Fix: _lttng_kernel_event_create never returns NULL

[lttng-modules.git] / src / lttng-syscalls.c

diff --git a/src/lttng-syscalls.c b/src/lttng-syscalls.c
index 1a6a492431b2b2b8f943bd1594601ffa19a4c85c..2e8324133d53ed069ec325bd29fd958ca6360d28 100644 (file)
--- a/src/lttng-syscalls.c
+++ b/src/lttng-syscalls.c
@@ -568,9 +568,9 @@ void lttng_syscall_event_enabler_create_event(struct lttng_event_enabler_common
                if (!event_recorder_enabler)
                        return;
                event = _lttng_kernel_event_create(&event_recorder_enabler->parent, desc);
-               WARN_ON_ONCE(!event || IS_ERR(event));
+               WARN_ON_ONCE(IS_ERR(event));
                lttng_event_enabler_destroy(&event_recorder_enabler->parent);
-               if (!event || IS_ERR(event)) {
+               if (IS_ERR(event)) {
                        printk(KERN_INFO "Unable to create event recorder %s\n", desc->event_name);
                        return;
                }
@@ -618,9 +618,9 @@ void lttng_syscall_event_enabler_create_event(struct lttng_event_enabler_common
                                &event_notifier_param, syscall_event_notifier_enabler->group);
                WARN_ON_ONCE(!event_notifier_enabler);
                event = _lttng_kernel_event_create(&event_notifier_enabler->parent, desc);
-               WARN_ON_ONCE(!event || IS_ERR(event));
+               WARN_ON_ONCE(IS_ERR(event));
                lttng_event_enabler_destroy(&event_notifier_enabler->parent);
-               if (!event || IS_ERR(event)) {
+               if (IS_ERR(event)) {
                        printk(KERN_INFO "Unable to create event notifier %s\n", desc->event_name);
                        return;
                }
@@ -815,8 +815,6 @@ int lttng_event_enabler_create_syscall_events_if_missing(struct lttng_event_enab
                        return -ENOMEM;
        }
 
-       lttng_syscall_event_enabler_create_matching_events(syscall_event_enabler);
-
        if (!syscall_table->sys_enter_registered) {
                ret = lttng_wrapper_tracepoint_probe_register("sys_enter",
                                (void *) syscall_entry_event_probe, syscall_table);
@@ -835,6 +833,8 @@ int lttng_event_enabler_create_syscall_events_if_missing(struct lttng_event_enab
                syscall_table->sys_exit_registered = 1;
        }
 
+       lttng_syscall_event_enabler_create_matching_events(syscall_event_enabler);
+
        return ret;
 }