summaryrefslogtreecommitdiffstats
path: root/block/blk.h
diff options
context:
space:
mode:
authorBaolin Wang <baolin.wang@linux.alibaba.com>2020-08-28 10:52:55 +0800
committerJens Axboe <axboe@kernel.dk>2020-09-01 16:49:26 -0600
commitbdc6a287bc98e8f32bf52c9cb2d1bdf75975f5a0 (patch)
treea21f895d98e33b5dd5b09af3d81973b86105dc3c /block/blk.h
parent8e756373d7c8eb6f8876411bed45e4b1c736eb53 (diff)
downloadlinux-stable-bdc6a287bc98e8f32bf52c9cb2d1bdf75975f5a0.tar.gz
linux-stable-bdc6a287bc98e8f32bf52c9cb2d1bdf75975f5a0.tar.bz2
linux-stable-bdc6a287bc98e8f32bf52c9cb2d1bdf75975f5a0.zip
block: Move blk_mq_bio_list_merge() into blk-merge.c
Move the blk_mq_bio_list_merge() into blk-merge.c and rename it as a generic name. 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.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/block/blk.h b/block/blk.h
index 49e2928a1632..d6152d20d4e2 100644
--- a/block/blk.h
+++ b/block/blk.h
@@ -177,6 +177,8 @@ bool 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,
+ struct bio *bio, unsigned int nr_segs);
void blk_account_io_start(struct request *req);
void blk_account_io_done(struct request *req, u64 now);