]> git.proxmox.com Git - mirror_zfs.git/commit - include/sys/fs/zfs.h
Restore aclmode and remove acltype on FreeBSD
authorRyan Moeller <ryan@iXsystems.com>
Tue, 4 Feb 2020 16:40:08 +0000 (11:40 -0500)
committerGitHub <noreply@github.com>
Tue, 4 Feb 2020 16:40:07 +0000 (08:40 -0800)
commit8c4987c489c842a7dcd2356bdfd53e2aacc33316
tree0a08a1cd7d9a3bae4c1c56667dccfdd2bb73e604
parent07bc2bc2319655c0a9dd92f4a732467bfeac4874
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 <behlendorf1@llnl.gov>
Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Signed-off-by: Ryan Moeller <ryan@iXsystems.com>
Closes #9913
include/sys/fs/zfs.h
man/man8/zfsprops.8
module/zcommon/zfs_prop.c