summaryrefslogtreecommitdiffstats
path: root/sys/vm/vm_pageout.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/vm/vm_pageout.c')
-rw-r--r--sys/vm/vm_pageout.c15
1 files changed, 3 insertions, 12 deletions
diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c
index 3994ce1..6b1031f 100644
--- a/sys/vm/vm_pageout.c
+++ b/sys/vm/vm_pageout.c
@@ -586,23 +586,14 @@ vm_pageout_launder(int queue, int tries, vm_paddr_t low, vm_paddr_t high)
continue;
}
object = m->object;
- if (!VM_OBJECT_TRYLOCK(object) &&
+ if ((!VM_OBJECT_TRYLOCK(object) &&
(!vm_pageout_fallback_object_lock(m, &next) ||
- m->hold_count != 0)) {
+ m->hold_count != 0)) || (m->oflags & VPO_BUSY) != 0 ||
+ m->busy != 0) {
vm_page_unlock(m);
VM_OBJECT_UNLOCK(object);
continue;
}
- if ((m->oflags & VPO_BUSY) != 0 || m->busy != 0) {
- if (tries == 0) {
- vm_page_unlock(m);
- VM_OBJECT_UNLOCK(object);
- continue;
- }
- vm_page_sleep(m, "vpctw0");
- VM_OBJECT_UNLOCK(object);
- return (FALSE);
- }
vm_page_test_dirty(m);
if (m->dirty == 0)
pmap_remove_all(m);
OpenPOWER on IntegriCloud