Changeset 26181 in vbox

Timestamp:

Feb 3, 2010 4:58:18 AM (15 years ago)

Author:

vboxsync

Message:

pdmacFileEpCacheDestroy: Fixed lock order issue, conflicted with pdmacFileEpCacheRead.

File:

• trunk/src/VBox/VMM/PDMAsyncCompletionFileCache.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/PDMAsyncCompletionFileCache.cpp

@@ -275 +275 @@
 
         /* We can't evict pages which are currently in progress */
-        if (!(pCurr->fFlags & PDMACFILECACHE_ENTRY_IO_IN_PROGRESS)
+        if (   !(pCurr->fFlags & PDMACFILECACHE_ENTRY_IO_IN_PROGRESS)
             && (ASMAtomicReadU32(&pCurr->cRefs) == 0))
         {
@@ -951 +951 @@
 
     /* Make sure nobody is accessing the cache while we delete the tree. */
+    RTCritSectEnter(&pCache->CritSect);
     RTSemRWRequestWrite(pEndpointCache->SemRWEntries, RT_INDEFINITE_WAIT);
-    RTCritSectEnter(&pCache->CritSect);
     RTAvlrFileOffsetDestroy(pEndpointCache->pTree, pdmacFileEpCacheEntryDestroy, pCache);
+    RTSemRWReleaseWrite(pEndpointCache->SemRWEntries);
     RTCritSectLeave(&pCache->CritSect);
-    RTSemRWReleaseWrite(pEndpointCache->SemRWEntries);
 
     RTSemRWDestroy(pEndpointCache->SemRWEntries);