Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

spa: Let spa_taskq_param_get()'s addition of a newline be optional 

For FreeBSD sysctls, we don't want the extra newline, since the
sysctl(8) utility will format strings appropriately.

Signed-off-by: Mark Johnston <markj@FreeBSD.org>
(cherry picked from commit 4cf943769d3decd73b379eb069cebe0c148e3f39)
This commit is contained in:
Mark Johnston 2023-12-29 12:56:35 -05:00 committed by Rob Norris
parent 92063ad7d4
commit 79d092987b
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
module/zfs/spa.c
View File

@ -1295,7 +1295,7 @@ spa_taskq_param_set(zio_type_t t, char *cfg)
} }
static int static int
spa_taskq_param_get(zio_type_t t, char *buf) spa_taskq_param_get(zio_type_t t, char *buf, boolean_t add_newline)
{ {
int pos = 0; int pos = 0;
@ -1313,7 +1313,8 @@ spa_taskq_param_get(zio_type_t t, char *buf)
sep = " "; sep = " ";
} }
buf[pos++] = '\n'; if (add_newline)
buf[pos++] = '\n';
buf[pos] = '\0'; buf[pos] = '\0';
return (pos); return (pos);
@ -1331,7 +1332,7 @@ spa_taskq_read_param_set(const char *val, zfs_kernel_param_t *kp)
static int static int
spa_taskq_read_param_get(char *buf, zfs_kernel_param_t *kp) spa_taskq_read_param_get(char *buf, zfs_kernel_param_t *kp)
{ {
return (spa_taskq_param_get(ZIO_TYPE_READ, buf)); return (spa_taskq_param_get(ZIO_TYPE_READ, buf, TRUE));
} }
static int static int
@ -1345,7 +1346,7 @@ spa_taskq_write_param_set(const char *val, zfs_kernel_param_t *kp)
static int static int
spa_taskq_write_param_get(char *buf, zfs_kernel_param_t *kp) spa_taskq_write_param_get(char *buf, zfs_kernel_param_t *kp)
{ {
return (spa_taskq_param_get(ZIO_TYPE_WRITE, buf)); return (spa_taskq_param_get(ZIO_TYPE_WRITE, buf, TRUE));
} }
#else #else
/* /*
@ -1360,7 +1361,7 @@ spa_taskq_read_param(ZFS_MODULE_PARAM_ARGS)
char buf[SPA_TASKQ_PARAM_MAX]; char buf[SPA_TASKQ_PARAM_MAX];
int err; int err;
(void) spa_taskq_param_get(ZIO_TYPE_READ, buf); (void) spa_taskq_param_get(ZIO_TYPE_READ, buf, FALSE);
err = sysctl_handle_string(oidp, buf, sizeof (buf), req); err = sysctl_handle_string(oidp, buf, sizeof (buf), req);
if (err || req->newptr == NULL) if (err || req->newptr == NULL)
return (err); return (err);
@ -1373,7 +1374,7 @@ spa_taskq_write_param(ZFS_MODULE_PARAM_ARGS)
char buf[SPA_TASKQ_PARAM_MAX]; char buf[SPA_TASKQ_PARAM_MAX];
int err; int err;
(void) spa_taskq_param_get(ZIO_TYPE_WRITE, buf); (void) spa_taskq_param_get(ZIO_TYPE_WRITE, buf, FALSE);
err = sysctl_handle_string(oidp, buf, sizeof (buf), req); err = sysctl_handle_string(oidp, buf, sizeof (buf), req);
if (err || req->newptr == NULL) if (err || req->newptr == NULL)
return (err); return (err);