--- //depot/vendor/freebsd/src/sys/compat/linprocfs/linprocfs.c	2007/11/29 06:35:55
+++ //depot/user/attilio/attilio_schedlock/compat/linprocfs/linprocfs.c	2008/01/08 16:10:31
@@ -933,7 +933,7 @@
 			if (vp) {
 				vn_fullpath(td, vp, &name, &freename);
 				locked = VFS_LOCK_GIANT(vp->v_mount);
-				vn_lock(vp, LK_SHARED | LK_RETRY, td);
+				vn_lock(vp, LK_SHARED | LK_RETRY);
 				VOP_GETATTR(vp, &vat, td->td_ucred, td);
 				ino = vat.va_fileid;
 				vput(vp);
--- //depot/vendor/freebsd/src/sys/compat/linux/linux_file.c	2007/12/29 14:30:37
+++ //depot/user/attilio/attilio_schedlock/compat/linux/linux_file.c	2008/01/08 16:10:31
@@ -452,7 +452,7 @@
 	buflen = max(LINUX_DIRBLKSIZ, nbytes);
 	buflen = min(buflen, MAXBSIZE);
 	buf = malloc(buflen, M_TEMP, M_WAITOK);
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 
 again:
 	aiov.iov_base = buf;
--- //depot/vendor/freebsd/src/sys/compat/linux/linux_getcwd.c	2007/10/24 19:06:35
+++ //depot/user/attilio/attilio_schedlock/compat/linux/linux_getcwd.c	2008/01/08 16:10:31
@@ -325,7 +325,7 @@
 	 *	uvp is either NULL, or locked and held.
 	 */
 
-	error = vn_lock(lvp, LK_EXCLUSIVE | LK_RETRY, td);
+	error = vn_lock(lvp, LK_EXCLUSIVE | LK_RETRY);
 	if (error != 0)
 		panic("vn_lock LK_RETRY returned error %d", error);
 	if (bufp)
@@ -378,7 +378,7 @@
 				goto out;
 			}
 			VREF(lvp);
-			error = vn_lock(lvp, LK_EXCLUSIVE | LK_RETRY, td);
+			error = vn_lock(lvp, LK_EXCLUSIVE | LK_RETRY);
 			if (error != 0)
 				panic("vn_lock LK_RETRY returned %d", error);
 		}
--- //depot/vendor/freebsd/src/sys/compat/opensolaris/kern/opensolaris_kobj.c	2007/05/31 11:58:14
+++ //depot/user/attilio/attilio_schedlock/compat/opensolaris/kern/opensolaris_kobj.c	2008/01/08 16:10:31
@@ -123,7 +123,7 @@
 	struct vattr va;
 	int error;
 
-	vn_lock(vp, LK_SHARED | LK_RETRY, td);
+	vn_lock(vp, LK_SHARED | LK_RETRY);
 	error = VOP_GETATTR(vp, &va, td->td_ucred, td);
 	VOP_UNLOCK(vp, 0, td);
 	if (error == 0)
@@ -176,7 +176,7 @@
 	auio.uio_resid = size;
 	auio.uio_td = td;
 
-	vn_lock(vp, LK_SHARED | LK_RETRY, td);
+	vn_lock(vp, LK_SHARED | LK_RETRY);
 	error = VOP_READ(vp, &auio, IO_UNIT | IO_SYNC, td->td_ucred);
 	VOP_UNLOCK(vp, 0, td);
 	return (error != 0 ? -1 : size - auio.uio_resid);
--- //depot/vendor/freebsd/src/sys/compat/opensolaris/kern/opensolaris_vfs.c	2007/11/01 09:02:41
+++ //depot/user/attilio/attilio_schedlock/compat/opensolaris/kern/opensolaris_vfs.c	2008/01/08 16:10:31
@@ -192,7 +192,7 @@
 	/*
 	 * Allocate and initialize the filesystem.
 	 */
-	vn_lock(vp, LK_SHARED | LK_RETRY, td);
+	vn_lock(vp, LK_SHARED | LK_RETRY);
 	mp = vfs_mount_alloc(vp, vfsp, fspath, td);
 	VOP_UNLOCK(vp, 0, td);
 
@@ -238,7 +238,7 @@
 	 * mnt_optnew.
 	*/
 	mp->mnt_optnew = NULL;
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	/*
 	 * Put the new filesystem on the mount list after root.
 	 */
--- //depot/vendor/freebsd/src/sys/compat/opensolaris/sys/vnode.h	2007/05/31 11:58:14
+++ //depot/user/attilio/attilio_schedlock/compat/opensolaris/sys/vnode.h	2008/01/08 16:10:31
@@ -222,7 +222,7 @@
 	vfslocked = VFS_LOCK_GIANT(vp->v_mount);
 	if ((error = vn_start_write(vp, &mp, V_WAIT | PCATCH)) != 0)
 		goto drop;
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	error = VOP_FSYNC(vp, MNT_WAIT, td);
 	VOP_UNLOCK(vp, 0, td);
 	vn_finished_write(mp);
--- //depot/vendor/freebsd/src/sys/compat/pecoff/imgact_pecoff.c	2007/11/05 11:44:38
+++ //depot/user/attilio/attilio_schedlock/compat/pecoff/imgact_pecoff.c	2008/01/08 16:10:31
@@ -598,7 +598,7 @@
 	error = exec_pecoff_coff_makecmds(imgp, fp, peofs);
 fail:   
 	free(fp, M_TEMP);
-        vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY, td);
+        vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY);
 	return error;
 }
 
--- //depot/vendor/freebsd/src/sys/compat/svr4/imgact_svr4.c	2007/11/05 11:44:38
+++ //depot/user/attilio/attilio_schedlock/compat/svr4/imgact_svr4.c	2008/01/08 16:10:31
@@ -231,7 +231,7 @@
     
     imgp->proc->p_sysent = &svr4_sysvec;
 fail:
-    vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY, td);
+    vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY);
     return (error);
 }
 
--- //depot/vendor/freebsd/src/sys/compat/svr4/svr4_fcntl.c	2007/10/24 19:06:35
+++ //depot/user/attilio/attilio_schedlock/compat/svr4/svr4_fcntl.c	2008/01/08 16:10:31
@@ -270,7 +270,7 @@
 	}
 
 #ifdef MAC
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	error = mac_vnode_check_revoke(td->td_ucred, vp);
 	VOP_UNLOCK(vp, 0, td);
 	if (error)
--- //depot/vendor/freebsd/src/sys/compat/svr4/svr4_misc.c	2007/10/24 19:06:35
+++ //depot/user/attilio/attilio_schedlock/compat/svr4/svr4_misc.c	2008/01/08 16:10:31
@@ -278,7 +278,7 @@
 	buflen = max(DIRBLKSIZ, nbytes);
 	buflen = min(buflen, MAXBSIZE);
 	buf = malloc(buflen, M_TEMP, M_WAITOK);
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 again:
 	aiov.iov_base = buf;
 	aiov.iov_len = buflen;
@@ -447,7 +447,7 @@
 
 	buflen = min(MAXBSIZE, uap->nbytes);
 	buf = malloc(buflen, M_TEMP, M_WAITOK);
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	off = fp->f_offset;
 again:
 	aiov.iov_base = buf;
@@ -620,7 +620,7 @@
 	VREF(vp);
 	fdrop(fp, td);
 	vfslocked = VFS_LOCK_GIANT(vp->v_mount);
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	error = change_dir(vp, td);
 	if (error)
 		goto fail;
--- //depot/vendor/freebsd/src/sys/contrib/opensolaris/uts/common/fs/gfs.c	2007/05/23 21:34:08
+++ //depot/user/attilio/attilio_schedlock/contrib/opensolaris/uts/common/fs/gfs.c	2008/01/08 16:10:31
@@ -321,7 +321,7 @@
 			VN_HOLD(pvp);
 			*vpp = pvp;
 		}
-		vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY, curthread);
+		vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY);
 		return (0);
 	}
 
--- //depot/vendor/freebsd/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c	2007/06/04 11:37:41
+++ //depot/user/attilio/attilio_schedlock/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c	2008/01/08 16:10:31
@@ -429,7 +429,7 @@
 
 	err = zfsctl_root_lookup(dvp, nm, vpp, NULL, 0, NULL, cr);
 	if (err == 0 && (nm[0] != '.' || nm[1] != '\0'))
-		vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY, ap->a_cnp->cn_thread);
+		vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY);
 
 	return (err);
 }
@@ -692,7 +692,7 @@
 			 */
 			goto domount;
 		}
-		vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY, ap->a_cnp->cn_thread);
+		vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY);
 		mutex_exit(&sdp->sd_lock);
 		ZFS_EXIT(zfsvfs);
 		return (0);
@@ -732,7 +732,7 @@
 	kmem_free(mountpoint, mountpoint_len);
 	/* FreeBSD: This line was moved from below to avoid a lock recursion. */
 	if (err == 0)
-		vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY, curthread);
+		vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY);
 	mutex_exit(&sdp->sd_lock);
 
 	/*
--- //depot/vendor/freebsd/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c	2007/05/28 00:32:52
+++ //depot/user/attilio/attilio_schedlock/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c	2008/01/08 16:10:31
@@ -109,7 +109,7 @@
 	cn.cn_thread = curthread;
 	cn.cn_flags = SAVENAME;
 
-	vn_lock(ZTOV(dzp), LK_EXCLUSIVE | LK_RETRY, curthread);
+	vn_lock(ZTOV(dzp), LK_EXCLUSIVE | LK_RETRY);
 	switch ((int)lr->lr_common.lrc_txtype) {
 	case TX_CREATE:
 		error = VOP_CREATE(ZTOV(dzp), &vp, &cn, &va);
@@ -162,7 +162,7 @@
 	cn.cn_lkflags = LK_EXCLUSIVE | LK_RETRY;
 	cn.cn_cred = kcred;
 	cn.cn_thread = curthread;
-	vn_lock(ZTOV(dzp), LK_EXCLUSIVE | LK_RETRY, curthread);
+	vn_lock(ZTOV(dzp), LK_EXCLUSIVE | LK_RETRY);
 	error = VOP_LOOKUP(ZTOV(dzp), &vp, &cn);
 	if (error != 0) {
 		VOP_UNLOCK(ZTOV(dzp), 0, curthread);
@@ -211,8 +211,8 @@
 	cn.cn_thread = curthread;
 	cn.cn_flags = SAVENAME;
 
-	vn_lock(ZTOV(dzp), LK_EXCLUSIVE | LK_RETRY, curthread);
-	vn_lock(ZTOV(zp), LK_EXCLUSIVE | LK_RETRY, curthread);
+	vn_lock(ZTOV(dzp), LK_EXCLUSIVE | LK_RETRY);
+	vn_lock(ZTOV(zp), LK_EXCLUSIVE | LK_RETRY);
 	error = VOP_LINK(ZTOV(dzp), ZTOV(zp), &cn);
 	VOP_UNLOCK(ZTOV(zp), 0, curthread);
 	VOP_UNLOCK(ZTOV(dzp), 0, curthread);
@@ -255,7 +255,7 @@
 	scn.cn_lkflags = LK_EXCLUSIVE | LK_RETRY;
 	scn.cn_cred = kcred;
 	scn.cn_thread = td;
-	vn_lock(ZTOV(sdzp), LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(ZTOV(sdzp), LK_EXCLUSIVE | LK_RETRY);
 	error = VOP_LOOKUP(ZTOV(sdzp), &svp, &scn);
 	VOP_UNLOCK(ZTOV(sdzp), 0, td);
 	if (error != 0)
@@ -270,7 +270,7 @@
 	tcn.cn_lkflags = LK_EXCLUSIVE | LK_RETRY;
 	tcn.cn_cred = kcred;
 	tcn.cn_thread = td;
-	vn_lock(ZTOV(tdzp), LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(ZTOV(tdzp), LK_EXCLUSIVE | LK_RETRY);
 	error = VOP_LOOKUP(ZTOV(tdzp), &tvp, &tcn);
 	if (error == EJUSTRETURN)
 		tvp = NULL;
@@ -360,7 +360,7 @@
 	ZFS_TIME_DECODE(&va.va_mtime, lr->lr_mtime);
 
 	vp = ZTOV(zp);
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, curthread);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	error = VOP_SETATTR(vp, &va, kcred, curthread);
 	VOP_UNLOCK(vp, 0, curthread);
 	VN_RELE(vp);
--- //depot/vendor/freebsd/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c	2007/09/10 20:02:58
+++ //depot/user/attilio/attilio_schedlock/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c	2008/01/08 16:10:31
@@ -663,7 +663,7 @@
 	error = zfs_zget(zfsvfs, zfsvfs->z_root, &rootzp);
 	if (error == 0) {
 		*vpp = ZTOV(rootzp);
-		error = vn_lock(*vpp, flags, td);
+		error = vn_lock(*vpp, flags);
 		(*vpp)->v_vflag |= VV_ROOT;
 	}
 
@@ -763,7 +763,7 @@
 		*vpp = NULL;
 	else {
 		*vpp = ZTOV(zp);
-		vn_lock(*vpp, flags, curthread);
+		vn_lock(*vpp, flags);
 	}
 	ZFS_EXIT(zfsvfs);
 	return (err);
@@ -830,7 +830,7 @@
 		}
 		ZFS_EXIT(zfsvfs);
 		/* XXX: LK_RETRY? */
-		vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY, td);
+		vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY);
 		return (0);
 	}
 
@@ -853,7 +853,7 @@
 
 	*vpp = ZTOV(zp);
 	/* XXX: LK_RETRY? */
-	vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY);
 	vnode_create_vobject(*vpp, zp->z_phys->zp_size, td);
 	ZFS_EXIT(zfsvfs);
 	return (0);
--- //depot/vendor/freebsd/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	2007/07/24 15:02:33
+++ //depot/user/attilio/attilio_schedlock/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	2008/01/08 16:10:31
@@ -1116,9 +1116,9 @@
 			ltype = VOP_ISLOCKED(dvp, td);
 			VOP_UNLOCK(dvp, 0, td);
 		}
-		error = vn_lock(*vpp, cnp->cn_lkflags, td);
+		error = vn_lock(*vpp, cnp->cn_lkflags);
 		if (cnp->cn_flags & ISDOTDOT)
-			vn_lock(dvp, ltype | LK_RETRY, td);
+			vn_lock(dvp, ltype | LK_RETRY);
 		if (error != 0) {
 			VN_RELE(*vpp);
 			*vpp = NULL;
@@ -1302,7 +1302,7 @@
 
 	if (error == 0) {
 		*vpp = ZTOV(zp);
-		vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY, td);
+		vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY);
 	}
 
 	if (dl)
@@ -1584,7 +1584,7 @@
 	zfs_log_create(zilog, tx, TX_MKDIR, dzp, zp, dirname);
 	dmu_tx_commit(tx);
 
-	vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY, curthread);
+	vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY);
 
 	zfs_dirent_unlock(dl);
 
@@ -2769,7 +2769,7 @@
 	if (error == 0) {
 		zfs_log_symlink(zilog, tx, TX_SYMLINK, dzp, zp, name, link);
 		*vpp = ZTOV(zp);
-		vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY, td);
+		vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY);
 	}
 
 	dmu_tx_commit(tx);
--- //depot/vendor/freebsd/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c	2007/11/02 00:36:26
+++ //depot/user/attilio/attilio_schedlock/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c	2008/01/08 16:10:31
@@ -85,7 +85,7 @@
 		ZTOV(zp) = NULL;
 		vhold(vp);
 		mutex_exit(&zp->z_lock);
-		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, curthread);
+		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 		vrecycle(vp, curthread);
 		VOP_UNLOCK(vp, 0, curthread);
 		vdrop(vp);
--- //depot/vendor/freebsd/src/sys/dev/hwpmc/hwpmc_mod.c	2007/12/07 08:20:59
+++ //depot/user/attilio/attilio_schedlock/dev/hwpmc/hwpmc_mod.c	2008/01/08 16:10:31
@@ -683,7 +683,7 @@
 	td = curthread;
 	*fullpath = "unknown";
 	*freepath = NULL;
-	vn_lock(v, LK_CANRECURSE | LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(v, LK_CANRECURSE | LK_EXCLUSIVE | LK_RETRY);
 	vn_fullpath(td, v, fullpath, freepath);
 	VOP_UNLOCK(v, 0, td);
 }
--- //depot/vendor/freebsd/src/sys/dev/md/md.c	2007/11/07 22:51:47
+++ //depot/user/attilio/attilio_schedlock/dev/md/md.c	2008/01/08 16:10:31
@@ -530,7 +530,7 @@
 	if (bp->bio_cmd == BIO_FLUSH) {
 		vfslocked = VFS_LOCK_GIANT(vp->v_mount);
 		(void) vn_start_write(vp, &mp, V_WAIT);
-		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 		error = VOP_FSYNC(vp, MNT_WAIT, td);
 		VOP_UNLOCK(vp, 0, td);
 		vn_finished_write(mp);
@@ -560,12 +560,12 @@
 	 */
 	vfslocked = VFS_LOCK_GIANT(vp->v_mount);
 	if (bp->bio_cmd == BIO_READ) {
-		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 		error = VOP_READ(vp, &auio, IO_DIRECT, sc->cred);
 		VOP_UNLOCK(vp, 0, td);
 	} else {
 		(void) vn_start_write(vp, &mp, V_WAIT);
-		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 		error = VOP_WRITE(vp, &auio, sc->flags & MD_ASYNC ? 0 : IO_SYNC,
 		    sc->cred);
 		VOP_UNLOCK(vp, 0, td);
@@ -895,7 +895,7 @@
 		auio.uio_rw = UIO_READ;
 		auio.uio_segflg = UIO_SYSSPACE;
 		auio.uio_resid = aiov.iov_len;
-		vn_lock(sc->vnode, LK_EXCLUSIVE | LK_RETRY, curthread);
+		vn_lock(sc->vnode, LK_EXCLUSIVE | LK_RETRY);
 		error = VOP_READ(sc->vnode, &auio, 0, sc->cred);
 		VOP_UNLOCK(sc->vnode, 0, curthread);
 		free(tmpbuf, M_TEMP);
@@ -947,7 +947,7 @@
 
 	error = mdsetcred(sc, td->td_ucred);
 	if (error != 0) {
-		vn_lock(nd.ni_vp, LK_EXCLUSIVE | LK_RETRY, td);
+		vn_lock(nd.ni_vp, LK_EXCLUSIVE | LK_RETRY);
 		nd.ni_vp->v_vflag &= ~VV_MD;
 		VOP_UNLOCK(nd.ni_vp, 0, td);
 		(void)vn_close(nd.ni_vp, flags, td->td_ucred, td);
@@ -984,7 +984,7 @@
 	mtx_destroy(&sc->queue_mtx);
 	if (sc->vnode != NULL) {
 		vfslocked = VFS_LOCK_GIANT(sc->vnode->v_mount);
-		vn_lock(sc->vnode, LK_EXCLUSIVE | LK_RETRY, td);
+		vn_lock(sc->vnode, LK_EXCLUSIVE | LK_RETRY);
 		sc->vnode->v_vflag &= ~VV_MD;
 		VOP_UNLOCK(sc->vnode, 0, td);
 		(void)vn_close(sc->vnode, sc->flags & MD_READONLY ?
--- //depot/vendor/freebsd/src/sys/fs/cd9660/cd9660_lookup.c	2007/02/11 13:56:41
+++ //depot/user/attilio/attilio_schedlock/fs/cd9660/cd9660_lookup.c	2008/01/08 16:10:31
@@ -354,7 +354,7 @@
 					     LK_EXCLUSIVE, &tdp,
 					     saved_ino != ino, ep);
 		brelse(bp);
-		vn_lock(pdp, LK_EXCLUSIVE | LK_RETRY, td);
+		vn_lock(pdp, LK_EXCLUSIVE | LK_RETRY);
 		if (error)
 			return (error);
 		*vpp = tdp;
--- //depot/vendor/freebsd/src/sys/fs/cd9660/cd9660_vfsops.c	2007/10/16 10:57:02
+++ //depot/user/attilio/attilio_schedlock/fs/cd9660/cd9660_vfsops.c	2008/01/08 16:10:31
@@ -170,7 +170,7 @@
 	 * or has superuser abilities
 	 */
 	accessmode = VREAD;
-	vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY);
 	error = VOP_ACCESS(devvp, accessmode, td->td_ucred, td);
 	if (error)
 		error = priv_check(td, PRIV_VFS_MOUNT_PERM);
@@ -224,7 +224,7 @@
 	struct bufobj *bo;
 	char *cs_local, *cs_disk;
 
-	vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY);
 	DROP_GIANT();
 	g_topology_lock();
 	error = g_vfs_open(devvp, &cp, "cd9660", 0);
--- //depot/vendor/freebsd/src/sys/fs/coda/coda_vfsops.c	2007/10/16 10:57:02
+++ //depot/user/attilio/attilio_schedlock/fs/coda/coda_vfsops.c	2008/01/08 16:10:31
@@ -297,7 +297,7 @@
 		/* On Mach, this is vref.  On NetBSD, VOP_LOCK */
 #if	1
 		vref(*vpp);
-		vn_lock(*vpp, LK_EXCLUSIVE, td);
+		vn_lock(*vpp, LK_EXCLUSIVE);
 #else
 		vget(*vpp, LK_EXCLUSIVE, td);
 #endif
@@ -320,7 +320,7 @@
 	*vpp = mi->mi_rootvp;
 #if	1
 	vref(*vpp);
-	vn_lock(*vpp, LK_EXCLUSIVE, td);
+	vn_lock(*vpp, LK_EXCLUSIVE);
 #else
 	vget(*vpp, LK_EXCLUSIVE, td);
 #endif
@@ -340,7 +340,7 @@
 	*vpp = mi->mi_rootvp;
 #if	1
 	vref(*vpp);
-	vn_lock(*vpp, LK_EXCLUSIVE, td);
+	vn_lock(*vpp, LK_EXCLUSIVE);
 #else
 	vget(*vpp, LK_EXCLUSIVE, td);
 #endif
--- //depot/vendor/freebsd/src/sys/fs/coda/coda_vnops.c	2007/07/20 11:17:45
+++ //depot/user/attilio/attilio_schedlock/fs/coda/coda_vnops.c	2008/01/08 16:10:31
@@ -931,11 +931,11 @@
 	     */
 	    if (*ap->a_vpp) {
 		if ((error = VOP_LOCK(*ap->a_vpp, LK_EXCLUSIVE, td))) {
-		    vn_lock(dvp, LK_RETRY|LK_EXCLUSIVE, td);
+		    vn_lock(dvp, LK_RETRY|LK_EXCLUSIVE);
 		    return (error);
 		}
 	    }
-	    vn_lock(dvp, LK_RETRY|LK_EXCLUSIVE, td);
+	    vn_lock(dvp, LK_RETRY|LK_EXCLUSIVE);
 	} else {
 	    /* The parent is locked, and may be the same as the child */
 	    if (*ap->a_vpp && (*ap->a_vpp != dvp)) {
--- //depot/vendor/freebsd/src/sys/fs/devfs/devfs_devs.c	2007/10/24 19:06:35
+++ //depot/user/attilio/attilio_schedlock/fs/devfs/devfs_devs.c	2008/01/08 16:10:31
@@ -259,7 +259,7 @@
 		vholdl(vp);
 		sx_unlock(&dm->dm_lock);
 		if (!vp_locked)
-			vn_lock(vp, LK_EXCLUSIVE | LK_INTERLOCK | LK_RETRY, td);
+			vn_lock(vp, LK_EXCLUSIVE | LK_INTERLOCK | LK_RETRY);
 		else
 			VI_UNLOCK(vp);
 		vgone(vp);
--- //depot/vendor/freebsd/src/sys/fs/devfs/devfs_vnops.c	2008/01/08 04:51:46
+++ //depot/user/attilio/attilio_schedlock/fs/devfs/devfs_vnops.c	2008/01/08 16:13:01
@@ -247,7 +247,7 @@
 	} else {
 		vp->v_type = VBAD;
 	}
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	mtx_lock(&devfs_de_interlock);
 	vp->v_data = de;
 	de->de_vnode = vp;
@@ -372,7 +372,7 @@
 		error = dsw->d_close(dev, ap->a_fflag, S_IFCHR, td);
 	}
 	dev_relthread(dev);
-	vn_lock(vp, vp_locked | LK_RETRY, td);
+	vn_lock(vp, vp_locked | LK_RETRY);
 	vdrop(vp);
 	return (error);
 }
@@ -593,7 +593,7 @@
 		de = de->de_dir;
 		error = devfs_allocv(de, dvp->v_mount, vpp, td);
 		*dm_unlock = 0;
-		vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY, td);
+		vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY);
 		return (error);
 	}
 
@@ -786,7 +786,7 @@
 			error = dsw->d_open(dev, ap->a_mode, S_IFCHR, td);
 	}
 
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 
 	dev_relthread(dev);
 
@@ -1101,7 +1101,7 @@
 	} else
 		dev_unlock();
 
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, curthread);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	return (0);
 }
 
--- //depot/vendor/freebsd/src/sys/fs/fdescfs/fdesc_vfsops.c	2007/10/16 10:57:02
+++ //depot/user/attilio/attilio_schedlock/fs/fdescfs/fdesc_vfsops.c	2008/01/08 16:10:31
@@ -149,7 +149,7 @@
 	 */
 	vp = VFSTOFDESC(mp)->f_root;
 	VREF(vp);
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	*vpp = vp;
 	return (0);
 }
--- //depot/vendor/freebsd/src/sys/fs/fdescfs/fdesc_vnops.c	2007/04/04 09:18:07
+++ //depot/user/attilio/attilio_schedlock/fs/fdescfs/fdesc_vnops.c	2008/01/08 16:10:31
@@ -234,7 +234,7 @@
 		goto bad;
 	VTOFDESC(fvp)->fd_fd = fd;
 	if (fvp != dvp)
-		vn_lock(fvp, LK_EXCLUSIVE | LK_RETRY, td);
+		vn_lock(fvp, LK_EXCLUSIVE | LK_RETRY);
 	*vpp = fvp;
 	return (0);
 
@@ -409,7 +409,7 @@
 	}
 	vp = fp->f_vnode;
 	if ((error = vn_start_write(vp, &mp, V_WAIT | PCATCH)) == 0) {
-		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, ap->a_td);
+		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 		error = VOP_SETATTR(vp, ap->a_vap, ap->a_cred, ap->a_td);
 		VOP_UNLOCK(vp, 0, ap->a_td);
 		vn_finished_write(mp);
--- //depot/vendor/freebsd/src/sys/fs/fifofs/fifo_vnops.c	2008/01/07 20:11:28
+++ //depot/user/attilio/attilio_schedlock/fs/fifofs/fifo_vnops.c	2008/01/08 16:10:31
@@ -257,7 +257,7 @@
 			VOP_UNLOCK(vp, 0, td);
 			error = msleep(&fip->fi_readers, &fifo_mtx,
 			    PDROP | PCATCH | PSOCK, "fifoor", 0);
-			vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+			vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 			if (error) {
 				fip->fi_readers--;
 				if (fip->fi_readers == 0) {
@@ -277,7 +277,7 @@
 			VOP_UNLOCK(vp, 0, td);
 			error = msleep(&fip->fi_writers, &fifo_mtx,
 			    PDROP | PCATCH | PSOCK, "fifoow", 0);
-			vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+			vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 			if (error) {
 				fip->fi_writers--;
 				if (fip->fi_writers == 0) {
--- //depot/vendor/freebsd/src/sys/fs/hpfs/hpfs_vnops.c	2007/02/15 22:11:58
+++ //depot/user/attilio/attilio_schedlock/fs/hpfs/hpfs_vnops.c	2008/01/08 16:10:31
@@ -1066,7 +1066,7 @@
 			VOP_UNLOCK(dvp,0,cnp->cn_thread);
 			error = VFS_VGET(hpmp->hpm_mp,
 				 dhp->h_fn.fn_parent, LK_EXCLUSIVE, ap->a_vpp); 
-			vn_lock(dvp, LK_EXCLUSIVE|LK_RETRY, cnp->cn_thread);
+			vn_lock(dvp, LK_EXCLUSIVE|LK_RETRY);
 			if (error)
 				return(error);
 		}
--- //depot/vendor/freebsd/src/sys/fs/msdosfs/msdosfs_lookup.c	2007/10/19 12:27:18
+++ //depot/user/attilio/attilio_schedlock/fs/msdosfs/msdosfs_lookup.c	2008/01/08 16:10:31
@@ -522,7 +522,7 @@
 	if (flags & ISDOTDOT) {
 		VOP_UNLOCK(pdp, 0, td);
 		error = deget(pmp, cluster, blkoff,  &tdp);
-		vn_lock(pdp, LK_EXCLUSIVE | LK_RETRY, td); 
+		vn_lock(pdp, LK_EXCLUSIVE | LK_RETRY); 
 		if (error)
 			return (error);
 		*vpp = DETOV(tdp);
--- //depot/vendor/freebsd/src/sys/fs/msdosfs/msdosfs_vfsops.c	2007/11/18 09:27:01
+++ //depot/user/attilio/attilio_schedlock/fs/msdosfs/msdosfs_vfsops.c	2008/01/08 16:10:31
@@ -312,7 +312,7 @@
 			 * that user has necessary permissions on the device.
 			 */
 			devvp = pmp->pm_devvp;
-			vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, td);
+			vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY);
 			error = VOP_ACCESS(devvp, VREAD | VWRITE,
 			    td->td_ucred, td);
 			if (error)
@@ -928,7 +928,7 @@
 	 * Flush filesystem control info.
 	 */
 	if (waitfor != MNT_LAZY) {
-		vn_lock(pmp->pm_devvp, LK_EXCLUSIVE | LK_RETRY, td);
+		vn_lock(pmp->pm_devvp, LK_EXCLUSIVE | LK_RETRY);
 		error = VOP_FSYNC(pmp->pm_devvp, waitfor, td);
 		if (error)
 			allerror = error;
--- //depot/vendor/freebsd/src/sys/fs/msdosfs/msdosfs_vnops.c	2007/10/19 12:27:18
+++ //depot/user/attilio/attilio_schedlock/fs/msdosfs/msdosfs_vnops.c	2008/01/08 16:10:31
@@ -1032,7 +1032,7 @@
 		goto abortit;
 	}
 
-	error = vn_lock(fvp, LK_EXCLUSIVE, td);
+	error = vn_lock(fvp, LK_EXCLUSIVE);
 	if (error)
 		goto abortit;
 	dp = VTODE(fdvp);
@@ -1480,7 +1480,7 @@
 	error = detrunc(ip, (u_long)0, IO_SYNC, cnp->cn_cred, td);
 	cache_purge(vp);
 
-	vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY);
 out:
 	return (error);
 }
--- //depot/vendor/freebsd/src/sys/fs/ntfs/ntfs_vfsops.c	2007/11/17 17:06:33
+++ //depot/user/attilio/attilio_schedlock/fs/ntfs/ntfs_vfsops.c	2008/01/08 16:10:31
@@ -743,7 +743,7 @@
 	ntfs_ntput(ip);
 
 	if (lkflags & LK_TYPE_MASK) {
-		error = vn_lock(vp, lkflags, td);
+		error = vn_lock(vp, lkflags);
 		if (error) {
 			vput(vp);
 			return (error);
--- //depot/vendor/freebsd/src/sys/fs/ntfs/ntfs_vnops.c	2007/02/15 22:11:58
+++ //depot/user/attilio/attilio_schedlock/fs/ntfs/ntfs_vnops.c	2008/01/08 16:10:31
@@ -664,7 +664,7 @@
 				 LK_EXCLUSIVE, ap->a_vpp); 
 		ntfs_ntvattrrele(vap);
 		if (error) {
-			vn_lock(dvp,LK_EXCLUSIVE|LK_RETRY,cnp->cn_thread);
+			vn_lock(dvp,LK_EXCLUSIVE|LK_RETRY);
 			return (error);
 		}
 	} else {
--- //depot/vendor/freebsd/src/sys/fs/nullfs/null_subr.c	2007/10/14 14:02:08
+++ //depot/user/attilio/attilio_schedlock/fs/nullfs/null_subr.c	2008/01/08 16:10:31
@@ -192,7 +192,7 @@
 	vp->v_vnlock = &vp->v_lock;
 	FREE(xp, M_NULLFSNODE);
 	vp->v_op = &dead_vnodeops;
-	(void) vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, curthread);
+	(void) vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	vgone(vp);
 	vput(vp);
 }
--- //depot/vendor/freebsd/src/sys/fs/nullfs/null_vfsops.c	2007/10/16 10:57:02
+++ //depot/user/attilio/attilio_schedlock/fs/nullfs/null_vfsops.c	2008/01/08 16:10:31
@@ -121,7 +121,7 @@
 	 * Re-lock vnode.
 	 */
 	if (isvnunlocked && !VOP_ISLOCKED(mp->mnt_vnodecovered, NULL))
-		vn_lock(mp->mnt_vnodecovered, LK_EXCLUSIVE | LK_RETRY, td);
+		vn_lock(mp->mnt_vnodecovered, LK_EXCLUSIVE | LK_RETRY);
 
 	if (error)
 		return (error);
@@ -250,7 +250,7 @@
 	if (VOP_ISLOCKED(vp, NULL))
 		panic("root vnode is locked.\n");
 #endif
-	vn_lock(vp, flags | LK_RETRY, td);
+	vn_lock(vp, flags | LK_RETRY);
 	*vpp = vp;
 	return 0;
 }
--- //depot/vendor/freebsd/src/sys/fs/nwfs/nwfs_node.c	2007/03/13 01:54:24
+++ //depot/user/attilio/attilio_schedlock/fs/nwfs/nwfs_node.c	2008/01/08 16:10:31
@@ -205,7 +205,7 @@
 	*vpp = vp;
 	nhpp = NWNOHASH(fid);
 	LIST_INSERT_HEAD(nhpp, np, n_hash);
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	lockmgr(&nwhashlock, LK_RELEASE, NULL, td);
 	
 	ASSERT_VOP_LOCKED(dvp, "nwfs_allocvp");
--- //depot/vendor/freebsd/src/sys/fs/nwfs/nwfs_vnops.c	2005/10/16 21:55:21
+++ //depot/user/attilio/attilio_schedlock/fs/nwfs/nwfs_vnops.c	2008/01/08 16:10:31
@@ -960,7 +960,7 @@
 	if (flags & ISDOTDOT) {
 		VOP_UNLOCK(dvp, 0, td);		/* race to get the inode */
 		error = nwfs_nget(mp, fid, NULL, NULL, &vp);
-		vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY, td);
+		vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY);
 		if (error)
 			return (error);
 		*vpp = vp;
--- //depot/vendor/freebsd/src/sys/fs/portalfs/portal_vfsops.c	2007/10/16 10:57:02
+++ //depot/user/attilio/attilio_schedlock/fs/portalfs/portal_vfsops.c	2008/01/08 16:10:31
@@ -224,7 +224,7 @@
 	 */
 	vp = VFSTOPORTAL(mp)->pm_root;
 	VREF(vp);
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	*vpp = vp;
 	return (0);
 }
--- //depot/vendor/freebsd/src/sys/fs/portalfs/portal_vnops.c	2007/03/13 01:54:24
+++ //depot/user/attilio/attilio_schedlock/fs/portalfs/portal_vnops.c	2008/01/09 13:08:41
@@ -103,7 +103,6 @@
 	struct vnode **vpp = ap->a_vpp;
 	struct vnode *dvp = ap->a_dvp;
 	char *pname = cnp->cn_nameptr;
-	struct thread *td = cnp->cn_thread;
 	struct portalnode *pt;
 	int error;
 	struct vnode *fvp = 0;
@@ -153,7 +152,7 @@
 	pt->pt_fileid = portal_fileid++;
 
 	*vpp = fvp;
-	vn_lock(fvp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(fvp, LK_EXCLUSIVE | LK_RETRY);
 	error = insmntque(fvp, dvp->v_mount);
 	if (error != 0) {
 		*vpp = NULLVP;
--- //depot/vendor/freebsd/src/sys/fs/procfs/procfs.c	2007/03/12 12:21:59
+++ //depot/user/attilio/attilio_schedlock/fs/procfs/procfs.c	2008/01/08 16:10:31
@@ -75,7 +75,7 @@
 	textvp = p->p_textvp;
 	VI_LOCK(textvp);
 	vholdl(textvp);
-	err = vn_lock(textvp, LK_EXCLUSIVE | LK_INTERLOCK, td);
+	err = vn_lock(textvp, LK_EXCLUSIVE | LK_INTERLOCK);
 	vdrop(textvp);
 	if (err)
 		return (err);
--- //depot/vendor/freebsd/src/sys/fs/procfs/procfs_map.c	2007/04/23 06:17:44
+++ //depot/user/attilio/attilio_schedlock/fs/procfs/procfs_map.c	2008/01/08 16:10:31
@@ -182,7 +182,7 @@
 			VM_OBJECT_UNLOCK(obj);
 			if (vp != NULL) {
 				vfslocked = VFS_LOCK_GIANT(vp->v_mount);
-				vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+				vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 				vn_fullpath(td, vp, &fullpath, &freepath);
 				vput(vp);
 				VFS_UNLOCK_GIANT(vfslocked);
--- //depot/vendor/freebsd/src/sys/fs/pseudofs/pseudofs_vncache.c	2007/04/23 19:21:51
+++ //depot/user/attilio/attilio_schedlock/fs/pseudofs/pseudofs_vncache.c	2008/01/08 16:10:31
@@ -197,7 +197,7 @@
 		(*vpp)->v_vflag |= VV_PROCDEP;
 	pvd->pvd_vnode = *vpp;
 	(*vpp)->v_vnlock->lk_flags |= LK_CANRECURSE;
-	vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY, curthread);
+	vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY);
 	error = insmntque(*vpp, mp);
 	if (error != 0) {
 		mtx_lock(&pfs_vncache_mutex);
--- //depot/vendor/freebsd/src/sys/fs/pseudofs/pseudofs_vnops.c	2007/10/05 17:43:15
+++ //depot/user/attilio/attilio_schedlock/fs/pseudofs/pseudofs_vnops.c	2008/01/08 16:10:31
@@ -428,13 +428,13 @@
 		goto failed;
 
 	if (cnp->cn_flags & ISDOTDOT)
-		vn_lock(vn, LK_EXCLUSIVE|LK_RETRY, cnp->cn_thread);
+		vn_lock(vn, LK_EXCLUSIVE|LK_RETRY);
 	if (cnp->cn_flags & MAKEENTRY)
 		cache_enter(vn, *vpp, cnp);
 	PFS_RETURN (0);
  failed:
 	if (cnp->cn_flags & ISDOTDOT)
-		vn_lock(vn, LK_EXCLUSIVE|LK_RETRY, cnp->cn_thread);
+		vn_lock(vn, LK_EXCLUSIVE|LK_RETRY);
 	PFS_RETURN(error);
 }
 
--- //depot/vendor/freebsd/src/sys/fs/smbfs/smbfs_io.c	2007/06/04 21:48:11
+++ //depot/user/attilio/attilio_schedlock/fs/smbfs/smbfs_io.c	2008/01/08 16:10:31
@@ -205,10 +205,10 @@
 	if (vp->v_type == VDIR) {
 		lks = LK_EXCLUSIVE;/*lockstatus(vp->v_vnlock, td);*/
 		if (lks == LK_SHARED)
-			vn_lock(vp, LK_UPGRADE | LK_RETRY, td);
+			vn_lock(vp, LK_UPGRADE | LK_RETRY);
 		error = smbfs_readvdir(vp, uiop, cred);
 		if (lks == LK_SHARED)
-			vn_lock(vp, LK_DOWNGRADE | LK_RETRY, td);
+			vn_lock(vp, LK_DOWNGRADE | LK_RETRY);
 		return error;
 	}
 
--- //depot/vendor/freebsd/src/sys/fs/smbfs/smbfs_node.c	2007/05/29 11:33:02
+++ //depot/user/attilio/attilio_schedlock/fs/smbfs/smbfs_node.c	2008/01/08 16:10:31
@@ -260,7 +260,7 @@
 		SMBERROR("new vnode '%s' born without parent ?\n", np->n_name);
 
 	vp->v_vnlock->lk_flags |= LK_CANRECURSE;
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 
 	smbfs_hash_lock(smp, td);
 	LIST_FOREACH(np2, nhpp, n_hash) {
--- //depot/vendor/freebsd/src/sys/fs/smbfs/smbfs_vnops.c	2007/05/31 11:53:40
+++ //depot/user/attilio/attilio_schedlock/fs/smbfs/smbfs_vnops.c	2008/01/08 16:10:31
@@ -1249,7 +1249,7 @@
 	if (flags & ISDOTDOT) {
 		VOP_UNLOCK(dvp, 0, td);
 		error = smbfs_nget(mp, dvp, name, nmlen, NULL, &vp);
-		vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY, td);
+		vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY);
 		if (error)
 			return error;
 		*vpp = vp;
--- //depot/vendor/freebsd/src/sys/fs/tmpfs/tmpfs_subr.c	2007/12/07 00:02:04
+++ //depot/user/attilio/attilio_schedlock/fs/tmpfs/tmpfs_subr.c	2008/01/09 16:09:23
@@ -360,7 +360,7 @@
 		goto unlock;
 	MPASS(vp != NULL);
 
-	(void) vn_lock(vp, lkflag | LK_RETRY, td);
+	(void) vn_lock(vp, lkflag | LK_RETRY);
 
 	vp->v_data = node;
 	vp->v_type = node->tn_type;
--- //depot/vendor/freebsd/src/sys/fs/tmpfs/tmpfs_vfsops.c	2007/12/06 23:22:37
+++ //depot/user/attilio/attilio_schedlock/fs/tmpfs/tmpfs_vfsops.c	2008/01/08 16:10:31
@@ -217,7 +217,7 @@
 	printf("WARNING: TMPFS is considered to be a highly experimental "
 	    "feature in FreeBSD.\n");
 
-	vn_lock(mp->mnt_vnodecovered, LK_SHARED | LK_RETRY, td);
+	vn_lock(mp->mnt_vnodecovered, LK_SHARED | LK_RETRY);
 	error = VOP_GETATTR(mp->mnt_vnodecovered, &va, mp->mnt_cred, td);
 	VOP_UNLOCK(mp->mnt_vnodecovered, 0, td);
 	if (error)
--- //depot/vendor/freebsd/src/sys/fs/tmpfs/tmpfs_vnops.c	2007/12/04 20:16:47
+++ //depot/user/attilio/attilio_schedlock/fs/tmpfs/tmpfs_vnops.c	2008/01/08 16:10:31
@@ -104,7 +104,7 @@
 		error = tmpfs_alloc_vp(dvp->v_mount, dnode->tn_dir.tn_parent,
 		    cnp->cn_lkflags, vpp, td);
 
-		vn_lock(dvp, ltype | LK_RETRY, td);
+		vn_lock(dvp, ltype | LK_RETRY);
 		vdrop(dvp);
 	} else if (cnp->cn_namelen == 1 && cnp->cn_nameptr[0] == '.') {
 		VREF(dvp);
@@ -925,7 +925,7 @@
 	/* If we need to move the directory between entries, lock the
 	 * source so that we can safely operate on it. */
 	if (tdvp != fdvp) {
-		error = vn_lock(fdvp, LK_EXCLUSIVE | LK_RETRY, tcnp->cn_thread);
+		error = vn_lock(fdvp, LK_EXCLUSIVE | LK_RETRY);
 		if (error != 0)
 			goto out;
 	}
--- //depot/vendor/freebsd/src/sys/fs/udf/udf_vnops.c	2007/06/11 20:17:40
+++ //depot/user/attilio/attilio_schedlock/fs/udf/udf_vnops.c	2008/01/08 16:10:31
@@ -958,7 +958,7 @@
 			VOP_UNLOCK(dvp, 0, a->a_cnp->cn_thread);
 		error = udf_vget(udfmp->im_mountp, id, LK_EXCLUSIVE, &tdp);
 		if (flags & ISDOTDOT)
-			vn_lock(dvp, LK_EXCLUSIVE|LK_RETRY, a->a_cnp->cn_thread);
+			vn_lock(dvp, LK_EXCLUSIVE|LK_RETRY);
 		if (!error) {
 			/*
 			 * Remember where this entry was if it's the final
--- //depot/vendor/freebsd/src/sys/fs/unionfs/union_subr.c	2007/12/25 17:56:52
+++ //depot/user/attilio/attilio_schedlock/fs/unionfs/union_subr.c	2008/01/08 16:10:31
@@ -167,7 +167,7 @@
 		vp->v_vflag |= VV_ROOT;
 
 	if (lkflags & LK_TYPE_MASK)
-		vn_lock(vp, lkflags | LK_RETRY, td);
+		vn_lock(vp, lkflags | LK_RETRY);
 
 	*vpp = vp;
 
@@ -386,7 +386,7 @@
 	if ((error = relookup(dvp, vpp, cn))) {
 		uma_zfree(namei_zone, cn->cn_pnbuf);
 		cn->cn_flags &= ~HASBUF;
-		vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY, td);
+		vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY);
 	} else
 		vrele(dvp);
 
@@ -556,7 +556,7 @@
 		panic("unionfs: no exclusive lock");
 	VI_UNLOCK(vp);
 	for (count = 1; count < lockcnt; count++)
-		vn_lock(uvp, LK_EXCLUSIVE | LK_CANRECURSE | LK_RETRY, td);
+		vn_lock(uvp, LK_EXCLUSIVE | LK_CANRECURSE | LK_RETRY);
 }
 
 /*
--- //depot/vendor/freebsd/src/sys/fs/unionfs/union_vfsops.c	2007/10/16 10:57:02
+++ //depot/user/attilio/attilio_schedlock/fs/unionfs/union_vfsops.c	2008/01/08 16:10:31
@@ -190,7 +190,7 @@
 	if (ufile == 0 && udir != 0)
 		ufile = udir;
 
-	vn_lock(mp->mnt_vnodecovered, LK_SHARED | LK_RETRY, td);
+	vn_lock(mp->mnt_vnodecovered, LK_SHARED | LK_RETRY);
 	error = VOP_GETATTR(mp->mnt_vnodecovered, &va, mp->mnt_cred, td);
 	if (!error) {
 		if (udir == 0)
@@ -289,7 +289,7 @@
 	 */
 	if (below) {
 		VOP_UNLOCK(upperrootvp, 0, td);
-		vn_lock(lowerrootvp, LK_EXCLUSIVE | LK_RETRY, td);
+		vn_lock(lowerrootvp, LK_EXCLUSIVE | LK_RETRY);
 		ump->um_lowervp = upperrootvp;
 		ump->um_uppervp = lowerrootvp;
 	} else {
@@ -429,7 +429,7 @@
 
 	vref(vp);
 	if (flags & LK_TYPE_MASK)
-		vn_lock(vp, flags, td);
+		vn_lock(vp, flags);
 
 	*vpp = vp;
 
--- //depot/vendor/freebsd/src/sys/fs/unionfs/union_vnops.c	2007/12/28 00:44:56
+++ //depot/user/attilio/attilio_schedlock/fs/unionfs/union_vnops.c	2008/01/08 16:10:31
@@ -146,7 +146,7 @@
 
 		if (dtmpvp == udvp && ldvp != NULLVP) {
 			VOP_UNLOCK(udvp, 0, td);
-			vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY, td);
+			vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY);
 		}
 
 		if (error == 0) {
@@ -165,11 +165,12 @@
 			vref(dunp->un_dvp);
 
 			if (nameiop == DELETE || nameiop == RENAME)
-				vn_lock(dunp->un_dvp, LK_EXCLUSIVE | LK_RETRY, td);
+				vn_lock(dunp->un_dvp, LK_EXCLUSIVE | LK_RETRY);
 			else if (cnp->cn_lkflags & LK_TYPE_MASK)
-				vn_lock(dunp->un_dvp, cnp->cn_lkflags | LK_RETRY, td);
+				vn_lock(dunp->un_dvp, cnp->cn_lkflags |
+				    LK_RETRY);
 
-			vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY, td);
+			vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY);
 		} else if (error == ENOENT && (cnflags & MAKEENTRY) &&
 		    nameiop != CREATE)
 			cache_enter(dvp, NULLVP, cnp);
@@ -278,7 +279,7 @@
 		if (LK_SHARED == (cnp->cn_lkflags & LK_TYPE_MASK))
 			VOP_UNLOCK(vp, 0, td);
 		if (LK_EXCLUSIVE != VOP_ISLOCKED(vp, td)) {
-			vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+			vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 			lockflag = 1;
 		}
 		error = unionfs_mkshadowdir(MOUNTTOUNIONFSMOUNT(dvp->v_mount),
@@ -294,7 +295,7 @@
 			goto unionfs_lookup_out;
 		}
 		if ((cnp->cn_lkflags & LK_TYPE_MASK) == LK_SHARED)
-			vn_lock(vp, LK_SHARED | LK_RETRY, td);
+			vn_lock(vp, LK_SHARED | LK_RETRY);
 	}
 	/*
 	 * get unionfs vnode.
@@ -314,7 +315,7 @@
 		}
 		if ((nameiop == DELETE || nameiop == RENAME) &&
 		    (cnp->cn_lkflags & LK_TYPE_MASK) == 0)
-			vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+			vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	}
 
 	*(ap->a_vpp) = vp;
@@ -532,7 +533,7 @@
 	td = ap->a_td;
 
 	if (VOP_ISLOCKED(ap->a_vp, td) != LK_EXCLUSIVE) {
-		vn_lock(ap->a_vp, LK_EXCLUSIVE | LK_RETRY, td);
+		vn_lock(ap->a_vp, LK_EXCLUSIVE | LK_RETRY);
 		locked = 1;
 	}
 	unionfs_get_node_status(unp, td, &unsp);
@@ -876,7 +877,7 @@
 
 	UNIONFS_INTERNAL_DEBUG("unionfs_ioctl: enter\n");
 
- 	vn_lock(ap->a_vp, LK_EXCLUSIVE | LK_RETRY, ap->a_td);
+ 	vn_lock(ap->a_vp, LK_EXCLUSIVE | LK_RETRY);
 	unp = VTOUNIONFS(ap->a_vp);
 	unionfs_get_node_status(unp, ap->a_td, &unsp);
 	ovp = (unsp->uns_upper_opencnt ? unp->un_uppervp : unp->un_lowervp);
@@ -901,7 +902,7 @@
 	struct unionfs_node_status *unsp;
 	struct vnode   *ovp;
 
- 	vn_lock(ap->a_vp, LK_EXCLUSIVE | LK_RETRY, ap->a_td);
+ 	vn_lock(ap->a_vp, LK_EXCLUSIVE | LK_RETRY);
 	unp = VTOUNIONFS(ap->a_vp);
 	unionfs_get_node_status(unp, ap->a_td, &unsp);
 	ovp = (unsp->uns_upper_opencnt ? unp->un_uppervp : unp->un_lowervp);
@@ -1107,7 +1108,7 @@
 	if (unp->un_uppervp == NULLVP) {
 		switch (fvp->v_type) {
 		case VREG:
-			if ((error = vn_lock(fvp, LK_EXCLUSIVE, td)) != 0)
+			if ((error = vn_lock(fvp, LK_EXCLUSIVE)) != 0)
 				goto unionfs_rename_abort;
 			error = unionfs_copyfile(unp, 1, fcnp->cn_cred, td);
 			VOP_UNLOCK(fvp, 0, td);
@@ -1115,7 +1116,7 @@
 				goto unionfs_rename_abort;
 			break;
 		case VDIR:
-			if ((error = vn_lock(fvp, LK_EXCLUSIVE, td)) != 0)
+			if ((error = vn_lock(fvp, LK_EXCLUSIVE)) != 0)
 				goto unionfs_rename_abort;
 			error = unionfs_mkshadowdir(ump, rfdvp, unp, fcnp, td);
 			VOP_UNLOCK(fvp, 0, td);
@@ -1169,7 +1170,7 @@
 	}
 
 	if (needrelookup != 0) {
-		if ((error = vn_lock(fdvp, LK_EXCLUSIVE, td)) != 0)
+		if ((error = vn_lock(fdvp, LK_EXCLUSIVE)) != 0)
 			goto unionfs_rename_abort;
 		error = unionfs_relookup_for_delete(fdvp, fcnp, td);
 		VOP_UNLOCK(fdvp, 0, td);
@@ -1181,7 +1182,7 @@
 			VOP_UNLOCK(tvp, 0, td);
 		error = unionfs_relookup_for_rename(tdvp, tcnp, td);
 		if (tvp != NULLVP && tvp != tdvp)
-			vn_lock(tvp, LK_EXCLUSIVE | LK_RETRY, td);
+			vn_lock(tvp, LK_EXCLUSIVE | LK_RETRY);
 		if (error != 0)
 			goto unionfs_rename_abort;
 	}
@@ -1420,7 +1421,7 @@
 
 	/* check the open count. unionfs needs to open before readdir. */
 	if (VOP_ISLOCKED(ap->a_vp, td) != LK_EXCLUSIVE) {
-		vn_lock(ap->a_vp, LK_UPGRADE | LK_RETRY, td);
+		vn_lock(ap->a_vp, LK_UPGRADE | LK_RETRY);
 		locked = 1;
 	}
 	unionfs_get_node_status(unp, td, &unsp);
@@ -1430,7 +1431,7 @@
 		error = EBADF;
 	}
 	if (locked == 1)
-		vn_lock(ap->a_vp, LK_DOWNGRADE | LK_RETRY, td);
+		vn_lock(ap->a_vp, LK_DOWNGRADE | LK_RETRY);
 	if (error != 0)
 		goto unionfs_readdir_exit;
 
@@ -1752,7 +1753,7 @@
 			if ((revlock & LK_TYPE_MASK) == LK_RELEASE)
 				VOP_UNLOCK(lvp, revlock, td);
 			else
-				vn_lock(lvp, revlock | LK_RETRY, td);
+				vn_lock(lvp, revlock | LK_RETRY);
 			goto unionfs_lock_abort;
 		}
 	}
@@ -1872,7 +1873,7 @@
 	vp = ap->a_vp;
 	td = curthread;
 
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 
 	unp = VTOUNIONFS(ap->a_vp);
 	uvp = unp->un_uppervp;
@@ -2024,12 +2025,12 @@
 	error = VOP_OPENEXTATTR(tvp, ap->a_cred, ap->a_td);
 
 	if (error == 0) {
-		vn_lock(vp, LK_UPGRADE | LK_RETRY, ap->a_td);
+		vn_lock(vp, LK_UPGRADE | LK_RETRY);
 		if (tvp == unp->un_uppervp)
 			unp->un_flag |= UNIONFS_OPENEXTU;
 		else
 			unp->un_flag |= UNIONFS_OPENEXTL;
-		vn_lock(vp, LK_DOWNGRADE | LK_RETRY, ap->a_td);
+		vn_lock(vp, LK_DOWNGRADE | LK_RETRY);
 	}
 
 	return (error);
@@ -2058,12 +2059,12 @@
 	error = VOP_CLOSEEXTATTR(tvp, ap->a_commit, ap->a_cred, ap->a_td);
 
 	if (error == 0) {
-		vn_lock(vp, LK_UPGRADE | LK_RETRY, ap->a_td);
+		vn_lock(vp, LK_UPGRADE | LK_RETRY);
 		if (tvp == unp->un_uppervp)
 			unp->un_flag &= ~UNIONFS_OPENEXTU;
 		else
 			unp->un_flag &= ~UNIONFS_OPENEXTL;
-		vn_lock(vp, LK_DOWNGRADE | LK_RETRY, ap->a_td);
+		vn_lock(vp, LK_DOWNGRADE | LK_RETRY);
 	}
 
 	return (error);
--- //depot/vendor/freebsd/src/sys/gnu/fs/ext2fs/ext2_lookup.c	2005/12/05 18:57:50
+++ //depot/user/attilio/attilio_schedlock/gnu/fs/ext2fs/ext2_lookup.c	2008/01/08 16:10:31
@@ -659,7 +659,7 @@
 		saved_ino = dp->i_ino;
 		VOP_UNLOCK(pdp, 0, td);	/* race to get the inode */
 		error = VFS_VGET(vdp->v_mount, saved_ino, LK_EXCLUSIVE, &tdp);
-		vn_lock(pdp, LK_EXCLUSIVE | LK_RETRY, td);
+		vn_lock(pdp, LK_EXCLUSIVE | LK_RETRY);
 		if (error != 0)
 			return (error);
 		*vpp = tdp;
--- //depot/vendor/freebsd/src/sys/gnu/fs/ext2fs/ext2_vfsops.c	2007/10/27 16:16:47
+++ //depot/user/attilio/attilio_schedlock/gnu/fs/ext2fs/ext2_vfsops.c	2008/01/08 16:10:31
@@ -199,7 +199,7 @@
 			 * If upgrade to read-write by non-root, then verify
 			 * that user has necessary permissions on the device.
 			 */
-			vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, td);
+			vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY);
 			error = VOP_ACCESS(devvp, VREAD | VWRITE,
 			    td->td_ucred, td);
 			if (error)
@@ -517,7 +517,7 @@
 	 * Step 1: invalidate all cached meta-data.
 	 */
 	devvp = VFSTOEXT2(mp)->um_devvp;
-	vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY);
 	if (vinvalbuf(devvp, 0, td, 0, 0) != 0)
 		panic("ext2_reload: dirty1");
 	VOP_UNLOCK(devvp, 0, td);
@@ -916,7 +916,7 @@
 	 * Force stale file system control information to be flushed.
 	 */
 	if (waitfor != MNT_LAZY) {
-		vn_lock(ump->um_devvp, LK_EXCLUSIVE | LK_RETRY, td);
+		vn_lock(ump->um_devvp, LK_EXCLUSIVE | LK_RETRY);
 		if ((error = VOP_FSYNC(ump->um_devvp, waitfor, td)) != 0)
 			allerror = error;
 		VOP_UNLOCK(ump->um_devvp, 0, td);
--- //depot/vendor/freebsd/src/sys/gnu/fs/ext2fs/ext2_vnops.c	2007/06/12 00:18:44
+++ //depot/user/attilio/attilio_schedlock/gnu/fs/ext2fs/ext2_vnops.c	2008/01/08 16:10:31
@@ -813,7 +813,7 @@
 		goto abortit;
 	}
 
-	if ((error = vn_lock(fvp, LK_EXCLUSIVE, td)) != 0)
+	if ((error = vn_lock(fvp, LK_EXCLUSIVE)) != 0)
 		goto abortit;
 	dp = VTOI(fdvp);
 	ip = VTOI(fvp);
@@ -1103,7 +1103,7 @@
 out:
 	if (doingdirectory)
 		ip->i_flag &= ~IN_RENAME;
-	if (vn_lock(fvp, LK_EXCLUSIVE, td) == 0) {
+	if (vn_lock(fvp, LK_EXCLUSIVE) == 0) {
 		ip->i_nlink--;
 		ip->i_flag |= IN_CHANGE;
 		ip->i_flag &= ~IN_RENAME;
@@ -1314,7 +1314,7 @@
 	ip->i_nlink -= 2;
 	error = ext2_truncate(vp, (off_t)0, IO_SYNC, cnp->cn_cred, td);
 	cache_purge(ITOV(ip));
-	vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY);
 out:
 	return (error);
 }
--- //depot/vendor/freebsd/src/sys/gnu/fs/ext2fs/fs.h	2005/09/08 06:30:24
+++ //depot/user/attilio/attilio_schedlock/gnu/fs/ext2fs/fs.h	2008/01/08 16:10:31
@@ -145,7 +145,7 @@
  * I think I'll try a VOP_LOCK/VOP_UNLOCK on the device vnode
  */
 #define  DEVVP(inode)		(VFSTOEXT2(ITOV(inode)->v_mount)->um_devvp)
-#define  lock_super(devvp)   	vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, curthread)
+#define  lock_super(devvp)   	vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY)
 #define  unlock_super(devvp) 	VOP_UNLOCK(devvp, 0, curthread)
 
 /*
--- //depot/vendor/freebsd/src/sys/gnu/fs/reiserfs/reiserfs_namei.c	2007/06/10 04:58:46
+++ //depot/user/attilio/attilio_schedlock/gnu/fs/reiserfs/reiserfs_namei.c	2008/01/08 16:10:31
@@ -82,7 +82,7 @@
 			VOP_UNLOCK(pdp, 0, td);
 			error = reiserfs_iget(vdp->v_mount,
 			    saved_ino, &vp, td);
-			vn_lock(pdp, LK_EXCLUSIVE | LK_RETRY, td);
+			vn_lock(pdp, LK_EXCLUSIVE | LK_RETRY);
 			if (error != 0)
 				return (error);
 			*vpp = vp;
--- //depot/vendor/freebsd/src/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c	2007/03/13 01:54:24
+++ //depot/user/attilio/attilio_schedlock/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c	2008/01/08 16:10:31
@@ -390,7 +390,7 @@
 	}
 
 	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));
--- //depot/vendor/freebsd/src/sys/gnu/fs/xfs/FreeBSD/xfs_super.c	2006/11/06 13:48:07
+++ //depot/user/attilio/attilio_schedlock/gnu/fs/xfs/FreeBSD/xfs_super.c	2008/01/08 16:10:31
@@ -148,7 +148,7 @@
 		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;
--- //depot/vendor/freebsd/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c	2006/06/09 06:06:46
+++ //depot/user/attilio/attilio_schedlock/gnu/fs/xfs/FreeBSD/xfs_vnode.c	2008/01/08 16:10:31
@@ -135,7 +135,7 @@
 
         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);
--- //depot/vendor/freebsd/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c	2007/02/15 22:11:58
+++ //depot/user/attilio/attilio_schedlock/gnu/fs/xfs/FreeBSD/xfs_vnops.c	2008/01/08 16:10:31
@@ -1294,7 +1294,7 @@
 	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 @@
 	 }
 
 	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 @@
 
 	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 @@
 		*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;
 		}
--- //depot/vendor/freebsd/src/sys/i386/ibcs2/ibcs2_misc.c	2007/10/24 19:06:35
+++ //depot/user/attilio/attilio_schedlock/i386/ibcs2/ibcs2_misc.c	2008/01/08 16:10:31
@@ -356,7 +356,7 @@
 	buflen = max(DIRBLKSIZ, uap->nbytes);
 	buflen = min(buflen, MAXBSIZE);
 	buf = malloc(buflen, M_TEMP, M_WAITOK);
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 again:
 	aiov.iov_base = buf;
 	aiov.iov_len = buflen;
@@ -518,7 +518,7 @@
 	buflen = max(DIRBLKSIZ, uap->nbytes);
 	buflen = min(buflen, MAXBSIZE);
 	buf = malloc(buflen, M_TEMP, M_WAITOK);
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 again:
 	aiov.iov_base = buf;
 	aiov.iov_len = buflen;
--- //depot/vendor/freebsd/src/sys/i386/ibcs2/imgact_coff.c	2007/11/05 11:44:38
+++ //depot/user/attilio/attilio_schedlock/i386/ibcs2/imgact_coff.c	2008/01/08 16:10:31
@@ -485,7 +485,7 @@
 	DPRINTF(("%s(%d):  returning successfully!\n", __FILE__, __LINE__));
 
 fail:
-	vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY);
 
 	return error;
 }
--- //depot/vendor/freebsd/src/sys/i386/linux/imgact_linux.c	2007/11/05 11:44:38
+++ //depot/user/attilio/attilio_schedlock/i386/linux/imgact_linux.c	2008/01/08 16:10:31
@@ -236,7 +236,7 @@
     imgp->proc->p_sysent = &linux_sysvec;
 
 fail:
-    vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY, td);
+    vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY);
     return (error);
 }
 
--- //depot/vendor/freebsd/src/sys/kern/imgact_aout.c	2007/11/05 11:44:38
+++ //depot/user/attilio/attilio_schedlock/kern/imgact_aout.c	2008/01/08 16:10:31
@@ -98,7 +98,6 @@
 	struct image_params *imgp;
 {
 	const struct exec *a_out = (const struct exec *) imgp->image_header;
-	struct thread *td = curthread;
 	struct vmspace *vmspace;
 	vm_map_t map;
 	vm_object_t object;
@@ -193,14 +192,14 @@
 	 * However, in cases where the vnode lock is external, such as nullfs,
 	 * v_usecount may become zero.
 	 */
-	VOP_UNLOCK(imgp->vp, 0, td);
+	VOP_UNLOCK(imgp->vp, 0, curthread);
 
 	/*
 	 * Destroy old process VM and create a new one (with a new stack)
 	 */
 	error = exec_new_vmspace(imgp, &aout_sysvec);
 
-	vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY);
 	if (error)
 		return (error);
 
--- //depot/vendor/freebsd/src/sys/kern/imgact_elf.c	2008/01/05 08:38:17
+++ //depot/user/attilio/attilio_schedlock/kern/imgact_elf.c	2008/01/08 16:10:31
@@ -680,7 +680,7 @@
 	error = exec_new_vmspace(imgp, sv);
 	imgp->proc->p_sysent = sv;
 
-	vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY);
 	if (error)
 		return (error);
 
@@ -824,7 +824,7 @@
 			error = __elfN(load_file)(imgp->proc, interp, &addr,
 			    &imgp->entry_addr, sv->sv_pagesize);
 		}
-		vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY, td);
+		vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY);
 		if (error != 0) {
 			uprintf("ELF interpreter %s not found\n", interp);
 			return (error);
--- //depot/vendor/freebsd/src/sys/kern/imgact_gzip.c	2007/11/05 11:44:38
+++ //depot/user/attilio/attilio_schedlock/kern/imgact_gzip.c	2008/01/08 16:10:31
@@ -241,7 +241,7 @@
 	 */
 	error = exec_new_vmspace(gz->ip, &aout_sysvec);
 
-	vn_lock(gz->ip->vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(gz->ip->vp, LK_EXCLUSIVE | LK_RETRY);
 	if (error) {
 		gz->where = __LINE__;
 		return (error);
--- //depot/vendor/freebsd/src/sys/kern/kern_alq.c	2007/10/24 19:06:35
+++ //depot/user/attilio/attilio_schedlock/kern/kern_alq.c	2008/01/08 16:10:31
@@ -294,7 +294,7 @@
 	 */
 	vfslocked = VFS_LOCK_GIANT(vp->v_mount);
 	vn_start_write(vp, &mp, V_WAIT);
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	VOP_LEASE(vp, td, alq->aq_cred, LEASE_WRITE);
 	/*
 	 * XXX: VOP_WRITE error checks are ignored.
--- //depot/vendor/freebsd/src/sys/kern/kern_descrip.c	2008/01/08 22:02:33
+++ //depot/user/attilio/attilio_schedlock/kern/kern_descrip.c	2008/01/09 00:08:09
@@ -1183,7 +1183,7 @@
 	if (vp != NULL) {
 		int vfslocked;
 		vfslocked = VFS_LOCK_GIANT(vp->v_mount);
-		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 		error = VOP_PATHCONF(vp, uap->name, td->td_retval);
 		VOP_UNLOCK(vp, 0, td);
 		VFS_UNLOCK_GIANT(vfslocked);
@@ -2579,7 +2579,7 @@
 			fullpath = "-";
 			FILEDESC_SUNLOCK(fdp);
 			vfslocked = VFS_LOCK_GIANT(vp->v_mount);
-			vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, curthread);
+			vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 			vn_fullpath(curthread, vp, &fullpath, &freepath);
 			vput(vp);
 			VFS_UNLOCK_GIANT(vfslocked);
--- //depot/vendor/freebsd/src/sys/kern/kern_exec.c	2007/12/29 19:55:58
+++ //depot/user/attilio/attilio_schedlock/kern/kern_exec.c	2008/01/08 16:10:31
@@ -493,7 +493,7 @@
 	/* close files on exec */
 	VOP_UNLOCK(imgp->vp, 0, td);
 	fdcloseexec(td);
-	vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY);
 
 	/* Get a reference to the vnode prior to locking the proc */
 	VREF(ndp->ni_vp);
@@ -593,7 +593,7 @@
 		setugidsafety(td);
 		VOP_UNLOCK(imgp->vp, 0, td);
 		error = fdcheckstd(td);
-		vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY, td);
+		vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY);
 		if (error != 0)
 			goto done1;
 		PROC_LOCK(p);
@@ -749,7 +749,7 @@
 	if (tracecred != NULL)
 		crfree(tracecred);
 #endif
-	vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY);
 	if (oldargs != NULL)
 		pargs_drop(oldargs);
 	if (newargs != NULL)
--- //depot/vendor/freebsd/src/sys/kern/kern_jail.c	2007/10/24 19:06:35
+++ //depot/user/attilio/attilio_schedlock/kern/kern_jail.c	2008/01/08 16:10:31
@@ -254,7 +254,7 @@
 	sx_sunlock(&allprison_lock);
 
 	vfslocked = VFS_LOCK_GIANT(pr->pr_root->v_mount);
-	vn_lock(pr->pr_root, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(pr->pr_root, LK_EXCLUSIVE | LK_RETRY);
 	if ((error = change_dir(pr->pr_root, td)) != 0)
 		goto e_unlock;
 #ifdef MAC
--- //depot/vendor/freebsd/src/sys/kern/kern_ktrace.c	2007/11/14 06:57:03
+++ //depot/user/attilio/attilio_schedlock/kern/kern_ktrace.c	2008/01/08 16:10:31
@@ -924,7 +924,7 @@
 
 	vfslocked = VFS_LOCK_GIANT(vp->v_mount);
 	vn_start_write(vp, &mp, V_WAIT);
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	(void)VOP_LEASE(vp, td, cred, LEASE_WRITE);
 #ifdef MAC
 	error = mac_vnode_check_write(cred, NOCRED, vp);
--- //depot/vendor/freebsd/src/sys/kern/kern_proc.c	2007/12/27 22:47:47
+++ //depot/user/attilio/attilio_schedlock/kern/kern_proc.c	2008/01/08 16:10:31
@@ -1397,8 +1397,7 @@
 			VM_OBJECT_UNLOCK(obj);
 			if (vp != NULL) {
 				vfslocked = VFS_LOCK_GIANT(vp->v_mount);
-				vn_lock(vp, LK_EXCLUSIVE | LK_RETRY,
-				    curthread);
+				vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 				vn_fullpath(curthread, vp, &fullpath,
 				    &freepath);
 				vput(vp);
--- //depot/vendor/freebsd/src/sys/kern/kern_sig.c	2007/12/18 20:44:29
+++ //depot/user/attilio/attilio_schedlock/kern/kern_sig.c	2008/01/08 16:10:31
@@ -3141,7 +3141,7 @@
 	vattr.va_size = 0;
 	if (set_core_nodump_flag)
 		vattr.va_flags = UF_NODUMP;
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	VOP_LEASE(vp, td, cred, LEASE_WRITE);
 	VOP_SETATTR(vp, &vattr, cred, td);
 	VOP_UNLOCK(vp, 0, td);
--- //depot/vendor/freebsd/src/sys/kern/uipc_mqueue.c	2008/01/07 20:11:28
+++ //depot/user/attilio/attilio_schedlock/kern/uipc_mqueue.c	2008/01/08 16:10:31
@@ -706,8 +706,7 @@
 	if (vd != NULL) {
 		if (vget(vd->mv_vnode, 0, curthread) == 0) {
 			*vpp = vd->mv_vnode;
-			vn_lock(*vpp, LK_RETRY | LK_EXCLUSIVE,
-			    curthread);
+			vn_lock(*vpp, LK_RETRY | LK_EXCLUSIVE);
 			return (0);
 		}
 		/* XXX if this can happen, we're in trouble */
@@ -716,7 +715,7 @@
 	error = getnewvnode("mqueue", mp, &mqfs_vnodeops, vpp);
 	if (error)
 		return (error);
-	vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY, curthread);
+	vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY);
 	error = insmntque(*vpp, mp);
 	if (error != 0) {
 		*vpp = NULLVP;
@@ -824,7 +823,7 @@
 		KASSERT(pd->mn_parent, ("non-root directory has no parent"));
 		pn = pd->mn_parent;
 		error = mqfs_allocv(dvp->v_mount, vpp, pn);
-		vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY, td);
+		vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY);
 		return (error);
 	}
 
--- //depot/vendor/freebsd/src/sys/kern/uipc_syscalls.c	2007/12/30 01:46:44
+++ //depot/user/attilio/attilio_schedlock/kern/uipc_syscalls.c	2008/01/08 16:10:31
@@ -1777,7 +1777,7 @@
 	if ((error = fgetvp_read(td, uap->fd, &vp)) != 0)
 		goto out;
 	vfslocked = VFS_LOCK_GIANT(vp->v_mount);
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	obj = vp->v_object;
 	if (obj != NULL) {
 		/*
@@ -2024,7 +2024,7 @@
 				 */
 				bsize = vp->v_mount->mnt_stat.f_iosize;
 				vfslocked = VFS_LOCK_GIANT(vp->v_mount);
-				vn_lock(vp, LK_SHARED | LK_RETRY, td);
+				vn_lock(vp, LK_SHARED | LK_RETRY);
 
 				/*
 				 * XXXMAC: Because we don't have fp->f_cred
--- //depot/vendor/freebsd/src/sys/kern/vfs_acl.c	2007/10/24 19:06:35
+++ //depot/user/attilio/attilio_schedlock/kern/vfs_acl.c	2008/01/08 16:10:31
@@ -91,7 +91,7 @@
 	if (error != 0)
 		return (error);
 	VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE);
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 #ifdef MAC
 	error = mac_vnode_check_setacl(td->td_ucred, vp, type, &inkernacl);
 	if (error != 0)
@@ -117,7 +117,7 @@
 	int error;
 
 	VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE);
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 #ifdef MAC
 	error = mac_vnode_check_getacl(td->td_ucred, vp, type);
 	if (error != 0)
@@ -146,7 +146,7 @@
 	if (error)
 		return (error);
 	VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE);
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 #ifdef MAC
 	error = mac_vnode_check_deleteacl(td->td_ucred, vp, type);
 	if (error)
--- //depot/vendor/freebsd/src/sys/kern/vfs_aio.c	2007/10/20 23:26:42
+++ //depot/user/attilio/attilio_schedlock/kern/vfs_aio.c	2008/01/08 16:10:31
@@ -764,7 +764,7 @@
 	vfslocked = VFS_LOCK_GIANT(vp->v_mount);
 	if ((error = vn_start_write(vp, &mp, V_WAIT | PCATCH)) != 0)
 		goto drop;
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	if (vp->v_object != NULL) {
 		VM_OBJECT_LOCK(vp->v_object);
 		vm_object_page_clean(vp->v_object, 0, 0, 0);
--- //depot/vendor/freebsd/src/sys/kern/vfs_bio.c	2007/12/30 05:55:15
+++ //depot/user/attilio/attilio_schedlock/kern/vfs_bio.c	2008/01/08 16:10:31
@@ -2206,7 +2206,7 @@
 			BUF_UNLOCK(bp);
 			continue;
 		}
-		if (vn_lock(vp, LK_EXCLUSIVE | LK_NOWAIT, td) == 0) {
+		if (vn_lock(vp, LK_EXCLUSIVE | LK_NOWAIT) == 0) {
 			mtx_unlock(&bqlock);
 			CTR3(KTR_BUF, "flushbufqueue(%p) vp %p flags %X",
 			    bp, bp->b_vp, bp->b_flags);
--- //depot/vendor/freebsd/src/sys/kern/vfs_cache.c	2007/11/22 21:31:55
+++ //depot/user/attilio/attilio_schedlock/kern/vfs_cache.c	2008/01/08 16:10:31
@@ -429,7 +429,7 @@
 		if (ltype == VOP_ISLOCKED(*vpp, td))
 			return (-1);
 		else if (ltype == LK_EXCLUSIVE)
-			vn_lock(*vpp, LK_UPGRADE | LK_RETRY, td);
+			vn_lock(*vpp, LK_UPGRADE | LK_RETRY);
 		return (-1);
 	}
 	ltype = 0;	/* silence gcc warning */
@@ -441,7 +441,7 @@
 	CACHE_UNLOCK();
 	error = vget(*vpp, cnp->cn_lkflags | LK_INTERLOCK, td);
 	if (cnp->cn_flags & ISDOTDOT)
-		vn_lock(dvp, ltype | LK_RETRY, td);
+		vn_lock(dvp, ltype | LK_RETRY);
 	if ((cnp->cn_flags & ISLASTCN) && (cnp->cn_lkflags & LK_EXCLUSIVE))
 		ASSERT_VOP_ELOCKED(*vpp, "cache_lookup");
 	if (error) {
--- //depot/vendor/freebsd/src/sys/kern/vfs_extattr.c	2007/10/24 19:06:35
+++ //depot/user/attilio/attilio_schedlock/kern/vfs_extattr.c	2008/01/08 16:10:31
@@ -162,7 +162,7 @@
 	if (error)
 		return (error);
 	VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE);
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 
 	aiov.iov_base = data;
 	aiov.iov_len = nbytes;
@@ -328,7 +328,7 @@
 
 	VFS_ASSERT_GIANT(vp->v_mount);
 	VOP_LEASE(vp, td, td->td_ucred, LEASE_READ);
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 
 	/*
 	 * Slightly unusual semantics: if the user provides a NULL data
@@ -509,7 +509,7 @@
 	if (error)
 		return (error);
 	VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE);
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 
 #ifdef MAC
 	error = mac_vnode_check_deleteextattr(td->td_ucred, vp, attrnamespace,
@@ -651,7 +651,7 @@
 
 	VFS_ASSERT_GIANT(vp->v_mount);
 	VOP_LEASE(vp, td, td->td_ucred, LEASE_READ);
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 
 	auiop = NULL;
 	sizep = NULL;
--- //depot/vendor/freebsd/src/sys/kern/vfs_lookup.c	2007/10/24 19:06:35
+++ //depot/user/attilio/attilio_schedlock/kern/vfs_lookup.c	2008/01/08 16:10:31
@@ -408,7 +408,8 @@
 		cnp->cn_lkflags = LK_EXCLUSIVE;
 	dp = ndp->ni_startdir;
 	ndp->ni_startdir = NULLVP;
-	vn_lock(dp, compute_cn_lkflags(dp->v_mount, cnp->cn_lkflags | LK_RETRY), td);
+	vn_lock(dp,
+	    compute_cn_lkflags(dp->v_mount, cnp->cn_lkflags | LK_RETRY));
 
 dirloop:
 	/*
@@ -546,7 +547,9 @@
 			VREF(dp);
 			vput(tdp);
 			VFS_UNLOCK_GIANT(tvfslocked);
-			vn_lock(dp, compute_cn_lkflags(dp->v_mount, cnp->cn_lkflags | LK_RETRY), td);
+			vn_lock(dp,
+			    compute_cn_lkflags(dp->v_mount, cnp->cn_lkflags |
+			    LK_RETRY));
 		}
 	}
 
@@ -572,7 +575,7 @@
 	if (dp != vp_crossmp &&
 	    VOP_ISLOCKED(dp, td) == LK_SHARED &&
 	    (cnp->cn_flags & ISLASTCN) && (cnp->cn_flags & LOCKPARENT))
-		vn_lock(dp, LK_UPGRADE|LK_RETRY, td);
+		vn_lock(dp, LK_UPGRADE|LK_RETRY);
 	/*
 	 * If we're looking up the last component and we need an exclusive
 	 * lock, adjust our lkflags.
@@ -601,7 +604,9 @@
 			VREF(dp);
 			vput(tdp);
 			VFS_UNLOCK_GIANT(tvfslocked);
-			vn_lock(dp, compute_cn_lkflags(dp->v_mount, cnp->cn_lkflags | LK_RETRY), td);
+			vn_lock(dp,
+			    compute_cn_lkflags(dp->v_mount, cnp->cn_lkflags |
+			    LK_RETRY));
 			goto unionlookup;
 		}
 
@@ -678,7 +683,7 @@
 		ndp->ni_dvp = vp_crossmp;
 		error = VFS_ROOT(mp, compute_cn_lkflags(mp, cnp->cn_lkflags), &tdp, td);
 		vfs_unbusy(mp, td);
-		if (vn_lock(vp_crossmp, LK_SHARED | LK_NOWAIT, td))
+		if (vn_lock(vp_crossmp, LK_SHARED | LK_NOWAIT))
 			panic("vp_crossmp exclusively locked or reclaimed");
 		if (error) {
 			dpunlocked = 1;
@@ -778,7 +783,7 @@
 	 */
 	if ((cnp->cn_flags & (ISLASTCN | LOCKSHARED | LOCKLEAF)) ==
 	    (ISLASTCN | LOCKLEAF) && VOP_ISLOCKED(dp, td) != LK_EXCLUSIVE) {
-		vn_lock(dp, LK_UPGRADE | LK_RETRY, td);
+		vn_lock(dp, LK_UPGRADE | LK_RETRY);
 	}
 	if (vfslocked && dvfslocked)
 		VFS_UNLOCK_GIANT(dvfslocked);	/* Only need one */
@@ -825,7 +830,7 @@
 	cnp->cn_flags &= ~ISSYMLINK;
 	dp = dvp;
 	cnp->cn_lkflags = LK_EXCLUSIVE;
-	vn_lock(dp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(dp, LK_EXCLUSIVE | LK_RETRY);
 
 	/*
 	 * Search a new directory.
--- //depot/vendor/freebsd/src/sys/kern/vfs_mount.c	2007/12/31 23:45:45
+++ //depot/user/attilio/attilio_schedlock/kern/vfs_mount.c	2008/01/08 16:10:31
@@ -1061,7 +1061,7 @@
 	else
 		mp->mnt_kern_flag &= ~MNTK_ASYNC;
 	MNT_IUNLOCK(mp);
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	/*
 	 * Put the new filesystem on the mount list after root.
 	 */
@@ -1204,7 +1204,7 @@
 		mnt_gen_r = mp->mnt_gen;
 		VI_LOCK(coveredvp);
 		vholdl(coveredvp);
-		vn_lock(coveredvp, LK_EXCLUSIVE | LK_INTERLOCK | LK_RETRY, td);
+		vn_lock(coveredvp, LK_EXCLUSIVE | LK_INTERLOCK | LK_RETRY);
 		vdrop(coveredvp);
 		/*
 		 * Check for mp being unmounted while waiting for the
--- //depot/vendor/freebsd/src/sys/kern/vfs_subr.c	2007/12/28 00:52:45
+++ //depot/user/attilio/attilio_schedlock/kern/vfs_subr.c	2008/01/08 16:10:31
@@ -1004,7 +1004,7 @@
 	/* XXX non mp-safe fs may still call insmntque with vnode
 	   unlocked */
 	if (!VOP_ISLOCKED(vp, td))
-		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	vgone(vp);
 	vput(vp);
 }
@@ -1662,7 +1662,7 @@
 		mtx_lock(&sync_mtx);
 		return (1);
 	}
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	(void) VOP_FSYNC(vp, MNT_LAZY, td);
 	VOP_UNLOCK(vp, 0, td);
 	vn_finished_write(mp);
@@ -2059,7 +2059,7 @@
 		oweinact = 1;
 	}
 	vholdl(vp);
-	if ((error = vn_lock(vp, flags | LK_INTERLOCK, td)) != 0) {
+	if ((error = vn_lock(vp, flags | LK_INTERLOCK)) != 0) {
 		vdrop(vp);
 		return (error);
 	}
@@ -2154,7 +2154,7 @@
 	 * as VI_DOINGINACT to avoid recursion.
 	 */
 	vp->v_iflag |= VI_OWEINACT;
-	if (vn_lock(vp, LK_EXCLUSIVE | LK_INTERLOCK, td) == 0) {
+	if (vn_lock(vp, LK_EXCLUSIVE | LK_INTERLOCK) == 0) {
 		VI_LOCK(vp);
 		if (vp->v_usecount > 0)
 			vp->v_iflag &= ~VI_OWEINACT;
@@ -2359,7 +2359,7 @@
 		VI_LOCK(vp);
 		vholdl(vp);
 		MNT_IUNLOCK(mp);
-		error = vn_lock(vp, LK_INTERLOCK | LK_EXCLUSIVE, td);
+		error = vn_lock(vp, LK_INTERLOCK | LK_EXCLUSIVE);
 		if (error) {
 			vdrop(vp);
 			MNT_ILOCK(mp);
@@ -3869,7 +3869,7 @@
 {
 	struct vnode *vp = arg;
 
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, curthread);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 }
 
 static void
--- //depot/vendor/freebsd/src/sys/kern/vfs_syscalls.c	2008/01/07 20:11:28
+++ //depot/user/attilio/attilio_schedlock/kern/vfs_syscalls.c	2008/01/08 16:10:31
@@ -364,7 +364,7 @@
 		return (error);
 	vp = fp->f_vnode;
 	vfslocked = VFS_LOCK_GIANT(vp->v_mount);
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 #ifdef AUDIT
 	AUDIT_ARG(vnode, vp, ARG_VNODE1);
 #endif
@@ -732,7 +732,7 @@
 	VREF(vp);
 	fdrop(fp, td);
 	vfslocked = VFS_LOCK_GIANT(vp->v_mount);
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	AUDIT_ARG(vnode, vp, ARG_VNODE1);
 	error = change_dir(vp, td);
 	while (!error && (mp = vp->v_mountedhere) != NULL) {
@@ -1103,7 +1103,7 @@
 		VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE);
 		VATTR_NULL(&vat);
 		vat.va_size = 0;
-		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 #ifdef MAC
 		error = mac_vnode_check_write(td->td_ucred, fp->f_cred, vp);
 		if (error == 0)
@@ -1462,7 +1462,7 @@
 				vput(nd.ni_dvp);
 			vrele(nd.ni_vp);
 			error = EEXIST;
-		} else if ((error = vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td))
+		} else if ((error = vn_lock(vp, LK_EXCLUSIVE | LK_RETRY))
 		    == 0) {
 			VOP_LEASE(nd.ni_dvp, td, td->td_ucred, LEASE_WRITE);
 			VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE);
@@ -1767,7 +1767,7 @@
 		offset += fp->f_offset;
 		break;
 	case L_XTND:
-		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 		error = VOP_GETATTR(vp, &vattr, cred, td);
 		VOP_UNLOCK(vp, 0, td);
 		if (error)
@@ -2398,7 +2398,7 @@
 	if ((error = vn_start_write(vp, &mp, V_WAIT | PCATCH)) != 0)
 		return (error);
 	VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE);
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	VATTR_NULL(&vattr);
 	vattr.va_flags = flags;
 #ifdef MAC
@@ -2500,7 +2500,7 @@
 		return (error);
 	vfslocked = VFS_LOCK_GIANT(fp->f_vnode->v_mount);
 #ifdef AUDIT
-	vn_lock(fp->f_vnode, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(fp->f_vnode, LK_EXCLUSIVE | LK_RETRY);
 	AUDIT_ARG(vnode, fp->f_vnode, ARG_VNODE1);
 	VOP_UNLOCK(fp->f_vnode, 0, td);
 #endif
@@ -2526,7 +2526,7 @@
 	if ((error = vn_start_write(vp, &mp, V_WAIT | PCATCH)) != 0)
 		return (error);
 	VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE);
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	VATTR_NULL(&vattr);
 	vattr.va_mode = mode & ALLPERMS;
 #ifdef MAC
@@ -2640,7 +2640,7 @@
 		return (error);
 	vfslocked = VFS_LOCK_GIANT(fp->f_vnode->v_mount);
 #ifdef AUDIT
-	vn_lock(fp->f_vnode, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(fp->f_vnode, LK_EXCLUSIVE | LK_RETRY);
 	AUDIT_ARG(vnode, fp->f_vnode, ARG_VNODE1);
 	VOP_UNLOCK(fp->f_vnode, 0, td);
 #endif
@@ -2667,7 +2667,7 @@
 	if ((error = vn_start_write(vp, &mp, V_WAIT | PCATCH)) != 0)
 		return (error);
 	VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE);
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	VATTR_NULL(&vattr);
 	vattr.va_uid = uid;
 	vattr.va_gid = gid;
@@ -2797,7 +2797,7 @@
 		return (error);
 	vfslocked = VFS_LOCK_GIANT(fp->f_vnode->v_mount);
 #ifdef AUDIT
-	vn_lock(fp->f_vnode, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(fp->f_vnode, LK_EXCLUSIVE | LK_RETRY);
 	AUDIT_ARG(vnode, fp->f_vnode, ARG_VNODE1);
 	VOP_UNLOCK(fp->f_vnode, 0, td);
 #endif
@@ -2860,7 +2860,7 @@
 	if ((error = vn_start_write(vp, &mp, V_WAIT | PCATCH)) != 0)
 		return (error);
 	VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE);
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	setbirthtime = 0;
 	if (numtimes < 3 && VOP_GETATTR(vp, &vattr, td->td_ucred, td) == 0 &&
 	    timespeccmp(&ts[1], &vattr.va_birthtime, < ))
@@ -3010,7 +3010,7 @@
 		return (error);
 	vfslocked = VFS_LOCK_GIANT(fp->f_vnode->v_mount);
 #ifdef AUDIT
-	vn_lock(fp->f_vnode, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(fp->f_vnode, LK_EXCLUSIVE | LK_RETRY);
 	AUDIT_ARG(vnode, fp->f_vnode, ARG_VNODE1);
 	VOP_UNLOCK(fp->f_vnode, 0, td);
 #endif
@@ -3067,7 +3067,7 @@
 	}
 	NDFREE(&nd, NDF_ONLY_PNBUF);
 	VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE);
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	if (vp->v_type == VDIR)
 		error = EISDIR;
 #ifdef MAC
@@ -3165,7 +3165,7 @@
 	vfslocked = VFS_LOCK_GIANT(vp->v_mount);
 	if ((error = vn_start_write(vp, &mp, V_WAIT | PCATCH)) != 0)
 		goto drop;
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	AUDIT_ARG(vnode, vp, ARG_VNODE1);
 	if (vp->v_object != NULL) {
 		VM_OBJECT_LOCK(vp->v_object);
@@ -3550,7 +3550,7 @@
 	auio.uio_segflg = UIO_USERSPACE;
 	auio.uio_td = td;
 	auio.uio_resid = uap->count;
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	loff = auio.uio_offset = fp->f_offset;
 #ifdef MAC
 	error = mac_vnode_check_readdir(td->td_ucred, vp);
@@ -3692,8 +3692,8 @@
 	auio.uio_segflg = UIO_USERSPACE;
 	auio.uio_td = td;
 	auio.uio_resid = uap->count;
-	/* vn_lock(vp, LK_SHARED | LK_RETRY, td); */
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	/* vn_lock(vp, LK_SHARED | LK_RETRY); */
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	AUDIT_ARG(vnode, vp, ARG_VNODE1);
 	loff = auio.uio_offset = fp->f_offset;
 #ifdef MAC
@@ -4054,7 +4054,7 @@
 			goto out;
 		}
 		VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE);
-		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);	/* XXX */
+		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);	/* XXX */
 #ifdef MAC
 		/*
 		 * We don't yet have fp->f_cred, so use td->td_ucred, which
@@ -4120,7 +4120,7 @@
 			fdrop(fp, td);
 			goto out;
 		}
-		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 		atomic_set_int(&fp->f_flag, FHASLOCK);
 	}
 
--- //depot/vendor/freebsd/src/sys/kern/vfs_vnops.c	2008/01/07 20:11:28
+++ //depot/user/attilio/attilio_schedlock/kern/vfs_vnops.c	2008/01/08 16:10:31
@@ -287,7 +287,7 @@
 	VFS_ASSERT_GIANT(vp->v_mount);
 
 	vn_start_write(vp, &mp, V_WAIT);
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	if (flags & FWRITE) {
 		VNASSERT(vp->v_writecount > 0, vp, 
 		    ("vn_close: negative writecount"));
@@ -371,14 +371,14 @@
 			    (error = vn_start_write(vp, &mp, V_WAIT | PCATCH))
 			    != 0)
 				return (error);
-			vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+			vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 		} else {
 			/*
 			 * XXX This should be LK_SHARED but I don't trust VFS
 			 * enough to leave it like that until it has been
 			 * reviewed further.
 			 */
-			vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+			vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 		}
 
 	}
@@ -525,10 +525,10 @@
 		}
 		fp->f_vnread_flags |= FOFFSET_LOCKED;
 		mtx_unlock(mtxp);
-		vn_lock(vp, LK_SHARED | LK_RETRY, td);
+		vn_lock(vp, LK_SHARED | LK_RETRY);
 		uio->uio_offset = fp->f_offset;
 	} else
-		vn_lock(vp, LK_SHARED | LK_RETRY, td);
+		vn_lock(vp, LK_SHARED | LK_RETRY);
 
 	ioflag |= sequential_heuristic(uio, fp);
 
@@ -588,7 +588,7 @@
 	    (error = vn_start_write(vp, &mp, V_WAIT | PCATCH)) != 0)
 		goto unlock;
 	VOP_LEASE(vp, td, fp->f_cred, LEASE_WRITE);
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	if ((flags & FOF_OFFSET) == 0)
 		uio->uio_offset = fp->f_offset;
 	ioflag |= sequential_heuristic(uio, fp);
@@ -632,7 +632,7 @@
 		return (error);
 	}
 	VOP_LEASE(vp, td, active_cred, LEASE_WRITE);
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	if (vp->v_type == VDIR) {
 		error = EISDIR;
 		goto out;
@@ -670,7 +670,7 @@
 	int error;
 
 	vfslocked = VFS_LOCK_GIANT(vp->v_mount);
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	error = vn_stat(vp, sb, active_cred, fp->f_cred, td);
 	VOP_UNLOCK(vp, 0, td);
 	VFS_UNLOCK_GIANT(vfslocked);
@@ -805,7 +805,7 @@
 	case VREG:
 	case VDIR:
 		if (com == FIONREAD) {
-			vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+			vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 			error = VOP_GETATTR(vp, &vattr, active_cred, td);
 			VOP_UNLOCK(vp, 0, td);
 			if (!error)
@@ -842,7 +842,7 @@
 	vp = fp->f_vnode;
 	vfslocked = VFS_LOCK_GIANT(vp->v_mount);
 #ifdef MAC
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	error = mac_vnode_check_poll(active_cred, fp->f_cred, vp);
 	VOP_UNLOCK(vp, 0, td);
 	if (!error)
@@ -858,7 +858,7 @@
  * acquire requested lock.
  */
 int
-_vn_lock(struct vnode *vp, int flags, struct thread *td, char *file, int line)
+_vn_lock(struct vnode *vp, int flags, char *file, int line)
 {
 	int error;
 
@@ -881,7 +881,8 @@
 		 * lockmgr drops interlock before it will return for
 		 * any reason.  So force the code above to relock it.
 		 */
-		error = VOP_LOCK1(vp, flags | LK_INTERLOCK, td, file, line);
+		error = VOP_LOCK1(vp, flags | LK_INTERLOCK, curthread, file,
+		    line);
 		flags &= ~LK_INTERLOCK;
 		KASSERT((flags & LK_RETRY) == 0 || error == 0,
 		    ("LK_RETRY set with incompatible flags %d\n", flags));
@@ -891,7 +892,7 @@
 		 */
 		if (error == 0 && vp->v_iflag & VI_DOOMED &&
 		    (flags & LK_RETRY) == 0) {
-			VOP_UNLOCK(vp, 0, td);
+			VOP_UNLOCK(vp, 0, curthread);
 			error = ENOENT;
 			break;
 		}
@@ -1222,7 +1223,7 @@
 	auio.uio_resid = *buflen;
 
 	if ((ioflg & IO_NODELOCKED) == 0)
-		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 
 	ASSERT_VOP_LOCKED(vp, "IO_NODELOCKED with no vp lock held");
 
@@ -1266,7 +1267,7 @@
 	if ((ioflg & IO_NODELOCKED) == 0) {
 		if ((error = vn_start_write(vp, &mp, V_WAIT)) != 0)
 			return (error);
-		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	}
 
 	ASSERT_VOP_LOCKED(vp, "IO_NODELOCKED with no vp lock held");
@@ -1292,7 +1293,7 @@
 	if ((ioflg & IO_NODELOCKED) == 0) {
 		if ((error = vn_start_write(vp, &mp, V_WAIT)) != 0)
 			return (error);
-		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	}
 
 	ASSERT_VOP_LOCKED(vp, "IO_NODELOCKED with no vp lock held");
--- //depot/vendor/freebsd/src/sys/nfs4client/nfs4_vnops.c	2007/06/01 01:18:14
+++ //depot/user/attilio/attilio_schedlock/nfs4client/nfs4_vnops.c	2008/01/08 16:10:31
@@ -1048,7 +1048,7 @@
 		VOP_UNLOCK(dvp, 0, td);
 
 		error = nfs_nget(dvp->v_mount, fhp, fhsize, &np, LK_EXCLUSIVE);
-		vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY, td);
+		vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY);
 		if (error)
 			return (error);
 		newvp = NFSTOV(np);
@@ -1709,7 +1709,7 @@
 		error = 0;
 		goto out;
 	}
-	if ((error = vn_lock(fvp, LK_EXCLUSIVE, fcnp->cn_thread)) != 0)
+	if ((error = vn_lock(fvp, LK_EXCLUSIVE)) != 0)
 		goto out;
 
 	/*
--- //depot/vendor/freebsd/src/sys/nfsclient/nfs_subs.c	2007/10/12 19:16:26
+++ //depot/user/attilio/attilio_schedlock/nfsclient/nfs_subs.c	2008/01/08 16:10:31
@@ -487,9 +487,9 @@
  	if ((old_lock = VOP_ISLOCKED(vp, td)) != LK_EXCLUSIVE) {
  		if (old_lock == LK_SHARED) {
  			/* Upgrade to exclusive lock, this might block */
- 			vn_lock(vp, LK_UPGRADE | LK_RETRY, td);
+ 			vn_lock(vp, LK_UPGRADE | LK_RETRY);
  		} else {
- 			vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+ 			vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
  		}
   	}
 	return old_lock;
@@ -501,7 +501,7 @@
 	if (old_lock != LK_EXCLUSIVE) {
  		if (old_lock == LK_SHARED) {
  			/* Downgrade from exclusive lock, this might block */
- 			vn_lock(vp, LK_DOWNGRADE, td);
+ 			vn_lock(vp, LK_DOWNGRADE);
  		} else {
  			VOP_UNLOCK(vp, 0, td);
  		}
--- //depot/vendor/freebsd/src/sys/nfsclient/nfs_vnops.c	2007/11/19 16:05:56
+++ //depot/user/attilio/attilio_schedlock/nfsclient/nfs_vnops.c	2008/01/08 16:10:31
@@ -932,7 +932,7 @@
 	if (flags & ISDOTDOT) {
 		VOP_UNLOCK(dvp, 0, td);
 		error = nfs_nget(dvp->v_mount, fhp, fhsize, &np, cnp->cn_lkflags);
-		vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY, td);
+		vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY);
 		if (error)
 			return (error);
 		newvp = NFSTOV(np);
@@ -1605,7 +1605,7 @@
 		error = 0;
 		goto out;
 	}
-	if ((error = vn_lock(fvp, LK_EXCLUSIVE, fcnp->cn_thread)) != 0)
+	if ((error = vn_lock(fvp, LK_EXCLUSIVE)) != 0)
 		goto out;
 
 	/*
--- //depot/vendor/freebsd/src/sys/nfsserver/nfs_serv.c	2007/10/18 16:45:10
+++ //depot/user/attilio/attilio_schedlock/nfsserver/nfs_serv.c	2008/01/08 16:10:31
@@ -1484,7 +1484,7 @@
 			if (vn_start_write(vp, &mntp, V_NOWAIT) != 0) {
 			    VOP_UNLOCK(vp, 0, td);
 			    error = vn_start_write(NULL, &mntp, V_WAIT);
-			    vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+			    vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 			}
 		        mvfslocked = VFS_LOCK_GIANT(mntp);
 		    }
@@ -1888,7 +1888,7 @@
 			nd.ni_dvp = NULL;
 			nd.ni_vp = NULL;
 
-			vn_lock(dirp, LK_EXCLUSIVE | LK_RETRY, td);
+			vn_lock(dirp, LK_EXCLUSIVE | LK_RETRY);
 			diraft_ret = VOP_GETATTR(dirp, &diraft, cred, td);
 			VOP_UNLOCK(dirp, 0, td);
 		}
@@ -2090,7 +2090,7 @@
 	}
 	NDFREE(&nd, NDF_ONLY_PNBUF);
 	if (dirp) {
-		vn_lock(dirp, LK_EXCLUSIVE | LK_RETRY, td);
+		vn_lock(dirp, LK_EXCLUSIVE | LK_RETRY);
 		diraft_ret = VOP_GETATTR(dirp, &diraft, cred, td);
 		VOP_UNLOCK(dirp, 0, td);
 	}
@@ -2207,7 +2207,7 @@
 			nd.ni_dvp = NULL;
 			nd.ni_vp = NULL;
 
-			vn_lock(dirp, LK_EXCLUSIVE | LK_RETRY, td);
+			vn_lock(dirp, LK_EXCLUSIVE | LK_RETRY);
 			diraft_ret = VOP_GETATTR(dirp, &diraft, cred, td);
 			VOP_UNLOCK(dirp, 0, td);
 		}
@@ -2418,12 +2418,12 @@
 		tond.ni_vp = NULL;
 
 		if (fdirp) {
-			vn_lock(fdirp, LK_EXCLUSIVE | LK_RETRY, td);
+			vn_lock(fdirp, LK_EXCLUSIVE | LK_RETRY);
 			fdiraft_ret = VOP_GETATTR(fdirp, &fdiraft, cred, td);
 			VOP_UNLOCK(fdirp, 0, td);
 		}
 		if (tdirp) {
-			vn_lock(tdirp, LK_EXCLUSIVE | LK_RETRY, td);
+			vn_lock(tdirp, LK_EXCLUSIVE | LK_RETRY);
 			tdiraft_ret = VOP_GETATTR(tdirp, &tdiraft, cred, td);
 			VOP_UNLOCK(tdirp, 0, td);
 		}
@@ -2558,7 +2558,7 @@
 		vp = NULL;
 		goto out2;
 	}
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	error = VOP_LINK(nd.ni_dvp, vp, &nd.ni_cnd);
 	NDFREE(&nd, NDF_ONLY_PNBUF);
 	/* fall through */
@@ -2583,7 +2583,7 @@
 			nd.ni_dvp = NULL;
 			nd.ni_vp = NULL;
 
-			vn_lock(dirp, LK_EXCLUSIVE | LK_RETRY, td);
+			vn_lock(dirp, LK_EXCLUSIVE | LK_RETRY);
 			diraft_ret = VOP_GETATTR(dirp, &diraft, cred, td);
 			VOP_UNLOCK(dirp, 0, td);
 		}
@@ -2759,7 +2759,7 @@
 		pathcp = NULL;
 	}
 	if (dirp) {
-		vn_lock(dirp, LK_EXCLUSIVE | LK_RETRY, td);
+		vn_lock(dirp, LK_EXCLUSIVE | LK_RETRY);
 		diraft_ret = VOP_GETATTR(dirp, &diraft, cred, td);
 		VOP_UNLOCK(dirp, 0, td);
 	}
@@ -2921,7 +2921,7 @@
 			}
 			nd.ni_dvp = NULL;
 			nd.ni_vp = NULL;
-			vn_lock(dirp, LK_EXCLUSIVE | LK_RETRY, td);
+			vn_lock(dirp, LK_EXCLUSIVE | LK_RETRY);
 			diraft_ret = VOP_GETATTR(dirp, &diraft, cred, td);
 			VOP_UNLOCK(dirp, 0, td);
 		}
@@ -3058,7 +3058,7 @@
 				vput(nd.ni_vp);
 			nd.ni_dvp = NULL;
 			nd.ni_vp = NULL;
-			vn_lock(dirp, LK_EXCLUSIVE | LK_RETRY, td);
+			vn_lock(dirp, LK_EXCLUSIVE | LK_RETRY);
 			diraft_ret = VOP_GETATTR(dirp, &diraft, cred, td);
 			VOP_UNLOCK(dirp, 0, td);
 		}
@@ -3234,7 +3234,7 @@
 	io.uio_rw = UIO_READ;
 	io.uio_td = NULL;
 	eofflag = 0;
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	if (cookies) {
 		free((caddr_t)cookies, M_TEMP);
 		cookies = NULL;
@@ -3516,7 +3516,7 @@
 	io.uio_rw = UIO_READ;
 	io.uio_td = NULL;
 	eofflag = 0;
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	if (cookies) {
 		free((caddr_t)cookies, M_TEMP);
 		cookies = NULL;
--- //depot/vendor/freebsd/src/sys/nfsserver/nfs_srvsubs.c	2007/11/04 19:21:10
+++ //depot/user/attilio/attilio_schedlock/nfsserver/nfs_srvsubs.c	2008/01/08 16:10:31
@@ -687,7 +687,7 @@
 	 */
 	*retdirp = dp;
 	if (v3) {
-		vn_lock(dp, LK_EXCLUSIVE | LK_RETRY, td);
+		vn_lock(dp, LK_EXCLUSIVE | LK_RETRY);
 		*retdirattr_retp = VOP_GETATTR(dp, retdirattrp,
 			ndp->ni_cnd.cn_cred, td);
 		VOP_UNLOCK(dp, 0, td);
--- //depot/vendor/freebsd/src/sys/security/audit/audit_arg.c	2007/06/27 17:03:26
+++ //depot/user/attilio/attilio_schedlock/security/audit/audit_arg.c	2008/01/08 16:10:31
@@ -630,7 +630,7 @@
 		 */
 		vp = fp->f_vnode;
 		vfslocked = VFS_LOCK_GIANT(vp->v_mount);
-		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, curthread);
+		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 		audit_arg_vnode(vp, ARG_VNODE1);
 		VOP_UNLOCK(vp, 0, curthread);
 		VFS_UNLOCK_GIANT(vfslocked);
@@ -848,7 +848,7 @@
 
 	vp = fp->f_vnode;
 	vfslocked = VFS_LOCK_GIANT(vp->v_mount);
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	audit_arg_vnode(vp, ARG_VNODE1);
 	VOP_UNLOCK(vp, 0, td);
 	VFS_UNLOCK_GIANT(vfslocked);
--- //depot/vendor/freebsd/src/sys/security/audit/audit_bsm_klib.c	2007/10/29 18:12:27
+++ //depot/user/attilio/attilio_schedlock/security/audit/audit_bsm_klib.c	2008/01/08 16:10:31
@@ -526,7 +526,7 @@
 		 * attention.
 		 */
 		vfslocked = VFS_LOCK_GIANT(vnp->v_mount);
-		vn_lock(vnp, LK_EXCLUSIVE | LK_RETRY, td);
+		vn_lock(vnp, LK_EXCLUSIVE | LK_RETRY);
 		error = vn_fullpath(td, vnp, &retbuf, &freebuf);
 		if (error == 0) {
 			/* Copy and free buffer allocated by vn_fullpath().
--- //depot/vendor/freebsd/src/sys/security/audit/audit_worker.c	2007/10/20 23:26:42
+++ //depot/user/attilio/attilio_schedlock/security/audit/audit_worker.c	2008/01/08 16:10:31
@@ -136,7 +136,7 @@
 	error = VFS_STATFS(vp->v_mount, mnt_stat, td);
 	if (error)
 		goto fail;
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	error = VOP_GETATTR(vp, &vattr, cred, td);
 	VOP_UNLOCK(vp, 0, td);
 	if (error)
--- //depot/vendor/freebsd/src/sys/security/mac/mac_process.c	2007/10/25 12:36:03
+++ //depot/user/attilio/attilio_schedlock/security/mac/mac_process.c	2008/01/08 16:10:31
@@ -365,7 +365,7 @@
 			continue;
 		vp = (struct vnode *)object->handle;
 		vfslocked = VFS_LOCK_GIANT(vp->v_mount);
-		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 		result = vme->max_protection;
 		mac_vnode_check_mmap_downgrade(cred, vp, &result);
 		VOP_UNLOCK(vp, 0, td);
@@ -401,7 +401,7 @@
 				 */
 				vm_object_reference(object);
 				(void) vn_start_write(vp, &mp, V_WAIT);
-				vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+				vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 				VM_OBJECT_LOCK(object);
 				vm_object_page_clean(object,
 				    OFF_TO_IDX(offset),
--- //depot/vendor/freebsd/src/sys/security/mac/mac_syscalls.c	2007/10/24 19:06:35
+++ //depot/user/attilio/attilio_schedlock/security/mac/mac_syscalls.c	2008/01/08 16:10:31
@@ -255,7 +255,7 @@
 		vp = fp->f_vnode;
 		intlabel = mac_vnode_label_alloc();
 		vfslocked = VFS_LOCK_GIANT(vp->v_mount);
-		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 		mac_vnode_copy_label(vp->v_label, intlabel);
 		VOP_UNLOCK(vp, 0, td);
 		VFS_UNLOCK_GIANT(vfslocked);
@@ -448,7 +448,7 @@
 			mac_vnode_label_free(intlabel);
 			break;
 		}
-		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 		error = vn_setlabel(vp, intlabel, td->td_ucred);
 		VOP_UNLOCK(vp, 0, td);
 		vn_finished_write(mp);
--- //depot/vendor/freebsd/src/sys/sys/vnode.h	2007/10/20 09:46:47
+++ //depot/user/attilio/attilio_schedlock/sys/vnode.h	2008/01/08 16:10:31
@@ -608,8 +608,8 @@
 void	vn_finished_write(struct mount *mp);
 void	vn_finished_secondary_write(struct mount *mp);
 int	vn_isdisk(struct vnode *vp, int *errp);
-int	_vn_lock(struct vnode *vp, int flags, struct thread *td, char *file, int line);
-#define vn_lock(vp, flags, td) _vn_lock(vp, flags, td, __FILE__, __LINE__)
+int	_vn_lock(struct vnode *vp, int flags, char *file, int line);
+#define vn_lock(vp, flags) _vn_lock(vp, flags, __FILE__, __LINE__)
 int	vn_open(struct nameidata *ndp, int *flagp, int cmode, struct file *fp);
 int	vn_open_cred(struct nameidata *ndp, int *flagp, int cmode,
 	    struct ucred *cred, struct file *fp);
--- //depot/vendor/freebsd/src/sys/ufs/ffs/ffs_snapshot.c	2007/11/08 17:23:44
+++ //depot/user/attilio/attilio_schedlock/ufs/ffs/ffs_snapshot.c	2008/01/08 16:10:31
@@ -406,14 +406,14 @@
 		vn_finished_write(wrtmp);
 		if ((error = vfs_write_suspend(vp->v_mount)) != 0) {
 			vn_start_write(NULL, &wrtmp, V_WAIT);
-			vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+			vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 			goto out;
 		}
 		if (mp->mnt_kern_flag & MNTK_SUSPENDED)
 			break;
 		vn_start_write(NULL, &wrtmp, V_WAIT);
 	}
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	if (ip->i_effnlink == 0) {
 		error = ENOENT;		/* Snapshot file unlinked */
 		goto out1;
@@ -534,7 +534,7 @@
 			continue;
 		}
 		vholdl(xvp);
-		if (vn_lock(xvp, LK_EXCLUSIVE | LK_INTERLOCK, td) != 0) {
+		if (vn_lock(xvp, LK_EXCLUSIVE | LK_INTERLOCK) != 0) {
 			MNT_ILOCK(mp);
 			MNT_VNODE_FOREACH_ABORT_ILOCKED(mp, mvp);
 			vdrop(xvp);
@@ -801,7 +801,7 @@
 		     fsbtodb(fs, ino_to_fsba(fs, ip->i_number)),
 		     (int) fs->fs_bsize, NOCRED, &nbp);
 	brelse(nbp);
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	if (ip->i_effnlink == 0)
 		error = ENOENT;		/* Snapshot file unlinked */
 	else
@@ -2001,7 +2001,7 @@
 	auio.uio_segflg = UIO_SYSSPACE;
 	auio.uio_rw = UIO_READ;
 	auio.uio_td = td;
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	if ((error = VOP_READ(vp, &auio, IO_UNIT, td->td_ucred)) != 0) {
 		printf("ffs_snapshot_mount: read_1 failed %d\n", error);
 		VOP_UNLOCK(vp, 0, td);
@@ -2451,7 +2451,7 @@
 		}
 		MNT_IUNLOCK(mp);
 		vholdl(vp);
-		error = vn_lock(vp, LK_EXCLUSIVE | LK_INTERLOCK, td);
+		error = vn_lock(vp, LK_EXCLUSIVE | LK_INTERLOCK);
 		if (error != 0) {
 			vdrop(vp);
 			MNT_ILOCK(mp);
--- //depot/vendor/freebsd/src/sys/ufs/ffs/ffs_softdep.c	2007/11/09 11:06:35
+++ //depot/user/attilio/attilio_schedlock/ufs/ffs/ffs_softdep.c	2008/01/08 16:10:31
@@ -1029,7 +1029,7 @@
 	devvp = ump->um_devvp;
 	while ((count = softdep_process_worklist(oldmnt, 1)) > 0) {
 		*countp += count;
-		vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, td);
+		vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY);
 		error = VOP_FSYNC(devvp, MNT_WAIT, td);
 		VOP_UNLOCK(devvp, 0, td);
 		if (error)
@@ -5077,7 +5077,7 @@
 		if (ffs_vget(mp, parentino, LK_NOWAIT | LK_EXCLUSIVE, &pvp)) {
 			VOP_UNLOCK(vp, 0, td);
 			error = ffs_vget(mp, parentino, LK_EXCLUSIVE, &pvp);
-			vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+			vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 			if (error != 0)
 				return (error);
 		}
--- //depot/vendor/freebsd/src/sys/ufs/ffs/ffs_vfsops.c	2007/10/24 19:06:35
+++ //depot/user/attilio/attilio_schedlock/ufs/ffs/ffs_vfsops.c	2008/01/08 16:10:31
@@ -261,7 +261,7 @@
 			 * If upgrade to read-write by non-root, then verify
 			 * that user has necessary permissions on the device.
 			 */
-			vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, td);
+			vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY);
 			error = VOP_ACCESS(devvp, VREAD | VWRITE,
 			    td->td_ucred, td);
 			if (error)
@@ -467,7 +467,7 @@
 	 * Step 1: invalidate all cached meta-data.
 	 */
 	devvp = VFSTOUFS(mp)->um_devvp;
-	vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY);
 	if (vinvalbuf(devvp, 0, td, 0, 0) != 0)
 		panic("ffs_reload: dirty1");
 	VOP_UNLOCK(devvp, 0, td);
@@ -1120,7 +1120,7 @@
 	/*
 	 * Flush filesystem metadata.
 	 */
-	vn_lock(ump->um_devvp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(ump->um_devvp, LK_EXCLUSIVE | LK_RETRY);
 	error = VOP_FSYNC(ump->um_devvp, MNT_WAIT, td);
 	VOP_UNLOCK(ump->um_devvp, 0, td);
 	return (error);
@@ -1270,7 +1270,7 @@
 	bo = &devvp->v_bufobj;
 	if (waitfor != MNT_LAZY &&
 	    (bo->bo_numoutput > 0 || bo->bo_dirty.bv_cnt > 0)) {
-		vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY | LK_INTERLOCK, td);
+		vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY | LK_INTERLOCK);
 		if ((error = VOP_FSYNC(devvp, waitfor, td)) != 0)
 			allerror = error;
 		VOP_UNLOCK(devvp, 0, td);
--- //depot/vendor/freebsd/src/sys/ufs/ufs/ufs_extattr.c	2007/06/01 14:37:18
+++ //depot/user/attilio/attilio_schedlock/ufs/ufs/ufs_extattr.c	2008/01/08 16:10:31
@@ -612,7 +612,7 @@
 	auio.uio_rw = UIO_READ;
 	auio.uio_td = td;
 
-	vn_lock(backing_vnode, LK_SHARED | LK_RETRY, td);
+	vn_lock(backing_vnode, LK_SHARED | LK_RETRY);
 	error = VOP_READ(backing_vnode, &auio, IO_NODELOCKED,
 	    ump->um_extattr.uepm_ucred);
 
@@ -672,8 +672,7 @@
 
 	LIST_REMOVE(uele, uele_entries);
 
-	vn_lock(uele->uele_backing_vnode, LK_SHARED | LK_RETRY,
-	    td);
+	vn_lock(uele->uele_backing_vnode, LK_SHARED | LK_RETRY);
 	ASSERT_VOP_LOCKED(uele->uele_backing_vnode, "ufs_extattr_disable");
 	VOP_UNLOCK(uele->uele_backing_vnode, 0, td);
 	error = vn_close(uele->uele_backing_vnode, FREAD|FWRITE,
@@ -875,8 +874,7 @@
 	 * being applied to the backing file, as the lock is already held.
 	 */
 	if (attribute->uele_backing_vnode != vp)
-		vn_lock(attribute->uele_backing_vnode, LK_SHARED |
-		    LK_RETRY, td);
+		vn_lock(attribute->uele_backing_vnode, LK_SHARED | LK_RETRY);
 
 	error = VOP_READ(attribute->uele_backing_vnode, &local_aio,
 	    IO_NODELOCKED, ump->um_extattr.uepm_ucred);
@@ -1085,8 +1083,7 @@
 	 * being applied to the backing file, as the lock is already held.
 	 */
 	if (attribute->uele_backing_vnode != vp)
-		vn_lock(attribute->uele_backing_vnode, 
-		    LK_EXCLUSIVE | LK_RETRY, td);
+		vn_lock(attribute->uele_backing_vnode, LK_EXCLUSIVE | LK_RETRY);
 
 	ioflag = IO_NODELOCKED;
 	if (ufs_extattr_sync)
@@ -1182,8 +1179,7 @@
 	 * modifying is it, as we already hold the lock.
 	 */
 	if (attribute->uele_backing_vnode != vp)
-		vn_lock(attribute->uele_backing_vnode,
-		    LK_EXCLUSIVE | LK_RETRY, td);
+		vn_lock(attribute->uele_backing_vnode, LK_EXCLUSIVE | LK_RETRY);
 
 	error = VOP_READ(attribute->uele_backing_vnode, &local_aio,
 	    IO_NODELOCKED, ump->um_extattr.uepm_ucred);
--- //depot/vendor/freebsd/src/sys/ufs/ufs/ufs_lookup.c	2007/11/08 17:23:44
+++ //depot/user/attilio/attilio_schedlock/ufs/ufs/ufs_lookup.c	2008/01/08 16:10:31
@@ -562,7 +562,7 @@
 		VOP_UNLOCK(pdp, 0, td);	/* race to get the inode */
 		error = VFS_VGET(pdp->v_mount, saved_ino,
 		    cnp->cn_lkflags, &tdp);
-		vn_lock(pdp, LK_EXCLUSIVE | LK_RETRY, td);
+		vn_lock(pdp, LK_EXCLUSIVE | LK_RETRY);
 		if (error)
 			return (error);
 		*vpp = tdp;
@@ -787,7 +787,7 @@
 				VOP_UNLOCK(tvp, 0, td);
 			error = VOP_FSYNC(dvp, MNT_WAIT, td);
 			if (tvp != NULL)
-				vn_lock(tvp, LK_EXCLUSIVE | LK_RETRY, td);
+				vn_lock(tvp, LK_EXCLUSIVE | LK_RETRY);
 			return (error);
 		}
 		if (DOINGASYNC(dvp)) {
@@ -950,7 +950,7 @@
 		(void) UFS_TRUNCATE(dvp, (off_t)dp->i_endoff,
 		    IO_NORMAL | IO_SYNC, cr, td);
 		if (tvp != NULL)
-			vn_lock(tvp, LK_EXCLUSIVE | LK_RETRY, td);
+			vn_lock(tvp, LK_EXCLUSIVE | LK_RETRY);
 	}
 	return (error);
 }
--- //depot/vendor/freebsd/src/sys/ufs/ufs/ufs_quota.c	2007/06/12 00:12:34
+++ //depot/user/attilio/attilio_schedlock/ufs/ufs/ufs_quota.c	2008/01/09 13:08:41
@@ -554,7 +554,7 @@
 	if (*vpp != vp)
 		quotaoff1(td, mp, type);
 
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	vp->v_vflag |= VV_SYSTEM;
 	VOP_UNLOCK(vp, 0, td);
 	*vpp = vp;
@@ -693,7 +693,7 @@
 	UFS_UNLOCK(ump);
 
 	vfslocked = VFS_LOCK_GIANT(qvp->v_mount);
-	vn_lock(qvp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(qvp, LK_EXCLUSIVE | LK_RETRY);
 	qvp->v_vflag &= ~VV_SYSTEM;
 	VOP_UNLOCK(qvp, 0, td);
 	error = vn_close(qvp, FREAD|FWRITE, td->td_ucred, td);
@@ -1087,7 +1087,6 @@
 	int type;
 	struct dquot **dqp;
 {
-	struct thread *td = curthread;		/* XXX */
 	struct dquot *dq, *dq1;
 	struct dqhash *dqh;
 	struct vnode *dqvp;
@@ -1154,7 +1153,7 @@
 	 */
 	if (vp != dqvp) {
 		DQH_UNLOCK();
-		vn_lock(dqvp, LK_SHARED | LK_RETRY, td);
+		vn_lock(dqvp, LK_SHARED | LK_RETRY);
 		dqvplocked = 1;
 		DQH_LOCK();
 		/*
@@ -1342,7 +1341,6 @@
 	struct vnode *vp;
 	struct dquot *dq;
 {
-	struct thread *td = curthread;		/* XXX */
 	struct vnode *dqvp;
 	struct iovec aiov;
 	struct uio auio;
@@ -1379,7 +1377,7 @@
 
 	(void) vn_start_secondary_write(dqvp, &mp, V_WAIT);
 	if (vp != dqvp)
-		vn_lock(dqvp, LK_EXCLUSIVE | LK_RETRY, td);
+		vn_lock(dqvp, LK_EXCLUSIVE | LK_RETRY);
 
 	VFS_UNLOCK_GIANT(vfslocked);
 	DQI_LOCK(dq);
--- //depot/vendor/freebsd/src/sys/ufs/ufs/ufs_vnops.c	2007/11/08 17:23:44
+++ //depot/user/attilio/attilio_schedlock/ufs/ufs/ufs_vnops.c	2008/01/08 16:10:31
@@ -831,7 +831,7 @@
 		 */
 		VOP_UNLOCK(vp, 0, td);
 		(void) VOP_FSYNC(dvp, MNT_WAIT, td);
-		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	}
 out:
 	return (error);
@@ -1037,7 +1037,7 @@
 		goto abortit;
 	}
 
-	if ((error = vn_lock(fvp, LK_EXCLUSIVE, td)) != 0)
+	if ((error = vn_lock(fvp, LK_EXCLUSIVE)) != 0)
 		goto abortit;
 	dp = VTOI(fdvp);
 	ip = VTOI(fvp);
@@ -1342,7 +1342,7 @@
 out:
 	if (doingdirectory)
 		ip->i_flag &= ~IN_RENAME;
-	if (vn_lock(fvp, LK_EXCLUSIVE, td) == 0) {
+	if (vn_lock(fvp, LK_EXCLUSIVE) == 0) {
 		ip->i_effnlink--;
 		ip->i_nlink--;
 		DIP_SET(ip, i_nlink, ip->i_nlink);
--- //depot/vendor/freebsd/src/sys/vm/swap_pager.c	2008/01/08 15:00:39
+++ //depot/user/attilio/attilio_schedlock/vm/swap_pager.c	2008/01/08 16:13:01
@@ -2118,7 +2118,7 @@
 
 	mtx_assert(&Giant, MA_OWNED);
 #ifdef MAC
-	(void) vn_lock(sp->sw_vp, LK_EXCLUSIVE | LK_RETRY, curthread);
+	(void) vn_lock(sp->sw_vp, LK_EXCLUSIVE | LK_RETRY);
 	error = mac_system_check_swapoff(cred, sp->sw_vp);
 	(void) VOP_UNLOCK(sp->sw_vp, 0, curthread);
 	if (error != 0)
@@ -2458,7 +2458,7 @@
 	int error;
 	struct swh0h0 swh;
 
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 
 	swh.dev = vp->v_rdev;
 	swh.vp = vp;
@@ -2527,7 +2527,7 @@
 	}
 	mtx_unlock(&sw_dev_mtx);
     
-	(void) vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	(void) vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 #ifdef MAC
 	error = mac_system_check_swapon(td->td_ucred, vp);
 	if (error == 0)
--- //depot/vendor/freebsd/src/sys/vm/vm_contig.c	2007/11/25 20:43:36
+++ //depot/user/attilio/attilio_schedlock/vm/vm_contig.c	2008/01/08 16:10:31
@@ -123,7 +123,7 @@
 			VM_OBJECT_UNLOCK(object);
 			(void) vn_start_write(vp, &mp, V_WAIT);
 			vfslocked = VFS_LOCK_GIANT(vp->v_mount);
-			vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, curthread);
+			vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 			VM_OBJECT_LOCK(object);
 			vm_object_page_clean(object, 0, 0, OBJPC_SYNC);
 			VM_OBJECT_UNLOCK(object);
--- //depot/vendor/freebsd/src/sys/vm/vm_object.c	2007/12/29 19:55:58
+++ //depot/user/attilio/attilio_schedlock/vm/vm_object.c	2008/01/08 16:10:31
@@ -1046,7 +1046,7 @@
 		VM_OBJECT_UNLOCK(object);
 		(void) vn_start_write(vp, &mp, V_WAIT);
 		vfslocked = VFS_LOCK_GIANT(vp->v_mount);
-		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, curthread);
+		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 		flags = (syncio || invalidate) ? OBJPC_SYNC : 0;
 		flags |= invalidate ? OBJPC_INVAL : 0;
 		VM_OBJECT_LOCK(object);
--- //depot/vendor/freebsd/src/sys/vm/vnode_pager.c	2007/11/22 20:01:59
+++ //depot/user/attilio/attilio_schedlock/vm/vnode_pager.c	2008/01/08 16:10:31
@@ -115,7 +115,7 @@
 		VOP_UNLOCK(vp, 0, td);
 		vm_object_set_flag(object, OBJ_DISCONNECTWNT);
 		msleep(object, VM_OBJECT_MTX(object), PDROP | PVM, "vodead", 0);
-		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	}
 
 	if (size == 0) {