FreeBSD: Fix scope of deadman tunables

A few deadman tunables ended up in the wrong sysctl node.

Move them to vfs.zfs.deadman.*

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Signed-off-by: Ryan Moeller <ryan@iXsystems.com>
Closes #11715

diff --git a/module/zfs/spa_misc.c b/module/zfs/spa_misc.c
index 0dacf9027b2768461bd8412de1699db6c4b5013b..1a2e5abc5335c11d71e8ff4f2644fb1f473db50c 100644 (file)
--- a/module/zfs/spa_misc.c
+++ b/module/zfs/spa_misc.c
@@ -2923,10 +2923,10 @@ ZFS_MODULE_PARAM(zfs, zfs_, recover, INT, ZMOD_RW,
 ZFS_MODULE_PARAM(zfs, zfs_, free_leak_on_eio, INT, ZMOD_RW,
        "Set to ignore IO errors during free and permanently leak the space");
 
-ZFS_MODULE_PARAM(zfs, zfs_, deadman_checktime_ms, ULONG, ZMOD_RW,
+ZFS_MODULE_PARAM(zfs_deadman, zfs_deadman_, checktime_ms, ULONG, ZMOD_RW,
        "Dead I/O check interval in milliseconds");
 
-ZFS_MODULE_PARAM(zfs, zfs_, deadman_enabled, INT, ZMOD_RW,
+ZFS_MODULE_PARAM(zfs_deadman, zfs_deadman_, enabled, INT, ZMOD_RW,
        "Enable deadman timer");
 
 ZFS_MODULE_PARAM(zfs_spa, spa_, asize_inflation, INT, ZMOD_RW,

diff --git a/tests/zfs-tests/include/tunables.cfg b/tests/zfs-tests/include/tunables.cfg
index e93e299ea25a1dc16f46c41bbd86a5cebdb9ecef..1cef60b0d634ede7a34353e2ebbae764c75248fd 100644 (file)
--- a/tests/zfs-tests/include/tunables.cfg
+++ b/tests/zfs-tests/include/tunables.cfg
@@ -27,10 +27,10 @@ COMPRESSED_ARC_ENABLED              compressed_arc_enabled          zfs_compressed_arc_enabled
 CONDENSE_INDIRECT_COMMIT_ENTRY_DELAY_MS        condense.indirect_commit_entry_delay_ms zfs_condense_indirect_commit_entry_delay_ms
 CONDENSE_MIN_MAPPING_BYTES     condense.min_mapping_bytes      zfs_condense_min_mapping_bytes
 DBUF_CACHE_MAX_BYTES           dbuf_cache.max_bytes            dbuf_cache_max_bytes
-DEADMAN_CHECKTIME_MS           deadman_checktime_ms            zfs_deadman_checktime_ms
-DEADMAN_FAILMODE               deadman_failmode                zfs_deadman_failmode
-DEADMAN_SYNCTIME_MS            deadman_synctime_ms             zfs_deadman_synctime_ms
-DEADMAN_ZIOTIME_MS             deadman_ziotime_ms              zfs_deadman_ziotime_ms
+DEADMAN_CHECKTIME_MS           deadman.checktime_ms            zfs_deadman_checktime_ms
+DEADMAN_FAILMODE               deadman.failmode                zfs_deadman_failmode
+DEADMAN_SYNCTIME_MS            deadman.synctime_ms             zfs_deadman_synctime_ms
+DEADMAN_ZIOTIME_MS             deadman.ziotime_ms              zfs_deadman_ziotime_ms
 DISABLE_IVSET_GUID_CHECK       disable_ivset_guid_check        zfs_disable_ivset_guid_check
 INITIALIZE_CHUNK_SIZE          initialize_chunk_size           zfs_initialize_chunk_size
 INITIALIZE_VALUE               initialize_value                zfs_initialize_value