X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=lttng-sessiond%2Fcontext.c;h=51beb3fba2a60dbb857f7e378d79690499ab3387;hb=daf282ab93462198c6acd16b4aa624635df1bea5;hp=081e05430ba1e9b44c95b536fc9dd7152db991d0;hpb=6b79ed20f0e6d7aace483e2e4364083d2cfe838b;p=lttng-tools.git

diff --git a/lttng-sessiond/context.c b/lttng-sessiond/context.c
index 081e05430..51beb3fba 100644
--- a/lttng-sessiond/context.c
+++ b/lttng-sessiond/context.c
@@ -26,7 +26,7 @@
 #include <lttngerr.h>
 
 #include "context.h"
-#include "hashtable.h"
+#include "../common/hashtable.h"
 #include "kernel.h"
 #include "ust-app.h"
 #include "trace-ust.h"
@@ -280,7 +280,7 @@ int context_ust_add(struct ltt_ust_session *usess, int domain,
 		char *channel_name)
 {
 	int ret = LTTCOMM_OK, have_event = 0;
-	struct cds_lfht_iter iter, uiter;
+	struct cds_lfht_iter iter;
 	struct cds_lfht *chan_ht;
 	struct ltt_ust_channel *uchan = NULL;
 	struct ltt_ust_event *uevent = NULL;
@@ -349,6 +349,8 @@ int context_ust_add(struct ltt_ust_session *usess, int domain,
 	} else if (!uchan && !have_event) {	/* Add ctx all events, all channels */
 		/* For all channels */
 		cds_lfht_for_each_entry(chan_ht, &iter, uchan, node) {
+			struct cds_lfht_iter uiter;
+
 			ret = add_uctx_to_channel(usess, domain, uchan, ctx);
 			if (ret < 0) {
 				ERR("Context added to channel %s failed", uchan->name);