svn commit: r250178 - stable/9/sys/kern

[Rick Macklem]

Author: rmacklem
Date: Thu May  2 13:34:40 2013
New Revision: 250178
URL: http://svnweb.freebsd.org/changeset/base/250178

Log:
  MFC: r249548
  Allow the vnode to be unlocked for the weird case of
  LK_EXCLOTHER. LK_EXCLOTHER is only used to acquire a
  usecount on a vnode during NFSv4 recovery from an
  expired lease.

Modified:
  stable/9/sys/kern/vfs_subr.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/kern/vfs_subr.c
==============================================================================
--- stable/9/sys/kern/vfs_subr.c	Thu May  2 12:52:49 2013	(r250177)
+++ stable/9/sys/kern/vfs_subr.c	Thu May  2 13:34:40 2013	(r250178)
@@ -4182,7 +4182,7 @@ vop_lock_post(void *ap, int rc)
 	struct vop_lock1_args *a = ap;
 
 	ASSERT_VI_UNLOCKED(a->a_vp, "VOP_LOCK");
-	if (rc == 0)
+	if (rc == 0 && (a->a_flags & LK_EXCLOTHER) == 0)
 		ASSERT_VOP_LOCKED(a->a_vp, "VOP_LOCK");
 #endif
 }