Index: sys/kern/vfs_default.c =================================================================== --- sys/kern/vfs_default.c +++ sys/kern/vfs_default.c @@ -525,11 +525,8 @@ } */ *ap; { struct vnode *vp = ap->a_vp; - struct mtx *ilk; - ilk = VI_MTX(vp); - return (lockmgr_unlock_fast_path(vp->v_vnlock, ap->a_flags, - &ilk->lock_object)); + return (lockmgr_unlock_fast_path(vp->v_vnlock, 0, NULL)); } /* See above. */ Index: sys/kern/vfs_lookup.c =================================================================== --- sys/kern/vfs_lookup.c +++ sys/kern/vfs_lookup.c @@ -119,14 +119,10 @@ { struct vnode *vp; struct lock *lk __unused; - int flags; vp = ap->a_vp; lk = vp->v_vnlock; - flags = ap->a_flags; - if ((flags & LK_INTERLOCK) != 0) - VI_UNLOCK(vp); WITNESS_UNLOCK(&lk->lock_object, 0, LOCK_FILE, LOCK_LINE); LOCK_LOG_LOCK("SUNLOCK", &lk->lock_object, 0, 0, LOCK_FILE, LOCK_LINE); Index: sys/kern/vfs_subr.c =================================================================== --- sys/kern/vfs_subr.c +++ sys/kern/vfs_subr.c @@ -4881,18 +4881,13 @@ { struct vop_unlock_args *a = ap; - if (a->a_flags & LK_INTERLOCK) - ASSERT_VI_LOCKED(a->a_vp, "VOP_UNLOCK"); ASSERT_VOP_LOCKED(a->a_vp, "VOP_UNLOCK"); } void vop_unlock_post(void *ap, int rc) { - struct vop_unlock_args *a = ap; - - if (a->a_flags & LK_INTERLOCK) - ASSERT_VI_UNLOCKED(a->a_vp, "VOP_UNLOCK"); + return; } #endif Index: sys/kern/vnode_if.src =================================================================== --- sys/kern/vnode_if.src +++ sys/kern/vnode_if.src @@ -384,7 +384,6 @@ vop_unlock { IN struct vnode *vp; - IN int flags; };