lttng-abi: remove compatibility code

[lttng-modules.git] / lttng-abi.c

diff --git a/lttng-abi.c b/lttng-abi.c
index baaf34d31952a2b0db6b732fc0c580891a059b35..7723aec8596aef6d7fce1601dd3152180e81ba2f 100644 (file)
--- a/lttng-abi.c
+++ b/lttng-abi.c
@@ -30,12 +30,10 @@
 #include <linux/uaccess.h>
 #include <linux/slab.h>
 #include <linux/err.h>
+#include <linux/kref.h>
 #include <wrapper/ringbuffer/vfs.h>
 #include <wrapper/ringbuffer/backend.h>
 #include <wrapper/ringbuffer/frontend.h>
-#include <wrapper/poll.h>
-#include <wrapper/file.h>
-#include <wrapper/kref.h>
 #include <lttng-string-utils.h>
 #include <lttng-abi.h>
 #include <lttng-abi-old.h>
@@ -51,11 +49,7 @@
 
 static struct proc_dir_entry *lttng_proc_dentry;
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0))
 static const struct proc_ops lttng_proc_ops;
-#else
-static const struct file_operations lttng_proc_ops;
-#endif
 
 static const struct file_operations lttng_session_fops;
 static const struct file_operations lttng_channel_fops;
@@ -80,7 +74,7 @@ int lttng_abi_create_session(void)
        session = lttng_session_create();
        if (!session)
                return -ENOMEM;
-       session_fd = lttng_get_unused_fd();
+       session_fd = get_unused_fd_flags(0);
        if (session_fd < 0) {
                ret = session_fd;
                goto fd_error;
@@ -109,7 +103,7 @@ int lttng_abi_tracepoint_list(void)
        struct file *tracepoint_list_file;
        int file_fd, ret;
 
-       file_fd = lttng_get_unused_fd();
+       file_fd = get_unused_fd_flags(0);
        if (file_fd < 0) {
                ret = file_fd;
                goto fd_error;
@@ -149,7 +143,7 @@ int lttng_abi_syscall_list(void)
        struct file *syscall_list_file;
        int file_fd, ret;
 
-       file_fd = lttng_get_unused_fd();
+       file_fd = get_unused_fd_flags(0);
        if (file_fd < 0) {
                ret = file_fd;
                goto fd_error;
@@ -396,22 +390,12 @@ long lttng_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
        }
 }
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0))
 static const struct proc_ops lttng_proc_ops = {
        .proc_ioctl = lttng_ioctl,
 #ifdef CONFIG_COMPAT
        .proc_compat_ioctl = lttng_ioctl,
 #endif /* CONFIG_COMPAT */
 };
-#else
-static const struct file_operations lttng_proc_ops = {
-       .owner = THIS_MODULE,
-       .unlocked_ioctl = lttng_ioctl,
-#ifdef CONFIG_COMPAT
-       .compat_ioctl = lttng_ioctl,
-#endif /* CONFIG_COMPAT */
-};
-#endif
 
 static
 int lttng_abi_create_channel(struct file *session_file,
@@ -426,7 +410,7 @@ int lttng_abi_create_channel(struct file *session_file,
        int chan_fd;
        int ret = 0;
 
-       chan_fd = lttng_get_unused_fd();
+       chan_fd = get_unused_fd_flags(0);
        if (chan_fd < 0) {
                ret = chan_fd;
                goto fd_error;
@@ -777,7 +761,6 @@ unsigned int lttng_metadata_ring_buffer_poll(struct file *filp,
        unsigned int mask = 0;
 
        if (filp->f_mode & FMODE_READ) {
-               poll_wait_set_exclusive(wait);
                poll_wait(filp, &stream->read_wait, wait);
 
                finalized = stream->finalized;
@@ -1085,7 +1068,7 @@ int lttng_abi_create_stream_fd(struct file *channel_file, void *stream_priv,
        int stream_fd, ret;
        struct file *stream_file;
 
-       stream_fd = lttng_get_unused_fd();
+       stream_fd = get_unused_fd_flags(0);
        if (stream_fd < 0) {
                ret = stream_fd;
                goto fd_error;
@@ -1177,11 +1160,7 @@ int lttng_abi_open_metadata_stream(struct file *channel_file)
                goto notransport;
        }
 
-       if (!lttng_kref_get(&session->metadata_cache->refcount)) {
-               ret = -EOVERFLOW;
-               goto kref_error;
-       }
-
+       kref_get(&session->metadata_cache->refcount);
        ret = lttng_abi_create_stream_fd(channel_file, stream_priv,
                        &lttng_metadata_ring_buffer_file_operations);
        if (ret < 0)
@@ -1193,7 +1172,6 @@ int lttng_abi_open_metadata_stream(struct file *channel_file)
 
 fd_error:
        kref_put(&session->metadata_cache->refcount, metadata_cache_destroy);
-kref_error:
        module_put(metadata_stream->transport->owner);
 notransport:
        kfree(metadata_stream);
@@ -1226,7 +1204,7 @@ int lttng_abi_create_event(struct file *channel_file,
        default:
                break;
        }
-       event_fd = lttng_get_unused_fd();
+       event_fd = get_unused_fd_flags(0);
        if (event_fd < 0) {
                ret = event_fd;
                goto fd_error;
@@ -1510,7 +1488,6 @@ unsigned int lttng_channel_poll(struct file *file, poll_table *wait)
        unsigned int mask = 0;
 
        if (file->f_mode & FMODE_READ) {
-               poll_wait_set_exclusive(wait);
                poll_wait(file, channel->ops->get_hp_wait_queue(channel->chan),
                          wait);