Changeset 78380 in vbox for trunk/src/VBox

Timestamp:

May 4, 2019 1:56:48 PM (6 years ago)

Author:

vboxsync

Message:

winnt/vboxsf: Update FCB size info when opening a file too. bugref:9172

File:

• trunk/src/VBox/Additions/WINNT/SharedFolders/driver/path.cpp (modified) (6 diffs)

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

@@ -458 +458 @@
 }
 
+/**
+ * Create/open a file, directory, ++.
+ *
+ * The RDBSS library will do a table lookup on the path passed in by the user
+ * and therefore share FCBs for objects with the same path.
+ *
+ * The FCB needs to be locked exclusively upon successful return, however it
+ * seems like it's not always locked when we get here (only older RDBSS library
+ * versions?), so we have to check this before returning.
+ *
+ */
 NTSTATUS VBoxMRxCreate(IN OUT PRX_CONTEXT RxContext)
 {
@@ -541 +552 @@
     RxContext->Create.ReturnedCreateInformation = CreateAction;
 
+    /*
+     * Make sure we've got the FCB locked exclusivly before updating it and returning.
+     * (bird: not entirely sure if this is needed for the W10 RDBSS, but cannot hurt.)
+     */
+    if (!RxIsFcbAcquiredExclusive(capFcb))
+        RxAcquireExclusiveFcbResourceInMRx(capFcb);
+
+
     /* Initialize the FCB if this is the first open.
        Note! The RxFinishFcbInitialization call expects node types as the 2nd parameter, but is for
@@ -553 +572 @@
         Data.LastWriteTime.QuadPart  = RTTimeSpecGetNtTime(&Info.ModificationTime);
         Data.ChangeTime.QuadPart     = RTTimeSpecGetNtTime(&Info.ChangeTime);
-        Data.AllocationSize.QuadPart = Info.cbAllocated;
+        Data.AllocationSize.QuadPart = Info.cbAllocated; /** @todo test sparse files.  CcSetFileSizes is documented to not want allocation size smaller than EOF offset. */
         Data.EndOfFile.QuadPart      = Info.cbObject;
         Data.FileAttributes          = VBoxToNTFileAttributes(Info.Attr.fMode);
@@ -571 +590 @@
             RxFinishFcbInitialization(capFcb, (RX_FILE_TYPE)RDBSS_NTC_STORAGE_TYPE_FILE, &InitPacket);
     }
-    /*
-     * See if the size has changed and update the FCB if it has.
-     */
-    else
-    {
-        /** @todo Need to check RDBSS stack for locking semantics before updating
-         *        anything. */
-    }
 
     SrvOpen->BufferingFlags = 0;
@@ -600 +611 @@
     pVBoxFobx->pSrvCall = RxContext->Create.pSrvCall;
     pVBoxFobx->Info = Info;
+
+    /*
+     * See if the size has changed and update the FCB if it has.
+     */
+    if (   capFcb->OpenCount > 0
+        && capFcb->Header.FileSize.QuadPart != Info.cbObject)
+    {
+        PFILE_OBJECT pFileObj = RxContext->CurrentIrpSp->FileObject;
+        Assert(pFileObj);
+        if (pFileObj)
+            vbsfNtUpdateFcbSize(pFileObj, capFcb, pVBoxFobx, Info.cbObject, capFcb->Header.FileSize.QuadPart, Info.cbAllocated);
+    }
+
+    /*
+     * Do logging.
+     */
     Log(("VBOXSF: MRxCreate: Info: BirthTime        %RI64\n", RTTimeSpecGetNano(&pVBoxFobx->Info.BirthTime)));
     Log(("VBOXSF: MRxCreate: Info: ChangeTime       %RI64\n", RTTimeSpecGetNano(&pVBoxFobx->Info.ChangeTime)));
@@ -609 +636 @@
         Log(("VBOXSF: MRxCreate: Info: cbObject         %#RX64\n", pVBoxFobx->Info.cbObject));
         Log(("VBOXSF: MRxCreate: Info: cbAllocated      %#RX64\n", pVBoxFobx->Info.cbAllocated));
-    }
-
-    if (!RxIsFcbAcquiredExclusive(capFcb))
-    {
-        RxAcquireExclusiveFcbResourceInMRx(capFcb);
     }