Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl

This commit is contained in:
Brian Behlendorf 2008-12-18 11:25:43 -08:00
parent 2ea3f11b9e 2ef6ae9654
commit 59ef7e8a19
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
module/zfs/txg.c
View File

@ -163,12 +163,12 @@ txg_thread_exit(tx_state_t *tx, callb_cpr_t *cpr, kthread_t **tpp)
} }
static void 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); CALLB_CPR_SAFE_BEGIN(cpr);
if (time) if (wt)
(void) cv_timedwait(cv, &tx->tx_sync_lock, lbolt + time); (void) cv_timedwait(cv, &tx->tx_sync_lock, lbolt + wt);
else else
cv_wait(cv, &tx->tx_sync_lock); cv_wait(cv, &tx->tx_sync_lock);