diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2010-07-12 14:19:23 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2010-07-12 14:19:23 +0000 |
| commit | 985fda3dfe86e93862cfd1fabb67f509b32641b1 (patch) | |
| tree | 01814fda825c59b6122b53f0f32365010879fd96 /sys/nfsclient/nfs_vnops.c | |
| parent | d83af91b99972b3d2e646b47f86e8d33ebafd251 (diff) | |
| download | src-985fda3dfe86e93862cfd1fabb67f509b32641b1.tar.gz src-985fda3dfe86e93862cfd1fabb67f509b32641b1.zip | |
- Add missing locking around flushing of an NFS node's attribute cache
in the NMODIFIED case of nfs_open().
- Cosmetic tweak to simplify an expression in nfs_lookup().
Reviewed by: rmacklem, bde
MFC after: 1 week
Notes
Notes:
svn path=/head/; revision=209946
Diffstat (limited to 'sys/nfsclient/nfs_vnops.c')
| -rw-r--r-- | sys/nfsclient/nfs_vnops.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/nfsclient/nfs_vnops.c b/sys/nfsclient/nfs_vnops.c index 163a67e9efd2..575997cc39ce 100644 --- a/sys/nfsclient/nfs_vnops.c +++ b/sys/nfsclient/nfs_vnops.c @@ -525,10 +525,12 @@ nfs_open(struct vop_open_args *ap) error = nfs_vinvalbuf(vp, V_SAVE, ap->a_td, 1); if (error == EINTR || error == EIO) return (error); + mtx_lock(&np->n_mtx); np->n_attrstamp = 0; KDTRACE_NFS_ATTRCACHE_FLUSH_DONE(vp); if (vp->v_type == VDIR) np->n_direofoffset = 0; + mtx_unlock(&np->n_mtx); error = VOP_GETATTR(vp, &vattr, ap->a_cred); if (error) return (error); @@ -970,8 +972,8 @@ nfs_lookup(struct vop_lookup_args *ap) */ newvp = *vpp; newnp = VTONFS(newvp); - if ((cnp->cn_flags & (ISLASTCN | ISOPEN)) == - (ISLASTCN | ISOPEN) && !(newnp->n_flag & NMODIFIED)) { + if ((flags & (ISLASTCN | ISOPEN)) == (ISLASTCN | ISOPEN) && + !(newnp->n_flag & NMODIFIED)) { mtx_lock(&newnp->n_mtx); newnp->n_attrstamp = 0; KDTRACE_NFS_ATTRCACHE_FLUSH_DONE(newvp); |