Skip to content

Commit 7c8998f

Browse files
ychoijyaxboe
authored andcommitted
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: Christoph Hellwig <hch@lst.de> Signed-off-by: Jinyoung Choi <j-young.choi@samsung.com> Tested-by: "Martin K. Petersen" <martin.petersen@oracle.com> Reviewed-by: "Martin K. Petersen" <martin.petersen@oracle.com> Link: https://lore.kernel.org/r/20230803024827epcms2p838d9e9131492c86a159fff25d195658f@epcms2p8 Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent d47f971 commit 7c8998f

2 files changed

Lines changed: 5 additions & 1 deletion

File tree

block/bio.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -934,7 +934,7 @@ static bool bvec_try_merge_page(struct bio_vec *bv, struct page *page,
934934
* size limit. This is not for normal read/write bios, but for passthrough
935935
* or Zone Append operations that we can't split.
936936
*/
937-
static bool bvec_try_merge_hw_page(struct request_queue *q, struct bio_vec *bv,
937+
bool bvec_try_merge_hw_page(struct request_queue *q, struct bio_vec *bv,
938938
struct page *page, unsigned len, unsigned offset,
939939
bool *same_page)
940940
{

block/blk.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,10 @@ struct bio_vec *bvec_alloc(mempool_t *pool, unsigned short *nr_vecs,
7575
gfp_t gfp_mask);
7676
void bvec_free(mempool_t *pool, struct bio_vec *bv, unsigned short nr_vecs);
7777

78+
bool bvec_try_merge_hw_page(struct request_queue *q, struct bio_vec *bv,
79+
struct page *page, unsigned len, unsigned offset,
80+
bool *same_page);
81+
7882
static inline bool biovec_phys_mergeable(struct request_queue *q,
7983
struct bio_vec *vec1, struct bio_vec *vec2)
8084
{

0 commit comments

Comments
 (0)