1 |
dilfridge 14/06/07 22:25:33 |
2 |
|
3 |
Added: 271-vfsfollowlink.patch 279-vfsfollowlink.patch |
4 |
Log: |
5 |
Conditionally add patch for kernel 3.12, bug 488072 |
6 |
|
7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 app-emulation/vmware-modules/files/271-vfsfollowlink.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/vmware-modules/files/271-vfsfollowlink.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/vmware-modules/files/271-vfsfollowlink.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: 271-vfsfollowlink.patch |
16 |
=================================================================== |
17 |
diff -Naur a/linux/inode.c b/linux/inode.c |
18 |
--- a/vmblock-only/linux/inode.c 2013-10-03 04:29:47.471339204 -0400 |
19 |
+++ b/vmblock-only/linux/inode.c 2013-10-03 04:31:56.607334636 -0400 |
20 |
@@ -36,7 +36,7 @@ |
21 |
|
22 |
/* Inode operations */ |
23 |
static struct dentry *InodeOpLookup(struct inode *dir, |
24 |
- struct dentry *dentry, struct nameidata *nd); |
25 |
+ struct dentry *dentry, unsigned int flags); |
26 |
static int InodeOpReadlink(struct dentry *dentry, char __user *buffer, int buflen); |
27 |
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) |
28 |
static void *InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd); |
29 |
@@ -75,7 +75,7 @@ |
30 |
static struct dentry * |
31 |
InodeOpLookup(struct inode *dir, // IN: parent directory's inode |
32 |
struct dentry *dentry, // IN: dentry to lookup |
33 |
- struct nameidata *nd) // IN: lookup intent and information |
34 |
+ unsigned int flags) // IN: lookup intent and information |
35 |
{ |
36 |
char *filename; |
37 |
struct inode *inode; |
38 |
@@ -221,7 +221,7 @@ |
39 |
goto out; |
40 |
} |
41 |
|
42 |
- ret = vfs_follow_link(nd, iinfo->name); |
43 |
+ nd_set_link(nd, iinfo->name); |
44 |
|
45 |
out: |
46 |
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) |
47 |
|
48 |
|
49 |
|
50 |
1.1 app-emulation/vmware-modules/files/279-vfsfollowlink.patch |
51 |
|
52 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/vmware-modules/files/279-vfsfollowlink.patch?rev=1.1&view=markup |
53 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/vmware-modules/files/279-vfsfollowlink.patch?rev=1.1&content-type=text/plain |
54 |
|
55 |
Index: 279-vfsfollowlink.patch |
56 |
=================================================================== |
57 |
diff -Naur a/linux/inode.c b/linux/inode.c |
58 |
--- a/vmblock-only/linux/inode.c 2013-10-03 04:29:47.471339204 -0400 |
59 |
+++ b/vmblock-only/linux/inode.c 2013-10-03 04:31:56.607334636 -0400 |
60 |
@@ -36,7 +36,7 @@ |
61 |
|
62 |
/* Inode operations */ |
63 |
static struct dentry *InodeOpLookup(struct inode *dir, |
64 |
- struct dentry *dentry, struct nameidata *nd); |
65 |
+ struct dentry *dentry, unsigned int flags); |
66 |
static int InodeOpReadlink(struct dentry *dentry, char __user *buffer, int buflen); |
67 |
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) |
68 |
static void *InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd); |
69 |
@@ -75,7 +75,7 @@ |
70 |
static struct dentry * |
71 |
InodeOpLookup(struct inode *dir, // IN: parent directory's inode |
72 |
struct dentry *dentry, // IN: dentry to lookup |
73 |
- struct nameidata *nd) // IN: lookup intent and information |
74 |
+ unsigned int flags) // IN: lookup intent and information |
75 |
{ |
76 |
char *filename; |
77 |
struct inode *inode; |
78 |
@@ -221,7 +221,7 @@ |
79 |
goto out; |
80 |
} |
81 |
|
82 |
- ret = vfs_follow_link(nd, iinfo->name); |
83 |
+ nd_set_link(nd, iinfo->name); |
84 |
|
85 |
out: |
86 |
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) |