Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OpenZFS ports in support of pull request #9709, NFSv4 ACL support #10266

Closed
wants to merge 9 commits into from
Closed

OpenZFS ports in support of pull request #9709, NFSv4 ACL support #10266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ed53cc3
Merge pull request #1 from zfsonlinux/master
pbhenson Dec 29, 2018
fc987c7
Merge branch 'master' of https://github.com/zfsonlinux/zfs
pbhenson Dec 4, 2019
f80d3ca
Merge pull request #2 from openzfs/master
pbhenson Apr 27, 2020
c1411f6
OpenZFS 742 - Resurrect the ZFS "aclmode" property OpenZFS 664 - Umas…
pbhenson Dec 5, 2019
c03ec5e
OpenZFS 3254 - add support in zfs for aclmode=restricted
pbhenson Dec 5, 2019
99a9df5
OpenZFS 6764 - zfs issues with inheritance flags during chmod(2)
pbhenson Dec 5, 2019
b2eb5af
OpenZFS 8984 - fix for 6764 breaks ACL inheritance
pbhenson Dec 5, 2019
f6ab211
OpenZFS 6762 - POSIX write should imply DELETE_CHILD on directories
pbhenson Dec 6, 2019
32e51f9
OpenZFS 6765 - zfs_zaccess_delete() comments do not accurately
pbhenson Dec 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/os/linux/zfs/sys/zfs_vfsops.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ struct zfsvfs {
boolean_t z_fuid_dirty; /* need to sync fuid table ? */
struct zfs_fuid_info *z_fuid_replay; /* fuid info for replay */
zilog_t *z_log; /* intent log pointer */
uint_t z_acl_mode; /* acl chmod/mode behavior */
uint_t z_acl_inherit; /* acl inheritance behavior */
uint_t z_acl_type; /* type of ACL usable on this FS */
zfs_case_t z_case; /* case-sense */
Expand Down
1 change: 1 addition & 0 deletions man/man8/zfs.8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,7 @@ pool/home/bob readonly off default
pool/home/bob zoned off default
pool/home/bob snapdir hidden default
pool/home/bob acltype off default
pool/home/bob aclmode discard default
pool/home/bob aclinherit restricted default
pool/home/bob canmount on default
pool/home/bob xattr on default
Expand Down
25 changes: 13 additions & 12 deletions man/man8/zfsprops.8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -599,23 +599,24 @@ accordance to the requested mode from the application.
The
.Sy aclinherit
property does not apply to POSIX ACLs.
.It Sy aclmode Ns = Ns Sy discard Ns | Ns Sy groupmask Ns | Ns Sy passthrough
.Ns Sy restricted
Controls how an
.Tn ACL
is modified during
.Xr chmod 2 .
This property is not visible on Linux yet.
.It Xo
.Sy aclmode Ns = Ns Sy discard Ns | Ns Sy groupmask Ns | Ns
.Sy passthrough Ns | Ns Sy restricted Ns
.Xc
Controls how an ACL is modified during chmod(2) and how inherited ACEs
are modified by the file creation mode.
.Bl -tag -width "passthrough"
.It Sy discard
default, deletes all
.Tn ACL
entries that do not represent the mode of the file.
.Sy ACEs
except for those representing
the mode of the file or directory requested by
.Xr chmod 2 .
.It Sy groupmask
reduces permissions granted in all
.Em ALLOW
entried found in the
.Tn ACL
.Sy ALLOW
entries found in the
.Sy ACL
such that they are no greater than the group permissions specified by
.Xr chmod 2 .
.It Sy passthrough
Expand Down
Loading