Author: zack
Date: Sat Aug 13 17:17:59 2011
New Revision: 224847
URL: http://svn.freebsd.org/changeset/base/224847
Log:
MFC: 224081
Simple find/replace of vn_lock -> NFSVOPLOCK. This is done so that NFSVOPLOCK
can be modified later to add enhanced logging and assertions.
Modified:
stable/8/sys/fs/nfs/nfs_commonsubs.c
stable/8/sys/fs/nfsclient/nfs_clport.c
stable/8/sys/fs/nfsclient/nfs_clsubs.c
stable/8/sys/fs/nfsclient/nfs_clvnops.c
stable/8/sys/fs/nfsserver/nfs_nfsdport.c
stable/8/sys/fs/nfsserver/nfs_nfsdserv.c
stable/8/sys/fs/nfsserver/nfs_nfsdsocket.c
stable/8/sys/fs/nfsserver/nfs_nfsdstate.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)
Modified: stable/8/sys/fs/nfs/nfs_commonsubs.c
==============================================================================
--- stable/8/sys/fs/nfs/nfs_commonsubs.c Sat Aug 13 17:17:06 2011
(r224846)
+++ stable/8/sys/fs/nfs/nfs_commonsubs.c Sat Aug 13 17:17:59 2011
(r224847)
@@ -1995,7 +1995,7 @@ nfsv4_fillattr(struct nfsrv_descript *nd
supports_nfsv4acls == 0)) {
NFSCLRBIT_ATTRBIT(retbitp, NFSATTRBIT_ACL);
} else if (naclp != NULL) {
- if (vn_lock(vp, LK_SHARED) == 0) {
+ if (NFSVOPLOCK(vp, LK_SHARED) == 0) {
error = VOP_ACCESSX(vp, VREAD_ACL, cred, p);
if (error == 0)
error = VOP_GETACL(vp, ACL_TYPE_NFS4,
Modified: stable/8/sys/fs/nfsclient/nfs_clport.c
==============================================================================
--- stable/8/sys/fs/nfsclient/nfs_clport.c Sat Aug 13 17:17:06 2011
(r224846)
+++ stable/8/sys/fs/nfsclient/nfs_clport.c Sat Aug 13 17:17:59 2011
(r224847)
@@ -105,7 +105,7 @@ nfscl_nget(struct mount *mntp, struct vn
if (error == 0 && nvp != NULL) {
/*
* I believe there is a slight chance that vgonel() could
- * get called on this vnode between when vn_lock() drops
+ * get called on this vnode between when NFSVOPLOCK() drops
* the VI_LOCK() and vget() acquires it again, so that it
* hasn't yet had v_usecount incremented. If this were to
* happen, the VI_DOOMED flag would be set, so check for
Modified: stable/8/sys/fs/nfsclient/nfs_clsubs.c
==============================================================================
--- stable/8/sys/fs/nfsclient/nfs_clsubs.c Sat Aug 13 17:17:06 2011
(r224846)
+++ stable/8/sys/fs/nfsclient/nfs_clsubs.c Sat Aug 13 17:17:59 2011
(r224847)
@@ -145,7 +145,7 @@ ncl_upgrade_vnlock(struct vnode *vp)
KASSERT(old_lock == LK_SHARED,
("ncl_upgrade_vnlock: wrong old_lock %d", old_lock));
/* Upgrade to exclusive lock, this might block */
- vn_lock(vp, LK_UPGRADE | LK_RETRY);
+ NFSVOPLOCK(vp, LK_UPGRADE | LK_RETRY);
}
return (old_lock);
}
@@ -156,7 +156,7 @@ ncl_downgrade_vnlock(struct vnode *vp, i
if (old_lock != LK_EXCLUSIVE) {
KASSERT(old_lock == LK_SHARED, ("wrong old_lock %d", old_lock));
/* Downgrade from exclusive lock. */
- vn_lock(vp, LK_DOWNGRADE | LK_RETRY);
+ NFSVOPLOCK(vp, LK_DOWNGRADE | LK_RETRY);
}
}
Modified: stable/8/sys/fs/nfsclient/nfs_clvnops.c
==============================================================================
--- stable/8/sys/fs/nfsclient/nfs_clvnops.c Sat Aug 13 17:17:06 2011
(r224846)
+++ stable/8/sys/fs/nfsclient/nfs_clvnops.c Sat Aug 13 17:17:59 2011
(r224847)
@@ -1177,7 +1177,7 @@ nfs_lookup(struct vop_lookup_args *ap)
vfs_ref(mp);
VOP_UNLOCK(dvp, 0);
error = vfs_busy(mp, 0);
- vn_lock(dvp, ltype | LK_RETRY);
+ NFSVOPLOCK(dvp, ltype | LK_RETRY);
vfs_rel(mp);
if (error == 0 && (dvp->v_iflag & VI_DOOMED)) {
vfs_unbusy(mp);
@@ -1193,7 +1193,7 @@ nfs_lookup(struct vop_lookup_args *ap)
newvp = NFSTOV(np);
vfs_unbusy(mp);
if (newvp != dvp)
- vn_lock(dvp, ltype | LK_RETRY);
+ NFSVOPLOCK(dvp, ltype | LK_RETRY);
if (dvp->v_iflag & VI_DOOMED) {
if (error == 0) {
if (newvp == dvp)
@@ -1707,7 +1707,7 @@ nfs_rename(struct vop_rename_args *ap)
error = 0;
goto out;
}
- if ((error = vn_lock(fvp, LK_EXCLUSIVE)) != 0)
+ if ((error = NFSVOPLOCK(fvp, LK_EXCLUSIVE)) != 0)
goto out;
/*
@@ -2879,7 +2879,7 @@ nfs_advlock(struct vop_advlock_args *ap)
cred = p->p_ucred;
else
cred = td->td_ucred;
- vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
+ NFSVOPLOCK(vp, LK_EXCLUSIVE | LK_RETRY);
if (vp->v_iflag & VI_DOOMED) {
VOP_UNLOCK(vp, 0);
return (EBADF);
@@ -2909,7 +2909,7 @@ nfs_advlock(struct vop_advlock_args *ap)
"ncladvl");
if (error)
return (EINTR);
- vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
+ NFSVOPLOCK(vp, LK_EXCLUSIVE | LK_RETRY);
if (vp->v_iflag & VI_DOOMED) {
VOP_UNLOCK(vp, 0);
return (EBADF);
@@ -2952,7 +2952,7 @@ nfs_advlock(struct vop_advlock_args *ap)
VOP_UNLOCK(vp, 0);
return (0);
} else if (!NFS_ISV4(vp)) {
- error = vn_lock(vp, LK_SHARED);
+ error = NFSVOPLOCK(vp, LK_SHARED);
if (error)
return (error);
if ((VFSTONFS(vp->v_mount)->nm_flag & NFSMNT_NOLOCKD) != 0) {
@@ -2983,7 +2983,7 @@ nfs_advlockasync(struct vop_advlockasync
if (NFS_ISV4(vp))
return (EOPNOTSUPP);
- error = vn_lock(vp, LK_SHARED);
+ error = NFSVOPLOCK(vp, LK_SHARED);
if (error)
return (error);
if ((VFSTONFS(vp->v_mount)->nm_flag & NFSMNT_NOLOCKD) != 0) {
Modified: stable/8/sys/fs/nfsserver/nfs_nfsdport.c
==============================================================================
--- stable/8/sys/fs/nfsserver/nfs_nfsdport.c Sat Aug 13 17:17:06 2011
(r224846)
+++ stable/8/sys/fs/nfsserver/nfs_nfsdport.c Sat Aug 13 17:17:59 2011
(r224847)
@@ -116,7 +116,7 @@ nfsvno_getattr(struct vnode *vp, struct
*/
if (VOP_ISLOCKED(vp) != LK_EXCLUSIVE) {
lockedit = 1;
- vn_lock(vp, LK_SHARED | LK_RETRY);
+ NFSVOPLOCK(vp, LK_SHARED | LK_RETRY);
}
}
error = VOP_GETATTR(vp, &nvap->na_vattr, cred);
@@ -158,7 +158,7 @@ nfsvno_accchk(struct vnode *vp, accmode_
int error = 0, getret = 0;
if (vpislocked == 0) {
- if (vn_lock(vp, LK_SHARED) != 0)
+ if (NFSVOPLOCK(vp, LK_SHARED) != 0)
return (EPERM);
}
if (accmode & VWRITE) {
@@ -1095,7 +1095,7 @@ nfsvno_rename(struct nameidata *fromndp,
goto out;
}
if (ndflag & ND_NFSV4) {
- if (vn_lock(fvp, LK_EXCLUSIVE) == 0) {
+ if (NFSVOPLOCK(fvp, LK_EXCLUSIVE) == 0) {
error = nfsrv_checkremove(fvp, 0, p);
VOP_UNLOCK(fvp, 0);
} else
@@ -1156,7 +1156,7 @@ nfsvno_link(struct nameidata *ndp, struc
error = EXDEV;
}
if (!error) {
- vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
+ NFSVOPLOCK(vp, LK_EXCLUSIVE | LK_RETRY);
if ((vp->v_iflag & VI_DOOMED) == 0)
error = VOP_LINK(ndp->ni_dvp, vp, &ndp->ni_cnd);
else
@@ -1983,7 +1983,7 @@ again:
dp->d_name[1] == '.')
cn.cn_flags |=
ISDOTDOT;
- if (vn_lock(vp, LK_SHARED)
+ if (NFSVOPLOCK(vp, LK_SHARED)
!= 0) {
nd->nd_repstat = EPERM;
break;
@@ -2575,7 +2575,7 @@ nfsvno_fhtovp(struct mount *mp, fhandle_
* but this will have to do until VFS_FHTOVP() has a lock
* type argument like VFS_VGET().
*/
- vn_lock(*vpp, LK_DOWNGRADE | LK_RETRY);
+ NFSVOPLOCK(*vpp, LK_DOWNGRADE | LK_RETRY);
return (error);
}
Modified: stable/8/sys/fs/nfsserver/nfs_nfsdserv.c
==============================================================================
--- stable/8/sys/fs/nfsserver/nfs_nfsdserv.c Sat Aug 13 17:17:06 2011
(r224846)
+++ stable/8/sys/fs/nfsserver/nfs_nfsdserv.c Sat Aug 13 17:17:59 2011
(r224847)
@@ -238,7 +238,7 @@ nfsrvd_getattr(struct nfsrv_descript *nd
VOP_UNLOCK(vp, 0);
if (at_root != 0) {
if ((nd->nd_repstat =
- vn_lock(tvp, LK_SHARED)) == 0) {
+ NFSVOPLOCK(tvp, LK_SHARED)) == 0) {
nd->nd_repstat = VOP_GETATTR(
tvp, &va, nd->nd_cred);
vput(tvp);
@@ -2703,7 +2703,7 @@ nfsrvd_open(struct nfsrv_descript *nd, _
};
stp->ls_flags |= NFSLCK_RECLAIM;
vp = dp;
- vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
+ NFSVOPLOCK(vp, LK_EXCLUSIVE | LK_RETRY);
if ((vp->v_iflag & VI_DOOMED) == 0)
nd->nd_repstat = nfsrv_opencheck(clientid, &stateid,
stp, vp, nd, p, nd->nd_repstat);
Modified: stable/8/sys/fs/nfsserver/nfs_nfsdsocket.c
==============================================================================
--- stable/8/sys/fs/nfsserver/nfs_nfsdsocket.c Sat Aug 13 17:17:06 2011
(r224846)
+++ stable/8/sys/fs/nfsserver/nfs_nfsdsocket.c Sat Aug 13 17:17:59 2011
(r224847)
@@ -861,7 +861,7 @@ nfsrvd_compound(struct nfsrv_descript *n
}
if (nfsv4_opflag[op].modifyfs)
vn_start_write(savevp, &temp_mp, V_WAIT);
- if (vn_lock(savevp, LK_EXCLUSIVE) == 0) {
+ if (NFSVOPLOCK(savevp, LK_EXCLUSIVE) == 0) {
VREF(vp);
VREF(savevp);
error = (*(nfsrv4_ops2[op]))(nd, isdgram,
@@ -878,7 +878,7 @@ nfsrvd_compound(struct nfsrv_descript *n
if (nfsv4_opflag[op].modifyfs)
vn_start_write(vp, &temp_mp,
V_WAIT);
- if (vn_lock(vp, nfsv4_opflag[op].lktype)
+ if (NFSVOPLOCK(vp,
nfsv4_opflag[op].lktype)
== 0)
VREF(vp);
else
Modified: stable/8/sys/fs/nfsserver/nfs_nfsdstate.c
==============================================================================
--- stable/8/sys/fs/nfsserver/nfs_nfsdstate.c Sat Aug 13 17:17:06 2011
(r224846)
+++ stable/8/sys/fs/nfsserver/nfs_nfsdstate.c Sat Aug 13 17:17:59 2011
(r224847)
@@ -4096,7 +4096,7 @@ nfsrv_updatestable(NFSPROC_T *p)
NFSVNO_SETATTRVAL(&nva, size, 0);
vp = NFSFPVNODE(sf->nsf_fp);
vn_start_write(vp, &mp, V_WAIT);
- if (vn_lock(vp, LK_EXCLUSIVE) == 0) {
+ if (NFSVOPLOCK(vp, LK_EXCLUSIVE) == 0) {
error = nfsvno_setattr(vp, &nva, NFSFPCRED(sf->nsf_fp), p,
NULL);
VOP_UNLOCK(vp, 0);
@@ -4231,7 +4231,7 @@ nfsrv_checkstable(struct nfsclient *clp)
* Return 0 to indicate the conflict can't be revoked and 1 to indicate
* the revocation worked and the conflicting client is "bye, bye", so it
* can be tried again.
- * Return 2 to indicate that the vnode is VI_DOOMED after vn_lock().
+ * Return 2 to indicate that the vnode is VI_DOOMED after NFSVOPLOCK().
* Unlocks State before a non-zero value is returned.
*/
static int
@@ -4258,7 +4258,7 @@ nfsrv_clientconflict(struct nfsclient *c
} while (!gotlock);
NFSUNLOCKV4ROOTMUTEX();
*haslockp = 1;
- vn_lock(vp, lktype | LK_RETRY);
+ NFSVOPLOCK(vp, lktype | LK_RETRY);
if ((vp->v_iflag & VI_DOOMED) != 0)
return (2);
else
@@ -4426,7 +4426,7 @@ nfsrv_delegconflict(struct nfsstate *stp
} while (!gotlock);
NFSUNLOCKV4ROOTMUTEX();
*haslockp = 1;
- vn_lock(vp, lktype | LK_RETRY);
+ NFSVOPLOCK(vp, lktype | LK_RETRY);
if ((vp->v_iflag & VI_DOOMED) != 0) {
*haslockp = 0;
NFSLOCKV4ROOTMUTEX();
@@ -4626,7 +4626,7 @@ nfsd_recalldelegation(vnode_t vp, NFSPRO
NFSGETNANOTIME(&mytime);
starttime = (u_int32_t)mytime.tv_sec;
do {
- if (vn_lock(vp, LK_EXCLUSIVE) == 0) {
+ if (NFSVOPLOCK(vp, LK_EXCLUSIVE) == 0) {
error = nfsrv_checkremove(vp, 0, p);
VOP_UNLOCK(vp, 0);
} else
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
