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

16 files changed, 20 insertions, 20 deletions

diff --git a/sys/fs/fdescfs/fdesc.h b/sys/fs/fdescfs/fdesc.h
index 60b6006..cbd45fa 100644
--- a/sys/fs/fdescfs/fdesc.h
+++ b/sys/fs/fdescfs/fdesc.h
@@ -52,7 +52,7 @@ typedef enum {
 } fdntype;
 
 struct fdescnode {
-	LIST_ENTRY(fdescnode) fd_hash;	/* Hash list */
+	LIST_ENTRY(struct fdescnode) fd_hash;	/* Hash list */
 	struct vnode	*fd_vnode;	/* Back ptr to vnode */
 	fdntype		fd_type;	/* Type of this node */
 	unsigned	fd_fd;		/* Fd to be dup'ed */
diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c
index 368d844..0f00f1c 100644
--- a/sys/fs/fdescfs/fdesc_vnops.c
+++ b/sys/fs/fdescfs/fdesc_vnops.c
@@ -67,7 +67,7 @@ static vop_t **fdesc_vnodeop_p;
 #define	NFDCACHE 4
 #define FD_NHASH(ix) \
 	(&fdhashtbl[(ix) & fdhash])
-static LIST_HEAD(fdhashhead, fdescnode) *fdhashtbl;
+static LIST_HEAD(fdhashhead, struct fdescnode) *fdhashtbl;
 static u_long fdhash;
 
 static int	fdesc_badop __P((void));
diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c
index 5bd13a7..a1b82c9 100644
--- a/sys/fs/fifofs/fifo_vnops.c
+++ b/sys/fs/fifofs/fifo_vnops.c
@@ -372,7 +372,7 @@ filt_fifordetach(struct knote *kn)
 	struct vnode *vn = (struct vnode *)kn->kn_fp->f_data;
 	struct socket *so = (struct socket *)vn->v_fifoinfo->fi_readsock;
 
-	SLIST_REMOVE(&so->so_rcv.sb_sel.si_note, kn, knote, kn_selnext);
+	SLIST_REMOVE(&so->so_rcv.sb_sel.si_note, kn, struct knote, kn_selnext);
 	if (SLIST_EMPTY(&so->so_rcv.sb_sel.si_note))
 		so->so_rcv.sb_flags &= ~SB_KNOTE;
 }
@@ -409,7 +409,7 @@ filt_fifowdetach(struct knote *kn)
 	struct vnode *vn = (struct vnode *)kn->kn_fp->f_data;
 	struct socket *so = (struct socket *)vn->v_fifoinfo->fi_readsock;
 
-	SLIST_REMOVE(&so->so_snd.sb_sel.si_note, kn, knote, kn_selnext);
+	SLIST_REMOVE(&so->so_snd.sb_sel.si_note, kn, struct knote, kn_selnext);
 	if (SLIST_EMPTY(&so->so_snd.sb_sel.si_note))
 		so->so_snd.sb_flags &= ~SB_KNOTE;
 }
diff --git a/sys/fs/hpfs/hpfs.h b/sys/fs/hpfs/hpfs.h
index 7c880b2..bb88689 100644
--- a/sys/fs/hpfs/hpfs.h
+++ b/sys/fs/hpfs/hpfs.h
@@ -339,7 +339,7 @@ struct hpfsnode {
 	struct simplelock h_interlock;
 #endif
 
-	LIST_ENTRY(hpfsnode)	h_hash;
+	LIST_ENTRY(struct hpfsnode)	h_hash;
 
 	struct hpfsmount *h_hpmp;
 	struct fnode 	h_fn;
diff --git a/sys/fs/hpfs/hpfs_hash.c b/sys/fs/hpfs/hpfs_hash.c
index a948ade..0d70eb7 100644
--- a/sys/fs/hpfs/hpfs_hash.c
+++ b/sys/fs/hpfs/hpfs_hash.c
@@ -50,7 +50,7 @@ MALLOC_DEFINE(M_HPFSHASH, "HPFS hash", "HPFS node hash tables");
 /*
  * Structures associated with hpfsnode cacheing.
  */
-static LIST_HEAD(hphashhead, hpfsnode) *hpfs_hphashtbl;
+static LIST_HEAD(hphashhead, struct hpfsnode) *hpfs_hphashtbl;
 static u_long	hpfs_hphash;		/* size of hash table - 1 */
 #define	HPNOHASH(dev, lsn)	(&hpfs_hphashtbl[(minor(dev) + (lsn)) & hpfs_hphash])
 #ifndef NULL_SIMPLELOCKS
diff --git a/sys/fs/ntfs/ntfs_ihash.c b/sys/fs/ntfs/ntfs_ihash.c
index 0deecff..0ddf074 100644
--- a/sys/fs/ntfs/ntfs_ihash.c
+++ b/sys/fs/ntfs/ntfs_ihash.c
@@ -54,7 +54,7 @@ MALLOC_DEFINE(M_NTFSNTHASH, "NTFS nthash", "NTFS ntnode hash tables");
 /*
  * Structures associated with inode cacheing.
  */
-static LIST_HEAD(nthashhead, ntnode) *ntfs_nthashtbl;
+static LIST_HEAD(nthashhead, struct ntnode) *ntfs_nthashtbl;
 static u_long	ntfs_nthash;		/* size of hash table - 1 */
 #define	NTNOHASH(device, inum)	(&ntfs_nthashtbl[(minor(device) + (inum)) & ntfs_nthash])
 #ifndef NULL_SIMPLELOCKS
diff --git a/sys/fs/ntfs/ntfs_inode.h b/sys/fs/ntfs/ntfs_inode.h
index a86d5f7..a14e008 100644
--- a/sys/fs/ntfs/ntfs_inode.h
+++ b/sys/fs/ntfs/ntfs_inode.h
@@ -60,7 +60,7 @@ struct ntnode {
 	struct vnode   *i_devvp;	/* vnode of blk dev we live on */
 	dev_t           i_dev;		/* Device associated with the inode. */
 
-	LIST_ENTRY(ntnode)	i_hash;
+	LIST_ENTRY(struct ntnode)	i_hash;
 	struct ntnode  *i_next;
 	struct ntnode **i_prev;
 	struct ntfsmount       *i_mp;
@@ -72,8 +72,8 @@ struct ntnode {
 	struct simplelock i_interlock;
 	int		i_usecount;
 
-	LIST_HEAD(,fnode)	i_fnlist;
-	LIST_HEAD(,ntvattr)	i_valist;
+	LIST_HEAD(, struct fnode)	i_fnlist;
+	LIST_HEAD(, struct ntvattr)	i_valist;
 
 	long		i_nlink;	/* MFR */
 	ino_t		i_mainrec;	/* MFR */
@@ -88,7 +88,7 @@ struct fnode {
 	struct lock	f_lock;	/* fnode lock >Keep this first< */
 #endif
 	
-	LIST_ENTRY(fnode) f_fnlist;
+	LIST_ENTRY(struct fnode) f_fnlist;
 	struct vnode   *f_vp;		/* Associatied vnode */
 	struct ntnode  *f_ip;		/* Associated ntnode */
 	u_long		f_flag;
diff --git a/sys/fs/ntfs/ntfs_subr.h b/sys/fs/ntfs/ntfs_subr.h
index a0cda50..f172c56 100644
--- a/sys/fs/ntfs/ntfs_subr.h
+++ b/sys/fs/ntfs/ntfs_subr.h
@@ -32,7 +32,7 @@
 #define	VA_PRELOADED		0x0002
 
 struct ntvattr {
-	LIST_ENTRY(ntvattr) 	va_list;
+	LIST_ENTRY(struct ntvattr) 	va_list;
 
 	u_int32_t		va_vflag;
 	struct vnode	       *va_vp;
diff --git a/sys/fs/nullfs/null.h b/sys/fs/nullfs/null.h
index 2b7ed51..8747230 100644
--- a/sys/fs/nullfs/null.h
+++ b/sys/fs/nullfs/null.h
@@ -52,7 +52,7 @@ struct null_mount {
  * A cache of vnode references
  */
 struct null_node {
-	LIST_ENTRY(null_node)	null_hash;	/* Hash list */
+	LIST_ENTRY(struct null_node)	null_hash;	/* Hash list */
 	struct vnode	        *null_lowervp;	/* VREFed once */
 	struct vnode		*null_vnode;	/* Back pointer */
 };
diff --git a/sys/fs/nullfs/null_subr.c b/sys/fs/nullfs/null_subr.c
index ad37a1e..7c4f669 100644
--- a/sys/fs/nullfs/null_subr.c
+++ b/sys/fs/nullfs/null_subr.c
@@ -59,7 +59,7 @@
 
 #define	NULL_NHASH(vp) \
 	(&null_node_hashtbl[(((uintptr_t)vp)>>LOG2_SIZEVNODE) & null_node_hash])
-static LIST_HEAD(null_node_hashhead, null_node) *null_node_hashtbl;
+static LIST_HEAD(null_node_hashhead, struct null_node) *null_node_hashtbl;
 static u_long null_node_hash;
 
 static int	null_node_alloc __P((struct mount *mp, struct vnode *lowervp,
diff --git a/sys/fs/nwfs/nwfs_node.c b/sys/fs/nwfs/nwfs_node.c
index 25d9225..f632a1e 100644
--- a/sys/fs/nwfs/nwfs_node.c
+++ b/sys/fs/nwfs/nwfs_node.c
@@ -59,7 +59,7 @@
 
 extern vop_t **nwfs_vnodeop_p;
 
-static LIST_HEAD(nwnode_hash_head,nwnode) *nwhashtbl;
+static LIST_HEAD(nwnode_hash_head, struct nwnode) *nwhashtbl;
 static u_long nwnodehash;
 static int nwhashlock = 0;
 
diff --git a/sys/fs/nwfs/nwfs_node.h b/sys/fs/nwfs/nwfs_node.h
index 3777679..2755013 100644
--- a/sys/fs/nwfs/nwfs_node.h
+++ b/sys/fs/nwfs/nwfs_node.h
@@ -45,7 +45,7 @@
 #define	NVOLUME		0x0010		/* vnode references a volume */
 
 struct nwnode {
-	LIST_ENTRY(nwnode)	n_hash;
+	LIST_ENTRY(struct nwnode)	n_hash;
 	struct vnode 		*n_vnode;
 	struct vattr		n_vattr;
 	struct nwmount		*n_mount;
diff --git a/sys/fs/umapfs/umap.h b/sys/fs/umapfs/umap.h
index eb562ed..0964614 100644
--- a/sys/fs/umapfs/umap.h
+++ b/sys/fs/umapfs/umap.h
@@ -67,7 +67,7 @@ struct umap_mount {
  * A cache of vnode references
  */
 struct umap_node {
-	LIST_ENTRY(umap_node) umap_hash;	/* Hash list */
+	LIST_ENTRY(struct umap_node) umap_hash;	/* Hash list */
 	struct vnode	*umap_lowervp;	/* Aliased vnode - VREFed once */
 	struct vnode	*umap_vnode;	/* Back pointer to vnode/umap_node */
 };
diff --git a/sys/fs/umapfs/umap_subr.c b/sys/fs/umapfs/umap_subr.c
index 6f08513..0ec9a43 100644
--- a/sys/fs/umapfs/umap_subr.c
+++ b/sys/fs/umapfs/umap_subr.c
@@ -60,7 +60,7 @@
 #define	UMAP_NHASH(vp) \
 	(&umap_node_hashtbl \
 	[((uintptr_t)(void *)(vp) >> LOG2_SIZEVNODE) & umap_node_hash])
-static LIST_HEAD(umap_node_hashhead, umap_node) *umap_node_hashtbl;
+static LIST_HEAD(umap_node_hashhead, struct umap_node) *umap_node_hashtbl;
 static u_long umap_node_hash;
 
 static u_long	umap_findid __P((u_long id, u_long map[][2], int nentries));
diff --git a/sys/fs/unionfs/union.h b/sys/fs/unionfs/union.h
index a720d41..65be0ab 100644
--- a/sys/fs/unionfs/union.h
+++ b/sys/fs/unionfs/union.h
@@ -79,7 +79,7 @@ struct union_mount {
  */
 struct union_node {
 	struct lock		un_lock;
-	LIST_ENTRY(union_node)	un_cache;	/* Hash chain */
+	LIST_ENTRY(struct union_node)	un_cache;	/* Hash chain */
 	struct vnode		*un_vnode;	/* Back pointer */
 	struct vnode	        *un_uppervp;	/* overlaying object */
 	struct vnode	        *un_lowervp;	/* underlying object */
diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c
index 6b88bef..4d4c2fa 100644
--- a/sys/fs/unionfs/union_subr.c
+++ b/sys/fs/unionfs/union_subr.c
@@ -67,7 +67,7 @@ extern int	union_init __P((void));
 #define UNION_HASH(u, l) \
 	(((((uintptr_t) (u)) + ((uintptr_t) l)) >> 8) & (NHASH-1))
 
-static LIST_HEAD(unhead, union_node) unhead[NHASH];
+static LIST_HEAD(unhead, struct union_node) unhead[NHASH];
 static int unvplock[NHASH];
 
 static void	union_dircache_r __P((struct vnode *vp, struct vnode ***vppp,