diff options
| author | Damien Le Moal <dlemoal@kernel.org> | 2024-04-08 10:41:05 +0900 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2024-04-17 08:44:02 -0600 |
| commit | dd850ff3eee428b4e1276bd51263dd937643ba19 (patch) | |
| tree | 68e581921034a14db86aa044341fb813969a5579 /block/blk.h | |
| parent | b85a3c1b7978f942fa5bf8cfe22b6a6aaa49d3b7 (diff) | |
| download | linux-dd850ff3eee428b4e1276bd51263dd937643ba19.tar.gz linux-dd850ff3eee428b4e1276bd51263dd937643ba19.tar.bz2 linux-dd850ff3eee428b4e1276bd51263dd937643ba19.zip | |
block: Allow using bio_attempt_back_merge() internally
Remove "static" from the definition of bio_attempt_back_merge() and
declare this function in block/blk.h to allow using it internally from
other block layer files. The definition of enum bio_merge_status is
also moved to block/blk.h.
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Tested-by: Hans Holmberg <hans.holmberg@wdc.com>
Tested-by: Dennis Maisenbacher <dennis.maisenbacher@wdc.com>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Link: https://lore.kernel.org/r/20240408014128.205141-6-dlemoal@kernel.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk.h')
| -rw-r--r-- | block/blk.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/block/blk.h b/block/blk.h index 17786052f32d..bca50a9510c8 100644 --- a/block/blk.h +++ b/block/blk.h @@ -269,6 +269,14 @@ static inline void bio_integrity_free(struct bio *bio) unsigned long blk_rq_timeout(unsigned long timeout); void blk_add_timer(struct request *req); +enum bio_merge_status { + BIO_MERGE_OK, + BIO_MERGE_NONE, + BIO_MERGE_FAILED, +}; + +enum bio_merge_status bio_attempt_back_merge(struct request *req, + struct bio *bio, unsigned int nr_segs); bool blk_attempt_plug_merge(struct request_queue *q, struct bio *bio, unsigned int nr_segs); bool blk_bio_list_merge(struct request_queue *q, struct list_head *list, |