block: refactor to use helper

Reduce some code by making use of bio_integrity_bytes().

Signed-off-by: Nitesh Shetty <nj.shetty@samsung.com>
Reviewed-by: "Martin K. Petersen" <martin.petersen@oracle.com>
Link: https://lore.kernel.org/r/20230719121608.32105-1-nj.shetty@samsung.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/bio-integrity.c b/block/bio-integrity.c
index 4533eb49166109b20cd3f3d37427c761d630ed6e..8f0af7ac8573b6d2200a0bc8df5c8b4c70966137 100644 (file)
--- a/block/bio-integrity.c
+++ b/block/bio-integrity.c
@@ -199,7 +199,6 @@ bool bio_integrity_prep(struct bio *bio)
        unsigned long start, end;
        unsigned int len, nr_pages;
        unsigned int bytes, offset, i;
-       unsigned int intervals;
        blk_status_t status;
 
        if (!bi)
@@ -224,10 +223,9 @@ bool bio_integrity_prep(struct bio *bio)
                    !(bi->flags & BLK_INTEGRITY_GENERATE))
                        return true;
        }
-       intervals = bio_integrity_intervals(bi, bio_sectors(bio));
 
        /* Allocate kernel buffer for protection data */
-       len = intervals * bi->tuple_size;
+       len = bio_integrity_bytes(bi, bio_sectors(bio));
        buf = kmalloc(len, GFP_NOIO);
        status = BLK_STS_RESOURCE;
        if (unlikely(buf == NULL)) {