diff options
| author | oster <oster@NetBSD.org> | 2002-09-07 23:11:46 +0000 |
|---|---|---|
| committer | oster <oster@NetBSD.org> | 2002-09-07 23:11:46 +0000 |
| commit | b07b6381d5a230fe3f93b2d958beef1e8853663a (patch) | |
| tree | 035b91052ce4f38e73e5598896f02e652d03f639 /sys/dev/raidframe | |
| parent | 29db5af4a587698e0619d86d406550a70124a4df (diff) | |
Protect rf_PrintDAGList() in a few more places. Thanks to Monroe Williams
on current-users for the patch.
Diffstat (limited to 'sys/dev/raidframe')
| -rw-r--r-- | sys/dev/raidframe/rf_evenodd.c | 10 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_paritylogDiskMgr.c | 6 |
2 files changed, 12 insertions, 4 deletions
diff --git a/sys/dev/raidframe/rf_evenodd.c b/sys/dev/raidframe/rf_evenodd.c index 73a046c4b14..97026a766f3 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.7 2001/11/13 07:11:14 lukem Exp $ */ +/* $NetBSD: rf_evenodd.c,v 1.8 2002/09/07 23:11:46 oster 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.7 2001/11/13 07:11:14 lukem Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_evenodd.c,v 1.8 2002/09/07 23:11:46 oster Exp $"); #include "rf_archs.h" @@ -433,10 +433,12 @@ rf_VerifyParityEvenOdd(raidPtr, raidAddr, parityPDA, correct_it, flags) memset((char *) &tracerec, 0, sizeof(tracerec)); rd_dag_h->tracerec = &tracerec; +#if RF_DEBUG_VALIDATE_DAG if (rf_verifyParityDebug) { printf("Parity verify read dag:\n"); rf_PrintDAGList(rd_dag_h); } +#endif RF_LOCK_MUTEX(mcpair->mutex); mcpair->flag = 0; rf_DispatchDAG(rd_dag_h, (void (*) (void *)) rf_MCPairWakeupFunc, @@ -493,10 +495,12 @@ rf_VerifyParityEvenOdd(raidPtr, raidAddr, parityPDA, correct_it, flags) wrBlock->succedents[0]->params[3].v = RF_CREATE_PARAM3(RF_IO_NORMAL_PRIORITY, 0, 0, which_ru); memset((char *) &tracerec, 0, sizeof(tracerec)); wr_dag_h->tracerec = &tracerec; +#if RF_DEBUG_VALIDATE_DAG if (rf_verifyParityDebug) { printf("Parity verify write dag:\n"); rf_PrintDAGList(wr_dag_h); } +#endif RF_LOCK_MUTEX(mcpair->mutex); mcpair->flag = 0; rf_DispatchDAG(wr_dag_h, (void (*) (void *)) rf_MCPairWakeupFunc, @@ -522,10 +526,12 @@ rf_VerifyParityEvenOdd(raidPtr, raidAddr, parityPDA, correct_it, flags) wrBlock->succedents[0]->params[3].v = RF_CREATE_PARAM3(RF_IO_NORMAL_PRIORITY, 0, 0, which_ru); memset((char *) &tracerec, 0, sizeof(tracerec)); wr_dag_h->tracerec = &tracerec; +#if RF_DEBUG_VALIDATE_DAG if (rf_verifyParityDebug) { printf("Dag of write new second redundant information in parity verify :\n"); rf_PrintDAGList(wr_dag_h); } +#endif RF_LOCK_MUTEX(mcpair->mutex); mcpair->flag = 0; rf_DispatchDAG(wr_dag_h, (void (*) (void *)) rf_MCPairWakeupFunc, diff --git a/sys/dev/raidframe/rf_paritylogDiskMgr.c b/sys/dev/raidframe/rf_paritylogDiskMgr.c index ca07d4ec07e..d7c7c5bf793 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.13 2001/11/13 07:11:15 lukem Exp $ */ +/* $NetBSD: rf_paritylogDiskMgr.c,v 1.14 2002/09/07 23:11:46 oster 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.13 2001/11/13 07:11:15 lukem Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_paritylogDiskMgr.c,v 1.14 2002/09/07 23:11:46 oster Exp $"); #include "rf_archs.h" @@ -262,8 +262,10 @@ ReadRegionParity( prd_rdNode->params[2].v = 0; prd_rdNode->params[3].v = RF_CREATE_PARAM3(RF_IO_NORMAL_PRIORITY, 0, 0, 0); +#if RF_DEBUG_VALIDATE_DAG if (rf_validateDAGDebug) rf_ValidateDAG(*prd_dag_h); +#endif /* launch region parity read dag */ rf_DispatchDAG(*prd_dag_h, (void (*) (void *)) rf_MCPairWakeupFunc, (void *) prd_mcpair); |
