-diff -NurpP --minimal linux-3.13.10/Documentation/vserver/debug.txt linux-3.13.10-vs2.3.6.11/Documentation/vserver/debug.txt
---- linux-3.13.10/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/Documentation/vserver/debug.txt 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/Documentation/vserver/debug.txt linux-3.14.17-vs2.3.6.13/Documentation/vserver/debug.txt
+--- linux-3.14.17/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/Documentation/vserver/debug.txt 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,154 @@
+
+debug_cvirt:
+ m 2^m "vx_acc_page[%5d,%s,%2d]: %5d%s"
+ "vx_acc_pages[%5d,%s,%2d]: %5d += %5d"
+ "vx_pages_avail[%5d,%s,%2d]: %5ld > %5d + %5d"
-diff -NurpP --minimal linux-3.13.10/arch/alpha/Kconfig linux-3.13.10-vs2.3.6.11/arch/alpha/Kconfig
---- linux-3.13.10/arch/alpha/Kconfig 2014-01-22 20:38:09.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/arch/alpha/Kconfig 2014-01-31 20:38:03.000000000 +0000
-@@ -735,6 +735,8 @@ config DUMMY_CONSOLE
+diff -NurpP --minimal linux-3.14.17/arch/alpha/Kconfig linux-3.14.17-vs2.3.6.13/arch/alpha/Kconfig
+--- linux-3.14.17/arch/alpha/Kconfig 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/arch/alpha/Kconfig 2014-08-30 14:27:38.000000000 +0000
+@@ -739,6 +739,8 @@ config DUMMY_CONSOLE
depends on VGA_HOSE
default y
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.13.10/arch/alpha/kernel/systbls.S linux-3.13.10-vs2.3.6.11/arch/alpha/kernel/systbls.S
---- linux-3.13.10/arch/alpha/kernel/systbls.S 2013-11-25 15:44:11.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/arch/alpha/kernel/systbls.S 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/arch/alpha/kernel/systbls.S linux-3.14.17-vs2.3.6.13/arch/alpha/kernel/systbls.S
+--- linux-3.14.17/arch/alpha/kernel/systbls.S 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/arch/alpha/kernel/systbls.S 2014-08-30 14:27:38.000000000 +0000
@@ -446,7 +446,7 @@ sys_call_table:
.quad sys_stat64 /* 425 */
.quad sys_lstat64
.quad sys_ni_syscall /* sys_mbind */
.quad sys_ni_syscall /* sys_get_mempolicy */
.quad sys_ni_syscall /* sys_set_mempolicy */
-diff -NurpP --minimal linux-3.13.10/arch/alpha/kernel/traps.c linux-3.13.10-vs2.3.6.11/arch/alpha/kernel/traps.c
---- linux-3.13.10/arch/alpha/kernel/traps.c 2014-01-22 20:38:10.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/arch/alpha/kernel/traps.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/arch/alpha/kernel/traps.c linux-3.14.17-vs2.3.6.13/arch/alpha/kernel/traps.c
+--- linux-3.14.17/arch/alpha/kernel/traps.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/arch/alpha/kernel/traps.c 2014-08-30 14:27:38.000000000 +0000
@@ -175,7 +175,8 @@ die_if_kernel(char * str, struct pt_regs
#ifdef CONFIG_SMP
printk("CPU %d ", hard_smp_processor_id());
dik_show_regs(regs, r9_15);
add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE);
dik_show_trace((unsigned long *)(regs+1));
-diff -NurpP --minimal linux-3.13.10/arch/arm/Kconfig linux-3.13.10-vs2.3.6.11/arch/arm/Kconfig
---- linux-3.13.10/arch/arm/Kconfig 2014-04-17 01:12:06.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/arch/arm/Kconfig 2014-04-17 01:17:10.000000000 +0000
-@@ -2267,6 +2267,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.14.17/arch/arm/Kconfig linux-3.14.17-vs2.3.6.13/arch/arm/Kconfig
+--- linux-3.14.17/arch/arm/Kconfig 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/arch/arm/Kconfig 2014-08-30 14:27:38.000000000 +0000
+@@ -2290,6 +2290,8 @@ source "fs/Kconfig"
source "arch/arm/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.13.10/arch/arm/kernel/calls.S linux-3.13.10-vs2.3.6.11/arch/arm/kernel/calls.S
---- linux-3.13.10/arch/arm/kernel/calls.S 2013-05-31 13:44:29.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/arch/arm/kernel/calls.S 2014-01-31 20:38:03.000000000 +0000
+File linux-3.14.17/arch/arm/boot/dts/include/dt-bindings is a directory while file linux-3.14.17-vs2.3.6.13/arch/arm/boot/dts/include/dt-bindings is a regular file
+diff -NurpP --minimal linux-3.14.17/arch/arm/kernel/calls.S linux-3.14.17-vs2.3.6.13/arch/arm/kernel/calls.S
+--- linux-3.14.17/arch/arm/kernel/calls.S 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/arch/arm/kernel/calls.S 2014-08-30 14:27:38.000000000 +0000
@@ -322,7 +322,7 @@
/* 310 */ CALL(sys_request_key)
CALL(sys_keyctl)
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-3.13.10/arch/arm/kernel/traps.c linux-3.13.10-vs2.3.6.11/arch/arm/kernel/traps.c
---- linux-3.13.10/arch/arm/kernel/traps.c 2014-01-22 20:38:11.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/arch/arm/kernel/traps.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/arch/arm/kernel/traps.c linux-3.14.17-vs2.3.6.13/arch/arm/kernel/traps.c
+--- linux-3.14.17/arch/arm/kernel/traps.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/arch/arm/kernel/traps.c 2014-08-30 14:27:38.000000000 +0000
@@ -247,8 +247,8 @@ static int __die(const char *str, int er
print_modules();
if (!user_mode(regs) || in_interrupt()) {
dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-3.13.10/arch/cris/Kconfig linux-3.13.10-vs2.3.6.11/arch/cris/Kconfig
---- linux-3.13.10/arch/cris/Kconfig 2014-01-22 20:38:15.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/arch/cris/Kconfig 2014-01-31 20:38:03.000000000 +0000
-@@ -561,6 +561,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.14.17/arch/cris/Kconfig linux-3.14.17-vs2.3.6.13/arch/cris/Kconfig
+--- linux-3.14.17/arch/cris/Kconfig 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/arch/cris/Kconfig 2014-08-30 14:27:38.000000000 +0000
+@@ -555,6 +555,8 @@ source "fs/Kconfig"
source "arch/cris/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.13.10/arch/ia64/Kconfig linux-3.13.10-vs2.3.6.11/arch/ia64/Kconfig
---- linux-3.13.10/arch/ia64/Kconfig 2014-01-22 20:38:16.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/arch/ia64/Kconfig 2014-01-31 20:38:03.000000000 +0000
-@@ -641,6 +641,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.14.17/arch/ia64/Kconfig linux-3.14.17-vs2.3.6.13/arch/ia64/Kconfig
+--- linux-3.14.17/arch/ia64/Kconfig 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/arch/ia64/Kconfig 2014-08-30 14:27:38.000000000 +0000
+@@ -631,6 +631,8 @@ source "fs/Kconfig"
source "arch/ia64/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.13.10/arch/ia64/kernel/entry.S linux-3.13.10-vs2.3.6.11/arch/ia64/kernel/entry.S
---- linux-3.13.10/arch/ia64/kernel/entry.S 2014-01-22 20:38:16.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/arch/ia64/kernel/entry.S 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/arch/ia64/kernel/entry.S linux-3.14.17-vs2.3.6.13/arch/ia64/kernel/entry.S
+--- linux-3.14.17/arch/ia64/kernel/entry.S 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/arch/ia64/kernel/entry.S 2014-08-30 14:27:38.000000000 +0000
@@ -1706,7 +1706,7 @@ sys_call_table:
data8 sys_mq_notify
data8 sys_mq_getsetattr
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -NurpP --minimal linux-3.13.10/arch/ia64/kernel/ptrace.c linux-3.13.10-vs2.3.6.11/arch/ia64/kernel/ptrace.c
---- linux-3.13.10/arch/ia64/kernel/ptrace.c 2013-02-19 13:56:51.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/arch/ia64/kernel/ptrace.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/arch/ia64/kernel/ptrace.c linux-3.14.17-vs2.3.6.13/arch/ia64/kernel/ptrace.c
+--- linux-3.14.17/arch/ia64/kernel/ptrace.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/arch/ia64/kernel/ptrace.c 2014-08-30 14:27:38.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/regset.h>
#include <linux/elf.h>
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-3.13.10/arch/ia64/kernel/traps.c linux-3.13.10-vs2.3.6.11/arch/ia64/kernel/traps.c
---- linux-3.13.10/arch/ia64/kernel/traps.c 2013-11-25 15:44:20.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/arch/ia64/kernel/traps.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/arch/ia64/kernel/traps.c linux-3.14.17-vs2.3.6.13/arch/ia64/kernel/traps.c
+--- linux-3.14.17/arch/ia64/kernel/traps.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/arch/ia64/kernel/traps.c 2014-08-30 14:27:38.000000000 +0000
@@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re
put_cpu();
}
}
}
-diff -NurpP --minimal linux-3.13.10/arch/m32r/kernel/traps.c linux-3.13.10-vs2.3.6.11/arch/m32r/kernel/traps.c
---- linux-3.13.10/arch/m32r/kernel/traps.c 2013-07-14 17:00:26.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/arch/m32r/kernel/traps.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/arch/m32r/kernel/traps.c linux-3.14.17-vs2.3.6.13/arch/m32r/kernel/traps.c
+--- linux-3.14.17/arch/m32r/kernel/traps.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/arch/m32r/kernel/traps.c 2014-08-30 14:27:38.000000000 +0000
@@ -184,8 +184,9 @@ static void show_registers(struct pt_reg
} else {
printk("SPI: %08lx\n", sp);
/*
* When in-kernel, we also print out the stack and code at the
-diff -NurpP --minimal linux-3.13.10/arch/m68k/Kconfig linux-3.13.10-vs2.3.6.11/arch/m68k/Kconfig
---- linux-3.13.10/arch/m68k/Kconfig 2014-04-17 01:12:07.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/arch/m68k/Kconfig 2014-04-17 01:17:10.000000000 +0000
-@@ -135,6 +135,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.14.17/arch/m68k/Kconfig linux-3.14.17-vs2.3.6.13/arch/m68k/Kconfig
+--- linux-3.14.17/arch/m68k/Kconfig 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/arch/m68k/Kconfig 2014-08-30 14:27:38.000000000 +0000
+@@ -159,6 +159,8 @@ source "fs/Kconfig"
source "arch/m68k/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.13.10/arch/mips/Kconfig linux-3.13.10-vs2.3.6.11/arch/mips/Kconfig
---- linux-3.13.10/arch/mips/Kconfig 2014-01-22 20:38:16.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/arch/mips/Kconfig 2014-01-31 20:38:03.000000000 +0000
-@@ -2539,6 +2539,8 @@ source "fs/Kconfig"
+File linux-3.14.17/arch/metag/boot/dts/include/dt-bindings is a directory while file linux-3.14.17-vs2.3.6.13/arch/metag/boot/dts/include/dt-bindings is a regular file
+diff -NurpP --minimal linux-3.14.17/arch/mips/Kconfig linux-3.14.17-vs2.3.6.13/arch/mips/Kconfig
+--- linux-3.14.17/arch/mips/Kconfig 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/arch/mips/Kconfig 2014-08-30 14:27:38.000000000 +0000
+@@ -2579,6 +2579,8 @@ source "fs/Kconfig"
source "arch/mips/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.13.10/arch/mips/kernel/ptrace.c linux-3.13.10-vs2.3.6.11/arch/mips/kernel/ptrace.c
---- linux-3.13.10/arch/mips/kernel/ptrace.c 2014-01-22 20:38:17.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/arch/mips/kernel/ptrace.c 2014-01-31 20:53:13.000000000 +0000
+File linux-3.14.17/arch/mips/boot/dts/include/dt-bindings is a directory while file linux-3.14.17-vs2.3.6.13/arch/mips/boot/dts/include/dt-bindings is a regular file
+diff -NurpP --minimal linux-3.14.17/arch/mips/kernel/ptrace.c linux-3.14.17-vs2.3.6.13/arch/mips/kernel/ptrace.c
+--- linux-3.14.17/arch/mips/kernel/ptrace.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/arch/mips/kernel/ptrace.c 2014-08-30 14:27:38.000000000 +0000
@@ -30,6 +30,7 @@
#include <linux/audit.h>
#include <linux/seccomp.h>
switch (request) {
/* when I and D space are separate, these will need to be fixed. */
case PTRACE_PEEKTEXT: /* read word at location addr. */
-diff -NurpP --minimal linux-3.13.10/arch/mips/kernel/scall32-o32.S linux-3.13.10-vs2.3.6.11/arch/mips/kernel/scall32-o32.S
---- linux-3.13.10/arch/mips/kernel/scall32-o32.S 2014-01-22 20:38:17.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/arch/mips/kernel/scall32-o32.S 2014-01-31 20:48:18.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/arch/mips/kernel/scall32-o32.S linux-3.14.17-vs2.3.6.13/arch/mips/kernel/scall32-o32.S
+--- linux-3.14.17/arch/mips/kernel/scall32-o32.S 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/arch/mips/kernel/scall32-o32.S 2014-08-30 14:27:38.000000000 +0000
@@ -491,7 +491,7 @@ EXPORT(sys_call_table)
PTR sys_mq_timedreceive
PTR sys_mq_notify /* 4275 */
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-diff -NurpP --minimal linux-3.13.10/arch/mips/kernel/scall64-64.S linux-3.13.10-vs2.3.6.11/arch/mips/kernel/scall64-64.S
---- linux-3.13.10/arch/mips/kernel/scall64-64.S 2014-01-22 20:38:17.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/arch/mips/kernel/scall64-64.S 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/arch/mips/kernel/scall64-64.S linux-3.14.17-vs2.3.6.13/arch/mips/kernel/scall64-64.S
+--- linux-3.14.17/arch/mips/kernel/scall64-64.S 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/arch/mips/kernel/scall64-64.S 2014-08-30 14:27:38.000000000 +0000
@@ -352,7 +352,7 @@ EXPORT(sys_call_table)
PTR sys_mq_timedreceive
PTR sys_mq_notify
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-3.13.10/arch/mips/kernel/scall64-n32.S linux-3.13.10-vs2.3.6.11/arch/mips/kernel/scall64-n32.S
---- linux-3.13.10/arch/mips/kernel/scall64-n32.S 2014-01-22 20:38:17.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/arch/mips/kernel/scall64-n32.S 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/arch/mips/kernel/scall64-n32.S linux-3.14.17-vs2.3.6.13/arch/mips/kernel/scall64-n32.S
+--- linux-3.14.17/arch/mips/kernel/scall64-n32.S 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/arch/mips/kernel/scall64-n32.S 2014-08-30 14:27:38.000000000 +0000
@@ -345,7 +345,7 @@ EXPORT(sysn32_call_table)
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify
PTR compat_sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-3.13.10/arch/mips/kernel/scall64-o32.S linux-3.13.10-vs2.3.6.11/arch/mips/kernel/scall64-o32.S
---- linux-3.13.10/arch/mips/kernel/scall64-o32.S 2014-01-22 20:38:17.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/arch/mips/kernel/scall64-o32.S 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/arch/mips/kernel/scall64-o32.S linux-3.14.17-vs2.3.6.13/arch/mips/kernel/scall64-o32.S
+--- linux-3.14.17/arch/mips/kernel/scall64-o32.S 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/arch/mips/kernel/scall64-o32.S 2014-08-30 14:27:38.000000000 +0000
@@ -469,7 +469,7 @@ EXPORT(sys32_call_table)
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify /* 4275 */
PTR compat_sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-diff -NurpP --minimal linux-3.13.10/arch/mips/kernel/traps.c linux-3.13.10-vs2.3.6.11/arch/mips/kernel/traps.c
---- linux-3.13.10/arch/mips/kernel/traps.c 2014-01-22 20:38:17.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/arch/mips/kernel/traps.c 2014-01-31 20:38:03.000000000 +0000
-@@ -334,9 +334,10 @@ void show_registers(struct pt_regs *regs
+diff -NurpP --minimal linux-3.14.17/arch/mips/kernel/traps.c linux-3.14.17-vs2.3.6.13/arch/mips/kernel/traps.c
+--- linux-3.14.17/arch/mips/kernel/traps.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/arch/mips/kernel/traps.c 2014-08-30 14:27:38.000000000 +0000
+@@ -335,9 +335,10 @@ void show_registers(struct pt_regs *regs
__show_regs(regs);
print_modules();
if (cpu_has_userlocal) {
unsigned long tls;
-diff -NurpP --minimal linux-3.13.10/arch/parisc/Kconfig linux-3.13.10-vs2.3.6.11/arch/parisc/Kconfig
---- linux-3.13.10/arch/parisc/Kconfig 2014-01-22 20:38:18.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/arch/parisc/Kconfig 2014-01-31 20:38:03.000000000 +0000
-@@ -320,6 +320,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.14.17/arch/parisc/Kconfig linux-3.14.17-vs2.3.6.13/arch/parisc/Kconfig
+--- linux-3.14.17/arch/parisc/Kconfig 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/arch/parisc/Kconfig 2014-08-30 14:27:38.000000000 +0000
+@@ -321,6 +321,8 @@ source "fs/Kconfig"
source "arch/parisc/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.13.10/arch/parisc/kernel/syscall_table.S linux-3.13.10-vs2.3.6.11/arch/parisc/kernel/syscall_table.S
---- linux-3.13.10/arch/parisc/kernel/syscall_table.S 2013-07-14 17:00:31.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/arch/parisc/kernel/syscall_table.S 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/arch/parisc/kernel/syscall_table.S linux-3.14.17-vs2.3.6.13/arch/parisc/kernel/syscall_table.S
+--- linux-3.14.17/arch/parisc/kernel/syscall_table.S 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/arch/parisc/kernel/syscall_table.S 2014-08-30 14:27:38.000000000 +0000
@@ -358,7 +358,7 @@
ENTRY_COMP(mbind) /* 260 */
ENTRY_COMP(get_mempolicy)
ENTRY_SAME(add_key)
ENTRY_SAME(request_key) /* 265 */
ENTRY_SAME(keyctl)
-diff -NurpP --minimal linux-3.13.10/arch/parisc/kernel/traps.c linux-3.13.10-vs2.3.6.11/arch/parisc/kernel/traps.c
---- linux-3.13.10/arch/parisc/kernel/traps.c 2013-11-25 15:46:28.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/arch/parisc/kernel/traps.c 2014-01-31 20:38:03.000000000 +0000
-@@ -229,8 +229,9 @@ void die_if_kernel(char *str, struct pt_
+diff -NurpP --minimal linux-3.14.17/arch/parisc/kernel/traps.c linux-3.14.17-vs2.3.6.13/arch/parisc/kernel/traps.c
+--- linux-3.14.17/arch/parisc/kernel/traps.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/arch/parisc/kernel/traps.c 2014-08-30 14:36:00.000000000 +0000
+@@ -239,8 +239,9 @@ void die_if_kernel(char *str, struct pt_
return; /* STFU */
parisc_printk_ratelimited(1, regs,
return;
}
-@@ -263,8 +264,8 @@ void die_if_kernel(char *str, struct pt_
+@@ -270,8 +271,8 @@ void die_if_kernel(char *str, struct pt_
pdc_console_restart();
if (err)
/* Wot's wrong wif bein' racy? */
if (current->thread.flags & PARISC_KERNEL_DEATH) {
-diff -NurpP --minimal linux-3.13.10/arch/powerpc/Kconfig linux-3.13.10-vs2.3.6.11/arch/powerpc/Kconfig
---- linux-3.13.10/arch/powerpc/Kconfig 2014-01-22 20:38:18.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/arch/powerpc/Kconfig 2014-01-31 20:38:03.000000000 +0000
-@@ -1028,6 +1028,8 @@ source "lib/Kconfig"
+diff -NurpP --minimal linux-3.14.17/arch/powerpc/Kconfig linux-3.14.17-vs2.3.6.13/arch/powerpc/Kconfig
+--- linux-3.14.17/arch/powerpc/Kconfig 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/arch/powerpc/Kconfig 2014-08-30 14:27:38.000000000 +0000
+@@ -1041,6 +1041,8 @@ source "lib/Kconfig"
source "arch/powerpc/Kconfig.debug"
source "security/Kconfig"
config KEYS_COMPAT
-diff -NurpP --minimal linux-3.13.10/arch/powerpc/include/uapi/asm/unistd.h linux-3.13.10-vs2.3.6.11/arch/powerpc/include/uapi/asm/unistd.h
---- linux-3.13.10/arch/powerpc/include/uapi/asm/unistd.h 2013-05-31 13:44:44.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/arch/powerpc/include/uapi/asm/unistd.h 2014-01-31 20:38:03.000000000 +0000
+File linux-3.14.17/arch/powerpc/boot/dts/include/dt-bindings is a directory while file linux-3.14.17-vs2.3.6.13/arch/powerpc/boot/dts/include/dt-bindings is a regular file
+diff -NurpP --minimal linux-3.14.17/arch/powerpc/include/uapi/asm/unistd.h linux-3.14.17-vs2.3.6.13/arch/powerpc/include/uapi/asm/unistd.h
+--- linux-3.14.17/arch/powerpc/include/uapi/asm/unistd.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/arch/powerpc/include/uapi/asm/unistd.h 2014-08-30 14:27:38.000000000 +0000
@@ -275,7 +275,7 @@
#endif
#define __NR_rtas 255
#define __NR_migrate_pages 258
#define __NR_mbind 259
#define __NR_get_mempolicy 260
-diff -NurpP --minimal linux-3.13.10/arch/powerpc/kernel/traps.c linux-3.13.10-vs2.3.6.11/arch/powerpc/kernel/traps.c
---- linux-3.13.10/arch/powerpc/kernel/traps.c 2014-01-22 20:38:23.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/arch/powerpc/kernel/traps.c 2014-01-31 20:38:03.000000000 +0000
-@@ -1272,8 +1272,9 @@ void nonrecoverable_exception(struct pt_
+diff -NurpP --minimal linux-3.14.17/arch/powerpc/kernel/traps.c linux-3.14.17-vs2.3.6.13/arch/powerpc/kernel/traps.c
+--- linux-3.14.17/arch/powerpc/kernel/traps.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/arch/powerpc/kernel/traps.c 2014-08-30 14:27:38.000000000 +0000
+@@ -1287,8 +1287,9 @@ void nonrecoverable_exception(struct pt_
void trace_syscall(struct pt_regs *regs)
{
regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted());
}
-diff -NurpP --minimal linux-3.13.10/arch/s390/Kconfig linux-3.13.10-vs2.3.6.11/arch/s390/Kconfig
---- linux-3.13.10/arch/s390/Kconfig 2014-04-17 01:12:08.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/arch/s390/Kconfig 2014-04-17 01:17:10.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/arch/s390/Kconfig linux-3.14.17-vs2.3.6.13/arch/s390/Kconfig
+--- linux-3.14.17/arch/s390/Kconfig 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/arch/s390/Kconfig 2014-08-30 14:27:38.000000000 +0000
@@ -650,6 +650,8 @@ source "fs/Kconfig"
source "arch/s390/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.13.10/arch/s390/include/asm/tlb.h linux-3.13.10-vs2.3.6.11/arch/s390/include/asm/tlb.h
---- linux-3.13.10/arch/s390/include/asm/tlb.h 2013-11-25 15:46:29.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/arch/s390/include/asm/tlb.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/arch/s390/include/asm/tlb.h linux-3.14.17-vs2.3.6.13/arch/s390/include/asm/tlb.h
+--- linux-3.14.17/arch/s390/include/asm/tlb.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/arch/s390/include/asm/tlb.h 2014-08-30 14:27:38.000000000 +0000
@@ -24,6 +24,7 @@
#include <linux/mm.h>
#include <linux/pagemap.h>
#include <asm/processor.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-3.13.10/arch/s390/include/uapi/asm/unistd.h linux-3.13.10-vs2.3.6.11/arch/s390/include/uapi/asm/unistd.h
---- linux-3.13.10/arch/s390/include/uapi/asm/unistd.h 2013-02-19 13:57:16.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/arch/s390/include/uapi/asm/unistd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/arch/s390/include/uapi/asm/unistd.h linux-3.14.17-vs2.3.6.13/arch/s390/include/uapi/asm/unistd.h
+--- linux-3.14.17/arch/s390/include/uapi/asm/unistd.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/arch/s390/include/uapi/asm/unistd.h 2014-08-30 14:27:38.000000000 +0000
@@ -200,7 +200,7 @@
#define __NR_clock_gettime (__NR_timer_create+6)
#define __NR_clock_getres (__NR_timer_create+7)
#define __NR_statfs64 265
#define __NR_fstatfs64 266
#define __NR_remap_file_pages 267
-diff -NurpP --minimal linux-3.13.10/arch/s390/kernel/ptrace.c linux-3.13.10-vs2.3.6.11/arch/s390/kernel/ptrace.c
---- linux-3.13.10/arch/s390/kernel/ptrace.c 2014-01-22 20:38:24.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/arch/s390/kernel/ptrace.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/arch/s390/kernel/ptrace.c linux-3.14.17-vs2.3.6.13/arch/s390/kernel/ptrace.c
+--- linux-3.14.17/arch/s390/kernel/ptrace.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/arch/s390/kernel/ptrace.c 2014-08-30 14:27:38.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/tracehook.h>
#include <linux/seccomp.h>
#include <trace/syscall.h>
#include <asm/segment.h>
#include <asm/page.h>
-diff -NurpP --minimal linux-3.13.10/arch/s390/kernel/syscalls.S linux-3.13.10-vs2.3.6.11/arch/s390/kernel/syscalls.S
---- linux-3.13.10/arch/s390/kernel/syscalls.S 2013-07-14 17:00:34.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/arch/s390/kernel/syscalls.S 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/arch/s390/kernel/syscalls.S linux-3.14.17-vs2.3.6.13/arch/s390/kernel/syscalls.S
+--- linux-3.14.17/arch/s390/kernel/syscalls.S 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/arch/s390/kernel/syscalls.S 2014-08-30 14:27:38.000000000 +0000
@@ -271,7 +271,7 @@ SYSCALL(sys_clock_settime,sys_clock_sett
SYSCALL(sys_clock_gettime,sys_clock_gettime,sys32_clock_gettime_wrapper) /* 260 */
SYSCALL(sys_clock_getres,sys_clock_getres,sys32_clock_getres_wrapper)
SYSCALL(sys_s390_fadvise64_64,sys_ni_syscall,sys32_fadvise64_64_wrapper)
SYSCALL(sys_statfs64,sys_statfs64,compat_sys_statfs64_wrapper)
SYSCALL(sys_fstatfs64,sys_fstatfs64,compat_sys_fstatfs64_wrapper)
-diff -NurpP --minimal linux-3.13.10/arch/sh/Kconfig linux-3.13.10-vs2.3.6.11/arch/sh/Kconfig
---- linux-3.13.10/arch/sh/Kconfig 2014-01-22 20:38:24.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/arch/sh/Kconfig 2014-01-31 20:38:03.000000000 +0000
-@@ -927,6 +927,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.14.17/arch/sh/Kconfig linux-3.14.17-vs2.3.6.13/arch/sh/Kconfig
+--- linux-3.14.17/arch/sh/Kconfig 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/arch/sh/Kconfig 2014-08-30 14:27:38.000000000 +0000
+@@ -914,6 +914,8 @@ source "fs/Kconfig"
source "arch/sh/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.13.10/arch/sh/kernel/irq.c linux-3.13.10-vs2.3.6.11/arch/sh/kernel/irq.c
---- linux-3.13.10/arch/sh/kernel/irq.c 2014-01-22 20:38:24.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/arch/sh/kernel/irq.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/arch/sh/kernel/irq.c linux-3.14.17-vs2.3.6.13/arch/sh/kernel/irq.c
+--- linux-3.14.17/arch/sh/kernel/irq.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/arch/sh/kernel/irq.c 2014-08-30 14:27:38.000000000 +0000
@@ -14,6 +14,7 @@
#include <linux/ftrace.h>
#include <linux/delay.h>
#include <asm/processor.h>
#include <asm/machvec.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-3.13.10/arch/sparc/Kconfig linux-3.13.10-vs2.3.6.11/arch/sparc/Kconfig
---- linux-3.13.10/arch/sparc/Kconfig 2014-01-22 20:38:24.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/arch/sparc/Kconfig 2014-01-31 20:38:03.000000000 +0000
-@@ -553,6 +553,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.14.17/arch/sparc/Kconfig linux-3.14.17-vs2.3.6.13/arch/sparc/Kconfig
+--- linux-3.14.17/arch/sparc/Kconfig 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/arch/sparc/Kconfig 2014-08-30 14:27:38.000000000 +0000
+@@ -555,6 +555,8 @@ source "fs/Kconfig"
source "arch/sparc/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.13.10/arch/sparc/include/uapi/asm/unistd.h linux-3.13.10-vs2.3.6.11/arch/sparc/include/uapi/asm/unistd.h
---- linux-3.13.10/arch/sparc/include/uapi/asm/unistd.h 2013-02-19 13:57:17.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/arch/sparc/include/uapi/asm/unistd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/arch/sparc/include/uapi/asm/unistd.h linux-3.14.17-vs2.3.6.13/arch/sparc/include/uapi/asm/unistd.h
+--- linux-3.14.17/arch/sparc/include/uapi/asm/unistd.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/arch/sparc/include/uapi/asm/unistd.h 2014-08-30 14:27:38.000000000 +0000
@@ -332,7 +332,7 @@
#define __NR_timer_getoverrun 264
#define __NR_timer_delete 265
#define __NR_io_setup 268
#define __NR_io_destroy 269
#define __NR_io_submit 270
-diff -NurpP --minimal linux-3.13.10/arch/sparc/kernel/systbls_32.S linux-3.13.10-vs2.3.6.11/arch/sparc/kernel/systbls_32.S
---- linux-3.13.10/arch/sparc/kernel/systbls_32.S 2013-05-31 13:44:48.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/arch/sparc/kernel/systbls_32.S 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/arch/sparc/kernel/systbls_32.S linux-3.14.17-vs2.3.6.13/arch/sparc/kernel/systbls_32.S
+--- linux-3.14.17/arch/sparc/kernel/systbls_32.S 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/arch/sparc/kernel/systbls_32.S 2014-08-30 14:27:38.000000000 +0000
@@ -70,7 +70,7 @@ sys_call_table:
/*250*/ .long sys_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_ni_syscall
/*255*/ .long sys_sync_file_range, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep
/*270*/ .long sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink
/*275*/ .long sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid
/*280*/ .long sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat
-diff -NurpP --minimal linux-3.13.10/arch/sparc/kernel/systbls_64.S linux-3.13.10-vs2.3.6.11/arch/sparc/kernel/systbls_64.S
---- linux-3.13.10/arch/sparc/kernel/systbls_64.S 2013-07-14 17:00:35.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/arch/sparc/kernel/systbls_64.S 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/arch/sparc/kernel/systbls_64.S linux-3.14.17-vs2.3.6.13/arch/sparc/kernel/systbls_64.S
+--- linux-3.14.17/arch/sparc/kernel/systbls_64.S 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/arch/sparc/kernel/systbls_64.S 2014-08-30 14:27:38.000000000 +0000
@@ -71,7 +71,7 @@ sys_call_table32:
/*250*/ .word sys_mremap, compat_sys_sysctl, sys_getsid, sys_fdatasync, sys_nis_syscall
.word sys32_sync_file_range, compat_sys_clock_settime, compat_sys_clock_gettime, compat_sys_clock_getres, sys32_clock_nanosleep
/*270*/ .word sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink
.word sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid
/*280*/ .word sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat
-diff -NurpP --minimal linux-3.13.10/arch/um/Kconfig.rest linux-3.13.10-vs2.3.6.11/arch/um/Kconfig.rest
---- linux-3.13.10/arch/um/Kconfig.rest 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/arch/um/Kconfig.rest 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/arch/um/Kconfig.rest linux-3.14.17-vs2.3.6.13/arch/um/Kconfig.rest
+--- linux-3.14.17/arch/um/Kconfig.rest 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/arch/um/Kconfig.rest 2014-08-30 14:27:38.000000000 +0000
@@ -12,6 +12,8 @@ source "arch/um/Kconfig.net"
source "fs/Kconfig"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.13.10/arch/x86/Kconfig linux-3.13.10-vs2.3.6.11/arch/x86/Kconfig
---- linux-3.13.10/arch/x86/Kconfig 2014-01-22 20:38:25.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/arch/x86/Kconfig 2014-01-31 20:38:03.000000000 +0000
-@@ -2403,6 +2403,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.14.17/arch/x86/Kconfig linux-3.14.17-vs2.3.6.13/arch/x86/Kconfig
+--- linux-3.14.17/arch/x86/Kconfig 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/arch/x86/Kconfig 2014-08-30 14:27:38.000000000 +0000
+@@ -2452,6 +2452,8 @@ source "fs/Kconfig"
source "arch/x86/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.13.10/arch/x86/syscalls/syscall_32.tbl linux-3.13.10-vs2.3.6.11/arch/x86/syscalls/syscall_32.tbl
---- linux-3.13.10/arch/x86/syscalls/syscall_32.tbl 2013-07-14 17:00:37.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/arch/x86/syscalls/syscall_32.tbl 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/arch/x86/syscalls/syscall_32.tbl linux-3.14.17-vs2.3.6.13/arch/x86/syscalls/syscall_32.tbl
+--- linux-3.14.17/arch/x86/syscalls/syscall_32.tbl 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/arch/x86/syscalls/syscall_32.tbl 2014-08-30 14:27:38.000000000 +0000
@@ -279,7 +279,7 @@
270 i386 tgkill sys_tgkill
271 i386 utimes sys_utimes compat_sys_utimes
274 i386 mbind sys_mbind
275 i386 get_mempolicy sys_get_mempolicy compat_sys_get_mempolicy
276 i386 set_mempolicy sys_set_mempolicy
-diff -NurpP --minimal linux-3.13.10/arch/x86/syscalls/syscall_64.tbl linux-3.13.10-vs2.3.6.11/arch/x86/syscalls/syscall_64.tbl
---- linux-3.13.10/arch/x86/syscalls/syscall_64.tbl 2013-05-31 13:44:50.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/arch/x86/syscalls/syscall_64.tbl 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/arch/x86/syscalls/syscall_64.tbl linux-3.14.17-vs2.3.6.13/arch/x86/syscalls/syscall_64.tbl
+--- linux-3.14.17/arch/x86/syscalls/syscall_64.tbl 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/arch/x86/syscalls/syscall_64.tbl 2014-08-30 14:27:38.000000000 +0000
@@ -242,7 +242,7 @@
233 common epoll_ctl sys_epoll_ctl
234 common tgkill sys_tgkill
237 common mbind sys_mbind
238 common set_mempolicy sys_set_mempolicy
239 common get_mempolicy sys_get_mempolicy
-diff -NurpP --minimal linux-3.13.10/drivers/block/Kconfig linux-3.13.10-vs2.3.6.11/drivers/block/Kconfig
---- linux-3.13.10/drivers/block/Kconfig 2014-01-22 20:38:27.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/drivers/block/Kconfig 2014-01-31 20:38:03.000000000 +0000
-@@ -281,6 +281,13 @@ config BLK_DEV_CRYPTOLOOP
+diff -NurpP --minimal linux-3.14.17/drivers/block/Kconfig linux-3.14.17-vs2.3.6.13/drivers/block/Kconfig
+--- linux-3.14.17/drivers/block/Kconfig 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/drivers/block/Kconfig 2014-08-30 14:27:38.000000000 +0000
+@@ -283,6 +283,13 @@ config BLK_DEV_CRYPTOLOOP
source "drivers/block/drbd/Kconfig"
config BLK_DEV_NBD
tristate "Network block device support"
depends on NET
-diff -NurpP --minimal linux-3.13.10/drivers/block/Makefile linux-3.13.10-vs2.3.6.11/drivers/block/Makefile
---- linux-3.13.10/drivers/block/Makefile 2014-01-22 20:38:27.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/drivers/block/Makefile 2014-01-31 20:38:03.000000000 +0000
-@@ -34,6 +34,7 @@ obj-$(CONFIG_VIRTIO_BLK) += virtio_blk.o
- obj-$(CONFIG_VIODASD) += viodasd.o
+diff -NurpP --minimal linux-3.14.17/drivers/block/Makefile linux-3.14.17-vs2.3.6.13/drivers/block/Makefile
+--- linux-3.14.17/drivers/block/Makefile 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/drivers/block/Makefile 2014-08-30 14:27:38.000000000 +0000
+@@ -33,6 +33,7 @@ obj-$(CONFIG_VIRTIO_BLK) += virtio_blk.o
+
obj-$(CONFIG_BLK_DEV_SX8) += sx8.o
obj-$(CONFIG_BLK_DEV_HD) += hd.o
+obj-$(CONFIG_BLK_DEV_VROOT) += vroot.o
obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o
obj-$(CONFIG_XEN_BLKDEV_BACKEND) += xen-blkback/
-diff -NurpP --minimal linux-3.13.10/drivers/block/loop.c linux-3.13.10-vs2.3.6.11/drivers/block/loop.c
---- linux-3.13.10/drivers/block/loop.c 2014-01-22 20:38:27.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/drivers/block/loop.c 2014-01-31 20:55:14.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/drivers/block/loop.c linux-3.14.17-vs2.3.6.13/drivers/block/loop.c
+--- linux-3.14.17/drivers/block/loop.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/drivers/block/loop.c 2014-08-30 14:27:38.000000000 +0000
@@ -75,6 +75,7 @@
#include <linux/sysfs.h>
#include <linux/miscdevice.h>
#include "loop.h"
#include <asm/uaccess.h>
-@@ -884,6 +885,7 @@ static int loop_set_fd(struct loop_devic
+@@ -885,6 +886,7 @@ static int loop_set_fd(struct loop_devic
lo->lo_blocksize = lo_blocksize;
lo->lo_device = bdev;
lo->lo_flags = lo_flags;
lo->lo_backing_file = file;
lo->transfer = transfer_none;
lo->ioctl = NULL;
-@@ -1028,6 +1030,7 @@ static int loop_clr_fd(struct loop_devic
+@@ -1029,6 +1031,7 @@ static int loop_clr_fd(struct loop_devic
lo->lo_sizelimit = 0;
lo->lo_encrypt_key_size = 0;
lo->lo_thread = NULL;
memset(lo->lo_encrypt_key, 0, LO_KEY_SIZE);
memset(lo->lo_crypt_name, 0, LO_NAME_SIZE);
memset(lo->lo_file_name, 0, LO_NAME_SIZE);
-@@ -1071,7 +1074,7 @@ loop_set_status(struct loop_device *lo,
+@@ -1072,7 +1075,7 @@ loop_set_status(struct loop_device *lo,
if (lo->lo_encrypt_key_size &&
!uid_eq(lo->lo_key_owner, uid) &&
return -EPERM;
if (lo->lo_state != Lo_bound)
return -ENXIO;
-@@ -1161,7 +1164,8 @@ loop_get_status(struct loop_device *lo,
+@@ -1162,7 +1165,8 @@ loop_get_status(struct loop_device *lo,
memcpy(info->lo_crypt_name, lo->lo_crypt_name, LO_NAME_SIZE);
info->lo_encrypt_type =
lo->lo_encryption ? lo->lo_encryption->number : 0;
info->lo_encrypt_key_size = lo->lo_encrypt_key_size;
memcpy(info->lo_encrypt_key, lo->lo_encrypt_key,
lo->lo_encrypt_key_size);
-@@ -1503,6 +1507,11 @@ static int lo_open(struct block_device *
+@@ -1504,6 +1508,11 @@ static int lo_open(struct block_device *
goto out;
}
mutex_lock(&lo->lo_ctl_mutex);
lo->lo_refcnt++;
mutex_unlock(&lo->lo_ctl_mutex);
-diff -NurpP --minimal linux-3.13.10/drivers/block/loop.h linux-3.13.10-vs2.3.6.11/drivers/block/loop.h
---- linux-3.13.10/drivers/block/loop.h 2013-11-25 15:44:28.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/drivers/block/loop.h 2014-02-01 01:57:49.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/drivers/block/loop.h linux-3.14.17-vs2.3.6.13/drivers/block/loop.h
+--- linux-3.14.17/drivers/block/loop.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/drivers/block/loop.h 2014-08-30 14:27:38.000000000 +0000
@@ -41,6 +41,7 @@ struct loop_device {
struct loop_func_table *lo_encryption;
__u32 lo_init[2];
int (*ioctl)(struct loop_device *, int cmd,
unsigned long arg);
-diff -NurpP --minimal linux-3.13.10/drivers/block/vroot.c linux-3.13.10-vs2.3.6.11/drivers/block/vroot.c
---- linux-3.13.10/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/drivers/block/vroot.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/drivers/block/vroot.c linux-3.14.17-vs2.3.6.13/drivers/block/vroot.c
+--- linux-3.14.17/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/drivers/block/vroot.c 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,290 @@
+/*
+ * linux/drivers/block/vroot.c
+
+#endif
+
-diff -NurpP --minimal linux-3.13.10/drivers/infiniband/core/addr.c linux-3.13.10-vs2.3.6.11/drivers/infiniband/core/addr.c
---- linux-3.13.10/drivers/infiniband/core/addr.c 2013-11-25 15:44:35.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/drivers/infiniband/core/addr.c 2014-01-31 20:38:03.000000000 +0000
-@@ -277,7 +277,7 @@ static int addr6_resolve(struct sockaddr
+diff -NurpP --minimal linux-3.14.17/drivers/infiniband/core/addr.c linux-3.14.17-vs2.3.6.13/drivers/infiniband/core/addr.c
+--- linux-3.14.17/drivers/infiniband/core/addr.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/drivers/infiniband/core/addr.c 2014-08-30 14:27:38.000000000 +0000
+@@ -284,7 +284,7 @@ static int addr6_resolve(struct sockaddr
if (ipv6_addr_any(&fl6.saddr)) {
ret = ipv6_dev_get_saddr(&init_net, ip6_dst_idev(dst)->dev,
if (ret)
goto put;
-diff -NurpP --minimal linux-3.13.10/drivers/md/dm-ioctl.c linux-3.13.10-vs2.3.6.11/drivers/md/dm-ioctl.c
---- linux-3.13.10/drivers/md/dm-ioctl.c 2014-01-22 20:38:36.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/drivers/md/dm-ioctl.c 2014-01-31 21:01:49.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/drivers/md/dm-ioctl.c linux-3.14.17-vs2.3.6.13/drivers/md/dm-ioctl.c
+--- linux-3.14.17/drivers/md/dm-ioctl.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/drivers/md/dm-ioctl.c 2014-08-30 14:27:38.000000000 +0000
@@ -16,6 +16,7 @@
#include <linux/dm-ioctl.h>
#include <linux/hdreg.h>
return -EACCES;
if (_IOC_TYPE(command) != DM_IOCTL)
-diff -NurpP --minimal linux-3.13.10/drivers/md/dm.c linux-3.13.10-vs2.3.6.11/drivers/md/dm.c
---- linux-3.13.10/drivers/md/dm.c 2014-04-17 01:12:19.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/drivers/md/dm.c 2014-02-25 11:26:09.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/drivers/md/dm.c linux-3.14.17-vs2.3.6.13/drivers/md/dm.c
+--- linux-3.14.17/drivers/md/dm.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/drivers/md/dm.c 2014-08-30 14:27:38.000000000 +0000
@@ -19,6 +19,7 @@
#include <linux/idr.h>
#include <linux/hdreg.h>
#include <trace/events/block.h>
-@@ -139,6 +140,7 @@ struct mapped_device {
+@@ -141,6 +142,7 @@ struct mapped_device {
struct mutex suspend_lock;
atomic_t holders;
atomic_t open_count;
/*
* The current mapping.
-@@ -384,6 +386,7 @@ int dm_deleting_md(struct mapped_device
+@@ -395,6 +397,7 @@ int dm_deleting_md(struct mapped_device
static int dm_blk_open(struct block_device *bdev, fmode_t mode)
{
struct mapped_device *md;
spin_lock(&_minor_lock);
-@@ -392,18 +395,19 @@ static int dm_blk_open(struct block_devi
+@@ -403,18 +406,19 @@ static int dm_blk_open(struct block_devi
goto out;
if (test_bit(DMF_FREEING, &md->flags) ||
}
static void dm_blk_close(struct gendisk *disk, fmode_t mode)
-@@ -687,6 +691,14 @@ int dm_set_geometry(struct mapped_device
+@@ -698,6 +702,14 @@ int dm_set_geometry(struct mapped_device
return 0;
}
/*-----------------------------------------------------------------
* CRUD START:
* A more elegant soln is in the works that uses the queue
-@@ -2026,6 +2038,7 @@ static struct mapped_device *alloc_dev(i
+@@ -1904,6 +1916,7 @@ static struct mapped_device *alloc_dev(i
INIT_LIST_HEAD(&md->uevent_list);
spin_lock_init(&md->uevent_lock);
md->queue = blk_alloc_queue(GFP_KERNEL);
if (!md->queue)
goto bad_queue;
-diff -NurpP --minimal linux-3.13.10/drivers/md/dm.h linux-3.13.10-vs2.3.6.11/drivers/md/dm.h
---- linux-3.13.10/drivers/md/dm.h 2014-04-17 01:12:19.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/drivers/md/dm.h 2014-02-25 11:26:09.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/drivers/md/dm.h linux-3.14.17-vs2.3.6.13/drivers/md/dm.h
+--- linux-3.14.17/drivers/md/dm.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/drivers/md/dm.h 2014-08-30 14:27:38.000000000 +0000
@@ -50,6 +50,8 @@ struct dm_dev_internal {
struct dm_table;
struct dm_md_mempools;
/*-----------------------------------------------------------------
* Internal table functions.
*---------------------------------------------------------------*/
-diff -NurpP --minimal linux-3.13.10/drivers/net/tun.c linux-3.13.10-vs2.3.6.11/drivers/net/tun.c
---- linux-3.13.10/drivers/net/tun.c 2014-04-17 01:12:21.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/drivers/net/tun.c 2014-04-17 01:17:10.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/drivers/net/tun.c linux-3.14.17-vs2.3.6.13/drivers/net/tun.c
+--- linux-3.14.17/drivers/net/tun.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/drivers/net/tun.c 2014-08-30 14:27:38.000000000 +0000
@@ -65,6 +65,7 @@
#include <linux/nsproxy.h>
#include <linux/virtio_net.h>
#include <net/net_namespace.h>
#include <net/netns/generic.h>
#include <net/rtnetlink.h>
-@@ -168,6 +169,7 @@ struct tun_struct {
+@@ -170,6 +171,7 @@ struct tun_struct {
unsigned int flags;
kuid_t owner;
kgid_t group;
struct net_device *dev;
netdev_features_t set_features;
-@@ -385,6 +387,7 @@ static inline bool tun_not_capable(struc
+@@ -403,6 +405,7 @@ static inline bool tun_not_capable(struc
return ((uid_valid(tun->owner) && !uid_eq(cred->euid, tun->owner)) ||
(gid_valid(tun->group) && !in_egroup_p(tun->group))) &&
!ns_capable(net->user_ns, CAP_NET_ADMIN);
}
static void tun_set_real_num_queues(struct tun_struct *tun)
-@@ -1382,6 +1385,7 @@ static void tun_setup(struct net_device
+@@ -1417,6 +1420,7 @@ static void tun_setup(struct net_device
tun->owner = INVALID_UID;
tun->group = INVALID_GID;
dev->ethtool_ops = &tun_ethtool_ops;
dev->destructor = tun_free_netdev;
-@@ -1598,7 +1602,7 @@ static int tun_set_iff(struct net *net,
+@@ -1633,7 +1637,7 @@ static int tun_set_iff(struct net *net,
int queues = ifr->ifr_flags & IFF_MULTI_QUEUE ?
MAX_TAP_QUEUES : 1;
return -EPERM;
err = security_tun_dev_create();
if (err < 0)
-@@ -1969,6 +1973,16 @@ static long __tun_chr_ioctl(struct file
+@@ -2004,6 +2008,16 @@ static long __tun_chr_ioctl(struct file
from_kgid(&init_user_ns, tun->group));
break;
case TUNSETLINK:
/* Only allow setting the type when the interface is down */
if (tun->dev->flags & IFF_UP) {
-diff -NurpP --minimal linux-3.13.10/drivers/tty/sysrq.c linux-3.13.10-vs2.3.6.11/drivers/tty/sysrq.c
---- linux-3.13.10/drivers/tty/sysrq.c 2014-01-22 20:39:02.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/drivers/tty/sysrq.c 2014-01-31 20:55:49.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/drivers/tty/sysrq.c linux-3.14.17-vs2.3.6.13/drivers/tty/sysrq.c
+--- linux-3.14.17/drivers/tty/sysrq.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/drivers/tty/sysrq.c 2014-08-30 14:27:38.000000000 +0000
@@ -46,6 +46,7 @@
#include <linux/jiffies.h>
#include <linux/syscalls.h>
else
retval = -1;
return retval;
-diff -NurpP --minimal linux-3.13.10/drivers/tty/tty_io.c linux-3.13.10-vs2.3.6.11/drivers/tty/tty_io.c
---- linux-3.13.10/drivers/tty/tty_io.c 2014-01-22 20:39:02.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/drivers/tty/tty_io.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/drivers/tty/tty_io.c linux-3.14.17-vs2.3.6.13/drivers/tty/tty_io.c
+--- linux-3.14.17/drivers/tty/tty_io.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/drivers/tty/tty_io.c 2014-08-30 14:27:38.000000000 +0000
@@ -104,6 +104,7 @@
#include <linux/kmod.h>
#undef TTY_DEBUG_HANGUP
-@@ -2218,7 +2219,8 @@ static int tiocsti(struct tty_struct *tt
+@@ -2219,7 +2220,8 @@ static int tiocsti(struct tty_struct *tt
char ch, mbz = 0;
struct tty_ldisc *ld;
return -EPERM;
if (get_user(ch, p))
return -EFAULT;
-@@ -2506,6 +2508,7 @@ static int tiocspgrp(struct tty_struct *
+@@ -2507,6 +2509,7 @@ static int tiocspgrp(struct tty_struct *
return -ENOTTY;
if (get_user(pgrp_nr, p))
return -EFAULT;
if (pgrp_nr < 0)
return -EINVAL;
rcu_read_lock();
-diff -NurpP --minimal linux-3.13.10/fs/attr.c linux-3.13.10-vs2.3.6.11/fs/attr.c
---- linux-3.13.10/fs/attr.c 2014-04-17 01:12:31.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/attr.c 2014-03-12 15:51:07.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/attr.c linux-3.14.17-vs2.3.6.13/fs/attr.c
+--- linux-3.14.17/fs/attr.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/attr.c 2014-08-30 14:27:38.000000000 +0000
@@ -15,6 +15,9 @@
#include <linux/security.h>
#include <linux/evm.h>
if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
return -EPERM;
}
-diff -NurpP --minimal linux-3.13.10/fs/block_dev.c linux-3.13.10-vs2.3.6.11/fs/block_dev.c
---- linux-3.13.10/fs/block_dev.c 2013-11-25 15:46:58.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/block_dev.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/block_dev.c linux-3.14.17-vs2.3.6.13/fs/block_dev.c
+--- linux-3.14.17/fs/block_dev.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/block_dev.c 2014-08-30 14:27:38.000000000 +0000
@@ -28,6 +28,7 @@
#include <linux/log2.h>
#include <linux/cleancache.h>
if (bdev) {
spin_lock(&bdev_lock);
if (!inode->i_bdev) {
-diff -NurpP --minimal linux-3.13.10/fs/btrfs/ctree.h linux-3.13.10-vs2.3.6.11/fs/btrfs/ctree.h
---- linux-3.13.10/fs/btrfs/ctree.h 2014-01-22 20:39:05.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/btrfs/ctree.h 2014-01-31 23:58:35.000000000 +0000
-@@ -718,11 +718,14 @@ struct btrfs_inode_item {
+diff -NurpP --minimal linux-3.14.17/fs/btrfs/ctree.h linux-3.14.17-vs2.3.6.13/fs/btrfs/ctree.h
+--- linux-3.14.17/fs/btrfs/ctree.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/btrfs/ctree.h 2014-08-30 14:27:38.000000000 +0000
+@@ -729,11 +729,14 @@ struct btrfs_inode_item {
/* modification sequence number for NFS */
__le64 sequence;
struct btrfs_timespec atime;
struct btrfs_timespec ctime;
struct btrfs_timespec mtime;
-@@ -2000,6 +2003,8 @@ struct btrfs_ioctl_defrag_range_args {
+@@ -2034,6 +2037,8 @@ struct btrfs_ioctl_defrag_range_args {
#define BTRFS_DEFAULT_COMMIT_INTERVAL (30)
#define btrfs_clear_opt(o, opt) ((o) &= ~BTRFS_MOUNT_##opt)
#define btrfs_set_opt(o, opt) ((o) |= BTRFS_MOUNT_##opt)
#define btrfs_raw_test_opt(o, opt) ((o) & BTRFS_MOUNT_##opt)
-@@ -2269,6 +2274,7 @@ BTRFS_SETGET_FUNCS(inode_block_group, st
+@@ -2303,6 +2308,7 @@ BTRFS_SETGET_FUNCS(inode_block_group, st
BTRFS_SETGET_FUNCS(inode_nlink, struct btrfs_inode_item, nlink, 32);
BTRFS_SETGET_FUNCS(inode_uid, struct btrfs_inode_item, uid, 32);
BTRFS_SETGET_FUNCS(inode_gid, struct btrfs_inode_item, gid, 32);
BTRFS_SETGET_FUNCS(inode_mode, struct btrfs_inode_item, mode, 32);
BTRFS_SETGET_FUNCS(inode_rdev, struct btrfs_inode_item, rdev, 64);
BTRFS_SETGET_FUNCS(inode_flags, struct btrfs_inode_item, flags, 64);
-@@ -2341,6 +2347,10 @@ BTRFS_SETGET_FUNCS(extent_flags, struct
+@@ -2375,6 +2381,10 @@ BTRFS_SETGET_FUNCS(extent_flags, struct
BTRFS_SETGET_FUNCS(extent_refs_v0, struct btrfs_extent_item_v0, refs, 32);
BTRFS_SETGET_FUNCS(tree_block_level, struct btrfs_tree_block_info, level, 8);
-@@ -3722,6 +3732,7 @@ long btrfs_ioctl(struct file *file, unsi
+@@ -3781,6 +3791,7 @@ long btrfs_ioctl(struct file *file, unsi
void btrfs_update_iflags(struct inode *inode);
void btrfs_inherit_iflags(struct inode *inode, struct inode *dir);
int btrfs_is_empty_uuid(u8 *uuid);
int btrfs_defrag_file(struct inode *inode, struct file *file,
struct btrfs_ioctl_defrag_range_args *range,
u64 newer_than, unsigned long max_pages);
-diff -NurpP --minimal linux-3.13.10/fs/btrfs/disk-io.c linux-3.13.10-vs2.3.6.11/fs/btrfs/disk-io.c
---- linux-3.13.10/fs/btrfs/disk-io.c 2014-01-22 20:39:05.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/btrfs/disk-io.c 2014-01-31 20:38:03.000000000 +0000
-@@ -2388,6 +2388,9 @@ int open_ctree(struct super_block *sb,
+diff -NurpP --minimal linux-3.14.17/fs/btrfs/disk-io.c linux-3.14.17-vs2.3.6.13/fs/btrfs/disk-io.c
+--- linux-3.14.17/fs/btrfs/disk-io.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/btrfs/disk-io.c 2014-08-30 14:27:38.000000000 +0000
+@@ -2378,6 +2378,9 @@ int open_ctree(struct super_block *sb,
goto fail_alloc;
}
features = btrfs_super_incompat_flags(disk_super) &
~BTRFS_FEATURE_INCOMPAT_SUPP;
if (features) {
-diff -NurpP --minimal linux-3.13.10/fs/btrfs/inode.c linux-3.13.10-vs2.3.6.11/fs/btrfs/inode.c
---- linux-3.13.10/fs/btrfs/inode.c 2014-04-17 01:12:31.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/btrfs/inode.c 2014-03-12 15:51:07.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/btrfs/inode.c linux-3.14.17-vs2.3.6.13/fs/btrfs/inode.c
+--- linux-3.14.17/fs/btrfs/inode.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/btrfs/inode.c 2014-08-30 14:54:20.000000000 +0000
@@ -43,6 +43,7 @@
#include <linux/btrfs.h>
#include <linux/blkdev.h>
#include "ctree.h"
#include "disk-io.h"
#include "transaction.h"
-@@ -3317,6 +3318,9 @@ static void btrfs_read_locked_inode(stru
- struct btrfs_key location;
+@@ -3343,6 +3344,9 @@ static void btrfs_read_locked_inode(stru
+ unsigned long ptr;
int maybe_acls;
u32 rdev;
+ kuid_t kuid;
+ ktag_t ktag;
int ret;
bool filled = false;
-
-@@ -3344,8 +3348,14 @@ static void btrfs_read_locked_inode(stru
+ int first_xattr_slot;
+@@ -3370,8 +3374,14 @@ static void btrfs_read_locked_inode(stru
struct btrfs_inode_item);
inode->i_mode = btrfs_inode_mode(leaf, inode_item);
set_nlink(inode, btrfs_inode_nlink(leaf, inode_item));
btrfs_i_size_write(inode, btrfs_inode_size(leaf, inode_item));
tspec = btrfs_inode_atime(inode_item);
-@@ -3436,11 +3446,18 @@ static void fill_inode_item(struct btrfs
+@@ -3495,11 +3505,18 @@ static void fill_inode_item(struct btrfs
struct inode *inode)
{
struct btrfs_map_token token;
btrfs_set_token_inode_size(leaf, item, BTRFS_I(inode)->disk_i_size,
&token);
btrfs_set_token_inode_mode(leaf, item, inode->i_mode, &token);
-@@ -8652,14 +8669,17 @@ static const struct inode_operations btr
+@@ -8849,13 +8866,16 @@ static const struct inode_operations btr
.listxattr = btrfs_listxattr,
.removexattr = btrfs_removexattr,
.permission = btrfs_permission,
.get_acl = btrfs_get_acl,
.set_acl = btrfs_set_acl,
.update_time = btrfs_update_time,
- };
-@@ -8727,6 +8747,7 @@ static const struct inode_operations btr
+@@ -8926,6 +8946,7 @@ static const struct inode_operations btr
.removexattr = btrfs_removexattr,
.permission = btrfs_permission,
.fiemap = btrfs_fiemap,
+ .sync_flags = btrfs_sync_flags,
.get_acl = btrfs_get_acl,
+ .set_acl = btrfs_set_acl,
.update_time = btrfs_update_time,
- };
-diff -NurpP --minimal linux-3.13.10/fs/btrfs/ioctl.c linux-3.13.10-vs2.3.6.11/fs/btrfs/ioctl.c
---- linux-3.13.10/fs/btrfs/ioctl.c 2014-04-17 01:12:31.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/btrfs/ioctl.c 2014-02-25 11:26:09.000000000 +0000
-@@ -78,10 +78,13 @@ static unsigned int btrfs_flags_to_ioctl
+diff -NurpP --minimal linux-3.14.17/fs/btrfs/ioctl.c linux-3.14.17-vs2.3.6.13/fs/btrfs/ioctl.c
+--- linux-3.14.17/fs/btrfs/ioctl.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/btrfs/ioctl.c 2014-08-30 14:27:38.000000000 +0000
+@@ -80,10 +80,13 @@ static unsigned int btrfs_flags_to_ioctl
{
unsigned int iflags = 0;
if (flags & BTRFS_INODE_APPEND)
iflags |= FS_APPEND_FL;
if (flags & BTRFS_INODE_NODUMP)
-@@ -98,28 +101,78 @@ static unsigned int btrfs_flags_to_ioctl
+@@ -100,28 +103,78 @@ static unsigned int btrfs_flags_to_ioctl
else if (flags & BTRFS_INODE_NOCOMPRESS)
iflags |= FS_NOCOMP_FL;
}
/*
-@@ -135,6 +188,7 @@ void btrfs_inherit_iflags(struct inode *
+@@ -137,6 +190,7 @@ void btrfs_inherit_iflags(struct inode *
return;
flags = BTRFS_I(dir)->flags;
if (flags & BTRFS_INODE_NOCOMPRESS) {
BTRFS_I(inode)->flags &= ~BTRFS_INODE_COMPRESS;
-@@ -153,6 +207,30 @@ void btrfs_inherit_iflags(struct inode *
+@@ -155,6 +209,30 @@ void btrfs_inherit_iflags(struct inode *
btrfs_update_iflags(inode);
}
static int btrfs_ioctl_getflags(struct file *file, void __user *arg)
{
struct btrfs_inode *ip = BTRFS_I(file_inode(file));
-@@ -215,21 +293,27 @@ static int btrfs_ioctl_setflags(struct f
+@@ -217,21 +295,27 @@ static int btrfs_ioctl_setflags(struct f
flags = btrfs_mask_flags(inode->i_mode, flags);
oldflags = btrfs_flags_to_ioctl(ip->flags);
if (flags & FS_APPEND_FL)
ip->flags |= BTRFS_INODE_APPEND;
else
-diff -NurpP --minimal linux-3.13.10/fs/btrfs/super.c linux-3.13.10-vs2.3.6.11/fs/btrfs/super.c
---- linux-3.13.10/fs/btrfs/super.c 2014-01-22 20:39:05.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/btrfs/super.c 2014-01-31 23:58:08.000000000 +0000
-@@ -323,7 +323,7 @@ enum {
+diff -NurpP --minimal linux-3.14.17/fs/btrfs/super.c linux-3.14.17-vs2.3.6.13/fs/btrfs/super.c
+--- linux-3.14.17/fs/btrfs/super.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/btrfs/super.c 2014-08-30 14:54:42.000000000 +0000
+@@ -328,7 +328,7 @@ enum {
Opt_commit_interval, Opt_barrier, Opt_nodefrag, Opt_nodiscard,
Opt_noenospc_debug, Opt_noflushoncommit, Opt_acl, Opt_datacow,
Opt_datasum, Opt_treelog, Opt_noinode_cache,
};
static match_table_t tokens = {
-@@ -365,6 +365,9 @@ static match_table_t tokens = {
+@@ -380,6 +380,9 @@ static match_table_t tokens = {
{Opt_rescan_uuid_tree, "rescan_uuid_tree"},
{Opt_fatal_errors, "fatal_errors=%s"},
{Opt_commit_interval, "commit=%d"},
{Opt_err, NULL},
};
-@@ -674,6 +677,22 @@ int btrfs_parse_options(struct btrfs_roo
+@@ -747,6 +750,22 @@ int btrfs_parse_options(struct btrfs_roo
info->commit_interval = BTRFS_DEFAULT_COMMIT_INTERVAL;
}
break;
+ break;
+#endif
case Opt_err:
- printk(KERN_INFO "btrfs: unrecognized mount option "
- "'%s'\n", p);
-@@ -1320,6 +1339,12 @@ static int btrfs_remount(struct super_bl
+ btrfs_info(root->fs_info, "unrecognized mount option '%s'", p);
+ ret = -EINVAL;
+@@ -1400,6 +1419,12 @@ static int btrfs_remount(struct super_bl
btrfs_resize_thread_pool(fs_info,
fs_info->thread_pool_size, old_thread_pool_size);
if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
goto out;
-diff -NurpP --minimal linux-3.13.10/fs/char_dev.c linux-3.13.10-vs2.3.6.11/fs/char_dev.c
---- linux-3.13.10/fs/char_dev.c 2014-01-22 20:39:05.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/char_dev.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/char_dev.c linux-3.14.17-vs2.3.6.13/fs/char_dev.c
+--- linux-3.14.17/fs/char_dev.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/char_dev.c 2014-08-30 14:27:38.000000000 +0000
@@ -21,6 +21,8 @@
#include <linux/mutex.h>
#include <linux/backing-dev.h>
if (!kobj)
return -ENXIO;
new = container_of(kobj, struct cdev, kobj);
-diff -NurpP --minimal linux-3.13.10/fs/dcache.c linux-3.13.10-vs2.3.6.11/fs/dcache.c
---- linux-3.13.10/fs/dcache.c 2014-04-17 01:12:32.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/dcache.c 2014-04-17 01:17:10.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/dcache.c linux-3.14.17-vs2.3.6.13/fs/dcache.c
+--- linux-3.14.17/fs/dcache.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/dcache.c 2014-08-30 14:27:38.000000000 +0000
@@ -38,6 +38,7 @@
#include <linux/prefetch.h>
#include <linux/ratelimit.h>
spin_lock_init(&dentry->d_lock);
seqcount_init(&dentry->d_seq);
dentry->d_inode = NULL;
-@@ -2278,6 +2286,7 @@ struct dentry *__d_lookup(const struct d
+@@ -2277,6 +2285,7 @@ struct dentry *__d_lookup(const struct d
}
dentry->d_lockref.count++;
found = dentry;
spin_unlock(&dentry->d_lock);
break;
-diff -NurpP --minimal linux-3.13.10/fs/devpts/inode.c linux-3.13.10-vs2.3.6.11/fs/devpts/inode.c
---- linux-3.13.10/fs/devpts/inode.c 2014-01-22 20:39:06.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/devpts/inode.c 2014-02-01 01:40:53.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/devpts/inode.c linux-3.14.17-vs2.3.6.13/fs/devpts/inode.c
+--- linux-3.14.17/fs/devpts/inode.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/devpts/inode.c 2014-08-30 14:27:38.000000000 +0000
@@ -25,6 +25,7 @@
#include <linux/parser.h>
#include <linux/fsnotify.h>
inode->i_private = priv;
sprintf(s, "%d", index);
-diff -NurpP --minimal linux-3.13.10/fs/ext2/balloc.c linux-3.13.10-vs2.3.6.11/fs/ext2/balloc.c
---- linux-3.13.10/fs/ext2/balloc.c 2013-05-31 13:45:23.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/ext2/balloc.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/ext2/balloc.c linux-3.14.17-vs2.3.6.13/fs/ext2/balloc.c
+--- linux-3.14.17/fs/ext2/balloc.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/ext2/balloc.c 2014-08-30 14:27:38.000000000 +0000
@@ -693,7 +693,6 @@ ext2_try_to_allocate(struct super_block
start = 0;
end = EXT2_BLOCKS_PER_GROUP(sb);
BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb));
repeat:
-diff -NurpP --minimal linux-3.13.10/fs/ext2/ext2.h linux-3.13.10-vs2.3.6.11/fs/ext2/ext2.h
---- linux-3.13.10/fs/ext2/ext2.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/ext2/ext2.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/ext2/ext2.h linux-3.14.17-vs2.3.6.13/fs/ext2/ext2.h
+--- linux-3.14.17/fs/ext2/ext2.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/ext2/ext2.h 2014-08-30 14:27:38.000000000 +0000
@@ -244,8 +244,12 @@ struct ext2_group_desc
#define EXT2_NOTAIL_FL FS_NOTAIL_FL /* file tail should not be merged */
#define EXT2_DIRSYNC_FL FS_DIRSYNC_FL /* dirsync behaviour (directories only) */
/* ioctl.c */
extern long ext2_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-3.13.10/fs/ext2/file.c linux-3.13.10-vs2.3.6.11/fs/ext2/file.c
---- linux-3.13.10/fs/ext2/file.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/ext2/file.c 2014-01-31 20:38:03.000000000 +0000
-@@ -104,4 +104,5 @@ const struct inode_operations ext2_file_
- .setattr = ext2_setattr,
+diff -NurpP --minimal linux-3.14.17/fs/ext2/file.c linux-3.14.17-vs2.3.6.13/fs/ext2/file.c
+--- linux-3.14.17/fs/ext2/file.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/ext2/file.c 2014-08-30 14:27:38.000000000 +0000
+@@ -105,4 +105,5 @@ const struct inode_operations ext2_file_
.get_acl = ext2_get_acl,
+ .set_acl = ext2_set_acl,
.fiemap = ext2_fiemap,
+ .sync_flags = ext2_sync_flags,
};
-diff -NurpP --minimal linux-3.13.10/fs/ext2/ialloc.c linux-3.13.10-vs2.3.6.11/fs/ext2/ialloc.c
---- linux-3.13.10/fs/ext2/ialloc.c 2013-05-31 13:45:23.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/ext2/ialloc.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/ext2/ialloc.c linux-3.14.17-vs2.3.6.13/fs/ext2/ialloc.c
+--- linux-3.14.17/fs/ext2/ialloc.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/ext2/ialloc.c 2014-08-30 14:27:38.000000000 +0000
@@ -17,6 +17,7 @@
#include <linux/backing-dev.h>
#include <linux/buffer_head.h>
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-3.13.10/fs/ext2/inode.c linux-3.13.10-vs2.3.6.11/fs/ext2/inode.c
---- linux-3.13.10/fs/ext2/inode.c 2014-01-22 20:39:06.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/ext2/inode.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/ext2/inode.c linux-3.14.17-vs2.3.6.13/fs/ext2/inode.c
+--- linux-3.14.17/fs/ext2/inode.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/ext2/inode.c 2014-08-30 14:27:38.000000000 +0000
@@ -32,6 +32,7 @@
#include <linux/fiemap.h>
#include <linux/namei.h>
error = dquot_transfer(inode, iattr);
if (error)
return error;
-diff -NurpP --minimal linux-3.13.10/fs/ext2/ioctl.c linux-3.13.10-vs2.3.6.11/fs/ext2/ioctl.c
---- linux-3.13.10/fs/ext2/ioctl.c 2013-05-31 13:45:23.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/ext2/ioctl.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/ext2/ioctl.c linux-3.14.17-vs2.3.6.13/fs/ext2/ioctl.c
+--- linux-3.14.17/fs/ext2/ioctl.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/ext2/ioctl.c 2014-08-30 14:27:38.000000000 +0000
@@ -17,6 +17,16 @@
#include <asm/uaccess.h>
flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE;
ei->i_flags = flags;
-diff -NurpP --minimal linux-3.13.10/fs/ext2/namei.c linux-3.13.10-vs2.3.6.11/fs/ext2/namei.c
---- linux-3.13.10/fs/ext2/namei.c 2013-11-25 15:45:01.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/ext2/namei.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/ext2/namei.c linux-3.14.17-vs2.3.6.13/fs/ext2/namei.c
+--- linux-3.14.17/fs/ext2/namei.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/ext2/namei.c 2014-08-30 14:27:38.000000000 +0000
@@ -32,6 +32,7 @@
#include <linux/pagemap.h>
}
return d_splice_alias(inode, dentry);
}
-@@ -432,5 +434,6 @@ const struct inode_operations ext2_speci
+@@ -433,6 +435,7 @@ const struct inode_operations ext2_speci
.removexattr = generic_removexattr,
#endif
.setattr = ext2_setattr,
+ .sync_flags = ext2_sync_flags,
.get_acl = ext2_get_acl,
+ .set_acl = ext2_set_acl,
};
-diff -NurpP --minimal linux-3.13.10/fs/ext2/super.c linux-3.13.10-vs2.3.6.11/fs/ext2/super.c
---- linux-3.13.10/fs/ext2/super.c 2014-01-22 20:39:06.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/ext2/super.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/ext2/super.c linux-3.14.17-vs2.3.6.13/fs/ext2/super.c
+--- linux-3.14.17/fs/ext2/super.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/ext2/super.c 2014-08-30 14:27:38.000000000 +0000
@@ -395,7 +395,8 @@ enum {
Opt_err_ro, Opt_nouid32, Opt_nocheck, Opt_debug,
Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr,
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-3.13.10/fs/ext3/ext3.h linux-3.13.10-vs2.3.6.11/fs/ext3/ext3.h
---- linux-3.13.10/fs/ext3/ext3.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/ext3/ext3.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/ext3/ext3.h linux-3.14.17-vs2.3.6.13/fs/ext3/ext3.h
+--- linux-3.14.17/fs/ext3/ext3.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/ext3/ext3.h 2014-08-30 14:27:38.000000000 +0000
@@ -151,10 +151,14 @@ struct ext3_group_desc
#define EXT3_NOTAIL_FL 0x00008000 /* file tail should not be merged */
#define EXT3_DIRSYNC_FL 0x00010000 /* dirsync behaviour (directories only) */
/* ioctl.c */
extern long ext3_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-3.13.10/fs/ext3/file.c linux-3.13.10-vs2.3.6.11/fs/ext3/file.c
---- linux-3.13.10/fs/ext3/file.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/ext3/file.c 2014-01-31 20:38:03.000000000 +0000
-@@ -76,5 +76,6 @@ const struct inode_operations ext3_file_
- #endif
+diff -NurpP --minimal linux-3.14.17/fs/ext3/file.c linux-3.14.17-vs2.3.6.13/fs/ext3/file.c
+--- linux-3.14.17/fs/ext3/file.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/ext3/file.c 2014-08-30 14:27:38.000000000 +0000
+@@ -77,5 +77,6 @@ const struct inode_operations ext3_file_
.get_acl = ext3_get_acl,
+ .set_acl = ext3_set_acl,
.fiemap = ext3_fiemap,
+ .sync_flags = ext3_sync_flags,
};
-diff -NurpP --minimal linux-3.13.10/fs/ext3/ialloc.c linux-3.13.10-vs2.3.6.11/fs/ext3/ialloc.c
---- linux-3.13.10/fs/ext3/ialloc.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/ext3/ialloc.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/ext3/ialloc.c linux-3.14.17-vs2.3.6.13/fs/ext3/ialloc.c
+--- linux-3.14.17/fs/ext3/ialloc.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/ext3/ialloc.c 2014-08-30 14:27:38.000000000 +0000
@@ -14,6 +14,7 @@
#include <linux/quotaops.h>
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-3.13.10/fs/ext3/inode.c linux-3.13.10-vs2.3.6.11/fs/ext3/inode.c
---- linux-3.13.10/fs/ext3/inode.c 2013-11-25 15:45:01.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/ext3/inode.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/ext3/inode.c linux-3.14.17-vs2.3.6.13/fs/ext3/inode.c
+--- linux-3.14.17/fs/ext3/inode.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/ext3/inode.c 2014-08-30 14:27:38.000000000 +0000
@@ -28,6 +28,8 @@
#include <linux/mpage.h>
#include <linux/namei.h>
error = ext3_mark_inode_dirty(handle, inode);
ext3_journal_stop(handle);
}
-diff -NurpP --minimal linux-3.13.10/fs/ext3/ioctl.c linux-3.13.10-vs2.3.6.11/fs/ext3/ioctl.c
---- linux-3.13.10/fs/ext3/ioctl.c 2013-05-31 13:45:23.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/ext3/ioctl.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/ext3/ioctl.c linux-3.14.17-vs2.3.6.13/fs/ext3/ioctl.c
+--- linux-3.14.17/fs/ext3/ioctl.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/ext3/ioctl.c 2014-08-30 14:27:38.000000000 +0000
@@ -12,6 +12,34 @@
#include <asm/uaccess.h>
#include "ext3.h"
flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE;
ei->i_flags = flags;
-diff -NurpP --minimal linux-3.13.10/fs/ext3/namei.c linux-3.13.10-vs2.3.6.11/fs/ext3/namei.c
---- linux-3.13.10/fs/ext3/namei.c 2013-11-25 15:46:59.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/ext3/namei.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/ext3/namei.c linux-3.14.17-vs2.3.6.13/fs/ext3/namei.c
+--- linux-3.14.17/fs/ext3/namei.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/ext3/namei.c 2014-08-30 14:27:38.000000000 +0000
@@ -25,6 +25,8 @@
*/
#endif
+ .sync_flags = ext3_sync_flags,
.get_acl = ext3_get_acl,
+ .set_acl = ext3_set_acl,
};
-
-diff -NurpP --minimal linux-3.13.10/fs/ext3/super.c linux-3.13.10-vs2.3.6.11/fs/ext3/super.c
---- linux-3.13.10/fs/ext3/super.c 2014-01-22 20:39:06.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/ext3/super.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/ext3/super.c linux-3.14.17-vs2.3.6.13/fs/ext3/super.c
+--- linux-3.14.17/fs/ext3/super.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/ext3/super.c 2014-08-30 14:27:38.000000000 +0000
@@ -826,7 +826,8 @@ enum {
Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota,
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-3.13.10/fs/ext4/ext4.h linux-3.13.10-vs2.3.6.11/fs/ext4/ext4.h
---- linux-3.13.10/fs/ext4/ext4.h 2014-04-17 01:12:32.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/ext4/ext4.h 2014-03-12 15:51:07.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/ext4/ext4.h linux-3.14.17-vs2.3.6.13/fs/ext4/ext4.h
+--- linux-3.14.17/fs/ext4/ext4.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/ext4/ext4.h 2014-08-30 14:27:38.000000000 +0000
@@ -385,7 +385,10 @@ struct flex_groups {
#define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */
#define EXT4_EA_INODE_FL 0x00200000 /* Inode used for large EA */
#define EXT4_MOUNT_QUOTA 0x80000 /* Some quota option set */
#define EXT4_MOUNT_USRQUOTA 0x100000 /* "old" user quota */
#define EXT4_MOUNT_GRPQUOTA 0x200000 /* "old" group quota */
-@@ -2653,6 +2658,7 @@ extern struct buffer_head *ext4_get_firs
+@@ -2636,6 +2641,7 @@ extern struct buffer_head *ext4_get_firs
extern int ext4_inline_data_fiemap(struct inode *inode,
struct fiemap_extent_info *fieinfo,
int *has_inline);
extern int ext4_try_to_evict_inline_data(handle_t *handle,
struct inode *inode,
int needed);
-diff -NurpP --minimal linux-3.13.10/fs/ext4/file.c linux-3.13.10-vs2.3.6.11/fs/ext4/file.c
---- linux-3.13.10/fs/ext4/file.c 2013-11-25 15:46:59.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/ext4/file.c 2014-01-31 20:38:03.000000000 +0000
-@@ -618,5 +618,6 @@ const struct inode_operations ext4_file_
- .removexattr = generic_removexattr,
+diff -NurpP --minimal linux-3.14.17/fs/ext4/file.c linux-3.14.17-vs2.3.6.13/fs/ext4/file.c
+--- linux-3.14.17/fs/ext4/file.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/ext4/file.c 2014-08-30 14:27:38.000000000 +0000
+@@ -619,5 +619,6 @@ const struct inode_operations ext4_file_
.get_acl = ext4_get_acl,
+ .set_acl = ext4_set_acl,
.fiemap = ext4_fiemap,
+ .sync_flags = ext4_sync_flags,
};
-diff -NurpP --minimal linux-3.13.10/fs/ext4/ialloc.c linux-3.13.10-vs2.3.6.11/fs/ext4/ialloc.c
---- linux-3.13.10/fs/ext4/ialloc.c 2014-01-22 20:39:06.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/ext4/ialloc.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/ext4/ialloc.c linux-3.14.17-vs2.3.6.13/fs/ext4/ialloc.c
+--- linux-3.14.17/fs/ext4/ialloc.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/ext4/ialloc.c 2014-08-30 14:27:38.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/random.h>
#include <linux/bitops.h>
} else
inode_init_owner(inode, dir, mode);
dquot_initialize(inode);
-diff -NurpP --minimal linux-3.13.10/fs/ext4/inode.c linux-3.13.10-vs2.3.6.11/fs/ext4/inode.c
---- linux-3.13.10/fs/ext4/inode.c 2014-04-17 01:12:32.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/ext4/inode.c 2014-04-17 01:28:13.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/ext4/inode.c linux-3.14.17-vs2.3.6.13/fs/ext4/inode.c
+--- linux-3.14.17/fs/ext4/inode.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/ext4/inode.c 2014-08-30 14:27:38.000000000 +0000
@@ -39,6 +39,7 @@
#include <linux/ratelimit.h>
#include <linux/aio.h>
#include "ext4_jbd2.h"
#include "xattr.h"
-@@ -3929,42 +3930,67 @@ void ext4_set_inode_flags(struct inode *
+@@ -3940,42 +3941,67 @@ void ext4_set_inode_flags(struct inode *
unsigned int flags = EXT4_I(inode)->i_flags;
unsigned int new_fl = 0;
} while (cmpxchg(&ei->i_flags, old_fl, new_fl) != old_fl);
}
-@@ -4069,8 +4095,10 @@ struct inode *ext4_iget(struct super_blo
+@@ -4080,8 +4106,10 @@ struct inode *ext4_iget(struct super_blo
i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
}
set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
ext4_clear_state_flags(ei); /* Only relevant on 32-bit archs */
-@@ -4298,8 +4326,10 @@ static int ext4_do_update_inode(handle_t
+@@ -4309,8 +4337,10 @@ static int ext4_do_update_inode(handle_t
ext4_get_inode_flags(ei);
raw_inode->i_mode = cpu_to_le16(inode->i_mode);
if (!(test_opt(inode->i_sb, NO_UID32))) {
raw_inode->i_uid_low = cpu_to_le16(low_16_bits(i_uid));
raw_inode->i_gid_low = cpu_to_le16(low_16_bits(i_gid));
-@@ -4322,6 +4352,9 @@ static int ext4_do_update_inode(handle_t
+@@ -4333,6 +4363,9 @@ static int ext4_do_update_inode(handle_t
raw_inode->i_uid_high = 0;
raw_inode->i_gid_high = 0;
}
raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
EXT4_INODE_SET_XTIME(i_ctime, inode, raw_inode);
-@@ -4553,7 +4586,8 @@ int ext4_setattr(struct dentry *dentry,
+@@ -4564,7 +4597,8 @@ int ext4_setattr(struct dentry *dentry,
if (is_quota_modification(inode, attr))
dquot_initialize(inode);
if ((ia_valid & ATTR_UID && !uid_eq(attr->ia_uid, inode->i_uid)) ||
handle_t *handle;
/* (user+group)*(old+new) structure, inode write (sb,
-@@ -4576,6 +4610,8 @@ int ext4_setattr(struct dentry *dentry,
+@@ -4587,6 +4621,8 @@ int ext4_setattr(struct dentry *dentry,
inode->i_uid = attr->ia_uid;
if (attr->ia_valid & ATTR_GID)
inode->i_gid = attr->ia_gid;
error = ext4_mark_inode_dirty(handle, inode);
ext4_journal_stop(handle);
}
-diff -NurpP --minimal linux-3.13.10/fs/ext4/ioctl.c linux-3.13.10-vs2.3.6.11/fs/ext4/ioctl.c
---- linux-3.13.10/fs/ext4/ioctl.c 2014-04-17 01:12:32.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/ext4/ioctl.c 2014-03-12 15:51:07.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/ext4/ioctl.c linux-3.14.17-vs2.3.6.13/fs/ext4/ioctl.c
+--- linux-3.14.17/fs/ext4/ioctl.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/ext4/ioctl.c 2014-08-30 14:27:38.000000000 +0000
@@ -14,6 +14,7 @@
#include <linux/compat.h>
#include <linux/mount.h>
#include <asm/uaccess.h>
#include "ext4_jbd2.h"
#include "ext4.h"
-@@ -214,6 +215,33 @@ swap_boot_out:
+@@ -210,6 +211,33 @@ swap_boot_out:
return err;
}
long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
struct inode *inode = file_inode(filp);
-@@ -247,6 +275,11 @@ long ext4_ioctl(struct file *filp, unsig
+@@ -243,6 +271,11 @@ long ext4_ioctl(struct file *filp, unsig
flags = ext4_mask_flags(inode->i_mode, flags);
err = -EPERM;
mutex_lock(&inode->i_mutex);
/* Is it quota file? Do not allow user to mess with it */
-@@ -264,7 +297,9 @@ long ext4_ioctl(struct file *filp, unsig
+@@ -260,7 +293,9 @@ long ext4_ioctl(struct file *filp, unsig
*
* This test looks nicer. Thanks to Pauline Middelink
*/
if (!capable(CAP_LINUX_IMMUTABLE))
goto flags_out;
}
-diff -NurpP --minimal linux-3.13.10/fs/ext4/namei.c linux-3.13.10-vs2.3.6.11/fs/ext4/namei.c
---- linux-3.13.10/fs/ext4/namei.c 2013-11-25 15:46:59.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/ext4/namei.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/ext4/namei.c linux-3.14.17-vs2.3.6.13/fs/ext4/namei.c
+--- linux-3.14.17/fs/ext4/namei.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/ext4/namei.c 2014-08-30 14:27:38.000000000 +0000
@@ -34,6 +34,7 @@
#include <linux/quotaops.h>
#include <linux/buffer_head.h>
if ((bh = bh_use[ra_ptr++]) == NULL)
goto next;
@@ -3226,6 +3228,7 @@ const struct inode_operations ext4_dir_i
- .removexattr = generic_removexattr,
.get_acl = ext4_get_acl,
+ .set_acl = ext4_set_acl,
.fiemap = ext4_fiemap,
+ .sync_flags = ext4_sync_flags,
};
const struct inode_operations ext4_special_inode_operations = {
-diff -NurpP --minimal linux-3.13.10/fs/ext4/super.c linux-3.13.10-vs2.3.6.11/fs/ext4/super.c
---- linux-3.13.10/fs/ext4/super.c 2014-04-17 01:12:32.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/ext4/super.c 2014-03-12 15:51:07.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/ext4/super.c linux-3.14.17-vs2.3.6.13/fs/ext4/super.c
+--- linux-3.14.17/fs/ext4/super.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/ext4/super.c 2014-08-30 14:27:38.000000000 +0000
@@ -1162,7 +1162,7 @@ enum {
Opt_inode_readahead_blks, Opt_journal_ioprio,
Opt_dioread_nolock, Opt_dioread_lock,
}
for (m = ext4_mount_opts; m->token != Opt_err; m++)
-@@ -3564,6 +3581,9 @@ static int ext4_fill_super(struct super_
+@@ -3563,6 +3580,9 @@ static int ext4_fill_super(struct super_
clear_opt(sb, DELALLOC);
}
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-@@ -4818,6 +4838,14 @@ static int ext4_remount(struct super_blo
+@@ -4817,6 +4837,14 @@ static int ext4_remount(struct super_blo
if (sbi->s_mount_flags & EXT4_MF_FS_ABORTED)
ext4_abort(sb, "Abort forced by user");
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-3.13.10/fs/fcntl.c linux-3.13.10-vs2.3.6.11/fs/fcntl.c
---- linux-3.13.10/fs/fcntl.c 2014-01-22 20:39:06.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/fcntl.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/fcntl.c linux-3.14.17-vs2.3.6.13/fs/fcntl.c
+--- linux-3.14.17/fs/fcntl.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/fcntl.c 2014-08-30 14:27:38.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/rcupdate.h>
#include <linux/pid_namespace.h>
if (unlikely(f.file->f_mode & FMODE_PATH)) {
if (!check_fcntl_cmd(cmd))
-diff -NurpP --minimal linux-3.13.10/fs/file.c linux-3.13.10-vs2.3.6.11/fs/file.c
---- linux-3.13.10/fs/file.c 2014-04-17 01:12:32.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/file.c 2014-02-25 11:26:09.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/file.c linux-3.14.17-vs2.3.6.13/fs/file.c
+--- linux-3.14.17/fs/file.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/file.c 2014-08-30 14:27:38.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/spinlock.h>
#include <linux/rcupdate.h>
} else {
/*
* The fd may be claimed in the fd bitmap but not yet
-@@ -376,9 +379,11 @@ static void close_files(struct files_str
+@@ -371,9 +374,11 @@ static struct fdtable *close_files(struc
filp_close(file, files);
cond_resched();
}
+ cond_resched();
}
}
- }
-@@ -503,6 +508,7 @@ repeat:
+
+@@ -495,6 +500,7 @@ repeat:
else
__clear_close_on_exec(fd, fdt);
error = fd;
#if 1
/* Sanity check */
if (rcu_dereference_raw(fdt->fd[fd]) != NULL) {
-@@ -533,6 +539,7 @@ static void __put_unused_fd(struct files
+@@ -525,6 +531,7 @@ static void __put_unused_fd(struct files
__clear_open_fd(fd, fdt);
if (fd < files->next_fd)
files->next_fd = fd;
}
void put_unused_fd(unsigned int fd)
-@@ -812,6 +819,8 @@ static int do_dup2(struct files_struct *
+@@ -791,6 +798,8 @@ static int do_dup2(struct files_struct *
if (tofree)
filp_close(tofree, files);
return fd;
-diff -NurpP --minimal linux-3.13.10/fs/file_table.c linux-3.13.10-vs2.3.6.11/fs/file_table.c
---- linux-3.13.10/fs/file_table.c 2014-01-22 20:39:06.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/file_table.c 2014-02-01 00:00:01.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/file_table.c linux-3.14.17-vs2.3.6.13/fs/file_table.c
+--- linux-3.14.17/fs/file_table.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/file_table.c 2014-08-30 14:27:38.000000000 +0000
@@ -26,6 +26,8 @@
#include <linux/hardirq.h>
#include <linux/task_work.h>
#include <linux/atomic.h>
-@@ -137,6 +139,8 @@ struct file *get_empty_filp(void)
- spin_lock_init(&f->f_lock);
+@@ -138,6 +140,8 @@ struct file *get_empty_filp(void)
+ mutex_init(&f->f_pos_lock);
eventpoll_init_file(f);
/* f->f_version: 0 */
+ f->f_xid = vx_current_xid();
return f;
over:
-@@ -254,6 +258,8 @@ static void __fput(struct file *file)
+@@ -255,6 +259,8 @@ static void __fput(struct file *file)
i_readcount_dec(inode);
if (file->f_mode & FMODE_WRITE)
drop_file_write_access(file);
file->f_path.dentry = NULL;
file->f_path.mnt = NULL;
file->f_inode = NULL;
-@@ -340,6 +346,8 @@ void put_filp(struct file *file)
+@@ -341,6 +347,8 @@ void put_filp(struct file *file)
{
if (atomic_long_dec_and_test(&file->f_count)) {
security_file_free(file);
file_free(file);
}
}
-diff -NurpP --minimal linux-3.13.10/fs/fs_struct.c linux-3.13.10-vs2.3.6.11/fs/fs_struct.c
---- linux-3.13.10/fs/fs_struct.c 2014-01-22 20:39:06.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/fs_struct.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/fs_struct.c linux-3.14.17-vs2.3.6.13/fs/fs_struct.c
+--- linux-3.14.17/fs/fs_struct.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/fs_struct.c 2014-08-30 14:27:38.000000000 +0000
@@ -4,6 +4,7 @@
#include <linux/path.h>
#include <linux/slab.h>
}
return fs;
}
-diff -NurpP --minimal linux-3.13.10/fs/gfs2/file.c linux-3.13.10-vs2.3.6.11/fs/gfs2/file.c
---- linux-3.13.10/fs/gfs2/file.c 2014-01-22 20:39:06.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/gfs2/file.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/gfs2/file.c linux-3.14.17-vs2.3.6.13/fs/gfs2/file.c
+--- linux-3.14.17/fs/gfs2/file.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/gfs2/file.c 2014-08-30 14:27:38.000000000 +0000
@@ -137,6 +137,9 @@ static const u32 fsflags_to_gfs2[32] = {
[12] = GFS2_DIF_EXHASH,
[14] = GFS2_DIF_INHERIT_JDATA,
static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
switch(cmd) {
-diff -NurpP --minimal linux-3.13.10/fs/gfs2/inode.h linux-3.13.10-vs2.3.6.11/fs/gfs2/inode.h
---- linux-3.13.10/fs/gfs2/inode.h 2013-11-25 15:45:01.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/gfs2/inode.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/gfs2/inode.h linux-3.14.17-vs2.3.6.13/fs/gfs2/inode.h
+--- linux-3.14.17/fs/gfs2/inode.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/gfs2/inode.h 2014-08-30 14:27:38.000000000 +0000
@@ -118,6 +118,7 @@ extern const struct file_operations gfs2
extern const struct file_operations gfs2_dir_fops_nolock;
#ifdef CONFIG_GFS2_FS_LOCKING_DLM
extern const struct file_operations gfs2_file_fops;
-diff -NurpP --minimal linux-3.13.10/fs/hostfs/hostfs.h linux-3.13.10-vs2.3.6.11/fs/hostfs/hostfs.h
---- linux-3.13.10/fs/hostfs/hostfs.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/hostfs/hostfs.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/hostfs/hostfs.h linux-3.14.17-vs2.3.6.13/fs/hostfs/hostfs.h
+--- linux-3.14.17/fs/hostfs/hostfs.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/hostfs/hostfs.h 2014-08-30 14:27:38.000000000 +0000
@@ -42,6 +42,7 @@ struct hostfs_iattr {
unsigned short ia_mode;
uid_t ia_uid;
loff_t ia_size;
struct timespec ia_atime;
struct timespec ia_mtime;
-diff -NurpP --minimal linux-3.13.10/fs/inode.c linux-3.13.10-vs2.3.6.11/fs/inode.c
---- linux-3.13.10/fs/inode.c 2014-01-22 20:39:06.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/inode.c 2014-01-31 23:33:47.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/inode.c linux-3.14.17-vs2.3.6.13/fs/inode.c
+--- linux-3.14.17/fs/inode.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/inode.c 2014-08-30 14:27:38.000000000 +0000
@@ -18,6 +18,7 @@
#include <linux/buffer_head.h> /* for inode_has_buffers */
#include <linux/ratelimit.h>
}
EXPORT_SYMBOL(inode_init_owner);
-diff -NurpP --minimal linux-3.13.10/fs/ioctl.c linux-3.13.10-vs2.3.6.11/fs/ioctl.c
---- linux-3.13.10/fs/ioctl.c 2014-01-22 20:39:06.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/ioctl.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/ioctl.c linux-3.14.17-vs2.3.6.13/fs/ioctl.c
+--- linux-3.14.17/fs/ioctl.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/ioctl.c 2014-08-30 14:27:38.000000000 +0000
@@ -15,6 +15,9 @@
#include <linux/writeback.h>
#include <linux/buffer_head.h>
#include <asm/ioctls.h>
-diff -NurpP --minimal linux-3.13.10/fs/ioprio.c linux-3.13.10-vs2.3.6.11/fs/ioprio.c
---- linux-3.13.10/fs/ioprio.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/ioprio.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/ioprio.c linux-3.14.17-vs2.3.6.13/fs/ioprio.c
+--- linux-3.14.17/fs/ioprio.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/ioprio.c 2014-08-30 14:27:38.000000000 +0000
@@ -28,6 +28,7 @@
#include <linux/syscalls.h>
#include <linux/security.h>
tmpio = get_task_ioprio(p);
if (tmpio < 0)
continue;
-diff -NurpP --minimal linux-3.13.10/fs/jfs/file.c linux-3.13.10-vs2.3.6.11/fs/jfs/file.c
---- linux-3.13.10/fs/jfs/file.c 2013-02-19 13:58:48.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/jfs/file.c 2014-01-31 20:38:03.000000000 +0000
-@@ -109,7 +109,8 @@ int jfs_setattr(struct dentry *dentry, s
+diff -NurpP --minimal linux-3.14.17/fs/jfs/file.c linux-3.14.17-vs2.3.6.13/fs/jfs/file.c
+--- linux-3.14.17/fs/jfs/file.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/jfs/file.c 2014-08-30 14:27:38.000000000 +0000
+@@ -110,7 +110,8 @@ int jfs_setattr(struct dentry *dentry, s
if (is_quota_modification(inode, iattr))
dquot_initialize(inode);
if ((iattr->ia_valid & ATTR_UID && !uid_eq(iattr->ia_uid, inode->i_uid)) ||
rc = dquot_transfer(inode, iattr);
if (rc)
return rc;
-@@ -144,6 +145,7 @@ const struct inode_operations jfs_file_i
- #ifdef CONFIG_JFS_POSIX_ACL
+@@ -146,6 +147,7 @@ const struct inode_operations jfs_file_i
.get_acl = jfs_get_acl,
+ .set_acl = jfs_set_acl,
#endif
+ .sync_flags = jfs_sync_flags,
};
const struct file_operations jfs_file_operations = {
-diff -NurpP --minimal linux-3.13.10/fs/jfs/ioctl.c linux-3.13.10-vs2.3.6.11/fs/jfs/ioctl.c
---- linux-3.13.10/fs/jfs/ioctl.c 2013-05-31 13:45:24.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/jfs/ioctl.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/jfs/ioctl.c linux-3.14.17-vs2.3.6.13/fs/jfs/ioctl.c
+--- linux-3.14.17/fs/jfs/ioctl.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/jfs/ioctl.c 2014-08-30 14:27:38.000000000 +0000
@@ -12,6 +12,7 @@
#include <linux/time.h>
#include <linux/sched.h>
flags |= oldflags & ~JFS_FL_USER_MODIFIABLE;
jfs_inode->mode2 = flags;
-diff -NurpP --minimal linux-3.13.10/fs/jfs/jfs_dinode.h linux-3.13.10-vs2.3.6.11/fs/jfs/jfs_dinode.h
---- linux-3.13.10/fs/jfs/jfs_dinode.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/jfs/jfs_dinode.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/jfs/jfs_dinode.h linux-3.14.17-vs2.3.6.13/fs/jfs/jfs_dinode.h
+--- linux-3.14.17/fs/jfs/jfs_dinode.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/jfs/jfs_dinode.h 2014-08-30 14:27:38.000000000 +0000
@@ -161,9 +161,13 @@ struct dinode {
#define JFS_APPEND_FL 0x01000000 /* writes to file may only append */
#define JFS_FL_INHERIT 0x03C80000
/* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */
-diff -NurpP --minimal linux-3.13.10/fs/jfs/jfs_filsys.h linux-3.13.10-vs2.3.6.11/fs/jfs/jfs_filsys.h
---- linux-3.13.10/fs/jfs/jfs_filsys.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/jfs/jfs_filsys.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/jfs/jfs_filsys.h linux-3.14.17-vs2.3.6.13/fs/jfs/jfs_filsys.h
+--- linux-3.14.17/fs/jfs/jfs_filsys.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/jfs/jfs_filsys.h 2014-08-30 14:27:38.000000000 +0000
@@ -266,6 +266,7 @@
#define JFS_NAME_MAX 255
#define JFS_PATH_MAX BPSIZE
/*
* file system state (superblock state)
-diff -NurpP --minimal linux-3.13.10/fs/jfs/jfs_imap.c linux-3.13.10-vs2.3.6.11/fs/jfs/jfs_imap.c
---- linux-3.13.10/fs/jfs/jfs_imap.c 2013-11-25 15:45:01.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/jfs/jfs_imap.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/jfs/jfs_imap.c linux-3.14.17-vs2.3.6.13/fs/jfs/jfs_imap.c
+--- linux-3.14.17/fs/jfs/jfs_imap.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/jfs/jfs_imap.c 2014-08-30 14:27:38.000000000 +0000
@@ -46,6 +46,7 @@
#include <linux/pagemap.h>
#include <linux/quotaops.h>
jfs_get_inode_flags(jfs_ip);
/*
* mode2 is only needed for storing the higher order bits.
-diff -NurpP --minimal linux-3.13.10/fs/jfs/jfs_inode.c linux-3.13.10-vs2.3.6.11/fs/jfs/jfs_inode.c
---- linux-3.13.10/fs/jfs/jfs_inode.c 2013-11-25 15:46:59.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/jfs/jfs_inode.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/jfs/jfs_inode.c linux-3.14.17-vs2.3.6.13/fs/jfs/jfs_inode.c
+--- linux-3.14.17/fs/jfs/jfs_inode.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/jfs/jfs_inode.c 2014-08-30 14:27:38.000000000 +0000
@@ -18,6 +18,7 @@
#include <linux/fs.h>
}
/*
-diff -NurpP --minimal linux-3.13.10/fs/jfs/jfs_inode.h linux-3.13.10-vs2.3.6.11/fs/jfs/jfs_inode.h
---- linux-3.13.10/fs/jfs/jfs_inode.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/jfs/jfs_inode.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/jfs/jfs_inode.h linux-3.14.17-vs2.3.6.13/fs/jfs/jfs_inode.h
+--- linux-3.14.17/fs/jfs/jfs_inode.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/jfs/jfs_inode.h 2014-08-30 14:27:38.000000000 +0000
@@ -39,6 +39,7 @@ extern struct dentry *jfs_fh_to_dentry(s
extern struct dentry *jfs_fh_to_parent(struct super_block *sb, struct fid *fid,
int fh_len, int fh_type);
extern int jfs_get_block(struct inode *, sector_t, struct buffer_head *, int);
extern int jfs_setattr(struct dentry *, struct iattr *);
-diff -NurpP --minimal linux-3.13.10/fs/jfs/namei.c linux-3.13.10-vs2.3.6.11/fs/jfs/namei.c
---- linux-3.13.10/fs/jfs/namei.c 2013-11-25 15:45:01.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/jfs/namei.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/jfs/namei.c linux-3.14.17-vs2.3.6.13/fs/jfs/namei.c
+--- linux-3.14.17/fs/jfs/namei.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/jfs/namei.c 2014-08-30 14:27:38.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/ctype.h>
#include <linux/quotaops.h>
return d_splice_alias(ip, dentry);
}
-@@ -1525,6 +1527,7 @@ const struct inode_operations jfs_dir_in
- #ifdef CONFIG_JFS_POSIX_ACL
+@@ -1526,6 +1528,7 @@ const struct inode_operations jfs_dir_in
.get_acl = jfs_get_acl,
+ .set_acl = jfs_set_acl,
#endif
+ .sync_flags = jfs_sync_flags,
};
const struct file_operations jfs_dir_operations = {
-diff -NurpP --minimal linux-3.13.10/fs/jfs/super.c linux-3.13.10-vs2.3.6.11/fs/jfs/super.c
---- linux-3.13.10/fs/jfs/super.c 2013-11-25 15:45:01.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/jfs/super.c 2014-01-31 20:38:03.000000000 +0000
-@@ -203,7 +203,8 @@ enum {
+diff -NurpP --minimal linux-3.14.17/fs/jfs/super.c linux-3.14.17-vs2.3.6.13/fs/jfs/super.c
+--- linux-3.14.17/fs/jfs/super.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/jfs/super.c 2014-08-30 14:27:38.000000000 +0000
+@@ -204,7 +204,8 @@ enum {
Opt_integrity, Opt_nointegrity, Opt_iocharset, Opt_resize,
Opt_resize_nosize, Opt_errors, Opt_ignore, Opt_err, Opt_quota,
Opt_usrquota, Opt_grpquota, Opt_uid, Opt_gid, Opt_umask,
};
static const match_table_t tokens = {
-@@ -213,6 +214,10 @@ static const match_table_t tokens = {
+@@ -214,6 +215,10 @@ static const match_table_t tokens = {
{Opt_resize, "resize=%u"},
{Opt_resize_nosize, "resize"},
{Opt_errors, "errors=%s"},
{Opt_ignore, "noquota"},
{Opt_ignore, "quota"},
{Opt_usrquota, "usrquota"},
-@@ -389,7 +394,20 @@ static int parse_options(char *options,
+@@ -390,7 +395,20 @@ static int parse_options(char *options,
}
break;
}
default:
printk("jfs: Unrecognized mount option \"%s\" "
" or missing value\n", p);
-@@ -421,6 +439,12 @@ static int jfs_remount(struct super_bloc
+@@ -422,6 +440,12 @@ static int jfs_remount(struct super_bloc
return -EINVAL;
}
if (newLVSize) {
if (sb->s_flags & MS_RDONLY) {
pr_err("JFS: resize requires volume" \
-@@ -506,6 +530,9 @@ static int jfs_fill_super(struct super_b
+@@ -507,6 +531,9 @@ static int jfs_fill_super(struct super_b
#ifdef CONFIG_JFS_POSIX_ACL
sb->s_flags |= MS_POSIXACL;
#endif
if (newLVSize) {
pr_err("resize option for remount only\n");
-diff -NurpP --minimal linux-3.13.10/fs/libfs.c linux-3.13.10-vs2.3.6.11/fs/libfs.c
---- linux-3.13.10/fs/libfs.c 2014-01-22 20:39:06.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/libfs.c 2014-02-01 01:35:46.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/libfs.c linux-3.14.17-vs2.3.6.13/fs/libfs.c
+--- linux-3.14.17/fs/libfs.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/libfs.c 2014-08-30 14:27:38.000000000 +0000
@@ -145,13 +145,14 @@ static inline unsigned char dt_type(stru
* both impossible due to the lock on directory.
*/
ssize_t generic_read_dir(struct file *filp, char __user *buf, size_t siz, loff_t *ppos)
{
return -EISDIR;
-diff -NurpP --minimal linux-3.13.10/fs/locks.c linux-3.13.10-vs2.3.6.11/fs/locks.c
---- linux-3.13.10/fs/locks.c 2014-01-22 20:39:06.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/locks.c 2014-01-31 23:51:55.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/locks.c linux-3.14.17-vs2.3.6.13/fs/locks.c
+--- linux-3.14.17/fs/locks.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/locks.c 2014-08-30 14:27:38.000000000 +0000
@@ -129,6 +129,8 @@
#include <linux/hashtable.h>
#include <linux/percpu.h>
if (error != FILE_LOCK_DEFERRED)
break;
error = wait_event_interruptible(fl.fl_wait, !fl.fl_next);
-@@ -1549,6 +1581,7 @@ static int generic_add_lease(struct file
+@@ -1548,6 +1580,7 @@ static int generic_add_lease(struct file
goto out;
locks_insert_lock(before, lease);
error = 0;
out:
if (is_deleg)
-@@ -1991,6 +2024,11 @@ int fcntl_setlk(unsigned int fd, struct
+@@ -1990,6 +2023,11 @@ int fcntl_setlk(unsigned int fd, struct
if (file_lock == NULL)
return -ENOLCK;
/*
* This might block, so we do it before checking the inode.
*/
-@@ -2109,6 +2147,11 @@ int fcntl_setlk64(unsigned int fd, struc
+@@ -2108,6 +2146,11 @@ int fcntl_setlk64(unsigned int fd, struc
if (file_lock == NULL)
return -ENOLCK;
/*
* This might block, so we do it before checking the inode.
*/
-@@ -2378,8 +2421,11 @@ static int locks_show(struct seq_file *f
+@@ -2377,8 +2420,11 @@ static int locks_show(struct seq_file *f
lock_get_status(f, fl, iter->li_pos, "");
- list_for_each_entry(bfl, &fl->fl_block, fl_block)
-- lock_get_status(f, bfl, iter->li_pos, " ->");
+ list_for_each_entry(bfl, &fl->fl_block, fl_block) {
+ if (!vx_check(fl->fl_xid, VS_WATCH_P | VS_IDENT))
+ continue;
-+ lock_get_status(f, bfl, iter->li_pos, " ->");
+ lock_get_status(f, bfl, iter->li_pos, " ->");
+ }
return 0;
}
-diff -NurpP --minimal linux-3.13.10/fs/mount.h linux-3.13.10-vs2.3.6.11/fs/mount.h
---- linux-3.13.10/fs/mount.h 2014-04-17 01:12:32.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/mount.h 2014-04-17 01:17:10.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/mount.h linux-3.14.17-vs2.3.6.13/fs/mount.h
+--- linux-3.14.17/fs/mount.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/mount.h 2014-08-30 14:27:38.000000000 +0000
@@ -57,6 +57,7 @@ struct mount {
int mnt_expiry_mark; /* true if marked for expiry */
int mnt_pinned;
};
#define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */
-diff -NurpP --minimal linux-3.13.10/fs/namei.c linux-3.13.10-vs2.3.6.11/fs/namei.c
---- linux-3.13.10/fs/namei.c 2014-04-17 01:12:32.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/namei.c 2014-04-17 01:17:10.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/namei.c linux-3.14.17-vs2.3.6.13/fs/namei.c
+--- linux-3.14.17/fs/namei.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/namei.c 2014-08-30 17:03:10.000000000 +0000
@@ -34,9 +34,19 @@
#include <linux/device_cgroup.h>
#include <linux/fs_struct.h>
#include "mount.h"
/* [Feb-1997 T. Schoebel-Theuer]
-@@ -266,6 +276,89 @@ static int check_acl(struct inode *inode
+@@ -277,6 +287,89 @@ static int check_acl(struct inode *inode
return -EAGAIN;
}
/*
* This does the basic permission checking
*/
-@@ -388,10 +481,14 @@ int __inode_permission(struct inode *ino
+@@ -400,10 +493,14 @@ int __inode_permission(struct inode *ino
/*
* Nobody gets write access to an immutable file.
*/
retval = do_inode_permission(inode, mask);
if (retval)
return retval;
-@@ -1238,7 +1335,8 @@ static void follow_dotdot(struct nameida
-
- if (nd->path.dentry == nd->root.dentry &&
- nd->path.mnt == nd->root.mnt) {
-- break;
-+ /* for sane '/' avoid follow_mount() */
-+ return;
- }
- if (nd->path.dentry != nd->path.mnt->mnt_root) {
- /* rare case of legitimate dget_parent()... */
-@@ -1383,6 +1481,9 @@ static int lookup_fast(struct nameidata
+@@ -1395,6 +1492,9 @@ static int lookup_fast(struct nameidata
goto unlazy;
}
}
path->mnt = mnt;
path->dentry = dentry;
if (unlikely(!__follow_mount_rcu(nd, path, inode)))
-@@ -1413,6 +1514,8 @@ unlazy:
+@@ -1425,6 +1525,8 @@ unlazy:
}
}
path->mnt = mnt;
path->dentry = dentry;
err = follow_managed(path, nd->flags);
-@@ -2400,7 +2503,7 @@ static int may_delete(struct inode *dir,
+@@ -2413,7 +2515,7 @@ static int may_delete(struct inode *dir,
return -EPERM;
if (check_sticky(dir, inode) || IS_APPEND(inode) ||
return -EPERM;
if (isdir) {
if (!d_is_directory(victim) && !d_is_autodir(victim))
-@@ -2480,19 +2583,25 @@ int vfs_create(struct inode *dir, struct
+@@ -2493,19 +2595,25 @@ int vfs_create(struct inode *dir, struct
bool want_excl)
{
int error = may_create(dir, dentry);
return error;
}
-@@ -2527,6 +2636,15 @@ static int may_open(struct path *path, i
+@@ -2540,6 +2648,15 @@ static int may_open(struct path *path, i
break;
}
error = inode_permission(inode, acc_mode);
if (error)
return error;
-@@ -3022,6 +3140,16 @@ finish_open:
+@@ -3035,6 +3152,16 @@ finish_open:
}
finish_open_created:
error = may_open(&nd->path, acc_mode, open_flag);
if (error)
goto out;
file->f_path.mnt = nd->path.mnt;
-@@ -3147,6 +3275,7 @@ static struct file *path_openat(int dfd,
+@@ -3160,6 +3287,7 @@ static struct file *path_openat(int dfd,
int opened = 0;
int error;
file = get_empty_filp();
if (IS_ERR(file))
return file;
-@@ -3188,6 +3317,16 @@ static struct file *path_openat(int dfd,
+@@ -3201,6 +3329,16 @@ static struct file *path_openat(int dfd,
error = do_last(nd, &path, file, op, &opened, pathname);
put_link(nd, &link, cookie);
}
out:
if (nd->root.mnt && !(nd->flags & LOOKUP_ROOT))
path_put(&nd->root);
-@@ -3303,6 +3442,11 @@ struct dentry *kern_path_create(int dfd,
+@@ -3316,6 +3454,11 @@ struct dentry *kern_path_create(int dfd,
goto fail;
}
*path = nd.path;
return dentry;
fail:
dput(dentry);
-@@ -3850,7 +3994,7 @@ int vfs_link(struct dentry *old_dentry,
+@@ -3863,7 +4006,7 @@ int vfs_link(struct dentry *old_dentry,
/*
* A link to an append-only or immutable file cannot be created.
*/
return -EPERM;
if (!dir->i_op->link)
return -EPERM;
-@@ -4305,6 +4449,287 @@ int generic_readlink(struct dentry *dent
+@@ -4318,6 +4461,287 @@ int generic_readlink(struct dentry *dent
return res;
}
/* get the link contents into pagecache */
static char *page_getlink(struct dentry * dentry, struct page **ppage)
{
-@@ -4427,3 +4852,4 @@ EXPORT_SYMBOL(vfs_symlink);
+@@ -4440,3 +4864,4 @@ EXPORT_SYMBOL(vfs_symlink);
EXPORT_SYMBOL(vfs_unlink);
EXPORT_SYMBOL(dentry_unhash);
EXPORT_SYMBOL(generic_readlink);
+EXPORT_SYMBOL(vx_info_mnt_namespace);
-diff -NurpP --minimal linux-3.13.10/fs/namespace.c linux-3.13.10-vs2.3.6.11/fs/namespace.c
---- linux-3.13.10/fs/namespace.c 2014-04-17 01:12:32.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/namespace.c 2014-04-17 01:18:37.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/namespace.c linux-3.14.17-vs2.3.6.13/fs/namespace.c
+--- linux-3.14.17/fs/namespace.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/namespace.c 2014-08-30 14:27:38.000000000 +0000
@@ -24,6 +24,11 @@
#include <linux/proc_ns.h>
#include <linux/magic.h>
}
/*
-@@ -1785,6 +1796,7 @@ static int do_change_type(struct path *p
+@@ -1790,6 +1801,7 @@ static int do_change_type(struct path *p
if (err)
goto out_unlock;
}
lock_mount_hash();
for (m = mnt; m; m = (recurse ? next_mnt(m, mnt) : NULL))
-@@ -1813,12 +1825,14 @@ static bool has_locked_children(struct m
+@@ -1818,12 +1830,14 @@ static bool has_locked_children(struct m
* do loopback mount.
*/
static int do_loopback(struct path *path, const char *old_name,
if (!old_name || !*old_name)
return -EINVAL;
err = kern_path(old_name, LOOKUP_FOLLOW|LOOKUP_AUTOMOUNT, &old_path);
-@@ -1898,7 +1912,7 @@ static int change_mount_flags(struct vfs
+@@ -1903,7 +1917,7 @@ static int change_mount_flags(struct vfs
* on it - tough luck.
*/
static int do_remount(struct path *path, int flags, int mnt_flags,
{
int err;
struct super_block *sb = path->mnt->mnt_sb;
-@@ -2377,6 +2391,7 @@ long do_mount(const char *dev_name, cons
+@@ -2382,6 +2396,7 @@ long do_mount(const char *dev_name, cons
struct path path;
int retval = 0;
int mnt_flags = 0;
/* Discard magic */
if ((flags & MS_MGC_MSK) == MS_MGC_VAL)
-@@ -2406,6 +2421,12 @@ long do_mount(const char *dev_name, cons
+@@ -2411,6 +2426,12 @@ long do_mount(const char *dev_name, cons
if (!(flags & MS_NOATIME))
mnt_flags |= MNT_RELATIME;
/* Separate the per-mountpoint flags */
if (flags & MS_NOSUID)
mnt_flags |= MNT_NOSUID;
-@@ -2422,15 +2443,17 @@ long do_mount(const char *dev_name, cons
+@@ -2427,15 +2448,17 @@ long do_mount(const char *dev_name, cons
if (flags & MS_RDONLY)
mnt_flags |= MNT_READONLY;
else if (flags & (MS_SHARED | MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE))
retval = do_change_type(&path, flags);
else if (flags & MS_MOVE)
-@@ -2546,6 +2569,7 @@ struct mnt_namespace *copy_mnt_ns(unsign
+@@ -2551,6 +2574,7 @@ struct mnt_namespace *copy_mnt_ns(unsign
p = next_mnt(p, old);
}
namespace_unlock();
if (rootmnt)
mntput(rootmnt);
-@@ -2727,9 +2751,10 @@ SYSCALL_DEFINE2(pivot_root, const char _
+@@ -2732,9 +2756,10 @@ SYSCALL_DEFINE2(pivot_root, const char _
new_mnt = real_mount(new.mnt);
root_mnt = real_mount(root.mnt);
old_mnt = real_mount(old.mnt);
goto out4;
if (!check_mnt(root_mnt) || !check_mnt(new_mnt))
goto out4;
-@@ -2859,6 +2884,7 @@ void put_mnt_ns(struct mnt_namespace *ns
+@@ -2866,6 +2891,7 @@ void put_mnt_ns(struct mnt_namespace *ns
if (!atomic_dec_and_test(&ns->count))
return;
drop_collected_mounts(&ns->root->mnt);
free_mnt_ns(ns);
}
-diff -NurpP --minimal linux-3.13.10/fs/nfs/client.c linux-3.13.10-vs2.3.6.11/fs/nfs/client.c
---- linux-3.13.10/fs/nfs/client.c 2014-01-22 20:39:06.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/nfs/client.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/nfs/client.c linux-3.14.17-vs2.3.6.13/fs/nfs/client.c
+--- linux-3.14.17/fs/nfs/client.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/nfs/client.c 2014-08-30 14:27:38.000000000 +0000
@@ -685,6 +685,9 @@ int nfs_init_server_rpcclient(struct nfs
if (server->flags & NFS_MOUNT_SOFT)
server->client->cl_softrtry = 1;
server->maxfilesize = fsinfo->maxfilesize;
server->time_delta = fsinfo->time_delta;
-diff -NurpP --minimal linux-3.13.10/fs/nfs/dir.c linux-3.13.10-vs2.3.6.11/fs/nfs/dir.c
---- linux-3.13.10/fs/nfs/dir.c 2014-04-17 01:12:32.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/nfs/dir.c 2014-02-25 11:26:10.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/nfs/dir.c linux-3.14.17-vs2.3.6.13/fs/nfs/dir.c
+--- linux-3.14.17/fs/nfs/dir.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/nfs/dir.c 2014-08-30 14:27:38.000000000 +0000
@@ -37,6 +37,7 @@
#include <linux/sched.h>
#include <linux/kmemleak.h>
#include "delegation.h"
#include "iostat.h"
-@@ -1319,6 +1320,7 @@ struct dentry *nfs_lookup(struct inode *
+@@ -1328,6 +1329,7 @@ struct dentry *nfs_lookup(struct inode *
/* Success: notify readdir to use READDIRPLUS */
nfs_advise_use_readdirplus(dir);
no_entry:
res = d_materialise_unique(dentry, inode);
if (res != NULL) {
-diff -NurpP --minimal linux-3.13.10/fs/nfs/inode.c linux-3.13.10-vs2.3.6.11/fs/nfs/inode.c
---- linux-3.13.10/fs/nfs/inode.c 2014-04-17 01:12:32.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/nfs/inode.c 2014-03-12 15:51:07.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/nfs/inode.c linux-3.14.17-vs2.3.6.13/fs/nfs/inode.c
+--- linux-3.14.17/fs/nfs/inode.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/nfs/inode.c 2014-08-30 14:27:38.000000000 +0000
@@ -38,6 +38,7 @@
#include <linux/slab.h>
#include <linux/compat.h>
NFS_I(inode)->cache_validity |= NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL;
spin_unlock(&inode->i_lock);
}
-@@ -1092,7 +1101,9 @@ static int nfs_check_inode_attributes(st
+@@ -1128,7 +1137,9 @@ static int nfs_check_inode_attributes(st
struct nfs_inode *nfsi = NFS_I(inode);
loff_t cur_size, new_isize;
unsigned long invalid = 0;
if (nfs_have_delegated_attributes(inode))
return 0;
-@@ -1117,13 +1128,18 @@ static int nfs_check_inode_attributes(st
+@@ -1153,13 +1164,18 @@ static int nfs_check_inode_attributes(st
invalid |= NFS_INO_INVALID_ATTR|NFS_INO_REVAL_PAGECACHE;
}
/* Has the link count changed? */
if ((fattr->valid & NFS_ATTR_FATTR_NLINK) && inode->i_nlink != fattr->nlink)
-@@ -1440,6 +1456,9 @@ static int nfs_update_inode(struct inode
+@@ -1492,6 +1508,9 @@ static int nfs_update_inode(struct inode
unsigned long invalid = 0;
unsigned long now = jiffies;
unsigned long save_cache_validity;
+ kgid_t kgid;
+ ktag_t ktag;
- dfprintk(VFS, "NFS: %s(%s/%ld fh_crc=0x%08x ct=%d info=0x%x)\n",
+ dfprintk(VFS, "NFS: %s(%s/%lu fh_crc=0x%08x ct=%d info=0x%x)\n",
__func__, inode->i_sb->s_id, inode->i_ino,
-@@ -1541,6 +1560,9 @@ static int nfs_update_inode(struct inode
+@@ -1595,6 +1614,9 @@ static int nfs_update_inode(struct inode
| NFS_INO_REVAL_PAGECACHE
| NFS_INO_REVAL_FORCED);
if (fattr->valid & NFS_ATTR_FATTR_ATIME)
memcpy(&inode->i_atime, &fattr->atime, sizeof(inode->i_atime));
-@@ -1583,6 +1605,10 @@ static int nfs_update_inode(struct inode
+@@ -1641,6 +1663,10 @@ static int nfs_update_inode(struct inode
| NFS_INO_INVALID_ACL
| NFS_INO_REVAL_FORCED);
if (fattr->valid & NFS_ATTR_FATTR_NLINK) {
if (inode->i_nlink != fattr->nlink) {
invalid |= NFS_INO_INVALID_ATTR;
-diff -NurpP --minimal linux-3.13.10/fs/nfs/nfs3xdr.c linux-3.13.10-vs2.3.6.11/fs/nfs/nfs3xdr.c
---- linux-3.13.10/fs/nfs/nfs3xdr.c 2013-05-31 13:45:24.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/nfs/nfs3xdr.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/nfs/nfs3xdr.c linux-3.14.17-vs2.3.6.13/fs/nfs/nfs3xdr.c
+--- linux-3.14.17/fs/nfs/nfs3xdr.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/nfs/nfs3xdr.c 2014-08-30 14:27:38.000000000 +0000
@@ -20,6 +20,7 @@
#include <linux/nfs3.h>
#include <linux/nfs_fs.h>
}
/*
-diff -NurpP --minimal linux-3.13.10/fs/nfs/super.c linux-3.13.10-vs2.3.6.11/fs/nfs/super.c
---- linux-3.13.10/fs/nfs/super.c 2014-01-22 20:39:06.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/nfs/super.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/nfs/super.c linux-3.14.17-vs2.3.6.13/fs/nfs/super.c
+--- linux-3.14.17/fs/nfs/super.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/nfs/super.c 2014-08-30 14:27:38.000000000 +0000
@@ -55,6 +55,7 @@
#include <linux/parser.h>
#include <linux/nsproxy.h>
/*
* options that take text values
-diff -NurpP --minimal linux-3.13.10/fs/nfsd/auth.c linux-3.13.10-vs2.3.6.11/fs/nfsd/auth.c
---- linux-3.13.10/fs/nfsd/auth.c 2013-05-31 13:45:24.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/nfsd/auth.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/nfsd/auth.c linux-3.14.17-vs2.3.6.13/fs/nfsd/auth.c
+--- linux-3.14.17/fs/nfsd/auth.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/nfsd/auth.c 2014-08-30 14:27:38.000000000 +0000
@@ -2,6 +2,7 @@
#include <linux/sched.h>
rqgi = rqstp->rq_cred.cr_group_info;
-diff -NurpP --minimal linux-3.13.10/fs/nfsd/nfs3xdr.c linux-3.13.10-vs2.3.6.11/fs/nfsd/nfs3xdr.c
---- linux-3.13.10/fs/nfsd/nfs3xdr.c 2013-05-31 13:45:24.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/nfsd/nfs3xdr.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/nfsd/nfs3xdr.c linux-3.14.17-vs2.3.6.13/fs/nfsd/nfs3xdr.c
+--- linux-3.14.17/fs/nfsd/nfs3xdr.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/nfsd/nfs3xdr.c 2014-08-30 14:27:38.000000000 +0000
@@ -8,6 +8,7 @@
#include <linux/namei.h>
@@ -170,8 +176,12 @@ encode_fattr3(struct svc_rqst *rqstp, __
*p++ = htonl(nfs3_ftypes[(stat->mode & S_IFMT) >> 12]);
- *p++ = htonl((u32) stat->mode);
+ *p++ = htonl((u32) (stat->mode & S_IALLUGO));
*p++ = htonl((u32) stat->nlink);
- *p++ = htonl((u32) from_kuid(&init_user_ns, stat->uid));
- *p++ = htonl((u32) from_kgid(&init_user_ns, stat->gid));
if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) {
p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN);
} else {
-diff -NurpP --minimal linux-3.13.10/fs/nfsd/nfs4xdr.c linux-3.13.10-vs2.3.6.11/fs/nfsd/nfs4xdr.c
---- linux-3.13.10/fs/nfsd/nfs4xdr.c 2014-01-22 20:39:06.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/nfsd/nfs4xdr.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/nfsd/nfs4xdr.c linux-3.14.17-vs2.3.6.13/fs/nfsd/nfs4xdr.c
+--- linux-3.14.17/fs/nfsd/nfs4xdr.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/nfsd/nfs4xdr.c 2014-08-30 14:56:00.000000000 +0000
@@ -46,6 +46,7 @@
#include <linux/utsname.h>
#include <linux/pagemap.h>
#include "idmap.h"
#include "acl.h"
-@@ -2430,10 +2431,14 @@ out_acl:
+@@ -2411,12 +2412,16 @@ out_acl:
WRITE32(stat.nlink);
}
if (bmval1 & FATTR4_WORD1_OWNER) {
if (status)
goto out;
}
-diff -NurpP --minimal linux-3.13.10/fs/nfsd/nfsxdr.c linux-3.13.10-vs2.3.6.11/fs/nfsd/nfsxdr.c
---- linux-3.13.10/fs/nfsd/nfsxdr.c 2013-05-31 13:45:24.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/nfsd/nfsxdr.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/nfsd/nfsxdr.c linux-3.14.17-vs2.3.6.13/fs/nfsd/nfsxdr.c
+--- linux-3.14.17/fs/nfsd/nfsxdr.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/nfsd/nfsxdr.c 2014-08-30 14:27:38.000000000 +0000
@@ -7,6 +7,7 @@
#include "vfs.h"
#include "xdr.h"
if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
*p++ = htonl(NFS_MAXPATHLEN);
-diff -NurpP --minimal linux-3.13.10/fs/ocfs2/dlmglue.c linux-3.13.10-vs2.3.6.11/fs/ocfs2/dlmglue.c
---- linux-3.13.10/fs/ocfs2/dlmglue.c 2014-01-22 20:39:07.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/ocfs2/dlmglue.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/ocfs2/dlmglue.c linux-3.14.17-vs2.3.6.13/fs/ocfs2/dlmglue.c
+--- linux-3.14.17/fs/ocfs2/dlmglue.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/ocfs2/dlmglue.c 2014-08-30 14:27:38.000000000 +0000
@@ -2047,6 +2047,7 @@ static void __ocfs2_stuff_meta_lvb(struc
lvb->lvb_iclusters = cpu_to_be32(oi->ip_clusters);
lvb->lvb_iuid = cpu_to_be32(i_uid_read(inode));
inode->i_mode = be16_to_cpu(lvb->lvb_imode);
set_nlink(inode, be16_to_cpu(lvb->lvb_inlink));
ocfs2_unpack_timespec(&inode->i_atime,
-diff -NurpP --minimal linux-3.13.10/fs/ocfs2/dlmglue.h linux-3.13.10-vs2.3.6.11/fs/ocfs2/dlmglue.h
---- linux-3.13.10/fs/ocfs2/dlmglue.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/ocfs2/dlmglue.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/ocfs2/dlmglue.h linux-3.14.17-vs2.3.6.13/fs/ocfs2/dlmglue.h
+--- linux-3.14.17/fs/ocfs2/dlmglue.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/ocfs2/dlmglue.h 2014-08-30 14:27:38.000000000 +0000
@@ -46,7 +46,8 @@ struct ocfs2_meta_lvb {
__be16 lvb_inlink;
__be32 lvb_iattr;
};
#define OCFS2_QINFO_LVB_VERSION 1
-diff -NurpP --minimal linux-3.13.10/fs/ocfs2/file.c linux-3.13.10-vs2.3.6.11/fs/ocfs2/file.c
---- linux-3.13.10/fs/ocfs2/file.c 2014-04-17 01:12:32.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/ocfs2/file.c 2014-04-17 01:17:10.000000000 +0000
-@@ -1119,7 +1119,7 @@ int ocfs2_setattr(struct dentry *dentry,
+diff -NurpP --minimal linux-3.14.17/fs/ocfs2/file.c linux-3.14.17-vs2.3.6.13/fs/ocfs2/file.c
+--- linux-3.14.17/fs/ocfs2/file.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/ocfs2/file.c 2014-08-30 14:27:38.000000000 +0000
+@@ -1141,7 +1141,7 @@ int ocfs2_setattr(struct dentry *dentry,
attr->ia_valid &= ~ATTR_SIZE;
#define OCFS2_VALID_ATTRS (ATTR_ATIME | ATTR_MTIME | ATTR_CTIME | ATTR_SIZE \
if (!(attr->ia_valid & OCFS2_VALID_ATTRS))
return 0;
-diff -NurpP --minimal linux-3.13.10/fs/ocfs2/inode.c linux-3.13.10-vs2.3.6.11/fs/ocfs2/inode.c
---- linux-3.13.10/fs/ocfs2/inode.c 2014-01-22 20:39:07.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/ocfs2/inode.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/ocfs2/inode.c linux-3.14.17-vs2.3.6.13/fs/ocfs2/inode.c
+--- linux-3.14.17/fs/ocfs2/inode.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/ocfs2/inode.c 2014-08-30 14:27:38.000000000 +0000
@@ -28,6 +28,7 @@
#include <linux/highmem.h>
#include <linux/pagemap.h>
/* Fast symlinks will have i_size but no allocated clusters. */
if (S_ISLNK(inode->i_mode) && !fe->i_clusters) {
-diff -NurpP --minimal linux-3.13.10/fs/ocfs2/inode.h linux-3.13.10-vs2.3.6.11/fs/ocfs2/inode.h
---- linux-3.13.10/fs/ocfs2/inode.h 2013-07-14 17:01:29.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/ocfs2/inode.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/ocfs2/inode.h linux-3.14.17-vs2.3.6.13/fs/ocfs2/inode.h
+--- linux-3.14.17/fs/ocfs2/inode.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/ocfs2/inode.h 2014-08-30 14:27:38.000000000 +0000
@@ -152,6 +152,7 @@ struct buffer_head *ocfs2_bread(struct i
void ocfs2_set_inode_flags(struct inode *inode);
static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode)
{
-diff -NurpP --minimal linux-3.13.10/fs/ocfs2/ioctl.c linux-3.13.10-vs2.3.6.11/fs/ocfs2/ioctl.c
---- linux-3.13.10/fs/ocfs2/ioctl.c 2013-11-25 15:47:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/ocfs2/ioctl.c 2014-01-31 20:38:03.000000000 +0000
-@@ -76,7 +76,41 @@ static int ocfs2_get_inode_attr(struct i
+diff -NurpP --minimal linux-3.14.17/fs/ocfs2/ioctl.c linux-3.14.17-vs2.3.6.13/fs/ocfs2/ioctl.c
+--- linux-3.14.17/fs/ocfs2/ioctl.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/ocfs2/ioctl.c 2014-08-30 14:27:38.000000000 +0000
+@@ -77,7 +77,41 @@ static int ocfs2_get_inode_attr(struct i
return status;
}
unsigned mask)
{
struct ocfs2_inode_info *ocfs2_inode = OCFS2_I(inode);
-@@ -116,6 +150,11 @@ static int ocfs2_set_inode_attr(struct i
+@@ -117,6 +151,11 @@ static int ocfs2_set_inode_attr(struct i
goto bail_unlock;
}
handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS);
if (IS_ERR(handle)) {
status = PTR_ERR(handle);
-@@ -881,6 +920,7 @@ bail:
+@@ -882,6 +921,7 @@ bail:
return status;
}
long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
struct inode *inode = file_inode(filp);
-diff -NurpP --minimal linux-3.13.10/fs/ocfs2/namei.c linux-3.13.10-vs2.3.6.11/fs/ocfs2/namei.c
---- linux-3.13.10/fs/ocfs2/namei.c 2014-01-22 20:39:07.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/ocfs2/namei.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/ocfs2/namei.c linux-3.14.17-vs2.3.6.13/fs/ocfs2/namei.c
+--- linux-3.14.17/fs/ocfs2/namei.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/ocfs2/namei.c 2014-08-30 14:27:38.000000000 +0000
@@ -41,6 +41,7 @@
#include <linux/slab.h>
#include <linux/highmem.h>
#include <cluster/masklog.h>
-@@ -475,6 +476,7 @@ static int __ocfs2_mknod_locked(struct i
+@@ -494,6 +495,7 @@ static int __ocfs2_mknod_locked(struct i
struct ocfs2_dinode *fe = NULL;
struct ocfs2_extent_list *fel;
u16 feat;
*new_fe_bh = NULL;
-@@ -512,8 +514,13 @@ static int __ocfs2_mknod_locked(struct i
+@@ -531,8 +533,13 @@ static int __ocfs2_mknod_locked(struct i
fe->i_suballoc_loc = cpu_to_le64(suballoc_loc);
fe->i_suballoc_bit = cpu_to_le16(suballoc_bit);
fe->i_suballoc_slot = cpu_to_le16(inode_ac->ac_alloc_slot);
fe->i_mode = cpu_to_le16(inode->i_mode);
if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode))
fe->id1.dev1.i_rdev = cpu_to_le64(huge_encode_dev(dev));
-diff -NurpP --minimal linux-3.13.10/fs/ocfs2/ocfs2.h linux-3.13.10-vs2.3.6.11/fs/ocfs2/ocfs2.h
---- linux-3.13.10/fs/ocfs2/ocfs2.h 2013-11-25 15:45:04.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/ocfs2/ocfs2.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/ocfs2/ocfs2.h linux-3.14.17-vs2.3.6.13/fs/ocfs2/ocfs2.h
+--- linux-3.14.17/fs/ocfs2/ocfs2.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/ocfs2/ocfs2.h 2014-08-30 14:27:38.000000000 +0000
@@ -272,6 +272,7 @@ enum ocfs2_mount_options
writes */
OCFS2_MOUNT_HB_NONE = 1 << 13, /* No heartbeat */
};
#define OCFS2_OSB_SOFT_RO 0x0001
-diff -NurpP --minimal linux-3.13.10/fs/ocfs2/ocfs2_fs.h linux-3.13.10-vs2.3.6.11/fs/ocfs2/ocfs2_fs.h
---- linux-3.13.10/fs/ocfs2/ocfs2_fs.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/ocfs2/ocfs2_fs.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/ocfs2/ocfs2_fs.h linux-3.14.17-vs2.3.6.13/fs/ocfs2/ocfs2_fs.h
+--- linux-3.14.17/fs/ocfs2/ocfs2_fs.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/ocfs2/ocfs2_fs.h 2014-08-30 14:27:38.000000000 +0000
@@ -266,6 +266,11 @@
#define OCFS2_TOPDIR_FL FS_TOPDIR_FL /* Top of directory hierarchies*/
#define OCFS2_RESERVED_FL FS_RESERVED_FL /* reserved for ext2 lib */
#define OCFS2_FL_VISIBLE FS_FL_USER_VISIBLE /* User visible flags */
#define OCFS2_FL_MODIFIABLE FS_FL_USER_MODIFIABLE /* User modifiable flags */
-diff -NurpP --minimal linux-3.13.10/fs/ocfs2/super.c linux-3.13.10-vs2.3.6.11/fs/ocfs2/super.c
---- linux-3.13.10/fs/ocfs2/super.c 2014-01-22 20:39:07.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/ocfs2/super.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/ocfs2/super.c linux-3.14.17-vs2.3.6.13/fs/ocfs2/super.c
+--- linux-3.14.17/fs/ocfs2/super.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/ocfs2/super.c 2014-08-30 14:27:38.000000000 +0000
@@ -185,6 +185,7 @@ enum {
Opt_coherency_full,
Opt_resv_level,
default:
mlog(ML_ERROR,
"Unrecognized mount option \"%s\" "
-diff -NurpP --minimal linux-3.13.10/fs/open.c linux-3.13.10-vs2.3.6.11/fs/open.c
---- linux-3.13.10/fs/open.c 2014-01-22 20:39:07.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/open.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/open.c linux-3.14.17-vs2.3.6.13/fs/open.c
+--- linux-3.14.17/fs/open.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/open.c 2014-08-30 14:27:38.000000000 +0000
@@ -31,6 +31,11 @@
#include <linux/ima.h>
#include <linux/dnotify.h>
error = chown_common(&path, user, group);
mnt_drop_write(path.mnt);
out_release:
-diff -NurpP --minimal linux-3.13.10/fs/proc/array.c linux-3.13.10-vs2.3.6.11/fs/proc/array.c
---- linux-3.13.10/fs/proc/array.c 2014-01-22 20:39:07.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/proc/array.c 2014-02-01 01:44:54.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/proc/array.c linux-3.14.17-vs2.3.6.13/fs/proc/array.c
+--- linux-3.14.17/fs/proc/array.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/proc/array.c 2014-08-30 14:56:59.000000000 +0000
@@ -82,6 +82,8 @@
#include <linux/ptrace.h>
#include <linux/tracehook.h>
#include <asm/pgtable.h>
#include <asm/processor.h>
-@@ -173,6 +175,9 @@ static inline void task_state(struct seq
+@@ -164,6 +166,9 @@ static inline void task_state(struct seq
rcu_read_lock();
ppid = pid_alive(p) ?
task_tgid_nr_ns(rcu_dereference(p->real_parent), ns) : 0;
tpid = 0;
if (pid_alive(p)) {
struct task_struct *tracer = ptrace_parent(p);
-@@ -299,7 +304,7 @@ static inline void task_sig(struct seq_f
+@@ -290,7 +295,7 @@ static inline void task_sig(struct seq_f
}
static void render_cap_t(struct seq_file *m, const char *header,
{
unsigned __capi;
-@@ -333,10 +338,11 @@ static inline void task_cap(struct seq_f
+@@ -324,10 +329,11 @@ static inline void task_cap(struct seq_f
NORM_CAPS(cap_effective);
NORM_CAPS(cap_bset);
}
static inline void task_seccomp(struct seq_file *m, struct task_struct *p)
-@@ -365,6 +371,43 @@ static void task_cpus_allowed(struct seq
+@@ -356,6 +362,43 @@ static void task_cpus_allowed(struct seq
seq_putc(m, '\n');
}
+ if (task_vx_flags(task, VXF_HIDE_VINFO, 0))
+ return;
+
-+ seq_printf(m, "VxID: %d\n", vx_task_xid(task));
-+ seq_printf(m, "NxID: %d\n", nx_task_nid(task));
++ seq_printf(m, "VxID:\t%d\n", vx_task_xid(task));
++ seq_printf(m, "NxID:\t%d\n", nx_task_nid(task));
+}
+
+
int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
struct pid *pid, struct task_struct *task)
{
-@@ -382,6 +425,7 @@ int proc_pid_status(struct seq_file *m,
+@@ -373,6 +416,7 @@ int proc_pid_status(struct seq_file *m,
task_seccomp(m, task);
task_cpus_allowed(m, task);
cpuset_task_status_allowed(m, task);
task_context_switch_counts(m, task);
return 0;
}
-@@ -491,6 +535,17 @@ static int do_task_stat(struct seq_file
+@@ -481,6 +525,17 @@ static int do_task_stat(struct seq_file
/* convert nsec -> ticks */
start_time = nsec_to_clock_t(start_time);
seq_printf(m, "%d (%s) %c", pid_nr_ns(pid, ns), tcomm, state);
seq_put_decimal_ll(m, ' ', ppid);
seq_put_decimal_ll(m, ' ', pgid);
-diff -NurpP --minimal linux-3.13.10/fs/proc/base.c linux-3.13.10-vs2.3.6.11/fs/proc/base.c
---- linux-3.13.10/fs/proc/base.c 2014-04-17 01:12:32.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/proc/base.c 2014-04-17 01:17:10.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/proc/base.c linux-3.14.17-vs2.3.6.13/fs/proc/base.c
+--- linux-3.14.17/fs/proc/base.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/proc/base.c 2014-08-30 14:27:38.000000000 +0000
@@ -87,6 +87,8 @@
#include <linux/slab.h>
#include <linux/flex_array.h>
d_drop(dentry);
return 0;
}
-@@ -2173,6 +2190,13 @@ static struct dentry *proc_pident_lookup
+@@ -2178,6 +2195,13 @@ static struct dentry *proc_pident_lookup
if (!task)
goto out_no_task;
/*
* Yes, it does not scale. And it should not. Don't add
* new entries into /proc/<tgid>/ without very good reasons.
-@@ -2569,6 +2593,9 @@ static int proc_pid_personality(struct s
+@@ -2574,6 +2598,9 @@ static int proc_pid_personality(struct s
static const struct file_operations proc_task_operations;
static const struct inode_operations proc_task_inode_operations;
static const struct pid_entry tgid_base_stuff[] = {
DIR("task", S_IRUGO|S_IXUGO, proc_task_inode_operations, proc_task_operations),
DIR("fd", S_IRUSR|S_IXUSR, proc_fd_inode_operations, proc_fd_operations),
-@@ -2635,6 +2662,8 @@ static const struct pid_entry tgid_base_
+@@ -2640,6 +2667,8 @@ static const struct pid_entry tgid_base_
#ifdef CONFIG_CGROUPS
REG("cgroup", S_IRUGO, proc_cgroup_operations),
#endif
INF("oom_score", S_IRUGO, proc_oom_score),
REG("oom_adj", S_IRUGO|S_IWUSR, proc_oom_adj_operations),
REG("oom_score_adj", S_IRUGO|S_IWUSR, proc_oom_score_adj_operations),
-@@ -2847,7 +2876,7 @@ retry:
+@@ -2852,7 +2881,7 @@ retry:
iter.task = NULL;
pid = find_ge_pid(iter.tgid, ns);
if (pid) {
iter.task = pid_task(pid, PIDTYPE_PID);
/* What we to know is if the pid we have find is the
* pid of a thread_group_leader. Testing for task
-@@ -2900,8 +2929,10 @@ int proc_pid_readdir(struct file *file,
+@@ -2905,8 +2934,10 @@ int proc_pid_readdir(struct file *file,
if (!has_pid_permissions(ns, iter.task, 2))
continue;
if (!proc_fill_cache(file, ctx, name, len,
proc_pid_instantiate, iter.task, NULL)) {
put_task_struct(iter.task);
-@@ -2994,6 +3025,7 @@ static const struct pid_entry tid_base_s
+@@ -2999,6 +3030,7 @@ static const struct pid_entry tid_base_s
REG("gid_map", S_IRUGO|S_IWUSR, proc_gid_map_operations),
REG("projid_map", S_IRUGO|S_IWUSR, proc_projid_map_operations),
#endif
};
static int proc_tid_base_readdir(struct file *file, struct dir_context *ctx)
-@@ -3060,6 +3092,8 @@ static struct dentry *proc_task_lookup(s
+@@ -3065,6 +3097,8 @@ static struct dentry *proc_task_lookup(s
tid = name_to_int(dentry);
if (tid == ~0U)
goto out;
ns = dentry->d_sb->s_fs_info;
rcu_read_lock();
-diff -NurpP --minimal linux-3.13.10/fs/proc/generic.c linux-3.13.10-vs2.3.6.11/fs/proc/generic.c
---- linux-3.13.10/fs/proc/generic.c 2014-01-22 20:39:07.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/proc/generic.c 2014-02-01 00:07:40.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/proc/generic.c linux-3.14.17-vs2.3.6.13/fs/proc/generic.c
+--- linux-3.14.17/fs/proc/generic.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/proc/generic.c 2014-08-30 14:27:38.000000000 +0000
@@ -23,6 +23,7 @@
#include <linux/bitops.h>
#include <linux/spinlock.h>
#include <asm/uaccess.h>
#include "internal.h"
-@@ -187,6 +188,8 @@ struct dentry *proc_lookup_de(struct pro
+@@ -186,6 +187,8 @@ struct dentry *proc_lookup_de(struct pro
for (de = de->subdir; de ; de = de->next) {
if (de->namelen != dentry->d_name.len)
continue;
if (!memcmp(dentry->d_name.name, de->name, de->namelen)) {
pde_get(de);
spin_unlock(&proc_subdir_lock);
-@@ -195,6 +198,8 @@ struct dentry *proc_lookup_de(struct pro
+@@ -194,6 +197,8 @@ struct dentry *proc_lookup_de(struct pro
return ERR_PTR(-ENOMEM);
d_set_d_op(dentry, &simple_dentry_operations);
d_add(dentry, inode);
return NULL;
}
}
-@@ -242,6 +247,9 @@ int proc_readdir_de(struct proc_dir_entr
+@@ -241,6 +246,9 @@ int proc_readdir_de(struct proc_dir_entr
do {
struct proc_dir_entry *next;
pde_get(de);
spin_unlock(&proc_subdir_lock);
if (!dir_emit(ctx, de->name, de->namelen,
de->low_ino, de->mode >> 12)) {
-@@ -249,6 +257,7 @@ int proc_readdir_de(struct proc_dir_entr
+@@ -248,6 +256,7 @@ int proc_readdir_de(struct proc_dir_entr
return 0;
}
spin_lock(&proc_subdir_lock);
ctx->pos++;
next = de->next;
pde_put(de);
-@@ -355,6 +364,7 @@ static struct proc_dir_entry *__proc_cre
+@@ -354,6 +363,7 @@ static struct proc_dir_entry *__proc_cre
ent->namelen = len;
ent->mode = mode;
ent->nlink = nlink;
atomic_set(&ent->count, 1);
spin_lock_init(&ent->pde_unload_lock);
INIT_LIST_HEAD(&ent->pde_openers);
-@@ -378,7 +388,8 @@ struct proc_dir_entry *proc_symlink(cons
+@@ -377,7 +387,8 @@ struct proc_dir_entry *proc_symlink(cons
kfree(ent->data);
kfree(ent);
ent = NULL;
} else {
kfree(ent);
ent = NULL;
-diff -NurpP --minimal linux-3.13.10/fs/proc/inode.c linux-3.13.10-vs2.3.6.11/fs/proc/inode.c
---- linux-3.13.10/fs/proc/inode.c 2014-01-22 20:39:07.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/proc/inode.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/proc/inode.c linux-3.14.17-vs2.3.6.13/fs/proc/inode.c
+--- linux-3.14.17/fs/proc/inode.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/proc/inode.c 2014-08-30 14:27:38.000000000 +0000
@@ -415,6 +415,8 @@ struct inode *proc_get_inode(struct supe
inode->i_uid = de->uid;
inode->i_gid = de->gid;
if (de->size)
inode->i_size = de->size;
if (de->nlink)
-diff -NurpP --minimal linux-3.13.10/fs/proc/internal.h linux-3.13.10-vs2.3.6.11/fs/proc/internal.h
---- linux-3.13.10/fs/proc/internal.h 2013-11-25 15:45:04.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/proc/internal.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/proc/internal.h linux-3.14.17-vs2.3.6.13/fs/proc/internal.h
+--- linux-3.14.17/fs/proc/internal.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/proc/internal.h 2014-08-30 14:27:38.000000000 +0000
@@ -14,6 +14,7 @@
#include <linux/spinlock.h>
#include <linux/atomic.h>
/*
* base.c
-diff -NurpP --minimal linux-3.13.10/fs/proc/loadavg.c linux-3.13.10-vs2.3.6.11/fs/proc/loadavg.c
---- linux-3.13.10/fs/proc/loadavg.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/proc/loadavg.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/proc/loadavg.c linux-3.14.17-vs2.3.6.13/fs/proc/loadavg.c
+--- linux-3.14.17/fs/proc/loadavg.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/proc/loadavg.c 2014-08-30 14:27:38.000000000 +0000
@@ -12,15 +12,27 @@
static int loadavg_proc_show(struct seq_file *m, void *v)
task_active_pid_ns(current)->last_pid);
return 0;
}
-diff -NurpP --minimal linux-3.13.10/fs/proc/meminfo.c linux-3.13.10-vs2.3.6.11/fs/proc/meminfo.c
---- linux-3.13.10/fs/proc/meminfo.c 2014-01-22 20:39:07.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/proc/meminfo.c 2014-01-31 20:38:03.000000000 +0000
-@@ -37,7 +37,8 @@ static int meminfo_proc_show(struct seq_
+diff -NurpP --minimal linux-3.14.17/fs/proc/meminfo.c linux-3.14.17-vs2.3.6.13/fs/proc/meminfo.c
+--- linux-3.14.17/fs/proc/meminfo.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/proc/meminfo.c 2014-08-30 14:27:38.000000000 +0000
+@@ -41,7 +41,8 @@ static int meminfo_proc_show(struct seq_
si_swapinfo(&i);
committed = percpu_counter_read_positive(&vm_committed_as);
total_swapcache_pages() - i.bufferram;
if (cached < 0)
cached = 0;
-diff -NurpP --minimal linux-3.13.10/fs/proc/root.c linux-3.13.10-vs2.3.6.11/fs/proc/root.c
---- linux-3.13.10/fs/proc/root.c 2013-11-25 15:47:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/proc/root.c 2014-02-01 00:02:11.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/proc/root.c linux-3.14.17-vs2.3.6.13/fs/proc/root.c
+--- linux-3.14.17/fs/proc/root.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/proc/root.c 2014-08-30 14:27:38.000000000 +0000
@@ -20,9 +20,14 @@
#include <linux/mount.h>
#include <linux/pid_namespace.h>
.name = "/proc",
};
-diff -NurpP --minimal linux-3.13.10/fs/proc/self.c linux-3.13.10-vs2.3.6.11/fs/proc/self.c
---- linux-3.13.10/fs/proc/self.c 2014-01-22 20:39:07.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/proc/self.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/proc/self.c linux-3.14.17-vs2.3.6.13/fs/proc/self.c
+--- linux-3.14.17/fs/proc/self.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/proc/self.c 2014-08-30 14:27:38.000000000 +0000
@@ -2,6 +2,7 @@
#include <linux/namei.h>
#include <linux/slab.h>
if (inode) {
inode->i_ino = self_inum;
inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
-diff -NurpP --minimal linux-3.13.10/fs/proc/stat.c linux-3.13.10-vs2.3.6.11/fs/proc/stat.c
---- linux-3.13.10/fs/proc/stat.c 2013-07-14 17:01:29.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/proc/stat.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/proc/stat.c linux-3.14.17-vs2.3.6.13/fs/proc/stat.c
+--- linux-3.14.17/fs/proc/stat.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/proc/stat.c 2014-08-30 14:27:38.000000000 +0000
@@ -9,8 +9,10 @@
#include <linux/slab.h>
#include <linux/time.h>
/* Copy values here to work around gcc-2.95.3, gcc-2.96 */
user = kcpustat_cpu(i).cpustat[CPUTIME_USER];
nice = kcpustat_cpu(i).cpustat[CPUTIME_NICE];
-diff -NurpP --minimal linux-3.13.10/fs/proc/uptime.c linux-3.13.10-vs2.3.6.11/fs/proc/uptime.c
---- linux-3.13.10/fs/proc/uptime.c 2013-11-25 15:45:04.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/proc/uptime.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/proc/uptime.c linux-3.14.17-vs2.3.6.13/fs/proc/uptime.c
+--- linux-3.14.17/fs/proc/uptime.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/proc/uptime.c 2014-08-30 14:27:38.000000000 +0000
@@ -5,6 +5,7 @@
#include <linux/seq_file.h>
#include <linux/time.h>
seq_printf(m, "%lu.%02lu %lu.%02lu\n",
(unsigned long) uptime.tv_sec,
(uptime.tv_nsec / (NSEC_PER_SEC / 100)),
-diff -NurpP --minimal linux-3.13.10/fs/proc_namespace.c linux-3.13.10-vs2.3.6.11/fs/proc_namespace.c
---- linux-3.13.10/fs/proc_namespace.c 2014-01-22 20:39:07.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/proc_namespace.c 2014-02-25 12:43:16.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/proc_namespace.c linux-3.14.17-vs2.3.6.13/fs/proc_namespace.c
+--- linux-3.14.17/fs/proc_namespace.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/proc_namespace.c 2014-08-30 14:27:38.000000000 +0000
@@ -44,6 +44,8 @@ static int show_sb_opts(struct seq_file
{ MS_SYNCHRONOUS, ",sync" },
{ MS_DIRSYNC, ",dirsync" },
/* file system type */
seq_puts(m, "with fstype ");
show_type(m, sb);
-diff -NurpP --minimal linux-3.13.10/fs/quota/dquot.c linux-3.13.10-vs2.3.6.11/fs/quota/dquot.c
---- linux-3.13.10/fs/quota/dquot.c 2014-04-17 01:12:34.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/quota/dquot.c 2014-03-12 15:51:07.000000000 +0000
-@@ -1602,6 +1602,9 @@ int __dquot_alloc_space(struct inode *in
+diff -NurpP --minimal linux-3.14.17/fs/quota/dquot.c linux-3.14.17-vs2.3.6.13/fs/quota/dquot.c
+--- linux-3.14.17/fs/quota/dquot.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/quota/dquot.c 2014-08-30 14:27:38.000000000 +0000
+@@ -1604,6 +1604,9 @@ int __dquot_alloc_space(struct inode *in
struct dquot **dquots = inode->i_dquot;
int reserve = flags & DQUOT_SPACE_RESERVE;
/*
* First test before acquiring mutex - solves deadlocks when we
* re-enter the quota code and are already holding the mutex
-@@ -1657,6 +1660,9 @@ int dquot_alloc_inode(const struct inode
+@@ -1659,6 +1662,9 @@ int dquot_alloc_inode(const struct inode
struct dquot_warn warn[MAXQUOTAS];
struct dquot * const *dquots = inode->i_dquot;
/* First test before acquiring mutex - solves deadlocks when we
* re-enter the quota code and are already holding the mutex */
if (!dquot_active(inode))
-@@ -1757,6 +1763,8 @@ void __dquot_free_space(struct inode *in
+@@ -1759,6 +1765,8 @@ void __dquot_free_space(struct inode *in
struct dquot **dquots = inode->i_dquot;
int reserve = flags & DQUOT_SPACE_RESERVE;
/* First test before acquiring mutex - solves deadlocks when we
* re-enter the quota code and are already holding the mutex */
if (!dquot_active(inode)) {
-@@ -1801,6 +1809,8 @@ void dquot_free_inode(const struct inode
+@@ -1803,6 +1811,8 @@ void dquot_free_inode(const struct inode
struct dquot_warn warn[MAXQUOTAS];
struct dquot * const *dquots = inode->i_dquot;
/* First test before acquiring mutex - solves deadlocks when we
* re-enter the quota code and are already holding the mutex */
if (!dquot_active(inode))
-diff -NurpP --minimal linux-3.13.10/fs/quota/quota.c linux-3.13.10-vs2.3.6.11/fs/quota/quota.c
---- linux-3.13.10/fs/quota/quota.c 2014-01-22 20:39:07.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/quota/quota.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/quota/quota.c linux-3.14.17-vs2.3.6.13/fs/quota/quota.c
+--- linux-3.14.17/fs/quota/quota.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/quota/quota.c 2014-08-30 14:27:38.000000000 +0000
@@ -8,6 +8,7 @@
#include <linux/fs.h>
#include <linux/namei.h>
if (quotactl_cmd_write(cmd))
sb = get_super_thawed(bdev);
else
-diff -NurpP --minimal linux-3.13.10/fs/stat.c linux-3.13.10-vs2.3.6.11/fs/stat.c
---- linux-3.13.10/fs/stat.c 2014-01-22 20:39:07.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/stat.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/stat.c linux-3.14.17-vs2.3.6.13/fs/stat.c
+--- linux-3.14.17/fs/stat.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/stat.c 2014-08-30 14:27:38.000000000 +0000
@@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod
stat->nlink = inode->i_nlink;
stat->uid = inode->i_uid;
stat->rdev = inode->i_rdev;
stat->size = i_size_read(inode);
stat->atime = inode->i_atime;
-diff -NurpP --minimal linux-3.13.10/fs/statfs.c linux-3.13.10-vs2.3.6.11/fs/statfs.c
---- linux-3.13.10/fs/statfs.c 2013-11-25 15:47:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/statfs.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/statfs.c linux-3.14.17-vs2.3.6.13/fs/statfs.c
+--- linux-3.14.17/fs/statfs.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/statfs.c 2014-08-30 14:27:38.000000000 +0000
@@ -7,6 +7,8 @@
#include <linux/statfs.h>
#include <linux/security.h>
return retval;
}
-diff -NurpP --minimal linux-3.13.10/fs/super.c linux-3.13.10-vs2.3.6.11/fs/super.c
---- linux-3.13.10/fs/super.c 2014-01-22 20:39:07.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/super.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/super.c linux-3.14.17-vs2.3.6.13/fs/super.c
+--- linux-3.14.17/fs/super.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/super.c 2014-08-30 14:27:38.000000000 +0000
@@ -34,6 +34,8 @@
#include <linux/cleancache.h>
#include <linux/fsnotify.h>
#include "internal.h"
-@@ -1098,6 +1100,13 @@ mount_fs(struct file_system_type *type,
+@@ -1103,6 +1105,13 @@ mount_fs(struct file_system_type *type,
WARN_ON(sb->s_bdi == &default_backing_dev_info);
sb->s_flags |= MS_BORN;
error = security_sb_kern_mount(sb, flags, secdata);
if (error)
goto out_sb;
-diff -NurpP --minimal linux-3.13.10/fs/kernfs/mount.c linux-3.13.10-vs2.3.6.11/fs/kernfs/mount.c
---- linux-3.13.10/fs/kernfs/mount.c 2013-11-25 15:47:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/kernfs/mount.c 2014-01-31 20:38:03.000000000 +0000
-@@ -48,7 +48,7 @@ static int sysfs_fill_super(struct super
-
- sb->s_blocksize = PAGE_CACHE_SIZE;
- sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
-- sb->s_magic = SYSFS_MAGIC;
-+ sb->s_magic = SYSFS_SUPER_MAGIC;
- sb->s_op = &kernfs_sops;
- sb->s_time_gran = 1;
-
-diff -NurpP --minimal linux-3.13.10/fs/utimes.c linux-3.13.10-vs2.3.6.11/fs/utimes.c
---- linux-3.13.10/fs/utimes.c 2014-01-22 20:39:07.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/utimes.c 2014-01-31 23:49:14.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/utimes.c linux-3.14.17-vs2.3.6.13/fs/utimes.c
+--- linux-3.14.17/fs/utimes.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/utimes.c 2014-08-30 14:27:38.000000000 +0000
@@ -8,6 +8,8 @@
#include <linux/stat.h>
#include <linux/utime.h>
if (times && times[0].tv_nsec == UTIME_NOW &&
times[1].tv_nsec == UTIME_NOW)
times = NULL;
-diff -NurpP --minimal linux-3.13.10/fs/xattr.c linux-3.13.10-vs2.3.6.11/fs/xattr.c
---- linux-3.13.10/fs/xattr.c 2013-02-19 13:58:49.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/fs/xattr.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/fs/xattr.c linux-3.14.17-vs2.3.6.13/fs/xattr.c
+--- linux-3.14.17/fs/xattr.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/fs/xattr.c 2014-08-30 14:27:38.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/audit.h>
#include <linux/vmalloc.h>
return (mask & MAY_WRITE) ? -EPERM : -ENODATA;
return 0;
}
-diff -NurpP --minimal linux-3.13.10/include/linux/cred.h linux-3.13.10-vs2.3.6.11/include/linux/cred.h
---- linux-3.13.10/include/linux/cred.h 2013-02-19 13:58:50.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/cred.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/cred.h linux-3.14.17-vs2.3.6.13/include/linux/cred.h
+--- linux-3.14.17/include/linux/cred.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/cred.h 2014-08-30 14:27:38.000000000 +0000
@@ -143,6 +143,7 @@ extern void exit_creds(struct task_struc
extern int copy_creds(struct task_struct *, unsigned long);
extern const struct cred *get_task_cred(struct task_struct *);
/**
* get_new_cred - Get a reference on a new set of credentials
* @cred: The new credentials to reference
-diff -NurpP --minimal linux-3.13.10/include/linux/devpts_fs.h linux-3.13.10-vs2.3.6.11/include/linux/devpts_fs.h
---- linux-3.13.10/include/linux/devpts_fs.h 2013-02-19 13:58:50.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/devpts_fs.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/devpts_fs.h linux-3.14.17-vs2.3.6.13/include/linux/devpts_fs.h
+--- linux-3.14.17/include/linux/devpts_fs.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/devpts_fs.h 2014-08-30 14:27:38.000000000 +0000
@@ -45,5 +45,4 @@ static inline void devpts_pty_kill(struc
#endif
-
#endif /* _LINUX_DEVPTS_FS_H */
-diff -NurpP --minimal linux-3.13.10/include/linux/fs.h linux-3.13.10-vs2.3.6.11/include/linux/fs.h
---- linux-3.13.10/include/linux/fs.h 2014-01-22 20:39:10.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/fs.h 2014-01-31 23:33:22.000000000 +0000
-@@ -213,6 +213,7 @@ typedef void (dio_iodone_t)(struct kiocb
+diff -NurpP --minimal linux-3.14.17/include/linux/fs.h linux-3.14.17-vs2.3.6.13/include/linux/fs.h
+--- linux-3.14.17/include/linux/fs.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/fs.h 2014-08-30 14:27:38.000000000 +0000
+@@ -216,6 +216,7 @@ typedef void (dio_iodone_t)(struct kiocb
#define ATTR_KILL_PRIV (1 << 14)
#define ATTR_OPEN (1 << 15) /* Truncating from open(O_TRUNC) */
#define ATTR_TIMES_SET (1 << 16)
/*
* This is the Inode Attributes structure, used for notify_change(). It
-@@ -228,6 +229,7 @@ struct iattr {
+@@ -231,6 +232,7 @@ struct iattr {
umode_t ia_mode;
kuid_t ia_uid;
kgid_t ia_gid;
loff_t ia_size;
struct timespec ia_atime;
struct timespec ia_mtime;
-@@ -526,7 +528,9 @@ struct inode {
+@@ -529,7 +531,9 @@ struct inode {
unsigned short i_opflags;
kuid_t i_uid;
kgid_t i_gid;
#ifdef CONFIG_FS_POSIX_ACL
struct posix_acl *i_acl;
-@@ -555,6 +559,7 @@ struct inode {
+@@ -558,6 +562,7 @@ struct inode {
unsigned int __i_nlink;
};
dev_t i_rdev;
loff_t i_size;
struct timespec i_atime;
struct timespec i_mtime;
-@@ -713,6 +718,11 @@ static inline gid_t i_gid_read(const str
+@@ -716,6 +721,11 @@ static inline gid_t i_gid_read(const str
return from_kgid(&init_user_ns, inode->i_gid);
}
static inline void i_uid_write(struct inode *inode, uid_t uid)
{
inode->i_uid = make_kuid(&init_user_ns, uid);
-@@ -723,14 +733,19 @@ static inline void i_gid_write(struct in
+@@ -726,14 +736,19 @@ static inline void i_gid_write(struct in
inode->i_gid = make_kgid(&init_user_ns, gid);
}
}
extern struct block_device *I_BDEV(struct inode *inode);
-@@ -790,6 +805,7 @@ struct file {
+@@ -794,6 +809,7 @@ struct file {
loff_t f_pos;
struct fown_struct f_owner;
const struct cred *f_cred;
struct file_ra_state f_ra;
u64 f_version;
-@@ -962,6 +978,7 @@ struct file_lock {
+@@ -966,6 +982,7 @@ struct file_lock {
struct file *fl_file;
loff_t fl_start;
loff_t fl_end;
struct fasync_struct * fl_fasync; /* for lease break notifications */
/* for lease breaks: */
-@@ -1573,6 +1590,7 @@ struct inode_operations {
+@@ -1577,6 +1594,7 @@ struct inode_operations {
ssize_t (*getxattr) (struct dentry *, const char *, void *, size_t);
ssize_t (*listxattr) (struct dentry *, char *, size_t);
int (*removexattr) (struct dentry *, const char *);
int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start,
u64 len);
int (*update_time)(struct inode *, struct timespec *, int);
-@@ -1586,6 +1604,7 @@ ssize_t rw_copy_check_uvector(int type,
+@@ -1591,6 +1609,7 @@ ssize_t rw_copy_check_uvector(int type,
unsigned long nr_segs, unsigned long fast_segs,
struct iovec *fast_pointer,
struct iovec **ret_pointer);
extern ssize_t vfs_read(struct file *, char __user *, size_t, loff_t *);
extern ssize_t vfs_write(struct file *, const char __user *, size_t, loff_t *);
-@@ -1639,6 +1658,14 @@ struct super_operations {
+@@ -1644,6 +1663,14 @@ struct super_operations {
#define S_IMA 1024 /* Inode has an associated IMA struct */
#define S_AUTOMOUNT 2048 /* Automount/referral quasi-directory */
#define S_NOSEC 4096 /* no suid or xattr security attributes */
/*
* Note that nosuid etc flags are inode-specific: setting some file-system
-@@ -1663,10 +1690,13 @@ struct super_operations {
+@@ -1668,10 +1695,13 @@ struct super_operations {
#define IS_MANDLOCK(inode) __IS_FLG(inode, MS_MANDLOCK)
#define IS_NOATIME(inode) __IS_FLG(inode, MS_RDONLY|MS_NOATIME)
#define IS_I_VERSION(inode) __IS_FLG(inode, MS_I_VERSION)
#define IS_POSIXACL(inode) __IS_FLG(inode, MS_POSIXACL)
#define IS_DEADDIR(inode) ((inode)->i_flags & S_DEAD)
-@@ -1677,6 +1707,16 @@ struct super_operations {
+@@ -1682,6 +1712,16 @@ struct super_operations {
#define IS_AUTOMOUNT(inode) ((inode)->i_flags & S_AUTOMOUNT)
#define IS_NOSEC(inode) ((inode)->i_flags & S_NOSEC)
/*
* Inode state bits. Protected by inode->i_lock
*
-@@ -1920,6 +1960,9 @@ extern struct kobject *fs_kobj;
+@@ -1925,6 +1965,9 @@ extern struct kobject *fs_kobj;
extern int locks_mandatory_locked(struct inode *);
extern int locks_mandatory_area(int, struct inode *, struct file *, loff_t, size_t);
/*
* Candidates for mandatory locking have the setgid bit set
* but no group execute bit - an otherwise meaningless combination.
-@@ -2605,6 +2648,7 @@ extern int dcache_dir_open(struct inode
+@@ -2617,6 +2660,7 @@ extern int dcache_dir_open(struct inode
extern int dcache_dir_close(struct inode *, struct file *);
extern loff_t dcache_dir_lseek(struct file *, loff_t, int);
extern int dcache_readdir(struct file *, struct dir_context *);
extern int simple_setattr(struct dentry *, struct iattr *);
extern int simple_getattr(struct vfsmount *, struct dentry *, struct kstat *);
extern int simple_statfs(struct dentry *, struct kstatfs *);
-diff -NurpP --minimal linux-3.13.10/include/linux/init_task.h linux-3.13.10-vs2.3.6.11/include/linux/init_task.h
---- linux-3.13.10/include/linux/init_task.h 2014-01-22 20:39:11.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/init_task.h 2014-01-31 20:38:03.000000000 +0000
-@@ -222,6 +222,10 @@ extern struct task_group root_task_group
- INIT_TASK_RCU_PREEMPT(tsk) \
+diff -NurpP --minimal linux-3.14.17/include/linux/init_task.h linux-3.14.17-vs2.3.6.13/include/linux/init_task.h
+--- linux-3.14.17/include/linux/init_task.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/init_task.h 2014-08-30 14:27:38.000000000 +0000
+@@ -234,6 +234,10 @@ extern struct task_group root_task_group
INIT_CPUSET_SEQ(tsk) \
+ INIT_RT_MUTEXES(tsk) \
INIT_VTIME(tsk) \
+ .xid = 0, \
+ .vx_info = NULL, \
}
-diff -NurpP --minimal linux-3.13.10/include/linux/ipc.h linux-3.13.10-vs2.3.6.11/include/linux/ipc.h
---- linux-3.13.10/include/linux/ipc.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/ipc.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/ipc.h linux-3.14.17-vs2.3.6.13/include/linux/ipc.h
+--- linux-3.14.17/include/linux/ipc.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/ipc.h 2014-08-30 14:27:38.000000000 +0000
@@ -16,6 +16,7 @@ struct kern_ipc_perm
key_t key;
kuid_t uid;
kuid_t cuid;
kgid_t cgid;
umode_t mode;
-diff -NurpP --minimal linux-3.13.10/include/linux/memcontrol.h linux-3.13.10-vs2.3.6.11/include/linux/memcontrol.h
---- linux-3.13.10/include/linux/memcontrol.h 2013-11-25 15:47:01.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/memcontrol.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/memcontrol.h linux-3.14.17-vs2.3.6.13/include/linux/memcontrol.h
+--- linux-3.14.17/include/linux/memcontrol.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/memcontrol.h 2014-08-30 14:27:38.000000000 +0000
@@ -99,6 +99,13 @@ extern struct mem_cgroup *try_get_mem_cg
extern struct mem_cgroup *parent_mem_cgroup(struct mem_cgroup *memcg);
extern struct mem_cgroup *mem_cgroup_from_css(struct cgroup_subsys_state *css);
static inline
bool mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *memcg)
{
-diff -NurpP --minimal linux-3.13.10/include/linux/mm_types.h linux-3.13.10-vs2.3.6.11/include/linux/mm_types.h
---- linux-3.13.10/include/linux/mm_types.h 2014-01-22 20:39:11.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/mm_types.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/mm_types.h linux-3.14.17-vs2.3.6.13/include/linux/mm_types.h
+--- linux-3.14.17/include/linux/mm_types.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/mm_types.h 2014-08-30 14:27:38.000000000 +0000
@@ -397,6 +397,7 @@ struct mm_struct {
/* Architecture-specific MM context */
unsigned long flags; /* Must use atomic bitops to access the bits */
-diff -NurpP --minimal linux-3.13.10/include/linux/mount.h linux-3.13.10-vs2.3.6.11/include/linux/mount.h
---- linux-3.13.10/include/linux/mount.h 2014-01-22 20:39:11.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/mount.h 2014-01-31 20:38:03.000000000 +0000
-@@ -52,6 +52,9 @@ struct mnt_namespace;
- #define MNT_DOOMED 0x1000000
+diff -NurpP --minimal linux-3.14.17/include/linux/mount.h linux-3.14.17-vs2.3.6.13/include/linux/mount.h
+--- linux-3.14.17/include/linux/mount.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/mount.h 2014-08-30 14:27:38.000000000 +0000
+@@ -55,6 +55,9 @@ struct mnt_namespace;
#define MNT_SYNC_UMOUNT 0x2000000
+ #define MNT_MARKED 0x4000000
+#define MNT_TAGID 0x10000
+#define MNT_NOTAG 0x20000
struct vfsmount {
struct dentry *mnt_root; /* root of the mounted tree */
struct super_block *mnt_sb; /* pointer to superblock */
-diff -NurpP --minimal linux-3.13.10/include/linux/net.h linux-3.13.10-vs2.3.6.11/include/linux/net.h
---- linux-3.13.10/include/linux/net.h 2014-01-22 20:39:11.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/net.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/net.h linux-3.14.17-vs2.3.6.13/include/linux/net.h
+--- linux-3.14.17/include/linux/net.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/net.h 2014-08-30 14:27:38.000000000 +0000
@@ -39,6 +39,7 @@ struct net;
#define SOCK_PASSCRED 3
#define SOCK_PASSSEC 4
#ifndef ARCH_HAS_SOCKET_TYPES
/**
-diff -NurpP --minimal linux-3.13.10/include/linux/netdevice.h linux-3.13.10-vs2.3.6.11/include/linux/netdevice.h
---- linux-3.13.10/include/linux/netdevice.h 2014-04-17 01:12:37.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/netdevice.h 2014-03-12 15:51:07.000000000 +0000
-@@ -1839,6 +1839,7 @@ int init_dummy_netdev(struct net_device
+diff -NurpP --minimal linux-3.14.17/include/linux/netdevice.h linux-3.14.17-vs2.3.6.13/include/linux/netdevice.h
+--- linux-3.14.17/include/linux/netdevice.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/netdevice.h 2014-08-30 14:27:38.000000000 +0000
+@@ -1882,6 +1882,7 @@ int init_dummy_netdev(struct net_device
struct net_device *dev_get_by_index(struct net *net, int ifindex);
struct net_device *__dev_get_by_index(struct net *net, int ifindex);
struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex);
int netdev_get_name(struct net *net, char *name, int ifindex);
int dev_restart(struct net_device *dev);
-diff -NurpP --minimal linux-3.13.10/include/linux/nsproxy.h linux-3.13.10-vs2.3.6.11/include/linux/nsproxy.h
---- linux-3.13.10/include/linux/nsproxy.h 2013-11-25 15:45:06.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/nsproxy.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/nsproxy.h linux-3.14.17-vs2.3.6.13/include/linux/nsproxy.h
+--- linux-3.14.17/include/linux/nsproxy.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/nsproxy.h 2014-08-30 14:27:38.000000000 +0000
@@ -3,6 +3,7 @@
#include <linux/spinlock.h>
}
#endif
-diff -NurpP --minimal linux-3.13.10/include/linux/pid.h linux-3.13.10-vs2.3.6.11/include/linux/pid.h
---- linux-3.13.10/include/linux/pid.h 2013-11-25 15:45:06.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/pid.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/pid.h linux-3.14.17-vs2.3.6.13/include/linux/pid.h
+--- linux-3.14.17/include/linux/pid.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/pid.h 2014-08-30 14:27:38.000000000 +0000
@@ -8,7 +8,8 @@ enum pid_type
PIDTYPE_PID,
PIDTYPE_PGID,
pid_t pid_vnr(struct pid *pid);
#define do_each_pid_task(pid, type, task) \
-diff -NurpP --minimal linux-3.13.10/include/linux/quotaops.h linux-3.13.10-vs2.3.6.11/include/linux/quotaops.h
---- linux-3.13.10/include/linux/quotaops.h 2013-11-25 15:47:02.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/quotaops.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/quotaops.h linux-3.14.17-vs2.3.6.13/include/linux/quotaops.h
+--- linux-3.14.17/include/linux/quotaops.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/quotaops.h 2014-08-30 14:27:38.000000000 +0000
@@ -8,6 +8,7 @@
#define _LINUX_QUOTAOPS_
}
static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
-diff -NurpP --minimal linux-3.13.10/include/linux/sched.h linux-3.13.10-vs2.3.6.11/include/linux/sched.h
---- linux-3.13.10/include/linux/sched.h 2014-01-22 20:39:11.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/sched.h 2014-01-31 20:38:03.000000000 +0000
-@@ -1237,6 +1237,14 @@ struct task_struct {
+diff -NurpP --minimal linux-3.14.17/include/linux/sched.h linux-3.14.17-vs2.3.6.13/include/linux/sched.h
+--- linux-3.14.17/include/linux/sched.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/sched.h 2014-08-30 14:27:38.000000000 +0000
+@@ -1361,6 +1361,14 @@ struct task_struct {
#endif
struct seccomp seccomp;
/* Thread group tracking */
u32 parent_exec_id;
u32 self_exec_id;
-@@ -1531,6 +1539,11 @@ struct pid_namespace;
+@@ -1658,6 +1666,11 @@ struct pid_namespace;
pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
struct pid_namespace *ns);
static inline pid_t task_pid_nr(struct task_struct *tsk)
{
return tsk->pid;
-@@ -1544,7 +1557,8 @@ static inline pid_t task_pid_nr_ns(struc
+@@ -1671,7 +1684,8 @@ static inline pid_t task_pid_nr_ns(struc
static inline pid_t task_pid_vnr(struct task_struct *tsk)
{
}
-@@ -1557,7 +1571,7 @@ pid_t task_tgid_nr_ns(struct task_struct
+@@ -1684,7 +1698,7 @@ pid_t task_tgid_nr_ns(struct task_struct
static inline pid_t task_tgid_vnr(struct task_struct *tsk)
{
}
-diff -NurpP --minimal linux-3.13.10/include/linux/shmem_fs.h linux-3.13.10-vs2.3.6.11/include/linux/shmem_fs.h
---- linux-3.13.10/include/linux/shmem_fs.h 2014-01-22 20:39:11.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/shmem_fs.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/shmem_fs.h linux-3.14.17-vs2.3.6.13/include/linux/shmem_fs.h
+--- linux-3.14.17/include/linux/shmem_fs.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/shmem_fs.h 2014-08-30 14:27:38.000000000 +0000
@@ -9,6 +9,9 @@
/* inode in-kernel data */
struct shmem_inode_info {
spinlock_t lock;
unsigned long flags;
-diff -NurpP --minimal linux-3.13.10/include/linux/stat.h linux-3.13.10-vs2.3.6.11/include/linux/stat.h
---- linux-3.13.10/include/linux/stat.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/stat.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/stat.h linux-3.14.17-vs2.3.6.13/include/linux/stat.h
+--- linux-3.14.17/include/linux/stat.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/stat.h 2014-08-30 14:27:38.000000000 +0000
@@ -25,6 +25,7 @@ struct kstat {
unsigned int nlink;
kuid_t uid;
dev_t rdev;
loff_t size;
struct timespec atime;
-diff -NurpP --minimal linux-3.13.10/include/linux/sunrpc/auth.h linux-3.13.10-vs2.3.6.11/include/linux/sunrpc/auth.h
---- linux-3.13.10/include/linux/sunrpc/auth.h 2013-11-25 15:47:02.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/sunrpc/auth.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/sunrpc/auth.h linux-3.14.17-vs2.3.6.13/include/linux/sunrpc/auth.h
+--- linux-3.14.17/include/linux/sunrpc/auth.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/sunrpc/auth.h 2014-08-30 14:27:38.000000000 +0000
@@ -36,6 +36,7 @@ enum {
struct auth_cred {
kuid_t uid;
struct group_info *group_info;
const char *principal;
unsigned long ac_flags;
-diff -NurpP --minimal linux-3.13.10/include/linux/sunrpc/clnt.h linux-3.13.10-vs2.3.6.11/include/linux/sunrpc/clnt.h
---- linux-3.13.10/include/linux/sunrpc/clnt.h 2014-01-22 20:39:11.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/sunrpc/clnt.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/sunrpc/clnt.h linux-3.14.17-vs2.3.6.13/include/linux/sunrpc/clnt.h
+--- linux-3.14.17/include/linux/sunrpc/clnt.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/sunrpc/clnt.h 2014-08-30 14:27:38.000000000 +0000
@@ -51,7 +51,8 @@ struct rpc_clnt {
cl_discrtry : 1,/* disconnect before retry */
cl_noretranstimeo: 1,/* No retransmit timeouts */
struct rpc_rtt * cl_rtt; /* RTO estimator data */
const struct rpc_timeout *cl_timeout; /* Timeout strategy */
-diff -NurpP --minimal linux-3.13.10/include/linux/sysfs.h linux-3.13.10-vs2.3.6.11/include/linux/sysfs.h
---- linux-3.13.10/include/linux/sysfs.h 2014-01-22 20:39:11.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/sysfs.h 2014-01-31 20:38:03.000000000 +0000
-@@ -20,6 +20,8 @@
- #include <linux/stat.h>
- #include <linux/atomic.h>
-
-+#define SYSFS_SUPER_MAGIC 0x62656572
-+
- struct kobject;
- struct module;
- struct bin_attribute;
-diff -NurpP --minimal linux-3.13.10/include/linux/types.h linux-3.13.10-vs2.3.6.11/include/linux/types.h
---- linux-3.13.10/include/linux/types.h 2013-02-19 13:58:52.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/types.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/types.h linux-3.14.17-vs2.3.6.13/include/linux/types.h
+--- linux-3.14.17/include/linux/types.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/types.h 2014-08-30 14:27:38.000000000 +0000
@@ -32,6 +32,9 @@ typedef __kernel_uid32_t uid_t;
typedef __kernel_gid32_t gid_t;
typedef __kernel_uid16_t uid16_t;
typedef unsigned long uintptr_t;
-diff -NurpP --minimal linux-3.13.10/include/linux/uidgid.h linux-3.13.10-vs2.3.6.11/include/linux/uidgid.h
---- linux-3.13.10/include/linux/uidgid.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/uidgid.h 2014-01-31 20:38:03.000000000 +0000
-@@ -23,13 +23,17 @@ typedef struct {
+diff -NurpP --minimal linux-3.14.17/include/linux/uidgid.h linux-3.14.17-vs2.3.6.13/include/linux/uidgid.h
+--- linux-3.14.17/include/linux/uidgid.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/uidgid.h 2014-08-30 14:32:41.000000000 +0000
+@@ -21,13 +21,17 @@ typedef struct {
uid_t val;
} kuid_t;
static inline uid_t __kuid_val(kuid_t uid)
{
-@@ -41,11 +45,18 @@ static inline gid_t __kgid_val(kgid_t gi
+@@ -39,11 +43,18 @@ static inline gid_t __kgid_val(kgid_t gi
return gid.val;
}
static inline bool uid_eq(kuid_t left, kuid_t right)
{
-@@ -77,6 +95,11 @@ static inline bool gid_eq(kgid_t left, k
+@@ -55,6 +66,11 @@ static inline bool gid_eq(kgid_t left, k
return __kgid_val(left) == __kgid_val(right);
}
static inline bool uid_gt(kuid_t left, kuid_t right)
{
return __kuid_val(left) > __kuid_val(right);
-@@ -127,13 +150,21 @@ static inline bool gid_valid(kgid_t gid)
+@@ -105,13 +121,21 @@ static inline bool gid_valid(kgid_t gid)
return !gid_eq(gid, INVALID_GID);
}
extern uid_t from_kuid_munged(struct user_namespace *to, kuid_t uid);
extern gid_t from_kgid_munged(struct user_namespace *to, kgid_t gid);
-@@ -159,6 +190,11 @@ static inline kgid_t make_kgid(struct us
+@@ -137,6 +161,11 @@ static inline kgid_t make_kgid(struct us
return KGIDT_INIT(gid);
}
static inline uid_t from_kuid(struct user_namespace *to, kuid_t kuid)
{
return __kuid_val(kuid);
-@@ -169,6 +205,11 @@ static inline gid_t from_kgid(struct use
+@@ -147,6 +176,11 @@ static inline gid_t from_kgid(struct use
return __kgid_val(kgid);
}
static inline uid_t from_kuid_munged(struct user_namespace *to, kuid_t kuid)
{
uid_t uid = from_kuid(to, kuid);
-diff -NurpP --minimal linux-3.13.10/include/linux/vroot.h linux-3.13.10-vs2.3.6.11/include/linux/vroot.h
---- linux-3.13.10/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vroot.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vroot.h linux-3.14.17-vs2.3.6.13/include/linux/vroot.h
+--- linux-3.14.17/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vroot.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,51 @@
+
+/*
+#define VROOT_CLR_DEV 0x5601
+
+#endif /* _LINUX_VROOT_H */
-diff -NurpP --minimal linux-3.13.10/include/linux/vs_base.h linux-3.13.10-vs2.3.6.11/include/linux/vs_base.h
---- linux-3.13.10/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vs_base.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vs_base.h linux-3.14.17-vs2.3.6.13/include/linux/vs_base.h
+--- linux-3.14.17/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vs_base.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,10 @@
+#ifndef _VS_BASE_H
+#define _VS_BASE_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.13.10/include/linux/vs_context.h linux-3.13.10-vs2.3.6.11/include/linux/vs_context.h
---- linux-3.13.10/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vs_context.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vs_context.h linux-3.14.17-vs2.3.6.13/include/linux/vs_context.h
+--- linux-3.14.17/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vs_context.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,242 @@
+#ifndef _VS_CONTEXT_H
+#define _VS_CONTEXT_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.13.10/include/linux/vs_cowbl.h linux-3.13.10-vs2.3.6.11/include/linux/vs_cowbl.h
---- linux-3.13.10/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vs_cowbl.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vs_cowbl.h linux-3.14.17-vs2.3.6.13/include/linux/vs_cowbl.h
+--- linux-3.14.17/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vs_cowbl.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,48 @@
+#ifndef _VS_COWBL_H
+#define _VS_COWBL_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.13.10/include/linux/vs_cvirt.h linux-3.13.10-vs2.3.6.11/include/linux/vs_cvirt.h
---- linux-3.13.10/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vs_cvirt.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vs_cvirt.h linux-3.14.17-vs2.3.6.13/include/linux/vs_cvirt.h
+--- linux-3.14.17/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vs_cvirt.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,50 @@
+#ifndef _VS_CVIRT_H
+#define _VS_CVIRT_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.13.10/include/linux/vs_device.h linux-3.13.10-vs2.3.6.11/include/linux/vs_device.h
---- linux-3.13.10/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vs_device.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vs_device.h linux-3.14.17-vs2.3.6.13/include/linux/vs_device.h
+--- linux-3.14.17/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vs_device.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,45 @@
+#ifndef _VS_DEVICE_H
+#define _VS_DEVICE_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.13.10/include/linux/vs_dlimit.h linux-3.13.10-vs2.3.6.11/include/linux/vs_dlimit.h
---- linux-3.13.10/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vs_dlimit.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vs_dlimit.h linux-3.14.17-vs2.3.6.13/include/linux/vs_dlimit.h
+--- linux-3.14.17/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vs_dlimit.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,215 @@
+#ifndef _VS_DLIMIT_H
+#define _VS_DLIMIT_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.13.10/include/linux/vs_inet.h linux-3.13.10-vs2.3.6.11/include/linux/vs_inet.h
---- linux-3.13.10/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vs_inet.h 2014-02-01 00:32:45.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vs_inet.h linux-3.14.17-vs2.3.6.13/include/linux/vs_inet.h
+--- linux-3.14.17/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vs_inet.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,364 @@
+#ifndef _VS_INET_H
+#define _VS_INET_H
+#else
+// #warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.13.10/include/linux/vs_inet6.h linux-3.13.10-vs2.3.6.11/include/linux/vs_inet6.h
---- linux-3.13.10/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vs_inet6.h 2014-02-01 00:35:02.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vs_inet6.h linux-3.14.17-vs2.3.6.13/include/linux/vs_inet6.h
+--- linux-3.14.17/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vs_inet6.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,257 @@
+#ifndef _VS_INET6_H
+#define _VS_INET6_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.13.10/include/linux/vs_limit.h linux-3.13.10-vs2.3.6.11/include/linux/vs_limit.h
---- linux-3.13.10/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vs_limit.h 2014-02-01 01:29:43.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vs_limit.h linux-3.14.17-vs2.3.6.13/include/linux/vs_limit.h
+--- linux-3.14.17/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vs_limit.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,140 @@
+#ifndef _VS_LIMIT_H
+#define _VS_LIMIT_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.13.10/include/linux/vs_network.h linux-3.13.10-vs2.3.6.11/include/linux/vs_network.h
---- linux-3.13.10/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vs_network.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vs_network.h linux-3.14.17-vs2.3.6.13/include/linux/vs_network.h
+--- linux-3.14.17/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vs_network.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,169 @@
+#ifndef _NX_VS_NETWORK_H
+#define _NX_VS_NETWORK_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.13.10/include/linux/vs_pid.h linux-3.13.10-vs2.3.6.11/include/linux/vs_pid.h
---- linux-3.13.10/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vs_pid.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vs_pid.h linux-3.14.17-vs2.3.6.13/include/linux/vs_pid.h
+--- linux-3.14.17/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vs_pid.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,50 @@
+#ifndef _VS_PID_H
+#define _VS_PID_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.13.10/include/linux/vs_sched.h linux-3.13.10-vs2.3.6.11/include/linux/vs_sched.h
---- linux-3.13.10/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vs_sched.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vs_sched.h linux-3.14.17-vs2.3.6.13/include/linux/vs_sched.h
+--- linux-3.14.17/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vs_sched.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,40 @@
+#ifndef _VS_SCHED_H
+#define _VS_SCHED_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.13.10/include/linux/vs_socket.h linux-3.13.10-vs2.3.6.11/include/linux/vs_socket.h
---- linux-3.13.10/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vs_socket.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vs_socket.h linux-3.14.17-vs2.3.6.13/include/linux/vs_socket.h
+--- linux-3.14.17/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vs_socket.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,67 @@
+#ifndef _VS_SOCKET_H
+#define _VS_SOCKET_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.13.10/include/linux/vs_tag.h linux-3.13.10-vs2.3.6.11/include/linux/vs_tag.h
---- linux-3.13.10/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vs_tag.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vs_tag.h linux-3.14.17-vs2.3.6.13/include/linux/vs_tag.h
+--- linux-3.14.17/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vs_tag.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,47 @@
+#ifndef _VS_TAG_H
+#define _VS_TAG_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.13.10/include/linux/vs_time.h linux-3.13.10-vs2.3.6.11/include/linux/vs_time.h
---- linux-3.13.10/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vs_time.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vs_time.h linux-3.14.17-vs2.3.6.13/include/linux/vs_time.h
+--- linux-3.14.17/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vs_time.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,19 @@
+#ifndef _VS_TIME_H
+#define _VS_TIME_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.13.10/include/linux/vserver/base.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/base.h
---- linux-3.13.10/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vserver/base.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vserver/base.h linux-3.14.17-vs2.3.6.13/include/linux/vserver/base.h
+--- linux-3.14.17/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vserver/base.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,184 @@
+#ifndef _VSERVER_BASE_H
+#define _VSERVER_BASE_H
+#define nx_info_state(n, m) (__nx_state(n) & (m))
+
+#endif
-diff -NurpP --minimal linux-3.13.10/include/linux/vserver/cacct.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/cacct.h
---- linux-3.13.10/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vserver/cacct.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vserver/cacct.h linux-3.14.17-vs2.3.6.13/include/linux/vserver/cacct.h
+--- linux-3.14.17/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vserver/cacct.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,15 @@
+#ifndef _VSERVER_CACCT_H
+#define _VSERVER_CACCT_H
+};
+
+#endif /* _VSERVER_CACCT_H */
-diff -NurpP --minimal linux-3.13.10/include/linux/vserver/cacct_cmd.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/cacct_cmd.h
---- linux-3.13.10/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vserver/cacct_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vserver/cacct_cmd.h linux-3.14.17-vs2.3.6.13/include/linux/vserver/cacct_cmd.h
+--- linux-3.14.17/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vserver/cacct_cmd.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,10 @@
+#ifndef _VSERVER_CACCT_CMD_H
+#define _VSERVER_CACCT_CMD_H
+extern int vc_sock_stat(struct vx_info *, void __user *);
+
+#endif /* _VSERVER_CACCT_CMD_H */
-diff -NurpP --minimal linux-3.13.10/include/linux/vserver/cacct_def.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/cacct_def.h
---- linux-3.13.10/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vserver/cacct_def.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vserver/cacct_def.h linux-3.14.17-vs2.3.6.13/include/linux/vserver/cacct_def.h
+--- linux-3.14.17/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vserver/cacct_def.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,43 @@
+#ifndef _VSERVER_CACCT_DEF_H
+#define _VSERVER_CACCT_DEF_H
+#endif
+
+#endif /* _VSERVER_CACCT_DEF_H */
-diff -NurpP --minimal linux-3.13.10/include/linux/vserver/cacct_int.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/cacct_int.h
---- linux-3.13.10/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vserver/cacct_int.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vserver/cacct_int.h linux-3.14.17-vs2.3.6.13/include/linux/vserver/cacct_int.h
+--- linux-3.14.17/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vserver/cacct_int.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,17 @@
+#ifndef _VSERVER_CACCT_INT_H
+#define _VSERVER_CACCT_INT_H
+}
+
+#endif /* _VSERVER_CACCT_INT_H */
-diff -NurpP --minimal linux-3.13.10/include/linux/vserver/check.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/check.h
---- linux-3.13.10/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vserver/check.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vserver/check.h linux-3.14.17-vs2.3.6.13/include/linux/vserver/check.h
+--- linux-3.14.17/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vserver/check.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,89 @@
+#ifndef _VSERVER_CHECK_H
+#define _VSERVER_CHECK_H
+#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1)
+
+#endif
-diff -NurpP --minimal linux-3.13.10/include/linux/vserver/context.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/context.h
---- linux-3.13.10/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vserver/context.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vserver/context.h linux-3.14.17-vs2.3.6.13/include/linux/vserver/context.h
+--- linux-3.14.17/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vserver/context.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,110 @@
+#ifndef _VSERVER_CONTEXT_H
+#define _VSERVER_CONTEXT_H
+
+
+#endif /* _VSERVER_CONTEXT_H */
-diff -NurpP --minimal linux-3.13.10/include/linux/vserver/context_cmd.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/context_cmd.h
---- linux-3.13.10/include/linux/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vserver/context_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vserver/context_cmd.h linux-3.14.17-vs2.3.6.13/include/linux/vserver/context_cmd.h
+--- linux-3.14.17/include/linux/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vserver/context_cmd.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,33 @@
+#ifndef _VSERVER_CONTEXT_CMD_H
+#define _VSERVER_CONTEXT_CMD_H
+extern int vc_set_badness(struct vx_info *, void __user *);
+
+#endif /* _VSERVER_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-3.13.10/include/linux/vserver/cvirt.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/cvirt.h
---- linux-3.13.10/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vserver/cvirt.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vserver/cvirt.h linux-3.14.17-vs2.3.6.13/include/linux/vserver/cvirt.h
+--- linux-3.14.17/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vserver/cvirt.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,18 @@
+#ifndef _VSERVER_CVIRT_H
+#define _VSERVER_CVIRT_H
+int vx_do_syslog(int, char __user *, int);
+
+#endif /* _VSERVER_CVIRT_H */
-diff -NurpP --minimal linux-3.13.10/include/linux/vserver/cvirt_cmd.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/cvirt_cmd.h
---- linux-3.13.10/include/linux/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vserver/cvirt_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vserver/cvirt_cmd.h linux-3.14.17-vs2.3.6.13/include/linux/vserver/cvirt_cmd.h
+--- linux-3.14.17/include/linux/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vserver/cvirt_cmd.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,13 @@
+#ifndef _VSERVER_CVIRT_CMD_H
+#define _VSERVER_CVIRT_CMD_H
+extern int vc_virt_stat(struct vx_info *, void __user *);
+
+#endif /* _VSERVER_CVIRT_CMD_H */
-diff -NurpP --minimal linux-3.13.10/include/linux/vserver/cvirt_def.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/cvirt_def.h
---- linux-3.13.10/include/linux/vserver/cvirt_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vserver/cvirt_def.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vserver/cvirt_def.h linux-3.14.17-vs2.3.6.13/include/linux/vserver/cvirt_def.h
+--- linux-3.14.17/include/linux/vserver/cvirt_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vserver/cvirt_def.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,80 @@
+#ifndef _VSERVER_CVIRT_DEF_H
+#define _VSERVER_CVIRT_DEF_H
+#endif
+
+#endif /* _VSERVER_CVIRT_DEF_H */
-diff -NurpP --minimal linux-3.13.10/include/linux/vserver/debug.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/debug.h
---- linux-3.13.10/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vserver/debug.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vserver/debug.h linux-3.14.17-vs2.3.6.13/include/linux/vserver/debug.h
+--- linux-3.14.17/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vserver/debug.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,146 @@
+#ifndef _VSERVER_DEBUG_H
+#define _VSERVER_DEBUG_H
+
+
+#endif /* _VSERVER_DEBUG_H */
-diff -NurpP --minimal linux-3.13.10/include/linux/vserver/debug_cmd.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/debug_cmd.h
---- linux-3.13.10/include/linux/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vserver/debug_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vserver/debug_cmd.h linux-3.14.17-vs2.3.6.13/include/linux/vserver/debug_cmd.h
+--- linux-3.14.17/include/linux/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vserver/debug_cmd.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,37 @@
+#ifndef _VSERVER_DEBUG_CMD_H
+#define _VSERVER_DEBUG_CMD_H
+#endif /* CONFIG_COMPAT */
+
+#endif /* _VSERVER_DEBUG_CMD_H */
-diff -NurpP --minimal linux-3.13.10/include/linux/vserver/device.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/device.h
---- linux-3.13.10/include/linux/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vserver/device.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vserver/device.h linux-3.14.17-vs2.3.6.13/include/linux/vserver/device.h
+--- linux-3.14.17/include/linux/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vserver/device.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,9 @@
+#ifndef _VSERVER_DEVICE_H
+#define _VSERVER_DEVICE_H
+#else /* _VSERVER_DEVICE_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_DEVICE_H */
-diff -NurpP --minimal linux-3.13.10/include/linux/vserver/device_cmd.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/device_cmd.h
---- linux-3.13.10/include/linux/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vserver/device_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vserver/device_cmd.h linux-3.14.17-vs2.3.6.13/include/linux/vserver/device_cmd.h
+--- linux-3.14.17/include/linux/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vserver/device_cmd.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,31 @@
+#ifndef _VSERVER_DEVICE_CMD_H
+#define _VSERVER_DEVICE_CMD_H
+#endif /* CONFIG_COMPAT */
+
+#endif /* _VSERVER_DEVICE_CMD_H */
-diff -NurpP --minimal linux-3.13.10/include/linux/vserver/device_def.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/device_def.h
---- linux-3.13.10/include/linux/vserver/device_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vserver/device_def.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vserver/device_def.h linux-3.14.17-vs2.3.6.13/include/linux/vserver/device_def.h
+--- linux-3.14.17/include/linux/vserver/device_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vserver/device_def.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,17 @@
+#ifndef _VSERVER_DEVICE_DEF_H
+#define _VSERVER_DEVICE_DEF_H
+};
+
+#endif /* _VSERVER_DEVICE_DEF_H */
-diff -NurpP --minimal linux-3.13.10/include/linux/vserver/dlimit.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/dlimit.h
---- linux-3.13.10/include/linux/vserver/dlimit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vserver/dlimit.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vserver/dlimit.h linux-3.14.17-vs2.3.6.13/include/linux/vserver/dlimit.h
+--- linux-3.14.17/include/linux/vserver/dlimit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vserver/dlimit.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,54 @@
+#ifndef _VSERVER_DLIMIT_H
+#define _VSERVER_DLIMIT_H
+#else /* _VSERVER_DLIMIT_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_DLIMIT_H */
-diff -NurpP --minimal linux-3.13.10/include/linux/vserver/dlimit_cmd.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/dlimit_cmd.h
---- linux-3.13.10/include/linux/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vserver/dlimit_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vserver/dlimit_cmd.h linux-3.14.17-vs2.3.6.13/include/linux/vserver/dlimit_cmd.h
+--- linux-3.14.17/include/linux/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vserver/dlimit_cmd.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,46 @@
+#ifndef _VSERVER_DLIMIT_CMD_H
+#define _VSERVER_DLIMIT_CMD_H
+#endif /* CONFIG_COMPAT */
+
+#endif /* _VSERVER_DLIMIT_CMD_H */
-diff -NurpP --minimal linux-3.13.10/include/linux/vserver/global.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/global.h
---- linux-3.13.10/include/linux/vserver/global.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vserver/global.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vserver/global.h linux-3.14.17-vs2.3.6.13/include/linux/vserver/global.h
+--- linux-3.14.17/include/linux/vserver/global.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vserver/global.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,19 @@
+#ifndef _VSERVER_GLOBAL_H
+#define _VSERVER_GLOBAL_H
+
+
+#endif /* _VSERVER_GLOBAL_H */
-diff -NurpP --minimal linux-3.13.10/include/linux/vserver/history.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/history.h
---- linux-3.13.10/include/linux/vserver/history.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vserver/history.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vserver/history.h linux-3.14.17-vs2.3.6.13/include/linux/vserver/history.h
+--- linux-3.14.17/include/linux/vserver/history.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vserver/history.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,197 @@
+#ifndef _VSERVER_HISTORY_H
+#define _VSERVER_HISTORY_H
+#endif /* CONFIG_VSERVER_HISTORY */
+
+#endif /* _VSERVER_HISTORY_H */
-diff -NurpP --minimal linux-3.13.10/include/linux/vserver/inode.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/inode.h
---- linux-3.13.10/include/linux/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vserver/inode.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vserver/inode.h linux-3.14.17-vs2.3.6.13/include/linux/vserver/inode.h
+--- linux-3.14.17/include/linux/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vserver/inode.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,19 @@
+#ifndef _VSERVER_INODE_H
+#define _VSERVER_INODE_H
+#else /* _VSERVER_INODE_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_INODE_H */
-diff -NurpP --minimal linux-3.13.10/include/linux/vserver/inode_cmd.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/inode_cmd.h
---- linux-3.13.10/include/linux/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vserver/inode_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vserver/inode_cmd.h linux-3.14.17-vs2.3.6.13/include/linux/vserver/inode_cmd.h
+--- linux-3.14.17/include/linux/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vserver/inode_cmd.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,36 @@
+#ifndef _VSERVER_INODE_CMD_H
+#define _VSERVER_INODE_CMD_H
+#endif /* CONFIG_COMPAT */
+
+#endif /* _VSERVER_INODE_CMD_H */
-diff -NurpP --minimal linux-3.13.10/include/linux/vserver/limit.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/limit.h
---- linux-3.13.10/include/linux/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vserver/limit.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vserver/limit.h linux-3.14.17-vs2.3.6.13/include/linux/vserver/limit.h
+--- linux-3.14.17/include/linux/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vserver/limit.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,61 @@
+#ifndef _VSERVER_LIMIT_H
+#define _VSERVER_LIMIT_H
+#define NUM_LIMITS 24
+
+#endif /* _VSERVER_LIMIT_H */
-diff -NurpP --minimal linux-3.13.10/include/linux/vserver/limit_cmd.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/limit_cmd.h
---- linux-3.13.10/include/linux/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vserver/limit_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vserver/limit_cmd.h linux-3.14.17-vs2.3.6.13/include/linux/vserver/limit_cmd.h
+--- linux-3.14.17/include/linux/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vserver/limit_cmd.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,35 @@
+#ifndef _VSERVER_LIMIT_CMD_H
+#define _VSERVER_LIMIT_CMD_H
+#endif /* CONFIG_IA32_EMULATION */
+
+#endif /* _VSERVER_LIMIT_CMD_H */
-diff -NurpP --minimal linux-3.13.10/include/linux/vserver/limit_def.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/limit_def.h
---- linux-3.13.10/include/linux/vserver/limit_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vserver/limit_def.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vserver/limit_def.h linux-3.14.17-vs2.3.6.13/include/linux/vserver/limit_def.h
+--- linux-3.14.17/include/linux/vserver/limit_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vserver/limit_def.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,47 @@
+#ifndef _VSERVER_LIMIT_DEF_H
+#define _VSERVER_LIMIT_DEF_H
+#endif
+
+#endif /* _VSERVER_LIMIT_DEF_H */
-diff -NurpP --minimal linux-3.13.10/include/linux/vserver/limit_int.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/limit_int.h
---- linux-3.13.10/include/linux/vserver/limit_int.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vserver/limit_int.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vserver/limit_int.h linux-3.14.17-vs2.3.6.13/include/linux/vserver/limit_int.h
+--- linux-3.14.17/include/linux/vserver/limit_int.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vserver/limit_int.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,193 @@
+#ifndef _VSERVER_LIMIT_INT_H
+#define _VSERVER_LIMIT_INT_H
+
+
+#endif /* _VSERVER_LIMIT_INT_H */
-diff -NurpP --minimal linux-3.13.10/include/linux/vserver/monitor.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/monitor.h
---- linux-3.13.10/include/linux/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vserver/monitor.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vserver/monitor.h linux-3.14.17-vs2.3.6.13/include/linux/vserver/monitor.h
+--- linux-3.14.17/include/linux/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vserver/monitor.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,6 @@
+#ifndef _VSERVER_MONITOR_H
+#define _VSERVER_MONITOR_H
+#include <uapi/vserver/monitor.h>
+
+#endif /* _VSERVER_MONITOR_H */
-diff -NurpP --minimal linux-3.13.10/include/linux/vserver/network.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/network.h
---- linux-3.13.10/include/linux/vserver/network.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vserver/network.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vserver/network.h linux-3.14.17-vs2.3.6.13/include/linux/vserver/network.h
+--- linux-3.14.17/include/linux/vserver/network.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vserver/network.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,76 @@
+#ifndef _VSERVER_NETWORK_H
+#define _VSERVER_NETWORK_H
+#endif
+
+#endif /* _VSERVER_NETWORK_H */
-diff -NurpP --minimal linux-3.13.10/include/linux/vserver/network_cmd.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/network_cmd.h
---- linux-3.13.10/include/linux/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vserver/network_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vserver/network_cmd.h linux-3.14.17-vs2.3.6.13/include/linux/vserver/network_cmd.h
+--- linux-3.14.17/include/linux/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vserver/network_cmd.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,37 @@
+#ifndef _VSERVER_NETWORK_CMD_H
+#define _VSERVER_NETWORK_CMD_H
+extern int vc_set_ncaps(struct nx_info *, void __user *);
+
+#endif /* _VSERVER_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-3.13.10/include/linux/vserver/percpu.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/percpu.h
---- linux-3.13.10/include/linux/vserver/percpu.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vserver/percpu.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vserver/percpu.h linux-3.14.17-vs2.3.6.13/include/linux/vserver/percpu.h
+--- linux-3.14.17/include/linux/vserver/percpu.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vserver/percpu.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,14 @@
+#ifndef _VSERVER_PERCPU_H
+#define _VSERVER_PERCPU_H
+#define PERCPU_PERCTX (sizeof(struct _vx_percpu))
+
+#endif /* _VSERVER_PERCPU_H */
-diff -NurpP --minimal linux-3.13.10/include/linux/vserver/pid.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/pid.h
---- linux-3.13.10/include/linux/vserver/pid.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vserver/pid.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vserver/pid.h linux-3.14.17-vs2.3.6.13/include/linux/vserver/pid.h
+--- linux-3.14.17/include/linux/vserver/pid.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vserver/pid.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,51 @@
+#ifndef _VSERVER_PID_H
+#define _VSERVER_PID_H
+}
+
+#endif
-diff -NurpP --minimal linux-3.13.10/include/linux/vserver/sched.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/sched.h
---- linux-3.13.10/include/linux/vserver/sched.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vserver/sched.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vserver/sched.h linux-3.14.17-vs2.3.6.13/include/linux/vserver/sched.h
+--- linux-3.14.17/include/linux/vserver/sched.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vserver/sched.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,23 @@
+#ifndef _VSERVER_SCHED_H
+#define _VSERVER_SCHED_H
+#else /* _VSERVER_SCHED_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_SCHED_H */
-diff -NurpP --minimal linux-3.13.10/include/linux/vserver/sched_cmd.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/sched_cmd.h
---- linux-3.13.10/include/linux/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vserver/sched_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vserver/sched_cmd.h linux-3.14.17-vs2.3.6.13/include/linux/vserver/sched_cmd.h
+--- linux-3.14.17/include/linux/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vserver/sched_cmd.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,11 @@
+#ifndef _VSERVER_SCHED_CMD_H
+#define _VSERVER_SCHED_CMD_H
+extern int vc_get_prio_bias(struct vx_info *, void __user *);
+
+#endif /* _VSERVER_SCHED_CMD_H */
-diff -NurpP --minimal linux-3.13.10/include/linux/vserver/sched_def.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/sched_def.h
---- linux-3.13.10/include/linux/vserver/sched_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vserver/sched_def.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vserver/sched_def.h linux-3.14.17-vs2.3.6.13/include/linux/vserver/sched_def.h
+--- linux-3.14.17/include/linux/vserver/sched_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vserver/sched_def.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,38 @@
+#ifndef _VSERVER_SCHED_DEF_H
+#define _VSERVER_SCHED_DEF_H
+#endif
+
+#endif /* _VSERVER_SCHED_DEF_H */
-diff -NurpP --minimal linux-3.13.10/include/linux/vserver/signal.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/signal.h
---- linux-3.13.10/include/linux/vserver/signal.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vserver/signal.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vserver/signal.h linux-3.14.17-vs2.3.6.13/include/linux/vserver/signal.h
+--- linux-3.14.17/include/linux/vserver/signal.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vserver/signal.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,14 @@
+#ifndef _VSERVER_SIGNAL_H
+#define _VSERVER_SIGNAL_H
+#else /* _VSERVER_SIGNAL_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_SIGNAL_H */
-diff -NurpP --minimal linux-3.13.10/include/linux/vserver/signal_cmd.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/signal_cmd.h
---- linux-3.13.10/include/linux/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vserver/signal_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vserver/signal_cmd.h linux-3.14.17-vs2.3.6.13/include/linux/vserver/signal_cmd.h
+--- linux-3.14.17/include/linux/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vserver/signal_cmd.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,14 @@
+#ifndef _VSERVER_SIGNAL_CMD_H
+#define _VSERVER_SIGNAL_CMD_H
+extern int vc_set_pflags(uint32_t pid, void __user *);
+
+#endif /* _VSERVER_SIGNAL_CMD_H */
-diff -NurpP --minimal linux-3.13.10/include/linux/vserver/space.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/space.h
---- linux-3.13.10/include/linux/vserver/space.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vserver/space.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vserver/space.h linux-3.14.17-vs2.3.6.13/include/linux/vserver/space.h
+--- linux-3.14.17/include/linux/vserver/space.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vserver/space.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,12 @@
+#ifndef _VSERVER_SPACE_H
+#define _VSERVER_SPACE_H
+#else /* _VSERVER_SPACE_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_SPACE_H */
-diff -NurpP --minimal linux-3.13.10/include/linux/vserver/space_cmd.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/space_cmd.h
---- linux-3.13.10/include/linux/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vserver/space_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vserver/space_cmd.h linux-3.14.17-vs2.3.6.13/include/linux/vserver/space_cmd.h
+--- linux-3.14.17/include/linux/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vserver/space_cmd.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,13 @@
+#ifndef _VSERVER_SPACE_CMD_H
+#define _VSERVER_SPACE_CMD_H
+extern int vc_get_space_mask(void __user *, int);
+
+#endif /* _VSERVER_SPACE_CMD_H */
-diff -NurpP --minimal linux-3.13.10/include/linux/vserver/switch.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/switch.h
---- linux-3.13.10/include/linux/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vserver/switch.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vserver/switch.h linux-3.14.17-vs2.3.6.13/include/linux/vserver/switch.h
+--- linux-3.14.17/include/linux/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vserver/switch.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,8 @@
+#ifndef _VSERVER_SWITCH_H
+#define _VSERVER_SWITCH_H
+#include <uapi/vserver/switch.h>
+
+#endif /* _VSERVER_SWITCH_H */
-diff -NurpP --minimal linux-3.13.10/include/linux/vserver/tag.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/tag.h
---- linux-3.13.10/include/linux/vserver/tag.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vserver/tag.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vserver/tag.h linux-3.14.17-vs2.3.6.13/include/linux/vserver/tag.h
+--- linux-3.14.17/include/linux/vserver/tag.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vserver/tag.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,160 @@
+#ifndef _DX_TAG_H
+#define _DX_TAG_H
+#endif
+
+#endif /* _DX_TAG_H */
-diff -NurpP --minimal linux-3.13.10/include/linux/vserver/tag_cmd.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/tag_cmd.h
---- linux-3.13.10/include/linux/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/linux/vserver/tag_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/linux/vserver/tag_cmd.h linux-3.14.17-vs2.3.6.13/include/linux/vserver/tag_cmd.h
+--- linux-3.14.17/include/linux/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/linux/vserver/tag_cmd.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,10 @@
+#ifndef _VSERVER_TAG_CMD_H
+#define _VSERVER_TAG_CMD_H
+extern int vc_tag_migrate(uint32_t);
+
+#endif /* _VSERVER_TAG_CMD_H */
-diff -NurpP --minimal linux-3.13.10/include/net/addrconf.h linux-3.13.10-vs2.3.6.11/include/net/addrconf.h
---- linux-3.13.10/include/net/addrconf.h 2013-11-25 15:47:02.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/net/addrconf.h 2014-01-31 20:39:35.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/net/addrconf.h linux-3.14.17-vs2.3.6.13/include/net/addrconf.h
+--- linux-3.14.17/include/net/addrconf.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/net/addrconf.h 2014-08-30 14:27:38.000000000 +0000
@@ -79,7 +79,7 @@ struct inet6_ifaddr *ipv6_get_ifaddr(str
int ipv6_dev_get_saddr(struct net *net, const struct net_device *dev,
- struct in6_addr *saddr);
+ struct in6_addr *saddr, struct nx_info *nxi);
int __ipv6_get_lladdr(struct inet6_dev *idev, struct in6_addr *addr,
- unsigned char banned_flags);
+ u32 banned_flags);
int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr,
-diff -NurpP --minimal linux-3.13.10/include/net/af_unix.h linux-3.13.10-vs2.3.6.11/include/net/af_unix.h
---- linux-3.13.10/include/net/af_unix.h 2013-11-25 15:47:02.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/net/af_unix.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/net/af_unix.h linux-3.14.17-vs2.3.6.13/include/net/af_unix.h
+--- linux-3.14.17/include/net/af_unix.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/net/af_unix.h 2014-08-30 14:27:38.000000000 +0000
@@ -4,6 +4,7 @@
#include <linux/socket.h>
#include <linux/un.h>
#include <net/sock.h>
void unix_inflight(struct file *fp);
-diff -NurpP --minimal linux-3.13.10/include/net/inet_timewait_sock.h linux-3.13.10-vs2.3.6.11/include/net/inet_timewait_sock.h
---- linux-3.13.10/include/net/inet_timewait_sock.h 2014-01-22 20:39:11.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/net/inet_timewait_sock.h 2014-01-31 20:40:30.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/net/inet_timewait_sock.h linux-3.14.17-vs2.3.6.13/include/net/inet_timewait_sock.h
+--- linux-3.14.17/include/net/inet_timewait_sock.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/net/inet_timewait_sock.h 2014-08-30 14:27:38.000000000 +0000
@@ -121,6 +121,10 @@ struct inet_timewait_sock {
#define tw_v6_rcv_saddr __tw_common.skc_v6_rcv_saddr
#define tw_dport __tw_common.skc_dport
int tw_timeout;
volatile unsigned char tw_substate;
-diff -NurpP --minimal linux-3.13.10/include/net/ip6_route.h linux-3.13.10-vs2.3.6.11/include/net/ip6_route.h
---- linux-3.13.10/include/net/ip6_route.h 2014-01-22 20:39:11.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/net/ip6_route.h 2014-01-31 20:41:10.000000000 +0000
-@@ -90,7 +90,7 @@ int ip6_del_rt(struct rt6_info *);
+diff -NurpP --minimal linux-3.14.17/include/net/ip6_route.h linux-3.14.17-vs2.3.6.13/include/net/ip6_route.h
+--- linux-3.14.17/include/net/ip6_route.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/net/ip6_route.h 2014-08-30 14:27:38.000000000 +0000
+@@ -75,7 +75,7 @@ int ip6_del_rt(struct rt6_info *);
int ip6_route_get_saddr(struct net *net, struct rt6_info *rt,
const struct in6_addr *daddr, unsigned int prefs,
struct rt6_info *rt6_lookup(struct net *net, const struct in6_addr *daddr,
const struct in6_addr *saddr, int oif, int flags);
-diff -NurpP --minimal linux-3.13.10/include/net/route.h linux-3.13.10-vs2.3.6.11/include/net/route.h
---- linux-3.13.10/include/net/route.h 2014-01-22 20:39:12.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/net/route.h 2014-02-01 12:30:58.000000000 +0000
-@@ -203,6 +203,9 @@ static inline void ip_rt_put(struct rtab
+diff -NurpP --minimal linux-3.14.17/include/net/route.h linux-3.14.17-vs2.3.6.13/include/net/route.h
+--- linux-3.14.17/include/net/route.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/net/route.h 2014-08-30 14:28:51.000000000 +0000
+@@ -206,6 +206,9 @@ static inline void ip_rt_put(struct rtab
dst_release(&rt->dst);
}
#define IPTOS_RT_MASK (IPTOS_TOS_MASK & ~3)
extern const __u8 ip_tos2prio[16];
-@@ -252,6 +255,9 @@ static inline void ip_route_connect_init
+@@ -253,6 +256,9 @@ static inline void ip_route_connect_init
protocol, flow_flags, dst, src, dport, sport);
}
static inline struct rtable *ip_route_connect(struct flowi4 *fl4,
__be32 dst, __be32 src, u32 tos,
int oif, u8 protocol,
-@@ -260,11 +266,25 @@ static inline struct rtable *ip_route_co
+@@ -261,11 +267,25 @@ static inline struct rtable *ip_route_co
{
struct net *net = sock_net(sk);
struct rtable *rt;
rt = __ip_route_output_key(net, fl4);
if (IS_ERR(rt))
return rt;
-diff -NurpP --minimal linux-3.13.10/include/net/sock.h linux-3.13.10-vs2.3.6.11/include/net/sock.h
---- linux-3.13.10/include/net/sock.h 2014-04-17 01:12:39.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/net/sock.h 2014-04-17 01:17:10.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/net/sock.h linux-3.14.17-vs2.3.6.13/include/net/sock.h
+--- linux-3.14.17/include/net/sock.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/net/sock.h 2014-08-30 14:27:38.000000000 +0000
@@ -191,6 +191,10 @@ struct sock_common {
#ifdef CONFIG_NET_NS
struct net *skc_net;
socket_lock_t sk_lock;
struct sk_buff_head sk_receive_queue;
-diff -NurpP --minimal linux-3.13.10/include/uapi/Kbuild linux-3.13.10-vs2.3.6.11/include/uapi/Kbuild
---- linux-3.13.10/include/uapi/Kbuild 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/uapi/Kbuild 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/uapi/Kbuild linux-3.14.17-vs2.3.6.13/include/uapi/Kbuild
+--- linux-3.14.17/include/uapi/Kbuild 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/uapi/Kbuild 2014-08-30 14:27:38.000000000 +0000
@@ -12,3 +12,4 @@ header-y += video/
header-y += drm/
header-y += xen/
header-y += scsi/
+header-y += vserver/
-diff -NurpP --minimal linux-3.13.10/include/uapi/linux/capability.h linux-3.13.10-vs2.3.6.11/include/uapi/linux/capability.h
---- linux-3.13.10/include/uapi/linux/capability.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/uapi/linux/capability.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/uapi/linux/capability.h linux-3.14.17-vs2.3.6.13/include/uapi/linux/capability.h
+--- linux-3.14.17/include/uapi/linux/capability.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/uapi/linux/capability.h 2014-08-30 14:27:38.000000000 +0000
@@ -259,6 +259,7 @@ struct vfs_cap_data {
arbitrary SCSI commands */
/* Allow setting encryption key on loopback filesystem */
/*
* Bit location of each capability (used by user-space library and kernel)
-diff -NurpP --minimal linux-3.13.10/include/uapi/linux/fs.h linux-3.13.10-vs2.3.6.11/include/uapi/linux/fs.h
---- linux-3.13.10/include/uapi/linux/fs.h 2013-11-25 15:47:02.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/uapi/linux/fs.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/uapi/linux/fs.h linux-3.14.17-vs2.3.6.13/include/uapi/linux/fs.h
+--- linux-3.14.17/include/uapi/linux/fs.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/uapi/linux/fs.h 2014-08-30 14:27:38.000000000 +0000
@@ -86,6 +86,9 @@ struct inodes_stat_t {
#define MS_KERNMOUNT (1<<22) /* this is a kern_mount call */
#define MS_I_VERSION (1<<23) /* Update inode I_version field */
#define SYNC_FILE_RANGE_WAIT_BEFORE 1
#define SYNC_FILE_RANGE_WRITE 2
-diff -NurpP --minimal linux-3.13.10/include/uapi/linux/gfs2_ondisk.h linux-3.13.10-vs2.3.6.11/include/uapi/linux/gfs2_ondisk.h
---- linux-3.13.10/include/uapi/linux/gfs2_ondisk.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/uapi/linux/gfs2_ondisk.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/uapi/linux/gfs2_ondisk.h linux-3.14.17-vs2.3.6.13/include/uapi/linux/gfs2_ondisk.h
+--- linux-3.14.17/include/uapi/linux/gfs2_ondisk.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/uapi/linux/gfs2_ondisk.h 2014-08-30 14:27:38.000000000 +0000
@@ -225,6 +225,9 @@ enum {
gfs2fl_Sync = 8,
gfs2fl_System = 9,
#define GFS2_DIF_TRUNC_IN_PROG 0x20000000 /* New in gfs2 */
#define GFS2_DIF_INHERIT_DIRECTIO 0x40000000 /* only in gfs1 */
#define GFS2_DIF_INHERIT_JDATA 0x80000000
-diff -NurpP --minimal linux-3.13.10/include/uapi/linux/if_tun.h linux-3.13.10-vs2.3.6.11/include/uapi/linux/if_tun.h
---- linux-3.13.10/include/uapi/linux/if_tun.h 2013-11-25 15:47:02.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/uapi/linux/if_tun.h 2014-01-31 20:45:49.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/uapi/linux/if_tun.h linux-3.14.17-vs2.3.6.13/include/uapi/linux/if_tun.h
+--- linux-3.14.17/include/uapi/linux/if_tun.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/uapi/linux/if_tun.h 2014-08-30 14:27:38.000000000 +0000
@@ -58,6 +58,7 @@
#define TUNSETQUEUE _IOW('T', 217, int)
#define TUNSETIFINDEX _IOW('T', 218, unsigned int)
/* TUNSETIFF ifr flags */
#define IFF_TUN 0x0001
-diff -NurpP --minimal linux-3.13.10/include/uapi/linux/major.h linux-3.13.10-vs2.3.6.11/include/uapi/linux/major.h
---- linux-3.13.10/include/uapi/linux/major.h 2014-01-22 20:39:12.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/uapi/linux/major.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/uapi/linux/major.h linux-3.14.17-vs2.3.6.13/include/uapi/linux/major.h
+--- linux-3.14.17/include/uapi/linux/major.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/uapi/linux/major.h 2014-08-30 14:27:38.000000000 +0000
@@ -15,6 +15,7 @@
#define HD_MAJOR IDE0_MAJOR
#define PTY_SLAVE_MAJOR 3
#define TTYAUX_MAJOR 5
#define LP_MAJOR 6
#define VCS_MAJOR 7
-diff -NurpP --minimal linux-3.13.10/include/uapi/linux/nfs_mount.h linux-3.13.10-vs2.3.6.11/include/uapi/linux/nfs_mount.h
---- linux-3.13.10/include/uapi/linux/nfs_mount.h 2014-01-22 20:39:12.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/uapi/linux/nfs_mount.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/uapi/linux/nfs_mount.h linux-3.14.17-vs2.3.6.13/include/uapi/linux/nfs_mount.h
+--- linux-3.14.17/include/uapi/linux/nfs_mount.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/uapi/linux/nfs_mount.h 2014-08-30 14:27:38.000000000 +0000
@@ -63,7 +63,8 @@ struct nfs_mount_data {
#define NFS_MOUNT_SECFLAVOUR 0x2000 /* 5 non-text parsed mount data only */
#define NFS_MOUNT_NORDIRPLUS 0x4000 /* 5 */
/* The following are for internal use only */
#define NFS_MOUNT_LOOKUP_CACHE_NONEG 0x10000
-diff -NurpP --minimal linux-3.13.10/include/uapi/linux/reboot.h linux-3.13.10-vs2.3.6.11/include/uapi/linux/reboot.h
---- linux-3.13.10/include/uapi/linux/reboot.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/uapi/linux/reboot.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/uapi/linux/reboot.h linux-3.14.17-vs2.3.6.13/include/uapi/linux/reboot.h
+--- linux-3.14.17/include/uapi/linux/reboot.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/uapi/linux/reboot.h 2014-08-30 14:27:38.000000000 +0000
@@ -33,7 +33,7 @@
#define LINUX_REBOOT_CMD_RESTART2 0xA1B2C3D4
#define LINUX_REBOOT_CMD_SW_SUSPEND 0xD000FCE2
#endif /* _UAPI_LINUX_REBOOT_H */
-diff -NurpP --minimal linux-3.13.10/include/uapi/linux/sysctl.h linux-3.13.10-vs2.3.6.11/include/uapi/linux/sysctl.h
---- linux-3.13.10/include/uapi/linux/sysctl.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/uapi/linux/sysctl.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/uapi/linux/sysctl.h linux-3.14.17-vs2.3.6.13/include/uapi/linux/sysctl.h
+--- linux-3.14.17/include/uapi/linux/sysctl.h 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/uapi/linux/sysctl.h 2014-08-30 14:27:38.000000000 +0000
@@ -60,6 +60,7 @@ enum
CTL_ABI=9, /* Binary emulation */
CTL_CPU=10, /* CPU stuff (speed scaling, etc) */
KERN_SPARC_REBOOT=21, /* reboot command on Sparc */
KERN_CTLALTDEL=22, /* int: allow ctl-alt-del to reboot */
-diff -NurpP --minimal linux-3.13.10/include/uapi/vserver/Kbuild linux-3.13.10-vs2.3.6.11/include/uapi/vserver/Kbuild
---- linux-3.13.10/include/uapi/vserver/Kbuild 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/uapi/vserver/Kbuild 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/uapi/vserver/Kbuild linux-3.14.17-vs2.3.6.13/include/uapi/vserver/Kbuild
+--- linux-3.14.17/include/uapi/vserver/Kbuild 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/uapi/vserver/Kbuild 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,9 @@
+
+header-y += context_cmd.h network_cmd.h space_cmd.h \
+header-y += switch.h context.h network.h monitor.h \
+ limit.h inode.h device.h
+
-diff -NurpP --minimal linux-3.13.10/include/uapi/vserver/cacct_cmd.h linux-3.13.10-vs2.3.6.11/include/uapi/vserver/cacct_cmd.h
---- linux-3.13.10/include/uapi/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/uapi/vserver/cacct_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/uapi/vserver/cacct_cmd.h linux-3.14.17-vs2.3.6.13/include/uapi/vserver/cacct_cmd.h
+--- linux-3.14.17/include/uapi/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/uapi/vserver/cacct_cmd.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,15 @@
+#ifndef _UAPI_VS_CACCT_CMD_H
+#define _UAPI_VS_CACCT_CMD_H
+};
+
+#endif /* _UAPI_VS_CACCT_CMD_H */
-diff -NurpP --minimal linux-3.13.10/include/uapi/vserver/context.h linux-3.13.10-vs2.3.6.11/include/uapi/vserver/context.h
---- linux-3.13.10/include/uapi/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/uapi/vserver/context.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/uapi/vserver/context.h linux-3.14.17-vs2.3.6.13/include/uapi/vserver/context.h
+--- linux-3.14.17/include/uapi/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/uapi/vserver/context.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,81 @@
+#ifndef _UAPI_VS_CONTEXT_H
+#define _UAPI_VS_CONTEXT_H
+#define VXC_NAMESPACE 0x02000000
+
+#endif /* _UAPI_VS_CONTEXT_H */
-diff -NurpP --minimal linux-3.13.10/include/uapi/vserver/context_cmd.h linux-3.13.10-vs2.3.6.11/include/uapi/vserver/context_cmd.h
---- linux-3.13.10/include/uapi/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/uapi/vserver/context_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/uapi/vserver/context_cmd.h linux-3.14.17-vs2.3.6.13/include/uapi/vserver/context_cmd.h
+--- linux-3.14.17/include/uapi/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/uapi/vserver/context_cmd.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,115 @@
+#ifndef _UAPI_VS_CONTEXT_CMD_H
+#define _UAPI_VS_CONTEXT_CMD_H
+};
+
+#endif /* _UAPI_VS_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-3.13.10/include/uapi/vserver/cvirt_cmd.h linux-3.13.10-vs2.3.6.11/include/uapi/vserver/cvirt_cmd.h
---- linux-3.13.10/include/uapi/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/uapi/vserver/cvirt_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/uapi/vserver/cvirt_cmd.h linux-3.14.17-vs2.3.6.13/include/uapi/vserver/cvirt_cmd.h
+--- linux-3.14.17/include/uapi/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/uapi/vserver/cvirt_cmd.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,41 @@
+#ifndef _UAPI_VS_CVIRT_CMD_H
+#define _UAPI_VS_CVIRT_CMD_H
+};
+
+#endif /* _UAPI_VS_CVIRT_CMD_H */
-diff -NurpP --minimal linux-3.13.10/include/uapi/vserver/debug_cmd.h linux-3.13.10-vs2.3.6.11/include/uapi/vserver/debug_cmd.h
---- linux-3.13.10/include/uapi/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/uapi/vserver/debug_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/uapi/vserver/debug_cmd.h linux-3.14.17-vs2.3.6.13/include/uapi/vserver/debug_cmd.h
+--- linux-3.14.17/include/uapi/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/uapi/vserver/debug_cmd.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,24 @@
+#ifndef _UAPI_VS_DEBUG_CMD_H
+#define _UAPI_VS_DEBUG_CMD_H
+};
+
+#endif /* _UAPI_VS_DEBUG_CMD_H */
-diff -NurpP --minimal linux-3.13.10/include/uapi/vserver/device.h linux-3.13.10-vs2.3.6.11/include/uapi/vserver/device.h
---- linux-3.13.10/include/uapi/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/uapi/vserver/device.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/uapi/vserver/device.h linux-3.14.17-vs2.3.6.13/include/uapi/vserver/device.h
+--- linux-3.14.17/include/uapi/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/uapi/vserver/device.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,12 @@
+#ifndef _UAPI_VS_DEVICE_H
+#define _UAPI_VS_DEVICE_H
+#define DATTR_MASK 0x00000013
+
+#endif /* _UAPI_VS_DEVICE_H */
-diff -NurpP --minimal linux-3.13.10/include/uapi/vserver/device_cmd.h linux-3.13.10-vs2.3.6.11/include/uapi/vserver/device_cmd.h
---- linux-3.13.10/include/uapi/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/uapi/vserver/device_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/uapi/vserver/device_cmd.h linux-3.14.17-vs2.3.6.13/include/uapi/vserver/device_cmd.h
+--- linux-3.14.17/include/uapi/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/uapi/vserver/device_cmd.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,16 @@
+#ifndef _UAPI_VS_DEVICE_CMD_H
+#define _UAPI_VS_DEVICE_CMD_H
+};
+
+#endif /* _UAPI_VS_DEVICE_CMD_H */
-diff -NurpP --minimal linux-3.13.10/include/uapi/vserver/dlimit_cmd.h linux-3.13.10-vs2.3.6.11/include/uapi/vserver/dlimit_cmd.h
---- linux-3.13.10/include/uapi/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/uapi/vserver/dlimit_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/uapi/vserver/dlimit_cmd.h linux-3.14.17-vs2.3.6.13/include/uapi/vserver/dlimit_cmd.h
+--- linux-3.14.17/include/uapi/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/uapi/vserver/dlimit_cmd.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,67 @@
+#ifndef _UAPI_VS_DLIMIT_CMD_H
+#define _UAPI_VS_DLIMIT_CMD_H
+}
+
+#endif /* _UAPI_VS_DLIMIT_CMD_H */
-diff -NurpP --minimal linux-3.13.10/include/uapi/vserver/inode.h linux-3.13.10-vs2.3.6.11/include/uapi/vserver/inode.h
---- linux-3.13.10/include/uapi/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/uapi/vserver/inode.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/uapi/vserver/inode.h linux-3.14.17-vs2.3.6.13/include/uapi/vserver/inode.h
+--- linux-3.14.17/include/uapi/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/uapi/vserver/inode.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,23 @@
+#ifndef _UAPI_VS_INODE_H
+#define _UAPI_VS_INODE_H
+#define FIOC_SETXFLG _IOW('x', 6, long)
+
+#endif /* _UAPI_VS_INODE_H */
-diff -NurpP --minimal linux-3.13.10/include/uapi/vserver/inode_cmd.h linux-3.13.10-vs2.3.6.11/include/uapi/vserver/inode_cmd.h
---- linux-3.13.10/include/uapi/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/uapi/vserver/inode_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/uapi/vserver/inode_cmd.h linux-3.14.17-vs2.3.6.13/include/uapi/vserver/inode_cmd.h
+--- linux-3.14.17/include/uapi/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/uapi/vserver/inode_cmd.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,26 @@
+#ifndef _UAPI_VS_INODE_CMD_H
+#define _UAPI_VS_INODE_CMD_H
+};
+
+#endif /* _UAPI_VS_INODE_CMD_H */
-diff -NurpP --minimal linux-3.13.10/include/uapi/vserver/limit.h linux-3.13.10-vs2.3.6.11/include/uapi/vserver/limit.h
---- linux-3.13.10/include/uapi/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/uapi/vserver/limit.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/uapi/vserver/limit.h linux-3.14.17-vs2.3.6.13/include/uapi/vserver/limit.h
+--- linux-3.14.17/include/uapi/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/uapi/vserver/limit.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,14 @@
+#ifndef _UAPI_VS_LIMIT_H
+#define _UAPI_VS_LIMIT_H
+#define VLIMIT_MAPPED 23
+
+#endif /* _UAPI_VS_LIMIT_H */
-diff -NurpP --minimal linux-3.13.10/include/uapi/vserver/limit_cmd.h linux-3.13.10-vs2.3.6.11/include/uapi/vserver/limit_cmd.h
---- linux-3.13.10/include/uapi/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/uapi/vserver/limit_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/uapi/vserver/limit_cmd.h linux-3.14.17-vs2.3.6.13/include/uapi/vserver/limit_cmd.h
+--- linux-3.14.17/include/uapi/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/uapi/vserver/limit_cmd.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,40 @@
+#ifndef _UAPI_VS_LIMIT_CMD_H
+#define _UAPI_VS_LIMIT_CMD_H
+#define CRLIM_KEEP (~1ULL)
+
+#endif /* _UAPI_VS_LIMIT_CMD_H */
-diff -NurpP --minimal linux-3.13.10/include/uapi/vserver/monitor.h linux-3.13.10-vs2.3.6.11/include/uapi/vserver/monitor.h
---- linux-3.13.10/include/uapi/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/uapi/vserver/monitor.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/uapi/vserver/monitor.h linux-3.14.17-vs2.3.6.13/include/uapi/vserver/monitor.h
+--- linux-3.14.17/include/uapi/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/uapi/vserver/monitor.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,96 @@
+#ifndef _UAPI_VS_MONITOR_H
+#define _UAPI_VS_MONITOR_H
+};
+
+#endif /* _UAPI_VS_MONITOR_H */
-diff -NurpP --minimal linux-3.13.10/include/uapi/vserver/network.h linux-3.13.10-vs2.3.6.11/include/uapi/vserver/network.h
---- linux-3.13.10/include/uapi/vserver/network.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/uapi/vserver/network.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/uapi/vserver/network.h linux-3.14.17-vs2.3.6.13/include/uapi/vserver/network.h
+--- linux-3.14.17/include/uapi/vserver/network.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/uapi/vserver/network.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,76 @@
+#ifndef _UAPI_VS_NETWORK_H
+#define _UAPI_VS_NETWORK_H
+#define NXA_MASK_SHOW (NXA_MASK_ALL | NXA_LOOPBACK)
+
+#endif /* _UAPI_VS_NETWORK_H */
-diff -NurpP --minimal linux-3.13.10/include/uapi/vserver/network_cmd.h linux-3.13.10-vs2.3.6.11/include/uapi/vserver/network_cmd.h
---- linux-3.13.10/include/uapi/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/uapi/vserver/network_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/uapi/vserver/network_cmd.h linux-3.14.17-vs2.3.6.13/include/uapi/vserver/network_cmd.h
+--- linux-3.14.17/include/uapi/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/uapi/vserver/network_cmd.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,123 @@
+#ifndef _UAPI_VS_NETWORK_CMD_H
+#define _UAPI_VS_NETWORK_CMD_H
+};
+
+#endif /* _UAPI_VS_NETWORK_CMD_H */
-diff -NurpP --minimal linux-3.13.10/include/uapi/vserver/sched_cmd.h linux-3.13.10-vs2.3.6.11/include/uapi/vserver/sched_cmd.h
---- linux-3.13.10/include/uapi/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/uapi/vserver/sched_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/uapi/vserver/sched_cmd.h linux-3.14.17-vs2.3.6.13/include/uapi/vserver/sched_cmd.h
+--- linux-3.14.17/include/uapi/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/uapi/vserver/sched_cmd.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,13 @@
+#ifndef _UAPI_VS_SCHED_CMD_H
+#define _UAPI_VS_SCHED_CMD_H
+#define VCMD_get_prio_bias VC_CMD(SCHED, 5, 0)
+
+#endif /* _UAPI_VS_SCHED_CMD_H */
-diff -NurpP --minimal linux-3.13.10/include/uapi/vserver/signal_cmd.h linux-3.13.10-vs2.3.6.11/include/uapi/vserver/signal_cmd.h
---- linux-3.13.10/include/uapi/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/uapi/vserver/signal_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/uapi/vserver/signal_cmd.h linux-3.14.17-vs2.3.6.13/include/uapi/vserver/signal_cmd.h
+--- linux-3.14.17/include/uapi/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/uapi/vserver/signal_cmd.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,31 @@
+#ifndef _UAPI_VS_SIGNAL_CMD_H
+#define _UAPI_VS_SIGNAL_CMD_H
+};
+
+#endif /* _UAPI_VS_SIGNAL_CMD_H */
-diff -NurpP --minimal linux-3.13.10/include/uapi/vserver/space_cmd.h linux-3.13.10-vs2.3.6.11/include/uapi/vserver/space_cmd.h
---- linux-3.13.10/include/uapi/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/uapi/vserver/space_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/uapi/vserver/space_cmd.h linux-3.14.17-vs2.3.6.13/include/uapi/vserver/space_cmd.h
+--- linux-3.14.17/include/uapi/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/uapi/vserver/space_cmd.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,28 @@
+#ifndef _UAPI_VS_SPACE_CMD_H
+#define _UAPI_VS_SPACE_CMD_H
+};
+
+#endif /* _UAPI_VS_SPACE_CMD_H */
-diff -NurpP --minimal linux-3.13.10/include/uapi/vserver/switch.h linux-3.13.10-vs2.3.6.11/include/uapi/vserver/switch.h
---- linux-3.13.10/include/uapi/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/uapi/vserver/switch.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/uapi/vserver/switch.h linux-3.14.17-vs2.3.6.13/include/uapi/vserver/switch.h
+--- linux-3.14.17/include/uapi/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/uapi/vserver/switch.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,90 @@
+#ifndef _UAPI_VS_SWITCH_H
+#define _UAPI_VS_SWITCH_H
+#define VCMD_get_vci VC_CMD(VERSION, 1, 0)
+
+#endif /* _UAPI_VS_SWITCH_H */
-diff -NurpP --minimal linux-3.13.10/include/uapi/vserver/tag_cmd.h linux-3.13.10-vs2.3.6.11/include/uapi/vserver/tag_cmd.h
---- linux-3.13.10/include/uapi/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/include/uapi/vserver/tag_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/include/uapi/vserver/tag_cmd.h linux-3.14.17-vs2.3.6.13/include/uapi/vserver/tag_cmd.h
+--- linux-3.14.17/include/uapi/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/include/uapi/vserver/tag_cmd.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,14 @@
+#ifndef _UAPI_VS_TAG_CMD_H
+#define _UAPI_VS_TAG_CMD_H
+#define VCMD_tag_migrate VC_CMD(TAGMIG, 1, 0)
+
+#endif /* _UAPI_VS_TAG_CMD_H */
-diff -NurpP --minimal linux-3.13.10/init/Kconfig linux-3.13.10-vs2.3.6.11/init/Kconfig
---- linux-3.13.10/init/Kconfig 2014-04-17 01:12:39.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/init/Kconfig 2014-04-17 01:17:11.000000000 +0000
-@@ -855,6 +855,7 @@ config NUMA_BALANCING
+diff -NurpP --minimal linux-3.14.17/init/Kconfig linux-3.14.17-vs2.3.6.13/init/Kconfig
+--- linux-3.14.17/init/Kconfig 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/init/Kconfig 2014-08-30 14:37:19.000000000 +0000
+@@ -854,6 +854,7 @@ config NUMA_BALANCING
menuconfig CGROUPS
boolean "Control Group support"
help
This option adds support for grouping sets of processes together, for
use with process control subsystems such as Cpusets, CFS, memory
-@@ -1117,6 +1118,7 @@ config IPC_NS
-
- config USER_NS
- bool "User namespace"
-+ depends on VSERVER_DISABLED
- default n
- help
- This allows containers, i.e. vservers, to use user namespaces
-diff -NurpP --minimal linux-3.13.10/init/main.c linux-3.13.10-vs2.3.6.11/init/main.c
---- linux-3.13.10/init/main.c 2014-01-22 20:39:12.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/init/main.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/init/main.c linux-3.14.17-vs2.3.6.13/init/main.c
+--- linux-3.14.17/init/main.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/init/main.c 2014-08-30 14:27:38.000000000 +0000
@@ -77,6 +77,7 @@
#include <linux/sched_clock.h>
#include <linux/context_tracking.h>
#include <asm/io.h>
#include <asm/bugs.h>
-diff -NurpP --minimal linux-3.13.10/ipc/mqueue.c linux-3.13.10-vs2.3.6.11/ipc/mqueue.c
---- linux-3.13.10/ipc/mqueue.c 2014-04-17 01:12:39.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/ipc/mqueue.c 2014-03-12 15:51:08.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/ipc/mqueue.c linux-3.14.17-vs2.3.6.13/ipc/mqueue.c
+--- linux-3.14.17/ipc/mqueue.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/ipc/mqueue.c 2014-08-30 14:27:38.000000000 +0000
@@ -35,6 +35,8 @@
#include <linux/ipc_namespace.h>
#include <linux/user_namespace.h>
#include <net/sock.h>
#include "util.h"
@@ -76,6 +78,7 @@ struct mqueue_inode_info {
- struct pid* notify_owner;
+ struct pid *notify_owner;
struct user_namespace *notify_user_ns;
struct user_struct *user; /* user who created, for accounting */
+ struct vx_info *vxi;
free_uid(user);
}
if (ipc_ns)
-diff -NurpP --minimal linux-3.13.10/ipc/msg.c linux-3.13.10-vs2.3.6.11/ipc/msg.c
---- linux-3.13.10/ipc/msg.c 2014-04-17 01:12:39.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/ipc/msg.c 2014-04-17 01:17:11.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/ipc/msg.c linux-3.14.17-vs2.3.6.13/ipc/msg.c
+--- linux-3.14.17/ipc/msg.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/ipc/msg.c 2014-08-30 14:27:38.000000000 +0000
@@ -37,6 +37,7 @@
#include <linux/rwsem.h>
#include <linux/nsproxy.h>
msq->q_perm.security = NULL;
retval = security_msg_queue_alloc(msq);
-diff -NurpP --minimal linux-3.13.10/ipc/sem.c linux-3.13.10-vs2.3.6.11/ipc/sem.c
---- linux-3.13.10/ipc/sem.c 2013-11-25 15:47:03.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/ipc/sem.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/ipc/sem.c linux-3.14.17-vs2.3.6.13/ipc/sem.c
+--- linux-3.14.17/ipc/sem.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/ipc/sem.c 2014-08-30 14:27:38.000000000 +0000
@@ -86,6 +86,8 @@
#include <linux/rwsem.h>
#include <linux/nsproxy.h>
#include <asm/uaccess.h>
#include "util.h"
-@@ -500,6 +502,7 @@ static int newary(struct ipc_namespace *
+@@ -499,6 +501,7 @@ static int newary(struct ipc_namespace *
sma->sem_perm.mode = (semflg & S_IRWXUGO);
sma->sem_perm.key = key;
sma->sem_perm.security = NULL;
retval = security_sem_alloc(sma);
-@@ -514,6 +517,9 @@ static int newary(struct ipc_namespace *
+@@ -513,6 +516,9 @@ static int newary(struct ipc_namespace *
return id;
}
ns->used_sems += nsems;
ipc_rcu_putref(sma, sem_rcu_free);
}
-diff -NurpP --minimal linux-3.13.10/ipc/shm.c linux-3.13.10-vs2.3.6.11/ipc/shm.c
---- linux-3.13.10/ipc/shm.c 2014-01-22 20:39:12.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/ipc/shm.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/ipc/shm.c linux-3.14.17-vs2.3.6.13/ipc/shm.c
+--- linux-3.14.17/ipc/shm.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/ipc/shm.c 2014-08-30 14:27:38.000000000 +0000
@@ -42,6 +42,8 @@
#include <linux/nsproxy.h>
#include <linux/mount.h>
ipc_rcu_putref(shp, shm_rcu_free);
}
-@@ -497,11 +504,15 @@ static int newseg(struct ipc_namespace *
+@@ -496,11 +503,15 @@ static int newseg(struct ipc_namespace *
if (ns->shm_tot + numpages > ns->shm_ctlall)
return -ENOSPC;
shp->shm_perm.mode = (shmflg & S_IRWXUGO);
shp->mlock_user = NULL;
-@@ -570,6 +581,7 @@ static int newseg(struct ipc_namespace *
+@@ -569,6 +580,7 @@ static int newseg(struct ipc_namespace *
ipc_unlock_object(&shp->shm_perm);
rcu_read_unlock();
return error;
no_id:
-diff -NurpP --minimal linux-3.13.10/kernel/Makefile linux-3.13.10-vs2.3.6.11/kernel/Makefile
---- linux-3.13.10/kernel/Makefile 2014-01-22 20:39:12.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/Makefile 2014-01-31 21:36:22.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/Makefile linux-3.14.17-vs2.3.6.13/kernel/Makefile
+--- linux-3.14.17/kernel/Makefile 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/Makefile 2014-08-30 14:27:38.000000000 +0000
@@ -25,6 +25,7 @@ obj-y += printk/
obj-y += cpu/
obj-y += irq/
obj-$(CONFIG_CHECKPOINT_RESTORE) += kcmp.o
obj-$(CONFIG_FREEZER) += freezer.o
-diff -NurpP --minimal linux-3.13.10/kernel/auditsc.c linux-3.13.10-vs2.3.6.11/kernel/auditsc.c
---- linux-3.13.10/kernel/auditsc.c 2014-04-17 01:12:39.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/auditsc.c 2014-04-17 01:17:11.000000000 +0000
-@@ -1956,7 +1956,7 @@ static int audit_set_loginuid_perm(kuid_
+diff -NurpP --minimal linux-3.14.17/kernel/auditsc.c linux-3.14.17-vs2.3.6.13/kernel/auditsc.c
+--- linux-3.14.17/kernel/auditsc.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/auditsc.c 2014-08-30 14:27:38.000000000 +0000
+@@ -1965,7 +1965,7 @@ static int audit_set_loginuid_perm(kuid_
if (is_audit_feature_set(AUDIT_FEATURE_LOGINUID_IMMUTABLE))
return -EPERM;
/* it is set, you need permission */
return -EPERM;
/* reject if this is not an unset and we don't allow that */
if (is_audit_feature_set(AUDIT_FEATURE_ONLY_UNSET_LOGINUID) && uid_valid(loginuid))
-diff -NurpP --minimal linux-3.13.10/kernel/capability.c linux-3.13.10-vs2.3.6.11/kernel/capability.c
---- linux-3.13.10/kernel/capability.c 2013-11-25 15:47:03.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/capability.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/capability.c linux-3.14.17-vs2.3.6.13/kernel/capability.c
+--- linux-3.14.17/kernel/capability.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/capability.c 2014-08-30 14:27:38.000000000 +0000
@@ -15,6 +15,7 @@
#include <linux/syscalls.h>
#include <linux/pid_namespace.h>
/**
* has_capability_noaudit - Does a task have a capability (unaudited) in the
* initial user ns
-diff -NurpP --minimal linux-3.13.10/kernel/compat.c linux-3.13.10-vs2.3.6.11/kernel/compat.c
---- linux-3.13.10/kernel/compat.c 2013-07-14 17:01:34.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/compat.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/compat.c linux-3.14.17-vs2.3.6.13/kernel/compat.c
+--- linux-3.14.17/kernel/compat.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/compat.c 2014-08-30 14:27:38.000000000 +0000
@@ -27,6 +27,7 @@
#include <linux/times.h>
#include <linux/ptrace.h>
return 0;
}
-diff -NurpP --minimal linux-3.13.10/kernel/cred.c linux-3.13.10-vs2.3.6.11/kernel/cred.c
---- linux-3.13.10/kernel/cred.c 2013-02-19 13:58:56.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/cred.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/cred.c linux-3.14.17-vs2.3.6.13/kernel/cred.c
+--- linux-3.14.17/kernel/cred.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/cred.c 2014-08-30 14:27:38.000000000 +0000
@@ -56,31 +56,6 @@ struct cred init_cred = {
.group_info = &init_groups,
};
EXPORT_SYMBOL(prepare_creds);
/*
-diff -NurpP --minimal linux-3.13.10/kernel/exit.c linux-3.13.10-vs2.3.6.11/kernel/exit.c
---- linux-3.13.10/kernel/exit.c 2013-11-25 15:45:07.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/exit.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/exit.c linux-3.14.17-vs2.3.6.13/kernel/exit.c
+--- linux-3.14.17/kernel/exit.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/exit.c 2014-08-30 14:27:38.000000000 +0000
@@ -48,6 +48,10 @@
#include <linux/fs_struct.h>
#include <linux/init_task.h>
#include <trace/events/sched.h>
#include <linux/hw_breakpoint.h>
#include <linux/oom.h>
-@@ -503,15 +507,25 @@ static struct task_struct *find_new_reap
+@@ -504,15 +508,25 @@ static struct task_struct *find_new_reap
__acquires(&tasklist_lock)
{
struct pid_namespace *pid_ns = task_active_pid_ns(father);
}
if (unlikely(pid_ns->child_reaper == father)) {
-@@ -549,7 +563,9 @@ static struct task_struct *find_new_reap
+@@ -550,7 +564,9 @@ static struct task_struct *find_new_reap
}
}
}
/*
-@@ -600,10 +616,15 @@ static void forget_original_parent(struc
+@@ -608,10 +624,15 @@ static void forget_original_parent(struc
list_for_each_entry_safe(p, n, &father->children, sibling) {
struct task_struct *t = p;
do {
}
if (t->pdeath_signal)
group_send_sig_info(t->pdeath_signal,
-@@ -810,6 +831,9 @@ void do_exit(long code)
+@@ -816,6 +837,9 @@ void do_exit(long code)
*/
flush_ptrace_hw_breakpoint(tsk);
exit_notify(tsk, group_dead);
#ifdef CONFIG_NUMA
task_lock(tsk);
-@@ -863,10 +887,15 @@ void do_exit(long code)
+@@ -869,10 +893,15 @@ void do_exit(long code)
smp_mb();
raw_spin_unlock_wait(&tsk->pi_lock);
BUG();
/* Avoid "noreturn function does return". */
for (;;)
-diff -NurpP --minimal linux-3.13.10/kernel/fork.c linux-3.13.10-vs2.3.6.11/kernel/fork.c
---- linux-3.13.10/kernel/fork.c 2014-01-22 20:39:13.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/fork.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/fork.c linux-3.14.17-vs2.3.6.13/kernel/fork.c
+--- linux-3.14.17/kernel/fork.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/fork.c 2014-08-30 14:38:41.000000000 +0000
@@ -71,6 +71,9 @@
#include <linux/signalfd.h>
#include <linux/uprobes.h>
free_mm(mm);
}
EXPORT_SYMBOL_GPL(__mmdrop);
-@@ -813,6 +820,7 @@ struct mm_struct *dup_mm(struct task_str
+@@ -810,6 +817,7 @@ static struct mm_struct *dup_mm(struct t
goto fail_nomem;
memcpy(mm, oldmm, sizeof(*mm));
mm_init_cpumask(mm);
#if defined(CONFIG_TRANSPARENT_HUGEPAGE) && !USE_SPLIT_PMD_PTLOCKS
-@@ -851,6 +859,7 @@ fail_nocontext:
+@@ -848,6 +856,7 @@ fail_nocontext:
* If init_new_context() failed, we cannot use mmput() to free the mm
* because it calls destroy_context()
*/
mm_free_pgd(mm);
free_mm(mm);
return NULL;
-@@ -1135,6 +1144,8 @@ static struct task_struct *copy_process(
+@@ -1139,6 +1148,8 @@ static struct task_struct *copy_process(
{
int retval;
struct task_struct *p;
if ((clone_flags & (CLONE_NEWNS|CLONE_FS)) == (CLONE_NEWNS|CLONE_FS))
return ERR_PTR(-EINVAL);
-@@ -1197,7 +1208,12 @@ static struct task_struct *copy_process(
+@@ -1201,7 +1212,12 @@ static struct task_struct *copy_process(
DEBUG_LOCKS_WARN_ON(!p->hardirqs_enabled);
DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
#endif
if (atomic_read(&p->real_cred->user->processes) >=
task_rlimit(p, RLIMIT_NPROC)) {
if (p->real_cred->user != INIT_USER &&
-@@ -1479,6 +1495,18 @@ static struct task_struct *copy_process(
+@@ -1485,6 +1501,18 @@ static struct task_struct *copy_process(
total_forks++;
spin_unlock(¤t->sighand->siglock);
syscall_tracepoint_update(p);
write_unlock_irq(&tasklist_lock);
proc_fork_connector(p);
-diff -NurpP --minimal linux-3.13.10/kernel/kthread.c linux-3.13.10-vs2.3.6.11/kernel/kthread.c
---- linux-3.13.10/kernel/kthread.c 2014-01-22 20:39:13.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/kthread.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/kthread.c linux-3.14.17-vs2.3.6.13/kernel/kthread.c
+--- linux-3.14.17/kernel/kthread.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/kthread.c 2014-08-30 14:27:38.000000000 +0000
@@ -18,6 +18,7 @@
#include <linux/freezer.h>
#include <linux/ptrace.h>
#include <trace/events/sched.h>
static DEFINE_SPINLOCK(kthread_create_lock);
-diff -NurpP --minimal linux-3.13.10/kernel/nsproxy.c linux-3.13.10-vs2.3.6.11/kernel/nsproxy.c
---- linux-3.13.10/kernel/nsproxy.c 2013-11-25 15:47:03.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/nsproxy.c 2014-02-01 00:17:43.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/nsproxy.c linux-3.14.17-vs2.3.6.13/kernel/nsproxy.c
+--- linux-3.14.17/kernel/nsproxy.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/nsproxy.c 2014-08-30 14:27:38.000000000 +0000
@@ -20,11 +20,14 @@
#include <linux/mnt_namespace.h>
#include <linux/utsname.h>
return -EPERM;
*new_nsp = create_new_namespaces(unshare_flags, current, user_ns,
-diff -NurpP --minimal linux-3.13.10/kernel/pid.c linux-3.13.10-vs2.3.6.11/kernel/pid.c
---- linux-3.13.10/kernel/pid.c 2013-11-25 15:47:03.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/pid.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/pid.c linux-3.14.17-vs2.3.6.13/kernel/pid.c
+--- linux-3.14.17/kernel/pid.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/pid.c 2014-08-30 14:27:38.000000000 +0000
@@ -38,6 +38,7 @@
#include <linux/syscalls.h>
#include <linux/proc_ns.h>
pid_t pid_vnr(struct pid *pid)
{
return pid_nr_ns(pid, task_active_pid_ns(current));
-diff -NurpP --minimal linux-3.13.10/kernel/pid_namespace.c linux-3.13.10-vs2.3.6.11/kernel/pid_namespace.c
---- linux-3.13.10/kernel/pid_namespace.c 2014-01-22 20:39:13.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/pid_namespace.c 2014-02-01 12:23:11.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/pid_namespace.c linux-3.14.17-vs2.3.6.13/kernel/pid_namespace.c
+--- linux-3.14.17/kernel/pid_namespace.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/pid_namespace.c 2014-08-30 14:27:38.000000000 +0000
@@ -18,6 +18,7 @@
#include <linux/proc_ns.h>
#include <linux/reboot.h>
kmem_cache_free(pid_ns_cachep, ns);
out:
return ERR_PTR(err);
-diff -NurpP --minimal linux-3.13.10/kernel/posix-timers.c linux-3.13.10-vs2.3.6.11/kernel/posix-timers.c
---- linux-3.13.10/kernel/posix-timers.c 2013-07-14 17:01:35.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/posix-timers.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/posix-timers.c linux-3.14.17-vs2.3.6.13/kernel/posix-timers.c
+--- linux-3.14.17/kernel/posix-timers.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/posix-timers.c 2014-08-30 14:27:38.000000000 +0000
@@ -48,6 +48,7 @@
#include <linux/workqueue.h>
#include <linux/export.h>
/* If we failed to send the signal the timer stops. */
return ret > 0;
}
-diff -NurpP --minimal linux-3.13.10/kernel/printk/printk.c linux-3.13.10-vs2.3.6.11/kernel/printk/printk.c
---- linux-3.13.10/kernel/printk/printk.c 2014-04-17 01:12:39.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/printk/printk.c 2014-04-17 01:17:11.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/printk/printk.c linux-3.14.17-vs2.3.6.13/kernel/printk/printk.c
+--- linux-3.14.17/kernel/printk/printk.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/printk/printk.c 2014-08-30 14:27:38.000000000 +0000
@@ -45,6 +45,7 @@
#include <linux/poll.h>
#include <linux/irq_work.h>
return 0;
/*
* For historical reasons, accept CAP_SYS_ADMIN too, with
-@@ -1134,12 +1135,9 @@ int do_syslog(int type, char __user *buf
+@@ -1130,12 +1131,9 @@ int do_syslog(int type, char __user *buf
if (error)
return error;
error = -EINVAL;
if (!buf || len < 0)
goto out;
-@@ -1150,6 +1148,16 @@ int do_syslog(int type, char __user *buf
+@@ -1146,6 +1144,16 @@ int do_syslog(int type, char __user *buf
error = -EFAULT;
goto out;
}
error = wait_event_interruptible(log_wait,
syslog_seq != log_next_seq);
if (error)
-@@ -1162,16 +1170,6 @@ int do_syslog(int type, char __user *buf
+@@ -1158,16 +1166,6 @@ int do_syslog(int type, char __user *buf
/* FALL THRU */
/* Read last kernel messages */
case SYSLOG_ACTION_READ_ALL:
error = syslog_print_all(buf, len, clear);
break;
/* Clear ring buffer */
-diff -NurpP --minimal linux-3.13.10/kernel/ptrace.c linux-3.13.10-vs2.3.6.11/kernel/ptrace.c
---- linux-3.13.10/kernel/ptrace.c 2014-01-22 20:39:13.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/ptrace.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/ptrace.c linux-3.14.17-vs2.3.6.13/kernel/ptrace.c
+--- linux-3.14.17/kernel/ptrace.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/ptrace.c 2014-08-30 14:27:38.000000000 +0000
@@ -23,6 +23,7 @@
#include <linux/syscalls.h>
#include <linux/uaccess.h>
return security_ptrace_access_check(task, mode);
}
-diff -NurpP --minimal linux-3.13.10/kernel/reboot.c linux-3.13.10-vs2.3.6.11/kernel/reboot.c
---- linux-3.13.10/kernel/reboot.c 2014-01-22 20:39:13.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/reboot.c 2014-02-01 00:19:40.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/reboot.c linux-3.14.17-vs2.3.6.13/kernel/reboot.c
+--- linux-3.14.17/kernel/reboot.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/reboot.c 2014-08-30 14:27:38.000000000 +0000
@@ -16,6 +16,7 @@
#include <linux/syscalls.h>
#include <linux/syscore_ops.h>
mutex_lock(&reboot_mutex);
switch (cmd) {
case LINUX_REBOOT_CMD_RESTART:
-diff -NurpP --minimal linux-3.13.10/kernel/sched/core.c linux-3.13.10-vs2.3.6.11/kernel/sched/core.c
---- linux-3.13.10/kernel/sched/core.c 2014-04-17 01:12:39.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/sched/core.c 2014-02-25 11:26:10.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/sched/core.c linux-3.14.17-vs2.3.6.13/kernel/sched/core.c
+--- linux-3.14.17/kernel/sched/core.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/sched/core.c 2014-08-30 14:27:38.000000000 +0000
@@ -73,6 +73,8 @@
#include <linux/init_task.h>
#include <linux/binfmts.h>
#include <asm/switch_to.h>
#include <asm/tlb.h>
-@@ -2927,7 +2929,7 @@ SYSCALL_DEFINE1(nice, int, increment)
+@@ -3083,7 +3085,7 @@ SYSCALL_DEFINE1(nice, int, increment)
nice = 19;
if (increment < 0 && !can_nice(current, nice))
retval = security_task_setnice(current, nice);
if (retval)
-diff -NurpP --minimal linux-3.13.10/kernel/sched/cputime.c linux-3.13.10-vs2.3.6.11/kernel/sched/cputime.c
---- linux-3.13.10/kernel/sched/cputime.c 2013-11-25 15:47:03.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/sched/cputime.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/sched/cputime.c linux-3.14.17-vs2.3.6.13/kernel/sched/cputime.c
+--- linux-3.14.17/kernel/sched/cputime.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/sched/cputime.c 2014-08-30 14:27:38.000000000 +0000
@@ -4,6 +4,7 @@
#include <linux/kernel_stat.h>
#include <linux/static_key.h>
account_group_system_time(p, cputime);
/* Add system time to cpustat. */
-diff -NurpP --minimal linux-3.13.10/kernel/sched/fair.c linux-3.13.10-vs2.3.6.11/kernel/sched/fair.c
---- linux-3.13.10/kernel/sched/fair.c 2014-04-17 01:12:40.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/sched/fair.c 2014-04-17 01:17:11.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/sched/fair.c linux-3.14.17-vs2.3.6.13/kernel/sched/fair.c
+--- linux-3.14.17/kernel/sched/fair.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/sched/fair.c 2014-08-30 14:27:38.000000000 +0000
@@ -29,6 +29,7 @@
#include <linux/mempolicy.h>
#include <linux/migrate.h>
#include <trace/events/sched.h>
-@@ -2577,6 +2578,8 @@ enqueue_entity(struct cfs_rq *cfs_rq, st
+@@ -2568,6 +2569,8 @@ enqueue_entity(struct cfs_rq *cfs_rq, st
__enqueue_entity(cfs_rq, se);
se->on_rq = 1;
if (cfs_rq->nr_running == 1) {
list_add_leaf_cfs_rq(cfs_rq);
check_enqueue_throttle(cfs_rq);
-@@ -2658,6 +2661,8 @@ dequeue_entity(struct cfs_rq *cfs_rq, st
+@@ -2649,6 +2652,8 @@ dequeue_entity(struct cfs_rq *cfs_rq, st
if (se != cfs_rq->curr)
__dequeue_entity(cfs_rq, se);
se->on_rq = 0;
account_entity_dequeue(cfs_rq, se);
/*
-diff -NurpP --minimal linux-3.13.10/kernel/sched/proc.c linux-3.13.10-vs2.3.6.11/kernel/sched/proc.c
---- linux-3.13.10/kernel/sched/proc.c 2013-11-25 15:45:08.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/sched/proc.c 2014-01-31 21:22:36.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/sched/proc.c linux-3.14.17-vs2.3.6.13/kernel/sched/proc.c
+--- linux-3.14.17/kernel/sched/proc.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/sched/proc.c 2014-08-30 14:27:38.000000000 +0000
@@ -78,9 +78,17 @@ EXPORT_SYMBOL(avenrun); /* should be rem
*/
void get_avenrun(unsigned long *loads, unsigned long offset, int shift)
}
long calc_load_fold_active(struct rq *this_rq)
-diff -NurpP --minimal linux-3.13.10/kernel/signal.c linux-3.13.10-vs2.3.6.11/kernel/signal.c
---- linux-3.13.10/kernel/signal.c 2014-01-22 20:39:13.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/signal.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/signal.c linux-3.14.17-vs2.3.6.13/kernel/signal.c
+--- linux-3.14.17/kernel/signal.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/signal.c 2014-08-30 14:27:38.000000000 +0000
@@ -33,6 +33,8 @@
#include <linux/uprobes.h>
#include <linux/compat.h>
if (sig_kernel_stop(signr)) {
/*
* The default action is to stop all threads in
-diff -NurpP --minimal linux-3.13.10/kernel/softirq.c linux-3.13.10-vs2.3.6.11/kernel/softirq.c
---- linux-3.13.10/kernel/softirq.c 2014-01-22 20:39:13.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/softirq.c 2014-01-31 20:38:03.000000000 +0000
-@@ -23,6 +23,7 @@
+diff -NurpP --minimal linux-3.14.17/kernel/softirq.c linux-3.14.17-vs2.3.6.13/kernel/softirq.c
+--- linux-3.14.17/kernel/softirq.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/softirq.c 2014-08-30 14:27:38.000000000 +0000
+@@ -25,6 +25,7 @@
#include <linux/smp.h>
#include <linux/smpboot.h>
#include <linux/tick.h>
#define CREATE_TRACE_POINTS
#include <trace/events/irq.h>
-diff -NurpP --minimal linux-3.13.10/kernel/sys.c linux-3.13.10-vs2.3.6.11/kernel/sys.c
---- linux-3.13.10/kernel/sys.c 2014-01-22 20:39:13.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/sys.c 2014-02-01 00:19:29.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/sys.c linux-3.14.17-vs2.3.6.13/kernel/sys.c
+--- linux-3.14.17/kernel/sys.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/sys.c 2014-08-30 14:27:38.000000000 +0000
@@ -54,6 +54,7 @@
#include <linux/cred.h>
niceval = 20 - task_nice(p);
if (niceval > retval)
retval = niceval;
-@@ -1198,7 +1206,8 @@ SYSCALL_DEFINE2(sethostname, char __user
+@@ -1197,7 +1205,8 @@ SYSCALL_DEFINE2(sethostname, char __user
int errno;
char tmp[__NEW_UTS_LEN];
return -EPERM;
if (len < 0 || len > __NEW_UTS_LEN)
-@@ -1249,7 +1258,8 @@ SYSCALL_DEFINE2(setdomainname, char __us
+@@ -1248,7 +1257,8 @@ SYSCALL_DEFINE2(setdomainname, char __us
int errno;
char tmp[__NEW_UTS_LEN];
return -EPERM;
if (len < 0 || len > __NEW_UTS_LEN)
return -EINVAL;
-@@ -1368,7 +1378,7 @@ int do_prlimit(struct task_struct *tsk,
+@@ -1367,7 +1377,7 @@ int do_prlimit(struct task_struct *tsk,
/* Keep the capable check against init_user_ns until
cgroups can contain all limits */
if (new_rlim->rlim_max > rlim->rlim_max &&
retval = -EPERM;
if (!retval)
retval = security_task_setrlimit(tsk->group_leader,
-@@ -1421,7 +1431,8 @@ static int check_prlimit_permission(stru
+@@ -1420,7 +1430,8 @@ static int check_prlimit_permission(stru
gid_eq(cred->gid, tcred->sgid) &&
gid_eq(cred->gid, tcred->gid))
return 0;
return 0;
return -EPERM;
-diff -NurpP --minimal linux-3.13.10/kernel/sysctl.c linux-3.13.10-vs2.3.6.11/kernel/sysctl.c
---- linux-3.13.10/kernel/sysctl.c 2014-04-17 01:12:40.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/sysctl.c 2014-02-25 11:26:10.000000000 +0000
-@@ -83,6 +83,7 @@
+diff -NurpP --minimal linux-3.14.17/kernel/sysctl.c linux-3.14.17-vs2.3.6.13/kernel/sysctl.c
+--- linux-3.14.17/kernel/sysctl.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/sysctl.c 2014-08-30 14:27:38.000000000 +0000
+@@ -84,6 +84,7 @@
#if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_LOCK_STAT)
#include <linux/lockdep.h>
#endif
#ifdef CONFIG_CHR_DEV_SG
#include <scsi/sg.h>
#endif
-@@ -650,6 +651,13 @@ static struct ctl_table kern_table[] = {
+@@ -660,6 +661,13 @@ static struct ctl_table kern_table[] = {
.mode = 0644,
.proc_handler = proc_dostring,
},
#ifdef CONFIG_CHR_DEV_SG
{
-diff -NurpP --minimal linux-3.13.10/kernel/sysctl_binary.c linux-3.13.10-vs2.3.6.11/kernel/sysctl_binary.c
---- linux-3.13.10/kernel/sysctl_binary.c 2014-01-22 20:39:13.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/sysctl_binary.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/sysctl_binary.c linux-3.14.17-vs2.3.6.13/kernel/sysctl_binary.c
+--- linux-3.14.17/kernel/sysctl_binary.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/sysctl_binary.c 2014-08-30 14:27:38.000000000 +0000
@@ -73,6 +73,7 @@ static const struct bin_table bin_kern_t
{ CTL_INT, KERN_PANIC, "panic" },
{ CTL_STR, KERN_SPARC_REBOOT, "reboot-cmd" },
{ CTL_INT, KERN_CTLALTDEL, "ctrl-alt-del" },
-diff -NurpP --minimal linux-3.13.10/kernel/time/timekeeping.c linux-3.13.10-vs2.3.6.11/kernel/time/timekeeping.c
---- linux-3.13.10/kernel/time/timekeeping.c 2014-04-17 01:12:40.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/time/timekeeping.c 2014-02-25 11:26:10.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/time/timekeeping.c linux-3.14.17-vs2.3.6.13/kernel/time/timekeeping.c
+--- linux-3.14.17/kernel/time/timekeeping.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/time/timekeeping.c 2014-08-30 14:27:38.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/tick.h>
#include <linux/stop_machine.h>
#include "tick-internal.h"
#include "ntp_internal.h"
-@@ -709,6 +710,7 @@ void getrawmonotonic(struct timespec *ts
+@@ -710,6 +711,7 @@ void getrawmonotonic(struct timespec *ts
} while (read_seqcount_retry(&timekeeper_seq, seq));
timespec_add_ns(ts, nsecs);
}
EXPORT_SYMBOL(getrawmonotonic);
-diff -NurpP --minimal linux-3.13.10/kernel/time.c linux-3.13.10-vs2.3.6.11/kernel/time.c
---- linux-3.13.10/kernel/time.c 2013-11-25 15:45:08.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/time.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/time.c linux-3.14.17-vs2.3.6.13/kernel/time.c
+--- linux-3.14.17/kernel/time.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/time.c 2014-08-30 14:27:38.000000000 +0000
@@ -37,6 +37,7 @@
#include <linux/fs.h>
#include <linux/math64.h>
return 0;
}
-diff -NurpP --minimal linux-3.13.10/kernel/timer.c linux-3.13.10-vs2.3.6.11/kernel/timer.c
---- linux-3.13.10/kernel/timer.c 2014-01-22 20:39:13.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/timer.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/timer.c linux-3.14.17-vs2.3.6.13/kernel/timer.c
+--- linux-3.14.17/kernel/timer.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/timer.c 2014-08-30 14:27:38.000000000 +0000
@@ -42,6 +42,10 @@
#include <linux/sched/sysctl.h>
#include <linux/slab.h>
#include <asm/uaccess.h>
#include <asm/unistd.h>
-diff -NurpP --minimal linux-3.13.10/kernel/user_namespace.c linux-3.13.10-vs2.3.6.11/kernel/user_namespace.c
---- linux-3.13.10/kernel/user_namespace.c 2014-01-22 20:39:13.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/user_namespace.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/user_namespace.c linux-3.14.17-vs2.3.6.13/kernel/user_namespace.c
+--- linux-3.14.17/kernel/user_namespace.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/user_namespace.c 2014-08-30 14:27:38.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/ctype.h>
#include <linux/projid.h>
ns->parent = parent_ns;
ns->level = parent_ns->level + 1;
ns->owner = owner;
-@@ -848,6 +850,8 @@ static void *userns_get(struct task_stru
+@@ -847,6 +849,8 @@ static void *userns_get(struct task_stru
static void userns_put(void *ns)
{
put_user_ns(ns);
}
-diff -NurpP --minimal linux-3.13.10/kernel/utsname.c linux-3.13.10-vs2.3.6.11/kernel/utsname.c
---- linux-3.13.10/kernel/utsname.c 2013-11-25 15:47:03.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/utsname.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/utsname.c linux-3.14.17-vs2.3.6.13/kernel/utsname.c
+--- linux-3.14.17/kernel/utsname.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/utsname.c 2014-08-30 14:27:38.000000000 +0000
@@ -16,14 +16,17 @@
#include <linux/slab.h>
#include <linux/user_namespace.h>
kfree(ns);
}
-diff -NurpP --minimal linux-3.13.10/kernel/vserver/Kconfig linux-3.13.10-vs2.3.6.11/kernel/vserver/Kconfig
---- linux-3.13.10/kernel/vserver/Kconfig 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/vserver/Kconfig 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/vserver/Kconfig linux-3.14.17-vs2.3.6.13/kernel/vserver/Kconfig
+--- linux-3.14.17/kernel/vserver/Kconfig 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/vserver/Kconfig 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,230 @@
+#
+# Linux VServer configuration
+ bool
+ default n
+
-diff -NurpP --minimal linux-3.13.10/kernel/vserver/Makefile linux-3.13.10-vs2.3.6.11/kernel/vserver/Makefile
---- linux-3.13.10/kernel/vserver/Makefile 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/vserver/Makefile 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/vserver/Makefile linux-3.14.17-vs2.3.6.13/kernel/vserver/Makefile
+--- linux-3.14.17/kernel/vserver/Makefile 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/vserver/Makefile 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,18 @@
+#
+# Makefile for the Linux vserver routines.
+vserver-$(CONFIG_VSERVER_MONITOR) += monitor.o
+vserver-$(CONFIG_VSERVER_DEVICE) += device.o
+
-diff -NurpP --minimal linux-3.13.10/kernel/vserver/cacct.c linux-3.13.10-vs2.3.6.11/kernel/vserver/cacct.c
---- linux-3.13.10/kernel/vserver/cacct.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/vserver/cacct.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/vserver/cacct.c linux-3.14.17-vs2.3.6.13/kernel/vserver/cacct.c
+--- linux-3.14.17/kernel/vserver/cacct.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/vserver/cacct.c 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,42 @@
+/*
+ * linux/kernel/vserver/cacct.c
+ return 0;
+}
+
-diff -NurpP --minimal linux-3.13.10/kernel/vserver/cacct_init.h linux-3.13.10-vs2.3.6.11/kernel/vserver/cacct_init.h
---- linux-3.13.10/kernel/vserver/cacct_init.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/vserver/cacct_init.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/vserver/cacct_init.h linux-3.14.17-vs2.3.6.13/kernel/vserver/cacct_init.h
+--- linux-3.14.17/kernel/vserver/cacct_init.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/vserver/cacct_init.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,25 @@
+
+
+ return;
+}
+
-diff -NurpP --minimal linux-3.13.10/kernel/vserver/cacct_proc.h linux-3.13.10-vs2.3.6.11/kernel/vserver/cacct_proc.h
---- linux-3.13.10/kernel/vserver/cacct_proc.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/vserver/cacct_proc.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/vserver/cacct_proc.h linux-3.14.17-vs2.3.6.13/kernel/vserver/cacct_proc.h
+--- linux-3.14.17/kernel/vserver/cacct_proc.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/vserver/cacct_proc.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,53 @@
+#ifndef _VX_CACCT_PROC_H
+#define _VX_CACCT_PROC_H
+}
+
+#endif /* _VX_CACCT_PROC_H */
-diff -NurpP --minimal linux-3.13.10/kernel/vserver/context.c linux-3.13.10-vs2.3.6.11/kernel/vserver/context.c
---- linux-3.13.10/kernel/vserver/context.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/vserver/context.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/vserver/context.c linux-3.14.17-vs2.3.6.13/kernel/vserver/context.c
+--- linux-3.14.17/kernel/vserver/context.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/vserver/context.c 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,1119 @@
+/*
+ * linux/kernel/vserver/context.c
+
+EXPORT_SYMBOL_GPL(free_vx_info);
+
-diff -NurpP --minimal linux-3.13.10/kernel/vserver/cvirt.c linux-3.13.10-vs2.3.6.11/kernel/vserver/cvirt.c
---- linux-3.13.10/kernel/vserver/cvirt.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/vserver/cvirt.c 2014-01-31 20:38:04.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/vserver/cvirt.c linux-3.14.17-vs2.3.6.13/kernel/vserver/cvirt.c
+--- linux-3.14.17/kernel/vserver/cvirt.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/vserver/cvirt.c 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,313 @@
+/*
+ * linux/kernel/vserver/cvirt.c
+
+#endif
+
-diff -NurpP --minimal linux-3.13.10/kernel/vserver/cvirt_init.h linux-3.13.10-vs2.3.6.11/kernel/vserver/cvirt_init.h
---- linux-3.13.10/kernel/vserver/cvirt_init.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/vserver/cvirt_init.h 2014-01-31 20:38:04.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/vserver/cvirt_init.h linux-3.14.17-vs2.3.6.13/kernel/vserver/cvirt_init.h
+--- linux-3.14.17/kernel/vserver/cvirt_init.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/vserver/cvirt_init.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,70 @@
+
+
+ return;
+}
+
-diff -NurpP --minimal linux-3.13.10/kernel/vserver/cvirt_proc.h linux-3.13.10-vs2.3.6.11/kernel/vserver/cvirt_proc.h
---- linux-3.13.10/kernel/vserver/cvirt_proc.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/vserver/cvirt_proc.h 2014-01-31 20:38:04.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/vserver/cvirt_proc.h linux-3.14.17-vs2.3.6.13/kernel/vserver/cvirt_proc.h
+--- linux-3.14.17/kernel/vserver/cvirt_proc.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/vserver/cvirt_proc.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,123 @@
+#ifndef _VX_CVIRT_PROC_H
+#define _VX_CVIRT_PROC_H
+}
+
+#endif /* _VX_CVIRT_PROC_H */
-diff -NurpP --minimal linux-3.13.10/kernel/vserver/debug.c linux-3.13.10-vs2.3.6.11/kernel/vserver/debug.c
---- linux-3.13.10/kernel/vserver/debug.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/vserver/debug.c 2014-01-31 20:38:04.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/vserver/debug.c linux-3.14.17-vs2.3.6.13/kernel/vserver/debug.c
+--- linux-3.14.17/kernel/vserver/debug.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/vserver/debug.c 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,32 @@
+/*
+ * kernel/vserver/debug.c
+
+EXPORT_SYMBOL_GPL(dump_vx_info);
+
-diff -NurpP --minimal linux-3.13.10/kernel/vserver/device.c linux-3.13.10-vs2.3.6.11/kernel/vserver/device.c
---- linux-3.13.10/kernel/vserver/device.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/vserver/device.c 2014-01-31 20:38:04.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/vserver/device.c linux-3.14.17-vs2.3.6.13/kernel/vserver/device.c
+--- linux-3.14.17/kernel/vserver/device.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/vserver/device.c 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,443 @@
+/*
+ * linux/kernel/vserver/device.c
+#endif /* CONFIG_COMPAT */
+
+
-diff -NurpP --minimal linux-3.13.10/kernel/vserver/dlimit.c linux-3.13.10-vs2.3.6.11/kernel/vserver/dlimit.c
---- linux-3.13.10/kernel/vserver/dlimit.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/vserver/dlimit.c 2014-01-31 20:38:04.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/vserver/dlimit.c linux-3.14.17-vs2.3.6.13/kernel/vserver/dlimit.c
+--- linux-3.14.17/kernel/vserver/dlimit.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/vserver/dlimit.c 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,528 @@
+/*
+ * linux/kernel/vserver/dlimit.c
+EXPORT_SYMBOL_GPL(locate_dl_info);
+EXPORT_SYMBOL_GPL(rcu_free_dl_info);
+
-diff -NurpP --minimal linux-3.13.10/kernel/vserver/helper.c linux-3.13.10-vs2.3.6.11/kernel/vserver/helper.c
---- linux-3.13.10/kernel/vserver/helper.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/vserver/helper.c 2014-01-31 20:38:04.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/vserver/helper.c linux-3.14.17-vs2.3.6.13/kernel/vserver/helper.c
+--- linux-3.14.17/kernel/vserver/helper.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/vserver/helper.c 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,242 @@
+/*
+ * linux/kernel/vserver/helper.c
+ return do_vshelper(vshelper_path, argv, envp, 1);
+}
+
-diff -NurpP --minimal linux-3.13.10/kernel/vserver/history.c linux-3.13.10-vs2.3.6.11/kernel/vserver/history.c
---- linux-3.13.10/kernel/vserver/history.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/vserver/history.c 2014-01-31 20:38:04.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/vserver/history.c linux-3.14.17-vs2.3.6.13/kernel/vserver/history.c
+--- linux-3.14.17/kernel/vserver/history.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/vserver/history.c 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,258 @@
+/*
+ * kernel/vserver/history.c
+
+#endif /* CONFIG_COMPAT */
+
-diff -NurpP --minimal linux-3.13.10/kernel/vserver/inet.c linux-3.13.10-vs2.3.6.11/kernel/vserver/inet.c
---- linux-3.13.10/kernel/vserver/inet.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/vserver/inet.c 2014-02-01 00:26:40.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/vserver/inet.c linux-3.14.17-vs2.3.6.13/kernel/vserver/inet.c
+--- linux-3.14.17/kernel/vserver/inet.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/vserver/inet.c 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,236 @@
+
+#include <linux/in.h>
+
+EXPORT_SYMBOL_GPL(ip_v4_find_src);
+
-diff -NurpP --minimal linux-3.13.10/kernel/vserver/init.c linux-3.13.10-vs2.3.6.11/kernel/vserver/init.c
---- linux-3.13.10/kernel/vserver/init.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/vserver/init.c 2014-01-31 20:38:04.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/vserver/init.c linux-3.14.17-vs2.3.6.13/kernel/vserver/init.c
+--- linux-3.14.17/kernel/vserver/init.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/vserver/init.c 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,45 @@
+/*
+ * linux/kernel/init.c
+module_init(init_vserver);
+module_exit(exit_vserver);
+
-diff -NurpP --minimal linux-3.13.10/kernel/vserver/inode.c linux-3.13.10-vs2.3.6.11/kernel/vserver/inode.c
---- linux-3.13.10/kernel/vserver/inode.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/vserver/inode.c 2014-01-31 20:38:04.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/vserver/inode.c linux-3.14.17-vs2.3.6.13/kernel/vserver/inode.c
+--- linux-3.14.17/kernel/vserver/inode.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/vserver/inode.c 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,440 @@
+/*
+ * linux/kernel/vserver/inode.c
+
+#endif /* CONFIG_PROPAGATE */
+
-diff -NurpP --minimal linux-3.13.10/kernel/vserver/limit.c linux-3.13.10-vs2.3.6.11/kernel/vserver/limit.c
---- linux-3.13.10/kernel/vserver/limit.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/vserver/limit.c 2014-02-01 00:22:08.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/vserver/limit.c linux-3.14.17-vs2.3.6.13/kernel/vserver/limit.c
+--- linux-3.14.17/kernel/vserver/limit.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/vserver/limit.c 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,345 @@
+/*
+ * linux/kernel/vserver/limit.c
+ return cache;
+}
+
-diff -NurpP --minimal linux-3.13.10/kernel/vserver/limit_init.h linux-3.13.10-vs2.3.6.11/kernel/vserver/limit_init.h
---- linux-3.13.10/kernel/vserver/limit_init.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/vserver/limit_init.h 2014-01-31 20:38:04.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/vserver/limit_init.h linux-3.14.17-vs2.3.6.13/kernel/vserver/limit_init.h
+--- linux-3.14.17/kernel/vserver/limit_init.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/vserver/limit_init.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,31 @@
+
+
+ }
+}
+
-diff -NurpP --minimal linux-3.13.10/kernel/vserver/limit_proc.h linux-3.13.10-vs2.3.6.11/kernel/vserver/limit_proc.h
---- linux-3.13.10/kernel/vserver/limit_proc.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/vserver/limit_proc.h 2014-01-31 20:38:04.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/vserver/limit_proc.h linux-3.14.17-vs2.3.6.13/kernel/vserver/limit_proc.h
+--- linux-3.14.17/kernel/vserver/limit_proc.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/vserver/limit_proc.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,57 @@
+#ifndef _VX_LIMIT_PROC_H
+#define _VX_LIMIT_PROC_H
+#endif /* _VX_LIMIT_PROC_H */
+
+
-diff -NurpP --minimal linux-3.13.10/kernel/vserver/network.c linux-3.13.10-vs2.3.6.11/kernel/vserver/network.c
---- linux-3.13.10/kernel/vserver/network.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/vserver/network.c 2014-01-31 20:38:04.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/vserver/network.c linux-3.14.17-vs2.3.6.13/kernel/vserver/network.c
+--- linux-3.14.17/kernel/vserver/network.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/vserver/network.c 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,1053 @@
+/*
+ * linux/kernel/vserver/network.c
+EXPORT_SYMBOL_GPL(free_nx_info);
+EXPORT_SYMBOL_GPL(unhash_nx_info);
+
-diff -NurpP --minimal linux-3.13.10/kernel/vserver/proc.c linux-3.13.10-vs2.3.6.11/kernel/vserver/proc.c
---- linux-3.13.10/kernel/vserver/proc.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/vserver/proc.c 2014-02-01 01:21:49.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/vserver/proc.c linux-3.14.17-vs2.3.6.13/kernel/vserver/proc.c
+--- linux-3.14.17/kernel/vserver/proc.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/vserver/proc.c 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,1097 @@
+/*
+ * linux/kernel/vserver/proc.c
+ return buffer - orig;
+}
+
-diff -NurpP --minimal linux-3.13.10/kernel/vserver/sched.c linux-3.13.10-vs2.3.6.11/kernel/vserver/sched.c
---- linux-3.13.10/kernel/vserver/sched.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/vserver/sched.c 2014-01-31 20:38:04.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/vserver/sched.c linux-3.14.17-vs2.3.6.13/kernel/vserver/sched.c
+--- linux-3.14.17/kernel/vserver/sched.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/vserver/sched.c 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,83 @@
+/*
+ * linux/kernel/vserver/sched.c
+ return 0;
+}
+
-diff -NurpP --minimal linux-3.13.10/kernel/vserver/sched_init.h linux-3.13.10-vs2.3.6.11/kernel/vserver/sched_init.h
---- linux-3.13.10/kernel/vserver/sched_init.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/vserver/sched_init.h 2014-01-31 20:38:04.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/vserver/sched_init.h linux-3.14.17-vs2.3.6.13/kernel/vserver/sched_init.h
+--- linux-3.14.17/kernel/vserver/sched_init.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/vserver/sched_init.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,27 @@
+
+static inline void vx_info_init_sched(struct _vx_sched *sched)
+{
+ return;
+}
-diff -NurpP --minimal linux-3.13.10/kernel/vserver/sched_proc.h linux-3.13.10-vs2.3.6.11/kernel/vserver/sched_proc.h
---- linux-3.13.10/kernel/vserver/sched_proc.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/vserver/sched_proc.h 2014-01-31 20:38:04.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/vserver/sched_proc.h linux-3.14.17-vs2.3.6.13/kernel/vserver/sched_proc.h
+--- linux-3.14.17/kernel/vserver/sched_proc.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/vserver/sched_proc.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,32 @@
+#ifndef _VX_SCHED_PROC_H
+#define _VX_SCHED_PROC_H
+}
+
+#endif /* _VX_SCHED_PROC_H */
-diff -NurpP --minimal linux-3.13.10/kernel/vserver/signal.c linux-3.13.10-vs2.3.6.11/kernel/vserver/signal.c
---- linux-3.13.10/kernel/vserver/signal.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/vserver/signal.c 2014-01-31 20:38:04.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/vserver/signal.c linux-3.14.17-vs2.3.6.13/kernel/vserver/signal.c
+--- linux-3.14.17/kernel/vserver/signal.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/vserver/signal.c 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,134 @@
+/*
+ * linux/kernel/vserver/signal.c
+ return ret;
+}
+
-diff -NurpP --minimal linux-3.13.10/kernel/vserver/space.c linux-3.13.10-vs2.3.6.11/kernel/vserver/space.c
---- linux-3.13.10/kernel/vserver/space.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/vserver/space.c 2014-02-01 12:21:24.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/vserver/space.c linux-3.14.17-vs2.3.6.13/kernel/vserver/space.c
+--- linux-3.14.17/kernel/vserver/space.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/vserver/space.c 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,436 @@
+/*
+ * linux/kernel/vserver/space.c
+ return 0;
+}
+
-diff -NurpP --minimal linux-3.13.10/kernel/vserver/switch.c linux-3.13.10-vs2.3.6.11/kernel/vserver/switch.c
---- linux-3.13.10/kernel/vserver/switch.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/vserver/switch.c 2014-01-31 20:38:04.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/vserver/switch.c linux-3.14.17-vs2.3.6.13/kernel/vserver/switch.c
+--- linux-3.14.17/kernel/vserver/switch.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/vserver/switch.c 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,556 @@
+/*
+ * linux/kernel/vserver/switch.c
+}
+
+#endif /* CONFIG_COMPAT */
-diff -NurpP --minimal linux-3.13.10/kernel/vserver/sysctl.c linux-3.13.10-vs2.3.6.11/kernel/vserver/sysctl.c
---- linux-3.13.10/kernel/vserver/sysctl.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/vserver/sysctl.c 2014-01-31 20:38:04.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/vserver/sysctl.c linux-3.14.17-vs2.3.6.13/kernel/vserver/sysctl.c
+--- linux-3.14.17/kernel/vserver/sysctl.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/vserver/sysctl.c 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,247 @@
+/*
+ * kernel/vserver/sysctl.c
+EXPORT_SYMBOL_GPL(vs_debug_perm);
+EXPORT_SYMBOL_GPL(vs_debug_misc);
+
-diff -NurpP --minimal linux-3.13.10/kernel/vserver/tag.c linux-3.13.10-vs2.3.6.11/kernel/vserver/tag.c
---- linux-3.13.10/kernel/vserver/tag.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/vserver/tag.c 2014-01-31 20:38:04.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/vserver/tag.c linux-3.14.17-vs2.3.6.13/kernel/vserver/tag.c
+--- linux-3.14.17/kernel/vserver/tag.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/vserver/tag.c 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,63 @@
+/*
+ * linux/kernel/vserver/tag.c
+}
+
+
-diff -NurpP --minimal linux-3.13.10/kernel/vserver/vci_config.h linux-3.13.10-vs2.3.6.11/kernel/vserver/vci_config.h
---- linux-3.13.10/kernel/vserver/vci_config.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/kernel/vserver/vci_config.h 2014-01-31 20:38:04.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/kernel/vserver/vci_config.h linux-3.14.17-vs2.3.6.13/kernel/vserver/vci_config.h
+--- linux-3.14.17/kernel/vserver/vci_config.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/kernel/vserver/vci_config.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,80 @@
+
+/* interface version */
+ 0;
+}
+
-diff -NurpP --minimal linux-3.13.10/mm/memcontrol.c linux-3.13.10-vs2.3.6.11/mm/memcontrol.c
---- linux-3.13.10/mm/memcontrol.c 2014-04-17 01:12:40.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/mm/memcontrol.c 2014-04-17 01:17:11.000000000 +0000
-@@ -1056,6 +1056,31 @@ struct mem_cgroup *mem_cgroup_from_task(
+diff -NurpP --minimal linux-3.14.17/mm/memcontrol.c linux-3.14.17-vs2.3.6.13/mm/memcontrol.c
+--- linux-3.14.17/mm/memcontrol.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/mm/memcontrol.c 2014-08-30 14:27:38.000000000 +0000
+@@ -1075,6 +1075,31 @@ struct mem_cgroup *mem_cgroup_from_task(
return mem_cgroup_from_css(task_css(p, mem_cgroup_subsys_id));
}
struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm)
{
struct mem_cgroup *memcg = NULL;
-diff -NurpP --minimal linux-3.13.10/mm/oom_kill.c linux-3.13.10-vs2.3.6.11/mm/oom_kill.c
---- linux-3.13.10/mm/oom_kill.c 2014-04-17 01:12:40.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/mm/oom_kill.c 2014-02-25 11:26:10.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/mm/oom_kill.c linux-3.14.17-vs2.3.6.13/mm/oom_kill.c
+--- linux-3.14.17/mm/oom_kill.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/mm/oom_kill.c 2014-08-30 14:27:38.000000000 +0000
@@ -35,6 +35,8 @@
#include <linux/freezer.h>
#include <linux/ftrace.h>
#define CREATE_TRACE_POINTS
#include <trace/events/oom.h>
-@@ -113,11 +115,18 @@ struct task_struct *find_lock_task_mm(st
+@@ -121,11 +123,18 @@ found:
static bool oom_unkillable_task(struct task_struct *p,
const struct mem_cgroup *memcg, const nodemask_t *nodemask)
{
/* When mem_cgroup_out_of_memory() and p is not member of the group */
if (memcg && !task_in_mem_cgroup(p, memcg))
return true;
-@@ -426,8 +435,8 @@ void oom_kill_process(struct task_struct
+@@ -438,8 +447,8 @@ void oom_kill_process(struct task_struct
dump_header(p, gfp_mask, order, memcg, nodemask);
task_lock(p);
task_unlock(p);
/*
-@@ -472,8 +481,8 @@ void oom_kill_process(struct task_struct
+@@ -482,8 +491,8 @@ void oom_kill_process(struct task_struct
/* mm cannot safely be dereferenced after task_unlock(victim) */
mm = victim->mm;
K(get_mm_counter(victim->mm, MM_ANONPAGES)),
K(get_mm_counter(victim->mm, MM_FILEPAGES)));
task_unlock(victim);
-@@ -543,6 +552,8 @@ int unregister_oom_notifier(struct notif
+@@ -554,6 +563,8 @@ int unregister_oom_notifier(struct notif
}
EXPORT_SYMBOL_GPL(unregister_oom_notifier);
/*
* Try to acquire the OOM killer lock for the zones in zonelist. Returns zero
* if a parallel OOM killing is already taking place that includes a zone in
-@@ -655,7 +666,12 @@ void out_of_memory(struct zonelist *zone
+@@ -666,7 +677,12 @@ void out_of_memory(struct zonelist *zone
/* Found nothing?!?! Either we hang forever, or we panic. */
if (!p) {
dump_header(NULL, gfp_mask, order, NULL, mpol_mask);
}
if (p != (void *)-1UL) {
oom_kill_process(p, gfp_mask, order, points, totalpages, NULL,
-diff -NurpP --minimal linux-3.13.10/mm/page_alloc.c linux-3.13.10-vs2.3.6.11/mm/page_alloc.c
---- linux-3.13.10/mm/page_alloc.c 2014-04-17 01:12:40.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/mm/page_alloc.c 2014-04-17 01:17:11.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/mm/page_alloc.c linux-3.14.17-vs2.3.6.13/mm/page_alloc.c
+--- linux-3.14.17/mm/page_alloc.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/mm/page_alloc.c 2014-08-30 14:27:38.000000000 +0000
@@ -61,6 +61,8 @@
#include <linux/page-debug-flags.h>
#include <linux/hugetlb.h>
#include <asm/sections.h>
#include <asm/tlbflush.h>
-@@ -2983,6 +2985,9 @@ void si_meminfo(struct sysinfo *val)
+@@ -3019,6 +3021,9 @@ void si_meminfo(struct sysinfo *val)
val->totalhigh = totalhigh_pages;
val->freehigh = nr_free_highpages();
val->mem_unit = PAGE_SIZE;
}
EXPORT_SYMBOL(si_meminfo);
-@@ -3007,6 +3012,9 @@ void si_meminfo_node(struct sysinfo *val
+@@ -3043,6 +3048,9 @@ void si_meminfo_node(struct sysinfo *val
val->freehigh = 0;
#endif
val->mem_unit = PAGE_SIZE;
}
#endif
-diff -NurpP --minimal linux-3.13.10/mm/pgtable-generic.c linux-3.13.10-vs2.3.6.11/mm/pgtable-generic.c
---- linux-3.13.10/mm/pgtable-generic.c 2014-01-22 20:39:14.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/mm/pgtable-generic.c 2014-01-31 20:38:04.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/mm/pgtable-generic.c linux-3.14.17-vs2.3.6.13/mm/pgtable-generic.c
+--- linux-3.14.17/mm/pgtable-generic.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/mm/pgtable-generic.c 2014-08-30 14:27:38.000000000 +0000
@@ -6,6 +6,8 @@
* Copyright (C) 2010 Linus Torvalds
*/
#include <linux/pagemap.h>
#include <asm/tlb.h>
#include <asm-generic/pgtable.h>
-diff -NurpP --minimal linux-3.13.10/mm/shmem.c linux-3.13.10-vs2.3.6.11/mm/shmem.c
---- linux-3.13.10/mm/shmem.c 2014-01-22 20:39:14.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/mm/shmem.c 2014-01-31 20:38:04.000000000 +0000
-@@ -1909,7 +1909,7 @@ static int shmem_statfs(struct dentry *d
+diff -NurpP --minimal linux-3.14.17/mm/shmem.c linux-3.14.17-vs2.3.6.13/mm/shmem.c
+--- linux-3.14.17/mm/shmem.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/mm/shmem.c 2014-08-30 14:27:38.000000000 +0000
+@@ -1987,7 +1987,7 @@ static int shmem_statfs(struct dentry *d
{
struct shmem_sb_info *sbinfo = SHMEM_SB(dentry->d_sb);
buf->f_bsize = PAGE_CACHE_SIZE;
buf->f_namelen = NAME_MAX;
if (sbinfo->max_blocks) {
-@@ -2639,7 +2639,7 @@ int shmem_fill_super(struct super_block
+@@ -2705,7 +2705,7 @@ int shmem_fill_super(struct super_block
sb->s_maxbytes = MAX_LFS_FILESIZE;
sb->s_blocksize = PAGE_CACHE_SIZE;
sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
sb->s_op = &shmem_ops;
sb->s_time_gran = 1;
#ifdef CONFIG_TMPFS_XATTR
-diff -NurpP --minimal linux-3.13.10/mm/slab.c linux-3.13.10-vs2.3.6.11/mm/slab.c
---- linux-3.13.10/mm/slab.c 2014-01-22 20:39:14.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/mm/slab.c 2014-01-31 20:38:04.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/mm/slab.c linux-3.14.17-vs2.3.6.13/mm/slab.c
+--- linux-3.14.17/mm/slab.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/mm/slab.c 2014-08-30 14:27:38.000000000 +0000
@@ -322,6 +322,8 @@ static void kmem_cache_node_init(struct
#define STATS_INC_FREEMISS(x) do { } while (0)
#endif
#if DEBUG
/*
-@@ -3240,6 +3242,7 @@ slab_alloc_node(struct kmem_cache *cache
+@@ -3296,6 +3298,7 @@ slab_alloc_node(struct kmem_cache *cache
/* ___cache_alloc_node can fall back to other nodes */
ptr = ____cache_alloc_node(cachep, flags, nodeid);
out:
local_irq_restore(save_flags);
ptr = cache_alloc_debugcheck_after(cachep, flags, ptr, caller);
kmemleak_alloc_recursive(ptr, cachep->object_size, 1, cachep->flags,
-@@ -3430,6 +3433,7 @@ static inline void __cache_free(struct k
+@@ -3486,6 +3489,7 @@ static inline void __cache_free(struct k
check_irq_off();
kmemleak_free_recursive(objp, cachep->flags);
objp = cache_free_debugcheck(cachep, objp, caller);
kmemcheck_slab_free(cachep, objp, cachep->object_size);
-diff -NurpP --minimal linux-3.13.10/mm/slab_vs.h linux-3.13.10-vs2.3.6.11/mm/slab_vs.h
---- linux-3.13.10/mm/slab_vs.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/mm/slab_vs.h 2014-01-31 20:38:04.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/mm/slab_vs.h linux-3.14.17-vs2.3.6.13/mm/slab_vs.h
+--- linux-3.14.17/mm/slab_vs.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/mm/slab_vs.h 2014-08-30 14:27:38.000000000 +0000
@@ -0,0 +1,29 @@
+
+#include <linux/vserver/context.h>
+ atomic_sub(cachep->size, &vxi->cacct.slab[what]);
+}
+
-diff -NurpP --minimal linux-3.13.10/mm/swapfile.c linux-3.13.10-vs2.3.6.11/mm/swapfile.c
---- linux-3.13.10/mm/swapfile.c 2014-04-17 01:12:40.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/mm/swapfile.c 2014-02-25 11:26:10.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/mm/swapfile.c linux-3.14.17-vs2.3.6.13/mm/swapfile.c
+--- linux-3.14.17/mm/swapfile.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/mm/swapfile.c 2014-08-30 14:27:38.000000000 +0000
@@ -39,6 +39,7 @@
#include <asm/tlbflush.h>
#include <linux/swapops.h>
static bool swap_count_continued(struct swap_info_struct *, pgoff_t,
unsigned char);
-@@ -2042,6 +2043,16 @@ static int swap_show(struct seq_file *sw
+@@ -2043,6 +2044,16 @@ static int swap_show(struct seq_file *sw
if (si == SEQ_START_TOKEN) {
seq_puts(swap,"Filename\t\t\t\tType\t\tSize\tUsed\tPriority\n");
return 0;
}
-@@ -2589,6 +2600,8 @@ void si_swapinfo(struct sysinfo *val)
+@@ -2590,6 +2601,8 @@ void si_swapinfo(struct sysinfo *val)
val->freeswap = atomic_long_read(&nr_swap_pages) + nr_to_be_unused;
val->totalswap = total_swap_pages + nr_to_be_unused;
spin_unlock(&swap_lock);
}
/*
-diff -NurpP --minimal linux-3.13.10/net/bridge/br_multicast.c linux-3.13.10-vs2.3.6.11/net/bridge/br_multicast.c
---- linux-3.13.10/net/bridge/br_multicast.c 2014-04-17 01:12:40.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/net/bridge/br_multicast.c 2014-04-17 01:17:11.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/net/bridge/br_multicast.c linux-3.14.17-vs2.3.6.13/net/bridge/br_multicast.c
+--- linux-3.14.17/net/bridge/br_multicast.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/net/bridge/br_multicast.c 2014-08-30 14:27:38.000000000 +0000
@@ -447,7 +447,7 @@ static struct sk_buff *br_ip6_multicast_
ip6h->hop_limit = 1;
ipv6_addr_set(&ip6h->daddr, htonl(0xff020000), 0, 0, htonl(1));
kfree_skb(skb);
return NULL;
}
-diff -NurpP --minimal linux-3.13.10/net/core/dev.c linux-3.13.10-vs2.3.6.11/net/core/dev.c
---- linux-3.13.10/net/core/dev.c 2014-04-17 01:12:41.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/net/core/dev.c 2014-03-12 15:51:08.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/net/core/dev.c linux-3.14.17-vs2.3.6.13/net/core/dev.c
+--- linux-3.14.17/net/core/dev.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/net/core/dev.c 2014-08-30 14:27:38.000000000 +0000
@@ -122,6 +122,7 @@
#include <linux/in.h>
#include <linux/jhash.h>
#include <trace/events/napi.h>
#include <trace/events/net.h>
#include <trace/events/skb.h>
-@@ -669,7 +670,8 @@ struct net_device *__dev_get_by_name(str
+@@ -673,7 +674,8 @@ struct net_device *__dev_get_by_name(str
struct hlist_head *head = dev_name_hash(net, name);
hlist_for_each_entry(dev, head, name_hlist)
return dev;
return NULL;
-@@ -694,7 +696,8 @@ struct net_device *dev_get_by_name_rcu(s
+@@ -698,7 +700,8 @@ struct net_device *dev_get_by_name_rcu(s
struct hlist_head *head = dev_name_hash(net, name);
hlist_for_each_entry_rcu(dev, head, name_hlist)
return dev;
return NULL;
-@@ -744,7 +747,8 @@ struct net_device *__dev_get_by_index(st
+@@ -748,7 +751,8 @@ struct net_device *__dev_get_by_index(st
struct hlist_head *head = dev_index_hash(net, ifindex);
hlist_for_each_entry(dev, head, index_hlist)
return dev;
return NULL;
-@@ -762,7 +766,7 @@ EXPORT_SYMBOL(__dev_get_by_index);
+@@ -766,7 +770,7 @@ EXPORT_SYMBOL(__dev_get_by_index);
* about locking. The caller must hold RCU lock.
*/
{
struct net_device *dev;
struct hlist_head *head = dev_index_hash(net, ifindex);
-@@ -773,6 +777,16 @@ struct net_device *dev_get_by_index_rcu(
+@@ -777,6 +781,16 @@ struct net_device *dev_get_by_index_rcu(
return NULL;
}
EXPORT_SYMBOL(dev_get_by_index_rcu);
-@@ -855,7 +869,8 @@ struct net_device *dev_getbyhwaddr_rcu(s
+@@ -859,7 +873,8 @@ struct net_device *dev_getbyhwaddr_rcu(s
for_each_netdev_rcu(net, dev)
if (dev->type == type &&
return dev;
return NULL;
-@@ -867,9 +882,11 @@ struct net_device *__dev_getfirstbyhwtyp
+@@ -871,9 +886,11 @@ struct net_device *__dev_getfirstbyhwtyp
struct net_device *dev;
ASSERT_RTNL();
return NULL;
}
-@@ -881,7 +898,8 @@ struct net_device *dev_getfirstbyhwtype(
+@@ -885,7 +902,8 @@ struct net_device *dev_getfirstbyhwtype(
rcu_read_lock();
for_each_netdev_rcu(net, dev)
dev_hold(dev);
ret = dev;
break;
-@@ -909,7 +927,8 @@ struct net_device *dev_get_by_flags_rcu(
+@@ -913,7 +931,8 @@ struct net_device *dev_get_by_flags_rcu(
ret = NULL;
for_each_netdev_rcu(net, dev) {
ret = dev;
break;
}
-@@ -987,6 +1006,8 @@ static int __dev_alloc_name(struct net *
+@@ -991,6 +1010,8 @@ static int __dev_alloc_name(struct net *
continue;
if (i < 0 || i >= max_netdevices)
continue;
/* avoid cases where sscanf is not exact inverse of printf */
snprintf(buf, IFNAMSIZ, name, i);
-diff -NurpP --minimal linux-3.13.10/net/core/net-procfs.c linux-3.13.10-vs2.3.6.11/net/core/net-procfs.c
---- linux-3.13.10/net/core/net-procfs.c 2013-11-25 15:45:09.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/net/core/net-procfs.c 2014-01-31 20:38:04.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/net/core/net-procfs.c linux-3.14.17-vs2.3.6.13/net/core/net-procfs.c
+--- linux-3.14.17/net/core/net-procfs.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/net/core/net-procfs.c 2014-08-30 14:27:38.000000000 +0000
@@ -1,6 +1,7 @@
#include <linux/netdevice.h>
#include <linux/proc_fs.h>
seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
"%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
dev->name, stats->rx_bytes, stats->rx_packets,
-diff -NurpP --minimal linux-3.13.10/net/core/rtnetlink.c linux-3.13.10-vs2.3.6.11/net/core/rtnetlink.c
---- linux-3.13.10/net/core/rtnetlink.c 2014-04-17 01:12:41.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/net/core/rtnetlink.c 2014-04-17 01:17:11.000000000 +0000
-@@ -1090,6 +1090,8 @@ static int rtnl_dump_ifinfo(struct sk_bu
+diff -NurpP --minimal linux-3.14.17/net/core/rtnetlink.c linux-3.14.17-vs2.3.6.13/net/core/rtnetlink.c
+--- linux-3.14.17/net/core/rtnetlink.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/net/core/rtnetlink.c 2014-08-30 14:40:40.000000000 +0000
+@@ -1196,6 +1196,8 @@ static int rtnl_dump_ifinfo(struct sk_bu
hlist_for_each_entry_rcu(dev, head, index_hlist) {
if (idx < s_idx)
goto cont;
err = rtnl_fill_ifinfo(skb, dev, RTM_NEWLINK,
NETLINK_CB(cb->skb).portid,
cb->nlh->nlmsg_seq, 0,
-@@ -1992,6 +1994,9 @@ void rtmsg_ifinfo(int type, struct net_d
+@@ -2156,6 +2158,9 @@ void rtmsg_ifinfo(int type, struct net_d
int err = -ENOBUFS;
size_t if_info_size;
skb = nlmsg_new((if_info_size = if_nlmsg_size(dev, 0)), flags);
if (skb == NULL)
goto errout;
-diff -NurpP --minimal linux-3.13.10/net/core/sock.c linux-3.13.10-vs2.3.6.11/net/core/sock.c
---- linux-3.13.10/net/core/sock.c 2014-04-17 01:12:41.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/net/core/sock.c 2014-04-17 01:17:11.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/net/core/sock.c linux-3.14.17-vs2.3.6.13/net/core/sock.c
+--- linux-3.14.17/net/core/sock.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/net/core/sock.c 2014-08-30 14:27:38.000000000 +0000
@@ -133,6 +133,10 @@
#include <net/netprio_cgroup.h>
#include <trace/events/sock.h>
-@@ -1279,6 +1283,8 @@ static struct sock *sk_prot_alloc(struct
+@@ -1331,6 +1335,8 @@ static struct sock *sk_prot_alloc(struct
goto out_free_sec;
sk_tx_queue_clear(sk);
}
return sk;
-@@ -1387,6 +1393,11 @@ static void __sk_free(struct sock *sk)
+@@ -1427,6 +1433,11 @@ static void __sk_free(struct sock *sk)
put_cred(sk->sk_peer_cred);
put_pid(sk->sk_peer_pid);
put_net(sock_net(sk));
sk_prot_free(sk->sk_prot_creator, sk);
}
-@@ -1447,6 +1458,8 @@ struct sock *sk_clone_lock(const struct
+@@ -1487,6 +1498,8 @@ struct sock *sk_clone_lock(const struct
/* SANITY */
get_net(sock_net(newsk));
sk_node_init(&newsk->sk_node);
sock_lock_init(newsk);
bh_lock_sock(newsk);
-@@ -1503,6 +1516,12 @@ struct sock *sk_clone_lock(const struct
+@@ -1543,6 +1556,12 @@ struct sock *sk_clone_lock(const struct
smp_wmb();
atomic_set(&newsk->sk_refcnt, 2);
/*
* Increment the counter in the same struct proto as the master
* sock (sk_refcnt_debug_inc uses newsk->sk_prot->socks, that
-@@ -2340,6 +2359,12 @@ void sock_init_data(struct socket *sock,
+@@ -2362,6 +2381,12 @@ void sock_init_data(struct socket *sock,
sk->sk_stamp = ktime_set(-1L, 0);
#ifdef CONFIG_NET_RX_BUSY_POLL
sk->sk_napi_id = 0;
sk->sk_ll_usec = sysctl_net_busy_read;
-diff -NurpP --minimal linux-3.13.10/net/ipv4/af_inet.c linux-3.13.10-vs2.3.6.11/net/ipv4/af_inet.c
---- linux-3.13.10/net/ipv4/af_inet.c 2014-04-17 01:12:41.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/net/ipv4/af_inet.c 2014-04-17 01:17:11.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/net/ipv4/af_inet.c linux-3.14.17-vs2.3.6.13/net/ipv4/af_inet.c
+--- linux-3.14.17/net/ipv4/af_inet.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/net/ipv4/af_inet.c 2014-08-30 14:27:38.000000000 +0000
@@ -118,6 +118,7 @@
#ifdef CONFIG_IP_MROUTE
#include <linux/mroute.h>
/* The inetsw table contains everything that inet_create needs to
-@@ -309,10 +310,13 @@ lookup_protocol:
+@@ -306,10 +307,13 @@ lookup_protocol:
}
err = -EPERM;
sock->ops = answer->ops;
answer_prot = answer->prot;
answer_no_check = answer->no_check;
-@@ -433,6 +437,7 @@ int inet_bind(struct socket *sock, struc
+@@ -430,6 +434,7 @@ int inet_bind(struct socket *sock, struc
struct sockaddr_in *addr = (struct sockaddr_in *)uaddr;
struct sock *sk = sock->sk;
struct inet_sock *inet = inet_sk(sk);
struct net *net = sock_net(sk);
unsigned short snum;
int chk_addr_ret;
-@@ -457,7 +462,11 @@ int inet_bind(struct socket *sock, struc
+@@ -454,7 +459,11 @@ int inet_bind(struct socket *sock, struc
goto out;
}
/* Not specified by any standard per-se, however it breaks too
* many applications when removed. It is unfortunate since
-@@ -469,7 +478,7 @@ int inet_bind(struct socket *sock, struc
+@@ -466,7 +475,7 @@ int inet_bind(struct socket *sock, struc
err = -EADDRNOTAVAIL;
if (!sysctl_ip_nonlocal_bind &&
!(inet->freebind || inet->transparent) &&
chk_addr_ret != RTN_LOCAL &&
chk_addr_ret != RTN_MULTICAST &&
chk_addr_ret != RTN_BROADCAST)
-@@ -495,7 +504,7 @@ int inet_bind(struct socket *sock, struc
+@@ -492,7 +501,7 @@ int inet_bind(struct socket *sock, struc
if (sk->sk_state != TCP_CLOSE || inet->inet_num)
goto out_release_sock;
if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST)
inet->inet_saddr = 0; /* Use device */
-@@ -714,11 +723,13 @@ int inet_getname(struct socket *sock, st
+@@ -711,11 +720,13 @@ int inet_getname(struct socket *sock, st
peer == 1))
return -ENOTCONN;
sin->sin_port = inet->inet_dport;
sin->sin_port = inet->inet_sport;
sin->sin_addr.s_addr = addr;
}
-diff -NurpP --minimal linux-3.13.10/net/ipv4/arp.c linux-3.13.10-vs2.3.6.11/net/ipv4/arp.c
---- linux-3.13.10/net/ipv4/arp.c 2013-11-25 15:47:06.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/net/ipv4/arp.c 2014-01-31 20:38:04.000000000 +0000
-@@ -1336,6 +1336,7 @@ static void arp_format_neigh_entry(struc
+diff -NurpP --minimal linux-3.14.17/net/ipv4/arp.c linux-3.14.17-vs2.3.6.13/net/ipv4/arp.c
+--- linux-3.14.17/net/ipv4/arp.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/net/ipv4/arp.c 2014-08-30 14:27:38.000000000 +0000
+@@ -1345,6 +1345,7 @@ static void arp_format_neigh_entry(struc
struct net_device *dev = n->dev;
int hatype = dev->type;
read_lock(&n->lock);
/* Convert hardware address to XX:XX:XX:XX ... form. */
#if IS_ENABLED(CONFIG_AX25)
-@@ -1367,6 +1368,7 @@ static void arp_format_pneigh_entry(stru
+@@ -1376,6 +1377,7 @@ static void arp_format_pneigh_entry(stru
int hatype = dev ? dev->type : 0;
char tbuf[16];
sprintf(tbuf, "%pI4", n->key);
seq_printf(seq, "%-16s 0x%-10x0x%-10x%s * %s\n",
tbuf, hatype, ATF_PUBL | ATF_PERM, "00:00:00:00:00:00",
-diff -NurpP --minimal linux-3.13.10/net/ipv4/devinet.c linux-3.13.10-vs2.3.6.11/net/ipv4/devinet.c
---- linux-3.13.10/net/ipv4/devinet.c 2014-04-17 01:12:41.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/net/ipv4/devinet.c 2014-03-12 15:51:08.000000000 +0000
-@@ -527,6 +527,7 @@ struct in_device *inetdev_by_index(struc
+diff -NurpP --minimal linux-3.14.17/net/ipv4/devinet.c linux-3.14.17-vs2.3.6.13/net/ipv4/devinet.c
+--- linux-3.14.17/net/ipv4/devinet.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/net/ipv4/devinet.c 2014-08-30 14:27:38.000000000 +0000
+@@ -529,6 +529,7 @@ struct in_device *inetdev_by_index(struc
}
EXPORT_SYMBOL(inetdev_by_index);
/* Called only from RTNL semaphored context. No locks. */
struct in_ifaddr *inet_ifa_byprefix(struct in_device *in_dev, __be32 prefix,
-@@ -947,6 +948,8 @@ int devinet_ioctl(struct net *net, unsig
+@@ -953,6 +954,8 @@ int devinet_ioctl(struct net *net, unsig
in_dev = __in_dev_get_rtnl(dev);
if (in_dev) {
if (tryaddrmatch) {
/* Matthias Andree */
/* compare label and address (4.4BSD style) */
-@@ -955,6 +958,8 @@ int devinet_ioctl(struct net *net, unsig
+@@ -961,6 +964,8 @@ int devinet_ioctl(struct net *net, unsig
This is checked above. */
for (ifap = &in_dev->ifa_list; (ifa = *ifap) != NULL;
ifap = &ifa->ifa_next) {
if (!strcmp(ifr.ifr_name, ifa->ifa_label) &&
sin_orig.sin_addr.s_addr ==
ifa->ifa_local) {
-@@ -967,9 +972,12 @@ int devinet_ioctl(struct net *net, unsig
+@@ -973,9 +978,12 @@ int devinet_ioctl(struct net *net, unsig
comparing just the label */
if (!ifa) {
for (ifap = &in_dev->ifa_list; (ifa = *ifap) != NULL;
}
}
-@@ -1123,6 +1131,8 @@ static int inet_gifconf(struct net_devic
+@@ -1129,6 +1137,8 @@ static int inet_gifconf(struct net_devic
goto out;
for (ifa = in_dev->ifa_list; ifa; ifa = ifa->ifa_next) {
if (!buf) {
done += sizeof(ifr);
continue;
-@@ -1524,6 +1534,7 @@ static int inet_dump_ifaddr(struct sk_bu
+@@ -1533,6 +1543,7 @@ static int inet_dump_ifaddr(struct sk_bu
struct net_device *dev;
struct in_device *in_dev;
struct in_ifaddr *ifa;
struct hlist_head *head;
s_h = cb->args[0];
-@@ -1547,6 +1558,8 @@ static int inet_dump_ifaddr(struct sk_bu
+@@ -1556,6 +1567,8 @@ static int inet_dump_ifaddr(struct sk_bu
for (ifa = in_dev->ifa_list, ip_idx = 0; ifa;
ifa = ifa->ifa_next, ip_idx++) {
if (ip_idx < s_ip_idx)
continue;
if (inet_fill_ifaddr(skb, ifa,
-diff -NurpP --minimal linux-3.13.10/net/ipv4/fib_trie.c linux-3.13.10-vs2.3.6.11/net/ipv4/fib_trie.c
---- linux-3.13.10/net/ipv4/fib_trie.c 2014-01-22 20:39:15.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/net/ipv4/fib_trie.c 2014-01-31 20:38:04.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/net/ipv4/fib_trie.c linux-3.14.17-vs2.3.6.13/net/ipv4/fib_trie.c
+--- linux-3.14.17/net/ipv4/fib_trie.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/net/ipv4/fib_trie.c 2014-08-30 14:27:38.000000000 +0000
@@ -2530,6 +2530,7 @@ static int fib_route_seq_show(struct seq
seq_setwidth(seq, 127);
if (fi)
seq_printf(seq,
"%s\t%08X\t%08X\t%04X\t%d\t%u\t"
-diff -NurpP --minimal linux-3.13.10/net/ipv4/inet_connection_sock.c linux-3.13.10-vs2.3.6.11/net/ipv4/inet_connection_sock.c
---- linux-3.13.10/net/ipv4/inet_connection_sock.c 2014-01-22 20:39:15.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/net/ipv4/inet_connection_sock.c 2014-02-01 00:33:11.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/net/ipv4/inet_connection_sock.c linux-3.14.17-vs2.3.6.13/net/ipv4/inet_connection_sock.c
+--- linux-3.14.17/net/ipv4/inet_connection_sock.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/net/ipv4/inet_connection_sock.c 2014-08-30 14:27:38.000000000 +0000
@@ -45,6 +45,37 @@ void inet_get_local_port_range(struct ne
}
EXPORT_SYMBOL(inet_get_local_port_range);
break;
}
}
-diff -NurpP --minimal linux-3.13.10/net/ipv4/inet_diag.c linux-3.13.10-vs2.3.6.11/net/ipv4/inet_diag.c
---- linux-3.13.10/net/ipv4/inet_diag.c 2014-02-01 02:17:51.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/net/ipv4/inet_diag.c 2014-02-01 02:32:22.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/net/ipv4/inet_diag.c linux-3.14.17-vs2.3.6.13/net/ipv4/inet_diag.c
+--- linux-3.14.17/net/ipv4/inet_diag.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/net/ipv4/inet_diag.c 2014-08-30 14:27:38.000000000 +0000
@@ -31,6 +31,8 @@
#include <linux/inet.h>
if (num < s_num)
goto next_normal;
state = (sk->sk_state == TCP_TIME_WAIT) ?
-diff -NurpP --minimal linux-3.13.10/net/ipv4/inet_hashtables.c linux-3.13.10-vs2.3.6.11/net/ipv4/inet_hashtables.c
---- linux-3.13.10/net/ipv4/inet_hashtables.c 2014-01-22 20:39:15.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/net/ipv4/inet_hashtables.c 2014-01-31 20:38:04.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/net/ipv4/inet_hashtables.c linux-3.14.17-vs2.3.6.13/net/ipv4/inet_hashtables.c
+--- linux-3.14.17/net/ipv4/inet_hashtables.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/net/ipv4/inet_hashtables.c 2014-08-30 14:27:38.000000000 +0000
@@ -22,6 +22,7 @@
#include <net/inet_connection_sock.h>
#include <net/inet_hashtables.h>
/*
* if the nulls value we got at the end of this lookup is
* not the expected one, we must restart lookup.
-diff -NurpP --minimal linux-3.13.10/net/ipv4/netfilter.c linux-3.13.10-vs2.3.6.11/net/ipv4/netfilter.c
---- linux-3.13.10/net/ipv4/netfilter.c 2013-07-14 17:01:37.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/net/ipv4/netfilter.c 2014-01-31 20:38:04.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/net/ipv4/netfilter.c linux-3.14.17-vs2.3.6.13/net/ipv4/netfilter.c
+--- linux-3.14.17/net/ipv4/netfilter.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/net/ipv4/netfilter.c 2014-08-30 14:27:38.000000000 +0000
@@ -11,7 +11,7 @@
#include <linux/skbuff.h>
#include <linux/gfp.h>
#include <net/xfrm.h>
#include <net/ip.h>
#include <net/netfilter/nf_queue.h>
-diff -NurpP --minimal linux-3.13.10/net/ipv4/raw.c linux-3.13.10-vs2.3.6.11/net/ipv4/raw.c
---- linux-3.13.10/net/ipv4/raw.c 2014-01-22 20:39:15.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/net/ipv4/raw.c 2014-01-31 20:38:04.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/net/ipv4/raw.c linux-3.14.17-vs2.3.6.13/net/ipv4/raw.c
+--- linux-3.14.17/net/ipv4/raw.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/net/ipv4/raw.c 2014-08-30 14:27:38.000000000 +0000
@@ -116,7 +116,7 @@ static struct sock *__raw_v4_lookup(stru
if (net_eq(sock_net(sk), net) && inet->inet_num == num &&
if (!sk && ++state->bucket < RAW_HTABLE_SIZE) {
sk = sk_head(&state->h->ht[state->bucket]);
-diff -NurpP --minimal linux-3.13.10/net/ipv4/route.c linux-3.13.10-vs2.3.6.11/net/ipv4/route.c
---- linux-3.13.10/net/ipv4/route.c 2014-04-17 01:12:41.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/net/ipv4/route.c 2014-03-12 15:51:08.000000000 +0000
-@@ -2063,7 +2063,7 @@ struct rtable *__ip_route_output_key(str
+diff -NurpP --minimal linux-3.14.17/net/ipv4/route.c linux-3.14.17-vs2.3.6.13/net/ipv4/route.c
+--- linux-3.14.17/net/ipv4/route.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/net/ipv4/route.c 2014-08-30 14:27:38.000000000 +0000
+@@ -2073,7 +2073,7 @@ struct rtable *__ip_route_output_key(str
if (fl4->flowi4_oif) {
rth = ERR_PTR(-ENODEV);
if (dev_out == NULL)
goto out;
-diff -NurpP --minimal linux-3.13.10/net/ipv4/tcp.c linux-3.13.10-vs2.3.6.11/net/ipv4/tcp.c
---- linux-3.13.10/net/ipv4/tcp.c 2014-04-17 01:12:41.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/net/ipv4/tcp.c 2014-04-17 01:17:11.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/net/ipv4/tcp.c linux-3.14.17-vs2.3.6.13/net/ipv4/tcp.c
+--- linux-3.14.17/net/ipv4/tcp.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/net/ipv4/tcp.c 2014-08-30 14:27:38.000000000 +0000
@@ -268,6 +268,7 @@
#include <linux/crypto.h>
#include <linux/time.h>
#include <net/icmp.h>
#include <net/inet_common.h>
-diff -NurpP --minimal linux-3.13.10/net/ipv4/tcp_ipv4.c linux-3.13.10-vs2.3.6.11/net/ipv4/tcp_ipv4.c
---- linux-3.13.10/net/ipv4/tcp_ipv4.c 2014-04-17 01:12:41.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/net/ipv4/tcp_ipv4.c 2014-04-17 01:17:11.000000000 +0000
-@@ -2227,6 +2227,12 @@ static void *listening_get_next(struct s
+diff -NurpP --minimal linux-3.14.17/net/ipv4/tcp_ipv4.c linux-3.14.17-vs2.3.6.13/net/ipv4/tcp_ipv4.c
+--- linux-3.14.17/net/ipv4/tcp_ipv4.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/net/ipv4/tcp_ipv4.c 2014-08-30 14:27:38.000000000 +0000
+@@ -2226,6 +2226,12 @@ static void *listening_get_next(struct s
req = req->dl_next;
while (1) {
while (req) {
if (req->rsk_ops->family == st->family) {
cur = req;
goto out;
-@@ -2251,6 +2257,10 @@ get_req:
+@@ -2250,6 +2256,10 @@ get_req:
}
get_sk:
sk_nulls_for_each_from(sk, node) {
if (!net_eq(sock_net(sk), net))
continue;
if (sk->sk_family == st->family) {
-@@ -2325,6 +2335,11 @@ static void *established_get_first(struc
+@@ -2324,6 +2334,11 @@ static void *established_get_first(struc
spin_lock_bh(lock);
sk_nulls_for_each(sk, node, &tcp_hashinfo.ehash[st->bucket].chain) {
if (sk->sk_family != st->family ||
!net_eq(sock_net(sk), net)) {
continue;
-@@ -2351,6 +2366,11 @@ static void *established_get_next(struct
+@@ -2350,6 +2365,11 @@ static void *established_get_next(struct
sk = sk_nulls_next(sk);
sk_nulls_for_each_from(sk, node) {
if (sk->sk_family == st->family && net_eq(sock_net(sk), net))
return sk;
}
-@@ -2549,9 +2569,9 @@ static void get_openreq4(const struct so
+@@ -2548,9 +2568,9 @@ static void get_openreq4(const struct so
seq_printf(f, "%4d: %08X:%04X %08X:%04X"
" %02X %08X:%08X %02X:%08lX %08X %5u %8d %u %d %pK",
i,
ntohs(ireq->ir_rmt_port),
TCP_SYN_RECV,
0, 0, /* could print option size, but that is af dependent. */
-@@ -2573,8 +2593,8 @@ static void get_tcp4_sock(struct sock *s
+@@ -2572,8 +2592,8 @@ static void get_tcp4_sock(struct sock *s
const struct inet_connection_sock *icsk = inet_csk(sk);
const struct inet_sock *inet = inet_sk(sk);
struct fastopen_queue *fastopenq = icsk->icsk_accept_queue.fastopenq;
__u16 destp = ntohs(inet->inet_dport);
__u16 srcp = ntohs(inet->inet_sport);
int rx_queue;
-@@ -2631,8 +2651,8 @@ static void get_timewait4_sock(const str
+@@ -2630,8 +2650,8 @@ static void get_timewait4_sock(const str
__u16 destp, srcp;
s32 delta = tw->tw_ttd - inet_tw_time_stamp();
destp = ntohs(tw->tw_dport);
srcp = ntohs(tw->tw_sport);
-diff -NurpP --minimal linux-3.13.10/net/ipv4/tcp_minisocks.c linux-3.13.10-vs2.3.6.11/net/ipv4/tcp_minisocks.c
---- linux-3.13.10/net/ipv4/tcp_minisocks.c 2014-01-22 20:39:15.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/net/ipv4/tcp_minisocks.c 2014-01-31 20:38:04.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/net/ipv4/tcp_minisocks.c linux-3.14.17-vs2.3.6.13/net/ipv4/tcp_minisocks.c
+--- linux-3.14.17/net/ipv4/tcp_minisocks.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/net/ipv4/tcp_minisocks.c 2014-08-30 14:27:38.000000000 +0000
@@ -23,6 +23,9 @@
#include <linux/slab.h>
#include <linux/sysctl.h>
#if IS_ENABLED(CONFIG_IPV6)
if (tw->tw_family == PF_INET6) {
struct ipv6_pinfo *np = inet6_sk(sk);
-diff -NurpP --minimal linux-3.13.10/net/ipv4/udp.c linux-3.13.10-vs2.3.6.11/net/ipv4/udp.c
---- linux-3.13.10/net/ipv4/udp.c 2014-01-22 20:39:15.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/net/ipv4/udp.c 2014-01-31 22:20:27.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/net/ipv4/udp.c linux-3.14.17-vs2.3.6.13/net/ipv4/udp.c
+--- linux-3.14.17/net/ipv4/udp.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/net/ipv4/udp.c 2014-08-30 14:27:38.000000000 +0000
@@ -308,14 +308,7 @@ fail:
}
EXPORT_SYMBOL(udp_lib_get_port);
(sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif))
return false;
@@ -989,6 +995,16 @@ int udp_sendmsg(struct kiocb *iocb, stru
- inet_sk_flowi_flags(sk)|FLOWI_FLAG_CAN_SLEEP,
+ inet_sk_flowi_flags(sk),
faddr, saddr, dport, inet->inet_sport);
+ if (sk->sk_nx_info) {
memset(sin->sin_zero, 0, sizeof(sin->sin_zero));
*addr_len = sizeof(*sin);
}
-@@ -2223,6 +2240,8 @@ static struct sock *udp_get_first(struct
+@@ -2227,6 +2244,8 @@ static struct sock *udp_get_first(struct
sk_nulls_for_each(sk, node, &hslot->head) {
if (!net_eq(sock_net(sk), net))
continue;
if (sk->sk_family == state->family)
goto found;
}
-@@ -2240,7 +2259,9 @@ static struct sock *udp_get_next(struct
+@@ -2244,7 +2263,9 @@ static struct sock *udp_get_next(struct
do {
sk = sk_nulls_next(sk);
if (!sk) {
if (state->bucket <= state->udp_table->mask)
-@@ -2336,8 +2357,8 @@ static void udp4_format_sock(struct sock
+@@ -2340,8 +2361,8 @@ static void udp4_format_sock(struct sock
int bucket)
{
struct inet_sock *inet = inet_sk(sp);
__u16 destp = ntohs(inet->inet_dport);
__u16 srcp = ntohs(inet->inet_sport);
-diff -NurpP --minimal linux-3.13.10/net/ipv6/Kconfig linux-3.13.10-vs2.3.6.11/net/ipv6/Kconfig
---- linux-3.13.10/net/ipv6/Kconfig 2014-01-22 20:39:15.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/net/ipv6/Kconfig 2014-01-31 20:38:04.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/net/ipv6/Kconfig linux-3.14.17-vs2.3.6.13/net/ipv6/Kconfig
+--- linux-3.14.17/net/ipv6/Kconfig 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/net/ipv6/Kconfig 2014-08-30 14:27:38.000000000 +0000
@@ -4,8 +4,8 @@
# IPv6 as module will cause a CRASH if you try to unload it
---help---
This is complemental support for the IP version 6.
You will still be able to do traditional IPv4 networking as well.
-diff -NurpP --minimal linux-3.13.10/net/ipv6/addrconf.c linux-3.13.10-vs2.3.6.11/net/ipv6/addrconf.c
---- linux-3.13.10/net/ipv6/addrconf.c 2014-04-17 01:12:41.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/net/ipv6/addrconf.c 2014-04-17 01:17:11.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/net/ipv6/addrconf.c linux-3.14.17-vs2.3.6.13/net/ipv6/addrconf.c
+--- linux-3.14.17/net/ipv6/addrconf.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/net/ipv6/addrconf.c 2014-08-30 14:27:38.000000000 +0000
@@ -90,6 +90,8 @@
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
/* Set to 3 to get tracing... */
#define ACONF_DEBUG 2
-@@ -1284,7 +1286,7 @@ out:
+@@ -1313,7 +1315,7 @@ out:
int ipv6_dev_get_saddr(struct net *net, const struct net_device *dst_dev,
const struct in6_addr *daddr, unsigned int prefs,
{
struct ipv6_saddr_score scores[2],
*score = &scores[0], *hiscore = &scores[1];
-@@ -1356,6 +1358,8 @@ int ipv6_dev_get_saddr(struct net *net,
+@@ -1385,6 +1387,8 @@ int ipv6_dev_get_saddr(struct net *net,
dev->name);
continue;
}
score->rule = -1;
bitmap_zero(score->scorebits, IPV6_SADDR_RULE_MAX);
-@@ -3371,7 +3375,10 @@ static void if6_seq_stop(struct seq_file
+@@ -3497,7 +3501,10 @@ static void if6_seq_stop(struct seq_file
static int if6_seq_show(struct seq_file *seq, void *v)
{
struct inet6_ifaddr *ifp = (struct inet6_ifaddr *)v;
&ifp->addr,
ifp->idev->dev->ifindex,
ifp->prefix_len,
-@@ -3892,6 +3899,11 @@ static int in6_dump_addrs(struct inet6_d
+@@ -4071,6 +4078,11 @@ static int in6_dump_addrs(struct inet6_d
struct ifacaddr6 *ifaca;
int err = 1;
int ip_idx = *p_ip_idx;
read_lock_bh(&idev->lock);
switch (type) {
-@@ -3902,6 +3914,8 @@ static int in6_dump_addrs(struct inet6_d
+@@ -4081,6 +4093,8 @@ static int in6_dump_addrs(struct inet6_d
list_for_each_entry(ifa, &idev->addr_list, if_list) {
if (++ip_idx < s_ip_idx)
continue;
err = inet6_fill_ifaddr(skb, ifa,
NETLINK_CB(cb->skb).portid,
cb->nlh->nlmsg_seq,
-@@ -3919,6 +3933,8 @@ static int in6_dump_addrs(struct inet6_d
+@@ -4098,6 +4112,8 @@ static int in6_dump_addrs(struct inet6_d
ifmca = ifmca->next, ip_idx++) {
if (ip_idx < s_ip_idx)
continue;
err = inet6_fill_ifmcaddr(skb, ifmca,
NETLINK_CB(cb->skb).portid,
cb->nlh->nlmsg_seq,
-@@ -3934,6 +3950,8 @@ static int in6_dump_addrs(struct inet6_d
+@@ -4113,6 +4129,8 @@ static int in6_dump_addrs(struct inet6_d
ifaca = ifaca->aca_next, ip_idx++) {
if (ip_idx < s_ip_idx)
continue;
err = inet6_fill_ifacaddr(skb, ifaca,
NETLINK_CB(cb->skb).portid,
cb->nlh->nlmsg_seq,
-@@ -3962,6 +3980,10 @@ static int inet6_dump_addr(struct sk_buf
+@@ -4141,6 +4159,10 @@ static int inet6_dump_addr(struct sk_buf
struct inet6_dev *idev;
struct hlist_head *head;
s_h = cb->args[0];
s_idx = idx = cb->args[1];
s_ip_idx = ip_idx = cb->args[2];
-@@ -4404,6 +4426,7 @@ static int inet6_dump_ifinfo(struct sk_b
+@@ -4585,6 +4607,7 @@ static int inet6_dump_ifinfo(struct sk_b
struct net_device *dev;
struct inet6_dev *idev;
struct hlist_head *head;
s_h = cb->args[0];
s_idx = cb->args[1];
-@@ -4415,6 +4438,8 @@ static int inet6_dump_ifinfo(struct sk_b
+@@ -4596,6 +4619,8 @@ static int inet6_dump_ifinfo(struct sk_b
hlist_for_each_entry_rcu(dev, head, index_hlist) {
if (idx < s_idx)
goto cont;
idev = __in6_dev_get(dev);
if (!idev)
goto cont;
-diff -NurpP --minimal linux-3.13.10/net/ipv6/af_inet6.c linux-3.13.10-vs2.3.6.11/net/ipv6/af_inet6.c
---- linux-3.13.10/net/ipv6/af_inet6.c 2014-01-22 20:39:15.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/net/ipv6/af_inet6.c 2014-01-31 21:39:03.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/net/ipv6/af_inet6.c linux-3.14.17-vs2.3.6.13/net/ipv6/af_inet6.c
+--- linux-3.14.17/net/ipv6/af_inet6.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/net/ipv6/af_inet6.c 2014-08-30 14:27:38.000000000 +0000
@@ -43,6 +43,8 @@
#include <linux/netdevice.h>
#include <linux/icmpv6.h>
if (ipv6_addr_any(&sk->sk_v6_rcv_saddr))
sin->sin6_addr = np->saddr;
else
-diff -NurpP --minimal linux-3.13.10/net/ipv6/datagram.c linux-3.13.10-vs2.3.6.11/net/ipv6/datagram.c
---- linux-3.13.10/net/ipv6/datagram.c 2014-01-22 20:39:15.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/net/ipv6/datagram.c 2014-01-31 20:38:04.000000000 +0000
-@@ -655,7 +655,7 @@ int ip6_datagram_send_ctl(struct net *ne
+diff -NurpP --minimal linux-3.14.17/net/ipv6/datagram.c linux-3.14.17-vs2.3.6.13/net/ipv6/datagram.c
+--- linux-3.14.17/net/ipv6/datagram.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/net/ipv6/datagram.c 2014-08-30 14:27:38.000000000 +0000
+@@ -685,7 +685,7 @@ int ip6_datagram_send_ctl(struct net *ne
rcu_read_lock();
if (fl6->flowi6_oif) {
if (!dev) {
rcu_read_unlock();
return -ENODEV;
-diff -NurpP --minimal linux-3.13.10/net/ipv6/fib6_rules.c linux-3.13.10-vs2.3.6.11/net/ipv6/fib6_rules.c
---- linux-3.13.10/net/ipv6/fib6_rules.c 2014-01-22 20:39:15.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/net/ipv6/fib6_rules.c 2014-01-31 20:38:04.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/net/ipv6/fib6_rules.c linux-3.14.17-vs2.3.6.13/net/ipv6/fib6_rules.c
+--- linux-3.14.17/net/ipv6/fib6_rules.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/net/ipv6/fib6_rules.c 2014-08-30 14:27:38.000000000 +0000
@@ -97,7 +97,7 @@ static int fib6_rule_action(struct fib_r
ip6_dst_idev(&rt->dst)->dev,
&flp6->daddr,
goto again;
if (!ipv6_prefix_equal(&saddr, &r->src.addr,
r->src.plen))
-diff -NurpP --minimal linux-3.13.10/net/ipv6/inet6_hashtables.c linux-3.13.10-vs2.3.6.11/net/ipv6/inet6_hashtables.c
---- linux-3.13.10/net/ipv6/inet6_hashtables.c 2014-01-22 20:39:15.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/net/ipv6/inet6_hashtables.c 2014-01-31 20:38:04.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/net/ipv6/inet6_hashtables.c linux-3.14.17-vs2.3.6.13/net/ipv6/inet6_hashtables.c
+--- linux-3.14.17/net/ipv6/inet6_hashtables.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/net/ipv6/inet6_hashtables.c 2014-08-30 14:27:38.000000000 +0000
@@ -16,6 +16,7 @@
#include <linux/module.h>
}
if (sk->sk_bound_dev_if) {
if (sk->sk_bound_dev_if != dif)
-diff -NurpP --minimal linux-3.13.10/net/ipv6/ip6_fib.c linux-3.13.10-vs2.3.6.11/net/ipv6/ip6_fib.c
---- linux-3.13.10/net/ipv6/ip6_fib.c 2014-01-22 20:39:15.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/net/ipv6/ip6_fib.c 2014-01-31 21:48:35.000000000 +0000
-@@ -1779,6 +1779,7 @@ static int ipv6_route_seq_show(struct se
+diff -NurpP --minimal linux-3.14.17/net/ipv6/ip6_fib.c linux-3.14.17-vs2.3.6.13/net/ipv6/ip6_fib.c
+--- linux-3.14.17/net/ipv6/ip6_fib.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/net/ipv6/ip6_fib.c 2014-08-30 14:27:38.000000000 +0000
+@@ -1780,6 +1780,7 @@ static int ipv6_route_seq_show(struct se
struct rt6_info *rt = v;
struct ipv6_route_iter *iter = seq->private;
seq_printf(seq, "%pi6 %02x ", &rt->rt6i_dst.addr, rt->rt6i_dst.plen);
#ifdef CONFIG_IPV6_SUBTREES
-diff -NurpP --minimal linux-3.13.10/net/ipv6/ip6_output.c linux-3.13.10-vs2.3.6.11/net/ipv6/ip6_output.c
---- linux-3.13.10/net/ipv6/ip6_output.c 2014-04-17 01:12:41.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/net/ipv6/ip6_output.c 2014-04-17 01:17:11.000000000 +0000
-@@ -872,7 +872,8 @@ static int ip6_dst_lookup_tail(struct so
+diff -NurpP --minimal linux-3.14.17/net/ipv6/ip6_output.c linux-3.14.17-vs2.3.6.13/net/ipv6/ip6_output.c
+--- linux-3.14.17/net/ipv6/ip6_output.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/net/ipv6/ip6_output.c 2014-08-30 14:27:38.000000000 +0000
+@@ -911,7 +911,8 @@ static int ip6_dst_lookup_tail(struct so
struct rt6_info *rt = (struct rt6_info *) *dst;
err = ip6_route_get_saddr(net, rt, &fl6->daddr,
sk ? inet6_sk(sk)->srcprefs : 0,
if (err)
goto out_err_release;
}
-diff -NurpP --minimal linux-3.13.10/net/ipv6/ndisc.c linux-3.13.10-vs2.3.6.11/net/ipv6/ndisc.c
---- linux-3.13.10/net/ipv6/ndisc.c 2014-01-22 20:39:15.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/net/ipv6/ndisc.c 2014-01-31 20:38:04.000000000 +0000
-@@ -486,7 +486,7 @@ void ndisc_send_na(struct net_device *de
+diff -NurpP --minimal linux-3.14.17/net/ipv6/ndisc.c linux-3.14.17-vs2.3.6.13/net/ipv6/ndisc.c
+--- linux-3.14.17/net/ipv6/ndisc.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/net/ipv6/ndisc.c 2014-08-30 14:27:38.000000000 +0000
+@@ -488,7 +488,7 @@ void ndisc_send_na(struct net_device *de
} else {
if (ipv6_dev_get_saddr(dev_net(dev), dev, daddr,
inet6_sk(dev_net(dev)->ipv6.ndisc_sk)->srcprefs,
return;
src_addr = &tmpaddr;
}
-diff -NurpP --minimal linux-3.13.10/net/ipv6/netfilter/ip6t_MASQUERADE.c linux-3.13.10-vs2.3.6.11/net/ipv6/netfilter/ip6t_MASQUERADE.c
---- linux-3.13.10/net/ipv6/netfilter/ip6t_MASQUERADE.c 2013-11-25 15:47:07.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/net/ipv6/netfilter/ip6t_MASQUERADE.c 2014-01-31 20:38:04.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/net/ipv6/netfilter/ip6t_MASQUERADE.c linux-3.14.17-vs2.3.6.13/net/ipv6/netfilter/ip6t_MASQUERADE.c
+--- linux-3.14.17/net/ipv6/netfilter/ip6t_MASQUERADE.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/net/ipv6/netfilter/ip6t_MASQUERADE.c 2014-08-30 14:27:38.000000000 +0000
@@ -34,7 +34,7 @@ masquerade_tg6(struct sk_buff *skb, cons
ctinfo == IP_CT_RELATED_REPLY));
return NF_DROP;
nfct_nat(ct)->masq_index = par->out->ifindex;
-diff -NurpP --minimal linux-3.13.10/net/ipv6/raw.c linux-3.13.10-vs2.3.6.11/net/ipv6/raw.c
---- linux-3.13.10/net/ipv6/raw.c 2014-01-22 20:39:15.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/net/ipv6/raw.c 2014-01-31 20:38:04.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/net/ipv6/raw.c linux-3.14.17-vs2.3.6.13/net/ipv6/raw.c
+--- linux-3.14.17/net/ipv6/raw.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/net/ipv6/raw.c 2014-08-30 14:27:38.000000000 +0000
@@ -30,6 +30,7 @@
#include <linux/icmpv6.h>
#include <linux/netfilter.h>
#include <linux/skbuff.h>
#include <linux/compat.h>
#include <asm/uaccess.h>
-@@ -287,6 +288,13 @@ static int rawv6_bind(struct sock *sk, s
+@@ -291,6 +292,13 @@ static int rawv6_bind(struct sock *sk, s
goto out_unlock;
}
/* ipv4 addr of the socket is invalid. Only the
* unspecified and mapped address have a v4 equivalent.
*/
-diff -NurpP --minimal linux-3.13.10/net/ipv6/route.c linux-3.13.10-vs2.3.6.11/net/ipv6/route.c
---- linux-3.13.10/net/ipv6/route.c 2014-04-17 01:12:41.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/net/ipv6/route.c 2014-04-17 01:17:11.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/net/ipv6/route.c linux-3.14.17-vs2.3.6.13/net/ipv6/route.c
+--- linux-3.14.17/net/ipv6/route.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/net/ipv6/route.c 2014-08-30 14:27:38.000000000 +0000
@@ -58,6 +58,7 @@
#include <net/netevent.h>
#include <net/netlink.h>
#include <asm/uaccess.h>
-@@ -2196,15 +2197,17 @@ int ip6_route_get_saddr(struct net *net,
+@@ -2215,15 +2216,17 @@ int ip6_route_get_saddr(struct net *net,
struct rt6_info *rt,
const struct in6_addr *daddr,
unsigned int prefs,
return err;
}
-@@ -2624,7 +2627,8 @@ static int rt6_fill_node(struct net *net
+@@ -2643,7 +2646,8 @@ static int rt6_fill_node(struct net *net
goto nla_put_failure;
} else if (dst) {
struct in6_addr saddr_buf;
nla_put(skb, RTA_PREFSRC, 16, &saddr_buf))
goto nla_put_failure;
}
-diff -NurpP --minimal linux-3.13.10/net/ipv6/tcp_ipv6.c linux-3.13.10-vs2.3.6.11/net/ipv6/tcp_ipv6.c
---- linux-3.13.10/net/ipv6/tcp_ipv6.c 2014-01-22 20:39:15.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/net/ipv6/tcp_ipv6.c 2014-01-31 20:38:04.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/net/ipv6/tcp_ipv6.c linux-3.14.17-vs2.3.6.13/net/ipv6/tcp_ipv6.c
+--- linux-3.14.17/net/ipv6/tcp_ipv6.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/net/ipv6/tcp_ipv6.c 2014-08-30 14:39:19.000000000 +0000
@@ -72,6 +72,7 @@
#include <linux/crypto.h>
- if (ipv6_addr_any(&usin->sin6_addr))
- usin->sin6_addr.s6_addr[15] = 0x1;
-+ if (ipv6_addr_any(&usin->sin6_addr)) {
++ if(ipv6_addr_any(&usin->sin6_addr)) {
+ struct nx_info *nxi = sk->sk_nx_info;
+
+ if (nxi && nx_info_has_v6(nxi))
addr_type = ipv6_addr_type(&usin->sin6_addr);
-diff -NurpP --minimal linux-3.13.10/net/ipv6/udp.c linux-3.13.10-vs2.3.6.11/net/ipv6/udp.c
---- linux-3.13.10/net/ipv6/udp.c 2014-01-22 20:39:15.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/net/ipv6/udp.c 2014-02-01 02:33:38.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/net/ipv6/udp.c linux-3.14.17-vs2.3.6.13/net/ipv6/udp.c
+--- linux-3.14.17/net/ipv6/udp.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/net/ipv6/udp.c 2014-08-30 14:27:38.000000000 +0000
@@ -47,6 +47,7 @@
#include <net/xfrm.h>
#include <net/inet6_hashtables.h>
}
if (!ipv6_addr_any(&sk->sk_v6_rcv_saddr)) {
if (!ipv6_addr_equal(&sk->sk_v6_rcv_saddr, daddr))
-diff -NurpP --minimal linux-3.13.10/net/ipv6/xfrm6_policy.c linux-3.13.10-vs2.3.6.11/net/ipv6/xfrm6_policy.c
---- linux-3.13.10/net/ipv6/xfrm6_policy.c 2014-01-22 20:39:15.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/net/ipv6/xfrm6_policy.c 2014-01-31 20:38:04.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/net/ipv6/xfrm6_policy.c linux-3.14.17-vs2.3.6.13/net/ipv6/xfrm6_policy.c
+--- linux-3.14.17/net/ipv6/xfrm6_policy.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/net/ipv6/xfrm6_policy.c 2014-08-30 14:27:38.000000000 +0000
@@ -63,7 +63,7 @@ static int xfrm6_get_saddr(struct net *n
dev = ip6_dst_idev(dst)->dev;
ipv6_dev_get_saddr(dev_net(dev), dev,
dst_release(dst);
return 0;
}
-diff -NurpP --minimal linux-3.13.10/net/netfilter/ipvs/ip_vs_xmit.c linux-3.13.10-vs2.3.6.11/net/netfilter/ipvs/ip_vs_xmit.c
---- linux-3.13.10/net/netfilter/ipvs/ip_vs_xmit.c 2013-11-25 15:47:07.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/net/netfilter/ipvs/ip_vs_xmit.c 2014-01-31 20:38:04.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/net/netfilter/ipvs/ip_vs_xmit.c linux-3.14.17-vs2.3.6.13/net/netfilter/ipvs/ip_vs_xmit.c
+--- linux-3.14.17/net/netfilter/ipvs/ip_vs_xmit.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/net/netfilter/ipvs/ip_vs_xmit.c 2014-08-30 14:27:38.000000000 +0000
@@ -316,7 +316,7 @@ __ip_vs_route_output_v6(struct net *net,
return dst;
if (ipv6_addr_any(&fl6.saddr) &&
goto out_err;
if (do_xfrm) {
dst = xfrm_lookup(net, dst, flowi6_to_flowi(&fl6), NULL, 0);
-diff -NurpP --minimal linux-3.13.10/net/netlink/af_netlink.c linux-3.13.10-vs2.3.6.11/net/netlink/af_netlink.c
---- linux-3.13.10/net/netlink/af_netlink.c 2014-01-22 20:39:16.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/net/netlink/af_netlink.c 2014-02-25 11:47:07.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/net/netlink/af_netlink.c linux-3.14.17-vs2.3.6.13/net/netlink/af_netlink.c
+--- linux-3.14.17/net/netlink/af_netlink.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/net/netlink/af_netlink.c 2014-08-30 14:27:38.000000000 +0000
@@ -58,6 +58,9 @@
#include <linux/mutex.h>
#include <linux/vmalloc.h>
#include <asm/cacheflush.h>
#include <net/net_namespace.h>
-@@ -2850,6 +2853,8 @@ static struct sock *netlink_seq_socket_i
+@@ -2913,6 +2916,8 @@ static struct sock *netlink_seq_socket_i
sk_for_each(s, &hash->table[j]) {
if (sock_net(s) != seq_file_net(seq))
continue;
if (off == pos) {
iter->link = i;
iter->hash_idx = j;
-@@ -2886,7 +2891,8 @@ static void *netlink_seq_next(struct seq
+@@ -2949,7 +2954,8 @@ static void *netlink_seq_next(struct seq
s = v;
do {
s = sk_next(s);
if (s)
return s;
-@@ -2899,7 +2905,8 @@ static void *netlink_seq_next(struct seq
+@@ -2962,7 +2968,8 @@ static void *netlink_seq_next(struct seq
for (; j <= hash->mask; j++) {
s = sk_head(&hash->table[j]);
s = sk_next(s);
if (s) {
iter->link = i;
-diff -NurpP --minimal linux-3.13.10/net/socket.c linux-3.13.10-vs2.3.6.11/net/socket.c
---- linux-3.13.10/net/socket.c 2014-04-17 01:12:42.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/net/socket.c 2014-04-17 01:17:11.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/net/socket.c linux-3.14.17-vs2.3.6.13/net/socket.c
+--- linux-3.14.17/net/socket.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/net/socket.c 2014-08-30 14:27:38.000000000 +0000
@@ -98,6 +98,9 @@
#include <net/sock.h>
#include <linux/if_tun.h>
#include <linux/ipv6_route.h>
-@@ -623,13 +626,29 @@ static inline int __sock_sendmsg_nosec(s
+@@ -624,13 +627,29 @@ static inline int __sock_sendmsg_nosec(s
struct msghdr *msg, size_t size)
{
struct sock_iocb *si = kiocb_to_siocb(iocb);
}
static inline int __sock_sendmsg(struct kiocb *iocb, struct socket *sock,
-@@ -773,6 +792,7 @@ static inline int __sock_recvmsg_nosec(s
+@@ -774,6 +793,7 @@ static inline int __sock_recvmsg_nosec(s
struct msghdr *msg, size_t size, int flags)
{
struct sock_iocb *si = kiocb_to_siocb(iocb);
si->sock = sock;
si->scm = NULL;
-@@ -780,7 +800,18 @@ static inline int __sock_recvmsg_nosec(s
+@@ -781,7 +801,18 @@ static inline int __sock_recvmsg_nosec(s
si->size = size;
si->flags = flags;
}
static inline int __sock_recvmsg(struct kiocb *iocb, struct socket *sock,
-@@ -1256,6 +1287,13 @@ int __sock_create(struct net *net, int f
+@@ -1257,6 +1288,13 @@ int __sock_create(struct net *net, int f
if (type < 0 || type >= SOCK_MAX)
return -EINVAL;
/* Compatibility.
This uglymoron is moved from INET layer to here to avoid
-@@ -1390,6 +1428,7 @@ SYSCALL_DEFINE3(socket, int, family, int
+@@ -1391,6 +1429,7 @@ SYSCALL_DEFINE3(socket, int, family, int
if (retval < 0)
goto out;
retval = sock_map_fd(sock, flags & (O_CLOEXEC | O_NONBLOCK));
if (retval < 0)
goto out_release;
-@@ -1431,10 +1470,12 @@ SYSCALL_DEFINE4(socketpair, int, family,
+@@ -1432,10 +1471,12 @@ SYSCALL_DEFINE4(socketpair, int, family,
err = sock_create(family, type, protocol, &sock1);
if (err < 0)
goto out;
err = sock1->ops->socketpair(sock1, sock2);
if (err < 0)
-diff -NurpP --minimal linux-3.13.10/net/sunrpc/auth.c linux-3.13.10-vs2.3.6.11/net/sunrpc/auth.c
---- linux-3.13.10/net/sunrpc/auth.c 2013-11-25 15:47:08.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/net/sunrpc/auth.c 2014-01-31 20:38:04.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/net/sunrpc/auth.c linux-3.14.17-vs2.3.6.13/net/sunrpc/auth.c
+--- linux-3.14.17/net/sunrpc/auth.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/net/sunrpc/auth.c 2014-08-30 14:27:38.000000000 +0000
@@ -15,6 +15,7 @@
#include <linux/sunrpc/clnt.h>
#include <linux/sunrpc/gss_api.h>
};
dprintk("RPC: %5u looking up %s cred\n",
-diff -NurpP --minimal linux-3.13.10/net/sunrpc/auth_unix.c linux-3.13.10-vs2.3.6.11/net/sunrpc/auth_unix.c
---- linux-3.13.10/net/sunrpc/auth_unix.c 2013-11-25 15:47:08.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/net/sunrpc/auth_unix.c 2014-01-31 20:38:04.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/net/sunrpc/auth_unix.c linux-3.14.17-vs2.3.6.13/net/sunrpc/auth_unix.c
+--- linux-3.14.17/net/sunrpc/auth_unix.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/net/sunrpc/auth_unix.c 2014-08-30 14:27:38.000000000 +0000
@@ -13,11 +13,13 @@
#include <linux/sunrpc/clnt.h>
#include <linux/sunrpc/auth.h>
hold = p++;
for (i = 0; i < 16 && gid_valid(cred->uc_gids[i]); i++)
*p++ = htonl((u32) from_kgid(&init_user_ns, cred->uc_gids[i]));
-diff -NurpP --minimal linux-3.13.10/net/sunrpc/clnt.c linux-3.13.10-vs2.3.6.11/net/sunrpc/clnt.c
---- linux-3.13.10/net/sunrpc/clnt.c 2014-04-17 01:12:42.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/net/sunrpc/clnt.c 2014-02-25 11:26:10.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/net/sunrpc/clnt.c linux-3.14.17-vs2.3.6.13/net/sunrpc/clnt.c
+--- linux-3.14.17/net/sunrpc/clnt.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/net/sunrpc/clnt.c 2014-08-30 14:27:38.000000000 +0000
@@ -31,6 +31,7 @@
#include <linux/in.h>
#include <linux/in6.h>
return clnt;
}
EXPORT_SYMBOL_GPL(rpc_create);
-diff -NurpP --minimal linux-3.13.10/net/unix/af_unix.c linux-3.13.10-vs2.3.6.11/net/unix/af_unix.c
---- linux-3.13.10/net/unix/af_unix.c 2014-04-17 01:12:42.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/net/unix/af_unix.c 2014-04-17 01:17:11.000000000 +0000
-@@ -115,6 +115,8 @@
+diff -NurpP --minimal linux-3.14.17/net/unix/af_unix.c linux-3.14.17-vs2.3.6.13/net/unix/af_unix.c
+--- linux-3.14.17/net/unix/af_unix.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/net/unix/af_unix.c 2014-08-30 14:27:38.000000000 +0000
+@@ -117,6 +117,8 @@
#include <net/checksum.h>
#include <linux/security.h>
#include <linux/freezer.h>
struct hlist_head unix_socket_table[2 * UNIX_HASH_SIZE];
EXPORT_SYMBOL_GPL(unix_socket_table);
-@@ -270,6 +272,8 @@ static struct sock *__unix_find_socket_b
+@@ -272,6 +274,8 @@ static struct sock *__unix_find_socket_b
if (!net_eq(sock_net(s), net))
continue;
if (u->addr->len == len &&
!memcmp(u->addr->name, sunname, len))
goto found;
-@@ -2275,6 +2279,8 @@ static struct sock *unix_from_bucket(str
+@@ -2277,6 +2281,8 @@ static struct sock *unix_from_bucket(str
for (sk = sk_head(&unix_socket_table[bucket]); sk; sk = sk_next(sk)) {
if (sock_net(sk) != seq_file_net(seq))
continue;
if (++count == offset)
break;
}
-@@ -2292,6 +2298,8 @@ static struct sock *unix_next_socket(str
+@@ -2294,6 +2300,8 @@ static struct sock *unix_next_socket(str
sk = sk_next(sk);
if (!sk)
goto next_bucket;
if (sock_net(sk) == seq_file_net(seq))
return sk;
}
-diff -NurpP --minimal linux-3.13.10/scripts/checksyscalls.sh linux-3.13.10-vs2.3.6.11/scripts/checksyscalls.sh
---- linux-3.13.10/scripts/checksyscalls.sh 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/scripts/checksyscalls.sh 2014-01-31 20:38:04.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/scripts/checksyscalls.sh linux-3.14.17-vs2.3.6.13/scripts/checksyscalls.sh
+--- linux-3.14.17/scripts/checksyscalls.sh 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/scripts/checksyscalls.sh 2014-08-30 14:27:38.000000000 +0000
@@ -193,7 +193,6 @@ cat << EOF
#define __IGNORE_afs_syscall
#define __IGNORE_getpmsg
EOF
}
-diff -NurpP --minimal linux-3.13.10/security/commoncap.c linux-3.13.10-vs2.3.6.11/security/commoncap.c
---- linux-3.13.10/security/commoncap.c 2013-11-25 15:47:08.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/security/commoncap.c 2014-01-31 20:38:04.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/security/commoncap.c linux-3.14.17-vs2.3.6.13/security/commoncap.c
+--- linux-3.14.17/security/commoncap.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/security/commoncap.c 2014-08-30 14:27:38.000000000 +0000
@@ -76,6 +76,7 @@ int cap_netlink_send(struct sock *sk, st
int cap_capable(const struct cred *cred, struct user_namespace *targ_ns,
int cap, int audit)
return -EPERM;
return 0;
}
-diff -NurpP --minimal linux-3.13.10/security/selinux/hooks.c linux-3.13.10-vs2.3.6.11/security/selinux/hooks.c
---- linux-3.13.10/security/selinux/hooks.c 2014-04-17 01:12:42.000000000 +0000
-+++ linux-3.13.10-vs2.3.6.11/security/selinux/hooks.c 2014-04-17 01:17:11.000000000 +0000
+diff -NurpP --minimal linux-3.14.17/security/selinux/hooks.c linux-3.14.17-vs2.3.6.13/security/selinux/hooks.c
+--- linux-3.14.17/security/selinux/hooks.c 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/security/selinux/hooks.c 2014-08-30 14:27:38.000000000 +0000
@@ -68,7 +68,6 @@
#include <linux/dccp.h>
#include <linux/quota.h>
projects / packages / kernel.git / commitdiff