From: Jan Rękorajski Date: Sat, 11 Jul 2020 09:11:21 +0000 (+0200) Subject: - 4.4.230, updated vserver patch to patch-4.4.197-vs2.3.9.8.diff X-Git-Tag: auto/th/kernel-4.4-4.4.230-1 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=48cb6a3ce3da04a8149ddb7f9019107ba68cb305;p=packages%2Fkernel.git - 4.4.230, updated vserver patch to patch-4.4.197-vs2.3.9.8.diff --- diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch index 40e2b790..623586da 100644 --- a/kernel-vserver-2.3.patch +++ b/kernel-vserver-2.3.patch @@ -1,6 +1,6 @@ -diff -NurpP --minimal linux-4.4.197/arch/alpha/Kconfig linux-4.4.197-vs2.3.9.8/arch/alpha/Kconfig ---- linux-4.4.197/arch/alpha/Kconfig 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/arch/alpha/Kconfig 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/arch/alpha/Kconfig linux-4.4.217-vs2.3.9.9/arch/alpha/Kconfig +--- linux-4.4.217/arch/alpha/Kconfig 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/arch/alpha/Kconfig 2018-10-20 04:57:21.000000000 +0000 @@ -745,6 +745,8 @@ config DUMMY_CONSOLE depends on VGA_HOSE default y @@ -10,9 +10,9 @@ diff -NurpP --minimal linux-4.4.197/arch/alpha/Kconfig linux-4.4.197-vs2.3.9.8/a source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-4.4.197/arch/alpha/kernel/systbls.S linux-4.4.197-vs2.3.9.8/arch/alpha/kernel/systbls.S ---- linux-4.4.197/arch/alpha/kernel/systbls.S 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/arch/alpha/kernel/systbls.S 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/arch/alpha/kernel/systbls.S linux-4.4.217-vs2.3.9.9/arch/alpha/kernel/systbls.S +--- linux-4.4.217/arch/alpha/kernel/systbls.S 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/arch/alpha/kernel/systbls.S 2018-10-20 04:57:21.000000000 +0000 @@ -446,7 +446,7 @@ sys_call_table: .quad sys_stat64 /* 425 */ .quad sys_lstat64 @@ -22,9 +22,9 @@ diff -NurpP --minimal linux-4.4.197/arch/alpha/kernel/systbls.S linux-4.4.197-vs .quad sys_ni_syscall /* sys_mbind */ .quad sys_ni_syscall /* sys_get_mempolicy */ .quad sys_ni_syscall /* sys_set_mempolicy */ -diff -NurpP --minimal linux-4.4.197/arch/alpha/kernel/traps.c linux-4.4.197-vs2.3.9.8/arch/alpha/kernel/traps.c ---- linux-4.4.197/arch/alpha/kernel/traps.c 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/arch/alpha/kernel/traps.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/arch/alpha/kernel/traps.c linux-4.4.217-vs2.3.9.9/arch/alpha/kernel/traps.c +--- linux-4.4.217/arch/alpha/kernel/traps.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/arch/alpha/kernel/traps.c 2018-10-20 04:57:21.000000000 +0000 @@ -174,7 +174,8 @@ die_if_kernel(char * str, struct pt_regs #ifdef CONFIG_SMP printk("CPU %d ", hard_smp_processor_id()); @@ -35,10 +35,10 @@ diff -NurpP --minimal linux-4.4.197/arch/alpha/kernel/traps.c linux-4.4.197-vs2. dik_show_regs(regs, r9_15); add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE); dik_show_trace((unsigned long *)(regs+1)); -diff -NurpP --minimal linux-4.4.197/arch/arm/Kconfig linux-4.4.197-vs2.3.9.8/arch/arm/Kconfig ---- linux-4.4.197/arch/arm/Kconfig 2019-10-22 12:33:36.159591972 +0000 -+++ linux-4.4.197-vs2.3.9.8/arch/arm/Kconfig 2019-10-05 14:35:09.563172476 +0000 -@@ -2160,6 +2160,8 @@ source "fs/Kconfig" +diff -NurpP --minimal linux-4.4.217/arch/arm/Kconfig linux-4.4.217-vs2.3.9.9/arch/arm/Kconfig +--- linux-4.4.217/arch/arm/Kconfig 2020-03-27 06:53:38.843028007 +0000 ++++ linux-4.4.217-vs2.3.9.9/arch/arm/Kconfig 2020-04-01 09:34:17.311616873 +0000 +@@ -2161,6 +2161,8 @@ source "fs/Kconfig" source "arch/arm/Kconfig.debug" @@ -47,9 +47,9 @@ diff -NurpP --minimal linux-4.4.197/arch/arm/Kconfig linux-4.4.197-vs2.3.9.8/arc source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-4.4.197/arch/arm/kernel/calls.S linux-4.4.197-vs2.3.9.8/arch/arm/kernel/calls.S ---- linux-4.4.197/arch/arm/kernel/calls.S 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/arch/arm/kernel/calls.S 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/arch/arm/kernel/calls.S linux-4.4.217-vs2.3.9.9/arch/arm/kernel/calls.S +--- linux-4.4.217/arch/arm/kernel/calls.S 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/arch/arm/kernel/calls.S 2018-10-20 04:57:21.000000000 +0000 @@ -322,7 +322,7 @@ /* 310 */ CALL(sys_request_key) CALL(sys_keyctl) @@ -59,9 +59,9 @@ diff -NurpP --minimal linux-4.4.197/arch/arm/kernel/calls.S linux-4.4.197-vs2.3. CALL(sys_ioprio_set) /* 315 */ CALL(sys_ioprio_get) CALL(sys_inotify_init) -diff -NurpP --minimal linux-4.4.197/arch/arm/kernel/traps.c linux-4.4.197-vs2.3.9.8/arch/arm/kernel/traps.c ---- linux-4.4.197/arch/arm/kernel/traps.c 2019-10-22 12:33:37.079577261 +0000 -+++ linux-4.4.197-vs2.3.9.8/arch/arm/kernel/traps.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/arch/arm/kernel/traps.c linux-4.4.217-vs2.3.9.9/arch/arm/kernel/traps.c +--- linux-4.4.217/arch/arm/kernel/traps.c 2020-03-27 06:53:39.663014560 +0000 ++++ linux-4.4.217-vs2.3.9.9/arch/arm/kernel/traps.c 2018-10-20 04:57:21.000000000 +0000 @@ -259,8 +259,8 @@ static int __die(const char *str, int er print_modules(); @@ -73,9 +73,9 @@ diff -NurpP --minimal linux-4.4.197/arch/arm/kernel/traps.c linux-4.4.197-vs2.3. if (!user_mode(regs) || in_interrupt()) { dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp, -diff -NurpP --minimal linux-4.4.197/arch/cris/Kconfig linux-4.4.197-vs2.3.9.8/arch/cris/Kconfig ---- linux-4.4.197/arch/cris/Kconfig 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/arch/cris/Kconfig 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/arch/cris/Kconfig linux-4.4.217-vs2.3.9.9/arch/cris/Kconfig +--- linux-4.4.217/arch/cris/Kconfig 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/arch/cris/Kconfig 2018-10-20 04:57:21.000000000 +0000 @@ -581,6 +581,8 @@ source "fs/Kconfig" source "arch/cris/Kconfig.debug" @@ -85,9 +85,9 @@ diff -NurpP --minimal linux-4.4.197/arch/cris/Kconfig linux-4.4.197-vs2.3.9.8/ar source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-4.4.197/arch/ia64/Kconfig linux-4.4.197-vs2.3.9.8/arch/ia64/Kconfig ---- linux-4.4.197/arch/ia64/Kconfig 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/arch/ia64/Kconfig 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/arch/ia64/Kconfig linux-4.4.217-vs2.3.9.9/arch/ia64/Kconfig +--- linux-4.4.217/arch/ia64/Kconfig 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/arch/ia64/Kconfig 2018-10-20 04:57:21.000000000 +0000 @@ -606,6 +606,8 @@ source "fs/Kconfig" source "arch/ia64/Kconfig.debug" @@ -97,9 +97,9 @@ diff -NurpP --minimal linux-4.4.197/arch/ia64/Kconfig linux-4.4.197-vs2.3.9.8/ar source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-4.4.197/arch/ia64/kernel/entry.S linux-4.4.197-vs2.3.9.8/arch/ia64/kernel/entry.S ---- linux-4.4.197/arch/ia64/kernel/entry.S 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/arch/ia64/kernel/entry.S 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/arch/ia64/kernel/entry.S linux-4.4.217-vs2.3.9.9/arch/ia64/kernel/entry.S +--- linux-4.4.217/arch/ia64/kernel/entry.S 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/arch/ia64/kernel/entry.S 2018-10-20 04:57:21.000000000 +0000 @@ -1694,7 +1694,7 @@ sys_call_table: data8 sys_mq_notify data8 sys_mq_getsetattr @@ -109,9 +109,9 @@ diff -NurpP --minimal linux-4.4.197/arch/ia64/kernel/entry.S linux-4.4.197-vs2.3 data8 sys_waitid // 1270 data8 sys_add_key data8 sys_request_key -diff -NurpP --minimal linux-4.4.197/arch/ia64/kernel/ptrace.c linux-4.4.197-vs2.3.9.8/arch/ia64/kernel/ptrace.c ---- linux-4.4.197/arch/ia64/kernel/ptrace.c 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/arch/ia64/kernel/ptrace.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/arch/ia64/kernel/ptrace.c linux-4.4.217-vs2.3.9.9/arch/ia64/kernel/ptrace.c +--- linux-4.4.217/arch/ia64/kernel/ptrace.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/arch/ia64/kernel/ptrace.c 2018-10-20 04:57:21.000000000 +0000 @@ -21,6 +21,7 @@ #include #include @@ -120,9 +120,9 @@ diff -NurpP --minimal linux-4.4.197/arch/ia64/kernel/ptrace.c linux-4.4.197-vs2. #include #include -diff -NurpP --minimal linux-4.4.197/arch/ia64/kernel/traps.c linux-4.4.197-vs2.3.9.8/arch/ia64/kernel/traps.c ---- linux-4.4.197/arch/ia64/kernel/traps.c 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/arch/ia64/kernel/traps.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/arch/ia64/kernel/traps.c linux-4.4.217-vs2.3.9.9/arch/ia64/kernel/traps.c +--- linux-4.4.217/arch/ia64/kernel/traps.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/arch/ia64/kernel/traps.c 2018-10-20 04:57:21.000000000 +0000 @@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re put_cpu(); @@ -147,9 +147,9 @@ diff -NurpP --minimal linux-4.4.197/arch/ia64/kernel/traps.c linux-4.4.197-vs2.3 } } } -diff -NurpP --minimal linux-4.4.197/arch/m32r/kernel/traps.c linux-4.4.197-vs2.3.9.8/arch/m32r/kernel/traps.c ---- linux-4.4.197/arch/m32r/kernel/traps.c 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/arch/m32r/kernel/traps.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/arch/m32r/kernel/traps.c linux-4.4.217-vs2.3.9.9/arch/m32r/kernel/traps.c +--- linux-4.4.217/arch/m32r/kernel/traps.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/arch/m32r/kernel/traps.c 2018-10-20 04:57:21.000000000 +0000 @@ -184,8 +184,9 @@ static void show_registers(struct pt_reg } else { printk("SPI: %08lx\n", sp); @@ -162,9 +162,9 @@ diff -NurpP --minimal linux-4.4.197/arch/m32r/kernel/traps.c linux-4.4.197-vs2.3 /* * When in-kernel, we also print out the stack and code at the -diff -NurpP --minimal linux-4.4.197/arch/m68k/Kconfig linux-4.4.197-vs2.3.9.8/arch/m68k/Kconfig ---- linux-4.4.197/arch/m68k/Kconfig 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/arch/m68k/Kconfig 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/arch/m68k/Kconfig linux-4.4.217-vs2.3.9.9/arch/m68k/Kconfig +--- linux-4.4.217/arch/m68k/Kconfig 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/arch/m68k/Kconfig 2018-10-20 04:57:21.000000000 +0000 @@ -164,6 +164,8 @@ source "fs/Kconfig" source "arch/m68k/Kconfig.debug" @@ -174,10 +174,10 @@ diff -NurpP --minimal linux-4.4.197/arch/m68k/Kconfig linux-4.4.197-vs2.3.9.8/ar source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-4.4.197/arch/mips/Kconfig linux-4.4.197-vs2.3.9.8/arch/mips/Kconfig ---- linux-4.4.197/arch/mips/Kconfig 2019-10-22 12:33:39.449539373 +0000 -+++ linux-4.4.197-vs2.3.9.8/arch/mips/Kconfig 2019-10-05 14:35:11.293145033 +0000 -@@ -3028,6 +3028,8 @@ source "fs/Kconfig" +diff -NurpP --minimal linux-4.4.217/arch/mips/Kconfig linux-4.4.217-vs2.3.9.9/arch/mips/Kconfig +--- linux-4.4.217/arch/mips/Kconfig 2020-03-27 06:53:45.562917831 +0000 ++++ linux-4.4.217-vs2.3.9.9/arch/mips/Kconfig 2020-04-01 09:34:18.491597330 +0000 +@@ -3029,6 +3029,8 @@ source "fs/Kconfig" source "arch/mips/Kconfig.debug" @@ -186,9 +186,9 @@ diff -NurpP --minimal linux-4.4.197/arch/mips/Kconfig linux-4.4.197-vs2.3.9.8/ar source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-4.4.197/arch/mips/kernel/ptrace.c linux-4.4.197-vs2.3.9.8/arch/mips/kernel/ptrace.c ---- linux-4.4.197/arch/mips/kernel/ptrace.c 2019-10-22 12:33:40.109528821 +0000 -+++ linux-4.4.197-vs2.3.9.8/arch/mips/kernel/ptrace.c 2019-02-22 08:20:24.721111089 +0000 +diff -NurpP --minimal linux-4.4.217/arch/mips/kernel/ptrace.c linux-4.4.217-vs2.3.9.9/arch/mips/kernel/ptrace.c +--- linux-4.4.217/arch/mips/kernel/ptrace.c 2020-03-27 06:53:46.542901761 +0000 ++++ linux-4.4.217-vs2.3.9.9/arch/mips/kernel/ptrace.c 2019-02-22 08:20:24.721111089 +0000 @@ -30,6 +30,7 @@ #include #include @@ -207,9 +207,9 @@ diff -NurpP --minimal linux-4.4.197/arch/mips/kernel/ptrace.c linux-4.4.197-vs2. 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-4.4.197/arch/mips/kernel/scall32-o32.S linux-4.4.197-vs2.3.9.8/arch/mips/kernel/scall32-o32.S ---- linux-4.4.197/arch/mips/kernel/scall32-o32.S 2019-10-22 12:33:40.109528821 +0000 -+++ linux-4.4.197-vs2.3.9.8/arch/mips/kernel/scall32-o32.S 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/arch/mips/kernel/scall32-o32.S linux-4.4.217-vs2.3.9.9/arch/mips/kernel/scall32-o32.S +--- linux-4.4.217/arch/mips/kernel/scall32-o32.S 2020-03-27 06:53:46.542901761 +0000 ++++ linux-4.4.217-vs2.3.9.9/arch/mips/kernel/scall32-o32.S 2018-10-20 04:57:21.000000000 +0000 @@ -512,7 +512,7 @@ EXPORT(sys_call_table) PTR sys_mq_timedreceive PTR sys_mq_notify /* 4275 */ @@ -219,9 +219,9 @@ diff -NurpP --minimal linux-4.4.197/arch/mips/kernel/scall32-o32.S linux-4.4.197 PTR sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key /* 4280 */ -diff -NurpP --minimal linux-4.4.197/arch/mips/kernel/scall64-64.S linux-4.4.197-vs2.3.9.8/arch/mips/kernel/scall64-64.S ---- linux-4.4.197/arch/mips/kernel/scall64-64.S 2019-10-22 12:33:40.109528821 +0000 -+++ linux-4.4.197-vs2.3.9.8/arch/mips/kernel/scall64-64.S 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/arch/mips/kernel/scall64-64.S linux-4.4.217-vs2.3.9.9/arch/mips/kernel/scall64-64.S +--- linux-4.4.217/arch/mips/kernel/scall64-64.S 2020-03-27 06:53:46.542901761 +0000 ++++ linux-4.4.217-vs2.3.9.9/arch/mips/kernel/scall64-64.S 2018-10-20 04:57:21.000000000 +0000 @@ -349,7 +349,7 @@ EXPORT(sys_call_table) PTR sys_mq_timedreceive PTR sys_mq_notify @@ -231,9 +231,9 @@ diff -NurpP --minimal linux-4.4.197/arch/mips/kernel/scall64-64.S linux-4.4.197- PTR sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key -diff -NurpP --minimal linux-4.4.197/arch/mips/kernel/scall64-n32.S linux-4.4.197-vs2.3.9.8/arch/mips/kernel/scall64-n32.S ---- linux-4.4.197/arch/mips/kernel/scall64-n32.S 2019-10-22 12:33:40.129528501 +0000 -+++ linux-4.4.197-vs2.3.9.8/arch/mips/kernel/scall64-n32.S 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/arch/mips/kernel/scall64-n32.S linux-4.4.217-vs2.3.9.9/arch/mips/kernel/scall64-n32.S +--- linux-4.4.217/arch/mips/kernel/scall64-n32.S 2020-03-27 06:53:46.552901598 +0000 ++++ linux-4.4.217-vs2.3.9.9/arch/mips/kernel/scall64-n32.S 2018-10-20 04:57:21.000000000 +0000 @@ -339,7 +339,7 @@ EXPORT(sysn32_call_table) PTR compat_sys_mq_timedreceive PTR compat_sys_mq_notify @@ -243,9 +243,9 @@ diff -NurpP --minimal linux-4.4.197/arch/mips/kernel/scall64-n32.S linux-4.4.197 PTR compat_sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key -diff -NurpP --minimal linux-4.4.197/arch/mips/kernel/scall64-o32.S linux-4.4.197-vs2.3.9.8/arch/mips/kernel/scall64-o32.S ---- linux-4.4.197/arch/mips/kernel/scall64-o32.S 2019-10-22 12:33:40.129528501 +0000 -+++ linux-4.4.197-vs2.3.9.8/arch/mips/kernel/scall64-o32.S 2019-10-05 14:35:11.423142972 +0000 +diff -NurpP --minimal linux-4.4.217/arch/mips/kernel/scall64-o32.S linux-4.4.217-vs2.3.9.9/arch/mips/kernel/scall64-o32.S +--- linux-4.4.217/arch/mips/kernel/scall64-o32.S 2020-03-27 06:53:46.552901598 +0000 ++++ linux-4.4.217-vs2.3.9.9/arch/mips/kernel/scall64-o32.S 2019-10-05 14:35:11.423142972 +0000 @@ -495,7 +495,7 @@ EXPORT(sys32_call_table) PTR compat_sys_mq_timedreceive PTR compat_sys_mq_notify /* 4275 */ @@ -255,9 +255,9 @@ diff -NurpP --minimal linux-4.4.197/arch/mips/kernel/scall64-o32.S linux-4.4.197 PTR compat_sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key /* 4280 */ -diff -NurpP --minimal linux-4.4.197/arch/mips/kernel/traps.c linux-4.4.197-vs2.3.9.8/arch/mips/kernel/traps.c ---- linux-4.4.197/arch/mips/kernel/traps.c 2019-10-22 12:33:40.129528501 +0000 -+++ linux-4.4.197-vs2.3.9.8/arch/mips/kernel/traps.c 2019-02-22 08:20:24.761110407 +0000 +diff -NurpP --minimal linux-4.4.217/arch/mips/kernel/traps.c linux-4.4.217-vs2.3.9.9/arch/mips/kernel/traps.c +--- linux-4.4.217/arch/mips/kernel/traps.c 2020-03-27 06:53:46.552901598 +0000 ++++ linux-4.4.217-vs2.3.9.9/arch/mips/kernel/traps.c 2019-02-22 08:20:24.761110407 +0000 @@ -354,9 +354,10 @@ void show_registers(struct pt_regs *regs __show_regs(regs); @@ -272,9 +272,9 @@ diff -NurpP --minimal linux-4.4.197/arch/mips/kernel/traps.c linux-4.4.197-vs2.3 if (cpu_has_userlocal) { unsigned long tls; -diff -NurpP --minimal linux-4.4.197/arch/parisc/Kconfig linux-4.4.197-vs2.3.9.8/arch/parisc/Kconfig ---- linux-4.4.197/arch/parisc/Kconfig 2019-10-22 12:33:40.439523543 +0000 -+++ linux-4.4.197-vs2.3.9.8/arch/parisc/Kconfig 2018-10-20 05:50:17.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/arch/parisc/Kconfig linux-4.4.217-vs2.3.9.9/arch/parisc/Kconfig +--- linux-4.4.217/arch/parisc/Kconfig 2020-03-27 06:53:47.912879302 +0000 ++++ linux-4.4.217-vs2.3.9.9/arch/parisc/Kconfig 2018-10-20 05:50:17.000000000 +0000 @@ -341,6 +341,8 @@ config SECCOMP If unsure, say Y. Only embedded should say N here. @@ -284,9 +284,9 @@ diff -NurpP --minimal linux-4.4.197/arch/parisc/Kconfig linux-4.4.197-vs2.3.9.8/ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-4.4.197/arch/parisc/kernel/syscall_table.S linux-4.4.197-vs2.3.9.8/arch/parisc/kernel/syscall_table.S ---- linux-4.4.197/arch/parisc/kernel/syscall_table.S 2019-10-22 12:33:40.519522264 +0000 -+++ linux-4.4.197-vs2.3.9.8/arch/parisc/kernel/syscall_table.S 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/arch/parisc/kernel/syscall_table.S linux-4.4.217-vs2.3.9.9/arch/parisc/kernel/syscall_table.S +--- linux-4.4.217/arch/parisc/kernel/syscall_table.S 2020-03-27 06:53:48.102876187 +0000 ++++ linux-4.4.217-vs2.3.9.9/arch/parisc/kernel/syscall_table.S 2018-10-20 04:57:21.000000000 +0000 @@ -358,7 +358,7 @@ ENTRY_COMP(mbind) /* 260 */ ENTRY_COMP(get_mempolicy) @@ -296,9 +296,9 @@ diff -NurpP --minimal linux-4.4.197/arch/parisc/kernel/syscall_table.S linux-4.4 ENTRY_SAME(add_key) ENTRY_SAME(request_key) /* 265 */ ENTRY_COMP(keyctl) -diff -NurpP --minimal linux-4.4.197/arch/parisc/kernel/traps.c linux-4.4.197-vs2.3.9.8/arch/parisc/kernel/traps.c ---- linux-4.4.197/arch/parisc/kernel/traps.c 2019-10-22 12:33:40.519522264 +0000 -+++ linux-4.4.197-vs2.3.9.8/arch/parisc/kernel/traps.c 2019-02-22 08:20:24.921107689 +0000 +diff -NurpP --minimal linux-4.4.217/arch/parisc/kernel/traps.c linux-4.4.217-vs2.3.9.9/arch/parisc/kernel/traps.c +--- linux-4.4.217/arch/parisc/kernel/traps.c 2020-03-27 06:53:48.102876187 +0000 ++++ linux-4.4.217-vs2.3.9.9/arch/parisc/kernel/traps.c 2019-02-22 08:20:24.921107689 +0000 @@ -235,8 +235,9 @@ void die_if_kernel(char *str, struct pt_ return; /* STFU */ @@ -322,9 +322,9 @@ diff -NurpP --minimal linux-4.4.197/arch/parisc/kernel/traps.c linux-4.4.197-vs2 /* Wot's wrong wif bein' racy? */ if (current->thread.flags & PARISC_KERNEL_DEATH) { -diff -NurpP --minimal linux-4.4.197/arch/powerpc/include/uapi/asm/unistd.h linux-4.4.197-vs2.3.9.8/arch/powerpc/include/uapi/asm/unistd.h ---- linux-4.4.197/arch/powerpc/include/uapi/asm/unistd.h 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/arch/powerpc/include/uapi/asm/unistd.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/arch/powerpc/include/uapi/asm/unistd.h linux-4.4.217-vs2.3.9.9/arch/powerpc/include/uapi/asm/unistd.h +--- linux-4.4.217/arch/powerpc/include/uapi/asm/unistd.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/arch/powerpc/include/uapi/asm/unistd.h 2018-10-20 04:57:21.000000000 +0000 @@ -275,7 +275,7 @@ #endif #define __NR_rtas 255 @@ -334,10 +334,10 @@ diff -NurpP --minimal linux-4.4.197/arch/powerpc/include/uapi/asm/unistd.h linux #define __NR_migrate_pages 258 #define __NR_mbind 259 #define __NR_get_mempolicy 260 -diff -NurpP --minimal linux-4.4.197/arch/powerpc/Kconfig linux-4.4.197-vs2.3.9.8/arch/powerpc/Kconfig ---- linux-4.4.197/arch/powerpc/Kconfig 2019-10-22 12:33:40.549521785 +0000 -+++ linux-4.4.197-vs2.3.9.8/arch/powerpc/Kconfig 2019-10-05 14:35:12.013133612 +0000 -@@ -1086,6 +1086,8 @@ source "lib/Kconfig" +diff -NurpP --minimal linux-4.4.217/arch/powerpc/Kconfig linux-4.4.217-vs2.3.9.9/arch/powerpc/Kconfig +--- linux-4.4.217/arch/powerpc/Kconfig 2020-03-27 06:53:48.212874381 +0000 ++++ linux-4.4.217-vs2.3.9.9/arch/powerpc/Kconfig 2020-04-01 09:34:18.671594346 +0000 +@@ -1087,6 +1087,8 @@ source "lib/Kconfig" source "arch/powerpc/Kconfig.debug" @@ -346,9 +346,9 @@ diff -NurpP --minimal linux-4.4.197/arch/powerpc/Kconfig linux-4.4.197-vs2.3.9.8 source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-4.4.197/arch/powerpc/kernel/traps.c linux-4.4.197-vs2.3.9.8/arch/powerpc/kernel/traps.c ---- linux-4.4.197/arch/powerpc/kernel/traps.c 2019-10-22 12:33:40.869516670 +0000 -+++ linux-4.4.197-vs2.3.9.8/arch/powerpc/kernel/traps.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/arch/powerpc/kernel/traps.c linux-4.4.217-vs2.3.9.9/arch/powerpc/kernel/traps.c +--- linux-4.4.217/arch/powerpc/kernel/traps.c 2020-03-27 06:53:48.802864711 +0000 ++++ linux-4.4.217-vs2.3.9.9/arch/powerpc/kernel/traps.c 2018-10-20 04:57:21.000000000 +0000 @@ -1315,8 +1315,9 @@ void nonrecoverable_exception(struct pt_ void trace_syscall(struct pt_regs *regs) @@ -361,9 +361,9 @@ diff -NurpP --minimal linux-4.4.197/arch/powerpc/kernel/traps.c linux-4.4.197-vs regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted()); } -diff -NurpP --minimal linux-4.4.197/arch/s390/include/asm/tlb.h linux-4.4.197-vs2.3.9.8/arch/s390/include/asm/tlb.h ---- linux-4.4.197/arch/s390/include/asm/tlb.h 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/arch/s390/include/asm/tlb.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/arch/s390/include/asm/tlb.h linux-4.4.217-vs2.3.9.9/arch/s390/include/asm/tlb.h +--- linux-4.4.217/arch/s390/include/asm/tlb.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/arch/s390/include/asm/tlb.h 2018-10-20 04:57:21.000000000 +0000 @@ -24,6 +24,7 @@ #include #include @@ -372,9 +372,9 @@ diff -NurpP --minimal linux-4.4.197/arch/s390/include/asm/tlb.h linux-4.4.197-vs #include #include #include -diff -NurpP --minimal linux-4.4.197/arch/s390/include/uapi/asm/unistd.h linux-4.4.197-vs2.3.9.8/arch/s390/include/uapi/asm/unistd.h ---- linux-4.4.197/arch/s390/include/uapi/asm/unistd.h 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/arch/s390/include/uapi/asm/unistd.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/arch/s390/include/uapi/asm/unistd.h linux-4.4.217-vs2.3.9.9/arch/s390/include/uapi/asm/unistd.h +--- linux-4.4.217/arch/s390/include/uapi/asm/unistd.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/arch/s390/include/uapi/asm/unistd.h 2018-10-20 04:57:21.000000000 +0000 @@ -200,7 +200,7 @@ #define __NR_clock_gettime 260 #define __NR_clock_getres 261 @@ -384,9 +384,9 @@ diff -NurpP --minimal linux-4.4.197/arch/s390/include/uapi/asm/unistd.h linux-4. #define __NR_statfs64 265 #define __NR_fstatfs64 266 #define __NR_remap_file_pages 267 -diff -NurpP --minimal linux-4.4.197/arch/s390/Kconfig linux-4.4.197-vs2.3.9.8/arch/s390/Kconfig ---- linux-4.4.197/arch/s390/Kconfig 2019-10-22 12:33:41.279510116 +0000 -+++ linux-4.4.197-vs2.3.9.8/arch/s390/Kconfig 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/arch/s390/Kconfig linux-4.4.217-vs2.3.9.9/arch/s390/Kconfig +--- linux-4.4.217/arch/s390/Kconfig 2020-03-27 06:53:49.722849593 +0000 ++++ linux-4.4.217-vs2.3.9.9/arch/s390/Kconfig 2018-10-20 04:57:21.000000000 +0000 @@ -776,6 +776,8 @@ source "fs/Kconfig" source "arch/s390/Kconfig.debug" @@ -396,9 +396,9 @@ diff -NurpP --minimal linux-4.4.197/arch/s390/Kconfig linux-4.4.197-vs2.3.9.8/ar source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-4.4.197/arch/s390/kernel/ptrace.c linux-4.4.197-vs2.3.9.8/arch/s390/kernel/ptrace.c ---- linux-4.4.197/arch/s390/kernel/ptrace.c 2019-10-22 12:33:41.379508517 +0000 -+++ linux-4.4.197-vs2.3.9.8/arch/s390/kernel/ptrace.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/arch/s390/kernel/ptrace.c linux-4.4.217-vs2.3.9.9/arch/s390/kernel/ptrace.c +--- linux-4.4.217/arch/s390/kernel/ptrace.c 2020-03-27 06:53:49.972845478 +0000 ++++ linux-4.4.217-vs2.3.9.9/arch/s390/kernel/ptrace.c 2018-10-20 04:57:21.000000000 +0000 @@ -21,6 +21,7 @@ #include #include @@ -407,9 +407,9 @@ diff -NurpP --minimal linux-4.4.197/arch/s390/kernel/ptrace.c linux-4.4.197-vs2. #include #include #include -diff -NurpP --minimal linux-4.4.197/arch/s390/kernel/syscalls.S linux-4.4.197-vs2.3.9.8/arch/s390/kernel/syscalls.S ---- linux-4.4.197/arch/s390/kernel/syscalls.S 2019-10-22 12:33:41.379508517 +0000 -+++ linux-4.4.197-vs2.3.9.8/arch/s390/kernel/syscalls.S 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/arch/s390/kernel/syscalls.S linux-4.4.217-vs2.3.9.9/arch/s390/kernel/syscalls.S +--- linux-4.4.217/arch/s390/kernel/syscalls.S 2020-03-27 06:53:49.972845478 +0000 ++++ linux-4.4.217-vs2.3.9.9/arch/s390/kernel/syscalls.S 2018-10-20 04:57:21.000000000 +0000 @@ -271,7 +271,7 @@ SYSCALL(sys_clock_settime,compat_sys_clo SYSCALL(sys_clock_gettime,compat_sys_clock_gettime) /* 260 */ SYSCALL(sys_clock_getres,compat_sys_clock_getres) @@ -419,9 +419,9 @@ diff -NurpP --minimal linux-4.4.197/arch/s390/kernel/syscalls.S linux-4.4.197-vs SYSCALL(sys_ni_syscall,compat_sys_s390_fadvise64_64) SYSCALL(sys_statfs64,compat_sys_statfs64) SYSCALL(sys_fstatfs64,compat_sys_fstatfs64) -diff -NurpP --minimal linux-4.4.197/arch/sh/Kconfig linux-4.4.197-vs2.3.9.8/arch/sh/Kconfig ---- linux-4.4.197/arch/sh/Kconfig 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/arch/sh/Kconfig 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/arch/sh/Kconfig linux-4.4.217-vs2.3.9.9/arch/sh/Kconfig +--- linux-4.4.217/arch/sh/Kconfig 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/arch/sh/Kconfig 2018-10-20 04:57:21.000000000 +0000 @@ -883,6 +883,8 @@ source "fs/Kconfig" source "arch/sh/Kconfig.debug" @@ -431,9 +431,9 @@ diff -NurpP --minimal linux-4.4.197/arch/sh/Kconfig linux-4.4.197-vs2.3.9.8/arch source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-4.4.197/arch/sh/kernel/irq.c linux-4.4.197-vs2.3.9.8/arch/sh/kernel/irq.c ---- linux-4.4.197/arch/sh/kernel/irq.c 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/arch/sh/kernel/irq.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/arch/sh/kernel/irq.c linux-4.4.217-vs2.3.9.9/arch/sh/kernel/irq.c +--- linux-4.4.217/arch/sh/kernel/irq.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/arch/sh/kernel/irq.c 2018-10-20 04:57:21.000000000 +0000 @@ -14,6 +14,7 @@ #include #include @@ -442,9 +442,9 @@ diff -NurpP --minimal linux-4.4.197/arch/sh/kernel/irq.c linux-4.4.197-vs2.3.9.8 #include #include #include -diff -NurpP --minimal linux-4.4.197/arch/sparc/include/uapi/asm/unistd.h linux-4.4.197-vs2.3.9.8/arch/sparc/include/uapi/asm/unistd.h ---- linux-4.4.197/arch/sparc/include/uapi/asm/unistd.h 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/arch/sparc/include/uapi/asm/unistd.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/arch/sparc/include/uapi/asm/unistd.h linux-4.4.217-vs2.3.9.9/arch/sparc/include/uapi/asm/unistd.h +--- linux-4.4.217/arch/sparc/include/uapi/asm/unistd.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/arch/sparc/include/uapi/asm/unistd.h 2018-10-20 04:57:21.000000000 +0000 @@ -332,7 +332,7 @@ #define __NR_timer_getoverrun 264 #define __NR_timer_delete 265 @@ -454,9 +454,9 @@ diff -NurpP --minimal linux-4.4.197/arch/sparc/include/uapi/asm/unistd.h linux-4 #define __NR_io_setup 268 #define __NR_io_destroy 269 #define __NR_io_submit 270 -diff -NurpP --minimal linux-4.4.197/arch/sparc/Kconfig linux-4.4.197-vs2.3.9.8/arch/sparc/Kconfig ---- linux-4.4.197/arch/sparc/Kconfig 2019-10-22 12:33:41.589505158 +0000 -+++ linux-4.4.197-vs2.3.9.8/arch/sparc/Kconfig 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/arch/sparc/Kconfig linux-4.4.217-vs2.3.9.9/arch/sparc/Kconfig +--- linux-4.4.217/arch/sparc/Kconfig 2020-03-27 06:53:50.702833469 +0000 ++++ linux-4.4.217-vs2.3.9.9/arch/sparc/Kconfig 2018-10-20 04:57:21.000000000 +0000 @@ -561,6 +561,8 @@ source "fs/Kconfig" source "arch/sparc/Kconfig.debug" @@ -466,9 +466,9 @@ diff -NurpP --minimal linux-4.4.197/arch/sparc/Kconfig linux-4.4.197-vs2.3.9.8/a source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-4.4.197/arch/sparc/kernel/systbls_32.S linux-4.4.197-vs2.3.9.8/arch/sparc/kernel/systbls_32.S ---- linux-4.4.197/arch/sparc/kernel/systbls_32.S 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/arch/sparc/kernel/systbls_32.S 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/arch/sparc/kernel/systbls_32.S linux-4.4.217-vs2.3.9.9/arch/sparc/kernel/systbls_32.S +--- linux-4.4.217/arch/sparc/kernel/systbls_32.S 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/arch/sparc/kernel/systbls_32.S 2018-10-20 04:57:21.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 @@ -478,9 +478,9 @@ diff -NurpP --minimal linux-4.4.197/arch/sparc/kernel/systbls_32.S linux-4.4.197 /*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-4.4.197/arch/sparc/kernel/systbls_64.S linux-4.4.197-vs2.3.9.8/arch/sparc/kernel/systbls_64.S ---- linux-4.4.197/arch/sparc/kernel/systbls_64.S 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/arch/sparc/kernel/systbls_64.S 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/arch/sparc/kernel/systbls_64.S linux-4.4.217-vs2.3.9.9/arch/sparc/kernel/systbls_64.S +--- linux-4.4.217/arch/sparc/kernel/systbls_64.S 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/arch/sparc/kernel/systbls_64.S 2018-10-20 04:57:21.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 @@ -499,9 +499,9 @@ diff -NurpP --minimal linux-4.4.197/arch/sparc/kernel/systbls_64.S linux-4.4.197 /*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-4.4.197/arch/um/Kconfig.rest linux-4.4.197-vs2.3.9.8/arch/um/Kconfig.rest ---- linux-4.4.197/arch/um/Kconfig.rest 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/arch/um/Kconfig.rest 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/arch/um/Kconfig.rest linux-4.4.217-vs2.3.9.9/arch/um/Kconfig.rest +--- linux-4.4.217/arch/um/Kconfig.rest 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/arch/um/Kconfig.rest 2018-10-20 04:57:21.000000000 +0000 @@ -12,6 +12,8 @@ source "arch/um/Kconfig.net" source "fs/Kconfig" @@ -511,9 +511,9 @@ diff -NurpP --minimal linux-4.4.197/arch/um/Kconfig.rest linux-4.4.197-vs2.3.9.8 source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-4.4.197/arch/x86/entry/syscalls/syscall_32.tbl linux-4.4.197-vs2.3.9.8/arch/x86/entry/syscalls/syscall_32.tbl ---- linux-4.4.197/arch/x86/entry/syscalls/syscall_32.tbl 2019-10-22 12:33:43.129480539 +0000 -+++ linux-4.4.197-vs2.3.9.8/arch/x86/entry/syscalls/syscall_32.tbl 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/arch/x86/entry/syscalls/syscall_32.tbl linux-4.4.217-vs2.3.9.9/arch/x86/entry/syscalls/syscall_32.tbl +--- linux-4.4.217/arch/x86/entry/syscalls/syscall_32.tbl 2020-03-27 06:53:52.222808467 +0000 ++++ linux-4.4.217-vs2.3.9.9/arch/x86/entry/syscalls/syscall_32.tbl 2018-10-20 04:57:21.000000000 +0000 @@ -279,7 +279,7 @@ 270 i386 tgkill sys_tgkill 271 i386 utimes sys_utimes compat_sys_utimes @@ -523,9 +523,9 @@ diff -NurpP --minimal linux-4.4.197/arch/x86/entry/syscalls/syscall_32.tbl linux 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-4.4.197/arch/x86/entry/syscalls/syscall_64.tbl linux-4.4.197-vs2.3.9.8/arch/x86/entry/syscalls/syscall_64.tbl ---- linux-4.4.197/arch/x86/entry/syscalls/syscall_64.tbl 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/arch/x86/entry/syscalls/syscall_64.tbl 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/arch/x86/entry/syscalls/syscall_64.tbl linux-4.4.217-vs2.3.9.9/arch/x86/entry/syscalls/syscall_64.tbl +--- linux-4.4.217/arch/x86/entry/syscalls/syscall_64.tbl 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/arch/x86/entry/syscalls/syscall_64.tbl 2018-10-20 04:57:21.000000000 +0000 @@ -242,7 +242,7 @@ 233 common epoll_ctl sys_epoll_ctl 234 common tgkill sys_tgkill @@ -535,10 +535,10 @@ diff -NurpP --minimal linux-4.4.197/arch/x86/entry/syscalls/syscall_64.tbl linux 237 common mbind sys_mbind 238 common set_mempolicy sys_set_mempolicy 239 common get_mempolicy sys_get_mempolicy -diff -NurpP --minimal linux-4.4.197/arch/x86/Kconfig linux-4.4.197-vs2.3.9.8/arch/x86/Kconfig ---- linux-4.4.197/arch/x86/Kconfig 2019-10-22 12:33:42.989482775 +0000 -+++ linux-4.4.197-vs2.3.9.8/arch/x86/Kconfig 2019-10-05 14:35:14.203098872 +0000 -@@ -2680,6 +2680,8 @@ source "fs/Kconfig" +diff -NurpP --minimal linux-4.4.217/arch/x86/Kconfig linux-4.4.217-vs2.3.9.9/arch/x86/Kconfig +--- linux-4.4.217/arch/x86/Kconfig 2020-03-27 06:53:51.712816857 +0000 ++++ linux-4.4.217-vs2.3.9.9/arch/x86/Kconfig 2020-04-01 09:34:19.711577121 +0000 +@@ -2724,6 +2724,8 @@ source "fs/Kconfig" source "arch/x86/Kconfig.debug" @@ -547,9 +547,9 @@ diff -NurpP --minimal linux-4.4.197/arch/x86/Kconfig linux-4.4.197-vs2.3.9.8/arc source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-4.4.197/block/ioprio.c linux-4.4.197-vs2.3.9.8/block/ioprio.c ---- linux-4.4.197/block/ioprio.c 2019-10-22 12:33:45.859436891 +0000 -+++ linux-4.4.197-vs2.3.9.8/block/ioprio.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/block/ioprio.c linux-4.4.217-vs2.3.9.9/block/ioprio.c +--- linux-4.4.217/block/ioprio.c 2020-03-27 06:53:54.772766518 +0000 ++++ linux-4.4.217-vs2.3.9.9/block/ioprio.c 2018-10-20 04:57:21.000000000 +0000 @@ -28,6 +28,7 @@ #include #include @@ -576,9 +576,9 @@ diff -NurpP --minimal linux-4.4.197/block/ioprio.c linux-4.4.197-vs2.3.9.8/block tmpio = get_task_ioprio(p); if (tmpio < 0) continue; -diff -NurpP --minimal linux-4.4.197/Documentation/vserver/debug.txt linux-4.4.197-vs2.3.9.8/Documentation/vserver/debug.txt ---- linux-4.4.197/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/Documentation/vserver/debug.txt 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/Documentation/vserver/debug.txt linux-4.4.217-vs2.3.9.9/Documentation/vserver/debug.txt +--- linux-4.4.217/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/Documentation/vserver/debug.txt 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,154 @@ + +debug_cvirt: @@ -613,12 +613,12 @@ diff -NurpP --minimal linux-4.4.197/Documentation/vserver/debug.txt linux-4.4.19 + "vroot[%d]_get_real_bdev: dev=%p[%lu,%d:%d]" + "vroot[%d]_set_dev: dev=%p[%lu,%d:%d]" + "vroot_get_real_bdev not set" -+ 1 2 "cow_break_link(?%s?)" -+ "temp copy ?%s?" ++ 1 2 "cow_break_link(»%s«)" ++ "temp copy »%s«" + 2 4 "dentry_open(new): %p" + "dentry_open(old): %p" + "lookup_create(new): %p" -+ "old path ?%s?" ++ "old path »%s«" + "path_lookup(old): %d" + "vfs_create(new): %d" + "vfs_rename: %d" @@ -686,7 +686,7 @@ diff -NurpP --minimal linux-4.4.197/Documentation/vserver/debug.txt linux-4.4.19 + +debug_tag: + -+ 7 80 "dx_parse_tag(?%s?): %d:#%d" ++ 7 80 "dx_parse_tag(»%s«): %d:#%d" + "dx_propagate_tag(%p[#%lu.%d]): %d,%d" + +debug_xid: @@ -734,9 +734,9 @@ diff -NurpP --minimal linux-4.4.197/Documentation/vserver/debug.txt linux-4.4.19 + 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-4.4.197/drivers/block/Kconfig linux-4.4.197-vs2.3.9.8/drivers/block/Kconfig ---- linux-4.4.197/drivers/block/Kconfig 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/drivers/block/Kconfig 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/drivers/block/Kconfig linux-4.4.217-vs2.3.9.9/drivers/block/Kconfig +--- linux-4.4.217/drivers/block/Kconfig 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/drivers/block/Kconfig 2018-10-20 04:57:21.000000000 +0000 @@ -283,6 +283,13 @@ config BLK_DEV_CRYPTOLOOP source "drivers/block/drbd/Kconfig" @@ -751,9 +751,9 @@ diff -NurpP --minimal linux-4.4.197/drivers/block/Kconfig linux-4.4.197-vs2.3.9. config BLK_DEV_NBD tristate "Network block device support" depends on NET -diff -NurpP --minimal linux-4.4.197/drivers/block/loop.c linux-4.4.197-vs2.3.9.8/drivers/block/loop.c ---- linux-4.4.197/drivers/block/loop.c 2019-10-22 12:33:47.979402997 +0000 -+++ linux-4.4.197-vs2.3.9.8/drivers/block/loop.c 2019-10-05 14:35:16.743058580 +0000 +diff -NurpP --minimal linux-4.4.217/drivers/block/loop.c linux-4.4.217-vs2.3.9.9/drivers/block/loop.c +--- linux-4.4.217/drivers/block/loop.c 2020-03-27 06:53:56.182743324 +0000 ++++ linux-4.4.217-vs2.3.9.9/drivers/block/loop.c 2020-04-01 09:34:21.381549460 +0000 @@ -76,6 +76,7 @@ #include #include @@ -797,7 +797,7 @@ diff -NurpP --minimal linux-4.4.197/drivers/block/loop.c linux-4.4.197-vs2.3.9.8 info->lo_encrypt_key_size = lo->lo_encrypt_key_size; memcpy(info->lo_encrypt_key, lo->lo_encrypt_key, lo->lo_encrypt_key_size); -@@ -1579,6 +1583,11 @@ static int lo_open(struct block_device * +@@ -1580,6 +1584,11 @@ static int lo_open(struct block_device * goto out; } @@ -809,9 +809,9 @@ diff -NurpP --minimal linux-4.4.197/drivers/block/loop.c linux-4.4.197-vs2.3.9.8 atomic_inc(&lo->lo_refcnt); out: mutex_unlock(&loop_index_mutex); -diff -NurpP --minimal linux-4.4.197/drivers/block/loop.h linux-4.4.197-vs2.3.9.8/drivers/block/loop.h ---- linux-4.4.197/drivers/block/loop.h 2019-10-22 12:33:47.979402997 +0000 -+++ linux-4.4.197-vs2.3.9.8/drivers/block/loop.h 2019-10-05 14:35:16.753058421 +0000 +diff -NurpP --minimal linux-4.4.217/drivers/block/loop.h linux-4.4.217-vs2.3.9.9/drivers/block/loop.h +--- linux-4.4.217/drivers/block/loop.h 2020-03-27 06:53:56.182743324 +0000 ++++ linux-4.4.217-vs2.3.9.9/drivers/block/loop.h 2019-10-05 14:35:16.753058421 +0000 @@ -43,6 +43,7 @@ struct loop_device { struct loop_func_table *lo_encryption; __u32 lo_init[2]; @@ -820,9 +820,9 @@ diff -NurpP --minimal linux-4.4.197/drivers/block/loop.h linux-4.4.197-vs2.3.9.8 int (*ioctl)(struct loop_device *, int cmd, unsigned long arg); -diff -NurpP --minimal linux-4.4.197/drivers/block/Makefile linux-4.4.197-vs2.3.9.8/drivers/block/Makefile ---- linux-4.4.197/drivers/block/Makefile 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/drivers/block/Makefile 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/drivers/block/Makefile linux-4.4.217-vs2.3.9.9/drivers/block/Makefile +--- linux-4.4.217/drivers/block/Makefile 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/drivers/block/Makefile 2018-10-20 04:57:21.000000000 +0000 @@ -32,6 +32,7 @@ obj-$(CONFIG_VIRTIO_BLK) += virtio_blk.o obj-$(CONFIG_BLK_DEV_SX8) += sx8.o @@ -831,19 +831,19 @@ diff -NurpP --minimal linux-4.4.197/drivers/block/Makefile linux-4.4.197-vs2.3.9 obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o obj-$(CONFIG_XEN_BLKDEV_BACKEND) += xen-blkback/ -diff -NurpP --minimal linux-4.4.197/drivers/block/vroot.c linux-4.4.197-vs2.3.9.8/drivers/block/vroot.c ---- linux-4.4.197/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/drivers/block/vroot.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/drivers/block/vroot.c linux-4.4.217-vs2.3.9.9/drivers/block/vroot.c +--- linux-4.4.217/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/drivers/block/vroot.c 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,291 @@ +/* + * linux/drivers/block/vroot.c + * -+ * written by Herbert P?tzl, 9/11/2002 -+ * ported to 2.6.10 by Herbert P?tzl, 30/12/2004 ++ * written by Herbert Pötzl, 9/11/2002 ++ * ported to 2.6.10 by Herbert Pötzl, 30/12/2004 + * + * based on the loop.c code by Theodore Ts'o. + * -+ * Copyright (C) 2002-2007 by Herbert P?tzl. ++ * Copyright (C) 2002-2007 by Herbert Pötzl. + * Redistribution of this file is permitted under the + * GNU General Public License. + * @@ -1021,7 +1021,7 @@ diff -NurpP --minimal linux-4.4.197/drivers/block/vroot.c linux-4.4.197-vs2.3.9. +MODULE_LICENSE("GPL"); +MODULE_ALIAS_BLOCKDEV_MAJOR(VROOT_MAJOR); + -+MODULE_AUTHOR ("Herbert P?tzl"); ++MODULE_AUTHOR ("Herbert Pötzl"); +MODULE_DESCRIPTION ("Virtual Root Device Mapper"); + + @@ -1126,9 +1126,9 @@ diff -NurpP --minimal linux-4.4.197/drivers/block/vroot.c linux-4.4.197-vs2.3.9. + +#endif + -diff -NurpP --minimal linux-4.4.197/drivers/infiniband/core/addr.c linux-4.4.197-vs2.3.9.8/drivers/infiniband/core/addr.c ---- linux-4.4.197/drivers/infiniband/core/addr.c 2019-10-22 12:33:58.339237367 +0000 -+++ linux-4.4.197-vs2.3.9.8/drivers/infiniband/core/addr.c 2019-10-05 14:35:19.353017176 +0000 +diff -NurpP --minimal linux-4.4.217/drivers/infiniband/core/addr.c linux-4.4.217-vs2.3.9.9/drivers/infiniband/core/addr.c +--- linux-4.4.217/drivers/infiniband/core/addr.c 2020-03-27 06:54:04.832601029 +0000 ++++ linux-4.4.217-vs2.3.9.9/drivers/infiniband/core/addr.c 2019-10-05 14:35:19.353017176 +0000 @@ -299,7 +299,7 @@ static int addr6_resolve(struct sockaddr if (ipv6_addr_any(&fl6.saddr)) { @@ -1138,9 +1138,9 @@ diff -NurpP --minimal linux-4.4.197/drivers/infiniband/core/addr.c linux-4.4.197 if (ret) goto put; -diff -NurpP --minimal linux-4.4.197/drivers/md/dm.c linux-4.4.197-vs2.3.9.8/drivers/md/dm.c ---- linux-4.4.197/drivers/md/dm.c 2019-10-22 12:33:59.859213069 +0000 -+++ linux-4.4.197-vs2.3.9.8/drivers/md/dm.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/drivers/md/dm.c linux-4.4.217-vs2.3.9.9/drivers/md/dm.c +--- linux-4.4.217/drivers/md/dm.c 2020-03-27 06:54:06.982565659 +0000 ++++ linux-4.4.217-vs2.3.9.9/drivers/md/dm.c 2020-04-01 09:34:24.631495625 +0000 @@ -25,6 +25,7 @@ #include /* for rq_end_sector() */ #include @@ -1213,9 +1213,9 @@ diff -NurpP --minimal linux-4.4.197/drivers/md/dm.c linux-4.4.197-vs2.3.9.8/driv md->queue = blk_alloc_queue(GFP_KERNEL); if (!md->queue) goto bad; -diff -NurpP --minimal linux-4.4.197/drivers/md/dm.h linux-4.4.197-vs2.3.9.8/drivers/md/dm.h ---- linux-4.4.197/drivers/md/dm.h 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/drivers/md/dm.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/drivers/md/dm.h linux-4.4.217-vs2.3.9.9/drivers/md/dm.h +--- linux-4.4.217/drivers/md/dm.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/drivers/md/dm.h 2018-10-20 04:57:21.000000000 +0000 @@ -52,6 +52,8 @@ struct dm_dev_internal { struct dm_table; struct dm_md_mempools; @@ -1225,9 +1225,9 @@ diff -NurpP --minimal linux-4.4.197/drivers/md/dm.h linux-4.4.197-vs2.3.9.8/driv /*----------------------------------------------------------------- * Internal table functions. *---------------------------------------------------------------*/ -diff -NurpP --minimal linux-4.4.197/drivers/md/dm-ioctl.c linux-4.4.197-vs2.3.9.8/drivers/md/dm-ioctl.c ---- linux-4.4.197/drivers/md/dm-ioctl.c 2019-10-22 12:33:59.539218184 +0000 -+++ linux-4.4.197-vs2.3.9.8/drivers/md/dm-ioctl.c 2019-02-22 08:20:28.131053160 +0000 +diff -NurpP --minimal linux-4.4.217/drivers/md/dm-ioctl.c linux-4.4.217-vs2.3.9.9/drivers/md/dm-ioctl.c +--- linux-4.4.217/drivers/md/dm-ioctl.c 2020-03-27 06:54:06.962565987 +0000 ++++ linux-4.4.217-vs2.3.9.9/drivers/md/dm-ioctl.c 2019-02-22 08:20:28.131053160 +0000 @@ -16,6 +16,7 @@ #include #include @@ -1313,9 +1313,9 @@ diff -NurpP --minimal linux-4.4.197/drivers/md/dm-ioctl.c linux-4.4.197-vs2.3.9. return -EACCES; if (_IOC_TYPE(command) != DM_IOCTL) -diff -NurpP --minimal linux-4.4.197/drivers/net/tun.c linux-4.4.197-vs2.3.9.8/drivers/net/tun.c ---- linux-4.4.197/drivers/net/tun.c 2019-10-22 12:34:11.439027933 +0000 -+++ linux-4.4.197-vs2.3.9.8/drivers/net/tun.c 2019-10-05 14:35:25.262923426 +0000 +diff -NurpP --minimal linux-4.4.217/drivers/net/tun.c linux-4.4.217-vs2.3.9.9/drivers/net/tun.c +--- linux-4.4.217/drivers/net/tun.c 2020-03-27 06:54:16.032416786 +0000 ++++ linux-4.4.217-vs2.3.9.9/drivers/net/tun.c 2019-10-05 14:35:25.262923426 +0000 @@ -65,6 +65,7 @@ #include #include @@ -1374,9 +1374,9 @@ diff -NurpP --minimal linux-4.4.197/drivers/net/tun.c linux-4.4.197-vs2.3.9.8/dr case TUNSETLINK: /* Only allow setting the type when the interface is down */ if (tun->dev->flags & IFF_UP) { -diff -NurpP --minimal linux-4.4.197/drivers/scsi/cxgbi/libcxgbi.c linux-4.4.197-vs2.3.9.8/drivers/scsi/cxgbi/libcxgbi.c ---- linux-4.4.197/drivers/scsi/cxgbi/libcxgbi.c 2019-10-22 12:34:17.668928331 +0000 -+++ linux-4.4.197-vs2.3.9.8/drivers/scsi/cxgbi/libcxgbi.c 2019-10-05 14:35:27.572886782 +0000 +diff -NurpP --minimal linux-4.4.217/drivers/scsi/cxgbi/libcxgbi.c linux-4.4.217-vs2.3.9.9/drivers/scsi/cxgbi/libcxgbi.c +--- linux-4.4.217/drivers/scsi/cxgbi/libcxgbi.c 2020-03-27 06:54:34.812107850 +0000 ++++ linux-4.4.217-vs2.3.9.9/drivers/scsi/cxgbi/libcxgbi.c 2019-10-05 14:35:27.572886782 +0000 @@ -772,7 +772,8 @@ static struct cxgbi_sock *cxgbi_check_ro struct inet6_dev *idev = ip6_dst_idev((struct dst_entry *)rt); @@ -1387,9 +1387,9 @@ diff -NurpP --minimal linux-4.4.197/drivers/scsi/cxgbi/libcxgbi.c linux-4.4.197- if (err) { pr_info("failed to get source address to reach %pI6\n", &daddr6->sin6_addr); -diff -NurpP --minimal linux-4.4.197/drivers/tty/sysrq.c linux-4.4.197-vs2.3.9.8/drivers/tty/sysrq.c ---- linux-4.4.197/drivers/tty/sysrq.c 2019-10-22 12:34:22.888844914 +0000 -+++ linux-4.4.197-vs2.3.9.8/drivers/tty/sysrq.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/drivers/tty/sysrq.c linux-4.4.217-vs2.3.9.9/drivers/tty/sysrq.c +--- linux-4.4.217/drivers/tty/sysrq.c 2020-03-27 06:54:39.192035797 +0000 ++++ linux-4.4.217-vs2.3.9.9/drivers/tty/sysrq.c 2020-04-01 09:34:39.161254955 +0000 @@ -47,6 +47,7 @@ #include #include @@ -1441,9 +1441,9 @@ diff -NurpP --minimal linux-4.4.197/drivers/tty/sysrq.c linux-4.4.197-vs2.3.9.8/ else retval = -1; return retval; -diff -NurpP --minimal linux-4.4.197/drivers/tty/tty_io.c linux-4.4.197-vs2.3.9.8/drivers/tty/tty_io.c ---- linux-4.4.197/drivers/tty/tty_io.c 2019-10-22 12:34:22.888844914 +0000 -+++ linux-4.4.197-vs2.3.9.8/drivers/tty/tty_io.c 2019-10-05 14:35:30.532839829 +0000 +diff -NurpP --minimal linux-4.4.217/drivers/tty/tty_io.c linux-4.4.217-vs2.3.9.9/drivers/tty/tty_io.c +--- linux-4.4.217/drivers/tty/tty_io.c 2020-03-27 06:54:39.192035797 +0000 ++++ linux-4.4.217-vs2.3.9.9/drivers/tty/tty_io.c 2019-10-05 14:35:30.532839829 +0000 @@ -104,6 +104,7 @@ #include @@ -1470,9 +1470,9 @@ diff -NurpP --minimal linux-4.4.197/drivers/tty/tty_io.c linux-4.4.197-vs2.3.9.8 if (pgrp_nr < 0) return -EINVAL; rcu_read_lock(); -diff -NurpP --minimal linux-4.4.197/fs/attr.c linux-4.4.197-vs2.3.9.8/fs/attr.c ---- linux-4.4.197/fs/attr.c 2019-10-22 12:34:30.078730021 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/attr.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/attr.c linux-4.4.217-vs2.3.9.9/fs/attr.c +--- linux-4.4.217/fs/attr.c 2020-03-27 06:54:43.631962755 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/attr.c 2018-10-20 04:57:21.000000000 +0000 @@ -15,6 +15,9 @@ #include #include @@ -1513,9 +1513,9 @@ diff -NurpP --minimal linux-4.4.197/fs/attr.c linux-4.4.197-vs2.3.9.8/fs/attr.c if (IS_IMMUTABLE(inode) || IS_APPEND(inode)) return -EPERM; } -diff -NurpP --minimal linux-4.4.197/fs/block_dev.c linux-4.4.197-vs2.3.9.8/fs/block_dev.c ---- linux-4.4.197/fs/block_dev.c 2019-10-22 12:34:30.558722354 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/block_dev.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/block_dev.c linux-4.4.217-vs2.3.9.9/fs/block_dev.c +--- linux-4.4.217/fs/block_dev.c 2020-03-27 06:54:43.771960451 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/block_dev.c 2018-10-20 04:57:21.000000000 +0000 @@ -29,6 +29,7 @@ #include #include @@ -1553,9 +1553,9 @@ diff -NurpP --minimal linux-4.4.197/fs/block_dev.c linux-4.4.197-vs2.3.9.8/fs/bl if (bdev) { spin_lock(&bdev_lock); if (!inode->i_bdev) { -diff -NurpP --minimal linux-4.4.197/fs/btrfs/ctree.h linux-4.4.197-vs2.3.9.8/fs/btrfs/ctree.h ---- linux-4.4.197/fs/btrfs/ctree.h 2019-10-22 12:34:30.658720753 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/btrfs/ctree.h 2019-02-22 08:20:32.700975524 +0000 +diff -NurpP --minimal linux-4.4.217/fs/btrfs/ctree.h linux-4.4.217-vs2.3.9.9/fs/btrfs/ctree.h +--- linux-4.4.217/fs/btrfs/ctree.h 2020-03-27 06:54:43.871958807 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/btrfs/ctree.h 2020-04-01 09:34:41.871210070 +0000 @@ -732,11 +732,14 @@ struct btrfs_inode_item { /* modification sequence number for NFS */ __le64 sequence; @@ -1572,7 +1572,7 @@ diff -NurpP --minimal linux-4.4.197/fs/btrfs/ctree.h linux-4.4.197-vs2.3.9.8/fs/ struct btrfs_timespec atime; struct btrfs_timespec ctime; struct btrfs_timespec mtime; -@@ -2191,6 +2194,8 @@ struct btrfs_ioctl_defrag_range_args { +@@ -2189,6 +2192,8 @@ struct btrfs_ioctl_defrag_range_args { #define BTRFS_DEFAULT_COMMIT_INTERVAL (30) #define BTRFS_DEFAULT_MAX_INLINE (8192) @@ -1581,7 +1581,7 @@ diff -NurpP --minimal linux-4.4.197/fs/btrfs/ctree.h linux-4.4.197-vs2.3.9.8/fs/ #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) -@@ -2533,6 +2538,7 @@ BTRFS_SETGET_FUNCS(inode_block_group, st +@@ -2531,6 +2536,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); @@ -1589,7 +1589,7 @@ diff -NurpP --minimal linux-4.4.197/fs/btrfs/ctree.h linux-4.4.197-vs2.3.9.8/fs/ 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); -@@ -2580,6 +2586,10 @@ BTRFS_SETGET_FUNCS(extent_flags, struct +@@ -2578,6 +2584,10 @@ BTRFS_SETGET_FUNCS(extent_flags, struct BTRFS_SETGET_FUNCS(extent_refs_v0, struct btrfs_extent_item_v0, refs, 32); @@ -1600,7 +1600,7 @@ diff -NurpP --minimal linux-4.4.197/fs/btrfs/ctree.h linux-4.4.197-vs2.3.9.8/fs/ BTRFS_SETGET_FUNCS(tree_block_level, struct btrfs_tree_block_info, level, 8); -@@ -4043,6 +4053,7 @@ long btrfs_ioctl(struct file *file, unsi +@@ -4041,6 +4051,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); @@ -1608,10 +1608,10 @@ diff -NurpP --minimal linux-4.4.197/fs/btrfs/ctree.h linux-4.4.197-vs2.3.9.8/fs/ 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-4.4.197/fs/btrfs/disk-io.c linux-4.4.197-vs2.3.9.8/fs/btrfs/disk-io.c ---- linux-4.4.197/fs/btrfs/disk-io.c 2019-10-22 12:34:30.668720596 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/btrfs/disk-io.c 2019-02-22 08:20:32.700975524 +0000 -@@ -2667,6 +2667,9 @@ int open_ctree(struct super_block *sb, +diff -NurpP --minimal linux-4.4.217/fs/btrfs/disk-io.c linux-4.4.217-vs2.3.9.9/fs/btrfs/disk-io.c +--- linux-4.4.217/fs/btrfs/disk-io.c 2020-03-27 06:54:43.881958645 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/btrfs/disk-io.c 2020-04-01 09:34:41.961208576 +0000 +@@ -2666,6 +2666,9 @@ int open_ctree(struct super_block *sb, goto fail_alloc; } @@ -1621,9 +1621,9 @@ diff -NurpP --minimal linux-4.4.197/fs/btrfs/disk-io.c linux-4.4.197-vs2.3.9.8/f features = btrfs_super_incompat_flags(disk_super) & ~BTRFS_FEATURE_INCOMPAT_SUPP; if (features) { -diff -NurpP --minimal linux-4.4.197/fs/btrfs/inode.c linux-4.4.197-vs2.3.9.8/fs/btrfs/inode.c ---- linux-4.4.197/fs/btrfs/inode.c 2019-10-22 12:34:30.728719635 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/btrfs/inode.c 2019-02-22 08:20:32.720975184 +0000 +diff -NurpP --minimal linux-4.4.217/fs/btrfs/inode.c linux-4.4.217-vs2.3.9.9/fs/btrfs/inode.c +--- linux-4.4.217/fs/btrfs/inode.c 2020-03-27 06:54:43.921957986 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/btrfs/inode.c 2020-04-01 09:34:42.021207582 +0000 @@ -43,6 +43,7 @@ #include #include @@ -1680,7 +1680,7 @@ diff -NurpP --minimal linux-4.4.197/fs/btrfs/inode.c linux-4.4.197-vs2.3.9.8/fs/ 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); -@@ -10093,6 +10110,7 @@ static const struct inode_operations btr +@@ -10092,6 +10109,7 @@ static const struct inode_operations btr .listxattr = btrfs_listxattr, .removexattr = btrfs_removexattr, .permission = btrfs_permission, @@ -1688,7 +1688,7 @@ diff -NurpP --minimal linux-4.4.197/fs/btrfs/inode.c linux-4.4.197-vs2.3.9.8/fs/ .get_acl = btrfs_get_acl, .set_acl = btrfs_set_acl, .update_time = btrfs_update_time, -@@ -10101,6 +10119,7 @@ static const struct inode_operations btr +@@ -10100,6 +10118,7 @@ static const struct inode_operations btr static const struct inode_operations btrfs_dir_ro_inode_operations = { .lookup = btrfs_lookup, .permission = btrfs_permission, @@ -1696,7 +1696,7 @@ diff -NurpP --minimal linux-4.4.197/fs/btrfs/inode.c linux-4.4.197-vs2.3.9.8/fs/ .get_acl = btrfs_get_acl, .set_acl = btrfs_set_acl, .update_time = btrfs_update_time, -@@ -10171,6 +10190,7 @@ static const struct inode_operations btr +@@ -10170,6 +10189,7 @@ static const struct inode_operations btr .removexattr = btrfs_removexattr, .permission = btrfs_permission, .fiemap = btrfs_fiemap, @@ -1704,9 +1704,9 @@ diff -NurpP --minimal linux-4.4.197/fs/btrfs/inode.c linux-4.4.197-vs2.3.9.8/fs/ .get_acl = btrfs_get_acl, .set_acl = btrfs_set_acl, .update_time = btrfs_update_time, -diff -NurpP --minimal linux-4.4.197/fs/btrfs/ioctl.c linux-4.4.197-vs2.3.9.8/fs/btrfs/ioctl.c ---- linux-4.4.197/fs/btrfs/ioctl.c 2019-10-22 12:34:30.728719635 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/btrfs/ioctl.c 2019-02-22 08:20:32.720975184 +0000 +diff -NurpP --minimal linux-4.4.217/fs/btrfs/ioctl.c linux-4.4.217-vs2.3.9.9/fs/btrfs/ioctl.c +--- linux-4.4.217/fs/btrfs/ioctl.c 2020-03-27 06:54:43.921957986 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/btrfs/ioctl.c 2020-04-01 09:34:42.051207086 +0000 @@ -108,10 +108,13 @@ static unsigned int btrfs_flags_to_ioctl { unsigned int iflags = 0; @@ -1885,9 +1885,9 @@ diff -NurpP --minimal linux-4.4.197/fs/btrfs/ioctl.c linux-4.4.197-vs2.3.9.8/fs/ if (flags & FS_APPEND_FL) ip->flags |= BTRFS_INODE_APPEND; else -diff -NurpP --minimal linux-4.4.197/fs/btrfs/super.c linux-4.4.197-vs2.3.9.8/fs/btrfs/super.c ---- linux-4.4.197/fs/btrfs/super.c 2019-10-22 12:34:30.738719477 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/btrfs/super.c 2019-02-22 08:20:32.730975015 +0000 +diff -NurpP --minimal linux-4.4.217/fs/btrfs/super.c linux-4.4.217-vs2.3.9.9/fs/btrfs/super.c +--- linux-4.4.217/fs/btrfs/super.c 2020-03-27 06:54:43.921957986 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/btrfs/super.c 2020-04-01 09:34:42.071206757 +0000 @@ -306,7 +306,7 @@ enum { #ifdef CONFIG_BTRFS_DEBUG Opt_fragment_data, Opt_fragment_metadata, Opt_fragment_all, @@ -1943,9 +1943,9 @@ diff -NurpP --minimal linux-4.4.197/fs/btrfs/super.c linux-4.4.197-vs2.3.9.8/fs/ if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY)) goto out; -diff -NurpP --minimal linux-4.4.197/fs/char_dev.c linux-4.4.197-vs2.3.9.8/fs/char_dev.c ---- linux-4.4.197/fs/char_dev.c 2019-10-22 12:34:30.948716122 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/char_dev.c 2019-10-05 14:35:32.892802392 +0000 +diff -NurpP --minimal linux-4.4.217/fs/char_dev.c linux-4.4.217-vs2.3.9.9/fs/char_dev.c +--- linux-4.4.217/fs/char_dev.c 2020-03-27 06:54:44.151954203 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/char_dev.c 2020-04-01 09:34:42.241203939 +0000 @@ -21,6 +21,8 @@ #include #include @@ -1978,9 +1978,9 @@ diff -NurpP --minimal linux-4.4.197/fs/char_dev.c linux-4.4.197-vs2.3.9.8/fs/cha if (!kobj) return -ENXIO; new = container_of(kobj, struct cdev, kobj); -diff -NurpP --minimal linux-4.4.197/fs/dcache.c linux-4.4.197-vs2.3.9.8/fs/dcache.c ---- linux-4.4.197/fs/dcache.c 2019-10-22 12:34:31.358709568 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/dcache.c 2019-10-05 14:35:33.302795887 +0000 +diff -NurpP --minimal linux-4.4.217/fs/dcache.c linux-4.4.217-vs2.3.9.9/fs/dcache.c +--- linux-4.4.217/fs/dcache.c 2020-03-27 06:54:44.371950584 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/dcache.c 2020-04-01 09:34:42.541198969 +0000 @@ -39,6 +39,7 @@ #include #include @@ -2072,9 +2072,9 @@ diff -NurpP --minimal linux-4.4.197/fs/dcache.c linux-4.4.197-vs2.3.9.8/fs/dcach } } return D_WALK_CONTINUE; -diff -NurpP --minimal linux-4.4.197/fs/devpts/inode.c linux-4.4.197-vs2.3.9.8/fs/devpts/inode.c ---- linux-4.4.197/fs/devpts/inode.c 2019-10-22 12:34:31.418708612 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/devpts/inode.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/devpts/inode.c linux-4.4.217-vs2.3.9.9/fs/devpts/inode.c +--- linux-4.4.217/fs/devpts/inode.c 2020-03-27 06:54:44.461949101 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/devpts/inode.c 2018-10-20 04:57:21.000000000 +0000 @@ -27,6 +27,7 @@ #include #include @@ -2162,9 +2162,9 @@ diff -NurpP --minimal linux-4.4.197/fs/devpts/inode.c linux-4.4.197-vs2.3.9.8/fs inode->i_private = priv; sprintf(s, "%d", index); -diff -NurpP --minimal linux-4.4.197/fs/ext2/balloc.c linux-4.4.197-vs2.3.9.8/fs/ext2/balloc.c ---- linux-4.4.197/fs/ext2/balloc.c 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/ext2/balloc.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/ext2/balloc.c linux-4.4.217-vs2.3.9.9/fs/ext2/balloc.c +--- linux-4.4.217/fs/ext2/balloc.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/ext2/balloc.c 2018-10-20 04:57:21.000000000 +0000 @@ -693,7 +693,6 @@ ext2_try_to_allocate(struct super_block start = 0; end = EXT2_BLOCKS_PER_GROUP(sb); @@ -2173,9 +2173,9 @@ diff -NurpP --minimal linux-4.4.197/fs/ext2/balloc.c linux-4.4.197-vs2.3.9.8/fs/ BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb)); repeat: -diff -NurpP --minimal linux-4.4.197/fs/ext2/ext2.h linux-4.4.197-vs2.3.9.8/fs/ext2/ext2.h ---- linux-4.4.197/fs/ext2/ext2.h 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/ext2/ext2.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/ext2/ext2.h linux-4.4.217-vs2.3.9.9/fs/ext2/ext2.h +--- linux-4.4.217/fs/ext2/ext2.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/ext2/ext2.h 2018-10-20 04:57:21.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) */ @@ -2223,18 +2223,18 @@ diff -NurpP --minimal linux-4.4.197/fs/ext2/ext2.h linux-4.4.197-vs2.3.9.8/fs/ex /* ioctl.c */ extern long ext2_ioctl(struct file *, unsigned int, unsigned long); -diff -NurpP --minimal linux-4.4.197/fs/ext2/file.c linux-4.4.197-vs2.3.9.8/fs/ext2/file.c ---- linux-4.4.197/fs/ext2/file.c 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/ext2/file.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/ext2/file.c linux-4.4.217-vs2.3.9.9/fs/ext2/file.c +--- linux-4.4.217/fs/ext2/file.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/ext2/file.c 2018-10-20 04:57:21.000000000 +0000 @@ -202,4 +202,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-4.4.197/fs/ext2/ialloc.c linux-4.4.197-vs2.3.9.8/fs/ext2/ialloc.c ---- linux-4.4.197/fs/ext2/ialloc.c 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/ext2/ialloc.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/ext2/ialloc.c linux-4.4.217-vs2.3.9.9/fs/ext2/ialloc.c +--- linux-4.4.217/fs/ext2/ialloc.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/ext2/ialloc.c 2018-10-20 04:57:21.000000000 +0000 @@ -17,6 +17,7 @@ #include #include @@ -2251,9 +2251,9 @@ diff -NurpP --minimal linux-4.4.197/fs/ext2/ialloc.c linux-4.4.197-vs2.3.9.8/fs/ } else inode_init_owner(inode, dir, mode); -diff -NurpP --minimal linux-4.4.197/fs/ext2/inode.c linux-4.4.197-vs2.3.9.8/fs/ext2/inode.c ---- linux-4.4.197/fs/ext2/inode.c 2019-10-22 12:34:31.748703336 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/ext2/inode.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/ext2/inode.c linux-4.4.217-vs2.3.9.9/fs/ext2/inode.c +--- linux-4.4.217/fs/ext2/inode.c 2020-03-27 06:54:44.791943672 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/ext2/inode.c 2018-10-20 04:57:21.000000000 +0000 @@ -33,6 +33,7 @@ #include #include @@ -2379,9 +2379,9 @@ diff -NurpP --minimal linux-4.4.197/fs/ext2/inode.c linux-4.4.197-vs2.3.9.8/fs/e error = dquot_transfer(inode, iattr); if (error) return error; -diff -NurpP --minimal linux-4.4.197/fs/ext2/ioctl.c linux-4.4.197-vs2.3.9.8/fs/ext2/ioctl.c ---- linux-4.4.197/fs/ext2/ioctl.c 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/ext2/ioctl.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/ext2/ioctl.c linux-4.4.217-vs2.3.9.9/fs/ext2/ioctl.c +--- linux-4.4.217/fs/ext2/ioctl.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/ext2/ioctl.c 2018-10-20 04:57:21.000000000 +0000 @@ -17,6 +17,16 @@ #include @@ -2431,9 +2431,9 @@ diff -NurpP --minimal linux-4.4.197/fs/ext2/ioctl.c linux-4.4.197-vs2.3.9.8/fs/e flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE; ei->i_flags = flags; -diff -NurpP --minimal linux-4.4.197/fs/ext2/namei.c linux-4.4.197-vs2.3.9.8/fs/ext2/namei.c ---- linux-4.4.197/fs/ext2/namei.c 2019-10-22 12:34:31.748703336 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/ext2/namei.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/ext2/namei.c linux-4.4.217-vs2.3.9.9/fs/ext2/namei.c +--- linux-4.4.217/fs/ext2/namei.c 2020-03-27 06:54:44.791943672 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/ext2/namei.c 2018-10-20 04:57:21.000000000 +0000 @@ -32,6 +32,7 @@ #include @@ -2458,9 +2458,9 @@ diff -NurpP --minimal linux-4.4.197/fs/ext2/namei.c linux-4.4.197-vs2.3.9.8/fs/e .get_acl = ext2_get_acl, .set_acl = ext2_set_acl, }; -diff -NurpP --minimal linux-4.4.197/fs/ext2/super.c linux-4.4.197-vs2.3.9.8/fs/ext2/super.c ---- linux-4.4.197/fs/ext2/super.c 2019-10-22 12:34:31.748703336 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/ext2/super.c 2019-10-05 14:35:33.502792714 +0000 +diff -NurpP --minimal linux-4.4.217/fs/ext2/super.c linux-4.4.217-vs2.3.9.9/fs/ext2/super.c +--- linux-4.4.217/fs/ext2/super.c 2020-03-27 06:54:44.791943672 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/ext2/super.c 2020-04-01 09:34:42.841194003 +0000 @@ -408,7 +408,8 @@ enum { Opt_err_ro, Opt_nouid32, Opt_nocheck, Opt_debug, Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr, @@ -2526,9 +2526,9 @@ diff -NurpP --minimal linux-4.4.197/fs/ext2/super.c linux-4.4.197-vs2.3.9.8/fs/e sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | ((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0); -diff -NurpP --minimal linux-4.4.197/fs/ext4/ext4.h linux-4.4.197-vs2.3.9.8/fs/ext4/ext4.h ---- linux-4.4.197/fs/ext4/ext4.h 2019-10-22 12:34:31.838701898 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/ext4/ext4.h 2019-02-22 08:20:33.340964652 +0000 +diff -NurpP --minimal linux-4.4.217/fs/ext4/ext4.h linux-4.4.217-vs2.3.9.9/fs/ext4/ext4.h +--- linux-4.4.217/fs/ext4/ext4.h 2020-03-27 06:54:44.851942688 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/ext4/ext4.h 2020-04-01 09:34:42.921192675 +0000 @@ -375,8 +375,11 @@ struct flex_groups { #define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */ #define EXT4_EA_INODE_FL 0x00200000 /* Inode used for large EA */ @@ -2566,7 +2566,7 @@ diff -NurpP --minimal linux-4.4.197/fs/ext4/ext4.h linux-4.4.197-vs2.3.9.8/fs/ex #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 */ -@@ -2496,6 +2501,7 @@ extern int ext4_punch_hole(struct inode +@@ -2516,6 +2521,7 @@ extern int ext4_punch_hole(struct inode extern int ext4_truncate_restart_trans(handle_t *, struct inode *, int nblocks); extern void ext4_set_inode_flags(struct inode *); extern void ext4_get_inode_flags(struct ext4_inode_info *); @@ -2574,9 +2574,9 @@ diff -NurpP --minimal linux-4.4.197/fs/ext4/ext4.h linux-4.4.197-vs2.3.9.8/fs/ex extern int ext4_alloc_da_blocks(struct inode *inode); extern void ext4_set_aops(struct inode *inode); extern int ext4_writepage_trans_blocks(struct inode *); -diff -NurpP --minimal linux-4.4.197/fs/ext4/file.c linux-4.4.197-vs2.3.9.8/fs/ext4/file.c ---- linux-4.4.197/fs/ext4/file.c 2019-10-22 12:34:31.848701739 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/ext4/file.c 2019-10-05 14:35:33.542792081 +0000 +diff -NurpP --minimal linux-4.4.217/fs/ext4/file.c linux-4.4.217-vs2.3.9.9/fs/ext4/file.c +--- linux-4.4.217/fs/ext4/file.c 2020-03-27 06:54:44.851942688 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/ext4/file.c 2019-10-05 14:35:33.542792081 +0000 @@ -749,5 +749,6 @@ const struct inode_operations ext4_file_ .get_acl = ext4_get_acl, .set_acl = ext4_set_acl, @@ -2584,9 +2584,9 @@ diff -NurpP --minimal linux-4.4.197/fs/ext4/file.c linux-4.4.197-vs2.3.9.8/fs/ex + .sync_flags = ext4_sync_flags, }; -diff -NurpP --minimal linux-4.4.197/fs/ext4/ialloc.c linux-4.4.197-vs2.3.9.8/fs/ext4/ialloc.c ---- linux-4.4.197/fs/ext4/ialloc.c 2019-10-22 12:34:31.848701739 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/ext4/ialloc.c 2018-10-20 05:50:20.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/ext4/ialloc.c linux-4.4.217-vs2.3.9.9/fs/ext4/ialloc.c +--- linux-4.4.217/fs/ext4/ialloc.c 2020-03-27 06:54:44.851942688 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/ext4/ialloc.c 2020-04-01 09:34:42.931192509 +0000 @@ -21,6 +21,7 @@ #include #include @@ -2595,7 +2595,7 @@ diff -NurpP --minimal linux-4.4.197/fs/ext4/ialloc.c linux-4.4.197-vs2.3.9.8/fs/ #include #include "ext4.h" -@@ -777,6 +778,7 @@ struct inode *__ext4_new_inode(handle_t +@@ -780,6 +781,7 @@ struct inode *__ext4_new_inode(handle_t inode->i_mode = mode; inode->i_uid = current_fsuid(); inode->i_gid = dir->i_gid; @@ -2603,9 +2603,9 @@ diff -NurpP --minimal linux-4.4.197/fs/ext4/ialloc.c linux-4.4.197-vs2.3.9.8/fs/ } else inode_init_owner(inode, dir, mode); err = dquot_initialize(inode); -diff -NurpP --minimal linux-4.4.197/fs/ext4/inode.c linux-4.4.197-vs2.3.9.8/fs/ext4/inode.c ---- linux-4.4.197/fs/ext4/inode.c 2019-10-22 12:34:31.858701581 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/ext4/inode.c 2019-10-05 14:35:33.602791127 +0000 +diff -NurpP --minimal linux-4.4.217/fs/ext4/inode.c linux-4.4.217-vs2.3.9.9/fs/ext4/inode.c +--- linux-4.4.217/fs/ext4/inode.c 2020-03-27 06:54:44.871942356 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/ext4/inode.c 2020-04-01 09:34:42.961192013 +0000 @@ -37,6 +37,7 @@ #include #include @@ -2703,7 +2703,7 @@ diff -NurpP --minimal linux-4.4.197/fs/ext4/inode.c linux-4.4.197-vs2.3.9.8/fs/e set_nlink(inode, le16_to_cpu(raw_inode->i_links_count)); ext4_clear_state_flags(ei); /* Only relevant on 32-bit archs */ -@@ -4600,8 +4627,10 @@ static int ext4_do_update_inode(handle_t +@@ -4612,8 +4639,10 @@ static int ext4_do_update_inode(handle_t ext4_get_inode_flags(ei); raw_inode->i_mode = cpu_to_le16(inode->i_mode); @@ -2716,7 +2716,7 @@ diff -NurpP --minimal linux-4.4.197/fs/ext4/inode.c linux-4.4.197-vs2.3.9.8/fs/e 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)); -@@ -4624,6 +4653,9 @@ static int ext4_do_update_inode(handle_t +@@ -4636,6 +4665,9 @@ static int ext4_do_update_inode(handle_t raw_inode->i_uid_high = 0; raw_inode->i_gid_high = 0; } @@ -2726,7 +2726,7 @@ diff -NurpP --minimal linux-4.4.197/fs/ext4/inode.c linux-4.4.197-vs2.3.9.8/fs/e raw_inode->i_links_count = cpu_to_le16(inode->i_nlink); EXT4_INODE_SET_XTIME(i_ctime, inode, raw_inode); -@@ -4869,7 +4901,8 @@ int ext4_setattr(struct dentry *dentry, +@@ -4881,7 +4913,8 @@ int ext4_setattr(struct dentry *dentry, return error; } if ((ia_valid & ATTR_UID && !uid_eq(attr->ia_uid, inode->i_uid)) || @@ -2736,7 +2736,7 @@ diff -NurpP --minimal linux-4.4.197/fs/ext4/inode.c linux-4.4.197-vs2.3.9.8/fs/e handle_t *handle; /* (user+group)*(old+new) structure, inode write (sb, -@@ -4892,6 +4925,8 @@ int ext4_setattr(struct dentry *dentry, +@@ -4904,6 +4937,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; @@ -2745,9 +2745,9 @@ diff -NurpP --minimal linux-4.4.197/fs/ext4/inode.c linux-4.4.197-vs2.3.9.8/fs/e error = ext4_mark_inode_dirty(handle, inode); ext4_journal_stop(handle); } -diff -NurpP --minimal linux-4.4.197/fs/ext4/ioctl.c linux-4.4.197-vs2.3.9.8/fs/ext4/ioctl.c ---- linux-4.4.197/fs/ext4/ioctl.c 2019-10-22 12:34:31.858701581 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/ext4/ioctl.c 2019-10-05 14:35:33.662790177 +0000 +diff -NurpP --minimal linux-4.4.217/fs/ext4/ioctl.c linux-4.4.217-vs2.3.9.9/fs/ext4/ioctl.c +--- linux-4.4.217/fs/ext4/ioctl.c 2020-03-27 06:54:44.871942356 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/ext4/ioctl.c 2019-10-05 14:35:33.662790177 +0000 @@ -14,6 +14,7 @@ #include #include @@ -2813,9 +2813,9 @@ diff -NurpP --minimal linux-4.4.197/fs/ext4/ioctl.c linux-4.4.197-vs2.3.9.8/fs/e if (!capable(CAP_LINUX_IMMUTABLE)) goto flags_out; } -diff -NurpP --minimal linux-4.4.197/fs/ext4/namei.c linux-4.4.197-vs2.3.9.8/fs/ext4/namei.c ---- linux-4.4.197/fs/ext4/namei.c 2019-10-22 12:34:31.868701419 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/ext4/namei.c 2019-02-22 08:20:33.380963972 +0000 +diff -NurpP --minimal linux-4.4.217/fs/ext4/namei.c linux-4.4.217-vs2.3.9.9/fs/ext4/namei.c +--- linux-4.4.217/fs/ext4/namei.c 2020-03-27 06:54:44.881942194 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/ext4/namei.c 2020-04-01 09:34:42.971191850 +0000 @@ -33,6 +33,7 @@ #include #include @@ -2824,7 +2824,7 @@ diff -NurpP --minimal linux-4.4.197/fs/ext4/namei.c linux-4.4.197-vs2.3.9.8/fs/e #include "ext4.h" #include "ext4_jbd2.h" -@@ -1446,6 +1447,7 @@ restart: +@@ -1447,6 +1448,7 @@ restart: ll_rw_block(READ | REQ_META | REQ_PRIO, 1, &bh); } @@ -2832,7 +2832,7 @@ diff -NurpP --minimal linux-4.4.197/fs/ext4/namei.c linux-4.4.197-vs2.3.9.8/fs/e } if ((bh = bh_use[ra_ptr++]) == NULL) goto next; -@@ -3884,6 +3886,7 @@ const struct inode_operations ext4_dir_i +@@ -3891,6 +3893,7 @@ const struct inode_operations ext4_dir_i .get_acl = ext4_get_acl, .set_acl = ext4_set_acl, .fiemap = ext4_fiemap, @@ -2840,10 +2840,10 @@ diff -NurpP --minimal linux-4.4.197/fs/ext4/namei.c linux-4.4.197-vs2.3.9.8/fs/e }; const struct inode_operations ext4_special_inode_operations = { -diff -NurpP --minimal linux-4.4.197/fs/ext4/super.c linux-4.4.197-vs2.3.9.8/fs/ext4/super.c ---- linux-4.4.197/fs/ext4/super.c 2019-10-22 12:34:31.868701419 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/ext4/super.c 2019-10-05 14:35:33.702789543 +0000 -@@ -1177,6 +1177,7 @@ enum { +diff -NurpP --minimal linux-4.4.217/fs/ext4/super.c linux-4.4.217-vs2.3.9.9/fs/ext4/super.c +--- linux-4.4.217/fs/ext4/super.c 2020-03-27 06:54:44.881942194 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/ext4/super.c 2020-04-01 09:34:43.051190521 +0000 +@@ -1187,6 +1187,7 @@ enum { Opt_dioread_nolock, Opt_dioread_lock, Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable, Opt_max_dir_size_kb, Opt_nojournal_checksum, @@ -2851,7 +2851,7 @@ diff -NurpP --minimal linux-4.4.197/fs/ext4/super.c linux-4.4.197-vs2.3.9.8/fs/e }; static const match_table_t tokens = { -@@ -1262,6 +1263,9 @@ static const match_table_t tokens = { +@@ -1272,6 +1273,9 @@ static const match_table_t tokens = { {Opt_removed, "reservation"}, /* mount option from ext2/3 */ {Opt_removed, "noreservation"}, /* mount option from ext2/3 */ {Opt_removed, "journal=%u"}, /* mount option from ext2/3 */ @@ -2861,7 +2861,7 @@ diff -NurpP --minimal linux-4.4.197/fs/ext4/super.c linux-4.4.197-vs2.3.9.8/fs/e {Opt_err, NULL}, }; -@@ -1504,6 +1508,20 @@ static int handle_mount_opt(struct super +@@ -1514,6 +1518,20 @@ static int handle_mount_opt(struct super case Opt_nolazytime: sb->s_flags &= ~MS_LAZYTIME; return 1; @@ -2882,7 +2882,7 @@ diff -NurpP --minimal linux-4.4.197/fs/ext4/super.c linux-4.4.197-vs2.3.9.8/fs/e } for (m = ext4_mount_opts; m->token != Opt_err; m++) -@@ -3425,6 +3443,9 @@ static int ext4_fill_super(struct super_ +@@ -3485,6 +3503,9 @@ static int ext4_fill_super(struct super_ sb->s_iflags |= SB_I_CGROUPWB; } @@ -2892,7 +2892,7 @@ diff -NurpP --minimal linux-4.4.197/fs/ext4/super.c linux-4.4.197-vs2.3.9.8/fs/e sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); -@@ -4803,6 +4824,14 @@ static int ext4_remount(struct super_blo +@@ -4858,6 +4879,14 @@ static int ext4_remount(struct super_blo if (sbi->s_mount_flags & EXT4_MF_FS_ABORTED) ext4_abort(sb, "Abort forced by user"); @@ -2907,9 +2907,9 @@ diff -NurpP --minimal linux-4.4.197/fs/ext4/super.c linux-4.4.197-vs2.3.9.8/fs/e sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); -diff -NurpP --minimal linux-4.4.197/fs/fcntl.c linux-4.4.197-vs2.3.9.8/fs/fcntl.c ---- linux-4.4.197/fs/fcntl.c 2019-10-22 12:34:32.028698862 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/fcntl.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/fcntl.c linux-4.4.217-vs2.3.9.9/fs/fcntl.c +--- linux-4.4.217/fs/fcntl.c 2020-03-27 06:54:44.991940385 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/fcntl.c 2018-10-20 04:57:21.000000000 +0000 @@ -22,6 +22,7 @@ #include #include @@ -2927,9 +2927,9 @@ diff -NurpP --minimal linux-4.4.197/fs/fcntl.c linux-4.4.197-vs2.3.9.8/fs/fcntl. if (unlikely(f.file->f_mode & FMODE_PATH)) { if (!check_fcntl_cmd(cmd)) -diff -NurpP --minimal linux-4.4.197/fs/file.c linux-4.4.197-vs2.3.9.8/fs/file.c ---- linux-4.4.197/fs/file.c 2019-10-22 12:34:32.038698704 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/file.c 2019-10-05 14:35:33.802787957 +0000 +diff -NurpP --minimal linux-4.4.217/fs/file.c linux-4.4.217-vs2.3.9.9/fs/file.c +--- linux-4.4.217/fs/file.c 2020-03-27 06:54:45.001940218 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/file.c 2019-10-05 14:35:33.802787957 +0000 @@ -22,6 +22,7 @@ #include #include @@ -2984,9 +2984,9 @@ diff -NurpP --minimal linux-4.4.197/fs/file.c linux-4.4.197-vs2.3.9.8/fs/file.c return fd; -diff -NurpP --minimal linux-4.4.197/fs/file_table.c linux-4.4.197-vs2.3.9.8/fs/file_table.c ---- linux-4.4.197/fs/file_table.c 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/file_table.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/file_table.c linux-4.4.217-vs2.3.9.9/fs/file_table.c +--- linux-4.4.217/fs/file_table.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/file_table.c 2018-10-20 04:57:21.000000000 +0000 @@ -26,6 +26,8 @@ #include #include @@ -3023,9 +3023,9 @@ diff -NurpP --minimal linux-4.4.197/fs/file_table.c linux-4.4.197-vs2.3.9.8/fs/f file_free(file); } } -diff -NurpP --minimal linux-4.4.197/fs/fs_struct.c linux-4.4.197-vs2.3.9.8/fs/fs_struct.c ---- linux-4.4.197/fs/fs_struct.c 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/fs_struct.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/fs_struct.c linux-4.4.217-vs2.3.9.9/fs/fs_struct.c +--- linux-4.4.217/fs/fs_struct.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/fs_struct.c 2018-10-20 04:57:21.000000000 +0000 @@ -4,6 +4,7 @@ #include #include @@ -3050,9 +3050,9 @@ diff -NurpP --minimal linux-4.4.197/fs/fs_struct.c linux-4.4.197-vs2.3.9.8/fs/fs } return fs; } -diff -NurpP --minimal linux-4.4.197/fs/gfs2/file.c linux-4.4.197-vs2.3.9.8/fs/gfs2/file.c ---- linux-4.4.197/fs/gfs2/file.c 2019-10-22 12:34:32.208695985 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/gfs2/file.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/gfs2/file.c linux-4.4.217-vs2.3.9.9/fs/gfs2/file.c +--- linux-4.4.217/fs/gfs2/file.c 2020-03-27 06:54:45.091938740 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/gfs2/file.c 2018-10-20 04:57:21.000000000 +0000 @@ -137,6 +137,9 @@ static const u32 fsflags_to_gfs2[32] = { [12] = GFS2_DIF_EXHASH, [14] = GFS2_DIF_INHERIT_JDATA, @@ -3174,9 +3174,9 @@ diff -NurpP --minimal linux-4.4.197/fs/gfs2/file.c linux-4.4.197-vs2.3.9.8/fs/gf static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { switch(cmd) { -diff -NurpP --minimal linux-4.4.197/fs/gfs2/inode.h linux-4.4.197-vs2.3.9.8/fs/gfs2/inode.h ---- linux-4.4.197/fs/gfs2/inode.h 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/gfs2/inode.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/gfs2/inode.h linux-4.4.217-vs2.3.9.9/fs/gfs2/inode.h +--- linux-4.4.217/fs/gfs2/inode.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/gfs2/inode.h 2018-10-20 04:57:21.000000000 +0000 @@ -118,6 +118,7 @@ extern const struct file_operations gfs2 extern const struct file_operations gfs2_dir_fops_nolock; @@ -3185,9 +3185,9 @@ diff -NurpP --minimal linux-4.4.197/fs/gfs2/inode.h linux-4.4.197-vs2.3.9.8/fs/g #ifdef CONFIG_GFS2_FS_LOCKING_DLM extern const struct file_operations gfs2_file_fops; -diff -NurpP --minimal linux-4.4.197/fs/hostfs/hostfs.h linux-4.4.197-vs2.3.9.8/fs/hostfs/hostfs.h ---- linux-4.4.197/fs/hostfs/hostfs.h 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/hostfs/hostfs.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/hostfs/hostfs.h linux-4.4.217-vs2.3.9.9/fs/hostfs/hostfs.h +--- linux-4.4.217/fs/hostfs/hostfs.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/hostfs/hostfs.h 2018-10-20 04:57:21.000000000 +0000 @@ -42,6 +42,7 @@ struct hostfs_iattr { unsigned short ia_mode; uid_t ia_uid; @@ -3196,9 +3196,9 @@ diff -NurpP --minimal linux-4.4.197/fs/hostfs/hostfs.h linux-4.4.197-vs2.3.9.8/f loff_t ia_size; struct timespec ia_atime; struct timespec ia_mtime; -diff -NurpP --minimal linux-4.4.197/fs/inode.c linux-4.4.197-vs2.3.9.8/fs/inode.c ---- linux-4.4.197/fs/inode.c 2019-10-22 12:34:32.438692310 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/inode.c 2019-10-05 14:35:34.142782561 +0000 +diff -NurpP --minimal linux-4.4.217/fs/inode.c linux-4.4.217-vs2.3.9.9/fs/inode.c +--- linux-4.4.217/fs/inode.c 2020-03-27 06:54:45.361934298 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/inode.c 2019-10-05 14:35:34.142782561 +0000 @@ -18,6 +18,7 @@ #include /* for inode_has_buffers */ #include @@ -3261,9 +3261,9 @@ diff -NurpP --minimal linux-4.4.197/fs/inode.c linux-4.4.197-vs2.3.9.8/fs/inode. } EXPORT_SYMBOL(inode_init_owner); -diff -NurpP --minimal linux-4.4.197/fs/ioctl.c linux-4.4.197-vs2.3.9.8/fs/ioctl.c ---- linux-4.4.197/fs/ioctl.c 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/ioctl.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/ioctl.c linux-4.4.217-vs2.3.9.9/fs/ioctl.c +--- linux-4.4.217/fs/ioctl.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/ioctl.c 2018-10-20 04:57:21.000000000 +0000 @@ -15,6 +15,9 @@ #include #include @@ -3274,9 +3274,9 @@ diff -NurpP --minimal linux-4.4.197/fs/ioctl.c linux-4.4.197-vs2.3.9.8/fs/ioctl. #include -diff -NurpP --minimal linux-4.4.197/fs/jfs/file.c linux-4.4.197-vs2.3.9.8/fs/jfs/file.c ---- linux-4.4.197/fs/jfs/file.c 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/jfs/file.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/jfs/file.c linux-4.4.217-vs2.3.9.9/fs/jfs/file.c +--- linux-4.4.217/fs/jfs/file.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/jfs/file.c 2018-10-20 04:57:21.000000000 +0000 @@ -113,7 +113,8 @@ int jfs_setattr(struct dentry *dentry, s return rc; } @@ -3295,9 +3295,9 @@ diff -NurpP --minimal linux-4.4.197/fs/jfs/file.c linux-4.4.197-vs2.3.9.8/fs/jfs }; const struct file_operations jfs_file_operations = { -diff -NurpP --minimal linux-4.4.197/fs/jfs/ioctl.c linux-4.4.197-vs2.3.9.8/fs/jfs/ioctl.c ---- linux-4.4.197/fs/jfs/ioctl.c 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/jfs/ioctl.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/jfs/ioctl.c linux-4.4.217-vs2.3.9.9/fs/jfs/ioctl.c +--- linux-4.4.217/fs/jfs/ioctl.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/jfs/ioctl.c 2018-10-20 04:57:21.000000000 +0000 @@ -12,6 +12,7 @@ #include #include @@ -3355,9 +3355,9 @@ diff -NurpP --minimal linux-4.4.197/fs/jfs/ioctl.c linux-4.4.197-vs2.3.9.8/fs/jf flags |= oldflags & ~JFS_FL_USER_MODIFIABLE; jfs_inode->mode2 = flags; -diff -NurpP --minimal linux-4.4.197/fs/jfs/jfs_dinode.h linux-4.4.197-vs2.3.9.8/fs/jfs/jfs_dinode.h ---- linux-4.4.197/fs/jfs/jfs_dinode.h 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/jfs/jfs_dinode.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/jfs/jfs_dinode.h linux-4.4.217-vs2.3.9.9/fs/jfs/jfs_dinode.h +--- linux-4.4.217/fs/jfs/jfs_dinode.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/jfs/jfs_dinode.h 2018-10-20 04:57:21.000000000 +0000 @@ -161,9 +161,13 @@ struct dinode { #define JFS_APPEND_FL 0x01000000 /* writes to file may only append */ @@ -3374,9 +3374,9 @@ diff -NurpP --minimal linux-4.4.197/fs/jfs/jfs_dinode.h linux-4.4.197-vs2.3.9.8/ #define JFS_FL_INHERIT 0x03C80000 /* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */ -diff -NurpP --minimal linux-4.4.197/fs/jfs/jfs_filsys.h linux-4.4.197-vs2.3.9.8/fs/jfs/jfs_filsys.h ---- linux-4.4.197/fs/jfs/jfs_filsys.h 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/jfs/jfs_filsys.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/jfs/jfs_filsys.h linux-4.4.217-vs2.3.9.9/fs/jfs/jfs_filsys.h +--- linux-4.4.217/fs/jfs/jfs_filsys.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/jfs/jfs_filsys.h 2018-10-20 04:57:21.000000000 +0000 @@ -266,6 +266,7 @@ #define JFS_NAME_MAX 255 #define JFS_PATH_MAX BPSIZE @@ -3385,9 +3385,9 @@ diff -NurpP --minimal linux-4.4.197/fs/jfs/jfs_filsys.h linux-4.4.197-vs2.3.9.8/ /* * file system state (superblock state) -diff -NurpP --minimal linux-4.4.197/fs/jfs/jfs_imap.c linux-4.4.197-vs2.3.9.8/fs/jfs/jfs_imap.c ---- linux-4.4.197/fs/jfs/jfs_imap.c 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/jfs/jfs_imap.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/jfs/jfs_imap.c linux-4.4.217-vs2.3.9.9/fs/jfs/jfs_imap.c +--- linux-4.4.217/fs/jfs/jfs_imap.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/jfs/jfs_imap.c 2018-10-20 04:57:21.000000000 +0000 @@ -46,6 +46,7 @@ #include #include @@ -3451,9 +3451,9 @@ diff -NurpP --minimal linux-4.4.197/fs/jfs/jfs_imap.c linux-4.4.197-vs2.3.9.8/fs jfs_get_inode_flags(jfs_ip); /* * mode2 is only needed for storing the higher order bits. -diff -NurpP --minimal linux-4.4.197/fs/jfs/jfs_inode.c linux-4.4.197-vs2.3.9.8/fs/jfs/jfs_inode.c ---- linux-4.4.197/fs/jfs/jfs_inode.c 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/jfs/jfs_inode.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/jfs/jfs_inode.c linux-4.4.217-vs2.3.9.9/fs/jfs/jfs_inode.c +--- linux-4.4.217/fs/jfs/jfs_inode.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/jfs/jfs_inode.c 2018-10-20 04:57:21.000000000 +0000 @@ -18,6 +18,7 @@ #include @@ -3524,9 +3524,9 @@ diff -NurpP --minimal linux-4.4.197/fs/jfs/jfs_inode.c linux-4.4.197-vs2.3.9.8/f } /* -diff -NurpP --minimal linux-4.4.197/fs/jfs/jfs_inode.h linux-4.4.197-vs2.3.9.8/fs/jfs/jfs_inode.h ---- linux-4.4.197/fs/jfs/jfs_inode.h 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/jfs/jfs_inode.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/jfs/jfs_inode.h linux-4.4.217-vs2.3.9.9/fs/jfs/jfs_inode.h +--- linux-4.4.217/fs/jfs/jfs_inode.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/jfs/jfs_inode.h 2018-10-20 04:57:21.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); @@ -3535,9 +3535,9 @@ diff -NurpP --minimal linux-4.4.197/fs/jfs/jfs_inode.h linux-4.4.197-vs2.3.9.8/f 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-4.4.197/fs/jfs/namei.c linux-4.4.197-vs2.3.9.8/fs/jfs/namei.c ---- linux-4.4.197/fs/jfs/namei.c 2019-10-22 12:34:32.898684963 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/jfs/namei.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/jfs/namei.c linux-4.4.217-vs2.3.9.9/fs/jfs/namei.c +--- linux-4.4.217/fs/jfs/namei.c 2020-03-27 06:54:45.531931501 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/jfs/namei.c 2018-10-20 04:57:21.000000000 +0000 @@ -22,6 +22,7 @@ #include #include @@ -3562,9 +3562,9 @@ diff -NurpP --minimal linux-4.4.197/fs/jfs/namei.c linux-4.4.197-vs2.3.9.8/fs/jf }; const struct file_operations jfs_dir_operations = { -diff -NurpP --minimal linux-4.4.197/fs/jfs/super.c linux-4.4.197-vs2.3.9.8/fs/jfs/super.c ---- linux-4.4.197/fs/jfs/super.c 2019-10-22 12:34:32.928684480 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/jfs/super.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/jfs/super.c linux-4.4.217-vs2.3.9.9/fs/jfs/super.c +--- linux-4.4.217/fs/jfs/super.c 2020-03-27 06:54:45.531931501 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/jfs/super.c 2018-10-20 04:57:21.000000000 +0000 @@ -206,7 +206,8 @@ enum { Opt_integrity, Opt_nointegrity, Opt_iocharset, Opt_resize, Opt_resize_nosize, Opt_errors, Opt_ignore, Opt_err, Opt_quota, @@ -3631,9 +3631,9 @@ diff -NurpP --minimal linux-4.4.197/fs/jfs/super.c linux-4.4.197-vs2.3.9.8/fs/jf if (newLVSize) { pr_err("resize option for remount only\n"); -diff -NurpP --minimal linux-4.4.197/fs/libfs.c linux-4.4.197-vs2.3.9.8/fs/libfs.c ---- linux-4.4.197/fs/libfs.c 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/libfs.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/libfs.c linux-4.4.217-vs2.3.9.9/fs/libfs.c +--- linux-4.4.217/fs/libfs.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/libfs.c 2018-10-20 04:57:21.000000000 +0000 @@ -141,13 +141,14 @@ static inline unsigned char dt_type(stru * both impossible due to the lock on directory. */ @@ -3685,9 +3685,9 @@ diff -NurpP --minimal linux-4.4.197/fs/libfs.c linux-4.4.197-vs2.3.9.8/fs/libfs. ssize_t generic_read_dir(struct file *filp, char __user *buf, size_t siz, loff_t *ppos) { return -EISDIR; -diff -NurpP --minimal linux-4.4.197/fs/locks.c linux-4.4.197-vs2.3.9.8/fs/locks.c ---- linux-4.4.197/fs/locks.c 2019-10-22 12:34:33.328678089 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/locks.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/locks.c linux-4.4.217-vs2.3.9.9/fs/locks.c +--- linux-4.4.217/fs/locks.c 2020-03-27 06:54:45.571930844 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/locks.c 2020-04-01 09:34:43.781178431 +0000 @@ -129,6 +129,8 @@ #include #include @@ -3883,9 +3883,9 @@ diff -NurpP --minimal linux-4.4.197/fs/locks.c linux-4.4.197-vs2.3.9.8/fs/locks. return 0; } -diff -NurpP --minimal linux-4.4.197/fs/mount.h linux-4.4.197-vs2.3.9.8/fs/mount.h ---- linux-4.4.197/fs/mount.h 2019-10-22 12:34:33.348677769 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/mount.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/mount.h linux-4.4.217-vs2.3.9.9/fs/mount.h +--- linux-4.4.217/fs/mount.h 2020-03-27 06:54:45.571930844 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/mount.h 2018-10-20 04:57:21.000000000 +0000 @@ -68,6 +68,7 @@ struct mount { struct hlist_head mnt_pins; struct fs_pin mnt_umount; @@ -3894,9 +3894,9 @@ diff -NurpP --minimal linux-4.4.197/fs/mount.h linux-4.4.197-vs2.3.9.8/fs/mount. }; #define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */ -diff -NurpP --minimal linux-4.4.197/fs/namei.c linux-4.4.197-vs2.3.9.8/fs/namei.c ---- linux-4.4.197/fs/namei.c 2019-10-22 12:34:33.358677612 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/namei.c 2019-02-22 08:20:34.040952763 +0000 +diff -NurpP --minimal linux-4.4.217/fs/namei.c linux-4.4.217-vs2.3.9.9/fs/namei.c +--- linux-4.4.217/fs/namei.c 2020-03-27 06:54:45.571930844 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/namei.c 2020-04-01 09:34:43.811177933 +0000 @@ -34,10 +34,20 @@ #include #include @@ -4028,7 +4028,7 @@ diff -NurpP --minimal linux-4.4.197/fs/namei.c linux-4.4.197-vs2.3.9.8/fs/namei. retval = do_inode_permission(inode, mask); if (retval) return retval; -@@ -1626,6 +1727,9 @@ static int lookup_fast(struct nameidata +@@ -1627,6 +1728,9 @@ static int lookup_fast(struct nameidata */ if (negative) return -ENOENT; @@ -4038,7 +4038,7 @@ diff -NurpP --minimal linux-4.4.197/fs/namei.c linux-4.4.197-vs2.3.9.8/fs/namei. path->mnt = mnt; path->dentry = dentry; if (likely(__follow_mount_rcu(nd, path, inode, seqp))) -@@ -1656,6 +1760,8 @@ unlazy: +@@ -1657,6 +1761,8 @@ unlazy: dput(dentry); return -ENOENT; } @@ -4047,7 +4047,7 @@ diff -NurpP --minimal linux-4.4.197/fs/namei.c linux-4.4.197-vs2.3.9.8/fs/namei. path->mnt = mnt; path->dentry = dentry; err = follow_managed(path, nd); -@@ -2617,7 +2723,7 @@ static int may_delete(struct inode *dir, +@@ -2618,7 +2724,7 @@ static int may_delete(struct inode *dir, return -EPERM; if (check_sticky(dir, inode) || IS_APPEND(inode) || @@ -4056,7 +4056,7 @@ diff -NurpP --minimal linux-4.4.197/fs/namei.c linux-4.4.197-vs2.3.9.8/fs/namei. return -EPERM; if (isdir) { if (!d_is_dir(victim)) -@@ -2699,19 +2805,25 @@ int vfs_create(struct inode *dir, struct +@@ -2700,19 +2806,25 @@ int vfs_create(struct inode *dir, struct bool want_excl) { int error = may_create(dir, dentry); @@ -4084,7 +4084,7 @@ diff -NurpP --minimal linux-4.4.197/fs/namei.c linux-4.4.197-vs2.3.9.8/fs/namei. return error; } EXPORT_SYMBOL(vfs_create); -@@ -2747,6 +2859,15 @@ static int may_open(struct path *path, i +@@ -2748,6 +2860,15 @@ static int may_open(struct path *path, i break; } @@ -4100,7 +4100,7 @@ diff -NurpP --minimal linux-4.4.197/fs/namei.c linux-4.4.197-vs2.3.9.8/fs/namei. error = inode_permission(inode, acc_mode); if (error) return error; -@@ -3230,6 +3351,16 @@ finish_open: +@@ -3233,6 +3354,16 @@ finish_open: } finish_open_created: error = may_open(&nd->path, acc_mode, open_flag); @@ -4117,7 +4117,7 @@ diff -NurpP --minimal linux-4.4.197/fs/namei.c linux-4.4.197-vs2.3.9.8/fs/namei. if (error) goto out; -@@ -3354,6 +3485,9 @@ static struct file *path_openat(struct n +@@ -3357,6 +3488,9 @@ static struct file *path_openat(struct n int opened = 0; int error; @@ -4127,7 +4127,7 @@ diff -NurpP --minimal linux-4.4.197/fs/namei.c linux-4.4.197-vs2.3.9.8/fs/namei. file = get_empty_filp(); if (IS_ERR(file)) return file; -@@ -3380,6 +3514,12 @@ static struct file *path_openat(struct n +@@ -3383,6 +3517,12 @@ static struct file *path_openat(struct n } } terminate_walk(nd); @@ -4140,7 +4140,7 @@ diff -NurpP --minimal linux-4.4.197/fs/namei.c linux-4.4.197-vs2.3.9.8/fs/namei. out2: if (!(opened & FILE_OPENED)) { BUG_ON(!error); -@@ -3500,6 +3640,11 @@ static struct dentry *filename_create(in +@@ -3503,6 +3643,11 @@ static struct dentry *filename_create(in goto fail; } putname(name); @@ -4152,7 +4152,7 @@ diff -NurpP --minimal linux-4.4.197/fs/namei.c linux-4.4.197-vs2.3.9.8/fs/namei. return dentry; fail: dput(dentry); -@@ -3616,6 +3761,7 @@ retry: +@@ -3619,6 +3764,7 @@ retry: error = vfs_mknod(path.dentry->d_inode,dentry,mode,0); break; } @@ -4160,7 +4160,7 @@ diff -NurpP --minimal linux-4.4.197/fs/namei.c linux-4.4.197-vs2.3.9.8/fs/namei. out: done_path_create(&path, dentry); if (retry_estale(error, lookup_flags)) { -@@ -4062,7 +4208,7 @@ int vfs_link(struct dentry *old_dentry, +@@ -4065,7 +4211,7 @@ int vfs_link(struct dentry *old_dentry, /* * A link to an append-only or immutable file cannot be created. */ @@ -4169,7 +4169,7 @@ diff -NurpP --minimal linux-4.4.197/fs/namei.c linux-4.4.197-vs2.3.9.8/fs/namei. return -EPERM; if (!dir->i_op->link) return -EPERM; -@@ -4571,6 +4717,330 @@ int generic_readlink(struct dentry *dent +@@ -4574,6 +4720,330 @@ int generic_readlink(struct dentry *dent } EXPORT_SYMBOL(generic_readlink); @@ -4500,9 +4500,9 @@ diff -NurpP --minimal linux-4.4.197/fs/namei.c linux-4.4.197-vs2.3.9.8/fs/namei. /* get the link contents into pagecache */ static char *page_getlink(struct dentry * dentry, struct page **ppage) { -diff -NurpP --minimal linux-4.4.197/fs/namespace.c linux-4.4.197-vs2.3.9.8/fs/namespace.c ---- linux-4.4.197/fs/namespace.c 2019-10-22 12:34:33.388677130 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/namespace.c 2019-02-22 08:20:34.040952763 +0000 +diff -NurpP --minimal linux-4.4.217/fs/namespace.c linux-4.4.217-vs2.3.9.9/fs/namespace.c +--- linux-4.4.217/fs/namespace.c 2020-03-27 06:54:45.571930844 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/namespace.c 2019-02-22 08:20:34.040952763 +0000 @@ -24,6 +24,11 @@ #include #include @@ -4647,9 +4647,9 @@ diff -NurpP --minimal linux-4.4.197/fs/namespace.c linux-4.4.197-vs2.3.9.8/fs/na free_mnt_ns(ns); } -diff -NurpP --minimal linux-4.4.197/fs/nfs/client.c linux-4.4.197-vs2.3.9.8/fs/nfs/client.c ---- linux-4.4.197/fs/nfs/client.c 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/nfs/client.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/nfs/client.c linux-4.4.217-vs2.3.9.9/fs/nfs/client.c +--- linux-4.4.217/fs/nfs/client.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/nfs/client.c 2018-10-20 04:57:21.000000000 +0000 @@ -583,6 +583,9 @@ int nfs_init_server_rpcclient(struct nfs if (server->flags & NFS_MOUNT_SOFT) server->client->cl_softrtry = 1; @@ -4671,9 +4671,9 @@ diff -NurpP --minimal linux-4.4.197/fs/nfs/client.c linux-4.4.197-vs2.3.9.8/fs/n server->maxfilesize = fsinfo->maxfilesize; server->time_delta = fsinfo->time_delta; -diff -NurpP --minimal linux-4.4.197/fs/nfs/dir.c linux-4.4.197-vs2.3.9.8/fs/nfs/dir.c ---- linux-4.4.197/fs/nfs/dir.c 2019-10-22 12:34:34.018667063 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/nfs/dir.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/nfs/dir.c linux-4.4.217-vs2.3.9.9/fs/nfs/dir.c +--- linux-4.4.217/fs/nfs/dir.c 2020-03-27 06:54:45.741928047 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/nfs/dir.c 2020-04-01 09:34:43.871176943 +0000 @@ -37,6 +37,7 @@ #include #include @@ -4682,7 +4682,7 @@ diff -NurpP --minimal linux-4.4.197/fs/nfs/dir.c linux-4.4.197-vs2.3.9.8/fs/nfs/ #include "delegation.h" #include "iostat.h" -@@ -1396,6 +1397,7 @@ struct dentry *nfs_lookup(struct inode * +@@ -1417,6 +1418,7 @@ struct dentry *nfs_lookup(struct inode * /* Success: notify readdir to use READDIRPLUS */ nfs_advise_use_readdirplus(dir); @@ -4690,9 +4690,9 @@ diff -NurpP --minimal linux-4.4.197/fs/nfs/dir.c linux-4.4.197-vs2.3.9.8/fs/nfs/ no_entry: res = d_splice_alias(inode, dentry); if (res != NULL) { -diff -NurpP --minimal linux-4.4.197/fs/nfs/inode.c linux-4.4.197-vs2.3.9.8/fs/nfs/inode.c ---- linux-4.4.197/fs/nfs/inode.c 2019-10-22 12:34:34.128665305 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/nfs/inode.c 2019-10-05 14:35:34.462777487 +0000 +diff -NurpP --minimal linux-4.4.217/fs/nfs/inode.c linux-4.4.217-vs2.3.9.9/fs/nfs/inode.c +--- linux-4.4.217/fs/nfs/inode.c 2020-03-27 06:54:45.811926893 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/nfs/inode.c 2019-10-05 14:35:34.462777487 +0000 @@ -38,6 +38,7 @@ #include #include @@ -4818,9 +4818,9 @@ diff -NurpP --minimal linux-4.4.197/fs/nfs/inode.c linux-4.4.197-vs2.3.9.8/fs/nf if (fattr->valid & NFS_ATTR_FATTR_NLINK) { if (inode->i_nlink != fattr->nlink) { invalid |= NFS_INO_INVALID_ATTR; -diff -NurpP --minimal linux-4.4.197/fs/nfs/nfs3xdr.c linux-4.4.197-vs2.3.9.8/fs/nfs/nfs3xdr.c ---- linux-4.4.197/fs/nfs/nfs3xdr.c 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/nfs/nfs3xdr.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/nfs/nfs3xdr.c linux-4.4.217-vs2.3.9.9/fs/nfs/nfs3xdr.c +--- linux-4.4.217/fs/nfs/nfs3xdr.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/nfs/nfs3xdr.c 2018-10-20 04:57:21.000000000 +0000 @@ -20,6 +20,7 @@ #include #include @@ -4966,9 +4966,9 @@ diff -NurpP --minimal linux-4.4.197/fs/nfs/nfs3xdr.c linux-4.4.197-vs2.3.9.8/fs/ } /* -diff -NurpP --minimal linux-4.4.197/fs/nfs/super.c linux-4.4.197-vs2.3.9.8/fs/nfs/super.c ---- linux-4.4.197/fs/nfs/super.c 2019-10-22 12:34:34.278662909 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/nfs/super.c 2019-10-05 14:35:34.622774949 +0000 +diff -NurpP --minimal linux-4.4.217/fs/nfs/super.c linux-4.4.217-vs2.3.9.9/fs/nfs/super.c +--- linux-4.4.217/fs/nfs/super.c 2020-03-27 06:54:45.861926070 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/nfs/super.c 2020-04-01 09:34:43.941175779 +0000 @@ -54,6 +54,7 @@ #include #include @@ -5042,9 +5042,9 @@ diff -NurpP --minimal linux-4.4.197/fs/nfs/super.c linux-4.4.197-vs2.3.9.8/fs/nf /* * options that take text values -diff -NurpP --minimal linux-4.4.197/fs/nfsd/auth.c linux-4.4.197-vs2.3.9.8/fs/nfsd/auth.c ---- linux-4.4.197/fs/nfsd/auth.c 2019-10-22 12:34:34.608657638 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/nfsd/auth.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/nfsd/auth.c linux-4.4.217-vs2.3.9.9/fs/nfsd/auth.c +--- linux-4.4.217/fs/nfsd/auth.c 2020-03-27 06:54:45.971924261 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/nfsd/auth.c 2018-10-20 04:57:21.000000000 +0000 @@ -1,6 +1,7 @@ /* Copyright (C) 1995, 1996 Olaf Kirch */ @@ -5063,9 +5063,9 @@ diff -NurpP --minimal linux-4.4.197/fs/nfsd/auth.c linux-4.4.197-vs2.3.9.8/fs/nf rqgi = rqstp->rq_cred.cr_group_info; -diff -NurpP --minimal linux-4.4.197/fs/nfsd/nfs3xdr.c linux-4.4.197-vs2.3.9.8/fs/nfsd/nfs3xdr.c ---- linux-4.4.197/fs/nfsd/nfs3xdr.c 2019-10-22 12:34:34.648656997 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/nfsd/nfs3xdr.c 2019-10-05 14:35:34.682773996 +0000 +diff -NurpP --minimal linux-4.4.217/fs/nfsd/nfs3xdr.c linux-4.4.217-vs2.3.9.9/fs/nfsd/nfs3xdr.c +--- linux-4.4.217/fs/nfsd/nfs3xdr.c 2020-03-27 06:54:46.011923605 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/nfsd/nfs3xdr.c 2019-10-05 14:35:34.682773996 +0000 @@ -8,6 +8,7 @@ #include @@ -5119,9 +5119,9 @@ diff -NurpP --minimal linux-4.4.197/fs/nfsd/nfs3xdr.c linux-4.4.197-vs2.3.9.8/fs if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) { p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN); } else { -diff -NurpP --minimal linux-4.4.197/fs/nfsd/nfs4xdr.c linux-4.4.197-vs2.3.9.8/fs/nfsd/nfs4xdr.c ---- linux-4.4.197/fs/nfsd/nfs4xdr.c 2019-10-22 12:34:34.708656037 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/nfsd/nfs4xdr.c 2018-10-20 05:50:20.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/nfsd/nfs4xdr.c linux-4.4.217-vs2.3.9.9/fs/nfsd/nfs4xdr.c +--- linux-4.4.217/fs/nfsd/nfs4xdr.c 2020-03-27 06:54:46.051922945 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/nfsd/nfs4xdr.c 2018-10-20 05:50:20.000000000 +0000 @@ -40,6 +40,7 @@ #include #include @@ -5149,9 +5149,9 @@ diff -NurpP --minimal linux-4.4.197/fs/nfsd/nfs4xdr.c linux-4.4.197-vs2.3.9.8/fs if (status) goto out; } -diff -NurpP --minimal linux-4.4.197/fs/nfsd/nfsxdr.c linux-4.4.197-vs2.3.9.8/fs/nfsd/nfsxdr.c ---- linux-4.4.197/fs/nfsd/nfsxdr.c 2019-10-22 12:34:34.718655878 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/nfsd/nfsxdr.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/nfsd/nfsxdr.c linux-4.4.217-vs2.3.9.9/fs/nfsd/nfsxdr.c +--- linux-4.4.217/fs/nfsd/nfsxdr.c 2020-03-27 06:54:46.051922945 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/nfsd/nfsxdr.c 2018-10-20 04:57:21.000000000 +0000 @@ -7,6 +7,7 @@ #include "vfs.h" #include "xdr.h" @@ -5203,9 +5203,9 @@ diff -NurpP --minimal linux-4.4.197/fs/nfsd/nfsxdr.c linux-4.4.197-vs2.3.9.8/fs/ if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) { *p++ = htonl(NFS_MAXPATHLEN); -diff -NurpP --minimal linux-4.4.197/fs/ocfs2/dlmglue.c linux-4.4.197-vs2.3.9.8/fs/ocfs2/dlmglue.c ---- linux-4.4.197/fs/ocfs2/dlmglue.c 2019-10-22 12:34:35.158648847 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/ocfs2/dlmglue.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/ocfs2/dlmglue.c linux-4.4.217-vs2.3.9.9/fs/ocfs2/dlmglue.c +--- linux-4.4.217/fs/ocfs2/dlmglue.c 2020-03-27 06:54:46.451916365 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/ocfs2/dlmglue.c 2020-04-01 09:34:44.151172302 +0000 @@ -2128,6 +2128,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)); @@ -5222,9 +5222,9 @@ diff -NurpP --minimal linux-4.4.197/fs/ocfs2/dlmglue.c linux-4.4.197-vs2.3.9.8/f 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-4.4.197/fs/ocfs2/dlmglue.h linux-4.4.197-vs2.3.9.8/fs/ocfs2/dlmglue.h ---- linux-4.4.197/fs/ocfs2/dlmglue.h 2019-10-22 12:34:35.158648847 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/ocfs2/dlmglue.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/ocfs2/dlmglue.h linux-4.4.217-vs2.3.9.9/fs/ocfs2/dlmglue.h +--- linux-4.4.217/fs/ocfs2/dlmglue.h 2020-03-27 06:54:46.451916365 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/ocfs2/dlmglue.h 2018-10-20 04:57:21.000000000 +0000 @@ -46,7 +46,8 @@ struct ocfs2_meta_lvb { __be16 lvb_inlink; __be32 lvb_iattr; @@ -5235,9 +5235,9 @@ diff -NurpP --minimal linux-4.4.197/fs/ocfs2/dlmglue.h linux-4.4.197-vs2.3.9.8/f }; #define OCFS2_QINFO_LVB_VERSION 1 -diff -NurpP --minimal linux-4.4.197/fs/ocfs2/file.c linux-4.4.197-vs2.3.9.8/fs/ocfs2/file.c ---- linux-4.4.197/fs/ocfs2/file.c 2019-10-22 12:34:35.158648847 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/ocfs2/file.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/ocfs2/file.c linux-4.4.217-vs2.3.9.9/fs/ocfs2/file.c +--- linux-4.4.217/fs/ocfs2/file.c 2020-03-27 06:54:46.451916365 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/ocfs2/file.c 2018-10-20 04:57:21.000000000 +0000 @@ -1151,7 +1151,7 @@ int ocfs2_setattr(struct dentry *dentry, attr->ia_valid &= ~ATTR_SIZE; @@ -5247,9 +5247,9 @@ diff -NurpP --minimal linux-4.4.197/fs/ocfs2/file.c linux-4.4.197-vs2.3.9.8/fs/o if (!(attr->ia_valid & OCFS2_VALID_ATTRS)) return 0; -diff -NurpP --minimal linux-4.4.197/fs/ocfs2/inode.c linux-4.4.197-vs2.3.9.8/fs/ocfs2/inode.c ---- linux-4.4.197/fs/ocfs2/inode.c 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/ocfs2/inode.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/ocfs2/inode.c linux-4.4.217-vs2.3.9.9/fs/ocfs2/inode.c +--- linux-4.4.217/fs/ocfs2/inode.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/ocfs2/inode.c 2018-10-20 04:57:21.000000000 +0000 @@ -28,6 +28,7 @@ #include #include @@ -5346,9 +5346,9 @@ diff -NurpP --minimal linux-4.4.197/fs/ocfs2/inode.c linux-4.4.197-vs2.3.9.8/fs/ /* Fast symlinks will have i_size but no allocated clusters. */ if (S_ISLNK(inode->i_mode) && !fe->i_clusters) { -diff -NurpP --minimal linux-4.4.197/fs/ocfs2/inode.h linux-4.4.197-vs2.3.9.8/fs/ocfs2/inode.h ---- linux-4.4.197/fs/ocfs2/inode.h 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/ocfs2/inode.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/ocfs2/inode.h linux-4.4.217-vs2.3.9.9/fs/ocfs2/inode.h +--- linux-4.4.217/fs/ocfs2/inode.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/ocfs2/inode.h 2018-10-20 04:57:21.000000000 +0000 @@ -161,6 +161,7 @@ struct buffer_head *ocfs2_bread(struct i void ocfs2_set_inode_flags(struct inode *inode); @@ -5357,9 +5357,9 @@ diff -NurpP --minimal linux-4.4.197/fs/ocfs2/inode.h linux-4.4.197-vs2.3.9.8/fs/ static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode) { -diff -NurpP --minimal linux-4.4.197/fs/ocfs2/ioctl.c linux-4.4.197-vs2.3.9.8/fs/ocfs2/ioctl.c ---- linux-4.4.197/fs/ocfs2/ioctl.c 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/ocfs2/ioctl.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/ocfs2/ioctl.c linux-4.4.217-vs2.3.9.9/fs/ocfs2/ioctl.c +--- linux-4.4.217/fs/ocfs2/ioctl.c 2020-03-27 06:54:46.461916203 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/ocfs2/ioctl.c 2020-04-01 09:34:44.161172136 +0000 @@ -76,7 +76,41 @@ static int ocfs2_get_inode_attr(struct i return status; } @@ -5423,9 +5423,9 @@ diff -NurpP --minimal linux-4.4.197/fs/ocfs2/ioctl.c linux-4.4.197-vs2.3.9.8/fs/ long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { struct inode *inode = file_inode(filp); -diff -NurpP --minimal linux-4.4.197/fs/ocfs2/namei.c linux-4.4.197-vs2.3.9.8/fs/ocfs2/namei.c ---- linux-4.4.197/fs/ocfs2/namei.c 2019-10-22 12:34:35.168648690 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/ocfs2/namei.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/ocfs2/namei.c linux-4.4.217-vs2.3.9.9/fs/ocfs2/namei.c +--- linux-4.4.217/fs/ocfs2/namei.c 2020-03-27 06:54:46.461916203 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/ocfs2/namei.c 2018-10-20 04:57:21.000000000 +0000 @@ -41,6 +41,7 @@ #include #include @@ -5458,9 +5458,9 @@ diff -NurpP --minimal linux-4.4.197/fs/ocfs2/namei.c linux-4.4.197-vs2.3.9.8/fs/ 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-4.4.197/fs/ocfs2/ocfs2_fs.h linux-4.4.197-vs2.3.9.8/fs/ocfs2/ocfs2_fs.h ---- linux-4.4.197/fs/ocfs2/ocfs2_fs.h 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/ocfs2/ocfs2_fs.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/ocfs2/ocfs2_fs.h linux-4.4.217-vs2.3.9.9/fs/ocfs2/ocfs2_fs.h +--- linux-4.4.217/fs/ocfs2/ocfs2_fs.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/ocfs2/ocfs2_fs.h 2018-10-20 04:57:21.000000000 +0000 @@ -275,6 +275,11 @@ #define OCFS2_TOPDIR_FL FS_TOPDIR_FL /* Top of directory hierarchies*/ #define OCFS2_RESERVED_FL FS_RESERVED_FL /* reserved for ext2 lib */ @@ -5473,9 +5473,9 @@ diff -NurpP --minimal linux-4.4.197/fs/ocfs2/ocfs2_fs.h linux-4.4.197-vs2.3.9.8/ #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-4.4.197/fs/ocfs2/ocfs2.h linux-4.4.197-vs2.3.9.8/fs/ocfs2/ocfs2.h ---- linux-4.4.197/fs/ocfs2/ocfs2.h 2019-10-22 12:34:35.168648690 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/ocfs2/ocfs2.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/ocfs2/ocfs2.h linux-4.4.217-vs2.3.9.9/fs/ocfs2/ocfs2.h +--- linux-4.4.217/fs/ocfs2/ocfs2.h 2020-03-27 06:54:46.461916203 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/ocfs2/ocfs2.h 2018-10-20 04:57:21.000000000 +0000 @@ -289,6 +289,7 @@ enum ocfs2_mount_options OCFS2_MOUNT_JOURNAL_ASYNC_COMMIT = 1 << 15, /* Journal Async Commit */ OCFS2_MOUNT_ERRORS_CONT = 1 << 16, /* Return EIO to the calling process on error */ @@ -5484,9 +5484,9 @@ diff -NurpP --minimal linux-4.4.197/fs/ocfs2/ocfs2.h linux-4.4.197-vs2.3.9.8/fs/ }; #define OCFS2_OSB_SOFT_RO 0x0001 -diff -NurpP --minimal linux-4.4.197/fs/ocfs2/super.c linux-4.4.197-vs2.3.9.8/fs/ocfs2/super.c ---- linux-4.4.197/fs/ocfs2/super.c 2019-10-22 12:34:35.168648690 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/ocfs2/super.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/ocfs2/super.c linux-4.4.217-vs2.3.9.9/fs/ocfs2/super.c +--- linux-4.4.217/fs/ocfs2/super.c 2020-03-27 06:54:46.471916038 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/ocfs2/super.c 2018-10-20 04:57:21.000000000 +0000 @@ -193,6 +193,7 @@ enum { Opt_dir_resv_level, Opt_journal_async_commit, @@ -5550,9 +5550,9 @@ diff -NurpP --minimal linux-4.4.197/fs/ocfs2/super.c linux-4.4.197-vs2.3.9.8/fs/ default: mlog(ML_ERROR, "Unrecognized mount option \"%s\" " -diff -NurpP --minimal linux-4.4.197/fs/open.c linux-4.4.197-vs2.3.9.8/fs/open.c ---- linux-4.4.197/fs/open.c 2019-10-22 12:34:35.188648370 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/open.c 2019-10-05 14:35:34.862771141 +0000 +diff -NurpP --minimal linux-4.4.217/fs/open.c linux-4.4.217-vs2.3.9.9/fs/open.c +--- linux-4.4.217/fs/open.c 2020-03-27 06:54:46.471916038 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/open.c 2019-10-05 14:35:34.862771141 +0000 @@ -31,6 +31,11 @@ #include #include @@ -5620,9 +5620,9 @@ diff -NurpP --minimal linux-4.4.197/fs/open.c linux-4.4.197-vs2.3.9.8/fs/open.c error = chown_common(&path, user, group); mnt_drop_write(path.mnt); out_release: -diff -NurpP --minimal linux-4.4.197/fs/proc/array.c linux-4.4.197-vs2.3.9.8/fs/proc/array.c ---- linux-4.4.197/fs/proc/array.c 2019-10-22 12:34:35.328646133 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/proc/array.c 2019-02-22 08:20:34.160950722 +0000 +diff -NurpP --minimal linux-4.4.217/fs/proc/array.c linux-4.4.217-vs2.3.9.9/fs/proc/array.c +--- linux-4.4.217/fs/proc/array.c 2020-03-27 06:54:46.561914555 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/proc/array.c 2020-04-01 09:34:44.321169489 +0000 @@ -84,6 +84,8 @@ #include #include @@ -5723,7 +5723,7 @@ diff -NurpP --minimal linux-4.4.197/fs/proc/array.c linux-4.4.197-vs2.3.9.8/fs/p task_context_switch_counts(m, task); return 0; } -@@ -497,6 +541,17 @@ static int do_task_stat(struct seq_file +@@ -509,6 +553,17 @@ static int do_task_stat(struct seq_file /* convert nsec -> ticks */ start_time = nsec_to_clock_t(task->real_start_time); @@ -5741,9 +5741,9 @@ diff -NurpP --minimal linux-4.4.197/fs/proc/array.c linux-4.4.197-vs2.3.9.8/fs/p 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-4.4.197/fs/proc/base.c linux-4.4.197-vs2.3.9.8/fs/proc/base.c ---- linux-4.4.197/fs/proc/base.c 2019-10-22 12:34:35.338645971 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/proc/base.c 2019-02-22 08:20:34.200950045 +0000 +diff -NurpP --minimal linux-4.4.217/fs/proc/base.c linux-4.4.217-vs2.3.9.9/fs/proc/base.c +--- linux-4.4.217/fs/proc/base.c 2020-03-27 06:54:46.571914393 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/proc/base.c 2019-02-22 08:20:34.200950045 +0000 @@ -87,6 +87,8 @@ #include #include @@ -5881,9 +5881,9 @@ diff -NurpP --minimal linux-4.4.197/fs/proc/base.c linux-4.4.197-vs2.3.9.8/fs/pr ns = dentry->d_sb->s_fs_info; rcu_read_lock(); -diff -NurpP --minimal linux-4.4.197/fs/proc/generic.c linux-4.4.197-vs2.3.9.8/fs/proc/generic.c ---- linux-4.4.197/fs/proc/generic.c 2019-10-22 12:34:35.338645971 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/proc/generic.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/proc/generic.c linux-4.4.217-vs2.3.9.9/fs/proc/generic.c +--- linux-4.4.217/fs/proc/generic.c 2020-03-27 06:54:46.571914393 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/proc/generic.c 2018-10-20 04:57:21.000000000 +0000 @@ -22,6 +22,7 @@ #include #include @@ -5958,9 +5958,9 @@ diff -NurpP --minimal linux-4.4.197/fs/proc/generic.c linux-4.4.197-vs2.3.9.8/fs } else { kfree(ent); ent = NULL; -diff -NurpP --minimal linux-4.4.197/fs/proc/inode.c linux-4.4.197-vs2.3.9.8/fs/proc/inode.c ---- linux-4.4.197/fs/proc/inode.c 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/proc/inode.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/proc/inode.c linux-4.4.217-vs2.3.9.9/fs/proc/inode.c +--- linux-4.4.217/fs/proc/inode.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/proc/inode.c 2018-10-20 04:57:21.000000000 +0000 @@ -431,6 +431,8 @@ struct inode *proc_get_inode(struct supe inode->i_uid = de->uid; inode->i_gid = de->gid; @@ -5970,9 +5970,9 @@ diff -NurpP --minimal linux-4.4.197/fs/proc/inode.c linux-4.4.197-vs2.3.9.8/fs/p if (de->size) inode->i_size = de->size; if (de->nlink) -diff -NurpP --minimal linux-4.4.197/fs/proc/internal.h linux-4.4.197-vs2.3.9.8/fs/proc/internal.h ---- linux-4.4.197/fs/proc/internal.h 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/proc/internal.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/proc/internal.h linux-4.4.217-vs2.3.9.9/fs/proc/internal.h +--- linux-4.4.217/fs/proc/internal.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/proc/internal.h 2018-10-20 04:57:21.000000000 +0000 @@ -14,6 +14,7 @@ #include #include @@ -6039,9 +6039,9 @@ diff -NurpP --minimal linux-4.4.197/fs/proc/internal.h linux-4.4.197-vs2.3.9.8/f /* * base.c -diff -NurpP --minimal linux-4.4.197/fs/proc/loadavg.c linux-4.4.197-vs2.3.9.8/fs/proc/loadavg.c ---- linux-4.4.197/fs/proc/loadavg.c 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/proc/loadavg.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/proc/loadavg.c linux-4.4.217-vs2.3.9.9/fs/proc/loadavg.c +--- linux-4.4.217/fs/proc/loadavg.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/proc/loadavg.c 2018-10-20 04:57:21.000000000 +0000 @@ -12,15 +12,27 @@ static int loadavg_proc_show(struct seq_file *m, void *v) @@ -6071,10 +6071,10 @@ diff -NurpP --minimal linux-4.4.197/fs/proc/loadavg.c linux-4.4.197-vs2.3.9.8/fs task_active_pid_ns(current)->last_pid); return 0; } -diff -NurpP --minimal linux-4.4.197/fs/proc/meminfo.c linux-4.4.197-vs2.3.9.8/fs/proc/meminfo.c ---- linux-4.4.197/fs/proc/meminfo.c 2019-10-22 12:34:35.338645971 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/proc/meminfo.c 2018-10-20 04:57:21.000000000 +0000 -@@ -43,7 +43,8 @@ static int meminfo_proc_show(struct seq_ +diff -NurpP --minimal linux-4.4.217/fs/proc/meminfo.c linux-4.4.217-vs2.3.9.9/fs/proc/meminfo.c +--- linux-4.4.217/fs/proc/meminfo.c 2020-03-27 06:54:46.571914393 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/proc/meminfo.c 2020-04-01 09:38:28.107462073 +0000 +@@ -40,7 +40,8 @@ static int meminfo_proc_show(struct seq_ si_swapinfo(&i); committed = percpu_counter_read_positive(&vm_committed_as); @@ -6084,9 +6084,9 @@ diff -NurpP --minimal linux-4.4.197/fs/proc/meminfo.c linux-4.4.197-vs2.3.9.8/fs total_swapcache_pages() - i.bufferram; if (cached < 0) cached = 0; -diff -NurpP --minimal linux-4.4.197/fs/proc/root.c linux-4.4.197-vs2.3.9.8/fs/proc/root.c ---- linux-4.4.197/fs/proc/root.c 2019-10-22 12:34:35.358645651 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/proc/root.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/proc/root.c linux-4.4.217-vs2.3.9.9/fs/proc/root.c +--- linux-4.4.217/fs/proc/root.c 2020-03-27 06:54:46.581914226 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/proc/root.c 2018-10-20 04:57:21.000000000 +0000 @@ -20,9 +20,14 @@ #include #include @@ -6128,9 +6128,9 @@ diff -NurpP --minimal linux-4.4.197/fs/proc/root.c linux-4.4.197-vs2.3.9.8/fs/pr .subdir = RB_ROOT, .name = "/proc", }; -diff -NurpP --minimal linux-4.4.197/fs/proc/self.c linux-4.4.197-vs2.3.9.8/fs/proc/self.c ---- linux-4.4.197/fs/proc/self.c 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/proc/self.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/proc/self.c linux-4.4.217-vs2.3.9.9/fs/proc/self.c +--- linux-4.4.217/fs/proc/self.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/proc/self.c 2018-10-20 04:57:21.000000000 +0000 @@ -1,6 +1,7 @@ #include #include @@ -6142,15 +6142,15 @@ diff -NurpP --minimal linux-4.4.197/fs/proc/self.c linux-4.4.197-vs2.3.9.8/fs/pr @@ -52,6 +53,8 @@ int proc_setup_self(struct super_block * self = d_alloc_name(s->s_root, "self"); if (self) { - struct inode *inode = new_inode_pseudo(s); + struct inode *inode = new_inode(s); + + // self->vx_flags = IATTR_PROC_SYMLINK; if (inode) { inode->i_ino = self_inum; inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME; -diff -NurpP --minimal linux-4.4.197/fs/proc/stat.c linux-4.4.197-vs2.3.9.8/fs/proc/stat.c ---- linux-4.4.197/fs/proc/stat.c 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/proc/stat.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/proc/stat.c linux-4.4.217-vs2.3.9.9/fs/proc/stat.c +--- linux-4.4.217/fs/proc/stat.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/proc/stat.c 2018-10-20 04:57:21.000000000 +0000 @@ -9,8 +9,10 @@ #include #include @@ -6199,9 +6199,9 @@ diff -NurpP --minimal linux-4.4.197/fs/proc/stat.c linux-4.4.197-vs2.3.9.8/fs/pr /* 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-4.4.197/fs/proc/uptime.c linux-4.4.197-vs2.3.9.8/fs/proc/uptime.c ---- linux-4.4.197/fs/proc/uptime.c 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/proc/uptime.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/proc/uptime.c linux-4.4.217-vs2.3.9.9/fs/proc/uptime.c +--- linux-4.4.217/fs/proc/uptime.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/proc/uptime.c 2018-10-20 04:57:21.000000000 +0000 @@ -5,6 +5,7 @@ #include #include @@ -6221,9 +6221,9 @@ diff -NurpP --minimal linux-4.4.197/fs/proc/uptime.c linux-4.4.197-vs2.3.9.8/fs/ seq_printf(m, "%lu.%02lu %lu.%02lu\n", (unsigned long) uptime.tv_sec, (uptime.tv_nsec / (NSEC_PER_SEC / 100)), -diff -NurpP --minimal linux-4.4.197/fs/proc_namespace.c linux-4.4.197-vs2.3.9.8/fs/proc_namespace.c ---- linux-4.4.197/fs/proc_namespace.c 2019-10-22 12:34:35.388645172 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/proc_namespace.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/proc_namespace.c linux-4.4.217-vs2.3.9.9/fs/proc_namespace.c +--- linux-4.4.217/fs/proc_namespace.c 2020-03-27 06:54:46.591914065 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/proc_namespace.c 2018-10-20 04:57:21.000000000 +0000 @@ -46,6 +46,8 @@ static int show_sb_opts(struct seq_file { MS_DIRSYNC, ",dirsync" }, { MS_MANDLOCK, ",mand" }, @@ -6337,10 +6337,10 @@ diff -NurpP --minimal linux-4.4.197/fs/proc_namespace.c linux-4.4.197-vs2.3.9.8/ /* file system type */ seq_puts(m, "with fstype "); show_type(m, sb); -diff -NurpP --minimal linux-4.4.197/fs/quota/dquot.c linux-4.4.197-vs2.3.9.8/fs/quota/dquot.c ---- linux-4.4.197/fs/quota/dquot.c 2019-10-22 12:34:35.478643734 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/quota/dquot.c 2018-10-20 04:57:21.000000000 +0000 -@@ -1643,6 +1643,9 @@ int __dquot_alloc_space(struct inode *in +diff -NurpP --minimal linux-4.4.217/fs/quota/dquot.c linux-4.4.217-vs2.3.9.9/fs/quota/dquot.c +--- linux-4.4.217/fs/quota/dquot.c 2020-03-27 06:54:46.731911761 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/quota/dquot.c 2020-04-01 09:34:44.481166836 +0000 +@@ -1644,6 +1644,9 @@ int __dquot_alloc_space(struct inode *in int reserve = flags & DQUOT_SPACE_RESERVE; struct dquot **dquots; @@ -6350,7 +6350,7 @@ diff -NurpP --minimal linux-4.4.197/fs/quota/dquot.c linux-4.4.197-vs2.3.9.8/fs/ if (!dquot_active(inode)) { inode_incr_space(inode, number, reserve); goto out; -@@ -1695,6 +1698,9 @@ int dquot_alloc_inode(struct inode *inod +@@ -1696,6 +1699,9 @@ int dquot_alloc_inode(struct inode *inod struct dquot_warn warn[MAXQUOTAS]; struct dquot * const *dquots; @@ -6360,7 +6360,7 @@ diff -NurpP --minimal linux-4.4.197/fs/quota/dquot.c linux-4.4.197-vs2.3.9.8/fs/ if (!dquot_active(inode)) return 0; for (cnt = 0; cnt < MAXQUOTAS; cnt++) -@@ -1797,6 +1803,8 @@ void __dquot_free_space(struct inode *in +@@ -1798,6 +1804,8 @@ void __dquot_free_space(struct inode *in struct dquot **dquots; int reserve = flags & DQUOT_SPACE_RESERVE, index; @@ -6369,7 +6369,7 @@ diff -NurpP --minimal linux-4.4.197/fs/quota/dquot.c linux-4.4.197-vs2.3.9.8/fs/ if (!dquot_active(inode)) { inode_decr_space(inode, number, reserve); return; -@@ -1841,6 +1849,8 @@ void dquot_free_inode(struct inode *inod +@@ -1842,6 +1850,8 @@ void dquot_free_inode(struct inode *inod struct dquot * const *dquots; int index; @@ -6378,9 +6378,9 @@ diff -NurpP --minimal linux-4.4.197/fs/quota/dquot.c linux-4.4.197-vs2.3.9.8/fs/ if (!dquot_active(inode)) return; -diff -NurpP --minimal linux-4.4.197/fs/quota/quota.c linux-4.4.197-vs2.3.9.8/fs/quota/quota.c ---- linux-4.4.197/fs/quota/quota.c 2019-10-22 12:34:35.498643414 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/quota/quota.c 2018-10-20 05:50:20.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/quota/quota.c linux-4.4.217-vs2.3.9.9/fs/quota/quota.c +--- linux-4.4.217/fs/quota/quota.c 2020-03-27 06:54:46.731911761 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/quota/quota.c 2018-10-20 05:50:20.000000000 +0000 @@ -8,6 +8,7 @@ #include #include @@ -6468,9 +6468,9 @@ diff -NurpP --minimal linux-4.4.197/fs/quota/quota.c linux-4.4.197-vs2.3.9.8/fs/ if (quotactl_cmd_write(cmd)) sb = get_super_thawed(bdev); else -diff -NurpP --minimal linux-4.4.197/fs/stat.c linux-4.4.197-vs2.3.9.8/fs/stat.c ---- linux-4.4.197/fs/stat.c 2019-10-22 12:34:35.708640058 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/stat.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/stat.c linux-4.4.217-vs2.3.9.9/fs/stat.c +--- linux-4.4.217/fs/stat.c 2020-03-27 06:54:46.881909291 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/stat.c 2018-10-20 04:57:21.000000000 +0000 @@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod stat->nlink = inode->i_nlink; stat->uid = inode->i_uid; @@ -6479,9 +6479,9 @@ diff -NurpP --minimal linux-4.4.197/fs/stat.c linux-4.4.197-vs2.3.9.8/fs/stat.c stat->rdev = inode->i_rdev; stat->size = i_size_read(inode); stat->atime = inode->i_atime; -diff -NurpP --minimal linux-4.4.197/fs/statfs.c linux-4.4.197-vs2.3.9.8/fs/statfs.c ---- linux-4.4.197/fs/statfs.c 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/statfs.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/statfs.c linux-4.4.217-vs2.3.9.9/fs/statfs.c +--- linux-4.4.217/fs/statfs.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/statfs.c 2018-10-20 04:57:21.000000000 +0000 @@ -7,6 +7,8 @@ #include #include @@ -6500,9 +6500,9 @@ diff -NurpP --minimal linux-4.4.197/fs/statfs.c linux-4.4.197-vs2.3.9.8/fs/statf return retval; } -diff -NurpP --minimal linux-4.4.197/fs/super.c linux-4.4.197-vs2.3.9.8/fs/super.c ---- linux-4.4.197/fs/super.c 2019-10-22 12:34:35.718639901 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/super.c 2019-02-22 08:20:34.220949702 +0000 +diff -NurpP --minimal linux-4.4.217/fs/super.c linux-4.4.217-vs2.3.9.9/fs/super.c +--- linux-4.4.217/fs/super.c 2020-03-27 06:54:46.881909291 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/super.c 2019-02-22 08:20:34.220949702 +0000 @@ -33,6 +33,8 @@ #include #include @@ -6526,9 +6526,9 @@ diff -NurpP --minimal linux-4.4.197/fs/super.c linux-4.4.197-vs2.3.9.8/fs/super. error = security_sb_kern_mount(sb, flags, secdata); if (error) goto out_sb; -diff -NurpP --minimal linux-4.4.197/fs/utimes.c linux-4.4.197-vs2.3.9.8/fs/utimes.c ---- linux-4.4.197/fs/utimes.c 2019-10-22 12:34:36.098633826 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/utimes.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/utimes.c linux-4.4.217-vs2.3.9.9/fs/utimes.c +--- linux-4.4.217/fs/utimes.c 2020-03-27 06:54:47.121905343 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/utimes.c 2018-10-20 04:57:21.000000000 +0000 @@ -8,6 +8,8 @@ #include #include @@ -6559,9 +6559,9 @@ diff -NurpP --minimal linux-4.4.197/fs/utimes.c linux-4.4.197-vs2.3.9.8/fs/utime if (times && times[0].tv_nsec == UTIME_NOW && times[1].tv_nsec == UTIME_NOW) times = NULL; -diff -NurpP --minimal linux-4.4.197/fs/xattr.c linux-4.4.197-vs2.3.9.8/fs/xattr.c ---- linux-4.4.197/fs/xattr.c 2019-10-22 12:34:36.098633826 +0000 -+++ linux-4.4.197-vs2.3.9.8/fs/xattr.c 2018-10-20 05:50:20.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/fs/xattr.c linux-4.4.217-vs2.3.9.9/fs/xattr.c +--- linux-4.4.217/fs/xattr.c 2020-03-27 06:54:47.121905343 +0000 ++++ linux-4.4.217-vs2.3.9.9/fs/xattr.c 2018-10-20 05:50:20.000000000 +0000 @@ -21,6 +21,7 @@ #include #include @@ -6579,9 +6579,9 @@ diff -NurpP --minimal linux-4.4.197/fs/xattr.c linux-4.4.197-vs2.3.9.8/fs/xattr. return (mask & MAY_WRITE) ? -EPERM : -ENODATA; return 0; } -diff -NurpP --minimal linux-4.4.197/include/linux/capability.h linux-4.4.197-vs2.3.9.8/include/linux/capability.h ---- linux-4.4.197/include/linux/capability.h 2019-10-22 12:34:36.818622321 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/capability.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/capability.h linux-4.4.217-vs2.3.9.9/include/linux/capability.h +--- linux-4.4.217/include/linux/capability.h 2020-03-27 06:54:49.361868497 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/capability.h 2018-10-20 04:57:21.000000000 +0000 @@ -77,7 +77,8 @@ extern const kernel_cap_t __cap_init_eff #else /* HAND-CODED capability initializers */ @@ -6592,9 +6592,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/capability.h linux-4.4.197-vs2 # define CAP_EMPTY_SET ((kernel_cap_t){{ 0, 0 }}) # define CAP_FULL_SET ((kernel_cap_t){{ ~0, CAP_LAST_U32_VALID_MASK }}) -diff -NurpP --minimal linux-4.4.197/include/linux/cred.h linux-4.4.197-vs2.3.9.8/include/linux/cred.h ---- linux-4.4.197/include/linux/cred.h 2019-10-22 12:34:36.938620404 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/cred.h 2019-10-05 14:35:35.422762257 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/cred.h linux-4.4.217-vs2.3.9.9/include/linux/cred.h +--- linux-4.4.217/include/linux/cred.h 2020-03-27 06:54:49.781861585 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/cred.h 2019-10-05 14:35:35.422762257 +0000 @@ -165,6 +165,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 *); @@ -6635,9 +6635,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/cred.h linux-4.4.197-vs2.3.9.8 /** * get_new_cred - Get a reference on a new set of credentials * @cred: The new credentials to reference -diff -NurpP --minimal linux-4.4.197/include/linux/dcache.h linux-4.4.197-vs2.3.9.8/include/linux/dcache.h ---- linux-4.4.197/include/linux/dcache.h 2019-10-22 12:34:36.958620084 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/dcache.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/dcache.h linux-4.4.217-vs2.3.9.9/include/linux/dcache.h +--- linux-4.4.217/include/linux/dcache.h 2020-03-27 06:54:49.781861585 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/dcache.h 2018-10-20 04:57:21.000000000 +0000 @@ -10,6 +10,7 @@ #include #include @@ -6658,18 +6658,18 @@ diff -NurpP --minimal linux-4.4.197/include/linux/dcache.h linux-4.4.197-vs2.3.9 return dentry; } -diff -NurpP --minimal linux-4.4.197/include/linux/devpts_fs.h linux-4.4.197-vs2.3.9.8/include/linux/devpts_fs.h ---- linux-4.4.197/include/linux/devpts_fs.h 2019-10-22 12:34:36.958620084 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/devpts_fs.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/devpts_fs.h linux-4.4.217-vs2.3.9.9/include/linux/devpts_fs.h +--- linux-4.4.217/include/linux/devpts_fs.h 2020-03-27 06:54:49.781861585 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/devpts_fs.h 2018-10-20 04:57:21.000000000 +0000 @@ -35,5 +35,4 @@ void devpts_pty_kill(struct inode *inode #endif - #endif /* _LINUX_DEVPTS_FS_H */ -diff -NurpP --minimal linux-4.4.197/include/linux/fs.h linux-4.4.197-vs2.3.9.8/include/linux/fs.h ---- linux-4.4.197/include/linux/fs.h 2019-10-22 12:34:36.968619927 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/fs.h 2019-10-05 14:35:35.442761942 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/fs.h linux-4.4.217-vs2.3.9.9/include/linux/fs.h +--- linux-4.4.217/include/linux/fs.h 2020-03-27 06:54:49.871860107 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/fs.h 2019-10-05 14:35:35.442761942 +0000 @@ -232,6 +232,7 @@ typedef void (dax_iodone_t)(struct buffe #define ATTR_OPEN (1 << 15) /* Truncating from open(O_TRUNC) */ #define ATTR_TIMES_SET (1 << 16) @@ -6835,10 +6835,10 @@ diff -NurpP --minimal linux-4.4.197/include/linux/fs.h linux-4.4.197-vs2.3.9.8/i 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-4.4.197/include/linux/init_task.h linux-4.4.197-vs2.3.9.8/include/linux/init_task.h ---- linux-4.4.197/include/linux/init_task.h 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/init_task.h 2018-10-20 04:57:21.000000000 +0000 -@@ -260,6 +260,10 @@ extern struct task_group root_task_group +diff -NurpP --minimal linux-4.4.217/include/linux/init_task.h linux-4.4.217-vs2.3.9.9/include/linux/init_task.h +--- linux-4.4.217/include/linux/init_task.h 2020-03-27 06:54:50.891843328 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/init_task.h 2020-04-01 09:34:45.001158224 +0000 +@@ -269,6 +269,10 @@ extern struct task_group root_task_group INIT_VTIME(tsk) \ INIT_NUMA_BALANCING(tsk) \ INIT_KASAN(tsk) \ @@ -6849,9 +6849,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/init_task.h linux-4.4.197-vs2. } -diff -NurpP --minimal linux-4.4.197/include/linux/ipc.h linux-4.4.197-vs2.3.9.8/include/linux/ipc.h ---- linux-4.4.197/include/linux/ipc.h 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/ipc.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/ipc.h linux-4.4.217-vs2.3.9.9/include/linux/ipc.h +--- linux-4.4.217/include/linux/ipc.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/ipc.h 2018-10-20 04:57:21.000000000 +0000 @@ -16,6 +16,7 @@ struct kern_ipc_perm key_t key; kuid_t uid; @@ -6860,9 +6860,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/ipc.h linux-4.4.197-vs2.3.9.8/ kuid_t cuid; kgid_t cgid; umode_t mode; -diff -NurpP --minimal linux-4.4.197/include/linux/memcontrol.h linux-4.4.197-vs2.3.9.8/include/linux/memcontrol.h ---- linux-4.4.197/include/linux/memcontrol.h 2019-10-22 12:34:37.858605703 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/memcontrol.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/memcontrol.h linux-4.4.217-vs2.3.9.9/include/linux/memcontrol.h +--- linux-4.4.217/include/linux/memcontrol.h 2020-03-27 06:54:51.041840858 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/memcontrol.h 2018-10-20 04:57:21.000000000 +0000 @@ -113,6 +113,7 @@ struct cg_proto { struct mem_cgroup *memcg; }; @@ -6884,9 +6884,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/memcontrol.h linux-4.4.197-vs2 static inline bool mm_match_cgroup(struct mm_struct *mm, struct mem_cgroup *memcg) { -diff -NurpP --minimal linux-4.4.197/include/linux/mount.h linux-4.4.197-vs2.3.9.8/include/linux/mount.h ---- linux-4.4.197/include/linux/mount.h 2019-10-22 12:34:38.708592123 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/mount.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/mount.h linux-4.4.217-vs2.3.9.9/include/linux/mount.h +--- linux-4.4.217/include/linux/mount.h 2020-03-27 06:54:51.391835100 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/mount.h 2018-10-20 04:57:21.000000000 +0000 @@ -63,6 +63,9 @@ struct mnt_namespace; #define MNT_MARKED 0x4000000 #define MNT_UMOUNT 0x8000000 @@ -6897,10 +6897,10 @@ diff -NurpP --minimal linux-4.4.197/include/linux/mount.h linux-4.4.197-vs2.3.9. struct vfsmount { struct dentry *mnt_root; /* root of the mounted tree */ struct super_block *mnt_sb; /* pointer to superblock */ -diff -NurpP --minimal linux-4.4.197/include/linux/netdevice.h linux-4.4.197-vs2.3.9.8/include/linux/netdevice.h ---- linux-4.4.197/include/linux/netdevice.h 2019-10-22 12:34:38.768591162 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/netdevice.h 2019-02-22 08:20:34.370947154 +0000 -@@ -2303,6 +2303,7 @@ static inline int dev_recursion_level(vo +diff -NurpP --minimal linux-4.4.217/include/linux/netdevice.h linux-4.4.217-vs2.3.9.9/include/linux/netdevice.h +--- linux-4.4.217/include/linux/netdevice.h 2020-03-27 06:54:51.421834610 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/netdevice.h 2020-04-01 09:34:45.201154912 +0000 +@@ -2308,6 +2308,7 @@ static inline int dev_recursion_level(vo struct net_device *dev_get_by_index(struct net *net, int ifindex); struct net_device *__dev_get_by_index(struct net *net, int ifindex); @@ -6908,9 +6908,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/netdevice.h linux-4.4.197-vs2. 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-4.4.197/include/linux/net.h linux-4.4.197-vs2.3.9.8/include/linux/net.h ---- linux-4.4.197/include/linux/net.h 2019-10-22 12:34:38.738591641 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/net.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/net.h linux-4.4.217-vs2.3.9.9/include/linux/net.h +--- linux-4.4.217/include/linux/net.h 2020-03-27 06:54:51.421834610 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/net.h 2018-10-20 04:57:21.000000000 +0000 @@ -43,6 +43,7 @@ struct net; #define SOCK_NOSPACE 2 #define SOCK_PASSCRED 3 @@ -6919,9 +6919,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/net.h linux-4.4.197-vs2.3.9.8/ #ifndef ARCH_HAS_SOCKET_TYPES /** -diff -NurpP --minimal linux-4.4.197/include/linux/nsproxy.h linux-4.4.197-vs2.3.9.8/include/linux/nsproxy.h ---- linux-4.4.197/include/linux/nsproxy.h 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/nsproxy.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/nsproxy.h linux-4.4.217-vs2.3.9.9/include/linux/nsproxy.h +--- linux-4.4.217/include/linux/nsproxy.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/nsproxy.h 2018-10-20 04:57:21.000000000 +0000 @@ -3,6 +3,7 @@ #include @@ -6971,9 +6971,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/nsproxy.h linux-4.4.197-vs2.3. } #endif -diff -NurpP --minimal linux-4.4.197/include/linux/pid.h linux-4.4.197-vs2.3.9.8/include/linux/pid.h ---- linux-4.4.197/include/linux/pid.h 2019-10-22 12:34:38.858589724 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/pid.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/pid.h linux-4.4.217-vs2.3.9.9/include/linux/pid.h +--- linux-4.4.217/include/linux/pid.h 2020-03-27 06:54:51.501833294 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/pid.h 2018-10-20 04:57:21.000000000 +0000 @@ -10,7 +10,8 @@ enum pid_type PIDTYPE_SID, PIDTYPE_MAX, @@ -6992,9 +6992,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/pid.h linux-4.4.197-vs2.3.9.8/ pid_t pid_vnr(struct pid *pid); #define do_each_pid_task(pid, type, task) \ -diff -NurpP --minimal linux-4.4.197/include/linux/quotaops.h linux-4.4.197-vs2.3.9.8/include/linux/quotaops.h ---- linux-4.4.197/include/linux/quotaops.h 2019-10-22 12:34:38.948588285 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/quotaops.h 2019-10-05 14:35:35.702757815 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/quotaops.h linux-4.4.217-vs2.3.9.9/include/linux/quotaops.h +--- linux-4.4.217/include/linux/quotaops.h 2020-03-27 06:54:51.571832139 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/quotaops.h 2020-04-01 09:34:45.471150442 +0000 @@ -8,6 +8,7 @@ #define _LINUX_QUOTAOPS_ @@ -7003,7 +7003,7 @@ diff -NurpP --minimal linux-4.4.197/include/linux/quotaops.h linux-4.4.197-vs2.3 #define DQUOT_SPACE_WARN 0x1 #define DQUOT_SPACE_RESERVE 0x2 -@@ -211,11 +212,12 @@ static inline void dquot_drop(struct ino +@@ -221,11 +222,12 @@ static inline void dquot_drop(struct ino static inline int dquot_alloc_inode(struct inode *inode) { @@ -7017,7 +7017,7 @@ diff -NurpP --minimal linux-4.4.197/include/linux/quotaops.h linux-4.4.197-vs2.3 } static inline int dquot_transfer(struct inode *inode, struct iattr *iattr) -@@ -226,6 +228,10 @@ static inline int dquot_transfer(struct +@@ -236,6 +238,10 @@ static inline int dquot_transfer(struct static inline int __dquot_alloc_space(struct inode *inode, qsize_t number, int flags) { @@ -7028,7 +7028,7 @@ diff -NurpP --minimal linux-4.4.197/include/linux/quotaops.h linux-4.4.197-vs2.3 if (!(flags & DQUOT_SPACE_RESERVE)) inode_add_bytes(inode, number); return 0; -@@ -236,6 +242,7 @@ static inline void __dquot_free_space(st +@@ -246,6 +252,7 @@ static inline void __dquot_free_space(st { if (!(flags & DQUOT_SPACE_RESERVE)) inode_sub_bytes(inode, number); @@ -7036,10 +7036,10 @@ diff -NurpP --minimal linux-4.4.197/include/linux/quotaops.h linux-4.4.197-vs2.3 } static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number) -diff -NurpP --minimal linux-4.4.197/include/linux/sched.h linux-4.4.197-vs2.3.9.8/include/linux/sched.h ---- linux-4.4.197/include/linux/sched.h 2019-10-22 12:34:38.988587649 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/sched.h 2019-10-05 14:35:35.742757182 +0000 -@@ -1601,6 +1601,14 @@ struct task_struct { +diff -NurpP --minimal linux-4.4.217/include/linux/sched.h linux-4.4.217-vs2.3.9.9/include/linux/sched.h +--- linux-4.4.217/include/linux/sched.h 2020-03-27 06:54:51.611831484 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/sched.h 2020-04-01 09:34:45.561148948 +0000 +@@ -1611,6 +1611,14 @@ struct task_struct { #endif struct seccomp seccomp; @@ -7054,7 +7054,7 @@ diff -NurpP --minimal linux-4.4.197/include/linux/sched.h linux-4.4.197-vs2.3.9. /* Thread group tracking */ u32 parent_exec_id; u32 self_exec_id; -@@ -1928,6 +1936,11 @@ struct pid_namespace; +@@ -1938,6 +1946,11 @@ struct pid_namespace; pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type, struct pid_namespace *ns); @@ -7066,7 +7066,7 @@ diff -NurpP --minimal linux-4.4.197/include/linux/sched.h linux-4.4.197-vs2.3.9. static inline pid_t task_pid_nr(struct task_struct *tsk) { return tsk->pid; -@@ -1941,7 +1954,8 @@ static inline pid_t task_pid_nr_ns(struc +@@ -1951,7 +1964,8 @@ static inline pid_t task_pid_nr_ns(struc static inline pid_t task_pid_vnr(struct task_struct *tsk) { @@ -7076,9 +7076,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/sched.h linux-4.4.197-vs2.3.9. } -diff -NurpP --minimal linux-4.4.197/include/linux/shmem_fs.h linux-4.4.197-vs2.3.9.8/include/linux/shmem_fs.h ---- linux-4.4.197/include/linux/shmem_fs.h 2019-10-22 12:34:39.018587167 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/shmem_fs.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/shmem_fs.h linux-4.4.217-vs2.3.9.9/include/linux/shmem_fs.h +--- linux-4.4.217/include/linux/shmem_fs.h 2020-03-27 06:54:51.641830990 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/shmem_fs.h 2018-10-20 04:57:21.000000000 +0000 @@ -10,6 +10,9 @@ /* inode in-kernel data */ @@ -7089,9 +7089,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/shmem_fs.h linux-4.4.197-vs2.3 struct shmem_inode_info { spinlock_t lock; unsigned int seals; /* shmem seals */ -diff -NurpP --minimal linux-4.4.197/include/linux/stat.h linux-4.4.197-vs2.3.9.8/include/linux/stat.h ---- linux-4.4.197/include/linux/stat.h 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/stat.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/stat.h linux-4.4.217-vs2.3.9.9/include/linux/stat.h +--- linux-4.4.217/include/linux/stat.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/stat.h 2018-10-20 04:57:21.000000000 +0000 @@ -25,6 +25,7 @@ struct kstat { unsigned int nlink; kuid_t uid; @@ -7100,9 +7100,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/stat.h linux-4.4.197-vs2.3.9.8 dev_t rdev; loff_t size; struct timespec atime; -diff -NurpP --minimal linux-4.4.197/include/linux/sunrpc/auth.h linux-4.4.197-vs2.3.9.8/include/linux/sunrpc/auth.h ---- linux-4.4.197/include/linux/sunrpc/auth.h 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/sunrpc/auth.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/sunrpc/auth.h linux-4.4.217-vs2.3.9.9/include/linux/sunrpc/auth.h +--- linux-4.4.217/include/linux/sunrpc/auth.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/sunrpc/auth.h 2018-10-20 04:57:21.000000000 +0000 @@ -40,6 +40,7 @@ enum { struct auth_cred { kuid_t uid; @@ -7111,9 +7111,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/sunrpc/auth.h linux-4.4.197-vs struct group_info *group_info; const char *principal; unsigned long ac_flags; -diff -NurpP --minimal linux-4.4.197/include/linux/sunrpc/clnt.h linux-4.4.197-vs2.3.9.8/include/linux/sunrpc/clnt.h ---- linux-4.4.197/include/linux/sunrpc/clnt.h 2019-10-22 12:34:39.118585570 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/sunrpc/clnt.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/sunrpc/clnt.h linux-4.4.217-vs2.3.9.9/include/linux/sunrpc/clnt.h +--- linux-4.4.217/include/linux/sunrpc/clnt.h 2020-03-27 06:54:51.711829836 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/sunrpc/clnt.h 2018-10-20 04:57:21.000000000 +0000 @@ -51,7 +51,8 @@ struct rpc_clnt { cl_discrtry : 1,/* disconnect before retry */ cl_noretranstimeo: 1,/* No retransmit timeouts */ @@ -7124,9 +7124,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/sunrpc/clnt.h linux-4.4.197-vs struct rpc_rtt * cl_rtt; /* RTO estimator data */ const struct rpc_timeout *cl_timeout; /* Timeout strategy */ -diff -NurpP --minimal linux-4.4.197/include/linux/types.h linux-4.4.197-vs2.3.9.8/include/linux/types.h ---- linux-4.4.197/include/linux/types.h 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/types.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/types.h linux-4.4.217-vs2.3.9.9/include/linux/types.h +--- linux-4.4.217/include/linux/types.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/types.h 2018-10-20 04:57:21.000000000 +0000 @@ -32,6 +32,9 @@ typedef __kernel_uid32_t uid_t; typedef __kernel_gid32_t gid_t; typedef __kernel_uid16_t uid16_t; @@ -7137,9 +7137,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/types.h linux-4.4.197-vs2.3.9. typedef unsigned long uintptr_t; -diff -NurpP --minimal linux-4.4.197/include/linux/uidgid.h linux-4.4.197-vs2.3.9.8/include/linux/uidgid.h ---- linux-4.4.197/include/linux/uidgid.h 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/uidgid.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/uidgid.h linux-4.4.217-vs2.3.9.9/include/linux/uidgid.h +--- linux-4.4.217/include/linux/uidgid.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/uidgid.h 2018-10-20 04:57:21.000000000 +0000 @@ -21,13 +21,17 @@ typedef struct { uid_t val; } kuid_t; @@ -7236,18 +7236,18 @@ diff -NurpP --minimal linux-4.4.197/include/linux/uidgid.h linux-4.4.197-vs2.3.9 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-4.4.197/include/linux/vroot.h linux-4.4.197-vs2.3.9.8/include/linux/vroot.h ---- linux-4.4.197/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vroot.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vroot.h linux-4.4.217-vs2.3.9.9/include/linux/vroot.h +--- linux-4.4.217/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vroot.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,51 @@ + +/* + * include/linux/vroot.h + * -+ * written by Herbert P?tzl, 9/11/2002 -+ * ported to 2.6 by Herbert P?tzl, 30/12/2004 ++ * written by Herbert Pötzl, 9/11/2002 ++ * ported to 2.6 by Herbert Pötzl, 30/12/2004 + * -+ * Copyright (C) 2002-2007 by Herbert P?tzl. ++ * Copyright (C) 2002-2007 by Herbert Pötzl. + * Redistribution of this file is permitted under the + * GNU General Public License. + */ @@ -7291,9 +7291,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vroot.h linux-4.4.197-vs2.3.9. +#define VROOT_CLR_DEV 0x5601 + +#endif /* _LINUX_VROOT_H */ -diff -NurpP --minimal linux-4.4.197/include/linux/vs_base.h linux-4.4.197-vs2.3.9.8/include/linux/vs_base.h ---- linux-4.4.197/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vs_base.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vs_base.h linux-4.4.217-vs2.3.9.9/include/linux/vs_base.h +--- linux-4.4.217/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vs_base.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,10 @@ +#ifndef _VS_BASE_H +#define _VS_BASE_H @@ -7305,9 +7305,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vs_base.h linux-4.4.197-vs2.3. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-4.4.197/include/linux/vs_context.h linux-4.4.197-vs2.3.9.8/include/linux/vs_context.h ---- linux-4.4.197/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vs_context.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vs_context.h linux-4.4.217-vs2.3.9.9/include/linux/vs_context.h +--- linux-4.4.217/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vs_context.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,242 @@ +#ifndef _VS_CONTEXT_H +#define _VS_CONTEXT_H @@ -7551,9 +7551,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vs_context.h linux-4.4.197-vs2 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-4.4.197/include/linux/vs_cowbl.h linux-4.4.197-vs2.3.9.8/include/linux/vs_cowbl.h ---- linux-4.4.197/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vs_cowbl.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vs_cowbl.h linux-4.4.217-vs2.3.9.9/include/linux/vs_cowbl.h +--- linux-4.4.217/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vs_cowbl.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,48 @@ +#ifndef _VS_COWBL_H +#define _VS_COWBL_H @@ -7603,9 +7603,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vs_cowbl.h linux-4.4.197-vs2.3 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-4.4.197/include/linux/vs_cvirt.h linux-4.4.197-vs2.3.9.8/include/linux/vs_cvirt.h ---- linux-4.4.197/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vs_cvirt.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vs_cvirt.h linux-4.4.217-vs2.3.9.9/include/linux/vs_cvirt.h +--- linux-4.4.217/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vs_cvirt.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,50 @@ +#ifndef _VS_CVIRT_H +#define _VS_CVIRT_H @@ -7657,9 +7657,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vs_cvirt.h linux-4.4.197-vs2.3 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-4.4.197/include/linux/vs_device.h linux-4.4.197-vs2.3.9.8/include/linux/vs_device.h ---- linux-4.4.197/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vs_device.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vs_device.h linux-4.4.217-vs2.3.9.9/include/linux/vs_device.h +--- linux-4.4.217/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vs_device.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,45 @@ +#ifndef _VS_DEVICE_H +#define _VS_DEVICE_H @@ -7706,9 +7706,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vs_device.h linux-4.4.197-vs2. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-4.4.197/include/linux/vs_dlimit.h linux-4.4.197-vs2.3.9.8/include/linux/vs_dlimit.h ---- linux-4.4.197/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vs_dlimit.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vs_dlimit.h linux-4.4.217-vs2.3.9.9/include/linux/vs_dlimit.h +--- linux-4.4.217/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vs_dlimit.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,215 @@ +#ifndef _VS_DLIMIT_H +#define _VS_DLIMIT_H @@ -7925,9 +7925,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vs_dlimit.h linux-4.4.197-vs2. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-4.4.197/include/linux/vserver/base.h linux-4.4.197-vs2.3.9.8/include/linux/vserver/base.h ---- linux-4.4.197/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vserver/base.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vserver/base.h linux-4.4.217-vs2.3.9.9/include/linux/vserver/base.h +--- linux-4.4.217/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vserver/base.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,184 @@ +#ifndef _VSERVER_BASE_H +#define _VSERVER_BASE_H @@ -8113,9 +8113,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vserver/base.h linux-4.4.197-v +#define nx_info_state(n, m) (__nx_state(n) & (m)) + +#endif -diff -NurpP --minimal linux-4.4.197/include/linux/vserver/cacct_cmd.h linux-4.4.197-vs2.3.9.8/include/linux/vserver/cacct_cmd.h ---- linux-4.4.197/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vserver/cacct_cmd.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vserver/cacct_cmd.h linux-4.4.217-vs2.3.9.9/include/linux/vserver/cacct_cmd.h +--- linux-4.4.217/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vserver/cacct_cmd.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,10 @@ +#ifndef _VSERVER_CACCT_CMD_H +#define _VSERVER_CACCT_CMD_H @@ -8127,9 +8127,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vserver/cacct_cmd.h linux-4.4. +extern int vc_sock_stat(struct vx_info *, void __user *); + +#endif /* _VSERVER_CACCT_CMD_H */ -diff -NurpP --minimal linux-4.4.197/include/linux/vserver/cacct_def.h linux-4.4.197-vs2.3.9.8/include/linux/vserver/cacct_def.h ---- linux-4.4.197/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vserver/cacct_def.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vserver/cacct_def.h linux-4.4.217-vs2.3.9.9/include/linux/vserver/cacct_def.h +--- linux-4.4.217/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vserver/cacct_def.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,43 @@ +#ifndef _VSERVER_CACCT_DEF_H +#define _VSERVER_CACCT_DEF_H @@ -8174,9 +8174,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vserver/cacct_def.h linux-4.4. +#endif + +#endif /* _VSERVER_CACCT_DEF_H */ -diff -NurpP --minimal linux-4.4.197/include/linux/vserver/cacct.h linux-4.4.197-vs2.3.9.8/include/linux/vserver/cacct.h ---- linux-4.4.197/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vserver/cacct.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vserver/cacct.h linux-4.4.217-vs2.3.9.9/include/linux/vserver/cacct.h +--- linux-4.4.217/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vserver/cacct.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,15 @@ +#ifndef _VSERVER_CACCT_H +#define _VSERVER_CACCT_H @@ -8193,9 +8193,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vserver/cacct.h linux-4.4.197- +}; + +#endif /* _VSERVER_CACCT_H */ -diff -NurpP --minimal linux-4.4.197/include/linux/vserver/cacct_int.h linux-4.4.197-vs2.3.9.8/include/linux/vserver/cacct_int.h ---- linux-4.4.197/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vserver/cacct_int.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vserver/cacct_int.h linux-4.4.217-vs2.3.9.9/include/linux/vserver/cacct_int.h +--- linux-4.4.217/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vserver/cacct_int.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,17 @@ +#ifndef _VSERVER_CACCT_INT_H +#define _VSERVER_CACCT_INT_H @@ -8214,9 +8214,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vserver/cacct_int.h linux-4.4. +} + +#endif /* _VSERVER_CACCT_INT_H */ -diff -NurpP --minimal linux-4.4.197/include/linux/vserver/check.h linux-4.4.197-vs2.3.9.8/include/linux/vserver/check.h ---- linux-4.4.197/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vserver/check.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vserver/check.h linux-4.4.217-vs2.3.9.9/include/linux/vserver/check.h +--- linux-4.4.217/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vserver/check.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,89 @@ +#ifndef _VSERVER_CHECK_H +#define _VSERVER_CHECK_H @@ -8307,9 +8307,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vserver/check.h linux-4.4.197- +#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1) + +#endif -diff -NurpP --minimal linux-4.4.197/include/linux/vserver/context_cmd.h linux-4.4.197-vs2.3.9.8/include/linux/vserver/context_cmd.h ---- linux-4.4.197/include/linux/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vserver/context_cmd.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vserver/context_cmd.h linux-4.4.217-vs2.3.9.9/include/linux/vserver/context_cmd.h +--- linux-4.4.217/include/linux/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vserver/context_cmd.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,33 @@ +#ifndef _VSERVER_CONTEXT_CMD_H +#define _VSERVER_CONTEXT_CMD_H @@ -8344,9 +8344,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vserver/context_cmd.h linux-4. +extern int vc_set_badness(struct vx_info *, void __user *); + +#endif /* _VSERVER_CONTEXT_CMD_H */ -diff -NurpP --minimal linux-4.4.197/include/linux/vserver/context.h linux-4.4.197-vs2.3.9.8/include/linux/vserver/context.h ---- linux-4.4.197/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vserver/context.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vserver/context.h linux-4.4.217-vs2.3.9.9/include/linux/vserver/context.h +--- linux-4.4.217/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vserver/context.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,110 @@ +#ifndef _VSERVER_CONTEXT_H +#define _VSERVER_CONTEXT_H @@ -8458,9 +8458,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vserver/context.h linux-4.4.19 + + +#endif /* _VSERVER_CONTEXT_H */ -diff -NurpP --minimal linux-4.4.197/include/linux/vserver/cvirt_cmd.h linux-4.4.197-vs2.3.9.8/include/linux/vserver/cvirt_cmd.h ---- linux-4.4.197/include/linux/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vserver/cvirt_cmd.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vserver/cvirt_cmd.h linux-4.4.217-vs2.3.9.9/include/linux/vserver/cvirt_cmd.h +--- linux-4.4.217/include/linux/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vserver/cvirt_cmd.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,13 @@ +#ifndef _VSERVER_CVIRT_CMD_H +#define _VSERVER_CVIRT_CMD_H @@ -8475,9 +8475,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vserver/cvirt_cmd.h linux-4.4. +extern int vc_virt_stat(struct vx_info *, void __user *); + +#endif /* _VSERVER_CVIRT_CMD_H */ -diff -NurpP --minimal linux-4.4.197/include/linux/vserver/cvirt_def.h linux-4.4.197-vs2.3.9.8/include/linux/vserver/cvirt_def.h ---- linux-4.4.197/include/linux/vserver/cvirt_def.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vserver/cvirt_def.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vserver/cvirt_def.h linux-4.4.217-vs2.3.9.9/include/linux/vserver/cvirt_def.h +--- linux-4.4.217/include/linux/vserver/cvirt_def.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vserver/cvirt_def.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,80 @@ +#ifndef _VSERVER_CVIRT_DEF_H +#define _VSERVER_CVIRT_DEF_H @@ -8559,9 +8559,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vserver/cvirt_def.h linux-4.4. +#endif + +#endif /* _VSERVER_CVIRT_DEF_H */ -diff -NurpP --minimal linux-4.4.197/include/linux/vserver/cvirt.h linux-4.4.197-vs2.3.9.8/include/linux/vserver/cvirt.h ---- linux-4.4.197/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vserver/cvirt.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vserver/cvirt.h linux-4.4.217-vs2.3.9.9/include/linux/vserver/cvirt.h +--- linux-4.4.217/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vserver/cvirt.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,18 @@ +#ifndef _VSERVER_CVIRT_H +#define _VSERVER_CVIRT_H @@ -8581,9 +8581,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vserver/cvirt.h linux-4.4.197- +int vx_do_syslog(int, char __user *, int); + +#endif /* _VSERVER_CVIRT_H */ -diff -NurpP --minimal linux-4.4.197/include/linux/vserver/debug_cmd.h linux-4.4.197-vs2.3.9.8/include/linux/vserver/debug_cmd.h ---- linux-4.4.197/include/linux/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vserver/debug_cmd.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vserver/debug_cmd.h linux-4.4.217-vs2.3.9.9/include/linux/vserver/debug_cmd.h +--- linux-4.4.217/include/linux/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vserver/debug_cmd.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,37 @@ +#ifndef _VSERVER_DEBUG_CMD_H +#define _VSERVER_DEBUG_CMD_H @@ -8622,9 +8622,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vserver/debug_cmd.h linux-4.4. +#endif /* CONFIG_COMPAT */ + +#endif /* _VSERVER_DEBUG_CMD_H */ -diff -NurpP --minimal linux-4.4.197/include/linux/vserver/debug.h linux-4.4.197-vs2.3.9.8/include/linux/vserver/debug.h ---- linux-4.4.197/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vserver/debug.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vserver/debug.h linux-4.4.217-vs2.3.9.9/include/linux/vserver/debug.h +--- linux-4.4.217/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vserver/debug.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,146 @@ +#ifndef _VSERVER_DEBUG_H +#define _VSERVER_DEBUG_H @@ -8772,9 +8772,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vserver/debug.h linux-4.4.197- + + +#endif /* _VSERVER_DEBUG_H */ -diff -NurpP --minimal linux-4.4.197/include/linux/vserver/device_cmd.h linux-4.4.197-vs2.3.9.8/include/linux/vserver/device_cmd.h ---- linux-4.4.197/include/linux/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vserver/device_cmd.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vserver/device_cmd.h linux-4.4.217-vs2.3.9.9/include/linux/vserver/device_cmd.h +--- linux-4.4.217/include/linux/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vserver/device_cmd.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,31 @@ +#ifndef _VSERVER_DEVICE_CMD_H +#define _VSERVER_DEVICE_CMD_H @@ -8807,9 +8807,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vserver/device_cmd.h linux-4.4 +#endif /* CONFIG_COMPAT */ + +#endif /* _VSERVER_DEVICE_CMD_H */ -diff -NurpP --minimal linux-4.4.197/include/linux/vserver/device_def.h linux-4.4.197-vs2.3.9.8/include/linux/vserver/device_def.h ---- linux-4.4.197/include/linux/vserver/device_def.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vserver/device_def.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vserver/device_def.h linux-4.4.217-vs2.3.9.9/include/linux/vserver/device_def.h +--- linux-4.4.217/include/linux/vserver/device_def.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vserver/device_def.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,17 @@ +#ifndef _VSERVER_DEVICE_DEF_H +#define _VSERVER_DEVICE_DEF_H @@ -8828,9 +8828,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vserver/device_def.h linux-4.4 +}; + +#endif /* _VSERVER_DEVICE_DEF_H */ -diff -NurpP --minimal linux-4.4.197/include/linux/vserver/device.h linux-4.4.197-vs2.3.9.8/include/linux/vserver/device.h ---- linux-4.4.197/include/linux/vserver/device.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vserver/device.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vserver/device.h linux-4.4.217-vs2.3.9.9/include/linux/vserver/device.h +--- linux-4.4.217/include/linux/vserver/device.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vserver/device.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,9 @@ +#ifndef _VSERVER_DEVICE_H +#define _VSERVER_DEVICE_H @@ -8841,9 +8841,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vserver/device.h linux-4.4.197 +#else /* _VSERVER_DEVICE_H */ +#warning duplicate inclusion +#endif /* _VSERVER_DEVICE_H */ -diff -NurpP --minimal linux-4.4.197/include/linux/vserver/dlimit_cmd.h linux-4.4.197-vs2.3.9.8/include/linux/vserver/dlimit_cmd.h ---- linux-4.4.197/include/linux/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vserver/dlimit_cmd.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vserver/dlimit_cmd.h linux-4.4.217-vs2.3.9.9/include/linux/vserver/dlimit_cmd.h +--- linux-4.4.217/include/linux/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vserver/dlimit_cmd.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,46 @@ +#ifndef _VSERVER_DLIMIT_CMD_H +#define _VSERVER_DLIMIT_CMD_H @@ -8891,9 +8891,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vserver/dlimit_cmd.h linux-4.4 +#endif /* CONFIG_COMPAT */ + +#endif /* _VSERVER_DLIMIT_CMD_H */ -diff -NurpP --minimal linux-4.4.197/include/linux/vserver/dlimit.h linux-4.4.197-vs2.3.9.8/include/linux/vserver/dlimit.h ---- linux-4.4.197/include/linux/vserver/dlimit.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vserver/dlimit.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vserver/dlimit.h linux-4.4.217-vs2.3.9.9/include/linux/vserver/dlimit.h +--- linux-4.4.217/include/linux/vserver/dlimit.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vserver/dlimit.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,54 @@ +#ifndef _VSERVER_DLIMIT_H +#define _VSERVER_DLIMIT_H @@ -8949,9 +8949,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vserver/dlimit.h linux-4.4.197 +#else /* _VSERVER_DLIMIT_H */ +#warning duplicate inclusion +#endif /* _VSERVER_DLIMIT_H */ -diff -NurpP --minimal linux-4.4.197/include/linux/vserver/global.h linux-4.4.197-vs2.3.9.8/include/linux/vserver/global.h ---- linux-4.4.197/include/linux/vserver/global.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vserver/global.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vserver/global.h linux-4.4.217-vs2.3.9.9/include/linux/vserver/global.h +--- linux-4.4.217/include/linux/vserver/global.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vserver/global.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,19 @@ +#ifndef _VSERVER_GLOBAL_H +#define _VSERVER_GLOBAL_H @@ -8972,9 +8972,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vserver/global.h linux-4.4.197 + + +#endif /* _VSERVER_GLOBAL_H */ -diff -NurpP --minimal linux-4.4.197/include/linux/vserver/history.h linux-4.4.197-vs2.3.9.8/include/linux/vserver/history.h ---- linux-4.4.197/include/linux/vserver/history.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vserver/history.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vserver/history.h linux-4.4.217-vs2.3.9.9/include/linux/vserver/history.h +--- linux-4.4.217/include/linux/vserver/history.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vserver/history.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,197 @@ +#ifndef _VSERVER_HISTORY_H +#define _VSERVER_HISTORY_H @@ -9173,9 +9173,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vserver/history.h linux-4.4.19 +#endif /* CONFIG_VSERVER_HISTORY */ + +#endif /* _VSERVER_HISTORY_H */ -diff -NurpP --minimal linux-4.4.197/include/linux/vserver/inode_cmd.h linux-4.4.197-vs2.3.9.8/include/linux/vserver/inode_cmd.h ---- linux-4.4.197/include/linux/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vserver/inode_cmd.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vserver/inode_cmd.h linux-4.4.217-vs2.3.9.9/include/linux/vserver/inode_cmd.h +--- linux-4.4.217/include/linux/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vserver/inode_cmd.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,36 @@ +#ifndef _VSERVER_INODE_CMD_H +#define _VSERVER_INODE_CMD_H @@ -9213,9 +9213,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vserver/inode_cmd.h linux-4.4. +#endif /* CONFIG_COMPAT */ + +#endif /* _VSERVER_INODE_CMD_H */ -diff -NurpP --minimal linux-4.4.197/include/linux/vserver/inode.h linux-4.4.197-vs2.3.9.8/include/linux/vserver/inode.h ---- linux-4.4.197/include/linux/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vserver/inode.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vserver/inode.h linux-4.4.217-vs2.3.9.9/include/linux/vserver/inode.h +--- linux-4.4.217/include/linux/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vserver/inode.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,19 @@ +#ifndef _VSERVER_INODE_H +#define _VSERVER_INODE_H @@ -9236,9 +9236,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vserver/inode.h linux-4.4.197- +#else /* _VSERVER_INODE_H */ +#warning duplicate inclusion +#endif /* _VSERVER_INODE_H */ -diff -NurpP --minimal linux-4.4.197/include/linux/vserver/limit_cmd.h linux-4.4.197-vs2.3.9.8/include/linux/vserver/limit_cmd.h ---- linux-4.4.197/include/linux/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vserver/limit_cmd.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vserver/limit_cmd.h linux-4.4.217-vs2.3.9.9/include/linux/vserver/limit_cmd.h +--- linux-4.4.217/include/linux/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vserver/limit_cmd.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,35 @@ +#ifndef _VSERVER_LIMIT_CMD_H +#define _VSERVER_LIMIT_CMD_H @@ -9275,9 +9275,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vserver/limit_cmd.h linux-4.4. +#endif /* CONFIG_IA32_EMULATION */ + +#endif /* _VSERVER_LIMIT_CMD_H */ -diff -NurpP --minimal linux-4.4.197/include/linux/vserver/limit_def.h linux-4.4.197-vs2.3.9.8/include/linux/vserver/limit_def.h ---- linux-4.4.197/include/linux/vserver/limit_def.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vserver/limit_def.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vserver/limit_def.h linux-4.4.217-vs2.3.9.9/include/linux/vserver/limit_def.h +--- linux-4.4.217/include/linux/vserver/limit_def.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vserver/limit_def.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,47 @@ +#ifndef _VSERVER_LIMIT_DEF_H +#define _VSERVER_LIMIT_DEF_H @@ -9326,9 +9326,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vserver/limit_def.h linux-4.4. +#endif + +#endif /* _VSERVER_LIMIT_DEF_H */ -diff -NurpP --minimal linux-4.4.197/include/linux/vserver/limit.h linux-4.4.197-vs2.3.9.8/include/linux/vserver/limit.h ---- linux-4.4.197/include/linux/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vserver/limit.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vserver/limit.h linux-4.4.217-vs2.3.9.9/include/linux/vserver/limit.h +--- linux-4.4.217/include/linux/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vserver/limit.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,67 @@ +#ifndef _VSERVER_LIMIT_H +#define _VSERVER_LIMIT_H @@ -9397,9 +9397,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vserver/limit.h linux-4.4.197- +#define NUM_LIMITS 24 + +#endif /* _VSERVER_LIMIT_H */ -diff -NurpP --minimal linux-4.4.197/include/linux/vserver/limit_int.h linux-4.4.197-vs2.3.9.8/include/linux/vserver/limit_int.h ---- linux-4.4.197/include/linux/vserver/limit_int.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vserver/limit_int.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vserver/limit_int.h linux-4.4.217-vs2.3.9.9/include/linux/vserver/limit_int.h +--- linux-4.4.217/include/linux/vserver/limit_int.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vserver/limit_int.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,193 @@ +#ifndef _VSERVER_LIMIT_INT_H +#define _VSERVER_LIMIT_INT_H @@ -9594,9 +9594,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vserver/limit_int.h linux-4.4. + + +#endif /* _VSERVER_LIMIT_INT_H */ -diff -NurpP --minimal linux-4.4.197/include/linux/vserver/monitor.h linux-4.4.197-vs2.3.9.8/include/linux/vserver/monitor.h ---- linux-4.4.197/include/linux/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vserver/monitor.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vserver/monitor.h linux-4.4.217-vs2.3.9.9/include/linux/vserver/monitor.h +--- linux-4.4.217/include/linux/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vserver/monitor.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,6 @@ +#ifndef _VSERVER_MONITOR_H +#define _VSERVER_MONITOR_H @@ -9604,9 +9604,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vserver/monitor.h linux-4.4.19 +#include + +#endif /* _VSERVER_MONITOR_H */ -diff -NurpP --minimal linux-4.4.197/include/linux/vserver/network_cmd.h linux-4.4.197-vs2.3.9.8/include/linux/vserver/network_cmd.h ---- linux-4.4.197/include/linux/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vserver/network_cmd.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vserver/network_cmd.h linux-4.4.217-vs2.3.9.9/include/linux/vserver/network_cmd.h +--- linux-4.4.217/include/linux/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vserver/network_cmd.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,37 @@ +#ifndef _VSERVER_NETWORK_CMD_H +#define _VSERVER_NETWORK_CMD_H @@ -9645,9 +9645,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vserver/network_cmd.h linux-4. +extern int vc_set_ncaps(struct nx_info *, void __user *); + +#endif /* _VSERVER_CONTEXT_CMD_H */ -diff -NurpP --minimal linux-4.4.197/include/linux/vserver/network.h linux-4.4.197-vs2.3.9.8/include/linux/vserver/network.h ---- linux-4.4.197/include/linux/vserver/network.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vserver/network.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vserver/network.h linux-4.4.217-vs2.3.9.9/include/linux/vserver/network.h +--- linux-4.4.217/include/linux/vserver/network.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vserver/network.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,76 @@ +#ifndef _VSERVER_NETWORK_H +#define _VSERVER_NETWORK_H @@ -9725,9 +9725,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vserver/network.h linux-4.4.19 +#endif + +#endif /* _VSERVER_NETWORK_H */ -diff -NurpP --minimal linux-4.4.197/include/linux/vserver/percpu.h linux-4.4.197-vs2.3.9.8/include/linux/vserver/percpu.h ---- linux-4.4.197/include/linux/vserver/percpu.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vserver/percpu.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vserver/percpu.h linux-4.4.217-vs2.3.9.9/include/linux/vserver/percpu.h +--- linux-4.4.217/include/linux/vserver/percpu.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vserver/percpu.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,14 @@ +#ifndef _VSERVER_PERCPU_H +#define _VSERVER_PERCPU_H @@ -9743,9 +9743,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vserver/percpu.h linux-4.4.197 +#define PERCPU_PERCTX (sizeof(struct _vx_percpu)) + +#endif /* _VSERVER_PERCPU_H */ -diff -NurpP --minimal linux-4.4.197/include/linux/vserver/pid.h linux-4.4.197-vs2.3.9.8/include/linux/vserver/pid.h ---- linux-4.4.197/include/linux/vserver/pid.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vserver/pid.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vserver/pid.h linux-4.4.217-vs2.3.9.9/include/linux/vserver/pid.h +--- linux-4.4.217/include/linux/vserver/pid.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vserver/pid.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,51 @@ +#ifndef _VSERVER_PID_H +#define _VSERVER_PID_H @@ -9798,9 +9798,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vserver/pid.h linux-4.4.197-vs +} + +#endif -diff -NurpP --minimal linux-4.4.197/include/linux/vserver/sched_cmd.h linux-4.4.197-vs2.3.9.8/include/linux/vserver/sched_cmd.h ---- linux-4.4.197/include/linux/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vserver/sched_cmd.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vserver/sched_cmd.h linux-4.4.217-vs2.3.9.9/include/linux/vserver/sched_cmd.h +--- linux-4.4.217/include/linux/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vserver/sched_cmd.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,11 @@ +#ifndef _VSERVER_SCHED_CMD_H +#define _VSERVER_SCHED_CMD_H @@ -9813,9 +9813,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vserver/sched_cmd.h linux-4.4. +extern int vc_get_prio_bias(struct vx_info *, void __user *); + +#endif /* _VSERVER_SCHED_CMD_H */ -diff -NurpP --minimal linux-4.4.197/include/linux/vserver/sched_def.h linux-4.4.197-vs2.3.9.8/include/linux/vserver/sched_def.h ---- linux-4.4.197/include/linux/vserver/sched_def.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vserver/sched_def.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vserver/sched_def.h linux-4.4.217-vs2.3.9.9/include/linux/vserver/sched_def.h +--- linux-4.4.217/include/linux/vserver/sched_def.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vserver/sched_def.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,38 @@ +#ifndef _VSERVER_SCHED_DEF_H +#define _VSERVER_SCHED_DEF_H @@ -9855,9 +9855,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vserver/sched_def.h linux-4.4. +#endif + +#endif /* _VSERVER_SCHED_DEF_H */ -diff -NurpP --minimal linux-4.4.197/include/linux/vserver/sched.h linux-4.4.197-vs2.3.9.8/include/linux/vserver/sched.h ---- linux-4.4.197/include/linux/vserver/sched.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vserver/sched.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vserver/sched.h linux-4.4.217-vs2.3.9.9/include/linux/vserver/sched.h +--- linux-4.4.217/include/linux/vserver/sched.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vserver/sched.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,23 @@ +#ifndef _VSERVER_SCHED_H +#define _VSERVER_SCHED_H @@ -9882,9 +9882,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vserver/sched.h linux-4.4.197- +#else /* _VSERVER_SCHED_H */ +#warning duplicate inclusion +#endif /* _VSERVER_SCHED_H */ -diff -NurpP --minimal linux-4.4.197/include/linux/vserver/signal_cmd.h linux-4.4.197-vs2.3.9.8/include/linux/vserver/signal_cmd.h ---- linux-4.4.197/include/linux/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vserver/signal_cmd.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vserver/signal_cmd.h linux-4.4.217-vs2.3.9.9/include/linux/vserver/signal_cmd.h +--- linux-4.4.217/include/linux/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vserver/signal_cmd.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,14 @@ +#ifndef _VSERVER_SIGNAL_CMD_H +#define _VSERVER_SIGNAL_CMD_H @@ -9900,9 +9900,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vserver/signal_cmd.h linux-4.4 +extern int vc_set_pflags(uint32_t pid, void __user *); + +#endif /* _VSERVER_SIGNAL_CMD_H */ -diff -NurpP --minimal linux-4.4.197/include/linux/vserver/signal.h linux-4.4.197-vs2.3.9.8/include/linux/vserver/signal.h ---- linux-4.4.197/include/linux/vserver/signal.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vserver/signal.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vserver/signal.h linux-4.4.217-vs2.3.9.9/include/linux/vserver/signal.h +--- linux-4.4.217/include/linux/vserver/signal.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vserver/signal.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,14 @@ +#ifndef _VSERVER_SIGNAL_H +#define _VSERVER_SIGNAL_H @@ -9918,9 +9918,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vserver/signal.h linux-4.4.197 +#else /* _VSERVER_SIGNAL_H */ +#warning duplicate inclusion +#endif /* _VSERVER_SIGNAL_H */ -diff -NurpP --minimal linux-4.4.197/include/linux/vserver/space_cmd.h linux-4.4.197-vs2.3.9.8/include/linux/vserver/space_cmd.h ---- linux-4.4.197/include/linux/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vserver/space_cmd.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vserver/space_cmd.h linux-4.4.217-vs2.3.9.9/include/linux/vserver/space_cmd.h +--- linux-4.4.217/include/linux/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vserver/space_cmd.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,13 @@ +#ifndef _VSERVER_SPACE_CMD_H +#define _VSERVER_SPACE_CMD_H @@ -9935,9 +9935,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vserver/space_cmd.h linux-4.4. +extern int vc_get_space_mask(void __user *, int); + +#endif /* _VSERVER_SPACE_CMD_H */ -diff -NurpP --minimal linux-4.4.197/include/linux/vserver/space.h linux-4.4.197-vs2.3.9.8/include/linux/vserver/space.h ---- linux-4.4.197/include/linux/vserver/space.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vserver/space.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vserver/space.h linux-4.4.217-vs2.3.9.9/include/linux/vserver/space.h +--- linux-4.4.217/include/linux/vserver/space.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vserver/space.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,12 @@ +#ifndef _VSERVER_SPACE_H +#define _VSERVER_SPACE_H @@ -9951,9 +9951,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vserver/space.h linux-4.4.197- +#else /* _VSERVER_SPACE_H */ +#warning duplicate inclusion +#endif /* _VSERVER_SPACE_H */ -diff -NurpP --minimal linux-4.4.197/include/linux/vserver/switch.h linux-4.4.197-vs2.3.9.8/include/linux/vserver/switch.h ---- linux-4.4.197/include/linux/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vserver/switch.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vserver/switch.h linux-4.4.217-vs2.3.9.9/include/linux/vserver/switch.h +--- linux-4.4.217/include/linux/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vserver/switch.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,8 @@ +#ifndef _VSERVER_SWITCH_H +#define _VSERVER_SWITCH_H @@ -9963,9 +9963,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vserver/switch.h linux-4.4.197 +#include + +#endif /* _VSERVER_SWITCH_H */ -diff -NurpP --minimal linux-4.4.197/include/linux/vserver/tag_cmd.h linux-4.4.197-vs2.3.9.8/include/linux/vserver/tag_cmd.h ---- linux-4.4.197/include/linux/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vserver/tag_cmd.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vserver/tag_cmd.h linux-4.4.217-vs2.3.9.9/include/linux/vserver/tag_cmd.h +--- linux-4.4.217/include/linux/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vserver/tag_cmd.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,10 @@ +#ifndef _VSERVER_TAG_CMD_H +#define _VSERVER_TAG_CMD_H @@ -9977,9 +9977,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vserver/tag_cmd.h linux-4.4.19 +extern int vc_tag_migrate(uint32_t); + +#endif /* _VSERVER_TAG_CMD_H */ -diff -NurpP --minimal linux-4.4.197/include/linux/vserver/tag.h linux-4.4.197-vs2.3.9.8/include/linux/vserver/tag.h ---- linux-4.4.197/include/linux/vserver/tag.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vserver/tag.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vserver/tag.h linux-4.4.217-vs2.3.9.9/include/linux/vserver/tag.h +--- linux-4.4.217/include/linux/vserver/tag.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vserver/tag.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,160 @@ +#ifndef _DX_TAG_H +#define _DX_TAG_H @@ -10141,9 +10141,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vserver/tag.h linux-4.4.197-vs +#endif + +#endif /* _DX_TAG_H */ -diff -NurpP --minimal linux-4.4.197/include/linux/vs_inet6.h linux-4.4.197-vs2.3.9.8/include/linux/vs_inet6.h ---- linux-4.4.197/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vs_inet6.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vs_inet6.h linux-4.4.217-vs2.3.9.9/include/linux/vs_inet6.h +--- linux-4.4.217/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vs_inet6.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,257 @@ +#ifndef _VS_INET6_H +#define _VS_INET6_H @@ -10402,9 +10402,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vs_inet6.h linux-4.4.197-vs2.3 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-4.4.197/include/linux/vs_inet.h linux-4.4.197-vs2.3.9.8/include/linux/vs_inet.h ---- linux-4.4.197/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vs_inet.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vs_inet.h linux-4.4.217-vs2.3.9.9/include/linux/vs_inet.h +--- linux-4.4.217/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vs_inet.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,364 @@ +#ifndef _VS_INET_H +#define _VS_INET_H @@ -10770,9 +10770,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vs_inet.h linux-4.4.197-vs2.3. +#else +// #warning duplicate inclusion +#endif -diff -NurpP --minimal linux-4.4.197/include/linux/vs_limit.h linux-4.4.197-vs2.3.9.8/include/linux/vs_limit.h ---- linux-4.4.197/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vs_limit.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vs_limit.h linux-4.4.217-vs2.3.9.9/include/linux/vs_limit.h +--- linux-4.4.217/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vs_limit.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,140 @@ +#ifndef _VS_LIMIT_H +#define _VS_LIMIT_H @@ -10914,9 +10914,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vs_limit.h linux-4.4.197-vs2.3 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-4.4.197/include/linux/vs_network.h linux-4.4.197-vs2.3.9.8/include/linux/vs_network.h ---- linux-4.4.197/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vs_network.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vs_network.h linux-4.4.217-vs2.3.9.9/include/linux/vs_network.h +--- linux-4.4.217/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vs_network.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,169 @@ +#ifndef _NX_VS_NETWORK_H +#define _NX_VS_NETWORK_H @@ -11087,9 +11087,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vs_network.h linux-4.4.197-vs2 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-4.4.197/include/linux/vs_pid.h linux-4.4.197-vs2.3.9.8/include/linux/vs_pid.h ---- linux-4.4.197/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vs_pid.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vs_pid.h linux-4.4.217-vs2.3.9.9/include/linux/vs_pid.h +--- linux-4.4.217/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vs_pid.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,50 @@ +#ifndef _VS_PID_H +#define _VS_PID_H @@ -11141,9 +11141,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vs_pid.h linux-4.4.197-vs2.3.9 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-4.4.197/include/linux/vs_sched.h linux-4.4.197-vs2.3.9.8/include/linux/vs_sched.h ---- linux-4.4.197/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vs_sched.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vs_sched.h linux-4.4.217-vs2.3.9.9/include/linux/vs_sched.h +--- linux-4.4.217/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vs_sched.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,40 @@ +#ifndef _VS_SCHED_H +#define _VS_SCHED_H @@ -11185,9 +11185,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vs_sched.h linux-4.4.197-vs2.3 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-4.4.197/include/linux/vs_socket.h linux-4.4.197-vs2.3.9.8/include/linux/vs_socket.h ---- linux-4.4.197/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vs_socket.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vs_socket.h linux-4.4.217-vs2.3.9.9/include/linux/vs_socket.h +--- linux-4.4.217/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vs_socket.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,67 @@ +#ifndef _VS_SOCKET_H +#define _VS_SOCKET_H @@ -11256,9 +11256,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vs_socket.h linux-4.4.197-vs2. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-4.4.197/include/linux/vs_tag.h linux-4.4.197-vs2.3.9.8/include/linux/vs_tag.h ---- linux-4.4.197/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vs_tag.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vs_tag.h linux-4.4.217-vs2.3.9.9/include/linux/vs_tag.h +--- linux-4.4.217/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vs_tag.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,47 @@ +#ifndef _VS_TAG_H +#define _VS_TAG_H @@ -11307,9 +11307,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vs_tag.h linux-4.4.197-vs2.3.9 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-4.4.197/include/linux/vs_time.h linux-4.4.197-vs2.3.9.8/include/linux/vs_time.h ---- linux-4.4.197/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/linux/vs_time.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/linux/vs_time.h linux-4.4.217-vs2.3.9.9/include/linux/vs_time.h +--- linux-4.4.217/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/linux/vs_time.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,19 @@ +#ifndef _VS_TIME_H +#define _VS_TIME_H @@ -11330,9 +11330,9 @@ diff -NurpP --minimal linux-4.4.197/include/linux/vs_time.h linux-4.4.197-vs2.3. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-4.4.197/include/net/addrconf.h linux-4.4.197-vs2.3.9.8/include/net/addrconf.h ---- linux-4.4.197/include/net/addrconf.h 2019-10-22 12:34:39.288582855 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/net/addrconf.h 2019-10-05 14:35:35.882754960 +0000 +diff -NurpP --minimal linux-4.4.217/include/net/addrconf.h linux-4.4.217-vs2.3.9.9/include/net/addrconf.h +--- linux-4.4.217/include/net/addrconf.h 2020-03-27 06:54:51.961825726 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/net/addrconf.h 2019-10-05 14:35:35.882754960 +0000 @@ -84,7 +84,7 @@ struct inet6_ifaddr *ipv6_get_ifaddr(str int ipv6_dev_get_saddr(struct net *net, const struct net_device *dev, @@ -11342,9 +11342,9 @@ diff -NurpP --minimal linux-4.4.197/include/net/addrconf.h linux-4.4.197-vs2.3.9 int __ipv6_get_lladdr(struct inet6_dev *idev, struct in6_addr *addr, u32 banned_flags); int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr, -diff -NurpP --minimal linux-4.4.197/include/net/af_unix.h linux-4.4.197-vs2.3.9.8/include/net/af_unix.h ---- linux-4.4.197/include/net/af_unix.h 2019-10-22 12:34:39.288582855 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/net/af_unix.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/net/af_unix.h linux-4.4.217-vs2.3.9.9/include/net/af_unix.h +--- linux-4.4.217/include/net/af_unix.h 2020-03-27 06:54:51.961825726 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/net/af_unix.h 2018-10-20 04:57:21.000000000 +0000 @@ -4,6 +4,7 @@ #include #include @@ -11353,9 +11353,9 @@ diff -NurpP --minimal linux-4.4.197/include/net/af_unix.h linux-4.4.197-vs2.3.9. #include void unix_inflight(struct user_struct *user, struct file *fp); -diff -NurpP --minimal linux-4.4.197/include/net/inet_timewait_sock.h linux-4.4.197-vs2.3.9.8/include/net/inet_timewait_sock.h ---- linux-4.4.197/include/net/inet_timewait_sock.h 2019-10-22 12:34:39.408580935 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/net/inet_timewait_sock.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/net/inet_timewait_sock.h linux-4.4.217-vs2.3.9.9/include/net/inet_timewait_sock.h +--- linux-4.4.217/include/net/inet_timewait_sock.h 2020-03-27 06:54:52.041824410 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/net/inet_timewait_sock.h 2018-10-20 04:57:21.000000000 +0000 @@ -72,6 +72,10 @@ struct inet_timewait_sock { #define tw_num __tw_common.skc_num #define tw_cookie __tw_common.skc_cookie @@ -11367,9 +11367,9 @@ diff -NurpP --minimal linux-4.4.197/include/net/inet_timewait_sock.h linux-4.4.1 int tw_timeout; volatile unsigned char tw_substate; -diff -NurpP --minimal linux-4.4.197/include/net/ip6_route.h linux-4.4.197-vs2.3.9.8/include/net/ip6_route.h ---- linux-4.4.197/include/net/ip6_route.h 2019-10-22 12:34:39.418580776 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/net/ip6_route.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/net/ip6_route.h linux-4.4.217-vs2.3.9.9/include/net/ip6_route.h +--- linux-4.4.217/include/net/ip6_route.h 2020-03-27 06:54:52.051824245 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/net/ip6_route.h 2018-10-20 04:57:21.000000000 +0000 @@ -90,7 +90,7 @@ int ip6_del_rt(struct rt6_info *); int ip6_route_get_saddr(struct net *net, struct rt6_info *rt, @@ -11379,9 +11379,9 @@ diff -NurpP --minimal linux-4.4.197/include/net/ip6_route.h linux-4.4.197-vs2.3. 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-4.4.197/include/net/route.h linux-4.4.197-vs2.3.9.8/include/net/route.h ---- linux-4.4.197/include/net/route.h 2019-10-22 12:34:39.578578219 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/net/route.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/net/route.h linux-4.4.217-vs2.3.9.9/include/net/route.h +--- linux-4.4.217/include/net/route.h 2020-03-27 06:54:52.241821118 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/net/route.h 2018-10-20 04:57:21.000000000 +0000 @@ -224,6 +224,9 @@ static inline void ip_rt_put(struct rtab dst_release(&rt->dst); } @@ -11433,9 +11433,9 @@ diff -NurpP --minimal linux-4.4.197/include/net/route.h linux-4.4.197-vs2.3.9.8/ rt = __ip_route_output_key(net, fl4); if (IS_ERR(rt)) return rt; -diff -NurpP --minimal linux-4.4.197/include/net/sock.h linux-4.4.197-vs2.3.9.8/include/net/sock.h ---- linux-4.4.197/include/net/sock.h 2019-10-22 12:34:39.628577420 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/net/sock.h 2019-10-05 14:35:36.182750203 +0000 +diff -NurpP --minimal linux-4.4.217/include/net/sock.h linux-4.4.217-vs2.3.9.9/include/net/sock.h +--- linux-4.4.217/include/net/sock.h 2020-03-27 06:54:52.321819802 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/net/sock.h 2020-04-01 09:34:46.141139341 +0000 @@ -201,6 +201,10 @@ struct sock_common { struct in6_addr skc_v6_daddr; struct in6_addr skc_v6_rcv_saddr; @@ -11461,17 +11461,17 @@ diff -NurpP --minimal linux-4.4.197/include/net/sock.h linux-4.4.197-vs2.3.9.8/i #define sk_incoming_cpu __sk_common.skc_incoming_cpu #define sk_flags __sk_common.skc_flags #define sk_rxhash __sk_common.skc_rxhash -diff -NurpP --minimal linux-4.4.197/include/uapi/Kbuild linux-4.4.197-vs2.3.9.8/include/uapi/Kbuild ---- linux-4.4.197/include/uapi/Kbuild 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/uapi/Kbuild 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/uapi/Kbuild linux-4.4.217-vs2.3.9.9/include/uapi/Kbuild +--- linux-4.4.217/include/uapi/Kbuild 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/uapi/Kbuild 2018-10-20 04:57:21.000000000 +0000 @@ -13,3 +13,4 @@ header-y += drm/ header-y += xen/ header-y += scsi/ header-y += misc/ +header-y += vserver/ -diff -NurpP --minimal linux-4.4.197/include/uapi/linux/capability.h linux-4.4.197-vs2.3.9.8/include/uapi/linux/capability.h ---- linux-4.4.197/include/uapi/linux/capability.h 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/uapi/linux/capability.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/uapi/linux/capability.h linux-4.4.217-vs2.3.9.9/include/uapi/linux/capability.h +--- linux-4.4.217/include/uapi/linux/capability.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/uapi/linux/capability.h 2018-10-20 04:57:21.000000000 +0000 @@ -259,6 +259,7 @@ struct vfs_cap_data { arbitrary SCSI commands */ /* Allow setting encryption key on loopback filesystem */ @@ -11494,9 +11494,9 @@ diff -NurpP --minimal linux-4.4.197/include/uapi/linux/capability.h linux-4.4.19 /* * Bit location of each capability (used by user-space library and kernel) -diff -NurpP --minimal linux-4.4.197/include/uapi/linux/fs.h linux-4.4.197-vs2.3.9.8/include/uapi/linux/fs.h ---- linux-4.4.197/include/uapi/linux/fs.h 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/uapi/linux/fs.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/uapi/linux/fs.h linux-4.4.217-vs2.3.9.9/include/uapi/linux/fs.h +--- linux-4.4.217/include/uapi/linux/fs.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/uapi/linux/fs.h 2018-10-20 04:57:21.000000000 +0000 @@ -91,6 +91,9 @@ struct inodes_stat_t { #define MS_I_VERSION (1<<23) /* Update inode I_version field */ #define MS_STRICTATIME (1<<24) /* Always perform atime updates */ @@ -11525,9 +11525,9 @@ diff -NurpP --minimal linux-4.4.197/include/uapi/linux/fs.h linux-4.4.197-vs2.3. #define SYNC_FILE_RANGE_WAIT_BEFORE 1 #define SYNC_FILE_RANGE_WRITE 2 -diff -NurpP --minimal linux-4.4.197/include/uapi/linux/gfs2_ondisk.h linux-4.4.197-vs2.3.9.8/include/uapi/linux/gfs2_ondisk.h ---- linux-4.4.197/include/uapi/linux/gfs2_ondisk.h 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/uapi/linux/gfs2_ondisk.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/uapi/linux/gfs2_ondisk.h linux-4.4.217-vs2.3.9.9/include/uapi/linux/gfs2_ondisk.h +--- linux-4.4.217/include/uapi/linux/gfs2_ondisk.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/uapi/linux/gfs2_ondisk.h 2018-10-20 04:57:21.000000000 +0000 @@ -225,6 +225,9 @@ enum { gfs2fl_Sync = 8, gfs2fl_System = 9, @@ -11548,9 +11548,9 @@ diff -NurpP --minimal linux-4.4.197/include/uapi/linux/gfs2_ondisk.h linux-4.4.1 #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-4.4.197/include/uapi/linux/if_tun.h linux-4.4.197-vs2.3.9.8/include/uapi/linux/if_tun.h ---- linux-4.4.197/include/uapi/linux/if_tun.h 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/uapi/linux/if_tun.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/uapi/linux/if_tun.h linux-4.4.217-vs2.3.9.9/include/uapi/linux/if_tun.h +--- linux-4.4.217/include/uapi/linux/if_tun.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/uapi/linux/if_tun.h 2018-10-20 04:57:21.000000000 +0000 @@ -56,6 +56,7 @@ */ #define TUNSETVNETBE _IOW('T', 222, int) @@ -11559,9 +11559,9 @@ diff -NurpP --minimal linux-4.4.197/include/uapi/linux/if_tun.h linux-4.4.197-vs /* TUNSETIFF ifr flags */ #define IFF_TUN 0x0001 -diff -NurpP --minimal linux-4.4.197/include/uapi/linux/major.h linux-4.4.197-vs2.3.9.8/include/uapi/linux/major.h ---- linux-4.4.197/include/uapi/linux/major.h 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/uapi/linux/major.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/uapi/linux/major.h linux-4.4.217-vs2.3.9.9/include/uapi/linux/major.h +--- linux-4.4.217/include/uapi/linux/major.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/uapi/linux/major.h 2018-10-20 04:57:21.000000000 +0000 @@ -15,6 +15,7 @@ #define HD_MAJOR IDE0_MAJOR #define PTY_SLAVE_MAJOR 3 @@ -11570,9 +11570,9 @@ diff -NurpP --minimal linux-4.4.197/include/uapi/linux/major.h linux-4.4.197-vs2 #define TTYAUX_MAJOR 5 #define LP_MAJOR 6 #define VCS_MAJOR 7 -diff -NurpP --minimal linux-4.4.197/include/uapi/linux/nfs_mount.h linux-4.4.197-vs2.3.9.8/include/uapi/linux/nfs_mount.h ---- linux-4.4.197/include/uapi/linux/nfs_mount.h 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/uapi/linux/nfs_mount.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/uapi/linux/nfs_mount.h linux-4.4.217-vs2.3.9.9/include/uapi/linux/nfs_mount.h +--- linux-4.4.217/include/uapi/linux/nfs_mount.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/uapi/linux/nfs_mount.h 2018-10-20 04:57:21.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 */ @@ -11583,9 +11583,9 @@ diff -NurpP --minimal linux-4.4.197/include/uapi/linux/nfs_mount.h linux-4.4.197 /* The following are for internal use only */ #define NFS_MOUNT_LOOKUP_CACHE_NONEG 0x10000 -diff -NurpP --minimal linux-4.4.197/include/uapi/linux/reboot.h linux-4.4.197-vs2.3.9.8/include/uapi/linux/reboot.h ---- linux-4.4.197/include/uapi/linux/reboot.h 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/uapi/linux/reboot.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/uapi/linux/reboot.h linux-4.4.217-vs2.3.9.9/include/uapi/linux/reboot.h +--- linux-4.4.217/include/uapi/linux/reboot.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/uapi/linux/reboot.h 2018-10-20 04:57:21.000000000 +0000 @@ -33,7 +33,7 @@ #define LINUX_REBOOT_CMD_RESTART2 0xA1B2C3D4 #define LINUX_REBOOT_CMD_SW_SUSPEND 0xD000FCE2 @@ -11595,9 +11595,9 @@ diff -NurpP --minimal linux-4.4.197/include/uapi/linux/reboot.h linux-4.4.197-vs #endif /* _UAPI_LINUX_REBOOT_H */ -diff -NurpP --minimal linux-4.4.197/include/uapi/linux/sysctl.h linux-4.4.197-vs2.3.9.8/include/uapi/linux/sysctl.h ---- linux-4.4.197/include/uapi/linux/sysctl.h 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/uapi/linux/sysctl.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/uapi/linux/sysctl.h linux-4.4.217-vs2.3.9.9/include/uapi/linux/sysctl.h +--- linux-4.4.217/include/uapi/linux/sysctl.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/uapi/linux/sysctl.h 2018-10-20 04:57:21.000000000 +0000 @@ -60,6 +60,7 @@ enum CTL_ABI=9, /* Binary emulation */ CTL_CPU=10, /* CPU stuff (speed scaling, etc) */ @@ -11614,9 +11614,9 @@ diff -NurpP --minimal linux-4.4.197/include/uapi/linux/sysctl.h linux-4.4.197-vs KERN_SPARC_REBOOT=21, /* reboot command on Sparc */ KERN_CTLALTDEL=22, /* int: allow ctl-alt-del to reboot */ -diff -NurpP --minimal linux-4.4.197/include/uapi/vserver/cacct_cmd.h linux-4.4.197-vs2.3.9.8/include/uapi/vserver/cacct_cmd.h ---- linux-4.4.197/include/uapi/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/uapi/vserver/cacct_cmd.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/uapi/vserver/cacct_cmd.h linux-4.4.217-vs2.3.9.9/include/uapi/vserver/cacct_cmd.h +--- linux-4.4.217/include/uapi/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/uapi/vserver/cacct_cmd.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,15 @@ +#ifndef _UAPI_VS_CACCT_CMD_H +#define _UAPI_VS_CACCT_CMD_H @@ -11633,9 +11633,9 @@ diff -NurpP --minimal linux-4.4.197/include/uapi/vserver/cacct_cmd.h linux-4.4.1 +}; + +#endif /* _UAPI_VS_CACCT_CMD_H */ -diff -NurpP --minimal linux-4.4.197/include/uapi/vserver/context_cmd.h linux-4.4.197-vs2.3.9.8/include/uapi/vserver/context_cmd.h ---- linux-4.4.197/include/uapi/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/uapi/vserver/context_cmd.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/uapi/vserver/context_cmd.h linux-4.4.217-vs2.3.9.9/include/uapi/vserver/context_cmd.h +--- linux-4.4.217/include/uapi/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/uapi/vserver/context_cmd.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,115 @@ +#ifndef _UAPI_VS_CONTEXT_CMD_H +#define _UAPI_VS_CONTEXT_CMD_H @@ -11752,9 +11752,9 @@ diff -NurpP --minimal linux-4.4.197/include/uapi/vserver/context_cmd.h linux-4.4 +}; + +#endif /* _UAPI_VS_CONTEXT_CMD_H */ -diff -NurpP --minimal linux-4.4.197/include/uapi/vserver/context.h linux-4.4.197-vs2.3.9.8/include/uapi/vserver/context.h ---- linux-4.4.197/include/uapi/vserver/context.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/uapi/vserver/context.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/uapi/vserver/context.h linux-4.4.217-vs2.3.9.9/include/uapi/vserver/context.h +--- linux-4.4.217/include/uapi/vserver/context.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/uapi/vserver/context.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,81 @@ +#ifndef _UAPI_VS_CONTEXT_H +#define _UAPI_VS_CONTEXT_H @@ -11837,9 +11837,9 @@ diff -NurpP --minimal linux-4.4.197/include/uapi/vserver/context.h linux-4.4.197 +#define VXC_NAMESPACE 0x02000000 + +#endif /* _UAPI_VS_CONTEXT_H */ -diff -NurpP --minimal linux-4.4.197/include/uapi/vserver/cvirt_cmd.h linux-4.4.197-vs2.3.9.8/include/uapi/vserver/cvirt_cmd.h ---- linux-4.4.197/include/uapi/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/uapi/vserver/cvirt_cmd.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/uapi/vserver/cvirt_cmd.h linux-4.4.217-vs2.3.9.9/include/uapi/vserver/cvirt_cmd.h +--- linux-4.4.217/include/uapi/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/uapi/vserver/cvirt_cmd.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,41 @@ +#ifndef _UAPI_VS_CVIRT_CMD_H +#define _UAPI_VS_CVIRT_CMD_H @@ -11882,9 +11882,9 @@ diff -NurpP --minimal linux-4.4.197/include/uapi/vserver/cvirt_cmd.h linux-4.4.1 +}; + +#endif /* _UAPI_VS_CVIRT_CMD_H */ -diff -NurpP --minimal linux-4.4.197/include/uapi/vserver/debug_cmd.h linux-4.4.197-vs2.3.9.8/include/uapi/vserver/debug_cmd.h ---- linux-4.4.197/include/uapi/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/uapi/vserver/debug_cmd.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/uapi/vserver/debug_cmd.h linux-4.4.217-vs2.3.9.9/include/uapi/vserver/debug_cmd.h +--- linux-4.4.217/include/uapi/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/uapi/vserver/debug_cmd.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,24 @@ +#ifndef _UAPI_VS_DEBUG_CMD_H +#define _UAPI_VS_DEBUG_CMD_H @@ -11910,9 +11910,9 @@ diff -NurpP --minimal linux-4.4.197/include/uapi/vserver/debug_cmd.h linux-4.4.1 +}; + +#endif /* _UAPI_VS_DEBUG_CMD_H */ -diff -NurpP --minimal linux-4.4.197/include/uapi/vserver/device_cmd.h linux-4.4.197-vs2.3.9.8/include/uapi/vserver/device_cmd.h ---- linux-4.4.197/include/uapi/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/uapi/vserver/device_cmd.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/uapi/vserver/device_cmd.h linux-4.4.217-vs2.3.9.9/include/uapi/vserver/device_cmd.h +--- linux-4.4.217/include/uapi/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/uapi/vserver/device_cmd.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,16 @@ +#ifndef _UAPI_VS_DEVICE_CMD_H +#define _UAPI_VS_DEVICE_CMD_H @@ -11930,9 +11930,9 @@ diff -NurpP --minimal linux-4.4.197/include/uapi/vserver/device_cmd.h linux-4.4. +}; + +#endif /* _UAPI_VS_DEVICE_CMD_H */ -diff -NurpP --minimal linux-4.4.197/include/uapi/vserver/device.h linux-4.4.197-vs2.3.9.8/include/uapi/vserver/device.h ---- linux-4.4.197/include/uapi/vserver/device.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/uapi/vserver/device.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/uapi/vserver/device.h linux-4.4.217-vs2.3.9.9/include/uapi/vserver/device.h +--- linux-4.4.217/include/uapi/vserver/device.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/uapi/vserver/device.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,12 @@ +#ifndef _UAPI_VS_DEVICE_H +#define _UAPI_VS_DEVICE_H @@ -11946,9 +11946,9 @@ diff -NurpP --minimal linux-4.4.197/include/uapi/vserver/device.h linux-4.4.197- +#define DATTR_MASK 0x00000013 + +#endif /* _UAPI_VS_DEVICE_H */ -diff -NurpP --minimal linux-4.4.197/include/uapi/vserver/dlimit_cmd.h linux-4.4.197-vs2.3.9.8/include/uapi/vserver/dlimit_cmd.h ---- linux-4.4.197/include/uapi/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/uapi/vserver/dlimit_cmd.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/uapi/vserver/dlimit_cmd.h linux-4.4.217-vs2.3.9.9/include/uapi/vserver/dlimit_cmd.h +--- linux-4.4.217/include/uapi/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/uapi/vserver/dlimit_cmd.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,67 @@ +#ifndef _UAPI_VS_DLIMIT_CMD_H +#define _UAPI_VS_DLIMIT_CMD_H @@ -12017,9 +12017,9 @@ diff -NurpP --minimal linux-4.4.197/include/uapi/vserver/dlimit_cmd.h linux-4.4. +} + +#endif /* _UAPI_VS_DLIMIT_CMD_H */ -diff -NurpP --minimal linux-4.4.197/include/uapi/vserver/inode_cmd.h linux-4.4.197-vs2.3.9.8/include/uapi/vserver/inode_cmd.h ---- linux-4.4.197/include/uapi/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/uapi/vserver/inode_cmd.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/uapi/vserver/inode_cmd.h linux-4.4.217-vs2.3.9.9/include/uapi/vserver/inode_cmd.h +--- linux-4.4.217/include/uapi/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/uapi/vserver/inode_cmd.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,26 @@ +#ifndef _UAPI_VS_INODE_CMD_H +#define _UAPI_VS_INODE_CMD_H @@ -12047,9 +12047,9 @@ diff -NurpP --minimal linux-4.4.197/include/uapi/vserver/inode_cmd.h linux-4.4.1 +}; + +#endif /* _UAPI_VS_INODE_CMD_H */ -diff -NurpP --minimal linux-4.4.197/include/uapi/vserver/inode.h linux-4.4.197-vs2.3.9.8/include/uapi/vserver/inode.h ---- linux-4.4.197/include/uapi/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/uapi/vserver/inode.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/uapi/vserver/inode.h linux-4.4.217-vs2.3.9.9/include/uapi/vserver/inode.h +--- linux-4.4.217/include/uapi/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/uapi/vserver/inode.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,23 @@ +#ifndef _UAPI_VS_INODE_H +#define _UAPI_VS_INODE_H @@ -12074,9 +12074,9 @@ diff -NurpP --minimal linux-4.4.197/include/uapi/vserver/inode.h linux-4.4.197-v +#define FIOC_SETXFLG _IOW('x', 6, long) + +#endif /* _UAPI_VS_INODE_H */ -diff -NurpP --minimal linux-4.4.197/include/uapi/vserver/Kbuild linux-4.4.197-vs2.3.9.8/include/uapi/vserver/Kbuild ---- linux-4.4.197/include/uapi/vserver/Kbuild 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/uapi/vserver/Kbuild 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/uapi/vserver/Kbuild linux-4.4.217-vs2.3.9.9/include/uapi/vserver/Kbuild +--- linux-4.4.217/include/uapi/vserver/Kbuild 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/uapi/vserver/Kbuild 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,9 @@ + +header-y += context_cmd.h network_cmd.h space_cmd.h \ @@ -12087,9 +12087,9 @@ diff -NurpP --minimal linux-4.4.197/include/uapi/vserver/Kbuild linux-4.4.197-vs +header-y += switch.h context.h network.h monitor.h \ + limit.h inode.h device.h + -diff -NurpP --minimal linux-4.4.197/include/uapi/vserver/limit_cmd.h linux-4.4.197-vs2.3.9.8/include/uapi/vserver/limit_cmd.h ---- linux-4.4.197/include/uapi/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/uapi/vserver/limit_cmd.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/uapi/vserver/limit_cmd.h linux-4.4.217-vs2.3.9.9/include/uapi/vserver/limit_cmd.h +--- linux-4.4.217/include/uapi/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/uapi/vserver/limit_cmd.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,40 @@ +#ifndef _UAPI_VS_LIMIT_CMD_H +#define _UAPI_VS_LIMIT_CMD_H @@ -12131,9 +12131,9 @@ diff -NurpP --minimal linux-4.4.197/include/uapi/vserver/limit_cmd.h linux-4.4.1 +#define CRLIM_KEEP (~1ULL) + +#endif /* _UAPI_VS_LIMIT_CMD_H */ -diff -NurpP --minimal linux-4.4.197/include/uapi/vserver/limit.h linux-4.4.197-vs2.3.9.8/include/uapi/vserver/limit.h ---- linux-4.4.197/include/uapi/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/uapi/vserver/limit.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/uapi/vserver/limit.h linux-4.4.217-vs2.3.9.9/include/uapi/vserver/limit.h +--- linux-4.4.217/include/uapi/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/uapi/vserver/limit.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,14 @@ +#ifndef _UAPI_VS_LIMIT_H +#define _UAPI_VS_LIMIT_H @@ -12149,9 +12149,9 @@ diff -NurpP --minimal linux-4.4.197/include/uapi/vserver/limit.h linux-4.4.197-v +#define VLIMIT_MAPPED 23 + +#endif /* _UAPI_VS_LIMIT_H */ -diff -NurpP --minimal linux-4.4.197/include/uapi/vserver/monitor.h linux-4.4.197-vs2.3.9.8/include/uapi/vserver/monitor.h ---- linux-4.4.197/include/uapi/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/uapi/vserver/monitor.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/uapi/vserver/monitor.h linux-4.4.217-vs2.3.9.9/include/uapi/vserver/monitor.h +--- linux-4.4.217/include/uapi/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/uapi/vserver/monitor.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,96 @@ +#ifndef _UAPI_VS_MONITOR_H +#define _UAPI_VS_MONITOR_H @@ -12249,9 +12249,9 @@ diff -NurpP --minimal linux-4.4.197/include/uapi/vserver/monitor.h linux-4.4.197 +}; + +#endif /* _UAPI_VS_MONITOR_H */ -diff -NurpP --minimal linux-4.4.197/include/uapi/vserver/network_cmd.h linux-4.4.197-vs2.3.9.8/include/uapi/vserver/network_cmd.h ---- linux-4.4.197/include/uapi/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/uapi/vserver/network_cmd.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/uapi/vserver/network_cmd.h linux-4.4.217-vs2.3.9.9/include/uapi/vserver/network_cmd.h +--- linux-4.4.217/include/uapi/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/uapi/vserver/network_cmd.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,123 @@ +#ifndef _UAPI_VS_NETWORK_CMD_H +#define _UAPI_VS_NETWORK_CMD_H @@ -12376,9 +12376,9 @@ diff -NurpP --minimal linux-4.4.197/include/uapi/vserver/network_cmd.h linux-4.4 +}; + +#endif /* _UAPI_VS_NETWORK_CMD_H */ -diff -NurpP --minimal linux-4.4.197/include/uapi/vserver/network.h linux-4.4.197-vs2.3.9.8/include/uapi/vserver/network.h ---- linux-4.4.197/include/uapi/vserver/network.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/uapi/vserver/network.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/uapi/vserver/network.h linux-4.4.217-vs2.3.9.9/include/uapi/vserver/network.h +--- linux-4.4.217/include/uapi/vserver/network.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/uapi/vserver/network.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,76 @@ +#ifndef _UAPI_VS_NETWORK_H +#define _UAPI_VS_NETWORK_H @@ -12456,9 +12456,9 @@ diff -NurpP --minimal linux-4.4.197/include/uapi/vserver/network.h linux-4.4.197 +#define NXA_MASK_SHOW (NXA_MASK_ALL | NXA_LOOPBACK) + +#endif /* _UAPI_VS_NETWORK_H */ -diff -NurpP --minimal linux-4.4.197/include/uapi/vserver/sched_cmd.h linux-4.4.197-vs2.3.9.8/include/uapi/vserver/sched_cmd.h ---- linux-4.4.197/include/uapi/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/uapi/vserver/sched_cmd.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/uapi/vserver/sched_cmd.h linux-4.4.217-vs2.3.9.9/include/uapi/vserver/sched_cmd.h +--- linux-4.4.217/include/uapi/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/uapi/vserver/sched_cmd.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,13 @@ +#ifndef _UAPI_VS_SCHED_CMD_H +#define _UAPI_VS_SCHED_CMD_H @@ -12473,9 +12473,9 @@ diff -NurpP --minimal linux-4.4.197/include/uapi/vserver/sched_cmd.h linux-4.4.1 +#define VCMD_get_prio_bias VC_CMD(SCHED, 5, 0) + +#endif /* _UAPI_VS_SCHED_CMD_H */ -diff -NurpP --minimal linux-4.4.197/include/uapi/vserver/signal_cmd.h linux-4.4.197-vs2.3.9.8/include/uapi/vserver/signal_cmd.h ---- linux-4.4.197/include/uapi/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/uapi/vserver/signal_cmd.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/uapi/vserver/signal_cmd.h linux-4.4.217-vs2.3.9.9/include/uapi/vserver/signal_cmd.h +--- linux-4.4.217/include/uapi/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/uapi/vserver/signal_cmd.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,31 @@ +#ifndef _UAPI_VS_SIGNAL_CMD_H +#define _UAPI_VS_SIGNAL_CMD_H @@ -12508,9 +12508,9 @@ diff -NurpP --minimal linux-4.4.197/include/uapi/vserver/signal_cmd.h linux-4.4. +}; + +#endif /* _UAPI_VS_SIGNAL_CMD_H */ -diff -NurpP --minimal linux-4.4.197/include/uapi/vserver/space_cmd.h linux-4.4.197-vs2.3.9.8/include/uapi/vserver/space_cmd.h ---- linux-4.4.197/include/uapi/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/uapi/vserver/space_cmd.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/uapi/vserver/space_cmd.h linux-4.4.217-vs2.3.9.9/include/uapi/vserver/space_cmd.h +--- linux-4.4.217/include/uapi/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/uapi/vserver/space_cmd.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,28 @@ +#ifndef _UAPI_VS_SPACE_CMD_H +#define _UAPI_VS_SPACE_CMD_H @@ -12540,9 +12540,9 @@ diff -NurpP --minimal linux-4.4.197/include/uapi/vserver/space_cmd.h linux-4.4.1 +}; + +#endif /* _UAPI_VS_SPACE_CMD_H */ -diff -NurpP --minimal linux-4.4.197/include/uapi/vserver/switch.h linux-4.4.197-vs2.3.9.8/include/uapi/vserver/switch.h ---- linux-4.4.197/include/uapi/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/uapi/vserver/switch.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/uapi/vserver/switch.h linux-4.4.217-vs2.3.9.9/include/uapi/vserver/switch.h +--- linux-4.4.217/include/uapi/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/uapi/vserver/switch.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,90 @@ +#ifndef _UAPI_VS_SWITCH_H +#define _UAPI_VS_SWITCH_H @@ -12634,9 +12634,9 @@ diff -NurpP --minimal linux-4.4.197/include/uapi/vserver/switch.h linux-4.4.197- +#define VCMD_get_vci VC_CMD(VERSION, 1, 0) + +#endif /* _UAPI_VS_SWITCH_H */ -diff -NurpP --minimal linux-4.4.197/include/uapi/vserver/tag_cmd.h linux-4.4.197-vs2.3.9.8/include/uapi/vserver/tag_cmd.h ---- linux-4.4.197/include/uapi/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/include/uapi/vserver/tag_cmd.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/include/uapi/vserver/tag_cmd.h linux-4.4.217-vs2.3.9.9/include/uapi/vserver/tag_cmd.h +--- linux-4.4.217/include/uapi/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/include/uapi/vserver/tag_cmd.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,14 @@ +#ifndef _UAPI_VS_TAG_CMD_H +#define _UAPI_VS_TAG_CMD_H @@ -12652,10 +12652,10 @@ diff -NurpP --minimal linux-4.4.197/include/uapi/vserver/tag_cmd.h linux-4.4.197 +#define VCMD_tag_migrate VC_CMD(TAGMIG, 1, 0) + +#endif /* _UAPI_VS_TAG_CMD_H */ -diff -NurpP --minimal linux-4.4.197/init/Kconfig linux-4.4.197-vs2.3.9.8/init/Kconfig ---- linux-4.4.197/init/Kconfig 2019-10-22 12:34:40.648561123 +0000 -+++ linux-4.4.197-vs2.3.9.8/init/Kconfig 2018-10-20 04:57:21.000000000 +0000 -@@ -927,6 +927,7 @@ config NUMA_BALANCING_DEFAULT_ENABLED +diff -NurpP --minimal linux-4.4.217/init/Kconfig linux-4.4.217-vs2.3.9.9/init/Kconfig +--- linux-4.4.217/init/Kconfig 2020-03-27 06:54:53.001808615 +0000 ++++ linux-4.4.217-vs2.3.9.9/init/Kconfig 2020-04-01 09:34:46.471133876 +0000 +@@ -937,6 +937,7 @@ config NUMA_BALANCING_DEFAULT_ENABLED menuconfig CGROUPS bool "Control Group support" select KERNFS @@ -12663,9 +12663,9 @@ diff -NurpP --minimal linux-4.4.197/init/Kconfig linux-4.4.197-vs2.3.9.8/init/Kc help This option adds support for grouping sets of processes together, for use with process control subsystems such as Cpusets, CFS, memory -diff -NurpP --minimal linux-4.4.197/init/main.c linux-4.4.197-vs2.3.9.8/init/main.c ---- linux-4.4.197/init/main.c 2019-10-22 12:34:40.648561123 +0000 -+++ linux-4.4.197-vs2.3.9.8/init/main.c 2019-10-05 14:35:36.472745602 +0000 +diff -NurpP --minimal linux-4.4.217/init/main.c linux-4.4.217-vs2.3.9.9/init/main.c +--- linux-4.4.217/init/main.c 2020-03-27 06:54:53.021808286 +0000 ++++ linux-4.4.217-vs2.3.9.9/init/main.c 2019-10-05 14:35:36.472745602 +0000 @@ -82,6 +82,7 @@ #include #include @@ -12674,9 +12674,9 @@ diff -NurpP --minimal linux-4.4.197/init/main.c linux-4.4.197-vs2.3.9.8/init/mai #include #include -diff -NurpP --minimal linux-4.4.197/ipc/mqueue.c linux-4.4.197-vs2.3.9.8/ipc/mqueue.c ---- linux-4.4.197/ipc/mqueue.c 2019-10-22 12:34:40.688560482 +0000 -+++ linux-4.4.197-vs2.3.9.8/ipc/mqueue.c 2019-10-05 14:39:58.588586269 +0000 +diff -NurpP --minimal linux-4.4.217/ipc/mqueue.c linux-4.4.217-vs2.3.9.9/ipc/mqueue.c +--- linux-4.4.217/ipc/mqueue.c 2020-03-27 06:54:53.051807793 +0000 ++++ linux-4.4.217-vs2.3.9.9/ipc/mqueue.c 2019-10-05 14:39:58.588586269 +0000 @@ -35,6 +35,8 @@ #include #include @@ -12756,9 +12756,9 @@ diff -NurpP --minimal linux-4.4.197/ipc/mqueue.c linux-4.4.197-vs2.3.9.8/ipc/mqu free_uid(user); } if (ipc_ns) -diff -NurpP --minimal linux-4.4.197/ipc/msg.c linux-4.4.197-vs2.3.9.8/ipc/msg.c ---- linux-4.4.197/ipc/msg.c 2019-10-22 12:34:40.708560162 +0000 -+++ linux-4.4.197-vs2.3.9.8/ipc/msg.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/ipc/msg.c linux-4.4.217-vs2.3.9.9/ipc/msg.c +--- linux-4.4.217/ipc/msg.c 2020-03-27 06:54:53.061807631 +0000 ++++ linux-4.4.217-vs2.3.9.9/ipc/msg.c 2018-10-20 04:57:21.000000000 +0000 @@ -37,6 +37,7 @@ #include #include @@ -12775,9 +12775,9 @@ diff -NurpP --minimal linux-4.4.197/ipc/msg.c linux-4.4.197-vs2.3.9.8/ipc/msg.c msq->q_perm.security = NULL; retval = security_msg_queue_alloc(msq); -diff -NurpP --minimal linux-4.4.197/ipc/sem.c linux-4.4.197-vs2.3.9.8/ipc/sem.c ---- linux-4.4.197/ipc/sem.c 2019-10-22 12:34:40.728559842 +0000 -+++ linux-4.4.197-vs2.3.9.8/ipc/sem.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/ipc/sem.c linux-4.4.217-vs2.3.9.9/ipc/sem.c +--- linux-4.4.217/ipc/sem.c 2020-03-27 06:54:53.081807299 +0000 ++++ linux-4.4.217-vs2.3.9.9/ipc/sem.c 2020-04-01 09:34:46.531132882 +0000 @@ -85,6 +85,8 @@ #include #include @@ -12815,9 +12815,9 @@ diff -NurpP --minimal linux-4.4.197/ipc/sem.c linux-4.4.197-vs2.3.9.8/ipc/sem.c ipc_rcu_putref(sma, sem_rcu_free); } -diff -NurpP --minimal linux-4.4.197/ipc/shm.c linux-4.4.197-vs2.3.9.8/ipc/shm.c ---- linux-4.4.197/ipc/shm.c 2019-10-22 12:34:40.738559683 +0000 -+++ linux-4.4.197-vs2.3.9.8/ipc/shm.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/ipc/shm.c linux-4.4.217-vs2.3.9.9/ipc/shm.c +--- linux-4.4.217/ipc/shm.c 2020-03-27 06:54:53.081807299 +0000 ++++ linux-4.4.217-vs2.3.9.9/ipc/shm.c 2018-10-20 04:57:21.000000000 +0000 @@ -42,6 +42,8 @@ #include #include @@ -12875,9 +12875,9 @@ diff -NurpP --minimal linux-4.4.197/ipc/shm.c linux-4.4.197-vs2.3.9.8/ipc/shm.c return error; no_id: -diff -NurpP --minimal linux-4.4.197/kernel/auditsc.c linux-4.4.197-vs2.3.9.8/kernel/auditsc.c ---- linux-4.4.197/kernel/auditsc.c 2019-10-22 12:34:40.828558245 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/auditsc.c 2018-10-20 05:50:20.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/auditsc.c linux-4.4.217-vs2.3.9.9/kernel/auditsc.c +--- linux-4.4.217/kernel/auditsc.c 2020-03-27 06:54:53.141806315 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/auditsc.c 2020-04-01 09:34:46.601131722 +0000 @@ -1964,7 +1964,7 @@ static int audit_set_loginuid_perm(kuid_ if (is_audit_feature_set(AUDIT_FEATURE_LOGINUID_IMMUTABLE)) return -EPERM; @@ -12887,9 +12887,9 @@ diff -NurpP --minimal linux-4.4.197/kernel/auditsc.c linux-4.4.197-vs2.3.9.8/ker 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-4.4.197/kernel/capability.c linux-4.4.197-vs2.3.9.8/kernel/capability.c ---- linux-4.4.197/kernel/capability.c 2019-10-22 12:34:40.908556969 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/capability.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/capability.c linux-4.4.217-vs2.3.9.9/kernel/capability.c +--- linux-4.4.217/kernel/capability.c 2020-03-27 06:54:53.211805161 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/capability.c 2018-10-20 04:57:21.000000000 +0000 @@ -17,6 +17,7 @@ #include #include @@ -12915,9 +12915,9 @@ diff -NurpP --minimal linux-4.4.197/kernel/capability.c linux-4.4.197-vs2.3.9.8/ /** * has_capability_noaudit - Does a task have a capability (unaudited) in the * initial user ns -diff -NurpP --minimal linux-4.4.197/kernel/compat.c linux-4.4.197-vs2.3.9.8/kernel/compat.c ---- linux-4.4.197/kernel/compat.c 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/compat.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/compat.c linux-4.4.217-vs2.3.9.9/kernel/compat.c +--- linux-4.4.217/kernel/compat.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/compat.c 2018-10-20 04:57:21.000000000 +0000 @@ -27,6 +27,7 @@ #include #include @@ -12935,9 +12935,9 @@ diff -NurpP --minimal linux-4.4.197/kernel/compat.c linux-4.4.197-vs2.3.9.8/kern return 0; } -diff -NurpP --minimal linux-4.4.197/kernel/cred.c linux-4.4.197-vs2.3.9.8/kernel/cred.c ---- linux-4.4.197/kernel/cred.c 2019-10-22 12:34:40.968556008 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/cred.c 2019-10-05 14:35:36.762741001 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/cred.c linux-4.4.217-vs2.3.9.9/kernel/cred.c +--- linux-4.4.217/kernel/cred.c 2020-03-27 06:54:53.261804338 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/cred.c 2019-10-05 14:35:36.762741001 +0000 @@ -64,31 +64,6 @@ struct cred init_cred = { .group_info = &init_groups, }; @@ -13007,9 +13007,9 @@ diff -NurpP --minimal linux-4.4.197/kernel/cred.c linux-4.4.197-vs2.3.9.8/kernel EXPORT_SYMBOL(prepare_creds); /* -diff -NurpP --minimal linux-4.4.197/kernel/exit.c linux-4.4.197-vs2.3.9.8/kernel/exit.c ---- linux-4.4.197/kernel/exit.c 2019-10-22 12:34:41.168552811 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/exit.c 2019-02-24 12:45:10.423538525 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/exit.c linux-4.4.217-vs2.3.9.9/kernel/exit.c +--- linux-4.4.217/kernel/exit.c 2020-03-27 06:54:53.411801873 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/exit.c 2019-02-24 12:45:10.423538525 +0000 @@ -48,6 +48,10 @@ #include #include @@ -13122,9 +13122,9 @@ diff -NurpP --minimal linux-4.4.197/kernel/exit.c linux-4.4.197-vs2.3.9.8/kernel BUG(); /* Avoid "noreturn function does return". */ for (;;) -diff -NurpP --minimal linux-4.4.197/kernel/fork.c linux-4.4.197-vs2.3.9.8/kernel/fork.c ---- linux-4.4.197/kernel/fork.c 2019-10-22 12:34:41.168552811 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/fork.c 2019-10-22 13:45:50.680817558 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/fork.c linux-4.4.217-vs2.3.9.9/kernel/fork.c +--- linux-4.4.217/kernel/fork.c 2020-03-27 06:54:53.411801873 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/fork.c 2019-10-22 13:45:50.680817558 +0000 @@ -76,6 +76,9 @@ #include #include @@ -13185,9 +13185,9 @@ diff -NurpP --minimal linux-4.4.197/kernel/fork.c linux-4.4.197-vs2.3.9.8/kernel write_unlock_irq(&tasklist_lock); proc_fork_connector(p); -diff -NurpP --minimal linux-4.4.197/kernel/kthread.c linux-4.4.197-vs2.3.9.8/kernel/kthread.c ---- linux-4.4.197/kernel/kthread.c 2019-10-22 12:34:41.318550415 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/kthread.c 2018-10-20 05:50:20.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/kthread.c linux-4.4.217-vs2.3.9.9/kernel/kthread.c +--- linux-4.4.217/kernel/kthread.c 2020-03-27 06:54:53.571799241 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/kthread.c 2018-10-20 05:50:20.000000000 +0000 @@ -19,6 +19,7 @@ #include #include @@ -13196,9 +13196,9 @@ diff -NurpP --minimal linux-4.4.197/kernel/kthread.c linux-4.4.197-vs2.3.9.8/ker #include static DEFINE_SPINLOCK(kthread_create_lock); -diff -NurpP --minimal linux-4.4.197/kernel/Makefile linux-4.4.197-vs2.3.9.8/kernel/Makefile ---- linux-4.4.197/kernel/Makefile 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/Makefile 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/Makefile linux-4.4.217-vs2.3.9.9/kernel/Makefile +--- linux-4.4.217/kernel/Makefile 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/Makefile 2018-10-20 04:57:21.000000000 +0000 @@ -29,6 +29,7 @@ obj-y += printk/ obj-y += irq/ obj-y += rcu/ @@ -13207,9 +13207,9 @@ diff -NurpP --minimal linux-4.4.197/kernel/Makefile linux-4.4.197-vs2.3.9.8/kern obj-$(CONFIG_CHECKPOINT_RESTORE) += kcmp.o obj-$(CONFIG_FREEZER) += freezer.o -diff -NurpP --minimal linux-4.4.197/kernel/nsproxy.c linux-4.4.197-vs2.3.9.8/kernel/nsproxy.c ---- linux-4.4.197/kernel/nsproxy.c 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/nsproxy.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/nsproxy.c linux-4.4.217-vs2.3.9.9/kernel/nsproxy.c +--- linux-4.4.217/kernel/nsproxy.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/nsproxy.c 2018-10-20 04:57:21.000000000 +0000 @@ -20,11 +20,14 @@ #include #include @@ -13394,9 +13394,9 @@ diff -NurpP --minimal linux-4.4.197/kernel/nsproxy.c linux-4.4.197-vs2.3.9.8/ker return -EPERM; *new_nsp = create_new_namespaces(unshare_flags, current, user_ns, -diff -NurpP --minimal linux-4.4.197/kernel/pid.c linux-4.4.197-vs2.3.9.8/kernel/pid.c ---- linux-4.4.197/kernel/pid.c 2019-10-22 12:34:41.408548977 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/pid.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/pid.c linux-4.4.217-vs2.3.9.9/kernel/pid.c +--- linux-4.4.217/kernel/pid.c 2020-03-27 06:54:53.641798087 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/pid.c 2018-10-20 04:57:21.000000000 +0000 @@ -38,6 +38,7 @@ #include #include @@ -13454,9 +13454,9 @@ diff -NurpP --minimal linux-4.4.197/kernel/pid.c linux-4.4.197-vs2.3.9.8/kernel/ pid_t pid_vnr(struct pid *pid) { return pid_nr_ns(pid, task_active_pid_ns(current)); -diff -NurpP --minimal linux-4.4.197/kernel/pid_namespace.c linux-4.4.197-vs2.3.9.8/kernel/pid_namespace.c ---- linux-4.4.197/kernel/pid_namespace.c 2019-10-22 12:34:41.408548977 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/pid_namespace.c 2019-10-05 14:35:36.942738146 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/pid_namespace.c linux-4.4.217-vs2.3.9.9/kernel/pid_namespace.c +--- linux-4.4.217/kernel/pid_namespace.c 2020-03-27 06:54:53.641798087 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/pid_namespace.c 2019-10-05 14:35:36.942738146 +0000 @@ -18,6 +18,7 @@ #include #include @@ -13481,9 +13481,9 @@ diff -NurpP --minimal linux-4.4.197/kernel/pid_namespace.c linux-4.4.197-vs2.3.9 kmem_cache_free(pid_ns_cachep, ns); out: return ERR_PTR(err); -diff -NurpP --minimal linux-4.4.197/kernel/printk/printk.c linux-4.4.197-vs2.3.9.8/kernel/printk/printk.c ---- linux-4.4.197/kernel/printk/printk.c 2019-10-22 12:34:41.518547219 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/printk/printk.c 2019-10-05 14:35:36.962737828 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/printk/printk.c linux-4.4.217-vs2.3.9.9/kernel/printk/printk.c +--- linux-4.4.217/kernel/printk/printk.c 2020-03-27 06:54:53.721796771 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/printk/printk.c 2020-04-01 09:34:46.901126753 +0000 @@ -46,6 +46,7 @@ #include #include @@ -13492,7 +13492,7 @@ diff -NurpP --minimal linux-4.4.197/kernel/printk/printk.c linux-4.4.197-vs2.3.9 #include -@@ -502,7 +503,7 @@ int check_syslog_permissions(int type, i +@@ -503,7 +504,7 @@ int check_syslog_permissions(int type, i goto ok; if (syslog_action_restricted(type)) { @@ -13501,7 +13501,7 @@ diff -NurpP --minimal linux-4.4.197/kernel/printk/printk.c linux-4.4.197-vs2.3.9 goto ok; /* * For historical reasons, accept CAP_SYS_ADMIN too, with -@@ -1309,12 +1310,9 @@ int do_syslog(int type, char __user *buf +@@ -1315,12 +1316,9 @@ int do_syslog(int type, char __user *buf if (error) goto out; @@ -13517,7 +13517,7 @@ diff -NurpP --minimal linux-4.4.197/kernel/printk/printk.c linux-4.4.197-vs2.3.9 error = -EINVAL; if (!buf || len < 0) goto out; -@@ -1325,6 +1323,16 @@ int do_syslog(int type, char __user *buf +@@ -1331,6 +1329,16 @@ int do_syslog(int type, char __user *buf error = -EFAULT; goto out; } @@ -13534,7 +13534,7 @@ diff -NurpP --minimal linux-4.4.197/kernel/printk/printk.c linux-4.4.197-vs2.3.9 error = wait_event_interruptible(log_wait, syslog_seq != log_next_seq); if (error) -@@ -1337,16 +1345,6 @@ int do_syslog(int type, char __user *buf +@@ -1343,16 +1351,6 @@ int do_syslog(int type, char __user *buf /* FALL THRU */ /* Read last kernel messages */ case SYSLOG_ACTION_READ_ALL: @@ -13551,9 +13551,9 @@ diff -NurpP --minimal linux-4.4.197/kernel/printk/printk.c linux-4.4.197-vs2.3.9 error = syslog_print_all(buf, len, clear); break; /* Clear ring buffer */ -diff -NurpP --minimal linux-4.4.197/kernel/ptrace.c linux-4.4.197-vs2.3.9.8/kernel/ptrace.c ---- linux-4.4.197/kernel/ptrace.c 2019-10-22 12:34:41.518547219 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/ptrace.c 2019-10-05 14:37:35.400859010 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/ptrace.c linux-4.4.217-vs2.3.9.9/kernel/ptrace.c +--- linux-4.4.217/kernel/ptrace.c 2020-03-27 06:54:53.721796771 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/ptrace.c 2019-10-05 14:37:35.400859010 +0000 @@ -23,6 +23,7 @@ #include #include @@ -13574,9 +13574,9 @@ diff -NurpP --minimal linux-4.4.197/kernel/ptrace.c linux-4.4.197-vs2.3.9.8/kern if (mode & PTRACE_MODE_SCHED) return 0; return security_ptrace_access_check(task, mode); -diff -NurpP --minimal linux-4.4.197/kernel/reboot.c linux-4.4.197-vs2.3.9.8/kernel/reboot.c ---- linux-4.4.197/kernel/reboot.c 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/reboot.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/reboot.c linux-4.4.217-vs2.3.9.9/kernel/reboot.c +--- linux-4.4.217/kernel/reboot.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/reboot.c 2018-10-20 04:57:21.000000000 +0000 @@ -16,6 +16,7 @@ #include #include @@ -13604,9 +13604,9 @@ diff -NurpP --minimal linux-4.4.197/kernel/reboot.c linux-4.4.197-vs2.3.9.8/kern mutex_lock(&reboot_mutex); switch (cmd) { case LINUX_REBOOT_CMD_RESTART: -diff -NurpP --minimal linux-4.4.197/kernel/sched/core.c linux-4.4.197-vs2.3.9.8/kernel/sched/core.c ---- linux-4.4.197/kernel/sched/core.c 2019-10-22 12:34:41.628545464 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/sched/core.c 2019-10-05 14:35:37.012737036 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/sched/core.c linux-4.4.217-vs2.3.9.9/kernel/sched/core.c +--- linux-4.4.217/kernel/sched/core.c 2020-03-27 06:54:53.811795293 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/sched/core.c 2019-10-05 14:35:37.012737036 +0000 @@ -74,6 +74,8 @@ #include #include @@ -13625,9 +13625,9 @@ diff -NurpP --minimal linux-4.4.197/kernel/sched/core.c linux-4.4.197-vs2.3.9.8/ retval = security_task_setnice(current, nice); if (retval) -diff -NurpP --minimal linux-4.4.197/kernel/sched/cputime.c linux-4.4.197-vs2.3.9.8/kernel/sched/cputime.c ---- linux-4.4.197/kernel/sched/cputime.c 2019-10-22 12:34:41.628545464 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/sched/cputime.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/sched/cputime.c linux-4.4.217-vs2.3.9.9/kernel/sched/cputime.c +--- linux-4.4.217/kernel/sched/cputime.c 2020-03-27 06:54:53.811795293 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/sched/cputime.c 2018-10-20 04:57:21.000000000 +0000 @@ -4,6 +4,7 @@ #include #include @@ -13668,9 +13668,9 @@ diff -NurpP --minimal linux-4.4.197/kernel/sched/cputime.c linux-4.4.197-vs2.3.9 account_group_system_time(p, cputime); /* Add system time to cpustat. */ -diff -NurpP --minimal linux-4.4.197/kernel/sched/fair.c linux-4.4.197-vs2.3.9.8/kernel/sched/fair.c ---- linux-4.4.197/kernel/sched/fair.c 2019-10-22 12:34:41.638545302 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/sched/fair.c 2019-10-05 14:35:37.022736877 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/sched/fair.c linux-4.4.217-vs2.3.9.9/kernel/sched/fair.c +--- linux-4.4.217/kernel/sched/fair.c 2020-03-27 06:54:53.831794961 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/sched/fair.c 2020-04-01 09:34:46.981125428 +0000 @@ -30,6 +30,7 @@ #include #include @@ -13697,9 +13697,9 @@ diff -NurpP --minimal linux-4.4.197/kernel/sched/fair.c linux-4.4.197-vs2.3.9.8/ account_entity_dequeue(cfs_rq, se); /* -diff -NurpP --minimal linux-4.4.197/kernel/sched/loadavg.c linux-4.4.197-vs2.3.9.8/kernel/sched/loadavg.c ---- linux-4.4.197/kernel/sched/loadavg.c 2019-10-22 12:34:41.648545144 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/sched/loadavg.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/sched/loadavg.c linux-4.4.217-vs2.3.9.9/kernel/sched/loadavg.c +--- linux-4.4.217/kernel/sched/loadavg.c 2020-03-27 06:54:53.831794961 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/sched/loadavg.c 2018-10-20 04:57:21.000000000 +0000 @@ -73,9 +73,16 @@ EXPORT_SYMBOL(avenrun); /* should be rem */ void get_avenrun(unsigned long *loads, unsigned long offset, int shift) @@ -13720,9 +13720,9 @@ diff -NurpP --minimal linux-4.4.197/kernel/sched/loadavg.c linux-4.4.197-vs2.3.9 } long calc_load_fold_active(struct rq *this_rq) -diff -NurpP --minimal linux-4.4.197/kernel/signal.c linux-4.4.197-vs2.3.9.8/kernel/signal.c ---- linux-4.4.197/kernel/signal.c 2019-10-22 12:34:41.648545144 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/signal.c 2019-10-05 14:35:37.072736083 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/signal.c linux-4.4.217-vs2.3.9.9/kernel/signal.c +--- linux-4.4.217/kernel/signal.c 2020-03-27 06:54:53.841794800 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/signal.c 2020-04-01 09:34:46.991125263 +0000 @@ -34,6 +34,8 @@ #include #include @@ -13732,7 +13732,7 @@ diff -NurpP --minimal linux-4.4.197/kernel/signal.c linux-4.4.197-vs2.3.9.8/kern #define CREATE_TRACE_POINTS #include -@@ -768,9 +770,18 @@ static int check_kill_permission(int sig +@@ -782,9 +784,18 @@ static int check_kill_permission(int sig struct pid *sid; int error; @@ -13751,7 +13751,7 @@ diff -NurpP --minimal linux-4.4.197/kernel/signal.c linux-4.4.197-vs2.3.9.8/kern if (!si_fromuser(info)) return 0; -@@ -794,6 +805,20 @@ static int check_kill_permission(int sig +@@ -808,6 +819,20 @@ static int check_kill_permission(int sig } } @@ -13772,7 +13772,7 @@ diff -NurpP --minimal linux-4.4.197/kernel/signal.c linux-4.4.197-vs2.3.9.8/kern return security_task_kill(t, info, sig, 0); } -@@ -1345,8 +1370,14 @@ int kill_pid_info(int sig, struct siginf +@@ -1359,8 +1384,14 @@ int kill_pid_info(int sig, struct siginf for (;;) { rcu_read_lock(); p = pid_task(pid, PIDTYPE_PID); @@ -13789,7 +13789,7 @@ diff -NurpP --minimal linux-4.4.197/kernel/signal.c linux-4.4.197-vs2.3.9.8/kern rcu_read_unlock(); if (likely(!p || error != -ESRCH)) return error; -@@ -1391,7 +1422,7 @@ int kill_pid_info_as_cred(int sig, struc +@@ -1405,7 +1436,7 @@ int kill_pid_info_as_cred(int sig, struc rcu_read_lock(); p = pid_task(pid, PIDTYPE_PID); @@ -13798,7 +13798,7 @@ diff -NurpP --minimal linux-4.4.197/kernel/signal.c linux-4.4.197-vs2.3.9.8/kern ret = -ESRCH; goto out_unlock; } -@@ -1447,8 +1478,10 @@ static int kill_something_info(int sig, +@@ -1461,8 +1492,10 @@ static int kill_something_info(int sig, struct task_struct * p; for_each_process(p) { @@ -13811,7 +13811,7 @@ diff -NurpP --minimal linux-4.4.197/kernel/signal.c linux-4.4.197-vs2.3.9.8/kern int err = group_send_sig_info(sig, info, p); ++count; if (err != -EPERM) -@@ -2319,6 +2352,11 @@ relock: +@@ -2333,6 +2366,11 @@ relock: !sig_kernel_only(signr)) continue; @@ -13823,9 +13823,9 @@ diff -NurpP --minimal linux-4.4.197/kernel/signal.c linux-4.4.197-vs2.3.9.8/kern if (sig_kernel_stop(signr)) { /* * The default action is to stop all threads in -diff -NurpP --minimal linux-4.4.197/kernel/softirq.c linux-4.4.197-vs2.3.9.8/kernel/softirq.c ---- linux-4.4.197/kernel/softirq.c 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/softirq.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/softirq.c linux-4.4.217-vs2.3.9.9/kernel/softirq.c +--- linux-4.4.217/kernel/softirq.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/softirq.c 2018-10-20 04:57:21.000000000 +0000 @@ -26,6 +26,7 @@ #include #include @@ -13834,9 +13834,9 @@ diff -NurpP --minimal linux-4.4.197/kernel/softirq.c linux-4.4.197-vs2.3.9.8/ker #define CREATE_TRACE_POINTS #include -diff -NurpP --minimal linux-4.4.197/kernel/sys.c linux-4.4.197-vs2.3.9.8/kernel/sys.c ---- linux-4.4.197/kernel/sys.c 2019-10-22 12:34:41.648545144 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/sys.c 2019-10-05 14:35:37.082735926 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/sys.c linux-4.4.217-vs2.3.9.9/kernel/sys.c +--- linux-4.4.217/kernel/sys.c 2020-03-27 06:54:53.841794800 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/sys.c 2019-10-05 14:35:37.082735926 +0000 @@ -56,6 +56,7 @@ #include @@ -13923,9 +13923,9 @@ diff -NurpP --minimal linux-4.4.197/kernel/sys.c linux-4.4.197-vs2.3.9.8/kernel/ return 0; return -EPERM; -diff -NurpP --minimal linux-4.4.197/kernel/sysctl_binary.c linux-4.4.197-vs2.3.9.8/kernel/sysctl_binary.c ---- linux-4.4.197/kernel/sysctl_binary.c 2019-10-22 12:34:41.648545144 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/sysctl_binary.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/sysctl_binary.c linux-4.4.217-vs2.3.9.9/kernel/sysctl_binary.c +--- linux-4.4.217/kernel/sysctl_binary.c 2020-03-27 06:54:53.841794800 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/sysctl_binary.c 2018-10-20 04:57:21.000000000 +0000 @@ -73,6 +73,7 @@ static const struct bin_table bin_kern_t { CTL_INT, KERN_PANIC, "panic" }, @@ -13934,9 +13934,9 @@ diff -NurpP --minimal linux-4.4.197/kernel/sysctl_binary.c linux-4.4.197-vs2.3.9 { CTL_STR, KERN_SPARC_REBOOT, "reboot-cmd" }, { CTL_INT, KERN_CTLALTDEL, "ctrl-alt-del" }, -diff -NurpP --minimal linux-4.4.197/kernel/sysctl.c linux-4.4.197-vs2.3.9.8/kernel/sysctl.c ---- linux-4.4.197/kernel/sysctl.c 2019-10-22 12:34:41.648545144 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/sysctl.c 2019-10-05 14:35:37.132735132 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/sysctl.c linux-4.4.217-vs2.3.9.9/kernel/sysctl.c +--- linux-4.4.217/kernel/sysctl.c 2020-03-27 06:54:53.841794800 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/sysctl.c 2020-04-01 09:34:47.021124769 +0000 @@ -87,6 +87,7 @@ #if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_LOCK_STAT) #include @@ -13967,9 +13967,9 @@ diff -NurpP --minimal linux-4.4.197/kernel/sysctl.c linux-4.4.197-vs2.3.9.8/kern #endif /* CONFIG_COMPACTION */ { .procname = "min_free_kbytes", -diff -NurpP --minimal linux-4.4.197/kernel/time/posix-timers.c linux-4.4.197-vs2.3.9.8/kernel/time/posix-timers.c ---- linux-4.4.197/kernel/time/posix-timers.c 2019-10-22 12:34:41.778543065 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/time/posix-timers.c 2019-02-22 08:20:35.190933224 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/time/posix-timers.c linux-4.4.217-vs2.3.9.9/kernel/time/posix-timers.c +--- linux-4.4.217/kernel/time/posix-timers.c 2020-03-27 06:54:53.911793645 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/time/posix-timers.c 2019-02-22 08:20:35.190933224 +0000 @@ -48,6 +48,7 @@ #include #include @@ -14005,9 +14005,9 @@ diff -NurpP --minimal linux-4.4.197/kernel/time/posix-timers.c linux-4.4.197-vs2 /* If we failed to send the signal the timer stops. */ return ret > 0; } -diff -NurpP --minimal linux-4.4.197/kernel/time/time.c linux-4.4.197-vs2.3.9.8/kernel/time/time.c ---- linux-4.4.197/kernel/time/time.c 2019-10-22 12:34:41.828542266 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/time/time.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/time/time.c linux-4.4.217-vs2.3.9.9/kernel/time/time.c +--- linux-4.4.217/kernel/time/time.c 2020-03-27 06:54:53.911793645 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/time/time.c 2018-10-20 04:57:21.000000000 +0000 @@ -38,6 +38,7 @@ #include #include @@ -14034,9 +14034,9 @@ diff -NurpP --minimal linux-4.4.197/kernel/time/time.c linux-4.4.197-vs2.3.9.8/k return 0; } -diff -NurpP --minimal linux-4.4.197/kernel/time/timekeeping.c linux-4.4.197-vs2.3.9.8/kernel/time/timekeeping.c ---- linux-4.4.197/kernel/time/timekeeping.c 2019-10-22 12:34:41.848541946 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/time/timekeeping.c 2019-02-22 08:20:35.190933224 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/time/timekeeping.c linux-4.4.217-vs2.3.9.9/kernel/time/timekeeping.c +--- linux-4.4.217/kernel/time/timekeeping.c 2020-03-27 06:54:53.921793484 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/time/timekeeping.c 2019-02-22 08:20:35.190933224 +0000 @@ -23,6 +23,7 @@ #include #include @@ -14055,9 +14055,9 @@ diff -NurpP --minimal linux-4.4.197/kernel/time/timekeeping.c linux-4.4.197-vs2. } EXPORT_SYMBOL(ktime_get_raw_and_real_ts64); -diff -NurpP --minimal linux-4.4.197/kernel/time/timer.c linux-4.4.197-vs2.3.9.8/kernel/time/timer.c ---- linux-4.4.197/kernel/time/timer.c 2019-10-22 12:34:41.878541469 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/time/timer.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/time/timer.c linux-4.4.217-vs2.3.9.9/kernel/time/timer.c +--- linux-4.4.217/kernel/time/timer.c 2020-03-27 06:54:53.921793484 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/time/timer.c 2018-10-20 04:57:21.000000000 +0000 @@ -42,6 +42,10 @@ #include #include @@ -14069,9 +14069,9 @@ diff -NurpP --minimal linux-4.4.197/kernel/time/timer.c linux-4.4.197-vs2.3.9.8/ #include #include -diff -NurpP --minimal linux-4.4.197/kernel/user_namespace.c linux-4.4.197-vs2.3.9.8/kernel/user_namespace.c ---- linux-4.4.197/kernel/user_namespace.c 2019-10-22 12:34:42.308534596 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/user_namespace.c 2018-10-20 05:50:20.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/user_namespace.c linux-4.4.217-vs2.3.9.9/kernel/user_namespace.c +--- linux-4.4.217/kernel/user_namespace.c 2020-03-27 06:54:53.981792496 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/user_namespace.c 2018-10-20 05:50:20.000000000 +0000 @@ -22,6 +22,7 @@ #include #include @@ -14115,9 +14115,9 @@ diff -NurpP --minimal linux-4.4.197/kernel/user_namespace.c linux-4.4.197-vs2.3. /** * make_kprojid - Map a user-namespace projid pair into a kprojid. * @ns: User namespace that the projid is in -diff -NurpP --minimal linux-4.4.197/kernel/utsname.c linux-4.4.197-vs2.3.9.8/kernel/utsname.c ---- linux-4.4.197/kernel/utsname.c 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/utsname.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/utsname.c linux-4.4.217-vs2.3.9.9/kernel/utsname.c +--- linux-4.4.217/kernel/utsname.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/utsname.c 2018-10-20 04:57:21.000000000 +0000 @@ -16,14 +16,17 @@ #include #include @@ -14145,16 +14145,16 @@ diff -NurpP --minimal linux-4.4.197/kernel/utsname.c linux-4.4.197-vs2.3.9.8/ker kfree(ns); } -diff -NurpP --minimal linux-4.4.197/kernel/vserver/cacct.c linux-4.4.197-vs2.3.9.8/kernel/vserver/cacct.c ---- linux-4.4.197/kernel/vserver/cacct.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/vserver/cacct.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/vserver/cacct.c linux-4.4.217-vs2.3.9.9/kernel/vserver/cacct.c +--- linux-4.4.217/kernel/vserver/cacct.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/vserver/cacct.c 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,42 @@ +/* + * linux/kernel/vserver/cacct.c + * + * Virtual Server: Context Accounting + * -+ * Copyright (C) 2006-2007 Herbert P?tzl ++ * Copyright (C) 2006-2007 Herbert Pötzl + * + * V0.01 added accounting stats + * @@ -14191,9 +14191,9 @@ diff -NurpP --minimal linux-4.4.197/kernel/vserver/cacct.c linux-4.4.197-vs2.3.9 + return 0; +} + -diff -NurpP --minimal linux-4.4.197/kernel/vserver/cacct_init.h linux-4.4.197-vs2.3.9.8/kernel/vserver/cacct_init.h ---- linux-4.4.197/kernel/vserver/cacct_init.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/vserver/cacct_init.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/vserver/cacct_init.h linux-4.4.217-vs2.3.9.9/kernel/vserver/cacct_init.h +--- linux-4.4.217/kernel/vserver/cacct_init.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/vserver/cacct_init.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,25 @@ + + @@ -14220,9 +14220,9 @@ diff -NurpP --minimal linux-4.4.197/kernel/vserver/cacct_init.h linux-4.4.197-vs + return; +} + -diff -NurpP --minimal linux-4.4.197/kernel/vserver/cacct_proc.h linux-4.4.197-vs2.3.9.8/kernel/vserver/cacct_proc.h ---- linux-4.4.197/kernel/vserver/cacct_proc.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/vserver/cacct_proc.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/vserver/cacct_proc.h linux-4.4.217-vs2.3.9.9/kernel/vserver/cacct_proc.h +--- linux-4.4.217/kernel/vserver/cacct_proc.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/vserver/cacct_proc.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,53 @@ +#ifndef _VX_CACCT_PROC_H +#define _VX_CACCT_PROC_H @@ -14277,16 +14277,16 @@ diff -NurpP --minimal linux-4.4.197/kernel/vserver/cacct_proc.h linux-4.4.197-vs +} + +#endif /* _VX_CACCT_PROC_H */ -diff -NurpP --minimal linux-4.4.197/kernel/vserver/context.c linux-4.4.197-vs2.3.9.8/kernel/vserver/context.c ---- linux-4.4.197/kernel/vserver/context.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/vserver/context.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/vserver/context.c linux-4.4.217-vs2.3.9.9/kernel/vserver/context.c +--- linux-4.4.217/kernel/vserver/context.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/vserver/context.c 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,1119 @@ +/* + * linux/kernel/vserver/context.c + * + * Virtual Server: Context Support + * -+ * Copyright (C) 2003-2011 Herbert P?tzl ++ * Copyright (C) 2003-2011 Herbert Pötzl + * + * V0.01 context helper + * V0.02 vx_ctx_kill syscall command @@ -15400,16 +15400,16 @@ diff -NurpP --minimal linux-4.4.197/kernel/vserver/context.c linux-4.4.197-vs2.3 + +EXPORT_SYMBOL_GPL(free_vx_info); + -diff -NurpP --minimal linux-4.4.197/kernel/vserver/cvirt.c linux-4.4.197-vs2.3.9.8/kernel/vserver/cvirt.c ---- linux-4.4.197/kernel/vserver/cvirt.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/vserver/cvirt.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/vserver/cvirt.c linux-4.4.217-vs2.3.9.9/kernel/vserver/cvirt.c +--- linux-4.4.217/kernel/vserver/cvirt.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/vserver/cvirt.c 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,313 @@ +/* + * linux/kernel/vserver/cvirt.c + * + * Virtual Server: Context Virtualization + * -+ * Copyright (C) 2004-2007 Herbert P?tzl ++ * Copyright (C) 2004-2007 Herbert Pötzl + * + * V0.01 broken out from limit.c + * V0.02 added utsname stuff @@ -15717,9 +15717,9 @@ diff -NurpP --minimal linux-4.4.197/kernel/vserver/cvirt.c linux-4.4.197-vs2.3.9 + +#endif + -diff -NurpP --minimal linux-4.4.197/kernel/vserver/cvirt_init.h linux-4.4.197-vs2.3.9.8/kernel/vserver/cvirt_init.h ---- linux-4.4.197/kernel/vserver/cvirt_init.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/vserver/cvirt_init.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/vserver/cvirt_init.h linux-4.4.217-vs2.3.9.9/kernel/vserver/cvirt_init.h +--- linux-4.4.217/kernel/vserver/cvirt_init.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/vserver/cvirt_init.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,70 @@ + + @@ -15791,9 +15791,9 @@ diff -NurpP --minimal linux-4.4.197/kernel/vserver/cvirt_init.h linux-4.4.197-vs + return; +} + -diff -NurpP --minimal linux-4.4.197/kernel/vserver/cvirt_proc.h linux-4.4.197-vs2.3.9.8/kernel/vserver/cvirt_proc.h ---- linux-4.4.197/kernel/vserver/cvirt_proc.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/vserver/cvirt_proc.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/vserver/cvirt_proc.h linux-4.4.217-vs2.3.9.9/kernel/vserver/cvirt_proc.h +--- linux-4.4.217/kernel/vserver/cvirt_proc.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/vserver/cvirt_proc.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,123 @@ +#ifndef _VX_CVIRT_PROC_H +#define _VX_CVIRT_PROC_H @@ -15918,14 +15918,14 @@ diff -NurpP --minimal linux-4.4.197/kernel/vserver/cvirt_proc.h linux-4.4.197-vs +} + +#endif /* _VX_CVIRT_PROC_H */ -diff -NurpP --minimal linux-4.4.197/kernel/vserver/debug.c linux-4.4.197-vs2.3.9.8/kernel/vserver/debug.c ---- linux-4.4.197/kernel/vserver/debug.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/vserver/debug.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/vserver/debug.c linux-4.4.217-vs2.3.9.9/kernel/vserver/debug.c +--- linux-4.4.217/kernel/vserver/debug.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/vserver/debug.c 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,32 @@ +/* + * kernel/vserver/debug.c + * -+ * Copyright (C) 2005-2007 Herbert P?tzl ++ * Copyright (C) 2005-2007 Herbert Pötzl + * + * V0.01 vx_info dump support + * @@ -15954,16 +15954,16 @@ diff -NurpP --minimal linux-4.4.197/kernel/vserver/debug.c linux-4.4.197-vs2.3.9 + +EXPORT_SYMBOL_GPL(dump_vx_info); + -diff -NurpP --minimal linux-4.4.197/kernel/vserver/device.c linux-4.4.197-vs2.3.9.8/kernel/vserver/device.c ---- linux-4.4.197/kernel/vserver/device.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/vserver/device.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/vserver/device.c linux-4.4.217-vs2.3.9.9/kernel/vserver/device.c +--- linux-4.4.217/kernel/vserver/device.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/vserver/device.c 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,443 @@ +/* + * linux/kernel/vserver/device.c + * + * Linux-VServer: Device Support + * -+ * Copyright (C) 2006 Herbert P?tzl ++ * Copyright (C) 2006 Herbert Pötzl + * Copyright (C) 2007 Daniel Hokka Zakrisson + * + * V0.01 device mapping basics @@ -16401,16 +16401,16 @@ diff -NurpP --minimal linux-4.4.197/kernel/vserver/device.c linux-4.4.197-vs2.3. +#endif /* CONFIG_COMPAT */ + + -diff -NurpP --minimal linux-4.4.197/kernel/vserver/dlimit.c linux-4.4.197-vs2.3.9.8/kernel/vserver/dlimit.c ---- linux-4.4.197/kernel/vserver/dlimit.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/vserver/dlimit.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/vserver/dlimit.c linux-4.4.217-vs2.3.9.9/kernel/vserver/dlimit.c +--- linux-4.4.217/kernel/vserver/dlimit.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/vserver/dlimit.c 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,528 @@ +/* + * linux/kernel/vserver/dlimit.c + * + * Virtual Server: Context Disk Limits + * -+ * Copyright (C) 2004-2009 Herbert P?tzl ++ * Copyright (C) 2004-2009 Herbert Pötzl + * + * V0.01 initial version + * V0.02 compat32 splitup @@ -16933,16 +16933,16 @@ diff -NurpP --minimal linux-4.4.197/kernel/vserver/dlimit.c linux-4.4.197-vs2.3. +EXPORT_SYMBOL_GPL(locate_dl_info); +EXPORT_SYMBOL_GPL(rcu_free_dl_info); + -diff -NurpP --minimal linux-4.4.197/kernel/vserver/helper.c linux-4.4.197-vs2.3.9.8/kernel/vserver/helper.c ---- linux-4.4.197/kernel/vserver/helper.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/vserver/helper.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/vserver/helper.c linux-4.4.217-vs2.3.9.9/kernel/vserver/helper.c +--- linux-4.4.217/kernel/vserver/helper.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/vserver/helper.c 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,242 @@ +/* + * linux/kernel/vserver/helper.c + * + * Virtual Context Support + * -+ * Copyright (C) 2004-2007 Herbert P?tzl ++ * Copyright (C) 2004-2007 Herbert Pötzl + * + * V0.01 basic helper + * @@ -17179,16 +17179,16 @@ diff -NurpP --minimal linux-4.4.197/kernel/vserver/helper.c linux-4.4.197-vs2.3. + return do_vshelper(vshelper_path, argv, envp, 1); +} + -diff -NurpP --minimal linux-4.4.197/kernel/vserver/history.c linux-4.4.197-vs2.3.9.8/kernel/vserver/history.c ---- linux-4.4.197/kernel/vserver/history.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/vserver/history.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/vserver/history.c linux-4.4.217-vs2.3.9.9/kernel/vserver/history.c +--- linux-4.4.217/kernel/vserver/history.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/vserver/history.c 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,258 @@ +/* + * kernel/vserver/history.c + * + * Virtual Context History Backtrace + * -+ * Copyright (C) 2004-2007 Herbert P?tzl ++ * Copyright (C) 2004-2007 Herbert Pötzl + * + * V0.01 basic structure + * V0.02 hash/unhash and trace @@ -17441,9 +17441,9 @@ diff -NurpP --minimal linux-4.4.197/kernel/vserver/history.c linux-4.4.197-vs2.3 + +#endif /* CONFIG_COMPAT */ + -diff -NurpP --minimal linux-4.4.197/kernel/vserver/inet.c linux-4.4.197-vs2.3.9.8/kernel/vserver/inet.c ---- linux-4.4.197/kernel/vserver/inet.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/vserver/inet.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/vserver/inet.c linux-4.4.217-vs2.3.9.9/kernel/vserver/inet.c +--- linux-4.4.217/kernel/vserver/inet.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/vserver/inet.c 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,236 @@ + +#include @@ -17681,16 +17681,16 @@ diff -NurpP --minimal linux-4.4.197/kernel/vserver/inet.c linux-4.4.197-vs2.3.9. + +EXPORT_SYMBOL_GPL(ip_v4_find_src); + -diff -NurpP --minimal linux-4.4.197/kernel/vserver/init.c linux-4.4.197-vs2.3.9.8/kernel/vserver/init.c ---- linux-4.4.197/kernel/vserver/init.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/vserver/init.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/vserver/init.c linux-4.4.217-vs2.3.9.9/kernel/vserver/init.c +--- linux-4.4.217/kernel/vserver/init.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/vserver/init.c 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,46 @@ +/* + * linux/kernel/init.c + * + * Virtual Server Init + * -+ * Copyright (C) 2004-2007 Herbert P?tzl ++ * Copyright (C) 2004-2007 Herbert Pötzl + * + * V0.01 basic structure + * @@ -17731,16 +17731,16 @@ diff -NurpP --minimal linux-4.4.197/kernel/vserver/init.c linux-4.4.197-vs2.3.9. +module_init(init_vserver); +module_exit(exit_vserver); + -diff -NurpP --minimal linux-4.4.197/kernel/vserver/inode.c linux-4.4.197-vs2.3.9.8/kernel/vserver/inode.c ---- linux-4.4.197/kernel/vserver/inode.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/vserver/inode.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/vserver/inode.c linux-4.4.217-vs2.3.9.9/kernel/vserver/inode.c +--- linux-4.4.217/kernel/vserver/inode.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/vserver/inode.c 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,440 @@ +/* + * linux/kernel/vserver/inode.c + * + * Virtual Server: File System Support + * -+ * Copyright (C) 2004-2007 Herbert P?tzl ++ * Copyright (C) 2004-2007 Herbert Pötzl + * + * V0.01 separated from vcontext V0.05 + * V0.02 moved to tag (instead of xid) @@ -18175,9 +18175,9 @@ diff -NurpP --minimal linux-4.4.197/kernel/vserver/inode.c linux-4.4.197-vs2.3.9 + +#endif /* CONFIG_PROPAGATE */ + -diff -NurpP --minimal linux-4.4.197/kernel/vserver/Kconfig linux-4.4.197-vs2.3.9.8/kernel/vserver/Kconfig ---- linux-4.4.197/kernel/vserver/Kconfig 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/vserver/Kconfig 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/vserver/Kconfig linux-4.4.217-vs2.3.9.9/kernel/vserver/Kconfig +--- linux-4.4.217/kernel/vserver/Kconfig 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/vserver/Kconfig 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,230 @@ +# +# Linux VServer configuration @@ -18409,16 +18409,16 @@ diff -NurpP --minimal linux-4.4.197/kernel/vserver/Kconfig linux-4.4.197-vs2.3.9 + bool + default n + -diff -NurpP --minimal linux-4.4.197/kernel/vserver/limit.c linux-4.4.197-vs2.3.9.8/kernel/vserver/limit.c ---- linux-4.4.197/kernel/vserver/limit.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/vserver/limit.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/vserver/limit.c linux-4.4.217-vs2.3.9.9/kernel/vserver/limit.c +--- linux-4.4.217/kernel/vserver/limit.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/vserver/limit.c 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,386 @@ +/* + * linux/kernel/vserver/limit.c + * + * Virtual Server: Context Limits + * -+ * Copyright (C) 2004-2010 Herbert P?tzl ++ * Copyright (C) 2004-2010 Herbert Pötzl + * + * V0.01 broken out from vcontext V0.05 + * V0.02 changed vcmds to vxi arg @@ -18799,9 +18799,9 @@ diff -NurpP --minimal linux-4.4.197/kernel/vserver/limit.c linux-4.4.197-vs2.3.9 +} +#endif /* !CONFIG_MEMCG */ + -diff -NurpP --minimal linux-4.4.197/kernel/vserver/limit_init.h linux-4.4.197-vs2.3.9.8/kernel/vserver/limit_init.h ---- linux-4.4.197/kernel/vserver/limit_init.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/vserver/limit_init.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/vserver/limit_init.h linux-4.4.217-vs2.3.9.9/kernel/vserver/limit_init.h +--- linux-4.4.217/kernel/vserver/limit_init.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/vserver/limit_init.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,31 @@ + + @@ -18834,9 +18834,9 @@ diff -NurpP --minimal linux-4.4.197/kernel/vserver/limit_init.h linux-4.4.197-vs + } +} + -diff -NurpP --minimal linux-4.4.197/kernel/vserver/limit_proc.h linux-4.4.197-vs2.3.9.8/kernel/vserver/limit_proc.h ---- linux-4.4.197/kernel/vserver/limit_proc.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/vserver/limit_proc.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/vserver/limit_proc.h linux-4.4.217-vs2.3.9.9/kernel/vserver/limit_proc.h +--- linux-4.4.217/kernel/vserver/limit_proc.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/vserver/limit_proc.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,57 @@ +#ifndef _VX_LIMIT_PROC_H +#define _VX_LIMIT_PROC_H @@ -18895,9 +18895,9 @@ diff -NurpP --minimal linux-4.4.197/kernel/vserver/limit_proc.h linux-4.4.197-vs +#endif /* _VX_LIMIT_PROC_H */ + + -diff -NurpP --minimal linux-4.4.197/kernel/vserver/Makefile linux-4.4.197-vs2.3.9.8/kernel/vserver/Makefile ---- linux-4.4.197/kernel/vserver/Makefile 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/vserver/Makefile 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/vserver/Makefile linux-4.4.217-vs2.3.9.9/kernel/vserver/Makefile +--- linux-4.4.217/kernel/vserver/Makefile 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/vserver/Makefile 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,18 @@ +# +# Makefile for the Linux vserver routines. @@ -18917,16 +18917,16 @@ diff -NurpP --minimal linux-4.4.197/kernel/vserver/Makefile linux-4.4.197-vs2.3. +vserver-$(CONFIG_VSERVER_MONITOR) += monitor.o +vserver-$(CONFIG_VSERVER_DEVICE) += device.o + -diff -NurpP --minimal linux-4.4.197/kernel/vserver/network.c linux-4.4.197-vs2.3.9.8/kernel/vserver/network.c ---- linux-4.4.197/kernel/vserver/network.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/vserver/network.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/vserver/network.c linux-4.4.217-vs2.3.9.9/kernel/vserver/network.c +--- linux-4.4.217/kernel/vserver/network.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/vserver/network.c 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,1053 @@ +/* + * linux/kernel/vserver/network.c + * + * Virtual Server: Network Support + * -+ * Copyright (C) 2003-2007 Herbert P?tzl ++ * Copyright (C) 2003-2007 Herbert Pötzl + * + * V0.01 broken out from vcontext V0.05 + * V0.02 cleaned up implementation @@ -19974,16 +19974,16 @@ diff -NurpP --minimal linux-4.4.197/kernel/vserver/network.c linux-4.4.197-vs2.3 +EXPORT_SYMBOL_GPL(free_nx_info); +EXPORT_SYMBOL_GPL(unhash_nx_info); + -diff -NurpP --minimal linux-4.4.197/kernel/vserver/proc.c linux-4.4.197-vs2.3.9.8/kernel/vserver/proc.c ---- linux-4.4.197/kernel/vserver/proc.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/vserver/proc.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/vserver/proc.c linux-4.4.217-vs2.3.9.9/kernel/vserver/proc.c +--- linux-4.4.217/kernel/vserver/proc.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/vserver/proc.c 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,1040 @@ +/* + * linux/kernel/vserver/proc.c + * + * Virtual Context Support + * -+ * Copyright (C) 2003-2011 Herbert P?tzl ++ * Copyright (C) 2003-2011 Herbert Pötzl + * + * V0.01 basic structure + * V0.02 adaptation vs1.3.0 @@ -21018,16 +21018,16 @@ diff -NurpP --minimal linux-4.4.197/kernel/vserver/proc.c linux-4.4.197-vs2.3.9. + return 0; +} + -diff -NurpP --minimal linux-4.4.197/kernel/vserver/sched.c linux-4.4.197-vs2.3.9.8/kernel/vserver/sched.c ---- linux-4.4.197/kernel/vserver/sched.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/vserver/sched.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/vserver/sched.c linux-4.4.217-vs2.3.9.9/kernel/vserver/sched.c +--- linux-4.4.217/kernel/vserver/sched.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/vserver/sched.c 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,83 @@ +/* + * linux/kernel/vserver/sched.c + * + * Virtual Server: Scheduler Support + * -+ * Copyright (C) 2004-2010 Herbert P?tzl ++ * Copyright (C) 2004-2010 Herbert Pötzl + * + * V0.01 adapted Sam Vilains version to 2.6.3 + * V0.02 removed legacy interface @@ -21105,9 +21105,9 @@ diff -NurpP --minimal linux-4.4.197/kernel/vserver/sched.c linux-4.4.197-vs2.3.9 + return 0; +} + -diff -NurpP --minimal linux-4.4.197/kernel/vserver/sched_init.h linux-4.4.197-vs2.3.9.8/kernel/vserver/sched_init.h ---- linux-4.4.197/kernel/vserver/sched_init.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/vserver/sched_init.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/vserver/sched_init.h linux-4.4.217-vs2.3.9.9/kernel/vserver/sched_init.h +--- linux-4.4.217/kernel/vserver/sched_init.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/vserver/sched_init.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,27 @@ + +static inline void vx_info_init_sched(struct _vx_sched *sched) @@ -21136,9 +21136,9 @@ diff -NurpP --minimal linux-4.4.197/kernel/vserver/sched_init.h linux-4.4.197-vs +{ + return; +} -diff -NurpP --minimal linux-4.4.197/kernel/vserver/sched_proc.h linux-4.4.197-vs2.3.9.8/kernel/vserver/sched_proc.h ---- linux-4.4.197/kernel/vserver/sched_proc.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/vserver/sched_proc.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/vserver/sched_proc.h linux-4.4.217-vs2.3.9.9/kernel/vserver/sched_proc.h +--- linux-4.4.217/kernel/vserver/sched_proc.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/vserver/sched_proc.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,32 @@ +#ifndef _VX_SCHED_PROC_H +#define _VX_SCHED_PROC_H @@ -21172,16 +21172,16 @@ diff -NurpP --minimal linux-4.4.197/kernel/vserver/sched_proc.h linux-4.4.197-vs +} + +#endif /* _VX_SCHED_PROC_H */ -diff -NurpP --minimal linux-4.4.197/kernel/vserver/signal.c linux-4.4.197-vs2.3.9.8/kernel/vserver/signal.c ---- linux-4.4.197/kernel/vserver/signal.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/vserver/signal.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/vserver/signal.c linux-4.4.217-vs2.3.9.9/kernel/vserver/signal.c +--- linux-4.4.217/kernel/vserver/signal.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/vserver/signal.c 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,134 @@ +/* + * linux/kernel/vserver/signal.c + * + * Virtual Server: Signal Support + * -+ * Copyright (C) 2003-2007 Herbert P?tzl ++ * Copyright (C) 2003-2007 Herbert Pötzl + * + * V0.01 broken out from vcontext V0.05 + * V0.02 changed vcmds to vxi arg @@ -21310,16 +21310,16 @@ diff -NurpP --minimal linux-4.4.197/kernel/vserver/signal.c linux-4.4.197-vs2.3. + return ret; +} + -diff -NurpP --minimal linux-4.4.197/kernel/vserver/space.c linux-4.4.197-vs2.3.9.8/kernel/vserver/space.c ---- linux-4.4.197/kernel/vserver/space.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/vserver/space.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/vserver/space.c linux-4.4.217-vs2.3.9.9/kernel/vserver/space.c +--- linux-4.4.217/kernel/vserver/space.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/vserver/space.c 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,436 @@ +/* + * linux/kernel/vserver/space.c + * + * Virtual Server: Context Space Support + * -+ * Copyright (C) 2003-2010 Herbert P?tzl ++ * Copyright (C) 2003-2010 Herbert Pötzl + * + * V0.01 broken out from context.c 0.07 + * V0.02 added task locking for namespace @@ -21750,16 +21750,16 @@ diff -NurpP --minimal linux-4.4.197/kernel/vserver/space.c linux-4.4.197-vs2.3.9 + return 0; +} + -diff -NurpP --minimal linux-4.4.197/kernel/vserver/switch.c linux-4.4.197-vs2.3.9.8/kernel/vserver/switch.c ---- linux-4.4.197/kernel/vserver/switch.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/vserver/switch.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/vserver/switch.c linux-4.4.217-vs2.3.9.9/kernel/vserver/switch.c +--- linux-4.4.217/kernel/vserver/switch.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/vserver/switch.c 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,556 @@ +/* + * linux/kernel/vserver/switch.c + * + * Virtual Server: Syscall Switch + * -+ * Copyright (C) 2003-2011 Herbert P?tzl ++ * Copyright (C) 2003-2011 Herbert Pötzl + * + * V0.01 syscall switch + * V0.02 added signal to context @@ -22310,16 +22310,16 @@ diff -NurpP --minimal linux-4.4.197/kernel/vserver/switch.c linux-4.4.197-vs2.3. +} + +#endif /* CONFIG_COMPAT */ -diff -NurpP --minimal linux-4.4.197/kernel/vserver/sysctl.c linux-4.4.197-vs2.3.9.8/kernel/vserver/sysctl.c ---- linux-4.4.197/kernel/vserver/sysctl.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/vserver/sysctl.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/vserver/sysctl.c linux-4.4.217-vs2.3.9.9/kernel/vserver/sysctl.c +--- linux-4.4.217/kernel/vserver/sysctl.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/vserver/sysctl.c 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,247 @@ +/* + * kernel/vserver/sysctl.c + * + * Virtual Context Support + * -+ * Copyright (C) 2004-2007 Herbert P?tzl ++ * Copyright (C) 2004-2007 Herbert Pötzl + * + * V0.01 basic structure + * @@ -22561,16 +22561,16 @@ diff -NurpP --minimal linux-4.4.197/kernel/vserver/sysctl.c linux-4.4.197-vs2.3. +EXPORT_SYMBOL_GPL(vs_debug_perm); +EXPORT_SYMBOL_GPL(vs_debug_misc); + -diff -NurpP --minimal linux-4.4.197/kernel/vserver/tag.c linux-4.4.197-vs2.3.9.8/kernel/vserver/tag.c ---- linux-4.4.197/kernel/vserver/tag.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/vserver/tag.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/vserver/tag.c linux-4.4.217-vs2.3.9.9/kernel/vserver/tag.c +--- linux-4.4.217/kernel/vserver/tag.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/vserver/tag.c 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,63 @@ +/* + * linux/kernel/vserver/tag.c + * + * Virtual Server: Shallow Tag Space + * -+ * Copyright (C) 2007 Herbert P?tzl ++ * Copyright (C) 2007 Herbert Pötzl + * + * V0.01 basic implementation + * @@ -22628,9 +22628,9 @@ diff -NurpP --minimal linux-4.4.197/kernel/vserver/tag.c linux-4.4.197-vs2.3.9.8 +} + + -diff -NurpP --minimal linux-4.4.197/kernel/vserver/vci_config.h linux-4.4.197-vs2.3.9.8/kernel/vserver/vci_config.h ---- linux-4.4.197/kernel/vserver/vci_config.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/kernel/vserver/vci_config.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/kernel/vserver/vci_config.h linux-4.4.217-vs2.3.9.9/kernel/vserver/vci_config.h +--- linux-4.4.217/kernel/vserver/vci_config.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/kernel/vserver/vci_config.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,80 @@ + +/* interface version */ @@ -22712,9 +22712,9 @@ diff -NurpP --minimal linux-4.4.197/kernel/vserver/vci_config.h linux-4.4.197-vs + 0; +} + -diff -NurpP --minimal linux-4.4.197/mm/memcontrol.c linux-4.4.197-vs2.3.9.8/mm/memcontrol.c ---- linux-4.4.197/mm/memcontrol.c 2019-10-22 12:34:43.988507753 +0000 -+++ linux-4.4.197-vs2.3.9.8/mm/memcontrol.c 2019-10-05 14:35:37.712725933 +0000 +diff -NurpP --minimal linux-4.4.217/mm/memcontrol.c linux-4.4.217-vs2.3.9.9/mm/memcontrol.c +--- linux-4.4.217/mm/memcontrol.c 2020-03-27 06:54:54.701780652 +0000 ++++ linux-4.4.217-vs2.3.9.9/mm/memcontrol.c 2020-04-01 09:34:47.731113004 +0000 @@ -2907,6 +2907,42 @@ static u64 mem_cgroup_read_u64(struct cg } } @@ -22758,9 +22758,9 @@ diff -NurpP --minimal linux-4.4.197/mm/memcontrol.c linux-4.4.197-vs2.3.9.8/mm/m #ifdef CONFIG_MEMCG_KMEM static int memcg_activate_kmem(struct mem_cgroup *memcg, unsigned long nr_pages) -diff -NurpP --minimal linux-4.4.197/mm/oom_kill.c linux-4.4.197-vs2.3.9.8/mm/oom_kill.c ---- linux-4.4.197/mm/oom_kill.c 2019-10-22 12:34:44.058506635 +0000 -+++ linux-4.4.197-vs2.3.9.8/mm/oom_kill.c 2019-02-22 08:20:35.470928469 +0000 +diff -NurpP --minimal linux-4.4.217/mm/oom_kill.c linux-4.4.217-vs2.3.9.9/mm/oom_kill.c +--- linux-4.4.217/mm/oom_kill.c 2020-03-27 06:54:54.761779665 +0000 ++++ linux-4.4.217-vs2.3.9.9/mm/oom_kill.c 2019-02-22 08:20:35.470928469 +0000 @@ -35,6 +35,8 @@ #include #include @@ -22835,9 +22835,9 @@ diff -NurpP --minimal linux-4.4.197/mm/oom_kill.c linux-4.4.197-vs2.3.9.8/mm/oom } if (p && p != (void *)-1UL) { oom_kill_process(oc, p, points, totalpages, NULL, -diff -NurpP --minimal linux-4.4.197/mm/page_alloc.c linux-4.4.197-vs2.3.9.8/mm/page_alloc.c ---- linux-4.4.197/mm/page_alloc.c 2019-10-22 12:34:44.058506635 +0000 -+++ linux-4.4.197-vs2.3.9.8/mm/page_alloc.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/mm/page_alloc.c linux-4.4.217-vs2.3.9.9/mm/page_alloc.c +--- linux-4.4.217/mm/page_alloc.c 2020-03-27 06:54:54.761779665 +0000 ++++ linux-4.4.217-vs2.3.9.9/mm/page_alloc.c 2020-04-01 09:44:46.391193828 +0000 @@ -62,6 +62,8 @@ #include #include @@ -22847,7 +22847,28 @@ diff -NurpP --minimal linux-4.4.197/mm/page_alloc.c linux-4.4.197-vs2.3.9.8/mm/p #include #include -@@ -3659,6 +3661,9 @@ void si_meminfo(struct sysinfo *val) +@@ -3678,14 +3680,17 @@ long si_mem_available(void) + */ + pagecache = pages[LRU_ACTIVE_FILE] + pages[LRU_INACTIVE_FILE]; + pagecache -= min(pagecache / 2, wmark_low); +- available += pagecache; ++ if (!vx_flags(VXF_VIRT_MEM, 0)) ++ available += pagecache; + + /* + * Part of the reclaimable slab consists of items that are in use, + * and cannot be freed. Cap this estimate at the low watermark. + */ +- available += global_page_state(NR_SLAB_RECLAIMABLE) - +- min(global_page_state(NR_SLAB_RECLAIMABLE) / 2, wmark_low); ++ if (!vx_flags(VXF_VIRT_MEM, 0)) ++ available += global_page_state(NR_SLAB_RECLAIMABLE) - ++ min(global_page_state(NR_SLAB_RECLAIMABLE) / 2, ++ wmark_low); + + if (available < 0) + available = 0; +@@ -3702,6 +3707,9 @@ void si_meminfo(struct sysinfo *val) val->totalhigh = totalhigh_pages; val->freehigh = nr_free_highpages(); val->mem_unit = PAGE_SIZE; @@ -22857,7 +22878,7 @@ diff -NurpP --minimal linux-4.4.197/mm/page_alloc.c linux-4.4.197-vs2.3.9.8/mm/p } EXPORT_SYMBOL(si_meminfo); -@@ -3684,6 +3689,9 @@ void si_meminfo_node(struct sysinfo *val +@@ -3727,6 +3735,9 @@ void si_meminfo_node(struct sysinfo *val val->freehigh = 0; #endif val->mem_unit = PAGE_SIZE; @@ -22867,9 +22888,9 @@ diff -NurpP --minimal linux-4.4.197/mm/page_alloc.c linux-4.4.197-vs2.3.9.8/mm/p } #endif -diff -NurpP --minimal linux-4.4.197/mm/pgtable-generic.c linux-4.4.197-vs2.3.9.8/mm/pgtable-generic.c ---- linux-4.4.197/mm/pgtable-generic.c 2019-10-22 12:34:44.058506635 +0000 -+++ linux-4.4.197-vs2.3.9.8/mm/pgtable-generic.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/mm/pgtable-generic.c linux-4.4.217-vs2.3.9.9/mm/pgtable-generic.c +--- linux-4.4.217/mm/pgtable-generic.c 2020-03-27 06:54:54.761779665 +0000 ++++ linux-4.4.217-vs2.3.9.9/mm/pgtable-generic.c 2018-10-20 04:57:21.000000000 +0000 @@ -6,6 +6,8 @@ * Copyright (C) 2010 Linus Torvalds */ @@ -22879,10 +22900,10 @@ diff -NurpP --minimal linux-4.4.197/mm/pgtable-generic.c linux-4.4.197-vs2.3.9.8 #include #include #include -diff -NurpP --minimal linux-4.4.197/mm/shmem.c linux-4.4.197-vs2.3.9.8/mm/shmem.c ---- linux-4.4.197/mm/shmem.c 2019-10-22 12:34:44.078506315 +0000 -+++ linux-4.4.197-vs2.3.9.8/mm/shmem.c 2019-10-05 14:35:37.802724503 +0000 -@@ -2198,7 +2198,7 @@ static int shmem_statfs(struct dentry *d +diff -NurpP --minimal linux-4.4.217/mm/shmem.c linux-4.4.217-vs2.3.9.9/mm/shmem.c +--- linux-4.4.217/mm/shmem.c 2020-03-27 06:54:54.771779498 +0000 ++++ linux-4.4.217-vs2.3.9.9/mm/shmem.c 2020-04-01 09:34:47.801111845 +0000 +@@ -2200,7 +2200,7 @@ static int shmem_statfs(struct dentry *d { struct shmem_sb_info *sbinfo = SHMEM_SB(dentry->d_sb); @@ -22891,7 +22912,7 @@ diff -NurpP --minimal linux-4.4.197/mm/shmem.c linux-4.4.197-vs2.3.9.8/mm/shmem. buf->f_bsize = PAGE_CACHE_SIZE; buf->f_namelen = NAME_MAX; if (sbinfo->max_blocks) { -@@ -3048,7 +3048,7 @@ int shmem_fill_super(struct super_block +@@ -3050,7 +3050,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; @@ -22900,9 +22921,9 @@ diff -NurpP --minimal linux-4.4.197/mm/shmem.c linux-4.4.197-vs2.3.9.8/mm/shmem. sb->s_op = &shmem_ops; sb->s_time_gran = 1; #ifdef CONFIG_TMPFS_XATTR -diff -NurpP --minimal linux-4.4.197/mm/slab.c linux-4.4.197-vs2.3.9.8/mm/slab.c ---- linux-4.4.197/mm/slab.c 2019-10-22 12:34:44.098505995 +0000 -+++ linux-4.4.197-vs2.3.9.8/mm/slab.c 2019-10-05 14:35:37.812724346 +0000 +diff -NurpP --minimal linux-4.4.217/mm/slab.c linux-4.4.217-vs2.3.9.9/mm/slab.c +--- linux-4.4.217/mm/slab.c 2020-03-27 06:54:54.791779169 +0000 ++++ linux-4.4.217-vs2.3.9.9/mm/slab.c 2019-10-05 14:35:37.812724346 +0000 @@ -337,6 +337,8 @@ static void kmem_cache_node_init(struct #define STATS_INC_FREEMISS(x) do { } while (0) #endif @@ -22928,9 +22949,9 @@ diff -NurpP --minimal linux-4.4.197/mm/slab.c linux-4.4.197-vs2.3.9.8/mm/slab.c kmemcheck_slab_free(cachep, objp, cachep->object_size); -diff -NurpP --minimal linux-4.4.197/mm/slab_vs.h linux-4.4.197-vs2.3.9.8/mm/slab_vs.h ---- linux-4.4.197/mm/slab_vs.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/mm/slab_vs.h 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/mm/slab_vs.h linux-4.4.217-vs2.3.9.9/mm/slab_vs.h +--- linux-4.4.217/mm/slab_vs.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/mm/slab_vs.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,29 @@ + +#include @@ -22961,9 +22982,9 @@ diff -NurpP --minimal linux-4.4.197/mm/slab_vs.h linux-4.4.197-vs2.3.9.8/mm/slab + atomic_sub(cachep->size, &vxi->cacct.slab[what]); +} + -diff -NurpP --minimal linux-4.4.197/mm/swapfile.c linux-4.4.197-vs2.3.9.8/mm/swapfile.c ---- linux-4.4.197/mm/swapfile.c 2019-10-22 12:34:44.098505995 +0000 -+++ linux-4.4.197-vs2.3.9.8/mm/swapfile.c 2018-10-20 05:50:20.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/mm/swapfile.c linux-4.4.217-vs2.3.9.9/mm/swapfile.c +--- linux-4.4.217/mm/swapfile.c 2020-03-27 06:54:54.791779169 +0000 ++++ linux-4.4.217-vs2.3.9.9/mm/swapfile.c 2018-10-20 05:50:20.000000000 +0000 @@ -39,6 +39,7 @@ #include #include @@ -22998,9 +23019,9 @@ diff -NurpP --minimal linux-4.4.197/mm/swapfile.c linux-4.4.197-vs2.3.9.8/mm/swa } /* -diff -NurpP --minimal linux-4.4.197/net/bridge/br_multicast.c linux-4.4.197-vs2.3.9.8/net/bridge/br_multicast.c ---- linux-4.4.197/net/bridge/br_multicast.c 2019-10-22 12:34:44.398501200 +0000 -+++ linux-4.4.197-vs2.3.9.8/net/bridge/br_multicast.c 2019-10-05 14:35:38.062720379 +0000 +diff -NurpP --minimal linux-4.4.217/net/bridge/br_multicast.c linux-4.4.217-vs2.3.9.9/net/bridge/br_multicast.c +--- linux-4.4.217/net/bridge/br_multicast.c 2020-03-27 06:54:55.401769137 +0000 ++++ linux-4.4.217-vs2.3.9.9/net/bridge/br_multicast.c 2019-10-05 14:35:38.062720379 +0000 @@ -462,7 +462,7 @@ static struct sk_buff *br_ip6_multicast_ ip6h->hop_limit = 1; ipv6_addr_set(&ip6h->daddr, htonl(0xff020000), 0, 0, htonl(1)); @@ -23010,9 +23031,9 @@ diff -NurpP --minimal linux-4.4.197/net/bridge/br_multicast.c linux-4.4.197-vs2. kfree_skb(skb); br->has_ipv6_addr = 0; return NULL; -diff -NurpP --minimal linux-4.4.197/net/core/dev.c linux-4.4.197-vs2.3.9.8/net/core/dev.c ---- linux-4.4.197/net/core/dev.c 2019-10-22 12:34:44.548498802 +0000 -+++ linux-4.4.197-vs2.3.9.8/net/core/dev.c 2019-10-05 14:35:38.182718477 +0000 +diff -NurpP --minimal linux-4.4.217/net/core/dev.c linux-4.4.217-vs2.3.9.9/net/core/dev.c +--- linux-4.4.217/net/core/dev.c 2020-03-27 06:54:55.841761896 +0000 ++++ linux-4.4.217-vs2.3.9.9/net/core/dev.c 2020-04-01 09:34:48.441101244 +0000 @@ -124,6 +124,7 @@ #include #include @@ -23130,9 +23151,9 @@ diff -NurpP --minimal linux-4.4.197/net/core/dev.c linux-4.4.197-vs2.3.9.8/net/c /* avoid cases where sscanf is not exact inverse of printf */ snprintf(buf, IFNAMSIZ, name, i); -diff -NurpP --minimal linux-4.4.197/net/core/net-procfs.c linux-4.4.197-vs2.3.9.8/net/core/net-procfs.c ---- linux-4.4.197/net/core/net-procfs.c 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/net/core/net-procfs.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/net/core/net-procfs.c linux-4.4.217-vs2.3.9.9/net/core/net-procfs.c +--- linux-4.4.217/net/core/net-procfs.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/net/core/net-procfs.c 2018-10-20 04:57:21.000000000 +0000 @@ -1,6 +1,7 @@ #include #include @@ -23156,9 +23177,9 @@ diff -NurpP --minimal linux-4.4.197/net/core/net-procfs.c linux-4.4.197-vs2.3.9. 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-4.4.197/net/core/rtnetlink.c linux-4.4.197-vs2.3.9.8/net/core/rtnetlink.c ---- linux-4.4.197/net/core/rtnetlink.c 2019-10-22 12:34:44.578498323 +0000 -+++ linux-4.4.197-vs2.3.9.8/net/core/rtnetlink.c 2019-02-22 08:20:35.940920486 +0000 +diff -NurpP --minimal linux-4.4.217/net/core/rtnetlink.c linux-4.4.217-vs2.3.9.9/net/core/rtnetlink.c +--- linux-4.4.217/net/core/rtnetlink.c 2020-03-27 06:54:56.331753839 +0000 ++++ linux-4.4.217-vs2.3.9.9/net/core/rtnetlink.c 2020-04-01 09:34:48.551099424 +0000 @@ -1456,6 +1456,8 @@ static int rtnl_dump_ifinfo(struct sk_bu hlist_for_each_entry(dev, head, index_hlist) { if (idx < s_idx) @@ -23168,7 +23189,7 @@ diff -NurpP --minimal linux-4.4.197/net/core/rtnetlink.c linux-4.4.197-vs2.3.9.8 err = rtnl_fill_ifinfo(skb, dev, RTM_NEWLINK, NETLINK_CB(cb->skb).portid, cb->nlh->nlmsg_seq, 0, -@@ -2568,6 +2570,9 @@ void rtmsg_ifinfo(int type, struct net_d +@@ -2584,6 +2586,9 @@ void rtmsg_ifinfo(int type, struct net_d { struct sk_buff *skb; @@ -23178,9 +23199,9 @@ diff -NurpP --minimal linux-4.4.197/net/core/rtnetlink.c linux-4.4.197-vs2.3.9.8 if (dev->reg_state != NETREG_REGISTERED) return; -diff -NurpP --minimal linux-4.4.197/net/core/sock.c linux-4.4.197-vs2.3.9.8/net/core/sock.c ---- linux-4.4.197/net/core/sock.c 2019-10-22 12:34:44.578498323 +0000 -+++ linux-4.4.197-vs2.3.9.8/net/core/sock.c 2019-02-22 08:20:35.940920486 +0000 +diff -NurpP --minimal linux-4.4.217/net/core/sock.c linux-4.4.217-vs2.3.9.9/net/core/sock.c +--- linux-4.4.217/net/core/sock.c 2020-03-27 06:54:56.361753345 +0000 ++++ linux-4.4.217-vs2.3.9.9/net/core/sock.c 2020-04-01 09:34:48.571099091 +0000 @@ -134,6 +134,10 @@ #include @@ -23248,9 +23269,9 @@ diff -NurpP --minimal linux-4.4.197/net/core/sock.c linux-4.4.197-vs2.3.9.8/net/ #ifdef CONFIG_NET_RX_BUSY_POLL sk->sk_napi_id = 0; sk->sk_ll_usec = sysctl_net_busy_read; -diff -NurpP --minimal linux-4.4.197/net/ipv4/af_inet.c linux-4.4.197-vs2.3.9.8/net/ipv4/af_inet.c ---- linux-4.4.197/net/ipv4/af_inet.c 2019-10-22 12:34:44.798494810 +0000 -+++ linux-4.4.197-vs2.3.9.8/net/ipv4/af_inet.c 2018-10-20 05:50:20.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/net/ipv4/af_inet.c linux-4.4.217-vs2.3.9.9/net/ipv4/af_inet.c +--- linux-4.4.217/net/ipv4/af_inet.c 2020-03-27 06:54:56.891744623 +0000 ++++ linux-4.4.217-vs2.3.9.9/net/ipv4/af_inet.c 2018-10-20 05:50:20.000000000 +0000 @@ -308,10 +308,15 @@ lookup_protocol: } @@ -23329,9 +23350,9 @@ diff -NurpP --minimal linux-4.4.197/net/ipv4/af_inet.c linux-4.4.197-vs2.3.9.8/n const struct proto_ops inet_stream_ops = { .family = PF_INET, -diff -NurpP --minimal linux-4.4.197/net/ipv4/arp.c linux-4.4.197-vs2.3.9.8/net/ipv4/arp.c ---- linux-4.4.197/net/ipv4/arp.c 2019-10-22 12:34:44.808494648 +0000 -+++ linux-4.4.197-vs2.3.9.8/net/ipv4/arp.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/net/ipv4/arp.c linux-4.4.217-vs2.3.9.9/net/ipv4/arp.c +--- linux-4.4.217/net/ipv4/arp.c 2020-03-27 06:54:56.901744462 +0000 ++++ linux-4.4.217-vs2.3.9.9/net/ipv4/arp.c 2018-10-20 04:57:21.000000000 +0000 @@ -1307,6 +1307,7 @@ static void arp_format_neigh_entry(struc struct net_device *dev = n->dev; int hatype = dev->type; @@ -23348,9 +23369,9 @@ diff -NurpP --minimal linux-4.4.197/net/ipv4/arp.c linux-4.4.197-vs2.3.9.8/net/i 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-4.4.197/net/ipv4/devinet.c linux-4.4.197-vs2.3.9.8/net/ipv4/devinet.c ---- linux-4.4.197/net/ipv4/devinet.c 2019-10-22 12:34:44.838494169 +0000 -+++ linux-4.4.197-vs2.3.9.8/net/ipv4/devinet.c 2019-10-05 14:35:38.482713717 +0000 +diff -NurpP --minimal linux-4.4.217/net/ipv4/devinet.c linux-4.4.217-vs2.3.9.9/net/ipv4/devinet.c +--- linux-4.4.217/net/ipv4/devinet.c 2020-03-27 06:54:56.931743968 +0000 ++++ linux-4.4.217-vs2.3.9.9/net/ipv4/devinet.c 2020-04-01 09:34:49.111090148 +0000 @@ -546,6 +546,7 @@ struct in_device *inetdev_by_index(struc } EXPORT_SYMBOL(inetdev_by_index); @@ -23400,7 +23421,7 @@ diff -NurpP --minimal linux-4.4.197/net/ipv4/devinet.c linux-4.4.197-vs2.3.9.8/n if (!buf) { done += sizeof(ifr); continue; -@@ -1581,6 +1591,7 @@ static int inet_dump_ifaddr(struct sk_bu +@@ -1576,6 +1586,7 @@ static int inet_dump_ifaddr(struct sk_bu struct net_device *dev; struct in_device *in_dev; struct in_ifaddr *ifa; @@ -23408,7 +23429,7 @@ diff -NurpP --minimal linux-4.4.197/net/ipv4/devinet.c linux-4.4.197-vs2.3.9.8/n struct hlist_head *head; s_h = cb->args[0]; -@@ -1604,6 +1615,8 @@ static int inet_dump_ifaddr(struct sk_bu +@@ -1599,6 +1610,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++) { @@ -23417,9 +23438,9 @@ diff -NurpP --minimal linux-4.4.197/net/ipv4/devinet.c linux-4.4.197-vs2.3.9.8/n if (ip_idx < s_ip_idx) continue; if (inet_fill_ifaddr(skb, ifa, -diff -NurpP --minimal linux-4.4.197/net/ipv4/fib_trie.c linux-4.4.197-vs2.3.9.8/net/ipv4/fib_trie.c ---- linux-4.4.197/net/ipv4/fib_trie.c 2019-10-22 12:34:44.898493209 +0000 -+++ linux-4.4.197-vs2.3.9.8/net/ipv4/fib_trie.c 2019-02-22 08:20:35.970919974 +0000 +diff -NurpP --minimal linux-4.4.217/net/ipv4/fib_trie.c linux-4.4.217-vs2.3.9.9/net/ipv4/fib_trie.c +--- linux-4.4.217/net/ipv4/fib_trie.c 2020-03-27 06:54:56.941743801 +0000 ++++ linux-4.4.217-vs2.3.9.9/net/ipv4/fib_trie.c 2019-02-22 08:20:35.970919974 +0000 @@ -2601,6 +2601,7 @@ static int fib_route_seq_show(struct seq seq_setwidth(seq, 127); @@ -23428,9 +23449,9 @@ diff -NurpP --minimal linux-4.4.197/net/ipv4/fib_trie.c linux-4.4.197-vs2.3.9.8/ if (fi) seq_printf(seq, "%s\t%08X\t%08X\t%04X\t%d\t%u\t" -diff -NurpP --minimal linux-4.4.197/net/ipv4/inet_connection_sock.c linux-4.4.197-vs2.3.9.8/net/ipv4/inet_connection_sock.c ---- linux-4.4.197/net/ipv4/inet_connection_sock.c 2019-10-22 12:34:44.918492889 +0000 -+++ linux-4.4.197-vs2.3.9.8/net/ipv4/inet_connection_sock.c 2019-10-05 14:35:38.522713082 +0000 +diff -NurpP --minimal linux-4.4.217/net/ipv4/inet_connection_sock.c linux-4.4.217-vs2.3.9.9/net/ipv4/inet_connection_sock.c +--- linux-4.4.217/net/ipv4/inet_connection_sock.c 2020-03-27 06:54:56.951743639 +0000 ++++ linux-4.4.217-vs2.3.9.9/net/ipv4/inet_connection_sock.c 2019-10-05 14:35:38.522713082 +0000 @@ -43,6 +43,37 @@ void inet_get_local_port_range(struct ne } EXPORT_SYMBOL(inet_get_local_port_range); @@ -23487,9 +23508,9 @@ diff -NurpP --minimal linux-4.4.197/net/ipv4/inet_connection_sock.c linux-4.4.19 break; } } -diff -NurpP --minimal linux-4.4.197/net/ipv4/inet_diag.c linux-4.4.197-vs2.3.9.8/net/ipv4/inet_diag.c ---- linux-4.4.197/net/ipv4/inet_diag.c 2019-10-22 12:34:44.948492410 +0000 -+++ linux-4.4.197-vs2.3.9.8/net/ipv4/inet_diag.c 2019-10-05 14:35:38.532712922 +0000 +diff -NurpP --minimal linux-4.4.217/net/ipv4/inet_diag.c linux-4.4.217-vs2.3.9.9/net/ipv4/inet_diag.c +--- linux-4.4.217/net/ipv4/inet_diag.c 2020-03-27 06:54:56.961743474 +0000 ++++ linux-4.4.217-vs2.3.9.9/net/ipv4/inet_diag.c 2019-10-05 14:35:38.532712922 +0000 @@ -31,6 +31,8 @@ #include @@ -23529,9 +23550,9 @@ diff -NurpP --minimal linux-4.4.197/net/ipv4/inet_diag.c linux-4.4.197-vs2.3.9.8 if (num < s_num) goto next_normal; state = (sk->sk_state == TCP_TIME_WAIT) ? -diff -NurpP --minimal linux-4.4.197/net/ipv4/inet_hashtables.c linux-4.4.197-vs2.3.9.8/net/ipv4/inet_hashtables.c ---- linux-4.4.197/net/ipv4/inet_hashtables.c 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/net/ipv4/inet_hashtables.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/net/ipv4/inet_hashtables.c linux-4.4.217-vs2.3.9.9/net/ipv4/inet_hashtables.c +--- linux-4.4.217/net/ipv4/inet_hashtables.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/net/ipv4/inet_hashtables.c 2018-10-20 04:57:21.000000000 +0000 @@ -23,6 +23,7 @@ #include #include @@ -23568,9 +23589,9 @@ diff -NurpP --minimal linux-4.4.197/net/ipv4/inet_hashtables.c linux-4.4.197-vs2 /* * 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-4.4.197/net/ipv4/netfilter.c linux-4.4.197-vs2.3.9.8/net/ipv4/netfilter.c ---- linux-4.4.197/net/ipv4/netfilter.c 2019-10-22 12:34:45.218488099 +0000 -+++ linux-4.4.197-vs2.3.9.8/net/ipv4/netfilter.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/net/ipv4/netfilter.c linux-4.4.217-vs2.3.9.9/net/ipv4/netfilter.c +--- linux-4.4.217/net/ipv4/netfilter.c 2020-03-27 06:54:56.991742979 +0000 ++++ linux-4.4.217-vs2.3.9.9/net/ipv4/netfilter.c 2018-10-20 04:57:21.000000000 +0000 @@ -11,7 +11,7 @@ #include #include @@ -23580,9 +23601,9 @@ diff -NurpP --minimal linux-4.4.197/net/ipv4/netfilter.c linux-4.4.197-vs2.3.9.8 #include #include #include -diff -NurpP --minimal linux-4.4.197/net/ipv4/raw.c linux-4.4.197-vs2.3.9.8/net/ipv4/raw.c ---- linux-4.4.197/net/ipv4/raw.c 2019-10-22 12:34:45.268487297 +0000 -+++ linux-4.4.197-vs2.3.9.8/net/ipv4/raw.c 2019-10-05 14:35:38.622711495 +0000 +diff -NurpP --minimal linux-4.4.217/net/ipv4/raw.c linux-4.4.217-vs2.3.9.9/net/ipv4/raw.c +--- linux-4.4.217/net/ipv4/raw.c 2020-03-27 06:54:57.011742652 +0000 ++++ linux-4.4.217-vs2.3.9.9/net/ipv4/raw.c 2019-10-05 14:35:38.622711495 +0000 @@ -126,7 +126,7 @@ static struct sock *__raw_v4_lookup(stru if (net_eq(sock_net(sk), net) && inet->inet_num == num && @@ -23675,10 +23696,10 @@ diff -NurpP --minimal linux-4.4.197/net/ipv4/raw.c linux-4.4.197-vs2.3.9.8/net/i if (!sk && ++state->bucket < RAW_HTABLE_SIZE) { sk = sk_head(&state->h->ht[state->bucket]); -diff -NurpP --minimal linux-4.4.197/net/ipv4/route.c linux-4.4.197-vs2.3.9.8/net/ipv4/route.c ---- linux-4.4.197/net/ipv4/route.c 2019-10-22 12:34:45.268487297 +0000 -+++ linux-4.4.197-vs2.3.9.8/net/ipv4/route.c 2019-10-22 13:45:50.760816294 +0000 -@@ -2274,7 +2274,7 @@ struct rtable *__ip_route_output_key_has +diff -NurpP --minimal linux-4.4.217/net/ipv4/route.c linux-4.4.217-vs2.3.9.9/net/ipv4/route.c +--- linux-4.4.217/net/ipv4/route.c 2020-03-27 06:54:57.011742652 +0000 ++++ linux-4.4.217-vs2.3.9.9/net/ipv4/route.c 2020-04-01 09:34:49.251087829 +0000 +@@ -2277,7 +2277,7 @@ struct rtable *__ip_route_output_key_has if (fl4->flowi4_oif) { @@ -23687,9 +23708,9 @@ diff -NurpP --minimal linux-4.4.197/net/ipv4/route.c linux-4.4.197-vs2.3.9.8/net rth = ERR_PTR(-ENODEV); if (!dev_out) goto out; -diff -NurpP --minimal linux-4.4.197/net/ipv4/tcp.c linux-4.4.197-vs2.3.9.8/net/ipv4/tcp.c ---- linux-4.4.197/net/ipv4/tcp.c 2019-10-22 12:34:45.268487297 +0000 -+++ linux-4.4.197-vs2.3.9.8/net/ipv4/tcp.c 2019-10-05 14:35:38.622711495 +0000 +diff -NurpP --minimal linux-4.4.217/net/ipv4/tcp.c linux-4.4.217-vs2.3.9.9/net/ipv4/tcp.c +--- linux-4.4.217/net/ipv4/tcp.c 2020-03-27 06:54:57.011742652 +0000 ++++ linux-4.4.217-vs2.3.9.9/net/ipv4/tcp.c 2020-04-01 09:34:49.251087829 +0000 @@ -269,6 +269,7 @@ #include #include @@ -23698,9 +23719,9 @@ diff -NurpP --minimal linux-4.4.197/net/ipv4/tcp.c linux-4.4.197-vs2.3.9.8/net/i #include #include -diff -NurpP --minimal linux-4.4.197/net/ipv4/tcp_ipv4.c linux-4.4.197-vs2.3.9.8/net/ipv4/tcp_ipv4.c ---- linux-4.4.197/net/ipv4/tcp_ipv4.c 2019-10-22 12:34:45.278487138 +0000 -+++ linux-4.4.197-vs2.3.9.8/net/ipv4/tcp_ipv4.c 2019-10-05 14:35:38.622711495 +0000 +diff -NurpP --minimal linux-4.4.217/net/ipv4/tcp_ipv4.c linux-4.4.217-vs2.3.9.9/net/ipv4/tcp_ipv4.c +--- linux-4.4.217/net/ipv4/tcp_ipv4.c 2020-03-27 06:54:57.011742652 +0000 ++++ linux-4.4.217-vs2.3.9.9/net/ipv4/tcp_ipv4.c 2020-04-01 09:34:49.261087666 +0000 @@ -1891,6 +1891,10 @@ static void *listening_get_next(struct s sk = sk_nulls_next(sk); get_sk: @@ -23770,9 +23791,9 @@ diff -NurpP --minimal linux-4.4.197/net/ipv4/tcp_ipv4.c linux-4.4.197-vs2.3.9.8/ destp = ntohs(tw->tw_dport); srcp = ntohs(tw->tw_sport); -diff -NurpP --minimal linux-4.4.197/net/ipv4/tcp_minisocks.c linux-4.4.197-vs2.3.9.8/net/ipv4/tcp_minisocks.c ---- linux-4.4.197/net/ipv4/tcp_minisocks.c 2019-10-22 12:34:45.278487138 +0000 -+++ linux-4.4.197-vs2.3.9.8/net/ipv4/tcp_minisocks.c 2018-10-20 05:50:20.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/net/ipv4/tcp_minisocks.c linux-4.4.217-vs2.3.9.9/net/ipv4/tcp_minisocks.c +--- linux-4.4.217/net/ipv4/tcp_minisocks.c 2020-03-27 06:54:57.011742652 +0000 ++++ linux-4.4.217-vs2.3.9.9/net/ipv4/tcp_minisocks.c 2018-10-20 05:50:20.000000000 +0000 @@ -23,6 +23,9 @@ #include #include @@ -23795,9 +23816,9 @@ diff -NurpP --minimal linux-4.4.197/net/ipv4/tcp_minisocks.c linux-4.4.197-vs2.3 #if IS_ENABLED(CONFIG_IPV6) if (tw->tw_family == PF_INET6) { struct ipv6_pinfo *np = inet6_sk(sk); -diff -NurpP --minimal linux-4.4.197/net/ipv4/udp.c linux-4.4.197-vs2.3.9.8/net/ipv4/udp.c ---- linux-4.4.197/net/ipv4/udp.c 2019-10-22 12:34:45.288486980 +0000 -+++ linux-4.4.197-vs2.3.9.8/net/ipv4/udp.c 2019-10-05 14:35:38.652711021 +0000 +diff -NurpP --minimal linux-4.4.217/net/ipv4/udp.c linux-4.4.217-vs2.3.9.9/net/ipv4/udp.c +--- linux-4.4.217/net/ipv4/udp.c 2020-03-27 06:54:57.011742652 +0000 ++++ linux-4.4.217-vs2.3.9.9/net/ipv4/udp.c 2019-10-05 14:35:38.652711021 +0000 @@ -309,14 +309,7 @@ fail: } EXPORT_SYMBOL(udp_lib_get_port); @@ -23929,9 +23950,9 @@ diff -NurpP --minimal linux-4.4.197/net/ipv4/udp.c linux-4.4.197-vs2.3.9.8/net/i __u16 destp = ntohs(inet->inet_dport); __u16 srcp = ntohs(inet->inet_sport); -diff -NurpP --minimal linux-4.4.197/net/ipv4/udp_diag.c linux-4.4.197-vs2.3.9.8/net/ipv4/udp_diag.c ---- linux-4.4.197/net/ipv4/udp_diag.c 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/net/ipv4/udp_diag.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/net/ipv4/udp_diag.c linux-4.4.217-vs2.3.9.9/net/ipv4/udp_diag.c +--- linux-4.4.217/net/ipv4/udp_diag.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/net/ipv4/udp_diag.c 2018-10-20 04:57:21.000000000 +0000 @@ -118,6 +118,8 @@ static void udp_dump(struct udp_table *t if (!net_eq(sock_net(sk), net)) @@ -23941,9 +23962,9 @@ diff -NurpP --minimal linux-4.4.197/net/ipv4/udp_diag.c linux-4.4.197-vs2.3.9.8/ if (num < s_num) goto next; if (!(r->idiag_states & (1 << sk->sk_state))) -diff -NurpP --minimal linux-4.4.197/net/ipv6/addrconf.c linux-4.4.197-vs2.3.9.8/net/ipv6/addrconf.c ---- linux-4.4.197/net/ipv6/addrconf.c 2019-10-22 12:34:45.308486661 +0000 -+++ linux-4.4.197-vs2.3.9.8/net/ipv6/addrconf.c 2019-10-05 14:35:38.692710385 +0000 +diff -NurpP --minimal linux-4.4.217/net/ipv6/addrconf.c linux-4.4.217-vs2.3.9.9/net/ipv6/addrconf.c +--- linux-4.4.217/net/ipv6/addrconf.c 2020-03-27 06:54:57.061741830 +0000 ++++ linux-4.4.217-vs2.3.9.9/net/ipv6/addrconf.c 2019-10-05 14:35:38.692710385 +0000 @@ -92,6 +92,8 @@ #include #include @@ -24078,9 +24099,9 @@ diff -NurpP --minimal linux-4.4.197/net/ipv6/addrconf.c linux-4.4.197-vs2.3.9.8/ idev = __in6_dev_get(dev); if (!idev) goto cont; -diff -NurpP --minimal linux-4.4.197/net/ipv6/af_inet6.c linux-4.4.197-vs2.3.9.8/net/ipv6/af_inet6.c ---- linux-4.4.197/net/ipv6/af_inet6.c 2019-10-22 12:34:45.318486498 +0000 -+++ linux-4.4.197-vs2.3.9.8/net/ipv6/af_inet6.c 2019-02-22 08:20:35.970919974 +0000 +diff -NurpP --minimal linux-4.4.217/net/ipv6/af_inet6.c linux-4.4.217-vs2.3.9.9/net/ipv6/af_inet6.c +--- linux-4.4.217/net/ipv6/af_inet6.c 2020-03-27 06:54:57.071741663 +0000 ++++ linux-4.4.217-vs2.3.9.9/net/ipv6/af_inet6.c 2019-02-22 08:20:35.970919974 +0000 @@ -43,6 +43,8 @@ #include #include @@ -24169,9 +24190,9 @@ diff -NurpP --minimal linux-4.4.197/net/ipv6/af_inet6.c linux-4.4.197-vs2.3.9.8/ if (ipv6_addr_any(&sk->sk_v6_rcv_saddr)) sin->sin6_addr = np->saddr; else -diff -NurpP --minimal linux-4.4.197/net/ipv6/datagram.c linux-4.4.197-vs2.3.9.8/net/ipv6/datagram.c ---- linux-4.4.197/net/ipv6/datagram.c 2019-10-22 12:34:45.318486498 +0000 -+++ linux-4.4.197-vs2.3.9.8/net/ipv6/datagram.c 2019-02-22 08:20:35.970919974 +0000 +diff -NurpP --minimal linux-4.4.217/net/ipv6/datagram.c linux-4.4.217-vs2.3.9.9/net/ipv6/datagram.c +--- linux-4.4.217/net/ipv6/datagram.c 2020-03-27 06:54:57.071741663 +0000 ++++ linux-4.4.217-vs2.3.9.9/net/ipv6/datagram.c 2019-02-22 08:20:35.970919974 +0000 @@ -735,7 +735,7 @@ int ip6_datagram_send_ctl(struct net *ne rcu_read_lock(); @@ -24181,9 +24202,9 @@ diff -NurpP --minimal linux-4.4.197/net/ipv6/datagram.c linux-4.4.197-vs2.3.9.8/ if (!dev) { rcu_read_unlock(); return -ENODEV; -diff -NurpP --minimal linux-4.4.197/net/ipv6/fib6_rules.c linux-4.4.197-vs2.3.9.8/net/ipv6/fib6_rules.c ---- linux-4.4.197/net/ipv6/fib6_rules.c 2019-10-22 12:34:45.318486498 +0000 -+++ linux-4.4.197-vs2.3.9.8/net/ipv6/fib6_rules.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/net/ipv6/fib6_rules.c linux-4.4.217-vs2.3.9.9/net/ipv6/fib6_rules.c +--- linux-4.4.217/net/ipv6/fib6_rules.c 2020-03-27 06:54:57.071741663 +0000 ++++ linux-4.4.217-vs2.3.9.9/net/ipv6/fib6_rules.c 2018-10-20 04:57:21.000000000 +0000 @@ -97,7 +97,7 @@ static int fib6_rule_action(struct fib_r ip6_dst_idev(&rt->dst)->dev, &flp6->daddr, @@ -24193,9 +24214,9 @@ diff -NurpP --minimal linux-4.4.197/net/ipv6/fib6_rules.c linux-4.4.197-vs2.3.9. goto again; if (!ipv6_prefix_equal(&saddr, &r->src.addr, r->src.plen)) -diff -NurpP --minimal linux-4.4.197/net/ipv6/inet6_hashtables.c linux-4.4.197-vs2.3.9.8/net/ipv6/inet6_hashtables.c ---- linux-4.4.197/net/ipv6/inet6_hashtables.c 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/net/ipv6/inet6_hashtables.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/net/ipv6/inet6_hashtables.c linux-4.4.217-vs2.3.9.9/net/ipv6/inet6_hashtables.c +--- linux-4.4.217/net/ipv6/inet6_hashtables.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/net/ipv6/inet6_hashtables.c 2018-10-20 04:57:21.000000000 +0000 @@ -16,6 +16,7 @@ #include @@ -24222,10 +24243,10 @@ diff -NurpP --minimal linux-4.4.197/net/ipv6/inet6_hashtables.c linux-4.4.197-vs } if (sk->sk_bound_dev_if) { if (sk->sk_bound_dev_if != dif) -diff -NurpP --minimal linux-4.4.197/net/ipv6/ip6_fib.c linux-4.4.197-vs2.3.9.8/net/ipv6/ip6_fib.c ---- linux-4.4.197/net/ipv6/ip6_fib.c 2019-10-22 12:34:45.348486021 +0000 -+++ linux-4.4.197-vs2.3.9.8/net/ipv6/ip6_fib.c 2018-10-20 04:57:21.000000000 +0000 -@@ -1968,6 +1968,7 @@ static int ipv6_route_seq_show(struct se +diff -NurpP --minimal linux-4.4.217/net/ipv6/ip6_fib.c linux-4.4.217-vs2.3.9.9/net/ipv6/ip6_fib.c +--- linux-4.4.217/net/ipv6/ip6_fib.c 2020-03-27 06:54:57.091741336 +0000 ++++ linux-4.4.217-vs2.3.9.9/net/ipv6/ip6_fib.c 2020-04-01 09:34:49.301087000 +0000 +@@ -1969,6 +1969,7 @@ static int ipv6_route_seq_show(struct se struct rt6_info *rt = v; struct ipv6_route_iter *iter = seq->private; @@ -24233,9 +24254,9 @@ diff -NurpP --minimal linux-4.4.197/net/ipv6/ip6_fib.c linux-4.4.197-vs2.3.9.8/n seq_printf(seq, "%pi6 %02x ", &rt->rt6i_dst.addr, rt->rt6i_dst.plen); #ifdef CONFIG_IPV6_SUBTREES -diff -NurpP --minimal linux-4.4.197/net/ipv6/ip6_output.c linux-4.4.197-vs2.3.9.8/net/ipv6/ip6_output.c ---- linux-4.4.197/net/ipv6/ip6_output.c 2019-10-22 12:34:45.358485858 +0000 -+++ linux-4.4.197-vs2.3.9.8/net/ipv6/ip6_output.c 2019-10-05 14:35:38.762709276 +0000 +diff -NurpP --minimal linux-4.4.217/net/ipv6/ip6_output.c linux-4.4.217-vs2.3.9.9/net/ipv6/ip6_output.c +--- linux-4.4.217/net/ipv6/ip6_output.c 2020-03-27 06:54:57.101741169 +0000 ++++ linux-4.4.217-vs2.3.9.9/net/ipv6/ip6_output.c 2019-10-05 14:35:38.762709276 +0000 @@ -945,7 +945,8 @@ static int ip6_dst_lookup_tail(struct ne rt = (*dst)->error ? NULL : (struct rt6_info *)*dst; err = ip6_route_get_saddr(net, rt, &fl6->daddr, @@ -24246,9 +24267,9 @@ diff -NurpP --minimal linux-4.4.197/net/ipv6/ip6_output.c linux-4.4.197-vs2.3.9. if (err) goto out_err_release; -diff -NurpP --minimal linux-4.4.197/net/ipv6/ndisc.c linux-4.4.197-vs2.3.9.8/net/ipv6/ndisc.c ---- linux-4.4.197/net/ipv6/ndisc.c 2019-10-22 12:34:45.358485858 +0000 -+++ linux-4.4.197-vs2.3.9.8/net/ipv6/ndisc.c 2019-02-22 08:20:35.980919804 +0000 +diff -NurpP --minimal linux-4.4.217/net/ipv6/ndisc.c linux-4.4.217-vs2.3.9.9/net/ipv6/ndisc.c +--- linux-4.4.217/net/ipv6/ndisc.c 2020-03-27 06:54:57.101741169 +0000 ++++ linux-4.4.217-vs2.3.9.9/net/ipv6/ndisc.c 2019-02-22 08:20:35.980919804 +0000 @@ -501,7 +501,7 @@ void ndisc_send_na(struct net_device *de } else { if (ipv6_dev_get_saddr(dev_net(dev), dev, daddr, @@ -24258,9 +24279,9 @@ diff -NurpP --minimal linux-4.4.197/net/ipv6/ndisc.c linux-4.4.197-vs2.3.9.8/net return; src_addr = &tmpaddr; } -diff -NurpP --minimal linux-4.4.197/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c linux-4.4.197-vs2.3.9.8/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c ---- linux-4.4.197/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c linux-4.4.217-vs2.3.9.9/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c +--- linux-4.4.217/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c 2018-10-20 04:57:21.000000000 +0000 @@ -35,7 +35,7 @@ nf_nat_masquerade_ipv6(struct sk_buff *s ctinfo == IP_CT_RELATED_REPLY)); @@ -24270,9 +24291,9 @@ diff -NurpP --minimal linux-4.4.197/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c return NF_DROP; nfct_nat(ct)->masq_index = out->ifindex; -diff -NurpP --minimal linux-4.4.197/net/ipv6/raw.c linux-4.4.197-vs2.3.9.8/net/ipv6/raw.c ---- linux-4.4.197/net/ipv6/raw.c 2019-10-22 12:34:45.378485542 +0000 -+++ linux-4.4.197-vs2.3.9.8/net/ipv6/raw.c 2019-10-05 14:35:38.852707848 +0000 +diff -NurpP --minimal linux-4.4.217/net/ipv6/raw.c linux-4.4.217-vs2.3.9.9/net/ipv6/raw.c +--- linux-4.4.217/net/ipv6/raw.c 2020-03-27 06:54:57.241738869 +0000 ++++ linux-4.4.217-vs2.3.9.9/net/ipv6/raw.c 2019-10-05 14:35:38.852707848 +0000 @@ -30,6 +30,7 @@ #include #include @@ -24295,9 +24316,9 @@ diff -NurpP --minimal linux-4.4.197/net/ipv6/raw.c linux-4.4.197-vs2.3.9.8/net/i /* ipv4 addr of the socket is invalid. Only the * unspecified and mapped address have a v4 equivalent. */ -diff -NurpP --minimal linux-4.4.197/net/ipv6/route.c linux-4.4.197-vs2.3.9.8/net/ipv6/route.c ---- linux-4.4.197/net/ipv6/route.c 2019-10-22 12:34:45.378485542 +0000 -+++ linux-4.4.197-vs2.3.9.8/net/ipv6/route.c 2019-10-05 14:35:38.872707530 +0000 +diff -NurpP --minimal linux-4.4.217/net/ipv6/route.c linux-4.4.217-vs2.3.9.9/net/ipv6/route.c +--- linux-4.4.217/net/ipv6/route.c 2020-03-27 06:54:57.241738869 +0000 ++++ linux-4.4.217-vs2.3.9.9/net/ipv6/route.c 2020-04-01 09:34:49.371085841 +0000 @@ -62,6 +62,7 @@ #include #include @@ -24328,7 +24349,7 @@ diff -NurpP --minimal linux-4.4.197/net/ipv6/route.c linux-4.4.197-vs2.3.9.8/net return err; } -@@ -3178,7 +3181,8 @@ static int rt6_fill_node(struct net *net +@@ -3179,7 +3182,8 @@ static int rt6_fill_node(struct net *net goto nla_put_failure; } else if (dst) { struct in6_addr saddr_buf; @@ -24338,9 +24359,9 @@ diff -NurpP --minimal linux-4.4.197/net/ipv6/route.c linux-4.4.197-vs2.3.9.8/net nla_put_in6_addr(skb, RTA_PREFSRC, &saddr_buf)) goto nla_put_failure; } -diff -NurpP --minimal linux-4.4.197/net/ipv6/tcp_ipv6.c linux-4.4.197-vs2.3.9.8/net/ipv6/tcp_ipv6.c ---- linux-4.4.197/net/ipv6/tcp_ipv6.c 2019-10-22 12:34:45.378485542 +0000 -+++ linux-4.4.197-vs2.3.9.8/net/ipv6/tcp_ipv6.c 2019-10-05 14:35:38.882707371 +0000 +diff -NurpP --minimal linux-4.4.217/net/ipv6/tcp_ipv6.c linux-4.4.217-vs2.3.9.9/net/ipv6/tcp_ipv6.c +--- linux-4.4.217/net/ipv6/tcp_ipv6.c 2020-03-27 06:54:57.241738869 +0000 ++++ linux-4.4.217-vs2.3.9.9/net/ipv6/tcp_ipv6.c 2019-10-05 14:35:38.882707371 +0000 @@ -69,6 +69,7 @@ #include @@ -24373,9 +24394,9 @@ diff -NurpP --minimal linux-4.4.197/net/ipv6/tcp_ipv6.c linux-4.4.197-vs2.3.9.8/ } addr_type = ipv6_addr_type(&usin->sin6_addr); -diff -NurpP --minimal linux-4.4.197/net/ipv6/udp.c linux-4.4.197-vs2.3.9.8/net/ipv6/udp.c ---- linux-4.4.197/net/ipv6/udp.c 2019-10-22 12:34:45.378485542 +0000 -+++ linux-4.4.197-vs2.3.9.8/net/ipv6/udp.c 2019-10-05 14:35:38.882707371 +0000 +diff -NurpP --minimal linux-4.4.217/net/ipv6/udp.c linux-4.4.217-vs2.3.9.9/net/ipv6/udp.c +--- linux-4.4.217/net/ipv6/udp.c 2020-03-27 06:54:57.241738869 +0000 ++++ linux-4.4.217-vs2.3.9.9/net/ipv6/udp.c 2019-10-05 14:35:38.882707371 +0000 @@ -47,6 +47,7 @@ #include #include @@ -24469,9 +24490,9 @@ diff -NurpP --minimal linux-4.4.197/net/ipv6/udp.c linux-4.4.197-vs2.3.9.8/net/i } if (!ipv6_addr_any(&sk->sk_v6_rcv_saddr)) { -diff -NurpP --minimal linux-4.4.197/net/ipv6/xfrm6_policy.c linux-4.4.197-vs2.3.9.8/net/ipv6/xfrm6_policy.c ---- linux-4.4.197/net/ipv6/xfrm6_policy.c 2019-10-22 12:34:45.378485542 +0000 -+++ linux-4.4.197-vs2.3.9.8/net/ipv6/xfrm6_policy.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/net/ipv6/xfrm6_policy.c linux-4.4.217-vs2.3.9.9/net/ipv6/xfrm6_policy.c +--- linux-4.4.217/net/ipv6/xfrm6_policy.c 2020-03-27 06:54:57.251738704 +0000 ++++ linux-4.4.217-vs2.3.9.9/net/ipv6/xfrm6_policy.c 2018-10-20 04:57:21.000000000 +0000 @@ -64,7 +64,8 @@ static int xfrm6_get_saddr(struct net *n return -EHOSTUNREACH; @@ -24482,9 +24503,9 @@ diff -NurpP --minimal linux-4.4.197/net/ipv6/xfrm6_policy.c linux-4.4.197-vs2.3. dst_release(dst); return 0; } -diff -NurpP --minimal linux-4.4.197/net/netfilter/ipvs/ip_vs_xmit.c linux-4.4.197-vs2.3.9.8/net/netfilter/ipvs/ip_vs_xmit.c ---- linux-4.4.197/net/netfilter/ipvs/ip_vs_xmit.c 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/net/netfilter/ipvs/ip_vs_xmit.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/net/netfilter/ipvs/ip_vs_xmit.c linux-4.4.217-vs2.3.9.9/net/netfilter/ipvs/ip_vs_xmit.c +--- linux-4.4.217/net/netfilter/ipvs/ip_vs_xmit.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/net/netfilter/ipvs/ip_vs_xmit.c 2018-10-20 04:57:21.000000000 +0000 @@ -381,7 +381,7 @@ __ip_vs_route_output_v6(struct net *net, return dst; if (ipv6_addr_any(&fl6.saddr) && @@ -24494,9 +24515,9 @@ diff -NurpP --minimal linux-4.4.197/net/netfilter/ipvs/ip_vs_xmit.c linux-4.4.19 goto out_err; if (do_xfrm) { dst = xfrm_lookup(net, dst, flowi6_to_flowi(&fl6), NULL, 0); -diff -NurpP --minimal linux-4.4.197/net/netlink/af_netlink.c linux-4.4.197-vs2.3.9.8/net/netlink/af_netlink.c ---- linux-4.4.197/net/netlink/af_netlink.c 2019-10-22 12:34:46.108473875 +0000 -+++ linux-4.4.197-vs2.3.9.8/net/netlink/af_netlink.c 2018-10-20 05:53:02.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/net/netlink/af_netlink.c linux-4.4.217-vs2.3.9.9/net/netlink/af_netlink.c +--- linux-4.4.217/net/netlink/af_netlink.c 2020-03-27 06:54:58.101724722 +0000 ++++ linux-4.4.217-vs2.3.9.9/net/netlink/af_netlink.c 2020-04-01 09:34:50.051074577 +0000 @@ -63,6 +63,8 @@ #include #include @@ -24506,7 +24527,7 @@ diff -NurpP --minimal linux-4.4.197/net/netlink/af_netlink.c linux-4.4.197-vs2.3 #include #include -@@ -2472,7 +2474,8 @@ static void *__netlink_seq_next(struct s +@@ -2473,7 +2475,8 @@ static void *__netlink_seq_next(struct s if (err) return ERR_PTR(err); } @@ -24516,9 +24537,9 @@ diff -NurpP --minimal linux-4.4.197/net/netlink/af_netlink.c linux-4.4.197-vs2.3 return nlk; } -diff -NurpP --minimal linux-4.4.197/net/packet/diag.c linux-4.4.197-vs2.3.9.8/net/packet/diag.c ---- linux-4.4.197/net/packet/diag.c 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/net/packet/diag.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/net/packet/diag.c linux-4.4.217-vs2.3.9.9/net/packet/diag.c +--- linux-4.4.217/net/packet/diag.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/net/packet/diag.c 2018-10-20 04:57:21.000000000 +0000 @@ -4,6 +4,7 @@ #include #include @@ -24536,9 +24557,9 @@ diff -NurpP --minimal linux-4.4.197/net/packet/diag.c linux-4.4.197-vs2.3.9.8/ne if (num < s_num) goto next; -diff -NurpP --minimal linux-4.4.197/net/socket.c linux-4.4.197-vs2.3.9.8/net/socket.c ---- linux-4.4.197/net/socket.c 2019-10-22 12:34:47.008459493 +0000 -+++ linux-4.4.197-vs2.3.9.8/net/socket.c 2019-10-05 14:35:42.162655341 +0000 +diff -NurpP --minimal linux-4.4.217/net/socket.c linux-4.4.217-vs2.3.9.9/net/socket.c +--- linux-4.4.217/net/socket.c 2020-03-27 06:54:58.701714851 +0000 ++++ linux-4.4.217-vs2.3.9.9/net/socket.c 2020-04-01 09:34:50.681064146 +0000 @@ -100,10 +100,12 @@ #include @@ -24615,9 +24636,9 @@ diff -NurpP --minimal linux-4.4.197/net/socket.c linux-4.4.197-vs2.3.9.8/net/soc err = sock1->ops->socketpair(sock1, sock2); if (err < 0) -diff -NurpP --minimal linux-4.4.197/net/sunrpc/auth.c linux-4.4.197-vs2.3.9.8/net/sunrpc/auth.c ---- linux-4.4.197/net/sunrpc/auth.c 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/net/sunrpc/auth.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/net/sunrpc/auth.c linux-4.4.217-vs2.3.9.9/net/sunrpc/auth.c +--- linux-4.4.217/net/sunrpc/auth.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/net/sunrpc/auth.c 2018-10-20 04:57:21.000000000 +0000 @@ -15,6 +15,7 @@ #include #include @@ -24642,9 +24663,9 @@ diff -NurpP --minimal linux-4.4.197/net/sunrpc/auth.c linux-4.4.197-vs2.3.9.8/ne }; dprintk("RPC: %5u looking up %s cred\n", -diff -NurpP --minimal linux-4.4.197/net/sunrpc/auth_unix.c linux-4.4.197-vs2.3.9.8/net/sunrpc/auth_unix.c ---- linux-4.4.197/net/sunrpc/auth_unix.c 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/net/sunrpc/auth_unix.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/net/sunrpc/auth_unix.c linux-4.4.217-vs2.3.9.9/net/sunrpc/auth_unix.c +--- linux-4.4.217/net/sunrpc/auth_unix.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/net/sunrpc/auth_unix.c 2018-10-20 04:57:21.000000000 +0000 @@ -13,11 +13,13 @@ #include #include @@ -24701,9 +24722,9 @@ diff -NurpP --minimal linux-4.4.197/net/sunrpc/auth_unix.c linux-4.4.197-vs2.3.9 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-4.4.197/net/sunrpc/clnt.c linux-4.4.197-vs2.3.9.8/net/sunrpc/clnt.c ---- linux-4.4.197/net/sunrpc/clnt.c 2019-10-22 12:34:47.108457897 +0000 -+++ linux-4.4.197-vs2.3.9.8/net/sunrpc/clnt.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/net/sunrpc/clnt.c linux-4.4.217-vs2.3.9.9/net/sunrpc/clnt.c +--- linux-4.4.217/net/sunrpc/clnt.c 2020-03-27 06:54:58.831712713 +0000 ++++ linux-4.4.217-vs2.3.9.9/net/sunrpc/clnt.c 2018-10-20 04:57:21.000000000 +0000 @@ -31,6 +31,7 @@ #include #include @@ -24722,9 +24743,9 @@ diff -NurpP --minimal linux-4.4.197/net/sunrpc/clnt.c linux-4.4.197-vs2.3.9.8/ne return clnt; } -diff -NurpP --minimal linux-4.4.197/net/unix/af_unix.c linux-4.4.197-vs2.3.9.8/net/unix/af_unix.c ---- linux-4.4.197/net/unix/af_unix.c 2019-10-22 12:34:47.388453423 +0000 -+++ linux-4.4.197-vs2.3.9.8/net/unix/af_unix.c 2019-10-05 14:35:43.842628692 +0000 +diff -NurpP --minimal linux-4.4.217/net/unix/af_unix.c linux-4.4.217-vs2.3.9.9/net/unix/af_unix.c +--- linux-4.4.217/net/unix/af_unix.c 2020-03-27 06:54:59.051709093 +0000 ++++ linux-4.4.217-vs2.3.9.9/net/unix/af_unix.c 2020-04-01 09:34:50.851061327 +0000 @@ -117,6 +117,8 @@ #include #include @@ -24734,7 +24755,7 @@ diff -NurpP --minimal linux-4.4.197/net/unix/af_unix.c linux-4.4.197-vs2.3.9.8/n struct hlist_head unix_socket_table[2 * UNIX_HASH_SIZE]; EXPORT_SYMBOL_GPL(unix_socket_table); -@@ -282,6 +284,8 @@ static struct sock *__unix_find_socket_b +@@ -284,6 +286,8 @@ static struct sock *__unix_find_socket_b if (!net_eq(sock_net(s), net)) continue; @@ -24743,7 +24764,7 @@ diff -NurpP --minimal linux-4.4.197/net/unix/af_unix.c linux-4.4.197-vs2.3.9.8/n if (u->addr->len == len && !memcmp(u->addr->name, sunname, len)) goto found; -@@ -2748,6 +2752,8 @@ static struct sock *unix_from_bucket(str +@@ -2750,6 +2754,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; @@ -24752,7 +24773,7 @@ diff -NurpP --minimal linux-4.4.197/net/unix/af_unix.c linux-4.4.197-vs2.3.9.8/n if (++count == offset) break; } -@@ -2765,6 +2771,8 @@ static struct sock *unix_next_socket(str +@@ -2767,6 +2773,8 @@ static struct sock *unix_next_socket(str sk = sk_next(sk); if (!sk) goto next_bucket; @@ -24761,9 +24782,9 @@ diff -NurpP --minimal linux-4.4.197/net/unix/af_unix.c linux-4.4.197-vs2.3.9.8/n if (sock_net(sk) == seq_file_net(seq)) return sk; } -diff -NurpP --minimal linux-4.4.197/net/unix/diag.c linux-4.4.197-vs2.3.9.8/net/unix/diag.c ---- linux-4.4.197/net/unix/diag.c 2019-10-22 12:34:47.388453423 +0000 -+++ linux-4.4.197-vs2.3.9.8/net/unix/diag.c 2019-10-05 14:35:43.902627739 +0000 +diff -NurpP --minimal linux-4.4.217/net/unix/diag.c linux-4.4.217-vs2.3.9.9/net/unix/diag.c +--- linux-4.4.217/net/unix/diag.c 2020-03-27 06:54:59.051709093 +0000 ++++ linux-4.4.217-vs2.3.9.9/net/unix/diag.c 2019-10-05 14:35:43.902627739 +0000 @@ -4,6 +4,7 @@ #include #include @@ -24781,9 +24802,9 @@ diff -NurpP --minimal linux-4.4.197/net/unix/diag.c linux-4.4.197-vs2.3.9.8/net/ if (num < s_num) goto next; if (!(req->udiag_states & (1 << sk->sk_state))) -diff -NurpP --minimal linux-4.4.197/scripts/checksyscalls.sh linux-4.4.197-vs2.3.9.8/scripts/checksyscalls.sh ---- linux-4.4.197/scripts/checksyscalls.sh 2016-01-10 23:01:32.000000000 +0000 -+++ linux-4.4.197-vs2.3.9.8/scripts/checksyscalls.sh 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/scripts/checksyscalls.sh linux-4.4.217-vs2.3.9.9/scripts/checksyscalls.sh +--- linux-4.4.217/scripts/checksyscalls.sh 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.217-vs2.3.9.9/scripts/checksyscalls.sh 2018-10-20 04:57:21.000000000 +0000 @@ -196,7 +196,6 @@ cat << EOF #define __IGNORE_afs_syscall #define __IGNORE_getpmsg @@ -24792,9 +24813,9 @@ diff -NurpP --minimal linux-4.4.197/scripts/checksyscalls.sh linux-4.4.197-vs2.3 EOF } -diff -NurpP --minimal linux-4.4.197/security/commoncap.c linux-4.4.197-vs2.3.9.8/security/commoncap.c ---- linux-4.4.197/security/commoncap.c 2019-10-22 12:34:49.458420344 +0000 -+++ linux-4.4.197-vs2.3.9.8/security/commoncap.c 2018-10-20 04:57:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.217/security/commoncap.c linux-4.4.217-vs2.3.9.9/security/commoncap.c +--- linux-4.4.217/security/commoncap.c 2020-03-27 06:55:00.091691985 +0000 ++++ linux-4.4.217-vs2.3.9.9/security/commoncap.c 2018-10-20 04:57:21.000000000 +0000 @@ -71,6 +71,7 @@ static void warn_setuid_and_fcaps_mixed( int cap_capable(const struct cred *cred, struct user_namespace *targ_ns, int cap, int audit) @@ -24836,9 +24857,9 @@ diff -NurpP --minimal linux-4.4.197/security/commoncap.c linux-4.4.197-vs2.3.9.8 return -EPERM; return 0; } -diff -NurpP --minimal linux-4.4.197/security/selinux/hooks.c linux-4.4.197-vs2.3.9.8/security/selinux/hooks.c ---- linux-4.4.197/security/selinux/hooks.c 2019-10-22 12:34:49.928412834 +0000 -+++ linux-4.4.197-vs2.3.9.8/security/selinux/hooks.c 2019-10-05 14:35:45.912595854 +0000 +diff -NurpP --minimal linux-4.4.217/security/selinux/hooks.c linux-4.4.217-vs2.3.9.9/security/selinux/hooks.c +--- linux-4.4.217/security/selinux/hooks.c 2020-03-27 06:55:00.281688860 +0000 ++++ linux-4.4.217-vs2.3.9.9/security/selinux/hooks.c 2019-10-05 14:35:45.912595854 +0000 @@ -67,7 +67,6 @@ #include #include diff --git a/kernel.spec b/kernel.spec index 49ea8f42..933bc869 100644 --- a/kernel.spec +++ b/kernel.spec @@ -72,7 +72,7 @@ %define rel 1 %define basever 4.4 -%define postver .227 +%define postver .230 # define this to '-%{basever}' for longterm branch %define versuffix -%{basever} @@ -124,7 +124,7 @@ Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz # Source0-md5: 9a78fa2eb6c68ca5a40ed5af08142599 %if "%{postver}" != ".0" Patch0: http://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz -# Patch0-md5: 0f2f683255fd17df217cfd80278567b5 +# Patch0-md5: 4a1285c203923cb99c3538fdcb58fac4 %endif Source1: kernel.sysconfig @@ -193,7 +193,7 @@ Patch59: kernel-rndis_host-wm5.patch Patch85: kernel-hostap.patch %define vserver_patch 4.4.197-vs2.3.9.8 -# http://vserver.13thfloor.at/Experimental/patch-4.4.197-vs2.3.9.8.diff +# http://vserver.13thfloor.at/Experimental/patch-4.4.217-vs2.3.9.9.diff # note there are additional patches from above url: # - *fix* are real fixes (we want these) # - *feat* are new features/tests (we don't want these)