summaryrefslogtreecommitdiff
path: root/sys/dev/raidframe
diff options
context:
space:
mode:
authoroster <oster@NetBSD.org>2002-09-17 03:21:40 +0000
committeroster <oster@NetBSD.org>2002-09-17 03:21:40 +0000
commit1b1653573f7229dcab539cd2c73f3f2b3cde2334 (patch)
treee8d3c4eb7e1494596be227ce6bb7be785828516c /sys/dev/raidframe
parentfe703e624d6036d656671187e1e84104fa08b514 (diff)
Rename RF_DEBUG_RECONBUFFER to RF_DEBUG_RECON in order to facilitate
disabling other stuff without having to introduce another #define.
Diffstat (limited to 'sys/dev/raidframe')
-rw-r--r--sys/dev/raidframe/rf_archs.h6
-rw-r--r--sys/dev/raidframe/rf_raid1.c16
-rw-r--r--sys/dev/raidframe/rf_reconstruct.c8
-rw-r--r--sys/dev/raidframe/rf_reconutil.c6
4 files changed, 18 insertions, 18 deletions
diff --git a/sys/dev/raidframe/rf_archs.h b/sys/dev/raidframe/rf_archs.h
index f77502cb7d8..a6f6ad06e40 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.15 2002/09/14 17:11:30 oster Exp $ */
+/* $NetBSD: rf_archs.h,v 1.16 2002/09/17 03:21:41 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -116,8 +116,8 @@
#define RF_DEBUG_STRIPELOCK 0
#endif
-#ifndef RF_DEBUG_RECONBUFFER
-#define RF_DEBUG_RECONBUFFER 0
+#ifndef RF_DEBUG_RECON
+#define RF_DEBUG_RECON 0
#endif
#ifndef RF_DEBUG_VERIFYPARITY
diff --git a/sys/dev/raidframe/rf_raid1.c b/sys/dev/raidframe/rf_raid1.c
index 2e01e18be2c..338a3348601 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.10 2002/09/14 17:11:30 oster Exp $ */
+/* $NetBSD: rf_raid1.c,v 1.11 2002/09/17 03:21:40 oster 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.10 2002/09/14 17:11:30 oster Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_raid1.c,v 1.11 2002/09/17 03:21:40 oster Exp $");
#include "rf_raid.h"
#include "rf_raid1.h"
@@ -581,7 +581,7 @@ rf_SubmitReconBufferRAID1(rbuf, keep_it, use_committed)
RF_ASSERT(rbuf);
RF_ASSERT(rbuf->col != reconCtrlPtr->fcol);
-#if RF_DEBUG_RECONBUFFER
+#if RF_DEBUG_RECON
if (rf_reconbufferDebug) {
printf("raid%d: RAID1 reconbuffer submission r%d c%d psid %ld ru%d (failed offset %ld)\n",
raidPtr->raidid, rbuf->row, rbuf->col,
@@ -613,7 +613,7 @@ rf_SubmitReconBufferRAID1(rbuf, keep_it, use_committed)
t = NULL;
if (keep_it) {
-#if RF_DEBUG_RECONBUFFER
+#if RF_DEBUG_RECON
if (rf_reconbufferDebug) {
printf("raid%d: RAID1 rbuf submission: keeping rbuf\n",
raidPtr->raidid);
@@ -622,7 +622,7 @@ rf_SubmitReconBufferRAID1(rbuf, keep_it, use_committed)
t = rbuf;
} else {
if (use_committed) {
-#if RF_DEBUG_RECONBUFFER
+#if RF_DEBUG_RECON
if (rf_reconbufferDebug) {
printf("raid%d: RAID1 rbuf submission: using committed rbuf\n", raidPtr->raidid);
}
@@ -633,7 +633,7 @@ rf_SubmitReconBufferRAID1(rbuf, keep_it, use_committed)
t->next = NULL;
} else
if (reconCtrlPtr->floatingRbufs) {
-#if RF_DEBUG_RECONBUFFER
+#if RF_DEBUG_RECON
if (rf_reconbufferDebug) {
printf("raid%d: RAID1 rbuf submission: using floating rbuf\n", raidPtr->raidid);
}
@@ -644,7 +644,7 @@ rf_SubmitReconBufferRAID1(rbuf, keep_it, use_committed)
}
}
if (t == NULL) {
-#if RF_DEBUG_RECONBUFFER
+#if RF_DEBUG_RECON
if (rf_reconbufferDebug) {
printf("raid%d: RAID1 rbuf submission: waiting for rbuf\n", raidPtr->raidid);
}
@@ -706,7 +706,7 @@ rf_SubmitReconBufferRAID1(rbuf, keep_it, use_committed)
out:
RF_UNLOCK_PSS_MUTEX(raidPtr, rbuf->row, rbuf->parityStripeID);
RF_UNLOCK_MUTEX(reconCtrlPtr->rb_mutex);
-#if RF_DEBUG_RECONBUFFER
+#if RF_DEBUG_RECON
if (rf_reconbufferDebug) {
printf("raid%d: RAID1 rbuf submission: returning %d\n",
raidPtr->raidid, retcode);
diff --git a/sys/dev/raidframe/rf_reconstruct.c b/sys/dev/raidframe/rf_reconstruct.c
index 0f7d5e25746..74321310694 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.39 2002/09/16 02:48:34 oster Exp $ */
+/* $NetBSD: rf_reconstruct.c,v 1.40 2002/09/17 03:21:41 oster 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.39 2002/09/16 02:48:34 oster Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_reconstruct.c,v 1.40 2002/09/17 03:21:41 oster Exp $");
#include <sys/time.h>
#include <sys/buf.h>
@@ -875,7 +875,7 @@ ProcessReconEvent(raidPtr, frow, event)
/* a write I/O has completed */
case RF_REVENT_WRITEDONE:
-#if RF_DEBUG_RECONBUFFER
+#if RF_DEBUG_RECON
if (rf_floatingRbufDebug) {
rf_CheckFloatingRbufCount(raidPtr, 1);
}
@@ -928,7 +928,7 @@ ProcessReconEvent(raidPtr, frow, event)
case RF_REVENT_BUFREADY:
Dprintf2("RECON: BUFREADY EVENT: row %d col %d\n", frow, event->col);
retcode = IssueNextWriteRequest(raidPtr, frow);
-#if RF_DEBUG_RECONBUFFER
+#if RF_DEBUG_RECON
if (rf_floatingRbufDebug) {
rf_CheckFloatingRbufCount(raidPtr, 1);
}
diff --git a/sys/dev/raidframe/rf_reconutil.c b/sys/dev/raidframe/rf_reconutil.c
index 2c6dbb520ab..20160ef3601 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.9 2002/09/16 23:37:18 oster Exp $ */
+/* $NetBSD: rf_reconutil.c,v 1.10 2002/09/17 03:21:41 oster 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.9 2002/09/16 23:37:18 oster Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_reconutil.c,v 1.10 2002/09/17 03:21:41 oster Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -265,7 +265,7 @@ rf_FreeReconBuffer(rbuf)
RF_Free(rbuf, sizeof(*rbuf));
}
-#if RF_DEBUG_RECONBUFFER
+#if RF_DEBUG_RECON
/******************************************************************************
* debug only: sanity check the number of floating recon bufs in use
*****************************************************************************/