Distributed Spare (dRAID) Feature

[mirror_zfs.git] / module / zfs / vdev_removal.c

diff --git a/module/zfs/vdev_removal.c b/module/zfs/vdev_removal.c
index ed7d1d4b303053b01c36faded0449f9e9133927b..4606af9aafac0ffd0bb8a406b4fcff4cfcda396c 100644 (file)
--- a/module/zfs/vdev_removal.c
+++ b/module/zfs/vdev_removal.c
@@ -250,7 +250,7 @@ vdev_remove_initiate_sync(void *arg, dmu_tx_t *tx)
        spa_vdev_removal_t *svr = NULL;
        uint64_t txg __maybe_unused = dmu_tx_get_txg(tx);
 
-       ASSERT3P(vd->vdev_ops, !=, &vdev_raidz_ops);
+       ASSERT0(vdev_get_nparity(vd));
        svr = spa_vdev_removal_create(vd);
 
        ASSERT(vd->vdev_removing);
@@ -1120,7 +1120,7 @@ static void
 vdev_remove_enlist_zaps(vdev_t *vd, nvlist_t *zlist)
 {
        ASSERT3P(zlist, !=, NULL);
-       ASSERT3P(vd->vdev_ops, !=, &vdev_raidz_ops);
+       ASSERT0(vdev_get_nparity(vd));
 
        if (vd->vdev_leaf_zap != 0) {
                char zkey[32];
@@ -2041,7 +2041,7 @@ spa_vdev_remove_top_check(vdev_t *vd)
 
        /*
         * All vdevs in normal class must have the same ashift
-        * and not be raidz.
+        * and not be raidz or draid.
         */
        vdev_t *rvd = spa->spa_root_vdev;
        int num_indirect = 0;
@@ -2064,7 +2064,7 @@ spa_vdev_remove_top_check(vdev_t *vd)
                        num_indirect++;
                if (!vdev_is_concrete(cvd))
                        continue;
-               if (cvd->vdev_ops == &vdev_raidz_ops)
+               if (vdev_get_nparity(cvd) != 0)
                        return (SET_ERROR(EINVAL));
                /*
                 * Need the mirror to be mirror of leaf vdevs only
@@ -2217,18 +2217,30 @@ spa_vdev_remove(spa_t *spa, uint64_t guid, boolean_t unspare)
                 * in this pool.
                 */
                if (vd == NULL || unspare) {
-                       if (vd == NULL)
-                               vd = spa_lookup_by_guid(spa, guid, B_TRUE);
-                       ev = spa_event_create(spa, vd, NULL,
-                           ESC_ZFS_VDEV_REMOVE_AUX);
-
-                       vd_type = VDEV_TYPE_SPARE;
-                       vd_path = spa_strdup(fnvlist_lookup_string(
-                           nv, ZPOOL_CONFIG_PATH));
-                       spa_vdev_remove_aux(spa->spa_spares.sav_config,
-                           ZPOOL_CONFIG_SPARES, spares, nspares, nv);
-                       spa_load_spares(spa);
-                       spa->spa_spares.sav_sync = B_TRUE;
+                       char *type;
+                       boolean_t draid_spare = B_FALSE;
+
+                       if (nvlist_lookup_string(nv, ZPOOL_CONFIG_TYPE, &type)
+                           == 0 && strcmp(type, VDEV_TYPE_DRAID_SPARE) == 0)
+                               draid_spare = B_TRUE;
+
+                       if (vd == NULL && draid_spare) {
+                               error = SET_ERROR(ENOTSUP);
+                       } else {
+                               if (vd == NULL)
+                                       vd = spa_lookup_by_guid(spa,
+                                           guid, B_TRUE);
+                               ev = spa_event_create(spa, vd, NULL,
+                                   ESC_ZFS_VDEV_REMOVE_AUX);
+
+                               vd_type = VDEV_TYPE_SPARE;
+                               vd_path = spa_strdup(fnvlist_lookup_string(
+                                   nv, ZPOOL_CONFIG_PATH));
+                               spa_vdev_remove_aux(spa->spa_spares.sav_config,
+                                   ZPOOL_CONFIG_SPARES, spares, nspares, nv);
+                               spa_load_spares(spa);
+                               spa->spa_spares.sav_sync = B_TRUE;
+                       }
                } else {
                        error = SET_ERROR(EBUSY);
                }