Skip to content

Commit 3315e16

Browse files
t-8chaxboe
authored andcommitted
blk-integrity: use sysfs_emit
The correct way to emit data into sysfs is via sysfs_emit(), use it. Also perform some trivial syntactic cleanups. Signed-off-by: Thomas Weißschuh <linux@weissschuh.net> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com> Link: https://lore.kernel.org/r/20230309-kobj_release-gendisk_integrity-v3-1-ceccb4493c46@weissschuh.net Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 3f89ac5 commit 3315e16

1 file changed

Lines changed: 9 additions & 10 deletions

File tree

block/blk-integrity.c

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -248,20 +248,19 @@ static ssize_t integrity_attr_store(struct kobject *kobj,
248248
static ssize_t integrity_format_show(struct blk_integrity *bi, char *page)
249249
{
250250
if (bi->profile && bi->profile->name)
251-
return sprintf(page, "%s\n", bi->profile->name);
252-
else
253-
return sprintf(page, "none\n");
251+
return sysfs_emit(page, "%s\n", bi->profile->name);
252+
return sysfs_emit(page, "none\n");
254253
}
255254

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

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

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

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

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

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

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

311310
static struct integrity_sysfs_entry integrity_format_entry = {

0 commit comments

Comments
 (0)