Remove splice_to_pipe kallsyms wrapper

[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 cac44e16e860d873c36e37e0502b735fab108e6a..f34bc35544f2e6d16799e78b55a16a9ec0249be7 100644 (file)
--- a/src/lib/ringbuffer/ring_buffer_splice.c
+++ b/src/lib/ringbuffer/ring_buffer_splice.c
@@ -12,9 +12,9 @@
 
 #include <linux/module.h>
 #include <linux/fs.h>
+#include <linux/splice.h>
 #include <lttng/kernel-version.h>
 
-#include <wrapper/splice.h>
 #include <ringbuffer/backend.h>
 #include <ringbuffer/frontend.h>
 #include <ringbuffer/vfs.h>
@@ -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,
@@ -176,7 +166,7 @@ static int subbuf_splice_actor(struct file *in,
        if (!spd.nr_pages)
                return 0;
 
-       return wrapper_splice_to_pipe(pipe, &spd);
+       return splice_to_pipe(pipe, &spd);
 }
 
 ssize_t lib_ring_buffer_splice_read(struct file *in, loff_t *ppos,