Fix: update ringbuffer for kernel 4.12

flags removed from splice_pipe_desc in 4.12.

See upstream commit f81dc7d7d5a2528f98f26a0b9406e822d0b35011

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/lib/ringbuffer/ring_buffer_splice.c b/lib/ringbuffer/ring_buffer_splice.c
index 0610caaf9bfedc2a1acf67eb40a0075d8f3e3f64..8d146667d41c0327c5a5847965fd77bc7ccc2f23 100644 (file)
--- a/lib/ringbuffer/ring_buffer_splice.c
+++ b/lib/ringbuffer/ring_buffer_splice.c
@@ -95,7 +95,9 @@ static int subbuf_splice_actor(struct file *in,
                .pages = pages,
                .nr_pages = 0,
                .partial = partial,
                .pages = pages,
                .nr_pages = 0,
                .partial = partial,

+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4,12,0))

                .flags = flags,
                .flags = flags,

+#endif

                .ops = &ring_buffer_pipe_buf_ops,
                .spd_release = lib_ring_buffer_page_release,
        };
                .ops = &ring_buffer_pipe_buf_ops,
                .spd_release = lib_ring_buffer_page_release,
        };