From 12a497dd68ac9569f7600b5463eb3987692c8dc9 Mon Sep 17 00:00:00 2001
From: Li Zefan <lizf@cn.fujitsu.com>
Date: Tue, 4 Mar 2008 14:28:19 -0800
Subject: [PATCH] --- yaml --- r: 86771 b: refs/heads/master c:
 b6abdb0e6ca5c2c0a7caa4131da2af0750927e72 h: refs/heads/master i:   86769:
 e4a2365b75463bb159245141dfcb77dc3b557ef4   86767:
 e93041ce3e0b3d412d275ae02758cc67218f918b v: v3

---
 [refs]                | 2 +-
 trunk/kernel/cgroup.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a8f4afbd6c0d..bb449e44026f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fcab59a3186640ce085e89ee6dfc03cacfb6c7c9
+refs/heads/master: b6abdb0e6ca5c2c0a7caa4131da2af0750927e72
diff --git a/trunk/kernel/cgroup.c b/trunk/kernel/cgroup.c
index d8abe996e009..e9c2fb01e89b 100644
--- a/trunk/kernel/cgroup.c
+++ b/trunk/kernel/cgroup.c
@@ -2232,7 +2232,6 @@ static long cgroup_create(struct cgroup *parent, struct dentry *dentry,
 
 	mutex_lock(&cgroup_mutex);
 
-	cgrp->flags = 0;
 	INIT_LIST_HEAD(&cgrp->sibling);
 	INIT_LIST_HEAD(&cgrp->children);
 	INIT_LIST_HEAD(&cgrp->css_sets);
@@ -2242,6 +2241,9 @@ static long cgroup_create(struct cgroup *parent, struct dentry *dentry,
 	cgrp->root = parent->root;
 	cgrp->top_cgroup = parent->top_cgroup;
 
+	if (notify_on_release(parent))
+		set_bit(CGRP_NOTIFY_ON_RELEASE, &cgrp->flags);
+
 	for_each_subsys(root, ss) {
 		struct cgroup_subsys_state *css = ss->create(ss, cgrp);
 		if (IS_ERR(css)) {