X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=lttng-abi.c;h=4178d87724eed3b774a7978e831a514d50b7b088;hb=7456615b6fee0905435303ebb5d7c330cd4d068c;hp=79d6e7ffd1cb24ad242fe4d52fbe7c0065d02f62;hpb=5594698f9c8ad13e0964c67946d1867df7757dae;p=lttng-modules.git

diff --git a/lttng-abi.c b/lttng-abi.c
index 79d6e7ff..4178d877 100644
--- a/lttng-abi.c
+++ b/lttng-abi.c
@@ -130,10 +130,6 @@ int lttng_abi_tracepoint_list(void)
 	if (ret < 0)
 		goto open_error;
 	fd_install(file_fd, tracepoint_list_file);
-	if (file_fd < 0) {
-		ret = file_fd;
-		goto fd_error;
-	}
 	return file_fd;
 
 open_error:
@@ -174,10 +170,6 @@ int lttng_abi_syscall_list(void)
 	if (ret < 0)
 		goto open_error;
 	fd_install(file_fd, syscall_list_file);
-	if (file_fd < 0) {
-		ret = file_fd;
-		goto fd_error;
-	}
 	return file_fd;
 
 open_error:
@@ -1286,8 +1278,8 @@ int lttng_metadata_channel_release(struct inode *inode, struct file *file)
 	struct lttng_channel *channel = file->private_data;
 
 	if (channel) {
-		lttng_metadata_channel_destroy(channel);
 		fput(channel->session->file);
+		lttng_metadata_channel_destroy(channel);
 	}
 
 	return 0;