1 files changed, 5 insertions, 14 deletions

diff --git a/mm/slub.c b/mm/slub.c
index 75d55fdfe3a1..1e5a4636cb23 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -3636,13 +3636,10 @@ struct kmem_cache *
 __kmem_cache_alias(const char *name, size_t size, size_t align,
                    unsigned long flags, void (*ctor)(void *))
 {
-        struct kmem_cache *s;
+        struct kmem_cache *s, *c;
 
         s = find_mergeable(size, align, flags, name, ctor);
         if (s) {
-                int i;
-                struct kmem_cache *c;
-
                 s->refcount++;
 
                 /*
@@ -3652,10 +3649,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
                 s->object_size = max(s->object_size, (int)size);
                 s->inuse = max_t(int, s->inuse, ALIGN(size, sizeof(void *)));
 
-                for_each_memcg_cache_index(i) {
-                        c = cache_from_memcg_idx(s, i);
-                        if (!c)
-                                continue;
+                for_each_memcg_cache(c, s) {
                         c->object_size = s->object_size;
                         c->inuse = max_t(int, c->inuse,
                                          ALIGN(size, sizeof(void *)));
@@ -4921,7 +4915,7 @@ static ssize_t slab_attr_store(struct kobject *kobj,
         err = attribute->store(s, buf, len);
 #ifdef CONFIG_MEMCG_KMEM
         if (slab_state >= FULL && err >= 0 && is_root_cache(s)) {
-                int i;
+                struct kmem_cache *c;
 
                 mutex_lock(&slab_mutex);
                 if (s->max_attr_size < len)
@@ -4944,11 +4938,8 @@ static ssize_t slab_attr_store(struct kobject *kobj,
                  * directly either failed or succeeded, in which case we loop
                  * through the descendants with best-effort propagation.
                  */
-                for_each_memcg_cache_index(i) {
-                        struct kmem_cache *c = cache_from_memcg_idx(s, i);
-                        if (c)
-                                attribute->store(c, buf, len);
-                }
+                for_each_memcg_cache(c, s)
+                        attribute->store(c, buf, len);
                 mutex_unlock(&slab_mutex);
         }
 #endif