diff options
Diffstat (limited to 'fs/nfsd/vfs.c')
-rw-r--r-- | fs/nfsd/vfs.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 31d32aeda2c2..3458a8f596f1 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c | |||
@@ -2052,7 +2052,6 @@ nfsd_permission(struct svc_rqst *rqstp, struct svc_export *exp, | |||
2052 | struct dentry *dentry, int acc) | 2052 | struct dentry *dentry, int acc) |
2053 | { | 2053 | { |
2054 | struct inode *inode = dentry->d_inode; | 2054 | struct inode *inode = dentry->d_inode; |
2055 | struct path path; | ||
2056 | int err; | 2055 | int err; |
2057 | 2056 | ||
2058 | if (acc == NFSD_MAY_NOP) | 2057 | if (acc == NFSD_MAY_NOP) |
@@ -2125,15 +2124,7 @@ nfsd_permission(struct svc_rqst *rqstp, struct svc_export *exp, | |||
2125 | if (err == -EACCES && S_ISREG(inode->i_mode) && | 2124 | if (err == -EACCES && S_ISREG(inode->i_mode) && |
2126 | acc == (NFSD_MAY_READ | NFSD_MAY_OWNER_OVERRIDE)) | 2125 | acc == (NFSD_MAY_READ | NFSD_MAY_OWNER_OVERRIDE)) |
2127 | err = inode_permission(inode, MAY_EXEC); | 2126 | err = inode_permission(inode, MAY_EXEC); |
2128 | if (err) | ||
2129 | goto nfsd_out; | ||
2130 | 2127 | ||
2131 | /* Do integrity (permission) checking now, but defer incrementing | ||
2132 | * IMA counts to the actual file open. | ||
2133 | */ | ||
2134 | path.mnt = exp->ex_path.mnt; | ||
2135 | path.dentry = dentry; | ||
2136 | nfsd_out: | ||
2137 | return err? nfserrno(err) : 0; | 2128 | return err? nfserrno(err) : 0; |
2138 | } | 2129 | } |
2139 | 2130 | ||