Changeset 39042 in vbox

Timestamp:

Oct 19, 2011 2:55:57 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

74462

Message:

build fix

File:

• trunk/src/VBox/VMM/VMMR3/PDMBlkCache.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/VMMR3/PDMBlkCache.cpp

@@ -1824 +1824 @@
                                                 size_t *pcbData)
 {
-    AssertReturn(cb <= UINT32_MAX, NULL);
-
     uint64_t offStart = 0;
     uint32_t cbEntry  = 0;
     *pcbData = pdmBlkCacheEntryBoundariesCalc(pBlkCache, off, (uint32_t)cb, uAlignment,
                                               &offStart, &cbEntry);
+    AssertReturn(cb <= UINT32_MAX, NULL);
 
     PPDMBLKCACHEGLOBAL pCache = pBlkCache->pCache;
@@ -2182 +2181 @@
 
         pEntry = pdmBlkCacheGetCacheEntryByOffset(pBlkCache, off);
-
         if (pEntry)
         {
@@ -2215 +2213 @@
                     /* If it is already dirty but not in progress just update the data. */
                     if (!(pEntry->fFlags & PDMBLKCACHE_ENTRY_IO_IN_PROGRESS))
-                    {
-                        RTSgBufCopyToBuf(&SgBuf, pEntry->pbData + offDiff,
-                                         cbToWrite);
-                    }
+                        RTSgBufCopyToBuf(&SgBuf, pEntry->pbData + offDiff, cbToWrite);
                     else
                     {
@@ -2236 +2231 @@
                      * We have to defer processing in that case.
                      */
-                    if(pdmBlkCacheEntryFlagIsSetClearAcquireLock(pBlkCache, pEntry,
-                                                                 PDMBLKCACHE_ENTRY_IO_IN_PROGRESS,
-                                                                 0))
+                    if (pdmBlkCacheEntryFlagIsSetClearAcquireLock(pBlkCache, pEntry,
+                                                                  PDMBLKCACHE_ENTRY_IO_IN_PROGRESS,
+                                                                  0))
                     {
                         pdmBlkCacheEntryWaitersAdd(pEntry, pReq,