From mboxrd@z Thu Jan 1 00:00:00 1970 From: Glauber Costa Subject: [PATCH v10 33/35] memcg: move initialization to memcg creation Date: Mon, 3 Jun 2013 23:30:02 +0400 Message-ID: <1370287804-3481-34-git-send-email-glommer@openvz.org> References: <1370287804-3481-1-git-send-email-glommer@openvz.org> Cc: , Mel Gorman , Dave Chinner , , , , Michal Hocko , Johannes Weiner , hughd-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org, Greg Thelen , Glauber Costa , Dave Chinner , Rik van Riel To: Andrew Morton Return-path: In-Reply-To: <1370287804-3481-1-git-send-email-glommer-GEFAQzZX7r8dnm+yROfE0A@public.gmane.org> Sender: cgroups-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: linux-fsdevel.vger.kernel.org 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 aa6853f..c0e1113f 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -3326,9 +3326,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: @@ -6319,6 +6317,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