Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 7 Feb 2013 15:08:36 +0000 (UTC)
From:      Attilio Rao <attilio@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r246475 - user/attilio/vmc-playground/sys/vm
Message-ID:  <201302071508.r17F8a3e094951@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: attilio
Date: Thu Feb  7 15:08:35 2013
New Revision: 246475
URL: http://svnweb.freebsd.org/changeset/base/246475

Log:
  Correctly complete r246474.

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	Thu Feb  7 15:06:45 2013	(r246474)
+++ user/attilio/vmc-playground/sys/vm/vm_reserv.c	Thu Feb  7 15:08:35 2013	(r246475)
@@ -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))
@@ -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))



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302071508.r17F8a3e094951>