mm: memcontrol: remove kmemcg_id reparenting

[sfrench/cifs-2.6.git] / mm / memcontrol.c

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index e4fcb6e55f750409e71bac72e570af1740fd4e4a..1e2d3f378edd458a91febd5f9be39efa552d9c67 100644 (file)
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -3650,8 +3650,7 @@ static int memcg_online_kmem(struct mem_cgroup *memcg)
 
 static void memcg_offline_kmem(struct mem_cgroup *memcg)
 {
-       struct cgroup_subsys_state *css;
-       struct mem_cgroup *parent, *child;
+       struct mem_cgroup *parent;
        int kmemcg_id;
 
        if (memcg->kmem_state != KMEM_ONLINE)
@@ -3669,21 +3668,11 @@ static void memcg_offline_kmem(struct mem_cgroup *memcg)
        BUG_ON(kmemcg_id < 0);
 
        /*
-        * Change kmemcg_id of this cgroup and all its descendants to the
-        * parent's id, and then move all entries from this cgroup's list_lrus
-        * to ones of the parent. After we have finished, all list_lrus
-        * corresponding to this cgroup are guaranteed to remain empty. The
-        * ordering is imposed by list_lru_node->lock taken by
+        * After we have finished memcg_reparent_objcgs(), all list_lrus
+        * corresponding to this cgroup are guaranteed to remain empty.
+        * The ordering is imposed by list_lru_node->lock taken by
         * memcg_drain_all_list_lrus().
         */
-       rcu_read_lock(); /* can be called from css_free w/o cgroup_mutex */
-       css_for_each_descendant_pre(css, &memcg->css) {
-               child = mem_cgroup_from_css(css);
-               BUG_ON(child->kmemcg_id != kmemcg_id);
-               child->kmemcg_id = parent->kmemcg_id;
-       }
-       rcu_read_unlock();
-
        memcg_drain_all_list_lrus(kmemcg_id, parent);
 
        memcg_free_cache_id(kmemcg_id);