Revert "ztest fails assertion in zio_write_gang_member_ready()"

This reverts commit 0156253. That commit was identified as causing IO errors on a user's encrypted dataset: #14413 Signed-off-by: Tony Hutter <[email protected]>
openzfs · Jan 24, 2023 · 11bdc5c · 11bdc5c
1 parent 04b0278
commit 11bdc5c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/module/zfs/zio.c b/module/zfs/zio.c
@@ -2827,7 +2827,7 @@ zio_write_gang_block(zio_t *pio, metaslab_class_t *mc)
 	 * have a third copy.
 	 */
 	gbh_copies = MIN(copies + 1, spa_max_replication(spa));
-	if (BP_IS_ENCRYPTED(bp) && gbh_copies >= SPA_DVAS_PER_BP)
+	if (gio->io_prop.zp_encrypt && gbh_copies >= SPA_DVAS_PER_BP)
 		gbh_copies = SPA_DVAS_PER_BP - 1;
 
 	int flags = METASLAB_HINTBP_FAVOR | METASLAB_GANG_HEADER;