aoe: fixup linux-next merge error

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c
index 951696605dda3433390004a90e92109712d54297..f0350e60f9f07a2cebccde15c673c5e6f8469591 100644 (file)
--- a/drivers/block/aoe/aoecmd.c
+++ b/drivers/block/aoe/aoecmd.c
@@ -926,7 +926,7 @@ bufinit(struct buf *buf, struct request *rq, struct bio *bio)
        buf->sector = bio->bi_sector;
        bio_pageinc(bio);
        buf->bv = bio_iovec(bio);
-       buf->bv_resid = bv->bv_len;
+       buf->bv_resid = buf->bv->bv_len;
        WARN_ON(buf->bv_resid == 0);
 }