Module Name: src Committed By: riz Date: Fri Nov 22 18:55:42 UTC 2013
Modified Files: src/sys/dev/raidframe: rf_evenodd_dagfuncs.c Log Message: Move two RF_ASSERT()s into the protection of RAID_DIAGNOSTIC to avoid a case where we get undeclared variables. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/dev/raidframe/rf_evenodd_dagfuncs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/raidframe/rf_evenodd_dagfuncs.c diff -u src/sys/dev/raidframe/rf_evenodd_dagfuncs.c:1.20 src/sys/dev/raidframe/rf_evenodd_dagfuncs.c:1.21 --- src/sys/dev/raidframe/rf_evenodd_dagfuncs.c:1.20 Sat Mar 14 15:36:20 2009 +++ src/sys/dev/raidframe/rf_evenodd_dagfuncs.c Fri Nov 22 18:55:42 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: rf_evenodd_dagfuncs.c,v 1.20 2009/03/14 15:36:20 dsl Exp $ */ +/* $NetBSD: rf_evenodd_dagfuncs.c,v 1.21 2013/11/22 18:55:42 riz Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_evenodd_dagfuncs.c,v 1.20 2009/03/14 15:36:20 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_evenodd_dagfuncs.c,v 1.21 2013/11/22 18:55:42 riz Exp $"); #include "rf_archs.h" @@ -114,10 +114,10 @@ rf_RegularONEFunc(RF_DagNode_t *node) RF_PhysDiskAddr_t *EPDA = (RF_PhysDiskAddr_t *) node->params[EpdaIndex].p; int ESUOffset = rf_StripeUnitOffset(layoutPtr, EPDA->startSector); -#endif /* RAID_DIAGNOSTIC */ RF_ASSERT(EPDA->type == RF_PDA_TYPE_Q); RF_ASSERT(ESUOffset == 0); +#endif /* RAID_DIAGNOSTIC */ RF_ETIMER_START(timer);