summaryrefslogtreecommitdiff
path: root/kernel/cgroup.c
diff options
context:
space:
mode:
authorLi Zefan <lizf@cn.fujitsu.com>2011-01-14 06:34:34 +0300
committerNick Piggin <npiggin@kernel.dk>2011-01-14 11:46:29 +0300
commit3ec762ad8be364c2fadfe0d6b2cc6d4d3b5e1b54 (patch)
treeabd1529daad510dbf44a6ebcaa1f680b073eaca6 /kernel/cgroup.c
parent7b9337aaf98f9941d0927a75217d3ff31afec609 (diff)
downloadlinux-3ec762ad8be364c2fadfe0d6b2cc6d4d3b5e1b54.tar.xz
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>
Diffstat (limited to 'kernel/cgroup.c')
-rw-r--r--kernel/cgroup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 51cddc11cd85..a7837e2d9d6b 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);