From b327cf936efb955a5c435e609cdaa6684d21c8a2 Mon Sep 17 00:00:00 2001
From: Li Zefan <lizf@cn.fujitsu.com>
Date: Thu, 2 Apr 2009 16:57:30 -0700
Subject: [PATCH] --- yaml --- r: 139657 b: refs/heads/master c:
 0670e08bdfc67272f8c3087030417465629b8073 h: refs/heads/master i:   139655:
 dded36818018f1720b9353545a62e5955b5cab15 v: v3

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

diff --git a/[refs] b/[refs]
index 158c44c8075f..fae38693ca64 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 099fca3225b39f7a3ed853036038054172b55581
+refs/heads/master: 0670e08bdfc67272f8c3087030417465629b8073
diff --git a/trunk/kernel/cgroup.c b/trunk/kernel/cgroup.c
index fea11c5c990c..f2a3f5c9936c 100644
--- a/trunk/kernel/cgroup.c
+++ b/trunk/kernel/cgroup.c
@@ -915,10 +915,11 @@ static int cgroup_remount(struct super_block *sb, int *flags, char *data)
 	}
 
 	ret = rebind_subsystems(root, opts.subsys_bits);
+	if (ret)
+		goto out_unlock;
 
 	/* (re)populate subsystem files */
-	if (!ret)
-		cgroup_populate_dir(cgrp);
+	cgroup_populate_dir(cgrp);
 
 	if (opts.release_agent)
 		strcpy(root->release_agent_path, opts.release_agent);