Attachment #374932 for bug #507664

Lines 516-522 Link Here

(-)vsock-only/linux/notify.c (+4 lines)
516	PKT_FIELD(vsk, sentWaitingRead) = FALSE;	516	PKT_FIELD(vsk, sentWaitingRead) = FALSE;
517	#endif	517	#endif
518		518
		519	#if LINUX_VERSION_CODE <= KERNEL_VERSION(3, 14, 99)
519	sk->sk_data_ready(sk, 0);	520	sk->sk_data_ready(sk, 0);
		521	#else
		522	sk->sk_data_ready(sk);
		523	#endif
520	}	524	}
521		525
522		526

Lines 164-170 Link Here

(-)vsock-only/linux/notifyQState.c (+9 lines)
164	struct sockaddr_vm *dst, // IN: unused	164	struct sockaddr_vm *dst, // IN: unused
165	struct sockaddr_vm *src) // IN: unused	165	struct sockaddr_vm *src) // IN: unused
166	{	166	{
		167	#if LINUX_VERSION_CODE <= KERNEL_VERSION(3, 14, 99)
167	sk->sk_data_ready(sk, 0);	168	sk->sk_data_ready(sk, 0);
		169	#else
		170	sk->sk_data_ready(sk);
		171	#endif
168	}	172	}
169		173
170		174
Lines 566-572 Link Here
566	}	570	}
567		571
568	/* See the comment in VSockVmciNotifyPktSendPostEnqueue */	572	/* See the comment in VSockVmciNotifyPktSendPostEnqueue */
		573
		574	#if LINUX_VERSION_CODE <= KERNEL_VERSION(3, 14, 99)
569	sk->sk_data_ready(sk, 0);	575	sk->sk_data_ready(sk, 0);
		576	#else
		577	sk->sk_data_ready(sk);
		578	#endif
570	}	579	}
571		580
572	return err;	581	return err;

Lines 178-184 Link Here

(-)vmblock-only/linux/inode.c (+4 lines)
178	return -EINVAL;	178	return -EINVAL;
179	}	179	}
180		180
		181	#if LINUX_VERSION_CODE <= KERNEL_VERSION(3, 14, 99)
181	return vfs_readlink(dentry, buffer, buflen, iinfo->name);	182	return vfs_readlink(dentry, buffer, buflen, iinfo->name);
		183	#else
		184	return readlink_copy(buffer, buflen, iinfo->name);
		185	#endif
182	}	186	}
183		187
184		188

Return to bug 507664