---

yaml --- r: 86771 b: refs/heads/master c: b6abdb0 h: refs/heads/master i: 86769: e4a2365 86767: e93041c v: v3
git-mirror · Mar 5, 2008 · 12a497d · 12a497d
1 parent c6d5caa
commit 12a497d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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)) {