Changeset 85689 in vbox for trunk/src

Timestamp:

Aug 11, 2020 12:48:15 PM (4 years ago)

Author:

vboxsync

Message:

linux/vboxsf: Try workaround suse backporting get_user_pages_unlocked changes from 4.9 to their 4.4.x SEL12 releases.

File:

• trunk/src/VBox/Additions/linux/sharedfolders/regops.c (modified) (2 diffs)

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

@@ -1431 +1431 @@
 DECLINLINE(int) vbsf_lock_user_pages(uintptr_t uPtrFrom, size_t cPages, bool fWrite, struct page **papPages, bool *pfLockPgHack)
 {
-# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0) \
+  || (   defined(CONFIG_SUSE_KERNEL) /** @todo Figure out when exactly. Also, guessing a bit here what got backported. */ \
+      && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 73) \
+      && LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0))
     ssize_t cPagesLocked = get_user_pages_unlocked(uPtrFrom, cPages, papPages,
                                                    fWrite ? FOLL_WRITE | FOLL_FORCE : FOLL_FORCE);
@@ -3731 +3734 @@
  * I/O requests if we don't intercept them earlier.
  */
-# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) \
+  || (defined(CONFIG_SUSE_KERNEL) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 73) && LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0)) /** @todo Figure out when exactly. */
 static ssize_t vbsf_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
 # elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0)