X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fkernel.c;h=edb7f7b2f2f3f83efd53ac077f005b26388d52d9;hp=4327db24bdb3291f575da0d90c143e280c7bdbfa;hb=9a6545985844978f34f88b82bf1bcd649968c0a3;hpb=45798a31cc31b86a669221676ab490c035c8dfdd

diff --git a/src/bin/lttng-sessiond/kernel.c b/src/bin/lttng-sessiond/kernel.c
index 4327db24b..edb7f7b2f 100644
--- a/src/bin/lttng-sessiond/kernel.c
+++ b/src/bin/lttng-sessiond/kernel.c
@@ -1233,13 +1233,14 @@ void kernel_destroy_channel(struct ltt_kernel_channel *kchan)
 /*
  * Take a snapshot for a given kernel session.
  *
- * Return 0 on success or else return a LTTNG_ERR code.
+ * Return LTTNG_OK on success or else return a LTTNG_ERR code.
  */
-int kernel_snapshot_record(struct ltt_kernel_session *ksess,
+enum lttng_error_code kernel_snapshot_record(struct ltt_kernel_session *ksess,
 		struct snapshot_output *output, int wait,
 		uint64_t nb_packets_per_stream)
 {
 	int err, ret, saved_metadata_fd;
+	enum lttng_error_code status = LTTNG_OK;
 	struct consumer_socket *socket;
 	struct lttng_ht_iter iter;
 	struct ltt_kernel_metadata *saved_metadata;
@@ -1266,13 +1267,13 @@ int kernel_snapshot_record(struct ltt_kernel_session *ksess,
 
 	ret = kernel_open_metadata(ksess);
 	if (ret < 0) {
-		ret = LTTNG_ERR_KERN_META_FAIL;
+		status = LTTNG_ERR_KERN_META_FAIL;
 		goto error;
 	}
 
 	ret = kernel_open_metadata_stream(ksess);
 	if (ret < 0) {
-		ret = LTTNG_ERR_KERN_META_FAIL;
+		status = LTTNG_ERR_KERN_META_FAIL;
 		goto error_open_stream;
 	}
 
@@ -1296,19 +1297,18 @@ int kernel_snapshot_record(struct ltt_kernel_session *ksess,
 		/* Put back the saved consumer output into the session. */
 		ksess->consumer = saved_output;
 		if (ret < 0) {
-			ret = LTTNG_ERR_KERN_CONSUMER_FAIL;
+			status = LTTNG_ERR_KERN_CONSUMER_FAIL;
 			goto error_consumer;
 		}
 
 		/* For each channel, ask the consumer to snapshot it. */
 		cds_list_for_each_entry(chan, &ksess->channel_list.head, list) {
-			ret = consumer_snapshot_channel(socket, chan->key, output, 0,
+			status = consumer_snapshot_channel(socket, chan->key, output, 0,
 					ksess->uid, ksess->gid,
 					DEFAULT_KERNEL_TRACE_DIR, wait,
 					nb_packets_per_stream,
 					trace_archive_id);
-			if (ret < 0) {
-				ret = LTTNG_ERR_KERN_CONSUMER_FAIL;
+			if (status != LTTNG_OK) {
 				(void) kernel_consumer_destroy_metadata(socket,
 						ksess->metadata);
 				goto error_consumer;
@@ -1316,12 +1316,11 @@ int kernel_snapshot_record(struct ltt_kernel_session *ksess,
 		}
 
 		/* Snapshot metadata, */
-		ret = consumer_snapshot_channel(socket, ksess->metadata->key, output,
+		status = consumer_snapshot_channel(socket, ksess->metadata->key, output,
 				1, ksess->uid, ksess->gid,
 				DEFAULT_KERNEL_TRACE_DIR, wait, 0,
 				trace_archive_id);
-		if (ret < 0) {
-			ret = LTTNG_ERR_KERN_CONSUMER_FAIL;
+		if (status != LTTNG_OK) {
 			goto error_consumer;
 		}
 
@@ -1332,8 +1331,6 @@ int kernel_snapshot_record(struct ltt_kernel_session *ksess,
 		(void) kernel_consumer_destroy_metadata(socket, ksess->metadata);
 	}
 
-	ret = LTTNG_OK;
-
 error_consumer:
 	/* Close newly opened metadata stream. It's now on the consumer side. */
 	err = close(ksess->metadata_stream_fd);
@@ -1349,7 +1346,7 @@ error:
 	ksess->metadata_stream_fd = saved_metadata_fd;
 
 	rcu_read_unlock();
-	return ret;
+	return status;
 }
 
 /*