diff options
| author | alc <alc@FreeBSD.org> | 2013-03-10 17:30:57 +0000 |
|---|---|---|
| committer | alc <alc@FreeBSD.org> | 2013-03-10 17:30:57 +0000 |
| commit | 2c9c7618862694a596a19b1c9890c0619bb01afb (patch) | |
| tree | cb93df5bbc8255e2e440a475e6592db83c14bdb7 /sys/vm/vm_page.c | |
| parent | 8e402504c86a0f6242d45649b2f345664f84215f (diff) | |
| download | FreeBSD-src-2c9c7618862694a596a19b1c9890c0619bb01afb.zip FreeBSD-src-2c9c7618862694a596a19b1c9890c0619bb01afb.tar.gz | |
Introduce vm_radix_is_empty(), and use it in place of
vm_object_cache_is_empty() where the caller is aware of the page cache's
implementation as a radix trie.
Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'sys/vm/vm_page.c')
| -rw-r--r-- | sys/vm/vm_page.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index e51a28d..1fc2da8 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -1018,7 +1018,7 @@ vm_page_cache_free(vm_object_t object, vm_pindex_t start, vm_pindex_t end) boolean_t empty; mtx_lock(&vm_page_queue_free_mtx); - if (__predict_false(vm_object_cache_is_empty(object))) { + if (__predict_false(vm_radix_is_empty(&object->cache))) { mtx_unlock(&vm_page_queue_free_mtx); return; } @@ -1035,7 +1035,7 @@ vm_page_cache_free(vm_object_t object, vm_pindex_t start, vm_pindex_t end) cnt.v_cache_count--; cnt.v_free_count++; } - empty = vm_object_cache_is_empty(object); + empty = vm_radix_is_empty(&object->cache); mtx_unlock(&vm_page_queue_free_mtx); if (object->type == OBJT_VNODE && empty) vdrop(object->handle); @@ -1096,7 +1096,7 @@ vm_page_cache_transfer(vm_object_t orig_object, vm_pindex_t offidxstart, * not. */ VM_OBJECT_ASSERT_WLOCKED(new_object); - KASSERT(vm_object_cache_is_empty(new_object), + KASSERT(vm_radix_is_empty(&new_object->cache), ("vm_page_cache_transfer: object %p has cached pages", new_object)); mtx_lock(&vm_page_queue_free_mtx); @@ -2186,7 +2186,7 @@ vm_page_cache(vm_page_t m) mtx_lock(&vm_page_queue_free_mtx); m->flags |= PG_CACHED; cnt.v_cache_count++; - cache_was_empty = vm_object_cache_is_empty(object); + cache_was_empty = vm_radix_is_empty(&object->cache); vm_radix_insert(&object->cache, m->pindex, m); #if VM_NRESERVLEVEL > 0 if (!vm_reserv_free_page(m)) { |
