Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Nuke unlockingOp -- it was only used for the userland version of the

Browse Source 
code.
This commit is contained in:
oster 2002-09-15 21:34:03 +00:00
parent 7193ba8687
commit 201928d9fa
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/dev/raidframe/rf_diskqueue.c
View File

@ -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. * Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved. * All rights reserved.
@ -66,7 +66,7 @@
****************************************************************************/ ****************************************************************************/
#include <sys/cdefs.h> #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> #include <dev/raidframe/raidframevar.h>
@ -197,7 +197,6 @@ rf_ConfigureDiskQueue(
diskqueue->maxOutstanding = maxOutstanding; diskqueue->maxOutstanding = maxOutstanding;
diskqueue->curPriority = RF_IO_NORMAL_PRIORITY; diskqueue->curPriority = RF_IO_NORMAL_PRIORITY;
diskqueue->nextLockingOp = NULL; diskqueue->nextLockingOp = NULL;
diskqueue->unlockingOp = NULL;
diskqueue->numWaiting = 0; diskqueue->numWaiting = 0;
diskqueue->flags = 0; diskqueue->flags = 0;
diskqueue->raidPtr = raidPtr; diskqueue->raidPtr = raidPtr;
@ -405,7 +404,7 @@ rf_DiskIOComplete(queue, req, status)
* locking req fails */ * locking req fails */
if (RF_UNLOCKING_REQ(req) || (RF_LOCKING_REQ(req) && status)) { if (RF_UNLOCKING_REQ(req) || (RF_LOCKING_REQ(req) && status)) {
Dprintf2("DiskIOComplete: unlocking queue at r %d c %d\n", queue->row, queue->col); 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); RF_UNLOCK_QUEUE(queue);
} }
queue->numOutstanding--; queue->numOutstanding--;

6
sys/dev/raidframe/rf_diskqueue.h
View File

@ -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. * Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved. * All rights reserved.
@ -114,10 +114,6 @@ struct RF_DiskQueue_s {
* arrived at the head of the * arrived at the head of the
* queue & is waiting for * queue & is waiting for
* drainage */ * 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. int numWaiting; /* number of threads waiting on this variable.
* user-level only */ * user-level only */
RF_DiskQueueFlags_t flags; /* terminate, locked */ RF_DiskQueueFlags_t flags; /* terminate, locked */