Page MenuHomeFreeBSD
Files F151711345

D47727.id146892.diff
No OneTemporary
Actions

D47727.id146892.diff
View Options

Index: sys/vm/vm_kern.c
===================================================================
--- sys/vm/vm_kern.c
+++ sys/vm/vm_kern.c
@@ -660,7 +660,7 @@
m = vm_page_iter_lookup(&pages, atop(offset))) {
vm_page_xbusy_claim(m);
vm_page_unwire_noq(m);
- vm_page_iter_free(&pages);
+ vm_page_iter_free(&pages, m);
}
VM_OBJECT_WUNLOCK(object);
Index: sys/vm/vm_object.c
===================================================================
--- sys/vm/vm_object.c
+++ sys/vm/vm_object.c
@@ -2060,7 +2060,7 @@
if ((options & OBJPR_NOTMAPPED) == 0 &&
object->ref_count != 0 && !vm_page_try_remove_all(p))
goto wired;
- vm_page_iter_free(&pages);
+ vm_page_iter_free(&pages, p);
}
vm_object_pip_wakeup(object);
Index: sys/vm/vm_page.h
===================================================================
--- sys/vm/vm_page.h
+++ sys/vm/vm_page.h
@@ -602,7 +602,7 @@
void vm_page_busy_sleep_unlocked(vm_object_t obj, vm_page_t m,
vm_pindex_t pindex, const char *wmesg, int allocflags);
void vm_page_free(vm_page_t m);
-void vm_page_iter_free(struct pctrie_iter *);
+void vm_page_iter_free(struct pctrie_iter *, vm_page_t m);
void vm_page_free_zero(vm_page_t m);
void vm_page_activate (vm_page_t);
Index: sys/vm/vm_page.c
===================================================================
--- sys/vm/vm_page.c
+++ sys/vm/vm_page.c
@@ -1716,11 +1716,8 @@
* Free the current page, as identified by iterator.
*/
void
-vm_page_iter_free(struct pctrie_iter *pages)
+vm_page_iter_free(struct pctrie_iter *pages, vm_page_t m)
{
- vm_page_t m;
-
- m = vm_radix_iter_page(pages);
vm_radix_iter_remove(pages);
vm_page_free_object_prep(m);
vm_page_xunbusy(m);

File Metadata

Mime Type
text/plain
Expires
Sat, Apr 11, 5:05 AM (16 h, 50 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31268764
Default Alt Text
D47727.id146892.diff (1 KB)

Event Timeline