From: Li Zefan <lizf@cn.fujitsu.com>
Date: Fri, 14 Jan 2011 03:34:34 +0000 (+0800)
Subject: cgroups: Fix a lockdep warning at cgroup removal
X-Git-Tag: upstream/snapshot3+hdmi~11725^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3ec762ad8be364c2fadfe0d6b2cc6d4d3b5e1b54;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

cgroups: Fix a lockdep warning at cgroup removal

Commit 2fd6b7f5 ("fs: dcache scale subdirs") forgot to annotate a dentry
lock, which caused a lockdep warning.

Reported-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
---

diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 51cddc1..a7837e2 100644
--- a/kernel/cgroup.c
+++ b/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);