X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fsession.c;h=bec521ab593ac493e1cba2b12678cc060bd3bcf3;hb=44a2fbf116008c62184cc12f144fc69d29d7f606;hp=f76fb4a42e7606b8ebfea427033b00e3de192020;hpb=0b83088a1cb26291facf0ab2c0e2b4cac207f5bb;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/session.c b/src/bin/lttng-relayd/session.c
index f76fb4a42..bec521ab5 100644
--- a/src/bin/lttng-relayd/session.c
+++ b/src/bin/lttng-relayd/session.c
@@ -194,16 +194,8 @@ int session_close(struct relay_session *session)
 	pthread_mutex_lock(&session->lock);
 	DBG("closing session %" PRIu64 ": is conn already closed %d",
 			session->id, session->connection_closed);
-	if (session->connection_closed) {
-		ret = -1;
-		goto unlock;
-	}
 	session->connection_closed = true;
-unlock:
 	pthread_mutex_unlock(&session->lock);
-	if (ret) {
-		return ret;
-	}
 
 	rcu_read_lock();
 	cds_lfht_for_each_entry(session->ctf_traces_ht->ht,
@@ -238,13 +230,7 @@ int session_abort(struct relay_session *session)
 
 	pthread_mutex_lock(&session->lock);
 	DBG("aborting session %" PRIu64, session->id);
-	if (session->aborted) {
-		ERR("session %" PRIu64 " is already aborted", session->id);
-		ret = -1;
-		goto unlock;
-	}
 	session->aborted = true;
-unlock:
 	pthread_mutex_unlock(&session->lock);
 	return ret;
 }