Fix: sessiond: kernel: invalid error code check

[lttng-tools.git] / src / bin / lttng-sessiond / kernel.c

diff --git a/src/bin/lttng-sessiond/kernel.c b/src/bin/lttng-sessiond/kernel.c
index b5c4a5e1267b5ae5fbe95cd70723ed2afb5710ab..7795cad337eb996ee5ea67f1e2bf60a8bf25761b 100644 (file)
--- a/src/bin/lttng-sessiond/kernel.c
+++ b/src/bin/lttng-sessiond/kernel.c
@@ -16,6 +16,7 @@
  */
 
 #define _LGPL_SOURCE
+
 #include <fcntl.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -659,14 +660,8 @@ int kernel_disable_event(struct ltt_kernel_event *event)
 
        ret = kernctl_disable(event->fd);
        if (ret < 0) {
-               switch (-ret) {
-               case EEXIST:
-                       ret = LTTNG_ERR_KERN_EVENT_EXIST;
-                       break;
-               default:
-                       PERROR("disable kernel event");
-                       break;
-               }
+               PERROR("Failed to disable kernel event: name = '%s', fd = %d",
+                               event->event->name, event->fd);
                goto error;
        }
 
@@ -1443,9 +1438,10 @@ int kernel_supports_ring_buffer_packet_sequence_number(void)
        }
 
        /*
-        * Packet sequence number was introduced in 2.8
+        * Packet sequence number was introduced in LTTng 2.8,
+        * lttng-modules ABI 2.1.
         */
-       if (abi.major >= 2 && abi.minor >= 8) {
+       if (abi.major >= 2 && abi.minor >= 1) {
                /* Supported */
                ret = 1;
        } else {