X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fchannel.c;h=302d3c9e569039910cd8712cfd576190206afe12;hb=5d9fd66023eef5c17862bccb221b9c31ad95e33e;hp=88480c4b4e7b78fd63a2edc744618eadba0c36bc;hpb=4d3350dd504d64cb10770c683848afd04a5817ea;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/channel.c b/src/bin/lttng-sessiond/channel.c
index 88480c4b4..302d3c9e5 100644
--- a/src/bin/lttng-sessiond/channel.c
+++ b/src/bin/lttng-sessiond/channel.c
@@ -300,6 +300,7 @@ int channel_ust_create(struct ltt_ust_session *usess,
 	struct ltt_ust_channel *uchan = NULL;
 	struct lttng_channel *defattr = NULL;
 	enum lttng_domain_type domain = LTTNG_DOMAIN_UST;
+	bool chan_published = false;
 
 	assert(usess);
 
@@ -434,6 +435,7 @@ int channel_ust_create(struct ltt_ust_session *usess,
 	if (strncmp(uchan->name, DEFAULT_METADATA_NAME,
 				sizeof(uchan->name))) {
 		lttng_ht_add_unique_str(usess->domain_global.channels, &uchan->node);
+		chan_published = true;
 	} else {
 		/*
 		 * Copy channel attribute to session if this is metadata so if NO
@@ -453,7 +455,7 @@ int channel_ust_create(struct ltt_ust_session *usess,
 			agt = agent_create(domain);
 			if (!agt) {
 				ret = LTTNG_ERR_NOMEM;
-				goto error_free_chan;
+				goto error_remove_chan;
 			}
 			agent_add(agt, usess->agents);
 		}
@@ -462,11 +464,11 @@ int channel_ust_create(struct ltt_ust_session *usess,
 	free(defattr);
 	return LTTNG_OK;
 
+error_remove_chan:
+	if (chan_published) {
+		trace_ust_delete_channel(usess->domain_global.channels, uchan);
+	}
 error_free_chan:
-	/*
-	 * No need to remove the channel from the hash table because at this point
-	 * it was not added hence the direct call and no call_rcu().
-	 */
 	trace_ust_destroy_channel(uchan);
 error:
 	free(defattr);