X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fkernel.c;h=03a358a0d3f1da9478ef220c3e93309298b469f7;hp=4e5216edcf3274acbc01937038b3fe8c52316fb7;hb=e8b1187d0ff0323106069738b2fff5c9e5a7d9bb;hpb=d602bd6a8ee25d5ca662dde4edb3db3cabf264e1

diff --git a/src/bin/lttng-sessiond/kernel.c b/src/bin/lttng-sessiond/kernel.c
index 4e5216edc..03a358a0d 100644
--- a/src/bin/lttng-sessiond/kernel.c
+++ b/src/bin/lttng-sessiond/kernel.c
@@ -28,8 +28,8 @@
 
 #include <lttng/userspace-probe.h>
 #include <lttng/userspace-probe-internal.h>
-#include <lttng/condition/event-rule.h>
-#include <lttng/condition/event-rule-internal.h>
+#include <lttng/condition/on-event.h>
+#include <lttng/condition/on-event-internal.h>
 #include <lttng/event-rule/event-rule.h>
 #include <lttng/event-rule/event-rule-internal.h>
 #include <lttng/event-rule/userspace-probe-internal.h>
@@ -2408,7 +2408,7 @@ static enum lttng_error_code kernel_create_event_notifier_rule(
 		if (capture_bytecode == NULL) {
 			ERR("Unexpected NULL capture bytecode on condition");
 			error_code_ret = LTTNG_ERR_KERN_ENABLE_FAIL;
-			goto error;
+			goto capture_error;
 		}
 
 		ret = kernctl_capture(event_notifier_rule->fd, capture_bytecode);
@@ -2416,7 +2416,7 @@ static enum lttng_error_code kernel_create_event_notifier_rule(
 			ERR("Failed to set capture bytecode on event notifier rule fd: fd = %d",
 					event_notifier_rule->fd);
 			error_code_ret = LTTNG_ERR_KERN_ENABLE_FAIL;
-			goto error;
+			goto capture_error;
 		}
 	}
 
@@ -2446,6 +2446,7 @@ static enum lttng_error_code kernel_create_event_notifier_rule(
 
 	return LTTNG_OK;
 
+capture_error:
 add_callsite_error:
 enable_error:
 set_cloexec_error: