diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2009-12-26 07:01:01 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-03-05 09:01:31 -0500 |
| commit | 67ee3ad21d0d0b2cc0b70708de8aed860fadda44 (patch) | |
| tree | 842c575f8d7c06b4ebca8c418270da7207359767 /fs | |
| parent | 4296e2cbf2138b5831b83f03e81de916ce1a967d (diff) | |
Pull handling of LAST_BIND into do_last(), clean up ok: part in do_filp_open()
Note that in case of !O_CREAT we know that nd.root has already been given up
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/namei.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/fs/namei.c b/fs/namei.c index f5e4397dcd7..0b4d19d47e6 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1656,6 +1656,9 @@ static struct file *do_last(struct nameidata *nd, struct path *path, *is_link = 0; + if (nd->last_type == LAST_BIND) + goto ok; + error = -EISDIR; if (nd->last_type != LAST_NORM || nd->last.name[nd->last.len]) goto exit; @@ -1733,6 +1736,7 @@ static struct file *do_last(struct nameidata *nd, struct path *path, error = -EISDIR; if (S_ISDIR(path->dentry->d_inode->i_mode)) goto exit; +ok: filp = finish_open(nd, open_flag, acc_mode); return filp; @@ -1808,7 +1812,7 @@ struct file *do_filp_open(int dfd, const char *pathname, release_open_intent(&nd); if (error) return ERR_PTR(error); - goto ok; + return finish_open(&nd, open_flag, acc_mode); } /* @@ -1853,21 +1857,14 @@ reval: path_put(&nd.root); return filp; -ok: - filp = finish_open(&nd, open_flag, acc_mode); - if (nd.root.mnt) - path_put(&nd.root); - return filp; - exit_dput: path_put_conditional(&path, &nd); -exit: if (!IS_ERR(nd.intent.open.file)) release_open_intent(&nd); exit_parent: + path_put(&nd.path); if (nd.root.mnt) path_put(&nd.root); - path_put(&nd.path); return ERR_PTR(error); do_link: @@ -1905,8 +1902,6 @@ do_link: return ERR_PTR(error); } nd.flags &= ~LOOKUP_PARENT; - if (nd.last_type == LAST_BIND) - goto ok; filp = do_last(&nd, &path, open_flag, acc_mode, mode, pathname, &is_link); if (nd.last_type == LAST_NORM) |