redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

block: add a missing BIOVEC_SEG_BOUNDARY check in bio_add_pc_page 

The actual recaculation of segments in __blk_recalc_rq_segments will
do this check, so there is no point in forcing it if we know it won't
succeed.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
hifive-unleashed-5.1
Christoph Hellwig 2018-09-24 09:43:51 +02:00 committed by Jens Axboe
parent 6a9f5f240a
commit 0e253391a9
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
block/bio.c
View File

@ -731,7 +731,9 @@ int bio_add_pc_page(struct request_queue *q, struct bio *bio, struct page
}
/* If we may be able to merge these biovecs, force a recount */
if (bio->bi_vcnt > 1 && biovec_phys_mergeable(bvec-1, bvec))
if (bio->bi_vcnt > 1 &&
biovec_phys_mergeable(bvec - 1, bvec) &&
BIOVEC_SEG_BOUNDARY(q, bvec - 1, bvec))
bio_clear_flag(bio, BIO_SEG_VALID);
done: