Changeset 78135 in vbox for trunk/src/VBox

Timestamp:

Apr 16, 2019 1:18:25 AM (6 years ago)

Author:

vboxsync

Message:

linux/vboxsf: Various build fixes for older kernels. bugref:9172

Location:

trunk/src/VBox/Additions/linux/sharedfolders

Files:

• Makefile.module (modified) (1 diff)
• dirops.c (modified) (1 diff)
• regops.c (modified) (4 diffs)
• vfsmod.h (modified) (1 diff)

trunk/src/VBox/Additions/linux/sharedfolders/Makefile.module

@@ -64 +64 @@
 VBOXMOD_DEFS += VBOX_WITH_64_BITS_GUESTS
 endif
+ifneq ($(filter %uek.x86_64,$(KERN_VER)),)
+VBOXMOD_DEFS += VBOX_UEK
+endif
 VBOXMOD_CFLAGS := $(call VBOX_GCC_CHECK_CC,-Wno-declaration-after-statement,-Wno-declaration-after-statement,,)
 VBOXMOD_CFLAGS += $(call VBOX_GCC_CHECK_CC,-fno-pie,-fno-pie,,)

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

@@ -1369 +1369 @@
 struct inode_operations vbsf_dir_iops = {
     .lookup         = vbsf_inode_lookup,
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 16, 0)
     .atomic_open    = vbsf_inode_atomic_open,
 #endif

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

@@ -1416 +1416 @@
 # elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
     ssize_t cPagesLocked = get_user_pages_unlocked(uPtrFrom, cPages, fWrite, 1 /*force*/, papPages);
+# elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 168) && LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0)
+    ssize_t cPagesLocked = get_user_pages_unlocked(current, current->mm, uPtrFrom, cPages, papPages,
+                                                   fWrite ? FOLL_WRITE | FOLL_FORCE : FOLL_FORCE);
 # elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0)
     ssize_t cPagesLocked = get_user_pages_unlocked(current, current->mm, uPtrFrom, cPages, fWrite, 1 /*force*/, papPages);
@@ -3698 +3701 @@
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 10)
+
+# ifdef VBOX_UEK
+#  undef iov_iter /* HACK ALERT! Don't put anything needing vbsf_iov_iter after this fun! */
+# endif
+
 /**
  * This is needed to make open accept O_DIRECT as well as dealing with direct
@@ -3706 +3714 @@
 # elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0)
 static ssize_t vbsf_direct_IO(struct kiocb *iocb, struct iov_iter *iter, loff_t offset)
-# elif LINUX_VERSION_CODE >= KERNEL_VERSION(3, 16, 0)
+# elif LINUX_VERSION_CODE >= KERNEL_VERSION(3, 16, 0) || defined(VBOX_UEK)
 static ssize_t vbsf_direct_IO(int rw, struct kiocb *iocb, struct iov_iter *iter, loff_t offset)
 # elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 6)
@@ -3727 +3735 @@
     return -EINVAL;
 }
+
 #endif
 

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

@@ -99 +99 @@
 #endif /* < 2.6.0 */
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)
+#if  LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0) \
+  && (!defined(RHEL_MAJOR) || RHEL_MAJOR != 6)
 DECLINLINE(void) set_nlink(struct inode *pInode, unsigned int cLinks)
 {