[src/trunk]: src/sys/dev/raidframe Move variables into the same ifdef as thei...

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

details:   https://anonhg.NetBSD.org/src/rev/0028664f3c86
branches:  trunk
changeset: 790030:0028664f3c86
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Sep 15 12:41:17 2013 +0000

description:
Move variables into the same ifdef as their use

diffstat:

 sys/dev/raidframe/rf_dagffwr.c |  40 ++++++++++++++++++++++------------------
 1 files changed, 22 insertions(+), 18 deletions(-)

diffs (109 lines):

diff -r 10a3b1284694 -r 0028664f3c86 sys/dev/raidframe/rf_dagffwr.c
--- a/sys/dev/raidframe/rf_dagffwr.c    Sun Sep 15 12:23:06 2013 +0000
+++ b/sys/dev/raidframe/rf_dagffwr.c    Sun Sep 15 12:41:17 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rf_dagffwr.c,v 1.33 2006/11/16 01:33:23 christos Exp $ */
+/*     $NetBSD: rf_dagffwr.c,v 1.34 2013/09/15 12:41:17 martin Exp $   */
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_dagffwr.c,v 1.33 2006/11/16 01:33:23 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_dagffwr.c,v 1.34 2013/09/15 12:41:17 martin Exp $");
 
 #include <dev/raidframe/raidframevar.h>
 
@@ -167,7 +167,10 @@
                             int allowBufferRecycle)
 {
        RF_DagNode_t *wndNodes, *rodNodes, *xorNode, *wnpNode, *tmpNode;
-       RF_DagNode_t *wnqNode, *blockNode, *commitNode, *termNode;
+       RF_DagNode_t *blockNode, *commitNode, *termNode;
+#if (RF_INCLUDE_DECL_PQ > 0) || (RF_INCLUDE_RAID6 > 0)
+       RF_DagNode_t *wnqNode;
+#endif
        int     nWndNodes, nRodNodes, i, nodeNum, asmNum;
        RF_AccessStripeMapHeader_t *new_asm_h[2];
        RF_StripeNum_t parityStripeID;
@@ -226,9 +229,7 @@
        if (nfaults == 2) {
                wnqNode = rf_AllocDAGNode();
        } else {
-#endif
                wnqNode = NULL;
-#if (RF_INCLUDE_DECL_PQ > 0) || (RF_INCLUDE_RAID6 > 0)
        }
 #endif
        rf_MapUnaccessedPortionOfStripe(raidPtr, layoutPtr, asmap, dag_h,
@@ -524,23 +525,24 @@
                             const RF_RedFuncs_t *pfuncs,
                             const RF_RedFuncs_t *qfuncs)
 {
-       RF_DagNode_t *readDataNodes, *readParityNodes, *readQNodes, *termNode;
+       RF_DagNode_t *readDataNodes, *readParityNodes, *termNode;
        RF_DagNode_t *tmpNode, *tmpreadDataNode, *tmpreadParityNode;
-       RF_DagNode_t *xorNodes, *qNodes, *blockNode, *commitNode;
-       RF_DagNode_t *writeDataNodes, *writeParityNodes, *writeQNodes;
-       RF_DagNode_t *tmpxorNode, *tmpqNode, *tmpwriteDataNode, *tmpreadQNode;
+       RF_DagNode_t *xorNodes, *blockNode, *commitNode;
+       RF_DagNode_t *writeDataNodes, *writeParityNodes;
+       RF_DagNode_t *tmpxorNode, *tmpwriteDataNode;
        RF_DagNode_t *tmpwriteParityNode;
 #if (RF_INCLUDE_DECL_PQ > 0) || (RF_INCLUDE_RAID6 > 0)
-       RF_DagNode_t *tmpwriteQNode;
+       RF_DagNode_t *tmpwriteQNode, *tmpreadQNode, *tmpqNode, *readQNodes,
+            *writeQNodes, *qNodes;
 #endif
-       int     i, j, nNodes, totalNumNodes;
+       int     i, j, nNodes;
        RF_ReconUnitNum_t which_ru;
        int     (*func) (RF_DagNode_t *), (*undoFunc) (RF_DagNode_t *);
-       int     (*qfunc) (RF_DagNode_t *);
+       int     (*qfunc) (RF_DagNode_t *) __unused;
        int     numDataNodes, numParityNodes;
        RF_StripeNum_t parityStripeID;
        RF_PhysDiskAddr_t *pda;
-       const char *name, *qname;
+       const char *name, *qname __unused;
        long    nfaults;
 
        nfaults = qfuncs ? 2 : 1;
@@ -579,9 +581,11 @@
         * redundancy computation node for each parity node (nfaults *
         * nparity) a read and write for each parity unit a block and
         * commit node (2) a terminate node if atomic RMW an unlock
-        * node for each data unit, redundancy unit */
-       totalNumNodes = (2 * numDataNodes) + (nfaults * numParityNodes)
-           + (nfaults * 2 * numParityNodes) + 3;
+        * node for each data unit, redundancy unit
+        * totalNumNodes = (2 * numDataNodes) + (nfaults * numParityNodes)
+        *   + (nfaults * 2 * numParityNodes) + 3;
+        */
+
        /*
          * Step 2. create the nodes
          */
@@ -656,9 +660,7 @@
                }
                qNodes = dag_h->nodes;
        } else {
-#endif
                readQNodes = writeQNodes = qNodes = NULL;
-#if (RF_INCLUDE_DECL_PQ > 0) || (RF_INCLUDE_RAID6 > 0)
        }
 #endif
 
@@ -818,8 +820,10 @@
                tmpreadDataNode = readDataNodes;
                tmpreadParityNode = readParityNodes;
                tmpwriteDataNode = writeDataNodes;
+#if (RF_INCLUDE_DECL_PQ > 0) || (RF_INCLUDE_RAID6 > 0)
                tmpqNode = qNodes;
                tmpreadQNode = readQNodes;
+#endif
                for (i = 0; i < numParityNodes; i++) {
                        /* note: no wakeup func for xor */
                        rf_InitNode(tmpxorNode, rf_wait, RF_FALSE, func,