Unverified Commit c6603b1d authored by Anuj Gupta's avatar Anuj Gupta Committed by Christian Brauner
Browse files

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: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarAnuj Gupta <anuj20.g@samsung.com>
Link: https://lore.kernel.org/20250630090548.3317-2-anuj20.g@samsung.com


Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent 19272b37

block/bio-integrity-auto.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

block/blk-integrity.c

+1 −1
Original line number Diff line number Diff line
@@ -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));

}

block/blk-settings.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

block/t10-pi.c

+8 −8
Original line number Diff line number Diff line
@@ -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 @@ static blk_status_t t10_pi_verify(struct blk_integrity_iter *iter, 
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 @@ static blk_status_t ext_pi_crc64_verify(struct blk_integrity_iter *iter, 
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;

drivers/md/dm-crypt.c

+2 −2
Original line number Diff line number Diff line
@@ -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;