| Message ID | 20250315141640564lv7R0CwIRPsmittXXjLbB@zte.com.cn (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [linux-next] ocfs2: use sysfs_emit() instead of scnprintf(). | expand |
On 15. 03. 25, 7:16, xie.ludan@zte.com.cn wrote: > From: XieLudan <xie.ludan@zte.com.cn> > > > 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. > > > Signed-off-by: XieLudan <xie.ludan@zte.com.cn> > > --- > > fs/ocfs2/cluster/heartbeat.c | 10 +++++----- > > 1 file changed, 5 insertions(+), 5 deletions(-) > > > diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c > > index 724350925aff..8282fc193906 100644 > > --- a/fs/ocfs2/cluster/heartbeat.c > > +++ b/fs/ocfs2/cluster/heartbeat.c > > @@ -1308,7 +1308,7 @@ static int o2hb_debug_open(struct inode *inode, > struct file *file) > > 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", This is wrong too [1]. [1] https://lore.kernel.org/all/9c552d9a-2d46-4069-a9c4-35fab857bfc3@kernel.org/ regards,
diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c index 724350925aff..8282fc193906 100644 --- a/fs/ocfs2/cluster/heartbeat.c +++ b/fs/ocfs2/cluster/heartbeat.c @@ -1308,7 +1308,7 @@ static int o2hb_debug_open(struct inode *inode, struct file *file) 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 *inode, struct file *file) /* 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 *inode, struct file *file) } 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);