diff options
| author | christos <christos@NetBSD.org> | 2005-12-11 12:16:03 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2005-12-11 12:16:03 +0000 |
| commit | 95e1ffb15694e54f29f8baaa4232152b703c2a5a (patch) | |
| tree | d6510e195bc06092a8057e34c6442eba4e77d09a /sys/dev/raidframe | |
| parent | 4f17ba81bcaf3f5086d88a346cbfd12506a5e3e6 (diff) | |
merge ktrace-lwp.
Diffstat (limited to 'sys/dev/raidframe')
114 files changed, 203 insertions, 197 deletions
diff --git a/sys/dev/raidframe/files.raidframe b/sys/dev/raidframe/files.raidframe index e1fc8310b96..921a7a4e757 100644 --- a/sys/dev/raidframe/files.raidframe +++ b/sys/dev/raidframe/files.raidframe @@ -1,4 +1,4 @@ -# $NetBSD: files.raidframe,v 1.3 2003/12/29 06:37:47 oster Exp $ +# $NetBSD: files.raidframe,v 1.4 2005/12/11 12:23:37 christos Exp $ defflag RAID_AUTOCONFIG defflag RAID_DIAGNOSTIC diff --git a/sys/dev/raidframe/raidframeio.h b/sys/dev/raidframe/raidframeio.h index 4bfedfcfd91..056771d2370 100644 --- a/sys/dev/raidframe/raidframeio.h +++ b/sys/dev/raidframe/raidframeio.h @@ -1,4 +1,4 @@ -/* $NetBSD: raidframeio.h,v 1.2 2005/02/27 00:27:44 perry Exp $ */ +/* $NetBSD: raidframeio.h,v 1.3 2005/12/11 12:23:37 christos Exp $ */ /*- * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/dev/raidframe/raidframevar.h b/sys/dev/raidframe/raidframevar.h index 86bc6ca9aaf..380e2325769 100644 --- a/sys/dev/raidframe/raidframevar.h +++ b/sys/dev/raidframe/raidframevar.h @@ -1,4 +1,4 @@ -/* $NetBSD: raidframevar.h,v 1.8 2005/02/27 00:27:44 perry Exp $ */ +/* $NetBSD: raidframevar.h,v 1.9 2005/12/11 12:23:37 christos Exp $ */ /*- * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/dev/raidframe/rf_acctrace.c b/sys/dev/raidframe/rf_acctrace.c index 2f5ce8d7366..683dc8f8b30 100644 --- a/sys/dev/raidframe/rf_acctrace.c +++ b/sys/dev/raidframe/rf_acctrace.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_acctrace.c,v 1.20 2005/02/27 00:27:44 perry Exp $ */ +/* $NetBSD: rf_acctrace.c,v 1.21 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -34,7 +34,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_acctrace.c,v 1.20 2005/02/27 00:27:44 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_acctrace.c,v 1.21 2005/12/11 12:23:37 christos Exp $"); #include <sys/stat.h> #include <sys/types.h> diff --git a/sys/dev/raidframe/rf_acctrace.h b/sys/dev/raidframe/rf_acctrace.h index 8529690c0ae..1e82317b6f3 100644 --- a/sys/dev/raidframe/rf_acctrace.h +++ b/sys/dev/raidframe/rf_acctrace.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_acctrace.h,v 1.7 2004/02/29 04:03:50 oster Exp $ */ +/* $NetBSD: rf_acctrace.h,v 1.8 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. diff --git a/sys/dev/raidframe/rf_alloclist.c b/sys/dev/raidframe/rf_alloclist.c index 95d062627d1..e6d30408f39 100644 --- a/sys/dev/raidframe/rf_alloclist.c +++ b/sys/dev/raidframe/rf_alloclist.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_alloclist.c,v 1.22 2005/02/27 00:27:44 perry Exp $ */ +/* $NetBSD: rf_alloclist.c,v 1.23 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -37,7 +37,7 @@ ***************************************************************************/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_alloclist.c,v 1.22 2005/02/27 00:27:44 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_alloclist.c,v 1.23 2005/12/11 12:23:37 christos Exp $"); #include <dev/raidframe/raidframevar.h> diff --git a/sys/dev/raidframe/rf_archs.h b/sys/dev/raidframe/rf_archs.h index aba4668f261..a8e0c76d7f7 100644 --- a/sys/dev/raidframe/rf_archs.h +++ b/sys/dev/raidframe/rf_archs.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_archs.h,v 1.25 2005/02/27 00:27:44 perry Exp $ */ +/* $NetBSD: rf_archs.h,v 1.26 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. diff --git a/sys/dev/raidframe/rf_aselect.c b/sys/dev/raidframe/rf_aselect.c index 5d4b86f536a..b2a216619be 100644 --- a/sys/dev/raidframe/rf_aselect.c +++ b/sys/dev/raidframe/rf_aselect.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_aselect.c,v 1.21 2005/02/27 00:27:44 perry Exp $ */ +/* $NetBSD: rf_aselect.c,v 1.22 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -33,7 +33,7 @@ *****************************************************************************/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_aselect.c,v 1.21 2005/02/27 00:27:44 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_aselect.c,v 1.22 2005/12/11 12:23:37 christos Exp $"); #include <dev/raidframe/raidframevar.h> diff --git a/sys/dev/raidframe/rf_aselect.h b/sys/dev/raidframe/rf_aselect.h index 48bd1d2692e..61024dc7deb 100644 --- a/sys/dev/raidframe/rf_aselect.h +++ b/sys/dev/raidframe/rf_aselect.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_aselect.h,v 1.4 2004/03/04 02:25:13 oster Exp $ */ +/* $NetBSD: rf_aselect.h,v 1.5 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. diff --git a/sys/dev/raidframe/rf_callback.c b/sys/dev/raidframe/rf_callback.c index 1b284ab7c55..98c0fe2b955 100644 --- a/sys/dev/raidframe/rf_callback.c +++ b/sys/dev/raidframe/rf_callback.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_callback.c,v 1.17 2005/02/27 00:27:44 perry Exp $ */ +/* $NetBSD: rf_callback.c,v 1.18 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -34,7 +34,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_callback.c,v 1.17 2005/02/27 00:27:44 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_callback.c,v 1.18 2005/12/11 12:23:37 christos Exp $"); #include <dev/raidframe/raidframevar.h> #include <sys/pool.h> diff --git a/sys/dev/raidframe/rf_callback.h b/sys/dev/raidframe/rf_callback.h index 9ab0bbbc8e0..1437c856f27 100644 --- a/sys/dev/raidframe/rf_callback.h +++ b/sys/dev/raidframe/rf_callback.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_callback.h,v 1.5 2004/03/03 13:29:00 oster Exp $ */ +/* $NetBSD: rf_callback.h,v 1.6 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. diff --git a/sys/dev/raidframe/rf_chaindecluster.c b/sys/dev/raidframe/rf_chaindecluster.c index ef5a599c968..65613eed823 100644 --- a/sys/dev/raidframe/rf_chaindecluster.c +++ b/sys/dev/raidframe/rf_chaindecluster.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_chaindecluster.c,v 1.12 2005/02/27 00:27:44 perry Exp $ */ +/* $NetBSD: rf_chaindecluster.c,v 1.13 2005/12/11 12:23:37 christos 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.12 2005/02/27 00:27:44 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_chaindecluster.c,v 1.13 2005/12/11 12:23:37 christos Exp $"); #include "rf_archs.h" diff --git a/sys/dev/raidframe/rf_chaindecluster.h b/sys/dev/raidframe/rf_chaindecluster.h index fea4992c975..aa0a6d70cfb 100644 --- a/sys/dev/raidframe/rf_chaindecluster.h +++ b/sys/dev/raidframe/rf_chaindecluster.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_chaindecluster.h,v 1.6 2005/02/27 00:27:44 perry Exp $ */ +/* $NetBSD: rf_chaindecluster.h,v 1.7 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. diff --git a/sys/dev/raidframe/rf_copyback.c b/sys/dev/raidframe/rf_copyback.c index 78378c3291f..cd0180ee907 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.31 2005/02/27 00:27:44 perry Exp $ */ +/* $NetBSD: rf_copyback.c,v 1.32 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -38,7 +38,7 @@ ****************************************************************************/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_copyback.c,v 1.31 2005/02/27 00:27:44 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_copyback.c,v 1.32 2005/12/11 12:23:37 christos Exp $"); #include <dev/raidframe/raidframevar.h> @@ -97,7 +97,7 @@ rf_CopybackReconstructedData(RF_Raid_t *raidPtr) struct partinfo dpart; struct vnode *vp; struct vattr va; - struct proc *proc; + struct lwp *l; int ac; @@ -118,7 +118,7 @@ rf_CopybackReconstructedData(RF_Raid_t *raidPtr) badDisk = &raidPtr->Disks[fcol]; - proc = raidPtr->engine_thread; + l = LIST_FIRST(&raidPtr->engine_thread->p_lwps); /* This device may have been opened successfully the first time. Close * it before trying to open it again.. */ @@ -138,7 +138,7 @@ rf_CopybackReconstructedData(RF_Raid_t *raidPtr) printf("About to (re-)open the device: %s\n", raidPtr->Disks[fcol].devname); - retcode = raidlookup(raidPtr->Disks[fcol].devname, proc, &vp); + retcode = raidlookup(raidPtr->Disks[fcol].devname, l, &vp); if (retcode) { printf("raid%d: copyback: raidlookup on device: %s failed: %d!\n", @@ -154,11 +154,12 @@ rf_CopybackReconstructedData(RF_Raid_t *raidPtr) /* Ok, so we can at least do a lookup... How about actually * getting a vp for it? */ - if ((retcode = VOP_GETATTR(vp, &va, proc->p_ucred, proc)) != 0) { + if ((retcode = VOP_GETATTR(vp, &va, + l->l_proc->p_ucred, l)) != 0) { return; } retcode = VOP_IOCTL(vp, DIOCGPART, &dpart, - FREAD, proc->p_ucred, proc); + FREAD, l->l_proc->p_ucred, l); if (retcode) { return; } diff --git a/sys/dev/raidframe/rf_copyback.h b/sys/dev/raidframe/rf_copyback.h index 600f87075c0..9112fa211af 100644 --- a/sys/dev/raidframe/rf_copyback.h +++ b/sys/dev/raidframe/rf_copyback.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_copyback.h,v 1.5 2004/01/01 19:32:55 oster Exp $ */ +/* $NetBSD: rf_copyback.h,v 1.6 2005/12/11 12:23:37 christos Exp $ */ /* * rf_copyback.h */ diff --git a/sys/dev/raidframe/rf_cvscan.c b/sys/dev/raidframe/rf_cvscan.c index 8a8c4a2ecb5..26472a4f970 100644 --- a/sys/dev/raidframe/rf_cvscan.c +++ b/sys/dev/raidframe/rf_cvscan.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_cvscan.c,v 1.12 2005/02/27 00:27:44 perry Exp $ */ +/* $NetBSD: rf_cvscan.c,v 1.13 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -35,7 +35,7 @@ ******************************************************************************/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_cvscan.c,v 1.12 2005/02/27 00:27:44 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_cvscan.c,v 1.13 2005/12/11 12:23:37 christos Exp $"); #include <dev/raidframe/raidframevar.h> #include "rf_alloclist.h" diff --git a/sys/dev/raidframe/rf_cvscan.h b/sys/dev/raidframe/rf_cvscan.h index 774ea834766..f0f67c47ada 100644 --- a/sys/dev/raidframe/rf_cvscan.h +++ b/sys/dev/raidframe/rf_cvscan.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_cvscan.h,v 1.5 2005/02/27 00:27:44 perry Exp $ */ +/* $NetBSD: rf_cvscan.h,v 1.6 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. diff --git a/sys/dev/raidframe/rf_dag.h b/sys/dev/raidframe/rf_dag.h index 35d1301e6da..5b08809e18c 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.18 2005/05/29 22:03:09 christos Exp $ */ +/* $NetBSD: rf_dag.h,v 1.19 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. diff --git a/sys/dev/raidframe/rf_dagdegrd.c b/sys/dev/raidframe/rf_dagdegrd.c index 7f5b9f39ef7..6aa95e3fc67 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.23 2005/02/27 00:27:44 perry Exp $ */ +/* $NetBSD: rf_dagdegrd.c,v 1.24 2005/12/11 12:23:37 christos 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.23 2005/02/27 00:27:44 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_dagdegrd.c,v 1.24 2005/12/11 12:23:37 christos Exp $"); #include <dev/raidframe/raidframevar.h> diff --git a/sys/dev/raidframe/rf_dagdegrd.h b/sys/dev/raidframe/rf_dagdegrd.h index b1f0556c880..653d89b2534 100644 --- a/sys/dev/raidframe/rf_dagdegrd.h +++ b/sys/dev/raidframe/rf_dagdegrd.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_dagdegrd.h,v 1.6 2005/02/27 00:27:44 perry Exp $ */ +/* $NetBSD: rf_dagdegrd.h,v 1.7 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. diff --git a/sys/dev/raidframe/rf_dagdegwr.c b/sys/dev/raidframe/rf_dagdegwr.c index a3b5698e1cf..e63a27d423c 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.26 2005/09/24 20:24:11 oster Exp $ */ +/* $NetBSD: rf_dagdegwr.c,v 1.27 2005/12/11 12:23:37 christos 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.26 2005/09/24 20:24:11 oster Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_dagdegwr.c,v 1.27 2005/12/11 12:23:37 christos Exp $"); #include <dev/raidframe/raidframevar.h> diff --git a/sys/dev/raidframe/rf_dagffrd.c b/sys/dev/raidframe/rf_dagffrd.c index ffaf70d1cd1..eee6c6f57d9 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.15 2005/05/29 22:03:09 christos Exp $ */ +/* $NetBSD: rf_dagffrd.c,v 1.16 2005/12/11 12:23:37 christos 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.15 2005/05/29 22:03:09 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_dagffrd.c,v 1.16 2005/12/11 12:23:37 christos Exp $"); #include <dev/raidframe/raidframevar.h> diff --git a/sys/dev/raidframe/rf_dagffrd.h b/sys/dev/raidframe/rf_dagffrd.h index df2982ded9a..55e205d994f 100644 --- a/sys/dev/raidframe/rf_dagffrd.h +++ b/sys/dev/raidframe/rf_dagffrd.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_dagffrd.h,v 1.5 2005/02/27 00:27:44 perry Exp $ */ +/* $NetBSD: rf_dagffrd.h,v 1.6 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. diff --git a/sys/dev/raidframe/rf_dagffwr.c b/sys/dev/raidframe/rf_dagffwr.c index 01b3741ecb6..8ee66547f26 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.30 2005/05/29 22:03:09 christos Exp $ */ +/* $NetBSD: rf_dagffwr.c,v 1.31 2005/12/11 12:23:37 christos 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.30 2005/05/29 22:03:09 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_dagffwr.c,v 1.31 2005/12/11 12:23:37 christos Exp $"); #include <dev/raidframe/raidframevar.h> diff --git a/sys/dev/raidframe/rf_dagffwr.h b/sys/dev/raidframe/rf_dagffwr.h index 4f4a5c10ae4..93ddb3d03ce 100644 --- a/sys/dev/raidframe/rf_dagffwr.h +++ b/sys/dev/raidframe/rf_dagffwr.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_dagffwr.h,v 1.6 2005/02/27 00:27:44 perry Exp $ */ +/* $NetBSD: rf_dagffwr.h,v 1.7 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. diff --git a/sys/dev/raidframe/rf_dagflags.h b/sys/dev/raidframe/rf_dagflags.h index f6d9b93c8ed..777037e7d86 100644 --- a/sys/dev/raidframe/rf_dagflags.h +++ b/sys/dev/raidframe/rf_dagflags.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_dagflags.h,v 1.4 2004/01/01 23:35:08 oster Exp $ */ +/* $NetBSD: rf_dagflags.h,v 1.5 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. diff --git a/sys/dev/raidframe/rf_dagfuncs.c b/sys/dev/raidframe/rf_dagfuncs.c index 369250c3c47..ac932d305b2 100644 --- a/sys/dev/raidframe/rf_dagfuncs.c +++ b/sys/dev/raidframe/rf_dagfuncs.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_dagfuncs.c,v 1.24 2005/05/29 22:03:09 christos Exp $ */ +/* $NetBSD: rf_dagfuncs.c,v 1.25 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -48,7 +48,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_dagfuncs.c,v 1.24 2005/05/29 22:03:09 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_dagfuncs.c,v 1.25 2005/12/11 12:23:37 christos Exp $"); #include <sys/param.h> #include <sys/ioctl.h> diff --git a/sys/dev/raidframe/rf_dagfuncs.h b/sys/dev/raidframe/rf_dagfuncs.h index 240d68da740..40176b1f801 100644 --- a/sys/dev/raidframe/rf_dagfuncs.h +++ b/sys/dev/raidframe/rf_dagfuncs.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_dagfuncs.h,v 1.8 2005/02/27 00:27:44 perry Exp $ */ +/* $NetBSD: rf_dagfuncs.h,v 1.9 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. diff --git a/sys/dev/raidframe/rf_dagutils.c b/sys/dev/raidframe/rf_dagutils.c index ed5093836fd..40d6a5157e8 100644 --- a/sys/dev/raidframe/rf_dagutils.c +++ b/sys/dev/raidframe/rf_dagutils.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_dagutils.c,v 1.46 2005/05/29 22:03:09 christos Exp $ */ +/* $NetBSD: rf_dagutils.c,v 1.47 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -33,7 +33,7 @@ *****************************************************************************/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_dagutils.c,v 1.46 2005/05/29 22:03:09 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_dagutils.c,v 1.47 2005/12/11 12:23:37 christos Exp $"); #include <dev/raidframe/raidframevar.h> diff --git a/sys/dev/raidframe/rf_dagutils.h b/sys/dev/raidframe/rf_dagutils.h index d704a123b1c..d69ed8311a3 100644 --- a/sys/dev/raidframe/rf_dagutils.h +++ b/sys/dev/raidframe/rf_dagutils.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_dagutils.h,v 1.19 2005/05/29 22:03:09 christos Exp $ */ +/* $NetBSD: rf_dagutils.h,v 1.20 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. diff --git a/sys/dev/raidframe/rf_debugMem.c b/sys/dev/raidframe/rf_debugMem.c index f76351cb1b2..3cecdf2e1d6 100644 --- a/sys/dev/raidframe/rf_debugMem.c +++ b/sys/dev/raidframe/rf_debugMem.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_debugMem.c,v 1.15 2005/02/27 00:27:44 perry Exp $ */ +/* $NetBSD: rf_debugMem.c,v 1.16 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_debugMem.c,v 1.15 2005/02/27 00:27:44 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_debugMem.c,v 1.16 2005/12/11 12:23:37 christos Exp $"); #include <dev/raidframe/raidframevar.h> diff --git a/sys/dev/raidframe/rf_debugMem.h b/sys/dev/raidframe/rf_debugMem.h index ffd7d5b0043..e17a7ffd0e3 100644 --- a/sys/dev/raidframe/rf_debugMem.h +++ b/sys/dev/raidframe/rf_debugMem.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_debugMem.h,v 1.11 2003/12/29 03:33:47 oster Exp $ */ +/* $NetBSD: rf_debugMem.h,v 1.12 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. diff --git a/sys/dev/raidframe/rf_debugprint.c b/sys/dev/raidframe/rf_debugprint.c index f470d720fcf..1ed565b0ad7 100644 --- a/sys/dev/raidframe/rf_debugprint.c +++ b/sys/dev/raidframe/rf_debugprint.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_debugprint.c,v 1.9 2005/02/27 00:27:44 perry Exp $ */ +/* $NetBSD: rf_debugprint.c,v 1.10 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_debugprint.c,v 1.9 2005/02/27 00:27:44 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_debugprint.c,v 1.10 2005/12/11 12:23:37 christos Exp $"); #include <dev/raidframe/raidframevar.h> diff --git a/sys/dev/raidframe/rf_debugprint.h b/sys/dev/raidframe/rf_debugprint.h index 11324b83478..1272c9cb1ab 100644 --- a/sys/dev/raidframe/rf_debugprint.h +++ b/sys/dev/raidframe/rf_debugprint.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_debugprint.h,v 1.5 2005/02/27 00:27:44 perry Exp $ */ +/* $NetBSD: rf_debugprint.h,v 1.6 2005/12/11 12:23:37 christos Exp $ */ /* * rf_debugprint.h */ diff --git a/sys/dev/raidframe/rf_decluster.c b/sys/dev/raidframe/rf_decluster.c index 672108c1f25..58f0c8a236d 100644 --- a/sys/dev/raidframe/rf_decluster.c +++ b/sys/dev/raidframe/rf_decluster.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_decluster.c,v 1.17 2005/02/27 00:27:44 perry Exp $ */ +/* $NetBSD: rf_decluster.c,v 1.18 2005/12/11 12:23:37 christos 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.17 2005/02/27 00:27:44 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_decluster.c,v 1.18 2005/12/11 12:23:37 christos Exp $"); #include <dev/raidframe/raidframevar.h> diff --git a/sys/dev/raidframe/rf_decluster.h b/sys/dev/raidframe/rf_decluster.h index afda37b28d6..438b77c5b4b 100644 --- a/sys/dev/raidframe/rf_decluster.h +++ b/sys/dev/raidframe/rf_decluster.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_decluster.h,v 1.5 2005/02/27 00:27:44 perry Exp $ */ +/* $NetBSD: rf_decluster.h,v 1.6 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. diff --git a/sys/dev/raidframe/rf_declusterPQ.c b/sys/dev/raidframe/rf_declusterPQ.c index 9c14ede0ca6..d87eb984159 100644 --- a/sys/dev/raidframe/rf_declusterPQ.c +++ b/sys/dev/raidframe/rf_declusterPQ.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_declusterPQ.c,v 1.11 2005/02/27 00:27:44 perry Exp $ */ +/* $NetBSD: rf_declusterPQ.c,v 1.12 2005/12/11 12:23:37 christos 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.11 2005/02/27 00:27:44 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_declusterPQ.c,v 1.12 2005/12/11 12:23:37 christos Exp $"); #include <dev/raidframe/raidframevar.h> diff --git a/sys/dev/raidframe/rf_declusterPQ.h b/sys/dev/raidframe/rf_declusterPQ.h index 3ec963d63d6..c8bd77ad1a4 100644 --- a/sys/dev/raidframe/rf_declusterPQ.h +++ b/sys/dev/raidframe/rf_declusterPQ.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_declusterPQ.h,v 1.5 2005/02/27 00:27:44 perry Exp $ */ +/* $NetBSD: rf_declusterPQ.h,v 1.6 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. diff --git a/sys/dev/raidframe/rf_desc.h b/sys/dev/raidframe/rf_desc.h index a1141bedb97..c2c35e9d644 100644 --- a/sys/dev/raidframe/rf_desc.h +++ b/sys/dev/raidframe/rf_desc.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_desc.h,v 1.18 2005/02/27 00:27:44 perry Exp $ */ +/* $NetBSD: rf_desc.h,v 1.19 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. diff --git a/sys/dev/raidframe/rf_diskqueue.c b/sys/dev/raidframe/rf_diskqueue.c index df166fb0438..a25154c3f3d 100644 --- a/sys/dev/raidframe/rf_diskqueue.c +++ b/sys/dev/raidframe/rf_diskqueue.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_diskqueue.c,v 1.41 2005/05/29 22:03:09 christos Exp $ */ +/* $NetBSD: rf_diskqueue.c,v 1.42 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -66,7 +66,7 @@ ****************************************************************************/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_diskqueue.c,v 1.41 2005/05/29 22:03:09 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_diskqueue.c,v 1.42 2005/12/11 12:23:37 christos Exp $"); #include <dev/raidframe/raidframevar.h> diff --git a/sys/dev/raidframe/rf_diskqueue.h b/sys/dev/raidframe/rf_diskqueue.h index c593915c5cb..cef1e8ef889 100644 --- a/sys/dev/raidframe/rf_diskqueue.h +++ b/sys/dev/raidframe/rf_diskqueue.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_diskqueue.h,v 1.20 2005/02/27 00:27:44 perry Exp $ */ +/* $NetBSD: rf_diskqueue.h,v 1.21 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. diff --git a/sys/dev/raidframe/rf_disks.c b/sys/dev/raidframe/rf_disks.c index 143e1fc139d..0332a98301f 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.58 2005/05/29 22:03:09 christos Exp $ */ +/* $NetBSD: rf_disks.c,v 1.59 2005/12/11 12:23:37 christos Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. * All rights reserved. @@ -67,7 +67,7 @@ ***************************************************************/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_disks.c,v 1.58 2005/05/29 22:03:09 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_disks.c,v 1.59 2005/12/11 12:23:37 christos Exp $"); #include <dev/raidframe/raidframevar.h> @@ -577,7 +577,7 @@ rf_ConfigureDisk(RF_Raid_t *raidPtr, char *bf, RF_RaidDisk_t *diskPtr, struct partinfo dpart; struct vnode *vp; struct vattr va; - struct proc *proc; + struct lwp *l; int error; p = rf_find_non_white(bf); @@ -587,7 +587,7 @@ rf_ConfigureDisk(RF_Raid_t *raidPtr, char *bf, RF_RaidDisk_t *diskPtr, } (void) strcpy(diskPtr->devname, p); - proc = raidPtr->engine_thread; + l = LIST_FIRST(&raidPtr->engine_thread->p_lwps); /* Let's start by claiming the component is fine and well... */ diskPtr->status = rf_ds_optimal; @@ -602,7 +602,7 @@ rf_ConfigureDisk(RF_Raid_t *raidPtr, char *bf, RF_RaidDisk_t *diskPtr, return (0); } - error = raidlookup(diskPtr->devname, proc, &vp); + error = raidlookup(diskPtr->devname, l, &vp); if (error) { printf("raidlookup on device: %s failed!\n", diskPtr->devname); if (error == ENXIO) { @@ -614,11 +614,12 @@ rf_ConfigureDisk(RF_Raid_t *raidPtr, char *bf, RF_RaidDisk_t *diskPtr, } if (diskPtr->status == rf_ds_optimal) { - if ((error = VOP_GETATTR(vp, &va, proc->p_ucred, proc)) != 0) { + if ((error = VOP_GETATTR(vp, &va, + l->l_proc->p_ucred, l)) != 0) { return (error); } error = VOP_IOCTL(vp, DIOCGPART, &dpart, - FREAD, proc->p_ucred, proc); + FREAD, l->l_proc->p_ucred, l); if (error) { return (error); } diff --git a/sys/dev/raidframe/rf_disks.h b/sys/dev/raidframe/rf_disks.h index d63704edd93..8690a10af6b 100644 --- a/sys/dev/raidframe/rf_disks.h +++ b/sys/dev/raidframe/rf_disks.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_disks.h,v 1.13 2005/05/29 22:03:09 christos Exp $ */ +/* $NetBSD: rf_disks.h,v 1.14 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. diff --git a/sys/dev/raidframe/rf_driver.c b/sys/dev/raidframe/rf_driver.c index 15f18309b15..3fee97290b7 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.108 2005/05/29 22:03:09 christos Exp $ */ +/* $NetBSD: rf_driver.c,v 1.109 2005/12/11 12:23:37 christos 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.108 2005/05/29 22:03:09 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_driver.c,v 1.109 2005/12/11 12:23:37 christos Exp $"); #include "opt_raid_diagnostic.h" diff --git a/sys/dev/raidframe/rf_driver.h b/sys/dev/raidframe/rf_driver.h index a46710e5782..1b0580d5ab3 100644 --- a/sys/dev/raidframe/rf_driver.h +++ b/sys/dev/raidframe/rf_driver.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_driver.h,v 1.15 2005/02/27 00:27:44 perry Exp $ */ +/* $NetBSD: rf_driver.h,v 1.16 2005/12/11 12:23:37 christos Exp $ */ /* * rf_driver.h */ diff --git a/sys/dev/raidframe/rf_engine.c b/sys/dev/raidframe/rf_engine.c index d850f90f549..b82545cc774 100644 --- a/sys/dev/raidframe/rf_engine.c +++ b/sys/dev/raidframe/rf_engine.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_engine.c,v 1.36 2005/09/25 19:47:17 oster Exp $ */ +/* $NetBSD: rf_engine.c,v 1.37 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -55,7 +55,7 @@ ****************************************************************************/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_engine.c,v 1.36 2005/09/25 19:47:17 oster Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_engine.c,v 1.37 2005/12/11 12:23:37 christos Exp $"); #include <sys/errno.h> diff --git a/sys/dev/raidframe/rf_engine.h b/sys/dev/raidframe/rf_engine.h index f4f5b89046d..0d7b353b46b 100644 --- a/sys/dev/raidframe/rf_engine.h +++ b/sys/dev/raidframe/rf_engine.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_engine.h,v 1.5 2005/02/27 00:27:44 perry Exp $ */ +/* $NetBSD: rf_engine.h,v 1.6 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. diff --git a/sys/dev/raidframe/rf_etimer.h b/sys/dev/raidframe/rf_etimer.h index f035e0688f1..140918e22a7 100644 --- a/sys/dev/raidframe/rf_etimer.h +++ b/sys/dev/raidframe/rf_etimer.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_etimer.h,v 1.9 2005/05/29 22:03:09 christos Exp $ */ +/* $NetBSD: rf_etimer.h,v 1.10 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. diff --git a/sys/dev/raidframe/rf_evenodd.c b/sys/dev/raidframe/rf_evenodd.c index e3cf5b8b7a3..6e146739d8e 100644 --- a/sys/dev/raidframe/rf_evenodd.c +++ b/sys/dev/raidframe/rf_evenodd.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_evenodd.c,v 1.14 2005/02/27 00:27:44 perry Exp $ */ +/* $NetBSD: rf_evenodd.c,v 1.15 2005/12/11 12:23:37 christos 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.14 2005/02/27 00:27:44 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_evenodd.c,v 1.15 2005/12/11 12:23:37 christos Exp $"); #include "rf_archs.h" diff --git a/sys/dev/raidframe/rf_evenodd.h b/sys/dev/raidframe/rf_evenodd.h index b130b9a18ff..38f5f734c33 100644 --- a/sys/dev/raidframe/rf_evenodd.h +++ b/sys/dev/raidframe/rf_evenodd.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_evenodd.h,v 1.4 2005/02/27 00:27:45 perry Exp $ */ +/* $NetBSD: rf_evenodd.h,v 1.5 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. * All rights reserved. diff --git a/sys/dev/raidframe/rf_evenodd_dagfuncs.c b/sys/dev/raidframe/rf_evenodd_dagfuncs.c index 6abce0a607d..bf4361d9c31 100644 --- a/sys/dev/raidframe/rf_evenodd_dagfuncs.c +++ b/sys/dev/raidframe/rf_evenodd_dagfuncs.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_evenodd_dagfuncs.c,v 1.14 2005/02/27 00:27:45 perry Exp $ */ +/* $NetBSD: rf_evenodd_dagfuncs.c,v 1.15 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_evenodd_dagfuncs.c,v 1.14 2005/02/27 00:27:45 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_evenodd_dagfuncs.c,v 1.15 2005/12/11 12:23:37 christos Exp $"); #include "rf_archs.h" #include "opt_raid_diagnostic.h" diff --git a/sys/dev/raidframe/rf_evenodd_dagfuncs.h b/sys/dev/raidframe/rf_evenodd_dagfuncs.h index ef191945c01..b4c69e260c6 100644 --- a/sys/dev/raidframe/rf_evenodd_dagfuncs.h +++ b/sys/dev/raidframe/rf_evenodd_dagfuncs.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_evenodd_dagfuncs.h,v 1.4 2005/02/27 00:27:45 perry Exp $ */ +/* $NetBSD: rf_evenodd_dagfuncs.h,v 1.5 2005/12/11 12:23:37 christos Exp $ */ /* * rf_evenodd_dagfuncs.h */ diff --git a/sys/dev/raidframe/rf_fifo.c b/sys/dev/raidframe/rf_fifo.c index 6aac80827f4..e877b647646 100644 --- a/sys/dev/raidframe/rf_fifo.c +++ b/sys/dev/raidframe/rf_fifo.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_fifo.c,v 1.12 2005/02/27 00:27:45 perry Exp $ */ +/* $NetBSD: rf_fifo.c,v 1.13 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -36,7 +36,7 @@ ***************************************************/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_fifo.c,v 1.12 2005/02/27 00:27:45 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_fifo.c,v 1.13 2005/12/11 12:23:37 christos Exp $"); #include <dev/raidframe/raidframevar.h> diff --git a/sys/dev/raidframe/rf_fifo.h b/sys/dev/raidframe/rf_fifo.h index 3d9cb1e50df..7f64fa195d2 100644 --- a/sys/dev/raidframe/rf_fifo.h +++ b/sys/dev/raidframe/rf_fifo.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_fifo.h,v 1.5 2005/02/27 00:27:45 perry Exp $ */ +/* $NetBSD: rf_fifo.h,v 1.6 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. diff --git a/sys/dev/raidframe/rf_general.h b/sys/dev/raidframe/rf_general.h index 35dfc2061c2..d1a5180ecdc 100644 --- a/sys/dev/raidframe/rf_general.h +++ b/sys/dev/raidframe/rf_general.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_general.h,v 1.15 2005/05/29 22:03:09 christos Exp $ */ +/* $NetBSD: rf_general.h,v 1.16 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. diff --git a/sys/dev/raidframe/rf_interdecluster.c b/sys/dev/raidframe/rf_interdecluster.c index 59f2dd67517..4181f87c550 100644 --- a/sys/dev/raidframe/rf_interdecluster.c +++ b/sys/dev/raidframe/rf_interdecluster.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_interdecluster.c,v 1.10 2005/02/27 00:27:45 perry Exp $ */ +/* $NetBSD: rf_interdecluster.c,v 1.11 2005/12/11 12:23:37 christos 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.10 2005/02/27 00:27:45 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_interdecluster.c,v 1.11 2005/12/11 12:23:37 christos Exp $"); #include "rf_archs.h" diff --git a/sys/dev/raidframe/rf_interdecluster.h b/sys/dev/raidframe/rf_interdecluster.h index 9480120e4f7..bcd4324fac4 100644 --- a/sys/dev/raidframe/rf_interdecluster.h +++ b/sys/dev/raidframe/rf_interdecluster.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_interdecluster.h,v 1.4 2005/02/27 00:27:45 perry Exp $ */ +/* $NetBSD: rf_interdecluster.h,v 1.5 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. diff --git a/sys/dev/raidframe/rf_kintf.h b/sys/dev/raidframe/rf_kintf.h index 566ed472418..3833fc97cd3 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.18 2003/06/29 22:30:32 fvdl Exp $ */ +/* $NetBSD: rf_kintf.h,v 1.19 2005/12/11 12:23:37 christos Exp $ */ /* * rf_kintf.h * @@ -47,7 +47,7 @@ int raidread_component_label(dev_t, struct vnode *, RF_ComponentLabel_t *); #define RF_NORMAL_COMPONENT_UPDATE 0 #define RF_FINAL_COMPONENT_UPDATE 1 void rf_update_component_labels(RF_Raid_t *, int); -int raidlookup(char *, struct proc *, struct vnode **); +int raidlookup(char *, struct lwp *, struct vnode **); int raidmarkclean(dev_t dev, struct vnode *b_vp, int); int raidmarkdirty(dev_t dev, struct vnode *b_vp, int); void raid_init_component_label(RF_Raid_t *, RF_ComponentLabel_t *); diff --git a/sys/dev/raidframe/rf_layout.c b/sys/dev/raidframe/rf_layout.c index 844be162832..a6769498867 100644 --- a/sys/dev/raidframe/rf_layout.c +++ b/sys/dev/raidframe/rf_layout.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_layout.c,v 1.17 2005/02/27 00:27:45 perry Exp $ */ +/* $NetBSD: rf_layout.c,v 1.18 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_layout.c,v 1.17 2005/02/27 00:27:45 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_layout.c,v 1.18 2005/12/11 12:23:37 christos Exp $"); #include <dev/raidframe/raidframevar.h> diff --git a/sys/dev/raidframe/rf_layout.h b/sys/dev/raidframe/rf_layout.h index 48aa8cbf7ec..5901f3a35f2 100644 --- a/sys/dev/raidframe/rf_layout.h +++ b/sys/dev/raidframe/rf_layout.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_layout.h,v 1.15 2005/02/27 00:27:45 perry Exp $ */ +/* $NetBSD: rf_layout.h,v 1.16 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. diff --git a/sys/dev/raidframe/rf_map.c b/sys/dev/raidframe/rf_map.c index 0342ff7a975..a25933d9595 100644 --- a/sys/dev/raidframe/rf_map.c +++ b/sys/dev/raidframe/rf_map.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_map.c,v 1.38 2005/02/27 00:27:45 perry Exp $ */ +/* $NetBSD: rf_map.c,v 1.39 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -33,7 +33,7 @@ **************************************************************************/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_map.c,v 1.38 2005/02/27 00:27:45 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_map.c,v 1.39 2005/12/11 12:23:37 christos Exp $"); #include <dev/raidframe/raidframevar.h> diff --git a/sys/dev/raidframe/rf_map.h b/sys/dev/raidframe/rf_map.h index cc177ba3dd1..2ff35b3e046 100644 --- a/sys/dev/raidframe/rf_map.h +++ b/sys/dev/raidframe/rf_map.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_map.h,v 1.11 2004/03/20 04:22:05 oster Exp $ */ +/* $NetBSD: rf_map.h,v 1.12 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. diff --git a/sys/dev/raidframe/rf_mcpair.c b/sys/dev/raidframe/rf_mcpair.c index 39f2fb50fda..6051e510826 100644 --- a/sys/dev/raidframe/rf_mcpair.c +++ b/sys/dev/raidframe/rf_mcpair.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_mcpair.c,v 1.18 2005/02/27 00:27:45 perry Exp $ */ +/* $NetBSD: rf_mcpair.c,v 1.19 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_mcpair.c,v 1.18 2005/02/27 00:27:45 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_mcpair.c,v 1.19 2005/12/11 12:23:37 christos Exp $"); #include <dev/raidframe/raidframevar.h> diff --git a/sys/dev/raidframe/rf_mcpair.h b/sys/dev/raidframe/rf_mcpair.h index 54106fecf57..063545d757f 100644 --- a/sys/dev/raidframe/rf_mcpair.h +++ b/sys/dev/raidframe/rf_mcpair.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_mcpair.h,v 1.8 2004/03/04 03:02:01 oster Exp $ */ +/* $NetBSD: rf_mcpair.h,v 1.9 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. diff --git a/sys/dev/raidframe/rf_netbsd.h b/sys/dev/raidframe/rf_netbsd.h index bf58444669f..7ee021a7f92 100644 --- a/sys/dev/raidframe/rf_netbsd.h +++ b/sys/dev/raidframe/rf_netbsd.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_netbsd.h,v 1.24 2005/09/25 19:47:17 oster Exp $ */ +/* $NetBSD: rf_netbsd.h,v 1.25 2005/12/11 12:23:37 christos Exp $ */ /*- * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc. diff --git a/sys/dev/raidframe/rf_netbsdkintf.c b/sys/dev/raidframe/rf_netbsdkintf.c index 0c6057302d5..e6ed808e388 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.191 2005/10/15 17:29:25 yamt Exp $ */ +/* $NetBSD: rf_netbsdkintf.c,v 1.192 2005/12/11 12:23:37 christos Exp $ */ /*- * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc. * All rights reserved. @@ -146,7 +146,7 @@ ***********************************************************/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.191 2005/10/15 17:29:25 yamt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.192 2005/12/11 12:23:37 christos Exp $"); #include <sys/param.h> #include <sys/errno.h> @@ -527,7 +527,7 @@ raidsize(dev_t dev) omask = rs->sc_dkdev.dk_openmask & (1 << part); lp = rs->sc_dkdev.dk_label; - if (omask == 0 && raidopen(dev, 0, S_IFBLK, curproc)) + if (omask == 0 && raidopen(dev, 0, S_IFBLK, curlwp)) return (-1); if (lp->d_partitions[part].p_fstype != FS_SWAP) @@ -536,7 +536,7 @@ raidsize(dev_t dev) size = lp->d_partitions[part].p_size * (lp->d_secsize / DEV_BSIZE); - if (omask == 0 && raidclose(dev, 0, S_IFBLK, curproc)) + if (omask == 0 && raidclose(dev, 0, S_IFBLK, curlwp)) return (-1); return (size); @@ -551,7 +551,7 @@ raiddump(dev_t dev, daddr_t blkno, caddr_t va, size_t size) } /* ARGSUSED */ int -raidopen(dev_t dev, int flags, int fmt, struct proc *p) +raidopen(dev_t dev, int flags, int fmt, struct lwp *l) { int unit = raidunit(dev); struct raid_softc *rs; @@ -621,7 +621,7 @@ raidopen(dev_t dev, int flags, int fmt, struct proc *p) } /* ARGSUSED */ int -raidclose(dev_t dev, int flags, int fmt, struct proc *p) +raidclose(dev_t dev, int flags, int fmt, struct lwp *l) { int unit = raidunit(dev); struct raid_softc *rs; @@ -776,7 +776,7 @@ raidwrite(dev_t dev, struct uio *uio, int flags) } int -raidioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p) +raidioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l) { int unit = raidunit(dev); int error = 0; @@ -2136,32 +2136,34 @@ raidmakedisklabel(struct raid_softc *rs) * You'll find the original of this in ccd.c */ int -raidlookup(char *path, struct proc *p, struct vnode **vpp) +raidlookup(char *path, struct lwp *l, struct vnode **vpp) { struct nameidata nd; struct vnode *vp; + struct proc *p; struct vattr va; int error; - NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, path, p); + p = l ? l->l_proc : NULL; + NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, path, l); if ((error = vn_open(&nd, FREAD | FWRITE, 0)) != 0) { return (error); } vp = nd.ni_vp; if (vp->v_usecount > 1) { VOP_UNLOCK(vp, 0); - (void) vn_close(vp, FREAD | FWRITE, p->p_ucred, p); + (void) vn_close(vp, FREAD | FWRITE, p->p_ucred, l); return (EBUSY); } - if ((error = VOP_GETATTR(vp, &va, p->p_ucred, p)) != 0) { + if ((error = VOP_GETATTR(vp, &va, p->p_ucred, l)) != 0) { VOP_UNLOCK(vp, 0); - (void) vn_close(vp, FREAD | FWRITE, p->p_ucred, p); + (void) vn_close(vp, FREAD | FWRITE, p->p_ucred, l); return (error); } /* XXX: eventually we should handle VREG, too. */ if (va.va_type != VBLK) { VOP_UNLOCK(vp, 0); - (void) vn_close(vp, FREAD | FWRITE, p->p_ucred, p); + (void) vn_close(vp, FREAD | FWRITE, p->p_ucred, l); return (ENOTBLK); } VOP_UNLOCK(vp, 0); @@ -2478,8 +2480,10 @@ void rf_close_component(RF_Raid_t *raidPtr, struct vnode *vp, int auto_configured) { struct proc *p; + struct lwp *l; p = raidPtr->engine_thread; + l = LIST_FIRST(&p->p_lwps); if (vp != NULL) { if (auto_configured == 1) { @@ -2488,7 +2492,7 @@ rf_close_component(RF_Raid_t *raidPtr, struct vnode *vp, int auto_configured) vput(vp); } else { - (void) vn_close(vp, FREAD | FWRITE, p->p_ucred, p); + (void) vn_close(vp, FREAD | FWRITE, p->p_ucred, l); } } } diff --git a/sys/dev/raidframe/rf_nwayxor.c b/sys/dev/raidframe/rf_nwayxor.c index a430f9859b3..f7c26bc2451 100644 --- a/sys/dev/raidframe/rf_nwayxor.c +++ b/sys/dev/raidframe/rf_nwayxor.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_nwayxor.c,v 1.8 2005/02/27 00:27:45 perry Exp $ */ +/* $NetBSD: rf_nwayxor.c,v 1.9 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -36,7 +36,7 @@ ************************************************************/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_nwayxor.c,v 1.8 2005/02/27 00:27:45 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_nwayxor.c,v 1.9 2005/12/11 12:23:37 christos Exp $"); #include "rf_nwayxor.h" #include "rf_shutdown.h" diff --git a/sys/dev/raidframe/rf_options.c b/sys/dev/raidframe/rf_options.c index 547496a0960..a78a9e523d3 100644 --- a/sys/dev/raidframe/rf_options.c +++ b/sys/dev/raidframe/rf_options.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_options.c,v 1.6 2005/02/27 00:27:45 perry Exp $ */ +/* $NetBSD: rf_options.c,v 1.7 2005/12/11 12:23:37 christos Exp $ */ /* * rf_options.c */ @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_options.c,v 1.6 2005/02/27 00:27:45 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_options.c,v 1.7 2005/12/11 12:23:37 christos Exp $"); #include <dev/raidframe/raidframevar.h> diff --git a/sys/dev/raidframe/rf_options.h b/sys/dev/raidframe/rf_options.h index 41fd9ce295a..212b54de7b0 100644 --- a/sys/dev/raidframe/rf_options.h +++ b/sys/dev/raidframe/rf_options.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_options.h,v 1.4 2005/05/29 22:03:09 christos Exp $ */ +/* $NetBSD: rf_options.h,v 1.5 2005/12/11 12:23:37 christos Exp $ */ /* * rf_options.h */ diff --git a/sys/dev/raidframe/rf_optnames.h b/sys/dev/raidframe/rf_optnames.h index 61e8b0f0803..501927c4f89 100644 --- a/sys/dev/raidframe/rf_optnames.h +++ b/sys/dev/raidframe/rf_optnames.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_optnames.h,v 1.10 2004/01/09 23:26:17 oster Exp $ */ +/* $NetBSD: rf_optnames.h,v 1.11 2005/12/11 12:23:37 christos Exp $ */ /* * rf_optnames.h */ diff --git a/sys/dev/raidframe/rf_paritylog.c b/sys/dev/raidframe/rf_paritylog.c index 788c93240c5..51632bc73e2 100644 --- a/sys/dev/raidframe/rf_paritylog.c +++ b/sys/dev/raidframe/rf_paritylog.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_paritylog.c,v 1.10 2005/02/27 00:27:45 perry Exp $ */ +/* $NetBSD: rf_paritylog.c,v 1.11 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_paritylog.c,v 1.10 2005/02/27 00:27:45 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_paritylog.c,v 1.11 2005/12/11 12:23:37 christos Exp $"); #include "rf_archs.h" diff --git a/sys/dev/raidframe/rf_paritylogDiskMgr.c b/sys/dev/raidframe/rf_paritylogDiskMgr.c index 867884893ef..86a35217d23 100644 --- a/sys/dev/raidframe/rf_paritylogDiskMgr.c +++ b/sys/dev/raidframe/rf_paritylogDiskMgr.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_paritylogDiskMgr.c,v 1.17 2005/02/27 00:27:45 perry Exp $ */ +/* $NetBSD: rf_paritylogDiskMgr.c,v 1.18 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_paritylogDiskMgr.c,v 1.17 2005/02/27 00:27:45 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_paritylogDiskMgr.c,v 1.18 2005/12/11 12:23:37 christos Exp $"); #include "rf_archs.h" diff --git a/sys/dev/raidframe/rf_paritylogging.c b/sys/dev/raidframe/rf_paritylogging.c index 98ce06f009d..c855d84aeba 100644 --- a/sys/dev/raidframe/rf_paritylogging.c +++ b/sys/dev/raidframe/rf_paritylogging.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_paritylogging.c,v 1.23 2005/02/27 00:27:45 perry Exp $ */ +/* $NetBSD: rf_paritylogging.c,v 1.24 2005/12/11 12:23:37 christos 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.23 2005/02/27 00:27:45 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_paritylogging.c,v 1.24 2005/12/11 12:23:37 christos Exp $"); #include "rf_archs.h" diff --git a/sys/dev/raidframe/rf_paritylogging.h b/sys/dev/raidframe/rf_paritylogging.h index eaced38eb2f..076835bec95 100644 --- a/sys/dev/raidframe/rf_paritylogging.h +++ b/sys/dev/raidframe/rf_paritylogging.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_paritylogging.h,v 1.5 2005/02/27 00:27:45 perry Exp $ */ +/* $NetBSD: rf_paritylogging.h,v 1.6 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. diff --git a/sys/dev/raidframe/rf_parityloggingdags.c b/sys/dev/raidframe/rf_parityloggingdags.c index 8bbccffa43d..8e917bbaa7e 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.14 2005/02/27 00:27:45 perry Exp $ */ +/* $NetBSD: rf_parityloggingdags.c,v 1.15 2005/12/11 12:23:37 christos 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.14 2005/02/27 00:27:45 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_parityloggingdags.c,v 1.15 2005/12/11 12:23:37 christos Exp $"); #include "rf_archs.h" #include "opt_raid_diagnostic.h" diff --git a/sys/dev/raidframe/rf_parityloggingdags.h b/sys/dev/raidframe/rf_parityloggingdags.h index 2374c851a85..412465acb17 100644 --- a/sys/dev/raidframe/rf_parityloggingdags.h +++ b/sys/dev/raidframe/rf_parityloggingdags.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_parityloggingdags.h,v 1.4 2005/02/27 00:27:45 perry Exp $ */ +/* $NetBSD: rf_parityloggingdags.h,v 1.5 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. diff --git a/sys/dev/raidframe/rf_parityscan.c b/sys/dev/raidframe/rf_parityscan.c index 874481e06d8..427d0381f20 100644 --- a/sys/dev/raidframe/rf_parityscan.c +++ b/sys/dev/raidframe/rf_parityscan.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_parityscan.c,v 1.29 2005/05/29 22:03:09 christos Exp $ */ +/* $NetBSD: rf_parityscan.c,v 1.30 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -33,7 +33,7 @@ ****************************************************************************/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_parityscan.c,v 1.29 2005/05/29 22:03:09 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_parityscan.c,v 1.30 2005/12/11 12:23:37 christos Exp $"); #include <dev/raidframe/raidframevar.h> diff --git a/sys/dev/raidframe/rf_parityscan.h b/sys/dev/raidframe/rf_parityscan.h index 9f8743f606f..1eab84437e9 100644 --- a/sys/dev/raidframe/rf_parityscan.h +++ b/sys/dev/raidframe/rf_parityscan.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_parityscan.h,v 1.6 2005/05/29 22:03:09 christos Exp $ */ +/* $NetBSD: rf_parityscan.h,v 1.7 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. diff --git a/sys/dev/raidframe/rf_pq.c b/sys/dev/raidframe/rf_pq.c index 42dd3d81bad..cf46eeb34d6 100644 --- a/sys/dev/raidframe/rf_pq.c +++ b/sys/dev/raidframe/rf_pq.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_pq.c,v 1.14 2005/02/27 00:27:45 perry Exp $ */ +/* $NetBSD: rf_pq.c,v 1.15 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_pq.c,v 1.14 2005/02/27 00:27:45 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_pq.c,v 1.15 2005/12/11 12:23:37 christos Exp $"); #include "rf_archs.h" diff --git a/sys/dev/raidframe/rf_pq.h b/sys/dev/raidframe/rf_pq.h index 3601b0f49f8..8992bb5565d 100644 --- a/sys/dev/raidframe/rf_pq.h +++ b/sys/dev/raidframe/rf_pq.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_pq.h,v 1.4 2005/02/27 00:27:45 perry Exp $ */ +/* $NetBSD: rf_pq.h,v 1.5 2005/12/11 12:23:37 christos Exp $ */ /* * rf_pq.h */ diff --git a/sys/dev/raidframe/rf_pqdeg.c b/sys/dev/raidframe/rf_pqdeg.c index c2ce030e396..b1d4daa2e99 100644 --- a/sys/dev/raidframe/rf_pqdeg.c +++ b/sys/dev/raidframe/rf_pqdeg.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_pqdeg.c,v 1.8 2005/02/27 00:27:45 perry Exp $ */ +/* $NetBSD: rf_pqdeg.c,v 1.9 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_pqdeg.c,v 1.8 2005/02/27 00:27:45 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_pqdeg.c,v 1.9 2005/12/11 12:23:37 christos Exp $"); #include "rf_archs.h" diff --git a/sys/dev/raidframe/rf_pqdegdags.c b/sys/dev/raidframe/rf_pqdegdags.c index 001798aa530..ccfb5aca39b 100644 --- a/sys/dev/raidframe/rf_pqdegdags.c +++ b/sys/dev/raidframe/rf_pqdegdags.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_pqdegdags.c,v 1.10 2005/02/27 00:27:45 perry Exp $ */ +/* $NetBSD: rf_pqdegdags.c,v 1.11 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -33,7 +33,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_pqdegdags.c,v 1.10 2005/02/27 00:27:45 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_pqdegdags.c,v 1.11 2005/12/11 12:23:37 christos Exp $"); #include "rf_archs.h" diff --git a/sys/dev/raidframe/rf_psstatus.c b/sys/dev/raidframe/rf_psstatus.c index 9d6d57dd8f4..cbb24fb57ea 100644 --- a/sys/dev/raidframe/rf_psstatus.c +++ b/sys/dev/raidframe/rf_psstatus.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_psstatus.c,v 1.29 2005/02/27 00:27:45 perry Exp $ */ +/* $NetBSD: rf_psstatus.c,v 1.30 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -37,7 +37,7 @@ *****************************************************************************/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_psstatus.c,v 1.29 2005/02/27 00:27:45 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_psstatus.c,v 1.30 2005/12/11 12:23:37 christos Exp $"); #include <dev/raidframe/raidframevar.h> diff --git a/sys/dev/raidframe/rf_psstatus.h b/sys/dev/raidframe/rf_psstatus.h index 428fdf6d4e1..cb62196e00e 100644 --- a/sys/dev/raidframe/rf_psstatus.h +++ b/sys/dev/raidframe/rf_psstatus.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_psstatus.h,v 1.11 2005/02/27 00:27:45 perry Exp $ */ +/* $NetBSD: rf_psstatus.h,v 1.12 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. diff --git a/sys/dev/raidframe/rf_raid.h b/sys/dev/raidframe/rf_raid.h index fa1fee6f4ad..a10feb4511f 100644 --- a/sys/dev/raidframe/rf_raid.h +++ b/sys/dev/raidframe/rf_raid.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_raid.h,v 1.34 2005/02/27 00:27:45 perry Exp $ */ +/* $NetBSD: rf_raid.h,v 1.35 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. diff --git a/sys/dev/raidframe/rf_raid0.c b/sys/dev/raidframe/rf_raid0.c index 2507cec624e..1a33c8bb575 100644 --- a/sys/dev/raidframe/rf_raid0.c +++ b/sys/dev/raidframe/rf_raid0.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_raid0.c,v 1.12 2005/02/27 00:27:45 perry Exp $ */ +/* $NetBSD: rf_raid0.c,v 1.13 2005/12/11 12:23:37 christos 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.12 2005/02/27 00:27:45 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_raid0.c,v 1.13 2005/12/11 12:23:37 christos Exp $"); #include <dev/raidframe/raidframevar.h> diff --git a/sys/dev/raidframe/rf_raid0.h b/sys/dev/raidframe/rf_raid0.h index 03d7e51c02a..ffb9d06735f 100644 --- a/sys/dev/raidframe/rf_raid0.h +++ b/sys/dev/raidframe/rf_raid0.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_raid0.h,v 1.5 2005/02/27 00:27:45 perry Exp $ */ +/* $NetBSD: rf_raid0.h,v 1.6 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. diff --git a/sys/dev/raidframe/rf_raid1.c b/sys/dev/raidframe/rf_raid1.c index a9343ebc065..bc7d68dfe36 100644 --- a/sys/dev/raidframe/rf_raid1.c +++ b/sys/dev/raidframe/rf_raid1.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_raid1.c,v 1.26 2005/05/29 22:03:09 christos Exp $ */ +/* $NetBSD: rf_raid1.c,v 1.27 2005/12/11 12:23:37 christos 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.26 2005/05/29 22:03:09 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_raid1.c,v 1.27 2005/12/11 12:23:37 christos Exp $"); #include "rf_raid.h" #include "rf_raid1.h" diff --git a/sys/dev/raidframe/rf_raid1.h b/sys/dev/raidframe/rf_raid1.h index 2d37845df39..9728706759a 100644 --- a/sys/dev/raidframe/rf_raid1.h +++ b/sys/dev/raidframe/rf_raid1.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_raid1.h,v 1.6 2005/02/27 00:27:45 perry Exp $ */ +/* $NetBSD: rf_raid1.h,v 1.7 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. diff --git a/sys/dev/raidframe/rf_raid4.c b/sys/dev/raidframe/rf_raid4.c index 19119219e82..baffd718e02 100644 --- a/sys/dev/raidframe/rf_raid4.c +++ b/sys/dev/raidframe/rf_raid4.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_raid4.c,v 1.9 2005/02/27 00:27:45 perry Exp $ */ +/* $NetBSD: rf_raid4.c,v 1.10 2005/12/11 12:23:37 christos 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.9 2005/02/27 00:27:45 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_raid4.c,v 1.10 2005/12/11 12:23:37 christos Exp $"); #include "rf_raid.h" #include "rf_dag.h" diff --git a/sys/dev/raidframe/rf_raid4.h b/sys/dev/raidframe/rf_raid4.h index 6d6632efddf..c1a9fbc5c9a 100644 --- a/sys/dev/raidframe/rf_raid4.h +++ b/sys/dev/raidframe/rf_raid4.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_raid4.h,v 1.5 2005/02/27 00:27:45 perry Exp $ */ +/* $NetBSD: rf_raid4.h,v 1.6 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. diff --git a/sys/dev/raidframe/rf_raid5.c b/sys/dev/raidframe/rf_raid5.c index 01e3705cb78..aefca978dce 100644 --- a/sys/dev/raidframe/rf_raid5.c +++ b/sys/dev/raidframe/rf_raid5.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_raid5.c,v 1.15 2005/02/27 00:27:45 perry Exp $ */ +/* $NetBSD: rf_raid5.c,v 1.16 2005/12/11 12:23:37 christos 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.15 2005/02/27 00:27:45 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_raid5.c,v 1.16 2005/12/11 12:23:37 christos Exp $"); #include <dev/raidframe/raidframevar.h> diff --git a/sys/dev/raidframe/rf_raid5.h b/sys/dev/raidframe/rf_raid5.h index 46bbc08df26..d4b779d253b 100644 --- a/sys/dev/raidframe/rf_raid5.h +++ b/sys/dev/raidframe/rf_raid5.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_raid5.h,v 1.5 2005/02/27 00:27:45 perry Exp $ */ +/* $NetBSD: rf_raid5.h,v 1.6 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. diff --git a/sys/dev/raidframe/rf_raid5_rotatedspare.c b/sys/dev/raidframe/rf_raid5_rotatedspare.c index 822346247c8..f38c93715aa 100644 --- a/sys/dev/raidframe/rf_raid5_rotatedspare.c +++ b/sys/dev/raidframe/rf_raid5_rotatedspare.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_raid5_rotatedspare.c,v 1.9 2005/02/27 00:27:45 perry Exp $ */ +/* $NetBSD: rf_raid5_rotatedspare.c,v 1.10 2005/12/11 12:23:37 christos 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.9 2005/02/27 00:27:45 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_raid5_rotatedspare.c,v 1.10 2005/12/11 12:23:37 christos Exp $"); #include "rf_archs.h" diff --git a/sys/dev/raidframe/rf_raid5_rotatedspare.h b/sys/dev/raidframe/rf_raid5_rotatedspare.h index a8b3dd6cd02..98456eb4e00 100644 --- a/sys/dev/raidframe/rf_raid5_rotatedspare.h +++ b/sys/dev/raidframe/rf_raid5_rotatedspare.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_raid5_rotatedspare.h,v 1.5 2005/02/27 00:27:45 perry Exp $ */ +/* $NetBSD: rf_raid5_rotatedspare.h,v 1.6 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. diff --git a/sys/dev/raidframe/rf_reconbuffer.c b/sys/dev/raidframe/rf_reconbuffer.c index fdf534bbafd..b117c3ec9ed 100644 --- a/sys/dev/raidframe/rf_reconbuffer.c +++ b/sys/dev/raidframe/rf_reconbuffer.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_reconbuffer.c,v 1.22 2005/02/27 00:27:45 perry Exp $ */ +/* $NetBSD: rf_reconbuffer.c,v 1.23 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -33,7 +33,7 @@ ***************************************************/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_reconbuffer.c,v 1.22 2005/02/27 00:27:45 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_reconbuffer.c,v 1.23 2005/12/11 12:23:37 christos Exp $"); #include "rf_raid.h" #include "rf_reconbuffer.h" diff --git a/sys/dev/raidframe/rf_reconbuffer.h b/sys/dev/raidframe/rf_reconbuffer.h index f7b48f2be34..98c683a38aa 100644 --- a/sys/dev/raidframe/rf_reconbuffer.h +++ b/sys/dev/raidframe/rf_reconbuffer.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_reconbuffer.h,v 1.7 2005/02/27 00:27:45 perry Exp $ */ +/* $NetBSD: rf_reconbuffer.h,v 1.8 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. diff --git a/sys/dev/raidframe/rf_reconmap.c b/sys/dev/raidframe/rf_reconmap.c index b68bc6b7ece..f71acb7e756 100644 --- a/sys/dev/raidframe/rf_reconmap.c +++ b/sys/dev/raidframe/rf_reconmap.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_reconmap.c,v 1.26 2005/02/27 00:27:45 perry Exp $ */ +/* $NetBSD: rf_reconmap.c,v 1.27 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -34,7 +34,7 @@ *************************************************************************/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_reconmap.c,v 1.26 2005/02/27 00:27:45 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_reconmap.c,v 1.27 2005/12/11 12:23:37 christos Exp $"); #include "rf_raid.h" #include <sys/time.h> diff --git a/sys/dev/raidframe/rf_reconmap.h b/sys/dev/raidframe/rf_reconmap.h index b03d812bf9e..5950af61021 100644 --- a/sys/dev/raidframe/rf_reconmap.h +++ b/sys/dev/raidframe/rf_reconmap.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_reconmap.h,v 1.9 2004/03/18 16:54:54 oster Exp $ */ +/* $NetBSD: rf_reconmap.h,v 1.10 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. diff --git a/sys/dev/raidframe/rf_reconstruct.c b/sys/dev/raidframe/rf_reconstruct.c index 913a956d59a..bf47a1c9d49 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.89 2005/07/18 15:32:01 oster Exp $ */ +/* $NetBSD: rf_reconstruct.c,v 1.90 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -33,7 +33,7 @@ ************************************************************/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_reconstruct.c,v 1.89 2005/07/18 15:32:01 oster Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_reconstruct.c,v 1.90 2005/12/11 12:23:37 christos Exp $"); #include <sys/time.h> #include <sys/buf.h> @@ -358,7 +358,7 @@ rf_ReconstructInPlace(RF_Raid_t *raidPtr, RF_RowCol_t col) struct partinfo dpart; struct vnode *vp; struct vattr va; - struct proc *proc; + struct lwp *lwp; int retcode; int ac; @@ -413,7 +413,7 @@ rf_ReconstructInPlace(RF_Raid_t *raidPtr, RF_RowCol_t col) return (EINVAL); } #endif - proc = raidPtr->engine_thread; + lwp = LIST_FIRST(&raidPtr->engine_thread->p_lwps); /* This device may have been opened successfully the first time. Close it before trying to open it again.. */ @@ -438,7 +438,7 @@ rf_ReconstructInPlace(RF_Raid_t *raidPtr, RF_RowCol_t col) raidPtr->Disks[col].devname); #endif RF_UNLOCK_MUTEX(raidPtr->mutex); - retcode = raidlookup(raidPtr->Disks[col].devname, proc, &vp); + retcode = raidlookup(raidPtr->Disks[col].devname, lwp, &vp); if (retcode) { printf("raid%d: rebuilding: raidlookup on device: %s failed: %d!\n",raidPtr->raidid, @@ -456,7 +456,7 @@ rf_ReconstructInPlace(RF_Raid_t *raidPtr, RF_RowCol_t col) /* Ok, so we can at least do a lookup... How about actually getting a vp for it? */ - if ((retcode = VOP_GETATTR(vp, &va, proc->p_ucred, proc)) != 0) { + if ((retcode = VOP_GETATTR(vp, &va, lwp->l_proc->p_ucred, lwp)) != 0) { RF_LOCK_MUTEX(raidPtr->mutex); raidPtr->reconInProgress--; RF_UNLOCK_MUTEX(raidPtr->mutex); @@ -464,7 +464,7 @@ rf_ReconstructInPlace(RF_Raid_t *raidPtr, RF_RowCol_t col) return(retcode); } - retcode = VOP_IOCTL(vp, DIOCGPART, &dpart, FREAD, proc->p_ucred, proc); + retcode = VOP_IOCTL(vp, DIOCGPART, &dpart, FREAD, lwp->l_proc->p_ucred, lwp); if (retcode) { RF_LOCK_MUTEX(raidPtr->mutex); raidPtr->reconInProgress--; diff --git a/sys/dev/raidframe/rf_reconstruct.h b/sys/dev/raidframe/rf_reconstruct.h index 0ee2ca0aa67..1d941bbb984 100644 --- a/sys/dev/raidframe/rf_reconstruct.h +++ b/sys/dev/raidframe/rf_reconstruct.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_reconstruct.h,v 1.21 2005/06/08 02:00:53 oster Exp $ */ +/* $NetBSD: rf_reconstruct.h,v 1.22 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. diff --git a/sys/dev/raidframe/rf_reconutil.c b/sys/dev/raidframe/rf_reconutil.c index ed88aec95f3..ec92004e7b8 100644 --- a/sys/dev/raidframe/rf_reconutil.c +++ b/sys/dev/raidframe/rf_reconutil.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_reconutil.c,v 1.25 2005/02/27 00:27:45 perry Exp $ */ +/* $NetBSD: rf_reconutil.c,v 1.26 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -31,7 +31,7 @@ ********************************************/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_reconutil.c,v 1.25 2005/02/27 00:27:45 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_reconutil.c,v 1.26 2005/12/11 12:23:37 christos Exp $"); #include <dev/raidframe/raidframevar.h> diff --git a/sys/dev/raidframe/rf_reconutil.h b/sys/dev/raidframe/rf_reconutil.h index 6670fce5448..19b1a378540 100644 --- a/sys/dev/raidframe/rf_reconutil.h +++ b/sys/dev/raidframe/rf_reconutil.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_reconutil.h,v 1.5 2003/12/29 02:38:18 oster Exp $ */ +/* $NetBSD: rf_reconutil.h,v 1.6 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. diff --git a/sys/dev/raidframe/rf_revent.c b/sys/dev/raidframe/rf_revent.c index 6251dddbd18..6cdef859891 100644 --- a/sys/dev/raidframe/rf_revent.c +++ b/sys/dev/raidframe/rf_revent.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_revent.c,v 1.21 2005/02/27 00:27:45 perry Exp $ */ +/* $NetBSD: rf_revent.c,v 1.22 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_revent.c,v 1.21 2005/02/27 00:27:45 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_revent.c,v 1.22 2005/12/11 12:23:37 christos Exp $"); #include <sys/errno.h> diff --git a/sys/dev/raidframe/rf_revent.h b/sys/dev/raidframe/rf_revent.h index 23d8e21449d..522e8ba972b 100644 --- a/sys/dev/raidframe/rf_revent.h +++ b/sys/dev/raidframe/rf_revent.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_revent.h,v 1.9 2005/02/05 23:35:33 oster Exp $ */ +/* $NetBSD: rf_revent.h,v 1.10 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. diff --git a/sys/dev/raidframe/rf_shutdown.c b/sys/dev/raidframe/rf_shutdown.c index 0967acea1ee..29b3fdec1ab 100644 --- a/sys/dev/raidframe/rf_shutdown.c +++ b/sys/dev/raidframe/rf_shutdown.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_shutdown.c,v 1.18 2005/02/27 00:27:45 perry Exp $ */ +/* $NetBSD: rf_shutdown.c,v 1.19 2005/12/11 12:23:37 christos Exp $ */ /* * rf_shutdown.c */ @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_shutdown.c,v 1.18 2005/02/27 00:27:45 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_shutdown.c,v 1.19 2005/12/11 12:23:37 christos Exp $"); #include <dev/raidframe/raidframevar.h> diff --git a/sys/dev/raidframe/rf_shutdown.h b/sys/dev/raidframe/rf_shutdown.h index 0921952edd4..05b42010bb1 100644 --- a/sys/dev/raidframe/rf_shutdown.h +++ b/sys/dev/raidframe/rf_shutdown.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_shutdown.h,v 1.6 2005/02/27 00:27:45 perry Exp $ */ +/* $NetBSD: rf_shutdown.h,v 1.7 2005/12/11 12:23:37 christos Exp $ */ /* * rf_shutdown.h */ diff --git a/sys/dev/raidframe/rf_sstf.c b/sys/dev/raidframe/rf_sstf.c index fc4ef4eadac..374ad8acdd5 100644 --- a/sys/dev/raidframe/rf_sstf.c +++ b/sys/dev/raidframe/rf_sstf.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_sstf.c,v 1.12 2005/02/27 00:27:45 perry Exp $ */ +/* $NetBSD: rf_sstf.c,v 1.13 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -33,7 +33,7 @@ ******************************************************************************/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_sstf.c,v 1.12 2005/02/27 00:27:45 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_sstf.c,v 1.13 2005/12/11 12:23:37 christos Exp $"); #include <dev/raidframe/raidframevar.h> diff --git a/sys/dev/raidframe/rf_sstf.h b/sys/dev/raidframe/rf_sstf.h index a3ac53fb158..ae890a2bac6 100644 --- a/sys/dev/raidframe/rf_sstf.h +++ b/sys/dev/raidframe/rf_sstf.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_sstf.h,v 1.4 2005/02/27 00:27:45 perry Exp $ */ +/* $NetBSD: rf_sstf.h,v 1.5 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. diff --git a/sys/dev/raidframe/rf_states.c b/sys/dev/raidframe/rf_states.c index 06c9c816f36..1c8739b1678 100644 --- a/sys/dev/raidframe/rf_states.c +++ b/sys/dev/raidframe/rf_states.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_states.c,v 1.39 2005/09/25 19:47:17 oster Exp $ */ +/* $NetBSD: rf_states.c,v 1.40 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_states.c,v 1.39 2005/09/25 19:47:17 oster Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_states.c,v 1.40 2005/12/11 12:23:37 christos Exp $"); #include <sys/errno.h> diff --git a/sys/dev/raidframe/rf_stripelocks.c b/sys/dev/raidframe/rf_stripelocks.c index c00e6bf96fc..663013edde8 100644 --- a/sys/dev/raidframe/rf_stripelocks.c +++ b/sys/dev/raidframe/rf_stripelocks.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_stripelocks.c,v 1.26 2005/02/27 00:27:45 perry Exp $ */ +/* $NetBSD: rf_stripelocks.c,v 1.27 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -57,7 +57,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_stripelocks.c,v 1.26 2005/02/27 00:27:45 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_stripelocks.c,v 1.27 2005/12/11 12:23:37 christos Exp $"); #include <dev/raidframe/raidframevar.h> diff --git a/sys/dev/raidframe/rf_stripelocks.h b/sys/dev/raidframe/rf_stripelocks.h index abbb18909a3..6581d093e57 100644 --- a/sys/dev/raidframe/rf_stripelocks.h +++ b/sys/dev/raidframe/rf_stripelocks.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_stripelocks.h,v 1.6 2004/03/04 02:55:58 oster Exp $ */ +/* $NetBSD: rf_stripelocks.h,v 1.7 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. diff --git a/sys/dev/raidframe/rf_threadstuff.h b/sys/dev/raidframe/rf_threadstuff.h index eb593bb93d1..1df767bba3b 100644 --- a/sys/dev/raidframe/rf_threadstuff.h +++ b/sys/dev/raidframe/rf_threadstuff.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_threadstuff.h,v 1.20 2003/12/29 06:30:42 oster Exp $ */ +/* $NetBSD: rf_threadstuff.h,v 1.21 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. diff --git a/sys/dev/raidframe/rf_utils.c b/sys/dev/raidframe/rf_utils.c index 0f5e0f9bd4b..1dc429a8b5f 100644 --- a/sys/dev/raidframe/rf_utils.c +++ b/sys/dev/raidframe/rf_utils.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_utils.c,v 1.13 2005/02/27 00:27:45 perry Exp $ */ +/* $NetBSD: rf_utils.c,v 1.14 2005/12/11 12:23:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -33,7 +33,7 @@ ****************************************/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_utils.c,v 1.13 2005/02/27 00:27:45 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_utils.c,v 1.14 2005/12/11 12:23:37 christos Exp $"); #include "rf_archs.h" #include "rf_utils.h" |
