Commit 1366251a authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: factor out flag_{store,show} helper for integrity 



Factor the duplicate code for the generate and verify attributes into
common helpers.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarKeith Busch <kbusch@kernel.org>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Link: https://lore.kernel.org/r/20240613084839.1044015-8-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent e8bc14d1

block/blk-integrity.c

+26 −27
Original line number Diff line number Diff line
@@ -243,6 +243,28 @@ const char *blk_integrity_profile_name(struct blk_integrity *bi) 
}

EXPORT_SYMBOL_GPL(blk_integrity_profile_name);



static ssize_t flag_store(struct device *dev, struct device_attribute *attr,

		const char *page, size_t count, unsigned char flag)

{

	struct blk_integrity *bi = dev_to_bi(dev);

	char *p = (char *) page;

	unsigned long val = simple_strtoul(p, &p, 10);



	if (val)

		bi->flags |= flag;

	else

		bi->flags &= ~flag;

	return count;

}



static ssize_t flag_show(struct device *dev, struct device_attribute *attr,

		char *page, unsigned char flag)

{

	struct blk_integrity *bi = dev_to_bi(dev);



	return sysfs_emit(page, "%d\n", !!(bi->flags & flag));

}



static ssize_t format_show(struct device *dev, struct device_attribute *attr,

			   char *page)

{
@@ -275,49 +297,26 @@ static ssize_t read_verify_store(struct device *dev, 
				 struct device_attribute *attr,

				 const char *page, size_t count)

{

	struct blk_integrity *bi = dev_to_bi(dev);

	char *p = (char *) page;

	unsigned long val = simple_strtoul(p, &p, 10);



	if (val)

		bi->flags |= BLK_INTEGRITY_VERIFY;

	else

		bi->flags &= ~BLK_INTEGRITY_VERIFY;



	return count;

	return flag_store(dev, attr, page, count, BLK_INTEGRITY_VERIFY);

}



static ssize_t read_verify_show(struct device *dev,

				struct device_attribute *attr, char *page)

{

	struct blk_integrity *bi = dev_to_bi(dev);



	return sysfs_emit(page, "%d\n", !!(bi->flags & BLK_INTEGRITY_VERIFY));

	return flag_show(dev, attr, page, BLK_INTEGRITY_VERIFY);

}



static ssize_t write_generate_store(struct device *dev,

				    struct device_attribute *attr,

				    const char *page, size_t count)

{

	struct blk_integrity *bi = dev_to_bi(dev);



	char *p = (char *) page;

	unsigned long val = simple_strtoul(p, &p, 10);



	if (val)

		bi->flags |= BLK_INTEGRITY_GENERATE;

	else

		bi->flags &= ~BLK_INTEGRITY_GENERATE;



	return count;

	return flag_store(dev, attr, page, count, BLK_INTEGRITY_GENERATE);

}



static ssize_t write_generate_show(struct device *dev,

				   struct device_attribute *attr, char *page)

{

	struct blk_integrity *bi = dev_to_bi(dev);



	return sysfs_emit(page, "%d\n", !!(bi->flags & BLK_INTEGRITY_GENERATE));

	return flag_show(dev, attr, page, BLK_INTEGRITY_GENERATE);

}



static ssize_t device_is_integrity_capable_show(struct device *dev,