From 50b70a0c9a00bf0fb5dce249b327a7e908d93904 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Thu, 18 Dec 2008 11:22:39 -0800 Subject: [PATCH] Resolve time conflict --- module/zfs/txg.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/module/zfs/txg.c b/module/zfs/txg.c index 2bbf2f086c..ae2cf51a40 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);