Dedup IOC reference constants in libzfs_input_check #9188
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Reuse enum value ZFS_IOC_BASE for `('Z' << 8)`.
This is helpful on FreeBSD where ZFS_IOC_BASE has a different value and
`('Z' << 8)` is wrong.
Signed-off-by: Ryan Moeller <ryan@ixsystems.com>
behlendorf
approved these changes
Aug 21, 2019
chrisrd
approved these changes
Aug 21, 2019
Codecov Report
@@ Coverage Diff @@
## master #9188 +/- ##
==========================================
- Coverage 79.05% 72.88% -6.17%
==========================================
Files 400 371 -29
Lines 122000 119430 -2570
==========================================
- Hits 96443 87043 -9400
- Misses 25557 32387 +6830
Continue to review full report at Codecov.
|
behlendorf
added
Status: Accepted
ghost
deleted the
tonyhutter
pushed a commit
to tonyhutter/zfs
that referenced
this pull request
Dec 24, 2019
Reuse enum value ZFS_IOC_BASE for `('Z' << 8)`.
This is helpful on FreeBSD where ZFS_IOC_BASE has a different value and
`('Z' << 8)` is wrong.
Reviewed-by: Chris Dunlop <chris@onthe.net.au>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <ryan@ixsystems.com>
Closes openzfs#9188
tonyhutter
pushed a commit
to tonyhutter/zfs
that referenced
this pull request
Dec 27, 2019
Reuse enum value ZFS_IOC_BASE for `('Z' << 8)`.
This is helpful on FreeBSD where ZFS_IOC_BASE has a different value and
`('Z' << 8)` is wrong.
Reviewed-by: Chris Dunlop <chris@onthe.net.au>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <ryan@ixsystems.com>
Closes openzfs#9188
tonyhutter
pushed a commit
that referenced
this pull request
Jan 23, 2020
Reuse enum value ZFS_IOC_BASE for `('Z' << 8)`.
This is helpful on FreeBSD where ZFS_IOC_BASE has a different value and
`('Z' << 8)` is wrong.
Reviewed-by: Chris Dunlop <chris@onthe.net.au>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <ryan@ixsystems.com>
Closes #9188
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation and Context
libzfs_input_check defines an enum of reference values for calculating ioctl numbers. The enum has a duplicated magic constant
('Z' << 8)as a base value. On FreeBSD the base value needs to be different.Description
Reuse the enum value ZFS_IOC_BASE in place of
('Z' << 8)in later values. This is helpful on FreeBSD where ZFS_IOC_BASE has a different value and('Z' << 8)is wrong.How Has This Been Tested?
Test passes in ZTS.
Types of changes
Checklist:
Signed-off-by.