Changeset 46613 in vbox for trunk/src/VBox/Storage/VMDK.cpp

Timestamp:

Jun 18, 2013 10:27:13 AM (12 years ago)

Author:

vboxsync

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

86497

Message:

Storage: Propagate errors when closing a file but free everything nevertheless (see @bugref{6791})

File:

• trunk/src/VBox/Storage/VMDK.cpp (modified) (8 diffs)

trunk/src/VBox/Storage/VMDK.cpp

@@ -524 +524 @@
 
 static void vmdkFreeStreamBuffers(PVMDKEXTENT pExtent);
-static void vmdkFreeExtentData(PVMDKIMAGE pImage, PVMDKEXTENT pExtent,
-                               bool fDelete);
+static int vmdkFreeExtentData(PVMDKIMAGE pImage, PVMDKEXTENT pExtent,
+                              bool fDelete);
 
 static int vmdkCreateExtents(PVMDKIMAGE pImage, unsigned cExtents);
@@ -2862 +2862 @@
  * Internal: free the memory used by the extent data structure, optionally
  * deleting the referenced files.
+ *
+ * @returns VBox status code.
+ * @param   pImage    Pointer to the image instance data.
+ * @param   pExtent   The extent to free.
+ * @param   fDelete   Flag whether to delete the backing storage.
  */
-static void vmdkFreeExtentData(PVMDKIMAGE pImage, PVMDKEXTENT pExtent,
-                               bool fDelete)
-{
+static int vmdkFreeExtentData(PVMDKIMAGE pImage, PVMDKEXTENT pExtent,
+                              bool fDelete)
+{
+    int rc = VINF_SUCCESS;
+
     vmdkFreeGrainDirectory(pExtent);
     if (pExtent->pDescData)
@@ -2875 +2882 @@
     {
         /* Do not delete raw extents, these have full and base names equal. */
-        vmdkFileClose(pImage, &pExtent->pFile,
-                         fDelete
-                      && pExtent->pszFullname
-                      && strcmp(pExtent->pszFullname, pExtent->pszBasename));
+        rc =vmdkFileClose(pImage, &pExtent->pFile,
+                             fDelete
+                          && pExtent->pszFullname
+                          && strcmp(pExtent->pszFullname, pExtent->pszBasename));
     }
     if (pExtent->pszBasename)
@@ -2891 +2898 @@
     }
     vmdkFreeStreamBuffers(pExtent);
+
+    return rc;
 }
 
@@ -4321 +4330 @@
         {
             for (unsigned i = 0 ; i < pImage->cExtents; i++)
-                vmdkFreeExtentData(pImage, &pImage->pExtents[i], fDelete);
+            {
+                int rc2 = vmdkFreeExtentData(pImage, &pImage->pExtents[i], fDelete);
+                if (RT_SUCCESS(rc))
+                    rc = rc2; /* Propogate any error when closing the file. */
+            }
             RTMemFree(pImage->pExtents);
             pImage->pExtents = NULL;
@@ -4327 +4340 @@
         pImage->cExtents = 0;
         if (pImage->pFile != NULL)
-            vmdkFileClose(pImage, &pImage->pFile, fDelete);
-        vmdkFileCheckAllClose(pImage);
+        {
+            int rc2 = vmdkFileClose(pImage, &pImage->pFile, fDelete);
+            if (RT_SUCCESS(rc))
+                rc = rc2; /* Propogate any error when closing the file. */
+        }
+        int rc2 = vmdkFileCheckAllClose(pImage);
+        if (RT_SUCCESS(rc))
+            rc = rc2; /* Propogate any error when closing the file. */
 
         if (pImage->pGTCache)
@@ -5517 +5536 @@
             goto rollback;
         /* Close the extent file. */
-        vmdkFileClose(pImage, &pExtent->pFile, false);
+        rc = vmdkFileClose(pImage, &pExtent->pFile, false);
+        if (RT_FAILURE(rc))
+            goto rollback;
+
         /* Rename the extent file. */
         rc = vdIfIoIntFileMove(pImage->pIfIo, pExtent->pszFullname, apszNewName[i], 0);
@@ -5526 +5548 @@
     }
     /* Release all old stuff. */
-    vmdkFreeImage(pImage, false);
+    rc = vmdkFreeImage(pImage, false);
+    if (RT_FAILURE(rc))
+        goto rollback;
 
     fImageFreed = true;