[RFC PATCH 2/7] block: move blk_crypto_bio_prep() out of blk-mq.c
From: Ming Lei <hidden>
Date: 2022-01-11 11:56:23
Subsystem:
block layer, the rest · Maintainers:
Jens Axboe, Linus Torvalds
blk_crypto_bio_prep() is called for both bio based and blk-mq drivers, so move it out of blk-mq.c, then we can unify this kind of handling. Signed-off-by: Ming Lei <redacted> --- block/blk-core.c | 18 ++++++------------ block/blk-mq.c | 3 --- 2 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/block/blk-core.c b/block/blk-core.c
index cca7fbe2a43b..471ffc834e3f 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c@@ -785,26 +785,20 @@ static noinline_for_stack bool submit_bio_checks(struct bio *bio) return false; } -static void __submit_bio_fops(struct gendisk *disk, struct bio *bio) +static void __submit_bio(struct bio *bio) { if (blk_crypto_bio_prep(&bio)) { - if (likely(bio_queue_enter(bio) == 0)) { + struct gendisk *disk = bio->bi_bdev->bd_disk; + + if (!disk->fops->submit_bio) { + blk_mq_submit_bio(bio); + } else if (likely(bio_queue_enter(bio) == 0)) { disk->fops->submit_bio(bio); blk_queue_exit(disk->queue); } } } -static void __submit_bio(struct bio *bio) -{ - struct gendisk *disk = bio->bi_bdev->bd_disk; - - if (!disk->fops->submit_bio) - blk_mq_submit_bio(bio); - else - __submit_bio_fops(disk, bio); -} - /* * The loop in this function may be a bit non-obvious, and so deserves some * explanation:
diff --git a/block/blk-mq.c b/block/blk-mq.c
index a6d4780580fc..73c376e27c5a 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c@@ -2786,9 +2786,6 @@ void blk_mq_submit_bio(struct bio *bio) unsigned int nr_segs = 1; blk_status_t ret; - if (unlikely(!blk_crypto_bio_prep(&bio))) - return; - blk_queue_bounce(q, &bio); if (blk_may_split(q, bio)) __blk_queue_split(q, &bio, &nr_segs);
--
2.31.1