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.

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

Restore aclmode and remove acltype on FreeBSD #9913

Merged
merged 1 commit into from
Feb 4, 2020

Conversation

ghost
Copy link

@ghost ghost commented Jan 29, 2020

Motivation and Context

Linux at some point dropped the aclmode property and added acltype.
A placeholder ZFS_PROP_PRIVATE was put in place of ZFS_PROP_ACLMODE.

On FreeBSD we support the aclmode property, not acltype.

Description

This patch 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.

How Has This Been Tested?

I ran the zfs_get tag of tests manually, full ZTS run looks clean.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Performance enhancement (non-breaking change which improves efficiency)
  • Code cleanup (non-breaking change which makes code smaller or more readable)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Documentation (a change to man pages or other documentation)

Checklist:

  • My code follows the ZFS on Linux code style requirements.
  • I have updated the documentation accordingly.
  • I have read the contributing document.
  • I have added tests to cover my changes.
  • I have run the ZFS Test Suite with this change applied.
  • All commit messages are properly formatted and contain Signed-off-by.

@ghost ghost added the Status: Code Review Needed Ready for review and testing label Jan 29, 2020
@codecov
Copy link

codecov bot commented Jan 30, 2020

Codecov Report

Merging #9913 into master will increase coverage by <1%.
The diff coverage is 100%.

Impacted file tree graph

@@           Coverage Diff            @@
##           master    #9913    +/-   ##
========================================
+ Coverage      79%      79%   +<1%     
========================================
  Files         384      384            
  Lines      121788   121788            
========================================
+ Hits        96645    96675    +30     
+ Misses      25143    25113    -30
Flag Coverage Δ
#kernel 80% <100%> (ø) ⬇️
#user 67% <100%> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9d8ce24...fc386c7. Read the comment docs.

@ghost ghost marked this pull request as ready for review January 30, 2020 04:15
This replaces the placeholder ZFS_PROP_PRIVATE with ZFS_PROP_ACLMODE,
matching what is done in the NFSv4 ACLs PR (openzfs#9709).

On FreeBSD we hide ZFS_PROP_ACLTYPE, while on Linux we hide
ZFS_PROP_ACLMODE.

The tests already assume this arrangement.

Signed-off-by: Ryan Moeller <ryan@iXsystems.com>
@ghost
Copy link
Author

ghost commented Jan 30, 2020

  • Added man page section based on the one in FreeBSD

Copy link
Contributor

@behlendorf behlendorf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We'd originally delayed making this change since some additional changes in #9709 are required to actually support "aclmode". But since this doesn't really change anything on the Linux side, and we're considerably father along with the FreeBSD work, I agree we can go ahead with this change now.

@behlendorf behlendorf added Status: Accepted Ready to integrate (reviewed, tested) and removed Status: Code Review Needed Ready for review and testing labels Feb 3, 2020
@behlendorf behlendorf merged commit 8c4987c into openzfs:master Feb 4, 2020
@ghost ghost deleted the freebsd-aclmode branch February 4, 2020 16:57
jsai20 pushed a commit to jsai20/zfs that referenced this pull request Mar 30, 2021
This replaces the placeholder ZFS_PROP_PRIVATE with ZFS_PROP_ACLMODE,
matching what is done in the NFSv4 ACLs PR (openzfs#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 openzfs#9913
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Status: Accepted Ready to integrate (reviewed, tested)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants