diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2010-05-08 22:19:47 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2010-05-08 22:19:47 +0000 |
| commit | 1cab1d150362bb86ebd653349769403194068828 (patch) | |
| tree | 8f1a46d015de39ff3be3931768dd5cb218634b71 | |
| parent | c60925a8da6f5ba6b3c5a172c87f11377364205e (diff) | |
disk_busy()/disk_unbusy() dance; from NetBSD.
| -rw-r--r-- | sys/arch/vax/mscp/mscp_disk.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/sys/arch/vax/mscp/mscp_disk.c b/sys/arch/vax/mscp/mscp_disk.c index 28d1e734223..f1f822263a1 100644 --- a/sys/arch/vax/mscp/mscp_disk.c +++ b/sys/arch/vax/mscp/mscp_disk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mscp_disk.c,v 1.27 2010/04/23 15:25:21 jsing Exp $ */ +/* $OpenBSD: mscp_disk.c,v 1.28 2010/05/08 22:19:46 miod Exp $ */ /* $NetBSD: mscp_disk.c,v 1.30 2001/11/13 07:38:28 lukem Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. @@ -302,6 +302,9 @@ rastrategy(bp) * If drive is open `raw' or reading label, let it at it. */ if (ra->ra_state == DK_RDLABEL) { + s = splbio(); + disk_busy(&ra->ra_disk); + splx(s); mscp_strategy(bp, ra->ra_dev.dv_parent); return; } @@ -798,8 +801,21 @@ rriodone(usc, bp) struct buf *bp; { int s; + struct rx_softc *rx = NULL; /* Wall */ + + int unit = DISKUNIT(bp->b_dev); +#if NRA + if (major(bp->b_dev) == RAMAJOR) + rx = ra_cd.cd_devs[unit]; +#endif +#if NRX + if (major(bp->b_dev) != RAMAJOR) + rx = rx_cd.cd_devs[unit]; +#endif s = splbio(); + disk_unbusy(&rx->ra_disk, bp->b_bcount - bp->b_resid, + bp->b_flags & B_READ); biodone(bp); splx(s); } |