[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 <[email protected]>
openzfs · Apr 29, 2024 · db65272 · db65272
1 parent da88fc4
commit db65272
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/include/libzfs.h b/include/libzfs.h
@@ -157,6 +157,7 @@ typedef enum zfs_error {
 	EZFS_CKSUM,		/* insufficient replicas */
 	EZFS_RESUME_EXISTS,	/* Resume on existing dataset without force */
 	EZFS_SHAREFAILED,	/* filesystem share failed */
+	EZFS_RAIDZ_EXPAND_IN_PROGRESS,	/* a raidz is currently expanding */
 	EZFS_UNKNOWN
 } zfs_error_t;
 

diff --git a/include/sys/fs/zfs.h b/include/sys/fs/zfs.h
@@ -363,6 +363,7 @@ typedef enum {
 	VDEV_PROP_CHECKSUM_T,
 	VDEV_PROP_IO_N,
 	VDEV_PROP_IO_T,
+	VDEV_PROP_RAIDZ_EXPANDING,
 	VDEV_NUM_PROPS
 } vdev_prop_t;
 
@@ -1569,6 +1570,7 @@ typedef enum {
 	ZFS_ERR_NOT_USER_NAMESPACE,
 	ZFS_ERR_RESUME_EXISTS,
 	ZFS_ERR_CRYPTO_NOTSUP,
+	ZFS_ERR_RAIDZ_EXPAND_IN_PROGRESS,
 } zfs_errno_t;
 
 /*

diff --git a/lib/libzfs/libzfs.abi b/lib/libzfs/libzfs.abi
@@ -5671,7 +5671,8 @@
       <enumerator name='VDEV_PROP_CHECKSUM_T' value='43'/>
       <enumerator name='VDEV_PROP_IO_N' value='44'/>
       <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>
     <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'>