diff options
| author | dg <dg@FreeBSD.org> | 1994-08-29 06:09:15 +0000 |
|---|---|---|
| committer | dg <dg@FreeBSD.org> | 1994-08-29 06:09:15 +0000 |
| commit | f15c464e97bffd366d0d2ebdacedabd88e7c236e (patch) | |
| tree | 9d47e82a6bd75190c972a7809b3e6351a1c03b1d /sys/nfs | |
| parent | 6cece6dd2e771f61766250b59cca252584821118 (diff) | |
| download | FreeBSD-src-f15c464e97bffd366d0d2ebdacedabd88e7c236e.zip FreeBSD-src-f15c464e97bffd366d0d2ebdacedabd88e7c236e.tar.gz | |
"bogus" fixes from 1.1.5 to work around some cache coherency problems.
Diffstat (limited to 'sys/nfs')
| -rw-r--r-- | sys/nfs/nfs_serv.c | 5 | ||||
| -rw-r--r-- | sys/nfs/nfs_vnops.c | 20 |
2 files changed, 10 insertions, 15 deletions
diff --git a/sys/nfs/nfs_serv.c b/sys/nfs/nfs_serv.c index 4ae8120..0184b27 100644 --- a/sys/nfs/nfs_serv.c +++ b/sys/nfs/nfs_serv.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_serv.c 8.3 (Berkeley) 1/12/94 - * $Id$ + * $Id: nfs_serv.c,v 1.3 1994/08/02 07:52:09 davidg Exp $ */ /* @@ -881,8 +881,7 @@ nfsrv_remove(nfsd, mrep, md, dpos, cred, nam, mrq) error = EBUSY; goto out; } - if (vp->v_flag & VTEXT) - (void) vnode_pager_uncache(vp); + (void) vnode_pager_uncache(vp); out: if (!error) { nqsrv_getl(nd.ni_dvp, NQL_WRITE); diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c index 70a6a88..8a77bfb 100644 --- a/sys/nfs/nfs_vnops.c +++ b/sys/nfs/nfs_vnops.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_vnops.c 8.5 (Berkeley) 2/13/94 - * $Id: nfs_vnops.c,v 1.3 1994/08/02 07:52:18 davidg Exp $ + * $Id: nfs_vnops.c,v 1.4 1994/08/08 17:30:53 davidg Exp $ */ /* @@ -339,11 +339,10 @@ nfs_open(ap) if (vp->v_type != VREG && vp->v_type != VDIR && vp->v_type != VLNK) return (EACCES); - if (vp->v_flag & VTEXT) { - /* - * Get a valid lease. If cached data is stale, flush it. - */ - if (nmp->nm_flag & NFSMNT_NQNFS) { + /* + * Get a valid lease. If cached data is stale, flush it. + */ + if (nmp->nm_flag & NFSMNT_NQNFS) { if (NQNFS_CKINVALID(vp, np, NQL_READ)) { do { error = nqnfs_getlease(vp, NQL_READ, ap->a_cred, ap->a_p); @@ -355,16 +354,14 @@ nfs_open(ap) if ((error = nfs_vinvalbuf(vp, V_SAVE, ap->a_cred, ap->a_p, 1)) == EINTR) return (error); - (void) vnode_pager_uncache(vp); np->n_brev = np->n_lrev; } } - } else { + } else { if (np->n_flag & NMODIFIED) { if ((error = nfs_vinvalbuf(vp, V_SAVE, ap->a_cred, ap->a_p, 1)) == EINTR) return (error); - (void) vnode_pager_uncache(vp); np->n_attrstamp = 0; np->n_direofoffset = 0; if (error = VOP_GETATTR(vp, &vattr, ap->a_cred, ap->a_p)) @@ -378,12 +375,11 @@ nfs_open(ap) if ((error = nfs_vinvalbuf(vp, V_SAVE, ap->a_cred, ap->a_p, 1)) == EINTR) return (error); - (void) vnode_pager_uncache(vp); np->n_mtime = vattr.va_mtime.ts_sec; } } - } - } else if ((nmp->nm_flag & NFSMNT_NQNFS) == 0) + } + if ((nmp->nm_flag & NFSMNT_NQNFS) == 0) np->n_attrstamp = 0; /* For Open/Close consistency */ return (0); } |
