Skip to content

Commit 8e71afb

Browse files
zhangguopengaxboe
zhangguopeng
authored and
axboe
committed
block: Replace sprintf() with sysfs_emit()
Per Documentation/filesystems/sysfs.rst, show() should only use sysfs_emit() or sysfs_emit_at() when formatting the value to be returned to user space. No functional change intended. Signed-off-by: zhangguopeng <[email protected]> Suggested-by: Christoph Hellwig <[email protected]> Reviewed-by: Christoph Hellwig <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jens Axboe <[email protected]>
1 parent 4122fef commit 8e71afb

File tree

2 files changed

+27
-27
lines changed

2 files changed

+27
-27
lines changed

‎block/blk-sysfs.c

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ struct queue_sysfs_entry {
3030
static ssize_t
3131
queue_var_show(unsigned long var, char *page)
3232
{
33-
return sprintf(page, "%lu\n", var);
33+
return sysfs_emit(page, "%lu\n", var);
3434
}
3535

3636
static ssize_t
@@ -121,7 +121,7 @@ QUEUE_SYSFS_LIMIT_SHOW(atomic_write_unit_max)
121121
#define QUEUE_SYSFS_LIMIT_SHOW_SECTORS_TO_BYTES(_field) \
122122
static ssize_t queue_##_field##_show(struct gendisk *disk, char *page) \
123123
{ \
124-
return sprintf(page, "%llu\n", \
124+
return sysfs_emit(page, "%llu\n", \
125125
(unsigned long long)disk->queue->limits._field << \
126126
SECTOR_SHIFT); \
127127
}
@@ -144,7 +144,7 @@ QUEUE_SYSFS_LIMIT_SHOW_SECTORS_TO_KB(max_hw_sectors)
144144
#define QUEUE_SYSFS_SHOW_CONST(_name, _val) \
145145
static ssize_t queue_##_name##_show(struct gendisk *disk, char *page) \
146146
{ \
147-
return sprintf(page, "%d\n", _val); \
147+
return sysfs_emit(page, "%d\n", _val); \
148148
}
149149

150150
/* deprecated fields */
@@ -235,7 +235,7 @@ static ssize_t queue_feature_store(struct gendisk *disk, const char *page,
235235
#define QUEUE_SYSFS_FEATURE(_name, _feature) \
236236
static ssize_t queue_##_name##_show(struct gendisk *disk, char *page) \
237237
{ \
238-
return sprintf(page, "%u\n", \
238+
return sysfs_emit(page, "%u\n", \
239239
!!(disk->queue->limits.features & _feature)); \
240240
} \
241241
static ssize_t queue_##_name##_store(struct gendisk *disk, \
@@ -252,7 +252,7 @@ QUEUE_SYSFS_FEATURE(stable_writes, BLK_FEAT_STABLE_WRITES);
252252
#define QUEUE_SYSFS_FEATURE_SHOW(_name, _feature) \
253253
static ssize_t queue_##_name##_show(struct gendisk *disk, char *page) \
254254
{ \
255-
return sprintf(page, "%u\n", \
255+
return sysfs_emit(page, "%u\n", \
256256
!!(disk->queue->limits.features & _feature)); \
257257
}
258258

@@ -263,8 +263,8 @@ QUEUE_SYSFS_FEATURE_SHOW(dax, BLK_FEAT_DAX);
263263
static ssize_t queue_zoned_show(struct gendisk *disk, char *page)
264264
{
265265
if (blk_queue_is_zoned(disk->queue))
266-
return sprintf(page, "host-managed\n");
267-
return sprintf(page, "none\n");
266+
return sysfs_emit(page, "host-managed\n");
267+
return sysfs_emit(page, "none\n");
268268
}
269269

270270
static ssize_t queue_nr_zones_show(struct gendisk *disk, char *page)
@@ -377,7 +377,7 @@ static ssize_t queue_poll_store(struct gendisk *disk, const char *page,
377377

378378
static ssize_t queue_io_timeout_show(struct gendisk *disk, char *page)
379379
{
380-
return sprintf(page, "%u\n", jiffies_to_msecs(disk->queue->rq_timeout));
380+
return sysfs_emit(page, "%u\n", jiffies_to_msecs(disk->queue->rq_timeout));
381381
}
382382

383383
static ssize_t queue_io_timeout_store(struct gendisk *disk, const char *page,
@@ -398,8 +398,8 @@ static ssize_t queue_io_timeout_store(struct gendisk *disk, const char *page,
398398
static ssize_t queue_wc_show(struct gendisk *disk, char *page)
399399
{
400400
if (blk_queue_write_cache(disk->queue))
401-
return sprintf(page, "write back\n");
402-
return sprintf(page, "write through\n");
401+
return sysfs_emit(page, "write back\n");
402+
return sysfs_emit(page, "write through\n");
403403
}
404404

405405
static ssize_t queue_wc_store(struct gendisk *disk, const char *page,
@@ -530,9 +530,9 @@ static ssize_t queue_wb_lat_show(struct gendisk *disk, char *page)
530530
return -EINVAL;
531531

532532
if (wbt_disabled(disk->queue))
533-
return sprintf(page, "0\n");
533+
return sysfs_emit(page, "0\n");
534534

535-
return sprintf(page, "%llu\n",
535+
return sysfs_emit(page, "%llu\n",
536536
div_u64(wbt_get_min_lat(disk->queue), 1000));
537537
}
538538

‎block/genhd.c

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -783,7 +783,7 @@ static ssize_t disk_badblocks_show(struct device *dev,
783783
struct gendisk *disk = dev_to_disk(dev);
784784

785785
if (!disk->bb)
786-
return sprintf(page, "\n");
786+
return sysfs_emit(page, "\n");
787787

788788
return badblocks_show(disk->bb, page, 0);
789789
}
@@ -931,15 +931,15 @@ static ssize_t disk_range_show(struct device *dev,
931931
{
932932
struct gendisk *disk = dev_to_disk(dev);
933933

934-
return sprintf(buf, "%d\n", disk->minors);
934+
return sysfs_emit(buf, "%d\n", disk->minors);
935935
}
936936

937937
static ssize_t disk_ext_range_show(struct device *dev,
938938
struct device_attribute *attr, char *buf)
939939
{
940940
struct gendisk *disk = dev_to_disk(dev);
941941

942-
return sprintf(buf, "%d\n",
942+
return sysfs_emit(buf, "%d\n",
943943
(disk->flags & GENHD_FL_NO_PART) ? 1 : DISK_MAX_PARTS);
944944
}
945945

@@ -948,7 +948,7 @@ static ssize_t disk_removable_show(struct device *dev,
948948
{
949949
struct gendisk *disk = dev_to_disk(dev);
950950

951-
return sprintf(buf, "%d\n",
951+
return sysfs_emit(buf, "%d\n",
952952
(disk->flags & GENHD_FL_REMOVABLE ? 1 : 0));
953953
}
954954

@@ -957,7 +957,7 @@ static ssize_t disk_hidden_show(struct device *dev,
957957
{
958958
struct gendisk *disk = dev_to_disk(dev);
959959

960-
return sprintf(buf, "%d\n",
960+
return sysfs_emit(buf, "%d\n",
961961
(disk->flags & GENHD_FL_HIDDEN ? 1 : 0));
962962
}
963963

@@ -966,13 +966,13 @@ static ssize_t disk_ro_show(struct device *dev,
966966
{
967967
struct gendisk *disk = dev_to_disk(dev);
968968

969-
return sprintf(buf, "%d\n", get_disk_ro(disk) ? 1 : 0);
969+
return sysfs_emit(buf, "%d\n", get_disk_ro(disk) ? 1 : 0);
970970
}
971971

972972
ssize_t part_size_show(struct device *dev,
973973
struct device_attribute *attr, char *buf)
974974
{
975-
return sprintf(buf, "%llu\n", bdev_nr_sectors(dev_to_bdev(dev)));
975+
return sysfs_emit(buf, "%llu\n", bdev_nr_sectors(dev_to_bdev(dev)));
976976
}
977977

978978
ssize_t part_stat_show(struct device *dev,
@@ -989,7 +989,7 @@ ssize_t part_stat_show(struct device *dev,
989989
part_stat_unlock();
990990
}
991991
part_stat_read_all(bdev, &stat);
992-
return sprintf(buf,
992+
return sysfs_emit(buf,
993993
"%8lu %8lu %8llu %8u "
994994
"%8lu %8lu %8llu %8u "
995995
"%8u %8u %8u "
@@ -1031,14 +1031,14 @@ ssize_t part_inflight_show(struct device *dev, struct device_attribute *attr,
10311031
else
10321032
part_in_flight_rw(bdev, inflight);
10331033

1034-
return sprintf(buf, "%8u %8u\n", inflight[0], inflight[1]);
1034+
return sysfs_emit(buf, "%8u %8u\n", inflight[0], inflight[1]);
10351035
}
10361036

10371037
static ssize_t disk_capability_show(struct device *dev,
10381038
struct device_attribute *attr, char *buf)
10391039
{
10401040
dev_warn_once(dev, "the capability attribute has been deprecated.\n");
1041-
return sprintf(buf, "0\n");
1041+
return sysfs_emit(buf, "0\n");
10421042
}
10431043

10441044
static ssize_t disk_alignment_offset_show(struct device *dev,
@@ -1047,7 +1047,7 @@ static ssize_t disk_alignment_offset_show(struct device *dev,
10471047
{
10481048
struct gendisk *disk = dev_to_disk(dev);
10491049

1050-
return sprintf(buf, "%d\n", bdev_alignment_offset(disk->part0));
1050+
return sysfs_emit(buf, "%d\n", bdev_alignment_offset(disk->part0));
10511051
}
10521052

10531053
static ssize_t disk_discard_alignment_show(struct device *dev,
@@ -1056,21 +1056,21 @@ static ssize_t disk_discard_alignment_show(struct device *dev,
10561056
{
10571057
struct gendisk *disk = dev_to_disk(dev);
10581058

1059-
return sprintf(buf, "%d\n", bdev_alignment_offset(disk->part0));
1059+
return sysfs_emit(buf, "%d\n", bdev_alignment_offset(disk->part0));
10601060
}
10611061

10621062
static ssize_t diskseq_show(struct device *dev,
10631063
struct device_attribute *attr, char *buf)
10641064
{
10651065
struct gendisk *disk = dev_to_disk(dev);
10661066

1067-
return sprintf(buf, "%llu\n", disk->diskseq);
1067+
return sysfs_emit(buf, "%llu\n", disk->diskseq);
10681068
}
10691069

10701070
static ssize_t partscan_show(struct device *dev,
10711071
struct device_attribute *attr, char *buf)
10721072
{
1073-
return sprintf(buf, "%u\n", disk_has_partscan(dev_to_disk(dev)));
1073+
return sysfs_emit(buf, "%u\n", disk_has_partscan(dev_to_disk(dev)));
10741074
}
10751075

10761076
static DEVICE_ATTR(range, 0444, disk_range_show, NULL);
@@ -1092,7 +1092,7 @@ static DEVICE_ATTR(partscan, 0444, partscan_show, NULL);
10921092
ssize_t part_fail_show(struct device *dev,
10931093
struct device_attribute *attr, char *buf)
10941094
{
1095-
return sprintf(buf, "%d\n",
1095+
return sysfs_emit(buf, "%d\n",
10961096
bdev_test_flag(dev_to_bdev(dev), BD_MAKE_IT_FAIL));
10971097
}
10981098

0 commit comments

Comments
 (0)