diff options
| author | dfr <dfr@FreeBSD.org> | 1997-06-03 17:22:47 +0000 |
|---|---|---|
| committer | dfr <dfr@FreeBSD.org> | 1997-06-03 17:22:47 +0000 |
| commit | 99eae7b7b1d0dfe2463f468406efaea5f7258df8 (patch) | |
| tree | ac6a203d84dfbdf93133d0f9bb62f4da2d4b8804 /sys/nfs/nfs_nqlease.c | |
| parent | a70561d506231c0740e4c09afc2f53bc95a62073 (diff) | |
| download | FreeBSD-src-99eae7b7b1d0dfe2463f468406efaea5f7258df8.zip FreeBSD-src-99eae7b7b1d0dfe2463f468406efaea5f7258df8.tar.gz | |
Various fixes from NetBSD:
Use u_int for rpc procedure numbers.
Some fixes to NQNFS.
A rare NULL pointer dereference.
Ignore NFSMNT_NOCONN for TCP mounts.
Obtained from: NetBSD
Diffstat (limited to 'sys/nfs/nfs_nqlease.c')
| -rw-r--r-- | sys/nfs/nfs_nqlease.c | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/sys/nfs/nfs_nqlease.c b/sys/nfs/nfs_nqlease.c index 9c76be4..821d391 100644 --- a/sys/nfs/nfs_nqlease.c +++ b/sys/nfs/nfs_nqlease.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_nqlease.c 8.9 (Berkeley) 5/20/95 - * $Id$ + * $Id: nfs_nqlease.c,v 1.24 1997/02/22 09:42:37 peter Exp $ */ @@ -492,9 +492,10 @@ nqsrv_send_eviction(vp, lp, slp, nam, cred) struct mbuf *mreq, *mb, *mb2, *nam2, *mheadend; struct socket *so; struct sockaddr_in *saddr; + nfsfh_t nfh; fhandle_t *fhp; caddr_t bpos, cp; - u_long xid; + u_long xid, *tl; int len = 1, ok = 1, i = 0; int sotype, *solockp; @@ -525,12 +526,12 @@ nqsrv_send_eviction(vp, lp, slp, nam, cred) else solockp = (int *)0; nfsm_reqhead((struct vnode *)0, NQNFSPROC_EVICTED, - NFSX_V3FH); - nfsm_build(cp, caddr_t, NFSX_V3FH); - bzero(cp, NFSX_V3FH); - fhp = (fhandle_t *)cp; + NFSX_V3FH + NFSX_UNSIGNED); + fhp = &nfh.fh_generic; + bzero((caddr_t)fhp, sizeof(nfh)); fhp->fh_fsid = vp->v_mount->mnt_stat.f_fsid; VFS_VPTOFH(vp, &fhp->fh_fid); + nfsm_srvfhtom(fhp, 1); m = mreq; siz = 0; while (m) { @@ -918,7 +919,7 @@ nqnfs_vacated(vp, cred) nmp = VFSTONFS(vp->v_mount); nfsstats.rpccnt[NQNFSPROC_VACATED]++; - nfsm_reqhead(vp, NQNFSPROC_VACATED, NFSX_V3FH); + nfsm_reqhead(vp, NQNFSPROC_VACATED, NFSX_FH(1)); nfsm_fhtom(vp, 1); m = mreq; i = 0; @@ -1092,14 +1093,16 @@ nqnfs_clientd(nmp, cred, ncd, flag, argp, p) if (vpid == vp->v_id) { CIRCLEQ_REMOVE(&nmp->nm_timerhead, np, n_timer); np->n_timer.cqe_next = 0; - if ((np->n_flag & (NMODIFIED | NQNFSEVICTED)) - && vp->v_type == VREG) { + if (np->n_flag & (NMODIFIED | NQNFSEVICTED)) { if (np->n_flag & NQNFSEVICTED) { + if (vp->v_type == VDIR) + nfs_invaldir(vp); + cache_purge(vp); (void) nfs_vinvalbuf(vp, V_SAVE, cred, p, 0); np->n_flag &= ~NQNFSEVICTED; (void) nqnfs_vacated(vp, cred); - } else { + } else if (vp->v_type == VREG) { (void) VOP_FSYNC(vp, cred, MNT_WAIT, p); np->n_flag &= ~NMODIFIED; |
