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: Miklos Szeredi <mszeredi@suse.cz> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
parent
37d7fffc9c
commit
b6183df7b2
1 changed files with 17 additions and 16 deletions
33
fs/namei.c
33
fs/namei.c
|
@ -2274,23 +2274,24 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
|
|||
inode = path->dentry->d_inode;
|
||||
}
|
||||
goto finish_lookup;
|
||||
} else {
|
||||
/* create side of things */
|
||||
/*
|
||||
* This will *only* deal with leaving RCU mode - LOOKUP_JUMPED
|
||||
* has been cleared when we got to the last component we are
|
||||
* about to look up
|
||||
*/
|
||||
error = complete_walk(nd);
|
||||
if (error)
|
||||
return ERR_PTR(error);
|
||||
|
||||
audit_inode(pathname, dir);
|
||||
error = -EISDIR;
|
||||
/* trailing slashes? */
|
||||
if (nd->last.name[nd->last.len])
|
||||
goto exit;
|
||||
}
|
||||
|
||||
/* create side of things */
|
||||
/*
|
||||
* This will *only* deal with leaving RCU mode - LOOKUP_JUMPED has been
|
||||
* cleared when we got to the last component we are about to look up
|
||||
*/
|
||||
error = complete_walk(nd);
|
||||
if (error)
|
||||
return ERR_PTR(error);
|
||||
|
||||
audit_inode(pathname, dir);
|
||||
error = -EISDIR;
|
||||
/* trailing slashes? */
|
||||
if (nd->last.name[nd->last.len])
|
||||
goto exit;
|
||||
|
||||
retry_lookup:
|
||||
mutex_lock(&dir->d_inode->i_mutex);
|
||||
|
||||
|
@ -2305,7 +2306,7 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
|
|||
path->mnt = nd->path.mnt;
|
||||
|
||||
/* Negative dentry, just create the file */
|
||||
if (!dentry->d_inode) {
|
||||
if (!dentry->d_inode && (open_flag & O_CREAT)) {
|
||||
umode_t mode = op->mode;
|
||||
if (!IS_POSIXACL(dir->d_inode))
|
||||
mode &= ~current_umask();
|
||||
|
|
Loading…
Reference in a new issue