svn commit: r349203 - stable/11/cddl/contrib/opensolaris/lib/libzpool/common

[Andriy Gapon]

Author: avg
Date: Wed Jun 19 19:58:43 2019
New Revision: 349203
URL: https://svnweb.freebsd.org/changeset/base/349203

Log:
  MFC r344359: fix userland illumos taskq code to pass relative timeout to cv_timedwait
  
  Sponsored by:	Panzura

Modified:
  stable/11/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c
==============================================================================
--- stable/11/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c	Wed Jun 19 19:19:37 2019	(r349202)
+++ stable/11/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c	Wed Jun 19 19:58:43 2019	(r349203)
@@ -79,8 +79,13 @@ again:	if ((t = tq->tq_freelist) != NULL && tq->tq_nal
 			 * immediately retry the allocation.
 			 */
 			tq->tq_maxalloc_wait++;
+#ifdef __FreeBSD__
 			rv = cv_timedwait(&tq->tq_maxalloc_cv,
+			    &tq->tq_lock, hz);
+#else
+			rv = cv_timedwait(&tq->tq_maxalloc_cv,
 			    &tq->tq_lock, ddi_get_lbolt() + hz);
+#endif
 			tq->tq_maxalloc_wait--;
 			if (rv > 0)
 				goto again;		/* signaled */