diff options
| author | oster <oster@NetBSD.org> | 2002-08-02 03:42:33 +0000 |
|---|---|---|
| committer | oster <oster@NetBSD.org> | 2002-08-02 03:42:33 +0000 |
| commit | 752e8eb5c8203acb4536dbed29f4a4bedb98641a (patch) | |
| tree | 7e62738a514fe70c7afcb78d6e8e1b8867d3ee0c /sys/dev/raidframe | |
| parent | fcc4232f71d0f7b65b1a794d331c720192893f95 (diff) | |
- remove "#include "rf_memchunk.h"
- nuke the call to rf_ConfigureMemChunk() from rf_driver.c
Diffstat (limited to 'sys/dev/raidframe')
| -rw-r--r-- | sys/dev/raidframe/rf_dag.h | 3 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_dagdegrd.c | 5 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_dagdegwr.c | 5 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_dagffrd.c | 5 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_dagffwr.c | 5 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_driver.c | 22 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_parityloggingdags.c | 5 |
7 files changed, 29 insertions, 21 deletions
diff --git a/sys/dev/raidframe/rf_dag.h b/sys/dev/raidframe/rf_dag.h index 8ae7eca0f58..5ea0d5315a3 100644 --- a/sys/dev/raidframe/rf_dag.h +++ b/sys/dev/raidframe/rf_dag.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_dag.h,v 1.5 2002/08/02 03:32:56 oster Exp $ */ +/* $NetBSD: rf_dag.h,v 1.6 2002/08/02 03:42:33 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -43,7 +43,6 @@ #include "rf_layout.h" #include "rf_dagflags.h" #include "rf_acctrace.h" -#include "rf_memchunk.h" #define RF_THREAD_CONTEXT 0 /* we were invoked from thread context */ #define RF_INTR_CONTEXT 1 /* we were invoked from interrupt context */ diff --git a/sys/dev/raidframe/rf_dagdegrd.c b/sys/dev/raidframe/rf_dagdegrd.c index 79c1ecba80a..43dd0b8e379 100644 --- a/sys/dev/raidframe/rf_dagdegrd.c +++ b/sys/dev/raidframe/rf_dagdegrd.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_dagdegrd.c,v 1.11 2002/05/22 15:40:47 wiz Exp $ */ +/* $NetBSD: rf_dagdegrd.c,v 1.12 2002/08/02 03:42:33 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_dagdegrd.c,v 1.11 2002/05/22 15:40:47 wiz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_dagdegrd.c,v 1.12 2002/08/02 03:42:33 oster Exp $"); #include <dev/raidframe/raidframevar.h> @@ -43,7 +43,6 @@ __KERNEL_RCSID(0, "$NetBSD: rf_dagdegrd.c,v 1.11 2002/05/22 15:40:47 wiz Exp $") #include "rf_dagutils.h" #include "rf_dagfuncs.h" #include "rf_debugMem.h" -#include "rf_memchunk.h" #include "rf_general.h" #include "rf_dagdegrd.h" diff --git a/sys/dev/raidframe/rf_dagdegwr.c b/sys/dev/raidframe/rf_dagdegwr.c index f2bac7f775b..e9fe6859017 100644 --- a/sys/dev/raidframe/rf_dagdegwr.c +++ b/sys/dev/raidframe/rf_dagdegwr.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_dagdegwr.c,v 1.10 2002/05/22 15:40:48 wiz Exp $ */ +/* $NetBSD: rf_dagdegwr.c,v 1.11 2002/08/02 03:42:33 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_dagdegwr.c,v 1.10 2002/05/22 15:40:48 wiz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_dagdegwr.c,v 1.11 2002/08/02 03:42:33 oster Exp $"); #include <dev/raidframe/raidframevar.h> @@ -43,7 +43,6 @@ __KERNEL_RCSID(0, "$NetBSD: rf_dagdegwr.c,v 1.10 2002/05/22 15:40:48 wiz Exp $") #include "rf_dagutils.h" #include "rf_dagfuncs.h" #include "rf_debugMem.h" -#include "rf_memchunk.h" #include "rf_general.h" #include "rf_dagdegwr.h" diff --git a/sys/dev/raidframe/rf_dagffrd.c b/sys/dev/raidframe/rf_dagffrd.c index a3315a17b38..a85fd1d102c 100644 --- a/sys/dev/raidframe/rf_dagffrd.c +++ b/sys/dev/raidframe/rf_dagffrd.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_dagffrd.c,v 1.6 2001/11/13 07:11:13 lukem Exp $ */ +/* $NetBSD: rf_dagffrd.c,v 1.7 2002/08/02 03:42:34 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_dagffrd.c,v 1.6 2001/11/13 07:11:13 lukem Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_dagffrd.c,v 1.7 2002/08/02 03:42:34 oster Exp $"); #include <dev/raidframe/raidframevar.h> @@ -43,7 +43,6 @@ __KERNEL_RCSID(0, "$NetBSD: rf_dagffrd.c,v 1.6 2001/11/13 07:11:13 lukem Exp $") #include "rf_dagutils.h" #include "rf_dagfuncs.h" #include "rf_debugMem.h" -#include "rf_memchunk.h" #include "rf_general.h" #include "rf_dagffrd.h" diff --git a/sys/dev/raidframe/rf_dagffwr.c b/sys/dev/raidframe/rf_dagffwr.c index 29535ffd577..c361a5f776e 100644 --- a/sys/dev/raidframe/rf_dagffwr.c +++ b/sys/dev/raidframe/rf_dagffwr.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_dagffwr.c,v 1.7 2001/11/13 07:11:13 lukem Exp $ */ +/* $NetBSD: rf_dagffwr.c,v 1.8 2002/08/02 03:42:34 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_dagffwr.c,v 1.7 2001/11/13 07:11:13 lukem Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_dagffwr.c,v 1.8 2002/08/02 03:42:34 oster Exp $"); #include <dev/raidframe/raidframevar.h> @@ -44,7 +44,6 @@ __KERNEL_RCSID(0, "$NetBSD: rf_dagffwr.c,v 1.7 2001/11/13 07:11:13 lukem Exp $") #include "rf_dagfuncs.h" #include "rf_debugMem.h" #include "rf_dagffrd.h" -#include "rf_memchunk.h" #include "rf_general.h" #include "rf_dagffwr.h" diff --git a/sys/dev/raidframe/rf_driver.c b/sys/dev/raidframe/rf_driver.c index 32331b05e07..4b3011f6783 100644 --- a/sys/dev/raidframe/rf_driver.c +++ b/sys/dev/raidframe/rf_driver.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_driver.c,v 1.49 2002/07/24 02:17:14 oster Exp $ */ +/* $NetBSD: rf_driver.c,v 1.50 2002/08/02 03:42:34 oster Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. * All rights reserved. @@ -73,7 +73,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_driver.c,v 1.49 2002/07/24 02:17:14 oster Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_driver.c,v 1.50 2002/08/02 03:42:34 oster Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -106,7 +106,6 @@ __KERNEL_RCSID(0, "$NetBSD: rf_driver.c,v 1.49 2002/07/24 02:17:14 oster Exp $") #include "rf_revent.h" #include "rf_callback.h" #include "rf_engine.h" -#include "rf_memchunk.h" #include "rf_mcpair.h" #include "rf_nwayxor.h" #include "rf_debugprint.h" @@ -371,7 +370,6 @@ rf_Configure(raidPtr, cfgPtr, ac) DO_INIT_CONFIGURE(rf_ConfigureMapModule); DO_INIT_CONFIGURE(rf_ConfigureReconEvent); DO_INIT_CONFIGURE(rf_ConfigureCallback); - DO_INIT_CONFIGURE(rf_ConfigureMemChunk); DO_INIT_CONFIGURE(rf_ConfigureRDFreeList); DO_INIT_CONFIGURE(rf_ConfigureNWayXor); DO_INIT_CONFIGURE(rf_ConfigureStripeLockFreeList); @@ -492,6 +490,22 @@ rf_Configure(raidPtr, cfgPtr, ac) rf_StartUserStats(raidPtr); raidPtr->valid = 1; + + printf("raid%d: %s\n", raidPtr->raidid, + raidPtr->Layout.map->configName); + printf("raid%d: Components: ", raidPtr->raidid); + for (row = 0; row < raidPtr->numRow; row++) { + for (col = 0; col < raidPtr->numCol; col++) { + printf("%s ", raidPtr->Disks[row][col].devname); + } + } + printf("\n"); + printf("raid%d: Total Sectors: %lu (%lu MB)\n", + raidPtr->raidid, + (unsigned long) raidPtr->totalSectors, + (unsigned long) (raidPtr->totalSectors / 1024 * + (1 << raidPtr->logBytesPerSector) / 1024)); + return (0); } diff --git a/sys/dev/raidframe/rf_parityloggingdags.c b/sys/dev/raidframe/rf_parityloggingdags.c index 8acb72c9a22..280dab921f0 100644 --- a/sys/dev/raidframe/rf_parityloggingdags.c +++ b/sys/dev/raidframe/rf_parityloggingdags.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_parityloggingdags.c,v 1.7 2001/11/13 07:11:15 lukem Exp $ */ +/* $NetBSD: rf_parityloggingdags.c,v 1.8 2002/08/02 03:42:34 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_parityloggingdags.c,v 1.7 2001/11/13 07:11:15 lukem Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_parityloggingdags.c,v 1.8 2002/08/02 03:42:34 oster Exp $"); #include "rf_archs.h" @@ -45,7 +45,6 @@ __KERNEL_RCSID(0, "$NetBSD: rf_parityloggingdags.c,v 1.7 2001/11/13 07:11:15 luk #include "rf_dagfuncs.h" #include "rf_debugMem.h" #include "rf_paritylog.h" -#include "rf_memchunk.h" #include "rf_general.h" #include "rf_parityloggingdags.h" |
