From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Thu, 18 Dec 2008 19:22:39 +0000 (-0800)
Subject: Resolve time conflict
X-Git-Tag: zfs-0.4.4~12^2~174^2^2^2^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=50b70a0c9a00bf0fb5dce249b327a7e908d93904;p=zfs

Resolve time conflict
---

diff --git a/module/zfs/txg.c b/module/zfs/txg.c
index 2bbf2f086..ae2cf51a4 100644
--- a/module/zfs/txg.c
+++ b/module/zfs/txg.c
@@ -142,12 +142,12 @@ txg_thread_exit(tx_state_t *tx, callb_cpr_t *cpr, kthread_t **tpp)
 }
 
 static void
-txg_thread_wait(tx_state_t *tx, callb_cpr_t *cpr, kcondvar_t *cv, uint64_t time)
+txg_thread_wait(tx_state_t *tx, callb_cpr_t *cpr, kcondvar_t *cv, uint64_t wt)
 {
 	CALLB_CPR_SAFE_BEGIN(cpr);
 
-	if (time)
-		(void) cv_timedwait(cv, &tx->tx_sync_lock, lbolt + time);
+	if (wt)
+		(void) cv_timedwait(cv, &tx->tx_sync_lock, lbolt + wt);
 	else
 		cv_wait(cv, &tx->tx_sync_lock);