Index: sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
===================================================================
--- sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	(revision 308826)
+++ sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	(working copy)
@@ -5963,6 +5963,10 @@ zfs_vptocnp(struct vop_vptocnp_args *ap)
 }
 
 #ifdef DIAGNOSTIC
+#define CHECK_LOR	((flags & LK_NOWAIT) == 0 && vp->v_mount != NULL && \
+    (vp->v_iflag & VI_DOOMED) == 0 && vp->v_data != NULL && \
+    (zp->z_pflags & ZFS_XATTR) == 0)
+
 static int
 zfs_lock(ap)
 	struct vop_lock1_args /* {
@@ -5979,22 +5983,21 @@ zfs_lock(ap)
 	int err;
 
 	vp = ap->a_vp;
+	zp = vp->v_data;
 	flags = ap->a_flags;
-	if ((flags & LK_INTERLOCK) == 0 && (flags & LK_NOWAIT) == 0 &&
-	    (vp->v_iflag & VI_DOOMED) == 0 && (zp = vp->v_data) != NULL &&
-	    (zp->z_pflags & ZFS_XATTR) == 0) {
+	if ((flags & LK_INTERLOCK) == 0 && CHECK_LOR) {
 		zfsvfs = zp->z_zfsvfs;
 		VERIFY(!RRM_LOCK_HELD(&zfsvfs->z_teardown_lock));
 	}
 	err = vop_stdlock(ap);
-	if ((flags & LK_INTERLOCK) != 0 && (flags & LK_NOWAIT) == 0 &&
-	    (vp->v_iflag & VI_DOOMED) == 0 && (zp = vp->v_data) != NULL &&
-	    (zp->z_pflags & ZFS_XATTR) == 0) {
+	if ((flags & LK_INTERLOCK) != 0 && CHECK_LOR) {
 		zfsvfs = zp->z_zfsvfs;
 		VERIFY(!RRM_LOCK_HELD(&zfsvfs->z_teardown_lock));
 	}
 	return (err);
 }
+
+#undef CHECK_LOR
 #endif
 
 struct vop_vector zfs_vnodeops;
Index: sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
===================================================================
--- sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c	(revision 308826)
+++ sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c	(working copy)
@@ -727,14 +727,7 @@ zfs_znode_alloc(zfsvfs_t *zfsvfs, dmu_buf_t *db, i
 	/*
 	 * Acquire vnode lock before making it available to the world.
 	 */
-#ifdef DIAGNOSTIC
-	vop_lock1_t *orig_lock = vp->v_op->vop_lock1;
-	vp->v_op->vop_lock1 = vop_stdlock;
 	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
-	vp->v_op->vop_lock1 = orig_lock;
-#else
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
-#endif
 	VN_LOCK_AREC(vp);
 	if (vp->v_type != VFIFO)
 		VN_LOCK_ASHARE(vp);