PERFORCE change 58388 for review

[John Baldwin]

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

Change 58388 by jhb at 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;
 		}
 		/*