From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx129.postini.com [74.125.245.129]) by kanga.kvack.org (Postfix) with SMTP id C46246B00E9 for ; Mon, 8 Apr 2013 10:02:40 -0400 (EDT) From: Glauber Costa Subject: [PATCH v3 29/32] memcg: move initialization to memcg creation Date: Mon, 8 Apr 2013 18:00:56 +0400 Message-Id: <1365429659-22108-30-git-send-email-glommer@parallels.com> In-Reply-To: <1365429659-22108-1-git-send-email-glommer@parallels.com> References: <1365429659-22108-1-git-send-email-glommer@parallels.com> Sender: owner-linux-mm@kvack.org List-ID: To: linux-mm@kvack.org Cc: cgroups@vger.kernel.org, Dave Shrinnker , Serge Hallyn , kamezawa.hiroyu@jp.fujitsu.com, Michal Hocko , Johannes Weiner , Andrew Morton , hughd@google.com, linux-fsdevel@vger.kernel.org, containers@lists.linux-foundation.org, Greg Thelen , Glauber Costa , Dave Chinner , Mel Gorman , Rik van Riel Those structures are only used for memcgs that are effectively using kmemcg. However, in a later patch I intend to use scan that list inconditionally (list empty meaning no kmem caches present), which simplifies the code a lot. So move the initialization to early kmem creation. Signed-off-by: Glauber Costa Cc: Dave Chinner Cc: Mel Gorman Cc: Rik van Riel Cc: Johannes Weiner Cc: Michal Hocko Cc: Hugh Dickins Cc: Kamezawa Hiroyuki Cc: Andrew Morton --- mm/memcontrol.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 545f922..1f1ded3 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -3149,9 +3149,7 @@ int memcg_update_cache_sizes(struct mem_cgroup *memcg) memcg_update_array_size(num + 1); - INIT_LIST_HEAD(&memcg->memcg_slab_caches); INIT_WORK(&memcg->kmemcg_shrink_work, kmemcg_shrink_work_fn); - mutex_init(&memcg->slab_caches_mutex); return 0; out: @@ -6029,6 +6027,8 @@ static int memcg_init_kmem(struct mem_cgroup *memcg, struct cgroup_subsys *ss) { int ret; + INIT_LIST_HEAD(&memcg->memcg_slab_caches); + mutex_init(&memcg->slab_caches_mutex); memcg->kmemcg_id = -1; ret = memcg_propagate_kmem(memcg); if (ret) -- 1.8.1.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