c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-01-13 19:50:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

Restore CALLOUT_FLAG_ABSOLUTE in cv_timedwait_hires

Browse Source 
In 39cd90e, I mistakenly disabled the ability of using absolute expire time in
cv_timedwait_hires. I don't quite sure why I did that, so let's restore it.

Signed-off-by: Chunwei Chen <david.chen@osnexus.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Tim Chase <tim@chase2k.com>
Issue #553
This commit is contained in:
Chunwei Chen 2016-05-20 16:35:52 -07:00 committed by Brian Behlendorf
parent fdbc1ba99d
commit 872e0cc9c7
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
module/spl/spl-condvar.c
View File

@ -311,9 +311,8 @@ cv_timedwait_hires_common(kcondvar_t *cvp, kmutex_t *mp, hrtime_t tim, hrtime_t
tim = (tim / res) * res;
}
ASSERT(!(flag & CALLOUT_FLAG_ABSOLUTE));
/* get abs expire time */
tim += gethrtime();
if (!(flag & CALLOUT_FLAG_ABSOLUTE))
tim += gethrtime();
return (__cv_timedwait_hires(cvp, mp, tim, state));
}