Fix: sessiond ust-app session teardown race

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

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 2d49aae2da892e1c41a47472145590c9d622fc00..217d45a2577f8f67df59cb5d65093f96e6caad24 100644 (file)
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -1575,7 +1575,7 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
                if (!agt) {
                        agt = agent_create(domain->type);
                        if (!agt) {
-                               ret = -LTTNG_ERR_NOMEM;
+                               ret = LTTNG_ERR_NOMEM;
                                goto error;
                        }
                        agent_add(agt, usess->agents);
@@ -1587,7 +1587,7 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
                uevent.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
                default_event_name = event_get_default_agent_ust_name(domain->type);
                if (!default_event_name) {
-                       ret = -LTTNG_ERR_FATAL;
+                       ret = LTTNG_ERR_FATAL;
                        goto error;
                }
                strncpy(uevent.name, default_event_name, sizeof(uevent.name));
@@ -1616,6 +1616,7 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
                                        sizeof(struct lttng_filter_bytecode)
                                        + filter->len);
                                if (!filter_copy) {
+                                       ret = LTTNG_ERR_NOMEM;
                                        goto error;
                                }
 
@@ -3153,7 +3154,7 @@ int cmd_snapshot_record(struct ltt_session *session,
        int ret = LTTNG_OK;
        unsigned int use_tmp_output = 0;
        struct snapshot_output tmp_output;
-       unsigned int nb_streams, snapshot_success = 0;
+       unsigned int snapshot_success = 0;
 
        assert(session);
        assert(output);