summaryrefslogtreecommitdiff
path: root/vm/vm_pageout.c
diff options
context:
space:
mode:
Diffstat (limited to 'vm/vm_pageout.c')
-rw-r--r--vm/vm_pageout.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/vm/vm_pageout.c b/vm/vm_pageout.c
index 51a6a0d..b676c7b 100644
--- a/vm/vm_pageout.c
+++ b/vm/vm_pageout.c
@@ -252,6 +252,8 @@ vm_pageout_setup(
vm_object_unlock(new_object);
}
+ vm_object_lock(old_object);
+
if (flush) {
/*
* Create a place-holder page where the old one was,
@@ -262,7 +264,6 @@ vm_pageout_setup(
== VM_PAGE_NULL)
vm_page_more_fictitious();
- vm_object_lock(old_object);
vm_page_lock_queues();
vm_page_remove(m);
vm_page_unlock_queues();
@@ -281,8 +282,6 @@ vm_pageout_setup(
VM_EXTERNAL_STATE_EXISTS);
#endif /* MACH_PAGEMAP */
- vm_object_unlock(old_object);
-
vm_object_lock(new_object);
/*
@@ -305,7 +304,6 @@ vm_pageout_setup(
*/
vm_page_copy(m, new_m);
- vm_object_lock(old_object);
m->dirty = FALSE;
pmap_clear_modify(m->phys_addr);
@@ -328,8 +326,6 @@ vm_pageout_setup(
VM_EXTERNAL_STATE_EXISTS);
#endif /* MACH_PAGEMAP */
- vm_object_unlock(old_object);
-
vm_object_lock(new_object);
/*
@@ -383,6 +379,7 @@ vm_pageout_setup(
*/
vm_object_unlock(new_object);
+ vm_object_unlock(old_object);
/*
* Return the placeholder page to simplify cleanup.