d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Fix style in vm_page_lookup(): there is no whiteline between

Browse Source 
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
This commit is contained in:
attilio 2013-02-15 12:35:16 +00:00
parent 431fc15e42
commit af55a9fb46
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/vm/vm_page.c
View File

@ -820,6 +820,9 @@ vm_page_insert(vm_page_t m, vm_object_t object, vm_pindex_t pindex)
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_pindex_t pindex)
{
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_object, vm_pindex_t offidxstart,
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--;