 @@ -1,14 +1,14 @@
-/*	$NetBSD: rf_reconstruct.c,v 1.106 2008/12/20 17:04:51 oster Exp $	*/
+/*	$NetBSD: rf_reconstruct.c,v 1.107 2009/02/11 23:54:10 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
+ *
  * Author: Mark Holland
+ *
  * Permission to use, copy, modify and distribute this software and
  * its documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
 @@ -23,27 +23,27 @@
  *  Pittsburgh PA 15213-3890
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */
 /************************************************************
+ *
  * rf_reconstruct.c -- code to perform on-line reconstruction
+ *
  ************************************************************/
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_reconstruct.c,v 1.106 2008/12/20 17:04:51 oster Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_reconstruct.c,v 1.107 2009/02/11 23:54:10 oster Exp $");
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/buf.h>
 #include <sys/errno.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/ioctl.h>
 #include <sys/fcntl.h>
 #include <sys/vnode.h>
 #include <dev/raidframe/raidframevar.h>
 #include "rf_raid.h"
 @@ -666,28 +666,30 @@ rf_ContinueReconstructFailedDisk(RF_Raid
 				*/
 				recon_error = 1;
 				raidPtr->reconControl->error = 1;
 				/* bump the numDisksDone count for reads,
 				   but not for writes */
 				if (status == RF_RECON_READ_ERROR)
 					reconDesc->numDisksDone++;
 				/* write errors are special -- when we are
 				   done dealing with the reads that are
 				   finished, we don't want to wait for any
 				   writes */
-				if (status == RF_RECON_WRITE_ERROR)
+				if (status == RF_RECON_WRITE_ERROR) {
 					write_error = 1;
 					num_writes++;
+				}
 			} else if (status == RF_RECON_READ_STOPPED) {
 				/* count this component as being "done" */
 				reconDesc->numDisksDone++;
 			} else if (status == RF_RECON_WRITE_DONE) {
 				num_writes++;
+			}
 			if (recon_error) {
 				/* make sure any stragglers are woken up so that
 				   their theads will complete, and we can get out
 				   of here with all IO processed */
 @@ -708,32 +710,33 @@ rf_ContinueReconstructFailedDisk(RF_Raid
+			}
 #endif
+		}
 		/* reads done, wakup any waiters, and then wait for writes */
 		rf_WakeupHeadSepCBWaiters(raidPtr);
 		while (!recon_error && (num_writes < pending_writes)) {
 			event = rf_GetNextReconEvent(reconDesc);
 			status = ProcessReconEvent(raidPtr, event);
 			if (status == RF_RECON_WRITE_ERROR) {
 				num_writes++;
 				recon_error = 1;
 				raidPtr->reconControl->error = 1;
 				/* an error was encountered at the very end... bail */
 			} else if (status == RF_RECON_WRITE_DONE) {
 				num_writes++;
 			} /* else it's something else, and we don't care */
+		}
 		if (recon_error ||
 		    (raidPtr->reconControl->lastPSID == lastPSID)) {
 			done = 1;
 			break;
+		}
 		prev = raidPtr->reconControl->lastPSID;
 		raidPtr->reconControl->lastPSID += incPSID;
 		if (raidPtr->reconControl->lastPSID > lastPSID) {
 			pending_writes = lastPSID - prev;
 			raidPtr->reconControl->lastPSID = lastPSID;
 @@ -1044,26 +1047,32 @@ ProcessReconEvent(RF_Raid_t *raidPtr, RF
 			retcode = 0;
+		}
 		break;
 		/* A read I/O failed to complete */
 	case RF_REVENT_READ_FAILED:
 		retcode = RF_RECON_READ_ERROR;
 		break;
 		/* A write I/O failed to complete */
 	case RF_REVENT_WRITE_FAILED:
 		retcode = RF_RECON_WRITE_ERROR;
 		/* This is an error, but it was a pending write.
 		   Account for it. */
 		RF_LOCK_MUTEX(raidPtr->reconControl->rb_mutex);
 		raidPtr->reconControl->pending_writes--;
 		RF_UNLOCK_MUTEX(raidPtr->reconControl->rb_mutex);
 		rbuf = (RF_ReconBuffer_t *) event->arg;
 		/* cleanup the disk queue data */
 		rf_FreeDiskQueueData((RF_DiskQueueData_t *) rbuf->arg);
 		/* At this point we're erroring out, badly, and floatingRbufs
 		   may not even be valid.  Rather than putting this back onto
 		   the floatingRbufs list, just arrange for its immediate
 		   destruction.
 		*/
 		rf_FreeReconBuffer(rbuf);
 		break;