Date: Tue, 26 May 2009 21:34:43 +0000 (UTC) From: Kip Macy <kmacy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r192858 - user/kmacy/releng_7_2_fcs/sys/vm Message-ID: <200905262134.n4QLYhbc074388@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kmacy Date: Tue May 26 21:34:43 2009 New Revision: 192858 URL: http://svn.freebsd.org/changeset/base/192858 Log: - remove write and start I/O on the current page - move assert down below goto target 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 Tue May 26 21:20:42 2009 (r192857) +++ user/kmacy/releng_7_2_fcs/sys/vm/vm_pageout.c Tue May 26 21:34:43 2009 (r192858) @@ -304,7 +304,7 @@ vm_pageout_clean(m) if ((m->hold_count != 0) || ((m->busy != 0) || (m->oflags & VPO_BUSY))) { vm_page_unlock(m); - return 0; + return (0); } vm_page_io_start(m); pmap_remove_write(m); @@ -362,8 +362,8 @@ more: vm_page_unlock(p); break; } - vm_page_io_start(m); - pmap_remove_write(m); + vm_page_io_start(p); + pmap_remove_write(p); vm_page_unlock(p); mc[--page_base] = p; ++pageout_count; @@ -394,8 +394,8 @@ more: vm_page_unlock(p); break; } - vm_page_io_start(m); - pmap_remove_write(m); + vm_page_io_start(p); + pmap_remove_write(p); vm_page_unlock(p); mc[page_base + pageout_count] = p; ++pageout_count; @@ -987,8 +987,8 @@ rescan0: goto unlock_and_continue; } VM_OBJECT_LOCK(object); - vm_page_lock(m); vm_page_lock_queues(); + vm_page_lock(m); /* * The page might have been moved to another * queue during potential blocking in vget() @@ -1043,9 +1043,9 @@ rescan0: --page_shortage; --maxlaunder; } - vm_page_lock_assert(m, MA_NOTOWNED); vm_page_lock_queues(); unlock_and_continue: + vm_page_lock_assert(m, MA_NOTOWNED); VM_OBJECT_UNLOCK(object); if (mp != NULL) { vm_page_unlock_queues();
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200905262134.n4QLYhbc074388>