From b49ac7f6b76df5f52b447eab8ada758ee120258d Mon Sep 17 00:00:00 2001 From: Al Viro Date: Wed, 9 Mar 2011 00:17:27 -0500 Subject: [PATCH] --- yaml --- r: 234263 b: refs/heads/master c: 9b44f1b3928b6f41532c9a1dc9a6fc665989ad5b h: refs/heads/master i: 234261: 163e3be59e594e2c6aeaa44e8087e4f25e695452 234259: 3f2d6aee4c3a3e22ea56ef0858f3400b50813be5 234255: 2774bbf4cd5aadfae006e9b6939b283c2a9bebf2 v: v3 --- [refs] | 2 +- trunk/fs/namei.c | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 9f9ea70cf5b0..2a1d0a96c901 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0f9d1a10c341020617e5b1c7f9c16f6a070438ec +refs/heads/master: 9b44f1b3928b6f41532c9a1dc9a6fc665989ad5b diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c index 1f561dc495a1..def63e7c058d 100644 --- a/trunk/fs/namei.c +++ b/trunk/fs/namei.c @@ -2069,11 +2069,7 @@ static int __open_namei_create(struct nameidata *nd, struct path *path, 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);