From mboxrd@z Thu Jan 1 00:00:00 1970 From: Glauber Costa Subject: [PATCH v6 29/31] memcg: move initialization to memcg creation Date: Sun, 12 May 2013 22:13:50 +0400 Message-ID: <1368382432-25462-30-git-send-email-glommer@openvz.org> References: <1368382432-25462-1-git-send-email-glommer@openvz.org> Cc: , Andrew Morton , Greg Thelen , , Michal Hocko , Johannes Weiner , , Dave Chinner , Glauber Costa , Dave Chinner , Mel Gorman , Rik van Riel , Hugh Dickins To: Return-path: Received: from mailhub.sw.ru ([195.214.232.25]:16388 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754868Ab3ELSPG (ORCPT ); Sun, 12 May 2013 14:15:06 -0400 In-Reply-To: <1368382432-25462-1-git-send-email-glommer@openvz.org> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: 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 b8980d1..6f6a330 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -3323,9 +3323,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: @@ -6318,6 +6316,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