Try only increment on syncing approach

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

Author: pcd1193182

include/sys/txg.h

@@ -137,7 +137,6 @@ extern boolean_t txg_stalled(struct dsl_pool *dp);
 
 /* returns TRUE if someone is waiting for the next txg to sync */
 extern boolean_t txg_sync_waiting(struct dsl_pool *dp);
-extern uint64_t txg_cur_open(struct dsl_pool *dp);
 
 extern void txg_verify(spa_t *spa, uint64_t txg);
 

module/zfs/txg.c

@@ -867,12 +867,6 @@ txg_verify(spa_t *spa, uint64_t txg)
 }
 #endif
 
-uint64_t
-txg_cur_open(dsl_pool_t *dp)
-{
-	return (dp->dp_tx.tx_open_txg);
-}
-
 /*
  * Per-txg object lists.
  */

module/zfs/zio.c

@@ -3318,9 +3318,8 @@ zio_write_gang_block(zio_t *pio, metaslab_class_t *mc)
 	} else if (any_failed && candidate > SPA_OLD_GANGBLOCKSIZE &&
 	    spa_feature_is_enabled(spa, SPA_FEATURE_DYNAMIC_GANG_HEADER) &&
 	    !spa_feature_is_active(spa, SPA_FEATURE_DYNAMIC_GANG_HEADER)) {
-		dmu_tx_t *tx =
-		    dmu_tx_create_assigned(spa->spa_dsl_pool, MIN(txg + 1,
-		    txg_cur_open(spa->spa_dsl_pool)));
+		dmu_tx_t *tx = dmu_tx_create_assigned(spa->spa_dsl_pool,
+		    spa_syncing_txg(spa) + 1);
 		dsl_sync_task_nowait(spa->spa_dsl_pool,
 		    zio_update_feature,
 		    (void *)SPA_FEATURE_DYNAMIC_GANG_HEADER, tx);