Drop support for kernels < 4.4 from LTTng tracer core

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

diff --git a/src/lib/ringbuffer/ring_buffer_splice.c b/src/lib/ringbuffer/ring_buffer_splice.c
index b6580fa6d42359158195a086c79e16490728849a..375255b51cf1725a25927912be211179a4dd3bc9 100644 (file)
--- a/src/lib/ringbuffer/ring_buffer_splice.c
+++ b/src/lib/ringbuffer/ring_buffer_splice.c
@@ -60,19 +60,9 @@ static const struct pipe_buf_operations ring_buffer_pipe_buf_ops = {
        .steal = generic_pipe_buf_steal,
        .get = generic_pipe_buf_get
 };
-#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,15,0))
-static const struct pipe_buf_operations ring_buffer_pipe_buf_ops = {
-       .can_merge = 0,
-       .confirm = generic_pipe_buf_confirm,
-       .release = lib_ring_buffer_pipe_buf_release,
-       .steal = generic_pipe_buf_steal,
-       .get = generic_pipe_buf_get
-};
 #else
 static const struct pipe_buf_operations ring_buffer_pipe_buf_ops = {
        .can_merge = 0,
-       .map = generic_pipe_buf_map,
-       .unmap = generic_pipe_buf_unmap,
        .confirm = generic_pipe_buf_confirm,
        .release = lib_ring_buffer_pipe_buf_release,
        .steal = generic_pipe_buf_steal,
@@ -97,10 +87,10 @@ static int subbuf_splice_actor(struct file *in,
                               struct pipe_inode_info *pipe,
                               size_t len,
                               unsigned int flags,
-                              struct lib_ring_buffer *buf)
+                              struct lttng_kernel_ring_buffer *buf)
 {
-       struct channel *chan = buf->backend.chan;
-       const struct lib_ring_buffer_config *config = &chan->backend.config;
+       struct lttng_kernel_ring_buffer_channel *chan = buf->backend.chan;
+       const struct lttng_kernel_ring_buffer_config *config = &chan->backend.config;
        unsigned int poff, subbuf_pages, nr_pages;
        struct page *pages[PIPE_DEF_BUFFERS];
        struct partial_page partial[PIPE_DEF_BUFFERS];
@@ -182,10 +172,10 @@ static int subbuf_splice_actor(struct file *in,
 ssize_t lib_ring_buffer_splice_read(struct file *in, loff_t *ppos,
                                    struct pipe_inode_info *pipe, size_t len,
                                    unsigned int flags,
-                                   struct lib_ring_buffer *buf)
+                                   struct lttng_kernel_ring_buffer *buf)
 {
-       struct channel *chan = buf->backend.chan;
-       const struct lib_ring_buffer_config *config = &chan->backend.config;
+       struct lttng_kernel_ring_buffer_channel *chan = buf->backend.chan;
+       const struct lttng_kernel_ring_buffer_config *config = &chan->backend.config;
        ssize_t spliced;
        int ret;
 
@@ -239,7 +229,7 @@ ssize_t vfs_lib_ring_buffer_splice_read(struct file *in, loff_t *ppos,
                                    struct pipe_inode_info *pipe, size_t len,
                                    unsigned int flags)
 {
-       struct lib_ring_buffer *buf = in->private_data;
+       struct lttng_kernel_ring_buffer *buf = in->private_data;
 
        return lib_ring_buffer_splice_read(in, ppos, pipe, len, flags, buf);
 }