Messages in this thread Patch in this message | | | From | Vladimir Davydov <> | Subject | [PATCH RESEND -mm 04/12] memcg: move slab caches list/mutex init to memcg creation | Date | Thu, 13 Mar 2014 19:06:42 +0400 |
| |
I need them initialized for cgroups that haven't got kmem accounting initialized.
Signed-off-by: Vladimir Davydov <vdavydov@parallels.com> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: Michal Hocko <mhocko@suse.cz> Cc: Glauber Costa <glommer@gmail.com> --- mm/memcontrol.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 21974ec406bb..3659d90d5a40 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -5043,8 +5043,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 @@ -5791,6 +5789,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
| |