Changeset 9672 in vbox for trunk/src/VBox/Additions

Timestamp:

Jun 13, 2008 8:01:07 AM (17 years ago)

Author:

vboxsync

Message:

Solaris vboxvfs: more untested code.

Location:

trunk/src/VBox/Additions/solaris/SharedFolders

Files:

• vboxvfs.h (modified) (3 diffs)
• vboxvfs_vfsops.c (modified) (9 diffs)

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

@@ -22 +22 @@
 
 /* Not sure if we need this; it seems only necessary for kernel mounts. */
+#if 0
 typedef struct vboxvfs_mountinfo
 {
@@ -30 +31 @@
     int ttl;
 } vboxvfs_mountinfo_t;
+#endif
 
 #ifdef _KERNEL
@@ -45 +47 @@
     int Gid;
     vfs_t *pVFS;
-    dev_t Dev;
     vnode_t *pVNodeDev;
     vnode_t *pVNodeRoot;

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

@@ -55 +55 @@
 static int VBoxVFS_Root(vfs_t *pVFS, vnode_t **ppVNode);
 static int VBoxVFS_Statfs(register vfs_t *pVFS, struct statvfs64 *pStat);
-static int VBoxVFS_Sync(vfs_t *pVFS, short fFlags, cred_t *pCred);
 static int VBoxVFS_VGet(vfs_t *pVFS, vnode_t **ppVNode, struct fid *pFid);
 static void VBoxVFS_FreeVFS(vfs_t *pVFS);
@@ -203 +202 @@
                     VFSNAME_ROOT,     { .vfs_root =      VBoxVFS_Root    },
                     VFSNAME_STATVFS,  { .vfs_statvfs =   VBoxVFS_Statfs  },
-                    VFSNAME_SYNC,     { .vfs_sync =      VBoxVFS_Sync    },
                     VFSNAME_VGET,     { .vfs_vget =      VBoxVFS_VGet    },
                     VFSNAME_FREEVFS,  { .vfs_freevfs =   VBoxVFS_FreeVFS },
@@ -296 +294 @@
     mutex_exit(&pVNode->v_lock);
 
-    /* I don't think we really need to support kernel mount arguments anymore. */
+    /* From what I understood the options are already parsed at a higher level */
+    if (   (pMount->flags & MS_DATA)
+        && pMount->datalen > 0)
+    {
+        LogRel((DEVICE_NAME ":VBoxVFS_Mount: unparsed options not supported.\n"));
+        return EINVAL;
+    }
+
+    /* Will be removed eventually... */
 #if 0
     /* Retreive arguments. */
@@ -395 +401 @@
         rc = EINVAL;
     }
-
     if (!rc)
     {
@@ -403 +408 @@
 
     /* Allocate the global info. structure. */
-    pVBoxVFSGlobalInfo = RTMemAlloc(sizeof(*pVBoxVFSGlobalInfo));
+    pVBoxVFSGlobalInfo = RTMemAllocZ(sizeof(*pVBoxVFSGlobalInfo));
     if (!pVBoxVFSGlobalInfo)
     {
-        LogRel((DEVICE_NAME ":VBoxVFS_Mount: RTMemAlloc failed to alloc %d bytes for global struct.\n", sizeof(*pVBoxVFSGlobalInfo)));
+        LogRel((DEVICE_NAME ":VBoxVFS_Mount: RTMemAllocZ failed to alloc %d bytes for global struct.\n", sizeof(*pVBoxVFSGlobalInfo)));
         return ENOMEM;
     }
 
-    cbShflShareName = offsetof (SHFLSTRING, String.utf8) + cbShare + 1;
+    cbShflShareName = offsetof(SHFLSTRING, String.utf8) + cbShare + 1;
     pShflShareName  = RTMemAllocZ(cbShflShareName);
     if (!pShflShareName)
     {
         RTMemFree(pVBoxVFSGlobalInfo);
-        LogRel((DEVICE_NAME ":VBoxVFS_Mount: RTMemAlloc failed to alloc %d bytes for ShFlShareName.\n", cbShflShareName));
+        LogRel((DEVICE_NAME ":VBoxVFS_Mount: RTMemAllocZ failed to alloc %d bytes for ShFlShareName.\n", cbShflShareName));
         return ENOMEM;
     }
@@ -436 +441 @@
     pVBoxVFSGlobalInfo->Gid = Gid;
     pVBoxVFSGlobalInfo->pVFS = pVFS;
-    pVBoxVFSGlobalInfo->Dev = Dev;
     pVBoxVFSGlobalInfo->pVNodeDev = pVNodeDev;
     pVFS->vfs_data = pVBoxVFSGlobalInfo;
     pVFS->vfs_fstype = g_VBoxVFSType;
+    pVFS->vfs_dev = Dev;
     vfs_make_fsid(&pVFS->vfs_fsid, Dev, g_VBoxVFSType);
 
@@ -473 +478 @@
         LogRel((DEVICE_NAME ":VBoxVFS_Unmount: failed to unmap shared folder. rc=%d\n", rc));
 
+    VN_RELE(pVBoxVFSGlobalInfo->pVNodeRoot);
+
     RTMemFree(pVBoxVFSGlobalInfo);
     pVFS->vfs_data = NULL;
@@ -481 +488 @@
 static int VBoxVFS_Root(vfs_t *pVFS, vnode_t **ppVNode)
 {
+    vboxvfs_globinfo_t *pVBoxVFSGlobalInfo = VFS2VBOXVFS(pVFS);
+    *ppVNode = pVBoxVFSGlobalInfo->pVNodeRoot;
+    VN_HOLD(*ppVNode);
+
     return 0;
 }
@@ -486 +497 @@
 static int VBoxVFS_Statfs(register vfs_t *pVFS, struct statvfs64 *pStat)
 {
+    SHFLVOLINFO         VolumeInfo;    
+    uint32_t            cbBuffer;
+    vboxvfs_globinfo_t *pVBoxVFSGlobalInfo;
+    dev32_t             Dev32;
+    int                 rc;
+
+    pVBoxVFSGlobalInfo = VFS2VBOXVFS(pVFS);
+    cbBuffer = sizeof(VolumeInfo);
+    rc = vboxCallFSInfo(&g_VBoxVFSClient, &pVBoxVFSGlobalInfo->Map, 0, SHFL_INFO_GET | SHFL_INFO_VOLUME, &cbBuffer,
+                    (PSHFLDIRINFO)&VolumeInfo);
+    if (VBOX_FAILURE(rc))
+        return RTErrConvertToErrno(rc);
+
+    bzero(pStat, sizeof(*pStat));
+    cmpldev(&Dev32, pVFS->vfs_dev);
+    pStat->f_fsid        = Dev32;
+    pStat->f_flag        = vf_to_stf(pVFS->vfs_flag);
+    pStat->f_bsize       = VolumeInfo.ulBytesPerAllocationUnit;
+    pStat->f_frsize      = VolumeInfo.ulBytesPerAllocationUnit;
+    pStat->f_bfree       = VolumeInfo.ullAvailableAllocationBytes / VolumeInfo.ulBytesPerAllocationUnit;
+    pStat->f_bavail      = VolumeInfo.ullAvailableAllocationBytes / VolumeInfo.ulBytesPerAllocationUnit;
+    pStat->f_blocks      = VolumeInfo.ullTotalAllocationBytes / VolumeInfo.ulBytesPerAllocationUnit;
+    pStat->f_files       = 1000;
+    pStat->f_ffree       = 1000; /* don't return 0 here since the guest may think that it is not possible to create any more files */
+    pStat->f_namemax     = 255;   /* @todo is this correct?? */
+
+    strlcpy(pStat->f_basetype, vfssw[pVFS->vfs_fstype].vsw_name, sizeof(pStat->f_basetype));
+    strlcpy(pStat->f_fstr, DEVICE_NAME, sizeof(pStat->f_fstr));
+
     return 0;
 }
 
-static int VBoxVFS_Sync(vfs_t *pVFS, short fFlags, cred_t *pCred)
-{
-    return 0;
-}
-
 static int VBoxVFS_VGet(vfs_t *pVFS, vnode_t **ppVNode, struct fid *pFid)
 {
+    /* -- TODO -- */
     return 0;
 }