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

[2.2.4-only] Stub RAIDZ enums to prevent conflicts 

Stub in the RAIDZ expansions enums for now so that the slow IO
commit merges cleanly.

Signed-off-by: Tony Hutter <hutter2@llnl.gov>
This commit is contained in:
Tony Hutter 2024-04-29 13:20:03 -07:00
parent da88fc4ac9
commit db65272aef
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/libzfs.h
View File

@ -157,6 +157,7 @@ typedef enum zfs_error {
EZFS_CKSUM, /* insufficient replicas */ EZFS_CKSUM, /* insufficient replicas */
EZFS_RESUME_EXISTS, /* Resume on existing dataset without force */ EZFS_RESUME_EXISTS, /* Resume on existing dataset without force */
EZFS_SHAREFAILED, /* filesystem share failed */ EZFS_SHAREFAILED, /* filesystem share failed */
EZFS_RAIDZ_EXPAND_IN_PROGRESS, /* a raidz is currently expanding */
EZFS_UNKNOWN EZFS_UNKNOWN
} zfs_error_t; } zfs_error_t;

2
include/sys/fs/zfs.h
View File

@ -363,6 +363,7 @@ typedef enum {
VDEV_PROP_CHECKSUM_T, VDEV_PROP_CHECKSUM_T,
VDEV_PROP_IO_N, VDEV_PROP_IO_N,
VDEV_PROP_IO_T, VDEV_PROP_IO_T,
VDEV_PROP_RAIDZ_EXPANDING,
VDEV_NUM_PROPS VDEV_NUM_PROPS
} vdev_prop_t; } vdev_prop_t;
@ -1569,6 +1570,7 @@ typedef enum {
ZFS_ERR_NOT_USER_NAMESPACE, ZFS_ERR_NOT_USER_NAMESPACE,
ZFS_ERR_RESUME_EXISTS, ZFS_ERR_RESUME_EXISTS,
ZFS_ERR_CRYPTO_NOTSUP, ZFS_ERR_CRYPTO_NOTSUP,
ZFS_ERR_RAIDZ_EXPAND_IN_PROGRESS,
} zfs_errno_t; } zfs_errno_t;
/* /*

3
lib/libzfs/libzfs.abi
View File

@ -5671,7 +5671,8 @@
<enumerator name='VDEV_PROP_CHECKSUM_T' value='43'/> <enumerator name='VDEV_PROP_CHECKSUM_T' value='43'/>
<enumerator name='VDEV_PROP_IO_N' value='44'/> <enumerator name='VDEV_PROP_IO_N' value='44'/>
<enumerator name='VDEV_PROP_IO_T' value='45'/> <enumerator name='VDEV_PROP_IO_T' value='45'/>
<enumerator name='VDEV_NUM_PROPS' value='46'/> <enumerator name='VDEV_PROP_RAIDZ_EXPANDING' value='46'/>
<enumerator name='VDEV_NUM_PROPS' value='47'/>
</enum-decl> </enum-decl>
<typedef-decl name='vdev_prop_t' type-id='1573bec8' id='5aa5c90c'/> <typedef-decl name='vdev_prop_t' type-id='1573bec8' id='5aa5c90c'/>
<class-decl name='zpool_load_policy' size-in-bits='256' is-struct='yes' visibility='default' id='2f65b36f'> <class-decl name='zpool_load_policy' size-in-bits='256' is-struct='yes' visibility='default' id='2f65b36f'>