[PATCH v2 2/2] cgroup: get rid of populate for memcg
From: Glauber Costa <hidden>
Date: 2012-04-06 16:04:10
Also in:
cgroups
Subsystem:
control group - memory resource controller (memcg), memory management, the rest · Maintainers:
Johannes Weiner, Michal Hocko, Roman Gushchin, Shakeel Butt, Andrew Morton, Linus Torvalds
Possibly related (same subject, not in this thread)
- 2012-04-10 · Re: [PATCH v2 2/2] cgroup: get rid of populate for memcg · KAMEZAWA Hiroyuki <hidden>
- 2012-04-10 · Re: [PATCH v2 2/2] cgroup: get rid of populate for memcg · KAMEZAWA Hiroyuki <hidden>
- 2012-04-09 · Re: [PATCH v2 2/2] cgroup: get rid of populate for memcg · Tejun Heo <hidden>
- 2012-04-09 · Re: [PATCH v2 2/2] cgroup: get rid of populate for memcg · Glauber Costa <hidden>
- 2012-04-09 · Re: [PATCH v2 2/2] cgroup: get rid of populate for memcg · Tejun Heo <hidden>
The last man standing justifying the need for populate() is the sock memcg initialization functions. Now that we are able to pass a struct mem_cgroup instead of a struct cgroup to the socket initialization, there is nothing that stops us from initializing everything in create(). Signed-off-by: Glauber Costa <redacted> CC: Tejun Heo <redacted> CC: Li Zefan <redacted> --- mm/memcontrol.c | 16 +++++----------- 1 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 704054d..64a1bcd 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c@@ -4640,7 +4640,7 @@ static int mem_control_numa_stat_open(struct inode *unused, struct file *file) #endif /* CONFIG_NUMA */ #ifdef CONFIG_CGROUP_MEM_RES_CTLR_KMEM -static int register_kmem_files(struct mem_cgroup *memcg, struct cgroup_subsys *ss) +static int memcg_init_kmem(struct mem_cgroup *memcg, struct cgroup_subsys *ss) { return mem_cgroup_sockets_init(memcg, ss); };
@@ -4650,7 +4650,7 @@ static void kmem_cgroup_destroy(struct mem_cgroup *memcg) mem_cgroup_sockets_destroy(memcg); } #else -static int register_kmem_files(struct mem_cgroup *memcg, struct cgroup_subsys *ss) +static int memcg_init_kmem(struct mem_cgroup *memcg, struct cgroup_subsys *ss) { return 0; }
@@ -5010,7 +5010,9 @@ mem_cgroup_create(struct cgroup *cont) memcg->move_charge_at_immigrate = 0; mutex_init(&memcg->thresholds_lock); spin_lock_init(&memcg->move_lock); - return &memcg->css; + + if (!memcg_init_kmem(memcg, &mem_cgroup_subsys)) + return &memcg->css; free_out: __mem_cgroup_free(memcg); return ERR_PTR(error);
@@ -5032,13 +5034,6 @@ static void mem_cgroup_destroy(struct cgroup *cont) mem_cgroup_put(memcg); } -static int mem_cgroup_populate(struct cgroup_subsys *ss, - struct cgroup *cont) -{ - struct mem_cgroup *memcg = mem_cgroup_from_cont(cont); - return register_kmem_files(memcg, ss); -} - #ifdef CONFIG_MMU /* Handlers for move charge at task migration. */ #define PRECHARGE_COUNT_AT_ONCE 256
@@ -5622,7 +5617,6 @@ struct cgroup_subsys mem_cgroup_subsys = { .create = mem_cgroup_create, .pre_destroy = mem_cgroup_pre_destroy, .destroy = mem_cgroup_destroy, - .populate = mem_cgroup_populate, .can_attach = mem_cgroup_can_attach, .cancel_attach = mem_cgroup_cancel_attach, .attach = mem_cgroup_move_task,
--
1.7.7.6