Document last supported kernel version for stable-2.10 branch

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

diff --git a/probes/lttng.c b/probes/lttng.c
index 65f9061a641add2b413b70f5197a8936d1b8a7c8..a5524394351b85201b35e5379d8ac2ca5de01828 100644 (file)
--- a/probes/lttng.c
+++ b/probes/lttng.c
@@ -28,16 +28,17 @@
 #include <linux/proc_fs.h>
 #include <linux/slab.h>
 #include <linux/mm.h>
-#include "../wrapper/vmalloc.h"
-#include "../lttng-events.h"
+#include <wrapper/vmalloc.h>
+#include <lttng-events.h>
 
 #define TP_MODULE_NOAUTOLOAD
 #define LTTNG_PACKAGE_BUILD
 #define CREATE_TRACE_POINTS
-#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module
+#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module
 #define TRACE_INCLUDE_FILE lttng
+#define LTTNG_INSTRUMENTATION
 
-#include "../instrumentation/events/lttng-module/lttng.h"
+#include <instrumentation/events/lttng-module/lttng.h>
 
 /* Events written through logger are truncated at 1024 bytes */
 #define LTTNG_LOGGER_COUNT_MAX 1024
@@ -64,7 +65,7 @@ static
 ssize_t lttng_logger_write(struct file *file, const char __user *user_buf,
                    size_t count, loff_t *ppos)
 {
-       unsigned int nr_pages = 1, i;
+       int nr_pages = 1, i;
        unsigned long uaddr = (unsigned long) user_buf;
        struct page *pages[2];
        ssize_t written;
@@ -104,6 +105,18 @@ static const struct file_operations lttng_logger_operations = {
        .write = lttng_logger_write,
 };
 
+/*
+ * Linux 5.6 introduced a separate proc_ops struct for /proc operations
+ * to decouple it from the vfs.
+ */
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,6,0))
+static const struct proc_ops lttng_logger_proc_ops = {
+       .proc_write = lttng_logger_write,
+};
+#else
+#define lttng_logger_proc_ops lttng_logger_operations
+#endif
+
 int __init lttng_logger_init(void)
 {
        int ret = 0;
@@ -111,7 +124,7 @@ int __init lttng_logger_init(void)
        wrapper_vmalloc_sync_all();
        lttng_logger_dentry = proc_create_data(LTTNG_LOGGER_FILE,
                                S_IRUGO | S_IWUGO, NULL,
-                               &lttng_logger_operations, NULL);
+                               &lttng_logger_proc_ops, NULL);
        if (!lttng_logger_dentry) {
                printk(KERN_ERR "Error creating LTTng logger file\n");
                ret = -ENOMEM;
@@ -128,7 +141,7 @@ error:
        return ret;
 }
 
-void __exit lttng_logger_exit(void)
+void lttng_logger_exit(void)
 {
        __lttng_events_exit__lttng();
        if (lttng_logger_dentry)