From d57e797c0150e3b86a6c3be9b78ac1c48c2761c6 Mon Sep 17 00:00:00 2001
From: Li Zefan <lizf@cn.fujitsu.com>
Date: Fri, 14 Jan 2011 11:34:34 +0800
Subject: [PATCH] --- yaml --- r: 231038 b: refs/heads/master c:
 3ec762ad8be364c2fadfe0d6b2cc6d4d3b5e1b54 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index e0c43b281c6e..32f8d8a0aad4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b9337aaf98f9941d0927a75217d3ff31afec609
+refs/heads/master: 3ec762ad8be364c2fadfe0d6b2cc6d4d3b5e1b54
diff --git a/trunk/kernel/cgroup.c b/trunk/kernel/cgroup.c
index 51cddc11cd85..a7837e2d9d6b 100644
--- a/trunk/kernel/cgroup.c
+++ b/trunk/kernel/cgroup.c
@@ -912,7 +912,7 @@ static void cgroup_d_remove_dir(struct dentry *dentry)
 
 	parent = dentry->d_parent;
 	spin_lock(&parent->d_lock);
-	spin_lock(&dentry->d_lock);
+	spin_lock_nested(&dentry->d_lock, DENTRY_D_LOCK_NESTED);
 	list_del_init(&dentry->d_u.d_child);
 	spin_unlock(&dentry->d_lock);
 	spin_unlock(&parent->d_lock);