The patch titled
Subject: memcg: root_cgroup cannot reach mem_cgroup_move_parent()
has been removed from the -mm tree. Its filename was
memcg-root_cgroup-cannot-reach-mem_cgroup_move_parent.patch
This patch was dropped because other changes were merged, which wrecked this patch
------------------------------------------------------
From: Michal Hocko <mhocko@xxxxxxx>
Subject: memcg: root_cgroup cannot reach mem_cgroup_move_parent()
The root cgroup cannot be destroyed so we never hit it down the
mem_cgroup_pre_destroy() path and mem_cgroup_force_empty_write() shouldn't
even try to do anything if called for the root.
This means that mem_cgroup_move_parent() doesn't have to bother with the
root cgroup and it can assume it can always move charges upwards.
Signed-off-by: Michal Hocko <mhocko@xxxxxxx>
Reviewed-by: Tejun Heo <tj@xxxxxxxxxx>
Reviewed-by: Glauber Costa <glommer@xxxxxxxxxxxxx>
Cc: Li Zefan <lizefan@xxxxxxxxxx>
Cc: Johannes Weiner <hannes@xxxxxxxxxxx>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
Cc: Balbir Singh <bsingharora@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/memcontrol.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff -puN mm/memcontrol.c~memcg-root_cgroup-cannot-reach-mem_cgroup_move_parent mm/memcontrol.c
--- a/mm/memcontrol.c~memcg-root_cgroup-cannot-reach-mem_cgroup_move_parent
+++ a/mm/memcontrol.c
@@ -2709,9 +2709,7 @@ static int mem_cgroup_move_parent(struct
unsigned long uninitialized_var(flags);
int ret;
- /* Is ROOT ? */
- if (mem_cgroup_is_root(child))
- return -EINVAL;
+ VM_BUG_ON(mem_cgroup_is_root(child));
ret = -EBUSY;
if (!get_page_unless_zero(page))
@@ -3817,6 +3815,8 @@ static int mem_cgroup_force_empty_write(
struct mem_cgroup *memcg = mem_cgroup_from_cont(cont);
int ret;
+ if (mem_cgroup_is_root(memcg))
+ return -EINVAL;
css_get(&memcg->css);
ret = mem_cgroup_force_empty(memcg);
css_put(&memcg->css);
_
Patches currently in -mm which might be from mhocko@xxxxxxx are
linux-next.patch
thp-clean-up-__collapse_huge_page_isolate.patch
thp-clean-up-__collapse_huge_page_isolate-v2.patch
mm-introduce-mm_find_pmd.patch
mm-introduce-mm_find_pmd-fix.patch
thp-introduce-hugepage_vma_check.patch
thp-cleanup-introduce-mk_huge_pmd.patch
memory-hotplug-allocate-zones-pcp-before-onlining-pages-fix.patch
memcg-simplify-mem_cgroup_force_empty_list-error-handling.patch
cgroups-forbid-pre_destroy-callback-to-fail.patch
memcg-make-mem_cgroup_reparent_charges-non-failing.patch
hugetlb-do-not-fail-in-hugetlb_cgroup_pre_destroy.patch
drop_caches-add-some-documentation-and-info-messsge.patch
drop_caches-add-some-documentation-and-info-messsge-checkpatch-fixes.patch
mm-memblock-reduce-overhead-in-binary-search.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
