Major KNF. Incentive from Tedu

1 files changed, 52 insertions, 37 deletions

diff --git a/sys/dev/raidframe/rf_reconmap.h b/sys/dev/raidframe/rf_reconmap.h
index 476acab9cb2..9910e4cc94e 100644
--- a/sys/dev/raidframe/rf_reconmap.h
+++ b/sys/dev/raidframe/rf_reconmap.h
@@ -1,5 +1,6 @@
-/*	$OpenBSD: rf_reconmap.h,v 1.2 1999/02/16 00:03:21 niklas Exp $	*/
+/*	$OpenBSD: rf_reconmap.h,v 1.3 2002/12/16 07:01:05 tdeval Exp $	*/
 /*	$NetBSD: rf_reconmap.h,v 1.3 1999/02/05 00:06:16 oster Exp $	*/
+
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -28,59 +29,73 @@
  */
 
 /******************************************************************************
- * rf_reconMap.h -- Header file describing reconstruction status data structure
+ * rf_reconMap.h
+ *
+ * -- Header file describing reconstruction status data structure.
  ******************************************************************************/
 
-#ifndef _RF__RF_RECONMAP_H_
-#define _RF__RF_RECONMAP_H_
+#ifndef	_RF__RF_RECONMAP_H_
+#define	_RF__RF_RECONMAP_H_
 
 #include "rf_types.h"
 #include "rf_threadstuff.h"
 
 /*
- * Main reconstruction status descriptor. size and maxsize are used for
- * monitoring only:  they have no function for reconstruction.
+ * Main reconstruction status descriptor; size and maxsize are used for
+ * monitoring only: they have no function for reconstruction.
  */
 struct RF_ReconMap_s {
-	RF_SectorCount_t sectorsPerReconUnit;	/* sectors per reconstruct
-						 * unit */
-	RF_SectorCount_t sectorsInDisk;	/* total sectors in disk */
-	RF_SectorCount_t unitsLeft;	/* recon units left to recon */
-	RF_ReconUnitCount_t totalRUs;	/* total recon units on disk */
-	RF_ReconUnitCount_t spareRUs;	/* total number of spare RUs on failed
-					 * disk */
-	RF_StripeCount_t totalParityStripes;	/* total number of parity
-						 * stripes in array */
-	u_int   size;		/* overall size of this structure */
-	u_int   maxSize;	/* maximum size so far */
-	RF_ReconMapListElem_t **status;	/* array of ptrs to list elements */
-	        RF_DECLARE_MUTEX(mutex)
+	RF_SectorCount_t	  sectorsPerReconUnit;
+						/*
+						 * Sectors per reconstruct
+						 * unit.
+						 */
+	RF_SectorCount_t	  sectorsInDisk;/* Total sectors in disk. */
+	RF_SectorCount_t	  unitsLeft;	/* Recon units left to recon. */
+	RF_ReconUnitCount_t	  totalRUs;	/* Total recon units on disk. */
+	RF_ReconUnitCount_t	  spareRUs;	/*
+						 * Total number of spare RUs on
+						 * failed disk.
+						 */
+	RF_StripeCount_t	  totalParityStripes;
+						/*
+						 * Total number of parity
+						 * stripes in array.
+						 */
+	u_int			  size;		/*
+						 * Overall size of this
+						 * structure.
+						 */
+	u_int			  maxSize;	/* Maximum size so far. */
+	RF_ReconMapListElem_t	**status;	/*
+						 * Array of ptrs to list
+						 * elements.
+						 */
+	RF_DECLARE_MUTEX	 (mutex);
 };
-/* a list element */
+
+/* A list element. */
 struct RF_ReconMapListElem_s {
-	RF_SectorNum_t startSector;	/* bounding sect nums on this block */
-	RF_SectorNum_t stopSector;
-	RF_ReconMapListElem_t *next;	/* next element in list */
+	/* Bounding sect nums on this block. */
+	RF_SectorNum_t		 startSector;
+	RF_SectorNum_t		 stopSector;
+	RF_ReconMapListElem_t	*next;		/* Next element in list. */
 };
 
-RF_ReconMap_t *
-rf_MakeReconMap(RF_Raid_t * raidPtr, RF_SectorCount_t ru_sectors,
-    RF_SectorCount_t disk_sectors, RF_ReconUnitCount_t spareUnitsPerDisk);
+RF_ReconMap_t *rf_MakeReconMap(RF_Raid_t *,
+	RF_SectorCount_t, RF_SectorCount_t, RF_ReconUnitCount_t);
 
-void 
-rf_ReconMapUpdate(RF_Raid_t * raidPtr, RF_ReconMap_t * mapPtr,
-    RF_SectorNum_t startSector, RF_SectorNum_t stopSector);
+void rf_ReconMapUpdate(RF_Raid_t *, RF_ReconMap_t *,
+	RF_SectorNum_t, RF_SectorNum_t);
 
-void    rf_FreeReconMap(RF_ReconMap_t * mapPtr);
+void rf_FreeReconMap(RF_ReconMap_t *);
 
-int     rf_CheckRUReconstructed(RF_ReconMap_t * mapPtr, RF_SectorNum_t startSector);
+int  rf_CheckRUReconstructed(RF_ReconMap_t *, RF_SectorNum_t);
 
-RF_ReconUnitCount_t rf_UnitsLeftToReconstruct(RF_ReconMap_t * mapPtr);
+RF_ReconUnitCount_t rf_UnitsLeftToReconstruct(RF_ReconMap_t *);
 
-void 
-rf_PrintReconMap(RF_Raid_t * raidPtr, RF_ReconMap_t * mapPtr,
-    RF_RowCol_t frow, RF_RowCol_t fcol);
+void rf_PrintReconMap(RF_Raid_t *, RF_ReconMap_t *, RF_RowCol_t, RF_RowCol_t);
 
-void    rf_PrintReconSchedule(RF_ReconMap_t * mapPtr, struct timeval * starttime);
+void rf_PrintReconSchedule(RF_ReconMap_t *, struct timeval *);
 
-#endif				/* !_RF__RF_RECONMAP_H_ */
+#endif	/* !_RF__RF_RECONMAP_H_ */