aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLi Zefan <lizf@cn.fujitsu.com>2011-01-13 22:34:34 -0500
committerNick Piggin <npiggin@kernel.dk>2011-01-14 03:46:29 -0500
commit3ec762ad8be364c2fadfe0d6b2cc6d4d3b5e1b54 (patch)
treeabd1529daad510dbf44a6ebcaa1f680b073eaca6
parent7b9337aaf98f9941d0927a75217d3ff31afec609 (diff)
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>
-rw-r--r--kernel/cgroup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 51cddc11cd8..a7837e2d9d6 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -912,7 +912,7 @@ static void cgroup_d_remove_dir(struct dentry *dentry)
912 912
913 parent = dentry->d_parent; 913 parent = dentry->d_parent;
914 spin_lock(&parent->d_lock); 914 spin_lock(&parent->d_lock);
915 spin_lock(&dentry->d_lock); 915 spin_lock_nested(&dentry->d_lock, DENTRY_D_LOCK_NESTED);
916 list_del_init(&dentry->d_u.d_child); 916 list_del_init(&dentry->d_u.d_child);
917 spin_unlock(&dentry->d_lock); 917 spin_unlock(&dentry->d_lock);
918 spin_unlock(&parent->d_lock); 918 spin_unlock(&parent->d_lock);