diff options
| author |   Baolin Wang <baolin.wang@linux.alibaba.com> | 2020-08-28 10:52:56 +0800 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2020-09-01 16:49:26 -0600 |
| commit | 7d7ca7c5269becab86c9f595309c8e90ce268967 (patch) | |
| tree | b19837e1b64f7d96bced5a4d6994b185d7e0f81d /block/blk.h | |
| parent | block: Move blk_mq_bio_list_merge() into blk-merge.c (diff) | |
| download | linux-dev-7d7ca7c5269becab86c9f595309c8e90ce268967.tar.xz linux-dev-7d7ca7c5269becab86c9f595309c8e90ce268967.zip | |
block: Add a new helper to attempt to merge a bio
There are lots of duplicated code when trying to merge a bio from
plug list and sw queue, we can introduce a new helper to attempt
to merge a bio, which can simplify the blk_bio_list_merge()
and blk_attempt_plug_merge().
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Baolin Wang <baolin.wang@linux.alibaba.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk.h')
| -rw-r--r-- | block/blk.h | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/block/blk.h b/block/blk.h index d6152d20d4e2..a180443ac13f 100644 --- a/block/blk.h +++ b/block/blk.h @@ -29,6 +29,12 @@ struct blk_flush_queue { spinlock_t mq_flush_lock; }; +enum bio_merge_status { + BIO_MERGE_OK, + BIO_MERGE_NONE, + BIO_MERGE_FAILED, +}; + extern struct kmem_cache *blk_requestq_cachep; extern struct kobj_type blk_queue_ktype; extern struct ida blk_queue_ida; @@ -169,12 +175,15 @@ static inline void blk_integrity_del(struct gendisk *disk) unsigned long blk_rq_timeout(unsigned long timeout); void blk_add_timer(struct request *req); -bool bio_attempt_front_merge(struct request *req, struct bio *bio, - unsigned int nr_segs); -bool bio_attempt_back_merge(struct request *req, struct bio *bio, - unsigned int nr_segs); -bool bio_attempt_discard_merge(struct request_queue *q, struct request *req, - struct bio *bio); +enum bio_merge_status bio_attempt_front_merge(struct request *req, + struct bio *bio, + unsigned int nr_segs); +enum bio_merge_status bio_attempt_back_merge(struct request *req, + struct bio *bio, + unsigned int nr_segs); +enum bio_merge_status bio_attempt_discard_merge(struct request_queue *q, + struct request *req, + struct bio *bio); bool blk_attempt_plug_merge(struct request_queue *q, struct bio *bio, unsigned int nr_segs, struct request **same_queue_rq); bool blk_bio_list_merge(struct request_queue *q, struct list_head *list, |