c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-24 03:08:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rename cv_wait_interruptible() to cv_wait_sig()

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
module/zfs/arc.c
+3 -3
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;