i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Cleanup, no functional change.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40343 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2011-02-01 17:55:38 +00:00
parent d40b4e0f3b
commit 3f8bbbe05a
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/device_manager/IOCache.cpp
+21 -21
View File
@@ -343,7 +343,7 @@ IOCache::_TransferRequestLine(IORequest* request, off_t lineOffset,
pageOffset++) { pageOffset++) {
page_num_t index = pageOffset - firstPageOffset; page_num_t index = pageOffset - firstPageOffset;
if (fPages[index] == NULL) { if (fPages[index] == NULL) {
fPages[index] = vm_page_allocate_page( &reservation, fPages[index] = vm_page_allocate_page(&reservation,
PAGE_STATE_UNUSED); PAGE_STATE_UNUSED);
DEBUG_PAGE_ACCESS_END(fPages[index]); DEBUG_PAGE_ACCESS_END(fPages[index]);
} else { } else {
@@ -392,29 +392,29 @@ IOCache::_TransferRequestLine(IORequest* request, off_t lineOffset,
requestOffset, requestLength, true); requestOffset, requestLength, true);
_CachePages(0, linePageCount); _CachePages(0, linePageCount);
return error; 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 // copy data from request
page_num_t firstPage = (requestOffset - lineOffset) / B_PAGE_SIZE; status_t error = _CopyPages(request, requestOffset - lineOffset,
page_num_t endPage = (requestOffset + requestLength - lineOffset requestOffset, requestLength, false);
+ B_PAGE_SIZE - 1) / B_PAGE_SIZE; if (error != B_OK) {
error = _TransferPages(firstPage, endPage - firstPage, true, isVIP); _DiscardPages(0, linePageCount);
if (error != B_OK) {
_DiscardPages(firstPage, endPage - firstPage);
return error;
}
_CachePages(0, linePageCount);
return error; 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;
} }