summarylogtreecommitdiffstats
path: root/vmblock.patch
diff options
context:
space:
mode:
authorMarkus Kitsinger (SwooshyCueb)2017-03-20 19:32:51 -0500
committerMarkus Kitsinger (SwooshyCueb)2017-03-20 19:32:51 -0500
commite4f6c000ff8f051cd0cac738fe0314852970cdaf (patch)
tree4d0aee61543f7140621dfa7d4de42b52690243d6 /vmblock.patch
parent43a8c3cb76d0bb2c6bd380cdab1a87bfd0f99c57 (diff)
downloadaur-vmware-modules-dkms.tar.gz
Update for kernel 4.10 (untested)
Diffstat (limited to 'vmblock.patch')
-rw-r--r--vmblock.patch10
1 files changed, 6 insertions, 4 deletions
diff --git a/vmblock.patch b/vmblock.patch
index cad47e8d6a2..e8e7223de22 100644
--- a/vmblock.patch
+++ b/vmblock.patch
@@ -262,7 +262,7 @@ index d7ac1f6..c5e6604 100644
.release = FileOpRelease,
};
diff --git a/vmblock/linux/inode.c b/vmblock/linux/inode.c
-index 098c94c..bd2bf01 100644
+index 098c94c..7aed6e7 100644
--- a/vmblock/linux/inode.c
+++ b/vmblock/linux/inode.c
@@ -35,13 +35,24 @@
@@ -334,7 +334,7 @@ index 098c94c..bd2bf01 100644
inode->i_op = &LinkInodeOps;
d_add(dentry, inode);
-@@ -176,8 +200,13 @@ InodeOpReadlink(struct dentry *dentry, // IN : dentry of symlink
+@@ -176,8 +200,15 @@ InodeOpReadlink(struct dentry *dentry, // IN : dentry of symlink
if (!iinfo) {
return -EINVAL;
}
@@ -343,13 +343,15 @@ index 098c94c..bd2bf01 100644
return vfs_readlink(dentry, buffer, buflen, iinfo->name);
+#elif LINUX_VERSION_CODE <= KERNEL_VERSION(4, 6, 99)
+ return readlink_copy(buffer, buflen, iinfo->name);
-+#else
++#elif LINUX_VERSION_CODE <= KERNEL_VERSION(4, 9, 99)
+ return generic_readlink(dentry, buffer, buflen);
++#else
++ return vfs_readlink(dentry, buffer, buflen);
+#endif
}
-@@ -198,30 +227,58 @@ InodeOpReadlink(struct dentry *dentry, // IN : dentry of symlink
+@@ -198,30 +229,58 @@ InodeOpReadlink(struct dentry *dentry, // IN : dentry of symlink
*----------------------------------------------------------------------------
*/