Commit 0eca8b6f authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJinyoung Choi <j-young.choi@samsung.com>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Link: https://lore.kernel.org/r/20230724165433.117645-5-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 939e1a37

block/bio.c

+22 −23
Original line number Diff line number Diff line
@@ -945,10 +945,10 @@ static inline bool page_is_mergeable(const struct bio_vec *bv, 
static bool __bio_try_merge_page(struct bio *bio, struct page *page,

		unsigned int len, unsigned int off, bool *same_page)

{

	if (bio->bi_vcnt > 0) {

	struct bio_vec *bv = &bio->bi_io_vec[bio->bi_vcnt - 1];



		if (page_is_mergeable(bv, page, len, off, same_page)) {

	if (!page_is_mergeable(bv, page, len, off, same_page))

		return false;

	if (bio->bi_iter.bi_size > UINT_MAX - len) {

		*same_page = false;

		return false;
@@ -957,9 +957,6 @@ static bool __bio_try_merge_page(struct bio *bio, struct page *page, 
	bio->bi_iter.bi_size += len;

	return true;

}

	}

	return false;

}



/*

 * Try to merge a page into a segment, while obeying the hardware segment
@@ -1127,11 +1124,13 @@ int bio_add_page(struct bio *bio, struct page *page, 
	if (WARN_ON_ONCE(bio_flagged(bio, BIO_CLONED)))

		return 0;



	if (!__bio_try_merge_page(bio, page, len, offset, &same_page)) {

	if (bio->bi_vcnt > 0 &&

	    __bio_try_merge_page(bio, page, len, offset, &same_page))

		return len;



	if (bio_full(bio, len))

		return 0;

	__bio_add_page(bio, page, len, offset);

	}

	return len;

}

EXPORT_SYMBOL(bio_add_page);
@@ -1205,15 +1204,15 @@ static int bio_iov_add_page(struct bio *bio, struct page *page, 
{

	bool same_page = false;



	if (!__bio_try_merge_page(bio, page, len, offset, &same_page)) {

		__bio_add_page(bio, page, len, offset);

		return 0;

	}



	if (bio->bi_vcnt > 0 &&

	    __bio_try_merge_page(bio, page, len, offset, &same_page)) {

		if (same_page)

			bio_release_page(bio, page);

		return 0;

	}

	__bio_add_page(bio, page, len, offset);

	return 0;

}



static int bio_iov_add_zone_append_page(struct bio *bio, struct page *page,

		unsigned int len, unsigned int offset)