bio-integrity: move the bio integrity profile check earlier in bio_integrity_prep

This makes the code more obvious, and moves the most likely branch first
in the function.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2017-08-09 17:48:08 +02:00 committed by Jens Axboe
parent d424681cc9
commit 9346beb9d0

View File

@ -246,6 +246,9 @@ bool bio_integrity_prep(struct bio *bio)
blk_status_t status; blk_status_t status;
bi = bdev_get_integrity(bio->bi_bdev); bi = bdev_get_integrity(bio->bi_bdev);
if (!bi)
return true;
q = bdev_get_queue(bio->bi_bdev); q = bdev_get_queue(bio->bi_bdev);
if (bio_op(bio) != REQ_OP_READ && bio_op(bio) != REQ_OP_WRITE) if (bio_op(bio) != REQ_OP_READ && bio_op(bio) != REQ_OP_WRITE)
return true; return true;
@ -257,9 +260,6 @@ bool bio_integrity_prep(struct bio *bio)
if (bio_integrity(bio)) if (bio_integrity(bio))
return true; return true;
if (bi == NULL)
return true;
if (bio_data_dir(bio) == READ) { if (bio_data_dir(bio) == READ) {
if (!bi->profile->verify_fn || if (!bi->profile->verify_fn ||
!(bi->flags & BLK_INTEGRITY_VERIFY)) !(bi->flags & BLK_INTEGRITY_VERIFY))