2013-03-11 11:53:12

by fanchaoting

Subject: [PATCH]spnfs-block: reserve space error in bl_encode_stripe

when useing spnfs-block, reserve space error in bl_encode_stripe.

Signed-off-by: fanchaoting<[email protected]>
---
fs/exportfs/nfs4blocklayoutxdr.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fs/exportfs/nfs4blocklayoutxdr.c b/fs/exportfs/nfs4blocklayoutxdr.c
index 439e647..c942d34 100644
--- a/fs/exportfs/nfs4blocklayoutxdr.c
+++ b/fs/exportfs/nfs4blocklayoutxdr.c
@@ -53,7 +53,7 @@ static int
bl_encode_stripe(struct exp_xdr_stream *xdr, pnfs_blocklayout_devinfo_t *bld)
{
int i;
- __be32 *p = exp_xdr_reserve_space(xdr,
+ __be32 *p = exp_xdr_reserve_qwords(xdr,
2 + 1 + bld->u.stripe.bld_stripes);

p = exp_xdr_encode_u64(p, bld->u.stripe.bld_chunk_size);
--
1.7.1

2013-03-25 09:40:18

by Benny Halevy

Subject: Re: [PATCH]spnfs-block: reserve space error in bl_encode_stripe

On 2013-03-11 13:53, fanchaoting wrote:
> when useing spnfs-block, reserve space error in bl_encode_stripe.
>
> Signed-off-by: fanchaoting<[email protected]>

Good catch!
This patch did not apply cleanly on my latest pnfsd-block branch.
Please rebase onto the newest branch and send an up-to-date patch next time.

Merged into git://linux-nfs.org/~bhalevy/linux-pnfs.git pnfsd-block

Thanks,

Benny

> ---
> fs/exportfs/nfs4blocklayoutxdr.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/fs/exportfs/nfs4blocklayoutxdr.c b/fs/exportfs/nfs4blocklayoutxdr.c
> index 439e647..c942d34 100644
> --- a/fs/exportfs/nfs4blocklayoutxdr.c
> +++ b/fs/exportfs/nfs4blocklayoutxdr.c
> @@ -53,7 +53,7 @@ static int
> bl_encode_stripe(struct exp_xdr_stream *xdr, pnfs_blocklayout_devinfo_t *bld)
> {
> int i;
> - __be32 *p = exp_xdr_reserve_space(xdr,
> + __be32 *p = exp_xdr_reserve_qwords(xdr,
> 2 + 1 + bld->u.stripe.bld_stripes);
>
> p = exp_xdr_encode_u64(p, bld->u.stripe.bld_chunk_size);
> --
> 1.7.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
>