bytesPerStripeUnit is set, but never used. Thanks to Simon B. for pointing
this out.
This commit is contained in:
parent
35d3621d0c
commit
23b87a323a
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: rf_chaindecluster.c,v 1.8 2001/11/13 07:11:12 lukem Exp $ */
|
||||
/* $NetBSD: rf_chaindecluster.c,v 1.9 2002/09/23 02:40:08 oster Exp $ */
|
||||
/*
|
||||
* Copyright (c) 1995 Carnegie-Mellon University.
|
||||
* All rights reserved.
|
||||
|
@ -33,7 +33,7 @@
|
|||
*****************************************************************************/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: rf_chaindecluster.c,v 1.8 2001/11/13 07:11:12 lukem Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: rf_chaindecluster.c,v 1.9 2002/09/23 02:40:08 oster Exp $");
|
||||
|
||||
#include "rf_archs.h"
|
||||
|
||||
|
@ -95,7 +95,6 @@ rf_ConfigureChainDecluster(
|
|||
info->stripeUnitsPerSparingRegion = raidPtr->numCol * (raidPtr->numCol - 1);
|
||||
info->mirrorStripeOffset = info->numSparingRegions * (raidPtr->numCol - 1);
|
||||
layoutPtr->numStripe = info->numSparingRegions * info->stripeUnitsPerSparingRegion;
|
||||
layoutPtr->bytesPerStripeUnit = layoutPtr->sectorsPerStripeUnit << raidPtr->logBytesPerSector;
|
||||
layoutPtr->numDataCol = 1;
|
||||
layoutPtr->dataSectorsPerStripe = layoutPtr->numDataCol * layoutPtr->sectorsPerStripeUnit;
|
||||
layoutPtr->numParityCol = 1;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: rf_decluster.c,v 1.10 2002/09/21 01:07:37 oster Exp $ */
|
||||
/* $NetBSD: rf_decluster.c,v 1.11 2002/09/23 02:40:08 oster Exp $ */
|
||||
/*
|
||||
* Copyright (c) 1995 Carnegie-Mellon University.
|
||||
* All rights reserved.
|
||||
|
@ -48,7 +48,7 @@
|
|||
*--------------------------------------------------------------------*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: rf_decluster.c,v 1.10 2002/09/21 01:07:37 oster Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: rf_decluster.c,v 1.11 2002/09/23 02:40:08 oster Exp $");
|
||||
|
||||
#include <dev/raidframe/raidframevar.h>
|
||||
|
||||
|
@ -287,7 +287,6 @@ rf_ConfigureDeclustered(
|
|||
* problems */
|
||||
|
||||
layoutPtr->dataSectorsPerStripe = (k - 1) * layoutPtr->sectorsPerStripeUnit;
|
||||
layoutPtr->bytesPerStripeUnit = layoutPtr->sectorsPerStripeUnit << raidPtr->logBytesPerSector;
|
||||
layoutPtr->numDataCol = k - 1;
|
||||
layoutPtr->numParityCol = 1;
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: rf_declusterPQ.c,v 1.7 2001/11/13 07:11:13 lukem Exp $ */
|
||||
/* $NetBSD: rf_declusterPQ.c,v 1.8 2002/09/23 02:40:08 oster Exp $ */
|
||||
/*
|
||||
* Copyright (c) 1995 Carnegie-Mellon University.
|
||||
* All rights reserved.
|
||||
|
@ -35,7 +35,7 @@
|
|||
*--------------------------------------------------*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: rf_declusterPQ.c,v 1.7 2001/11/13 07:11:13 lukem Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: rf_declusterPQ.c,v 1.8 2002/09/23 02:40:08 oster Exp $");
|
||||
|
||||
#include <dev/raidframe/raidframevar.h>
|
||||
|
||||
|
@ -261,7 +261,6 @@ rf_ConfigureDeclusteredPQ(
|
|||
* problems */
|
||||
|
||||
layoutPtr->dataSectorsPerStripe = (k - 2) * layoutPtr->sectorsPerStripeUnit;
|
||||
layoutPtr->bytesPerStripeUnit = layoutPtr->sectorsPerStripeUnit << raidPtr->logBytesPerSector;
|
||||
layoutPtr->numDataCol = k - 2;
|
||||
layoutPtr->numParityCol = 2;
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: rf_evenodd.c,v 1.8 2002/09/07 23:11:46 oster Exp $ */
|
||||
/* $NetBSD: rf_evenodd.c,v 1.9 2002/09/23 02:40:08 oster Exp $ */
|
||||
/*
|
||||
* Copyright (c) 1995 Carnegie-Mellon University.
|
||||
* All rights reserved.
|
||||
|
@ -33,7 +33,7 @@
|
|||
****************************************************************************************/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: rf_evenodd.c,v 1.8 2002/09/07 23:11:46 oster Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: rf_evenodd.c,v 1.9 2002/09/23 02:40:08 oster Exp $");
|
||||
|
||||
#include "rf_archs.h"
|
||||
|
||||
|
@ -94,7 +94,6 @@ rf_ConfigureEvenOdd(listp, raidPtr, cfgPtr)
|
|||
|
||||
/* fill in the remaining layout parameters */
|
||||
layoutPtr->numStripe = layoutPtr->stripeUnitsPerDisk;
|
||||
layoutPtr->bytesPerStripeUnit = layoutPtr->sectorsPerStripeUnit << raidPtr->logBytesPerSector;
|
||||
layoutPtr->numDataCol = raidPtr->numCol - 2; /* ORIG:
|
||||
* layoutPtr->numDataCol
|
||||
* = raidPtr->numCol-1; */
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: rf_interdecluster.c,v 1.7 2001/11/13 07:11:14 lukem Exp $ */
|
||||
/* $NetBSD: rf_interdecluster.c,v 1.8 2002/09/23 02:40:08 oster Exp $ */
|
||||
/*
|
||||
* Copyright (c) 1995 Carnegie-Mellon University.
|
||||
* All rights reserved.
|
||||
|
@ -33,7 +33,7 @@
|
|||
************************************************************/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: rf_interdecluster.c,v 1.7 2001/11/13 07:11:14 lukem Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: rf_interdecluster.c,v 1.8 2002/09/23 02:40:08 oster Exp $");
|
||||
|
||||
#include "rf_archs.h"
|
||||
|
||||
|
@ -106,7 +106,6 @@ rf_ConfigureInterDecluster(
|
|||
info->stripeUnitsPerSparingRegion = raidPtr->numCol * (raidPtr->numCol - 1);
|
||||
info->mirrorStripeOffset = info->numSparingRegions * (raidPtr->numCol + 1);
|
||||
layoutPtr->numStripe = info->numSparingRegions * info->stripeUnitsPerSparingRegion;
|
||||
layoutPtr->bytesPerStripeUnit = layoutPtr->sectorsPerStripeUnit << raidPtr->logBytesPerSector;
|
||||
layoutPtr->numDataCol = 1;
|
||||
layoutPtr->dataSectorsPerStripe = layoutPtr->numDataCol * layoutPtr->sectorsPerStripeUnit;
|
||||
layoutPtr->numParityCol = 1;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: rf_layout.h,v 1.8 2002/09/23 02:35:24 oster Exp $ */
|
||||
/* $NetBSD: rf_layout.h,v 1.9 2002/09/23 02:40:07 oster Exp $ */
|
||||
/*
|
||||
* Copyright (c) 1995 Carnegie-Mellon University.
|
||||
* All rights reserved.
|
||||
|
@ -69,7 +69,6 @@ struct RF_RaidLayout_s {
|
|||
* array */
|
||||
RF_SectorCount_t dataSectorsPerStripe;
|
||||
RF_StripeCount_t dataStripeUnitsPerDisk;
|
||||
u_int bytesPerStripeUnit;
|
||||
RF_StripeCount_t numDataCol; /* number of SUs of data per stripe
|
||||
* (name here is a la RAID4) */
|
||||
RF_StripeCount_t numParityCol; /* number of SUs of parity per stripe.
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: rf_paritylogging.c,v 1.13 2002/09/14 17:53:58 oster Exp $ */
|
||||
/* $NetBSD: rf_paritylogging.c,v 1.14 2002/09/23 02:40:08 oster Exp $ */
|
||||
/*
|
||||
* Copyright (c) 1995 Carnegie-Mellon University.
|
||||
* All rights reserved.
|
||||
|
@ -32,7 +32,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: rf_paritylogging.c,v 1.13 2002/09/14 17:53:58 oster Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: rf_paritylogging.c,v 1.14 2002/09/23 02:40:08 oster Exp $");
|
||||
|
||||
#include "rf_archs.h"
|
||||
|
||||
|
@ -126,8 +126,6 @@ rf_ConfigureParityLogging(
|
|||
|
||||
/* fill in the remaining layout parameters */
|
||||
layoutPtr->numStripe = layoutPtr->stripeUnitsPerDisk;
|
||||
layoutPtr->bytesPerStripeUnit = layoutPtr->sectorsPerStripeUnit <<
|
||||
raidPtr->logBytesPerSector;
|
||||
layoutPtr->numParityCol = 1;
|
||||
layoutPtr->numParityLogCol = 1;
|
||||
layoutPtr->numDataCol = raidPtr->numCol - layoutPtr->numParityCol -
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: rf_raid0.c,v 1.6 2001/11/13 07:11:16 lukem Exp $ */
|
||||
/* $NetBSD: rf_raid0.c,v 1.7 2002/09/23 02:40:09 oster Exp $ */
|
||||
/*
|
||||
* Copyright (c) 1995 Carnegie-Mellon University.
|
||||
* All rights reserved.
|
||||
|
@ -33,7 +33,7 @@
|
|||
***************************************/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: rf_raid0.c,v 1.6 2001/11/13 07:11:16 lukem Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: rf_raid0.c,v 1.7 2002/09/23 02:40:09 oster Exp $");
|
||||
|
||||
#include <dev/raidframe/raidframevar.h>
|
||||
|
||||
|
@ -77,7 +77,6 @@ rf_ConfigureRAID0(
|
|||
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->numDataCol = raidPtr->numCol;
|
||||
layoutPtr->numParityCol = 0;
|
||||
return (0);
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: rf_raid1.c,v 1.11 2002/09/17 03:21:40 oster Exp $ */
|
||||
/* $NetBSD: rf_raid1.c,v 1.12 2002/09/23 02:40:09 oster Exp $ */
|
||||
/*
|
||||
* Copyright (c) 1995 Carnegie-Mellon University.
|
||||
* All rights reserved.
|
||||
|
@ -33,7 +33,7 @@
|
|||
*****************************************************************************/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: rf_raid1.c,v 1.11 2002/09/17 03:21:40 oster Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: rf_raid1.c,v 1.12 2002/09/23 02:40:09 oster Exp $");
|
||||
|
||||
#include "rf_raid.h"
|
||||
#include "rf_raid1.h"
|
||||
|
@ -91,7 +91,6 @@ rf_ConfigureRAID1(
|
|||
raidPtr->totalSectors = layoutPtr->stripeUnitsPerDisk * (raidPtr->numCol / 2) * layoutPtr->sectorsPerStripeUnit;
|
||||
layoutPtr->numStripe = layoutPtr->stripeUnitsPerDisk * (raidPtr->numCol / 2);
|
||||
layoutPtr->dataSectorsPerStripe = layoutPtr->sectorsPerStripeUnit;
|
||||
layoutPtr->bytesPerStripeUnit = layoutPtr->sectorsPerStripeUnit << raidPtr->logBytesPerSector;
|
||||
layoutPtr->numDataCol = 1;
|
||||
layoutPtr->numParityCol = 1;
|
||||
return (0);
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: rf_raid4.c,v 1.5 2001/11/13 07:11:16 lukem Exp $ */
|
||||
/* $NetBSD: rf_raid4.c,v 1.6 2002/09/23 02:40:09 oster Exp $ */
|
||||
/*
|
||||
* Copyright (c) 1995 Carnegie-Mellon University.
|
||||
* All rights reserved.
|
||||
|
@ -33,7 +33,7 @@
|
|||
***************************************/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: rf_raid4.c,v 1.5 2001/11/13 07:11:16 lukem Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: rf_raid4.c,v 1.6 2002/09/23 02:40:09 oster Exp $");
|
||||
|
||||
#include "rf_raid.h"
|
||||
#include "rf_dag.h"
|
||||
|
@ -80,7 +80,6 @@ rf_ConfigureRAID4(
|
|||
|
||||
/* fill in the remaining layout parameters */
|
||||
layoutPtr->numStripe = layoutPtr->stripeUnitsPerDisk;
|
||||
layoutPtr->bytesPerStripeUnit = layoutPtr->sectorsPerStripeUnit << raidPtr->logBytesPerSector;
|
||||
layoutPtr->numDataCol = raidPtr->numCol - 1;
|
||||
layoutPtr->dataSectorsPerStripe = layoutPtr->numDataCol * layoutPtr->sectorsPerStripeUnit;
|
||||
layoutPtr->numParityCol = 1;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: rf_raid5.c,v 1.6 2001/11/13 07:11:16 lukem Exp $ */
|
||||
/* $NetBSD: rf_raid5.c,v 1.7 2002/09/23 02:40:09 oster Exp $ */
|
||||
/*
|
||||
* Copyright (c) 1995 Carnegie-Mellon University.
|
||||
* All rights reserved.
|
||||
|
@ -33,7 +33,7 @@
|
|||
*****************************************************************************/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: rf_raid5.c,v 1.6 2001/11/13 07:11:16 lukem Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: rf_raid5.c,v 1.7 2002/09/23 02:40:09 oster Exp $");
|
||||
|
||||
#include <dev/raidframe/raidframevar.h>
|
||||
|
||||
|
@ -88,7 +88,6 @@ rf_ConfigureRAID5(
|
|||
|
||||
/* fill in the remaining layout parameters */
|
||||
layoutPtr->numStripe = layoutPtr->stripeUnitsPerDisk;
|
||||
layoutPtr->bytesPerStripeUnit = layoutPtr->sectorsPerStripeUnit << raidPtr->logBytesPerSector;
|
||||
layoutPtr->numDataCol = raidPtr->numCol - 1;
|
||||
layoutPtr->dataSectorsPerStripe = layoutPtr->numDataCol * layoutPtr->sectorsPerStripeUnit;
|
||||
layoutPtr->numParityCol = 1;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: rf_raid5_rotatedspare.c,v 1.6 2001/11/13 07:11:16 lukem Exp $ */
|
||||
/* $NetBSD: rf_raid5_rotatedspare.c,v 1.7 2002/09/23 02:40:09 oster Exp $ */
|
||||
/*
|
||||
* Copyright (c) 1995 Carnegie-Mellon University.
|
||||
* All rights reserved.
|
||||
|
@ -33,7 +33,7 @@
|
|||
**************************************************************************/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: rf_raid5_rotatedspare.c,v 1.6 2001/11/13 07:11:16 lukem Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: rf_raid5_rotatedspare.c,v 1.7 2002/09/23 02:40:09 oster Exp $");
|
||||
|
||||
#include "rf_archs.h"
|
||||
|
||||
|
@ -88,7 +88,6 @@ rf_ConfigureRAID5_RS(
|
|||
|
||||
/* fill in the remaining layout parameters */
|
||||
layoutPtr->numStripe = layoutPtr->stripeUnitsPerDisk;
|
||||
layoutPtr->bytesPerStripeUnit = layoutPtr->sectorsPerStripeUnit << raidPtr->logBytesPerSector;
|
||||
layoutPtr->numDataCol = raidPtr->numCol - 2;
|
||||
layoutPtr->dataSectorsPerStripe = layoutPtr->numDataCol * layoutPtr->sectorsPerStripeUnit;
|
||||
layoutPtr->numParityCol = 1;
|
||||
|
|
Loading…
Reference in New Issue