Commit 7c8998f7 authored by Jinyoung Choi's avatar Jinyoung Choi Committed by Jens Axboe
Browse files

block: make bvec_try_merge_hw_page() non-static 



This will be used for multi-page configuration for integrity payload.

Cc: Christoph Hellwig <hch@lst.de>
Cc: Martin K. Petersen <martin.petersen@oracle.com>

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJinyoung Choi <j-young.choi@samsung.com>
Tested-by: default avatar"Martin K. Petersen" <martin.petersen@oracle.com>
Reviewed-by: default avatar"Martin K. Petersen" <martin.petersen@oracle.com>
Link: https://lore.kernel.org/r/20230803024827epcms2p838d9e9131492c86a159fff25d195658f@epcms2p8


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

block/bio.c

+1 −1
Original line number Diff line number Diff line
@@ -934,7 +934,7 @@ static bool bvec_try_merge_page(struct bio_vec *bv, struct page *page, 
 * size limit.  This is not for normal read/write bios, but for passthrough

 * or Zone Append operations that we can't split.

 */

static bool bvec_try_merge_hw_page(struct request_queue *q, struct bio_vec *bv,

bool bvec_try_merge_hw_page(struct request_queue *q, struct bio_vec *bv,

		struct page *page, unsigned len, unsigned offset,

		bool *same_page)

{

block/blk.h

+4 −0
Original line number Diff line number Diff line
@@ -75,6 +75,10 @@ struct bio_vec *bvec_alloc(mempool_t *pool, unsigned short *nr_vecs, 
		gfp_t gfp_mask);

void bvec_free(mempool_t *pool, struct bio_vec *bv, unsigned short nr_vecs);



bool bvec_try_merge_hw_page(struct request_queue *q, struct bio_vec *bv,

		struct page *page, unsigned len, unsigned offset,

		bool *same_page);



static inline bool biovec_phys_mergeable(struct request_queue *q,

		struct bio_vec *vec1, struct bio_vec *vec2)

{