From owner-svn-src-stable@FreeBSD.ORG Fri Nov 26 15:33:10 2010 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1D9EA1065672; Fri, 26 Nov 2010 15:33:10 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0794A8FC1C; Fri, 26 Nov 2010 15:33:10 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oAQFX92V051094; Fri, 26 Nov 2010 15:33:09 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAQFX9Eu051091; Fri, 26 Nov 2010 15:33:09 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201011261533.oAQFX9Eu051091@svn.freebsd.org> From: Konstantin Belousov Date: Fri, 26 Nov 2010 15:33:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r215867 - stable/8/sys/vm X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Nov 2010 15:33:11 -0000 Author: kib Date: Fri Nov 26 15:33:09 2010 New Revision: 215867 URL: http://svn.freebsd.org/changeset/base/215867 Log: MFC r215469: Only increment object generation count when inserting the page into object page list. Modified: stable/8/sys/vm/vm_object.c stable/8/sys/vm/vm_page.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/vm/vm_object.c ============================================================================== --- stable/8/sys/vm/vm_object.c Fri Nov 26 15:30:02 2010 (r215866) +++ stable/8/sys/vm/vm_object.c Fri Nov 26 15:33:09 2010 (r215867) @@ -604,7 +604,6 @@ doterm: VM_OBJECT_LOCK(temp); LIST_REMOVE(object, shadow_list); temp->shadow_count--; - temp->generation++; VM_OBJECT_UNLOCK(temp); object->backing_object = NULL; } @@ -1156,7 +1155,6 @@ vm_object_shadow( VM_OBJECT_LOCK(source); LIST_INSERT_HEAD(&source->shadow_head, result, shadow_list); source->shadow_count++; - source->generation++; #if VM_NRESERVLEVEL > 0 result->flags |= source->flags & OBJ_COLORED; result->pg_color = (source->pg_color + OFF_TO_IDX(*offset)) & @@ -1224,7 +1222,6 @@ vm_object_split(vm_map_entry_t entry) LIST_INSERT_HEAD(&source->shadow_head, new_object, shadow_list); source->shadow_count++; - source->generation++; vm_object_reference_locked(source); /* for new_object */ vm_object_clear_flag(source, OBJ_ONEMAPPING); VM_OBJECT_UNLOCK(source); @@ -1616,7 +1613,6 @@ vm_object_collapse(vm_object_t object) */ LIST_REMOVE(object, shadow_list); backing_object->shadow_count--; - backing_object->generation++; if (backing_object->backing_object) { VM_OBJECT_LOCK(backing_object->backing_object); LIST_REMOVE(backing_object, shadow_list); @@ -1626,7 +1622,6 @@ vm_object_collapse(vm_object_t object) /* * The shadow_count has not changed. */ - backing_object->backing_object->generation++; VM_OBJECT_UNLOCK(backing_object->backing_object); } object->backing_object = backing_object->backing_object; @@ -1668,7 +1663,6 @@ vm_object_collapse(vm_object_t object) */ LIST_REMOVE(object, shadow_list); backing_object->shadow_count--; - backing_object->generation++; new_backing_object = backing_object->backing_object; if ((object->backing_object = new_backing_object) != NULL) { @@ -1679,7 +1673,6 @@ vm_object_collapse(vm_object_t object) shadow_list ); new_backing_object->shadow_count++; - new_backing_object->generation++; vm_object_reference_locked(new_backing_object); VM_OBJECT_UNLOCK(new_backing_object); object->backing_object_offset += Modified: stable/8/sys/vm/vm_page.c ============================================================================== --- stable/8/sys/vm/vm_page.c Fri Nov 26 15:30:02 2010 (r215866) +++ stable/8/sys/vm/vm_page.c Fri Nov 26 15:33:09 2010 (r215867) @@ -751,7 +751,6 @@ vm_page_remove(vm_page_t m) * And show that the object has one fewer resident page. */ object->resident_page_count--; - object->generation++; /* * The vnode may now be recycled. */ @@ -1750,7 +1749,6 @@ vm_page_cache(vm_page_t m) object->root = root; TAILQ_REMOVE(&object->memq, m, listq); object->resident_page_count--; - object->generation++; /* * Restore the default memory attribute to the page. @@ -2102,7 +2100,6 @@ vm_page_set_invalid(vm_page_t m, int bas pmap_remove_all(m); m->valid &= ~bits; m->dirty &= ~bits; - m->object->generation++; } /*