summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>1998-05-07 05:19:37 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>1998-05-07 05:19:37 +0000
commit2f42e30f80fd885d2f65e8b446aa7e1aa09a26d3 (patch)
tree96b5fb03ad24e3911e6403cc7c9fb79391408ec9 /sys
parente72bc6cfb01f6959670a5c80130f0167065eedd7 (diff)
don't clear *_WLABEL on close so 'disklabel -W' is persistent like in the generic scsi system
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/hp300/dev/hd.c4
-rw-r--r--sys/arch/hp300/dev/sd.c4
-rw-r--r--sys/arch/pmax/dev/rz.c1
3 files changed, 4 insertions, 5 deletions
diff --git a/sys/arch/hp300/dev/hd.c b/sys/arch/hp300/dev/hd.c
index 71514571b0e..3d0a20e893c 100644
--- a/sys/arch/hp300/dev/hd.c
+++ b/sys/arch/hp300/dev/hd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hd.c,v 1.8 1998/04/25 00:38:16 millert Exp $ */
+/* $OpenBSD: hd.c,v 1.9 1998/05/07 05:19:34 millert Exp $ */
/* $NetBSD: rd.c,v 1.33 1997/07/10 18:14:08 kleink Exp $ */
/*
@@ -630,7 +630,7 @@ hdclose(dev, flag, mode, p)
sleep((caddr_t)&rs->sc_tab, PRIBIO);
}
splx(s);
- rs->sc_flags &= ~(HDF_CLOSING|HDF_WLABEL);
+ rs->sc_flags &= ~(HDF_CLOSING);
wakeup((caddr_t)rs);
}
return(0);
diff --git a/sys/arch/hp300/dev/sd.c b/sys/arch/hp300/dev/sd.c
index 58abd418d18..5632a750324 100644
--- a/sys/arch/hp300/dev/sd.c
+++ b/sys/arch/hp300/dev/sd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sd.c,v 1.18 1998/05/02 05:36:58 millert Exp $ */
+/* $OpenBSD: sd.c,v 1.19 1998/05/07 05:19:33 millert Exp $ */
/* $NetBSD: sd.c,v 1.34 1997/07/10 18:14:10 kleink Exp $ */
/*
@@ -609,7 +609,7 @@ sdclose(dev, flag, mode, p)
sleep((caddr_t)&sc->sc_tab, PRIBIO);
}
splx(s);
- sc->sc_flags &= ~(SDF_CLOSING|SDF_WLABEL|SDF_ERROR);
+ sc->sc_flags &= ~(SDF_CLOSING|SDF_ERROR);
wakeup((caddr_t)sc);
}
sc->sc_format_pid = -1;
diff --git a/sys/arch/pmax/dev/rz.c b/sys/arch/pmax/dev/rz.c
index bbad670e208..a346d6dabe0 100644
--- a/sys/arch/pmax/dev/rz.c
+++ b/sys/arch/pmax/dev/rz.c
@@ -958,7 +958,6 @@ rzclose(dev, flags, mode, p)
while (sc->sc_tab.b_actf)
sleep((caddr_t)&sc->sc_tab, PZERO - 1);
splx(s);
- sc->sc_flags &= ~RZF_WLABEL;
}
return (0);
}