From: Li Zefan Subject: [PATCH 4/8] memcg: convert to use cgroup_from_id() Date: Mon, 8 Apr 2013 16:21:29 +0800 Message-ID: <51627E09.5010605@huawei.com> References: <51627DA9.7020507@huawei.com> Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <51627DA9.7020507-hv44wF8Li93QT0dZR+AlfA@public.gmane.org> Sender: cgroups-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-ID: Content-Type: text/plain; charset="us-ascii" To: Andrew Morton Cc: Tejun Heo , Glauber Costa , KAMEZAWA Hiroyuki , Michal Hocko , Johannes Weiner , LKML , Cgroups , linux-mm-Bw31MaZKKs3YtjvyW6yDsg@public.gmane.org This is a preparation to kill css_id. Signed-off-by: Li Zefan --- mm/memcontrol.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 14f1375..3561d0b 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -2769,15 +2769,15 @@ static void __mem_cgroup_cancel_local_charge(struct mem_cgroup *memcg, */ static struct mem_cgroup *mem_cgroup_lookup(unsigned short id) { - struct cgroup_subsys_state *css; + struct cgroup *cgrp; /* ID 0 is unused ID */ if (!id) return NULL; - css = css_lookup(&mem_cgroup_subsys, id); - if (!css) + cgrp = cgroup_from_id(&mem_cgroup_subsys, id); + if (!cgrp) return NULL; - return mem_cgroup_from_css(css); + return mem_cgroup_from_cont(cgrp); } struct mem_cgroup *try_get_mem_cgroup_from_page(struct page *page) -- 1.8.0.2