summaryrefslogtreecommitdiffstats
path: root/sys/ufs/ufs
diff options
context:
space:
mode:
authorjake <jake@FreeBSD.org>2000-05-26 02:09:24 +0000
committerjake <jake@FreeBSD.org>2000-05-26 02:09:24 +0000
commit961b97d43458f3c57241940cabebb3bedf7e4c00 (patch)
tree6014972d9b90b4e3a8b20dbea641a88cf6355c13 /sys/ufs/ufs
parent06b64672180d9b04ae6d35db819c854df3c3c684 (diff)
downloadFreeBSD-src-961b97d43458f3c57241940cabebb3bedf7e4c00.zip
FreeBSD-src-961b97d43458f3c57241940cabebb3bedf7e4c00.tar.gz
Back out the previous change to the queue(3) interface.
It was not discussed and should probably not happen. Requested by: msmith and others
Diffstat (limited to 'sys/ufs/ufs')
-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
5 files changed, 8 insertions, 8 deletions
diff --git a/sys/ufs/ufs/extattr.h b/sys/ufs/ufs/extattr.h
index bbc310f..c2d1eee 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, struct ufs_extattr_list_entry);
+LIST_HEAD(ufs_extattr_list_head, ufs_extattr_list_entry);
struct ufs_extattr_list_entry {
- LIST_ENTRY(struct ufs_extattr_list_entry) uele_entries;
+ LIST_ENTRY(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 206babd..83960b0 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(struct inode) i_hash;/* Hash chain. */
+ LIST_ENTRY(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 0ead861..f8299ee 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(struct dquot) dq_hash; /* hash list */
- TAILQ_ENTRY(struct dquot) dq_freelist; /* free list */
+ LIST_ENTRY(dquot) dq_hash; /* hash list */
+ TAILQ_ENTRY(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 39e0c11..0a7c7d5 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, struct inode) *ihashtbl;
+static LIST_HEAD(ihashhead, 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 208cefa..6203e45 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, struct dquot) *dqhashtbl;
+static LIST_HEAD(dqhash, dquot) *dqhashtbl;
static u_long dqhash;
/*
* Dquot free list.
*/
#define DQUOTINC 5 /* minimum free dquots desired */
-static TAILQ_HEAD(dqfreelist, struct dquot) dqfreelist;
+static TAILQ_HEAD(dqfreelist, dquot) dqfreelist;
static long numdquot, desireddquot = DQUOTINC;
/*
OpenPOWER on IntegriCloud