From owner-svn-src-stable-9@FreeBSD.ORG  Thu May  2 13:34:41 2013
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 0C0046C7;
 Thu,  2 May 2013 13:34:41 +0000 (UTC)
 (envelope-from rmacklem@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id F22B21CAA;
 Thu,  2 May 2013 13:34:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r42DYeTP063040;
 Thu, 2 May 2013 13:34:40 GMT (envelope-from rmacklem@svn.freebsd.org)
Received: (from rmacklem@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r42DYeZX063038;
 Thu, 2 May 2013 13:34:40 GMT (envelope-from rmacklem@svn.freebsd.org)
Message-Id: <201305021334.r42DYeZX063038@svn.freebsd.org>
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Thu, 2 May 2013 13:34:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r250178 - stable/9/sys/kern
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 02 May 2013 13:34:41 -0000

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
 }