From owner-p4-projects@FreeBSD.ORG  Wed Jul 28 18:27:33 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D47E216A4D0; Wed, 28 Jul 2004 18:27:32 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id AC8B316A4CE
	for <perforce@freebsd.org>; Wed, 28 Jul 2004 18:27:32 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A2A6243D5E
	for <perforce@freebsd.org>; Wed, 28 Jul 2004 18:27:32 +0000 (GMT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6SIRW3Y006271
	for <perforce@freebsd.org>; Wed, 28 Jul 2004 18:27:32 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6SIRWsu006268
	for perforce@freebsd.org; Wed, 28 Jul 2004 18:27:32 GMT
	(envelope-from jhb@freebsd.org)
Date: Wed, 28 Jul 2004 18:27:32 GMT
Message-Id: <200407281827.i6SIRWsu006268@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 58388 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Wed, 28 Jul 2004 18:27:33 -0000

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

Change 58388 by jhb@jhb_slimer on 2004/07/28 18:26:56

	IFC @58386.

Affected files ...

.. //depot/projects/smpng/sys/vm/vm_object.c#56 integrate

Differences ...

==== //depot/projects/smpng/sys/vm/vm_object.c#56 (text+ko) ====

@@ -63,7 +63,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/vm/vm_object.c,v 1.328 2004/07/25 19:28:10 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/vm/vm_object.c,v 1.329 2004/07/28 18:23:08 alc Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -985,9 +985,9 @@
 	VM_OBJECT_LOCK(object);
 	while ((backing_object = object->backing_object) != NULL) {
 		VM_OBJECT_LOCK(backing_object);
+		offset += object->backing_object_offset;
 		VM_OBJECT_UNLOCK(object);
 		object = backing_object;
-		offset += object->backing_object_offset;
 		if (object->size < OFF_TO_IDX(offset + size))
 			size = IDX_TO_OFF(object->size) - offset;
 	}
@@ -1096,9 +1096,9 @@
 			if (backing_object == NULL)
 				goto unlock_tobject;
 			VM_OBJECT_LOCK(backing_object);
+			tpindex += OFF_TO_IDX(tobject->backing_object_offset);
 			VM_OBJECT_UNLOCK(tobject);
 			tobject = backing_object;
-			tpindex += OFF_TO_IDX(tobject->backing_object_offset);
 			goto shadowlookup;
 		}
 		/*