[src/trunk]: src/sys/dev/raidframe More #if 0's bite the dust.

[oster <oster%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2d9208ae1822
branches:  trunk
changeset: 515825:2d9208ae1822
user:      oster <oster%NetBSD.org@localhost>
date:      Fri Oct 05 15:41:23 2001 +0000

description:
More #if 0's bite the dust.

diffstat:

 sys/dev/raidframe/rf_acctrace.c |   6 +-----
 sys/dev/raidframe/rf_copyback.c |  16 +---------------
 sys/dev/raidframe/rf_disks.c    |   6 +-----
 sys/dev/raidframe/rf_layout.h   |   8 +-------
 sys/dev/raidframe/rf_map.c      |   7 +------
 5 files changed, 5 insertions(+), 38 deletions(-)

diffs (116 lines):

diff -r 70bda2d38ff0 -r 2d9208ae1822 sys/dev/raidframe/rf_acctrace.c
--- a/sys/dev/raidframe/rf_acctrace.c   Fri Oct 05 15:36:46 2001 +0000
+++ b/sys/dev/raidframe/rf_acctrace.c   Fri Oct 05 15:41:23 2001 +0000
@@ -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_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 -r 70bda2d38ff0 -r 2d9208ae1822 sys/dev/raidframe/rf_copyback.c
--- a/sys/dev/raidframe/rf_copyback.c   Fri Oct 05 15:36:46 2001 +0000
+++ b/sys/dev/raidframe/rf_copyback.c   Fri Oct 05 15:41:23 2001 +0000
@@ -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 @@
                    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 -r 70bda2d38ff0 -r 2d9208ae1822 sys/dev/raidframe/rf_disks.c
--- a/sys/dev/raidframe/rf_disks.c      Fri Oct 05 15:36:46 2001 +0000
+++ b/sys/dev/raidframe/rf_disks.c      Fri Oct 05 15:41:23 2001 +0000
@@ -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 @@
        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 -r 70bda2d38ff0 -r 2d9208ae1822 sys/dev/raidframe/rf_layout.h
--- a/sys/dev/raidframe/rf_layout.h     Fri Oct 05 15:36:46 2001 +0000
+++ b/sys/dev/raidframe/rf_layout.h     Fri Oct 05 15:41:23 2001 +0000
@@ -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 @@
                                 * 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 -r 70bda2d38ff0 -r 2d9208ae1822 sys/dev/raidframe/rf_map.c
--- a/sys/dev/raidframe/rf_map.c        Fri Oct 05 15:36:46 2001 +0000
+++ b/sys/dev/raidframe/rf_map.c        Fri Oct 05 15:41:23 2001 +0000
@@ -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 @@
                                        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++;