From 41c7a76dffd503f0e4677bc8f88633318066d888 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Tue, 27 Aug 2019 17:03:45 -0400 Subject: [PATCH] Use case-scope error labels handling LTTNG_CONSUMER_ROTATE_CHANNEL MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This cleans-up the error handling of the case handling the LTTNG_CONSUMER_ROTATE_CHANNEL command. This is done in order to allow a follow-up commit to perform some common clean-up operations on error while introducing as few changes as possible. No behaviour change is intended. Signed-off-by: Jérémie Galarneau --- src/common/ust-consumer/ust-consumer.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c index ee6f4f79b..04d7efe54 100644 --- a/src/common/ust-consumer/ust-consumer.c +++ b/src/common/ust-consumer/ust-consumer.c @@ -1984,7 +1984,7 @@ error_push_metadata_fatal: ret = consumer_send_status_msg(sock, ret_code); if (ret < 0) { /* Somehow, the session daemon is not responding anymore. */ - goto end_nosignal; + goto end_rotate_channel_nosignal; } /* @@ -2002,6 +2002,8 @@ error_push_metadata_fatal: } } break; +end_rotate_channel_nosignal: + goto end_nosignal; } case LTTNG_CONSUMER_INIT: { -- 2.34.1