From: Chunwei Chen <david.chen@osnexus.com>
Date: Fri, 20 May 2016 23:35:52 +0000 (-0700)
Subject: Restore CALLOUT_FLAG_ABSOLUTE in cv_timedwait_hires
X-Git-Tag: zfs-0.8.0-rc1~152^2~97
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=872e0cc9c7334f7aedca05f41eca5ddecf6ff72b;p=zfs

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