svn commit: r224083 - in head/sys/fs: nfsclient nfsserver

[Zack Kirsch]

Author: zack
Date: Sat Jul 16 08:05:41 2011
New Revision: 224083
URL: http://svn.freebsd.org/changeset/base/224083

Log:
  Simple find/replace of VOP_ISLOCKED -> NFSVOPISLOCKED. This is done so that NFSVOPISLOCKED can be modified later to add enhanced logging and assertions.
  
  Reviewed by:    rmacklem
  Approved by:    zml (mentor)
  MFC after:      2 weeks

Modified:
  head/sys/fs/nfsclient/nfs_clsubs.c
  head/sys/fs/nfsclient/nfs_clvfsops.c
  head/sys/fs/nfsclient/nfs_clvnops.c
  head/sys/fs/nfsserver/nfs_nfsdport.c
  head/sys/fs/nfsserver/nfs_nfsdstate.c

Modified: head/sys/fs/nfsclient/nfs_clsubs.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clsubs.c	Sat Jul 16 08:05:36 2011	(r224082)
+++ head/sys/fs/nfsclient/nfs_clsubs.c	Sat Jul 16 08:05:41 2011	(r224083)
@@ -143,7 +143,7 @@ ncl_upgrade_vnlock(struct vnode *vp)
 	int old_lock;
 
 	ASSERT_VOP_LOCKED(vp, "ncl_upgrade_vnlock");
-	old_lock = VOP_ISLOCKED(vp);
+	old_lock = NFSVOPISLOCKED(vp);
 	if (old_lock != LK_EXCLUSIVE) {
 		KASSERT(old_lock == LK_SHARED,
 		    ("ncl_upgrade_vnlock: wrong old_lock %d", old_lock));

Modified: head/sys/fs/nfsclient/nfs_clvfsops.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clvfsops.c	Sat Jul 16 08:05:36 2011	(r224082)
+++ head/sys/fs/nfsclient/nfs_clvfsops.c	Sat Jul 16 08:05:41 2011	(r224083)
@@ -1477,7 +1477,7 @@ loop:
 		VI_LOCK(vp);
 		MNT_IUNLOCK(mp);
 		/* XXX Racy bv_cnt check. */
-		if (VOP_ISLOCKED(vp) || vp->v_bufobj.bo_dirty.bv_cnt == 0 ||
+		if (NFSVOPISLOCKED(vp) || vp->v_bufobj.bo_dirty.bv_cnt == 0 ||
 		    waitfor == MNT_LAZY) {
 			VI_UNLOCK(vp);
 			MNT_ILOCK(mp);

Modified: head/sys/fs/nfsclient/nfs_clvnops.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clvnops.c	Sat Jul 16 08:05:36 2011	(r224082)
+++ head/sys/fs/nfsclient/nfs_clvnops.c	Sat Jul 16 08:05:41 2011	(r224083)
@@ -1209,7 +1209,7 @@ nfs_lookup(struct vop_lookup_args *ap)
 	}
 
 	if (flags & ISDOTDOT) {
-		ltype = VOP_ISLOCKED(dvp);
+		ltype = NFSVOPISLOCKED(dvp);
 		error = vfs_busy(mp, MBF_NOWAIT);
 		if (error != 0) {
 			vfs_ref(mp);

Modified: head/sys/fs/nfsserver/nfs_nfsdport.c
==============================================================================
--- head/sys/fs/nfsserver/nfs_nfsdport.c	Sat Jul 16 08:05:36 2011	(r224082)
+++ head/sys/fs/nfsserver/nfs_nfsdport.c	Sat Jul 16 08:05:41 2011	(r224083)
@@ -116,7 +116,7 @@ nfsvno_getattr(struct vnode *vp, struct 
 		 * locked by this thread or not locked by this thread.
 		 * As such, shared lock it, if not exclusively locked.
 		 */
-		if (VOP_ISLOCKED(vp) != LK_EXCLUSIVE) {
+		if (NFSVOPISLOCKED(vp) != LK_EXCLUSIVE) {
 			lockedit = 1;
 			NFSVOPLOCK(vp, LK_SHARED | LK_RETRY);
 		}

Modified: head/sys/fs/nfsserver/nfs_nfsdstate.c
==============================================================================
--- head/sys/fs/nfsserver/nfs_nfsdstate.c	Sat Jul 16 08:05:36 2011	(r224082)
+++ head/sys/fs/nfsserver/nfs_nfsdstate.c	Sat Jul 16 08:05:41 2011	(r224083)
@@ -4248,7 +4248,7 @@ nfsrv_clientconflict(struct nfsclient *c
 		return (0);
 	if (*haslockp == 0) {
 		NFSUNLOCKSTATE();
-		lktype = VOP_ISLOCKED(vp);
+		lktype = NFSVOPISLOCKED(vp);
 		NFSVOPUNLOCK(vp, 0);
 		NFSLOCKV4ROOTMUTEX();
 		nfsv4_relref(&nfsv4rootfs_lock);
@@ -4416,7 +4416,7 @@ nfsrv_delegconflict(struct nfsstate *stp
 	 */
 	if (*haslockp == 0) {
 		NFSUNLOCKSTATE();
-		lktype = VOP_ISLOCKED(vp);
+		lktype = NFSVOPISLOCKED(vp);
 		NFSVOPUNLOCK(vp, 0);
 		NFSLOCKV4ROOTMUTEX();
 		nfsv4_relref(&nfsv4rootfs_lock);
@@ -4610,7 +4610,7 @@ nfsd_recalldelegation(vnode_t vp, NFSPRO
 	    nfsrv_issuedelegs == 0)
 		return;
 
-	KASSERT((VOP_ISLOCKED(vp) != LK_EXCLUSIVE), ("vp %p is locked", vp));
+	KASSERT((NFSVOPISLOCKED(vp) != LK_EXCLUSIVE), ("vp %p is locked", vp));
 	/*
 	 * First, get a reference on the nfsv4rootfs_lock so that an
 	 * exclusive lock cannot be acquired by another thread.