From owner-svn-src-head@FreeBSD.ORG  Sun Feb 22 18:15:17 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 989DB10656F5;
	Sun, 22 Feb 2009 18:15:17 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 82BBC8FC27;
	Sun, 22 Feb 2009 18:15:17 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1MIFHQX002914;
	Sun, 22 Feb 2009 18:15:17 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1MIFHKQ002913;
	Sun, 22 Feb 2009 18:15:17 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <200902221815.n1MIFHKQ002913@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Sun, 22 Feb 2009 18:15:17 +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: r188921 - head/sys/fs/tmpfs
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Feb 2009 18:15:19 -0000

Author: alc
Date: Sun Feb 22 18:15:17 2009
New Revision: 188921
URL: http://svn.freebsd.org/changeset/base/188921

Log:
  Simplify the unwiring and activation of pages.
  
  MFC after:	1 week

Modified:
  head/sys/fs/tmpfs/tmpfs_vnops.c

Modified: head/sys/fs/tmpfs/tmpfs_vnops.c
==============================================================================
--- head/sys/fs/tmpfs/tmpfs_vnops.c	Sun Feb 22 17:57:35 2009	(r188920)
+++ head/sys/fs/tmpfs/tmpfs_vnops.c	Sun Feb 22 18:15:17 2009	(r188921)
@@ -496,8 +496,7 @@ nocache:
 	VM_OBJECT_LOCK(tobj);
 out:
 	vm_page_lock_queues();
-	vm_page_unwire(m, 0);
-	vm_page_activate(m);
+	vm_page_unwire(m, TRUE);
 	vm_page_unlock_queues();
 	vm_page_wakeup(m);
 	vm_object_pip_subtract(tobj, 1);
@@ -635,8 +634,7 @@ out:
 		vm_page_zero_invalid(tpg, TRUE);
 		vm_page_dirty(tpg);
 	}
-	vm_page_unwire(tpg, 0);
-	vm_page_activate(tpg);
+	vm_page_unwire(tpg, TRUE);
 	vm_page_unlock_queues();
 	vm_page_wakeup(tpg);
 	if (vpg != NULL)