From owner-svn-src-all@FreeBSD.ORG  Sun Jan 20 16:07:01 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id ADB1446F;
 Sun, 20 Jan 2013 16:07:01 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 893EF9C9;
 Sun, 20 Jan 2013 16:07:01 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0KG71oa027922;
 Sun, 20 Jan 2013 16:07:01 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0KG71Ad027921;
 Sun, 20 Jan 2013 16:07:01 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201301201607.r0KG71Ad027921@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Sun, 20 Jan 2013 16:07:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r245692 -
 stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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, 20 Jan 2013 16:07:01 -0000

Author: avg
Date: Sun Jan 20 16:07:00 2013
New Revision: 245692
URL: http://svnweb.freebsd.org/changeset/base/245692

Log:
  MFC r243763: zfs_getpages: make use of vm_page_readahead_finish

Modified:
  stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)

Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
==============================================================================
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	Sun Jan 20 16:03:51 2013	(r245691)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	Sun Jan 20 16:07:00 2013	(r245692)
@@ -5675,27 +5675,11 @@ zfs_getpages(struct vnode *vp, vm_page_t
 	VM_OBJECT_LOCK(object);
 
 	for (i = reqstart; i < reqstart + reqsize; i++) {
-		m[i]->valid = VM_PAGE_BITS_ALL;
+		if (!error)
+			m[i]->valid = VM_PAGE_BITS_ALL;
 		KASSERT(m[i]->dirty == 0, ("zfs_getpages: page %p is dirty", m[i]));
-		if (i != reqpage) {
-			if (!error) {
-				if (m[i]->oflags & VPO_WANTED) {
-					vm_page_lock(m[i]);
-					vm_page_activate(m[i]);
-					vm_page_unlock(m[i]);
-				} else {
-					vm_page_lock(m[i]);
-					vm_page_deactivate(m[i]);
-					vm_page_unlock(m[i]);
-				}
-				vm_page_wakeup(m[i]);
-			} else {
-				vm_page_lock(m[i]);
-				vm_page_free(m[i]);
-				vm_page_unlock(m[i]);
-			}
-		}
-
+		if (i != reqpage)
+			vm_page_readahead_finish(m[i]);
 	}
 
 	VM_OBJECT_UNLOCK(object);