2010-05-25 06:50:26

by Benny Halevy

Subject: [PATCH] nfsd: nfs4callback encode_stateid helper function

To be used also for the pnfs cb_layoutrecall callback

Signed-off-by: Benny Halevy <[email protected]>
[nfsd4: fix cb_recall encoding]
"nfsd: nfs4callback encode_stateid helper function" forgot to reserve
more space after return from the new helper.
Reported-by: Michael Groshans <[email protected]>
Signed-off-by: J. Bruce Fields <[email protected]>
Signed-off-by: Benny Halevy <[email protected]>
---
fs/nfsd/nfs4callback.c | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
index eb78e7e..6bacd0e 100644
--- a/fs/nfsd/nfs4callback.c
+++ b/fs/nfsd/nfs4callback.c
@@ -205,6 +205,16 @@ nfs_cb_stat_to_errno(int stat)
*/

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)
{
__be32 * p;
@@ -229,10 +239,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);
--
1.6.6.1

2010-06-01 23:21:21

by J.Bruce Fields

Subject: Re: [PATCH] nfsd: nfs4callback encode_stateid helper function

Thanks.--b.

On Tue, May 25, 2010 at 09:50:23AM +0300, Benny Halevy wrote:
> To be used also for the pnfs cb_layoutrecall callback
>
> Signed-off-by: Benny Halevy <[email protected]>
> [nfsd4: fix cb_recall encoding]
> "nfsd: nfs4callback encode_stateid helper function" forgot to reserve
> more space after return from the new helper.
> Reported-by: Michael Groshans <[email protected]>
> Signed-off-by: J. Bruce Fields <[email protected]>
> Signed-off-by: Benny Halevy <[email protected]>
> ---
> fs/nfsd/nfs4callback.c | 16 +++++++++++++---
> 1 files changed, 13 insertions(+), 3 deletions(-)
>
> diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
> index eb78e7e..6bacd0e 100644
> --- a/fs/nfsd/nfs4callback.c
> +++ b/fs/nfsd/nfs4callback.c
> @@ -205,6 +205,16 @@ nfs_cb_stat_to_errno(int stat)
> */
>
> 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)
> {
> __be32 * p;
> @@ -229,10 +239,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);
> --
> 1.6.6.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html