summaryrefslogtreecommitdiff
path: root/sys/dev/raidframe
diff options
context:
space:
mode:
authoroster <oster@NetBSD.org>2002-11-16 16:49:46 +0000
committeroster <oster@NetBSD.org>2002-11-16 16:49:46 +0000
commitc00752f98a3b53afa6fed53dfcab48074b736372 (patch)
treebf27c49b58f7e42ba7d332f55b8847da340d6222 /sys/dev/raidframe
parentff4dc2f86d339e5cd217feace2e300036e5506a0 (diff)
Clean up error reporting, and nuke some printf verbosity.
Diffstat (limited to 'sys/dev/raidframe')
-rw-r--r--sys/dev/raidframe/rf_copyback.c27
1 files changed, 16 insertions, 11 deletions
diff --git a/sys/dev/raidframe/rf_copyback.c b/sys/dev/raidframe/rf_copyback.c
index 1827e4e4ead..7e7cdcefcef 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.21 2002/11/15 03:57:48 oster Exp $ */
+/* $NetBSD: rf_copyback.c,v 1.22 2002/11/16 16:49:46 oster 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.21 2002/11/15 03:57:48 oster Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_copyback.c,v 1.22 2002/11/16 16:49:46 oster Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -118,7 +118,7 @@ rf_CopybackReconstructedData(raidPtr)
}
if (frow == raidPtr->numRow) {
- printf("COPYBACK: no disks need copyback\n");
+ printf("raid%d: no disks need copyback\n", raidPtr->raidid);
return;
}
badDisk = &raidPtr->Disks[frow][fcol];
@@ -146,8 +146,9 @@ rf_CopybackReconstructedData(raidPtr)
retcode = raidlookup(raidPtr->Disks[frow][fcol].devname, proc, &vp);
if (retcode) {
- printf("COPYBACK: raidlookup on device: %s failed: %d!\n",
- raidPtr->Disks[frow][fcol].devname, retcode);
+ printf("raid%d: copyback: raidlookup on device: %s failed: %d!\n",
+ raidPtr->raidid, raidPtr->Disks[frow][fcol].devname,
+ retcode);
/* XXX the component isn't responding properly... must be
* still dead :-( */
@@ -185,7 +186,8 @@ rf_CopybackReconstructedData(raidPtr)
}
if (retcode) {
- printf("COPYBACK: target disk failed TUR\n");
+ printf("raid%d: copyback: target disk failed TUR\n",
+ raidPtr->raidid);
return;
}
/* get a buffer to hold one SU */
@@ -205,7 +207,6 @@ rf_CopybackReconstructedData(raidPtr)
desc->databuf = databuf;
desc->mcpair = rf_AllocMCPair();
- printf("COPYBACK: Quiescing the array\n");
/* quiesce the array, since we don't want to code support for user
* accs here */
rf_SuspendNewRequestsAndWait(raidPtr);
@@ -217,7 +218,6 @@ rf_CopybackReconstructedData(raidPtr)
rf_copyback_in_progress = 1; /* debug only */
RF_UNLOCK_MUTEX(raidPtr->mutex);
- printf("COPYBACK: Beginning\n");
RF_GETTIME(desc->starttime);
rf_ContinueCopyback(desc);
@@ -386,7 +386,8 @@ rf_CopybackReadDoneProc(desc, status)
int status;
{
if (status) { /* invoke the callback with bad status */
- printf("COPYBACK: copyback read failed. Aborting.\n");
+ printf("raid%d: copyback read failed. Aborting.\n",
+ desc->raidPtr->raidid);
(desc->writereq->CompleteFunc) (desc, -100);
} else {
rf_DiskIOEnqueue(&(desc->raidPtr->Queues[desc->frow][desc->fcol]), desc->writereq, RF_IO_NORMAL_PRIORITY);
@@ -404,7 +405,8 @@ rf_CopybackWriteDoneProc(desc, status)
int status;
{
if (status && status != -100) {
- printf("COPYBACK: copyback write failed. Aborting.\n");
+ printf("raid%d: copyback write failed. Aborting.\n",
+ desc->raidPtr->raidid);
}
desc->status = status;
rf_MCPairWakeupFunc(desc->mcpair);
@@ -431,10 +433,13 @@ rf_CopybackComplete(desc, status)
RF_GETTIME(t);
RF_TIMEVAL_DIFF(&desc->starttime, &t, &diff);
+#if 0
printf("Copyback time was %d.%06d seconds\n",
(int) diff.tv_sec, (int) diff.tv_usec);
+#endif
} else
- printf("COPYBACK: Failure.\n");
+ printf("raid%d: Copyback failure. Status: %d\n",
+ raidPtr->raidid, status);
RF_Free(desc->databuf, rf_RaidAddressToByte(raidPtr, desc->sectPerSU));
rf_FreeMCPair(desc->mcpair);