Fix: pipe: stop using ->can_merge (v5.1)

[lttng-modules.git] / lib / ringbuffer / ring_buffer_splice.c

diff --git a/lib/ringbuffer/ring_buffer_splice.c b/lib/ringbuffer/ring_buffer_splice.c
index 3a7ff0c45cf86f7606d9d0751fe7a5db283daf3b..93cad295e0e9495ff3ec8fdad8efc98ecb11cdb4 100644 (file)
--- a/lib/ringbuffer/ring_buffer_splice.c
+++ b/lib/ringbuffer/ring_buffer_splice.c
@@ -25,11 +25,12 @@
 
 #include <linux/module.h>
 #include <linux/fs.h>
+#include <linux/version.h>
 
-#include "../../wrapper/splice.h"
-#include "../../wrapper/ringbuffer/backend.h"
-#include "../../wrapper/ringbuffer/frontend.h"
-#include "../../wrapper/ringbuffer/vfs.h"
+#include <wrapper/splice.h>
+#include <wrapper/ringbuffer/backend.h>
+#include <wrapper/ringbuffer/frontend.h>
+#include <wrapper/ringbuffer/vfs.h>
 
 #if 0
 #define printk_dbg(fmt, args...) printk(fmt, args)
@@ -55,9 +56,13 @@ static void lib_ring_buffer_pipe_buf_release(struct pipe_inode_info *pipe,
 }
 
 static const struct pipe_buf_operations ring_buffer_pipe_buf_ops = {
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5,1,0))
        .can_merge = 0,
+#endif
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0))
        .map = generic_pipe_buf_map,
        .unmap = generic_pipe_buf_unmap,
+#endif
        .confirm = generic_pipe_buf_confirm,
        .release = lib_ring_buffer_pipe_buf_release,
        .steal = generic_pipe_buf_steal,
@@ -92,7 +97,9 @@ static int subbuf_splice_actor(struct file *in,
                .pages = pages,
                .nr_pages = 0,
                .partial = partial,
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4,12,0))
                .flags = flags,
+#endif
                .ops = &ring_buffer_pipe_buf_ops,
                .spd_release = lib_ring_buffer_page_release,
        };
@@ -123,7 +130,8 @@ static int subbuf_splice_actor(struct file *in,
 
        for (; spd.nr_pages < nr_pages; spd.nr_pages++) {
                unsigned int this_len;
-               struct page **page, *new_page;
+               unsigned long *pfnp, new_pfn;
+               struct page *new_page;
                void **virt;
 
                if (!len)
@@ -140,11 +148,11 @@ static int subbuf_splice_actor(struct file *in,
                                            GFP_KERNEL | __GFP_ZERO, 0);
                if (!new_page)
                        break;
-
+               new_pfn = page_to_pfn(new_page);
                this_len = PAGE_SIZE - poff;
-               page = lib_ring_buffer_read_get_page(&buf->backend, roffset, &virt);
-               spd.pages[spd.nr_pages] = *page;
-               *page = new_page;
+               pfnp = lib_ring_buffer_read_get_pfn(&buf->backend, roffset, &virt);
+               spd.pages[spd.nr_pages] = pfn_to_page(*pfnp);
+               *pfnp = new_pfn;
                *virt = page_address(new_page);
                spd.partial[spd.nr_pages].offset = poff;
                spd.partial[spd.nr_pages].len = this_len;