]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
block: switch on bio operation in bio_integrity_prep
authorChristoph Hellwig <hch@lst.de>
Wed, 26 Jun 2024 04:59:37 +0000 (06:59 +0200)
committerJens Axboe <axboe@kernel.dk>
Fri, 28 Jun 2024 16:29:41 +0000 (10:29 -0600)
Use a single switch to perform read and write specific checks and exit
early for other operations instead of having two checks using different
predicates.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Kanchan Joshi <joshi.k@samsung.com>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Link: https://lore.kernel.org/r/20240626045950.189758-5-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/bio-integrity.c

index 2da7fb222a3582f416cfe56dea365866fda94a32..2f8a4617003473602f4108ec772d629de204fa49 100644 (file)
@@ -435,9 +435,6 @@ bool bio_integrity_prep(struct bio *bio)
        if (!bi)
                return true;
 
-       if (bio_op(bio) != REQ_OP_READ && bio_op(bio) != REQ_OP_WRITE)
-               return true;
-
        if (!bio_sectors(bio))
                return true;
 
@@ -445,10 +442,12 @@ bool bio_integrity_prep(struct bio *bio)
        if (bio_integrity(bio))
                return true;
 
-       if (bio_data_dir(bio) == READ) {
+       switch (bio_op(bio)) {
+       case REQ_OP_READ:
                if (bi->flags & BLK_INTEGRITY_NOVERIFY)
                        return true;
-       } else {
+               break;
+       case REQ_OP_WRITE:
                if (bi->flags & BLK_INTEGRITY_NOGENERATE)
                        return true;
 
@@ -459,6 +458,9 @@ bool bio_integrity_prep(struct bio *bio)
                 */
                if (bi->csum_type == BLK_INTEGRITY_CSUM_NONE)
                        gfp |= __GFP_ZERO;
+               break;
+       default:
+               return true;
        }
 
        /* Allocate kernel buffer for protection data */