[src/trunk]: src/sys/dev/raidframe rf_GetNextReconEvent() *will* return a val...

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

details:   https://anonhg.NetBSD.org/src/rev/2cf56c1453de
branches:  trunk
changeset: 573706:2cf56c1453de
user:      oster <oster%NetBSD.org@localhost>
date:      Sat Feb 05 23:39:12 2005 +0000

description:
rf_GetNextReconEvent() *will* return a valid event, so no need for
the assert.  (we'd have panic'ed in there long before this assert
if that wasn't the case).

Minor whitespace changes.

diffstat:

 sys/dev/raidframe/rf_reconstruct.c |  10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diffs (46 lines):

diff -r 5e0a8d635d1d -r 2cf56c1453de sys/dev/raidframe/rf_reconstruct.c
--- a/sys/dev/raidframe/rf_reconstruct.c        Sat Feb 05 23:35:33 2005 +0000
+++ b/sys/dev/raidframe/rf_reconstruct.c        Sat Feb 05 23:39:12 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rf_reconstruct.c,v 1.82 2005/02/05 23:32:43 oster Exp $        */
+/*     $NetBSD: rf_reconstruct.c,v 1.83 2005/02/05 23:39:12 oster Exp $        */
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -33,7 +33,7 @@
  ************************************************************/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_reconstruct.c,v 1.82 2005/02/05 23:32:43 oster Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_reconstruct.c,v 1.83 2005/02/05 23:39:12 oster Exp $");
 
 #include <sys/time.h>
 #include <sys/buf.h>
@@ -639,8 +639,6 @@
        while (reconDesc->numDisksDone < raidPtr->numCol - 1) {
                
                event = rf_GetNextReconEvent(reconDesc);
-               RF_ASSERT(event);
-
                status = ProcessReconEvent(raidPtr, event);
 
                /* the normal case is that a read completes, and all is well. */
@@ -711,9 +709,8 @@
        while (!recon_error && rf_UnitsLeftToReconstruct(raidPtr->reconControl->reconMap) > 0) {
                
                event = rf_GetNextReconEvent(reconDesc);
-               RF_ASSERT(event);
+               status = ProcessReconEvent(raidPtr, event);
 
-               status = ProcessReconEvent(raidPtr, event);
                if (status == RF_RECON_WRITE_ERROR) {
                        recon_error = 1;
                        raidPtr->reconControl->error = 1; 
@@ -765,6 +762,7 @@
                if (!write_error) {
                        /* wait for writes to complete */
                        while (raidPtr->reconControl->pending_writes > 0) {
+
                                event = rf_GetNextReconEvent(reconDesc);
                                status = ProcessReconEvent(raidPtr, event);