From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx109.postini.com [74.125.245.109]) by kanga.kvack.org (Postfix) with SMTP id D28036B000D for ; Mon, 11 Feb 2013 04:04:24 -0500 (EST) Date: Mon, 11 Feb 2013 10:04:18 +0100 From: Michal Hocko Subject: Re: [PATCH 1/2] memcg: fast hierarchy-aware child test fix Message-ID: <20130211090409.GA19922@dhcp22.suse.cz> References: <1360569889-843-1-git-send-email-glommer@parallels.com> <1360569889-843-2-git-send-email-glommer@parallels.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1360569889-843-2-git-send-email-glommer@parallels.com> Sender: owner-linux-mm@kvack.org List-ID: To: Glauber Costa Cc: Andrew Morton , Tejun Heo , linux-mm@kvack.org, cgroups@vger.kernel.org, Johannes Weiner , kamezawa.hiroyu@jp.fujitsu.com Acked-by: Michal Hocko On Mon 11-02-13 12:04:48, Glauber Costa wrote: > --- > mm/memcontrol.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 25ac5f4..28252c9 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -5883,8 +5883,7 @@ static int mem_cgroup_oom_control_write(struct cgroup *cgrp, > > mutex_lock(&memcg_create_mutex); > /* oom-kill-disable is a flag for subhierarchy. */ > - if ((parent->use_hierarchy) || > - (memcg->use_hierarchy && !list_empty(&cgrp->children))) { > + if ((parent->use_hierarchy) || memcg_has_children(memcg)) { > cgroup_unlock(); > return -EINVAL; > } > -- > 1.8.1.2 > > -- > 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 -- Michal Hocko SUSE Labs -- 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