Index: sys/fs/tmpfs/tmpfs_vnops.c
===================================================================
--- sys/fs/tmpfs/tmpfs_vnops.c	(revisione 233191)
+++ sys/fs/tmpfs/tmpfs_vnops.c	(copia locale)
@@ -653,21 +653,32 @@
 		goto nocache;
 	}
 lookupvpg:
-	if (((vpg = vm_page_lookup(vobj, idx)) != NULL) &&
-	    vm_page_is_valid(vpg, offset, tlen)) {
-		if ((vpg->oflags & VPO_BUSY) != 0) {
-			/*
-			 * Reference the page before unlocking and sleeping so
-			 * that the page daemon is less likely to reclaim it.  
-			 */
-			vm_page_reference(vpg);
-			vm_page_sleep(vpg, "tmfsmw");
-			goto lookupvpg;
+	if ((vpg = vm_radix_lookup(&vobj->rtree, idx, VM_RADIX_ANY)) != NULL) {
+		if (vm_page_is_valid(vpg, offset, tlen)) {
+			if ((vpg->oflags & VPO_BUSY) != 0) {
+				/*
+				 * Reference the page before unlocking and
+				 * sleeping so that the page daemon is less
+				 * likely to reclaim it.  
+			 	*/
+				vm_page_reference(vpg);
+				vm_page_sleep(vpg, "tmfsmw");
+				goto lookupvpg;
+			}
+			vm_page_busy(vpg);
+			vm_page_undirty(vpg);
+			VM_OBJECT_UNLOCK(vobj);
+			error = uiomove_fromphys(&vpg, offset, tlen, uio);
+		} else {
+			if (vpg->flags & PG_CACHED) {
+				mtx_lock(&vm_page_queue_free_mtx);
+				if (vpg->object == vobj)
+					vm_page_cache_free(vpg);
+				mtx_unlock(&vm_page_queue_free_mtx);
+			}
+			VM_OBJECT_UNLOCK(vobj);
+			vpg = NULL;
 		}
-		vm_page_busy(vpg);
-		vm_page_undirty(vpg);
-		VM_OBJECT_UNLOCK(vobj);
-		error = uiomove_fromphys(&vpg, offset, tlen, uio);
 	} else {
 		VM_OBJECT_UNLOCK(vobj);
 		vpg = NULL;
Index: sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
===================================================================
--- sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	(revisione 233191)
+++ sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	(copia locale)
@@ -323,20 +323,32 @@
 	VM_OBJECT_LOCK_ASSERT(obj, MA_OWNED);
 
 	for (;;) {
-		if ((pp = vm_page_lookup(obj, OFF_TO_IDX(start))) != NULL &&
-		    vm_page_is_valid(pp, (vm_offset_t)off, nbytes)) {
-			if ((pp->oflags & VPO_BUSY) != 0) {
-				/*
-				 * Reference the page before unlocking and
-				 * sleeping so that the page daemon is less
-				 * likely to reclaim it.
-				 */
-				vm_page_reference(pp);
-				vm_page_sleep(pp, "zfsmwb");
-				continue;
+		pp = vm_radix_lookup(&obj->rtree, OFF_TO_IDX(start),
+		    VM_RADIX_ANY);
+		if (pp != NULL) {
+			if (vm_page_is_valid(pp, (vm_offset_t)off, nbytes)) {
+				if ((pp->oflags & VPO_BUSY) != 0) {
+					/*
+					 * Reference the page before unlocking
+					 * and sleeping so that the page
+					 * daemon is less likely to reclaim it.
+					 */
+					vm_page_reference(pp);
+					vm_page_sleep(pp, "zfsmwb");
+					continue;
+				}
+				vm_page_busy(pp);
+				vm_page_undirty(pp);
+			} else {
+				if (obj->cached_page_count != 0 &&
+				    (pp->flags & PG_CACHED) != 0) {
+					mtx_lock(&vm_page_queue_free_mtx);
+					if (pp->object == obj)
+						vm_page_cache_free(pp);
+					mtx_unlock(&vm_page_queue_free_mtx);
+				}
+				pp = NULL;
 			}
-			vm_page_busy(pp);
-			vm_page_undirty(pp);
 		} else
 			pp = NULL;
 		break;