X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=libust%2Flttng-ust-comm.c;h=7971168c638b2d14fdf0864ec3bb6a0b35ec840e;hb=4847e9bbec5a73140193185073437d95fdf15f30;hp=858e92c9b513c3bfb79a844e37d1cc315c1b968b;hpb=824f40b81426c6ac82685251018dae00947786a9;p=lttng-ust.git

diff --git a/libust/lttng-ust-comm.c b/libust/lttng-ust-comm.c
index 858e92c9..7971168c 100644
--- a/libust/lttng-ust-comm.c
+++ b/libust/lttng-ust-comm.c
@@ -39,6 +39,7 @@
 #include <urcu/futex.h>
 
 #include <lttng-ust-comm.h>
+#include <ust/lttng-events.h>
 #include <ust/usterr-signal-safe.h>
 #include <ust/lttng-ust-abi.h>
 #include <ust/tracepoint.h>
@@ -641,7 +642,7 @@ restart:
 	 */
 	if (sock_info->root_handle == -1) {
 		ret = lttng_abi_create_root_handle();
-		if (ret) {
+		if (ret < 0) {
 			ERR("Error creating root handle");
 			ust_unlock();
 			goto quit;
@@ -924,6 +925,7 @@ void ust_after_fork_child(ust_fork_info_t *fork_info)
 	/* Release urcu mutexes */
 	rcu_bp_after_fork_child();
 	lttng_ust_cleanup(0);
+	lttng_context_vtid_reset();
 	/* Release mutexes and reenable signals */
 	ust_after_fork_common(fork_info);
 	lttng_ust_init();