block: move the bi_vcnt check out of __bio_try_merge_page
authorChristoph Hellwig <hch@lst.de>
Mon, 24 Jul 2023 16:54:29 +0000 (09:54 -0700)
committerJens Axboe <axboe@kernel.dk>
Tue, 25 Jul 2023 01:55:16 +0000 (19:55 -0600)
commit0eca8b6f97ac705c5806f7d062207379094fb114
tree99c0a5fa9054a7ffdd26ee6bb7018ce571bd967d
parent939e1a370330841b2c0292a483d7b38f3ee45f88
block: move the bi_vcnt check out of __bio_try_merge_page

Move the bi_vcnt out of __bio_try_merge_page and into the two callers
that don't already have it in preparation for additional changes to
__bio_try_merge_page.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jinyoung Choi <j-young.choi@samsung.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Link: https://lore.kernel.org/r/20230724165433.117645-5-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/bio.c