Update version to 2.0-pre3

[lttng-tools.git] / ltt-sessiond / kernel-ctl.c

diff --git a/ltt-sessiond/kernel-ctl.c b/ltt-sessiond/kernel-ctl.c
index ea3c8b2835f0e0c3b8fa3ab91df78914a35553a7..1af82d9de3086ec0343158d5f6f9d9e1ce731c49 100644 (file)
--- 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);
 
@@ -283,6 +281,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;
        }