4 files changed, 6 insertions, 6 deletions

diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index 9bd3104..97825cb 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -827,7 +827,7 @@ exec_map_first_page(imgp)
 			if ((ma[i] = vm_page_lookup(object, i)) != NULL) {
 				if (ma[i]->valid)
 					break;
-				if ((ma[i]->flags & PG_BUSY) || ma[i]->busy)
+				if ((ma[i]->oflags & VPO_BUSY) || ma[i]->busy)
 					break;
 				vm_page_lock_queues();
 				vm_page_busy(ma[i]);
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c
index df224c8..23437a3 100644
--- a/sys/kern/uipc_syscalls.c
+++ b/sys/kern/uipc_syscalls.c
@@ -2100,7 +2100,7 @@ retry_lookup:
 			 * If not and it is not valid, then free it.
 			 */
 			if (pg->wire_count == 0 && pg->valid == 0 &&
-			    pg->busy == 0 && !(pg->flags & PG_BUSY) &&
+			    pg->busy == 0 && !(pg->oflags & VPO_BUSY) &&
 			    pg->hold_count == 0) {
 				vm_page_free(pg);
 			}
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index 904e84c..2e6e8ec 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -1519,7 +1519,7 @@ vfs_vmio_release(struct buf *bp)
 		 * the responsibility of the process that
 		 * busied the pages to deal with them.
 		 */
-		if ((m->flags & PG_BUSY) || (m->busy != 0))
+		if ((m->oflags & VPO_BUSY) || (m->busy != 0))
 			continue;
 			
 		if (m->wire_count == 0) {
@@ -2879,7 +2879,7 @@ allocbuf(struct buf *bp, int size)
 				 * retry because it might have gotten freed out
 				 * from under us.
 				 *
-				 * We can only test PG_BUSY here.  Blocking on
+				 * We can only test VPO_BUSY here.  Blocking on
 				 * m->busy might lead to a deadlock:
 				 *
 				 *  vm_fault->getpages->cluster_read->allocbuf
@@ -3369,7 +3369,7 @@ vfs_page_set_valid(struct buf *bp, vm_ooffset_t off, int pageno, vm_page_t m)
  * This routine is called before a device strategy routine.
  * It is used to tell the VM system that paging I/O is in
  * progress, and treat the pages associated with the buffer
- * almost as being PG_BUSY.  Also the object paging_in_progress
+ * almost as being VPO_BUSY.  Also the object paging_in_progress
  * flag is handled to make sure that the object doesn't become
  * inconsistant.
  *
diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c
index 4c2cfaf..1036629 100644
--- a/sys/kern/vfs_cluster.c
+++ b/sys/kern/vfs_cluster.c
@@ -911,7 +911,7 @@ cluster_wbuild(vp, size, start_lbn, len)
 				if (i != 0) { /* if not first buffer */
 					for (j = 0; j < tbp->b_npages; j += 1) {
 						m = tbp->b_pages[j];
-						if (m->flags & PG_BUSY) {
+						if (m->oflags & VPO_BUSY) {
 							VM_OBJECT_UNLOCK(
 							    tbp->b_object);
 							bqrelse(tbp);