Changeset 82166 in vbox for trunk/src

Timestamp:

Nov 25, 2019 11:32:20 AM (5 years ago)

Author:

vboxsync

Message:

linux/vboxsf: Workaround for missing noop_backing_dev_info export in 4.0 and 4.1. bugref:9172

Location:

trunk/src/VBox/Additions/linux/sharedfolders

Files:

• vfsmod.c (modified) (2 diffs)
• vfsmod.h (modified) (1 diff)

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

@@ -365 +365 @@
     struct backing_dev_info *bdi;
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0) && LINUX_VERSION_CODE < KERNEL_VERSION(4, 2, 0)
+    pSuperInfo->bdi_org = sb->s_bdi;
+#endif
+
 #  if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
     rc = super_setup_bdi_name(sb, "vboxsf-%llu", (unsigned long long)idSeqMine);
@@ -435 +439 @@
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24) && LINUX_VERSION_CODE <= KERNEL_VERSION(4, 12, 0)
     bdi_destroy(&pSuperInfo->bdi);    /* includes bdi_unregister() */
-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34) && LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0) && LINUX_VERSION_CODE < KERNEL_VERSION(4, 2, 0)
+    sb->s_bdi = pSuperInfo->bdi_org; /* (noop_backing_dev_info is not exported) */
+# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34) && LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
     sb->s_bdi = &noop_backing_dev_info;
 # endif

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

@@ -160 +160 @@
     /** The time to live for inode information in milliseconds, for /proc/mounts. */
     int32_t                 msInodeTTL;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0) && LINUX_VERSION_CODE < KERNEL_VERSION(4, 2, 0)
+    /** 4.0 and 4.1 are missing noop_backing_dev_info export, so take down the
+     *  initial value so we can restore it in vbsf_done_backing_dev(). (paranoia) */
+    struct backing_dev_info *bdi_org;
+#endif
 };