summaryrefslogtreecommitdiffstats
path: root/sys/vm/vm_reserv.c
diff options
context:
space:
mode:
authorattilio <attilio@FreeBSD.org>2012-07-08 14:01:25 +0000
committerattilio <attilio@FreeBSD.org>2012-07-08 14:01:25 +0000
commitffa3f082fffd0919e1fab9e61c5d2f6e3b660159 (patch)
treefb66d07b443940b951526bc54891166470963486 /sys/vm/vm_reserv.c
parent3fc8e2687245790ea86e20d4e2ecb493bca60a00 (diff)
downloadFreeBSD-src-ffa3f082fffd0919e1fab9e61c5d2f6e3b660159.zip
FreeBSD-src-ffa3f082fffd0919e1fab9e61c5d2f6e3b660159.tar.gz
- Split the cached and resident pages tree into 2 distinct ones.
This makes the RED/BLACK support go away and simplifies a lot vmradix functions used here. This happens because with patricia trie support the trie will be little enough that keeping 2 diffetnt will be efficient too. - Reduce differences with head, in places like backing scan where the optimizazions used shuffled the code a little bit around. Tested by: flo, Andrea Barberio
Diffstat (limited to 'sys/vm/vm_reserv.c')
-rw-r--r--sys/vm/vm_reserv.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/vm/vm_reserv.c b/sys/vm/vm_reserv.c
index 10db93c..86a98d6 100644
--- a/sys/vm/vm_reserv.c
+++ b/sys/vm/vm_reserv.c
@@ -341,7 +341,7 @@ vm_reserv_alloc_contig(vm_object_t object, vm_pindex_t pindex, u_long npages,
/*
* Look for an existing reservation.
*/
- mpred = vm_radix_lookup_le(&object->rtree, pindex, VM_RADIX_BLACK);
+ mpred = vm_radix_lookup_le(&object->rtree, pindex);
if (mpred != NULL) {
KASSERT(mpred->pindex != pindex,
("vm_reserv_alloc_contig: pindex already allocated"));
@@ -349,7 +349,7 @@ vm_reserv_alloc_contig(vm_object_t object, vm_pindex_t pindex, u_long npages,
if (rv->object == object && vm_reserv_has_pindex(rv, pindex))
goto found;
}
- msucc = vm_radix_lookup_ge(&object->rtree, pindex, VM_RADIX_BLACK);
+ msucc = vm_radix_lookup_ge(&object->rtree, pindex);
if (msucc != NULL) {
KASSERT(msucc->pindex != pindex,
("vm_reserv_alloc_page: pindex already allocated"));
@@ -495,7 +495,7 @@ vm_reserv_alloc_page(vm_object_t object, vm_pindex_t pindex)
/*
* Look for an existing reservation.
*/
- mpred = vm_radix_lookup_le(&object->rtree, pindex, VM_RADIX_BLACK);
+ mpred = vm_radix_lookup_le(&object->rtree, pindex);
if (mpred != NULL) {
KASSERT(mpred->pindex != pindex,
("vm_reserv_alloc_page: pindex already allocated"));
@@ -503,7 +503,7 @@ vm_reserv_alloc_page(vm_object_t object, vm_pindex_t pindex)
if (rv->object == object && vm_reserv_has_pindex(rv, pindex))
goto found;
}
- msucc = vm_radix_lookup_ge(&object->rtree, pindex, VM_RADIX_BLACK);
+ msucc = vm_radix_lookup_ge(&object->rtree, pindex);
if (msucc != NULL) {
KASSERT(msucc->pindex != pindex,
("vm_reserv_alloc_page: pindex already allocated"));
OpenPOWER on IntegriCloud