Attachment #410998 for bug #559602

View | Details | Raw Unified | Return to bug 559602
Collapse All | Expand All

Lines 38-44 Link Here

(-)a/vmblock-only/linux/inode.c (-2 / +9 lines)
38	static struct dentry InodeOpLookup(struct inode dir,	38	static struct dentry InodeOpLookup(struct inode dir,
39	struct dentry *dentry, unsigned int flags);	39	struct dentry *dentry, unsigned int flags);
40	static int InodeOpReadlink(struct dentry dentry, char __user buffer, int buflen);	40	static int InodeOpReadlink(struct dentry dentry, char __user buffer, int buflen);
41	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)	41	#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
		42	static const char InodeOpFollowlink(struct dentry dentry, void **cookie);
		43	#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
42	static void InodeOpFollowlink(struct dentry dentry, struct nameidata *nd);	44	static void InodeOpFollowlink(struct dentry dentry, struct nameidata *nd);
43	#else	45	#else
44	static int InodeOpFollowlink(struct dentry dentry, struct nameidata nd);	46	static int InodeOpFollowlink(struct dentry dentry, struct nameidata nd);
Lines 207-213 static void * Link Here
207	static int	209	static int
208	#endif	210	#endif
209	InodeOpFollowlink(struct dentry *dentry, // IN : dentry of symlink	211	InodeOpFollowlink(struct dentry *dentry, // IN : dentry of symlink
210	struct nameidata *nd) // OUT: stores result	212	#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
		213	void **cookie
		214	#else
		215	struct nameidata *nd
		216	#endif
		217	) // OUT: stores result
211	{	218	{
212	int ret;	219	int ret;
213	VMBlockInodeInfo *iinfo;	220	VMBlockInodeInfo *iinfo;

Lines 199-205 InodeOpReadlink(struct dentry *dentry, // IN : dentry of symlink Link Here

(-)a/vmblock-only/linux/inode.c (-1 / +7 lines)
199	*----------------------------------------------------------------------------	199	*----------------------------------------------------------------------------
200	*/	200	*/
201		201
202	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)	202	#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
		203	static const char *
		204	#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
203	static void *	205	static void *
204	#else	206	#else
205	static int	207	static int
Lines 222-229 InodeOpFollowlink(struct dentry *dentry, // IN : dentry of symlink Link Here
222	goto out;	224	goto out;
223	}	225	}
224		226
		227	#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
		228	return cookie = (char )(iinfo->name);
		229	#else
225	nd_set_link(nd, iinfo->name);	230	nd_set_link(nd, iinfo->name);
226	ret = 0;	231	ret = 0;
		232	#endif
227		233
228	out:	234	out:
229	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)	235	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)

Lines 78-85 Link Here

(-)a/vmnet-only/vmnetInt.h (-1 / +6 lines)
78		78
79	extern struct proto vmnet_proto;	79	extern struct proto vmnet_proto;
80	#ifdef VMW_NETDEV_HAS_NET	80	#ifdef VMW_NETDEV_HAS_NET
		81	# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
81	# define compat_sk_alloc(_bri, _pri) sk_alloc(&init_net, \	82	# define compat_sk_alloc(_bri, _pri) sk_alloc(&init_net, \
82	PF_NETLINK, _pri, &vmnet_proto)	83	PF_NETLINK, _pri, &vmnet_proto, 1)
		84	# else
		85	# define compat_sk_alloc(_bri, _pri) sk_alloc(&init_net, \
		86	PF_NETLINK, _pri, &vmnet_proto)
		87	# endif
83	#else	88	#else
84	# define compat_sk_alloc(_bri, _pri) sk_alloc(PF_NETLINK, _pri, &vmnet_proto, 1)	89	# define compat_sk_alloc(_bri, _pri) sk_alloc(PF_NETLINK, _pri, &vmnet_proto, 1)
85	#endif	90	#endif

Return to bug 559602