X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=lib%2Fringbuffer%2Fring_buffer_backend.c;h=a9513d1c07e3072fc9e6f6dcd5418554a1af8255;hb=9a0df743d0ee1aef496b7ca94fdf5308b54c8a36;hp=2d272c773ef57e670d105268b715f59b953fa8bf;hpb=6d2a620c03c40df6fb09429e9895f71c5d9dfa76;p=lttng-modules.git

diff --git a/lib/ringbuffer/ring_buffer_backend.c b/lib/ringbuffer/ring_buffer_backend.c
index 2d272c77..a9513d1c 100644
--- a/lib/ringbuffer/ring_buffer_backend.c
+++ b/lib/ringbuffer/ring_buffer_backend.c
@@ -16,7 +16,7 @@
 #include <linux/cpu.h>
 #include <linux/mm.h>
 
-#include "../../wrapper/symbols.h"	/* for wrapper_vmalloc_sync_all() */
+#include "../../wrapper/vmalloc.h"	/* for wrapper_vmalloc_sync_all() */
 #include "../../wrapper/ringbuffer/config.h"
 #include "../../wrapper/ringbuffer/backend.h"
 #include "../../wrapper/ringbuffer/frontend.h"
@@ -311,7 +311,8 @@ int channel_backend_init(struct channel_backend *chanb,
 		return -EPERM;
 
 	/* Check that the subbuffer size is larger than a page. */
-	CHAN_WARN_ON(chanb, subbuf_size < PAGE_SIZE);
+	if (subbuf_size < PAGE_SIZE)
+		return -EINVAL;
 
 	/*
 	 * Make sure the number of subbuffers and subbuffer size are power of 2.
@@ -568,11 +569,10 @@ int __lib_ring_buffer_copy_to_user(struct lib_ring_buffer_backend *bufb,
 	struct channel_backend *chanb = &bufb->chan->backend;
 	const struct lib_ring_buffer_config *config = chanb->config;
 	size_t index;
-	ssize_t pagecpy, orig_len;
+	ssize_t pagecpy;
 	struct lib_ring_buffer_backend_pages *rpages;
 	unsigned long sb_bindex, id;
 
-	orig_len = len;
 	offset &= chanb->buf_size - 1;
 	index = (offset & (chanb->subbuf_size - 1)) >> PAGE_SHIFT;
 	if (unlikely(!len))