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

Replace an unnecessary call to vm_page_activate() by an assertion that

Browse Source 
the page is already wired or queued.  Prior to the elimination of PG_CACHED
pages, vm_page_grab() might have returned a valid, previously PG_CACHED
page, in which case enqueueing the page was necessary.  Now, that can't
happen.  Moreover, activating the page is a dubious choice, since the page
is not being accessed.

Reviewed by:	kib
MFC after:	1 week
This commit is contained in:
Alan Cox 2017-10-08 16:54:42 +00:00
parent 8dd7bf2916
commit 37244a84fd
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=324411
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/vm/swap_pager.c
View File

@ -1635,9 +1635,12 @@ swp_pager_force_pagein(vm_object_t object, vm_pindex_t pindex)
if (m->valid == VM_PAGE_BITS_ALL) {
vm_object_pip_wakeup(object);
vm_page_dirty(m);
#ifdef INVARIANTS
vm_page_lock(m);
vm_page_activate(m);
if (m->wire_count == 0 && m->queue == PQ_NONE)
panic("page %p is neither wired nor queued", m);
vm_page_unlock(m);
#endif
vm_page_xunbusy(m);
vm_pager_page_unswapped(m);
return;