svn commit: r207845 - stable/8/sys/vm

[Konstantin Belousov]

Author: kib
Date: Mon May 10 11:50:26 2010
New Revision: 207845
URL: http://svn.freebsd.org/changeset/base/207845

Log:
  MFC r207580:
  Handle busy status of the page in a way expected for pager_getpage().
  Flush requested page, unbusy other pages, do not clear m->busy.

Modified:
  stable/8/sys/vm/phys_pager.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)
  stable/8/sys/geom/sched/   (props changed)

Modified: stable/8/sys/vm/phys_pager.c
==============================================================================
--- stable/8/sys/vm/phys_pager.c	Mon May 10 07:47:31 2010	(r207844)
+++ stable/8/sys/vm/phys_pager.c	Mon May 10 11:50:26 2010	(r207845)
@@ -152,10 +152,10 @@ phys_pager_getpages(vm_object_t object, 
 		KASSERT(m[i]->dirty == 0,
 		    ("phys_pager_getpages: dirty page %p", m[i]));
 		/* The requested page must remain busy, the others not. */
-		if (reqpage != i) {
-			m[i]->oflags &= ~VPO_BUSY;
-			m[i]->busy = 0;
-		}
+		if (i == reqpage)
+			vm_page_flash(m[i]);
+		else
+			vm_page_wakeup(m[i]);
 	}
 	return (VM_PAGER_OK);
 }