Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753712AbbLJMhg (ORCPT ); Thu, 10 Dec 2015 07:37:36 -0500 Received: from mail-wm0-f51.google.com ([74.125.82.51]:37403 "EHLO mail-wm0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751779AbbLJMhe (ORCPT ); Thu, 10 Dec 2015 07:37:34 -0500 Date: Thu, 10 Dec 2015 13:37:32 +0100 From: Michal Hocko To: Johannes Weiner Cc: Andrew Morton , Vladimir Davydov , linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@fb.com Subject: Re: [PATCH 1/8] mm: memcontrol: drop unused @css argument in memcg_init_kmem Message-ID: <20151210123732.GG19496@dhcp22.suse.cz> References: <1449599665-18047-1-git-send-email-hannes@cmpxchg.org> <1449599665-18047-2-git-send-email-hannes@cmpxchg.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1449599665-18047-2-git-send-email-hannes@cmpxchg.org> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2526 Lines: 79 On Tue 08-12-15 13:34:18, Johannes Weiner wrote: > Signed-off-by: Johannes Weiner Acked-by: Michal Hocko > --- > include/net/tcp_memcontrol.h | 3 ++- > mm/memcontrol.c | 6 +++--- > net/ipv4/tcp_memcontrol.c | 2 +- > 3 files changed, 6 insertions(+), 5 deletions(-) > > diff --git a/include/net/tcp_memcontrol.h b/include/net/tcp_memcontrol.h > index 3a17b16..dc2da2f 100644 > --- a/include/net/tcp_memcontrol.h > +++ b/include/net/tcp_memcontrol.h > @@ -1,6 +1,7 @@ > #ifndef _TCP_MEMCG_H > #define _TCP_MEMCG_H > > -int tcp_init_cgroup(struct mem_cgroup *memcg, struct cgroup_subsys *ss); > +int tcp_init_cgroup(struct mem_cgroup *memcg); > void tcp_destroy_cgroup(struct mem_cgroup *memcg); > + > #endif /* _TCP_MEMCG_H */ > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 5fe45d68..eda8d43 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -3561,7 +3561,7 @@ static int mem_cgroup_oom_control_write(struct cgroup_subsys_state *css, > } > > #ifdef CONFIG_MEMCG_KMEM > -static int memcg_init_kmem(struct mem_cgroup *memcg, struct cgroup_subsys *ss) > +static int memcg_init_kmem(struct mem_cgroup *memcg) > { > int ret; > > @@ -3569,7 +3569,7 @@ static int memcg_init_kmem(struct mem_cgroup *memcg, struct cgroup_subsys *ss) > if (ret) > return ret; > > - return tcp_init_cgroup(memcg, ss); > + return tcp_init_cgroup(memcg); > } > > static void memcg_deactivate_kmem(struct mem_cgroup *memcg) > @@ -4252,7 +4252,7 @@ mem_cgroup_css_online(struct cgroup_subsys_state *css) > } > mutex_unlock(&memcg_create_mutex); > > - ret = memcg_init_kmem(memcg, &memory_cgrp_subsys); > + ret = memcg_init_kmem(memcg); > if (ret) > return ret; > > diff --git a/net/ipv4/tcp_memcontrol.c b/net/ipv4/tcp_memcontrol.c > index 18bc7f7..133eb5e 100644 > --- a/net/ipv4/tcp_memcontrol.c > +++ b/net/ipv4/tcp_memcontrol.c > @@ -6,7 +6,7 @@ > #include > #include > > -int tcp_init_cgroup(struct mem_cgroup *memcg, struct cgroup_subsys *ss) > +int tcp_init_cgroup(struct mem_cgroup *memcg) > { > struct mem_cgroup *parent = parent_mem_cgroup(memcg); > struct page_counter *counter_parent = NULL; > -- > 2.6.3 -- Michal Hocko SUSE Labs -- 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/