diff options
| author | Wenbo Wang <wenbo.wang@memblaze.com> | 2015-03-20 01:04:54 -0400 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2015-04-10 10:03:59 +0100 |
| commit | 25660d3a5b9310e339fc26ae0b64f7f9583f9a2c (patch) | |
| tree | 6db3698e745bd8438df7d788c75d73d60d8a09b6 /block | |
| parent | 5b2766ff430b71cf5b10fbf8e2d46e5210a0e35d (diff) | |
| download | linux-stable-25660d3a5b9310e339fc26ae0b64f7f9583f9a2c.tar.gz linux-stable-25660d3a5b9310e339fc26ae0b64f7f9583f9a2c.tar.bz2 linux-stable-25660d3a5b9310e339fc26ae0b64f7f9583f9a2c.zip | |
Fix bug in blk_rq_merge_ok
commit 7ee8e4f3983c4ff700958a6099c8fd212ea67b94 upstream.
Use the right array index to reference the last
element of rq->biotail->bi_io_vec[]
Signed-off-by: Wenbo Wang <wenbo.wang@memblaze.com>
Reviewed-by: Chong Yuan <chong.yuan@memblaze.com>
Fixes: 66cb45aa41315 ("block: add support for limiting gaps in SG lists")
Signed-off-by: Jens Axboe <axboe@fb.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-merge.c b/block/blk-merge.c index 54535831f1e1..25db382fd2c2 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -596,7 +596,7 @@ bool blk_rq_merge_ok(struct request *rq, struct bio *bio) if (q->queue_flags & (1 << QUEUE_FLAG_SG_GAPS)) { struct bio_vec *bprev; - bprev = &rq->biotail->bi_io_vec[bio->bi_vcnt - 1]; + bprev = &rq->biotail->bi_io_vec[rq->biotail->bi_vcnt - 1]; if (bvec_gap_to_prev(bprev, bio->bi_io_vec[0].bv_offset)) return false; } |