X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Flttng-context-ipc-ns.c;h=80ef40c92b9d509f7cf9d534705565d33d936f99;hb=928a843e1f731fd83e17ff90af697eb39387d7f7;hp=d66415397272f24455ae25e080b0d203c85f2985;hpb=7207017d9b15dafec4ea157ab751b24aaee6cdfe;p=lttng-modules.git

diff --git a/src/lttng-context-ipc-ns.c b/src/lttng-context-ipc-ns.c
index d6641539..80ef40c9 100644
--- a/src/lttng-context-ipc-ns.c
+++ b/src/lttng-context-ipc-ns.c
@@ -24,7 +24,7 @@
 	(LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0))
 
 static
-size_t ipc_ns_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset)
+size_t ipc_ns_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset)
 {
 	size_t size = 0;
 
@@ -34,9 +34,9 @@ size_t ipc_ns_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t off
 }
 
 static
-void ipc_ns_record(void *priv, struct lttng_probe_ctx *probe_ctx,
-		 struct lib_ring_buffer_ctx *ctx,
-		 struct lttng_channel *chan)
+void ipc_ns_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
+		 struct lttng_kernel_ring_buffer_ctx *ctx,
+		 struct lttng_kernel_channel_buffer *chan)
 {
 	unsigned int ipc_ns_inum = 0;
 
@@ -50,13 +50,12 @@ void ipc_ns_record(void *priv, struct lttng_probe_ctx *probe_ctx,
 	if (current->nsproxy)
 		ipc_ns_inum = current->nsproxy->ipc_ns->lttng_ns_inum;
 
-	lib_ring_buffer_align_ctx(ctx, lttng_alignof(ipc_ns_inum));
-	chan->ops->event_write(ctx, &ipc_ns_inum, sizeof(ipc_ns_inum));
+	chan->ops->event_write(ctx, &ipc_ns_inum, sizeof(ipc_ns_inum), lttng_alignof(ipc_ns_inum));
 }
 
 static
 void ipc_ns_get_value(void *priv,
-		struct lttng_probe_ctx *lttng_probe_ctx,
+		struct lttng_kernel_probe_ctx *lttng_probe_ctx,
 		struct lttng_ctx_value *value)
 {
 	unsigned int ipc_ns_inum = 0;
@@ -77,7 +76,7 @@ void ipc_ns_get_value(void *priv,
 static const struct lttng_kernel_ctx_field *ctx_field = lttng_kernel_static_ctx_field(
 	lttng_kernel_static_event_field("ipc_ns",
 		lttng_kernel_static_type_integer_from_type(unsigned int, __BYTE_ORDER, 10),
-		false, false, false),
+		false, false),
 	ipc_ns_get_size,
 	ipc_ns_record,
 	ipc_ns_get_value,