From: Linus Torvalds Date: Sat, 31 May 2014 16:13:21 +0000 (-0700) Subject: dcache: add missing lockdep annotation X-Git-Tag: accepted/tizen/common/20141203.182822~94^2~24 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9f12600fe425bc28f0ccba034a77783c09c15af4;p=platform%2Fkernel%2Flinux-arm64.git 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 046b961b45f9 ("shrink_dentry_list(): take parent's ->d_lock earlier"). Reported-and-tested-by: Josh Boyer Cc: Al Viro Signed-off-by: Linus Torvalds --- diff --git a/fs/dcache.c b/fs/dcache.c index bce851d..be2bea8 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -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;