block: fix "check bi_size overflow before merge"
authorAndreas Gruenbacher <agruenba@redhat.com>
Mon, 9 Dec 2019 19:11:14 +0000 (20:11 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 21 Dec 2019 10:04:32 +0000 (11:04 +0100)
commit06ad673b6c585581a68e7b0059cf89ca9de67ab0
tree73c6aee839c6be86be7af31e2bce7095de90e7b1
parentf092fa8da25146eacbc840340912282728d97814
block: fix "check bi_size overflow before merge"

commit cc90bc68422318eb8e75b15cd74bc8d538a7df29 upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
block/bio.c