Changeset 10307 in vbox for trunk/src/VBox/Additions/solaris

Timestamp:

Jul 7, 2008 11:18:16 AM (17 years ago)

Author:

vboxsync

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

32928

Message:

Solaris vboxvfs: added mount wrapper.

Location:

trunk/src/VBox/Additions/solaris/SharedFolders

Files:

• Makefile.kmk (modified) (1 diff)
• vboxvfs_mount.c (added)
• vboxvfs_vfsops.c (modified) (6 diffs)

trunk/src/VBox/Additions/solaris/SharedFolders/Makefile.kmk

@@ -42 +42 @@
 #vboxvfs_LDFLAGS      += -N drv/vboxguest
 
+#
+# mount - Userland mount wrapper for vboxvfs
+#
+PROGRAMS                += vboxvfsmount
+vboxvfsmount_TEMPLATE    = VBOXGUESTR3EXE
+vboxvfsmount_SOURCES     = vboxvfs_mount.c
+
 include $(KBUILD_PATH)/subfooter.kmk
 

trunk/src/VBox/Additions/solaris/SharedFolders/vboxvfs_vfsops.c

@@ -33 +33 @@
 #include <iprt/mem.h>
 #include <iprt/err.h>
-
+#if defined(DEBUG_ramshankar)
+# undef LogFlow
+# define LogFlow        LogRel
+# undef Log
+# define Log            LogRel
+#endif
 
 /*******************************************************************************
@@ -67 +72 @@
 {
     /* Option Name           Cancel Opt.     Default Arg       Flags           Data */
-    { MNTOPT_VBOXVFS_UID,    NULL,           NULL,             MO_HASVALUE,    NULL },
-    { MNTOPT_VBOXVFS_GID,    NULL,           NULL,             MO_HASVALUE,    NULL }
+    { MNTOPT_VBOXVFS_UID,    NULL,           "0",             MO_DEFAULT | MO_HASVALUE,    NULL },
+    { MNTOPT_VBOXVFS_GID,    NULL,           "0",             MO_DEFAULT | MO_HASVALUE,    NULL }
 };
 
@@ -384 +389 @@
         else
         {
-            LogRel((DEVICE_NAME ":VBoxVFS_Mount: RTMemAllocZ failed to alloc %d bytes for ShFlShareName.\n", cbShflShareName));            
+            LogRel((DEVICE_NAME ":VBoxVFS_Mount: RTMemAllocZ failed to alloc %d bytes for ShFlShareName.\n", cbShflShareName));
             rc = ENOMEM;
         }
@@ -398 +403 @@
     if (rc)
         goto mntError1;
-    
+
     /* Initialize the per-filesystem mutex */
     mutex_init(&pVBoxVFSGlobalInfo->MtxFS, "VBoxVFS_FSMtx", MUTEX_DEFAULT, NULL);
@@ -458 +463 @@
 
     /* Undo work in reverse. */
-mntError1:           
+mntError1:
     /* Just release the mount location. */
     VOP_CLOSE(pVNodeDev, (pVFS->vfs_flag & VFS_RDONLY) ? FREAD : FREAD | FWRITE, 1, (offset_t)0, pCred, NULL);
-    VN_RELE(pVNodeDev);        
+    VN_RELE(pVNodeDev);
     return rc;
 }
@@ -480 +485 @@
     }
 
-    /* @todo -XXX - Not sure of supporting force unmounts. What this means is that a failed force mount could bring down 
+    /* @todo -XXX - Not sure of supporting force unmounts. What this means is that a failed force mount could bring down
      * the entire system as hanging about vnode releases would no longer be valid after unloading ourselves...
      */