wrapper: remove file.h wrapper

diff --git a/lib/ringbuffer/ring_buffer_iterator.c b/lib/ringbuffer/ring_buffer_iterator.c
index 382a477de2ce82ff4505fa49478432867166a0fa..df09aabc1afc49fb936e1ece33948dbcd008bc02 100644 (file)
--- a/lib/ringbuffer/ring_buffer_iterator.c
+++ b/lib/ringbuffer/ring_buffer_iterator.c
@@ -10,7 +10,7 @@
  */
 
 #include <wrapper/ringbuffer/iterator.h>
-#include <wrapper/file.h>
+#include <linux/file.h>
 #include <linux/uaccess.h>
 #include <linux/jiffies.h>
 #include <linux/delay.h>
@@ -722,7 +722,7 @@ ssize_t lib_ring_buffer_file_read(struct file *filp,
                                  size_t count,
                                  loff_t *ppos)
 {
-       struct inode *inode = filp->lttng_f_dentry->d_inode;
+       struct inode *inode = filp->f_path.dentry->d_inode;
        struct lib_ring_buffer *buf = inode->i_private;
        struct channel *chan = buf->backend.chan;
 
@@ -747,7 +747,7 @@ ssize_t channel_file_read(struct file *filp,
                          size_t count,
                          loff_t *ppos)
 {
-       struct inode *inode = filp->lttng_f_dentry->d_inode;
+       struct inode *inode = filp->f_path.dentry->d_inode;
        struct channel *chan = inode->i_private;
        const struct lib_ring_buffer_config *config = &chan->backend.config;
 

diff --git a/lttng-abi.c b/lttng-abi.c
index 724d4f428a412ac7d3f74a935ecf15e890bc720f..fb970a6926ce0eec2d61199f8dedc470ad9eab1f 100644 (file)
--- a/lttng-abi.c
+++ b/lttng-abi.c
@@ -34,7 +34,6 @@
 #include <wrapper/ringbuffer/vfs.h>
 #include <wrapper/ringbuffer/backend.h>
 #include <wrapper/ringbuffer/frontend.h>
-#include <wrapper/file.h>
 #include <lttng-string-utils.h>
 #include <lttng-abi.h>
 #include <lttng-abi-old.h>
@@ -79,7 +78,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;
@@ -108,7 +107,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;
@@ -148,7 +147,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;
@@ -425,7 +424,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;
@@ -1083,7 +1082,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;
@@ -1219,7 +1218,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;

diff --git a/lttng-events.c b/lttng-events.c
index c16cff803d94d3ef0b0fec1717a2dcb452682054..24e817bd47d4d8c1cee894e4e34653b0f47d1d24 100644 (file)
--- a/lttng-events.c
+++ b/lttng-events.c
@@ -23,7 +23,6 @@
 #include <linux/seq_file.h>
 #include <linux/file.h>
 #include <linux/anon_inodes.h>
-#include <wrapper/file.h>
 #include <linux/jhash.h>
 #include <linux/uaccess.h>
 #include <linux/uuid.h>
@@ -1139,7 +1138,7 @@ int lttng_session_list_tracker_ids(struct lttng_session *session,
        struct seq_file *m;
        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;

diff --git a/lttng-statedump-impl.c b/lttng-statedump-impl.c
index 52f7c48b282322344ebc20449b647ddd2a68a9cd..07ffbf7f461f6397dcb2a3218585e409ac317e52 100644 (file)
--- a/lttng-statedump-impl.c
+++ b/lttng-statedump-impl.c
@@ -39,7 +39,6 @@
 #include <lttng-tracer.h>
 #include <wrapper/namespace.h>
 #include <wrapper/genhd.h>
-#include <wrapper/file.h>
 
 /* Define the tracepoints, but do not build the probes */
 #define CREATE_TRACE_POINTS
@@ -306,7 +305,7 @@ void lttng_enumerate_task_vm_maps(struct lttng_session *session,
                down_read(&mm->mmap_sem);
                while (map) {
                        if (map->vm_file)
-                               ino = map->vm_file->lttng_f_dentry->d_inode->i_ino;
+                               ino = map->vm_file->f_path.dentry->d_inode->i_ino;
                        else
                                ino = 0;
                        trace_lttng_statedump_vm_map(session, p, map, ino);

diff --git a/lttng-syscalls.c b/lttng-syscalls.c
index e1f1809808573367b701b62cfe9a90d4af8e075c..bdbaa5e9536462ac8ed1179be569b9a802822e1e 100644 (file)
--- a/lttng-syscalls.c
+++ b/lttng-syscalls.c
@@ -23,7 +23,6 @@
 #include <asm/syscall.h>
 
 #include <lib/bitfield.h>
-#include <wrapper/file.h>
 #include <wrapper/rcu.h>
 #include <wrapper/syscall.h>
 #include <lttng-events.h>
@@ -1295,7 +1294,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;

diff --git a/wrapper/file.h b/wrapper/file.h
deleted file mode 100644 (file)
index b179995..0000000
--- a/wrapper/file.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
- *
- * wrapper/file.h
- *
- * wrapper around linux/file.h.
- *
- * Copyright (C) 2014 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- */
-
-#ifndef _LTTNG_WRAPPER_FILE_H
-#define _LTTNG_WRAPPER_FILE_H
-
-#include <linux/version.h>
-#include <linux/file.h>
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0)
-
-static
-inline int lttng_get_unused_fd(void)
-{
-       return get_unused_fd_flags(0);
-}
-
-#define lttng_f_dentry f_path.dentry
-
-#else /* #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0) */
-
-static
-inline int lttng_get_unused_fd(void)
-{
-       return get_unused_fd();
-}
-
-#define lttng_f_dentry f_dentry
-
-#endif /* #else #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0) */
-
-#endif /* _LTTNG_WRAPPER_FILE_H */