aboutsummaryrefslogtreecommitdiff
path: root/sys/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/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/sys')
-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
26 files changed, 112 insertions, 112 deletions
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 */