block: rename tuple_size field in blk_integrity to metadata_size

The tuple_size field in blk_integrity currently represents the total
size of metadata associated with each data interval. To make the meaning
more explicit, rename tuple_size to metadata_size. This is a purely
mechanical rename with no functional changes.

Suggested-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Anuj Gupta <anuj20.g@samsung.com>
Link: https://lore.kernel.org/20250630090548.3317-2-anuj20.g@samsung.com
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Christian Brauner <brauner@kernel.org>

diff --git a/block/bio-integrity-auto.c b/block/bio-integrity-auto.c
index 9c66576647920149ddc912e8bc0f1e32910f080b..687952f63bbbfe7658fa50f3ee489cf9cd4ee268 100644 (file)
--- a/block/bio-integrity-auto.c
+++ b/block/bio-integrity-auto.c
@@ -54,10 +54,10 @@ static bool bi_offload_capable(struct blk_integrity *bi)
 {
        switch (bi->csum_type) {
        case BLK_INTEGRITY_CSUM_CRC64:
-               return bi->tuple_size == sizeof(struct crc64_pi_tuple);
+               return bi->metadata_size == sizeof(struct crc64_pi_tuple);
        case BLK_INTEGRITY_CSUM_CRC:
        case BLK_INTEGRITY_CSUM_IP:
-               return bi->tuple_size == sizeof(struct t10_pi_tuple);
+               return bi->metadata_size == sizeof(struct t10_pi_tuple);
        default:
                pr_warn_once("%s: unknown integrity checksum type:%d\n",
                        __func__, bi->csum_type);

diff --git a/block/blk-integrity.c b/block/blk-integrity.c
index e4e2567061f9dbefbffe4e8c0fe61e58aa0966dc..c1102bf4cd8d11c67477201acdf788095ba8b8ed 100644 (file)
--- a/block/blk-integrity.c
+++ b/block/blk-integrity.c
@@ -239,7 +239,7 @@ static ssize_t format_show(struct device *dev, struct device_attribute *attr,
 {
        struct blk_integrity *bi = dev_to_bi(dev);
 
-       if (!bi->tuple_size)
+       if (!bi->metadata_size)
                return sysfs_emit(page, "none\n");
        return sysfs_emit(page, "%s\n", blk_integrity_profile_name(bi));
 }

diff --git a/block/blk-settings.c b/block/blk-settings.c
index a000daafbfb489fa6a23c794af0f9bbe3513e1bb..787500ff00c3cdd88fd053102440c735dd76c8f9 100644 (file)
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@ -114,7 +114,7 @@ static int blk_validate_integrity_limits(struct queue_limits *lim)
 {
        struct blk_integrity *bi = &lim->integrity;
 
-       if (!bi->tuple_size) {
+       if (!bi->metadata_size) {
                if (bi->csum_type != BLK_INTEGRITY_CSUM_NONE ||
                    bi->tag_size || ((bi->flags & BLK_INTEGRITY_REF_TAG))) {
                        pr_warn("invalid PI settings.\n");
@@ -875,7 +875,7 @@ bool queue_limits_stack_integrity(struct queue_limits *t,
                return true;
 
        if (ti->flags & BLK_INTEGRITY_STACKED) {
-               if (ti->tuple_size != bi->tuple_size)
+               if (ti->metadata_size != bi->metadata_size)
                        goto incompatible;
                if (ti->interval_exp != bi->interval_exp)
                        goto incompatible;
@@ -891,7 +891,7 @@ bool queue_limits_stack_integrity(struct queue_limits *t,
                ti->flags |= (bi->flags & BLK_INTEGRITY_DEVICE_CAPABLE) |
                             (bi->flags & BLK_INTEGRITY_REF_TAG);
                ti->csum_type = bi->csum_type;
-               ti->tuple_size = bi->tuple_size;
+               ti->metadata_size = bi->metadata_size;
                ti->pi_offset = bi->pi_offset;
                ti->interval_exp = bi->interval_exp;
                ti->tag_size = bi->tag_size;

diff --git a/block/t10-pi.c b/block/t10-pi.c
index 851db518ee5e89fed724a5c60878ee62c773e968..0c4ed97021460a0dbd05b1ccb56cb6c989988082 100644 (file)
--- a/block/t10-pi.c
+++ b/block/t10-pi.c
@@ -56,7 +56,7 @@ static void t10_pi_generate(struct blk_integrity_iter *iter,
                        pi->ref_tag = 0;
 
                iter->data_buf += iter->interval;
-               iter->prot_buf += bi->tuple_size;
+               iter->prot_buf += bi->metadata_size;
                iter->seed++;
        }
 }
@@ -105,7 +105,7 @@ static blk_status_t t10_pi_verify(struct blk_integrity_iter *iter,
 
 next:
                iter->data_buf += iter->interval;
-               iter->prot_buf += bi->tuple_size;
+               iter->prot_buf += bi->metadata_size;
                iter->seed++;
        }
 
@@ -125,7 +125,7 @@ next:
 static void t10_pi_type1_prepare(struct request *rq)
 {
        struct blk_integrity *bi = &rq->q->limits.integrity;
-       const int tuple_sz = bi->tuple_size;
+       const int tuple_sz = bi->metadata_size;
        u32 ref_tag = t10_pi_ref_tag(rq);
        u8 offset = bi->pi_offset;
        struct bio *bio;
@@ -177,7 +177,7 @@ static void t10_pi_type1_complete(struct request *rq, unsigned int nr_bytes)
 {
        struct blk_integrity *bi = &rq->q->limits.integrity;
        unsigned intervals = nr_bytes >> bi->interval_exp;
-       const int tuple_sz = bi->tuple_size;
+       const int tuple_sz = bi->metadata_size;
        u32 ref_tag = t10_pi_ref_tag(rq);
        u8 offset = bi->pi_offset;
        struct bio *bio;
@@ -234,7 +234,7 @@ static void ext_pi_crc64_generate(struct blk_integrity_iter *iter,
                        put_unaligned_be48(0ULL, pi->ref_tag);
 
                iter->data_buf += iter->interval;
-               iter->prot_buf += bi->tuple_size;
+               iter->prot_buf += bi->metadata_size;
                iter->seed++;
        }
 }
@@ -289,7 +289,7 @@ static blk_status_t ext_pi_crc64_verify(struct blk_integrity_iter *iter,
 
 next:
                iter->data_buf += iter->interval;
-               iter->prot_buf += bi->tuple_size;
+               iter->prot_buf += bi->metadata_size;
                iter->seed++;
        }
 
@@ -299,7 +299,7 @@ next:
 static void ext_pi_type1_prepare(struct request *rq)
 {
        struct blk_integrity *bi = &rq->q->limits.integrity;
-       const int tuple_sz = bi->tuple_size;
+       const int tuple_sz = bi->metadata_size;
        u64 ref_tag = ext_pi_ref_tag(rq);
        u8 offset = bi->pi_offset;
        struct bio *bio;
@@ -340,7 +340,7 @@ static void ext_pi_type1_complete(struct request *rq, unsigned int nr_bytes)
 {
        struct blk_integrity *bi = &rq->q->limits.integrity;
        unsigned intervals = nr_bytes >> bi->interval_exp;
-       const int tuple_sz = bi->tuple_size;
+       const int tuple_sz = bi->metadata_size;
        u64 ref_tag = ext_pi_ref_tag(rq);
        u8 offset = bi->pi_offset;
        struct bio *bio;

diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index 9dfdb63220d746241d4d490058dc1ef6c374811c..3d6d06b94c9f998d3c4209795924988083136571 100644 (file)
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -1189,11 +1189,11 @@ static int crypt_integrity_ctr(struct crypt_config *cc, struct dm_target *ti)
                return -EINVAL;
        }
 
-       if (bi->tuple_size < cc->used_tag_size) {
+       if (bi->metadata_size < cc->used_tag_size) {
                ti->error = "Integrity profile tag size mismatch.";
                return -EINVAL;
        }
-       cc->tuple_size = bi->tuple_size;
+       cc->tuple_size = bi->metadata_size;
        if (1 << bi->interval_exp != cc->sector_size) {
                ti->error = "Integrity profile sector size mismatch.";
                return -EINVAL;

diff --git a/drivers/md/dm-integrity.c b/drivers/md/dm-integrity.c
index 4395657fa5838efbc96d98f7420986b0544d9847..efeee0a873c0646235d6f221dfda9242f27b8ada 100644 (file)
--- a/drivers/md/dm-integrity.c
+++ b/drivers/md/dm-integrity.c
@@ -3906,8 +3906,8 @@ static void dm_integrity_io_hints(struct dm_target *ti, struct queue_limits *lim
                struct blk_integrity *bi = &limits->integrity;
 
                memset(bi, 0, sizeof(*bi));
-               bi->tuple_size = ic->tag_size;
-               bi->tag_size = bi->tuple_size;
+               bi->metadata_size = ic->tag_size;
+               bi->tag_size = bi->metadata_size;
                bi->interval_exp =
                        ic->sb->log2_sectors_per_block + SECTOR_SHIFT;
        }
@@ -4746,18 +4746,18 @@ static int dm_integrity_ctr(struct dm_target *ti, unsigned int argc, char **argv
                        ti->error = "Integrity profile not supported";
                        goto bad;
                }
-               /*printk("tag_size: %u, tuple_size: %u\n", bi->tag_size, bi->tuple_size);*/
-               if (bi->tuple_size < ic->tag_size) {
+               /*printk("tag_size: %u, metadata_size: %u\n", bi->tag_size, bi->metadata_size);*/
+               if (bi->metadata_size < ic->tag_size) {
                        r = -EINVAL;
                        ti->error = "The integrity profile is smaller than tag size";
                        goto bad;
                }
-               if ((unsigned long)bi->tuple_size > PAGE_SIZE / 2) {
+               if ((unsigned long)bi->metadata_size > PAGE_SIZE / 2) {
                        r = -EINVAL;
                        ti->error = "Too big tuple size";
                        goto bad;
                }
-               ic->tuple_size = bi->tuple_size;
+               ic->tuple_size = bi->metadata_size;
                if (1 << bi->interval_exp != ic->sectors_per_block << SECTOR_SHIFT) {
                        r = -EINVAL;
                        ti->error = "Integrity profile sector size mismatch";

diff --git a/drivers/nvdimm/btt.c b/drivers/nvdimm/btt.c
index 423dcd190906141b333c6d59c83e2f3607e4c29c..2a1aa32e66938380867665612aa6a35f008cae54 100644 (file)
--- a/drivers/nvdimm/btt.c
+++ b/drivers/nvdimm/btt.c
@@ -1506,7 +1506,7 @@ static int btt_blk_init(struct btt *btt)
        int rc;
 
        if (btt_meta_size(btt) && IS_ENABLED(CONFIG_BLK_DEV_INTEGRITY)) {
-               lim.integrity.tuple_size = btt_meta_size(btt);
+               lim.integrity.metadata_size = btt_meta_size(btt);
                lim.integrity.tag_size = btt_meta_size(btt);
        }
 

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 92697f98c601d4b89a1681bdfa1adca45e86af4a..b027dda38e69230f9e19c7d6b511004d91aa2995 100644 (file)
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1866,7 +1866,7 @@ static bool nvme_init_integrity(struct nvme_ns_head *head,
                break;
        }
 
-       bi->tuple_size = head->ms;
+       bi->metadata_size = head->ms;
        bi->pi_offset = info->pi_offset;
        return true;
 }

diff --git a/drivers/nvme/target/io-cmd-bdev.c b/drivers/nvme/target/io-cmd-bdev.c
index eba42df2f8215e41277102a922d2a67a72243f1e..42fb19f94ab8cd97f5950f948029eeb047947bd7 100644 (file)
--- a/drivers/nvme/target/io-cmd-bdev.c
+++ b/drivers/nvme/target/io-cmd-bdev.c
@@ -65,7 +65,7 @@ static void nvmet_bdev_ns_enable_integrity(struct nvmet_ns *ns)
                return;
 
        if (bi->csum_type == BLK_INTEGRITY_CSUM_CRC) {
-               ns->metadata_size = bi->tuple_size;
+               ns->metadata_size = bi->metadata_size;
                if (bi->flags & BLK_INTEGRITY_REF_TAG)
                        ns->pi_type = NVME_NS_DPS_PI_TYPE1;
                else

diff --git a/drivers/scsi/sd_dif.c b/drivers/scsi/sd_dif.c
index ae6ce6f5d622d9d613c4fd2839955e77a1192f74..18bfca1f1c783a2dc68c03eef164638fc91d9319 100644 (file)
--- a/drivers/scsi/sd_dif.c
+++ b/drivers/scsi/sd_dif.c
@@ -52,7 +52,7 @@ void sd_dif_config_host(struct scsi_disk *sdkp, struct queue_limits *lim)
        if (type != T10_PI_TYPE3_PROTECTION)
                bi->flags |= BLK_INTEGRITY_REF_TAG;
 
-       bi->tuple_size = sizeof(struct t10_pi_tuple);
+       bi->metadata_size = sizeof(struct t10_pi_tuple);
 
        if (dif && type) {
                bi->flags |= BLK_INTEGRITY_DEVICE_CAPABLE;

diff --git a/include/linux/blk-integrity.h b/include/linux/blk-integrity.h
index c7eae0bfb013f171eadb34e7b107cf451e356287..d27730da47f36a265c85e107a1d3b4c01a7c54b3 100644 (file)
--- a/include/linux/blk-integrity.h
+++ b/include/linux/blk-integrity.h
@@ -33,7 +33,7 @@ int blk_rq_integrity_map_user(struct request *rq, void __user *ubuf,
 static inline bool
 blk_integrity_queue_supports_integrity(struct request_queue *q)
 {
-       return q->limits.integrity.tuple_size;
+       return q->limits.integrity.metadata_size;
 }
 
 static inline struct blk_integrity *blk_get_integrity(struct gendisk *disk)
@@ -74,7 +74,7 @@ static inline unsigned int bio_integrity_intervals(struct blk_integrity *bi,
 static inline unsigned int bio_integrity_bytes(struct blk_integrity *bi,
                                               unsigned int sectors)
 {
-       return bio_integrity_intervals(bi, sectors) * bi->tuple_size;
+       return bio_integrity_intervals(bi, sectors) * bi->metadata_size;
 }
 
 static inline bool blk_integrity_rq(struct request *rq)

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index a59880c809c7bd92aff5a16020371cf1413a3e1b..ccda87d06a38d5d6c9bcdad532fd6eaa27ead14f 100644 (file)
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -116,7 +116,7 @@ enum blk_integrity_checksum {
 struct blk_integrity {
        unsigned char                           flags;
        enum blk_integrity_checksum             csum_type;
-       unsigned char                           tuple_size;
+       unsigned char                           metadata_size;
        unsigned char                           pi_offset;
        unsigned char                           interval_exp;
        unsigned char                           tag_size;