diff options
| author |   mpi <mpi@openbsd.org> | 2020-01-08 15:03:10 +0000 |
|---|---|---|
| committer | mpi <mpi@openbsd.org> | 2020-01-08 15:03:10 +0000 |
| commit | 9b55129e7defe32636e1f234bcd995d2206136ca (patch) | |
| tree | 08e92a3426570d1c697dec12576f7add426476b5 | |
| parent | Document OBP boot-device and boot-file variables (diff) | |
| download | wireguard-openbsd-9b55129e7defe32636e1f234bcd995d2206136ca.tar.xz wireguard-openbsd-9b55129e7defe32636e1f234bcd995d2206136ca.zip | |
Convert infinite sleeps to tsleep_nsec(9).
ok bluhm@
| -rw-r--r-- | sys/kern/sysv_sem.c | 6 | ||||
| -rw-r--r-- | sys/miscfs/fifofs/fifo_vnops.c | 10 | ||||
| -rw-r--r-- | sys/nfs/nfs_vfsops.c | 5 |
3 files changed, 10 insertions, 11 deletions
diff --git a/sys/kern/sysv_sem.c b/sys/kern/sysv_sem.c index 1abfda51c5c..b2222ba92ba 100644 --- a/sys/kern/sysv_sem.c +++ b/sys/kern/sysv_sem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sysv_sem.c,v 1.56 2019/02/04 07:04:28 anton Exp $ */ +/* $OpenBSD: sysv_sem.c,v 1.57 2020/01/08 15:03:10 mpi Exp $ */ /* $NetBSD: sysv_sem.c,v 1.26 1996/02/09 19:00:25 christos Exp $ */ /* @@ -648,8 +648,8 @@ sys_semop(struct proc *p, void *v, register_t *retval) semptr->semncnt++; DPRINTF(("semop: good night!\n")); - error = tsleep(&sema[semid], PLOCK | PCATCH, - "semwait", 0); + error = tsleep_nsec(&sema[semid], PLOCK | PCATCH, + "semwait", INFSLP); DPRINTF(("semop: good morning (error=%d)!\n", error)); suptr = NULL; /* sem_undo may have been reallocated */ diff --git a/sys/miscfs/fifofs/fifo_vnops.c b/sys/miscfs/fifofs/fifo_vnops.c index d71b917214f..83b2c891178 100644 --- a/sys/miscfs/fifofs/fifo_vnops.c +++ b/sys/miscfs/fifofs/fifo_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fifo_vnops.c,v 1.70 2019/12/31 13:48:32 visa Exp $ */ +/* $OpenBSD: fifo_vnops.c,v 1.71 2020/01/08 15:03:10 mpi Exp $ */ /* $NetBSD: fifo_vnops.c,v 1.18 1996/03/16 23:52:42 christos Exp $ */ /* @@ -192,16 +192,16 @@ fifo_open(void *v) if ((ap->a_mode & O_NONBLOCK) == 0) { if ((ap->a_mode & FREAD) && fip->fi_writers == 0) { VOP_UNLOCK(vp); - error = tsleep(&fip->fi_readers, - PCATCH | PSOCK, "fifor", 0); + error = tsleep_nsec(&fip->fi_readers, + PCATCH | PSOCK, "fifor", INFSLP); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); if (error) goto bad; } if ((ap->a_mode & FWRITE) && fip->fi_readers == 0) { VOP_UNLOCK(vp); - error = tsleep(&fip->fi_writers, - PCATCH | PSOCK, "fifow", 0); + error = tsleep_nsec(&fip->fi_writers, + PCATCH | PSOCK, "fifow", INFSLP); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); if (error) goto bad; diff --git a/sys/nfs/nfs_vfsops.c b/sys/nfs/nfs_vfsops.c index fae12217f71..0e394f2bbca 100644 --- a/sys/nfs/nfs_vfsops.c +++ b/sys/nfs/nfs_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_vfsops.c,v 1.123 2019/12/26 13:28:49 bluhm Exp $ */ +/* $OpenBSD: nfs_vfsops.c,v 1.124 2020/01/08 15:03:10 mpi Exp $ */ /* $NetBSD: nfs_vfsops.c,v 1.46.4.1 1996/05/25 22:40:35 fvdl Exp $ */ /* @@ -522,8 +522,7 @@ nfs_decode_args(struct nfsmount *nmp, struct nfs_args *argp, if (nmp->nm_sotype == SOCK_DGRAM) while (nfs_connect(nmp, NULL)) { printf("nfs_args: retrying connect\n"); - (void) tsleep(&lbolt, - PSOCK, "nfscon", 0); + tsleep_nsec(&lbolt, PSOCK, "nfscon", INFSLP); } } |