X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Fprobes%2Flttng-test.c;h=e3476393fe2753d541a9015b049d6a32ef690acf;hb=52cb3b849cde399f68fa47d53010431803b8d93a;hp=42e48cf2be41ade450d2e2a3a989bfbe924f35a7;hpb=9f36eaed6f91d5897924b551b44d1edd8cee00e2;p=lttng-modules.git diff --git a/tests/probes/lttng-test.c b/tests/probes/lttng-test.c index 42e48cf2..e3476393 100644 --- a/tests/probes/lttng-test.c +++ b/tests/probes/lttng-test.c @@ -16,7 +16,6 @@ #include #include #include -#include #define TP_MODULE_NOAUTOLOAD #define LTTNG_PACKAGE_BUILD @@ -69,7 +68,7 @@ ssize_t lttng_test_filter_event_write(struct file *file, const char __user *user int ret; /* Get the number of iterations */ - ret = lttng_kstrtouint_from_user(user_buf, count, 10, &nr_iter); + ret = kstrtouint_from_user(user_buf, count, 10, &nr_iter); if (ret) { written = ret; goto end; @@ -82,9 +81,15 @@ end: return written; } -static const struct file_operations lttng_test_filter_event_operations = { +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0)) +static const struct proc_ops lttng_test_filter_event_proc_ops = { + .proc_write = lttng_test_filter_event_write, +}; +#else +static const struct file_operations lttng_test_filter_event_proc_ops = { .write = lttng_test_filter_event_write, }; +#endif static int __init lttng_test_init(void) @@ -96,7 +101,7 @@ int __init lttng_test_init(void) lttng_test_filter_event_dentry = proc_create_data(LTTNG_TEST_FILTER_EVENT_FILE, S_IRUGO | S_IWUGO, NULL, - <tng_test_filter_event_operations, NULL); + <tng_test_filter_event_proc_ops, NULL); if (!lttng_test_filter_event_dentry) { printk(KERN_ERR "Error creating LTTng test filter file\n"); ret = -ENOMEM;