From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail191.messagelabs.com (mail191.messagelabs.com [216.82.242.19]) by kanga.kvack.org (Postfix) with SMTP id 9D1C260021B for ; Wed, 9 Dec 2009 11:12:34 -0500 (EST) Date: Thu, 10 Dec 2009 01:11:42 +0900 From: Daisuke Nishimura Subject: Re: [PATCH] [TRIVIAL] memcg: fix memory.memsw.usage_in_bytes for root cgroup Message-Id: <20091210011142.bd64a736.d-nishimura@mtf.biglobe.ne.jp> In-Reply-To: <1260373738-17179-1-git-send-email-kirill@shutemov.name> References: <1260373738-17179-1-git-send-email-kirill@shutemov.name> Reply-To: nishimura@mxp.nes.nec.co.jp Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: owner-linux-mm@kvack.org To: "Kirill A. Shutemov" Cc: Andrew Morton , linux-mm@kvack.org, KAMEZAWA Hiroyuki , Balbir Singh , Pavel Emelyanov , linux-kernel@vger.kernel.org, stable@kernel.org, nishimura@mxp.nes.nec.co.jp List-ID: (Added Cc: Andrew Morton ) On Wed, 9 Dec 2009 17:48:58 +0200 "Kirill A. Shutemov" wrote: > We really want to take MEM_CGROUP_STAT_SWAPOUT into account. > Nice catch! Reviewed-by: Daisuke Nishimura > Signed-off-by: Kirill A. Shutemov > Cc: stable@kernel.org > --- > mm/memcontrol.c | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index f99f599..6314015 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -2541,6 +2541,7 @@ static u64 mem_cgroup_read(struct cgroup *cont, struct cftype *cft) > val += idx_val; > mem_cgroup_get_recursive_idx_stat(mem, > MEM_CGROUP_STAT_SWAPOUT, &idx_val); > + val += idx_val; > val <<= PAGE_SHIFT; > } else > val = res_counter_read_u64(&mem->memsw, name); Regards, Daisuke Nishimura. -- 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