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

Timestamp:

Feb 23, 2015 5:07:55 PM (10 years ago)

Author:

vboxsync

Message:

Additions/linux/vboxsf: fix for Linux 4.0

File:

• trunk/src/VBox/Additions/linux/sharedfolders/utils.c (modified) (5 diffs)

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

@@ -99 +99 @@
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
     inode->i_mapping->a_ops = &sf_reg_aops;
+# if LINUX_VERSION_CODE <= KERNEL_VERSION(3, 19, 0)
+    /* XXX Was this ever necessary? */
     inode->i_mapping->backing_dev_info = &sf_g->bdi;
+# endif
 #endif
 
@@ -864 +867 @@
 {
     int rc = 0;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) && LINUX_VERSION_CODE <= KERNEL_VERSION(3, 19, 0)
     /* Each new shared folder map gets a new uint64_t identifier,
      * allocated in sequence.  We ASSUME the sequence will not wrap. */
@@ -869 +873 @@
     uint64_t u64CurrentSequence = ASMAtomicIncU64(&s_u64Sequence);
 
-#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)
@@ -886 +889 @@
 #  endif /* >= 2.6.26 */
 # endif /* >= 2.6.24 */
-#endif /* >= 2.6.0 */
+#endif /* >= 2.6.0 && <= 3.19.0 */
     return rc;
 }
@@ -892 +895 @@
 void sf_done_backing_dev(struct sf_glob_info *sf_g)
 {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24) && LINUX_VERSION_CODE <= KERNEL_VERSION(3, 19, 0)
     bdi_destroy(&sf_g->bdi); /* includes bdi_unregister() */
 #endif