From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Tue, 27 Aug 2019 21:03:45 +0000 (-0400)
Subject: Use case-scope error labels handling LTTNG_CONSUMER_ROTATE_CHANNEL
X-Git-Tag: v2.11.0-rc3~54
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=c69b5db6ca0fdd83e11aadd4d4227d74a72df8c6;p=lttng-tools.git

Use case-scope error labels handling LTTNG_CONSUMER_ROTATE_CHANNEL

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 <jeremie.galarneau@efficios.com>
---

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:
 	{