Author: jhb
Date: Fri Jul 23 15:26:19 2010
New Revision: 210418
URL: http://svn.freebsd.org/changeset/base/210418
Log:
MFC 209946:
- 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().
Modified:
stable/8/sys/nfsclient/nfs_vnops.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
Modified: stable/8/sys/nfsclient/nfs_vnops.c
==============================================================================
--- stable/8/sys/nfsclient/nfs_vnops.c Fri Jul 23 15:16:37 2010
(r210417)
+++ stable/8/sys/nfsclient/nfs_vnops.c Fri Jul 23 15:26:19 2010
(r210418)
@@ -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);
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
