svn commit: r213936 - stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Andriy Gapon]

Author: avg
Date: Sat Oct 16 20:13:15 2010
New Revision: 213936
URL: http://svn.freebsd.org/changeset/base/213936

Log:
  Revert r213261 (MFC of r212652): vm_page_sleep change has not been MFCed yet

Modified:
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
==============================================================================
--- stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	Sat Oct 16 20:01:41 2010	(r213935)
+++ stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	Sat Oct 16 20:13:15 2010	(r213936)
@@ -322,17 +322,8 @@ page_lookup(vnode_t *vp, int64_t start, 
 	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_lock_queues();
-				vm_page_flag_set(pp, PG_REFERENCED);
-				vm_page_sleep(pp, "zfsmwb");
+			if (vm_page_sleep_if_busy(pp, FALSE, "zfsmwb"))
 				continue;
-			}
 			vm_page_busy(pp);
 			vm_page_lock_queues();
 			vm_page_undirty(pp);
@@ -460,18 +451,8 @@ mappedread(vnode_t *vp, int nbytes, uio_
 again:
 		if ((m = vm_page_lookup(obj, OFF_TO_IDX(start))) != NULL &&
 		    vm_page_is_valid(m, off, bytes)) {
-			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_lock_queues();
-				vm_page_flag_set(m, PG_REFERENCED);
-				vm_page_sleep(m, "zfsmrb");
+			if (vm_page_sleep_if_busy(m, FALSE, "zfsmrb"))
 				goto again;
-			}
-
 			vm_page_busy(m);
 			VM_OBJECT_UNLOCK(obj);
 			if (dirbytes > 0) {
@@ -493,17 +474,8 @@ again:
 			 */
 			KASSERT(off == 0,
 			    ("unexpected offset in 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_lock_queues();
-				vm_page_flag_set(m, PG_REFERENCED);
-				vm_page_sleep(m, "zfsmrb");
+			if (vm_page_sleep_if_busy(m, FALSE, "zfsmrb"))
 				goto again;
-			}
 			vm_page_busy(m);
 			VM_OBJECT_UNLOCK(obj);
 			if (dirbytes > 0) {