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>

diff --git a/block/bio-integrity.c b/block/bio-integrity.c
index 83e92beb3c9feb25f3be917e2b675f90b1544b5f..5fa9a740fd99ab4dec3e48e673c90436b7e907b4 100644 (file)
--- a/block/bio-integrity.c
+++ b/block/bio-integrity.c
@@ -246,6 +246,9 @@ bool bio_integrity_prep(struct bio *bio)
        blk_status_t status;
 
        bi = bdev_get_integrity(bio->bi_bdev);
+       if (!bi)
+               return true;
+
        q = bdev_get_queue(bio->bi_bdev);
        if (bio_op(bio) != REQ_OP_READ && bio_op(bio) != REQ_OP_WRITE)
                return true;
@@ -257,9 +260,6 @@ bool bio_integrity_prep(struct bio *bio)
        if (bio_integrity(bio))
                return true;
 
-       if (bi == NULL)
-               return true;
-
        if (bio_data_dir(bio) == READ) {
                if (!bi->profile->verify_fn ||
                    !(bi->flags & BLK_INTEGRITY_VERIFY))