Procházet zdrojové kódy

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 <jwboyer@fedoraproject.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Linus Torvalds před 11 roky
rodič
revize
9f12600fe4
1 změnil soubory, kde provedl 1 přidání a 1 odebrání
  1. 1 1
      fs/dcache.c

+ 1 - 1
fs/dcache.c

@@ -553,7 +553,7 @@ static inline struct dentry *lock_parent(struct dentry *dentry)
 	}
 	}
 	rcu_read_unlock();
 	rcu_read_unlock();
 	if (parent != dentry)
 	if (parent != dentry)
-		spin_lock(&dentry->d_lock);
+		spin_lock_nested(&dentry->d_lock, DENTRY_D_LOCK_NESTED);
 	else
 	else
 		parent = NULL;
 		parent = NULL;
 	return parent;
 	return parent;