X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flttng-abi.c;h=7eafe2d09ff1403738ce00442ac18f458dd73606;hb=44b1abdc77d0587d2b800584b7b6612a4fbcb96b;hp=72dc06034fe2f5b6c2e90f039b457e829a3551ef;hpb=def1e3046bc419e2a7dae84bc6abc1ea20cf1343;p=lttng-modules.git

diff --git a/src/lttng-abi.c b/src/lttng-abi.c
index 72dc0603..7eafe2d0 100644
--- a/src/lttng-abi.c
+++ b/src/lttng-abi.c
@@ -1887,17 +1887,17 @@ int lttng_abi_create_event(struct file *channel_file,
 		lttng_fallthrough;
 	case LTTNG_KERNEL_ABI_SYSCALL:
 	{
-		struct lttng_event_enabler *event_enabler;
+		struct lttng_event_recorder_enabler *event_enabler;
 
 		if (strutils_is_star_glob_pattern(event_param->name)) {
 			/*
 			 * If the event name is a star globbing pattern,
 			 * we create the special star globbing enabler.
 			 */
-			event_enabler = lttng_event_enabler_create(LTTNG_ENABLER_FORMAT_STAR_GLOB,
+			event_enabler = lttng_event_recorder_enabler_create(LTTNG_ENABLER_FORMAT_STAR_GLOB,
 				event_param, channel);
 		} else {
-			event_enabler = lttng_event_enabler_create(LTTNG_ENABLER_FORMAT_NAME,
+			event_enabler = lttng_event_recorder_enabler_create(LTTNG_ENABLER_FORMAT_NAME,
 				event_param, channel);
 		}
 		if (event_enabler)
@@ -1913,9 +1913,9 @@ int lttng_abi_create_event(struct file *channel_file,
 	case LTTNG_KERNEL_ABI_UPROBE:
 	{
 		struct lttng_kernel_event_recorder *event;
-		struct lttng_event_enabler *event_enabler;
+		struct lttng_event_recorder_enabler *event_enabler;
 
-		event_enabler = lttng_event_enabler_create(LTTNG_ENABLER_FORMAT_NAME,
+		event_enabler = lttng_event_recorder_enabler_create(LTTNG_ENABLER_FORMAT_NAME,
 				event_param, channel);
 		if (!event_enabler) {
 			ret = -ENOMEM;
@@ -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(
@@ -2700,7 +2699,7 @@ long lttng_event_recorder_event_ioctl(struct file *file, unsigned int cmd, unsig
 static
 long lttng_event_recorder_enabler_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
-	struct lttng_event_enabler *event_enabler = file->private_data;
+	struct lttng_event_recorder_enabler *event_enabler = file->private_data;
 
 	switch (cmd) {
 	case LTTNG_KERNEL_ABI_OLD_CONTEXT:
@@ -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;
@@ -2743,7 +2741,7 @@ int lttng_event_recorder_event_release(struct inode *inode, struct file *file)
 static
 int lttng_event_recorder_enabler_release(struct inode *inode, struct file *file)
 {
-	struct lttng_event_enabler *event_enabler = file->private_data;
+	struct lttng_event_recorder_enabler *event_enabler = file->private_data;
 
 	if (event_enabler)
 		fput(event_enabler->chan->priv->parent.file);