Resolve time conflict

diff --git a/module/zfs/txg.c b/module/zfs/txg.c
index 2bbf2f086c15441fa4374cc044fea79d6e0e7936..ae2cf51a407bd2464fc6b129bba02c538167a212 100644 (file)
--- 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);