Skip to content
This repository has been archived by the owner on Feb 26, 2020. It is now read-only.

SPL fixes #553

Closed
wants to merge 4 commits into from
Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions module/spl/spl-condvar.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure how I missed this when I looked over 39cd90e but yes we definitely need to restore this.


return (__cv_timedwait_hires(cvp, mp, tim, state));
}
Expand Down