Fix: Don't set filter if enable event fails

[lttng-tools.git] / src / bin / lttng-sessiond / ust-app.c

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index 4cae85d6e75719c4c1db5ca26c3627b2bdd2c803..fc0d53787dd6a5d0ff2d8fe9faf5714bc2362951 100644 (file)
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -25,6 +25,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <urcu/compiler.h>
+#include <lttng/ust-error.h>
 
 #include <common/common.h>
 #include <common/sessiond-comm/sessiond-comm.h>
@@ -711,10 +712,6 @@ int create_ust_event(struct ust_app *app, struct ust_app_session *ua_sess,
        ret = ustctl_create_event(app->sock, &ua_event->attr, ua_chan->obj,
                        &ua_event->obj);
        if (ret < 0) {
-               if (ret == -EEXIST || ret == -EPERM) {
-                       ret = 0;
-                       goto error;
-               }
                ERR("Error ustctl create event %s for app pid: %d with ret %d",
                                ua_event->attr.name, app->pid, ret);
                goto error;
@@ -1580,7 +1577,7 @@ int ust_app_list_events(struct lttng_event **events)
                }
 
                while ((ret = ustctl_tracepoint_list_get(app->sock, handle,
-                                               &uiter)) != -ENOENT) {
+                                       &uiter)) != -LTTNG_UST_ERR_NOENT) {
                        health_code_update(&health_thread_cmd);
                        if (count >= nbmem) {
                                /* In case the realloc fails, we free the memory */
@@ -1658,7 +1655,7 @@ int ust_app_list_event_fields(struct lttng_event_field **fields)
                }
 
                while ((ret = ustctl_tracepoint_field_list_get(app->sock, handle,
-                                               &uiter)) != -ENOENT) {
+                                       &uiter)) != -LTTNG_UST_ERR_NOENT) {
                        health_code_update(&health_thread_cmd);
                        if (count >= nbmem) {
                                /* In case the realloc fails, we free the memory */