2023-03-10 22:40:40

by Thomas Weißschuh

Subject: [PATCH v2 1/4] blk-integrity: use sysfs_emit

The correct way to emit data into sysfs is via sysfs_emit(), use it.

Signed-off-by: Thomas Weißschuh <[email protected]>
---
block/blk-integrity.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/block/blk-integrity.c b/block/blk-integrity.c
index 8f01d786f5cb..5dd820ee4d1c 100644
--- a/block/blk-integrity.c
+++ b/block/blk-integrity.c
@@ -248,20 +248,20 @@ static ssize_t integrity_attr_store(struct kobject *kobj,
static ssize_t integrity_format_show(struct blk_integrity *bi, char *page)
{
if (bi->profile && bi->profile->name)
- return sprintf(page, "%s\n", bi->profile->name);
+ return sysfs_emit(page, "%s\n", bi->profile->name);
else
- return sprintf(page, "none\n");
+ return sysfs_emit(page, "none\n");
}

static ssize_t integrity_tag_size_show(struct blk_integrity *bi, char *page)
{
- return sprintf(page, "%u\n", bi->tag_size);
+ return sysfs_emit(page, "%u\n", bi->tag_size);
}

static ssize_t integrity_interval_show(struct blk_integrity *bi, char *page)
{
- return sprintf(page, "%u\n",
- bi->interval_exp ? 1 << bi->interval_exp : 0);
+ return sysfs_emit(page, "%u\n",
+ bi->interval_exp ? 1 << bi->interval_exp : 0);
}

static ssize_t integrity_verify_store(struct blk_integrity *bi,
@@ -280,7 +280,7 @@ static ssize_t integrity_verify_store(struct blk_integrity *bi,

static ssize_t integrity_verify_show(struct blk_integrity *bi, char *page)
{
- return sprintf(page, "%d\n", (bi->flags & BLK_INTEGRITY_VERIFY) != 0);
+ return sysfs_emit(page, "%d\n", (bi->flags & BLK_INTEGRITY_VERIFY) != 0);
}

static ssize_t integrity_generate_store(struct blk_integrity *bi,
@@ -299,13 +299,13 @@ static ssize_t integrity_generate_store(struct blk_integrity *bi,

static ssize_t integrity_generate_show(struct blk_integrity *bi, char *page)
{
- return sprintf(page, "%d\n", (bi->flags & BLK_INTEGRITY_GENERATE) != 0);
+ return sysfs_emit(page, "%d\n", (bi->flags & BLK_INTEGRITY_GENERATE) != 0);
}

static ssize_t integrity_device_show(struct blk_integrity *bi, char *page)
{
- return sprintf(page, "%u\n",
- (bi->flags & BLK_INTEGRITY_DEVICE_CAPABLE) != 0);
+ return sysfs_emit(page, "%u\n",
+ (bi->flags & BLK_INTEGRITY_DEVICE_CAPABLE) != 0);
}

static struct integrity_sysfs_entry integrity_format_entry = {

--
2.39.2

2023-03-15 15:01:43

by Christoph Hellwig

Subject: Re: [PATCH v2 1/4] blk-integrity: use sysfs_emit

> if (bi->profile && bi->profile->name)
> - return sprintf(page, "%s\n", bi->profile->name);
> + return sysfs_emit(page, "%s\n", bi->profile->name);
> else

Might be worth to drop the else here if you touch the function.

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

Please shorten these != 0 to !! expressions, i.e.

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