[Midnightbsd-cvs] src [8646] trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c: zfs_getpages: make use of vm_page_readahead_finish

[laffer1 at midnightbsd.org]

Revision: 8646
          http://svnweb.midnightbsd.org/src/?rev=8646
Author:   laffer1
Date:     2016-09-25 14:21:47 -0400 (Sun, 25 Sep 2016)
Log Message:
-----------
zfs_getpages: make use of vm_page_readahead_finish

Modified Paths:
--------------
    trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c

Modified: trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
===================================================================
--- trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	2016-09-25 18:21:25 UTC (rev 8645)
+++ trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	2016-09-25 18:21:47 UTC (rev 8646)
@@ -5675,27 +5675,11 @@
 	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);