diff options
| author | alc <alc@FreeBSD.org> | 2013-02-23 19:28:31 +0000 |
|---|---|---|
| committer | alc <alc@FreeBSD.org> | 2013-02-23 19:28:31 +0000 |
| commit | 96feae12e9182127f02a48989f3f181218cf2948 (patch) | |
| tree | 958f57512b7bcc340cfdc4b42baa6dd3fc86fef4 | |
| parent | 47d4527f8fb3b97e3572f3d79509ad9a0be79777 (diff) | |
| download | FreeBSD-src-96feae12e9182127f02a48989f3f181218cf2948.zip FreeBSD-src-96feae12e9182127f02a48989f3f181218cf2948.tar.gz | |
Correctly assert that no page already exists at the offset within the
object that is currently being allocated.
Sponsored by: EMC / Isilon Storage Division
| -rw-r--r-- | sys/vm/vm_reserv.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/vm/vm_reserv.c b/sys/vm/vm_reserv.c index cf42558..e2ec77f 100644 --- a/sys/vm/vm_reserv.c +++ b/sys/vm/vm_reserv.c @@ -344,7 +344,7 @@ vm_reserv_alloc_contig(vm_object_t object, vm_pindex_t pindex, u_long npages, */ mpred = vm_radix_lookup_le(&object->rtree, pindex); if (mpred != NULL) { - KASSERT(mpred->pindex <= pindex, + KASSERT(mpred->pindex < pindex, ("vm_reserv_alloc_contig: pindex already allocated")); rv = vm_reserv_from_page(mpred); if (rv->object == object && vm_reserv_has_pindex(rv, pindex)) @@ -352,7 +352,7 @@ vm_reserv_alloc_contig(vm_object_t object, vm_pindex_t pindex, u_long npages, } msucc = vm_radix_lookup_ge(&object->rtree, pindex); if (msucc != NULL) { - KASSERT(msucc->pindex >= pindex, + KASSERT(msucc->pindex > pindex, ("vm_reserv_alloc_page: pindex already allocated")); rv = vm_reserv_from_page(msucc); if (rv->object == object && vm_reserv_has_pindex(rv, pindex)) @@ -498,7 +498,7 @@ vm_reserv_alloc_page(vm_object_t object, vm_pindex_t pindex) */ mpred = vm_radix_lookup_le(&object->rtree, pindex); if (mpred != NULL) { - KASSERT(mpred->pindex <= pindex, + KASSERT(mpred->pindex < pindex, ("vm_reserv_alloc_page: pindex already allocated")); rv = vm_reserv_from_page(mpred); if (rv->object == object && vm_reserv_has_pindex(rv, pindex)) @@ -506,7 +506,7 @@ vm_reserv_alloc_page(vm_object_t object, vm_pindex_t pindex) } msucc = vm_radix_lookup_ge(&object->rtree, pindex); if (msucc != NULL) { - KASSERT(msucc->pindex >= pindex, + KASSERT(msucc->pindex > pindex, ("vm_reserv_alloc_page: pindex already allocated")); rv = vm_reserv_from_page(msucc); if (rv->object == object && vm_reserv_has_pindex(rv, pindex)) |
