Re: [PATCH] SQUASHME: nfsd4: fix cb_recall encoding

[Benny Halevy <bhalevy@panasas.com>]

On May. 24, 2010, 18:28 +0300, "J. Bruce Fields" <bfields@fieldses.org> wrote:
> From: J. Bruce Fields <bfields@citi.umich.edu>
> 
> "nfsd: nfs4callback encode_stateid helper function" forgot to reserve
> more space after return from the new helper.
> 
> Reported-by: Michael Groshans <groshans@citi.umich.edu>
> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
> ---
>  fs/nfsd/nfs4callback.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> Benny, maybe you could fix that patch and then pass it upstream?

Sure.  I submitted this fix to the pnfs tree and will test and
send a fixed version of "nfsd: nfs4callback encode_stateid helper function"
upstream.

Benny

> 
> --b.
> 
> diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
> index b279738..238e0b8 100644
> --- a/fs/nfsd/nfs4callback.c
> +++ b/fs/nfsd/nfs4callback.c
> @@ -246,6 +246,7 @@ encode_cb_recall(struct xdr_stream *xdr, struct nfs4_delegation *dp,
>  	RESERVE_SPACE(4);
>  	WRITE32(OP_CB_RECALL);
>  	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);