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 <david.chen@osnexus.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Tim Chase <tim@chase2k.com>
Issue #553

diff --git a/module/spl/spl-condvar.c b/module/spl/spl-condvar.c
index 1e2d0fc10d2ffd65ea19e9c870ce29054340bd36..479bbfd1234896a63b714398105c8b187dbcf1d3 100644 (file)
--- 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));
 }