Index: sys/ufs/ufs/ufs_acl.c
===================================================================
--- sys/ufs/ufs/ufs_acl.c	(revision 199789)
+++ sys/ufs/ufs/ufs_acl.c	(working copy)
@@ -145,8 +145,7 @@ ufs_sync_inode_from_acl(struct acl *acl, struct in
  * or if any other error has occured.
  */
 static int
-ufs_get_oldacl(acl_type_t type, struct oldacl *old, struct vnode *vp,
-    struct thread *td)
+ufs_get_oldacl(acl_type_t type, struct oldacl *old, struct vnode *vp)
 {
 	int error, len;
 	struct inode *ip = VTOI(vp);
@@ -158,7 +157,7 @@ static int
 		error = vn_extattr_get(vp, IO_NODELOCKED,
 		    POSIX1E_ACL_ACCESS_EXTATTR_NAMESPACE,
 		    POSIX1E_ACL_ACCESS_EXTATTR_NAME, &len, (char *) old,
-		    td);
+		    curthread);
 		break;
 	case ACL_TYPE_DEFAULT:
 		if (vp->v_type != VDIR)
@@ -166,7 +165,7 @@ static int
 		error = vn_extattr_get(vp, IO_NODELOCKED,
 		    POSIX1E_ACL_DEFAULT_EXTATTR_NAMESPACE,
 		    POSIX1E_ACL_DEFAULT_EXTATTR_NAME, &len, (char *) old,
-		    td);
+		    curthread);
 		break;
 	default:
 		return (EINVAL);
@@ -216,7 +215,7 @@ ufs_getacl_posix1e(struct vop_getacl_args *ap)
 	/*
 	 * Attempt to retrieve the ACL from the extended attributes.
 	 */
-	error = ufs_get_oldacl(ap->a_type, old, ap->a_vp, ap->a_td);
+	error = ufs_get_oldacl(ap->a_type, old, ap->a_vp);
 	switch (error) {
 	/*
 	 * XXX: If ufs_getacl() should work on filesystems
@@ -278,7 +277,6 @@ ufs_getacl(ap)
 		acl_type_t type;
 		struct acl *aclp;
 		struct ucred *cred;
-		struct thread *td;
 	} */ *ap;
 {
 
@@ -314,7 +312,7 @@ ufs_setacl_posix1e(struct vop_setacl_args *ap)
 		 * Set operation.
 		 */
 		error = VOP_ACLCHECK(ap->a_vp, ap->a_type, ap->a_aclp,
-		    ap->a_cred, ap->a_td);
+		    ap->a_cred);
 		if (error != 0)
 			return (error);
 	} else {
@@ -341,7 +339,7 @@ ufs_setacl_posix1e(struct vop_setacl_args *ap)
 	/*
 	 * Must hold VADMIN (be file owner) or have appropriate privilege.
 	 */
-	if ((error = VOP_ACCESS(ap->a_vp, VADMIN, ap->a_cred, ap->a_td)))
+	if ((error = VOP_ACCESS(ap->a_vp, VADMIN, ap->a_cred, curthread)))
 		return (error);
 
 	switch(ap->a_type) {
@@ -352,7 +350,7 @@ ufs_setacl_posix1e(struct vop_setacl_args *ap)
 			error = vn_extattr_set(ap->a_vp, IO_NODELOCKED,
 			    POSIX1E_ACL_ACCESS_EXTATTR_NAMESPACE,
 			    POSIX1E_ACL_ACCESS_EXTATTR_NAME, sizeof(*old),
-			    (char *) old, ap->a_td);
+			    (char *) old, curthread);
 		}
 		free(old, M_ACL);
 		break;
@@ -361,7 +359,7 @@ ufs_setacl_posix1e(struct vop_setacl_args *ap)
 		if (ap->a_aclp == NULL) {
 			error = vn_extattr_rm(ap->a_vp, IO_NODELOCKED,
 			    POSIX1E_ACL_DEFAULT_EXTATTR_NAMESPACE,
-			    POSIX1E_ACL_DEFAULT_EXTATTR_NAME, ap->a_td);
+			    POSIX1E_ACL_DEFAULT_EXTATTR_NAME, curthread);
 			/*
 			 * Attempting to delete a non-present default ACL
 			 * will return success for portability purposes.
@@ -381,7 +379,7 @@ ufs_setacl_posix1e(struct vop_setacl_args *ap)
 				error = vn_extattr_set(ap->a_vp, IO_NODELOCKED,
 				    POSIX1E_ACL_DEFAULT_EXTATTR_NAMESPACE,
 				    POSIX1E_ACL_DEFAULT_EXTATTR_NAME,
-				    sizeof(*old), (char *) old, ap->a_td);
+				    sizeof(*old), (char *) old, curthread);
 			}
 			free(old, M_ACL);
 		}
@@ -419,7 +417,6 @@ ufs_setacl(ap)
 		acl_type_t type;
 		struct acl *aclp;
 		struct ucred *cred;
-		struct thread *td;
 	} */ *ap;
 {
 
@@ -467,7 +464,6 @@ ufs_aclcheck(ap)
 		acl_type_t type;
 		struct acl *aclp;
 		struct ucred *cred;
-		struct thread *td;
 	} */ *ap;
 {
 
Index: sys/ufs/ufs/ufs_vnops.c
===================================================================
--- sys/ufs/ufs/ufs_vnops.c	(revision 199789)
+++ sys/ufs/ufs/ufs_vnops.c	(working copy)
@@ -374,8 +374,7 @@ relock:
 #ifdef UFS_ACL
 	if ((vp->v_mount->mnt_flag & MNT_ACLS) != 0) {
 		acl = acl_alloc(M_WAITOK);
-		error = VOP_GETACL(vp, ACL_TYPE_ACCESS, acl, ap->a_cred,
-		    ap->a_td);
+		error = VOP_GETACL(vp, ACL_TYPE_ACCESS, acl, ap->a_cred);
 		switch (error) {
 		case EOPNOTSUPP:
 			error = vaccess(vp->v_type, ip->i_mode, ip->i_uid,
@@ -1517,8 +1516,7 @@ ufs_mkdir(ap)
 		/*
 		 * Retrieve default ACL from parent, if any.
 		 */
-		error = VOP_GETACL(dvp, ACL_TYPE_DEFAULT, acl, cnp->cn_cred,
-		    cnp->cn_thread);
+		error = VOP_GETACL(dvp, ACL_TYPE_DEFAULT, acl, cnp->cn_cred);
 		switch (error) {
 		case 0:
 			/*
@@ -1600,11 +1598,10 @@ ufs_mkdir(ap)
 		 * XXX: If we abort now, will Soft Updates notify the extattr
 		 * code that the EAs for the file need to be released?
 		 */
-		error = VOP_SETACL(tvp, ACL_TYPE_ACCESS, acl, cnp->cn_cred,
-		    cnp->cn_thread);
+		error = VOP_SETACL(tvp, ACL_TYPE_ACCESS, acl, cnp->cn_cred);
 		if (error == 0)
 			error = VOP_SETACL(tvp, ACL_TYPE_DEFAULT, dacl,
-			    cnp->cn_cred, cnp->cn_thread);
+			    cnp->cn_cred);
 		switch (error) {
 		case 0:
 			break;
@@ -2358,8 +2355,7 @@ ufs_makeinode(mode, dvp, vpp, cnp)
 		/*
 		 * Retrieve default ACL for parent, if any.
 		 */
-		error = VOP_GETACL(dvp, ACL_TYPE_DEFAULT, acl, cnp->cn_cred,
-		    cnp->cn_thread);
+		error = VOP_GETACL(dvp, ACL_TYPE_DEFAULT, acl, cnp->cn_cred);
 		switch (error) {
 		case 0:
 			/*
@@ -2443,8 +2439,7 @@ ufs_makeinode(mode, dvp, vpp, cnp)
 		 * XXX: If we abort now, will Soft Updates notify the extattr
 		 * code that the EAs for the file need to be released?
 		 */
-		error = VOP_SETACL(tvp, ACL_TYPE_ACCESS, acl, cnp->cn_cred,
-		    cnp->cn_thread);
+		error = VOP_SETACL(tvp, ACL_TYPE_ACCESS, acl, cnp->cn_cred);
 		switch (error) {
 		case 0:
 			break;
Index: sys/kern/vfs_acl.c
===================================================================
--- sys/kern/vfs_acl.c	(revision 199789)
+++ sys/kern/vfs_acl.c	(working copy)
@@ -225,7 +225,7 @@ vacl_set_acl(struct thread *td, struct vnode *vp,
 		goto out_unlock;
 #endif
 	error = VOP_SETACL(vp, acl_type_unold(type), inkernelacl,
-	    td->td_ucred, td);
+	    td->td_ucred);
 #ifdef MAC
 out_unlock:
 #endif
@@ -254,7 +254,7 @@ vacl_get_acl(struct thread *td, struct vnode *vp,
 		goto out;
 #endif
 	error = VOP_GETACL(vp, acl_type_unold(type), inkernelacl,
-	    td->td_ucred, td);
+	    td->td_ucred);
 
 #ifdef MAC
 out:
@@ -284,7 +284,7 @@ vacl_delete(struct thread *td, struct vnode *vp, a
 	if (error != 0)
 		goto out;
 #endif
-	error = VOP_SETACL(vp, acl_type_unold(type), 0, td->td_ucred, td);
+	error = VOP_SETACL(vp, acl_type_unold(type), 0, td->td_ucred);
 #ifdef MAC
 out:
 #endif
@@ -307,7 +307,7 @@ vacl_aclcheck(struct thread *td, struct vnode *vp,
 	error = acl_copyin(aclp, inkernelacl, type);
 	if (error != 0)
 		goto out;
-	error = VOP_ACLCHECK(vp, type, inkernelacl, td->td_ucred, td);
+	error = VOP_ACLCHECK(vp, type, inkernelacl, td->td_ucred);
 out:
 	acl_free(inkernelacl);
 	return (error);
Index: sys/kern/vnode_if.src
===================================================================
--- sys/kern/vnode_if.src	(revision 199789)
+++ sys/kern/vnode_if.src	(working copy)
@@ -491,7 +491,6 @@ vop_getacl {
 	IN acl_type_t type;
 	OUT struct acl *aclp;
 	IN struct ucred *cred;
-	IN struct thread *td;
 };
 
 
@@ -502,7 +501,6 @@ vop_setacl {
 	IN acl_type_t type;
 	IN struct acl *aclp;
 	IN struct ucred *cred;
-	IN struct thread *td;
 };
 
 
@@ -513,7 +511,6 @@ vop_aclcheck {
 	IN acl_type_t type;
 	IN struct acl *aclp;
 	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)
@@ -2065,7 +2065,7 @@ unionfs_getacl(struct vop_getacl_args *ap)
 
 	UNIONFS_INTERNAL_DEBUG("unionfs_getacl: enter\n");
 
-	error = VOP_GETACL(vp, ap->a_type, ap->a_aclp, ap->a_cred, ap->a_td);
+	error = VOP_GETACL(vp, ap->a_type, ap->a_aclp, ap->a_cred);
 
 	UNIONFS_INTERNAL_DEBUG("unionfs_getacl: leave (%d)\n", error);
 
@@ -2079,7 +2079,6 @@ unionfs_setacl(struct vop_setacl_args *ap)
 	struct unionfs_node *unp;
 	struct vnode   *uvp;
 	struct vnode   *lvp;
-	struct thread  *td;
 
 	UNIONFS_INTERNAL_DEBUG("unionfs_setacl: enter\n");
 
@@ -2089,19 +2088,18 @@ unionfs_setacl(struct vop_setacl_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_SETACL(uvp, ap->a_type, ap->a_aclp, ap->a_cred, td);
+		error = VOP_SETACL(uvp, ap->a_type, ap->a_aclp, ap->a_cred);
 
 	UNIONFS_INTERNAL_DEBUG("unionfs_setacl: leave (%d)\n", error);
 
@@ -2122,7 +2120,7 @@ unionfs_aclcheck(struct vop_aclcheck_args *ap)
 	unp = VTOUNIONFS(ap->a_vp);
 	vp = (unp->un_uppervp != NULLVP ? unp->un_uppervp : unp->un_lowervp);
 
-	error = VOP_ACLCHECK(vp, ap->a_type, ap->a_aclp, ap->a_cred, ap->a_td);
+	error = VOP_ACLCHECK(vp, ap->a_type, ap->a_aclp, ap->a_cred);
 
 	UNIONFS_INTERNAL_DEBUG("unionfs_aclcheck: leave (%d)\n", error);
 
Index: sys/fs/nfsclient/nfs_clvnops.c
===================================================================
--- sys/fs/nfsclient/nfs_clvnops.c	(revision 199789)
+++ sys/fs/nfsclient/nfs_clvnops.c	(working copy)
@@ -3144,10 +3144,10 @@ nfs_getacl(struct vop_getacl_args *ap)
 
 	if (ap->a_type != ACL_TYPE_NFS4)
 		return (EOPNOTSUPP);
-	error = nfsrpc_getacl(ap->a_vp, ap->a_cred, ap->a_td, ap->a_aclp,
+	error = nfsrpc_getacl(ap->a_vp, ap->a_cred, curthread, ap->a_aclp,
 	    NULL);
 	if (error > NFSERR_STALE) {
-		(void) nfscl_maperr(ap->a_td, error, (uid_t)0, (gid_t)0);
+		(void) nfscl_maperr(curthread, error, (uid_t)0, (gid_t)0);
 		error = EPERM;
 	}
 	return (error);
@@ -3160,10 +3160,10 @@ nfs_setacl(struct vop_setacl_args *ap)
 
 	if (ap->a_type != ACL_TYPE_NFS4)
 		return (EOPNOTSUPP);
-	error = nfsrpc_setacl(ap->a_vp, ap->a_cred, ap->a_td, ap->a_aclp,
+	error = nfsrpc_setacl(ap->a_vp, ap->a_cred, curthread, ap->a_aclp,
 	    NULL);
 	if (error > NFSERR_STALE) {
-		(void) nfscl_maperr(ap->a_td, error, (uid_t)0, (gid_t)0);
+		(void) nfscl_maperr(curthread, error, (uid_t)0, (gid_t)0);
 		error = EPERM;
 	}
 	return (error);
Index: sys/fs/nfs/nfs_commonacl.c
===================================================================
--- sys/fs/nfs/nfs_commonacl.c	(revision 199789)
+++ sys/fs/nfs/nfs_commonacl.c	(working copy)
@@ -702,9 +702,9 @@ nfsrv_setacl(vnode_t vp, NFSACL_T *aclp, struct uc
 	 */
 	if (aclp->acl_cnt > (ACL_MAX_ENTRIES - 6) / 2)
 		return (NFSERR_ATTRNOTSUPP);
-	error = VOP_ACLCHECK(vp, ACL_TYPE_NFS4, aclp, cred, p);
+	error = VOP_ACLCHECK(vp, ACL_TYPE_NFS4, aclp, cred);
 	if (!error)
-		error = VOP_SETACL(vp, ACL_TYPE_NFS4, aclp, cred, p);
+		error = VOP_SETACL(vp, ACL_TYPE_NFS4, aclp, cred);
 	return (error);
 }
 
Index: sys/fs/nfs/nfs_commonsubs.c
===================================================================
--- sys/fs/nfs/nfs_commonsubs.c	(revision 199789)
+++ sys/fs/nfs/nfs_commonsubs.c	(working copy)
@@ -1977,7 +1977,7 @@ nfsv4_fillattr(struct nfsrv_descript *nd, vnode_t
 			error = VOP_ACCESS(vp, VREAD_ACL, cred, p);
 			if (error == 0)
 				error = VOP_GETACL(vp, ACL_TYPE_NFS4, naclp,
-				    cred, p);
+				    cred);
 			NFSVOPUNLOCK(vp, 0, p);
 			if (error != 0) {
 				if (reterr) {
Index: sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
===================================================================
--- sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	(revision 199789)
+++ sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	(working copy)
@@ -4886,7 +4886,6 @@ zfs_freebsd_getacl(ap)
 		acl_type_t type;
 		struct acl *aclp;
 		struct ucred *cred;
-		struct thread *td;
 	} */ *ap;
 {
 	int		error;
@@ -4913,7 +4912,6 @@ zfs_freebsd_setacl(ap)
 		acl_type_t type;
 		struct acl *aclp;
 		struct ucred *cred;
-		struct thread *td;
 	} */ *ap;
 {
 	int		error;
@@ -4956,7 +4954,6 @@ zfs_freebsd_aclcheck(ap)
 		acl_type_t type;
 		struct acl *aclp;
 		struct ucred *cred;
-		struct thread *td;
 	} */ *ap;
 {