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

Revert wrongly added asserts: lookup and remove from the collection

Browse Source 
of cached pages doesn't require the object lock to be held.

Sponsored by:	EMC / Isilon storage division
This commit is contained in:
attilio 2013-02-26 00:34:52 +00:00
parent 26f238c055
commit fc0ecac2f8
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/vm/vm_page.c
View File

@ -1006,8 +1006,6 @@ vm_page_rename(vm_page_t m, vm_object_t new_object, vm_pindex_t new_pindex)
* infinity. If the given object is backed by a vnode and it
* transitions from having one or more cached pages to none, the
* vnode's hold count is reduced.
*
* The object must be locked.
*/
void
vm_page_cache_free(vm_object_t object, vm_pindex_t start, vm_pindex_t end)
@ -1015,8 +1013,6 @@ vm_page_cache_free(vm_object_t object, vm_pindex_t start, vm_pindex_t end)
vm_page_t m;
boolean_t empty;
VM_OBJECT_LOCK_ASSERT(object, MA_OWNED);
mtx_lock(&vm_page_queue_free_mtx);
if (vm_object_cache_is_empty(object)) {
mtx_unlock(&vm_page_queue_free_mtx);
@ -1045,13 +1041,12 @@ vm_page_cache_free(vm_object_t object, vm_pindex_t start, vm_pindex_t end)
* Returns the cached page that is associated with the given
* object and offset. If, however, none exists, returns NULL.
*
* The free page queue and object must be locked.
* The free page queue must be locked.
*/
static inline vm_page_t
vm_page_cache_lookup(vm_object_t object, vm_pindex_t pindex)
{
VM_OBJECT_LOCK_ASSERT(object, MA_OWNED);
mtx_assert(&vm_page_queue_free_mtx, MA_OWNED);
return (vm_radix_lookup(&object->cache, pindex));
}
@ -1083,7 +1078,7 @@ vm_page_cache_remove(vm_page_t m)
* empty. Offset 'offidxstart' in the original object must
* correspond to offset zero in the new object.
*
* The new object and original object must be locked.
* The new object must be locked.
*/
void
vm_page_cache_transfer(vm_object_t orig_object, vm_pindex_t offidxstart,
@ -1097,7 +1092,6 @@ vm_page_cache_transfer(vm_object_t orig_object, vm_pindex_t offidxstart,
* not.
*/
VM_OBJECT_LOCK_ASSERT(new_object, MA_OWNED);
VM_OBJECT_LOCK_ASSERT(orig_object, MA_OWNED);
KASSERT(vm_object_cache_is_empty(new_object),
("vm_page_cache_transfer: object %p has cached pages",
new_object));