summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Teran <evan.teran@gmail.com>2014-10-09 17:09:30 -0400
committerEvan Teran <evan.teran@gmail.com>2014-10-09 17:09:30 -0400
commit10ad4083b2d0209d4ed333a23fa1ef6b5851b8a3 (patch)
treea876231f774ad2542613ed67b400c47edbdb92c9 /app-emulation/vmware-modules/files/271-3.10-06-inode.patch
parentMerge branch 'master' of git://git.overlays.gentoo.org/proj/vmware (diff)
downloadvmware-10ad4083b2d0209d4ed333a23fa1ef6b5851b8a3.tar.gz
vmware-10ad4083b2d0209d4ed333a23fa1ef6b5851b8a3.tar.bz2
vmware-10ad4083b2d0209d4ed333a23fa1ef6b5851b8a3.zip
now properly compiles with minimal wanrings for 3.10, moving onto 3.11 testing :-)
Diffstat (limited to 'app-emulation/vmware-modules/files/271-3.10-06-inode.patch')
-rw-r--r--app-emulation/vmware-modules/files/271-3.10-06-inode.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/app-emulation/vmware-modules/files/271-3.10-06-inode.patch b/app-emulation/vmware-modules/files/271-3.10-06-inode.patch
new file mode 100644
index 0000000..0d30dbe
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-3.10-06-inode.patch
@@ -0,0 +1,31 @@
+diff -Naur vmblock-only/linux/inode.c vmblock-only/linux/inode.c
+--- vmblock-only/linux/inode.c 2013-11-05 23:33:26.000000000 -0500
++++ vmblock-only/linux/inode.c 2014-04-26 10:58:03.063635343 -0400
+@@ -36,7 +36,7 @@
+
+ /* Inode operations */
+ static struct dentry *InodeOpLookup(struct inode *dir,
+- struct dentry *dentry, struct nameidata *nd);
++ struct dentry *dentry, unsigned int flags);
+ static int InodeOpReadlink(struct dentry *dentry, char __user *buffer, int buflen);
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
+ static void *InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd);
+@@ -75,7 +75,7 @@
+ static struct dentry *
+ InodeOpLookup(struct inode *dir, // IN: parent directory's inode
+ struct dentry *dentry, // IN: dentry to lookup
+- struct nameidata *nd) // IN: lookup intent and information
++ unsigned int flags) // IN: lookup intent and information
+ {
+ char *filename;
+ struct inode *inode;
+@@ -221,7 +221,8 @@
+ goto out;
+ }
+
+- ret = vfs_follow_link(nd, iinfo->name);
++ nd_set_link(nd, iinfo->name);
++ ret = 0;
+
+ out:
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)