From 57940b435cd1dab6529babcda095c47ecee8a8e9 Mon Sep 17 00:00:00 2001 From: Ryan Moeller Date: Mon, 10 Feb 2020 16:11:30 -0500 Subject: Share some code for spa deadman tunables We need to do the same thing to update all spas on any OS for these tunables, so let's share the code. While here let's match the types of the literals initializing the variables with the type of the variable. Reviewed-by: Allan Jude Reviewed-by: Brian Behlendorf Reviewed-by: Olaf Faaland Signed-off-by: Ryan Moeller Closes #9964 --- module/os/linux/zfs/spa_misc_os.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'module/os') diff --git a/module/os/linux/zfs/spa_misc_os.c b/module/os/linux/zfs/spa_misc_os.c index 33ff6c082..85de10d40 100644 --- a/module/os/linux/zfs/spa_misc_os.c +++ b/module/os/linux/zfs/spa_misc_os.c @@ -58,20 +58,13 @@ param_set_deadman_failmode(const char *val, zfs_kernel_param_t *kp) int param_set_deadman_ziotime(const char *val, zfs_kernel_param_t *kp) { - spa_t *spa = NULL; int error; error = param_set_ulong(val, kp); if (error < 0) return (SET_ERROR(error)); - if (spa_mode_global != SPA_MODE_UNINIT) { - mutex_enter(&spa_namespace_lock); - while ((spa = spa_next(spa)) != NULL) - spa->spa_deadman_ziotime = - MSEC2NSEC(zfs_deadman_ziotime_ms); - mutex_exit(&spa_namespace_lock); - } + spa_set_deadman_ziotime(MSEC2NSEC(zfs_deadman_ziotime_ms)); return (0); } @@ -79,20 +72,13 @@ param_set_deadman_ziotime(const char *val, zfs_kernel_param_t *kp) int param_set_deadman_synctime(const char *val, zfs_kernel_param_t *kp) { - spa_t *spa = NULL; int error; error = param_set_ulong(val, kp); if (error < 0) return (SET_ERROR(error)); - if (spa_mode_global != SPA_MODE_UNINIT) { - mutex_enter(&spa_namespace_lock); - while ((spa = spa_next(spa)) != NULL) - spa->spa_deadman_synctime = - MSEC2NSEC(zfs_deadman_synctime_ms); - mutex_exit(&spa_namespace_lock); - } + spa_set_deadman_synctime(MSEC2NSEC(zfs_deadman_synctime_ms)); return (0); } -- cgit v1.2.3