From owner-svn-src-user@FreeBSD.ORG  Mon Aug  5 18:11:02 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id B6FB1646;
 Mon,  5 Aug 2013 18:11:02 +0000 (UTC)
 (envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id A4F682D34;
 Mon,  5 Aug 2013 18:11:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r75IB257079271;
 Mon, 5 Aug 2013 18:11:02 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r75IB2KN079270;
 Mon, 5 Aug 2013 18:11:02 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201308051811.r75IB2KN079270@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Mon, 5 Aug 2013 18:11:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r253966 - user/attilio/vmobj-readlock/sys/vm
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Aug 2013 18:11:02 -0000

Author: attilio
Date: Mon Aug  5 18:11:02 2013
New Revision: 253966
URL: http://svnweb.freebsd.org/changeset/base/253966

Log:
  Reuse a stronger check to match original code.
  
  Sponsored by:	EMC / Isilon storage division
  Reported by:	alc

Modified:
  user/attilio/vmobj-readlock/sys/vm/vm_page.h

Modified: user/attilio/vmobj-readlock/sys/vm/vm_page.h
==============================================================================
--- user/attilio/vmobj-readlock/sys/vm/vm_page.h	Mon Aug  5 16:16:50 2013	(r253965)
+++ user/attilio/vmobj-readlock/sys/vm/vm_page.h	Mon Aug  5 18:11:02 2013	(r253966)
@@ -557,7 +557,7 @@ vm_page_aflag_set(vm_page_t m, uint8_t b
 	 * exclusive busied.  Currently, this flag is only set by pmap_enter().
 	 */
 	KASSERT((bits & PGA_WRITEABLE) == 0 ||
-	    (m->oflags & VPO_UNMANAGED) == 0 || vm_page_xbusied(m),
+	    ((m->oflags & VPO_UNMANAGED) == 0 && vm_page_xbusied(m)),
 	    ("vm_page_aflag_set: PGA_WRITEABLE and not exclusive busy"));
 
 	/*