From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kamezawa Hiroyuki Subject: [PATCH 2/2] memcg: clean up force_empty_list() return value check Date: Mon, 18 Jun 2012 20:59:44 +0900 Message-ID: <4FDF1830.1000504@jp.fujitsu.com> References: <4FDF17A3.9060202@jp.fujitsu.com> Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <4FDF17A3.9060202-+CUm20s59erQFUHtdCDX3A@public.gmane.org> Sender: cgroups-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-ID: Content-Type: text/plain; charset="us-ascii" To: linux-mm Cc: Linux Kernel Mailing List , cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Michal Hocko , Andrew Morton , Johannes Weiner 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 --- 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