--- fs/nfsclient/nfs_clvnops.c	2016-02-19 18:01:47.796969000 -0500
+++ fs/nfsclient/nfs_clvnops.c	2016-02-19 18:06:15.135933000 -0500
@@ -3368,11 +3368,8 @@ nfs_lock1(struct vop_lock1_args *ap)
 	 * there isn't any race problem.
 	 */
 	if ((ap->a_flags & LK_TYPE_MASK) == LK_EXCLOTHER) {
-		if ((ap->a_flags & LK_INTERLOCK) == 0)
-			panic("ncllock1");
 		if ((vp->v_iflag & VI_DOOMED))
 			error = ENOENT;
-		VI_UNLOCK(vp);
 		return (error);
 	}
 	return (_lockmgr_args(vp->v_vnlock, ap->a_flags, VI_MTX(vp),