Changeset 77709 in vbox for trunk/src/VBox/Additions/linux/sharedfolders/vfsmod.c

Timestamp:

Mar 15, 2019 1:49:43 AM (6 years ago)

Author:

vboxsync

Message:

linux/vboxsf: Use 'VBox' as f_type value. NFS_SUPER_MAGIC confuses umount from the debian mount package v2.25.2-6 (debian 8). bugref:9172

File:

• trunk/src/VBox/Additions/linux/sharedfolders/vfsmod.c (modified) (3 diffs)

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

@@ -53 +53 @@
 #include <linux/seq_file.h>
 #include <linux/vfs.h>
-#include <linux/nfs_fs.h> /* for NFS_SUPER_MAGIC */
 #include <iprt/path.h>
 
@@ -577 +576 @@
         rc = VbglR0SfHostReqQueryVolInfo(sf_g->map.root, pReq, SHFL_HANDLE_ROOT);
         if (RT_SUCCESS(rc)) {
-            stat->f_type   = NFS_SUPER_MAGIC; /** @todo vboxsf type? */
+            stat->f_type   = UINT32_C(0x786f4256); /* 'VBox' little endian */
             stat->f_bsize  = pVolInfo->ulBytesPerAllocationUnit;
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 73)
@@ -583 +582 @@
 #endif
             stat->f_blocks = pVolInfo->ullTotalAllocationBytes
-                       / pVolInfo->ulBytesPerAllocationUnit;
+                           / pVolInfo->ulBytesPerAllocationUnit;
             stat->f_bfree  = pVolInfo->ullAvailableAllocationBytes
-                       / pVolInfo->ulBytesPerAllocationUnit;
+                           / pVolInfo->ulBytesPerAllocationUnit;
             stat->f_bavail = pVolInfo->ullAvailableAllocationBytes
-                       / pVolInfo->ulBytesPerAllocationUnit;
+                           / pVolInfo->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_ffree  = 1000000; /* 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;