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 | |
| 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
| -rw-r--r-- | include/sys/zfs_context.h | 4 | ||||
| -rw-r--r-- | module/zfs/arc.c | 6 | ||||
| -rw-r--r-- | module/zfs/fm.c | 2 | ||||
| -rw-r--r-- | module/zfs/txg.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/include/sys/zfs_context.h b/include/sys/zfs_context.h index 8b9a5f46f..62f7611fa 100644 --- a/include/sys/zfs_context.h +++ b/include/sys/zfs_context.h @@ -349,8 +349,8 @@ extern clock_t cv_timedwait_hires(kcondvar_t *cvp, kmutex_t *mp, hrtime_t tim, hrtime_t res, int flag); extern void cv_signal(kcondvar_t *cv); extern void cv_broadcast(kcondvar_t *cv); -#define cv_timedwait_interruptible(cv, mp, at) cv_timedwait(cv, mp, at) -#define cv_wait_interruptible(cv, mp) cv_wait(cv, mp) +#define cv_timedwait_sig(cv, mp, at) cv_timedwait(cv, mp, at) +#define cv_wait_sig(cv, mp) cv_wait(cv, mp) #define cv_wait_io(cv, mp) cv_wait(cv, mp) /* diff --git a/module/zfs/arc.c b/module/zfs/arc.c index 805e7b59f..014c7c4f4 100644 --- a/module/zfs/arc.c +++ b/module/zfs/arc.c @@ -3077,7 +3077,7 @@ arc_adapt_thread(void) /* block until needed, or one second, whichever is shorter */ CALLB_CPR_SAFE_BEGIN(&cpr); - (void) cv_timedwait_interruptible(&arc_reclaim_thread_cv, + (void) cv_timedwait_sig(&arc_reclaim_thread_cv, &arc_reclaim_lock, (ddi_get_lbolt() + hz)); CALLB_CPR_SAFE_END(&cpr, &arc_reclaim_lock); @@ -3142,7 +3142,7 @@ arc_user_evicts_thread(void) * call the arc's kstat update function regularly). */ CALLB_CPR_SAFE_BEGIN(&cpr); - (void) cv_timedwait_interruptible(&arc_user_evicts_cv, + (void) cv_timedwait_sig(&arc_user_evicts_cv, &arc_user_evicts_lock, ddi_get_lbolt() + hz); CALLB_CPR_SAFE_END(&cpr, &arc_user_evicts_lock); } @@ -6175,7 +6175,7 @@ l2arc_feed_thread(void) cookie = spl_fstrans_mark(); while (l2arc_thread_exit == 0) { CALLB_CPR_SAFE_BEGIN(&cpr); - (void) cv_timedwait_interruptible(&l2arc_feed_thr_cv, + (void) cv_timedwait_sig(&l2arc_feed_thr_cv, &l2arc_feed_thr_lock, next); CALLB_CPR_SAFE_END(&cpr, &l2arc_feed_thr_lock); next = ddi_get_lbolt() + hz; diff --git a/module/zfs/fm.c b/module/zfs/fm.c index 56787137b..b67a7076d 100644 --- a/module/zfs/fm.c +++ b/module/zfs/fm.c @@ -676,7 +676,7 @@ zfs_zevent_wait(zfs_zevent_t *ze) } zevent_waiters++; - cv_wait_interruptible(&zevent_cv, &zevent_lock); + cv_wait_sig(&zevent_cv, &zevent_lock); if (issig(JUSTLOOKING)) error = EINTR; 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); } |