git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Call udevadm trigger more safely
[zfs.git]
/
module
/
zfs
/
txg.c
diff --git
a/module/zfs/txg.c
b/module/zfs/txg.c
index
5afb139
..
00c1c7d
100644
(file)
--- 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)
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
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);
}
CALLB_CPR_SAFE_END(cpr, &tx->tx_sync_lock);
}