Remove custom queue macros in Coda, replacing them with queue(9) tailq

macros.  The only semantic change was the need to add a vc_opened field
to struct vcomm since we can no longer use the request queue returning
to an uninitialized state to hold whether or not the device is open.

MFC after:	1 month

4 files changed, 30 insertions, 105 deletions

diff --git a/sys/fs/coda/TODO b/sys/fs/coda/TODO
index 7c4799c..390e691 100644
--- a/sys/fs/coda/TODO
+++ b/sys/fs/coda/TODO
@@ -12,7 +12,4 @@ Medium term:
 	Do performance profile.
 	Tune hash algorithm used in cfs_subr.
 
-Eventually:
-	Use standard queue macros.
-
 $FreeBSD$
diff --git a/sys/fs/coda/cnode.h b/sys/fs/coda/cnode.h
index 85a4bec..bd508e2 100644
--- a/sys/fs/coda/cnode.h
+++ b/sys/fs/coda/cnode.h
@@ -53,11 +53,6 @@
 MALLOC_DECLARE(M_CODA);
 
 /*
- * tmp below since we need struct queue.
- */
-#include <fs/coda/coda_kernel.h>
-
-/*
  * Cnode lookup stuff.
  *
  * NOTE: CODA_CACHESIZE must be a power of 2 for cfshash to work!
@@ -128,15 +123,16 @@ struct cnode {
 #define	IS_UNMOUNTING(cp)	((cp)->c_flags & C_UNMOUNTING)
 
 struct vcomm {
-	u_long		vc_seq;
-	struct selinfo	vc_selproc;
-	struct queue	vc_requests;
-	struct queue	vc_replies;
+	u_long			vc_seq;
+	struct selinfo		vc_selproc;
+	TAILQ_HEAD(, vmsg)	vc_requests;
+	TAILQ_HEAD(, vmsg)	vc_replies;
+	int			vc_open;
 };
 
-#define	VC_OPEN(vcp)		((vcp)->vc_requests.forw != NULL)
-#define	MARK_VC_CLOSED(vcp)	(vcp)->vc_requests.forw = NULL;
-#define	MARK_VC_OPEN(vcp)	/* MT */
+#define	VC_OPEN(vcp)		((vcp)->vc_open == 1)
+#define	MARK_VC_CLOSED(vcp)	(vcp)->vc_open = 0
+#define	MARK_VC_OPEN(vcp)	(vcp)->vc_open = 1
 
 struct coda_clstat {
 	int	ncalls;			/* client requests */
diff --git a/sys/fs/coda/coda_kernel.h b/sys/fs/coda/coda_kernel.h
deleted file mode 100644
index a326063..0000000
--- a/sys/fs/coda/coda_kernel.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-
- *
- *             Coda: an Experimental Distributed File System
- *                              Release 3.1
- *
- *           Copyright (c) 1987-1998 Carnegie Mellon University
- *                          All Rights Reserved
- *
- * Permission  to  use, copy, modify and distribute this software and its
- * documentation is hereby granted,  provided  that  both  the  copyright
- * notice  and  this  permission  notice  appear  in  all  copies  of the
- * software, derivative works or  modified  versions,  and  any  portions
- * thereof, and that both notices appear in supporting documentation, and
- * that credit is given to Carnegie Mellon University  in  all  documents
- * and publicity pertaining to direct or indirect use of this code or its
- * derivatives.
- *
- * CODA IS AN EXPERIMENTAL SOFTWARE SYSTEM AND IS  KNOWN  TO  HAVE  BUGS,
- * SOME  OF  WHICH MAY HAVE SERIOUS CONSEQUENCES.  CARNEGIE MELLON ALLOWS
- * FREE USE OF THIS SOFTWARE IN ITS "AS IS" CONDITION.   CARNEGIE  MELLON
- * DISCLAIMS  ANY  LIABILITY  OF  ANY  KIND  FOR  ANY  DAMAGES WHATSOEVER
- * RESULTING DIRECTLY OR INDIRECTLY FROM THE USE OF THIS SOFTWARE  OR  OF
- * ANY DERIVATIVE WORK.
- *
- * Carnegie  Mellon  encourages  users  of  this  software  to return any
- * improvements or extensions that  they  make,  and  to  grant  Carnegie
- * Mellon the rights to redistribute these changes without encumbrance.
- *
- * 	@(#) src/sys/coda/coda_kernel.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- * $FreeBSD$
- *
- */
-
-/*
- * Macros to manipulate the queue.
- *
- * XXX: It would be good to replace this with use of queue(9) throughout the
- * Coda kernel module.
- */
-#ifndef INIT_QUEUE
-
-struct queue {
-	struct queue *forw, *back;
-};
-
-#define	INIT_QUEUE(head) do {						\
-	(head).forw = (struct queue *)&(head);				\
-	(head).back = (struct queue *)&(head);				\
-} while (0)
-
-#define	GETNEXT(head)	(head).forw
-#define	EMPTY(head)	((head).forw == &(head))
-#define	EOQ(el, head)	((struct queue *)(el) == (struct queue *)&(head))
-
-#define	INSQUE(el, head) do {						\
-	(el).forw = ((head).back)->forw;				\
-	(el).back = (head).back;					\
-	((head).back)->forw = (struct queue *)&(el);			\
-	(head).back = (struct queue *)&(el);				\
-} while (0)
-
-#define	REMQUE(el) do {							\
-	((el).forw)->back = (el).back;					\
-	(el).back->forw = (el).forw;					\
-}  while (0)
-
-#endif
diff --git a/sys/fs/coda/coda_psdev.c b/sys/fs/coda/coda_psdev.c
index 970785b..b55a5f4 100644
--- a/sys/fs/coda/coda_psdev.c
+++ b/sys/fs/coda/coda_psdev.c
@@ -96,7 +96,7 @@ int coda_pcatch = PCATCH;
 } while (0)
 
 struct vmsg {
-	struct queue	vm_chain;
+	TAILQ_ENTRY(vmsg)	vm_chain;
 	caddr_t		vm_data;
 	u_short		vm_flags;
 	u_short		vm_inSize;	/* Size is at most 5000 bytes */
@@ -123,8 +123,8 @@ vc_open(struct cdev *dev, int flag, int mode, struct thread *td)
 	if (VC_OPEN(vcp))
 		return (EBUSY);
 	bzero(&(vcp->vc_selproc), sizeof (struct selinfo));
-	INIT_QUEUE(vcp->vc_requests);
-	INIT_QUEUE(vcp->vc_replies);
+	TAILQ_INIT(&vcp->vc_requests);
+	TAILQ_INIT(&vcp->vc_replies);
 	MARK_VC_OPEN(vcp);
 	mnt->mi_vfsp = NULL;
 	mnt->mi_rootvp = NULL;
@@ -171,9 +171,7 @@ vc_close(struct cdev *dev, int flag, int mode, struct thread *td)
 	 * Wakeup clients so they can return.
 	 */
 	outstanding_upcalls = 0;
-	for (vmp = (struct vmsg *)GETNEXT(vcp->vc_requests);
-	    !EOQ(vmp, vcp->vc_requests); vmp = nvmp) {
-		nvmp = (struct vmsg *)GETNEXT(vmp->vm_chain);
+	TAILQ_FOREACH_SAFE(vmp, &vcp->vc_requests, vm_chain, nvmp) {
 		/*
 		 * Free signal request messages and don't wakeup cause no one
 		 * is waiting.
@@ -187,9 +185,7 @@ vc_close(struct cdev *dev, int flag, int mode, struct thread *td)
 		outstanding_upcalls++;
 		wakeup(&vmp->vm_sleep);
 	}
-	for (vmp = (struct vmsg *)GETNEXT(vcp->vc_replies);
-	    !EOQ(vmp, vcp->vc_replies);
-	    vmp = (struct vmsg *)GETNEXT(vmp->vm_chain)) {
+	TAILQ_FOREACH(vmp, &vcp->vc_replies, vm_chain) {
 		outstanding_upcalls++;
 		wakeup(&vmp->vm_sleep);
 	}
@@ -226,12 +222,15 @@ vc_read(struct cdev *dev, struct uio *uiop, int flag)
 	/*
 	 * Get message at head of request queue.
 	 */
-	if (EMPTY(vcp->vc_requests))
+	vmp = TAILQ_FIRST(&vcp->vc_requests);
+	if (vmp == NULL)
 		return (0);	/* Nothing to read */
-	vmp = (struct vmsg *)GETNEXT(vcp->vc_requests);
 
 	/*
 	 * Move the input args into userspace.
+	 *
+	 * XXXRW: This is not safe in the presence of >1 reader, as vmp is
+	 * still on the head of the list.
 	 */
 	uiop->uio_rw = UIO_READ;
 	error = uiomove(vmp->vm_data, vmp->vm_inSize, uiop);
@@ -239,7 +238,7 @@ vc_read(struct cdev *dev, struct uio *uiop, int flag)
 		myprintf(("vcread: error (%d) on uiomove\n", error));
 		error = EINVAL;
 	}
-	REMQUE(vmp->vm_chain);
+	TAILQ_REMOVE(&vcp->vc_requests, vmp, vm_chain);
 
 	/*
 	 * If request was a signal, free up the message and don't enqueue it
@@ -254,7 +253,7 @@ vc_read(struct cdev *dev, struct uio *uiop, int flag)
 		return (error);
 	}
 	vmp->vm_flags |= VM_READ;
-	INSQUE(vmp->vm_chain, vcp->vc_replies);
+	TAILQ_INSERT_TAIL(&vcp->vc_replies, vmp, vm_chain);
 	return (error);
 }
 
@@ -305,13 +304,11 @@ vc_write(struct cdev *dev, struct uio *uiop, int flag)
 	/*
 	 * Look for the message on the (waiting for) reply queue.
 	 */
-	for (vmp = (struct vmsg *)GETNEXT(vcp->vc_replies);
-	    !EOQ(vmp, vcp->vc_replies);
-	    vmp = (struct vmsg *)GETNEXT(vmp->vm_chain)) {
+	TAILQ_FOREACH(vmp, &vcp->vc_replies, vm_chain) {
 		if (vmp->vm_unique == seq)
 			break;
 	}
-	if (EOQ(vmp, vcp->vc_replies)) {
+	if (vmp == NULL) {
 		if (codadebug)
 			myprintf(("vcwrite: msg (%ld, %ld) not found\n",
 			    opcode, seq));
@@ -321,7 +318,7 @@ vc_write(struct cdev *dev, struct uio *uiop, int flag)
 	/*
 	 * Remove the message from the reply queue.
 	 */
-	REMQUE(vmp->vm_chain);
+	TAILQ_REMOVE(&vcp->vc_replies, vmp, vm_chain);
 
 	/*
 	 * Move data into response buffer.
@@ -444,7 +441,7 @@ vc_poll(struct cdev *dev, int events, struct thread *td)
 	event_msk = events & (POLLIN|POLLRDNORM);
 	if (!event_msk)
 		return (0);
-	if (!EMPTY(vcp->vc_requests))
+	if (!TAILQ_EMPTY(&vcp->vc_requests))
 		return (events & (POLLIN|POLLRDNORM));
 	selrecord(td, &(vcp->vc_selproc));
 	return (0);
@@ -511,7 +508,7 @@ coda_call(struct coda_mntinfo *mntinfo, int inSize, int *outSize,
 	/*
 	 * Append msg to request queue and poke Venus.
 	 */
-	INSQUE(vmp->vm_chain, vcp->vc_requests);
+	TAILQ_INSERT_TAIL(&vcp->vc_requests, vmp, vm_chain);
 	selwakeuppri(&(vcp->vc_selproc), coda_call_sleep);
 
 	/*
@@ -616,7 +613,7 @@ coda_call(struct coda_mntinfo *mntinfo, int inSize, int *outSize,
 				myprintf(("interrupted before read: op = "
 				    "%d.%d, flags = %x\n", vmp->vm_opcode,
 				    vmp->vm_unique, vmp->vm_flags));
-			REMQUE(vmp->vm_chain);
+			TAILQ_REMOVE(&vcp->vc_requests, vmp, vm_chain);
 			error = EINTR;
 		} else {
 			/*
@@ -637,7 +634,7 @@ coda_call(struct coda_mntinfo *mntinfo, int inSize, int *outSize,
 				myprintf(("Sending Venus a signal: op = "
 				    "%d.%d, flags = %x\n", vmp->vm_opcode,
 				    vmp->vm_unique, vmp->vm_flags));
-			REMQUE(vmp->vm_chain);
+			TAILQ_REMOVE(&vcp->vc_requests, vmp, vm_chain);
 			error = EINTR;
 			CODA_ALLOC(svmp, struct vmsg *, sizeof(struct vmsg));
 			CODA_ALLOC((svmp->vm_data), char *,
@@ -655,8 +652,10 @@ coda_call(struct coda_mntinfo *mntinfo, int inSize, int *outSize,
 
 			/*
 			 * Insert at head of queue!
+			 *
+			 * XXXRW: Actually, the tail.
 			 */
-			INSQUE(svmp->vm_chain, vcp->vc_requests);
+			TAILQ_INSERT_TAIL(&vcp->vc_requests, svmp, vm_chain);
 			selwakeuppri(&(vcp->vc_selproc), coda_call_sleep);
 		}
 	} else {