diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-05-29 11:53:29 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-06-06 16:24:41 -0400 |
commit | 1a1a29fa8420e42a760410d9f5b0b51a9eb521eb (patch) | |
tree | 1139c4cef87d1b7462e06433c20ac49278c19119 | |
parent | 9ec2ef53b92fdbb1b5f24af000fc2ba0b18221ea (diff) |
NFSv4: Remove redundant check for FMODE_EXEC in nfs_finish_open
We already check the EXEC access mode in the lower layers.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-rw-r--r-- | fs/nfs/dir.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index e093e73178b7..bf4e5f47d686 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c | |||
@@ -1362,13 +1362,6 @@ static int nfs_finish_open(struct nfs_open_context *ctx, | |||
1362 | ctx->dentry = dget(dentry); | 1362 | ctx->dentry = dget(dentry); |
1363 | } | 1363 | } |
1364 | 1364 | ||
1365 | /* If the open_intent is for execute, we have an extra check to make */ | ||
1366 | if (ctx->mode & FMODE_EXEC) { | ||
1367 | err = nfs_may_open(dentry->d_inode, ctx->cred, open_flags); | ||
1368 | if (err < 0) | ||
1369 | goto out; | ||
1370 | } | ||
1371 | |||
1372 | err = finish_open(file, dentry, do_open, opened); | 1365 | err = finish_open(file, dentry, do_open, opened); |
1373 | if (err) | 1366 | if (err) |
1374 | goto out; | 1367 | goto out; |