diff options
| author | gjb <gjb@FreeBSD.org> | 2016-04-04 23:55:32 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2016-04-04 23:55:32 +0000 |
| commit | 1dc4c40e3b35564cb2e787ad968e6b4a9fb7eb0f (patch) | |
| tree | a027fe5a27446f32854d6a07b34b5f2a992bf283 /cddl/contrib/opensolaris/lib/libzpool/common/kernel.c | |
| parent | 3669a0dced7e344be71d234ffc3a71530ef0ae08 (diff) | |
| parent | 589cedfe0cde2b49d5f47fc240de37c8bf307abd (diff) | |
| download | FreeBSD-src-1dc4c40e3b35564cb2e787ad968e6b4a9fb7eb0f.zip FreeBSD-src-1dc4c40e3b35564cb2e787ad968e6b4a9fb7eb0f.tar.gz | |
MFH
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'cddl/contrib/opensolaris/lib/libzpool/common/kernel.c')
| -rw-r--r-- | cddl/contrib/opensolaris/lib/libzpool/common/kernel.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c b/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c index 126a7c1..56d7bf3 100644 --- a/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c +++ b/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c @@ -366,10 +366,13 @@ cv_timedwait_hires(kcondvar_t *cv, kmutex_t *mp, hrtime_t tim, hrtime_t res, timestruc_t ts; hrtime_t delta; - ASSERT(flag == 0); + ASSERT(flag == 0 || flag == CALLOUT_FLAG_ABSOLUTE); top: - delta = tim - gethrtime(); + delta = tim; + if (flag & CALLOUT_FLAG_ABSOLUTE) + delta -= gethrtime(); + if (delta <= 0) return (-1); |
