From owner-svn-src-user@FreeBSD.ORG Fri Feb 15 12:35:17 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id B8765466; Fri, 15 Feb 2013 12:35:17 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 7C60B8FD; Fri, 15 Feb 2013 12:35:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1FCZHkR043345; Fri, 15 Feb 2013 12:35:17 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1FCZH5l043343; Fri, 15 Feb 2013 12:35:17 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201302151235.r1FCZH5l043343@svn.freebsd.org> From: Attilio Rao Date: Fri, 15 Feb 2013 12:35:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r246825 - user/attilio/vmc-playground/sys/vm X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Feb 2013 12:35:17 -0000 Author: attilio Date: Fri Feb 15 12:35:16 2013 New Revision: 246825 URL: http://svnweb.freebsd.org/changeset/base/246825 Log: - Fix style in vm_page_lookup(): there is no whiteline between assertions and other code in this file. - Reinsert some comments that were lost during the work but which are actual yet, reducing differences with HEAD. Sponsoed by: EMC / Isilon storage division Modified: user/attilio/vmc-playground/sys/vm/vm_page.c Modified: user/attilio/vmc-playground/sys/vm/vm_page.c ============================================================================== --- user/attilio/vmc-playground/sys/vm/vm_page.c Fri Feb 15 10:44:07 2013 (r246824) +++ user/attilio/vmc-playground/sys/vm/vm_page.c Fri Feb 15 12:35:16 2013 (r246825) @@ -820,6 +820,9 @@ vm_page_insert(vm_page_t m, vm_object_t m->object = object; m->pindex = pindex; + /* + * Now link into the object's ordered list of backed pages. + */ if (object->resident_page_count == 0) { TAILQ_INSERT_TAIL(&object->memq, m, listq); } else { @@ -879,6 +882,9 @@ vm_page_remove(vm_page_t m) vm_page_flash(m); } + /* + * Now remove from the object's list of backed pages. + */ vm_radix_remove(&object->rtree, m->pindex); TAILQ_REMOVE(&object->memq, m, listq); @@ -909,7 +915,6 @@ vm_page_lookup(vm_object_t object, vm_pi { VM_OBJECT_LOCK_ASSERT(object, MA_OWNED); - return (vm_radix_lookup(&object->rtree, pindex)); } @@ -1101,10 +1106,16 @@ vm_page_cache_transfer(vm_object_t orig_ mtx_lock(&vm_page_queue_free_mtx); while ((m = vm_radix_lookup_ge(&orig_object->cache, offidxstart)) != NULL) { + /* + * Transfer all of the pages with offset greater than or + * equal to 'offidxstart' from the original object's + * cache to the new object's cache. + */ if ((m->pindex - offidxstart) >= new_object->size) break; vm_radix_remove(&orig_object->cache, m->pindex); vm_radix_insert(&new_object->cache, m->pindex - offidxstart, m); + /* Update the page's object and offset. */ m->object = new_object; m->pindex -= offidxstart; } @@ -2157,6 +2168,10 @@ vm_page_cache(vm_page_t m) */ vm_page_remque(m); + /* + * Remove the page from the object's collection of resident + * pages. + */ vm_radix_remove(&object->rtree, m->pindex); TAILQ_REMOVE(&object->memq, m, listq); object->resident_page_count--;