From owner-svn-src-all@FreeBSD.ORG  Mon May  3 17:55:32 2010
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 C11D4106566B;
	Mon,  3 May 2010 17:55:32 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id B1BF48FC1F;
	Mon,  3 May 2010 17:55:32 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o43HtW2Q050923;
	Mon, 3 May 2010 17:55:32 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o43HtWBZ050921;
	Mon, 3 May 2010 17:55:32 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <201005031755.o43HtWBZ050921@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Mon, 3 May 2010 17:55:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r207577 - head/sys/vm
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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, 03 May 2010 17:55:32 -0000

Author: alc
Date: Mon May  3 17:55:32 2010
New Revision: 207577
URL: http://svn.freebsd.org/changeset/base/207577

Log:
  Acquire the page lock around vm_page_wire() in vm_page_grab().
  
  Assert that the page lock is held in vm_page_wire().

Modified:
  head/sys/vm/vm_page.c

Modified: head/sys/vm/vm_page.c
==============================================================================
--- head/sys/vm/vm_page.c	Mon May  3 17:35:31 2010	(r207576)
+++ head/sys/vm/vm_page.c	Mon May  3 17:55:32 2010	(r207577)
@@ -1544,6 +1544,7 @@ vm_page_wire(vm_page_t m)
 	 * it is already off the queues).
 	 */
 	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+	vm_page_lock_assert(m, MA_OWNED);
 	if (m->flags & PG_FICTITIOUS)
 		return;
 	if (m->wire_count == 0) {
@@ -1914,9 +1915,11 @@ retrylookup:
 			goto retrylookup;
 		} else {
 			if ((allocflags & VM_ALLOC_WIRED) != 0) {
+				vm_page_lock(m);
 				vm_page_lock_queues();
 				vm_page_wire(m);
 				vm_page_unlock_queues();
+				vm_page_unlock(m);
 			}
 			if ((allocflags & VM_ALLOC_NOBUSY) == 0)
 				vm_page_busy(m);