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

Resolve ZoF differences in zfs_ioctl.h #9625

Merged
merged 1 commit into from
Nov 30, 2019

Conversation

mattmacy
Copy link
Contributor

FreeBSD needs to be able to pass the jail id to the jail/unjail ioctls
and it uses a struct cdev rather than a struct file in the device
structure.

Signed-off-by: Matt Macy [email protected]

Motivation and Context

Description

How Has This Been Tested?

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:

@behlendorf behlendorf added the Status: Code Review Needed Ready for review and testing label Nov 27, 2019
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.

This looks fine, though I happened to notice that zs_file on Linux is entirely unused. I haven't looked at the FreeBSD code in this regard, but is it possible the same is true? If so, it would nice to instead remove this.

@mattmacy
Copy link
Contributor Author

This looks fine, though I happened to notice that zs_file on Linux is entirely unused. I haven't looked at the FreeBSD code in this regard, but is it possible the same is true? If so, it would nice to instead remove this.

It's unused. I was hesitant to remove it.

@mattmacy mattmacy force-pushed the projects/zfs_ioctl_resolve branch from 5dc38c5 to cc53d72 Compare November 27, 2019 21:41
FreeBSD needs to be able to pass the jail id to the jail/unjail ioctls
and it uses a struct cdev rather than a struct file in the device
structure.

Signed-off-by: Matt Macy <[email protected]>
@mattmacy mattmacy force-pushed the projects/zfs_ioctl_resolve branch from cc53d72 to f0d8521 Compare November 27, 2019 21:51
@behlendorf behlendorf requested a review from lundman November 27, 2019 21:53
@behlendorf behlendorf added Status: Accepted Ready to integrate (reviewed, tested) and removed Status: Code Review Needed Ready for review and testing labels Nov 27, 2019
@codecov
Copy link

codecov bot commented Nov 28, 2019

Codecov Report

Merging #9625 into master will decrease coverage by 0.16%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #9625      +/-   ##
==========================================
- Coverage   79.37%    79.2%   -0.17%     
==========================================
  Files         418      418              
  Lines      123544   123530      -14     
==========================================
- Hits        98057    97844     -213     
- Misses      25487    25686     +199
Flag Coverage Δ
#kernel 79.9% <ø> (-0.06%) ⬇️
#user 66.6% <ø> (-0.33%) ⬇️

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 d6f67df...f0d8521. Read the comment docs.

@behlendorf behlendorf merged commit a5b762a into openzfs:master Nov 30, 2019
@mattmacy mattmacy deleted the projects/zfs_ioctl_resolve branch December 19, 2019 22:26
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.

4 participants