diff options
| author | Chunwei Chen <[email protected]> | 2016-05-20 16:35:52 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2016-05-24 12:58:49 -0700 |
| commit | 872e0cc9c7334f7aedca05f41eca5ddecf6ff72b (patch) | |
| tree | 51b280cfdace907bb5d403a63b8bafb5cf1759cb | |
| parent | fdbc1ba99d1f4d3958189079eee9b6c957e0264b (diff) | |
Restore CALLOUT_FLAG_ABSOLUTE in cv_timedwait_hires
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 <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Signed-off-by: Tim Chase <[email protected]>
Issue #553
| -rw-r--r-- | module/spl/spl-condvar.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/module/spl/spl-condvar.c b/module/spl/spl-condvar.c index 1e2d0fc10..479bbfd12 100644 --- a/module/spl/spl-condvar.c +++ b/module/spl/spl-condvar.c @@ -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)); } |