From 13092bd31a9115e55865639b61d700a9faf3ddfa Mon Sep 17 00:00:00 2001 From: KAMEZAWA Hiroyuki Date: Thu, 7 Feb 2008 00:14:28 -0800 Subject: [PATCH] --- yaml --- r: 83791 b: refs/heads/master c: df878fb04dea044378274d40d063279a9cb787fb h: refs/heads/master i: 83789: ac50f142f089433b52eaf77c41856ddd7cd60ef6 83787: 25a8ed66342ad95dde53a757bad5f461e58cb69e 83783: e951088ce21e40ebc2364f71713612b3656c701a 83775: 6e5029a1a9985a511649e19eab0a0656f0363489 v: v3 --- [refs] | 2 +- trunk/mm/memcontrol.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 0a3cc686cdd4..f720b87cfebf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4fca88c87b7969c698912e2de9b1b31088c777cb +refs/heads/master: df878fb04dea044378274d40d063279a9cb787fb diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c index 904e9a9c223d..14cb6142ec4c 100644 --- a/trunk/mm/memcontrol.c +++ b/trunk/mm/memcontrol.c @@ -895,6 +895,13 @@ mem_cgroup_create(struct cgroup_subsys *ss, struct cgroup *cont) return &mem->css; } +static void mem_cgroup_pre_destroy(struct cgroup_subsys *ss, + struct cgroup *cont) +{ + struct mem_cgroup *mem = mem_cgroup_from_cont(cont); + mem_cgroup_force_empty(mem); +} + static void mem_cgroup_destroy(struct cgroup_subsys *ss, struct cgroup *cont) { @@ -946,6 +953,7 @@ struct cgroup_subsys mem_cgroup_subsys = { .name = "memory", .subsys_id = mem_cgroup_subsys_id, .create = mem_cgroup_create, + .pre_destroy = mem_cgroup_pre_destroy, .destroy = mem_cgroup_destroy, .populate = mem_cgroup_populate, .attach = mem_cgroup_move_task,