VOP_LOCK1() (and so VOP_LOCK()) and VOP_UNLOCK() are only used in

conjuction with 'thread' argument passing which is always curthread.
Remove the unuseful extra-argument and pass explicitly curthread to lower
layer functions, when necessary.

KPI results broken by this change, which should affect several ports, so
version bumping and manpage update will be further committed.

Tested by: kris, pho, Diego Sardina <siarodx at gmail dot com>

4 files changed, 9 insertions, 9 deletions

diff --git a/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c b/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c
index 8d3ba0f..244ad30 100644
--- a/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c
+++ b/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c
@@ -302,7 +302,7 @@ _xfs_root(mp, flags, vpp, td)
         XVFS_ROOT(MNTTOVFS(mp), &vp, error);
 	if (error == 0) {
 		*vpp = vp->v_vnode;
-		VOP_LOCK(*vpp, flags, curthread);
+		VOP_LOCK(*vpp, flags);
 	}
 	return (error);
 }
diff --git a/sys/gnu/fs/xfs/FreeBSD/xfs_super.c b/sys/gnu/fs/xfs/FreeBSD/xfs_super.c
index 6f1d8b8..c7968bb 100644
--- a/sys/gnu/fs/xfs/FreeBSD/xfs_super.c
+++ b/sys/gnu/fs/xfs/FreeBSD/xfs_super.c
@@ -105,7 +105,7 @@ xfs_initialize_vnode(
 	 * and unlock the inode.
 	 */
 	if (ip->i_d.di_mode != 0 && unlock)
-		VOP_UNLOCK(xvp->v_vnode, 0, curthread);
+		VOP_UNLOCK(xvp->v_vnode, 0);
 }
 
 #if 0
@@ -189,7 +189,7 @@ xfs_blkdev_get(
 		vput(devvp);
 		return (error);
 	}
-	VOP_UNLOCK(devvp, 0, td);
+	VOP_UNLOCK(devvp, 0);
 
 	devvp->v_bufobj.bo_private = cp;
 	devvp->v_bufobj.bo_ops = &xfs_bo_ops;
diff --git a/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c b/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c
index c014efc..8e2b1f9 100644
--- a/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c
+++ b/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c
@@ -139,7 +139,7 @@ vn_purge(struct xfs_vnode        *xfs_vp)
 	if (vp->v_holdcnt == 0)
 		vhold(vp);
 	vgone(vp);
-        VOP_UNLOCK(vp, 0, curthread);
+        VOP_UNLOCK(vp, 0);
 }
 
 void xfs_ichgtime(
diff --git a/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c b/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c
index 80435a7..90a0b48 100644
--- a/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c
+++ b/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c
@@ -751,7 +751,7 @@ _xfs_create(
 
 	if (error == 0) {
 		*ap->a_vpp = xvp->v_vnode;
-		VOP_LOCK(xvp->v_vnode, LK_EXCLUSIVE, td);
+		VOP_LOCK(xvp->v_vnode, LK_EXCLUSIVE);
 	}
 
 	return (error);
@@ -886,7 +886,7 @@ _xfs_symlink(
 
 	if (error == 0) {
 		*ap->a_vpp = xvp->v_vnode;
-		VOP_LOCK(xvp->v_vnode, LK_EXCLUSIVE, td);
+		VOP_LOCK(xvp->v_vnode, LK_EXCLUSIVE);
 	}
 
 	return (error);
@@ -922,7 +922,7 @@ _xfs_mknod(
 
 	if (error == 0) {
 		*ap->a_vpp = xvp->v_vnode;
-		VOP_LOCK(xvp->v_vnode, LK_EXCLUSIVE, td);
+		VOP_LOCK(xvp->v_vnode, LK_EXCLUSIVE);
 	}
 
 	return (error);
@@ -956,7 +956,7 @@ _xfs_mkdir(
 
 	if (error == 0) {
 		*ap->a_vpp = xvp->v_vnode;
-		VOP_LOCK(xvp->v_vnode, LK_EXCLUSIVE, td);
+		VOP_LOCK(xvp->v_vnode, LK_EXCLUSIVE);
 	}
 
 	return (error);
@@ -1322,7 +1322,7 @@ _xfs_cachedlookup(
 	}
 
 	if (flags & ISDOTDOT) {
-		VOP_UNLOCK(dvp, 0, td);
+		VOP_UNLOCK(dvp, 0);
 		error = vn_lock(tvp, cnp->cn_lkflags);
 		if (error) {
 			vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY);