Fix possible NULL UST session on start trace

[lttng-tools.git] / lttng-sessiond / context.c

diff --git a/lttng-sessiond/context.c b/lttng-sessiond/context.c
index 41e33ec27634a56489be547ecff0b6e3381048d5..d36b3de80fe318b2b72eceb4ba3064cd6489639b 100644 (file)
--- a/lttng-sessiond/context.c
+++ b/lttng-sessiond/context.c
@@ -25,14 +25,6 @@
 #include <lttng-sessiond-comm.h>
 #include <lttngerr.h>
 
-#ifdef CONFIG_LTTNG_TOOLS_HAVE_UST
-#include <ust/lttng-ust-ctl.h>
-#include <ust/lttng-ust-abi.h>
-#else
-#include "lttng-ust-ctl.h"
-#include "lttng-ust-abi.h"
-#endif
-
 #include "context.h"
 #include "hashtable.h"
 #include "kernel-ctl.h"
@@ -283,16 +275,13 @@ static int add_ustctx_all_channels(struct ltt_ust_session *ustsession,
                }
                hashtable_get_next(channels, &iter);
        }
-       rcu_read_unlock();
-
        if (!found && !no_event) {
                ret = LTTCOMM_NO_EVENT;
                goto error;
        }
-
        ret = LTTCOMM_OK;
-
 error:
+       rcu_read_unlock();
        return ret;
 #endif
        return 0;