vn_lock() is currently only used with the 'curthread' passed as argument.

Remove this argument and pass curthread directly to underlying
VOP_LOCK1() VFS method. This modify makes the code cleaner and in
particular remove an annoying dependence helping next lockmgr() cleanup.
KPI results, obviously, changed.

Manpage and FreeBSD_version will be updated through further commits.

As a side note, would be valuable to say that next commits will address
a similar cleanup about VFS methods, in particular vop_lock1 and
vop_unlock.

Tested by:	Diego Sardina <siarodx at gmail dot com>,
		Andrea Di Pasquale <whyx dot it at gmail dot com>

4 files changed, 8 insertions, 8 deletions

diff --git a/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c b/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c
index 7145b9497a4b..ff5b0c2efcfb 100644
--- a/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c
+++ b/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c
@@ -390,7 +390,7 @@ xfs_vn_allocate(xfs_mount_t *mp, xfs_inode_t *ip, struct xfs_vnode **vpp)
 	}
 
 	vp->v_vnlock->lk_flags |= LK_CANRECURSE;
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, curthread);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	error = insmntque(vp, XVFSTOMNT(XFS_MTOVFS(mp)));
 	if (error != 0) {
 		kmem_free(vdata, sizeof(*vdata));
diff --git a/sys/gnu/fs/xfs/FreeBSD/xfs_super.c b/sys/gnu/fs/xfs/FreeBSD/xfs_super.c
index 97c65864a22f..6f1d8b855ccf 100644
--- a/sys/gnu/fs/xfs/FreeBSD/xfs_super.c
+++ b/sys/gnu/fs/xfs/FreeBSD/xfs_super.c
@@ -148,7 +148,7 @@ xfs_blkdev_get(
 		return (error);
 	}
 
-	vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY);
 
 	ronly = ((XFS_MTOVFS(mp)->vfs_flag & VFS_RDONLY) != 0);
 	accessmode = VREAD;
diff --git a/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c b/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c
index 0d245c65613d..c014efc019fc 100644
--- a/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c
+++ b/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c
@@ -135,7 +135,7 @@ vn_purge(struct xfs_vnode        *xfs_vp)
 
         vp = xfs_vp->v_vnode;
 
-        vn_lock(vp, LK_EXCLUSIVE, curthread);
+        vn_lock(vp, LK_EXCLUSIVE);
 	if (vp->v_holdcnt == 0)
 		vhold(vp);
 	vgone(vp);
diff --git a/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c b/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c
index c894095bdd79..80435a71e117 100644
--- a/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c
+++ b/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c
@@ -1294,7 +1294,7 @@ _xfs_cachedlookup(
 	tvp = cvp->v_vnode;
 
 	if (nameiop == DELETE && islastcn) {
-		if ((error = vn_lock(tvp, LK_EXCLUSIVE, td))) {
+		if ((error = vn_lock(tvp, LK_EXCLUSIVE))) {
 			vrele(tvp);
 			goto err_out;
 		}
@@ -1310,7 +1310,7 @@ _xfs_cachedlookup(
 	 }
 
 	if (nameiop == RENAME && islastcn) {
-		if ((error = vn_lock(tvp, LK_EXCLUSIVE, td))) {
+		if ((error = vn_lock(tvp, LK_EXCLUSIVE))) {
 			vrele(tvp);
 			goto err_out;
 		}
@@ -1323,9 +1323,9 @@ _xfs_cachedlookup(
 
 	if (flags & ISDOTDOT) {
 		VOP_UNLOCK(dvp, 0, td);
-		error = vn_lock(tvp, cnp->cn_lkflags, td);
+		error = vn_lock(tvp, cnp->cn_lkflags);
 		if (error) {
-			vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY, td);
+			vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY);
 			vrele(tvp);
 			goto err_out;
 		}
@@ -1334,7 +1334,7 @@ _xfs_cachedlookup(
 		*vpp = tvp;
 		KASSERT(tvp == dvp, ("not same directory"));
 	} else {
-		if ((error = vn_lock(tvp, cnp->cn_lkflags, td))) {
+		if ((error = vn_lock(tvp, cnp->cn_lkflags))) {
 			vrele(tvp);
 			goto err_out;
 		}