[src/trunk]: src/sys/dev/raidframe infoFunc doesn't exist any more. Nuke com...

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

details:   https://anonhg.NetBSD.org/src/rev/9cd4bfebca7b
branches:  trunk
changeset: 555413:9cd4bfebca7b
user:      oster <oster%NetBSD.org@localhost>
date:      Sun Nov 16 20:32:05 2003 +0000

description:
infoFunc doesn't exist any more.  Nuke commented out bits refering
to infoFunc.

diffstat:

 sys/dev/raidframe/rf_evenodd.c       |  6 +++---
 sys/dev/raidframe/rf_paritylogging.c |  6 +++---
 sys/dev/raidframe/rf_pq.c            |  7 +++----
 sys/dev/raidframe/rf_raid5.c         |  6 +++---
 4 files changed, 12 insertions(+), 13 deletions(-)

diffs (116 lines):

diff -r 8f4fc86315b8 -r 9cd4bfebca7b sys/dev/raidframe/rf_evenodd.c
--- a/sys/dev/raidframe/rf_evenodd.c    Sun Nov 16 18:31:45 2003 +0000
+++ b/sys/dev/raidframe/rf_evenodd.c    Sun Nov 16 20:32:05 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rf_evenodd.c,v 1.9 2002/09/23 02:40:08 oster Exp $     */
+/*     $NetBSD: rf_evenodd.c,v 1.10 2003/11/16 20:32:05 oster Exp $    */
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -33,7 +33,7 @@
  ****************************************************************************************/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_evenodd.c,v 1.9 2002/09/23 02:40:08 oster Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_evenodd.c,v 1.10 2003/11/16 20:32:05 oster Exp $");
 
 #include "rf_archs.h"
 
@@ -213,7 +213,7 @@
        RF_ASSERT(RF_IO_IS_R_OR_W(type));
        if (ntfail > 2) {
                RF_ERRORMSG("more than two disks failed in a single group!  Aborting I/O operation.\n");
-                /* *infoFunc = */ *createFunc = NULL;
+               *createFunc = NULL;
                return;
        }
        /* ok, we can do this I/O */
diff -r 8f4fc86315b8 -r 9cd4bfebca7b sys/dev/raidframe/rf_paritylogging.c
--- a/sys/dev/raidframe/rf_paritylogging.c      Sun Nov 16 18:31:45 2003 +0000
+++ b/sys/dev/raidframe/rf_paritylogging.c      Sun Nov 16 20:32:05 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rf_paritylogging.c,v 1.14 2002/09/23 02:40:08 oster Exp $      */
+/*     $NetBSD: rf_paritylogging.c,v 1.15 2003/11/16 20:32:05 oster Exp $      */
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_paritylogging.c,v 1.14 2002/09/23 02:40:08 oster Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_paritylogging.c,v 1.15 2003/11/16 20:32:05 oster Exp $");
 
 #include "rf_archs.h"
 
@@ -943,7 +943,7 @@
 
        if (asmp->numDataFailed + asmp->numParityFailed > 1) {
                RF_ERRORMSG("Multiple disks failed in a single group!  Aborting I/O operation.\n");
-                /* *infoFunc = */ *createFunc = NULL;
+               *createFunc = NULL;
                return;
        } else
                if (asmp->numDataFailed + asmp->numParityFailed == 1) {
diff -r 8f4fc86315b8 -r 9cd4bfebca7b sys/dev/raidframe/rf_pq.c
--- a/sys/dev/raidframe/rf_pq.c Sun Nov 16 18:31:45 2003 +0000
+++ b/sys/dev/raidframe/rf_pq.c Sun Nov 16 20:32:05 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rf_pq.c,v 1.12 2002/05/22 15:40:51 wiz Exp $   */
+/*     $NetBSD: rf_pq.c,v 1.13 2003/11/16 20:32:05 oster Exp $ */
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_pq.c,v 1.12 2002/05/22 15:40:51 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_pq.c,v 1.13 2003/11/16 20:32:05 oster Exp $");
 
 #include "rf_archs.h"
 
@@ -115,7 +115,7 @@
        RF_ASSERT(RF_IO_IS_R_OR_W(type));
        if (ntfail > 2) {
                RF_ERRORMSG("more than two disks failed in a single group!  Aborting I/O operation.\n");
-                /* *infoFunc = */ *createFunc = NULL;
+               *createFunc = NULL;
                return;
        }
        /* ok, we can do this I/O */
@@ -146,7 +146,6 @@
                        break;
                case 2:
                        /* lost two data units */
-                       /* *infoFunc = PQOneTwo; */
                        *createFunc = (RF_VoidFuncPtr) rf_PQ_200_CreateReadDAG;
                        break;
                }
diff -r 8f4fc86315b8 -r 9cd4bfebca7b sys/dev/raidframe/rf_raid5.c
--- a/sys/dev/raidframe/rf_raid5.c      Sun Nov 16 18:31:45 2003 +0000
+++ b/sys/dev/raidframe/rf_raid5.c      Sun Nov 16 20:32:05 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rf_raid5.c,v 1.7 2002/09/23 02:40:09 oster Exp $       */
+/*     $NetBSD: rf_raid5.c,v 1.8 2003/11/16 20:32:05 oster Exp $       */
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -33,7 +33,7 @@
  *****************************************************************************/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_raid5.c,v 1.7 2002/09/23 02:40:09 oster Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_raid5.c,v 1.8 2003/11/16 20:32:05 oster Exp $");
 
 #include <dev/raidframe/raidframevar.h>
 
@@ -196,7 +196,7 @@
 
        if (asmap->numDataFailed + asmap->numParityFailed > 1) {
                RF_ERRORMSG("Multiple disks failed in a single group!  Aborting I/O operation.\n");
-                /* *infoFunc = */ *createFunc = NULL;
+               *createFunc = NULL;
                return;
        } else
                if (asmap->numDataFailed + asmap->numParityFailed == 1) {