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

Commit 3ecefc92 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4: Don't request close-to-open attribute when holding a delegation 



If holding a delegation, we do not need to ask the server to return
close-to-open cache consistency attributes as part of the CLOSE
compound.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 3947b74d

fs/nfs/nfs4proc.c

+8 −2
Original line number Diff line number Diff line
@@ -3156,8 +3156,15 @@ static void nfs4_close_prepare(struct rpc_task *task, void *data) 
		goto out_wait;

	}



	if (calldata->arg.fmode == 0)

	if (calldata->arg.fmode == 0) {

		task->tk_msg.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_CLOSE];



		/* Close-to-open cache consistency revalidation */

		if (!nfs4_have_delegation(inode, FMODE_READ))

			calldata->arg.bitmask = NFS_SERVER(inode)->cache_consistency_bitmask;

		else

			calldata->arg.bitmask = NULL;

	}

	if (calldata->roc)

		pnfs_roc_get_barrier(inode, &calldata->roc_barrier);
@@ -3240,7 +3247,6 @@ int nfs4_do_close(struct nfs4_state *state, gfp_t gfp_mask, int wait) 
	if (IS_ERR(calldata->arg.seqid))

		goto out_free_calldata;

	calldata->arg.fmode = 0;

	calldata->arg.bitmask = server->cache_consistency_bitmask;

	calldata->res.fattr = &calldata->fattr;

	calldata->res.seqid = calldata->arg.seqid;

	calldata->res.server = server;

fs/nfs/nfs4xdr.c

+2 −1
Original line number Diff line number Diff line
@@ -2248,6 +2248,7 @@ static void nfs4_xdr_enc_close(struct rpc_rqst *req, struct xdr_stream *xdr, 
	encode_sequence(xdr, &args->seq_args, &hdr);

	encode_putfh(xdr, args->fh, &hdr);

	encode_close(xdr, args, &hdr);

	if (args->bitmask != NULL)

		encode_getfattr(xdr, args->bitmask, &hdr);

	encode_nops(&hdr);

}