From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752247Ab2GRDGM (ORCPT ); Tue, 17 Jul 2012 23:06:12 -0400 Received: from e28smtp07.in.ibm.com ([122.248.162.7]:58690 "EHLO e28smtp07.in.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752112Ab2GRDGE (ORCPT ); Tue, 17 Jul 2012 23:06:04 -0400 From: Wanpeng Li To: linux-mm@kvack.org Cc: Wanpeng Li , Michal Hocko , Johannes Weiner , KAMEZAWA Hiroyuki , Andrew Morton , Gavin Shan , linux-kernel@vger.kernel.org Subject: [PATCH] mm/memcg: wrap mem_cgroup_from_css function Date: Wed, 18 Jul 2012 11:05:30 +0800 Message-Id: <1342580730-25703-1-git-send-email-liwanp@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: References: x-cbid: 12071803-8878-0000-0000-0000034C1E04 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org wrap mem_cgroup_from_css function to clarify get mem cgroup from cgroup_subsys_state. Signed-off-by: Wanpeng Li Cc: Michal Hocko Cc: Johannes Weiner Cc: KAMEZAWA Hiroyuki Cc: Andrew Morton Cc: Gavin Shan Cc: Wanpeng Li Cc: linux-kernel@vger.kernel.org --- mm/memcontrol.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 58a08fc..20f6a15 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -396,6 +396,12 @@ static void mem_cgroup_put(struct mem_cgroup *memcg); #include #include +static inline +struct mem_cgroup *mem_cgroup_from_css(struct cgroup_subsys_state *s) +{ + return container_of(s, struct mem_cgroup, css); +} + static bool mem_cgroup_is_root(struct mem_cgroup *memcg); void sock_update_memcg(struct sock *sk) { @@ -820,7 +826,7 @@ static void memcg_check_events(struct mem_cgroup *memcg, struct page *page) struct mem_cgroup *mem_cgroup_from_cont(struct cgroup *cont) { - return container_of(cgroup_subsys_state(cont, + return mem_cgroup_from_css(cgroup_subsys_state(cont, mem_cgroup_subsys_id), struct mem_cgroup, css); } @@ -835,7 +841,7 @@ struct mem_cgroup *mem_cgroup_from_task(struct task_struct *p) if (unlikely(!p)) return NULL; - return container_of(task_subsys_state(p, mem_cgroup_subsys_id), + return mem_cgroup_from_css(task_subsys_state(p, mem_cgroup_subsys_id), struct mem_cgroup, css); } @@ -922,7 +928,7 @@ struct mem_cgroup *mem_cgroup_iter(struct mem_cgroup *root, css = css_get_next(&mem_cgroup_subsys, id + 1, &root->css, &id); if (css) { if (css == &root->css || css_tryget(css)) - memcg = container_of(css, + memcg = mem_cgroup_from_css(css, struct mem_cgroup, css); } else id = 0; @@ -2406,7 +2412,7 @@ static struct mem_cgroup *mem_cgroup_lookup(unsigned short id) css = css_lookup(&mem_cgroup_subsys, id); if (!css) return NULL; - return container_of(css, struct mem_cgroup, css); + return mem_cgroup_from_css(css, struct mem_cgroup, css); } struct mem_cgroup *try_get_mem_cgroup_from_page(struct page *page) -- 1.7.5.4