diff options
| author | alc <alc@FreeBSD.org> | 2010-07-02 15:02:51 +0000 |
|---|---|---|
| committer | alc <alc@FreeBSD.org> | 2010-07-02 15:02:51 +0000 |
| commit | 50ab2ca4b1b445046b0539ebcdf8d35a3c36a005 (patch) | |
| tree | fb5f25775173492a3b45324086efae1cc889215e /sys/vm/vm_pageout.c | |
| parent | 6e640459754dcfd9bff47693ad9d420dba7b9c32 (diff) | |
| download | FreeBSD-src-50ab2ca4b1b445046b0539ebcdf8d35a3c36a005.zip FreeBSD-src-50ab2ca4b1b445046b0539ebcdf8d35a3c36a005.tar.gz | |
With the demise of page coloring, the page queue macros no longer serve any
useful purpose. Eliminate them.
Reviewed by: kib
Diffstat (limited to 'sys/vm/vm_pageout.c')
| -rw-r--r-- | sys/vm/vm_pageout.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c index 8a31573..d664938 100644 --- a/sys/vm/vm_pageout.c +++ b/sys/vm/vm_pageout.c @@ -773,9 +773,8 @@ rescan0: cnt.v_pdpages++; - if (VM_PAGE_GETQUEUE(m) != PQ_INACTIVE) { + if (m->queue != PQ_INACTIVE) goto rescan0; - } next = TAILQ_NEXT(m, pageq); @@ -1025,7 +1024,7 @@ rescan0: * above. The page might have been freed and * reused for another vnode. */ - if (VM_PAGE_GETQUEUE(m) != PQ_INACTIVE || + if (m->queue != PQ_INACTIVE || m->object != object || TAILQ_NEXT(m, pageq) != &marker) { vm_page_unlock(m); @@ -1115,7 +1114,7 @@ unlock_and_continue: while ((m != NULL) && (pcount-- > 0) && (page_shortage > 0)) { - KASSERT(VM_PAGE_INQUEUE2(m, PQ_ACTIVE), + KASSERT(m->queue == PQ_ACTIVE, ("vm_pageout_scan: page %p isn't active", m)); next = TAILQ_NEXT(m, pageq); @@ -1379,7 +1378,7 @@ vm_pageout_page_stats() while ((m != NULL) && (pcount-- > 0)) { int actcount; - KASSERT(VM_PAGE_INQUEUE2(m, PQ_ACTIVE), + KASSERT(m->queue == PQ_ACTIVE, ("vm_pageout_page_stats: page %p isn't active", m)); next = TAILQ_NEXT(m, pageq); |
