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

diff --git a/src/bin/lttng-sessiond/kernel.c b/src/bin/lttng-sessiond/kernel.c
index be263943f..4327db24b 100644
--- a/src/bin/lttng-sessiond/kernel.c
+++ b/src/bin/lttng-sessiond/kernel.c
@@ -1401,11 +1401,12 @@ error:
 /*
  * Rotate a kernel session.
  *
- * Return 0 on success or else return a LTTNG_ERR code.
+ * Return LTTNG_OK on success or else an LTTng error code.
  */
-int kernel_rotate_session(struct ltt_session *session)
+enum lttng_error_code kernel_rotate_session(struct ltt_session *session)
 {
 	int ret;
+	enum lttng_error_code status = LTTNG_OK;
 	struct consumer_socket *socket;
 	struct lttng_ht_iter iter;
 	struct ltt_kernel_session *ksess = session->kernel_session;
@@ -1436,7 +1437,7 @@ int kernel_rotate_session(struct ltt_session *session)
 					/* is_metadata_channel */ false,
 					session->current_archive_id);
 			if (ret < 0) {
-				ret = LTTNG_ERR_KERN_CONSUMER_FAIL;
+				status = LTTNG_ERR_KERN_CONSUMER_FAIL;
 				goto error;
 			}
 		}
@@ -1450,14 +1451,12 @@ int kernel_rotate_session(struct ltt_session *session)
 				/* is_metadata_channel */ true,
 				session->current_archive_id);
 		if (ret < 0) {
-			ret = LTTNG_ERR_KERN_CONSUMER_FAIL;
+			status = LTTNG_ERR_KERN_CONSUMER_FAIL;
 			goto error;
 		}
 	}
 
-	ret = LTTNG_OK;
-
 error:
 	rcu_read_unlock();
-	return ret;
+	return status;
 }