diff options
| author | Pavel Begunkov <asml.silence@gmail.com> | 2021-10-20 21:00:49 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2021-10-21 16:27:17 +0200 |
| commit | 179ae84f7ef5225e03cd29cb9a75f6e90d2d7388 (patch) | |
| tree | dc6205b3b64bdd5c8a49ea2b2978809d80c68462 /block/blk-mq-sched.c | |
| parent | block: optimise boundary blkdev_read_iter's checks (diff) | |
| download | linux-179ae84f7ef5225e03cd29cb9a75f6e90d2d7388.tar.xz linux-179ae84f7ef5225e03cd29cb9a75f6e90d2d7388.zip | |
block: clean up blk_mq_submit_bio() merging
Combine blk_mq_sched_bio_merge() and blk_attempt_plug_merge() under a
common if, so we don't check it twice.
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/daedc90d4029a5d1d73344771632b1faca3aaf81.1634755800.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-mq-sched.c')
| -rw-r--r-- | block/blk-mq-sched.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c index e85b7556b096..5b259fdea794 100644 --- a/block/blk-mq-sched.c +++ b/block/blk-mq-sched.c @@ -361,7 +361,7 @@ void blk_mq_sched_dispatch_requests(struct blk_mq_hw_ctx *hctx) } } -bool __blk_mq_sched_bio_merge(struct request_queue *q, struct bio *bio, +bool blk_mq_sched_bio_merge(struct request_queue *q, struct bio *bio, unsigned int nr_segs) { struct elevator_queue *e = q->elevator; |