svn commit: r240143 - stable/9/sys/vm
Konstantin Belousov
kib at FreeBSD.org
Wed Sep 5 16:47:01 UTC 2012
Author: kib
Date: Wed Sep 5 16:47:00 2012
New Revision: 240143
URL: http://svn.freebsd.org/changeset/base/240143
Log:
MFC r238604:
Do not restart scan of the inactive queue when non-inactive page is
found. Rather, we shall not find such pages on inactive queue at all.
Modified:
stable/9/sys/vm/vm_pageout.c
Directory Properties:
stable/9/sys/ (props changed)
Modified: stable/9/sys/vm/vm_pageout.c
==============================================================================
--- stable/9/sys/vm/vm_pageout.c Wed Sep 5 16:35:37 2012 (r240142)
+++ stable/9/sys/vm/vm_pageout.c Wed Sep 5 16:47:00 2012 (r240143)
@@ -786,7 +786,6 @@ vm_pageout_scan(int pass)
maxlaunder = 10000;
vm_page_lock_queues();
queues_locked = TRUE;
-rescan0:
addl_page_shortage = addl_page_shortage_init;
maxscan = cnt.v_inactive_count;
@@ -795,12 +794,9 @@ rescan0:
m = next) {
KASSERT(queues_locked, ("unlocked queues"));
mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+ KASSERT(m->queue == PQ_INACTIVE, ("Inactive queue %p", m));
cnt.v_pdpages++;
-
- if (m->queue != PQ_INACTIVE)
- goto rescan0;
-
next = TAILQ_NEXT(m, pageq);
/*
More information about the svn-src-stable-9
mailing list