Allow mixing anyraid and mirrors

Signed-off-by: Paul Dagnelie <[email protected]>

Author: Paul Dagnelie

cmd/zpool/zpool_vdev.c

@@ -458,7 +458,8 @@ is_raidz_mirror(replication_level_t *a, replication_level_t *b,
 {
 	if ((strcmp(a->zprl_type, "raidz") == 0 ||
 	    strcmp(a->zprl_type, "draid") == 0) &&
-	    strcmp(b->zprl_type, "mirror") == 0) {
+	    (strcmp(b->zprl_type, "mirror") == 0 ||
+	    strcmp(b->zprl_type, "anyraid") == 0)) {
 		*raidz = a;
 		*mirror = b;
 		return (B_TRUE);
@@ -749,19 +750,6 @@ get_replication(nvlist_t *nvroot, boolean_t fatal)
 					else
 						return (NULL);
 				}
-			} else if (strcmp(lastrep.zprl_type, rep.zprl_type) !=
-			    0) {
-				if (ret != NULL)
-					free(ret);
-				ret = NULL;
-				if (fatal)
-					vdev_error(gettext(
-					    "mismatched replication level: "
-					    "both %s and %s vdevs are "
-					    "present\n"),
-					    lastrep.zprl_type, rep.zprl_type);
-				else
-					return (NULL);
 			} else if (lastrep.zprl_parity != rep.zprl_parity) {
 				if (ret)
 					free(ret);