diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2019-12-31 22:57:08 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2019-12-31 22:57:08 +0000 |
| commit | a798abaf0b8a82288a72bced3f56166c0f689d38 (patch) | |
| tree | 32e2927dbe045f468dc3caa4c12866735c106257 | |
| parent | 231f4faeb2563a707971e6b18db416cee8e72062 (diff) | |
convert infinite msleep(9) to msleep_nsec(9)
ok mpi@ bluhm@
| -rw-r--r-- | sys/dev/ic/qla.c | 6 | ||||
| -rw-r--r-- | sys/dev/pci/qle.c | 6 | ||||
| -rw-r--r-- | sys/dev/vscsi.c | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/sys/dev/ic/qla.c b/sys/dev/ic/qla.c index 9ab8a2f4603..f0f9aec9342 100644 --- a/sys/dev/ic/qla.c +++ b/sys/dev/ic/qla.c @@ -1,4 +1,4 @@ -/* $OpenBSD: qla.c,v 1.57 2019/08/20 22:31:28 krw Exp $ */ +/* $OpenBSD: qla.c,v 1.58 2019/12/31 22:57:07 jsg Exp $ */ /* * Copyright (c) 2011 David Gwynne <dlg@openbsd.org> @@ -1148,8 +1148,8 @@ qla_mbox(struct qla_softc *sc, int maskin) mtx_enter(&sc->sc_mbox_mtx); sc->sc_mbox_pending = 1; while (sc->sc_mbox_pending == 1) { - msleep(sc->sc_mbox, &sc->sc_mbox_mtx, PRIBIO, - "qlambox", 0); + msleep_nsec(sc->sc_mbox, &sc->sc_mbox_mtx, PRIBIO, + "qlambox", INFSLP); } result = sc->sc_mbox[0]; sc->sc_mbox_pending = 0; diff --git a/sys/dev/pci/qle.c b/sys/dev/pci/qle.c index fe9475fc334..33eefebd187 100644 --- a/sys/dev/pci/qle.c +++ b/sys/dev/pci/qle.c @@ -1,4 +1,4 @@ -/* $OpenBSD: qle.c,v 1.47 2019/10/16 00:16:35 daniel Exp $ */ +/* $OpenBSD: qle.c,v 1.48 2019/12/31 22:57:07 jsg Exp $ */ /* * Copyright (c) 2013, 2014 Jonathan Matthew <jmatthew@openbsd.org> @@ -1496,8 +1496,8 @@ qle_mbox(struct qle_softc *sc, int maskin) mtx_enter(&sc->sc_mbox_mtx); sc->sc_mbox_pending = 1; while (sc->sc_mbox_pending == 1) { - msleep(sc->sc_mbox, &sc->sc_mbox_mtx, PRIBIO, - "qlembox", 0); + msleep_nsec(sc->sc_mbox, &sc->sc_mbox_mtx, PRIBIO, + "qlembox", INFSLP); } result = sc->sc_mbox[0]; sc->sc_mbox_pending = 0; diff --git a/sys/dev/vscsi.c b/sys/dev/vscsi.c index 765b62d4c5b..c5213de556c 100644 --- a/sys/dev/vscsi.c +++ b/sys/dev/vscsi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vscsi.c,v 1.44 2019/12/31 13:48:31 visa Exp $ */ +/* $OpenBSD: vscsi.c,v 1.45 2019/12/31 22:57:07 jsg Exp $ */ /* * Copyright (c) 2008 David Gwynne <dlg@openbsd.org> @@ -646,8 +646,8 @@ vscsiclose(dev_t dev, int flags, int mode, struct proc *p) mtx_enter(&sc->sc_state_mtx); while (sc->sc_ref_count > 0) { - msleep(&sc->sc_ref_count, &sc->sc_state_mtx, - PRIBIO, "vscsiref", 0); + msleep_nsec(&sc->sc_ref_count, &sc->sc_state_mtx, + PRIBIO, "vscsiref", INFSLP); } mtx_leave(&sc->sc_state_mtx); |