diff options
| author | oster <oster@NetBSD.org> | 2001-10-05 15:41:23 +0000 |
|---|---|---|
| committer | oster <oster@NetBSD.org> | 2001-10-05 15:41:23 +0000 |
| commit | 035a63f6d32f89de2413a6afcaf19d4db3ec789f (patch) | |
| tree | c3b3169dc3b82ff35158b4026d61bca7041cc176 /sys/dev/raidframe | |
| parent | 4471b944320acffc688bfa1a6642c7dc1048a063 (diff) | |
More #if 0's bite the dust.
Diffstat (limited to 'sys/dev/raidframe')
| -rw-r--r-- | sys/dev/raidframe/rf_acctrace.c | 6 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_copyback.c | 16 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_disks.c | 6 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_layout.h | 8 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_map.c | 7 |
5 files changed, 5 insertions, 38 deletions
diff --git a/sys/dev/raidframe/rf_acctrace.c b/sys/dev/raidframe/rf_acctrace.c index 9f52396e75e..902d6a11aa3 100644 --- a/sys/dev/raidframe/rf_acctrace.c +++ b/sys/dev/raidframe/rf_acctrace.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_acctrace.c,v 1.5 2001/10/04 15:58:51 oster Exp $ */ +/* $NetBSD: rf_acctrace.c,v 1.6 2001/10/05 15:41:23 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -106,10 +106,6 @@ rf_LogTraceRec(raid, rec) RF_AccTraceEntry_t *rec; { RF_AccTotals_t *acc = &raid->acc_totals; -#if 0 - RF_Etimer_t timer; - int i, n; -#endif if (rf_stopCollectingTraces || ((rf_maxNumTraces >= 0) && (numTracesSoFar >= rf_maxNumTraces))) return; diff --git a/sys/dev/raidframe/rf_copyback.c b/sys/dev/raidframe/rf_copyback.c index 89186d94301..848cbf1b999 100644 --- a/sys/dev/raidframe/rf_copyback.c +++ b/sys/dev/raidframe/rf_copyback.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_copyback.c,v 1.16 2001/10/04 15:58:51 oster Exp $ */ +/* $NetBSD: rf_copyback.c,v 1.17 2001/10/05 15:41:23 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -180,20 +180,6 @@ rf_CopybackReconstructedData(raidPtr) raidPtr->Disks[frow][fcol].numBlocks * rf_sizePercentage / 100; } -#if 0 - /* This is the way it was done before the CAM stuff was removed */ - - if (rf_extract_ids(badDisk->devname, &bus, &targ, &lun)) { - printf("COPYBACK: unable to extract bus, target, lun from devname %s\n", - badDisk->devname); - return; - } - /* TUR the disk that's marked as bad to be sure that it's actually - * alive */ - rf_SCSI_AllocTUR(&tur_op); - retcode = rf_SCSI_DoTUR(tur_op, bus, targ, lun, badDisk->dev); - rf_SCSI_FreeDiskOp(tur_op, 0); -#endif if (retcode) { printf("COPYBACK: target disk failed TUR\n"); diff --git a/sys/dev/raidframe/rf_disks.c b/sys/dev/raidframe/rf_disks.c index 1218092a7fc..e87bca5743f 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.35 2001/10/04 15:58:53 oster Exp $ */ +/* $NetBSD: rf_disks.c,v 1.36 2001/10/05 15:41:23 oster Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. * All rights reserved. @@ -1024,10 +1024,6 @@ rf_add_hot_spare(raidPtr, sparePtr) unsigned int bs; int spare_number; -#if 0 - printf("Just in rf_add_hot_spare: %d\n",raidPtr->numSpare); - printf("Num col: %d\n",raidPtr->numCol); -#endif if (raidPtr->numSpare >= RF_MAXSPARE) { RF_ERRORMSG1("Too many spares: %d\n", raidPtr->numSpare); return(EINVAL); diff --git a/sys/dev/raidframe/rf_layout.h b/sys/dev/raidframe/rf_layout.h index f1a8aaa7641..2f9e01380b1 100644 --- a/sys/dev/raidframe/rf_layout.h +++ b/sys/dev/raidframe/rf_layout.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_layout.h,v 1.6 2001/10/04 15:58:54 oster Exp $ */ +/* $NetBSD: rf_layout.h,v 1.7 2001/10/05 15:41:23 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -128,15 +128,9 @@ struct RF_AccessStripeMap_s { * or 1) */ int numQFailed; /* number of failed Q units accessed (0 or 1) */ RF_AccessStripeMapFlags_t flags; /* various flags */ -#if 0 - RF_PhysDiskAddr_t *failedPDA; /* points to the PDA that has failed */ - RF_PhysDiskAddr_t *failedPDAtwo; /* points to the second PDA - * that has failed, if any */ -#else int numFailedPDAs; /* number of failed phys addrs */ RF_PhysDiskAddr_t *failedPDAs[RF_MAX_FAILED_PDA]; /* array of failed phys * addrs */ -#endif RF_PhysDiskAddr_t *physInfo; /* a list of PhysDiskAddr structs */ RF_PhysDiskAddr_t *parityInfo; /* list of physical addrs for the * parity (P of P + Q ) */ diff --git a/sys/dev/raidframe/rf_map.c b/sys/dev/raidframe/rf_map.c index fe8a4784548..84430a3cd73 100644 --- a/sys/dev/raidframe/rf_map.c +++ b/sys/dev/raidframe/rf_map.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_map.c,v 1.7 2001/10/04 15:58:54 oster Exp $ */ +/* $NetBSD: rf_map.c,v 1.8 2001/10/05 15:41:23 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -880,11 +880,6 @@ rf_ASMCheckStatus( asm_p->numParityFailed++; else { asm_p->numDataFailed++; -#if 0 - /* XXX Do we really want this spewing - * out on the console? GO */ - printf("DATA_FAILED!\n"); -#endif } asm_p->failedPDAs[asm_p->numFailedPDAs] = pda_p; asm_p->numFailedPDAs++; |
