diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-03 10:34:36 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-03 10:34:36 +0200 |
| commit | b5259d944279d0b7e78a83849a352d8ba0447c4c (patch) | |
| tree | 42f0e7dc404bc776f9a736c17f52c121da166fc1 /fs/dcache.c | |
| parent | 1c50b728c3e734150b8a4a8310ce3e01bc5c70be (diff) | |
| parent | 94aca1dac6f6d21f4b07e4864baf7768cabcc6e7 (diff) | |
| download | blackbird-op-linux-b5259d944279d0b7e78a83849a352d8ba0447c4c.tar.gz blackbird-op-linux-b5259d944279d0b7e78a83849a352d8ba0447c4c.zip | |
Merge commit 'v2.6.27-rc8' into core/rcu
Diffstat (limited to 'fs/dcache.c')
| -rw-r--r-- | fs/dcache.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/fs/dcache.c b/fs/dcache.c index 80e93956aced..e7a1a99b7464 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -1395,6 +1395,10 @@ struct dentry * __d_lookup(struct dentry * parent, struct qstr * name) if (dentry->d_parent != parent) goto next; + /* non-existing due to RCU? */ + if (d_unhashed(dentry)) + goto next; + /* * It is safe to compare names since d_move() cannot * change the qstr (protected by d_lock). @@ -1410,10 +1414,8 @@ struct dentry * __d_lookup(struct dentry * parent, struct qstr * name) goto next; } - if (!d_unhashed(dentry)) { - atomic_inc(&dentry->d_count); - found = dentry; - } + atomic_inc(&dentry->d_count); + found = dentry; spin_unlock(&dentry->d_lock); break; next: |
