From 887c7e4548a9559a5f722f94216292bc4e5c8861 Mon Sep 17 00:00:00 2001
From: Li Zefan <lizf@cn.fujitsu.com>
Date: Tue, 2 Feb 2010 13:44:10 -0800
Subject: [PATCH] --- yaml --- r: 180178 b: refs/heads/master c:
 4528fd0595847c2078b59f24800e751c2d6b7e41 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 196a638cf9b3..34a6e22ecb3f 100644
--- 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
index 1fbcc748044a..aa3bee566446 100644
--- 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. */
 	}