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

Timestamp:

Mar 29, 2019 3:25:15 AM (6 years ago)

Author:

vboxsync

Message:

linux/vboxsf: Implemented our own .sendfile for 2.5.30 - 2.6.23 that does not muck around with the page cache unless there are writable mmap'ings of the file. This should be the final page cache issue I'm aware of. [build fix] bugref:9172

File:

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

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

@@ -1021 +1021 @@
  * generic_file_sendfile() does.
  */
-static ssize_t vbsf_reg_sendfile(struct file *pFile, loff_t *poffFile, size_t cbToSend, read_actor_t pfnActor, void *pvUser)
+static ssize_t vbsf_reg_sendfile(struct file *pFile, loff_t *poffFile, size_t cbToSend, read_actor_t pfnActor,
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 8)
+                                 void *pvUser
+# else
+                                 void __user *pvUser
+# endif
+                                )
 {
     struct inode           *inode = VBSF_GET_F_DENTRY(pFile)->d_inode;
@@ -1078 +1084 @@
                 read_descriptor_t     RdDesc;
                 RdDesc.count    = cbToSend;
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 8)
                 RdDesc.arg.data = pvUser;
+# else
+                RdDesc.buf      = pvUser;
+# endif
                 RdDesc.written  = 0;
                 RdDesc.error    = 0;