Version 2.12.17

[lttng-modules.git] / probes / lttng-uprobes.c

diff --git a/probes/lttng-uprobes.c b/probes/lttng-uprobes.c
index bc1012895f958b48a1542443432ed7162b5bbbc7..acb2627af029b83337556c9150f6f1133a2f4d00 100644 (file)
--- a/probes/lttng-uprobes.c
+++ b/probes/lttng-uprobes.c
@@ -9,7 +9,7 @@
  *
  */
 
-#include <linux/fdtable.h>
+#include <wrapper/fdtable.h>
 #include <linux/list.h>
 #include <linux/module.h>
 #include <linux/namei.h>
@@ -40,11 +40,11 @@ int lttng_uprobes_handler_pre(struct uprobe_consumer *uc, struct pt_regs *regs)
                unsigned long ip;
        } payload;
 
-       if (unlikely(!READ_ONCE(chan->session->active)))
+       if (unlikely(!LTTNG_READ_ONCE(chan->session->active)))
                return 0;
-       if (unlikely(!READ_ONCE(chan->enabled)))
+       if (unlikely(!LTTNG_READ_ONCE(chan->enabled)))
                return 0;
-       if (unlikely(!READ_ONCE(event->enabled)))
+       if (unlikely(!LTTNG_READ_ONCE(event->enabled)))
                return 0;
 
        lib_ring_buffer_ctx_init(&ctx, chan->chan, &lttng_probe_ctx,
@@ -126,7 +126,7 @@ static struct inode *get_inode_from_fd(int fd)
         * Returns the file backing the given fd. Needs to be done inside an RCU
         * critical section.
         */
-       file = fcheck(fd);
+       file = lttng_lookup_fd_rcu(fd);
        if (file == NULL) {
                printk(KERN_WARNING "Cannot access file backing the fd(%d)\n", fd);
                inode = NULL;