From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail143.messagelabs.com (mail143.messagelabs.com [216.82.254.35]) by kanga.kvack.org (Postfix) with ESMTP id 7D16C6B004F for ; Wed, 14 Jan 2009 03:30:53 -0500 (EST) Date: Wed, 14 Jan 2009 17:29:12 +0900 From: Daisuke Nishimura Subject: Re: [PATCH] memcg: fix return value of mem_cgroup_hierarchy_write() Message-Id: <20090114172912.95a78542.nishimura@mxp.nes.nec.co.jp> In-Reply-To: <496D9E0C.4060806@cn.fujitsu.com> References: <496D9E0C.4060806@cn.fujitsu.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: owner-linux-mm@kvack.org To: Li Zefan Cc: nishimura@mxp.nes.nec.co.jp, Andrew Morton , KAMEZAWA Hiroyuki , Balbir Singh , Paul Menage , LKML , "linux-mm@kvack.org" List-ID: On Wed, 14 Jan 2009 16:10:52 +0800, Li Zefan wrote: > When there are sub-dirs, writing to memory.use_hierarchy returns -EBUSY, > this doesn't seem to fit the meaning of EBUSY, and is inconsistent with > memory.swappiness, which returns -EINVAL in this case. > I also think -EBUSY is not so bad in this case. Thanks, Daisuke Nishimura. > Signed-off-by: Li Zefan > --- > mm/memcontrol.c | 10 +++++----- > 1 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index bc8f101..2497f7d 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -1760,6 +1760,9 @@ static int mem_cgroup_hierarchy_write(struct cgroup *cont, struct cftype *cft, > struct cgroup *parent = cont->parent; > struct mem_cgroup *parent_mem = NULL; > > + if (val != 0 && val != 1) > + return -EINVAL; > + > if (parent) > parent_mem = mem_cgroup_from_cont(parent); > > @@ -1773,12 +1776,9 @@ static int mem_cgroup_hierarchy_write(struct cgroup *cont, struct cftype *cft, > * set if there are no children. > */ > if ((!parent_mem || !parent_mem->use_hierarchy) && > - (val == 1 || val == 0)) { > - if (list_empty(&cont->children)) > + list_empty(&cont->children)) > mem->use_hierarchy = val; > - else > - retval = -EBUSY; > - } else > + else > retval = -EINVAL; > cgroup_unlock(); > > -- > 1.5.4.rc3 -- 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: email@kvack.org