Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Fix the FreeBSD userspace build (#15716) 

- Mark some parameters to zpool_power*() as unused.
- Add a stub zpool_disk_wait().

Fixes: a9520e6e5 ("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>
This commit is contained in:
Mark Johnston 2023-12-27 15:17:53 -05:00 committed by GitHub
parent 4cf4bc7334
commit 07e95b4670
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/zpool/os/freebsd/zpool_vdev_os.c
View File

@ -128,6 +128,9 @@ check_file(const char *file, boolean_t force, boolean_t isspare)
int int
zpool_power_current_state(zpool_handle_t *zhp, char *vdev) zpool_power_current_state(zpool_handle_t *zhp, char *vdev)
{ {
(void) zhp;
(void) vdev;
/* Enclosure slot power not supported on FreeBSD yet */ /* Enclosure slot power not supported on FreeBSD yet */
return (-1); return (-1);
} }
@ -135,6 +138,10 @@ zpool_power_current_state(zpool_handle_t *zhp, char *vdev)
int int
zpool_power(zpool_handle_t *zhp, char *vdev, boolean_t turn_on) zpool_power(zpool_handle_t *zhp, char *vdev, boolean_t turn_on)
{ {
(void) zhp;
(void) vdev;
(void) turn_on;
/* Enclosure slot power not supported on FreeBSD yet */ /* Enclosure slot power not supported on FreeBSD yet */
return (ENOTSUP); return (ENOTSUP);
} }

8
lib/libzutil/os/freebsd/zutil_import_os.c
View File

@ -263,3 +263,11 @@ update_vdevs_config_dev_sysfs_path(nvlist_t *config)
{ {
(void) config; (void) config;
} }
int
zpool_disk_wait(const char *path)
{
(void) path;
return (ENOTSUP);
}