Commit 9a6083be authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: move bio_full out of bio.h 



bio_full is only used in bio.c, so move it there.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20211012161804.991559-6-hch@lst.de


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

block/bio.c

+17 −0
Original line number Diff line number Diff line
@@ -772,6 +772,23 @@ const char *bio_devname(struct bio *bio, char *buf) 
}

EXPORT_SYMBOL(bio_devname);



/**

 * bio_full - check if the bio is full

 * @bio:	bio to check

 * @len:	length of one segment to be added

 *

 * Return true if @bio is full and one segment with @len bytes can't be

 * added to the bio, otherwise return false

 */

static inline bool bio_full(struct bio *bio, unsigned len)

{

	if (bio->bi_vcnt >= bio->bi_max_vecs)

		return true;

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

		return true;

	return false;

}



static inline bool page_is_mergeable(const struct bio_vec *bv,

		struct page *page, unsigned int len, unsigned int off,

		bool *same_page)

include/linux/bio.h

+0 −19
Original line number Diff line number Diff line
@@ -77,25 +77,6 @@ static inline void *bio_data(struct bio *bio) 
	return NULL;

}



/**

 * bio_full - check if the bio is full

 * @bio:	bio to check

 * @len:	length of one segment to be added

 *

 * Return true if @bio is full and one segment with @len bytes can't be

 * added to the bio, otherwise return false

 */

static inline bool bio_full(struct bio *bio, unsigned len)

{

	if (bio->bi_vcnt >= bio->bi_max_vecs)

		return true;



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

		return true;



	return false;

}



static inline bool bio_next_segment(const struct bio *bio,

				    struct bvec_iter_all *iter)

{