summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Johnston <[email protected]>2023-12-27 15:17:53 -0500
committerTony Hutter <[email protected]>2024-01-30 13:33:36 -0800
commit9ef15845f5fd1fe83267712c4753d804703854ea (patch)
treeb9f4a3c0c46b5af0be388012243d4d6a3ec57656
parent69142125d75b7405e0f1cf141dbe7913448daedf (diff)
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 <[email protected]> Reviewed-by: Alexander Motin <[email protected]> Reviewed-by: Tony Hutter <[email protected]>
-rw-r--r--cmd/zpool/os/freebsd/zpool_vdev_os.c7
-rw-r--r--lib/libzutil/os/freebsd/zutil_import_os.c8
2 files changed, 15 insertions, 0 deletions
diff --git a/cmd/zpool/os/freebsd/zpool_vdev_os.c b/cmd/zpool/os/freebsd/zpool_vdev_os.c
index 9dd733989..c57c689af 100644
--- a/cmd/zpool/os/freebsd/zpool_vdev_os.c
+++ b/cmd/zpool/os/freebsd/zpool_vdev_os.c
@@ -128,6 +128,9 @@ check_file(const char *file, boolean_t force, boolean_t isspare)
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);
}
@@ -135,6 +138,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 a134c173b..049710d39 100644
--- a/lib/libzutil/os/freebsd/zutil_import_os.c
+++ b/lib/libzutil/os/freebsd/zutil_import_os.c
@@ -263,3 +263,11 @@ update_vdevs_config_dev_sysfs_path(nvlist_t *config)
{
(void) config;
}
+
+int
+zpool_disk_wait(const char *path)
+{
+
+ (void) path;
+ return (ENOTSUP);
+}