X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fkernel.c;h=00172e80170c3089a9160bcd49ce8d72357107c0;hp=d52d9aa62f4e997b327fe2d1ec336ed5414392f8;hb=e3e57ea7c5b6379b0a2df41acbcacb731a6acdd9;hpb=2f77fc4b3720dc8f75847130498c2d4aad7c03ec

diff --git a/src/bin/lttng-sessiond/kernel.c b/src/bin/lttng-sessiond/kernel.c
index d52d9aa62..00172e801 100644
--- a/src/bin/lttng-sessiond/kernel.c
+++ b/src/bin/lttng-sessiond/kernel.c
@@ -66,35 +66,6 @@ error:
 	return ret;
 }
 
-/*
- * Add context on a kernel event.
- */
-int kernel_add_event_context(struct ltt_kernel_event *event,
-		struct lttng_kernel_context *ctx)
-{
-	int ret;
-
-	DBG("Adding context to event %s", event->event->name);
-	ret = kernctl_add_context(event->fd, ctx);
-	if (ret < 0) {
-		PERROR("add context ioctl");
-		goto error;
-	}
-
-	event->ctx = zmalloc(sizeof(struct lttng_kernel_context));
-	if (event->ctx == NULL) {
-		PERROR("zmalloc event context");
-		goto error;
-	}
-
-	memcpy(event->ctx, ctx, sizeof(struct lttng_kernel_context));
-
-	return 0;
-
-error:
-	return ret;
-}
-
 /*
  * Create a new kernel session, register it to the kernel tracer and add it to
  * the session daemon session.
@@ -125,6 +96,7 @@ int kernel_create_session(struct ltt_session *session, int tracer_fd)
 		PERROR("fcntl session fd");
 	}
 
+	lks->id = session->id;
 	lks->consumer_fds_sent = 0;
 	session->kernel_session = lks;
 
@@ -307,7 +279,7 @@ int kernel_enable_event(struct ltt_kernel_event *event)
 	if (ret < 0) {
 		switch (errno) {
 		case EEXIST:
-			ret = LTTCOMM_KERN_EVENT_EXIST;
+			ret = LTTNG_ERR_KERN_EVENT_EXIST;
 			break;
 		default:
 			PERROR("enable kernel event");
@@ -336,7 +308,7 @@ int kernel_disable_event(struct ltt_kernel_event *event)
 	if (ret < 0) {
 		switch (errno) {
 		case EEXIST:
-			ret = LTTCOMM_KERN_EVENT_EXIST;
+			ret = LTTNG_ERR_KERN_EVENT_EXIST;
 			break;
 		default:
 			PERROR("disable kernel event");