NFSv4: Don't ask for attributes when ACCESS is protected by a delegation

If we hold a delegation, then the results of the ACCESS call are protected
anyway.

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index e5ad2c18692707fe1f079445076d343c835ed27e..924238db5983b927ed1c68d13f9b0b11d11f934b 100644 (file)
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -4055,7 +4055,6 @@ static int _nfs4_proc_access(struct inode *inode, struct nfs_access_entry *entry
        struct nfs_server *server = NFS_SERVER(inode);
        struct nfs4_accessargs args = {
                .fh = NFS_FH(inode),
-               .bitmask = server->cache_consistency_bitmask,
                .access = entry->mask,
        };
        struct nfs4_accessres res = {
@@ -4069,14 +4068,18 @@ static int _nfs4_proc_access(struct inode *inode, struct nfs_access_entry *entry
        };
        int status = 0;
 
-       res.fattr = nfs_alloc_fattr();
-       if (res.fattr == NULL)
-               return -ENOMEM;
+       if (!nfs_have_delegated_attributes(inode)) {
+               res.fattr = nfs_alloc_fattr();
+               if (res.fattr == NULL)
+                       return -ENOMEM;
+               args.bitmask = server->cache_consistency_bitmask;
+       }
 
        status = nfs4_call_sync(server->client, server, &msg, &args.seq_args, &res.seq_res, 0);
        if (!status) {
                nfs_access_set_mask(entry, res.access);
-               nfs_refresh_inode(inode, res.fattr);
+               if (res.fattr)
+                       nfs_refresh_inode(inode, res.fattr);
        }
        nfs_free_fattr(res.fattr);
        return status;

diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
index 79f1774b9d68c603dee6a826197a8b8bccc302ef..51264f5d9d2a072a2c697a94b1f469ee3c75b657 100644 (file)
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
@@ -2102,7 +2102,8 @@ static void nfs4_xdr_enc_access(struct rpc_rqst *req, struct xdr_stream *xdr,
        encode_sequence(xdr, &args->seq_args, &hdr);
        encode_putfh(xdr, args->fh, &hdr);
        encode_access(xdr, args->access, &hdr);
-       encode_getfattr(xdr, args->bitmask, &hdr);
+       if (args->bitmask)
+               encode_getfattr(xdr, args->bitmask, &hdr);
        encode_nops(&hdr);
 }
 
@@ -6236,7 +6237,8 @@ static int nfs4_xdr_dec_access(struct rpc_rqst *rqstp, struct xdr_stream *xdr,
        status = decode_access(xdr, &res->supported, &res->access);
        if (status != 0)
                goto out;
-       decode_getfattr(xdr, res->fattr, res->server);
+       if (res->fattr)
+               decode_getfattr(xdr, res->fattr, res->server);
 out:
        return status;
 }