Patch "dcache: add missing lockdep annotation" has been added to the 3.14-stable tree

This is a note to let you know that I've just added the patch titled

dcache: add missing lockdep annotation

to the 3.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
dcache-add-missing-lockdep-annotation.patch
and it can be found in the queue-3.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Linus Torvalds <[email protected]>
Date: Sat, 31 May 2014 09:13:21 -0700
Subject: dcache: add missing lockdep annotation

From: Linus Torvalds <[email protected]>

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").

---
 fs/dcache.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

@@ -551,7 +551,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;

Patches currently in stable-queue which might be from [email protected] are

queue-3.14/dcache-add-missing-lockdep-annotation.patch queue-3.14/unix-correctly-track-in-flight-fds-in-sending-process-user_struct.patch