X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=ltt-sessiond%2Fkernel-ctl.c;h=ef3afb714bf1bebe6b96376f484f15044f2e4555;hb=b79f82bbde7fd1fb50a6820d5ffabdbe105941ed;hp=0b0fca836bd59b612b3ffbc4eda86f855b2f8954;hpb=99309957a01e3a42abb5081daeeac50729c0eec5;p=lttng-tools.git

diff --git a/ltt-sessiond/kernel-ctl.c b/ltt-sessiond/kernel-ctl.c
index 0b0fca836..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
@@ -209,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;
@@ -281,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;
 	}