Changeset 10067 in vbox for trunk/src/VBox

Timestamp:

Jul 1, 2008 11:07:51 AM (17 years ago)

Author:

vboxsync

Message:

Solaris vboxvfs: root vnode.

Location:

trunk/src/VBox/Additions/solaris/SharedFolders

Files:

• Makefile.kmk (modified) (1 diff)
• vboxvfs.h (modified) (2 diffs)
• vboxvfs_utils.c (added)
• vboxvfs_vfsops.c (modified) (10 diffs)
• vboxvfs_vnops.c (modified) (1 diff)

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

@@ -30 +30 @@
 vboxvfs_SOURCES       = \
         vboxvfs_vfsops.c \
-        vboxvfs_vnops.c
+        vboxvfs_vnops.c \
+        vboxvfs_utils.c
 vboxvfs_LIBS          = \
         $(VBOX_LIB_VBGL_R0) \

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

@@ -21 +21 @@
 #define MAX_NLS_NAME    32
 
+/** The module name. */
+#define DEVICE_NAME              "vboxvfs"
+/** The module description as seen in 'modinfo'. */
+#define DEVICE_DESC              "filesystem for VirtualBox Shared Folders"
+
 /* Not sure if we need this; it seems only necessary for kernel mounts. */
 #if 0
@@ -39 +44 @@
 #include <sys/vfs_opreg.h>
 
+/** VNode for VBoxVFS */
+typedef struct vboxvfs_vnode
+{
+    vnode_t     *pVNode;
+    vattr_t     Attr;
+    SHFLSTRING  *pPath;
+    kmutex_t    MtxContents;
+} vboxvfs_vnode_t;
+
+
 /** Per-file system mount instance data. */
 typedef struct vboxvfs_globinfo
 {
-    VBSFMAP Map;
-    int Ttl;
-    int Uid;
-    int Gid;
-    vfs_t *pVFS;
-    vnode_t *pVNodeDev;
-    vnode_t *pVNodeRoot;
+    VBSFMAP         Map;
+    int             Ttl;
+    int             Uid;
+    int             Gid;
+    vfs_t           *pVFS;
+    vnode_t         *pVNodeDev;
+    vboxvfs_vnode_t *pVNodeRoot;
 } vboxvfs_globinfo_t;
 
 extern struct vnodeops *g_pVBoxVFS_vnodeops;
 extern const fs_operation_def_t g_VBoxVFS_vnodeops_template[];
+extern VBSFCLIENT g_VBoxVFSClient;
+
+/** Helper functions */
+extern int vboxvfs_Stat(const char *pszCaller, vboxvfs_globinfo_t *pVBoxVFSGlobalInfo, SHFLSTRING *pPath,
+            RTFSOBJINFO *pResult, boolean_t fAllowFailure);
+extern void vboxvfs_InitVNode(vboxvfs_globinfo_t *pVBoxVFSGlobalInfo, vboxvfs_vnode_t *pVBoxVNode,
+            RTFSOBJINFO *pFSInfo);
+
+
+/** Helper macros */
+#define VFS_TO_VBOXVFS(vfs)      ((vboxvfs_globinfo_t *)((vfs)->vfs_data))
+#define VBOXVFS_TO_VFS(vboxvfs)  ((vboxvfs)->pVFS)
+#define VN_TO_VBOXVN(vnode)      ((vboxvfs_vnode_t *)((vnode)->v_data))
+#define VBOXVN_TO_VN(vboxvnode)  ((vboxvnode)->pVNode)
 
 #endif /* _KERNEL */

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VirtualBox File System Driver for Solaris Guests.
+ * VirtualBox File System Driver for Solaris Guests. VFS operations.
  */
 
@@ -38 +38 @@
 *   Defined Constants And Macros                                               *
 *******************************************************************************/
-/** The module name. */
-#define DEVICE_NAME              "vboxvfs"
-/** The module description as seen in 'modinfo'. */
-#define DEVICE_DESC              "filesystem for VirtualBox Shared Folders"
-
 /** Mount Options */
 #define MNTOPT_VBOXVFS_UID       "uid"
 #define MNTOPT_VBOXVFS_GID       "gid"
-
-/** Helpers */
-#define VFS2VBOXVFS(vfs)         ((vboxvfs_globinfo_t *)((vfs)->vfs_data))
-#define VBOXVFS2VFS(vboxvfs)     ((vboxvfs)->pVFS)
 
 
@@ -141 +132 @@
 unsigned __gxx_personality_v0 = 0xdecea5ed;
 /** Global connection to the client. */
-static VBSFCLIENT g_VBoxVFSClient;
+VBSFCLIENT g_VBoxVFSClient;
 /** Global VFS Operations pointer. */
 vfsops_t *g_pVBoxVFS_vfsops;
@@ -262 +253 @@
     size_t cbShare = NULL;
     pathname_t PathName;
+    vboxvfs_vnode_t *pVNodeRoot = NULL;
     vnode_t *pVNodeSpec = NULL;
     vnode_t *pVNodeDev = NULL;
     dev_t Dev = 0;
     SHFLSTRING *pShflShareName = NULL;
+    RTFSOBJINFO FSInfo;
     size_t cbShflShareName = 0;
     vboxvfs_globinfo_t *pVBoxVFSGlobalInfo = NULL;
@@ -418 +411 @@
 
     /* Allocate the global info. structure. */
-    pVBoxVFSGlobalInfo = RTMemAllocZ(sizeof(*pVBoxVFSGlobalInfo));
+    pVBoxVFSGlobalInfo = RTMemAlloc(sizeof(*pVBoxVFSGlobalInfo));
     if (!pVBoxVFSGlobalInfo)
     {
-        LogRel((DEVICE_NAME ":VBoxVFS_Mount: RTMemAllocZ failed to alloc %d bytes for global struct.\n", sizeof(*pVBoxVFSGlobalInfo)));
+        LogRel((DEVICE_NAME ":VBoxVFS_Mount: RTMemAlloc failed to alloc %d bytes for global struct.\n", sizeof(*pVBoxVFSGlobalInfo)));
         return ENOMEM;
     }
@@ -457 +450 @@
     vfs_make_fsid(&pVFS->vfs_fsid, Dev, g_VBoxVFSType);
 
-    /* @todo root vnode */
+    /* Allocate root vboxvfs_vnode_t object */
+    pVNodeRoot = RTMemAlloc(sizeof(*pVNodeRoot));
+    if (!pVNodeRoot)
+    {
+        LogRel((DEVICE_NAME ":VBoxVFS_Mount: RTMemAlloc failed to alloc %d bytes for root node.\n", sizeof(*pVNodeRoot)));
+        return ENOMEM;
+    }
+
+    /* Initialize the mutex */
+    mutex_init(&pVNodeRoot->MtxContents, "VNodeMtx", MUTEX_DEFAULT, NULL);
+
+    /* Allocate root path */
+    pVNodeRoot->pPath = RTMemAllocZ(sizeof(SHFLSTRING) + 1);
+    if (!pVNodeRoot->pPath)
+    {
+        LogRel((DEVICE_NAME ":VBoxVFS_Mount: RTMemAllocZ failed to alloc %d bytes for root path.\n", sizeof(SHFLSTRING) + 1));
+        return ENOMEM;
+    }
+
+    /* Initialize root path */
+    pVNodeRoot->pPath->u16Length = 1;
+    pVNodeRoot->pPath->u16Size = 2;
+    pVNodeRoot->pPath->String.utf8[0] = '/';
+    pVNodeRoot->pPath->String.utf8[1] = '\0';
+
+    /* Stat root node info from host */
+    rc = vboxvfs_Stat(__func__, pVBoxVFSGlobalInfo, pVNodeRoot->pPath, &FSInfo, B_FALSE);
+    if (rc)
+    {
+        LogRel((DEVICE_NAME ":VBoxVFS_Mount: vboxvfs_Stat failed rc(errno)=%d\n", rc));
+        return rc;
+    }
+
+    /* Initialize the root vboxvfs_node_t object */
+    vboxvfs_InitVNode(pVBoxVFSGlobalInfo, pVNodeRoot, &FSInfo);
 
     return 0;
@@ -482 +509 @@
     /* @todo implement ref-counting of active vnodes & check for busy state here. */
     /* @todo mutex protection needed here */
-    pVBoxVFSGlobalInfo = VFS2VBOXVFS(pVFS);
+    pVBoxVFSGlobalInfo = VFS_TO_VBOXVFS(pVFS);
 
     rc = vboxCallUnmapFolder(&g_VBoxVFSClient, &pVBoxVFSGlobalInfo->Map);
@@ -488 +515 @@
         LogRel((DEVICE_NAME ":VBoxVFS_Unmount: failed to unmap shared folder. rc=%d\n", rc));
 
-    VN_RELE(pVBoxVFSGlobalInfo->pVNodeRoot);
+    VN_RELE(VBOXVN_TO_VN(pVBoxVFSGlobalInfo->pVNodeRoot));
 
     RTMemFree(pVBoxVFSGlobalInfo);
@@ -498 +525 @@
 static int VBoxVFS_Root(vfs_t *pVFS, vnode_t **ppVNode)
 {
-    vboxvfs_globinfo_t *pVBoxVFSGlobalInfo = VFS2VBOXVFS(pVFS);
-    *ppVNode = pVBoxVFSGlobalInfo->pVNodeRoot;
+    vboxvfs_globinfo_t *pVBoxVFSGlobalInfo = VFS_TO_VBOXVFS(pVFS);
+    *ppVNode = VBOXVN_TO_VN(pVBoxVFSGlobalInfo->pVNodeRoot);
     VN_HOLD(*ppVNode);
 
@@ -513 +540 @@
     int                 rc;
 
-    pVBoxVFSGlobalInfo = VFS2VBOXVFS(pVFS);
+    pVBoxVFSGlobalInfo = VFS_TO_VBOXVFS(pVFS);
     cbBuffer = sizeof(VolumeInfo);
     rc = vboxCallFSInfo(&g_VBoxVFSClient, &pVBoxVFSGlobalInfo->Map, 0, SHFL_INFO_GET | SHFL_INFO_VOLUME, &cbBuffer,

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VirtualBox File System Driver for Solaris Guests.
+ * VirtualBox File System Driver for Solaris Guests, VNode Operations.
  */