Revert "vfs: remove unnecessary d_unhashed() check from __d_lookup_rcu"

This reverts commit 8c01a52. It turns out the d_unhashed() check isn't unnecessary after all: while it's true that unhashing will increment the sequence numbers, that does not necessarily invalidate the RCU lookup, because it might have seen the dentry pointer (before it got unhashed), but by the time it loaded the sequence number, it could have seen the *new* sequence number (after it got unhashed). End result: we might look up an unhashed dentry that is about to be freed, with the sequence number never indicating anything bad about it. So checking that the dentry is still hashed (*after* reading the sequence number) is indeed the proper fix, and was never unnecessary. Reported-by: Dave Jones <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
mna · May 22, 2012 · 2e32180 · 2e32180
1 parent c23ddf7
commit 2e32180
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/fs/dcache.c b/fs/dcache.c
@@ -1877,6 +1877,8 @@ struct dentry *__d_lookup_rcu(const struct dentry *parent,
 		seq = raw_seqcount_begin(&dentry->d_seq);
 		if (dentry->d_parent != parent)
 			continue;
+		if (d_unhashed(dentry))
+			continue;
 		*seqp = seq;
 
 		if (unlikely(parent->d_flags & DCACHE_OP_COMPARE)) {