[haiku-commits] r40343 - haiku/trunk/src/system/kernel/device_manager

From: axeld@xxxxxxxxxxxxxxxx
To: haiku-commits@xxxxxxxxxxxxx
Date: Tue, 1 Feb 2011 18:55:38 +0100 (CET)
Author: axeld
Date: 2011-02-01 18:55:38 +0100 (Tue, 01 Feb 2011)
New Revision: 40343
Changeset: http://dev.haiku-os.org/changeset/40343

Modified:
   haiku/trunk/src/system/kernel/device_manager/IOCache.cpp
Log:
* Cleanup, no functional change.


Modified: haiku/trunk/src/system/kernel/device_manager/IOCache.cpp
===================================================================
--- haiku/trunk/src/system/kernel/device_manager/IOCache.cpp    2011-02-01 
17:20:15 UTC (rev 40342)
+++ haiku/trunk/src/system/kernel/device_manager/IOCache.cpp    2011-02-01 
17:55:38 UTC (rev 40343)
@@ -343,7 +343,7 @@
                                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 @@
                        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);
+       // copy data from request
+       status_t error = _CopyPages(request, requestOffset - lineOffset,
+               requestOffset, requestLength, false);
+       if (error != B_OK) {
+               _DiscardPages(0, linePageCount);
+               return error;
+       }
 
-               if (error != B_OK) {
-                       _DiscardPages(firstPage, endPage - firstPage);
-                       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);
 
-               _CachePages(0, linePageCount);
+       if (error != B_OK) {
+               _DiscardPages(firstPage, endPage - firstPage);
                return error;
        }
+
+       _CachePages(0, linePageCount);
+       return error;
 }
[haiku-commits] r40343 - haiku/trunk/src/system/kernel/device_manager

Other related posts:
