X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=module%2Fzfs%2Ftxg.c;h=c234567d7e5295f6437f8b417f7b5d3c4c3ce130;hb=44f21da41c441bfceec7b825991b6e68321d78a2;hp=00c1c7d26abe64dbf96d27ececd1be5d8f542817;hpb=bfd214af01dd360417b1331d903655244979fe0f;p=zfs.git

diff --git a/module/zfs/txg.c b/module/zfs/txg.c
index 00c1c7d..c234567 100644
--- a/module/zfs/txg.c
+++ b/module/zfs/txg.c
@@ -218,9 +218,19 @@ uint64_t
 txg_hold_open(dsl_pool_t *dp, txg_handle_t *th)
 {
 	tx_state_t *tx = &dp->dp_tx;
-	tx_cpu_t *tc = &tx->tx_cpu[CPU_SEQID];
+	tx_cpu_t *tc;
 	uint64_t txg;
 
+	/*
+	 * It appears the processor id is simply used as a "random"
+	 * number to index into the array, and there isn't any other
+	 * significance to the chosen tx_cpu. Because.. Why not use
+	 * the current cpu to index into the array?
+	 */
+	kpreempt_disable();
+	tc = &tx->tx_cpu[CPU_SEQID];
+	kpreempt_enable();
+
 	mutex_enter(&tc->tc_lock);
 
 	txg = tx->tx_open_txg;
@@ -493,7 +503,7 @@ void
 txg_delay(dsl_pool_t *dp, uint64_t txg, int ticks)
 {
 	tx_state_t *tx = &dp->dp_tx;
-	int timeout = ddi_get_lbolt() + ticks;
+	clock_t timeout = ddi_get_lbolt() + ticks;
 
 	/* don't delay if this txg could transition to quiesing immediately */
 	if (tx->tx_open_txg > txg ||
@@ -511,6 +521,8 @@ txg_delay(dsl_pool_t *dp, uint64_t txg, int ticks)
 		(void) cv_timedwait(&tx->tx_quiesce_more_cv, &tx->tx_sync_lock,
 		    timeout);
 
+	DMU_TX_STAT_BUMP(dmu_tx_delay);
+
 	mutex_exit(&tx->tx_sync_lock);
 }