From b51d271e170c97587803100c0a3dc6ad955fc283 Mon Sep 17 00:00:00 2001 From: oster Date: Sun, 15 Sep 2002 19:25:07 +0000 Subject: Nuke 'numPending' from the RF_RaidAccessDesc_s structure, and minor cleanup. --- sys/dev/raidframe/rf_desc.h | 9 +++------ sys/dev/raidframe/rf_driver.c | 5 ++--- 2 files changed, 5 insertions(+), 9 deletions(-) (limited to 'sys/dev/raidframe') diff --git a/sys/dev/raidframe/rf_desc.h b/sys/dev/raidframe/rf_desc.h index 11ac1b7d87a..84b3f220945 100644 --- a/sys/dev/raidframe/rf_desc.h +++ b/sys/dev/raidframe/rf_desc.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_desc.h,v 1.6 2001/10/04 15:58:52 oster Exp $ */ +/* $NetBSD: rf_desc.h,v 1.7 2002/09/15 19:25:07 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -101,11 +101,8 @@ struct RF_RaidAccessDesc_s { RF_RaidAccessDesc_t *next; RF_RaidAccessDesc_t *head; - int numPending; - - RF_DECLARE_MUTEX(mutex) /* these are used to implement - * blocking I/O */ - RF_DECLARE_COND(cond) + RF_DECLARE_MUTEX(mutex) /* these are used to implement blocking I/O */ + RF_DECLARE_COND(cond) int async_flag; RF_Etimer_t timer; /* used for timing this access */ diff --git a/sys/dev/raidframe/rf_driver.c b/sys/dev/raidframe/rf_driver.c index f9da3cc5fd3..cabc0870bc7 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.58 2002/09/14 17:53:58 oster Exp $ */ +/* $NetBSD: rf_driver.c,v 1.59 2002/09/15 19:25: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.58 2002/09/14 17:53:58 oster Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_driver.c,v 1.59 2002/09/15 19:25:07 oster Exp $"); #include #include @@ -604,7 +604,6 @@ rf_AllocRaidAccDesc( desc->callbackArg = NULL; desc->next = NULL; desc->head = desc; - desc->numPending = 0; desc->cleanupList = NULL; rf_MakeAllocList(desc->cleanupList); return (desc); -- cgit