---

yaml --- r: 180178 b: refs/heads/master c: 4528fd0 h: refs/heads/master v: v3
git-mirror · Feb 3, 2010 · 887c7e4 · 887c7e4
1 parent 869daf0
commit 887c7e4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef2b9b054580ef835078d8aa411bd06542cd5c1c
+refs/heads/master: 4528fd0595847c2078b59f24800e751c2d6b7e41
diff --git a/trunk/kernel/cgroup.c b/trunk/kernel/cgroup.c
@@ -2936,14 +2936,17 @@ static long cgroup_create(struct cgroup *parent, struct dentry *dentry,
 
 	for_each_subsys(root, ss) {
 		struct cgroup_subsys_state *css = ss->create(ss, cgrp);
+
 		if (IS_ERR(css)) {
 			err = PTR_ERR(css);
 			goto err_destroy;
 		}
 		init_cgroup_css(css, ss, cgrp);
-		if (ss->use_id)
-			if (alloc_css_id(ss, parent, cgrp))
+		if (ss->use_id) {
+			err = alloc_css_id(ss, parent, cgrp);
+			if (err)
 				goto err_destroy;
+		}
 		/* At error, ->destroy() callback has to free assigned ID. */
 	}