X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbin%2Flttng-sessiond%2Ftrace-ust.c;h=c8b3b72f91ca3343a9a507dd343d5447ea6eb323;hb=fc4705fe99b46c430112590c66abd74e4191c388;hp=5a8fc7dd988e300a70e6fd56b86b8a7bab6bae74;hpb=a2c0da862b4c3286fa919b96556bc30e8914e28b;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/trace-ust.c b/src/bin/lttng-sessiond/trace-ust.c
index 5a8fc7dd9..c8b3b72f9 100644
--- a/src/bin/lttng-sessiond/trace-ust.c
+++ b/src/bin/lttng-sessiond/trace-ust.c
@@ -85,8 +85,8 @@ error:
  *
  * Return pointer to structure or NULL.
  */
-struct ltt_ust_session *trace_ust_create_session(char *path, int session_id,
-		struct lttng_domain *domain)
+struct ltt_ust_session *trace_ust_create_session(char *path,
+		unsigned int session_id, struct lttng_domain *domain)
 {
 	int ret;
 	struct ltt_ust_session *lus;
@@ -459,8 +459,10 @@ static void destroy_channel_rcu(struct rcu_head *head)
  */
 void trace_ust_destroy_metadata(struct ltt_ust_metadata *metadata)
 {
+	if (!metadata->handle) {
+		return;
+	}
 	DBG2("Trace UST destroy metadata %d", metadata->handle);
-
 	free(metadata);
 }
 
@@ -542,7 +544,7 @@ void trace_ust_destroy_session(struct ltt_ust_session *session)
 
 	rcu_read_lock();
 
-	DBG2("Trace UST destroy session %d", session->id);
+	DBG2("Trace UST destroy session %u", session->id);
 
 	/* Cleaning up UST domain */
 	destroy_domain_global(&session->domain_global);