summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortedu <tedu@openbsd.org>2004-02-15 02:56:13 +0000
committertedu <tedu@openbsd.org>2004-02-15 02:56:13 +0000
commit335930d99864211c78295686e6d3ce466642d7a9 (patch)
tree3ff563a6ab3590c28ee5c7ca4fdfd6d03cdbf02b
parent18 -> ETHER_ADDR_LEN*3 in ether_sprintf() for clarity (diff)
downloadwireguard-openbsd-335930d99864211c78295686e6d3ce466642d7a9.tar.xz
wireguard-openbsd-335930d99864211c78295686e6d3ce466642d7a9.zip
sneaky disk_unbusy()'s tried to hide
-rw-r--r--sys/arch/hp300/dev/hd.c5
-rw-r--r--sys/arch/hp300/dev/sd.c5
2 files changed, 6 insertions, 4 deletions
diff --git a/sys/arch/hp300/dev/hd.c b/sys/arch/hp300/dev/hd.c
index a71bd88d24d..3e96c8dd619 100644
--- a/sys/arch/hp300/dev/hd.c
+++ b/sys/arch/hp300/dev/hd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hd.c,v 1.23 2003/06/02 23:27:44 millert Exp $ */
+/* $OpenBSD: hd.c,v 1.24 2004/02/15 02:56:13 tedu Exp $ */
/* $NetBSD: rd.c,v 1.33 1997/07/10 18:14:08 kleink Exp $ */
/*
@@ -877,7 +877,8 @@ hdinterrupt(arg)
return;
}
#endif
- disk_unbusy(&rs->sc_dkdev, (bp->b_bcount - bp->b_resid));
+ disk_unbusy(&rs->sc_dkdev, (bp->b_bcount - bp->b_resid),
+ (bp->b_flags & B_READ));
if (rs->sc_flags & HDF_SEEK) {
rs->sc_flags &= ~HDF_SEEK;
diff --git a/sys/arch/hp300/dev/sd.c b/sys/arch/hp300/dev/sd.c
index df9a4c49106..ceeb8aa0e02 100644
--- a/sys/arch/hp300/dev/sd.c
+++ b/sys/arch/hp300/dev/sd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sd.c,v 1.32 2003/11/03 05:34:43 david Exp $ */
+/* $OpenBSD: sd.c,v 1.33 2004/02/15 02:56:13 tedu Exp $ */
/* $NetBSD: sd.c,v 1.34 1997/07/10 18:14:10 kleink Exp $ */
/*
@@ -984,7 +984,8 @@ sdintr(arg, stat)
return;
}
- disk_unbusy(&sc->sc_dkdev, (bp->b_bcount - bp->b_resid));
+ disk_unbusy(&sc->sc_dkdev, (bp->b_bcount - bp->b_resid),
+ (bp->b_flags & B_READ));
if (stat) {
#ifdef DEBUG