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

Timestamp:

Jan 29, 2010 2:46:26 PM (15 years ago)

Author:

vboxsync

Message:

Another fix for public #5891. Thanks to Pax Team for the suggestion.

Location:

trunk/src/VBox/Additions/linux/sharedfolders

Files:

• utils.c (modified) (4 diffs)
• vfsmod.c (modified) (5 diffs)
• vfsmod.h (modified) (3 diffs)

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

@@ -28 +28 @@
 /* #define USE_VMALLOC */
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 0)
 /*
  * sf_reg_aops and sf_backing_dev_info are just quick implementations to make
@@ -40 +39 @@
  */
 
-static struct backing_dev_info sf_backing_dev_info = {
-        .ra_pages      = 0, /* No readahead */
-# if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 12)
-        .capabilities  = BDI_CAP_MAP_DIRECT    /* MAP_SHARED */
-                       | BDI_CAP_MAP_COPY      /* MAP_PRIVATE */
-                       | BDI_CAP_READ_MAP      /* can be mapped for reading */
-                       | BDI_CAP_WRITE_MAP     /* can be mapped for writing */
-                       | BDI_CAP_EXEC_MAP,     /* can be mapped for execution */
-# endif
-};
-#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 0) */
-
 #if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 0)
 static void
@@ -121 +108 @@
 #if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 0)
         inode->i_mapping->a_ops = &sf_reg_aops;
-        inode->i_mapping->backing_dev_info = &sf_backing_dev_info;
+        inode->i_mapping->backing_dev_info = &sf_g->bdi;
 #endif
 
@@ -813 +800 @@
 };
 
-void sf_init_backing_dev(void)
+int sf_init_backing_dev(struct sf_glob_info *sf_g, const char *name)
+{
+    int rc = 0;
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 0)
+    sf_g->bdi.ra_pages = 0; /* No readahead */
+# if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 12)
+    sf_g->bdi.capabilities  = BDI_CAP_MAP_DIRECT    /* MAP_SHARED */
+                            | BDI_CAP_MAP_COPY      /* MAP_PRIVATE */
+                            | BDI_CAP_READ_MAP      /* can be mapped for reading */
+                            | BDI_CAP_WRITE_MAP     /* can be mapped for writing */
+                            | BDI_CAP_EXEC_MAP;     /* can be mapped for execution */
+# endif /* >= 2.6.12 */
+# if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 24)
+    rc = bdi_init(&sf_g->bdi);
+    if (!rc)
+        rc = bdi_register(&sf_g->bdi, NULL, "vboxvfs-%s", name);
+# endif /* >= 2.6.24 */
+#endif /* >= 2.6.0 */
+    return rc;
+}
+
+void sf_done_backing_dev(struct sf_glob_info *sf_g)
 {
 #if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 24)
-    bdi_init(&sf_backing_dev_info);
-#endif
-}
+    bdi_destroy(&sf_g->bdi);
+#endif
+}

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

@@ -287 +287 @@
         }
 
+        if (sf_init_backing_dev(sf_g, info->name)) {
+                err = -EINVAL;
+                LogFunc(("could not init bdi\n"));
+                goto fail4;
+        }
+
         sf_init_inode (sf_g, iroot, &fsinfo);
         SET_INODE_INFO (iroot, sf_i);
@@ -298 +304 @@
                 err = -ENOMEM;  /* XXX */
                 LogFunc(("d_alloc_root failed\n"));
-                goto fail4;
+                goto fail5;
         }
 
@@ -305 +311 @@
         return 0;
 
+ fail5:
+        sf_done_backing_dev(sf_g);
  fail4:
         iput (iroot);
@@ -372 +380 @@
         sf_g = GET_GLOB_INFO (sb);
         BUG_ON (!sf_g);
+        sf_done_backing_dev(sf_g);
         sf_glob_free (sf_g);
 }
@@ -468 +477 @@
         }
 
-        sf_init_backing_dev();
-
         err = register_filesystem (&vboxsf_fs_type);
         if (err) {

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

@@ -26 +26 @@
 #include "version-generated.h"
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 0)
+# include <linux/backing-dev.h>
+#endif
+
 #include "VBoxCalls.h"
 #include "vbsfmount.h"
@@ -40 +44 @@
         int dmask;
         int fmask;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 0)
+        struct backing_dev_info bdi;
+#endif
 };
 
@@ -108 +115 @@
 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 void
-sf_init_backing_dev(void);
+sf_done_backing_dev (struct sf_glob_info *sf_g);
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 0)