svn commit: r338570 - head/sys/vm

[Mark Johnston]

Author: markj
Date: Mon Sep 10 18:59:23 2018
New Revision: 338570
URL: https://svnweb.freebsd.org/changeset/base/338570

Log:
  Split some checks in vm_page_activate() to make it easier to read.
  
  No functional change intended.
  
  Reviewed by:	alc, kib
  Approved by:	re (gjb)
  Sponsored by:	The FreeBSD Foundation
  Differential Revision:	https://reviews.freebsd.org/D17028

Modified:
  head/sys/vm/vm_page.c

Modified: head/sys/vm/vm_page.c
==============================================================================
--- head/sys/vm/vm_page.c	Mon Sep 10 17:37:34 2018	(r338569)
+++ head/sys/vm/vm_page.c	Mon Sep 10 18:59:23 2018	(r338570)
@@ -3406,13 +3406,13 @@ vm_page_requeue(vm_page_t m)
 void
 vm_page_activate(vm_page_t m)
 {
-	int queue;
 
 	vm_page_assert_locked(m);
 
-	if ((queue = vm_page_queue(m)) == PQ_ACTIVE || m->wire_count > 0 ||
-	    (m->oflags & VPO_UNMANAGED) != 0) {
-		if (queue == PQ_ACTIVE && m->act_count < ACT_INIT)
+	if (m->wire_count > 0 || (m->oflags & VPO_UNMANAGED) != 0)
+		return;
+	if (vm_page_queue(m) == PQ_ACTIVE) {
+		if (m->act_count < ACT_INIT)
 			m->act_count = ACT_INIT;
 		return;
 	}