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

Fix the FreeBSD userspace build #15716

Merged
merged 1 commit into from
Dec 27, 2023
Merged

Fix the FreeBSD userspace build #15716

merged 1 commit into from
Dec 27, 2023

Conversation

markjdb
Copy link
Contributor

@markjdb markjdb commented Dec 27, 2023

Fix a couple of build breaks I hit when building zfs locally on FreeBSD.

Motivation and Context

OpenZFS should build on FreeBSD.

Description

Address a warning about unused parameters, and add a stub implementation of zpool_disk_wait().

How Has This Been Tested?

Build testing only.

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:

@markjdb
Fix the FreeBSD userspace build
c6f2356 
- Mark some parameters to zpool_power*() as unused.
- Add a stub zpool_disk_wait().

Fixes: a9520e6 ("zpool: Add slot power control, print power status")
Signed-off-by: Mark Johnston <markj@FreeBSD.org>
@amotin
Copy link
Member

amotin commented Dec 27, 2023

Fixes #15709 .

@amotin amotin added the Status: Code Review Needed Ready for review and testing label Dec 27, 2023
tonyhutter
tonyhutter approved these changes Dec 27, 2023
View reviewed changes
Copy link
Contributor

@tonyhutter tonyhutter left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for this!

@tonyhutter tonyhutter mentioned this pull request Dec 27, 2023
Closed
@tonyhutter
Copy link
Contributor

This PR fixes the build for me on FreeBSD 13.

@tonyhutter tonyhutter merged commit 07e95b4 into openzfs:master Dec 27, 2023
18 of 25 checks passed
@mmatuska mmatuska mentioned this pull request Jan 30, 2024
Merged
13 tasks
ixhamza pushed a commit to truenas/zfs that referenced this pull request Jan 31, 2024
@markjdb @tonyhutter
Fix the FreeBSD userspace build (openzfs#15716)
9ef1584 
- Mark some parameters to zpool_power*() as unused.
- Add a stub zpool_disk_wait().

Fixes: a9520e6 ("zpool: Add slot power control, print power status")

Signed-off-by: Mark Johnston <markj@FreeBSD.org>
Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
@mmatuska mmatuska mentioned this pull request Feb 10, 2024
Merged
13 tasks
behlendorf pushed a commit that referenced this pull request Feb 13, 2024
@markjdb @behlendorf
Fix the FreeBSD userspace build (#15716)
4a0d86a 
- Mark some parameters to zpool_power*() as unused.
- Add a stub zpool_disk_wait().

Fixes: a9520e6 ("zpool: Add slot power control, print power status")

Signed-off-by: Mark Johnston <markj@FreeBSD.org>
Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
lundman pushed a commit to openzfsonwindows/openzfs that referenced this pull request Mar 13, 2024
@markjdb @lundman
Fix the FreeBSD userspace build (openzfs#15716)
4eed897 
- Mark some parameters to zpool_power*() as unused.
- Add a stub zpool_disk_wait().

Fixes: a9520e6 ("zpool: Add slot power control, print power status")

Signed-off-by: Mark Johnston <markj@FreeBSD.org>
Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
lundman pushed a commit to openzfsonwindows/openzfs that referenced this pull request Mar 13, 2024
@markjdb @lundman
Fix the FreeBSD userspace build (openzfs#15716)
ea59fdb 
- Mark some parameters to zpool_power*() as unused.
- Add a stub zpool_disk_wait().

Fixes: a9520e6 ("zpool: Add slot power control, print power status")

Signed-off-by: Mark Johnston <markj@FreeBSD.org>
Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tonyhutter tonyhutter tonyhutter approved these changes

@amotin amotin amotin approved these changes

Assignees
No one assigned
Labels
Status: Code Review Needed Ready for review and testing
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@markjdb @amotin @tonyhutter