Changeset 78548 in vbox

Timestamp:

May 16, 2019 1:53:39 PM (6 years ago)

Author:

vboxsync

Message:

winnt/vboxsf: Fixed none-working open+truncate testcase caused by an old misconception in the FileAllocationInformation wrt when the incoming sizes would be updated (before call, as it turns out). bugref:9172

Location:

trunk/src/VBox/Additions/WINNT/SharedFolders/driver

Files:

• file.cpp (modified) (1 diff)
• info.cpp (modified) (5 diffs)
• path.cpp (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/SharedFolders/driver/file.cpp

@@ -438 +438 @@
         if (pVBoxFcbx->pFobxLastWriteTime != pVBoxFobx)
             pVBoxFcbx->pFobxLastWriteTime = NULL;
+
+        /* Make sure our cached file size value is up to date: */
+        if (ctx.cbData > 0)
+        {
+            RTFOFF offEndOfWrite = LowIoContext->ParamsFor.ReadWrite.ByteOffset + ctx.cbData;
+            if (pVBoxFobx->Info.cbObject < offEndOfWrite)
+                pVBoxFobx->Info.cbObject = offEndOfWrite;
+
+            if (pVBoxFobx->Info.cbAllocated < offEndOfWrite)
+            {
+                pVBoxFobx->Info.cbAllocated = offEndOfWrite;
+                pVBoxFobx->nsUpToDate       = 0;
+            }
+        }
     }
     else

trunk/src/VBox/Additions/WINNT/SharedFolders/driver/info.cpp

@@ -1209 +1209 @@
                 FileSizes.ValidDataLength.QuadPart = cbFileNew;
 
+
                 /* RDBSS leave the lock before calling CcSetFileSizes, so we do that too then.*/
                 if (NT_SUCCESS(rcNtLock))
@@ -1225 +1226 @@
                     Log(("vbsfNtUpdateFcbSize: CcSetFileSizes -> %#x\n", rcNt));
 #endif
-                }
+                    return;
+                }
+                Log2(("vbsfNtUpdateFcbSize: Updated Size+VDL from %#RX64 to %#RX64; Alloc %#RX64\n",
+                      cbFileOld, cbFileNew, FileSizes.AllocationSize));
                 return;
             }
             /** @todo should we flag this so we can try again later? */
         }
+
+        Log2(("vbsfNtUpdateFcbSize: Updated sizes: cb=%#RX64 VDL=%#RX64 Alloc=%#RX64 (old cb=#RX64)\n",
+              pFcb->Header.FileSize.QuadPart, pFcb->Header.ValidDataLength.QuadPart, pFcb->Header.AllocationSize.QuadPart, cbFileOld));
     }
     else
@@ -1237 +1244 @@
     if (NT_SUCCESS(rcNtLock))
     {
-        RxReleasePagingIoResource(NULL, pFcb);
+        RxReleasePagingIoResource(NULL, pFcb); /* requires {} */
     }
 }
@@ -2159 +2166 @@
          *
          * https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-fscc/d4bc551b-7aaf-4b4f-ba0e-3a75e7c528f0#Appendix_A_83
+         *
+         * Note! The AllocationSize and FileSize could be set by RxSetAllocationInfo
+         *       before it calls us, so we must use our own copy of the file size here
+         *       when we try avoid calling the host!  (open+truncate test failure)
          */
         case FileAllocationInformation:
@@ -2166 +2177 @@
                  pInfo->AllocationSize.QuadPart, capFcb->Header.FileSize.QuadPart));
 
-            if (pInfo->AllocationSize.QuadPart >= capFcb->Header.FileSize.QuadPart)
+            if (pInfo->AllocationSize.QuadPart >= pVBoxFobx->Info.cbObject)
                 Status = STATUS_SUCCESS;
             else

trunk/src/VBox/Additions/WINNT/SharedFolders/driver/path.cpp

@@ -561 +561 @@
     if (capFcb->OpenCount == 0)
     {
+        Log(("VBOXSF: MRxCreate: Initializing the FCB.\n"));
         FCB_INIT_PACKET               InitPacket;
         FILE_NETWORK_OPEN_INFORMATION Data;