1 files changed, 5 insertions, 4 deletions

diff --git a/mm/slab_common.c b/mm/slab_common.c
index c29f03adca91..f9fb27b4c843 100644
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
@@ -178,10 +178,13 @@ static int init_memcg_params(struct kmem_cache *s,
 
 static void destroy_memcg_params(struct kmem_cache *s)
 {
-        if (is_root_cache(s))
+        if (is_root_cache(s)) {
                 kvfree(rcu_access_pointer(s->memcg_params.memcg_caches));
-        else
+        } else {
+                mem_cgroup_put(s->memcg_params.memcg);
+                WRITE_ONCE(s->memcg_params.memcg, NULL);
                 percpu_ref_exit(&s->memcg_params.refcnt);
+        }
 }
 
 static void free_memcg_params(struct rcu_head *rcu)
@@ -253,8 +256,6 @@ static void memcg_unlink_cache(struct kmem_cache *s)
         } else {
                 list_del(&s->memcg_params.children_node);
                 list_del(&s->memcg_params.kmem_caches_node);
-                mem_cgroup_put(s->memcg_params.memcg);
-                WRITE_ONCE(s->memcg_params.memcg, NULL);
         }
 }
 #else