SUNRPC: Use sysfs_emit in place of strlcpy/sprintf
Subsystems (4)
PATCH v3 1/1 SUNRPC: Use sysfs_emit in place of strlcpy/sprintf
Part of an effort to remove strlcpy() tree-wide [1].
Direct replacement is safe here since the getter in kernel_params_ops handles -errno return [2].
[1] https://github.com/KSPP/linux/issues/89
[2] https://elixir.bootlin.com/linux/v6.4-rc6/source/include/linux/moduleparam.h#L52
--- net/sunrpc/svc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
net/sunrpc/svc.c +5 -5
@@ -109,15 +109,15 @@ param_get_pool_mode(char *buf, const struct kernel_param *kp)switch (*ip) {case SVC_POOL_AUTO : -return strlcpy (buf,"auto\n" ,20 ); +return sysfs_emit (buf,"auto\n" );case SVC_POOL_GLOBAL : -return strlcpy (buf,"global\n" ,20 ); +return sysfs_emit (buf,"global\n" );case SVC_POOL_PERCPU : -return strlcpy (buf,"percpu\n" ,20 ); +return sysfs_emit (buf,"percpu\n" );case SVC_POOL_PERNODE : -return strlcpy (buf,"pernode\n" ,20 ); +return sysfs_emit (buf,"pernode\n" );default : -return sprintf (buf,"%d\n" , *ip); +return sysfs_emit (buf,"%d\n" , *ip); } }
Signature · 1 line
2.41.0.162.gfafddb0af9-goog
Chuck Lever III
AppliedQuoted 13 lines · Azeem Shaikh
Part of an effort to remove
strlcpy()tree-wide [1].Direct replacement is safe here since the getter in
kernel_params_opshandles -errno return [2].[1] https://github.com/KSPP/linux/issues/89
[2] https://elixir.bootlin.com/linux/v6.4-rc6/source/include/linux/moduleparam.h#L52Signed-off-by Azeem Shaikh <[email protected]>
Thank you! Applied to nfsd-next.
Quoted 20 lines
---
net/sunrpc/svc.c| 10 +++++-----1 file changed, 5 insertions(+), 5 deletions(-)net/sunrpc/svc.c +0
-0@@ -109,15 +109,15 @@ param_get_pool_mode(char *buf, const struct kernel_param *kp)switch (*ip) {case
SVC_POOL_AUTO:
- returnstrlcpy(buf, "auto\n", 20);
+ returnsysfs_emit(buf, "auto\n");
caseSVC_POOL_GLOBAL:
- returnstrlcpy(buf, "global\n", 20);
+ returnsysfs_emit(buf, "global\n");
caseSVC_POOL_PERCPU:
- returnstrlcpy(buf, "percpu\n", 20);
+ returnsysfs_emit(buf, "percpu\n");
Quoted 13 lines
case
SVC_POOL_PERNODE:
- returnstrlcpy(buf, "pernode\n", 20);
+ returnsysfs_emit(buf, "pernode\n");
default:
- returnsprintf(buf, "%d\n", *ip);
+ returnsysfs_emit(buf, "%d\n", *ip);
}
}Signature · 1 line
2.41.0.162.gfafddb0af9-goog
--
Chuck Lever