svn commit: r236921 - stable/9/sys/vm

[Konstantin Belousov]

Author: kib
Date: Mon Jun 11 21:06:10 2012
New Revision: 236921
URL: http://svn.freebsd.org/changeset/base/236921

Log:
  MFC r235362:
  Assert that fictitious or unmanaged pages do not appear on
  active/inactive lists.

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	Mon Jun 11 20:58:23 2012	(r236920)
+++ stable/9/sys/vm/vm_pageout.c	Mon Jun 11 21:06:10 2012	(r236921)
@@ -805,6 +805,11 @@ rescan0:
 		if (m->flags & PG_MARKER)
 			continue;
 
+		KASSERT((m->flags & PG_FICTITIOUS) == 0,
+		    ("Fictitious page %p cannot be in inactive queue", m));
+		KASSERT((m->oflags & VPO_UNMANAGED) == 0,
+		    ("Unmanaged page %p cannot be in inactive queue", m));
+
 		/*
 		 * Lock the page.
 		 */
@@ -1143,6 +1148,10 @@ unlock_and_continue:
 			m = next;
 			continue;
 		}
+		KASSERT((m->flags & PG_FICTITIOUS) == 0,
+		    ("Fictitious page %p cannot be in active queue", m));
+		KASSERT((m->oflags & VPO_UNMANAGED) == 0,
+		    ("Unmanaged page %p cannot be in active queue", m));
 		if (!vm_pageout_page_lock(m, &next)) {
 			vm_page_unlock(m);
 			m = next;