Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752319Ab2FRNbw (ORCPT ); Mon, 18 Jun 2012 09:31:52 -0400 Received: from cantor2.suse.de ([195.135.220.15]:48483 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751629Ab2FRNbv (ORCPT ); Mon, 18 Jun 2012 09:31:51 -0400 Date: Mon, 18 Jun 2012 15:31:50 +0200 From: Michal Hocko To: Kamezawa Hiroyuki Cc: linux-mm , Linux Kernel Mailing List , cgroups@vger.kernel.org, Andrew Morton , Johannes Weiner Subject: Re: [PATCH 2/2] memcg: clean up force_empty_list() return value check Message-ID: <20120618133149.GC2313@tiehlicka.suse.cz> References: <4FDF17A3.9060202@jp.fujitsu.com> <4FDF1830.1000504@jp.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4FDF1830.1000504@jp.fujitsu.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1855 Lines: 58 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 Acked-by: Michal Hocko > --- > 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 from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/