Changeset 10347 in vbox for trunk/src/VBox/Additions/solaris/SharedFolders

Timestamp:

Jul 8, 2008 6:23:10 AM (17 years ago)

Author:

vboxsync

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

32975

Message:

Solaris vboxvfs bits.

Location:

trunk/src/VBox/Additions/solaris/SharedFolders

Files:

• vboxvfs.h (modified) (1 diff)
• vboxvfs_vfsops.c (modified) (8 diffs)

trunk/src/VBox/Additions/solaris/SharedFolders/vboxvfs.h

@@ -62 +62 @@
     int             Gid;
     vfs_t           *pVFS;
-    vnode_t         *pVNodeDev;
     vboxvfs_vnode_t *pVNodeRoot;
     kmutex_t        MtxFS;

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

@@ -21 +21 @@
 #include <sys/mount.h>
 #include <sys/policy.h>
+#include <sys/atomic.h>
+#include <sys/sysmacros.h>
 #include <sys/ddi.h>
 #include <sys/sunddi.h>
@@ -121 +123 @@
 *   Global Variables                                                           *
 *******************************************************************************/
-/** Opaque pointer to list of states. */
-static void *g_pVBoxVFSState;
 /** GCC C++ hack. */
 unsigned __gxx_personality_v0 = 0xdecea5ed;
@@ -131 +131 @@
 /** The file system type identifier. */
 static int g_VBoxVFSType;
+/** Major number of this module */
+static major_t g_VBoxVFSMajor;
+/** Minor instance number */
+static minor_t g_VBoxVFSMinor;
+/** Minor lock mutex protection */
+static kmutex_t g_VBoxVFSMinorMtx;
 
 
@@ -205 +211 @@
                     if (!rc)
                     {
-                        LogFlow((DEVICE_NAME ":Successfully loaded vboxvfs.\n"));
-                        return 0;
+                        /* Get a free major number. */
+                        g_VBoxVFSMajor = getudev();
+                        if (g_VBoxVFSMajor != (major_t)-1)
+                        {
+                            /* Initialize minor mutex here. */
+                            mutex_init(&g_VBoxVFSMinorMtx, "VBoxVFSMinorMtx", MUTEX_DEFAULT, NULL);
+                            LogFlow((DEVICE_NAME ":Successfully loaded vboxvfs.\n"));
+                            return 0;
+                        }
+                        else
+                        {
+                            LogRel((DEVICE_NAME ":getudev failed.\n"));
+                            rc = EMFILE;
+                        }
                     }
                     else
@@ -273 +291 @@
 
     mutex_enter(&pVNode->v_lock);
-    if (   !(pMount->flags & MS_REMOUNT)
-        && !(pMount->flags & MS_OVERLAY)
-        && (pVNode->v_count > 1 || (pVNode->v_flag & VROOT)))
+    if (   !(pMount->flags & MS_OVERLAY)
+        &&  (pVNode->v_count > 1 || (pVNode->v_flag & VROOT)))
     {
         LogRel((DEVICE_NAME ":VBoxVFS_Mount: device busy.\n"));
@@ -311 +328 @@
     if (!rc)
     {
-        /* Get the vnode for the special file for storing the device identifier and path. */
-        rc = lookupname(PathName.pn_path, AddrSpace, FOLLOW, NULLVPP, &pVNodeSpec);
-        if (!rc)
-        {
-            /* Check if user has permission to use the special file for mounting. */
-            rc = vboxvfs_CheckMountPerm(pVFS, pMount, pVNodeSpec, pCred);
-            VN_RELE(pVNodeSpec);
-            if (!rc)
-            {
-                Dev = pVNodeSpec->v_rdev;
-                memcpy(pszShare, PathName.pn_path, strlen(PathName.pn_path));
-                cbShare = strlen(pszShare);
-            }
-            else
-                LogRel((DEVICE_NAME ":VBoxVFS_Mount: invalid permissions to mount %s.rc=%d\n", pszShare, rc));
-            rc = EPERM;
-        }
+        /* Get an available minor instance number for this mount. */
+        mutex_enter(&g_VBoxVFSMinorMtx);
+        do
+        {
+            atomic_add_32_nv(&g_VBoxVFSMinor, 1) & L_MAXMIN32;
+            Dev = makedevice(g_VBoxVFSMajor, g_VBoxVFSMinor);
+        } while (vfs_devismounted(Dev));
+        mutex_exit(&g_VBoxVFSMinorMtx);
+
+        cbShare = strlen(PathName.pn_path);
+        pszShare = RTMemAlloc(cbShare);
+        if (pszShare)
+            memcpy(pszShare, PathName.pn_path, cbShare);
         else
-            LogRel((DEVICE_NAME ":VBoxVFS_Mount: failed to lookup sharename.rc=%d\n", rc));
+        {
+            LogRel((DEVICE_NAME ":VBoxVFS_Mount: failed to alloc %d bytes for sharename.\n", cbShare));
+            rc = ENOMEM;
+        }
+    }
+    else
+    {
+        LogRel((DEVICE_NAME ":VBoxVFS_Mount: failed to get sharename.rc=%d\n", rc));
         rc = EINVAL;
     }
-    else
-    {
-        LogRel((DEVICE_NAME ":VBoxVFS_Mount: failed to get special file path.rc=%d\n", rc));
-        rc = EINVAL;
-    }
     pn_free(&PathName);
 
     if (rc)
-        return rc;
-
-    /* Get VNode of the special file being mounted. */
-    pVNodeDev = makespecvp(Dev, VBLK);
-    if (!IS_SWAPVP(pVNodeDev))
-    {
-        /* Open the vnode for mounting. */
-        rc = VOP_OPEN(&pVNodeDev, (pVFS->vfs_flag & VFS_RDONLY) ? FREAD : FREAD | FWRITE, pCred, NULL);
-        if (rc)
-        {
-            LogRel((DEVICE_NAME ":VBoxVFS_Mount: failed to mount.\n"));
-            rc = EINVAL;
-        }
-    }
-    else
-    {
-        LogRel((DEVICE_NAME ":VBoxVFS_Mount: cannot mount from swap.\n"));
-        rc = EINVAL;
-    }
-    if (!rc)
-    {
-        VN_RELE(pVNodeDev);
+    {
+        if (pszShare)
+            RTMemFree(pszShare);
         return rc;
     }
@@ -410 +406 @@
     pVBoxVFSGlobalInfo->Gid = Gid;
     pVBoxVFSGlobalInfo->pVFS = pVFS;
-    pVBoxVFSGlobalInfo->pVNodeDev = pVNodeDev;
     pVFS->vfs_data = pVBoxVFSGlobalInfo;
     pVFS->vfs_fstype = g_VBoxVFSType;
@@ -464 +459 @@
     /* Undo work in reverse. */
 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);
+    RTMemFree(pszShare);
     return rc;
 }