diff options
| author | oster <oster@NetBSD.org> | 2002-09-15 21:34:03 +0000 |
|---|---|---|
| committer | oster <oster@NetBSD.org> | 2002-09-15 21:34:03 +0000 |
| commit | 201928d9fa09f830e3c2b6a267fbbb7de17a4ede (patch) | |
| tree | cfe8de326dd43b5837fc97be537905aa9f7f8cda /sys | |
| parent | 7193ba8687c79e08397153f8f91ee2e2cc1a7e87 (diff) | |
Nuke unlockingOp -- it was only used for the userland version of the
code.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/raidframe/rf_diskqueue.c | 7 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_diskqueue.h | 6 |
2 files changed, 4 insertions, 9 deletions
diff --git a/sys/dev/raidframe/rf_diskqueue.c b/sys/dev/raidframe/rf_diskqueue.c index c87b56a905e..2093a16ff4a 100644 --- a/sys/dev/raidframe/rf_diskqueue.c +++ b/sys/dev/raidframe/rf_diskqueue.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_diskqueue.c,v 1.19 2002/09/15 21:19:50 oster Exp $ */ +/* $NetBSD: rf_diskqueue.c,v 1.20 2002/09/15 21:34:03 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -66,7 +66,7 @@ ****************************************************************************/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_diskqueue.c,v 1.19 2002/09/15 21:19:50 oster Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_diskqueue.c,v 1.20 2002/09/15 21:34:03 oster Exp $"); #include <dev/raidframe/raidframevar.h> @@ -197,7 +197,6 @@ rf_ConfigureDiskQueue( diskqueue->maxOutstanding = maxOutstanding; diskqueue->curPriority = RF_IO_NORMAL_PRIORITY; diskqueue->nextLockingOp = NULL; - diskqueue->unlockingOp = NULL; diskqueue->numWaiting = 0; diskqueue->flags = 0; diskqueue->raidPtr = raidPtr; @@ -405,7 +404,7 @@ rf_DiskIOComplete(queue, req, status) * locking req fails */ if (RF_UNLOCKING_REQ(req) || (RF_LOCKING_REQ(req) && status)) { Dprintf2("DiskIOComplete: unlocking queue at r %d c %d\n", queue->row, queue->col); - RF_ASSERT(RF_QUEUE_LOCKED(queue) && (queue->unlockingOp == NULL)); + RF_ASSERT(RF_QUEUE_LOCKED(queue)); RF_UNLOCK_QUEUE(queue); } queue->numOutstanding--; diff --git a/sys/dev/raidframe/rf_diskqueue.h b/sys/dev/raidframe/rf_diskqueue.h index 47b7d36522c..d568a8f9d1b 100644 --- a/sys/dev/raidframe/rf_diskqueue.h +++ b/sys/dev/raidframe/rf_diskqueue.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_diskqueue.h,v 1.9 2002/09/15 21:31:11 oster Exp $ */ +/* $NetBSD: rf_diskqueue.h,v 1.10 2002/09/15 21:34:03 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -114,10 +114,6 @@ struct RF_DiskQueue_s { * arrived at the head of the * queue & is waiting for * drainage */ - RF_DiskQueueData_t *unlockingOp; /* used at user level to - * communicate unlocking op - * b/w user (or dag exec) & - * disk threads */ int numWaiting; /* number of threads waiting on this variable. * user-level only */ RF_DiskQueueFlags_t flags; /* terminate, locked */ |
