[src/trunk]: src/sys/dev/raidframe Nuke unlockingOp -- it was only used for t...

[oster <oster%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/02e40dbf5c25
branches:  trunk
changeset: 536431:02e40dbf5c25
user:      oster <oster%NetBSD.org@localhost>
date:      Sun Sep 15 21:34:03 2002 +0000

description:
Nuke unlockingOp -- it was only used for the userland version of the
code.

diffstat:

 sys/dev/raidframe/rf_diskqueue.c |  7 +++----
 sys/dev/raidframe/rf_diskqueue.h |  6 +-----
 2 files changed, 4 insertions(+), 9 deletions(-)

diffs (55 lines):

diff -r 8c9c1d99b42a -r 02e40dbf5c25 sys/dev/raidframe/rf_diskqueue.c
--- a/sys/dev/raidframe/rf_diskqueue.c  Sun Sep 15 21:31:11 2002 +0000
+++ b/sys/dev/raidframe/rf_diskqueue.c  Sun Sep 15 21:34:03 2002 +0000
@@ -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 @@
        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 @@
         * 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 -r 8c9c1d99b42a -r 02e40dbf5c25 sys/dev/raidframe/rf_diskqueue.h
--- a/sys/dev/raidframe/rf_diskqueue.h  Sun Sep 15 21:31:11 2002 +0000
+++ b/sys/dev/raidframe/rf_diskqueue.h  Sun Sep 15 21:34:03 2002 +0000
@@ -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 @@
                                                 * 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 */