X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=module%2Fzfs%2Ftxg.c;h=00c1c7d26abe64dbf96d27ececd1be5d8f542817;hb=bfd214af01dd360417b1331d903655244979fe0f;hp=5afb139ddfb0b87710bd2805326acf06ad0943a8;hpb=54a179e7b80413bd48cd2cd259110fb493d0215e;p=zfs.git diff --git a/module/zfs/txg.c b/module/zfs/txg.c index 5afb139..00c1c7d 100644 --- a/module/zfs/txg.c +++ b/module/zfs/txg.c @@ -166,10 +166,10 @@ txg_thread_wait(tx_state_t *tx, callb_cpr_t *cpr, kcondvar_t *cv, uint64_t time) CALLB_CPR_SAFE_BEGIN(cpr); if (time) - (void) cv_timedwait(cv, &tx->tx_sync_lock, + (void) cv_timedwait_interruptible(cv, &tx->tx_sync_lock, ddi_get_lbolt() + time); else - cv_wait(cv, &tx->tx_sync_lock); + cv_wait_interruptible(cv, &tx->tx_sync_lock); CALLB_CPR_SAFE_END(cpr, &tx->tx_sync_lock); }