From mboxrd@z Thu Jan 1 00:00:00 1970 From: Cong Wang Subject: [Patch 3.14 stable 15/16] dcache: add missing lockdep annotation Date: Thu, 6 Nov 2014 11:37:19 -0800 Message-ID: <1415302640-5876-16-git-send-email-xiyou.wangcong@gmail.com> References: <1415302640-5876-1-git-send-email-xiyou.wangcong@gmail.com> Cc: viro@zeniv.linux.org.uk, gregkh@linuxfoundation.org, linux-fsdevel@vger.kernel.org, Linus Torvalds To: stable@vger.kernel.org Return-path: Received: from mail-pd0-f177.google.com ([209.85.192.177]:52319 "EHLO mail-pd0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751437AbaKFTiA (ORCPT ); Thu, 6 Nov 2014 14:38:00 -0500 In-Reply-To: <1415302640-5876-1-git-send-email-xiyou.wangcong@gmail.com> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: From: Linus Torvalds 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 Cc: Al Viro Signed-off-by: Linus Torvalds (cherry picked from commit 9f12600fe425bc28f0ccba034a77783c09c15af4) --- fs/dcache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/dcache.c b/fs/dcache.c index bb72e82..c0f89ea 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -552,7 +552,7 @@ static inline struct dentry *lock_parent(struct dentry *dentry) } 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; -- 1.8.3.1