diff options
| author | phk <phk@FreeBSD.org> | 1994-10-17 17:47:45 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 1994-10-17 17:47:45 +0000 |
| commit | 071d10f334b2e0094018c4b2027c8e3e73833bc1 (patch) | |
| tree | c5905f4096b68df87a3f00435bec4fcc08408b18 /sys/nfs/nfsnode.h | |
| parent | 24ec594f4ae8189490a0087923fc655e16dde331 (diff) | |
| download | FreeBSD-src-071d10f334b2e0094018c4b2027c8e3e73833bc1.zip FreeBSD-src-071d10f334b2e0094018c4b2027c8e3e73833bc1.tar.gz | |
This is a bunch of changes from NetBSD. There are a couple of bug-fixes.
But mostly it is changes to use the list-maintenance macros instead of
doing the pointer-gymnastics by hand.
Obtained from: NetBSD
Diffstat (limited to 'sys/nfs/nfsnode.h')
| -rw-r--r-- | sys/nfs/nfsnode.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sys/nfs/nfsnode.h b/sys/nfs/nfsnode.h index 5bb170b..01d0969 100644 --- a/sys/nfs/nfsnode.h +++ b/sys/nfs/nfsnode.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfsnode.h 8.4 (Berkeley) 2/13/94 - * $Id: nfsnode.h,v 1.6 1994/09/22 19:38:29 wollman Exp $ + * $Id: nfsnode.h,v 1.7 1994/10/02 17:27:06 phk Exp $ */ #ifndef _NFS_NFSNODE_H_ @@ -60,8 +60,8 @@ struct sillyrename { */ struct nfsnode { - struct nfsnode *n_forw; /* hash, forward */ - struct nfsnode **n_back; /* hash, backward */ + LIST_ENTRY(nfsnode) n_hash; /* Hash chain */ + CIRCLEQ_ENTRY(nfsnode) n_timer; /* Nqnfs timer chain */ nfsv2fh_t n_fh; /* NFS File Handle */ long n_flag; /* Flag for locking.. */ struct vnode *n_vnode; /* vnode associated with this node */ @@ -77,8 +77,6 @@ struct nfsnode { u_quad_t n_brev; /* Modify rev when cached */ u_quad_t n_lrev; /* Modify rev for lease */ time_t n_expiry; /* Lease expiry time */ - struct nfsnode *n_tnext; /* Nqnfs timer chain */ - struct nfsnode *n_tprev; struct sillyrename n_silly; /* Silly rename struct */ struct timeval n_atim; /* Special file times */ struct timeval n_mtim; @@ -107,7 +105,7 @@ struct nfsnode { /* * Queue head for nfsiod's */ -TAILQ_HEAD(nfsbufs, buf) nfs_bufq; +TAILQ_HEAD(, buf) nfs_bufq; #ifdef KERNEL /* |
