 @@ -1,14 +1,14 @@
-/*	$NetBSD: rf_acctrace.c,v 1.23 2006/11/16 01:33:23 christos Exp $	*/
+/*	$NetBSD: rf_acctrace.c,v 1.24 2011/05/01 06:22:54 mrg Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
+ *
  * Author: Mark Holland
+ *
  * Permission to use, copy, modify and distribute this software and
  * its documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
 @@ -24,51 +24,58 @@
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */
 /*****************************************************************************
+ *
  * acctrace.c -- code to support collecting information about each access
+ *
  *****************************************************************************/
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_acctrace.c,v 1.23 2006/11/16 01:33:23 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_acctrace.c,v 1.24 2011/05/01 06:22:54 mrg Exp $");
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <dev/raidframe/raidframevar.h>
 #include "rf_threadstuff.h"
 #include "rf_debugMem.h"
 #include "rf_acctrace.h"
 #include "rf_general.h"
 #include "rf_raid.h"
 #include "rf_etimer.h"
 #include "rf_hist.h"
 #include "rf_shutdown.h"
 #if RF_ACC_TRACE > 0
 static long numTracesSoFar;
-RF_DECLARE_MUTEX(rf_tracing_mutex)
+rf_declare_mutex2(rf_tracing_mutex);
 static void
 rf_ShutdownAccessTrace(void *unused)
+{
 	rf_destroy_mutex2(rf_tracing_mutex);
+}
 int
 rf_ConfigureAccessTrace(RF_ShutdownList_t **listp)
+{
 	numTracesSoFar = 0;
-	rf_mutex_init(&rf_tracing_mutex);
+	rf_init_mutex2(rf_tracing_mutex, IPL_VM);
 	rf_ShutdownCreate(listp, rf_ShutdownAccessTrace, NULL);
 	return (0);
+}
 /* install a trace record.  cause a flush to disk or to the trace
  * collector daemon if the trace buffer is at least 1/2 full.
  */
 void
 rf_LogTraceRec(RF_Raid_t *raid, RF_AccTraceEntry_t *rec)
+{
 	RF_AccTotals_t *acc = &raid->acc_totals;
 	if (((rf_maxNumTraces >= 0) && (numTracesSoFar >= rf_maxNumTraces)))
 		return;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rf_acctrace.h,v 1.9 2011/04/27 07:55:14 mrg Exp $	*/
+/*	$NetBSD: rf_acctrace.h,v 1.10 2011/05/01 06:22:54 mrg Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
+ *
  * Author: Mark Holland
+ *
  * Permission to use, copy, modify and distribute this software and
  * its documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
 @@ -113,20 +113,20 @@ typedef struct RF_AccTotals_s {
 	RF_uint64 diskqueue_us;
 	RF_uint64 diskwait_us;
 	RF_uint64 total_us;
 	RF_uint64 num_log_ents;
 	RF_uint64 phys_io_overflow_count;
 	RF_uint64 num_phys_ios;
 	RF_uint64 phys_io_us;
 	RF_uint64 bigvals;
 	/* histograms */
 	RF_Hist_t dw_hist[RF_HIST_NUM_BUCKETS];
 	RF_Hist_t tot_hist[RF_HIST_NUM_BUCKETS];
 }       RF_AccTotals_t;
-extern RF_DECLARE_MUTEX(rf_tracing_mutex);
+extern rf_declare_mutex2(rf_tracing_mutex);
 int     rf_ConfigureAccessTrace(RF_ShutdownList_t ** listp);
 void    rf_LogTraceRec(RF_Raid_t * raid, RF_AccTraceEntry_t * rec);
 #endif				/* !_RF__RF_ACCTRACE_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rf_netbsdkintf.c,v 1.287 2011/05/01 05:44:47 mrg Exp $	*/
+/*	$NetBSD: rf_netbsdkintf.c,v 1.288 2011/05/01 06:22:54 mrg Exp $	*/
 /*-
  * Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Greg Oster; Jason R. Thorpe.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -91,27 +91,27 @@
  *  Pittsburgh PA 15213-3890
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */
 /***********************************************************
+ *
  * rf_kintf.c -- the kernel interface routines for RAIDframe
+ *
  ***********************************************************/
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.287 2011/05/01 05:44:47 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.288 2011/05/01 06:22:54 mrg Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
 #include "opt_raid_autoconfig.h"
 #include "raid.h"
 #endif
 #include <sys/param.h>
 #include <sys/errno.h>
 #include <sys/pool.h>
 #include <sys/proc.h>
 #include <sys/queue.h>
 #include <sys/disk.h>
 @@ -2165,31 +2165,31 @@ KernelWakeupFunc(struct buf *bp)
 	db1_printf(("recovering the request queue:\n"));
 	req = bp->b_private;
 	queue = (RF_DiskQueue_t *) req->queue;
 	rf_lock_mutex2(queue->raidPtr->iodone_lock);
 #if RF_ACC_TRACE > 0
 	if (req->tracerec) {
 		RF_ETIMER_STOP(req->tracerec->timer);
 		RF_ETIMER_EVAL(req->tracerec->timer);
-		RF_LOCK_MUTEX(rf_tracing_mutex);
+		rf_lock_mutex2(rf_tracing_mutex);
 		req->tracerec->diskwait_us += RF_ETIMER_VAL_US(req->tracerec->timer);
 		req->tracerec->phys_io_us += RF_ETIMER_VAL_US(req->tracerec->timer);
 		req->tracerec->num_phys_ios++;
-		RF_UNLOCK_MUTEX(rf_tracing_mutex);
+		rf_unlock_mutex2(rf_tracing_mutex);
+	}
 #endif
 	/* XXX Ok, let's get aggressive... If b_error is set, let's go
 	 * ballistic, and mark the component as hosed... */
 	if (bp->b_error != 0) {
 		/* Mark the disk as dead */
 		/* but only mark it once... */
 		/* and only if it wouldn't leave this RAID set
 		   completely broken */
 		if (((queue->raidPtr->Disks[queue->col].status ==
 		      rf_ds_optimal) ||