Changeset 37119 in vbox

Timestamp:

May 17, 2011 7:41:10 AM (14 years ago)

Author:

vboxsync

Message:

VD: Fix rare hangs during I/O with flat VMDK images

File:

• trunk/src/VBox/Storage/VD.cpp (modified) (7 diffs)

trunk/src/VBox/Storage/VD.cpp

@@ -2721 +2721 @@
                  pIoStorage, pIoCtx, pfnComplete, pvUser, cbTransfer, rcReq));
 
+    RTCritSectEnter(&pDisk->CritSect);
     Assert(pIoCtx->cbTransferLeft >= cbTransfer);
     ASMAtomicSubU32(&pIoCtx->cbTransferLeft, cbTransfer);
@@ -2726 +2727 @@
 
     if (pfnComplete)
-    {
-        RTCritSectEnter(&pDisk->CritSect);
         rc = pfnComplete(pIoStorage->pVDIo->pBackendData, pIoCtx, pvUser, rcReq);
-        RTCritSectLeave(&pDisk->CritSect);
-    }
 
     if (RT_SUCCESS(rc))
@@ -2736 +2733 @@
     else if (rc == VERR_VD_ASYNC_IO_IN_PROGRESS)
         rc = VINF_SUCCESS;
+
+    RTCritSectLeave(&pDisk->CritSect);
 
     return rc;
@@ -2777 +2776 @@
     else
         RTListMove(&ListIoCtxWaiting, &pMetaXfer->ListIoCtxWaiting);
-    RTCritSectLeave(&pDisk->CritSect);
 
     /* Go through the waiting list and continue the I/O contexts. */
@@ -2792 +2790 @@
 
         if (pfnComplete)
-        {
-            RTCritSectEnter(&pDisk->CritSect);
             rc = pfnComplete(pIoStorage->pVDIo->pBackendData, pIoCtx, pvUser, rcReq);
-            RTCritSectLeave(&pDisk->CritSect);
-        }
 
         LogFlow(("Completion callback for I/O context %#p returned %Rrc\n", pIoCtx, rc));
@@ -2812 +2806 @@
     if (RT_SUCCESS(rcReq) && !fFlush)
     {
-        RTCritSectEnter(&pDisk->CritSect);
         pMetaXfer->cRefs--;
         if (!pMetaXfer->cRefs && RTListIsEmpty(&pMetaXfer->ListIoCtxWaiting))
@@ -2822 +2815 @@
             RTMemFree(pMetaXfer);
         }
-        RTCritSectLeave(&pDisk->CritSect);
     }
     else if (fFlush)
         RTMemFree(pMetaXfer);
+
+    RTCritSectLeave(&pDisk->CritSect);
 
     return VINF_SUCCESS;