aboutsummaryrefslogtreecommitdiff
path: root/sys/contrib/openzfs/module/zcommon
diff options
context:
space:
mode:
authorMatt Macy <mmacy@FreeBSD.org>2020-09-18 23:21:24 +0000
committerMatt Macy <mmacy@FreeBSD.org>2020-09-18 23:21:24 +0000
commit2c48331d28f16c0efce5a72a81e7d71668c4a158 (patch)
tree3b7c79252e9c0d269630439a5ef3e9b8a9f8cc3e /sys/contrib/openzfs/module/zcommon
parentd8d2dda141c198a2e9863584e2e61566cc6b222d (diff)
parent04bab0082226f7e72c41ad528298c43edc3fa316 (diff)
downloadsrc-2c48331d28f16c0efce5a72a81e7d71668c4a158.tar.gz
src-2c48331d28f16c0efce5a72a81e7d71668c4a158.zip
MFV 2.0-rc2
- Fixes divide by zero for unusual hz - remove cryptodev dependency
Notes
Notes: svn path=/head/; revision=365894
Diffstat (limited to 'sys/contrib/openzfs/module/zcommon')
-rw-r--r--sys/contrib/openzfs/module/zcommon/zfs_prop.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/sys/contrib/openzfs/module/zcommon/zfs_prop.c b/sys/contrib/openzfs/module/zcommon/zfs_prop.c
index 837b8ae71b34..f3dbbc15d25e 100644
--- a/sys/contrib/openzfs/module/zcommon/zfs_prop.c
+++ b/sys/contrib/openzfs/module/zcommon/zfs_prop.c
@@ -253,9 +253,10 @@ zfs_prop_init(void)
static zprop_index_t acltype_table[] = {
{ "off", ZFS_ACLTYPE_OFF },
- { "disabled", ZFS_ACLTYPE_OFF },
- { "noacl", ZFS_ACLTYPE_OFF },
- { "posixacl", ZFS_ACLTYPE_POSIXACL },
+ { "posix", ZFS_ACLTYPE_POSIX },
+ { "disabled", ZFS_ACLTYPE_OFF }, /* bkwrd compatibility */
+ { "noacl", ZFS_ACLTYPE_OFF }, /* bkwrd compatibility */
+ { "posixacl", ZFS_ACLTYPE_POSIX }, /* bkwrd compatibility */
{ NULL }
};
@@ -430,7 +431,7 @@ zfs_prop_init(void)
#ifndef __FreeBSD__
zprop_register_index(ZFS_PROP_ACLTYPE, "acltype", ZFS_ACLTYPE_OFF,
PROP_INHERIT, ZFS_TYPE_FILESYSTEM | ZFS_TYPE_SNAPSHOT,
- "noacl | posixacl", "ACLTYPE", acltype_table);
+ "off | posix", "ACLTYPE", acltype_table);
#endif
zprop_register_index(ZFS_PROP_ACLINHERIT, "aclinherit",
ZFS_ACL_RESTRICTED, PROP_INHERIT, ZFS_TYPE_FILESYSTEM,
@@ -705,7 +706,7 @@ zfs_prop_init(void)
zprop_register_impl(ZFS_PROP_ACLTYPE, "acltype", PROP_TYPE_INDEX,
ZFS_ACLTYPE_OFF, NULL, PROP_INHERIT,
ZFS_TYPE_FILESYSTEM | ZFS_TYPE_SNAPSHOT,
- "noacl | posixacl", "ACLTYPE", B_FALSE, B_FALSE, acltype_table);
+ "off | posix", "ACLTYPE", B_FALSE, B_FALSE, acltype_table);
#endif
zprop_register_hidden(ZFS_PROP_REMAPTXG, "remaptxg", PROP_TYPE_NUMBER,
PROP_READONLY, ZFS_TYPE_DATASET, "REMAPTXG");