Index: sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c
===================================================================
--- sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c	(revision 199789)
+++ sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c	(working copy)
@@ -1160,7 +1160,6 @@ _xfs_ioctl(
 		caddr_t a_data;
 		int fflag;
 		struct ucred *cred;
-		struct thread *a_td;
 	} */ *ap)
 {
 /* 	struct vnode *vp = ap->a_vp; */
Index: sys/kern/vfs_vnops.c
===================================================================
--- sys/kern/vfs_vnops.c	(revision 199789)
+++ sys/kern/vfs_vnops.c	(working copy)
@@ -836,7 +836,7 @@ vn_ioctl(fp, com, data, active_cred, td)
 			error = 0;
 		else
 			error = VOP_IOCTL(vp, com, data, fp->f_flag,
-			    active_cred, td);
+			    active_cred);
 		break;
 
 	default:
Index: sys/kern/vnode_if.src
===================================================================
--- sys/kern/vnode_if.src	(revision 199789)
+++ sys/kern/vnode_if.src	(working copy)
@@ -217,7 +217,6 @@ vop_ioctl {
 	IN void *data;
 	IN int fflag;
 	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)
@@ -911,7 +911,7 @@ unionfs_ioctl(struct vop_ioctl_args *ap)
 
  	vn_lock(ap->a_vp, LK_EXCLUSIVE | LK_RETRY);
 	unp = VTOUNIONFS(ap->a_vp);
-	unionfs_get_node_status(unp, ap->a_td, &unsp);
+	unionfs_get_node_status(unp, curthread, &unsp);
 	ovp = (unsp->uns_upper_opencnt ? unp->un_uppervp : unp->un_lowervp);
 	unionfs_tryrem_node_status(unp, unsp);
 	VOP_UNLOCK(ap->a_vp, 0);
@@ -920,7 +920,7 @@ unionfs_ioctl(struct vop_ioctl_args *ap)
 		return (EBADF);
 
 	error = VOP_IOCTL(ovp, ap->a_command, ap->a_data, ap->a_fflag,
-	    ap->a_cred, ap->a_td);
+	    ap->a_cred);
 
 	UNIONFS_INTERNAL_DEBUG("unionfs_ioctl: leave (%d)\n", error);
 
Index: sys/fs/hpfs/hpfs_vnops.c
===================================================================
--- sys/fs/hpfs/hpfs_vnops.c	(revision 199789)
+++ sys/fs/hpfs/hpfs_vnops.c	(working copy)
@@ -108,7 +108,6 @@ hpfs_ioctl (
 		caddr_t a_data;
 		int a_fflag;
 		struct ucred *a_cred;
-		struct thread *a_td;
 	} */ *ap)
 {
 	register struct vnode *vp = ap->a_vp;
Index: sys/fs/coda/coda_vnops.c
===================================================================
--- sys/fs/coda/coda_vnops.c	(revision 199789)
+++ sys/fs/coda/coda_vnops.c	(working copy)
@@ -418,7 +418,6 @@ coda_ioctl(struct vop_ioctl_args *ap)
 	caddr_t data = ap->a_data;
 	int flag = ap->a_fflag;
 	struct ucred *cred = ap->a_cred;
-	struct thread *td = ap->a_td;
 	/* locals */
 	int error;
 	struct vnode *tvp;
@@ -448,7 +447,7 @@ coda_ioctl(struct vop_ioctl_args *ap)
 	 * sooner or later anyway, right?
 	 */
 	NDINIT(&ndp, LOOKUP, (iap->follow ? FOLLOW : NOFOLLOW),
-	    UIO_USERSPACE, iap->path, td);
+	    UIO_USERSPACE, iap->path, curthread);
 	error = namei(&ndp);
 	tvp = ndp.ni_vp;
 	if (error) {
@@ -476,7 +475,7 @@ coda_ioctl(struct vop_ioctl_args *ap)
 		return (EINVAL);
 	}
 	error = venus_ioctl(vtomi(tvp), &((VTOC(tvp))->c_fid), com, flag,
-	    data, cred, td->td_proc);
+	    data, cred, curproc);
 	if (error)
 		MARK_INT_FAIL(CODA_IOCTL_STATS);
 	else
Index: sys/fs/devfs/devfs_rule.c
===================================================================
--- sys/fs/devfs/devfs_rule.c	(revision 199789)
+++ sys/fs/devfs/devfs_rule.c	(working copy)
@@ -152,7 +152,7 @@ devfs_rules_apply(struct devfs_mount *dm, struct d
  * Rule subsystem ioctl hook.
  */
 int
-devfs_rules_ioctl(struct devfs_mount *dm, u_long cmd, caddr_t data, struct thread *td)
+devfs_rules_ioctl(struct devfs_mount *dm, u_long cmd, caddr_t data)
 {
 	struct devfs_ruleset *ds;
 	struct devfs_krule *dk;
@@ -170,7 +170,7 @@ int
 	 *
 	 * We could make this privileges finer grained if desired.
 	 */
-	error = priv_check(td, PRIV_DEVFS_RULE);
+	error = priv_check(curthread, PRIV_DEVFS_RULE);
 	if (error)
 		return (error);
 
Index: sys/fs/devfs/devfs.h
===================================================================
--- sys/fs/devfs/devfs.h	(revision 199789)
+++ sys/fs/devfs/devfs.h	(working copy)
@@ -171,7 +171,7 @@ extern unsigned devfs_rule_depth;
 
 void devfs_rules_apply(struct devfs_mount *dm, struct devfs_dirent *de);
 void devfs_rules_cleanup (struct devfs_mount *dm);
-int devfs_rules_ioctl(struct devfs_mount *dm, u_long cmd, caddr_t data, struct thread *td);
+int devfs_rules_ioctl(struct devfs_mount *dm, u_long cmd, caddr_t data);
 int devfs_allocv (struct devfs_dirent *de, struct mount *mp,
     struct vnode **vpp);
 void devfs_delete(struct devfs_mount *dm, struct devfs_dirent *de, int vp_locked);
Index: sys/fs/devfs/devfs_vnops.c
===================================================================
--- sys/fs/devfs/devfs_vnops.c	(revision 199789)
+++ sys/fs/devfs/devfs_vnops.c	(working copy)
@@ -1318,7 +1318,7 @@ devfs_rioctl(struct vop_ioctl_args *ap)
 		devfs_unmount_final(dmp);
 		return (ENOENT);
 	}
-	error = devfs_rules_ioctl(dmp, ap->a_command, ap->a_data, ap->a_td);
+	error = devfs_rules_ioctl(dmp, ap->a_command, ap->a_data);
 	sx_xunlock(&dmp->dm_lock);
 	return (error);
 }
Index: sys/fs/smbfs/smbfs_vnops.c
===================================================================
--- sys/fs/smbfs/smbfs_vnops.c	(revision 199789)
+++ sys/fs/smbfs/smbfs_vnops.c	(working copy)
@@ -874,7 +874,6 @@ smbfs_ioctl(ap)
 		caddr_t a_data;
 		int fflag;
 		struct ucred *cred;
-		struct thread *td;
 	} */ *ap;
 {
 	return ENOTTY;
Index: sys/fs/cd9660/cd9660_vnops.c
===================================================================
--- sys/fs/cd9660/cd9660_vnops.c	(revision 199789)
+++ sys/fs/cd9660/cd9660_vnops.c	(working copy)
@@ -248,7 +248,6 @@ cd9660_ioctl(ap)
 		caddr_t  a_data;
 		int  a_fflag;
 		struct ucred *a_cred;
-		struct thread *a_td;
 	} */ *ap;
 {
 	struct vnode *vp;
Index: sys/fs/nwfs/nwfs_ioctl.c
===================================================================
--- sys/fs/nwfs/nwfs_ioctl.c	(revision 199789)
+++ sys/fs/nwfs/nwfs_ioctl.c	(working copy)
@@ -53,11 +53,10 @@ nwfs_ioctl(ap)
 		caddr_t a_data;
 		int fflag;
 		struct ucred *cred;
-		struct thread *td;
 	} */ *ap;
 {
 	int error;
-	struct thread *td = ap->a_td;
+	struct thread *td = curthread;
 	struct ucred *cred = ap->a_cred;
 	struct vnode *vp = ap->a_vp;
 	struct nwnode *np = VTONW(vp);
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)
@@ -3946,7 +3946,6 @@ zfs_freebsd_ioctl(ap)
 		caddr_t a_data;
 		int a_fflag;
 		struct ucred *cred;
-		struct thread *td;
 	} */ *ap;
 {