Index: sys/fs/tmpfs/tmpfs_vnops.c
===================================================================
--- sys/fs/tmpfs/tmpfs_vnops.c	(revisione 237174)
+++ sys/fs/tmpfs/tmpfs_vnops.c	(copia locale)
@@ -464,7 +464,7 @@ tmpfs_nocacheread(vm_object_t tobj, vm_pindex_t id
 	error = uiomove_fromphys(&m, offset, tlen, uio);
 	VM_OBJECT_LOCK(tobj);
 	vm_page_lock(m);
-	vm_page_unwire(m, TRUE);
+	vm_page_unwire(m, FALSE);
 	vm_page_unlock(m);
 	vm_page_wakeup(m);
 	VM_OBJECT_UNLOCK(tobj);
@@ -510,63 +510,67 @@ tmpfs_mappedread(vm_object_t vobj, vm_object_t tob
 	offset = addr & PAGE_MASK;
 	tlen = MIN(PAGE_SIZE - offset, len);
 
-	if ((vobj == NULL) ||
-	    (vobj->resident_page_count == 0 && vobj->cache == NULL))
+	if (vobj == NULL)
 		goto nocache;
 
 	VM_OBJECT_LOCK(vobj);
 lookupvpg:
-	if (((m = vm_page_lookup(vobj, idx)) != NULL) &&
-	    vm_page_is_valid(m, offset, tlen)) {
-		if ((m->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(m);
-			vm_page_sleep(m, "tmfsmr");
-			goto lookupvpg;
-		}
-		vm_page_busy(m);
-		VM_OBJECT_UNLOCK(vobj);
-		error = uiomove_fromphys(&m, offset, tlen, uio);
-		VM_OBJECT_LOCK(vobj);
-		vm_page_wakeup(m);
-		VM_OBJECT_UNLOCK(vobj);
-		return	(error);
-	} else if (m != NULL && uio->uio_segflg == UIO_NOCOPY) {
-		KASSERT(offset == 0,
+	m = vm_page_lookup(vobj, idx);
+	if (m != NULL) {
+		if (vm_page_is_valid(m, offset, tlen)) {
+			if ((m->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(m);
+				vm_page_sleep(m, "tmfsmr");
+				goto lookupvpg;
+			}
+			vm_page_busy(m);
+			VM_OBJECT_UNLOCK(vobj);
+			error = uiomove_fromphys(&m, offset, tlen, uio);
+			VM_OBJECT_LOCK(vobj);
+			vm_page_wakeup(m);
+			VM_OBJECT_UNLOCK(vobj);
+			return	(error);
+		} else if (uio->uio_segflg == UIO_NOCOPY) {
+			KASSERT(offset == 0,
 		    ("unexpected offset in tmpfs_mappedread for sendfile"));
-		if ((m->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(m);
-			vm_page_sleep(m, "tmfsmr");
-			goto lookupvpg;
+			if ((m->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(m);
+				vm_page_sleep(m, "tmfsmr");
+				goto lookupvpg;
+			}
+			vm_page_busy(m);
+			VM_OBJECT_UNLOCK(vobj);
+			sched_pin();
+			sf = sf_buf_alloc(m, SFB_CPUPRIVATE);
+			ma = (char *)sf_buf_kva(sf);
+			error = tmpfs_nocacheread_buf(tobj, idx, 0, tlen, ma);
+			if (error == 0) {
+				if (tlen != PAGE_SIZE)
+					bzero(ma + tlen, PAGE_SIZE - tlen);
+				uio->uio_offset += tlen;
+				uio->uio_resid -= tlen;
+			}
+			sf_buf_free(sf);
+			sched_unpin();
+			VM_OBJECT_LOCK(vobj);
+			if (error == 0)
+				m->valid = VM_PAGE_BITS_ALL;
+			vm_page_wakeup(m);
+			VM_OBJECT_UNLOCK(vobj);
+			return	(error);
 		}
-		vm_page_busy(m);
-		VM_OBJECT_UNLOCK(vobj);
-		sched_pin();
-		sf = sf_buf_alloc(m, SFB_CPUPRIVATE);
-		ma = (char *)sf_buf_kva(sf);
-		error = tmpfs_nocacheread_buf(tobj, idx, 0, tlen, ma);
-		if (error == 0) {
-			if (tlen != PAGE_SIZE)
-				bzero(ma + tlen, PAGE_SIZE - tlen);
-			uio->uio_offset += tlen;
-			uio->uio_resid -= tlen;
-		}
-		sf_buf_free(sf);
-		sched_unpin();
-		VM_OBJECT_LOCK(vobj);
-		if (error == 0)
-			m->valid = VM_PAGE_BITS_ALL;
-		vm_page_wakeup(m);
-		VM_OBJECT_UNLOCK(vobj);
-		return	(error);
-	}
+	} else if (vm_page_is_cached(vobj, idx))
+		vm_page_cache_free(vobj, idx, idx + 1);
 	VM_OBJECT_UNLOCK(vobj);
 nocache:
 	error = tmpfs_nocacheread(tobj, idx, offset, tlen, uio);
@@ -637,12 +641,10 @@ tmpfs_mappedwrite(vm_object_t vobj, vm_object_t to
 	idx = OFF_TO_IDX(addr);
 	offset = addr & PAGE_MASK;
 	tlen = MIN(PAGE_SIZE - offset, len);
+	vpg = NULL;
 
-	if ((vobj == NULL) ||
-	    (vobj->resident_page_count == 0 && vobj->cache == NULL)) {
-		vpg = NULL;
+	if (vobj == NULL)
 		goto nocache;
-	}
 
 	VM_OBJECT_LOCK(vobj);
 lookupvpg:
@@ -698,7 +700,7 @@ nocache:
 		vm_page_dirty(tpg);
 	}
 	vm_page_lock(tpg);
-	vm_page_unwire(tpg, TRUE);
+	vm_page_unwire(tpg, FALSE);
 	vm_page_unlock(tpg);
 	vm_page_wakeup(tpg);
 out: