Merge "block: disable multi-page bvec"

This commit is contained in:
qctecmdr 2020-12-04 22:41:52 -08:00 • committed by Gerrit - the friendly Code Review server
commit ca8993b29a

View file

@ -806,9 +806,7 @@ bool __bio_try_merge_page(struct bio *bio, struct page *page,
if (bio->bi_vcnt > 0) {
struct bio_vec *bv = &bio->bi_io_vec[bio->bi_vcnt - 1];
if (page_is_mergeable(bv, page, len, off, same_page)) {
if (bio->bi_iter.bi_size > UINT_MAX - len)
return false;
if (page == bv->bv_page && off == bv->bv_offset + bv->bv_len) {
bv->bv_len += len;
bio->bi_iter.bi_size += len;
return true;