diff options
| author | alc <alc@FreeBSD.org> | 2014-05-23 17:47:49 +0000 |
|---|---|---|
| committer | alc <alc@FreeBSD.org> | 2014-05-23 17:47:49 +0000 |
| commit | 5b014c7d3ed7dd8a1942ed6cd4e044f9ea0867e0 (patch) | |
| tree | 9d9283201a44867a237af507ca8610c96ebdf77c /sys/vm | |
| parent | e7613520673b6f7fb6b5b77f7c9ac3b31982f6ae (diff) | |
| download | FreeBSD-src-5b014c7d3ed7dd8a1942ed6cd4e044f9ea0867e0.zip FreeBSD-src-5b014c7d3ed7dd8a1942ed6cd4e044f9ea0867e0.tar.gz | |
MFC r259107
Eliminate a redundant parameter to vm_radix_replace().
Improve the wording of the comment describing vm_radix_replace().
Diffstat (limited to 'sys/vm')
| -rw-r--r-- | sys/vm/vm_page.c | 2 | ||||
| -rw-r--r-- | sys/vm/vm_radix.c | 12 | ||||
| -rw-r--r-- | sys/vm/vm_radix.h | 3 |
3 files changed, 7 insertions, 10 deletions
diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 696f4ee..0242fe5 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -1200,7 +1200,7 @@ vm_page_replace(vm_page_t mnew, vm_object_t object, vm_pindex_t pindex) mnew->object = object; mnew->pindex = pindex; - mold = vm_radix_replace(&object->rtree, mnew, pindex); + mold = vm_radix_replace(&object->rtree, mnew); KASSERT(mold->queue == PQ_NONE, ("vm_page_replace: mold is on a paging queue")); diff --git a/sys/vm/vm_radix.c b/sys/vm/vm_radix.c index ff311b2..7c6f7fa 100644 --- a/sys/vm/vm_radix.c +++ b/sys/vm/vm_radix.c @@ -788,20 +788,18 @@ vm_radix_reclaim_allnodes(struct vm_radix *rtree) } /* - * Replace an existing page into the trie with another one. - * Panics if the replacing page is not present or if the new page has an - * invalid key. + * Replace an existing page in the trie with another one. + * Panics if there is not an old page in the trie at the new page's index. */ vm_page_t -vm_radix_replace(struct vm_radix *rtree, vm_page_t newpage, vm_pindex_t index) +vm_radix_replace(struct vm_radix *rtree, vm_page_t newpage) { struct vm_radix_node *rnode; vm_page_t m; + vm_pindex_t index; int slot; - KASSERT(newpage->pindex == index, ("%s: newpage index invalid", - __func__)); - + index = newpage->pindex; rnode = vm_radix_getroot(rtree); if (rnode == NULL) panic("%s: replacing page on an empty trie", __func__); diff --git a/sys/vm/vm_radix.h b/sys/vm/vm_radix.h index 4491860..63d27d4 100644 --- a/sys/vm/vm_radix.h +++ b/sys/vm/vm_radix.h @@ -43,8 +43,7 @@ vm_page_t vm_radix_lookup_ge(struct vm_radix *rtree, vm_pindex_t index); vm_page_t vm_radix_lookup_le(struct vm_radix *rtree, vm_pindex_t index); void vm_radix_reclaim_allnodes(struct vm_radix *rtree); void vm_radix_remove(struct vm_radix *rtree, vm_pindex_t index); -vm_page_t vm_radix_replace(struct vm_radix *rtree, vm_page_t newpage, - vm_pindex_t index); +vm_page_t vm_radix_replace(struct vm_radix *rtree, vm_page_t newpage); #endif /* _KERNEL */ #endif /* !_VM_RADIX_H_ */ |
