[PATCH] orangefs: use sysfs_emit() to instead of scnprintf()
From: ye.xingchen
Date: Mon Dec 05 2022 - 06:03:57 EST
From: ye xingchen <ye.xingchen@xxxxxxxxxx>
Follow the advice of the Documentation/filesystems/sysfs.rst and show()
should only use sysfs_emit() or sysfs_emit_at() when formatting the
value to be returned to user space.
Signed-off-by: ye xingchen <ye.xingchen@xxxxxxxxxx>
---
fs/orangefs/orangefs-sysfs.c | 45 ++++++++----------------------------
1 file changed, 10 insertions(+), 35 deletions(-)
diff --git a/fs/orangefs/orangefs-sysfs.c b/fs/orangefs/orangefs-sysfs.c
index de80b62553bb..c89f16052e92 100644
--- a/fs/orangefs/orangefs-sysfs.c
+++ b/fs/orangefs/orangefs-sysfs.c
@@ -217,38 +217,23 @@ static ssize_t sysfs_int_show(struct kobject *kobj,
if (!strcmp(kobj->name, ORANGEFS_KOBJ_ID)) {
if (!strcmp(attr->attr.name, "op_timeout_secs")) {
- rc = scnprintf(buf,
- PAGE_SIZE,
- "%d\n",
- op_timeout_secs);
+ rc = sysfs_emit(buf, "%d\n", op_timeout_secs);
goto out;
} else if (!strcmp(attr->attr.name,
"slot_timeout_secs")) {
- rc = scnprintf(buf,
- PAGE_SIZE,
- "%d\n",
- slot_timeout_secs);
+ rc = sysfs_emit(buf, "%d\n", slot_timeout_secs);
goto out;
} else if (!strcmp(attr->attr.name,
"cache_timeout_msecs")) {
- rc = scnprintf(buf,
- PAGE_SIZE,
- "%d\n",
- orangefs_cache_timeout_msecs);
+ rc = sysfs_emit(buf, "%d\n", orangefs_cache_timeout_msecs);
goto out;
} else if (!strcmp(attr->attr.name,
"dcache_timeout_msecs")) {
- rc = scnprintf(buf,
- PAGE_SIZE,
- "%d\n",
- orangefs_dcache_timeout_msecs);
+ rc = sysfs_emit(buf, "%d\n", orangefs_dcache_timeout_msecs);
goto out;
} else if (!strcmp(attr->attr.name,
"getattr_timeout_msecs")) {
- rc = scnprintf(buf,
- PAGE_SIZE,
- "%d\n",
- orangefs_getattr_timeout_msecs);
+ rc = sysfs_emit(buf, "%d\n", orangefs_getattr_timeout_msecs);
goto out;
} else {
goto out;
@@ -256,16 +241,10 @@ static ssize_t sysfs_int_show(struct kobject *kobj,
} else if (!strcmp(kobj->name, STATS_KOBJ_ID)) {
if (!strcmp(attr->attr.name, "reads")) {
- rc = scnprintf(buf,
- PAGE_SIZE,
- "%lu\n",
- orangefs_stats.reads);
+ rc = sysfs_emit(buf, "%lu\n", orangefs_stats.reads);
goto out;
} else if (!strcmp(attr->attr.name, "writes")) {
- rc = scnprintf(buf,
- PAGE_SIZE,
- "%lu\n",
- orangefs_stats.writes);
+ rc = sysfs_emit(buf, "%lu\n", orangefs_stats.writes);
goto out;
} else {
goto out;
@@ -497,21 +476,17 @@ static ssize_t sysfs_service_op_show(struct kobject *kobj,
if (strcmp(kobj->name, PC_KOBJ_ID)) {
if (new_op->upcall.req.param.op ==
ORANGEFS_PARAM_REQUEST_OP_READAHEAD_COUNT_SIZE) {
- rc = scnprintf(buf, PAGE_SIZE, "%d %d\n",
+ rc = sysfs_emit(buf, "%d %d\n",
(int)new_op->downcall.resp.param.u.
value32[0],
(int)new_op->downcall.resp.param.u.
value32[1]);
} else {
- rc = scnprintf(buf, PAGE_SIZE, "%d\n",
+ rc = sysfs_emit(buf, "%d\n",
(int)new_op->downcall.resp.param.u.value64);
}
} else {
- rc = scnprintf(
- buf,
- PAGE_SIZE,
- "%s",
- new_op->downcall.resp.perf_count.buffer);
+ rc = sysfs_emit(buf, "%s", new_op->downcall.resp.perf_count.buffer);
}
}
--
2.25.1