From: Keith Busch <keith.busch@intel.com>
Date: Tue, 1 Sep 2015 16:46:44 +0000 (-0600)
Subject: blk: Fix bio_io_vec index when checking bvec gaps
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=2ca495ac27d245513c11fed70591b1838250e240;p=deliverable%2Flinux.git

blk: Fix bio_io_vec index when checking bvec gaps

Corrects a coding error from earlier patch.

Reported by: Sagi Grimberg <sagig@dev.mellanox.co.il>
Signed-off-by: Keith Busch <keith.busch@intel.com>
Fixes: 03100aada96f ("block: Replace SG_GAPS with new queue limits mask")
Signed-off-by: Jens Axboe <axboe@fb.com>
---

diff --git a/block/blk-merge.c b/block/blk-merge.c
index 0e0d9fd01c40..b2625271a572 100644
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -488,7 +488,7 @@ static int req_gap_to_prev(struct request *req, struct bio *next)
 	struct bio *prev = req->biotail;
 
 	return bvec_gap_to_prev(req->q, &prev->bi_io_vec[prev->bi_vcnt - 1],
-			next->bi_io_vec[1].bv_offset);
+			next->bi_io_vec[0].bv_offset);
 }
 
 static int ll_merge_requests_fn(struct request_queue *q, struct request *req,