Back out the previous change to the queue(3) interface.

It was not discussed and should probably not happen.

Requested by:		msmith and others

26 files changed, 63 insertions, 63 deletions

diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c
index a7d6412..d6116f7 100644
--- a/sys/kern/kern_conf.c
+++ b/sys/kern/kern_conf.c
@@ -64,9 +64,9 @@ MALLOC_DEFINE(M_DEVT, "dev_t", "dev_t storage");
 
 static struct specinfo devt_stash[DEVT_STASH];
 
-static LIST_HEAD(, struct specinfo) dev_hash[DEVT_HASH];
+static LIST_HEAD(, specinfo) dev_hash[DEVT_HASH];
 
-static LIST_HEAD(, struct specinfo) dev_free;
+static LIST_HEAD(, specinfo) dev_free;
 
 devfs_create_t *devfs_create_hook;
 devfs_remove_t *devfs_remove_hook;
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index cbe9f2b..f0095c97 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -368,10 +368,10 @@ funsetown(sigio)
 	splx(s);
 	if (sigio->sio_pgid < 0) {
 		SLIST_REMOVE(&sigio->sio_pgrp->pg_sigiolst, sigio,
-			     struct sigio, sio_pgsigio);
+			     sigio, sio_pgsigio);
 	} else /* if ((*sigiop)->sio_pgid > 0) */ {
 		SLIST_REMOVE(&sigio->sio_proc->p_sigiolst, sigio,
-			     struct sigio, sio_pgsigio);
+			     sigio, sio_pgsigio);
 	}
 	crfree(sigio->sio_ucred);
 	FREE(sigio, M_SIGIO);
diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c
index 48f444a..c22b248 100644
--- a/sys/kern/kern_event.c
+++ b/sys/kern/kern_event.c
@@ -180,7 +180,7 @@ filt_kqdetach(struct knote *kn)
 {
 	struct kqueue *kq = (struct kqueue *)kn->kn_fp->f_data;
 
-	SLIST_REMOVE(&kq->kq_sel.si_note, kn, struct knote, kn_selnext);
+	SLIST_REMOVE(&kq->kq_sel.si_note, kn, knote, kn_selnext);
 }
 
 /*ARGSUSED*/
@@ -239,7 +239,7 @@ filt_procdetach(struct knote *kn)
 		return;
 
 	/* XXX locking?  this might modify another process. */
-	SLIST_REMOVE(&p->p_klist, kn, struct knote, kn_selnext);
+	SLIST_REMOVE(&p->p_klist, kn, knote, kn_selnext);
 }
 
 static int
@@ -855,7 +855,7 @@ knote_drop(struct knote *kn, struct proc *p)
 	else
 		list = &fdp->fd_knhash[KN_HASH(kn->kn_id, fdp->fd_knhashmask)];
 
-	SLIST_REMOVE(list, kn, struct knote, kn_link);
+	SLIST_REMOVE(list, kn, knote, kn_link);
 	if (kn->kn_status & KN_QUEUED)
 		knote_dequeue(kn);
 	if (kn->kn_fop->f_isfd)
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index 3a4c1a4..9115f97 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -82,10 +82,10 @@ static int wait1 __P((struct proc *, struct wait_args *, int));
  */
 struct exitlist {
 	exitlist_fn function;
-	TAILQ_ENTRY(struct exitlist) next;
+	TAILQ_ENTRY(exitlist) next;
 };
 
-TAILQ_HEAD(exit_list_head, struct exitlist);
+TAILQ_HEAD(exit_list_head, exitlist);
 static struct exit_list_head exit_list = TAILQ_HEAD_INITIALIZER(exit_list);
 
 /*
diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c
index b89bffb..62296b2 100644
--- a/sys/kern/kern_fork.c
+++ b/sys/kern/kern_fork.c
@@ -76,10 +76,10 @@ SYSCTL_INT(_kern, OID_AUTO, fast_vfork, CTLFLAG_RW, &fast_vfork, 0, "");
  */
 struct forklist {
 	forklist_fn function;
-	TAILQ_ENTRY(struct forklist) next;
+	TAILQ_ENTRY(forklist) next;
 };
 
-TAILQ_HEAD(forklist_head, struct forklist);
+TAILQ_HEAD(forklist_head, forklist);
 static struct forklist_head fork_list = TAILQ_HEAD_INITIALIZER(fork_list);
 
 #ifndef _SYS_SYSPROTO_H_
diff --git a/sys/kern/kern_linker.c b/sys/kern/kern_linker.c
index c8ad3cb..bb764f4 100644
--- a/sys/kern/kern_linker.c
+++ b/sys/kern/kern_linker.c
@@ -64,9 +64,9 @@ static linker_file_list_t linker_files;
 static int next_file_id = 1;
 
 /* XXX wrong name; we're looking at version provision tags here, not modules */
-typedef TAILQ_HEAD(, struct modlist) modlisthead_t;
+typedef TAILQ_HEAD(, modlist) modlisthead_t;
 struct modlist {
-    TAILQ_ENTRY(struct modlist) link;	/* chain together all modules */
+    TAILQ_ENTRY(modlist) link;		/* chain together all modules */
     linker_file_t	container;
     const char		*name;
 };
@@ -480,7 +480,7 @@ linker_file_unload(linker_file_t file)
 
     for (cp = STAILQ_FIRST(&file->common); cp;
 	 cp = STAILQ_FIRST(&file->common)) {
-	STAILQ_REMOVE(&file->common, cp, struct common_symbol, link);
+	STAILQ_REMOVE(&file->common, cp, common_symbol, link);
 	free(cp, M_LINKER);
     }
 
diff --git a/sys/kern/kern_module.c b/sys/kern/kern_module.c
index 540be53..46c3d14 100644
--- a/sys/kern/kern_module.c
+++ b/sys/kern/kern_module.c
@@ -39,10 +39,10 @@
 
 MALLOC_DEFINE(M_MODULE, "module", "module data structures");
 
-typedef TAILQ_HEAD(, struct module) modulelist_t;
+typedef TAILQ_HEAD(, module) modulelist_t;
 struct module {
-    TAILQ_ENTRY(struct module)	link;		/* chain together all modules */
-    TAILQ_ENTRY(struct module)	flink;		/* all modules in a file */
+    TAILQ_ENTRY(module)	link;		/* chain together all modules */
+    TAILQ_ENTRY(module)	flink;		/* all modules in a file */
     struct linker_file*	file;		/* file which contains this module */
     int			refs;		/* reference count */
     int			id;		/* unique id number */
diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index d0a36ec..df9f1c5 100644
--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@@ -61,13 +61,13 @@ static void pgdelete	__P((struct pgrp *));
  * Structure associated with user cacheing.
  */
 struct uidinfo {
-	LIST_ENTRY(struct uidinfo) ui_hash;
+	LIST_ENTRY(uidinfo) ui_hash;
 	uid_t	ui_uid;
 	long	ui_proccnt;
 	rlim_t	ui_sbsize;
 };
 #define	UIHASH(uid)	(&uihashtbl[(uid) & uihash])
-static LIST_HEAD(uihashhead, struct uidinfo) *uihashtbl;
+static LIST_HEAD(uihashhead, uidinfo) *uihashtbl;
 static u_long uihash;		/* size of hash table - 1 */
 
 static void	orphanpg __P((struct pgrp *pg));
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index e67153b..7702aba 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -1717,7 +1717,7 @@ filt_sigdetach(struct knote *kn)
 {
 	struct proc *p = kn->kn_ptr.p_proc;
 
-	SLIST_REMOVE(&p->p_klist, kn, struct knote, kn_selnext);
+	SLIST_REMOVE(&p->p_klist, kn, knote, kn_selnext);
 }
 
 /*
diff --git a/sys/kern/kern_subr.c b/sys/kern/kern_subr.c
index 7b99bbf..c0f7f64 100644
--- a/sys/kern/kern_subr.c
+++ b/sys/kern/kern_subr.c
@@ -365,7 +365,7 @@ hashinit(elements, type, hashmask)
 	u_long *hashmask;
 {
 	long hashsize;
-	LIST_HEAD(generic, struct generic) *hashtbl;
+	LIST_HEAD(generic, generic) *hashtbl;
 	int i;
 
 	if (elements <= 0)
@@ -395,7 +395,7 @@ phashinit(elements, type, nentries)
 	u_long *nentries;
 {
 	long hashsize;
-	LIST_HEAD(generic, struct generic) *hashtbl;
+	LIST_HEAD(generic, generic) *hashtbl;
 	int i;
 
 	if (elements <= 0)
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c
index 4dff981..0a8e176 100644
--- a/sys/kern/kern_synch.c
+++ b/sys/kern/kern_synch.c
@@ -361,7 +361,7 @@ updatepri(p)
  * of 2.  Shift right by 8, i.e. drop the bottom 256 worth.
  */
 #define TABLESIZE	128
-static TAILQ_HEAD(slpquehead, struct proc) slpque[TABLESIZE];
+static TAILQ_HEAD(slpquehead, proc) slpque[TABLESIZE];
 #define LOOKUP(x)	(((intptr_t)(x) >> 8) & (TABLESIZE - 1))
 
 /*
diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c
index 907e9626..1da9a0b 100644
--- a/sys/kern/kern_sysctl.c
+++ b/sys/kern/kern_sysctl.c
@@ -112,7 +112,7 @@ void sysctl_register_oid(struct sysctl_oid *oidp)
 
 void sysctl_unregister_oid(struct sysctl_oid *oidp)
 {
-	SLIST_REMOVE(oidp->oid_parent, oidp, struct sysctl_oid, oid_link);
+	SLIST_REMOVE(oidp->oid_parent, oidp, sysctl_oid, oid_link);
 }
 
 /*
diff --git a/sys/kern/subr_autoconf.c b/sys/kern/subr_autoconf.c
index 36e58f5..9bbb7b4 100644
--- a/sys/kern/subr_autoconf.c
+++ b/sys/kern/subr_autoconf.c
@@ -55,7 +55,7 @@
 /*
  * "Interrupt driven config" functions.
  */
-static TAILQ_HEAD(, struct intr_config_hook) intr_config_hook_list =
+static TAILQ_HEAD(, intr_config_hook) intr_config_hook_list =
 	TAILQ_HEAD_INITIALIZER(intr_config_hook_list);
 
 
diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c
index 5604a90..ddd1e4f 100644
--- a/sys/kern/subr_bus.c
+++ b/sys/kern/subr_bus.c
@@ -1630,7 +1630,7 @@ resource_list_delete(struct resource_list *rl,
     struct resource_list_entry *rle = resource_list_find(rl, type, rid);
 
     if (rle) {
-	SLIST_REMOVE(rl, rle, struct resource_list_entry, link);
+	SLIST_REMOVE(rl, rle, resource_list_entry, link);
 	free(rle, M_BUS);
     }
 }
diff --git a/sys/kern/subr_devstat.c b/sys/kern/subr_devstat.c
index 28f55cc..fe14002 100644
--- a/sys/kern/subr_devstat.c
+++ b/sys/kern/subr_devstat.c
@@ -41,7 +41,7 @@ static long devstat_generation;
 static int devstat_version = DEVSTAT_VERSION;
 static int devstat_current_devnumber;
 
-static STAILQ_HEAD(devstatlist, struct devstat) device_statq;
+static STAILQ_HEAD(devstatlist, devstat) device_statq;
 
 /*
  * Take a malloced and zeroed devstat structure given to us, fill it in 
@@ -149,7 +149,7 @@ devstat_remove_entry(struct devstat *ds)
 	devstat_head = &device_statq;
 
 	/* Remove this entry from the devstat queue */
-	STAILQ_REMOVE(devstat_head, ds, struct devstat, dev_links);
+	STAILQ_REMOVE(devstat_head, ds, devstat, dev_links);
 }
 
 /*
diff --git a/sys/kern/subr_eventhandler.c b/sys/kern/subr_eventhandler.c
index 7d979c9..c23441d 100644
--- a/sys/kern/subr_eventhandler.c
+++ b/sys/kern/subr_eventhandler.c
@@ -35,7 +35,7 @@
 MALLOC_DEFINE(M_EVENTHANDLER, "eventhandler", "Event handler records");
 
 /* List of 'slow' lists */
-static TAILQ_HEAD(, struct eventhandler_list)	eventhandler_lists;
+static TAILQ_HEAD(, eventhandler_list)	eventhandler_lists;
 static int				eventhandler_lists_initted = 0;
 
 struct eventhandler_entry_generic 
diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c
index d1a2741..40d47e4 100644
--- a/sys/kern/sys_pipe.c
+++ b/sys/kern/sys_pipe.c
@@ -1187,7 +1187,7 @@ filt_pipedetach(struct knote *kn)
 {
 	struct pipe *rpipe = (struct pipe *)kn->kn_fp->f_data;
 
-	SLIST_REMOVE(&rpipe->pipe_sel.si_note, kn, struct knote, kn_selnext);
+	SLIST_REMOVE(&rpipe->pipe_sel.si_note, kn, knote, kn_selnext);
 }
 
 /*ARGSUSED*/
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index 163e016..d69ae83 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -198,7 +198,7 @@ static u_char const char_type[] = {
 /*
  * list of struct tty where pstat(8) can pick it up with sysctl
  */
-static SLIST_HEAD(, struct tty) tty_list;
+static SLIST_HEAD(, tty) tty_list;
 
 static int  drainwait = 5*60;
 SYSCTL_INT(_kern, OID_AUTO, drainwait, CTLFLAG_RW, &drainwait,
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index 8e90cb6..76495e1 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -1427,7 +1427,7 @@ filt_sordetach(struct knote *kn)
 	struct socket *so = (struct socket *)kn->kn_fp->f_data;
 	int s = splnet();
 
-	SLIST_REMOVE(&so->so_rcv.sb_sel.si_note, kn, struct knote, kn_selnext);
+	SLIST_REMOVE(&so->so_rcv.sb_sel.si_note, kn, knote, kn_selnext);
 	if (SLIST_EMPTY(&so->so_rcv.sb_sel.si_note))
 		so->so_rcv.sb_flags &= ~SB_KNOTE;
 	splx(s);
@@ -1465,7 +1465,7 @@ filt_sowdetach(struct knote *kn)
 	struct socket *so = (struct socket *)kn->kn_fp->f_data;
 	int s = splnet();
 
-	SLIST_REMOVE(&so->so_snd.sb_sel.si_note, kn, struct knote, kn_selnext);
+	SLIST_REMOVE(&so->so_snd.sb_sel.si_note, kn, knote, kn_selnext);
 	if (SLIST_EMPTY(&so->so_snd.sb_sel.si_note))
 		so->so_snd.sb_flags &= ~SB_KNOTE;
 	splx(s);
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c
index 020bd8e..298bbe1 100644
--- a/sys/kern/uipc_syscalls.c
+++ b/sys/kern/uipc_syscalls.c
@@ -85,7 +85,7 @@ static int getsockname1 __P((struct proc *p, struct getsockname_args *uap,
 static int getpeername1 __P((struct proc *p, struct getpeername_args *uap,
 			     int compat));
 
-static SLIST_HEAD(, struct sf_buf) sf_freelist;
+static SLIST_HEAD(, sf_buf) sf_freelist;
 static vm_offset_t sf_base;
 static struct sf_buf *sf_bufs;
 static int sf_buf_alloc_want;
diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c
index 7bb4e5b..16867cd 100644
--- a/sys/kern/vfs_aio.c
+++ b/sys/kern/vfs_aio.c
@@ -150,9 +150,9 @@ SYSCTL_INT(_vfs_aio, OID_AUTO, aiod_timeout,
 
 struct aioproclist {
 	int aioprocflags;			/* AIO proc flags */
-	TAILQ_ENTRY(struct aioproclist) list;	/* List of processes */
+	TAILQ_ENTRY(aioproclist) list;		/* List of processes */
 	struct proc *aioproc;			/* The AIO thread */
-	TAILQ_HEAD (,struct aiocblist) jobtorun; /* suggested job to run */
+	TAILQ_HEAD (,aiocblist) jobtorun;	/* suggested job to run */
 };
 
 /*
@@ -165,7 +165,7 @@ struct aio_liojob {
 	int	lioj_queue_count;
 	int	lioj_queue_finished_count;
 	struct	sigevent lioj_signal;	/* signal on all I/O done */
-	TAILQ_ENTRY	(struct aio_liojob) lioj_list;
+	TAILQ_ENTRY	(aio_liojob) lioj_list;
 	struct	kaioinfo *lioj_ki;
 };
 #define	LIOJ_SIGNAL		0x1	/* signal on all done (lio) */
@@ -185,21 +185,21 @@ struct kaioinfo {
 	int	kaio_buffer_count;	/* number of physio buffers */
 	int	kaio_buffer_finished_count; /* count of I/O done */
 	struct 	proc *kaio_p;		/* process that uses this kaio block */
-	TAILQ_HEAD (,struct aio_liojob) kaio_liojoblist; /* list of lio jobs */
-	TAILQ_HEAD (,struct aiocblist)	kaio_jobqueue;	/* job queue for process */
-	TAILQ_HEAD (,struct aiocblist)	kaio_jobdone;	/* done queue for process */
-	TAILQ_HEAD (,struct aiocblist)	kaio_bufqueue;	/* buffer job queue for process */
-	TAILQ_HEAD (,struct aiocblist)	kaio_bufdone;	/* buffer done queue for process */
-	TAILQ_HEAD (,struct aiocblist) kaio_sockqueue;	/* queue for aios waiting on sockets */
+	TAILQ_HEAD (,aio_liojob) kaio_liojoblist; /* list of lio jobs */
+	TAILQ_HEAD (,aiocblist)	kaio_jobqueue;	/* job queue for process */
+	TAILQ_HEAD (,aiocblist)	kaio_jobdone;	/* done queue for process */
+	TAILQ_HEAD (,aiocblist)	kaio_bufqueue;	/* buffer job queue for process */
+	TAILQ_HEAD (,aiocblist)	kaio_bufdone;	/* buffer done queue for process */
+	TAILQ_HEAD (,aiocblist) kaio_sockqueue; /* queue for aios waiting on sockets */
 };
 
 #define KAIO_RUNDOWN	0x1	/* process is being run down */
 #define KAIO_WAKEUP	0x2	/* wakeup process when there is a significant event */
 
-static TAILQ_HEAD(, struct aioproclist) aio_freeproc, aio_activeproc;
-static TAILQ_HEAD(, struct aiocblist) aio_jobs;		/* Async job list */
-static TAILQ_HEAD(, struct aiocblist) aio_bufjobs;	/* Phys I/O job list */
-static TAILQ_HEAD(, struct aiocblist) aio_freejobs;	/* Pool of free jobs */
+static TAILQ_HEAD(,aioproclist) aio_freeproc, aio_activeproc;
+static TAILQ_HEAD(,aiocblist) aio_jobs;			/* Async job list */
+static TAILQ_HEAD(,aiocblist) aio_bufjobs;		/* Phys I/O job list */
+static TAILQ_HEAD(,aiocblist) aio_freejobs;		/* Pool of free jobs */
 
 static void	aio_init_aioinfo(struct proc *p);
 static void	aio_onceonly(void *);
@@ -2352,7 +2352,7 @@ filt_aiodetach(struct knote *kn)
 	struct aiocblist *aiocbe = (struct aiocblist *)kn->kn_id;
 	int s = splhigh();	 /* XXX no clue, so overkill */
 
-	SLIST_REMOVE(&aiocbe->klist, kn, struct knote, kn_selnext);
+	SLIST_REMOVE(&aiocbe->klist, kn, knote, kn_selnext);
 	splx(s);
 }
 
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index 51c0dcb..93e4620 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -137,7 +137,7 @@ SYSCTL_INT(_vfs, OID_AUTO, bufreusecnt, CTLFLAG_RW,
 	&bufreusecnt, 0, "");
 
 static int bufhashmask;
-static LIST_HEAD(bufhashhdr, struct buf) *bufhashtbl, invalhash;
+static LIST_HEAD(bufhashhdr, buf) *bufhashtbl, invalhash;
 struct bqueues bufqueues[BUFFER_QUEUES] = { { 0 } };
 char *buf_wmesg = BUF_WMESG;
 
diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c
index b34be2e..99e0821 100644
--- a/sys/kern/vfs_cache.c
+++ b/sys/kern/vfs_cache.c
@@ -55,9 +55,9 @@
  */
 
 struct	namecache {
-	LIST_ENTRY(struct namecache) nc_hash;	/* hash chain */
-	LIST_ENTRY(struct namecache) nc_src;	/* source vnode list */
-	TAILQ_ENTRY(struct namecache) nc_dst;	/* destination vnode list */
+	LIST_ENTRY(namecache) nc_hash;	/* hash chain */
+	LIST_ENTRY(namecache) nc_src;	/* source vnode list */
+	TAILQ_ENTRY(namecache) nc_dst;	/* destination vnode list */
 	struct	vnode *nc_dvp;		/* vnode of parent of name */
 	struct	vnode *nc_vp;		/* vnode the name refers to */
 	u_char	nc_flag;		/* flag bits */
@@ -87,8 +87,8 @@ struct	namecache {
  */
 #define NCHHASH(dvp, hash) \
 	(&nchashtbl[((dvp)->v_id + (hash)) & nchash])
-static LIST_HEAD(nchashhead, struct namecache) *nchashtbl;	/* Hash Table */
-static TAILQ_HEAD(, struct namecache) ncneg;	/* Hash Table */
+static LIST_HEAD(nchashhead, namecache) *nchashtbl;	/* Hash Table */
+static TAILQ_HEAD(, namecache) ncneg;	/* Hash Table */
 static u_long	nchash;			/* size of hash table */
 SYSCTL_INT(_debug, OID_AUTO, nchash, CTLFLAG_RD, &nchash, 0, "");
 static u_long	ncnegfactor = 16;	/* ratio of negative entries */
diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c
index 3d5292e..670d999 100644
--- a/sys/kern/vfs_export.c
+++ b/sys/kern/vfs_export.c
@@ -95,7 +95,7 @@ int vttoif_tab[9] = {
 	S_IFSOCK, S_IFIFO, S_IFMT,
 };
 
-static TAILQ_HEAD(freelst, struct vnode) vnode_free_list; /* vnode free list */
+static TAILQ_HEAD(freelst, vnode) vnode_free_list;	/* vnode free list */
 struct tobefreelist vnode_tobefree_list;	/* vnode free list */
 
 static u_long wantfreevnodes = 25;
@@ -149,7 +149,7 @@ SYSCTL_INT(_debug, OID_AUTO, rush_requests, CTLFLAG_RW, &stat_rush_requests, 0,
 
 static int syncer_delayno = 0;
 static long syncer_mask; 
-LIST_HEAD(synclist, struct vnode);
+LIST_HEAD(synclist, vnode);
 static struct synclist *syncer_workitem_pending;
 
 int desiredvnodes;
@@ -453,7 +453,7 @@ getnewvnode(tag, mp, vops, vpp)
 	struct proc *p = curproc;	/* XXX */
 	struct vnode *vp, *tvp, *nvp;
 	vm_object_t object;
-	TAILQ_HEAD(freelst, struct vnode) vnode_tmp_list;
+	TAILQ_HEAD(freelst, vnode) vnode_tmp_list;
 
 	/*
 	 * We take the least recently used vnode from the freelist
@@ -1851,7 +1851,7 @@ vgonel(vp, p)
 	 */
 	if ((vp->v_type == VBLK || vp->v_type == VCHR) && vp->v_rdev != NULL) {
 		simple_lock(&spechash_slock);
-		SLIST_REMOVE(&vp->v_hashchain, vp, struct vnode, v_specnext);
+		SLIST_REMOVE(&vp->v_hashchain, vp, vnode, v_specnext);
 		freedev(vp->v_rdev);
 		simple_unlock(&spechash_slock);
 		vp->v_rdev = NULL;
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 3d5292e..670d999 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -95,7 +95,7 @@ int vttoif_tab[9] = {
 	S_IFSOCK, S_IFIFO, S_IFMT,
 };
 
-static TAILQ_HEAD(freelst, struct vnode) vnode_free_list; /* vnode free list */
+static TAILQ_HEAD(freelst, vnode) vnode_free_list;	/* vnode free list */
 struct tobefreelist vnode_tobefree_list;	/* vnode free list */
 
 static u_long wantfreevnodes = 25;
@@ -149,7 +149,7 @@ SYSCTL_INT(_debug, OID_AUTO, rush_requests, CTLFLAG_RW, &stat_rush_requests, 0,
 
 static int syncer_delayno = 0;
 static long syncer_mask; 
-LIST_HEAD(synclist, struct vnode);
+LIST_HEAD(synclist, vnode);
 static struct synclist *syncer_workitem_pending;
 
 int desiredvnodes;
@@ -453,7 +453,7 @@ getnewvnode(tag, mp, vops, vpp)
 	struct proc *p = curproc;	/* XXX */
 	struct vnode *vp, *tvp, *nvp;
 	vm_object_t object;
-	TAILQ_HEAD(freelst, struct vnode) vnode_tmp_list;
+	TAILQ_HEAD(freelst, vnode) vnode_tmp_list;
 
 	/*
 	 * We take the least recently used vnode from the freelist
@@ -1851,7 +1851,7 @@ vgonel(vp, p)
 	 */
 	if ((vp->v_type == VBLK || vp->v_type == VCHR) && vp->v_rdev != NULL) {
 		simple_lock(&spechash_slock);
-		SLIST_REMOVE(&vp->v_hashchain, vp, struct vnode, v_specnext);
+		SLIST_REMOVE(&vp->v_hashchain, vp, vnode, v_specnext);
 		freedev(vp->v_rdev);
 		simple_unlock(&spechash_slock);
 		vp->v_rdev = NULL;
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c
index 0e0e8ad..53c2cdb 100644
--- a/sys/kern/vfs_vnops.c
+++ b/sys/kern/vfs_vnops.c
@@ -685,7 +685,7 @@ filt_vndetach(struct knote *kn)
 
         simple_lock(&vp->v_pollinfo.vpi_lock);
 	SLIST_REMOVE(&vp->v_pollinfo.vpi_selinfo.si_note,
-	    kn, struct knote, kn_selnext);
+	    kn, knote, kn_selnext);
         simple_unlock(&vp->v_pollinfo.vpi_lock);
 }