From 3ac36660fa2a528ca6699b9962ff5b40b0dc6170 Mon Sep 17 00:00:00 2001 From: oster Date: Mon, 23 Sep 2002 03:38:51 +0000 Subject: Another 'unblockNode' goes *poof*. Also nuke an instance of an (effectively) unused layoutPtr. Thanks to Simon B. --- sys/dev/raidframe/rf_raid1.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'sys/dev/raidframe') diff --git a/sys/dev/raidframe/rf_raid1.c b/sys/dev/raidframe/rf_raid1.c index 54eca0ed6dd..902c9c97bf9 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.12 2002/09/23 02:40:09 oster Exp $ */ +/* $NetBSD: rf_raid1.c,v 1.13 2002/09/23 03:38:51 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -33,7 +33,7 @@ *****************************************************************************/ #include -__KERNEL_RCSID(0, "$NetBSD: rf_raid1.c,v 1.12 2002/09/23 02:40:09 oster Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_raid1.c,v 1.13 2002/09/23 03:38:51 oster Exp $"); #include "rf_raid.h" #include "rf_raid1.h" @@ -280,7 +280,7 @@ rf_VerifyParityRAID1( RF_RaidAccessFlags_t flags) { int nbytes, bcount, stripeWidth, ret, i, j, nbad, *bbufs; - RF_DagNode_t *blockNode, *unblockNode, *wrBlock; + RF_DagNode_t *blockNode, *wrBlock; RF_DagHeader_t *rd_dag_h, *wr_dag_h; RF_AccessStripeMapHeader_t *asm_h; RF_AllocListElem_t *allocList; @@ -337,7 +337,6 @@ rf_VerifyParityRAID1( if (rd_dag_h == NULL) goto done; blockNode = rd_dag_h->succedents[0]; - unblockNode = blockNode->succedents[0]->succedents[0]; /* * Map the access to physical disk addresses (PDAs)- this will @@ -563,7 +562,6 @@ rf_SubmitReconBufferRAID1(rbuf, keep_it, use_committed) { RF_ReconParityStripeStatus_t *pssPtr; RF_ReconCtrl_t *reconCtrlPtr; - RF_RaidLayout_t *layoutPtr; int retcode, created; RF_CallbackDesc_t *cb, *p; RF_ReconBuffer_t *t; @@ -574,7 +572,6 @@ rf_SubmitReconBufferRAID1(rbuf, keep_it, use_committed) created = 0; raidPtr = rbuf->raidPtr; - layoutPtr = &raidPtr->Layout; reconCtrlPtr = raidPtr->reconControl[rbuf->row]; RF_ASSERT(rbuf); -- cgit