diff options
| author | Al Viro | 2012-03-30 20:04:16 +0200 |
|---|---|---|
| committer | Al Viro | 2012-03-31 22:03:16 +0200 |
| commit | 3f6c7c71a2af6eb306e16562c6ee1bfdb48015fb (patch) | |
| tree | 11a45a75c858894fcfdbf40e320d860d7f28c166 | |
| parent | vfs: move MAY_EXEC check from __lookup_hash() (diff) | |
| download | kernel-qcow2-linux-3f6c7c71a2af6eb306e16562c6ee1bfdb48015fb.tar.gz kernel-qcow2-linux-3f6c7c71a2af6eb306e16562c6ee1bfdb48015fb.tar.xz kernel-qcow2-linux-3f6c7c71a2af6eb306e16562c6ee1bfdb48015fb.zip | |
untangling do_lookup() - isolate !dentry stuff from the rest of it.
Duplicate the revalidation-related parts into if (!dentry) branch.
Next step will be to pull them under i_mutex.
This and the next 8 commits are more or less a splitup of patch
by Miklos; folks, when you are working with something that convoluted,
carve your patches up into easily reviewed steps, especially when
a lot of codepaths involved are rarely hit...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | fs/namei.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/fs/namei.c b/fs/namei.c index 907e24785576..157f3debbf98 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1194,6 +1194,21 @@ retry: status = 1; } mutex_unlock(&dir->i_mutex); + if (unlikely(dentry->d_flags & DCACHE_OP_REVALIDATE) && need_reval) + status = d_revalidate(dentry, nd); + if (unlikely(status <= 0)) { + if (status < 0) { + dput(dentry); + return status; + } + if (!d_invalidate(dentry)) { + dput(dentry); + dentry = NULL; + need_reval = 1; + goto retry; + } + } + goto done; } if (unlikely(dentry->d_flags & DCACHE_OP_REVALIDATE) && need_reval) status = d_revalidate(dentry, nd); @@ -1209,7 +1224,7 @@ retry: goto retry; } } - +done: path->mnt = mnt; path->dentry = dentry; err = follow_managed(path, nd->flags); |