X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftimer.c;h=fa5e95cf194721bd5ff812ad1ea67fac9a312608;hb=4a224750266970206a160541f575cf12c361968f;hp=4bff7bd76cea0497c311f12b7026b0142761710c;hpb=8b0602a9ee1a03ec24ac46d95ec051fb2be0c6e4;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/timer.c b/src/bin/lttng-sessiond/timer.c
index 4bff7bd76..fa5e95cf1 100644
--- a/src/bin/lttng-sessiond/timer.c
+++ b/src/bin/lttng-sessiond/timer.c
@@ -248,6 +248,7 @@ int timer_session_rotation_pending_check_stop(struct ltt_session *session)
 	int ret;
 
 	assert(session);
+	assert(session->rotation_pending_check_timer_enabled);
 
 	DBG("Disabling session rotation pending check timer on session %" PRIu64,
 			session->id);
@@ -390,9 +391,6 @@ void *timer_thread_func(void *data)
 			rotation_thread_enqueue_job(ctx->rotation_thread_job_queue,
 					ROTATION_THREAD_JOB_TYPE_CHECK_PENDING_ROTATION,
 					session);
-			session_lock_list();
-			session_put(session);
-			session_unlock_list();
 		} else if (signr == LTTNG_SESSIOND_SIG_SCHEDULED_ROTATION) {
 			rotation_thread_enqueue_job(ctx->rotation_thread_job_queue,
 					ROTATION_THREAD_JOB_TYPE_SCHEDULED_ROTATION,