From owner-svn-src-all@FreeBSD.ORG  Mon Nov 19 11:35:56 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id E487F7AE;
 Mon, 19 Nov 2012 11:35:56 +0000 (UTC) (envelope-from avg@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 C98748FC16;
 Mon, 19 Nov 2012 11:35:56 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAJBZu8J044470;
 Mon, 19 Nov 2012 11:35:56 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAJBZu8R044469;
 Mon, 19 Nov 2012 11:35:56 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201211191135.qAJBZu8R044469@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Mon, 19 Nov 2012 11:35:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r243272 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Nov 2012 11:35:57 -0000

Author: avg
Date: Mon Nov 19 11:35:56 2012
New Revision: 243272
URL: http://svnweb.freebsd.org/changeset/base/243272

Log:
  assert_vop_locked should treat LK_EXCLOTHER as the not locked case
  
  ... from a perspective of the current thread.
  
  Spotted by:	mjg
  Discussed with:	kib
  MFC after:	18 days

Modified:
  head/sys/kern/vfs_subr.c

Modified: head/sys/kern/vfs_subr.c
==============================================================================
--- head/sys/kern/vfs_subr.c	Mon Nov 19 11:32:56 2012	(r243271)
+++ head/sys/kern/vfs_subr.c	Mon Nov 19 11:35:56 2012	(r243272)
@@ -3988,7 +3988,8 @@ void
 assert_vop_locked(struct vnode *vp, const char *str)
 {
 
-	if (!IGNORE_LOCK(vp) && VOP_ISLOCKED(vp) == 0)
+	if (!IGNORE_LOCK(vp) &&
+	    (VOP_ISLOCKED(vp) == 0 || VOP_ISLOCKED(vp) == LK_EXCLOTHER))
 		vfs_badlock("is not locked but should be", str, vp);
 }