PERFORCE change 147750 for review

[Mayur Shardul]

http://perforce.freebsd.org/chv.cgi?CH=147750

Change 147750 by mayur at mayur_freebsd_vm on 2008/08/18 18:38:25

	Added more checks

Affected files ...

.. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_reserv.c#3 edit

Differences ...

==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_reserv.c#3 (text+ko) ====

@@ -314,10 +314,11 @@
 	msucc = NULL;
 	//mpred = object->root;
 	mpred = radix_tree_lookup_le(pindex, &object->rtree);
-	if(mpred != NULL){
+	if(mpred != NULL && mpred->object == object){
 		KASSERT(mpred->pindex != pindex,
 			    ("vm_reserv_alloc_page: pindex already allocated"));
 		rv = vm_reserv_from_page(mpred);
+		KASSERT( rv != NULL, ("vm_reserv_alloc_page: null rv"));
 		if (rv->object == object && vm_reserv_has_pindex(rv, pindex)) {
 			m = &rv->pages[VM_RESERV_INDEX(object, pindex)];
 			 //Handle vm_page_rename(m, new_object, ...). 
@@ -326,12 +327,16 @@
 			vm_reserv_populate(rv);
 			return (m);
 		}
+	}else{
+		mpred = NULL;
 	}
+
 	msucc = radix_tree_lookup_ge(pindex, &object->rtree);
-	if(msucc != NULL){
+	if(msucc != NULL && msucc->object == object){
 		KASSERT(msucc->pindex != pindex,
 			    ("vm_reserv_alloc_page: pindex already allocated"));
 		rv = vm_reserv_from_page(msucc);
+		KASSERT( rv != NULL, ("vm_reserv_alloc_page: null rv"));
 		if (rv->object == object && vm_reserv_has_pindex(rv, pindex)) {
 			m = &rv->pages[VM_RESERV_INDEX(object, pindex)];
 			 //Handle vm_page_rename(m, new_object, ...). 
@@ -340,6 +345,8 @@
 			vm_reserv_populate(rv);
 			return (m);
 		}
+	}else{
+		msucc = NULL;
 	}
 	/*
 	   while (mpred != NULL) {