From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx185.postini.com [74.125.245.185]) by kanga.kvack.org (Postfix) with SMTP id 097326B01AB for ; Fri, 14 Sep 2012 03:58:08 -0400 (EDT) Received: by vcbfl17 with SMTP id fl17so2098927vcb.14 for ; Fri, 14 Sep 2012 00:58:08 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: <20120912130935.GJ21579@dhcp22.suse.cz> References: <1347350934-17712-1-git-send-email-sachin.kamat@linaro.org> <20120911095200.GB8058@dhcp22.suse.cz> <20120912072520.GB17516@dhcp22.suse.cz> <50504CE1.8030509@parallels.com> <20120912125647.GH21579@dhcp22.suse.cz> <20120912130935.GJ21579@dhcp22.suse.cz> Date: Fri, 14 Sep 2012 13:28:07 +0530 Message-ID: Subject: Re: [PATCH] mm/memcontrol.c: Remove duplicate inclusion of sock.h file From: Sachin Kamat Content-Type: text/plain; charset=ISO-8859-1 Sender: owner-linux-mm@kvack.org List-ID: To: Michal Hocko Cc: Glauber Costa , cgroups@vger.kernel.org, linux-mm@kvack.org, Johannes Weiner , Balbir Singh , KAMEZAWA Hiroyuki , Andrew Morton Hi Michal, Has this patch been accepted? On 12 September 2012 18:39, Michal Hocko wrote: > On Wed 12-09-12 14:56:47, Michal Hocko wrote: >> On Wed 12-09-12 12:50:41, Glauber Costa wrote: >> [...] >> > >> diff --git a/mm/memcontrol.c b/mm/memcontrol.c >> > >> index 795e525..85ec9ff 100644 >> > >> --- a/mm/memcontrol.c >> > >> +++ b/mm/memcontrol.c >> > >> @@ -50,8 +50,12 @@ >> > >> #include >> > >> #include >> > >> #include "internal.h" >> > >> + >> > >> +#ifdef CONFIG_MEMCG_KMEM >> > >> #include >> > >> +#include >> > >> #include >> > >> +#endif >> > >> >> > >> #include >> > >> >> > >> @@ -326,7 +330,7 @@ struct mem_cgroup { >> > >> struct mem_cgroup_stat_cpu nocpu_base; >> > >> spinlock_t pcp_counter_lock; >> > >> >> > >> -#ifdef CONFIG_INET >> > >> +#ifdef CONFIG_MEMCG_KMEM >> > >> struct tcp_memcontrol tcp_mem; >> > >> #endif >> > >> }; >> > >> > If you are changing this, why not test for both? This field will be >> > useless with inet disabled. I usually don't like conditional in >> > structures (note that the "kmem" res counter in my patchsets is not >> > conditional to KMEM!!), but since the decision was made to make this one >> > conditional, I think INET is a much better test. I am fine with both though. >> >> You are right of course. Updated patch bellow: > > Bahh. And I managed to send a different patch than I tested... > --- > From 0617ff7114bdf424160a8f1533784c837d426ec2 Mon Sep 17 00:00:00 2001 > From: Michal Hocko > Date: Tue, 11 Sep 2012 10:38:42 +0200 > Subject: [PATCH] memcg: clean up networking headers file inclusion > > Memory controller doesn't need anything from the networking stack unless > CONFIG_MEMCG_KMEM is selected. > Now we are including net/sock.h and net/tcp_memcontrol.h unconditionally > which is not necessary. Moreover struct mem_cgroup contains tcp_mem even > if CONFIG_MEMCG_KMEM is not selected which is not necessary. > > Signed-off-by: Sachin Kamat > Signed-off-by: Michal Hocko > --- > mm/memcontrol.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 795e525..1a217b4 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -50,8 +50,12 @@ > #include > #include > #include "internal.h" > + > +#if defined(CONFIG_MEMCG_KMEM) && defined(CONFIG_INET) > #include > +#include > #include > +#endif > > #include > > @@ -326,7 +330,7 @@ struct mem_cgroup { > struct mem_cgroup_stat_cpu nocpu_base; > spinlock_t pcp_counter_lock; > > -#ifdef CONFIG_INET > +#if defined(CONFIG_MEMCG_KMEM) && defined(CONFIG_INET) > struct tcp_memcontrol tcp_mem; > #endif > }; > @@ -413,8 +417,6 @@ struct mem_cgroup *mem_cgroup_from_css(struct cgroup_subsys_state *s) > > /* Writing them here to avoid exposing memcg's inner layout */ > #ifdef CONFIG_MEMCG_KMEM > -#include > -#include > > static bool mem_cgroup_is_root(struct mem_cgroup *memcg); > void sock_update_memcg(struct sock *sk) > -- > 1.7.10.4 > > -- > Michal Hocko > SUSE Labs -- With warm regards, Sachin -- 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