svn commit: r356173 - head/sys/vm

[Mark Johnston]

Author: markj
Date: Sun Dec 29 15:39:43 2019
New Revision: 356173
URL: https://svnweb.freebsd.org/changeset/base/356173

Log:
  Clear queue op flags in vm_page_mvqueue().
  
  This fixes a regression in r356155, introduced at the last minute.  In
  particular, we must clear PGA_REQUEUE_HEAD before inserting into any
  queue besides PQ_INACTIVE since that operation is implemented only for
  PQ_INACTIVE.
  
  Reported by:	pho, Jenkins via lwhsu

Modified:
  head/sys/vm/vm_page.c

Modified: head/sys/vm/vm_page.c
==============================================================================
--- head/sys/vm/vm_page.c	Sun Dec 29 13:54:02 2019	(r356172)
+++ head/sys/vm/vm_page.c	Sun Dec 29 15:39:43 2019	(r356173)
@@ -4018,6 +4018,7 @@ vm_page_mvqueue(vm_page_t m, const uint8_t nqueue, con
 		if ((old.flags & PGA_DEQUEUE) != 0)
 			break;
 		new = old;
+		new.flags &= ~PGA_QUEUE_OP_MASK;
 		if (nqueue == PQ_ACTIVE)
 			new.act_count = max(old.act_count, ACT_INIT);
 		if (old.queue == nqueue) {