summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2011-03-09 00:17:27 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2011-03-14 09:15:26 -0400
commit9b44f1b3928b6f41532c9a1dc9a6fc665989ad5b (patch)
treeffa1a492cc767c3c3e561c206131fa1762747833
parent0f9d1a10c341020617e5b1c7f9c16f6a070438ec (diff)
downloadop-kernel-dev-9b44f1b3928b6f41532c9a1dc9a6fc665989ad5b.zip
op-kernel-dev-9b44f1b3928b6f41532c9a1dc9a6fc665989ad5b.tar.gz
move may_open() from __open_name_create() to do_last()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--fs/namei.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/fs/namei.c b/fs/namei.c
index 1f561dc..def63e7 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);
OpenPOWER on IntegriCloud