From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx153.postini.com [74.125.245.153]) by kanga.kvack.org (Postfix) with SMTP id 97F7F6B005A for ; Tue, 17 Jul 2012 23:05:54 -0400 (EDT) Received: from /spool/local by e28smtp03.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 18 Jul 2012 08:35:51 +0530 Received: from d28av04.in.ibm.com (d28av04.in.ibm.com [9.184.220.66]) by d28relay05.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q6I35ldn2294168 for ; Wed, 18 Jul 2012 08:35:48 +0530 Received: from d28av04.in.ibm.com (loopback [127.0.0.1]) by d28av04.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q6I8ZZhW016661 for ; Wed, 18 Jul 2012 18:35:35 +1000 From: Wanpeng Li 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> In-Reply-To: References: Sender: owner-linux-mm@kvack.org List-ID: To: linux-mm@kvack.org Cc: Wanpeng Li , Michal Hocko , Johannes Weiner , KAMEZAWA Hiroyuki , Andrew Morton , Gavin Shan , 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 -- 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