Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/raidframe Step 2 of the disentanglement. We now loo...
details: https://anonhg.NetBSD.org/src/rev/e354ce4f3a66
branches: trunk
changeset: 515760:e354ce4f3a66
user: oster <oster%NetBSD.org@localhost>
date: Thu Oct 04 15:58:51 2001 +0000
description:
Step 2 of the disentanglement. We now look to <dev/raidframe/*> for
the stuff that used to live in rf_types.h, rf_raidframe.h, rf_layout.h,
rf_netbsd.h, rf_raid.h, rf_decluster,h, and a few other places.
Believe it or not, when this is all done, things will be cleaner.
No functional changes to RAIDframe.
diffstat:
sys/dev/raidframe/rf_acctrace.c | 4 +-
sys/dev/raidframe/rf_acctrace.h | 4 +-
sys/dev/raidframe/rf_alloclist.c | 5 +-
sys/dev/raidframe/rf_alloclist.h | 4 +-
sys/dev/raidframe/rf_aselect.c | 4 +-
sys/dev/raidframe/rf_callback.c | 5 +-
sys/dev/raidframe/rf_callback.h | 4 +-
sys/dev/raidframe/rf_chaindecluster.c | 5 +-
sys/dev/raidframe/rf_configure.h | 53 +--------------
sys/dev/raidframe/rf_copyback.c | 4 +-
sys/dev/raidframe/rf_copyback.h | 4 +-
sys/dev/raidframe/rf_cvscan.c | 4 +-
sys/dev/raidframe/rf_dag.h | 5 +-
sys/dev/raidframe/rf_dagdegrd.c | 5 +-
sys/dev/raidframe/rf_dagdegrd.h | 4 +-
sys/dev/raidframe/rf_dagdegwr.c | 5 +-
sys/dev/raidframe/rf_dagffrd.c | 5 +-
sys/dev/raidframe/rf_dagffrd.h | 4 +-
sys/dev/raidframe/rf_dagffwr.c | 5 +-
sys/dev/raidframe/rf_dagffwr.h | 4 +-
sys/dev/raidframe/rf_dagutils.c | 5 +-
sys/dev/raidframe/rf_dagutils.h | 5 +-
sys/dev/raidframe/rf_debugMem.c | 4 +-
sys/dev/raidframe/rf_debugMem.h | 5 +-
sys/dev/raidframe/rf_debugprint.c | 5 +-
sys/dev/raidframe/rf_decluster.c | 7 +-
sys/dev/raidframe/rf_decluster.h | 10 +--
sys/dev/raidframe/rf_declusterPQ.c | 6 +-
sys/dev/raidframe/rf_declusterPQ.h | 4 +-
sys/dev/raidframe/rf_desc.h | 5 +-
sys/dev/raidframe/rf_diskqueue.c | 6 +-
sys/dev/raidframe/rf_diskqueue.h | 5 +-
sys/dev/raidframe/rf_disks.c | 6 +-
sys/dev/raidframe/rf_disks.h | 45 +-----------
sys/dev/raidframe/rf_driver.c | 3 +-
sys/dev/raidframe/rf_driver.h | 8 +-
sys/dev/raidframe/rf_etimer.h | 5 +-
sys/dev/raidframe/rf_evenodd.c | 6 +-
sys/dev/raidframe/rf_evenodd_dagfuncs.c | 6 +-
sys/dev/raidframe/rf_evenodd_dags.c | 5 +-
sys/dev/raidframe/rf_evenodd_dags.h | 4 +-
sys/dev/raidframe/rf_fifo.c | 6 +-
sys/dev/raidframe/rf_fifo.h | 5 +-
sys/dev/raidframe/rf_freelist.h | 5 +-
sys/dev/raidframe/rf_general.h | 10 +-
sys/dev/raidframe/rf_hist.h | 4 +-
sys/dev/raidframe/rf_interdecluster.c | 5 +-
sys/dev/raidframe/rf_kintf.h | 4 +-
sys/dev/raidframe/rf_layout.c | 6 +-
sys/dev/raidframe/rf_layout.h | 96 +--------------------------
sys/dev/raidframe/rf_map.c | 5 +-
sys/dev/raidframe/rf_map.h | 5 +-
sys/dev/raidframe/rf_mcpair.c | 5 +-
sys/dev/raidframe/rf_mcpair.h | 4 +-
sys/dev/raidframe/rf_memchunk.c | 5 +-
sys/dev/raidframe/rf_memchunk.h | 4 +-
sys/dev/raidframe/rf_netbsd.h | 64 +-----------------
sys/dev/raidframe/rf_netbsdkintf.c | 12 +-
sys/dev/raidframe/rf_nwayxor.h | 5 +-
sys/dev/raidframe/rf_options.c | 4 +-
sys/dev/raidframe/rf_paritylog.c | 5 +-
sys/dev/raidframe/rf_paritylog.h | 4 +-
sys/dev/raidframe/rf_paritylogDiskMgr.c | 5 +-
sys/dev/raidframe/rf_paritylogDiskMgr.h | 4 +-
sys/dev/raidframe/rf_paritylogging.c | 5 +-
sys/dev/raidframe/rf_parityloggingdags.c | 5 +-
sys/dev/raidframe/rf_parityscan.c | 5 +-
sys/dev/raidframe/rf_parityscan.h | 5 +-
sys/dev/raidframe/rf_pq.c | 5 +-
sys/dev/raidframe/rf_pqdeg.c | 5 +-
sys/dev/raidframe/rf_pqdeg.h | 6 +-
sys/dev/raidframe/rf_pqdegdags.c | 5 +-
sys/dev/raidframe/rf_psstatus.c | 5 +-
sys/dev/raidframe/rf_psstatus.h | 5 +-
sys/dev/raidframe/rf_raid.h | 6 +-
sys/dev/raidframe/rf_raid0.c | 6 +-
sys/dev/raidframe/rf_raid1.h | 4 +-
sys/dev/raidframe/rf_raid5.c | 5 +-
sys/dev/raidframe/rf_raidframe.h | 109 +------------------------------
sys/dev/raidframe/rf_reconbuffer.h | 5 +-
sys/dev/raidframe/rf_reconmap.h | 5 +-
sys/dev/raidframe/rf_reconstruct.c | 5 +-
sys/dev/raidframe/rf_reconstruct.h | 4 +-
sys/dev/raidframe/rf_reconutil.c | 5 +-
sys/dev/raidframe/rf_reconutil.h | 5 +-
sys/dev/raidframe/rf_revent.h | 4 +-
sys/dev/raidframe/rf_shutdown.c | 5 +-
sys/dev/raidframe/rf_shutdown.h | 5 +-
sys/dev/raidframe/rf_sstf.c | 4 +-
sys/dev/raidframe/rf_states.h | 4 +-
sys/dev/raidframe/rf_stripelocks.c | 5 +-
sys/dev/raidframe/rf_stripelocks.h | 4 +-
sys/dev/raidframe/rf_threadstuff.c | 5 +-
sys/dev/raidframe/rf_threadstuff.h | 7 +-
sys/dev/raidframe/rf_types.h | 4 +-
sys/dev/raidframe/rf_utils.h | 4 +-
96 files changed, 250 insertions(+), 575 deletions(-)
diffs (truncated from 2355 to 300 lines):
diff -r d35265fa4c3f -r e354ce4f3a66 sys/dev/raidframe/rf_acctrace.c
--- a/sys/dev/raidframe/rf_acctrace.c Thu Oct 04 15:56:35 2001 +0000
+++ b/sys/dev/raidframe/rf_acctrace.c Thu Oct 04 15:58:51 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_acctrace.c,v 1.4 1999/08/13 03:41:52 oster Exp $ */
+/* $NetBSD: rf_acctrace.c,v 1.5 2001/10/04 15:58:51 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -35,9 +35,9 @@
#include <sys/stat.h>
#include <sys/types.h>
+#include <dev/raidframe/raidframevar.h>
#include "rf_threadstuff.h"
-#include "rf_types.h"
#include "rf_debugMem.h"
#include "rf_acctrace.h"
#include "rf_general.h"
diff -r d35265fa4c3f -r e354ce4f3a66 sys/dev/raidframe/rf_acctrace.h
--- a/sys/dev/raidframe/rf_acctrace.h Thu Oct 04 15:56:35 2001 +0000
+++ b/sys/dev/raidframe/rf_acctrace.h Thu Oct 04 15:58:51 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_acctrace.h,v 1.3 1999/02/05 00:06:06 oster Exp $ */
+/* $NetBSD: rf_acctrace.h,v 1.4 2001/10/04 15:58:51 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -36,7 +36,7 @@
#ifndef _RF__RF_ACCTRACE_H_
#define _RF__RF_ACCTRACE_H_
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
#include "rf_hist.h"
#include "rf_etimer.h"
diff -r d35265fa4c3f -r e354ce4f3a66 sys/dev/raidframe/rf_alloclist.c
--- a/sys/dev/raidframe/rf_alloclist.c Thu Oct 04 15:56:35 2001 +0000
+++ b/sys/dev/raidframe/rf_alloclist.c Thu Oct 04 15:58:51 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_alloclist.c,v 1.5 2001/07/18 06:45:33 thorpej Exp $ */
+/* $NetBSD: rf_alloclist.c,v 1.6 2001/10/04 15:58:51 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -36,7 +36,8 @@
*
***************************************************************************/
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
+
#include "rf_threadstuff.h"
#include "rf_alloclist.h"
#include "rf_debugMem.h"
diff -r d35265fa4c3f -r e354ce4f3a66 sys/dev/raidframe/rf_alloclist.h
--- a/sys/dev/raidframe/rf_alloclist.h Thu Oct 04 15:56:35 2001 +0000
+++ b/sys/dev/raidframe/rf_alloclist.h Thu Oct 04 15:58:51 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_alloclist.h,v 1.3 1999/02/05 00:06:06 oster Exp $ */
+/* $NetBSD: rf_alloclist.h,v 1.4 2001/10/04 15:58:51 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -35,7 +35,7 @@
#ifndef _RF__RF_ALLOCLIST_H_
#define _RF__RF_ALLOCLIST_H_
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
#define RF_POINTERS_PER_ALLOC_LIST_ELEMENT 20
diff -r d35265fa4c3f -r e354ce4f3a66 sys/dev/raidframe/rf_aselect.c
--- a/sys/dev/raidframe/rf_aselect.c Thu Oct 04 15:56:35 2001 +0000
+++ b/sys/dev/raidframe/rf_aselect.c Thu Oct 04 15:58:51 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_aselect.c,v 1.3 1999/02/05 00:06:06 oster Exp $ */
+/* $NetBSD: rf_aselect.c,v 1.4 2001/10/04 15:58:51 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -32,9 +32,9 @@
*
*****************************************************************************/
+#include <dev/raidframe/raidframevar.h>
#include "rf_archs.h"
-#include "rf_types.h"
#include "rf_raid.h"
#include "rf_dag.h"
#include "rf_dagutils.h"
diff -r d35265fa4c3f -r e354ce4f3a66 sys/dev/raidframe/rf_callback.c
--- a/sys/dev/raidframe/rf_callback.c Thu Oct 04 15:56:35 2001 +0000
+++ b/sys/dev/raidframe/rf_callback.c Thu Oct 04 15:58:51 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_callback.c,v 1.4 2001/09/26 02:52:57 oster Exp $ */
+/* $NetBSD: rf_callback.c,v 1.5 2001/10/04 15:58:51 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,8 @@
****************************************************************************************/
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
+
#include "rf_archs.h"
#include "rf_threadstuff.h"
#include "rf_callback.h"
diff -r d35265fa4c3f -r e354ce4f3a66 sys/dev/raidframe/rf_callback.h
--- a/sys/dev/raidframe/rf_callback.h Thu Oct 04 15:56:35 2001 +0000
+++ b/sys/dev/raidframe/rf_callback.h Thu Oct 04 15:58:51 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_callback.h,v 1.3 1999/02/05 00:06:06 oster Exp $ */
+/* $NetBSD: rf_callback.h,v 1.4 2001/10/04 15:58:51 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -44,7 +44,7 @@
#ifndef _RF__RF_CALLBACK_H_
#define _RF__RF_CALLBACK_H_
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
struct RF_CallbackDesc_s {
void (*callbackFunc) (RF_CBParam_t); /* function to call */
diff -r d35265fa4c3f -r e354ce4f3a66 sys/dev/raidframe/rf_chaindecluster.c
--- a/sys/dev/raidframe/rf_chaindecluster.c Thu Oct 04 15:56:35 2001 +0000
+++ b/sys/dev/raidframe/rf_chaindecluster.c Thu Oct 04 15:58:51 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_chaindecluster.c,v 1.6 2001/01/26 04:27:16 oster Exp $ */
+/* $NetBSD: rf_chaindecluster.c,v 1.7 2001/10/04 15:58:51 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -36,7 +36,8 @@
#if (RF_INCLUDE_CHAINDECLUSTER > 0)
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
+
#include "rf_raid.h"
#include "rf_chaindecluster.h"
#include "rf_dag.h"
diff -r d35265fa4c3f -r e354ce4f3a66 sys/dev/raidframe/rf_configure.h
--- a/sys/dev/raidframe/rf_configure.h Thu Oct 04 15:56:35 2001 +0000
+++ b/sys/dev/raidframe/rf_configure.h Thu Oct 04 15:58:51 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_configure.h,v 1.4 1999/03/02 03:18:49 oster Exp $ */
+/* $NetBSD: rf_configure.h,v 1.5 2001/10/04 15:58:51 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -39,55 +39,4 @@
#ifndef _RF__RF_CONFIGURE_H_
#define _RF__RF_CONFIGURE_H_
-#include "rf_archs.h"
-#include "rf_types.h"
-
-#include <sys/param.h>
-#include <sys/proc.h>
-
-#include <sys/ioctl.h>
-
-/* the raidframe configuration, passed down through an ioctl.
- * the driver can be reconfigured (with total loss of data) at any time,
- * but it must be shut down first.
- */
-struct RF_Config_s {
- RF_RowCol_t numRow, numCol, numSpare; /* number of rows, columns,
- * and spare disks */
- dev_t devs[RF_MAXROW][RF_MAXCOL]; /* device numbers for disks
- * comprising array */
- char devnames[RF_MAXROW][RF_MAXCOL][50]; /* device names */
- dev_t spare_devs[RF_MAXSPARE]; /* device numbers for spare
- * disks */
- char spare_names[RF_MAXSPARE][50]; /* device names */
- RF_SectorNum_t sectPerSU; /* sectors per stripe unit */
- RF_StripeNum_t SUsPerPU;/* stripe units per parity unit */
- RF_StripeNum_t SUsPerRU;/* stripe units per reconstruction unit */
- RF_ParityConfig_t parityConfig; /* identifies the RAID architecture to
- * be used */
- RF_DiskQueueType_t diskQueueType; /* 'f' = fifo, 'c' = cvscan,
- * not used in kernel */
- char maxOutstandingDiskReqs; /* # concurrent reqs to be sent to a
- * disk. not used in kernel. */
- char debugVars[RF_MAXDBGV][50]; /* space for specifying debug
- * variables & their values */
- unsigned int layoutSpecificSize; /* size in bytes of
- * layout-specific info */
- void *layoutSpecific; /* a pointer to a layout-specific structure to
- * be copied in */
- int force; /* if !0, ignore many fatal
- configuration conditions */
- /*
- "force" is used to override cases where the component labels would
- indicate that configuration should not proceed without user
- intervention
- */
-};
-#ifndef _KERNEL
-int rf_MakeConfig(char *configname, RF_Config_t * cfgPtr);
-int rf_MakeLayoutSpecificNULL(FILE * fp, RF_Config_t * cfgPtr, void *arg);
-int rf_MakeLayoutSpecificDeclustered(FILE * configfp, RF_Config_t * cfgPtr, void *arg);
-void *rf_ReadSpareTable(RF_SparetWait_t * req, char *fname);
-#endif /* !_KERNEL */
-
#endif /* !_RF__RF_CONFIGURE_H_ */
diff -r d35265fa4c3f -r e354ce4f3a66 sys/dev/raidframe/rf_copyback.c
--- a/sys/dev/raidframe/rf_copyback.c Thu Oct 04 15:56:35 2001 +0000
+++ b/sys/dev/raidframe/rf_copyback.c Thu Oct 04 15:58:51 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_copyback.c,v 1.15 2001/01/26 02:16:24 oster Exp $ */
+/* $NetBSD: rf_copyback.c,v 1.16 2001/10/04 15:58:51 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -37,7 +37,7 @@
*
****************************************************************************************/
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
#include <sys/time.h>
#include <sys/buf.h>
diff -r d35265fa4c3f -r e354ce4f3a66 sys/dev/raidframe/rf_copyback.h
--- a/sys/dev/raidframe/rf_copyback.h Thu Oct 04 15:56:35 2001 +0000
+++ b/sys/dev/raidframe/rf_copyback.h Thu Oct 04 15:58:51 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_copyback.h,v 1.3 1999/02/05 00:06:06 oster Exp $ */
+/* $NetBSD: rf_copyback.h,v 1.4 2001/10/04 15:58:51 oster Exp $ */
/*
* rf_copyback.h
*/
@@ -32,7 +32,7 @@
#ifndef _RF__RF_COPYBACK_H_
#define _RF__RF_COPYBACK_H_
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
typedef struct RF_CopybackDesc_s {
RF_Raid_t *raidPtr;
diff -r d35265fa4c3f -r e354ce4f3a66 sys/dev/raidframe/rf_cvscan.c
--- a/sys/dev/raidframe/rf_cvscan.c Thu Oct 04 15:56:35 2001 +0000
+++ b/sys/dev/raidframe/rf_cvscan.c Thu Oct 04 15:58:51 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_cvscan.c,v 1.6 2001/07/18 06:45:33 thorpej Exp $ */
+/* $NetBSD: rf_cvscan.c,v 1.7 2001/10/04 15:58:51 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -34,7 +34,7 @@
*
******************************************************************************/
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
#include "rf_alloclist.h"
#include "rf_stripelocks.h"
#include "rf_layout.h"
diff -r d35265fa4c3f -r e354ce4f3a66 sys/dev/raidframe/rf_dag.h
--- a/sys/dev/raidframe/rf_dag.h Thu Oct 04 15:56:35 2001 +0000
+++ b/sys/dev/raidframe/rf_dag.h Thu Oct 04 15:58:51 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_dag.h,v 1.3 1999/02/05 00:06:07 oster Exp $ */
+/* $NetBSD: rf_dag.h,v 1.4 2001/10/04 15:58:51 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -35,7 +35,8 @@
#ifndef _RF__RF_DAG_H_
#define _RF__RF_DAG_H_
-#include "rf_types.h"
+#include <dev/raidframe/raidframevar.h>
+
#include "rf_threadstuff.h"
#include "rf_alloclist.h"
#include "rf_stripelocks.h"
diff -r d35265fa4c3f -r e354ce4f3a66 sys/dev/raidframe/rf_dagdegrd.c
--- a/sys/dev/raidframe/rf_dagdegrd.c Thu Oct 04 15:56:35 2001 +0000
+++ b/sys/dev/raidframe/rf_dagdegrd.c Thu Oct 04 15:58:51 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_dagdegrd.c,v 1.8 2001/06/08 12:51:17 mrg Exp $ */
+/* $NetBSD: rf_dagdegrd.c,v 1.9 2001/10/04 15:58:51 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -32,8 +32,9 @@
* code for creating degraded read DAGs
Home |
Main Index |
Thread Index |
Old Index