X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fprobes%2Flttng-uprobes.c;h=fed3a1d5a2b4c9beefe4f787370398a38d44474f;hb=f5ffbd770ec2b9d1ac9b7059eb33a01432043bce;hp=b88aee13cb29a3a9d815d5302a11928f53eaa0df;hpb=6c8c025bf7552b6073c5c1884e1493badd842f42;p=lttng-modules.git

diff --git a/src/probes/lttng-uprobes.c b/src/probes/lttng-uprobes.c
index b88aee13..fed3a1d5 100644
--- a/src/probes/lttng-uprobes.c
+++ b/src/probes/lttng-uprobes.c
@@ -42,11 +42,11 @@ int lttng_uprobes_event_handler_pre(struct uprobe_consumer *uc, struct pt_regs *
 	{
 		struct lttng_kernel_event_recorder *event_recorder =
 			container_of(event, struct lttng_kernel_event_recorder, parent);
-		struct lttng_channel *chan = event_recorder->chan;
+		struct lttng_kernel_channel_buffer *chan = event_recorder->chan;
 
-		if (unlikely(!LTTNG_READ_ONCE(chan->session->active)))
+		if (unlikely(!LTTNG_READ_ONCE(chan->parent.session->active)))
 			return 0;
-		if (unlikely(!LTTNG_READ_ONCE(chan->enabled)))
+		if (unlikely(!LTTNG_READ_ONCE(chan->parent.enabled)))
 			return 0;
 		break;
 	}
@@ -64,7 +64,7 @@ int lttng_uprobes_event_handler_pre(struct uprobe_consumer *uc, struct pt_regs *
 	{
 		struct lttng_kernel_event_recorder *event_recorder =
 			container_of(event, struct lttng_kernel_event_recorder, parent);
-		struct lttng_channel *chan = event_recorder->chan;
+		struct lttng_kernel_channel_buffer *chan = event_recorder->chan;
 		struct lttng_kernel_ring_buffer_ctx ctx;
 		int ret;
 
@@ -78,8 +78,7 @@ int lttng_uprobes_event_handler_pre(struct uprobe_consumer *uc, struct pt_regs *
 		/* Event payload. */
 		payload.ip = (unsigned long)instruction_pointer(regs);
 
-		lib_ring_buffer_align_ctx(&ctx, lttng_alignof(payload));
-		chan->ops->event_write(&ctx, &payload, sizeof(payload));
+		chan->ops->event_write(&ctx, &payload, sizeof(payload), lttng_alignof(payload));
 		chan->ops->event_commit(&ctx);
 		break;
 	}