diff options
| author | oster <oster@NetBSD.org> | 2004-08-26 17:09:18 +0000 |
|---|---|---|
| committer | oster <oster@NetBSD.org> | 2004-08-26 17:09:18 +0000 |
| commit | da1725a1169f7b8ba175b2ab4976beb5341e6480 (patch) | |
| tree | 6c73886378393be9bb5ae2ba5ef24a3fb803d4ee /sys/dev/raidframe | |
| parent | 6c6c2be95f387edd1c82abf6337711f7121271df (diff) | |
rf_CheckLabels() needs to die, but for now, we patch it by setting
fatal_error when too_fatal is set, and by setting fatal_error in a
couple other critical cases.
Diffstat (limited to 'sys/dev/raidframe')
| -rw-r--r-- | sys/dev/raidframe/rf_disks.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/dev/raidframe/rf_disks.c b/sys/dev/raidframe/rf_disks.c index f0f6c97570a..c1d0f8f7325 100644 --- a/sys/dev/raidframe/rf_disks.c +++ b/sys/dev/raidframe/rf_disks.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_disks.c,v 1.53 2004/05/22 20:56:52 oster Exp $ */ +/* $NetBSD: rf_disks.c,v 1.54 2004/08/26 17:09:18 oster Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. * All rights reserved. @@ -67,7 +67,7 @@ ***************************************************************/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_disks.c,v 1.53 2004/05/22 20:56:52 oster Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_disks.c,v 1.54 2004/08/26 17:09:18 oster Exp $"); #include <dev/raidframe/raidframevar.h> @@ -902,16 +902,19 @@ rf_CheckLabels(RF_Raid_t *raidPtr, RF_Config_t *cfgPtr) Bail -- make things fail so that the user must force the issue... */ hosed_column = -1; + fatal_error = 1; } if (num_ser > 2) { printf("raid%d: Too many different serial numbers!\n", raidPtr->raidid); + fatal_error = 1; } if (num_mod > 2) { printf("raid%d: Too many different mod counters!\n", raidPtr->raidid); + fatal_error = 1; } /* we start by assuming the parity will be good, and flee from |
