From 35d7c1ee7e1e482a59ae9c829e6cac7687c93a56 Mon Sep 17 00:00:00 2001 From: oster Date: Fri, 9 Jan 2004 23:26:17 +0000 Subject: [PATCH] Cleanup rf_enableAtomicRMW and its use. According to the comments, we can't set this to anything other than zero anyway. Shaves off another 900 bytes. lu_flag's days are numbered now, as are the middle parameters of RF_CREATE_PARAM3. --- sys/dev/raidframe/rf_dagffwr.c | 6 +++--- sys/dev/raidframe/rf_optnames.h | 7 +------ 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/sys/dev/raidframe/rf_dagffwr.c b/sys/dev/raidframe/rf_dagffwr.c index b114a5e4cefb..f1876179983c 100644 --- a/sys/dev/raidframe/rf_dagffwr.c +++ b/sys/dev/raidframe/rf_dagffwr.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_dagffwr.c,v 1.14 2004/01/06 03:27:13 oster Exp $ */ +/* $NetBSD: rf_dagffwr.c,v 1.15 2004/01/09 23:26:17 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: rf_dagffwr.c,v 1.14 2004/01/06 03:27:13 oster Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_dagffwr.c,v 1.15 2004/01/09 23:26:17 oster Exp $"); #include @@ -491,7 +491,7 @@ rf_CommonCreateSmallWriteDAG(RF_Raid_t *raidPtr, RF_AccessStripeMap_t *asmap, long nfaults; nfaults = qfuncs ? 2 : 1; - lu_flag = (rf_enableAtomicRMW) ? 1 : 0; /* lock/unlock flag */ + lu_flag = 0; /* lock/unlock flag */ parityStripeID = rf_RaidAddressToParityStripeID(&(raidPtr->Layout), asmap->raidAddress, &which_ru); diff --git a/sys/dev/raidframe/rf_optnames.h b/sys/dev/raidframe/rf_optnames.h index 8fdaee4c4190..61e8b0f08032 100644 --- a/sys/dev/raidframe/rf_optnames.h +++ b/sys/dev/raidframe/rf_optnames.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_optnames.h,v 1.9 2003/12/31 22:25:38 oster Exp $ */ +/* $NetBSD: rf_optnames.h,v 1.10 2004/01/09 23:26:17 oster Exp $ */ /* * rf_optnames.h */ @@ -38,11 +38,6 @@ RF_DBG_OPTION(cscanDebug, 0) /* debug CSCAN sorting */ RF_DBG_OPTION(dagDebug, 0) RF_DBG_OPTION(degDagDebug, 0) RF_DBG_OPTION(diskDebug, 0) -RF_DBG_OPTION(enableAtomicRMW, 0) /* this debug var enables locking of - * the disk arm during small-write - * operations. Setting this variable - * to anything other than 0 will - * result in deadlock. (wvcii) */ RF_DBG_OPTION(engineDebug, 0) RF_DBG_OPTION(fifoDebug, 0) /* debug fifo queueing */ RF_DBG_OPTION(floatingRbufDebug, 0)