X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=lib%2Fringbuffer%2Fring_buffer_splice.c;h=ded18ba80fc1d02949cb9931cdc1f5049a929ef7;hb=58aa5d24fc1b9bc14fa91a2a9ca8467fb2541fec;hp=531914a4ef04a9b205564ddba1cc0df6e9de1522;hpb=f3bc08c50e1b302bceea699027d889fd6d9af525;p=lttng-modules.git

diff --git a/lib/ringbuffer/ring_buffer_splice.c b/lib/ringbuffer/ring_buffer_splice.c
index 531914a4..ded18ba8 100644
--- a/lib/ringbuffer/ring_buffer_splice.c
+++ b/lib/ringbuffer/ring_buffer_splice.c
@@ -13,6 +13,7 @@
 #include <linux/module.h>
 #include <linux/fs.h>
 
+#include "../../wrapper/splice.h"
 #include "../../wrapper/ringbuffer/backend.h"
 #include "../../wrapper/ringbuffer/frontend.h"
 #include "../../wrapper/ringbuffer/vfs.h"
@@ -80,7 +81,7 @@ static int subbuf_splice_actor(struct file *in,
 		.ops = &ring_buffer_pipe_buf_ops,
 		.spd_release = lib_ring_buffer_page_release,
 	};
-	unsigned long consumed_old, consumed_idx, roffset;
+	unsigned long consumed_old, roffset;
 	unsigned long bytes_avail;
 
 	/*
@@ -89,7 +90,6 @@ static int subbuf_splice_actor(struct file *in,
 	WARN_ON(atomic_long_read(&buf->active_readers) != 1);
 	consumed_old = lib_ring_buffer_get_consumed(config, buf);
 	consumed_old += *ppos;
-	consumed_idx = subbuf_index(consumed_old, chan);
 
 	/*
 	 * Adjust read len, if longer than what is available.
@@ -142,7 +142,7 @@ static int subbuf_splice_actor(struct file *in,
 	if (!spd.nr_pages)
 		return 0;
 
-	return splice_to_pipe(pipe, &spd);
+	return wrapper_splice_to_pipe(pipe, &spd);
 }
 
 ssize_t lib_ring_buffer_splice_read(struct file *in, loff_t *ppos,