From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752858AbaBZPFi (ORCPT ); Wed, 26 Feb 2014 10:05:38 -0500 Received: from relay.parallels.com ([195.214.232.42]:59683 "EHLO relay.parallels.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752809AbaBZPFg (ORCPT ); Wed, 26 Feb 2014 10:05:36 -0500 From: Vladimir Davydov To: CC: , , , , , Subject: [PATCH -mm 04/12] memcg: move slab caches list/mutex init to memcg creation Date: Wed, 26 Feb 2014 19:05:09 +0400 Message-ID: <0bd569d6a70e144d39f6749b5592803ee666367f.1393423762.git.vdavydov@parallels.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.30.16.96] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org I need them initialized for cgroups that haven't got kmem accounting initialized. Signed-off-by: Vladimir Davydov Cc: Johannes Weiner Cc: Michal Hocko Cc: Glauber Costa --- mm/memcontrol.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 1b9634090454..69431f5285cc 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -5122,8 +5122,6 @@ static int __memcg_activate_kmem(struct mem_cgroup *memcg, goto out_rmid; memcg->kmemcg_id = memcg_id; - INIT_LIST_HEAD(&memcg->memcg_slab_caches); - mutex_init(&memcg->slab_caches_mutex); /* * We couldn't have accounted to this cgroup, because it hasn't got the @@ -5870,6 +5868,9 @@ static int memcg_init_kmem(struct mem_cgroup *memcg, struct cgroup_subsys *ss) int ret; memcg->kmemcg_id = -1; + INIT_LIST_HEAD(&memcg->memcg_slab_caches); + mutex_init(&memcg->slab_caches_mutex); + ret = memcg_propagate_kmem(memcg); if (ret) return ret; -- 1.7.10.4