fix: proc: decouple proc from VFS with "struct proc_ops" (v5.6)

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

diff --git a/probes/lttng.c b/probes/lttng.c
index c883429fa2e3401b83fb87181557213c008bdb40..383202c68efd8f4f46c6dd30302de5e935f6c54f 100644 (file)
--- a/probes/lttng.c
+++ b/probes/lttng.c
@@ -93,6 +93,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 (LINUX_VERSION_CODE >= 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
+
 static struct miscdevice logger_dev = {
        .minor = MISC_DYNAMIC_MINOR,
        .name = "lttng-logger",
@@ -116,7 +128,7 @@ int __init lttng_logger_init(void)
        /* /proc/lttng-logger */
        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 proc file\n");
                ret = -ENOMEM;