1 files changed, 5 insertions, 8 deletions

diff --git a/mm/slab.c b/mm/slab.c
index 65b5dcb6f671..7894017bc160 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -3708,8 +3708,7 @@ static int do_tune_cpucache(struct kmem_cache *cachep, int limit,
                                 int batchcount, int shared, gfp_t gfp)
 {
         int ret;
-        struct kmem_cache *c = NULL;
-        int i = 0;
+        struct kmem_cache *c;
 
         ret = __do_tune_cpucache(cachep, limit, batchcount, shared, gfp);
 
@@ -3719,12 +3718,10 @@ static int do_tune_cpucache(struct kmem_cache *cachep, int limit,
         if ((ret < 0) || !is_root_cache(cachep))
                 return ret;
 
-        VM_BUG_ON(!mutex_is_locked(&slab_mutex));
-        for_each_memcg_cache_index(i) {
-                c = cache_from_memcg_idx(cachep, i);
-                if (c)
-                        /* return value determined by the parent cache only */
-                        __do_tune_cpucache(c, limit, batchcount, shared, gfp);
+        lockdep_assert_held(&slab_mutex);
+        for_each_memcg_cache(c, cachep) {
+                /* return value determined by the root cache only */
+                __do_tune_cpucache(c, limit, batchcount, shared, gfp);
         }
 
         return ret;