Index: sys/ufs/ffs/ffs_alloc.c
===================================================================
RCS file: /cvsroot/src/sys/ufs/ffs/ffs_alloc.c,v
retrieving revision 1.157
diff -p -u -r1.157 ffs_alloc.c
--- sys/ufs/ffs/ffs_alloc.c     12 Jul 2017 09:30:16 -0000      1.157
+++ sys/ufs/ffs/ffs_alloc.c     13 Aug 2017 15:04:07 -0000
@@ -1659,17 +1659,14 @@ ffs_discard_finish(void *vts, int flags)
{
       struct discarddata *ts = vts;
       struct discardopdata *td = NULL;
-       int res = 0;

       /* wait for workqueue to drain */
       mutex_enter(&ts->wqlk);
       if (ts->wqcnt) {
               ts->wqdraining = 1;
-               res = cv_timedwait(&ts->wqcv, &ts->wqlk, mstohz(5000));
+               cv_wait(&ts->wqcv, &ts->wqlk);
       }
       mutex_exit(&ts->wqlk);
-       if (res)
-               printf("ffs_discarddata drain timeout\n");

       mutex_enter(&ts->entrylk);
       if (ts->entry) {