diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2011-03-09 06:17:27 +0100 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-03-14 14:15:26 +0100 |
| commit | 9b44f1b3928b6f41532c9a1dc9a6fc665989ad5b (patch) | |
| tree | ffa1a492cc767c3c3e561c206131fa1762747833 /fs/namei.c | |
| parent | expand finish_open() in its only caller (diff) | |
| download | linux-9b44f1b3928b6f41532c9a1dc9a6fc665989ad5b.tar.xz linux-9b44f1b3928b6f41532c9a1dc9a6fc665989ad5b.zip | |
move may_open() from __open_name_create() to do_last()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to '')
| -rw-r--r-- | fs/namei.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/fs/namei.c b/fs/namei.c index 1f561dc495a1..def63e7c058d 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -2069,11 +2069,7 @@ out_unlock: mutex_unlock(&dir->d_inode->i_mutex); dput(nd->path.dentry); nd->path.dentry = path->dentry; - - if (error) - return error; - /* Don't check for write permission, don't truncate */ - return may_open(&nd->path, 0, open_flag & ~O_TRUNC); + return error; } /* @@ -2239,6 +2235,12 @@ static struct file *do_last(struct nameidata *nd, struct path *path, mnt_drop_write(nd->path.mnt); goto exit; } + /* Don't check for write permission, don't truncate */ + error = may_open(&nd->path, 0, op->open_flag & ~O_TRUNC); + if (error) { + mnt_drop_write(nd->path.mnt); + goto exit; + } filp = nameidata_to_filp(nd); mnt_drop_write(nd->path.mnt); path_put(&nd->path); |