Changeset 77940 in vbox for trunk

Timestamp:

Mar 28, 2019 4:03:06 PM (6 years ago)

Author:

vboxsync

Message:

linux/vboxsf: Reimplemented vbsf_splice_read to make both sendfile and splice() work more correctly on 2.6.23 - 2.6.30. [build fix] bugref:9172

File:

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

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

@@ -41 +41 @@
 # include <linux/buffer_head.h>
 #endif
-#if LINUX_VERSION_CODE <  KERNEL_VERSION(2, 6, 31) \
- && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 12)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 12) \
+ && LINUX_VERSION_CODE <  KERNEL_VERSION(2, 6, 31)
 # include <linux/writeback.h>
 #endif
@@ -48 +48 @@
  && LINUX_VERSION_CODE <  KERNEL_VERSION(2, 6, 31)
 # include <linux/splice.h>
+#endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 17) \
+ && LINUX_VERSION_CODE <  KERNEL_VERSION(2, 6, 23)
+# include <linux/pipe_fs_i.h>
 #endif
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 10)
@@ -520 +524 @@
 
 /*********************************************************************************************************************************
-*   Pipe / splice stuff for 2.6.23 >= linux < 2.6.31 (where no fallbacks were available)                                         *
+*   Pipe / splice stuff for 2.6.17 >= linux < 2.6.31 (where no fallbacks were available)                                         *
 *********************************************************************************************************************************/
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 23) \
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 17) \
  && LINUX_VERSION_CODE <  KERNEL_VERSION(2, 6, 31)
 
 
 /** Verify pipe buffer content (needed for page-cache to ensure idle page). */
-static int vbsf_pipe_buf_confirm(struct pipe_inode_info *info, struct pipe_buffer *pPipeBuf)
+static int vbsf_pipe_buf_confirm(struct pipe_inode_info *pPipe, struct pipe_buffer *pPipeBuf)
 {
     /*SFLOG3(("vbsf_pipe_buf_confirm: %p\n", pPipeBuf));*/
@@ -535 +539 @@
 
 /** Maps the buffer page. */
-static void *vbsf_pipe_buf_map(struct pipe_inode_info *pipe, struct pipe_buffer *pPipeBuf, int atomic)
+static void *vbsf_pipe_buf_map(struct pipe_inode_info *pPipe, struct pipe_buffer *pPipeBuf, int atomic)
 {
     void *pvRet;
@@ -549 +553 @@
 
 /** Unmaps the buffer page. */
-static void vbsf_pipe_buf_unmap(struct pipe_inode_info *pipe, struct pipe_buffer *pPipeBuf, void *pvMapping)
+static void vbsf_pipe_buf_unmap(struct pipe_inode_info *pPipe, struct pipe_buffer *pPipeBuf, void *pvMapping)
 {
     /*SFLOG3(("vbsf_pipe_buf_unmap: %p/%p\n", pPipeBuf, pvMapping)); */
@@ -561 +565 @@
 
 /** Gets a reference to the page. */
-static void vbsf_pipe_buf_get(struct pipe_inode_info *pipe, struct pipe_buffer *pPipeBuf)
+static void vbsf_pipe_buf_get(struct pipe_inode_info *pPipe, struct pipe_buffer *pPipeBuf)
 {
     page_cache_get(pPipeBuf->page);
@@ -568 +572 @@
 
 /** Release the buffer page (counter to vbsf_pipe_buf_get). */
-static void vbsf_pipe_buf_release(struct pipe_inode_info *pipe, struct pipe_buffer *pPipeBuf)
+static void vbsf_pipe_buf_release(struct pipe_inode_info *pPipe, struct pipe_buffer *pPipeBuf)
 {
     /*SFLOG3(("vbsf_pipe_buf_release: %p (incoming count=%d)\n", pPipeBuf, page_count(pPipeBuf->page)));*/
@@ -576 +580 @@
 /** Attempt to steal the page.
  * @returns 0 success, 1 on failure.  */
-static int vbsf_pipe_buf_steal(struct pipe_inode_info *pipe, struct pipe_buffer *pPipeBuf)
+static int vbsf_pipe_buf_steal(struct pipe_inode_info *pPipe, struct pipe_buffer *pPipeBuf)
 {
     if (page_count(pPipeBuf->page) == 1) {
@@ -604 +608 @@
 };
 
-# define LOCK_PIPE(pipe)   do { if ((pipe)->inode) mutex_lock(&(pipe)->inode->i_mutex); } while (0)
-# define UNLOCK_PIPE(pipe) do { if ((pipe)->inode) mutex_unlock(&(pipe)->inode->i_mutex); } while (0)
+# define LOCK_PIPE(a_pPipe)   do { if ((a_pPipe)->inode) mutex_lock(&(a_pPipe)->inode->i_mutex); } while (0)
+# define UNLOCK_PIPE(a_pPipe) do { if ((a_pPipe)->inode) mutex_unlock(&(a_pPipe)->inode->i_mutex); } while (0)
 
 /** Waits for the pipe buffer status to change. */
@@ -796 +800 @@
 }
 
-#endif /* 2.6.23 <= LINUX_VERSION_CODE < 2.6.31 */
+#endif /* 2.6.17 <= LINUX_VERSION_CODE < 2.6.31 */
 
 
@@ -2965 +2969 @@
     .mmap            = generic_file_mmap,
 #endif
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31) && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 17)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 17) && LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
     .splice_read     = vbsf_splice_read,
     /// @todo .splice_write    = vbsf_splice_write,