summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormpi <mpi@openbsd.org>2019-12-05 10:41:08 +0000
committermpi <mpi@openbsd.org>2019-12-05 10:41:08 +0000
commit83824c381825744670c01da7a640099ef05c45a5 (patch)
tree774259dcf94cfa843408bd36703e4ee98bdcb1b0
parentFix #ifndef NOSSL vs SMALL inconsistencies (diff)
downloadwireguard-openbsd-83824c381825744670c01da7a640099ef05c45a5.tar.xz
wireguard-openbsd-83824c381825744670c01da7a640099ef05c45a5.zip
Convert infinite sleeps to tsleep_nsec(9).
ok jca@
-rw-r--r--sys/miscfs/deadfs/dead_vnops.c4
-rw-r--r--sys/miscfs/fuse/fusebuf.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/miscfs/deadfs/dead_vnops.c b/sys/miscfs/deadfs/dead_vnops.c
index d4f523bfd72..6abb2eb638d 100644
--- a/sys/miscfs/deadfs/dead_vnops.c
+++ b/sys/miscfs/deadfs/dead_vnops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dead_vnops.c,v 1.30 2019/10/19 06:56:18 visa Exp $ */
+/* $OpenBSD: dead_vnops.c,v 1.31 2019/12/05 10:41:08 mpi Exp $ */
/* $NetBSD: dead_vnops.c,v 1.16 1996/02/13 13:12:48 mycroft Exp $ */
/*
@@ -266,7 +266,7 @@ chkvnlock(struct vnode *vp)
while (vp->v_flag & VXLOCK) {
vp->v_flag |= VXWANT;
- tsleep(vp, PINOD, "chkvnlock", 0);
+ tsleep_nsec(vp, PINOD, "chkvnlock", INFSLP);
locked = 1;
}
return (locked);
diff --git a/sys/miscfs/fuse/fusebuf.c b/sys/miscfs/fuse/fusebuf.c
index 9673491bcba..c2d01bd7b14 100644
--- a/sys/miscfs/fuse/fusebuf.c
+++ b/sys/miscfs/fuse/fusebuf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fusebuf.c,v 1.16 2018/06/21 14:53:36 helg Exp $ */
+/* $OpenBSD: fusebuf.c,v 1.17 2019/12/05 10:41:08 mpi Exp $ */
/*
* Copyright (c) 2012-2013 Sylvestre Gallon <ccna.syl@gmail.com>
*
@@ -82,7 +82,7 @@ int
fb_queue(dev_t dev, struct fusebuf *fbuf)
{
fuse_device_queue_fbuf(dev, fbuf);
- tsleep(fbuf, PWAIT, "fuse", 0);
+ tsleep_nsec(fbuf, PWAIT, "fuse", INFSLP);
return (fbuf->fb_err);
}