From 55144670c2d7dbb2bc047f275e4d2a75fbb9752a Mon Sep 17 00:00:00 2001 From: Andriy Gapon Date: Wed, 20 Oct 2010 05:17:23 +0000 Subject: [PATCH] PG_BUSY -> VPO_BUSY, PG_WANTED -> VPO_WANTED in manual pages and comments Reviewed by: alc MFC after: 4 days --- share/man/man9/vm_page_io.9 | 4 ++-- share/man/man9/vm_page_sleep_busy.9 | 2 +- share/man/man9/vm_page_wakeup.9 | 8 ++++---- sys/vm/swap_pager.c | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/share/man/man9/vm_page_io.9 b/share/man/man9/vm_page_io.9 index 396cb1903bb5..bddb82b8ea7a 100644 --- a/share/man/man9/vm_page_io.9 +++ b/share/man/man9/vm_page_io.9 @@ -52,9 +52,9 @@ function lowers the busy count on the page by one, if the resulting busy 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 diff --git a/share/man/man9/vm_page_sleep_busy.9 b/share/man/man9/vm_page_sleep_busy.9 index 45aa97761c98..6ccdf6849900 100644 --- a/share/man/man9/vm_page_sleep_busy.9 +++ b/share/man/man9/vm_page_sleep_busy.9 @@ -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 diff --git a/share/man/man9/vm_page_wakeup.9 b/share/man/man9/vm_page_wakeup.9 index adb03a13c05b..75f0ca8abf3c 100644 --- a/share/man/man9/vm_page_wakeup.9 +++ b/share/man/man9/vm_page_wakeup.9 @@ -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. diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index b359bd478290..bea235af8b64 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -1460,8 +1460,8 @@ swap_pager_putpages(vm_object_t object, vm_page_t *m, int count, * 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 ).