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.

Sign up for GitHub

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

Jump to bottom

FreeBSD: make zfs_vfs_held() definition consistent with declaration #14776

Merged
merged 1 commit into from
Apr 21, 2023
Merged

FreeBSD: make zfs_vfs_held() definition consistent with declaration #14776

merged 1 commit into from
Apr 21, 2023

Conversation

DimitryAndric
Copy link
Contributor

Description

Noticed while attempting to change FreeBSD's boolean_t into an actual (C99) bool: in include/sys/zfs_ioctl_impl.h, zfs_vfs_held() is declared to return a boolean_t, but in module/os/freebsd/zfs/zfs_ioctl_os.c it is defined to return an int. Make the definition match the declaration.

How Has This Been Tested?

Recompiled the zfs module on FreeBSD. There is no functional change, purely syntactical.

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)
  • Library ABI change (libzfs, libzfs_core, libnvpair, libuutil and libzfsbootenv)
  • Documentation (a change to man pages or other documentation)

Checklist:

@DimitryAndric
FreeBSD: make zfs_vfs_held() definition consistent with declaration
b51a9e2 
Noticed while attempting to change FreeBSD's boolean_t into an actual
bool: in include/sys/zfs_ioctl_impl.h, zfs_vfs_held() is declared to
return a boolean_t, but in module/os/freebsd/zfs/zfs_ioctl_os.c it is
defined to return an int. Make the definition match the declaration.

Signed-off-by: Dimitry Andric <dimitry@andric.com>
@behlendorf behlendorf added the Status: Code Review Needed Ready for review and testing label Apr 20, 2023
@behlendorf behlendorf added Status: Accepted Ready to integrate (reviewed, tested) and removed Status: Code Review Needed Ready for review and testing labels Apr 21, 2023
@behlendorf behlendorf merged commit 62cc9d4 into openzfs:master Apr 21, 2023
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request May 1, 2023
@DimitryAndric @andrewc12
FreeBSD: make zfs_vfs_held() definition consistent with declaration
dde3390 
Noticed while attempting to change FreeBSD's boolean_t into an actual
bool: in include/sys/zfs_ioctl_impl.h, zfs_vfs_held() is declared to
return a boolean_t, but in module/os/freebsd/zfs/zfs_ioctl_os.c it is
defined to return an int. Make the definition match the declaration.

Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Brian Atkinson <batkinson@lanl.gov>
Signed-off-by: Dimitry Andric <dimitry@andric.com>
Closes openzfs#14776
behlendorf pushed a commit to behlendorf/zfs that referenced this pull request May 26, 2023
@DimitryAndric @behlendorf
FreeBSD: make zfs_vfs_held() definition consistent with declaration
f1b63ce 
Noticed while attempting to change FreeBSD's boolean_t into an actual
bool: in include/sys/zfs_ioctl_impl.h, zfs_vfs_held() is declared to
return a boolean_t, but in module/os/freebsd/zfs/zfs_ioctl_os.c it is
defined to return an int. Make the definition match the declaration.

Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Brian Atkinson <batkinson@lanl.gov>
Signed-off-by: Dimitry Andric <dimitry@andric.com>
Closes openzfs#14776
behlendorf pushed a commit to behlendorf/zfs that referenced this pull request May 28, 2023
@DimitryAndric @behlendorf
FreeBSD: make zfs_vfs_held() definition consistent with declaration
f002719 
Noticed while attempting to change FreeBSD's boolean_t into an actual
bool: in include/sys/zfs_ioctl_impl.h, zfs_vfs_held() is declared to
return a boolean_t, but in module/os/freebsd/zfs/zfs_ioctl_os.c it is
defined to return an int. Make the definition match the declaration.

Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Brian Atkinson <batkinson@lanl.gov>
Signed-off-by: Dimitry Andric <dimitry@andric.com>
Closes openzfs#14776
behlendorf pushed a commit that referenced this pull request May 30, 2023
@DimitryAndric @behlendorf
FreeBSD: make zfs_vfs_held() definition consistent with declaration
d1e05c6 
Noticed while attempting to change FreeBSD's boolean_t into an actual
bool: in include/sys/zfs_ioctl_impl.h, zfs_vfs_held() is declared to
return a boolean_t, but in module/os/freebsd/zfs/zfs_ioctl_os.c it is
defined to return an int. Make the definition match the declaration.

Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Brian Atkinson <batkinson@lanl.gov>
Signed-off-by: Dimitry Andric <dimitry@andric.com>
Closes #14776
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bwatkinson bwatkinson bwatkinson approved these changes

@amotin amotin amotin approved these changes

@behlendorf behlendorf behlendorf approved these changes

Assignees
No one assigned
Labels
Status: Accepted Ready to integrate (reviewed, tested)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@DimitryAndric @behlendorf @amotin @bwatkinson