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

Timestamp:

Sep 21, 2011 6:50:36 AM (13 years ago)

Author:

vboxsync

Message:

Additions/linux/sharedfolders: use a unique identifier rather than the share name when creating the backing device

Location:

trunk/src/VBox/Additions/linux/sharedfolders

Files:

• utils.c (modified) (3 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 <iprt/asm.h>
 #include <linux/nfs_fs.h>
 #include <linux/vfs.h>
@@ -828 +829 @@
 };
 
-int sf_init_backing_dev(struct sf_glob_info *sf_g, const char *name)
+int sf_init_backing_dev(struct sf_glob_info *sf_g)
 {
     int rc = 0;
+    /* Each new shared folder map gets a new uint64_t identifier,
+     * allocated in sequence.  We ASSUME the sequence will not wrap. */
+    static uint64_t s_u64Sequence = 0;
+    uint64_t u64CurrentSequence = ASMAtomicIncU64(&s_u64Sequence);
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
@@ -845 +850 @@
 #  if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)
     if (!rc)
-        rc = bdi_register(&sf_g->bdi, NULL, "vboxsf-%s", name);
+        rc = bdi_register(&sf_g->bdi, NULL, "vboxsf-%llu",
+                          (unsigned long long)u64CurrentSequence);
 #  endif /* >= 2.6.26 */
 # endif /* >= 2.6.24 */

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

@@ -278 +278 @@
     }
 
-    if (sf_init_backing_dev(sf_g, info->name))
+    if (sf_init_backing_dev(sf_g))
     {
         err = -EINVAL;

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

@@ -118 +118 @@
 extern int  sf_dir_read_all(struct sf_glob_info *sf_g, struct sf_inode_info *sf_i,
                             struct sf_dir_info *sf_d, SHFLHANDLE handle);
-extern int  sf_init_backing_dev(struct sf_glob_info *sf_g, const char *name);
+extern int  sf_init_backing_dev(struct sf_glob_info *sf_g);
 extern void sf_done_backing_dev(struct sf_glob_info *sf_g);