X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=ltt-sessiond%2Fkernel-ctl.c;h=ef3afb714bf1bebe6b96376f484f15044f2e4555;hp=ea3c8b2835f0e0c3b8fa3ab91df78914a35553a7;hb=cbbbb2757f90ecfc8bc2f51ba5bad8ed614577bb;hpb=58a97671d5fa65f93126798ded9e5306e3555186

diff --git a/ltt-sessiond/kernel-ctl.c b/ltt-sessiond/kernel-ctl.c
index ea3c8b283..ef3afb714 100644
--- a/ltt-sessiond/kernel-ctl.c
+++ b/ltt-sessiond/kernel-ctl.c
@@ -3,8 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation; only version 2
+ * of the License.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -25,7 +25,6 @@
 #include <unistd.h>
 
 #include "lttngerr.h"
-#include "ltt-sessiond.h"
 #include "libkernelctl.h"
 #include "kernel-ctl.h"
 
@@ -125,7 +124,6 @@ int kernel_create_session(struct ltt_session *session, int tracer_fd)
 
 	lks->kconsumer_fds_sent = 0;
 	session->kernel_session = lks;
-	session->kern_session_count++;
 
 	DBG("Kernel session created (fd: %d)", lks->fd);
 
@@ -211,6 +209,8 @@ int kernel_create_event(struct lttng_event *ev, struct ltt_kernel_channel *chann
 
 	/* Add event to event list */
 	cds_list_add(&event->list, &channel->events_list.head);
+	channel->event_count++;
+
 	DBG("Event %s created (fd: %d)", ev->name, event->fd);
 
 	return 0;
@@ -283,6 +283,9 @@ int kernel_enable_event(struct ltt_kernel_event *event)
 	ret = kernctl_enable(event->fd);
 	if (ret < 0) {
 		perror("enable event ioctl");
+		if (errno == EEXIST) {
+			ret = -EEXIST;
+		}
 		goto error;
 	}