Commit ef52bff8 authored by Andy Adamson's avatar Andy Adamson Committed by J. Bruce Fields
Browse files

nfsd41: Backchannel: cleanup nfs4.0 callback encode routines 



Mimic the client and prepare to share the back channel xdr with NFSv4.1.
Bump the number of operations in each encode routine, then backfill the
number of operations.

Signed-off-by: default avatarAndy Adamson <andros@netapp.com>
Signed-off-by: default avatarBenny Halevy <bhalevy@panasas.com>
Signed-off-by: default avatarRicardo Labiaga <Ricardo.Labiaga@netapp.com>
Signed-off-by: default avatarBenny Halevy <bhalevy@panasas.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent 6ddbbbfe

fs/nfsd/nfs4callback.c

+16 −8
Original line number Diff line number Diff line
@@ -140,6 +140,7 @@ struct nfs4_cb_compound_hdr { 
	int		status;

	u32		ident;

	u32		nops;

	__be32		*nops_p;

	u32		taglen;

	char		*tag;

};
@@ -201,7 +202,7 @@ nfs_cb_stat_to_errno(int stat) 
 * XDR encode

 */



static int

static void

encode_cb_compound_hdr(struct xdr_stream *xdr, struct nfs4_cb_compound_hdr *hdr)

{

	__be32 * p;
@@ -210,12 +211,18 @@ encode_cb_compound_hdr(struct xdr_stream *xdr, struct nfs4_cb_compound_hdr *hdr) 
	WRITE32(0);            /* tag length is always 0 */

	WRITE32(NFS4_MINOR_VERSION);

	WRITE32(hdr->ident);

	hdr->nops_p = p;

	WRITE32(hdr->nops);

	return 0;

}



static int

encode_cb_recall(struct xdr_stream *xdr, struct nfs4_delegation *dp)

static void encode_cb_nops(struct nfs4_cb_compound_hdr *hdr)

{

	*hdr->nops_p = htonl(hdr->nops);

}



static void

encode_cb_recall(struct xdr_stream *xdr, struct nfs4_delegation *dp,

		struct nfs4_cb_compound_hdr *hdr)

{

	__be32 *p;

	int len = dp->dl_fh.fh_size;
@@ -227,7 +234,7 @@ encode_cb_recall(struct xdr_stream *xdr, struct nfs4_delegation *dp) 
	WRITE32(0); /* truncate optimization not implemented */

	WRITE32(len);

	WRITEMEM(&dp->dl_fh.fh_base, len);

	return 0;

	hdr->nops++;

}



static int
@@ -246,12 +253,13 @@ nfs4_xdr_enc_cb_recall(struct rpc_rqst *req, __be32 *p, struct nfs4_delegation * 
	struct xdr_stream xdr;

	struct nfs4_cb_compound_hdr hdr = {

		.ident = args->dl_ident,

		.nops   = 1,

	};



	xdr_init_encode(&xdr, &req->rq_snd_buf, p);

	encode_cb_compound_hdr(&xdr, &hdr);

	return (encode_cb_recall(&xdr, args));

	encode_cb_recall(&xdr, args, &hdr);

	encode_cb_nops(&hdr);

	return 0;

}