From 289b3b96acdb69b88c907c26780c19d94271d1e3 Mon Sep 17 00:00:00 2001 From: Andriy Gapon Date: Sat, 1 Dec 2012 18:13:53 +0000 Subject: [PATCH] zfs_getpages: make use of vm_page_readahead_finish Suggested by: kib MFC after: 5 days --- .../opensolaris/uts/common/fs/zfs/zfs_vnops.c | 24 ++++--------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c index c07400d9666..7a29ff0e5d3 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c @@ -5675,27 +5675,11 @@ zfs_getpages(struct vnode *vp, vm_page_t *m, int count, int reqpage) 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);