]> git.hungrycats.org Git - linux/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)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 17 Dec 2019 19:08:40 +0000 (20:08 +0100)
commit9d2710fe8bf0b62996f4c8e0edd0ade0d3a34127
tree95efb418c77e612fbb4c3a9b9bbce92196bbf052
parentd0400f5906e95d743d2e5dc84d5876e833fde856
block: fix "check bi_size overflow before merge"

[ Upstream commit cc90bc68422318eb8e75b15cd74bc8d538a7df29 ]

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: Sasha Levin <sashal@kernel.org>
block/bio.c