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 merge error in zfs_acl_ids_create #10721

Merged
merged 1 commit into from
Aug 17, 2020

Conversation

mattmacy
Copy link
Contributor

Signed-off-by: Matt Macy mmacy@FreeBSD.org

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:

  • 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.

Signed-off-by: Matt Macy <mmacy@FreeBSD.org>
@codecov
Copy link

codecov bot commented Aug 16, 2020

Codecov Report

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

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #10721      +/-   ##
==========================================
+ Coverage   79.72%   79.74%   +0.02%     
==========================================
  Files         394      394              
  Lines      124665   124665              
==========================================
+ Hits        99390    99415      +25     
+ Misses      25275    25250      -25     
Flag Coverage Δ
#kernel 80.34% <ø> (-0.05%) ⬇️
#user 65.96% <ø> (+0.16%) ⬆️

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

Impacted Files Coverage Δ
module/os/linux/spl/spl-zlib.c 55.35% <0.00%> (-28.58%) ⬇️
cmd/zdb/zdb_il.c 30.86% <0.00%> (-24.08%) ⬇️
cmd/zvol_id/zvol_id_main.c 76.31% <0.00%> (-5.27%) ⬇️
module/zfs/vdev_raidz.c 89.32% <0.00%> (-4.36%) ⬇️
module/zfs/vdev_raidz_math.c 76.57% <0.00%> (-2.26%) ⬇️
lib/libzpool/util.c 94.93% <0.00%> (-1.27%) ⬇️
module/os/linux/zfs/zio_crypt.c 80.09% <0.00%> (-1.11%) ⬇️
module/zfs/bptree.c 92.70% <0.00%> (-1.05%) ⬇️
module/zfs/dmu_traverse.c 96.34% <0.00%> (-0.67%) ⬇️
lib/libzutil/os/linux/zutil_import_os.c 80.06% <0.00%> (-0.67%) ⬇️
... and 47 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 fc34dfb...de47ee9. Read the comment docs.

@behlendorf behlendorf added the Status: Accepted Ready to integrate (reviewed, tested) label Aug 17, 2020
@behlendorf behlendorf merged commit cfdc432 into openzfs:master Aug 17, 2020
@ghost ghost deleted the projects/zfs_acl_ids_create branch August 17, 2020 23:50
jsai20 pushed a commit to jsai20/zfs that referenced this pull request Mar 30, 2021
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Matt Macy <mmacy@FreeBSD.org>
Closes openzfs#10721
sempervictus pushed a commit to sempervictus/zfs that referenced this pull request May 31, 2021
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Matt Macy <mmacy@FreeBSD.org>
Closes openzfs#10721
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