fs/dlm: use scnprintf() in lockspace show funcs
PATCH 1/1 fs/dlm: use scnprintf() in lockspace show funcs
Replace all snprintf() instances with scnprintf(). snprintf() returns the number of bytes that would have been written had there been enough space. For sysfs attributes, snprintf() should not be used for the show() method. Instead use scnprintf() which returns the number of bytes actually written.
--- fs/dlm/config.c | 2 +- fs/dlm/lockspace.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-)
fs/dlm/config.c +1 -1
@@ -185,7 +185,7 @@ static ssize_t cluster_##name##_store(struct config_item *item, \ } \ static ssize_t cluster_##name##_show(struct config_item *item, char *buf) \ { \ - return snprintf(buf, PAGE_SIZE, "%u\n", dlm_config.ci_##name); \ + return scnprintf(buf, PAGE_SIZE, "%u\n", dlm_config.ci_##name); \ } \ CONFIGFS_ATTR(cluster_, name);
fs/dlm/lockspace.c +4 -4
@@ -69,7 +69,7 @@ static ssize_t dlm_event_store(struct dlm_ls *ls, const char *buf, size_t len)static ssize_t dlm_id_show (struct dlm_ls *ls,char *buf) { -return snprintf (buf,PAGE_SIZE ,"%u\n" , ls->ls_global_id); +return scnprintf (buf,PAGE_SIZE ,"%u\n" , ls->ls_global_id); }static ssize_t dlm_id_store (struct dlm_ls *ls,const char *buf,size_t len)
@@ -83,7 +83,7 @@ static ssize_t dlm_id_store(struct dlm_ls *ls, const char *buf, size_t len)static ssize_t dlm_nodir_show (struct dlm_ls *ls,char *buf) { -return snprintf (buf,PAGE_SIZE ,"%u\n" ,dlm_no_directory (ls)); +return scnprintf (buf,PAGE_SIZE ,"%u\n" ,dlm_no_directory (ls)); }static ssize_t dlm_nodir_store (struct dlm_ls *ls,const char *buf,size_t len)
@@ -101,12 +101,12 @@ static ssize_t dlm_nodir_store(struct dlm_ls *ls, const char *buf, size_t len)static ssize_t dlm_recover_status_show (struct dlm_ls *ls,char *buf) {uint32_t status =dlm_recover_status (ls); -return snprintf (buf,PAGE_SIZE ,"%x\n" , status); +return scnprintf (buf,PAGE_SIZE ,"%x\n" , status); }static ssize_t dlm_recover_nodeid_show (struct dlm_ls *ls,char *buf) { -return snprintf (buf,PAGE_SIZE ,"%d\n" , ls->ls_recover_nodeid); +return scnprintf (buf,PAGE_SIZE ,"%d\n" , ls->ls_recover_nodeid); }struct dlm_attr {
Signature · 1 line
2.49.0
Quoted 17 lines · Pranav Tyagi
Replace all
snprintf()instances withscnprintf().snprintf()returns the number of bytes that would have been written had there been enough space. For sysfs attributes,snprintf()should not be used for theshow()method. Instead usescnprintf()which returns the number of bytes actually written.Signed-off-by Pranav Tyagi <[email protected]>--- fs/dlm/config.c | 2 +- fs/dlm/lockspace.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-)fs/dlm/config.c +0
-0
fs/dlm/config.c static ssize_t cluster_##name##_store(struct config_item *item, \ · line 188
Quoted 5 lines
fs/dlm/config.c +1
-1@@ -185,7 +185,7 @@ static ssize_t cluster_##name##_store(struct config_item *item, \ } \ static ssize_t cluster_##name##_show(struct config_item *item, char *buf) \ { \ - return snprintf(buf, PAGE_SIZE, "%u\n", dlm_config.ci_##name); \ + return scnprintf(buf, PAGE_SIZE, "%u\n", dlm_config.ci_##name); \
sysfs_emit() or no change at all please.