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>

1 files changed, 4 insertions, 4 deletions

diff --git a/sys/fs/coda/coda_vnops.c b/sys/fs/coda/coda_vnops.c
index 51f9d62..fe0b2c9 100644
--- a/sys/fs/coda/coda_vnops.c
+++ b/sys/fs/coda/coda_vnops.c
@@ -922,7 +922,7 @@ coda_lookup(struct vop_lookup_args *ap)
      */
     if (!error || (error == EJUSTRETURN)) {
 	if (cnp->cn_flags & ISDOTDOT) {
-	    if ((error = VOP_UNLOCK(dvp, 0, td))) {
+	    if ((error = VOP_UNLOCK(dvp, 0))) {
 		return error; 
 	    }	    
 	    /* 
@@ -930,7 +930,7 @@ coda_lookup(struct vop_lookup_args *ap)
 	     * lock it without bothering to check anything else. 
 	     */
 	    if (*ap->a_vpp) {
-		if ((error = VOP_LOCK(*ap->a_vpp, LK_EXCLUSIVE, td))) {
+		if ((error = VOP_LOCK(*ap->a_vpp, LK_EXCLUSIVE))) {
 		    vn_lock(dvp, LK_RETRY|LK_EXCLUSIVE);
 		    return (error);
 		}
@@ -940,7 +940,7 @@ coda_lookup(struct vop_lookup_args *ap)
 	    /* The parent is locked, and may be the same as the child */
 	    if (*ap->a_vpp && (*ap->a_vpp != dvp)) {
 		/* Different, go ahead and lock it. */
-		if ((error = VOP_LOCK(*ap->a_vpp, LK_EXCLUSIVE, td))) {
+		if ((error = VOP_LOCK(*ap->a_vpp, LK_EXCLUSIVE))) {
 		    return (error);
 		}
 	    }
@@ -1026,7 +1026,7 @@ coda_create(struct vop_create_args *ap)
 
     if (!error) {
 	if (cnp->cn_flags & LOCKLEAF) {
-	    if ((error = VOP_LOCK(*ap->a_vpp, LK_EXCLUSIVE, td))) {
+	    if ((error = VOP_LOCK(*ap->a_vpp, LK_EXCLUSIVE))) {
 		printf("coda_create: ");
 		panic("unlocked parent but couldn't lock child");
 	    }