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

Timestamp:

Nov 11, 2011 5:05:17 PM (14 years ago)

Author:

vboxsync

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

74828

Message:

Additions/solaris/SharedFolders: Consolidate volinfo calls into one fsinfo.

Location:

trunk/src/VBox/Additions/solaris/SharedFolders

Files:

• vboxfs_prov.c (modified) (2 diffs)
• vboxfs_prov.h (modified) (1 diff)
• vboxfs_vfs.c (modified) (2 diffs)

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

@@ -173 +173 @@
  */
 int
-sfprov_get_blksize(sfp_mount_t *mnt, uint64_t *blksize)
+sfprov_get_fsinfo(sfp_mount_t *mnt, sffs_fsinfo_t *fsinfo)
 {
         int rc;
@@ -183 +183 @@
         if (RT_FAILURE(rc))
                 return (EINVAL);
-        *blksize = info.ulBytesPerAllocationUnit;
-        return (0);
-}
-
-int
-sfprov_get_blksused(sfp_mount_t *mnt, uint64_t *blksused)
-{
-        int rc;
-        SHFLVOLINFO info;
-        uint32_t bytes = sizeof(SHFLVOLINFO);
-
-        rc = vboxCallFSInfo(&vbox_client, &mnt->map, 0,
-            (SHFL_INFO_GET | SHFL_INFO_VOLUME), &bytes, (SHFLDIRINFO *)&info);
-        if (RT_FAILURE(rc))
-                return (EINVAL);
-        *blksused = (info.ullTotalAllocationBytes -
-            info.ullAvailableAllocationBytes) / info.ulBytesPerAllocationUnit;
-        return (0);
-}
-
-int
-sfprov_get_blksavail(sfp_mount_t *mnt, uint64_t *blksavail)
-{
-        int rc;
-        SHFLVOLINFO info;
-        uint32_t bytes = sizeof(SHFLVOLINFO);
-
-        rc = vboxCallFSInfo(&vbox_client, &mnt->map, 0,
-            (SHFL_INFO_GET | SHFL_INFO_VOLUME), &bytes, (SHFLDIRINFO *)&info);
-        if (RT_FAILURE(rc))
-                return (EINVAL);
-        *blksavail =
-            info.ullAvailableAllocationBytes / info.ulBytesPerAllocationUnit;
-        return (0);
-}
-
-int
-sfprov_get_maxnamesize(sfp_mount_t *mnt, uint32_t *maxnamesize)
-{
-        int rc;
-        SHFLVOLINFO info;
-        uint32_t bytes = sizeof(SHFLVOLINFO);
-
-        rc = vboxCallFSInfo(&vbox_client, &mnt->map, 0,
-            (SHFL_INFO_GET | SHFL_INFO_VOLUME), &bytes, (SHFLDIRINFO *)&info);
-        if (RT_FAILURE(rc))
-                return (EINVAL);
-        *maxnamesize = info.fsProperties.cbMaxComponent;
-        return (0);
-}
-
-int
-sfprov_get_readonly(sfp_mount_t *mnt, uint32_t *readonly)
-{
-        int rc;
-        SHFLVOLINFO info;
-        uint32_t bytes = sizeof(SHFLVOLINFO);
-
-        rc = vboxCallFSInfo(&vbox_client, &mnt->map, 0,
-            (SHFL_INFO_GET | SHFL_INFO_VOLUME), &bytes, (SHFLDIRINFO *)&info);
-        if (RT_FAILURE(rc))
-                return (EINVAL);
-        *readonly = info.fsProperties.fReadOnly;
+
+        fsinfo->blksize = info.ulBytesPerAllocationUnit;
+        fsinfo->blksused = (info.ullTotalAllocationBytes - info.ullAvailableAllocationBytes) / info.ulBytesPerAllocationUnit;
+        fsinfo->blksavail = info.ullAvailableAllocationBytes / info.ulBytesPerAllocationUnit;
+        fsinfo->maxnamesize = info.fsProperties.cbMaxComponent;
+        fsinfo->readonly = info.fsProperties.fReadOnly;
         return (0);
 }

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

@@ -72 +72 @@
  * query information about a mounted file system
  */
-extern int sfprov_get_blksize(sfp_mount_t *, uint64_t *);
-extern int sfprov_get_blksused(sfp_mount_t *, uint64_t *);
-extern int sfprov_get_blksavail(sfp_mount_t *, uint64_t *);
-extern int sfprov_get_maxnamesize(sfp_mount_t *, uint32_t *);
-extern int sfprov_get_readonly(sfp_mount_t *, uint32_t *);
+typedef struct sffs_fsinfo {
+        uint64_t blksize;
+        uint64_t blksused;
+        uint64_t blksavail;
+        uint32_t maxnamesize;
+        uint32_t readonly;
+} sffs_fsinfo_t;
+
+extern int sfprov_get_fsinfo(sfp_mount_t *, sffs_fsinfo_t *);
 
 /*

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

@@ -526 +526 @@
 {
         sffs_data_t *sffs = (sffs_data_t *)vfsp->vfs_data;
-        uint64_t x;
-        uint32_t u;
+        sffs_fsinfo_t fsinfo;
         dev32_t d32;
         int error;
 
         bzero(sbp, sizeof(*sbp));
-        error = sfprov_get_blksize(sffs->sf_handle, &x);
+        error = sfprov_get_fsinfo(sffs->sf_handle, &fsinfo);
         if (error != 0)
                 return (error);
-        sbp->f_bsize = x;
-        sbp->f_frsize = x;
-
-        error = sfprov_get_blksavail(sffs->sf_handle, &x);
-        if (error != 0)
-                return (error);
-        sbp->f_bfree = x;
-        sbp->f_bavail = x;
-        sbp->f_files = x / 4;   /* some kind of reasonable value */
-        sbp->f_ffree = x / 4;
-        sbp->f_favail = x / 4;
-
-        error = sfprov_get_blksused(sffs->sf_handle, &x);
-        if (error != 0)
-                return (error);
-        sbp->f_blocks = x + sbp->f_bavail;
+
+        sbp->f_bsize = fsinfo.blksize;
+        sbp->f_frsize = fsinfo.blksize;
+
+        sbp->f_bfree = fsinfo.blksavail;
+        sbp->f_bavail = fsinfo.blksavail;
+        sbp->f_files = fsinfo.blksavail / 4; /* some kind of reasonable value */
+        sbp->f_ffree = fsinfo.blksavail / 4;
+        sbp->f_favail = fsinfo.blksavail / 4;
+
+        sbp->f_blocks = fsinfo.blksused + sbp->f_bavail;
 
         (void) cmpldev(&d32, vfsp->vfs_dev);
@@ -557 +551 @@
         sbp->f_flag |= ST_NOSUID;
 
-        error = sfprov_get_readonly(sffs->sf_handle, &u);
-        if (error != 0)
-                return (error);
-        if (u)
+        if (fsinfo.readonly)
                 sbp->f_flag |= ST_RDONLY;
 
-        error = sfprov_get_maxnamesize(sffs->sf_handle, &u);
-        if (error != 0)
-                return (error);
-        sbp->f_namemax = u;
+        sbp->f_namemax = fsinfo.maxnamesize;
         return (0);
 }