| 1 |
commit: af19a5d912cdd537f70667722d2fb3cbb14b3d35 |
| 2 |
Author: Fabio Rossi <rossi.f <AT> inwind <DOT> it> |
| 3 |
AuthorDate: Fri May 27 21:31:39 2016 +0000 |
| 4 |
Commit: Fabio Rossi <rossi.f <AT> inwind <DOT> net> |
| 5 |
CommitDate: Fri May 27 22:57:07 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/vmware.git/commit/?id=af19a5d9 |
| 7 |
|
| 8 |
app-emulation/vmware-modules: fix patching of version 308 for kernel 4.5 |
| 9 |
|
| 10 |
The old patch 308-4.05-00-vmblock-follow_link.patch was not complete |
| 11 |
(probably produced before final 4.5-rc1 release). The problem was |
| 12 |
triggering a build failure on some systems. |
| 13 |
|
| 14 |
The patch for version 304 was already correct. |
| 15 |
|
| 16 |
.../files/308-4.05-00-vmblock-follow_link.patch | 33 ++++++++++++++-------- |
| 17 |
1 file changed, 22 insertions(+), 11 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-emulation/vmware-modules/files/308-4.05-00-vmblock-follow_link.patch b/app-emulation/vmware-modules/files/308-4.05-00-vmblock-follow_link.patch |
| 20 |
index c139292..03311b0 100644 |
| 21 |
--- a/app-emulation/vmware-modules/files/308-4.05-00-vmblock-follow_link.patch |
| 22 |
+++ b/app-emulation/vmware-modules/files/308-4.05-00-vmblock-follow_link.patch |
| 23 |
@@ -1,12 +1,12 @@ |
| 24 |
---- vmblock-only/linux/inode.c 2016-01-30 19:13:04.019947435 +0100 |
| 25 |
-+++ vmblock-only/linux/inode.c.new 2016-01-30 19:13:56.226950354 +0100 |
| 26 |
+--- vmblock-only/linux/inode.c.old 2016-05-27 15:12:49.315632906 +0200 |
| 27 |
++++ vmblock-only/linux/inode.c 2016-05-27 22:57:39.550192422 +0200 |
| 28 |
@@ -44,7 +44,9 @@ |
| 29 |
static int InodeOpReadlink(struct dentry *, char __user *, int); |
| 30 |
#endif |
| 31 |
- |
| 32 |
+ |
| 33 |
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99) |
| 34 |
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 99) |
| 35 |
-+static const char *InodeOpFollowlink(struct dentry *dentry, struct inode *inode, void **cookie); |
| 36 |
++static const char *InodeOpFollowlink(struct dentry *dentry, struct inode *inode, struct delayed_call *done); |
| 37 |
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99) |
| 38 |
static const char *InodeOpFollowlink(struct dentry *dentry, void **cookie); |
| 39 |
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) |
| 40 |
@@ -21,21 +21,23 @@ |
| 41 |
.follow_link = InodeOpFollowlink, |
| 42 |
+#endif |
| 43 |
}; |
| 44 |
- |
| 45 |
+ |
| 46 |
/* |
| 47 |
-@@ -231,6 +237,9 @@ |
| 48 |
+@@ -231,7 +237,10 @@ |
| 49 |
static int |
| 50 |
#endif |
| 51 |
InodeOpFollowlink(struct dentry *dentry, // IN : dentry of symlink |
| 52 |
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99) |
| 53 |
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 99) |
| 54 |
+ struct inode *inode, |
| 55 |
-+#endif |
| 56 |
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99) |
| 57 |
++ struct delayed_call *done) |
| 58 |
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99) |
| 59 |
void **cookie) // OUT: stores opaque pointer |
| 60 |
#else |
| 61 |
-@@ -241,12 +250,20 @@ |
| 62 |
+ struct nameidata *nd) // OUT: stores result |
| 63 |
+@@ -241,18 +250,28 @@ |
| 64 |
VMBlockInodeInfo *iinfo; |
| 65 |
- |
| 66 |
+ |
| 67 |
if (!dentry) { |
| 68 |
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 99) |
| 69 |
+ ret = -ECHILD; |
| 70 |
@@ -45,7 +47,7 @@ |
| 71 |
+#endif |
| 72 |
goto out; |
| 73 |
} |
| 74 |
- |
| 75 |
+ |
| 76 |
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 99) |
| 77 |
+ iinfo = INODE_TO_IINFO(inode); |
| 78 |
+#else |
| 79 |
@@ -54,3 +56,12 @@ |
| 80 |
if (!iinfo) { |
| 81 |
ret = -EINVAL; |
| 82 |
goto out; |
| 83 |
+ } |
| 84 |
+ |
| 85 |
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99) |
| 86 |
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 99) |
| 87 |
++ return iinfo->name; |
| 88 |
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99) |
| 89 |
+ return *cookie = iinfo->name; |
| 90 |
+ #else |
| 91 |
+ nd_set_link(nd, iinfo->name); |
Archives