From owner-p4-projects@FreeBSD.ORG  Mon Aug 18 18:38:45 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7965710656E9; Mon, 18 Aug 2008 18:38:45 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3788910656BE
	for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 18:38:45 +0000 (UTC)
	(envelope-from mayur@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 1C9888FC23
	for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 18:38:45 +0000 (UTC)
	(envelope-from mayur@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7IIcjFG005180
	for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 18:38:45 GMT
	(envelope-from mayur@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7IIcjaf005178
	for perforce@freebsd.org; Mon, 18 Aug 2008 18:38:45 GMT
	(envelope-from mayur@FreeBSD.org)
Date: Mon, 18 Aug 2008 18:38:45 GMT
Message-Id: <200808181838.m7IIcjaf005178@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mayur@FreeBSD.org using -f
From: Mayur Shardul <mayur@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 147750 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 18 Aug 2008 18:38:46 -0000

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

Change 147750 by mayur@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) {