]> git.baikalelectronics.ru Git - kernel.git/commit
block: fix "check bi_size overflow before merge"
authorAndreas Gruenbacher <agruenba@redhat.com>
Mon, 9 Dec 2019 19:11:14 +0000 (20:11 +0100)
committerJens Axboe <axboe@kernel.dk>
Tue, 10 Dec 2019 05:04:35 +0000 (22:04 -0700)
commit235a040b2fd145f865356a8e1dafe4dbb88644f7
tree4d0f4bb1643821a729440b51421ebfb82144916d
parent63eb3fef985e113c2c28c32a8898aa9c6a5d0a19
block: fix "check bi_size overflow before merge"

This partially reverts commit 2996300ad968ac047161d04f5681311ed1eae053.

Commit 2996300ad968 ("check bi_size overflow before merge") adds a bio_full
check to __bio_try_merge_page.  This will cause __bio_try_merge_page to fail
when the last bi_io_vec has been reached.  Instead, what we want here is only
the bi_size overflow check.

Fixes: 2996300ad968 ("block: check bi_size overflow before merge")
Cc: stable@vger.kernel.org # v5.4+
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/bio.c