diff options
| author | delphij <delphij@FreeBSD.org> | 2009-12-28 22:15:11 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2009-12-28 22:15:11 +0000 |
| commit | 2414a09002c0b7080b6044e995d127de758f3e12 (patch) | |
| tree | 1430d12f92f54e2d6f42cd1c36726627c2427969 /sys/cddl/contrib/opensolaris/common/zfs | |
| parent | 0b0591131cdc07568e203ce41632d17adc436efb (diff) | |
| download | FreeBSD-src-2414a09002c0b7080b6044e995d127de758f3e12.zip FreeBSD-src-2414a09002c0b7080b6044e995d127de758f3e12.tar.gz | |
Apply OpenSolaris revision 8012 which brings our zpool to version 14,
making it possible for zpools created on OpenSolaris 2009.06 be used
on FreeBSD.
PR: kern/141800
Submitted by: mm
Reviewed by: pjd, trasz
Obtained from: OpenSolaris
MFC after: 2 weeks
Diffstat (limited to 'sys/cddl/contrib/opensolaris/common/zfs')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c b/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c index fef05ab..70c08ad 100644 --- a/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c +++ b/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c @@ -97,6 +97,7 @@ zfs_prop_init(void) { "restricted", ZFS_ACL_RESTRICTED }, { "passthrough", ZFS_ACL_PASSTHROUGH }, { "secure", ZFS_ACL_RESTRICTED }, /* bkwrd compatability */ + { "passthrough-x", ZFS_ACL_PASSTHROUGH_X }, { NULL } }; @@ -173,7 +174,7 @@ zfs_prop_init(void) "discard | groupmask | passthrough", "ACLMODE", acl_mode_table); register_index(ZFS_PROP_ACLINHERIT, "aclinherit", ZFS_ACL_RESTRICTED, PROP_INHERIT, ZFS_TYPE_FILESYSTEM, - "discard | noallow | restricted | passthrough", + "discard | noallow | restricted | passthrough | passthrough-x", "ACLINHERIT", acl_inherit_table); register_index(ZFS_PROP_COPIES, "copies", 1, PROP_INHERIT, ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME, |
