d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove a bogus assertion from vm_page_launder().

Browse Source 
After r328977, a wired page m may have m->queue != PQ_NONE.

Reviewed by:	kib
X-MFC with:	r328977
Differential Revision:	https://reviews.freebsd.org/D14485
This commit is contained in:
Mark Johnston 2018-02-23 23:25:22 +00:00
parent 5f8cd1c0bf
commit 9140bff7ed
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=329885
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/vm/vm_page.c
View File

@ -3435,14 +3435,11 @@ vm_page_launder(vm_page_t m)
int queue;
vm_page_assert_locked(m);
if ((queue = m->queue) != PQ_LAUNDRY) {
if (m->wire_count == 0 && (m->oflags & VPO_UNMANAGED) == 0) {
if (queue != PQ_NONE)
vm_page_dequeue(m);
vm_page_enqueue(PQ_LAUNDRY, m);
} else
KASSERT(queue == PQ_NONE,
("wired page %p is queued", m));
if ((queue = m->queue) != PQ_LAUNDRY && m->wire_count == 0 &&
(m->oflags & VPO_UNMANAGED) == 0) {
if (queue != PQ_NONE)
vm_page_dequeue(m);
vm_page_enqueue(PQ_LAUNDRY, m);
}
}