Date: Sat, 27 Jun 2009 20:47:59 +0000 (UTC) From: Kip Macy <kmacy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r195116 - user/kmacy/releng_7_2_fcs/sys/vm Message-ID: <200906272047.n5RKlx6d087795@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kmacy Date: Sat Jun 27 20:47:59 2009 New Revision: 195116 URL: http://svn.freebsd.org/changeset/base/195116 Log: - make page trylock acquisition style the same as object trylock - fix missed re-ordering of page and object lock Modified: user/kmacy/releng_7_2_fcs/sys/vm/vm_pageout.c Modified: user/kmacy/releng_7_2_fcs/sys/vm/vm_pageout.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/vm/vm_pageout.c Sat Jun 27 20:26:16 2009 (r195115) +++ user/kmacy/releng_7_2_fcs/sys/vm/vm_pageout.c Sat Jun 27 20:47:59 2009 (r195116) @@ -775,7 +775,7 @@ rescan0: 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 @@ unlock_and_continue: 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; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906272047.n5RKlx6d087795>