From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760812Ab3DCJND (ORCPT ); Wed, 3 Apr 2013 05:13:03 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:38938 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759772Ab3DCJM6 (ORCPT ); Wed, 3 Apr 2013 05:12:58 -0400 Message-ID: <515BF275.5080408@huawei.com> Date: Wed, 3 Apr 2013 17:12:21 +0800 From: Li Zefan User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:17.0) Gecko/20130307 Thunderbird/17.0.4 MIME-Version: 1.0 To: CC: LKML , Cgroups , Tejun Heo , Glauber Costa , Michal Hocko , KAMEZAWA Hiroyuki , Johannes Weiner Subject: [RFC][PATCH 2/7] memcg: don't use mem_cgroup_get() when creating a kmemcg cache References: <515BF233.6070308@huawei.com> In-Reply-To: <515BF233.6070308@huawei.com> Content-Type: text/plain; charset="GB2312" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.135.68.215] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use css_get()/css_put() instead of mem_cgroup_get()/mem_cgroup_put(). Signed-off-by: Li Zefan --- mm/memcontrol.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 43ca91d..dafacb8 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -3191,7 +3191,7 @@ void memcg_release_cache(struct kmem_cache *s) list_del(&s->memcg_params->list); mutex_unlock(&memcg->slab_caches_mutex); - mem_cgroup_put(memcg); + css_put(&memcg->css); out: kfree(s->memcg_params); } @@ -3350,16 +3350,18 @@ static struct kmem_cache *memcg_create_kmem_cache(struct mem_cgroup *memcg, mutex_lock(&memcg_cache_mutex); new_cachep = cachep->memcg_params->memcg_caches[idx]; - if (new_cachep) + if (new_cachep) { + css_put(&memcg->css); goto out; + } new_cachep = kmem_cache_dup(memcg, cachep); if (new_cachep == NULL) { new_cachep = cachep; + css_put(&memcg->css); goto out; } - mem_cgroup_get(memcg); atomic_set(&new_cachep->memcg_params->nr_pages , 0); cachep->memcg_params->memcg_caches[idx] = new_cachep; @@ -3449,8 +3451,6 @@ static void memcg_create_cache_work_func(struct work_struct *w) cw = container_of(w, struct create_work, work); memcg_create_kmem_cache(cw->memcg, cw->cachep); - /* Drop the reference gotten when we enqueued. */ - css_put(&cw->memcg->css); kfree(cw); } -- 1.8.0.2