From owner-svn-src-head@freebsd.org  Mon Sep 10 18:59:24 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6F6431098FDC;
 Mon, 10 Sep 2018 18:59:24 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 1D5E370004;
 Mon, 10 Sep 2018 18:59:24 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 161754BEE;
 Mon, 10 Sep 2018 18:59:24 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w8AIxN9x055075;
 Mon, 10 Sep 2018 18:59:23 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8AIxNWr055074;
 Mon, 10 Sep 2018 18:59:23 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201809101859.w8AIxNWr055074@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: markj set sender to
 markj@FreeBSD.org using -f
From: Mark Johnston <markj@FreeBSD.org>
Date: Mon, 10 Sep 2018 18:59:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r338570 - head/sys/vm
X-SVN-Group: head
X-SVN-Commit-Author: markj
X-SVN-Commit-Paths: head/sys/vm
X-SVN-Commit-Revision: 338570
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.27
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Sep 2018 18:59:24 -0000

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;
 	}