Convert them to msleep_nsec(9) and tsleep_nsec(9), ok? Index: scsi/scsi_base.c =================================================================== RCS file: /cvs/src/sys/scsi/scsi_base.c,v retrieving revision 1.250 diff -u -p -r1.250 scsi_base.c --- scsi/scsi_base.c 1 Dec 2019 16:56:26 -0000 1.250 +++ scsi/scsi_base.c 2 Dec 2019 14:12:25 -0000 @@ -432,7 +432,7 @@ scsi_move(struct scsi_io_mover *m) { mtx_enter(&m->mtx); while (!m->done) - msleep(m, &m->mtx, PRIBIO, "scsiiomv", 0); + msleep_nsec(m, &m->mtx, PRIBIO, "scsiiomv", INFSLP); mtx_leave(&m->mtx); } @@ -706,7 +706,8 @@ scsi_link_shutdown(struct scsi_link *lin } while (link->pending > 0) - msleep(&link->pending, &iopl->mtx, PRIBIO, "pendxs", 0); + msleep_nsec(&link->pending, &iopl->mtx, PRIBIO, "pendxs", + INFSLP); mtx_leave(&iopl->mtx); while ((ioh = TAILQ_FIRST(&sleepers)) != NULL) { @@ -1440,7 +1441,7 @@ scsi_xs_sync(struct scsi_xfer *xs) mtx_enter(&cookie); while (xs->cookie != NULL) - msleep(xs, &cookie, PRIBIO, "syncxs", 0); + msleep_nsec(xs, &cookie, PRIBIO, "syncxs", INFSLP); mtx_leave(&cookie); error = scsi_xs_error(xs); @@ -1530,7 +1531,7 @@ scsi_delay(struct scsi_xfer *xs, int sec } while (seconds-- > 0) { - if (tsleep(&lbolt, PRIBIO|PCATCH, "scbusy", 0)) { + if (tsleep_nsec(&lbolt, PRIBIO|PCATCH, "scbusy", INFSLP)) { /* Signal == abort xs. */ return (EIO); }