NFSv4: Retry the DELEGRETURN if the embedded GETATTR is rejected with EACCES

If our DELEGRETURN RPC call is rejected with an EACCES call, then we should
remove the GETATTR call from the compound RPC and retry.
This could potentially happen when there is a conflict between an
ACL denying attribute reads and our use of SP4_MACH_CRED.

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

1 files changed, 7 insertions, 4 deletions

diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
index 6f2365b99fb4..e9255cb453e6 100644
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
@@ -2705,7 +2705,8 @@ static void nfs4_xdr_enc_delegreturn(struct rpc_rqst *req,
         encode_putfh(xdr, args->fhandle, &hdr);
         if (args->lr_args)
                 encode_layoutreturn(xdr, args->lr_args, &hdr);
-        encode_getfattr(xdr, args->bitmask, &hdr);
+        if (args->bitmask)
+                encode_getfattr(xdr, args->bitmask, &hdr);
         encode_delegreturn(xdr, args->stateid, &hdr);
         encode_nops(&hdr);
 }
@@ -6972,9 +6973,11 @@ static int nfs4_xdr_dec_delegreturn(struct rpc_rqst *rqstp,
                 if (status)
                         goto out;
         }
-        status = decode_getfattr(xdr, res->fattr, res->server);
-        if (status != 0)
-                goto out;
+        if (res->fattr) {
+                status = decode_getfattr(xdr, res->fattr, res->server);
+                if (status != 0)
+                        goto out;
+        }
         status = decode_delegreturn(xdr);
 out:
         return status;