Changeset 4909 in vbox

Timestamp:

Sep 20, 2007 7:27:19 AM (17 years ago)

Author:

vboxsync

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

24647

Message:

Implement statfs call for Linux guests. Makes volume info (e.g. df) work.

Location:

trunk/src/VBox/Additions/linux/sharedfolders

Files:

• utils.c (modified) (2 diffs)
• vfsmod.c (modified) (1 diff)
• vfsmod.h (modified) (1 diff)

trunk/src/VBox/Additions/linux/sharedfolders/utils.c

@@ -19 +19 @@
 
 #include "vfsmod.h"
+#include <linux/nfs_fs.h>
+#include <linux/vfs.h>
 
 /* #define USE_VMALLOC */
@@ -590 +592 @@
 }
 
+int sf_get_volume_info(struct super_block *sb, STRUCT_STATFS *stat)
+{
+        struct sf_glob_info *sf_g;
+        SHFLVOLINFO SHFLVolumeInfo;
+        uint32_t cbBuffer;
+        int rc;
+
+        sf_g = GET_GLOB_INFO (sb);
+        cbBuffer = sizeof(SHFLVolumeInfo);
+        rc = vboxCallFSInfo(&client_handle, &sf_g->map, 0, SHFL_INFO_GET | SHFL_INFO_VOLUME,
+                            &cbBuffer, (PSHFLDIRINFO)&SHFLVolumeInfo);
+        if (VBOX_FAILURE(rc))
+            return -RTErrConvertToErrno(rc);
+
+        stat->f_type        = NFS_SUPER_MAGIC; /* XXX vboxsf type? */
+        stat->f_bsize       = SHFLVolumeInfo.ulBytesPerAllocationUnit;
+        stat->f_blocks      = SHFLVolumeInfo.ullTotalAllocationBytes
+                            / SHFLVolumeInfo.ulBytesPerAllocationUnit;
+        stat->f_bfree       = SHFLVolumeInfo.ullAvailableAllocationBytes
+                            / SHFLVolumeInfo.ulBytesPerAllocationUnit;
+        stat->f_bavail      = SHFLVolumeInfo.ullAvailableAllocationBytes
+                            / SHFLVolumeInfo.ulBytesPerAllocationUnit;
+        stat->f_files       = 1000;
+        stat->f_ffree       = 1000; /* don't return 0 here since the guest may think
+                                     * that it is not possible to create any more files */
+        stat->f_fsid.val[0] = 0;
+        stat->f_fsid.val[1] = 0;
+        stat->f_namelen     = 255;
+        return 0;
+}
+
 struct dentry_operations sf_dentry_ops = {
         .d_revalidate = sf_dentry_revalidate

trunk/src/VBox/Additions/linux/sharedfolders/vfsmod.c

@@ -311 +311 @@
 }
 
-static int
-sf_statfs (
 #if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 18)
-           struct super_block *sb,
+static int
+sf_statfs (struct super_block *sb, STRUCT_STATFS *stat)
+{
+        return sf_get_volume_info(sb, stat);
+}
 #else
-           struct dentry *dentry,
-#endif
-#if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 0)
-           struct statfs *stat
-#else
-           struct kstatfs *stat
-#endif
-        )
-{
-        TRACE ();
-        return -ENOSYS;
-}
+static int
+sf_statfs (struct dentry *dentry, STRUCT_STATFS *stat)
+{
+        struct super_block *sb = dentry->d_inode->i_sb;
+        return sf_get_volume_info(sb, stat);
+}
+#endif
 
 static int

trunk/src/VBox/Additions/linux/sharedfolders/vfsmod.h

@@ -93 +93 @@
                  struct sf_dir_info *sf_d, SHFLHANDLE handle);
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 0)
+#define STRUCT_STATFS  struct statfs
+#else
+#define STRUCT_STATFS  struct kstatfs
+#endif
+int sf_get_volume_info(struct super_block *sb,STRUCT_STATFS *stat);
+
 #ifdef ALIGN
 #undef ALIGN