Changeset 38409 in vbox

Timestamp:

Aug 11, 2011 8:29:43 AM (13 years ago)

Author:

vboxsync

Message:

VD: Fix a possible deadlock if the block cache is enabled

File:

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

trunk/src/VBox/Storage/VD.cpp

@@ -2763 +2763 @@
     int rc = VINF_SUCCESS;
 
+    VD_THREAD_IS_CRITSECT_OWNER(pDisk);
+
     if (RT_FAILURE(rcReq))
         ASMAtomicCmpXchgS32(&pIoCtx->rcReq, rcReq, VINF_SUCCESS);
@@ -2820 +2822 @@
 
                 /* Process any pending writes if the current request didn't caused another growing. */
-                RTCritSectEnter(&pDisk->CritSect);
-
                 if (   !RTListIsEmpty(&pDisk->ListWriteLocked)
                     && !vdIoCtxIsDiskLockOwner(pDisk, pIoCtx))
@@ -2857 +2857 @@
                             && ASMAtomicCmpXchgBool(&pIoCtxWait->fComplete, true, false))
                         {
-                            RTCritSectLeave(&pDisk->CritSect);
                             LogFlowFunc(("Waiting I/O context completed pIoCtxWait=%#p\n", pIoCtxWait));
                             vdThreadFinishWrite(pDisk);
@@ -2864 +2863 @@
                                                               pIoCtxWait->rcReq);
                             vdIoCtxFree(pDisk, pIoCtxWait);
-                            RTCritSectEnter(&pDisk->CritSect);
                         }
                     } while (!RTListIsEmpty(&ListTmp));
+
+                    RTCritSectEnter(&pDisk->CritSect);
                 }
-                else
-                    RTCritSectLeave(&pDisk->CritSect);
             }
             else