wrapper: remove irq wrapper

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

diff --git a/lttng-abi.c b/lttng-abi.c
index 590945c4e8ee146dd52184b0413e6cdd1a326ee1..724d4f428a412ac7d3f74a935ecf15e890bc720f 100644 (file)
--- a/lttng-abi.c
+++ b/lttng-abi.c
@@ -30,13 +30,11 @@
 #include <linux/uaccess.h>
 #include <linux/slab.h>
 #include <linux/err.h>
-#include <wrapper/vmalloc.h>   /* for wrapper_vmalloc_sync_all() */
+#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>
@@ -778,7 +776,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;
@@ -1178,11 +1175,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)
@@ -1194,7 +1187,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);
@@ -1511,7 +1503,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);
 
@@ -1938,7 +1929,6 @@ int __init lttng_abi_init(void)
 {
        int ret = 0;
 
-       wrapper_vmalloc_sync_all();
        lttng_clock_ref();
 
        ret = lttng_tp_mempool_init();