diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-14 09:08:29 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-14 09:08:29 -0800 |
| commit | acda4721ae876dedab3fef04bbd8020bfa67ff0a (patch) | |
| tree | ec48d554fe48b3915912e2ae62bc962ade0553bd /kernel | |
| parent | 822e5215f9eef86c1dd56d5696bf55a212b0e3f0 (diff) | |
| parent | 32385c7cf60a78375b63afc4f02001df84dfd1a0 (diff) | |
| download | linux-acda4721ae876dedab3fef04bbd8020bfa67ff0a.tar.gz linux-acda4721ae876dedab3fef04bbd8020bfa67ff0a.tar.bz2 linux-acda4721ae876dedab3fef04bbd8020bfa67ff0a.zip | |
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')
| -rw-r--r-- | kernel/cgroup.c | 2 |
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) 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); |