svn commit: r214327 - in stable/7: share/man/man9 sys/vm

[Andriy Gapon]

Author: avg
Date: Mon Oct 25 08:07:57 2010
New Revision: 214327
URL: http://svn.freebsd.org/changeset/base/214327

Log:
  MFC r214095: PG_BUSY -> VPO_BUSY, PG_WANTED -> VPO_WANTED in manual
  pages and comments

Modified:
  stable/7/share/man/man9/vm_page_io.9
  stable/7/share/man/man9/vm_page_sleep_busy.9
  stable/7/share/man/man9/vm_page_wakeup.9
  stable/7/sys/vm/swap_pager.c
Directory Properties:
  stable/7/share/man/man9/   (props changed)
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/share/man/man9/vm_page_io.9
==============================================================================
--- stable/7/share/man/man9/vm_page_io.9	Mon Oct 25 07:58:37 2010	(r214326)
+++ stable/7/share/man/man9/vm_page_io.9	Mon Oct 25 08:07:57 2010	(r214327)
@@ -52,9 +52,9 @@ function lowers the busy count on the pa
 count is zero, a
 .Xr wakeup 9
 will be issued if the page has been marked
-.Dv PG_WANTED .
+.Dv VPO_WANTED .
 A page is typically marked
-.Dv PG_WANTED
+.Dv VPO_WANTED
 by a thread to register its interest in
 the page to either complete I/O or becoming available for general use.
 .Sh AUTHORS

Modified: stable/7/share/man/man9/vm_page_sleep_busy.9
==============================================================================
--- stable/7/share/man/man9/vm_page_sleep_busy.9	Mon Oct 25 07:58:37 2010	(r214326)
+++ stable/7/share/man/man9/vm_page_sleep_busy.9	Mon Oct 25 08:07:57 2010	(r214327)
@@ -42,7 +42,7 @@
 The
 .Fn vm_page_sleep_busy
 function waits until the
-.Dv PG_BUSY
+.Dv VPO_BUSY
 flag is cleared.
 If
 .Fa also_m_busy

Modified: stable/7/share/man/man9/vm_page_wakeup.9
==============================================================================
--- stable/7/share/man/man9/vm_page_wakeup.9	Mon Oct 25 07:58:37 2010	(r214326)
+++ stable/7/share/man/man9/vm_page_wakeup.9	Mon Oct 25 08:07:57 2010	(r214327)
@@ -50,20 +50,20 @@ of a page.
 .Pp
 .Fn vm_page_busy
 sets the
-.Dv PG_BUSY
+.Dv VPO_BUSY
 flag in the page.
 .Pp
 .Fn vm_page_flash
 checks to see if there is anybody waiting on the page
-.Dv ( PG_WANTED
+.Dv ( VPO_WANTED
 will be set), and if so, clears the
-.Dv PG_WANTED
+.Dv VPO_WANTED
 flag and notifies whoever is waiting via
 .Fn wakeup .
 .Pp
 .Fn vm_page_wakeup
 clears the
-.Dv PG_BUSY
+.Dv VPO_BUSY
 flag on the page, and calls
 .Fn vm_page_flash
 in case somebody has been waiting for it.

Modified: stable/7/sys/vm/swap_pager.c
==============================================================================
--- stable/7/sys/vm/swap_pager.c	Mon Oct 25 07:58:37 2010	(r214326)
+++ stable/7/sys/vm/swap_pager.c	Mon Oct 25 08:07:57 2010	(r214327)
@@ -1311,8 +1311,8 @@ swap_pager_putpages(vm_object_t object, 
  *	Completion routine for asynchronous reads and writes from/to swap.
  *	Also called manually by synchronous code to finish up a bp.
  *
- *	For READ operations, the pages are PG_BUSY'd.  For WRITE operations, 
- *	the pages are vm_page_t->busy'd.  For READ operations, we PG_BUSY 
+ *	For READ operations, the pages are VPO_BUSY'd.  For WRITE operations, 
+ *	the pages are vm_page_t->busy'd.  For READ operations, we VPO_BUSY 
  *	unbusy all pages except the 'main' request page.  For WRITE 
  *	operations, we vm_page_t->busy'd unbusy all pages ( we can do this 
  *	because we marked them all VM_PAGER_PEND on return from putpages ).