blk-mq: really fix plug list flushing for nomerge queues

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

diff --git a/mm/slab_common.c b/mm/slab_common.c
index 3239bfd758e6be9c9e57aadd13feddb234533777..a65dad7fdcd12495a51eabd91fc76ed96edb0576 100644 (file)
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
@@ -715,6 +715,7 @@ void kmem_cache_destroy(struct kmem_cache *s)
        get_online_cpus();
        get_online_mems();
 
+       kasan_cache_destroy(s);
        mutex_lock(&slab_mutex);
 
        s->refcount--;
@@ -753,6 +754,7 @@ int kmem_cache_shrink(struct kmem_cache *cachep)
 
        get_online_cpus();
        get_online_mems();
+       kasan_cache_shrink(cachep);
        ret = __kmem_cache_shrink(cachep, false);
        put_online_mems();
        put_online_cpus();