aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorJake Burkholder <jake@FreeBSD.org>2000-05-23 20:41:01 +0000
committerJake Burkholder <jake@FreeBSD.org>2000-05-23 20:41:01 +0000
commit740a1973a62eaa8e1dc23e22f84dacb3346d303a (patch)
treeacf054a865eef37380f5ac3d3c07766b5bb234b0 /sys
parentb4183771fd8ab7a5946fd38df04c1e24b1268bea (diff)
downloadsrc-740a1973a62eaa8e1dc23e22f84dacb3346d303a.tar.gz
src-740a1973a62eaa8e1dc23e22f84dacb3346d303a.zip
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
Notes
Notes: svn path=/head/; revision=60833
Diffstat (limited to 'sys')
-rw-r--r--sys/alpha/alpha/busdma_machdep.c10
-rw-r--r--sys/alpha/alpha/interrupt.c4
-rw-r--r--sys/alpha/include/pmap.h8
-rw-r--r--sys/alpha/tc/espvar.h4
-rw-r--r--sys/amd64/amd64/busdma_machdep.c10
-rw-r--r--sys/amd64/include/pmap.h8
-rw-r--r--sys/boot/common/bootstrap.h6
-rw-r--r--sys/boot/common/pnp.c2
-rw-r--r--sys/cam/cam_ccb.h8
-rw-r--r--sys/cam/cam_periph.h8
-rw-r--r--sys/cam/cam_queue.h6
-rw-r--r--sys/cam/cam_xpt.c31
-rw-r--r--sys/cam/scsi/scsi_cd.c12
-rw-r--r--sys/cam/scsi/scsi_da.c8
-rw-r--r--sys/cam/scsi/scsi_pt.c2
-rw-r--r--sys/cam/scsi/scsi_targ_bh.c2
-rw-r--r--sys/cam/scsi/scsi_target.c2
-rw-r--r--sys/cam/scsi/scsi_targetio.h2
-rw-r--r--sys/compat/linux/linux_ioctl.c4
-rw-r--r--sys/compat/svr4/svr4_socket.c4
-rw-r--r--sys/contrib/softupdates/ffs_softdep.c6
-rw-r--r--sys/contrib/softupdates/softdep.h44
-rw-r--r--sys/dev/advansys/advlib.h6
-rw-r--r--sys/dev/advansys/adwlib.h10
-rw-r--r--sys/dev/aha/ahareg.h10
-rw-r--r--sys/dev/ahb/ahbreg.h6
-rw-r--r--sys/dev/aic/aicvar.h2
-rw-r--r--sys/dev/aic7xxx/aic7xxx.h10
-rw-r--r--sys/dev/aic7xxx/aicasm.c6
-rw-r--r--sys/dev/aic7xxx/aicasm.h4
-rw-r--r--sys/dev/aic7xxx/aicasm/aicasm.c6
-rw-r--r--sys/dev/aic7xxx/aicasm/aicasm.h4
-rw-r--r--sys/dev/aic7xxx/aicasm/aicasm_scan.l4
-rw-r--r--sys/dev/aic7xxx/aicasm/aicasm_symbol.h14
-rw-r--r--sys/dev/aic7xxx/aicasm_scan.l4
-rw-r--r--sys/dev/aic7xxx/aicasm_symbol.h14
-rw-r--r--sys/dev/aic7xxx/sequencer.h2
-rw-r--r--sys/dev/amd/amd.h4
-rw-r--r--sys/dev/amr/amrvar.h6
-rw-r--r--sys/dev/ata/ata-all.h4
-rw-r--r--sys/dev/ata/ata-disk.h2
-rw-r--r--sys/dev/ata/atapi-all.h2
-rw-r--r--sys/dev/awi/awivar.h4
-rw-r--r--sys/dev/buslogic/btreg.h10
-rw-r--r--sys/dev/dpt/dpt.h14
-rw-r--r--sys/dev/eisa/eisaconf.c8
-rw-r--r--sys/dev/ida/idavar.h8
-rw-r--r--sys/dev/kbd/kbd.c4
-rw-r--r--sys/dev/kbd/kbdreg.h2
-rw-r--r--sys/dev/mii/miivar.h4
-rw-r--r--sys/dev/mlx/mlxvar.h6
-rw-r--r--sys/dev/pccard/pccardvar.h8
-rw-r--r--sys/dev/pci/pci.c6
-rw-r--r--sys/dev/pcic/i82365var.h4
-rw-r--r--sys/dev/sk/if_skreg.h6
-rw-r--r--sys/dev/sound/pci/emu10k1.c4
-rw-r--r--sys/dev/streams/streams.c4
-rw-r--r--sys/dev/syscons/scterm.c2
-rw-r--r--sys/dev/syscons/scvidctl.c2
-rw-r--r--sys/dev/syscons/syscons.h4
-rw-r--r--sys/dev/ti/if_tireg.h10
-rw-r--r--sys/dev/usb/ohcivar.h6
-rw-r--r--sys/dev/usb/uhci.c2
-rw-r--r--sys/dev/usb/uhcivar.h6
-rw-r--r--sys/dev/usb/usb.c4
-rw-r--r--sys/dev/usb/usb_mem.h2
-rw-r--r--sys/dev/usb/usbdivar.h8
-rw-r--r--sys/dev/vn/vn.c4
-rw-r--r--sys/fs/fdescfs/fdesc.h2
-rw-r--r--sys/fs/fdescfs/fdesc_vnops.c2
-rw-r--r--sys/fs/fifofs/fifo_vnops.c4
-rw-r--r--sys/fs/hpfs/hpfs.h2
-rw-r--r--sys/fs/hpfs/hpfs_hash.c2
-rw-r--r--sys/fs/ntfs/ntfs_ihash.c2
-rw-r--r--sys/fs/ntfs/ntfs_inode.h8
-rw-r--r--sys/fs/ntfs/ntfs_subr.h2
-rw-r--r--sys/fs/nullfs/null.h2
-rw-r--r--sys/fs/nullfs/null_subr.c2
-rw-r--r--sys/fs/nwfs/nwfs_node.c2
-rw-r--r--sys/fs/nwfs/nwfs_node.h2
-rw-r--r--sys/fs/umapfs/umap.h2
-rw-r--r--sys/fs/umapfs/umap_subr.c2
-rw-r--r--sys/fs/unionfs/union.h2
-rw-r--r--sys/fs/unionfs/union_subr.c2
-rw-r--r--sys/gnu/ext2fs/ext2_ihash.c2
-rw-r--r--sys/gnu/ext2fs/inode.h2
-rw-r--r--sys/gnu/fs/ext2fs/inode.h2
-rw-r--r--sys/i386/i386/busdma_machdep.c10
-rw-r--r--sys/i386/include/pmap.h8
-rw-r--r--sys/i386/isa/bs/bsvar.h8
-rw-r--r--sys/i386/isa/ccbque.h2
-rw-r--r--sys/i386/isa/loran.c4
-rw-r--r--sys/i386/linux/linux_ioctl.c4
-rw-r--r--sys/isa/isa_common.h4
-rw-r--r--sys/kern/kern_conf.c4
-rw-r--r--sys/kern/kern_descrip.c4
-rw-r--r--sys/kern/kern_event.c6
-rw-r--r--sys/kern/kern_exit.c4
-rw-r--r--sys/kern/kern_fork.c4
-rw-r--r--sys/kern/kern_linker.c6
-rw-r--r--sys/kern/kern_module.c6
-rw-r--r--sys/kern/kern_proc.c4
-rw-r--r--sys/kern/kern_sig.c2
-rw-r--r--sys/kern/kern_subr.c4
-rw-r--r--sys/kern/kern_synch.c2
-rw-r--r--sys/kern/kern_sysctl.c2
-rw-r--r--sys/kern/subr_autoconf.c2
-rw-r--r--sys/kern/subr_bus.c2
-rw-r--r--sys/kern/subr_devstat.c4
-rw-r--r--sys/kern/subr_eventhandler.c2
-rw-r--r--sys/kern/sys_pipe.c2
-rw-r--r--sys/kern/tty.c2
-rw-r--r--sys/kern/uipc_socket.c4
-rw-r--r--sys/kern/uipc_syscalls.c2
-rw-r--r--sys/kern/vfs_aio.c28
-rw-r--r--sys/kern/vfs_bio.c2
-rw-r--r--sys/kern/vfs_cache.c10
-rw-r--r--sys/kern/vfs_export.c8
-rw-r--r--sys/kern/vfs_subr.c8
-rw-r--r--sys/kern/vfs_vnops.c2
-rw-r--r--sys/miscfs/fdesc/fdesc.h2
-rw-r--r--sys/miscfs/fdesc/fdesc_vnops.c2
-rw-r--r--sys/miscfs/fifofs/fifo_vnops.c4
-rw-r--r--sys/miscfs/nullfs/null.h2
-rw-r--r--sys/miscfs/nullfs/null_subr.c2
-rw-r--r--sys/miscfs/umapfs/umap.h2
-rw-r--r--sys/miscfs/umapfs/umap_subr.c2
-rw-r--r--sys/miscfs/union/union.h2
-rw-r--r--sys/miscfs/union/union_subr.c2
-rw-r--r--sys/net/hostcache.h4
-rw-r--r--sys/net/if_ef.c4
-rw-r--r--sys/net/if_media.h4
-rw-r--r--sys/net/if_var.h16
-rw-r--r--sys/net/if_vlan_var.h4
-rw-r--r--sys/net/pfil.h4
-rw-r--r--sys/net/raw_cb.h4
-rw-r--r--sys/netgraph/netgraph.h10
-rw-r--r--sys/netgraph/ng_base.c6
-rw-r--r--sys/netgraph/ng_ppp.c4
-rw-r--r--sys/netgraph/ng_socket.c2
-rw-r--r--sys/netgraph/ng_socketvar.h2
-rw-r--r--sys/netinet/if_ether.c4
-rw-r--r--sys/netinet/in_pcb.h12
-rw-r--r--sys/netinet/in_var.h8
-rw-r--r--sys/netinet/ip_dummynet.c2
-rw-r--r--sys/netinet/ip_flow.c2
-rw-r--r--sys/netinet/ip_flow.h2
-rw-r--r--sys/netinet/ip_fw.c2
-rw-r--r--sys/netinet/ip_fw.h2
-rw-r--r--sys/netinet/tcp_var.h4
-rw-r--r--sys/netinet6/in6_prefix.h8
-rw-r--r--sys/netinet6/in6_var.h6
-rw-r--r--sys/netinet6/ip6_fw.c2
-rw-r--r--sys/netinet6/ip6_fw.h2
-rw-r--r--sys/netinet6/ip6_var.h2
-rw-r--r--sys/netinet6/ipsec.h2
-rw-r--r--sys/netinet6/nd6.h12
-rw-r--r--sys/netinet6/nd6_nbr.c4
-rw-r--r--sys/netkey/key.c8
-rw-r--r--sys/netkey/keydb.h10
-rw-r--r--sys/netnatm/natm.h4
-rw-r--r--sys/netncp/ncp_conn.c8
-rw-r--r--sys/netncp/ncp_conn.h8
-rw-r--r--sys/netncp/ncp_rcfile.h10
-rw-r--r--sys/nfs/nfs.h34
-rw-r--r--sys/nfs/nfs_common.c2
-rw-r--r--sys/nfs/nfs_node.c2
-rw-r--r--sys/nfs/nfs_srvcache.c4
-rw-r--r--sys/nfs/nfs_subs.c2
-rw-r--r--sys/nfs/nfsmount.h8
-rw-r--r--sys/nfs/nfsnode.h10
-rw-r--r--sys/nfs/nfsrvcache.h4
-rw-r--r--sys/nfs/nqnfs.h8
-rw-r--r--sys/nfsclient/nfs.h34
-rw-r--r--sys/nfsclient/nfs_node.c2
-rw-r--r--sys/nfsclient/nfs_subs.c2
-rw-r--r--sys/nfsclient/nfsargs.h34
-rw-r--r--sys/nfsclient/nfsmount.h8
-rw-r--r--sys/nfsclient/nfsnode.h10
-rw-r--r--sys/nfsclient/nfsstats.h34
-rw-r--r--sys/nfsserver/nfs.h34
-rw-r--r--sys/nfsserver/nfs_srvcache.c4
-rw-r--r--sys/nfsserver/nfs_srvsubs.c2
-rw-r--r--sys/nfsserver/nfsrvcache.h4
-rw-r--r--sys/nfsserver/nfsrvstats.h34
-rw-r--r--sys/ntfs/ntfs_ihash.c2
-rw-r--r--sys/ntfs/ntfs_inode.h8
-rw-r--r--sys/ntfs/ntfs_subr.h2
-rw-r--r--sys/nwfs/nwfs_node.c2
-rw-r--r--sys/nwfs/nwfs_node.h2
-rw-r--r--sys/pci/amd.h4
-rw-r--r--sys/pci/if_skreg.h6
-rw-r--r--sys/pci/if_tireg.h10
-rw-r--r--sys/pci/pci.c6
-rw-r--r--sys/svr4/svr4_socket.c4
-rw-r--r--sys/sys/aio.h4
-rw-r--r--sys/sys/bio.h4
-rw-r--r--sys/sys/buf.h20
-rw-r--r--sys/sys/bus.h4
-rw-r--r--sys/sys/bus_private.h12
-rw-r--r--sys/sys/callout.h8
-rw-r--r--sys/sys/conf.h4
-rw-r--r--sys/sys/devicestat.h2
-rw-r--r--sys/sys/event.h8
-rw-r--r--sys/sys/eventhandler.h6
-rw-r--r--sys/sys/eventvar.h2
-rw-r--r--sys/sys/file.h4
-rw-r--r--sys/sys/filedesc.h4
-rw-r--r--sys/sys/kernel.h2
-rw-r--r--sys/sys/linedisc.h4
-rw-r--r--sys/sys/linker.h16
-rw-r--r--sys/sys/lockf.h4
-rw-r--r--sys/sys/mount.h6
-rw-r--r--sys/sys/proc.h24
-rw-r--r--sys/sys/queue.h36
-rw-r--r--sys/sys/rman.h12
-rw-r--r--sys/sys/socketvar.h10
-rw-r--r--sys/sys/sysctl.h4
-rw-r--r--sys/sys/tty.h2
-rw-r--r--sys/sys/unpcb.h6
-rw-r--r--sys/sys/vnode.h16
-rw-r--r--sys/ufs/ffs/ffs_softdep.c6
-rw-r--r--sys/ufs/ffs/softdep.h44
-rw-r--r--sys/ufs/ufs/extattr.h4
-rw-r--r--sys/ufs/ufs/inode.h2
-rw-r--r--sys/ufs/ufs/quota.h4
-rw-r--r--sys/ufs/ufs/ufs_ihash.c2
-rw-r--r--sys/ufs/ufs/ufs_quota.c4
-rw-r--r--sys/vm/vm_object.h16
-rw-r--r--sys/vm/vm_page.h6
-rw-r--r--sys/vm/vm_pager.h2
231 files changed, 755 insertions, 754 deletions
diff --git a/sys/alpha/alpha/busdma_machdep.c b/sys/alpha/alpha/busdma_machdep.c
index d01433ba01a3..f480322f0211 100644
--- a/sys/alpha/alpha/busdma_machdep.c
+++ b/sys/alpha/alpha/busdma_machdep.c
@@ -62,12 +62,12 @@ struct bounce_page {
bus_addr_t busaddr; /* Physical address */
vm_offset_t datavaddr; /* kva of client data */
bus_size_t datacount; /* client data count */
- STAILQ_ENTRY(bounce_page) links;
+ STAILQ_ENTRY(struct bounce_page) links;
};
int busdma_swi_pending;
-static STAILQ_HEAD(bp_list, bounce_page) bounce_page_list;
+static STAILQ_HEAD(bp_list, struct bounce_page) bounce_page_list;
static int free_bpages;
static int reserved_bpages;
static int active_bpages;
@@ -85,11 +85,11 @@ struct bus_dmamap {
bus_dmamap_callback_t *callback;
void *callback_arg;
void *sgmaphandle; /* handle into sgmap */
- STAILQ_ENTRY(bus_dmamap) links;
+ STAILQ_ENTRY(struct bus_dmamap) links;
};
-static STAILQ_HEAD(, bus_dmamap) bounce_map_waitinglist;
-static STAILQ_HEAD(, bus_dmamap) bounce_map_callbacklist;
+static STAILQ_HEAD(, struct bus_dmamap) bounce_map_waitinglist;
+static STAILQ_HEAD(, struct bus_dmamap) bounce_map_callbacklist;
static struct bus_dmamap nobounce_dmamap;
static int alloc_bounce_pages(bus_dma_tag_t dmat, u_int numpages);
diff --git a/sys/alpha/alpha/interrupt.c b/sys/alpha/alpha/interrupt.c
index db6f54257af2..120d3be1f244 100644
--- a/sys/alpha/alpha/interrupt.c
+++ b/sys/alpha/alpha/interrupt.c
@@ -293,10 +293,10 @@ badaddr_read(addr, size, rptr)
#define HASHVEC(vector) ((vector) % 31)
-LIST_HEAD(alpha_intr_list, alpha_intr);
+LIST_HEAD(alpha_intr_list, struct alpha_intr);
struct alpha_intr {
- LIST_ENTRY(alpha_intr) list; /* chain handlers in this hash bucket */
+ LIST_ENTRY(struct alpha_intr) list; /* chain handlers in this hash bucket */
int vector; /* vector to match */
driver_intr_t *intr; /* handler function */
void *arg; /* argument to handler */
diff --git a/sys/alpha/include/pmap.h b/sys/alpha/include/pmap.h
index 134c9a2d09fd..4b65301478ee 100644
--- a/sys/alpha/include/pmap.h
+++ b/sys/alpha/include/pmap.h
@@ -162,7 +162,7 @@ struct pv_entry;
struct md_page {
int pv_list_count;
int pv_flags;
- TAILQ_HEAD(,pv_entry) pv_list;
+ TAILQ_HEAD(, struct pv_entry) pv_list;
};
#define PV_TABLE_MOD 0x01 /* modified */
@@ -171,7 +171,7 @@ struct md_page {
struct pmap {
pt_entry_t *pm_lev1; /* KVA of lev0map */
vm_object_t pm_pteobj; /* Container for pte's */
- TAILQ_HEAD(,pv_entry) pm_pvlist; /* list of mappings in pmap */
+ TAILQ_HEAD(, struct pv_entry) pm_pvlist;/* list of mappings in pmap */
int pm_count; /* reference count */
int pm_flags; /* pmap flags */
int pm_active; /* active flag */
@@ -199,8 +199,8 @@ extern pmap_t kernel_pmap;
typedef struct pv_entry {
pmap_t pv_pmap; /* pmap where mapping lies */
vm_offset_t pv_va; /* virtual address for mapping */
- TAILQ_ENTRY(pv_entry) pv_list;
- TAILQ_ENTRY(pv_entry) pv_plist;
+ TAILQ_ENTRY(struct pv_entry) pv_list;
+ TAILQ_ENTRY(struct pv_entry) pv_plist;
vm_page_t pv_ptem; /* VM page for pte */
} *pv_entry_t;
diff --git a/sys/alpha/tc/espvar.h b/sys/alpha/tc/espvar.h
index 1efbbc0fcc47..edca635076ad 100644
--- a/sys/alpha/tc/espvar.h
+++ b/sys/alpha/tc/espvar.h
@@ -49,7 +49,7 @@
* occasionally xs->retries.
*/
struct ecb {
- TAILQ_ENTRY(ecb) chain;
+ TAILQ_ENTRY(struct ecb) chain;
struct scsi_xfer *xs; /* SCSI xfer ctrl block from above */
int flags; /* Status */
#define ECB_QNONE 0
@@ -173,7 +173,7 @@ struct esp_softc {
u_char sc_espfflags;
/* Lists of command blocks */
- TAILQ_HEAD(ecb_list, ecb) free_list,
+ TAILQ_HEAD(ecb_list, struct ecb) free_list,
ready_list,
nexus_list;
diff --git a/sys/amd64/amd64/busdma_machdep.c b/sys/amd64/amd64/busdma_machdep.c
index 0868b7c196dd..81476f6f32c0 100644
--- a/sys/amd64/amd64/busdma_machdep.c
+++ b/sys/amd64/amd64/busdma_machdep.c
@@ -61,12 +61,12 @@ struct bounce_page {
bus_addr_t busaddr; /* Physical address */
vm_offset_t datavaddr; /* kva of client data */
bus_size_t datacount; /* client data count */
- STAILQ_ENTRY(bounce_page) links;
+ STAILQ_ENTRY(struct bounce_page) links;
};
int busdma_swi_pending;
-static STAILQ_HEAD(bp_list, bounce_page) bounce_page_list;
+static STAILQ_HEAD(bp_list, struct bounce_page) bounce_page_list;
static int free_bpages;
static int reserved_bpages;
static int active_bpages;
@@ -82,11 +82,11 @@ struct bus_dmamap {
bus_size_t buflen; /* unmapped buffer length */
bus_dmamap_callback_t *callback;
void *callback_arg;
- STAILQ_ENTRY(bus_dmamap) links;
+ STAILQ_ENTRY(struct bus_dmamap) links;
};
-static STAILQ_HEAD(, bus_dmamap) bounce_map_waitinglist;
-static STAILQ_HEAD(, bus_dmamap) bounce_map_callbacklist;
+static STAILQ_HEAD(, struct bus_dmamap) bounce_map_waitinglist;
+static STAILQ_HEAD(, struct bus_dmamap) bounce_map_callbacklist;
static struct bus_dmamap nobounce_dmamap;
static int alloc_bounce_pages(bus_dma_tag_t dmat, u_int numpages);
diff --git a/sys/amd64/include/pmap.h b/sys/amd64/include/pmap.h
index 813f2ae02468..054db2be5d4d 100644
--- a/sys/amd64/include/pmap.h
+++ b/sys/amd64/include/pmap.h
@@ -191,13 +191,13 @@ struct pv_entry;
struct md_page {
int pv_list_count;
- TAILQ_HEAD(,pv_entry) pv_list;
+ TAILQ_HEAD(,struct pv_entry) pv_list;
};
struct pmap {
pd_entry_t *pm_pdir; /* KVA of page directory */
vm_object_t pm_pteobj; /* Container for pte's */
- TAILQ_HEAD(,pv_entry) pm_pvlist; /* list of mappings in pmap */
+ TAILQ_HEAD(,struct pv_entry) pm_pvlist;/* list of mappings in pmap */
int pm_count; /* reference count */
int pm_active; /* active on cpus */
struct pmap_statistics pm_stats; /* pmap statistics */
@@ -219,8 +219,8 @@ extern pmap_t kernel_pmap;
typedef struct pv_entry {
pmap_t pv_pmap; /* pmap where mapping lies */
vm_offset_t pv_va; /* virtual address for mapping */
- TAILQ_ENTRY(pv_entry) pv_list;
- TAILQ_ENTRY(pv_entry) pv_plist;
+ TAILQ_ENTRY(struct pv_entry) pv_list;
+ TAILQ_ENTRY(struct pv_entry) pv_plist;
vm_page_t pv_ptem; /* VM page for pte */
} *pv_entry_t;
diff --git a/sys/boot/common/bootstrap.h b/sys/boot/common/bootstrap.h
index 4c38154f7bcf..9bb6f5d3b450 100644
--- a/sys/boot/common/bootstrap.h
+++ b/sys/boot/common/bootstrap.h
@@ -122,7 +122,7 @@ struct pnphandler
struct pnpident
{
char *id_ident; /* ASCII identifier, actual format varies with bus/handler */
- STAILQ_ENTRY(pnpident) id_link;
+ STAILQ_ENTRY(struct pnpident) id_link;
};
struct pnpinfo
@@ -133,8 +133,8 @@ struct pnpinfo
int pi_argc; /* module arguments */
char **pi_argv;
struct pnphandler *pi_handler; /* handler which detected this device */
- STAILQ_HEAD(,pnpident) pi_ident; /* list of identifiers */
- STAILQ_ENTRY(pnpinfo) pi_link;
+ STAILQ_HEAD(, struct pnpident) pi_ident; /* list of identifiers */
+ STAILQ_ENTRY(struct pnpinfo) pi_link;
};
extern struct pnphandler *pnphandlers[]; /* provided by MD code */
diff --git a/sys/boot/common/pnp.c b/sys/boot/common/pnp.c
index bb3695be3a8c..b425bc2ba609 100644
--- a/sys/boot/common/pnp.c
+++ b/sys/boot/common/pnp.c
@@ -15,7 +15,7 @@
#include <string.h>
#include <bootstrap.h>
-STAILQ_HEAD(,pnpinfo) pnp_devices;
+STAILQ_HEAD(, struct pnpinfo) pnp_devices;
static int pnp_devices_initted = 0;
static void pnp_discard(void);
diff --git a/sys/cam/cam_ccb.h b/sys/cam/cam_ccb.h
index 32245225ddb8..e02c72fe2bd6 100644
--- a/sys/cam/cam_ccb.h
+++ b/sys/cam/cam_ccb.h
@@ -202,10 +202,10 @@ typedef enum {
#define XPT_FC_IS_QUEUED(ccb) \
(((ccb)->ccb_h.func_code & XPT_FC_QUEUED) != 0)
typedef union {
- LIST_ENTRY(ccb_hdr) le;
- SLIST_ENTRY(ccb_hdr) sle;
- TAILQ_ENTRY(ccb_hdr) tqe;
- STAILQ_ENTRY(ccb_hdr) stqe;
+ LIST_ENTRY(struct ccb_hdr) le;
+ SLIST_ENTRY(struct ccb_hdr) sle;
+ TAILQ_ENTRY(struct ccb_hdr) tqe;
+ STAILQ_ENTRY(struct ccb_hdr) stqe;
} camq_entry;
typedef union {
diff --git a/sys/cam/cam_periph.h b/sys/cam/cam_periph.h
index 54c549c39572..e2bc2e72a958 100644
--- a/sys/cam/cam_periph.h
+++ b/sys/cam/cam_periph.h
@@ -49,7 +49,7 @@ typedef periph_init_t *periph_init_func_t;
struct periph_driver {
periph_init_func_t init;
char *driver_name;
- TAILQ_HEAD(,cam_periph) units;
+ TAILQ_HEAD(, struct cam_periph) units;
u_int generation;
};
@@ -89,9 +89,9 @@ struct cam_periph {
#define CAM_PERIPH_RECOVERY_INPROG 0x20
u_int32_t immediate_priority;
u_int32_t refcount;
- SLIST_HEAD(, ccb_hdr) ccb_list; /* For "immediate" requests */
- SLIST_ENTRY(cam_periph) periph_links;
- TAILQ_ENTRY(cam_periph) unit_links;
+ SLIST_HEAD(, struct ccb_hdr) ccb_list; /* For "immediate" requests */
+ SLIST_ENTRY(struct cam_periph) periph_links;
+ TAILQ_ENTRY(struct cam_periph) unit_links;
ac_callback_t *deferred_callback;
ac_code deferred_ac;
};
diff --git a/sys/cam/cam_queue.h b/sys/cam/cam_queue.h
index 3d0a29c6bf88..52fb9b39b11d 100644
--- a/sys/cam/cam_queue.h
+++ b/sys/cam/cam_queue.h
@@ -50,9 +50,9 @@ struct camq {
u_int32_t qfrozen_cnt;
};
-TAILQ_HEAD(ccb_hdr_tailq, ccb_hdr);
-LIST_HEAD(ccb_hdr_list, ccb_hdr);
-SLIST_HEAD(ccb_hdr_slist, ccb_hdr);
+TAILQ_HEAD(ccb_hdr_tailq, struct ccb_hdr);
+LIST_HEAD(ccb_hdr_list, struct ccb_hdr);
+SLIST_HEAD(ccb_hdr_slist, struct ccb_hdr);
struct cam_ccbq {
struct camq queue;
diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c
index 53ff2883a6ab..5f24a9dd1132 100644
--- a/sys/cam/cam_xpt.c
+++ b/sys/cam/cam_xpt.c
@@ -69,16 +69,16 @@
* SIMs and peripherals to the async callback lists.
*/
struct async_node {
- SLIST_ENTRY(async_node) links;
+ SLIST_ENTRY(struct async_node) links;
u_int32_t event_enable; /* Async Event enables */
void (*callback)(void *arg, u_int32_t code,
struct cam_path *path, void *args);
void *callback_arg;
};
-SLIST_HEAD(async_list, async_node);
-SLIST_HEAD(periph_list, cam_periph);
-static STAILQ_HEAD(highpowerlist, ccb_hdr) highpowerq;
+SLIST_HEAD(async_list, struct async_node);
+SLIST_HEAD(periph_list, struct cam_periph);
+static STAILQ_HEAD(highpowerlist, struct ccb_hdr) highpowerq;
/*
* This is the maximum number of high powered commands (e.g. start unit)
@@ -107,7 +107,7 @@ struct cam_ed_qinfo {
* cam_ed structure for each device on the bus.
*/
struct cam_ed {
- TAILQ_ENTRY(cam_ed) links;
+ TAILQ_ENTRY(struct cam_ed) links;
struct cam_ed_qinfo alloc_ccb_entry;
struct cam_ed_qinfo send_ccb_entry;
struct cam_et *target;
@@ -155,8 +155,8 @@ struct cam_ed {
* of retries, or a bus rescan finds the device missing.
*/
struct cam_et {
- TAILQ_HEAD(, cam_ed) ed_entries;
- TAILQ_ENTRY(cam_et) links;
+ TAILQ_HEAD(, struct cam_ed) ed_entries;
+ TAILQ_ENTRY(struct cam_et) links;
struct cam_eb *bus;
target_id_t target_id;
u_int32_t refcount;
@@ -170,8 +170,8 @@ struct cam_et {
* xpt_bus_deregister.
*/
struct cam_eb {
- TAILQ_HEAD(, cam_et) et_entries;
- TAILQ_ENTRY(cam_eb) links;
+ TAILQ_HEAD(, struct cam_et) et_entries;
+ TAILQ_ENTRY(struct cam_eb) links;
path_id_t path_id;
struct cam_sim *sim;
struct timeval last_reset;
@@ -515,12 +515,12 @@ typedef int xpt_pdrvfunc_t (struct periph_driver **pdrv, void *arg);
static struct xpt_softc xsoftc;
/* Queues for our software interrupt handler */
-typedef TAILQ_HEAD(cam_isrq, ccb_hdr) cam_isrq_t;
+typedef TAILQ_HEAD(cam_isrq, struct ccb_hdr) cam_isrq_t;
static cam_isrq_t cam_bioq;
static cam_isrq_t cam_netq;
/* "Pool" of inactive ccbs managed by xpt_alloc_ccb and xpt_free_ccb */
-static SLIST_HEAD(,ccb_hdr) ccb_freeq;
+static SLIST_HEAD(, struct ccb_hdr) ccb_freeq;
static u_int xpt_max_ccbs; /*
* Maximum size of ccb pool. Modified as
* devices are added/removed or have their
@@ -575,7 +575,7 @@ static struct cdevsw xpt_cdevsw = {
static struct intr_config_hook *xpt_config_hook;
/* Registered busses */
-static TAILQ_HEAD(,cam_eb) xpt_busses;
+static TAILQ_HEAD(, struct cam_eb) xpt_busses;
static u_int bus_generation;
/* Storage for debugging datastructures */
@@ -1395,7 +1395,8 @@ xpt_remove_periph(struct cam_periph *periph)
device->generation++;
- SLIST_REMOVE(periph_head, periph, cam_periph, periph_links);
+ SLIST_REMOVE(periph_head, periph, struct cam_periph,
+ periph_links);
splx(s);
}
@@ -3130,7 +3131,7 @@ xpt_action(union ccb *start_ccb)
added &= ~cur_entry->event_enable;
if (csa->event_enable == 0) {
SLIST_REMOVE(async_head, cur_entry,
- async_node, links);
+ struct async_node, links);
csa->ccb_h.path->device->refcount--;
free(cur_entry, M_DEVBUF);
} else {
@@ -5038,7 +5039,7 @@ typedef enum {
} probe_flags;
typedef struct {
- TAILQ_HEAD(, ccb_hdr) request_ccbs;
+ TAILQ_HEAD(, struct ccb_hdr) request_ccbs;
probe_action action;
union ccb saved_ccb;
probe_flags flags;
diff --git a/sys/cam/scsi/scsi_cd.c b/sys/cam/scsi/scsi_cd.c
index e862e629445c..cd7d1b08e9ef 100644
--- a/sys/cam/scsi/scsi_cd.c
+++ b/sys/cam/scsi/scsi_cd.c
@@ -126,13 +126,13 @@ struct cd_softc {
cd_state state;
volatile cd_flags flags;
struct bio_queue_head bio_queue;
- LIST_HEAD(, ccb_hdr) pending_ccbs;
+ LIST_HEAD(, struct ccb_hdr) pending_ccbs;
struct cd_params params;
struct disk disk;
union ccb saved_ccb;
cd_quirks quirks;
struct devstat device_stats;
- STAILQ_ENTRY(cd_softc) changer_links;
+ STAILQ_ENTRY(struct cd_softc) changer_links;
struct cdchanger *changer;
int bufs_left;
struct cam_periph *periph;
@@ -299,11 +299,11 @@ struct cdchanger {
struct callout_handle short_handle;
struct callout_handle long_handle;
volatile cd_changer_flags flags;
- STAILQ_ENTRY(cdchanger) changer_links;
- STAILQ_HEAD(chdevlist, cd_softc) chluns;
+ STAILQ_ENTRY(struct cdchanger) changer_links;
+ STAILQ_HEAD(chdevlist, struct cd_softc) chluns;
};
-static STAILQ_HEAD(changerlist, cdchanger) changerq;
+static STAILQ_HEAD(changerlist, struct cdchanger) changerq;
void
cdinit(void)
@@ -477,7 +477,7 @@ cdcleanup(struct cam_periph *periph)
softc->changer->flags &= ~CHANGER_SHORT_TMOUT_SCHED;
}
- STAILQ_REMOVE(&changerq, softc->changer, cdchanger,
+ STAILQ_REMOVE(&changerq, softc->changer, struct cdchanger,
changer_links);
xpt_print_path(periph->path);
printf("removing changer entry\n");
diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c
index f7fdd5502e39..f615a0099f62 100644
--- a/sys/cam/scsi/scsi_da.c
+++ b/sys/cam/scsi/scsi_da.c
@@ -117,8 +117,8 @@ struct disk_params {
struct da_softc {
struct bio_queue_head bio_queue;
struct devstat device_stats;
- SLIST_ENTRY(da_softc) links;
- LIST_HEAD(, ccb_hdr) pending_ccbs;
+ SLIST_ENTRY(struct da_softc) links;
+ LIST_HEAD(, struct ccb_hdr) pending_ccbs;
da_state state;
da_flags flags;
da_quirks quirks;
@@ -278,7 +278,7 @@ static struct cdevsw da_cdevsw = {
static struct cdevsw dadisk_cdevsw;
-static SLIST_HEAD(,da_softc) softc_list;
+static SLIST_HEAD(, struct da_softc) softc_list;
static struct extend_array *daperiphs;
static int
@@ -825,7 +825,7 @@ daoninvalidate(struct cam_periph *periph)
}
splx(s);
- SLIST_REMOVE(&softc_list, softc, da_softc, links);
+ SLIST_REMOVE(&softc_list, softc, struct da_softc, links);
xpt_print_path(periph->path);
printf("lost device\n");
diff --git a/sys/cam/scsi/scsi_pt.c b/sys/cam/scsi/scsi_pt.c
index 8f51ea8709b9..589cc21e9092 100644
--- a/sys/cam/scsi/scsi_pt.c
+++ b/sys/cam/scsi/scsi_pt.c
@@ -78,7 +78,7 @@ typedef enum {
struct pt_softc {
struct bio_queue_head bio_queue;
struct devstat device_stats;
- LIST_HEAD(, ccb_hdr) pending_ccbs;
+ LIST_HEAD(, struct ccb_hdr) pending_ccbs;
pt_state state;
pt_flags flags;
union ccb saved_ccb;
diff --git a/sys/cam/scsi/scsi_targ_bh.c b/sys/cam/scsi/scsi_targ_bh.c
index ba80ac1950ca..50c07173fc77 100644
--- a/sys/cam/scsi/scsi_targ_bh.c
+++ b/sys/cam/scsi/scsi_targ_bh.c
@@ -80,7 +80,7 @@ typedef enum {
/* We stick a pointer to the originating accept TIO in each continue I/O CCB */
#define ccb_atio ppriv_ptr1
-TAILQ_HEAD(ccb_queue, ccb_hdr);
+TAILQ_HEAD(ccb_queue, struct ccb_hdr);
struct targbh_softc {
struct ccb_queue pending_queue;
diff --git a/sys/cam/scsi/scsi_target.c b/sys/cam/scsi/scsi_target.c
index db27cacbb26c..c3b243916913 100644
--- a/sys/cam/scsi/scsi_target.c
+++ b/sys/cam/scsi/scsi_target.c
@@ -1763,7 +1763,7 @@ targdone(struct cam_periph *periph, union ccb *done_ccb)
frozen = (done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0;
if (softc->state == TARG_STATE_TEARDOWN) {
SLIST_REMOVE(&softc->immed_notify_slist,
- &done_ccb->ccb_h, ccb_hdr,
+ &done_ccb->ccb_h, struct ccb_hdr,
periph_links.sle);
free(done_ccb, M_DEVBUF);
} else if (done_ccb->ccb_h.status == CAM_REQ_ABORTED) {
diff --git a/sys/cam/scsi/scsi_targetio.h b/sys/cam/scsi/scsi_targetio.h
index f628d945d954..c9b1e543e16b 100644
--- a/sys/cam/scsi/scsi_targetio.h
+++ b/sys/cam/scsi/scsi_targetio.h
@@ -38,7 +38,7 @@
#include <cam/cam.h>
#include <cam/cam_ccb.h>
-TAILQ_HEAD(ccb_queue, ccb_hdr);
+TAILQ_HEAD(ccb_queue, struct ccb_hdr);
/* Determine and clear exception state in the driver */
typedef enum {
diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c
index 582770fcf5d2..609baae740e9 100644
--- a/sys/compat/linux/linux_ioctl.c
+++ b/sys/compat/linux/linux_ioctl.c
@@ -85,12 +85,12 @@ DATA_SET(linux_ioctl_handler_set, termio_handler);
struct handler_element
{
- TAILQ_ENTRY(handler_element) list;
+ TAILQ_ENTRY(struct handler_element) list;
int (*func)(struct proc *, struct linux_ioctl_args *);
int low, high, span;
};
-static TAILQ_HEAD(, handler_element) handlers =
+static TAILQ_HEAD(, struct handler_element) handlers =
TAILQ_HEAD_INITIALIZER(handlers);
static int
diff --git a/sys/compat/svr4/svr4_socket.c b/sys/compat/svr4/svr4_socket.c
index 1884b07ef316..264e6547bffb 100644
--- a/sys/compat/svr4/svr4_socket.c
+++ b/sys/compat/svr4/svr4_socket.c
@@ -68,10 +68,10 @@ struct svr4_sockcache_entry {
struct sockaddr_un sock;/* Pathname for the socket */
udev_t dev; /* Device where the socket lives on */
ino_t ino; /* Inode where the socket lives on */
- TAILQ_ENTRY(svr4_sockcache_entry) entries;
+ TAILQ_ENTRY(struct svr4_sockcache_entry) entries;
};
-extern TAILQ_HEAD(svr4_sockcache_head, svr4_sockcache_entry) svr4_head;
+extern TAILQ_HEAD(svr4_sockcache_head, struct svr4_sockcache_entry) svr4_head;
extern int svr4_str_initialized;
struct sockaddr_un *
diff --git a/sys/contrib/softupdates/ffs_softdep.c b/sys/contrib/softupdates/ffs_softdep.c
index ce48d430b574..bea5aa8cb9ce 100644
--- a/sys/contrib/softupdates/ffs_softdep.c
+++ b/sys/contrib/softupdates/ffs_softdep.c
@@ -745,7 +745,7 @@ softdep_flushfiles(oldmnt, flags, p)
/*
* Structures and routines associated with pagedep caching.
*/
-LIST_HEAD(pagedep_hashhead, pagedep) *pagedep_hashtbl;
+LIST_HEAD(pagedep_hashhead, struct pagedep) *pagedep_hashtbl;
u_long pagedep_hash; /* size of hash table - 1 */
#define PAGEDEP_HASH(mp, inum, lbn) \
(&pagedep_hashtbl[((((register_t)(mp)) >> 13) + (inum) + (lbn)) & \
@@ -816,7 +816,7 @@ top:
/*
* Structures and routines associated with inodedep caching.
*/
-LIST_HEAD(inodedep_hashhead, inodedep) *inodedep_hashtbl;
+LIST_HEAD(inodedep_hashhead, struct inodedep) *inodedep_hashtbl;
static u_long inodedep_hash; /* size of hash table - 1 */
static long num_inodedep; /* number of inodedep allocated */
#define INODEDEP_HASH(fs, inum) \
@@ -897,7 +897,7 @@ top:
/*
* Structures and routines associated with newblk caching.
*/
-LIST_HEAD(newblk_hashhead, newblk) *newblk_hashtbl;
+LIST_HEAD(newblk_hashhead, struct newblk) *newblk_hashtbl;
u_long newblk_hash; /* size of hash table - 1 */
#define NEWBLK_HASH(fs, inum) \
(&newblk_hashtbl[((((register_t)(fs)) >> 13) + (inum)) & newblk_hash])
diff --git a/sys/contrib/softupdates/softdep.h b/sys/contrib/softupdates/softdep.h
index 8bbc409accbb..f68b9ca13005 100644
--- a/sys/contrib/softupdates/softdep.h
+++ b/sys/contrib/softupdates/softdep.h
@@ -128,7 +128,7 @@
* per second to process the items on the queue.
*/
-/* LIST_HEAD(workhead, worklist); -- declared in buf.h */
+/* LIST_HEAD(workhead, struct worklist); -- declared in buf.h */
/*
* Each request can be linked onto a work queue through its worklist structure.
@@ -138,7 +138,7 @@
* and the macros below changed to use it.
*/
struct worklist {
- LIST_ENTRY(worklist) wk_list; /* list of work requests */
+ LIST_ENTRY(struct worklist) wk_list; /* list of work requests */
unsigned short wk_type; /* type of request */
unsigned short wk_state; /* state flags */
};
@@ -160,13 +160,13 @@ struct worklist {
/*
* Various types of lists
*/
-LIST_HEAD(dirremhd, dirrem);
-LIST_HEAD(diraddhd, diradd);
-LIST_HEAD(newblkhd, newblk);
-LIST_HEAD(inodedephd, inodedep);
-LIST_HEAD(allocindirhd, allocindir);
-LIST_HEAD(allocdirecthd, allocdirect);
-TAILQ_HEAD(allocdirectlst, allocdirect);
+LIST_HEAD(dirremhd, struct dirrem);
+LIST_HEAD(diraddhd, struct diradd);
+LIST_HEAD(newblkhd, struct newblk);
+LIST_HEAD(inodedephd, struct inodedep);
+LIST_HEAD(allocindirhd, struct allocindir);
+LIST_HEAD(allocdirecthd, struct allocdirect);
+TAILQ_HEAD(allocdirectlst, struct allocdirect);
/*
* The "pagedep" structure tracks the various dependencies related to
@@ -191,7 +191,7 @@ TAILQ_HEAD(allocdirectlst, allocdirect);
struct pagedep {
struct worklist pd_list; /* page buffer */
# define pd_state pd_list.wk_state /* check for multiple I/O starts */
- LIST_ENTRY(pagedep) pd_hash; /* hashed lookup */
+ LIST_ENTRY(struct pagedep) pd_hash; /* hashed lookup */
struct mount *pd_mnt; /* associated mount point */
ino_t pd_ino; /* associated file */
ufs_lbn_t pd_lbn; /* block within file */
@@ -250,12 +250,12 @@ struct pagedep {
struct inodedep {
struct worklist id_list; /* buffer holding inode block */
# define id_state id_list.wk_state /* inode dependency state */
- LIST_ENTRY(inodedep) id_hash; /* hashed lookup */
+ LIST_ENTRY(struct inodedep) id_hash; /* hashed lookup */
struct fs *id_fs; /* associated filesystem */
ino_t id_ino; /* dependent inode */
nlink_t id_nlinkdelta; /* saved effective link count */
struct dinode *id_savedino; /* saved dinode contents */
- LIST_ENTRY(inodedep) id_deps; /* bmsafemap's list of inodedep's */
+ LIST_ENTRY(struct inodedep) id_deps; /* bmsafemap's list of inodedep's */
struct buf *id_buf; /* related bmsafemap (if pending) */
off_t id_savedsize; /* file size saved during rollback */
struct workhead id_pendinghd; /* entries awaiting directory write */
@@ -274,11 +274,11 @@ struct inodedep {
* is not set (i.e., its cylinder group map has not been written).
*/
struct newblk {
- LIST_ENTRY(newblk) nb_hash; /* hashed lookup */
+ LIST_ENTRY(struct newblk) nb_hash; /* hashed lookup */
struct fs *nb_fs; /* associated filesystem */
ufs_daddr_t nb_newblkno; /* allocated block number */
int nb_state; /* state of bitmap dependency */
- LIST_ENTRY(newblk) nb_deps; /* bmsafemap's list of newblk's */
+ LIST_ENTRY(struct newblk) nb_deps; /* bmsafemap's list of newblk's */
struct bmsafemap *nb_bmsafemap; /* associated bmsafemap */
};
@@ -321,13 +321,13 @@ struct bmsafemap {
struct allocdirect {
struct worklist ad_list; /* buffer holding block */
# define ad_state ad_list.wk_state /* block pointer state */
- TAILQ_ENTRY(allocdirect) ad_next; /* inodedep's list of allocdirect's */
+ TAILQ_ENTRY(struct allocdirect) ad_next; /* inodedep's list of allocdirect's */
ufs_lbn_t ad_lbn; /* block within file */
ufs_daddr_t ad_newblkno; /* new value of block pointer */
ufs_daddr_t ad_oldblkno; /* old value of block pointer */
long ad_newsize; /* size of new block */
long ad_oldsize; /* size of old block */
- LIST_ENTRY(allocdirect) ad_deps; /* bmsafemap's list of allocdirect's */
+ LIST_ENTRY(struct allocdirect) ad_deps; /* bmsafemap's list of allocdirect's */
struct buf *ad_buf; /* cylgrp buffer (if pending) */
struct inodedep *ad_inodedep; /* associated inodedep */
struct freefrag *ad_freefrag; /* fragment to be freed (if any) */
@@ -375,13 +375,13 @@ struct indirdep {
struct allocindir {
struct worklist ai_list; /* buffer holding indirect block */
# define ai_state ai_list.wk_state /* indirect block pointer state */
- LIST_ENTRY(allocindir) ai_next; /* indirdep's list of allocindir's */
+ LIST_ENTRY(struct allocindir) ai_next; /* indirdep's list of allocindir's */
int ai_offset; /* pointer offset in indirect block */
ufs_daddr_t ai_newblkno; /* new block pointer value */
ufs_daddr_t ai_oldblkno; /* old block pointer value */
struct freefrag *ai_freefrag; /* block to be freed when complete */
struct indirdep *ai_indirdep; /* address of associated indirdep */
- LIST_ENTRY(allocindir) ai_deps; /* bmsafemap's list of allocindir's */
+ LIST_ENTRY(struct allocindir) ai_deps; /* bmsafemap's list of allocindir's */
struct buf *ai_buf; /* cylgrp buffer (if pending) */
};
@@ -478,7 +478,7 @@ struct freefile {
struct diradd {
struct worklist da_list; /* id_inowait or id_pendinghd list */
# define da_state da_list.wk_state /* state of the new directory entry */
- LIST_ENTRY(diradd) da_pdlist; /* pagedep holding directory block */
+ LIST_ENTRY(struct diradd) da_pdlist; /* pagedep holding directory block */
doff_t da_offset; /* offset of new dir entry in dir blk */
ino_t da_newinum; /* inode number for the new dir entry */
union {
@@ -518,9 +518,9 @@ struct mkdir {
# define md_state md_list.wk_state /* type: MKDIR_PARENT or MKDIR_BODY */
struct diradd *md_diradd; /* associated diradd */
struct buf *md_buf; /* MKDIR_BODY: buffer holding dir */
- LIST_ENTRY(mkdir) md_mkdirs; /* list of all mkdirs */
+ LIST_ENTRY(struct mkdir) md_mkdirs; /* list of all mkdirs */
};
-LIST_HEAD(mkdirlist, mkdir) mkdirlisthd;
+LIST_HEAD(mkdirlist, struct mkdir) mkdirlisthd;
/*
* A "dirrem" structure describes an operation to decrement the link
@@ -536,7 +536,7 @@ LIST_HEAD(mkdirlist, mkdir) mkdirlisthd;
struct dirrem {
struct worklist dm_list; /* delayed worklist */
# define dm_state dm_list.wk_state /* state of the old directory entry */
- LIST_ENTRY(dirrem) dm_next; /* pagedep's list of dirrem's */
+ LIST_ENTRY(struct dirrem) dm_next; /* pagedep's list of dirrem's */
struct mount *dm_mnt; /* associated mount point */
ino_t dm_oldinum; /* inum of the removed dir entry */
union {
diff --git a/sys/dev/advansys/advlib.h b/sys/dev/advansys/advlib.h
index ba9703db1b6d..a8cd9467240c 100644
--- a/sys/dev/advansys/advlib.h
+++ b/sys/dev/advansys/advlib.h
@@ -93,7 +93,7 @@ struct adv_ccb_info {
adv_ccb_state state;
bus_dmamap_t dmamap;
union ccb* ccb;
- SLIST_ENTRY(adv_ccb_info) links;
+ SLIST_ENTRY(struct adv_ccb_info) links;
};
#define ccb_cinfo_ptr spriv_ptr0
@@ -497,9 +497,9 @@ struct adv_softc {
bus_space_tag_t tag;
bus_space_handle_t bsh;
struct cam_sim *sim;
- LIST_HEAD(, ccb_hdr) pending_ccbs;
+ LIST_HEAD(, struct ccb_hdr) pending_ccbs;
struct adv_ccb_info *ccb_infos;
- SLIST_HEAD(, adv_ccb_info) free_ccb_infos;
+ SLIST_HEAD(, struct adv_ccb_info) free_ccb_infos;
bus_dma_tag_t parent_dmat;
bus_dma_tag_t buffer_dmat;
bus_dma_tag_t sense_dmat;
diff --git a/sys/dev/advansys/adwlib.h b/sys/dev/advansys/adwlib.h
index c470c101b0bd..7973dcab077f 100644
--- a/sys/dev/advansys/adwlib.h
+++ b/sys/dev/advansys/adwlib.h
@@ -324,7 +324,7 @@ struct sg_map_node {
bus_dmamap_t sg_dmamap;
bus_addr_t sg_physaddr;
struct adw_sg_block* sg_vaddr;
- SLIST_ENTRY(sg_map_node) links;
+ SLIST_ENTRY(struct sg_map_node) links;
};
typedef enum {
@@ -425,7 +425,7 @@ struct acb {
struct adw_sg_block* sg_blocks;
bus_addr_t sg_busaddr;
struct scsi_sense_data sense_data;
- SLIST_ENTRY(acb) links;
+ SLIST_ENTRY(struct acb) links;
};
/*
@@ -612,15 +612,15 @@ struct adw_softc
struct adw_carrier *free_carriers;
struct adw_carrier *commandq;
struct adw_carrier *responseq;
- LIST_HEAD(, ccb_hdr) pending_ccbs;
- SLIST_HEAD(, acb) free_acb_list;
+ LIST_HEAD(, struct ccb_hdr) pending_ccbs;
+ SLIST_HEAD(, struct acb) free_acb_list;
bus_dma_tag_t parent_dmat;
bus_dma_tag_t carrier_dmat; /* dmat for our acb carriers*/
bus_dmamap_t carrier_dmamap;
bus_dma_tag_t acb_dmat; /* dmat for our ccb array */
bus_dmamap_t acb_dmamap;
bus_dma_tag_t sg_dmat; /* dmat for our sg maps */
- SLIST_HEAD(, sg_map_node) sg_maps;
+ SLIST_HEAD(, struct sg_map_node) sg_maps;
bus_addr_t acb_busbase;
bus_addr_t carrier_busbase;
adw_chip chip;
diff --git a/sys/dev/aha/ahareg.h b/sys/dev/aha/ahareg.h
index 339eace12e20..f634a85c7bc3 100644
--- a/sys/dev/aha/ahareg.h
+++ b/sys/dev/aha/ahareg.h
@@ -319,7 +319,7 @@ typedef enum {
struct aha_ccb {
struct aha_hccb hccb; /* hccb assumed to be at 0 */
- SLIST_ENTRY(aha_ccb) links;
+ SLIST_ENTRY(struct aha_ccb) links;
u_int32_t flags;
union ccb *ccb;
bus_dmamap_t dmamap;
@@ -331,7 +331,7 @@ struct sg_map_node {
bus_dmamap_t sg_dmamap;
bus_addr_t sg_physaddr;
aha_sg_t* sg_vaddr;
- SLIST_ENTRY(sg_map_node) links;
+ SLIST_ENTRY(struct sg_map_node) links;
};
struct aha_softc {
@@ -344,8 +344,8 @@ struct aha_softc {
aha_mbox_out_t *last_outbox;
aha_mbox_in_t *last_inbox;
struct aha_ccb *aha_ccb_array;
- SLIST_HEAD(,aha_ccb) free_aha_ccbs;
- LIST_HEAD(,ccb_hdr) pending_ccbs;
+ SLIST_HEAD(, struct aha_ccb) free_aha_ccbs;
+ LIST_HEAD(, struct ccb_hdr) pending_ccbs;
u_int active_ccbs;
u_int32_t aha_ccb_physbase;
aha_ccb_opcode_t ccb_sg_opcode;
@@ -367,7 +367,7 @@ struct aha_softc {
bus_dma_tag_t ccb_dmat; /* dmat for our ccb array */
bus_dmamap_t ccb_dmamap;
bus_dma_tag_t sg_dmat; /* dmat for our sg maps */
- SLIST_HEAD(, sg_map_node) sg_maps;
+ SLIST_HEAD(, struct sg_map_node) sg_maps;
bus_addr_t mailbox_physbase;
u_int num_ccbs; /* Number of CCBs malloc'd */
u_int max_ccbs; /* Maximum allocatable CCBs */
diff --git a/sys/dev/ahb/ahbreg.h b/sys/dev/ahb/ahbreg.h
index c72f068aa3b9..13127482b97d 100644
--- a/sys/dev/ahb/ahbreg.h
+++ b/sys/dev/ahb/ahbreg.h
@@ -251,7 +251,7 @@ struct ecb {
struct ecb_status status;
struct scsi_sense_data sense;
ahb_sg_t sg_list[AHB_NSEG];
- SLIST_ENTRY(ecb) links;
+ SLIST_ENTRY(struct ecb) links;
ecb_state state;
union ccb *ccb;
bus_dmamap_t dmamap;
@@ -262,8 +262,8 @@ struct ahb_softc {
bus_space_handle_t bsh;
struct cam_sim *sim;
struct cam_path *path;
- SLIST_HEAD(,ecb) free_ecbs;
- LIST_HEAD(,ccb_hdr) pending_ccbs;
+ SLIST_HEAD(, struct ecb) free_ecbs;
+ LIST_HEAD(, struct ccb_hdr) pending_ccbs;
struct ecb *ecb_array;
u_int32_t ecb_physbase;
bus_dma_tag_t buffer_dmat; /* dmat for buffer I/O */
diff --git a/sys/dev/aic/aicvar.h b/sys/dev/aic/aicvar.h
index 5d789b493b95..ce43a6ba555d 100644
--- a/sys/dev/aic/aicvar.h
+++ b/sys/dev/aic/aicvar.h
@@ -76,7 +76,7 @@ struct aic_softc {
struct cam_sim *sim;
struct cam_path *path;
- TAILQ_HEAD(,ccb_hdr) pending_ccbs, nexus_ccbs;
+ TAILQ_HEAD(, struct ccb_hdr) pending_ccbs, nexus_ccbs;
struct aic_scb *nexus;
u_int32_t flags;
diff --git a/sys/dev/aic7xxx/aic7xxx.h b/sys/dev/aic7xxx/aic7xxx.h
index 534f2e4381d3..5aed8ce5f4ac 100644
--- a/sys/dev/aic7xxx/aic7xxx.h
+++ b/sys/dev/aic7xxx/aic7xxx.h
@@ -250,7 +250,7 @@ struct hardware_scb {
struct scb {
struct hardware_scb *hscb;
- SLIST_ENTRY(scb) links; /* for chaining */
+ SLIST_ENTRY(struct scb) links; /* for chaining */
union ccb *ccb; /* the ccb for this cmd */
scb_flag flags;
bus_dmamap_t dmamap;
@@ -432,13 +432,13 @@ struct sg_map_node {
bus_dmamap_t sg_dmamap;
bus_addr_t sg_physaddr;
struct ahc_dma_seg* sg_vaddr;
- SLIST_ENTRY(sg_map_node) links;
+ SLIST_ENTRY(struct sg_map_node) links;
};
struct scb_data {
struct hardware_scb *hscbs; /* Array of hardware SCBs */
struct scb *scbarray; /* Array of kernel SCBs */
- SLIST_HEAD(, scb) free_scbs; /*
+ SLIST_HEAD(, struct scb) free_scbs; /*
* Pool of SCBs ready to be assigned
* commands to execute.
*/
@@ -454,7 +454,7 @@ struct scb_data {
bus_dmamap_t sense_dmamap;
bus_addr_t sense_busaddr;
bus_dma_tag_t sg_dmat; /* dmat for our sg segments */
- SLIST_HEAD(, sg_map_node) sg_maps;
+ SLIST_HEAD(, struct sg_map_node) sg_maps;
u_int8_t numscbs;
u_int8_t maxhscbs; /* Number of SCBs on the card */
u_int8_t init_level; /*
@@ -472,7 +472,7 @@ struct ahc_softc {
/*
* CCBs that have been send to the controller
*/
- LIST_HEAD(, ccb_hdr) pending_ccbs;
+ LIST_HEAD(, struct ccb_hdr) pending_ccbs;
/*
* Target mode related state kept on a per enabled lun basis.
diff --git a/sys/dev/aic7xxx/aicasm.c b/sys/dev/aic7xxx/aicasm.c
index 9af5c8343274..a7f9c85fd506 100644
--- a/sys/dev/aic7xxx/aicasm.c
+++ b/sys/dev/aic7xxx/aicasm.c
@@ -42,14 +42,14 @@
#include "sequencer.h"
typedef struct patch {
- STAILQ_ENTRY(patch) links;
+ STAILQ_ENTRY(struct patch) links;
int patch_func;
u_int begin;
u_int skip_instr;
u_int skip_patch;
} patch_t;
-STAILQ_HEAD(patch_list, patch) patches;
+STAILQ_HEAD(patch_list, struct patch) patches;
static void usage(void);
static void back_patch(void);
@@ -70,7 +70,7 @@ FILE *regfile;
char *listfilename;
FILE *listfile;
-static STAILQ_HEAD(,instruction) seq_program;
+static STAILQ_HEAD(, struct instruction) seq_program;
struct scope_list scope_stack;
symlist_t patch_functions;
diff --git a/sys/dev/aic7xxx/aicasm.h b/sys/dev/aic7xxx/aicasm.h
index 7e6b4683dfdb..2f729b32f012 100644
--- a/sys/dev/aic7xxx/aicasm.h
+++ b/sys/dev/aic7xxx/aicasm.h
@@ -41,7 +41,7 @@
typedef struct path_entry {
char *directory;
int quoted_includes_only;
- SLIST_ENTRY(path_entry) links;
+ SLIST_ENTRY(struct path_entry) links;
} *path_entry_t;
typedef enum {
@@ -50,7 +50,7 @@ typedef enum {
SOURCE_FILE
} include_type;
-SLIST_HEAD(path_list, path_entry);
+SLIST_HEAD(path_list, struct path_entry);
extern struct path_list search_path;
extern struct scope_list scope_stack;
diff --git a/sys/dev/aic7xxx/aicasm/aicasm.c b/sys/dev/aic7xxx/aicasm/aicasm.c
index 9af5c8343274..a7f9c85fd506 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm.c
+++ b/sys/dev/aic7xxx/aicasm/aicasm.c
@@ -42,14 +42,14 @@
#include "sequencer.h"
typedef struct patch {
- STAILQ_ENTRY(patch) links;
+ STAILQ_ENTRY(struct patch) links;
int patch_func;
u_int begin;
u_int skip_instr;
u_int skip_patch;
} patch_t;
-STAILQ_HEAD(patch_list, patch) patches;
+STAILQ_HEAD(patch_list, struct patch) patches;
static void usage(void);
static void back_patch(void);
@@ -70,7 +70,7 @@ FILE *regfile;
char *listfilename;
FILE *listfile;
-static STAILQ_HEAD(,instruction) seq_program;
+static STAILQ_HEAD(, struct instruction) seq_program;
struct scope_list scope_stack;
symlist_t patch_functions;
diff --git a/sys/dev/aic7xxx/aicasm/aicasm.h b/sys/dev/aic7xxx/aicasm/aicasm.h
index 7e6b4683dfdb..2f729b32f012 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm.h
+++ b/sys/dev/aic7xxx/aicasm/aicasm.h
@@ -41,7 +41,7 @@
typedef struct path_entry {
char *directory;
int quoted_includes_only;
- SLIST_ENTRY(path_entry) links;
+ SLIST_ENTRY(struct path_entry) links;
} *path_entry_t;
typedef enum {
@@ -50,7 +50,7 @@ typedef enum {
SOURCE_FILE
} include_type;
-SLIST_HEAD(path_list, path_entry);
+SLIST_HEAD(path_list, struct path_entry);
extern struct path_list search_path;
extern struct scope_list scope_stack;
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_scan.l b/sys/dev/aic7xxx/aicasm/aicasm_scan.l
index 28689cbd4996..51a13f2293fd 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm_scan.l
+++ b/sys/dev/aic7xxx/aicasm/aicasm_scan.l
@@ -200,10 +200,10 @@ typedef struct include {
YY_BUFFER_STATE buffer;
int lineno;
char *filename;
- SLIST_ENTRY(include) links;
+ SLIST_ENTRY(struct include) links;
}include_t;
-SLIST_HEAD(, include) include_stack;
+SLIST_HEAD(, struct include) include_stack;
void
include_file(file_name, type)
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_symbol.h b/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
index 79809db8e6a5..d86b4f055ab8 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
+++ b/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
@@ -58,7 +58,7 @@ struct reg_info {
int typecheck_masks;
};
-typedef SLIST_HEAD(symlist, symbol_node) symlist_t;
+typedef SLIST_HEAD(symlist, struct symbol_node) symlist_t;
struct mask_info {
symlist_t symrefs;
@@ -106,7 +106,7 @@ typedef struct symbol_ref {
} symbol_ref_t;
typedef struct symbol_node {
- SLIST_ENTRY(symbol_node) links;
+ SLIST_ENTRY(struct symbol_node) links;
symbol_t *symbol;
}symbol_node_t;
@@ -123,9 +123,9 @@ typedef struct patch_info {
} patch_info_t;
typedef struct scope {
- SLIST_ENTRY(scope) scope_stack_links;
- TAILQ_ENTRY(scope) scope_links;
- TAILQ_HEAD(, scope) inner_scope;
+ SLIST_ENTRY(struct scope) scope_stack_links;
+ TAILQ_ENTRY(struct scope) scope_links;
+ TAILQ_HEAD(, struct scope) inner_scope;
scope_type type;
int inner_scope_patches;
int begin_addr;
@@ -134,8 +134,8 @@ typedef struct scope {
int func_num;
} scope_t;
-SLIST_HEAD(scope_list, scope);
-TAILQ_HEAD(scope_tailq, scope);
+SLIST_HEAD(scope_list, struct scope);
+TAILQ_HEAD(scope_tailq, struct scope);
void symbol_delete __P((symbol_t *symbol));
diff --git a/sys/dev/aic7xxx/aicasm_scan.l b/sys/dev/aic7xxx/aicasm_scan.l
index 28689cbd4996..51a13f2293fd 100644
--- a/sys/dev/aic7xxx/aicasm_scan.l
+++ b/sys/dev/aic7xxx/aicasm_scan.l
@@ -200,10 +200,10 @@ typedef struct include {
YY_BUFFER_STATE buffer;
int lineno;
char *filename;
- SLIST_ENTRY(include) links;
+ SLIST_ENTRY(struct include) links;
}include_t;
-SLIST_HEAD(, include) include_stack;
+SLIST_HEAD(, struct include) include_stack;
void
include_file(file_name, type)
diff --git a/sys/dev/aic7xxx/aicasm_symbol.h b/sys/dev/aic7xxx/aicasm_symbol.h
index 79809db8e6a5..d86b4f055ab8 100644
--- a/sys/dev/aic7xxx/aicasm_symbol.h
+++ b/sys/dev/aic7xxx/aicasm_symbol.h
@@ -58,7 +58,7 @@ struct reg_info {
int typecheck_masks;
};
-typedef SLIST_HEAD(symlist, symbol_node) symlist_t;
+typedef SLIST_HEAD(symlist, struct symbol_node) symlist_t;
struct mask_info {
symlist_t symrefs;
@@ -106,7 +106,7 @@ typedef struct symbol_ref {
} symbol_ref_t;
typedef struct symbol_node {
- SLIST_ENTRY(symbol_node) links;
+ SLIST_ENTRY(struct symbol_node) links;
symbol_t *symbol;
}symbol_node_t;
@@ -123,9 +123,9 @@ typedef struct patch_info {
} patch_info_t;
typedef struct scope {
- SLIST_ENTRY(scope) scope_stack_links;
- TAILQ_ENTRY(scope) scope_links;
- TAILQ_HEAD(, scope) inner_scope;
+ SLIST_ENTRY(struct scope) scope_stack_links;
+ TAILQ_ENTRY(struct scope) scope_links;
+ TAILQ_HEAD(, struct scope) inner_scope;
scope_type type;
int inner_scope_patches;
int begin_addr;
@@ -134,8 +134,8 @@ typedef struct scope {
int func_num;
} scope_t;
-SLIST_HEAD(scope_list, scope);
-TAILQ_HEAD(scope_tailq, scope);
+SLIST_HEAD(scope_list, struct scope);
+TAILQ_HEAD(scope_tailq, struct scope);
void symbol_delete __P((symbol_t *symbol));
diff --git a/sys/dev/aic7xxx/sequencer.h b/sys/dev/aic7xxx/sequencer.h
index 4f054916ebe8..a84951c30aff 100644
--- a/sys/dev/aic7xxx/sequencer.h
+++ b/sys/dev/aic7xxx/sequencer.h
@@ -69,7 +69,7 @@ struct instruction {
union ins_formats format;
u_int srcline;
struct symbol *patch_label;
- STAILQ_ENTRY(instruction) links;
+ STAILQ_ENTRY(struct instruction) links;
};
#define AIC_OP_OR 0x0
diff --git a/sys/dev/amd/amd.h b/sys/dev/amd/amd.h
index 85f4f80e1474..e36956e4fe93 100644
--- a/sys/dev/amd/amd.h
+++ b/sys/dev/amd/amd.h
@@ -154,7 +154,7 @@ typedef struct _EEprom {
* SCSI Request Block
*/
struct amd_srb {
- TAILQ_ENTRY(amd_srb) links;
+ TAILQ_ENTRY(struct amd_srb) links;
u_int8_t CmdBlock[12];
union ccb *pccb;
bus_dmamap_t dmamap;
@@ -187,7 +187,7 @@ struct amd_srb {
u_int8_t ScsiCmdLen;
};
-TAILQ_HEAD(srb_queue, amd_srb);
+TAILQ_HEAD(srb_queue, struct amd_srb);
/*
* Per-adapter, software configuration.
diff --git a/sys/dev/amr/amrvar.h b/sys/dev/amr/amrvar.h
index 5edfb1fb93f0..6a136be0645f 100644
--- a/sys/dev/amr/amrvar.h
+++ b/sys/dev/amr/amrvar.h
@@ -69,7 +69,7 @@ struct amr_logdrive
*/
struct amr_command
{
- TAILQ_ENTRY(amr_command) ac_link;
+ TAILQ_ENTRY(struct amr_command) ac_link;
struct amr_softc *ac_sc;
u_int8_t ac_slot;
@@ -140,9 +140,9 @@ struct amr_softc
int amr_waitbufs;
struct amr_command *amr_busycmd[AMR_MAXCMD];
int amr_busycmdcount;
- TAILQ_HEAD(,amr_command) amr_work;
+ TAILQ_HEAD(, struct amr_command) amr_work;
int amr_workcount;
- TAILQ_HEAD(,amr_command) amr_freecmds;
+ TAILQ_HEAD(, struct amr_command) amr_freecmds;
int amr_locks; /* reentrancy avoidance */
diff --git a/sys/dev/ata/ata-all.h b/sys/dev/ata/ata-all.h
index 14a3d971882e..3947060b4536 100644
--- a/sys/dev/ata/ata-all.h
+++ b/sys/dev/ata/ata-all.h
@@ -304,8 +304,8 @@ struct ata_softc {
#define ATA_ACTIVE_ATAPI 0x6
#define ATA_REINITING 0x7
- TAILQ_HEAD(, ad_request) ata_queue; /* head of ATA queue */
- TAILQ_HEAD(, atapi_request) atapi_queue; /* head of ATAPI queue */
+ TAILQ_HEAD(, struct ad_request) ata_queue; /* head of ATA queue */
+ TAILQ_HEAD(, struct atapi_request) atapi_queue; /* head of ATAPI queue */
void *running; /* currently running request */
};
diff --git a/sys/dev/ata/ata-disk.h b/sys/dev/ata/ata-disk.h
index 4a184d9a495b..b7c870ad95bf 100644
--- a/sys/dev/ata/ata-disk.h
+++ b/sys/dev/ata/ata-disk.h
@@ -67,7 +67,7 @@ struct ad_request {
int8_t *data; /* pointer to data buf */
struct bio *bp; /* associated bio ptr */
u_int8_t tag; /* tag ID of this request */
- TAILQ_ENTRY(ad_request) chain; /* list management */
+ TAILQ_ENTRY(struct ad_request) chain; /* list management */
};
void ad_attach(struct ata_softc *, int32_t);
diff --git a/sys/dev/ata/atapi-all.h b/sys/dev/ata/atapi-all.h
index 6223f5d8e2cc..35512caf8824 100644
--- a/sys/dev/ata/atapi-all.h
+++ b/sys/dev/ata/atapi-all.h
@@ -174,7 +174,7 @@ struct atapi_request {
int8_t *data; /* pointer to data buf */
atapi_callback_t *callback; /* ptr to callback func */
void *driver; /* driver specific */
- TAILQ_ENTRY(atapi_request) chain; /* list management */
+ TAILQ_ENTRY(struct atapi_request) chain; /* list management */
};
void atapi_attach(struct ata_softc *, int32_t);
diff --git a/sys/dev/awi/awivar.h b/sys/dev/awi/awivar.h
index e3c85cc3ba1b..bc2da4c54867 100644
--- a/sys/dev/awi/awivar.h
+++ b/sys/dev/awi/awivar.h
@@ -61,7 +61,7 @@ enum awi_status {
struct awi_bss
{
- TAILQ_ENTRY(awi_bss) list;
+ TAILQ_ENTRY(struct awi_bss) list;
u_int8_t esrc[ETHER_ADDR_LEN];
u_int8_t chanset; /* channel set to use */
u_int8_t pattern; /* hop pattern to use */
@@ -116,7 +116,7 @@ struct awi_softc
int sc_mgt_timer;
- TAILQ_HEAD(, awi_bss) sc_scan;
+ TAILQ_HEAD(, struct awi_bss) sc_scan;
u_int8_t sc_scan_cur;
u_int8_t sc_scan_min;
u_int8_t sc_scan_max;
diff --git a/sys/dev/buslogic/btreg.h b/sys/dev/buslogic/btreg.h
index f6a1851757bf..617340c7f99c 100644
--- a/sys/dev/buslogic/btreg.h
+++ b/sys/dev/buslogic/btreg.h
@@ -580,7 +580,7 @@ typedef enum {
struct bt_ccb {
struct bt_hccb hccb;
- SLIST_ENTRY(bt_ccb) links;
+ SLIST_ENTRY(struct bt_ccb) links;
u_int32_t flags;
union ccb *ccb;
bus_dmamap_t dmamap;
@@ -592,7 +592,7 @@ struct sg_map_node {
bus_dmamap_t sg_dmamap;
bus_addr_t sg_physaddr;
bt_sg_t* sg_vaddr;
- SLIST_ENTRY(sg_map_node) links;
+ SLIST_ENTRY(struct sg_map_node) links;
};
struct bt_softc {
@@ -610,8 +610,8 @@ struct bt_softc {
bt_mbox_out_t *last_outbox;
bt_mbox_in_t *last_inbox;
struct bt_ccb *bt_ccb_array;
- SLIST_HEAD(,bt_ccb) free_bt_ccbs;
- LIST_HEAD(,ccb_hdr) pending_ccbs;
+ SLIST_HEAD(, struct bt_ccb) free_bt_ccbs;
+ LIST_HEAD(, struct ccb_hdr) pending_ccbs;
u_int active_ccbs;
u_int32_t bt_ccb_physbase;
bt_mbox_in_t *in_boxes;
@@ -633,7 +633,7 @@ struct bt_softc {
bus_dma_tag_t sg_dmat; /* dmat for our sg segments */
bus_dma_tag_t sense_dmat; /* dmat for our sense buffers */
bus_dmamap_t sense_dmamap;
- SLIST_HEAD(, sg_map_node) sg_maps;
+ SLIST_HEAD(, struct sg_map_node) sg_maps;
bus_addr_t mailbox_physbase;
u_int num_ccbs; /* Number of CCBs malloc'd */
u_int max_ccbs; /* Maximum allocatable CCBs */
diff --git a/sys/dev/dpt/dpt.h b/sys/dev/dpt/dpt.h
index 6d6230e75014..777e775083cf 100644
--- a/sys/dev/dpt/dpt.h
+++ b/sys/dev/dpt/dpt.h
@@ -894,7 +894,7 @@ typedef struct dpt_ccb {
u_int32_t transaction_id;
u_int32_t result;
caddr_t data;
- SLIST_ENTRY(dpt_ccb) links;
+ SLIST_ENTRY(struct dpt_ccb) links;
#ifdef DPT_MEASURE_PERFORMANCE
u_int32_t submitted_time;
@@ -1016,7 +1016,7 @@ struct sg_map_node {
bus_dmamap_t sg_dmamap;
bus_addr_t sg_physaddr;
dpt_sg_t* sg_vaddr;
- SLIST_ENTRY(sg_map_node) links;
+ SLIST_ENTRY(struct sg_map_node) links;
};
/* Main state machine and interface structure */
@@ -1039,14 +1039,14 @@ typedef struct dpt_softc {
int pending_ccbs;
int completed_ccbs;
- SLIST_HEAD(, dpt_ccb) free_dccb_list;
- LIST_HEAD(, ccb_hdr) pending_ccb_list;
+ SLIST_HEAD(, struct dpt_ccb) free_dccb_list;
+ LIST_HEAD(, struct ccb_hdr) pending_ccb_list;
bus_dma_tag_t parent_dmat;
bus_dma_tag_t dccb_dmat; /* dmat for our ccb array */
bus_dmamap_t dccb_dmamap;
bus_dma_tag_t sg_dmat; /* dmat for our sg maps */
- SLIST_HEAD(, sg_map_node) sg_maps;
+ SLIST_HEAD(, struct sg_map_node) sg_maps;
struct cam_sim *sims[MAX_CHANNELS];
struct cam_path *paths[MAX_CHANNELS];
@@ -1069,7 +1069,7 @@ typedef struct dpt_softc {
u_int8_t irq;
u_int8_t dma_channel;
- TAILQ_ENTRY(dpt_softc) links;
+ TAILQ_ENTRY(struct dpt_softc) links;
int unit;
int init_level;
@@ -1266,7 +1266,7 @@ dpt_time_delta(struct timeval start,
(end.tv_usec - start.tv_usec) );
}
-extern TAILQ_HEAD(dpt_softc_list, dpt_softc) dpt_softcs;
+extern TAILQ_HEAD(dpt_softc_list, struct dpt_softc) dpt_softcs;
extern int dpt_controllers_present;
diff --git a/sys/dev/eisa/eisaconf.c b/sys/dev/eisa/eisaconf.c
index 1e9dcda367ba..d37f00e72b90 100644
--- a/sys/dev/eisa/eisaconf.c
+++ b/sys/dev/eisa/eisaconf.c
@@ -53,19 +53,19 @@ typedef struct resvaddr {
u_long size; /* size of reserved area */
int flags;
struct resource *res; /* resource manager handle */
- LIST_ENTRY(resvaddr) links; /* List links */
+ LIST_ENTRY(struct resvaddr) links; /* List links */
} resvaddr_t;
-LIST_HEAD(resvlist, resvaddr);
+LIST_HEAD(resvlist, struct resvaddr);
struct irq_node {
int irq_no;
int irq_trigger;
void *idesc;
- TAILQ_ENTRY(irq_node) links;
+ TAILQ_ENTRY(struct irq_node) links;
};
-TAILQ_HEAD(irqlist, irq_node);
+TAILQ_HEAD(irqlist, struct irq_node);
struct eisa_ioconf {
int slot;
diff --git a/sys/dev/ida/idavar.h b/sys/dev/ida/idavar.h
index 0e3db00a23bb..223ac6c442cd 100644
--- a/sys/dev/ida/idavar.h
+++ b/sys/dev/ida/idavar.h
@@ -98,8 +98,8 @@ struct ida_qcb {
qcb_state state;
short flags;
union {
- STAILQ_ENTRY(ida_qcb) stqe;
- SLIST_ENTRY(ida_qcb) sle;
+ STAILQ_ENTRY(struct ida_qcb) stqe;
+ SLIST_ENTRY(struct ida_qcb) sle;
} link;
bus_dmamap_t dmamap;
bus_addr_t hwqcb_busaddr;
@@ -152,8 +152,8 @@ struct ida_softc {
struct ida_hardware_qcb *hwqcbs; /* HW QCB array */
struct ida_qcb *qcbs; /* kernel QCB array */
- SLIST_HEAD(, ida_qcb) free_qcbs;
- STAILQ_HEAD(, ida_qcb) qcb_queue;
+ SLIST_HEAD(, struct ida_qcb) free_qcbs;
+ STAILQ_HEAD(, struct ida_qcb) qcb_queue;
struct bio_queue_head bio_queue;
struct ida_access cmd;
diff --git a/sys/dev/kbd/kbd.c b/sys/dev/kbd/kbd.c
index ba436be2c202..a215dd1f17e5 100644
--- a/sys/dev/kbd/kbd.c
+++ b/sys/dev/kbd/kbd.c
@@ -52,7 +52,7 @@ typedef struct genkbd_softc {
struct selinfo gkb_rsel;
} genkbd_softc_t;
-static SLIST_HEAD(, keyboard_driver) keyboard_drivers =
+static SLIST_HEAD(, struct keyboard_driver) keyboard_drivers =
SLIST_HEAD_INITIALIZER(keyboard_drivers);
/* local arrays */
@@ -164,7 +164,7 @@ kbd_add_driver(keyboard_driver_t *driver)
int
kbd_delete_driver(keyboard_driver_t *driver)
{
- SLIST_REMOVE(&keyboard_drivers, driver, keyboard_driver, link);
+ SLIST_REMOVE(&keyboard_drivers, driver, struct keyboard_driver, link);
SLIST_NEXT(driver, link) = NULL;
return 0;
}
diff --git a/sys/dev/kbd/kbdreg.h b/sys/dev/kbd/kbdreg.h
index 54b2d6d4089d..1a71527203ce 100644
--- a/sys/dev/kbd/kbdreg.h
+++ b/sys/dev/kbd/kbdreg.h
@@ -157,7 +157,7 @@ typedef struct keyboard_switch {
/* keyboard driver */
typedef struct keyboard_driver {
- SLIST_ENTRY(keyboard_driver) link;
+ SLIST_ENTRY(struct keyboard_driver) link;
char *name;
keyboard_switch_t *kbdsw;
int (*configure)(int); /* backdoor for the console driver */
diff --git a/sys/dev/mii/miivar.h b/sys/dev/mii/miivar.h
index 4a68b9c7cf25..cd47d2d592c0 100644
--- a/sys/dev/mii/miivar.h
+++ b/sys/dev/mii/miivar.h
@@ -74,7 +74,7 @@ struct mii_data {
* PHYs is required so they can all be notified when a media
* request is made.
*/
- LIST_HEAD(mii_listhead, mii_softc) mii_phys;
+ LIST_HEAD(mii_listhead, struct mii_softc) mii_phys;
int mii_instance;
/*
@@ -113,7 +113,7 @@ typedef int (*mii_downcall_t) __P((struct mii_softc *, struct mii_data *, int));
struct mii_softc {
device_t mii_dev; /* generic device glue */
- LIST_ENTRY(mii_softc) mii_list; /* entry on parent's PHY list */
+ LIST_ENTRY(struct mii_softc) mii_list; /* entry on parent's PHY list */
int mii_phy; /* our MII address */
int mii_inst; /* instance for ifmedia */
diff --git a/sys/dev/mlx/mlxvar.h b/sys/dev/mlx/mlxvar.h
index edb1a853d094..58223cbe65f3 100644
--- a/sys/dev/mlx/mlxvar.h
+++ b/sys/dev/mlx/mlxvar.h
@@ -77,7 +77,7 @@ struct mlx_sysdrive
*/
struct mlx_command
{
- TAILQ_ENTRY(mlx_command) mc_link; /* list linkage */
+ TAILQ_ENTRY(struct mlx_command) mc_link; /* list linkage */
struct mlx_softc *mc_sc; /* controller that owns us */
u_int8_t mc_slot; /* command slot we occupy */
@@ -128,8 +128,8 @@ struct mlx_softc
#define MLX_FEAT_PAUSEWORKS (1<<0) /* channel pause works as expected */
/* controller queues and arrays */
- TAILQ_HEAD(, mlx_command) mlx_freecmds; /* command structures available for reuse */
- TAILQ_HEAD(, mlx_command) mlx_work; /* active commands */
+ TAILQ_HEAD(, struct mlx_command) mlx_freecmds; /* command structures available for reuse */
+ TAILQ_HEAD(, struct mlx_command) mlx_work; /* active commands */
struct mlx_command *mlx_busycmd[MLX_NSLOTS]; /* busy commands */
int mlx_busycmds; /* count of busy commands */
struct mlx_sysdrive mlx_sysdrive[MLX_MAXDRIVES]; /* system drives */
diff --git a/sys/dev/pccard/pccardvar.h b/sys/dev/pccard/pccardvar.h
index 19e943437370..58398c445141 100644
--- a/sys/dev/pccard/pccardvar.h
+++ b/sys/dev/pccard/pccardvar.h
@@ -103,7 +103,7 @@ struct pccard_config_entry {
u_long hostaddr;
} memspace[2]; /* XXX this could be as high as 8 */
int maxtwins;
- STAILQ_ENTRY(pccard_config_entry) cfe_list;
+ STAILQ_ENTRY(struct pccard_config_entry) cfe_list;
};
struct pccard_function {
@@ -115,8 +115,8 @@ struct pccard_function {
u_long ccr_mask;
struct resource *ccr_res;
int ccr_rid;
- STAILQ_HEAD(, pccard_config_entry) cfe_head;
- STAILQ_ENTRY(pccard_function) pf_list;
+ STAILQ_HEAD(, struct pccard_config_entry) cfe_head;
+ STAILQ_ENTRY(struct pccard_function) pf_list;
/* run-time state */
struct pccard_softc *sc;
struct pccard_config_entry *cfe;
@@ -154,7 +154,7 @@ struct pccard_card {
#define PCCARD_PRODUCT_INVALID -1
u_int16_t error;
#define PCCARD_CIS_INVALID { NULL, NULL, NULL, NULL }
- STAILQ_HEAD(, pccard_function) pf_head;
+ STAILQ_HEAD(, struct pccard_function) pf_head;
};
#define PCCARD_MEM_ATTR 1
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
index aa58b8aa4eb8..081cd5457315 100644
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/pci/pci.c
@@ -87,13 +87,13 @@ struct pci_quirk pci_quirks[] = {
#define PCI_MAPPORT 0x04 /* port map */
struct pci_devinfo {
- STAILQ_ENTRY(pci_devinfo) pci_links;
+ STAILQ_ENTRY(struct pci_devinfo) pci_links;
struct resource_list resources;
pcicfgregs cfg;
struct pci_conf conf;
};
-static STAILQ_HEAD(devlist, pci_devinfo) pci_devq;
+static STAILQ_HEAD(devlist, struct pci_devinfo) pci_devq;
u_int32_t pci_numdevs = 0;
static u_int32_t pci_generation = 0;
@@ -400,7 +400,7 @@ pci_freecfg(struct pci_devinfo *dinfo)
if (dinfo->cfg.map != NULL)
free(dinfo->cfg.map, M_DEVBUF);
/* XXX this hasn't been tested */
- STAILQ_REMOVE(devlist_head, dinfo, pci_devinfo, pci_links);
+ STAILQ_REMOVE(devlist_head, dinfo, struct pci_devinfo, pci_links);
free(dinfo, M_DEVBUF);
/* increment the generation count */
diff --git a/sys/dev/pcic/i82365var.h b/sys/dev/pcic/i82365var.h
index 5a0c723ad7eb..55eaa0712d5f 100644
--- a/sys/dev/pcic/i82365var.h
+++ b/sys/dev/pcic/i82365var.h
@@ -37,7 +37,7 @@
struct proc;
struct pcic_event {
- STAILQ_ENTRY(pcic_event) pe_q;
+ STAILQ_ENTRY(struct pcic_event) pe_q;
int pe_type;
};
@@ -65,7 +65,7 @@ struct pcic_handle {
int shutdown;
struct proc *event_thread;
- STAILQ_HEAD(, pcic_event) events;
+ STAILQ_HEAD(, struct pcic_event) events;
};
#define PCIC_FLAG_SOCKETP 0x0001
diff --git a/sys/dev/sk/if_skreg.h b/sys/dev/sk/if_skreg.h
index af17c1c165ce..2a5afc0a3258 100644
--- a/sys/dev/sk/if_skreg.h
+++ b/sys/dev/sk/if_skreg.h
@@ -1129,7 +1129,7 @@ struct sk_jslot {
struct sk_jpool_entry {
int slot;
- SLIST_ENTRY(sk_jpool_entry) jpool_entries;
+ SLIST_ENTRY(struct sk_jpool_entry) jpool_entries;
};
struct sk_chain {
@@ -1209,8 +1209,8 @@ struct sk_if_softc {
struct sk_softc *sk_softc; /* parent controller */
int sk_tx_bmu; /* TX BMU register */
int sk_if_flags;
- SLIST_HEAD(__sk_jfreehead, sk_jpool_entry) sk_jfree_listhead;
- SLIST_HEAD(__sk_jinusehead, sk_jpool_entry) sk_jinuse_listhead;
+ SLIST_HEAD(__sk_jfreehead, struct sk_jpool_entry) sk_jfree_listhead;
+ SLIST_HEAD(__sk_jinusehead, struct sk_jpool_entry) sk_jinuse_listhead;
};
#define SK_MAXUNIT 256
diff --git a/sys/dev/sound/pci/emu10k1.c b/sys/dev/sound/pci/emu10k1.c
index e8dcc6ed69cb..dd6ed9bbe153 100644
--- a/sys/dev/sound/pci/emu10k1.c
+++ b/sys/dev/sound/pci/emu10k1.c
@@ -44,7 +44,7 @@
#undef EMUDEBUG
struct emu_memblk {
- SLIST_ENTRY(emu_memblk) link;
+ SLIST_ENTRY(struct emu_memblk) link;
void *buf;
u_int32_t pte_start, pte_size;
};
@@ -53,7 +53,7 @@ struct emu_mem {
u_int8_t bmap[MAXPAGES / 8];
u_int32_t *ptb_pages;
void *silent_page;
- SLIST_HEAD(, emu_memblk) blocks;
+ SLIST_HEAD(, struct emu_memblk) blocks;
};
struct emu_voice {
diff --git a/sys/dev/streams/streams.c b/sys/dev/streams/streams.c
index c0f6f1cbb56d..472eb193c0d7 100644
--- a/sys/dev/streams/streams.c
+++ b/sys/dev/streams/streams.c
@@ -71,10 +71,10 @@ struct svr4_sockcache_entry {
struct sockaddr_un sock;/* Pathname for the socket */
dev_t dev; /* Device where the socket lives on */
ino_t ino; /* Inode where the socket lives on */
- TAILQ_ENTRY(svr4_sockcache_entry) entries;
+ TAILQ_ENTRY(struct svr4_sockcache_entry) entries;
};
-TAILQ_HEAD(svr4_sockcache_head, svr4_sockcache_entry) svr4_head;
+TAILQ_HEAD(svr4_sockcache_head, struct svr4_sockcache_entry) svr4_head;
/* Initialization flag (set/queried by svr4_mod LKM) */
int svr4_str_initialized = 0;
diff --git a/sys/dev/syscons/scterm.c b/sys/dev/syscons/scterm.c
index 99fad9857118..f174d109cdea 100644
--- a/sys/dev/syscons/scterm.c
+++ b/sys/dev/syscons/scterm.c
@@ -64,7 +64,7 @@ sc_clear_screen(scr_stat *scp)
/* terminal emulator manager routines */
-static LIST_HEAD(, sc_term_sw) sc_term_list =
+static LIST_HEAD(, struct sc_term_sw) sc_term_list =
LIST_HEAD_INITIALIZER(sc_term_list);
int
diff --git a/sys/dev/syscons/scvidctl.c b/sys/dev/syscons/scvidctl.c
index 8af13a0b0719..8eda6e699ef2 100644
--- a/sys/dev/syscons/scvidctl.c
+++ b/sys/dev/syscons/scvidctl.c
@@ -768,7 +768,7 @@ sc_vid_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, struct proc *p)
return ENOIOCTL;
}
-static LIST_HEAD(, sc_renderer) sc_rndr_list =
+static LIST_HEAD(, struct sc_renderer) sc_rndr_list =
LIST_HEAD_INITIALIZER(sc_rndr_list);
int
diff --git a/sys/dev/syscons/syscons.h b/sys/dev/syscons/syscons.h
index 0c1d8e4b5c6d..4b9840419ec8 100644
--- a/sys/dev/syscons/syscons.h
+++ b/sys/dev/syscons/syscons.h
@@ -325,7 +325,7 @@ typedef void sc_term_notify_t(scr_stat *scp, int event);
typedef int sc_term_input_t(scr_stat *scp, int c, struct tty *tp);
typedef struct sc_term_sw {
- LIST_ENTRY(sc_term_sw) link;
+ LIST_ENTRY(struct sc_term_sw) link;
char *te_name; /* name of the emulator */
char *te_desc; /* description */
char *te_renderer; /* matching renderer */
@@ -395,7 +395,7 @@ typedef struct sc_renderer {
char *name;
int mode;
sc_rndr_sw_t *rndrsw;
- LIST_ENTRY(sc_renderer) link;
+ LIST_ENTRY(struct sc_renderer) link;
} sc_renderer_t;
extern struct linker_set scrndr_set;
diff --git a/sys/dev/ti/if_tireg.h b/sys/dev/ti/if_tireg.h
index 5210ffac9cff..fd6cb00cb79d 100644
--- a/sys/dev/ti/if_tireg.h
+++ b/sys/dev/ti/if_tireg.h
@@ -1103,12 +1103,12 @@ struct ti_type {
struct ti_mc_entry {
struct ether_addr mc_addr;
- SLIST_ENTRY(ti_mc_entry) mc_entries;
+ SLIST_ENTRY(struct ti_mc_entry) mc_entries;
};
struct ti_jpool_entry {
int slot;
- SLIST_ENTRY(ti_jpool_entry) jpool_entries;
+ SLIST_ENTRY(struct ti_jpool_entry) jpool_entries;
};
struct ti_softc {
@@ -1135,9 +1135,9 @@ struct ti_softc {
u_int16_t ti_std; /* current std ring head */
u_int16_t ti_mini; /* current mini ring head */
u_int16_t ti_jumbo; /* current jumo ring head */
- SLIST_HEAD(__ti_mchead, ti_mc_entry) ti_mc_listhead;
- SLIST_HEAD(__ti_jfreehead, ti_jpool_entry) ti_jfree_listhead;
- SLIST_HEAD(__ti_jinusehead, ti_jpool_entry) ti_jinuse_listhead;
+ SLIST_HEAD(__ti_mchead, struct ti_mc_entry) ti_mc_listhead;
+ SLIST_HEAD(__ti_jfreehead, struct ti_jpool_entry) ti_jfree_listhead;
+ SLIST_HEAD(__ti_jinusehead, struct ti_jpool_entry) ti_jinuse_listhead;
u_int32_t ti_stat_ticks;
u_int32_t ti_rx_coal_ticks;
u_int32_t ti_tx_coal_ticks;
diff --git a/sys/dev/usb/ohcivar.h b/sys/dev/usb/ohcivar.h
index 8d3777868c67..11c339474c0b 100644
--- a/sys/dev/usb/ohcivar.h
+++ b/sys/dev/usb/ohcivar.h
@@ -51,7 +51,7 @@ typedef struct ohci_soft_td {
struct ohci_soft_td *nexttd; /* mirrors nexttd in TD */
struct ohci_soft_td *dnext; /* next in done list */
ohci_physaddr_t physaddr;
- LIST_ENTRY(ohci_soft_td) hnext;
+ LIST_ENTRY(struct ohci_soft_td) hnext;
usbd_xfer_handle xfer;
u_int16_t len;
u_int16_t flags;
@@ -97,7 +97,7 @@ typedef struct ohci_softc {
ohci_soft_ed_t *sc_ctrl_head;
ohci_soft_ed_t *sc_bulk_head;
- LIST_HEAD(, ohci_soft_td) sc_hash_tds[OHCI_HASH_SIZE];
+ LIST_HEAD(, struct ohci_soft_td) sc_hash_tds[OHCI_HASH_SIZE];
int sc_noport;
u_int8_t sc_addr; /* device address */
@@ -107,7 +107,7 @@ typedef struct ohci_softc {
ohci_soft_td_t *sc_freetds;
ohci_soft_itd_t *sc_freeitds;
- SIMPLEQ_HEAD(, usbd_xfer) sc_free_xfers; /* free xfers */
+ SIMPLEQ_HEAD(, struct usbd_xfer) sc_free_xfers; /* free xfers */
usbd_xfer_handle sc_intrxfer;
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c
index f26657014e52..62fdb9f4c6af 100644
--- a/sys/dev/usb/uhci.c
+++ b/sys/dev/usb/uhci.c
@@ -147,7 +147,7 @@ struct uhci_pipe {
* The uhci_intr_info free list can be global since they contain
* no dma specific data. The other free lists do.
*/
-LIST_HEAD(, uhci_intr_info) uhci_ii_free;
+LIST_HEAD(, struct uhci_intr_info) uhci_ii_free;
Static void uhci_busreset __P((uhci_softc_t *));
Static usbd_status uhci_run __P((uhci_softc_t *, int run));
diff --git a/sys/dev/usb/uhcivar.h b/sys/dev/usb/uhcivar.h
index 303a429cdc04..bea26bc532b4 100644
--- a/sys/dev/usb/uhcivar.h
+++ b/sys/dev/usb/uhcivar.h
@@ -73,7 +73,7 @@ typedef struct uhci_intr_info {
usbd_xfer_handle xfer;
uhci_soft_td_t *stdstart;
uhci_soft_td_t *stdend;
- LIST_ENTRY(uhci_intr_info) list;
+ LIST_ENTRY(struct uhci_intr_info) list;
#if defined(__FreeBSD__)
struct callout_handle timeout_handle;
#endif /* defined(__FreeBSD__) */
@@ -149,7 +149,7 @@ typedef struct uhci_softc {
uhci_soft_td_t *sc_freetds; /* TD free list */
uhci_soft_qh_t *sc_freeqhs; /* QH free list */
- SIMPLEQ_HEAD(, usbd_xfer) sc_free_xfers; /* free xfers */
+ SIMPLEQ_HEAD(, struct usbd_xfer) sc_free_xfers; /* free xfers */
u_int8_t sc_addr; /* device address */
u_int8_t sc_conf; /* device configuration */
@@ -157,7 +157,7 @@ typedef struct uhci_softc {
char sc_isreset;
char sc_suspend;
- LIST_HEAD(, uhci_intr_info) sc_intrhead;
+ LIST_HEAD(, struct uhci_intr_info) sc_intrhead;
/* Info for the root hub interrupt channel. */
int sc_ival; /* time between root hug intrs */
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index b623cf2ac4e0..43c2351fcd94 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -156,9 +156,9 @@ Static void usb_event_thread __P((void *));
#define USB_MAX_EVENTS 50
struct usb_event_q {
struct usb_event ue;
- SIMPLEQ_ENTRY(usb_event_q) next;
+ SIMPLEQ_ENTRY(struct usb_event_q) next;
};
-Static SIMPLEQ_HEAD(, usb_event_q) usb_events =
+Static SIMPLEQ_HEAD(, struct usb_event_q) usb_events =
SIMPLEQ_HEAD_INITIALIZER(usb_events);
Static int usb_nevents = 0;
Static struct selinfo usb_selevent;
diff --git a/sys/dev/usb/usb_mem.h b/sys/dev/usb/usb_mem.h
index f74e9c4791f8..37c65bac4eec 100644
--- a/sys/dev/usb/usb_mem.h
+++ b/sys/dev/usb/usb_mem.h
@@ -48,7 +48,7 @@ typedef struct usb_dma_block {
size_t size;
size_t align;
int fullblock;
- LIST_ENTRY(usb_dma_block) next;
+ LIST_ENTRY(struct usb_dma_block) next;
} usb_dma_block_t;
#define DMAADDR(dma, offset) ((dma)->block->segs[0].ds_addr + (dma)->offs + (offset))
diff --git a/sys/dev/usb/usbdivar.h b/sys/dev/usb/usbdivar.h
index 9d8ca8aae575..ca1fae6c41d7 100644
--- a/sys/dev/usb/usbdivar.h
+++ b/sys/dev/usb/usbdivar.h
@@ -146,7 +146,7 @@ struct usbd_interface {
int altindex;
struct usbd_endpoint *endpoints;
void *priv;
- LIST_HEAD(, usbd_pipe) pipes;
+ LIST_HEAD(, struct usbd_pipe) pipes;
};
struct usbd_pipe {
@@ -155,8 +155,8 @@ struct usbd_pipe {
struct usbd_endpoint *endpoint;
int refcnt;
char running;
- SIMPLEQ_HEAD(, usbd_xfer) queue;
- LIST_ENTRY(usbd_pipe) next;
+ SIMPLEQ_HEAD(, struct usbd_xfer) queue;
+ LIST_ENTRY(struct usbd_pipe) next;
usbd_xfer_handle intrxfer; /* used for repeating requests */
char repeat;
@@ -194,7 +194,7 @@ struct usbd_xfer {
#define URQ_AUTO_DMABUF 0x10
#define URQ_DEV_DMABUF 0x20
- SIMPLEQ_ENTRY(usbd_xfer) next;
+ SIMPLEQ_ENTRY(struct usbd_xfer) next;
void *hcpriv; /* private use by the HC driver */
int hcprivint;
diff --git a/sys/dev/vn/vn.c b/sys/dev/vn/vn.c
index 29f4e7a54453..95b4e46c37b5 100644
--- a/sys/dev/vn/vn.c
+++ b/sys/dev/vn/vn.c
@@ -137,10 +137,10 @@ struct vn_softc {
struct ucred *sc_cred; /* credentials */
int sc_maxactive; /* max # of active requests */
u_long sc_options; /* options */
- SLIST_ENTRY(vn_softc) sc_list;
+ SLIST_ENTRY(struct vn_softc) sc_list;
};
-static SLIST_HEAD(, vn_softc) vn_list;
+static SLIST_HEAD(, struct vn_softc) vn_list;
/* sc_flags */
#define VNF_INITED 0x01
diff --git a/sys/fs/fdescfs/fdesc.h b/sys/fs/fdescfs/fdesc.h
index 60b600649ed2..cbd45fafc82a 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 368d844c47cd..0f00f1c9b6f2 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 5bd13a771d48..a1b82c93f7dc 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 7c880b2f0d53..bb88689a3a5d 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 a948ade1d911..0d70eb78c3d1 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 0deecff73851..0ddf074c3a35 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 a86d5f7daa01..a14e008bcc7e 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 a0cda505c421..f172c56b16b6 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 2b7ed51d2427..874723035328 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 ad37a1ef4788..7c4f6699358c 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 25d92251d1d8..f632a1ed78b7 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 3777679c7c64..2755013b2037 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 eb562eda6722..0964614e1939 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 6f08513cf552..0ec9a4301c5c 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 a720d411df87..65be0abed45e 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 6b88befc18ed..4d4c2faa97a1 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,
diff --git a/sys/gnu/ext2fs/ext2_ihash.c b/sys/gnu/ext2fs/ext2_ihash.c
index 0a7c7d583191..39e0c1128a98 100644
--- a/sys/gnu/ext2fs/ext2_ihash.c
+++ b/sys/gnu/ext2fs/ext2_ihash.c
@@ -50,7 +50,7 @@ static MALLOC_DEFINE(M_UFSIHASH, "UFS ihash", "UFS Inode hash tables");
/*
* Structures associated with inode cacheing.
*/
-static LIST_HEAD(ihashhead, inode) *ihashtbl;
+static LIST_HEAD(ihashhead, struct inode) *ihashtbl;
static u_long ihash; /* size of hash table - 1 */
#define INOHASH(device, inum) (&ihashtbl[(minor(device) + (inum)) & ihash])
#ifndef NULL_SIMPLELOCKS
diff --git a/sys/gnu/ext2fs/inode.h b/sys/gnu/ext2fs/inode.h
index 83960b0d20f3..206babd18170 100644
--- a/sys/gnu/ext2fs/inode.h
+++ b/sys/gnu/ext2fs/inode.h
@@ -67,7 +67,7 @@ typedef long ufs_lbn_t;
*/
struct inode {
struct lock i_lock; /* Inode lock. >Keep this first< */
- LIST_ENTRY(inode) i_hash;/* Hash chain. */
+ LIST_ENTRY(struct inode) i_hash;/* Hash chain. */
struct vnode *i_vnode;/* Vnode associated with this inode. */
struct vnode *i_devvp;/* Vnode for block I/O. */
u_int32_t i_flag; /* flags, see below */
diff --git a/sys/gnu/fs/ext2fs/inode.h b/sys/gnu/fs/ext2fs/inode.h
index 83960b0d20f3..206babd18170 100644
--- a/sys/gnu/fs/ext2fs/inode.h
+++ b/sys/gnu/fs/ext2fs/inode.h
@@ -67,7 +67,7 @@ typedef long ufs_lbn_t;
*/
struct inode {
struct lock i_lock; /* Inode lock. >Keep this first< */
- LIST_ENTRY(inode) i_hash;/* Hash chain. */
+ LIST_ENTRY(struct inode) i_hash;/* Hash chain. */
struct vnode *i_vnode;/* Vnode associated with this inode. */
struct vnode *i_devvp;/* Vnode for block I/O. */
u_int32_t i_flag; /* flags, see below */
diff --git a/sys/i386/i386/busdma_machdep.c b/sys/i386/i386/busdma_machdep.c
index 0868b7c196dd..81476f6f32c0 100644
--- a/sys/i386/i386/busdma_machdep.c
+++ b/sys/i386/i386/busdma_machdep.c
@@ -61,12 +61,12 @@ struct bounce_page {
bus_addr_t busaddr; /* Physical address */
vm_offset_t datavaddr; /* kva of client data */
bus_size_t datacount; /* client data count */
- STAILQ_ENTRY(bounce_page) links;
+ STAILQ_ENTRY(struct bounce_page) links;
};
int busdma_swi_pending;
-static STAILQ_HEAD(bp_list, bounce_page) bounce_page_list;
+static STAILQ_HEAD(bp_list, struct bounce_page) bounce_page_list;
static int free_bpages;
static int reserved_bpages;
static int active_bpages;
@@ -82,11 +82,11 @@ struct bus_dmamap {
bus_size_t buflen; /* unmapped buffer length */
bus_dmamap_callback_t *callback;
void *callback_arg;
- STAILQ_ENTRY(bus_dmamap) links;
+ STAILQ_ENTRY(struct bus_dmamap) links;
};
-static STAILQ_HEAD(, bus_dmamap) bounce_map_waitinglist;
-static STAILQ_HEAD(, bus_dmamap) bounce_map_callbacklist;
+static STAILQ_HEAD(, struct bus_dmamap) bounce_map_waitinglist;
+static STAILQ_HEAD(, struct bus_dmamap) bounce_map_callbacklist;
static struct bus_dmamap nobounce_dmamap;
static int alloc_bounce_pages(bus_dma_tag_t dmat, u_int numpages);
diff --git a/sys/i386/include/pmap.h b/sys/i386/include/pmap.h
index 813f2ae02468..054db2be5d4d 100644
--- a/sys/i386/include/pmap.h
+++ b/sys/i386/include/pmap.h
@@ -191,13 +191,13 @@ struct pv_entry;
struct md_page {
int pv_list_count;
- TAILQ_HEAD(,pv_entry) pv_list;
+ TAILQ_HEAD(,struct pv_entry) pv_list;
};
struct pmap {
pd_entry_t *pm_pdir; /* KVA of page directory */
vm_object_t pm_pteobj; /* Container for pte's */
- TAILQ_HEAD(,pv_entry) pm_pvlist; /* list of mappings in pmap */
+ TAILQ_HEAD(,struct pv_entry) pm_pvlist;/* list of mappings in pmap */
int pm_count; /* reference count */
int pm_active; /* active on cpus */
struct pmap_statistics pm_stats; /* pmap statistics */
@@ -219,8 +219,8 @@ extern pmap_t kernel_pmap;
typedef struct pv_entry {
pmap_t pv_pmap; /* pmap where mapping lies */
vm_offset_t pv_va; /* virtual address for mapping */
- TAILQ_ENTRY(pv_entry) pv_list;
- TAILQ_ENTRY(pv_entry) pv_plist;
+ TAILQ_ENTRY(struct pv_entry) pv_list;
+ TAILQ_ENTRY(struct pv_entry) pv_plist;
vm_page_t pv_ptem; /* VM page for pte */
} *pv_entry_t;
diff --git a/sys/i386/isa/bs/bsvar.h b/sys/i386/isa/bs/bsvar.h
index 6267c31a917c..1914eb15249e 100644
--- a/sys/i386/isa/bs/bsvar.h
+++ b/sys/i386/isa/bs/bsvar.h
@@ -261,7 +261,7 @@ struct sc_p {
#define BSCFLAGSMASK (0xffff)
struct bsccb {
- TAILQ_ENTRY(bsccb) ccb_chain;
+ TAILQ_ENTRY(struct bsccb) ccb_chain;
union ccb *ccb; /* upper drivers info */
@@ -296,9 +296,9 @@ GENERIC_CCB_ASSERT(bs, bsccb)
/* target info */
struct targ_info {
-/*0*/ TAILQ_ENTRY(targ_info) ti_tchain; /* targ_info link */
+/*0*/ TAILQ_ENTRY(struct targ_info) ti_tchain; /* targ_info link */
-/*4*/ TAILQ_ENTRY(targ_info) ti_wchain; /* wait link */
+/*4*/ TAILQ_ENTRY(struct targ_info) ti_wchain; /* wait link */
/*8*/ struct bs_softc *ti_bsc; /* our controller */
/*c*/ u_int ti_id; /* scsi id */
@@ -364,7 +364,7 @@ struct targ_info {
struct scsi_sense_data sense;
};
-TAILQ_HEAD(titab, targ_info);
+TAILQ_HEAD(titab, struct targ_info);
struct bshw;
struct bs_softc {
diff --git a/sys/i386/isa/ccbque.h b/sys/i386/isa/ccbque.h
index cb6bebead390..088252a39d71 100644
--- a/sys/i386/isa/ccbque.h
+++ b/sys/i386/isa/ccbque.h
@@ -41,7 +41,7 @@
/* (I) structure and prototype */
#define GENERIC_CCB_ASSERT(DEV, CCBTYPE) \
-TAILQ_HEAD(CCBTYPE##tab, CCBTYPE); \
+TAILQ_HEAD(CCBTYPE##tab, struct CCBTYPE); \
struct CCBTYPE##que { \
struct CCBTYPE##tab CCBTYPE##tab; \
int count; \
diff --git a/sys/i386/isa/loran.c b/sys/i386/isa/loran.c
index b4c5daa110c0..0da59b5052df 100644
--- a/sys/i386/isa/loran.c
+++ b/sys/i386/isa/loran.c
@@ -33,7 +33,7 @@
#include <i386/isa/isa_device.h>
#endif /* _KERNEL */
-typedef TAILQ_HEAD(, datapoint) dphead_t;
+typedef TAILQ_HEAD(, struct datapoint) dphead_t;
struct datapoint {
/* Fields used by kernel */
@@ -48,7 +48,7 @@ struct datapoint {
u_int qsig;
u_int ssig;
u_int64_t epoch;
- TAILQ_ENTRY(datapoint) list;
+ TAILQ_ENTRY(struct datapoint) list;
int vco;
int bounce;
pid_t pid;
diff --git a/sys/i386/linux/linux_ioctl.c b/sys/i386/linux/linux_ioctl.c
index 582770fcf5d2..609baae740e9 100644
--- a/sys/i386/linux/linux_ioctl.c
+++ b/sys/i386/linux/linux_ioctl.c
@@ -85,12 +85,12 @@ DATA_SET(linux_ioctl_handler_set, termio_handler);
struct handler_element
{
- TAILQ_ENTRY(handler_element) list;
+ TAILQ_ENTRY(struct handler_element) list;
int (*func)(struct proc *, struct linux_ioctl_args *);
int low, high, span;
};
-static TAILQ_HEAD(, handler_element) handlers =
+static TAILQ_HEAD(, struct handler_element) handlers =
TAILQ_HEAD_INITIALIZER(handlers);
static int
diff --git a/sys/isa/isa_common.h b/sys/isa/isa_common.h
index 70b8b339533f..13770de678cd 100644
--- a/sys/isa/isa_common.h
+++ b/sys/isa/isa_common.h
@@ -38,9 +38,9 @@ MALLOC_DECLARE(M_ISADEV);
/*
* PNP configurations are kept in a tailq.
*/
-TAILQ_HEAD(isa_config_list, isa_config_entry);
+TAILQ_HEAD(isa_config_list, struct isa_config_entry);
struct isa_config_entry {
- TAILQ_ENTRY(isa_config_entry) ice_link;
+ TAILQ_ENTRY(struct isa_config_entry) ice_link;
int ice_priority;
struct isa_config ice_config;
};
diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c
index d6116f75513f..a7d641273cbd 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(, specinfo) dev_hash[DEVT_HASH];
+static LIST_HEAD(, struct specinfo) dev_hash[DEVT_HASH];
-static LIST_HEAD(, specinfo) dev_free;
+static LIST_HEAD(, struct 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 f0095c97ddac..cbe9f2b4f598 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,
- sigio, sio_pgsigio);
+ struct sigio, sio_pgsigio);
} else /* if ((*sigiop)->sio_pgid > 0) */ {
SLIST_REMOVE(&sigio->sio_proc->p_sigiolst, sigio,
- sigio, sio_pgsigio);
+ struct 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 c22b24878cc6..48f444ab1a71 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, knote, kn_selnext);
+ SLIST_REMOVE(&kq->kq_sel.si_note, kn, struct 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, knote, kn_selnext);
+ SLIST_REMOVE(&p->p_klist, kn, struct 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, knote, kn_link);
+ SLIST_REMOVE(list, kn, struct 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 9115f9775a36..3a4c1a4472ef 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(exitlist) next;
+ TAILQ_ENTRY(struct exitlist) next;
};
-TAILQ_HEAD(exit_list_head, exitlist);
+TAILQ_HEAD(exit_list_head, struct 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 62296b27d60e..b89bffbe843a 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(forklist) next;
+ TAILQ_ENTRY(struct forklist) next;
};
-TAILQ_HEAD(forklist_head, forklist);
+TAILQ_HEAD(forklist_head, struct 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 bb764f4c0c62..c8ad3cb8aec6 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(, modlist) modlisthead_t;
+typedef TAILQ_HEAD(, struct modlist) modlisthead_t;
struct modlist {
- TAILQ_ENTRY(modlist) link; /* chain together all modules */
+ TAILQ_ENTRY(struct 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, common_symbol, link);
+ STAILQ_REMOVE(&file->common, cp, struct common_symbol, link);
free(cp, M_LINKER);
}
diff --git a/sys/kern/kern_module.c b/sys/kern/kern_module.c
index 46c3d14786f5..540be5323852 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(, module) modulelist_t;
+typedef TAILQ_HEAD(, struct module) modulelist_t;
struct module {
- TAILQ_ENTRY(module) link; /* chain together all modules */
- TAILQ_ENTRY(module) flink; /* all modules in a file */
+ TAILQ_ENTRY(struct module) link; /* chain together all modules */
+ TAILQ_ENTRY(struct 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 df9f1c569fed..d0a36ec3fd75 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(uidinfo) ui_hash;
+ LIST_ENTRY(struct uidinfo) ui_hash;
uid_t ui_uid;
long ui_proccnt;
rlim_t ui_sbsize;
};
#define UIHASH(uid) (&uihashtbl[(uid) & uihash])
-static LIST_HEAD(uihashhead, uidinfo) *uihashtbl;
+static LIST_HEAD(uihashhead, struct 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 7702aba5846d..e67153b5864b 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, knote, kn_selnext);
+ SLIST_REMOVE(&p->p_klist, kn, struct knote, kn_selnext);
}
/*
diff --git a/sys/kern/kern_subr.c b/sys/kern/kern_subr.c
index c0f7f6479e48..7b99bbf8ff48 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, generic) *hashtbl;
+ LIST_HEAD(generic, struct generic) *hashtbl;
int i;
if (elements <= 0)
@@ -395,7 +395,7 @@ phashinit(elements, type, nentries)
u_long *nentries;
{
long hashsize;
- LIST_HEAD(generic, generic) *hashtbl;
+ LIST_HEAD(generic, struct generic) *hashtbl;
int i;
if (elements <= 0)
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c
index 0a8e17678a77..4dff9819f2a2 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, proc) slpque[TABLESIZE];
+static TAILQ_HEAD(slpquehead, struct 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 1da9a0b71c35..907e96263314 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, sysctl_oid, oid_link);
+ SLIST_REMOVE(oidp->oid_parent, oidp, struct sysctl_oid, oid_link);
}
/*
diff --git a/sys/kern/subr_autoconf.c b/sys/kern/subr_autoconf.c
index 9bbb7b4992c0..36e58f51fc59 100644
--- a/sys/kern/subr_autoconf.c
+++ b/sys/kern/subr_autoconf.c
@@ -55,7 +55,7 @@
/*
* "Interrupt driven config" functions.
*/
-static TAILQ_HEAD(, intr_config_hook) intr_config_hook_list =
+static TAILQ_HEAD(, struct 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 ddd1e4f6b6b0..5604a90ed641 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, resource_list_entry, link);
+ SLIST_REMOVE(rl, rle, struct resource_list_entry, link);
free(rle, M_BUS);
}
}
diff --git a/sys/kern/subr_devstat.c b/sys/kern/subr_devstat.c
index fe14002aa0c0..28f55cc05dab 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, devstat) device_statq;
+static STAILQ_HEAD(devstatlist, struct 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, devstat, dev_links);
+ STAILQ_REMOVE(devstat_head, ds, struct devstat, dev_links);
}
/*
diff --git a/sys/kern/subr_eventhandler.c b/sys/kern/subr_eventhandler.c
index c23441d736a0..7d979c909cf9 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(, eventhandler_list) eventhandler_lists;
+static TAILQ_HEAD(, struct 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 40d47e46a6d3..d1a27416480a 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, knote, kn_selnext);
+ SLIST_REMOVE(&rpipe->pipe_sel.si_note, kn, struct knote, kn_selnext);
}
/*ARGSUSED*/
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index d69ae8394d15..163e016e497a 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(, tty) tty_list;
+static SLIST_HEAD(, struct 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 76495e19244f..8e90cb662df7 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, 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;
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, 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;
splx(s);
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c
index 298bbe12b386..020bd8e0d809 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(, sf_buf) sf_freelist;
+static SLIST_HEAD(, struct 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 16867cd95122..7bb4e5b03a93 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(aioproclist) list; /* List of processes */
+ TAILQ_ENTRY(struct aioproclist) list; /* List of processes */
struct proc *aioproc; /* The AIO thread */
- TAILQ_HEAD (,aiocblist) jobtorun; /* suggested job to run */
+ TAILQ_HEAD (,struct 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 (aio_liojob) lioj_list;
+ TAILQ_ENTRY (struct 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 (,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 */
+ 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 */
};
#define KAIO_RUNDOWN 0x1 /* process is being run down */
#define KAIO_WAKEUP 0x2 /* wakeup process when there is a significant event */
-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 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 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, knote, kn_selnext);
+ SLIST_REMOVE(&aiocbe->klist, kn, struct knote, kn_selnext);
splx(s);
}
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index 93e4620f2a93..51c0dcb5a4d5 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, buf) *bufhashtbl, invalhash;
+static LIST_HEAD(bufhashhdr, struct 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 99e08215bd07..b34be2edf690 100644
--- a/sys/kern/vfs_cache.c
+++ b/sys/kern/vfs_cache.c
@@ -55,9 +55,9 @@
*/
struct namecache {
- LIST_ENTRY(namecache) nc_hash; /* hash chain */
- LIST_ENTRY(namecache) nc_src; /* source vnode list */
- TAILQ_ENTRY(namecache) nc_dst; /* destination vnode list */
+ 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 */
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, namecache) *nchashtbl; /* Hash Table */
-static TAILQ_HEAD(, namecache) ncneg; /* Hash Table */
+static LIST_HEAD(nchashhead, struct namecache) *nchashtbl; /* Hash Table */
+static TAILQ_HEAD(, struct 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 670d999545ad..3d5292ecd291 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, vnode) vnode_free_list; /* vnode free list */
+static TAILQ_HEAD(freelst, struct 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, vnode);
+LIST_HEAD(synclist, struct 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, vnode) vnode_tmp_list;
+ TAILQ_HEAD(freelst, struct 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, vnode, v_specnext);
+ SLIST_REMOVE(&vp->v_hashchain, vp, struct 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 670d999545ad..3d5292ecd291 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, vnode) vnode_free_list; /* vnode free list */
+static TAILQ_HEAD(freelst, struct 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, vnode);
+LIST_HEAD(synclist, struct 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, vnode) vnode_tmp_list;
+ TAILQ_HEAD(freelst, struct 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, vnode, v_specnext);
+ SLIST_REMOVE(&vp->v_hashchain, vp, struct 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 53c2cdb1498d..0e0e8ad0a823 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, knote, kn_selnext);
+ kn, struct knote, kn_selnext);
simple_unlock(&vp->v_pollinfo.vpi_lock);
}
diff --git a/sys/miscfs/fdesc/fdesc.h b/sys/miscfs/fdesc/fdesc.h
index 60b600649ed2..cbd45fafc82a 100644
--- a/sys/miscfs/fdesc/fdesc.h
+++ b/sys/miscfs/fdesc/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/miscfs/fdesc/fdesc_vnops.c b/sys/miscfs/fdesc/fdesc_vnops.c
index 368d844c47cd..0f00f1c9b6f2 100644
--- a/sys/miscfs/fdesc/fdesc_vnops.c
+++ b/sys/miscfs/fdesc/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/miscfs/fifofs/fifo_vnops.c b/sys/miscfs/fifofs/fifo_vnops.c
index 5bd13a771d48..a1b82c93f7dc 100644
--- a/sys/miscfs/fifofs/fifo_vnops.c
+++ b/sys/miscfs/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/miscfs/nullfs/null.h b/sys/miscfs/nullfs/null.h
index 2b7ed51d2427..874723035328 100644
--- a/sys/miscfs/nullfs/null.h
+++ b/sys/miscfs/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/miscfs/nullfs/null_subr.c b/sys/miscfs/nullfs/null_subr.c
index ad37a1ef4788..7c4f6699358c 100644
--- a/sys/miscfs/nullfs/null_subr.c
+++ b/sys/miscfs/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/miscfs/umapfs/umap.h b/sys/miscfs/umapfs/umap.h
index eb562eda6722..0964614e1939 100644
--- a/sys/miscfs/umapfs/umap.h
+++ b/sys/miscfs/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/miscfs/umapfs/umap_subr.c b/sys/miscfs/umapfs/umap_subr.c
index 6f08513cf552..0ec9a4301c5c 100644
--- a/sys/miscfs/umapfs/umap_subr.c
+++ b/sys/miscfs/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/miscfs/union/union.h b/sys/miscfs/union/union.h
index a720d411df87..65be0abed45e 100644
--- a/sys/miscfs/union/union.h
+++ b/sys/miscfs/union/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/miscfs/union/union_subr.c b/sys/miscfs/union/union_subr.c
index 6b88befc18ed..4d4c2faa97a1 100644
--- a/sys/miscfs/union/union_subr.c
+++ b/sys/miscfs/union/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,
diff --git a/sys/net/hostcache.h b/sys/net/hostcache.h
index 3158db9dc8c3..c0b0f12c9076 100644
--- a/sys/net/hostcache.h
+++ b/sys/net/hostcache.h
@@ -49,7 +49,7 @@
#include <sys/queue.h>
struct hcentry {
- LIST_ENTRY(hcentry) hc_link;
+ LIST_ENTRY(struct hcentry) hc_link;
struct timeval hc_idlesince; /* time last ref dropped */
struct sockaddr *hc_host; /* address of this entry's host */
struct rtentry *hc_rt; /* route to get there */
@@ -64,7 +64,7 @@ struct hccallback {
u_long (*hccb_bump)(u_long);
};
-LIST_HEAD(hchead, hcentry);
+LIST_HEAD(hchead, struct hcentry);
struct hctable {
u_long hct_nentries;
diff --git a/sys/net/if_ef.c b/sys/net/if_ef.c
index 97d93c89f18f..344271a4c9cf 100644
--- a/sys/net/if_ef.c
+++ b/sys/net/if_ef.c
@@ -82,12 +82,12 @@ struct efnet {
};
struct ef_link {
- SLIST_ENTRY(ef_link) el_next;
+ SLIST_ENTRY(struct ef_link) el_next;
struct ifnet *el_ifp; /* raw device for this clones */
struct efnet *el_units[EF_NFT]; /* our clones */
};
-static SLIST_HEAD(ef_link_head, ef_link) efdev = {NULL};
+static SLIST_HEAD(ef_link_head, struct ef_link) efdev = {NULL};
static int efcount;
extern int (*ef_inputp)(struct ifnet*, struct ether_header *eh, struct mbuf *m);
diff --git a/sys/net/if_media.h b/sys/net/if_media.h
index 2ed5ed0171c7..ea7bfb797182 100644
--- a/sys/net/if_media.h
+++ b/sys/net/if_media.h
@@ -64,7 +64,7 @@ typedef void (*ifm_stat_cb_t) __P((struct ifnet *ifp, struct ifmediareq *req));
* In-kernel representation of a single supported media type.
*/
struct ifmedia_entry {
- LIST_ENTRY(ifmedia_entry) ifm_list;
+ LIST_ENTRY(struct ifmedia_entry) ifm_list;
int ifm_media; /* description of this media attachment */
int ifm_data; /* for driver-specific use */
void *ifm_aux; /* for driver-specific use */
@@ -78,7 +78,7 @@ struct ifmedia {
int ifm_mask; /* mask of changes we don't care about */
int ifm_media; /* current user-set media word */
struct ifmedia_entry *ifm_cur; /* currently selected media */
- LIST_HEAD(, ifmedia_entry) ifm_list; /* list of all supported media */
+ LIST_HEAD(, struct ifmedia_entry) ifm_list; /* list of all supported media */
ifm_change_cb_t ifm_change; /* media change driver callback */
ifm_stat_cb_t ifm_status; /* media status driver callback */
};
diff --git a/sys/net/if_var.h b/sys/net/if_var.h
index a59e0160246f..66b117c7df5c 100644
--- a/sys/net/if_var.h
+++ b/sys/net/if_var.h
@@ -75,10 +75,10 @@ struct ether_header;
#include <sys/queue.h> /* get TAILQ macros */
-TAILQ_HEAD(ifnethead, ifnet); /* we use TAILQs so that the order of */
-TAILQ_HEAD(ifaddrhead, ifaddr); /* instantiation is preserved in the list */
-TAILQ_HEAD(ifprefixhead, ifprefix);
-LIST_HEAD(ifmultihead, ifmultiaddr);
+TAILQ_HEAD(ifnethead, struct ifnet); /* we use TAILQs so that the order of */
+TAILQ_HEAD(ifaddrhead, struct ifaddr); /* instantiation is preserved in the list */
+TAILQ_HEAD(ifprefixhead, struct ifprefix);
+LIST_HEAD(ifmultihead, struct ifmultiaddr);
/*
* Structure defining a queue for a network interface.
@@ -99,7 +99,7 @@ struct ifqueue {
struct ifnet {
void *if_softc; /* pointer to driver state */
char *if_name; /* name, e.g. ``en'' or ``lo'' */
- TAILQ_ENTRY(ifnet) if_link; /* all struct ifnets are chained */
+ TAILQ_ENTRY(struct ifnet) if_link; /* all struct ifnets are chained */
struct ifaddrhead if_addrhead; /* linked list of addresses per if */
int if_pcount; /* number of promiscuous listeners */
struct bpf_if *if_bpf; /* packet filter structure */
@@ -260,7 +260,7 @@ struct ifaddr {
#define ifa_broadaddr ifa_dstaddr /* broadcast address interface */
struct sockaddr *ifa_netmask; /* used to determine subnet */
struct ifnet *ifa_ifp; /* back-pointer to interface */
- TAILQ_ENTRY(ifaddr) ifa_link; /* queue macro glue */
+ TAILQ_ENTRY(struct ifaddr) ifa_link; /* queue macro glue */
void (*ifa_rtrequest) /* check or clean routes (+ or -)'d */
__P((int, struct rtentry *, struct sockaddr *));
u_short ifa_flags; /* mostly rt_flags for cloning */
@@ -287,7 +287,7 @@ struct ifaddr {
struct ifprefix {
struct sockaddr *ifpr_prefix; /* prefix of interface */
struct ifnet *ifpr_ifp; /* back-pointer to interface */
- TAILQ_ENTRY(ifprefix) ifpr_list; /* queue macro glue */
+ TAILQ_ENTRY(struct ifprefix) ifpr_list; /* queue macro glue */
u_char ifpr_plen; /* prefix length in bits */
u_char ifpr_type; /* protocol dependent prefix type */
};
@@ -299,7 +299,7 @@ struct ifprefix {
* address, not a count of pointers to this structure.
*/
struct ifmultiaddr {
- LIST_ENTRY(ifmultiaddr) ifma_link; /* queue macro glue */
+ LIST_ENTRY(struct ifmultiaddr) ifma_link; /* queue macro glue */
struct sockaddr *ifma_addr; /* address this membership is for */
struct sockaddr *ifma_lladdr; /* link-layer translation, if any */
struct ifnet *ifma_ifp; /* back-pointer to interface */
diff --git a/sys/net/if_vlan_var.h b/sys/net/if_vlan_var.h
index 8fbe10ca1ac9..2cbcc21e40d3 100644
--- a/sys/net/if_vlan_var.h
+++ b/sys/net/if_vlan_var.h
@@ -35,7 +35,7 @@
#ifdef _KERNEL
struct vlan_mc_entry {
struct ether_addr mc_addr;
- SLIST_ENTRY(vlan_mc_entry) mc_entries;
+ SLIST_ENTRY(struct vlan_mc_entry) mc_entries;
};
struct ifvlan {
@@ -46,7 +46,7 @@ struct ifvlan {
u_int16_t ifvm_proto; /* encapsulation ethertype */
u_int16_t ifvm_tag; /* tag to apply on packets leaving if */
} ifv_mib;
- SLIST_HEAD(__vlan_mchead, vlan_mc_entry) vlan_mc_listhead;
+ SLIST_HEAD(__vlan_mchead, struct vlan_mc_entry) vlan_mc_listhead;
};
#define ifv_if ifv_ac.ac_if
#define ifv_tag ifv_mib.ifvm_tag
diff --git a/sys/net/pfil.h b/sys/net/pfil.h
index 783132857a48..bed0b27b5d87 100644
--- a/sys/net/pfil.h
+++ b/sys/net/pfil.h
@@ -41,7 +41,7 @@ struct ifnet;
* possibly intercept the packet.
*/
struct packet_filter_hook {
- TAILQ_ENTRY(packet_filter_hook) pfil_link;
+ TAILQ_ENTRY(struct packet_filter_hook) pfil_link;
int (*pfil_func) __P((void *, int, struct ifnet *, int,
struct mbuf **));
int pfil_flags;
@@ -52,7 +52,7 @@ struct packet_filter_hook {
#define PFIL_WAITOK 0x00000004
#define PFIL_ALL (PFIL_IN|PFIL_OUT)
-typedef TAILQ_HEAD(pfil_list, packet_filter_hook) pfil_list_t;
+typedef TAILQ_HEAD(pfil_list, struct packet_filter_hook) pfil_list_t;
struct pfil_head {
pfil_list_t ph_in;
diff --git a/sys/net/raw_cb.h b/sys/net/raw_cb.h
index 6c079a92878f..cdf695b6dacb 100644
--- a/sys/net/raw_cb.h
+++ b/sys/net/raw_cb.h
@@ -44,7 +44,7 @@
* to tie a socket to the generic raw interface.
*/
struct rawcb {
- LIST_ENTRY(rawcb) list;
+ LIST_ENTRY(struct rawcb) list;
struct socket *rcb_socket; /* back pointer to socket */
struct sockaddr *rcb_faddr; /* destination address */
struct sockaddr *rcb_laddr; /* socket's address */
@@ -60,7 +60,7 @@ struct rawcb {
#define RAWRCVQ 8192
#ifdef _KERNEL
-extern LIST_HEAD(rawcb_list_head, rawcb) rawcb_list;
+extern LIST_HEAD(rawcb_list_head, struct rawcb) rawcb_list;
int raw_attach __P((struct socket *, int));
void raw_ctlinput __P((int, struct sockaddr *, void *));
diff --git a/sys/netgraph/netgraph.h b/sys/netgraph/netgraph.h
index 7b044095415a..89e955f6b4c4 100644
--- a/sys/netgraph/netgraph.h
+++ b/sys/netgraph/netgraph.h
@@ -61,7 +61,7 @@ struct ng_hook {
int refs; /* dont actually free this till 0 */
struct ng_hook *peer; /* the other end of this link */
struct ng_node *node; /* The node this hook is attached to */
- LIST_ENTRY(ng_hook) hooks; /* linked list of all hooks on node */
+ LIST_ENTRY(struct ng_hook) hooks; /* linked list of all hooks on node */
};
typedef struct ng_hook *hook_p;
@@ -81,9 +81,9 @@ struct ng_node {
int colour; /* for graph colouring algorithms */
void *private; /* node type dependant node ID */
ng_ID_t ID; /* Unique per node */
- LIST_HEAD(hooks, ng_hook) hooks; /* linked list of node hooks */
- LIST_ENTRY(ng_node) nodes; /* linked list of all nodes */
- LIST_ENTRY(ng_node) idnodes; /* ID hash collision list */
+ LIST_HEAD(hooks, struct ng_hook) hooks; /* linked list of node hooks */
+ LIST_ENTRY(struct ng_node) nodes; /* linked list of all nodes */
+ LIST_ENTRY(struct ng_node) idnodes; /* ID hash collision list */
};
typedef struct ng_node *node_p;
@@ -177,7 +177,7 @@ struct ng_type {
const struct ng_cmdlist *cmdlist; /* commands we can convert */
/* R/W data private to the base netgraph code DON'T TOUCH! */
- LIST_ENTRY(ng_type) types; /* linked list of all types */
+ LIST_ENTRY(struct ng_type) types; /* linked list of all types */
int refs; /* number of instances */
};
diff --git a/sys/netgraph/ng_base.c b/sys/netgraph/ng_base.c
index 1c0d80edbab3..037ad04bc13e 100644
--- a/sys/netgraph/ng_base.c
+++ b/sys/netgraph/ng_base.c
@@ -66,14 +66,14 @@
MODULE_VERSION(netgraph, 1);
/* List of all nodes */
-static LIST_HEAD(, ng_node) nodelist;
+static LIST_HEAD(, struct ng_node) nodelist;
/* List of installed types */
-static LIST_HEAD(, ng_type) typelist;
+static LIST_HEAD(, struct ng_type) typelist;
/* Hash releted definitions */
#define ID_HASH_SIZE 32 /* most systems wont need even this many */
-static LIST_HEAD(, ng_node) ID_hash[ID_HASH_SIZE];
+static LIST_HEAD(, struct ng_node) ID_hash[ID_HASH_SIZE];
/* Don't nead to initialise them because it's a LIST */
/* Internal functions */
diff --git a/sys/netgraph/ng_ppp.c b/sys/netgraph/ng_ppp.c
index ba1dacf796ab..83f7d77eb4df 100644
--- a/sys/netgraph/ng_ppp.c
+++ b/sys/netgraph/ng_ppp.c
@@ -131,7 +131,7 @@ struct ng_ppp_frag {
struct timeval timestamp; /* time of reception */
struct mbuf *data; /* Fragment data */
meta_p meta; /* Fragment meta */
- CIRCLEQ_ENTRY(ng_ppp_frag) f_qent; /* Fragment queue */
+ CIRCLEQ_ENTRY(struct ng_ppp_frag) f_qent; /* Fragment queue */
};
/* We use integer indicies to refer to the non-link hooks */
@@ -195,7 +195,7 @@ struct ng_ppp_private {
int activeLinks[NG_PPP_MAX_LINKS]; /* indicies */
u_int lastLink; /* for round robin */
hook_p hooks[HOOK_INDEX_MAX]; /* non-link hooks */
- CIRCLEQ_HEAD(ng_ppp_fraglist, ng_ppp_frag) /* fragment queue */
+ CIRCLEQ_HEAD(ng_ppp_fraglist, struct ng_ppp_frag) /* fragment queue */
frags;
int qlen; /* fraq queue length */
struct callout_handle fragTimer; /* fraq queue check */
diff --git a/sys/netgraph/ng_socket.c b/sys/netgraph/ng_socket.c
index 6a3266cf746c..08c8c917d6b6 100644
--- a/sys/netgraph/ng_socket.c
+++ b/sys/netgraph/ng_socket.c
@@ -142,7 +142,7 @@ static u_long ngpdg_sendspace = 2 * 1024; /* really max datagram size */
static u_long ngpdg_recvspace = 20 * 1024;
/* List of all sockets */
-LIST_HEAD(, ngpcb) ngsocklist;
+LIST_HEAD(, struct ngpcb) ngsocklist;
#define sotongpcb(so) ((struct ngpcb *)(so)->so_pcb)
diff --git a/sys/netgraph/ng_socketvar.h b/sys/netgraph/ng_socketvar.h
index df9cba3f9de3..3654bbe57eac 100644
--- a/sys/netgraph/ng_socketvar.h
+++ b/sys/netgraph/ng_socketvar.h
@@ -47,7 +47,7 @@
struct ngpcb {
struct socket *ng_socket; /* the socket */
struct ngsock *sockdata; /* netgraph info */
- LIST_ENTRY(ngpcb) socks; /* linked list of sockets */
+ LIST_ENTRY(struct ngpcb) socks; /* linked list of sockets */
int type; /* NG_CONTROL or NG_DATA */
};
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c
index 1125455c384c..3eac14a0c120 100644
--- a/sys/netinet/if_ether.c
+++ b/sys/netinet/if_ether.c
@@ -87,14 +87,14 @@ SYSCTL_INT(_net_link_ether_inet, OID_AUTO, host_down_time, CTLFLAG_RW,
#define rt_expire rt_rmx.rmx_expire
struct llinfo_arp {
- LIST_ENTRY(llinfo_arp) la_le;
+ LIST_ENTRY(struct llinfo_arp) la_le;
struct rtentry *la_rt;
struct mbuf *la_hold; /* last packet until resolved/timeout */
long la_asked; /* last time we QUERIED for this addr */
#define la_timer la_rt->rt_rmx.rmx_expire /* deletion time in seconds */
};
-static LIST_HEAD(, llinfo_arp) llinfo_arp;
+static LIST_HEAD(, struct llinfo_arp) llinfo_arp;
struct ifqueue arpintrq = {0, 0, 0, 50};
static int arp_inuse, arp_allocated;
diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h
index 08733ad152a8..cc9527c49212 100644
--- a/sys/netinet/in_pcb.h
+++ b/sys/netinet/in_pcb.h
@@ -52,8 +52,8 @@
* up (to a socket structure) and down (to a protocol-specific)
* control block.
*/
-LIST_HEAD(inpcbhead, inpcb);
-LIST_HEAD(inpcbporthead, inpcbport);
+LIST_HEAD(inpcbhead, struct inpcb);
+LIST_HEAD(inpcbporthead, struct inpcbport);
typedef u_quad_t inp_gen_t;
/*
@@ -75,10 +75,10 @@ struct in_addr_4in6 {
struct icmp6_filter;
struct inpcb {
- LIST_ENTRY(inpcb) inp_hash; /* hash list */
+ LIST_ENTRY(struct inpcb) inp_hash; /* hash list */
u_short inp_fport; /* foreign port */
u_short inp_lport; /* local port */
- LIST_ENTRY(inpcb) inp_list; /* list for all PCBs of this proto */
+ LIST_ENTRY(struct inpcb) inp_list; /* list for all PCBs of this proto */
u_int32_t inp_flow;
/* protocol dependent part, local and foreign addr */
@@ -140,7 +140,7 @@ struct inpcb {
short inp6_hops;
u_int8_t inp6_hlim;
} inp_depend6;
- LIST_ENTRY(inpcb) inp_portlist;
+ LIST_ENTRY(struct inpcb) inp_portlist;
struct inpcbport *inp_phd; /* head of this list */
inp_gen_t inp_gencnt; /* generation count of this instance */
#define in6p_faddr inp_dependfaddr.inp6_foreign
@@ -191,7 +191,7 @@ struct xinpgen {
#endif /* _SYS_SOCKETVAR_H_ */
struct inpcbport {
- LIST_ENTRY(inpcbport) phd_hash;
+ LIST_ENTRY(struct inpcbport) phd_hash;
struct inpcbhead phd_pcblist;
u_short phd_port;
};
diff --git a/sys/netinet/in_var.h b/sys/netinet/in_var.h
index de2a6a6e16fc..f0cbab6b2adc 100644
--- a/sys/netinet/in_var.h
+++ b/sys/netinet/in_var.h
@@ -55,7 +55,7 @@ struct in_ifaddr {
u_long ia_subnet; /* subnet number, including net */
u_long ia_subnetmask; /* mask of subnet part */
struct in_addr ia_netbroadcast; /* to recognize net broadcasts */
- TAILQ_ENTRY(in_ifaddr) ia_link; /* tailq macro glue */
+ TAILQ_ENTRY(struct in_ifaddr) ia_link; /* tailq macro glue */
struct sockaddr_in ia_addr; /* reserve space for interface name */
struct sockaddr_in ia_dstaddr; /* reserve space for broadcast addr */
#define ia_broadaddr ia_dstaddr
@@ -81,7 +81,7 @@ struct in_aliasreq {
#ifdef _KERNEL
-extern TAILQ_HEAD(in_ifaddrhead, in_ifaddr) in_ifaddrhead;
+extern TAILQ_HEAD(in_ifaddrhead, struct in_ifaddr) in_ifaddrhead;
extern struct ifqueue ipintrq; /* ip packet input queue */
extern struct in_addr zeroin_addr;
extern u_char inetctlerrmap[];
@@ -147,7 +147,7 @@ struct router_info {
* compatible with the rest of the world (see IN_FIRST_MULTI et al, below).
*/
struct in_multi {
- LIST_ENTRY(in_multi) inm_link; /* queue macro glue */
+ LIST_ENTRY(struct in_multi) inm_link; /* queue macro glue */
struct in_addr inm_addr; /* IP multicast address, convenience */
struct ifnet *inm_ifp; /* back pointer to ifnet */
struct ifmultiaddr *inm_ifma; /* back pointer to ifmultiaddr */
@@ -163,7 +163,7 @@ SYSCTL_DECL(_net_inet_ip);
SYSCTL_DECL(_net_inet_raw);
#endif
-extern LIST_HEAD(in_multihead, in_multi) in_multihead;
+extern LIST_HEAD(in_multihead, struct in_multi) in_multihead;
/*
* Structure used by macros below to remember position when stepping through
diff --git a/sys/netinet/ip_dummynet.c b/sys/netinet/ip_dummynet.c
index 5f8c091d5cd7..28be322294cf 100644
--- a/sys/netinet/ip_dummynet.c
+++ b/sys/netinet/ip_dummynet.c
@@ -120,7 +120,7 @@ static void dummynet_flush(void);
* ip_fw_chain is used when deleting a pipe, because ipfw rules can
* hold references to the pipe.
*/
-extern LIST_HEAD (ip_fw_head, ip_fw_chain) ip_fw_chain;
+extern LIST_HEAD (ip_fw_head, struct ip_fw_chain) ip_fw_chain;
static void
rt_unref(struct rtentry *rt)
diff --git a/sys/netinet/ip_flow.c b/sys/netinet/ip_flow.c
index 6c9119b5ee86..119dd5921c51 100644
--- a/sys/netinet/ip_flow.c
+++ b/sys/netinet/ip_flow.c
@@ -59,7 +59,7 @@
#define IPFLOW_TIMER (5 * PR_SLOWHZ)
#define IPFLOW_HASHBITS 6 /* should not be a multiple of 8 */
#define IPFLOW_HASHSIZE (1 << IPFLOW_HASHBITS)
-static LIST_HEAD(ipflowhead, ipflow) ipflows[IPFLOW_HASHSIZE];
+static LIST_HEAD(ipflowhead, struct ipflow) ipflows[IPFLOW_HASHSIZE];
static int ipflow_inuse;
#define IPFLOW_MAX 256
diff --git a/sys/netinet/ip_flow.h b/sys/netinet/ip_flow.h
index 4675996cc790..2e334aff9260 100644
--- a/sys/netinet/ip_flow.h
+++ b/sys/netinet/ip_flow.h
@@ -40,7 +40,7 @@
#define _NETINET_IP_FLOW_H
struct ipflow {
- LIST_ENTRY(ipflow) ipf_next; /* next ipflow in bucket */
+ LIST_ENTRY(struct ipflow) ipf_next; /* next ipflow in bucket */
struct in_addr ipf_dst; /* destination address */
struct in_addr ipf_src; /* source address */
diff --git a/sys/netinet/ip_fw.c b/sys/netinet/ip_fw.c
index 03deaa736773..8e654e6df285 100644
--- a/sys/netinet/ip_fw.c
+++ b/sys/netinet/ip_fw.c
@@ -84,7 +84,7 @@ struct ipfw_flow_id last_pkt ;
#define IPFW_DEFAULT_RULE ((u_int)(u_short)~0)
-LIST_HEAD (ip_fw_head, ip_fw_chain) ip_fw_chain;
+LIST_HEAD (ip_fw_head, struct ip_fw_chain) ip_fw_chain;
MALLOC_DEFINE(M_IPFW, "IpFw/IpAcct", "IpFw/IpAcct chain's");
diff --git a/sys/netinet/ip_fw.h b/sys/netinet/ip_fw.h
index a106108598b7..1609bd98d582 100644
--- a/sys/netinet/ip_fw.h
+++ b/sys/netinet/ip_fw.h
@@ -123,7 +123,7 @@ struct ip_fw_ext { /* extended structure */
#define fw_fwd_ip fw_un.fu_fwd_ip
struct ip_fw_chain {
- LIST_ENTRY(ip_fw_chain) chain;
+ LIST_ENTRY(struct ip_fw_chain) chain;
struct ip_fw *rule;
};
diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h
index 5798c84cba52..57e81a78c791 100644
--- a/sys/netinet/tcp_var.h
+++ b/sys/netinet/tcp_var.h
@@ -42,12 +42,12 @@
/* TCP segment queue entry */
struct tseg_qent {
- LIST_ENTRY(tseg_qent) tqe_q;
+ LIST_ENTRY(struct tseg_qent) tqe_q;
int tqe_len; /* TCP segment data length */
struct tcphdr *tqe_th; /* a pointer to tcp header */
struct mbuf *tqe_m; /* mbuf contains packet */
};
-LIST_HEAD(tsegqe_head, tseg_qent);
+LIST_HEAD(tsegqe_head, struct tseg_qent);
#ifdef MALLOC_DECLARE
MALLOC_DECLARE(M_TSEGQ);
#endif
diff --git a/sys/netinet6/in6_prefix.h b/sys/netinet6/in6_prefix.h
index fa5a0e35457f..daae4ede26fa 100644
--- a/sys/netinet6/in6_prefix.h
+++ b/sys/netinet6/in6_prefix.h
@@ -31,8 +31,8 @@
struct rr_prefix {
struct ifprefix rp_ifpr;
- LIST_ENTRY(rr_prefix) rp_entry;
- LIST_HEAD(rp_addrhead, rp_addr) rp_addrhead;
+ LIST_ENTRY(struct rr_prefix) rp_entry;
+ LIST_HEAD(rp_addrhead, struct rp_addr) rp_addrhead;
struct sockaddr_in6 rp_prefix; /* prefix */
u_int32_t rp_vltime; /* advertised valid lifetime */
u_int32_t rp_pltime; /* advertised preferred lifetime */
@@ -63,7 +63,7 @@ struct rr_prefix {
#define rp_rrf_decrprefd rp_flags.prf_rr.decrprefd
struct rp_addr {
- LIST_ENTRY(rp_addr) ra_entry;
+ LIST_ENTRY(struct rp_addr) ra_entry;
struct in6_addr ra_ifid;
struct in6_ifaddr *ra_addr;
struct ra_flags {
@@ -79,7 +79,7 @@ struct rp_addr {
#define RR_INFINITE_LIFETIME 0xffffffff
-LIST_HEAD(rr_prhead, rr_prefix);
+LIST_HEAD(rr_prhead, struct rr_prefix);
extern struct rr_prhead rr_prefix;
diff --git a/sys/netinet6/in6_var.h b/sys/netinet6/in6_var.h
index 163c1679ccee..d8aeb57775b9 100644
--- a/sys/netinet6/in6_var.h
+++ b/sys/netinet6/in6_var.h
@@ -453,11 +453,11 @@ do { \
*/
struct in6_multi_mship {
struct in6_multi *i6mm_maddr; /* Multicast address pointer */
- LIST_ENTRY(in6_multi_mship) i6mm_chain; /* multicast options chain */
+ LIST_ENTRY(struct in6_multi_mship) i6mm_chain; /* multicast options chain */
};
struct in6_multi {
- LIST_ENTRY(in6_multi) in6m_entry; /* list glue */
+ LIST_ENTRY(struct in6_multi) in6m_entry; /* list glue */
struct in6_addr in6m_addr; /* IP6 multicast address */
struct ifnet *in6m_ifp; /* back pointer to ifnet */
struct ifmultiaddr *in6m_ifma; /* back pointer to ifmultiaddr */
@@ -472,7 +472,7 @@ struct in6_multi {
SYSCTL_DECL(_net_inet6_ip6);
#endif
-extern LIST_HEAD(in6_multihead, in6_multi) in6_multihead;
+extern LIST_HEAD(in6_multihead, struct in6_multi) in6_multihead;
/*
* Structure used by macros below to remember position when stepping through
diff --git a/sys/netinet6/ip6_fw.c b/sys/netinet6/ip6_fw.c
index d6b4ca2960ed..40cf312a1809 100644
--- a/sys/netinet6/ip6_fw.c
+++ b/sys/netinet6/ip6_fw.c
@@ -66,7 +66,7 @@ static int fw6_verbose_limit = IPV6FIREWALL_VERBOSE_LIMIT;
static int fw6_verbose_limit = 0;
#endif
-LIST_HEAD (ip6_fw_head, ip6_fw_chain) ip6_fw_chain;
+LIST_HEAD (ip6_fw_head, struct ip6_fw_chain) ip6_fw_chain;
#ifdef SYSCTL_NODE
SYSCTL_DECL(_net_inet6_ip6);
diff --git a/sys/netinet6/ip6_fw.h b/sys/netinet6/ip6_fw.h
index a356ac3cca41..3b492eb1f319 100644
--- a/sys/netinet6/ip6_fw.h
+++ b/sys/netinet6/ip6_fw.h
@@ -97,7 +97,7 @@ struct ip6_fw {
#define fw_reject_code fw_un.fu_reject_code
struct ip6_fw_chain {
- LIST_ENTRY(ip6_fw_chain) chain;
+ LIST_ENTRY(struct ip6_fw_chain) chain;
struct ip6_fw *rule;
};
diff --git a/sys/netinet6/ip6_var.h b/sys/netinet6/ip6_var.h
index 2e70bcb5aefd..0a33997c96b7 100644
--- a/sys/netinet6/ip6_var.h
+++ b/sys/netinet6/ip6_var.h
@@ -109,7 +109,7 @@ struct ip6_moptions {
struct ifnet *im6o_multicast_ifp; /* ifp for outgoing multicasts */
u_char im6o_multicast_hlim; /* hoplimit for outgoing multicasts */
u_char im6o_multicast_loop; /* 1 >= hear sends if a member */
- LIST_HEAD(, in6_multi_mship) im6o_memberships;
+ LIST_HEAD(, struct in6_multi_mship) im6o_memberships;
};
/*
diff --git a/sys/netinet6/ipsec.h b/sys/netinet6/ipsec.h
index df68bd7b88b0..ee2026892e99 100644
--- a/sys/netinet6/ipsec.h
+++ b/sys/netinet6/ipsec.h
@@ -59,7 +59,7 @@ struct secpolicyindex {
/* Security Policy Data Base */
struct secpolicy {
- LIST_ENTRY(secpolicy) chain;
+ LIST_ENTRY(struct secpolicy) chain;
int refcnt; /* reference count */
struct secpolicyindex spidx; /* selector */
diff --git a/sys/netinet6/nd6.h b/sys/netinet6/nd6.h
index 756f49585a3c..3040dc9f3b14 100644
--- a/sys/netinet6/nd6.h
+++ b/sys/netinet6/nd6.h
@@ -125,7 +125,7 @@ struct in6_ndireq {
((MAX_RANDOM_FACTOR - MIN_RANDOM_FACTOR) * (x >> 10)))) /1000)
struct nd_defrouter {
- LIST_ENTRY(nd_defrouter) dr_entry;
+ LIST_ENTRY(struct nd_defrouter) dr_entry;
struct in6_addr rtaddr;
u_char flags;
u_short rtlifetime;
@@ -135,7 +135,7 @@ struct nd_defrouter {
struct nd_prefix {
struct ifnet *ndpr_ifp;
- LIST_ENTRY(nd_prefix) ndpr_entry;
+ LIST_ENTRY(struct nd_prefix) ndpr_entry;
struct sockaddr_in6 ndpr_prefix; /* prefix */
struct in6_addr ndpr_mask; /* netmask derived from the prefix */
struct in6_addr ndpr_addr; /* address that is derived from the prefix */
@@ -145,7 +145,7 @@ struct nd_prefix {
time_t ndpr_preferred; /* preferred time of the prefix */
struct prf_ra ndpr_flags;
/* list of routers that advertise the prefix: */
- LIST_HEAD(pr_rtrhead, nd_pfxrouter) ndpr_advrtrs;
+ LIST_HEAD(pr_rtrhead, struct nd_pfxrouter) ndpr_advrtrs;
u_char ndpr_plen;
struct ndpr_stateflags {
/* if this prefix can be regarded as on-link */
@@ -196,12 +196,12 @@ struct inet6_ndpr_msghdr {
#define ndpr2ifpr(ndpr) ((struct ifprefix *)(ndpr))
struct nd_pfxrouter {
- LIST_ENTRY(nd_pfxrouter) pfr_entry;
+ LIST_ENTRY(struct nd_pfxrouter) pfr_entry;
struct nd_defrouter *router;
};
-LIST_HEAD(nd_drhead, nd_defrouter);
-LIST_HEAD(nd_prhead, nd_prefix);
+LIST_HEAD(nd_drhead, struct nd_defrouter);
+LIST_HEAD(nd_prhead, struct nd_prefix);
/* nd6.c */
extern int nd6_prune;
diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c
index 9c16e1e3c468..3ba95355b87a 100644
--- a/sys/netinet6/nd6_nbr.c
+++ b/sys/netinet6/nd6_nbr.c
@@ -796,9 +796,9 @@ nd6_ifptomac(ifp)
}
}
-TAILQ_HEAD(dadq_head, dadq);
+TAILQ_HEAD(dadq_head, struct dadq);
struct dadq {
- TAILQ_ENTRY(dadq) dad_list;
+ TAILQ_ENTRY(struct dadq) dad_list;
struct ifaddr *dad_ifa;
int dad_count; /* max NS to send */
int dad_ns_ocount; /* NS sent so far */
diff --git a/sys/netkey/key.c b/sys/netkey/key.c
index f00792d00d50..2e348d12fe30 100644
--- a/sys/netkey/key.c
+++ b/sys/netkey/key.c
@@ -110,12 +110,12 @@ static int key_blockacq_lifetime = 20; /* lifetime for blocking SADB_ACQUIRE.*/
static u_int32_t acq_seq = 0;
static int key_tick_init_random = 0;
-static LIST_HEAD(_sptree, secpolicy) sptree[IPSEC_DIR_MAX]; /* SPD */
-static LIST_HEAD(_sahtree, secashead) sahtree; /* SAD */
-static LIST_HEAD(_regtree, secreg) regtree[SADB_SATYPE_MAX + 1];
+static LIST_HEAD(_sptree, struct secpolicy) sptree[IPSEC_DIR_MAX]; /* SPD */
+static LIST_HEAD(_sahtree, struct secashead) sahtree; /* SAD */
+static LIST_HEAD(_regtree, struct secreg) regtree[SADB_SATYPE_MAX + 1];
/* registed list */
#ifndef IPSEC_NONBLOCK_ACQUIRE
-static LIST_HEAD(_acqtree, secacq) acqtree; /* acquiring list */
+static LIST_HEAD(_acqtree, struct secacq) acqtree; /* acquiring list */
#endif
struct key_cb key_cb;
diff --git a/sys/netkey/keydb.h b/sys/netkey/keydb.h
index af4b3ba497a2..608c10da62a5 100644
--- a/sys/netkey/keydb.h
+++ b/sys/netkey/keydb.h
@@ -45,14 +45,14 @@ struct secasindex {
/* Security Association Data Base */
struct secashead {
- LIST_ENTRY(secashead) chain;
+ LIST_ENTRY(struct secashead) chain;
struct secasindex saidx;
struct secpolicyindex *owner; /* Indicate it who owned its SA. */
/* If NULL then it's shared SA */
u_int8_t state; /* MATURE or DEAD. */
- LIST_HEAD(_satree, secasvar) savtree[SADB_SASTATE_MAX+1];
+ LIST_HEAD(_satree, struct secasvar) savtree[SADB_SASTATE_MAX+1];
/* SA chain */
/* The first of this list is newer SA */
@@ -61,7 +61,7 @@ struct secashead {
/* Security Association */
struct secasvar {
- LIST_ENTRY(secasvar) chain;
+ LIST_ENTRY(struct secasvar) chain;
int refcnt; /* reference count */
u_int8_t state; /* Status of this Association */
@@ -102,7 +102,7 @@ struct secreplay {
/* socket table due to send PF_KEY messages. */
struct secreg {
- LIST_ENTRY(secreg) chain;
+ LIST_ENTRY(struct secreg) chain;
struct socket *so;
};
@@ -110,7 +110,7 @@ struct secreg {
#ifndef IPSEC_NONBLOCK_ACQUIRE
/* acquiring list table. */
struct secacq {
- LIST_ENTRY(secacq) chain;
+ LIST_ENTRY(struct secacq) chain;
struct secasindex saidx;
diff --git a/sys/netnatm/natm.h b/sys/netnatm/natm.h
index 431eb3544647..eade047b5552 100644
--- a/sys/netnatm/natm.h
+++ b/sys/netnatm/natm.h
@@ -75,7 +75,7 @@ struct sockaddr_natm {
*/
struct natmpcb {
- LIST_ENTRY(natmpcb) pcblist; /* list pointers */
+ LIST_ENTRY(struct natmpcb) pcblist; /* list pointers */
u_int npcb_inq; /* # of our pkts in proto q */
struct socket *npcb_socket; /* backpointer to socket */
struct ifnet *npcb_ifp; /* pointer to hardware */
@@ -106,7 +106,7 @@ struct natmpcb {
#define NPCB_RAWCC (1024*1024) /* 1MB */
-LIST_HEAD(npcblist, natmpcb);
+LIST_HEAD(npcblist, struct natmpcb);
/* global data structures */
diff --git a/sys/netncp/ncp_conn.c b/sys/netncp/ncp_conn.c
index 026f2622ee59..b13688b296e4 100644
--- a/sys/netncp/ncp_conn.c
+++ b/sys/netncp/ncp_conn.c
@@ -44,7 +44,7 @@
#include <netncp/ncp_subr.h>
#include <netncp/ncp_conn.h>
-SLIST_HEAD(ncp_handle_head,ncp_handle);
+SLIST_HEAD(ncp_handle_head, struct ncp_handle);
int ncp_burst_enabled = 1;
@@ -248,7 +248,7 @@ ncp_conn_free(struct ncp_conn *ncp) {
ncp_conn_unlocklist(ncp->procp);
return 0;
}
- SLIST_REMOVE(&conn_list, ncp, ncp_conn, nc_next);
+ SLIST_REMOVE(&conn_list, ncp, struct ncp_conn, nc_next);
ncp_conn_cnt--;
ncp_conn_unlocklist(ncp->procp);
if (ncp->li.user) free(ncp->li.user, M_NCPDATA);
@@ -434,7 +434,7 @@ ncp_conn_puthandle(struct ncp_handle *handle, struct proc *p, int force) {
refp->nh_ref = 0;
}
if (refp->nh_ref == 0) {
- SLIST_REMOVE(&lhlist, refp, ncp_handle, nh_next);
+ SLIST_REMOVE(&lhlist, refp, struct ncp_handle, nh_next);
FREE(refp, M_NCPDATA);
}
lockmgr(&lhlock, LK_RELEASE, 0, p);
@@ -471,7 +471,7 @@ ncp_conn_putprochandles(struct proc *p) {
if (hp->nh_proc != p) continue;
haveone = 1;
hp->nh_conn->ref_cnt -= hp->nh_ref;
- SLIST_REMOVE(&lhlist, hp, ncp_handle, nh_next);
+ SLIST_REMOVE(&lhlist, hp, struct ncp_handle, nh_next);
FREE(hp, M_NCPDATA);
}
lockmgr(&lhlock, LK_RELEASE, 0, p);
diff --git a/sys/netncp/ncp_conn.h b/sys/netncp/ncp_conn.h
index 850e5e7217a6..2cbb97cfaaee 100644
--- a/sys/netncp/ncp_conn.h
+++ b/sys/netncp/ncp_conn.h
@@ -144,7 +144,7 @@ struct ncp_conn_stat {
struct socket;
struct u_cred;
-SLIST_HEAD(ncp_conn_head,ncp_conn);
+SLIST_HEAD(ncp_conn_head, struct ncp_conn);
struct ncp_rq;
struct ncp_conn;
@@ -154,7 +154,7 @@ struct ncp_conn;
* This gives us a freedom in maintance of underlying connections.
*/
struct ncp_handle {
- SLIST_ENTRY(ncp_handle) nh_next;
+ SLIST_ENTRY(struct ncp_handle) nh_next;
int nh_id; /* handle id */
struct ncp_conn*nh_conn; /* which conn we are refernce */
struct proc * nh_proc; /* who owns the handle */
@@ -165,7 +165,7 @@ struct ncp_handle {
* Describes any connection to server
*/
struct ncp_conn {
- SLIST_ENTRY(ncp_conn) nc_next;
+ SLIST_ENTRY(struct ncp_conn) nc_next;
struct ncp_conn_args li;
struct ucred *nc_owner;
gid_t nc_group;
@@ -176,7 +176,7 @@ struct ncp_conn {
struct socket *msg_so;
struct socket *bc_so;
int ref_cnt; /* how many handles leased */
- SLIST_HEAD(ncp_ref_hd,ncp_ref) ref_list;/* list of handles */
+ SLIST_HEAD(ncp_ref_hd, struct ncp_ref) ref_list;/* list of handles */
struct lock nc_lock; /* excl locks */
int nc_lwant; /* number of wanted locks */
struct proc *procp; /* pid currently operates */
diff --git a/sys/netncp/ncp_rcfile.h b/sys/netncp/ncp_rcfile.h
index 815b8ddc2393..dcebb3a2fcaa 100644
--- a/sys/netncp/ncp_rcfile.h
+++ b/sys/netncp/ncp_rcfile.h
@@ -36,20 +36,20 @@
#include <sys/queue.h>
struct rckey {
- SLIST_ENTRY(rckey) rk_next;
+ SLIST_ENTRY(struct rckey) rk_next;
char *rk_name;
char *rk_value;
};
struct rcsection {
- SLIST_ENTRY(rcsection) rs_next;
- SLIST_HEAD(rckey_head,rckey) rs_keys;
+ SLIST_ENTRY(struct rcsection) rs_next;
+ SLIST_HEAD(rckey_head, struct rckey) rs_keys;
char *rs_name;
};
struct rcfile {
- SLIST_ENTRY(rcfile) rf_next;
- SLIST_HEAD(rcsec_head, rcsection) rf_sect;
+ SLIST_ENTRY(struct rcfile) rf_next;
+ SLIST_HEAD(rcsec_head, struct rcsection) rf_sect;
char *rf_name;
FILE *rf_f;
};
diff --git a/sys/nfs/nfs.h b/sys/nfs/nfs.h
index e07a4f5315d1..475dbd2f8f92 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 70e871fc4db0..fab991290c29 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 1de873908dfa..8ed28308941a 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 9eb168f6086e..07808c43bd60 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 70e871fc4db0..fab991290c29 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 8efd1dfcbc38..8b737f7a805e 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 dac6020f66e3..12b717bc53f7 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 eec5850bd381..93ce6ce7ec4c 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 15b5af510fbf..a76b94be0a2e 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;
/*
diff --git a/sys/nfsclient/nfs.h b/sys/nfsclient/nfs.h
index e07a4f5315d1..475dbd2f8f92 100644
--- a/sys/nfsclient/nfs.h
+++ b/sys/nfsclient/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/nfsclient/nfs_node.c b/sys/nfsclient/nfs_node.c
index 1de873908dfa..8ed28308941a 100644
--- a/sys/nfsclient/nfs_node.c
+++ b/sys/nfsclient/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/nfsclient/nfs_subs.c b/sys/nfsclient/nfs_subs.c
index 70e871fc4db0..fab991290c29 100644
--- a/sys/nfsclient/nfs_subs.c
+++ b/sys/nfsclient/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/nfsclient/nfsargs.h b/sys/nfsclient/nfsargs.h
index e07a4f5315d1..475dbd2f8f92 100644
--- a/sys/nfsclient/nfsargs.h
+++ b/sys/nfsclient/nfsargs.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/nfsclient/nfsmount.h b/sys/nfsclient/nfsmount.h
index 8efd1dfcbc38..8b737f7a805e 100644
--- a/sys/nfsclient/nfsmount.h
+++ b/sys/nfsclient/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/nfsclient/nfsnode.h b/sys/nfsclient/nfsnode.h
index dac6020f66e3..12b717bc53f7 100644
--- a/sys/nfsclient/nfsnode.h
+++ b/sys/nfsclient/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/nfsclient/nfsstats.h b/sys/nfsclient/nfsstats.h
index e07a4f5315d1..475dbd2f8f92 100644
--- a/sys/nfsclient/nfsstats.h
+++ b/sys/nfsclient/nfsstats.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/nfsserver/nfs.h b/sys/nfsserver/nfs.h
index e07a4f5315d1..475dbd2f8f92 100644
--- a/sys/nfsserver/nfs.h
+++ b/sys/nfsserver/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/nfsserver/nfs_srvcache.c b/sys/nfsserver/nfs_srvcache.c
index 9eb168f6086e..07808c43bd60 100644
--- a/sys/nfsserver/nfs_srvcache.c
+++ b/sys/nfsserver/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/nfsserver/nfs_srvsubs.c b/sys/nfsserver/nfs_srvsubs.c
index 70e871fc4db0..fab991290c29 100644
--- a/sys/nfsserver/nfs_srvsubs.c
+++ b/sys/nfsserver/nfs_srvsubs.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/nfsserver/nfsrvcache.h b/sys/nfsserver/nfsrvcache.h
index eec5850bd381..93ce6ce7ec4c 100644
--- a/sys/nfsserver/nfsrvcache.h
+++ b/sys/nfsserver/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/nfsserver/nfsrvstats.h b/sys/nfsserver/nfsrvstats.h
index e07a4f5315d1..475dbd2f8f92 100644
--- a/sys/nfsserver/nfsrvstats.h
+++ b/sys/nfsserver/nfsrvstats.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/ntfs/ntfs_ihash.c b/sys/ntfs/ntfs_ihash.c
index 0deecff73851..0ddf074c3a35 100644
--- a/sys/ntfs/ntfs_ihash.c
+++ b/sys/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/ntfs/ntfs_inode.h b/sys/ntfs/ntfs_inode.h
index a86d5f7daa01..a14e008bcc7e 100644
--- a/sys/ntfs/ntfs_inode.h
+++ b/sys/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/ntfs/ntfs_subr.h b/sys/ntfs/ntfs_subr.h
index a0cda505c421..f172c56b16b6 100644
--- a/sys/ntfs/ntfs_subr.h
+++ b/sys/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/nwfs/nwfs_node.c b/sys/nwfs/nwfs_node.c
index 25d92251d1d8..f632a1ed78b7 100644
--- a/sys/nwfs/nwfs_node.c
+++ b/sys/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/nwfs/nwfs_node.h b/sys/nwfs/nwfs_node.h
index 3777679c7c64..2755013b2037 100644
--- a/sys/nwfs/nwfs_node.h
+++ b/sys/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/pci/amd.h b/sys/pci/amd.h
index 85f4f80e1474..e36956e4fe93 100644
--- a/sys/pci/amd.h
+++ b/sys/pci/amd.h
@@ -154,7 +154,7 @@ typedef struct _EEprom {
* SCSI Request Block
*/
struct amd_srb {
- TAILQ_ENTRY(amd_srb) links;
+ TAILQ_ENTRY(struct amd_srb) links;
u_int8_t CmdBlock[12];
union ccb *pccb;
bus_dmamap_t dmamap;
@@ -187,7 +187,7 @@ struct amd_srb {
u_int8_t ScsiCmdLen;
};
-TAILQ_HEAD(srb_queue, amd_srb);
+TAILQ_HEAD(srb_queue, struct amd_srb);
/*
* Per-adapter, software configuration.
diff --git a/sys/pci/if_skreg.h b/sys/pci/if_skreg.h
index af17c1c165ce..2a5afc0a3258 100644
--- a/sys/pci/if_skreg.h
+++ b/sys/pci/if_skreg.h
@@ -1129,7 +1129,7 @@ struct sk_jslot {
struct sk_jpool_entry {
int slot;
- SLIST_ENTRY(sk_jpool_entry) jpool_entries;
+ SLIST_ENTRY(struct sk_jpool_entry) jpool_entries;
};
struct sk_chain {
@@ -1209,8 +1209,8 @@ struct sk_if_softc {
struct sk_softc *sk_softc; /* parent controller */
int sk_tx_bmu; /* TX BMU register */
int sk_if_flags;
- SLIST_HEAD(__sk_jfreehead, sk_jpool_entry) sk_jfree_listhead;
- SLIST_HEAD(__sk_jinusehead, sk_jpool_entry) sk_jinuse_listhead;
+ SLIST_HEAD(__sk_jfreehead, struct sk_jpool_entry) sk_jfree_listhead;
+ SLIST_HEAD(__sk_jinusehead, struct sk_jpool_entry) sk_jinuse_listhead;
};
#define SK_MAXUNIT 256
diff --git a/sys/pci/if_tireg.h b/sys/pci/if_tireg.h
index 5210ffac9cff..fd6cb00cb79d 100644
--- a/sys/pci/if_tireg.h
+++ b/sys/pci/if_tireg.h
@@ -1103,12 +1103,12 @@ struct ti_type {
struct ti_mc_entry {
struct ether_addr mc_addr;
- SLIST_ENTRY(ti_mc_entry) mc_entries;
+ SLIST_ENTRY(struct ti_mc_entry) mc_entries;
};
struct ti_jpool_entry {
int slot;
- SLIST_ENTRY(ti_jpool_entry) jpool_entries;
+ SLIST_ENTRY(struct ti_jpool_entry) jpool_entries;
};
struct ti_softc {
@@ -1135,9 +1135,9 @@ struct ti_softc {
u_int16_t ti_std; /* current std ring head */
u_int16_t ti_mini; /* current mini ring head */
u_int16_t ti_jumbo; /* current jumo ring head */
- SLIST_HEAD(__ti_mchead, ti_mc_entry) ti_mc_listhead;
- SLIST_HEAD(__ti_jfreehead, ti_jpool_entry) ti_jfree_listhead;
- SLIST_HEAD(__ti_jinusehead, ti_jpool_entry) ti_jinuse_listhead;
+ SLIST_HEAD(__ti_mchead, struct ti_mc_entry) ti_mc_listhead;
+ SLIST_HEAD(__ti_jfreehead, struct ti_jpool_entry) ti_jfree_listhead;
+ SLIST_HEAD(__ti_jinusehead, struct ti_jpool_entry) ti_jinuse_listhead;
u_int32_t ti_stat_ticks;
u_int32_t ti_rx_coal_ticks;
u_int32_t ti_tx_coal_ticks;
diff --git a/sys/pci/pci.c b/sys/pci/pci.c
index aa58b8aa4eb8..081cd5457315 100644
--- a/sys/pci/pci.c
+++ b/sys/pci/pci.c
@@ -87,13 +87,13 @@ struct pci_quirk pci_quirks[] = {
#define PCI_MAPPORT 0x04 /* port map */
struct pci_devinfo {
- STAILQ_ENTRY(pci_devinfo) pci_links;
+ STAILQ_ENTRY(struct pci_devinfo) pci_links;
struct resource_list resources;
pcicfgregs cfg;
struct pci_conf conf;
};
-static STAILQ_HEAD(devlist, pci_devinfo) pci_devq;
+static STAILQ_HEAD(devlist, struct pci_devinfo) pci_devq;
u_int32_t pci_numdevs = 0;
static u_int32_t pci_generation = 0;
@@ -400,7 +400,7 @@ pci_freecfg(struct pci_devinfo *dinfo)
if (dinfo->cfg.map != NULL)
free(dinfo->cfg.map, M_DEVBUF);
/* XXX this hasn't been tested */
- STAILQ_REMOVE(devlist_head, dinfo, pci_devinfo, pci_links);
+ STAILQ_REMOVE(devlist_head, dinfo, struct pci_devinfo, pci_links);
free(dinfo, M_DEVBUF);
/* increment the generation count */
diff --git a/sys/svr4/svr4_socket.c b/sys/svr4/svr4_socket.c
index 1884b07ef316..264e6547bffb 100644
--- a/sys/svr4/svr4_socket.c
+++ b/sys/svr4/svr4_socket.c
@@ -68,10 +68,10 @@ struct svr4_sockcache_entry {
struct sockaddr_un sock;/* Pathname for the socket */
udev_t dev; /* Device where the socket lives on */
ino_t ino; /* Inode where the socket lives on */
- TAILQ_ENTRY(svr4_sockcache_entry) entries;
+ TAILQ_ENTRY(struct svr4_sockcache_entry) entries;
};
-extern TAILQ_HEAD(svr4_sockcache_head, svr4_sockcache_entry) svr4_head;
+extern TAILQ_HEAD(svr4_sockcache_head, struct svr4_sockcache_entry) svr4_head;
extern int svr4_str_initialized;
struct sockaddr_un *
diff --git a/sys/sys/aio.h b/sys/sys/aio.h
index 946ac0bec4c8..a7ae6b6f49f0 100644
--- a/sys/sys/aio.h
+++ b/sys/sys/aio.h
@@ -156,8 +156,8 @@ __END_DECLS
#define AIOCBLIST_DONE 0x10
struct aiocblist {
- TAILQ_ENTRY (aiocblist) list; /* List of jobs */
- TAILQ_ENTRY (aiocblist) plist; /* List of jobs for proc */
+ TAILQ_ENTRY (struct aiocblist) list; /* List of jobs */
+ TAILQ_ENTRY (struct aiocblist) plist; /* List of jobs for proc */
int jobflags;
int jobstate;
int inputcharge, outputcharge;
diff --git a/sys/sys/bio.h b/sys/sys/bio.h
index bdd19dffb768..d65e57a26ba2 100644
--- a/sys/sys/bio.h
+++ b/sys/sys/bio.h
@@ -76,7 +76,7 @@ struct bio {
void *bio_driver2; /* Private use by the callee. */
void *bio_caller1; /* Private use by the caller. */
void *bio_caller2; /* Private use by the caller. */
- TAILQ_ENTRY(bio) bio_queue; /* Disksort queue. */
+ TAILQ_ENTRY(struct bio) bio_queue; /* Disksort queue. */
/* XXX: these go away when bio chaining is introduced */
daddr_t bio_pblkno; /* physical block number */
@@ -104,7 +104,7 @@ biodone(struct bio *bp)
}
struct bio_queue_head {
- TAILQ_HEAD(bio_queue, bio) queue;
+ TAILQ_HEAD(bio_queue, struct bio) queue;
daddr_t last_pblkno;
struct bio *insert_point;
struct bio *switch_point;
diff --git a/sys/sys/buf.h b/sys/sys/buf.h
index 39a5c99135a5..9d97bc09b223 100644
--- a/sys/sys/buf.h
+++ b/sys/sys/buf.h
@@ -53,7 +53,7 @@ struct vnode;
/*
* To avoid including <ufs/ffs/softdep.h>
*/
-LIST_HEAD(workhead, worklist);
+LIST_HEAD(workhead, struct worklist);
/*
* These are currently used only by the soft dependency code, hence
* are stored once in a global variable. If other subsystems wanted
@@ -103,10 +103,10 @@ struct buf {
#define b_resid b_io.bio_resid
void (*b_iodone) __P((struct buf *));
off_t b_offset; /* Offset into file. */
- LIST_ENTRY(buf) b_hash; /* Hash chain. */
- TAILQ_ENTRY(buf) b_vnbufs; /* Buffer's associated vnode. */
- TAILQ_ENTRY(buf) b_freelist; /* Free list position if not active. */
- TAILQ_ENTRY(buf) b_act; /* Device driver queue when active. *new* */
+ LIST_ENTRY(struct buf) b_hash; /* Hash chain. */
+ TAILQ_ENTRY(struct buf) b_vnbufs; /* Buffer's associated vnode. */
+ TAILQ_ENTRY(struct buf) b_freelist; /* Free list position if not active. */
+ TAILQ_ENTRY(struct buf) b_act; /* Device driver queue when active. *new* */
long b_flags; /* B_* flags. */
unsigned short b_qindex; /* buffer queue index */
unsigned char b_xflags; /* extra flags */
@@ -126,8 +126,8 @@ struct buf {
int pg_reqpage;
} b_pager;
union cluster_info {
- TAILQ_HEAD(cluster_list_head, buf) cluster_head;
- TAILQ_ENTRY(buf) cluster_entry;
+ TAILQ_HEAD(cluster_list_head, struct buf) cluster_head;
+ TAILQ_ENTRY(struct buf) cluster_entry;
} b_cluster;
struct vm_page *b_pages[btoc(MAXPHYS)];
int b_npages;
@@ -334,7 +334,7 @@ BUF_REFCNT(struct buf *bp)
#endif /* _KERNEL */
struct buf_queue_head {
- TAILQ_HEAD(buf_queue, buf) queue;
+ TAILQ_HEAD(buf_queue, struct buf) queue;
daddr_t last_pblkno;
struct buf *insert_point;
struct buf *switch_point;
@@ -440,8 +440,8 @@ extern char *buffers; /* The buffer contents. */
extern int bufpages; /* Number of memory pages in the buffer pool. */
extern struct buf *swbuf; /* Swap I/O buffer headers. */
extern int nswbuf; /* Number of swap I/O buffer headers. */
-extern TAILQ_HEAD(swqueue, buf) bswlist;
-extern TAILQ_HEAD(bqueues, buf) bufqueues[BUFFER_QUEUES];
+extern TAILQ_HEAD(swqueue, struct buf) bswlist;
+extern TAILQ_HEAD(bqueues, struct buf) bufqueues[BUFFER_QUEUES];
struct uio;
diff --git a/sys/sys/bus.h b/sys/sys/bus.h
index 8ab2a130a4cc..5527685255bd 100644
--- a/sys/sys/bus.h
+++ b/sys/sys/bus.h
@@ -81,7 +81,7 @@ typedef enum device_state {
struct resource;
struct resource_list_entry {
- SLIST_ENTRY(resource_list_entry) link;
+ SLIST_ENTRY(struct resource_list_entry) link;
int type; /* type argument to alloc_resource */
int rid; /* resource identifier */
struct resource *res; /* the real resource when allocated */
@@ -89,7 +89,7 @@ struct resource_list_entry {
u_long end; /* end of resource range */
u_long count; /* count within range */
};
-SLIST_HEAD(resource_list, resource_list_entry);
+SLIST_HEAD(resource_list, struct resource_list_entry);
/*
* Initialise a resource list.
diff --git a/sys/sys/bus_private.h b/sys/sys/bus_private.h
index 547892b3c8d3..3b934be896ce 100644
--- a/sys/sys/bus_private.h
+++ b/sys/sys/bus_private.h
@@ -37,18 +37,18 @@
typedef struct driverlink *driverlink_t;
struct driverlink {
driver_t *driver;
- TAILQ_ENTRY(driverlink) link; /* list of drivers in devclass */
+ TAILQ_ENTRY(struct driverlink) link; /* list of drivers in devclass */
};
/*
* Forward declarations
*/
-typedef TAILQ_HEAD(devclass_list, devclass) devclass_list_t;
-typedef TAILQ_HEAD(driver_list, driverlink) driver_list_t;
-typedef TAILQ_HEAD(device_list, device) device_list_t;
+typedef TAILQ_HEAD(devclass_list, struct devclass) devclass_list_t;
+typedef TAILQ_HEAD(driver_list, struct driverlink) driver_list_t;
+typedef TAILQ_HEAD(device_list, struct device) device_list_t;
struct devclass {
- TAILQ_ENTRY(devclass) link;
+ TAILQ_ENTRY(struct devclass) link;
driver_list_t drivers; /* bus devclasses store drivers for bus */
char *name;
device_t *devices; /* array of devices indexed by unit */
@@ -92,7 +92,7 @@ struct device {
/*
* Device hierarchy.
*/
- TAILQ_ENTRY(device) link; /* list of devices in parent */
+ TAILQ_ENTRY(struct device) link; /* list of devices in parent */
device_t parent;
device_list_t children; /* list of subordinate devices */
diff --git a/sys/sys/callout.h b/sys/sys/callout.h
index c83bf442c707..c2c8b9b9d4f6 100644
--- a/sys/sys/callout.h
+++ b/sys/sys/callout.h
@@ -44,13 +44,13 @@
#include <sys/queue.h>
-SLIST_HEAD(callout_list, callout);
-TAILQ_HEAD(callout_tailq, callout);
+SLIST_HEAD(callout_list, struct callout);
+TAILQ_HEAD(callout_tailq, struct callout);
struct callout {
union {
- SLIST_ENTRY(callout) sle;
- TAILQ_ENTRY(callout) tqe;
+ SLIST_ENTRY(struct callout) sle;
+ TAILQ_ENTRY(struct callout) tqe;
} c_links;
int c_time; /* ticks to the event */
void *c_arg; /* function argument */
diff --git a/sys/sys/conf.h b/sys/sys/conf.h
index c13a5ca17eb6..f1408fef1d1a 100644
--- a/sys/sys/conf.h
+++ b/sys/sys/conf.h
@@ -55,8 +55,8 @@ struct specinfo {
#define SI_STASHED 0x0001 /* created in stashed storage */
#define SI_WHINED 0x0002 /* whined about already */
udev_t si_udev;
- LIST_ENTRY(specinfo) si_hash;
- SLIST_HEAD(, vnode) si_hlist;
+ LIST_ENTRY(struct specinfo) si_hash;
+ SLIST_HEAD(, struct vnode) si_hlist;
char si_name[SPECNAMELEN + 1];
void *si_drv1, *si_drv2;
struct cdevsw *si_devsw;
diff --git a/sys/sys/devicestat.h b/sys/sys/devicestat.h
index 7e617c68d3b2..7ccc7013c49d 100644
--- a/sys/sys/devicestat.h
+++ b/sys/sys/devicestat.h
@@ -121,7 +121,7 @@ typedef enum {
} devstat_type_flags;
struct devstat {
- STAILQ_ENTRY(devstat) dev_links;
+ STAILQ_ENTRY(struct devstat) dev_links;
u_int32_t device_number; /*
* Devstat device
* number.
diff --git a/sys/sys/event.h b/sys/sys/event.h
index 366b3476f81b..ca53c5b53055 100644
--- a/sys/sys/event.h
+++ b/sys/sys/event.h
@@ -94,7 +94,7 @@ struct kevent {
*/
#include <sys/queue.h>
struct knote;
-SLIST_HEAD(klist, knote);
+SLIST_HEAD(klist, struct knote);
#ifdef _KERNEL
@@ -114,9 +114,9 @@ struct filterops {
};
struct knote {
- SLIST_ENTRY(knote) kn_link; /* for fd */
- SLIST_ENTRY(knote) kn_selnext; /* for struct selinfo */
- TAILQ_ENTRY(knote) kn_tqe;
+ SLIST_ENTRY(struct knote) kn_link; /* for fd */
+ SLIST_ENTRY(struct knote) kn_selnext; /* for struct selinfo */
+ TAILQ_ENTRY(struct knote) kn_tqe;
struct kqueue *kn_kq; /* which queue we are on */
struct kevent kn_kevent;
int kn_status;
diff --git a/sys/sys/eventhandler.h b/sys/sys/eventhandler.h
index 0d879b7034ea..3239d988bbe1 100644
--- a/sys/sys/eventhandler.h
+++ b/sys/sys/eventhandler.h
@@ -33,18 +33,18 @@
struct eventhandler_entry
{
- TAILQ_ENTRY(eventhandler_entry) ee_link;
+ TAILQ_ENTRY(struct eventhandler_entry) ee_link;
int ee_priority;
void *ee_arg;
};
struct eventhandler_list
{
- TAILQ_ENTRY(eventhandler_list) el_link;
+ TAILQ_ENTRY(struct eventhandler_list) el_link;
char *el_name;
int el_flags;
#define EHE_INITTED (1<<0)
- TAILQ_HEAD(,eventhandler_entry) el_entries;
+ TAILQ_HEAD(, struct eventhandler_entry) el_entries;
};
typedef struct eventhandler_entry *eventhandler_tag;
diff --git a/sys/sys/eventvar.h b/sys/sys/eventvar.h
index 7046f511057a..e98a1a7ba58d 100644
--- a/sys/sys/eventvar.h
+++ b/sys/sys/eventvar.h
@@ -33,7 +33,7 @@
#define KQEXTENT 256 /* linear growth by this amount */
struct kqueue {
- TAILQ_HEAD(kqlist, knote) kq_head; /* list of pending event */
+ TAILQ_HEAD(kqlist, struct knote) kq_head; /* list of pending event */
int kq_count; /* number of pending events */
struct selinfo kq_sel;
struct filedesc *kq_fdp;
diff --git a/sys/sys/file.h b/sys/sys/file.h
index a92370a3be5d..6cbcb212b954 100644
--- a/sys/sys/file.h
+++ b/sys/sys/file.h
@@ -54,7 +54,7 @@ struct uio;
* One entry for each open kernel vnode and socket.
*/
struct file {
- LIST_ENTRY(file) f_list;/* list of active files */
+ LIST_ENTRY(struct file) f_list;/* list of active files */
short f_flag; /* see fcntl.h */
#define DTYPE_VNODE 1 /* file */
#define DTYPE_SOCKET 2 /* communications endpoint */
@@ -96,7 +96,7 @@ struct file {
MALLOC_DECLARE(M_FILE);
#endif
-LIST_HEAD(filelist, file);
+LIST_HEAD(filelist, struct file);
extern struct filelist filehead; /* head of list of open files */
extern struct fileops vnops;
extern struct fileops badfileops;
diff --git a/sys/sys/filedesc.h b/sys/sys/filedesc.h
index 0a43b8303e04..8df890628ce6 100644
--- a/sys/sys/filedesc.h
+++ b/sys/sys/filedesc.h
@@ -111,7 +111,7 @@ struct sigio {
struct proc *siu_proc; /* process to receive SIGIO/SIGURG */
struct pgrp *siu_pgrp; /* process group to receive ... */
} sio_u;
- SLIST_ENTRY(sigio) sio_pgsigio; /* sigio's for process or group */
+ SLIST_ENTRY(struct sigio) sio_pgsigio; /* sigio's for process or group */
struct sigio **sio_myref; /* location of the pointer that holds
* the reference to this structure */
struct ucred *sio_ucred; /* current credentials */
@@ -121,7 +121,7 @@ struct sigio {
#define sio_proc sio_u.siu_proc
#define sio_pgrp sio_u.siu_pgrp
-SLIST_HEAD(sigiolst, sigio);
+SLIST_HEAD(sigiolst, struct sigio);
#ifdef _KERNEL
int closef __P((struct file *fp, struct proc *p));
diff --git a/sys/sys/kernel.h b/sys/sys/kernel.h
index fe340c9e64c5..0f09cdee59f0 100644
--- a/sys/sys/kernel.h
+++ b/sys/sys/kernel.h
@@ -295,7 +295,7 @@ extern struct linker_set execsw_set;
struct intr_config_hook {
- TAILQ_ENTRY(intr_config_hook) ich_links;
+ TAILQ_ENTRY(struct intr_config_hook) ich_links;
void (*ich_func) __P((void *arg));
void *ich_arg;
};
diff --git a/sys/sys/linedisc.h b/sys/sys/linedisc.h
index c13a5ca17eb6..f1408fef1d1a 100644
--- a/sys/sys/linedisc.h
+++ b/sys/sys/linedisc.h
@@ -55,8 +55,8 @@ struct specinfo {
#define SI_STASHED 0x0001 /* created in stashed storage */
#define SI_WHINED 0x0002 /* whined about already */
udev_t si_udev;
- LIST_ENTRY(specinfo) si_hash;
- SLIST_HEAD(, vnode) si_hlist;
+ LIST_ENTRY(struct specinfo) si_hash;
+ SLIST_HEAD(, struct vnode) si_hlist;
char si_name[SPECNAMELEN + 1];
void *si_drv1, *si_drv2;
struct cdevsw *si_devsw;
diff --git a/sys/sys/linker.h b/sys/sys/linker.h
index 60c47b590811..cc6b3e74e34e 100644
--- a/sys/sys/linker.h
+++ b/sys/sys/linker.h
@@ -42,7 +42,7 @@ MALLOC_DECLARE(M_LINKER);
* Object representing a file which has been loaded by the linker.
*/
typedef struct linker_file* linker_file_t;
-typedef TAILQ_HEAD(, linker_file) linker_file_list_t;
+typedef TAILQ_HEAD(, struct linker_file) linker_file_list_t;
typedef caddr_t linker_sym_t; /* opaque symbol */
typedef c_caddr_t c_linker_sym_t; /* const opaque symbol */
@@ -57,7 +57,7 @@ typedef struct linker_symval {
} linker_symval_t;
struct common_symbol {
- STAILQ_ENTRY(common_symbol) link;
+ STAILQ_ENTRY(struct common_symbol) link;
char* name;
caddr_t address;
};
@@ -68,27 +68,27 @@ struct linker_file {
int userrefs; /* kldload(2) count */
int flags;
#define LINKER_FILE_LINKED 0x1 /* file has been fully linked */
- TAILQ_ENTRY(linker_file) link; /* list of all loaded files */
+ TAILQ_ENTRY(struct linker_file) link; /* list of all loaded files */
char* filename; /* file which was loaded */
int id; /* unique id */
caddr_t address; /* load address */
size_t size; /* size of file */
int ndeps; /* number of dependancies */
linker_file_t* deps; /* list of dependancies */
- STAILQ_HEAD(, common_symbol) common; /* list of common symbols */
- TAILQ_HEAD(, module) modules; /* modules in this file */
- TAILQ_ENTRY(linker_file) loaded; /* preload dependency support */
+ STAILQ_HEAD(, struct common_symbol) common; /* list of common symbols */
+ TAILQ_HEAD(, struct module) modules; /* modules in this file */
+ TAILQ_ENTRY(struct linker_file) loaded; /* preload dependency support */
};
/*
* Object implementing a class of file (a.out, elf, etc.)
*/
typedef struct linker_class *linker_class_t;
-typedef TAILQ_HEAD(, linker_class) linker_class_list_t;
+typedef TAILQ_HEAD(, struct linker_class) linker_class_list_t;
struct linker_class {
KOBJ_CLASS_FIELDS;
- TAILQ_ENTRY(linker_class) link; /* list of all file classes */
+ TAILQ_ENTRY(struct linker_class) link; /* list of all file classes */
};
/*
diff --git a/sys/sys/lockf.h b/sys/sys/lockf.h
index 17980f6a1bbd..f95f73a9ab9e 100644
--- a/sys/sys/lockf.h
+++ b/sys/sys/lockf.h
@@ -50,7 +50,7 @@ struct vop_advlock_args;
* the inode structure. Locks are sorted by the starting byte of the lock for
* efficiency.
*/
-TAILQ_HEAD(locklist, lockf);
+TAILQ_HEAD(locklist, struct lockf);
struct lockf {
short lf_flags; /* Semantics: F_POSIX, F_FLOCK, F_WAIT */
@@ -62,7 +62,7 @@ struct lockf {
struct inode *lf_inode; /* Back pointer to the inode */
struct lockf *lf_next; /* Pointer to the next lock on this inode */
struct locklist lf_blkhd; /* List of requests blocked on this lock */
- TAILQ_ENTRY(lockf) lf_block;/* A request waiting for a lock */
+ TAILQ_ENTRY(struct lockf) lf_block;/* A request waiting for a lock */
};
/* Maximum length of sleep chains to traverse to try and detect deadlock. */
diff --git a/sys/sys/mount.h b/sys/sys/mount.h
index ffadb7196729..3f3db3d31a7b 100644
--- a/sys/sys/mount.h
+++ b/sys/sys/mount.h
@@ -104,10 +104,10 @@ struct statfs {
* array of operations and an instance record. The file systems are
* put on a doubly linked list.
*/
-LIST_HEAD(vnodelst, vnode);
+LIST_HEAD(vnodelst, struct vnode);
struct mount {
- TAILQ_ENTRY(mount) mnt_list; /* mount list */
+ TAILQ_ENTRY(struct mount) mnt_list; /* mount list */
struct vfsops *mnt_op; /* operations on fs */
struct vfsconf *mnt_vfc; /* configuration info */
struct vnode *mnt_vnodecovered; /* vnode we mounted on */
@@ -418,7 +418,7 @@ void vfs_unbusy __P((struct mount *, struct proc *));
void vfs_unmountall __P((void));
int vfs_register __P((struct vfsconf *));
int vfs_unregister __P((struct vfsconf *));
-extern TAILQ_HEAD(mntlist, mount) mountlist; /* mounted filesystem list */
+extern TAILQ_HEAD(mntlist, struct mount) mountlist; /* mounted filesystem list */
extern struct simplelock mountlist_slock;
extern struct nfs_public nfs_pub;
diff --git a/sys/sys/proc.h b/sys/sys/proc.h
index af7f110603cd..24671cd6af53 100644
--- a/sys/sys/proc.h
+++ b/sys/sys/proc.h
@@ -70,8 +70,8 @@ struct session {
* One structure allocated per process group.
*/
struct pgrp {
- LIST_ENTRY(pgrp) pg_hash; /* Hash chain. */
- LIST_HEAD(, proc) pg_members; /* Pointer to pgrp members. */
+ LIST_ENTRY(struct pgrp) pg_hash; /* Hash chain. */
+ LIST_HEAD(, struct proc) pg_members; /* Pointer to pgrp members. */
struct session *pg_session; /* Pointer to session. */
struct sigiolst pg_sigiolst; /* List of sigio sources. */
pid_t pg_id; /* Pgrp id. */
@@ -123,8 +123,8 @@ struct pargs {
struct jail;
struct proc {
- TAILQ_ENTRY(proc) p_procq; /* run/sleep queue. */
- LIST_ENTRY(proc) p_list; /* List of all processes. */
+ TAILQ_ENTRY(struct proc) p_procq; /* run/sleep queue. */
+ LIST_ENTRY(struct proc) p_list; /* List of all processes. */
/* substructures: */
struct pcred *p_cred; /* Process owner's identity. */
@@ -145,11 +145,11 @@ struct proc {
char p_pad1[3];
pid_t p_pid; /* Process identifier. */
- LIST_ENTRY(proc) p_hash; /* Hash chain. */
- LIST_ENTRY(proc) p_pglist; /* List of processes in pgrp. */
+ LIST_ENTRY(struct proc) p_hash; /* Hash chain. */
+ LIST_ENTRY(struct proc) p_pglist; /* List of processes in pgrp. */
struct proc *p_pptr; /* Pointer to parent process. */
- LIST_ENTRY(proc) p_sibling; /* List of sibling processes. */
- LIST_HEAD(, proc) p_children; /* Pointer to list of children. */
+ LIST_ENTRY(struct proc) p_sibling; /* List of sibling processes. */
+ LIST_HEAD(, struct proc) p_children; /* Pointer to list of children. */
struct callout_handle p_ithandle; /*
* Callout handle for scheduling
@@ -361,11 +361,11 @@ extern void stopevent(struct proc*, unsigned int, unsigned int);
#define PRELE(p) (--(p)->p_lock)
#define PIDHASH(pid) (&pidhashtbl[(pid) & pidhash])
-extern LIST_HEAD(pidhashhead, proc) *pidhashtbl;
+extern LIST_HEAD(pidhashhead, struct proc) *pidhashtbl;
extern u_long pidhash;
#define PGRPHASH(pgid) (&pgrphashtbl[(pgid) & pgrphash])
-extern LIST_HEAD(pgrphashhead, pgrp) *pgrphashtbl;
+extern LIST_HEAD(pgrphashhead, struct pgrp) *pgrphashtbl;
extern u_long pgrphash;
#ifndef SET_CURPROC
@@ -384,13 +384,13 @@ extern int nprocs, maxproc; /* Current and max number of procs. */
extern int maxprocperuid; /* Max procs per uid. */
extern int sched_quantum; /* Scheduling quantum in ticks */
-LIST_HEAD(proclist, proc);
+LIST_HEAD(proclist, struct proc);
extern struct proclist allproc; /* List of all processes. */
extern struct proclist zombproc; /* List of zombie processes. */
extern struct proc *initproc, *pageproc, *updateproc; /* Process slots for init, pager. */
#define NQS 32 /* 32 run queues. */
-TAILQ_HEAD(rq, proc);
+TAILQ_HEAD(rq, struct proc);
extern struct rq queues[];
extern struct rq rtqueues[];
extern struct rq idqueues[];
diff --git a/sys/sys/queue.h b/sys/sys/queue.h
index 04a6ffef80f5..6714983ef63a 100644
--- a/sys/sys/queue.h
+++ b/sys/sys/queue.h
@@ -113,7 +113,7 @@
*/
#define SLIST_HEAD(name, type) \
struct name { \
- struct type *slh_first; /* first element */ \
+ type *slh_first; /* first element */ \
}
#define SLIST_HEAD_INITIALIZER(head) \
@@ -121,7 +121,7 @@ struct name { \
#define SLIST_ENTRY(type) \
struct { \
- struct type *sle_next; /* next element */ \
+ type *sle_next; /* next element */ \
}
/*
@@ -157,7 +157,7 @@ struct { \
SLIST_REMOVE_HEAD((head), field); \
} \
else { \
- struct type *curelm = SLIST_FIRST((head)); \
+ type *curelm = SLIST_FIRST((head)); \
while (SLIST_NEXT(curelm, field) != (elm)) \
curelm = SLIST_NEXT(curelm, field); \
SLIST_NEXT(curelm, field) = \
@@ -174,8 +174,8 @@ struct { \
*/
#define STAILQ_HEAD(name, type) \
struct name { \
- struct type *stqh_first;/* first element */ \
- struct type **stqh_last;/* addr of last next element */ \
+ type *stqh_first; /* first element */ \
+ type **stqh_last; /* addr of last next element */ \
}
#define STAILQ_HEAD_INITIALIZER(head) \
@@ -183,7 +183,7 @@ struct name { \
#define STAILQ_ENTRY(type) \
struct { \
- struct type *stqe_next; /* next element */ \
+ type *stqe_next; /* next element */ \
}
/*
@@ -230,7 +230,7 @@ struct { \
STAILQ_REMOVE_HEAD(head, field); \
} \
else { \
- struct type *curelm = STAILQ_FIRST((head)); \
+ type *curelm = STAILQ_FIRST((head)); \
while (STAILQ_NEXT(curelm, field) != (elm)) \
curelm = STAILQ_NEXT(curelm, field); \
if ((STAILQ_NEXT(curelm, field) = \
@@ -255,7 +255,7 @@ struct { \
*/
#define LIST_HEAD(name, type) \
struct name { \
- struct type *lh_first; /* first element */ \
+ type *lh_first; /* first element */ \
}
#define LIST_HEAD_INITIALIZER(head) \
@@ -263,8 +263,8 @@ struct name { \
#define LIST_ENTRY(type) \
struct { \
- struct type *le_next; /* next element */ \
- struct type **le_prev; /* address of previous next element */ \
+ type *le_next; /* next element */ \
+ type **le_prev; /* address of previous next element */ \
}
/*
@@ -320,8 +320,8 @@ struct { \
*/
#define TAILQ_HEAD(name, type) \
struct name { \
- struct type *tqh_first; /* first element */ \
- struct type **tqh_last; /* addr of last next element */ \
+ type *tqh_first; /* first element */ \
+ type **tqh_last; /* addr of last next element */ \
}
#define TAILQ_HEAD_INITIALIZER(head) \
@@ -329,8 +329,8 @@ struct name { \
#define TAILQ_ENTRY(type) \
struct { \
- struct type *tqe_next; /* next element */ \
- struct type **tqe_prev; /* address of previous next element */ \
+ type *tqe_next; /* next element */ \
+ type **tqe_prev; /* address of previous next element */ \
}
/*
@@ -411,8 +411,8 @@ struct { \
*/
#define CIRCLEQ_HEAD(name, type) \
struct name { \
- struct type *cqh_first; /* first element */ \
- struct type *cqh_last; /* last element */ \
+ type *cqh_first; /* first element */ \
+ type *cqh_last; /* last element */ \
}
#define CIRCLEQ_HEAD_INITIALIZER(head) \
@@ -420,8 +420,8 @@ struct name { \
#define CIRCLEQ_ENTRY(type) \
struct { \
- struct type *cqe_next; /* next element */ \
- struct type *cqe_prev; /* previous element */ \
+ type *cqe_next; /* next element */ \
+ type *cqe_prev; /* previous element */ \
}
/*
diff --git a/sys/sys/rman.h b/sys/sys/rman.h
index 0e59f75fced4..57e8f6ac7ad5 100644
--- a/sys/sys/rman.h
+++ b/sys/sys/rman.h
@@ -42,11 +42,11 @@
* address space). That is also why the indices are defined to have type
* `unsigned long' -- that being the largest integral type in Standard C.
*/
-CIRCLEQ_HEAD(resource_head, resource);
+CIRCLEQ_HEAD(resource_head, struct resource);
struct resource {
- CIRCLEQ_ENTRY(resource) r_link;
- LIST_ENTRY(resource) r_sharelink;
- LIST_HEAD(, resource) *r_sharehead;
+ CIRCLEQ_ENTRY(struct resource) r_link;
+ LIST_ENTRY(struct resource) r_sharelink;
+ LIST_HEAD(, struct resource) *r_sharehead;
u_long r_start; /* index of the first entry in this resource */
u_long r_end; /* index of the last entry (inclusive) */
u_int r_flags;
@@ -69,13 +69,13 @@ enum rman_type { RMAN_UNINIT = 0, RMAN_GAUGE, RMAN_ARRAY };
struct rman {
struct resource_head rm_list;
struct simplelock *rm_slock; /* mutex used to protect rm_list */
- TAILQ_ENTRY(rman) rm_link; /* link in list of all rmans */
+ TAILQ_ENTRY(struct rman) rm_link; /* link in list of all rmans */
u_long rm_start; /* index of globally first entry */
u_long rm_end; /* index of globally last entry */
enum rman_type rm_type; /* what type of resource this is */
const char *rm_descr; /* text descripion of this resource */
};
-TAILQ_HEAD(rman_head, rman);
+TAILQ_HEAD(rman_head, struct rman);
#ifdef _KERNEL
diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h
index add6eb6c988e..a67561e7da55 100644
--- a/sys/sys/socketvar.h
+++ b/sys/sys/socketvar.h
@@ -68,9 +68,9 @@ struct socket {
* and limit on number of queued connections for this socket.
*/
struct socket *so_head; /* back pointer to accept socket */
- TAILQ_HEAD(, socket) so_incomp; /* queue of partial unaccepted connections */
- TAILQ_HEAD(, socket) so_comp; /* queue of complete unaccepted connections */
- TAILQ_ENTRY(socket) so_list; /* list of unaccepted connections */
+ TAILQ_HEAD(, struct socket) so_incomp; /* queue of partial unaccepted connections */
+ TAILQ_HEAD(, struct socket) so_comp; /* queue of complete unaccepted connections */
+ TAILQ_ENTRY(struct socket) so_list; /* list of unaccepted connections */
short so_qlen; /* number of unaccepted connections */
short so_incqlen; /* number of unaccepted incomplete
connections */
@@ -80,7 +80,7 @@ struct socket {
struct sigio *so_sigio; /* information for async I/O or
out of band data (SIGURG) */
u_long so_oobmark; /* chars to oob mark */
- TAILQ_HEAD(, aiocblist) so_aiojobq; /* AIO ops waiting on socket */
+ TAILQ_HEAD(, struct aiocblist) so_aiojobq; /* AIO ops waiting on socket */
/*
* Variables for socket buffering.
*/
@@ -264,7 +264,7 @@ struct sockopt {
};
struct sf_buf {
- SLIST_ENTRY(sf_buf) free_list; /* list of free buffer slots */
+ SLIST_ENTRY(struct sf_buf) free_list; /* list of free buffer slots */
int refcnt; /* reference count */
struct vm_page *m; /* currently mapped page */
vm_offset_t kva; /* va of mapping */
diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h
index d5697a6edb10..302b5fe63123 100644
--- a/sys/sys/sysctl.h
+++ b/sys/sys/sysctl.h
@@ -112,7 +112,7 @@ struct sysctl_req {
int (*newfunc)(struct sysctl_req *, void *, size_t);
};
-SLIST_HEAD(sysctl_oid_list, sysctl_oid);
+SLIST_HEAD(sysctl_oid_list, struct sysctl_oid);
/*
* This describes one "oid" in the MIB tree. Potentially more nodes can
@@ -120,7 +120,7 @@ SLIST_HEAD(sysctl_oid_list, sysctl_oid);
*/
struct sysctl_oid {
struct sysctl_oid_list *oid_parent;
- SLIST_ENTRY(sysctl_oid) oid_link;
+ SLIST_ENTRY(struct sysctl_oid) oid_link;
int oid_number;
int oid_kind;
void *oid_arg1;
diff --git a/sys/sys/tty.h b/sys/sys/tty.h
index c6f405606257..6c230de76a92 100644
--- a/sys/sys/tty.h
+++ b/sys/sys/tty.h
@@ -102,7 +102,7 @@ struct tty {
int t_olowat; /* Low water mark for output. */
speed_t t_ospeedwat; /* t_ospeed override for watermarks. */
int t_gen; /* Generation number. */
- SLIST_ENTRY(tty) t_list; /* Global chain of ttys for pstat(8) */
+ SLIST_ENTRY(struct tty) t_list; /* Global chain of ttys for pstat(8) */
};
#define t_cc t_termios.c_cc
diff --git a/sys/sys/unpcb.h b/sys/sys/unpcb.h
index c0b8a373a197..2708b29d752d 100644
--- a/sys/sys/unpcb.h
+++ b/sys/sys/unpcb.h
@@ -65,17 +65,17 @@
* back pressure on the sender accordingly.
*/
typedef u_quad_t unp_gen_t;
-LIST_HEAD(unp_head, unpcb);
+LIST_HEAD(unp_head, struct unpcb);
struct unpcb {
- LIST_ENTRY(unpcb) unp_link; /* glue on list of all PCBs */
+ LIST_ENTRY(struct unpcb) unp_link; /* glue on list of all PCBs */
struct socket *unp_socket; /* pointer back to socket */
struct vnode *unp_vnode; /* if associated with file */
struct vnode *unp_rvnode; /* root vp for creating process */
ino_t unp_ino; /* fake inode number */
struct unpcb *unp_conn; /* control block of connected socket */
struct unp_head unp_refs; /* referencing socket linked list */
- LIST_ENTRY(unpcb) unp_reflink; /* link in unp_refs list */
+ LIST_ENTRY(struct unpcb) unp_reflink; /* link in unp_refs list */
struct sockaddr_un *unp_addr; /* bound address of socket */
int unp_cc; /* copy of rcv.sb_cc */
int unp_mbcnt; /* copy of rcv.sb_mbcnt */
diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h
index 4938dcab8b77..fa4b07c42cdb 100644
--- a/sys/sys/vnode.h
+++ b/sys/sys/vnode.h
@@ -71,7 +71,7 @@ enum vtagtype {
* Each underlying filesystem allocates its own private area and hangs
* it from v_data. If non-null, this area is freed in getnewvnode().
*/
-TAILQ_HEAD(buflists, buf);
+TAILQ_HEAD(buflists, struct buf);
typedef int vop_t __P((void *));
struct namecache;
@@ -92,11 +92,11 @@ struct vnode {
u_long v_id; /* capability identifier */
struct mount *v_mount; /* ptr to vfs we are in */
vop_t **v_op; /* vnode operations vector */
- TAILQ_ENTRY(vnode) v_freelist; /* vnode freelist */
- LIST_ENTRY(vnode) v_mntvnodes; /* vnodes for mount point */
+ TAILQ_ENTRY(struct vnode) v_freelist; /* vnode freelist */
+ LIST_ENTRY(struct vnode) v_mntvnodes; /* vnodes for mount point */
struct buflists v_cleanblkhd; /* clean blocklist head */
struct buflists v_dirtyblkhd; /* dirty blocklist head */
- LIST_ENTRY(vnode) v_synclist; /* vnodes with dirty buffers */
+ LIST_ENTRY(struct vnode) v_synclist; /* vnodes with dirty buffers */
long v_numoutput; /* num of writes in progress */
enum vtype v_type; /* vnode type */
union {
@@ -104,7 +104,7 @@ struct vnode {
struct socket *vu_socket; /* unix ipc (VSOCK) */
struct {
struct specinfo *vu_specinfo; /* device (VCHR, VBLK) */
- SLIST_ENTRY(vnode) vu_specnext;
+ SLIST_ENTRY(struct vnode) vu_specnext;
} vu_spec;
struct fifoinfo *vu_fifoinfo; /* fifo (VFIFO) */
} v_un;
@@ -118,8 +118,8 @@ struct vnode {
struct lock *v_vnlock; /* used for non-locking fs's */
enum vtagtype v_tag; /* type of underlying data */
void *v_data; /* private data for fs */
- LIST_HEAD(, namecache) v_cache_src; /* Cache entries from us */
- TAILQ_HEAD(, namecache) v_cache_dst; /* Cache entries to us */
+ LIST_HEAD(, struct namecache) v_cache_src; /* Cache entries from us */
+ TAILQ_HEAD(, struct namecache) v_cache_dst; /* Cache entries to us */
struct vnode *v_dd; /* .. vnode */
u_long v_ddid; /* .. capability identifier */
struct {
@@ -621,7 +621,7 @@ void vbusy __P((struct vnode *vp));
extern vop_t **default_vnodeop_p;
extern vop_t **spec_vnodeop_p;
-extern TAILQ_HEAD(tobefreelist, vnode)
+extern TAILQ_HEAD(tobefreelist, struct vnode)
vnode_tobefree_list; /* vnode free list */
#endif /* _KERNEL */
diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c
index ce48d430b574..bea5aa8cb9ce 100644
--- a/sys/ufs/ffs/ffs_softdep.c
+++ b/sys/ufs/ffs/ffs_softdep.c
@@ -745,7 +745,7 @@ softdep_flushfiles(oldmnt, flags, p)
/*
* Structures and routines associated with pagedep caching.
*/
-LIST_HEAD(pagedep_hashhead, pagedep) *pagedep_hashtbl;
+LIST_HEAD(pagedep_hashhead, struct pagedep) *pagedep_hashtbl;
u_long pagedep_hash; /* size of hash table - 1 */
#define PAGEDEP_HASH(mp, inum, lbn) \
(&pagedep_hashtbl[((((register_t)(mp)) >> 13) + (inum) + (lbn)) & \
@@ -816,7 +816,7 @@ top:
/*
* Structures and routines associated with inodedep caching.
*/
-LIST_HEAD(inodedep_hashhead, inodedep) *inodedep_hashtbl;
+LIST_HEAD(inodedep_hashhead, struct inodedep) *inodedep_hashtbl;
static u_long inodedep_hash; /* size of hash table - 1 */
static long num_inodedep; /* number of inodedep allocated */
#define INODEDEP_HASH(fs, inum) \
@@ -897,7 +897,7 @@ top:
/*
* Structures and routines associated with newblk caching.
*/
-LIST_HEAD(newblk_hashhead, newblk) *newblk_hashtbl;
+LIST_HEAD(newblk_hashhead, struct newblk) *newblk_hashtbl;
u_long newblk_hash; /* size of hash table - 1 */
#define NEWBLK_HASH(fs, inum) \
(&newblk_hashtbl[((((register_t)(fs)) >> 13) + (inum)) & newblk_hash])
diff --git a/sys/ufs/ffs/softdep.h b/sys/ufs/ffs/softdep.h
index 8bbc409accbb..f68b9ca13005 100644
--- a/sys/ufs/ffs/softdep.h
+++ b/sys/ufs/ffs/softdep.h
@@ -128,7 +128,7 @@
* per second to process the items on the queue.
*/
-/* LIST_HEAD(workhead, worklist); -- declared in buf.h */
+/* LIST_HEAD(workhead, struct worklist); -- declared in buf.h */
/*
* Each request can be linked onto a work queue through its worklist structure.
@@ -138,7 +138,7 @@
* and the macros below changed to use it.
*/
struct worklist {
- LIST_ENTRY(worklist) wk_list; /* list of work requests */
+ LIST_ENTRY(struct worklist) wk_list; /* list of work requests */
unsigned short wk_type; /* type of request */
unsigned short wk_state; /* state flags */
};
@@ -160,13 +160,13 @@ struct worklist {
/*
* Various types of lists
*/
-LIST_HEAD(dirremhd, dirrem);
-LIST_HEAD(diraddhd, diradd);
-LIST_HEAD(newblkhd, newblk);
-LIST_HEAD(inodedephd, inodedep);
-LIST_HEAD(allocindirhd, allocindir);
-LIST_HEAD(allocdirecthd, allocdirect);
-TAILQ_HEAD(allocdirectlst, allocdirect);
+LIST_HEAD(dirremhd, struct dirrem);
+LIST_HEAD(diraddhd, struct diradd);
+LIST_HEAD(newblkhd, struct newblk);
+LIST_HEAD(inodedephd, struct inodedep);
+LIST_HEAD(allocindirhd, struct allocindir);
+LIST_HEAD(allocdirecthd, struct allocdirect);
+TAILQ_HEAD(allocdirectlst, struct allocdirect);
/*
* The "pagedep" structure tracks the various dependencies related to
@@ -191,7 +191,7 @@ TAILQ_HEAD(allocdirectlst, allocdirect);
struct pagedep {
struct worklist pd_list; /* page buffer */
# define pd_state pd_list.wk_state /* check for multiple I/O starts */
- LIST_ENTRY(pagedep) pd_hash; /* hashed lookup */
+ LIST_ENTRY(struct pagedep) pd_hash; /* hashed lookup */
struct mount *pd_mnt; /* associated mount point */
ino_t pd_ino; /* associated file */
ufs_lbn_t pd_lbn; /* block within file */
@@ -250,12 +250,12 @@ struct pagedep {
struct inodedep {
struct worklist id_list; /* buffer holding inode block */
# define id_state id_list.wk_state /* inode dependency state */
- LIST_ENTRY(inodedep) id_hash; /* hashed lookup */
+ LIST_ENTRY(struct inodedep) id_hash; /* hashed lookup */
struct fs *id_fs; /* associated filesystem */
ino_t id_ino; /* dependent inode */
nlink_t id_nlinkdelta; /* saved effective link count */
struct dinode *id_savedino; /* saved dinode contents */
- LIST_ENTRY(inodedep) id_deps; /* bmsafemap's list of inodedep's */
+ LIST_ENTRY(struct inodedep) id_deps; /* bmsafemap's list of inodedep's */
struct buf *id_buf; /* related bmsafemap (if pending) */
off_t id_savedsize; /* file size saved during rollback */
struct workhead id_pendinghd; /* entries awaiting directory write */
@@ -274,11 +274,11 @@ struct inodedep {
* is not set (i.e., its cylinder group map has not been written).
*/
struct newblk {
- LIST_ENTRY(newblk) nb_hash; /* hashed lookup */
+ LIST_ENTRY(struct newblk) nb_hash; /* hashed lookup */
struct fs *nb_fs; /* associated filesystem */
ufs_daddr_t nb_newblkno; /* allocated block number */
int nb_state; /* state of bitmap dependency */
- LIST_ENTRY(newblk) nb_deps; /* bmsafemap's list of newblk's */
+ LIST_ENTRY(struct newblk) nb_deps; /* bmsafemap's list of newblk's */
struct bmsafemap *nb_bmsafemap; /* associated bmsafemap */
};
@@ -321,13 +321,13 @@ struct bmsafemap {
struct allocdirect {
struct worklist ad_list; /* buffer holding block */
# define ad_state ad_list.wk_state /* block pointer state */
- TAILQ_ENTRY(allocdirect) ad_next; /* inodedep's list of allocdirect's */
+ TAILQ_ENTRY(struct allocdirect) ad_next; /* inodedep's list of allocdirect's */
ufs_lbn_t ad_lbn; /* block within file */
ufs_daddr_t ad_newblkno; /* new value of block pointer */
ufs_daddr_t ad_oldblkno; /* old value of block pointer */
long ad_newsize; /* size of new block */
long ad_oldsize; /* size of old block */
- LIST_ENTRY(allocdirect) ad_deps; /* bmsafemap's list of allocdirect's */
+ LIST_ENTRY(struct allocdirect) ad_deps; /* bmsafemap's list of allocdirect's */
struct buf *ad_buf; /* cylgrp buffer (if pending) */
struct inodedep *ad_inodedep; /* associated inodedep */
struct freefrag *ad_freefrag; /* fragment to be freed (if any) */
@@ -375,13 +375,13 @@ struct indirdep {
struct allocindir {
struct worklist ai_list; /* buffer holding indirect block */
# define ai_state ai_list.wk_state /* indirect block pointer state */
- LIST_ENTRY(allocindir) ai_next; /* indirdep's list of allocindir's */
+ LIST_ENTRY(struct allocindir) ai_next; /* indirdep's list of allocindir's */
int ai_offset; /* pointer offset in indirect block */
ufs_daddr_t ai_newblkno; /* new block pointer value */
ufs_daddr_t ai_oldblkno; /* old block pointer value */
struct freefrag *ai_freefrag; /* block to be freed when complete */
struct indirdep *ai_indirdep; /* address of associated indirdep */
- LIST_ENTRY(allocindir) ai_deps; /* bmsafemap's list of allocindir's */
+ LIST_ENTRY(struct allocindir) ai_deps; /* bmsafemap's list of allocindir's */
struct buf *ai_buf; /* cylgrp buffer (if pending) */
};
@@ -478,7 +478,7 @@ struct freefile {
struct diradd {
struct worklist da_list; /* id_inowait or id_pendinghd list */
# define da_state da_list.wk_state /* state of the new directory entry */
- LIST_ENTRY(diradd) da_pdlist; /* pagedep holding directory block */
+ LIST_ENTRY(struct diradd) da_pdlist; /* pagedep holding directory block */
doff_t da_offset; /* offset of new dir entry in dir blk */
ino_t da_newinum; /* inode number for the new dir entry */
union {
@@ -518,9 +518,9 @@ struct mkdir {
# define md_state md_list.wk_state /* type: MKDIR_PARENT or MKDIR_BODY */
struct diradd *md_diradd; /* associated diradd */
struct buf *md_buf; /* MKDIR_BODY: buffer holding dir */
- LIST_ENTRY(mkdir) md_mkdirs; /* list of all mkdirs */
+ LIST_ENTRY(struct mkdir) md_mkdirs; /* list of all mkdirs */
};
-LIST_HEAD(mkdirlist, mkdir) mkdirlisthd;
+LIST_HEAD(mkdirlist, struct mkdir) mkdirlisthd;
/*
* A "dirrem" structure describes an operation to decrement the link
@@ -536,7 +536,7 @@ LIST_HEAD(mkdirlist, mkdir) mkdirlisthd;
struct dirrem {
struct worklist dm_list; /* delayed worklist */
# define dm_state dm_list.wk_state /* state of the old directory entry */
- LIST_ENTRY(dirrem) dm_next; /* pagedep's list of dirrem's */
+ LIST_ENTRY(struct dirrem) dm_next; /* pagedep's list of dirrem's */
struct mount *dm_mnt; /* associated mount point */
ino_t dm_oldinum; /* inum of the removed dir entry */
union {
diff --git a/sys/ufs/ufs/extattr.h b/sys/ufs/ufs/extattr.h
index c2d1eee4506e..bbc310f75274 100644
--- a/sys/ufs/ufs/extattr.h
+++ b/sys/ufs/ufs/extattr.h
@@ -74,9 +74,9 @@ MALLOC_DECLARE(M_EXTATTR);
#endif
struct vnode;
-LIST_HEAD(ufs_extattr_list_head, ufs_extattr_list_entry);
+LIST_HEAD(ufs_extattr_list_head, struct ufs_extattr_list_entry);
struct ufs_extattr_list_entry {
- LIST_ENTRY(ufs_extattr_list_entry) uele_entries;
+ LIST_ENTRY(struct ufs_extattr_list_entry) uele_entries;
struct ufs_extattr_fileheader uele_fileheader;
char uele_attrname[UFS_EXTATTR_MAXEXTATTRNAME];
struct vnode *uele_backing_vnode;
diff --git a/sys/ufs/ufs/inode.h b/sys/ufs/ufs/inode.h
index 83960b0d20f3..206babd18170 100644
--- a/sys/ufs/ufs/inode.h
+++ b/sys/ufs/ufs/inode.h
@@ -67,7 +67,7 @@ typedef long ufs_lbn_t;
*/
struct inode {
struct lock i_lock; /* Inode lock. >Keep this first< */
- LIST_ENTRY(inode) i_hash;/* Hash chain. */
+ LIST_ENTRY(struct inode) i_hash;/* Hash chain. */
struct vnode *i_vnode;/* Vnode associated with this inode. */
struct vnode *i_devvp;/* Vnode for block I/O. */
u_int32_t i_flag; /* flags, see below */
diff --git a/sys/ufs/ufs/quota.h b/sys/ufs/ufs/quota.h
index f8299ee13f37..0ead861b48c2 100644
--- a/sys/ufs/ufs/quota.h
+++ b/sys/ufs/ufs/quota.h
@@ -119,8 +119,8 @@ struct dqblk {
* used entries.
*/
struct dquot {
- LIST_ENTRY(dquot) dq_hash; /* hash list */
- TAILQ_ENTRY(dquot) dq_freelist; /* free list */
+ LIST_ENTRY(struct dquot) dq_hash; /* hash list */
+ TAILQ_ENTRY(struct dquot) dq_freelist; /* free list */
u_int16_t dq_flags; /* flags, see below */
u_int16_t dq_cnt; /* count of active references */
u_int16_t dq_spare; /* unused spare padding */
diff --git a/sys/ufs/ufs/ufs_ihash.c b/sys/ufs/ufs/ufs_ihash.c
index 0a7c7d583191..39e0c1128a98 100644
--- a/sys/ufs/ufs/ufs_ihash.c
+++ b/sys/ufs/ufs/ufs_ihash.c
@@ -50,7 +50,7 @@ static MALLOC_DEFINE(M_UFSIHASH, "UFS ihash", "UFS Inode hash tables");
/*
* Structures associated with inode cacheing.
*/
-static LIST_HEAD(ihashhead, inode) *ihashtbl;
+static LIST_HEAD(ihashhead, struct inode) *ihashtbl;
static u_long ihash; /* size of hash table - 1 */
#define INOHASH(device, inum) (&ihashtbl[(minor(device) + (inum)) & ihash])
#ifndef NULL_SIMPLELOCKS
diff --git a/sys/ufs/ufs/ufs_quota.c b/sys/ufs/ufs/ufs_quota.c
index 6203e45955c2..208cefa6bcf7 100644
--- a/sys/ufs/ufs/ufs_quota.c
+++ b/sys/ufs/ufs/ufs_quota.c
@@ -701,14 +701,14 @@ again:
*/
#define DQHASH(dqvp, id) \
(&dqhashtbl[((((intptr_t)(dqvp)) >> 8) + id) & dqhash])
-static LIST_HEAD(dqhash, dquot) *dqhashtbl;
+static LIST_HEAD(dqhash, struct dquot) *dqhashtbl;
static u_long dqhash;
/*
* Dquot free list.
*/
#define DQUOTINC 5 /* minimum free dquots desired */
-static TAILQ_HEAD(dqfreelist, dquot) dqfreelist;
+static TAILQ_HEAD(dqfreelist, struct dquot) dqfreelist;
static long numdquot, desireddquot = DQUOTINC;
/*
diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h
index 62a3bbe24168..d6b591344332 100644
--- a/sys/vm/vm_object.h
+++ b/sys/vm/vm_object.h
@@ -86,10 +86,10 @@ typedef u_char objtype_t;
*/
struct vm_object {
- TAILQ_ENTRY(vm_object) object_list; /* list of all objects */
- TAILQ_HEAD(, vm_object) shadow_head; /* objects that this is a shadow for */
- TAILQ_ENTRY(vm_object) shadow_list; /* chain of shadow objects */
- TAILQ_HEAD(, vm_page) memq; /* list of resident pages */
+ TAILQ_ENTRY(struct vm_object) object_list; /* list of all objects */
+ TAILQ_HEAD(, struct vm_object) shadow_head; /* objects that this is a shadow for */
+ TAILQ_ENTRY(struct vm_object) shadow_list; /* chain of shadow objects */
+ TAILQ_HEAD(, struct vm_page) memq; /* list of resident pages */
int generation; /* generation ID */
vm_size_t size; /* Object size */
int ref_count; /* How many refs?? */
@@ -102,7 +102,7 @@ struct vm_object {
int resident_page_count; /* number of resident pages */
struct vm_object *backing_object; /* object that I'm a shadow of */
vm_ooffset_t backing_object_offset;/* Offset in backing object */
- TAILQ_ENTRY(vm_object) pager_object_list; /* list of all objects of this pager type */
+ TAILQ_ENTRY(struct vm_object) pager_object_list; /* list of all objects of this pager type */
void *handle;
union {
/*
@@ -120,7 +120,7 @@ struct vm_object {
* devp_pglist - list of allocated pages
*/
struct {
- TAILQ_HEAD(, vm_page) devp_pglist;
+ TAILQ_HEAD(, struct vm_page) devp_pglist;
} devp;
/*
@@ -129,7 +129,7 @@ struct vm_object {
* physp_pglist - list of allocated pages
*/
struct {
- TAILQ_HEAD(, vm_page) physp_pglist;
+ TAILQ_HEAD(, struct vm_page) physp_pglist;
} physp;
/*
@@ -167,7 +167,7 @@ struct vm_object {
#define OBJPC_INVAL 0x2 /* invalidate */
#define OBJPC_NOSYNC 0x4 /* skip if PG_NOSYNC */
-TAILQ_HEAD(object_q, vm_object);
+TAILQ_HEAD(object_q, struct vm_object);
extern struct object_q vm_object_list; /* list of allocated objects */
diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h
index e61be7fd531f..4e3d273fced4 100644
--- a/sys/vm/vm_page.h
+++ b/sys/vm/vm_page.h
@@ -107,12 +107,12 @@
* NFS to implement piecemeal writes.
*/
-TAILQ_HEAD(pglist, vm_page);
+TAILQ_HEAD(pglist, struct vm_page);
struct vm_page {
- TAILQ_ENTRY(vm_page) pageq; /* queue info for FIFO queue or free list (P) */
+ TAILQ_ENTRY(struct vm_page) pageq; /* queue info for FIFO queue or free list (P) */
struct vm_page *hnext; /* hash table link (O,P) */
- TAILQ_ENTRY(vm_page) listq; /* pages in same object (O) */
+ TAILQ_ENTRY(struct vm_page) listq; /* pages in same object (O) */
vm_object_t object; /* which object am I in (O,P)*/
vm_pindex_t pindex; /* offset into object (O,P) */
diff --git a/sys/vm/vm_pager.h b/sys/vm/vm_pager.h
index df0befa10ff1..ccc3a35014cd 100644
--- a/sys/vm/vm_pager.h
+++ b/sys/vm/vm_pager.h
@@ -48,7 +48,7 @@
#include <sys/queue.h>
-TAILQ_HEAD(pagerlst, vm_object);
+TAILQ_HEAD(pagerlst, struct vm_object);
struct bio;