summaryrefslogtreecommitdiff
path: root/sys/dev/raidframe
diff options
context:
space:
mode:
authoroster <oster@NetBSD.org>1999-11-17 01:16:37 +0000
committeroster <oster@NetBSD.org>1999-11-17 01:16:37 +0000
commite5891556920ee2f6221fd6bd78bb72f56eff18a1 (patch)
tree80881ebc56ef5534bddb284a9d7f22c24e8cd438 /sys/dev/raidframe
parente345f0f17c92710c62677cd9d85d978977f4dc59 (diff)
Remove some minor stuff that wasn't right, and wasn't even really used.
Diffstat (limited to 'sys/dev/raidframe')
-rw-r--r--sys/dev/raidframe/rf_netbsdkintf.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/sys/dev/raidframe/rf_netbsdkintf.c b/sys/dev/raidframe/rf_netbsdkintf.c
index 5557d1d876f..1e096d916c5 100644
--- a/sys/dev/raidframe/rf_netbsdkintf.c
+++ b/sys/dev/raidframe/rf_netbsdkintf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_netbsdkintf.c,v 1.29 1999/08/14 23:34:18 oster Exp $ */
+/* $NetBSD: rf_netbsdkintf.c,v 1.30 1999/11/17 01:16:37 oster Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -153,11 +153,6 @@
int rf_kdebug_level = 0;
-#define RFK_BOOT_NONE 0
-#define RFK_BOOT_GOOD 1
-#define RFK_BOOT_BAD 2
-static int rf_kbooted = RFK_BOOT_NONE;
-
#ifdef DEBUG
#define db0_printf(a) printf a
#define db_printf(a) if (rf_kdebug_level > 0) printf a
@@ -348,8 +343,6 @@ raidattach(num)
else
panic("Serious error booting RAID!!\n");
- rf_kbooted = RFK_BOOT_GOOD;
-
/* put together some datastructures like the CCD device does.. This
* lets us lock the device and what-not when it gets opened. */
@@ -570,8 +563,13 @@ raidstrategy(bp)
else
db1_printf(("WRITE\n"));
#endif
- if (rf_kbooted != RFK_BOOT_GOOD)
+ if ((rs->sc_flags & RAIDF_INITED) ==0) {
+ bp->b_error = ENXIO;
+ bp->b_flags = B_ERROR;
+ bp->b_resid = bp->b_bcount;
+ biodone(bp);
return;
+ }
if (raidID >= numraid || !raidPtrs[raidID]) {
bp->b_error = ENODEV;
bp->b_flags |= B_ERROR;