| From: XieLudan <xie.ludan@zte.com.cn> |
| Subject: ocfs2: use sysfs_emit() instead of scnprintf() |
| Date: Sat, 15 Mar 2025 14:16:40 +0800 (CST) |
| |
| Follow the advice in Documentation/filesystems/sysfs.rst: show() should |
| only use sysfs_emit() or sysfs_emit_at() when formatting the value to be |
| returned to user space. |
| |
| Link: https://lkml.kernel.org/r/20250315141640564lv7R0CwIRPsmittXXjLbB@zte.com.cn |
| Signed-off-by: XieLudan <xie.ludan@zte.com.cn> |
| Cc: Mark Fasheh <mark@fasheh.com> |
| Cc: Joel Becker <jlbec@evilplan.org> |
| Cc: Junxiao Bi <junxiao.bi@oracle.com> |
| Cc: Joseph Qi <jiangqi903@gmail.com> |
| Cc: Changwei Ge <gechangwei@live.cn> |
| Cc: Jun Piao <piaojun@huawei.com> |
| Cc: Jiri Slaby <jirislaby@kernel.org> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| --- |
| |
| fs/ocfs2/cluster/heartbeat.c | 10 +++++----- |
| 1 file changed, 5 insertions(+), 5 deletions(-) |
| |
| --- a/fs/ocfs2/cluster/heartbeat.c~ocfs2-use-sysfs_emit-instead-of-scnprintf |
| +++ a/fs/ocfs2/cluster/heartbeat.c |
| @@ -1308,7 +1308,7 @@ static int o2hb_debug_open(struct inode |
| |
| case O2HB_DB_TYPE_REGION_NUMBER: |
| reg = (struct o2hb_region *)db->db_data; |
| - out += scnprintf(buf + out, PAGE_SIZE - out, "%d\n", |
| + out += sysfs_emit(buf + out, "%d\n", |
| reg->hr_region_num); |
| goto done; |
| |
| @@ -1318,12 +1318,12 @@ static int o2hb_debug_open(struct inode |
| /* If 0, it has never been set before */ |
| if (lts) |
| lts = jiffies_to_msecs(jiffies - lts); |
| - out += scnprintf(buf + out, PAGE_SIZE - out, "%lu\n", lts); |
| + out += sysfs_emit(buf + out, "%lu\n", lts); |
| goto done; |
| |
| case O2HB_DB_TYPE_REGION_PINNED: |
| reg = (struct o2hb_region *)db->db_data; |
| - out += scnprintf(buf + out, PAGE_SIZE - out, "%u\n", |
| + out += sysfs_emit(buf + out, "%u\n", |
| !!reg->hr_item_pinned); |
| goto done; |
| |
| @@ -1332,8 +1332,8 @@ static int o2hb_debug_open(struct inode |
| } |
| |
| while ((i = find_next_bit(map, db->db_len, i + 1)) < db->db_len) |
| - out += scnprintf(buf + out, PAGE_SIZE - out, "%d ", i); |
| - out += scnprintf(buf + out, PAGE_SIZE - out, "\n"); |
| + out += sysfs_emit(buf + out, "%d ", i); |
| + out += sysfs_emit(buf + out, "\n"); |
| |
| done: |
| i_size_write(inode, out); |
| _ |