svn commit: r224080 - in head/sys/fs: nfs nfsserver

[Zack Kirsch]

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

Log:
  Remove unnecessary thread pointer from VOPLOCK macros and current users.
  
  Reviewed by:    rmacklem
  Approved by:    zml (mentor)
  MFC after:      2 weeks

Modified:
  head/sys/fs/nfs/nfsport.h
  head/sys/fs/nfsserver/nfs_nfsdport.c
  head/sys/fs/nfsserver/nfs_nfsdserv.c
  head/sys/fs/nfsserver/nfs_nfsdsocket.c

Modified: head/sys/fs/nfs/nfsport.h
==============================================================================
--- head/sys/fs/nfs/nfsport.h	Sat Jul 16 08:05:21 2011	(r224079)
+++ head/sys/fs/nfs/nfsport.h	Sat Jul 16 08:05:26 2011	(r224080)
@@ -836,10 +836,13 @@ void nfsd_mntinit(void);
 
 /*
  * Define these for vnode lock/unlock ops.
+ *
+ * These are good abstractions to macro out, so that they can be added to
+ * later, for debugging or stats, etc.
  */
-#define	NFSVOPLOCK(v, f, p)	vn_lock((v), (f))
-#define	NFSVOPUNLOCK(v, f, p)	VOP_UNLOCK((v), (f))
-#define	NFSVOPISLOCKED(v, p)	VOP_ISLOCKED((v))
+#define	NFSVOPLOCK(v, f)	vn_lock((v), (f))
+#define	NFSVOPUNLOCK(v, f)	VOP_UNLOCK((v), (f))
+#define	NFSVOPISLOCKED(v)	VOP_ISLOCKED((v))
 
 /*
  * Define ncl_hash().

Modified: head/sys/fs/nfsserver/nfs_nfsdport.c
==============================================================================
--- head/sys/fs/nfsserver/nfs_nfsdport.c	Sat Jul 16 08:05:21 2011	(r224079)
+++ head/sys/fs/nfsserver/nfs_nfsdport.c	Sat Jul 16 08:05:26 2011	(r224080)
@@ -282,7 +282,7 @@ nfsvno_namei(struct nfsrv_descript *nd, 
 		return (ENOTDIR);
 	}
 	if (islocked)
-		NFSVOPUNLOCK(dp, 0, p);
+		NFSVOPUNLOCK(dp, 0);
 	VREF(dp);
 	*retdirp = dp;
 	if (NFSVNO_EXRDONLY(exp))
@@ -351,7 +351,7 @@ nfsvno_namei(struct nfsrv_descript *nd, 
 			if ((cnp->cn_flags & (SAVENAME | SAVESTART)) == 0)
 				nfsvno_relpathbuf(ndp);
 			if (ndp->ni_vp && !lockleaf)
-				NFSVOPUNLOCK(ndp->ni_vp, 0, p);
+				NFSVOPUNLOCK(ndp->ni_vp, 0);
 			break;
 		}
 
@@ -359,7 +359,7 @@ nfsvno_namei(struct nfsrv_descript *nd, 
 		 * Validate symlink
 		 */
 		if ((cnp->cn_flags & LOCKPARENT) && ndp->ni_pathlen == 1)
-			NFSVOPUNLOCK(ndp->ni_dvp, 0, p);
+			NFSVOPUNLOCK(ndp->ni_dvp, 0);
 		if (!(nd->nd_flag & ND_PUBLOOKUP)) {
 			error = EINVAL;
 			goto badlink2;
@@ -2868,14 +2868,14 @@ nfsvno_advlock(struct vnode *vp, int fty
 	fl.l_pid = (pid_t)0;
 	fl.l_sysid = (int)nfsv4_sysid;
 
-	NFSVOPUNLOCK(vp, 0, td);
+	NFSVOPUNLOCK(vp, 0);
 	if (ftype == F_UNLCK)
 		error = VOP_ADVLOCK(vp, (caddr_t)td->td_proc, F_UNLCK, &fl,
 		    (F_POSIX | F_REMOTE));
 	else
 		error = VOP_ADVLOCK(vp, (caddr_t)td->td_proc, F_SETLK, &fl,
 		    (F_POSIX | F_REMOTE));
-	NFSVOPLOCK(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	NFSVOPLOCK(vp, LK_EXCLUSIVE | LK_RETRY);
 	return (error);
 }
 

Modified: head/sys/fs/nfsserver/nfs_nfsdserv.c
==============================================================================
--- head/sys/fs/nfsserver/nfs_nfsdserv.c	Sat Jul 16 08:05:21 2011	(r224079)
+++ head/sys/fs/nfsserver/nfs_nfsdserv.c	Sat Jul 16 08:05:26 2011	(r224080)
@@ -1449,7 +1449,7 @@ nfsrvd_rename(struct nfsrv_descript *nd,
 		if (tdp) {
 			tdirfor_ret = nfsvno_getattr(tdp, &tdirfor, nd->nd_cred,
 			    p, 1);
-			NFSVOPUNLOCK(tdp, 0, p);
+			NFSVOPUNLOCK(tdp, 0);
 		}
 	}
 	NFSNAMEICNDSET(&tond.ni_cnd, nd->nd_cred, RENAME, LOCKPARENT | LOCKLEAF | NOCACHE | SAVESTART);
@@ -1554,7 +1554,7 @@ nfsrvd_link(struct nfsrv_descript *nd, i
 		nfsrv_wcc(nd, dirfor_ret, &dirfor, diraft_ret, &diraft);
 		return (0);
 	}
-	NFSVOPUNLOCK(vp, 0, p);
+	NFSVOPUNLOCK(vp, 0);
 	if (vnode_vtype(vp) == VDIR) {
 		if (nd->nd_flag & ND_NFSV4)
 			nd->nd_repstat = NFSERR_ISDIR;
@@ -1584,7 +1584,7 @@ nfsrvd_link(struct nfsrv_descript *nd, i
 			nfsd_fhtovp(nd, &dfh, LK_EXCLUSIVE, &dp, &tnes, NULL, 0,
 			    p);
 			if (dp)
-				NFSVOPUNLOCK(dp, 0, p);
+				NFSVOPUNLOCK(dp, 0);
 		}
 	}
 	NFSNAMEICNDSET(&named.ni_cnd, nd->nd_cred, CREATE,
@@ -1868,7 +1868,7 @@ nfsrvd_mkdirsub(struct nfsrv_descript *n
 			nd->nd_repstat = nfsvno_getattr(vp, nvap, nd->nd_cred,
 			    p, 1);
 		if (vpp && !nd->nd_repstat) {
-			NFSVOPUNLOCK(vp, 0, p);
+			NFSVOPUNLOCK(vp, 0);
 			*vpp = vp;
 		} else {
 			vput(vp);
@@ -2765,7 +2765,7 @@ nfsrvd_open(struct nfsrv_descript *nd, _
 	 * (ie: Leave the NFSVOPUNLOCK() about here.)
 	 */
 	if (vp)
-		NFSVOPUNLOCK(vp, 0, p);
+		NFSVOPUNLOCK(vp, 0);
 	if (stp)
 		FREE((caddr_t)stp, M_NFSDSTATE);
 	if (!nd->nd_repstat && dirp)

Modified: head/sys/fs/nfsserver/nfs_nfsdsocket.c
==============================================================================
--- head/sys/fs/nfsserver/nfs_nfsdsocket.c	Sat Jul 16 08:05:21 2011	(r224079)
+++ head/sys/fs/nfsserver/nfs_nfsdsocket.c	Sat Jul 16 08:05:26 2011	(r224080)
@@ -430,7 +430,7 @@ nfsrvd_dorpc(struct nfsrv_descript *nd, 
 	} else {
 		if (nfs_retfh[nd->nd_procnum] == 1) {
 			if (vp)
-				NFSVOPUNLOCK(vp, 0, p);
+				NFSVOPUNLOCK(vp, 0);
 			error = (*(nfsrv3_procs1[nd->nd_procnum]))(nd, isdgram,
 			    vp, NULL, (fhandle_t *)fh.nfsrvfh_data, p, &nes);
 		} else if (nfs_retfh[nd->nd_procnum] == 2) {