Page MenuHomeFreeBSD
Files F143827193

D47727.diff
No OneTemporary
Actions

D47727.diff
View Options

diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c
--- a/sys/vm/vm_kern.c
+++ b/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);
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c
--- a/sys/vm/vm_object.c
+++ b/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);
diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h
--- a/sys/vm/vm_page.h
+++ b/sys/vm/vm_page.h
@@ -602,7 +602,6 @@
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_free_zero(vm_page_t m);
void vm_page_activate (vm_page_t);
@@ -651,11 +650,13 @@
void vm_page_init_page(vm_page_t m, vm_paddr_t pa, int segind, int pool);
int vm_page_insert (vm_page_t, vm_object_t, vm_pindex_t);
void vm_page_invalid(vm_page_t m);
-void vm_page_launder(vm_page_t m);
-vm_page_t vm_page_lookup(vm_object_t, vm_pindex_t);
+void vm_page_iter_free(struct pctrie_iter *pages, vm_page_t m);
void vm_page_iter_init(struct pctrie_iter *, vm_object_t);
void vm_page_iter_limit_init(struct pctrie_iter *, vm_object_t, vm_pindex_t);
vm_page_t vm_page_iter_lookup(struct pctrie_iter *, vm_pindex_t);
+bool vm_page_iter_remove(struct pctrie_iter *pages);
+void vm_page_launder(vm_page_t m);
+vm_page_t vm_page_lookup(vm_object_t, vm_pindex_t);
vm_page_t vm_page_lookup_unlocked(vm_object_t, vm_pindex_t);
vm_page_t vm_page_next(vm_page_t m);
void vm_page_pqbatch_drain(void);
@@ -680,7 +681,6 @@
void vm_page_release_locked(vm_page_t m, int flags);
vm_page_t vm_page_relookup(vm_object_t, vm_pindex_t);
bool vm_page_remove(vm_page_t);
-bool vm_page_iter_remove(struct pctrie_iter *);
bool vm_page_remove_xbusy(vm_page_t);
int vm_page_rename(struct pctrie_iter *, vm_object_t, vm_pindex_t);
void vm_page_replace(vm_page_t mnew, vm_object_t object,
diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c
--- a/sys/vm/vm_page.c
+++ b/sys/vm/vm_page.c
@@ -1713,14 +1713,12 @@
/*
* vm_page_iter_free:
*
- * Free the current page, as identified by iterator.
+ * Free the given page, and use the iterator to remove it from the radix
+ * tree.
*/
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
Sun, Feb 1, 4:29 PM (2 h, 20 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28373580
Default Alt Text
D47727.diff (2 KB)

Event Timeline