From owner-svn-src-user@FreeBSD.ORG  Sun Jan  1 21:46:16 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 99A79106567C;
	Sun,  1 Jan 2012 21:46:16 +0000 (UTC)
	(envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 855748FC13;
	Sun,  1 Jan 2012 21:46:16 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q01LkGiv032364;
	Sun, 1 Jan 2012 21:46:16 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q01LkGIo032362;
	Sun, 1 Jan 2012 21:46:16 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201201012146.q01LkGIo032362@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Sun, 1 Jan 2012 21:46:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r229214 - user/attilio/vmcontention/sys/vm
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 01 Jan 2012 21:46:16 -0000

Author: attilio
Date: Sun Jan  1 21:46:16 2012
New Revision: 229214
URL: http://svn.freebsd.org/changeset/base/229214

Log:
  Fix a spot missed during the last merge.

Modified:
  user/attilio/vmcontention/sys/vm/vm_reserv.c

Modified: user/attilio/vmcontention/sys/vm/vm_reserv.c
==============================================================================
--- user/attilio/vmcontention/sys/vm/vm_reserv.c	Sun Jan  1 21:43:14 2012	(r229213)
+++ user/attilio/vmcontention/sys/vm/vm_reserv.c	Sun Jan  1 21:46:16 2012	(r229214)
@@ -495,33 +495,21 @@ vm_reserv_alloc_page(vm_object_t object,
 	/*
 	 * Look for an existing reservation.
 	 */
-	msucc = NULL;
-	mpred = object->root;
-	while (mpred != NULL) {
+	mpred = vm_radix_lookup_le(&object->rtree, pindex, VM_RADIX_BLACK);
+	if (mpred != NULL) {
 		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))
 			goto found;
-		else if (mpred->pindex < pindex) {
-			if (msucc != NULL ||
-			    (msucc = TAILQ_NEXT(mpred, listq)) == NULL)
-				break;
-			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))
-				goto found;
-			else if (pindex < msucc->pindex)
-				break;
-		} else if (msucc == NULL) {
-			msucc = mpred;
-			mpred = TAILQ_PREV(msucc, pglist, listq);
-			continue;
-		}
-		msucc = NULL;
-		mpred = object->root = vm_page_splay(pindex, object->root);
+	}
+	msucc = vm_radix_lookup_ge(&object->rtree, pindex, VM_RADIX_BLACK);
+	if (msucc != NULL) {
+		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))
+			goto found;
 	}
 
 	/*