Re: [PATCH 2/2] memcg: clean up force_empty_list() return value check
From: Michal Hocko <hidden>
Date: 2012-06-18 13:31:52
Also in:
cgroups, lkml
On Mon 18-06-12 20:59:44, KAMEZAWA Hiroyuki wrote:
By commit "memcg: move charges to root cgroup if use_hierarchy=0" mem_cgroup_move_parent() only returns -EBUSY, -EINVAL. So, we can remove -ENOMEM and -EINTR checks. Signed-off-by: KAMEZAWA Hiroyuki <redacted>
Acked-by: Michal Hocko <redacted>
quoted hunk ↗ jump to hunk
--- mm/memcontrol.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-)diff --git a/mm/memcontrol.c b/mm/memcontrol.c index cf8a0f6..726b7c6 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c@@ -3847,8 +3847,6 @@ static int mem_cgroup_force_empty_list(struct mem_cgroup *memcg, pc = lookup_page_cgroup(page); ret = mem_cgroup_move_parent(page, pc, memcg, GFP_KERNEL); - if (ret == -ENOMEM || ret == -EINTR) - break; if (ret == -EBUSY || ret == -EINVAL) { /* found lock contention or "pc" is obsolete. */@@ -3910,9 +3908,6 @@ move_account: } mem_cgroup_end_move(memcg); memcg_oom_recover(memcg); - /* it seems parent cgroup doesn't have enough mem */ - if (ret == -ENOMEM) - goto try_to_free; cond_resched(); /* "ret" should also be checked to ensure all lists are empty. */ } while (res_counter_read_u64(&memcg->res, RES_USAGE) > 0 || ret);-- 1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe cgroups" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
-- Michal Hocko SUSE Labs SUSE LINUX s.r.o. Lihovarska 1060/12 190 00 Praha 9 Czech Republic -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>