diff mbox

spnfs-block: reserve space error in bl_encode_stripe

Message ID 513DC5BE.9000103@cn.fujitsu.com (mailing list archive)
State New, archived
Headers show

Commit Message

fanchaoting March 11, 2013, 11:53 a.m. UTC 
when useing spnfs-block, reserve space error in bl_encode_stripe.

 Signed-off-by: fanchaoting<fanchaoting@cn.fujitsu.com>
---
 fs/exportfs/nfs4blocklayoutxdr.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

--
1.7.1

--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Benny Halevy March 25, 2013, 9:40 a.m. UTC | #1 
On 2013-03-11 13:53, fanchaoting wrote:
>  when useing spnfs-block, reserve space error in bl_encode_stripe.
> 
>  Signed-off-by: fanchaoting<fanchaoting@cn.fujitsu.com>

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 majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

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);