From 3f8bbbe05a989d756551c00cf684c101cb6c034c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 1 Feb 2011 17:55:38 +0000 Subject: [PATCH] * Cleanup, no functional change. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40343 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/system/kernel/device_manager/IOCache.cpp | 42 ++++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/system/kernel/device_manager/IOCache.cpp b/src/system/kernel/device_manager/IOCache.cpp index 574767e1a4..d4eb97d189 100644 --- a/src/system/kernel/device_manager/IOCache.cpp +++ b/src/system/kernel/device_manager/IOCache.cpp @@ -343,7 +343,7 @@ IOCache::_TransferRequestLine(IORequest* request, off_t lineOffset, pageOffset++) { page_num_t index = pageOffset - firstPageOffset; if (fPages[index] == NULL) { - fPages[index] = vm_page_allocate_page( &reservation, + fPages[index] = vm_page_allocate_page(&reservation, PAGE_STATE_UNUSED); DEBUG_PAGE_ACCESS_END(fPages[index]); } else { @@ -392,29 +392,29 @@ IOCache::_TransferRequestLine(IORequest* request, off_t lineOffset, requestOffset, requestLength, true); _CachePages(0, linePageCount); return error; - } else { - // copy data from request - status_t error = _CopyPages(request, requestOffset - lineOffset, - requestOffset, requestLength, false); - if (error != B_OK) { - _DiscardPages(0, linePageCount); - return error; - } + } - // write the pages to disk - page_num_t firstPage = (requestOffset - lineOffset) / B_PAGE_SIZE; - page_num_t endPage = (requestOffset + requestLength - lineOffset - + B_PAGE_SIZE - 1) / B_PAGE_SIZE; - error = _TransferPages(firstPage, endPage - firstPage, true, isVIP); - - if (error != B_OK) { - _DiscardPages(firstPage, endPage - firstPage); - return error; - } - - _CachePages(0, linePageCount); + // copy data from request + status_t error = _CopyPages(request, requestOffset - lineOffset, + requestOffset, requestLength, false); + if (error != B_OK) { + _DiscardPages(0, linePageCount); return error; } + + // write the pages to disk + page_num_t firstPage = (requestOffset - lineOffset) / B_PAGE_SIZE; + page_num_t endPage = (requestOffset + requestLength - lineOffset + + B_PAGE_SIZE - 1) / B_PAGE_SIZE; + error = _TransferPages(firstPage, endPage - firstPage, true, isVIP); + + if (error != B_OK) { + _DiscardPages(firstPage, endPage - firstPage); + return error; + } + + _CachePages(0, linePageCount); + return error; }