From 181f2eebeee0dab822bf0490b5223f0a35bf8b95 Mon Sep 17 00:00:00 2001 From: oster Date: Mon, 5 Jan 2004 01:19:07 +0000 Subject: remove terminate_disk_queues from RF_Raid_s. The hist_diskreq[] stuff is only used for the CHAINDECLUSTERING, so hide it with an #if. --- sys/dev/raidframe/rf_driver.c | 7 ++++--- sys/dev/raidframe/rf_raid.h | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'sys/dev/raidframe') diff --git a/sys/dev/raidframe/rf_driver.c b/sys/dev/raidframe/rf_driver.c index 14a32a7b10f..1b698cab561 100644 --- a/sys/dev/raidframe/rf_driver.c +++ b/sys/dev/raidframe/rf_driver.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_driver.c,v 1.81 2004/01/01 19:27:36 oster Exp $ */ +/* $NetBSD: rf_driver.c,v 1.82 2004/01/05 01:19:07 oster Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. * All rights reserved. @@ -73,7 +73,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: rf_driver.c,v 1.81 2004/01/01 19:27:36 oster Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_driver.c,v 1.82 2004/01/05 01:19:07 oster Exp $"); #include "opt_raid_diagnostic.h" @@ -377,13 +377,14 @@ rf_Configure(RF_Raid_t *raidPtr, RF_Config_t *cfgPtr, RF_AutoConfig_t *ac) DO_RAID_INIT_CONFIGURE(rf_ConfigurePSStatus); +#if RF_INCLUDE_CHAINDECLUSTER > 0 for (col = 0; col < raidPtr->numCol; col++) { /* * XXX better distribution */ raidPtr->hist_diskreq[col] = 0; } - +#endif raidPtr->numNewFailures = 0; raidPtr->copyback_in_progress = 0; raidPtr->parity_rewrite_in_progress = 0; diff --git a/sys/dev/raidframe/rf_raid.h b/sys/dev/raidframe/rf_raid.h index 3396e7431d2..da717874c32 100644 --- a/sys/dev/raidframe/rf_raid.h +++ b/sys/dev/raidframe/rf_raid.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_raid.h,v 1.23 2004/01/01 19:27:36 oster Exp $ */ +/* $NetBSD: rf_raid.h,v 1.24 2004/01/05 01:19:07 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -264,10 +264,11 @@ struct RF_Raid_s { * somewhere else, or at least hung off this * in some generic way */ +#if RF_INCLUDE_CHAINDECLUSTER > 0 /* used by rf_compute_workload_shift */ RF_RowCol_t hist_diskreq[RF_MAXCOL]; - +#endif /* used by declustering */ int noRotate; -- cgit