aboutsummaryrefslogtreecommitdiffstats
path: root/fs/dcache.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-05-31 12:13:21 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-05-31 12:13:21 -0400
commit9f12600fe425bc28f0ccba034a77783c09c15af4 (patch)
tree4986536b92acab05e0ea3faf39f12cdcb573ee0f /fs/dcache.c
parent1487385edb55a68a629cf3a30fc04958ad798df1 (diff)
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.c2
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:
553 } 553 }
554 rcu_read_unlock(); 554 rcu_read_unlock();
555 if (parent != dentry) 555 if (parent != dentry)
556 spin_lock(&dentry->d_lock); 556 spin_lock_nested(&dentry->d_lock, DENTRY_D_LOCK_NESTED);
557 else 557 else
558 parent = NULL; 558 parent = NULL;
559 return parent; 559 return parent;