f2fs: remove the redundant variable definition

[linux-2.6-block.git] / mm / slab_common.c

diff --git a/mm/slab_common.c b/mm/slab_common.c
index 23ff74e618388508e359a5317d93ae284778f779..09d0e849b07f47d82f5d9a5cda4862517d297cb2 100644 (file)
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
@@ -528,6 +528,9 @@ static void slab_caches_to_rcu_destroy_workfn(struct work_struct *work)
 
 static int shutdown_cache(struct kmem_cache *s)
 {
+       /* free asan quarantined objects */
+       kasan_cache_shutdown(s);
+
        if (__kmem_cache_shutdown(s) != 0)
                return -EBUSY;
 
@@ -816,7 +819,6 @@ void kmem_cache_destroy(struct kmem_cache *s)
        get_online_cpus();
        get_online_mems();
 
-       kasan_cache_destroy(s);
        mutex_lock(&slab_mutex);
 
        s->refcount--;