diff options
| author | Ryan Moeller <[email protected]> | 2020-02-04 11:40:08 -0500 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-02-04 08:40:07 -0800 |
| commit | 8c4987c489c842a7dcd2356bdfd53e2aacc33316 (patch) | |
| tree | 0a08a1cd7d9a3bae4c1c56667dccfdd2bb73e604 /include/sys/fs | |
| parent | 07bc2bc2319655c0a9dd92f4a732467bfeac4874 (diff) | |
Restore aclmode and remove acltype on FreeBSD
This replaces the placeholder ZFS_PROP_PRIVATE with ZFS_PROP_ACLMODE,
matching what is done in the NFSv4 ACLs PR (#9709).
On FreeBSD we hide ZFS_PROP_ACLTYPE, while on Linux we hide
ZFS_PROP_ACLMODE.
The tests already assume this arrangement.
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Alexander Motin <[email protected]>
Signed-off-by: Ryan Moeller <[email protected]>
Closes #9913
Diffstat (limited to 'include/sys/fs')
| -rw-r--r-- | include/sys/fs/zfs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sys/fs/zfs.h b/include/sys/fs/zfs.h index 2f35563bc..3e2c00235 100644 --- a/include/sys/fs/zfs.h +++ b/include/sys/fs/zfs.h @@ -115,7 +115,7 @@ typedef enum { ZFS_PROP_READONLY, ZFS_PROP_ZONED, ZFS_PROP_SNAPDIR, - ZFS_PROP_PRIVATE, /* not exposed to user, temporary */ + ZFS_PROP_ACLMODE, ZFS_PROP_ACLINHERIT, ZFS_PROP_CREATETXG, ZFS_PROP_NAME, /* not exposed to the user */ |