X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=lttng-sessiond%2Fcontext.c;h=c7c902197df34fa54143bec06dd437f8db5bf017;hp=41e33ec27634a56489be547ecff0b6e3381048d5;hb=6299f964b03eb3a3074dbe872907794d20da8af0;hpb=322585731ced1adba36cddcb8bdd5d997d1b2e3e

diff --git a/lttng-sessiond/context.c b/lttng-sessiond/context.c
index 41e33ec27..c7c902197 100644
--- a/lttng-sessiond/context.c
+++ b/lttng-sessiond/context.c
@@ -25,17 +25,9 @@
 #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"
+#include "kernel.h"
 
 /*
  * Add kernel context to an event of a specific channel.
@@ -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;