svn commit: r247198 - user/attilio/vmc-playground/sys/vm

Alan Cox alc at FreeBSD.org
Sat Feb 23 19:28:32 UTC 2013


Author: alc
Date: Sat Feb 23 19:28:31 2013
New Revision: 247198
URL: http://svnweb.freebsd.org/changeset/base/247198

Log:
  Correctly assert that no page already exists at the offset within the
  object that is currently being allocated.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  user/attilio/vmc-playground/sys/vm/vm_reserv.c

Modified: user/attilio/vmc-playground/sys/vm/vm_reserv.c
==============================================================================
--- user/attilio/vmc-playground/sys/vm/vm_reserv.c	Sat Feb 23 19:27:53 2013	(r247197)
+++ user/attilio/vmc-playground/sys/vm/vm_reserv.c	Sat Feb 23 19:28:31 2013	(r247198)
@@ -344,7 +344,7 @@ vm_reserv_alloc_contig(vm_object_t objec
 	 */
 	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 objec
 	}
 	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,
 	 */
 	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,
 	}
 	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))


More information about the svn-src-user mailing list