Changeset 47420 in vbox

Timestamp:

Jul 26, 2013 11:16:35 AM (11 years ago)

Author:

vboxsync

Message:

Storage: Fix assertion when using the iSCSI backend

File:

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

trunk/src/VBox/Storage/VD.cpp

@@ -2771 +2771 @@
         rc = pImage->Backend->pfnFlush(pImage->pBackendData, pIoCtx);
         if (   (   RT_SUCCESS(rc)
-                || rc == VERR_VD_ASYNC_IO_IN_PROGRESS)
+                || rc == VERR_VD_ASYNC_IO_IN_PROGRESS
+                || rc == VERR_VD_IOCTX_HALT)
             && pDisk->pCache)
         {
             rc = pDisk->pCache->Backend->pfnFlush(pDisk->pCache->pBackendData, pIoCtx);
             if (   RT_SUCCESS(rc)
-                || rc != VERR_VD_ASYNC_IO_IN_PROGRESS)
+                || (   rc != VERR_VD_ASYNC_IO_IN_PROGRESS
+                    && rc != VERR_VD_IOCTX_HALT))
                 vdIoCtxUnlockDisk(pDisk, pIoCtx, true /* fProcessBlockedReqs */);
-            else
+            else if (rc != VERR_VD_IOCTX_HALT)
                 rc = VINF_SUCCESS;
         }
         else if (rc == VERR_VD_ASYNC_IO_IN_PROGRESS)
             rc = VINF_SUCCESS;
-        else /* Some other error. */
+        else if (rc != VERR_VD_IOCTX_HALT)/* Some other error. */
             vdIoCtxUnlockDisk(pDisk, pIoCtx, true /* fProcessBlockedReqs */);
     }
@@ -4621 +4623 @@
     PVBOXHDD pDisk = pVDIo->pDisk;
 
+    LogFlowFunc(("pvUser=%#p pIoCtx=%#p rcReq=%Rrc cbCompleted=%zu\n",
+                 pvUser, pIoCtx, rcReq, cbCompleted));
+
     /*
      * Grab the disk critical section to avoid races with other threads which
@@ -4630 +4635 @@
      * the request would hang indefinite.
      */
-    pIoCtx->rcReq = rcReq;
+    ASMAtomicCmpXchgS32(&pIoCtx->rcReq, rcReq, VINF_SUCCESS);
     ASMAtomicSubU32(&pIoCtx->Req.Io.cbTransferLeft, cbCompleted);