Remove extra newline from spa_set_allocator().

zfs_dbgmsg() does not need newline at the end of the message.

While there, slightly update/sync FreeBSD __dprintf().

Reviewed by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by:	Alexander Motin <mav@FreeBSD.org>
Sponsored by:	iXsystems, Inc.
Closes #16536
This commit is contained in:
Alexander Motin 2024-09-17 16:15:42 -04:00 committed by GitHub
parent bca9b64e7b
commit ac04407ffe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 5 deletions

View File

@ -218,12 +218,19 @@ __dprintf(boolean_t dprint, const char *file, const char *func,
}
/*
* Get rid of trailing newline.
* Get rid of trailing newline for dprintf logs.
*/
nl = strrchr(buf, '\n');
if (nl != NULL)
*nl = '\0';
if (dprint && buf[0] != '\0') {
nl = &buf[strlen(buf) - 1];
if (*nl == '\n')
*nl = '\0';
}
/*
* To get this data:
*
* $ sysctl -n kstat.zfs.misc.dbgmsg
*/
__zfs_dbgmsg(buf);
kmem_free(buf, size);

View File

@ -1679,7 +1679,7 @@ spa_set_allocator(spa_t *spa, const char *allocator)
int a = spa_find_allocator_byname(allocator);
if (a < 0) a = 0;
spa->spa_active_allocator = a;
zfs_dbgmsg("spa allocator: %s\n", metaslab_allocators[a].msop_name);
zfs_dbgmsg("spa allocator: %s", metaslab_allocators[a].msop_name);
}
int