Changeset 36151 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Mar 3, 2011 2:42:53 PM (14 years ago)

Author:

vboxsync

Message:

BlockCache: Don't add waiting writs to the list again after an I/O error, this can cause hangs during suspend. It is safe to write the data and complete the entries.

File:

• trunk/src/VBox/VMM/VMMR3/PDMBlkCache.cpp (modified) (1 diff)

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

@@ -2473 +2473 @@
             }
 
-            /*
-             * The entry is still marked as dirty which prevents eviction.
-             * Add the waiters to the list again.
-             */
-            pEntry->fFlags &= ~PDMBLKCACHE_ENTRY_IS_DIRTY; /* Clear so it gets added to the list again. */
+            /* Mark the entry as dirty again to get it added to the list later on. */
             fDirty = true;
-
-            if (pComplete)
-            {
-                pEntry->pWaitingHead = pComplete;
-                while (pComplete->pNext)
-                    pComplete = pComplete->pNext;
-                pEntry->pWaitingTail = pComplete;
-                pComplete = NULL;
-            }
-        }
-        else
-        {
-            pEntry->fFlags &= ~PDMBLKCACHE_ENTRY_IS_DIRTY;
-
-            while (pCurr)
-            {
-                AssertMsg(pCurr->fWrite, ("Completed write entries should never have read tasks attached\n"));
-
-                RTSgBufCopyToBuf(&pCurr->SgBuf, pEntry->pbData + pCurr->offCacheEntry, pCurr->cbTransfer);
-                fDirty = true;
-
-                pCurr = pCurr->pNext;
-            }
+        }
+
+        pEntry->fFlags &= ~PDMBLKCACHE_ENTRY_IS_DIRTY;
+
+        while (pCurr)
+        {
+            AssertMsg(pCurr->fWrite, ("Completed write entries should never have read tasks attached\n"));
+
+            RTSgBufCopyToBuf(&pCurr->SgBuf, pEntry->pbData + pCurr->offCacheEntry, pCurr->cbTransfer);
+            fDirty = true;
+            pCurr = pCurr->pNext;
         }
     }