]> 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)
committerJiri Slaby <jslaby@suse.cz>
Thu, 30 Oct 2014 21:17:48 +0000 (22:17 +0100)
commit3fc5a7a953bd4cbbb7e0b6c56fa3c8c91a4aa22c
treeca89ca13d82ffc45b216a8cb16dae7b2927fd713
parenta2d9d64978050f5cbf03292fa2656837b4a53918
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: Jiri Slaby <jslaby@suse.cz>
fs/dcache.c