Permalink
Browse files

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 <davej@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information...
1 parent c23ddf7 commit 2e321806b681b1920b6dfa7d81bbe3d312fe1d19 @torvalds committed May 22, 2012
Showing with 2 additions and 0 deletions.
  1. +2 −0 fs/dcache.c
View
@@ -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)) {

0 comments on commit 2e32180

Please sign in to comment.