Skip to content

Commit db65272

Browse files
committed
[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]>
1 parent da88fc4 commit db65272

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

include/libzfs.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ typedef enum zfs_error {
157157
EZFS_CKSUM, /* insufficient replicas */
158158
EZFS_RESUME_EXISTS, /* Resume on existing dataset without force */
159159
EZFS_SHAREFAILED, /* filesystem share failed */
160+
EZFS_RAIDZ_EXPAND_IN_PROGRESS, /* a raidz is currently expanding */
160161
EZFS_UNKNOWN
161162
} zfs_error_t;
162163

include/sys/fs/zfs.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,7 @@ typedef enum {
363363
VDEV_PROP_CHECKSUM_T,
364364
VDEV_PROP_IO_N,
365365
VDEV_PROP_IO_T,
366+
VDEV_PROP_RAIDZ_EXPANDING,
366367
VDEV_NUM_PROPS
367368
} vdev_prop_t;
368369

@@ -1569,6 +1570,7 @@ typedef enum {
15691570
ZFS_ERR_NOT_USER_NAMESPACE,
15701571
ZFS_ERR_RESUME_EXISTS,
15711572
ZFS_ERR_CRYPTO_NOTSUP,
1573+
ZFS_ERR_RAIDZ_EXPAND_IN_PROGRESS,
15721574
} zfs_errno_t;
15731575

15741576
/*

lib/libzfs/libzfs.abi

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5671,7 +5671,8 @@
56715671
<enumerator name='VDEV_PROP_CHECKSUM_T' value='43'/>
56725672
<enumerator name='VDEV_PROP_IO_N' value='44'/>
56735673
<enumerator name='VDEV_PROP_IO_T' value='45'/>
5674-
<enumerator name='VDEV_NUM_PROPS' value='46'/>
5674+
<enumerator name='VDEV_PROP_RAIDZ_EXPANDING' value='46'/>
5675+
<enumerator name='VDEV_NUM_PROPS' value='47'/>
56755676
</enum-decl>
56765677
<typedef-decl name='vdev_prop_t' type-id='1573bec8' id='5aa5c90c'/>
56775678
<class-decl name='zpool_load_policy' size-in-bits='256' is-struct='yes' visibility='default' id='2f65b36f'>

0 commit comments

Comments
 (0)