diff options
author | mav <mav@FreeBSD.org> | 2016-03-20 19:21:20 +0000 |
---|---|---|
committer | mav <mav@FreeBSD.org> | 2016-03-20 19:21:20 +0000 |
commit | 4a8be1848456afda0ef2335f0ed1a0b7f4e44cbf (patch) | |
tree | 75ab48d422cdb09ede4f4ba70f5dc9b87f6258a3 /sys/cddl | |
parent | c46c1536eed3d63909547d54a4d8aa4bf220761a (diff) | |
download | FreeBSD-src-4a8be1848456afda0ef2335f0ed1a0b7f4e44cbf.zip FreeBSD-src-4a8be1848456afda0ef2335f0ed1a0b7f4e44cbf.tar.gz |
MFC r271785:
Reorder sysctls for spa.c global tunables; add sysctl for ccw_retry_interval.
Diffstat (limited to 'sys/cddl')
-rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c index 4052717..95bccaa 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c @@ -85,17 +85,21 @@ /* Check hostid on import? */ static int check_hostid = 1; -SYSCTL_DECL(_vfs_zfs); -TUNABLE_INT("vfs.zfs.check_hostid", &check_hostid); -SYSCTL_INT(_vfs_zfs, OID_AUTO, check_hostid, CTLFLAG_RW, &check_hostid, 0, - "Check hostid on import?"); - /* * The interval, in seconds, at which failed configuration cache file writes * should be retried. */ static int zfs_ccw_retry_interval = 300; +SYSCTL_DECL(_vfs_zfs); +TUNABLE_INT("vfs.zfs.check_hostid", &check_hostid); +SYSCTL_INT(_vfs_zfs, OID_AUTO, check_hostid, CTLFLAG_RWTUN, &check_hostid, 0, + "Check hostid on import?"); +TUNABLE_INT("vfs.zfs.ccw_retry_interval", &zfs_ccw_retry_interval); +SYSCTL_INT(_vfs_zfs, OID_AUTO, ccw_retry_interval, CTLFLAG_RW, + &zfs_ccw_retry_interval, 0, + "Configuration cache file write, retry after failure, interval (seconds)"); + typedef enum zti_modes { ZTI_MODE_FIXED, /* value is # of threads (min 1) */ ZTI_MODE_BATCH, /* cpu-intensive; value is ignored */ |