#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
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;
.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
+
int __init lttng_logger_init(void)
{
int ret = 0;
wrapper_vmalloc_sync_all();
lttng_logger_dentry = proc_create_data(LTTNG_LOGGER_FILE,
S_IRUGO | S_IWUGO, NULL,
- <tng_logger_operations, NULL);
+ <tng_logger_proc_ops, NULL);
if (!lttng_logger_dentry) {
printk(KERN_ERR "Error creating LTTng logger file\n");
ret = -ENOMEM;
return ret;
}
-void __exit lttng_logger_exit(void)
+void lttng_logger_exit(void)
{
__lttng_events_exit__lttng();
if (lttng_logger_dentry)