summaryrefslogtreecommitdiffstats
path: root/main/open-vm-tools-grsec/0002-Fix-d_alias-to-d_u.d_alias-for-kernel-3.18.patch
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2015-04-14 12:45:41 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2015-04-14 13:24:14 +0000
commit2b4f0c0beb18d468ff89457ce0b42b0fd35ff246 (patch)
treea177b1345f78b6b6d1bde52f4e5d173eafcc1ac9 /main/open-vm-tools-grsec/0002-Fix-d_alias-to-d_u.d_alias-for-kernel-3.18.patch
parent9d86cf29d9853a68265193b3034bac36c84f9e13 (diff)
downloadaports-2b4f0c0beb18d468ff89457ce0b42b0fd35ff246.tar.bz2
aports-2b4f0c0beb18d468ff89457ce0b42b0fd35ff246.tar.xz
main/open-vm-tools: upgrade and rebuild against 3.18.11 kernel
Diffstat (limited to 'main/open-vm-tools-grsec/0002-Fix-d_alias-to-d_u.d_alias-for-kernel-3.18.patch')
-rw-r--r--main/open-vm-tools-grsec/0002-Fix-d_alias-to-d_u.d_alias-for-kernel-3.18.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/main/open-vm-tools-grsec/0002-Fix-d_alias-to-d_u.d_alias-for-kernel-3.18.patch b/main/open-vm-tools-grsec/0002-Fix-d_alias-to-d_u.d_alias-for-kernel-3.18.patch
new file mode 100644
index 000000000..53ccc3485
--- /dev/null
+++ b/main/open-vm-tools-grsec/0002-Fix-d_alias-to-d_u.d_alias-for-kernel-3.18.patch
@@ -0,0 +1,34 @@
+From 8df98f3c779fa43d073a42e82bd18cf28c2bd4af Mon Sep 17 00:00:00 2001
+From: Wendell Smith <wendellwsmith@gmail.com>
+Date: Sat, 7 Feb 2015 15:42:13 -0500
+Subject: [PATCH 2/3] Fix d_alias to d_u.d_alias for kernel 3.18
+
+---
+ open-vm-tools/modules/linux/vmhgfs/inode.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/open-vm-tools/modules/linux/vmhgfs/inode.c b/open-vm-tools/modules/linux/vmhgfs/inode.c
+index 77b1669..2d289e3 100644
+--- a/modules/linux/vmhgfs/inode.c
++++ b/modules/linux/vmhgfs/inode.c
+@@ -1917,7 +1917,7 @@ HgfsPermission(struct inode *inode,
+ p,
+ #endif
+ &inode->i_dentry,
+- d_alias) {
++ d_u.d_alias) {
+ int dcount = hgfs_d_count(dentry);
+ if (dcount) {
+ LOG(4, ("Found %s %d \n", dentry->d_name.name, dcount));
+@@ -1970,7 +1970,7 @@ HgfsPermission(struct inode *inode,
+ /* Find a dentry with valid d_count. Refer bug 587879. */
+ list_for_each(pos, &inode->i_dentry) {
+ int dcount;
+- struct dentry *dentry = list_entry(pos, struct dentry, d_alias);
++ struct dentry *dentry = list_entry(pos, struct dentry, d_u.d_alias);
+ dcount = hgfs_d_count(dentry);
+ if (dcount) {
+ LOG(4, ("Found %s %d \n", (dentry)->d_name.name, dcount));
+--
+2.3.4
+