Index: /trunk/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp
===================================================================
--- /trunk/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp	(revision 75450)
+++ /trunk/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp	(revision 75451)
@@ -996,5 +996,5 @@
         struct mnttab Entry;
         while (getmntent(pFile, &Entry) == 0)
-            if (strcmp(Entry.mnt_fstype, "vboxsf") == 0)
+            if (strcmp(Entry.mnt_fstype, "vboxfs") == 0)
             {
                 /* Look for the dummy automounter option. */
@@ -1156,5 +1156,5 @@
                     {
                         VGSvcVerbose(3, "vbsvcAutomounterQueryMountPoint: Found shared folder '%s' at '%s'.\n",
-                                     pszMountPoint, pszName);
+                                     pszName, pszMountPoint);
                         rc = VINF_SUCCESS;
                     }
@@ -1220,5 +1220,5 @@
             {
                 VGSvcVerbose(3, "vbsvcAutomounterQueryMountPoint: Found shared folder '%s' at '%s'.\n",
-                             pszMountPoint, pszName);
+                             pszName, pszMountPoint);
                 rc = VINF_SUCCESS;
             }
@@ -1267,5 +1267,5 @@
                     {
                         VGSvcVerbose(3, "vbsvcAutomounterQueryMountPoint: Found shared folder '%s' at '%s'.\n",
-                                     pszMountPoint, pszName);
+                                     pszName, pszMountPoint);
                         rc = VINF_SUCCESS;
                     }
@@ -1313,5 +1313,5 @@
                     {
                         VGSvcVerbose(3, "vbsvcAutomounterQueryMountPoint: Found shared folder '%s' at '%s'.\n",
-                                     pszMountPoint, pszName);
+                                     pszName, pszMountPoint);
                         rc = VINF_SUCCESS;
                     }
@@ -1511,4 +1511,7 @@
      * The ',VBoxService=auto' option (g_szTag) is ignored by the kernel but helps
      * us identify our own mounts on restart.  See vbsvcAutomounterPopulateTable().
+     *
+     * Note! Must pass MAX_MNTOPT_STR rather than cchOpts to mount, as it may fail
+     *       with EOVERFLOW in vfs_buildoptionstr() during domount() otherwise.
      */
     char szOpts[MAX_MNTOPT_STR] = { '\0', };
@@ -1522,5 +1525,5 @@
 
     rc = mount(pEntry->pszName, pEntry->pszActualMountPoint, MS_OPTIONSTR, "vboxfs",
-               NULL /*dataptr*/, 0 /* datalen */, szOpts, cchOpts + 1);
+               NULL /*dataptr*/, 0 /* datalen */, szOpts, MAX_MNTOPT_STR);
     if (rc == 0)
     {