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

FreeBSD: Fix zfs jail and add a test #10658

Merged
merged 1 commit into from Aug 1, 2020

Conversation

ghost
Copy link

@ghost ghost commented Jul 31, 2020

Motivation and Context

zfs_jail was not using zfs_ioctl so failed to map the IOC number correctly.

Description

Use zfs_ioctl to perform the jail ioctl.
Add a test case for FreeBSD.

How Has This Been Tested?

./scripts/zfs-tests.sh -vxT zfs_jail on Freebsd

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 Status: Code Review Needed Ready for review and testing Component: Userspace user space functionality labels Jul 31, 2020
The ioctl was not using zfs_ioctl.

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

codecov bot commented Aug 1, 2020

Codecov Report

Merging #10658 into master will increase coverage by 0.15%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #10658      +/-   ##
==========================================
+ Coverage   79.55%   79.70%   +0.15%     
==========================================
  Files         394      394              
  Lines      124631   124631              
==========================================
+ Hits        99146    99338     +192     
+ Misses      25485    25293     -192     
Flag Coverage Δ
#kernel 80.22% <ø> (+0.09%) ⬆️
#user 66.12% <ø> (+1.19%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
cmd/zdb/zdb_il.c 30.86% <0.00%> (-24.08%) ⬇️
module/zfs/vdev_indirect.c 73.83% <0.00%> (-11.17%) ⬇️
module/zfs/spa_log_spacemap.c 93.40% <0.00%> (-0.86%) ⬇️
cmd/zed/agents/zfs_mod.c 77.55% <0.00%> (-0.67%) ⬇️
module/os/linux/spl/spl-kmem-cache.c 88.27% <0.00%> (-0.60%) ⬇️
module/zfs/zfs_fm.c 84.39% <0.00%> (-0.58%) ⬇️
module/os/linux/zfs/zfs_vnops.c 69.42% <0.00%> (-0.42%) ⬇️
module/zfs/zvol.c 84.06% <0.00%> (-0.34%) ⬇️
module/zfs/range_tree.c 93.60% <0.00%> (-0.26%) ⬇️
module/zfs/sa.c 83.97% <0.00%> (-0.22%) ⬇️
... and 49 more

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 25499e2...15f5a97. Read the comment docs.

@behlendorf behlendorf added Status: Accepted Ready to integrate (reviewed, tested) and removed Status: Code Review Needed Ready for review and testing labels Aug 1, 2020
@behlendorf behlendorf merged commit b673719 into openzfs:master Aug 1, 2020
@ghost ghost deleted the jail-tests branch August 1, 2020 16:42
jsai20 pushed a commit to jsai20/zfs that referenced this pull request Mar 30, 2021
zfs_jail was not using zfs_ioctl so failed to map the IOC number
correctly.  Use zfs_ioctl to perform the jail ioctl and add a test 
case for FreeBSD.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <ryan@iXsystems.com>
Closes openzfs#10658
sempervictus pushed a commit to sempervictus/zfs that referenced this pull request May 31, 2021
zfs_jail was not using zfs_ioctl so failed to map the IOC number
correctly.  Use zfs_ioctl to perform the jail ioctl and add a test 
case for FreeBSD.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <ryan@iXsystems.com>
Closes openzfs#10658
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Component: Userspace user space functionality Status: Accepted Ready to integrate (reviewed, tested)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant