Allow sys/vdev_disk.h to have OS fields #10452
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
Codecov Report
@@ Coverage Diff @@
## master #10452 +/- ##
==========================================
- Coverage 80.24% 79.44% -0.81%
==========================================
Files 293 393 +100
Lines 83882 123859 +39977
==========================================
+ Hits 67313 98397 +31084
- Misses 16569 25462 +8893
Continue to review full report at Codecov.
|
behlendorf
reviewed
Jun 15, 2020
Linux defines different vdev_disk_t members to macOS, but they are generally only used in vdev_disk.c Signed-off-by: Jorgen Lundman <lundman@lundman.net>
behlendorf
approved these changes
Jun 16, 2020
|
Heh it became almost nothing :) |
ghost
approved these changes
Jun 16, 2020
| typedef struct vdev_disk { | ||
| ddi_devid_t vd_devid; | ||
| char *vd_minor; | ||
| struct block_device *vd_bdev; |
There was a problem hiding this comment.
I'm a little surprised this ever worked on FreeBSD 🤔
There was a problem hiding this comment.
I don't think FreeBSD even includes the header which is why it was OK.
behlendorf
added
Status: Accepted
lundman
referenced
this pull request
in openzfsonosx/openzfs
Jun 19, 2020
Linux defines different vdev_disk_t members to macOS, but they are only used in vdev_disk.c so move the declaration there. Reviewed-by: Ryan Moeller <ryan@ixsystems.com> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Jorgen Lundman <lundman@lundman.net> Closes #10452
jsai20
pushed a commit
to jsai20/zfs
that referenced
this pull request
Mar 30, 2021
Linux defines different vdev_disk_t members to macOS, but they are only used in vdev_disk.c so move the declaration there. Reviewed-by: Ryan Moeller <ryan@ixsystems.com> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Jorgen Lundman <lundman@lundman.net> Closes openzfs#10452
sempervictus
pushed a commit
to sempervictus/zfs
that referenced
this pull request
May 31, 2021
Linux defines different vdev_disk_t members to macOS, but they are only used in vdev_disk.c so move the declaration there. Reviewed-by: Ryan Moeller <ryan@ixsystems.com> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Jorgen Lundman <lundman@lundman.net> Closes openzfs#10452
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.
Move OS specific fields from vdev_disk.h into (new) platform header.
Motivation and Context
macOS and FreeBSD doesn't need to know what a
struct block_deviceis, and I guarantee Linux and FreeBSD do not want to know aboutclass iokit::storage::ioblockdevice.Description
Based on the same style as zfs_znode_os.h.
Create an os/$platform/sys/vdev_disk_os.h for each platform, move
Linux specific fields into it. Currently it leaves FreeBSD's empty.
macOS header file will come in a future PR. If you are curious, it will look something like:
https://github.com/openzfsonosx/openzfs/blob/sorted2/include/os/macos/zfs/sys/vdev_disk_os.h#L26
How Has This Been Tested?
Types of changes
Checklist:
Signed-off-by.