diff options
| author | Linus Torvalds | 2014-05-31 18:13:21 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2014-05-31 18:13:21 +0200 |
| commit | 9f12600fe425bc28f0ccba034a77783c09c15af4 (patch) | |
| tree | 4986536b92acab05e0ea3faf39f12cdcb573ee0f /fs/dcache.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto... (diff) | |
| download | kernel-qcow2-linux-9f12600fe425bc28f0ccba034a77783c09c15af4.tar.gz kernel-qcow2-linux-9f12600fe425bc28f0ccba034a77783c09c15af4.tar.xz kernel-qcow2-linux-9f12600fe425bc28f0ccba034a77783c09c15af4.zip | |
dcache: add missing lockdep annotation
lock_parent() very much on purpose does nested locking of dentries, and
is careful to maintain the right order (lock parent first). But because
it didn't annotate the nested locking order, lockdep thought it might be
a deadlock on d_lock, and complained.
Add the proper annotation for the inner locking of the child dentry to
make lockdep happy.
Introduced by commit 046b961b45f9 ("shrink_dentry_list(): take parent's
->d_lock earlier").
Reported-and-tested-by: Josh Boyer <jwboyer@fedoraproject.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/dcache.c')
| -rw-r--r-- | fs/dcache.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/dcache.c b/fs/dcache.c index bce851dc03ef..be2bea834bf4 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -553,7 +553,7 @@ again: } rcu_read_unlock(); if (parent != dentry) - spin_lock(&dentry->d_lock); + spin_lock_nested(&dentry->d_lock, DENTRY_D_LOCK_NESTED); else parent = NULL; return parent; |