diff options
Diffstat (limited to 'sys/ufs')
| -rw-r--r-- | sys/ufs/ffs/ffs_softdep.c | 6 | ||||
| -rw-r--r-- | sys/ufs/ffs/softdep.h | 44 | ||||
| -rw-r--r-- | sys/ufs/ufs/extattr.h | 4 | ||||
| -rw-r--r-- | sys/ufs/ufs/inode.h | 2 | ||||
| -rw-r--r-- | sys/ufs/ufs/quota.h | 4 | ||||
| -rw-r--r-- | sys/ufs/ufs/ufs_ihash.c | 2 | ||||
| -rw-r--r-- | sys/ufs/ufs/ufs_quota.c | 4 |
7 files changed, 33 insertions, 33 deletions
diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c index ce48d43..bea5aa8 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 8bbc409..f68b9ca 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 c2d1eee..bbc310f 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 83960b0..206babd 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 f8299ee..0ead861 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 0a7c7d5..39e0c11 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 6203e45..208cefa 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; /* |
