From d93fbc99166053b75c2eeb69b5cb603cfaf79ec0 Mon Sep 17 00:00:00 2001 From: jake Date: Tue, 23 May 2000 20:41:01 +0000 Subject: 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 --- sys/vm/vm_object.h | 16 ++++++++-------- sys/vm/vm_page.h | 6 +++--- sys/vm/vm_pager.h | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'sys/vm') diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h index 62a3bbe..d6b5913 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 e61be7f..4e3d273 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 df0befa..ccc3a35 100644 --- a/sys/vm/vm_pager.h +++ b/sys/vm/vm_pager.h @@ -48,7 +48,7 @@ #include -TAILQ_HEAD(pagerlst, vm_object); +TAILQ_HEAD(pagerlst, struct vm_object); struct bio; -- cgit v1.1