X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=9d5a668e5c5446983583f83907102a766db6f73c;hp=5d098d7689a10e8b80417e92ea2da7efd85f5eb2;hb=38303ec83b84d67c1a2a3b16c972c5a652798c8c;hpb=da9ee8323287d74fc2ec5477ecf83e61da36f5ce

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 5d098d768..9d5a668e5 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -6136,11 +6136,12 @@ exit_health_sessiond_cleanup:
 exit_create_run_as_worker_cleanup:
 
 exit_options:
+	/* Ensure all prior call_rcu are done. */
+	rcu_barrier();
+
 	sessiond_cleanup_options();
 
 exit_set_signal_handler:
-	/* Ensure all prior call_rcu are done. */
-	rcu_barrier();
 
 	if (!retval) {
 		exit(EXIT_SUCCESS);