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

Commit 9303bbd3 authored by Benny Halevy's avatar Benny Halevy Committed by J. Bruce Fields
Browse files

nfsd: nfs4callback encode_stateid helper function 



To be used also for the pnfs cb_layoutrecall callback

Signed-off-by: default avatarBenny Halevy <bhalevy@panasas.com>
[nfsd4: fix cb_recall encoding]
    "nfsd: nfs4callback encode_stateid helper function" forgot to reserve
    more space after return from the new helper.
Reported-by: default avatarMichael Groshans <groshans@citi.umich.edu>
Signed-off-by: default avatarBenny Halevy <bhalevy@panasas.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent 4731030d

fs/nfsd/nfs4callback.c

+13 −3
Original line number Diff line number Diff line
@@ -202,6 +202,16 @@ nfs_cb_stat_to_errno(int stat) 
 * XDR encode

 */



static void

encode_stateid(struct xdr_stream *xdr, stateid_t *sid)

{

	__be32 *p;



	RESERVE_SPACE(sizeof(stateid_t));

	WRITE32(sid->si_generation);

	WRITEMEM(&sid->si_opaque, sizeof(stateid_opaque_t));

}



static void

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

{
@@ -227,10 +237,10 @@ encode_cb_recall(struct xdr_stream *xdr, struct nfs4_delegation *dp, 
	__be32 *p;

	int len = dp->dl_fh.fh_size;



	RESERVE_SPACE(12+sizeof(dp->dl_stateid) + len);

	RESERVE_SPACE(4);

	WRITE32(OP_CB_RECALL);

	WRITE32(dp->dl_stateid.si_generation);

	WRITEMEM(&dp->dl_stateid.si_opaque, sizeof(stateid_opaque_t));

	encode_stateid(xdr, &dp->dl_stateid);

	RESERVE_SPACE(8 + (XDR_QUADLEN(len) << 2));

	WRITE32(0); /* truncate optimization not implemented */

	WRITE32(len);

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