Changeset 27213 in vbox for trunk/src

Timestamp:

Mar 9, 2010 1:03:27 PM (15 years ago)

Author:

vboxsync

Message:

VD: Move the readonly mode change after behind the differencing disk deletion to prevent an inconsistent chain if the mode change fails

File:

• trunk/src/VBox/Devices/Storage/VBoxHDD.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Storage/VBoxHDD.cpp

@@ -2061 +2061 @@
         /* Update parent UUID so that image chain is consistent. */
         RTUUID Uuid;
+        PVDIMAGE pImageChild = NULL;
         if (nImageFrom < nImageTo)
         {
@@ -2088 +2089 @@
                 AssertRC(rc);
 
-                /* Reopen readonly if neccessary */
-                if (pImageFrom->pNext != pDisk->pLast)
-                {
-                    PVDIMAGE pImageChild = pImageFrom->pNext;
-
-                    uOpenFlags = pImageChild->Backend->pfnGetOpenFlags(pImageChild->pvBackendData);
-                    uOpenFlags |= VD_OPEN_FLAGS_READONLY;
-                    rc = pImageChild->Backend->pfnSetOpenFlags(pImageChild->pvBackendData,
-                                                               uOpenFlags);
-                    /** @todo: What to do if this fails?. Breaking would
-                     * prevent the merged images from being removed 
-                     * from the chain possibly causing inconsistent behavior.
-                     */
-                    if (RT_FAILURE(rc))
-                        break;
-                }
+                pImageChild = pImageFrom->pNext;
             }
-        }
-
-        /* Make sure destination image is back to read only if necessary. */
-        if (pImageTo != pDisk->pLast && pImageFrom != pDisk->pLast)
-        {
-            uOpenFlags = pImageTo->Backend->pfnGetOpenFlags(pImageTo->pvBackendData);
-            uOpenFlags |= VD_OPEN_FLAGS_READONLY;
-            rc = pImageTo->Backend->pfnSetOpenFlags(pImageTo->pvBackendData,
-                                                    uOpenFlags);
-            if (RT_FAILURE(rc))
-                break;
         }
 
@@ -2131 +2106 @@
             RTMemFree(pImg);
             pImg = pTmp;
+        }
+
+        /* Make sure destination image is back to read only if necessary. */
+        if (pImageTo != pDisk->pLast)
+        {
+            uOpenFlags = pImageTo->Backend->pfnGetOpenFlags(pImageTo->pvBackendData);
+            uOpenFlags |= VD_OPEN_FLAGS_READONLY;
+            rc = pImageTo->Backend->pfnSetOpenFlags(pImageTo->pvBackendData,
+                                                    uOpenFlags);
+            if (RT_FAILURE(rc))
+                break;
+        }
+
+        /*
+         * Make sure the child is readonly
+         * for the child -> parent merge direction
+         * if neccessary.
+        */
+        if (   nImageFrom > nImageTo
+            && pImageChild
+            && pImageChild != pDisk->pLast)
+        {
+            uOpenFlags = pImageChild->Backend->pfnGetOpenFlags(pImageChild->pvBackendData);
+            uOpenFlags |= VD_OPEN_FLAGS_READONLY;
+            rc = pImageChild->Backend->pfnSetOpenFlags(pImageChild->pvBackendData,
+                                                       uOpenFlags);
+            if (RT_FAILURE(rc))
+                break;
         }
     } while (0);