From 4bdbe0dd26c7198c982d5accaf38808717785e43 Mon Sep 17 00:00:00 2001 From: kmacy Date: Sat, 27 Jun 2009 20:47:59 +0000 Subject: [PATCH] - make page trylock acquisition style the same as object trylock - fix missed re-ordering of page and object lock --- sys/vm/vm_pageout.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c index 4ee476213828f8..db42456272381e 100644 --- a/sys/vm/vm_pageout.c +++ b/sys/vm/vm_pageout.c @@ -775,7 +775,7 @@ vm_pageout_scan(int pass) continue; } - if (vm_page_trylock(m) == 0 || (object = m->object) == NULL) { + if (!vm_page_trylock(m) || (object = m->object) == NULL) { addl_page_shortage++; continue; } @@ -1102,7 +1102,7 @@ vm_pageout_scan(int pass) continue; } - if (vm_page_trylock(m) == 0 || (object = m->object) == NULL) { + if (!vm_page_trylock(m) || (object = m->object) == NULL) { m = next; continue; } @@ -1344,15 +1344,15 @@ vm_pageout_page_stats() m = next; continue; } - if (!VM_OBJECT_TRYLOCK(object) && - !vm_pageout_fallback_object_lock(m, &next)) { - VM_OBJECT_UNLOCK(object); + vm_page_lock_assert(m, MA_NOTOWNED); + if (!vm_page_trylock(m) || (object = m->object) == NULL) { m = next; continue; } - vm_page_lock_assert(m, MA_NOTOWNED); - if (vm_page_trylock(m) == 0) { + if (!VM_OBJECT_TRYLOCK(object) && + !vm_pageout_fallback_object_lock(m, &next)) { VM_OBJECT_UNLOCK(object); + vm_page_unlock(m); m = next; continue; }