]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
dcache: add missing lockdep annotation
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 31 May 2014 16:13:21 +0000 (09:13 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 3 Mar 2016 23:06:46 +0000 (15:06 -0800)
commit001869c34bdefa35f021f2633ed37122cfd3aa2d
treed6b9cb0ace986259bd755c1b857b2db005118019
parentb004c3a7f5ee27001a39892874c733d23b7ecbc6
dcache: add missing lockdep annotation

commit 9f12600fe425bc28f0ccba034a77783c09c15af4 upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/dcache.c