Index: sys/kern/vnode_if.src
===================================================================
--- sys/kern/vnode_if.src	(revision 199789)
+++ sys/kern/vnode_if.src	(working copy)
@@ -590,7 +590,6 @@ vop_setlabel {
 	IN struct vnode *vp;
 	IN struct label *label;
 	IN struct ucred *cred;
-	IN struct thread *td;
 };
 
 
Index: sys/fs/unionfs/union_vnops.c
===================================================================
--- sys/fs/unionfs/union_vnops.c	(revision 199789)
+++ sys/fs/unionfs/union_vnops.c	(working copy)
@@ -2382,7 +2382,6 @@ unionfs_setlabel(struct vop_setlabel_args *ap)
 	struct unionfs_node *unp;
 	struct vnode   *uvp;
 	struct vnode   *lvp;
-	struct thread  *td;
 
 	UNIONFS_INTERNAL_DEBUG("unionfs_setlabel: enter\n");
 
@@ -2392,19 +2391,18 @@ unionfs_setlabel(struct vop_setlabel_args *ap)
 	unp = VTOUNIONFS(ap->a_vp);
 	uvp = unp->un_uppervp;
 	lvp = unp->un_lowervp;
-	td = ap->a_td;
 
 	if (ap->a_vp->v_mount->mnt_flag & MNT_RDONLY)
 		return (EROFS);
 
 	if (uvp == NULLVP && lvp->v_type == VREG) {
-		if ((error = unionfs_copyfile(unp, 1, ap->a_cred, td)) != 0)
+		if ((error = unionfs_copyfile(unp, 1, ap->a_cred, curthread)) != 0)
 			return (error);
 		uvp = unp->un_uppervp;
 	}
 
 	if (uvp != NULLVP)
-		error = VOP_SETLABEL(uvp, ap->a_label, ap->a_cred, td);
+		error = VOP_SETLABEL(uvp, ap->a_label, ap->a_cred);
 
 	UNIONFS_INTERNAL_DEBUG("unionfs_setlabel: leave (%d)\n", error);
 
Index: sys/security/mac/mac_vfs.c
===================================================================
--- sys/security/mac/mac_vfs.c	(revision 199789)
+++ sys/security/mac/mac_vfs.c	(working copy)
@@ -1061,7 +1061,7 @@ vn_setlabel(struct vnode *vp, struct label *intlab
 	if (error)
 		return (error);
 
-	error = VOP_SETLABEL(vp, intlabel, cred, curthread);
+	error = VOP_SETLABEL(vp, intlabel, cred);
 	if (error)
 		return (error);