[src/trunk]: src/sys/dev/raidframe Cleanup the initialization of buffers a bi...

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

details:   https://anonhg.NetBSD.org/src/rev/b57652f892e7
branches:  trunk
changeset: 587023:b57652f892e7
user:      oster <oster%NetBSD.org@localhost>
date:      Sun Jan 08 21:53:26 2006 +0000

description:
Cleanup the initialization of buffers a bit, and remove some old code
that works around a bug that no longer exists.  From yamt. Thanks!
(a bit more cleanup to follow)

diffstat:

 sys/dev/raidframe/rf_diskqueue.c   |   6 ++----
 sys/dev/raidframe/rf_netbsdkintf.c |  21 ++++-----------------
 2 files changed, 6 insertions(+), 21 deletions(-)

diffs (83 lines):

diff -r dccdd143951d -r b57652f892e7 sys/dev/raidframe/rf_diskqueue.c
--- a/sys/dev/raidframe/rf_diskqueue.c  Sun Jan 08 21:14:39 2006 +0000
+++ b/sys/dev/raidframe/rf_diskqueue.c  Sun Jan 08 21:53:26 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rf_diskqueue.c,v 1.44 2006/01/06 09:21:44 yamt Exp $   */
+/*     $NetBSD: rf_diskqueue.c,v 1.45 2006/01/08 21:53:26 oster Exp $  */
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -66,7 +66,7 @@
  ****************************************************************************/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_diskqueue.c,v 1.44 2006/01/06 09:21:44 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_diskqueue.c,v 1.45 2006/01/08 21:53:26 oster Exp $");
 
 #include <dev/raidframe/raidframevar.h>
 
@@ -465,8 +465,6 @@
                pool_put(&rf_pools.dqd, p);
                return (NULL);
        }
-       p->bp->b_flags = 0;
-       p->bp->b_vp = NULL; /* XXX unnecessary? */
 
        p->sectorOffset = ssect + rf_protectedSectors;
        p->numSector = nsect;
diff -r dccdd143951d -r b57652f892e7 sys/dev/raidframe/rf_netbsdkintf.c
--- a/sys/dev/raidframe/rf_netbsdkintf.c        Sun Jan 08 21:14:39 2006 +0000
+++ b/sys/dev/raidframe/rf_netbsdkintf.c        Sun Jan 08 21:53:26 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rf_netbsdkintf.c,v 1.196 2006/01/08 09:11:21 yamt Exp $        */
+/*     $NetBSD: rf_netbsdkintf.c,v 1.197 2006/01/08 21:53:26 oster Exp $       */
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -146,7 +146,7 @@
  ***********************************************************/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.196 2006/01/08 09:11:21 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.197 2006/01/08 21:53:26 oster Exp $");
 
 #include <sys/param.h>
 #include <sys/errno.h>
@@ -1812,19 +1812,6 @@
 #endif
 
        bp = req->bp;
-#if 1
-       /* XXX when there is a physical disk failure, someone is passing us a
-        * buffer that contains old stuff!!  Attempt to deal with this problem
-        * without taking a performance hit... (not sure where the real bug
-        * is.  It's buried in RAIDframe somewhere) :-(  GO ) */
-
-       if (bp->b_flags & B_ERROR) {
-               bp->b_flags &= ~B_ERROR;
-       }
-       if (bp->b_error != 0) {
-               bp->b_error = 0;
-       }
-#endif
 
        /*
         * context for raidiodone
@@ -1840,7 +1827,7 @@
                printf(("WAKEUP CALLED\n"));
                queue->numOutstanding++;
 
-               /* XXX need to glue the original buffer into this??  */
+               bp->b_flags = 0;
 
                KernelWakeupFunc(bp);
                break;
@@ -1853,7 +1840,7 @@
                }
 #endif
                InitBP(bp, queue->rf_cinfo->ci_vp,
-                   op | bp->b_flags, queue->rf_cinfo->ci_dev,
+                   op, queue->rf_cinfo->ci_dev,
                    req->sectorOffset, req->numSector,
                    req->buf, KernelWakeupFunc, (void *) req,
                    queue->raidPtr->logBytesPerSector, req->b_proc);