summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2009-12-26 07:09:49 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2010-03-05 09:01:35 -0500
commit10fa8e62f2bc33c452516585911f151d88389e4c (patch)
tree9a69dd68ffdf419cd6391f198ff40ac0943b9a35 /fs
parent9e67f36169117e07daf16dc7ca314f1db9e2050a (diff)
Unify exits in O_CREAT handling
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
-rw-r--r--fs/namei.c30
1 files changed, 13 insertions, 17 deletions
diff --git a/fs/namei.c b/fs/namei.c
index b0c74fe91fb0..675a712137f1 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1821,9 +1821,8 @@ reval:
nd.flags |= LOOKUP_REVAL;
error = path_walk(pathname, &nd);
if (error) {
- if (nd.root.mnt)
- path_put(&nd.root);
- return ERR_PTR(error);
+ filp = ERR_PTR(error);
+ goto out;
}
if (unlikely(!audit_dummy_context()))
audit_inode(pathname, nd.path.dentry);
@@ -1847,9 +1846,7 @@ reval:
filp = do_last(&nd, &path, open_flag, acc_mode, mode, pathname);
if (!filp)
goto do_link;
- if (nd.root.mnt)
- path_put(&nd.root);
- return filp;
+ goto out;
exit_dput:
path_put_conditional(&path, &nd);
@@ -1857,9 +1854,15 @@ exit_dput:
release_open_intent(&nd);
exit_parent:
path_put(&nd.path);
+ filp = ERR_PTR(error);
+out:
if (nd.root.mnt)
path_put(&nd.root);
- return ERR_PTR(error);
+ if (filp == ERR_PTR(-ESTALE) && !force_reval) {
+ force_reval = 1;
+ goto reval;
+ }
+ return filp;
do_link:
error = -ELOOP;
@@ -1887,13 +1890,8 @@ do_link:
* with "intent.open".
*/
release_open_intent(&nd);
- if (nd.root.mnt)
- path_put(&nd.root);
- if (error == -ESTALE && !force_reval) {
- force_reval = 1;
- goto reval;
- }
- return ERR_PTR(error);
+ filp = ERR_PTR(error);
+ goto out;
}
nd.flags &= ~LOOKUP_PARENT;
filp = do_last(&nd, &path, open_flag, acc_mode, mode, pathname);
@@ -1901,9 +1899,7 @@ do_link:
__putname(nd.last.name);
if (!filp)
goto do_link;
- if (nd.root.mnt)
- path_put(&nd.root);
- return filp;
+ goto out;
}
/**