aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2013-12-09 10:10:34 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2013-12-09 10:14:50 +0000
commitd7fe92a3b3eaf625e0e0e1fa5238ceb3c9fb5028 (patch)
tree497551cbf218502dde7ce62292d92c9eda96536c
parent1815df4c9eaa1fecc8925be90d9817ce2993999c (diff)
downloadalpine_aports-d7fe92a3b3eaf625e0e0e1fa5238ceb3c9fb5028.tar.bz2
alpine_aports-d7fe92a3b3eaf625e0e0e1fa5238ceb3c9fb5028.tar.xz
alpine_aports-d7fe92a3b3eaf625e0e0e1fa5238ceb3c9fb5028.zip
main/linux-vserver: upgrade to 3.10.23
Diffstat
-rw-r--r--main/linux-vserver/APKBUILD18
-rw-r--r--main/linux-vserver/patch-3.10.23-vs2.3.6.8.diff (renamed from main/linux-vserver/patch-3.10.19-vs2.3.6.8.diff)2424
2 files changed, 1220 insertions, 1222 deletions
diff --git a/main/linux-vserver/APKBUILD b/main/linux-vserver/APKBUILD
index be32d6f15d..7a01bbcc37 100644
--- a/main/linux-vserver/APKBUILD
+++ b/main/linux-vserver/APKBUILD
@@ -2,7 +2,7 @@
2 2
3_flavor=vserver 3_flavor=vserver
4pkgname=linux-${_flavor} 4pkgname=linux-${_flavor}
5pkgver=3.10.19 5pkgver=3.10.23
6pkgrel=0 6pkgrel=0
7_vsver=vs2.3.6.8 7_vsver=vs2.3.6.8
8 8
@@ -23,7 +23,6 @@ source="http://www.kernel.org/pub/linux/kernel/v3.x/linux-$_kernver.tar.xz
23 http://www.kernel.org/pub/linux/kernel/v3.x/patch-$pkgver.xz 23 http://www.kernel.org/pub/linux/kernel/v3.x/patch-$pkgver.xz
24 patch-$pkgver-$_vsver.diff 24 patch-$pkgver-$_vsver.diff
25 aslr-pie.patch 25 aslr-pie.patch
26 CVE-2013-4348.patch
27 kernelconfig.x86 26 kernelconfig.x86
28 kernelconfig.x86_64 27 kernelconfig.x86_64
29 " 28 "
@@ -138,23 +137,20 @@ dev() {
138} 137}
139 138
140md5sums="4f25cd5bec5f8d5a7d935b3f2ccb8481 linux-3.10.tar.xz 139md5sums="4f25cd5bec5f8d5a7d935b3f2ccb8481 linux-3.10.tar.xz
141b7f932eecbbf5636ad69add480fa1573 patch-3.10.19.xz 1408b9650e10f8beee769545b51202766a5 patch-3.10.23.xz
14216269e10835d0f8446e8b5e0016c87bf patch-3.10.19-vs2.3.6.8.diff 1415cf351f296b0343a244cbfb11b6620f8 patch-3.10.23-vs2.3.6.8.diff
14335e2e5c7a5f0de3cdf540bb4ae894349 aslr-pie.patch 14235e2e5c7a5f0de3cdf540bb4ae894349 aslr-pie.patch
14409ae7985af988c75ff35ed503558eb8b CVE-2013-4348.patch
1457f62c6c40c9638d83d4fa11eace3f9ac kernelconfig.x86 1437f62c6c40c9638d83d4fa11eace3f9ac kernelconfig.x86
146aa2ac10901c87db6a4a70ed3d8cc49a8 kernelconfig.x86_64" 144aa2ac10901c87db6a4a70ed3d8cc49a8 kernelconfig.x86_64"
147sha256sums="df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544 linux-3.10.tar.xz 145sha256sums="df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544 linux-3.10.tar.xz
148c420b1da0aefe23e4a6953e579374fd377385b6041f967694cf4f828e2f3252e patch-3.10.19.xz 146bdf3983ff3e26c5781edb19a8d0d7765e2e0282cfabda2b0652cc0deff53f445 patch-3.10.23.xz
14956247228dc90b9dfe162f4ad704863f3d8bd713a16f81e885a0338c963df94ec patch-3.10.19-vs2.3.6.8.diff 14748abc596ffbca06766ac308743c5882d1666c9fa7e6b96e349cc73eb1f75e000 patch-3.10.23-vs2.3.6.8.diff
150c18b47c7cd07837ca1c4f4702ef72e688a307b02f1f74012b329cea7d910ec85 aslr-pie.patch 148c18b47c7cd07837ca1c4f4702ef72e688a307b02f1f74012b329cea7d910ec85 aslr-pie.patch
15139acdfc0bb2298e3a9ba62ee42ac2b6556fc31d8eaa2c085f84897cdeaa1a996 CVE-2013-4348.patch
1521c06446173692d14e7db21b873e6b9053770ed1290a0e199e575dfebd2781072 kernelconfig.x86 1491c06446173692d14e7db21b873e6b9053770ed1290a0e199e575dfebd2781072 kernelconfig.x86
153ed941323278a48033f96cdfd4e66a25cb26171b31cbc96583817f7291d47f721 kernelconfig.x86_64" 150ed941323278a48033f96cdfd4e66a25cb26171b31cbc96583817f7291d47f721 kernelconfig.x86_64"
154sha512sums="5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35 linux-3.10.tar.xz 151sha512sums="5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35 linux-3.10.tar.xz
1556a8bfb124f90f1c8ed27ce3315629601b1b72d4bc8b1d2b776424e56b3a72e4cd03bcebe6cde35223a3beba75ec6d69e949e217504acc611becb7e62aa88f05c patch-3.10.19.xz 1520fdb65f1c45e490e1f2206589273e4b8f0f142ab6b16341cb52977e0c6a983b359f01456a9cae3e1c139d5ead5de106c10909b7fdb6a156675cad5d39374e97f patch-3.10.23.xz
1569e6ed233e4618d9a9368d907631b9643f91e42fac1115f50f3e57deeea946f0d8673f82f92ed134bc2b1ca4ba7198dae9327b3f157673f21bab73e5a46bee79f patch-3.10.19-vs2.3.6.8.diff 15301ec1135de900f898fd8aa61d6d3475a64bcd1dfdbcda6747cd5132b7bb12f195331995ae52e718108ef118e6bd1a50984f861a6318346317ad6401117beff2a patch-3.10.23-vs2.3.6.8.diff
15741c74619359791a65dc2c017e8fdae9e8614c8c6d3306bec59dac84bc74455ea1b9c5d35d98c7ce414d8621d91c9dbe868916a8b89be6c60d1013235ef5c21ab aslr-pie.patch 15441c74619359791a65dc2c017e8fdae9e8614c8c6d3306bec59dac84bc74455ea1b9c5d35d98c7ce414d8621d91c9dbe868916a8b89be6c60d1013235ef5c21ab aslr-pie.patch
1586c5165692519c630cb96a254088e55d4d7412bd0f45920c0bf514dd9c68d24625da91798158fe502b6c214a7b8d44ae6b2e49b39aed6da3c1344f816f90405a3 CVE-2013-4348.patch
1594612728f2f6b3d9ac043606511c2f6147f98aa716d16c8633776b83d1b98d997277e650cab537e2f87c1225541294f51302598cd5e543a353d768bbc68e91ab4 kernelconfig.x86 1554612728f2f6b3d9ac043606511c2f6147f98aa716d16c8633776b83d1b98d997277e650cab537e2f87c1225541294f51302598cd5e543a353d768bbc68e91ab4 kernelconfig.x86
160a3d9e72659f6a53b4bc47350fbf427263c2cc8320ef61e64f22a7402c4ba16d8ae2a3df5057ab09431d4b8a4e2c2a41b86d188b89d830c7301c6943360e83954 kernelconfig.x86_64" 156a3d9e72659f6a53b4bc47350fbf427263c2cc8320ef61e64f22a7402c4ba16d8ae2a3df5057ab09431d4b8a4e2c2a41b86d188b89d830c7301c6943360e83954 kernelconfig.x86_64"
diff --git a/main/linux-vserver/patch-3.10.19-vs2.3.6.8.diff b/main/linux-vserver/patch-3.10.23-vs2.3.6.8.diff
index 97983a951b..0431b8adc1 100644
--- a/main/linux-vserver/patch-3.10.19-vs2.3.6.8.diff
+++ b/main/linux-vserver/patch-3.10.23-vs2.3.6.8.diff
@@ -1,6 +1,6 @@
1diff -NurpP --minimal linux-3.10.19/Documentation/vserver/debug.txt linux-3.10.19-vs2.3.6.8/Documentation/vserver/debug.txt 1diff -NurpP --minimal linux-3.10.21/Documentation/vserver/debug.txt linux-3.10.21-vs2.3.6.8/Documentation/vserver/debug.txt
2--- linux-3.10.19/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000 2--- linux-3.10.21/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000
3+++ linux-3.10.19-vs2.3.6.8/Documentation/vserver/debug.txt 2013-08-22 20:29:59.000000000 +0000 3+++ linux-3.10.21-vs2.3.6.8/Documentation/vserver/debug.txt 2013-08-22 20:29:59.000000000 +0000
4@@ -0,0 +1,154 @@ 4@@ -0,0 +1,154 @@
5+ 5+
6+debug_cvirt: 6+debug_cvirt:
@@ -156,21 +156,21 @@ diff -NurpP --minimal linux-3.10.19/Documentation/vserver/debug.txt linux-3.10.1
156+ m 2^m "vx_acc_page[%5d,%s,%2d]: %5d%s" 156+ m 2^m "vx_acc_page[%5d,%s,%2d]: %5d%s"
157+ "vx_acc_pages[%5d,%s,%2d]: %5d += %5d" 157+ "vx_acc_pages[%5d,%s,%2d]: %5d += %5d"
158+ "vx_pages_avail[%5d,%s,%2d]: %5ld > %5d + %5d" 158+ "vx_pages_avail[%5d,%s,%2d]: %5ld > %5d + %5d"
159diff -NurpP --minimal linux-3.10.19/Makefile linux-3.10.19-vs2.3.6.8/Makefile 159diff -NurpP --minimal linux-3.10.21/Makefile linux-3.10.21-vs2.3.6.8/Makefile
160--- linux-3.10.19/Makefile 2013-11-13 17:21:12.000000000 +0000 160--- linux-3.10.21/Makefile 2013-11-30 07:50:36.000000000 +0000
161+++ linux-3.10.19-vs2.3.6.8/Makefile 2013-11-14 04:32:32.000000000 +0000 161+++ linux-3.10.21-vs2.3.6.8/Makefile 2013-11-30 08:28:38.000000000 +0000
162@@ -1,7 +1,7 @@ 162@@ -1,7 +1,7 @@
163 VERSION = 3 163 VERSION = 3
164 PATCHLEVEL = 10 164 PATCHLEVEL = 10
165 SUBLEVEL = 19 165 SUBLEVEL = 23
166-EXTRAVERSION = 166-EXTRAVERSION =
167+EXTRAVERSION = -vs2.3.6.8 167+EXTRAVERSION = -vs2.3.6.8
168 NAME = TOSSUG Baby Fish 168 NAME = TOSSUG Baby Fish
169 169
170 # *DOCUMENTATION* 170 # *DOCUMENTATION*
171diff -NurpP --minimal linux-3.10.19/arch/alpha/Kconfig linux-3.10.19-vs2.3.6.8/arch/alpha/Kconfig 171diff -NurpP --minimal linux-3.10.21/arch/alpha/Kconfig linux-3.10.21-vs2.3.6.8/arch/alpha/Kconfig
172--- linux-3.10.19/arch/alpha/Kconfig 2013-07-14 17:00:13.000000000 +0000 172--- linux-3.10.21/arch/alpha/Kconfig 2013-07-14 17:00:13.000000000 +0000
173+++ linux-3.10.19-vs2.3.6.8/arch/alpha/Kconfig 2013-08-22 20:29:59.000000000 +0000 173+++ linux-3.10.21-vs2.3.6.8/arch/alpha/Kconfig 2013-08-22 20:29:59.000000000 +0000
174@@ -665,6 +665,8 @@ config DUMMY_CONSOLE 174@@ -665,6 +665,8 @@ config DUMMY_CONSOLE
175 depends on VGA_HOSE 175 depends on VGA_HOSE
176 default y 176 default y
@@ -180,9 +180,9 @@ diff -NurpP --minimal linux-3.10.19/arch/alpha/Kconfig linux-3.10.19-vs2.3.6.8/a
180 source "security/Kconfig" 180 source "security/Kconfig"
181 181
182 source "crypto/Kconfig" 182 source "crypto/Kconfig"
183diff -NurpP --minimal linux-3.10.19/arch/alpha/kernel/systbls.S linux-3.10.19-vs2.3.6.8/arch/alpha/kernel/systbls.S 183diff -NurpP --minimal linux-3.10.21/arch/alpha/kernel/systbls.S linux-3.10.21-vs2.3.6.8/arch/alpha/kernel/systbls.S
184--- linux-3.10.19/arch/alpha/kernel/systbls.S 2013-02-19 13:56:11.000000000 +0000 184--- linux-3.10.21/arch/alpha/kernel/systbls.S 2013-02-19 13:56:11.000000000 +0000
185+++ linux-3.10.19-vs2.3.6.8/arch/alpha/kernel/systbls.S 2013-08-22 20:29:59.000000000 +0000 185+++ linux-3.10.21-vs2.3.6.8/arch/alpha/kernel/systbls.S 2013-08-22 20:29:59.000000000 +0000
186@@ -446,7 +446,7 @@ sys_call_table: 186@@ -446,7 +446,7 @@ sys_call_table:
187 .quad sys_stat64 /* 425 */ 187 .quad sys_stat64 /* 425 */
188 .quad sys_lstat64 188 .quad sys_lstat64
@@ -192,9 +192,9 @@ diff -NurpP --minimal linux-3.10.19/arch/alpha/kernel/systbls.S linux-3.10.19-vs
192 .quad sys_ni_syscall /* sys_mbind */ 192 .quad sys_ni_syscall /* sys_mbind */
193 .quad sys_ni_syscall /* sys_get_mempolicy */ 193 .quad sys_ni_syscall /* sys_get_mempolicy */
194 .quad sys_ni_syscall /* sys_set_mempolicy */ 194 .quad sys_ni_syscall /* sys_set_mempolicy */
195diff -NurpP --minimal linux-3.10.19/arch/alpha/kernel/traps.c linux-3.10.19-vs2.3.6.8/arch/alpha/kernel/traps.c 195diff -NurpP --minimal linux-3.10.21/arch/alpha/kernel/traps.c linux-3.10.21-vs2.3.6.8/arch/alpha/kernel/traps.c
196--- linux-3.10.19/arch/alpha/kernel/traps.c 2013-07-14 17:00:13.000000000 +0000 196--- linux-3.10.21/arch/alpha/kernel/traps.c 2013-07-14 17:00:13.000000000 +0000
197+++ linux-3.10.19-vs2.3.6.8/arch/alpha/kernel/traps.c 2013-08-22 20:29:59.000000000 +0000 197+++ linux-3.10.21-vs2.3.6.8/arch/alpha/kernel/traps.c 2013-08-22 20:29:59.000000000 +0000
198@@ -177,7 +177,8 @@ die_if_kernel(char * str, struct pt_regs 198@@ -177,7 +177,8 @@ die_if_kernel(char * str, struct pt_regs
199 #ifdef CONFIG_SMP 199 #ifdef CONFIG_SMP
200 printk("CPU %d ", hard_smp_processor_id()); 200 printk("CPU %d ", hard_smp_processor_id());
@@ -205,9 +205,9 @@ diff -NurpP --minimal linux-3.10.19/arch/alpha/kernel/traps.c linux-3.10.19-vs2.
205 dik_show_regs(regs, r9_15); 205 dik_show_regs(regs, r9_15);
206 add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE); 206 add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE);
207 dik_show_trace((unsigned long *)(regs+1)); 207 dik_show_trace((unsigned long *)(regs+1));
208diff -NurpP --minimal linux-3.10.19/arch/arm/Kconfig linux-3.10.19-vs2.3.6.8/arch/arm/Kconfig 208diff -NurpP --minimal linux-3.10.21/arch/arm/Kconfig linux-3.10.21-vs2.3.6.8/arch/arm/Kconfig
209--- linux-3.10.19/arch/arm/Kconfig 2013-11-13 17:21:12.000000000 +0000 209--- linux-3.10.21/arch/arm/Kconfig 2013-11-30 07:50:36.000000000 +0000
210+++ linux-3.10.19-vs2.3.6.8/arch/arm/Kconfig 2013-11-13 17:17:15.000000000 +0000 210+++ linux-3.10.21-vs2.3.6.8/arch/arm/Kconfig 2013-11-13 17:17:15.000000000 +0000
211@@ -2238,6 +2238,8 @@ source "fs/Kconfig" 211@@ -2238,6 +2238,8 @@ source "fs/Kconfig"
212 212
213 source "arch/arm/Kconfig.debug" 213 source "arch/arm/Kconfig.debug"
@@ -217,9 +217,9 @@ diff -NurpP --minimal linux-3.10.19/arch/arm/Kconfig linux-3.10.19-vs2.3.6.8/arc
217 source "security/Kconfig" 217 source "security/Kconfig"
218 218
219 source "crypto/Kconfig" 219 source "crypto/Kconfig"
220diff -NurpP --minimal linux-3.10.19/arch/arm/kernel/calls.S linux-3.10.19-vs2.3.6.8/arch/arm/kernel/calls.S 220diff -NurpP --minimal linux-3.10.21/arch/arm/kernel/calls.S linux-3.10.21-vs2.3.6.8/arch/arm/kernel/calls.S
221--- linux-3.10.19/arch/arm/kernel/calls.S 2013-05-31 13:44:29.000000000 +0000 221--- linux-3.10.21/arch/arm/kernel/calls.S 2013-05-31 13:44:29.000000000 +0000
222+++ linux-3.10.19-vs2.3.6.8/arch/arm/kernel/calls.S 2013-08-22 20:29:59.000000000 +0000 222+++ linux-3.10.21-vs2.3.6.8/arch/arm/kernel/calls.S 2013-08-22 20:29:59.000000000 +0000
223@@ -322,7 +322,7 @@ 223@@ -322,7 +322,7 @@
224 /* 310 */ CALL(sys_request_key) 224 /* 310 */ CALL(sys_request_key)
225 CALL(sys_keyctl) 225 CALL(sys_keyctl)
@@ -229,9 +229,9 @@ diff -NurpP --minimal linux-3.10.19/arch/arm/kernel/calls.S linux-3.10.19-vs2.3.
229 CALL(sys_ioprio_set) 229 CALL(sys_ioprio_set)
230 /* 315 */ CALL(sys_ioprio_get) 230 /* 315 */ CALL(sys_ioprio_get)
231 CALL(sys_inotify_init) 231 CALL(sys_inotify_init)
232diff -NurpP --minimal linux-3.10.19/arch/arm/kernel/traps.c linux-3.10.19-vs2.3.6.8/arch/arm/kernel/traps.c 232diff -NurpP --minimal linux-3.10.21/arch/arm/kernel/traps.c linux-3.10.21-vs2.3.6.8/arch/arm/kernel/traps.c
233--- linux-3.10.19/arch/arm/kernel/traps.c 2013-11-13 17:21:12.000000000 +0000 233--- linux-3.10.21/arch/arm/kernel/traps.c 2013-11-30 07:50:36.000000000 +0000
234+++ linux-3.10.19-vs2.3.6.8/arch/arm/kernel/traps.c 2013-11-13 17:17:15.000000000 +0000 234+++ linux-3.10.21-vs2.3.6.8/arch/arm/kernel/traps.c 2013-11-13 17:17:15.000000000 +0000
235@@ -240,8 +240,8 @@ static int __die(const char *str, int er 235@@ -240,8 +240,8 @@ static int __die(const char *str, int er
236 236
237 print_modules(); 237 print_modules();
@@ -243,9 +243,9 @@ diff -NurpP --minimal linux-3.10.19/arch/arm/kernel/traps.c linux-3.10.19-vs2.3.
243 243
244 if (!user_mode(regs) || in_interrupt()) { 244 if (!user_mode(regs) || in_interrupt()) {
245 dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp, 245 dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
246diff -NurpP --minimal linux-3.10.19/arch/cris/Kconfig linux-3.10.19-vs2.3.6.8/arch/cris/Kconfig 246diff -NurpP --minimal linux-3.10.21/arch/cris/Kconfig linux-3.10.21-vs2.3.6.8/arch/cris/Kconfig
247--- linux-3.10.19/arch/cris/Kconfig 2013-07-14 17:00:25.000000000 +0000 247--- linux-3.10.21/arch/cris/Kconfig 2013-07-14 17:00:25.000000000 +0000
248+++ linux-3.10.19-vs2.3.6.8/arch/cris/Kconfig 2013-08-22 20:29:59.000000000 +0000 248+++ linux-3.10.21-vs2.3.6.8/arch/cris/Kconfig 2013-08-22 20:29:59.000000000 +0000
249@@ -673,6 +673,8 @@ source "drivers/staging/Kconfig" 249@@ -673,6 +673,8 @@ source "drivers/staging/Kconfig"
250 250
251 source "arch/cris/Kconfig.debug" 251 source "arch/cris/Kconfig.debug"
@@ -255,9 +255,9 @@ diff -NurpP --minimal linux-3.10.19/arch/cris/Kconfig linux-3.10.19-vs2.3.6.8/ar
255 source "security/Kconfig" 255 source "security/Kconfig"
256 256
257 source "crypto/Kconfig" 257 source "crypto/Kconfig"
258diff -NurpP --minimal linux-3.10.19/arch/h8300/Kconfig linux-3.10.19-vs2.3.6.8/arch/h8300/Kconfig 258diff -NurpP --minimal linux-3.10.21/arch/h8300/Kconfig linux-3.10.21-vs2.3.6.8/arch/h8300/Kconfig
259--- linux-3.10.19/arch/h8300/Kconfig 2013-07-14 17:00:25.000000000 +0000 259--- linux-3.10.21/arch/h8300/Kconfig 2013-07-14 17:00:25.000000000 +0000
260+++ linux-3.10.19-vs2.3.6.8/arch/h8300/Kconfig 2013-08-22 20:29:59.000000000 +0000 260+++ linux-3.10.21-vs2.3.6.8/arch/h8300/Kconfig 2013-08-22 20:29:59.000000000 +0000
261@@ -218,6 +218,8 @@ source "fs/Kconfig" 261@@ -218,6 +218,8 @@ source "fs/Kconfig"
262 262
263 source "arch/h8300/Kconfig.debug" 263 source "arch/h8300/Kconfig.debug"
@@ -267,9 +267,9 @@ diff -NurpP --minimal linux-3.10.19/arch/h8300/Kconfig linux-3.10.19-vs2.3.6.8/a
267 source "security/Kconfig" 267 source "security/Kconfig"
268 268
269 source "crypto/Kconfig" 269 source "crypto/Kconfig"
270diff -NurpP --minimal linux-3.10.19/arch/ia64/Kconfig linux-3.10.19-vs2.3.6.8/arch/ia64/Kconfig 270diff -NurpP --minimal linux-3.10.21/arch/ia64/Kconfig linux-3.10.21-vs2.3.6.8/arch/ia64/Kconfig
271--- linux-3.10.19/arch/ia64/Kconfig 2013-07-14 17:00:25.000000000 +0000 271--- linux-3.10.21/arch/ia64/Kconfig 2013-07-14 17:00:25.000000000 +0000
272+++ linux-3.10.19-vs2.3.6.8/arch/ia64/Kconfig 2013-08-22 20:29:59.000000000 +0000 272+++ linux-3.10.21-vs2.3.6.8/arch/ia64/Kconfig 2013-08-22 20:29:59.000000000 +0000
273@@ -643,6 +643,8 @@ source "fs/Kconfig" 273@@ -643,6 +643,8 @@ source "fs/Kconfig"
274 274
275 source "arch/ia64/Kconfig.debug" 275 source "arch/ia64/Kconfig.debug"
@@ -279,9 +279,9 @@ diff -NurpP --minimal linux-3.10.19/arch/ia64/Kconfig linux-3.10.19-vs2.3.6.8/ar
279 source "security/Kconfig" 279 source "security/Kconfig"
280 280
281 source "crypto/Kconfig" 281 source "crypto/Kconfig"
282diff -NurpP --minimal linux-3.10.19/arch/ia64/kernel/entry.S linux-3.10.19-vs2.3.6.8/arch/ia64/kernel/entry.S 282diff -NurpP --minimal linux-3.10.21/arch/ia64/kernel/entry.S linux-3.10.21-vs2.3.6.8/arch/ia64/kernel/entry.S
283--- linux-3.10.19/arch/ia64/kernel/entry.S 2013-05-31 13:44:38.000000000 +0000 283--- linux-3.10.21/arch/ia64/kernel/entry.S 2013-05-31 13:44:38.000000000 +0000
284+++ linux-3.10.19-vs2.3.6.8/arch/ia64/kernel/entry.S 2013-08-22 20:29:59.000000000 +0000 284+++ linux-3.10.21-vs2.3.6.8/arch/ia64/kernel/entry.S 2013-08-22 20:29:59.000000000 +0000
285@@ -1719,7 +1719,7 @@ sys_call_table: 285@@ -1719,7 +1719,7 @@ sys_call_table:
286 data8 sys_mq_notify 286 data8 sys_mq_notify
287 data8 sys_mq_getsetattr 287 data8 sys_mq_getsetattr
@@ -291,9 +291,9 @@ diff -NurpP --minimal linux-3.10.19/arch/ia64/kernel/entry.S linux-3.10.19-vs2.3
291 data8 sys_waitid // 1270 291 data8 sys_waitid // 1270
292 data8 sys_add_key 292 data8 sys_add_key
293 data8 sys_request_key 293 data8 sys_request_key
294diff -NurpP --minimal linux-3.10.19/arch/ia64/kernel/ptrace.c linux-3.10.19-vs2.3.6.8/arch/ia64/kernel/ptrace.c 294diff -NurpP --minimal linux-3.10.21/arch/ia64/kernel/ptrace.c linux-3.10.21-vs2.3.6.8/arch/ia64/kernel/ptrace.c
295--- linux-3.10.19/arch/ia64/kernel/ptrace.c 2013-02-19 13:56:51.000000000 +0000 295--- linux-3.10.21/arch/ia64/kernel/ptrace.c 2013-02-19 13:56:51.000000000 +0000
296+++ linux-3.10.19-vs2.3.6.8/arch/ia64/kernel/ptrace.c 2013-08-22 20:29:59.000000000 +0000 296+++ linux-3.10.21-vs2.3.6.8/arch/ia64/kernel/ptrace.c 2013-08-22 20:29:59.000000000 +0000
297@@ -21,6 +21,7 @@ 297@@ -21,6 +21,7 @@
298 #include <linux/regset.h> 298 #include <linux/regset.h>
299 #include <linux/elf.h> 299 #include <linux/elf.h>
@@ -302,9 +302,9 @@ diff -NurpP --minimal linux-3.10.19/arch/ia64/kernel/ptrace.c linux-3.10.19-vs2.
302 302
303 #include <asm/pgtable.h> 303 #include <asm/pgtable.h>
304 #include <asm/processor.h> 304 #include <asm/processor.h>
305diff -NurpP --minimal linux-3.10.19/arch/ia64/kernel/traps.c linux-3.10.19-vs2.3.6.8/arch/ia64/kernel/traps.c 305diff -NurpP --minimal linux-3.10.21/arch/ia64/kernel/traps.c linux-3.10.21-vs2.3.6.8/arch/ia64/kernel/traps.c
306--- linux-3.10.19/arch/ia64/kernel/traps.c 2013-05-31 13:44:38.000000000 +0000 306--- linux-3.10.21/arch/ia64/kernel/traps.c 2013-05-31 13:44:38.000000000 +0000
307+++ linux-3.10.19-vs2.3.6.8/arch/ia64/kernel/traps.c 2013-08-22 20:29:59.000000000 +0000 307+++ linux-3.10.21-vs2.3.6.8/arch/ia64/kernel/traps.c 2013-08-22 20:29:59.000000000 +0000
308@@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re 308@@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re
309 put_cpu(); 309 put_cpu();
310 310
@@ -329,9 +329,9 @@ diff -NurpP --minimal linux-3.10.19/arch/ia64/kernel/traps.c linux-3.10.19-vs2.3
329 } 329 }
330 } 330 }
331 } 331 }
332diff -NurpP --minimal linux-3.10.19/arch/m32r/kernel/traps.c linux-3.10.19-vs2.3.6.8/arch/m32r/kernel/traps.c 332diff -NurpP --minimal linux-3.10.21/arch/m32r/kernel/traps.c linux-3.10.21-vs2.3.6.8/arch/m32r/kernel/traps.c
333--- linux-3.10.19/arch/m32r/kernel/traps.c 2013-07-14 17:00:26.000000000 +0000 333--- linux-3.10.21/arch/m32r/kernel/traps.c 2013-07-14 17:00:26.000000000 +0000
334+++ linux-3.10.19-vs2.3.6.8/arch/m32r/kernel/traps.c 2013-08-22 20:29:59.000000000 +0000 334+++ linux-3.10.21-vs2.3.6.8/arch/m32r/kernel/traps.c 2013-08-22 20:29:59.000000000 +0000
335@@ -184,8 +184,9 @@ static void show_registers(struct pt_reg 335@@ -184,8 +184,9 @@ static void show_registers(struct pt_reg
336 } else { 336 } else {
337 printk("SPI: %08lx\n", sp); 337 printk("SPI: %08lx\n", sp);
@@ -344,9 +344,9 @@ diff -NurpP --minimal linux-3.10.19/arch/m32r/kernel/traps.c linux-3.10.19-vs2.3
344 344
345 /* 345 /*
346 * When in-kernel, we also print out the stack and code at the 346 * When in-kernel, we also print out the stack and code at the
347diff -NurpP --minimal linux-3.10.19/arch/m68k/Kconfig linux-3.10.19-vs2.3.6.8/arch/m68k/Kconfig 347diff -NurpP --minimal linux-3.10.21/arch/m68k/Kconfig linux-3.10.21-vs2.3.6.8/arch/m68k/Kconfig
348--- linux-3.10.19/arch/m68k/Kconfig 2013-07-14 17:00:26.000000000 +0000 348--- linux-3.10.21/arch/m68k/Kconfig 2013-07-14 17:00:26.000000000 +0000
349+++ linux-3.10.19-vs2.3.6.8/arch/m68k/Kconfig 2013-08-22 20:29:59.000000000 +0000 349+++ linux-3.10.21-vs2.3.6.8/arch/m68k/Kconfig 2013-08-22 20:29:59.000000000 +0000
350@@ -134,6 +134,8 @@ source "fs/Kconfig" 350@@ -134,6 +134,8 @@ source "fs/Kconfig"
351 351
352 source "arch/m68k/Kconfig.debug" 352 source "arch/m68k/Kconfig.debug"
@@ -356,9 +356,9 @@ diff -NurpP --minimal linux-3.10.19/arch/m68k/Kconfig linux-3.10.19-vs2.3.6.8/ar
356 source "security/Kconfig" 356 source "security/Kconfig"
357 357
358 source "crypto/Kconfig" 358 source "crypto/Kconfig"
359diff -NurpP --minimal linux-3.10.19/arch/mips/Kconfig linux-3.10.19-vs2.3.6.8/arch/mips/Kconfig 359diff -NurpP --minimal linux-3.10.21/arch/mips/Kconfig linux-3.10.21-vs2.3.6.8/arch/mips/Kconfig
360--- linux-3.10.19/arch/mips/Kconfig 2013-11-13 17:21:12.000000000 +0000 360--- linux-3.10.21/arch/mips/Kconfig 2013-11-30 07:50:37.000000000 +0000
361+++ linux-3.10.19-vs2.3.6.8/arch/mips/Kconfig 2013-11-13 17:17:15.000000000 +0000 361+++ linux-3.10.21-vs2.3.6.8/arch/mips/Kconfig 2013-11-13 17:17:15.000000000 +0000
362@@ -2583,6 +2583,8 @@ source "fs/Kconfig" 362@@ -2583,6 +2583,8 @@ source "fs/Kconfig"
363 363
364 source "arch/mips/Kconfig.debug" 364 source "arch/mips/Kconfig.debug"
@@ -368,9 +368,9 @@ diff -NurpP --minimal linux-3.10.19/arch/mips/Kconfig linux-3.10.19-vs2.3.6.8/ar
368 source "security/Kconfig" 368 source "security/Kconfig"
369 369
370 source "crypto/Kconfig" 370 source "crypto/Kconfig"
371diff -NurpP --minimal linux-3.10.19/arch/mips/kernel/ptrace.c linux-3.10.19-vs2.3.6.8/arch/mips/kernel/ptrace.c 371diff -NurpP --minimal linux-3.10.21/arch/mips/kernel/ptrace.c linux-3.10.21-vs2.3.6.8/arch/mips/kernel/ptrace.c
372--- linux-3.10.19/arch/mips/kernel/ptrace.c 2013-05-31 13:44:42.000000000 +0000 372--- linux-3.10.21/arch/mips/kernel/ptrace.c 2013-05-31 13:44:42.000000000 +0000
373+++ linux-3.10.19-vs2.3.6.8/arch/mips/kernel/ptrace.c 2013-08-22 20:29:59.000000000 +0000 373+++ linux-3.10.21-vs2.3.6.8/arch/mips/kernel/ptrace.c 2013-08-22 20:29:59.000000000 +0000
374@@ -25,6 +25,7 @@ 374@@ -25,6 +25,7 @@
375 #include <linux/security.h> 375 #include <linux/security.h>
376 #include <linux/audit.h> 376 #include <linux/audit.h>
@@ -389,9 +389,9 @@ diff -NurpP --minimal linux-3.10.19/arch/mips/kernel/ptrace.c linux-3.10.19-vs2.
389 switch (request) { 389 switch (request) {
390 /* when I and D space are separate, these will need to be fixed. */ 390 /* when I and D space are separate, these will need to be fixed. */
391 case PTRACE_PEEKTEXT: /* read word at location addr. */ 391 case PTRACE_PEEKTEXT: /* read word at location addr. */
392diff -NurpP --minimal linux-3.10.19/arch/mips/kernel/scall32-o32.S linux-3.10.19-vs2.3.6.8/arch/mips/kernel/scall32-o32.S 392diff -NurpP --minimal linux-3.10.21/arch/mips/kernel/scall32-o32.S linux-3.10.21-vs2.3.6.8/arch/mips/kernel/scall32-o32.S
393--- linux-3.10.19/arch/mips/kernel/scall32-o32.S 2013-07-14 17:00:28.000000000 +0000 393--- linux-3.10.21/arch/mips/kernel/scall32-o32.S 2013-07-14 17:00:28.000000000 +0000
394+++ linux-3.10.19-vs2.3.6.8/arch/mips/kernel/scall32-o32.S 2013-08-22 20:29:59.000000000 +0000 394+++ linux-3.10.21-vs2.3.6.8/arch/mips/kernel/scall32-o32.S 2013-08-22 20:29:59.000000000 +0000
395@@ -521,7 +521,7 @@ einval: li v0, -ENOSYS 395@@ -521,7 +521,7 @@ einval: li v0, -ENOSYS
396 sys sys_mq_timedreceive 5 396 sys sys_mq_timedreceive 5
397 sys sys_mq_notify 2 /* 4275 */ 397 sys sys_mq_notify 2 /* 4275 */
@@ -401,9 +401,9 @@ diff -NurpP --minimal linux-3.10.19/arch/mips/kernel/scall32-o32.S linux-3.10.19
401 sys sys_waitid 5 401 sys sys_waitid 5
402 sys sys_ni_syscall 0 /* available, was setaltroot */ 402 sys sys_ni_syscall 0 /* available, was setaltroot */
403 sys sys_add_key 5 /* 4280 */ 403 sys sys_add_key 5 /* 4280 */
404diff -NurpP --minimal linux-3.10.19/arch/mips/kernel/scall64-64.S linux-3.10.19-vs2.3.6.8/arch/mips/kernel/scall64-64.S 404diff -NurpP --minimal linux-3.10.21/arch/mips/kernel/scall64-64.S linux-3.10.21-vs2.3.6.8/arch/mips/kernel/scall64-64.S
405--- linux-3.10.19/arch/mips/kernel/scall64-64.S 2013-07-14 17:00:28.000000000 +0000 405--- linux-3.10.21/arch/mips/kernel/scall64-64.S 2013-07-14 17:00:28.000000000 +0000
406+++ linux-3.10.19-vs2.3.6.8/arch/mips/kernel/scall64-64.S 2013-08-22 20:29:59.000000000 +0000 406+++ linux-3.10.21-vs2.3.6.8/arch/mips/kernel/scall64-64.S 2013-08-22 20:29:59.000000000 +0000
407@@ -351,7 +351,7 @@ sys_call_table: 407@@ -351,7 +351,7 @@ sys_call_table:
408 PTR sys_mq_timedreceive 408 PTR sys_mq_timedreceive
409 PTR sys_mq_notify 409 PTR sys_mq_notify
@@ -413,9 +413,9 @@ diff -NurpP --minimal linux-3.10.19/arch/mips/kernel/scall64-64.S linux-3.10.19-
413 PTR sys_waitid 413 PTR sys_waitid
414 PTR sys_ni_syscall /* available, was setaltroot */ 414 PTR sys_ni_syscall /* available, was setaltroot */
415 PTR sys_add_key 415 PTR sys_add_key
416diff -NurpP --minimal linux-3.10.19/arch/mips/kernel/scall64-n32.S linux-3.10.19-vs2.3.6.8/arch/mips/kernel/scall64-n32.S 416diff -NurpP --minimal linux-3.10.21/arch/mips/kernel/scall64-n32.S linux-3.10.21-vs2.3.6.8/arch/mips/kernel/scall64-n32.S
417--- linux-3.10.19/arch/mips/kernel/scall64-n32.S 2013-07-14 17:00:28.000000000 +0000 417--- linux-3.10.21/arch/mips/kernel/scall64-n32.S 2013-07-14 17:00:28.000000000 +0000
418+++ linux-3.10.19-vs2.3.6.8/arch/mips/kernel/scall64-n32.S 2013-08-22 20:29:59.000000000 +0000 418+++ linux-3.10.21-vs2.3.6.8/arch/mips/kernel/scall64-n32.S 2013-08-22 20:29:59.000000000 +0000
419@@ -344,7 +344,7 @@ EXPORT(sysn32_call_table) 419@@ -344,7 +344,7 @@ EXPORT(sysn32_call_table)
420 PTR compat_sys_mq_timedreceive 420 PTR compat_sys_mq_timedreceive
421 PTR compat_sys_mq_notify 421 PTR compat_sys_mq_notify
@@ -425,9 +425,9 @@ diff -NurpP --minimal linux-3.10.19/arch/mips/kernel/scall64-n32.S linux-3.10.19
425 PTR compat_sys_waitid 425 PTR compat_sys_waitid
426 PTR sys_ni_syscall /* available, was setaltroot */ 426 PTR sys_ni_syscall /* available, was setaltroot */
427 PTR sys_add_key 427 PTR sys_add_key
428diff -NurpP --minimal linux-3.10.19/arch/mips/kernel/scall64-o32.S linux-3.10.19-vs2.3.6.8/arch/mips/kernel/scall64-o32.S 428diff -NurpP --minimal linux-3.10.21/arch/mips/kernel/scall64-o32.S linux-3.10.21-vs2.3.6.8/arch/mips/kernel/scall64-o32.S
429--- linux-3.10.19/arch/mips/kernel/scall64-o32.S 2013-07-14 17:00:28.000000000 +0000 429--- linux-3.10.21/arch/mips/kernel/scall64-o32.S 2013-07-14 17:00:28.000000000 +0000
430+++ linux-3.10.19-vs2.3.6.8/arch/mips/kernel/scall64-o32.S 2013-08-22 20:29:59.000000000 +0000 430+++ linux-3.10.21-vs2.3.6.8/arch/mips/kernel/scall64-o32.S 2013-08-22 20:29:59.000000000 +0000
431@@ -469,7 +469,7 @@ sys_call_table: 431@@ -469,7 +469,7 @@ sys_call_table:
432 PTR compat_sys_mq_timedreceive 432 PTR compat_sys_mq_timedreceive
433 PTR compat_sys_mq_notify /* 4275 */ 433 PTR compat_sys_mq_notify /* 4275 */
@@ -437,9 +437,9 @@ diff -NurpP --minimal linux-3.10.19/arch/mips/kernel/scall64-o32.S linux-3.10.19
437 PTR compat_sys_waitid 437 PTR compat_sys_waitid
438 PTR sys_ni_syscall /* available, was setaltroot */ 438 PTR sys_ni_syscall /* available, was setaltroot */
439 PTR sys_add_key /* 4280 */ 439 PTR sys_add_key /* 4280 */
440diff -NurpP --minimal linux-3.10.19/arch/mips/kernel/traps.c linux-3.10.19-vs2.3.6.8/arch/mips/kernel/traps.c 440diff -NurpP --minimal linux-3.10.21/arch/mips/kernel/traps.c linux-3.10.21-vs2.3.6.8/arch/mips/kernel/traps.c
441--- linux-3.10.19/arch/mips/kernel/traps.c 2013-07-14 17:00:28.000000000 +0000 441--- linux-3.10.21/arch/mips/kernel/traps.c 2013-07-14 17:00:28.000000000 +0000
442+++ linux-3.10.19-vs2.3.6.8/arch/mips/kernel/traps.c 2013-08-22 20:29:59.000000000 +0000 442+++ linux-3.10.21-vs2.3.6.8/arch/mips/kernel/traps.c 2013-08-22 20:29:59.000000000 +0000
443@@ -331,9 +331,10 @@ void show_registers(struct pt_regs *regs 443@@ -331,9 +331,10 @@ void show_registers(struct pt_regs *regs
444 444
445 __show_regs(regs); 445 __show_regs(regs);
@@ -454,9 +454,9 @@ diff -NurpP --minimal linux-3.10.19/arch/mips/kernel/traps.c linux-3.10.19-vs2.3
454 if (cpu_has_userlocal) { 454 if (cpu_has_userlocal) {
455 unsigned long tls; 455 unsigned long tls;
456 456
457diff -NurpP --minimal linux-3.10.19/arch/parisc/Kconfig linux-3.10.19-vs2.3.6.8/arch/parisc/Kconfig 457diff -NurpP --minimal linux-3.10.21/arch/parisc/Kconfig linux-3.10.21-vs2.3.6.8/arch/parisc/Kconfig
458--- linux-3.10.19/arch/parisc/Kconfig 2013-07-14 17:00:29.000000000 +0000 458--- linux-3.10.21/arch/parisc/Kconfig 2013-07-14 17:00:29.000000000 +0000
459+++ linux-3.10.19-vs2.3.6.8/arch/parisc/Kconfig 2013-08-22 20:29:59.000000000 +0000 459+++ linux-3.10.21-vs2.3.6.8/arch/parisc/Kconfig 2013-08-22 20:29:59.000000000 +0000
460@@ -318,6 +318,8 @@ source "fs/Kconfig" 460@@ -318,6 +318,8 @@ source "fs/Kconfig"
461 461
462 source "arch/parisc/Kconfig.debug" 462 source "arch/parisc/Kconfig.debug"
@@ -466,9 +466,9 @@ diff -NurpP --minimal linux-3.10.19/arch/parisc/Kconfig linux-3.10.19-vs2.3.6.8/
466 source "security/Kconfig" 466 source "security/Kconfig"
467 467
468 source "crypto/Kconfig" 468 source "crypto/Kconfig"
469diff -NurpP --minimal linux-3.10.19/arch/parisc/kernel/syscall_table.S linux-3.10.19-vs2.3.6.8/arch/parisc/kernel/syscall_table.S 469diff -NurpP --minimal linux-3.10.21/arch/parisc/kernel/syscall_table.S linux-3.10.21-vs2.3.6.8/arch/parisc/kernel/syscall_table.S
470--- linux-3.10.19/arch/parisc/kernel/syscall_table.S 2013-07-14 17:00:31.000000000 +0000 470--- linux-3.10.21/arch/parisc/kernel/syscall_table.S 2013-07-14 17:00:31.000000000 +0000
471+++ linux-3.10.19-vs2.3.6.8/arch/parisc/kernel/syscall_table.S 2013-08-22 20:29:59.000000000 +0000 471+++ linux-3.10.21-vs2.3.6.8/arch/parisc/kernel/syscall_table.S 2013-08-22 20:29:59.000000000 +0000
472@@ -358,7 +358,7 @@ 472@@ -358,7 +358,7 @@
473 ENTRY_COMP(mbind) /* 260 */ 473 ENTRY_COMP(mbind) /* 260 */
474 ENTRY_COMP(get_mempolicy) 474 ENTRY_COMP(get_mempolicy)
@@ -478,9 +478,9 @@ diff -NurpP --minimal linux-3.10.19/arch/parisc/kernel/syscall_table.S linux-3.1
478 ENTRY_SAME(add_key) 478 ENTRY_SAME(add_key)
479 ENTRY_SAME(request_key) /* 265 */ 479 ENTRY_SAME(request_key) /* 265 */
480 ENTRY_SAME(keyctl) 480 ENTRY_SAME(keyctl)
481diff -NurpP --minimal linux-3.10.19/arch/parisc/kernel/traps.c linux-3.10.19-vs2.3.6.8/arch/parisc/kernel/traps.c 481diff -NurpP --minimal linux-3.10.21/arch/parisc/kernel/traps.c linux-3.10.21-vs2.3.6.8/arch/parisc/kernel/traps.c
482--- linux-3.10.19/arch/parisc/kernel/traps.c 2013-11-13 17:21:12.000000000 +0000 482--- linux-3.10.21/arch/parisc/kernel/traps.c 2013-11-30 07:50:37.000000000 +0000
483+++ linux-3.10.19-vs2.3.6.8/arch/parisc/kernel/traps.c 2013-11-13 17:17:15.000000000 +0000 483+++ linux-3.10.21-vs2.3.6.8/arch/parisc/kernel/traps.c 2013-11-13 17:17:15.000000000 +0000
484@@ -229,8 +229,9 @@ void die_if_kernel(char *str, struct pt_ 484@@ -229,8 +229,9 @@ void die_if_kernel(char *str, struct pt_
485 if (err == 0) 485 if (err == 0)
486 return; /* STFU */ 486 return; /* STFU */
@@ -504,9 +504,9 @@ diff -NurpP --minimal linux-3.10.19/arch/parisc/kernel/traps.c linux-3.10.19-vs2
504 504
505 /* Wot's wrong wif bein' racy? */ 505 /* Wot's wrong wif bein' racy? */
506 if (current->thread.flags & PARISC_KERNEL_DEATH) { 506 if (current->thread.flags & PARISC_KERNEL_DEATH) {
507diff -NurpP --minimal linux-3.10.19/arch/parisc/mm/fault.c linux-3.10.19-vs2.3.6.8/arch/parisc/mm/fault.c 507diff -NurpP --minimal linux-3.10.21/arch/parisc/mm/fault.c linux-3.10.21-vs2.3.6.8/arch/parisc/mm/fault.c
508--- linux-3.10.19/arch/parisc/mm/fault.c 2013-05-31 13:44:44.000000000 +0000 508--- linux-3.10.21/arch/parisc/mm/fault.c 2013-05-31 13:44:44.000000000 +0000
509+++ linux-3.10.19-vs2.3.6.8/arch/parisc/mm/fault.c 2013-08-22 20:29:59.000000000 +0000 509+++ linux-3.10.21-vs2.3.6.8/arch/parisc/mm/fault.c 2013-08-22 20:29:59.000000000 +0000
510@@ -257,8 +257,9 @@ bad_area: 510@@ -257,8 +257,9 @@ bad_area:
511 511
512 #ifdef PRINT_USER_FAULTS 512 #ifdef PRINT_USER_FAULTS
@@ -519,9 +519,9 @@ diff -NurpP --minimal linux-3.10.19/arch/parisc/mm/fault.c linux-3.10.19-vs2.3.6
519 if (vma) { 519 if (vma) {
520 printk(KERN_DEBUG "vm_start = 0x%08lx, vm_end = 0x%08lx\n", 520 printk(KERN_DEBUG "vm_start = 0x%08lx, vm_end = 0x%08lx\n",
521 vma->vm_start, vma->vm_end); 521 vma->vm_start, vma->vm_end);
522diff -NurpP --minimal linux-3.10.19/arch/powerpc/Kconfig linux-3.10.19-vs2.3.6.8/arch/powerpc/Kconfig 522diff -NurpP --minimal linux-3.10.21/arch/powerpc/Kconfig linux-3.10.21-vs2.3.6.8/arch/powerpc/Kconfig
523--- linux-3.10.19/arch/powerpc/Kconfig 2013-11-13 17:21:12.000000000 +0000 523--- linux-3.10.21/arch/powerpc/Kconfig 2013-11-30 07:50:37.000000000 +0000
524+++ linux-3.10.19-vs2.3.6.8/arch/powerpc/Kconfig 2013-11-13 17:17:15.000000000 +0000 524+++ linux-3.10.21-vs2.3.6.8/arch/powerpc/Kconfig 2013-11-13 17:17:15.000000000 +0000
525@@ -1010,6 +1010,8 @@ source "lib/Kconfig" 525@@ -1010,6 +1010,8 @@ source "lib/Kconfig"
526 526
527 source "arch/powerpc/Kconfig.debug" 527 source "arch/powerpc/Kconfig.debug"
@@ -531,9 +531,9 @@ diff -NurpP --minimal linux-3.10.19/arch/powerpc/Kconfig linux-3.10.19-vs2.3.6.8
531 source "security/Kconfig" 531 source "security/Kconfig"
532 532
533 config KEYS_COMPAT 533 config KEYS_COMPAT
534diff -NurpP --minimal linux-3.10.19/arch/powerpc/include/uapi/asm/unistd.h linux-3.10.19-vs2.3.6.8/arch/powerpc/include/uapi/asm/unistd.h 534diff -NurpP --minimal linux-3.10.21/arch/powerpc/include/uapi/asm/unistd.h linux-3.10.21-vs2.3.6.8/arch/powerpc/include/uapi/asm/unistd.h
535--- linux-3.10.19/arch/powerpc/include/uapi/asm/unistd.h 2013-05-31 13:44:44.000000000 +0000 535--- linux-3.10.21/arch/powerpc/include/uapi/asm/unistd.h 2013-05-31 13:44:44.000000000 +0000
536+++ linux-3.10.19-vs2.3.6.8/arch/powerpc/include/uapi/asm/unistd.h 2013-08-22 20:29:59.000000000 +0000 536+++ linux-3.10.21-vs2.3.6.8/arch/powerpc/include/uapi/asm/unistd.h 2013-08-22 20:29:59.000000000 +0000
537@@ -275,7 +275,7 @@ 537@@ -275,7 +275,7 @@
538 #endif 538 #endif
539 #define __NR_rtas 255 539 #define __NR_rtas 255
@@ -543,9 +543,9 @@ diff -NurpP --minimal linux-3.10.19/arch/powerpc/include/uapi/asm/unistd.h linux
543 #define __NR_migrate_pages 258 543 #define __NR_migrate_pages 258
544 #define __NR_mbind 259 544 #define __NR_mbind 259
545 #define __NR_get_mempolicy 260 545 #define __NR_get_mempolicy 260
546diff -NurpP --minimal linux-3.10.19/arch/powerpc/kernel/traps.c linux-3.10.19-vs2.3.6.8/arch/powerpc/kernel/traps.c 546diff -NurpP --minimal linux-3.10.21/arch/powerpc/kernel/traps.c linux-3.10.21-vs2.3.6.8/arch/powerpc/kernel/traps.c
547--- linux-3.10.19/arch/powerpc/kernel/traps.c 2013-11-13 17:21:12.000000000 +0000 547--- linux-3.10.21/arch/powerpc/kernel/traps.c 2013-11-30 07:50:37.000000000 +0000
548+++ linux-3.10.19-vs2.3.6.8/arch/powerpc/kernel/traps.c 2013-11-13 17:17:15.000000000 +0000 548+++ linux-3.10.21-vs2.3.6.8/arch/powerpc/kernel/traps.c 2013-11-13 17:17:15.000000000 +0000
549@@ -1231,8 +1231,9 @@ void nonrecoverable_exception(struct pt_ 549@@ -1231,8 +1231,9 @@ void nonrecoverable_exception(struct pt_
550 550
551 void trace_syscall(struct pt_regs *regs) 551 void trace_syscall(struct pt_regs *regs)
@@ -558,9 +558,9 @@ diff -NurpP --minimal linux-3.10.19/arch/powerpc/kernel/traps.c linux-3.10.19-vs
558 regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted()); 558 regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted());
559 } 559 }
560 560
561diff -NurpP --minimal linux-3.10.19/arch/s390/Kconfig linux-3.10.19-vs2.3.6.8/arch/s390/Kconfig 561diff -NurpP --minimal linux-3.10.21/arch/s390/Kconfig linux-3.10.21-vs2.3.6.8/arch/s390/Kconfig
562--- linux-3.10.19/arch/s390/Kconfig 2013-11-13 17:21:12.000000000 +0000 562--- linux-3.10.21/arch/s390/Kconfig 2013-11-30 07:50:37.000000000 +0000
563+++ linux-3.10.19-vs2.3.6.8/arch/s390/Kconfig 2013-11-13 17:17:15.000000000 +0000 563+++ linux-3.10.21-vs2.3.6.8/arch/s390/Kconfig 2013-11-13 17:17:15.000000000 +0000
564@@ -579,6 +579,8 @@ source "fs/Kconfig" 564@@ -579,6 +579,8 @@ source "fs/Kconfig"
565 565
566 source "arch/s390/Kconfig.debug" 566 source "arch/s390/Kconfig.debug"
@@ -570,9 +570,9 @@ diff -NurpP --minimal linux-3.10.19/arch/s390/Kconfig linux-3.10.19-vs2.3.6.8/ar
570 source "security/Kconfig" 570 source "security/Kconfig"
571 571
572 source "crypto/Kconfig" 572 source "crypto/Kconfig"
573diff -NurpP --minimal linux-3.10.19/arch/s390/include/asm/tlb.h linux-3.10.19-vs2.3.6.8/arch/s390/include/asm/tlb.h 573diff -NurpP --minimal linux-3.10.21/arch/s390/include/asm/tlb.h linux-3.10.21-vs2.3.6.8/arch/s390/include/asm/tlb.h
574--- linux-3.10.19/arch/s390/include/asm/tlb.h 2013-11-13 17:21:12.000000000 +0000 574--- linux-3.10.21/arch/s390/include/asm/tlb.h 2013-11-30 07:50:37.000000000 +0000
575+++ linux-3.10.19-vs2.3.6.8/arch/s390/include/asm/tlb.h 2013-11-13 17:17:15.000000000 +0000 575+++ linux-3.10.21-vs2.3.6.8/arch/s390/include/asm/tlb.h 2013-11-13 17:17:15.000000000 +0000
576@@ -24,6 +24,7 @@ 576@@ -24,6 +24,7 @@
577 #include <linux/mm.h> 577 #include <linux/mm.h>
578 #include <linux/pagemap.h> 578 #include <linux/pagemap.h>
@@ -581,9 +581,9 @@ diff -NurpP --minimal linux-3.10.19/arch/s390/include/asm/tlb.h linux-3.10.19-vs
581 #include <asm/processor.h> 581 #include <asm/processor.h>
582 #include <asm/pgalloc.h> 582 #include <asm/pgalloc.h>
583 #include <asm/tlbflush.h> 583 #include <asm/tlbflush.h>
584diff -NurpP --minimal linux-3.10.19/arch/s390/include/uapi/asm/unistd.h linux-3.10.19-vs2.3.6.8/arch/s390/include/uapi/asm/unistd.h 584diff -NurpP --minimal linux-3.10.21/arch/s390/include/uapi/asm/unistd.h linux-3.10.21-vs2.3.6.8/arch/s390/include/uapi/asm/unistd.h
585--- linux-3.10.19/arch/s390/include/uapi/asm/unistd.h 2013-02-19 13:57:16.000000000 +0000 585--- linux-3.10.21/arch/s390/include/uapi/asm/unistd.h 2013-02-19 13:57:16.000000000 +0000
586+++ linux-3.10.19-vs2.3.6.8/arch/s390/include/uapi/asm/unistd.h 2013-08-22 20:29:59.000000000 +0000 586+++ linux-3.10.21-vs2.3.6.8/arch/s390/include/uapi/asm/unistd.h 2013-08-22 20:29:59.000000000 +0000
587@@ -200,7 +200,7 @@ 587@@ -200,7 +200,7 @@
588 #define __NR_clock_gettime (__NR_timer_create+6) 588 #define __NR_clock_gettime (__NR_timer_create+6)
589 #define __NR_clock_getres (__NR_timer_create+7) 589 #define __NR_clock_getres (__NR_timer_create+7)
@@ -593,9 +593,9 @@ diff -NurpP --minimal linux-3.10.19/arch/s390/include/uapi/asm/unistd.h linux-3.
593 #define __NR_statfs64 265 593 #define __NR_statfs64 265
594 #define __NR_fstatfs64 266 594 #define __NR_fstatfs64 266
595 #define __NR_remap_file_pages 267 595 #define __NR_remap_file_pages 267
596diff -NurpP --minimal linux-3.10.19/arch/s390/kernel/ptrace.c linux-3.10.19-vs2.3.6.8/arch/s390/kernel/ptrace.c 596diff -NurpP --minimal linux-3.10.21/arch/s390/kernel/ptrace.c linux-3.10.21-vs2.3.6.8/arch/s390/kernel/ptrace.c
597--- linux-3.10.19/arch/s390/kernel/ptrace.c 2012-12-11 03:30:57.000000000 +0000 597--- linux-3.10.21/arch/s390/kernel/ptrace.c 2012-12-11 03:30:57.000000000 +0000
598+++ linux-3.10.19-vs2.3.6.8/arch/s390/kernel/ptrace.c 2013-08-22 20:29:59.000000000 +0000 598+++ linux-3.10.21-vs2.3.6.8/arch/s390/kernel/ptrace.c 2013-08-22 20:29:59.000000000 +0000
599@@ -21,6 +21,7 @@ 599@@ -21,6 +21,7 @@
600 #include <linux/tracehook.h> 600 #include <linux/tracehook.h>
601 #include <linux/seccomp.h> 601 #include <linux/seccomp.h>
@@ -604,9 +604,9 @@ diff -NurpP --minimal linux-3.10.19/arch/s390/kernel/ptrace.c linux-3.10.19-vs2.
604 #include <trace/syscall.h> 604 #include <trace/syscall.h>
605 #include <asm/segment.h> 605 #include <asm/segment.h>
606 #include <asm/page.h> 606 #include <asm/page.h>
607diff -NurpP --minimal linux-3.10.19/arch/s390/kernel/syscalls.S linux-3.10.19-vs2.3.6.8/arch/s390/kernel/syscalls.S 607diff -NurpP --minimal linux-3.10.21/arch/s390/kernel/syscalls.S linux-3.10.21-vs2.3.6.8/arch/s390/kernel/syscalls.S
608--- linux-3.10.19/arch/s390/kernel/syscalls.S 2013-07-14 17:00:34.000000000 +0000 608--- linux-3.10.21/arch/s390/kernel/syscalls.S 2013-07-14 17:00:34.000000000 +0000
609+++ linux-3.10.19-vs2.3.6.8/arch/s390/kernel/syscalls.S 2013-08-22 20:29:59.000000000 +0000 609+++ linux-3.10.21-vs2.3.6.8/arch/s390/kernel/syscalls.S 2013-08-22 20:29:59.000000000 +0000
610@@ -271,7 +271,7 @@ SYSCALL(sys_clock_settime,sys_clock_sett 610@@ -271,7 +271,7 @@ SYSCALL(sys_clock_settime,sys_clock_sett
611 SYSCALL(sys_clock_gettime,sys_clock_gettime,sys32_clock_gettime_wrapper) /* 260 */ 611 SYSCALL(sys_clock_gettime,sys_clock_gettime,sys32_clock_gettime_wrapper) /* 260 */
612 SYSCALL(sys_clock_getres,sys_clock_getres,sys32_clock_getres_wrapper) 612 SYSCALL(sys_clock_getres,sys_clock_getres,sys32_clock_getres_wrapper)
@@ -616,9 +616,9 @@ diff -NurpP --minimal linux-3.10.19/arch/s390/kernel/syscalls.S linux-3.10.19-vs
616 SYSCALL(sys_s390_fadvise64_64,sys_ni_syscall,sys32_fadvise64_64_wrapper) 616 SYSCALL(sys_s390_fadvise64_64,sys_ni_syscall,sys32_fadvise64_64_wrapper)
617 SYSCALL(sys_statfs64,sys_statfs64,compat_sys_statfs64_wrapper) 617 SYSCALL(sys_statfs64,sys_statfs64,compat_sys_statfs64_wrapper)
618 SYSCALL(sys_fstatfs64,sys_fstatfs64,compat_sys_fstatfs64_wrapper) 618 SYSCALL(sys_fstatfs64,sys_fstatfs64,compat_sys_fstatfs64_wrapper)
619diff -NurpP --minimal linux-3.10.19/arch/sh/Kconfig linux-3.10.19-vs2.3.6.8/arch/sh/Kconfig 619diff -NurpP --minimal linux-3.10.21/arch/sh/Kconfig linux-3.10.21-vs2.3.6.8/arch/sh/Kconfig
620--- linux-3.10.19/arch/sh/Kconfig 2013-07-14 17:00:35.000000000 +0000 620--- linux-3.10.21/arch/sh/Kconfig 2013-07-14 17:00:35.000000000 +0000
621+++ linux-3.10.19-vs2.3.6.8/arch/sh/Kconfig 2013-08-22 20:29:59.000000000 +0000 621+++ linux-3.10.21-vs2.3.6.8/arch/sh/Kconfig 2013-08-22 20:29:59.000000000 +0000
622@@ -928,6 +928,8 @@ source "fs/Kconfig" 622@@ -928,6 +928,8 @@ source "fs/Kconfig"
623 623
624 source "arch/sh/Kconfig.debug" 624 source "arch/sh/Kconfig.debug"
@@ -628,9 +628,9 @@ diff -NurpP --minimal linux-3.10.19/arch/sh/Kconfig linux-3.10.19-vs2.3.6.8/arch
628 source "security/Kconfig" 628 source "security/Kconfig"
629 629
630 source "crypto/Kconfig" 630 source "crypto/Kconfig"
631diff -NurpP --minimal linux-3.10.19/arch/sh/kernel/irq.c linux-3.10.19-vs2.3.6.8/arch/sh/kernel/irq.c 631diff -NurpP --minimal linux-3.10.21/arch/sh/kernel/irq.c linux-3.10.21-vs2.3.6.8/arch/sh/kernel/irq.c
632--- linux-3.10.19/arch/sh/kernel/irq.c 2012-12-11 03:30:57.000000000 +0000 632--- linux-3.10.21/arch/sh/kernel/irq.c 2012-12-11 03:30:57.000000000 +0000
633+++ linux-3.10.19-vs2.3.6.8/arch/sh/kernel/irq.c 2013-08-22 20:29:59.000000000 +0000 633+++ linux-3.10.21-vs2.3.6.8/arch/sh/kernel/irq.c 2013-08-22 20:29:59.000000000 +0000
634@@ -14,6 +14,7 @@ 634@@ -14,6 +14,7 @@
635 #include <linux/ftrace.h> 635 #include <linux/ftrace.h>
636 #include <linux/delay.h> 636 #include <linux/delay.h>
@@ -639,9 +639,9 @@ diff -NurpP --minimal linux-3.10.19/arch/sh/kernel/irq.c linux-3.10.19-vs2.3.6.8
639 #include <asm/processor.h> 639 #include <asm/processor.h>
640 #include <asm/machvec.h> 640 #include <asm/machvec.h>
641 #include <asm/uaccess.h> 641 #include <asm/uaccess.h>
642diff -NurpP --minimal linux-3.10.19/arch/sparc/Kconfig linux-3.10.19-vs2.3.6.8/arch/sparc/Kconfig 642diff -NurpP --minimal linux-3.10.21/arch/sparc/Kconfig linux-3.10.21-vs2.3.6.8/arch/sparc/Kconfig
643--- linux-3.10.19/arch/sparc/Kconfig 2013-07-14 17:00:35.000000000 +0000 643--- linux-3.10.21/arch/sparc/Kconfig 2013-07-14 17:00:35.000000000 +0000
644+++ linux-3.10.19-vs2.3.6.8/arch/sparc/Kconfig 2013-08-22 20:29:59.000000000 +0000 644+++ linux-3.10.21-vs2.3.6.8/arch/sparc/Kconfig 2013-08-22 20:29:59.000000000 +0000
645@@ -550,6 +550,8 @@ source "fs/Kconfig" 645@@ -550,6 +550,8 @@ source "fs/Kconfig"
646 646
647 source "arch/sparc/Kconfig.debug" 647 source "arch/sparc/Kconfig.debug"
@@ -651,9 +651,9 @@ diff -NurpP --minimal linux-3.10.19/arch/sparc/Kconfig linux-3.10.19-vs2.3.6.8/a
651 source "security/Kconfig" 651 source "security/Kconfig"
652 652
653 source "crypto/Kconfig" 653 source "crypto/Kconfig"
654diff -NurpP --minimal linux-3.10.19/arch/sparc/include/uapi/asm/unistd.h linux-3.10.19-vs2.3.6.8/arch/sparc/include/uapi/asm/unistd.h 654diff -NurpP --minimal linux-3.10.21/arch/sparc/include/uapi/asm/unistd.h linux-3.10.21-vs2.3.6.8/arch/sparc/include/uapi/asm/unistd.h
655--- linux-3.10.19/arch/sparc/include/uapi/asm/unistd.h 2013-02-19 13:57:17.000000000 +0000 655--- linux-3.10.21/arch/sparc/include/uapi/asm/unistd.h 2013-02-19 13:57:17.000000000 +0000
656+++ linux-3.10.19-vs2.3.6.8/arch/sparc/include/uapi/asm/unistd.h 2013-08-22 20:29:59.000000000 +0000 656+++ linux-3.10.21-vs2.3.6.8/arch/sparc/include/uapi/asm/unistd.h 2013-08-22 20:29:59.000000000 +0000
657@@ -332,7 +332,7 @@ 657@@ -332,7 +332,7 @@
658 #define __NR_timer_getoverrun 264 658 #define __NR_timer_getoverrun 264
659 #define __NR_timer_delete 265 659 #define __NR_timer_delete 265
@@ -663,9 +663,9 @@ diff -NurpP --minimal linux-3.10.19/arch/sparc/include/uapi/asm/unistd.h linux-3
663 #define __NR_io_setup 268 663 #define __NR_io_setup 268
664 #define __NR_io_destroy 269 664 #define __NR_io_destroy 269
665 #define __NR_io_submit 270 665 #define __NR_io_submit 270
666diff -NurpP --minimal linux-3.10.19/arch/sparc/kernel/systbls_32.S linux-3.10.19-vs2.3.6.8/arch/sparc/kernel/systbls_32.S 666diff -NurpP --minimal linux-3.10.21/arch/sparc/kernel/systbls_32.S linux-3.10.21-vs2.3.6.8/arch/sparc/kernel/systbls_32.S
667--- linux-3.10.19/arch/sparc/kernel/systbls_32.S 2013-05-31 13:44:48.000000000 +0000 667--- linux-3.10.21/arch/sparc/kernel/systbls_32.S 2013-05-31 13:44:48.000000000 +0000
668+++ linux-3.10.19-vs2.3.6.8/arch/sparc/kernel/systbls_32.S 2013-08-22 20:29:59.000000000 +0000 668+++ linux-3.10.21-vs2.3.6.8/arch/sparc/kernel/systbls_32.S 2013-08-22 20:29:59.000000000 +0000
669@@ -70,7 +70,7 @@ sys_call_table: 669@@ -70,7 +70,7 @@ sys_call_table:
670 /*250*/ .long sys_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_ni_syscall 670 /*250*/ .long sys_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_ni_syscall
671 /*255*/ .long sys_sync_file_range, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep 671 /*255*/ .long sys_sync_file_range, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep
@@ -675,9 +675,9 @@ diff -NurpP --minimal linux-3.10.19/arch/sparc/kernel/systbls_32.S linux-3.10.19
675 /*270*/ .long sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink 675 /*270*/ .long sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink
676 /*275*/ .long sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid 676 /*275*/ .long sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid
677 /*280*/ .long sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat 677 /*280*/ .long sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat
678diff -NurpP --minimal linux-3.10.19/arch/sparc/kernel/systbls_64.S linux-3.10.19-vs2.3.6.8/arch/sparc/kernel/systbls_64.S 678diff -NurpP --minimal linux-3.10.21/arch/sparc/kernel/systbls_64.S linux-3.10.21-vs2.3.6.8/arch/sparc/kernel/systbls_64.S
679--- linux-3.10.19/arch/sparc/kernel/systbls_64.S 2013-07-14 17:00:35.000000000 +0000 679--- linux-3.10.21/arch/sparc/kernel/systbls_64.S 2013-07-14 17:00:35.000000000 +0000
680+++ linux-3.10.19-vs2.3.6.8/arch/sparc/kernel/systbls_64.S 2013-08-22 20:29:59.000000000 +0000 680+++ linux-3.10.21-vs2.3.6.8/arch/sparc/kernel/systbls_64.S 2013-08-22 20:29:59.000000000 +0000
681@@ -71,7 +71,7 @@ sys_call_table32: 681@@ -71,7 +71,7 @@ sys_call_table32:
682 /*250*/ .word sys_mremap, compat_sys_sysctl, sys_getsid, sys_fdatasync, sys_nis_syscall 682 /*250*/ .word sys_mremap, compat_sys_sysctl, sys_getsid, sys_fdatasync, sys_nis_syscall
683 .word sys32_sync_file_range, compat_sys_clock_settime, compat_sys_clock_gettime, compat_sys_clock_getres, sys32_clock_nanosleep 683 .word sys32_sync_file_range, compat_sys_clock_settime, compat_sys_clock_gettime, compat_sys_clock_getres, sys32_clock_nanosleep
@@ -696,9 +696,9 @@ diff -NurpP --minimal linux-3.10.19/arch/sparc/kernel/systbls_64.S linux-3.10.19
696 /*270*/ .word sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink 696 /*270*/ .word sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink
697 .word sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid 697 .word sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid
698 /*280*/ .word sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat 698 /*280*/ .word sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat
699diff -NurpP --minimal linux-3.10.19/arch/um/Kconfig.rest linux-3.10.19-vs2.3.6.8/arch/um/Kconfig.rest 699diff -NurpP --minimal linux-3.10.21/arch/um/Kconfig.rest linux-3.10.21-vs2.3.6.8/arch/um/Kconfig.rest
700--- linux-3.10.19/arch/um/Kconfig.rest 2012-12-11 03:30:57.000000000 +0000 700--- linux-3.10.21/arch/um/Kconfig.rest 2012-12-11 03:30:57.000000000 +0000
701+++ linux-3.10.19-vs2.3.6.8/arch/um/Kconfig.rest 2013-08-22 20:29:59.000000000 +0000 701+++ linux-3.10.21-vs2.3.6.8/arch/um/Kconfig.rest 2013-08-22 20:29:59.000000000 +0000
702@@ -12,6 +12,8 @@ source "arch/um/Kconfig.net" 702@@ -12,6 +12,8 @@ source "arch/um/Kconfig.net"
703 703
704 source "fs/Kconfig" 704 source "fs/Kconfig"
@@ -708,9 +708,9 @@ diff -NurpP --minimal linux-3.10.19/arch/um/Kconfig.rest linux-3.10.19-vs2.3.6.8
708 source "security/Kconfig" 708 source "security/Kconfig"
709 709
710 source "crypto/Kconfig" 710 source "crypto/Kconfig"
711diff -NurpP --minimal linux-3.10.19/arch/x86/Kconfig linux-3.10.19-vs2.3.6.8/arch/x86/Kconfig 711diff -NurpP --minimal linux-3.10.21/arch/x86/Kconfig linux-3.10.21-vs2.3.6.8/arch/x86/Kconfig
712--- linux-3.10.19/arch/x86/Kconfig 2013-07-14 17:00:36.000000000 +0000 712--- linux-3.10.21/arch/x86/Kconfig 2013-07-14 17:00:36.000000000 +0000
713+++ linux-3.10.19-vs2.3.6.8/arch/x86/Kconfig 2013-08-22 20:29:59.000000000 +0000 713+++ linux-3.10.21-vs2.3.6.8/arch/x86/Kconfig 2013-08-22 20:29:59.000000000 +0000
714@@ -2339,6 +2339,8 @@ source "fs/Kconfig" 714@@ -2339,6 +2339,8 @@ source "fs/Kconfig"
715 715
716 source "arch/x86/Kconfig.debug" 716 source "arch/x86/Kconfig.debug"
@@ -720,9 +720,9 @@ diff -NurpP --minimal linux-3.10.19/arch/x86/Kconfig linux-3.10.19-vs2.3.6.8/arc
720 source "security/Kconfig" 720 source "security/Kconfig"
721 721
722 source "crypto/Kconfig" 722 source "crypto/Kconfig"
723diff -NurpP --minimal linux-3.10.19/arch/x86/syscalls/syscall_32.tbl linux-3.10.19-vs2.3.6.8/arch/x86/syscalls/syscall_32.tbl 723diff -NurpP --minimal linux-3.10.21/arch/x86/syscalls/syscall_32.tbl linux-3.10.21-vs2.3.6.8/arch/x86/syscalls/syscall_32.tbl
724--- linux-3.10.19/arch/x86/syscalls/syscall_32.tbl 2013-07-14 17:00:37.000000000 +0000 724--- linux-3.10.21/arch/x86/syscalls/syscall_32.tbl 2013-07-14 17:00:37.000000000 +0000
725+++ linux-3.10.19-vs2.3.6.8/arch/x86/syscalls/syscall_32.tbl 2013-08-22 20:29:59.000000000 +0000 725+++ linux-3.10.21-vs2.3.6.8/arch/x86/syscalls/syscall_32.tbl 2013-08-22 20:29:59.000000000 +0000
726@@ -279,7 +279,7 @@ 726@@ -279,7 +279,7 @@
727 270 i386 tgkill sys_tgkill 727 270 i386 tgkill sys_tgkill
728 271 i386 utimes sys_utimes compat_sys_utimes 728 271 i386 utimes sys_utimes compat_sys_utimes
@@ -732,9 +732,9 @@ diff -NurpP --minimal linux-3.10.19/arch/x86/syscalls/syscall_32.tbl linux-3.10.
732 274 i386 mbind sys_mbind 732 274 i386 mbind sys_mbind
733 275 i386 get_mempolicy sys_get_mempolicy compat_sys_get_mempolicy 733 275 i386 get_mempolicy sys_get_mempolicy compat_sys_get_mempolicy
734 276 i386 set_mempolicy sys_set_mempolicy 734 276 i386 set_mempolicy sys_set_mempolicy
735diff -NurpP --minimal linux-3.10.19/arch/x86/syscalls/syscall_64.tbl linux-3.10.19-vs2.3.6.8/arch/x86/syscalls/syscall_64.tbl 735diff -NurpP --minimal linux-3.10.21/arch/x86/syscalls/syscall_64.tbl linux-3.10.21-vs2.3.6.8/arch/x86/syscalls/syscall_64.tbl
736--- linux-3.10.19/arch/x86/syscalls/syscall_64.tbl 2013-05-31 13:44:50.000000000 +0000 736--- linux-3.10.21/arch/x86/syscalls/syscall_64.tbl 2013-05-31 13:44:50.000000000 +0000
737+++ linux-3.10.19-vs2.3.6.8/arch/x86/syscalls/syscall_64.tbl 2013-08-22 20:29:59.000000000 +0000 737+++ linux-3.10.21-vs2.3.6.8/arch/x86/syscalls/syscall_64.tbl 2013-08-22 20:29:59.000000000 +0000
738@@ -242,7 +242,7 @@ 738@@ -242,7 +242,7 @@
739 233 common epoll_ctl sys_epoll_ctl 739 233 common epoll_ctl sys_epoll_ctl
740 234 common tgkill sys_tgkill 740 234 common tgkill sys_tgkill
@@ -744,9 +744,9 @@ diff -NurpP --minimal linux-3.10.19/arch/x86/syscalls/syscall_64.tbl linux-3.10.
744 237 common mbind sys_mbind 744 237 common mbind sys_mbind
745 238 common set_mempolicy sys_set_mempolicy 745 238 common set_mempolicy sys_set_mempolicy
746 239 common get_mempolicy sys_get_mempolicy 746 239 common get_mempolicy sys_get_mempolicy
747diff -NurpP --minimal linux-3.10.19/drivers/block/Kconfig linux-3.10.19-vs2.3.6.8/drivers/block/Kconfig 747diff -NurpP --minimal linux-3.10.21/drivers/block/Kconfig linux-3.10.21-vs2.3.6.8/drivers/block/Kconfig
748--- linux-3.10.19/drivers/block/Kconfig 2013-05-31 13:44:51.000000000 +0000 748--- linux-3.10.21/drivers/block/Kconfig 2013-05-31 13:44:51.000000000 +0000
749+++ linux-3.10.19-vs2.3.6.8/drivers/block/Kconfig 2013-08-22 20:29:59.000000000 +0000 749+++ linux-3.10.21-vs2.3.6.8/drivers/block/Kconfig 2013-08-22 20:29:59.000000000 +0000
750@@ -278,6 +278,13 @@ config BLK_DEV_CRYPTOLOOP 750@@ -278,6 +278,13 @@ config BLK_DEV_CRYPTOLOOP
751 751
752 source "drivers/block/drbd/Kconfig" 752 source "drivers/block/drbd/Kconfig"
@@ -761,9 +761,9 @@ diff -NurpP --minimal linux-3.10.19/drivers/block/Kconfig linux-3.10.19-vs2.3.6.
761 config BLK_DEV_NBD 761 config BLK_DEV_NBD
762 tristate "Network block device support" 762 tristate "Network block device support"
763 depends on NET 763 depends on NET
764diff -NurpP --minimal linux-3.10.19/drivers/block/Makefile linux-3.10.19-vs2.3.6.8/drivers/block/Makefile 764diff -NurpP --minimal linux-3.10.21/drivers/block/Makefile linux-3.10.21-vs2.3.6.8/drivers/block/Makefile
765--- linux-3.10.19/drivers/block/Makefile 2013-07-14 17:00:41.000000000 +0000 765--- linux-3.10.21/drivers/block/Makefile 2013-07-14 17:00:41.000000000 +0000
766+++ linux-3.10.19-vs2.3.6.8/drivers/block/Makefile 2013-08-22 20:29:59.000000000 +0000 766+++ linux-3.10.21-vs2.3.6.8/drivers/block/Makefile 2013-08-22 20:29:59.000000000 +0000
767@@ -33,6 +33,7 @@ obj-$(CONFIG_VIRTIO_BLK) += virtio_blk.o 767@@ -33,6 +33,7 @@ obj-$(CONFIG_VIRTIO_BLK) += virtio_blk.o
768 obj-$(CONFIG_VIODASD) += viodasd.o 768 obj-$(CONFIG_VIODASD) += viodasd.o
769 obj-$(CONFIG_BLK_DEV_SX8) += sx8.o 769 obj-$(CONFIG_BLK_DEV_SX8) += sx8.o
@@ -772,9 +772,9 @@ diff -NurpP --minimal linux-3.10.19/drivers/block/Makefile linux-3.10.19-vs2.3.6
772 772
773 obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o 773 obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o
774 obj-$(CONFIG_XEN_BLKDEV_BACKEND) += xen-blkback/ 774 obj-$(CONFIG_XEN_BLKDEV_BACKEND) += xen-blkback/
775diff -NurpP --minimal linux-3.10.19/drivers/block/loop.c linux-3.10.19-vs2.3.6.8/drivers/block/loop.c 775diff -NurpP --minimal linux-3.10.21/drivers/block/loop.c linux-3.10.21-vs2.3.6.8/drivers/block/loop.c
776--- linux-3.10.19/drivers/block/loop.c 2013-07-14 17:00:41.000000000 +0000 776--- linux-3.10.21/drivers/block/loop.c 2013-11-30 07:50:39.000000000 +0000
777+++ linux-3.10.19-vs2.3.6.8/drivers/block/loop.c 2013-08-22 20:29:59.000000000 +0000 777+++ linux-3.10.21-vs2.3.6.8/drivers/block/loop.c 2013-11-30 07:53:00.000000000 +0000
778@@ -76,6 +76,7 @@ 778@@ -76,6 +76,7 @@
779 #include <linux/sysfs.h> 779 #include <linux/sysfs.h>
780 #include <linux/miscdevice.h> 780 #include <linux/miscdevice.h>
@@ -830,9 +830,9 @@ diff -NurpP --minimal linux-3.10.19/drivers/block/loop.c linux-3.10.19-vs2.3.6.8
830 mutex_lock(&lo->lo_ctl_mutex); 830 mutex_lock(&lo->lo_ctl_mutex);
831 lo->lo_refcnt++; 831 lo->lo_refcnt++;
832 mutex_unlock(&lo->lo_ctl_mutex); 832 mutex_unlock(&lo->lo_ctl_mutex);
833diff -NurpP --minimal linux-3.10.19/drivers/block/vroot.c linux-3.10.19-vs2.3.6.8/drivers/block/vroot.c 833diff -NurpP --minimal linux-3.10.21/drivers/block/vroot.c linux-3.10.21-vs2.3.6.8/drivers/block/vroot.c
834--- linux-3.10.19/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000 834--- linux-3.10.21/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000
835+++ linux-3.10.19-vs2.3.6.8/drivers/block/vroot.c 2013-08-23 00:23:45.000000000 +0000 835+++ linux-3.10.21-vs2.3.6.8/drivers/block/vroot.c 2013-08-23 00:23:45.000000000 +0000
836@@ -0,0 +1,290 @@ 836@@ -0,0 +1,290 @@
837+/* 837+/*
838+ * linux/drivers/block/vroot.c 838+ * linux/drivers/block/vroot.c
@@ -1124,9 +1124,9 @@ diff -NurpP --minimal linux-3.10.19/drivers/block/vroot.c linux-3.10.19-vs2.3.6.
1124+ 1124+
1125+#endif 1125+#endif
1126+ 1126+
1127diff -NurpP --minimal linux-3.10.19/drivers/infiniband/Kconfig linux-3.10.19-vs2.3.6.8/drivers/infiniband/Kconfig 1127diff -NurpP --minimal linux-3.10.21/drivers/infiniband/Kconfig linux-3.10.21-vs2.3.6.8/drivers/infiniband/Kconfig
1128--- linux-3.10.19/drivers/infiniband/Kconfig 2013-07-14 17:00:49.000000000 +0000 1128--- linux-3.10.21/drivers/infiniband/Kconfig 2013-07-14 17:00:49.000000000 +0000
1129+++ linux-3.10.19-vs2.3.6.8/drivers/infiniband/Kconfig 2013-08-22 20:29:59.000000000 +0000 1129+++ linux-3.10.21-vs2.3.6.8/drivers/infiniband/Kconfig 2013-08-22 20:29:59.000000000 +0000
1130@@ -39,7 +39,7 @@ config INFINIBAND_USER_MEM 1130@@ -39,7 +39,7 @@ config INFINIBAND_USER_MEM
1131 config INFINIBAND_ADDR_TRANS 1131 config INFINIBAND_ADDR_TRANS
1132 bool 1132 bool
@@ -1136,9 +1136,9 @@ diff -NurpP --minimal linux-3.10.19/drivers/infiniband/Kconfig linux-3.10.19-vs2
1136 default y 1136 default y
1137 1137
1138 source "drivers/infiniband/hw/mthca/Kconfig" 1138 source "drivers/infiniband/hw/mthca/Kconfig"
1139diff -NurpP --minimal linux-3.10.19/drivers/infiniband/core/addr.c linux-3.10.19-vs2.3.6.8/drivers/infiniband/core/addr.c 1139diff -NurpP --minimal linux-3.10.21/drivers/infiniband/core/addr.c linux-3.10.21-vs2.3.6.8/drivers/infiniband/core/addr.c
1140--- linux-3.10.19/drivers/infiniband/core/addr.c 2012-12-11 03:30:57.000000000 +0000 1140--- linux-3.10.21/drivers/infiniband/core/addr.c 2012-12-11 03:30:57.000000000 +0000
1141+++ linux-3.10.19-vs2.3.6.8/drivers/infiniband/core/addr.c 2013-08-22 20:29:59.000000000 +0000 1141+++ linux-3.10.21-vs2.3.6.8/drivers/infiniband/core/addr.c 2013-08-22 20:29:59.000000000 +0000
1142@@ -261,7 +261,7 @@ static int addr6_resolve(struct sockaddr 1142@@ -261,7 +261,7 @@ static int addr6_resolve(struct sockaddr
1143 1143
1144 if (ipv6_addr_any(&fl6.saddr)) { 1144 if (ipv6_addr_any(&fl6.saddr)) {
@@ -1148,9 +1148,9 @@ diff -NurpP --minimal linux-3.10.19/drivers/infiniband/core/addr.c linux-3.10.19
1148 if (ret) 1148 if (ret)
1149 goto put; 1149 goto put;
1150 1150
1151diff -NurpP --minimal linux-3.10.19/drivers/md/dm-ioctl.c linux-3.10.19-vs2.3.6.8/drivers/md/dm-ioctl.c 1151diff -NurpP --minimal linux-3.10.21/drivers/md/dm-ioctl.c linux-3.10.21-vs2.3.6.8/drivers/md/dm-ioctl.c
1152--- linux-3.10.19/drivers/md/dm-ioctl.c 2013-11-13 17:21:12.000000000 +0000 1152--- linux-3.10.21/drivers/md/dm-ioctl.c 2013-11-30 07:50:42.000000000 +0000
1153+++ linux-3.10.19-vs2.3.6.8/drivers/md/dm-ioctl.c 2013-11-13 17:17:15.000000000 +0000 1153+++ linux-3.10.21-vs2.3.6.8/drivers/md/dm-ioctl.c 2013-11-13 17:17:15.000000000 +0000
1154@@ -16,6 +16,7 @@ 1154@@ -16,6 +16,7 @@
1155 #include <linux/dm-ioctl.h> 1155 #include <linux/dm-ioctl.h>
1156 #include <linux/hdreg.h> 1156 #include <linux/hdreg.h>
@@ -1236,9 +1236,9 @@ diff -NurpP --minimal linux-3.10.19/drivers/md/dm-ioctl.c linux-3.10.19-vs2.3.6.
1236 return -EACCES; 1236 return -EACCES;
1237 1237
1238 if (_IOC_TYPE(command) != DM_IOCTL) 1238 if (_IOC_TYPE(command) != DM_IOCTL)
1239diff -NurpP --minimal linux-3.10.19/drivers/md/dm.c linux-3.10.19-vs2.3.6.8/drivers/md/dm.c 1239diff -NurpP --minimal linux-3.10.21/drivers/md/dm.c linux-3.10.21-vs2.3.6.8/drivers/md/dm.c
1240--- linux-3.10.19/drivers/md/dm.c 2013-11-13 17:21:12.000000000 +0000 1240--- linux-3.10.21/drivers/md/dm.c 2013-11-30 07:50:42.000000000 +0000
1241+++ linux-3.10.19-vs2.3.6.8/drivers/md/dm.c 2013-11-13 17:17:15.000000000 +0000 1241+++ linux-3.10.21-vs2.3.6.8/drivers/md/dm.c 2013-11-13 17:17:15.000000000 +0000
1242@@ -19,6 +19,7 @@ 1242@@ -19,6 +19,7 @@
1243 #include <linux/idr.h> 1243 #include <linux/idr.h>
1244 #include <linux/hdreg.h> 1244 #include <linux/hdreg.h>
@@ -1312,9 +1312,9 @@ diff -NurpP --minimal linux-3.10.19/drivers/md/dm.c linux-3.10.19-vs2.3.6.8/driv
1312 md->queue = blk_alloc_queue(GFP_KERNEL); 1312 md->queue = blk_alloc_queue(GFP_KERNEL);
1313 if (!md->queue) 1313 if (!md->queue)
1314 goto bad_queue; 1314 goto bad_queue;
1315diff -NurpP --minimal linux-3.10.19/drivers/md/dm.h linux-3.10.19-vs2.3.6.8/drivers/md/dm.h 1315diff -NurpP --minimal linux-3.10.21/drivers/md/dm.h linux-3.10.21-vs2.3.6.8/drivers/md/dm.h
1316--- linux-3.10.19/drivers/md/dm.h 2013-02-19 13:57:51.000000000 +0000 1316--- linux-3.10.21/drivers/md/dm.h 2013-02-19 13:57:51.000000000 +0000
1317+++ linux-3.10.19-vs2.3.6.8/drivers/md/dm.h 2013-08-22 20:29:59.000000000 +0000 1317+++ linux-3.10.21-vs2.3.6.8/drivers/md/dm.h 2013-08-22 20:29:59.000000000 +0000
1318@@ -46,6 +46,8 @@ struct dm_dev_internal { 1318@@ -46,6 +46,8 @@ struct dm_dev_internal {
1319 struct dm_table; 1319 struct dm_table;
1320 struct dm_md_mempools; 1320 struct dm_md_mempools;
@@ -1324,9 +1324,9 @@ diff -NurpP --minimal linux-3.10.19/drivers/md/dm.h linux-3.10.19-vs2.3.6.8/driv
1324 /*----------------------------------------------------------------- 1324 /*-----------------------------------------------------------------
1325 * Internal table functions. 1325 * Internal table functions.
1326 *---------------------------------------------------------------*/ 1326 *---------------------------------------------------------------*/
1327diff -NurpP --minimal linux-3.10.19/drivers/net/tun.c linux-3.10.19-vs2.3.6.8/drivers/net/tun.c 1327diff -NurpP --minimal linux-3.10.21/drivers/net/tun.c linux-3.10.21-vs2.3.6.8/drivers/net/tun.c
1328--- linux-3.10.19/drivers/net/tun.c 2013-11-13 17:21:13.000000000 +0000 1328--- linux-3.10.21/drivers/net/tun.c 2013-11-30 07:50:43.000000000 +0000
1329+++ linux-3.10.19-vs2.3.6.8/drivers/net/tun.c 2013-11-13 17:17:15.000000000 +0000 1329+++ linux-3.10.21-vs2.3.6.8/drivers/net/tun.c 2013-11-13 17:17:15.000000000 +0000
1330@@ -64,6 +64,7 @@ 1330@@ -64,6 +64,7 @@
1331 #include <linux/nsproxy.h> 1331 #include <linux/nsproxy.h>
1332 #include <linux/virtio_net.h> 1332 #include <linux/virtio_net.h>
@@ -1395,9 +1395,9 @@ diff -NurpP --minimal linux-3.10.19/drivers/net/tun.c linux-3.10.19-vs2.3.6.8/dr
1395 case TUNSETLINK: 1395 case TUNSETLINK:
1396 /* Only allow setting the type when the interface is down */ 1396 /* Only allow setting the type when the interface is down */
1397 if (tun->dev->flags & IFF_UP) { 1397 if (tun->dev->flags & IFF_UP) {
1398diff -NurpP --minimal linux-3.10.19/drivers/tty/sysrq.c linux-3.10.19-vs2.3.6.8/drivers/tty/sysrq.c 1398diff -NurpP --minimal linux-3.10.21/drivers/tty/sysrq.c linux-3.10.21-vs2.3.6.8/drivers/tty/sysrq.c
1399--- linux-3.10.19/drivers/tty/sysrq.c 2013-07-14 17:01:22.000000000 +0000 1399--- linux-3.10.21/drivers/tty/sysrq.c 2013-07-14 17:01:22.000000000 +0000
1400+++ linux-3.10.19-vs2.3.6.8/drivers/tty/sysrq.c 2013-08-22 20:58:35.000000000 +0000 1400+++ linux-3.10.21-vs2.3.6.8/drivers/tty/sysrq.c 2013-08-22 20:58:35.000000000 +0000
1401@@ -44,6 +44,7 @@ 1401@@ -44,6 +44,7 @@
1402 #include <linux/uaccess.h> 1402 #include <linux/uaccess.h>
1403 #include <linux/moduleparam.h> 1403 #include <linux/moduleparam.h>
@@ -1449,9 +1449,9 @@ diff -NurpP --minimal linux-3.10.19/drivers/tty/sysrq.c linux-3.10.19-vs2.3.6.8/
1449 else 1449 else
1450 retval = -1; 1450 retval = -1;
1451 return retval; 1451 return retval;
1452diff -NurpP --minimal linux-3.10.19/drivers/tty/tty_io.c linux-3.10.19-vs2.3.6.8/drivers/tty/tty_io.c 1452diff -NurpP --minimal linux-3.10.21/drivers/tty/tty_io.c linux-3.10.21-vs2.3.6.8/drivers/tty/tty_io.c
1453--- linux-3.10.19/drivers/tty/tty_io.c 2013-11-13 17:21:14.000000000 +0000 1453--- linux-3.10.21/drivers/tty/tty_io.c 2013-11-30 07:50:45.000000000 +0000
1454+++ linux-3.10.19-vs2.3.6.8/drivers/tty/tty_io.c 2013-11-13 17:17:15.000000000 +0000 1454+++ linux-3.10.21-vs2.3.6.8/drivers/tty/tty_io.c 2013-11-13 17:17:15.000000000 +0000
1455@@ -104,6 +104,7 @@ 1455@@ -104,6 +104,7 @@
1456 1456
1457 #include <linux/kmod.h> 1457 #include <linux/kmod.h>
@@ -1478,9 +1478,9 @@ diff -NurpP --minimal linux-3.10.19/drivers/tty/tty_io.c linux-3.10.19-vs2.3.6.8
1478 if (pgrp_nr < 0) 1478 if (pgrp_nr < 0)
1479 return -EINVAL; 1479 return -EINVAL;
1480 rcu_read_lock(); 1480 rcu_read_lock();
1481diff -NurpP --minimal linux-3.10.19/fs/attr.c linux-3.10.19-vs2.3.6.8/fs/attr.c 1481diff -NurpP --minimal linux-3.10.21/fs/attr.c linux-3.10.21-vs2.3.6.8/fs/attr.c
1482--- linux-3.10.19/fs/attr.c 2013-02-19 13:58:46.000000000 +0000 1482--- linux-3.10.21/fs/attr.c 2013-02-19 13:58:46.000000000 +0000
1483+++ linux-3.10.19-vs2.3.6.8/fs/attr.c 2013-08-22 20:29:59.000000000 +0000 1483+++ linux-3.10.21-vs2.3.6.8/fs/attr.c 2013-08-22 20:29:59.000000000 +0000
1484@@ -15,6 +15,9 @@ 1484@@ -15,6 +15,9 @@
1485 #include <linux/security.h> 1485 #include <linux/security.h>
1486 #include <linux/evm.h> 1486 #include <linux/evm.h>
@@ -1521,9 +1521,9 @@ diff -NurpP --minimal linux-3.10.19/fs/attr.c linux-3.10.19-vs2.3.6.8/fs/attr.c
1521 if (IS_IMMUTABLE(inode) || IS_APPEND(inode)) 1521 if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
1522 return -EPERM; 1522 return -EPERM;
1523 } 1523 }
1524diff -NurpP --minimal linux-3.10.19/fs/block_dev.c linux-3.10.19-vs2.3.6.8/fs/block_dev.c 1524diff -NurpP --minimal linux-3.10.21/fs/block_dev.c linux-3.10.21-vs2.3.6.8/fs/block_dev.c
1525--- linux-3.10.19/fs/block_dev.c 2013-11-13 17:21:14.000000000 +0000 1525--- linux-3.10.21/fs/block_dev.c 2013-11-30 07:50:46.000000000 +0000
1526+++ linux-3.10.19-vs2.3.6.8/fs/block_dev.c 2013-11-13 17:17:15.000000000 +0000 1526+++ linux-3.10.21-vs2.3.6.8/fs/block_dev.c 2013-11-13 17:17:15.000000000 +0000
1527@@ -28,6 +28,7 @@ 1527@@ -28,6 +28,7 @@
1528 #include <linux/log2.h> 1528 #include <linux/log2.h>
1529 #include <linux/cleancache.h> 1529 #include <linux/cleancache.h>
@@ -1561,9 +1561,9 @@ diff -NurpP --minimal linux-3.10.19/fs/block_dev.c linux-3.10.19-vs2.3.6.8/fs/bl
1561 if (bdev) { 1561 if (bdev) {
1562 spin_lock(&bdev_lock); 1562 spin_lock(&bdev_lock);
1563 if (!inode->i_bdev) { 1563 if (!inode->i_bdev) {
1564diff -NurpP --minimal linux-3.10.19/fs/btrfs/ctree.h linux-3.10.19-vs2.3.6.8/fs/btrfs/ctree.h 1564diff -NurpP --minimal linux-3.10.21/fs/btrfs/ctree.h linux-3.10.21-vs2.3.6.8/fs/btrfs/ctree.h
1565--- linux-3.10.19/fs/btrfs/ctree.h 2013-07-14 17:01:26.000000000 +0000 1565--- linux-3.10.21/fs/btrfs/ctree.h 2013-07-14 17:01:26.000000000 +0000
1566+++ linux-3.10.19-vs2.3.6.8/fs/btrfs/ctree.h 2013-08-22 20:29:59.000000000 +0000 1566+++ linux-3.10.21-vs2.3.6.8/fs/btrfs/ctree.h 2013-08-22 20:29:59.000000000 +0000
1567@@ -707,11 +707,14 @@ struct btrfs_inode_item { 1567@@ -707,11 +707,14 @@ struct btrfs_inode_item {
1568 /* modification sequence number for NFS */ 1568 /* modification sequence number for NFS */
1569 __le64 sequence; 1569 __le64 sequence;
@@ -1616,9 +1616,9 @@ diff -NurpP --minimal linux-3.10.19/fs/btrfs/ctree.h linux-3.10.19-vs2.3.6.8/fs/
1616 int btrfs_defrag_file(struct inode *inode, struct file *file, 1616 int btrfs_defrag_file(struct inode *inode, struct file *file,
1617 struct btrfs_ioctl_defrag_range_args *range, 1617 struct btrfs_ioctl_defrag_range_args *range,
1618 u64 newer_than, unsigned long max_pages); 1618 u64 newer_than, unsigned long max_pages);
1619diff -NurpP --minimal linux-3.10.19/fs/btrfs/disk-io.c linux-3.10.19-vs2.3.6.8/fs/btrfs/disk-io.c 1619diff -NurpP --minimal linux-3.10.21/fs/btrfs/disk-io.c linux-3.10.21-vs2.3.6.8/fs/btrfs/disk-io.c
1620--- linux-3.10.19/fs/btrfs/disk-io.c 2013-07-14 17:01:26.000000000 +0000 1620--- linux-3.10.21/fs/btrfs/disk-io.c 2013-07-14 17:01:26.000000000 +0000
1621+++ linux-3.10.19-vs2.3.6.8/fs/btrfs/disk-io.c 2013-08-22 20:29:59.000000000 +0000 1621+++ linux-3.10.21-vs2.3.6.8/fs/btrfs/disk-io.c 2013-08-22 20:29:59.000000000 +0000
1622@@ -2360,6 +2360,9 @@ int open_ctree(struct super_block *sb, 1622@@ -2360,6 +2360,9 @@ int open_ctree(struct super_block *sb,
1623 goto fail_alloc; 1623 goto fail_alloc;
1624 } 1624 }
@@ -1629,9 +1629,9 @@ diff -NurpP --minimal linux-3.10.19/fs/btrfs/disk-io.c linux-3.10.19-vs2.3.6.8/f
1629 features = btrfs_super_incompat_flags(disk_super) & 1629 features = btrfs_super_incompat_flags(disk_super) &
1630 ~BTRFS_FEATURE_INCOMPAT_SUPP; 1630 ~BTRFS_FEATURE_INCOMPAT_SUPP;
1631 if (features) { 1631 if (features) {
1632diff -NurpP --minimal linux-3.10.19/fs/btrfs/inode.c linux-3.10.19-vs2.3.6.8/fs/btrfs/inode.c 1632diff -NurpP --minimal linux-3.10.21/fs/btrfs/inode.c linux-3.10.21-vs2.3.6.8/fs/btrfs/inode.c
1633--- linux-3.10.19/fs/btrfs/inode.c 2013-11-13 17:21:14.000000000 +0000 1633--- linux-3.10.21/fs/btrfs/inode.c 2013-11-30 07:50:46.000000000 +0000
1634+++ linux-3.10.19-vs2.3.6.8/fs/btrfs/inode.c 2013-11-13 17:17:16.000000000 +0000 1634+++ linux-3.10.21-vs2.3.6.8/fs/btrfs/inode.c 2013-11-13 17:17:16.000000000 +0000
1635@@ -42,6 +42,7 @@ 1635@@ -42,6 +42,7 @@
1636 #include <linux/mount.h> 1636 #include <linux/mount.h>
1637 #include <linux/btrfs.h> 1637 #include <linux/btrfs.h>
@@ -1702,9 +1702,9 @@ diff -NurpP --minimal linux-3.10.19/fs/btrfs/inode.c linux-3.10.19-vs2.3.6.8/fs/
1702 .get_acl = btrfs_get_acl, 1702 .get_acl = btrfs_get_acl,
1703 }; 1703 };
1704 1704
1705diff -NurpP --minimal linux-3.10.19/fs/btrfs/ioctl.c linux-3.10.19-vs2.3.6.8/fs/btrfs/ioctl.c 1705diff -NurpP --minimal linux-3.10.21/fs/btrfs/ioctl.c linux-3.10.21-vs2.3.6.8/fs/btrfs/ioctl.c
1706--- linux-3.10.19/fs/btrfs/ioctl.c 2013-11-13 17:21:14.000000000 +0000 1706--- linux-3.10.21/fs/btrfs/ioctl.c 2013-11-30 07:50:46.000000000 +0000
1707+++ linux-3.10.19-vs2.3.6.8/fs/btrfs/ioctl.c 2013-11-13 17:17:16.000000000 +0000 1707+++ linux-3.10.21-vs2.3.6.8/fs/btrfs/ioctl.c 2013-11-13 17:17:16.000000000 +0000
1708@@ -75,10 +75,13 @@ static unsigned int btrfs_flags_to_ioctl 1708@@ -75,10 +75,13 @@ static unsigned int btrfs_flags_to_ioctl
1709 { 1709 {
1710 unsigned int iflags = 0; 1710 unsigned int iflags = 0;
@@ -1876,9 +1876,9 @@ diff -NurpP --minimal linux-3.10.19/fs/btrfs/ioctl.c linux-3.10.19-vs2.3.6.8/fs/
1876 if (flags & FS_APPEND_FL) 1876 if (flags & FS_APPEND_FL)
1877 ip->flags |= BTRFS_INODE_APPEND; 1877 ip->flags |= BTRFS_INODE_APPEND;
1878 else 1878 else
1879diff -NurpP --minimal linux-3.10.19/fs/btrfs/super.c linux-3.10.19-vs2.3.6.8/fs/btrfs/super.c 1879diff -NurpP --minimal linux-3.10.21/fs/btrfs/super.c linux-3.10.21-vs2.3.6.8/fs/btrfs/super.c
1880--- linux-3.10.19/fs/btrfs/super.c 2013-07-14 17:01:26.000000000 +0000 1880--- linux-3.10.21/fs/btrfs/super.c 2013-07-14 17:01:26.000000000 +0000
1881+++ linux-3.10.19-vs2.3.6.8/fs/btrfs/super.c 2013-08-22 20:29:59.000000000 +0000 1881+++ linux-3.10.21-vs2.3.6.8/fs/btrfs/super.c 2013-08-22 20:29:59.000000000 +0000
1882@@ -319,7 +319,7 @@ enum { 1882@@ -319,7 +319,7 @@ enum {
1883 Opt_no_space_cache, Opt_recovery, Opt_skip_balance, 1883 Opt_no_space_cache, Opt_recovery, Opt_skip_balance,
1884 Opt_check_integrity, Opt_check_integrity_including_extent_data, 1884 Opt_check_integrity, Opt_check_integrity_including_extent_data,
@@ -1934,9 +1934,9 @@ diff -NurpP --minimal linux-3.10.19/fs/btrfs/super.c linux-3.10.19-vs2.3.6.8/fs/
1934 if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY)) 1934 if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
1935 goto out; 1935 goto out;
1936 1936
1937diff -NurpP --minimal linux-3.10.19/fs/char_dev.c linux-3.10.19-vs2.3.6.8/fs/char_dev.c 1937diff -NurpP --minimal linux-3.10.21/fs/char_dev.c linux-3.10.21-vs2.3.6.8/fs/char_dev.c
1938--- linux-3.10.19/fs/char_dev.c 2012-12-11 03:30:57.000000000 +0000 1938--- linux-3.10.21/fs/char_dev.c 2012-12-11 03:30:57.000000000 +0000
1939+++ linux-3.10.19-vs2.3.6.8/fs/char_dev.c 2013-08-22 20:29:59.000000000 +0000 1939+++ linux-3.10.21-vs2.3.6.8/fs/char_dev.c 2013-08-22 20:29:59.000000000 +0000
1940@@ -21,6 +21,8 @@ 1940@@ -21,6 +21,8 @@
1941 #include <linux/mutex.h> 1941 #include <linux/mutex.h>
1942 #include <linux/backing-dev.h> 1942 #include <linux/backing-dev.h>
@@ -1969,9 +1969,9 @@ diff -NurpP --minimal linux-3.10.19/fs/char_dev.c linux-3.10.19-vs2.3.6.8/fs/cha
1969 if (!kobj) 1969 if (!kobj)
1970 return -ENXIO; 1970 return -ENXIO;
1971 new = container_of(kobj, struct cdev, kobj); 1971 new = container_of(kobj, struct cdev, kobj);
1972diff -NurpP --minimal linux-3.10.19/fs/dcache.c linux-3.10.19-vs2.3.6.8/fs/dcache.c 1972diff -NurpP --minimal linux-3.10.21/fs/dcache.c linux-3.10.21-vs2.3.6.8/fs/dcache.c
1973--- linux-3.10.19/fs/dcache.c 2013-11-13 17:21:14.000000000 +0000 1973--- linux-3.10.21/fs/dcache.c 2013-11-30 07:50:46.000000000 +0000
1974+++ linux-3.10.19-vs2.3.6.8/fs/dcache.c 2013-11-13 17:17:16.000000000 +0000 1974+++ linux-3.10.21-vs2.3.6.8/fs/dcache.c 2013-11-13 17:17:16.000000000 +0000
1975@@ -37,6 +37,7 @@ 1975@@ -37,6 +37,7 @@
1976 #include <linux/rculist_bl.h> 1976 #include <linux/rculist_bl.h>
1977 #include <linux/prefetch.h> 1977 #include <linux/prefetch.h>
@@ -2023,9 +2023,9 @@ diff -NurpP --minimal linux-3.10.19/fs/dcache.c linux-3.10.19-vs2.3.6.8/fs/dcach
2023 found = dentry; 2023 found = dentry;
2024 spin_unlock(&dentry->d_lock); 2024 spin_unlock(&dentry->d_lock);
2025 break; 2025 break;
2026diff -NurpP --minimal linux-3.10.19/fs/devpts/inode.c linux-3.10.19-vs2.3.6.8/fs/devpts/inode.c 2026diff -NurpP --minimal linux-3.10.21/fs/devpts/inode.c linux-3.10.21-vs2.3.6.8/fs/devpts/inode.c
2027--- linux-3.10.19/fs/devpts/inode.c 2013-05-31 13:45:23.000000000 +0000 2027--- linux-3.10.21/fs/devpts/inode.c 2013-05-31 13:45:23.000000000 +0000
2028+++ linux-3.10.19-vs2.3.6.8/fs/devpts/inode.c 2013-08-22 20:29:59.000000000 +0000 2028+++ linux-3.10.21-vs2.3.6.8/fs/devpts/inode.c 2013-08-22 20:29:59.000000000 +0000
2029@@ -25,6 +25,7 @@ 2029@@ -25,6 +25,7 @@
2030 #include <linux/parser.h> 2030 #include <linux/parser.h>
2031 #include <linux/fsnotify.h> 2031 #include <linux/fsnotify.h>
@@ -2113,9 +2113,9 @@ diff -NurpP --minimal linux-3.10.19/fs/devpts/inode.c linux-3.10.19-vs2.3.6.8/fs
2113 inode->i_private = priv; 2113 inode->i_private = priv;
2114 2114
2115 sprintf(s, "%d", index); 2115 sprintf(s, "%d", index);
2116diff -NurpP --minimal linux-3.10.19/fs/ext2/balloc.c linux-3.10.19-vs2.3.6.8/fs/ext2/balloc.c 2116diff -NurpP --minimal linux-3.10.21/fs/ext2/balloc.c linux-3.10.21-vs2.3.6.8/fs/ext2/balloc.c
2117--- linux-3.10.19/fs/ext2/balloc.c 2013-05-31 13:45:23.000000000 +0000 2117--- linux-3.10.21/fs/ext2/balloc.c 2013-05-31 13:45:23.000000000 +0000
2118+++ linux-3.10.19-vs2.3.6.8/fs/ext2/balloc.c 2013-08-22 20:29:59.000000000 +0000 2118+++ linux-3.10.21-vs2.3.6.8/fs/ext2/balloc.c 2013-08-22 20:29:59.000000000 +0000
2119@@ -693,7 +693,6 @@ ext2_try_to_allocate(struct super_block 2119@@ -693,7 +693,6 @@ ext2_try_to_allocate(struct super_block
2120 start = 0; 2120 start = 0;
2121 end = EXT2_BLOCKS_PER_GROUP(sb); 2121 end = EXT2_BLOCKS_PER_GROUP(sb);
@@ -2124,9 +2124,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ext2/balloc.c linux-3.10.19-vs2.3.6.8/fs/
2124 BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb)); 2124 BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb));
2125 2125
2126 repeat: 2126 repeat:
2127diff -NurpP --minimal linux-3.10.19/fs/ext2/ext2.h linux-3.10.19-vs2.3.6.8/fs/ext2/ext2.h 2127diff -NurpP --minimal linux-3.10.21/fs/ext2/ext2.h linux-3.10.21-vs2.3.6.8/fs/ext2/ext2.h
2128--- linux-3.10.19/fs/ext2/ext2.h 2012-12-11 03:30:57.000000000 +0000 2128--- linux-3.10.21/fs/ext2/ext2.h 2012-12-11 03:30:57.000000000 +0000
2129+++ linux-3.10.19-vs2.3.6.8/fs/ext2/ext2.h 2013-08-22 20:29:59.000000000 +0000 2129+++ linux-3.10.21-vs2.3.6.8/fs/ext2/ext2.h 2013-08-22 20:29:59.000000000 +0000
2130@@ -244,8 +244,12 @@ struct ext2_group_desc 2130@@ -244,8 +244,12 @@ struct ext2_group_desc
2131 #define EXT2_NOTAIL_FL FS_NOTAIL_FL /* file tail should not be merged */ 2131 #define EXT2_NOTAIL_FL FS_NOTAIL_FL /* file tail should not be merged */
2132 #define EXT2_DIRSYNC_FL FS_DIRSYNC_FL /* dirsync behaviour (directories only) */ 2132 #define EXT2_DIRSYNC_FL FS_DIRSYNC_FL /* dirsync behaviour (directories only) */
@@ -2174,18 +2174,18 @@ diff -NurpP --minimal linux-3.10.19/fs/ext2/ext2.h linux-3.10.19-vs2.3.6.8/fs/ex
2174 2174
2175 /* ioctl.c */ 2175 /* ioctl.c */
2176 extern long ext2_ioctl(struct file *, unsigned int, unsigned long); 2176 extern long ext2_ioctl(struct file *, unsigned int, unsigned long);
2177diff -NurpP --minimal linux-3.10.19/fs/ext2/file.c linux-3.10.19-vs2.3.6.8/fs/ext2/file.c 2177diff -NurpP --minimal linux-3.10.21/fs/ext2/file.c linux-3.10.21-vs2.3.6.8/fs/ext2/file.c
2178--- linux-3.10.19/fs/ext2/file.c 2012-12-11 03:30:57.000000000 +0000 2178--- linux-3.10.21/fs/ext2/file.c 2012-12-11 03:30:57.000000000 +0000
2179+++ linux-3.10.19-vs2.3.6.8/fs/ext2/file.c 2013-08-22 20:29:59.000000000 +0000 2179+++ linux-3.10.21-vs2.3.6.8/fs/ext2/file.c 2013-08-22 20:29:59.000000000 +0000
2180@@ -104,4 +104,5 @@ const struct inode_operations ext2_file_ 2180@@ -104,4 +104,5 @@ const struct inode_operations ext2_file_
2181 .setattr = ext2_setattr, 2181 .setattr = ext2_setattr,
2182 .get_acl = ext2_get_acl, 2182 .get_acl = ext2_get_acl,
2183 .fiemap = ext2_fiemap, 2183 .fiemap = ext2_fiemap,
2184+ .sync_flags = ext2_sync_flags, 2184+ .sync_flags = ext2_sync_flags,
2185 }; 2185 };
2186diff -NurpP --minimal linux-3.10.19/fs/ext2/ialloc.c linux-3.10.19-vs2.3.6.8/fs/ext2/ialloc.c 2186diff -NurpP --minimal linux-3.10.21/fs/ext2/ialloc.c linux-3.10.21-vs2.3.6.8/fs/ext2/ialloc.c
2187--- linux-3.10.19/fs/ext2/ialloc.c 2013-05-31 13:45:23.000000000 +0000 2187--- linux-3.10.21/fs/ext2/ialloc.c 2013-05-31 13:45:23.000000000 +0000
2188+++ linux-3.10.19-vs2.3.6.8/fs/ext2/ialloc.c 2013-08-22 20:29:59.000000000 +0000 2188+++ linux-3.10.21-vs2.3.6.8/fs/ext2/ialloc.c 2013-08-22 20:29:59.000000000 +0000
2189@@ -17,6 +17,7 @@ 2189@@ -17,6 +17,7 @@
2190 #include <linux/backing-dev.h> 2190 #include <linux/backing-dev.h>
2191 #include <linux/buffer_head.h> 2191 #include <linux/buffer_head.h>
@@ -2202,9 +2202,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ext2/ialloc.c linux-3.10.19-vs2.3.6.8/fs/
2202 } else 2202 } else
2203 inode_init_owner(inode, dir, mode); 2203 inode_init_owner(inode, dir, mode);
2204 2204
2205diff -NurpP --minimal linux-3.10.19/fs/ext2/inode.c linux-3.10.19-vs2.3.6.8/fs/ext2/inode.c 2205diff -NurpP --minimal linux-3.10.21/fs/ext2/inode.c linux-3.10.21-vs2.3.6.8/fs/ext2/inode.c
2206--- linux-3.10.19/fs/ext2/inode.c 2013-07-14 17:01:27.000000000 +0000 2206--- linux-3.10.21/fs/ext2/inode.c 2013-07-14 17:01:27.000000000 +0000
2207+++ linux-3.10.19-vs2.3.6.8/fs/ext2/inode.c 2013-08-22 21:46:54.000000000 +0000 2207+++ linux-3.10.21-vs2.3.6.8/fs/ext2/inode.c 2013-08-22 21:46:54.000000000 +0000
2208@@ -32,6 +32,7 @@ 2208@@ -32,6 +32,7 @@
2209 #include <linux/fiemap.h> 2209 #include <linux/fiemap.h>
2210 #include <linux/namei.h> 2210 #include <linux/namei.h>
@@ -2337,9 +2337,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ext2/inode.c linux-3.10.19-vs2.3.6.8/fs/e
2337 error = dquot_transfer(inode, iattr); 2337 error = dquot_transfer(inode, iattr);
2338 if (error) 2338 if (error)
2339 return error; 2339 return error;
2340diff -NurpP --minimal linux-3.10.19/fs/ext2/ioctl.c linux-3.10.19-vs2.3.6.8/fs/ext2/ioctl.c 2340diff -NurpP --minimal linux-3.10.21/fs/ext2/ioctl.c linux-3.10.21-vs2.3.6.8/fs/ext2/ioctl.c
2341--- linux-3.10.19/fs/ext2/ioctl.c 2013-05-31 13:45:23.000000000 +0000 2341--- linux-3.10.21/fs/ext2/ioctl.c 2013-05-31 13:45:23.000000000 +0000
2342+++ linux-3.10.19-vs2.3.6.8/fs/ext2/ioctl.c 2013-08-22 20:29:59.000000000 +0000 2342+++ linux-3.10.21-vs2.3.6.8/fs/ext2/ioctl.c 2013-08-22 20:29:59.000000000 +0000
2343@@ -17,6 +17,16 @@ 2343@@ -17,6 +17,16 @@
2344 #include <asm/uaccess.h> 2344 #include <asm/uaccess.h>
2345 2345
@@ -2389,9 +2389,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ext2/ioctl.c linux-3.10.19-vs2.3.6.8/fs/e
2389 flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE; 2389 flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE;
2390 ei->i_flags = flags; 2390 ei->i_flags = flags;
2391 2391
2392diff -NurpP --minimal linux-3.10.19/fs/ext2/namei.c linux-3.10.19-vs2.3.6.8/fs/ext2/namei.c 2392diff -NurpP --minimal linux-3.10.21/fs/ext2/namei.c linux-3.10.21-vs2.3.6.8/fs/ext2/namei.c
2393--- linux-3.10.19/fs/ext2/namei.c 2012-12-11 03:30:57.000000000 +0000 2393--- linux-3.10.21/fs/ext2/namei.c 2012-12-11 03:30:57.000000000 +0000
2394+++ linux-3.10.19-vs2.3.6.8/fs/ext2/namei.c 2013-08-22 20:29:59.000000000 +0000 2394+++ linux-3.10.21-vs2.3.6.8/fs/ext2/namei.c 2013-08-22 20:29:59.000000000 +0000
2395@@ -32,6 +32,7 @@ 2395@@ -32,6 +32,7 @@
2396 2396
2397 #include <linux/pagemap.h> 2397 #include <linux/pagemap.h>
@@ -2416,9 +2416,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ext2/namei.c linux-3.10.19-vs2.3.6.8/fs/e
2416 .get_acl = ext2_get_acl, 2416 .get_acl = ext2_get_acl,
2417 }; 2417 };
2418 2418
2419diff -NurpP --minimal linux-3.10.19/fs/ext2/super.c linux-3.10.19-vs2.3.6.8/fs/ext2/super.c 2419diff -NurpP --minimal linux-3.10.21/fs/ext2/super.c linux-3.10.21-vs2.3.6.8/fs/ext2/super.c
2420--- linux-3.10.19/fs/ext2/super.c 2013-05-31 13:45:23.000000000 +0000 2420--- linux-3.10.21/fs/ext2/super.c 2013-05-31 13:45:23.000000000 +0000
2421+++ linux-3.10.19-vs2.3.6.8/fs/ext2/super.c 2013-08-22 20:29:59.000000000 +0000 2421+++ linux-3.10.21-vs2.3.6.8/fs/ext2/super.c 2013-08-22 20:29:59.000000000 +0000
2422@@ -395,7 +395,8 @@ enum { 2422@@ -395,7 +395,8 @@ enum {
2423 Opt_err_ro, Opt_nouid32, Opt_nocheck, Opt_debug, 2423 Opt_err_ro, Opt_nouid32, Opt_nocheck, Opt_debug,
2424 Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr, 2424 Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr,
@@ -2484,9 +2484,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ext2/super.c linux-3.10.19-vs2.3.6.8/fs/e
2484 2484
2485 sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | 2485 sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
2486 ((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0); 2486 ((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
2487diff -NurpP --minimal linux-3.10.19/fs/ext3/ext3.h linux-3.10.19-vs2.3.6.8/fs/ext3/ext3.h 2487diff -NurpP --minimal linux-3.10.21/fs/ext3/ext3.h linux-3.10.21-vs2.3.6.8/fs/ext3/ext3.h
2488--- linux-3.10.19/fs/ext3/ext3.h 2012-12-11 03:30:57.000000000 +0000 2488--- linux-3.10.21/fs/ext3/ext3.h 2012-12-11 03:30:57.000000000 +0000
2489+++ linux-3.10.19-vs2.3.6.8/fs/ext3/ext3.h 2013-08-22 20:29:59.000000000 +0000 2489+++ linux-3.10.21-vs2.3.6.8/fs/ext3/ext3.h 2013-08-22 20:29:59.000000000 +0000
2490@@ -151,10 +151,14 @@ struct ext3_group_desc 2490@@ -151,10 +151,14 @@ struct ext3_group_desc
2491 #define EXT3_NOTAIL_FL 0x00008000 /* file tail should not be merged */ 2491 #define EXT3_NOTAIL_FL 0x00008000 /* file tail should not be merged */
2492 #define EXT3_DIRSYNC_FL 0x00010000 /* dirsync behaviour (directories only) */ 2492 #define EXT3_DIRSYNC_FL 0x00010000 /* dirsync behaviour (directories only) */
@@ -2538,9 +2538,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ext3/ext3.h linux-3.10.19-vs2.3.6.8/fs/ex
2538 2538
2539 /* ioctl.c */ 2539 /* ioctl.c */
2540 extern long ext3_ioctl(struct file *, unsigned int, unsigned long); 2540 extern long ext3_ioctl(struct file *, unsigned int, unsigned long);
2541diff -NurpP --minimal linux-3.10.19/fs/ext3/file.c linux-3.10.19-vs2.3.6.8/fs/ext3/file.c 2541diff -NurpP --minimal linux-3.10.21/fs/ext3/file.c linux-3.10.21-vs2.3.6.8/fs/ext3/file.c
2542--- linux-3.10.19/fs/ext3/file.c 2012-12-11 03:30:57.000000000 +0000 2542--- linux-3.10.21/fs/ext3/file.c 2012-12-11 03:30:57.000000000 +0000
2543+++ linux-3.10.19-vs2.3.6.8/fs/ext3/file.c 2013-08-22 20:29:59.000000000 +0000 2543+++ linux-3.10.21-vs2.3.6.8/fs/ext3/file.c 2013-08-22 20:29:59.000000000 +0000
2544@@ -76,5 +76,6 @@ const struct inode_operations ext3_file_ 2544@@ -76,5 +76,6 @@ const struct inode_operations ext3_file_
2545 #endif 2545 #endif
2546 .get_acl = ext3_get_acl, 2546 .get_acl = ext3_get_acl,
@@ -2548,9 +2548,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ext3/file.c linux-3.10.19-vs2.3.6.8/fs/ex
2548+ .sync_flags = ext3_sync_flags, 2548+ .sync_flags = ext3_sync_flags,
2549 }; 2549 };
2550 2550
2551diff -NurpP --minimal linux-3.10.19/fs/ext3/ialloc.c linux-3.10.19-vs2.3.6.8/fs/ext3/ialloc.c 2551diff -NurpP --minimal linux-3.10.21/fs/ext3/ialloc.c linux-3.10.21-vs2.3.6.8/fs/ext3/ialloc.c
2552--- linux-3.10.19/fs/ext3/ialloc.c 2012-12-11 03:30:57.000000000 +0000 2552--- linux-3.10.21/fs/ext3/ialloc.c 2012-12-11 03:30:57.000000000 +0000
2553+++ linux-3.10.19-vs2.3.6.8/fs/ext3/ialloc.c 2013-08-22 20:29:59.000000000 +0000 2553+++ linux-3.10.21-vs2.3.6.8/fs/ext3/ialloc.c 2013-08-22 20:29:59.000000000 +0000
2554@@ -14,6 +14,7 @@ 2554@@ -14,6 +14,7 @@
2555 2555
2556 #include <linux/quotaops.h> 2556 #include <linux/quotaops.h>
@@ -2567,9 +2567,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ext3/ialloc.c linux-3.10.19-vs2.3.6.8/fs/
2567 } else 2567 } else
2568 inode_init_owner(inode, dir, mode); 2568 inode_init_owner(inode, dir, mode);
2569 2569
2570diff -NurpP --minimal linux-3.10.19/fs/ext3/inode.c linux-3.10.19-vs2.3.6.8/fs/ext3/inode.c 2570diff -NurpP --minimal linux-3.10.21/fs/ext3/inode.c linux-3.10.21-vs2.3.6.8/fs/ext3/inode.c
2571--- linux-3.10.19/fs/ext3/inode.c 2013-07-14 17:01:27.000000000 +0000 2571--- linux-3.10.21/fs/ext3/inode.c 2013-07-14 17:01:27.000000000 +0000
2572+++ linux-3.10.19-vs2.3.6.8/fs/ext3/inode.c 2013-08-22 21:21:18.000000000 +0000 2572+++ linux-3.10.21-vs2.3.6.8/fs/ext3/inode.c 2013-08-22 21:21:18.000000000 +0000
2573@@ -28,6 +28,8 @@ 2573@@ -28,6 +28,8 @@
2574 #include <linux/mpage.h> 2574 #include <linux/mpage.h>
2575 #include <linux/namei.h> 2575 #include <linux/namei.h>
@@ -2702,9 +2702,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ext3/inode.c linux-3.10.19-vs2.3.6.8/fs/e
2702 error = ext3_mark_inode_dirty(handle, inode); 2702 error = ext3_mark_inode_dirty(handle, inode);
2703 ext3_journal_stop(handle); 2703 ext3_journal_stop(handle);
2704 } 2704 }
2705diff -NurpP --minimal linux-3.10.19/fs/ext3/ioctl.c linux-3.10.19-vs2.3.6.8/fs/ext3/ioctl.c 2705diff -NurpP --minimal linux-3.10.21/fs/ext3/ioctl.c linux-3.10.21-vs2.3.6.8/fs/ext3/ioctl.c
2706--- linux-3.10.19/fs/ext3/ioctl.c 2013-05-31 13:45:23.000000000 +0000 2706--- linux-3.10.21/fs/ext3/ioctl.c 2013-05-31 13:45:23.000000000 +0000
2707+++ linux-3.10.19-vs2.3.6.8/fs/ext3/ioctl.c 2013-08-22 20:29:59.000000000 +0000 2707+++ linux-3.10.21-vs2.3.6.8/fs/ext3/ioctl.c 2013-08-22 20:29:59.000000000 +0000
2708@@ -12,6 +12,34 @@ 2708@@ -12,6 +12,34 @@
2709 #include <asm/uaccess.h> 2709 #include <asm/uaccess.h>
2710 #include "ext3.h" 2710 #include "ext3.h"
@@ -2772,9 +2772,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ext3/ioctl.c linux-3.10.19-vs2.3.6.8/fs/e
2772 flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE; 2772 flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE;
2773 ei->i_flags = flags; 2773 ei->i_flags = flags;
2774 2774
2775diff -NurpP --minimal linux-3.10.19/fs/ext3/namei.c linux-3.10.19-vs2.3.6.8/fs/ext3/namei.c 2775diff -NurpP --minimal linux-3.10.21/fs/ext3/namei.c linux-3.10.21-vs2.3.6.8/fs/ext3/namei.c
2776--- linux-3.10.19/fs/ext3/namei.c 2013-11-13 17:21:14.000000000 +0000 2776--- linux-3.10.21/fs/ext3/namei.c 2013-11-30 07:50:46.000000000 +0000
2777+++ linux-3.10.19-vs2.3.6.8/fs/ext3/namei.c 2013-11-13 17:17:16.000000000 +0000 2777+++ linux-3.10.21-vs2.3.6.8/fs/ext3/namei.c 2013-11-13 17:17:16.000000000 +0000
2778@@ -25,6 +25,8 @@ 2778@@ -25,6 +25,8 @@
2779 */ 2779 */
2780 2780
@@ -2800,9 +2800,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ext3/namei.c linux-3.10.19-vs2.3.6.8/fs/e
2800 .get_acl = ext3_get_acl, 2800 .get_acl = ext3_get_acl,
2801 }; 2801 };
2802 2802
2803diff -NurpP --minimal linux-3.10.19/fs/ext3/super.c linux-3.10.19-vs2.3.6.8/fs/ext3/super.c 2803diff -NurpP --minimal linux-3.10.21/fs/ext3/super.c linux-3.10.21-vs2.3.6.8/fs/ext3/super.c
2804--- linux-3.10.19/fs/ext3/super.c 2013-07-14 17:01:27.000000000 +0000 2804--- linux-3.10.21/fs/ext3/super.c 2013-07-14 17:01:27.000000000 +0000
2805+++ linux-3.10.19-vs2.3.6.8/fs/ext3/super.c 2013-08-22 20:29:59.000000000 +0000 2805+++ linux-3.10.21-vs2.3.6.8/fs/ext3/super.c 2013-08-22 20:29:59.000000000 +0000
2806@@ -813,7 +813,8 @@ enum { 2806@@ -813,7 +813,8 @@ enum {
2807 Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota, 2807 Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
2808 Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota, 2808 Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota,
@@ -2869,9 +2869,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ext3/super.c linux-3.10.19-vs2.3.6.8/fs/e
2869 sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | 2869 sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
2870 (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); 2870 (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
2871 2871
2872diff -NurpP --minimal linux-3.10.19/fs/ext4/ext4.h linux-3.10.19-vs2.3.6.8/fs/ext4/ext4.h 2872diff -NurpP --minimal linux-3.10.21/fs/ext4/ext4.h linux-3.10.21-vs2.3.6.8/fs/ext4/ext4.h
2873--- linux-3.10.19/fs/ext4/ext4.h 2013-07-14 17:01:27.000000000 +0000 2873--- linux-3.10.21/fs/ext4/ext4.h 2013-07-14 17:01:27.000000000 +0000
2874+++ linux-3.10.19-vs2.3.6.8/fs/ext4/ext4.h 2013-08-22 20:29:59.000000000 +0000 2874+++ linux-3.10.21-vs2.3.6.8/fs/ext4/ext4.h 2013-08-22 20:29:59.000000000 +0000
2875@@ -387,7 +387,10 @@ struct flex_groups { 2875@@ -387,7 +387,10 @@ struct flex_groups {
2876 #define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */ 2876 #define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */
2877 #define EXT4_EA_INODE_FL 0x00200000 /* Inode used for large EA */ 2877 #define EXT4_EA_INODE_FL 0x00200000 /* Inode used for large EA */
@@ -2916,9 +2916,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ext4/ext4.h linux-3.10.19-vs2.3.6.8/fs/ex
2916 extern int ext4_try_to_evict_inline_data(handle_t *handle, 2916 extern int ext4_try_to_evict_inline_data(handle_t *handle,
2917 struct inode *inode, 2917 struct inode *inode,
2918 int needed); 2918 int needed);
2919diff -NurpP --minimal linux-3.10.19/fs/ext4/file.c linux-3.10.19-vs2.3.6.8/fs/ext4/file.c 2919diff -NurpP --minimal linux-3.10.21/fs/ext4/file.c linux-3.10.21-vs2.3.6.8/fs/ext4/file.c
2920--- linux-3.10.19/fs/ext4/file.c 2013-11-13 17:21:14.000000000 +0000 2920--- linux-3.10.21/fs/ext4/file.c 2013-11-30 07:50:46.000000000 +0000
2921+++ linux-3.10.19-vs2.3.6.8/fs/ext4/file.c 2013-11-13 17:17:16.000000000 +0000 2921+++ linux-3.10.21-vs2.3.6.8/fs/ext4/file.c 2013-11-13 17:17:16.000000000 +0000
2922@@ -651,5 +651,6 @@ const struct inode_operations ext4_file_ 2922@@ -651,5 +651,6 @@ const struct inode_operations ext4_file_
2923 .removexattr = generic_removexattr, 2923 .removexattr = generic_removexattr,
2924 .get_acl = ext4_get_acl, 2924 .get_acl = ext4_get_acl,
@@ -2926,9 +2926,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ext4/file.c linux-3.10.19-vs2.3.6.8/fs/ex
2926+ .sync_flags = ext4_sync_flags, 2926+ .sync_flags = ext4_sync_flags,
2927 }; 2927 };
2928 2928
2929diff -NurpP --minimal linux-3.10.19/fs/ext4/ialloc.c linux-3.10.19-vs2.3.6.8/fs/ext4/ialloc.c 2929diff -NurpP --minimal linux-3.10.21/fs/ext4/ialloc.c linux-3.10.21-vs2.3.6.8/fs/ext4/ialloc.c
2930--- linux-3.10.19/fs/ext4/ialloc.c 2013-11-13 17:21:14.000000000 +0000 2930--- linux-3.10.21/fs/ext4/ialloc.c 2013-11-30 07:50:46.000000000 +0000
2931+++ linux-3.10.19-vs2.3.6.8/fs/ext4/ialloc.c 2013-11-13 17:17:16.000000000 +0000 2931+++ linux-3.10.21-vs2.3.6.8/fs/ext4/ialloc.c 2013-11-13 17:17:16.000000000 +0000
2932@@ -22,6 +22,7 @@ 2932@@ -22,6 +22,7 @@
2933 #include <linux/random.h> 2933 #include <linux/random.h>
2934 #include <linux/bitops.h> 2934 #include <linux/bitops.h>
@@ -2945,9 +2945,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ext4/ialloc.c linux-3.10.19-vs2.3.6.8/fs/
2945 } else 2945 } else
2946 inode_init_owner(inode, dir, mode); 2946 inode_init_owner(inode, dir, mode);
2947 dquot_initialize(inode); 2947 dquot_initialize(inode);
2948diff -NurpP --minimal linux-3.10.19/fs/ext4/inode.c linux-3.10.19-vs2.3.6.8/fs/ext4/inode.c 2948diff -NurpP --minimal linux-3.10.21/fs/ext4/inode.c linux-3.10.21-vs2.3.6.8/fs/ext4/inode.c
2949--- linux-3.10.19/fs/ext4/inode.c 2013-11-13 17:21:14.000000000 +0000 2949--- linux-3.10.21/fs/ext4/inode.c 2013-11-30 07:50:46.000000000 +0000
2950+++ linux-3.10.19-vs2.3.6.8/fs/ext4/inode.c 2013-11-13 17:17:16.000000000 +0000 2950+++ linux-3.10.21-vs2.3.6.8/fs/ext4/inode.c 2013-11-13 17:17:16.000000000 +0000
2951@@ -38,6 +38,7 @@ 2951@@ -38,6 +38,7 @@
2952 #include <linux/slab.h> 2952 #include <linux/slab.h>
2953 #include <linux/ratelimit.h> 2953 #include <linux/ratelimit.h>
@@ -3083,9 +3083,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ext4/inode.c linux-3.10.19-vs2.3.6.8/fs/e
3083 error = ext4_mark_inode_dirty(handle, inode); 3083 error = ext4_mark_inode_dirty(handle, inode);
3084 ext4_journal_stop(handle); 3084 ext4_journal_stop(handle);
3085 } 3085 }
3086diff -NurpP --minimal linux-3.10.19/fs/ext4/ioctl.c linux-3.10.19-vs2.3.6.8/fs/ext4/ioctl.c 3086diff -NurpP --minimal linux-3.10.21/fs/ext4/ioctl.c linux-3.10.21-vs2.3.6.8/fs/ext4/ioctl.c
3087--- linux-3.10.19/fs/ext4/ioctl.c 2013-11-13 17:21:14.000000000 +0000 3087--- linux-3.10.21/fs/ext4/ioctl.c 2013-11-30 07:50:46.000000000 +0000
3088+++ linux-3.10.19-vs2.3.6.8/fs/ext4/ioctl.c 2013-11-13 17:17:16.000000000 +0000 3088+++ linux-3.10.21-vs2.3.6.8/fs/ext4/ioctl.c 2013-11-13 17:17:16.000000000 +0000
3089@@ -14,6 +14,7 @@ 3089@@ -14,6 +14,7 @@
3090 #include <linux/compat.h> 3090 #include <linux/compat.h>
3091 #include <linux/mount.h> 3091 #include <linux/mount.h>
@@ -3151,9 +3151,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ext4/ioctl.c linux-3.10.19-vs2.3.6.8/fs/e
3151 if (!capable(CAP_LINUX_IMMUTABLE)) 3151 if (!capable(CAP_LINUX_IMMUTABLE))
3152 goto flags_out; 3152 goto flags_out;
3153 } 3153 }
3154diff -NurpP --minimal linux-3.10.19/fs/ext4/namei.c linux-3.10.19-vs2.3.6.8/fs/ext4/namei.c 3154diff -NurpP --minimal linux-3.10.21/fs/ext4/namei.c linux-3.10.21-vs2.3.6.8/fs/ext4/namei.c
3155--- linux-3.10.19/fs/ext4/namei.c 2013-11-13 17:21:14.000000000 +0000 3155--- linux-3.10.21/fs/ext4/namei.c 2013-11-30 07:50:46.000000000 +0000
3156+++ linux-3.10.19-vs2.3.6.8/fs/ext4/namei.c 2013-11-13 17:17:16.000000000 +0000 3156+++ linux-3.10.21-vs2.3.6.8/fs/ext4/namei.c 2013-11-13 17:17:16.000000000 +0000
3157@@ -34,6 +34,7 @@ 3157@@ -34,6 +34,7 @@
3158 #include <linux/quotaops.h> 3158 #include <linux/quotaops.h>
3159 #include <linux/buffer_head.h> 3159 #include <linux/buffer_head.h>
@@ -3178,9 +3178,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ext4/namei.c linux-3.10.19-vs2.3.6.8/fs/e
3178 }; 3178 };
3179 3179
3180 const struct inode_operations ext4_special_inode_operations = { 3180 const struct inode_operations ext4_special_inode_operations = {
3181diff -NurpP --minimal linux-3.10.19/fs/ext4/super.c linux-3.10.19-vs2.3.6.8/fs/ext4/super.c 3181diff -NurpP --minimal linux-3.10.21/fs/ext4/super.c linux-3.10.21-vs2.3.6.8/fs/ext4/super.c
3182--- linux-3.10.19/fs/ext4/super.c 2013-11-13 17:21:14.000000000 +0000 3182--- linux-3.10.21/fs/ext4/super.c 2013-11-30 07:50:46.000000000 +0000
3183+++ linux-3.10.19-vs2.3.6.8/fs/ext4/super.c 2013-11-13 17:17:16.000000000 +0000 3183+++ linux-3.10.21-vs2.3.6.8/fs/ext4/super.c 2013-11-13 17:17:16.000000000 +0000
3184@@ -1129,7 +1129,7 @@ enum { 3184@@ -1129,7 +1129,7 @@ enum {
3185 Opt_inode_readahead_blks, Opt_journal_ioprio, 3185 Opt_inode_readahead_blks, Opt_journal_ioprio,
3186 Opt_dioread_nolock, Opt_dioread_lock, 3186 Opt_dioread_nolock, Opt_dioread_lock,
@@ -3246,9 +3246,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ext4/super.c linux-3.10.19-vs2.3.6.8/fs/e
3246 sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | 3246 sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
3247 (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); 3247 (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
3248 3248
3249diff -NurpP --minimal linux-3.10.19/fs/fcntl.c linux-3.10.19-vs2.3.6.8/fs/fcntl.c 3249diff -NurpP --minimal linux-3.10.21/fs/fcntl.c linux-3.10.21-vs2.3.6.8/fs/fcntl.c
3250--- linux-3.10.19/fs/fcntl.c 2013-05-31 13:45:23.000000000 +0000 3250--- linux-3.10.21/fs/fcntl.c 2013-05-31 13:45:23.000000000 +0000
3251+++ linux-3.10.19-vs2.3.6.8/fs/fcntl.c 2013-08-22 20:29:59.000000000 +0000 3251+++ linux-3.10.21-vs2.3.6.8/fs/fcntl.c 2013-08-22 20:29:59.000000000 +0000
3252@@ -21,6 +21,7 @@ 3252@@ -21,6 +21,7 @@
3253 #include <linux/rcupdate.h> 3253 #include <linux/rcupdate.h>
3254 #include <linux/pid_namespace.h> 3254 #include <linux/pid_namespace.h>
@@ -3266,9 +3266,9 @@ diff -NurpP --minimal linux-3.10.19/fs/fcntl.c linux-3.10.19-vs2.3.6.8/fs/fcntl.
3266 3266
3267 if (unlikely(f.file->f_mode & FMODE_PATH)) { 3267 if (unlikely(f.file->f_mode & FMODE_PATH)) {
3268 if (!check_fcntl_cmd(cmd)) 3268 if (!check_fcntl_cmd(cmd))
3269diff -NurpP --minimal linux-3.10.19/fs/file.c linux-3.10.19-vs2.3.6.8/fs/file.c 3269diff -NurpP --minimal linux-3.10.21/fs/file.c linux-3.10.21-vs2.3.6.8/fs/file.c
3270--- linux-3.10.19/fs/file.c 2013-07-14 17:01:28.000000000 +0000 3270--- linux-3.10.21/fs/file.c 2013-07-14 17:01:28.000000000 +0000
3271+++ linux-3.10.19-vs2.3.6.8/fs/file.c 2013-08-22 20:29:59.000000000 +0000 3271+++ linux-3.10.21-vs2.3.6.8/fs/file.c 2013-08-22 20:29:59.000000000 +0000
3272@@ -22,6 +22,7 @@ 3272@@ -22,6 +22,7 @@
3273 #include <linux/spinlock.h> 3273 #include <linux/spinlock.h>
3274 #include <linux/rcupdate.h> 3274 #include <linux/rcupdate.h>
@@ -3323,9 +3323,9 @@ diff -NurpP --minimal linux-3.10.19/fs/file.c linux-3.10.19-vs2.3.6.8/fs/file.c
3323 3323
3324 return fd; 3324 return fd;
3325 3325
3326diff -NurpP --minimal linux-3.10.19/fs/file_table.c linux-3.10.19-vs2.3.6.8/fs/file_table.c 3326diff -NurpP --minimal linux-3.10.21/fs/file_table.c linux-3.10.21-vs2.3.6.8/fs/file_table.c
3327--- linux-3.10.19/fs/file_table.c 2013-07-14 17:01:28.000000000 +0000 3327--- linux-3.10.21/fs/file_table.c 2013-07-14 17:01:28.000000000 +0000
3328+++ linux-3.10.19-vs2.3.6.8/fs/file_table.c 2013-08-22 20:29:59.000000000 +0000 3328+++ linux-3.10.21-vs2.3.6.8/fs/file_table.c 2013-08-22 20:29:59.000000000 +0000
3329@@ -26,6 +26,8 @@ 3329@@ -26,6 +26,8 @@
3330 #include <linux/hardirq.h> 3330 #include <linux/hardirq.h>
3331 #include <linux/task_work.h> 3331 #include <linux/task_work.h>
@@ -3362,9 +3362,9 @@ diff -NurpP --minimal linux-3.10.19/fs/file_table.c linux-3.10.19-vs2.3.6.8/fs/f
3362 file_sb_list_del(file); 3362 file_sb_list_del(file);
3363 file_free(file); 3363 file_free(file);
3364 } 3364 }
3365diff -NurpP --minimal linux-3.10.19/fs/fs_struct.c linux-3.10.19-vs2.3.6.8/fs/fs_struct.c 3365diff -NurpP --minimal linux-3.10.21/fs/fs_struct.c linux-3.10.21-vs2.3.6.8/fs/fs_struct.c
3366--- linux-3.10.19/fs/fs_struct.c 2013-05-31 13:45:23.000000000 +0000 3366--- linux-3.10.21/fs/fs_struct.c 2013-05-31 13:45:23.000000000 +0000
3367+++ linux-3.10.19-vs2.3.6.8/fs/fs_struct.c 2013-08-22 20:29:59.000000000 +0000 3367+++ linux-3.10.21-vs2.3.6.8/fs/fs_struct.c 2013-08-22 20:29:59.000000000 +0000
3368@@ -4,6 +4,7 @@ 3368@@ -4,6 +4,7 @@
3369 #include <linux/path.h> 3369 #include <linux/path.h>
3370 #include <linux/slab.h> 3370 #include <linux/slab.h>
@@ -3389,9 +3389,9 @@ diff -NurpP --minimal linux-3.10.19/fs/fs_struct.c linux-3.10.19-vs2.3.6.8/fs/fs
3389 } 3389 }
3390 return fs; 3390 return fs;
3391 } 3391 }
3392diff -NurpP --minimal linux-3.10.19/fs/gfs2/file.c linux-3.10.19-vs2.3.6.8/fs/gfs2/file.c 3392diff -NurpP --minimal linux-3.10.21/fs/gfs2/file.c linux-3.10.21-vs2.3.6.8/fs/gfs2/file.c
3393--- linux-3.10.19/fs/gfs2/file.c 2013-07-14 17:01:28.000000000 +0000 3393--- linux-3.10.21/fs/gfs2/file.c 2013-07-14 17:01:28.000000000 +0000
3394+++ linux-3.10.19-vs2.3.6.8/fs/gfs2/file.c 2013-08-22 20:29:59.000000000 +0000 3394+++ linux-3.10.21-vs2.3.6.8/fs/gfs2/file.c 2013-08-22 20:29:59.000000000 +0000
3395@@ -144,6 +144,9 @@ static const u32 fsflags_to_gfs2[32] = { 3395@@ -144,6 +144,9 @@ static const u32 fsflags_to_gfs2[32] = {
3396 [12] = GFS2_DIF_EXHASH, 3396 [12] = GFS2_DIF_EXHASH,
3397 [14] = GFS2_DIF_INHERIT_JDATA, 3397 [14] = GFS2_DIF_INHERIT_JDATA,
@@ -3514,9 +3514,9 @@ diff -NurpP --minimal linux-3.10.19/fs/gfs2/file.c linux-3.10.19-vs2.3.6.8/fs/gf
3514 static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 3514 static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
3515 { 3515 {
3516 switch(cmd) { 3516 switch(cmd) {
3517diff -NurpP --minimal linux-3.10.19/fs/gfs2/inode.h linux-3.10.19-vs2.3.6.8/fs/gfs2/inode.h 3517diff -NurpP --minimal linux-3.10.21/fs/gfs2/inode.h linux-3.10.21-vs2.3.6.8/fs/gfs2/inode.h
3518--- linux-3.10.19/fs/gfs2/inode.h 2012-12-11 03:30:57.000000000 +0000 3518--- linux-3.10.21/fs/gfs2/inode.h 2012-12-11 03:30:57.000000000 +0000
3519+++ linux-3.10.19-vs2.3.6.8/fs/gfs2/inode.h 2013-08-22 20:29:59.000000000 +0000 3519+++ linux-3.10.21-vs2.3.6.8/fs/gfs2/inode.h 2013-08-22 20:29:59.000000000 +0000
3520@@ -117,6 +117,7 @@ extern const struct file_operations gfs2 3520@@ -117,6 +117,7 @@ extern const struct file_operations gfs2
3521 extern const struct file_operations gfs2_dir_fops_nolock; 3521 extern const struct file_operations gfs2_dir_fops_nolock;
3522 3522
@@ -3525,9 +3525,9 @@ diff -NurpP --minimal linux-3.10.19/fs/gfs2/inode.h linux-3.10.19-vs2.3.6.8/fs/g
3525 3525
3526 #ifdef CONFIG_GFS2_FS_LOCKING_DLM 3526 #ifdef CONFIG_GFS2_FS_LOCKING_DLM
3527 extern const struct file_operations gfs2_file_fops; 3527 extern const struct file_operations gfs2_file_fops;
3528diff -NurpP --minimal linux-3.10.19/fs/hostfs/hostfs.h linux-3.10.19-vs2.3.6.8/fs/hostfs/hostfs.h 3528diff -NurpP --minimal linux-3.10.21/fs/hostfs/hostfs.h linux-3.10.21-vs2.3.6.8/fs/hostfs/hostfs.h
3529--- linux-3.10.19/fs/hostfs/hostfs.h 2012-12-11 03:30:57.000000000 +0000 3529--- linux-3.10.21/fs/hostfs/hostfs.h 2012-12-11 03:30:57.000000000 +0000
3530+++ linux-3.10.19-vs2.3.6.8/fs/hostfs/hostfs.h 2013-08-22 20:29:59.000000000 +0000 3530+++ linux-3.10.21-vs2.3.6.8/fs/hostfs/hostfs.h 2013-08-22 20:29:59.000000000 +0000
3531@@ -42,6 +42,7 @@ struct hostfs_iattr { 3531@@ -42,6 +42,7 @@ struct hostfs_iattr {
3532 unsigned short ia_mode; 3532 unsigned short ia_mode;
3533 uid_t ia_uid; 3533 uid_t ia_uid;
@@ -3536,9 +3536,9 @@ diff -NurpP --minimal linux-3.10.19/fs/hostfs/hostfs.h linux-3.10.19-vs2.3.6.8/f
3536 loff_t ia_size; 3536 loff_t ia_size;
3537 struct timespec ia_atime; 3537 struct timespec ia_atime;
3538 struct timespec ia_mtime; 3538 struct timespec ia_mtime;
3539diff -NurpP --minimal linux-3.10.19/fs/inode.c linux-3.10.19-vs2.3.6.8/fs/inode.c 3539diff -NurpP --minimal linux-3.10.21/fs/inode.c linux-3.10.21-vs2.3.6.8/fs/inode.c
3540--- linux-3.10.19/fs/inode.c 2013-07-14 17:01:28.000000000 +0000 3540--- linux-3.10.21/fs/inode.c 2013-07-14 17:01:28.000000000 +0000
3541+++ linux-3.10.19-vs2.3.6.8/fs/inode.c 2013-08-22 20:29:59.000000000 +0000 3541+++ linux-3.10.21-vs2.3.6.8/fs/inode.c 2013-08-22 20:29:59.000000000 +0000
3542@@ -17,6 +17,7 @@ 3542@@ -17,6 +17,7 @@
3543 #include <linux/prefetch.h> 3543 #include <linux/prefetch.h>
3544 #include <linux/buffer_head.h> /* for inode_has_buffers */ 3544 #include <linux/buffer_head.h> /* for inode_has_buffers */
@@ -3601,9 +3601,9 @@ diff -NurpP --minimal linux-3.10.19/fs/inode.c linux-3.10.19-vs2.3.6.8/fs/inode.
3601 } 3601 }
3602 EXPORT_SYMBOL(inode_init_owner); 3602 EXPORT_SYMBOL(inode_init_owner);
3603 3603
3604diff -NurpP --minimal linux-3.10.19/fs/ioctl.c linux-3.10.19-vs2.3.6.8/fs/ioctl.c 3604diff -NurpP --minimal linux-3.10.21/fs/ioctl.c linux-3.10.21-vs2.3.6.8/fs/ioctl.c
3605--- linux-3.10.19/fs/ioctl.c 2013-05-31 13:45:24.000000000 +0000 3605--- linux-3.10.21/fs/ioctl.c 2013-05-31 13:45:24.000000000 +0000
3606+++ linux-3.10.19-vs2.3.6.8/fs/ioctl.c 2013-08-22 20:29:59.000000000 +0000 3606+++ linux-3.10.21-vs2.3.6.8/fs/ioctl.c 2013-08-22 20:29:59.000000000 +0000
3607@@ -15,6 +15,9 @@ 3607@@ -15,6 +15,9 @@
3608 #include <linux/writeback.h> 3608 #include <linux/writeback.h>
3609 #include <linux/buffer_head.h> 3609 #include <linux/buffer_head.h>
@@ -3614,9 +3614,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ioctl.c linux-3.10.19-vs2.3.6.8/fs/ioctl.
3614 3614
3615 #include <asm/ioctls.h> 3615 #include <asm/ioctls.h>
3616 3616
3617diff -NurpP --minimal linux-3.10.19/fs/ioprio.c linux-3.10.19-vs2.3.6.8/fs/ioprio.c 3617diff -NurpP --minimal linux-3.10.21/fs/ioprio.c linux-3.10.21-vs2.3.6.8/fs/ioprio.c
3618--- linux-3.10.19/fs/ioprio.c 2012-12-11 03:30:57.000000000 +0000 3618--- linux-3.10.21/fs/ioprio.c 2012-12-11 03:30:57.000000000 +0000
3619+++ linux-3.10.19-vs2.3.6.8/fs/ioprio.c 2013-08-22 20:29:59.000000000 +0000 3619+++ linux-3.10.21-vs2.3.6.8/fs/ioprio.c 2013-08-22 20:29:59.000000000 +0000
3620@@ -28,6 +28,7 @@ 3620@@ -28,6 +28,7 @@
3621 #include <linux/syscalls.h> 3621 #include <linux/syscalls.h>
3622 #include <linux/security.h> 3622 #include <linux/security.h>
@@ -3643,9 +3643,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ioprio.c linux-3.10.19-vs2.3.6.8/fs/iopri
3643 tmpio = get_task_ioprio(p); 3643 tmpio = get_task_ioprio(p);
3644 if (tmpio < 0) 3644 if (tmpio < 0)
3645 continue; 3645 continue;
3646diff -NurpP --minimal linux-3.10.19/fs/jfs/file.c linux-3.10.19-vs2.3.6.8/fs/jfs/file.c 3646diff -NurpP --minimal linux-3.10.21/fs/jfs/file.c linux-3.10.21-vs2.3.6.8/fs/jfs/file.c
3647--- linux-3.10.19/fs/jfs/file.c 2013-02-19 13:58:48.000000000 +0000 3647--- linux-3.10.21/fs/jfs/file.c 2013-02-19 13:58:48.000000000 +0000
3648+++ linux-3.10.19-vs2.3.6.8/fs/jfs/file.c 2013-08-22 20:29:59.000000000 +0000 3648+++ linux-3.10.21-vs2.3.6.8/fs/jfs/file.c 2013-08-22 20:29:59.000000000 +0000
3649@@ -109,7 +109,8 @@ int jfs_setattr(struct dentry *dentry, s 3649@@ -109,7 +109,8 @@ int jfs_setattr(struct dentry *dentry, s
3650 if (is_quota_modification(inode, iattr)) 3650 if (is_quota_modification(inode, iattr))
3651 dquot_initialize(inode); 3651 dquot_initialize(inode);
@@ -3664,9 +3664,9 @@ diff -NurpP --minimal linux-3.10.19/fs/jfs/file.c linux-3.10.19-vs2.3.6.8/fs/jfs
3664 }; 3664 };
3665 3665
3666 const struct file_operations jfs_file_operations = { 3666 const struct file_operations jfs_file_operations = {
3667diff -NurpP --minimal linux-3.10.19/fs/jfs/ioctl.c linux-3.10.19-vs2.3.6.8/fs/jfs/ioctl.c 3667diff -NurpP --minimal linux-3.10.21/fs/jfs/ioctl.c linux-3.10.21-vs2.3.6.8/fs/jfs/ioctl.c
3668--- linux-3.10.19/fs/jfs/ioctl.c 2013-05-31 13:45:24.000000000 +0000 3668--- linux-3.10.21/fs/jfs/ioctl.c 2013-05-31 13:45:24.000000000 +0000
3669+++ linux-3.10.19-vs2.3.6.8/fs/jfs/ioctl.c 2013-08-22 20:29:59.000000000 +0000 3669+++ linux-3.10.21-vs2.3.6.8/fs/jfs/ioctl.c 2013-08-22 20:29:59.000000000 +0000
3670@@ -12,6 +12,7 @@ 3670@@ -12,6 +12,7 @@
3671 #include <linux/time.h> 3671 #include <linux/time.h>
3672 #include <linux/sched.h> 3672 #include <linux/sched.h>
@@ -3724,9 +3724,9 @@ diff -NurpP --minimal linux-3.10.19/fs/jfs/ioctl.c linux-3.10.19-vs2.3.6.8/fs/jf
3724 flags |= oldflags & ~JFS_FL_USER_MODIFIABLE; 3724 flags |= oldflags & ~JFS_FL_USER_MODIFIABLE;
3725 jfs_inode->mode2 = flags; 3725 jfs_inode->mode2 = flags;
3726 3726
3727diff -NurpP --minimal linux-3.10.19/fs/jfs/jfs_dinode.h linux-3.10.19-vs2.3.6.8/fs/jfs/jfs_dinode.h 3727diff -NurpP --minimal linux-3.10.21/fs/jfs/jfs_dinode.h linux-3.10.21-vs2.3.6.8/fs/jfs/jfs_dinode.h
3728--- linux-3.10.19/fs/jfs/jfs_dinode.h 2012-12-11 03:30:57.000000000 +0000 3728--- linux-3.10.21/fs/jfs/jfs_dinode.h 2012-12-11 03:30:57.000000000 +0000
3729+++ linux-3.10.19-vs2.3.6.8/fs/jfs/jfs_dinode.h 2013-08-22 20:29:59.000000000 +0000 3729+++ linux-3.10.21-vs2.3.6.8/fs/jfs/jfs_dinode.h 2013-08-22 20:29:59.000000000 +0000
3730@@ -161,9 +161,13 @@ struct dinode { 3730@@ -161,9 +161,13 @@ struct dinode {
3731 3731
3732 #define JFS_APPEND_FL 0x01000000 /* writes to file may only append */ 3732 #define JFS_APPEND_FL 0x01000000 /* writes to file may only append */
@@ -3743,9 +3743,9 @@ diff -NurpP --minimal linux-3.10.19/fs/jfs/jfs_dinode.h linux-3.10.19-vs2.3.6.8/
3743 #define JFS_FL_INHERIT 0x03C80000 3743 #define JFS_FL_INHERIT 0x03C80000
3744 3744
3745 /* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */ 3745 /* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */
3746diff -NurpP --minimal linux-3.10.19/fs/jfs/jfs_filsys.h linux-3.10.19-vs2.3.6.8/fs/jfs/jfs_filsys.h 3746diff -NurpP --minimal linux-3.10.21/fs/jfs/jfs_filsys.h linux-3.10.21-vs2.3.6.8/fs/jfs/jfs_filsys.h
3747--- linux-3.10.19/fs/jfs/jfs_filsys.h 2012-12-11 03:30:57.000000000 +0000 3747--- linux-3.10.21/fs/jfs/jfs_filsys.h 2012-12-11 03:30:57.000000000 +0000
3748+++ linux-3.10.19-vs2.3.6.8/fs/jfs/jfs_filsys.h 2013-08-22 20:29:59.000000000 +0000 3748+++ linux-3.10.21-vs2.3.6.8/fs/jfs/jfs_filsys.h 2013-08-22 20:29:59.000000000 +0000
3749@@ -266,6 +266,7 @@ 3749@@ -266,6 +266,7 @@
3750 #define JFS_NAME_MAX 255 3750 #define JFS_NAME_MAX 255
3751 #define JFS_PATH_MAX BPSIZE 3751 #define JFS_PATH_MAX BPSIZE
@@ -3754,9 +3754,9 @@ diff -NurpP --minimal linux-3.10.19/fs/jfs/jfs_filsys.h linux-3.10.19-vs2.3.6.8/
3754 3754
3755 /* 3755 /*
3756 * file system state (superblock state) 3756 * file system state (superblock state)
3757diff -NurpP --minimal linux-3.10.19/fs/jfs/jfs_imap.c linux-3.10.19-vs2.3.6.8/fs/jfs/jfs_imap.c 3757diff -NurpP --minimal linux-3.10.21/fs/jfs/jfs_imap.c linux-3.10.21-vs2.3.6.8/fs/jfs/jfs_imap.c
3758--- linux-3.10.19/fs/jfs/jfs_imap.c 2013-07-14 17:01:28.000000000 +0000 3758--- linux-3.10.21/fs/jfs/jfs_imap.c 2013-07-14 17:01:28.000000000 +0000
3759+++ linux-3.10.19-vs2.3.6.8/fs/jfs/jfs_imap.c 2013-08-22 20:29:59.000000000 +0000 3759+++ linux-3.10.21-vs2.3.6.8/fs/jfs/jfs_imap.c 2013-08-22 20:29:59.000000000 +0000
3760@@ -46,6 +46,7 @@ 3760@@ -46,6 +46,7 @@
3761 #include <linux/pagemap.h> 3761 #include <linux/pagemap.h>
3762 #include <linux/quotaops.h> 3762 #include <linux/quotaops.h>
@@ -3820,9 +3820,9 @@ diff -NurpP --minimal linux-3.10.19/fs/jfs/jfs_imap.c linux-3.10.19-vs2.3.6.8/fs
3820 jfs_get_inode_flags(jfs_ip); 3820 jfs_get_inode_flags(jfs_ip);
3821 /* 3821 /*
3822 * mode2 is only needed for storing the higher order bits. 3822 * mode2 is only needed for storing the higher order bits.
3823diff -NurpP --minimal linux-3.10.19/fs/jfs/jfs_inode.c linux-3.10.19-vs2.3.6.8/fs/jfs/jfs_inode.c 3823diff -NurpP --minimal linux-3.10.21/fs/jfs/jfs_inode.c linux-3.10.21-vs2.3.6.8/fs/jfs/jfs_inode.c
3824--- linux-3.10.19/fs/jfs/jfs_inode.c 2013-11-13 17:21:14.000000000 +0000 3824--- linux-3.10.21/fs/jfs/jfs_inode.c 2013-11-30 07:50:49.000000000 +0000
3825+++ linux-3.10.19-vs2.3.6.8/fs/jfs/jfs_inode.c 2013-11-13 17:22:25.000000000 +0000 3825+++ linux-3.10.21-vs2.3.6.8/fs/jfs/jfs_inode.c 2013-11-13 17:22:25.000000000 +0000
3826@@ -18,6 +18,7 @@ 3826@@ -18,6 +18,7 @@
3827 3827
3828 #include <linux/fs.h> 3828 #include <linux/fs.h>
@@ -3896,9 +3896,9 @@ diff -NurpP --minimal linux-3.10.19/fs/jfs/jfs_inode.c linux-3.10.19-vs2.3.6.8/f
3896 } 3896 }
3897 3897
3898 /* 3898 /*
3899diff -NurpP --minimal linux-3.10.19/fs/jfs/jfs_inode.h linux-3.10.19-vs2.3.6.8/fs/jfs/jfs_inode.h 3899diff -NurpP --minimal linux-3.10.21/fs/jfs/jfs_inode.h linux-3.10.21-vs2.3.6.8/fs/jfs/jfs_inode.h
3900--- linux-3.10.19/fs/jfs/jfs_inode.h 2012-12-11 03:30:57.000000000 +0000 3900--- linux-3.10.21/fs/jfs/jfs_inode.h 2012-12-11 03:30:57.000000000 +0000
3901+++ linux-3.10.19-vs2.3.6.8/fs/jfs/jfs_inode.h 2013-08-22 20:29:59.000000000 +0000 3901+++ linux-3.10.21-vs2.3.6.8/fs/jfs/jfs_inode.h 2013-08-22 20:29:59.000000000 +0000
3902@@ -39,6 +39,7 @@ extern struct dentry *jfs_fh_to_dentry(s 3902@@ -39,6 +39,7 @@ extern struct dentry *jfs_fh_to_dentry(s
3903 extern struct dentry *jfs_fh_to_parent(struct super_block *sb, struct fid *fid, 3903 extern struct dentry *jfs_fh_to_parent(struct super_block *sb, struct fid *fid,
3904 int fh_len, int fh_type); 3904 int fh_len, int fh_type);
@@ -3907,9 +3907,9 @@ diff -NurpP --minimal linux-3.10.19/fs/jfs/jfs_inode.h linux-3.10.19-vs2.3.6.8/f
3907 extern int jfs_get_block(struct inode *, sector_t, struct buffer_head *, int); 3907 extern int jfs_get_block(struct inode *, sector_t, struct buffer_head *, int);
3908 extern int jfs_setattr(struct dentry *, struct iattr *); 3908 extern int jfs_setattr(struct dentry *, struct iattr *);
3909 3909
3910diff -NurpP --minimal linux-3.10.19/fs/jfs/namei.c linux-3.10.19-vs2.3.6.8/fs/jfs/namei.c 3910diff -NurpP --minimal linux-3.10.21/fs/jfs/namei.c linux-3.10.21-vs2.3.6.8/fs/jfs/namei.c
3911--- linux-3.10.19/fs/jfs/namei.c 2012-12-11 03:30:57.000000000 +0000 3911--- linux-3.10.21/fs/jfs/namei.c 2012-12-11 03:30:57.000000000 +0000
3912+++ linux-3.10.19-vs2.3.6.8/fs/jfs/namei.c 2013-08-22 20:29:59.000000000 +0000 3912+++ linux-3.10.21-vs2.3.6.8/fs/jfs/namei.c 2013-08-22 20:29:59.000000000 +0000
3913@@ -22,6 +22,7 @@ 3913@@ -22,6 +22,7 @@
3914 #include <linux/ctype.h> 3914 #include <linux/ctype.h>
3915 #include <linux/quotaops.h> 3915 #include <linux/quotaops.h>
@@ -3934,9 +3934,9 @@ diff -NurpP --minimal linux-3.10.19/fs/jfs/namei.c linux-3.10.19-vs2.3.6.8/fs/jf
3934 }; 3934 };
3935 3935
3936 const struct file_operations jfs_dir_operations = { 3936 const struct file_operations jfs_dir_operations = {
3937diff -NurpP --minimal linux-3.10.19/fs/jfs/super.c linux-3.10.19-vs2.3.6.8/fs/jfs/super.c 3937diff -NurpP --minimal linux-3.10.21/fs/jfs/super.c linux-3.10.21-vs2.3.6.8/fs/jfs/super.c
3938--- linux-3.10.19/fs/jfs/super.c 2013-07-14 17:01:28.000000000 +0000 3938--- linux-3.10.21/fs/jfs/super.c 2013-07-14 17:01:28.000000000 +0000
3939+++ linux-3.10.19-vs2.3.6.8/fs/jfs/super.c 2013-08-22 20:29:59.000000000 +0000 3939+++ linux-3.10.21-vs2.3.6.8/fs/jfs/super.c 2013-08-22 20:29:59.000000000 +0000
3940@@ -199,7 +199,8 @@ enum { 3940@@ -199,7 +199,8 @@ enum {
3941 Opt_integrity, Opt_nointegrity, Opt_iocharset, Opt_resize, 3941 Opt_integrity, Opt_nointegrity, Opt_iocharset, Opt_resize,
3942 Opt_resize_nosize, Opt_errors, Opt_ignore, Opt_err, Opt_quota, 3942 Opt_resize_nosize, Opt_errors, Opt_ignore, Opt_err, Opt_quota,
@@ -4003,9 +4003,9 @@ diff -NurpP --minimal linux-3.10.19/fs/jfs/super.c linux-3.10.19-vs2.3.6.8/fs/jf
4003 4003
4004 if (newLVSize) { 4004 if (newLVSize) {
4005 pr_err("resize option for remount only\n"); 4005 pr_err("resize option for remount only\n");
4006diff -NurpP --minimal linux-3.10.19/fs/libfs.c linux-3.10.19-vs2.3.6.8/fs/libfs.c 4006diff -NurpP --minimal linux-3.10.21/fs/libfs.c linux-3.10.21-vs2.3.6.8/fs/libfs.c
4007--- linux-3.10.19/fs/libfs.c 2013-02-19 13:58:48.000000000 +0000 4007--- linux-3.10.21/fs/libfs.c 2013-02-19 13:58:48.000000000 +0000
4008+++ linux-3.10.19-vs2.3.6.8/fs/libfs.c 2013-08-22 20:29:59.000000000 +0000 4008+++ linux-3.10.21-vs2.3.6.8/fs/libfs.c 2013-08-22 20:29:59.000000000 +0000
4009@@ -135,7 +135,8 @@ static inline unsigned char dt_type(stru 4009@@ -135,7 +135,8 @@ static inline unsigned char dt_type(stru
4010 * both impossible due to the lock on directory. 4010 * both impossible due to the lock on directory.
4011 */ 4011 */
@@ -4051,9 +4051,9 @@ diff -NurpP --minimal linux-3.10.19/fs/libfs.c linux-3.10.19-vs2.3.6.8/fs/libfs.
4051 EXPORT_SYMBOL(generic_read_dir); 4051 EXPORT_SYMBOL(generic_read_dir);
4052 EXPORT_SYMBOL(mount_pseudo); 4052 EXPORT_SYMBOL(mount_pseudo);
4053 EXPORT_SYMBOL(simple_write_begin); 4053 EXPORT_SYMBOL(simple_write_begin);
4054diff -NurpP --minimal linux-3.10.19/fs/locks.c linux-3.10.19-vs2.3.6.8/fs/locks.c 4054diff -NurpP --minimal linux-3.10.21/fs/locks.c linux-3.10.21-vs2.3.6.8/fs/locks.c
4055--- linux-3.10.19/fs/locks.c 2013-05-31 13:45:24.000000000 +0000 4055--- linux-3.10.21/fs/locks.c 2013-05-31 13:45:24.000000000 +0000
4056+++ linux-3.10.19-vs2.3.6.8/fs/locks.c 2013-08-22 20:29:59.000000000 +0000 4056+++ linux-3.10.21-vs2.3.6.8/fs/locks.c 2013-08-22 20:29:59.000000000 +0000
4057@@ -126,6 +126,8 @@ 4057@@ -126,6 +126,8 @@
4058 #include <linux/time.h> 4058 #include <linux/time.h>
4059 #include <linux/rcupdate.h> 4059 #include <linux/rcupdate.h>
@@ -4251,9 +4251,9 @@ diff -NurpP --minimal linux-3.10.19/fs/locks.c linux-3.10.19-vs2.3.6.8/fs/locks.
4251 4251
4252 return 0; 4252 return 0;
4253 } 4253 }
4254diff -NurpP --minimal linux-3.10.19/fs/mount.h linux-3.10.19-vs2.3.6.8/fs/mount.h 4254diff -NurpP --minimal linux-3.10.21/fs/mount.h linux-3.10.21-vs2.3.6.8/fs/mount.h
4255--- linux-3.10.19/fs/mount.h 2013-07-14 17:01:28.000000000 +0000 4255--- linux-3.10.21/fs/mount.h 2013-07-14 17:01:28.000000000 +0000
4256+++ linux-3.10.19-vs2.3.6.8/fs/mount.h 2013-08-22 20:29:59.000000000 +0000 4256+++ linux-3.10.21-vs2.3.6.8/fs/mount.h 2013-08-22 20:29:59.000000000 +0000
4257@@ -56,6 +56,7 @@ struct mount { 4257@@ -56,6 +56,7 @@ struct mount {
4258 int mnt_expiry_mark; /* true if marked for expiry */ 4258 int mnt_expiry_mark; /* true if marked for expiry */
4259 int mnt_pinned; 4259 int mnt_pinned;
@@ -4262,9 +4262,9 @@ diff -NurpP --minimal linux-3.10.19/fs/mount.h linux-3.10.19-vs2.3.6.8/fs/mount.
4262 }; 4262 };
4263 4263
4264 #define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */ 4264 #define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */
4265diff -NurpP --minimal linux-3.10.19/fs/namei.c linux-3.10.19-vs2.3.6.8/fs/namei.c 4265diff -NurpP --minimal linux-3.10.21/fs/namei.c linux-3.10.21-vs2.3.6.8/fs/namei.c
4266--- linux-3.10.19/fs/namei.c 2013-07-14 17:01:28.000000000 +0000 4266--- linux-3.10.21/fs/namei.c 2013-07-14 17:01:28.000000000 +0000
4267+++ linux-3.10.19-vs2.3.6.8/fs/namei.c 2013-08-22 23:36:09.000000000 +0000 4267+++ linux-3.10.21-vs2.3.6.8/fs/namei.c 2013-08-22 23:36:09.000000000 +0000
4268@@ -34,9 +34,19 @@ 4268@@ -34,9 +34,19 @@
4269 #include <linux/device_cgroup.h> 4269 #include <linux/device_cgroup.h>
4270 #include <linux/fs_struct.h> 4270 #include <linux/fs_struct.h>
@@ -4829,9 +4829,9 @@ diff -NurpP --minimal linux-3.10.19/fs/namei.c linux-3.10.19-vs2.3.6.8/fs/namei.
4829 EXPORT_SYMBOL(dentry_unhash); 4829 EXPORT_SYMBOL(dentry_unhash);
4830 EXPORT_SYMBOL(generic_readlink); 4830 EXPORT_SYMBOL(generic_readlink);
4831+EXPORT_SYMBOL(vx_info_mnt_namespace); 4831+EXPORT_SYMBOL(vx_info_mnt_namespace);
4832diff -NurpP --minimal linux-3.10.19/fs/namespace.c linux-3.10.19-vs2.3.6.8/fs/namespace.c 4832diff -NurpP --minimal linux-3.10.21/fs/namespace.c linux-3.10.21-vs2.3.6.8/fs/namespace.c
4833--- linux-3.10.19/fs/namespace.c 2013-11-13 17:21:14.000000000 +0000 4833--- linux-3.10.21/fs/namespace.c 2013-11-30 07:50:49.000000000 +0000
4834+++ linux-3.10.19-vs2.3.6.8/fs/namespace.c 2013-11-13 17:17:16.000000000 +0000 4834+++ linux-3.10.21-vs2.3.6.8/fs/namespace.c 2013-11-13 17:17:16.000000000 +0000
4835@@ -23,6 +23,11 @@ 4835@@ -23,6 +23,11 @@
4836 #include <linux/uaccess.h> 4836 #include <linux/uaccess.h>
4837 #include <linux/proc_ns.h> 4837 #include <linux/proc_ns.h>
@@ -4976,9 +4976,9 @@ diff -NurpP --minimal linux-3.10.19/fs/namespace.c linux-3.10.19-vs2.3.6.8/fs/na
4976 free_mnt_ns(ns); 4976 free_mnt_ns(ns);
4977 } 4977 }
4978 4978
4979diff -NurpP --minimal linux-3.10.19/fs/nfs/client.c linux-3.10.19-vs2.3.6.8/fs/nfs/client.c 4979diff -NurpP --minimal linux-3.10.21/fs/nfs/client.c linux-3.10.21-vs2.3.6.8/fs/nfs/client.c
4980--- linux-3.10.19/fs/nfs/client.c 2013-07-14 17:01:28.000000000 +0000 4980--- linux-3.10.21/fs/nfs/client.c 2013-07-14 17:01:28.000000000 +0000
4981+++ linux-3.10.19-vs2.3.6.8/fs/nfs/client.c 2013-08-22 20:29:59.000000000 +0000 4981+++ linux-3.10.21-vs2.3.6.8/fs/nfs/client.c 2013-08-22 20:29:59.000000000 +0000
4982@@ -684,6 +684,9 @@ int nfs_init_server_rpcclient(struct nfs 4982@@ -684,6 +684,9 @@ int nfs_init_server_rpcclient(struct nfs
4983 if (server->flags & NFS_MOUNT_SOFT) 4983 if (server->flags & NFS_MOUNT_SOFT)
4984 server->client->cl_softrtry = 1; 4984 server->client->cl_softrtry = 1;
@@ -5000,9 +5000,9 @@ diff -NurpP --minimal linux-3.10.19/fs/nfs/client.c linux-3.10.19-vs2.3.6.8/fs/n
5000 server->maxfilesize = fsinfo->maxfilesize; 5000 server->maxfilesize = fsinfo->maxfilesize;
5001 5001
5002 server->time_delta = fsinfo->time_delta; 5002 server->time_delta = fsinfo->time_delta;
5003diff -NurpP --minimal linux-3.10.19/fs/nfs/dir.c linux-3.10.19-vs2.3.6.8/fs/nfs/dir.c 5003diff -NurpP --minimal linux-3.10.21/fs/nfs/dir.c linux-3.10.21-vs2.3.6.8/fs/nfs/dir.c
5004--- linux-3.10.19/fs/nfs/dir.c 2013-07-14 17:01:28.000000000 +0000 5004--- linux-3.10.21/fs/nfs/dir.c 2013-07-14 17:01:28.000000000 +0000
5005+++ linux-3.10.19-vs2.3.6.8/fs/nfs/dir.c 2013-08-22 20:29:59.000000000 +0000 5005+++ linux-3.10.21-vs2.3.6.8/fs/nfs/dir.c 2013-08-22 20:29:59.000000000 +0000
5006@@ -36,6 +36,7 @@ 5006@@ -36,6 +36,7 @@
5007 #include <linux/sched.h> 5007 #include <linux/sched.h>
5008 #include <linux/kmemleak.h> 5008 #include <linux/kmemleak.h>
@@ -5019,9 +5019,9 @@ diff -NurpP --minimal linux-3.10.19/fs/nfs/dir.c linux-3.10.19-vs2.3.6.8/fs/nfs/
5019 no_entry: 5019 no_entry:
5020 res = d_materialise_unique(dentry, inode); 5020 res = d_materialise_unique(dentry, inode);
5021 if (res != NULL) { 5021 if (res != NULL) {
5022diff -NurpP --minimal linux-3.10.19/fs/nfs/inode.c linux-3.10.19-vs2.3.6.8/fs/nfs/inode.c 5022diff -NurpP --minimal linux-3.10.21/fs/nfs/inode.c linux-3.10.21-vs2.3.6.8/fs/nfs/inode.c
5023--- linux-3.10.19/fs/nfs/inode.c 2013-07-14 17:01:28.000000000 +0000 5023--- linux-3.10.21/fs/nfs/inode.c 2013-07-14 17:01:28.000000000 +0000
5024+++ linux-3.10.19-vs2.3.6.8/fs/nfs/inode.c 2013-08-22 20:29:59.000000000 +0000 5024+++ linux-3.10.21-vs2.3.6.8/fs/nfs/inode.c 2013-08-22 20:29:59.000000000 +0000
5025@@ -39,6 +39,7 @@ 5025@@ -39,6 +39,7 @@
5026 #include <linux/compat.h> 5026 #include <linux/compat.h>
5027 #include <linux/freezer.h> 5027 #include <linux/freezer.h>
@@ -5148,9 +5148,9 @@ diff -NurpP --minimal linux-3.10.19/fs/nfs/inode.c linux-3.10.19-vs2.3.6.8/fs/nf
5148 if (fattr->valid & NFS_ATTR_FATTR_NLINK) { 5148 if (fattr->valid & NFS_ATTR_FATTR_NLINK) {
5149 if (inode->i_nlink != fattr->nlink) { 5149 if (inode->i_nlink != fattr->nlink) {
5150 invalid |= NFS_INO_INVALID_ATTR; 5150 invalid |= NFS_INO_INVALID_ATTR;
5151diff -NurpP --minimal linux-3.10.19/fs/nfs/nfs3xdr.c linux-3.10.19-vs2.3.6.8/fs/nfs/nfs3xdr.c 5151diff -NurpP --minimal linux-3.10.21/fs/nfs/nfs3xdr.c linux-3.10.21-vs2.3.6.8/fs/nfs/nfs3xdr.c
5152--- linux-3.10.19/fs/nfs/nfs3xdr.c 2013-05-31 13:45:24.000000000 +0000 5152--- linux-3.10.21/fs/nfs/nfs3xdr.c 2013-05-31 13:45:24.000000000 +0000
5153+++ linux-3.10.19-vs2.3.6.8/fs/nfs/nfs3xdr.c 2013-08-22 20:29:59.000000000 +0000 5153+++ linux-3.10.21-vs2.3.6.8/fs/nfs/nfs3xdr.c 2013-08-22 20:29:59.000000000 +0000
5154@@ -20,6 +20,7 @@ 5154@@ -20,6 +20,7 @@
5155 #include <linux/nfs3.h> 5155 #include <linux/nfs3.h>
5156 #include <linux/nfs_fs.h> 5156 #include <linux/nfs_fs.h>
@@ -5296,9 +5296,9 @@ diff -NurpP --minimal linux-3.10.19/fs/nfs/nfs3xdr.c linux-3.10.19-vs2.3.6.8/fs/
5296 } 5296 }
5297 5297
5298 /* 5298 /*
5299diff -NurpP --minimal linux-3.10.19/fs/nfs/super.c linux-3.10.19-vs2.3.6.8/fs/nfs/super.c 5299diff -NurpP --minimal linux-3.10.21/fs/nfs/super.c linux-3.10.21-vs2.3.6.8/fs/nfs/super.c
5300--- linux-3.10.19/fs/nfs/super.c 2013-07-14 17:01:28.000000000 +0000 5300--- linux-3.10.21/fs/nfs/super.c 2013-07-14 17:01:28.000000000 +0000
5301+++ linux-3.10.19-vs2.3.6.8/fs/nfs/super.c 2013-08-22 20:29:59.000000000 +0000 5301+++ linux-3.10.21-vs2.3.6.8/fs/nfs/super.c 2013-08-22 20:29:59.000000000 +0000
5302@@ -55,6 +55,7 @@ 5302@@ -55,6 +55,7 @@
5303 #include <linux/parser.h> 5303 #include <linux/parser.h>
5304 #include <linux/nsproxy.h> 5304 #include <linux/nsproxy.h>
@@ -5372,9 +5372,9 @@ diff -NurpP --minimal linux-3.10.19/fs/nfs/super.c linux-3.10.19-vs2.3.6.8/fs/nf
5372 5372
5373 /* 5373 /*
5374 * options that take text values 5374 * options that take text values
5375diff -NurpP --minimal linux-3.10.19/fs/nfsd/auth.c linux-3.10.19-vs2.3.6.8/fs/nfsd/auth.c 5375diff -NurpP --minimal linux-3.10.21/fs/nfsd/auth.c linux-3.10.21-vs2.3.6.8/fs/nfsd/auth.c
5376--- linux-3.10.19/fs/nfsd/auth.c 2013-05-31 13:45:24.000000000 +0000 5376--- linux-3.10.21/fs/nfsd/auth.c 2013-05-31 13:45:24.000000000 +0000
5377+++ linux-3.10.19-vs2.3.6.8/fs/nfsd/auth.c 2013-08-22 20:29:59.000000000 +0000 5377+++ linux-3.10.21-vs2.3.6.8/fs/nfsd/auth.c 2013-08-22 20:29:59.000000000 +0000
5378@@ -2,6 +2,7 @@ 5378@@ -2,6 +2,7 @@
5379 5379
5380 #include <linux/sched.h> 5380 #include <linux/sched.h>
@@ -5393,9 +5393,9 @@ diff -NurpP --minimal linux-3.10.19/fs/nfsd/auth.c linux-3.10.19-vs2.3.6.8/fs/nf
5393 5393
5394 rqgi = rqstp->rq_cred.cr_group_info; 5394 rqgi = rqstp->rq_cred.cr_group_info;
5395 5395
5396diff -NurpP --minimal linux-3.10.19/fs/nfsd/nfs3xdr.c linux-3.10.19-vs2.3.6.8/fs/nfsd/nfs3xdr.c 5396diff -NurpP --minimal linux-3.10.21/fs/nfsd/nfs3xdr.c linux-3.10.21-vs2.3.6.8/fs/nfsd/nfs3xdr.c
5397--- linux-3.10.19/fs/nfsd/nfs3xdr.c 2013-05-31 13:45:24.000000000 +0000 5397--- linux-3.10.21/fs/nfsd/nfs3xdr.c 2013-05-31 13:45:24.000000000 +0000
5398+++ linux-3.10.19-vs2.3.6.8/fs/nfsd/nfs3xdr.c 2013-08-22 20:29:59.000000000 +0000 5398+++ linux-3.10.21-vs2.3.6.8/fs/nfsd/nfs3xdr.c 2013-08-22 20:29:59.000000000 +0000
5399@@ -8,6 +8,7 @@ 5399@@ -8,6 +8,7 @@
5400 5400
5401 #include <linux/namei.h> 5401 #include <linux/namei.h>
@@ -5449,9 +5449,9 @@ diff -NurpP --minimal linux-3.10.19/fs/nfsd/nfs3xdr.c linux-3.10.19-vs2.3.6.8/fs
5449 if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) { 5449 if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) {
5450 p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN); 5450 p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN);
5451 } else { 5451 } else {
5452diff -NurpP --minimal linux-3.10.19/fs/nfsd/nfs4xdr.c linux-3.10.19-vs2.3.6.8/fs/nfsd/nfs4xdr.c 5452diff -NurpP --minimal linux-3.10.21/fs/nfsd/nfs4xdr.c linux-3.10.21-vs2.3.6.8/fs/nfsd/nfs4xdr.c
5453--- linux-3.10.19/fs/nfsd/nfs4xdr.c 2013-11-13 17:21:14.000000000 +0000 5453--- linux-3.10.21/fs/nfsd/nfs4xdr.c 2013-11-30 07:50:50.000000000 +0000
5454+++ linux-3.10.19-vs2.3.6.8/fs/nfsd/nfs4xdr.c 2013-11-13 17:17:16.000000000 +0000 5454+++ linux-3.10.21-vs2.3.6.8/fs/nfsd/nfs4xdr.c 2013-11-13 17:17:16.000000000 +0000
5455@@ -46,6 +46,7 @@ 5455@@ -46,6 +46,7 @@
5456 #include <linux/utsname.h> 5456 #include <linux/utsname.h>
5457 #include <linux/pagemap.h> 5457 #include <linux/pagemap.h>
@@ -5481,9 +5481,9 @@ diff -NurpP --minimal linux-3.10.19/fs/nfsd/nfs4xdr.c linux-3.10.19-vs2.3.6.8/fs
5481 if (status == nfserr_resource) 5481 if (status == nfserr_resource)
5482 goto out_resource; 5482 goto out_resource;
5483 if (status) 5483 if (status)
5484diff -NurpP --minimal linux-3.10.19/fs/nfsd/nfsxdr.c linux-3.10.19-vs2.3.6.8/fs/nfsd/nfsxdr.c 5484diff -NurpP --minimal linux-3.10.21/fs/nfsd/nfsxdr.c linux-3.10.21-vs2.3.6.8/fs/nfsd/nfsxdr.c
5485--- linux-3.10.19/fs/nfsd/nfsxdr.c 2013-05-31 13:45:24.000000000 +0000 5485--- linux-3.10.21/fs/nfsd/nfsxdr.c 2013-05-31 13:45:24.000000000 +0000
5486+++ linux-3.10.19-vs2.3.6.8/fs/nfsd/nfsxdr.c 2013-08-22 20:29:59.000000000 +0000 5486+++ linux-3.10.21-vs2.3.6.8/fs/nfsd/nfsxdr.c 2013-08-22 20:29:59.000000000 +0000
5487@@ -7,6 +7,7 @@ 5487@@ -7,6 +7,7 @@
5488 #include "vfs.h" 5488 #include "vfs.h"
5489 #include "xdr.h" 5489 #include "xdr.h"
@@ -5535,9 +5535,9 @@ diff -NurpP --minimal linux-3.10.19/fs/nfsd/nfsxdr.c linux-3.10.19-vs2.3.6.8/fs/
5535 5535
5536 if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) { 5536 if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
5537 *p++ = htonl(NFS_MAXPATHLEN); 5537 *p++ = htonl(NFS_MAXPATHLEN);
5538diff -NurpP --minimal linux-3.10.19/fs/ocfs2/dlmglue.c linux-3.10.19-vs2.3.6.8/fs/ocfs2/dlmglue.c 5538diff -NurpP --minimal linux-3.10.21/fs/ocfs2/dlmglue.c linux-3.10.21-vs2.3.6.8/fs/ocfs2/dlmglue.c
5539--- linux-3.10.19/fs/ocfs2/dlmglue.c 2013-07-14 17:01:29.000000000 +0000 5539--- linux-3.10.21/fs/ocfs2/dlmglue.c 2013-07-14 17:01:29.000000000 +0000
5540+++ linux-3.10.19-vs2.3.6.8/fs/ocfs2/dlmglue.c 2013-08-22 20:29:59.000000000 +0000 5540+++ linux-3.10.21-vs2.3.6.8/fs/ocfs2/dlmglue.c 2013-08-22 20:29:59.000000000 +0000
5541@@ -2047,6 +2047,7 @@ static void __ocfs2_stuff_meta_lvb(struc 5541@@ -2047,6 +2047,7 @@ static void __ocfs2_stuff_meta_lvb(struc
5542 lvb->lvb_iclusters = cpu_to_be32(oi->ip_clusters); 5542 lvb->lvb_iclusters = cpu_to_be32(oi->ip_clusters);
5543 lvb->lvb_iuid = cpu_to_be32(i_uid_read(inode)); 5543 lvb->lvb_iuid = cpu_to_be32(i_uid_read(inode));
@@ -5554,9 +5554,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ocfs2/dlmglue.c linux-3.10.19-vs2.3.6.8/f
5554 inode->i_mode = be16_to_cpu(lvb->lvb_imode); 5554 inode->i_mode = be16_to_cpu(lvb->lvb_imode);
5555 set_nlink(inode, be16_to_cpu(lvb->lvb_inlink)); 5555 set_nlink(inode, be16_to_cpu(lvb->lvb_inlink));
5556 ocfs2_unpack_timespec(&inode->i_atime, 5556 ocfs2_unpack_timespec(&inode->i_atime,
5557diff -NurpP --minimal linux-3.10.19/fs/ocfs2/dlmglue.h linux-3.10.19-vs2.3.6.8/fs/ocfs2/dlmglue.h 5557diff -NurpP --minimal linux-3.10.21/fs/ocfs2/dlmglue.h linux-3.10.21-vs2.3.6.8/fs/ocfs2/dlmglue.h
5558--- linux-3.10.19/fs/ocfs2/dlmglue.h 2012-12-11 03:30:57.000000000 +0000 5558--- linux-3.10.21/fs/ocfs2/dlmglue.h 2012-12-11 03:30:57.000000000 +0000
5559+++ linux-3.10.19-vs2.3.6.8/fs/ocfs2/dlmglue.h 2013-08-22 20:29:59.000000000 +0000 5559+++ linux-3.10.21-vs2.3.6.8/fs/ocfs2/dlmglue.h 2013-08-22 20:29:59.000000000 +0000
5560@@ -46,7 +46,8 @@ struct ocfs2_meta_lvb { 5560@@ -46,7 +46,8 @@ struct ocfs2_meta_lvb {
5561 __be16 lvb_inlink; 5561 __be16 lvb_inlink;
5562 __be32 lvb_iattr; 5562 __be32 lvb_iattr;
@@ -5567,9 +5567,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ocfs2/dlmglue.h linux-3.10.19-vs2.3.6.8/f
5567 }; 5567 };
5568 5568
5569 #define OCFS2_QINFO_LVB_VERSION 1 5569 #define OCFS2_QINFO_LVB_VERSION 1
5570diff -NurpP --minimal linux-3.10.19/fs/ocfs2/file.c linux-3.10.19-vs2.3.6.8/fs/ocfs2/file.c 5570diff -NurpP --minimal linux-3.10.21/fs/ocfs2/file.c linux-3.10.21-vs2.3.6.8/fs/ocfs2/file.c
5571--- linux-3.10.19/fs/ocfs2/file.c 2013-07-14 17:01:29.000000000 +0000 5571--- linux-3.10.21/fs/ocfs2/file.c 2013-07-14 17:01:29.000000000 +0000
5572+++ linux-3.10.19-vs2.3.6.8/fs/ocfs2/file.c 2013-08-22 20:29:59.000000000 +0000 5572+++ linux-3.10.21-vs2.3.6.8/fs/ocfs2/file.c 2013-08-22 20:29:59.000000000 +0000
5573@@ -1124,7 +1124,7 @@ int ocfs2_setattr(struct dentry *dentry, 5573@@ -1124,7 +1124,7 @@ int ocfs2_setattr(struct dentry *dentry,
5574 attr->ia_valid &= ~ATTR_SIZE; 5574 attr->ia_valid &= ~ATTR_SIZE;
5575 5575
@@ -5579,9 +5579,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ocfs2/file.c linux-3.10.19-vs2.3.6.8/fs/o
5579 if (!(attr->ia_valid & OCFS2_VALID_ATTRS)) 5579 if (!(attr->ia_valid & OCFS2_VALID_ATTRS))
5580 return 0; 5580 return 0;
5581 5581
5582diff -NurpP --minimal linux-3.10.19/fs/ocfs2/inode.c linux-3.10.19-vs2.3.6.8/fs/ocfs2/inode.c 5582diff -NurpP --minimal linux-3.10.21/fs/ocfs2/inode.c linux-3.10.21-vs2.3.6.8/fs/ocfs2/inode.c
5583--- linux-3.10.19/fs/ocfs2/inode.c 2013-05-31 13:45:24.000000000 +0000 5583--- linux-3.10.21/fs/ocfs2/inode.c 2013-05-31 13:45:24.000000000 +0000
5584+++ linux-3.10.19-vs2.3.6.8/fs/ocfs2/inode.c 2013-08-22 20:29:59.000000000 +0000 5584+++ linux-3.10.21-vs2.3.6.8/fs/ocfs2/inode.c 2013-08-22 20:29:59.000000000 +0000
5585@@ -28,6 +28,7 @@ 5585@@ -28,6 +28,7 @@
5586 #include <linux/highmem.h> 5586 #include <linux/highmem.h>
5587 #include <linux/pagemap.h> 5587 #include <linux/pagemap.h>
@@ -5678,9 +5678,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ocfs2/inode.c linux-3.10.19-vs2.3.6.8/fs/
5678 5678
5679 /* Fast symlinks will have i_size but no allocated clusters. */ 5679 /* Fast symlinks will have i_size but no allocated clusters. */
5680 if (S_ISLNK(inode->i_mode) && !fe->i_clusters) { 5680 if (S_ISLNK(inode->i_mode) && !fe->i_clusters) {
5681diff -NurpP --minimal linux-3.10.19/fs/ocfs2/inode.h linux-3.10.19-vs2.3.6.8/fs/ocfs2/inode.h 5681diff -NurpP --minimal linux-3.10.21/fs/ocfs2/inode.h linux-3.10.21-vs2.3.6.8/fs/ocfs2/inode.h
5682--- linux-3.10.19/fs/ocfs2/inode.h 2013-07-14 17:01:29.000000000 +0000 5682--- linux-3.10.21/fs/ocfs2/inode.h 2013-07-14 17:01:29.000000000 +0000
5683+++ linux-3.10.19-vs2.3.6.8/fs/ocfs2/inode.h 2013-08-22 20:29:59.000000000 +0000 5683+++ linux-3.10.21-vs2.3.6.8/fs/ocfs2/inode.h 2013-08-22 20:29:59.000000000 +0000
5684@@ -152,6 +152,7 @@ struct buffer_head *ocfs2_bread(struct i 5684@@ -152,6 +152,7 @@ struct buffer_head *ocfs2_bread(struct i
5685 5685
5686 void ocfs2_set_inode_flags(struct inode *inode); 5686 void ocfs2_set_inode_flags(struct inode *inode);
@@ -5689,9 +5689,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ocfs2/inode.h linux-3.10.19-vs2.3.6.8/fs/
5689 5689
5690 static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode) 5690 static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode)
5691 { 5691 {
5692diff -NurpP --minimal linux-3.10.19/fs/ocfs2/ioctl.c linux-3.10.19-vs2.3.6.8/fs/ocfs2/ioctl.c 5692diff -NurpP --minimal linux-3.10.21/fs/ocfs2/ioctl.c linux-3.10.21-vs2.3.6.8/fs/ocfs2/ioctl.c
5693--- linux-3.10.19/fs/ocfs2/ioctl.c 2013-07-14 17:01:29.000000000 +0000 5693--- linux-3.10.21/fs/ocfs2/ioctl.c 2013-07-14 17:01:29.000000000 +0000
5694+++ linux-3.10.19-vs2.3.6.8/fs/ocfs2/ioctl.c 2013-08-22 20:29:59.000000000 +0000 5694+++ linux-3.10.21-vs2.3.6.8/fs/ocfs2/ioctl.c 2013-08-22 20:29:59.000000000 +0000
5695@@ -76,7 +76,41 @@ static int ocfs2_get_inode_attr(struct i 5695@@ -76,7 +76,41 @@ static int ocfs2_get_inode_attr(struct i
5696 return status; 5696 return status;
5697 } 5697 }
@@ -5755,9 +5755,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ocfs2/ioctl.c linux-3.10.19-vs2.3.6.8/fs/
5755 long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 5755 long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
5756 { 5756 {
5757 struct inode *inode = file_inode(filp); 5757 struct inode *inode = file_inode(filp);
5758diff -NurpP --minimal linux-3.10.19/fs/ocfs2/namei.c linux-3.10.19-vs2.3.6.8/fs/ocfs2/namei.c 5758diff -NurpP --minimal linux-3.10.21/fs/ocfs2/namei.c linux-3.10.21-vs2.3.6.8/fs/ocfs2/namei.c
5759--- linux-3.10.19/fs/ocfs2/namei.c 2013-07-14 17:01:29.000000000 +0000 5759--- linux-3.10.21/fs/ocfs2/namei.c 2013-07-14 17:01:29.000000000 +0000
5760+++ linux-3.10.19-vs2.3.6.8/fs/ocfs2/namei.c 2013-08-22 20:29:59.000000000 +0000 5760+++ linux-3.10.21-vs2.3.6.8/fs/ocfs2/namei.c 2013-08-22 20:29:59.000000000 +0000
5761@@ -41,6 +41,7 @@ 5761@@ -41,6 +41,7 @@
5762 #include <linux/slab.h> 5762 #include <linux/slab.h>
5763 #include <linux/highmem.h> 5763 #include <linux/highmem.h>
@@ -5790,9 +5790,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ocfs2/namei.c linux-3.10.19-vs2.3.6.8/fs/
5790 fe->i_mode = cpu_to_le16(inode->i_mode); 5790 fe->i_mode = cpu_to_le16(inode->i_mode);
5791 if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode)) 5791 if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode))
5792 fe->id1.dev1.i_rdev = cpu_to_le64(huge_encode_dev(dev)); 5792 fe->id1.dev1.i_rdev = cpu_to_le64(huge_encode_dev(dev));
5793diff -NurpP --minimal linux-3.10.19/fs/ocfs2/ocfs2.h linux-3.10.19-vs2.3.6.8/fs/ocfs2/ocfs2.h 5793diff -NurpP --minimal linux-3.10.21/fs/ocfs2/ocfs2.h linux-3.10.21-vs2.3.6.8/fs/ocfs2/ocfs2.h
5794--- linux-3.10.19/fs/ocfs2/ocfs2.h 2012-12-11 03:30:57.000000000 +0000 5794--- linux-3.10.21/fs/ocfs2/ocfs2.h 2012-12-11 03:30:57.000000000 +0000
5795+++ linux-3.10.19-vs2.3.6.8/fs/ocfs2/ocfs2.h 2013-08-22 20:29:59.000000000 +0000 5795+++ linux-3.10.21-vs2.3.6.8/fs/ocfs2/ocfs2.h 2013-08-22 20:29:59.000000000 +0000
5796@@ -272,6 +272,7 @@ enum ocfs2_mount_options 5796@@ -272,6 +272,7 @@ enum ocfs2_mount_options
5797 writes */ 5797 writes */
5798 OCFS2_MOUNT_HB_NONE = 1 << 13, /* No heartbeat */ 5798 OCFS2_MOUNT_HB_NONE = 1 << 13, /* No heartbeat */
@@ -5801,9 +5801,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ocfs2/ocfs2.h linux-3.10.19-vs2.3.6.8/fs/
5801 }; 5801 };
5802 5802
5803 #define OCFS2_OSB_SOFT_RO 0x0001 5803 #define OCFS2_OSB_SOFT_RO 0x0001
5804diff -NurpP --minimal linux-3.10.19/fs/ocfs2/ocfs2_fs.h linux-3.10.19-vs2.3.6.8/fs/ocfs2/ocfs2_fs.h 5804diff -NurpP --minimal linux-3.10.21/fs/ocfs2/ocfs2_fs.h linux-3.10.21-vs2.3.6.8/fs/ocfs2/ocfs2_fs.h
5805--- linux-3.10.19/fs/ocfs2/ocfs2_fs.h 2012-12-11 03:30:57.000000000 +0000 5805--- linux-3.10.21/fs/ocfs2/ocfs2_fs.h 2012-12-11 03:30:57.000000000 +0000
5806+++ linux-3.10.19-vs2.3.6.8/fs/ocfs2/ocfs2_fs.h 2013-08-22 20:29:59.000000000 +0000 5806+++ linux-3.10.21-vs2.3.6.8/fs/ocfs2/ocfs2_fs.h 2013-08-22 20:29:59.000000000 +0000
5807@@ -266,6 +266,11 @@ 5807@@ -266,6 +266,11 @@
5808 #define OCFS2_TOPDIR_FL FS_TOPDIR_FL /* Top of directory hierarchies*/ 5808 #define OCFS2_TOPDIR_FL FS_TOPDIR_FL /* Top of directory hierarchies*/
5809 #define OCFS2_RESERVED_FL FS_RESERVED_FL /* reserved for ext2 lib */ 5809 #define OCFS2_RESERVED_FL FS_RESERVED_FL /* reserved for ext2 lib */
@@ -5816,9 +5816,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ocfs2/ocfs2_fs.h linux-3.10.19-vs2.3.6.8/
5816 #define OCFS2_FL_VISIBLE FS_FL_USER_VISIBLE /* User visible flags */ 5816 #define OCFS2_FL_VISIBLE FS_FL_USER_VISIBLE /* User visible flags */
5817 #define OCFS2_FL_MODIFIABLE FS_FL_USER_MODIFIABLE /* User modifiable flags */ 5817 #define OCFS2_FL_MODIFIABLE FS_FL_USER_MODIFIABLE /* User modifiable flags */
5818 5818
5819diff -NurpP --minimal linux-3.10.19/fs/ocfs2/super.c linux-3.10.19-vs2.3.6.8/fs/ocfs2/super.c 5819diff -NurpP --minimal linux-3.10.21/fs/ocfs2/super.c linux-3.10.21-vs2.3.6.8/fs/ocfs2/super.c
5820--- linux-3.10.19/fs/ocfs2/super.c 2013-05-31 13:45:25.000000000 +0000 5820--- linux-3.10.21/fs/ocfs2/super.c 2013-05-31 13:45:25.000000000 +0000
5821+++ linux-3.10.19-vs2.3.6.8/fs/ocfs2/super.c 2013-08-22 20:29:59.000000000 +0000 5821+++ linux-3.10.21-vs2.3.6.8/fs/ocfs2/super.c 2013-08-22 20:29:59.000000000 +0000
5822@@ -185,6 +185,7 @@ enum { 5822@@ -185,6 +185,7 @@ enum {
5823 Opt_coherency_full, 5823 Opt_coherency_full,
5824 Opt_resv_level, 5824 Opt_resv_level,
@@ -5882,9 +5882,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ocfs2/super.c linux-3.10.19-vs2.3.6.8/fs/
5882 default: 5882 default:
5883 mlog(ML_ERROR, 5883 mlog(ML_ERROR,
5884 "Unrecognized mount option \"%s\" " 5884 "Unrecognized mount option \"%s\" "
5885diff -NurpP --minimal linux-3.10.19/fs/open.c linux-3.10.19-vs2.3.6.8/fs/open.c 5885diff -NurpP --minimal linux-3.10.21/fs/open.c linux-3.10.21-vs2.3.6.8/fs/open.c
5886--- linux-3.10.19/fs/open.c 2013-07-14 17:01:29.000000000 +0000 5886--- linux-3.10.21/fs/open.c 2013-07-14 17:01:29.000000000 +0000
5887+++ linux-3.10.19-vs2.3.6.8/fs/open.c 2013-08-22 20:29:59.000000000 +0000 5887+++ linux-3.10.21-vs2.3.6.8/fs/open.c 2013-08-22 20:29:59.000000000 +0000
5888@@ -31,6 +31,11 @@ 5888@@ -31,6 +31,11 @@
5889 #include <linux/ima.h> 5889 #include <linux/ima.h>
5890 #include <linux/dnotify.h> 5890 #include <linux/dnotify.h>
@@ -5960,9 +5960,9 @@ diff -NurpP --minimal linux-3.10.19/fs/open.c linux-3.10.19-vs2.3.6.8/fs/open.c
5960 error = chown_common(&path, user, group); 5960 error = chown_common(&path, user, group);
5961 mnt_drop_write(path.mnt); 5961 mnt_drop_write(path.mnt);
5962 out_release: 5962 out_release:
5963diff -NurpP --minimal linux-3.10.19/fs/proc/array.c linux-3.10.19-vs2.3.6.8/fs/proc/array.c 5963diff -NurpP --minimal linux-3.10.21/fs/proc/array.c linux-3.10.21-vs2.3.6.8/fs/proc/array.c
5964--- linux-3.10.19/fs/proc/array.c 2013-05-31 13:45:25.000000000 +0000 5964--- linux-3.10.21/fs/proc/array.c 2013-05-31 13:45:25.000000000 +0000
5965+++ linux-3.10.19-vs2.3.6.8/fs/proc/array.c 2013-08-22 20:29:59.000000000 +0000 5965+++ linux-3.10.21-vs2.3.6.8/fs/proc/array.c 2013-08-22 20:29:59.000000000 +0000
5966@@ -82,6 +82,8 @@ 5966@@ -82,6 +82,8 @@
5967 #include <linux/ptrace.h> 5967 #include <linux/ptrace.h>
5968 #include <linux/tracehook.h> 5968 #include <linux/tracehook.h>
@@ -6076,9 +6076,9 @@ diff -NurpP --minimal linux-3.10.19/fs/proc/array.c linux-3.10.19-vs2.3.6.8/fs/p
6076 seq_printf(m, "%d (%s) %c", pid_nr_ns(pid, ns), tcomm, state); 6076 seq_printf(m, "%d (%s) %c", pid_nr_ns(pid, ns), tcomm, state);
6077 seq_put_decimal_ll(m, ' ', ppid); 6077 seq_put_decimal_ll(m, ' ', ppid);
6078 seq_put_decimal_ll(m, ' ', pgid); 6078 seq_put_decimal_ll(m, ' ', pgid);
6079diff -NurpP --minimal linux-3.10.19/fs/proc/base.c linux-3.10.19-vs2.3.6.8/fs/proc/base.c 6079diff -NurpP --minimal linux-3.10.21/fs/proc/base.c linux-3.10.21-vs2.3.6.8/fs/proc/base.c
6080--- linux-3.10.19/fs/proc/base.c 2013-07-14 17:01:29.000000000 +0000 6080--- linux-3.10.21/fs/proc/base.c 2013-07-14 17:01:29.000000000 +0000
6081+++ linux-3.10.19-vs2.3.6.8/fs/proc/base.c 2013-08-22 22:18:21.000000000 +0000 6081+++ linux-3.10.21-vs2.3.6.8/fs/proc/base.c 2013-08-22 22:18:21.000000000 +0000
6082@@ -87,6 +87,8 @@ 6082@@ -87,6 +87,8 @@
6083 #include <linux/slab.h> 6083 #include <linux/slab.h>
6084 #include <linux/flex_array.h> 6084 #include <linux/flex_array.h>
@@ -6221,9 +6221,9 @@ diff -NurpP --minimal linux-3.10.19/fs/proc/base.c linux-3.10.19-vs2.3.6.8/fs/pr
6221 6221
6222 ns = dentry->d_sb->s_fs_info; 6222 ns = dentry->d_sb->s_fs_info;
6223 rcu_read_lock(); 6223 rcu_read_lock();
6224diff -NurpP --minimal linux-3.10.19/fs/proc/generic.c linux-3.10.19-vs2.3.6.8/fs/proc/generic.c 6224diff -NurpP --minimal linux-3.10.21/fs/proc/generic.c linux-3.10.21-vs2.3.6.8/fs/proc/generic.c
6225--- linux-3.10.19/fs/proc/generic.c 2013-07-14 17:01:29.000000000 +0000 6225--- linux-3.10.21/fs/proc/generic.c 2013-07-14 17:01:29.000000000 +0000
6226+++ linux-3.10.19-vs2.3.6.8/fs/proc/generic.c 2013-08-22 20:29:59.000000000 +0000 6226+++ linux-3.10.21-vs2.3.6.8/fs/proc/generic.c 2013-08-22 20:29:59.000000000 +0000
6227@@ -23,6 +23,7 @@ 6227@@ -23,6 +23,7 @@
6228 #include <linux/bitops.h> 6228 #include <linux/bitops.h>
6229 #include <linux/spinlock.h> 6229 #include <linux/spinlock.h>
@@ -6285,9 +6285,9 @@ diff -NurpP --minimal linux-3.10.19/fs/proc/generic.c linux-3.10.19-vs2.3.6.8/fs
6285 } else { 6285 } else {
6286 kfree(ent); 6286 kfree(ent);
6287 ent = NULL; 6287 ent = NULL;
6288diff -NurpP --minimal linux-3.10.19/fs/proc/inode.c linux-3.10.19-vs2.3.6.8/fs/proc/inode.c 6288diff -NurpP --minimal linux-3.10.21/fs/proc/inode.c linux-3.10.21-vs2.3.6.8/fs/proc/inode.c
6289--- linux-3.10.19/fs/proc/inode.c 2013-07-14 17:01:29.000000000 +0000 6289--- linux-3.10.21/fs/proc/inode.c 2013-07-14 17:01:29.000000000 +0000
6290+++ linux-3.10.19-vs2.3.6.8/fs/proc/inode.c 2013-08-22 20:29:59.000000000 +0000 6290+++ linux-3.10.21-vs2.3.6.8/fs/proc/inode.c 2013-08-22 20:29:59.000000000 +0000
6291@@ -387,6 +387,8 @@ struct inode *proc_get_inode(struct supe 6291@@ -387,6 +387,8 @@ struct inode *proc_get_inode(struct supe
6292 inode->i_uid = de->uid; 6292 inode->i_uid = de->uid;
6293 inode->i_gid = de->gid; 6293 inode->i_gid = de->gid;
@@ -6297,9 +6297,9 @@ diff -NurpP --minimal linux-3.10.19/fs/proc/inode.c linux-3.10.19-vs2.3.6.8/fs/p
6297 if (de->size) 6297 if (de->size)
6298 inode->i_size = de->size; 6298 inode->i_size = de->size;
6299 if (de->nlink) 6299 if (de->nlink)
6300diff -NurpP --minimal linux-3.10.19/fs/proc/internal.h linux-3.10.19-vs2.3.6.8/fs/proc/internal.h 6300diff -NurpP --minimal linux-3.10.21/fs/proc/internal.h linux-3.10.21-vs2.3.6.8/fs/proc/internal.h
6301--- linux-3.10.19/fs/proc/internal.h 2013-07-14 17:01:29.000000000 +0000 6301--- linux-3.10.21/fs/proc/internal.h 2013-07-14 17:01:29.000000000 +0000
6302+++ linux-3.10.19-vs2.3.6.8/fs/proc/internal.h 2013-08-22 21:52:30.000000000 +0000 6302+++ linux-3.10.21-vs2.3.6.8/fs/proc/internal.h 2013-08-22 21:52:30.000000000 +0000
6303@@ -14,6 +14,7 @@ 6303@@ -14,6 +14,7 @@
6304 #include <linux/spinlock.h> 6304 #include <linux/spinlock.h>
6305 #include <linux/atomic.h> 6305 #include <linux/atomic.h>
@@ -6367,9 +6367,9 @@ diff -NurpP --minimal linux-3.10.19/fs/proc/internal.h linux-3.10.19-vs2.3.6.8/f
6367 6367
6368 /* 6368 /*
6369 * base.c 6369 * base.c
6370diff -NurpP --minimal linux-3.10.19/fs/proc/loadavg.c linux-3.10.19-vs2.3.6.8/fs/proc/loadavg.c 6370diff -NurpP --minimal linux-3.10.21/fs/proc/loadavg.c linux-3.10.21-vs2.3.6.8/fs/proc/loadavg.c
6371--- linux-3.10.19/fs/proc/loadavg.c 2012-12-11 03:30:57.000000000 +0000 6371--- linux-3.10.21/fs/proc/loadavg.c 2012-12-11 03:30:57.000000000 +0000
6372+++ linux-3.10.19-vs2.3.6.8/fs/proc/loadavg.c 2013-08-22 20:30:00.000000000 +0000 6372+++ linux-3.10.21-vs2.3.6.8/fs/proc/loadavg.c 2013-08-22 20:30:00.000000000 +0000
6373@@ -12,15 +12,27 @@ 6373@@ -12,15 +12,27 @@
6374 6374
6375 static int loadavg_proc_show(struct seq_file *m, void *v) 6375 static int loadavg_proc_show(struct seq_file *m, void *v)
@@ -6399,9 +6399,9 @@ diff -NurpP --minimal linux-3.10.19/fs/proc/loadavg.c linux-3.10.19-vs2.3.6.8/fs
6399 task_active_pid_ns(current)->last_pid); 6399 task_active_pid_ns(current)->last_pid);
6400 return 0; 6400 return 0;
6401 } 6401 }
6402diff -NurpP --minimal linux-3.10.19/fs/proc/meminfo.c linux-3.10.19-vs2.3.6.8/fs/proc/meminfo.c 6402diff -NurpP --minimal linux-3.10.21/fs/proc/meminfo.c linux-3.10.21-vs2.3.6.8/fs/proc/meminfo.c
6403--- linux-3.10.19/fs/proc/meminfo.c 2013-07-14 17:01:29.000000000 +0000 6403--- linux-3.10.21/fs/proc/meminfo.c 2013-07-14 17:01:29.000000000 +0000
6404+++ linux-3.10.19-vs2.3.6.8/fs/proc/meminfo.c 2013-08-22 20:30:00.000000000 +0000 6404+++ linux-3.10.21-vs2.3.6.8/fs/proc/meminfo.c 2013-08-22 20:30:00.000000000 +0000
6405@@ -40,7 +40,8 @@ static int meminfo_proc_show(struct seq_ 6405@@ -40,7 +40,8 @@ static int meminfo_proc_show(struct seq_
6406 allowed = ((totalram_pages - hugetlb_total_pages()) 6406 allowed = ((totalram_pages - hugetlb_total_pages())
6407 * sysctl_overcommit_ratio / 100) + total_swap_pages; 6407 * sysctl_overcommit_ratio / 100) + total_swap_pages;
@@ -6412,9 +6412,9 @@ diff -NurpP --minimal linux-3.10.19/fs/proc/meminfo.c linux-3.10.19-vs2.3.6.8/fs
6412 total_swapcache_pages() - i.bufferram; 6412 total_swapcache_pages() - i.bufferram;
6413 if (cached < 0) 6413 if (cached < 0)
6414 cached = 0; 6414 cached = 0;
6415diff -NurpP --minimal linux-3.10.19/fs/proc/root.c linux-3.10.19-vs2.3.6.8/fs/proc/root.c 6415diff -NurpP --minimal linux-3.10.21/fs/proc/root.c linux-3.10.21-vs2.3.6.8/fs/proc/root.c
6416--- linux-3.10.19/fs/proc/root.c 2013-11-13 17:21:14.000000000 +0000 6416--- linux-3.10.21/fs/proc/root.c 2013-11-30 07:50:50.000000000 +0000
6417+++ linux-3.10.19-vs2.3.6.8/fs/proc/root.c 2013-11-13 17:19:37.000000000 +0000 6417+++ linux-3.10.21-vs2.3.6.8/fs/proc/root.c 2013-11-13 17:19:37.000000000 +0000
6418@@ -20,9 +20,14 @@ 6418@@ -20,9 +20,14 @@
6419 #include <linux/mount.h> 6419 #include <linux/mount.h>
6420 #include <linux/pid_namespace.h> 6420 #include <linux/pid_namespace.h>
@@ -6456,9 +6456,9 @@ diff -NurpP --minimal linux-3.10.19/fs/proc/root.c linux-3.10.19-vs2.3.6.8/fs/pr
6456 .name = "/proc", 6456 .name = "/proc",
6457 }; 6457 };
6458 6458
6459diff -NurpP --minimal linux-3.10.19/fs/proc/self.c linux-3.10.19-vs2.3.6.8/fs/proc/self.c 6459diff -NurpP --minimal linux-3.10.21/fs/proc/self.c linux-3.10.21-vs2.3.6.8/fs/proc/self.c
6460--- linux-3.10.19/fs/proc/self.c 2013-07-14 17:01:29.000000000 +0000 6460--- linux-3.10.21/fs/proc/self.c 2013-07-14 17:01:29.000000000 +0000
6461+++ linux-3.10.19-vs2.3.6.8/fs/proc/self.c 2013-08-23 00:07:45.000000000 +0000 6461+++ linux-3.10.21-vs2.3.6.8/fs/proc/self.c 2013-08-23 00:07:45.000000000 +0000
6462@@ -2,6 +2,7 @@ 6462@@ -2,6 +2,7 @@
6463 #include <linux/namei.h> 6463 #include <linux/namei.h>
6464 #include <linux/slab.h> 6464 #include <linux/slab.h>
@@ -6476,9 +6476,9 @@ diff -NurpP --minimal linux-3.10.19/fs/proc/self.c linux-3.10.19-vs2.3.6.8/fs/pr
6476 if (inode) { 6476 if (inode) {
6477 inode->i_ino = self_inum; 6477 inode->i_ino = self_inum;
6478 inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME; 6478 inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
6479diff -NurpP --minimal linux-3.10.19/fs/proc/stat.c linux-3.10.19-vs2.3.6.8/fs/proc/stat.c 6479diff -NurpP --minimal linux-3.10.21/fs/proc/stat.c linux-3.10.21-vs2.3.6.8/fs/proc/stat.c
6480--- linux-3.10.19/fs/proc/stat.c 2013-07-14 17:01:29.000000000 +0000 6480--- linux-3.10.21/fs/proc/stat.c 2013-07-14 17:01:29.000000000 +0000
6481+++ linux-3.10.19-vs2.3.6.8/fs/proc/stat.c 2013-08-22 20:30:00.000000000 +0000 6481+++ linux-3.10.21-vs2.3.6.8/fs/proc/stat.c 2013-08-22 20:30:00.000000000 +0000
6482@@ -9,8 +9,10 @@ 6482@@ -9,8 +9,10 @@
6483 #include <linux/slab.h> 6483 #include <linux/slab.h>
6484 #include <linux/time.h> 6484 #include <linux/time.h>
@@ -6527,9 +6527,9 @@ diff -NurpP --minimal linux-3.10.19/fs/proc/stat.c linux-3.10.19-vs2.3.6.8/fs/pr
6527 /* Copy values here to work around gcc-2.95.3, gcc-2.96 */ 6527 /* Copy values here to work around gcc-2.95.3, gcc-2.96 */
6528 user = kcpustat_cpu(i).cpustat[CPUTIME_USER]; 6528 user = kcpustat_cpu(i).cpustat[CPUTIME_USER];
6529 nice = kcpustat_cpu(i).cpustat[CPUTIME_NICE]; 6529 nice = kcpustat_cpu(i).cpustat[CPUTIME_NICE];
6530diff -NurpP --minimal linux-3.10.19/fs/proc/uptime.c linux-3.10.19-vs2.3.6.8/fs/proc/uptime.c 6530diff -NurpP --minimal linux-3.10.21/fs/proc/uptime.c linux-3.10.21-vs2.3.6.8/fs/proc/uptime.c
6531--- linux-3.10.19/fs/proc/uptime.c 2012-12-11 03:30:57.000000000 +0000 6531--- linux-3.10.21/fs/proc/uptime.c 2012-12-11 03:30:57.000000000 +0000
6532+++ linux-3.10.19-vs2.3.6.8/fs/proc/uptime.c 2013-08-22 20:30:00.000000000 +0000 6532+++ linux-3.10.21-vs2.3.6.8/fs/proc/uptime.c 2013-08-22 20:30:00.000000000 +0000
6533@@ -5,6 +5,7 @@ 6533@@ -5,6 +5,7 @@
6534 #include <linux/seq_file.h> 6534 #include <linux/seq_file.h>
6535 #include <linux/time.h> 6535 #include <linux/time.h>
@@ -6549,9 +6549,9 @@ diff -NurpP --minimal linux-3.10.19/fs/proc/uptime.c linux-3.10.19-vs2.3.6.8/fs/
6549 seq_printf(m, "%lu.%02lu %lu.%02lu\n", 6549 seq_printf(m, "%lu.%02lu %lu.%02lu\n",
6550 (unsigned long) uptime.tv_sec, 6550 (unsigned long) uptime.tv_sec,
6551 (uptime.tv_nsec / (NSEC_PER_SEC / 100)), 6551 (uptime.tv_nsec / (NSEC_PER_SEC / 100)),
6552diff -NurpP --minimal linux-3.10.19/fs/proc_namespace.c linux-3.10.19-vs2.3.6.8/fs/proc_namespace.c 6552diff -NurpP --minimal linux-3.10.21/fs/proc_namespace.c linux-3.10.21-vs2.3.6.8/fs/proc_namespace.c
6553--- linux-3.10.19/fs/proc_namespace.c 2012-12-11 03:30:57.000000000 +0000 6553--- linux-3.10.21/fs/proc_namespace.c 2012-12-11 03:30:57.000000000 +0000
6554+++ linux-3.10.19-vs2.3.6.8/fs/proc_namespace.c 2013-08-22 20:30:00.000000000 +0000 6554+++ linux-3.10.21-vs2.3.6.8/fs/proc_namespace.c 2013-08-22 20:30:00.000000000 +0000
6555@@ -44,6 +44,8 @@ static int show_sb_opts(struct seq_file 6555@@ -44,6 +44,8 @@ static int show_sb_opts(struct seq_file
6556 { MS_SYNCHRONOUS, ",sync" }, 6556 { MS_SYNCHRONOUS, ",sync" },
6557 { MS_DIRSYNC, ",dirsync" }, 6557 { MS_DIRSYNC, ",dirsync" },
@@ -6667,9 +6667,9 @@ diff -NurpP --minimal linux-3.10.19/fs/proc_namespace.c linux-3.10.19-vs2.3.6.8/
6667 /* file system type */ 6667 /* file system type */
6668 seq_puts(m, "with fstype "); 6668 seq_puts(m, "with fstype ");
6669 show_type(m, sb); 6669 show_type(m, sb);
6670diff -NurpP --minimal linux-3.10.19/fs/quota/dquot.c linux-3.10.19-vs2.3.6.8/fs/quota/dquot.c 6670diff -NurpP --minimal linux-3.10.21/fs/quota/dquot.c linux-3.10.21-vs2.3.6.8/fs/quota/dquot.c
6671--- linux-3.10.19/fs/quota/dquot.c 2013-05-31 13:45:25.000000000 +0000 6671--- linux-3.10.21/fs/quota/dquot.c 2013-05-31 13:45:25.000000000 +0000
6672+++ linux-3.10.19-vs2.3.6.8/fs/quota/dquot.c 2013-08-22 20:30:00.000000000 +0000 6672+++ linux-3.10.21-vs2.3.6.8/fs/quota/dquot.c 2013-08-22 20:30:00.000000000 +0000
6673@@ -1585,6 +1585,9 @@ int __dquot_alloc_space(struct inode *in 6673@@ -1585,6 +1585,9 @@ int __dquot_alloc_space(struct inode *in
6674 struct dquot **dquots = inode->i_dquot; 6674 struct dquot **dquots = inode->i_dquot;
6675 int reserve = flags & DQUOT_SPACE_RESERVE; 6675 int reserve = flags & DQUOT_SPACE_RESERVE;
@@ -6708,9 +6708,9 @@ diff -NurpP --minimal linux-3.10.19/fs/quota/dquot.c linux-3.10.19-vs2.3.6.8/fs/
6708 /* First test before acquiring mutex - solves deadlocks when we 6708 /* First test before acquiring mutex - solves deadlocks when we
6709 * re-enter the quota code and are already holding the mutex */ 6709 * re-enter the quota code and are already holding the mutex */
6710 if (!dquot_active(inode)) 6710 if (!dquot_active(inode))
6711diff -NurpP --minimal linux-3.10.19/fs/quota/quota.c linux-3.10.19-vs2.3.6.8/fs/quota/quota.c 6711diff -NurpP --minimal linux-3.10.21/fs/quota/quota.c linux-3.10.21-vs2.3.6.8/fs/quota/quota.c
6712--- linux-3.10.19/fs/quota/quota.c 2013-02-19 13:58:49.000000000 +0000 6712--- linux-3.10.21/fs/quota/quota.c 2013-02-19 13:58:49.000000000 +0000
6713+++ linux-3.10.19-vs2.3.6.8/fs/quota/quota.c 2013-08-22 20:30:00.000000000 +0000 6713+++ linux-3.10.21-vs2.3.6.8/fs/quota/quota.c 2013-08-22 20:30:00.000000000 +0000
6714@@ -8,6 +8,7 @@ 6714@@ -8,6 +8,7 @@
6715 #include <linux/fs.h> 6715 #include <linux/fs.h>
6716 #include <linux/namei.h> 6716 #include <linux/namei.h>
@@ -6798,9 +6798,9 @@ diff -NurpP --minimal linux-3.10.19/fs/quota/quota.c linux-3.10.19-vs2.3.6.8/fs/
6798 if (quotactl_cmd_write(cmd)) 6798 if (quotactl_cmd_write(cmd))
6799 sb = get_super_thawed(bdev); 6799 sb = get_super_thawed(bdev);
6800 else 6800 else
6801diff -NurpP --minimal linux-3.10.19/fs/stat.c linux-3.10.19-vs2.3.6.8/fs/stat.c 6801diff -NurpP --minimal linux-3.10.21/fs/stat.c linux-3.10.21-vs2.3.6.8/fs/stat.c
6802--- linux-3.10.19/fs/stat.c 2013-05-31 13:45:25.000000000 +0000 6802--- linux-3.10.21/fs/stat.c 2013-05-31 13:45:25.000000000 +0000
6803+++ linux-3.10.19-vs2.3.6.8/fs/stat.c 2013-08-22 20:30:00.000000000 +0000 6803+++ linux-3.10.21-vs2.3.6.8/fs/stat.c 2013-08-22 20:30:00.000000000 +0000
6804@@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod 6804@@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod
6805 stat->nlink = inode->i_nlink; 6805 stat->nlink = inode->i_nlink;
6806 stat->uid = inode->i_uid; 6806 stat->uid = inode->i_uid;
@@ -6809,9 +6809,9 @@ diff -NurpP --minimal linux-3.10.19/fs/stat.c linux-3.10.19-vs2.3.6.8/fs/stat.c
6809 stat->rdev = inode->i_rdev; 6809 stat->rdev = inode->i_rdev;
6810 stat->size = i_size_read(inode); 6810 stat->size = i_size_read(inode);
6811 stat->atime = inode->i_atime; 6811 stat->atime = inode->i_atime;
6812diff -NurpP --minimal linux-3.10.19/fs/statfs.c linux-3.10.19-vs2.3.6.8/fs/statfs.c 6812diff -NurpP --minimal linux-3.10.21/fs/statfs.c linux-3.10.21-vs2.3.6.8/fs/statfs.c
6813--- linux-3.10.19/fs/statfs.c 2013-11-13 17:21:14.000000000 +0000 6813--- linux-3.10.21/fs/statfs.c 2013-11-30 07:50:50.000000000 +0000
6814+++ linux-3.10.19-vs2.3.6.8/fs/statfs.c 2013-11-13 17:17:16.000000000 +0000 6814+++ linux-3.10.21-vs2.3.6.8/fs/statfs.c 2013-11-13 17:17:16.000000000 +0000
6815@@ -7,6 +7,8 @@ 6815@@ -7,6 +7,8 @@
6816 #include <linux/statfs.h> 6816 #include <linux/statfs.h>
6817 #include <linux/security.h> 6817 #include <linux/security.h>
@@ -6830,9 +6830,9 @@ diff -NurpP --minimal linux-3.10.19/fs/statfs.c linux-3.10.19-vs2.3.6.8/fs/statf
6830 return retval; 6830 return retval;
6831 } 6831 }
6832 6832
6833diff -NurpP --minimal linux-3.10.19/fs/super.c linux-3.10.19-vs2.3.6.8/fs/super.c 6833diff -NurpP --minimal linux-3.10.21/fs/super.c linux-3.10.21-vs2.3.6.8/fs/super.c
6834--- linux-3.10.19/fs/super.c 2013-11-13 17:21:14.000000000 +0000 6834--- linux-3.10.21/fs/super.c 2013-11-30 07:50:50.000000000 +0000
6835+++ linux-3.10.19-vs2.3.6.8/fs/super.c 2013-11-13 17:17:16.000000000 +0000 6835+++ linux-3.10.21-vs2.3.6.8/fs/super.c 2013-11-13 17:17:16.000000000 +0000
6836@@ -34,6 +34,8 @@ 6836@@ -34,6 +34,8 @@
6837 #include <linux/cleancache.h> 6837 #include <linux/cleancache.h>
6838 #include <linux/fsnotify.h> 6838 #include <linux/fsnotify.h>
@@ -6856,9 +6856,9 @@ diff -NurpP --minimal linux-3.10.19/fs/super.c linux-3.10.19-vs2.3.6.8/fs/super.
6856 error = security_sb_kern_mount(sb, flags, secdata); 6856 error = security_sb_kern_mount(sb, flags, secdata);
6857 if (error) 6857 if (error)
6858 goto out_sb; 6858 goto out_sb;
6859diff -NurpP --minimal linux-3.10.19/fs/sysfs/mount.c linux-3.10.19-vs2.3.6.8/fs/sysfs/mount.c 6859diff -NurpP --minimal linux-3.10.21/fs/sysfs/mount.c linux-3.10.21-vs2.3.6.8/fs/sysfs/mount.c
6860--- linux-3.10.19/fs/sysfs/mount.c 2013-05-31 13:45:25.000000000 +0000 6860--- linux-3.10.21/fs/sysfs/mount.c 2013-05-31 13:45:25.000000000 +0000
6861+++ linux-3.10.19-vs2.3.6.8/fs/sysfs/mount.c 2013-08-22 20:30:00.000000000 +0000 6861+++ linux-3.10.21-vs2.3.6.8/fs/sysfs/mount.c 2013-08-22 20:30:00.000000000 +0000
6862@@ -48,7 +48,7 @@ static int sysfs_fill_super(struct super 6862@@ -48,7 +48,7 @@ static int sysfs_fill_super(struct super
6863 6863
6864 sb->s_blocksize = PAGE_CACHE_SIZE; 6864 sb->s_blocksize = PAGE_CACHE_SIZE;
@@ -6868,9 +6868,9 @@ diff -NurpP --minimal linux-3.10.19/fs/sysfs/mount.c linux-3.10.19-vs2.3.6.8/fs/
6868 sb->s_op = &sysfs_ops; 6868 sb->s_op = &sysfs_ops;
6869 sb->s_time_gran = 1; 6869 sb->s_time_gran = 1;
6870 6870
6871diff -NurpP --minimal linux-3.10.19/fs/utimes.c linux-3.10.19-vs2.3.6.8/fs/utimes.c 6871diff -NurpP --minimal linux-3.10.21/fs/utimes.c linux-3.10.21-vs2.3.6.8/fs/utimes.c
6872--- linux-3.10.19/fs/utimes.c 2013-02-19 13:58:49.000000000 +0000 6872--- linux-3.10.21/fs/utimes.c 2013-02-19 13:58:49.000000000 +0000
6873+++ linux-3.10.19-vs2.3.6.8/fs/utimes.c 2013-08-22 20:30:00.000000000 +0000 6873+++ linux-3.10.21-vs2.3.6.8/fs/utimes.c 2013-08-22 20:30:00.000000000 +0000
6874@@ -8,6 +8,8 @@ 6874@@ -8,6 +8,8 @@
6875 #include <linux/stat.h> 6875 #include <linux/stat.h>
6876 #include <linux/utime.h> 6876 #include <linux/utime.h>
@@ -6900,9 +6900,9 @@ diff -NurpP --minimal linux-3.10.19/fs/utimes.c linux-3.10.19-vs2.3.6.8/fs/utime
6900 if (times && times[0].tv_nsec == UTIME_NOW && 6900 if (times && times[0].tv_nsec == UTIME_NOW &&
6901 times[1].tv_nsec == UTIME_NOW) 6901 times[1].tv_nsec == UTIME_NOW)
6902 times = NULL; 6902 times = NULL;
6903diff -NurpP --minimal linux-3.10.19/fs/xattr.c linux-3.10.19-vs2.3.6.8/fs/xattr.c 6903diff -NurpP --minimal linux-3.10.21/fs/xattr.c linux-3.10.21-vs2.3.6.8/fs/xattr.c
6904--- linux-3.10.19/fs/xattr.c 2013-02-19 13:58:49.000000000 +0000 6904--- linux-3.10.21/fs/xattr.c 2013-02-19 13:58:49.000000000 +0000
6905+++ linux-3.10.19-vs2.3.6.8/fs/xattr.c 2013-08-22 20:30:00.000000000 +0000 6905+++ linux-3.10.21-vs2.3.6.8/fs/xattr.c 2013-08-22 20:30:00.000000000 +0000
6906@@ -21,6 +21,7 @@ 6906@@ -21,6 +21,7 @@
6907 #include <linux/audit.h> 6907 #include <linux/audit.h>
6908 #include <linux/vmalloc.h> 6908 #include <linux/vmalloc.h>
@@ -6920,9 +6920,9 @@ diff -NurpP --minimal linux-3.10.19/fs/xattr.c linux-3.10.19-vs2.3.6.8/fs/xattr.
6920 return (mask & MAY_WRITE) ? -EPERM : -ENODATA; 6920 return (mask & MAY_WRITE) ? -EPERM : -ENODATA;
6921 return 0; 6921 return 0;
6922 } 6922 }
6923diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_dinode.h linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_dinode.h 6923diff -NurpP --minimal linux-3.10.21/fs/xfs/xfs_dinode.h linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_dinode.h
6924--- linux-3.10.19/fs/xfs/xfs_dinode.h 2013-07-14 17:01:29.000000000 +0000 6924--- linux-3.10.21/fs/xfs/xfs_dinode.h 2013-07-14 17:01:29.000000000 +0000
6925+++ linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_dinode.h 2013-08-22 20:30:00.000000000 +0000 6925+++ linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_dinode.h 2013-08-22 20:30:00.000000000 +0000
6926@@ -51,7 +51,9 @@ typedef struct xfs_dinode { 6926@@ -51,7 +51,9 @@ typedef struct xfs_dinode {
6927 __be32 di_nlink; /* number of links to file */ 6927 __be32 di_nlink; /* number of links to file */
6928 __be16 di_projid_lo; /* lower part of owner's project id */ 6928 __be16 di_projid_lo; /* lower part of owner's project id */
@@ -6963,9 +6963,9 @@ diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_dinode.h linux-3.10.19-vs2.3.6.8/
6963+#define XFS_DIVFLAG_COW 0x02 6963+#define XFS_DIVFLAG_COW 0x02
6964 6964
6965 #endif /* __XFS_DINODE_H__ */ 6965 #endif /* __XFS_DINODE_H__ */
6966diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_fs.h linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_fs.h 6966diff -NurpP --minimal linux-3.10.21/fs/xfs/xfs_fs.h linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_fs.h
6967--- linux-3.10.19/fs/xfs/xfs_fs.h 2013-07-14 17:01:29.000000000 +0000 6967--- linux-3.10.21/fs/xfs/xfs_fs.h 2013-07-14 17:01:29.000000000 +0000
6968+++ linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_fs.h 2013-08-22 20:30:00.000000000 +0000 6968+++ linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_fs.h 2013-08-22 20:30:00.000000000 +0000
6969@@ -67,6 +67,9 @@ struct fsxattr { 6969@@ -67,6 +67,9 @@ struct fsxattr {
6970 #define XFS_XFLAG_EXTSZINHERIT 0x00001000 /* inherit inode extent size */ 6970 #define XFS_XFLAG_EXTSZINHERIT 0x00001000 /* inherit inode extent size */
6971 #define XFS_XFLAG_NODEFRAG 0x00002000 /* do not defragment */ 6971 #define XFS_XFLAG_NODEFRAG 0x00002000 /* do not defragment */
@@ -6986,9 +6986,9 @@ diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_fs.h linux-3.10.19-vs2.3.6.8/fs/x
6986 __u32 bs_dmevmask; /* DMIG event mask */ 6986 __u32 bs_dmevmask; /* DMIG event mask */
6987 __u16 bs_dmstate; /* DMIG state info */ 6987 __u16 bs_dmstate; /* DMIG state info */
6988 __u16 bs_aextents; /* attribute number of extents */ 6988 __u16 bs_aextents; /* attribute number of extents */
6989diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_ialloc.c linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_ialloc.c 6989diff -NurpP --minimal linux-3.10.21/fs/xfs/xfs_ialloc.c linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_ialloc.c
6990--- linux-3.10.19/fs/xfs/xfs_ialloc.c 2013-07-14 17:01:29.000000000 +0000 6990--- linux-3.10.21/fs/xfs/xfs_ialloc.c 2013-07-14 17:01:29.000000000 +0000
6991+++ linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_ialloc.c 2013-08-22 20:30:00.000000000 +0000 6991+++ linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_ialloc.c 2013-08-22 20:30:00.000000000 +0000
6992@@ -39,7 +39,6 @@ 6992@@ -39,7 +39,6 @@
6993 #include "xfs_cksum.h" 6993 #include "xfs_cksum.h"
6994 #include "xfs_buf_item.h" 6994 #include "xfs_buf_item.h"
@@ -6997,9 +6997,9 @@ diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_ialloc.c linux-3.10.19-vs2.3.6.8/
6997 /* 6997 /*
6998 * Allocation group level functions. 6998 * Allocation group level functions.
6999 */ 6999 */
7000diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_inode.c linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_inode.c 7000diff -NurpP --minimal linux-3.10.21/fs/xfs/xfs_inode.c linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_inode.c
7001--- linux-3.10.19/fs/xfs/xfs_inode.c 2013-07-14 17:01:29.000000000 +0000 7001--- linux-3.10.21/fs/xfs/xfs_inode.c 2013-07-14 17:01:29.000000000 +0000
7002+++ linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_inode.c 2013-08-22 21:50:34.000000000 +0000 7002+++ linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_inode.c 2013-08-22 21:50:34.000000000 +0000
7003@@ -16,6 +16,7 @@ 7003@@ -16,6 +16,7 @@
7004 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA 7004 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
7005 */ 7005 */
@@ -7177,9 +7177,9 @@ diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_inode.c linux-3.10.19-vs2.3.6.8/f
7177 7177
7178 /* Wrap, we never let the log put out DI_MAX_FLUSH */ 7178 /* Wrap, we never let the log put out DI_MAX_FLUSH */
7179 if (ip->i_d.di_flushiter == DI_MAX_FLUSH) 7179 if (ip->i_d.di_flushiter == DI_MAX_FLUSH)
7180diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_inode.h linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_inode.h 7180diff -NurpP --minimal linux-3.10.21/fs/xfs/xfs_inode.h linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_inode.h
7181--- linux-3.10.19/fs/xfs/xfs_inode.h 2013-07-14 17:01:30.000000000 +0000 7181--- linux-3.10.21/fs/xfs/xfs_inode.h 2013-07-14 17:01:30.000000000 +0000
7182+++ linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_inode.h 2013-08-22 20:30:00.000000000 +0000 7182+++ linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_inode.h 2013-08-22 20:30:00.000000000 +0000
7183@@ -134,7 +134,9 @@ typedef struct xfs_icdinode { 7183@@ -134,7 +134,9 @@ typedef struct xfs_icdinode {
7184 __uint32_t di_nlink; /* number of links to file */ 7184 __uint32_t di_nlink; /* number of links to file */
7185 __uint16_t di_projid_lo; /* lower part of owner's project id */ 7185 __uint16_t di_projid_lo; /* lower part of owner's project id */
@@ -7200,9 +7200,9 @@ diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_inode.h linux-3.10.19-vs2.3.6.8/f
7200 void xfs_idestroy_fork(struct xfs_inode *, int); 7200 void xfs_idestroy_fork(struct xfs_inode *, int);
7201 void xfs_idata_realloc(struct xfs_inode *, int, int); 7201 void xfs_idata_realloc(struct xfs_inode *, int, int);
7202 void xfs_iroot_realloc(struct xfs_inode *, int, int); 7202 void xfs_iroot_realloc(struct xfs_inode *, int, int);
7203diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_ioctl.c linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_ioctl.c 7203diff -NurpP --minimal linux-3.10.21/fs/xfs/xfs_ioctl.c linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_ioctl.c
7204--- linux-3.10.19/fs/xfs/xfs_ioctl.c 2013-07-14 17:01:30.000000000 +0000 7204--- linux-3.10.21/fs/xfs/xfs_ioctl.c 2013-07-14 17:01:30.000000000 +0000
7205+++ linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_ioctl.c 2013-08-22 20:30:00.000000000 +0000 7205+++ linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_ioctl.c 2013-08-22 20:30:00.000000000 +0000
7206@@ -26,7 +26,7 @@ 7206@@ -26,7 +26,7 @@
7207 #include "xfs_bmap_btree.h" 7207 #include "xfs_bmap_btree.h"
7208 #include "xfs_dinode.h" 7208 #include "xfs_dinode.h"
@@ -7271,9 +7271,9 @@ diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_ioctl.c linux-3.10.19-vs2.3.6.8/f
7271 return xfs_ioc_setxflags(ip, filp, arg); 7271 return xfs_ioc_setxflags(ip, filp, arg);
7272 7272
7273 case XFS_IOC_FSSETDM: { 7273 case XFS_IOC_FSSETDM: {
7274diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_ioctl.h linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_ioctl.h 7274diff -NurpP --minimal linux-3.10.21/fs/xfs/xfs_ioctl.h linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_ioctl.h
7275--- linux-3.10.19/fs/xfs/xfs_ioctl.h 2012-12-11 03:30:57.000000000 +0000 7275--- linux-3.10.21/fs/xfs/xfs_ioctl.h 2012-12-11 03:30:57.000000000 +0000
7276+++ linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_ioctl.h 2013-08-22 20:30:00.000000000 +0000 7276+++ linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_ioctl.h 2013-08-22 20:30:00.000000000 +0000
7277@@ -70,6 +70,12 @@ xfs_handle_to_dentry( 7277@@ -70,6 +70,12 @@ xfs_handle_to_dentry(
7278 void __user *uhandle, 7278 void __user *uhandle,
7279 u32 hlen); 7279 u32 hlen);
@@ -7287,9 +7287,9 @@ diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_ioctl.h linux-3.10.19-vs2.3.6.8/f
7287 extern long 7287 extern long
7288 xfs_file_ioctl( 7288 xfs_file_ioctl(
7289 struct file *filp, 7289 struct file *filp,
7290diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_iops.c linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_iops.c 7290diff -NurpP --minimal linux-3.10.21/fs/xfs/xfs_iops.c linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_iops.c
7291--- linux-3.10.19/fs/xfs/xfs_iops.c 2013-07-14 17:01:30.000000000 +0000 7291--- linux-3.10.21/fs/xfs/xfs_iops.c 2013-07-14 17:01:30.000000000 +0000
7292+++ linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_iops.c 2013-08-22 20:30:00.000000000 +0000 7292+++ linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_iops.c 2013-08-22 20:30:00.000000000 +0000
7293@@ -28,6 +28,7 @@ 7293@@ -28,6 +28,7 @@
7294 #include "xfs_bmap_btree.h" 7294 #include "xfs_bmap_btree.h"
7295 #include "xfs_dinode.h" 7295 #include "xfs_dinode.h"
@@ -7365,9 +7365,9 @@ diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_iops.c linux-3.10.19-vs2.3.6.8/fs
7365 7365
7366 switch (inode->i_mode & S_IFMT) { 7366 switch (inode->i_mode & S_IFMT) {
7367 case S_IFBLK: 7367 case S_IFBLK:
7368diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_itable.c linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_itable.c 7368diff -NurpP --minimal linux-3.10.21/fs/xfs/xfs_itable.c linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_itable.c
7369--- linux-3.10.19/fs/xfs/xfs_itable.c 2013-02-19 13:58:49.000000000 +0000 7369--- linux-3.10.21/fs/xfs/xfs_itable.c 2013-02-19 13:58:49.000000000 +0000
7370+++ linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_itable.c 2013-08-22 20:30:00.000000000 +0000 7370+++ linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_itable.c 2013-08-22 20:30:00.000000000 +0000
7371@@ -97,6 +97,7 @@ xfs_bulkstat_one_int( 7371@@ -97,6 +97,7 @@ xfs_bulkstat_one_int(
7372 buf->bs_mode = dic->di_mode; 7372 buf->bs_mode = dic->di_mode;
7373 buf->bs_uid = dic->di_uid; 7373 buf->bs_uid = dic->di_uid;
@@ -7376,9 +7376,9 @@ diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_itable.c linux-3.10.19-vs2.3.6.8/
7376 buf->bs_size = dic->di_size; 7376 buf->bs_size = dic->di_size;
7377 buf->bs_atime.tv_sec = dic->di_atime.t_sec; 7377 buf->bs_atime.tv_sec = dic->di_atime.t_sec;
7378 buf->bs_atime.tv_nsec = dic->di_atime.t_nsec; 7378 buf->bs_atime.tv_nsec = dic->di_atime.t_nsec;
7379diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_linux.h linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_linux.h 7379diff -NurpP --minimal linux-3.10.21/fs/xfs/xfs_linux.h linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_linux.h
7380--- linux-3.10.19/fs/xfs/xfs_linux.h 2013-07-14 17:01:30.000000000 +0000 7380--- linux-3.10.21/fs/xfs/xfs_linux.h 2013-07-14 17:01:30.000000000 +0000
7381+++ linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_linux.h 2013-08-22 20:30:00.000000000 +0000 7381+++ linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_linux.h 2013-08-22 20:30:00.000000000 +0000
7382@@ -124,6 +124,7 @@ 7382@@ -124,6 +124,7 @@
7383 7383
7384 #define current_cpu() (raw_smp_processor_id()) 7384 #define current_cpu() (raw_smp_processor_id())
@@ -7387,9 +7387,9 @@ diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_linux.h linux-3.10.19-vs2.3.6.8/f
7387 #define current_test_flags(f) (current->flags & (f)) 7387 #define current_test_flags(f) (current->flags & (f))
7388 #define current_set_flags_nested(sp, f) \ 7388 #define current_set_flags_nested(sp, f) \
7389 (*(sp) = current->flags, current->flags |= (f)) 7389 (*(sp) = current->flags, current->flags |= (f))
7390diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_log_recover.c linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_log_recover.c 7390diff -NurpP --minimal linux-3.10.21/fs/xfs/xfs_log_recover.c linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_log_recover.c
7391--- linux-3.10.19/fs/xfs/xfs_log_recover.c 2013-07-14 17:01:31.000000000 +0000 7391--- linux-3.10.21/fs/xfs/xfs_log_recover.c 2013-07-14 17:01:31.000000000 +0000
7392+++ linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_log_recover.c 2013-08-22 21:48:01.000000000 +0000 7392+++ linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_log_recover.c 2013-08-22 21:48:01.000000000 +0000
7393@@ -2662,7 +2662,7 @@ xlog_recover_inode_pass2( 7393@@ -2662,7 +2662,7 @@ xlog_recover_inode_pass2(
7394 } 7394 }
7395 7395
@@ -7399,9 +7399,9 @@ diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_log_recover.c linux-3.10.19-vs2.3
7399 7399
7400 /* the rest is in on-disk format */ 7400 /* the rest is in on-disk format */
7401 if (item->ri_buf[1].i_len > isize) { 7401 if (item->ri_buf[1].i_len > isize) {
7402diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_mount.h linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_mount.h 7402diff -NurpP --minimal linux-3.10.21/fs/xfs/xfs_mount.h linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_mount.h
7403--- linux-3.10.19/fs/xfs/xfs_mount.h 2013-07-14 17:01:31.000000000 +0000 7403--- linux-3.10.21/fs/xfs/xfs_mount.h 2013-07-14 17:01:31.000000000 +0000
7404+++ linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_mount.h 2013-08-22 20:30:00.000000000 +0000 7404+++ linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_mount.h 2013-08-22 20:30:00.000000000 +0000
7405@@ -253,6 +253,7 @@ typedef struct xfs_mount { 7405@@ -253,6 +253,7 @@ typedef struct xfs_mount {
7406 allocator */ 7406 allocator */
7407 #define XFS_MOUNT_NOATTR2 (1ULL << 25) /* disable use of attr2 format */ 7407 #define XFS_MOUNT_NOATTR2 (1ULL << 25) /* disable use of attr2 format */
@@ -7410,9 +7410,9 @@ diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_mount.h linux-3.10.19-vs2.3.6.8/f
7410 7410
7411 /* 7411 /*
7412 * Default minimum read and write sizes. 7412 * Default minimum read and write sizes.
7413diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_super.c linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_super.c 7413diff -NurpP --minimal linux-3.10.21/fs/xfs/xfs_super.c linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_super.c
7414--- linux-3.10.19/fs/xfs/xfs_super.c 2013-07-14 17:01:31.000000000 +0000 7414--- linux-3.10.21/fs/xfs/xfs_super.c 2013-07-14 17:01:31.000000000 +0000
7415+++ linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_super.c 2013-08-22 20:30:00.000000000 +0000 7415+++ linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_super.c 2013-08-22 20:30:00.000000000 +0000
7416@@ -114,6 +114,9 @@ mempool_t *xfs_ioend_pool; 7416@@ -114,6 +114,9 @@ mempool_t *xfs_ioend_pool;
7417 #define MNTOPT_NODELAYLOG "nodelaylog" /* Delayed logging disabled */ 7417 #define MNTOPT_NODELAYLOG "nodelaylog" /* Delayed logging disabled */
7418 #define MNTOPT_DISCARD "discard" /* Discard unused blocks */ 7418 #define MNTOPT_DISCARD "discard" /* Discard unused blocks */
@@ -7489,9 +7489,9 @@ diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_super.c linux-3.10.19-vs2.3.6.8/f
7489 /* 7489 /*
7490 * we must configure the block size in the superblock before we run the 7490 * we must configure the block size in the superblock before we run the
7491 * full mount process as the mount process can lookup and cache inodes. 7491 * full mount process as the mount process can lookup and cache inodes.
7492diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_vnodeops.c linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_vnodeops.c 7492diff -NurpP --minimal linux-3.10.21/fs/xfs/xfs_vnodeops.c linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_vnodeops.c
7493--- linux-3.10.19/fs/xfs/xfs_vnodeops.c 2013-07-14 17:01:31.000000000 +0000 7493--- linux-3.10.21/fs/xfs/xfs_vnodeops.c 2013-07-14 17:01:31.000000000 +0000
7494+++ linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_vnodeops.c 2013-08-22 20:30:00.000000000 +0000 7494+++ linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_vnodeops.c 2013-08-22 20:30:00.000000000 +0000
7495@@ -155,6 +155,77 @@ xfs_free_eofblocks( 7495@@ -155,6 +155,77 @@ xfs_free_eofblocks(
7496 return error; 7496 return error;
7497 } 7497 }
@@ -7570,9 +7570,9 @@ diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_vnodeops.c linux-3.10.19-vs2.3.6.
7570 int 7570 int
7571 xfs_release( 7571 xfs_release(
7572 xfs_inode_t *ip) 7572 xfs_inode_t *ip)
7573diff -NurpP --minimal linux-3.10.19/include/linux/cred.h linux-3.10.19-vs2.3.6.8/include/linux/cred.h 7573diff -NurpP --minimal linux-3.10.21/include/linux/cred.h linux-3.10.21-vs2.3.6.8/include/linux/cred.h
7574--- linux-3.10.19/include/linux/cred.h 2013-02-19 13:58:50.000000000 +0000 7574--- linux-3.10.21/include/linux/cred.h 2013-02-19 13:58:50.000000000 +0000
7575+++ linux-3.10.19-vs2.3.6.8/include/linux/cred.h 2013-08-22 20:30:00.000000000 +0000 7575+++ linux-3.10.21-vs2.3.6.8/include/linux/cred.h 2013-08-22 20:30:00.000000000 +0000
7576@@ -143,6 +143,7 @@ extern void exit_creds(struct task_struc 7576@@ -143,6 +143,7 @@ extern void exit_creds(struct task_struc
7577 extern int copy_creds(struct task_struct *, unsigned long); 7577 extern int copy_creds(struct task_struct *, unsigned long);
7578 extern const struct cred *get_task_cred(struct task_struct *); 7578 extern const struct cred *get_task_cred(struct task_struct *);
@@ -7613,18 +7613,18 @@ diff -NurpP --minimal linux-3.10.19/include/linux/cred.h linux-3.10.19-vs2.3.6.8
7613 /** 7613 /**
7614 * get_new_cred - Get a reference on a new set of credentials 7614 * get_new_cred - Get a reference on a new set of credentials
7615 * @cred: The new credentials to reference 7615 * @cred: The new credentials to reference
7616diff -NurpP --minimal linux-3.10.19/include/linux/devpts_fs.h linux-3.10.19-vs2.3.6.8/include/linux/devpts_fs.h 7616diff -NurpP --minimal linux-3.10.21/include/linux/devpts_fs.h linux-3.10.21-vs2.3.6.8/include/linux/devpts_fs.h
7617--- linux-3.10.19/include/linux/devpts_fs.h 2013-02-19 13:58:50.000000000 +0000 7617--- linux-3.10.21/include/linux/devpts_fs.h 2013-02-19 13:58:50.000000000 +0000
7618+++ linux-3.10.19-vs2.3.6.8/include/linux/devpts_fs.h 2013-08-22 20:30:00.000000000 +0000 7618+++ linux-3.10.21-vs2.3.6.8/include/linux/devpts_fs.h 2013-08-22 20:30:00.000000000 +0000
7619@@ -45,5 +45,4 @@ static inline void devpts_pty_kill(struc 7619@@ -45,5 +45,4 @@ static inline void devpts_pty_kill(struc
7620 7620
7621 #endif 7621 #endif
7622 7622
7623- 7623-
7624 #endif /* _LINUX_DEVPTS_FS_H */ 7624 #endif /* _LINUX_DEVPTS_FS_H */
7625diff -NurpP --minimal linux-3.10.19/include/linux/fs.h linux-3.10.19-vs2.3.6.8/include/linux/fs.h 7625diff -NurpP --minimal linux-3.10.21/include/linux/fs.h linux-3.10.21-vs2.3.6.8/include/linux/fs.h
7626--- linux-3.10.19/include/linux/fs.h 2013-07-14 17:01:32.000000000 +0000 7626--- linux-3.10.21/include/linux/fs.h 2013-07-14 17:01:32.000000000 +0000
7627+++ linux-3.10.19-vs2.3.6.8/include/linux/fs.h 2013-08-22 20:30:00.000000000 +0000 7627+++ linux-3.10.21-vs2.3.6.8/include/linux/fs.h 2013-08-22 20:30:00.000000000 +0000
7628@@ -211,6 +211,7 @@ typedef void (dio_iodone_t)(struct kiocb 7628@@ -211,6 +211,7 @@ typedef void (dio_iodone_t)(struct kiocb
7629 #define ATTR_KILL_PRIV (1 << 14) 7629 #define ATTR_KILL_PRIV (1 << 14)
7630 #define ATTR_OPEN (1 << 15) /* Truncating from open(O_TRUNC) */ 7630 #define ATTR_OPEN (1 << 15) /* Truncating from open(O_TRUNC) */
@@ -7790,9 +7790,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/fs.h linux-3.10.19-vs2.3.6.8/i
7790 extern int simple_setattr(struct dentry *, struct iattr *); 7790 extern int simple_setattr(struct dentry *, struct iattr *);
7791 extern int simple_getattr(struct vfsmount *, struct dentry *, struct kstat *); 7791 extern int simple_getattr(struct vfsmount *, struct dentry *, struct kstat *);
7792 extern int simple_statfs(struct dentry *, struct kstatfs *); 7792 extern int simple_statfs(struct dentry *, struct kstatfs *);
7793diff -NurpP --minimal linux-3.10.19/include/linux/init_task.h linux-3.10.19-vs2.3.6.8/include/linux/init_task.h 7793diff -NurpP --minimal linux-3.10.21/include/linux/init_task.h linux-3.10.21-vs2.3.6.8/include/linux/init_task.h
7794--- linux-3.10.19/include/linux/init_task.h 2013-05-31 13:45:27.000000000 +0000 7794--- linux-3.10.21/include/linux/init_task.h 2013-05-31 13:45:27.000000000 +0000
7795+++ linux-3.10.19-vs2.3.6.8/include/linux/init_task.h 2013-08-22 20:30:00.000000000 +0000 7795+++ linux-3.10.21-vs2.3.6.8/include/linux/init_task.h 2013-08-22 20:30:00.000000000 +0000
7796@@ -222,6 +222,10 @@ extern struct task_group root_task_group 7796@@ -222,6 +222,10 @@ extern struct task_group root_task_group
7797 INIT_TASK_RCU_PREEMPT(tsk) \ 7797 INIT_TASK_RCU_PREEMPT(tsk) \
7798 INIT_CPUSET_SEQ \ 7798 INIT_CPUSET_SEQ \
@@ -7804,9 +7804,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/init_task.h linux-3.10.19-vs2.
7804 } 7804 }
7805 7805
7806 7806
7807diff -NurpP --minimal linux-3.10.19/include/linux/ipc.h linux-3.10.19-vs2.3.6.8/include/linux/ipc.h 7807diff -NurpP --minimal linux-3.10.21/include/linux/ipc.h linux-3.10.21-vs2.3.6.8/include/linux/ipc.h
7808--- linux-3.10.19/include/linux/ipc.h 2012-12-11 03:30:57.000000000 +0000 7808--- linux-3.10.21/include/linux/ipc.h 2012-12-11 03:30:57.000000000 +0000
7809+++ linux-3.10.19-vs2.3.6.8/include/linux/ipc.h 2013-08-22 20:30:00.000000000 +0000 7809+++ linux-3.10.21-vs2.3.6.8/include/linux/ipc.h 2013-08-22 20:30:00.000000000 +0000
7810@@ -16,6 +16,7 @@ struct kern_ipc_perm 7810@@ -16,6 +16,7 @@ struct kern_ipc_perm
7811 key_t key; 7811 key_t key;
7812 kuid_t uid; 7812 kuid_t uid;
@@ -7815,9 +7815,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/ipc.h linux-3.10.19-vs2.3.6.8/
7815 kuid_t cuid; 7815 kuid_t cuid;
7816 kgid_t cgid; 7816 kgid_t cgid;
7817 umode_t mode; 7817 umode_t mode;
7818diff -NurpP --minimal linux-3.10.19/include/linux/loop.h linux-3.10.19-vs2.3.6.8/include/linux/loop.h 7818diff -NurpP --minimal linux-3.10.21/include/linux/loop.h linux-3.10.21-vs2.3.6.8/include/linux/loop.h
7819--- linux-3.10.19/include/linux/loop.h 2013-02-19 13:58:51.000000000 +0000 7819--- linux-3.10.21/include/linux/loop.h 2013-02-19 13:58:51.000000000 +0000
7820+++ linux-3.10.19-vs2.3.6.8/include/linux/loop.h 2013-08-22 20:30:00.000000000 +0000 7820+++ linux-3.10.21-vs2.3.6.8/include/linux/loop.h 2013-08-22 20:30:00.000000000 +0000
7821@@ -41,6 +41,7 @@ struct loop_device { 7821@@ -41,6 +41,7 @@ struct loop_device {
7822 struct loop_func_table *lo_encryption; 7822 struct loop_func_table *lo_encryption;
7823 __u32 lo_init[2]; 7823 __u32 lo_init[2];
@@ -7826,9 +7826,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/loop.h linux-3.10.19-vs2.3.6.8
7826 int (*ioctl)(struct loop_device *, int cmd, 7826 int (*ioctl)(struct loop_device *, int cmd,
7827 unsigned long arg); 7827 unsigned long arg);
7828 7828
7829diff -NurpP --minimal linux-3.10.19/include/linux/memcontrol.h linux-3.10.19-vs2.3.6.8/include/linux/memcontrol.h 7829diff -NurpP --minimal linux-3.10.21/include/linux/memcontrol.h linux-3.10.21-vs2.3.6.8/include/linux/memcontrol.h
7830--- linux-3.10.19/include/linux/memcontrol.h 2013-05-31 13:45:28.000000000 +0000 7830--- linux-3.10.21/include/linux/memcontrol.h 2013-05-31 13:45:28.000000000 +0000
7831+++ linux-3.10.19-vs2.3.6.8/include/linux/memcontrol.h 2013-08-22 20:30:00.000000000 +0000 7831+++ linux-3.10.21-vs2.3.6.8/include/linux/memcontrol.h 2013-08-22 20:30:00.000000000 +0000
7832@@ -86,6 +86,13 @@ extern struct mem_cgroup *try_get_mem_cg 7832@@ -86,6 +86,13 @@ extern struct mem_cgroup *try_get_mem_cg
7833 extern struct mem_cgroup *parent_mem_cgroup(struct mem_cgroup *memcg); 7833 extern struct mem_cgroup *parent_mem_cgroup(struct mem_cgroup *memcg);
7834 extern struct mem_cgroup *mem_cgroup_from_cont(struct cgroup *cont); 7834 extern struct mem_cgroup *mem_cgroup_from_cont(struct cgroup *cont);
@@ -7843,9 +7843,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/memcontrol.h linux-3.10.19-vs2
7843 static inline 7843 static inline
7844 bool mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *memcg) 7844 bool mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *memcg)
7845 { 7845 {
7846diff -NurpP --minimal linux-3.10.19/include/linux/mm_types.h linux-3.10.19-vs2.3.6.8/include/linux/mm_types.h 7846diff -NurpP --minimal linux-3.10.21/include/linux/mm_types.h linux-3.10.21-vs2.3.6.8/include/linux/mm_types.h
7847--- linux-3.10.19/include/linux/mm_types.h 2013-11-13 17:21:14.000000000 +0000 7847--- linux-3.10.21/include/linux/mm_types.h 2013-11-30 07:50:50.000000000 +0000
7848+++ linux-3.10.19-vs2.3.6.8/include/linux/mm_types.h 2013-11-13 17:17:16.000000000 +0000 7848+++ linux-3.10.21-vs2.3.6.8/include/linux/mm_types.h 2013-11-13 17:17:16.000000000 +0000
7849@@ -381,6 +381,7 @@ struct mm_struct { 7849@@ -381,6 +381,7 @@ struct mm_struct {
7850 7850
7851 /* Architecture-specific MM context */ 7851 /* Architecture-specific MM context */
@@ -7854,9 +7854,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/mm_types.h linux-3.10.19-vs2.3
7854 7854
7855 unsigned long flags; /* Must use atomic bitops to access the bits */ 7855 unsigned long flags; /* Must use atomic bitops to access the bits */
7856 7856
7857diff -NurpP --minimal linux-3.10.19/include/linux/mount.h linux-3.10.19-vs2.3.6.8/include/linux/mount.h 7857diff -NurpP --minimal linux-3.10.21/include/linux/mount.h linux-3.10.21-vs2.3.6.8/include/linux/mount.h
7858--- linux-3.10.19/include/linux/mount.h 2013-05-31 13:45:28.000000000 +0000 7858--- linux-3.10.21/include/linux/mount.h 2013-05-31 13:45:28.000000000 +0000
7859+++ linux-3.10.19-vs2.3.6.8/include/linux/mount.h 2013-08-22 20:30:00.000000000 +0000 7859+++ linux-3.10.21-vs2.3.6.8/include/linux/mount.h 2013-08-22 20:30:00.000000000 +0000
7860@@ -49,6 +49,9 @@ struct mnt_namespace; 7860@@ -49,6 +49,9 @@ struct mnt_namespace;
7861 7861
7862 #define MNT_LOCK_READONLY 0x400000 7862 #define MNT_LOCK_READONLY 0x400000
@@ -7867,9 +7867,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/mount.h linux-3.10.19-vs2.3.6.
7867 struct vfsmount { 7867 struct vfsmount {
7868 struct dentry *mnt_root; /* root of the mounted tree */ 7868 struct dentry *mnt_root; /* root of the mounted tree */
7869 struct super_block *mnt_sb; /* pointer to superblock */ 7869 struct super_block *mnt_sb; /* pointer to superblock */
7870diff -NurpP --minimal linux-3.10.19/include/linux/net.h linux-3.10.19-vs2.3.6.8/include/linux/net.h 7870diff -NurpP --minimal linux-3.10.21/include/linux/net.h linux-3.10.21-vs2.3.6.8/include/linux/net.h
7871--- linux-3.10.19/include/linux/net.h 2013-07-14 17:01:32.000000000 +0000 7871--- linux-3.10.21/include/linux/net.h 2013-07-14 17:01:32.000000000 +0000
7872+++ linux-3.10.19-vs2.3.6.8/include/linux/net.h 2013-08-22 20:30:00.000000000 +0000 7872+++ linux-3.10.21-vs2.3.6.8/include/linux/net.h 2013-08-22 20:30:00.000000000 +0000
7873@@ -38,6 +38,7 @@ struct net; 7873@@ -38,6 +38,7 @@ struct net;
7874 #define SOCK_PASSCRED 3 7874 #define SOCK_PASSCRED 3
7875 #define SOCK_PASSSEC 4 7875 #define SOCK_PASSSEC 4
@@ -7878,9 +7878,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/net.h linux-3.10.19-vs2.3.6.8/
7878 7878
7879 #ifndef ARCH_HAS_SOCKET_TYPES 7879 #ifndef ARCH_HAS_SOCKET_TYPES
7880 /** 7880 /**
7881diff -NurpP --minimal linux-3.10.19/include/linux/netdevice.h linux-3.10.19-vs2.3.6.8/include/linux/netdevice.h 7881diff -NurpP --minimal linux-3.10.21/include/linux/netdevice.h linux-3.10.21-vs2.3.6.8/include/linux/netdevice.h
7882--- linux-3.10.19/include/linux/netdevice.h 2013-07-14 17:01:32.000000000 +0000 7882--- linux-3.10.21/include/linux/netdevice.h 2013-07-14 17:01:32.000000000 +0000
7883+++ linux-3.10.19-vs2.3.6.8/include/linux/netdevice.h 2013-08-22 20:30:00.000000000 +0000 7883+++ linux-3.10.21-vs2.3.6.8/include/linux/netdevice.h 2013-08-22 20:30:00.000000000 +0000
7884@@ -1694,6 +1694,7 @@ extern int init_dummy_netdev(struct net 7884@@ -1694,6 +1694,7 @@ extern int init_dummy_netdev(struct net
7885 7885
7886 extern struct net_device *dev_get_by_index(struct net *net, int ifindex); 7886 extern struct net_device *dev_get_by_index(struct net *net, int ifindex);
@@ -7889,9 +7889,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/netdevice.h linux-3.10.19-vs2.
7889 extern struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex); 7889 extern struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex);
7890 extern int netdev_get_name(struct net *net, char *name, int ifindex); 7890 extern int netdev_get_name(struct net *net, char *name, int ifindex);
7891 extern int dev_restart(struct net_device *dev); 7891 extern int dev_restart(struct net_device *dev);
7892diff -NurpP --minimal linux-3.10.19/include/linux/nsproxy.h linux-3.10.19-vs2.3.6.8/include/linux/nsproxy.h 7892diff -NurpP --minimal linux-3.10.21/include/linux/nsproxy.h linux-3.10.21-vs2.3.6.8/include/linux/nsproxy.h
7893--- linux-3.10.19/include/linux/nsproxy.h 2013-02-19 13:58:51.000000000 +0000 7893--- linux-3.10.21/include/linux/nsproxy.h 2013-02-19 13:58:51.000000000 +0000
7894+++ linux-3.10.19-vs2.3.6.8/include/linux/nsproxy.h 2013-08-22 20:30:00.000000000 +0000 7894+++ linux-3.10.21-vs2.3.6.8/include/linux/nsproxy.h 2013-08-22 20:30:00.000000000 +0000
7895@@ -3,6 +3,7 @@ 7895@@ -3,6 +3,7 @@
7896 7896
7897 #include <linux/spinlock.h> 7897 #include <linux/spinlock.h>
@@ -7941,9 +7941,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/nsproxy.h linux-3.10.19-vs2.3.
7941 } 7941 }
7942 7942
7943 #endif 7943 #endif
7944diff -NurpP --minimal linux-3.10.19/include/linux/pid.h linux-3.10.19-vs2.3.6.8/include/linux/pid.h 7944diff -NurpP --minimal linux-3.10.21/include/linux/pid.h linux-3.10.21-vs2.3.6.8/include/linux/pid.h
7945--- linux-3.10.19/include/linux/pid.h 2013-05-31 13:45:28.000000000 +0000 7945--- linux-3.10.21/include/linux/pid.h 2013-05-31 13:45:28.000000000 +0000
7946+++ linux-3.10.19-vs2.3.6.8/include/linux/pid.h 2013-08-22 20:30:00.000000000 +0000 7946+++ linux-3.10.21-vs2.3.6.8/include/linux/pid.h 2013-08-22 20:30:00.000000000 +0000
7947@@ -8,7 +8,8 @@ enum pid_type 7947@@ -8,7 +8,8 @@ enum pid_type
7948 PIDTYPE_PID, 7948 PIDTYPE_PID,
7949 PIDTYPE_PGID, 7949 PIDTYPE_PGID,
@@ -7962,9 +7962,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/pid.h linux-3.10.19-vs2.3.6.8/
7962 pid_t pid_vnr(struct pid *pid); 7962 pid_t pid_vnr(struct pid *pid);
7963 7963
7964 #define do_each_pid_task(pid, type, task) \ 7964 #define do_each_pid_task(pid, type, task) \
7965diff -NurpP --minimal linux-3.10.19/include/linux/quotaops.h linux-3.10.19-vs2.3.6.8/include/linux/quotaops.h 7965diff -NurpP --minimal linux-3.10.21/include/linux/quotaops.h linux-3.10.21-vs2.3.6.8/include/linux/quotaops.h
7966--- linux-3.10.19/include/linux/quotaops.h 2012-12-11 03:30:57.000000000 +0000 7966--- linux-3.10.21/include/linux/quotaops.h 2012-12-11 03:30:57.000000000 +0000
7967+++ linux-3.10.19-vs2.3.6.8/include/linux/quotaops.h 2013-08-22 20:30:00.000000000 +0000 7967+++ linux-3.10.21-vs2.3.6.8/include/linux/quotaops.h 2013-08-22 20:30:00.000000000 +0000
7968@@ -8,6 +8,7 @@ 7968@@ -8,6 +8,7 @@
7969 #define _LINUX_QUOTAOPS_ 7969 #define _LINUX_QUOTAOPS_
7970 7970
@@ -8006,10 +8006,10 @@ diff -NurpP --minimal linux-3.10.19/include/linux/quotaops.h linux-3.10.19-vs2.3
8006 } 8006 }
8007 8007
8008 static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number) 8008 static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
8009diff -NurpP --minimal linux-3.10.19/include/linux/sched.h linux-3.10.19-vs2.3.6.8/include/linux/sched.h 8009diff -NurpP --minimal linux-3.10.21/include/linux/sched.h linux-3.10.21-vs2.3.6.8/include/linux/sched.h
8010--- linux-3.10.19/include/linux/sched.h 2013-07-14 17:01:33.000000000 +0000 8010--- linux-3.10.21/include/linux/sched.h 2013-11-30 07:50:50.000000000 +0000
8011+++ linux-3.10.19-vs2.3.6.8/include/linux/sched.h 2013-10-09 17:37:22.000000000 +0000 8011+++ linux-3.10.21-vs2.3.6.8/include/linux/sched.h 2013-11-30 07:53:00.000000000 +0000
8012@@ -1233,6 +1233,14 @@ struct task_struct { 8012@@ -1237,6 +1237,14 @@ struct task_struct {
8013 #endif 8013 #endif
8014 struct seccomp seccomp; 8014 struct seccomp seccomp;
8015 8015
@@ -8024,7 +8024,7 @@ diff -NurpP --minimal linux-3.10.19/include/linux/sched.h linux-3.10.19-vs2.3.6.
8024 /* Thread group tracking */ 8024 /* Thread group tracking */
8025 u32 parent_exec_id; 8025 u32 parent_exec_id;
8026 u32 self_exec_id; 8026 u32 self_exec_id;
8027@@ -1476,6 +1484,11 @@ struct pid_namespace; 8027@@ -1480,6 +1488,11 @@ struct pid_namespace;
8028 pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type, 8028 pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
8029 struct pid_namespace *ns); 8029 struct pid_namespace *ns);
8030 8030
@@ -8036,7 +8036,7 @@ diff -NurpP --minimal linux-3.10.19/include/linux/sched.h linux-3.10.19-vs2.3.6.
8036 static inline pid_t task_pid_nr(struct task_struct *tsk) 8036 static inline pid_t task_pid_nr(struct task_struct *tsk)
8037 { 8037 {
8038 return tsk->pid; 8038 return tsk->pid;
8039@@ -1489,7 +1502,8 @@ static inline pid_t task_pid_nr_ns(struc 8039@@ -1493,7 +1506,8 @@ static inline pid_t task_pid_nr_ns(struc
8040 8040
8041 static inline pid_t task_pid_vnr(struct task_struct *tsk) 8041 static inline pid_t task_pid_vnr(struct task_struct *tsk)
8042 { 8042 {
@@ -8046,7 +8046,7 @@ diff -NurpP --minimal linux-3.10.19/include/linux/sched.h linux-3.10.19-vs2.3.6.
8046 } 8046 }
8047 8047
8048 8048
8049@@ -1502,7 +1516,7 @@ pid_t task_tgid_nr_ns(struct task_struct 8049@@ -1506,7 +1520,7 @@ pid_t task_tgid_nr_ns(struct task_struct
8050 8050
8051 static inline pid_t task_tgid_vnr(struct task_struct *tsk) 8051 static inline pid_t task_tgid_vnr(struct task_struct *tsk)
8052 { 8052 {
@@ -8055,9 +8055,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/sched.h linux-3.10.19-vs2.3.6.
8055 } 8055 }
8056 8056
8057 8057
8058diff -NurpP --minimal linux-3.10.19/include/linux/shmem_fs.h linux-3.10.19-vs2.3.6.8/include/linux/shmem_fs.h 8058diff -NurpP --minimal linux-3.10.21/include/linux/shmem_fs.h linux-3.10.21-vs2.3.6.8/include/linux/shmem_fs.h
8059--- linux-3.10.19/include/linux/shmem_fs.h 2012-12-11 03:30:57.000000000 +0000 8059--- linux-3.10.21/include/linux/shmem_fs.h 2012-12-11 03:30:57.000000000 +0000
8060+++ linux-3.10.19-vs2.3.6.8/include/linux/shmem_fs.h 2013-08-22 20:30:00.000000000 +0000 8060+++ linux-3.10.21-vs2.3.6.8/include/linux/shmem_fs.h 2013-08-22 20:30:00.000000000 +0000
8061@@ -9,6 +9,9 @@ 8061@@ -9,6 +9,9 @@
8062 8062
8063 /* inode in-kernel data */ 8063 /* inode in-kernel data */
@@ -8068,9 +8068,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/shmem_fs.h linux-3.10.19-vs2.3
8068 struct shmem_inode_info { 8068 struct shmem_inode_info {
8069 spinlock_t lock; 8069 spinlock_t lock;
8070 unsigned long flags; 8070 unsigned long flags;
8071diff -NurpP --minimal linux-3.10.19/include/linux/stat.h linux-3.10.19-vs2.3.6.8/include/linux/stat.h 8071diff -NurpP --minimal linux-3.10.21/include/linux/stat.h linux-3.10.21-vs2.3.6.8/include/linux/stat.h
8072--- linux-3.10.19/include/linux/stat.h 2012-12-11 03:30:57.000000000 +0000 8072--- linux-3.10.21/include/linux/stat.h 2012-12-11 03:30:57.000000000 +0000
8073+++ linux-3.10.19-vs2.3.6.8/include/linux/stat.h 2013-08-22 20:30:00.000000000 +0000 8073+++ linux-3.10.21-vs2.3.6.8/include/linux/stat.h 2013-08-22 20:30:00.000000000 +0000
8074@@ -25,6 +25,7 @@ struct kstat { 8074@@ -25,6 +25,7 @@ struct kstat {
8075 unsigned int nlink; 8075 unsigned int nlink;
8076 kuid_t uid; 8076 kuid_t uid;
@@ -8079,9 +8079,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/stat.h linux-3.10.19-vs2.3.6.8
8079 dev_t rdev; 8079 dev_t rdev;
8080 loff_t size; 8080 loff_t size;
8081 struct timespec atime; 8081 struct timespec atime;
8082diff -NurpP --minimal linux-3.10.19/include/linux/sunrpc/auth.h linux-3.10.19-vs2.3.6.8/include/linux/sunrpc/auth.h 8082diff -NurpP --minimal linux-3.10.21/include/linux/sunrpc/auth.h linux-3.10.21-vs2.3.6.8/include/linux/sunrpc/auth.h
8083--- linux-3.10.19/include/linux/sunrpc/auth.h 2013-07-14 17:01:33.000000000 +0000 8083--- linux-3.10.21/include/linux/sunrpc/auth.h 2013-07-14 17:01:33.000000000 +0000
8084+++ linux-3.10.19-vs2.3.6.8/include/linux/sunrpc/auth.h 2013-08-22 20:30:00.000000000 +0000 8084+++ linux-3.10.21-vs2.3.6.8/include/linux/sunrpc/auth.h 2013-08-22 20:30:00.000000000 +0000
8085@@ -28,6 +28,7 @@ struct rpcsec_gss_info; 8085@@ -28,6 +28,7 @@ struct rpcsec_gss_info;
8086 struct auth_cred { 8086 struct auth_cred {
8087 kuid_t uid; 8087 kuid_t uid;
@@ -8090,9 +8090,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/sunrpc/auth.h linux-3.10.19-vs
8090 struct group_info *group_info; 8090 struct group_info *group_info;
8091 const char *principal; 8091 const char *principal;
8092 unsigned char machine_cred : 1; 8092 unsigned char machine_cred : 1;
8093diff -NurpP --minimal linux-3.10.19/include/linux/sunrpc/clnt.h linux-3.10.19-vs2.3.6.8/include/linux/sunrpc/clnt.h 8093diff -NurpP --minimal linux-3.10.21/include/linux/sunrpc/clnt.h linux-3.10.21-vs2.3.6.8/include/linux/sunrpc/clnt.h
8094--- linux-3.10.19/include/linux/sunrpc/clnt.h 2013-07-14 17:01:33.000000000 +0000 8094--- linux-3.10.21/include/linux/sunrpc/clnt.h 2013-07-14 17:01:33.000000000 +0000
8095+++ linux-3.10.19-vs2.3.6.8/include/linux/sunrpc/clnt.h 2013-08-22 20:30:00.000000000 +0000 8095+++ linux-3.10.21-vs2.3.6.8/include/linux/sunrpc/clnt.h 2013-08-22 20:30:00.000000000 +0000
8096@@ -49,7 +49,8 @@ struct rpc_clnt { 8096@@ -49,7 +49,8 @@ struct rpc_clnt {
8097 unsigned int cl_softrtry : 1,/* soft timeouts */ 8097 unsigned int cl_softrtry : 1,/* soft timeouts */
8098 cl_discrtry : 1,/* disconnect before retry */ 8098 cl_discrtry : 1,/* disconnect before retry */
@@ -8103,9 +8103,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/sunrpc/clnt.h linux-3.10.19-vs
8103 8103
8104 struct rpc_rtt * cl_rtt; /* RTO estimator data */ 8104 struct rpc_rtt * cl_rtt; /* RTO estimator data */
8105 const struct rpc_timeout *cl_timeout; /* Timeout strategy */ 8105 const struct rpc_timeout *cl_timeout; /* Timeout strategy */
8106diff -NurpP --minimal linux-3.10.19/include/linux/sysfs.h linux-3.10.19-vs2.3.6.8/include/linux/sysfs.h 8106diff -NurpP --minimal linux-3.10.21/include/linux/sysfs.h linux-3.10.21-vs2.3.6.8/include/linux/sysfs.h
8107--- linux-3.10.19/include/linux/sysfs.h 2013-05-31 13:45:28.000000000 +0000 8107--- linux-3.10.21/include/linux/sysfs.h 2013-05-31 13:45:28.000000000 +0000
8108+++ linux-3.10.19-vs2.3.6.8/include/linux/sysfs.h 2013-08-22 20:30:00.000000000 +0000 8108+++ linux-3.10.21-vs2.3.6.8/include/linux/sysfs.h 2013-08-22 20:30:00.000000000 +0000
8109@@ -19,6 +19,8 @@ 8109@@ -19,6 +19,8 @@
8110 #include <linux/kobject_ns.h> 8110 #include <linux/kobject_ns.h>
8111 #include <linux/atomic.h> 8111 #include <linux/atomic.h>
@@ -8115,9 +8115,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/sysfs.h linux-3.10.19-vs2.3.6.
8115 struct kobject; 8115 struct kobject;
8116 struct module; 8116 struct module;
8117 enum kobj_ns_type; 8117 enum kobj_ns_type;
8118diff -NurpP --minimal linux-3.10.19/include/linux/types.h linux-3.10.19-vs2.3.6.8/include/linux/types.h 8118diff -NurpP --minimal linux-3.10.21/include/linux/types.h linux-3.10.21-vs2.3.6.8/include/linux/types.h
8119--- linux-3.10.19/include/linux/types.h 2013-02-19 13:58:52.000000000 +0000 8119--- linux-3.10.21/include/linux/types.h 2013-02-19 13:58:52.000000000 +0000
8120+++ linux-3.10.19-vs2.3.6.8/include/linux/types.h 2013-08-22 20:30:00.000000000 +0000 8120+++ linux-3.10.21-vs2.3.6.8/include/linux/types.h 2013-08-22 20:30:00.000000000 +0000
8121@@ -32,6 +32,9 @@ typedef __kernel_uid32_t uid_t; 8121@@ -32,6 +32,9 @@ typedef __kernel_uid32_t uid_t;
8122 typedef __kernel_gid32_t gid_t; 8122 typedef __kernel_gid32_t gid_t;
8123 typedef __kernel_uid16_t uid16_t; 8123 typedef __kernel_uid16_t uid16_t;
@@ -8128,9 +8128,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/types.h linux-3.10.19-vs2.3.6.
8128 8128
8129 typedef unsigned long uintptr_t; 8129 typedef unsigned long uintptr_t;
8130 8130
8131diff -NurpP --minimal linux-3.10.19/include/linux/uidgid.h linux-3.10.19-vs2.3.6.8/include/linux/uidgid.h 8131diff -NurpP --minimal linux-3.10.21/include/linux/uidgid.h linux-3.10.21-vs2.3.6.8/include/linux/uidgid.h
8132--- linux-3.10.19/include/linux/uidgid.h 2012-12-11 03:30:57.000000000 +0000 8132--- linux-3.10.21/include/linux/uidgid.h 2012-12-11 03:30:57.000000000 +0000
8133+++ linux-3.10.19-vs2.3.6.8/include/linux/uidgid.h 2013-08-22 20:30:00.000000000 +0000 8133+++ linux-3.10.21-vs2.3.6.8/include/linux/uidgid.h 2013-08-22 20:30:00.000000000 +0000
8134@@ -23,13 +23,17 @@ typedef struct { 8134@@ -23,13 +23,17 @@ typedef struct {
8135 uid_t val; 8135 uid_t val;
8136 } kuid_t; 8136 } kuid_t;
@@ -8250,9 +8250,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/uidgid.h linux-3.10.19-vs2.3.6
8250 static inline uid_t from_kuid_munged(struct user_namespace *to, kuid_t kuid) 8250 static inline uid_t from_kuid_munged(struct user_namespace *to, kuid_t kuid)
8251 { 8251 {
8252 uid_t uid = from_kuid(to, kuid); 8252 uid_t uid = from_kuid(to, kuid);
8253diff -NurpP --minimal linux-3.10.19/include/linux/vroot.h linux-3.10.19-vs2.3.6.8/include/linux/vroot.h 8253diff -NurpP --minimal linux-3.10.21/include/linux/vroot.h linux-3.10.21-vs2.3.6.8/include/linux/vroot.h
8254--- linux-3.10.19/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000 8254--- linux-3.10.21/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000
8255+++ linux-3.10.19-vs2.3.6.8/include/linux/vroot.h 2013-08-22 20:30:00.000000000 +0000 8255+++ linux-3.10.21-vs2.3.6.8/include/linux/vroot.h 2013-08-22 20:30:00.000000000 +0000
8256@@ -0,0 +1,51 @@ 8256@@ -0,0 +1,51 @@
8257+ 8257+
8258+/* 8258+/*
@@ -8305,9 +8305,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vroot.h linux-3.10.19-vs2.3.6.
8305+#define VROOT_CLR_DEV 0x5601 8305+#define VROOT_CLR_DEV 0x5601
8306+ 8306+
8307+#endif /* _LINUX_VROOT_H */ 8307+#endif /* _LINUX_VROOT_H */
8308diff -NurpP --minimal linux-3.10.19/include/linux/vs_base.h linux-3.10.19-vs2.3.6.8/include/linux/vs_base.h 8308diff -NurpP --minimal linux-3.10.21/include/linux/vs_base.h linux-3.10.21-vs2.3.6.8/include/linux/vs_base.h
8309--- linux-3.10.19/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000 8309--- linux-3.10.21/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000
8310+++ linux-3.10.19-vs2.3.6.8/include/linux/vs_base.h 2013-08-22 20:30:00.000000000 +0000 8310+++ linux-3.10.21-vs2.3.6.8/include/linux/vs_base.h 2013-08-22 20:30:00.000000000 +0000
8311@@ -0,0 +1,10 @@ 8311@@ -0,0 +1,10 @@
8312+#ifndef _VS_BASE_H 8312+#ifndef _VS_BASE_H
8313+#define _VS_BASE_H 8313+#define _VS_BASE_H
@@ -8319,9 +8319,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vs_base.h linux-3.10.19-vs2.3.
8319+#else 8319+#else
8320+#warning duplicate inclusion 8320+#warning duplicate inclusion
8321+#endif 8321+#endif
8322diff -NurpP --minimal linux-3.10.19/include/linux/vs_context.h linux-3.10.19-vs2.3.6.8/include/linux/vs_context.h 8322diff -NurpP --minimal linux-3.10.21/include/linux/vs_context.h linux-3.10.21-vs2.3.6.8/include/linux/vs_context.h
8323--- linux-3.10.19/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000 8323--- linux-3.10.21/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000
8324+++ linux-3.10.19-vs2.3.6.8/include/linux/vs_context.h 2013-08-22 20:30:00.000000000 +0000 8324+++ linux-3.10.21-vs2.3.6.8/include/linux/vs_context.h 2013-08-22 20:30:00.000000000 +0000
8325@@ -0,0 +1,242 @@ 8325@@ -0,0 +1,242 @@
8326+#ifndef _VS_CONTEXT_H 8326+#ifndef _VS_CONTEXT_H
8327+#define _VS_CONTEXT_H 8327+#define _VS_CONTEXT_H
@@ -8565,9 +8565,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vs_context.h linux-3.10.19-vs2
8565+#else 8565+#else
8566+#warning duplicate inclusion 8566+#warning duplicate inclusion
8567+#endif 8567+#endif
8568diff -NurpP --minimal linux-3.10.19/include/linux/vs_cowbl.h linux-3.10.19-vs2.3.6.8/include/linux/vs_cowbl.h 8568diff -NurpP --minimal linux-3.10.21/include/linux/vs_cowbl.h linux-3.10.21-vs2.3.6.8/include/linux/vs_cowbl.h
8569--- linux-3.10.19/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000 8569--- linux-3.10.21/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000
8570+++ linux-3.10.19-vs2.3.6.8/include/linux/vs_cowbl.h 2013-08-22 20:30:00.000000000 +0000 8570+++ linux-3.10.21-vs2.3.6.8/include/linux/vs_cowbl.h 2013-08-22 20:30:00.000000000 +0000
8571@@ -0,0 +1,48 @@ 8571@@ -0,0 +1,48 @@
8572+#ifndef _VS_COWBL_H 8572+#ifndef _VS_COWBL_H
8573+#define _VS_COWBL_H 8573+#define _VS_COWBL_H
@@ -8617,9 +8617,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vs_cowbl.h linux-3.10.19-vs2.3
8617+#else 8617+#else
8618+#warning duplicate inclusion 8618+#warning duplicate inclusion
8619+#endif 8619+#endif
8620diff -NurpP --minimal linux-3.10.19/include/linux/vs_cvirt.h linux-3.10.19-vs2.3.6.8/include/linux/vs_cvirt.h 8620diff -NurpP --minimal linux-3.10.21/include/linux/vs_cvirt.h linux-3.10.21-vs2.3.6.8/include/linux/vs_cvirt.h
8621--- linux-3.10.19/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000 8621--- linux-3.10.21/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000
8622+++ linux-3.10.19-vs2.3.6.8/include/linux/vs_cvirt.h 2013-08-22 20:30:00.000000000 +0000 8622+++ linux-3.10.21-vs2.3.6.8/include/linux/vs_cvirt.h 2013-08-22 20:30:00.000000000 +0000
8623@@ -0,0 +1,50 @@ 8623@@ -0,0 +1,50 @@
8624+#ifndef _VS_CVIRT_H 8624+#ifndef _VS_CVIRT_H
8625+#define _VS_CVIRT_H 8625+#define _VS_CVIRT_H
@@ -8671,9 +8671,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vs_cvirt.h linux-3.10.19-vs2.3
8671+#else 8671+#else
8672+#warning duplicate inclusion 8672+#warning duplicate inclusion
8673+#endif 8673+#endif
8674diff -NurpP --minimal linux-3.10.19/include/linux/vs_device.h linux-3.10.19-vs2.3.6.8/include/linux/vs_device.h 8674diff -NurpP --minimal linux-3.10.21/include/linux/vs_device.h linux-3.10.21-vs2.3.6.8/include/linux/vs_device.h
8675--- linux-3.10.19/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000 8675--- linux-3.10.21/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000
8676+++ linux-3.10.19-vs2.3.6.8/include/linux/vs_device.h 2013-08-22 20:30:00.000000000 +0000 8676+++ linux-3.10.21-vs2.3.6.8/include/linux/vs_device.h 2013-08-22 20:30:00.000000000 +0000
8677@@ -0,0 +1,45 @@ 8677@@ -0,0 +1,45 @@
8678+#ifndef _VS_DEVICE_H 8678+#ifndef _VS_DEVICE_H
8679+#define _VS_DEVICE_H 8679+#define _VS_DEVICE_H
@@ -8720,9 +8720,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vs_device.h linux-3.10.19-vs2.
8720+#else 8720+#else
8721+#warning duplicate inclusion 8721+#warning duplicate inclusion
8722+#endif 8722+#endif
8723diff -NurpP --minimal linux-3.10.19/include/linux/vs_dlimit.h linux-3.10.19-vs2.3.6.8/include/linux/vs_dlimit.h 8723diff -NurpP --minimal linux-3.10.21/include/linux/vs_dlimit.h linux-3.10.21-vs2.3.6.8/include/linux/vs_dlimit.h
8724--- linux-3.10.19/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000 8724--- linux-3.10.21/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000
8725+++ linux-3.10.19-vs2.3.6.8/include/linux/vs_dlimit.h 2013-08-22 20:30:00.000000000 +0000 8725+++ linux-3.10.21-vs2.3.6.8/include/linux/vs_dlimit.h 2013-08-22 20:30:00.000000000 +0000
8726@@ -0,0 +1,215 @@ 8726@@ -0,0 +1,215 @@
8727+#ifndef _VS_DLIMIT_H 8727+#ifndef _VS_DLIMIT_H
8728+#define _VS_DLIMIT_H 8728+#define _VS_DLIMIT_H
@@ -8939,9 +8939,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vs_dlimit.h linux-3.10.19-vs2.
8939+#else 8939+#else
8940+#warning duplicate inclusion 8940+#warning duplicate inclusion
8941+#endif 8941+#endif
8942diff -NurpP --minimal linux-3.10.19/include/linux/vs_inet.h linux-3.10.19-vs2.3.6.8/include/linux/vs_inet.h 8942diff -NurpP --minimal linux-3.10.21/include/linux/vs_inet.h linux-3.10.21-vs2.3.6.8/include/linux/vs_inet.h
8943--- linux-3.10.19/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000 8943--- linux-3.10.21/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000
8944+++ linux-3.10.19-vs2.3.6.8/include/linux/vs_inet.h 2013-08-22 20:30:00.000000000 +0000 8944+++ linux-3.10.21-vs2.3.6.8/include/linux/vs_inet.h 2013-08-22 20:30:00.000000000 +0000
8945@@ -0,0 +1,364 @@ 8945@@ -0,0 +1,364 @@
8946+#ifndef _VS_INET_H 8946+#ifndef _VS_INET_H
8947+#define _VS_INET_H 8947+#define _VS_INET_H
@@ -9307,9 +9307,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vs_inet.h linux-3.10.19-vs2.3.
9307+#else 9307+#else
9308+// #warning duplicate inclusion 9308+// #warning duplicate inclusion
9309+#endif 9309+#endif
9310diff -NurpP --minimal linux-3.10.19/include/linux/vs_inet6.h linux-3.10.19-vs2.3.6.8/include/linux/vs_inet6.h 9310diff -NurpP --minimal linux-3.10.21/include/linux/vs_inet6.h linux-3.10.21-vs2.3.6.8/include/linux/vs_inet6.h
9311--- linux-3.10.19/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000 9311--- linux-3.10.21/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000
9312+++ linux-3.10.19-vs2.3.6.8/include/linux/vs_inet6.h 2013-08-22 20:30:00.000000000 +0000 9312+++ linux-3.10.21-vs2.3.6.8/include/linux/vs_inet6.h 2013-08-22 20:30:00.000000000 +0000
9313@@ -0,0 +1,257 @@ 9313@@ -0,0 +1,257 @@
9314+#ifndef _VS_INET6_H 9314+#ifndef _VS_INET6_H
9315+#define _VS_INET6_H 9315+#define _VS_INET6_H
@@ -9568,9 +9568,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vs_inet6.h linux-3.10.19-vs2.3
9568+#else 9568+#else
9569+#warning duplicate inclusion 9569+#warning duplicate inclusion
9570+#endif 9570+#endif
9571diff -NurpP --minimal linux-3.10.19/include/linux/vs_limit.h linux-3.10.19-vs2.3.6.8/include/linux/vs_limit.h 9571diff -NurpP --minimal linux-3.10.21/include/linux/vs_limit.h linux-3.10.21-vs2.3.6.8/include/linux/vs_limit.h
9572--- linux-3.10.19/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000 9572--- linux-3.10.21/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000
9573+++ linux-3.10.19-vs2.3.6.8/include/linux/vs_limit.h 2013-08-22 20:30:00.000000000 +0000 9573+++ linux-3.10.21-vs2.3.6.8/include/linux/vs_limit.h 2013-08-22 20:30:00.000000000 +0000
9574@@ -0,0 +1,140 @@ 9574@@ -0,0 +1,140 @@
9575+#ifndef _VS_LIMIT_H 9575+#ifndef _VS_LIMIT_H
9576+#define _VS_LIMIT_H 9576+#define _VS_LIMIT_H
@@ -9712,9 +9712,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vs_limit.h linux-3.10.19-vs2.3
9712+#else 9712+#else
9713+#warning duplicate inclusion 9713+#warning duplicate inclusion
9714+#endif 9714+#endif
9715diff -NurpP --minimal linux-3.10.19/include/linux/vs_network.h linux-3.10.19-vs2.3.6.8/include/linux/vs_network.h 9715diff -NurpP --minimal linux-3.10.21/include/linux/vs_network.h linux-3.10.21-vs2.3.6.8/include/linux/vs_network.h
9716--- linux-3.10.19/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000 9716--- linux-3.10.21/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000
9717+++ linux-3.10.19-vs2.3.6.8/include/linux/vs_network.h 2013-08-22 20:30:00.000000000 +0000 9717+++ linux-3.10.21-vs2.3.6.8/include/linux/vs_network.h 2013-08-22 20:30:00.000000000 +0000
9718@@ -0,0 +1,169 @@ 9718@@ -0,0 +1,169 @@
9719+#ifndef _NX_VS_NETWORK_H 9719+#ifndef _NX_VS_NETWORK_H
9720+#define _NX_VS_NETWORK_H 9720+#define _NX_VS_NETWORK_H
@@ -9885,9 +9885,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vs_network.h linux-3.10.19-vs2
9885+#else 9885+#else
9886+#warning duplicate inclusion 9886+#warning duplicate inclusion
9887+#endif 9887+#endif
9888diff -NurpP --minimal linux-3.10.19/include/linux/vs_pid.h linux-3.10.19-vs2.3.6.8/include/linux/vs_pid.h 9888diff -NurpP --minimal linux-3.10.21/include/linux/vs_pid.h linux-3.10.21-vs2.3.6.8/include/linux/vs_pid.h
9889--- linux-3.10.19/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000 9889--- linux-3.10.21/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000
9890+++ linux-3.10.19-vs2.3.6.8/include/linux/vs_pid.h 2013-08-22 20:30:00.000000000 +0000 9890+++ linux-3.10.21-vs2.3.6.8/include/linux/vs_pid.h 2013-08-22 20:30:00.000000000 +0000
9891@@ -0,0 +1,50 @@ 9891@@ -0,0 +1,50 @@
9892+#ifndef _VS_PID_H 9892+#ifndef _VS_PID_H
9893+#define _VS_PID_H 9893+#define _VS_PID_H
@@ -9939,9 +9939,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vs_pid.h linux-3.10.19-vs2.3.6
9939+#else 9939+#else
9940+#warning duplicate inclusion 9940+#warning duplicate inclusion
9941+#endif 9941+#endif
9942diff -NurpP --minimal linux-3.10.19/include/linux/vs_sched.h linux-3.10.19-vs2.3.6.8/include/linux/vs_sched.h 9942diff -NurpP --minimal linux-3.10.21/include/linux/vs_sched.h linux-3.10.21-vs2.3.6.8/include/linux/vs_sched.h
9943--- linux-3.10.19/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000 9943--- linux-3.10.21/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000
9944+++ linux-3.10.19-vs2.3.6.8/include/linux/vs_sched.h 2013-08-22 20:30:00.000000000 +0000 9944+++ linux-3.10.21-vs2.3.6.8/include/linux/vs_sched.h 2013-08-22 20:30:00.000000000 +0000
9945@@ -0,0 +1,40 @@ 9945@@ -0,0 +1,40 @@
9946+#ifndef _VS_SCHED_H 9946+#ifndef _VS_SCHED_H
9947+#define _VS_SCHED_H 9947+#define _VS_SCHED_H
@@ -9983,9 +9983,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vs_sched.h linux-3.10.19-vs2.3
9983+#else 9983+#else
9984+#warning duplicate inclusion 9984+#warning duplicate inclusion
9985+#endif 9985+#endif
9986diff -NurpP --minimal linux-3.10.19/include/linux/vs_socket.h linux-3.10.19-vs2.3.6.8/include/linux/vs_socket.h 9986diff -NurpP --minimal linux-3.10.21/include/linux/vs_socket.h linux-3.10.21-vs2.3.6.8/include/linux/vs_socket.h
9987--- linux-3.10.19/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000 9987--- linux-3.10.21/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000
9988+++ linux-3.10.19-vs2.3.6.8/include/linux/vs_socket.h 2013-08-22 20:30:00.000000000 +0000 9988+++ linux-3.10.21-vs2.3.6.8/include/linux/vs_socket.h 2013-08-22 20:30:00.000000000 +0000
9989@@ -0,0 +1,67 @@ 9989@@ -0,0 +1,67 @@
9990+#ifndef _VS_SOCKET_H 9990+#ifndef _VS_SOCKET_H
9991+#define _VS_SOCKET_H 9991+#define _VS_SOCKET_H
@@ -10054,9 +10054,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vs_socket.h linux-3.10.19-vs2.
10054+#else 10054+#else
10055+#warning duplicate inclusion 10055+#warning duplicate inclusion
10056+#endif 10056+#endif
10057diff -NurpP --minimal linux-3.10.19/include/linux/vs_tag.h linux-3.10.19-vs2.3.6.8/include/linux/vs_tag.h 10057diff -NurpP --minimal linux-3.10.21/include/linux/vs_tag.h linux-3.10.21-vs2.3.6.8/include/linux/vs_tag.h
10058--- linux-3.10.19/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000 10058--- linux-3.10.21/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000
10059+++ linux-3.10.19-vs2.3.6.8/include/linux/vs_tag.h 2013-08-22 20:30:00.000000000 +0000 10059+++ linux-3.10.21-vs2.3.6.8/include/linux/vs_tag.h 2013-08-22 20:30:00.000000000 +0000
10060@@ -0,0 +1,47 @@ 10060@@ -0,0 +1,47 @@
10061+#ifndef _VS_TAG_H 10061+#ifndef _VS_TAG_H
10062+#define _VS_TAG_H 10062+#define _VS_TAG_H
@@ -10105,9 +10105,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vs_tag.h linux-3.10.19-vs2.3.6
10105+#else 10105+#else
10106+#warning duplicate inclusion 10106+#warning duplicate inclusion
10107+#endif 10107+#endif
10108diff -NurpP --minimal linux-3.10.19/include/linux/vs_time.h linux-3.10.19-vs2.3.6.8/include/linux/vs_time.h 10108diff -NurpP --minimal linux-3.10.21/include/linux/vs_time.h linux-3.10.21-vs2.3.6.8/include/linux/vs_time.h
10109--- linux-3.10.19/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000 10109--- linux-3.10.21/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000
10110+++ linux-3.10.19-vs2.3.6.8/include/linux/vs_time.h 2013-08-22 20:30:00.000000000 +0000 10110+++ linux-3.10.21-vs2.3.6.8/include/linux/vs_time.h 2013-08-22 20:30:00.000000000 +0000
10111@@ -0,0 +1,19 @@ 10111@@ -0,0 +1,19 @@
10112+#ifndef _VS_TIME_H 10112+#ifndef _VS_TIME_H
10113+#define _VS_TIME_H 10113+#define _VS_TIME_H
@@ -10128,9 +10128,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vs_time.h linux-3.10.19-vs2.3.
10128+#else 10128+#else
10129+#warning duplicate inclusion 10129+#warning duplicate inclusion
10130+#endif 10130+#endif
10131diff -NurpP --minimal linux-3.10.19/include/linux/vserver/base.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/base.h 10131diff -NurpP --minimal linux-3.10.21/include/linux/vserver/base.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/base.h
10132--- linux-3.10.19/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000 10132--- linux-3.10.21/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000
10133+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/base.h 2013-10-27 03:40:46.000000000 +0000 10133+++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/base.h 2013-10-27 03:40:46.000000000 +0000
10134@@ -0,0 +1,184 @@ 10134@@ -0,0 +1,184 @@
10135+#ifndef _VSERVER_BASE_H 10135+#ifndef _VSERVER_BASE_H
10136+#define _VSERVER_BASE_H 10136+#define _VSERVER_BASE_H
@@ -10316,9 +10316,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/base.h linux-3.10.19-v
10316+#define nx_info_state(n, m) (__nx_state(n) & (m)) 10316+#define nx_info_state(n, m) (__nx_state(n) & (m))
10317+ 10317+
10318+#endif 10318+#endif
10319diff -NurpP --minimal linux-3.10.19/include/linux/vserver/cacct.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/cacct.h 10319diff -NurpP --minimal linux-3.10.21/include/linux/vserver/cacct.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/cacct.h
10320--- linux-3.10.19/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000 10320--- linux-3.10.21/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000
10321+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/cacct.h 2013-08-22 20:30:00.000000000 +0000 10321+++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/cacct.h 2013-08-22 20:30:00.000000000 +0000
10322@@ -0,0 +1,15 @@ 10322@@ -0,0 +1,15 @@
10323+#ifndef _VSERVER_CACCT_H 10323+#ifndef _VSERVER_CACCT_H
10324+#define _VSERVER_CACCT_H 10324+#define _VSERVER_CACCT_H
@@ -10335,9 +10335,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/cacct.h linux-3.10.19-
10335+}; 10335+};
10336+ 10336+
10337+#endif /* _VSERVER_CACCT_H */ 10337+#endif /* _VSERVER_CACCT_H */
10338diff -NurpP --minimal linux-3.10.19/include/linux/vserver/cacct_cmd.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/cacct_cmd.h 10338diff -NurpP --minimal linux-3.10.21/include/linux/vserver/cacct_cmd.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/cacct_cmd.h
10339--- linux-3.10.19/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000 10339--- linux-3.10.21/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
10340+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/cacct_cmd.h 2013-08-22 20:30:00.000000000 +0000 10340+++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/cacct_cmd.h 2013-08-22 20:30:00.000000000 +0000
10341@@ -0,0 +1,10 @@ 10341@@ -0,0 +1,10 @@
10342+#ifndef _VSERVER_CACCT_CMD_H 10342+#ifndef _VSERVER_CACCT_CMD_H
10343+#define _VSERVER_CACCT_CMD_H 10343+#define _VSERVER_CACCT_CMD_H
@@ -10349,9 +10349,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/cacct_cmd.h linux-3.10
10349+extern int vc_sock_stat(struct vx_info *, void __user *); 10349+extern int vc_sock_stat(struct vx_info *, void __user *);
10350+ 10350+
10351+#endif /* _VSERVER_CACCT_CMD_H */ 10351+#endif /* _VSERVER_CACCT_CMD_H */
10352diff -NurpP --minimal linux-3.10.19/include/linux/vserver/cacct_def.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/cacct_def.h 10352diff -NurpP --minimal linux-3.10.21/include/linux/vserver/cacct_def.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/cacct_def.h
10353--- linux-3.10.19/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000 10353--- linux-3.10.21/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000
10354+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/cacct_def.h 2013-08-22 20:30:00.000000000 +0000 10354+++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/cacct_def.h 2013-08-22 20:30:00.000000000 +0000
10355@@ -0,0 +1,43 @@ 10355@@ -0,0 +1,43 @@
10356+#ifndef _VSERVER_CACCT_DEF_H 10356+#ifndef _VSERVER_CACCT_DEF_H
10357+#define _VSERVER_CACCT_DEF_H 10357+#define _VSERVER_CACCT_DEF_H
@@ -10396,9 +10396,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/cacct_def.h linux-3.10
10396+#endif 10396+#endif
10397+ 10397+
10398+#endif /* _VSERVER_CACCT_DEF_H */ 10398+#endif /* _VSERVER_CACCT_DEF_H */
10399diff -NurpP --minimal linux-3.10.19/include/linux/vserver/cacct_int.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/cacct_int.h 10399diff -NurpP --minimal linux-3.10.21/include/linux/vserver/cacct_int.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/cacct_int.h
10400--- linux-3.10.19/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000 10400--- linux-3.10.21/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000
10401+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/cacct_int.h 2013-08-22 20:30:00.000000000 +0000 10401+++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/cacct_int.h 2013-08-22 20:30:00.000000000 +0000
10402@@ -0,0 +1,17 @@ 10402@@ -0,0 +1,17 @@
10403+#ifndef _VSERVER_CACCT_INT_H 10403+#ifndef _VSERVER_CACCT_INT_H
10404+#define _VSERVER_CACCT_INT_H 10404+#define _VSERVER_CACCT_INT_H
@@ -10417,9 +10417,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/cacct_int.h linux-3.10
10417+} 10417+}
10418+ 10418+
10419+#endif /* _VSERVER_CACCT_INT_H */ 10419+#endif /* _VSERVER_CACCT_INT_H */
10420diff -NurpP --minimal linux-3.10.19/include/linux/vserver/check.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/check.h 10420diff -NurpP --minimal linux-3.10.21/include/linux/vserver/check.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/check.h
10421--- linux-3.10.19/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000 10421--- linux-3.10.21/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000
10422+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/check.h 2013-08-22 20:30:00.000000000 +0000 10422+++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/check.h 2013-08-22 20:30:00.000000000 +0000
10423@@ -0,0 +1,89 @@ 10423@@ -0,0 +1,89 @@
10424+#ifndef _VSERVER_CHECK_H 10424+#ifndef _VSERVER_CHECK_H
10425+#define _VSERVER_CHECK_H 10425+#define _VSERVER_CHECK_H
@@ -10510,9 +10510,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/check.h linux-3.10.19-
10510+#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1) 10510+#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1)
10511+ 10511+
10512+#endif 10512+#endif
10513diff -NurpP --minimal linux-3.10.19/include/linux/vserver/context.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/context.h 10513diff -NurpP --minimal linux-3.10.21/include/linux/vserver/context.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/context.h
10514--- linux-3.10.19/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000 10514--- linux-3.10.21/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
10515+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/context.h 2013-08-22 20:30:00.000000000 +0000 10515+++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/context.h 2013-08-22 20:30:00.000000000 +0000
10516@@ -0,0 +1,110 @@ 10516@@ -0,0 +1,110 @@
10517+#ifndef _VSERVER_CONTEXT_H 10517+#ifndef _VSERVER_CONTEXT_H
10518+#define _VSERVER_CONTEXT_H 10518+#define _VSERVER_CONTEXT_H
@@ -10624,9 +10624,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/context.h linux-3.10.1
10624+ 10624+
10625+ 10625+
10626+#endif /* _VSERVER_CONTEXT_H */ 10626+#endif /* _VSERVER_CONTEXT_H */
10627diff -NurpP --minimal linux-3.10.19/include/linux/vserver/context_cmd.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/context_cmd.h 10627diff -NurpP --minimal linux-3.10.21/include/linux/vserver/context_cmd.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/context_cmd.h
10628--- linux-3.10.19/include/linux/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000 10628--- linux-3.10.21/include/linux/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
10629+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/context_cmd.h 2013-08-22 20:30:00.000000000 +0000 10629+++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/context_cmd.h 2013-08-22 20:30:00.000000000 +0000
10630@@ -0,0 +1,33 @@ 10630@@ -0,0 +1,33 @@
10631+#ifndef _VSERVER_CONTEXT_CMD_H 10631+#ifndef _VSERVER_CONTEXT_CMD_H
10632+#define _VSERVER_CONTEXT_CMD_H 10632+#define _VSERVER_CONTEXT_CMD_H
@@ -10661,9 +10661,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/context_cmd.h linux-3.
10661+extern int vc_set_badness(struct vx_info *, void __user *); 10661+extern int vc_set_badness(struct vx_info *, void __user *);
10662+ 10662+
10663+#endif /* _VSERVER_CONTEXT_CMD_H */ 10663+#endif /* _VSERVER_CONTEXT_CMD_H */
10664diff -NurpP --minimal linux-3.10.19/include/linux/vserver/cvirt.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/cvirt.h 10664diff -NurpP --minimal linux-3.10.21/include/linux/vserver/cvirt.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/cvirt.h
10665--- linux-3.10.19/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000 10665--- linux-3.10.21/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000
10666+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/cvirt.h 2013-08-22 20:30:00.000000000 +0000 10666+++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/cvirt.h 2013-08-22 20:30:00.000000000 +0000
10667@@ -0,0 +1,18 @@ 10667@@ -0,0 +1,18 @@
10668+#ifndef _VSERVER_CVIRT_H 10668+#ifndef _VSERVER_CVIRT_H
10669+#define _VSERVER_CVIRT_H 10669+#define _VSERVER_CVIRT_H
@@ -10683,9 +10683,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/cvirt.h linux-3.10.19-
10683+int vx_do_syslog(int, char __user *, int); 10683+int vx_do_syslog(int, char __user *, int);
10684+ 10684+
10685+#endif /* _VSERVER_CVIRT_H */ 10685+#endif /* _VSERVER_CVIRT_H */
10686diff -NurpP --minimal linux-3.10.19/include/linux/vserver/cvirt_cmd.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/cvirt_cmd.h 10686diff -NurpP --minimal linux-3.10.21/include/linux/vserver/cvirt_cmd.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/cvirt_cmd.h
10687--- linux-3.10.19/include/linux/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000 10687--- linux-3.10.21/include/linux/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
10688+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/cvirt_cmd.h 2013-08-22 20:30:00.000000000 +0000 10688+++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/cvirt_cmd.h 2013-08-22 20:30:00.000000000 +0000
10689@@ -0,0 +1,13 @@ 10689@@ -0,0 +1,13 @@
10690+#ifndef _VSERVER_CVIRT_CMD_H 10690+#ifndef _VSERVER_CVIRT_CMD_H
10691+#define _VSERVER_CVIRT_CMD_H 10691+#define _VSERVER_CVIRT_CMD_H
@@ -10700,9 +10700,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/cvirt_cmd.h linux-3.10
10700+extern int vc_virt_stat(struct vx_info *, void __user *); 10700+extern int vc_virt_stat(struct vx_info *, void __user *);
10701+ 10701+
10702+#endif /* _VSERVER_CVIRT_CMD_H */ 10702+#endif /* _VSERVER_CVIRT_CMD_H */
10703diff -NurpP --minimal linux-3.10.19/include/linux/vserver/cvirt_def.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/cvirt_def.h 10703diff -NurpP --minimal linux-3.10.21/include/linux/vserver/cvirt_def.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/cvirt_def.h
10704--- linux-3.10.19/include/linux/vserver/cvirt_def.h 1970-01-01 00:00:00.000000000 +0000 10704--- linux-3.10.21/include/linux/vserver/cvirt_def.h 1970-01-01 00:00:00.000000000 +0000
10705+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/cvirt_def.h 2013-08-22 20:30:00.000000000 +0000 10705+++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/cvirt_def.h 2013-08-22 20:30:00.000000000 +0000
10706@@ -0,0 +1,80 @@ 10706@@ -0,0 +1,80 @@
10707+#ifndef _VSERVER_CVIRT_DEF_H 10707+#ifndef _VSERVER_CVIRT_DEF_H
10708+#define _VSERVER_CVIRT_DEF_H 10708+#define _VSERVER_CVIRT_DEF_H
@@ -10784,9 +10784,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/cvirt_def.h linux-3.10
10784+#endif 10784+#endif
10785+ 10785+
10786+#endif /* _VSERVER_CVIRT_DEF_H */ 10786+#endif /* _VSERVER_CVIRT_DEF_H */
10787diff -NurpP --minimal linux-3.10.19/include/linux/vserver/debug.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/debug.h 10787diff -NurpP --minimal linux-3.10.21/include/linux/vserver/debug.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/debug.h
10788--- linux-3.10.19/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000 10788--- linux-3.10.21/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000
10789+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/debug.h 2013-08-22 20:30:00.000000000 +0000 10789+++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/debug.h 2013-08-22 20:30:00.000000000 +0000
10790@@ -0,0 +1,146 @@ 10790@@ -0,0 +1,146 @@
10791+#ifndef _VSERVER_DEBUG_H 10791+#ifndef _VSERVER_DEBUG_H
10792+#define _VSERVER_DEBUG_H 10792+#define _VSERVER_DEBUG_H
@@ -10934,9 +10934,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/debug.h linux-3.10.19-
10934+ 10934+
10935+ 10935+
10936+#endif /* _VSERVER_DEBUG_H */ 10936+#endif /* _VSERVER_DEBUG_H */
10937diff -NurpP --minimal linux-3.10.19/include/linux/vserver/debug_cmd.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/debug_cmd.h 10937diff -NurpP --minimal linux-3.10.21/include/linux/vserver/debug_cmd.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/debug_cmd.h
10938--- linux-3.10.19/include/linux/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000 10938--- linux-3.10.21/include/linux/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
10939+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/debug_cmd.h 2013-08-22 20:30:00.000000000 +0000 10939+++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/debug_cmd.h 2013-08-22 20:30:00.000000000 +0000
10940@@ -0,0 +1,37 @@ 10940@@ -0,0 +1,37 @@
10941+#ifndef _VSERVER_DEBUG_CMD_H 10941+#ifndef _VSERVER_DEBUG_CMD_H
10942+#define _VSERVER_DEBUG_CMD_H 10942+#define _VSERVER_DEBUG_CMD_H
@@ -10975,9 +10975,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/debug_cmd.h linux-3.10
10975+#endif /* CONFIG_COMPAT */ 10975+#endif /* CONFIG_COMPAT */
10976+ 10976+
10977+#endif /* _VSERVER_DEBUG_CMD_H */ 10977+#endif /* _VSERVER_DEBUG_CMD_H */
10978diff -NurpP --minimal linux-3.10.19/include/linux/vserver/device.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/device.h 10978diff -NurpP --minimal linux-3.10.21/include/linux/vserver/device.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/device.h
10979--- linux-3.10.19/include/linux/vserver/device.h 1970-01-01 00:00:00.000000000 +0000 10979--- linux-3.10.21/include/linux/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
10980+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/device.h 2013-08-22 20:30:00.000000000 +0000 10980+++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/device.h 2013-08-22 20:30:00.000000000 +0000
10981@@ -0,0 +1,9 @@ 10981@@ -0,0 +1,9 @@
10982+#ifndef _VSERVER_DEVICE_H 10982+#ifndef _VSERVER_DEVICE_H
10983+#define _VSERVER_DEVICE_H 10983+#define _VSERVER_DEVICE_H
@@ -10988,9 +10988,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/device.h linux-3.10.19
10988+#else /* _VSERVER_DEVICE_H */ 10988+#else /* _VSERVER_DEVICE_H */
10989+#warning duplicate inclusion 10989+#warning duplicate inclusion
10990+#endif /* _VSERVER_DEVICE_H */ 10990+#endif /* _VSERVER_DEVICE_H */
10991diff -NurpP --minimal linux-3.10.19/include/linux/vserver/device_cmd.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/device_cmd.h 10991diff -NurpP --minimal linux-3.10.21/include/linux/vserver/device_cmd.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/device_cmd.h
10992--- linux-3.10.19/include/linux/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000 10992--- linux-3.10.21/include/linux/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000
10993+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/device_cmd.h 2013-08-22 20:30:00.000000000 +0000 10993+++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/device_cmd.h 2013-08-22 20:30:00.000000000 +0000
10994@@ -0,0 +1,31 @@ 10994@@ -0,0 +1,31 @@
10995+#ifndef _VSERVER_DEVICE_CMD_H 10995+#ifndef _VSERVER_DEVICE_CMD_H
10996+#define _VSERVER_DEVICE_CMD_H 10996+#define _VSERVER_DEVICE_CMD_H
@@ -11023,9 +11023,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/device_cmd.h linux-3.1
11023+#endif /* CONFIG_COMPAT */ 11023+#endif /* CONFIG_COMPAT */
11024+ 11024+
11025+#endif /* _VSERVER_DEVICE_CMD_H */ 11025+#endif /* _VSERVER_DEVICE_CMD_H */
11026diff -NurpP --minimal linux-3.10.19/include/linux/vserver/device_def.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/device_def.h 11026diff -NurpP --minimal linux-3.10.21/include/linux/vserver/device_def.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/device_def.h
11027--- linux-3.10.19/include/linux/vserver/device_def.h 1970-01-01 00:00:00.000000000 +0000 11027--- linux-3.10.21/include/linux/vserver/device_def.h 1970-01-01 00:00:00.000000000 +0000
11028+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/device_def.h 2013-08-22 20:30:00.000000000 +0000 11028+++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/device_def.h 2013-08-22 20:30:00.000000000 +0000
11029@@ -0,0 +1,17 @@ 11029@@ -0,0 +1,17 @@
11030+#ifndef _VSERVER_DEVICE_DEF_H 11030+#ifndef _VSERVER_DEVICE_DEF_H
11031+#define _VSERVER_DEVICE_DEF_H 11031+#define _VSERVER_DEVICE_DEF_H
@@ -11044,9 +11044,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/device_def.h linux-3.1
11044+}; 11044+};
11045+ 11045+
11046+#endif /* _VSERVER_DEVICE_DEF_H */ 11046+#endif /* _VSERVER_DEVICE_DEF_H */
11047diff -NurpP --minimal linux-3.10.19/include/linux/vserver/dlimit.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/dlimit.h 11047diff -NurpP --minimal linux-3.10.21/include/linux/vserver/dlimit.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/dlimit.h
11048--- linux-3.10.19/include/linux/vserver/dlimit.h 1970-01-01 00:00:00.000000000 +0000 11048--- linux-3.10.21/include/linux/vserver/dlimit.h 1970-01-01 00:00:00.000000000 +0000
11049+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/dlimit.h 2013-08-22 20:30:00.000000000 +0000 11049+++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/dlimit.h 2013-08-22 20:30:00.000000000 +0000
11050@@ -0,0 +1,54 @@ 11050@@ -0,0 +1,54 @@
11051+#ifndef _VSERVER_DLIMIT_H 11051+#ifndef _VSERVER_DLIMIT_H
11052+#define _VSERVER_DLIMIT_H 11052+#define _VSERVER_DLIMIT_H
@@ -11102,9 +11102,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/dlimit.h linux-3.10.19
11102+#else /* _VSERVER_DLIMIT_H */ 11102+#else /* _VSERVER_DLIMIT_H */
11103+#warning duplicate inclusion 11103+#warning duplicate inclusion
11104+#endif /* _VSERVER_DLIMIT_H */ 11104+#endif /* _VSERVER_DLIMIT_H */
11105diff -NurpP --minimal linux-3.10.19/include/linux/vserver/dlimit_cmd.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/dlimit_cmd.h 11105diff -NurpP --minimal linux-3.10.21/include/linux/vserver/dlimit_cmd.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/dlimit_cmd.h
11106--- linux-3.10.19/include/linux/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000 11106--- linux-3.10.21/include/linux/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000
11107+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/dlimit_cmd.h 2013-08-22 20:30:00.000000000 +0000 11107+++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/dlimit_cmd.h 2013-08-22 20:30:00.000000000 +0000
11108@@ -0,0 +1,46 @@ 11108@@ -0,0 +1,46 @@
11109+#ifndef _VSERVER_DLIMIT_CMD_H 11109+#ifndef _VSERVER_DLIMIT_CMD_H
11110+#define _VSERVER_DLIMIT_CMD_H 11110+#define _VSERVER_DLIMIT_CMD_H
@@ -11152,9 +11152,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/dlimit_cmd.h linux-3.1
11152+#endif /* CONFIG_COMPAT */ 11152+#endif /* CONFIG_COMPAT */
11153+ 11153+
11154+#endif /* _VSERVER_DLIMIT_CMD_H */ 11154+#endif /* _VSERVER_DLIMIT_CMD_H */
11155diff -NurpP --minimal linux-3.10.19/include/linux/vserver/global.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/global.h 11155diff -NurpP --minimal linux-3.10.21/include/linux/vserver/global.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/global.h
11156--- linux-3.10.19/include/linux/vserver/global.h 1970-01-01 00:00:00.000000000 +0000 11156--- linux-3.10.21/include/linux/vserver/global.h 1970-01-01 00:00:00.000000000 +0000
11157+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/global.h 2013-08-22 20:30:00.000000000 +0000 11157+++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/global.h 2013-08-22 20:30:00.000000000 +0000
11158@@ -0,0 +1,19 @@ 11158@@ -0,0 +1,19 @@
11159+#ifndef _VSERVER_GLOBAL_H 11159+#ifndef _VSERVER_GLOBAL_H
11160+#define _VSERVER_GLOBAL_H 11160+#define _VSERVER_GLOBAL_H
@@ -11175,9 +11175,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/global.h linux-3.10.19
11175+ 11175+
11176+ 11176+
11177+#endif /* _VSERVER_GLOBAL_H */ 11177+#endif /* _VSERVER_GLOBAL_H */
11178diff -NurpP --minimal linux-3.10.19/include/linux/vserver/history.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/history.h 11178diff -NurpP --minimal linux-3.10.21/include/linux/vserver/history.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/history.h
11179--- linux-3.10.19/include/linux/vserver/history.h 1970-01-01 00:00:00.000000000 +0000 11179--- linux-3.10.21/include/linux/vserver/history.h 1970-01-01 00:00:00.000000000 +0000
11180+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/history.h 2013-08-22 20:30:00.000000000 +0000 11180+++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/history.h 2013-08-22 20:30:00.000000000 +0000
11181@@ -0,0 +1,197 @@ 11181@@ -0,0 +1,197 @@
11182+#ifndef _VSERVER_HISTORY_H 11182+#ifndef _VSERVER_HISTORY_H
11183+#define _VSERVER_HISTORY_H 11183+#define _VSERVER_HISTORY_H
@@ -11376,9 +11376,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/history.h linux-3.10.1
11376+#endif /* CONFIG_VSERVER_HISTORY */ 11376+#endif /* CONFIG_VSERVER_HISTORY */
11377+ 11377+
11378+#endif /* _VSERVER_HISTORY_H */ 11378+#endif /* _VSERVER_HISTORY_H */
11379diff -NurpP --minimal linux-3.10.19/include/linux/vserver/inode.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/inode.h 11379diff -NurpP --minimal linux-3.10.21/include/linux/vserver/inode.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/inode.h
11380--- linux-3.10.19/include/linux/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000 11380--- linux-3.10.21/include/linux/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
11381+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/inode.h 2013-08-22 20:30:00.000000000 +0000 11381+++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/inode.h 2013-08-22 20:30:00.000000000 +0000
11382@@ -0,0 +1,19 @@ 11382@@ -0,0 +1,19 @@
11383+#ifndef _VSERVER_INODE_H 11383+#ifndef _VSERVER_INODE_H
11384+#define _VSERVER_INODE_H 11384+#define _VSERVER_INODE_H
@@ -11399,9 +11399,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/inode.h linux-3.10.19-
11399+#else /* _VSERVER_INODE_H */ 11399+#else /* _VSERVER_INODE_H */
11400+#warning duplicate inclusion 11400+#warning duplicate inclusion
11401+#endif /* _VSERVER_INODE_H */ 11401+#endif /* _VSERVER_INODE_H */
11402diff -NurpP --minimal linux-3.10.19/include/linux/vserver/inode_cmd.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/inode_cmd.h 11402diff -NurpP --minimal linux-3.10.21/include/linux/vserver/inode_cmd.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/inode_cmd.h
11403--- linux-3.10.19/include/linux/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000 11403--- linux-3.10.21/include/linux/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000
11404+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/inode_cmd.h 2013-08-22 20:30:00.000000000 +0000 11404+++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/inode_cmd.h 2013-08-22 20:30:00.000000000 +0000
11405@@ -0,0 +1,36 @@ 11405@@ -0,0 +1,36 @@
11406+#ifndef _VSERVER_INODE_CMD_H 11406+#ifndef _VSERVER_INODE_CMD_H
11407+#define _VSERVER_INODE_CMD_H 11407+#define _VSERVER_INODE_CMD_H
@@ -11439,9 +11439,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/inode_cmd.h linux-3.10
11439+#endif /* CONFIG_COMPAT */ 11439+#endif /* CONFIG_COMPAT */
11440+ 11440+
11441+#endif /* _VSERVER_INODE_CMD_H */ 11441+#endif /* _VSERVER_INODE_CMD_H */
11442diff -NurpP --minimal linux-3.10.19/include/linux/vserver/limit.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/limit.h 11442diff -NurpP --minimal linux-3.10.21/include/linux/vserver/limit.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/limit.h
11443--- linux-3.10.19/include/linux/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000 11443--- linux-3.10.21/include/linux/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000
11444+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/limit.h 2013-08-22 20:30:00.000000000 +0000 11444+++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/limit.h 2013-08-22 20:30:00.000000000 +0000
11445@@ -0,0 +1,61 @@ 11445@@ -0,0 +1,61 @@
11446+#ifndef _VSERVER_LIMIT_H 11446+#ifndef _VSERVER_LIMIT_H
11447+#define _VSERVER_LIMIT_H 11447+#define _VSERVER_LIMIT_H
@@ -11504,9 +11504,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/limit.h linux-3.10.19-
11504+#define NUM_LIMITS 24 11504+#define NUM_LIMITS 24
11505+ 11505+
11506+#endif /* _VSERVER_LIMIT_H */ 11506+#endif /* _VSERVER_LIMIT_H */
11507diff -NurpP --minimal linux-3.10.19/include/linux/vserver/limit_cmd.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/limit_cmd.h 11507diff -NurpP --minimal linux-3.10.21/include/linux/vserver/limit_cmd.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/limit_cmd.h
11508--- linux-3.10.19/include/linux/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000 11508--- linux-3.10.21/include/linux/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000
11509+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/limit_cmd.h 2013-08-22 20:30:00.000000000 +0000 11509+++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/limit_cmd.h 2013-08-22 20:30:00.000000000 +0000
11510@@ -0,0 +1,35 @@ 11510@@ -0,0 +1,35 @@
11511+#ifndef _VSERVER_LIMIT_CMD_H 11511+#ifndef _VSERVER_LIMIT_CMD_H
11512+#define _VSERVER_LIMIT_CMD_H 11512+#define _VSERVER_LIMIT_CMD_H
@@ -11543,9 +11543,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/limit_cmd.h linux-3.10
11543+#endif /* CONFIG_IA32_EMULATION */ 11543+#endif /* CONFIG_IA32_EMULATION */
11544+ 11544+
11545+#endif /* _VSERVER_LIMIT_CMD_H */ 11545+#endif /* _VSERVER_LIMIT_CMD_H */
11546diff -NurpP --minimal linux-3.10.19/include/linux/vserver/limit_def.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/limit_def.h 11546diff -NurpP --minimal linux-3.10.21/include/linux/vserver/limit_def.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/limit_def.h
11547--- linux-3.10.19/include/linux/vserver/limit_def.h 1970-01-01 00:00:00.000000000 +0000 11547--- linux-3.10.21/include/linux/vserver/limit_def.h 1970-01-01 00:00:00.000000000 +0000
11548+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/limit_def.h 2013-08-22 20:30:00.000000000 +0000 11548+++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/limit_def.h 2013-08-22 20:30:00.000000000 +0000
11549@@ -0,0 +1,47 @@ 11549@@ -0,0 +1,47 @@
11550+#ifndef _VSERVER_LIMIT_DEF_H 11550+#ifndef _VSERVER_LIMIT_DEF_H
11551+#define _VSERVER_LIMIT_DEF_H 11551+#define _VSERVER_LIMIT_DEF_H
@@ -11594,9 +11594,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/limit_def.h linux-3.10
11594+#endif 11594+#endif
11595+ 11595+
11596+#endif /* _VSERVER_LIMIT_DEF_H */ 11596+#endif /* _VSERVER_LIMIT_DEF_H */
11597diff -NurpP --minimal linux-3.10.19/include/linux/vserver/limit_int.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/limit_int.h 11597diff -NurpP --minimal linux-3.10.21/include/linux/vserver/limit_int.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/limit_int.h
11598--- linux-3.10.19/include/linux/vserver/limit_int.h 1970-01-01 00:00:00.000000000 +0000 11598--- linux-3.10.21/include/linux/vserver/limit_int.h 1970-01-01 00:00:00.000000000 +0000
11599+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/limit_int.h 2013-08-22 20:30:00.000000000 +0000 11599+++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/limit_int.h 2013-08-22 20:30:00.000000000 +0000
11600@@ -0,0 +1,193 @@ 11600@@ -0,0 +1,193 @@
11601+#ifndef _VSERVER_LIMIT_INT_H 11601+#ifndef _VSERVER_LIMIT_INT_H
11602+#define _VSERVER_LIMIT_INT_H 11602+#define _VSERVER_LIMIT_INT_H
@@ -11791,9 +11791,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/limit_int.h linux-3.10
11791+ 11791+
11792+ 11792+
11793+#endif /* _VSERVER_LIMIT_INT_H */ 11793+#endif /* _VSERVER_LIMIT_INT_H */
11794diff -NurpP --minimal linux-3.10.19/include/linux/vserver/monitor.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/monitor.h 11794diff -NurpP --minimal linux-3.10.21/include/linux/vserver/monitor.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/monitor.h
11795--- linux-3.10.19/include/linux/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000 11795--- linux-3.10.21/include/linux/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000
11796+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/monitor.h 2013-08-22 20:30:00.000000000 +0000 11796+++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/monitor.h 2013-08-22 20:30:00.000000000 +0000
11797@@ -0,0 +1,6 @@ 11797@@ -0,0 +1,6 @@
11798+#ifndef _VSERVER_MONITOR_H 11798+#ifndef _VSERVER_MONITOR_H
11799+#define _VSERVER_MONITOR_H 11799+#define _VSERVER_MONITOR_H
@@ -11801,9 +11801,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/monitor.h linux-3.10.1
11801+#include <uapi/vserver/monitor.h> 11801+#include <uapi/vserver/monitor.h>
11802+ 11802+
11803+#endif /* _VSERVER_MONITOR_H */ 11803+#endif /* _VSERVER_MONITOR_H */
11804diff -NurpP --minimal linux-3.10.19/include/linux/vserver/network.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/network.h 11804diff -NurpP --minimal linux-3.10.21/include/linux/vserver/network.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/network.h
11805--- linux-3.10.19/include/linux/vserver/network.h 1970-01-01 00:00:00.000000000 +0000 11805--- linux-3.10.21/include/linux/vserver/network.h 1970-01-01 00:00:00.000000000 +0000
11806+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/network.h 2013-08-22 20:30:00.000000000 +0000 11806+++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/network.h 2013-08-22 20:30:00.000000000 +0000
11807@@ -0,0 +1,76 @@ 11807@@ -0,0 +1,76 @@
11808+#ifndef _VSERVER_NETWORK_H 11808+#ifndef _VSERVER_NETWORK_H
11809+#define _VSERVER_NETWORK_H 11809+#define _VSERVER_NETWORK_H
@@ -11881,9 +11881,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/network.h linux-3.10.1
11881+#endif 11881+#endif
11882+ 11882+
11883+#endif /* _VSERVER_NETWORK_H */ 11883+#endif /* _VSERVER_NETWORK_H */
11884diff -NurpP --minimal linux-3.10.19/include/linux/vserver/network_cmd.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/network_cmd.h 11884diff -NurpP --minimal linux-3.10.21/include/linux/vserver/network_cmd.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/network_cmd.h
11885--- linux-3.10.19/include/linux/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000 11885--- linux-3.10.21/include/linux/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000
11886+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/network_cmd.h 2013-08-22 20:30:00.000000000 +0000 11886+++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/network_cmd.h 2013-08-22 20:30:00.000000000 +0000
11887@@ -0,0 +1,37 @@ 11887@@ -0,0 +1,37 @@
11888+#ifndef _VSERVER_NETWORK_CMD_H 11888+#ifndef _VSERVER_NETWORK_CMD_H
11889+#define _VSERVER_NETWORK_CMD_H 11889+#define _VSERVER_NETWORK_CMD_H
@@ -11922,9 +11922,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/network_cmd.h linux-3.
11922+extern int vc_set_ncaps(struct nx_info *, void __user *); 11922+extern int vc_set_ncaps(struct nx_info *, void __user *);
11923+ 11923+
11924+#endif /* _VSERVER_CONTEXT_CMD_H */ 11924+#endif /* _VSERVER_CONTEXT_CMD_H */
11925diff -NurpP --minimal linux-3.10.19/include/linux/vserver/percpu.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/percpu.h 11925diff -NurpP --minimal linux-3.10.21/include/linux/vserver/percpu.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/percpu.h
11926--- linux-3.10.19/include/linux/vserver/percpu.h 1970-01-01 00:00:00.000000000 +0000 11926--- linux-3.10.21/include/linux/vserver/percpu.h 1970-01-01 00:00:00.000000000 +0000
11927+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/percpu.h 2013-08-22 20:30:00.000000000 +0000 11927+++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/percpu.h 2013-08-22 20:30:00.000000000 +0000
11928@@ -0,0 +1,14 @@ 11928@@ -0,0 +1,14 @@
11929+#ifndef _VSERVER_PERCPU_H 11929+#ifndef _VSERVER_PERCPU_H
11930+#define _VSERVER_PERCPU_H 11930+#define _VSERVER_PERCPU_H
@@ -11940,9 +11940,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/percpu.h linux-3.10.19
11940+#define PERCPU_PERCTX (sizeof(struct _vx_percpu)) 11940+#define PERCPU_PERCTX (sizeof(struct _vx_percpu))
11941+ 11941+
11942+#endif /* _VSERVER_PERCPU_H */ 11942+#endif /* _VSERVER_PERCPU_H */
11943diff -NurpP --minimal linux-3.10.19/include/linux/vserver/pid.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/pid.h 11943diff -NurpP --minimal linux-3.10.21/include/linux/vserver/pid.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/pid.h
11944--- linux-3.10.19/include/linux/vserver/pid.h 1970-01-01 00:00:00.000000000 +0000 11944--- linux-3.10.21/include/linux/vserver/pid.h 1970-01-01 00:00:00.000000000 +0000
11945+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/pid.h 2013-08-22 20:30:00.000000000 +0000 11945+++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/pid.h 2013-08-22 20:30:00.000000000 +0000
11946@@ -0,0 +1,51 @@ 11946@@ -0,0 +1,51 @@
11947+#ifndef _VSERVER_PID_H 11947+#ifndef _VSERVER_PID_H
11948+#define _VSERVER_PID_H 11948+#define _VSERVER_PID_H
@@ -11995,9 +11995,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/pid.h linux-3.10.19-vs
11995+} 11995+}
11996+ 11996+
11997+#endif 11997+#endif
11998diff -NurpP --minimal linux-3.10.19/include/linux/vserver/sched.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/sched.h 11998diff -NurpP --minimal linux-3.10.21/include/linux/vserver/sched.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/sched.h
11999--- linux-3.10.19/include/linux/vserver/sched.h 1970-01-01 00:00:00.000000000 +0000 11999--- linux-3.10.21/include/linux/vserver/sched.h 1970-01-01 00:00:00.000000000 +0000
12000+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/sched.h 2013-08-22 20:30:00.000000000 +0000 12000+++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/sched.h 2013-08-22 20:30:00.000000000 +0000
12001@@ -0,0 +1,23 @@ 12001@@ -0,0 +1,23 @@
12002+#ifndef _VSERVER_SCHED_H 12002+#ifndef _VSERVER_SCHED_H
12003+#define _VSERVER_SCHED_H 12003+#define _VSERVER_SCHED_H
@@ -12022,9 +12022,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/sched.h linux-3.10.19-
12022+#else /* _VSERVER_SCHED_H */ 12022+#else /* _VSERVER_SCHED_H */
12023+#warning duplicate inclusion 12023+#warning duplicate inclusion
12024+#endif /* _VSERVER_SCHED_H */ 12024+#endif /* _VSERVER_SCHED_H */
12025diff -NurpP --minimal linux-3.10.19/include/linux/vserver/sched_cmd.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/sched_cmd.h 12025diff -NurpP --minimal linux-3.10.21/include/linux/vserver/sched_cmd.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/sched_cmd.h
12026--- linux-3.10.19/include/linux/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000 12026--- linux-3.10.21/include/linux/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000
12027+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/sched_cmd.h 2013-08-22 20:30:00.000000000 +0000 12027+++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/sched_cmd.h 2013-08-22 20:30:00.000000000 +0000
12028@@ -0,0 +1,11 @@ 12028@@ -0,0 +1,11 @@
12029+#ifndef _VSERVER_SCHED_CMD_H 12029+#ifndef _VSERVER_SCHED_CMD_H
12030+#define _VSERVER_SCHED_CMD_H 12030+#define _VSERVER_SCHED_CMD_H
@@ -12037,9 +12037,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/sched_cmd.h linux-3.10
12037+extern int vc_get_prio_bias(struct vx_info *, void __user *); 12037+extern int vc_get_prio_bias(struct vx_info *, void __user *);
12038+ 12038+
12039+#endif /* _VSERVER_SCHED_CMD_H */ 12039+#endif /* _VSERVER_SCHED_CMD_H */
12040diff -NurpP --minimal linux-3.10.19/include/linux/vserver/sched_def.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/sched_def.h 12040diff -NurpP --minimal linux-3.10.21/include/linux/vserver/sched_def.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/sched_def.h
12041--- linux-3.10.19/include/linux/vserver/sched_def.h 1970-01-01 00:00:00.000000000 +0000 12041--- linux-3.10.21/include/linux/vserver/sched_def.h 1970-01-01 00:00:00.000000000 +0000
12042+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/sched_def.h 2013-08-22 20:30:00.000000000 +0000 12042+++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/sched_def.h 2013-08-22 20:30:00.000000000 +0000
12043@@ -0,0 +1,38 @@ 12043@@ -0,0 +1,38 @@
12044+#ifndef _VSERVER_SCHED_DEF_H 12044+#ifndef _VSERVER_SCHED_DEF_H
12045+#define _VSERVER_SCHED_DEF_H 12045+#define _VSERVER_SCHED_DEF_H
@@ -12079,9 +12079,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/sched_def.h linux-3.10
12079+#endif 12079+#endif
12080+ 12080+
12081+#endif /* _VSERVER_SCHED_DEF_H */ 12081+#endif /* _VSERVER_SCHED_DEF_H */
12082diff -NurpP --minimal linux-3.10.19/include/linux/vserver/signal.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/signal.h 12082diff -NurpP --minimal linux-3.10.21/include/linux/vserver/signal.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/signal.h
12083--- linux-3.10.19/include/linux/vserver/signal.h 1970-01-01 00:00:00.000000000 +0000 12083--- linux-3.10.21/include/linux/vserver/signal.h 1970-01-01 00:00:00.000000000 +0000
12084+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/signal.h 2013-08-22 20:30:00.000000000 +0000 12084+++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/signal.h 2013-08-22 20:30:00.000000000 +0000
12085@@ -0,0 +1,14 @@ 12085@@ -0,0 +1,14 @@
12086+#ifndef _VSERVER_SIGNAL_H 12086+#ifndef _VSERVER_SIGNAL_H
12087+#define _VSERVER_SIGNAL_H 12087+#define _VSERVER_SIGNAL_H
@@ -12097,9 +12097,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/signal.h linux-3.10.19
12097+#else /* _VSERVER_SIGNAL_H */ 12097+#else /* _VSERVER_SIGNAL_H */
12098+#warning duplicate inclusion 12098+#warning duplicate inclusion
12099+#endif /* _VSERVER_SIGNAL_H */ 12099+#endif /* _VSERVER_SIGNAL_H */
12100diff -NurpP --minimal linux-3.10.19/include/linux/vserver/signal_cmd.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/signal_cmd.h 12100diff -NurpP --minimal linux-3.10.21/include/linux/vserver/signal_cmd.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/signal_cmd.h
12101--- linux-3.10.19/include/linux/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000 12101--- linux-3.10.21/include/linux/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000
12102+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/signal_cmd.h 2013-08-22 20:30:00.000000000 +0000 12102+++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/signal_cmd.h 2013-08-22 20:30:00.000000000 +0000
12103@@ -0,0 +1,14 @@ 12103@@ -0,0 +1,14 @@
12104+#ifndef _VSERVER_SIGNAL_CMD_H 12104+#ifndef _VSERVER_SIGNAL_CMD_H
12105+#define _VSERVER_SIGNAL_CMD_H 12105+#define _VSERVER_SIGNAL_CMD_H
@@ -12115,9 +12115,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/signal_cmd.h linux-3.1
12115+extern int vc_set_pflags(uint32_t pid, void __user *); 12115+extern int vc_set_pflags(uint32_t pid, void __user *);
12116+ 12116+
12117+#endif /* _VSERVER_SIGNAL_CMD_H */ 12117+#endif /* _VSERVER_SIGNAL_CMD_H */
12118diff -NurpP --minimal linux-3.10.19/include/linux/vserver/space.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/space.h 12118diff -NurpP --minimal linux-3.10.21/include/linux/vserver/space.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/space.h
12119--- linux-3.10.19/include/linux/vserver/space.h 1970-01-01 00:00:00.000000000 +0000 12119--- linux-3.10.21/include/linux/vserver/space.h 1970-01-01 00:00:00.000000000 +0000
12120+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/space.h 2013-08-22 20:30:00.000000000 +0000 12120+++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/space.h 2013-08-22 20:30:00.000000000 +0000
12121@@ -0,0 +1,12 @@ 12121@@ -0,0 +1,12 @@
12122+#ifndef _VSERVER_SPACE_H 12122+#ifndef _VSERVER_SPACE_H
12123+#define _VSERVER_SPACE_H 12123+#define _VSERVER_SPACE_H
@@ -12131,9 +12131,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/space.h linux-3.10.19-
12131+#else /* _VSERVER_SPACE_H */ 12131+#else /* _VSERVER_SPACE_H */
12132+#warning duplicate inclusion 12132+#warning duplicate inclusion
12133+#endif /* _VSERVER_SPACE_H */ 12133+#endif /* _VSERVER_SPACE_H */
12134diff -NurpP --minimal linux-3.10.19/include/linux/vserver/space_cmd.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/space_cmd.h 12134diff -NurpP --minimal linux-3.10.21/include/linux/vserver/space_cmd.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/space_cmd.h
12135--- linux-3.10.19/include/linux/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000 12135--- linux-3.10.21/include/linux/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000
12136+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/space_cmd.h 2013-08-22 20:30:00.000000000 +0000 12136+++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/space_cmd.h 2013-08-22 20:30:00.000000000 +0000
12137@@ -0,0 +1,13 @@ 12137@@ -0,0 +1,13 @@
12138+#ifndef _VSERVER_SPACE_CMD_H 12138+#ifndef _VSERVER_SPACE_CMD_H
12139+#define _VSERVER_SPACE_CMD_H 12139+#define _VSERVER_SPACE_CMD_H
@@ -12148,9 +12148,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/space_cmd.h linux-3.10
12148+extern int vc_get_space_mask(void __user *, int); 12148+extern int vc_get_space_mask(void __user *, int);
12149+ 12149+
12150+#endif /* _VSERVER_SPACE_CMD_H */ 12150+#endif /* _VSERVER_SPACE_CMD_H */
12151diff -NurpP --minimal linux-3.10.19/include/linux/vserver/switch.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/switch.h 12151diff -NurpP --minimal linux-3.10.21/include/linux/vserver/switch.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/switch.h
12152--- linux-3.10.19/include/linux/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000 12152--- linux-3.10.21/include/linux/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000
12153+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/switch.h 2013-08-22 20:30:00.000000000 +0000 12153+++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/switch.h 2013-08-22 20:30:00.000000000 +0000
12154@@ -0,0 +1,8 @@ 12154@@ -0,0 +1,8 @@
12155+#ifndef _VSERVER_SWITCH_H 12155+#ifndef _VSERVER_SWITCH_H
12156+#define _VSERVER_SWITCH_H 12156+#define _VSERVER_SWITCH_H
@@ -12160,9 +12160,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/switch.h linux-3.10.19
12160+#include <uapi/vserver/switch.h> 12160+#include <uapi/vserver/switch.h>
12161+ 12161+
12162+#endif /* _VSERVER_SWITCH_H */ 12162+#endif /* _VSERVER_SWITCH_H */
12163diff -NurpP --minimal linux-3.10.19/include/linux/vserver/tag.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/tag.h 12163diff -NurpP --minimal linux-3.10.21/include/linux/vserver/tag.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/tag.h
12164--- linux-3.10.19/include/linux/vserver/tag.h 1970-01-01 00:00:00.000000000 +0000 12164--- linux-3.10.21/include/linux/vserver/tag.h 1970-01-01 00:00:00.000000000 +0000
12165+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/tag.h 2013-08-22 20:30:00.000000000 +0000 12165+++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/tag.h 2013-08-22 20:30:00.000000000 +0000
12166@@ -0,0 +1,160 @@ 12166@@ -0,0 +1,160 @@
12167+#ifndef _DX_TAG_H 12167+#ifndef _DX_TAG_H
12168+#define _DX_TAG_H 12168+#define _DX_TAG_H
@@ -12324,9 +12324,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/tag.h linux-3.10.19-vs
12324+#endif 12324+#endif
12325+ 12325+
12326+#endif /* _DX_TAG_H */ 12326+#endif /* _DX_TAG_H */
12327diff -NurpP --minimal linux-3.10.19/include/linux/vserver/tag_cmd.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/tag_cmd.h 12327diff -NurpP --minimal linux-3.10.21/include/linux/vserver/tag_cmd.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/tag_cmd.h
12328--- linux-3.10.19/include/linux/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000 12328--- linux-3.10.21/include/linux/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000
12329+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/tag_cmd.h 2013-08-22 20:30:00.000000000 +0000 12329+++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/tag_cmd.h 2013-08-22 20:30:00.000000000 +0000
12330@@ -0,0 +1,10 @@ 12330@@ -0,0 +1,10 @@
12331+#ifndef _VSERVER_TAG_CMD_H 12331+#ifndef _VSERVER_TAG_CMD_H
12332+#define _VSERVER_TAG_CMD_H 12332+#define _VSERVER_TAG_CMD_H
@@ -12338,9 +12338,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/tag_cmd.h linux-3.10.1
12338+extern int vc_tag_migrate(uint32_t); 12338+extern int vc_tag_migrate(uint32_t);
12339+ 12339+
12340+#endif /* _VSERVER_TAG_CMD_H */ 12340+#endif /* _VSERVER_TAG_CMD_H */
12341diff -NurpP --minimal linux-3.10.19/include/net/addrconf.h linux-3.10.19-vs2.3.6.8/include/net/addrconf.h 12341diff -NurpP --minimal linux-3.10.21/include/net/addrconf.h linux-3.10.21-vs2.3.6.8/include/net/addrconf.h
12342--- linux-3.10.19/include/net/addrconf.h 2013-11-13 17:21:14.000000000 +0000 12342--- linux-3.10.21/include/net/addrconf.h 2013-11-30 07:50:50.000000000 +0000
12343+++ linux-3.10.19-vs2.3.6.8/include/net/addrconf.h 2013-11-13 17:19:37.000000000 +0000 12343+++ linux-3.10.21-vs2.3.6.8/include/net/addrconf.h 2013-11-13 17:19:37.000000000 +0000
12344@@ -89,7 +89,8 @@ extern int ipv6_dev_get_saddr(struct n 12344@@ -89,7 +89,8 @@ extern int ipv6_dev_get_saddr(struct n
12345 const struct net_device *dev, 12345 const struct net_device *dev,
12346 const struct in6_addr *daddr, 12346 const struct in6_addr *daddr,
@@ -12351,9 +12351,9 @@ diff -NurpP --minimal linux-3.10.19/include/net/addrconf.h linux-3.10.19-vs2.3.6
12351 extern int __ipv6_get_lladdr(struct inet6_dev *idev, 12351 extern int __ipv6_get_lladdr(struct inet6_dev *idev,
12352 struct in6_addr *addr, 12352 struct in6_addr *addr,
12353 unsigned char banned_flags); 12353 unsigned char banned_flags);
12354diff -NurpP --minimal linux-3.10.19/include/net/af_unix.h linux-3.10.19-vs2.3.6.8/include/net/af_unix.h 12354diff -NurpP --minimal linux-3.10.21/include/net/af_unix.h linux-3.10.21-vs2.3.6.8/include/net/af_unix.h
12355--- linux-3.10.19/include/net/af_unix.h 2013-07-14 17:01:33.000000000 +0000 12355--- linux-3.10.21/include/net/af_unix.h 2013-07-14 17:01:33.000000000 +0000
12356+++ linux-3.10.19-vs2.3.6.8/include/net/af_unix.h 2013-08-22 20:30:00.000000000 +0000 12356+++ linux-3.10.21-vs2.3.6.8/include/net/af_unix.h 2013-08-22 20:30:00.000000000 +0000
12357@@ -4,6 +4,7 @@ 12357@@ -4,6 +4,7 @@
12358 #include <linux/socket.h> 12358 #include <linux/socket.h>
12359 #include <linux/un.h> 12359 #include <linux/un.h>
@@ -12362,9 +12362,9 @@ diff -NurpP --minimal linux-3.10.19/include/net/af_unix.h linux-3.10.19-vs2.3.6.
12362 #include <net/sock.h> 12362 #include <net/sock.h>
12363 12363
12364 extern void unix_inflight(struct file *fp); 12364 extern void unix_inflight(struct file *fp);
12365diff -NurpP --minimal linux-3.10.19/include/net/inet_timewait_sock.h linux-3.10.19-vs2.3.6.8/include/net/inet_timewait_sock.h 12365diff -NurpP --minimal linux-3.10.21/include/net/inet_timewait_sock.h linux-3.10.21-vs2.3.6.8/include/net/inet_timewait_sock.h
12366--- linux-3.10.19/include/net/inet_timewait_sock.h 2013-05-31 13:45:28.000000000 +0000 12366--- linux-3.10.21/include/net/inet_timewait_sock.h 2013-05-31 13:45:28.000000000 +0000
12367+++ linux-3.10.19-vs2.3.6.8/include/net/inet_timewait_sock.h 2013-08-22 20:30:00.000000000 +0000 12367+++ linux-3.10.21-vs2.3.6.8/include/net/inet_timewait_sock.h 2013-08-22 20:30:00.000000000 +0000
12368@@ -116,6 +116,10 @@ struct inet_timewait_sock { 12368@@ -116,6 +116,10 @@ struct inet_timewait_sock {
12369 #define tw_dport __tw_common.skc_dport 12369 #define tw_dport __tw_common.skc_dport
12370 #define tw_num __tw_common.skc_num 12370 #define tw_num __tw_common.skc_num
@@ -12376,9 +12376,9 @@ diff -NurpP --minimal linux-3.10.19/include/net/inet_timewait_sock.h linux-3.10.
12376 12376
12377 int tw_timeout; 12377 int tw_timeout;
12378 volatile unsigned char tw_substate; 12378 volatile unsigned char tw_substate;
12379diff -NurpP --minimal linux-3.10.19/include/net/ip6_route.h linux-3.10.19-vs2.3.6.8/include/net/ip6_route.h 12379diff -NurpP --minimal linux-3.10.21/include/net/ip6_route.h linux-3.10.21-vs2.3.6.8/include/net/ip6_route.h
12380--- linux-3.10.19/include/net/ip6_route.h 2013-11-13 17:21:14.000000000 +0000 12380--- linux-3.10.21/include/net/ip6_route.h 2013-11-30 07:50:50.000000000 +0000
12381+++ linux-3.10.19-vs2.3.6.8/include/net/ip6_route.h 2013-11-13 17:22:25.000000000 +0000 12381+++ linux-3.10.21-vs2.3.6.8/include/net/ip6_route.h 2013-11-13 17:22:25.000000000 +0000
12382@@ -95,7 +95,8 @@ extern int ip6_route_get_saddr(struct 12382@@ -95,7 +95,8 @@ extern int ip6_route_get_saddr(struct
12383 struct rt6_info *rt, 12383 struct rt6_info *rt,
12384 const struct in6_addr *daddr, 12384 const struct in6_addr *daddr,
@@ -12389,9 +12389,9 @@ diff -NurpP --minimal linux-3.10.19/include/net/ip6_route.h linux-3.10.19-vs2.3.
12389 12389
12390 extern struct rt6_info *rt6_lookup(struct net *net, 12390 extern struct rt6_info *rt6_lookup(struct net *net,
12391 const struct in6_addr *daddr, 12391 const struct in6_addr *daddr,
12392diff -NurpP --minimal linux-3.10.19/include/net/route.h linux-3.10.19-vs2.3.6.8/include/net/route.h 12392diff -NurpP --minimal linux-3.10.21/include/net/route.h linux-3.10.21-vs2.3.6.8/include/net/route.h
12393--- linux-3.10.19/include/net/route.h 2013-02-19 13:58:52.000000000 +0000 12393--- linux-3.10.21/include/net/route.h 2013-02-19 13:58:52.000000000 +0000
12394+++ linux-3.10.19-vs2.3.6.8/include/net/route.h 2013-08-22 20:30:00.000000000 +0000 12394+++ linux-3.10.21-vs2.3.6.8/include/net/route.h 2013-08-22 20:30:00.000000000 +0000
12395@@ -207,6 +207,9 @@ static inline void ip_rt_put(struct rtab 12395@@ -207,6 +207,9 @@ static inline void ip_rt_put(struct rtab
12396 dst_release(&rt->dst); 12396 dst_release(&rt->dst);
12397 } 12397 }
@@ -12439,9 +12439,9 @@ diff -NurpP --minimal linux-3.10.19/include/net/route.h linux-3.10.19-vs2.3.6.8/
12439 rt = __ip_route_output_key(net, fl4); 12439 rt = __ip_route_output_key(net, fl4);
12440 if (IS_ERR(rt)) 12440 if (IS_ERR(rt))
12441 return rt; 12441 return rt;
12442diff -NurpP --minimal linux-3.10.19/include/net/sock.h linux-3.10.19-vs2.3.6.8/include/net/sock.h 12442diff -NurpP --minimal linux-3.10.21/include/net/sock.h linux-3.10.21-vs2.3.6.8/include/net/sock.h
12443--- linux-3.10.19/include/net/sock.h 2013-11-13 17:21:14.000000000 +0000 12443--- linux-3.10.21/include/net/sock.h 2013-11-30 07:50:50.000000000 +0000
12444+++ linux-3.10.19-vs2.3.6.8/include/net/sock.h 2013-11-13 17:22:25.000000000 +0000 12444+++ linux-3.10.21-vs2.3.6.8/include/net/sock.h 2013-11-13 17:22:25.000000000 +0000
12445@@ -191,6 +191,10 @@ struct sock_common { 12445@@ -191,6 +191,10 @@ struct sock_common {
12446 #ifdef CONFIG_NET_NS 12446 #ifdef CONFIG_NET_NS
12447 struct net *skc_net; 12447 struct net *skc_net;
@@ -12464,17 +12464,17 @@ diff -NurpP --minimal linux-3.10.19/include/net/sock.h linux-3.10.19-vs2.3.6.8/i
12464 socket_lock_t sk_lock; 12464 socket_lock_t sk_lock;
12465 struct sk_buff_head sk_receive_queue; 12465 struct sk_buff_head sk_receive_queue;
12466 /* 12466 /*
12467diff -NurpP --minimal linux-3.10.19/include/uapi/Kbuild linux-3.10.19-vs2.3.6.8/include/uapi/Kbuild 12467diff -NurpP --minimal linux-3.10.21/include/uapi/Kbuild linux-3.10.21-vs2.3.6.8/include/uapi/Kbuild
12468--- linux-3.10.19/include/uapi/Kbuild 2012-12-11 03:30:57.000000000 +0000 12468--- linux-3.10.21/include/uapi/Kbuild 2012-12-11 03:30:57.000000000 +0000
12469+++ linux-3.10.19-vs2.3.6.8/include/uapi/Kbuild 2013-08-22 20:30:00.000000000 +0000 12469+++ linux-3.10.21-vs2.3.6.8/include/uapi/Kbuild 2013-08-22 20:30:00.000000000 +0000
12470@@ -12,3 +12,4 @@ header-y += video/ 12470@@ -12,3 +12,4 @@ header-y += video/
12471 header-y += drm/ 12471 header-y += drm/
12472 header-y += xen/ 12472 header-y += xen/
12473 header-y += scsi/ 12473 header-y += scsi/
12474+header-y += vserver/ 12474+header-y += vserver/
12475diff -NurpP --minimal linux-3.10.19/include/uapi/linux/capability.h linux-3.10.19-vs2.3.6.8/include/uapi/linux/capability.h 12475diff -NurpP --minimal linux-3.10.21/include/uapi/linux/capability.h linux-3.10.21-vs2.3.6.8/include/uapi/linux/capability.h
12476--- linux-3.10.19/include/uapi/linux/capability.h 2012-12-11 03:30:57.000000000 +0000 12476--- linux-3.10.21/include/uapi/linux/capability.h 2012-12-11 03:30:57.000000000 +0000
12477+++ linux-3.10.19-vs2.3.6.8/include/uapi/linux/capability.h 2013-08-22 20:30:00.000000000 +0000 12477+++ linux-3.10.21-vs2.3.6.8/include/uapi/linux/capability.h 2013-08-22 20:30:00.000000000 +0000
12478@@ -259,6 +259,7 @@ struct vfs_cap_data { 12478@@ -259,6 +259,7 @@ struct vfs_cap_data {
12479 arbitrary SCSI commands */ 12479 arbitrary SCSI commands */
12480 /* Allow setting encryption key on loopback filesystem */ 12480 /* Allow setting encryption key on loopback filesystem */
@@ -12497,9 +12497,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/linux/capability.h linux-3.10.1
12497 12497
12498 /* 12498 /*
12499 * Bit location of each capability (used by user-space library and kernel) 12499 * Bit location of each capability (used by user-space library and kernel)
12500diff -NurpP --minimal linux-3.10.19/include/uapi/linux/fs.h linux-3.10.19-vs2.3.6.8/include/uapi/linux/fs.h 12500diff -NurpP --minimal linux-3.10.21/include/uapi/linux/fs.h linux-3.10.21-vs2.3.6.8/include/uapi/linux/fs.h
12501--- linux-3.10.19/include/uapi/linux/fs.h 2013-07-14 17:01:34.000000000 +0000 12501--- linux-3.10.21/include/uapi/linux/fs.h 2013-07-14 17:01:34.000000000 +0000
12502+++ linux-3.10.19-vs2.3.6.8/include/uapi/linux/fs.h 2013-08-22 20:30:00.000000000 +0000 12502+++ linux-3.10.21-vs2.3.6.8/include/uapi/linux/fs.h 2013-08-22 20:30:00.000000000 +0000
12503@@ -86,6 +86,9 @@ struct inodes_stat_t { 12503@@ -86,6 +86,9 @@ struct inodes_stat_t {
12504 #define MS_KERNMOUNT (1<<22) /* this is a kern_mount call */ 12504 #define MS_KERNMOUNT (1<<22) /* this is a kern_mount call */
12505 #define MS_I_VERSION (1<<23) /* Update inode I_version field */ 12505 #define MS_I_VERSION (1<<23) /* Update inode I_version field */
@@ -12527,9 +12527,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/linux/fs.h linux-3.10.19-vs2.3.
12527 12527
12528 #define SYNC_FILE_RANGE_WAIT_BEFORE 1 12528 #define SYNC_FILE_RANGE_WAIT_BEFORE 1
12529 #define SYNC_FILE_RANGE_WRITE 2 12529 #define SYNC_FILE_RANGE_WRITE 2
12530diff -NurpP --minimal linux-3.10.19/include/uapi/linux/gfs2_ondisk.h linux-3.10.19-vs2.3.6.8/include/uapi/linux/gfs2_ondisk.h 12530diff -NurpP --minimal linux-3.10.21/include/uapi/linux/gfs2_ondisk.h linux-3.10.21-vs2.3.6.8/include/uapi/linux/gfs2_ondisk.h
12531--- linux-3.10.19/include/uapi/linux/gfs2_ondisk.h 2012-12-11 03:30:57.000000000 +0000 12531--- linux-3.10.21/include/uapi/linux/gfs2_ondisk.h 2012-12-11 03:30:57.000000000 +0000
12532+++ linux-3.10.19-vs2.3.6.8/include/uapi/linux/gfs2_ondisk.h 2013-08-22 20:30:00.000000000 +0000 12532+++ linux-3.10.21-vs2.3.6.8/include/uapi/linux/gfs2_ondisk.h 2013-08-22 20:30:00.000000000 +0000
12533@@ -225,6 +225,9 @@ enum { 12533@@ -225,6 +225,9 @@ enum {
12534 gfs2fl_Sync = 8, 12534 gfs2fl_Sync = 8,
12535 gfs2fl_System = 9, 12535 gfs2fl_System = 9,
@@ -12550,9 +12550,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/linux/gfs2_ondisk.h linux-3.10.
12550 #define GFS2_DIF_TRUNC_IN_PROG 0x20000000 /* New in gfs2 */ 12550 #define GFS2_DIF_TRUNC_IN_PROG 0x20000000 /* New in gfs2 */
12551 #define GFS2_DIF_INHERIT_DIRECTIO 0x40000000 /* only in gfs1 */ 12551 #define GFS2_DIF_INHERIT_DIRECTIO 0x40000000 /* only in gfs1 */
12552 #define GFS2_DIF_INHERIT_JDATA 0x80000000 12552 #define GFS2_DIF_INHERIT_JDATA 0x80000000
12553diff -NurpP --minimal linux-3.10.19/include/uapi/linux/if_tun.h linux-3.10.19-vs2.3.6.8/include/uapi/linux/if_tun.h 12553diff -NurpP --minimal linux-3.10.21/include/uapi/linux/if_tun.h linux-3.10.21-vs2.3.6.8/include/uapi/linux/if_tun.h
12554--- linux-3.10.19/include/uapi/linux/if_tun.h 2013-02-19 13:58:55.000000000 +0000 12554--- linux-3.10.21/include/uapi/linux/if_tun.h 2013-02-19 13:58:55.000000000 +0000
12555+++ linux-3.10.19-vs2.3.6.8/include/uapi/linux/if_tun.h 2013-08-22 20:30:00.000000000 +0000 12555+++ linux-3.10.21-vs2.3.6.8/include/uapi/linux/if_tun.h 2013-08-22 20:30:00.000000000 +0000
12556@@ -56,6 +56,7 @@ 12556@@ -56,6 +56,7 @@
12557 #define TUNGETVNETHDRSZ _IOR('T', 215, int) 12557 #define TUNGETVNETHDRSZ _IOR('T', 215, int)
12558 #define TUNSETVNETHDRSZ _IOW('T', 216, int) 12558 #define TUNSETVNETHDRSZ _IOW('T', 216, int)
@@ -12561,9 +12561,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/linux/if_tun.h linux-3.10.19-vs
12561 12561
12562 /* TUNSETIFF ifr flags */ 12562 /* TUNSETIFF ifr flags */
12563 #define IFF_TUN 0x0001 12563 #define IFF_TUN 0x0001
12564diff -NurpP --minimal linux-3.10.19/include/uapi/linux/major.h linux-3.10.19-vs2.3.6.8/include/uapi/linux/major.h 12564diff -NurpP --minimal linux-3.10.21/include/uapi/linux/major.h linux-3.10.21-vs2.3.6.8/include/uapi/linux/major.h
12565--- linux-3.10.19/include/uapi/linux/major.h 2012-12-11 03:30:57.000000000 +0000 12565--- linux-3.10.21/include/uapi/linux/major.h 2012-12-11 03:30:57.000000000 +0000
12566+++ linux-3.10.19-vs2.3.6.8/include/uapi/linux/major.h 2013-08-22 20:30:00.000000000 +0000 12566+++ linux-3.10.21-vs2.3.6.8/include/uapi/linux/major.h 2013-08-22 20:30:00.000000000 +0000
12567@@ -15,6 +15,7 @@ 12567@@ -15,6 +15,7 @@
12568 #define HD_MAJOR IDE0_MAJOR 12568 #define HD_MAJOR IDE0_MAJOR
12569 #define PTY_SLAVE_MAJOR 3 12569 #define PTY_SLAVE_MAJOR 3
@@ -12572,9 +12572,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/linux/major.h linux-3.10.19-vs2
12572 #define TTYAUX_MAJOR 5 12572 #define TTYAUX_MAJOR 5
12573 #define LP_MAJOR 6 12573 #define LP_MAJOR 6
12574 #define VCS_MAJOR 7 12574 #define VCS_MAJOR 7
12575diff -NurpP --minimal linux-3.10.19/include/uapi/linux/nfs_mount.h linux-3.10.19-vs2.3.6.8/include/uapi/linux/nfs_mount.h 12575diff -NurpP --minimal linux-3.10.21/include/uapi/linux/nfs_mount.h linux-3.10.21-vs2.3.6.8/include/uapi/linux/nfs_mount.h
12576--- linux-3.10.19/include/uapi/linux/nfs_mount.h 2012-12-11 03:30:57.000000000 +0000 12576--- linux-3.10.21/include/uapi/linux/nfs_mount.h 2012-12-11 03:30:57.000000000 +0000
12577+++ linux-3.10.19-vs2.3.6.8/include/uapi/linux/nfs_mount.h 2013-08-22 20:30:00.000000000 +0000 12577+++ linux-3.10.21-vs2.3.6.8/include/uapi/linux/nfs_mount.h 2013-08-22 20:30:00.000000000 +0000
12578@@ -63,7 +63,8 @@ struct nfs_mount_data { 12578@@ -63,7 +63,8 @@ struct nfs_mount_data {
12579 #define NFS_MOUNT_SECFLAVOUR 0x2000 /* 5 */ 12579 #define NFS_MOUNT_SECFLAVOUR 0x2000 /* 5 */
12580 #define NFS_MOUNT_NORDIRPLUS 0x4000 /* 5 */ 12580 #define NFS_MOUNT_NORDIRPLUS 0x4000 /* 5 */
@@ -12585,9 +12585,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/linux/nfs_mount.h linux-3.10.19
12585 12585
12586 /* The following are for internal use only */ 12586 /* The following are for internal use only */
12587 #define NFS_MOUNT_LOOKUP_CACHE_NONEG 0x10000 12587 #define NFS_MOUNT_LOOKUP_CACHE_NONEG 0x10000
12588diff -NurpP --minimal linux-3.10.19/include/uapi/linux/reboot.h linux-3.10.19-vs2.3.6.8/include/uapi/linux/reboot.h 12588diff -NurpP --minimal linux-3.10.21/include/uapi/linux/reboot.h linux-3.10.21-vs2.3.6.8/include/uapi/linux/reboot.h
12589--- linux-3.10.19/include/uapi/linux/reboot.h 2012-12-11 03:30:57.000000000 +0000 12589--- linux-3.10.21/include/uapi/linux/reboot.h 2012-12-11 03:30:57.000000000 +0000
12590+++ linux-3.10.19-vs2.3.6.8/include/uapi/linux/reboot.h 2013-08-22 20:30:00.000000000 +0000 12590+++ linux-3.10.21-vs2.3.6.8/include/uapi/linux/reboot.h 2013-08-22 20:30:00.000000000 +0000
12591@@ -33,7 +33,7 @@ 12591@@ -33,7 +33,7 @@
12592 #define LINUX_REBOOT_CMD_RESTART2 0xA1B2C3D4 12592 #define LINUX_REBOOT_CMD_RESTART2 0xA1B2C3D4
12593 #define LINUX_REBOOT_CMD_SW_SUSPEND 0xD000FCE2 12593 #define LINUX_REBOOT_CMD_SW_SUSPEND 0xD000FCE2
@@ -12597,9 +12597,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/linux/reboot.h linux-3.10.19-vs
12597 12597
12598 12598
12599 #endif /* _UAPI_LINUX_REBOOT_H */ 12599 #endif /* _UAPI_LINUX_REBOOT_H */
12600diff -NurpP --minimal linux-3.10.19/include/uapi/linux/sysctl.h linux-3.10.19-vs2.3.6.8/include/uapi/linux/sysctl.h 12600diff -NurpP --minimal linux-3.10.21/include/uapi/linux/sysctl.h linux-3.10.21-vs2.3.6.8/include/uapi/linux/sysctl.h
12601--- linux-3.10.19/include/uapi/linux/sysctl.h 2012-12-11 03:30:57.000000000 +0000 12601--- linux-3.10.21/include/uapi/linux/sysctl.h 2012-12-11 03:30:57.000000000 +0000
12602+++ linux-3.10.19-vs2.3.6.8/include/uapi/linux/sysctl.h 2013-08-22 20:30:00.000000000 +0000 12602+++ linux-3.10.21-vs2.3.6.8/include/uapi/linux/sysctl.h 2013-08-22 20:30:00.000000000 +0000
12603@@ -60,6 +60,7 @@ enum 12603@@ -60,6 +60,7 @@ enum
12604 CTL_ABI=9, /* Binary emulation */ 12604 CTL_ABI=9, /* Binary emulation */
12605 CTL_CPU=10, /* CPU stuff (speed scaling, etc) */ 12605 CTL_CPU=10, /* CPU stuff (speed scaling, etc) */
@@ -12616,9 +12616,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/linux/sysctl.h linux-3.10.19-vs
12616 12616
12617 KERN_SPARC_REBOOT=21, /* reboot command on Sparc */ 12617 KERN_SPARC_REBOOT=21, /* reboot command on Sparc */
12618 KERN_CTLALTDEL=22, /* int: allow ctl-alt-del to reboot */ 12618 KERN_CTLALTDEL=22, /* int: allow ctl-alt-del to reboot */
12619diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/Kbuild linux-3.10.19-vs2.3.6.8/include/uapi/vserver/Kbuild 12619diff -NurpP --minimal linux-3.10.21/include/uapi/vserver/Kbuild linux-3.10.21-vs2.3.6.8/include/uapi/vserver/Kbuild
12620--- linux-3.10.19/include/uapi/vserver/Kbuild 1970-01-01 00:00:00.000000000 +0000 12620--- linux-3.10.21/include/uapi/vserver/Kbuild 1970-01-01 00:00:00.000000000 +0000
12621+++ linux-3.10.19-vs2.3.6.8/include/uapi/vserver/Kbuild 2013-08-22 20:30:00.000000000 +0000 12621+++ linux-3.10.21-vs2.3.6.8/include/uapi/vserver/Kbuild 2013-08-22 20:30:00.000000000 +0000
12622@@ -0,0 +1,9 @@ 12622@@ -0,0 +1,9 @@
12623+ 12623+
12624+header-y += context_cmd.h network_cmd.h space_cmd.h \ 12624+header-y += context_cmd.h network_cmd.h space_cmd.h \
@@ -12629,9 +12629,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/Kbuild linux-3.10.19-vs
12629+header-y += switch.h context.h network.h monitor.h \ 12629+header-y += switch.h context.h network.h monitor.h \
12630+ limit.h inode.h device.h 12630+ limit.h inode.h device.h
12631+ 12631+
12632diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/cacct_cmd.h linux-3.10.19-vs2.3.6.8/include/uapi/vserver/cacct_cmd.h 12632diff -NurpP --minimal linux-3.10.21/include/uapi/vserver/cacct_cmd.h linux-3.10.21-vs2.3.6.8/include/uapi/vserver/cacct_cmd.h
12633--- linux-3.10.19/include/uapi/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000 12633--- linux-3.10.21/include/uapi/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
12634+++ linux-3.10.19-vs2.3.6.8/include/uapi/vserver/cacct_cmd.h 2013-08-22 20:30:00.000000000 +0000 12634+++ linux-3.10.21-vs2.3.6.8/include/uapi/vserver/cacct_cmd.h 2013-08-22 20:30:00.000000000 +0000
12635@@ -0,0 +1,15 @@ 12635@@ -0,0 +1,15 @@
12636+#ifndef _UAPI_VS_CACCT_CMD_H 12636+#ifndef _UAPI_VS_CACCT_CMD_H
12637+#define _UAPI_VS_CACCT_CMD_H 12637+#define _UAPI_VS_CACCT_CMD_H
@@ -12648,9 +12648,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/cacct_cmd.h linux-3.10.
12648+}; 12648+};
12649+ 12649+
12650+#endif /* _UAPI_VS_CACCT_CMD_H */ 12650+#endif /* _UAPI_VS_CACCT_CMD_H */
12651diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/context.h linux-3.10.19-vs2.3.6.8/include/uapi/vserver/context.h 12651diff -NurpP --minimal linux-3.10.21/include/uapi/vserver/context.h linux-3.10.21-vs2.3.6.8/include/uapi/vserver/context.h
12652--- linux-3.10.19/include/uapi/vserver/context.h 1970-01-01 00:00:00.000000000 +0000 12652--- linux-3.10.21/include/uapi/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
12653+++ linux-3.10.19-vs2.3.6.8/include/uapi/vserver/context.h 2013-10-27 03:43:35.000000000 +0000 12653+++ linux-3.10.21-vs2.3.6.8/include/uapi/vserver/context.h 2013-10-27 03:43:35.000000000 +0000
12654@@ -0,0 +1,81 @@ 12654@@ -0,0 +1,81 @@
12655+#ifndef _UAPI_VS_CONTEXT_H 12655+#ifndef _UAPI_VS_CONTEXT_H
12656+#define _UAPI_VS_CONTEXT_H 12656+#define _UAPI_VS_CONTEXT_H
@@ -12733,9 +12733,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/context.h linux-3.10.19
12733+#define VXC_NAMESPACE 0x02000000 12733+#define VXC_NAMESPACE 0x02000000
12734+ 12734+
12735+#endif /* _UAPI_VS_CONTEXT_H */ 12735+#endif /* _UAPI_VS_CONTEXT_H */
12736diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/context_cmd.h linux-3.10.19-vs2.3.6.8/include/uapi/vserver/context_cmd.h 12736diff -NurpP --minimal linux-3.10.21/include/uapi/vserver/context_cmd.h linux-3.10.21-vs2.3.6.8/include/uapi/vserver/context_cmd.h
12737--- linux-3.10.19/include/uapi/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000 12737--- linux-3.10.21/include/uapi/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
12738+++ linux-3.10.19-vs2.3.6.8/include/uapi/vserver/context_cmd.h 2013-08-22 20:30:00.000000000 +0000 12738+++ linux-3.10.21-vs2.3.6.8/include/uapi/vserver/context_cmd.h 2013-08-22 20:30:00.000000000 +0000
12739@@ -0,0 +1,115 @@ 12739@@ -0,0 +1,115 @@
12740+#ifndef _UAPI_VS_CONTEXT_CMD_H 12740+#ifndef _UAPI_VS_CONTEXT_CMD_H
12741+#define _UAPI_VS_CONTEXT_CMD_H 12741+#define _UAPI_VS_CONTEXT_CMD_H
@@ -12852,9 +12852,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/context_cmd.h linux-3.1
12852+}; 12852+};
12853+ 12853+
12854+#endif /* _UAPI_VS_CONTEXT_CMD_H */ 12854+#endif /* _UAPI_VS_CONTEXT_CMD_H */
12855diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/cvirt_cmd.h linux-3.10.19-vs2.3.6.8/include/uapi/vserver/cvirt_cmd.h 12855diff -NurpP --minimal linux-3.10.21/include/uapi/vserver/cvirt_cmd.h linux-3.10.21-vs2.3.6.8/include/uapi/vserver/cvirt_cmd.h
12856--- linux-3.10.19/include/uapi/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000 12856--- linux-3.10.21/include/uapi/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
12857+++ linux-3.10.19-vs2.3.6.8/include/uapi/vserver/cvirt_cmd.h 2013-08-22 20:30:00.000000000 +0000 12857+++ linux-3.10.21-vs2.3.6.8/include/uapi/vserver/cvirt_cmd.h 2013-08-22 20:30:00.000000000 +0000
12858@@ -0,0 +1,41 @@ 12858@@ -0,0 +1,41 @@
12859+#ifndef _UAPI_VS_CVIRT_CMD_H 12859+#ifndef _UAPI_VS_CVIRT_CMD_H
12860+#define _UAPI_VS_CVIRT_CMD_H 12860+#define _UAPI_VS_CVIRT_CMD_H
@@ -12897,9 +12897,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/cvirt_cmd.h linux-3.10.
12897+}; 12897+};
12898+ 12898+
12899+#endif /* _UAPI_VS_CVIRT_CMD_H */ 12899+#endif /* _UAPI_VS_CVIRT_CMD_H */
12900diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/debug_cmd.h linux-3.10.19-vs2.3.6.8/include/uapi/vserver/debug_cmd.h 12900diff -NurpP --minimal linux-3.10.21/include/uapi/vserver/debug_cmd.h linux-3.10.21-vs2.3.6.8/include/uapi/vserver/debug_cmd.h
12901--- linux-3.10.19/include/uapi/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000 12901--- linux-3.10.21/include/uapi/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
12902+++ linux-3.10.19-vs2.3.6.8/include/uapi/vserver/debug_cmd.h 2013-08-22 20:30:00.000000000 +0000 12902+++ linux-3.10.21-vs2.3.6.8/include/uapi/vserver/debug_cmd.h 2013-08-22 20:30:00.000000000 +0000
12903@@ -0,0 +1,24 @@ 12903@@ -0,0 +1,24 @@
12904+#ifndef _UAPI_VS_DEBUG_CMD_H 12904+#ifndef _UAPI_VS_DEBUG_CMD_H
12905+#define _UAPI_VS_DEBUG_CMD_H 12905+#define _UAPI_VS_DEBUG_CMD_H
@@ -12925,9 +12925,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/debug_cmd.h linux-3.10.
12925+}; 12925+};
12926+ 12926+
12927+#endif /* _UAPI_VS_DEBUG_CMD_H */ 12927+#endif /* _UAPI_VS_DEBUG_CMD_H */
12928diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/device.h linux-3.10.19-vs2.3.6.8/include/uapi/vserver/device.h 12928diff -NurpP --minimal linux-3.10.21/include/uapi/vserver/device.h linux-3.10.21-vs2.3.6.8/include/uapi/vserver/device.h
12929--- linux-3.10.19/include/uapi/vserver/device.h 1970-01-01 00:00:00.000000000 +0000 12929--- linux-3.10.21/include/uapi/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
12930+++ linux-3.10.19-vs2.3.6.8/include/uapi/vserver/device.h 2013-08-22 20:30:00.000000000 +0000 12930+++ linux-3.10.21-vs2.3.6.8/include/uapi/vserver/device.h 2013-08-22 20:30:00.000000000 +0000
12931@@ -0,0 +1,12 @@ 12931@@ -0,0 +1,12 @@
12932+#ifndef _UAPI_VS_DEVICE_H 12932+#ifndef _UAPI_VS_DEVICE_H
12933+#define _UAPI_VS_DEVICE_H 12933+#define _UAPI_VS_DEVICE_H
@@ -12941,9 +12941,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/device.h linux-3.10.19-
12941+#define DATTR_MASK 0x00000013 12941+#define DATTR_MASK 0x00000013
12942+ 12942+
12943+#endif /* _UAPI_VS_DEVICE_H */ 12943+#endif /* _UAPI_VS_DEVICE_H */
12944diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/device_cmd.h linux-3.10.19-vs2.3.6.8/include/uapi/vserver/device_cmd.h 12944diff -NurpP --minimal linux-3.10.21/include/uapi/vserver/device_cmd.h linux-3.10.21-vs2.3.6.8/include/uapi/vserver/device_cmd.h
12945--- linux-3.10.19/include/uapi/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000 12945--- linux-3.10.21/include/uapi/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000
12946+++ linux-3.10.19-vs2.3.6.8/include/uapi/vserver/device_cmd.h 2013-08-22 20:30:00.000000000 +0000 12946+++ linux-3.10.21-vs2.3.6.8/include/uapi/vserver/device_cmd.h 2013-08-22 20:30:00.000000000 +0000
12947@@ -0,0 +1,16 @@ 12947@@ -0,0 +1,16 @@
12948+#ifndef _UAPI_VS_DEVICE_CMD_H 12948+#ifndef _UAPI_VS_DEVICE_CMD_H
12949+#define _UAPI_VS_DEVICE_CMD_H 12949+#define _UAPI_VS_DEVICE_CMD_H
@@ -12961,9 +12961,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/device_cmd.h linux-3.10
12961+}; 12961+};
12962+ 12962+
12963+#endif /* _UAPI_VS_DEVICE_CMD_H */ 12963+#endif /* _UAPI_VS_DEVICE_CMD_H */
12964diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/dlimit_cmd.h linux-3.10.19-vs2.3.6.8/include/uapi/vserver/dlimit_cmd.h 12964diff -NurpP --minimal linux-3.10.21/include/uapi/vserver/dlimit_cmd.h linux-3.10.21-vs2.3.6.8/include/uapi/vserver/dlimit_cmd.h
12965--- linux-3.10.19/include/uapi/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000 12965--- linux-3.10.21/include/uapi/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000
12966+++ linux-3.10.19-vs2.3.6.8/include/uapi/vserver/dlimit_cmd.h 2013-08-22 20:30:00.000000000 +0000 12966+++ linux-3.10.21-vs2.3.6.8/include/uapi/vserver/dlimit_cmd.h 2013-08-22 20:30:00.000000000 +0000
12967@@ -0,0 +1,67 @@ 12967@@ -0,0 +1,67 @@
12968+#ifndef _UAPI_VS_DLIMIT_CMD_H 12968+#ifndef _UAPI_VS_DLIMIT_CMD_H
12969+#define _UAPI_VS_DLIMIT_CMD_H 12969+#define _UAPI_VS_DLIMIT_CMD_H
@@ -13032,9 +13032,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/dlimit_cmd.h linux-3.10
13032+} 13032+}
13033+ 13033+
13034+#endif /* _UAPI_VS_DLIMIT_CMD_H */ 13034+#endif /* _UAPI_VS_DLIMIT_CMD_H */
13035diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/inode.h linux-3.10.19-vs2.3.6.8/include/uapi/vserver/inode.h 13035diff -NurpP --minimal linux-3.10.21/include/uapi/vserver/inode.h linux-3.10.21-vs2.3.6.8/include/uapi/vserver/inode.h
13036--- linux-3.10.19/include/uapi/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000 13036--- linux-3.10.21/include/uapi/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
13037+++ linux-3.10.19-vs2.3.6.8/include/uapi/vserver/inode.h 2013-08-22 20:30:00.000000000 +0000 13037+++ linux-3.10.21-vs2.3.6.8/include/uapi/vserver/inode.h 2013-08-22 20:30:00.000000000 +0000
13038@@ -0,0 +1,23 @@ 13038@@ -0,0 +1,23 @@
13039+#ifndef _UAPI_VS_INODE_H 13039+#ifndef _UAPI_VS_INODE_H
13040+#define _UAPI_VS_INODE_H 13040+#define _UAPI_VS_INODE_H
@@ -13059,9 +13059,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/inode.h linux-3.10.19-v
13059+#define FIOC_SETXFLG _IOW('x', 6, long) 13059+#define FIOC_SETXFLG _IOW('x', 6, long)
13060+ 13060+
13061+#endif /* _UAPI_VS_INODE_H */ 13061+#endif /* _UAPI_VS_INODE_H */
13062diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/inode_cmd.h linux-3.10.19-vs2.3.6.8/include/uapi/vserver/inode_cmd.h 13062diff -NurpP --minimal linux-3.10.21/include/uapi/vserver/inode_cmd.h linux-3.10.21-vs2.3.6.8/include/uapi/vserver/inode_cmd.h
13063--- linux-3.10.19/include/uapi/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000 13063--- linux-3.10.21/include/uapi/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000
13064+++ linux-3.10.19-vs2.3.6.8/include/uapi/vserver/inode_cmd.h 2013-08-22 20:30:00.000000000 +0000 13064+++ linux-3.10.21-vs2.3.6.8/include/uapi/vserver/inode_cmd.h 2013-08-22 20:30:00.000000000 +0000
13065@@ -0,0 +1,26 @@ 13065@@ -0,0 +1,26 @@
13066+#ifndef _UAPI_VS_INODE_CMD_H 13066+#ifndef _UAPI_VS_INODE_CMD_H
13067+#define _UAPI_VS_INODE_CMD_H 13067+#define _UAPI_VS_INODE_CMD_H
@@ -13089,9 +13089,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/inode_cmd.h linux-3.10.
13089+}; 13089+};
13090+ 13090+
13091+#endif /* _UAPI_VS_INODE_CMD_H */ 13091+#endif /* _UAPI_VS_INODE_CMD_H */
13092diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/limit.h linux-3.10.19-vs2.3.6.8/include/uapi/vserver/limit.h 13092diff -NurpP --minimal linux-3.10.21/include/uapi/vserver/limit.h linux-3.10.21-vs2.3.6.8/include/uapi/vserver/limit.h
13093--- linux-3.10.19/include/uapi/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000 13093--- linux-3.10.21/include/uapi/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000
13094+++ linux-3.10.19-vs2.3.6.8/include/uapi/vserver/limit.h 2013-08-22 20:30:00.000000000 +0000 13094+++ linux-3.10.21-vs2.3.6.8/include/uapi/vserver/limit.h 2013-08-22 20:30:00.000000000 +0000
13095@@ -0,0 +1,14 @@ 13095@@ -0,0 +1,14 @@
13096+#ifndef _UAPI_VS_LIMIT_H 13096+#ifndef _UAPI_VS_LIMIT_H
13097+#define _UAPI_VS_LIMIT_H 13097+#define _UAPI_VS_LIMIT_H
@@ -13107,9 +13107,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/limit.h linux-3.10.19-v
13107+#define VLIMIT_MAPPED 23 13107+#define VLIMIT_MAPPED 23
13108+ 13108+
13109+#endif /* _UAPI_VS_LIMIT_H */ 13109+#endif /* _UAPI_VS_LIMIT_H */
13110diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/limit_cmd.h linux-3.10.19-vs2.3.6.8/include/uapi/vserver/limit_cmd.h 13110diff -NurpP --minimal linux-3.10.21/include/uapi/vserver/limit_cmd.h linux-3.10.21-vs2.3.6.8/include/uapi/vserver/limit_cmd.h
13111--- linux-3.10.19/include/uapi/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000 13111--- linux-3.10.21/include/uapi/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000
13112+++ linux-3.10.19-vs2.3.6.8/include/uapi/vserver/limit_cmd.h 2013-08-22 20:30:00.000000000 +0000 13112+++ linux-3.10.21-vs2.3.6.8/include/uapi/vserver/limit_cmd.h 2013-08-22 20:30:00.000000000 +0000
13113@@ -0,0 +1,40 @@ 13113@@ -0,0 +1,40 @@
13114+#ifndef _UAPI_VS_LIMIT_CMD_H 13114+#ifndef _UAPI_VS_LIMIT_CMD_H
13115+#define _UAPI_VS_LIMIT_CMD_H 13115+#define _UAPI_VS_LIMIT_CMD_H
@@ -13151,9 +13151,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/limit_cmd.h linux-3.10.
13151+#define CRLIM_KEEP (~1ULL) 13151+#define CRLIM_KEEP (~1ULL)
13152+ 13152+
13153+#endif /* _UAPI_VS_LIMIT_CMD_H */ 13153+#endif /* _UAPI_VS_LIMIT_CMD_H */
13154diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/monitor.h linux-3.10.19-vs2.3.6.8/include/uapi/vserver/monitor.h 13154diff -NurpP --minimal linux-3.10.21/include/uapi/vserver/monitor.h linux-3.10.21-vs2.3.6.8/include/uapi/vserver/monitor.h
13155--- linux-3.10.19/include/uapi/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000 13155--- linux-3.10.21/include/uapi/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000
13156+++ linux-3.10.19-vs2.3.6.8/include/uapi/vserver/monitor.h 2013-08-22 20:30:00.000000000 +0000 13156+++ linux-3.10.21-vs2.3.6.8/include/uapi/vserver/monitor.h 2013-08-22 20:30:00.000000000 +0000
13157@@ -0,0 +1,96 @@ 13157@@ -0,0 +1,96 @@
13158+#ifndef _UAPI_VS_MONITOR_H 13158+#ifndef _UAPI_VS_MONITOR_H
13159+#define _UAPI_VS_MONITOR_H 13159+#define _UAPI_VS_MONITOR_H
@@ -13251,9 +13251,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/monitor.h linux-3.10.19
13251+}; 13251+};
13252+ 13252+
13253+#endif /* _UAPI_VS_MONITOR_H */ 13253+#endif /* _UAPI_VS_MONITOR_H */
13254diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/network.h linux-3.10.19-vs2.3.6.8/include/uapi/vserver/network.h 13254diff -NurpP --minimal linux-3.10.21/include/uapi/vserver/network.h linux-3.10.21-vs2.3.6.8/include/uapi/vserver/network.h
13255--- linux-3.10.19/include/uapi/vserver/network.h 1970-01-01 00:00:00.000000000 +0000 13255--- linux-3.10.21/include/uapi/vserver/network.h 1970-01-01 00:00:00.000000000 +0000
13256+++ linux-3.10.19-vs2.3.6.8/include/uapi/vserver/network.h 2013-08-22 20:30:00.000000000 +0000 13256+++ linux-3.10.21-vs2.3.6.8/include/uapi/vserver/network.h 2013-08-22 20:30:00.000000000 +0000
13257@@ -0,0 +1,76 @@ 13257@@ -0,0 +1,76 @@
13258+#ifndef _UAPI_VS_NETWORK_H 13258+#ifndef _UAPI_VS_NETWORK_H
13259+#define _UAPI_VS_NETWORK_H 13259+#define _UAPI_VS_NETWORK_H
@@ -13331,9 +13331,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/network.h linux-3.10.19
13331+#define NXA_MASK_SHOW (NXA_MASK_ALL | NXA_LOOPBACK) 13331+#define NXA_MASK_SHOW (NXA_MASK_ALL | NXA_LOOPBACK)
13332+ 13332+
13333+#endif /* _UAPI_VS_NETWORK_H */ 13333+#endif /* _UAPI_VS_NETWORK_H */
13334diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/network_cmd.h linux-3.10.19-vs2.3.6.8/include/uapi/vserver/network_cmd.h 13334diff -NurpP --minimal linux-3.10.21/include/uapi/vserver/network_cmd.h linux-3.10.21-vs2.3.6.8/include/uapi/vserver/network_cmd.h
13335--- linux-3.10.19/include/uapi/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000 13335--- linux-3.10.21/include/uapi/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000
13336+++ linux-3.10.19-vs2.3.6.8/include/uapi/vserver/network_cmd.h 2013-08-22 20:30:00.000000000 +0000 13336+++ linux-3.10.21-vs2.3.6.8/include/uapi/vserver/network_cmd.h 2013-08-22 20:30:00.000000000 +0000
13337@@ -0,0 +1,123 @@ 13337@@ -0,0 +1,123 @@
13338+#ifndef _UAPI_VS_NETWORK_CMD_H 13338+#ifndef _UAPI_VS_NETWORK_CMD_H
13339+#define _UAPI_VS_NETWORK_CMD_H 13339+#define _UAPI_VS_NETWORK_CMD_H
@@ -13458,9 +13458,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/network_cmd.h linux-3.1
13458+}; 13458+};
13459+ 13459+
13460+#endif /* _UAPI_VS_NETWORK_CMD_H */ 13460+#endif /* _UAPI_VS_NETWORK_CMD_H */
13461diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/sched_cmd.h linux-3.10.19-vs2.3.6.8/include/uapi/vserver/sched_cmd.h 13461diff -NurpP --minimal linux-3.10.21/include/uapi/vserver/sched_cmd.h linux-3.10.21-vs2.3.6.8/include/uapi/vserver/sched_cmd.h
13462--- linux-3.10.19/include/uapi/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000 13462--- linux-3.10.21/include/uapi/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000
13463+++ linux-3.10.19-vs2.3.6.8/include/uapi/vserver/sched_cmd.h 2013-08-22 20:30:00.000000000 +0000 13463+++ linux-3.10.21-vs2.3.6.8/include/uapi/vserver/sched_cmd.h 2013-08-22 20:30:00.000000000 +0000
13464@@ -0,0 +1,13 @@ 13464@@ -0,0 +1,13 @@
13465+#ifndef _UAPI_VS_SCHED_CMD_H 13465+#ifndef _UAPI_VS_SCHED_CMD_H
13466+#define _UAPI_VS_SCHED_CMD_H 13466+#define _UAPI_VS_SCHED_CMD_H
@@ -13475,9 +13475,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/sched_cmd.h linux-3.10.
13475+#define VCMD_get_prio_bias VC_CMD(SCHED, 5, 0) 13475+#define VCMD_get_prio_bias VC_CMD(SCHED, 5, 0)
13476+ 13476+
13477+#endif /* _UAPI_VS_SCHED_CMD_H */ 13477+#endif /* _UAPI_VS_SCHED_CMD_H */
13478diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/signal_cmd.h linux-3.10.19-vs2.3.6.8/include/uapi/vserver/signal_cmd.h 13478diff -NurpP --minimal linux-3.10.21/include/uapi/vserver/signal_cmd.h linux-3.10.21-vs2.3.6.8/include/uapi/vserver/signal_cmd.h
13479--- linux-3.10.19/include/uapi/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000 13479--- linux-3.10.21/include/uapi/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000
13480+++ linux-3.10.19-vs2.3.6.8/include/uapi/vserver/signal_cmd.h 2013-08-22 20:30:00.000000000 +0000 13480+++ linux-3.10.21-vs2.3.6.8/include/uapi/vserver/signal_cmd.h 2013-08-22 20:30:00.000000000 +0000
13481@@ -0,0 +1,31 @@ 13481@@ -0,0 +1,31 @@
13482+#ifndef _UAPI_VS_SIGNAL_CMD_H 13482+#ifndef _UAPI_VS_SIGNAL_CMD_H
13483+#define _UAPI_VS_SIGNAL_CMD_H 13483+#define _UAPI_VS_SIGNAL_CMD_H
@@ -13510,9 +13510,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/signal_cmd.h linux-3.10
13510+}; 13510+};
13511+ 13511+
13512+#endif /* _UAPI_VS_SIGNAL_CMD_H */ 13512+#endif /* _UAPI_VS_SIGNAL_CMD_H */
13513diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/space_cmd.h linux-3.10.19-vs2.3.6.8/include/uapi/vserver/space_cmd.h 13513diff -NurpP --minimal linux-3.10.21/include/uapi/vserver/space_cmd.h linux-3.10.21-vs2.3.6.8/include/uapi/vserver/space_cmd.h
13514--- linux-3.10.19/include/uapi/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000 13514--- linux-3.10.21/include/uapi/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000
13515+++ linux-3.10.19-vs2.3.6.8/include/uapi/vserver/space_cmd.h 2013-08-22 20:30:00.000000000 +0000 13515+++ linux-3.10.21-vs2.3.6.8/include/uapi/vserver/space_cmd.h 2013-08-22 20:30:00.000000000 +0000
13516@@ -0,0 +1,28 @@ 13516@@ -0,0 +1,28 @@
13517+#ifndef _UAPI_VS_SPACE_CMD_H 13517+#ifndef _UAPI_VS_SPACE_CMD_H
13518+#define _UAPI_VS_SPACE_CMD_H 13518+#define _UAPI_VS_SPACE_CMD_H
@@ -13542,9 +13542,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/space_cmd.h linux-3.10.
13542+}; 13542+};
13543+ 13543+
13544+#endif /* _UAPI_VS_SPACE_CMD_H */ 13544+#endif /* _UAPI_VS_SPACE_CMD_H */
13545diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/switch.h linux-3.10.19-vs2.3.6.8/include/uapi/vserver/switch.h 13545diff -NurpP --minimal linux-3.10.21/include/uapi/vserver/switch.h linux-3.10.21-vs2.3.6.8/include/uapi/vserver/switch.h
13546--- linux-3.10.19/include/uapi/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000 13546--- linux-3.10.21/include/uapi/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000
13547+++ linux-3.10.19-vs2.3.6.8/include/uapi/vserver/switch.h 2013-08-22 20:30:00.000000000 +0000 13547+++ linux-3.10.21-vs2.3.6.8/include/uapi/vserver/switch.h 2013-08-22 20:30:00.000000000 +0000
13548@@ -0,0 +1,90 @@ 13548@@ -0,0 +1,90 @@
13549+#ifndef _UAPI_VS_SWITCH_H 13549+#ifndef _UAPI_VS_SWITCH_H
13550+#define _UAPI_VS_SWITCH_H 13550+#define _UAPI_VS_SWITCH_H
@@ -13636,9 +13636,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/switch.h linux-3.10.19-
13636+#define VCMD_get_vci VC_CMD(VERSION, 1, 0) 13636+#define VCMD_get_vci VC_CMD(VERSION, 1, 0)
13637+ 13637+
13638+#endif /* _UAPI_VS_SWITCH_H */ 13638+#endif /* _UAPI_VS_SWITCH_H */
13639diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/tag_cmd.h linux-3.10.19-vs2.3.6.8/include/uapi/vserver/tag_cmd.h 13639diff -NurpP --minimal linux-3.10.21/include/uapi/vserver/tag_cmd.h linux-3.10.21-vs2.3.6.8/include/uapi/vserver/tag_cmd.h
13640--- linux-3.10.19/include/uapi/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000 13640--- linux-3.10.21/include/uapi/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000
13641+++ linux-3.10.19-vs2.3.6.8/include/uapi/vserver/tag_cmd.h 2013-08-22 20:30:00.000000000 +0000 13641+++ linux-3.10.21-vs2.3.6.8/include/uapi/vserver/tag_cmd.h 2013-08-22 20:30:00.000000000 +0000
13642@@ -0,0 +1,14 @@ 13642@@ -0,0 +1,14 @@
13643+#ifndef _UAPI_VS_TAG_CMD_H 13643+#ifndef _UAPI_VS_TAG_CMD_H
13644+#define _UAPI_VS_TAG_CMD_H 13644+#define _UAPI_VS_TAG_CMD_H
@@ -13654,9 +13654,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/tag_cmd.h linux-3.10.19
13654+#define VCMD_tag_migrate VC_CMD(TAGMIG, 1, 0) 13654+#define VCMD_tag_migrate VC_CMD(TAGMIG, 1, 0)
13655+ 13655+
13656+#endif /* _UAPI_VS_TAG_CMD_H */ 13656+#endif /* _UAPI_VS_TAG_CMD_H */
13657diff -NurpP --minimal linux-3.10.19/init/Kconfig linux-3.10.19-vs2.3.6.8/init/Kconfig 13657diff -NurpP --minimal linux-3.10.21/init/Kconfig linux-3.10.21-vs2.3.6.8/init/Kconfig
13658--- linux-3.10.19/init/Kconfig 2013-07-14 17:01:34.000000000 +0000 13658--- linux-3.10.21/init/Kconfig 2013-07-14 17:01:34.000000000 +0000
13659+++ linux-3.10.19-vs2.3.6.8/init/Kconfig 2013-08-22 20:30:00.000000000 +0000 13659+++ linux-3.10.21-vs2.3.6.8/init/Kconfig 2013-08-22 20:30:00.000000000 +0000
13660@@ -805,6 +805,7 @@ config NUMA_BALANCING 13660@@ -805,6 +805,7 @@ config NUMA_BALANCING
13661 menuconfig CGROUPS 13661 menuconfig CGROUPS
13662 boolean "Control Group support" 13662 boolean "Control Group support"
@@ -13673,9 +13673,9 @@ diff -NurpP --minimal linux-3.10.19/init/Kconfig linux-3.10.19-vs2.3.6.8/init/Kc
13673 select UIDGID_STRICT_TYPE_CHECKS 13673 select UIDGID_STRICT_TYPE_CHECKS
13674 13674
13675 default n 13675 default n
13676diff -NurpP --minimal linux-3.10.19/init/main.c linux-3.10.19-vs2.3.6.8/init/main.c 13676diff -NurpP --minimal linux-3.10.21/init/main.c linux-3.10.21-vs2.3.6.8/init/main.c
13677--- linux-3.10.19/init/main.c 2013-11-13 17:21:14.000000000 +0000 13677--- linux-3.10.21/init/main.c 2013-11-30 07:50:51.000000000 +0000
13678+++ linux-3.10.19-vs2.3.6.8/init/main.c 2013-11-13 17:19:37.000000000 +0000 13678+++ linux-3.10.21-vs2.3.6.8/init/main.c 2013-11-13 17:19:37.000000000 +0000
13679@@ -75,6 +75,7 @@ 13679@@ -75,6 +75,7 @@
13680 #include <linux/blkdev.h> 13680 #include <linux/blkdev.h>
13681 #include <linux/elevator.h> 13681 #include <linux/elevator.h>
@@ -13684,9 +13684,9 @@ diff -NurpP --minimal linux-3.10.19/init/main.c linux-3.10.19-vs2.3.6.8/init/mai
13684 13684
13685 #include <asm/io.h> 13685 #include <asm/io.h>
13686 #include <asm/bugs.h> 13686 #include <asm/bugs.h>
13687diff -NurpP --minimal linux-3.10.19/ipc/mqueue.c linux-3.10.19-vs2.3.6.8/ipc/mqueue.c 13687diff -NurpP --minimal linux-3.10.21/ipc/mqueue.c linux-3.10.21-vs2.3.6.8/ipc/mqueue.c
13688--- linux-3.10.19/ipc/mqueue.c 2013-05-31 13:45:29.000000000 +0000 13688--- linux-3.10.21/ipc/mqueue.c 2013-05-31 13:45:29.000000000 +0000
13689+++ linux-3.10.19-vs2.3.6.8/ipc/mqueue.c 2013-08-22 20:30:00.000000000 +0000 13689+++ linux-3.10.21-vs2.3.6.8/ipc/mqueue.c 2013-08-22 20:30:00.000000000 +0000
13690@@ -35,6 +35,8 @@ 13690@@ -35,6 +35,8 @@
13691 #include <linux/ipc_namespace.h> 13691 #include <linux/ipc_namespace.h>
13692 #include <linux/user_namespace.h> 13692 #include <linux/user_namespace.h>
@@ -13762,9 +13762,9 @@ diff -NurpP --minimal linux-3.10.19/ipc/mqueue.c linux-3.10.19-vs2.3.6.8/ipc/mqu
13762 free_uid(user); 13762 free_uid(user);
13763 } 13763 }
13764 if (ipc_ns) 13764 if (ipc_ns)
13765diff -NurpP --minimal linux-3.10.19/ipc/msg.c linux-3.10.19-vs2.3.6.8/ipc/msg.c 13765diff -NurpP --minimal linux-3.10.21/ipc/msg.c linux-3.10.21-vs2.3.6.8/ipc/msg.c
13766--- linux-3.10.19/ipc/msg.c 2013-11-13 17:21:14.000000000 +0000 13766--- linux-3.10.21/ipc/msg.c 2013-11-30 07:50:51.000000000 +0000
13767+++ linux-3.10.19-vs2.3.6.8/ipc/msg.c 2013-11-13 17:17:16.000000000 +0000 13767+++ linux-3.10.21-vs2.3.6.8/ipc/msg.c 2013-11-13 17:17:16.000000000 +0000
13768@@ -37,6 +37,7 @@ 13768@@ -37,6 +37,7 @@
13769 #include <linux/rwsem.h> 13769 #include <linux/rwsem.h>
13770 #include <linux/nsproxy.h> 13770 #include <linux/nsproxy.h>
@@ -13781,9 +13781,9 @@ diff -NurpP --minimal linux-3.10.19/ipc/msg.c linux-3.10.19-vs2.3.6.8/ipc/msg.c
13781 13781
13782 msq->q_perm.security = NULL; 13782 msq->q_perm.security = NULL;
13783 retval = security_msg_queue_alloc(msq); 13783 retval = security_msg_queue_alloc(msq);
13784diff -NurpP --minimal linux-3.10.19/ipc/sem.c linux-3.10.19-vs2.3.6.8/ipc/sem.c 13784diff -NurpP --minimal linux-3.10.21/ipc/sem.c linux-3.10.21-vs2.3.6.8/ipc/sem.c
13785--- linux-3.10.19/ipc/sem.c 2013-11-13 17:21:14.000000000 +0000 13785--- linux-3.10.21/ipc/sem.c 2013-11-30 07:50:51.000000000 +0000
13786+++ linux-3.10.19-vs2.3.6.8/ipc/sem.c 2013-11-13 17:19:37.000000000 +0000 13786+++ linux-3.10.21-vs2.3.6.8/ipc/sem.c 2013-11-13 17:19:37.000000000 +0000
13787@@ -86,6 +86,8 @@ 13787@@ -86,6 +86,8 @@
13788 #include <linux/rwsem.h> 13788 #include <linux/rwsem.h>
13789 #include <linux/nsproxy.h> 13789 #include <linux/nsproxy.h>
@@ -13821,9 +13821,9 @@ diff -NurpP --minimal linux-3.10.19/ipc/sem.c linux-3.10.19-vs2.3.6.8/ipc/sem.c
13821 ipc_rcu_putref(sma, sem_rcu_free); 13821 ipc_rcu_putref(sma, sem_rcu_free);
13822 } 13822 }
13823 13823
13824diff -NurpP --minimal linux-3.10.19/ipc/shm.c linux-3.10.19-vs2.3.6.8/ipc/shm.c 13824diff -NurpP --minimal linux-3.10.21/ipc/shm.c linux-3.10.21-vs2.3.6.8/ipc/shm.c
13825--- linux-3.10.19/ipc/shm.c 2013-11-13 17:21:14.000000000 +0000 13825--- linux-3.10.21/ipc/shm.c 2013-11-30 07:50:51.000000000 +0000
13826+++ linux-3.10.19-vs2.3.6.8/ipc/shm.c 2013-11-13 17:19:37.000000000 +0000 13826+++ linux-3.10.21-vs2.3.6.8/ipc/shm.c 2013-11-30 07:55:52.000000000 +0000
13827@@ -42,6 +42,8 @@ 13827@@ -42,6 +42,8 @@
13828 #include <linux/nsproxy.h> 13828 #include <linux/nsproxy.h>
13829 #include <linux/mount.h> 13829 #include <linux/mount.h>
@@ -13833,29 +13833,31 @@ diff -NurpP --minimal linux-3.10.19/ipc/shm.c linux-3.10.19-vs2.3.6.8/ipc/shm.c
13833 13833
13834 #include <asm/uaccess.h> 13834 #include <asm/uaccess.h>
13835 13835
13836@@ -208,7 +210,12 @@ static void shm_open(struct vm_area_stru 13836@@ -209,10 +211,14 @@ static void shm_open(struct vm_area_stru
13837 */
13838 static void shm_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp) 13837 static void shm_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp)
13839 { 13838 {
13840- ns->shm_tot -= (shp->shm_segsz + PAGE_SIZE - 1) >> PAGE_SHIFT; 13839 struct file *shm_file;
13841+ struct vx_info *vxi = lookup_vx_info(shp->shm_perm.xid); 13840+ struct vx_info *vxi = lookup_vx_info(shp->shm_perm.xid);
13842+ int numpages = (shp->shm_segsz + PAGE_SIZE - 1) >> PAGE_SHIFT; 13841+ int numpages = (shp->shm_segsz + PAGE_SIZE - 1) >> PAGE_SHIFT;
13843+ 13842
13843 shm_file = shp->shm_file;
13844 shp->shm_file = NULL;
13845- ns->shm_tot -= (shp->shm_segsz + PAGE_SIZE - 1) >> PAGE_SHIFT;
13844+ vx_ipcshm_sub(vxi, shp, numpages); 13846+ vx_ipcshm_sub(vxi, shp, numpages);
13845+ ns->shm_tot -= numpages; 13847+ ns->shm_tot -= numpages;
13846+ 13848+
13847 shm_rmid(ns, shp); 13849 shm_rmid(ns, shp);
13848 shm_unlock(shp); 13850 shm_unlock(shp);
13849 if (!is_file_hugepages(shp->shm_file)) 13851 if (!is_file_hugepages(shm_file))
13850@@ -217,6 +224,7 @@ static void shm_destroy(struct ipc_names 13852@@ -220,6 +226,7 @@ static void shm_destroy(struct ipc_names
13851 user_shm_unlock(file_inode(shp->shm_file)->i_size, 13853 else if (shp->mlock_user)
13852 shp->mlock_user); 13854 user_shm_unlock(file_inode(shm_file)->i_size, shp->mlock_user);
13853 fput (shp->shm_file); 13855 fput(shm_file);
13854+ put_vx_info(vxi); 13856+ put_vx_info(vxi);
13855 ipc_rcu_putref(shp, shm_rcu_free); 13857 ipc_rcu_putref(shp, shm_rcu_free);
13856 } 13858 }
13857 13859
13858@@ -494,11 +502,15 @@ static int newseg(struct ipc_namespace * 13860@@ -497,11 +504,15 @@ static int newseg(struct ipc_namespace *
13859 if (ns->shm_tot + numpages > ns->shm_ctlall) 13861 if (ns->shm_tot + numpages > ns->shm_ctlall)
13860 return -ENOSPC; 13862 return -ENOSPC;
13861 13863
@@ -13871,7 +13873,7 @@ diff -NurpP --minimal linux-3.10.19/ipc/shm.c linux-3.10.19-vs2.3.6.8/ipc/shm.c
13871 shp->shm_perm.mode = (shmflg & S_IRWXUGO); 13873 shp->shm_perm.mode = (shmflg & S_IRWXUGO);
13872 shp->mlock_user = NULL; 13874 shp->mlock_user = NULL;
13873 13875
13874@@ -567,6 +579,7 @@ static int newseg(struct ipc_namespace * 13876@@ -570,6 +581,7 @@ static int newseg(struct ipc_namespace *
13875 13877
13876 ipc_unlock_object(&shp->shm_perm); 13878 ipc_unlock_object(&shp->shm_perm);
13877 rcu_read_unlock(); 13879 rcu_read_unlock();
@@ -13879,9 +13881,9 @@ diff -NurpP --minimal linux-3.10.19/ipc/shm.c linux-3.10.19-vs2.3.6.8/ipc/shm.c
13879 return error; 13881 return error;
13880 13882
13881 no_id: 13883 no_id:
13882diff -NurpP --minimal linux-3.10.19/kernel/Makefile linux-3.10.19-vs2.3.6.8/kernel/Makefile 13884diff -NurpP --minimal linux-3.10.21/kernel/Makefile linux-3.10.21-vs2.3.6.8/kernel/Makefile
13883--- linux-3.10.19/kernel/Makefile 2013-07-14 17:01:34.000000000 +0000 13885--- linux-3.10.21/kernel/Makefile 2013-07-14 17:01:34.000000000 +0000
13884+++ linux-3.10.19-vs2.3.6.8/kernel/Makefile 2013-08-22 21:18:32.000000000 +0000 13886+++ linux-3.10.21-vs2.3.6.8/kernel/Makefile 2013-08-22 21:18:32.000000000 +0000
13885@@ -25,6 +25,7 @@ endif 13887@@ -25,6 +25,7 @@ endif
13886 obj-y += sched/ 13888 obj-y += sched/
13887 obj-y += power/ 13889 obj-y += power/
@@ -13890,9 +13892,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/Makefile linux-3.10.19-vs2.3.6.8/kern
13890 13892
13891 obj-$(CONFIG_CHECKPOINT_RESTORE) += kcmp.o 13893 obj-$(CONFIG_CHECKPOINT_RESTORE) += kcmp.o
13892 obj-$(CONFIG_FREEZER) += freezer.o 13894 obj-$(CONFIG_FREEZER) += freezer.o
13893diff -NurpP --minimal linux-3.10.19/kernel/auditsc.c linux-3.10.19-vs2.3.6.8/kernel/auditsc.c 13895diff -NurpP --minimal linux-3.10.21/kernel/auditsc.c linux-3.10.21-vs2.3.6.8/kernel/auditsc.c
13894--- linux-3.10.19/kernel/auditsc.c 2013-07-14 17:01:34.000000000 +0000 13896--- linux-3.10.21/kernel/auditsc.c 2013-07-14 17:01:34.000000000 +0000
13895+++ linux-3.10.19-vs2.3.6.8/kernel/auditsc.c 2013-08-22 20:30:00.000000000 +0000 13897+++ linux-3.10.21-vs2.3.6.8/kernel/auditsc.c 2013-08-22 20:30:00.000000000 +0000
13896@@ -1976,7 +1976,7 @@ int audit_set_loginuid(kuid_t loginuid) 13898@@ -1976,7 +1976,7 @@ int audit_set_loginuid(kuid_t loginuid)
13897 if (audit_loginuid_set(task)) 13899 if (audit_loginuid_set(task))
13898 return -EPERM; 13900 return -EPERM;
@@ -13902,9 +13904,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/auditsc.c linux-3.10.19-vs2.3.6.8/ker
13902 return -EPERM; 13904 return -EPERM;
13903 #endif /* CONFIG_AUDIT_LOGINUID_IMMUTABLE */ 13905 #endif /* CONFIG_AUDIT_LOGINUID_IMMUTABLE */
13904 13906
13905diff -NurpP --minimal linux-3.10.19/kernel/capability.c linux-3.10.19-vs2.3.6.8/kernel/capability.c 13907diff -NurpP --minimal linux-3.10.21/kernel/capability.c linux-3.10.21-vs2.3.6.8/kernel/capability.c
13906--- linux-3.10.19/kernel/capability.c 2013-05-31 13:45:29.000000000 +0000 13908--- linux-3.10.21/kernel/capability.c 2013-05-31 13:45:29.000000000 +0000
13907+++ linux-3.10.19-vs2.3.6.8/kernel/capability.c 2013-08-22 20:30:00.000000000 +0000 13909+++ linux-3.10.21-vs2.3.6.8/kernel/capability.c 2013-08-22 20:30:00.000000000 +0000
13908@@ -15,6 +15,7 @@ 13910@@ -15,6 +15,7 @@
13909 #include <linux/syscalls.h> 13911 #include <linux/syscalls.h>
13910 #include <linux/pid_namespace.h> 13912 #include <linux/pid_namespace.h>
@@ -13930,9 +13932,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/capability.c linux-3.10.19-vs2.3.6.8/
13930 /** 13932 /**
13931 * has_capability_noaudit - Does a task have a capability (unaudited) in the 13933 * has_capability_noaudit - Does a task have a capability (unaudited) in the
13932 * initial user ns 13934 * initial user ns
13933diff -NurpP --minimal linux-3.10.19/kernel/compat.c linux-3.10.19-vs2.3.6.8/kernel/compat.c 13935diff -NurpP --minimal linux-3.10.21/kernel/compat.c linux-3.10.21-vs2.3.6.8/kernel/compat.c
13934--- linux-3.10.19/kernel/compat.c 2013-07-14 17:01:34.000000000 +0000 13936--- linux-3.10.21/kernel/compat.c 2013-07-14 17:01:34.000000000 +0000
13935+++ linux-3.10.19-vs2.3.6.8/kernel/compat.c 2013-08-22 20:30:00.000000000 +0000 13937+++ linux-3.10.21-vs2.3.6.8/kernel/compat.c 2013-08-22 20:30:00.000000000 +0000
13936@@ -27,6 +27,7 @@ 13938@@ -27,6 +27,7 @@
13937 #include <linux/times.h> 13939 #include <linux/times.h>
13938 #include <linux/ptrace.h> 13940 #include <linux/ptrace.h>
@@ -13950,9 +13952,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/compat.c linux-3.10.19-vs2.3.6.8/kern
13950 return 0; 13952 return 0;
13951 } 13953 }
13952 13954
13953diff -NurpP --minimal linux-3.10.19/kernel/cred.c linux-3.10.19-vs2.3.6.8/kernel/cred.c 13955diff -NurpP --minimal linux-3.10.21/kernel/cred.c linux-3.10.21-vs2.3.6.8/kernel/cred.c
13954--- linux-3.10.19/kernel/cred.c 2013-02-19 13:58:56.000000000 +0000 13956--- linux-3.10.21/kernel/cred.c 2013-02-19 13:58:56.000000000 +0000
13955+++ linux-3.10.19-vs2.3.6.8/kernel/cred.c 2013-08-22 20:30:00.000000000 +0000 13957+++ linux-3.10.21-vs2.3.6.8/kernel/cred.c 2013-08-22 20:30:00.000000000 +0000
13956@@ -56,31 +56,6 @@ struct cred init_cred = { 13958@@ -56,31 +56,6 @@ struct cred init_cred = {
13957 .group_info = &init_groups, 13959 .group_info = &init_groups,
13958 }; 13960 };
@@ -14022,9 +14024,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/cred.c linux-3.10.19-vs2.3.6.8/kernel
14022 EXPORT_SYMBOL(prepare_creds); 14024 EXPORT_SYMBOL(prepare_creds);
14023 14025
14024 /* 14026 /*
14025diff -NurpP --minimal linux-3.10.19/kernel/exit.c linux-3.10.19-vs2.3.6.8/kernel/exit.c 14027diff -NurpP --minimal linux-3.10.21/kernel/exit.c linux-3.10.21-vs2.3.6.8/kernel/exit.c
14026--- linux-3.10.19/kernel/exit.c 2013-07-14 17:01:35.000000000 +0000 14028--- linux-3.10.21/kernel/exit.c 2013-07-14 17:01:35.000000000 +0000
14027+++ linux-3.10.19-vs2.3.6.8/kernel/exit.c 2013-08-22 20:30:00.000000000 +0000 14029+++ linux-3.10.21-vs2.3.6.8/kernel/exit.c 2013-08-22 20:30:00.000000000 +0000
14028@@ -48,6 +48,10 @@ 14030@@ -48,6 +48,10 @@
14029 #include <linux/fs_struct.h> 14031 #include <linux/fs_struct.h>
14030 #include <linux/init_task.h> 14032 #include <linux/init_task.h>
@@ -14120,9 +14122,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/exit.c linux-3.10.19-vs2.3.6.8/kernel
14120 BUG(); 14122 BUG();
14121 /* Avoid "noreturn function does return". */ 14123 /* Avoid "noreturn function does return". */
14122 for (;;) 14124 for (;;)
14123diff -NurpP --minimal linux-3.10.19/kernel/fork.c linux-3.10.19-vs2.3.6.8/kernel/fork.c 14125diff -NurpP --minimal linux-3.10.21/kernel/fork.c linux-3.10.21-vs2.3.6.8/kernel/fork.c
14124--- linux-3.10.19/kernel/fork.c 2013-11-13 17:21:14.000000000 +0000 14126--- linux-3.10.21/kernel/fork.c 2013-11-30 07:50:51.000000000 +0000
14125+++ linux-3.10.19-vs2.3.6.8/kernel/fork.c 2013-11-13 17:17:16.000000000 +0000 14127+++ linux-3.10.21-vs2.3.6.8/kernel/fork.c 2013-11-13 17:17:16.000000000 +0000
14126@@ -71,6 +71,9 @@ 14128@@ -71,6 +71,9 @@
14127 #include <linux/signalfd.h> 14129 #include <linux/signalfd.h>
14128 #include <linux/uprobes.h> 14130 #include <linux/uprobes.h>
@@ -14215,9 +14217,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/fork.c linux-3.10.19-vs2.3.6.8/kernel
14215 write_unlock_irq(&tasklist_lock); 14217 write_unlock_irq(&tasklist_lock);
14216 proc_fork_connector(p); 14218 proc_fork_connector(p);
14217 cgroup_post_fork(p); 14219 cgroup_post_fork(p);
14218diff -NurpP --minimal linux-3.10.19/kernel/kthread.c linux-3.10.19-vs2.3.6.8/kernel/kthread.c 14220diff -NurpP --minimal linux-3.10.21/kernel/kthread.c linux-3.10.21-vs2.3.6.8/kernel/kthread.c
14219--- linux-3.10.19/kernel/kthread.c 2013-07-14 17:01:35.000000000 +0000 14221--- linux-3.10.21/kernel/kthread.c 2013-07-14 17:01:35.000000000 +0000
14220+++ linux-3.10.19-vs2.3.6.8/kernel/kthread.c 2013-08-22 21:14:28.000000000 +0000 14222+++ linux-3.10.21-vs2.3.6.8/kernel/kthread.c 2013-08-22 21:14:28.000000000 +0000
14221@@ -18,6 +18,7 @@ 14223@@ -18,6 +18,7 @@
14222 #include <linux/freezer.h> 14224 #include <linux/freezer.h>
14223 #include <linux/ptrace.h> 14225 #include <linux/ptrace.h>
@@ -14226,9 +14228,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/kthread.c linux-3.10.19-vs2.3.6.8/ker
14226 #include <trace/events/sched.h> 14228 #include <trace/events/sched.h>
14227 14229
14228 static DEFINE_SPINLOCK(kthread_create_lock); 14230 static DEFINE_SPINLOCK(kthread_create_lock);
14229diff -NurpP --minimal linux-3.10.19/kernel/nsproxy.c linux-3.10.19-vs2.3.6.8/kernel/nsproxy.c 14231diff -NurpP --minimal linux-3.10.21/kernel/nsproxy.c linux-3.10.21-vs2.3.6.8/kernel/nsproxy.c
14230--- linux-3.10.19/kernel/nsproxy.c 2013-07-14 17:01:35.000000000 +0000 14232--- linux-3.10.21/kernel/nsproxy.c 2013-07-14 17:01:35.000000000 +0000
14231+++ linux-3.10.19-vs2.3.6.8/kernel/nsproxy.c 2013-08-22 21:09:55.000000000 +0000 14233+++ linux-3.10.21-vs2.3.6.8/kernel/nsproxy.c 2013-08-22 21:09:55.000000000 +0000
14232@@ -20,11 +20,14 @@ 14234@@ -20,11 +20,14 @@
14233 #include <linux/mnt_namespace.h> 14235 #include <linux/mnt_namespace.h>
14234 #include <linux/utsname.h> 14236 #include <linux/utsname.h>
@@ -14414,9 +14416,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/nsproxy.c linux-3.10.19-vs2.3.6.8/ker
14414 return -EPERM; 14416 return -EPERM;
14415 14417
14416 *new_nsp = create_new_namespaces(unshare_flags, current, user_ns, 14418 *new_nsp = create_new_namespaces(unshare_flags, current, user_ns,
14417diff -NurpP --minimal linux-3.10.19/kernel/pid.c linux-3.10.19-vs2.3.6.8/kernel/pid.c 14419diff -NurpP --minimal linux-3.10.21/kernel/pid.c linux-3.10.21-vs2.3.6.8/kernel/pid.c
14418--- linux-3.10.19/kernel/pid.c 2013-11-13 17:21:14.000000000 +0000 14420--- linux-3.10.21/kernel/pid.c 2013-11-30 07:50:51.000000000 +0000
14419+++ linux-3.10.19-vs2.3.6.8/kernel/pid.c 2013-11-13 17:17:16.000000000 +0000 14421+++ linux-3.10.21-vs2.3.6.8/kernel/pid.c 2013-11-13 17:17:16.000000000 +0000
14420@@ -38,6 +38,7 @@ 14422@@ -38,6 +38,7 @@
14421 #include <linux/syscalls.h> 14423 #include <linux/syscalls.h>
14422 #include <linux/proc_ns.h> 14424 #include <linux/proc_ns.h>
@@ -14474,9 +14476,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/pid.c linux-3.10.19-vs2.3.6.8/kernel/
14474 pid_t pid_vnr(struct pid *pid) 14476 pid_t pid_vnr(struct pid *pid)
14475 { 14477 {
14476 return pid_nr_ns(pid, task_active_pid_ns(current)); 14478 return pid_nr_ns(pid, task_active_pid_ns(current));
14477diff -NurpP --minimal linux-3.10.19/kernel/pid_namespace.c linux-3.10.19-vs2.3.6.8/kernel/pid_namespace.c 14479diff -NurpP --minimal linux-3.10.21/kernel/pid_namespace.c linux-3.10.21-vs2.3.6.8/kernel/pid_namespace.c
14478--- linux-3.10.19/kernel/pid_namespace.c 2013-07-14 17:01:35.000000000 +0000 14480--- linux-3.10.21/kernel/pid_namespace.c 2013-07-14 17:01:35.000000000 +0000
14479+++ linux-3.10.19-vs2.3.6.8/kernel/pid_namespace.c 2013-08-22 20:30:00.000000000 +0000 14481+++ linux-3.10.21-vs2.3.6.8/kernel/pid_namespace.c 2013-08-22 20:30:00.000000000 +0000
14480@@ -18,6 +18,7 @@ 14482@@ -18,6 +18,7 @@
14481 #include <linux/proc_ns.h> 14483 #include <linux/proc_ns.h>
14482 #include <linux/reboot.h> 14484 #include <linux/reboot.h>
@@ -14501,9 +14503,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/pid_namespace.c linux-3.10.19-vs2.3.6
14501 kmem_cache_free(pid_ns_cachep, ns); 14503 kmem_cache_free(pid_ns_cachep, ns);
14502 } 14504 }
14503 14505
14504diff -NurpP --minimal linux-3.10.19/kernel/posix-timers.c linux-3.10.19-vs2.3.6.8/kernel/posix-timers.c 14506diff -NurpP --minimal linux-3.10.21/kernel/posix-timers.c linux-3.10.21-vs2.3.6.8/kernel/posix-timers.c
14505--- linux-3.10.19/kernel/posix-timers.c 2013-07-14 17:01:35.000000000 +0000 14507--- linux-3.10.21/kernel/posix-timers.c 2013-07-14 17:01:35.000000000 +0000
14506+++ linux-3.10.19-vs2.3.6.8/kernel/posix-timers.c 2013-08-22 21:10:34.000000000 +0000 14508+++ linux-3.10.21-vs2.3.6.8/kernel/posix-timers.c 2013-08-22 21:10:34.000000000 +0000
14507@@ -48,6 +48,7 @@ 14509@@ -48,6 +48,7 @@
14508 #include <linux/workqueue.h> 14510 #include <linux/workqueue.h>
14509 #include <linux/export.h> 14511 #include <linux/export.h>
@@ -14539,9 +14541,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/posix-timers.c linux-3.10.19-vs2.3.6.
14539 /* If we failed to send the signal the timer stops. */ 14541 /* If we failed to send the signal the timer stops. */
14540 return ret > 0; 14542 return ret > 0;
14541 } 14543 }
14542diff -NurpP --minimal linux-3.10.19/kernel/printk.c linux-3.10.19-vs2.3.6.8/kernel/printk.c 14544diff -NurpP --minimal linux-3.10.21/kernel/printk.c linux-3.10.21-vs2.3.6.8/kernel/printk.c
14543--- linux-3.10.19/kernel/printk.c 2013-11-13 17:21:14.000000000 +0000 14545--- linux-3.10.21/kernel/printk.c 2013-11-30 07:50:51.000000000 +0000
14544+++ linux-3.10.19-vs2.3.6.8/kernel/printk.c 2013-11-13 17:17:16.000000000 +0000 14546+++ linux-3.10.21-vs2.3.6.8/kernel/printk.c 2013-11-13 17:17:16.000000000 +0000
14545@@ -45,6 +45,7 @@ 14547@@ -45,6 +45,7 @@
14546 #include <linux/poll.h> 14548 #include <linux/poll.h>
14547 #include <linux/irq_work.h> 14549 #include <linux/irq_work.h>
@@ -14609,9 +14611,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/printk.c linux-3.10.19-vs2.3.6.8/kern
14609 error = syslog_print_all(buf, len, clear); 14611 error = syslog_print_all(buf, len, clear);
14610 break; 14612 break;
14611 /* Clear ring buffer */ 14613 /* Clear ring buffer */
14612diff -NurpP --minimal linux-3.10.19/kernel/ptrace.c linux-3.10.19-vs2.3.6.8/kernel/ptrace.c 14614diff -NurpP --minimal linux-3.10.21/kernel/ptrace.c linux-3.10.21-vs2.3.6.8/kernel/ptrace.c
14613--- linux-3.10.19/kernel/ptrace.c 2013-07-14 17:01:35.000000000 +0000 14615--- linux-3.10.21/kernel/ptrace.c 2013-11-30 07:50:51.000000000 +0000
14614+++ linux-3.10.19-vs2.3.6.8/kernel/ptrace.c 2013-08-22 20:30:00.000000000 +0000 14616+++ linux-3.10.21-vs2.3.6.8/kernel/ptrace.c 2013-11-30 07:53:00.000000000 +0000
14615@@ -23,6 +23,7 @@ 14617@@ -23,6 +23,7 @@
14616 #include <linux/syscalls.h> 14618 #include <linux/syscalls.h>
14617 #include <linux/uaccess.h> 14619 #include <linux/uaccess.h>
@@ -14620,7 +14622,7 @@ diff -NurpP --minimal linux-3.10.19/kernel/ptrace.c linux-3.10.19-vs2.3.6.8/kern
14620 #include <linux/hw_breakpoint.h> 14622 #include <linux/hw_breakpoint.h>
14621 #include <linux/cn_proc.h> 14623 #include <linux/cn_proc.h>
14622 #include <linux/compat.h> 14624 #include <linux/compat.h>
14623@@ -263,6 +264,11 @@ ok: 14625@@ -264,6 +265,11 @@ ok:
14624 } 14626 }
14625 rcu_read_unlock(); 14627 rcu_read_unlock();
14626 14628
@@ -14632,9 +14634,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/ptrace.c linux-3.10.19-vs2.3.6.8/kern
14632 return security_ptrace_access_check(task, mode); 14634 return security_ptrace_access_check(task, mode);
14633 } 14635 }
14634 14636
14635diff -NurpP --minimal linux-3.10.19/kernel/sched/core.c linux-3.10.19-vs2.3.6.8/kernel/sched/core.c 14637diff -NurpP --minimal linux-3.10.21/kernel/sched/core.c linux-3.10.21-vs2.3.6.8/kernel/sched/core.c
14636--- linux-3.10.19/kernel/sched/core.c 2013-07-14 17:01:35.000000000 +0000 14638--- linux-3.10.21/kernel/sched/core.c 2013-07-14 17:01:35.000000000 +0000
14637+++ linux-3.10.19-vs2.3.6.8/kernel/sched/core.c 2013-08-22 20:30:00.000000000 +0000 14639+++ linux-3.10.21-vs2.3.6.8/kernel/sched/core.c 2013-08-22 20:30:00.000000000 +0000
14638@@ -73,6 +73,8 @@ 14640@@ -73,6 +73,8 @@
14639 #include <linux/init_task.h> 14641 #include <linux/init_task.h>
14640 #include <linux/binfmts.h> 14642 #include <linux/binfmts.h>
@@ -14674,9 +14676,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/sched/core.c linux-3.10.19-vs2.3.6.8/
14674 14676
14675 retval = security_task_setnice(current, nice); 14677 retval = security_task_setnice(current, nice);
14676 if (retval) 14678 if (retval)
14677diff -NurpP --minimal linux-3.10.19/kernel/sched/cputime.c linux-3.10.19-vs2.3.6.8/kernel/sched/cputime.c 14679diff -NurpP --minimal linux-3.10.21/kernel/sched/cputime.c linux-3.10.21-vs2.3.6.8/kernel/sched/cputime.c
14678--- linux-3.10.19/kernel/sched/cputime.c 2013-11-13 17:21:14.000000000 +0000 14680--- linux-3.10.21/kernel/sched/cputime.c 2013-11-30 07:50:51.000000000 +0000
14679+++ linux-3.10.19-vs2.3.6.8/kernel/sched/cputime.c 2013-11-13 17:17:16.000000000 +0000 14681+++ linux-3.10.21-vs2.3.6.8/kernel/sched/cputime.c 2013-11-13 17:17:16.000000000 +0000
14680@@ -4,6 +4,7 @@ 14682@@ -4,6 +4,7 @@
14681 #include <linux/kernel_stat.h> 14683 #include <linux/kernel_stat.h>
14682 #include <linux/static_key.h> 14684 #include <linux/static_key.h>
@@ -14717,9 +14719,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/sched/cputime.c linux-3.10.19-vs2.3.6
14717 account_group_system_time(p, cputime); 14719 account_group_system_time(p, cputime);
14718 14720
14719 /* Add system time to cpustat. */ 14721 /* Add system time to cpustat. */
14720diff -NurpP --minimal linux-3.10.19/kernel/sched/fair.c linux-3.10.19-vs2.3.6.8/kernel/sched/fair.c 14722diff -NurpP --minimal linux-3.10.21/kernel/sched/fair.c linux-3.10.21-vs2.3.6.8/kernel/sched/fair.c
14721--- linux-3.10.19/kernel/sched/fair.c 2013-11-13 17:21:14.000000000 +0000 14723--- linux-3.10.21/kernel/sched/fair.c 2013-11-30 07:50:51.000000000 +0000
14722+++ linux-3.10.19-vs2.3.6.8/kernel/sched/fair.c 2013-11-13 17:17:16.000000000 +0000 14724+++ linux-3.10.21-vs2.3.6.8/kernel/sched/fair.c 2013-11-13 17:17:16.000000000 +0000
14723@@ -29,6 +29,7 @@ 14725@@ -29,6 +29,7 @@
14724 #include <linux/mempolicy.h> 14726 #include <linux/mempolicy.h>
14725 #include <linux/migrate.h> 14727 #include <linux/migrate.h>
@@ -14746,9 +14748,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/sched/fair.c linux-3.10.19-vs2.3.6.8/
14746 account_entity_dequeue(cfs_rq, se); 14748 account_entity_dequeue(cfs_rq, se);
14747 14749
14748 /* 14750 /*
14749diff -NurpP --minimal linux-3.10.19/kernel/signal.c linux-3.10.19-vs2.3.6.8/kernel/signal.c 14751diff -NurpP --minimal linux-3.10.21/kernel/signal.c linux-3.10.21-vs2.3.6.8/kernel/signal.c
14750--- linux-3.10.19/kernel/signal.c 2013-07-14 17:01:35.000000000 +0000 14752--- linux-3.10.21/kernel/signal.c 2013-07-14 17:01:35.000000000 +0000
14751+++ linux-3.10.19-vs2.3.6.8/kernel/signal.c 2013-08-22 21:13:50.000000000 +0000 14753+++ linux-3.10.21-vs2.3.6.8/kernel/signal.c 2013-08-22 21:13:50.000000000 +0000
14752@@ -33,6 +33,8 @@ 14754@@ -33,6 +33,8 @@
14753 #include <linux/uprobes.h> 14755 #include <linux/uprobes.h>
14754 #include <linux/compat.h> 14756 #include <linux/compat.h>
@@ -14841,9 +14843,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/signal.c linux-3.10.19-vs2.3.6.8/kern
14841 if (sig_kernel_stop(signr)) { 14843 if (sig_kernel_stop(signr)) {
14842 /* 14844 /*
14843 * The default action is to stop all threads in 14845 * The default action is to stop all threads in
14844diff -NurpP --minimal linux-3.10.19/kernel/softirq.c linux-3.10.19-vs2.3.6.8/kernel/softirq.c 14846diff -NurpP --minimal linux-3.10.21/kernel/softirq.c linux-3.10.21-vs2.3.6.8/kernel/softirq.c
14845--- linux-3.10.19/kernel/softirq.c 2013-11-13 17:21:14.000000000 +0000 14847--- linux-3.10.21/kernel/softirq.c 2013-11-30 07:50:51.000000000 +0000
14846+++ linux-3.10.19-vs2.3.6.8/kernel/softirq.c 2013-11-13 17:17:16.000000000 +0000 14848+++ linux-3.10.21-vs2.3.6.8/kernel/softirq.c 2013-11-13 17:17:16.000000000 +0000
14847@@ -25,6 +25,7 @@ 14849@@ -25,6 +25,7 @@
14848 #include <linux/smp.h> 14850 #include <linux/smp.h>
14849 #include <linux/smpboot.h> 14851 #include <linux/smpboot.h>
@@ -14852,9 +14854,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/softirq.c linux-3.10.19-vs2.3.6.8/ker
14852 14854
14853 #define CREATE_TRACE_POINTS 14855 #define CREATE_TRACE_POINTS
14854 #include <trace/events/irq.h> 14856 #include <trace/events/irq.h>
14855diff -NurpP --minimal linux-3.10.19/kernel/sys.c linux-3.10.19-vs2.3.6.8/kernel/sys.c 14857diff -NurpP --minimal linux-3.10.21/kernel/sys.c linux-3.10.21-vs2.3.6.8/kernel/sys.c
14856--- linux-3.10.19/kernel/sys.c 2013-07-14 17:01:35.000000000 +0000 14858--- linux-3.10.21/kernel/sys.c 2013-07-14 17:01:35.000000000 +0000
14857+++ linux-3.10.19-vs2.3.6.8/kernel/sys.c 2013-08-22 20:30:00.000000000 +0000 14859+++ linux-3.10.21-vs2.3.6.8/kernel/sys.c 2013-08-22 20:30:00.000000000 +0000
14858@@ -55,6 +55,7 @@ 14860@@ -55,6 +55,7 @@
14859 #include <linux/cred.h> 14861 #include <linux/cred.h>
14860 14862
@@ -14951,9 +14953,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/sys.c linux-3.10.19-vs2.3.6.8/kernel/
14951 return 0; 14953 return 0;
14952 14954
14953 return -EPERM; 14955 return -EPERM;
14954diff -NurpP --minimal linux-3.10.19/kernel/sysctl.c linux-3.10.19-vs2.3.6.8/kernel/sysctl.c 14956diff -NurpP --minimal linux-3.10.21/kernel/sysctl.c linux-3.10.21-vs2.3.6.8/kernel/sysctl.c
14955--- linux-3.10.19/kernel/sysctl.c 2013-07-14 17:01:35.000000000 +0000 14957--- linux-3.10.21/kernel/sysctl.c 2013-07-14 17:01:35.000000000 +0000
14956+++ linux-3.10.19-vs2.3.6.8/kernel/sysctl.c 2013-08-22 20:30:00.000000000 +0000 14958+++ linux-3.10.21-vs2.3.6.8/kernel/sysctl.c 2013-08-22 20:30:00.000000000 +0000
14957@@ -83,6 +83,7 @@ 14959@@ -83,6 +83,7 @@
14958 #if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_LOCK_STAT) 14960 #if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_LOCK_STAT)
14959 #include <linux/lockdep.h> 14961 #include <linux/lockdep.h>
@@ -14976,9 +14978,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/sysctl.c linux-3.10.19-vs2.3.6.8/kern
14976 14978
14977 #ifdef CONFIG_CHR_DEV_SG 14979 #ifdef CONFIG_CHR_DEV_SG
14978 { 14980 {
14979diff -NurpP --minimal linux-3.10.19/kernel/sysctl_binary.c linux-3.10.19-vs2.3.6.8/kernel/sysctl_binary.c 14981diff -NurpP --minimal linux-3.10.21/kernel/sysctl_binary.c linux-3.10.21-vs2.3.6.8/kernel/sysctl_binary.c
14980--- linux-3.10.19/kernel/sysctl_binary.c 2013-07-14 17:01:35.000000000 +0000 14982--- linux-3.10.21/kernel/sysctl_binary.c 2013-07-14 17:01:35.000000000 +0000
14981+++ linux-3.10.19-vs2.3.6.8/kernel/sysctl_binary.c 2013-08-22 20:30:00.000000000 +0000 14983+++ linux-3.10.21-vs2.3.6.8/kernel/sysctl_binary.c 2013-08-22 20:30:00.000000000 +0000
14982@@ -74,6 +74,7 @@ static const struct bin_table bin_kern_t 14984@@ -74,6 +74,7 @@ static const struct bin_table bin_kern_t
14983 14985
14984 { CTL_INT, KERN_PANIC, "panic" }, 14986 { CTL_INT, KERN_PANIC, "panic" },
@@ -14987,9 +14989,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/sysctl_binary.c linux-3.10.19-vs2.3.6
14987 14989
14988 { CTL_STR, KERN_SPARC_REBOOT, "reboot-cmd" }, 14990 { CTL_STR, KERN_SPARC_REBOOT, "reboot-cmd" },
14989 { CTL_INT, KERN_CTLALTDEL, "ctrl-alt-del" }, 14991 { CTL_INT, KERN_CTLALTDEL, "ctrl-alt-del" },
14990diff -NurpP --minimal linux-3.10.19/kernel/time/timekeeping.c linux-3.10.19-vs2.3.6.8/kernel/time/timekeeping.c 14992diff -NurpP --minimal linux-3.10.21/kernel/time/timekeeping.c linux-3.10.21-vs2.3.6.8/kernel/time/timekeeping.c
14991--- linux-3.10.19/kernel/time/timekeeping.c 2013-11-13 17:21:14.000000000 +0000 14993--- linux-3.10.21/kernel/time/timekeeping.c 2013-11-30 07:50:51.000000000 +0000
14992+++ linux-3.10.19-vs2.3.6.8/kernel/time/timekeeping.c 2013-11-13 17:17:16.000000000 +0000 14994+++ linux-3.10.21-vs2.3.6.8/kernel/time/timekeeping.c 2013-11-13 17:17:16.000000000 +0000
14993@@ -22,6 +22,7 @@ 14995@@ -22,6 +22,7 @@
14994 #include <linux/tick.h> 14996 #include <linux/tick.h>
14995 #include <linux/stop_machine.h> 14997 #include <linux/stop_machine.h>
@@ -15006,9 +15008,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/time/timekeeping.c linux-3.10.19-vs2.
15006 } 15008 }
15007 EXPORT_SYMBOL(getrawmonotonic); 15009 EXPORT_SYMBOL(getrawmonotonic);
15008 15010
15009diff -NurpP --minimal linux-3.10.19/kernel/time.c linux-3.10.19-vs2.3.6.8/kernel/time.c 15011diff -NurpP --minimal linux-3.10.21/kernel/time.c linux-3.10.21-vs2.3.6.8/kernel/time.c
15010--- linux-3.10.19/kernel/time.c 2013-07-14 17:01:35.000000000 +0000 15012--- linux-3.10.21/kernel/time.c 2013-07-14 17:01:35.000000000 +0000
15011+++ linux-3.10.19-vs2.3.6.8/kernel/time.c 2013-08-22 20:30:00.000000000 +0000 15013+++ linux-3.10.21-vs2.3.6.8/kernel/time.c 2013-08-22 20:30:00.000000000 +0000
15012@@ -37,6 +37,7 @@ 15014@@ -37,6 +37,7 @@
15013 #include <linux/fs.h> 15015 #include <linux/fs.h>
15014 #include <linux/math64.h> 15016 #include <linux/math64.h>
@@ -15035,9 +15037,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/time.c linux-3.10.19-vs2.3.6.8/kernel
15035 return 0; 15037 return 0;
15036 } 15038 }
15037 15039
15038diff -NurpP --minimal linux-3.10.19/kernel/timer.c linux-3.10.19-vs2.3.6.8/kernel/timer.c 15040diff -NurpP --minimal linux-3.10.21/kernel/timer.c linux-3.10.21-vs2.3.6.8/kernel/timer.c
15039--- linux-3.10.19/kernel/timer.c 2013-11-13 17:21:14.000000000 +0000 15041--- linux-3.10.21/kernel/timer.c 2013-11-30 07:50:51.000000000 +0000
15040+++ linux-3.10.19-vs2.3.6.8/kernel/timer.c 2013-11-13 17:17:16.000000000 +0000 15042+++ linux-3.10.21-vs2.3.6.8/kernel/timer.c 2013-11-13 17:17:16.000000000 +0000
15041@@ -42,6 +42,10 @@ 15043@@ -42,6 +42,10 @@
15042 #include <linux/sched/sysctl.h> 15044 #include <linux/sched/sysctl.h>
15043 #include <linux/slab.h> 15045 #include <linux/slab.h>
@@ -15049,9 +15051,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/timer.c linux-3.10.19-vs2.3.6.8/kerne
15049 15051
15050 #include <asm/uaccess.h> 15052 #include <asm/uaccess.h>
15051 #include <asm/unistd.h> 15053 #include <asm/unistd.h>
15052diff -NurpP --minimal linux-3.10.19/kernel/user_namespace.c linux-3.10.19-vs2.3.6.8/kernel/user_namespace.c 15054diff -NurpP --minimal linux-3.10.21/kernel/user_namespace.c linux-3.10.21-vs2.3.6.8/kernel/user_namespace.c
15053--- linux-3.10.19/kernel/user_namespace.c 2013-11-13 17:21:14.000000000 +0000 15055--- linux-3.10.21/kernel/user_namespace.c 2013-11-30 07:50:51.000000000 +0000
15054+++ linux-3.10.19-vs2.3.6.8/kernel/user_namespace.c 2013-11-13 17:17:16.000000000 +0000 15056+++ linux-3.10.21-vs2.3.6.8/kernel/user_namespace.c 2013-11-13 17:17:16.000000000 +0000
15055@@ -22,6 +22,7 @@ 15057@@ -22,6 +22,7 @@
15056 #include <linux/ctype.h> 15058 #include <linux/ctype.h>
15057 #include <linux/projid.h> 15059 #include <linux/projid.h>
@@ -15077,9 +15079,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/user_namespace.c linux-3.10.19-vs2.3.
15077 put_user_ns(ns); 15079 put_user_ns(ns);
15078 } 15080 }
15079 15081
15080diff -NurpP --minimal linux-3.10.19/kernel/utsname.c linux-3.10.19-vs2.3.6.8/kernel/utsname.c 15082diff -NurpP --minimal linux-3.10.21/kernel/utsname.c linux-3.10.21-vs2.3.6.8/kernel/utsname.c
15081--- linux-3.10.19/kernel/utsname.c 2013-07-14 17:01:35.000000000 +0000 15083--- linux-3.10.21/kernel/utsname.c 2013-07-14 17:01:35.000000000 +0000
15082+++ linux-3.10.19-vs2.3.6.8/kernel/utsname.c 2013-08-22 21:03:08.000000000 +0000 15084+++ linux-3.10.21-vs2.3.6.8/kernel/utsname.c 2013-08-22 21:03:08.000000000 +0000
15083@@ -16,14 +16,17 @@ 15085@@ -16,14 +16,17 @@
15084 #include <linux/slab.h> 15086 #include <linux/slab.h>
15085 #include <linux/user_namespace.h> 15087 #include <linux/user_namespace.h>
@@ -15108,9 +15110,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/utsname.c linux-3.10.19-vs2.3.6.8/ker
15108 kfree(ns); 15110 kfree(ns);
15109 } 15111 }
15110 15112
15111diff -NurpP --minimal linux-3.10.19/kernel/vserver/Kconfig linux-3.10.19-vs2.3.6.8/kernel/vserver/Kconfig 15113diff -NurpP --minimal linux-3.10.21/kernel/vserver/Kconfig linux-3.10.21-vs2.3.6.8/kernel/vserver/Kconfig
15112--- linux-3.10.19/kernel/vserver/Kconfig 1970-01-01 00:00:00.000000000 +0000 15114--- linux-3.10.21/kernel/vserver/Kconfig 1970-01-01 00:00:00.000000000 +0000
15113+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/Kconfig 2013-11-14 04:29:47.000000000 +0000 15115+++ linux-3.10.21-vs2.3.6.8/kernel/vserver/Kconfig 2013-11-14 04:29:47.000000000 +0000
15114@@ -0,0 +1,230 @@ 15116@@ -0,0 +1,230 @@
15115+# 15117+#
15116+# Linux VServer configuration 15118+# Linux VServer configuration
@@ -15342,9 +15344,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/Kconfig linux-3.10.19-vs2.3.6
15342+ bool 15344+ bool
15343+ default n 15345+ default n
15344+ 15346+
15345diff -NurpP --minimal linux-3.10.19/kernel/vserver/Makefile linux-3.10.19-vs2.3.6.8/kernel/vserver/Makefile 15347diff -NurpP --minimal linux-3.10.21/kernel/vserver/Makefile linux-3.10.21-vs2.3.6.8/kernel/vserver/Makefile
15346--- linux-3.10.19/kernel/vserver/Makefile 1970-01-01 00:00:00.000000000 +0000 15348--- linux-3.10.21/kernel/vserver/Makefile 1970-01-01 00:00:00.000000000 +0000
15347+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/Makefile 2013-08-22 20:30:00.000000000 +0000 15349+++ linux-3.10.21-vs2.3.6.8/kernel/vserver/Makefile 2013-08-22 20:30:00.000000000 +0000
15348@@ -0,0 +1,18 @@ 15350@@ -0,0 +1,18 @@
15349+# 15351+#
15350+# Makefile for the Linux vserver routines. 15352+# Makefile for the Linux vserver routines.
@@ -15364,9 +15366,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/Makefile linux-3.10.19-vs2.3.
15364+vserver-$(CONFIG_VSERVER_MONITOR) += monitor.o 15366+vserver-$(CONFIG_VSERVER_MONITOR) += monitor.o
15365+vserver-$(CONFIG_VSERVER_DEVICE) += device.o 15367+vserver-$(CONFIG_VSERVER_DEVICE) += device.o
15366+ 15368+
15367diff -NurpP --minimal linux-3.10.19/kernel/vserver/cacct.c linux-3.10.19-vs2.3.6.8/kernel/vserver/cacct.c 15369diff -NurpP --minimal linux-3.10.21/kernel/vserver/cacct.c linux-3.10.21-vs2.3.6.8/kernel/vserver/cacct.c
15368--- linux-3.10.19/kernel/vserver/cacct.c 1970-01-01 00:00:00.000000000 +0000 15370--- linux-3.10.21/kernel/vserver/cacct.c 1970-01-01 00:00:00.000000000 +0000
15369+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/cacct.c 2013-08-22 20:30:00.000000000 +0000 15371+++ linux-3.10.21-vs2.3.6.8/kernel/vserver/cacct.c 2013-08-22 20:30:00.000000000 +0000
15370@@ -0,0 +1,42 @@ 15372@@ -0,0 +1,42 @@
15371+/* 15373+/*
15372+ * linux/kernel/vserver/cacct.c 15374+ * linux/kernel/vserver/cacct.c
@@ -15410,9 +15412,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/cacct.c linux-3.10.19-vs2.3.6
15410+ return 0; 15412+ return 0;
15411+} 15413+}
15412+ 15414+
15413diff -NurpP --minimal linux-3.10.19/kernel/vserver/cacct_init.h linux-3.10.19-vs2.3.6.8/kernel/vserver/cacct_init.h 15415diff -NurpP --minimal linux-3.10.21/kernel/vserver/cacct_init.h linux-3.10.21-vs2.3.6.8/kernel/vserver/cacct_init.h
15414--- linux-3.10.19/kernel/vserver/cacct_init.h 1970-01-01 00:00:00.000000000 +0000 15416--- linux-3.10.21/kernel/vserver/cacct_init.h 1970-01-01 00:00:00.000000000 +0000
15415+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/cacct_init.h 2013-08-22 20:30:00.000000000 +0000 15417+++ linux-3.10.21-vs2.3.6.8/kernel/vserver/cacct_init.h 2013-08-22 20:30:00.000000000 +0000
15416@@ -0,0 +1,25 @@ 15418@@ -0,0 +1,25 @@
15417+ 15419+
15418+ 15420+
@@ -15439,9 +15441,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/cacct_init.h linux-3.10.19-vs
15439+ return; 15441+ return;
15440+} 15442+}
15441+ 15443+
15442diff -NurpP --minimal linux-3.10.19/kernel/vserver/cacct_proc.h linux-3.10.19-vs2.3.6.8/kernel/vserver/cacct_proc.h 15444diff -NurpP --minimal linux-3.10.21/kernel/vserver/cacct_proc.h linux-3.10.21-vs2.3.6.8/kernel/vserver/cacct_proc.h
15443--- linux-3.10.19/kernel/vserver/cacct_proc.h 1970-01-01 00:00:00.000000000 +0000 15445--- linux-3.10.21/kernel/vserver/cacct_proc.h 1970-01-01 00:00:00.000000000 +0000
15444+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/cacct_proc.h 2013-08-22 20:30:00.000000000 +0000 15446+++ linux-3.10.21-vs2.3.6.8/kernel/vserver/cacct_proc.h 2013-08-22 20:30:00.000000000 +0000
15445@@ -0,0 +1,53 @@ 15447@@ -0,0 +1,53 @@
15446+#ifndef _VX_CACCT_PROC_H 15448+#ifndef _VX_CACCT_PROC_H
15447+#define _VX_CACCT_PROC_H 15449+#define _VX_CACCT_PROC_H
@@ -15496,9 +15498,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/cacct_proc.h linux-3.10.19-vs
15496+} 15498+}
15497+ 15499+
15498+#endif /* _VX_CACCT_PROC_H */ 15500+#endif /* _VX_CACCT_PROC_H */
15499diff -NurpP --minimal linux-3.10.19/kernel/vserver/context.c linux-3.10.19-vs2.3.6.8/kernel/vserver/context.c 15501diff -NurpP --minimal linux-3.10.21/kernel/vserver/context.c linux-3.10.21-vs2.3.6.8/kernel/vserver/context.c
15500--- linux-3.10.19/kernel/vserver/context.c 1970-01-01 00:00:00.000000000 +0000 15502--- linux-3.10.21/kernel/vserver/context.c 1970-01-01 00:00:00.000000000 +0000
15501+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/context.c 2013-08-22 20:30:00.000000000 +0000 15503+++ linux-3.10.21-vs2.3.6.8/kernel/vserver/context.c 2013-08-22 20:30:00.000000000 +0000
15502@@ -0,0 +1,1119 @@ 15504@@ -0,0 +1,1119 @@
15503+/* 15505+/*
15504+ * linux/kernel/vserver/context.c 15506+ * linux/kernel/vserver/context.c
@@ -16619,9 +16621,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/context.c linux-3.10.19-vs2.3
16619+ 16621+
16620+EXPORT_SYMBOL_GPL(free_vx_info); 16622+EXPORT_SYMBOL_GPL(free_vx_info);
16621+ 16623+
16622diff -NurpP --minimal linux-3.10.19/kernel/vserver/cvirt.c linux-3.10.19-vs2.3.6.8/kernel/vserver/cvirt.c 16624diff -NurpP --minimal linux-3.10.21/kernel/vserver/cvirt.c linux-3.10.21-vs2.3.6.8/kernel/vserver/cvirt.c
16623--- linux-3.10.19/kernel/vserver/cvirt.c 1970-01-01 00:00:00.000000000 +0000 16625--- linux-3.10.21/kernel/vserver/cvirt.c 1970-01-01 00:00:00.000000000 +0000
16624+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/cvirt.c 2013-08-22 20:30:00.000000000 +0000 16626+++ linux-3.10.21-vs2.3.6.8/kernel/vserver/cvirt.c 2013-08-22 20:30:00.000000000 +0000
16625@@ -0,0 +1,313 @@ 16627@@ -0,0 +1,313 @@
16626+/* 16628+/*
16627+ * linux/kernel/vserver/cvirt.c 16629+ * linux/kernel/vserver/cvirt.c
@@ -16936,9 +16938,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/cvirt.c linux-3.10.19-vs2.3.6
16936+ 16938+
16937+#endif 16939+#endif
16938+ 16940+
16939diff -NurpP --minimal linux-3.10.19/kernel/vserver/cvirt_init.h linux-3.10.19-vs2.3.6.8/kernel/vserver/cvirt_init.h 16941diff -NurpP --minimal linux-3.10.21/kernel/vserver/cvirt_init.h linux-3.10.21-vs2.3.6.8/kernel/vserver/cvirt_init.h
16940--- linux-3.10.19/kernel/vserver/cvirt_init.h 1970-01-01 00:00:00.000000000 +0000 16942--- linux-3.10.21/kernel/vserver/cvirt_init.h 1970-01-01 00:00:00.000000000 +0000
16941+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/cvirt_init.h 2013-08-22 20:30:00.000000000 +0000 16943+++ linux-3.10.21-vs2.3.6.8/kernel/vserver/cvirt_init.h 2013-08-22 20:30:00.000000000 +0000
16942@@ -0,0 +1,70 @@ 16944@@ -0,0 +1,70 @@
16943+ 16945+
16944+ 16946+
@@ -17010,9 +17012,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/cvirt_init.h linux-3.10.19-vs
17010+ return; 17012+ return;
17011+} 17013+}
17012+ 17014+
17013diff -NurpP --minimal linux-3.10.19/kernel/vserver/cvirt_proc.h linux-3.10.19-vs2.3.6.8/kernel/vserver/cvirt_proc.h 17015diff -NurpP --minimal linux-3.10.21/kernel/vserver/cvirt_proc.h linux-3.10.21-vs2.3.6.8/kernel/vserver/cvirt_proc.h
17014--- linux-3.10.19/kernel/vserver/cvirt_proc.h 1970-01-01 00:00:00.000000000 +0000 17016--- linux-3.10.21/kernel/vserver/cvirt_proc.h 1970-01-01 00:00:00.000000000 +0000
17015+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/cvirt_proc.h 2013-08-22 20:30:00.000000000 +0000 17017+++ linux-3.10.21-vs2.3.6.8/kernel/vserver/cvirt_proc.h 2013-08-22 20:30:00.000000000 +0000
17016@@ -0,0 +1,123 @@ 17018@@ -0,0 +1,123 @@
17017+#ifndef _VX_CVIRT_PROC_H 17019+#ifndef _VX_CVIRT_PROC_H
17018+#define _VX_CVIRT_PROC_H 17020+#define _VX_CVIRT_PROC_H
@@ -17137,9 +17139,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/cvirt_proc.h linux-3.10.19-vs
17137+} 17139+}
17138+ 17140+
17139+#endif /* _VX_CVIRT_PROC_H */ 17141+#endif /* _VX_CVIRT_PROC_H */
17140diff -NurpP --minimal linux-3.10.19/kernel/vserver/debug.c linux-3.10.19-vs2.3.6.8/kernel/vserver/debug.c 17142diff -NurpP --minimal linux-3.10.21/kernel/vserver/debug.c linux-3.10.21-vs2.3.6.8/kernel/vserver/debug.c
17141--- linux-3.10.19/kernel/vserver/debug.c 1970-01-01 00:00:00.000000000 +0000 17143--- linux-3.10.21/kernel/vserver/debug.c 1970-01-01 00:00:00.000000000 +0000
17142+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/debug.c 2013-08-22 20:30:00.000000000 +0000 17144+++ linux-3.10.21-vs2.3.6.8/kernel/vserver/debug.c 2013-08-22 20:30:00.000000000 +0000
17143@@ -0,0 +1,32 @@ 17145@@ -0,0 +1,32 @@
17144+/* 17146+/*
17145+ * kernel/vserver/debug.c 17147+ * kernel/vserver/debug.c
@@ -17173,9 +17175,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/debug.c linux-3.10.19-vs2.3.6
17173+ 17175+
17174+EXPORT_SYMBOL_GPL(dump_vx_info); 17176+EXPORT_SYMBOL_GPL(dump_vx_info);
17175+ 17177+
17176diff -NurpP --minimal linux-3.10.19/kernel/vserver/device.c linux-3.10.19-vs2.3.6.8/kernel/vserver/device.c 17178diff -NurpP --minimal linux-3.10.21/kernel/vserver/device.c linux-3.10.21-vs2.3.6.8/kernel/vserver/device.c
17177--- linux-3.10.19/kernel/vserver/device.c 1970-01-01 00:00:00.000000000 +0000 17179--- linux-3.10.21/kernel/vserver/device.c 1970-01-01 00:00:00.000000000 +0000
17178+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/device.c 2013-08-22 20:30:00.000000000 +0000 17180+++ linux-3.10.21-vs2.3.6.8/kernel/vserver/device.c 2013-08-22 20:30:00.000000000 +0000
17179@@ -0,0 +1,443 @@ 17181@@ -0,0 +1,443 @@
17180+/* 17182+/*
17181+ * linux/kernel/vserver/device.c 17183+ * linux/kernel/vserver/device.c
@@ -17620,9 +17622,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/device.c linux-3.10.19-vs2.3.
17620+#endif /* CONFIG_COMPAT */ 17622+#endif /* CONFIG_COMPAT */
17621+ 17623+
17622+ 17624+
17623diff -NurpP --minimal linux-3.10.19/kernel/vserver/dlimit.c linux-3.10.19-vs2.3.6.8/kernel/vserver/dlimit.c 17625diff -NurpP --minimal linux-3.10.21/kernel/vserver/dlimit.c linux-3.10.21-vs2.3.6.8/kernel/vserver/dlimit.c
17624--- linux-3.10.19/kernel/vserver/dlimit.c 1970-01-01 00:00:00.000000000 +0000 17626--- linux-3.10.21/kernel/vserver/dlimit.c 1970-01-01 00:00:00.000000000 +0000
17625+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/dlimit.c 2013-08-22 20:30:00.000000000 +0000 17627+++ linux-3.10.21-vs2.3.6.8/kernel/vserver/dlimit.c 2013-08-22 20:30:00.000000000 +0000
17626@@ -0,0 +1,528 @@ 17628@@ -0,0 +1,528 @@
17627+/* 17629+/*
17628+ * linux/kernel/vserver/dlimit.c 17630+ * linux/kernel/vserver/dlimit.c
@@ -18152,9 +18154,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/dlimit.c linux-3.10.19-vs2.3.
18152+EXPORT_SYMBOL_GPL(locate_dl_info); 18154+EXPORT_SYMBOL_GPL(locate_dl_info);
18153+EXPORT_SYMBOL_GPL(rcu_free_dl_info); 18155+EXPORT_SYMBOL_GPL(rcu_free_dl_info);
18154+ 18156+
18155diff -NurpP --minimal linux-3.10.19/kernel/vserver/helper.c linux-3.10.19-vs2.3.6.8/kernel/vserver/helper.c 18157diff -NurpP --minimal linux-3.10.21/kernel/vserver/helper.c linux-3.10.21-vs2.3.6.8/kernel/vserver/helper.c
18156--- linux-3.10.19/kernel/vserver/helper.c 1970-01-01 00:00:00.000000000 +0000 18158--- linux-3.10.21/kernel/vserver/helper.c 1970-01-01 00:00:00.000000000 +0000
18157+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/helper.c 2013-08-23 00:55:48.000000000 +0000 18159+++ linux-3.10.21-vs2.3.6.8/kernel/vserver/helper.c 2013-08-23 00:55:48.000000000 +0000
18158@@ -0,0 +1,242 @@ 18160@@ -0,0 +1,242 @@
18159+/* 18161+/*
18160+ * linux/kernel/vserver/helper.c 18162+ * linux/kernel/vserver/helper.c
@@ -18398,9 +18400,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/helper.c linux-3.10.19-vs2.3.
18398+ return do_vshelper(vshelper_path, argv, envp, 1); 18400+ return do_vshelper(vshelper_path, argv, envp, 1);
18399+} 18401+}
18400+ 18402+
18401diff -NurpP --minimal linux-3.10.19/kernel/vserver/history.c linux-3.10.19-vs2.3.6.8/kernel/vserver/history.c 18403diff -NurpP --minimal linux-3.10.21/kernel/vserver/history.c linux-3.10.21-vs2.3.6.8/kernel/vserver/history.c
18402--- linux-3.10.19/kernel/vserver/history.c 1970-01-01 00:00:00.000000000 +0000 18404--- linux-3.10.21/kernel/vserver/history.c 1970-01-01 00:00:00.000000000 +0000
18403+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/history.c 2013-08-22 20:30:00.000000000 +0000 18405+++ linux-3.10.21-vs2.3.6.8/kernel/vserver/history.c 2013-08-22 20:30:00.000000000 +0000
18404@@ -0,0 +1,258 @@ 18406@@ -0,0 +1,258 @@
18405+/* 18407+/*
18406+ * kernel/vserver/history.c 18408+ * kernel/vserver/history.c
@@ -18660,9 +18662,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/history.c linux-3.10.19-vs2.3
18660+ 18662+
18661+#endif /* CONFIG_COMPAT */ 18663+#endif /* CONFIG_COMPAT */
18662+ 18664+
18663diff -NurpP --minimal linux-3.10.19/kernel/vserver/inet.c linux-3.10.19-vs2.3.6.8/kernel/vserver/inet.c 18665diff -NurpP --minimal linux-3.10.21/kernel/vserver/inet.c linux-3.10.21-vs2.3.6.8/kernel/vserver/inet.c
18664--- linux-3.10.19/kernel/vserver/inet.c 1970-01-01 00:00:00.000000000 +0000 18666--- linux-3.10.21/kernel/vserver/inet.c 1970-01-01 00:00:00.000000000 +0000
18665+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/inet.c 2013-08-22 20:30:00.000000000 +0000 18667+++ linux-3.10.21-vs2.3.6.8/kernel/vserver/inet.c 2013-08-22 20:30:00.000000000 +0000
18666@@ -0,0 +1,236 @@ 18668@@ -0,0 +1,236 @@
18667+ 18669+
18668+#include <linux/in.h> 18670+#include <linux/in.h>
@@ -18900,9 +18902,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/inet.c linux-3.10.19-vs2.3.6.
18900+ 18902+
18901+EXPORT_SYMBOL_GPL(ip_v4_find_src); 18903+EXPORT_SYMBOL_GPL(ip_v4_find_src);
18902+ 18904+
18903diff -NurpP --minimal linux-3.10.19/kernel/vserver/init.c linux-3.10.19-vs2.3.6.8/kernel/vserver/init.c 18905diff -NurpP --minimal linux-3.10.21/kernel/vserver/init.c linux-3.10.21-vs2.3.6.8/kernel/vserver/init.c
18904--- linux-3.10.19/kernel/vserver/init.c 1970-01-01 00:00:00.000000000 +0000 18906--- linux-3.10.21/kernel/vserver/init.c 1970-01-01 00:00:00.000000000 +0000
18905+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/init.c 2013-08-22 20:30:00.000000000 +0000 18907+++ linux-3.10.21-vs2.3.6.8/kernel/vserver/init.c 2013-08-22 20:30:00.000000000 +0000
18906@@ -0,0 +1,45 @@ 18908@@ -0,0 +1,45 @@
18907+/* 18909+/*
18908+ * linux/kernel/init.c 18910+ * linux/kernel/init.c
@@ -18949,9 +18951,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/init.c linux-3.10.19-vs2.3.6.
18949+module_init(init_vserver); 18951+module_init(init_vserver);
18950+module_exit(exit_vserver); 18952+module_exit(exit_vserver);
18951+ 18953+
18952diff -NurpP --minimal linux-3.10.19/kernel/vserver/inode.c linux-3.10.19-vs2.3.6.8/kernel/vserver/inode.c 18954diff -NurpP --minimal linux-3.10.21/kernel/vserver/inode.c linux-3.10.21-vs2.3.6.8/kernel/vserver/inode.c
18953--- linux-3.10.19/kernel/vserver/inode.c 1970-01-01 00:00:00.000000000 +0000 18955--- linux-3.10.21/kernel/vserver/inode.c 1970-01-01 00:00:00.000000000 +0000
18954+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/inode.c 2013-08-22 23:14:01.000000000 +0000 18956+++ linux-3.10.21-vs2.3.6.8/kernel/vserver/inode.c 2013-08-22 23:14:01.000000000 +0000
18955@@ -0,0 +1,440 @@ 18957@@ -0,0 +1,440 @@
18956+/* 18958+/*
18957+ * linux/kernel/vserver/inode.c 18959+ * linux/kernel/vserver/inode.c
@@ -19393,9 +19395,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/inode.c linux-3.10.19-vs2.3.6
19393+ 19395+
19394+#endif /* CONFIG_PROPAGATE */ 19396+#endif /* CONFIG_PROPAGATE */
19395+ 19397+
19396diff -NurpP --minimal linux-3.10.19/kernel/vserver/limit.c linux-3.10.19-vs2.3.6.8/kernel/vserver/limit.c 19398diff -NurpP --minimal linux-3.10.21/kernel/vserver/limit.c linux-3.10.21-vs2.3.6.8/kernel/vserver/limit.c
19397--- linux-3.10.19/kernel/vserver/limit.c 1970-01-01 00:00:00.000000000 +0000 19399--- linux-3.10.21/kernel/vserver/limit.c 1970-01-01 00:00:00.000000000 +0000
19398+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/limit.c 2013-08-22 20:30:00.000000000 +0000 19400+++ linux-3.10.21-vs2.3.6.8/kernel/vserver/limit.c 2013-08-22 20:30:00.000000000 +0000
19399@@ -0,0 +1,345 @@ 19401@@ -0,0 +1,345 @@
19400+/* 19402+/*
19401+ * linux/kernel/vserver/limit.c 19403+ * linux/kernel/vserver/limit.c
@@ -19742,9 +19744,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/limit.c linux-3.10.19-vs2.3.6
19742+ return cache; 19744+ return cache;
19743+} 19745+}
19744+ 19746+
19745diff -NurpP --minimal linux-3.10.19/kernel/vserver/limit_init.h linux-3.10.19-vs2.3.6.8/kernel/vserver/limit_init.h 19747diff -NurpP --minimal linux-3.10.21/kernel/vserver/limit_init.h linux-3.10.21-vs2.3.6.8/kernel/vserver/limit_init.h
19746--- linux-3.10.19/kernel/vserver/limit_init.h 1970-01-01 00:00:00.000000000 +0000 19748--- linux-3.10.21/kernel/vserver/limit_init.h 1970-01-01 00:00:00.000000000 +0000
19747+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/limit_init.h 2013-08-22 20:30:00.000000000 +0000 19749+++ linux-3.10.21-vs2.3.6.8/kernel/vserver/limit_init.h 2013-08-22 20:30:00.000000000 +0000
19748@@ -0,0 +1,31 @@ 19750@@ -0,0 +1,31 @@
19749+ 19751+
19750+ 19752+
@@ -19777,9 +19779,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/limit_init.h linux-3.10.19-vs
19777+ } 19779+ }
19778+} 19780+}
19779+ 19781+
19780diff -NurpP --minimal linux-3.10.19/kernel/vserver/limit_proc.h linux-3.10.19-vs2.3.6.8/kernel/vserver/limit_proc.h 19782diff -NurpP --minimal linux-3.10.21/kernel/vserver/limit_proc.h linux-3.10.21-vs2.3.6.8/kernel/vserver/limit_proc.h
19781--- linux-3.10.19/kernel/vserver/limit_proc.h 1970-01-01 00:00:00.000000000 +0000 19783--- linux-3.10.21/kernel/vserver/limit_proc.h 1970-01-01 00:00:00.000000000 +0000
19782+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/limit_proc.h 2013-08-22 20:30:00.000000000 +0000 19784+++ linux-3.10.21-vs2.3.6.8/kernel/vserver/limit_proc.h 2013-08-22 20:30:00.000000000 +0000
19783@@ -0,0 +1,57 @@ 19785@@ -0,0 +1,57 @@
19784+#ifndef _VX_LIMIT_PROC_H 19786+#ifndef _VX_LIMIT_PROC_H
19785+#define _VX_LIMIT_PROC_H 19787+#define _VX_LIMIT_PROC_H
@@ -19838,9 +19840,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/limit_proc.h linux-3.10.19-vs
19838+#endif /* _VX_LIMIT_PROC_H */ 19840+#endif /* _VX_LIMIT_PROC_H */
19839+ 19841+
19840+ 19842+
19841diff -NurpP --minimal linux-3.10.19/kernel/vserver/network.c linux-3.10.19-vs2.3.6.8/kernel/vserver/network.c 19843diff -NurpP --minimal linux-3.10.21/kernel/vserver/network.c linux-3.10.21-vs2.3.6.8/kernel/vserver/network.c
19842--- linux-3.10.19/kernel/vserver/network.c 1970-01-01 00:00:00.000000000 +0000 19844--- linux-3.10.21/kernel/vserver/network.c 1970-01-01 00:00:00.000000000 +0000
19843+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/network.c 2013-08-22 20:30:00.000000000 +0000 19845+++ linux-3.10.21-vs2.3.6.8/kernel/vserver/network.c 2013-08-22 20:30:00.000000000 +0000
19844@@ -0,0 +1,1053 @@ 19846@@ -0,0 +1,1053 @@
19845+/* 19847+/*
19846+ * linux/kernel/vserver/network.c 19848+ * linux/kernel/vserver/network.c
@@ -20895,9 +20897,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/network.c linux-3.10.19-vs2.3
20895+EXPORT_SYMBOL_GPL(free_nx_info); 20897+EXPORT_SYMBOL_GPL(free_nx_info);
20896+EXPORT_SYMBOL_GPL(unhash_nx_info); 20898+EXPORT_SYMBOL_GPL(unhash_nx_info);
20897+ 20899+
20898diff -NurpP --minimal linux-3.10.19/kernel/vserver/proc.c linux-3.10.19-vs2.3.6.8/kernel/vserver/proc.c 20900diff -NurpP --minimal linux-3.10.21/kernel/vserver/proc.c linux-3.10.21-vs2.3.6.8/kernel/vserver/proc.c
20899--- linux-3.10.19/kernel/vserver/proc.c 1970-01-01 00:00:00.000000000 +0000 20901--- linux-3.10.21/kernel/vserver/proc.c 1970-01-01 00:00:00.000000000 +0000
20900+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/proc.c 2013-08-22 23:31:37.000000000 +0000 20902+++ linux-3.10.21-vs2.3.6.8/kernel/vserver/proc.c 2013-08-22 23:31:37.000000000 +0000
20901@@ -0,0 +1,1113 @@ 20903@@ -0,0 +1,1113 @@
20902+/* 20904+/*
20903+ * linux/kernel/vserver/proc.c 20905+ * linux/kernel/vserver/proc.c
@@ -22012,9 +22014,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/proc.c linux-3.10.19-vs2.3.6.
22012+ return buffer - orig; 22014+ return buffer - orig;
22013+} 22015+}
22014+ 22016+
22015diff -NurpP --minimal linux-3.10.19/kernel/vserver/sched.c linux-3.10.19-vs2.3.6.8/kernel/vserver/sched.c 22017diff -NurpP --minimal linux-3.10.21/kernel/vserver/sched.c linux-3.10.21-vs2.3.6.8/kernel/vserver/sched.c
22016--- linux-3.10.19/kernel/vserver/sched.c 1970-01-01 00:00:00.000000000 +0000 22018--- linux-3.10.21/kernel/vserver/sched.c 1970-01-01 00:00:00.000000000 +0000
22017+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/sched.c 2013-08-22 20:30:00.000000000 +0000 22019+++ linux-3.10.21-vs2.3.6.8/kernel/vserver/sched.c 2013-08-22 20:30:00.000000000 +0000
22018@@ -0,0 +1,83 @@ 22020@@ -0,0 +1,83 @@
22019+/* 22021+/*
22020+ * linux/kernel/vserver/sched.c 22022+ * linux/kernel/vserver/sched.c
@@ -22099,9 +22101,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/sched.c linux-3.10.19-vs2.3.6
22099+ return 0; 22101+ return 0;
22100+} 22102+}
22101+ 22103+
22102diff -NurpP --minimal linux-3.10.19/kernel/vserver/sched_init.h linux-3.10.19-vs2.3.6.8/kernel/vserver/sched_init.h 22104diff -NurpP --minimal linux-3.10.21/kernel/vserver/sched_init.h linux-3.10.21-vs2.3.6.8/kernel/vserver/sched_init.h
22103--- linux-3.10.19/kernel/vserver/sched_init.h 1970-01-01 00:00:00.000000000 +0000 22105--- linux-3.10.21/kernel/vserver/sched_init.h 1970-01-01 00:00:00.000000000 +0000
22104+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/sched_init.h 2013-08-22 20:30:00.000000000 +0000 22106+++ linux-3.10.21-vs2.3.6.8/kernel/vserver/sched_init.h 2013-08-22 20:30:00.000000000 +0000
22105@@ -0,0 +1,27 @@ 22107@@ -0,0 +1,27 @@
22106+ 22108+
22107+static inline void vx_info_init_sched(struct _vx_sched *sched) 22109+static inline void vx_info_init_sched(struct _vx_sched *sched)
@@ -22130,9 +22132,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/sched_init.h linux-3.10.19-vs
22130+{ 22132+{
22131+ return; 22133+ return;
22132+} 22134+}
22133diff -NurpP --minimal linux-3.10.19/kernel/vserver/sched_proc.h linux-3.10.19-vs2.3.6.8/kernel/vserver/sched_proc.h 22135diff -NurpP --minimal linux-3.10.21/kernel/vserver/sched_proc.h linux-3.10.21-vs2.3.6.8/kernel/vserver/sched_proc.h
22134--- linux-3.10.19/kernel/vserver/sched_proc.h 1970-01-01 00:00:00.000000000 +0000 22136--- linux-3.10.21/kernel/vserver/sched_proc.h 1970-01-01 00:00:00.000000000 +0000
22135+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/sched_proc.h 2013-08-22 20:30:00.000000000 +0000 22137+++ linux-3.10.21-vs2.3.6.8/kernel/vserver/sched_proc.h 2013-08-22 20:30:00.000000000 +0000
22136@@ -0,0 +1,32 @@ 22138@@ -0,0 +1,32 @@
22137+#ifndef _VX_SCHED_PROC_H 22139+#ifndef _VX_SCHED_PROC_H
22138+#define _VX_SCHED_PROC_H 22140+#define _VX_SCHED_PROC_H
@@ -22166,9 +22168,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/sched_proc.h linux-3.10.19-vs
22166+} 22168+}
22167+ 22169+
22168+#endif /* _VX_SCHED_PROC_H */ 22170+#endif /* _VX_SCHED_PROC_H */
22169diff -NurpP --minimal linux-3.10.19/kernel/vserver/signal.c linux-3.10.19-vs2.3.6.8/kernel/vserver/signal.c 22171diff -NurpP --minimal linux-3.10.21/kernel/vserver/signal.c linux-3.10.21-vs2.3.6.8/kernel/vserver/signal.c
22170--- linux-3.10.19/kernel/vserver/signal.c 1970-01-01 00:00:00.000000000 +0000 22172--- linux-3.10.21/kernel/vserver/signal.c 1970-01-01 00:00:00.000000000 +0000
22171+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/signal.c 2013-08-22 20:30:00.000000000 +0000 22173+++ linux-3.10.21-vs2.3.6.8/kernel/vserver/signal.c 2013-08-22 20:30:00.000000000 +0000
22172@@ -0,0 +1,134 @@ 22174@@ -0,0 +1,134 @@
22173+/* 22175+/*
22174+ * linux/kernel/vserver/signal.c 22176+ * linux/kernel/vserver/signal.c
@@ -22304,9 +22306,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/signal.c linux-3.10.19-vs2.3.
22304+ return ret; 22306+ return ret;
22305+} 22307+}
22306+ 22308+
22307diff -NurpP --minimal linux-3.10.19/kernel/vserver/space.c linux-3.10.19-vs2.3.6.8/kernel/vserver/space.c 22309diff -NurpP --minimal linux-3.10.21/kernel/vserver/space.c linux-3.10.21-vs2.3.6.8/kernel/vserver/space.c
22308--- linux-3.10.19/kernel/vserver/space.c 1970-01-01 00:00:00.000000000 +0000 22310--- linux-3.10.21/kernel/vserver/space.c 1970-01-01 00:00:00.000000000 +0000
22309+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/space.c 2013-08-22 20:30:00.000000000 +0000 22311+++ linux-3.10.21-vs2.3.6.8/kernel/vserver/space.c 2013-08-22 20:30:00.000000000 +0000
22310@@ -0,0 +1,436 @@ 22312@@ -0,0 +1,436 @@
22311+/* 22313+/*
22312+ * linux/kernel/vserver/space.c 22314+ * linux/kernel/vserver/space.c
@@ -22744,9 +22746,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/space.c linux-3.10.19-vs2.3.6
22744+ return 0; 22746+ return 0;
22745+} 22747+}
22746+ 22748+
22747diff -NurpP --minimal linux-3.10.19/kernel/vserver/switch.c linux-3.10.19-vs2.3.6.8/kernel/vserver/switch.c 22749diff -NurpP --minimal linux-3.10.21/kernel/vserver/switch.c linux-3.10.21-vs2.3.6.8/kernel/vserver/switch.c
22748--- linux-3.10.19/kernel/vserver/switch.c 1970-01-01 00:00:00.000000000 +0000 22750--- linux-3.10.21/kernel/vserver/switch.c 1970-01-01 00:00:00.000000000 +0000
22749+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/switch.c 2013-08-22 20:30:00.000000000 +0000 22751+++ linux-3.10.21-vs2.3.6.8/kernel/vserver/switch.c 2013-08-22 20:30:00.000000000 +0000
22750@@ -0,0 +1,556 @@ 22752@@ -0,0 +1,556 @@
22751+/* 22753+/*
22752+ * linux/kernel/vserver/switch.c 22754+ * linux/kernel/vserver/switch.c
@@ -23304,9 +23306,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/switch.c linux-3.10.19-vs2.3.
23304+} 23306+}
23305+ 23307+
23306+#endif /* CONFIG_COMPAT */ 23308+#endif /* CONFIG_COMPAT */
23307diff -NurpP --minimal linux-3.10.19/kernel/vserver/sysctl.c linux-3.10.19-vs2.3.6.8/kernel/vserver/sysctl.c 23309diff -NurpP --minimal linux-3.10.21/kernel/vserver/sysctl.c linux-3.10.21-vs2.3.6.8/kernel/vserver/sysctl.c
23308--- linux-3.10.19/kernel/vserver/sysctl.c 1970-01-01 00:00:00.000000000 +0000 23310--- linux-3.10.21/kernel/vserver/sysctl.c 1970-01-01 00:00:00.000000000 +0000
23309+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/sysctl.c 2013-08-22 20:30:00.000000000 +0000 23311+++ linux-3.10.21-vs2.3.6.8/kernel/vserver/sysctl.c 2013-08-22 20:30:00.000000000 +0000
23310@@ -0,0 +1,247 @@ 23312@@ -0,0 +1,247 @@
23311+/* 23313+/*
23312+ * kernel/vserver/sysctl.c 23314+ * kernel/vserver/sysctl.c
@@ -23555,9 +23557,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/sysctl.c linux-3.10.19-vs2.3.
23555+EXPORT_SYMBOL_GPL(vs_debug_perm); 23557+EXPORT_SYMBOL_GPL(vs_debug_perm);
23556+EXPORT_SYMBOL_GPL(vs_debug_misc); 23558+EXPORT_SYMBOL_GPL(vs_debug_misc);
23557+ 23559+
23558diff -NurpP --minimal linux-3.10.19/kernel/vserver/tag.c linux-3.10.19-vs2.3.6.8/kernel/vserver/tag.c 23560diff -NurpP --minimal linux-3.10.21/kernel/vserver/tag.c linux-3.10.21-vs2.3.6.8/kernel/vserver/tag.c
23559--- linux-3.10.19/kernel/vserver/tag.c 1970-01-01 00:00:00.000000000 +0000 23561--- linux-3.10.21/kernel/vserver/tag.c 1970-01-01 00:00:00.000000000 +0000
23560+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/tag.c 2013-08-22 20:30:00.000000000 +0000 23562+++ linux-3.10.21-vs2.3.6.8/kernel/vserver/tag.c 2013-08-22 20:30:00.000000000 +0000
23561@@ -0,0 +1,63 @@ 23563@@ -0,0 +1,63 @@
23562+/* 23564+/*
23563+ * linux/kernel/vserver/tag.c 23565+ * linux/kernel/vserver/tag.c
@@ -23622,9 +23624,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/tag.c linux-3.10.19-vs2.3.6.8
23622+} 23624+}
23623+ 23625+
23624+ 23626+
23625diff -NurpP --minimal linux-3.10.19/kernel/vserver/vci_config.h linux-3.10.19-vs2.3.6.8/kernel/vserver/vci_config.h 23627diff -NurpP --minimal linux-3.10.21/kernel/vserver/vci_config.h linux-3.10.21-vs2.3.6.8/kernel/vserver/vci_config.h
23626--- linux-3.10.19/kernel/vserver/vci_config.h 1970-01-01 00:00:00.000000000 +0000 23628--- linux-3.10.21/kernel/vserver/vci_config.h 1970-01-01 00:00:00.000000000 +0000
23627+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/vci_config.h 2013-08-22 20:30:00.000000000 +0000 23629+++ linux-3.10.21-vs2.3.6.8/kernel/vserver/vci_config.h 2013-08-22 20:30:00.000000000 +0000
23628@@ -0,0 +1,80 @@ 23630@@ -0,0 +1,80 @@
23629+ 23631+
23630+/* interface version */ 23632+/* interface version */
@@ -23706,9 +23708,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/vci_config.h linux-3.10.19-vs
23706+ 0; 23708+ 0;
23707+} 23709+}
23708+ 23710+
23709diff -NurpP --minimal linux-3.10.19/mm/memcontrol.c linux-3.10.19-vs2.3.6.8/mm/memcontrol.c 23711diff -NurpP --minimal linux-3.10.21/mm/memcontrol.c linux-3.10.21-vs2.3.6.8/mm/memcontrol.c
23710--- linux-3.10.19/mm/memcontrol.c 2013-11-13 17:21:14.000000000 +0000 23712--- linux-3.10.21/mm/memcontrol.c 2013-11-30 07:50:51.000000000 +0000
23711+++ linux-3.10.19-vs2.3.6.8/mm/memcontrol.c 2013-11-13 17:17:16.000000000 +0000 23713+++ linux-3.10.21-vs2.3.6.8/mm/memcontrol.c 2013-11-13 17:17:16.000000000 +0000
23712@@ -1082,6 +1082,31 @@ struct mem_cgroup *mem_cgroup_from_task( 23714@@ -1082,6 +1082,31 @@ struct mem_cgroup *mem_cgroup_from_task(
23713 return mem_cgroup_from_css(task_subsys_state(p, mem_cgroup_subsys_id)); 23715 return mem_cgroup_from_css(task_subsys_state(p, mem_cgroup_subsys_id));
23714 } 23716 }
@@ -23741,9 +23743,9 @@ diff -NurpP --minimal linux-3.10.19/mm/memcontrol.c linux-3.10.19-vs2.3.6.8/mm/m
23741 struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm) 23743 struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm)
23742 { 23744 {
23743 struct mem_cgroup *memcg = NULL; 23745 struct mem_cgroup *memcg = NULL;
23744diff -NurpP --minimal linux-3.10.19/mm/oom_kill.c linux-3.10.19-vs2.3.6.8/mm/oom_kill.c 23746diff -NurpP --minimal linux-3.10.21/mm/oom_kill.c linux-3.10.21-vs2.3.6.8/mm/oom_kill.c
23745--- linux-3.10.19/mm/oom_kill.c 2013-05-31 13:45:31.000000000 +0000 23747--- linux-3.10.21/mm/oom_kill.c 2013-05-31 13:45:31.000000000 +0000
23746+++ linux-3.10.19-vs2.3.6.8/mm/oom_kill.c 2013-08-22 20:30:00.000000000 +0000 23748+++ linux-3.10.21-vs2.3.6.8/mm/oom_kill.c 2013-08-22 20:30:00.000000000 +0000
23747@@ -35,6 +35,8 @@ 23749@@ -35,6 +35,8 @@
23748 #include <linux/freezer.h> 23750 #include <linux/freezer.h>
23749 #include <linux/ftrace.h> 23751 #include <linux/ftrace.h>
@@ -23818,9 +23820,9 @@ diff -NurpP --minimal linux-3.10.19/mm/oom_kill.c linux-3.10.19-vs2.3.6.8/mm/oom
23818 } 23820 }
23819 if (PTR_ERR(p) != -1UL) { 23821 if (PTR_ERR(p) != -1UL) {
23820 oom_kill_process(p, gfp_mask, order, points, totalpages, NULL, 23822 oom_kill_process(p, gfp_mask, order, points, totalpages, NULL,
23821diff -NurpP --minimal linux-3.10.19/mm/page_alloc.c linux-3.10.19-vs2.3.6.8/mm/page_alloc.c 23823diff -NurpP --minimal linux-3.10.21/mm/page_alloc.c linux-3.10.21-vs2.3.6.8/mm/page_alloc.c
23822--- linux-3.10.19/mm/page_alloc.c 2013-11-13 17:21:14.000000000 +0000 23824--- linux-3.10.21/mm/page_alloc.c 2013-11-30 07:50:51.000000000 +0000
23823+++ linux-3.10.19-vs2.3.6.8/mm/page_alloc.c 2013-11-13 17:17:16.000000000 +0000 23825+++ linux-3.10.21-vs2.3.6.8/mm/page_alloc.c 2013-11-13 17:17:16.000000000 +0000
23824@@ -60,6 +60,8 @@ 23826@@ -60,6 +60,8 @@
23825 #include <linux/page-debug-flags.h> 23827 #include <linux/page-debug-flags.h>
23826 #include <linux/hugetlb.h> 23828 #include <linux/hugetlb.h>
@@ -23850,9 +23852,9 @@ diff -NurpP --minimal linux-3.10.19/mm/page_alloc.c linux-3.10.19-vs2.3.6.8/mm/p
23850 } 23852 }
23851 #endif 23853 #endif
23852 23854
23853diff -NurpP --minimal linux-3.10.19/mm/pgtable-generic.c linux-3.10.19-vs2.3.6.8/mm/pgtable-generic.c 23855diff -NurpP --minimal linux-3.10.21/mm/pgtable-generic.c linux-3.10.21-vs2.3.6.8/mm/pgtable-generic.c
23854--- linux-3.10.19/mm/pgtable-generic.c 2013-02-19 13:58:57.000000000 +0000 23856--- linux-3.10.21/mm/pgtable-generic.c 2013-02-19 13:58:57.000000000 +0000
23855+++ linux-3.10.19-vs2.3.6.8/mm/pgtable-generic.c 2013-08-22 20:30:00.000000000 +0000 23857+++ linux-3.10.21-vs2.3.6.8/mm/pgtable-generic.c 2013-08-22 20:30:00.000000000 +0000
23856@@ -6,6 +6,8 @@ 23858@@ -6,6 +6,8 @@
23857 * Copyright (C) 2010 Linus Torvalds 23859 * Copyright (C) 2010 Linus Torvalds
23858 */ 23860 */
@@ -23862,9 +23864,9 @@ diff -NurpP --minimal linux-3.10.19/mm/pgtable-generic.c linux-3.10.19-vs2.3.6.8
23862 #include <linux/pagemap.h> 23864 #include <linux/pagemap.h>
23863 #include <asm/tlb.h> 23865 #include <asm/tlb.h>
23864 #include <asm-generic/pgtable.h> 23866 #include <asm-generic/pgtable.h>
23865diff -NurpP --minimal linux-3.10.19/mm/shmem.c linux-3.10.19-vs2.3.6.8/mm/shmem.c 23867diff -NurpP --minimal linux-3.10.21/mm/shmem.c linux-3.10.21-vs2.3.6.8/mm/shmem.c
23866--- linux-3.10.19/mm/shmem.c 2013-11-13 17:21:14.000000000 +0000 23868--- linux-3.10.21/mm/shmem.c 2013-11-30 07:50:51.000000000 +0000
23867+++ linux-3.10.19-vs2.3.6.8/mm/shmem.c 2013-11-13 17:17:16.000000000 +0000 23869+++ linux-3.10.21-vs2.3.6.8/mm/shmem.c 2013-11-13 17:17:16.000000000 +0000
23868@@ -1911,7 +1911,7 @@ static int shmem_statfs(struct dentry *d 23870@@ -1911,7 +1911,7 @@ static int shmem_statfs(struct dentry *d
23869 { 23871 {
23870 struct shmem_sb_info *sbinfo = SHMEM_SB(dentry->d_sb); 23872 struct shmem_sb_info *sbinfo = SHMEM_SB(dentry->d_sb);
@@ -23883,9 +23885,9 @@ diff -NurpP --minimal linux-3.10.19/mm/shmem.c linux-3.10.19-vs2.3.6.8/mm/shmem.
23883 sb->s_op = &shmem_ops; 23885 sb->s_op = &shmem_ops;
23884 sb->s_time_gran = 1; 23886 sb->s_time_gran = 1;
23885 #ifdef CONFIG_TMPFS_XATTR 23887 #ifdef CONFIG_TMPFS_XATTR
23886diff -NurpP --minimal linux-3.10.19/mm/slab.c linux-3.10.19-vs2.3.6.8/mm/slab.c 23888diff -NurpP --minimal linux-3.10.21/mm/slab.c linux-3.10.21-vs2.3.6.8/mm/slab.c
23887--- linux-3.10.19/mm/slab.c 2013-11-13 17:21:14.000000000 +0000 23889--- linux-3.10.21/mm/slab.c 2013-11-30 07:50:51.000000000 +0000
23888+++ linux-3.10.19-vs2.3.6.8/mm/slab.c 2013-11-13 17:17:16.000000000 +0000 23890+++ linux-3.10.21-vs2.3.6.8/mm/slab.c 2013-11-13 17:17:16.000000000 +0000
23889@@ -388,6 +388,8 @@ static void kmem_cache_node_init(struct 23891@@ -388,6 +388,8 @@ static void kmem_cache_node_init(struct
23890 #define STATS_INC_FREEMISS(x) do { } while (0) 23892 #define STATS_INC_FREEMISS(x) do { } while (0)
23891 #endif 23893 #endif
@@ -23919,9 +23921,9 @@ diff -NurpP --minimal linux-3.10.19/mm/slab.c linux-3.10.19-vs2.3.6.8/mm/slab.c
23919 23921
23920 kmemcheck_slab_free(cachep, objp, cachep->object_size); 23922 kmemcheck_slab_free(cachep, objp, cachep->object_size);
23921 23923
23922diff -NurpP --minimal linux-3.10.19/mm/slab_vs.h linux-3.10.19-vs2.3.6.8/mm/slab_vs.h 23924diff -NurpP --minimal linux-3.10.21/mm/slab_vs.h linux-3.10.21-vs2.3.6.8/mm/slab_vs.h
23923--- linux-3.10.19/mm/slab_vs.h 1970-01-01 00:00:00.000000000 +0000 23925--- linux-3.10.21/mm/slab_vs.h 1970-01-01 00:00:00.000000000 +0000
23924+++ linux-3.10.19-vs2.3.6.8/mm/slab_vs.h 2013-08-22 20:30:00.000000000 +0000 23926+++ linux-3.10.21-vs2.3.6.8/mm/slab_vs.h 2013-08-22 20:30:00.000000000 +0000
23925@@ -0,0 +1,29 @@ 23927@@ -0,0 +1,29 @@
23926+ 23928+
23927+#include <linux/vserver/context.h> 23929+#include <linux/vserver/context.h>
@@ -23952,9 +23954,9 @@ diff -NurpP --minimal linux-3.10.19/mm/slab_vs.h linux-3.10.19-vs2.3.6.8/mm/slab
23952+ atomic_sub(cachep->size, &vxi->cacct.slab[what]); 23954+ atomic_sub(cachep->size, &vxi->cacct.slab[what]);
23953+} 23955+}
23954+ 23956+
23955diff -NurpP --minimal linux-3.10.19/mm/swapfile.c linux-3.10.19-vs2.3.6.8/mm/swapfile.c 23957diff -NurpP --minimal linux-3.10.21/mm/swapfile.c linux-3.10.21-vs2.3.6.8/mm/swapfile.c
23956--- linux-3.10.19/mm/swapfile.c 2013-07-14 17:01:36.000000000 +0000 23958--- linux-3.10.21/mm/swapfile.c 2013-07-14 17:01:36.000000000 +0000
23957+++ linux-3.10.19-vs2.3.6.8/mm/swapfile.c 2013-08-22 20:30:00.000000000 +0000 23959+++ linux-3.10.21-vs2.3.6.8/mm/swapfile.c 2013-08-22 20:30:00.000000000 +0000
23958@@ -39,6 +39,7 @@ 23960@@ -39,6 +39,7 @@
23959 #include <asm/tlbflush.h> 23961 #include <asm/tlbflush.h>
23960 #include <linux/swapops.h> 23962 #include <linux/swapops.h>
@@ -23989,9 +23991,9 @@ diff -NurpP --minimal linux-3.10.19/mm/swapfile.c linux-3.10.19-vs2.3.6.8/mm/swa
23989 } 23991 }
23990 23992
23991 /* 23993 /*
23992diff -NurpP --minimal linux-3.10.19/net/bridge/br_multicast.c linux-3.10.19-vs2.3.6.8/net/bridge/br_multicast.c 23994diff -NurpP --minimal linux-3.10.21/net/bridge/br_multicast.c linux-3.10.21-vs2.3.6.8/net/bridge/br_multicast.c
23993--- linux-3.10.19/net/bridge/br_multicast.c 2013-11-13 17:21:14.000000000 +0000 23995--- linux-3.10.21/net/bridge/br_multicast.c 2013-11-30 07:50:51.000000000 +0000
23994+++ linux-3.10.19-vs2.3.6.8/net/bridge/br_multicast.c 2013-11-13 17:17:16.000000000 +0000 23996+++ linux-3.10.21-vs2.3.6.8/net/bridge/br_multicast.c 2013-11-13 17:17:16.000000000 +0000
23995@@ -443,7 +443,7 @@ static struct sk_buff *br_ip6_multicast_ 23997@@ -443,7 +443,7 @@ static struct sk_buff *br_ip6_multicast_
23996 ip6h->hop_limit = 1; 23998 ip6h->hop_limit = 1;
23997 ipv6_addr_set(&ip6h->daddr, htonl(0xff020000), 0, 0, htonl(1)); 23999 ipv6_addr_set(&ip6h->daddr, htonl(0xff020000), 0, 0, htonl(1));
@@ -24001,9 +24003,9 @@ diff -NurpP --minimal linux-3.10.19/net/bridge/br_multicast.c linux-3.10.19-vs2.
24001 kfree_skb(skb); 24003 kfree_skb(skb);
24002 return NULL; 24004 return NULL;
24003 } 24005 }
24004diff -NurpP --minimal linux-3.10.19/net/core/dev.c linux-3.10.19-vs2.3.6.8/net/core/dev.c 24006diff -NurpP --minimal linux-3.10.21/net/core/dev.c linux-3.10.21-vs2.3.6.8/net/core/dev.c
24005--- linux-3.10.19/net/core/dev.c 2013-11-13 17:21:15.000000000 +0000 24007--- linux-3.10.21/net/core/dev.c 2013-11-30 07:50:51.000000000 +0000
24006+++ linux-3.10.19-vs2.3.6.8/net/core/dev.c 2013-11-13 17:17:16.000000000 +0000 24008+++ linux-3.10.21-vs2.3.6.8/net/core/dev.c 2013-11-13 17:17:16.000000000 +0000
24007@@ -122,6 +122,7 @@ 24009@@ -122,6 +122,7 @@
24008 #include <linux/in.h> 24010 #include <linux/in.h>
24009 #include <linux/jhash.h> 24011 #include <linux/jhash.h>
@@ -24121,9 +24123,9 @@ diff -NurpP --minimal linux-3.10.19/net/core/dev.c linux-3.10.19-vs2.3.6.8/net/c
24121 24123
24122 /* avoid cases where sscanf is not exact inverse of printf */ 24124 /* avoid cases where sscanf is not exact inverse of printf */
24123 snprintf(buf, IFNAMSIZ, name, i); 24125 snprintf(buf, IFNAMSIZ, name, i);
24124diff -NurpP --minimal linux-3.10.19/net/core/net-procfs.c linux-3.10.19-vs2.3.6.8/net/core/net-procfs.c 24126diff -NurpP --minimal linux-3.10.21/net/core/net-procfs.c linux-3.10.21-vs2.3.6.8/net/core/net-procfs.c
24125--- linux-3.10.19/net/core/net-procfs.c 2013-07-14 17:01:37.000000000 +0000 24127--- linux-3.10.21/net/core/net-procfs.c 2013-07-14 17:01:37.000000000 +0000
24126+++ linux-3.10.19-vs2.3.6.8/net/core/net-procfs.c 2013-08-22 20:30:00.000000000 +0000 24128+++ linux-3.10.21-vs2.3.6.8/net/core/net-procfs.c 2013-08-22 20:30:00.000000000 +0000
24127@@ -1,6 +1,7 @@ 24129@@ -1,6 +1,7 @@
24128 #include <linux/netdevice.h> 24130 #include <linux/netdevice.h>
24129 #include <linux/proc_fs.h> 24131 #include <linux/proc_fs.h>
@@ -24147,9 +24149,9 @@ diff -NurpP --minimal linux-3.10.19/net/core/net-procfs.c linux-3.10.19-vs2.3.6.
24147 seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu " 24149 seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
24148 "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n", 24150 "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
24149 dev->name, stats->rx_bytes, stats->rx_packets, 24151 dev->name, stats->rx_bytes, stats->rx_packets,
24150diff -NurpP --minimal linux-3.10.19/net/core/rtnetlink.c linux-3.10.19-vs2.3.6.8/net/core/rtnetlink.c 24152diff -NurpP --minimal linux-3.10.21/net/core/rtnetlink.c linux-3.10.21-vs2.3.6.8/net/core/rtnetlink.c
24151--- linux-3.10.19/net/core/rtnetlink.c 2013-11-13 17:21:15.000000000 +0000 24153--- linux-3.10.21/net/core/rtnetlink.c 2013-11-30 07:50:51.000000000 +0000
24152+++ linux-3.10.19-vs2.3.6.8/net/core/rtnetlink.c 2013-11-13 17:17:16.000000000 +0000 24154+++ linux-3.10.21-vs2.3.6.8/net/core/rtnetlink.c 2013-11-13 17:17:16.000000000 +0000
24153@@ -1059,6 +1059,8 @@ static int rtnl_dump_ifinfo(struct sk_bu 24155@@ -1059,6 +1059,8 @@ static int rtnl_dump_ifinfo(struct sk_bu
24154 hlist_for_each_entry_rcu(dev, head, index_hlist) { 24156 hlist_for_each_entry_rcu(dev, head, index_hlist) {
24155 if (idx < s_idx) 24157 if (idx < s_idx)
@@ -24169,9 +24171,9 @@ diff -NurpP --minimal linux-3.10.19/net/core/rtnetlink.c linux-3.10.19-vs2.3.6.8
24169 skb = nlmsg_new((if_info_size = if_nlmsg_size(dev, 0)), GFP_KERNEL); 24171 skb = nlmsg_new((if_info_size = if_nlmsg_size(dev, 0)), GFP_KERNEL);
24170 if (skb == NULL) 24172 if (skb == NULL)
24171 goto errout; 24173 goto errout;
24172diff -NurpP --minimal linux-3.10.19/net/core/sock.c linux-3.10.19-vs2.3.6.8/net/core/sock.c 24174diff -NurpP --minimal linux-3.10.21/net/core/sock.c linux-3.10.21-vs2.3.6.8/net/core/sock.c
24173--- linux-3.10.19/net/core/sock.c 2013-11-13 17:21:15.000000000 +0000 24175--- linux-3.10.21/net/core/sock.c 2013-11-30 07:50:51.000000000 +0000
24174+++ linux-3.10.19-vs2.3.6.8/net/core/sock.c 2013-11-13 17:22:25.000000000 +0000 24176+++ linux-3.10.21-vs2.3.6.8/net/core/sock.c 2013-11-13 17:22:25.000000000 +0000
24175@@ -132,6 +132,10 @@ 24177@@ -132,6 +132,10 @@
24176 #include <net/netprio_cgroup.h> 24178 #include <net/netprio_cgroup.h>
24177 24179
@@ -24239,9 +24241,9 @@ diff -NurpP --minimal linux-3.10.19/net/core/sock.c linux-3.10.19-vs2.3.6.8/net/
24239 sk->sk_pacing_rate = ~0U; 24241 sk->sk_pacing_rate = ~0U;
24240 /* 24242 /*
24241 * Before updating sk_refcnt, we must commit prior changes to memory 24243 * Before updating sk_refcnt, we must commit prior changes to memory
24242diff -NurpP --minimal linux-3.10.19/net/ipv4/af_inet.c linux-3.10.19-vs2.3.6.8/net/ipv4/af_inet.c 24244diff -NurpP --minimal linux-3.10.21/net/ipv4/af_inet.c linux-3.10.21-vs2.3.6.8/net/ipv4/af_inet.c
24243--- linux-3.10.19/net/ipv4/af_inet.c 2013-11-13 17:21:15.000000000 +0000 24245--- linux-3.10.21/net/ipv4/af_inet.c 2013-11-30 07:50:51.000000000 +0000
24244+++ linux-3.10.19-vs2.3.6.8/net/ipv4/af_inet.c 2013-11-13 17:17:16.000000000 +0000 24246+++ linux-3.10.21-vs2.3.6.8/net/ipv4/af_inet.c 2013-11-13 17:17:16.000000000 +0000
24245@@ -118,6 +118,7 @@ 24247@@ -118,6 +118,7 @@
24246 #ifdef CONFIG_IP_MROUTE 24248 #ifdef CONFIG_IP_MROUTE
24247 #include <linux/mroute.h> 24249 #include <linux/mroute.h>
@@ -24319,9 +24321,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv4/af_inet.c linux-3.10.19-vs2.3.6.8/n
24319 sin->sin_port = inet->inet_sport; 24321 sin->sin_port = inet->inet_sport;
24320 sin->sin_addr.s_addr = addr; 24322 sin->sin_addr.s_addr = addr;
24321 } 24323 }
24322diff -NurpP --minimal linux-3.10.19/net/ipv4/arp.c linux-3.10.19-vs2.3.6.8/net/ipv4/arp.c 24324diff -NurpP --minimal linux-3.10.21/net/ipv4/arp.c linux-3.10.21-vs2.3.6.8/net/ipv4/arp.c
24323--- linux-3.10.19/net/ipv4/arp.c 2013-07-14 17:01:37.000000000 +0000 24325--- linux-3.10.21/net/ipv4/arp.c 2013-07-14 17:01:37.000000000 +0000
24324+++ linux-3.10.19-vs2.3.6.8/net/ipv4/arp.c 2013-08-22 20:30:00.000000000 +0000 24326+++ linux-3.10.21-vs2.3.6.8/net/ipv4/arp.c 2013-08-22 20:30:00.000000000 +0000
24325@@ -1332,6 +1332,7 @@ static void arp_format_neigh_entry(struc 24327@@ -1332,6 +1332,7 @@ static void arp_format_neigh_entry(struc
24326 struct net_device *dev = n->dev; 24328 struct net_device *dev = n->dev;
24327 int hatype = dev->type; 24329 int hatype = dev->type;
@@ -24338,9 +24340,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv4/arp.c linux-3.10.19-vs2.3.6.8/net/i
24338 sprintf(tbuf, "%pI4", n->key); 24340 sprintf(tbuf, "%pI4", n->key);
24339 seq_printf(seq, "%-16s 0x%-10x0x%-10x%s * %s\n", 24341 seq_printf(seq, "%-16s 0x%-10x0x%-10x%s * %s\n",
24340 tbuf, hatype, ATF_PUBL | ATF_PERM, "00:00:00:00:00:00", 24342 tbuf, hatype, ATF_PUBL | ATF_PERM, "00:00:00:00:00:00",
24341diff -NurpP --minimal linux-3.10.19/net/ipv4/devinet.c linux-3.10.19-vs2.3.6.8/net/ipv4/devinet.c 24343diff -NurpP --minimal linux-3.10.21/net/ipv4/devinet.c linux-3.10.21-vs2.3.6.8/net/ipv4/devinet.c
24342--- linux-3.10.19/net/ipv4/devinet.c 2013-11-13 17:21:15.000000000 +0000 24344--- linux-3.10.21/net/ipv4/devinet.c 2013-11-30 07:50:51.000000000 +0000
24343+++ linux-3.10.19-vs2.3.6.8/net/ipv4/devinet.c 2013-11-13 17:17:16.000000000 +0000 24345+++ linux-3.10.21-vs2.3.6.8/net/ipv4/devinet.c 2013-11-13 17:17:16.000000000 +0000
24344@@ -522,6 +522,7 @@ struct in_device *inetdev_by_index(struc 24346@@ -522,6 +522,7 @@ struct in_device *inetdev_by_index(struc
24345 } 24347 }
24346 EXPORT_SYMBOL(inetdev_by_index); 24348 EXPORT_SYMBOL(inetdev_by_index);
@@ -24407,9 +24409,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv4/devinet.c linux-3.10.19-vs2.3.6.8/n
24407 if (ip_idx < s_ip_idx) 24409 if (ip_idx < s_ip_idx)
24408 continue; 24410 continue;
24409 if (inet_fill_ifaddr(skb, ifa, 24411 if (inet_fill_ifaddr(skb, ifa,
24410diff -NurpP --minimal linux-3.10.19/net/ipv4/fib_trie.c linux-3.10.19-vs2.3.6.8/net/ipv4/fib_trie.c 24412diff -NurpP --minimal linux-3.10.21/net/ipv4/fib_trie.c linux-3.10.21-vs2.3.6.8/net/ipv4/fib_trie.c
24411--- linux-3.10.19/net/ipv4/fib_trie.c 2013-11-13 17:21:15.000000000 +0000 24413--- linux-3.10.21/net/ipv4/fib_trie.c 2013-11-30 07:50:51.000000000 +0000
24412+++ linux-3.10.19-vs2.3.6.8/net/ipv4/fib_trie.c 2013-11-13 17:17:16.000000000 +0000 24414+++ linux-3.10.21-vs2.3.6.8/net/ipv4/fib_trie.c 2013-11-13 17:17:16.000000000 +0000
24413@@ -2536,6 +2536,7 @@ static int fib_route_seq_show(struct seq 24415@@ -2536,6 +2536,7 @@ static int fib_route_seq_show(struct seq
24414 || fa->fa_type == RTN_MULTICAST) 24416 || fa->fa_type == RTN_MULTICAST)
24415 continue; 24417 continue;
@@ -24418,9 +24420,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv4/fib_trie.c linux-3.10.19-vs2.3.6.8/
24418 if (fi) 24420 if (fi)
24419 seq_printf(seq, 24421 seq_printf(seq,
24420 "%s\t%08X\t%08X\t%04X\t%d\t%u\t" 24422 "%s\t%08X\t%08X\t%04X\t%d\t%u\t"
24421diff -NurpP --minimal linux-3.10.19/net/ipv4/inet_connection_sock.c linux-3.10.19-vs2.3.6.8/net/ipv4/inet_connection_sock.c 24423diff -NurpP --minimal linux-3.10.21/net/ipv4/inet_connection_sock.c linux-3.10.21-vs2.3.6.8/net/ipv4/inet_connection_sock.c
24422--- linux-3.10.19/net/ipv4/inet_connection_sock.c 2013-07-14 17:01:37.000000000 +0000 24424--- linux-3.10.21/net/ipv4/inet_connection_sock.c 2013-07-14 17:01:37.000000000 +0000
24423+++ linux-3.10.19-vs2.3.6.8/net/ipv4/inet_connection_sock.c 2013-08-22 20:30:00.000000000 +0000 24425+++ linux-3.10.21-vs2.3.6.8/net/ipv4/inet_connection_sock.c 2013-08-22 20:30:00.000000000 +0000
24424@@ -53,6 +53,37 @@ void inet_get_local_port_range(int *low, 24426@@ -53,6 +53,37 @@ void inet_get_local_port_range(int *low,
24425 } 24427 }
24426 EXPORT_SYMBOL(inet_get_local_port_range); 24428 EXPORT_SYMBOL(inet_get_local_port_range);
@@ -24479,9 +24481,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv4/inet_connection_sock.c linux-3.10.1
24479 break; 24481 break;
24480 } 24482 }
24481 } 24483 }
24482diff -NurpP --minimal linux-3.10.19/net/ipv4/inet_diag.c linux-3.10.19-vs2.3.6.8/net/ipv4/inet_diag.c 24484diff -NurpP --minimal linux-3.10.21/net/ipv4/inet_diag.c linux-3.10.21-vs2.3.6.8/net/ipv4/inet_diag.c
24483--- linux-3.10.19/net/ipv4/inet_diag.c 2013-07-14 17:01:37.000000000 +0000 24485--- linux-3.10.21/net/ipv4/inet_diag.c 2013-07-14 17:01:37.000000000 +0000
24484+++ linux-3.10.19-vs2.3.6.8/net/ipv4/inet_diag.c 2013-08-22 20:30:00.000000000 +0000 24486+++ linux-3.10.21-vs2.3.6.8/net/ipv4/inet_diag.c 2013-08-22 20:30:00.000000000 +0000
24485@@ -31,6 +31,8 @@ 24487@@ -31,6 +31,8 @@
24486 24488
24487 #include <linux/inet.h> 24489 #include <linux/inet.h>
@@ -24593,9 +24595,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv4/inet_diag.c linux-3.10.19-vs2.3.6.8
24593 if (num < s_num) 24595 if (num < s_num)
24594 goto next_dying; 24596 goto next_dying;
24595 if (r->sdiag_family != AF_UNSPEC && 24597 if (r->sdiag_family != AF_UNSPEC &&
24596diff -NurpP --minimal linux-3.10.19/net/ipv4/inet_hashtables.c linux-3.10.19-vs2.3.6.8/net/ipv4/inet_hashtables.c 24598diff -NurpP --minimal linux-3.10.21/net/ipv4/inet_hashtables.c linux-3.10.21-vs2.3.6.8/net/ipv4/inet_hashtables.c
24597--- linux-3.10.19/net/ipv4/inet_hashtables.c 2013-11-13 17:21:15.000000000 +0000 24599--- linux-3.10.21/net/ipv4/inet_hashtables.c 2013-11-30 07:50:52.000000000 +0000
24598+++ linux-3.10.19-vs2.3.6.8/net/ipv4/inet_hashtables.c 2013-11-13 17:22:25.000000000 +0000 24600+++ linux-3.10.21-vs2.3.6.8/net/ipv4/inet_hashtables.c 2013-11-13 17:22:25.000000000 +0000
24599@@ -22,6 +22,7 @@ 24601@@ -22,6 +22,7 @@
24600 #include <net/inet_connection_sock.h> 24602 #include <net/inet_connection_sock.h>
24601 #include <net/inet_hashtables.h> 24603 #include <net/inet_hashtables.h>
@@ -24632,9 +24634,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv4/inet_hashtables.c linux-3.10.19-vs2
24632 /* 24634 /*
24633 * if the nulls value we got at the end of this lookup is 24635 * if the nulls value we got at the end of this lookup is
24634 * not the expected one, we must restart lookup. 24636 * not the expected one, we must restart lookup.
24635diff -NurpP --minimal linux-3.10.19/net/ipv4/netfilter.c linux-3.10.19-vs2.3.6.8/net/ipv4/netfilter.c 24637diff -NurpP --minimal linux-3.10.21/net/ipv4/netfilter.c linux-3.10.21-vs2.3.6.8/net/ipv4/netfilter.c
24636--- linux-3.10.19/net/ipv4/netfilter.c 2013-07-14 17:01:37.000000000 +0000 24638--- linux-3.10.21/net/ipv4/netfilter.c 2013-07-14 17:01:37.000000000 +0000
24637+++ linux-3.10.19-vs2.3.6.8/net/ipv4/netfilter.c 2013-08-22 20:30:00.000000000 +0000 24639+++ linux-3.10.21-vs2.3.6.8/net/ipv4/netfilter.c 2013-08-22 20:30:00.000000000 +0000
24638@@ -11,7 +11,7 @@ 24640@@ -11,7 +11,7 @@
24639 #include <linux/skbuff.h> 24641 #include <linux/skbuff.h>
24640 #include <linux/gfp.h> 24642 #include <linux/gfp.h>
@@ -24644,9 +24646,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv4/netfilter.c linux-3.10.19-vs2.3.6.8
24644 #include <net/xfrm.h> 24646 #include <net/xfrm.h>
24645 #include <net/ip.h> 24647 #include <net/ip.h>
24646 #include <net/netfilter/nf_queue.h> 24648 #include <net/netfilter/nf_queue.h>
24647diff -NurpP --minimal linux-3.10.19/net/ipv4/raw.c linux-3.10.19-vs2.3.6.8/net/ipv4/raw.c 24649diff -NurpP --minimal linux-3.10.21/net/ipv4/raw.c linux-3.10.21-vs2.3.6.8/net/ipv4/raw.c
24648--- linux-3.10.19/net/ipv4/raw.c 2013-11-13 17:21:15.000000000 +0000 24650--- linux-3.10.21/net/ipv4/raw.c 2013-11-30 07:50:52.000000000 +0000
24649+++ linux-3.10.19-vs2.3.6.8/net/ipv4/raw.c 2013-11-13 17:17:16.000000000 +0000 24651+++ linux-3.10.21-vs2.3.6.8/net/ipv4/raw.c 2013-11-13 17:17:16.000000000 +0000
24650@@ -116,7 +116,7 @@ static struct sock *__raw_v4_lookup(stru 24652@@ -116,7 +116,7 @@ static struct sock *__raw_v4_lookup(stru
24651 24653
24652 if (net_eq(sock_net(sk), net) && inet->inet_num == num && 24654 if (net_eq(sock_net(sk), net) && inet->inet_num == num &&
@@ -24739,9 +24741,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv4/raw.c linux-3.10.19-vs2.3.6.8/net/i
24739 24741
24740 if (!sk && ++state->bucket < RAW_HTABLE_SIZE) { 24742 if (!sk && ++state->bucket < RAW_HTABLE_SIZE) {
24741 sk = sk_head(&state->h->ht[state->bucket]); 24743 sk = sk_head(&state->h->ht[state->bucket]);
24742diff -NurpP --minimal linux-3.10.19/net/ipv4/route.c linux-3.10.19-vs2.3.6.8/net/ipv4/route.c 24744diff -NurpP --minimal linux-3.10.21/net/ipv4/route.c linux-3.10.21-vs2.3.6.8/net/ipv4/route.c
24743--- linux-3.10.19/net/ipv4/route.c 2013-11-13 17:21:15.000000000 +0000 24745--- linux-3.10.21/net/ipv4/route.c 2013-11-30 07:50:52.000000000 +0000
24744+++ linux-3.10.19-vs2.3.6.8/net/ipv4/route.c 2013-11-13 17:22:25.000000000 +0000 24746+++ linux-3.10.21-vs2.3.6.8/net/ipv4/route.c 2013-11-13 17:22:25.000000000 +0000
24745@@ -2003,7 +2003,7 @@ struct rtable *__ip_route_output_key(str 24747@@ -2003,7 +2003,7 @@ struct rtable *__ip_route_output_key(str
24746 24748
24747 24749
@@ -24751,9 +24753,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv4/route.c linux-3.10.19-vs2.3.6.8/net
24751 rth = ERR_PTR(-ENODEV); 24753 rth = ERR_PTR(-ENODEV);
24752 if (dev_out == NULL) 24754 if (dev_out == NULL)
24753 goto out; 24755 goto out;
24754diff -NurpP --minimal linux-3.10.19/net/ipv4/tcp.c linux-3.10.19-vs2.3.6.8/net/ipv4/tcp.c 24756diff -NurpP --minimal linux-3.10.21/net/ipv4/tcp.c linux-3.10.21-vs2.3.6.8/net/ipv4/tcp.c
24755--- linux-3.10.19/net/ipv4/tcp.c 2013-11-13 17:21:15.000000000 +0000 24757--- linux-3.10.21/net/ipv4/tcp.c 2013-11-30 07:50:52.000000000 +0000
24756+++ linux-3.10.19-vs2.3.6.8/net/ipv4/tcp.c 2013-11-13 17:22:25.000000000 +0000 24758+++ linux-3.10.21-vs2.3.6.8/net/ipv4/tcp.c 2013-11-13 17:22:25.000000000 +0000
24757@@ -268,6 +268,7 @@ 24759@@ -268,6 +268,7 @@
24758 #include <linux/crypto.h> 24760 #include <linux/crypto.h>
24759 #include <linux/time.h> 24761 #include <linux/time.h>
@@ -24762,9 +24764,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv4/tcp.c linux-3.10.19-vs2.3.6.8/net/i
24762 24764
24763 #include <net/icmp.h> 24765 #include <net/icmp.h>
24764 #include <net/inet_common.h> 24766 #include <net/inet_common.h>
24765diff -NurpP --minimal linux-3.10.19/net/ipv4/tcp_ipv4.c linux-3.10.19-vs2.3.6.8/net/ipv4/tcp_ipv4.c 24767diff -NurpP --minimal linux-3.10.21/net/ipv4/tcp_ipv4.c linux-3.10.21-vs2.3.6.8/net/ipv4/tcp_ipv4.c
24766--- linux-3.10.19/net/ipv4/tcp_ipv4.c 2013-07-14 17:01:37.000000000 +0000 24768--- linux-3.10.21/net/ipv4/tcp_ipv4.c 2013-07-14 17:01:37.000000000 +0000
24767+++ linux-3.10.19-vs2.3.6.8/net/ipv4/tcp_ipv4.c 2013-08-22 20:30:00.000000000 +0000 24769+++ linux-3.10.21-vs2.3.6.8/net/ipv4/tcp_ipv4.c 2013-08-22 20:30:00.000000000 +0000
24768@@ -2263,6 +2263,12 @@ static void *listening_get_next(struct s 24770@@ -2263,6 +2263,12 @@ static void *listening_get_next(struct s
24769 req = req->dl_next; 24771 req = req->dl_next;
24770 while (1) { 24772 while (1) {
@@ -24870,9 +24872,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv4/tcp_ipv4.c linux-3.10.19-vs2.3.6.8/
24870 destp = ntohs(tw->tw_dport); 24872 destp = ntohs(tw->tw_dport);
24871 srcp = ntohs(tw->tw_sport); 24873 srcp = ntohs(tw->tw_sport);
24872 24874
24873diff -NurpP --minimal linux-3.10.19/net/ipv4/tcp_minisocks.c linux-3.10.19-vs2.3.6.8/net/ipv4/tcp_minisocks.c 24875diff -NurpP --minimal linux-3.10.21/net/ipv4/tcp_minisocks.c linux-3.10.21-vs2.3.6.8/net/ipv4/tcp_minisocks.c
24874--- linux-3.10.19/net/ipv4/tcp_minisocks.c 2013-07-14 17:01:37.000000000 +0000 24876--- linux-3.10.21/net/ipv4/tcp_minisocks.c 2013-07-14 17:01:37.000000000 +0000
24875+++ linux-3.10.19-vs2.3.6.8/net/ipv4/tcp_minisocks.c 2013-08-22 20:30:00.000000000 +0000 24877+++ linux-3.10.21-vs2.3.6.8/net/ipv4/tcp_minisocks.c 2013-08-22 20:30:00.000000000 +0000
24876@@ -23,6 +23,9 @@ 24878@@ -23,6 +23,9 @@
24877 #include <linux/slab.h> 24879 #include <linux/slab.h>
24878 #include <linux/sysctl.h> 24880 #include <linux/sysctl.h>
@@ -24895,9 +24897,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv4/tcp_minisocks.c linux-3.10.19-vs2.3
24895 #if IS_ENABLED(CONFIG_IPV6) 24897 #if IS_ENABLED(CONFIG_IPV6)
24896 if (tw->tw_family == PF_INET6) { 24898 if (tw->tw_family == PF_INET6) {
24897 struct ipv6_pinfo *np = inet6_sk(sk); 24899 struct ipv6_pinfo *np = inet6_sk(sk);
24898diff -NurpP --minimal linux-3.10.19/net/ipv4/udp.c linux-3.10.19-vs2.3.6.8/net/ipv4/udp.c 24900diff -NurpP --minimal linux-3.10.21/net/ipv4/udp.c linux-3.10.21-vs2.3.6.8/net/ipv4/udp.c
24899--- linux-3.10.19/net/ipv4/udp.c 2013-11-13 17:21:15.000000000 +0000 24901--- linux-3.10.21/net/ipv4/udp.c 2013-11-30 07:50:52.000000000 +0000
24900+++ linux-3.10.19-vs2.3.6.8/net/ipv4/udp.c 2013-11-13 17:17:16.000000000 +0000 24902+++ linux-3.10.21-vs2.3.6.8/net/ipv4/udp.c 2013-11-13 17:17:16.000000000 +0000
24901@@ -306,14 +306,7 @@ fail: 24903@@ -306,14 +306,7 @@ fail:
24902 } 24904 }
24903 EXPORT_SYMBOL(udp_lib_get_port); 24905 EXPORT_SYMBOL(udp_lib_get_port);
@@ -25030,9 +25032,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv4/udp.c linux-3.10.19-vs2.3.6.8/net/i
25030 __u16 destp = ntohs(inet->inet_dport); 25032 __u16 destp = ntohs(inet->inet_dport);
25031 __u16 srcp = ntohs(inet->inet_sport); 25033 __u16 srcp = ntohs(inet->inet_sport);
25032 25034
25033diff -NurpP --minimal linux-3.10.19/net/ipv6/Kconfig linux-3.10.19-vs2.3.6.8/net/ipv6/Kconfig 25035diff -NurpP --minimal linux-3.10.21/net/ipv6/Kconfig linux-3.10.21-vs2.3.6.8/net/ipv6/Kconfig
25034--- linux-3.10.19/net/ipv6/Kconfig 2013-07-14 17:01:38.000000000 +0000 25036--- linux-3.10.21/net/ipv6/Kconfig 2013-07-14 17:01:38.000000000 +0000
25035+++ linux-3.10.19-vs2.3.6.8/net/ipv6/Kconfig 2013-08-22 20:30:00.000000000 +0000 25037+++ linux-3.10.21-vs2.3.6.8/net/ipv6/Kconfig 2013-08-22 20:30:00.000000000 +0000
25036@@ -4,8 +4,8 @@ 25038@@ -4,8 +4,8 @@
25037 25039
25038 # IPv6 as module will cause a CRASH if you try to unload it 25040 # IPv6 as module will cause a CRASH if you try to unload it
@@ -25044,9 +25046,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv6/Kconfig linux-3.10.19-vs2.3.6.8/net
25044 ---help--- 25046 ---help---
25045 This is complemental support for the IP version 6. 25047 This is complemental support for the IP version 6.
25046 You will still be able to do traditional IPv4 networking as well. 25048 You will still be able to do traditional IPv4 networking as well.
25047diff -NurpP --minimal linux-3.10.19/net/ipv6/addrconf.c linux-3.10.19-vs2.3.6.8/net/ipv6/addrconf.c 25049diff -NurpP --minimal linux-3.10.21/net/ipv6/addrconf.c linux-3.10.21-vs2.3.6.8/net/ipv6/addrconf.c
25048--- linux-3.10.19/net/ipv6/addrconf.c 2013-11-13 17:21:15.000000000 +0000 25050--- linux-3.10.21/net/ipv6/addrconf.c 2013-11-30 07:50:52.000000000 +0000
25049+++ linux-3.10.19-vs2.3.6.8/net/ipv6/addrconf.c 2013-11-13 17:17:16.000000000 +0000 25051+++ linux-3.10.21-vs2.3.6.8/net/ipv6/addrconf.c 2013-11-13 17:17:16.000000000 +0000
25050@@ -94,6 +94,8 @@ 25052@@ -94,6 +94,8 @@
25051 #include <linux/proc_fs.h> 25053 #include <linux/proc_fs.h>
25052 #include <linux/seq_file.h> 25054 #include <linux/seq_file.h>
@@ -25153,9 +25155,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv6/addrconf.c linux-3.10.19-vs2.3.6.8/
25153 idev = __in6_dev_get(dev); 25155 idev = __in6_dev_get(dev);
25154 if (!idev) 25156 if (!idev)
25155 goto cont; 25157 goto cont;
25156diff -NurpP --minimal linux-3.10.19/net/ipv6/af_inet6.c linux-3.10.19-vs2.3.6.8/net/ipv6/af_inet6.c 25158diff -NurpP --minimal linux-3.10.21/net/ipv6/af_inet6.c linux-3.10.21-vs2.3.6.8/net/ipv6/af_inet6.c
25157--- linux-3.10.19/net/ipv6/af_inet6.c 2013-07-14 17:01:38.000000000 +0000 25159--- linux-3.10.21/net/ipv6/af_inet6.c 2013-07-14 17:01:38.000000000 +0000
25158+++ linux-3.10.19-vs2.3.6.8/net/ipv6/af_inet6.c 2013-08-22 20:30:00.000000000 +0000 25160+++ linux-3.10.21-vs2.3.6.8/net/ipv6/af_inet6.c 2013-08-22 20:30:00.000000000 +0000
25159@@ -43,6 +43,8 @@ 25161@@ -43,6 +43,8 @@
25160 #include <linux/netdevice.h> 25162 #include <linux/netdevice.h>
25161 #include <linux/icmpv6.h> 25163 #include <linux/icmpv6.h>
@@ -25252,9 +25254,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv6/af_inet6.c linux-3.10.19-vs2.3.6.8/
25252 if (ipv6_addr_any(&np->rcv_saddr)) 25254 if (ipv6_addr_any(&np->rcv_saddr))
25253 sin->sin6_addr = np->saddr; 25255 sin->sin6_addr = np->saddr;
25254 else 25256 else
25255diff -NurpP --minimal linux-3.10.19/net/ipv6/datagram.c linux-3.10.19-vs2.3.6.8/net/ipv6/datagram.c 25257diff -NurpP --minimal linux-3.10.21/net/ipv6/datagram.c linux-3.10.21-vs2.3.6.8/net/ipv6/datagram.c
25256--- linux-3.10.19/net/ipv6/datagram.c 2013-07-14 17:01:38.000000000 +0000 25258--- linux-3.10.21/net/ipv6/datagram.c 2013-07-14 17:01:38.000000000 +0000
25257+++ linux-3.10.19-vs2.3.6.8/net/ipv6/datagram.c 2013-08-22 20:30:00.000000000 +0000 25259+++ linux-3.10.21-vs2.3.6.8/net/ipv6/datagram.c 2013-08-22 20:30:00.000000000 +0000
25258@@ -652,7 +652,7 @@ int ip6_datagram_send_ctl(struct net *ne 25260@@ -652,7 +652,7 @@ int ip6_datagram_send_ctl(struct net *ne
25259 25261
25260 rcu_read_lock(); 25262 rcu_read_lock();
@@ -25264,9 +25266,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv6/datagram.c linux-3.10.19-vs2.3.6.8/
25264 if (!dev) { 25266 if (!dev) {
25265 rcu_read_unlock(); 25267 rcu_read_unlock();
25266 return -ENODEV; 25268 return -ENODEV;
25267diff -NurpP --minimal linux-3.10.19/net/ipv6/fib6_rules.c linux-3.10.19-vs2.3.6.8/net/ipv6/fib6_rules.c 25269diff -NurpP --minimal linux-3.10.21/net/ipv6/fib6_rules.c linux-3.10.21-vs2.3.6.8/net/ipv6/fib6_rules.c
25268--- linux-3.10.19/net/ipv6/fib6_rules.c 2013-02-19 13:58:58.000000000 +0000 25270--- linux-3.10.21/net/ipv6/fib6_rules.c 2013-02-19 13:58:58.000000000 +0000
25269+++ linux-3.10.19-vs2.3.6.8/net/ipv6/fib6_rules.c 2013-08-22 20:30:00.000000000 +0000 25271+++ linux-3.10.21-vs2.3.6.8/net/ipv6/fib6_rules.c 2013-08-22 20:30:00.000000000 +0000
25270@@ -90,7 +90,7 @@ static int fib6_rule_action(struct fib_r 25272@@ -90,7 +90,7 @@ static int fib6_rule_action(struct fib_r
25271 ip6_dst_idev(&rt->dst)->dev, 25273 ip6_dst_idev(&rt->dst)->dev,
25272 &flp6->daddr, 25274 &flp6->daddr,
@@ -25276,9 +25278,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv6/fib6_rules.c linux-3.10.19-vs2.3.6.
25276 goto again; 25278 goto again;
25277 if (!ipv6_prefix_equal(&saddr, &r->src.addr, 25279 if (!ipv6_prefix_equal(&saddr, &r->src.addr,
25278 r->src.plen)) 25280 r->src.plen))
25279diff -NurpP --minimal linux-3.10.19/net/ipv6/inet6_hashtables.c linux-3.10.19-vs2.3.6.8/net/ipv6/inet6_hashtables.c 25281diff -NurpP --minimal linux-3.10.21/net/ipv6/inet6_hashtables.c linux-3.10.21-vs2.3.6.8/net/ipv6/inet6_hashtables.c
25280--- linux-3.10.19/net/ipv6/inet6_hashtables.c 2013-11-13 17:21:15.000000000 +0000 25282--- linux-3.10.21/net/ipv6/inet6_hashtables.c 2013-11-30 07:50:52.000000000 +0000
25281+++ linux-3.10.19-vs2.3.6.8/net/ipv6/inet6_hashtables.c 2013-11-13 17:22:25.000000000 +0000 25283+++ linux-3.10.21-vs2.3.6.8/net/ipv6/inet6_hashtables.c 2013-11-13 17:22:25.000000000 +0000
25282@@ -16,6 +16,7 @@ 25284@@ -16,6 +16,7 @@
25283 25285
25284 #include <linux/module.h> 25286 #include <linux/module.h>
@@ -25314,9 +25316,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv6/inet6_hashtables.c linux-3.10.19-vs
25314 } 25316 }
25315 if (sk->sk_bound_dev_if) { 25317 if (sk->sk_bound_dev_if) {
25316 if (sk->sk_bound_dev_if != dif) 25318 if (sk->sk_bound_dev_if != dif)
25317diff -NurpP --minimal linux-3.10.19/net/ipv6/ip6_output.c linux-3.10.19-vs2.3.6.8/net/ipv6/ip6_output.c 25319diff -NurpP --minimal linux-3.10.21/net/ipv6/ip6_output.c linux-3.10.21-vs2.3.6.8/net/ipv6/ip6_output.c
25318--- linux-3.10.19/net/ipv6/ip6_output.c 2013-11-13 17:21:15.000000000 +0000 25320--- linux-3.10.21/net/ipv6/ip6_output.c 2013-11-30 07:50:52.000000000 +0000
25319+++ linux-3.10.19-vs2.3.6.8/net/ipv6/ip6_output.c 2013-11-13 17:22:25.000000000 +0000 25321+++ linux-3.10.21-vs2.3.6.8/net/ipv6/ip6_output.c 2013-11-13 17:22:25.000000000 +0000
25320@@ -882,7 +882,8 @@ static int ip6_dst_lookup_tail(struct so 25322@@ -882,7 +882,8 @@ static int ip6_dst_lookup_tail(struct so
25321 struct rt6_info *rt = (struct rt6_info *) *dst; 25323 struct rt6_info *rt = (struct rt6_info *) *dst;
25322 err = ip6_route_get_saddr(net, rt, &fl6->daddr, 25324 err = ip6_route_get_saddr(net, rt, &fl6->daddr,
@@ -25327,9 +25329,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv6/ip6_output.c linux-3.10.19-vs2.3.6.
25327 if (err) 25329 if (err)
25328 goto out_err_release; 25330 goto out_err_release;
25329 } 25331 }
25330diff -NurpP --minimal linux-3.10.19/net/ipv6/ndisc.c linux-3.10.19-vs2.3.6.8/net/ipv6/ndisc.c 25332diff -NurpP --minimal linux-3.10.21/net/ipv6/ndisc.c linux-3.10.21-vs2.3.6.8/net/ipv6/ndisc.c
25331--- linux-3.10.19/net/ipv6/ndisc.c 2013-11-13 17:21:15.000000000 +0000 25333--- linux-3.10.21/net/ipv6/ndisc.c 2013-11-30 07:50:52.000000000 +0000
25332+++ linux-3.10.19-vs2.3.6.8/net/ipv6/ndisc.c 2013-11-13 17:17:16.000000000 +0000 25334+++ linux-3.10.21-vs2.3.6.8/net/ipv6/ndisc.c 2013-11-13 17:17:16.000000000 +0000
25333@@ -487,7 +487,7 @@ static void ndisc_send_na(struct net_dev 25335@@ -487,7 +487,7 @@ static void ndisc_send_na(struct net_dev
25334 } else { 25336 } else {
25335 if (ipv6_dev_get_saddr(dev_net(dev), dev, daddr, 25337 if (ipv6_dev_get_saddr(dev_net(dev), dev, daddr,
@@ -25339,9 +25341,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv6/ndisc.c linux-3.10.19-vs2.3.6.8/net
25339 return; 25341 return;
25340 src_addr = &tmpaddr; 25342 src_addr = &tmpaddr;
25341 } 25343 }
25342diff -NurpP --minimal linux-3.10.19/net/ipv6/netfilter/ip6t_MASQUERADE.c linux-3.10.19-vs2.3.6.8/net/ipv6/netfilter/ip6t_MASQUERADE.c 25344diff -NurpP --minimal linux-3.10.21/net/ipv6/netfilter/ip6t_MASQUERADE.c linux-3.10.21-vs2.3.6.8/net/ipv6/netfilter/ip6t_MASQUERADE.c
25343--- linux-3.10.19/net/ipv6/netfilter/ip6t_MASQUERADE.c 2012-12-11 03:30:57.000000000 +0000 25345--- linux-3.10.21/net/ipv6/netfilter/ip6t_MASQUERADE.c 2012-12-11 03:30:57.000000000 +0000
25344+++ linux-3.10.19-vs2.3.6.8/net/ipv6/netfilter/ip6t_MASQUERADE.c 2013-08-22 20:30:00.000000000 +0000 25346+++ linux-3.10.21-vs2.3.6.8/net/ipv6/netfilter/ip6t_MASQUERADE.c 2013-08-22 20:30:00.000000000 +0000
25345@@ -34,7 +34,7 @@ masquerade_tg6(struct sk_buff *skb, cons 25347@@ -34,7 +34,7 @@ masquerade_tg6(struct sk_buff *skb, cons
25346 ctinfo == IP_CT_RELATED_REPLY)); 25348 ctinfo == IP_CT_RELATED_REPLY));
25347 25349
@@ -25351,9 +25353,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv6/netfilter/ip6t_MASQUERADE.c linux-3
25351 return NF_DROP; 25353 return NF_DROP;
25352 25354
25353 nfct_nat(ct)->masq_index = par->out->ifindex; 25355 nfct_nat(ct)->masq_index = par->out->ifindex;
25354diff -NurpP --minimal linux-3.10.19/net/ipv6/raw.c linux-3.10.19-vs2.3.6.8/net/ipv6/raw.c 25356diff -NurpP --minimal linux-3.10.21/net/ipv6/raw.c linux-3.10.21-vs2.3.6.8/net/ipv6/raw.c
25355--- linux-3.10.19/net/ipv6/raw.c 2013-07-14 17:01:38.000000000 +0000 25357--- linux-3.10.21/net/ipv6/raw.c 2013-07-14 17:01:38.000000000 +0000
25356+++ linux-3.10.19-vs2.3.6.8/net/ipv6/raw.c 2013-08-22 20:30:00.000000000 +0000 25358+++ linux-3.10.21-vs2.3.6.8/net/ipv6/raw.c 2013-08-22 20:30:00.000000000 +0000
25357@@ -30,6 +30,7 @@ 25359@@ -30,6 +30,7 @@
25358 #include <linux/icmpv6.h> 25360 #include <linux/icmpv6.h>
25359 #include <linux/netfilter.h> 25361 #include <linux/netfilter.h>
@@ -25376,9 +25378,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv6/raw.c linux-3.10.19-vs2.3.6.8/net/i
25376 /* ipv4 addr of the socket is invalid. Only the 25378 /* ipv4 addr of the socket is invalid. Only the
25377 * unspecified and mapped address have a v4 equivalent. 25379 * unspecified and mapped address have a v4 equivalent.
25378 */ 25380 */
25379diff -NurpP --minimal linux-3.10.19/net/ipv6/route.c linux-3.10.19-vs2.3.6.8/net/ipv6/route.c 25381diff -NurpP --minimal linux-3.10.21/net/ipv6/route.c linux-3.10.21-vs2.3.6.8/net/ipv6/route.c
25380--- linux-3.10.19/net/ipv6/route.c 2013-11-13 17:21:15.000000000 +0000 25382--- linux-3.10.21/net/ipv6/route.c 2013-11-30 07:50:52.000000000 +0000
25381+++ linux-3.10.19-vs2.3.6.8/net/ipv6/route.c 2013-11-13 17:22:25.000000000 +0000 25383+++ linux-3.10.21-vs2.3.6.8/net/ipv6/route.c 2013-11-30 07:53:00.000000000 +0000
25382@@ -58,6 +58,7 @@ 25384@@ -58,6 +58,7 @@
25383 #include <net/netevent.h> 25385 #include <net/netevent.h>
25384 #include <net/netlink.h> 25386 #include <net/netlink.h>
@@ -25387,7 +25389,7 @@ diff -NurpP --minimal linux-3.10.19/net/ipv6/route.c linux-3.10.19-vs2.3.6.8/net
25387 25389
25388 #include <asm/uaccess.h> 25390 #include <asm/uaccess.h>
25389 25391
25390@@ -2129,15 +2130,17 @@ int ip6_route_get_saddr(struct net *net, 25392@@ -2132,15 +2133,17 @@ int ip6_route_get_saddr(struct net *net,
25391 struct rt6_info *rt, 25393 struct rt6_info *rt,
25392 const struct in6_addr *daddr, 25394 const struct in6_addr *daddr,
25393 unsigned int prefs, 25395 unsigned int prefs,
@@ -25408,7 +25410,7 @@ diff -NurpP --minimal linux-3.10.19/net/ipv6/route.c linux-3.10.19-vs2.3.6.8/net
25408 return err; 25410 return err;
25409 } 25411 }
25410 25412
25411@@ -2557,7 +2560,8 @@ static int rt6_fill_node(struct net *net 25413@@ -2560,7 +2563,8 @@ static int rt6_fill_node(struct net *net
25412 goto nla_put_failure; 25414 goto nla_put_failure;
25413 } else if (dst) { 25415 } else if (dst) {
25414 struct in6_addr saddr_buf; 25416 struct in6_addr saddr_buf;
@@ -25418,7 +25420,7 @@ diff -NurpP --minimal linux-3.10.19/net/ipv6/route.c linux-3.10.19-vs2.3.6.8/net
25418 nla_put(skb, RTA_PREFSRC, 16, &saddr_buf)) 25420 nla_put(skb, RTA_PREFSRC, 16, &saddr_buf))
25419 goto nla_put_failure; 25421 goto nla_put_failure;
25420 } 25422 }
25421@@ -2769,6 +2773,7 @@ static int rt6_info_route(struct rt6_inf 25423@@ -2772,6 +2776,7 @@ static int rt6_info_route(struct rt6_inf
25422 { 25424 {
25423 struct seq_file *m = p_arg; 25425 struct seq_file *m = p_arg;
25424 25426
@@ -25426,9 +25428,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv6/route.c linux-3.10.19-vs2.3.6.8/net
25426 seq_printf(m, "%pi6 %02x ", &rt->rt6i_dst.addr, rt->rt6i_dst.plen); 25428 seq_printf(m, "%pi6 %02x ", &rt->rt6i_dst.addr, rt->rt6i_dst.plen);
25427 25429
25428 #ifdef CONFIG_IPV6_SUBTREES 25430 #ifdef CONFIG_IPV6_SUBTREES
25429diff -NurpP --minimal linux-3.10.19/net/ipv6/tcp_ipv6.c linux-3.10.19-vs2.3.6.8/net/ipv6/tcp_ipv6.c 25431diff -NurpP --minimal linux-3.10.21/net/ipv6/tcp_ipv6.c linux-3.10.21-vs2.3.6.8/net/ipv6/tcp_ipv6.c
25430--- linux-3.10.19/net/ipv6/tcp_ipv6.c 2013-11-13 17:21:15.000000000 +0000 25432--- linux-3.10.21/net/ipv6/tcp_ipv6.c 2013-11-30 07:50:52.000000000 +0000
25431+++ linux-3.10.19-vs2.3.6.8/net/ipv6/tcp_ipv6.c 2013-11-13 17:17:16.000000000 +0000 25433+++ linux-3.10.21-vs2.3.6.8/net/ipv6/tcp_ipv6.c 2013-11-13 17:17:16.000000000 +0000
25432@@ -71,6 +71,7 @@ 25434@@ -71,6 +71,7 @@
25433 25435
25434 #include <linux/crypto.h> 25436 #include <linux/crypto.h>
@@ -25455,9 +25457,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv6/tcp_ipv6.c linux-3.10.19-vs2.3.6.8/
25455 25457
25456 addr_type = ipv6_addr_type(&usin->sin6_addr); 25458 addr_type = ipv6_addr_type(&usin->sin6_addr);
25457 25459
25458diff -NurpP --minimal linux-3.10.19/net/ipv6/udp.c linux-3.10.19-vs2.3.6.8/net/ipv6/udp.c 25460diff -NurpP --minimal linux-3.10.21/net/ipv6/udp.c linux-3.10.21-vs2.3.6.8/net/ipv6/udp.c
25459--- linux-3.10.19/net/ipv6/udp.c 2013-11-13 17:21:15.000000000 +0000 25461--- linux-3.10.21/net/ipv6/udp.c 2013-11-30 07:50:52.000000000 +0000
25460+++ linux-3.10.19-vs2.3.6.8/net/ipv6/udp.c 2013-11-13 17:17:16.000000000 +0000 25462+++ linux-3.10.21-vs2.3.6.8/net/ipv6/udp.c 2013-11-13 17:17:16.000000000 +0000
25461@@ -46,42 +46,68 @@ 25463@@ -46,42 +46,68 @@
25462 #include <net/ip6_checksum.h> 25464 #include <net/ip6_checksum.h>
25463 #include <net/xfrm.h> 25465 #include <net/xfrm.h>
@@ -25551,9 +25553,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv6/udp.c linux-3.10.19-vs2.3.6.8/net/i
25551 } 25553 }
25552 if (!ipv6_addr_any(&np->daddr)) { 25554 if (!ipv6_addr_any(&np->daddr)) {
25553 if (!ipv6_addr_equal(&np->daddr, saddr)) 25555 if (!ipv6_addr_equal(&np->daddr, saddr))
25554diff -NurpP --minimal linux-3.10.19/net/ipv6/xfrm6_policy.c linux-3.10.19-vs2.3.6.8/net/ipv6/xfrm6_policy.c 25556diff -NurpP --minimal linux-3.10.21/net/ipv6/xfrm6_policy.c linux-3.10.21-vs2.3.6.8/net/ipv6/xfrm6_policy.c
25555--- linux-3.10.19/net/ipv6/xfrm6_policy.c 2013-07-14 17:01:38.000000000 +0000 25557--- linux-3.10.21/net/ipv6/xfrm6_policy.c 2013-07-14 17:01:38.000000000 +0000
25556+++ linux-3.10.19-vs2.3.6.8/net/ipv6/xfrm6_policy.c 2013-08-22 20:30:00.000000000 +0000 25558+++ linux-3.10.21-vs2.3.6.8/net/ipv6/xfrm6_policy.c 2013-08-22 20:30:00.000000000 +0000
25557@@ -63,7 +63,7 @@ static int xfrm6_get_saddr(struct net *n 25559@@ -63,7 +63,7 @@ static int xfrm6_get_saddr(struct net *n
25558 dev = ip6_dst_idev(dst)->dev; 25560 dev = ip6_dst_idev(dst)->dev;
25559 ipv6_dev_get_saddr(dev_net(dev), dev, 25561 ipv6_dev_get_saddr(dev_net(dev), dev,
@@ -25563,9 +25565,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv6/xfrm6_policy.c linux-3.10.19-vs2.3.
25563 dst_release(dst); 25565 dst_release(dst);
25564 return 0; 25566 return 0;
25565 } 25567 }
25566diff -NurpP --minimal linux-3.10.19/net/netfilter/ipvs/ip_vs_xmit.c linux-3.10.19-vs2.3.6.8/net/netfilter/ipvs/ip_vs_xmit.c 25568diff -NurpP --minimal linux-3.10.21/net/netfilter/ipvs/ip_vs_xmit.c linux-3.10.21-vs2.3.6.8/net/netfilter/ipvs/ip_vs_xmit.c
25567--- linux-3.10.19/net/netfilter/ipvs/ip_vs_xmit.c 2013-11-13 17:21:15.000000000 +0000 25569--- linux-3.10.21/net/netfilter/ipvs/ip_vs_xmit.c 2013-11-30 07:50:52.000000000 +0000
25568+++ linux-3.10.19-vs2.3.6.8/net/netfilter/ipvs/ip_vs_xmit.c 2013-11-13 17:17:16.000000000 +0000 25570+++ linux-3.10.21-vs2.3.6.8/net/netfilter/ipvs/ip_vs_xmit.c 2013-11-13 17:17:16.000000000 +0000
25569@@ -316,7 +316,7 @@ __ip_vs_route_output_v6(struct net *net, 25571@@ -316,7 +316,7 @@ __ip_vs_route_output_v6(struct net *net,
25570 return dst; 25572 return dst;
25571 if (ipv6_addr_any(&fl6.saddr) && 25573 if (ipv6_addr_any(&fl6.saddr) &&
@@ -25575,9 +25577,9 @@ diff -NurpP --minimal linux-3.10.19/net/netfilter/ipvs/ip_vs_xmit.c linux-3.10.1
25575 goto out_err; 25577 goto out_err;
25576 if (do_xfrm) { 25578 if (do_xfrm) {
25577 dst = xfrm_lookup(net, dst, flowi6_to_flowi(&fl6), NULL, 0); 25579 dst = xfrm_lookup(net, dst, flowi6_to_flowi(&fl6), NULL, 0);
25578diff -NurpP --minimal linux-3.10.19/net/netlink/af_netlink.c linux-3.10.19-vs2.3.6.8/net/netlink/af_netlink.c 25580diff -NurpP --minimal linux-3.10.21/net/netlink/af_netlink.c linux-3.10.21-vs2.3.6.8/net/netlink/af_netlink.c
25579--- linux-3.10.19/net/netlink/af_netlink.c 2013-07-14 17:01:39.000000000 +0000 25581--- linux-3.10.21/net/netlink/af_netlink.c 2013-07-14 17:01:39.000000000 +0000
25580+++ linux-3.10.19-vs2.3.6.8/net/netlink/af_netlink.c 2013-08-22 21:19:02.000000000 +0000 25582+++ linux-3.10.21-vs2.3.6.8/net/netlink/af_netlink.c 2013-08-22 21:19:02.000000000 +0000
25581@@ -57,6 +57,9 @@ 25583@@ -57,6 +57,9 @@
25582 #include <linux/audit.h> 25584 #include <linux/audit.h>
25583 #include <linux/mutex.h> 25585 #include <linux/mutex.h>
@@ -25617,9 +25619,9 @@ diff -NurpP --minimal linux-3.10.19/net/netlink/af_netlink.c linux-3.10.19-vs2.3
25617 s = sk_next(s); 25619 s = sk_next(s);
25618 if (s) { 25620 if (s) {
25619 iter->link = i; 25621 iter->link = i;
25620diff -NurpP --minimal linux-3.10.19/net/socket.c linux-3.10.19-vs2.3.6.8/net/socket.c 25622diff -NurpP --minimal linux-3.10.21/net/socket.c linux-3.10.21-vs2.3.6.8/net/socket.c
25621--- linux-3.10.19/net/socket.c 2013-11-13 17:21:15.000000000 +0000 25623--- linux-3.10.21/net/socket.c 2013-11-30 07:50:52.000000000 +0000
25622+++ linux-3.10.19-vs2.3.6.8/net/socket.c 2013-11-13 17:22:25.000000000 +0000 25624+++ linux-3.10.21-vs2.3.6.8/net/socket.c 2013-11-13 17:22:25.000000000 +0000
25623@@ -98,6 +98,10 @@ 25625@@ -98,6 +98,10 @@
25624 25626
25625 #include <net/sock.h> 25627 #include <net/sock.h>
@@ -25725,9 +25727,9 @@ diff -NurpP --minimal linux-3.10.19/net/socket.c linux-3.10.19-vs2.3.6.8/net/soc
25725 25727
25726 err = sock1->ops->socketpair(sock1, sock2); 25728 err = sock1->ops->socketpair(sock1, sock2);
25727 if (err < 0) 25729 if (err < 0)
25728diff -NurpP --minimal linux-3.10.19/net/sunrpc/auth.c linux-3.10.19-vs2.3.6.8/net/sunrpc/auth.c 25730diff -NurpP --minimal linux-3.10.21/net/sunrpc/auth.c linux-3.10.21-vs2.3.6.8/net/sunrpc/auth.c
25729--- linux-3.10.19/net/sunrpc/auth.c 2013-07-14 17:01:39.000000000 +0000 25731--- linux-3.10.21/net/sunrpc/auth.c 2013-07-14 17:01:39.000000000 +0000
25730+++ linux-3.10.19-vs2.3.6.8/net/sunrpc/auth.c 2013-08-22 20:30:00.000000000 +0000 25732+++ linux-3.10.21-vs2.3.6.8/net/sunrpc/auth.c 2013-08-22 20:30:00.000000000 +0000
25731@@ -15,6 +15,7 @@ 25733@@ -15,6 +15,7 @@
25732 #include <linux/sunrpc/clnt.h> 25734 #include <linux/sunrpc/clnt.h>
25733 #include <linux/sunrpc/gss_api.h> 25735 #include <linux/sunrpc/gss_api.h>
@@ -25752,9 +25754,9 @@ diff -NurpP --minimal linux-3.10.19/net/sunrpc/auth.c linux-3.10.19-vs2.3.6.8/ne
25752 }; 25754 };
25753 25755
25754 dprintk("RPC: %5u looking up %s cred\n", 25756 dprintk("RPC: %5u looking up %s cred\n",
25755diff -NurpP --minimal linux-3.10.19/net/sunrpc/auth_unix.c linux-3.10.19-vs2.3.6.8/net/sunrpc/auth_unix.c 25757diff -NurpP --minimal linux-3.10.21/net/sunrpc/auth_unix.c linux-3.10.21-vs2.3.6.8/net/sunrpc/auth_unix.c
25756--- linux-3.10.19/net/sunrpc/auth_unix.c 2013-05-31 13:45:33.000000000 +0000 25758--- linux-3.10.21/net/sunrpc/auth_unix.c 2013-05-31 13:45:33.000000000 +0000
25757+++ linux-3.10.19-vs2.3.6.8/net/sunrpc/auth_unix.c 2013-08-22 20:30:00.000000000 +0000 25759+++ linux-3.10.21-vs2.3.6.8/net/sunrpc/auth_unix.c 2013-08-22 20:30:00.000000000 +0000
25758@@ -13,11 +13,13 @@ 25760@@ -13,11 +13,13 @@
25759 #include <linux/sunrpc/clnt.h> 25761 #include <linux/sunrpc/clnt.h>
25760 #include <linux/sunrpc/auth.h> 25762 #include <linux/sunrpc/auth.h>
@@ -25811,9 +25813,9 @@ diff -NurpP --minimal linux-3.10.19/net/sunrpc/auth_unix.c linux-3.10.19-vs2.3.6
25811 hold = p++; 25813 hold = p++;
25812 for (i = 0; i < 16 && gid_valid(cred->uc_gids[i]); i++) 25814 for (i = 0; i < 16 && gid_valid(cred->uc_gids[i]); i++)
25813 *p++ = htonl((u32) from_kgid(&init_user_ns, cred->uc_gids[i])); 25815 *p++ = htonl((u32) from_kgid(&init_user_ns, cred->uc_gids[i]));
25814diff -NurpP --minimal linux-3.10.19/net/sunrpc/clnt.c linux-3.10.19-vs2.3.6.8/net/sunrpc/clnt.c 25816diff -NurpP --minimal linux-3.10.21/net/sunrpc/clnt.c linux-3.10.21-vs2.3.6.8/net/sunrpc/clnt.c
25815--- linux-3.10.19/net/sunrpc/clnt.c 2013-11-13 17:21:15.000000000 +0000 25817--- linux-3.10.21/net/sunrpc/clnt.c 2013-11-30 07:50:52.000000000 +0000
25816+++ linux-3.10.19-vs2.3.6.8/net/sunrpc/clnt.c 2013-11-13 17:17:16.000000000 +0000 25818+++ linux-3.10.21-vs2.3.6.8/net/sunrpc/clnt.c 2013-11-30 07:53:00.000000000 +0000
25817@@ -31,6 +31,7 @@ 25819@@ -31,6 +31,7 @@
25818 #include <linux/in6.h> 25820 #include <linux/in6.h>
25819 #include <linux/un.h> 25821 #include <linux/un.h>
@@ -25832,9 +25834,9 @@ diff -NurpP --minimal linux-3.10.19/net/sunrpc/clnt.c linux-3.10.19-vs2.3.6.8/ne
25832 return clnt; 25834 return clnt;
25833 } 25835 }
25834 EXPORT_SYMBOL_GPL(rpc_create); 25836 EXPORT_SYMBOL_GPL(rpc_create);
25835diff -NurpP --minimal linux-3.10.19/net/unix/af_unix.c linux-3.10.19-vs2.3.6.8/net/unix/af_unix.c 25837diff -NurpP --minimal linux-3.10.21/net/unix/af_unix.c linux-3.10.21-vs2.3.6.8/net/unix/af_unix.c
25836--- linux-3.10.19/net/unix/af_unix.c 2013-11-13 17:21:15.000000000 +0000 25838--- linux-3.10.21/net/unix/af_unix.c 2013-11-30 07:50:52.000000000 +0000
25837+++ linux-3.10.19-vs2.3.6.8/net/unix/af_unix.c 2013-11-13 17:22:25.000000000 +0000 25839+++ linux-3.10.21-vs2.3.6.8/net/unix/af_unix.c 2013-11-13 17:22:25.000000000 +0000
25838@@ -114,6 +114,8 @@ 25840@@ -114,6 +114,8 @@
25839 #include <linux/mount.h> 25841 #include <linux/mount.h>
25840 #include <net/checksum.h> 25842 #include <net/checksum.h>
@@ -25871,9 +25873,9 @@ diff -NurpP --minimal linux-3.10.19/net/unix/af_unix.c linux-3.10.19-vs2.3.6.8/n
25871 if (sock_net(sk) == seq_file_net(seq)) 25873 if (sock_net(sk) == seq_file_net(seq))
25872 return sk; 25874 return sk;
25873 } 25875 }
25874diff -NurpP --minimal linux-3.10.19/scripts/checksyscalls.sh linux-3.10.19-vs2.3.6.8/scripts/checksyscalls.sh 25876diff -NurpP --minimal linux-3.10.21/scripts/checksyscalls.sh linux-3.10.21-vs2.3.6.8/scripts/checksyscalls.sh
25875--- linux-3.10.19/scripts/checksyscalls.sh 2012-12-11 03:30:57.000000000 +0000 25877--- linux-3.10.21/scripts/checksyscalls.sh 2012-12-11 03:30:57.000000000 +0000
25876+++ linux-3.10.19-vs2.3.6.8/scripts/checksyscalls.sh 2013-08-22 20:30:00.000000000 +0000 25878+++ linux-3.10.21-vs2.3.6.8/scripts/checksyscalls.sh 2013-08-22 20:30:00.000000000 +0000
25877@@ -193,7 +193,6 @@ cat << EOF 25879@@ -193,7 +193,6 @@ cat << EOF
25878 #define __IGNORE_afs_syscall 25880 #define __IGNORE_afs_syscall
25879 #define __IGNORE_getpmsg 25881 #define __IGNORE_getpmsg
@@ -25882,9 +25884,9 @@ diff -NurpP --minimal linux-3.10.19/scripts/checksyscalls.sh linux-3.10.19-vs2.3
25882 EOF 25884 EOF
25883 } 25885 }
25884 25886
25885diff -NurpP --minimal linux-3.10.19/security/commoncap.c linux-3.10.19-vs2.3.6.8/security/commoncap.c 25887diff -NurpP --minimal linux-3.10.21/security/commoncap.c linux-3.10.21-vs2.3.6.8/security/commoncap.c
25886--- linux-3.10.19/security/commoncap.c 2013-05-31 13:45:34.000000000 +0000 25888--- linux-3.10.21/security/commoncap.c 2013-05-31 13:45:34.000000000 +0000
25887+++ linux-3.10.19-vs2.3.6.8/security/commoncap.c 2013-08-22 20:30:00.000000000 +0000 25889+++ linux-3.10.21-vs2.3.6.8/security/commoncap.c 2013-08-22 20:30:00.000000000 +0000
25888@@ -76,6 +76,7 @@ int cap_netlink_send(struct sock *sk, st 25890@@ -76,6 +76,7 @@ int cap_netlink_send(struct sock *sk, st
25889 int cap_capable(const struct cred *cred, struct user_namespace *targ_ns, 25891 int cap_capable(const struct cred *cred, struct user_namespace *targ_ns,
25890 int cap, int audit) 25892 int cap, int audit)
@@ -25926,9 +25928,9 @@ diff -NurpP --minimal linux-3.10.19/security/commoncap.c linux-3.10.19-vs2.3.6.8
25926 return -EPERM; 25928 return -EPERM;
25927 return 0; 25929 return 0;
25928 } 25930 }
25929diff -NurpP --minimal linux-3.10.19/security/selinux/hooks.c linux-3.10.19-vs2.3.6.8/security/selinux/hooks.c 25931diff -NurpP --minimal linux-3.10.21/security/selinux/hooks.c linux-3.10.21-vs2.3.6.8/security/selinux/hooks.c
25930--- linux-3.10.19/security/selinux/hooks.c 2013-07-14 17:01:42.000000000 +0000 25932--- linux-3.10.21/security/selinux/hooks.c 2013-07-14 17:01:42.000000000 +0000
25931+++ linux-3.10.19-vs2.3.6.8/security/selinux/hooks.c 2013-08-22 20:30:00.000000000 +0000 25933+++ linux-3.10.21-vs2.3.6.8/security/selinux/hooks.c 2013-08-22 20:30:00.000000000 +0000
25932@@ -67,7 +67,6 @@ 25934@@ -67,7 +67,6 @@
25933 #include <linux/dccp.h> 25935 #include <linux/dccp.h>
25934 #include <linux/quota.h> 25936 #include <linux/quota.h>
© 2015 Mike Crute