svn commit: r249548 - head/sys/kern

[Rick Macklem]

Author: rmacklem
Date: Tue Apr 16 14:22:16 2013
New Revision: 249548
URL: http://svnweb.freebsd.org/changeset/base/249548

Log:
  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.
  
  Reported and tested by:	pho
  MFC after:	2 weeks

Modified:
  head/sys/kern/vfs_subr.c

Modified: head/sys/kern/vfs_subr.c
==============================================================================
--- head/sys/kern/vfs_subr.c	Tue Apr 16 12:31:16 2013	(r249547)
+++ head/sys/kern/vfs_subr.c	Tue Apr 16 14:22:16 2013	(r249548)
@@ -4123,7 +4123,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
 }