Commit 7f36b7d0 authored by Ming Lei's avatar Ming Lei Committed by Jens Axboe
Browse files

block: move blk_crypto_bio_prep() out of blk-mq.c 



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.

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMing Lei <ming.lei@redhat.com>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Link: https://lore.kernel.org/r/20220216044514.2903784-3-ming.lei@redhat.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent a650628b

block/blk-core.c

+8 −13
Original line number Diff line number Diff line
@@ -783,24 +783,19 @@ noinline_for_stack bool submit_bio_checks(struct bio *bio) 
	return false;

}



static void __submit_bio_fops(struct gendisk *disk, struct bio *bio)

{

	if (blk_crypto_bio_prep(&bio)) {

		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)

	if (unlikely(!blk_crypto_bio_prep(&bio)))

		return;



	if (!disk->fops->submit_bio) {

		blk_mq_submit_bio(bio);

	else

		__submit_bio_fops(disk, bio);

	} else if (likely(bio_queue_enter(bio) == 0)) {

		disk->fops->submit_bio(bio);

		blk_queue_exit(disk->queue);

	}

}



/*

block/blk-mq.c

+0 −3
Original line number Diff line number Diff line
@@ -2788,9 +2788,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);