Commit b6183df7 authored by Miklos Szeredi's avatar Miklos Szeredi Committed by Al Viro

vfs: do_last(): separate O_CREAT specific code

Check O_CREAT on the slow lookup paths where necessary.  This allows the rest to
be shared with plain open.
Signed-off-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 37d7fffc
...@@ -2274,22 +2274,23 @@ static struct file *do_last(struct nameidata *nd, struct path *path, ...@@ -2274,22 +2274,23 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
inode = path->dentry->d_inode; inode = path->dentry->d_inode;
} }
goto finish_lookup; goto finish_lookup;
} } else {
/* create side of things */
/* create side of things */ /*
/* * This will *only* deal with leaving RCU mode - LOOKUP_JUMPED
* This will *only* deal with leaving RCU mode - LOOKUP_JUMPED has been * has been cleared when we got to the last component we are
* cleared when we got to the last component we are about to look up * about to look up
*/ */
error = complete_walk(nd); error = complete_walk(nd);
if (error) if (error)
return ERR_PTR(error); return ERR_PTR(error);
audit_inode(pathname, dir); audit_inode(pathname, dir);
error = -EISDIR; error = -EISDIR;
/* trailing slashes? */ /* trailing slashes? */
if (nd->last.name[nd->last.len]) if (nd->last.name[nd->last.len])
goto exit; goto exit;
}
retry_lookup: retry_lookup:
mutex_lock(&dir->d_inode->i_mutex); mutex_lock(&dir->d_inode->i_mutex);
...@@ -2305,7 +2306,7 @@ static struct file *do_last(struct nameidata *nd, struct path *path, ...@@ -2305,7 +2306,7 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
path->mnt = nd->path.mnt; path->mnt = nd->path.mnt;
/* Negative dentry, just create the file */ /* Negative dentry, just create the file */
if (!dentry->d_inode) { if (!dentry->d_inode && (open_flag & O_CREAT)) {
umode_t mode = op->mode; umode_t mode = op->mode;
if (!IS_POSIXACL(dir->d_inode)) if (!IS_POSIXACL(dir->d_inode))
mode &= ~current_umask(); mode &= ~current_umask();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment