Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
This commit is contained in:
commit
c0ae2987ae
|
@ -163,12 +163,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);
|
||||
|
||||
|
|
Loading…
Reference in New Issue