Page MenuHomeFreeBSD

D15582.1794793699.diff
No OneTemporary

Authored By
Unknown
Size
1 KB
Referenced Files
None
Subscribers
None

D15582.1794793699.diff

Index: vm/vm_fault.c
===================================================================
--- vm/vm_fault.c
+++ vm/vm_fault.c
@@ -482,10 +482,9 @@
m_mtx = NULL;
for (i = 0; i < npages; i++) {
vm_page_change_lock(&m[i], &m_mtx);
- if ((fault_flags & VM_FAULT_WIRE) != 0) {
- KASSERT(wired, ("VM_FAULT_WIRE && !wired"));
+ if ((fault_flags & VM_FAULT_WIRE) != 0)
vm_page_wire(&m[i]);
- } else
+ else
vm_page_activate(&m[i]);
if (m_hold != NULL && m[i].pindex == fs->first_pindex) {
*m_hold = &m[i];
@@ -1247,6 +1246,10 @@
unlock_and_deallocate(&fs);
goto RetryFault;
}
+
+ /* Reassert in case wired changed. */
+ KASSERT(wired || (fault_flags & VM_FAULT_WIRE) == 0,
+ ("!wired && VM_FAULT_WIRE"));
}
}
@@ -1290,10 +1293,9 @@
* If the page is not wired down, then put it where the pageout daemon
* can find it.
*/
- if ((fault_flags & VM_FAULT_WIRE) != 0) {
- KASSERT(wired, ("VM_FAULT_WIRE && !wired"));
+ if ((fault_flags & VM_FAULT_WIRE) != 0)
vm_page_wire(fs.m);
- } else
+ else
vm_page_activate(fs.m);
if (m_hold != NULL) {
*m_hold = fs.m;

File Metadata

Mime Type
text/plain
Expires
Mon, Nov 16, 1:48 AM (1 h, 30 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41754684
Default Alt Text
D15582.1794793699.diff (1 KB)

Event Timeline