aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/cgroup.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-01-14 12:08:29 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-14 12:08:29 -0500
commitacda4721ae876dedab3fef04bbd8020bfa67ff0a (patch)
treeec48d554fe48b3915912e2ae62bc962ade0553bd /kernel/cgroup.c
parent822e5215f9eef86c1dd56d5696bf55a212b0e3f0 (diff)
parent32385c7cf60a78375b63afc4f02001df84dfd1a0 (diff)
Merge branch 'vfs-scale-working' of git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin
* 'vfs-scale-working' of git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin: kernel: fix hlist_bl again cgroups: Fix a lockdep warning at cgroup removal fs: namei fix ->put_link on wrong inode in do_filp_open
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 ffb7bbad0638..b24d7027b83c 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -916,7 +916,7 @@ static void cgroup_d_remove_dir(struct dentry *dentry)
916 916
917 parent = dentry->d_parent; 917 parent = dentry->d_parent;
918 spin_lock(&parent->d_lock); 918 spin_lock(&parent->d_lock);
919 spin_lock(&dentry->d_lock); 919 spin_lock_nested(&dentry->d_lock, DENTRY_D_LOCK_NESTED);
920 list_del_init(&dentry->d_u.d_child); 920 list_del_init(&dentry->d_u.d_child);
921 spin_unlock(&dentry->d_lock); 921 spin_unlock(&dentry->d_lock);
922 spin_unlock(&parent->d_lock); 922 spin_unlock(&parent->d_lock);