From 4afa29cd7fd70af61485d08b5cd12caeeb5423c8 Mon Sep 17 00:00:00 2001
From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Date: Thu, 29 Jan 2009 14:25:10 -0800
Subject: [PATCH] --- yaml --- r: 130380 b: refs/heads/master c:
 baef99a08a2e23d9386b47e53fa5f0d44fc98f66 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 42f6de612d5e..753a052d5dd1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9e9e3cbc62da43c66e894d5a61fa08b427e25202
+refs/heads/master: baef99a08a2e23d9386b47e53fa5f0d44fc98f66
diff --git a/trunk/kernel/cgroup.c b/trunk/kernel/cgroup.c
index c29831076e7a..2ae7cb47dbfa 100644
--- a/trunk/kernel/cgroup.c
+++ b/trunk/kernel/cgroup.c
@@ -2434,7 +2434,9 @@ static long cgroup_create(struct cgroup *parent, struct dentry *dentry,
 
  err_remove:
 
+	cgroup_lock_hierarchy(root);
 	list_del(&cgrp->sibling);
+	cgroup_unlock_hierarchy(root);
 	root->number_of_cgroups--;
 
  err_destroy: