svn commit: r324190 - head/sys/kern

[Alan Cox]

Author: alc
Date: Mon Oct  2 07:30:21 2017
New Revision: 324190
URL: https://svnweb.freebsd.org/changeset/base/324190

Log:
  Use vm_page_active() rather than directly accessing the page's queue
  field.
  
  Reviewed by:	kib, markj
  MFC after:	2 weeks
  X-MFC with:	r324146

Modified:
  head/sys/kern/uipc_shm.c

Modified: head/sys/kern/uipc_shm.c
==============================================================================
--- head/sys/kern/uipc_shm.c	Mon Oct  2 07:14:32 2017	(r324189)
+++ head/sys/kern/uipc_shm.c	Mon Oct  2 07:30:21 2017	(r324190)
@@ -209,10 +209,10 @@ uiomove_object_page(vm_object_t obj, size_t len, struc
 	}
 	vm_page_lock(m);
 	vm_page_hold(m);
-	if (m->queue != PQ_ACTIVE)
-		vm_page_activate(m);
-	else
+	if (vm_page_active(m))
 		vm_page_reference(m);
+	else
+		vm_page_activate(m);
 	vm_page_unlock(m);
 	VM_OBJECT_WUNLOCK(obj);
 	error = uiomove_fromphys(&m, offset, tlen, uio);