OSDN Git Service

block: move the BIO_CLONED checks out of __bio_try_merge_page
authorChristoph Hellwig <hch@lst.de>
Mon, 24 Jul 2023 16:54:28 +0000 (09:54 -0700)
committerJens Axboe <axboe@kernel.dk>
Tue, 25 Jul 2023 01:55:16 +0000 (19:55 -0600)
commit939e1a370330841b2c0292a483d7b38f3ee45f88
treedf9d9005bdfe932da4040c2290bb87c03ba52cd1
parent6850b2dd5c25f27f7b74414553f047d4c12dd66c
block: move the BIO_CLONED checks out of __bio_try_merge_page

__bio_try_merge_page is a way too low-level helper to assert that the
bio is not cloned.  Move the check into bio_add_page and
bio_iov_iter_get_pages instead, which are the high level entry points
that should enforce this variant.  bio_add_hw_page already this
check, coverig the third (indirect) caller of __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-4-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/bio.c