Major KNF. Incentive from Tedu

1 files changed, 46 insertions, 62 deletions

diff --git a/sys/dev/raidframe/rf_raid0.c b/sys/dev/raidframe/rf_raid0.c
index be28e945deb..0cf113db220 100644
--- a/sys/dev/raidframe/rf_raid0.c
+++ b/sys/dev/raidframe/rf_raid0.c
@@ -1,5 +1,6 @@
-/*	$OpenBSD: rf_raid0.c,v 1.3 2000/01/11 18:02:23 peter Exp $	*/
+/*	$OpenBSD: rf_raid0.c,v 1.4 2002/12/16 07:01:04 tdeval Exp $	*/
 /*	$NetBSD: rf_raid0.c,v 1.4 2000/01/07 03:41:02 oster Exp $	*/
+
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -27,11 +28,11 @@
  * rights to redistribute these changes.
  */
 
-/***************************************
+/*****************************************
  *
- * rf_raid0.c -- implements RAID Level 0
+ * rf_raid0.c -- Implements RAID Level 0.
  *
- ***************************************/
+ *****************************************/
 
 #include "rf_types.h"
 #include "rf_raid.h"
@@ -47,75 +48,67 @@
 
 typedef struct RF_Raid0ConfigInfo_s {
 	RF_RowCol_t *stripeIdentifier;
-}       RF_Raid0ConfigInfo_t;
+} RF_Raid0ConfigInfo_t;
 
-int 
-rf_ConfigureRAID0(
-    RF_ShutdownList_t ** listp,
-    RF_Raid_t * raidPtr,
-    RF_Config_t * cfgPtr)
+int
+rf_ConfigureRAID0(RF_ShutdownList_t **listp, RF_Raid_t *raidPtr,
+    RF_Config_t *cfgPtr)
 {
 	RF_RaidLayout_t *layoutPtr = &raidPtr->Layout;
 	RF_Raid0ConfigInfo_t *info;
 	RF_RowCol_t i;
 
-	/* create a RAID level 0 configuration structure */
-	RF_MallocAndAdd(info, sizeof(RF_Raid0ConfigInfo_t), (RF_Raid0ConfigInfo_t *), raidPtr->cleanupList);
+	/* Create a RAID level 0 configuration structure. */
+	RF_MallocAndAdd(info, sizeof(RF_Raid0ConfigInfo_t),
+	    (RF_Raid0ConfigInfo_t *), raidPtr->cleanupList);
 	if (info == NULL)
 		return (ENOMEM);
 	layoutPtr->layoutSpecificInfo = (void *) info;
 
-	RF_MallocAndAdd(info->stripeIdentifier, raidPtr->numCol * sizeof(RF_RowCol_t), (RF_RowCol_t *), raidPtr->cleanupList);
+	RF_MallocAndAdd(info->stripeIdentifier, raidPtr->numCol *
+	    sizeof(RF_RowCol_t), (RF_RowCol_t *), raidPtr->cleanupList);
 	if (info->stripeIdentifier == NULL)
 		return (ENOMEM);
 	for (i = 0; i < raidPtr->numCol; i++)
 		info->stripeIdentifier[i] = i;
 
 	RF_ASSERT(raidPtr->numRow == 1);
-	raidPtr->totalSectors = layoutPtr->stripeUnitsPerDisk * raidPtr->numCol * layoutPtr->sectorsPerStripeUnit;
+	raidPtr->totalSectors = layoutPtr->stripeUnitsPerDisk *
+	    raidPtr->numCol * layoutPtr->sectorsPerStripeUnit;
 	layoutPtr->numStripe = layoutPtr->stripeUnitsPerDisk;
-	layoutPtr->dataSectorsPerStripe = raidPtr->numCol * layoutPtr->sectorsPerStripeUnit;
-	layoutPtr->bytesPerStripeUnit = layoutPtr->sectorsPerStripeUnit << raidPtr->logBytesPerSector;
+	layoutPtr->dataSectorsPerStripe = raidPtr->numCol *
+	    layoutPtr->sectorsPerStripeUnit;
+	layoutPtr->bytesPerStripeUnit = layoutPtr->sectorsPerStripeUnit <<
+	    raidPtr->logBytesPerSector;
 	layoutPtr->numDataCol = raidPtr->numCol;
 	layoutPtr->numParityCol = 0;
 	return (0);
 }
 
-void 
-rf_MapSectorRAID0(
-    RF_Raid_t * raidPtr,
-    RF_RaidAddr_t raidSector,
-    RF_RowCol_t * row,
-    RF_RowCol_t * col,
-    RF_SectorNum_t * diskSector,
-    int remap)
+void
+rf_MapSectorRAID0(RF_Raid_t *raidPtr, RF_RaidAddr_t raidSector,
+    RF_RowCol_t *row, RF_RowCol_t *col, RF_SectorNum_t *diskSector, int remap)
 {
-	RF_StripeNum_t SUID = raidSector / raidPtr->Layout.sectorsPerStripeUnit;
+	RF_StripeNum_t SUID =
+	    raidSector / raidPtr->Layout.sectorsPerStripeUnit;
 	*row = 0;
 	*col = SUID % raidPtr->numCol;
-	*diskSector = (SUID / raidPtr->numCol) * raidPtr->Layout.sectorsPerStripeUnit +
+	*diskSector = (SUID / raidPtr->numCol) *
+	    raidPtr->Layout.sectorsPerStripeUnit +
 	    (raidSector % raidPtr->Layout.sectorsPerStripeUnit);
 }
 
-void 
-rf_MapParityRAID0(
-    RF_Raid_t * raidPtr,
-    RF_RaidAddr_t raidSector,
-    RF_RowCol_t * row,
-    RF_RowCol_t * col,
-    RF_SectorNum_t * diskSector,
-    int remap)
+void
+rf_MapParityRAID0(RF_Raid_t *raidPtr, RF_RaidAddr_t raidSector,
+    RF_RowCol_t *row, RF_RowCol_t *col, RF_SectorNum_t *diskSector, int remap)
 {
 	*row = *col = 0;
 	*diskSector = 0;
 }
 
-void 
-rf_IdentifyStripeRAID0(
-    RF_Raid_t * raidPtr,
-    RF_RaidAddr_t addr,
-    RF_RowCol_t ** diskids,
-    RF_RowCol_t * outRow)
+void
+rf_IdentifyStripeRAID0( RF_Raid_t *raidPtr, RF_RaidAddr_t addr,
+    RF_RowCol_t **diskids, RF_RowCol_t *outRow)
 {
 	RF_Raid0ConfigInfo_t *info;
 
@@ -124,38 +117,29 @@ rf_IdentifyStripeRAID0(
 	*outRow = 0;
 }
 
-void 
-rf_MapSIDToPSIDRAID0(
-    RF_RaidLayout_t * layoutPtr,
-    RF_StripeNum_t stripeID,
-    RF_StripeNum_t * psID,
-    RF_ReconUnitNum_t * which_ru)
+void
+rf_MapSIDToPSIDRAID0(RF_RaidLayout_t *layoutPtr, RF_StripeNum_t stripeID,
+    RF_StripeNum_t *psID, RF_ReconUnitNum_t *which_ru)
 {
 	*which_ru = 0;
 	*psID = stripeID;
 }
 
-void 
-rf_RAID0DagSelect(
-    RF_Raid_t * raidPtr,
-    RF_IoType_t type,
-    RF_AccessStripeMap_t * asmap,
-    RF_VoidFuncPtr * createFunc)
+void
+rf_RAID0DagSelect(RF_Raid_t *raidPtr, RF_IoType_t type,
+    RF_AccessStripeMap_t *asmap, RF_VoidFuncPtr *createFunc)
 {
 	*createFunc = ((type == RF_IO_TYPE_READ) ?
-	    (RF_VoidFuncPtr) rf_CreateFaultFreeReadDAG : (RF_VoidFuncPtr) rf_CreateRAID0WriteDAG);
+	    (RF_VoidFuncPtr) rf_CreateFaultFreeReadDAG :
+	    (RF_VoidFuncPtr) rf_CreateRAID0WriteDAG);
 }
 
-int 
-rf_VerifyParityRAID0(
-    RF_Raid_t * raidPtr,
-    RF_RaidAddr_t raidAddr,
-    RF_PhysDiskAddr_t * parityPDA,
-    int correct_it,
-    RF_RaidAccessFlags_t flags)
+int
+rf_VerifyParityRAID0(RF_Raid_t *raidPtr, RF_RaidAddr_t raidAddr,
+    RF_PhysDiskAddr_t *parityPDA, int correct_it, RF_RaidAccessFlags_t flags)
 {
 	/*
-         * No parity is always okay.
-         */
+	 * No parity is always okay.
+	 */
 	return (RF_PARITY_OKAY);
 }