summaryrefslogtreecommitdiff
path: root/usr/src/common/zfs/zprop_common.c
diff options
context:
space:
mode:
authorDan McDonald <danmcd@mnx.io>2022-10-03 10:29:49 -0400
committerDan McDonald <danmcd@mnx.io>2022-10-03 10:29:49 -0400
commit4e09adb1ae71f9570a14be2e9c2e7d1fcd64b0cc (patch)
treeeca5333e2c185a6b559a99b2d7f4a2bde393747b /usr/src/common/zfs/zprop_common.c
parent7d35233e629cfee42ee57e76f6bbd1e3f6d2c64a (diff)
parent3f6fd99d844f7d4b62e4e1ddb0c29a4c2f7eca15 (diff)
downloadillumos-joyent-4e09adb1ae71f9570a14be2e9c2e7d1fcd64b0cc.tar.gz
[illumos-gate merge]
commit 3f6fd99d844f7d4b62e4e1ddb0c29a4c2f7eca15 14952 bhyve should expose PAGING exits to userspace commit 17c4dadf772c2bfb28130f501dc6e1f46f8b1250 15020 HBA_LoadLibrary needs to close config file when done commit 609febc9a48c79a089214cb5d882759a72a38513 13923 zpool list -v output is misaligned commit e472a1cd85bffae230f8546d46fa757bade533e9 15006 Implement pre-auth integrity for fksmbd commit 17e9e0ae7132604963fd5a20e8ece5f2630e7fdf 15008 expose bhyve kernel interface version wider
Diffstat (limited to 'usr/src/common/zfs/zprop_common.c')
-rw-r--r--usr/src/common/zfs/zprop_common.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/usr/src/common/zfs/zprop_common.c b/usr/src/common/zfs/zprop_common.c
index 03919f0e91..5517782337 100644
--- a/usr/src/common/zfs/zprop_common.c
+++ b/usr/src/common/zfs/zprop_common.c
@@ -410,6 +410,12 @@ zprop_width(int prop, boolean_t *fixed, zfs_type_t type)
*/
if (prop == ZFS_PROP_CREATION)
*fixed = B_FALSE;
+ /*
+ * 'health' is handled specially because it's a number
+ * internally, but displayed as a fixed 8 character string.
+ */
+ if (prop == ZPOOL_PROP_HEALTH)
+ ret = 8;
break;
case PROP_TYPE_INDEX:
idx = prop_tbl[prop].pd_table;