From 8931d859c2e99154e09e3514268180bb85e75f4f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Sat, 27 Oct 2018 21:27:38 +0200 Subject: [PATCH] - update vserver patch to vs2.3.9.8 --- kernel-vserver-2.3.patch | 2721 +++++++++++++++++++------------------- kernel.spec | 4 +- 2 files changed, 1394 insertions(+), 1331 deletions(-) diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch index d5248fcf..6cc0c71b 100644 --- a/kernel-vserver-2.3.patch +++ b/kernel-vserver-2.3.patch @@ -1,6 +1,6 @@ -diff -NurpP --minimal linux-4.4.116/Documentation/vserver/debug.txt linux-4.4.116-vs2.3.9.7/Documentation/vserver/debug.txt ---- linux-4.4.116/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/Documentation/vserver/debug.txt 2018-01-09 16:36:20.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/Documentation/vserver/debug.txt linux-4.4.161-vs2.3.9.8/Documentation/vserver/debug.txt +--- linux-4.4.161/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/Documentation/vserver/debug.txt 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,154 @@ + +debug_cvirt: @@ -156,9 +156,9 @@ diff -NurpP --minimal linux-4.4.116/Documentation/vserver/debug.txt linux-4.4.11 + 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.116/arch/alpha/Kconfig linux-4.4.116-vs2.3.9.7/arch/alpha/Kconfig ---- linux-4.4.116/arch/alpha/Kconfig 2016-07-05 04:11:34.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/arch/alpha/Kconfig 2018-01-09 16:36:20.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/arch/alpha/Kconfig linux-4.4.161-vs2.3.9.8/arch/alpha/Kconfig +--- linux-4.4.161/arch/alpha/Kconfig 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/arch/alpha/Kconfig 2018-10-20 04:57:21.000000000 +0000 @@ -745,6 +745,8 @@ config DUMMY_CONSOLE depends on VGA_HOSE default y @@ -168,9 +168,9 @@ diff -NurpP --minimal linux-4.4.116/arch/alpha/Kconfig linux-4.4.116-vs2.3.9.7/a source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-4.4.116/arch/alpha/kernel/systbls.S linux-4.4.116-vs2.3.9.7/arch/alpha/kernel/systbls.S ---- linux-4.4.116/arch/alpha/kernel/systbls.S 2015-07-06 20:41:36.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/arch/alpha/kernel/systbls.S 2018-01-09 16:36:20.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/arch/alpha/kernel/systbls.S linux-4.4.161-vs2.3.9.8/arch/alpha/kernel/systbls.S +--- linux-4.4.161/arch/alpha/kernel/systbls.S 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -180,9 +180,9 @@ diff -NurpP --minimal linux-4.4.116/arch/alpha/kernel/systbls.S linux-4.4.116-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.116/arch/alpha/kernel/traps.c linux-4.4.116-vs2.3.9.7/arch/alpha/kernel/traps.c ---- linux-4.4.116/arch/alpha/kernel/traps.c 2015-07-06 20:41:36.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/arch/alpha/kernel/traps.c 2018-01-09 16:36:20.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/arch/alpha/kernel/traps.c linux-4.4.161-vs2.3.9.8/arch/alpha/kernel/traps.c +--- linux-4.4.161/arch/alpha/kernel/traps.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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()); @@ -193,9 +193,9 @@ diff -NurpP --minimal linux-4.4.116/arch/alpha/kernel/traps.c linux-4.4.116-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.116/arch/arm/Kconfig linux-4.4.116-vs2.3.9.7/arch/arm/Kconfig ---- linux-4.4.116/arch/arm/Kconfig 2016-07-05 04:14:23.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/arch/arm/Kconfig 2018-01-09 16:36:20.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/arch/arm/Kconfig linux-4.4.161-vs2.3.9.8/arch/arm/Kconfig +--- linux-4.4.161/arch/arm/Kconfig 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/arch/arm/Kconfig 2018-10-20 04:57:21.000000000 +0000 @@ -2159,6 +2159,8 @@ source "fs/Kconfig" source "arch/arm/Kconfig.debug" @@ -205,9 +205,9 @@ diff -NurpP --minimal linux-4.4.116/arch/arm/Kconfig linux-4.4.116-vs2.3.9.7/arc source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-4.4.116/arch/arm/kernel/calls.S linux-4.4.116-vs2.3.9.7/arch/arm/kernel/calls.S ---- linux-4.4.116/arch/arm/kernel/calls.S 2016-07-05 04:14:26.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/arch/arm/kernel/calls.S 2018-01-09 16:36:20.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/arch/arm/kernel/calls.S linux-4.4.161-vs2.3.9.8/arch/arm/kernel/calls.S +--- linux-4.4.161/arch/arm/kernel/calls.S 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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) @@ -217,10 +217,10 @@ diff -NurpP --minimal linux-4.4.116/arch/arm/kernel/calls.S linux-4.4.116-vs2.3. CALL(sys_ioprio_set) /* 315 */ CALL(sys_ioprio_get) CALL(sys_inotify_init) -diff -NurpP --minimal linux-4.4.116/arch/arm/kernel/traps.c linux-4.4.116-vs2.3.9.7/arch/arm/kernel/traps.c ---- linux-4.4.116/arch/arm/kernel/traps.c 2018-02-22 21:18:48.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/arch/arm/kernel/traps.c 2018-01-09 16:36:20.000000000 +0000 -@@ -258,8 +258,8 @@ static int __die(const char *str, int er +diff -NurpP --minimal linux-4.4.161/arch/arm/kernel/traps.c linux-4.4.161-vs2.3.9.8/arch/arm/kernel/traps.c +--- linux-4.4.161/arch/arm/kernel/traps.c 2018-10-20 02:34:24.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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(); __show_regs(regs); @@ -231,9 +231,9 @@ diff -NurpP --minimal linux-4.4.116/arch/arm/kernel/traps.c linux-4.4.116-vs2.3. if (!user_mode(regs) || in_interrupt()) { dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp, -diff -NurpP --minimal linux-4.4.116/arch/cris/Kconfig linux-4.4.116-vs2.3.9.7/arch/cris/Kconfig ---- linux-4.4.116/arch/cris/Kconfig 2016-07-05 04:14:27.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/arch/cris/Kconfig 2018-01-09 16:36:20.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/arch/cris/Kconfig linux-4.4.161-vs2.3.9.8/arch/cris/Kconfig +--- linux-4.4.161/arch/cris/Kconfig 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/arch/cris/Kconfig 2018-10-20 04:57:21.000000000 +0000 @@ -581,6 +581,8 @@ source "fs/Kconfig" source "arch/cris/Kconfig.debug" @@ -243,9 +243,9 @@ diff -NurpP --minimal linux-4.4.116/arch/cris/Kconfig linux-4.4.116-vs2.3.9.7/ar source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-4.4.116/arch/ia64/Kconfig linux-4.4.116-vs2.3.9.7/arch/ia64/Kconfig ---- linux-4.4.116/arch/ia64/Kconfig 2016-07-05 04:11:39.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/arch/ia64/Kconfig 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/arch/ia64/Kconfig linux-4.4.161-vs2.3.9.8/arch/ia64/Kconfig +--- linux-4.4.161/arch/ia64/Kconfig 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/arch/ia64/Kconfig 2018-10-20 04:57:21.000000000 +0000 @@ -606,6 +606,8 @@ source "fs/Kconfig" source "arch/ia64/Kconfig.debug" @@ -255,9 +255,9 @@ diff -NurpP --minimal linux-4.4.116/arch/ia64/Kconfig linux-4.4.116-vs2.3.9.7/ar source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-4.4.116/arch/ia64/kernel/entry.S linux-4.4.116-vs2.3.9.7/arch/ia64/kernel/entry.S ---- linux-4.4.116/arch/ia64/kernel/entry.S 2016-07-05 04:14:27.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/arch/ia64/kernel/entry.S 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/arch/ia64/kernel/entry.S linux-4.4.161-vs2.3.9.8/arch/ia64/kernel/entry.S +--- linux-4.4.161/arch/ia64/kernel/entry.S 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -267,9 +267,9 @@ diff -NurpP --minimal linux-4.4.116/arch/ia64/kernel/entry.S linux-4.4.116-vs2.3 data8 sys_waitid // 1270 data8 sys_add_key data8 sys_request_key -diff -NurpP --minimal linux-4.4.116/arch/ia64/kernel/ptrace.c linux-4.4.116-vs2.3.9.7/arch/ia64/kernel/ptrace.c ---- linux-4.4.116/arch/ia64/kernel/ptrace.c 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/arch/ia64/kernel/ptrace.c 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/arch/ia64/kernel/ptrace.c linux-4.4.161-vs2.3.9.8/arch/ia64/kernel/ptrace.c +--- linux-4.4.161/arch/ia64/kernel/ptrace.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/arch/ia64/kernel/ptrace.c 2018-10-20 04:57:21.000000000 +0000 @@ -21,6 +21,7 @@ #include #include @@ -278,9 +278,9 @@ diff -NurpP --minimal linux-4.4.116/arch/ia64/kernel/ptrace.c linux-4.4.116-vs2. #include #include -diff -NurpP --minimal linux-4.4.116/arch/ia64/kernel/traps.c linux-4.4.116-vs2.3.9.7/arch/ia64/kernel/traps.c ---- linux-4.4.116/arch/ia64/kernel/traps.c 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/arch/ia64/kernel/traps.c 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/arch/ia64/kernel/traps.c linux-4.4.161-vs2.3.9.8/arch/ia64/kernel/traps.c +--- linux-4.4.161/arch/ia64/kernel/traps.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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(); @@ -305,9 +305,9 @@ diff -NurpP --minimal linux-4.4.116/arch/ia64/kernel/traps.c linux-4.4.116-vs2.3 } } } -diff -NurpP --minimal linux-4.4.116/arch/m32r/kernel/traps.c linux-4.4.116-vs2.3.9.7/arch/m32r/kernel/traps.c ---- linux-4.4.116/arch/m32r/kernel/traps.c 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/arch/m32r/kernel/traps.c 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/arch/m32r/kernel/traps.c linux-4.4.161-vs2.3.9.8/arch/m32r/kernel/traps.c +--- linux-4.4.161/arch/m32r/kernel/traps.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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); @@ -320,9 +320,9 @@ diff -NurpP --minimal linux-4.4.116/arch/m32r/kernel/traps.c linux-4.4.116-vs2.3 /* * When in-kernel, we also print out the stack and code at the -diff -NurpP --minimal linux-4.4.116/arch/m68k/Kconfig linux-4.4.116-vs2.3.9.7/arch/m68k/Kconfig ---- linux-4.4.116/arch/m68k/Kconfig 2016-07-05 04:11:39.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/arch/m68k/Kconfig 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/arch/m68k/Kconfig linux-4.4.161-vs2.3.9.8/arch/m68k/Kconfig +--- linux-4.4.161/arch/m68k/Kconfig 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/arch/m68k/Kconfig 2018-10-20 04:57:21.000000000 +0000 @@ -164,6 +164,8 @@ source "fs/Kconfig" source "arch/m68k/Kconfig.debug" @@ -332,9 +332,9 @@ diff -NurpP --minimal linux-4.4.116/arch/m68k/Kconfig linux-4.4.116-vs2.3.9.7/ar source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-4.4.116/arch/mips/Kconfig linux-4.4.116-vs2.3.9.7/arch/mips/Kconfig ---- linux-4.4.116/arch/mips/Kconfig 2018-02-22 21:18:55.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/arch/mips/Kconfig 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/arch/mips/Kconfig linux-4.4.161-vs2.3.9.8/arch/mips/Kconfig +--- linux-4.4.161/arch/mips/Kconfig 2018-10-20 02:34:25.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/arch/mips/Kconfig 2018-10-20 04:57:21.000000000 +0000 @@ -3026,6 +3026,8 @@ source "fs/Kconfig" source "arch/mips/Kconfig.debug" @@ -344,9 +344,9 @@ diff -NurpP --minimal linux-4.4.116/arch/mips/Kconfig linux-4.4.116-vs2.3.9.7/ar source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-4.4.116/arch/mips/kernel/ptrace.c linux-4.4.116-vs2.3.9.7/arch/mips/kernel/ptrace.c ---- linux-4.4.116/arch/mips/kernel/ptrace.c 2018-02-22 21:18:56.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/arch/mips/kernel/ptrace.c 2018-01-25 00:25:00.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/arch/mips/kernel/ptrace.c linux-4.4.161-vs2.3.9.8/arch/mips/kernel/ptrace.c +--- linux-4.4.161/arch/mips/kernel/ptrace.c 2018-10-20 02:34:25.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/arch/mips/kernel/ptrace.c 2018-10-20 05:50:17.000000000 +0000 @@ -30,6 +30,7 @@ #include #include @@ -355,7 +355,7 @@ diff -NurpP --minimal linux-4.4.116/arch/mips/kernel/ptrace.c linux-4.4.116-vs2. #include #include -@@ -787,6 +788,9 @@ long arch_ptrace(struct task_struct *chi +@@ -801,6 +802,9 @@ long arch_ptrace(struct task_struct *chi void __user *datavp = (void __user *) data; unsigned long __user *datalp = (void __user *) data; @@ -365,9 +365,9 @@ diff -NurpP --minimal linux-4.4.116/arch/mips/kernel/ptrace.c linux-4.4.116-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.116/arch/mips/kernel/scall32-o32.S linux-4.4.116-vs2.3.9.7/arch/mips/kernel/scall32-o32.S ---- linux-4.4.116/arch/mips/kernel/scall32-o32.S 2018-02-22 21:18:56.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/arch/mips/kernel/scall32-o32.S 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/arch/mips/kernel/scall32-o32.S linux-4.4.161-vs2.3.9.8/arch/mips/kernel/scall32-o32.S +--- linux-4.4.161/arch/mips/kernel/scall32-o32.S 2018-10-20 02:34:25.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 */ @@ -377,9 +377,9 @@ diff -NurpP --minimal linux-4.4.116/arch/mips/kernel/scall32-o32.S linux-4.4.116 PTR sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key /* 4280 */ -diff -NurpP --minimal linux-4.4.116/arch/mips/kernel/scall64-64.S linux-4.4.116-vs2.3.9.7/arch/mips/kernel/scall64-64.S ---- linux-4.4.116/arch/mips/kernel/scall64-64.S 2018-02-22 21:18:56.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/arch/mips/kernel/scall64-64.S 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/arch/mips/kernel/scall64-64.S linux-4.4.161-vs2.3.9.8/arch/mips/kernel/scall64-64.S +--- linux-4.4.161/arch/mips/kernel/scall64-64.S 2018-10-20 02:34:25.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -389,9 +389,9 @@ diff -NurpP --minimal linux-4.4.116/arch/mips/kernel/scall64-64.S linux-4.4.116- PTR sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key -diff -NurpP --minimal linux-4.4.116/arch/mips/kernel/scall64-n32.S linux-4.4.116-vs2.3.9.7/arch/mips/kernel/scall64-n32.S ---- linux-4.4.116/arch/mips/kernel/scall64-n32.S 2018-02-22 21:18:56.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/arch/mips/kernel/scall64-n32.S 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/arch/mips/kernel/scall64-n32.S linux-4.4.161-vs2.3.9.8/arch/mips/kernel/scall64-n32.S +--- linux-4.4.161/arch/mips/kernel/scall64-n32.S 2018-10-20 02:34:25.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -401,9 +401,9 @@ diff -NurpP --minimal linux-4.4.116/arch/mips/kernel/scall64-n32.S linux-4.4.116 PTR compat_sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key -diff -NurpP --minimal linux-4.4.116/arch/mips/kernel/scall64-o32.S linux-4.4.116-vs2.3.9.7/arch/mips/kernel/scall64-o32.S ---- linux-4.4.116/arch/mips/kernel/scall64-o32.S 2018-02-22 21:18:56.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/arch/mips/kernel/scall64-o32.S 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/arch/mips/kernel/scall64-o32.S linux-4.4.161-vs2.3.9.8/arch/mips/kernel/scall64-o32.S +--- linux-4.4.161/arch/mips/kernel/scall64-o32.S 2018-10-20 02:34:25.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/arch/mips/kernel/scall64-o32.S 2018-10-20 04:57:21.000000000 +0000 @@ -495,7 +495,7 @@ EXPORT(sys32_call_table) PTR compat_sys_mq_timedreceive PTR compat_sys_mq_notify /* 4275 */ @@ -413,10 +413,10 @@ diff -NurpP --minimal linux-4.4.116/arch/mips/kernel/scall64-o32.S linux-4.4.116 PTR compat_sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key /* 4280 */ -diff -NurpP --minimal linux-4.4.116/arch/mips/kernel/traps.c linux-4.4.116-vs2.3.9.7/arch/mips/kernel/traps.c ---- linux-4.4.116/arch/mips/kernel/traps.c 2018-02-22 21:18:56.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/arch/mips/kernel/traps.c 2018-01-09 16:36:21.000000000 +0000 -@@ -353,9 +353,10 @@ void show_registers(struct pt_regs *regs +diff -NurpP --minimal linux-4.4.161/arch/mips/kernel/traps.c linux-4.4.161-vs2.3.9.8/arch/mips/kernel/traps.c +--- linux-4.4.161/arch/mips/kernel/traps.c 2018-10-20 02:34:25.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/arch/mips/kernel/traps.c 2018-10-20 05:50:17.000000000 +0000 +@@ -354,9 +354,10 @@ void show_registers(struct pt_regs *regs __show_regs(regs); print_modules(); @@ -430,9 +430,9 @@ diff -NurpP --minimal linux-4.4.116/arch/mips/kernel/traps.c linux-4.4.116-vs2.3 if (cpu_has_userlocal) { unsigned long tls; -diff -NurpP --minimal linux-4.4.116/arch/parisc/Kconfig linux-4.4.116-vs2.3.9.7/arch/parisc/Kconfig ---- linux-4.4.116/arch/parisc/Kconfig 2016-07-05 04:14:29.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/arch/parisc/Kconfig 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/arch/parisc/Kconfig linux-4.4.161-vs2.3.9.8/arch/parisc/Kconfig +--- linux-4.4.161/arch/parisc/Kconfig 2018-10-20 02:34:25.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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. @@ -442,9 +442,9 @@ diff -NurpP --minimal linux-4.4.116/arch/parisc/Kconfig linux-4.4.116-vs2.3.9.7/ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-4.4.116/arch/parisc/kernel/syscall_table.S linux-4.4.116-vs2.3.9.7/arch/parisc/kernel/syscall_table.S ---- linux-4.4.116/arch/parisc/kernel/syscall_table.S 2018-02-22 21:18:58.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/arch/parisc/kernel/syscall_table.S 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/arch/parisc/kernel/syscall_table.S linux-4.4.161-vs2.3.9.8/arch/parisc/kernel/syscall_table.S +--- linux-4.4.161/arch/parisc/kernel/syscall_table.S 2018-10-20 02:34:25.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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) @@ -454,9 +454,9 @@ diff -NurpP --minimal linux-4.4.116/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.116/arch/parisc/kernel/traps.c linux-4.4.116-vs2.3.9.7/arch/parisc/kernel/traps.c ---- linux-4.4.116/arch/parisc/kernel/traps.c 2018-02-22 21:18:58.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/arch/parisc/kernel/traps.c 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/arch/parisc/kernel/traps.c linux-4.4.161-vs2.3.9.8/arch/parisc/kernel/traps.c +--- linux-4.4.161/arch/parisc/kernel/traps.c 2018-10-20 02:34:25.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/arch/parisc/kernel/traps.c 2018-10-20 04:57:21.000000000 +0000 @@ -235,8 +235,9 @@ void die_if_kernel(char *str, struct pt_ return; /* STFU */ @@ -480,9 +480,9 @@ diff -NurpP --minimal linux-4.4.116/arch/parisc/kernel/traps.c linux-4.4.116-vs2 /* Wot's wrong wif bein' racy? */ if (current->thread.flags & PARISC_KERNEL_DEATH) { -diff -NurpP --minimal linux-4.4.116/arch/powerpc/Kconfig linux-4.4.116-vs2.3.9.7/arch/powerpc/Kconfig ---- linux-4.4.116/arch/powerpc/Kconfig 2018-02-22 21:18:58.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/arch/powerpc/Kconfig 2018-02-22 21:30:19.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/arch/powerpc/Kconfig linux-4.4.161-vs2.3.9.8/arch/powerpc/Kconfig +--- linux-4.4.161/arch/powerpc/Kconfig 2018-10-20 02:34:25.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/arch/powerpc/Kconfig 2018-10-20 04:57:21.000000000 +0000 @@ -1081,6 +1081,8 @@ source "lib/Kconfig" source "arch/powerpc/Kconfig.debug" @@ -492,9 +492,9 @@ diff -NurpP --minimal linux-4.4.116/arch/powerpc/Kconfig linux-4.4.116-vs2.3.9.7 source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-4.4.116/arch/powerpc/include/uapi/asm/unistd.h linux-4.4.116-vs2.3.9.7/arch/powerpc/include/uapi/asm/unistd.h ---- linux-4.4.116/arch/powerpc/include/uapi/asm/unistd.h 2016-07-05 04:14:29.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/arch/powerpc/include/uapi/asm/unistd.h 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/arch/powerpc/include/uapi/asm/unistd.h linux-4.4.161-vs2.3.9.8/arch/powerpc/include/uapi/asm/unistd.h +--- linux-4.4.161/arch/powerpc/include/uapi/asm/unistd.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/arch/powerpc/include/uapi/asm/unistd.h 2018-10-20 04:57:21.000000000 +0000 @@ -275,7 +275,7 @@ #endif #define __NR_rtas 255 @@ -504,9 +504,9 @@ diff -NurpP --minimal linux-4.4.116/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.116/arch/powerpc/kernel/traps.c linux-4.4.116-vs2.3.9.7/arch/powerpc/kernel/traps.c ---- linux-4.4.116/arch/powerpc/kernel/traps.c 2018-02-22 21:19:02.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/arch/powerpc/kernel/traps.c 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/arch/powerpc/kernel/traps.c linux-4.4.161-vs2.3.9.8/arch/powerpc/kernel/traps.c +--- linux-4.4.161/arch/powerpc/kernel/traps.c 2018-10-20 02:34:25.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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) @@ -519,10 +519,10 @@ diff -NurpP --minimal linux-4.4.116/arch/powerpc/kernel/traps.c linux-4.4.116-vs regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted()); } -diff -NurpP --minimal linux-4.4.116/arch/s390/Kconfig linux-4.4.116-vs2.3.9.7/arch/s390/Kconfig ---- linux-4.4.116/arch/s390/Kconfig 2018-02-22 21:19:03.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/arch/s390/Kconfig 2018-02-10 15:16:50.000000000 +0000 -@@ -730,6 +730,8 @@ source "fs/Kconfig" +diff -NurpP --minimal linux-4.4.161/arch/s390/Kconfig linux-4.4.161-vs2.3.9.8/arch/s390/Kconfig +--- linux-4.4.161/arch/s390/Kconfig 2018-10-20 02:34:25.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/arch/s390/Kconfig 2018-10-20 04:57:21.000000000 +0000 +@@ -776,6 +776,8 @@ source "fs/Kconfig" source "arch/s390/Kconfig.debug" @@ -531,9 +531,9 @@ diff -NurpP --minimal linux-4.4.116/arch/s390/Kconfig linux-4.4.116-vs2.3.9.7/ar source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-4.4.116/arch/s390/include/asm/tlb.h linux-4.4.116-vs2.3.9.7/arch/s390/include/asm/tlb.h ---- linux-4.4.116/arch/s390/include/asm/tlb.h 2015-07-06 20:41:37.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/arch/s390/include/asm/tlb.h 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/arch/s390/include/asm/tlb.h linux-4.4.161-vs2.3.9.8/arch/s390/include/asm/tlb.h +--- linux-4.4.161/arch/s390/include/asm/tlb.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/arch/s390/include/asm/tlb.h 2018-10-20 04:57:21.000000000 +0000 @@ -24,6 +24,7 @@ #include #include @@ -542,9 +542,9 @@ diff -NurpP --minimal linux-4.4.116/arch/s390/include/asm/tlb.h linux-4.4.116-vs #include #include #include -diff -NurpP --minimal linux-4.4.116/arch/s390/include/uapi/asm/unistd.h linux-4.4.116-vs2.3.9.7/arch/s390/include/uapi/asm/unistd.h ---- linux-4.4.116/arch/s390/include/uapi/asm/unistd.h 2016-07-05 04:14:30.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/arch/s390/include/uapi/asm/unistd.h 2018-01-09 16:48:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/arch/s390/include/uapi/asm/unistd.h linux-4.4.161-vs2.3.9.8/arch/s390/include/uapi/asm/unistd.h +--- linux-4.4.161/arch/s390/include/uapi/asm/unistd.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -554,9 +554,9 @@ diff -NurpP --minimal linux-4.4.116/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.116/arch/s390/kernel/ptrace.c linux-4.4.116-vs2.3.9.7/arch/s390/kernel/ptrace.c ---- linux-4.4.116/arch/s390/kernel/ptrace.c 2018-02-22 21:19:04.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/arch/s390/kernel/ptrace.c 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/arch/s390/kernel/ptrace.c linux-4.4.161-vs2.3.9.8/arch/s390/kernel/ptrace.c +--- linux-4.4.161/arch/s390/kernel/ptrace.c 2018-10-20 02:34:25.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/arch/s390/kernel/ptrace.c 2018-10-20 04:57:21.000000000 +0000 @@ -21,6 +21,7 @@ #include #include @@ -565,9 +565,9 @@ diff -NurpP --minimal linux-4.4.116/arch/s390/kernel/ptrace.c linux-4.4.116-vs2. #include #include #include -diff -NurpP --minimal linux-4.4.116/arch/s390/kernel/syscalls.S linux-4.4.116-vs2.3.9.7/arch/s390/kernel/syscalls.S ---- linux-4.4.116/arch/s390/kernel/syscalls.S 2018-02-22 21:19:04.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/arch/s390/kernel/syscalls.S 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/arch/s390/kernel/syscalls.S linux-4.4.161-vs2.3.9.8/arch/s390/kernel/syscalls.S +--- linux-4.4.161/arch/s390/kernel/syscalls.S 2018-10-20 02:34:25.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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) @@ -577,9 +577,9 @@ diff -NurpP --minimal linux-4.4.116/arch/s390/kernel/syscalls.S linux-4.4.116-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.116/arch/sh/Kconfig linux-4.4.116-vs2.3.9.7/arch/sh/Kconfig ---- linux-4.4.116/arch/sh/Kconfig 2016-07-05 04:11:46.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/arch/sh/Kconfig 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/arch/sh/Kconfig linux-4.4.161-vs2.3.9.8/arch/sh/Kconfig +--- linux-4.4.161/arch/sh/Kconfig 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/arch/sh/Kconfig 2018-10-20 04:57:21.000000000 +0000 @@ -883,6 +883,8 @@ source "fs/Kconfig" source "arch/sh/Kconfig.debug" @@ -589,9 +589,9 @@ diff -NurpP --minimal linux-4.4.116/arch/sh/Kconfig linux-4.4.116-vs2.3.9.7/arch source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-4.4.116/arch/sh/kernel/irq.c linux-4.4.116-vs2.3.9.7/arch/sh/kernel/irq.c ---- linux-4.4.116/arch/sh/kernel/irq.c 2016-07-05 04:11:46.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/arch/sh/kernel/irq.c 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/arch/sh/kernel/irq.c linux-4.4.161-vs2.3.9.8/arch/sh/kernel/irq.c +--- linux-4.4.161/arch/sh/kernel/irq.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/arch/sh/kernel/irq.c 2018-10-20 04:57:21.000000000 +0000 @@ -14,6 +14,7 @@ #include #include @@ -600,9 +600,9 @@ diff -NurpP --minimal linux-4.4.116/arch/sh/kernel/irq.c linux-4.4.116-vs2.3.9.7 #include #include #include -diff -NurpP --minimal linux-4.4.116/arch/sparc/Kconfig linux-4.4.116-vs2.3.9.7/arch/sparc/Kconfig ---- linux-4.4.116/arch/sparc/Kconfig 2018-02-22 21:19:04.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/arch/sparc/Kconfig 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/arch/sparc/Kconfig linux-4.4.161-vs2.3.9.8/arch/sparc/Kconfig +--- linux-4.4.161/arch/sparc/Kconfig 2018-10-20 02:34:25.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/arch/sparc/Kconfig 2018-10-20 04:57:21.000000000 +0000 @@ -561,6 +561,8 @@ source "fs/Kconfig" source "arch/sparc/Kconfig.debug" @@ -612,9 +612,9 @@ diff -NurpP --minimal linux-4.4.116/arch/sparc/Kconfig linux-4.4.116-vs2.3.9.7/a source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-4.4.116/arch/sparc/include/uapi/asm/unistd.h linux-4.4.116-vs2.3.9.7/arch/sparc/include/uapi/asm/unistd.h ---- linux-4.4.116/arch/sparc/include/uapi/asm/unistd.h 2016-07-05 04:14:33.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/arch/sparc/include/uapi/asm/unistd.h 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/arch/sparc/include/uapi/asm/unistd.h linux-4.4.161-vs2.3.9.8/arch/sparc/include/uapi/asm/unistd.h +--- linux-4.4.161/arch/sparc/include/uapi/asm/unistd.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -624,9 +624,9 @@ diff -NurpP --minimal linux-4.4.116/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.116/arch/sparc/kernel/systbls_32.S linux-4.4.116-vs2.3.9.7/arch/sparc/kernel/systbls_32.S ---- linux-4.4.116/arch/sparc/kernel/systbls_32.S 2016-07-05 04:14:33.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/arch/sparc/kernel/systbls_32.S 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/arch/sparc/kernel/systbls_32.S linux-4.4.161-vs2.3.9.8/arch/sparc/kernel/systbls_32.S +--- linux-4.4.161/arch/sparc/kernel/systbls_32.S 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -636,9 +636,9 @@ diff -NurpP --minimal linux-4.4.116/arch/sparc/kernel/systbls_32.S linux-4.4.116 /*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.116/arch/sparc/kernel/systbls_64.S linux-4.4.116-vs2.3.9.7/arch/sparc/kernel/systbls_64.S ---- linux-4.4.116/arch/sparc/kernel/systbls_64.S 2016-07-05 04:14:33.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/arch/sparc/kernel/systbls_64.S 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/arch/sparc/kernel/systbls_64.S linux-4.4.161-vs2.3.9.8/arch/sparc/kernel/systbls_64.S +--- linux-4.4.161/arch/sparc/kernel/systbls_64.S 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -657,9 +657,9 @@ diff -NurpP --minimal linux-4.4.116/arch/sparc/kernel/systbls_64.S linux-4.4.116 /*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.116/arch/um/Kconfig.rest linux-4.4.116-vs2.3.9.7/arch/um/Kconfig.rest ---- linux-4.4.116/arch/um/Kconfig.rest 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/arch/um/Kconfig.rest 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/arch/um/Kconfig.rest linux-4.4.161-vs2.3.9.8/arch/um/Kconfig.rest +--- linux-4.4.161/arch/um/Kconfig.rest 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/arch/um/Kconfig.rest 2018-10-20 04:57:21.000000000 +0000 @@ -12,6 +12,8 @@ source "arch/um/Kconfig.net" source "fs/Kconfig" @@ -669,10 +669,10 @@ diff -NurpP --minimal linux-4.4.116/arch/um/Kconfig.rest linux-4.4.116-vs2.3.9.7 source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-4.4.116/arch/x86/Kconfig linux-4.4.116-vs2.3.9.7/arch/x86/Kconfig ---- linux-4.4.116/arch/x86/Kconfig 2018-02-22 21:19:06.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/arch/x86/Kconfig 2018-02-10 15:16:50.000000000 +0000 -@@ -2687,6 +2687,8 @@ source "fs/Kconfig" +diff -NurpP --minimal linux-4.4.161/arch/x86/Kconfig linux-4.4.161-vs2.3.9.8/arch/x86/Kconfig +--- linux-4.4.161/arch/x86/Kconfig 2018-10-20 02:34:25.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/arch/x86/Kconfig 2018-10-20 04:57:21.000000000 +0000 +@@ -2693,6 +2693,8 @@ source "fs/Kconfig" source "arch/x86/Kconfig.debug" @@ -681,9 +681,9 @@ diff -NurpP --minimal linux-4.4.116/arch/x86/Kconfig linux-4.4.116-vs2.3.9.7/arc source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-4.4.116/arch/x86/entry/syscalls/syscall_32.tbl linux-4.4.116-vs2.3.9.7/arch/x86/entry/syscalls/syscall_32.tbl ---- linux-4.4.116/arch/x86/entry/syscalls/syscall_32.tbl 2018-02-22 21:19:07.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/arch/x86/entry/syscalls/syscall_32.tbl 2018-01-10 01:51:14.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/arch/x86/entry/syscalls/syscall_32.tbl linux-4.4.161-vs2.3.9.8/arch/x86/entry/syscalls/syscall_32.tbl +--- linux-4.4.161/arch/x86/entry/syscalls/syscall_32.tbl 2018-10-20 02:34:25.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -693,9 +693,9 @@ diff -NurpP --minimal linux-4.4.116/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.116/arch/x86/entry/syscalls/syscall_64.tbl linux-4.4.116-vs2.3.9.7/arch/x86/entry/syscalls/syscall_64.tbl ---- linux-4.4.116/arch/x86/entry/syscalls/syscall_64.tbl 2016-07-05 04:14:33.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/arch/x86/entry/syscalls/syscall_64.tbl 2018-01-10 01:51:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/arch/x86/entry/syscalls/syscall_64.tbl linux-4.4.161-vs2.3.9.8/arch/x86/entry/syscalls/syscall_64.tbl +--- linux-4.4.161/arch/x86/entry/syscalls/syscall_64.tbl 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -705,9 +705,9 @@ diff -NurpP --minimal linux-4.4.116/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.116/block/ioprio.c linux-4.4.116-vs2.3.9.7/block/ioprio.c ---- linux-4.4.116/block/ioprio.c 2018-02-22 21:19:12.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/block/ioprio.c 2018-01-09 16:36:23.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/block/ioprio.c linux-4.4.161-vs2.3.9.8/block/ioprio.c +--- linux-4.4.161/block/ioprio.c 2018-10-20 02:34:26.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/block/ioprio.c 2018-10-20 04:57:21.000000000 +0000 @@ -28,6 +28,7 @@ #include #include @@ -734,9 +734,9 @@ diff -NurpP --minimal linux-4.4.116/block/ioprio.c linux-4.4.116-vs2.3.9.7/block tmpio = get_task_ioprio(p); if (tmpio < 0) continue; -diff -NurpP --minimal linux-4.4.116/drivers/block/Kconfig linux-4.4.116-vs2.3.9.7/drivers/block/Kconfig ---- linux-4.4.116/drivers/block/Kconfig 2016-07-05 04:14:35.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/drivers/block/Kconfig 2018-01-09 16:36:23.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/drivers/block/Kconfig linux-4.4.161-vs2.3.9.8/drivers/block/Kconfig +--- linux-4.4.161/drivers/block/Kconfig 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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.116/drivers/block/Kconfig linux-4.4.116-vs2.3.9. config BLK_DEV_NBD tristate "Network block device support" depends on NET -diff -NurpP --minimal linux-4.4.116/drivers/block/Makefile linux-4.4.116-vs2.3.9.7/drivers/block/Makefile ---- linux-4.4.116/drivers/block/Makefile 2016-07-05 04:14:35.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/drivers/block/Makefile 2018-01-09 16:36:23.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/drivers/block/Makefile linux-4.4.161-vs2.3.9.8/drivers/block/Makefile +--- linux-4.4.161/drivers/block/Makefile 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -762,9 +762,9 @@ diff -NurpP --minimal linux-4.4.116/drivers/block/Makefile linux-4.4.116-vs2.3.9 obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o obj-$(CONFIG_XEN_BLKDEV_BACKEND) += xen-blkback/ -diff -NurpP --minimal linux-4.4.116/drivers/block/loop.c linux-4.4.116-vs2.3.9.7/drivers/block/loop.c ---- linux-4.4.116/drivers/block/loop.c 2018-02-22 21:19:16.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/drivers/block/loop.c 2018-02-10 15:16:50.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/drivers/block/loop.c linux-4.4.161-vs2.3.9.8/drivers/block/loop.c +--- linux-4.4.161/drivers/block/loop.c 2018-10-20 02:34:26.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/drivers/block/loop.c 2018-10-20 04:57:21.000000000 +0000 @@ -76,6 +76,7 @@ #include #include @@ -773,7 +773,7 @@ diff -NurpP --minimal linux-4.4.116/drivers/block/loop.c linux-4.4.116-vs2.3.9.7 #include "loop.h" #include -@@ -935,6 +936,7 @@ static int loop_set_fd(struct loop_devic +@@ -947,6 +948,7 @@ static int loop_set_fd(struct loop_devic lo->lo_blocksize = lo_blocksize; lo->lo_device = bdev; lo->lo_flags = lo_flags; @@ -781,7 +781,7 @@ diff -NurpP --minimal linux-4.4.116/drivers/block/loop.c linux-4.4.116-vs2.3.9.7 lo->lo_backing_file = file; lo->transfer = NULL; lo->ioctl = NULL; -@@ -1055,6 +1057,7 @@ static int loop_clr_fd(struct loop_devic +@@ -1067,6 +1069,7 @@ static int loop_clr_fd(struct loop_devic lo->lo_offset = 0; lo->lo_sizelimit = 0; lo->lo_encrypt_key_size = 0; @@ -789,7 +789,7 @@ diff -NurpP --minimal linux-4.4.116/drivers/block/loop.c linux-4.4.116-vs2.3.9.7 memset(lo->lo_encrypt_key, 0, LO_KEY_SIZE); memset(lo->lo_crypt_name, 0, LO_NAME_SIZE); memset(lo->lo_file_name, 0, LO_NAME_SIZE); -@@ -1101,7 +1104,7 @@ loop_set_status(struct loop_device *lo, +@@ -1113,7 +1116,7 @@ loop_set_status(struct loop_device *lo, if (lo->lo_encrypt_key_size && !uid_eq(lo->lo_key_owner, uid) && @@ -798,7 +798,7 @@ diff -NurpP --minimal linux-4.4.116/drivers/block/loop.c linux-4.4.116-vs2.3.9.7 return -EPERM; if (lo->lo_state != Lo_bound) return -ENXIO; -@@ -1202,7 +1205,8 @@ loop_get_status(struct loop_device *lo, +@@ -1218,7 +1221,8 @@ loop_get_status(struct loop_device *lo, memcpy(info->lo_crypt_name, lo->lo_crypt_name, LO_NAME_SIZE); info->lo_encrypt_type = lo->lo_encryption ? lo->lo_encryption->number : 0; @@ -808,7 +808,7 @@ diff -NurpP --minimal linux-4.4.116/drivers/block/loop.c linux-4.4.116-vs2.3.9.7 info->lo_encrypt_key_size = lo->lo_encrypt_key_size; memcpy(info->lo_encrypt_key, lo->lo_encrypt_key, lo->lo_encrypt_key_size); -@@ -1563,6 +1567,11 @@ static int lo_open(struct block_device * +@@ -1579,6 +1583,11 @@ static int lo_open(struct block_device * goto out; } @@ -820,9 +820,9 @@ diff -NurpP --minimal linux-4.4.116/drivers/block/loop.c linux-4.4.116-vs2.3.9.7 atomic_inc(&lo->lo_refcnt); out: mutex_unlock(&loop_index_mutex); -diff -NurpP --minimal linux-4.4.116/drivers/block/loop.h linux-4.4.116-vs2.3.9.7/drivers/block/loop.h ---- linux-4.4.116/drivers/block/loop.h 2016-07-05 04:14:35.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/drivers/block/loop.h 2018-01-09 16:36:23.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/drivers/block/loop.h linux-4.4.161-vs2.3.9.8/drivers/block/loop.h +--- linux-4.4.161/drivers/block/loop.h 2018-10-20 02:34:26.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/drivers/block/loop.h 2018-10-20 04:57:21.000000000 +0000 @@ -43,6 +43,7 @@ struct loop_device { struct loop_func_table *lo_encryption; __u32 lo_init[2]; @@ -831,9 +831,9 @@ diff -NurpP --minimal linux-4.4.116/drivers/block/loop.h linux-4.4.116-vs2.3.9.7 int (*ioctl)(struct loop_device *, int cmd, unsigned long arg); -diff -NurpP --minimal linux-4.4.116/drivers/block/vroot.c linux-4.4.116-vs2.3.9.7/drivers/block/vroot.c ---- linux-4.4.116/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/drivers/block/vroot.c 2018-01-11 07:37:22.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/drivers/block/vroot.c linux-4.4.161-vs2.3.9.8/drivers/block/vroot.c +--- linux-4.4.161/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/drivers/block/vroot.c 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,291 @@ +/* + * linux/drivers/block/vroot.c @@ -1126,10 +1126,10 @@ diff -NurpP --minimal linux-4.4.116/drivers/block/vroot.c linux-4.4.116-vs2.3.9. + +#endif + -diff -NurpP --minimal linux-4.4.116/drivers/infiniband/core/addr.c linux-4.4.116-vs2.3.9.7/drivers/infiniband/core/addr.c ---- linux-4.4.116/drivers/infiniband/core/addr.c 2018-02-22 21:19:25.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/drivers/infiniband/core/addr.c 2018-01-09 16:49:06.000000000 +0000 -@@ -283,7 +283,7 @@ static int addr6_resolve(struct sockaddr +diff -NurpP --minimal linux-4.4.161/drivers/infiniband/core/addr.c linux-4.4.161-vs2.3.9.8/drivers/infiniband/core/addr.c +--- linux-4.4.161/drivers/infiniband/core/addr.c 2018-10-20 02:34:27.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/drivers/infiniband/core/addr.c 2018-10-20 04:57:21.000000000 +0000 +@@ -299,7 +299,7 @@ static int addr6_resolve(struct sockaddr if (ipv6_addr_any(&fl6.saddr)) { ret = ipv6_dev_get_saddr(addr->net, ip6_dst_idev(dst)->dev, @@ -1138,9 +1138,9 @@ diff -NurpP --minimal linux-4.4.116/drivers/infiniband/core/addr.c linux-4.4.116 if (ret) goto put; -diff -NurpP --minimal linux-4.4.116/drivers/md/dm-ioctl.c linux-4.4.116-vs2.3.9.7/drivers/md/dm-ioctl.c ---- linux-4.4.116/drivers/md/dm-ioctl.c 2018-02-22 21:19:28.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/drivers/md/dm-ioctl.c 2018-01-09 16:36:23.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/drivers/md/dm-ioctl.c linux-4.4.161-vs2.3.9.8/drivers/md/dm-ioctl.c +--- linux-4.4.161/drivers/md/dm-ioctl.c 2018-10-20 02:34:27.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/drivers/md/dm-ioctl.c 2018-10-20 04:57:21.000000000 +0000 @@ -16,6 +16,7 @@ #include #include @@ -1226,9 +1226,9 @@ diff -NurpP --minimal linux-4.4.116/drivers/md/dm-ioctl.c linux-4.4.116-vs2.3.9. return -EACCES; if (_IOC_TYPE(command) != DM_IOCTL) -diff -NurpP --minimal linux-4.4.116/drivers/md/dm.c linux-4.4.116-vs2.3.9.7/drivers/md/dm.c ---- linux-4.4.116/drivers/md/dm.c 2018-02-22 21:19:28.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/drivers/md/dm.c 2018-01-09 16:49:30.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/drivers/md/dm.c linux-4.4.161-vs2.3.9.8/drivers/md/dm.c +--- linux-4.4.161/drivers/md/dm.c 2018-10-20 02:34:27.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/drivers/md/dm.c 2018-10-20 04:57:21.000000000 +0000 @@ -25,6 +25,7 @@ #include /* for rq_end_sector() */ #include @@ -1293,7 +1293,7 @@ diff -NurpP --minimal linux-4.4.116/drivers/md/dm.c linux-4.4.116-vs2.3.9.7/driv /*----------------------------------------------------------------- * CRUD START: * A more elegant soln is in the works that uses the queue -@@ -2380,6 +2393,7 @@ static struct mapped_device *alloc_dev(i +@@ -2381,6 +2394,7 @@ static struct mapped_device *alloc_dev(i INIT_LIST_HEAD(&md->table_devices); spin_lock_init(&md->uevent_lock); @@ -1301,9 +1301,9 @@ diff -NurpP --minimal linux-4.4.116/drivers/md/dm.c linux-4.4.116-vs2.3.9.7/driv md->queue = blk_alloc_queue(GFP_KERNEL); if (!md->queue) goto bad; -diff -NurpP --minimal linux-4.4.116/drivers/md/dm.h linux-4.4.116-vs2.3.9.7/drivers/md/dm.h ---- linux-4.4.116/drivers/md/dm.h 2016-07-05 04:12:06.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/drivers/md/dm.h 2018-01-09 16:36:24.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/drivers/md/dm.h linux-4.4.161-vs2.3.9.8/drivers/md/dm.h +--- linux-4.4.161/drivers/md/dm.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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; @@ -1313,9 +1313,9 @@ diff -NurpP --minimal linux-4.4.116/drivers/md/dm.h linux-4.4.116-vs2.3.9.7/driv /*----------------------------------------------------------------- * Internal table functions. *---------------------------------------------------------------*/ -diff -NurpP --minimal linux-4.4.116/drivers/net/tun.c linux-4.4.116-vs2.3.9.7/drivers/net/tun.c ---- linux-4.4.116/drivers/net/tun.c 2018-02-22 21:19:36.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/drivers/net/tun.c 2018-01-09 16:36:24.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/drivers/net/tun.c linux-4.4.161-vs2.3.9.8/drivers/net/tun.c +--- linux-4.4.161/drivers/net/tun.c 2018-10-20 02:34:28.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/drivers/net/tun.c 2018-10-20 04:57:21.000000000 +0000 @@ -65,6 +65,7 @@ #include #include @@ -1374,9 +1374,9 @@ diff -NurpP --minimal linux-4.4.116/drivers/net/tun.c linux-4.4.116-vs2.3.9.7/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.116/drivers/scsi/cxgbi/libcxgbi.c linux-4.4.116-vs2.3.9.7/drivers/scsi/cxgbi/libcxgbi.c ---- linux-4.4.116/drivers/scsi/cxgbi/libcxgbi.c 2015-10-29 09:21:24.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/drivers/scsi/cxgbi/libcxgbi.c 2018-01-09 16:36:24.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/drivers/scsi/cxgbi/libcxgbi.c linux-4.4.161-vs2.3.9.8/drivers/scsi/cxgbi/libcxgbi.c +--- linux-4.4.161/drivers/scsi/cxgbi/libcxgbi.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/drivers/scsi/cxgbi/libcxgbi.c 2018-10-20 04:57:21.000000000 +0000 @@ -768,7 +768,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.116/drivers/scsi/cxgbi/libcxgbi.c linux-4.4.116- if (err) { pr_info("failed to get source address to reach %pI6\n", &daddr6->sin6_addr); -diff -NurpP --minimal linux-4.4.116/drivers/tty/sysrq.c linux-4.4.116-vs2.3.9.7/drivers/tty/sysrq.c ---- linux-4.4.116/drivers/tty/sysrq.c 2018-02-22 21:19:46.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/drivers/tty/sysrq.c 2018-01-25 00:25:02.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/drivers/tty/sysrq.c linux-4.4.161-vs2.3.9.8/drivers/tty/sysrq.c +--- linux-4.4.161/drivers/tty/sysrq.c 2018-10-20 02:34:29.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/drivers/tty/sysrq.c 2018-10-20 04:57:21.000000000 +0000 @@ -47,6 +47,7 @@ #include #include @@ -1441,9 +1441,9 @@ diff -NurpP --minimal linux-4.4.116/drivers/tty/sysrq.c linux-4.4.116-vs2.3.9.7/ else retval = -1; return retval; -diff -NurpP --minimal linux-4.4.116/drivers/tty/tty_io.c linux-4.4.116-vs2.3.9.7/drivers/tty/tty_io.c ---- linux-4.4.116/drivers/tty/tty_io.c 2018-02-22 21:19:46.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/drivers/tty/tty_io.c 2018-01-09 16:36:24.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/drivers/tty/tty_io.c linux-4.4.161-vs2.3.9.8/drivers/tty/tty_io.c +--- linux-4.4.161/drivers/tty/tty_io.c 2018-10-20 02:34:29.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/drivers/tty/tty_io.c 2018-10-20 04:57:21.000000000 +0000 @@ -104,6 +104,7 @@ #include @@ -1452,7 +1452,7 @@ diff -NurpP --minimal linux-4.4.116/drivers/tty/tty_io.c linux-4.4.116-vs2.3.9.7 #undef TTY_DEBUG_HANGUP #ifdef TTY_DEBUG_HANGUP -@@ -2280,7 +2281,8 @@ static int tiocsti(struct tty_struct *tt +@@ -2291,7 +2292,8 @@ static int tiocsti(struct tty_struct *tt char ch, mbz = 0; struct tty_ldisc *ld; @@ -1462,7 +1462,7 @@ diff -NurpP --minimal linux-4.4.116/drivers/tty/tty_io.c linux-4.4.116-vs2.3.9.7 return -EPERM; if (get_user(ch, p)) return -EFAULT; -@@ -2593,6 +2595,7 @@ static int tiocspgrp(struct tty_struct * +@@ -2604,6 +2606,7 @@ static int tiocspgrp(struct tty_struct * return -ENOTTY; if (get_user(pgrp_nr, p)) return -EFAULT; @@ -1470,9 +1470,9 @@ diff -NurpP --minimal linux-4.4.116/drivers/tty/tty_io.c linux-4.4.116-vs2.3.9.7 if (pgrp_nr < 0) return -EINVAL; rcu_read_lock(); -diff -NurpP --minimal linux-4.4.116/fs/attr.c linux-4.4.116-vs2.3.9.7/fs/attr.c ---- linux-4.4.116/fs/attr.c 2018-02-22 21:19:50.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/attr.c 2018-01-09 17:27:12.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/attr.c linux-4.4.161-vs2.3.9.8/fs/attr.c +--- linux-4.4.161/fs/attr.c 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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.116/fs/attr.c linux-4.4.116-vs2.3.9.7/fs/attr.c if (IS_IMMUTABLE(inode) || IS_APPEND(inode)) return -EPERM; } -diff -NurpP --minimal linux-4.4.116/fs/block_dev.c linux-4.4.116-vs2.3.9.7/fs/block_dev.c ---- linux-4.4.116/fs/block_dev.c 2018-02-22 21:19:50.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/block_dev.c 2018-01-09 17:16:29.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/block_dev.c linux-4.4.161-vs2.3.9.8/fs/block_dev.c +--- linux-4.4.161/fs/block_dev.c 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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.116/fs/block_dev.c linux-4.4.116-vs2.3.9.7/fs/bl if (bdev) { spin_lock(&bdev_lock); if (!inode->i_bdev) { -diff -NurpP --minimal linux-4.4.116/fs/btrfs/ctree.h linux-4.4.116-vs2.3.9.7/fs/btrfs/ctree.h ---- linux-4.4.116/fs/btrfs/ctree.h 2018-02-22 21:19:50.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/btrfs/ctree.h 2018-01-09 16:36:24.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/btrfs/ctree.h linux-4.4.161-vs2.3.9.8/fs/btrfs/ctree.h +--- linux-4.4.161/fs/btrfs/ctree.h 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/fs/btrfs/ctree.h 2018-10-20 04:57:21.000000000 +0000 @@ -731,11 +731,14 @@ struct btrfs_inode_item { /* modification sequence number for NFS */ __le64 sequence; @@ -1608,10 +1608,10 @@ diff -NurpP --minimal linux-4.4.116/fs/btrfs/ctree.h linux-4.4.116-vs2.3.9.7/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.116/fs/btrfs/disk-io.c linux-4.4.116-vs2.3.9.7/fs/btrfs/disk-io.c ---- linux-4.4.116/fs/btrfs/disk-io.c 2018-02-22 21:19:50.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/btrfs/disk-io.c 2018-01-09 16:36:24.000000000 +0000 -@@ -2736,6 +2736,9 @@ int open_ctree(struct super_block *sb, +diff -NurpP --minimal linux-4.4.161/fs/btrfs/disk-io.c linux-4.4.161-vs2.3.9.8/fs/btrfs/disk-io.c +--- linux-4.4.161/fs/btrfs/disk-io.c 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/fs/btrfs/disk-io.c 2018-10-20 05:50:20.000000000 +0000 +@@ -2737,6 +2737,9 @@ int open_ctree(struct super_block *sb, goto fail_alloc; } @@ -1621,9 +1621,9 @@ diff -NurpP --minimal linux-4.4.116/fs/btrfs/disk-io.c linux-4.4.116-vs2.3.9.7/f features = btrfs_super_incompat_flags(disk_super) & ~BTRFS_FEATURE_INCOMPAT_SUPP; if (features) { -diff -NurpP --minimal linux-4.4.116/fs/btrfs/inode.c linux-4.4.116-vs2.3.9.7/fs/btrfs/inode.c ---- linux-4.4.116/fs/btrfs/inode.c 2018-02-22 21:19:50.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/btrfs/inode.c 2018-02-22 21:30:19.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/btrfs/inode.c linux-4.4.161-vs2.3.9.8/fs/btrfs/inode.c +--- linux-4.4.161/fs/btrfs/inode.c 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/fs/btrfs/inode.c 2018-10-20 04:57:21.000000000 +0000 @@ -43,6 +43,7 @@ #include #include @@ -1632,7 +1632,7 @@ diff -NurpP --minimal linux-4.4.116/fs/btrfs/inode.c linux-4.4.116-vs2.3.9.7/fs/ #include "ctree.h" #include "disk-io.h" #include "transaction.h" -@@ -3619,6 +3620,9 @@ static void btrfs_read_locked_inode(stru +@@ -3649,6 +3650,9 @@ static void btrfs_read_locked_inode(stru unsigned long ptr; int maybe_acls; u32 rdev; @@ -1642,7 +1642,7 @@ diff -NurpP --minimal linux-4.4.116/fs/btrfs/inode.c linux-4.4.116-vs2.3.9.7/fs/ int ret; bool filled = false; int first_xattr_slot; -@@ -3646,8 +3650,14 @@ static void btrfs_read_locked_inode(stru +@@ -3676,8 +3680,14 @@ static void btrfs_read_locked_inode(stru struct btrfs_inode_item); inode->i_mode = btrfs_inode_mode(leaf, inode_item); set_nlink(inode, btrfs_inode_nlink(leaf, inode_item)); @@ -1659,7 +1659,7 @@ diff -NurpP --minimal linux-4.4.116/fs/btrfs/inode.c linux-4.4.116-vs2.3.9.7/fs/ btrfs_i_size_write(inode, btrfs_inode_size(leaf, inode_item)); inode->i_atime.tv_sec = btrfs_timespec_sec(leaf, &inode_item->atime); -@@ -3803,11 +3813,18 @@ static void fill_inode_item(struct btrfs +@@ -3833,11 +3843,18 @@ static void fill_inode_item(struct btrfs struct inode *inode) { struct btrfs_map_token token; @@ -1680,7 +1680,7 @@ diff -NurpP --minimal linux-4.4.116/fs/btrfs/inode.c linux-4.4.116-vs2.3.9.7/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); -@@ -10070,6 +10087,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.116/fs/btrfs/inode.c linux-4.4.116-vs2.3.9.7/fs/ .get_acl = btrfs_get_acl, .set_acl = btrfs_set_acl, .update_time = btrfs_update_time, -@@ -10078,6 +10096,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.116/fs/btrfs/inode.c linux-4.4.116-vs2.3.9.7/fs/ .get_acl = btrfs_get_acl, .set_acl = btrfs_set_acl, .update_time = btrfs_update_time, -@@ -10148,6 +10167,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.116/fs/btrfs/inode.c linux-4.4.116-vs2.3.9.7/fs/ .get_acl = btrfs_get_acl, .set_acl = btrfs_set_acl, .update_time = btrfs_update_time, -diff -NurpP --minimal linux-4.4.116/fs/btrfs/ioctl.c linux-4.4.116-vs2.3.9.7/fs/btrfs/ioctl.c ---- linux-4.4.116/fs/btrfs/ioctl.c 2018-02-22 21:19:50.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/btrfs/ioctl.c 2018-01-09 16:36:24.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/btrfs/ioctl.c linux-4.4.161-vs2.3.9.8/fs/btrfs/ioctl.c +--- linux-4.4.161/fs/btrfs/ioctl.c 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/fs/btrfs/ioctl.c 2018-10-20 04:57:21.000000000 +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.116/fs/btrfs/ioctl.c linux-4.4.116-vs2.3.9.7/fs/ if (flags & FS_APPEND_FL) ip->flags |= BTRFS_INODE_APPEND; else -diff -NurpP --minimal linux-4.4.116/fs/btrfs/super.c linux-4.4.116-vs2.3.9.7/fs/btrfs/super.c ---- linux-4.4.116/fs/btrfs/super.c 2018-02-22 21:19:50.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/btrfs/super.c 2018-01-09 17:25:27.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/btrfs/super.c linux-4.4.161-vs2.3.9.8/fs/btrfs/super.c +--- linux-4.4.161/fs/btrfs/super.c 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/fs/btrfs/super.c 2018-10-20 04:57:21.000000000 +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.116/fs/btrfs/super.c linux-4.4.116-vs2.3.9.7/fs/ if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY)) goto out; -diff -NurpP --minimal linux-4.4.116/fs/char_dev.c linux-4.4.116-vs2.3.9.7/fs/char_dev.c ---- linux-4.4.116/fs/char_dev.c 2016-07-05 04:12:30.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/char_dev.c 2018-01-09 16:36:24.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/char_dev.c linux-4.4.161-vs2.3.9.8/fs/char_dev.c +--- linux-4.4.161/fs/char_dev.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/fs/char_dev.c 2018-10-20 04:57:21.000000000 +0000 @@ -21,6 +21,8 @@ #include #include @@ -1978,9 +1978,9 @@ diff -NurpP --minimal linux-4.4.116/fs/char_dev.c linux-4.4.116-vs2.3.9.7/fs/cha if (!kobj) return -ENXIO; new = container_of(kobj, struct cdev, kobj); -diff -NurpP --minimal linux-4.4.116/fs/dcache.c linux-4.4.116-vs2.3.9.7/fs/dcache.c ---- linux-4.4.116/fs/dcache.c 2018-02-22 21:19:51.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/dcache.c 2018-01-09 16:36:24.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/dcache.c linux-4.4.161-vs2.3.9.8/fs/dcache.c +--- linux-4.4.161/fs/dcache.c 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/fs/dcache.c 2018-10-20 05:50:20.000000000 +0000 @@ -39,6 +39,7 @@ #include #include @@ -1989,7 +1989,7 @@ diff -NurpP --minimal linux-4.4.116/fs/dcache.c linux-4.4.116-vs2.3.9.7/fs/dcach #include "internal.h" #include "mount.h" -@@ -677,6 +678,7 @@ static inline bool fast_dput(struct dent +@@ -683,6 +684,7 @@ static inline bool fast_dput(struct dent spin_lock(&dentry->d_lock); if (dentry->d_lockref.count > 1) { dentry->d_lockref.count--; @@ -1997,7 +1997,7 @@ diff -NurpP --minimal linux-4.4.116/fs/dcache.c linux-4.4.116-vs2.3.9.7/fs/dcach spin_unlock(&dentry->d_lock); return 1; } -@@ -806,6 +808,7 @@ repeat: +@@ -812,6 +814,7 @@ repeat: dentry_lru_add(dentry); dentry->d_lockref.count--; @@ -2005,7 +2005,7 @@ diff -NurpP --minimal linux-4.4.116/fs/dcache.c linux-4.4.116-vs2.3.9.7/fs/dcach spin_unlock(&dentry->d_lock); return; -@@ -823,6 +826,7 @@ EXPORT_SYMBOL(dput); +@@ -829,6 +832,7 @@ EXPORT_SYMBOL(dput); static inline void __dget_dlock(struct dentry *dentry) { dentry->d_lockref.count++; @@ -2013,7 +2013,7 @@ diff -NurpP --minimal linux-4.4.116/fs/dcache.c linux-4.4.116-vs2.3.9.7/fs/dcach } static inline void __dget(struct dentry *dentry) -@@ -835,6 +839,8 @@ struct dentry *dget_parent(struct dentry +@@ -841,6 +845,8 @@ struct dentry *dget_parent(struct dentry int gotref; struct dentry *ret; @@ -2022,7 +2022,7 @@ diff -NurpP --minimal linux-4.4.116/fs/dcache.c linux-4.4.116-vs2.3.9.7/fs/dcach /* * Do optimistic parent lookup without any * locking. -@@ -865,6 +871,7 @@ repeat: +@@ -871,6 +877,7 @@ repeat: rcu_read_unlock(); BUG_ON(!ret->d_lockref.count); ret->d_lockref.count++; @@ -2030,7 +2030,7 @@ diff -NurpP --minimal linux-4.4.116/fs/dcache.c linux-4.4.116-vs2.3.9.7/fs/dcach spin_unlock(&ret->d_lock); return ret; } -@@ -1019,6 +1026,7 @@ static void shrink_dentry_list(struct li +@@ -1025,6 +1032,7 @@ static void shrink_dentry_list(struct li parent = lock_parent(dentry); if (dentry->d_lockref.count != 1) { dentry->d_lockref.count--; @@ -2038,7 +2038,7 @@ diff -NurpP --minimal linux-4.4.116/fs/dcache.c linux-4.4.116-vs2.3.9.7/fs/dcach spin_unlock(&dentry->d_lock); if (parent) spin_unlock(&parent->d_lock); -@@ -1581,6 +1589,9 @@ struct dentry *__d_alloc(struct super_bl +@@ -1587,6 +1595,9 @@ struct dentry *__d_alloc(struct super_bl struct dentry *dentry; char *dname; @@ -2048,7 +2048,7 @@ diff -NurpP --minimal linux-4.4.116/fs/dcache.c linux-4.4.116-vs2.3.9.7/fs/dcach dentry = kmem_cache_alloc(dentry_cache, GFP_KERNEL); if (!dentry) return NULL; -@@ -1619,6 +1630,7 @@ struct dentry *__d_alloc(struct super_bl +@@ -1625,6 +1636,7 @@ struct dentry *__d_alloc(struct super_bl dentry->d_lockref.count = 1; dentry->d_flags = 0; @@ -2056,7 +2056,7 @@ diff -NurpP --minimal linux-4.4.116/fs/dcache.c linux-4.4.116-vs2.3.9.7/fs/dcach spin_lock_init(&dentry->d_lock); seqcount_init(&dentry->d_seq); dentry->d_inode = NULL; -@@ -2355,6 +2367,7 @@ struct dentry *__d_lookup(const struct d +@@ -2385,6 +2397,7 @@ struct dentry *__d_lookup(const struct d } dentry->d_lockref.count++; @@ -2064,7 +2064,7 @@ diff -NurpP --minimal linux-4.4.116/fs/dcache.c linux-4.4.116-vs2.3.9.7/fs/dcach found = dentry; spin_unlock(&dentry->d_lock); break; -@@ -3371,6 +3384,7 @@ static enum d_walk_ret d_genocide_kill(v +@@ -3401,6 +3414,7 @@ static enum d_walk_ret d_genocide_kill(v if (!(dentry->d_flags & DCACHE_GENOCIDE)) { dentry->d_flags |= DCACHE_GENOCIDE; dentry->d_lockref.count--; @@ -2072,9 +2072,9 @@ diff -NurpP --minimal linux-4.4.116/fs/dcache.c linux-4.4.116-vs2.3.9.7/fs/dcach } } return D_WALK_CONTINUE; -diff -NurpP --minimal linux-4.4.116/fs/devpts/inode.c linux-4.4.116-vs2.3.9.7/fs/devpts/inode.c ---- linux-4.4.116/fs/devpts/inode.c 2018-02-22 21:19:51.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/devpts/inode.c 2018-01-09 16:36:24.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/devpts/inode.c linux-4.4.161-vs2.3.9.8/fs/devpts/inode.c +--- linux-4.4.161/fs/devpts/inode.c 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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.116/fs/devpts/inode.c linux-4.4.116-vs2.3.9.7/fs inode->i_private = priv; sprintf(s, "%d", index); -diff -NurpP --minimal linux-4.4.116/fs/ext2/balloc.c linux-4.4.116-vs2.3.9.7/fs/ext2/balloc.c ---- linux-4.4.116/fs/ext2/balloc.c 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/ext2/balloc.c 2018-01-09 16:36:24.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/ext2/balloc.c linux-4.4.161-vs2.3.9.8/fs/ext2/balloc.c +--- linux-4.4.161/fs/ext2/balloc.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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.116/fs/ext2/balloc.c linux-4.4.116-vs2.3.9.7/fs/ BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb)); repeat: -diff -NurpP --minimal linux-4.4.116/fs/ext2/ext2.h linux-4.4.116-vs2.3.9.7/fs/ext2/ext2.h ---- linux-4.4.116/fs/ext2/ext2.h 2016-07-05 04:15:07.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/ext2/ext2.h 2018-01-09 16:36:24.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/ext2/ext2.h linux-4.4.161-vs2.3.9.8/fs/ext2/ext2.h +--- linux-4.4.161/fs/ext2/ext2.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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.116/fs/ext2/ext2.h linux-4.4.116-vs2.3.9.7/fs/ex /* ioctl.c */ extern long ext2_ioctl(struct file *, unsigned int, unsigned long); -diff -NurpP --minimal linux-4.4.116/fs/ext2/file.c linux-4.4.116-vs2.3.9.7/fs/ext2/file.c ---- linux-4.4.116/fs/ext2/file.c 2016-07-05 04:15:07.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/ext2/file.c 2018-01-09 16:36:24.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/ext2/file.c linux-4.4.161-vs2.3.9.8/fs/ext2/file.c +--- linux-4.4.161/fs/ext2/file.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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.116/fs/ext2/ialloc.c linux-4.4.116-vs2.3.9.7/fs/ext2/ialloc.c ---- linux-4.4.116/fs/ext2/ialloc.c 2016-07-05 04:12:30.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/ext2/ialloc.c 2018-01-09 16:36:24.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/ext2/ialloc.c linux-4.4.161-vs2.3.9.8/fs/ext2/ialloc.c +--- linux-4.4.161/fs/ext2/ialloc.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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.116/fs/ext2/ialloc.c linux-4.4.116-vs2.3.9.7/fs/ } else inode_init_owner(inode, dir, mode); -diff -NurpP --minimal linux-4.4.116/fs/ext2/inode.c linux-4.4.116-vs2.3.9.7/fs/ext2/inode.c ---- linux-4.4.116/fs/ext2/inode.c 2016-07-05 04:15:07.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/ext2/inode.c 2018-01-09 16:36:24.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/ext2/inode.c linux-4.4.161-vs2.3.9.8/fs/ext2/inode.c +--- linux-4.4.161/fs/ext2/inode.c 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/fs/ext2/inode.c 2018-10-20 04:57:21.000000000 +0000 @@ -33,6 +33,7 @@ #include #include @@ -2262,7 +2262,7 @@ diff -NurpP --minimal linux-4.4.116/fs/ext2/inode.c linux-4.4.116-vs2.3.9.7/fs/e #include "ext2.h" #include "acl.h" #include "xattr.h" -@@ -1284,39 +1285,62 @@ void ext2_set_inode_flags(struct inode * +@@ -1274,39 +1275,62 @@ void ext2_set_inode_flags(struct inode * { unsigned int flags = EXT2_I(inode)->i_flags; @@ -2333,7 +2333,7 @@ diff -NurpP --minimal linux-4.4.116/fs/ext2/inode.c linux-4.4.116-vs2.3.9.7/fs/e } struct inode *ext2_iget (struct super_block *sb, unsigned long ino) -@@ -1352,8 +1376,10 @@ struct inode *ext2_iget (struct super_bl +@@ -1342,8 +1366,10 @@ struct inode *ext2_iget (struct super_bl i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16; i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16; } @@ -2346,7 +2346,7 @@ diff -NurpP --minimal linux-4.4.116/fs/ext2/inode.c linux-4.4.116-vs2.3.9.7/fs/e set_nlink(inode, le16_to_cpu(raw_inode->i_links_count)); inode->i_size = le32_to_cpu(raw_inode->i_size); inode->i_atime.tv_sec = (signed)le32_to_cpu(raw_inode->i_atime); -@@ -1449,8 +1475,10 @@ static int __ext2_write_inode(struct ino +@@ -1439,8 +1465,10 @@ static int __ext2_write_inode(struct ino struct ext2_inode_info *ei = EXT2_I(inode); struct super_block *sb = inode->i_sb; ino_t ino = inode->i_ino; @@ -2359,7 +2359,7 @@ diff -NurpP --minimal linux-4.4.116/fs/ext2/inode.c linux-4.4.116-vs2.3.9.7/fs/e struct buffer_head * bh; struct ext2_inode * raw_inode = ext2_get_inode(sb, ino, &bh); int n; -@@ -1486,6 +1514,9 @@ static int __ext2_write_inode(struct ino +@@ -1476,6 +1504,9 @@ static int __ext2_write_inode(struct ino raw_inode->i_uid_high = 0; raw_inode->i_gid_high = 0; } @@ -2369,7 +2369,7 @@ diff -NurpP --minimal linux-4.4.116/fs/ext2/inode.c linux-4.4.116-vs2.3.9.7/fs/e raw_inode->i_links_count = cpu_to_le16(inode->i_nlink); raw_inode->i_size = cpu_to_le32(inode->i_size); raw_inode->i_atime = cpu_to_le32(inode->i_atime.tv_sec); -@@ -1569,7 +1600,8 @@ int ext2_setattr(struct dentry *dentry, +@@ -1559,7 +1590,8 @@ int ext2_setattr(struct dentry *dentry, return error; } if ((iattr->ia_valid & ATTR_UID && !uid_eq(iattr->ia_uid, inode->i_uid)) || @@ -2379,9 +2379,9 @@ diff -NurpP --minimal linux-4.4.116/fs/ext2/inode.c linux-4.4.116-vs2.3.9.7/fs/e error = dquot_transfer(inode, iattr); if (error) return error; -diff -NurpP --minimal linux-4.4.116/fs/ext2/ioctl.c linux-4.4.116-vs2.3.9.7/fs/ext2/ioctl.c ---- linux-4.4.116/fs/ext2/ioctl.c 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/ext2/ioctl.c 2018-01-09 16:36:24.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/ext2/ioctl.c linux-4.4.161-vs2.3.9.8/fs/ext2/ioctl.c +--- linux-4.4.161/fs/ext2/ioctl.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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.116/fs/ext2/ioctl.c linux-4.4.116-vs2.3.9.7/fs/e flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE; ei->i_flags = flags; -diff -NurpP --minimal linux-4.4.116/fs/ext2/namei.c linux-4.4.116-vs2.3.9.7/fs/ext2/namei.c ---- linux-4.4.116/fs/ext2/namei.c 2016-07-05 04:15:07.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/ext2/namei.c 2018-01-09 16:36:24.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/ext2/namei.c linux-4.4.161-vs2.3.9.8/fs/ext2/namei.c +--- linux-4.4.161/fs/ext2/namei.c 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/fs/ext2/namei.c 2018-10-20 04:57:21.000000000 +0000 @@ -32,6 +32,7 @@ #include @@ -2442,7 +2442,7 @@ diff -NurpP --minimal linux-4.4.116/fs/ext2/namei.c linux-4.4.116-vs2.3.9.7/fs/e #include "ext2.h" #include "xattr.h" #include "acl.h" -@@ -72,6 +73,7 @@ static struct dentry *ext2_lookup(struct +@@ -71,6 +72,7 @@ static struct dentry *ext2_lookup(struct (unsigned long) ino); return ERR_PTR(-EIO); } @@ -2450,7 +2450,7 @@ diff -NurpP --minimal linux-4.4.116/fs/ext2/namei.c linux-4.4.116-vs2.3.9.7/fs/e } return d_splice_alias(inode, dentry); } -@@ -446,6 +448,7 @@ const struct inode_operations ext2_speci +@@ -444,6 +446,7 @@ const struct inode_operations ext2_speci .removexattr = generic_removexattr, #endif .setattr = ext2_setattr, @@ -2458,9 +2458,9 @@ diff -NurpP --minimal linux-4.4.116/fs/ext2/namei.c linux-4.4.116-vs2.3.9.7/fs/e .get_acl = ext2_get_acl, .set_acl = ext2_set_acl, }; -diff -NurpP --minimal linux-4.4.116/fs/ext2/super.c linux-4.4.116-vs2.3.9.7/fs/ext2/super.c ---- linux-4.4.116/fs/ext2/super.c 2016-07-05 04:15:07.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/ext2/super.c 2018-01-09 16:36:24.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/ext2/super.c linux-4.4.161-vs2.3.9.8/fs/ext2/super.c +--- linux-4.4.161/fs/ext2/super.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/fs/ext2/super.c 2018-10-20 04:57:21.000000000 +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.116/fs/ext2/super.c linux-4.4.116-vs2.3.9.7/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.116/fs/ext4/ext4.h linux-4.4.116-vs2.3.9.7/fs/ext4/ext4.h ---- linux-4.4.116/fs/ext4/ext4.h 2018-02-22 21:19:51.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/ext4/ext4.h 2018-01-09 17:33:10.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/ext4/ext4.h linux-4.4.161-vs2.3.9.8/fs/ext4/ext4.h +--- linux-4.4.161/fs/ext4/ext4.h 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/fs/ext4/ext4.h 2018-10-20 04:57:21.000000000 +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.116/fs/ext4/ext4.h linux-4.4.116-vs2.3.9.7/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 */ -@@ -2501,6 +2506,7 @@ extern int ext4_punch_hole(struct inode +@@ -2496,6 +2501,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.116/fs/ext4/ext4.h linux-4.4.116-vs2.3.9.7/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.116/fs/ext4/file.c linux-4.4.116-vs2.3.9.7/fs/ext4/file.c ---- linux-4.4.116/fs/ext4/file.c 2018-02-22 21:19:51.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/ext4/file.c 2018-01-09 16:36:31.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/ext4/file.c linux-4.4.161-vs2.3.9.8/fs/ext4/file.c +--- linux-4.4.161/fs/ext4/file.c 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/fs/ext4/file.c 2018-10-20 04:57:21.000000000 +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.116/fs/ext4/file.c linux-4.4.116-vs2.3.9.7/fs/ex + .sync_flags = ext4_sync_flags, }; -diff -NurpP --minimal linux-4.4.116/fs/ext4/ialloc.c linux-4.4.116-vs2.3.9.7/fs/ext4/ialloc.c ---- linux-4.4.116/fs/ext4/ialloc.c 2018-02-22 21:19:51.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/ext4/ialloc.c 2018-01-09 16:36:31.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/ext4/ialloc.c linux-4.4.161-vs2.3.9.8/fs/ext4/ialloc.c +--- linux-4.4.161/fs/ext4/ialloc.c 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/fs/ext4/ialloc.c 2018-10-20 05:50:20.000000000 +0000 @@ -21,6 +21,7 @@ #include #include @@ -2595,7 +2595,7 @@ diff -NurpP --minimal linux-4.4.116/fs/ext4/ialloc.c linux-4.4.116-vs2.3.9.7/fs/ #include #include "ext4.h" -@@ -799,6 +800,7 @@ struct inode *__ext4_new_inode(handle_t +@@ -777,6 +778,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.116/fs/ext4/ialloc.c linux-4.4.116-vs2.3.9.7/fs/ } else inode_init_owner(inode, dir, mode); err = dquot_initialize(inode); -diff -NurpP --minimal linux-4.4.116/fs/ext4/inode.c linux-4.4.116-vs2.3.9.7/fs/ext4/inode.c ---- linux-4.4.116/fs/ext4/inode.c 2018-02-22 21:19:51.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/ext4/inode.c 2018-02-22 21:30:19.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/ext4/inode.c linux-4.4.161-vs2.3.9.8/fs/ext4/inode.c +--- linux-4.4.161/fs/ext4/inode.c 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/fs/ext4/inode.c 2018-10-20 05:50:20.000000000 +0000 @@ -37,6 +37,7 @@ #include #include @@ -2614,7 +2614,7 @@ diff -NurpP --minimal linux-4.4.116/fs/ext4/inode.c linux-4.4.116-vs2.3.9.7/fs/e #include "ext4_jbd2.h" #include "xattr.h" -@@ -4128,12 +4129,15 @@ void ext4_set_inode_flags(struct inode * +@@ -4129,12 +4130,15 @@ void ext4_set_inode_flags(struct inode * unsigned int flags = EXT4_I(inode)->i_flags; unsigned int new_fl = 0; @@ -2632,7 +2632,7 @@ diff -NurpP --minimal linux-4.4.116/fs/ext4/inode.c linux-4.4.116-vs2.3.9.7/fs/e if (flags & EXT4_NOATIME_FL) new_fl |= S_NOATIME; if (flags & EXT4_DIRSYNC_FL) -@@ -4141,31 +4145,52 @@ void ext4_set_inode_flags(struct inode * +@@ -4142,31 +4146,52 @@ void ext4_set_inode_flags(struct inode * if (test_opt(inode->i_sb, DAX)) new_fl |= S_DAX; inode_set_flags(inode, new_fl, @@ -2690,7 +2690,7 @@ diff -NurpP --minimal linux-4.4.116/fs/ext4/inode.c linux-4.4.116-vs2.3.9.7/fs/e } while (cmpxchg(&ei->i_flags, old_fl, new_fl) != old_fl); } -@@ -4269,8 +4294,10 @@ struct inode *ext4_iget(struct super_blo +@@ -4276,8 +4301,10 @@ struct inode *ext4_iget(struct super_blo i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16; i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16; } @@ -2703,7 +2703,7 @@ diff -NurpP --minimal linux-4.4.116/fs/ext4/inode.c linux-4.4.116-vs2.3.9.7/fs/e set_nlink(inode, le16_to_cpu(raw_inode->i_links_count)); ext4_clear_state_flags(ei); /* Only relevant on 32-bit archs */ -@@ -4584,8 +4611,10 @@ static int ext4_do_update_inode(handle_t +@@ -4591,8 +4618,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.116/fs/ext4/inode.c linux-4.4.116-vs2.3.9.7/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)); -@@ -4608,6 +4637,9 @@ static int ext4_do_update_inode(handle_t +@@ -4615,6 +4644,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.116/fs/ext4/inode.c linux-4.4.116-vs2.3.9.7/fs/e raw_inode->i_links_count = cpu_to_le16(inode->i_nlink); EXT4_INODE_SET_XTIME(i_ctime, inode, raw_inode); -@@ -4853,7 +4885,8 @@ int ext4_setattr(struct dentry *dentry, +@@ -4860,7 +4892,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.116/fs/ext4/inode.c linux-4.4.116-vs2.3.9.7/fs/e handle_t *handle; /* (user+group)*(old+new) structure, inode write (sb, -@@ -4876,6 +4909,8 @@ int ext4_setattr(struct dentry *dentry, +@@ -4883,6 +4916,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.116/fs/ext4/inode.c linux-4.4.116-vs2.3.9.7/fs/e error = ext4_mark_inode_dirty(handle, inode); ext4_journal_stop(handle); } -diff -NurpP --minimal linux-4.4.116/fs/ext4/ioctl.c linux-4.4.116-vs2.3.9.7/fs/ext4/ioctl.c ---- linux-4.4.116/fs/ext4/ioctl.c 2018-02-22 21:19:51.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/ext4/ioctl.c 2018-01-09 16:36:31.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/ext4/ioctl.c linux-4.4.161-vs2.3.9.8/fs/ext4/ioctl.c +--- linux-4.4.161/fs/ext4/ioctl.c 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/fs/ext4/ioctl.c 2018-10-20 04:57:21.000000000 +0000 @@ -14,6 +14,7 @@ #include #include @@ -2813,9 +2813,9 @@ diff -NurpP --minimal linux-4.4.116/fs/ext4/ioctl.c linux-4.4.116-vs2.3.9.7/fs/e if (!capable(CAP_LINUX_IMMUTABLE)) goto flags_out; } -diff -NurpP --minimal linux-4.4.116/fs/ext4/namei.c linux-4.4.116-vs2.3.9.7/fs/ext4/namei.c ---- linux-4.4.116/fs/ext4/namei.c 2018-02-22 21:19:51.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/ext4/namei.c 2018-02-22 21:30:19.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/ext4/namei.c linux-4.4.161-vs2.3.9.8/fs/ext4/namei.c +--- linux-4.4.161/fs/ext4/namei.c 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/fs/ext4/namei.c 2018-10-20 05:50:20.000000000 +0000 @@ -33,6 +33,7 @@ #include #include @@ -2824,7 +2824,7 @@ diff -NurpP --minimal linux-4.4.116/fs/ext4/namei.c linux-4.4.116-vs2.3.9.7/fs/e #include "ext4.h" #include "ext4_jbd2.h" -@@ -1444,6 +1445,7 @@ restart: +@@ -1445,6 +1446,7 @@ restart: ll_rw_block(READ | REQ_META | REQ_PRIO, 1, &bh); } @@ -2832,7 +2832,7 @@ diff -NurpP --minimal linux-4.4.116/fs/ext4/namei.c linux-4.4.116-vs2.3.9.7/fs/e } if ((bh = bh_use[ra_ptr++]) == NULL) goto next; -@@ -3882,6 +3884,7 @@ const struct inode_operations ext4_dir_i +@@ -3881,6 +3883,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.116/fs/ext4/namei.c linux-4.4.116-vs2.3.9.7/fs/e }; const struct inode_operations ext4_special_inode_operations = { -diff -NurpP --minimal linux-4.4.116/fs/ext4/super.c linux-4.4.116-vs2.3.9.7/fs/ext4/super.c ---- linux-4.4.116/fs/ext4/super.c 2018-02-22 21:19:51.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/ext4/super.c 2018-01-09 16:36:32.000000000 +0000 -@@ -1165,6 +1165,7 @@ enum { +diff -NurpP --minimal linux-4.4.161/fs/ext4/super.c linux-4.4.161-vs2.3.9.8/fs/ext4/super.c +--- linux-4.4.161/fs/ext4/super.c 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/fs/ext4/super.c 2018-10-20 05:50:20.000000000 +0000 +@@ -1166,6 +1166,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.116/fs/ext4/super.c linux-4.4.116-vs2.3.9.7/fs/e }; static const match_table_t tokens = { -@@ -1250,6 +1251,9 @@ static const match_table_t tokens = { +@@ -1251,6 +1252,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.116/fs/ext4/super.c linux-4.4.116-vs2.3.9.7/fs/e {Opt_err, NULL}, }; -@@ -1492,6 +1496,20 @@ static int handle_mount_opt(struct super +@@ -1493,6 +1497,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.116/fs/ext4/super.c linux-4.4.116-vs2.3.9.7/fs/e } for (m = ext4_mount_opts; m->token != Opt_err; m++) -@@ -3379,6 +3397,9 @@ static int ext4_fill_super(struct super_ +@@ -3414,6 +3432,9 @@ static int ext4_fill_super(struct super_ sb->s_iflags |= SB_I_CGROUPWB; } @@ -2892,7 +2892,7 @@ diff -NurpP --minimal linux-4.4.116/fs/ext4/super.c linux-4.4.116-vs2.3.9.7/fs/e sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); -@@ -4727,6 +4748,14 @@ static int ext4_remount(struct super_blo +@@ -4792,6 +4813,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.116/fs/ext4/super.c linux-4.4.116-vs2.3.9.7/fs/e sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); -diff -NurpP --minimal linux-4.4.116/fs/fcntl.c linux-4.4.116-vs2.3.9.7/fs/fcntl.c ---- linux-4.4.116/fs/fcntl.c 2018-02-22 21:19:52.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/fcntl.c 2018-02-10 15:16:50.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/fcntl.c linux-4.4.161-vs2.3.9.8/fs/fcntl.c +--- linux-4.4.161/fs/fcntl.c 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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.116/fs/fcntl.c linux-4.4.116-vs2.3.9.7/fs/fcntl. if (unlikely(f.file->f_mode & FMODE_PATH)) { if (!check_fcntl_cmd(cmd)) -diff -NurpP --minimal linux-4.4.116/fs/file.c linux-4.4.116-vs2.3.9.7/fs/file.c ---- linux-4.4.116/fs/file.c 2016-07-05 04:15:07.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/file.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/file.c linux-4.4.161-vs2.3.9.8/fs/file.c +--- linux-4.4.161/fs/file.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/fs/file.c 2018-10-20 04:57:21.000000000 +0000 @@ -22,6 +22,7 @@ #include #include @@ -2984,9 +2984,9 @@ diff -NurpP --minimal linux-4.4.116/fs/file.c linux-4.4.116-vs2.3.9.7/fs/file.c return fd; -diff -NurpP --minimal linux-4.4.116/fs/file_table.c linux-4.4.116-vs2.3.9.7/fs/file_table.c ---- linux-4.4.116/fs/file_table.c 2015-10-29 09:21:35.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/file_table.c 2018-01-09 17:25:51.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/file_table.c linux-4.4.161-vs2.3.9.8/fs/file_table.c +--- linux-4.4.161/fs/file_table.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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.116/fs/file_table.c linux-4.4.116-vs2.3.9.7/fs/f file_free(file); } } -diff -NurpP --minimal linux-4.4.116/fs/fs_struct.c linux-4.4.116-vs2.3.9.7/fs/fs_struct.c ---- linux-4.4.116/fs/fs_struct.c 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/fs_struct.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/fs_struct.c linux-4.4.161-vs2.3.9.8/fs/fs_struct.c +--- linux-4.4.161/fs/fs_struct.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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.116/fs/fs_struct.c linux-4.4.116-vs2.3.9.7/fs/fs } return fs; } -diff -NurpP --minimal linux-4.4.116/fs/gfs2/file.c linux-4.4.116-vs2.3.9.7/fs/gfs2/file.c ---- linux-4.4.116/fs/gfs2/file.c 2018-02-22 21:19:52.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/gfs2/file.c 2018-01-09 17:23:53.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/gfs2/file.c linux-4.4.161-vs2.3.9.8/fs/gfs2/file.c +--- linux-4.4.161/fs/gfs2/file.c 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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, @@ -3078,11 +3078,11 @@ diff -NurpP --minimal linux-4.4.116/fs/gfs2/file.c linux-4.4.116-vs2.3.9.7/fs/gf struct gfs2_inode *ip = GFS2_I(inode); unsigned int flags = inode->i_flags; + unsigned int vflags = inode->i_vflags; - -- flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC|S_NOSEC); ++ + flags &= ~(S_IMMUTABLE | S_IXUNLINK | + S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC | S_NOSEC); -+ + +- flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC|S_NOSEC); if ((ip->i_eattr == 0) && !is_sxid(inode->i_mode)) flags |= S_NOSEC; if (ip->i_diskflags & GFS2_DIF_IMMUTABLE) @@ -3174,9 +3174,9 @@ diff -NurpP --minimal linux-4.4.116/fs/gfs2/file.c linux-4.4.116-vs2.3.9.7/fs/gf static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { switch(cmd) { -diff -NurpP --minimal linux-4.4.116/fs/gfs2/inode.h linux-4.4.116-vs2.3.9.7/fs/gfs2/inode.h ---- linux-4.4.116/fs/gfs2/inode.h 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/gfs2/inode.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/gfs2/inode.h linux-4.4.161-vs2.3.9.8/fs/gfs2/inode.h +--- linux-4.4.161/fs/gfs2/inode.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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.116/fs/gfs2/inode.h linux-4.4.116-vs2.3.9.7/fs/g #ifdef CONFIG_GFS2_FS_LOCKING_DLM extern const struct file_operations gfs2_file_fops; -diff -NurpP --minimal linux-4.4.116/fs/hostfs/hostfs.h linux-4.4.116-vs2.3.9.7/fs/hostfs/hostfs.h ---- linux-4.4.116/fs/hostfs/hostfs.h 2015-07-06 20:41:42.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/hostfs/hostfs.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/hostfs/hostfs.h linux-4.4.161-vs2.3.9.8/fs/hostfs/hostfs.h +--- linux-4.4.161/fs/hostfs/hostfs.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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.116/fs/hostfs/hostfs.h linux-4.4.116-vs2.3.9.7/f loff_t ia_size; struct timespec ia_atime; struct timespec ia_mtime; -diff -NurpP --minimal linux-4.4.116/fs/inode.c linux-4.4.116-vs2.3.9.7/fs/inode.c ---- linux-4.4.116/fs/inode.c 2018-02-22 21:19:52.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/inode.c 2018-02-22 21:30:19.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/inode.c linux-4.4.161-vs2.3.9.8/fs/inode.c +--- linux-4.4.161/fs/inode.c 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/fs/inode.c 2018-10-20 04:57:21.000000000 +0000 @@ -18,6 +18,7 @@ #include /* for inode_has_buffers */ #include @@ -3253,7 +3253,7 @@ diff -NurpP --minimal linux-4.4.116/fs/inode.c linux-4.4.116-vs2.3.9.7/fs/inode. } else if (S_ISFIFO(mode)) inode->i_fop = &pipefifo_fops; else if (S_ISSOCK(mode)) -@@ -1942,6 +1951,7 @@ void inode_init_owner(struct inode *inod +@@ -1948,6 +1957,7 @@ void inode_init_owner(struct inode *inod } else inode->i_gid = current_fsgid(); inode->i_mode = mode; @@ -3261,9 +3261,9 @@ diff -NurpP --minimal linux-4.4.116/fs/inode.c linux-4.4.116-vs2.3.9.7/fs/inode. } EXPORT_SYMBOL(inode_init_owner); -diff -NurpP --minimal linux-4.4.116/fs/ioctl.c linux-4.4.116-vs2.3.9.7/fs/ioctl.c ---- linux-4.4.116/fs/ioctl.c 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/ioctl.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/ioctl.c linux-4.4.161-vs2.3.9.8/fs/ioctl.c +--- linux-4.4.161/fs/ioctl.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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.116/fs/ioctl.c linux-4.4.116-vs2.3.9.7/fs/ioctl. #include -diff -NurpP --minimal linux-4.4.116/fs/jfs/file.c linux-4.4.116-vs2.3.9.7/fs/jfs/file.c ---- linux-4.4.116/fs/jfs/file.c 2016-07-05 04:12:33.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/jfs/file.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/jfs/file.c linux-4.4.161-vs2.3.9.8/fs/jfs/file.c +--- linux-4.4.161/fs/jfs/file.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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.116/fs/jfs/file.c linux-4.4.116-vs2.3.9.7/fs/jfs }; const struct file_operations jfs_file_operations = { -diff -NurpP --minimal linux-4.4.116/fs/jfs/ioctl.c linux-4.4.116-vs2.3.9.7/fs/jfs/ioctl.c ---- linux-4.4.116/fs/jfs/ioctl.c 2015-10-29 09:21:36.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/jfs/ioctl.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/jfs/ioctl.c linux-4.4.161-vs2.3.9.8/fs/jfs/ioctl.c +--- linux-4.4.161/fs/jfs/ioctl.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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.116/fs/jfs/ioctl.c linux-4.4.116-vs2.3.9.7/fs/jf flags |= oldflags & ~JFS_FL_USER_MODIFIABLE; jfs_inode->mode2 = flags; -diff -NurpP --minimal linux-4.4.116/fs/jfs/jfs_dinode.h linux-4.4.116-vs2.3.9.7/fs/jfs/jfs_dinode.h ---- linux-4.4.116/fs/jfs/jfs_dinode.h 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/jfs/jfs_dinode.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/jfs/jfs_dinode.h linux-4.4.161-vs2.3.9.8/fs/jfs/jfs_dinode.h +--- linux-4.4.161/fs/jfs/jfs_dinode.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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.116/fs/jfs/jfs_dinode.h linux-4.4.116-vs2.3.9.7/ #define JFS_FL_INHERIT 0x03C80000 /* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */ -diff -NurpP --minimal linux-4.4.116/fs/jfs/jfs_filsys.h linux-4.4.116-vs2.3.9.7/fs/jfs/jfs_filsys.h ---- linux-4.4.116/fs/jfs/jfs_filsys.h 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/jfs/jfs_filsys.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/jfs/jfs_filsys.h linux-4.4.161-vs2.3.9.8/fs/jfs/jfs_filsys.h +--- linux-4.4.161/fs/jfs/jfs_filsys.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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.116/fs/jfs/jfs_filsys.h linux-4.4.116-vs2.3.9.7/ /* * file system state (superblock state) -diff -NurpP --minimal linux-4.4.116/fs/jfs/jfs_imap.c linux-4.4.116-vs2.3.9.7/fs/jfs/jfs_imap.c ---- linux-4.4.116/fs/jfs/jfs_imap.c 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/jfs/jfs_imap.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/jfs/jfs_imap.c linux-4.4.161-vs2.3.9.8/fs/jfs/jfs_imap.c +--- linux-4.4.161/fs/jfs/jfs_imap.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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.116/fs/jfs/jfs_imap.c linux-4.4.116-vs2.3.9.7/fs jfs_get_inode_flags(jfs_ip); /* * mode2 is only needed for storing the higher order bits. -diff -NurpP --minimal linux-4.4.116/fs/jfs/jfs_inode.c linux-4.4.116-vs2.3.9.7/fs/jfs/jfs_inode.c ---- linux-4.4.116/fs/jfs/jfs_inode.c 2016-07-05 04:12:33.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/jfs/jfs_inode.c 2018-01-14 06:39:51.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/jfs/jfs_inode.c linux-4.4.161-vs2.3.9.8/fs/jfs/jfs_inode.c +--- linux-4.4.161/fs/jfs/jfs_inode.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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.116/fs/jfs/jfs_inode.c linux-4.4.116-vs2.3.9.7/f } /* -diff -NurpP --minimal linux-4.4.116/fs/jfs/jfs_inode.h linux-4.4.116-vs2.3.9.7/fs/jfs/jfs_inode.h ---- linux-4.4.116/fs/jfs/jfs_inode.h 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/jfs/jfs_inode.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/jfs/jfs_inode.h linux-4.4.161-vs2.3.9.8/fs/jfs/jfs_inode.h +--- linux-4.4.161/fs/jfs/jfs_inode.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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.116/fs/jfs/jfs_inode.h linux-4.4.116-vs2.3.9.7/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.116/fs/jfs/namei.c linux-4.4.116-vs2.3.9.7/fs/jfs/namei.c ---- linux-4.4.116/fs/jfs/namei.c 2016-07-05 04:15:08.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/jfs/namei.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/jfs/namei.c linux-4.4.161-vs2.3.9.8/fs/jfs/namei.c +--- linux-4.4.161/fs/jfs/namei.c 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/fs/jfs/namei.c 2018-10-20 04:57:21.000000000 +0000 @@ -22,6 +22,7 @@ #include #include @@ -3546,7 +3546,7 @@ diff -NurpP --minimal linux-4.4.116/fs/jfs/namei.c linux-4.4.116-vs2.3.9.7/fs/jf #include "jfs_incore.h" #include "jfs_superblock.h" #include "jfs_inode.h" -@@ -1480,6 +1481,7 @@ static struct dentry *jfs_lookup(struct +@@ -1476,6 +1477,7 @@ static struct dentry *jfs_lookup(struct jfs_err("jfs_lookup: iget failed on inum %d", (uint)inum); } @@ -3554,7 +3554,7 @@ diff -NurpP --minimal linux-4.4.116/fs/jfs/namei.c linux-4.4.116-vs2.3.9.7/fs/jf return d_splice_alias(ip, dentry); } -@@ -1545,6 +1547,7 @@ const struct inode_operations jfs_dir_in +@@ -1541,6 +1543,7 @@ const struct inode_operations jfs_dir_in .get_acl = jfs_get_acl, .set_acl = jfs_set_acl, #endif @@ -3562,9 +3562,9 @@ diff -NurpP --minimal linux-4.4.116/fs/jfs/namei.c linux-4.4.116-vs2.3.9.7/fs/jf }; const struct file_operations jfs_dir_operations = { -diff -NurpP --minimal linux-4.4.116/fs/jfs/super.c linux-4.4.116-vs2.3.9.7/fs/jfs/super.c ---- linux-4.4.116/fs/jfs/super.c 2018-02-22 21:19:52.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/jfs/super.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/jfs/super.c linux-4.4.161-vs2.3.9.8/fs/jfs/super.c +--- linux-4.4.161/fs/jfs/super.c 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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.116/fs/jfs/super.c linux-4.4.116-vs2.3.9.7/fs/jf if (newLVSize) { pr_err("resize option for remount only\n"); -diff -NurpP --minimal linux-4.4.116/fs/libfs.c linux-4.4.116-vs2.3.9.7/fs/libfs.c ---- linux-4.4.116/fs/libfs.c 2016-07-05 04:12:33.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/libfs.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/libfs.c linux-4.4.161-vs2.3.9.8/fs/libfs.c +--- linux-4.4.161/fs/libfs.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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.116/fs/libfs.c linux-4.4.116-vs2.3.9.7/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.116/fs/locks.c linux-4.4.116-vs2.3.9.7/fs/locks.c ---- linux-4.4.116/fs/locks.c 2018-02-22 21:19:52.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/locks.c 2018-01-25 00:25:02.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/locks.c linux-4.4.161-vs2.3.9.8/fs/locks.c +--- linux-4.4.161/fs/locks.c 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/fs/locks.c 2018-10-20 04:57:21.000000000 +0000 @@ -129,6 +129,8 @@ #include #include @@ -3883,9 +3883,9 @@ diff -NurpP --minimal linux-4.4.116/fs/locks.c linux-4.4.116-vs2.3.9.7/fs/locks. return 0; } -diff -NurpP --minimal linux-4.4.116/fs/mount.h linux-4.4.116-vs2.3.9.7/fs/mount.h ---- linux-4.4.116/fs/mount.h 2018-02-22 21:19:52.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/mount.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/mount.h linux-4.4.161-vs2.3.9.8/fs/mount.h +--- linux-4.4.161/fs/mount.h 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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.116/fs/mount.h linux-4.4.116-vs2.3.9.7/fs/mount. }; #define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */ -diff -NurpP --minimal linux-4.4.116/fs/namei.c linux-4.4.116-vs2.3.9.7/fs/namei.c ---- linux-4.4.116/fs/namei.c 2018-02-22 21:19:52.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/namei.c 2018-01-13 03:11:55.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/namei.c linux-4.4.161-vs2.3.9.8/fs/namei.c +--- linux-4.4.161/fs/namei.c 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/fs/namei.c 2018-10-20 04:57:21.000000000 +0000 @@ -34,10 +34,20 @@ #include #include @@ -3918,7 +3918,7 @@ diff -NurpP --minimal linux-4.4.116/fs/namei.c linux-4.4.116-vs2.3.9.7/fs/namei. #include "mount.h" /* [Feb-1997 T. Schoebel-Theuer] -@@ -283,6 +293,93 @@ static int check_acl(struct inode *inode +@@ -284,6 +294,93 @@ static int check_acl(struct inode *inode return -EAGAIN; } @@ -4012,7 +4012,7 @@ diff -NurpP --minimal linux-4.4.116/fs/namei.c linux-4.4.116-vs2.3.9.7/fs/namei. /* * This does the basic permission checking */ -@@ -407,10 +504,14 @@ int __inode_permission(struct inode *ino +@@ -408,10 +505,14 @@ int __inode_permission(struct inode *ino /* * Nobody gets write access to an immutable file. */ @@ -4028,7 +4028,7 @@ diff -NurpP --minimal linux-4.4.116/fs/namei.c linux-4.4.116-vs2.3.9.7/fs/namei. retval = do_inode_permission(inode, mask); if (retval) return retval; -@@ -1583,6 +1684,9 @@ static int lookup_fast(struct nameidata +@@ -1585,6 +1686,9 @@ static int lookup_fast(struct nameidata */ if (negative) return -ENOENT; @@ -4038,7 +4038,7 @@ diff -NurpP --minimal linux-4.4.116/fs/namei.c linux-4.4.116-vs2.3.9.7/fs/namei. path->mnt = mnt; path->dentry = dentry; if (likely(__follow_mount_rcu(nd, path, inode, seqp))) -@@ -1613,6 +1717,8 @@ unlazy: +@@ -1615,6 +1719,8 @@ unlazy: dput(dentry); return -ENOENT; } @@ -4047,7 +4047,7 @@ diff -NurpP --minimal linux-4.4.116/fs/namei.c linux-4.4.116-vs2.3.9.7/fs/namei. path->mnt = mnt; path->dentry = dentry; err = follow_managed(path, nd); -@@ -2571,7 +2677,7 @@ static int may_delete(struct inode *dir, +@@ -2576,7 +2682,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.116/fs/namei.c linux-4.4.116-vs2.3.9.7/fs/namei. return -EPERM; if (isdir) { if (!d_is_dir(victim)) -@@ -2653,19 +2759,25 @@ int vfs_create(struct inode *dir, struct +@@ -2658,19 +2764,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.116/fs/namei.c linux-4.4.116-vs2.3.9.7/fs/namei. return error; } EXPORT_SYMBOL(vfs_create); -@@ -2701,6 +2813,15 @@ static int may_open(struct path *path, i +@@ -2706,6 +2818,15 @@ static int may_open(struct path *path, i break; } @@ -4100,7 +4100,7 @@ diff -NurpP --minimal linux-4.4.116/fs/namei.c linux-4.4.116-vs2.3.9.7/fs/namei. error = inode_permission(inode, acc_mode); if (error) return error; -@@ -3178,6 +3299,16 @@ finish_open: +@@ -3183,6 +3304,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.116/fs/namei.c linux-4.4.116-vs2.3.9.7/fs/namei. if (error) goto out; -@@ -3302,6 +3433,9 @@ static struct file *path_openat(struct n +@@ -3307,6 +3438,9 @@ static struct file *path_openat(struct n int opened = 0; int error; @@ -4127,7 +4127,7 @@ diff -NurpP --minimal linux-4.4.116/fs/namei.c linux-4.4.116-vs2.3.9.7/fs/namei. file = get_empty_filp(); if (IS_ERR(file)) return file; -@@ -3328,6 +3462,12 @@ static struct file *path_openat(struct n +@@ -3333,6 +3467,12 @@ static struct file *path_openat(struct n } } terminate_walk(nd); @@ -4140,7 +4140,7 @@ diff -NurpP --minimal linux-4.4.116/fs/namei.c linux-4.4.116-vs2.3.9.7/fs/namei. out2: if (!(opened & FILE_OPENED)) { BUG_ON(!error); -@@ -3448,6 +3588,11 @@ static struct dentry *filename_create(in +@@ -3453,6 +3593,11 @@ static struct dentry *filename_create(in goto fail; } putname(name); @@ -4152,7 +4152,7 @@ diff -NurpP --minimal linux-4.4.116/fs/namei.c linux-4.4.116-vs2.3.9.7/fs/namei. return dentry; fail: dput(dentry); -@@ -3564,6 +3709,7 @@ retry: +@@ -3569,6 +3714,7 @@ retry: error = vfs_mknod(path.dentry->d_inode,dentry,mode,0); break; } @@ -4160,7 +4160,7 @@ diff -NurpP --minimal linux-4.4.116/fs/namei.c linux-4.4.116-vs2.3.9.7/fs/namei. out: done_path_create(&path, dentry); if (retry_estale(error, lookup_flags)) { -@@ -4010,7 +4156,7 @@ int vfs_link(struct dentry *old_dentry, +@@ -4015,7 +4161,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.116/fs/namei.c linux-4.4.116-vs2.3.9.7/fs/namei. return -EPERM; if (!dir->i_op->link) return -EPERM; -@@ -4519,6 +4665,330 @@ int generic_readlink(struct dentry *dent +@@ -4524,6 +4670,330 @@ int generic_readlink(struct dentry *dent } EXPORT_SYMBOL(generic_readlink); @@ -4500,9 +4500,9 @@ diff -NurpP --minimal linux-4.4.116/fs/namei.c linux-4.4.116-vs2.3.9.7/fs/namei. /* get the link contents into pagecache */ static char *page_getlink(struct dentry * dentry, struct page **ppage) { -diff -NurpP --minimal linux-4.4.116/fs/namespace.c linux-4.4.116-vs2.3.9.7/fs/namespace.c ---- linux-4.4.116/fs/namespace.c 2018-02-22 21:19:52.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/namespace.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/namespace.c linux-4.4.161-vs2.3.9.8/fs/namespace.c +--- linux-4.4.161/fs/namespace.c 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/fs/namespace.c 2018-10-20 05:50:20.000000000 +0000 @@ -24,6 +24,11 @@ #include #include @@ -4515,7 +4515,7 @@ diff -NurpP --minimal linux-4.4.116/fs/namespace.c linux-4.4.116-vs2.3.9.7/fs/na #include "pnode.h" #include "internal.h" -@@ -971,6 +976,10 @@ vfs_kern_mount(struct file_system_type * +@@ -980,6 +985,10 @@ vfs_kern_mount(struct file_system_type * if (!type) return ERR_PTR(-ENODEV); @@ -4526,7 +4526,7 @@ diff -NurpP --minimal linux-4.4.116/fs/namespace.c linux-4.4.116-vs2.3.9.7/fs/na mnt = alloc_vfsmnt(name); if (!mnt) return ERR_PTR(-ENOMEM); -@@ -1046,6 +1055,7 @@ static struct mount *clone_mnt(struct mo +@@ -1056,6 +1065,7 @@ static struct mount *clone_mnt(struct mo mnt->mnt.mnt_root = dget(root); mnt->mnt_mountpoint = mnt->mnt.mnt_root; mnt->mnt_parent = mnt; @@ -4534,7 +4534,7 @@ diff -NurpP --minimal linux-4.4.116/fs/namespace.c linux-4.4.116-vs2.3.9.7/fs/na lock_mount_hash(); list_add_tail(&mnt->mnt_instance, &sb->s_mounts); unlock_mount_hash(); -@@ -1620,7 +1630,8 @@ out_unlock: +@@ -1645,7 +1655,8 @@ out_unlock: */ static inline bool may_mount(void) { @@ -4544,7 +4544,7 @@ diff -NurpP --minimal linux-4.4.116/fs/namespace.c linux-4.4.116-vs2.3.9.7/fs/na } /* -@@ -2121,6 +2132,7 @@ static int do_change_type(struct path *p +@@ -2146,6 +2157,7 @@ static int do_change_type(struct path *p if (err) goto out_unlock; } @@ -4552,7 +4552,7 @@ diff -NurpP --minimal linux-4.4.116/fs/namespace.c linux-4.4.116-vs2.3.9.7/fs/na lock_mount_hash(); for (m = mnt; m; m = (recurse ? next_mnt(m, mnt) : NULL)) -@@ -2149,12 +2161,14 @@ static bool has_locked_children(struct m +@@ -2174,12 +2186,14 @@ static bool has_locked_children(struct m * do loopback mount. */ static int do_loopback(struct path *path, const char *old_name, @@ -4568,7 +4568,7 @@ diff -NurpP --minimal linux-4.4.116/fs/namespace.c linux-4.4.116-vs2.3.9.7/fs/na if (!old_name || !*old_name) return -EINVAL; err = kern_path(old_name, LOOKUP_FOLLOW|LOOKUP_AUTOMOUNT, &old_path); -@@ -2234,7 +2248,7 @@ static int change_mount_flags(struct vfs +@@ -2259,7 +2273,7 @@ static int change_mount_flags(struct vfs * on it - tough luck. */ static int do_remount(struct path *path, int flags, int mnt_flags, @@ -4577,7 +4577,7 @@ diff -NurpP --minimal linux-4.4.116/fs/namespace.c linux-4.4.116-vs2.3.9.7/fs/na { int err; struct super_block *sb = path->mnt->mnt_sb; -@@ -2742,6 +2756,7 @@ long do_mount(const char *dev_name, cons +@@ -2767,6 +2781,7 @@ long do_mount(const char *dev_name, cons struct path path; int retval = 0; int mnt_flags = 0; @@ -4585,7 +4585,7 @@ diff -NurpP --minimal linux-4.4.116/fs/namespace.c linux-4.4.116-vs2.3.9.7/fs/na /* Discard magic */ if ((flags & MS_MGC_MSK) == MS_MGC_VAL) -@@ -2767,6 +2782,12 @@ long do_mount(const char *dev_name, cons +@@ -2792,6 +2807,12 @@ long do_mount(const char *dev_name, cons if (!(flags & MS_NOATIME)) mnt_flags |= MNT_RELATIME; @@ -4598,7 +4598,7 @@ diff -NurpP --minimal linux-4.4.116/fs/namespace.c linux-4.4.116-vs2.3.9.7/fs/na /* Separate the per-mountpoint flags */ if (flags & MS_NOSUID) mnt_flags |= MNT_NOSUID; -@@ -2791,15 +2812,17 @@ long do_mount(const char *dev_name, cons +@@ -2816,15 +2837,17 @@ long do_mount(const char *dev_name, cons mnt_flags |= path.mnt->mnt_flags & MNT_ATIME_MASK; } @@ -4618,7 +4618,7 @@ diff -NurpP --minimal linux-4.4.116/fs/namespace.c linux-4.4.116-vs2.3.9.7/fs/na else if (flags & (MS_SHARED | MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE)) retval = do_change_type(&path, flags); else if (flags & MS_MOVE) -@@ -2919,6 +2942,7 @@ struct mnt_namespace *copy_mnt_ns(unsign +@@ -2944,6 +2967,7 @@ struct mnt_namespace *copy_mnt_ns(unsign p = next_mnt(p, old); } namespace_unlock(); @@ -4626,7 +4626,7 @@ diff -NurpP --minimal linux-4.4.116/fs/namespace.c linux-4.4.116-vs2.3.9.7/fs/na if (rootmnt) mntput(rootmnt); -@@ -3094,9 +3118,10 @@ SYSCALL_DEFINE2(pivot_root, const char _ +@@ -3119,9 +3143,10 @@ SYSCALL_DEFINE2(pivot_root, const char _ new_mnt = real_mount(new.mnt); root_mnt = real_mount(root.mnt); old_mnt = real_mount(old.mnt); @@ -4639,7 +4639,7 @@ diff -NurpP --minimal linux-4.4.116/fs/namespace.c linux-4.4.116-vs2.3.9.7/fs/na goto out4; if (!check_mnt(root_mnt) || !check_mnt(new_mnt)) goto out4; -@@ -3234,6 +3259,7 @@ void put_mnt_ns(struct mnt_namespace *ns +@@ -3259,6 +3284,7 @@ void put_mnt_ns(struct mnt_namespace *ns if (!atomic_dec_and_test(&ns->count)) return; drop_collected_mounts(&ns->root->mnt); @@ -4647,9 +4647,9 @@ diff -NurpP --minimal linux-4.4.116/fs/namespace.c linux-4.4.116-vs2.3.9.7/fs/na free_mnt_ns(ns); } -diff -NurpP --minimal linux-4.4.116/fs/nfs/client.c linux-4.4.116-vs2.3.9.7/fs/nfs/client.c ---- linux-4.4.116/fs/nfs/client.c 2016-07-05 04:15:08.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/nfs/client.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/nfs/client.c linux-4.4.161-vs2.3.9.8/fs/nfs/client.c +--- linux-4.4.161/fs/nfs/client.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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.116/fs/nfs/client.c linux-4.4.116-vs2.3.9.7/fs/n server->maxfilesize = fsinfo->maxfilesize; server->time_delta = fsinfo->time_delta; -diff -NurpP --minimal linux-4.4.116/fs/nfs/dir.c linux-4.4.116-vs2.3.9.7/fs/nfs/dir.c ---- linux-4.4.116/fs/nfs/dir.c 2018-02-22 21:19:52.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/nfs/dir.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/nfs/dir.c linux-4.4.161-vs2.3.9.8/fs/nfs/dir.c +--- linux-4.4.161/fs/nfs/dir.c 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/fs/nfs/dir.c 2018-10-20 04:57:21.000000000 +0000 @@ -37,6 +37,7 @@ #include #include @@ -4690,9 +4690,9 @@ diff -NurpP --minimal linux-4.4.116/fs/nfs/dir.c linux-4.4.116-vs2.3.9.7/fs/nfs/ no_entry: res = d_splice_alias(inode, dentry); if (res != NULL) { -diff -NurpP --minimal linux-4.4.116/fs/nfs/inode.c linux-4.4.116-vs2.3.9.7/fs/nfs/inode.c ---- linux-4.4.116/fs/nfs/inode.c 2018-02-22 21:19:52.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/nfs/inode.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/nfs/inode.c linux-4.4.161-vs2.3.9.8/fs/nfs/inode.c +--- linux-4.4.161/fs/nfs/inode.c 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/fs/nfs/inode.c 2018-10-20 04:57:21.000000000 +0000 @@ -38,6 +38,7 @@ #include #include @@ -4818,9 +4818,9 @@ diff -NurpP --minimal linux-4.4.116/fs/nfs/inode.c linux-4.4.116-vs2.3.9.7/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.116/fs/nfs/nfs3xdr.c linux-4.4.116-vs2.3.9.7/fs/nfs/nfs3xdr.c ---- linux-4.4.116/fs/nfs/nfs3xdr.c 2016-07-05 04:12:33.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/nfs/nfs3xdr.c 2018-01-09 17:17:07.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/nfs/nfs3xdr.c linux-4.4.161-vs2.3.9.8/fs/nfs/nfs3xdr.c +--- linux-4.4.161/fs/nfs/nfs3xdr.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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.116/fs/nfs/nfs3xdr.c linux-4.4.116-vs2.3.9.7/fs/ } /* -diff -NurpP --minimal linux-4.4.116/fs/nfs/super.c linux-4.4.116-vs2.3.9.7/fs/nfs/super.c ---- linux-4.4.116/fs/nfs/super.c 2018-02-22 21:19:52.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/nfs/super.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/nfs/super.c linux-4.4.161-vs2.3.9.8/fs/nfs/super.c +--- linux-4.4.161/fs/nfs/super.c 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/fs/nfs/super.c 2018-10-20 04:57:21.000000000 +0000 @@ -54,6 +54,7 @@ #include #include @@ -5042,9 +5042,9 @@ diff -NurpP --minimal linux-4.4.116/fs/nfs/super.c linux-4.4.116-vs2.3.9.7/fs/nf /* * options that take text values -diff -NurpP --minimal linux-4.4.116/fs/nfsd/auth.c linux-4.4.116-vs2.3.9.7/fs/nfsd/auth.c ---- linux-4.4.116/fs/nfsd/auth.c 2018-02-22 21:19:52.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/nfsd/auth.c 2018-02-10 15:16:50.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/nfsd/auth.c linux-4.4.161-vs2.3.9.8/fs/nfsd/auth.c +--- linux-4.4.161/fs/nfsd/auth.c 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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.116/fs/nfsd/auth.c linux-4.4.116-vs2.3.9.7/fs/nf rqgi = rqstp->rq_cred.cr_group_info; -diff -NurpP --minimal linux-4.4.116/fs/nfsd/nfs3xdr.c linux-4.4.116-vs2.3.9.7/fs/nfsd/nfs3xdr.c ---- linux-4.4.116/fs/nfsd/nfs3xdr.c 2018-02-22 21:19:52.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/nfsd/nfs3xdr.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/nfsd/nfs3xdr.c linux-4.4.161-vs2.3.9.8/fs/nfsd/nfs3xdr.c +--- linux-4.4.161/fs/nfsd/nfs3xdr.c 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/fs/nfsd/nfs3xdr.c 2018-10-20 04:57:21.000000000 +0000 @@ -8,6 +8,7 @@ #include @@ -5119,9 +5119,9 @@ diff -NurpP --minimal linux-4.4.116/fs/nfsd/nfs3xdr.c linux-4.4.116-vs2.3.9.7/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.116/fs/nfsd/nfs4xdr.c linux-4.4.116-vs2.3.9.7/fs/nfsd/nfs4xdr.c ---- linux-4.4.116/fs/nfsd/nfs4xdr.c 2018-02-22 21:19:53.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/nfsd/nfs4xdr.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/nfsd/nfs4xdr.c linux-4.4.161-vs2.3.9.8/fs/nfsd/nfs4xdr.c +--- linux-4.4.161/fs/nfsd/nfs4xdr.c 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/fs/nfsd/nfs4xdr.c 2018-10-20 05:50:20.000000000 +0000 @@ -40,6 +40,7 @@ #include #include @@ -5130,7 +5130,7 @@ diff -NurpP --minimal linux-4.4.116/fs/nfsd/nfs4xdr.c linux-4.4.116-vs2.3.9.7/fs #include "idmap.h" #include "acl.h" -@@ -2637,12 +2638,16 @@ out_acl: +@@ -2639,12 +2640,16 @@ out_acl: *p++ = cpu_to_be32(stat.nlink); } if (bmval1 & FATTR4_WORD1_OWNER) { @@ -5149,9 +5149,9 @@ diff -NurpP --minimal linux-4.4.116/fs/nfsd/nfs4xdr.c linux-4.4.116-vs2.3.9.7/fs if (status) goto out; } -diff -NurpP --minimal linux-4.4.116/fs/nfsd/nfsxdr.c linux-4.4.116-vs2.3.9.7/fs/nfsd/nfsxdr.c ---- linux-4.4.116/fs/nfsd/nfsxdr.c 2018-02-22 21:19:53.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/nfsd/nfsxdr.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/nfsd/nfsxdr.c linux-4.4.161-vs2.3.9.8/fs/nfsd/nfsxdr.c +--- linux-4.4.161/fs/nfsd/nfsxdr.c 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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.116/fs/nfsd/nfsxdr.c linux-4.4.116-vs2.3.9.7/fs/ if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) { *p++ = htonl(NFS_MAXPATHLEN); -diff -NurpP --minimal linux-4.4.116/fs/ocfs2/dlmglue.c linux-4.4.116-vs2.3.9.7/fs/ocfs2/dlmglue.c ---- linux-4.4.116/fs/ocfs2/dlmglue.c 2018-02-22 21:19:53.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/ocfs2/dlmglue.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/ocfs2/dlmglue.c linux-4.4.161-vs2.3.9.8/fs/ocfs2/dlmglue.c +--- linux-4.4.161/fs/ocfs2/dlmglue.c 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/fs/ocfs2/dlmglue.c 2018-10-20 04:57:21.000000000 +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.116/fs/ocfs2/dlmglue.c linux-4.4.116-vs2.3.9.7/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.116/fs/ocfs2/dlmglue.h linux-4.4.116-vs2.3.9.7/fs/ocfs2/dlmglue.h ---- linux-4.4.116/fs/ocfs2/dlmglue.h 2018-02-22 21:19:53.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/ocfs2/dlmglue.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/ocfs2/dlmglue.h linux-4.4.161-vs2.3.9.8/fs/ocfs2/dlmglue.h +--- linux-4.4.161/fs/ocfs2/dlmglue.h 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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.116/fs/ocfs2/dlmglue.h linux-4.4.116-vs2.3.9.7/f }; #define OCFS2_QINFO_LVB_VERSION 1 -diff -NurpP --minimal linux-4.4.116/fs/ocfs2/file.c linux-4.4.116-vs2.3.9.7/fs/ocfs2/file.c ---- linux-4.4.116/fs/ocfs2/file.c 2018-02-22 21:19:53.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/ocfs2/file.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/ocfs2/file.c linux-4.4.161-vs2.3.9.8/fs/ocfs2/file.c +--- linux-4.4.161/fs/ocfs2/file.c 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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.116/fs/ocfs2/file.c linux-4.4.116-vs2.3.9.7/fs/o if (!(attr->ia_valid & OCFS2_VALID_ATTRS)) return 0; -diff -NurpP --minimal linux-4.4.116/fs/ocfs2/inode.c linux-4.4.116-vs2.3.9.7/fs/ocfs2/inode.c ---- linux-4.4.116/fs/ocfs2/inode.c 2016-07-05 04:12:34.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/ocfs2/inode.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/ocfs2/inode.c linux-4.4.161-vs2.3.9.8/fs/ocfs2/inode.c +--- linux-4.4.161/fs/ocfs2/inode.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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.116/fs/ocfs2/inode.c linux-4.4.116-vs2.3.9.7/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.116/fs/ocfs2/inode.h linux-4.4.116-vs2.3.9.7/fs/ocfs2/inode.h ---- linux-4.4.116/fs/ocfs2/inode.h 2016-07-05 04:15:08.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/ocfs2/inode.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/ocfs2/inode.h linux-4.4.161-vs2.3.9.8/fs/ocfs2/inode.h +--- linux-4.4.161/fs/ocfs2/inode.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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.116/fs/ocfs2/inode.h linux-4.4.116-vs2.3.9.7/fs/ static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode) { -diff -NurpP --minimal linux-4.4.116/fs/ocfs2/ioctl.c linux-4.4.116-vs2.3.9.7/fs/ocfs2/ioctl.c ---- linux-4.4.116/fs/ocfs2/ioctl.c 2015-10-29 09:21:37.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/ocfs2/ioctl.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/ocfs2/ioctl.c linux-4.4.161-vs2.3.9.8/fs/ocfs2/ioctl.c +--- linux-4.4.161/fs/ocfs2/ioctl.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/fs/ocfs2/ioctl.c 2018-10-20 04:57:21.000000000 +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.116/fs/ocfs2/ioctl.c linux-4.4.116-vs2.3.9.7/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.116/fs/ocfs2/namei.c linux-4.4.116-vs2.3.9.7/fs/ocfs2/namei.c ---- linux-4.4.116/fs/ocfs2/namei.c 2018-02-22 21:19:53.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/ocfs2/namei.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/ocfs2/namei.c linux-4.4.161-vs2.3.9.8/fs/ocfs2/namei.c +--- linux-4.4.161/fs/ocfs2/namei.c 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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.116/fs/ocfs2/namei.c linux-4.4.116-vs2.3.9.7/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.116/fs/ocfs2/ocfs2.h linux-4.4.116-vs2.3.9.7/fs/ocfs2/ocfs2.h ---- linux-4.4.116/fs/ocfs2/ocfs2.h 2018-02-22 21:19:53.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/ocfs2/ocfs2.h 2018-01-09 17:21:54.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/ocfs2/ocfs2.h linux-4.4.161-vs2.3.9.8/fs/ocfs2/ocfs2.h +--- linux-4.4.161/fs/ocfs2/ocfs2.h 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 */ @@ -5469,9 +5469,9 @@ diff -NurpP --minimal linux-4.4.116/fs/ocfs2/ocfs2.h linux-4.4.116-vs2.3.9.7/fs/ }; #define OCFS2_OSB_SOFT_RO 0x0001 -diff -NurpP --minimal linux-4.4.116/fs/ocfs2/ocfs2_fs.h linux-4.4.116-vs2.3.9.7/fs/ocfs2/ocfs2_fs.h ---- linux-4.4.116/fs/ocfs2/ocfs2_fs.h 2016-07-05 04:12:34.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/ocfs2/ocfs2_fs.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/ocfs2/ocfs2_fs.h linux-4.4.161-vs2.3.9.8/fs/ocfs2/ocfs2_fs.h +--- linux-4.4.161/fs/ocfs2/ocfs2_fs.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 */ @@ -5484,9 +5484,9 @@ diff -NurpP --minimal linux-4.4.116/fs/ocfs2/ocfs2_fs.h linux-4.4.116-vs2.3.9.7/ #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.116/fs/ocfs2/super.c linux-4.4.116-vs2.3.9.7/fs/ocfs2/super.c ---- linux-4.4.116/fs/ocfs2/super.c 2016-07-05 04:12:34.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/ocfs2/super.c 2018-01-09 17:22:51.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/ocfs2/super.c linux-4.4.161-vs2.3.9.8/fs/ocfs2/super.c +--- linux-4.4.161/fs/ocfs2/super.c 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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, @@ -5505,7 +5505,7 @@ diff -NurpP --minimal linux-4.4.116/fs/ocfs2/super.c linux-4.4.116-vs2.3.9.7/fs/ {Opt_err, NULL} }; -@@ -677,6 +681,13 @@ static int ocfs2_remount(struct super_bl +@@ -676,6 +680,13 @@ static int ocfs2_remount(struct super_bl goto out; } @@ -5519,7 +5519,7 @@ diff -NurpP --minimal linux-4.4.116/fs/ocfs2/super.c linux-4.4.116-vs2.3.9.7/fs/ /* We're going to/from readonly mode. */ if ((*flags & MS_RDONLY) != (sb->s_flags & MS_RDONLY)) { /* Disable quota accounting before remounting RO */ -@@ -1166,6 +1177,9 @@ static int ocfs2_fill_super(struct super +@@ -1165,6 +1176,9 @@ static int ocfs2_fill_super(struct super ocfs2_complete_mount_recovery(osb); @@ -5529,7 +5529,7 @@ diff -NurpP --minimal linux-4.4.116/fs/ocfs2/super.c linux-4.4.116-vs2.3.9.7/fs/ if (ocfs2_mount_local(osb)) snprintf(nodestr, sizeof(nodestr), "local"); else -@@ -1486,6 +1500,20 @@ static int ocfs2_parse_options(struct su +@@ -1485,6 +1499,20 @@ static int ocfs2_parse_options(struct su case Opt_journal_async_commit: mopt->mount_opt |= OCFS2_MOUNT_JOURNAL_ASYNC_COMMIT; break; @@ -5550,9 +5550,9 @@ diff -NurpP --minimal linux-4.4.116/fs/ocfs2/super.c linux-4.4.116-vs2.3.9.7/fs/ default: mlog(ML_ERROR, "Unrecognized mount option \"%s\" " -diff -NurpP --minimal linux-4.4.116/fs/open.c linux-4.4.116-vs2.3.9.7/fs/open.c ---- linux-4.4.116/fs/open.c 2018-02-22 21:19:53.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/open.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/open.c linux-4.4.161-vs2.3.9.8/fs/open.c +--- linux-4.4.161/fs/open.c 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/fs/open.c 2018-10-20 04:57:21.000000000 +0000 @@ -31,6 +31,11 @@ #include #include @@ -5620,10 +5620,10 @@ diff -NurpP --minimal linux-4.4.116/fs/open.c linux-4.4.116-vs2.3.9.7/fs/open.c error = chown_common(&path, user, group); mnt_drop_write(path.mnt); out_release: -diff -NurpP --minimal linux-4.4.116/fs/proc/array.c linux-4.4.116-vs2.3.9.7/fs/proc/array.c ---- linux-4.4.116/fs/proc/array.c 2018-02-22 21:19:53.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/proc/array.c 2018-01-09 17:30:44.000000000 +0000 -@@ -83,6 +83,8 @@ +diff -NurpP --minimal linux-4.4.161/fs/proc/array.c linux-4.4.161-vs2.3.9.8/fs/proc/array.c +--- linux-4.4.161/fs/proc/array.c 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/fs/proc/array.c 2018-10-20 05:50:20.000000000 +0000 +@@ -84,6 +84,8 @@ #include #include #include @@ -5632,7 +5632,7 @@ diff -NurpP --minimal linux-4.4.116/fs/proc/array.c linux-4.4.116-vs2.3.9.7/fs/p #include #include -@@ -154,6 +156,9 @@ static inline void task_state(struct seq +@@ -155,6 +157,9 @@ static inline void task_state(struct seq ppid = pid_alive(p) ? task_tgid_nr_ns(rcu_dereference(p->real_parent), ns) : 0; @@ -5642,7 +5642,7 @@ diff -NurpP --minimal linux-4.4.116/fs/proc/array.c linux-4.4.116-vs2.3.9.7/fs/p tracer = ptrace_parent(p); if (tracer) tpid = task_pid_nr_ns(tracer, ns); -@@ -292,8 +297,8 @@ static inline void task_sig(struct seq_f +@@ -293,8 +298,8 @@ static inline void task_sig(struct seq_f render_sigset_t(m, "SigCgt:\t", &caught); } @@ -5653,7 +5653,7 @@ diff -NurpP --minimal linux-4.4.116/fs/proc/array.c linux-4.4.116-vs2.3.9.7/fs/p { unsigned __capi; -@@ -320,11 +325,12 @@ static inline void task_cap(struct seq_f +@@ -321,11 +326,12 @@ static inline void task_cap(struct seq_f cap_ambient = cred->cap_ambient; rcu_read_unlock(); @@ -5671,7 +5671,7 @@ diff -NurpP --minimal linux-4.4.116/fs/proc/array.c linux-4.4.116-vs2.3.9.7/fs/p } static inline void task_seccomp(struct seq_file *m, struct task_struct *p) -@@ -351,6 +357,43 @@ static void task_cpus_allowed(struct seq +@@ -377,6 +383,43 @@ static void task_cpus_allowed(struct seq cpumask_pr_args(&task->cpus_allowed)); } @@ -5715,7 +5715,7 @@ diff -NurpP --minimal linux-4.4.116/fs/proc/array.c linux-4.4.116-vs2.3.9.7/fs/p int proc_pid_status(struct seq_file *m, struct pid_namespace *ns, struct pid *pid, struct task_struct *task) { -@@ -368,6 +411,7 @@ int proc_pid_status(struct seq_file *m, +@@ -394,6 +437,7 @@ int proc_pid_status(struct seq_file *m, task_seccomp(m, task); task_cpus_allowed(m, task); cpuset_task_status_allowed(m, task); @@ -5723,7 +5723,7 @@ diff -NurpP --minimal linux-4.4.116/fs/proc/array.c linux-4.4.116-vs2.3.9.7/fs/p task_context_switch_counts(m, task); return 0; } -@@ -471,6 +515,17 @@ static int do_task_stat(struct seq_file +@@ -497,6 +541,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.116/fs/proc/array.c linux-4.4.116-vs2.3.9.7/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.116/fs/proc/base.c linux-4.4.116-vs2.3.9.7/fs/proc/base.c ---- linux-4.4.116/fs/proc/base.c 2018-02-22 21:19:53.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/proc/base.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/proc/base.c linux-4.4.161-vs2.3.9.8/fs/proc/base.c +--- linux-4.4.161/fs/proc/base.c 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/fs/proc/base.c 2018-10-20 05:50:20.000000000 +0000 @@ -87,6 +87,8 @@ #include #include @@ -5753,7 +5753,7 @@ diff -NurpP --minimal linux-4.4.116/fs/proc/base.c linux-4.4.116-vs2.3.9.7/fs/pr #ifdef CONFIG_HARDWALL #include #endif -@@ -1097,11 +1099,15 @@ static ssize_t oom_adj_write(struct file +@@ -1120,11 +1122,15 @@ static ssize_t oom_adj_write(struct file oom_adj = (oom_adj * OOM_SCORE_ADJ_MAX) / -OOM_DISABLE; if (oom_adj < task->signal->oom_score_adj && @@ -5770,7 +5770,7 @@ diff -NurpP --minimal linux-4.4.116/fs/proc/base.c linux-4.4.116-vs2.3.9.7/fs/pr /* * /proc/pid/oom_adj is provided for legacy purposes, ask users to use * /proc/pid/oom_score_adj instead. -@@ -1666,6 +1672,8 @@ struct inode *proc_pid_make_inode(struct +@@ -1689,6 +1695,8 @@ struct inode *proc_pid_make_inode(struct inode->i_gid = cred->egid; rcu_read_unlock(); } @@ -5779,7 +5779,7 @@ diff -NurpP --minimal linux-4.4.116/fs/proc/base.c linux-4.4.116-vs2.3.9.7/fs/pr security_task_to_inode(task, inode); out: -@@ -1711,6 +1719,8 @@ int pid_getattr(struct vfsmount *mnt, st +@@ -1734,6 +1742,8 @@ int pid_getattr(struct vfsmount *mnt, st /* dentry stuff */ @@ -5788,7 +5788,7 @@ diff -NurpP --minimal linux-4.4.116/fs/proc/base.c linux-4.4.116-vs2.3.9.7/fs/pr /* * Exceptional case: normally we are not allowed to unhash a busy * directory. In this case, however, we can do it - no aliasing problems -@@ -1739,6 +1749,19 @@ int pid_revalidate(struct dentry *dentry +@@ -1762,6 +1772,19 @@ int pid_revalidate(struct dentry *dentry task = get_proc_task(inode); if (task) { @@ -5808,7 +5808,7 @@ diff -NurpP --minimal linux-4.4.116/fs/proc/base.c linux-4.4.116-vs2.3.9.7/fs/pr if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) || task_dumpable(task)) { rcu_read_lock(); -@@ -2283,6 +2306,13 @@ static struct dentry *proc_pident_lookup +@@ -2331,6 +2354,13 @@ static struct dentry *proc_pident_lookup if (!task) goto out_no_task; @@ -5822,7 +5822,7 @@ diff -NurpP --minimal linux-4.4.116/fs/proc/base.c linux-4.4.116-vs2.3.9.7/fs/pr /* * Yes, it does not scale. And it should not. Don't add * new entries into /proc// without very good reasons. -@@ -2725,6 +2755,11 @@ static int proc_pid_personality(struct s +@@ -2773,6 +2803,11 @@ static int proc_pid_personality(struct s static const struct file_operations proc_task_operations; static const struct inode_operations proc_task_inode_operations; @@ -5834,7 +5834,7 @@ diff -NurpP --minimal linux-4.4.116/fs/proc/base.c linux-4.4.116-vs2.3.9.7/fs/pr static const struct pid_entry tgid_base_stuff[] = { DIR("task", S_IRUGO|S_IXUGO, proc_task_inode_operations, proc_task_operations), DIR("fd", S_IRUSR|S_IXUSR, proc_fd_inode_operations, proc_fd_operations), -@@ -2789,6 +2824,8 @@ static const struct pid_entry tgid_base_ +@@ -2837,6 +2872,8 @@ static const struct pid_entry tgid_base_ #ifdef CONFIG_CGROUPS ONE("cgroup", S_IRUGO, proc_cgroup_show), #endif @@ -5843,7 +5843,7 @@ diff -NurpP --minimal linux-4.4.116/fs/proc/base.c linux-4.4.116-vs2.3.9.7/fs/pr ONE("oom_score", S_IRUGO, proc_oom_score), REG("oom_adj", S_IRUGO|S_IWUSR, proc_oom_adj_operations), REG("oom_score_adj", S_IRUGO|S_IWUSR, proc_oom_score_adj_operations), -@@ -3003,7 +3040,7 @@ retry: +@@ -3051,7 +3088,7 @@ retry: iter.task = NULL; pid = find_ge_pid(iter.tgid, ns); if (pid) { @@ -5852,7 +5852,7 @@ diff -NurpP --minimal linux-4.4.116/fs/proc/base.c linux-4.4.116-vs2.3.9.7/fs/pr iter.task = pid_task(pid, PIDTYPE_PID); /* What we to know is if the pid we have find is the * pid of a thread_group_leader. Testing for task -@@ -3063,8 +3100,10 @@ int proc_pid_readdir(struct file *file, +@@ -3111,8 +3148,10 @@ int proc_pid_readdir(struct file *file, if (!has_pid_permissions(ns, iter.task, 2)) continue; @@ -5864,7 +5864,7 @@ diff -NurpP --minimal linux-4.4.116/fs/proc/base.c linux-4.4.116-vs2.3.9.7/fs/pr if (!proc_fill_cache(file, ctx, name, len, proc_pid_instantiate, iter.task, NULL)) { put_task_struct(iter.task); -@@ -3161,6 +3200,7 @@ static const struct pid_entry tid_base_s +@@ -3249,6 +3288,7 @@ static const struct pid_entry tid_base_s REG("projid_map", S_IRUGO|S_IWUSR, proc_projid_map_operations), REG("setgroups", S_IRUGO|S_IWUSR, proc_setgroups_operations), #endif @@ -5872,7 +5872,7 @@ diff -NurpP --minimal linux-4.4.116/fs/proc/base.c linux-4.4.116-vs2.3.9.7/fs/pr }; static int proc_tid_base_readdir(struct file *file, struct dir_context *ctx) -@@ -3227,6 +3267,8 @@ static struct dentry *proc_task_lookup(s +@@ -3315,6 +3355,8 @@ static struct dentry *proc_task_lookup(s tid = name_to_int(&dentry->d_name); if (tid == ~0U) goto out; @@ -5881,9 +5881,9 @@ diff -NurpP --minimal linux-4.4.116/fs/proc/base.c linux-4.4.116-vs2.3.9.7/fs/pr ns = dentry->d_sb->s_fs_info; rcu_read_lock(); -diff -NurpP --minimal linux-4.4.116/fs/proc/generic.c linux-4.4.116-vs2.3.9.7/fs/proc/generic.c ---- linux-4.4.116/fs/proc/generic.c 2018-02-22 21:19:53.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/proc/generic.c 2018-01-09 17:29:24.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/proc/generic.c linux-4.4.161-vs2.3.9.8/fs/proc/generic.c +--- linux-4.4.161/fs/proc/generic.c 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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.116/fs/proc/generic.c linux-4.4.116-vs2.3.9.7/fs } else { kfree(ent); ent = NULL; -diff -NurpP --minimal linux-4.4.116/fs/proc/inode.c linux-4.4.116-vs2.3.9.7/fs/proc/inode.c ---- linux-4.4.116/fs/proc/inode.c 2015-10-29 09:21:39.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/proc/inode.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/proc/inode.c linux-4.4.161-vs2.3.9.8/fs/proc/inode.c +--- linux-4.4.161/fs/proc/inode.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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.116/fs/proc/inode.c linux-4.4.116-vs2.3.9.7/fs/p if (de->size) inode->i_size = de->size; if (de->nlink) -diff -NurpP --minimal linux-4.4.116/fs/proc/internal.h linux-4.4.116-vs2.3.9.7/fs/proc/internal.h ---- linux-4.4.116/fs/proc/internal.h 2015-10-29 09:21:39.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/proc/internal.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/proc/internal.h linux-4.4.161-vs2.3.9.8/fs/proc/internal.h +--- linux-4.4.161/fs/proc/internal.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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.116/fs/proc/internal.h linux-4.4.116-vs2.3.9.7/f /* * base.c -diff -NurpP --minimal linux-4.4.116/fs/proc/loadavg.c linux-4.4.116-vs2.3.9.7/fs/proc/loadavg.c ---- linux-4.4.116/fs/proc/loadavg.c 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/proc/loadavg.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/proc/loadavg.c linux-4.4.161-vs2.3.9.8/fs/proc/loadavg.c +--- linux-4.4.161/fs/proc/loadavg.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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,9 +6071,9 @@ diff -NurpP --minimal linux-4.4.116/fs/proc/loadavg.c linux-4.4.116-vs2.3.9.7/fs task_active_pid_ns(current)->last_pid); return 0; } -diff -NurpP --minimal linux-4.4.116/fs/proc/meminfo.c linux-4.4.116-vs2.3.9.7/fs/proc/meminfo.c ---- linux-4.4.116/fs/proc/meminfo.c 2016-07-05 04:15:09.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/proc/meminfo.c 2018-01-12 18:43:53.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/proc/meminfo.c linux-4.4.161-vs2.3.9.8/fs/proc/meminfo.c +--- linux-4.4.161/fs/proc/meminfo.c 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-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_ si_swapinfo(&i); committed = percpu_counter_read_positive(&vm_committed_as); @@ -6084,7 +6084,7 @@ diff -NurpP --minimal linux-4.4.116/fs/proc/meminfo.c linux-4.4.116-vs2.3.9.7/fs total_swapcache_pages() - i.bufferram; if (cached < 0) cached = 0; -@@ -70,13 +71,16 @@ static int meminfo_proc_show(struct seq_ +@@ -67,13 +68,16 @@ static int meminfo_proc_show(struct seq_ */ pagecache = pages[LRU_ACTIVE_FILE] + pages[LRU_INACTIVE_FILE]; pagecache -= min(pagecache / 2, wmark_low); @@ -6103,9 +6103,9 @@ diff -NurpP --minimal linux-4.4.116/fs/proc/meminfo.c linux-4.4.116-vs2.3.9.7/fs min(global_page_state(NR_SLAB_RECLAIMABLE) / 2, wmark_low); if (available < 0) -diff -NurpP --minimal linux-4.4.116/fs/proc/root.c linux-4.4.116-vs2.3.9.7/fs/proc/root.c ---- linux-4.4.116/fs/proc/root.c 2018-02-22 21:19:53.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/proc/root.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/proc/root.c linux-4.4.161-vs2.3.9.8/fs/proc/root.c +--- linux-4.4.161/fs/proc/root.c 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/fs/proc/root.c 2018-10-20 04:57:21.000000000 +0000 @@ -20,9 +20,14 @@ #include #include @@ -6147,9 +6147,9 @@ diff -NurpP --minimal linux-4.4.116/fs/proc/root.c linux-4.4.116-vs2.3.9.7/fs/pr .subdir = RB_ROOT, .name = "/proc", }; -diff -NurpP --minimal linux-4.4.116/fs/proc/self.c linux-4.4.116-vs2.3.9.7/fs/proc/self.c ---- linux-4.4.116/fs/proc/self.c 2015-10-29 09:21:39.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/proc/self.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/proc/self.c linux-4.4.161-vs2.3.9.8/fs/proc/self.c +--- linux-4.4.161/fs/proc/self.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/fs/proc/self.c 2018-10-20 04:57:21.000000000 +0000 @@ -1,6 +1,7 @@ #include #include @@ -6167,9 +6167,9 @@ diff -NurpP --minimal linux-4.4.116/fs/proc/self.c linux-4.4.116-vs2.3.9.7/fs/pr if (inode) { inode->i_ino = self_inum; inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME; -diff -NurpP --minimal linux-4.4.116/fs/proc/stat.c linux-4.4.116-vs2.3.9.7/fs/proc/stat.c ---- linux-4.4.116/fs/proc/stat.c 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/proc/stat.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/proc/stat.c linux-4.4.161-vs2.3.9.8/fs/proc/stat.c +--- linux-4.4.161/fs/proc/stat.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/fs/proc/stat.c 2018-10-20 04:57:21.000000000 +0000 @@ -9,8 +9,10 @@ #include #include @@ -6218,9 +6218,9 @@ diff -NurpP --minimal linux-4.4.116/fs/proc/stat.c linux-4.4.116-vs2.3.9.7/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.116/fs/proc/uptime.c linux-4.4.116-vs2.3.9.7/fs/proc/uptime.c ---- linux-4.4.116/fs/proc/uptime.c 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/proc/uptime.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/proc/uptime.c linux-4.4.161-vs2.3.9.8/fs/proc/uptime.c +--- linux-4.4.161/fs/proc/uptime.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/fs/proc/uptime.c 2018-10-20 04:57:21.000000000 +0000 @@ -5,6 +5,7 @@ #include #include @@ -6240,9 +6240,9 @@ diff -NurpP --minimal linux-4.4.116/fs/proc/uptime.c linux-4.4.116-vs2.3.9.7/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.116/fs/proc_namespace.c linux-4.4.116-vs2.3.9.7/fs/proc_namespace.c ---- linux-4.4.116/fs/proc_namespace.c 2018-02-22 21:19:53.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/proc_namespace.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/proc_namespace.c linux-4.4.161-vs2.3.9.8/fs/proc_namespace.c +--- linux-4.4.161/fs/proc_namespace.c 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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" }, @@ -6356,9 +6356,9 @@ diff -NurpP --minimal linux-4.4.116/fs/proc_namespace.c linux-4.4.116-vs2.3.9.7/ /* file system type */ seq_puts(m, "with fstype "); show_type(m, sb); -diff -NurpP --minimal linux-4.4.116/fs/quota/dquot.c linux-4.4.116-vs2.3.9.7/fs/quota/dquot.c ---- linux-4.4.116/fs/quota/dquot.c 2018-02-22 21:19:53.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/quota/dquot.c 2018-02-10 15:16:50.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/quota/dquot.c linux-4.4.161-vs2.3.9.8/fs/quota/dquot.c +--- linux-4.4.161/fs/quota/dquot.c 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-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 int reserve = flags & DQUOT_SPACE_RESERVE; struct dquot **dquots; @@ -6397,9 +6397,9 @@ diff -NurpP --minimal linux-4.4.116/fs/quota/dquot.c linux-4.4.116-vs2.3.9.7/fs/ if (!dquot_active(inode)) return; -diff -NurpP --minimal linux-4.4.116/fs/quota/quota.c linux-4.4.116-vs2.3.9.7/fs/quota/quota.c ---- linux-4.4.116/fs/quota/quota.c 2016-07-05 04:12:34.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/quota/quota.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/quota/quota.c linux-4.4.161-vs2.3.9.8/fs/quota/quota.c +--- linux-4.4.161/fs/quota/quota.c 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/fs/quota/quota.c 2018-10-20 05:50:20.000000000 +0000 @@ -8,6 +8,7 @@ #include #include @@ -6408,7 +6408,7 @@ diff -NurpP --minimal linux-4.4.116/fs/quota/quota.c linux-4.4.116-vs2.3.9.7/fs/ #include #include #include -@@ -38,7 +39,7 @@ static int check_quotactl_permission(str +@@ -39,7 +40,7 @@ static int check_quotactl_permission(str break; /*FALLTHROUGH*/ default: @@ -6417,7 +6417,7 @@ diff -NurpP --minimal linux-4.4.116/fs/quota/quota.c linux-4.4.116-vs2.3.9.7/fs/ return -EPERM; } -@@ -702,6 +703,46 @@ static int do_quotactl(struct super_bloc +@@ -704,6 +705,46 @@ static int do_quotactl(struct super_bloc #ifdef CONFIG_BLOCK @@ -6464,7 +6464,7 @@ diff -NurpP --minimal linux-4.4.116/fs/quota/quota.c linux-4.4.116-vs2.3.9.7/fs/ /* Return 1 if 'cmd' will block on frozen filesystem */ static int quotactl_cmd_write(int cmd) { -@@ -737,6 +778,22 @@ static struct super_block *quotactl_bloc +@@ -739,6 +780,22 @@ static struct super_block *quotactl_bloc putname(tmp); if (IS_ERR(bdev)) return ERR_CAST(bdev); @@ -6487,9 +6487,9 @@ diff -NurpP --minimal linux-4.4.116/fs/quota/quota.c linux-4.4.116-vs2.3.9.7/fs/ if (quotactl_cmd_write(cmd)) sb = get_super_thawed(bdev); else -diff -NurpP --minimal linux-4.4.116/fs/stat.c linux-4.4.116-vs2.3.9.7/fs/stat.c ---- linux-4.4.116/fs/stat.c 2018-02-22 21:19:54.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/stat.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/stat.c linux-4.4.161-vs2.3.9.8/fs/stat.c +--- linux-4.4.161/fs/stat.c 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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; @@ -6498,9 +6498,9 @@ diff -NurpP --minimal linux-4.4.116/fs/stat.c linux-4.4.116-vs2.3.9.7/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.116/fs/statfs.c linux-4.4.116-vs2.3.9.7/fs/statfs.c ---- linux-4.4.116/fs/statfs.c 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/statfs.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/statfs.c linux-4.4.161-vs2.3.9.8/fs/statfs.c +--- linux-4.4.161/fs/statfs.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/fs/statfs.c 2018-10-20 04:57:21.000000000 +0000 @@ -7,6 +7,8 @@ #include #include @@ -6519,9 +6519,9 @@ diff -NurpP --minimal linux-4.4.116/fs/statfs.c linux-4.4.116-vs2.3.9.7/fs/statf return retval; } -diff -NurpP --minimal linux-4.4.116/fs/super.c linux-4.4.116-vs2.3.9.7/fs/super.c ---- linux-4.4.116/fs/super.c 2018-02-22 21:19:54.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/super.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/super.c linux-4.4.161-vs2.3.9.8/fs/super.c +--- linux-4.4.161/fs/super.c 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/fs/super.c 2018-10-20 04:57:21.000000000 +0000 @@ -33,6 +33,8 @@ #include #include @@ -6531,7 +6531,7 @@ diff -NurpP --minimal linux-4.4.116/fs/super.c linux-4.4.116-vs2.3.9.7/fs/super. #include "internal.h" -@@ -1131,6 +1133,13 @@ mount_fs(struct file_system_type *type, +@@ -1135,6 +1137,13 @@ mount_fs(struct file_system_type *type, WARN_ON(!sb->s_bdi); sb->s_flags |= MS_BORN; @@ -6545,9 +6545,9 @@ diff -NurpP --minimal linux-4.4.116/fs/super.c linux-4.4.116-vs2.3.9.7/fs/super. error = security_sb_kern_mount(sb, flags, secdata); if (error) goto out_sb; -diff -NurpP --minimal linux-4.4.116/fs/utimes.c linux-4.4.116-vs2.3.9.7/fs/utimes.c ---- linux-4.4.116/fs/utimes.c 2018-02-22 21:19:54.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/utimes.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/utimes.c linux-4.4.161-vs2.3.9.8/fs/utimes.c +--- linux-4.4.161/fs/utimes.c 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/fs/utimes.c 2018-10-20 04:57:21.000000000 +0000 @@ -8,6 +8,8 @@ #include #include @@ -6578,9 +6578,9 @@ diff -NurpP --minimal linux-4.4.116/fs/utimes.c linux-4.4.116-vs2.3.9.7/fs/utime if (times && times[0].tv_nsec == UTIME_NOW && times[1].tv_nsec == UTIME_NOW) times = NULL; -diff -NurpP --minimal linux-4.4.116/fs/xattr.c linux-4.4.116-vs2.3.9.7/fs/xattr.c ---- linux-4.4.116/fs/xattr.c 2018-02-22 21:19:54.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/fs/xattr.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/fs/xattr.c linux-4.4.161-vs2.3.9.8/fs/xattr.c +--- linux-4.4.161/fs/xattr.c 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/fs/xattr.c 2018-10-20 05:50:20.000000000 +0000 @@ -21,6 +21,7 @@ #include #include @@ -6598,9 +6598,9 @@ diff -NurpP --minimal linux-4.4.116/fs/xattr.c linux-4.4.116-vs2.3.9.7/fs/xattr. return (mask & MAY_WRITE) ? -EPERM : -ENODATA; return 0; } -diff -NurpP --minimal linux-4.4.116/include/linux/capability.h linux-4.4.116-vs2.3.9.7/include/linux/capability.h ---- linux-4.4.116/include/linux/capability.h 2018-02-22 21:19:56.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/capability.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/capability.h linux-4.4.161-vs2.3.9.8/include/linux/capability.h +--- linux-4.4.161/include/linux/capability.h 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 */ @@ -6611,9 +6611,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/capability.h linux-4.4.116-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.116/include/linux/cred.h linux-4.4.116-vs2.3.9.7/include/linux/cred.h ---- linux-4.4.116/include/linux/cred.h 2018-02-22 21:19:57.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/cred.h 2018-01-11 08:03:00.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/cred.h linux-4.4.161-vs2.3.9.8/include/linux/cred.h +--- linux-4.4.161/include/linux/cred.h 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/include/linux/cred.h 2018-10-20 04:57:21.000000000 +0000 @@ -161,6 +161,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 *); @@ -6654,9 +6654,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/cred.h linux-4.4.116-vs2.3.9.7 /** * get_new_cred - Get a reference on a new set of credentials * @cred: The new credentials to reference -diff -NurpP --minimal linux-4.4.116/include/linux/dcache.h linux-4.4.116-vs2.3.9.7/include/linux/dcache.h ---- linux-4.4.116/include/linux/dcache.h 2018-02-22 21:19:57.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/dcache.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/dcache.h linux-4.4.161-vs2.3.9.8/include/linux/dcache.h +--- linux-4.4.161/include/linux/dcache.h 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/include/linux/dcache.h 2018-10-20 04:57:21.000000000 +0000 @@ -10,6 +10,7 @@ #include #include @@ -6665,7 +6665,7 @@ diff -NurpP --minimal linux-4.4.116/include/linux/dcache.h linux-4.4.116-vs2.3.9 struct path; struct vfsmount; -@@ -351,8 +352,10 @@ extern char *dentry_path(struct dentry * +@@ -352,8 +353,10 @@ extern char *dentry_path(struct dentry * */ static inline struct dentry *dget_dlock(struct dentry *dentry) { @@ -6677,18 +6677,18 @@ diff -NurpP --minimal linux-4.4.116/include/linux/dcache.h linux-4.4.116-vs2.3.9 return dentry; } -diff -NurpP --minimal linux-4.4.116/include/linux/devpts_fs.h linux-4.4.116-vs2.3.9.7/include/linux/devpts_fs.h ---- linux-4.4.116/include/linux/devpts_fs.h 2018-02-22 21:19:57.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/devpts_fs.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/devpts_fs.h linux-4.4.161-vs2.3.9.8/include/linux/devpts_fs.h +--- linux-4.4.161/include/linux/devpts_fs.h 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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.116/include/linux/fs.h linux-4.4.116-vs2.3.9.7/include/linux/fs.h ---- linux-4.4.116/include/linux/fs.h 2018-02-22 21:19:57.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/fs.h 2018-02-22 21:30:19.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/fs.h linux-4.4.161-vs2.3.9.8/include/linux/fs.h +--- linux-4.4.161/include/linux/fs.h 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/include/linux/fs.h 2018-10-20 04:57:21.000000000 +0000 @@ -227,6 +227,7 @@ typedef void (dax_iodone_t)(struct buffe #define ATTR_OPEN (1 << 15) /* Truncating from open(O_TRUNC) */ #define ATTR_TIMES_SET (1 << 16) @@ -6774,7 +6774,7 @@ diff -NurpP --minimal linux-4.4.116/include/linux/fs.h linux-4.4.116-vs2.3.9.7/i struct fasync_struct * fl_fasync; /* for lease break notifications */ /* for lease breaks: */ -@@ -1698,6 +1715,7 @@ struct inode_operations { +@@ -1699,6 +1716,7 @@ struct inode_operations { ssize_t (*getxattr) (struct dentry *, const char *, void *, size_t); ssize_t (*listxattr) (struct dentry *, char *, size_t); int (*removexattr) (struct dentry *, const char *); @@ -6782,7 +6782,7 @@ diff -NurpP --minimal linux-4.4.116/include/linux/fs.h linux-4.4.116-vs2.3.9.7/i int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start, u64 len); int (*update_time)(struct inode *, struct timespec *, int); -@@ -1712,6 +1730,7 @@ ssize_t rw_copy_check_uvector(int type, +@@ -1713,6 +1731,7 @@ ssize_t rw_copy_check_uvector(int type, unsigned long nr_segs, unsigned long fast_segs, struct iovec *fast_pointer, struct iovec **ret_pointer); @@ -6790,7 +6790,7 @@ diff -NurpP --minimal linux-4.4.116/include/linux/fs.h linux-4.4.116-vs2.3.9.7/i extern ssize_t __vfs_read(struct file *, char __user *, size_t, loff_t *); extern ssize_t __vfs_write(struct file *, const char __user *, size_t, loff_t *); -@@ -1777,6 +1796,14 @@ struct super_operations { +@@ -1778,6 +1797,14 @@ struct super_operations { #else #define S_DAX 0 /* Make all the DAX code disappear */ #endif @@ -6805,7 +6805,7 @@ diff -NurpP --minimal linux-4.4.116/include/linux/fs.h linux-4.4.116-vs2.3.9.7/i /* * Note that nosuid etc flags are inode-specific: setting some file-system -@@ -1801,10 +1828,13 @@ struct super_operations { +@@ -1802,10 +1829,13 @@ struct super_operations { #define IS_MANDLOCK(inode) __IS_FLG(inode, MS_MANDLOCK) #define IS_NOATIME(inode) __IS_FLG(inode, MS_RDONLY|MS_NOATIME) #define IS_I_VERSION(inode) __IS_FLG(inode, MS_I_VERSION) @@ -6819,7 +6819,7 @@ diff -NurpP --minimal linux-4.4.116/include/linux/fs.h linux-4.4.116-vs2.3.9.7/i #define IS_POSIXACL(inode) __IS_FLG(inode, MS_POSIXACL) #define IS_DEADDIR(inode) ((inode)->i_flags & S_DEAD) -@@ -1819,6 +1849,16 @@ struct super_operations { +@@ -1820,6 +1850,16 @@ struct super_operations { #define IS_WHITEOUT(inode) (S_ISCHR(inode->i_mode) && \ (inode)->i_rdev == WHITEOUT_DEV) @@ -6836,7 +6836,7 @@ diff -NurpP --minimal linux-4.4.116/include/linux/fs.h linux-4.4.116-vs2.3.9.7/i /* * Inode state bits. Protected by inode->i_lock * -@@ -2075,6 +2115,9 @@ extern struct kobject *fs_kobj; +@@ -2076,6 +2116,9 @@ extern struct kobject *fs_kobj; extern int locks_mandatory_locked(struct file *); extern int locks_mandatory_area(int, struct inode *, struct file *, loff_t, size_t); @@ -6846,7 +6846,7 @@ diff -NurpP --minimal linux-4.4.116/include/linux/fs.h linux-4.4.116-vs2.3.9.7/i /* * Candidates for mandatory locking have the setgid bit set * but no group execute bit - an otherwise meaningless combination. -@@ -2830,6 +2873,7 @@ extern int dcache_dir_open(struct inode +@@ -2831,6 +2874,7 @@ extern int dcache_dir_open(struct inode extern int dcache_dir_close(struct inode *, struct file *); extern loff_t dcache_dir_lseek(struct file *, loff_t, int); extern int dcache_readdir(struct file *, struct dir_context *); @@ -6854,9 +6854,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/fs.h linux-4.4.116-vs2.3.9.7/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.116/include/linux/init_task.h linux-4.4.116-vs2.3.9.7/include/linux/init_task.h ---- linux-4.4.116/include/linux/init_task.h 2016-07-05 04:15:10.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/init_task.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/init_task.h linux-4.4.161-vs2.3.9.8/include/linux/init_task.h +--- linux-4.4.161/include/linux/init_task.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-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 INIT_VTIME(tsk) \ INIT_NUMA_BALANCING(tsk) \ @@ -6868,9 +6868,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/init_task.h linux-4.4.116-vs2. } -diff -NurpP --minimal linux-4.4.116/include/linux/ipc.h linux-4.4.116-vs2.3.9.7/include/linux/ipc.h ---- linux-4.4.116/include/linux/ipc.h 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/ipc.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/ipc.h linux-4.4.161-vs2.3.9.8/include/linux/ipc.h +--- linux-4.4.161/include/linux/ipc.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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; @@ -6879,9 +6879,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/ipc.h linux-4.4.116-vs2.3.9.7/ kuid_t cuid; kgid_t cgid; umode_t mode; -diff -NurpP --minimal linux-4.4.116/include/linux/memcontrol.h linux-4.4.116-vs2.3.9.7/include/linux/memcontrol.h ---- linux-4.4.116/include/linux/memcontrol.h 2018-02-22 21:19:57.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/memcontrol.h 2018-01-24 22:44:17.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/memcontrol.h linux-4.4.161-vs2.3.9.8/include/linux/memcontrol.h +--- linux-4.4.161/include/linux/memcontrol.h 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/include/linux/memcontrol.h 2018-10-20 04:57:21.000000000 +0000 @@ -113,6 +113,7 @@ struct cg_proto { struct mem_cgroup *memcg; }; @@ -6903,9 +6903,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/memcontrol.h linux-4.4.116-vs2 static inline bool mm_match_cgroup(struct mm_struct *mm, struct mem_cgroup *memcg) { -diff -NurpP --minimal linux-4.4.116/include/linux/mount.h linux-4.4.116-vs2.3.9.7/include/linux/mount.h ---- linux-4.4.116/include/linux/mount.h 2018-02-22 21:19:57.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/mount.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/mount.h linux-4.4.161-vs2.3.9.8/include/linux/mount.h +--- linux-4.4.161/include/linux/mount.h 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -6916,9 +6916,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/mount.h linux-4.4.116-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.116/include/linux/net.h linux-4.4.116-vs2.3.9.7/include/linux/net.h ---- linux-4.4.116/include/linux/net.h 2018-02-22 21:19:57.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/net.h 2018-01-09 16:42:30.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/net.h linux-4.4.161-vs2.3.9.8/include/linux/net.h +--- linux-4.4.161/include/linux/net.h 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -6927,9 +6927,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/net.h linux-4.4.116-vs2.3.9.7/ #ifndef ARCH_HAS_SOCKET_TYPES /** -diff -NurpP --minimal linux-4.4.116/include/linux/netdevice.h linux-4.4.116-vs2.3.9.7/include/linux/netdevice.h ---- linux-4.4.116/include/linux/netdevice.h 2018-02-22 21:19:57.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/netdevice.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/netdevice.h linux-4.4.161-vs2.3.9.8/include/linux/netdevice.h +--- linux-4.4.161/include/linux/netdevice.h 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/include/linux/netdevice.h 2018-10-20 04:57:21.000000000 +0000 @@ -2296,6 +2296,7 @@ static inline int dev_recursion_level(vo struct net_device *dev_get_by_index(struct net *net, int ifindex); @@ -6938,9 +6938,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/netdevice.h linux-4.4.116-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.116/include/linux/nsproxy.h linux-4.4.116-vs2.3.9.7/include/linux/nsproxy.h ---- linux-4.4.116/include/linux/nsproxy.h 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/nsproxy.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/nsproxy.h linux-4.4.161-vs2.3.9.8/include/linux/nsproxy.h +--- linux-4.4.161/include/linux/nsproxy.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/include/linux/nsproxy.h 2018-10-20 04:57:21.000000000 +0000 @@ -3,6 +3,7 @@ #include @@ -6990,9 +6990,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/nsproxy.h linux-4.4.116-vs2.3. } #endif -diff -NurpP --minimal linux-4.4.116/include/linux/pid.h linux-4.4.116-vs2.3.9.7/include/linux/pid.h ---- linux-4.4.116/include/linux/pid.h 2018-02-22 21:19:57.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/pid.h 2018-01-09 16:45:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/pid.h linux-4.4.161-vs2.3.9.8/include/linux/pid.h +--- linux-4.4.161/include/linux/pid.h 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/include/linux/pid.h 2018-10-20 04:57:21.000000000 +0000 @@ -10,7 +10,8 @@ enum pid_type PIDTYPE_SID, PIDTYPE_MAX, @@ -7011,9 +7011,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/pid.h linux-4.4.116-vs2.3.9.7/ pid_t pid_vnr(struct pid *pid); #define do_each_pid_task(pid, type, task) \ -diff -NurpP --minimal linux-4.4.116/include/linux/quotaops.h linux-4.4.116-vs2.3.9.7/include/linux/quotaops.h ---- linux-4.4.116/include/linux/quotaops.h 2016-07-05 04:12:37.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/quotaops.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/quotaops.h linux-4.4.161-vs2.3.9.8/include/linux/quotaops.h +--- linux-4.4.161/include/linux/quotaops.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/include/linux/quotaops.h 2018-10-20 04:57:21.000000000 +0000 @@ -8,6 +8,7 @@ #define _LINUX_QUOTAOPS_ @@ -7055,9 +7055,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/quotaops.h linux-4.4.116-vs2.3 } static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number) -diff -NurpP --minimal linux-4.4.116/include/linux/sched.h linux-4.4.116-vs2.3.9.7/include/linux/sched.h ---- linux-4.4.116/include/linux/sched.h 2018-02-22 21:19:57.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/sched.h 2018-02-10 15:16:50.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/sched.h linux-4.4.161-vs2.3.9.8/include/linux/sched.h +--- linux-4.4.161/include/linux/sched.h 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/include/linux/sched.h 2018-10-20 05:50:20.000000000 +0000 @@ -1601,6 +1601,14 @@ struct task_struct { #endif struct seccomp seccomp; @@ -7095,9 +7095,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/sched.h linux-4.4.116-vs2.3.9. } -diff -NurpP --minimal linux-4.4.116/include/linux/shmem_fs.h linux-4.4.116-vs2.3.9.7/include/linux/shmem_fs.h ---- linux-4.4.116/include/linux/shmem_fs.h 2018-02-22 21:19:57.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/shmem_fs.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/shmem_fs.h linux-4.4.161-vs2.3.9.8/include/linux/shmem_fs.h +--- linux-4.4.161/include/linux/shmem_fs.h 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/include/linux/shmem_fs.h 2018-10-20 04:57:21.000000000 +0000 @@ -10,6 +10,9 @@ /* inode in-kernel data */ @@ -7108,9 +7108,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/shmem_fs.h linux-4.4.116-vs2.3 struct shmem_inode_info { spinlock_t lock; unsigned int seals; /* shmem seals */ -diff -NurpP --minimal linux-4.4.116/include/linux/stat.h linux-4.4.116-vs2.3.9.7/include/linux/stat.h ---- linux-4.4.116/include/linux/stat.h 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/stat.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/stat.h linux-4.4.161-vs2.3.9.8/include/linux/stat.h +--- linux-4.4.161/include/linux/stat.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/include/linux/stat.h 2018-10-20 04:57:21.000000000 +0000 @@ -25,6 +25,7 @@ struct kstat { unsigned int nlink; kuid_t uid; @@ -7119,9 +7119,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/stat.h linux-4.4.116-vs2.3.9.7 dev_t rdev; loff_t size; struct timespec atime; -diff -NurpP --minimal linux-4.4.116/include/linux/sunrpc/auth.h linux-4.4.116-vs2.3.9.7/include/linux/sunrpc/auth.h ---- linux-4.4.116/include/linux/sunrpc/auth.h 2016-07-05 04:12:37.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/sunrpc/auth.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/sunrpc/auth.h linux-4.4.161-vs2.3.9.8/include/linux/sunrpc/auth.h +--- linux-4.4.161/include/linux/sunrpc/auth.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/include/linux/sunrpc/auth.h 2018-10-20 04:57:21.000000000 +0000 @@ -40,6 +40,7 @@ enum { struct auth_cred { kuid_t uid; @@ -7130,9 +7130,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/sunrpc/auth.h linux-4.4.116-vs struct group_info *group_info; const char *principal; unsigned long ac_flags; -diff -NurpP --minimal linux-4.4.116/include/linux/sunrpc/clnt.h linux-4.4.116-vs2.3.9.7/include/linux/sunrpc/clnt.h ---- linux-4.4.116/include/linux/sunrpc/clnt.h 2018-02-22 21:19:58.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/sunrpc/clnt.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/sunrpc/clnt.h linux-4.4.161-vs2.3.9.8/include/linux/sunrpc/clnt.h +--- linux-4.4.161/include/linux/sunrpc/clnt.h 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 */ @@ -7143,9 +7143,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/sunrpc/clnt.h linux-4.4.116-vs struct rpc_rtt * cl_rtt; /* RTO estimator data */ const struct rpc_timeout *cl_timeout; /* Timeout strategy */ -diff -NurpP --minimal linux-4.4.116/include/linux/types.h linux-4.4.116-vs2.3.9.7/include/linux/types.h ---- linux-4.4.116/include/linux/types.h 2016-07-05 04:15:11.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/types.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/types.h linux-4.4.161-vs2.3.9.8/include/linux/types.h +--- linux-4.4.161/include/linux/types.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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; @@ -7156,9 +7156,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/types.h linux-4.4.116-vs2.3.9. typedef unsigned long uintptr_t; -diff -NurpP --minimal linux-4.4.116/include/linux/uidgid.h linux-4.4.116-vs2.3.9.7/include/linux/uidgid.h ---- linux-4.4.116/include/linux/uidgid.h 2015-07-06 20:41:43.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/uidgid.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/uidgid.h linux-4.4.161-vs2.3.9.8/include/linux/uidgid.h +--- linux-4.4.161/include/linux/uidgid.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/include/linux/uidgid.h 2018-10-20 04:57:21.000000000 +0000 @@ -21,13 +21,17 @@ typedef struct { uid_t val; } kuid_t; @@ -7255,9 +7255,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/uidgid.h linux-4.4.116-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.116/include/linux/vroot.h linux-4.4.116-vs2.3.9.7/include/linux/vroot.h ---- linux-4.4.116/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vroot.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vroot.h linux-4.4.161-vs2.3.9.8/include/linux/vroot.h +--- linux-4.4.161/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/include/linux/vroot.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,51 @@ + +/* @@ -7310,9 +7310,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/vroot.h linux-4.4.116-vs2.3.9. +#define VROOT_CLR_DEV 0x5601 + +#endif /* _LINUX_VROOT_H */ -diff -NurpP --minimal linux-4.4.116/include/linux/vs_base.h linux-4.4.116-vs2.3.9.7/include/linux/vs_base.h ---- linux-4.4.116/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vs_base.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vs_base.h linux-4.4.161-vs2.3.9.8/include/linux/vs_base.h +--- linux-4.4.161/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -7324,9 +7324,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/vs_base.h linux-4.4.116-vs2.3. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-4.4.116/include/linux/vs_context.h linux-4.4.116-vs2.3.9.7/include/linux/vs_context.h ---- linux-4.4.116/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vs_context.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vs_context.h linux-4.4.161-vs2.3.9.8/include/linux/vs_context.h +--- linux-4.4.161/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -7570,9 +7570,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/vs_context.h linux-4.4.116-vs2 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-4.4.116/include/linux/vs_cowbl.h linux-4.4.116-vs2.3.9.7/include/linux/vs_cowbl.h ---- linux-4.4.116/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vs_cowbl.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vs_cowbl.h linux-4.4.161-vs2.3.9.8/include/linux/vs_cowbl.h +--- linux-4.4.161/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -7622,9 +7622,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/vs_cowbl.h linux-4.4.116-vs2.3 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-4.4.116/include/linux/vs_cvirt.h linux-4.4.116-vs2.3.9.7/include/linux/vs_cvirt.h ---- linux-4.4.116/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vs_cvirt.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vs_cvirt.h linux-4.4.161-vs2.3.9.8/include/linux/vs_cvirt.h +--- linux-4.4.161/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -7676,9 +7676,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/vs_cvirt.h linux-4.4.116-vs2.3 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-4.4.116/include/linux/vs_device.h linux-4.4.116-vs2.3.9.7/include/linux/vs_device.h ---- linux-4.4.116/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vs_device.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vs_device.h linux-4.4.161-vs2.3.9.8/include/linux/vs_device.h +--- linux-4.4.161/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -7725,9 +7725,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/vs_device.h linux-4.4.116-vs2. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-4.4.116/include/linux/vs_dlimit.h linux-4.4.116-vs2.3.9.7/include/linux/vs_dlimit.h ---- linux-4.4.116/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vs_dlimit.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vs_dlimit.h linux-4.4.161-vs2.3.9.8/include/linux/vs_dlimit.h +--- linux-4.4.161/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -7944,9 +7944,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/vs_dlimit.h linux-4.4.116-vs2. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-4.4.116/include/linux/vs_inet.h linux-4.4.116-vs2.3.9.7/include/linux/vs_inet.h ---- linux-4.4.116/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vs_inet.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vs_inet.h linux-4.4.161-vs2.3.9.8/include/linux/vs_inet.h +--- linux-4.4.161/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -8312,9 +8312,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/vs_inet.h linux-4.4.116-vs2.3. +#else +// #warning duplicate inclusion +#endif -diff -NurpP --minimal linux-4.4.116/include/linux/vs_inet6.h linux-4.4.116-vs2.3.9.7/include/linux/vs_inet6.h ---- linux-4.4.116/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vs_inet6.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vs_inet6.h linux-4.4.161-vs2.3.9.8/include/linux/vs_inet6.h +--- linux-4.4.161/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -8573,9 +8573,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/vs_inet6.h linux-4.4.116-vs2.3 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-4.4.116/include/linux/vs_limit.h linux-4.4.116-vs2.3.9.7/include/linux/vs_limit.h ---- linux-4.4.116/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vs_limit.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vs_limit.h linux-4.4.161-vs2.3.9.8/include/linux/vs_limit.h +--- linux-4.4.161/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -8717,9 +8717,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/vs_limit.h linux-4.4.116-vs2.3 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-4.4.116/include/linux/vs_network.h linux-4.4.116-vs2.3.9.7/include/linux/vs_network.h ---- linux-4.4.116/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vs_network.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vs_network.h linux-4.4.161-vs2.3.9.8/include/linux/vs_network.h +--- linux-4.4.161/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -8890,9 +8890,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/vs_network.h linux-4.4.116-vs2 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-4.4.116/include/linux/vs_pid.h linux-4.4.116-vs2.3.9.7/include/linux/vs_pid.h ---- linux-4.4.116/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vs_pid.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vs_pid.h linux-4.4.161-vs2.3.9.8/include/linux/vs_pid.h +--- linux-4.4.161/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -8944,9 +8944,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/vs_pid.h linux-4.4.116-vs2.3.9 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-4.4.116/include/linux/vs_sched.h linux-4.4.116-vs2.3.9.7/include/linux/vs_sched.h ---- linux-4.4.116/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vs_sched.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vs_sched.h linux-4.4.161-vs2.3.9.8/include/linux/vs_sched.h +--- linux-4.4.161/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -8988,9 +8988,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/vs_sched.h linux-4.4.116-vs2.3 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-4.4.116/include/linux/vs_socket.h linux-4.4.116-vs2.3.9.7/include/linux/vs_socket.h ---- linux-4.4.116/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vs_socket.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vs_socket.h linux-4.4.161-vs2.3.9.8/include/linux/vs_socket.h +--- linux-4.4.161/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -9059,9 +9059,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/vs_socket.h linux-4.4.116-vs2. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-4.4.116/include/linux/vs_tag.h linux-4.4.116-vs2.3.9.7/include/linux/vs_tag.h ---- linux-4.4.116/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vs_tag.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vs_tag.h linux-4.4.161-vs2.3.9.8/include/linux/vs_tag.h +--- linux-4.4.161/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -9110,9 +9110,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/vs_tag.h linux-4.4.116-vs2.3.9 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-4.4.116/include/linux/vs_time.h linux-4.4.116-vs2.3.9.7/include/linux/vs_time.h ---- linux-4.4.116/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vs_time.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vs_time.h linux-4.4.161-vs2.3.9.8/include/linux/vs_time.h +--- linux-4.4.161/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -9133,9 +9133,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/vs_time.h linux-4.4.116-vs2.3. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-4.4.116/include/linux/vserver/base.h linux-4.4.116-vs2.3.9.7/include/linux/vserver/base.h ---- linux-4.4.116/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vserver/base.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vserver/base.h linux-4.4.161-vs2.3.9.8/include/linux/vserver/base.h +--- linux-4.4.161/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -9321,9 +9321,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/vserver/base.h linux-4.4.116-v +#define nx_info_state(n, m) (__nx_state(n) & (m)) + +#endif -diff -NurpP --minimal linux-4.4.116/include/linux/vserver/cacct.h linux-4.4.116-vs2.3.9.7/include/linux/vserver/cacct.h ---- linux-4.4.116/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vserver/cacct.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vserver/cacct.h linux-4.4.161-vs2.3.9.8/include/linux/vserver/cacct.h +--- linux-4.4.161/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -9340,9 +9340,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/vserver/cacct.h linux-4.4.116- +}; + +#endif /* _VSERVER_CACCT_H */ -diff -NurpP --minimal linux-4.4.116/include/linux/vserver/cacct_cmd.h linux-4.4.116-vs2.3.9.7/include/linux/vserver/cacct_cmd.h ---- linux-4.4.116/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vserver/cacct_cmd.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vserver/cacct_cmd.h linux-4.4.161-vs2.3.9.8/include/linux/vserver/cacct_cmd.h +--- linux-4.4.161/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -9354,9 +9354,9 @@ diff -NurpP --minimal linux-4.4.116/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.116/include/linux/vserver/cacct_def.h linux-4.4.116-vs2.3.9.7/include/linux/vserver/cacct_def.h ---- linux-4.4.116/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vserver/cacct_def.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vserver/cacct_def.h linux-4.4.161-vs2.3.9.8/include/linux/vserver/cacct_def.h +--- linux-4.4.161/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -9401,9 +9401,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/vserver/cacct_def.h linux-4.4. +#endif + +#endif /* _VSERVER_CACCT_DEF_H */ -diff -NurpP --minimal linux-4.4.116/include/linux/vserver/cacct_int.h linux-4.4.116-vs2.3.9.7/include/linux/vserver/cacct_int.h ---- linux-4.4.116/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vserver/cacct_int.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vserver/cacct_int.h linux-4.4.161-vs2.3.9.8/include/linux/vserver/cacct_int.h +--- linux-4.4.161/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -9422,9 +9422,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/vserver/cacct_int.h linux-4.4. +} + +#endif /* _VSERVER_CACCT_INT_H */ -diff -NurpP --minimal linux-4.4.116/include/linux/vserver/check.h linux-4.4.116-vs2.3.9.7/include/linux/vserver/check.h ---- linux-4.4.116/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vserver/check.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vserver/check.h linux-4.4.161-vs2.3.9.8/include/linux/vserver/check.h +--- linux-4.4.161/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -9515,9 +9515,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/vserver/check.h linux-4.4.116- +#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1) + +#endif -diff -NurpP --minimal linux-4.4.116/include/linux/vserver/context.h linux-4.4.116-vs2.3.9.7/include/linux/vserver/context.h ---- linux-4.4.116/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vserver/context.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vserver/context.h linux-4.4.161-vs2.3.9.8/include/linux/vserver/context.h +--- linux-4.4.161/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -9629,9 +9629,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/vserver/context.h linux-4.4.11 + + +#endif /* _VSERVER_CONTEXT_H */ -diff -NurpP --minimal linux-4.4.116/include/linux/vserver/context_cmd.h linux-4.4.116-vs2.3.9.7/include/linux/vserver/context_cmd.h ---- linux-4.4.116/include/linux/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vserver/context_cmd.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vserver/context_cmd.h linux-4.4.161-vs2.3.9.8/include/linux/vserver/context_cmd.h +--- linux-4.4.161/include/linux/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -9666,9 +9666,9 @@ diff -NurpP --minimal linux-4.4.116/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.116/include/linux/vserver/cvirt.h linux-4.4.116-vs2.3.9.7/include/linux/vserver/cvirt.h ---- linux-4.4.116/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vserver/cvirt.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vserver/cvirt.h linux-4.4.161-vs2.3.9.8/include/linux/vserver/cvirt.h +--- linux-4.4.161/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -9688,9 +9688,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/vserver/cvirt.h linux-4.4.116- +int vx_do_syslog(int, char __user *, int); + +#endif /* _VSERVER_CVIRT_H */ -diff -NurpP --minimal linux-4.4.116/include/linux/vserver/cvirt_cmd.h linux-4.4.116-vs2.3.9.7/include/linux/vserver/cvirt_cmd.h ---- linux-4.4.116/include/linux/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vserver/cvirt_cmd.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vserver/cvirt_cmd.h linux-4.4.161-vs2.3.9.8/include/linux/vserver/cvirt_cmd.h +--- linux-4.4.161/include/linux/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -9705,9 +9705,9 @@ diff -NurpP --minimal linux-4.4.116/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.116/include/linux/vserver/cvirt_def.h linux-4.4.116-vs2.3.9.7/include/linux/vserver/cvirt_def.h ---- linux-4.4.116/include/linux/vserver/cvirt_def.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vserver/cvirt_def.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vserver/cvirt_def.h linux-4.4.161-vs2.3.9.8/include/linux/vserver/cvirt_def.h +--- linux-4.4.161/include/linux/vserver/cvirt_def.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -9789,9 +9789,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/vserver/cvirt_def.h linux-4.4. +#endif + +#endif /* _VSERVER_CVIRT_DEF_H */ -diff -NurpP --minimal linux-4.4.116/include/linux/vserver/debug.h linux-4.4.116-vs2.3.9.7/include/linux/vserver/debug.h ---- linux-4.4.116/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vserver/debug.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vserver/debug.h linux-4.4.161-vs2.3.9.8/include/linux/vserver/debug.h +--- linux-4.4.161/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -9939,9 +9939,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/vserver/debug.h linux-4.4.116- + + +#endif /* _VSERVER_DEBUG_H */ -diff -NurpP --minimal linux-4.4.116/include/linux/vserver/debug_cmd.h linux-4.4.116-vs2.3.9.7/include/linux/vserver/debug_cmd.h ---- linux-4.4.116/include/linux/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vserver/debug_cmd.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vserver/debug_cmd.h linux-4.4.161-vs2.3.9.8/include/linux/vserver/debug_cmd.h +--- linux-4.4.161/include/linux/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -9980,9 +9980,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/vserver/debug_cmd.h linux-4.4. +#endif /* CONFIG_COMPAT */ + +#endif /* _VSERVER_DEBUG_CMD_H */ -diff -NurpP --minimal linux-4.4.116/include/linux/vserver/device.h linux-4.4.116-vs2.3.9.7/include/linux/vserver/device.h ---- linux-4.4.116/include/linux/vserver/device.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vserver/device.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vserver/device.h linux-4.4.161-vs2.3.9.8/include/linux/vserver/device.h +--- linux-4.4.161/include/linux/vserver/device.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -9993,9 +9993,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/vserver/device.h linux-4.4.116 +#else /* _VSERVER_DEVICE_H */ +#warning duplicate inclusion +#endif /* _VSERVER_DEVICE_H */ -diff -NurpP --minimal linux-4.4.116/include/linux/vserver/device_cmd.h linux-4.4.116-vs2.3.9.7/include/linux/vserver/device_cmd.h ---- linux-4.4.116/include/linux/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vserver/device_cmd.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vserver/device_cmd.h linux-4.4.161-vs2.3.9.8/include/linux/vserver/device_cmd.h +--- linux-4.4.161/include/linux/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -10028,9 +10028,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/vserver/device_cmd.h linux-4.4 +#endif /* CONFIG_COMPAT */ + +#endif /* _VSERVER_DEVICE_CMD_H */ -diff -NurpP --minimal linux-4.4.116/include/linux/vserver/device_def.h linux-4.4.116-vs2.3.9.7/include/linux/vserver/device_def.h ---- linux-4.4.116/include/linux/vserver/device_def.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vserver/device_def.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vserver/device_def.h linux-4.4.161-vs2.3.9.8/include/linux/vserver/device_def.h +--- linux-4.4.161/include/linux/vserver/device_def.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -10049,9 +10049,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/vserver/device_def.h linux-4.4 +}; + +#endif /* _VSERVER_DEVICE_DEF_H */ -diff -NurpP --minimal linux-4.4.116/include/linux/vserver/dlimit.h linux-4.4.116-vs2.3.9.7/include/linux/vserver/dlimit.h ---- linux-4.4.116/include/linux/vserver/dlimit.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vserver/dlimit.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vserver/dlimit.h linux-4.4.161-vs2.3.9.8/include/linux/vserver/dlimit.h +--- linux-4.4.161/include/linux/vserver/dlimit.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -10107,9 +10107,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/vserver/dlimit.h linux-4.4.116 +#else /* _VSERVER_DLIMIT_H */ +#warning duplicate inclusion +#endif /* _VSERVER_DLIMIT_H */ -diff -NurpP --minimal linux-4.4.116/include/linux/vserver/dlimit_cmd.h linux-4.4.116-vs2.3.9.7/include/linux/vserver/dlimit_cmd.h ---- linux-4.4.116/include/linux/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vserver/dlimit_cmd.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vserver/dlimit_cmd.h linux-4.4.161-vs2.3.9.8/include/linux/vserver/dlimit_cmd.h +--- linux-4.4.161/include/linux/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -10157,9 +10157,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/vserver/dlimit_cmd.h linux-4.4 +#endif /* CONFIG_COMPAT */ + +#endif /* _VSERVER_DLIMIT_CMD_H */ -diff -NurpP --minimal linux-4.4.116/include/linux/vserver/global.h linux-4.4.116-vs2.3.9.7/include/linux/vserver/global.h ---- linux-4.4.116/include/linux/vserver/global.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vserver/global.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vserver/global.h linux-4.4.161-vs2.3.9.8/include/linux/vserver/global.h +--- linux-4.4.161/include/linux/vserver/global.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -10180,9 +10180,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/vserver/global.h linux-4.4.116 + + +#endif /* _VSERVER_GLOBAL_H */ -diff -NurpP --minimal linux-4.4.116/include/linux/vserver/history.h linux-4.4.116-vs2.3.9.7/include/linux/vserver/history.h ---- linux-4.4.116/include/linux/vserver/history.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vserver/history.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vserver/history.h linux-4.4.161-vs2.3.9.8/include/linux/vserver/history.h +--- linux-4.4.161/include/linux/vserver/history.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -10381,9 +10381,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/vserver/history.h linux-4.4.11 +#endif /* CONFIG_VSERVER_HISTORY */ + +#endif /* _VSERVER_HISTORY_H */ -diff -NurpP --minimal linux-4.4.116/include/linux/vserver/inode.h linux-4.4.116-vs2.3.9.7/include/linux/vserver/inode.h ---- linux-4.4.116/include/linux/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vserver/inode.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vserver/inode.h linux-4.4.161-vs2.3.9.8/include/linux/vserver/inode.h +--- linux-4.4.161/include/linux/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -10404,9 +10404,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/vserver/inode.h linux-4.4.116- +#else /* _VSERVER_INODE_H */ +#warning duplicate inclusion +#endif /* _VSERVER_INODE_H */ -diff -NurpP --minimal linux-4.4.116/include/linux/vserver/inode_cmd.h linux-4.4.116-vs2.3.9.7/include/linux/vserver/inode_cmd.h ---- linux-4.4.116/include/linux/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vserver/inode_cmd.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vserver/inode_cmd.h linux-4.4.161-vs2.3.9.8/include/linux/vserver/inode_cmd.h +--- linux-4.4.161/include/linux/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -10444,9 +10444,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/vserver/inode_cmd.h linux-4.4. +#endif /* CONFIG_COMPAT */ + +#endif /* _VSERVER_INODE_CMD_H */ -diff -NurpP --minimal linux-4.4.116/include/linux/vserver/limit.h linux-4.4.116-vs2.3.9.7/include/linux/vserver/limit.h ---- linux-4.4.116/include/linux/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vserver/limit.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vserver/limit.h linux-4.4.161-vs2.3.9.8/include/linux/vserver/limit.h +--- linux-4.4.161/include/linux/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -10515,9 +10515,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/vserver/limit.h linux-4.4.116- +#define NUM_LIMITS 24 + +#endif /* _VSERVER_LIMIT_H */ -diff -NurpP --minimal linux-4.4.116/include/linux/vserver/limit_cmd.h linux-4.4.116-vs2.3.9.7/include/linux/vserver/limit_cmd.h ---- linux-4.4.116/include/linux/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vserver/limit_cmd.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vserver/limit_cmd.h linux-4.4.161-vs2.3.9.8/include/linux/vserver/limit_cmd.h +--- linux-4.4.161/include/linux/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -10554,9 +10554,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/vserver/limit_cmd.h linux-4.4. +#endif /* CONFIG_IA32_EMULATION */ + +#endif /* _VSERVER_LIMIT_CMD_H */ -diff -NurpP --minimal linux-4.4.116/include/linux/vserver/limit_def.h linux-4.4.116-vs2.3.9.7/include/linux/vserver/limit_def.h ---- linux-4.4.116/include/linux/vserver/limit_def.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vserver/limit_def.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vserver/limit_def.h linux-4.4.161-vs2.3.9.8/include/linux/vserver/limit_def.h +--- linux-4.4.161/include/linux/vserver/limit_def.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -10605,9 +10605,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/vserver/limit_def.h linux-4.4. +#endif + +#endif /* _VSERVER_LIMIT_DEF_H */ -diff -NurpP --minimal linux-4.4.116/include/linux/vserver/limit_int.h linux-4.4.116-vs2.3.9.7/include/linux/vserver/limit_int.h ---- linux-4.4.116/include/linux/vserver/limit_int.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vserver/limit_int.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vserver/limit_int.h linux-4.4.161-vs2.3.9.8/include/linux/vserver/limit_int.h +--- linux-4.4.161/include/linux/vserver/limit_int.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -10802,9 +10802,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/vserver/limit_int.h linux-4.4. + + +#endif /* _VSERVER_LIMIT_INT_H */ -diff -NurpP --minimal linux-4.4.116/include/linux/vserver/monitor.h linux-4.4.116-vs2.3.9.7/include/linux/vserver/monitor.h ---- linux-4.4.116/include/linux/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vserver/monitor.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vserver/monitor.h linux-4.4.161-vs2.3.9.8/include/linux/vserver/monitor.h +--- linux-4.4.161/include/linux/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -10812,9 +10812,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/vserver/monitor.h linux-4.4.11 +#include + +#endif /* _VSERVER_MONITOR_H */ -diff -NurpP --minimal linux-4.4.116/include/linux/vserver/network.h linux-4.4.116-vs2.3.9.7/include/linux/vserver/network.h ---- linux-4.4.116/include/linux/vserver/network.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vserver/network.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vserver/network.h linux-4.4.161-vs2.3.9.8/include/linux/vserver/network.h +--- linux-4.4.161/include/linux/vserver/network.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -10892,9 +10892,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/vserver/network.h linux-4.4.11 +#endif + +#endif /* _VSERVER_NETWORK_H */ -diff -NurpP --minimal linux-4.4.116/include/linux/vserver/network_cmd.h linux-4.4.116-vs2.3.9.7/include/linux/vserver/network_cmd.h ---- linux-4.4.116/include/linux/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vserver/network_cmd.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vserver/network_cmd.h linux-4.4.161-vs2.3.9.8/include/linux/vserver/network_cmd.h +--- linux-4.4.161/include/linux/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -10933,9 +10933,9 @@ diff -NurpP --minimal linux-4.4.116/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.116/include/linux/vserver/percpu.h linux-4.4.116-vs2.3.9.7/include/linux/vserver/percpu.h ---- linux-4.4.116/include/linux/vserver/percpu.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vserver/percpu.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vserver/percpu.h linux-4.4.161-vs2.3.9.8/include/linux/vserver/percpu.h +--- linux-4.4.161/include/linux/vserver/percpu.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -10951,9 +10951,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/vserver/percpu.h linux-4.4.116 +#define PERCPU_PERCTX (sizeof(struct _vx_percpu)) + +#endif /* _VSERVER_PERCPU_H */ -diff -NurpP --minimal linux-4.4.116/include/linux/vserver/pid.h linux-4.4.116-vs2.3.9.7/include/linux/vserver/pid.h ---- linux-4.4.116/include/linux/vserver/pid.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vserver/pid.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vserver/pid.h linux-4.4.161-vs2.3.9.8/include/linux/vserver/pid.h +--- linux-4.4.161/include/linux/vserver/pid.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -11006,9 +11006,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/vserver/pid.h linux-4.4.116-vs +} + +#endif -diff -NurpP --minimal linux-4.4.116/include/linux/vserver/sched.h linux-4.4.116-vs2.3.9.7/include/linux/vserver/sched.h ---- linux-4.4.116/include/linux/vserver/sched.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vserver/sched.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vserver/sched.h linux-4.4.161-vs2.3.9.8/include/linux/vserver/sched.h +--- linux-4.4.161/include/linux/vserver/sched.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -11033,9 +11033,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/vserver/sched.h linux-4.4.116- +#else /* _VSERVER_SCHED_H */ +#warning duplicate inclusion +#endif /* _VSERVER_SCHED_H */ -diff -NurpP --minimal linux-4.4.116/include/linux/vserver/sched_cmd.h linux-4.4.116-vs2.3.9.7/include/linux/vserver/sched_cmd.h ---- linux-4.4.116/include/linux/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vserver/sched_cmd.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vserver/sched_cmd.h linux-4.4.161-vs2.3.9.8/include/linux/vserver/sched_cmd.h +--- linux-4.4.161/include/linux/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -11048,9 +11048,9 @@ diff -NurpP --minimal linux-4.4.116/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.116/include/linux/vserver/sched_def.h linux-4.4.116-vs2.3.9.7/include/linux/vserver/sched_def.h ---- linux-4.4.116/include/linux/vserver/sched_def.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vserver/sched_def.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vserver/sched_def.h linux-4.4.161-vs2.3.9.8/include/linux/vserver/sched_def.h +--- linux-4.4.161/include/linux/vserver/sched_def.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -11090,9 +11090,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/vserver/sched_def.h linux-4.4. +#endif + +#endif /* _VSERVER_SCHED_DEF_H */ -diff -NurpP --minimal linux-4.4.116/include/linux/vserver/signal.h linux-4.4.116-vs2.3.9.7/include/linux/vserver/signal.h ---- linux-4.4.116/include/linux/vserver/signal.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vserver/signal.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vserver/signal.h linux-4.4.161-vs2.3.9.8/include/linux/vserver/signal.h +--- linux-4.4.161/include/linux/vserver/signal.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -11108,9 +11108,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/vserver/signal.h linux-4.4.116 +#else /* _VSERVER_SIGNAL_H */ +#warning duplicate inclusion +#endif /* _VSERVER_SIGNAL_H */ -diff -NurpP --minimal linux-4.4.116/include/linux/vserver/signal_cmd.h linux-4.4.116-vs2.3.9.7/include/linux/vserver/signal_cmd.h ---- linux-4.4.116/include/linux/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vserver/signal_cmd.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vserver/signal_cmd.h linux-4.4.161-vs2.3.9.8/include/linux/vserver/signal_cmd.h +--- linux-4.4.161/include/linux/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -11126,9 +11126,9 @@ diff -NurpP --minimal linux-4.4.116/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.116/include/linux/vserver/space.h linux-4.4.116-vs2.3.9.7/include/linux/vserver/space.h ---- linux-4.4.116/include/linux/vserver/space.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vserver/space.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vserver/space.h linux-4.4.161-vs2.3.9.8/include/linux/vserver/space.h +--- linux-4.4.161/include/linux/vserver/space.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -11142,9 +11142,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/vserver/space.h linux-4.4.116- +#else /* _VSERVER_SPACE_H */ +#warning duplicate inclusion +#endif /* _VSERVER_SPACE_H */ -diff -NurpP --minimal linux-4.4.116/include/linux/vserver/space_cmd.h linux-4.4.116-vs2.3.9.7/include/linux/vserver/space_cmd.h ---- linux-4.4.116/include/linux/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vserver/space_cmd.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vserver/space_cmd.h linux-4.4.161-vs2.3.9.8/include/linux/vserver/space_cmd.h +--- linux-4.4.161/include/linux/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -11159,9 +11159,9 @@ diff -NurpP --minimal linux-4.4.116/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.116/include/linux/vserver/switch.h linux-4.4.116-vs2.3.9.7/include/linux/vserver/switch.h ---- linux-4.4.116/include/linux/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vserver/switch.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vserver/switch.h linux-4.4.161-vs2.3.9.8/include/linux/vserver/switch.h +--- linux-4.4.161/include/linux/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -11171,9 +11171,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/vserver/switch.h linux-4.4.116 +#include + +#endif /* _VSERVER_SWITCH_H */ -diff -NurpP --minimal linux-4.4.116/include/linux/vserver/tag.h linux-4.4.116-vs2.3.9.7/include/linux/vserver/tag.h ---- linux-4.4.116/include/linux/vserver/tag.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vserver/tag.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vserver/tag.h linux-4.4.161-vs2.3.9.8/include/linux/vserver/tag.h +--- linux-4.4.161/include/linux/vserver/tag.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -11335,9 +11335,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/vserver/tag.h linux-4.4.116-vs +#endif + +#endif /* _DX_TAG_H */ -diff -NurpP --minimal linux-4.4.116/include/linux/vserver/tag_cmd.h linux-4.4.116-vs2.3.9.7/include/linux/vserver/tag_cmd.h ---- linux-4.4.116/include/linux/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/linux/vserver/tag_cmd.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/linux/vserver/tag_cmd.h linux-4.4.161-vs2.3.9.8/include/linux/vserver/tag_cmd.h +--- linux-4.4.161/include/linux/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -11349,9 +11349,9 @@ diff -NurpP --minimal linux-4.4.116/include/linux/vserver/tag_cmd.h linux-4.4.11 +extern int vc_tag_migrate(uint32_t); + +#endif /* _VSERVER_TAG_CMD_H */ -diff -NurpP --minimal linux-4.4.116/include/net/addrconf.h linux-4.4.116-vs2.3.9.7/include/net/addrconf.h ---- linux-4.4.116/include/net/addrconf.h 2018-02-22 21:19:58.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/net/addrconf.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/net/addrconf.h linux-4.4.161-vs2.3.9.8/include/net/addrconf.h +--- linux-4.4.161/include/net/addrconf.h 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/include/net/addrconf.h 2018-10-20 04:57:21.000000000 +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, @@ -11361,9 +11361,9 @@ diff -NurpP --minimal linux-4.4.116/include/net/addrconf.h linux-4.4.116-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.116/include/net/af_unix.h linux-4.4.116-vs2.3.9.7/include/net/af_unix.h ---- linux-4.4.116/include/net/af_unix.h 2018-02-22 21:19:58.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/net/af_unix.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/net/af_unix.h linux-4.4.161-vs2.3.9.8/include/net/af_unix.h +--- linux-4.4.161/include/net/af_unix.h 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/include/net/af_unix.h 2018-10-20 04:57:21.000000000 +0000 @@ -4,6 +4,7 @@ #include #include @@ -11372,10 +11372,10 @@ diff -NurpP --minimal linux-4.4.116/include/net/af_unix.h linux-4.4.116-vs2.3.9. #include void unix_inflight(struct user_struct *user, struct file *fp); -diff -NurpP --minimal linux-4.4.116/include/net/inet_timewait_sock.h linux-4.4.116-vs2.3.9.7/include/net/inet_timewait_sock.h ---- linux-4.4.116/include/net/inet_timewait_sock.h 2016-07-05 04:15:11.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/net/inet_timewait_sock.h 2018-01-09 16:40:17.000000000 +0000 -@@ -71,6 +71,10 @@ struct inet_timewait_sock { +diff -NurpP --minimal linux-4.4.161/include/net/inet_timewait_sock.h linux-4.4.161-vs2.3.9.8/include/net/inet_timewait_sock.h +--- linux-4.4.161/include/net/inet_timewait_sock.h 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 #define tw_dr __tw_common.skc_tw_dr @@ -11386,9 +11386,9 @@ diff -NurpP --minimal linux-4.4.116/include/net/inet_timewait_sock.h linux-4.4.1 int tw_timeout; volatile unsigned char tw_substate; -diff -NurpP --minimal linux-4.4.116/include/net/ip6_route.h linux-4.4.116-vs2.3.9.7/include/net/ip6_route.h ---- linux-4.4.116/include/net/ip6_route.h 2018-02-22 21:19:58.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/net/ip6_route.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/net/ip6_route.h linux-4.4.161-vs2.3.9.8/include/net/ip6_route.h +--- linux-4.4.161/include/net/ip6_route.h 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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, @@ -11398,10 +11398,10 @@ diff -NurpP --minimal linux-4.4.116/include/net/ip6_route.h linux-4.4.116-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.116/include/net/route.h linux-4.4.116-vs2.3.9.7/include/net/route.h ---- linux-4.4.116/include/net/route.h 2016-07-05 04:15:11.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/net/route.h 2018-01-09 16:39:47.000000000 +0000 -@@ -223,6 +223,9 @@ static inline void ip_rt_put(struct rtab +diff -NurpP --minimal linux-4.4.161/include/net/route.h linux-4.4.161-vs2.3.9.8/include/net/route.h +--- linux-4.4.161/include/net/route.h 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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); } @@ -11411,7 +11411,7 @@ diff -NurpP --minimal linux-4.4.116/include/net/route.h linux-4.4.116-vs2.3.9.7/ #define IPTOS_RT_MASK (IPTOS_TOS_MASK & ~3) extern const __u8 ip_tos2prio[16]; -@@ -270,6 +273,9 @@ static inline void ip_route_connect_init +@@ -271,6 +274,9 @@ static inline void ip_route_connect_init protocol, flow_flags, dst, src, dport, sport); } @@ -11421,7 +11421,7 @@ diff -NurpP --minimal linux-4.4.116/include/net/route.h linux-4.4.116-vs2.3.9.7/ static inline struct rtable *ip_route_connect(struct flowi4 *fl4, __be32 dst, __be32 src, u32 tos, int oif, u8 protocol, -@@ -278,6 +284,7 @@ static inline struct rtable *ip_route_co +@@ -279,6 +285,7 @@ static inline struct rtable *ip_route_co { struct net *net = sock_net(sk); struct rtable *rt; @@ -11429,7 +11429,7 @@ diff -NurpP --minimal linux-4.4.116/include/net/route.h linux-4.4.116-vs2.3.9.7/ ip_route_connect_init(fl4, dst, src, tos, oif, protocol, sport, dport, sk); -@@ -291,7 +298,21 @@ static inline struct rtable *ip_route_co +@@ -292,7 +299,21 @@ static inline struct rtable *ip_route_co src = fl4->saddr; } @@ -11452,9 +11452,9 @@ diff -NurpP --minimal linux-4.4.116/include/net/route.h linux-4.4.116-vs2.3.9.7/ rt = __ip_route_output_key(net, fl4); if (IS_ERR(rt)) return rt; -diff -NurpP --minimal linux-4.4.116/include/net/sock.h linux-4.4.116-vs2.3.9.7/include/net/sock.h ---- linux-4.4.116/include/net/sock.h 2018-02-22 21:19:58.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/net/sock.h 2018-01-09 16:41:40.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/net/sock.h linux-4.4.161-vs2.3.9.8/include/net/sock.h +--- linux-4.4.161/include/net/sock.h 2018-10-20 02:34:30.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/include/net/sock.h 2018-10-20 05:50:20.000000000 +0000 @@ -201,6 +201,10 @@ struct sock_common { struct in6_addr skc_v6_daddr; struct in6_addr skc_v6_rcv_saddr; @@ -11480,17 +11480,17 @@ diff -NurpP --minimal linux-4.4.116/include/net/sock.h linux-4.4.116-vs2.3.9.7/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.116/include/uapi/Kbuild linux-4.4.116-vs2.3.9.7/include/uapi/Kbuild ---- linux-4.4.116/include/uapi/Kbuild 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/uapi/Kbuild 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/uapi/Kbuild linux-4.4.161-vs2.3.9.8/include/uapi/Kbuild +--- linux-4.4.161/include/uapi/Kbuild 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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.116/include/uapi/linux/capability.h linux-4.4.116-vs2.3.9.7/include/uapi/linux/capability.h ---- linux-4.4.116/include/uapi/linux/capability.h 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/uapi/linux/capability.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/uapi/linux/capability.h linux-4.4.161-vs2.3.9.8/include/uapi/linux/capability.h +--- linux-4.4.161/include/uapi/linux/capability.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 */ @@ -11513,9 +11513,9 @@ diff -NurpP --minimal linux-4.4.116/include/uapi/linux/capability.h linux-4.4.11 /* * Bit location of each capability (used by user-space library and kernel) -diff -NurpP --minimal linux-4.4.116/include/uapi/linux/fs.h linux-4.4.116-vs2.3.9.7/include/uapi/linux/fs.h ---- linux-4.4.116/include/uapi/linux/fs.h 2016-07-05 04:15:11.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/uapi/linux/fs.h 2018-01-09 16:47:48.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/uapi/linux/fs.h linux-4.4.161-vs2.3.9.8/include/uapi/linux/fs.h +--- linux-4.4.161/include/uapi/linux/fs.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 */ @@ -11536,18 +11536,17 @@ diff -NurpP --minimal linux-4.4.116/include/uapi/linux/fs.h linux-4.4.116-vs2.3. -#define FS_FL_USER_VISIBLE 0x0003DFFF /* User visible flags */ -#define FS_FL_USER_MODIFIABLE 0x000380FF /* User modifiable flags */ -- +#define FS_BARRIER_FL 0x04000000 /* Barrier for chroot() */ +#define FS_COW_FL 0x20000000 /* Copy on Write marker */ -+ + +#define FS_FL_USER_VISIBLE 0x0103DFFF /* User visible flags */ +#define FS_FL_USER_MODIFIABLE 0x010380FF /* User modifiable flags */ #define SYNC_FILE_RANGE_WAIT_BEFORE 1 #define SYNC_FILE_RANGE_WRITE 2 -diff -NurpP --minimal linux-4.4.116/include/uapi/linux/gfs2_ondisk.h linux-4.4.116-vs2.3.9.7/include/uapi/linux/gfs2_ondisk.h ---- linux-4.4.116/include/uapi/linux/gfs2_ondisk.h 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/uapi/linux/gfs2_ondisk.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/uapi/linux/gfs2_ondisk.h linux-4.4.161-vs2.3.9.8/include/uapi/linux/gfs2_ondisk.h +--- linux-4.4.161/include/uapi/linux/gfs2_ondisk.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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, @@ -11568,9 +11567,9 @@ diff -NurpP --minimal linux-4.4.116/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.116/include/uapi/linux/if_tun.h linux-4.4.116-vs2.3.9.7/include/uapi/linux/if_tun.h ---- linux-4.4.116/include/uapi/linux/if_tun.h 2015-10-29 09:21:42.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/uapi/linux/if_tun.h 2018-01-09 16:46:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/uapi/linux/if_tun.h linux-4.4.161-vs2.3.9.8/include/uapi/linux/if_tun.h +--- linux-4.4.161/include/uapi/linux/if_tun.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/include/uapi/linux/if_tun.h 2018-10-20 04:57:21.000000000 +0000 @@ -56,6 +56,7 @@ */ #define TUNSETVNETBE _IOW('T', 222, int) @@ -11579,9 +11578,9 @@ diff -NurpP --minimal linux-4.4.116/include/uapi/linux/if_tun.h linux-4.4.116-vs /* TUNSETIFF ifr flags */ #define IFF_TUN 0x0001 -diff -NurpP --minimal linux-4.4.116/include/uapi/linux/major.h linux-4.4.116-vs2.3.9.7/include/uapi/linux/major.h ---- linux-4.4.116/include/uapi/linux/major.h 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/uapi/linux/major.h 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/uapi/linux/major.h linux-4.4.161-vs2.3.9.8/include/uapi/linux/major.h +--- linux-4.4.161/include/uapi/linux/major.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -11590,9 +11589,9 @@ diff -NurpP --minimal linux-4.4.116/include/uapi/linux/major.h linux-4.4.116-vs2 #define TTYAUX_MAJOR 5 #define LP_MAJOR 6 #define VCS_MAJOR 7 -diff -NurpP --minimal linux-4.4.116/include/uapi/linux/nfs_mount.h linux-4.4.116-vs2.3.9.7/include/uapi/linux/nfs_mount.h ---- linux-4.4.116/include/uapi/linux/nfs_mount.h 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/uapi/linux/nfs_mount.h 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/uapi/linux/nfs_mount.h linux-4.4.161-vs2.3.9.8/include/uapi/linux/nfs_mount.h +--- linux-4.4.161/include/uapi/linux/nfs_mount.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 */ @@ -11603,9 +11602,9 @@ diff -NurpP --minimal linux-4.4.116/include/uapi/linux/nfs_mount.h linux-4.4.116 /* The following are for internal use only */ #define NFS_MOUNT_LOOKUP_CACHE_NONEG 0x10000 -diff -NurpP --minimal linux-4.4.116/include/uapi/linux/reboot.h linux-4.4.116-vs2.3.9.7/include/uapi/linux/reboot.h ---- linux-4.4.116/include/uapi/linux/reboot.h 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/uapi/linux/reboot.h 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/uapi/linux/reboot.h linux-4.4.161-vs2.3.9.8/include/uapi/linux/reboot.h +--- linux-4.4.161/include/uapi/linux/reboot.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -11615,9 +11614,9 @@ diff -NurpP --minimal linux-4.4.116/include/uapi/linux/reboot.h linux-4.4.116-vs #endif /* _UAPI_LINUX_REBOOT_H */ -diff -NurpP --minimal linux-4.4.116/include/uapi/linux/sysctl.h linux-4.4.116-vs2.3.9.7/include/uapi/linux/sysctl.h ---- linux-4.4.116/include/uapi/linux/sysctl.h 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/uapi/linux/sysctl.h 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/uapi/linux/sysctl.h linux-4.4.161-vs2.3.9.8/include/uapi/linux/sysctl.h +--- linux-4.4.161/include/uapi/linux/sysctl.h 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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) */ @@ -11634,9 +11633,9 @@ diff -NurpP --minimal linux-4.4.116/include/uapi/linux/sysctl.h linux-4.4.116-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.116/include/uapi/vserver/Kbuild linux-4.4.116-vs2.3.9.7/include/uapi/vserver/Kbuild ---- linux-4.4.116/include/uapi/vserver/Kbuild 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/uapi/vserver/Kbuild 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/uapi/vserver/Kbuild linux-4.4.161-vs2.3.9.8/include/uapi/vserver/Kbuild +--- linux-4.4.161/include/uapi/vserver/Kbuild 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 \ @@ -11647,9 +11646,9 @@ diff -NurpP --minimal linux-4.4.116/include/uapi/vserver/Kbuild linux-4.4.116-vs +header-y += switch.h context.h network.h monitor.h \ + limit.h inode.h device.h + -diff -NurpP --minimal linux-4.4.116/include/uapi/vserver/cacct_cmd.h linux-4.4.116-vs2.3.9.7/include/uapi/vserver/cacct_cmd.h ---- linux-4.4.116/include/uapi/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/uapi/vserver/cacct_cmd.h 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/uapi/vserver/cacct_cmd.h linux-4.4.161-vs2.3.9.8/include/uapi/vserver/cacct_cmd.h +--- linux-4.4.161/include/uapi/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -11666,9 +11665,9 @@ diff -NurpP --minimal linux-4.4.116/include/uapi/vserver/cacct_cmd.h linux-4.4.1 +}; + +#endif /* _UAPI_VS_CACCT_CMD_H */ -diff -NurpP --minimal linux-4.4.116/include/uapi/vserver/context.h linux-4.4.116-vs2.3.9.7/include/uapi/vserver/context.h ---- linux-4.4.116/include/uapi/vserver/context.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/uapi/vserver/context.h 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/uapi/vserver/context.h linux-4.4.161-vs2.3.9.8/include/uapi/vserver/context.h +--- linux-4.4.161/include/uapi/vserver/context.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -11751,9 +11750,9 @@ diff -NurpP --minimal linux-4.4.116/include/uapi/vserver/context.h linux-4.4.116 +#define VXC_NAMESPACE 0x02000000 + +#endif /* _UAPI_VS_CONTEXT_H */ -diff -NurpP --minimal linux-4.4.116/include/uapi/vserver/context_cmd.h linux-4.4.116-vs2.3.9.7/include/uapi/vserver/context_cmd.h ---- linux-4.4.116/include/uapi/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/uapi/vserver/context_cmd.h 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/uapi/vserver/context_cmd.h linux-4.4.161-vs2.3.9.8/include/uapi/vserver/context_cmd.h +--- linux-4.4.161/include/uapi/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -11870,9 +11869,9 @@ diff -NurpP --minimal linux-4.4.116/include/uapi/vserver/context_cmd.h linux-4.4 +}; + +#endif /* _UAPI_VS_CONTEXT_CMD_H */ -diff -NurpP --minimal linux-4.4.116/include/uapi/vserver/cvirt_cmd.h linux-4.4.116-vs2.3.9.7/include/uapi/vserver/cvirt_cmd.h ---- linux-4.4.116/include/uapi/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/uapi/vserver/cvirt_cmd.h 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/uapi/vserver/cvirt_cmd.h linux-4.4.161-vs2.3.9.8/include/uapi/vserver/cvirt_cmd.h +--- linux-4.4.161/include/uapi/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -11915,9 +11914,9 @@ diff -NurpP --minimal linux-4.4.116/include/uapi/vserver/cvirt_cmd.h linux-4.4.1 +}; + +#endif /* _UAPI_VS_CVIRT_CMD_H */ -diff -NurpP --minimal linux-4.4.116/include/uapi/vserver/debug_cmd.h linux-4.4.116-vs2.3.9.7/include/uapi/vserver/debug_cmd.h ---- linux-4.4.116/include/uapi/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/uapi/vserver/debug_cmd.h 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/uapi/vserver/debug_cmd.h linux-4.4.161-vs2.3.9.8/include/uapi/vserver/debug_cmd.h +--- linux-4.4.161/include/uapi/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -11943,9 +11942,9 @@ diff -NurpP --minimal linux-4.4.116/include/uapi/vserver/debug_cmd.h linux-4.4.1 +}; + +#endif /* _UAPI_VS_DEBUG_CMD_H */ -diff -NurpP --minimal linux-4.4.116/include/uapi/vserver/device.h linux-4.4.116-vs2.3.9.7/include/uapi/vserver/device.h ---- linux-4.4.116/include/uapi/vserver/device.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/uapi/vserver/device.h 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/uapi/vserver/device.h linux-4.4.161-vs2.3.9.8/include/uapi/vserver/device.h +--- linux-4.4.161/include/uapi/vserver/device.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -11959,9 +11958,9 @@ diff -NurpP --minimal linux-4.4.116/include/uapi/vserver/device.h linux-4.4.116- +#define DATTR_MASK 0x00000013 + +#endif /* _UAPI_VS_DEVICE_H */ -diff -NurpP --minimal linux-4.4.116/include/uapi/vserver/device_cmd.h linux-4.4.116-vs2.3.9.7/include/uapi/vserver/device_cmd.h ---- linux-4.4.116/include/uapi/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/uapi/vserver/device_cmd.h 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/uapi/vserver/device_cmd.h linux-4.4.161-vs2.3.9.8/include/uapi/vserver/device_cmd.h +--- linux-4.4.161/include/uapi/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -11979,9 +11978,9 @@ diff -NurpP --minimal linux-4.4.116/include/uapi/vserver/device_cmd.h linux-4.4. +}; + +#endif /* _UAPI_VS_DEVICE_CMD_H */ -diff -NurpP --minimal linux-4.4.116/include/uapi/vserver/dlimit_cmd.h linux-4.4.116-vs2.3.9.7/include/uapi/vserver/dlimit_cmd.h ---- linux-4.4.116/include/uapi/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/uapi/vserver/dlimit_cmd.h 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/uapi/vserver/dlimit_cmd.h linux-4.4.161-vs2.3.9.8/include/uapi/vserver/dlimit_cmd.h +--- linux-4.4.161/include/uapi/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -12050,9 +12049,9 @@ diff -NurpP --minimal linux-4.4.116/include/uapi/vserver/dlimit_cmd.h linux-4.4. +} + +#endif /* _UAPI_VS_DLIMIT_CMD_H */ -diff -NurpP --minimal linux-4.4.116/include/uapi/vserver/inode.h linux-4.4.116-vs2.3.9.7/include/uapi/vserver/inode.h ---- linux-4.4.116/include/uapi/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/uapi/vserver/inode.h 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/uapi/vserver/inode.h linux-4.4.161-vs2.3.9.8/include/uapi/vserver/inode.h +--- linux-4.4.161/include/uapi/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -12077,9 +12076,9 @@ diff -NurpP --minimal linux-4.4.116/include/uapi/vserver/inode.h linux-4.4.116-v +#define FIOC_SETXFLG _IOW('x', 6, long) + +#endif /* _UAPI_VS_INODE_H */ -diff -NurpP --minimal linux-4.4.116/include/uapi/vserver/inode_cmd.h linux-4.4.116-vs2.3.9.7/include/uapi/vserver/inode_cmd.h ---- linux-4.4.116/include/uapi/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/uapi/vserver/inode_cmd.h 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/uapi/vserver/inode_cmd.h linux-4.4.161-vs2.3.9.8/include/uapi/vserver/inode_cmd.h +--- linux-4.4.161/include/uapi/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -12107,9 +12106,9 @@ diff -NurpP --minimal linux-4.4.116/include/uapi/vserver/inode_cmd.h linux-4.4.1 +}; + +#endif /* _UAPI_VS_INODE_CMD_H */ -diff -NurpP --minimal linux-4.4.116/include/uapi/vserver/limit.h linux-4.4.116-vs2.3.9.7/include/uapi/vserver/limit.h ---- linux-4.4.116/include/uapi/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/uapi/vserver/limit.h 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/uapi/vserver/limit.h linux-4.4.161-vs2.3.9.8/include/uapi/vserver/limit.h +--- linux-4.4.161/include/uapi/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -12125,9 +12124,9 @@ diff -NurpP --minimal linux-4.4.116/include/uapi/vserver/limit.h linux-4.4.116-v +#define VLIMIT_MAPPED 23 + +#endif /* _UAPI_VS_LIMIT_H */ -diff -NurpP --minimal linux-4.4.116/include/uapi/vserver/limit_cmd.h linux-4.4.116-vs2.3.9.7/include/uapi/vserver/limit_cmd.h ---- linux-4.4.116/include/uapi/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/uapi/vserver/limit_cmd.h 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/uapi/vserver/limit_cmd.h linux-4.4.161-vs2.3.9.8/include/uapi/vserver/limit_cmd.h +--- linux-4.4.161/include/uapi/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -12169,9 +12168,9 @@ diff -NurpP --minimal linux-4.4.116/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.116/include/uapi/vserver/monitor.h linux-4.4.116-vs2.3.9.7/include/uapi/vserver/monitor.h ---- linux-4.4.116/include/uapi/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/uapi/vserver/monitor.h 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/uapi/vserver/monitor.h linux-4.4.161-vs2.3.9.8/include/uapi/vserver/monitor.h +--- linux-4.4.161/include/uapi/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -12269,9 +12268,9 @@ diff -NurpP --minimal linux-4.4.116/include/uapi/vserver/monitor.h linux-4.4.116 +}; + +#endif /* _UAPI_VS_MONITOR_H */ -diff -NurpP --minimal linux-4.4.116/include/uapi/vserver/network.h linux-4.4.116-vs2.3.9.7/include/uapi/vserver/network.h ---- linux-4.4.116/include/uapi/vserver/network.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/uapi/vserver/network.h 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/uapi/vserver/network.h linux-4.4.161-vs2.3.9.8/include/uapi/vserver/network.h +--- linux-4.4.161/include/uapi/vserver/network.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -12349,9 +12348,9 @@ diff -NurpP --minimal linux-4.4.116/include/uapi/vserver/network.h linux-4.4.116 +#define NXA_MASK_SHOW (NXA_MASK_ALL | NXA_LOOPBACK) + +#endif /* _UAPI_VS_NETWORK_H */ -diff -NurpP --minimal linux-4.4.116/include/uapi/vserver/network_cmd.h linux-4.4.116-vs2.3.9.7/include/uapi/vserver/network_cmd.h ---- linux-4.4.116/include/uapi/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/uapi/vserver/network_cmd.h 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/uapi/vserver/network_cmd.h linux-4.4.161-vs2.3.9.8/include/uapi/vserver/network_cmd.h +--- linux-4.4.161/include/uapi/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -12476,9 +12475,9 @@ diff -NurpP --minimal linux-4.4.116/include/uapi/vserver/network_cmd.h linux-4.4 +}; + +#endif /* _UAPI_VS_NETWORK_CMD_H */ -diff -NurpP --minimal linux-4.4.116/include/uapi/vserver/sched_cmd.h linux-4.4.116-vs2.3.9.7/include/uapi/vserver/sched_cmd.h ---- linux-4.4.116/include/uapi/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/uapi/vserver/sched_cmd.h 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/uapi/vserver/sched_cmd.h linux-4.4.161-vs2.3.9.8/include/uapi/vserver/sched_cmd.h +--- linux-4.4.161/include/uapi/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -12493,9 +12492,9 @@ diff -NurpP --minimal linux-4.4.116/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.116/include/uapi/vserver/signal_cmd.h linux-4.4.116-vs2.3.9.7/include/uapi/vserver/signal_cmd.h ---- linux-4.4.116/include/uapi/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/uapi/vserver/signal_cmd.h 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/uapi/vserver/signal_cmd.h linux-4.4.161-vs2.3.9.8/include/uapi/vserver/signal_cmd.h +--- linux-4.4.161/include/uapi/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -12528,9 +12527,9 @@ diff -NurpP --minimal linux-4.4.116/include/uapi/vserver/signal_cmd.h linux-4.4. +}; + +#endif /* _UAPI_VS_SIGNAL_CMD_H */ -diff -NurpP --minimal linux-4.4.116/include/uapi/vserver/space_cmd.h linux-4.4.116-vs2.3.9.7/include/uapi/vserver/space_cmd.h ---- linux-4.4.116/include/uapi/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/uapi/vserver/space_cmd.h 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/uapi/vserver/space_cmd.h linux-4.4.161-vs2.3.9.8/include/uapi/vserver/space_cmd.h +--- linux-4.4.161/include/uapi/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -12560,9 +12559,9 @@ diff -NurpP --minimal linux-4.4.116/include/uapi/vserver/space_cmd.h linux-4.4.1 +}; + +#endif /* _UAPI_VS_SPACE_CMD_H */ -diff -NurpP --minimal linux-4.4.116/include/uapi/vserver/switch.h linux-4.4.116-vs2.3.9.7/include/uapi/vserver/switch.h ---- linux-4.4.116/include/uapi/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/uapi/vserver/switch.h 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/uapi/vserver/switch.h linux-4.4.161-vs2.3.9.8/include/uapi/vserver/switch.h +--- linux-4.4.161/include/uapi/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -12654,9 +12653,9 @@ diff -NurpP --minimal linux-4.4.116/include/uapi/vserver/switch.h linux-4.4.116- +#define VCMD_get_vci VC_CMD(VERSION, 1, 0) + +#endif /* _UAPI_VS_SWITCH_H */ -diff -NurpP --minimal linux-4.4.116/include/uapi/vserver/tag_cmd.h linux-4.4.116-vs2.3.9.7/include/uapi/vserver/tag_cmd.h ---- linux-4.4.116/include/uapi/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/include/uapi/vserver/tag_cmd.h 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/include/uapi/vserver/tag_cmd.h linux-4.4.161-vs2.3.9.8/include/uapi/vserver/tag_cmd.h +--- linux-4.4.161/include/uapi/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -12672,9 +12671,9 @@ diff -NurpP --minimal linux-4.4.116/include/uapi/vserver/tag_cmd.h linux-4.4.116 +#define VCMD_tag_migrate VC_CMD(TAGMIG, 1, 0) + +#endif /* _UAPI_VS_TAG_CMD_H */ -diff -NurpP --minimal linux-4.4.116/init/Kconfig linux-4.4.116-vs2.3.9.7/init/Kconfig ---- linux-4.4.116/init/Kconfig 2018-02-22 21:19:59.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/init/Kconfig 2018-02-10 15:16:50.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/init/Kconfig linux-4.4.161-vs2.3.9.8/init/Kconfig +--- linux-4.4.161/init/Kconfig 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/init/Kconfig 2018-10-20 04:57:21.000000000 +0000 @@ -927,6 +927,7 @@ config NUMA_BALANCING_DEFAULT_ENABLED menuconfig CGROUPS bool "Control Group support" @@ -12683,9 +12682,9 @@ diff -NurpP --minimal linux-4.4.116/init/Kconfig linux-4.4.116-vs2.3.9.7/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.116/init/main.c linux-4.4.116-vs2.3.9.7/init/main.c ---- linux-4.4.116/init/main.c 2018-02-22 21:19:59.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/init/main.c 2018-01-09 16:58:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/init/main.c linux-4.4.161-vs2.3.9.8/init/main.c +--- linux-4.4.161/init/main.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/init/main.c 2018-10-20 04:57:21.000000000 +0000 @@ -82,6 +82,7 @@ #include #include @@ -12694,9 +12693,9 @@ diff -NurpP --minimal linux-4.4.116/init/main.c linux-4.4.116-vs2.3.9.7/init/mai #include #include -diff -NurpP --minimal linux-4.4.116/ipc/mqueue.c linux-4.4.116-vs2.3.9.7/ipc/mqueue.c ---- linux-4.4.116/ipc/mqueue.c 2018-02-22 21:19:59.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/ipc/mqueue.c 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/ipc/mqueue.c linux-4.4.161-vs2.3.9.8/ipc/mqueue.c +--- linux-4.4.161/ipc/mqueue.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/ipc/mqueue.c 2018-10-20 04:57:21.000000000 +0000 @@ -35,6 +35,8 @@ #include #include @@ -12772,9 +12771,9 @@ diff -NurpP --minimal linux-4.4.116/ipc/mqueue.c linux-4.4.116-vs2.3.9.7/ipc/mqu free_uid(user); } if (ipc_ns) -diff -NurpP --minimal linux-4.4.116/ipc/msg.c linux-4.4.116-vs2.3.9.7/ipc/msg.c ---- linux-4.4.116/ipc/msg.c 2018-02-22 21:19:59.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/ipc/msg.c 2018-02-10 15:16:50.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/ipc/msg.c linux-4.4.161-vs2.3.9.8/ipc/msg.c +--- linux-4.4.161/ipc/msg.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/ipc/msg.c 2018-10-20 04:57:21.000000000 +0000 @@ -37,6 +37,7 @@ #include #include @@ -12791,9 +12790,9 @@ diff -NurpP --minimal linux-4.4.116/ipc/msg.c linux-4.4.116-vs2.3.9.7/ipc/msg.c msq->q_perm.security = NULL; retval = security_msg_queue_alloc(msq); -diff -NurpP --minimal linux-4.4.116/ipc/sem.c linux-4.4.116-vs2.3.9.7/ipc/sem.c ---- linux-4.4.116/ipc/sem.c 2018-02-22 21:19:59.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/ipc/sem.c 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/ipc/sem.c linux-4.4.161-vs2.3.9.8/ipc/sem.c +--- linux-4.4.161/ipc/sem.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/ipc/sem.c 2018-10-20 04:57:21.000000000 +0000 @@ -85,6 +85,8 @@ #include #include @@ -12831,9 +12830,9 @@ diff -NurpP --minimal linux-4.4.116/ipc/sem.c linux-4.4.116-vs2.3.9.7/ipc/sem.c ipc_rcu_putref(sma, sem_rcu_free); } -diff -NurpP --minimal linux-4.4.116/ipc/shm.c linux-4.4.116-vs2.3.9.7/ipc/shm.c ---- linux-4.4.116/ipc/shm.c 2018-02-22 21:19:59.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/ipc/shm.c 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/ipc/shm.c linux-4.4.161-vs2.3.9.8/ipc/shm.c +--- linux-4.4.161/ipc/shm.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/ipc/shm.c 2018-10-20 04:57:21.000000000 +0000 @@ -42,6 +42,8 @@ #include #include @@ -12843,7 +12842,7 @@ diff -NurpP --minimal linux-4.4.116/ipc/shm.c linux-4.4.116-vs2.3.9.7/ipc/shm.c #include -@@ -228,10 +230,14 @@ static void shm_open(struct vm_area_stru +@@ -234,10 +236,14 @@ static void shm_open(struct vm_area_stru static void shm_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp) { struct file *shm_file; @@ -12859,7 +12858,7 @@ diff -NurpP --minimal linux-4.4.116/ipc/shm.c linux-4.4.116-vs2.3.9.7/ipc/shm.c shm_rmid(ns, shp); shm_unlock(shp); if (!is_file_hugepages(shm_file)) -@@ -240,6 +246,7 @@ static void shm_destroy(struct ipc_names +@@ -246,6 +252,7 @@ static void shm_destroy(struct ipc_names user_shm_unlock(i_size_read(file_inode(shm_file)), shp->mlock_user); fput(shm_file); @@ -12867,7 +12866,7 @@ diff -NurpP --minimal linux-4.4.116/ipc/shm.c linux-4.4.116-vs2.3.9.7/ipc/shm.c ipc_rcu_putref(shp, shm_rcu_free); } -@@ -537,11 +544,15 @@ static int newseg(struct ipc_namespace * +@@ -545,11 +552,15 @@ static int newseg(struct ipc_namespace * ns->shm_tot + numpages > ns->shm_ctlall) return -ENOSPC; @@ -12883,7 +12882,7 @@ diff -NurpP --minimal linux-4.4.116/ipc/shm.c linux-4.4.116-vs2.3.9.7/ipc/shm.c shp->shm_perm.mode = (shmflg & S_IRWXUGO); shp->mlock_user = NULL; -@@ -612,6 +623,7 @@ static int newseg(struct ipc_namespace * +@@ -620,6 +631,7 @@ static int newseg(struct ipc_namespace * ipc_unlock_object(&shp->shm_perm); rcu_read_unlock(); @@ -12891,9 +12890,9 @@ diff -NurpP --minimal linux-4.4.116/ipc/shm.c linux-4.4.116-vs2.3.9.7/ipc/shm.c return error; no_id: -diff -NurpP --minimal linux-4.4.116/kernel/Makefile linux-4.4.116-vs2.3.9.7/kernel/Makefile ---- linux-4.4.116/kernel/Makefile 2016-07-05 04:12:38.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/Makefile 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/Makefile linux-4.4.161-vs2.3.9.8/kernel/Makefile +--- linux-4.4.161/kernel/Makefile 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/Makefile 2018-10-20 04:57:21.000000000 +0000 @@ -29,6 +29,7 @@ obj-y += printk/ obj-y += irq/ obj-y += rcu/ @@ -12902,10 +12901,10 @@ diff -NurpP --minimal linux-4.4.116/kernel/Makefile linux-4.4.116-vs2.3.9.7/kern obj-$(CONFIG_CHECKPOINT_RESTORE) += kcmp.o obj-$(CONFIG_FREEZER) += freezer.o -diff -NurpP --minimal linux-4.4.116/kernel/auditsc.c linux-4.4.116-vs2.3.9.7/kernel/auditsc.c ---- linux-4.4.116/kernel/auditsc.c 2018-02-22 21:19:59.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/auditsc.c 2018-01-09 16:36:33.000000000 +0000 -@@ -1962,7 +1962,7 @@ static int audit_set_loginuid_perm(kuid_ +diff -NurpP --minimal linux-4.4.161/kernel/auditsc.c linux-4.4.161-vs2.3.9.8/kernel/auditsc.c +--- linux-4.4.161/kernel/auditsc.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/auditsc.c 2018-10-20 05:50:20.000000000 +0000 +@@ -1964,7 +1964,7 @@ static int audit_set_loginuid_perm(kuid_ if (is_audit_feature_set(AUDIT_FEATURE_LOGINUID_IMMUTABLE)) return -EPERM; /* it is set, you need permission */ @@ -12914,9 +12913,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/auditsc.c linux-4.4.116-vs2.3.9.7/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.116/kernel/capability.c linux-4.4.116-vs2.3.9.7/kernel/capability.c ---- linux-4.4.116/kernel/capability.c 2018-02-22 21:19:59.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/capability.c 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/capability.c linux-4.4.161-vs2.3.9.8/kernel/capability.c +--- linux-4.4.161/kernel/capability.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/capability.c 2018-10-20 04:57:21.000000000 +0000 @@ -17,6 +17,7 @@ #include #include @@ -12942,9 +12941,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/capability.c linux-4.4.116-vs2.3.9.7/ /** * has_capability_noaudit - Does a task have a capability (unaudited) in the * initial user ns -diff -NurpP --minimal linux-4.4.116/kernel/compat.c linux-4.4.116-vs2.3.9.7/kernel/compat.c ---- linux-4.4.116/kernel/compat.c 2015-07-06 20:41:43.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/compat.c 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/compat.c linux-4.4.161-vs2.3.9.8/kernel/compat.c +--- linux-4.4.161/kernel/compat.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/compat.c 2018-10-20 04:57:21.000000000 +0000 @@ -27,6 +27,7 @@ #include #include @@ -12962,9 +12961,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/compat.c linux-4.4.116-vs2.3.9.7/kern return 0; } -diff -NurpP --minimal linux-4.4.116/kernel/cred.c linux-4.4.116-vs2.3.9.7/kernel/cred.c ---- linux-4.4.116/kernel/cred.c 2018-02-22 21:19:59.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/cred.c 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/cred.c linux-4.4.161-vs2.3.9.8/kernel/cred.c +--- linux-4.4.161/kernel/cred.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/cred.c 2018-10-20 04:57:21.000000000 +0000 @@ -64,31 +64,6 @@ struct cred init_cred = { .group_info = &init_groups, }; @@ -13034,9 +13033,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/cred.c linux-4.4.116-vs2.3.9.7/kernel EXPORT_SYMBOL(prepare_creds); /* -diff -NurpP --minimal linux-4.4.116/kernel/exit.c linux-4.4.116-vs2.3.9.7/kernel/exit.c ---- linux-4.4.116/kernel/exit.c 2018-02-22 21:20:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/exit.c 2018-02-06 17:16:09.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/exit.c linux-4.4.161-vs2.3.9.8/kernel/exit.c +--- linux-4.4.161/kernel/exit.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/exit.c 2018-10-20 04:57:21.000000000 +0000 @@ -48,6 +48,10 @@ #include #include @@ -13148,9 +13147,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/exit.c linux-4.4.116-vs2.3.9.7/kernel BUG(); /* Avoid "noreturn function does return". */ for (;;) -diff -NurpP --minimal linux-4.4.116/kernel/fork.c linux-4.4.116-vs2.3.9.7/kernel/fork.c ---- linux-4.4.116/kernel/fork.c 2018-02-22 21:20:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/fork.c 2018-01-09 17:00:00.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/fork.c linux-4.4.161-vs2.3.9.8/kernel/fork.c +--- linux-4.4.161/kernel/fork.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/fork.c 2018-10-20 05:50:20.000000000 +0000 @@ -76,6 +76,9 @@ #include #include @@ -13170,7 +13169,7 @@ diff -NurpP --minimal linux-4.4.116/kernel/fork.c linux-4.4.116-vs2.3.9.7/kernel ftrace_graph_exit_task(tsk); put_seccomp_filter(tsk); arch_release_task_struct(tsk); -@@ -1282,6 +1287,8 @@ static struct task_struct *copy_process( +@@ -1284,6 +1289,8 @@ static struct task_struct *copy_process( { int retval; struct task_struct *p; @@ -13179,7 +13178,7 @@ diff -NurpP --minimal linux-4.4.116/kernel/fork.c linux-4.4.116-vs2.3.9.7/kernel void *cgrp_ss_priv[CGROUP_CANFORK_COUNT] = {}; if ((clone_flags & (CLONE_NEWNS|CLONE_FS)) == (CLONE_NEWNS|CLONE_FS)) -@@ -1343,7 +1350,12 @@ static struct task_struct *copy_process( +@@ -1357,7 +1364,12 @@ static struct task_struct *copy_process( DEBUG_LOCKS_WARN_ON(!p->hardirqs_enabled); DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled); #endif @@ -13192,7 +13191,7 @@ diff -NurpP --minimal linux-4.4.116/kernel/fork.c linux-4.4.116-vs2.3.9.7/kernel if (atomic_read(&p->real_cred->user->processes) >= task_rlimit(p, RLIMIT_NPROC)) { if (p->real_cred->user != INIT_USER && -@@ -1640,6 +1652,18 @@ static struct task_struct *copy_process( +@@ -1649,6 +1661,18 @@ static struct task_struct *copy_process( total_forks++; spin_unlock(¤t->sighand->siglock); syscall_tracepoint_update(p); @@ -13211,9 +13210,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/fork.c linux-4.4.116-vs2.3.9.7/kernel write_unlock_irq(&tasklist_lock); proc_fork_connector(p); -diff -NurpP --minimal linux-4.4.116/kernel/kthread.c linux-4.4.116-vs2.3.9.7/kernel/kthread.c ---- linux-4.4.116/kernel/kthread.c 2018-02-22 21:20:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/kthread.c 2018-01-09 17:01:06.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/kthread.c linux-4.4.161-vs2.3.9.8/kernel/kthread.c +--- linux-4.4.161/kernel/kthread.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/kthread.c 2018-10-20 05:50:20.000000000 +0000 @@ -19,6 +19,7 @@ #include #include @@ -13222,9 +13221,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/kthread.c linux-4.4.116-vs2.3.9.7/ker #include static DEFINE_SPINLOCK(kthread_create_lock); -diff -NurpP --minimal linux-4.4.116/kernel/nsproxy.c linux-4.4.116-vs2.3.9.7/kernel/nsproxy.c ---- linux-4.4.116/kernel/nsproxy.c 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/nsproxy.c 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/nsproxy.c linux-4.4.161-vs2.3.9.8/kernel/nsproxy.c +--- linux-4.4.161/kernel/nsproxy.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/nsproxy.c 2018-10-20 04:57:21.000000000 +0000 @@ -20,11 +20,14 @@ #include #include @@ -13409,9 +13408,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/nsproxy.c linux-4.4.116-vs2.3.9.7/ker return -EPERM; *new_nsp = create_new_namespaces(unshare_flags, current, user_ns, -diff -NurpP --minimal linux-4.4.116/kernel/pid.c linux-4.4.116-vs2.3.9.7/kernel/pid.c ---- linux-4.4.116/kernel/pid.c 2018-02-22 21:20:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/pid.c 2018-01-09 21:54:23.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/pid.c linux-4.4.161-vs2.3.9.8/kernel/pid.c +--- linux-4.4.161/kernel/pid.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/pid.c 2018-10-20 04:57:21.000000000 +0000 @@ -38,6 +38,7 @@ #include #include @@ -13420,7 +13419,7 @@ diff -NurpP --minimal linux-4.4.116/kernel/pid.c linux-4.4.116-vs2.3.9.7/kernel/ #define pid_hashfn(nr, ns) \ hash_long((unsigned long)nr + (unsigned long)ns, pidhash_shift) -@@ -379,7 +380,7 @@ EXPORT_SYMBOL_GPL(find_pid_ns); +@@ -381,7 +382,7 @@ EXPORT_SYMBOL_GPL(find_pid_ns); struct pid *find_vpid(int nr) { @@ -13429,7 +13428,7 @@ diff -NurpP --minimal linux-4.4.116/kernel/pid.c linux-4.4.116-vs2.3.9.7/kernel/ } EXPORT_SYMBOL_GPL(find_vpid); -@@ -435,6 +436,9 @@ void transfer_pid(struct task_struct *ol +@@ -437,6 +438,9 @@ void transfer_pid(struct task_struct *ol struct task_struct *pid_task(struct pid *pid, enum pid_type type) { struct task_struct *result = NULL; @@ -13439,7 +13438,7 @@ diff -NurpP --minimal linux-4.4.116/kernel/pid.c linux-4.4.116-vs2.3.9.7/kernel/ if (pid) { struct hlist_node *first; first = rcu_dereference_check(hlist_first_rcu(&pid->tasks[type]), -@@ -453,7 +457,7 @@ struct task_struct *find_task_by_pid_ns( +@@ -455,7 +459,7 @@ struct task_struct *find_task_by_pid_ns( { RCU_LOCKDEP_WARN(!rcu_read_lock_held(), "find_task_by_pid_ns() needs rcu_read_lock() protection"); @@ -13448,7 +13447,7 @@ diff -NurpP --minimal linux-4.4.116/kernel/pid.c linux-4.4.116-vs2.3.9.7/kernel/ } struct task_struct *find_task_by_vpid(pid_t vnr) -@@ -497,7 +501,7 @@ struct pid *find_get_pid(pid_t nr) +@@ -499,7 +503,7 @@ struct pid *find_get_pid(pid_t nr) } EXPORT_SYMBOL_GPL(find_get_pid); @@ -13457,7 +13456,7 @@ diff -NurpP --minimal linux-4.4.116/kernel/pid.c linux-4.4.116-vs2.3.9.7/kernel/ { struct upid *upid; pid_t nr = 0; -@@ -511,6 +515,11 @@ pid_t pid_nr_ns(struct pid *pid, struct +@@ -513,6 +517,11 @@ pid_t pid_nr_ns(struct pid *pid, struct } EXPORT_SYMBOL_GPL(pid_nr_ns); @@ -13469,9 +13468,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/pid.c linux-4.4.116-vs2.3.9.7/kernel/ pid_t pid_vnr(struct pid *pid) { return pid_nr_ns(pid, task_active_pid_ns(current)); -diff -NurpP --minimal linux-4.4.116/kernel/pid_namespace.c linux-4.4.116-vs2.3.9.7/kernel/pid_namespace.c ---- linux-4.4.116/kernel/pid_namespace.c 2018-02-22 21:20:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/pid_namespace.c 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/pid_namespace.c linux-4.4.161-vs2.3.9.8/kernel/pid_namespace.c +--- linux-4.4.161/kernel/pid_namespace.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/pid_namespace.c 2018-10-20 04:57:21.000000000 +0000 @@ -18,6 +18,7 @@ #include #include @@ -13496,9 +13495,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/pid_namespace.c linux-4.4.116-vs2.3.9 kmem_cache_free(pid_ns_cachep, ns); out: return ERR_PTR(err); -diff -NurpP --minimal linux-4.4.116/kernel/printk/printk.c linux-4.4.116-vs2.3.9.7/kernel/printk/printk.c ---- linux-4.4.116/kernel/printk/printk.c 2018-02-22 21:20:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/printk/printk.c 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/printk/printk.c linux-4.4.161-vs2.3.9.8/kernel/printk/printk.c +--- linux-4.4.161/kernel/printk/printk.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/printk/printk.c 2018-10-20 04:57:21.000000000 +0000 @@ -46,6 +46,7 @@ #include #include @@ -13566,9 +13565,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/printk/printk.c linux-4.4.116-vs2.3.9 error = syslog_print_all(buf, len, clear); break; /* Clear ring buffer */ -diff -NurpP --minimal linux-4.4.116/kernel/ptrace.c linux-4.4.116-vs2.3.9.7/kernel/ptrace.c ---- linux-4.4.116/kernel/ptrace.c 2018-02-22 21:20:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/ptrace.c 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/ptrace.c linux-4.4.161-vs2.3.9.8/kernel/ptrace.c +--- linux-4.4.161/kernel/ptrace.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/ptrace.c 2018-10-20 04:57:21.000000000 +0000 @@ -23,6 +23,7 @@ #include #include @@ -13589,9 +13588,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/ptrace.c linux-4.4.116-vs2.3.9.7/kern return security_ptrace_access_check(task, mode); } -diff -NurpP --minimal linux-4.4.116/kernel/reboot.c linux-4.4.116-vs2.3.9.7/kernel/reboot.c ---- linux-4.4.116/kernel/reboot.c 2016-07-05 04:12:39.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/reboot.c 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/reboot.c linux-4.4.161-vs2.3.9.8/kernel/reboot.c +--- linux-4.4.161/kernel/reboot.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/reboot.c 2018-10-20 04:57:21.000000000 +0000 @@ -16,6 +16,7 @@ #include #include @@ -13619,9 +13618,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/reboot.c linux-4.4.116-vs2.3.9.7/kern mutex_lock(&reboot_mutex); switch (cmd) { case LINUX_REBOOT_CMD_RESTART: -diff -NurpP --minimal linux-4.4.116/kernel/sched/core.c linux-4.4.116-vs2.3.9.7/kernel/sched/core.c ---- linux-4.4.116/kernel/sched/core.c 2018-02-22 21:20:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/sched/core.c 2018-02-22 21:30:19.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/sched/core.c linux-4.4.161-vs2.3.9.8/kernel/sched/core.c +--- linux-4.4.161/kernel/sched/core.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/sched/core.c 2018-10-20 04:57:21.000000000 +0000 @@ -74,6 +74,8 @@ #include #include @@ -13631,7 +13630,7 @@ diff -NurpP --minimal linux-4.4.116/kernel/sched/core.c linux-4.4.116-vs2.3.9.7/ #include #include -@@ -3559,7 +3561,7 @@ SYSCALL_DEFINE1(nice, int, increment) +@@ -3560,7 +3562,7 @@ SYSCALL_DEFINE1(nice, int, increment) nice = clamp_val(nice, MIN_NICE, MAX_NICE); if (increment < 0 && !can_nice(current, nice)) @@ -13640,9 +13639,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/sched/core.c linux-4.4.116-vs2.3.9.7/ retval = security_task_setnice(current, nice); if (retval) -diff -NurpP --minimal linux-4.4.116/kernel/sched/cputime.c linux-4.4.116-vs2.3.9.7/kernel/sched/cputime.c ---- linux-4.4.116/kernel/sched/cputime.c 2018-02-22 21:20:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/sched/cputime.c 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/sched/cputime.c linux-4.4.161-vs2.3.9.8/kernel/sched/cputime.c +--- linux-4.4.161/kernel/sched/cputime.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/sched/cputime.c 2018-10-20 04:57:21.000000000 +0000 @@ -4,6 +4,7 @@ #include #include @@ -13683,9 +13682,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/sched/cputime.c linux-4.4.116-vs2.3.9 account_group_system_time(p, cputime); /* Add system time to cpustat. */ -diff -NurpP --minimal linux-4.4.116/kernel/sched/fair.c linux-4.4.116-vs2.3.9.7/kernel/sched/fair.c ---- linux-4.4.116/kernel/sched/fair.c 2018-02-22 21:20:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/sched/fair.c 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/sched/fair.c linux-4.4.161-vs2.3.9.8/kernel/sched/fair.c +--- linux-4.4.161/kernel/sched/fair.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/sched/fair.c 2018-10-20 04:57:21.000000000 +0000 @@ -30,6 +30,7 @@ #include #include @@ -13694,7 +13693,7 @@ diff -NurpP --minimal linux-4.4.116/kernel/sched/fair.c linux-4.4.116-vs2.3.9.7/ #include -@@ -3055,6 +3056,8 @@ enqueue_entity(struct cfs_rq *cfs_rq, st +@@ -3056,6 +3057,8 @@ enqueue_entity(struct cfs_rq *cfs_rq, st __enqueue_entity(cfs_rq, se); se->on_rq = 1; @@ -13703,7 +13702,7 @@ diff -NurpP --minimal linux-4.4.116/kernel/sched/fair.c linux-4.4.116-vs2.3.9.7/ if (cfs_rq->nr_running == 1) { list_add_leaf_cfs_rq(cfs_rq); check_enqueue_throttle(cfs_rq); -@@ -3136,6 +3139,8 @@ dequeue_entity(struct cfs_rq *cfs_rq, st +@@ -3137,6 +3140,8 @@ dequeue_entity(struct cfs_rq *cfs_rq, st if (se != cfs_rq->curr) __dequeue_entity(cfs_rq, se); se->on_rq = 0; @@ -13712,9 +13711,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/sched/fair.c linux-4.4.116-vs2.3.9.7/ account_entity_dequeue(cfs_rq, se); /* -diff -NurpP --minimal linux-4.4.116/kernel/sched/loadavg.c linux-4.4.116-vs2.3.9.7/kernel/sched/loadavg.c ---- linux-4.4.116/kernel/sched/loadavg.c 2018-02-22 21:20:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/sched/loadavg.c 2018-01-24 23:01:30.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/sched/loadavg.c linux-4.4.161-vs2.3.9.8/kernel/sched/loadavg.c +--- linux-4.4.161/kernel/sched/loadavg.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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) @@ -13735,9 +13734,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/sched/loadavg.c linux-4.4.116-vs2.3.9 } long calc_load_fold_active(struct rq *this_rq) -diff -NurpP --minimal linux-4.4.116/kernel/signal.c linux-4.4.116-vs2.3.9.7/kernel/signal.c ---- linux-4.4.116/kernel/signal.c 2018-02-22 21:20:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/signal.c 2018-01-11 08:03:00.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/signal.c linux-4.4.161-vs2.3.9.8/kernel/signal.c +--- linux-4.4.161/kernel/signal.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/signal.c 2018-10-20 04:57:21.000000000 +0000 @@ -34,6 +34,8 @@ #include #include @@ -13813,7 +13812,7 @@ diff -NurpP --minimal linux-4.4.116/kernel/signal.c linux-4.4.116-vs2.3.9.7/kern ret = -ESRCH; goto out_unlock; } -@@ -1401,8 +1432,10 @@ static int kill_something_info(int sig, +@@ -1405,8 +1436,10 @@ static int kill_something_info(int sig, struct task_struct * p; for_each_process(p) { @@ -13826,7 +13825,7 @@ diff -NurpP --minimal linux-4.4.116/kernel/signal.c linux-4.4.116-vs2.3.9.7/kern int err = group_send_sig_info(sig, info, p); ++count; if (err != -EPERM) -@@ -2255,6 +2288,11 @@ relock: +@@ -2259,6 +2292,11 @@ relock: !sig_kernel_only(signr)) continue; @@ -13838,9 +13837,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/signal.c linux-4.4.116-vs2.3.9.7/kern if (sig_kernel_stop(signr)) { /* * The default action is to stop all threads in -diff -NurpP --minimal linux-4.4.116/kernel/softirq.c linux-4.4.116-vs2.3.9.7/kernel/softirq.c ---- linux-4.4.116/kernel/softirq.c 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/softirq.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/softirq.c linux-4.4.161-vs2.3.9.8/kernel/softirq.c +--- linux-4.4.161/kernel/softirq.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/softirq.c 2018-10-20 04:57:21.000000000 +0000 @@ -26,6 +26,7 @@ #include #include @@ -13849,18 +13848,18 @@ diff -NurpP --minimal linux-4.4.116/kernel/softirq.c linux-4.4.116-vs2.3.9.7/ker #define CREATE_TRACE_POINTS #include -diff -NurpP --minimal linux-4.4.116/kernel/sys.c linux-4.4.116-vs2.3.9.7/kernel/sys.c ---- linux-4.4.116/kernel/sys.c 2018-02-22 21:20:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/sys.c 2018-01-09 17:00:36.000000000 +0000 -@@ -54,6 +54,7 @@ - #include +diff -NurpP --minimal linux-4.4.161/kernel/sys.c linux-4.4.161-vs2.3.9.8/kernel/sys.c +--- linux-4.4.161/kernel/sys.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/sys.c 2018-10-20 05:50:20.000000000 +0000 +@@ -56,6 +56,7 @@ + #include #include +#include /* Move somewhere else to avoid recompiling? */ #include -@@ -157,7 +158,10 @@ static int set_one_prio(struct task_stru +@@ -159,7 +160,10 @@ static int set_one_prio(struct task_stru goto out; } if (niceval < task_nice(p) && !can_nice(p, niceval)) { @@ -13872,7 +13871,7 @@ diff -NurpP --minimal linux-4.4.116/kernel/sys.c linux-4.4.116-vs2.3.9.7/kernel/ goto out; } no_nice = security_task_setnice(p, niceval); -@@ -208,6 +212,8 @@ SYSCALL_DEFINE3(setpriority, int, which, +@@ -210,6 +214,8 @@ SYSCALL_DEFINE3(setpriority, int, which, else pgrp = task_pgrp(current); do_each_pid_thread(pgrp, PIDTYPE_PGID, p) { @@ -13881,7 +13880,7 @@ diff -NurpP --minimal linux-4.4.116/kernel/sys.c linux-4.4.116-vs2.3.9.7/kernel/ error = set_one_prio(p, niceval, error); } while_each_pid_thread(pgrp, PIDTYPE_PGID, p); break; -@@ -274,6 +280,8 @@ SYSCALL_DEFINE2(getpriority, int, which, +@@ -276,6 +282,8 @@ SYSCALL_DEFINE2(getpriority, int, which, else pgrp = task_pgrp(current); do_each_pid_thread(pgrp, PIDTYPE_PGID, p) { @@ -13890,7 +13889,7 @@ diff -NurpP --minimal linux-4.4.116/kernel/sys.c linux-4.4.116-vs2.3.9.7/kernel/ niceval = nice_to_rlimit(task_nice(p)); if (niceval > retval) retval = niceval; -@@ -290,6 +298,8 @@ SYSCALL_DEFINE2(getpriority, int, which, +@@ -292,6 +300,8 @@ SYSCALL_DEFINE2(getpriority, int, which, goto out_unlock; /* No processes for this user */ } do_each_thread(g, p) { @@ -13899,7 +13898,7 @@ diff -NurpP --minimal linux-4.4.116/kernel/sys.c linux-4.4.116-vs2.3.9.7/kernel/ if (uid_eq(task_uid(p), uid) && task_pid_vnr(p)) { niceval = nice_to_rlimit(task_nice(p)); if (niceval > retval) -@@ -1217,7 +1227,8 @@ SYSCALL_DEFINE2(sethostname, char __user +@@ -1211,7 +1221,8 @@ SYSCALL_DEFINE2(sethostname, char __user int errno; char tmp[__NEW_UTS_LEN]; @@ -13909,7 +13908,7 @@ diff -NurpP --minimal linux-4.4.116/kernel/sys.c linux-4.4.116-vs2.3.9.7/kernel/ return -EPERM; if (len < 0 || len > __NEW_UTS_LEN) -@@ -1268,7 +1279,8 @@ SYSCALL_DEFINE2(setdomainname, char __us +@@ -1264,7 +1275,8 @@ SYSCALL_DEFINE2(setdomainname, char __us int errno; char tmp[__NEW_UTS_LEN]; @@ -13919,7 +13918,7 @@ diff -NurpP --minimal linux-4.4.116/kernel/sys.c linux-4.4.116-vs2.3.9.7/kernel/ return -EPERM; if (len < 0 || len > __NEW_UTS_LEN) return -EINVAL; -@@ -1386,7 +1398,7 @@ int do_prlimit(struct task_struct *tsk, +@@ -1384,7 +1396,7 @@ int do_prlimit(struct task_struct *tsk, /* Keep the capable check against init_user_ns until cgroups can contain all limits */ if (new_rlim->rlim_max > rlim->rlim_max && @@ -13928,7 +13927,7 @@ diff -NurpP --minimal linux-4.4.116/kernel/sys.c linux-4.4.116-vs2.3.9.7/kernel/ retval = -EPERM; if (!retval) retval = security_task_setrlimit(tsk->group_leader, -@@ -1439,7 +1451,8 @@ static int check_prlimit_permission(stru +@@ -1437,7 +1449,8 @@ static int check_prlimit_permission(stru gid_eq(cred->gid, tcred->sgid) && gid_eq(cred->gid, tcred->gid)) return 0; @@ -13938,9 +13937,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/sys.c linux-4.4.116-vs2.3.9.7/kernel/ return 0; return -EPERM; -diff -NurpP --minimal linux-4.4.116/kernel/sysctl.c linux-4.4.116-vs2.3.9.7/kernel/sysctl.c ---- linux-4.4.116/kernel/sysctl.c 2018-02-22 21:20:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/sysctl.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/sysctl.c linux-4.4.161-vs2.3.9.8/kernel/sysctl.c +--- linux-4.4.161/kernel/sysctl.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/sysctl.c 2018-10-20 05:50:20.000000000 +0000 @@ -87,6 +87,7 @@ #if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_LOCK_STAT) #include @@ -13963,7 +13962,7 @@ diff -NurpP --minimal linux-4.4.116/kernel/sysctl.c linux-4.4.116-vs2.3.9.7/kern .procname = "sched_child_runs_first", .data = &sysctl_sched_child_runs_first, .maxlen = sizeof(unsigned int), -@@ -1385,7 +1393,6 @@ static struct ctl_table vm_table[] = { +@@ -1386,7 +1394,6 @@ static struct ctl_table vm_table[] = { .extra1 = &zero, .extra2 = &one, }, @@ -13971,9 +13970,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/sysctl.c linux-4.4.116-vs2.3.9.7/kern #endif /* CONFIG_COMPACTION */ { .procname = "min_free_kbytes", -diff -NurpP --minimal linux-4.4.116/kernel/sysctl_binary.c linux-4.4.116-vs2.3.9.7/kernel/sysctl_binary.c ---- linux-4.4.116/kernel/sysctl_binary.c 2018-02-22 21:20:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/sysctl_binary.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/sysctl_binary.c linux-4.4.161-vs2.3.9.8/kernel/sysctl_binary.c +--- linux-4.4.161/kernel/sysctl_binary.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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" }, @@ -13982,9 +13981,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/sysctl_binary.c linux-4.4.116-vs2.3.9 { CTL_STR, KERN_SPARC_REBOOT, "reboot-cmd" }, { CTL_INT, KERN_CTLALTDEL, "ctrl-alt-del" }, -diff -NurpP --minimal linux-4.4.116/kernel/time/posix-timers.c linux-4.4.116-vs2.3.9.7/kernel/time/posix-timers.c ---- linux-4.4.116/kernel/time/posix-timers.c 2018-02-22 21:20:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/time/posix-timers.c 2018-02-22 21:30:19.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/time/posix-timers.c linux-4.4.161-vs2.3.9.8/kernel/time/posix-timers.c +--- linux-4.4.161/kernel/time/posix-timers.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/time/posix-timers.c 2018-10-20 04:57:21.000000000 +0000 @@ -48,6 +48,7 @@ #include #include @@ -14020,10 +14019,10 @@ diff -NurpP --minimal linux-4.4.116/kernel/time/posix-timers.c linux-4.4.116-vs2 /* If we failed to send the signal the timer stops. */ return ret > 0; } -diff -NurpP --minimal linux-4.4.116/kernel/time/time.c linux-4.4.116-vs2.3.9.7/kernel/time/time.c ---- linux-4.4.116/kernel/time/time.c 2016-07-05 04:12:39.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/time/time.c 2018-01-09 16:36:34.000000000 +0000 -@@ -37,6 +37,7 @@ +diff -NurpP --minimal linux-4.4.161/kernel/time/time.c linux-4.4.161-vs2.3.9.8/kernel/time/time.c +--- linux-4.4.161/kernel/time/time.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/time/time.c 2018-10-20 04:57:21.000000000 +0000 +@@ -38,6 +38,7 @@ #include #include #include @@ -14031,7 +14030,7 @@ diff -NurpP --minimal linux-4.4.116/kernel/time/time.c linux-4.4.116-vs2.3.9.7/k #include #include -@@ -93,7 +94,7 @@ SYSCALL_DEFINE1(stime, time_t __user *, +@@ -94,7 +95,7 @@ SYSCALL_DEFINE1(stime, time_t __user *, if (err) return err; @@ -14040,7 +14039,7 @@ diff -NurpP --minimal linux-4.4.116/kernel/time/time.c linux-4.4.116-vs2.3.9.7/k return 0; } -@@ -186,7 +187,7 @@ int do_sys_settimeofday(const struct tim +@@ -187,7 +188,7 @@ int do_sys_settimeofday(const struct tim } } if (tv) @@ -14049,9 +14048,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/time/time.c linux-4.4.116-vs2.3.9.7/k return 0; } -diff -NurpP --minimal linux-4.4.116/kernel/time/timekeeping.c linux-4.4.116-vs2.3.9.7/kernel/time/timekeeping.c ---- linux-4.4.116/kernel/time/timekeeping.c 2018-02-22 21:20:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/time/timekeeping.c 2018-01-09 17:02:47.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/time/timekeeping.c linux-4.4.161-vs2.3.9.8/kernel/time/timekeeping.c +--- linux-4.4.161/kernel/time/timekeeping.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/time/timekeeping.c 2018-10-20 04:57:21.000000000 +0000 @@ -23,6 +23,7 @@ #include #include @@ -14060,7 +14059,7 @@ diff -NurpP --minimal linux-4.4.116/kernel/time/timekeeping.c linux-4.4.116-vs2. #include "tick-internal.h" #include "ntp_internal.h" -@@ -921,7 +922,9 @@ void ktime_get_raw_and_real_ts64(struct +@@ -920,7 +921,9 @@ void ktime_get_raw_and_real_ts64(struct } while (read_seqcount_retry(&tk_core.seq, seq)); timespec64_add_ns(ts_raw, nsecs_raw); @@ -14070,9 +14069,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/time/timekeeping.c linux-4.4.116-vs2. } EXPORT_SYMBOL(ktime_get_raw_and_real_ts64); -diff -NurpP --minimal linux-4.4.116/kernel/time/timer.c linux-4.4.116-vs2.3.9.7/kernel/time/timer.c ---- linux-4.4.116/kernel/time/timer.c 2018-02-22 21:20:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/time/timer.c 2018-02-10 15:16:50.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/time/timer.c linux-4.4.161-vs2.3.9.8/kernel/time/timer.c +--- linux-4.4.161/kernel/time/timer.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/time/timer.c 2018-10-20 04:57:21.000000000 +0000 @@ -42,6 +42,10 @@ #include #include @@ -14084,9 +14083,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/time/timer.c linux-4.4.116-vs2.3.9.7/ #include #include -diff -NurpP --minimal linux-4.4.116/kernel/user_namespace.c linux-4.4.116-vs2.3.9.7/kernel/user_namespace.c ---- linux-4.4.116/kernel/user_namespace.c 2016-07-05 04:12:39.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/user_namespace.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/user_namespace.c linux-4.4.161-vs2.3.9.8/kernel/user_namespace.c +--- linux-4.4.161/kernel/user_namespace.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/user_namespace.c 2018-10-20 05:50:20.000000000 +0000 @@ -22,6 +22,7 @@ #include #include @@ -14130,9 +14129,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/user_namespace.c linux-4.4.116-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.116/kernel/utsname.c linux-4.4.116-vs2.3.9.7/kernel/utsname.c ---- linux-4.4.116/kernel/utsname.c 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/utsname.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/utsname.c linux-4.4.161-vs2.3.9.8/kernel/utsname.c +--- linux-4.4.161/kernel/utsname.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/utsname.c 2018-10-20 04:57:21.000000000 +0000 @@ -16,14 +16,17 @@ #include #include @@ -14160,9 +14159,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/utsname.c linux-4.4.116-vs2.3.9.7/ker kfree(ns); } -diff -NurpP --minimal linux-4.4.116/kernel/vserver/Kconfig linux-4.4.116-vs2.3.9.7/kernel/vserver/Kconfig ---- linux-4.4.116/kernel/vserver/Kconfig 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/vserver/Kconfig 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/vserver/Kconfig linux-4.4.161-vs2.3.9.8/kernel/vserver/Kconfig +--- linux-4.4.161/kernel/vserver/Kconfig 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/vserver/Kconfig 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,230 @@ +# +# Linux VServer configuration @@ -14394,9 +14393,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/vserver/Kconfig linux-4.4.116-vs2.3.9 + bool + default n + -diff -NurpP --minimal linux-4.4.116/kernel/vserver/Makefile linux-4.4.116-vs2.3.9.7/kernel/vserver/Makefile ---- linux-4.4.116/kernel/vserver/Makefile 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/vserver/Makefile 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/vserver/Makefile linux-4.4.161-vs2.3.9.8/kernel/vserver/Makefile +--- linux-4.4.161/kernel/vserver/Makefile 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/vserver/Makefile 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,18 @@ +# +# Makefile for the Linux vserver routines. @@ -14416,9 +14415,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/vserver/Makefile linux-4.4.116-vs2.3. +vserver-$(CONFIG_VSERVER_MONITOR) += monitor.o +vserver-$(CONFIG_VSERVER_DEVICE) += device.o + -diff -NurpP --minimal linux-4.4.116/kernel/vserver/cacct.c linux-4.4.116-vs2.3.9.7/kernel/vserver/cacct.c ---- linux-4.4.116/kernel/vserver/cacct.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/vserver/cacct.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/vserver/cacct.c linux-4.4.161-vs2.3.9.8/kernel/vserver/cacct.c +--- linux-4.4.161/kernel/vserver/cacct.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/vserver/cacct.c 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,42 @@ +/* + * linux/kernel/vserver/cacct.c @@ -14462,9 +14461,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/vserver/cacct.c linux-4.4.116-vs2.3.9 + return 0; +} + -diff -NurpP --minimal linux-4.4.116/kernel/vserver/cacct_init.h linux-4.4.116-vs2.3.9.7/kernel/vserver/cacct_init.h ---- linux-4.4.116/kernel/vserver/cacct_init.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/vserver/cacct_init.h 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/vserver/cacct_init.h linux-4.4.161-vs2.3.9.8/kernel/vserver/cacct_init.h +--- linux-4.4.161/kernel/vserver/cacct_init.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/vserver/cacct_init.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,25 @@ + + @@ -14491,9 +14490,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/vserver/cacct_init.h linux-4.4.116-vs + return; +} + -diff -NurpP --minimal linux-4.4.116/kernel/vserver/cacct_proc.h linux-4.4.116-vs2.3.9.7/kernel/vserver/cacct_proc.h ---- linux-4.4.116/kernel/vserver/cacct_proc.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/vserver/cacct_proc.h 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/vserver/cacct_proc.h linux-4.4.161-vs2.3.9.8/kernel/vserver/cacct_proc.h +--- linux-4.4.161/kernel/vserver/cacct_proc.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -14548,9 +14547,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/vserver/cacct_proc.h linux-4.4.116-vs +} + +#endif /* _VX_CACCT_PROC_H */ -diff -NurpP --minimal linux-4.4.116/kernel/vserver/context.c linux-4.4.116-vs2.3.9.7/kernel/vserver/context.c ---- linux-4.4.116/kernel/vserver/context.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/vserver/context.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/vserver/context.c linux-4.4.161-vs2.3.9.8/kernel/vserver/context.c +--- linux-4.4.161/kernel/vserver/context.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/vserver/context.c 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,1119 @@ +/* + * linux/kernel/vserver/context.c @@ -15671,9 +15670,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/vserver/context.c linux-4.4.116-vs2.3 + +EXPORT_SYMBOL_GPL(free_vx_info); + -diff -NurpP --minimal linux-4.4.116/kernel/vserver/cvirt.c linux-4.4.116-vs2.3.9.7/kernel/vserver/cvirt.c ---- linux-4.4.116/kernel/vserver/cvirt.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/vserver/cvirt.c 2018-01-09 22:27:39.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/vserver/cvirt.c linux-4.4.161-vs2.3.9.8/kernel/vserver/cvirt.c +--- linux-4.4.161/kernel/vserver/cvirt.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/vserver/cvirt.c 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,313 @@ +/* + * linux/kernel/vserver/cvirt.c @@ -15988,9 +15987,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/vserver/cvirt.c linux-4.4.116-vs2.3.9 + +#endif + -diff -NurpP --minimal linux-4.4.116/kernel/vserver/cvirt_init.h linux-4.4.116-vs2.3.9.7/kernel/vserver/cvirt_init.h ---- linux-4.4.116/kernel/vserver/cvirt_init.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/vserver/cvirt_init.h 2018-01-09 22:16:00.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/vserver/cvirt_init.h linux-4.4.161-vs2.3.9.8/kernel/vserver/cvirt_init.h +--- linux-4.4.161/kernel/vserver/cvirt_init.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/vserver/cvirt_init.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,70 @@ + + @@ -16062,9 +16061,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/vserver/cvirt_init.h linux-4.4.116-vs + return; +} + -diff -NurpP --minimal linux-4.4.116/kernel/vserver/cvirt_proc.h linux-4.4.116-vs2.3.9.7/kernel/vserver/cvirt_proc.h ---- linux-4.4.116/kernel/vserver/cvirt_proc.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/vserver/cvirt_proc.h 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/vserver/cvirt_proc.h linux-4.4.161-vs2.3.9.8/kernel/vserver/cvirt_proc.h +--- linux-4.4.161/kernel/vserver/cvirt_proc.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -16189,9 +16188,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/vserver/cvirt_proc.h linux-4.4.116-vs +} + +#endif /* _VX_CVIRT_PROC_H */ -diff -NurpP --minimal linux-4.4.116/kernel/vserver/debug.c linux-4.4.116-vs2.3.9.7/kernel/vserver/debug.c ---- linux-4.4.116/kernel/vserver/debug.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/vserver/debug.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/vserver/debug.c linux-4.4.161-vs2.3.9.8/kernel/vserver/debug.c +--- linux-4.4.161/kernel/vserver/debug.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/vserver/debug.c 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,32 @@ +/* + * kernel/vserver/debug.c @@ -16225,9 +16224,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/vserver/debug.c linux-4.4.116-vs2.3.9 + +EXPORT_SYMBOL_GPL(dump_vx_info); + -diff -NurpP --minimal linux-4.4.116/kernel/vserver/device.c linux-4.4.116-vs2.3.9.7/kernel/vserver/device.c ---- linux-4.4.116/kernel/vserver/device.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/vserver/device.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/vserver/device.c linux-4.4.161-vs2.3.9.8/kernel/vserver/device.c +--- linux-4.4.161/kernel/vserver/device.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/vserver/device.c 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,443 @@ +/* + * linux/kernel/vserver/device.c @@ -16672,9 +16671,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/vserver/device.c linux-4.4.116-vs2.3. +#endif /* CONFIG_COMPAT */ + + -diff -NurpP --minimal linux-4.4.116/kernel/vserver/dlimit.c linux-4.4.116-vs2.3.9.7/kernel/vserver/dlimit.c ---- linux-4.4.116/kernel/vserver/dlimit.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/vserver/dlimit.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/vserver/dlimit.c linux-4.4.161-vs2.3.9.8/kernel/vserver/dlimit.c +--- linux-4.4.161/kernel/vserver/dlimit.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/vserver/dlimit.c 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,528 @@ +/* + * linux/kernel/vserver/dlimit.c @@ -17204,9 +17203,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/vserver/dlimit.c linux-4.4.116-vs2.3. +EXPORT_SYMBOL_GPL(locate_dl_info); +EXPORT_SYMBOL_GPL(rcu_free_dl_info); + -diff -NurpP --minimal linux-4.4.116/kernel/vserver/helper.c linux-4.4.116-vs2.3.9.7/kernel/vserver/helper.c ---- linux-4.4.116/kernel/vserver/helper.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/vserver/helper.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/vserver/helper.c linux-4.4.161-vs2.3.9.8/kernel/vserver/helper.c +--- linux-4.4.161/kernel/vserver/helper.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/vserver/helper.c 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,242 @@ +/* + * linux/kernel/vserver/helper.c @@ -17450,9 +17449,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/vserver/helper.c linux-4.4.116-vs2.3. + return do_vshelper(vshelper_path, argv, envp, 1); +} + -diff -NurpP --minimal linux-4.4.116/kernel/vserver/history.c linux-4.4.116-vs2.3.9.7/kernel/vserver/history.c ---- linux-4.4.116/kernel/vserver/history.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/vserver/history.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/vserver/history.c linux-4.4.161-vs2.3.9.8/kernel/vserver/history.c +--- linux-4.4.161/kernel/vserver/history.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/vserver/history.c 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,258 @@ +/* + * kernel/vserver/history.c @@ -17712,9 +17711,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/vserver/history.c linux-4.4.116-vs2.3 + +#endif /* CONFIG_COMPAT */ + -diff -NurpP --minimal linux-4.4.116/kernel/vserver/inet.c linux-4.4.116-vs2.3.9.7/kernel/vserver/inet.c ---- linux-4.4.116/kernel/vserver/inet.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/vserver/inet.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/vserver/inet.c linux-4.4.161-vs2.3.9.8/kernel/vserver/inet.c +--- linux-4.4.161/kernel/vserver/inet.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/vserver/inet.c 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,236 @@ + +#include @@ -17952,9 +17951,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/vserver/inet.c linux-4.4.116-vs2.3.9. + +EXPORT_SYMBOL_GPL(ip_v4_find_src); + -diff -NurpP --minimal linux-4.4.116/kernel/vserver/init.c linux-4.4.116-vs2.3.9.7/kernel/vserver/init.c ---- linux-4.4.116/kernel/vserver/init.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/vserver/init.c 2018-01-09 22:31:39.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/vserver/init.c linux-4.4.161-vs2.3.9.8/kernel/vserver/init.c +--- linux-4.4.161/kernel/vserver/init.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/vserver/init.c 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,46 @@ +/* + * linux/kernel/init.c @@ -18002,9 +18001,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/vserver/init.c linux-4.4.116-vs2.3.9. +module_init(init_vserver); +module_exit(exit_vserver); + -diff -NurpP --minimal linux-4.4.116/kernel/vserver/inode.c linux-4.4.116-vs2.3.9.7/kernel/vserver/inode.c ---- linux-4.4.116/kernel/vserver/inode.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/vserver/inode.c 2018-01-09 22:24:56.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/vserver/inode.c linux-4.4.161-vs2.3.9.8/kernel/vserver/inode.c +--- linux-4.4.161/kernel/vserver/inode.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/vserver/inode.c 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,440 @@ +/* + * linux/kernel/vserver/inode.c @@ -18446,9 +18445,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/vserver/inode.c linux-4.4.116-vs2.3.9 + +#endif /* CONFIG_PROPAGATE */ + -diff -NurpP --minimal linux-4.4.116/kernel/vserver/limit.c linux-4.4.116-vs2.3.9.7/kernel/vserver/limit.c ---- linux-4.4.116/kernel/vserver/limit.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/vserver/limit.c 2018-01-24 23:13:15.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/vserver/limit.c linux-4.4.161-vs2.3.9.8/kernel/vserver/limit.c +--- linux-4.4.161/kernel/vserver/limit.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/vserver/limit.c 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,386 @@ +/* + * linux/kernel/vserver/limit.c @@ -18836,9 +18835,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/vserver/limit.c linux-4.4.116-vs2.3.9 +} +#endif /* !CONFIG_MEMCG */ + -diff -NurpP --minimal linux-4.4.116/kernel/vserver/limit_init.h linux-4.4.116-vs2.3.9.7/kernel/vserver/limit_init.h ---- linux-4.4.116/kernel/vserver/limit_init.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/vserver/limit_init.h 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/vserver/limit_init.h linux-4.4.161-vs2.3.9.8/kernel/vserver/limit_init.h +--- linux-4.4.161/kernel/vserver/limit_init.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/vserver/limit_init.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,31 @@ + + @@ -18871,9 +18870,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/vserver/limit_init.h linux-4.4.116-vs + } +} + -diff -NurpP --minimal linux-4.4.116/kernel/vserver/limit_proc.h linux-4.4.116-vs2.3.9.7/kernel/vserver/limit_proc.h ---- linux-4.4.116/kernel/vserver/limit_proc.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/vserver/limit_proc.h 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/vserver/limit_proc.h linux-4.4.161-vs2.3.9.8/kernel/vserver/limit_proc.h +--- linux-4.4.161/kernel/vserver/limit_proc.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -18932,9 +18931,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/vserver/limit_proc.h linux-4.4.116-vs +#endif /* _VX_LIMIT_PROC_H */ + + -diff -NurpP --minimal linux-4.4.116/kernel/vserver/network.c linux-4.4.116-vs2.3.9.7/kernel/vserver/network.c ---- linux-4.4.116/kernel/vserver/network.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/vserver/network.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/vserver/network.c linux-4.4.161-vs2.3.9.8/kernel/vserver/network.c +--- linux-4.4.161/kernel/vserver/network.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/vserver/network.c 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,1053 @@ +/* + * linux/kernel/vserver/network.c @@ -19989,9 +19988,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/vserver/network.c linux-4.4.116-vs2.3 +EXPORT_SYMBOL_GPL(free_nx_info); +EXPORT_SYMBOL_GPL(unhash_nx_info); + -diff -NurpP --minimal linux-4.4.116/kernel/vserver/proc.c linux-4.4.116-vs2.3.9.7/kernel/vserver/proc.c ---- linux-4.4.116/kernel/vserver/proc.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/vserver/proc.c 2018-01-11 12:02:42.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/vserver/proc.c linux-4.4.161-vs2.3.9.8/kernel/vserver/proc.c +--- linux-4.4.161/kernel/vserver/proc.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/vserver/proc.c 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,1040 @@ +/* + * linux/kernel/vserver/proc.c @@ -21033,9 +21032,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/vserver/proc.c linux-4.4.116-vs2.3.9. + return 0; +} + -diff -NurpP --minimal linux-4.4.116/kernel/vserver/sched.c linux-4.4.116-vs2.3.9.7/kernel/vserver/sched.c ---- linux-4.4.116/kernel/vserver/sched.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/vserver/sched.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/vserver/sched.c linux-4.4.161-vs2.3.9.8/kernel/vserver/sched.c +--- linux-4.4.161/kernel/vserver/sched.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/vserver/sched.c 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,83 @@ +/* + * linux/kernel/vserver/sched.c @@ -21120,9 +21119,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/vserver/sched.c linux-4.4.116-vs2.3.9 + return 0; +} + -diff -NurpP --minimal linux-4.4.116/kernel/vserver/sched_init.h linux-4.4.116-vs2.3.9.7/kernel/vserver/sched_init.h ---- linux-4.4.116/kernel/vserver/sched_init.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/vserver/sched_init.h 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/vserver/sched_init.h linux-4.4.161-vs2.3.9.8/kernel/vserver/sched_init.h +--- linux-4.4.161/kernel/vserver/sched_init.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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) @@ -21151,9 +21150,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/vserver/sched_init.h linux-4.4.116-vs +{ + return; +} -diff -NurpP --minimal linux-4.4.116/kernel/vserver/sched_proc.h linux-4.4.116-vs2.3.9.7/kernel/vserver/sched_proc.h ---- linux-4.4.116/kernel/vserver/sched_proc.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/vserver/sched_proc.h 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/vserver/sched_proc.h linux-4.4.161-vs2.3.9.8/kernel/vserver/sched_proc.h +--- linux-4.4.161/kernel/vserver/sched_proc.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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 @@ -21187,9 +21186,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/vserver/sched_proc.h linux-4.4.116-vs +} + +#endif /* _VX_SCHED_PROC_H */ -diff -NurpP --minimal linux-4.4.116/kernel/vserver/signal.c linux-4.4.116-vs2.3.9.7/kernel/vserver/signal.c ---- linux-4.4.116/kernel/vserver/signal.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/vserver/signal.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/vserver/signal.c linux-4.4.161-vs2.3.9.8/kernel/vserver/signal.c +--- linux-4.4.161/kernel/vserver/signal.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/vserver/signal.c 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,134 @@ +/* + * linux/kernel/vserver/signal.c @@ -21325,9 +21324,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/vserver/signal.c linux-4.4.116-vs2.3. + return ret; +} + -diff -NurpP --minimal linux-4.4.116/kernel/vserver/space.c linux-4.4.116-vs2.3.9.7/kernel/vserver/space.c ---- linux-4.4.116/kernel/vserver/space.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/vserver/space.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/vserver/space.c linux-4.4.161-vs2.3.9.8/kernel/vserver/space.c +--- linux-4.4.161/kernel/vserver/space.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/vserver/space.c 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,436 @@ +/* + * linux/kernel/vserver/space.c @@ -21765,9 +21764,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/vserver/space.c linux-4.4.116-vs2.3.9 + return 0; +} + -diff -NurpP --minimal linux-4.4.116/kernel/vserver/switch.c linux-4.4.116-vs2.3.9.7/kernel/vserver/switch.c ---- linux-4.4.116/kernel/vserver/switch.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/vserver/switch.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/vserver/switch.c linux-4.4.161-vs2.3.9.8/kernel/vserver/switch.c +--- linux-4.4.161/kernel/vserver/switch.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/vserver/switch.c 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,556 @@ +/* + * linux/kernel/vserver/switch.c @@ -22325,9 +22324,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/vserver/switch.c linux-4.4.116-vs2.3. +} + +#endif /* CONFIG_COMPAT */ -diff -NurpP --minimal linux-4.4.116/kernel/vserver/sysctl.c linux-4.4.116-vs2.3.9.7/kernel/vserver/sysctl.c ---- linux-4.4.116/kernel/vserver/sysctl.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/vserver/sysctl.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/vserver/sysctl.c linux-4.4.161-vs2.3.9.8/kernel/vserver/sysctl.c +--- linux-4.4.161/kernel/vserver/sysctl.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/vserver/sysctl.c 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,247 @@ +/* + * kernel/vserver/sysctl.c @@ -22576,9 +22575,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/vserver/sysctl.c linux-4.4.116-vs2.3. +EXPORT_SYMBOL_GPL(vs_debug_perm); +EXPORT_SYMBOL_GPL(vs_debug_misc); + -diff -NurpP --minimal linux-4.4.116/kernel/vserver/tag.c linux-4.4.116-vs2.3.9.7/kernel/vserver/tag.c ---- linux-4.4.116/kernel/vserver/tag.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/vserver/tag.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/vserver/tag.c linux-4.4.161-vs2.3.9.8/kernel/vserver/tag.c +--- linux-4.4.161/kernel/vserver/tag.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/vserver/tag.c 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,63 @@ +/* + * linux/kernel/vserver/tag.c @@ -22643,9 +22642,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/vserver/tag.c linux-4.4.116-vs2.3.9.7 +} + + -diff -NurpP --minimal linux-4.4.116/kernel/vserver/vci_config.h linux-4.4.116-vs2.3.9.7/kernel/vserver/vci_config.h ---- linux-4.4.116/kernel/vserver/vci_config.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/kernel/vserver/vci_config.h 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/kernel/vserver/vci_config.h linux-4.4.161-vs2.3.9.8/kernel/vserver/vci_config.h +--- linux-4.4.161/kernel/vserver/vci_config.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/kernel/vserver/vci_config.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,80 @@ + +/* interface version */ @@ -22727,9 +22726,9 @@ diff -NurpP --minimal linux-4.4.116/kernel/vserver/vci_config.h linux-4.4.116-vs + 0; +} + -diff -NurpP --minimal linux-4.4.116/mm/memcontrol.c linux-4.4.116-vs2.3.9.7/mm/memcontrol.c ---- linux-4.4.116/mm/memcontrol.c 2018-02-22 21:20:01.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/mm/memcontrol.c 2018-02-10 15:16:50.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/mm/memcontrol.c linux-4.4.161-vs2.3.9.8/mm/memcontrol.c +--- linux-4.4.161/mm/memcontrol.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/mm/memcontrol.c 2018-10-20 05:50:20.000000000 +0000 @@ -2888,6 +2888,42 @@ static u64 mem_cgroup_read_u64(struct cg } } @@ -22773,9 +22772,9 @@ diff -NurpP --minimal linux-4.4.116/mm/memcontrol.c linux-4.4.116-vs2.3.9.7/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.116/mm/oom_kill.c linux-4.4.116-vs2.3.9.7/mm/oom_kill.c ---- linux-4.4.116/mm/oom_kill.c 2016-07-05 04:15:13.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/mm/oom_kill.c 2018-01-09 16:56:23.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/mm/oom_kill.c linux-4.4.161-vs2.3.9.8/mm/oom_kill.c +--- linux-4.4.161/mm/oom_kill.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/mm/oom_kill.c 2018-10-20 04:57:21.000000000 +0000 @@ -35,6 +35,8 @@ #include #include @@ -22850,9 +22849,9 @@ diff -NurpP --minimal linux-4.4.116/mm/oom_kill.c linux-4.4.116-vs2.3.9.7/mm/oom } if (p && p != (void *)-1UL) { oom_kill_process(oc, p, points, totalpages, NULL, -diff -NurpP --minimal linux-4.4.116/mm/page_alloc.c linux-4.4.116-vs2.3.9.7/mm/page_alloc.c ---- linux-4.4.116/mm/page_alloc.c 2018-02-22 21:20:01.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/mm/page_alloc.c 2018-02-10 15:16:50.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/mm/page_alloc.c linux-4.4.161-vs2.3.9.8/mm/page_alloc.c +--- linux-4.4.161/mm/page_alloc.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/mm/page_alloc.c 2018-10-20 04:57:21.000000000 +0000 @@ -62,6 +62,8 @@ #include #include @@ -22862,7 +22861,7 @@ diff -NurpP --minimal linux-4.4.116/mm/page_alloc.c linux-4.4.116-vs2.3.9.7/mm/p #include #include -@@ -3661,6 +3663,9 @@ void si_meminfo(struct sysinfo *val) +@@ -3659,6 +3661,9 @@ void si_meminfo(struct sysinfo *val) val->totalhigh = totalhigh_pages; val->freehigh = nr_free_highpages(); val->mem_unit = PAGE_SIZE; @@ -22872,7 +22871,7 @@ diff -NurpP --minimal linux-4.4.116/mm/page_alloc.c linux-4.4.116-vs2.3.9.7/mm/p } EXPORT_SYMBOL(si_meminfo); -@@ -3686,6 +3691,9 @@ void si_meminfo_node(struct sysinfo *val +@@ -3684,6 +3689,9 @@ void si_meminfo_node(struct sysinfo *val val->freehigh = 0; #endif val->mem_unit = PAGE_SIZE; @@ -22882,9 +22881,9 @@ diff -NurpP --minimal linux-4.4.116/mm/page_alloc.c linux-4.4.116-vs2.3.9.7/mm/p } #endif -diff -NurpP --minimal linux-4.4.116/mm/pgtable-generic.c linux-4.4.116-vs2.3.9.7/mm/pgtable-generic.c ---- linux-4.4.116/mm/pgtable-generic.c 2018-02-22 21:20:01.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/mm/pgtable-generic.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/mm/pgtable-generic.c linux-4.4.161-vs2.3.9.8/mm/pgtable-generic.c +--- linux-4.4.161/mm/pgtable-generic.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/mm/pgtable-generic.c 2018-10-20 04:57:21.000000000 +0000 @@ -6,6 +6,8 @@ * Copyright (C) 2010 Linus Torvalds */ @@ -22894,10 +22893,10 @@ diff -NurpP --minimal linux-4.4.116/mm/pgtable-generic.c linux-4.4.116-vs2.3.9.7 #include #include #include -diff -NurpP --minimal linux-4.4.116/mm/shmem.c linux-4.4.116-vs2.3.9.7/mm/shmem.c ---- linux-4.4.116/mm/shmem.c 2018-02-22 21:20:01.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/mm/shmem.c 2018-01-09 16:36:34.000000000 +0000 -@@ -2198,7 +2198,7 @@ static int shmem_statfs(struct dentry *d +diff -NurpP --minimal linux-4.4.161/mm/shmem.c linux-4.4.161-vs2.3.9.8/mm/shmem.c +--- linux-4.4.161/mm/shmem.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/mm/shmem.c 2018-10-20 05:50:20.000000000 +0000 +@@ -2200,7 +2200,7 @@ static int shmem_statfs(struct dentry *d { struct shmem_sb_info *sbinfo = SHMEM_SB(dentry->d_sb); @@ -22906,7 +22905,7 @@ diff -NurpP --minimal linux-4.4.116/mm/shmem.c linux-4.4.116-vs2.3.9.7/mm/shmem. buf->f_bsize = PAGE_CACHE_SIZE; buf->f_namelen = NAME_MAX; if (sbinfo->max_blocks) { -@@ -3044,7 +3044,7 @@ int shmem_fill_super(struct super_block +@@ -3046,7 +3046,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; @@ -22915,9 +22914,9 @@ diff -NurpP --minimal linux-4.4.116/mm/shmem.c linux-4.4.116-vs2.3.9.7/mm/shmem. sb->s_op = &shmem_ops; sb->s_time_gran = 1; #ifdef CONFIG_TMPFS_XATTR -diff -NurpP --minimal linux-4.4.116/mm/slab.c linux-4.4.116-vs2.3.9.7/mm/slab.c ---- linux-4.4.116/mm/slab.c 2016-07-05 04:15:13.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/mm/slab.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/mm/slab.c linux-4.4.161-vs2.3.9.8/mm/slab.c +--- linux-4.4.161/mm/slab.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/mm/slab.c 2018-10-20 04:57:21.000000000 +0000 @@ -337,6 +337,8 @@ static void kmem_cache_node_init(struct #define STATS_INC_FREEMISS(x) do { } while (0) #endif @@ -22943,9 +22942,9 @@ diff -NurpP --minimal linux-4.4.116/mm/slab.c linux-4.4.116-vs2.3.9.7/mm/slab.c kmemcheck_slab_free(cachep, objp, cachep->object_size); -diff -NurpP --minimal linux-4.4.116/mm/slab_vs.h linux-4.4.116-vs2.3.9.7/mm/slab_vs.h ---- linux-4.4.116/mm/slab_vs.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/mm/slab_vs.h 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/mm/slab_vs.h linux-4.4.161-vs2.3.9.8/mm/slab_vs.h +--- linux-4.4.161/mm/slab_vs.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/mm/slab_vs.h 2018-10-20 04:57:21.000000000 +0000 @@ -0,0 +1,29 @@ + +#include @@ -22976,9 +22975,9 @@ diff -NurpP --minimal linux-4.4.116/mm/slab_vs.h linux-4.4.116-vs2.3.9.7/mm/slab + atomic_sub(cachep->size, &vxi->cacct.slab[what]); +} + -diff -NurpP --minimal linux-4.4.116/mm/swapfile.c linux-4.4.116-vs2.3.9.7/mm/swapfile.c ---- linux-4.4.116/mm/swapfile.c 2018-02-22 21:20:01.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/mm/swapfile.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/mm/swapfile.c linux-4.4.161-vs2.3.9.8/mm/swapfile.c +--- linux-4.4.161/mm/swapfile.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/mm/swapfile.c 2018-10-20 05:50:20.000000000 +0000 @@ -39,6 +39,7 @@ #include #include @@ -23004,7 +23003,7 @@ diff -NurpP --minimal linux-4.4.116/mm/swapfile.c linux-4.4.116-vs2.3.9.7/mm/swa return 0; } -@@ -2609,6 +2620,8 @@ void si_swapinfo(struct sysinfo *val) +@@ -2627,6 +2638,8 @@ void si_swapinfo(struct sysinfo *val) val->freeswap = atomic_long_read(&nr_swap_pages) + nr_to_be_unused; val->totalswap = total_swap_pages + nr_to_be_unused; spin_unlock(&swap_lock); @@ -23013,9 +23012,9 @@ diff -NurpP --minimal linux-4.4.116/mm/swapfile.c linux-4.4.116-vs2.3.9.7/mm/swa } /* -diff -NurpP --minimal linux-4.4.116/net/bridge/br_multicast.c linux-4.4.116-vs2.3.9.7/net/bridge/br_multicast.c ---- linux-4.4.116/net/bridge/br_multicast.c 2018-02-22 21:20:02.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/net/bridge/br_multicast.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/net/bridge/br_multicast.c linux-4.4.161-vs2.3.9.8/net/bridge/br_multicast.c +--- linux-4.4.161/net/bridge/br_multicast.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/net/bridge/br_multicast.c 2018-10-20 04:57:21.000000000 +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)); @@ -23025,9 +23024,9 @@ diff -NurpP --minimal linux-4.4.116/net/bridge/br_multicast.c linux-4.4.116-vs2. kfree_skb(skb); br->has_ipv6_addr = 0; return NULL; -diff -NurpP --minimal linux-4.4.116/net/core/dev.c linux-4.4.116-vs2.3.9.7/net/core/dev.c ---- linux-4.4.116/net/core/dev.c 2018-02-22 21:20:02.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/net/core/dev.c 2018-02-10 15:16:50.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/net/core/dev.c linux-4.4.161-vs2.3.9.8/net/core/dev.c +--- linux-4.4.161/net/core/dev.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/net/core/dev.c 2018-10-20 05:50:20.000000000 +0000 @@ -124,6 +124,7 @@ #include #include @@ -23145,9 +23144,9 @@ diff -NurpP --minimal linux-4.4.116/net/core/dev.c linux-4.4.116-vs2.3.9.7/net/c /* avoid cases where sscanf is not exact inverse of printf */ snprintf(buf, IFNAMSIZ, name, i); -diff -NurpP --minimal linux-4.4.116/net/core/net-procfs.c linux-4.4.116-vs2.3.9.7/net/core/net-procfs.c ---- linux-4.4.116/net/core/net-procfs.c 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/net/core/net-procfs.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/net/core/net-procfs.c linux-4.4.161-vs2.3.9.8/net/core/net-procfs.c +--- linux-4.4.161/net/core/net-procfs.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/net/core/net-procfs.c 2018-10-20 04:57:21.000000000 +0000 @@ -1,6 +1,7 @@ #include #include @@ -23171,9 +23170,9 @@ diff -NurpP --minimal linux-4.4.116/net/core/net-procfs.c linux-4.4.116-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.116/net/core/rtnetlink.c linux-4.4.116-vs2.3.9.7/net/core/rtnetlink.c ---- linux-4.4.116/net/core/rtnetlink.c 2018-02-22 21:20:02.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/net/core/rtnetlink.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/net/core/rtnetlink.c linux-4.4.161-vs2.3.9.8/net/core/rtnetlink.c +--- linux-4.4.161/net/core/rtnetlink.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/net/core/rtnetlink.c 2018-10-20 05:50:20.000000000 +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) @@ -23183,7 +23182,7 @@ diff -NurpP --minimal linux-4.4.116/net/core/rtnetlink.c linux-4.4.116-vs2.3.9.7 err = rtnl_fill_ifinfo(skb, dev, RTM_NEWLINK, NETLINK_CB(cb->skb).portid, cb->nlh->nlmsg_seq, 0, -@@ -2559,6 +2561,9 @@ void rtmsg_ifinfo(int type, struct net_d +@@ -2562,6 +2564,9 @@ void rtmsg_ifinfo(int type, struct net_d { struct sk_buff *skb; @@ -23193,9 +23192,9 @@ diff -NurpP --minimal linux-4.4.116/net/core/rtnetlink.c linux-4.4.116-vs2.3.9.7 if (dev->reg_state != NETREG_REGISTERED) return; -diff -NurpP --minimal linux-4.4.116/net/core/sock.c linux-4.4.116-vs2.3.9.7/net/core/sock.c ---- linux-4.4.116/net/core/sock.c 2018-02-22 21:20:02.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/net/core/sock.c 2018-01-09 17:15:58.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/net/core/sock.c linux-4.4.161-vs2.3.9.8/net/core/sock.c +--- linux-4.4.161/net/core/sock.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/net/core/sock.c 2018-10-20 04:57:21.000000000 +0000 @@ -134,6 +134,10 @@ #include @@ -23263,9 +23262,9 @@ diff -NurpP --minimal linux-4.4.116/net/core/sock.c linux-4.4.116-vs2.3.9.7/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.116/net/ipv4/af_inet.c linux-4.4.116-vs2.3.9.7/net/ipv4/af_inet.c ---- linux-4.4.116/net/ipv4/af_inet.c 2018-02-22 21:20:03.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/net/ipv4/af_inet.c 2018-01-09 17:11:11.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/net/ipv4/af_inet.c linux-4.4.161-vs2.3.9.8/net/ipv4/af_inet.c +--- linux-4.4.161/net/ipv4/af_inet.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/net/ipv4/af_inet.c 2018-10-20 05:50:20.000000000 +0000 @@ -308,10 +308,15 @@ lookup_protocol: } @@ -23344,10 +23343,10 @@ diff -NurpP --minimal linux-4.4.116/net/ipv4/af_inet.c linux-4.4.116-vs2.3.9.7/n const struct proto_ops inet_stream_ops = { .family = PF_INET, -diff -NurpP --minimal linux-4.4.116/net/ipv4/arp.c linux-4.4.116-vs2.3.9.7/net/ipv4/arp.c ---- linux-4.4.116/net/ipv4/arp.c 2018-02-22 21:20:03.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/net/ipv4/arp.c 2018-02-10 15:16:50.000000000 +0000 -@@ -1295,6 +1295,7 @@ static void arp_format_neigh_entry(struc +diff -NurpP --minimal linux-4.4.161/net/ipv4/arp.c linux-4.4.161-vs2.3.9.8/net/ipv4/arp.c +--- linux-4.4.161/net/ipv4/arp.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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; @@ -23355,7 +23354,7 @@ diff -NurpP --minimal linux-4.4.116/net/ipv4/arp.c linux-4.4.116-vs2.3.9.7/net/i read_lock(&n->lock); /* Convert hardware address to XX:XX:XX:XX ... form. */ #if IS_ENABLED(CONFIG_AX25) -@@ -1326,6 +1327,7 @@ static void arp_format_pneigh_entry(stru +@@ -1338,6 +1339,7 @@ static void arp_format_pneigh_entry(stru int hatype = dev ? dev->type : 0; char tbuf[16]; @@ -23363,9 +23362,9 @@ diff -NurpP --minimal linux-4.4.116/net/ipv4/arp.c linux-4.4.116-vs2.3.9.7/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.116/net/ipv4/devinet.c linux-4.4.116-vs2.3.9.7/net/ipv4/devinet.c ---- linux-4.4.116/net/ipv4/devinet.c 2018-02-22 21:20:03.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/net/ipv4/devinet.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/net/ipv4/devinet.c linux-4.4.161-vs2.3.9.8/net/ipv4/devinet.c +--- linux-4.4.161/net/ipv4/devinet.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/net/ipv4/devinet.c 2018-10-20 04:57:21.000000000 +0000 @@ -538,6 +538,7 @@ struct in_device *inetdev_by_index(struc } EXPORT_SYMBOL(inetdev_by_index); @@ -23432,9 +23431,9 @@ diff -NurpP --minimal linux-4.4.116/net/ipv4/devinet.c linux-4.4.116-vs2.3.9.7/n if (ip_idx < s_ip_idx) continue; if (inet_fill_ifaddr(skb, ifa, -diff -NurpP --minimal linux-4.4.116/net/ipv4/fib_trie.c linux-4.4.116-vs2.3.9.7/net/ipv4/fib_trie.c ---- linux-4.4.116/net/ipv4/fib_trie.c 2018-02-22 21:20:03.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/net/ipv4/fib_trie.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/net/ipv4/fib_trie.c linux-4.4.161-vs2.3.9.8/net/ipv4/fib_trie.c +--- linux-4.4.161/net/ipv4/fib_trie.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/net/ipv4/fib_trie.c 2018-10-20 04:57:21.000000000 +0000 @@ -2591,6 +2591,7 @@ static int fib_route_seq_show(struct seq seq_setwidth(seq, 127); @@ -23443,9 +23442,9 @@ diff -NurpP --minimal linux-4.4.116/net/ipv4/fib_trie.c linux-4.4.116-vs2.3.9.7/ if (fi) seq_printf(seq, "%s\t%08X\t%08X\t%04X\t%d\t%u\t" -diff -NurpP --minimal linux-4.4.116/net/ipv4/inet_connection_sock.c linux-4.4.116-vs2.3.9.7/net/ipv4/inet_connection_sock.c ---- linux-4.4.116/net/ipv4/inet_connection_sock.c 2018-02-22 21:20:03.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/net/ipv4/inet_connection_sock.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/net/ipv4/inet_connection_sock.c linux-4.4.161-vs2.3.9.8/net/ipv4/inet_connection_sock.c +--- linux-4.4.161/net/ipv4/inet_connection_sock.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/net/ipv4/inet_connection_sock.c 2018-10-20 04:57:21.000000000 +0000 @@ -43,6 +43,37 @@ void inet_get_local_port_range(struct ne } EXPORT_SYMBOL(inet_get_local_port_range); @@ -23502,9 +23501,9 @@ diff -NurpP --minimal linux-4.4.116/net/ipv4/inet_connection_sock.c linux-4.4.11 break; } } -diff -NurpP --minimal linux-4.4.116/net/ipv4/inet_diag.c linux-4.4.116-vs2.3.9.7/net/ipv4/inet_diag.c ---- linux-4.4.116/net/ipv4/inet_diag.c 2016-07-05 04:15:14.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/net/ipv4/inet_diag.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/net/ipv4/inet_diag.c linux-4.4.161-vs2.3.9.8/net/ipv4/inet_diag.c +--- linux-4.4.161/net/ipv4/inet_diag.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/net/ipv4/inet_diag.c 2018-10-20 06:34:05.000000000 +0000 @@ -31,6 +31,8 @@ #include @@ -23514,16 +23513,28 @@ diff -NurpP --minimal linux-4.4.116/net/ipv4/inet_diag.c linux-4.4.116-vs2.3.9.7 #include #include -@@ -761,6 +763,8 @@ void inet_diag_dump_icsk(struct inet_has +@@ -85,8 +87,8 @@ static void inet_diag_msg_common_fill(st + memset(&r->id.idiag_src, 0, sizeof(r->id.idiag_src)); + memset(&r->id.idiag_dst, 0, sizeof(r->id.idiag_dst)); + +- r->id.idiag_src[0] = sk->sk_rcv_saddr; +- r->id.idiag_dst[0] = sk->sk_daddr; ++ r->id.idiag_src[0] = nx_map_sock_lback(sk->sk_nx_info, sk->sk_rcv_saddr); ++ r->id.idiag_dst[0] = nx_map_sock_lback(sk->sk_nx_info, sk->sk_daddr); + } + } + +@@ -761,6 +763,9 @@ void inet_diag_dump_icsk(struct inet_has if (!net_eq(sock_net(sk), net)) continue; + if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)) + continue; ++ if (num < s_num) { num++; continue; -@@ -822,6 +826,8 @@ skip_listen_ht: +@@ -822,6 +827,8 @@ skip_listen_ht: if (!net_eq(sock_net(sk), net)) continue; @@ -23532,9 +23543,9 @@ diff -NurpP --minimal linux-4.4.116/net/ipv4/inet_diag.c linux-4.4.116-vs2.3.9.7 if (num < s_num) goto next_normal; state = (sk->sk_state == TCP_TIME_WAIT) ? -diff -NurpP --minimal linux-4.4.116/net/ipv4/inet_hashtables.c linux-4.4.116-vs2.3.9.7/net/ipv4/inet_hashtables.c ---- linux-4.4.116/net/ipv4/inet_hashtables.c 2016-07-05 04:15:14.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/net/ipv4/inet_hashtables.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/net/ipv4/inet_hashtables.c linux-4.4.161-vs2.3.9.8/net/ipv4/inet_hashtables.c +--- linux-4.4.161/net/ipv4/inet_hashtables.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/net/ipv4/inet_hashtables.c 2018-10-20 04:57:21.000000000 +0000 @@ -23,6 +23,7 @@ #include #include @@ -23571,9 +23582,9 @@ diff -NurpP --minimal linux-4.4.116/net/ipv4/inet_hashtables.c linux-4.4.116-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.116/net/ipv4/netfilter.c linux-4.4.116-vs2.3.9.7/net/ipv4/netfilter.c ---- linux-4.4.116/net/ipv4/netfilter.c 2016-07-05 04:15:14.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/net/ipv4/netfilter.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/net/ipv4/netfilter.c linux-4.4.161-vs2.3.9.8/net/ipv4/netfilter.c +--- linux-4.4.161/net/ipv4/netfilter.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/net/ipv4/netfilter.c 2018-10-20 04:57:21.000000000 +0000 @@ -11,7 +11,7 @@ #include #include @@ -23583,9 +23594,9 @@ diff -NurpP --minimal linux-4.4.116/net/ipv4/netfilter.c linux-4.4.116-vs2.3.9.7 #include #include #include -diff -NurpP --minimal linux-4.4.116/net/ipv4/raw.c linux-4.4.116-vs2.3.9.7/net/ipv4/raw.c ---- linux-4.4.116/net/ipv4/raw.c 2018-02-22 21:20:03.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/net/ipv4/raw.c 2018-01-09 17:06:10.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/net/ipv4/raw.c linux-4.4.161-vs2.3.9.8/net/ipv4/raw.c +--- linux-4.4.161/net/ipv4/raw.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/net/ipv4/raw.c 2018-10-20 04:57:21.000000000 +0000 @@ -126,7 +126,7 @@ static struct sock *__raw_v4_lookup(stru if (net_eq(sock_net(sk), net) && inet->inet_num == num && @@ -23678,10 +23689,10 @@ diff -NurpP --minimal linux-4.4.116/net/ipv4/raw.c linux-4.4.116-vs2.3.9.7/net/i if (!sk && ++state->bucket < RAW_HTABLE_SIZE) { sk = sk_head(&state->h->ht[state->bucket]); -diff -NurpP --minimal linux-4.4.116/net/ipv4/route.c linux-4.4.116-vs2.3.9.7/net/ipv4/route.c ---- linux-4.4.116/net/ipv4/route.c 2018-02-22 21:20:03.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/net/ipv4/route.c 2018-01-09 16:36:34.000000000 +0000 -@@ -2226,7 +2226,7 @@ struct rtable *__ip_route_output_key_has +diff -NurpP --minimal linux-4.4.161/net/ipv4/route.c linux-4.4.161-vs2.3.9.8/net/ipv4/route.c +--- linux-4.4.161/net/ipv4/route.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/net/ipv4/route.c 2018-10-20 04:57:21.000000000 +0000 +@@ -2238,7 +2238,7 @@ struct rtable *__ip_route_output_key_has if (fl4->flowi4_oif) { @@ -23690,9 +23701,9 @@ diff -NurpP --minimal linux-4.4.116/net/ipv4/route.c linux-4.4.116-vs2.3.9.7/net rth = ERR_PTR(-ENODEV); if (!dev_out) goto out; -diff -NurpP --minimal linux-4.4.116/net/ipv4/tcp.c linux-4.4.116-vs2.3.9.7/net/ipv4/tcp.c ---- linux-4.4.116/net/ipv4/tcp.c 2018-02-22 21:20:03.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/net/ipv4/tcp.c 2018-02-22 21:30:19.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/net/ipv4/tcp.c linux-4.4.161-vs2.3.9.8/net/ipv4/tcp.c +--- linux-4.4.161/net/ipv4/tcp.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/net/ipv4/tcp.c 2018-10-20 05:50:20.000000000 +0000 @@ -269,6 +269,7 @@ #include #include @@ -23701,10 +23712,10 @@ diff -NurpP --minimal linux-4.4.116/net/ipv4/tcp.c linux-4.4.116-vs2.3.9.7/net/i #include #include -diff -NurpP --minimal linux-4.4.116/net/ipv4/tcp_ipv4.c linux-4.4.116-vs2.3.9.7/net/ipv4/tcp_ipv4.c ---- linux-4.4.116/net/ipv4/tcp_ipv4.c 2018-02-22 21:20:03.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/net/ipv4/tcp_ipv4.c 2018-01-09 17:13:45.000000000 +0000 -@@ -1885,6 +1885,10 @@ static void *listening_get_next(struct s +diff -NurpP --minimal linux-4.4.161/net/ipv4/tcp_ipv4.c linux-4.4.161-vs2.3.9.8/net/ipv4/tcp_ipv4.c +--- linux-4.4.161/net/ipv4/tcp_ipv4.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/net/ipv4/tcp_ipv4.c 2018-10-20 05:50:20.000000000 +0000 +@@ -1890,6 +1890,10 @@ static void *listening_get_next(struct s sk = sk_nulls_next(sk); get_sk: sk_nulls_for_each_from(sk, node) { @@ -23715,7 +23726,7 @@ diff -NurpP --minimal linux-4.4.116/net/ipv4/tcp_ipv4.c linux-4.4.116-vs2.3.9.7/ if (!net_eq(sock_net(sk), net)) continue; if (sk->sk_family == st->family) { -@@ -1949,6 +1953,11 @@ static void *established_get_first(struc +@@ -1954,6 +1958,11 @@ static void *established_get_first(struc spin_lock_bh(lock); sk_nulls_for_each(sk, node, &tcp_hashinfo.ehash[st->bucket].chain) { @@ -23727,7 +23738,7 @@ diff -NurpP --minimal linux-4.4.116/net/ipv4/tcp_ipv4.c linux-4.4.116-vs2.3.9.7/ if (sk->sk_family != st->family || !net_eq(sock_net(sk), net)) { continue; -@@ -1975,6 +1984,11 @@ static void *established_get_next(struct +@@ -1980,6 +1989,11 @@ static void *established_get_next(struct sk = sk_nulls_next(sk); sk_nulls_for_each_from(sk, node) { @@ -23739,7 +23750,7 @@ diff -NurpP --minimal linux-4.4.116/net/ipv4/tcp_ipv4.c linux-4.4.116-vs2.3.9.7/ if (sk->sk_family == st->family && net_eq(sock_net(sk), net)) return sk; } -@@ -2166,9 +2180,9 @@ static void get_openreq4(const struct re +@@ -2171,9 +2185,9 @@ static void get_openreq4(const struct re seq_printf(f, "%4d: %08X:%04X %08X:%04X" " %02X %08X:%08X %02X:%08lX %08X %5u %8d %u %d %pK", i, @@ -23751,7 +23762,7 @@ diff -NurpP --minimal linux-4.4.116/net/ipv4/tcp_ipv4.c linux-4.4.116-vs2.3.9.7/ ntohs(ireq->ir_rmt_port), TCP_SYN_RECV, 0, 0, /* could print option size, but that is af dependent. */ -@@ -2191,8 +2205,8 @@ static void get_tcp4_sock(struct sock *s +@@ -2196,8 +2210,8 @@ static void get_tcp4_sock(struct sock *s const struct inet_connection_sock *icsk = inet_csk(sk); const struct inet_sock *inet = inet_sk(sk); const struct fastopen_queue *fastopenq = &icsk->icsk_accept_queue.fastopenq; @@ -23762,7 +23773,7 @@ diff -NurpP --minimal linux-4.4.116/net/ipv4/tcp_ipv4.c linux-4.4.116-vs2.3.9.7/ __u16 destp = ntohs(inet->inet_dport); __u16 srcp = ntohs(inet->inet_sport); int rx_queue; -@@ -2251,8 +2265,8 @@ static void get_timewait4_sock(const str +@@ -2256,8 +2270,8 @@ static void get_timewait4_sock(const str __be32 dest, src; __u16 destp, srcp; @@ -23773,9 +23784,9 @@ diff -NurpP --minimal linux-4.4.116/net/ipv4/tcp_ipv4.c linux-4.4.116-vs2.3.9.7/ destp = ntohs(tw->tw_dport); srcp = ntohs(tw->tw_sport); -diff -NurpP --minimal linux-4.4.116/net/ipv4/tcp_minisocks.c linux-4.4.116-vs2.3.9.7/net/ipv4/tcp_minisocks.c ---- linux-4.4.116/net/ipv4/tcp_minisocks.c 2018-02-22 21:20:03.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/net/ipv4/tcp_minisocks.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/net/ipv4/tcp_minisocks.c linux-4.4.161-vs2.3.9.8/net/ipv4/tcp_minisocks.c +--- linux-4.4.161/net/ipv4/tcp_minisocks.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/net/ipv4/tcp_minisocks.c 2018-10-20 05:50:20.000000000 +0000 @@ -23,6 +23,9 @@ #include #include @@ -23786,7 +23797,7 @@ diff -NurpP --minimal linux-4.4.116/net/ipv4/tcp_minisocks.c linux-4.4.116-vs2.3 #include #include #include -@@ -291,6 +294,11 @@ void tcp_time_wait(struct sock *sk, int +@@ -292,6 +295,11 @@ void tcp_time_wait(struct sock *sk, int tcptw->tw_ts_offset = tp->tsoffset; tcptw->tw_last_oow_ack_time = 0; @@ -23798,9 +23809,9 @@ diff -NurpP --minimal linux-4.4.116/net/ipv4/tcp_minisocks.c linux-4.4.116-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.116/net/ipv4/udp.c linux-4.4.116-vs2.3.9.7/net/ipv4/udp.c ---- linux-4.4.116/net/ipv4/udp.c 2018-02-22 21:20:03.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/net/ipv4/udp.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/net/ipv4/udp.c linux-4.4.161-vs2.3.9.8/net/ipv4/udp.c +--- linux-4.4.161/net/ipv4/udp.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/net/ipv4/udp.c 2018-10-20 04:57:21.000000000 +0000 @@ -309,14 +309,7 @@ fail: } EXPORT_SYMBOL(udp_lib_get_port); @@ -23874,7 +23885,7 @@ diff -NurpP --minimal linux-4.4.116/net/ipv4/udp.c linux-4.4.116-vs2.3.9.7/net/i ipv6_only_sock(sk) || (sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif)) return false; -@@ -1033,6 +1039,16 @@ int udp_sendmsg(struct sock *sk, struct +@@ -1035,6 +1041,16 @@ int udp_sendmsg(struct sock *sk, struct goto out; } @@ -23891,7 +23902,7 @@ diff -NurpP --minimal linux-4.4.116/net/ipv4/udp.c linux-4.4.116-vs2.3.9.7/net/i security_sk_classify_flow(sk, flowi4_to_flowi(fl4)); rt = ip_route_output_flow(net, fl4, sk); if (IS_ERR(rt)) { -@@ -1337,7 +1353,8 @@ try_again: +@@ -1340,7 +1356,8 @@ try_again: if (sin) { sin->sin_family = AF_INET; sin->sin_port = udp_hdr(skb)->source; @@ -23901,7 +23912,7 @@ diff -NurpP --minimal linux-4.4.116/net/ipv4/udp.c linux-4.4.116-vs2.3.9.7/net/i memset(sin->sin_zero, 0, sizeof(sin->sin_zero)); *addr_len = sizeof(*sin); } -@@ -2319,6 +2336,8 @@ static struct sock *udp_get_first(struct +@@ -2327,6 +2344,8 @@ static struct sock *udp_get_first(struct sk_nulls_for_each(sk, node, &hslot->head) { if (!net_eq(sock_net(sk), net)) continue; @@ -23910,7 +23921,7 @@ diff -NurpP --minimal linux-4.4.116/net/ipv4/udp.c linux-4.4.116-vs2.3.9.7/net/i if (sk->sk_family == state->family) goto found; } -@@ -2336,7 +2355,9 @@ static struct sock *udp_get_next(struct +@@ -2344,7 +2363,9 @@ static struct sock *udp_get_next(struct do { sk = sk_nulls_next(sk); @@ -23921,7 +23932,7 @@ diff -NurpP --minimal linux-4.4.116/net/ipv4/udp.c linux-4.4.116-vs2.3.9.7/net/i if (!sk) { if (state->bucket <= state->udp_table->mask) -@@ -2432,8 +2453,8 @@ static void udp4_format_sock(struct sock +@@ -2440,8 +2461,8 @@ static void udp4_format_sock(struct sock int bucket) { struct inet_sock *inet = inet_sk(sp); @@ -23932,9 +23943,21 @@ diff -NurpP --minimal linux-4.4.116/net/ipv4/udp.c linux-4.4.116-vs2.3.9.7/net/i __u16 destp = ntohs(inet->inet_dport); __u16 srcp = ntohs(inet->inet_sport); -diff -NurpP --minimal linux-4.4.116/net/ipv6/addrconf.c linux-4.4.116-vs2.3.9.7/net/ipv6/addrconf.c ---- linux-4.4.116/net/ipv6/addrconf.c 2018-02-22 21:20:03.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/net/ipv6/addrconf.c 2018-01-09 23:41:55.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/net/ipv4/udp_diag.c linux-4.4.161-vs2.3.9.8/net/ipv4/udp_diag.c +--- linux-4.4.161/net/ipv4/udp_diag.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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)) + continue; ++ if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)) ++ continue; + if (num < s_num) + goto next; + if (!(r->idiag_states & (1 << sk->sk_state))) +diff -NurpP --minimal linux-4.4.161/net/ipv6/addrconf.c linux-4.4.161-vs2.3.9.8/net/ipv6/addrconf.c +--- linux-4.4.161/net/ipv6/addrconf.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/net/ipv6/addrconf.c 2018-10-20 04:57:21.000000000 +0000 @@ -92,6 +92,8 @@ #include #include @@ -23944,7 +23967,7 @@ diff -NurpP --minimal linux-4.4.116/net/ipv6/addrconf.c linux-4.4.116-vs2.3.9.7/ /* Set to 3 to get tracing... */ #define ACONF_DEBUG 2 -@@ -1442,7 +1444,8 @@ static int __ipv6_dev_get_saddr(struct n +@@ -1445,7 +1447,8 @@ static int __ipv6_dev_get_saddr(struct n struct ipv6_saddr_dst *dst, struct inet6_dev *idev, struct ipv6_saddr_score *scores, @@ -23954,7 +23977,7 @@ diff -NurpP --minimal linux-4.4.116/net/ipv6/addrconf.c linux-4.4.116-vs2.3.9.7/ { struct ipv6_saddr_score *score = &scores[1 - hiscore_idx], *hiscore = &scores[hiscore_idx]; -@@ -1472,6 +1475,8 @@ static int __ipv6_dev_get_saddr(struct n +@@ -1475,6 +1478,8 @@ static int __ipv6_dev_get_saddr(struct n idev->dev->name); continue; } @@ -23963,7 +23986,7 @@ diff -NurpP --minimal linux-4.4.116/net/ipv6/addrconf.c linux-4.4.116-vs2.3.9.7/ score->rule = -1; bitmap_zero(score->scorebits, IPV6_SADDR_RULE_MAX); -@@ -1519,7 +1524,7 @@ out: +@@ -1522,7 +1527,7 @@ out: int ipv6_dev_get_saddr(struct net *net, const struct net_device *dst_dev, const struct in6_addr *daddr, unsigned int prefs, @@ -23972,7 +23995,7 @@ diff -NurpP --minimal linux-4.4.116/net/ipv6/addrconf.c linux-4.4.116-vs2.3.9.7/ { struct ipv6_saddr_score scores[2], *hiscore; struct ipv6_saddr_dst dst; -@@ -1568,13 +1573,15 @@ int ipv6_dev_get_saddr(struct net *net, +@@ -1571,13 +1576,15 @@ int ipv6_dev_get_saddr(struct net *net, if (use_oif_addr) { if (idev) @@ -23990,7 +24013,7 @@ diff -NurpP --minimal linux-4.4.116/net/ipv6/addrconf.c linux-4.4.116-vs2.3.9.7/ } } rcu_read_unlock(); -@@ -3846,7 +3853,10 @@ static void if6_seq_stop(struct seq_file +@@ -3849,7 +3856,10 @@ static void if6_seq_stop(struct seq_file static int if6_seq_show(struct seq_file *seq, void *v) { struct inet6_ifaddr *ifp = (struct inet6_ifaddr *)v; @@ -24002,7 +24025,7 @@ diff -NurpP --minimal linux-4.4.116/net/ipv6/addrconf.c linux-4.4.116-vs2.3.9.7/ &ifp->addr, ifp->idev->dev->ifindex, ifp->prefix_len, -@@ -4430,6 +4440,11 @@ static int in6_dump_addrs(struct inet6_d +@@ -4433,6 +4443,11 @@ static int in6_dump_addrs(struct inet6_d struct ifacaddr6 *ifaca; int err = 1; int ip_idx = *p_ip_idx; @@ -24014,7 +24037,7 @@ diff -NurpP --minimal linux-4.4.116/net/ipv6/addrconf.c linux-4.4.116-vs2.3.9.7/ read_lock_bh(&idev->lock); switch (type) { -@@ -4440,6 +4455,8 @@ static int in6_dump_addrs(struct inet6_d +@@ -4443,6 +4458,8 @@ static int in6_dump_addrs(struct inet6_d list_for_each_entry(ifa, &idev->addr_list, if_list) { if (++ip_idx < s_ip_idx) continue; @@ -24023,7 +24046,7 @@ diff -NurpP --minimal linux-4.4.116/net/ipv6/addrconf.c linux-4.4.116-vs2.3.9.7/ err = inet6_fill_ifaddr(skb, ifa, NETLINK_CB(cb->skb).portid, cb->nlh->nlmsg_seq, -@@ -4457,6 +4474,8 @@ static int in6_dump_addrs(struct inet6_d +@@ -4460,6 +4477,8 @@ static int in6_dump_addrs(struct inet6_d ifmca = ifmca->next, ip_idx++) { if (ip_idx < s_ip_idx) continue; @@ -24032,7 +24055,7 @@ diff -NurpP --minimal linux-4.4.116/net/ipv6/addrconf.c linux-4.4.116-vs2.3.9.7/ err = inet6_fill_ifmcaddr(skb, ifmca, NETLINK_CB(cb->skb).portid, cb->nlh->nlmsg_seq, -@@ -4472,6 +4491,8 @@ static int in6_dump_addrs(struct inet6_d +@@ -4475,6 +4494,8 @@ static int in6_dump_addrs(struct inet6_d ifaca = ifaca->aca_next, ip_idx++) { if (ip_idx < s_ip_idx) continue; @@ -24041,7 +24064,7 @@ diff -NurpP --minimal linux-4.4.116/net/ipv6/addrconf.c linux-4.4.116-vs2.3.9.7/ err = inet6_fill_ifacaddr(skb, ifaca, NETLINK_CB(cb->skb).portid, cb->nlh->nlmsg_seq, -@@ -4500,6 +4521,10 @@ static int inet6_dump_addr(struct sk_buf +@@ -4503,6 +4524,10 @@ static int inet6_dump_addr(struct sk_buf struct inet6_dev *idev; struct hlist_head *head; @@ -24052,7 +24075,7 @@ diff -NurpP --minimal linux-4.4.116/net/ipv6/addrconf.c linux-4.4.116-vs2.3.9.7/ s_h = cb->args[0]; s_idx = idx = cb->args[1]; s_ip_idx = ip_idx = cb->args[2]; -@@ -5008,6 +5033,7 @@ static int inet6_dump_ifinfo(struct sk_b +@@ -5011,6 +5036,7 @@ static int inet6_dump_ifinfo(struct sk_b struct net_device *dev; struct inet6_dev *idev; struct hlist_head *head; @@ -24060,7 +24083,7 @@ diff -NurpP --minimal linux-4.4.116/net/ipv6/addrconf.c linux-4.4.116-vs2.3.9.7/ s_h = cb->args[0]; s_idx = cb->args[1]; -@@ -5019,6 +5045,8 @@ static int inet6_dump_ifinfo(struct sk_b +@@ -5022,6 +5048,8 @@ static int inet6_dump_ifinfo(struct sk_b hlist_for_each_entry_rcu(dev, head, index_hlist) { if (idx < s_idx) goto cont; @@ -24069,9 +24092,9 @@ diff -NurpP --minimal linux-4.4.116/net/ipv6/addrconf.c linux-4.4.116-vs2.3.9.7/ idev = __in6_dev_get(dev); if (!idev) goto cont; -diff -NurpP --minimal linux-4.4.116/net/ipv6/af_inet6.c linux-4.4.116-vs2.3.9.7/net/ipv6/af_inet6.c ---- linux-4.4.116/net/ipv6/af_inet6.c 2018-02-22 21:20:03.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/net/ipv6/af_inet6.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/net/ipv6/af_inet6.c linux-4.4.161-vs2.3.9.8/net/ipv6/af_inet6.c +--- linux-4.4.161/net/ipv6/af_inet6.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/net/ipv6/af_inet6.c 2018-10-20 04:57:21.000000000 +0000 @@ -43,6 +43,8 @@ #include #include @@ -24160,10 +24183,10 @@ diff -NurpP --minimal linux-4.4.116/net/ipv6/af_inet6.c linux-4.4.116-vs2.3.9.7/ if (ipv6_addr_any(&sk->sk_v6_rcv_saddr)) sin->sin6_addr = np->saddr; else -diff -NurpP --minimal linux-4.4.116/net/ipv6/datagram.c linux-4.4.116-vs2.3.9.7/net/ipv6/datagram.c ---- linux-4.4.116/net/ipv6/datagram.c 2018-02-22 21:20:03.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/net/ipv6/datagram.c 2018-01-09 16:36:34.000000000 +0000 -@@ -733,7 +733,7 @@ int ip6_datagram_send_ctl(struct net *ne +diff -NurpP --minimal linux-4.4.161/net/ipv6/datagram.c linux-4.4.161-vs2.3.9.8/net/ipv6/datagram.c +--- linux-4.4.161/net/ipv6/datagram.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/net/ipv6/datagram.c 2018-10-20 05:50:20.000000000 +0000 +@@ -736,7 +736,7 @@ int ip6_datagram_send_ctl(struct net *ne rcu_read_lock(); if (fl6->flowi6_oif) { @@ -24172,9 +24195,9 @@ diff -NurpP --minimal linux-4.4.116/net/ipv6/datagram.c linux-4.4.116-vs2.3.9.7/ if (!dev) { rcu_read_unlock(); return -ENODEV; -diff -NurpP --minimal linux-4.4.116/net/ipv6/fib6_rules.c linux-4.4.116-vs2.3.9.7/net/ipv6/fib6_rules.c ---- linux-4.4.116/net/ipv6/fib6_rules.c 2018-02-22 21:20:03.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/net/ipv6/fib6_rules.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/net/ipv6/fib6_rules.c linux-4.4.161-vs2.3.9.8/net/ipv6/fib6_rules.c +--- linux-4.4.161/net/ipv6/fib6_rules.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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, @@ -24184,9 +24207,9 @@ diff -NurpP --minimal linux-4.4.116/net/ipv6/fib6_rules.c linux-4.4.116-vs2.3.9. goto again; if (!ipv6_prefix_equal(&saddr, &r->src.addr, r->src.plen)) -diff -NurpP --minimal linux-4.4.116/net/ipv6/inet6_hashtables.c linux-4.4.116-vs2.3.9.7/net/ipv6/inet6_hashtables.c ---- linux-4.4.116/net/ipv6/inet6_hashtables.c 2016-07-05 04:15:14.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/net/ipv6/inet6_hashtables.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/net/ipv6/inet6_hashtables.c linux-4.4.161-vs2.3.9.8/net/ipv6/inet6_hashtables.c +--- linux-4.4.161/net/ipv6/inet6_hashtables.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/net/ipv6/inet6_hashtables.c 2018-10-20 04:57:21.000000000 +0000 @@ -16,6 +16,7 @@ #include @@ -24213,9 +24236,9 @@ diff -NurpP --minimal linux-4.4.116/net/ipv6/inet6_hashtables.c linux-4.4.116-vs } if (sk->sk_bound_dev_if) { if (sk->sk_bound_dev_if != dif) -diff -NurpP --minimal linux-4.4.116/net/ipv6/ip6_fib.c linux-4.4.116-vs2.3.9.7/net/ipv6/ip6_fib.c ---- linux-4.4.116/net/ipv6/ip6_fib.c 2018-02-22 21:20:03.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/net/ipv6/ip6_fib.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/net/ipv6/ip6_fib.c linux-4.4.161-vs2.3.9.8/net/ipv6/ip6_fib.c +--- linux-4.4.161/net/ipv6/ip6_fib.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-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 struct rt6_info *rt = v; struct ipv6_route_iter *iter = seq->private; @@ -24224,10 +24247,10 @@ diff -NurpP --minimal linux-4.4.116/net/ipv6/ip6_fib.c linux-4.4.116-vs2.3.9.7/n seq_printf(seq, "%pi6 %02x ", &rt->rt6i_dst.addr, rt->rt6i_dst.plen); #ifdef CONFIG_IPV6_SUBTREES -diff -NurpP --minimal linux-4.4.116/net/ipv6/ip6_output.c linux-4.4.116-vs2.3.9.7/net/ipv6/ip6_output.c ---- linux-4.4.116/net/ipv6/ip6_output.c 2018-02-22 21:20:03.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/net/ipv6/ip6_output.c 2018-02-10 15:16:50.000000000 +0000 -@@ -941,7 +941,8 @@ static int ip6_dst_lookup_tail(struct ne +diff -NurpP --minimal linux-4.4.161/net/ipv6/ip6_output.c linux-4.4.161-vs2.3.9.8/net/ipv6/ip6_output.c +--- linux-4.4.161/net/ipv6/ip6_output.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/net/ipv6/ip6_output.c 2018-10-20 05:50:20.000000000 +0000 +@@ -943,7 +943,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, sk ? inet6_sk(sk)->srcprefs : 0, @@ -24237,9 +24260,9 @@ diff -NurpP --minimal linux-4.4.116/net/ipv6/ip6_output.c linux-4.4.116-vs2.3.9. if (err) goto out_err_release; -diff -NurpP --minimal linux-4.4.116/net/ipv6/ndisc.c linux-4.4.116-vs2.3.9.7/net/ipv6/ndisc.c ---- linux-4.4.116/net/ipv6/ndisc.c 2016-07-05 04:15:14.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/net/ipv6/ndisc.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/net/ipv6/ndisc.c linux-4.4.161-vs2.3.9.8/net/ipv6/ndisc.c +--- linux-4.4.161/net/ipv6/ndisc.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/net/ipv6/ndisc.c 2018-10-20 04:57:21.000000000 +0000 @@ -501,7 +501,7 @@ void ndisc_send_na(struct net_device *de } else { if (ipv6_dev_get_saddr(dev_net(dev), dev, daddr, @@ -24249,9 +24272,9 @@ diff -NurpP --minimal linux-4.4.116/net/ipv6/ndisc.c linux-4.4.116-vs2.3.9.7/net return; src_addr = &tmpaddr; } -diff -NurpP --minimal linux-4.4.116/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c linux-4.4.116-vs2.3.9.7/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c ---- linux-4.4.116/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c 2016-07-05 04:15:14.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c 2018-01-09 17:04:44.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c linux-4.4.161-vs2.3.9.8/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c +--- linux-4.4.161/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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)); @@ -24261,9 +24284,9 @@ diff -NurpP --minimal linux-4.4.116/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c return NF_DROP; nfct_nat(ct)->masq_index = out->ifindex; -diff -NurpP --minimal linux-4.4.116/net/ipv6/raw.c linux-4.4.116-vs2.3.9.7/net/ipv6/raw.c ---- linux-4.4.116/net/ipv6/raw.c 2018-02-22 21:20:03.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/net/ipv6/raw.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/net/ipv6/raw.c linux-4.4.161-vs2.3.9.8/net/ipv6/raw.c +--- linux-4.4.161/net/ipv6/raw.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/net/ipv6/raw.c 2018-10-20 04:57:21.000000000 +0000 @@ -30,6 +30,7 @@ #include #include @@ -24286,9 +24309,9 @@ diff -NurpP --minimal linux-4.4.116/net/ipv6/raw.c linux-4.4.116-vs2.3.9.7/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.116/net/ipv6/route.c linux-4.4.116-vs2.3.9.7/net/ipv6/route.c ---- linux-4.4.116/net/ipv6/route.c 2018-02-22 21:20:03.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/net/ipv6/route.c 2018-01-09 17:03:24.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/net/ipv6/route.c linux-4.4.161-vs2.3.9.8/net/ipv6/route.c +--- linux-4.4.161/net/ipv6/route.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/net/ipv6/route.c 2018-10-20 04:57:21.000000000 +0000 @@ -62,6 +62,7 @@ #include #include @@ -24297,7 +24320,7 @@ diff -NurpP --minimal linux-4.4.116/net/ipv6/route.c linux-4.4.116-vs2.3.9.7/net #include -@@ -2545,16 +2546,18 @@ int ip6_route_get_saddr(struct net *net, +@@ -2549,16 +2550,18 @@ int ip6_route_get_saddr(struct net *net, struct rt6_info *rt, const struct in6_addr *daddr, unsigned int prefs, @@ -24319,7 +24342,7 @@ diff -NurpP --minimal linux-4.4.116/net/ipv6/route.c linux-4.4.116-vs2.3.9.7/net return err; } -@@ -3168,7 +3171,8 @@ static int rt6_fill_node(struct net *net +@@ -3174,7 +3177,8 @@ static int rt6_fill_node(struct net *net goto nla_put_failure; } else if (dst) { struct in6_addr saddr_buf; @@ -24329,9 +24352,9 @@ diff -NurpP --minimal linux-4.4.116/net/ipv6/route.c linux-4.4.116-vs2.3.9.7/net nla_put_in6_addr(skb, RTA_PREFSRC, &saddr_buf)) goto nla_put_failure; } -diff -NurpP --minimal linux-4.4.116/net/ipv6/tcp_ipv6.c linux-4.4.116-vs2.3.9.7/net/ipv6/tcp_ipv6.c ---- linux-4.4.116/net/ipv6/tcp_ipv6.c 2018-02-22 21:20:04.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/net/ipv6/tcp_ipv6.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/net/ipv6/tcp_ipv6.c linux-4.4.161-vs2.3.9.8/net/ipv6/tcp_ipv6.c +--- linux-4.4.161/net/ipv6/tcp_ipv6.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/net/ipv6/tcp_ipv6.c 2018-10-20 05:50:20.000000000 +0000 @@ -69,6 +69,7 @@ #include @@ -24364,9 +24387,9 @@ diff -NurpP --minimal linux-4.4.116/net/ipv6/tcp_ipv6.c linux-4.4.116-vs2.3.9.7/ } addr_type = ipv6_addr_type(&usin->sin6_addr); -diff -NurpP --minimal linux-4.4.116/net/ipv6/udp.c linux-4.4.116-vs2.3.9.7/net/ipv6/udp.c ---- linux-4.4.116/net/ipv6/udp.c 2018-02-22 21:20:04.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/net/ipv6/udp.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/net/ipv6/udp.c linux-4.4.161-vs2.3.9.8/net/ipv6/udp.c +--- linux-4.4.161/net/ipv6/udp.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/net/ipv6/udp.c 2018-10-20 04:57:21.000000000 +0000 @@ -47,6 +47,7 @@ #include #include @@ -24460,9 +24483,9 @@ diff -NurpP --minimal linux-4.4.116/net/ipv6/udp.c linux-4.4.116-vs2.3.9.7/net/i } if (!ipv6_addr_any(&sk->sk_v6_rcv_saddr)) { -diff -NurpP --minimal linux-4.4.116/net/ipv6/xfrm6_policy.c linux-4.4.116-vs2.3.9.7/net/ipv6/xfrm6_policy.c ---- linux-4.4.116/net/ipv6/xfrm6_policy.c 2016-07-05 04:15:14.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/net/ipv6/xfrm6_policy.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/net/ipv6/xfrm6_policy.c linux-4.4.161-vs2.3.9.8/net/ipv6/xfrm6_policy.c +--- linux-4.4.161/net/ipv6/xfrm6_policy.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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; @@ -24473,9 +24496,9 @@ diff -NurpP --minimal linux-4.4.116/net/ipv6/xfrm6_policy.c linux-4.4.116-vs2.3. dst_release(dst); return 0; } -diff -NurpP --minimal linux-4.4.116/net/netfilter/ipvs/ip_vs_xmit.c linux-4.4.116-vs2.3.9.7/net/netfilter/ipvs/ip_vs_xmit.c ---- linux-4.4.116/net/netfilter/ipvs/ip_vs_xmit.c 2016-07-05 04:15:15.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/net/netfilter/ipvs/ip_vs_xmit.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/net/netfilter/ipvs/ip_vs_xmit.c linux-4.4.161-vs2.3.9.8/net/netfilter/ipvs/ip_vs_xmit.c +--- linux-4.4.161/net/netfilter/ipvs/ip_vs_xmit.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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) && @@ -24485,10 +24508,10 @@ diff -NurpP --minimal linux-4.4.116/net/netfilter/ipvs/ip_vs_xmit.c linux-4.4.11 goto out_err; if (do_xfrm) { dst = xfrm_lookup(net, dst, flowi6_to_flowi(&fl6), NULL, 0); -diff -NurpP --minimal linux-4.4.116/net/netlink/af_netlink.c linux-4.4.116-vs2.3.9.7/net/netlink/af_netlink.c ---- linux-4.4.116/net/netlink/af_netlink.c 2018-02-22 21:20:06.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/net/netlink/af_netlink.c 2018-01-09 16:36:34.000000000 +0000 -@@ -62,6 +62,8 @@ +diff -NurpP --minimal linux-4.4.161/net/netlink/af_netlink.c linux-4.4.161-vs2.3.9.8/net/netlink/af_netlink.c +--- linux-4.4.161/net/netlink/af_netlink.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/net/netlink/af_netlink.c 2018-10-20 05:53:02.000000000 +0000 +@@ -63,6 +63,8 @@ #include #include #include @@ -24497,7 +24520,7 @@ diff -NurpP --minimal linux-4.4.116/net/netlink/af_netlink.c linux-4.4.116-vs2.3 #include #include -@@ -2460,7 +2462,8 @@ static void *__netlink_seq_next(struct s +@@ -2472,7 +2474,8 @@ static void *__netlink_seq_next(struct s if (err) return ERR_PTR(err); } @@ -24507,10 +24530,30 @@ diff -NurpP --minimal linux-4.4.116/net/netlink/af_netlink.c linux-4.4.116-vs2.3 return nlk; } -diff -NurpP --minimal linux-4.4.116/net/socket.c linux-4.4.116-vs2.3.9.7/net/socket.c ---- linux-4.4.116/net/socket.c 2018-02-22 21:20:07.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/net/socket.c 2018-02-10 15:16:50.000000000 +0000 -@@ -99,10 +99,12 @@ +diff -NurpP --minimal linux-4.4.161/net/packet/diag.c linux-4.4.161-vs2.3.9.8/net/packet/diag.c +--- linux-4.4.161/net/packet/diag.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/net/packet/diag.c 2018-10-20 04:57:21.000000000 +0000 +@@ -4,6 +4,7 @@ + #include + #include + #include ++#include + #include + #include + +@@ -201,6 +202,8 @@ static int packet_diag_dump(struct sk_bu + sk_for_each(sk, &net->packet.sklist) { + if (!net_eq(sock_net(sk), net)) + continue; ++ if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)) ++ continue; + if (num < s_num) + goto next; + +diff -NurpP --minimal linux-4.4.161/net/socket.c linux-4.4.161-vs2.3.9.8/net/socket.c +--- linux-4.4.161/net/socket.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/net/socket.c 2018-10-20 05:50:20.000000000 +0000 +@@ -100,10 +100,12 @@ #include #include @@ -24524,7 +24567,7 @@ diff -NurpP --minimal linux-4.4.116/net/socket.c linux-4.4.116-vs2.3.9.7/net/soc #include #include #include -@@ -608,8 +610,24 @@ EXPORT_SYMBOL(__sock_tx_timestamp); +@@ -609,8 +611,24 @@ EXPORT_SYMBOL(__sock_tx_timestamp); static inline int sock_sendmsg_nosec(struct socket *sock, struct msghdr *msg) { @@ -24551,7 +24594,7 @@ diff -NurpP --minimal linux-4.4.116/net/socket.c linux-4.4.116-vs2.3.9.7/net/soc return ret; } -@@ -1100,6 +1118,13 @@ int __sock_create(struct net *net, int f +@@ -1101,6 +1119,13 @@ int __sock_create(struct net *net, int f if (type < 0 || type >= SOCK_MAX) return -EINVAL; @@ -24565,7 +24608,7 @@ diff -NurpP --minimal linux-4.4.116/net/socket.c linux-4.4.116-vs2.3.9.7/net/soc /* Compatibility. This uglymoron is moved from INET layer to here to avoid -@@ -1234,6 +1259,7 @@ SYSCALL_DEFINE3(socket, int, family, int +@@ -1235,6 +1260,7 @@ SYSCALL_DEFINE3(socket, int, family, int if (retval < 0) goto out; @@ -24573,7 +24616,7 @@ diff -NurpP --minimal linux-4.4.116/net/socket.c linux-4.4.116-vs2.3.9.7/net/soc retval = sock_map_fd(sock, flags & (O_CLOEXEC | O_NONBLOCK)); if (retval < 0) goto out_release; -@@ -1275,10 +1301,12 @@ SYSCALL_DEFINE4(socketpair, int, family, +@@ -1276,10 +1302,12 @@ SYSCALL_DEFINE4(socketpair, int, family, err = sock_create(family, type, protocol, &sock1); if (err < 0) goto out; @@ -24586,9 +24629,9 @@ diff -NurpP --minimal linux-4.4.116/net/socket.c linux-4.4.116-vs2.3.9.7/net/soc err = sock1->ops->socketpair(sock1, sock2); if (err < 0) -diff -NurpP --minimal linux-4.4.116/net/sunrpc/auth.c linux-4.4.116-vs2.3.9.7/net/sunrpc/auth.c ---- linux-4.4.116/net/sunrpc/auth.c 2015-10-29 09:21:46.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/net/sunrpc/auth.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/net/sunrpc/auth.c linux-4.4.161-vs2.3.9.8/net/sunrpc/auth.c +--- linux-4.4.161/net/sunrpc/auth.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/net/sunrpc/auth.c 2018-10-20 04:57:21.000000000 +0000 @@ -15,6 +15,7 @@ #include #include @@ -24613,9 +24656,9 @@ diff -NurpP --minimal linux-4.4.116/net/sunrpc/auth.c linux-4.4.116-vs2.3.9.7/ne }; dprintk("RPC: %5u looking up %s cred\n", -diff -NurpP --minimal linux-4.4.116/net/sunrpc/auth_unix.c linux-4.4.116-vs2.3.9.7/net/sunrpc/auth_unix.c ---- linux-4.4.116/net/sunrpc/auth_unix.c 2016-07-05 04:12:45.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/net/sunrpc/auth_unix.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/net/sunrpc/auth_unix.c linux-4.4.161-vs2.3.9.8/net/sunrpc/auth_unix.c +--- linux-4.4.161/net/sunrpc/auth_unix.c 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/net/sunrpc/auth_unix.c 2018-10-20 04:57:21.000000000 +0000 @@ -13,11 +13,13 @@ #include #include @@ -24672,9 +24715,9 @@ diff -NurpP --minimal linux-4.4.116/net/sunrpc/auth_unix.c linux-4.4.116-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.116/net/sunrpc/clnt.c linux-4.4.116-vs2.3.9.7/net/sunrpc/clnt.c ---- linux-4.4.116/net/sunrpc/clnt.c 2018-02-22 21:20:07.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/net/sunrpc/clnt.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/net/sunrpc/clnt.c linux-4.4.161-vs2.3.9.8/net/sunrpc/clnt.c +--- linux-4.4.161/net/sunrpc/clnt.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/net/sunrpc/clnt.c 2018-10-20 04:57:21.000000000 +0000 @@ -31,6 +31,7 @@ #include #include @@ -24693,9 +24736,9 @@ diff -NurpP --minimal linux-4.4.116/net/sunrpc/clnt.c linux-4.4.116-vs2.3.9.7/ne return clnt; } -diff -NurpP --minimal linux-4.4.116/net/unix/af_unix.c linux-4.4.116-vs2.3.9.7/net/unix/af_unix.c ---- linux-4.4.116/net/unix/af_unix.c 2018-02-22 21:20:07.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/net/unix/af_unix.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/net/unix/af_unix.c linux-4.4.161-vs2.3.9.8/net/unix/af_unix.c +--- linux-4.4.161/net/unix/af_unix.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/net/unix/af_unix.c 2018-10-20 04:57:21.000000000 +0000 @@ -117,6 +117,8 @@ #include #include @@ -24732,9 +24775,29 @@ diff -NurpP --minimal linux-4.4.116/net/unix/af_unix.c linux-4.4.116-vs2.3.9.7/n if (sock_net(sk) == seq_file_net(seq)) return sk; } -diff -NurpP --minimal linux-4.4.116/scripts/checksyscalls.sh linux-4.4.116-vs2.3.9.7/scripts/checksyscalls.sh ---- linux-4.4.116/scripts/checksyscalls.sh 2015-10-29 09:21:46.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/scripts/checksyscalls.sh 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/net/unix/diag.c linux-4.4.161-vs2.3.9.8/net/unix/diag.c +--- linux-4.4.161/net/unix/diag.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/net/unix/diag.c 2018-10-20 04:57:21.000000000 +0000 +@@ -4,6 +4,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -199,6 +200,8 @@ static int unix_diag_dump(struct sk_buff + sk_for_each(sk, &unix_socket_table[slot]) { + if (!net_eq(sock_net(sk), net)) + continue; ++ if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)) ++ continue; + if (num < s_num) + goto next; + if (!(req->udiag_states & (1 << sk->sk_state))) +diff -NurpP --minimal linux-4.4.161/scripts/checksyscalls.sh linux-4.4.161-vs2.3.9.8/scripts/checksyscalls.sh +--- linux-4.4.161/scripts/checksyscalls.sh 2016-01-10 23:01:32.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/scripts/checksyscalls.sh 2018-10-20 04:57:21.000000000 +0000 @@ -196,7 +196,6 @@ cat << EOF #define __IGNORE_afs_syscall #define __IGNORE_getpmsg @@ -24743,9 +24806,9 @@ diff -NurpP --minimal linux-4.4.116/scripts/checksyscalls.sh linux-4.4.116-vs2.3 EOF } -diff -NurpP --minimal linux-4.4.116/security/commoncap.c linux-4.4.116-vs2.3.9.7/security/commoncap.c ---- linux-4.4.116/security/commoncap.c 2018-02-22 21:20:08.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/security/commoncap.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/security/commoncap.c linux-4.4.161-vs2.3.9.8/security/commoncap.c +--- linux-4.4.161/security/commoncap.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/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) @@ -24787,9 +24850,9 @@ diff -NurpP --minimal linux-4.4.116/security/commoncap.c linux-4.4.116-vs2.3.9.7 return -EPERM; return 0; } -diff -NurpP --minimal linux-4.4.116/security/selinux/hooks.c linux-4.4.116-vs2.3.9.7/security/selinux/hooks.c ---- linux-4.4.116/security/selinux/hooks.c 2018-02-22 21:20:08.000000000 +0000 -+++ linux-4.4.116-vs2.3.9.7/security/selinux/hooks.c 2018-02-10 15:16:50.000000000 +0000 +diff -NurpP --minimal linux-4.4.161/security/selinux/hooks.c linux-4.4.161-vs2.3.9.8/security/selinux/hooks.c +--- linux-4.4.161/security/selinux/hooks.c 2018-10-20 02:34:31.000000000 +0000 ++++ linux-4.4.161-vs2.3.9.8/security/selinux/hooks.c 2018-10-20 04:57:21.000000000 +0000 @@ -67,7 +67,6 @@ #include #include diff --git a/kernel.spec b/kernel.spec index 35457d91..11a7a3b5 100644 --- a/kernel.spec +++ b/kernel.spec @@ -192,8 +192,8 @@ Patch59: kernel-rndis_host-wm5.patch # http://patches.aircrack-ng.org/hostap-kernel-2.6.18.patch Patch85: kernel-hostap.patch -%define vserver_patch 4.4.116-vs2.3.9.7 -# http://vserver.13thfloor.at/Experimental/patch-4.4.113-vs2.3.9.6.diff +%define vserver_patch 4.4.161-vs2.3.9.8 +# http://vserver.13thfloor.at/Experimental/patch-4.4.161-vs2.3.9.8.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) -- 2.44.0