Author: markj
Date: Wed Jul 27 17:11:03 2016
New Revision: 303399
URL: https://svnweb.freebsd.org/changeset/base/303399
Log:
De-pluralize "queues" where appropriate in the pagedaemon code.
MFC after: 1 week
Modified:
head/sys/vm/vm_pageout.c
Modified: head/sys/vm/vm_pageout.c
==============================================================================
--- head/sys/vm/vm_pageout.c Wed Jul 27 17:10:09 2016 (r303398)
+++ head/sys/vm/vm_pageout.c Wed Jul 27 17:11:03 2016 (r303399)
@@ -885,7 +885,7 @@ vm_pageout_scan(struct vm_domain *vmd, i
int act_delta, addl_page_shortage, deficit, error, maxlaunder, maxscan;
int page_shortage, scan_tick, scanned, starting_page_shortage;
int vnodes_skipped;
- boolean_t pageout_ok, queues_locked;
+ boolean_t pageout_ok, queue_locked;
/*
* If we need to reclaim memory ask kernel caches to return
@@ -952,12 +952,12 @@ vm_pageout_scan(struct vm_domain *vmd, i
pq = &vmd->vmd_pagequeues[PQ_INACTIVE];
maxscan = pq->pq_cnt;
vm_pagequeue_lock(pq);
- queues_locked = TRUE;
+ queue_locked = TRUE;
for (m = TAILQ_FIRST(&pq->pq_pl);
m != NULL && maxscan-- > 0 && page_shortage > 0;
m = next) {
vm_pagequeue_assert_locked(pq);
- KASSERT(queues_locked, ("unlocked queues"));
+ KASSERT(queue_locked, ("unlocked inactive queue"));
KASSERT(m->queue == PQ_INACTIVE, ("Inactive queue %p", m));
PCPU_INC(cnt.v_pdpages);
@@ -1027,7 +1027,7 @@ unlock_page:
*/
TAILQ_INSERT_AFTER(&pq->pq_pl, m, &vmd->vmd_marker, plinks.q);
vm_pagequeue_unlock(pq);
- queues_locked = FALSE;
+ queue_locked = FALSE;
/*
* Invalid pages can be easily freed. They cannot be
@@ -1115,7 +1115,7 @@ free_page:
m->flags |= PG_WINATCFLS;
requeue_page:
vm_pagequeue_lock(pq);
- queues_locked = TRUE;
+ queue_locked = TRUE;
vm_page_requeue_locked(m);
} else if (maxlaunder > 0) {
/*
@@ -1153,15 +1153,15 @@ requeue_page:
addl_page_shortage++;
}
vm_page_lock_assert(m, MA_NOTOWNED);
- goto relock_queues;
+ goto relock_queue;
}
drop_page:
vm_page_unlock(m);
VM_OBJECT_WUNLOCK(object);
-relock_queues:
- if (!queues_locked) {
+relock_queue:
+ if (!queue_locked) {
vm_pagequeue_lock(pq);
- queues_locked = TRUE;
+ queue_locked = TRUE;
}
next = TAILQ_NEXT(&vmd->vmd_marker, plinks.q);
TAILQ_REMOVE(&pq->pq_pl, &vmd->vmd_marker, plinks.q);
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
