X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fkernel.c;h=c377509ab4205dcba347ac97deec6ce2df478817;hp=eebe119d2701dc8e3875c9f5e2f482a0849fd452;hb=d79bd829001f60a92c9c88c857635b8543ccf7ef;hpb=1d25334cf088d661bac0643ccb50d1acc6d02e05

diff --git a/src/bin/lttng-sessiond/kernel.c b/src/bin/lttng-sessiond/kernel.c
index eebe119d2..c377509ab 100644
--- a/src/bin/lttng-sessiond/kernel.c
+++ b/src/bin/lttng-sessiond/kernel.c
@@ -769,14 +769,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;
 	}
 
@@ -805,15 +799,8 @@ int kernel_disable_event_notifier_rule(struct ltt_kernel_event_notifier_rule *ev
 
 	ret = kernctl_disable(event->fd);
 	if (ret < 0) {
-		switch (-ret) {
-		case EEXIST:
-			ret = LTTNG_ERR_KERN_EVENT_EXIST;
-			break;
-		default:
-			PERROR("Failed to disable kernel event notifier: fd = %d, token = %" PRIu64,
-					event->fd, event->token);
-			break;
-		}
+		PERROR("Failed to disable kernel event notifier: fd = %d, token = %" PRIu64,
+				event->fd, event->token);
 		goto error;
 	}
 
@@ -2036,6 +2023,7 @@ error_version:
 		PERROR("Failed to close kernel tracer file descriptor: fd = %d",
 				kernel_tracer_fd);
 	}
+
 	kernel_tracer_fd = -1;
 	return LTTNG_ERR_KERN_VERSION;
 
@@ -2047,6 +2035,8 @@ error_token_ht:
 				kernel_tracer_event_notifier_group_notification_fd);
 	}
 
+	kernel_tracer_event_notifier_group_notification_fd = -1;
+
 error_modules:
 	ret = close(kernel_tracer_event_notifier_group_fd);
 	if (ret) {
@@ -2054,12 +2044,16 @@ error_modules:
 				kernel_tracer_event_notifier_group_fd);
 	}
 
+	kernel_tracer_event_notifier_group_fd = -1;
+
 	ret = close(kernel_tracer_fd);
 	if (ret) {
 		PERROR("Failed to close kernel tracer file descriptor: fd = %d",
 				kernel_tracer_fd);
 	}
 
+	kernel_tracer_fd = -1;
+
 error_open:
 	modprobe_remove_lttng_control();