svn commit: r208046 - stable/8/sys/vm

[Konstantin Belousov]

Author: kib
Date: Thu May 13 20:31:24 2010
New Revision: 208046
URL: http://svn.freebsd.org/changeset/base/208046

Log:
  MFC r206814 (by alc):
  Remove a nonsensical test from vm_pageout_clean().  A page can't be in the
  inactive queue and have a non-zero wire count.

Modified:
  stable/8/sys/vm/vm_pageout.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)
  stable/8/sys/geom/sched/   (props changed)

Modified: stable/8/sys/vm/vm_pageout.c
==============================================================================
--- stable/8/sys/vm/vm_pageout.c	Thu May 13 20:29:42 2010	(r208045)
+++ stable/8/sys/vm/vm_pageout.c	Thu May 13 20:31:24 2010	(r208046)
@@ -350,7 +350,6 @@ more:
 		vm_page_test_dirty(p);
 		if (p->dirty == 0 ||
 		    p->queue != PQ_INACTIVE ||
-		    p->wire_count != 0 ||	/* may be held by buf cache */
 		    p->hold_count != 0) {	/* may be undergoing I/O */
 			ib = 0;
 			break;
@@ -378,7 +377,6 @@ more:
 		vm_page_test_dirty(p);
 		if (p->dirty == 0 ||
 		    p->queue != PQ_INACTIVE ||
-		    p->wire_count != 0 ||	/* may be held by buf cache */
 		    p->hold_count != 0) {	/* may be undergoing I/O */
 			break;
 		}