X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libringbuffer%2Fring_buffer_backend.c;h=769e24bffa0c35475aee4ddcec62b60b4b618d93;hb=75181c4b1b6e046ae8561c486ced003a83b1a696;hp=95346049f5b20f9f92d0cd9e3875b4a76e84b54b;hpb=35897f8b2d311b756b81657dad9c53ef1c0fad8a;p=lttng-ust.git

diff --git a/libringbuffer/ring_buffer_backend.c b/libringbuffer/ring_buffer_backend.c
index 95346049..769e24bf 100644
--- a/libringbuffer/ring_buffer_backend.c
+++ b/libringbuffer/ring_buffer_backend.c
@@ -6,7 +6,9 @@
  * Dual LGPL v2.1/GPL v2 license.
  */
 
+#define _GNU_SOURCE
 #include <urcu/arch.h>
+#include <limits.h>
 
 #include <lttng/ringbuffer-config.h>
 #include "vatomic.h"
@@ -218,8 +220,10 @@ int channel_backend_init(struct channel_backend *chanb,
 	/*
 	 * Make sure the number of subbuffers and subbuffer size are power of 2.
 	 */
-	CHAN_WARN_ON(chanb, hweight32(subbuf_size) != 1);
-	CHAN_WARN_ON(chanb, hweight32(num_subbuf) != 1);
+	if (hweight32(subbuf_size) != 1)
+		return -EINVAL;
+	if (hweight32(num_subbuf) != 1)
+		return -EINVAL;
 
 	ret = subbuffer_id_check_index(config, num_subbuf);
 	if (ret)
@@ -292,6 +296,7 @@ int channel_backend_init(struct channel_backend *chanb,
 		buf = shmp(handle, chanb->buf[0].shmp);
 		if (!buf)
 			goto end;
+		set_shmp(buf->self, chanb->buf[0].shmp._ref);
 		ret = lib_ring_buffer_create(buf, chanb, -1,
 					handle, shmobj);
 		if (ret)