X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fsession.c;h=383c6fde714c229f5adccd5c2abcf8c3c1fd5211;hb=b2f4c4fadc015bd2506d6940082a61683e565f1a;hp=2e39c43174ed21720090268e73882849555622d0;hpb=7f13b97cfd2a9b89efd581eaba80aa5ba3358acf;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/session.c b/src/bin/lttng-sessiond/session.c
index 2e39c4317..383c6fde7 100644
--- a/src/bin/lttng-sessiond/session.c
+++ b/src/bin/lttng-sessiond/session.c
@@ -423,7 +423,7 @@ int _session_set_trace_chunk_no_lock_check(struct ltt_session *session,
 		struct lttng_trace_chunk *new_trace_chunk,
 		struct lttng_trace_chunk **_current_trace_chunk)
 {
-	int ret;
+	int ret = 0;
 	unsigned int i, refs_to_acquire = 0, refs_acquired = 0, refs_to_release = 0;
 	struct cds_lfht_iter iter;
 	struct consumer_socket *socket;
@@ -811,7 +811,6 @@ void session_release(struct urcu_ref *ref)
 
 	DBG("Destroying session %s (id %" PRIu64 ")", session->name, session->id);
 
-	consumer_output_put(session->consumer);
 	snapshot_destroy(&session->snapshot);
 
 	pthread_mutex_destroy(&session->lock);
@@ -823,6 +822,7 @@ void session_release(struct urcu_ref *ref)
 	}
 	session_notify_destruction(session);
 
+	consumer_output_put(session->consumer);
 	kernel_free_session(ksess);
 	session->kernel_session = NULL;
 	if (usess) {
@@ -1163,7 +1163,7 @@ int session_access_ok(struct ltt_session *session, uid_t uid, gid_t gid)
  *
  * Be careful of the result passed to this function. For instance,
  * on failure to launch a rotation, a client will expect the rotation
- * state to be set to "NO_ROTATION". If an error occured while the
+ * state to be set to "NO_ROTATION". If an error occurred while the
  * rotation was "ONGOING", result should be set to "ERROR", which will
  * allow a client to report it.
  *