Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ac2b422 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

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: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent f07d4a31

fs/nfs/nfs4proc.c

+8 −0
Original line number Diff line number Diff line
@@ -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) {

fs/nfs/nfs4xdr.c

+7 −4
Original line number Diff line number Diff line
@@ -2705,6 +2705,7 @@ 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);

	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;

	}

	if (res->fattr) {

		status = decode_getfattr(xdr, res->fattr, res->server);

		if (status != 0)

			goto out;

	}

	status = decode_delegreturn(xdr);

out:

	return status;