block: clean up blk_mq_submit_bio() merging
authorPavel Begunkov <asml.silence@gmail.com>
Wed, 20 Oct 2021 19:00:49 +0000 (20:00 +0100)
committerJens Axboe <axboe@kernel.dk>
Thu, 21 Oct 2021 14:27:17 +0000 (08:27 -0600)
commit179ae84f7ef5225e03cd29cb9a75f6e90d2d7388
treedc6205b3b64bdd5c8a49ea2b2978809d80c68462
parent6450fe1f668f410fe2ab69c79a52a0929a4a8296
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>
block/blk-mq-sched.c
block/blk-mq-sched.h
block/blk-mq.c