Skip to contentSkip to conversation

blk: Fix bio_io_vec index when checking bvec gaps

PATCH New Keith Busch 2 participants 2 messages Sep 1, 2015

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

PATCH 1/1 blk: Fix bio_io_vec index when checking bvec gaps

Corrects a coding error from earlier patch.

Reported by: Sagi Grimberg <sagig at dev.mellanox.co.il>
Signed-off-by: Keith Busch <keith.busch at intel.com>

---
 block/blk-merge.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
block/blk-merge.c +1 -1
index 53bb485..d088cff 100644
@@ -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,
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 1/1 blk: Fix bio_io_vec index when checking bvec gaps

Quoted 13 lines · Keith Busch

Corrects a coding error from earlier patch.

Reported by: Sagi Grimberg <sagig at dev.mellanox.co.il>
Signed-off-by: Keith Busch <keith.busch at intel.com>

---
  block/blk-merge.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
block/blk-merge.c +0 -0
index 53bb485..d088cff 100644

block/blk-merge.c static int req_gap_to_prev(struct request *req, struct bio *next) · line 492

Quoted 6 lines
block/blk-merge.c +1 -1
@@ -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);
  }

Thanks - good catch, Sagi. I've applied this, and added a Fixes line as well.

Signature · 1 line
Jens Axboe