diff options
| author | Brian Behlendorf <[email protected]> | 2015-06-11 10:47:19 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2015-06-11 10:50:47 -0700 |
| commit | b64ccd6c52cfb34d7b92715baef5ebd9305de6d1 (patch) | |
| tree | 53e9b9805dba7496214ef20acca5736b2952cdef /module/zfs/txg.c | |
| parent | 06358ea16e2ff256acc6376c71539f7211851404 (diff) | |
Rename cv_wait_interruptible() to cv_wait_sig()
This is the counterpart to zfsonlinux/spl@2345368 which replaces the
cv_wait_interruptible() function with cv_wait_sig(). There is no
functional change to patch merely brings the function names in to
sync to maximize portability.
Signed-off-by: Brian Behlendorf <[email protected]>
Issue #3450
Issue #3402
Diffstat (limited to 'module/zfs/txg.c')
| -rw-r--r-- | module/zfs/txg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/module/zfs/txg.c b/module/zfs/txg.c index c542b0a75..9accd48df 100644 --- a/module/zfs/txg.c +++ b/module/zfs/txg.c @@ -242,10 +242,10 @@ txg_thread_wait(tx_state_t *tx, callb_cpr_t *cpr, kcondvar_t *cv, clock_t time) CALLB_CPR_SAFE_BEGIN(cpr); if (time) - (void) cv_timedwait_interruptible(cv, &tx->tx_sync_lock, + (void) cv_timedwait_sig(cv, &tx->tx_sync_lock, ddi_get_lbolt() + time); else - cv_wait_interruptible(cv, &tx->tx_sync_lock); + cv_wait_sig(cv, &tx->tx_sync_lock); CALLB_CPR_SAFE_END(cpr, &tx->tx_sync_lock); } |