From owner-svn-src-head@FreeBSD.ORG  Sat Jun  6 20:13:15 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 3B48C106566B;
	Sat,  6 Jun 2009 20:13:15 +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 296B48FC0C;
	Sat,  6 Jun 2009 20:13:15 +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 n56KDEft070718;
	Sat, 6 Jun 2009 20:13:14 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n56KDEgU070716;
	Sat, 6 Jun 2009 20:13:14 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <200906062013.n56KDEgU070716@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Sat, 6 Jun 2009 20:13:14 +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: r193593 - in head/sys: kern vm
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: Sat, 06 Jun 2009 20:13:15 -0000

Author: alc
Date: Sat Jun  6 20:13:14 2009
New Revision: 193593
URL: http://svn.freebsd.org/changeset/base/193593

Log:
  If vm_pager_get_pages() returns VM_PAGER_OK, then there is no need to check
  the page's valid bits.  The page is guaranteed to be fully valid.  (For the
  record, this is documented in vm/vm_pager.h's comments.)

Modified:
  head/sys/kern/kern_exec.c
  head/sys/vm/vm_glue.c

Modified: head/sys/kern/kern_exec.c
==============================================================================
--- head/sys/kern/kern_exec.c	Sat Jun  6 19:07:15 2009	(r193592)
+++ head/sys/kern/kern_exec.c	Sat Jun  6 20:13:14 2009	(r193593)
@@ -948,8 +948,7 @@ exec_map_first_page(imgp)
 		initial_pagein = i;
 		rv = vm_pager_get_pages(object, ma, initial_pagein, 0);
 		ma[0] = vm_page_lookup(object, 0);
-		if ((rv != VM_PAGER_OK) || (ma[0] == NULL) ||
-		    (ma[0]->valid == 0)) {
+		if ((rv != VM_PAGER_OK) || (ma[0] == NULL)) {
 			if (ma[0]) {
 				vm_page_lock_queues();
 				vm_page_free(ma[0]);

Modified: head/sys/vm/vm_glue.c
==============================================================================
--- head/sys/vm/vm_glue.c	Sat Jun  6 19:07:15 2009	(r193592)
+++ head/sys/vm/vm_glue.c	Sat Jun  6 20:13:14 2009	(r193593)
@@ -259,7 +259,7 @@ vm_imgact_hold_page(vm_object_t object, 
 		m = vm_page_lookup(object, pindex);
 		if (m == NULL)
 			goto out;
-		if (m->valid == 0 || rv != VM_PAGER_OK) {
+		if (rv != VM_PAGER_OK) {
 			vm_page_lock_queues();
 			vm_page_free(m);
 			vm_page_unlock_queues();