Skip to contentSkip to conversation

spnfs-block: reserve space error in bl_encode_stripe

PATCH Applied fanchaoting 2 participants 2 messages Mar 11, 2013 – Mar 25, 2013

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 spnfs-block: reserve space error in bl_encode_stripe

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

---
 fs/exportfs/nfs4blocklayoutxdr.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
fs/exportfs/nfs4blocklayoutxdr.c +1 -1
index 439e647..c942d34 100644
@@ -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

Applied
#1 lore raw
Quoted 3 lines · fanchaoting

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

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

Quoted 25 lines
---
 fs/exportfs/nfs4blocklayoutxdr.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
fs/exportfs/nfs4blocklayoutxdr.c +1 -2
index 439e647..c942d34 100644
@@ -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