Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753085Ab1BQIRr (ORCPT ); Thu, 17 Feb 2011 03:17:47 -0500 Received: from cantor2.suse.de ([195.135.220.15]:34007 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751170Ab1BQIRp (ORCPT ); Thu, 17 Feb 2011 03:17:45 -0500 Date: Thu, 17 Feb 2011 09:17:41 +0100 (CET) From: Jiri Kosina To: KAMEZAWA Hiroyuki Cc: Greg Thelen , Andrew Morton , Randy Dunlap , Daisuke Nishimura , linux-mm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] memcg: clarify use_hierarchy documentation In-Reply-To: <20110217104932.9e2c741b.kamezawa.hiroyu@jp.fujitsu.com> Message-ID: References: <1297907483-3672-1-git-send-email-gthelen@google.com> <20110217104932.9e2c741b.kamezawa.hiroyu@jp.fujitsu.com> User-Agent: Alpine 2.00 (LNX 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1710 Lines: 54 On Thu, 17 Feb 2011, KAMEZAWA Hiroyuki wrote: > On Wed, 16 Feb 2011 17:51:23 -0800 > Greg Thelen wrote: > > > The memcg code does not allow changing memory.use_hierarchy if the > > parent cgroup has enabled use_hierarchy. Update documentation to match > > the code. > > > > Signed-off-by: Greg Thelen > > Thank you, > Acked-by: KAMEZAWA Hiroyuki Applied, thanks. > > Because I tend to read linux-mm list 1st, I'm glad if you CC linux-mm in > the next time. > > > --- > > Documentation/cgroups/memory.txt | 5 +++-- > > 1 files changed, 3 insertions(+), 2 deletions(-) > > > > diff --git a/Documentation/cgroups/memory.txt b/Documentation/cgroups/memory.txt > > index 7781857..b6ed61c 100644 > > --- a/Documentation/cgroups/memory.txt > > +++ b/Documentation/cgroups/memory.txt > > @@ -485,8 +485,9 @@ The feature can be disabled by > > > > # echo 0 > memory.use_hierarchy > > > > -NOTE1: Enabling/disabling will fail if the cgroup already has other > > - cgroups created below it. > > +NOTE1: Enabling/disabling will fail if either the cgroup already has other > > + cgroups created below it, or if the parent cgroup has use_hierarchy > > + enabled. > > > > NOTE2: When panic_on_oom is set to "2", the whole system will panic in > > case of an OOM event in any cgroup. > > -- > > 1.7.3.1 > > > > > -- Jiri Kosina SUSE Labs, Novell Inc. -- 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/