From owner-svn-src-all@FreeBSD.ORG  Sun May  9 16:27:43 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 39A54106566C;
	Sun,  9 May 2010 16:27:43 +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 29B158FC12;
	Sun,  9 May 2010 16:27:43 +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 o49GRghM085234;
	Sun, 9 May 2010 16:27:42 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o49GRgGC085232;
	Sun, 9 May 2010 16:27:42 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <201005091627.o49GRgGC085232@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Sun, 9 May 2010 16:27:42 +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: r207822 - 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 16:27:43 -0000

Author: alc
Date: Sun May  9 16:27:42 2010
New Revision: 207822
URL: http://svn.freebsd.org/changeset/base/207822

Log:
  Call vm_page_deactivate() rather than vm_page_dontneed() in
  swp_pager_force_pagein().  By dirtying the page, swp_pager_force_pagein()
  forces vm_page_dontneed() to insert the page at the head of the inactive
  queue, just like vm_page_deactivate() does.  Moreover, because the page
  was invalid, it can't have been mapped, and thus the other effect of
  vm_page_dontneed(), clearing the page's reference bits has no effect.  In
  summary, there is no reason to call vm_page_dontneed() since its effect
  will be identical to calling the simpler vm_page_deactivate().

Modified:
  head/sys/vm/swap_pager.c

Modified: head/sys/vm/swap_pager.c
==============================================================================
--- head/sys/vm/swap_pager.c	Sun May  9 16:15:40 2010	(r207821)
+++ head/sys/vm/swap_pager.c	Sun May  9 16:27:42 2010	(r207822)
@@ -1719,11 +1719,9 @@ swp_pager_force_pagein(vm_object_t objec
 	if (swap_pager_getpages(object, &m, 1, 0) != VM_PAGER_OK)
 		panic("swap_pager_force_pagein: read from swap failed");/*XXX*/
 	vm_object_pip_subtract(object, 1);
-	vm_page_lock(m);
-	vm_page_lock_queues();
 	vm_page_dirty(m);
-	vm_page_dontneed(m);
-	vm_page_unlock_queues();
+	vm_page_lock(m);
+	vm_page_deactivate(m);
 	vm_page_unlock(m);
 	vm_page_wakeup(m);
 	vm_pager_page_unswapped(m);