---

yaml --- r: 83791 b: refs/heads/master c: df878fb h: refs/heads/master i: 83789: ac50f14 83787: 25a8ed6 83783: e951088 83775: 6e5029a v: v3
git-mirror · Feb 7, 2008 · 13092bd · 13092bd
1 parent 5b1d4f8
commit 13092bd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git 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
@@ -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,