Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reordered somewhat unhealthy looking if-construct (first

Browse Source 
"currentPage->state == ..." then "currentPage != NULL").


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20377 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2007-03-12 12:23:45 +00:00
parent f6be3b4d1a
commit e4b4574f41
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/system/kernel/cache/file_cache.cpp vendored
View File

@ -902,7 +902,11 @@ cache_io(void *_cacheRef, off_t offset, addr_t buffer, size_t *_size, bool doWri
// check if the dummy page is still in place // check if the dummy page is still in place
restart_dummy_lookup: restart_dummy_lookup:
vm_page *currentPage = vm_cache_lookup_page(cache, offset); vm_page *currentPage = vm_cache_lookup_page(cache, offset);
if (currentPage->state == PAGE_STATE_BUSY) { if (currentPage == NULL) {
// there is no page in place anymore, we'll put ours
// into it
vm_cache_insert_page(cache, page, offset);
} else if (currentPage->state == PAGE_STATE_BUSY) {
if (currentPage->type == PAGE_TYPE_DUMMY) { if (currentPage->type == PAGE_TYPE_DUMMY) {
// we let the other party add our page // we let the other party add our page
currentPage->queue_next = page; currentPage->queue_next = page;
@ -913,7 +917,7 @@ cache_io(void *_cacheRef, off_t offset, addr_t buffer, size_t *_size, bool doWri
mutex_lock(&cache->lock); mutex_lock(&cache->lock);
goto restart_dummy_lookup; goto restart_dummy_lookup;
} }
} else if (currentPage != NULL) { } else {
// we need to copy our new page into the old one // we need to copy our new page into the old one
addr_t destinationAddress; addr_t destinationAddress;
vm_get_physical_page(page->physical_page_number * B_PAGE_SIZE, vm_get_physical_page(page->physical_page_number * B_PAGE_SIZE,
@ -927,9 +931,6 @@ cache_io(void *_cacheRef, off_t offset, addr_t buffer, size_t *_size, bool doWri
vm_put_physical_page(virtualAddress); vm_put_physical_page(virtualAddress);
vm_page_set_state(page, PAGE_STATE_FREE); vm_page_set_state(page, PAGE_STATE_FREE);
} else {
// there is no page in place anymore, we'll put ours into it
vm_cache_insert_page(cache, page, offset);
} }
} }