From 4a0d86afc3aa4ab3c62609f086ce09c04a9d0233 Mon Sep 17 00:00:00 2001 From: Mark Johnston Date: Wed, 27 Dec 2023 15:17:53 -0500 Subject: [PATCH] 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 Reviewed-by: Alexander Motin Reviewed-by: Tony Hutter --- cmd/zpool/os/freebsd/zpool_vdev_os.c | 7 +++++++ lib/libzutil/os/freebsd/zutil_import_os.c | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/cmd/zpool/os/freebsd/zpool_vdev_os.c b/cmd/zpool/os/freebsd/zpool_vdev_os.c index 2e0faa7ec..08f382fb5 100644 --- a/cmd/zpool/os/freebsd/zpool_vdev_os.c +++ b/cmd/zpool/os/freebsd/zpool_vdev_os.c @@ -120,6 +120,9 @@ after_zpool_upgrade(zpool_handle_t *zhp) int zpool_power_current_state(zpool_handle_t *zhp, char *vdev) { + + (void) zhp; + (void) vdev; /* Enclosure slot power not supported on FreeBSD yet */ return (-1); } @@ -127,6 +130,10 @@ zpool_power_current_state(zpool_handle_t *zhp, char *vdev) int 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 */ return (ENOTSUP); } diff --git a/lib/libzutil/os/freebsd/zutil_import_os.c b/lib/libzutil/os/freebsd/zutil_import_os.c index 2ecb9793c..a57a2db57 100644 --- a/lib/libzutil/os/freebsd/zutil_import_os.c +++ b/lib/libzutil/os/freebsd/zutil_import_os.c @@ -261,3 +261,11 @@ void update_vdevs_config_dev_sysfs_path(nvlist_t *config) { } + +int +zpool_disk_wait(const char *path) +{ + + (void) path; + return (ENOTSUP); +}