OSDN Git Service

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)
commitcc90bc68422318eb8e75b15cd74bc8d538a7df29
tree4d0f4bb1643821a729440b51421ebfb82144916d
parentdc3ecfc9819a96b2a6700b01443347b01e07a13b
block: fix "check bi_size overflow before merge"

This partially reverts commit e3a5d8e386c3fb973fa75f2403622a8f3640ec06.

Commit e3a5d8e386c3 ("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: e3a5d8e386c3 ("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