Changeset 45239 in vbox for trunk/src

Timestamp:

Mar 28, 2013 4:11:56 PM (12 years ago)

Author:

vboxsync

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

84617

Message:

Main/Medium: Remove leftover calls to UnlockWrite in ResetHandler causing hangs during startup

File:

• trunk/src/VBox/Main/src-server/MediumImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-server/MediumImpl.cpp

@@ -3091 +3091 @@
             pProgress.queryInterfaceTo(aProgress);
     }
-    else
-    {
-        /* Note: on success, the task will unlock this */
-        {
-            AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-            HRESULT rc2 = UnlockWrite(NULL);
-            AssertComRC(rc2);
-        }
-        if (pTask != NULL)
-            delete pTask;
-    }
+    else if (pTask != NULL)
+        delete pTask;
 
     LogFlowThisFunc(("LEAVE, rc=%Rhrc\n", rc));
@@ -7867 +7858 @@
     m->variant = variant;
 
-    if (task.isAsync())
-    {
-        /* unlock ourselves when done */
-        HRESULT rc2 = UnlockWrite(NULL);
-        AssertComRC(rc2);
-    }
-
-    /* Note that in sync mode, it's the caller's responsibility to
-     * unlock the medium. */
+    /* Everything is explicitly unlocked when the task exits,
+     * as the task destruction also destroys the media chain. */
 
     return rc;