From owner-svn-src-all@FreeBSD.ORG  Sun May  9 00:32:52 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 E5E95106564A;
	Sun,  9 May 2010 00:32:52 +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 D626A8FC0C;
	Sun,  9 May 2010 00:32:52 +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 o490Wqm3074260;
	Sun, 9 May 2010 00:32:52 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o490Wqfp074258;
	Sun, 9 May 2010 00:32:52 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <201005090032.o490Wqfp074258@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Sun, 9 May 2010 00:32:52 +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: r207806 - 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: Sun, 09 May 2010 00:32:53 -0000

Author: alc
Date: Sun May  9 00:32:52 2010
New Revision: 207806
URL: http://svn.freebsd.org/changeset/base/207806

Log:
  Remove the page queues lock around a call to vm_page_activate().  Make the
  page dirty before adding it to the active queue.

Modified:
  head/sys/vm/swap_pager.c

Modified: head/sys/vm/swap_pager.c
==============================================================================
--- head/sys/vm/swap_pager.c	Sat May  8 23:01:47 2010	(r207805)
+++ head/sys/vm/swap_pager.c	Sun May  9 00:32:52 2010	(r207806)
@@ -1707,11 +1707,9 @@ swp_pager_force_pagein(vm_object_t objec
 	m = vm_page_grab(object, pindex, VM_ALLOC_NORMAL|VM_ALLOC_RETRY);
 	if (m->valid == VM_PAGE_BITS_ALL) {
 		vm_object_pip_subtract(object, 1);
+		vm_page_dirty(m);
 		vm_page_lock(m);
-		vm_page_lock_queues();
 		vm_page_activate(m);
-		vm_page_dirty(m);
-		vm_page_unlock_queues();
 		vm_page_unlock(m);
 		vm_page_wakeup(m);
 		vm_pager_page_unswapped(m);