On Tue, May 25, 2010 at 09:14:02AM +0300, Benny Halevy wrote: > On May. 24, 2010, 18:28 +0300, "J. Bruce Fields" <bfields@xxxxxxxxxxxx> wrote: > > From: J. Bruce Fields <bfields@xxxxxxxxxxxxxx> > > > > "nfsd: nfs4callback encode_stateid helper function" forgot to reserve > > more space after return from the new helper. > > > > Reported-by: Michael Groshans <groshans@xxxxxxxxxxxxxx> > > Signed-off-by: J. Bruce Fields <bfields@xxxxxxxxxxxxxx> > > --- > > 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. That's what I meant to say, yes, thanks! --b. > > 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); > -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
