Changeset 77854 in vbox for trunk/src/VBox/Additions/common/VBoxGuest

Timestamp:

Mar 22, 2019 10:23:36 PM (6 years ago)

Author:

vboxsync

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

129538

Message:

linux/vboxsf: Cleaned up init(), moving the file system registration to the end of everything to avoid races. Also coverted the UTF-8 and symlinks setting to fast HGCM requests. bugref:9172

File:

• trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibSharedFolders.c (modified) (7 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibSharedFolders.c

@@ -51 +51 @@
 *   Defined Constants And Macros                                                                                                 *
 *********************************************************************************************************************************/
-#define SHFL_CPARMS_SET_UTF8 0
-#define SHFL_CPARMS_SET_SYMLINKS 0
-
 #define VBOX_INIT_CALL(a, b, c) \
     LogFunc(("%s, idClient=%d\n", "SHFL_FN_" # b, (c)->idClient)); \
@@ -101 +98 @@
 }
 
+#if !defined(RT_OS_LINUX)
+
 DECLVBGL(int) VbglR0SfSetUtf8(PVBGLSFCLIENT pClient)
 {
@@ -111 +110 @@
     return rc;
 }
-
-#if !defined(RT_OS_LINUX)
 
 /** @name       Deprecated VBGL shared folder helpers.
@@ -393 +390 @@
 }
 
-#endif /* !RT_OS_LINUX */
-
 DECLVBGL(int) VbglR0SfWrite(PVBGLSFCLIENT pClient, PVBGLSFMAP pMap, SHFLHANDLE hFile,
                             uint64_t offset, uint32_t *pcbBuffer, uint8_t *pBuffer, bool fLocked)
@@ -425 +420 @@
     return rc;
 }
-
-#ifndef RT_OS_LINUX
 
 DECLVBGL(int) VbglR0SfWritePhysCont(PVBGLSFCLIENT pClient, PVBGLSFMAP pMap, SHFLHANDLE hFile, uint64_t offset,
@@ -697 +690 @@
 }
 
+#if !defined(RT_OS_LINUX)
+
 DECLVBGL(int) VbglR0SfSetSymlinks(PVBGLSFCLIENT pClient)
 {
@@ -708 +703 @@
 }
 
+#endif /* !RT_OS_LINUX */
 
 /** @} */