Changeset 75433 in vbox for trunk/src/VBox/Additions/linux

Timestamp:

Nov 13, 2018 10:34:39 PM (6 years ago)

Author:

vboxsync

Message:

linux/vboxsf,VBoxService: Added mount tag and implemented show_options so the tag (and more) is visible in /proc/mounts. Made use of the tag in VBoxService, also made it prefer /proc/mounts over /etc/mtab, and made it rmdir mountpoints during umount.

Location:

trunk/src/VBox/Additions/linux/sharedfolders

Files:

• mount.vboxsf.c (modified) (1 diff)
• vbsfmount.h (modified) (1 diff)
• vfsmod.c (modified) (5 diffs)
• vfsmod.h (modified) (1 diff)

trunk/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c

@@ -402 +402 @@
     mntinf.signature[2] = VBSF_MOUNT_SIGNATURE_BYTE_2;
     mntinf.length       = sizeof(mntinf);
+    mntinf.tag[0] = '\0';
 
     if (getuid())

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

@@ -59 +59 @@
         int dmask;              /* umask applied to directories */
         int fmask;              /* umask applied to regular files */
+        char tag[32];           /**< Mount tag for VBoxService automounter.  @since 6.0 */
 };
 

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

@@ -156 +156 @@
         sf_g->gid = info->gid;
 
-        if ((unsigned)info->length >= sizeof(struct vbsf_mount_info_new)) {
+        if ((unsigned)info->length >= RT_UOFFSETOF(struct vbsf_mount_info_new, tag)) {
                 /* new fields */
                 sf_g->dmode = info->dmode;
@@ -165 +165 @@
                 sf_g->dmode = ~0;
                 sf_g->fmode = ~0;
+        }
+
+        if ((unsigned)info->length >= sizeof(struct vbsf_mount_info_new)) {
+                AssertCompile(sizeof(sf_g->tag) >= sizeof(info->tag));
+                memcpy(sf_g->tag, info->tag, sizeof(info->tag));
+                sf_g->tag[sizeof(sf_g->tag) - 1] = '\0';
+        } else {
+                sf_g->tag[0] = '\0';
         }
 
@@ -457 +465 @@
                         sf_g->gid = info->gid;
                         sf_g->ttl = info->ttl;
-                        sf_g->dmode = info->dmode;
-                        sf_g->fmode = info->fmode;
-                        sf_g->dmask = info->dmask;
-                        sf_g->fmask = info->fmask;
+                        if ((unsigned)info->length >= RT_UOFFSETOF(struct vbsf_mount_info_new, tag)) {
+                                sf_g->dmode = info->dmode;
+                                sf_g->fmode = info->fmode;
+                                sf_g->dmask = info->dmask;
+                                sf_g->fmask = info->fmask;
+                        } else {
+                                sf_g->dmode = ~0;
+                                sf_g->fmode = ~0;
+                        }
+                        if ((unsigned)info->length >= sizeof(struct vbsf_mount_info_new)) {
+                                AssertCompile(sizeof(sf_g->tag) >= sizeof(info->tag));
+                                memcpy(sf_g->tag, info->tag, sizeof(info->tag));
+                                sf_g->tag[sizeof(sf_g->tag) - 1] = '\0';
+                        } else {
+                                sf_g->tag[0] = '\0';
+                        }
                 }
         }
@@ -479 +499 @@
 }
 
+/** Show mount options. */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0)
+static int sf_show_options(struct seq_file *m, struct vfsmount *mnt)
+#else
+static int sf_show_options(struct seq_file *m, struct dentry *root)
+#endif
+{
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0)
+        struct super_block *sb = mnt->mnt_sb;
+#else
+        struct super_block *sb = root->d_sb;
+#endif
+        struct sf_glob_info *sf_g = GET_GLOB_INFO(sb);
+        if (sf_g) {
+                seq_printf(m, ",uid=%u,gid=%u,ttl=%u,dmode=0%o,fmode=0%o,dmask=0%o,fmask=0%o",
+                        sf_g->uid, sf_g->gid, sf_g->ttl, sf_g->dmode, sf_g->fmode, sf_g->dmask, sf_g->fmask);
+                if (sf_g->tag[0] != '\0') {
+                        seq_puts(m, ",tag=");
+                        seq_escape(m, sf_g->tag, " \t\n\\");
+                }
+        }
+
+    return 0;
+}
+
 /** @todo Implement show_options (forever) or maybe set s_options (2.6.25+).
  *        Necessary for the automounter tagging.  */
@@ -492 +537 @@
         .put_super = sf_put_super,
         .statfs = sf_statfs,
-        .remount_fs = sf_remount_fs
+        .remount_fs = sf_remount_fs,
+        .show_options = sf_show_options
 };
 

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

@@ -58 +58 @@
         struct backing_dev_info bdi;
 #endif
+        char tag[32];           /**< Mount tag for VBoxService automounter.  @since 6.0 */
 };