Skip to content

Commit

Permalink
Revert "ztest fails assertion in zio_write_gang_member_ready()"
Browse files Browse the repository at this point in the history
This reverts commit 0156253.

That commit was identified as causing IO errors on a user's
encrypted dataset:
openzfs#14413

Signed-off-by: Tony Hutter <hutter2@llnl.gov>
  • Loading branch information
tonyhutter committed Jan 24, 2023
1 parent 04b0278 commit 11bdc5c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion module/zfs/zio.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 11bdc5c

Please sign in to comment.