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/nfs/dir.c | |
| parent | 97431204ea005ec8070ac94bc3251e836daa7ca7 (diff) | |
| download | linux-5948a401a7f06d67f8548651041e00fd1aafcaf9.tar.bz2 | |
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/nfs/dir.c')
| -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) case S_IFLNK: goto out; case S_IFREG: - /* NFSv4 has atomic_open... */ - if (nfs_server_capable(inode, NFS_CAP_ATOMIC_OPEN) - && (mask & MAY_OPEN) - && !(mask & MAY_EXEC)) - goto out; break; case S_IFDIR: /* |