Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

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 <behlendorf1@llnl.gov>
Issue #3450
Issue #3402
This commit is contained in:
Brian Behlendorf 2015-06-11 10:47:19 -07:00
parent 06358ea16e
commit b64ccd6c52
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/sys/zfs_context.h
View File

@ -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)
/*

6
module/zfs/arc.c
View File

@ -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;

2
module/zfs/fm.c
View File

@ -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;

4
module/zfs/txg.c
View File

@ -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);
}