X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=libringbuffer%2Fring_buffer_backend.c;h=c32ba982259a2099a7aa0f8bf65a7f6ecadfc1b4;hb=b9acc13ba2cb2780291591e78c242eb86eeaaec9;hp=50cb1938a63ca9bf017887c43b72873c38e81354;hpb=b5a3dfa5923801ddeea22ce70758d1e61200eac2;p=lttng-ust.git

diff --git a/libringbuffer/ring_buffer_backend.c b/libringbuffer/ring_buffer_backend.c
index 50cb1938..c32ba982 100644
--- a/libringbuffer/ring_buffer_backend.c
+++ b/libringbuffer/ring_buffer_backend.c
@@ -8,9 +8,9 @@
 
 #include <urcu/arch.h>
 
-#include "ust/core.h"
+#include "lttng/core.h"
 
-#include <ust/ringbuffer-config.h>
+#include <lttng/ringbuffer-config.h>
 #include "backend.h"
 #include "frontend.h"
 #include "smp.h"
@@ -190,7 +190,6 @@ void channel_backend_reset(struct channel_backend *chanb)
  * @chanb: channel backend
  * @name: channel name
  * @config: client ring buffer configuration
- * @priv: client private data
  * @parent: dentry of parent directory, %NULL for root directory
  * @subbuf_size: size of sub-buffers (> PAGE_SIZE, power of 2)
  * @num_subbuf: number of sub-buffers (power of 2)
@@ -207,7 +206,7 @@ void channel_backend_reset(struct channel_backend *chanb)
 int channel_backend_init(struct channel_backend *chanb,
 			 const char *name,
 			 const struct lttng_ust_lib_ring_buffer_config *config,
-			 void *priv, size_t subbuf_size, size_t num_subbuf,
+			 size_t subbuf_size, size_t num_subbuf,
 			 struct lttng_ust_shm_handle *handle)
 {
 	struct channel *chan = caa_container_of(chanb, struct channel, backend);
@@ -235,7 +234,6 @@ int channel_backend_init(struct channel_backend *chanb,
 	if (ret)
 		return ret;
 
-	chanb->priv = priv;
 	chanb->buf_size = num_subbuf * subbuf_size;
 	chanb->subbuf_size = subbuf_size;
 	chanb->buf_size_order = get_count_order(chanb->buf_size);