37d36
< * $FreeBSD: head/sys/nfsclient/nfs_node.c 83366 2001-09-12 08:38:13Z julian $
39a39,40
> #include <sys/cdefs.h>
> __FBSDID("$FreeBSD: head/sys/nfsclient/nfs_node.c 83651 2001-09-18 23:32:09Z peter $");
57,59c58,60
< #include <nfs/nfs.h>
< #include <nfs/nfsnode.h>
< #include <nfs/nfsmount.h>
---
> #include <nfsclient/nfs.h>
> #include <nfsclient/nfsnode.h>
> #include <nfsclient/nfsmount.h>
63a65
> static int nfs_node_hash_lock;
67a70,71
> SYSCTL_DECL(_debug_hashstat);
>
71d74
< SYSCTL_DECL(_debug_hashstat);
97,98c100,101
< SYSCTL_PROC(_debug_hashstat, OID_AUTO, rawnfsnode, CTLTYPE_INT|CTLFLAG_RD,
< 0, 0, sysctl_debug_hashstat_rawnfsnode, "S,int", "nfsnode chain lengths");
---
> SYSCTL_PROC(_debug_hashstat, OID_AUTO, rawnfsnode, CTLTYPE_INT|CTLFLAG_RD, 0, 0,
> sysctl_debug_hashstat_rawnfsnode, "S,int", "nfsnode chain lengths");
151c154
< nfs_nhinit()
---
> nfs_nhinit(void)
152a156
>
163,164d166
< static int nfs_node_hash_lock;
<
166,170c168
< nfs_nget(mntp, fhp, fhsize, npp)
< struct mount *mntp;
< register nfsfh_t *fhp;
< int fhsize;
< struct nfsnode **npp;
---
> nfs_nget(struct mount *mntp, nfsfh_t *fhp, int fhsize, struct nfsnode **npp)
175c173
< register struct vnode *vp;
---
> struct vnode *vp;
194c192
< for (np = nhpp->lh_first; np != 0; np = np->n_hash.le_next) {
---
> LIST_FOREACH(np, nhpp, n_hash) {
223c221
<
---
>
240c238
< for (np2 = nhpp->lh_first; np2 != 0; np2 = np2->n_hash.le_next) {
---
> LIST_FOREACH(np2, nhpp, n_hash) {
275,279c273
< nfs_inactive(ap)
< struct vop_inactive_args /* {
< struct vnode *a_vp;
< struct thread *a_td;
< } */ *ap;
---
> nfs_inactive(struct vop_inactive_args *ap)
281,282c275,276
< register struct nfsnode *np;
< register struct sillyrename *sp;
---
> struct nfsnode *np;
> struct sillyrename *sp;
317,318c311
< np->n_flag &= (NMODIFIED | NFLUSHINPROG | NFLUSHWANT | NQNFSEVICTED |
< NQNFSNONCACHE | NQNFSWRITE);
---
> np->n_flag &= (NMODIFIED | NFLUSHINPROG | NFLUSHWANT);
327,330c320
< nfs_reclaim(ap)
< struct vop_reclaim_args /* {
< struct vnode *a_vp;
< } */ *ap;
---
> nfs_reclaim(struct vop_reclaim_args *ap)
332,335c322,324
< register struct vnode *vp = ap->a_vp;
< register struct nfsnode *np = VTONFS(vp);
< register struct nfsmount *nmp = VFSTONFS(vp->v_mount);
< register struct nfsdmap *dp, *dp2;
---
> struct vnode *vp = ap->a_vp;
> struct nfsnode *np = VTONFS(vp);
> struct nfsdmap *dp, *dp2;
340c329
< if (np->n_hash.le_prev != NULL)
---
> if (np->n_hash.le_prev != NULL) /* XXX beware */
344,350d332
< * For nqnfs, take it off the timer queue as required.
< */
< if ((nmp->nm_flag & NFSMNT_NQNFS) && TAILQ_NEXT(np, n_timer) != 0) {
< TAILQ_REMOVE(&nmp->nm_timerhead, np, n_timer);
< }
<
< /*
356c338
< dp = np->n_cookies.lh_first;
---
> dp = LIST_FIRST(&np->n_cookies);
359c341
< dp = dp->ndm_list.le_next;
---
> dp = LIST_NEXT(dp, ndm_list);
380,383c362
< nfs_lock(ap)
< struct vop_lock_args /* {
< struct vnode *a_vp;
< } */ *ap;
---
> nfs_lock(struct vop_lock_args *ap)
385c364
< register struct vnode *vp = ap->a_vp;
---
> struct vnode *vp = ap->a_vp;
432,435c411
< nfs_unlock(ap)
< struct vop_unlock_args /* {
< struct vnode *a_vp;
< } */ *ap;
---
> nfs_unlock(struct vop_unlock_args *ap)
459,463c435
< nfs_islocked(ap)
< struct vop_islocked_args /* {
< struct vnode *a_vp;
< struct thread *a_td;
< } */ *ap;
---
> nfs_islocked(struct vop_islocked_args *ap)
464a437
>