svn commit: r329885 - head/sys/vm

[Mark Johnston]

Author: markj
Date: Fri Feb 23 23:25:22 2018
New Revision: 329885
URL: https://svnweb.freebsd.org/changeset/base/329885

Log:
  Remove a bogus assertion from vm_page_launder().
  
  After r328977, a wired page m may have m->queue != PQ_NONE.
  
  Reviewed by:	kib
  X-MFC with:	r328977
  Differential Revision:	https://reviews.freebsd.org/D14485

Modified:
  head/sys/vm/vm_page.c

Modified: head/sys/vm/vm_page.c
==============================================================================
--- head/sys/vm/vm_page.c	Fri Feb 23 23:16:15 2018	(r329884)
+++ head/sys/vm/vm_page.c	Fri Feb 23 23:25:22 2018	(r329885)
@@ -3435,14 +3435,11 @@ vm_page_launder(vm_page_t m)
 	int queue;
 
 	vm_page_assert_locked(m);
-	if ((queue = m->queue) != PQ_LAUNDRY) {
-		if (m->wire_count == 0 && (m->oflags & VPO_UNMANAGED) == 0) {
-			if (queue != PQ_NONE)
-				vm_page_dequeue(m);
-			vm_page_enqueue(PQ_LAUNDRY, m);
-		} else
-			KASSERT(queue == PQ_NONE,
-			    ("wired page %p is queued", m));
+	if ((queue = m->queue) != PQ_LAUNDRY && m->wire_count == 0 &&
+	    (m->oflags & VPO_UNMANAGED) == 0) {
+		if (queue != PQ_NONE)
+			vm_page_dequeue(m);
+		vm_page_enqueue(PQ_LAUNDRY, m);
 	}
 }