X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=6076830099847be986b91be5378d9846c63d63b2;hb=95e047ff8e01767e2e18b892f7a1ba9bf28abcbe;hp=384f8e68812387e8188ad7ef24af80f0b14641e4;hpb=321d0ee36e3c7f9d38647cb171f5760f4278c784;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index 384f8e688..607683009 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -2050,7 +2050,7 @@ int ust_app_create_channel_glb(struct ltt_ust_session *usess,
 		if (ua_sess == NULL) {
 			/* The malloc() failed. */
 			ret = -1;
-			goto error;
+			goto error_rcu_unlock;
 		} else if (ua_sess == (void *) -1UL) {
 			/* The application's socket is not valid. Contiuing */
 			ret = -1;
@@ -2062,13 +2062,12 @@ int ust_app_create_channel_glb(struct ltt_ust_session *usess,
 		if (ua_chan == NULL) {
 			/* Major problem here and it's maybe the tracer or malloc() */
 			ret = -1;
-			goto error;
+			goto error_rcu_unlock;
 		}
 	}
 
+error_rcu_unlock:
 	rcu_read_unlock();
-
-error:
 	return ret;
 }
 
@@ -2581,10 +2580,7 @@ void ust_app_global_update(struct ltt_ust_session *usess, int sock)
 	struct ust_app_event *ua_event;
 	struct ust_app_ctx *ua_ctx;
 
-	if (usess == NULL) {
-		ERR("No UST session on global update. Returning");
-		goto error;
-	}
+	assert(usess);
 
 	DBG2("UST app global update for app sock %d for session id %d", sock,
 			usess->id);