X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Flttng-abi.c;h=d4760561d73469741f093d96003e2e3cf8020419;hb=6b757027d2404725d3ae002ae682f4db878adfbb;hp=2fec42378c4a97f858af8c0c97b4e195e4a19ebf;hpb=1ae083ba1e1a1116fdc6119a01faa5320a4e2f2b;p=lttng-modules.git

diff --git a/src/lttng-abi.c b/src/lttng-abi.c
index 2fec4237..d4760561 100644
--- a/src/lttng-abi.c
+++ b/src/lttng-abi.c
@@ -1927,7 +1927,7 @@ int lttng_abi_create_event(struct file *channel_file,
 		 */
 		event = lttng_kernel_event_recorder_create(event_enabler, NULL);
 		WARN_ON_ONCE(!event);
-		lttng_event_enabler_destroy(event_enabler);
+		lttng_event_enabler_destroy(&event_enabler->parent);
 		if (IS_ERR(event)) {
 			ret = PTR_ERR(event);
 			goto event_error;
@@ -1987,12 +1987,11 @@ long lttng_event_notifier_enabler_ioctl(struct file *file, unsigned int cmd, uns
 
 	switch (cmd) {
 	case LTTNG_KERNEL_ABI_ENABLE:
-		return lttng_event_notifier_enabler_enable(event_notifier_enabler);
+		return lttng_event_enabler_enable(&event_notifier_enabler->parent);
 	case LTTNG_KERNEL_ABI_DISABLE:
-		return lttng_event_notifier_enabler_disable(event_notifier_enabler);
+		return lttng_event_enabler_disable(&event_notifier_enabler->parent);
 	case LTTNG_KERNEL_ABI_FILTER:
-		return lttng_event_notifier_enabler_attach_filter_bytecode(
-				event_notifier_enabler,
+		return lttng_event_enabler_attach_filter_bytecode(&event_notifier_enabler->parent,
 			(struct lttng_kernel_abi_filter_bytecode __user *) arg);
 	case LTTNG_KERNEL_ABI_CAPTURE:
 		return lttng_event_notifier_enabler_attach_capture_bytecode(
@@ -2528,10 +2527,10 @@ old_ctx_end:
 	}
 	case LTTNG_KERNEL_ABI_OLD_ENABLE:
 	case LTTNG_KERNEL_ABI_ENABLE:
-		return lttng_channel_enable(channel);
+		return lttng_channel_enable(&channel->parent);
 	case LTTNG_KERNEL_ABI_OLD_DISABLE:
 	case LTTNG_KERNEL_ABI_DISABLE:
-		return lttng_channel_disable(channel);
+		return lttng_channel_disable(&channel->parent);
 	case LTTNG_KERNEL_ABI_SYSCALL_MASK:
 		return lttng_channel_syscall_mask(channel,
 			(struct lttng_kernel_abi_syscall_mask __user *) arg);
@@ -2715,13 +2714,12 @@ long lttng_event_recorder_enabler_ioctl(struct file *file, unsigned int cmd, uns
 	}
 	case LTTNG_KERNEL_ABI_OLD_ENABLE:
 	case LTTNG_KERNEL_ABI_ENABLE:
-		return lttng_event_enabler_enable(event_enabler);
+		return lttng_event_enabler_enable(&event_enabler->parent);
 	case LTTNG_KERNEL_ABI_OLD_DISABLE:
 	case LTTNG_KERNEL_ABI_DISABLE:
-		return lttng_event_enabler_disable(event_enabler);
+		return lttng_event_enabler_disable(&event_enabler->parent);
 	case LTTNG_KERNEL_ABI_FILTER:
-		return lttng_event_enabler_attach_filter_bytecode(
-			event_enabler,
+		return lttng_event_enabler_attach_filter_bytecode(&event_enabler->parent,
 			(struct lttng_kernel_abi_filter_bytecode __user *) arg);
 	case LTTNG_KERNEL_ABI_ADD_CALLSITE:
 		return -EINVAL;