1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
|
--- vsock-only/linux/notify.c 2014-04-14 23:36:15.779380482 +0200
+++ vsock-only/linux/notify.c.new 2014-04-14 23:36:41.396381914 +0200
@@ -516,7 +516,11 @@
PKT_FIELD(vsk, sentWaitingRead) = FALSE;
#endif
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(3, 14, 99)
sk->sk_data_ready(sk, 0);
+#else
+ sk->sk_data_ready(sk);
+#endif
}
--- vsock-only/linux/notifyQState.c 2013-10-18 19:56:12.000000000 +0200
+++ vsock-only/linux/notifyQState.c.new 2014-04-14 23:37:53.316385936 +0200
@@ -164,7 +164,11 @@
struct sockaddr_vm *dst, // IN: unused
struct sockaddr_vm *src) // IN: unused
{
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(3, 14, 99)
sk->sk_data_ready(sk, 0);
+#else
+ sk->sk_data_ready(sk);
+#endif
}
@@ -566,7 +570,12 @@
}
/* See the comment in VSockVmciNotifyPktSendPostEnqueue */
+
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(3, 14, 99)
sk->sk_data_ready(sk, 0);
+#else
+ sk->sk_data_ready(sk);
+#endif
}
return err;
--- vmblock-only/linux/inode.c 2014-04-14 23:25:31.755344470 +0200
+++ vmblock-only/linux/inode.c.new 2014-04-14 23:23:31.732337759 +0200
@@ -178,7 +178,11 @@
return -EINVAL;
}
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(3, 14, 99)
return vfs_readlink(dentry, buffer, buflen, iinfo->name);
+#else
+ return readlink_copy(buffer, buflen, iinfo->name);
+#endif
}
|
GitWeb
