diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-08-20 12:29:27 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-08-20 12:29:27 -0400 |
commit | 5948a401a7f06d67f8548651041e00fd1aafcaf9 (patch) | |
tree | fcdc35d085fdd7c227066449990a369629963e18 /fs | |
parent | 97431204ea005ec8070ac94bc3251e836daa7ca7 (diff) |
NFS: Remove the NFSv4 "open optimisation" from nfs_permission
Ever since commit 6168f62cb (Add ACCESS operation to OPEN compound)
the NFSv4 atomic open has primed the access cache, and so nfs_permission
will no longer do an RPC call on the wire.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/nfs/dir.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index 39e69d47cd0b..5d737bd52288 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c | |||
@@ -2245,11 +2245,6 @@ int nfs_permission(struct inode *inode, int mask) | |||
2245 | case S_IFLNK: | 2245 | case S_IFLNK: |
2246 | goto out; | 2246 | goto out; |
2247 | case S_IFREG: | 2247 | case S_IFREG: |
2248 | /* NFSv4 has atomic_open... */ | ||
2249 | if (nfs_server_capable(inode, NFS_CAP_ATOMIC_OPEN) | ||
2250 | && (mask & MAY_OPEN) | ||
2251 | && !(mask & MAY_EXEC)) | ||
2252 | goto out; | ||
2253 | break; | 2248 | break; |
2254 | case S_IFDIR: | 2249 | case S_IFDIR: |
2255 | /* | 2250 | /* |