Merge updated branch 'zfs-2.2.3-hutter'

Signed-off-by: Ameer Hamza <ahamza@ixsystems.com>
This commit is contained in:
Ameer Hamza 2024-01-31 11:52:46 +05:00
commit b3b9983169
3 changed files with 16 additions and 1 deletions

2
META
View File

@ -1,7 +1,7 @@
Meta: 1
Name: zfs
Branch: 1.0
Version: 2.2.2
Version: 2.2.3
Release: 1
Release-Tags: relext
License: CDDL

View File

@ -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);
}

View File

@ -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);
}