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
This commit is contained in:
Mark Johnston
2018-09-10 18:59:23 +00:00
parent 7da0adf72b
commit 7a364d458a
+4 -4
View File
@@ -3406,13 +3406,13 @@ vm_page_requeue(vm_page_t m)
void void
vm_page_activate(vm_page_t m) vm_page_activate(vm_page_t m)
{ {
int queue;
vm_page_assert_locked(m); vm_page_assert_locked(m);
if ((queue = vm_page_queue(m)) == PQ_ACTIVE || m->wire_count > 0 || if (m->wire_count > 0 || (m->oflags & VPO_UNMANAGED) != 0)
(m->oflags & VPO_UNMANAGED) != 0) { return;
if (queue == PQ_ACTIVE && m->act_count < ACT_INIT) if (vm_page_queue(m) == PQ_ACTIVE) {
if (m->act_count < ACT_INIT)
m->act_count = ACT_INIT; m->act_count = ACT_INIT;
return; return;
} }