summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2006-08-22 20:06:04 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2006-08-24 15:55:16 -0400
commita969fd5a4e162c4485ae8f3e49d674656a18fa36 (patch)
treeb0b61e40b0bda116e41f2a451666715caed2c263
parent9167b0b9a0ab7907191523f5a0528e3b9c288e21 (diff)
downloadlinux-a969fd5a4e162c4485ae8f3e49d674656a18fa36.tar.gz
linux-a969fd5a4e162c4485ae8f3e49d674656a18fa36.tar.bz2
linux-a969fd5a4e162c4485ae8f3e49d674656a18fa36.zip
VFS: Remove redundant open-coded mode bit checks in open_exec().
The check in open_exec() for inode->i_mode & 0111 has been made redundant by the fix to permission(). Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com> (cherry picked from 1d3741c5d991686699f100b65b9956f7ee7ae0ae commit)
-rw-r--r--fs/exec.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/exec.c b/fs/exec.c
index a6f64a98ac50..f7aabfeca033 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -486,8 +486,6 @@ struct file *open_exec(const char *name)
if (!(nd.mnt->mnt_flags & MNT_NOEXEC) &&
S_ISREG(inode->i_mode)) {
int err = vfs_permission(&nd, MAY_EXEC);
- if (!err && !(inode->i_mode & 0111))
- err = -EACCES;
file = ERR_PTR(err);
if (!err) {
file = nameidata_to_filp(&nd, O_RDONLY);