From fc85c231c4353d74e0d97ff5733f69bd1714d756 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Tue, 26 Mar 2013 07:01:36 -0600 Subject: [PATCH] aoe: fixup linux-next merge error Signed-off-by: Jens Axboe --- drivers/block/aoe/aoecmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c index 951696605dda..f0350e60f9f0 100644 --- 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); } -- 2.39.5