summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorart <art@openbsd.org>2002-06-08 18:43:34 +0000
committerart <art@openbsd.org>2002-06-08 18:43:34 +0000
commit58e272769be8fb1a0b2d13ce88d46b5ad819e83a (patch)
treeb55558d1c0b9c292eefeaaf143502dc193a6297f
parentUse ltsleep in vfs_busy. (diff)
downloadwireguard-openbsd-58e272769be8fb1a0b2d13ce88d46b5ad819e83a.tar.xz
wireguard-openbsd-58e272769be8fb1a0b2d13ce88d46b5ad819e83a.zip
Use tsleep instead of sleep.
-rw-r--r--sys/miscfs/deadfs/dead_vnops.c4
-rw-r--r--sys/miscfs/union/union_subr.c6
-rw-r--r--sys/miscfs/union/union_vnops.c4
3 files changed, 7 insertions, 7 deletions
diff --git a/sys/miscfs/deadfs/dead_vnops.c b/sys/miscfs/deadfs/dead_vnops.c
index 7ca3c4a7800..eef86925fd0 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.12 2002/05/24 13:41:27 art Exp $ */
+/* $OpenBSD: dead_vnops.c,v 1.13 2002/06/08 18:43:34 art Exp $ */
/* $NetBSD: dead_vnops.c,v 1.16 1996/02/13 13:12:48 mycroft Exp $ */
/*
@@ -357,7 +357,7 @@ chkvnlock(vp)
while (vp->v_flag & VXLOCK) {
vp->v_flag |= VXWANT;
- sleep((caddr_t)vp, PINOD);
+ tsleep(vp, PINOD, "chkvnlock", 0);
locked = 1;
}
return (locked);
diff --git a/sys/miscfs/union/union_subr.c b/sys/miscfs/union/union_subr.c
index 43867db8ff7..23e9e81ea9e 100644
--- a/sys/miscfs/union/union_subr.c
+++ b/sys/miscfs/union/union_subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: union_subr.c,v 1.11 2002/03/14 01:27:08 millert Exp $ */
+/* $OpenBSD: union_subr.c,v 1.12 2002/06/08 18:43:34 art Exp $ */
/* $NetBSD: union_subr.c,v 1.18 1996/02/09 22:41:10 christos Exp $ */
/*
@@ -160,7 +160,7 @@ union_list_lock(ix)
if (unvplock[ix] & UN_LOCKED) {
unvplock[ix] |= UN_WANTED;
- sleep((caddr_t) &unvplock[ix], PINOD);
+ tsleep((caddr_t) &unvplock[ix], PINOD, "unlstlk", 0);
return (1);
}
@@ -453,7 +453,7 @@ loop:
if (un->un_flags & UN_LOCKED) {
vrele(UNIONTOV(un));
un->un_flags |= UN_WANTED;
- sleep((caddr_t)un, PINOD);
+ tsleep((caddr_t)un, PINOD, "unallvp", 0);
goto loop;
}
un->un_flags |= UN_LOCKED;
diff --git a/sys/miscfs/union/union_vnops.c b/sys/miscfs/union/union_vnops.c
index 072dfc2068a..2988085190f 100644
--- a/sys/miscfs/union/union_vnops.c
+++ b/sys/miscfs/union/union_vnops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: union_vnops.c,v 1.18 2002/03/14 01:27:08 millert Exp $ */
+/* $OpenBSD: union_vnops.c,v 1.19 2002/06/08 18:43:34 art Exp $ */
/* $NetBSD: union_vnops.c,v 1.30.4.1 1996/05/25 22:10:14 jtc Exp $ */
/*
@@ -1617,7 +1617,7 @@ start:
panic("union: locking against myself");
#endif
un->un_flags |= UN_WANTED;
- sleep((caddr_t)un, PINOD);
+ tsleep((caddr_t)un, PINOD, "unionlk", 0);
goto start;
}