summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-03-30 14:37:42 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2012-03-31 16:03:16 -0400
commitec335e91a4f088d8759c1311d0724e609d1c318e (patch)
tree43163e92febda81023fcee742a9667f34ef39063
parentd774a058d94d6b0dafada2295ec5221481b07d16 (diff)
downloadop-kernel-dev-ec335e91a4f088d8759c1311d0724e609d1c318e.zip
op-kernel-dev-ec335e91a4f088d8759c1311d0724e609d1c318e.tar.gz
untangling do_lookup() - merge failure exits in !dentry case
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--fs/namei.c23
1 files changed, 8 insertions, 15 deletions
diff --git a/fs/namei.c b/fs/namei.c
index 5414438..a0f9a02 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1176,35 +1176,28 @@ retry:
dentry = d_lookup(parent, name);
if (dentry && d_need_lookup(dentry)) {
dentry = d_inode_lookup(parent, dentry, nd);
- if (IS_ERR(dentry)) {
- mutex_unlock(&dir->i_mutex);
- return PTR_ERR(dentry);
- }
- } else if (dentry && (dentry->d_flags & DCACHE_OP_REVALIDATE)) {
+ goto l;
+ }
+ if (dentry && (dentry->d_flags & DCACHE_OP_REVALIDATE)) {
status = d_revalidate(dentry, nd);
if (unlikely(status <= 0)) {
if (status < 0) {
- mutex_unlock(&dir->i_mutex);
dput(dentry);
- return status;
+ dentry = ERR_PTR(status);
+ goto l;
}
if (!d_invalidate(dentry)) {
dput(dentry);
dentry = d_alloc_and_lookup(parent, name, nd);
- if (IS_ERR(dentry)) {
- mutex_unlock(&dir->i_mutex);
- return PTR_ERR(dentry);
- }
}
}
} else if (!dentry) {
dentry = d_alloc_and_lookup(parent, name, nd);
- if (IS_ERR(dentry)) {
- mutex_unlock(&dir->i_mutex);
- return PTR_ERR(dentry);
- }
}
+ l:
mutex_unlock(&dir->i_mutex);
+ if (IS_ERR(dentry))
+ return PTR_ERR(dentry);
goto done;
}
if (unlikely(dentry->d_flags & DCACHE_OP_REVALIDATE) && need_reval)
OpenPOWER on IntegriCloud