diff options
| author | oster <oster@NetBSD.org> | 2000-01-09 01:29:27 +0000 |
|---|---|---|
| committer | oster <oster@NetBSD.org> | 2000-01-09 01:29:27 +0000 |
| commit | c8730b35e604ec7eed94a81547e97bb6c21ccd64 (patch) | |
| tree | 23e5a01a96880c815bee036f4291eaf3bf98b95a /sys/dev/raidframe | |
| parent | 08817bcd5087fd67f8008ee040d43dbd837388ec (diff) | |
- move a bunch of function prototypes to rf_kintf.h
- general cleanup of a number of prototypes that were scattered around.
Diffstat (limited to 'sys/dev/raidframe')
| -rw-r--r-- | sys/dev/raidframe/rf_copyback.c | 16 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_disks.c | 6 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_driver.c | 9 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_kintf.h | 9 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_netbsdkintf.c | 12 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_reconstruct.c | 7 |
6 files changed, 21 insertions, 38 deletions
diff --git a/sys/dev/raidframe/rf_copyback.c b/sys/dev/raidframe/rf_copyback.c index 405c07c82e9..8f8bbd75405 100644 --- a/sys/dev/raidframe/rf_copyback.c +++ b/sys/dev/raidframe/rf_copyback.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_copyback.c,v 1.11 2000/01/07 03:40:56 oster Exp $ */ +/* $NetBSD: rf_copyback.c,v 1.12 2000/01/09 01:29:28 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -51,6 +51,7 @@ #include "rf_decluster.h" #include "rf_driver.h" #include "rf_shutdown.h" +#include "rf_kintf.h" #define RF_COPYBACK_DATA 0 #define RF_COPYBACK_PARITY 1 @@ -59,10 +60,10 @@ int rf_copyback_in_progress; static int rf_CopybackReadDoneProc(RF_CopybackDesc_t * desc, int status); static int rf_CopybackWriteDoneProc(RF_CopybackDesc_t * desc, int status); -static void -rf_CopybackOne(RF_CopybackDesc_t * desc, int typ, - RF_RaidAddr_t addr, RF_RowCol_t testRow, RF_RowCol_t testCol, - RF_SectorNum_t testOffs); +static void rf_CopybackOne(RF_CopybackDesc_t * desc, int typ, + RF_RaidAddr_t addr, RF_RowCol_t testRow, + RF_RowCol_t testCol, + RF_SectorNum_t testOffs); static void rf_CopybackComplete(RF_CopybackDesc_t * desc, int status); int @@ -80,11 +81,6 @@ rf_ConfigureCopyback(listp) #include <sys/fcntl.h> #include <sys/vnode.h> -/* XXX these should be in a .h file somewhere */ -int raidlookup __P((char *, struct proc *, struct vnode **)); -int raidwrite_component_label(dev_t, struct vnode *, RF_ComponentLabel_t *); -int raidread_component_label(dev_t, struct vnode *, RF_ComponentLabel_t *); - /* do a complete copyback */ void rf_CopybackReconstructedData(raidPtr) diff --git a/sys/dev/raidframe/rf_disks.c b/sys/dev/raidframe/rf_disks.c index 8c620400950..c052ba3edfc 100644 --- a/sys/dev/raidframe/rf_disks.c +++ b/sys/dev/raidframe/rf_disks.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_disks.c,v 1.13 1999/08/14 03:10:03 oster Exp $ */ +/* $NetBSD: rf_disks.c,v 1.14 2000/01/09 01:29:28 oster Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. * All rights reserved. @@ -73,6 +73,7 @@ #include "rf_configure.h" #include "rf_general.h" #include "rf_options.h" +#include "rf_kintf.h" #include <sys/types.h> #include <sys/param.h> @@ -83,9 +84,6 @@ #include <sys/vnode.h> /* XXX these should be in a header file somewhere */ -int raidlookup __P((char *, struct proc * p, struct vnode **)); -int raidwrite_component_label(dev_t, struct vnode *, RF_ComponentLabel_t *); -int raidread_component_label(dev_t, struct vnode *, RF_ComponentLabel_t *); void rf_UnconfigureVnodes( RF_Raid_t * ); int rf_CheckLabels( RF_Raid_t *, RF_Config_t *); diff --git a/sys/dev/raidframe/rf_driver.c b/sys/dev/raidframe/rf_driver.c index 2f46fadaea0..ddb3015db50 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.23 2000/01/09 00:00:18 oster Exp $ */ +/* $NetBSD: rf_driver.c,v 1.24 2000/01/09 01:29:28 oster Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. * All rights reserved. @@ -115,6 +115,7 @@ #include "rf_options.h" #include "rf_shutdown.h" #include "rf_cpuutil.h" +#include "rf_kintf.h" #include <sys/buf.h> @@ -139,12 +140,6 @@ static void rf_ShutdownRDFreeList(void *); static int rf_ConfigureRDFreeList(RF_ShutdownList_t **); void rf_UnconfigureVnodes( RF_Raid_t * ); -/* XXX move these to their own .h file! */ -int raidwrite_component_label(dev_t, struct vnode *, RF_ComponentLabel_t *); -int raidread_component_label(dev_t, struct vnode *, RF_ComponentLabel_t *); -int raidmarkclean(dev_t dev, struct vnode *b_vp,int); -void rf_update_component_labels( RF_Raid_t *); - RF_DECLARE_MUTEX(rf_printf_mutex) /* debug only: avoids interleaved * printfs by different stripes */ diff --git a/sys/dev/raidframe/rf_kintf.h b/sys/dev/raidframe/rf_kintf.h index 12b066060f6..afe275ec4ff 100644 --- a/sys/dev/raidframe/rf_kintf.h +++ b/sys/dev/raidframe/rf_kintf.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_kintf.h,v 1.6 2000/01/05 02:57:29 oster Exp $ */ +/* $NetBSD: rf_kintf.h,v 1.7 2000/01/09 01:29:27 oster Exp $ */ /* * rf_kintf.h * @@ -41,4 +41,11 @@ int rf_GetSpareTableFromDaemon(RF_SparetWait_t * req); void raidstart(RF_Raid_t * raidPtr); int rf_DispatchKernelIO(RF_DiskQueue_t * queue, RF_DiskQueueData_t * req); +int raidwrite_component_label(dev_t, struct vnode *, RF_ComponentLabel_t *); +int raidread_component_label(dev_t, struct vnode *, RF_ComponentLabel_t *); +void rf_update_component_labels( RF_Raid_t *); +int raidlookup __P((char *, struct proc *, struct vnode **)); +int raidmarkclean(dev_t dev, struct vnode *b_vp, int); +int raidmarkdirty(dev_t dev, struct vnode *b_vp, int); + #endif /* _RF__RF_KINTF_H_ */ diff --git a/sys/dev/raidframe/rf_netbsdkintf.c b/sys/dev/raidframe/rf_netbsdkintf.c index 363bd262e87..b106287faac 100644 --- a/sys/dev/raidframe/rf_netbsdkintf.c +++ b/sys/dev/raidframe/rf_netbsdkintf.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_netbsdkintf.c,v 1.43 2000/01/08 02:04:06 oster Exp $ */ +/* $NetBSD: rf_netbsdkintf.c,v 1.44 2000/01/09 01:29:27 oster Exp $ */ /*- * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc. * All rights reserved. @@ -137,6 +137,7 @@ #include "raid.h" #include "rf_raid.h" #include "rf_raidframe.h" +#include "rf_copyback.h" #include "rf_dag.h" #include "rf_dagflags.h" #include "rf_diskqueue.h" @@ -187,14 +188,9 @@ static void InitBP(struct buf * bp, struct vnode *, unsigned rw_flag, void (*cbFunc) (struct buf *), void *cbArg, int logBytesPerSector, struct proc * b_proc); -int raidmarkclean(dev_t dev, struct vnode *b_vp, int); -int raidmarkdirty(dev_t dev, struct vnode *b_vp, int); - void raidattach __P((int)); int raidsize __P((dev_t)); -void rf_DiskIOComplete(RF_DiskQueue_t *, RF_DiskQueueData_t *, int); -void rf_CopybackReconstructedData(RF_Raid_t * raidPtr); static int raidinit __P((dev_t, RF_Raid_t *, int)); int raidopen __P((dev_t, int, int, struct proc *)); @@ -205,9 +201,6 @@ int raidread __P((dev_t, struct uio *, int)); void raidstrategy __P((struct buf *)); int raiddump __P((dev_t, daddr_t, caddr_t, size_t)); -int raidwrite_component_label(dev_t, struct vnode *, RF_ComponentLabel_t *); -int raidread_component_label(dev_t, struct vnode *, RF_ComponentLabel_t *); -void rf_update_component_labels( RF_Raid_t *); /* * Pilfered from ccd.c */ @@ -280,7 +273,6 @@ static void raidmakedisklabel __P((struct raid_softc *)); static int raidlock __P((struct raid_softc *)); static void raidunlock __P((struct raid_softc *)); -int raidlookup __P((char *, struct proc * p, struct vnode **)); static void rf_markalldirty __P((RF_Raid_t *)); diff --git a/sys/dev/raidframe/rf_reconstruct.c b/sys/dev/raidframe/rf_reconstruct.c index ec324af3b29..51e6df4b839 100644 --- a/sys/dev/raidframe/rf_reconstruct.c +++ b/sys/dev/raidframe/rf_reconstruct.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_reconstruct.c,v 1.11 2000/01/09 01:12:05 oster Exp $ */ +/* $NetBSD: rf_reconstruct.c,v 1.12 2000/01/09 01:29:28 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -125,11 +125,6 @@ static void ForceReconReadDoneProc(void *arg, int status); static void rf_ShutdownReconstruction(void *); -/* XXX these should be in a .h file somewhere */ -int raidlookup __P((char *, struct proc *, struct vnode **)); -int raidwrite_component_label(dev_t, struct vnode *, RF_ComponentLabel_t *); -int raidread_component_label(dev_t, struct vnode *, RF_ComponentLabel_t *); - struct RF_ReconDoneProc_s { void (*proc) (RF_Raid_t *, void *); void *arg; |
