2 files changed, 15 insertions, 4 deletions

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 4b66b0c469cd..6dcbc5defb7a 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -5695,6 +5695,14 @@ static void nfs4_delegreturn_done(struct rpc_task *task, void *calldata)
         case -NFS4ERR_STALE_STATEID:
                 task->tk_status = 0;
                 break;
+        case -NFS4ERR_ACCESS:
+                if (data->args.bitmask) {
+                        data->args.bitmask = NULL;
+                        data->res.fattr = NULL;
+                        task->tk_status = 0;
+                        rpc_restart_call_prepare(task);
+                        return;
+                }
         default:
                 if (nfs4_async_handle_error(task, data->res.server,
                                             NULL, NULL) == -EAGAIN) {
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;