summarylogtreecommitdiffstats
path: root/vmnet.patch
diff options
context:
space:
mode:
authorJean-Marc Lenoir2020-03-13 13:34:52 +0100
committerJean-Marc Lenoir2020-03-13 13:34:52 +0100
commit13aca7afd5c8ec0394448324ce5d60f95f84939d (patch)
tree0a46cb3e2871d40683d51b6e4917fdbfccc40d1b /vmnet.patch
parentc68579f7e0e14de796bcc0b4bc2f81b3ae961122 (diff)
downloadaur-13aca7afd5c8ec0394448324ce5d60f95f84939d.tar.gz
Compatibility with Linux 5.6
Diffstat (limited to 'vmnet.patch')
-rw-r--r--vmnet.patch42
1 files changed, 42 insertions, 0 deletions
diff --git a/vmnet.patch b/vmnet.patch
index 4e38598ab7ff..4bfb6c58c075 100644
--- a/vmnet.patch
+++ b/vmnet.patch
@@ -97,3 +97,45 @@ index d385088..aab9478 100644
}
}
+From d8e6c50b735f95af01ddfe8b9d2775ed68aaa625 Mon Sep 17 00:00:00 2001
+From: Michal Kubecek <mkubecek@suse.cz>
+Date: Wed, 5 Feb 2020 07:29:14 +0100
+Subject: [PATCH] vmnet: convert from file_operations to proc_ops
+
+Manline commit 97a32539b956 ("proc: convert everything to "struct
+proc_ops"") in v5.6-rc1 introduces struct proc_ops and converts procfs file
+operations to it. Convert vmnet to do the same.
+
+As the same commit also introduces DEFINE_PROC_SHOW_ATTRIBUTE macro, we can
+use it for detection rather than rely on version comparison.
+---
+ vmnet-only/procfs.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/vmnet-only/procfs.c b/vmnet-only/procfs.c
+index 165cda0..58e1c4e 100644
+--- a/vmnet-only/procfs.c
++++ b/vmnet-only/procfs.c
+@@ -161,6 +161,14 @@ VNetProcOpen(struct inode *inode, // IN:
+ }
+
+ /* Our procfs callbacks. We only need to specialize open. */
++#ifdef DEFINE_PROC_SHOW_ATTRIBUTE
++static const struct proc_ops fops = {
++ .proc_open = VNetProcOpen,
++ .proc_read = seq_read,
++ .proc_lseek = seq_lseek,
++ .proc_release = single_release,
++};
++#else
+ static struct file_operations fops = {
+ .open = VNetProcOpen,
+ .read = seq_read,
+@@ -168,6 +176,7 @@ static struct file_operations fops = {
+ .release = single_release,
+ };
+ #endif
++#endif
+
+
+ /*