diff options
| author | Ming Lei | 2019-03-02 09:43:44 +0100 |
|---|---|---|
| committer | Jens Axboe | 2019-03-02 20:45:37 +0100 |
| commit | aaeee62c841cc1e48231e1d60c304d2da9c4e41c (patch) | |
| tree | 79d3ec0b8a6fe6b928beeeb25af27f57bbe6bcb8 /block | |
| parent | block: Replace function name in string with __func__ (diff) | |
| download | kernel-qcow2-linux-aaeee62c841cc1e48231e1d60c304d2da9c4e41c.tar.gz kernel-qcow2-linux-aaeee62c841cc1e48231e1d60c304d2da9c4e41c.tar.xz kernel-qcow2-linux-aaeee62c841cc1e48231e1d60c304d2da9c4e41c.zip | |
block: fix updating bio's front segment size
When the current bvec can be merged to the 1st segment, the bio's front
segment size has to be updated.
However, dcebd755926b doesn't consider that case, then bio's front
segment size may not be correct.
This patch fixes this issue.
Cc: Christoph Hellwig <hch@lst.de>
Cc: Omar Sandoval <osandov@fb.com>
Fixes: dcebd755926b ("block: use bio_for_each_bvec() to compute multi-page bvec count")
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-merge.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/block/blk-merge.c b/block/blk-merge.c index 9402a7c3ba22..22467f475ab4 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -277,6 +277,9 @@ static struct bio *blk_bio_segment_split(struct request_queue *q, bvprvp = &bvprv; sectors += bv.bv_len >> 9; + if (nsegs == 1 && seg_size > front_seg_size) + front_seg_size = seg_size; + continue; } new_segment: @@ -401,6 +404,11 @@ static unsigned int __blk_recalc_rq_segments(struct request_queue *q, seg_size += bv.bv_len; bvprv = bv; + + if (nr_phys_segs == 1 && seg_size > + front_seg_size) + front_seg_size = seg_size; + continue; } new_segment: |