X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=lttng-abi.c;h=ecc040e5c96e5f727c8ab133e882dd94c4ce732e;hb=e362ba5eec0233e2fa978cc2df8cc36fb34bda35;hp=7cf6b0f4aeafdb88a769142e7213256e07874685;hpb=ee51d6fe83fdd5e72190e2d9d1422b5bee2c3d1f;p=lttng-modules.git

diff --git a/lttng-abi.c b/lttng-abi.c
index 7cf6b0f4..ecc040e5 100644
--- a/lttng-abi.c
+++ b/lttng-abi.c
@@ -65,7 +65,13 @@
  */
 
 static struct proc_dir_entry *lttng_proc_dentry;
-static const struct file_operations lttng_fops;
+
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,6,0))
+static const struct proc_ops lttng_proc_ops;
+#else
+static const struct file_operations lttng_proc_ops;
+#endif
+
 static const struct file_operations lttng_session_fops;
 static const struct file_operations lttng_channel_fops;
 static const struct file_operations lttng_metadata_fops;
@@ -364,13 +370,22 @@ long lttng_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 	}
 }
 
-static const struct file_operations lttng_fops = {
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,6,0))
+static const struct proc_ops lttng_proc_ops = {
+	.proc_ioctl = lttng_ioctl,
+#ifdef CONFIG_COMPAT
+	.proc_compat_ioctl = lttng_ioctl,
+#endif /* CONFIG_COMPAT */
+};
+#else
+static const struct file_operations lttng_proc_ops = {
 	.owner = THIS_MODULE,
 	.unlocked_ioctl = lttng_ioctl,
 #ifdef CONFIG_COMPAT
 	.compat_ioctl = lttng_ioctl,
-#endif
+#endif /* CONFIG_COMPAT */
 };
+#endif
 
 static
 int lttng_abi_create_channel(struct file *session_file,
@@ -1013,7 +1028,8 @@ int lttng_abi_create_event(struct file *channel_file,
 		event_param->u.kprobe.symbol_name[LTTNG_KERNEL_SYM_NAME_LEN - 1] = '\0';
 		break;
 	case LTTNG_KERNEL_FUNCTION:
-		event_param->u.ftrace.symbol_name[LTTNG_KERNEL_SYM_NAME_LEN - 1] = '\0';
+		WARN_ON_ONCE(1);
+		/* Not implemented. */
 		break;
 	default:
 		break;
@@ -1164,9 +1180,8 @@ long lttng_channel_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 				sizeof(uevent_param->u.kretprobe.symbol_name));
 			break;
 		case LTTNG_KERNEL_FUNCTION:
-			memcpy(uevent_param->u.ftrace.symbol_name,
-					old_uevent_param->u.ftrace.symbol_name,
-					sizeof(uevent_param->u.ftrace.symbol_name));
+			WARN_ON_ONCE(1);
+			/* Not implemented. */
 			break;
 		default:
 			break;
@@ -1726,7 +1741,7 @@ int __init lttng_abi_init(void)
 	}
 
 	lttng_proc_dentry = proc_create_data("lttng", S_IRUSR | S_IWUSR, NULL,
-					&lttng_fops, NULL);
+					&lttng_proc_ops, NULL);
 
 	if (!lttng_proc_dentry) {
 		printk(KERN_ERR "Error creating LTTng control file\n");