X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fust-consumer%2Fust-consumer.c;h=2963b16ed46caf222cfdc28eb1ab1518ad781e56;hb=6fa5fe7cc78bea0b0bba154a0f911d3df530e18f;hp=ee6f4f79b9147a9feb22e046b86402973382c19b;hpb=a8ffe2444f26010961b3b5c171775205f1a43a18;p=lttng-tools.git

diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c
index ee6f4f79b..2963b16ed 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:
 	{
@@ -3029,7 +3031,7 @@ end:
  * Stop a given metadata channel timer if enabled and close the wait fd which
  * is the poll pipe of the metadata stream.
  *
- * This MUST be called with the metadata channel acquired.
+ * This MUST be called with the metadata channel lock acquired.
  */
 void lttng_ustconsumer_close_metadata(struct lttng_consumer_channel *metadata)
 {