Attachment #428298 for bug #577472

Lines 44-50 Link Here

(-)vmblock-only/linux/inode.c.orig (-3 / +11 lines)
44	static int InodeOpReadlink(struct dentry , char __user , int);	44	static int InodeOpReadlink(struct dentry , char __user , int);
45	#endif	45	#endif
46		46
47	#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)	47	#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
		48	static const char InodeOpGetlink(struct dentry dentry, struct inode inode, struct delayed_call done);
		49	#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
48	static const char InodeOpFollowlink(struct dentry dentry, void **cookie);	50	static const char InodeOpFollowlink(struct dentry dentry, void **cookie);
49	#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)	51	#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
50	static void InodeOpFollowlink(struct dentry dentry, struct nameidata *nd);	52	static void InodeOpFollowlink(struct dentry dentry, struct nameidata *nd);
Lines 63-69 Link Here
63	struct inode_operations LinkInodeOps = {	65	struct inode_operations LinkInodeOps = {
64	#endif	66	#endif
65	.readlink = InodeOpReadlink,	67	.readlink = InodeOpReadlink,
66	.follow_link = InodeOpFollowlink,	68	#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
		69	.get_link = InodeOpGetlink
		70	#else
		71	.follow_link = InodeOpFollowlink
		72	#endif
67	};	73	};
68		74
69	/*	75	/*
Lines 223-229 Link Here
223	*----------------------------------------------------------------------------	229	*----------------------------------------------------------------------------
224	*/	230	*/
225		231
226	#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)	232	#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
		233	static const char InodeOpGetlink(struct dentry dentry, struct inode inode, struct delayed_call done)
		234	#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
227	static const char InodeOpFollowlink(struct dentry dentry, void **cookie)	235	static const char InodeOpFollowlink(struct dentry dentry, void **cookie)
228	#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)	236	#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
229	static void * InodeOpFollowlink(struct dentry *dentry, // IN : dentry of symlink	237	static void * InodeOpFollowlink(struct dentry *dentry, // IN : dentry of symlink

Lines 256-262 Link Here

(-)vmblock-only/linux/inode.c.orig (-1 / +3 lines)
256	goto out;	256	goto out;
257	}	257	}
258		258
259	#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)	259	#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
		260	return link = (char *)(iinfo->name);
		261	#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
260	return cookie = (char )(iinfo->name);	262	return cookie = (char )(iinfo->name);
261	#else	263	#else
262	nd_set_link(nd, iinfo->name);	264	nd_set_link(nd, iinfo->name);

Lines 243-248 Link Here

(-)vmblock-only/linux/inode.c.orig (+1 lines)
243	{	243	{
244	int ret;	244	int ret;
245	VMBlockInodeInfo *iinfo;	245	VMBlockInodeInfo *iinfo;
		246	char *link = NULL;
246		247
247	if (!dentry) {	248	if (!dentry) {
248	Warning("InodeOpReadlink: invalid args from kernel\n");	249	Warning("InodeOpReadlink: invalid args from kernel\n");

Return to bug 577472