diff options
| author | Jens Axboe <axboe@fb.com> | 2015-09-01 11:05:13 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-09-01 11:05:13 -0600 |
| commit | 3cb73014ad0656464c433ab9f8a931a1b4cfa2eb (patch) | |
| tree | 6e57d1f4e1048a6296e157318060a5c8cae85992 /block | |
| parent | 721cb0165e64b3b9c5aaf8db52edc13dc05d0648 (diff) | |
| parent | 2ca495ac27d245513c11fed70591b1838250e240 (diff) | |
Merge branch 'for-4.3/core' into for-next
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 53bb4856256e..d088cffb8105 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, |