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

Commit 89dfdc96 authored by Jeff Layton's avatar Jeff Layton Committed by J. Bruce Fields
Browse files

nfsd: eliminate cb_minorversion field 



We already have that info in the client pointer. No need to pass around
a copy.

Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 1983a66f

fs/nfsd/nfs4callback.c

+3 −4
Original line number Diff line number Diff line
@@ -448,7 +448,7 @@ static int decode_cb_sequence4res(struct xdr_stream *xdr, 
{

	int status;



	if (cb->cb_minorversion == 0)

	if (cb->cb_clp->cl_minorversion == 0)

		return 0;



	status = decode_cb_op_status(xdr, OP_CB_SEQUENCE, &cb->cb_seq_status);
@@ -485,7 +485,7 @@ static void nfs4_xdr_enc_cb_recall(struct rpc_rqst *req, struct xdr_stream *xdr, 
	const struct nfs4_delegation *dp = cb_to_delegation(cb);

	struct nfs4_cb_compound_hdr hdr = {

		.ident = cb->cb_clp->cl_cb_ident,

		.minorversion = cb->cb_minorversion,

		.minorversion = cb->cb_clp->cl_minorversion,

	};



	encode_cb_compound4args(xdr, &hdr);
@@ -594,7 +594,7 @@ static void nfs4_xdr_enc_cb_layout(struct rpc_rqst *req, 
		container_of(cb, struct nfs4_layout_stateid, ls_recall);

	struct nfs4_cb_compound_hdr hdr = {

		.ident = 0,

		.minorversion = cb->cb_minorversion,

		.minorversion = cb->cb_clp->cl_minorversion,

	};



	encode_cb_compound4args(xdr, &hdr);
@@ -862,7 +862,6 @@ static void nfsd4_cb_prepare(struct rpc_task *task, void *calldata) 
	struct nfs4_client *clp = cb->cb_clp;

	u32 minorversion = clp->cl_minorversion;



	cb->cb_minorversion = minorversion;

	/*

	 * cb_seq_status is only set in decode_cb_sequence4res,

	 * and so will remain 1 if an rpc level failure occurs.

fs/nfsd/state.h

+0 −1
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ typedef struct { 


struct nfsd4_callback {

	struct nfs4_client *cb_clp;

	u32 cb_minorversion;

	struct rpc_message cb_msg;

	const struct nfsd4_callback_ops *cb_ops;

	struct work_struct cb_work;