Change the way that the queue(3) structures are declared; don't assume that

the type argument to *_HEAD and *_ENTRY is a struct.

Suggested by:	phk
Reviewed by:	phk
Approved by:	mdodd

9 files changed, 37 insertions, 37 deletions

diff --git a/sys/nfs/nfs.h b/sys/nfs/nfs.h
index e07a4f5..475dbd2 100644
--- a/sys/nfs/nfs.h
+++ b/sys/nfs/nfs.h
@@ -333,7 +333,7 @@ struct uio; struct buf; struct vattr; struct nameidata;	/* XXX */
  * Nfs outstanding request list element
  */
 struct nfsreq {
-	TAILQ_ENTRY(nfsreq) r_chain;
+	TAILQ_ENTRY(struct nfsreq) r_chain;
 	struct mbuf	*r_mreq;
 	struct mbuf	*r_mrep;
 	struct mbuf	*r_md;
@@ -353,7 +353,7 @@ struct nfsreq {
 /*
  * Queue head for nfsreq's
  */
-extern TAILQ_HEAD(nfs_reqq, nfsreq) nfs_reqq;
+extern TAILQ_HEAD(nfs_reqq, struct nfsreq) nfs_reqq;
 
 /* Flag values for r_flags */
 #define R_TIMING	0x01		/* timing request (in mntp) */
@@ -398,8 +398,8 @@ union nethostaddr {
 };
 
 struct nfsuid {
-	TAILQ_ENTRY(nfsuid) nu_lru;	/* LRU chain */
-	LIST_ENTRY(nfsuid) nu_hash;	/* Hash list */
+	TAILQ_ENTRY(struct nfsuid) nu_lru;	/* LRU chain */
+	LIST_ENTRY(struct nfsuid) nu_hash;	/* Hash list */
 	int		nu_flag;	/* Flags */
 	union nethostaddr nu_haddr;	/* Host addr. for dgram sockets */
 	struct ucred	nu_cr;		/* Cred uid mapped to */
@@ -417,20 +417,20 @@ struct nfsuid {
 #define NU_NETFAM(u)	(((u)->nu_flag & NU_INETADDR) ? AF_INET : AF_ISO)
 
 struct nfsrv_rec {
-	STAILQ_ENTRY(nfsrv_rec) nr_link;
+	STAILQ_ENTRY(struct nfsrv_rec) nr_link;
 	struct sockaddr	*nr_address;
 	struct mbuf	*nr_packet;
 };
 
 struct nfssvc_sock {
-	TAILQ_ENTRY(nfssvc_sock) ns_chain;	/* List of all nfssvc_sock's */
-	TAILQ_HEAD(, nfsuid) ns_uidlruhead;
+	TAILQ_ENTRY(struct nfssvc_sock) ns_chain;/* List of all nfssvc_sock's */
+	TAILQ_HEAD(, struct nfsuid) ns_uidlruhead;
 	struct file	*ns_fp;
 	struct socket	*ns_so;
 	struct sockaddr	*ns_nam;
 	struct mbuf	*ns_raw;
 	struct mbuf	*ns_rawend;
-	STAILQ_HEAD(, nfsrv_rec) ns_rec;
+	STAILQ_HEAD(, struct nfsrv_rec) ns_rec;
 	struct mbuf	*ns_frag;
 	int		ns_flag;
 	int		ns_solock;
@@ -438,9 +438,9 @@ struct nfssvc_sock {
 	int		ns_reclen;
 	int		ns_numuids;
 	u_int32_t	ns_sref;
-	LIST_HEAD(, nfsrv_descript) ns_tq;	/* Write gather lists */
-	LIST_HEAD(, nfsuid) ns_uidhashtbl[NFS_UIDHASHSIZ];
-	LIST_HEAD(nfsrvw_delayhash, nfsrv_descript) ns_wdelayhashtbl[NFS_WDELAYHASHSIZ];
+	LIST_HEAD(, struct nfsrv_descript) ns_tq;	/* Write gather lists */
+	LIST_HEAD(, struct nfsuid) ns_uidhashtbl[NFS_UIDHASHSIZ];
+	LIST_HEAD(nfsrvw_delayhash, struct nfsrv_descript) ns_wdelayhashtbl[NFS_WDELAYHASHSIZ];
 };
 
 /* Bits for "ns_flag" */
@@ -452,7 +452,7 @@ struct nfssvc_sock {
 #define	SLP_LASTFRAG	0x20
 #define SLP_ALLFLAGS	0xff
 
-extern TAILQ_HEAD(nfssvc_sockhead, nfssvc_sock) nfssvc_sockhead;
+extern TAILQ_HEAD(nfssvc_sockhead, struct nfssvc_sock) nfssvc_sockhead;
 extern int nfssvc_sockhead_flag;
 #define	SLP_INIT	0x01
 #define	SLP_WANTINIT	0x02
@@ -461,7 +461,7 @@ extern int nfssvc_sockhead_flag;
  * One of these structures is allocated for each nfsd.
  */
 struct nfsd {
-	TAILQ_ENTRY(nfsd) nfsd_chain;	/* List of all nfsd's */
+	TAILQ_ENTRY(struct nfsd) nfsd_chain;	/* List of all nfsd's */
 	int		nfsd_flag;	/* NFSD_ flags */
 	struct nfssvc_sock *nfsd_slp;	/* Current socket */
 	int		nfsd_authlen;	/* Authenticator len */
@@ -486,9 +486,9 @@ struct nfsrv_descript {
 	u_quad_t		nd_time;	/* Write deadline (usec) */
 	off_t			nd_off;		/* Start byte offset */
 	off_t			nd_eoff;	/* and end byte offset */
-	LIST_ENTRY(nfsrv_descript) nd_hash;	/* Hash list */
-	LIST_ENTRY(nfsrv_descript) nd_tq;		/* and timer list */
-	LIST_HEAD(,nfsrv_descript) nd_coalesce;	/* coalesced writes */
+	LIST_ENTRY(struct nfsrv_descript) nd_hash;	/* Hash list */
+	LIST_ENTRY(struct nfsrv_descript) nd_tq;	/* and timer list */
+	LIST_HEAD(, struct nfsrv_descript) nd_coalesce;	/* coalesced writes */
 	struct mbuf		*nd_mrep;	/* Request mbuf list */
 	struct mbuf		*nd_md;		/* Current dissect mbuf */
 	struct mbuf		*nd_mreq;	/* Reply mbuf list */
@@ -518,7 +518,7 @@ struct nfsrv_descript {
 #define ND_KERBFULL	0x40
 #define ND_KERBAUTH	(ND_KERBNICK | ND_KERBFULL)
 
-extern TAILQ_HEAD(nfsd_head, nfsd) nfsd_head;
+extern TAILQ_HEAD(nfsd_head, struct nfsd) nfsd_head;
 extern int nfsd_head_flag;
 #define	NFSD_CHECKSLP	0x01
 
diff --git a/sys/nfs/nfs_common.c b/sys/nfs/nfs_common.c
index 70e871f..fab9912 100644
--- a/sys/nfs/nfs_common.c
+++ b/sys/nfs/nfs_common.c
@@ -556,7 +556,7 @@ extern u_long nfsnodehash;
 struct nfssvc_args;
 extern int nfssvc(struct proc *, struct nfssvc_args *, int *);
 
-LIST_HEAD(nfsnodehashhead, nfsnode);
+LIST_HEAD(nfsnodehashhead, struct nfsnode);
 
 int nfs_webnamei __P((struct nameidata *, struct vnode *, struct proc *));
 
diff --git a/sys/nfs/nfs_node.c b/sys/nfs/nfs_node.c
index 1de8739..8ed2830 100644
--- a/sys/nfs/nfs_node.c
+++ b/sys/nfs/nfs_node.c
@@ -55,7 +55,7 @@
 #include <nfs/nfsmount.h>
 
 static vm_zone_t nfsnode_zone;
-static LIST_HEAD(nfsnodehashhead, nfsnode) *nfsnodehashtbl;
+static LIST_HEAD(nfsnodehashhead, struct nfsnode) *nfsnodehashtbl;
 static u_long nfsnodehash;
 
 #define TRUE	1
diff --git a/sys/nfs/nfs_srvcache.c b/sys/nfs/nfs_srvcache.c
index 9eb168f..07808c4 100644
--- a/sys/nfs/nfs_srvcache.c
+++ b/sys/nfs/nfs_srvcache.c
@@ -64,8 +64,8 @@ static long desirednfsrvcache = NFSRVCACHESIZ;
 
 #define	NFSRCHASH(xid) \
 	(&nfsrvhashtbl[((xid) + ((xid) >> 24)) & nfsrvhash])
-static LIST_HEAD(nfsrvhash, nfsrvcache) *nfsrvhashtbl;
-static TAILQ_HEAD(nfsrvlru, nfsrvcache) nfsrvlruhead;
+static LIST_HEAD(nfsrvhash, struct nfsrvcache) *nfsrvhashtbl;
+static TAILQ_HEAD(nfsrvlru, struct nfsrvcache) nfsrvlruhead;
 static u_long nfsrvhash;
 
 #define TRUE	1
diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c
index 70e871f..fab9912 100644
--- a/sys/nfs/nfs_subs.c
+++ b/sys/nfs/nfs_subs.c
@@ -556,7 +556,7 @@ extern u_long nfsnodehash;
 struct nfssvc_args;
 extern int nfssvc(struct proc *, struct nfssvc_args *, int *);
 
-LIST_HEAD(nfsnodehashhead, nfsnode);
+LIST_HEAD(nfsnodehashhead, struct nfsnode);
 
 int nfs_webnamei __P((struct nameidata *, struct vnode *, struct proc *));
 
diff --git a/sys/nfs/nfsmount.h b/sys/nfs/nfsmount.h
index 8efd1df..8b737f7 100644
--- a/sys/nfs/nfsmount.h
+++ b/sys/nfs/nfsmount.h
@@ -75,7 +75,7 @@ struct	nfsmount {
 	int	nm_acdirmax;		/* Directory attr cache max lifetime */
 	int	nm_acregmin;		/* Reg file attr cache min lifetime */
 	int	nm_acregmax;		/* Reg file attr cache max lifetime */
-	CIRCLEQ_HEAD(, nfsnode) nm_timerhead; /* Head of lease timer queue */
+	CIRCLEQ_HEAD(, struct nfsnode) nm_timerhead; /* Head of lease timer queue */
 	struct vnode *nm_inprog;	/* Vnode in prog by nqnfs_clientd() */
 	uid_t	nm_authuid;		/* Uid for authenticator */
 	int	nm_authtype;		/* Authenticator type */
@@ -86,9 +86,9 @@ struct	nfsmount {
 	u_char	nm_verf[NFSX_V3WRITEVERF]; /* V3 write verifier */
 	NFSKERBKEY_T nm_key;		/* and the session key */
 	int	nm_numuids;		/* Number of nfsuid mappings */
-	TAILQ_HEAD(, nfsuid) nm_uidlruhead; /* Lists of nfsuid mappings */
-	LIST_HEAD(, nfsuid) nm_uidhashtbl[NFS_MUIDHASHSIZ];
-	TAILQ_HEAD(, buf) nm_bufq;	/* async io buffer queue */
+	TAILQ_HEAD(, struct nfsuid) nm_uidlruhead; /* Lists of nfsuid mappings */
+	LIST_HEAD(, struct nfsuid) nm_uidhashtbl[NFS_MUIDHASHSIZ];
+	TAILQ_HEAD(, struct buf) nm_bufq;	/* async io buffer queue */
 	short	nm_bufqlen;		/* number of buffers in queue */
 	short	nm_bufqwant;		/* process wants to add to the queue */
 	int	nm_bufqiods;		/* number of iods processing queue */
diff --git a/sys/nfs/nfsnode.h b/sys/nfs/nfsnode.h
index dac6020..12b717b 100644
--- a/sys/nfs/nfsnode.h
+++ b/sys/nfs/nfsnode.h
@@ -67,7 +67,7 @@ struct sillyrename {
 #define NFSNUMCOOKIES		31
 
 struct nfsdmap {
-	LIST_ENTRY(nfsdmap)	ndm_list;
+	LIST_ENTRY(struct nfsdmap)	ndm_list;
 	int			ndm_eocookie;
 	nfsuint64		ndm_cookies[NFSNUMCOOKIES];
 };
@@ -86,8 +86,8 @@ struct nfsdmap {
  *     be well aligned and, therefore, tightly packed.
  */
 struct nfsnode {
-	LIST_ENTRY(nfsnode)	n_hash;		/* Hash chain */
-	CIRCLEQ_ENTRY(nfsnode)	n_timer;	/* Nqnfs timer chain */
+	LIST_ENTRY(struct nfsnode)	n_hash;		/* Hash chain */
+	CIRCLEQ_ENTRY(struct nfsnode)	n_timer;	/* Nqnfs timer chain */
 	u_quad_t		n_size;		/* Current size of file */
 	u_quad_t		n_brev;		/* Modify rev when cached */
 	u_quad_t		n_lrev;		/* Modify rev for lease */
@@ -113,7 +113,7 @@ struct nfsnode {
 	} n_un2;
 	union {
 		struct sillyrename *nf_silly;	/* Ptr to silly rename struct */
-		LIST_HEAD(, nfsdmap) nd_cook;	/* cookies */
+		LIST_HEAD(, struct nfsdmap) nd_cook;	/* cookies */
 	} n_un3;
 	short			n_fhsize;	/* size in bytes, of fh */
 	short			n_flag;		/* Flag for locking.. */
@@ -153,7 +153,7 @@ struct nfsnode {
 /*
  * Queue head for nfsiod's
  */
-extern TAILQ_HEAD(nfs_bufq, buf) nfs_bufq;
+extern TAILQ_HEAD(nfs_bufq, struct buf) nfs_bufq;
 extern struct proc *nfs_iodwant[NFS_MAXASYNCDAEMON];
 extern struct nfsmount *nfs_iodmount[NFS_MAXASYNCDAEMON];
 
diff --git a/sys/nfs/nfsrvcache.h b/sys/nfs/nfsrvcache.h
index eec5850..93ce6ce 100644
--- a/sys/nfs/nfsrvcache.h
+++ b/sys/nfs/nfsrvcache.h
@@ -50,8 +50,8 @@
 #define	NFSRVCACHESIZ	64
 
 struct nfsrvcache {
-	TAILQ_ENTRY(nfsrvcache) rc_lru;		/* LRU chain */
-	LIST_ENTRY(nfsrvcache) rc_hash;		/* Hash chain */
+	TAILQ_ENTRY(struct nfsrvcache) rc_lru;	/* LRU chain */
+	LIST_ENTRY(struct nfsrvcache) rc_hash;	/* Hash chain */
 	u_int32_t rc_xid;			/* rpc id number */
 	union {
 		struct mbuf *ru_repmb;		/* Reply mbuf list OR */
diff --git a/sys/nfs/nqnfs.h b/sys/nfs/nqnfs.h
index 15b5af5..a76b94b 100644
--- a/sys/nfs/nqnfs.h
+++ b/sys/nfs/nqnfs.h
@@ -104,8 +104,8 @@ struct nqhost {
 #define	lph_inetaddr	lph_un.un_udp.udp_haddr.had_inetaddr
 
 struct nqlease {
-	LIST_ENTRY(nqlease) lc_hash;	/* Fhandle hash list */
-	CIRCLEQ_ENTRY(nqlease) lc_timer; /* Timer queue list */
+	LIST_ENTRY(struct nqlease) lc_hash;	/* Fhandle hash list */
+	CIRCLEQ_ENTRY(struct nqlease) lc_timer; /* Timer queue list */
 	time_t		lc_expiry;	/* Expiry time (sec) */
 	struct nqhost	lc_host;	/* Host that got lease */
 	struct nqm	*lc_morehosts;	/* Other hosts that share read lease */
@@ -173,14 +173,14 @@ struct nqm {
 /*
  * List head for timer queue.
  */
-extern CIRCLEQ_HEAD(nqtimerhead, nqlease) nqtimerhead;
+extern CIRCLEQ_HEAD(nqtimerhead, struct nqlease) nqtimerhead;
 
 /*
  * List head for the file handle hash table.
  */
 #define	NQFHHASH(f) \
 	(&nqfhhashtbl[(*((u_int32_t *)(f))) & nqfhhash])
-extern LIST_HEAD(nqfhhashhead, nqlease) *nqfhhashtbl;
+extern LIST_HEAD(nqfhhashhead, struct nqlease) *nqfhhashtbl;
 extern u_long nqfhhash;
 
 /*