Commit 9f12600f authored May 31, 2014 by Linus Torvalds

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 046b961b ("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>

parent 1487385e

fs/dcache.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

Admin message