[packages/kernel/LINUX_4_9] - up to 4.9.218; vserver patch up to 4.9.217-vs2.3.9.12
arekm
arekm at pld-linux.org
Fri Apr 3 09:16:02 CEST 2020
commit 6690eb62573d9fb3dd4e8cdd04078d8bd95c6747
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Fri Apr 3 09:15:53 2020 +0200
- up to 4.9.218; vserver patch up to 4.9.217-vs2.3.9.12
kernel-vserver-2.3.patch | 2442 ++++++++++++++++++++++----------------------
kernel-vserver-fixes.patch | 16 +-
kernel.spec | 8 +-
3 files changed, 1237 insertions(+), 1229 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 69e6d768..49f1ff22 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -73,7 +73,7 @@
%define rel 1
%define basever 4.9
-%define postver .217
+%define postver .218
# define this to '-%{basever}' for longterm branch
%define versuffix -%{basever}
@@ -125,7 +125,7 @@ Source0: https://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz
# Source0-md5: 0a68ef3615c64bd5ee54a3320e46667d
%if "%{postver}" != ".0"
Patch0: https://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
-# Patch0-md5: 956b21b553d3de0d906525e23e267268
+# Patch0-md5: 723a1dfb12f45833385e17ca6e3b4934
%endif
Source1: kernel.sysconfig
@@ -187,8 +187,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.9.207-vs2.3.9.11
-# http://vserver.13thfloor.at/Experimental/patch-4.9.207-vs2.3.9.11.diff
+%define vserver_patch 4.9.217-vs2.3.9.12
+# http://vserver.13thfloor.at/Experimental/patch-4.9.217-vs2.3.9.12.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)
diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index 3d91691e..cf28e55e 100644
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -1,6 +1,6 @@
-diff -NurpP --minimal linux-4.9.207/arch/alpha/Kconfig linux-4.9.207-vs2.3.9.11/arch/alpha/Kconfig
---- linux-4.9.207/arch/alpha/Kconfig 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/arch/alpha/Kconfig 2018-10-20 04:58:12.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/arch/alpha/Kconfig linux-4.9.217-vs2.3.9.12/arch/alpha/Kconfig
+--- linux-4.9.217/arch/alpha/Kconfig 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/arch/alpha/Kconfig 2018-10-20 04:58:12.000000000 +0000
@@ -743,6 +743,8 @@ config DUMMY_CONSOLE
depends on VGA_HOSE
default y
@@ -10,9 +10,9 @@ diff -NurpP --minimal linux-4.9.207/arch/alpha/Kconfig linux-4.9.207-vs2.3.9.11/
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.9.207/arch/alpha/kernel/systbls.S linux-4.9.207-vs2.3.9.11/arch/alpha/kernel/systbls.S
---- linux-4.9.207/arch/alpha/kernel/systbls.S 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/arch/alpha/kernel/systbls.S 2018-10-20 04:58:12.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/arch/alpha/kernel/systbls.S linux-4.9.217-vs2.3.9.12/arch/alpha/kernel/systbls.S
+--- linux-4.9.217/arch/alpha/kernel/systbls.S 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/arch/alpha/kernel/systbls.S 2018-10-20 04:58:12.000000000 +0000
@@ -446,7 +446,7 @@ sys_call_table:
.quad sys_stat64 /* 425 */
.quad sys_lstat64
@@ -22,9 +22,9 @@ diff -NurpP --minimal linux-4.9.207/arch/alpha/kernel/systbls.S linux-4.9.207-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.9.207/arch/alpha/kernel/traps.c linux-4.9.207-vs2.3.9.11/arch/alpha/kernel/traps.c
---- linux-4.9.207/arch/alpha/kernel/traps.c 2019-12-25 15:27:26.328464250 +0000
-+++ linux-4.9.207-vs2.3.9.11/arch/alpha/kernel/traps.c 2018-10-20 04:58:12.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/arch/alpha/kernel/traps.c linux-4.9.217-vs2.3.9.12/arch/alpha/kernel/traps.c
+--- linux-4.9.217/arch/alpha/kernel/traps.c 2020-03-27 00:50:40.331132545 +0000
++++ linux-4.9.217-vs2.3.9.12/arch/alpha/kernel/traps.c 2018-10-20 04:58:12.000000000 +0000
@@ -179,7 +179,8 @@ die_if_kernel(char * str, struct pt_regs
#ifdef CONFIG_SMP
printk("CPU %d ", hard_smp_processor_id());
@@ -35,9 +35,9 @@ diff -NurpP --minimal linux-4.9.207/arch/alpha/kernel/traps.c linux-4.9.207-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.9.207/arch/arm/Kconfig linux-4.9.207-vs2.3.9.11/arch/arm/Kconfig
---- linux-4.9.207/arch/arm/Kconfig 2019-12-25 15:27:26.428462634 +0000
-+++ linux-4.9.207-vs2.3.9.11/arch/arm/Kconfig 2019-10-05 14:58:36.470454583 +0000
+diff -NurpP --minimal linux-4.9.217/arch/arm/Kconfig linux-4.9.217-vs2.3.9.12/arch/arm/Kconfig
+--- linux-4.9.217/arch/arm/Kconfig 2020-03-27 00:50:40.441130813 +0000
++++ linux-4.9.217-vs2.3.9.12/arch/arm/Kconfig 2020-04-01 09:39:57.315984093 +0000
@@ -2200,6 +2200,8 @@ source "fs/Kconfig"
source "arch/arm/Kconfig.debug"
@@ -47,9 +47,9 @@ diff -NurpP --minimal linux-4.9.207/arch/arm/Kconfig linux-4.9.207-vs2.3.9.11/ar
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.9.207/arch/arm/kernel/calls.S linux-4.9.207-vs2.3.9.11/arch/arm/kernel/calls.S
---- linux-4.9.207/arch/arm/kernel/calls.S 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/arch/arm/kernel/calls.S 2018-10-20 04:58:12.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/arch/arm/kernel/calls.S linux-4.9.217-vs2.3.9.12/arch/arm/kernel/calls.S
+--- linux-4.9.217/arch/arm/kernel/calls.S 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/arch/arm/kernel/calls.S 2018-10-20 04:58:12.000000000 +0000
@@ -322,7 +322,7 @@
/* 310 */ CALL(sys_request_key)
CALL(sys_keyctl)
@@ -59,9 +59,9 @@ diff -NurpP --minimal linux-4.9.207/arch/arm/kernel/calls.S linux-4.9.207-vs2.3.
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-4.9.207/arch/arm/kernel/traps.c linux-4.9.207-vs2.3.9.11/arch/arm/kernel/traps.c
---- linux-4.9.207/arch/arm/kernel/traps.c 2019-12-25 15:27:26.938454388 +0000
-+++ linux-4.9.207-vs2.3.9.11/arch/arm/kernel/traps.c 2018-10-20 04:58:12.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/arch/arm/kernel/traps.c linux-4.9.217-vs2.3.9.12/arch/arm/kernel/traps.c
+--- linux-4.9.217/arch/arm/kernel/traps.c 2020-03-27 00:50:40.901123578 +0000
++++ linux-4.9.217-vs2.3.9.12/arch/arm/kernel/traps.c 2018-10-20 04:58:12.000000000 +0000
@@ -279,8 +279,8 @@ static int __die(const char *str, int er
print_modules();
@@ -73,9 +73,9 @@ diff -NurpP --minimal linux-4.9.207/arch/arm/kernel/traps.c linux-4.9.207-vs2.3.
if (!user_mode(regs) || in_interrupt()) {
dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-4.9.207/arch/cris/Kconfig linux-4.9.207-vs2.3.9.11/arch/cris/Kconfig
---- linux-4.9.207/arch/cris/Kconfig 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/arch/cris/Kconfig 2018-10-20 04:58:12.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/arch/cris/Kconfig linux-4.9.217-vs2.3.9.12/arch/cris/Kconfig
+--- linux-4.9.217/arch/cris/Kconfig 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/arch/cris/Kconfig 2018-10-20 04:58:12.000000000 +0000
@@ -583,6 +583,8 @@ source "fs/Kconfig"
source "arch/cris/Kconfig.debug"
@@ -85,9 +85,9 @@ diff -NurpP --minimal linux-4.9.207/arch/cris/Kconfig linux-4.9.207-vs2.3.9.11/a
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.9.207/arch/ia64/Kconfig linux-4.9.207-vs2.3.9.11/arch/ia64/Kconfig
---- linux-4.9.207/arch/ia64/Kconfig 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/arch/ia64/Kconfig 2018-10-20 04:58:12.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/arch/ia64/Kconfig linux-4.9.217-vs2.3.9.12/arch/ia64/Kconfig
+--- linux-4.9.217/arch/ia64/Kconfig 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/arch/ia64/Kconfig 2018-10-20 04:58:12.000000000 +0000
@@ -602,6 +602,8 @@ source "fs/Kconfig"
source "arch/ia64/Kconfig.debug"
@@ -97,9 +97,9 @@ diff -NurpP --minimal linux-4.9.207/arch/ia64/Kconfig linux-4.9.207-vs2.3.9.11/a
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.9.207/arch/ia64/kernel/entry.S linux-4.9.207-vs2.3.9.11/arch/ia64/kernel/entry.S
---- linux-4.9.207/arch/ia64/kernel/entry.S 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/arch/ia64/kernel/entry.S 2018-10-20 04:58:12.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/arch/ia64/kernel/entry.S linux-4.9.217-vs2.3.9.12/arch/ia64/kernel/entry.S
+--- linux-4.9.217/arch/ia64/kernel/entry.S 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/arch/ia64/kernel/entry.S 2018-10-20 04:58:12.000000000 +0000
@@ -1697,7 +1697,7 @@ sys_call_table:
data8 sys_mq_notify
data8 sys_mq_getsetattr
@@ -109,9 +109,9 @@ diff -NurpP --minimal linux-4.9.207/arch/ia64/kernel/entry.S linux-4.9.207-vs2.3
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -NurpP --minimal linux-4.9.207/arch/ia64/kernel/ptrace.c linux-4.9.207-vs2.3.9.11/arch/ia64/kernel/ptrace.c
---- linux-4.9.207/arch/ia64/kernel/ptrace.c 2019-12-25 15:27:28.308432237 +0000
-+++ linux-4.9.207-vs2.3.9.11/arch/ia64/kernel/ptrace.c 2018-10-20 04:58:12.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/arch/ia64/kernel/ptrace.c linux-4.9.217-vs2.3.9.12/arch/ia64/kernel/ptrace.c
+--- linux-4.9.217/arch/ia64/kernel/ptrace.c 2020-03-27 00:50:42.241102503 +0000
++++ linux-4.9.217-vs2.3.9.12/arch/ia64/kernel/ptrace.c 2018-10-20 04:58:12.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/regset.h>
#include <linux/elf.h>
@@ -120,9 +120,9 @@ diff -NurpP --minimal linux-4.9.207/arch/ia64/kernel/ptrace.c linux-4.9.207-vs2.
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-4.9.207/arch/ia64/kernel/traps.c linux-4.9.207-vs2.3.9.11/arch/ia64/kernel/traps.c
---- linux-4.9.207/arch/ia64/kernel/traps.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/arch/ia64/kernel/traps.c 2018-10-20 04:58:12.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/arch/ia64/kernel/traps.c linux-4.9.217-vs2.3.9.12/arch/ia64/kernel/traps.c
+--- linux-4.9.217/arch/ia64/kernel/traps.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/arch/ia64/kernel/traps.c 2018-10-20 04:58:12.000000000 +0000
@@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re
put_cpu();
@@ -147,9 +147,9 @@ diff -NurpP --minimal linux-4.9.207/arch/ia64/kernel/traps.c linux-4.9.207-vs2.3
}
}
}
-diff -NurpP --minimal linux-4.9.207/arch/m32r/kernel/traps.c linux-4.9.207-vs2.3.9.11/arch/m32r/kernel/traps.c
---- linux-4.9.207/arch/m32r/kernel/traps.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/arch/m32r/kernel/traps.c 2018-10-20 04:58:12.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/arch/m32r/kernel/traps.c linux-4.9.217-vs2.3.9.12/arch/m32r/kernel/traps.c
+--- linux-4.9.217/arch/m32r/kernel/traps.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/arch/m32r/kernel/traps.c 2018-10-20 04:58:12.000000000 +0000
@@ -184,8 +184,9 @@ static void show_registers(struct pt_reg
} else {
printk("SPI: %08lx\n", sp);
@@ -162,9 +162,9 @@ diff -NurpP --minimal linux-4.9.207/arch/m32r/kernel/traps.c linux-4.9.207-vs2.3
/*
* When in-kernel, we also print out the stack and code at the
-diff -NurpP --minimal linux-4.9.207/arch/m68k/Kconfig linux-4.9.207-vs2.3.9.11/arch/m68k/Kconfig
---- linux-4.9.207/arch/m68k/Kconfig 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/arch/m68k/Kconfig 2018-10-20 04:58:12.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/arch/m68k/Kconfig linux-4.9.217-vs2.3.9.12/arch/m68k/Kconfig
+--- linux-4.9.217/arch/m68k/Kconfig 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/arch/m68k/Kconfig 2018-10-20 04:58:12.000000000 +0000
@@ -163,6 +163,8 @@ source "fs/Kconfig"
source "arch/m68k/Kconfig.debug"
@@ -174,9 +174,9 @@ diff -NurpP --minimal linux-4.9.207/arch/m68k/Kconfig linux-4.9.207-vs2.3.9.11/a
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.9.207/arch/mips/Kconfig linux-4.9.207-vs2.3.9.11/arch/mips/Kconfig
---- linux-4.9.207/arch/mips/Kconfig 2019-12-25 15:27:28.488429329 +0000
-+++ linux-4.9.207-vs2.3.9.11/arch/mips/Kconfig 2019-12-25 15:37:43.808561393 +0000
+diff -NurpP --minimal linux-4.9.217/arch/mips/Kconfig linux-4.9.217-vs2.3.9.12/arch/mips/Kconfig
+--- linux-4.9.217/arch/mips/Kconfig 2020-03-27 00:50:42.451099201 +0000
++++ linux-4.9.217-vs2.3.9.12/arch/mips/Kconfig 2019-12-25 15:37:43.808561393 +0000
@@ -3193,6 +3193,8 @@ source "fs/Kconfig"
source "arch/mips/Kconfig.debug"
@@ -186,9 +186,9 @@ diff -NurpP --minimal linux-4.9.207/arch/mips/Kconfig linux-4.9.207-vs2.3.9.11/a
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.9.207/arch/mips/kernel/ptrace.c linux-4.9.207-vs2.3.9.11/arch/mips/kernel/ptrace.c
---- linux-4.9.207/arch/mips/kernel/ptrace.c 2019-12-25 15:27:28.848423509 +0000
-+++ linux-4.9.207-vs2.3.9.11/arch/mips/kernel/ptrace.c 2018-10-20 05:55:33.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/arch/mips/kernel/ptrace.c linux-4.9.217-vs2.3.9.12/arch/mips/kernel/ptrace.c
+--- linux-4.9.217/arch/mips/kernel/ptrace.c 2020-03-27 00:50:42.811093539 +0000
++++ linux-4.9.217-vs2.3.9.12/arch/mips/kernel/ptrace.c 2018-10-20 05:55:33.000000000 +0000
@@ -30,6 +30,7 @@
#include <linux/audit.h>
#include <linux/seccomp.h>
@@ -207,9 +207,9 @@ diff -NurpP --minimal linux-4.9.207/arch/mips/kernel/ptrace.c linux-4.9.207-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.9.207/arch/mips/kernel/scall32-o32.S linux-4.9.207-vs2.3.9.11/arch/mips/kernel/scall32-o32.S
---- linux-4.9.207/arch/mips/kernel/scall32-o32.S 2019-12-25 15:27:28.848423509 +0000
-+++ linux-4.9.207-vs2.3.9.11/arch/mips/kernel/scall32-o32.S 2018-10-20 04:58:12.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/arch/mips/kernel/scall32-o32.S linux-4.9.217-vs2.3.9.12/arch/mips/kernel/scall32-o32.S
+--- linux-4.9.217/arch/mips/kernel/scall32-o32.S 2020-03-27 00:50:42.811093539 +0000
++++ linux-4.9.217-vs2.3.9.12/arch/mips/kernel/scall32-o32.S 2018-10-20 04:58:12.000000000 +0000
@@ -511,7 +511,7 @@ EXPORT(sys_call_table)
PTR sys_mq_timedreceive
PTR sys_mq_notify /* 4275 */
@@ -219,9 +219,9 @@ diff -NurpP --minimal linux-4.9.207/arch/mips/kernel/scall32-o32.S linux-4.9.207
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-diff -NurpP --minimal linux-4.9.207/arch/mips/kernel/scall64-64.S linux-4.9.207-vs2.3.9.11/arch/mips/kernel/scall64-64.S
---- linux-4.9.207/arch/mips/kernel/scall64-64.S 2019-12-25 15:27:28.848423509 +0000
-+++ linux-4.9.207-vs2.3.9.11/arch/mips/kernel/scall64-64.S 2018-10-20 04:58:12.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/arch/mips/kernel/scall64-64.S linux-4.9.217-vs2.3.9.12/arch/mips/kernel/scall64-64.S
+--- linux-4.9.217/arch/mips/kernel/scall64-64.S 2020-03-27 00:50:42.811093539 +0000
++++ linux-4.9.217-vs2.3.9.12/arch/mips/kernel/scall64-64.S 2018-10-20 04:58:12.000000000 +0000
@@ -348,7 +348,7 @@ EXPORT(sys_call_table)
PTR sys_mq_timedreceive
PTR sys_mq_notify
@@ -231,9 +231,9 @@ diff -NurpP --minimal linux-4.9.207/arch/mips/kernel/scall64-64.S linux-4.9.207-
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-4.9.207/arch/mips/kernel/scall64-n32.S linux-4.9.207-vs2.3.9.11/arch/mips/kernel/scall64-n32.S
---- linux-4.9.207/arch/mips/kernel/scall64-n32.S 2019-12-25 15:27:28.848423509 +0000
-+++ linux-4.9.207-vs2.3.9.11/arch/mips/kernel/scall64-n32.S 2018-10-20 04:58:12.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/arch/mips/kernel/scall64-n32.S linux-4.9.217-vs2.3.9.12/arch/mips/kernel/scall64-n32.S
+--- linux-4.9.217/arch/mips/kernel/scall64-n32.S 2020-03-27 00:50:42.811093539 +0000
++++ linux-4.9.217-vs2.3.9.12/arch/mips/kernel/scall64-n32.S 2018-10-20 04:58:12.000000000 +0000
@@ -343,7 +343,7 @@ EXPORT(sysn32_call_table)
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify
@@ -243,9 +243,9 @@ diff -NurpP --minimal linux-4.9.207/arch/mips/kernel/scall64-n32.S linux-4.9.207
PTR compat_sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-4.9.207/arch/mips/kernel/scall64-o32.S linux-4.9.207-vs2.3.9.11/arch/mips/kernel/scall64-o32.S
---- linux-4.9.207/arch/mips/kernel/scall64-o32.S 2019-12-25 15:27:28.848423509 +0000
-+++ linux-4.9.207-vs2.3.9.11/arch/mips/kernel/scall64-o32.S 2019-10-05 14:58:36.920447392 +0000
+diff -NurpP --minimal linux-4.9.217/arch/mips/kernel/scall64-o32.S linux-4.9.217-vs2.3.9.12/arch/mips/kernel/scall64-o32.S
+--- linux-4.9.217/arch/mips/kernel/scall64-o32.S 2020-03-27 00:50:42.811093539 +0000
++++ linux-4.9.217-vs2.3.9.12/arch/mips/kernel/scall64-o32.S 2019-10-05 14:58:36.920447392 +0000
@@ -499,7 +499,7 @@ EXPORT(sys32_call_table)
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify /* 4275 */
@@ -255,9 +255,9 @@ diff -NurpP --minimal linux-4.9.207/arch/mips/kernel/scall64-o32.S linux-4.9.207
PTR compat_sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-diff -NurpP --minimal linux-4.9.207/arch/mips/kernel/traps.c linux-4.9.207-vs2.3.9.11/arch/mips/kernel/traps.c
---- linux-4.9.207/arch/mips/kernel/traps.c 2019-12-25 15:27:28.848423509 +0000
-+++ linux-4.9.207-vs2.3.9.11/arch/mips/kernel/traps.c 2018-10-20 04:58:13.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/arch/mips/kernel/traps.c linux-4.9.217-vs2.3.9.12/arch/mips/kernel/traps.c
+--- linux-4.9.217/arch/mips/kernel/traps.c 2020-03-27 00:50:42.811093539 +0000
++++ linux-4.9.217-vs2.3.9.12/arch/mips/kernel/traps.c 2018-10-20 04:58:13.000000000 +0000
@@ -361,9 +361,10 @@ void show_registers(struct pt_regs *regs
__show_regs(regs);
@@ -272,9 +272,9 @@ diff -NurpP --minimal linux-4.9.207/arch/mips/kernel/traps.c linux-4.9.207-vs2.3
if (cpu_has_userlocal) {
unsigned long tls;
-diff -NurpP --minimal linux-4.9.207/arch/parisc/Kconfig linux-4.9.207-vs2.3.9.11/arch/parisc/Kconfig
---- linux-4.9.207/arch/parisc/Kconfig 2019-12-25 15:27:29.098419467 +0000
-+++ linux-4.9.207-vs2.3.9.11/arch/parisc/Kconfig 2018-10-20 05:55:33.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/arch/parisc/Kconfig linux-4.9.217-vs2.3.9.12/arch/parisc/Kconfig
+--- linux-4.9.217/arch/parisc/Kconfig 2020-03-27 00:50:43.061089606 +0000
++++ linux-4.9.217-vs2.3.9.12/arch/parisc/Kconfig 2018-10-20 05:55:33.000000000 +0000
@@ -348,6 +348,8 @@ config SECCOMP
If unsure, say Y. Only embedded should say N here.
@@ -284,9 +284,9 @@ diff -NurpP --minimal linux-4.9.207/arch/parisc/Kconfig linux-4.9.207-vs2.3.9.11
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.9.207/arch/parisc/kernel/syscall_table.S linux-4.9.207-vs2.3.9.11/arch/parisc/kernel/syscall_table.S
---- linux-4.9.207/arch/parisc/kernel/syscall_table.S 2019-12-25 15:27:29.198417850 +0000
-+++ linux-4.9.207-vs2.3.9.11/arch/parisc/kernel/syscall_table.S 2018-10-20 04:58:13.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/arch/parisc/kernel/syscall_table.S linux-4.9.217-vs2.3.9.12/arch/parisc/kernel/syscall_table.S
+--- linux-4.9.217/arch/parisc/kernel/syscall_table.S 2020-03-27 00:50:43.151088192 +0000
++++ linux-4.9.217-vs2.3.9.12/arch/parisc/kernel/syscall_table.S 2018-10-20 04:58:13.000000000 +0000
@@ -358,7 +358,7 @@
ENTRY_COMP(mbind) /* 260 */
ENTRY_COMP(get_mempolicy)
@@ -296,9 +296,9 @@ diff -NurpP --minimal linux-4.9.207/arch/parisc/kernel/syscall_table.S linux-4.9
ENTRY_SAME(add_key)
ENTRY_SAME(request_key) /* 265 */
ENTRY_COMP(keyctl)
-diff -NurpP --minimal linux-4.9.207/arch/parisc/kernel/traps.c linux-4.9.207-vs2.3.9.11/arch/parisc/kernel/traps.c
---- linux-4.9.207/arch/parisc/kernel/traps.c 2019-12-25 15:27:29.208417686 +0000
-+++ linux-4.9.207-vs2.3.9.11/arch/parisc/kernel/traps.c 2019-02-22 08:37:49.463155825 +0000
+diff -NurpP --minimal linux-4.9.217/arch/parisc/kernel/traps.c linux-4.9.217-vs2.3.9.12/arch/parisc/kernel/traps.c
+--- linux-4.9.217/arch/parisc/kernel/traps.c 2020-03-27 00:50:43.161088037 +0000
++++ linux-4.9.217-vs2.3.9.12/arch/parisc/kernel/traps.c 2019-02-22 08:37:49.463155825 +0000
@@ -235,8 +235,9 @@ void die_if_kernel(char *str, struct pt_
return; /* STFU */
@@ -322,9 +322,9 @@ diff -NurpP --minimal linux-4.9.207/arch/parisc/kernel/traps.c linux-4.9.207-vs2
/* Wot's wrong wif bein' racy? */
if (current->thread.flags & PARISC_KERNEL_DEATH) {
-diff -NurpP --minimal linux-4.9.207/arch/powerpc/include/uapi/asm/unistd.h linux-4.9.207-vs2.3.9.11/arch/powerpc/include/uapi/asm/unistd.h
---- linux-4.9.207/arch/powerpc/include/uapi/asm/unistd.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/arch/powerpc/include/uapi/asm/unistd.h 2018-10-20 04:58:13.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/arch/powerpc/include/uapi/asm/unistd.h linux-4.9.217-vs2.3.9.12/arch/powerpc/include/uapi/asm/unistd.h
+--- linux-4.9.217/arch/powerpc/include/uapi/asm/unistd.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/arch/powerpc/include/uapi/asm/unistd.h 2018-10-20 04:58:13.000000000 +0000
@@ -275,7 +275,7 @@
#endif
#define __NR_rtas 255
@@ -334,10 +334,10 @@ diff -NurpP --minimal linux-4.9.207/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.9.207/arch/powerpc/Kconfig linux-4.9.207-vs2.3.9.11/arch/powerpc/Kconfig
---- linux-4.9.207/arch/powerpc/Kconfig 2019-12-25 15:27:29.218417525 +0000
-+++ linux-4.9.207-vs2.3.9.11/arch/powerpc/Kconfig 2019-10-05 14:58:37.110444356 +0000
-@@ -1091,6 +1091,8 @@ source "lib/Kconfig"
+diff -NurpP --minimal linux-4.9.217/arch/powerpc/Kconfig linux-4.9.217-vs2.3.9.12/arch/powerpc/Kconfig
+--- linux-4.9.217/arch/powerpc/Kconfig 2020-03-27 00:50:43.171087876 +0000
++++ linux-4.9.217-vs2.3.9.12/arch/powerpc/Kconfig 2020-04-01 09:40:17.695646404 +0000
+@@ -1092,6 +1092,8 @@ source "lib/Kconfig"
source "arch/powerpc/Kconfig.debug"
@@ -346,9 +346,9 @@ diff -NurpP --minimal linux-4.9.207/arch/powerpc/Kconfig linux-4.9.207-vs2.3.9.1
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.9.207/arch/s390/include/asm/tlb.h linux-4.9.207-vs2.3.9.11/arch/s390/include/asm/tlb.h
---- linux-4.9.207/arch/s390/include/asm/tlb.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/arch/s390/include/asm/tlb.h 2018-10-20 04:58:13.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/arch/s390/include/asm/tlb.h linux-4.9.217-vs2.3.9.12/arch/s390/include/asm/tlb.h
+--- linux-4.9.217/arch/s390/include/asm/tlb.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/arch/s390/include/asm/tlb.h 2018-10-20 04:58:13.000000000 +0000
@@ -24,6 +24,7 @@
#include <linux/mm.h>
#include <linux/pagemap.h>
@@ -357,9 +357,9 @@ diff -NurpP --minimal linux-4.9.207/arch/s390/include/asm/tlb.h linux-4.9.207-vs
#include <asm/processor.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-4.9.207/arch/s390/include/uapi/asm/unistd.h linux-4.9.207-vs2.3.9.11/arch/s390/include/uapi/asm/unistd.h
---- linux-4.9.207/arch/s390/include/uapi/asm/unistd.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/arch/s390/include/uapi/asm/unistd.h 2018-10-20 04:58:13.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/arch/s390/include/uapi/asm/unistd.h linux-4.9.217-vs2.3.9.12/arch/s390/include/uapi/asm/unistd.h
+--- linux-4.9.217/arch/s390/include/uapi/asm/unistd.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/arch/s390/include/uapi/asm/unistd.h 2018-10-20 04:58:13.000000000 +0000
@@ -200,7 +200,7 @@
#define __NR_clock_gettime 260
#define __NR_clock_getres 261
@@ -369,9 +369,9 @@ diff -NurpP --minimal linux-4.9.207/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.9.207/arch/s390/Kconfig linux-4.9.207-vs2.3.9.11/arch/s390/Kconfig
---- linux-4.9.207/arch/s390/Kconfig 2019-12-25 15:27:30.238401034 +0000
-+++ linux-4.9.207-vs2.3.9.11/arch/s390/Kconfig 2018-10-20 04:58:13.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/arch/s390/Kconfig linux-4.9.217-vs2.3.9.12/arch/s390/Kconfig
+--- linux-4.9.217/arch/s390/Kconfig 2020-03-27 00:50:44.061073883 +0000
++++ linux-4.9.217-vs2.3.9.12/arch/s390/Kconfig 2018-10-20 04:58:13.000000000 +0000
@@ -775,6 +775,8 @@ source "fs/Kconfig"
source "arch/s390/Kconfig.debug"
@@ -381,9 +381,9 @@ diff -NurpP --minimal linux-4.9.207/arch/s390/Kconfig linux-4.9.207-vs2.3.9.11/a
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.9.207/arch/s390/kernel/ptrace.c linux-4.9.207-vs2.3.9.11/arch/s390/kernel/ptrace.c
---- linux-4.9.207/arch/s390/kernel/ptrace.c 2019-12-25 15:27:30.598395214 +0000
-+++ linux-4.9.207-vs2.3.9.11/arch/s390/kernel/ptrace.c 2018-10-20 04:58:13.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/arch/s390/kernel/ptrace.c linux-4.9.217-vs2.3.9.12/arch/s390/kernel/ptrace.c
+--- linux-4.9.217/arch/s390/kernel/ptrace.c 2020-03-27 00:50:44.171072152 +0000
++++ linux-4.9.217-vs2.3.9.12/arch/s390/kernel/ptrace.c 2018-10-20 04:58:13.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/tracehook.h>
#include <linux/seccomp.h>
@@ -392,9 +392,9 @@ diff -NurpP --minimal linux-4.9.207/arch/s390/kernel/ptrace.c linux-4.9.207-vs2.
#include <trace/syscall.h>
#include <asm/segment.h>
#include <asm/page.h>
-diff -NurpP --minimal linux-4.9.207/arch/s390/kernel/syscalls.S linux-4.9.207-vs2.3.9.11/arch/s390/kernel/syscalls.S
---- linux-4.9.207/arch/s390/kernel/syscalls.S 2019-12-25 15:27:30.598395214 +0000
-+++ linux-4.9.207-vs2.3.9.11/arch/s390/kernel/syscalls.S 2018-10-20 04:58:13.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/arch/s390/kernel/syscalls.S linux-4.9.217-vs2.3.9.12/arch/s390/kernel/syscalls.S
+--- linux-4.9.217/arch/s390/kernel/syscalls.S 2020-03-27 00:50:44.171072152 +0000
++++ linux-4.9.217-vs2.3.9.12/arch/s390/kernel/syscalls.S 2018-10-20 04:58:13.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)
@@ -404,9 +404,9 @@ diff -NurpP --minimal linux-4.9.207/arch/s390/kernel/syscalls.S linux-4.9.207-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.9.207/arch/sh/Kconfig linux-4.9.207-vs2.3.9.11/arch/sh/Kconfig
---- linux-4.9.207/arch/sh/Kconfig 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/arch/sh/Kconfig 2018-10-20 04:58:13.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/arch/sh/Kconfig linux-4.9.217-vs2.3.9.12/arch/sh/Kconfig
+--- linux-4.9.217/arch/sh/Kconfig 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/arch/sh/Kconfig 2018-10-20 04:58:13.000000000 +0000
@@ -904,6 +904,8 @@ source "fs/Kconfig"
source "arch/sh/Kconfig.debug"
@@ -416,9 +416,9 @@ diff -NurpP --minimal linux-4.9.207/arch/sh/Kconfig linux-4.9.207-vs2.3.9.11/arc
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.9.207/arch/sh/kernel/irq.c linux-4.9.207-vs2.3.9.11/arch/sh/kernel/irq.c
---- linux-4.9.207/arch/sh/kernel/irq.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/arch/sh/kernel/irq.c 2018-10-20 04:58:13.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/arch/sh/kernel/irq.c linux-4.9.217-vs2.3.9.12/arch/sh/kernel/irq.c
+--- linux-4.9.217/arch/sh/kernel/irq.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/arch/sh/kernel/irq.c 2018-10-20 04:58:13.000000000 +0000
@@ -14,6 +14,7 @@
#include <linux/ftrace.h>
#include <linux/delay.h>
@@ -427,9 +427,9 @@ diff -NurpP --minimal linux-4.9.207/arch/sh/kernel/irq.c linux-4.9.207-vs2.3.9.1
#include <asm/processor.h>
#include <asm/machvec.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-4.9.207/arch/sparc/include/uapi/asm/unistd.h linux-4.9.207-vs2.3.9.11/arch/sparc/include/uapi/asm/unistd.h
---- linux-4.9.207/arch/sparc/include/uapi/asm/unistd.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/arch/sparc/include/uapi/asm/unistd.h 2018-10-20 04:58:13.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/arch/sparc/include/uapi/asm/unistd.h linux-4.9.217-vs2.3.9.12/arch/sparc/include/uapi/asm/unistd.h
+--- linux-4.9.217/arch/sparc/include/uapi/asm/unistd.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/arch/sparc/include/uapi/asm/unistd.h 2018-10-20 04:58:13.000000000 +0000
@@ -332,7 +332,7 @@
#define __NR_timer_getoverrun 264
#define __NR_timer_delete 265
@@ -439,9 +439,9 @@ diff -NurpP --minimal linux-4.9.207/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.9.207/arch/sparc/Kconfig linux-4.9.207-vs2.3.9.11/arch/sparc/Kconfig
---- linux-4.9.207/arch/sparc/Kconfig 2019-12-25 15:27:31.178385837 +0000
-+++ linux-4.9.207-vs2.3.9.11/arch/sparc/Kconfig 2019-02-22 08:37:49.523154806 +0000
+diff -NurpP --minimal linux-4.9.217/arch/sparc/Kconfig linux-4.9.217-vs2.3.9.12/arch/sparc/Kconfig
+--- linux-4.9.217/arch/sparc/Kconfig 2020-03-27 00:50:44.741063185 +0000
++++ linux-4.9.217-vs2.3.9.12/arch/sparc/Kconfig 2019-02-22 08:37:49.523154806 +0000
@@ -584,6 +584,8 @@ source "fs/Kconfig"
source "arch/sparc/Kconfig.debug"
@@ -451,9 +451,9 @@ diff -NurpP --minimal linux-4.9.207/arch/sparc/Kconfig linux-4.9.207-vs2.3.9.11/
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.9.207/arch/sparc/kernel/systbls_32.S linux-4.9.207-vs2.3.9.11/arch/sparc/kernel/systbls_32.S
---- linux-4.9.207/arch/sparc/kernel/systbls_32.S 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/arch/sparc/kernel/systbls_32.S 2018-10-20 04:58:13.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/arch/sparc/kernel/systbls_32.S linux-4.9.217-vs2.3.9.12/arch/sparc/kernel/systbls_32.S
+--- linux-4.9.217/arch/sparc/kernel/systbls_32.S 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/arch/sparc/kernel/systbls_32.S 2018-10-20 04:58:13.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
@@ -463,9 +463,9 @@ diff -NurpP --minimal linux-4.9.207/arch/sparc/kernel/systbls_32.S linux-4.9.207
/*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.9.207/arch/sparc/kernel/systbls_64.S linux-4.9.207-vs2.3.9.11/arch/sparc/kernel/systbls_64.S
---- linux-4.9.207/arch/sparc/kernel/systbls_64.S 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/arch/sparc/kernel/systbls_64.S 2018-10-20 04:58:13.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/arch/sparc/kernel/systbls_64.S linux-4.9.217-vs2.3.9.12/arch/sparc/kernel/systbls_64.S
+--- linux-4.9.217/arch/sparc/kernel/systbls_64.S 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/arch/sparc/kernel/systbls_64.S 2018-10-20 04:58:13.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
@@ -484,9 +484,9 @@ diff -NurpP --minimal linux-4.9.207/arch/sparc/kernel/systbls_64.S linux-4.9.207
/*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.9.207/arch/um/Kconfig.rest linux-4.9.207-vs2.3.9.11/arch/um/Kconfig.rest
---- linux-4.9.207/arch/um/Kconfig.rest 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/arch/um/Kconfig.rest 2018-10-20 04:58:13.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/arch/um/Kconfig.rest linux-4.9.217-vs2.3.9.12/arch/um/Kconfig.rest
+--- linux-4.9.217/arch/um/Kconfig.rest 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/arch/um/Kconfig.rest 2018-10-20 04:58:13.000000000 +0000
@@ -12,6 +12,8 @@ source "arch/um/Kconfig.net"
source "fs/Kconfig"
@@ -496,9 +496,9 @@ diff -NurpP --minimal linux-4.9.207/arch/um/Kconfig.rest linux-4.9.207-vs2.3.9.1
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.9.207/arch/x86/entry/syscalls/syscall_32.tbl linux-4.9.207-vs2.3.9.11/arch/x86/entry/syscalls/syscall_32.tbl
---- linux-4.9.207/arch/x86/entry/syscalls/syscall_32.tbl 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/arch/x86/entry/syscalls/syscall_32.tbl 2018-10-20 04:58:13.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/arch/x86/entry/syscalls/syscall_32.tbl linux-4.9.217-vs2.3.9.12/arch/x86/entry/syscalls/syscall_32.tbl
+--- linux-4.9.217/arch/x86/entry/syscalls/syscall_32.tbl 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/arch/x86/entry/syscalls/syscall_32.tbl 2018-10-20 04:58:13.000000000 +0000
@@ -279,7 +279,7 @@
270 i386 tgkill sys_tgkill
271 i386 utimes sys_utimes compat_sys_utimes
@@ -508,9 +508,9 @@ diff -NurpP --minimal linux-4.9.207/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.9.207/arch/x86/entry/syscalls/syscall_64.tbl linux-4.9.207-vs2.3.9.11/arch/x86/entry/syscalls/syscall_64.tbl
---- linux-4.9.207/arch/x86/entry/syscalls/syscall_64.tbl 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/arch/x86/entry/syscalls/syscall_64.tbl 2018-10-20 04:58:13.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/arch/x86/entry/syscalls/syscall_64.tbl linux-4.9.217-vs2.3.9.12/arch/x86/entry/syscalls/syscall_64.tbl
+--- linux-4.9.217/arch/x86/entry/syscalls/syscall_64.tbl 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/arch/x86/entry/syscalls/syscall_64.tbl 2018-10-20 04:58:13.000000000 +0000
@@ -242,7 +242,7 @@
233 common epoll_ctl sys_epoll_ctl
234 common tgkill sys_tgkill
@@ -520,9 +520,9 @@ diff -NurpP --minimal linux-4.9.207/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.9.207/arch/x86/Kconfig linux-4.9.207-vs2.3.9.11/arch/x86/Kconfig
---- linux-4.9.207/arch/x86/Kconfig 2019-12-25 15:27:31.878374518 +0000
-+++ linux-4.9.207-vs2.3.9.11/arch/x86/Kconfig 2019-12-25 15:37:44.298553484 +0000
+diff -NurpP --minimal linux-4.9.217/arch/x86/Kconfig linux-4.9.217-vs2.3.9.12/arch/x86/Kconfig
+--- linux-4.9.217/arch/x86/Kconfig 2020-03-27 00:50:45.651048876 +0000
++++ linux-4.9.217-vs2.3.9.12/arch/x86/Kconfig 2019-12-25 15:37:44.298553484 +0000
@@ -2810,6 +2810,8 @@ source "fs/Kconfig"
source "arch/x86/Kconfig.debug"
@@ -532,9 +532,9 @@ diff -NurpP --minimal linux-4.9.207/arch/x86/Kconfig linux-4.9.207-vs2.3.9.11/ar
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.9.207/block/ioprio.c linux-4.9.207-vs2.3.9.11/block/ioprio.c
---- linux-4.9.207/block/ioprio.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/block/ioprio.c 2018-10-20 04:58:13.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/block/ioprio.c linux-4.9.217-vs2.3.9.12/block/ioprio.c
+--- linux-4.9.217/block/ioprio.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/block/ioprio.c 2018-10-20 04:58:13.000000000 +0000
@@ -28,6 +28,7 @@
#include <linux/syscalls.h>
#include <linux/security.h>
@@ -561,9 +561,9 @@ diff -NurpP --minimal linux-4.9.207/block/ioprio.c linux-4.9.207-vs2.3.9.11/bloc
tmpio = get_task_ioprio(p);
if (tmpio < 0)
continue;
-diff -NurpP --minimal linux-4.9.207/Documentation/vserver/debug.txt linux-4.9.207-vs2.3.9.11/Documentation/vserver/debug.txt
---- linux-4.9.207/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/Documentation/vserver/debug.txt 2018-10-20 04:58:12.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/Documentation/vserver/debug.txt linux-4.9.217-vs2.3.9.12/Documentation/vserver/debug.txt
+--- linux-4.9.217/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/Documentation/vserver/debug.txt 2018-10-20 04:58:12.000000000 +0000
@@ -0,0 +1,154 @@
+
+debug_cvirt:
@@ -719,9 +719,9 @@ diff -NurpP --minimal linux-4.9.207/Documentation/vserver/debug.txt linux-4.9.20
+ 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.9.207/drivers/block/Kconfig linux-4.9.207-vs2.3.9.11/drivers/block/Kconfig
---- linux-4.9.207/drivers/block/Kconfig 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/drivers/block/Kconfig 2018-10-20 04:58:13.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/drivers/block/Kconfig linux-4.9.217-vs2.3.9.12/drivers/block/Kconfig
+--- linux-4.9.217/drivers/block/Kconfig 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/drivers/block/Kconfig 2018-10-20 04:58:13.000000000 +0000
@@ -273,6 +273,13 @@ config BLK_DEV_CRYPTOLOOP
source "drivers/block/drbd/Kconfig"
@@ -736,9 +736,9 @@ diff -NurpP --minimal linux-4.9.207/drivers/block/Kconfig linux-4.9.207-vs2.3.9.
config BLK_DEV_NBD
tristate "Network block device support"
depends on NET
-diff -NurpP --minimal linux-4.9.207/drivers/block/loop.c linux-4.9.207-vs2.3.9.11/drivers/block/loop.c
---- linux-4.9.207/drivers/block/loop.c 2019-12-25 15:27:36.368301926 +0000
-+++ linux-4.9.207-vs2.3.9.11/drivers/block/loop.c 2019-12-25 15:37:45.418535409 +0000
+diff -NurpP --minimal linux-4.9.217/drivers/block/loop.c linux-4.9.217-vs2.3.9.12/drivers/block/loop.c
+--- linux-4.9.217/drivers/block/loop.c 2020-03-27 00:50:48.141009707 +0000
++++ linux-4.9.217-vs2.3.9.12/drivers/block/loop.c 2019-12-25 15:37:45.418535409 +0000
@@ -76,6 +76,7 @@
#include <linux/miscdevice.h>
#include <linux/falloc.h>
@@ -794,9 +794,9 @@ diff -NurpP --minimal linux-4.9.207/drivers/block/loop.c linux-4.9.207-vs2.3.9.1
atomic_inc(&lo->lo_refcnt);
out:
mutex_unlock(&loop_index_mutex);
-diff -NurpP --minimal linux-4.9.207/drivers/block/loop.h linux-4.9.207-vs2.3.9.11/drivers/block/loop.h
---- linux-4.9.207/drivers/block/loop.h 2019-12-25 15:27:36.388301601 +0000
-+++ linux-4.9.207-vs2.3.9.11/drivers/block/loop.h 2019-10-05 14:58:39.110412393 +0000
+diff -NurpP --minimal linux-4.9.217/drivers/block/loop.h linux-4.9.217-vs2.3.9.12/drivers/block/loop.h
+--- linux-4.9.217/drivers/block/loop.h 2020-03-27 00:50:48.151009551 +0000
++++ linux-4.9.217-vs2.3.9.12/drivers/block/loop.h 2019-10-05 14:58:39.110412393 +0000
@@ -43,6 +43,7 @@ struct loop_device {
struct loop_func_table *lo_encryption;
__u32 lo_init[2];
@@ -805,9 +805,9 @@ diff -NurpP --minimal linux-4.9.207/drivers/block/loop.h linux-4.9.207-vs2.3.9.1
int (*ioctl)(struct loop_device *, int cmd,
unsigned long arg);
-diff -NurpP --minimal linux-4.9.207/drivers/block/Makefile linux-4.9.207-vs2.3.9.11/drivers/block/Makefile
---- linux-4.9.207/drivers/block/Makefile 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/drivers/block/Makefile 2018-10-20 04:58:13.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/drivers/block/Makefile linux-4.9.217-vs2.3.9.12/drivers/block/Makefile
+--- linux-4.9.217/drivers/block/Makefile 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/drivers/block/Makefile 2018-10-20 04:58:13.000000000 +0000
@@ -31,6 +31,7 @@ obj-$(CONFIG_VIRTIO_BLK) += virtio_blk.o
obj-$(CONFIG_BLK_DEV_SX8) += sx8.o
@@ -816,9 +816,9 @@ diff -NurpP --minimal linux-4.9.207/drivers/block/Makefile linux-4.9.207-vs2.3.9
obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o
obj-$(CONFIG_XEN_BLKDEV_BACKEND) += xen-blkback/
-diff -NurpP --minimal linux-4.9.207/drivers/block/vroot.c linux-4.9.207-vs2.3.9.11/drivers/block/vroot.c
---- linux-4.9.207/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/drivers/block/vroot.c 2018-10-20 04:58:13.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/drivers/block/vroot.c linux-4.9.217-vs2.3.9.12/drivers/block/vroot.c
+--- linux-4.9.217/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/drivers/block/vroot.c 2018-10-20 04:58:13.000000000 +0000
@@ -0,0 +1,291 @@
+/*
+ * linux/drivers/block/vroot.c
@@ -1111,9 +1111,9 @@ diff -NurpP --minimal linux-4.9.207/drivers/block/vroot.c linux-4.9.207-vs2.3.9.
+
+#endif
+
-diff -NurpP --minimal linux-4.9.207/drivers/md/dm.c linux-4.9.207-vs2.3.9.11/drivers/md/dm.c
---- linux-4.9.207/drivers/md/dm.c 2019-12-25 15:28:01.727891912 +0000
-+++ linux-4.9.207-vs2.3.9.11/drivers/md/dm.c 2019-12-25 15:37:45.988526209 +0000
+diff -NurpP --minimal linux-4.9.217/drivers/md/dm.c linux-4.9.217-vs2.3.9.12/drivers/md/dm.c
+--- linux-4.9.217/drivers/md/dm.c 2020-03-27 00:50:57.810857303 +0000
++++ linux-4.9.217-vs2.3.9.12/drivers/md/dm.c 2020-04-01 09:40:21.845577638 +0000
@@ -22,6 +22,7 @@
#include <linux/wait.h>
#include <linux/pr.h>
@@ -1178,9 +1178,9 @@ diff -NurpP --minimal linux-4.9.207/drivers/md/dm.c linux-4.9.207-vs2.3.9.11/dri
md->queue = blk_alloc_queue_node(GFP_KERNEL, numa_node_id);
if (!md->queue)
-diff -NurpP --minimal linux-4.9.207/drivers/md/dm-core.h linux-4.9.207-vs2.3.9.11/drivers/md/dm-core.h
---- linux-4.9.207/drivers/md/dm-core.h 2019-12-25 15:28:01.677892718 +0000
-+++ linux-4.9.207-vs2.3.9.11/drivers/md/dm-core.h 2018-10-20 04:58:13.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/drivers/md/dm-core.h linux-4.9.217-vs2.3.9.12/drivers/md/dm-core.h
+--- linux-4.9.217/drivers/md/dm-core.h 2020-03-27 00:50:57.740858403 +0000
++++ linux-4.9.217-vs2.3.9.12/drivers/md/dm-core.h 2018-10-20 04:58:13.000000000 +0000
@@ -52,6 +52,7 @@ struct mapped_device {
atomic_t holders;
@@ -1189,9 +1189,9 @@ diff -NurpP --minimal linux-4.9.207/drivers/md/dm-core.h linux-4.9.207-vs2.3.9.1
struct dm_target *immutable_target;
struct target_type *immutable_target_type;
-diff -NurpP --minimal linux-4.9.207/drivers/md/dm.h linux-4.9.207-vs2.3.9.11/drivers/md/dm.h
---- linux-4.9.207/drivers/md/dm.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/drivers/md/dm.h 2018-10-20 04:58:13.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/drivers/md/dm.h linux-4.9.217-vs2.3.9.12/drivers/md/dm.h
+--- linux-4.9.217/drivers/md/dm.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/drivers/md/dm.h 2018-10-20 04:58:13.000000000 +0000
@@ -45,6 +45,8 @@ struct dm_dev_internal {
struct dm_table;
struct dm_md_mempools;
@@ -1201,9 +1201,9 @@ diff -NurpP --minimal linux-4.9.207/drivers/md/dm.h linux-4.9.207-vs2.3.9.11/dri
/*-----------------------------------------------------------------
* Internal table functions.
*---------------------------------------------------------------*/
-diff -NurpP --minimal linux-4.9.207/drivers/md/dm-ioctl.c linux-4.9.207-vs2.3.9.11/drivers/md/dm-ioctl.c
---- linux-4.9.207/drivers/md/dm-ioctl.c 2019-12-25 15:28:01.687892558 +0000
-+++ linux-4.9.207-vs2.3.9.11/drivers/md/dm-ioctl.c 2019-02-22 08:37:51.173126752 +0000
+diff -NurpP --minimal linux-4.9.217/drivers/md/dm-ioctl.c linux-4.9.217-vs2.3.9.12/drivers/md/dm-ioctl.c
+--- linux-4.9.217/drivers/md/dm-ioctl.c 2020-03-27 00:50:57.760858091 +0000
++++ linux-4.9.217-vs2.3.9.12/drivers/md/dm-ioctl.c 2019-02-22 08:37:51.173126752 +0000
@@ -16,6 +16,7 @@
#include <linux/dm-ioctl.h>
#include <linux/hdreg.h>
@@ -1289,9 +1289,9 @@ diff -NurpP --minimal linux-4.9.207/drivers/md/dm-ioctl.c linux-4.9.207-vs2.3.9.
return -EACCES;
if (_IOC_TYPE(command) != DM_IOCTL)
-diff -NurpP --minimal linux-4.9.207/drivers/net/tun.c linux-4.9.207-vs2.3.9.11/drivers/net/tun.c
---- linux-4.9.207/drivers/net/tun.c 2019-12-25 15:28:13.097708081 +0000
-+++ linux-4.9.207-vs2.3.9.11/drivers/net/tun.c 2019-10-05 14:58:41.040381546 +0000
+diff -NurpP --minimal linux-4.9.217/drivers/net/tun.c linux-4.9.217-vs2.3.9.12/drivers/net/tun.c
+--- linux-4.9.217/drivers/net/tun.c 2020-03-27 00:51:04.880745870 +0000
++++ linux-4.9.217-vs2.3.9.12/drivers/net/tun.c 2020-04-01 09:40:23.915543339 +0000
@@ -65,6 +65,7 @@
#include <linux/nsproxy.h>
#include <linux/virtio_net.h>
@@ -1316,7 +1316,7 @@ diff -NurpP --minimal linux-4.9.207/drivers/net/tun.c linux-4.9.207-vs2.3.9.11/d
}
static void tun_set_real_num_queues(struct tun_struct *tun)
-@@ -1558,6 +1561,7 @@ static void tun_setup(struct net_device
+@@ -1569,6 +1572,7 @@ static void tun_setup(struct net_device
tun->owner = INVALID_UID;
tun->group = INVALID_GID;
@@ -1324,7 +1324,7 @@ diff -NurpP --minimal linux-4.9.207/drivers/net/tun.c linux-4.9.207-vs2.3.9.11/d
dev->ethtool_ops = &tun_ethtool_ops;
dev->destructor = tun_free_netdev;
-@@ -1771,7 +1775,7 @@ static int tun_set_iff(struct net *net,
+@@ -1782,7 +1786,7 @@ static int tun_set_iff(struct net *net,
int queues = ifr->ifr_flags & IFF_MULTI_QUEUE ?
MAX_TAP_QUEUES : 1;
@@ -1333,7 +1333,7 @@ diff -NurpP --minimal linux-4.9.207/drivers/net/tun.c linux-4.9.207-vs2.3.9.11/d
return -EPERM;
err = security_tun_dev_create();
if (err < 0)
-@@ -2140,6 +2144,16 @@ static long __tun_chr_ioctl(struct file
+@@ -2151,6 +2155,16 @@ static long __tun_chr_ioctl(struct file
from_kgid(&init_user_ns, tun->group));
break;
@@ -1350,10 +1350,10 @@ diff -NurpP --minimal linux-4.9.207/drivers/net/tun.c linux-4.9.207-vs2.3.9.11/d
case TUNSETLINK:
/* Only allow setting the type when the interface is down */
if (tun->dev->flags & IFF_UP) {
-diff -NurpP --minimal linux-4.9.207/drivers/scsi/cxgbi/libcxgbi.c linux-4.9.207-vs2.3.9.11/drivers/scsi/cxgbi/libcxgbi.c
---- linux-4.9.207/drivers/scsi/cxgbi/libcxgbi.c 2019-12-25 15:28:19.947597331 +0000
-+++ linux-4.9.207-vs2.3.9.11/drivers/scsi/cxgbi/libcxgbi.c 2019-10-05 14:58:43.270345911 +0000
-@@ -776,7 +776,8 @@ static struct cxgbi_sock *cxgbi_check_ro
+diff -NurpP --minimal linux-4.9.217/drivers/scsi/cxgbi/libcxgbi.c linux-4.9.217-vs2.3.9.12/drivers/scsi/cxgbi/libcxgbi.c
+--- linux-4.9.217/drivers/scsi/cxgbi/libcxgbi.c 2020-03-27 00:51:09.110679202 +0000
++++ linux-4.9.217-vs2.3.9.12/drivers/scsi/cxgbi/libcxgbi.c 2020-04-01 09:40:26.325503408 +0000
+@@ -777,7 +777,8 @@ static struct cxgbi_sock *cxgbi_check_ro
struct inet6_dev *idev = ip6_dst_idev((struct dst_entry *)rt);
err = ipv6_dev_get_saddr(&init_net, idev ? idev->dev : NULL,
@@ -1363,9 +1363,9 @@ diff -NurpP --minimal linux-4.9.207/drivers/scsi/cxgbi/libcxgbi.c linux-4.9.207-
if (err) {
pr_info("failed to get source address to reach %pI6\n",
&daddr6->sin6_addr);
-diff -NurpP --minimal linux-4.9.207/drivers/tty/sysrq.c linux-4.9.207-vs2.3.9.11/drivers/tty/sysrq.c
---- linux-4.9.207/drivers/tty/sysrq.c 2019-12-25 15:28:24.267527483 +0000
-+++ linux-4.9.207-vs2.3.9.11/drivers/tty/sysrq.c 2018-10-20 04:58:13.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/drivers/tty/sysrq.c linux-4.9.217-vs2.3.9.12/drivers/tty/sysrq.c
+--- linux-4.9.217/drivers/tty/sysrq.c 2020-03-27 00:51:14.160599611 +0000
++++ linux-4.9.217-vs2.3.9.12/drivers/tty/sysrq.c 2020-04-01 09:40:27.395485676 +0000
@@ -47,6 +47,7 @@
#include <linux/syscalls.h>
#include <linux/of.h>
@@ -1417,9 +1417,9 @@ diff -NurpP --minimal linux-4.9.207/drivers/tty/sysrq.c linux-4.9.207-vs2.3.9.11
else
retval = -1;
return retval;
-diff -NurpP --minimal linux-4.9.207/drivers/tty/tty_io.c linux-4.9.207-vs2.3.9.11/drivers/tty/tty_io.c
---- linux-4.9.207/drivers/tty/tty_io.c 2019-12-25 15:28:24.287527162 +0000
-+++ linux-4.9.207-vs2.3.9.11/drivers/tty/tty_io.c 2019-10-05 14:58:43.980334565 +0000
+diff -NurpP --minimal linux-4.9.217/drivers/tty/tty_io.c linux-4.9.217-vs2.3.9.12/drivers/tty/tty_io.c
+--- linux-4.9.217/drivers/tty/tty_io.c 2020-03-27 00:51:14.190599135 +0000
++++ linux-4.9.217-vs2.3.9.12/drivers/tty/tty_io.c 2019-10-05 14:58:43.980334565 +0000
@@ -104,6 +104,7 @@
#include <linux/kmod.h>
@@ -1446,9 +1446,9 @@ diff -NurpP --minimal linux-4.9.207/drivers/tty/tty_io.c linux-4.9.207-vs2.3.9.1
if (pgrp_nr < 0)
return -EINVAL;
rcu_read_lock();
-diff -NurpP --minimal linux-4.9.207/fs/attr.c linux-4.9.207-vs2.3.9.11/fs/attr.c
---- linux-4.9.207/fs/attr.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/attr.c 2018-10-20 04:58:13.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/attr.c linux-4.9.217-vs2.3.9.12/fs/attr.c
+--- linux-4.9.217/fs/attr.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/attr.c 2018-10-20 04:58:13.000000000 +0000
@@ -15,6 +15,9 @@
#include <linux/security.h>
#include <linux/evm.h>
@@ -1489,9 +1489,9 @@ diff -NurpP --minimal linux-4.9.207/fs/attr.c linux-4.9.207-vs2.3.9.11/fs/attr.c
if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
return -EPERM;
}
-diff -NurpP --minimal linux-4.9.207/fs/block_dev.c linux-4.9.207-vs2.3.9.11/fs/block_dev.c
---- linux-4.9.207/fs/block_dev.c 2019-12-25 15:28:35.697342685 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/block_dev.c 2019-02-22 08:37:54.463070814 +0000
+diff -NurpP --minimal linux-4.9.217/fs/block_dev.c linux-4.9.217-vs2.3.9.12/fs/block_dev.c
+--- linux-4.9.217/fs/block_dev.c 2020-03-27 00:51:17.200551698 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/block_dev.c 2019-02-22 08:37:54.463070814 +0000
@@ -31,6 +31,7 @@
#include <linux/dax.h>
#include <linux/badblocks.h>
@@ -1529,10 +1529,10 @@ diff -NurpP --minimal linux-4.9.207/fs/block_dev.c linux-4.9.207-vs2.3.9.11/fs/b
if (bdev) {
spin_lock(&bdev_lock);
if (!inode->i_bdev) {
-diff -NurpP --minimal linux-4.9.207/fs/btrfs/ctree.h linux-4.9.207-vs2.3.9.11/fs/btrfs/ctree.h
---- linux-4.9.207/fs/btrfs/ctree.h 2019-12-25 15:28:35.767341551 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/btrfs/ctree.h 2019-02-22 08:37:54.473070642 +0000
-@@ -1321,6 +1321,8 @@ static inline u32 BTRFS_MAX_XATTR_SIZE(c
+diff -NurpP --minimal linux-4.9.217/fs/btrfs/ctree.h linux-4.9.217-vs2.3.9.12/fs/btrfs/ctree.h
+--- linux-4.9.217/fs/btrfs/ctree.h 2020-03-27 00:51:17.270550595 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/btrfs/ctree.h 2020-04-01 09:40:28.245471591 +0000
+@@ -1319,6 +1319,8 @@ static inline u32 BTRFS_MAX_XATTR_SIZE(c
#define BTRFS_DEFAULT_COMMIT_INTERVAL (30)
#define BTRFS_DEFAULT_MAX_INLINE (2048)
@@ -1541,7 +1541,7 @@ diff -NurpP --minimal linux-4.9.207/fs/btrfs/ctree.h linux-4.9.207-vs2.3.9.11/fs
#define btrfs_clear_opt(o, opt) ((o) &= ~BTRFS_MOUNT_##opt)
#define btrfs_set_opt(o, opt) ((o) |= BTRFS_MOUNT_##opt)
#define btrfs_raw_test_opt(o, opt) ((o) & BTRFS_MOUNT_##opt)
-@@ -1671,6 +1673,7 @@ BTRFS_SETGET_FUNCS(inode_block_group, st
+@@ -1669,6 +1671,7 @@ BTRFS_SETGET_FUNCS(inode_block_group, st
BTRFS_SETGET_FUNCS(inode_nlink, struct btrfs_inode_item, nlink, 32);
BTRFS_SETGET_FUNCS(inode_uid, struct btrfs_inode_item, uid, 32);
BTRFS_SETGET_FUNCS(inode_gid, struct btrfs_inode_item, gid, 32);
@@ -1549,7 +1549,7 @@ diff -NurpP --minimal linux-4.9.207/fs/btrfs/ctree.h linux-4.9.207-vs2.3.9.11/fs
BTRFS_SETGET_FUNCS(inode_mode, struct btrfs_inode_item, mode, 32);
BTRFS_SETGET_FUNCS(inode_rdev, struct btrfs_inode_item, rdev, 64);
BTRFS_SETGET_FUNCS(inode_flags, struct btrfs_inode_item, flags, 64);
-@@ -1718,6 +1721,10 @@ BTRFS_SETGET_FUNCS(extent_flags, struct
+@@ -1716,6 +1719,10 @@ BTRFS_SETGET_FUNCS(extent_flags, struct
BTRFS_SETGET_FUNCS(extent_refs_v0, struct btrfs_extent_item_v0, refs, 32);
@@ -1560,7 +1560,7 @@ diff -NurpP --minimal linux-4.9.207/fs/btrfs/ctree.h linux-4.9.207-vs2.3.9.11/fs
BTRFS_SETGET_FUNCS(tree_block_level, struct btrfs_tree_block_info, level, 8);
-@@ -3201,6 +3208,7 @@ int btrfs_ioctl_get_supported_features(v
+@@ -3199,6 +3206,7 @@ int btrfs_ioctl_get_supported_features(v
void btrfs_update_iflags(struct inode *inode);
void btrfs_inherit_iflags(struct inode *inode, struct inode *dir);
int btrfs_is_empty_uuid(u8 *uuid);
@@ -1568,10 +1568,10 @@ diff -NurpP --minimal linux-4.9.207/fs/btrfs/ctree.h linux-4.9.207-vs2.3.9.11/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.9.207/fs/btrfs/disk-io.c linux-4.9.207-vs2.3.9.11/fs/btrfs/disk-io.c
---- linux-4.9.207/fs/btrfs/disk-io.c 2019-12-25 15:28:35.787341229 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/btrfs/disk-io.c 2019-02-22 08:37:54.473070642 +0000
-@@ -2706,6 +2706,9 @@ int open_ctree(struct super_block *sb,
+diff -NurpP --minimal linux-4.9.217/fs/btrfs/disk-io.c linux-4.9.217-vs2.3.9.12/fs/btrfs/disk-io.c
+--- linux-4.9.217/fs/btrfs/disk-io.c 2020-03-27 00:51:17.290550279 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/btrfs/disk-io.c 2020-04-01 09:40:28.245471591 +0000
+@@ -2705,6 +2705,9 @@ int open_ctree(struct super_block *sb,
goto fail_alloc;
}
@@ -1581,9 +1581,9 @@ diff -NurpP --minimal linux-4.9.207/fs/btrfs/disk-io.c linux-4.9.207-vs2.3.9.11/
features = btrfs_super_incompat_flags(disk_super) &
~BTRFS_FEATURE_INCOMPAT_SUPP;
if (features) {
-diff -NurpP --minimal linux-4.9.207/fs/btrfs/inode.c linux-4.9.207-vs2.3.9.11/fs/btrfs/inode.c
---- linux-4.9.207/fs/btrfs/inode.c 2019-12-25 15:28:35.847340258 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/btrfs/inode.c 2019-12-25 15:37:51.118443417 +0000
+diff -NurpP --minimal linux-4.9.217/fs/btrfs/inode.c linux-4.9.217-vs2.3.9.12/fs/btrfs/inode.c
+--- linux-4.9.217/fs/btrfs/inode.c 2020-03-27 00:51:17.350549330 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/btrfs/inode.c 2020-04-01 09:40:28.265471261 +0000
@@ -43,6 +43,7 @@
#include <linux/blkdev.h>
#include <linux/posix_acl_xattr.h>
@@ -1640,7 +1640,7 @@ diff -NurpP --minimal linux-4.9.207/fs/btrfs/inode.c linux-4.9.207-vs2.3.9.11/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);
-@@ -10649,6 +10666,7 @@ static const struct inode_operations btr
+@@ -10646,6 +10663,7 @@ static const struct inode_operations btr
.mknod = btrfs_mknod,
.listxattr = btrfs_listxattr,
.permission = btrfs_permission,
@@ -1648,7 +1648,7 @@ diff -NurpP --minimal linux-4.9.207/fs/btrfs/inode.c linux-4.9.207-vs2.3.9.11/fs
.get_acl = btrfs_get_acl,
.set_acl = btrfs_set_acl,
.update_time = btrfs_update_time,
-@@ -10657,6 +10675,7 @@ static const struct inode_operations btr
+@@ -10654,6 +10672,7 @@ static const struct inode_operations btr
static const struct inode_operations btrfs_dir_ro_inode_operations = {
.lookup = btrfs_lookup,
.permission = btrfs_permission,
@@ -1656,7 +1656,7 @@ diff -NurpP --minimal linux-4.9.207/fs/btrfs/inode.c linux-4.9.207-vs2.3.9.11/fs
.update_time = btrfs_update_time,
};
-@@ -10722,6 +10741,7 @@ static const struct inode_operations btr
+@@ -10719,6 +10738,7 @@ static const struct inode_operations btr
.listxattr = btrfs_listxattr,
.permission = btrfs_permission,
.fiemap = btrfs_fiemap,
@@ -1664,9 +1664,9 @@ diff -NurpP --minimal linux-4.9.207/fs/btrfs/inode.c linux-4.9.207-vs2.3.9.11/fs
.get_acl = btrfs_get_acl,
.set_acl = btrfs_set_acl,
.update_time = btrfs_update_time,
-diff -NurpP --minimal linux-4.9.207/fs/btrfs/ioctl.c linux-4.9.207-vs2.3.9.11/fs/btrfs/ioctl.c
---- linux-4.9.207/fs/btrfs/ioctl.c 2019-12-25 15:28:35.847340258 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/btrfs/ioctl.c 2019-10-05 14:58:45.120316346 +0000
+diff -NurpP --minimal linux-4.9.217/fs/btrfs/ioctl.c linux-4.9.217-vs2.3.9.12/fs/btrfs/ioctl.c
+--- linux-4.9.217/fs/btrfs/ioctl.c 2020-03-27 00:51:17.350549330 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/btrfs/ioctl.c 2020-04-01 09:40:28.265471261 +0000
@@ -110,10 +110,13 @@ static unsigned int btrfs_flags_to_ioctl
{
unsigned int iflags = 0;
@@ -1845,9 +1845,9 @@ diff -NurpP --minimal linux-4.9.207/fs/btrfs/ioctl.c linux-4.9.207-vs2.3.9.11/fs
if (flags & FS_APPEND_FL)
ip->flags |= BTRFS_INODE_APPEND;
else
-diff -NurpP --minimal linux-4.9.207/fs/btrfs/super.c linux-4.9.207-vs2.3.9.11/fs/btrfs/super.c
---- linux-4.9.207/fs/btrfs/super.c 2019-12-25 15:28:35.857340098 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/btrfs/super.c 2019-02-22 08:37:54.503070133 +0000
+diff -NurpP --minimal linux-4.9.217/fs/btrfs/super.c linux-4.9.217-vs2.3.9.12/fs/btrfs/super.c
+--- linux-4.9.217/fs/btrfs/super.c 2020-03-27 00:51:17.390548703 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/btrfs/super.c 2020-04-01 09:40:28.265471261 +0000
@@ -327,7 +327,7 @@ enum {
#ifdef CONFIG_BTRFS_DEBUG
Opt_fragment_data, Opt_fragment_metadata, Opt_fragment_all,
@@ -1903,9 +1903,9 @@ diff -NurpP --minimal linux-4.9.207/fs/btrfs/super.c linux-4.9.207-vs2.3.9.11/fs
if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
goto out;
-diff -NurpP --minimal linux-4.9.207/fs/char_dev.c linux-4.9.207-vs2.3.9.11/fs/char_dev.c
---- linux-4.9.207/fs/char_dev.c 2019-12-25 15:28:36.037337186 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/char_dev.c 2019-10-05 14:58:45.140316026 +0000
+diff -NurpP --minimal linux-4.9.217/fs/char_dev.c linux-4.9.217-vs2.3.9.12/fs/char_dev.c
+--- linux-4.9.217/fs/char_dev.c 2020-03-27 00:51:17.560546024 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/char_dev.c 2020-04-01 09:40:28.315470432 +0000
@@ -21,6 +21,8 @@
#include <linux/mutex.h>
#include <linux/backing-dev.h>
@@ -1938,9 +1938,9 @@ diff -NurpP --minimal linux-4.9.207/fs/char_dev.c linux-4.9.207-vs2.3.9.11/fs/ch
if (!kobj)
return -ENXIO;
new = container_of(kobj, struct cdev, kobj);
-diff -NurpP --minimal linux-4.9.207/fs/dcache.c linux-4.9.207-vs2.3.9.11/fs/dcache.c
---- linux-4.9.207/fs/dcache.c 2019-12-25 15:28:36.257333629 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/dcache.c 2019-10-05 14:58:45.150315864 +0000
+diff -NurpP --minimal linux-4.9.217/fs/dcache.c linux-4.9.217-vs2.3.9.12/fs/dcache.c
+--- linux-4.9.217/fs/dcache.c 2020-03-27 00:51:17.880540977 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/dcache.c 2019-10-05 14:58:45.150315864 +0000
@@ -39,6 +39,7 @@
#include <linux/ratelimit.h>
#include <linux/list_lru.h>
@@ -2032,9 +2032,9 @@ diff -NurpP --minimal linux-4.9.207/fs/dcache.c linux-4.9.207-vs2.3.9.11/fs/dcac
}
}
return D_WALK_CONTINUE;
-diff -NurpP --minimal linux-4.9.207/fs/devpts/inode.c linux-4.9.207-vs2.3.9.11/fs/devpts/inode.c
---- linux-4.9.207/fs/devpts/inode.c 2019-12-25 15:28:36.287333144 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/devpts/inode.c 2019-10-05 14:58:45.150315864 +0000
+diff -NurpP --minimal linux-4.9.217/fs/devpts/inode.c linux-4.9.217-vs2.3.9.12/fs/devpts/inode.c
+--- linux-4.9.217/fs/devpts/inode.c 2020-03-27 00:51:18.080537825 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/devpts/inode.c 2019-10-05 14:58:45.150315864 +0000
@@ -27,6 +27,7 @@
#include <linux/parser.h>
#include <linux/fsnotify.h>
@@ -2122,9 +2122,9 @@ diff -NurpP --minimal linux-4.9.207/fs/devpts/inode.c linux-4.9.207-vs2.3.9.11/f
sprintf(s, "%d", index);
-diff -NurpP --minimal linux-4.9.207/fs/ext2/balloc.c linux-4.9.207-vs2.3.9.11/fs/ext2/balloc.c
---- linux-4.9.207/fs/ext2/balloc.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/ext2/balloc.c 2018-10-20 04:58:13.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/ext2/balloc.c linux-4.9.217-vs2.3.9.12/fs/ext2/balloc.c
+--- linux-4.9.217/fs/ext2/balloc.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/ext2/balloc.c 2018-10-20 04:58:13.000000000 +0000
@@ -693,7 +693,6 @@ ext2_try_to_allocate(struct super_block
start = 0;
end = EXT2_BLOCKS_PER_GROUP(sb);
@@ -2133,9 +2133,9 @@ diff -NurpP --minimal linux-4.9.207/fs/ext2/balloc.c linux-4.9.207-vs2.3.9.11/fs
BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb));
repeat:
-diff -NurpP --minimal linux-4.9.207/fs/ext2/ext2.h linux-4.9.207-vs2.3.9.11/fs/ext2/ext2.h
---- linux-4.9.207/fs/ext2/ext2.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/ext2/ext2.h 2018-10-20 04:58:13.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/ext2/ext2.h linux-4.9.217-vs2.3.9.12/fs/ext2/ext2.h
+--- linux-4.9.217/fs/ext2/ext2.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/ext2/ext2.h 2018-10-20 04:58:13.000000000 +0000
@@ -247,8 +247,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) */
@@ -2183,18 +2183,18 @@ diff -NurpP --minimal linux-4.9.207/fs/ext2/ext2.h linux-4.9.207-vs2.3.9.11/fs/e
/* ioctl.c */
extern long ext2_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-4.9.207/fs/ext2/file.c linux-4.9.207-vs2.3.9.11/fs/ext2/file.c
---- linux-4.9.207/fs/ext2/file.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/ext2/file.c 2018-10-20 04:58:13.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/ext2/file.c linux-4.9.217-vs2.3.9.12/fs/ext2/file.c
+--- linux-4.9.217/fs/ext2/file.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/ext2/file.c 2018-10-20 04:58:13.000000000 +0000
@@ -247,4 +247,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.9.207/fs/ext2/ialloc.c linux-4.9.207-vs2.3.9.11/fs/ext2/ialloc.c
---- linux-4.9.207/fs/ext2/ialloc.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/ext2/ialloc.c 2018-10-20 04:58:13.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/ext2/ialloc.c linux-4.9.217-vs2.3.9.12/fs/ext2/ialloc.c
+--- linux-4.9.217/fs/ext2/ialloc.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/ext2/ialloc.c 2018-10-20 04:58:13.000000000 +0000
@@ -17,6 +17,7 @@
#include <linux/backing-dev.h>
#include <linux/buffer_head.h>
@@ -2211,9 +2211,9 @@ diff -NurpP --minimal linux-4.9.207/fs/ext2/ialloc.c linux-4.9.207-vs2.3.9.11/fs
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-4.9.207/fs/ext2/inode.c linux-4.9.207-vs2.3.9.11/fs/ext2/inode.c
---- linux-4.9.207/fs/ext2/inode.c 2019-12-25 15:28:36.507329586 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/ext2/inode.c 2019-12-25 15:37:51.438438255 +0000
+diff -NurpP --minimal linux-4.9.217/fs/ext2/inode.c linux-4.9.217-vs2.3.9.12/fs/ext2/inode.c
+--- linux-4.9.217/fs/ext2/inode.c 2020-03-27 00:51:18.820526161 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/ext2/inode.c 2019-12-25 15:37:51.438438255 +0000
@@ -35,6 +35,7 @@
#include <linux/iomap.h>
#include <linux/namei.h>
@@ -2338,9 +2338,9 @@ diff -NurpP --minimal linux-4.9.207/fs/ext2/inode.c linux-4.9.207-vs2.3.9.11/fs/
error = dquot_transfer(inode, iattr);
if (error)
return error;
-diff -NurpP --minimal linux-4.9.207/fs/ext2/ioctl.c linux-4.9.207-vs2.3.9.11/fs/ext2/ioctl.c
---- linux-4.9.207/fs/ext2/ioctl.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/ext2/ioctl.c 2018-10-20 04:58:13.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/ext2/ioctl.c linux-4.9.217-vs2.3.9.12/fs/ext2/ioctl.c
+--- linux-4.9.217/fs/ext2/ioctl.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/ext2/ioctl.c 2018-10-20 04:58:13.000000000 +0000
@@ -17,6 +17,16 @@
#include <asm/uaccess.h>
@@ -2390,9 +2390,9 @@ diff -NurpP --minimal linux-4.9.207/fs/ext2/ioctl.c linux-4.9.207-vs2.3.9.11/fs/
flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE;
ei->i_flags = flags;
-diff -NurpP --minimal linux-4.9.207/fs/ext2/namei.c linux-4.9.207-vs2.3.9.11/fs/ext2/namei.c
---- linux-4.9.207/fs/ext2/namei.c 2019-12-25 15:28:36.517329425 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/ext2/namei.c 2018-10-20 04:58:13.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/ext2/namei.c linux-4.9.217-vs2.3.9.12/fs/ext2/namei.c
+--- linux-4.9.217/fs/ext2/namei.c 2020-03-27 00:51:18.830526005 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/ext2/namei.c 2018-10-20 04:58:13.000000000 +0000
@@ -32,6 +32,7 @@
#include <linux/pagemap.h>
@@ -2417,9 +2417,9 @@ diff -NurpP --minimal linux-4.9.207/fs/ext2/namei.c linux-4.9.207-vs2.3.9.11/fs/
.get_acl = ext2_get_acl,
.set_acl = ext2_set_acl,
};
-diff -NurpP --minimal linux-4.9.207/fs/ext2/super.c linux-4.9.207-vs2.3.9.11/fs/ext2/super.c
---- linux-4.9.207/fs/ext2/super.c 2019-12-25 15:28:36.537329101 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/ext2/super.c 2019-10-05 14:58:45.150315864 +0000
+diff -NurpP --minimal linux-4.9.217/fs/ext2/super.c linux-4.9.217-vs2.3.9.12/fs/ext2/super.c
+--- linux-4.9.217/fs/ext2/super.c 2020-03-27 00:51:18.940524270 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/ext2/super.c 2020-04-01 09:40:28.405468940 +0000
@@ -411,7 +411,8 @@ enum {
Opt_err_ro, Opt_nouid32, Opt_nocheck, Opt_debug,
Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr,
@@ -2485,9 +2485,9 @@ diff -NurpP --minimal linux-4.9.207/fs/ext2/super.c linux-4.9.207-vs2.3.9.11/fs/
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-4.9.207/fs/ext4/ext4.h linux-4.9.207-vs2.3.9.11/fs/ext4/ext4.h
---- linux-4.9.207/fs/ext4/ext4.h 2019-12-25 15:28:36.597328134 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/ext4/ext4.h 2018-10-20 11:46:17.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/ext4/ext4.h linux-4.9.217-vs2.3.9.12/fs/ext4/ext4.h
+--- linux-4.9.217/fs/ext4/ext4.h 2020-03-27 00:51:19.290518755 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/ext4/ext4.h 2020-04-01 09:40:28.435468445 +0000
@@ -392,8 +392,11 @@ struct flex_groups {
#define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */
#define EXT4_EA_INODE_FL 0x00200000 /* Inode used for large EA */
@@ -2525,7 +2525,7 @@ diff -NurpP --minimal linux-4.9.207/fs/ext4/ext4.h linux-4.9.207-vs2.3.9.11/fs/e
#define EXT4_MOUNT_DELALLOC 0x8000000 /* Delalloc support */
#define EXT4_MOUNT_DATA_ERR_ABORT 0x10000000 /* Abort on file data write */
#define EXT4_MOUNT_BLOCK_VALIDITY 0x20000000 /* Block validity checking */
-@@ -2492,6 +2497,7 @@ extern int ext4_punch_hole(struct inode
+@@ -2515,6 +2520,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 *);
@@ -2533,9 +2533,9 @@ diff -NurpP --minimal linux-4.9.207/fs/ext4/ext4.h linux-4.9.207-vs2.3.9.11/fs/e
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.9.207/fs/ext4/file.c linux-4.9.207-vs2.3.9.11/fs/ext4/file.c
---- linux-4.9.207/fs/ext4/file.c 2019-12-25 15:28:36.617327809 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/ext4/file.c 2019-10-05 14:58:45.150315864 +0000
+diff -NurpP --minimal linux-4.9.217/fs/ext4/file.c linux-4.9.217-vs2.3.9.12/fs/ext4/file.c
+--- linux-4.9.217/fs/ext4/file.c 2020-03-27 00:51:19.360517651 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/ext4/file.c 2019-10-05 14:58:45.150315864 +0000
@@ -698,5 +698,6 @@ const struct inode_operations ext4_file_
.get_acl = ext4_get_acl,
.set_acl = ext4_set_acl,
@@ -2543,9 +2543,9 @@ diff -NurpP --minimal linux-4.9.207/fs/ext4/file.c linux-4.9.207-vs2.3.9.11/fs/e
+ .sync_flags = ext4_sync_flags,
};
-diff -NurpP --minimal linux-4.9.207/fs/ext4/ialloc.c linux-4.9.207-vs2.3.9.11/fs/ext4/ialloc.c
---- linux-4.9.207/fs/ext4/ialloc.c 2019-12-25 15:28:36.617327809 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/ext4/ialloc.c 2018-10-20 05:55:42.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/ext4/ialloc.c linux-4.9.217-vs2.3.9.12/fs/ext4/ialloc.c
+--- linux-4.9.217/fs/ext4/ialloc.c 2020-03-27 00:51:19.360517651 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/ext4/ialloc.c 2020-04-01 09:40:28.435468445 +0000
@@ -21,6 +21,7 @@
#include <linux/random.h>
#include <linux/bitops.h>
@@ -2554,7 +2554,7 @@ diff -NurpP --minimal linux-4.9.207/fs/ext4/ialloc.c linux-4.9.207-vs2.3.9.11/fs
#include <asm/byteorder.h>
#include "ext4.h"
-@@ -777,6 +778,7 @@ struct inode *__ext4_new_inode(handle_t
+@@ -780,6 +781,7 @@ struct inode *__ext4_new_inode(handle_t
inode->i_mode = mode;
inode->i_uid = current_fsuid();
inode->i_gid = dir->i_gid;
@@ -2562,9 +2562,9 @@ diff -NurpP --minimal linux-4.9.207/fs/ext4/ialloc.c linux-4.9.207-vs2.3.9.11/fs
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-4.9.207/fs/ext4/inode.c linux-4.9.207-vs2.3.9.11/fs/ext4/inode.c
---- linux-4.9.207/fs/ext4/inode.c 2019-12-25 15:28:36.667327000 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/ext4/inode.c 2019-12-25 15:37:51.518436962 +0000
+diff -NurpP --minimal linux-4.9.217/fs/ext4/inode.c linux-4.9.217-vs2.3.9.12/fs/ext4/inode.c
+--- linux-4.9.217/fs/ext4/inode.c 2020-03-27 00:51:19.610513714 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/ext4/inode.c 2020-04-01 09:40:28.445468277 +0000
@@ -37,6 +37,7 @@
#include <linux/printk.h>
#include <linux/slab.h>
@@ -2662,7 +2662,7 @@ diff -NurpP --minimal linux-4.9.207/fs/ext4/inode.c linux-4.9.207-vs2.3.9.11/fs/
ei->i_projid = make_kprojid(&init_user_ns, i_projid);
set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
-@@ -4870,8 +4897,10 @@ static int ext4_do_update_inode(handle_t
+@@ -4882,8 +4909,10 @@ static int ext4_do_update_inode(handle_t
ext4_get_inode_flags(ei);
raw_inode->i_mode = cpu_to_le16(inode->i_mode);
@@ -2675,7 +2675,7 @@ diff -NurpP --minimal linux-4.9.207/fs/ext4/inode.c linux-4.9.207-vs2.3.9.11/fs/
i_projid = from_kprojid(&init_user_ns, ei->i_projid);
if (!(test_opt(inode->i_sb, NO_UID32))) {
raw_inode->i_uid_low = cpu_to_le16(low_16_bits(i_uid));
-@@ -4895,6 +4924,9 @@ static int ext4_do_update_inode(handle_t
+@@ -4907,6 +4936,9 @@ static int ext4_do_update_inode(handle_t
raw_inode->i_uid_high = 0;
raw_inode->i_gid_high = 0;
}
@@ -2685,7 +2685,7 @@ diff -NurpP --minimal linux-4.9.207/fs/ext4/inode.c linux-4.9.207-vs2.3.9.11/fs/
raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
EXT4_INODE_SET_XTIME(i_ctime, inode, raw_inode);
-@@ -5152,7 +5184,8 @@ int ext4_setattr(struct dentry *dentry,
+@@ -5164,7 +5196,8 @@ int ext4_setattr(struct dentry *dentry,
return error;
}
if ((ia_valid & ATTR_UID && !uid_eq(attr->ia_uid, inode->i_uid)) ||
@@ -2695,7 +2695,7 @@ diff -NurpP --minimal linux-4.9.207/fs/ext4/inode.c linux-4.9.207-vs2.3.9.11/fs/
handle_t *handle;
/* (user+group)*(old+new) structure, inode write (sb,
-@@ -5175,6 +5208,8 @@ int ext4_setattr(struct dentry *dentry,
+@@ -5187,6 +5220,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;
@@ -2704,9 +2704,9 @@ diff -NurpP --minimal linux-4.9.207/fs/ext4/inode.c linux-4.9.207-vs2.3.9.11/fs/
error = ext4_mark_inode_dirty(handle, inode);
ext4_journal_stop(handle);
}
-diff -NurpP --minimal linux-4.9.207/fs/ext4/ioctl.c linux-4.9.207-vs2.3.9.11/fs/ext4/ioctl.c
---- linux-4.9.207/fs/ext4/ioctl.c 2019-12-25 15:28:36.707326353 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/ext4/ioctl.c 2019-10-05 14:58:45.150315864 +0000
+diff -NurpP --minimal linux-4.9.217/fs/ext4/ioctl.c linux-4.9.217-vs2.3.9.12/fs/ext4/ioctl.c
+--- linux-4.9.217/fs/ext4/ioctl.c 2020-03-27 00:51:19.620513553 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/ext4/ioctl.c 2019-10-05 14:58:45.150315864 +0000
@@ -15,6 +15,7 @@
#include <linux/file.h>
#include <linux/quotaops.h>
@@ -2772,9 +2772,9 @@ diff -NurpP --minimal linux-4.9.207/fs/ext4/ioctl.c linux-4.9.207-vs2.3.9.11/fs/
inode_lock(inode);
err = ext4_ioctl_setflags(inode, flags);
inode_unlock(inode);
-diff -NurpP --minimal linux-4.9.207/fs/ext4/namei.c linux-4.9.207-vs2.3.9.11/fs/ext4/namei.c
---- linux-4.9.207/fs/ext4/namei.c 2019-12-25 15:28:36.737325868 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/ext4/namei.c 2019-10-05 14:58:45.150315864 +0000
+diff -NurpP --minimal linux-4.9.217/fs/ext4/namei.c linux-4.9.217-vs2.3.9.12/fs/ext4/namei.c
+--- linux-4.9.217/fs/ext4/namei.c 2020-03-27 00:51:19.650513081 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/ext4/namei.c 2020-04-01 09:40:28.445468277 +0000
@@ -33,6 +33,7 @@
#include <linux/quotaops.h>
#include <linux/buffer_head.h>
@@ -2783,7 +2783,7 @@ diff -NurpP --minimal linux-4.9.207/fs/ext4/namei.c linux-4.9.207-vs2.3.9.11/fs/
#include "ext4.h"
#include "ext4_jbd2.h"
-@@ -1474,6 +1475,7 @@ restart:
+@@ -1475,6 +1476,7 @@ restart:
REQ_META | REQ_PRIO,
1, &bh);
}
@@ -2791,7 +2791,7 @@ diff -NurpP --minimal linux-4.9.207/fs/ext4/namei.c linux-4.9.207-vs2.3.9.11/fs/
}
if ((bh = bh_use[ra_ptr++]) == NULL)
goto next;
-@@ -3943,6 +3945,7 @@ const struct inode_operations ext4_dir_i
+@@ -3954,6 +3956,7 @@ const struct inode_operations ext4_dir_i
.get_acl = ext4_get_acl,
.set_acl = ext4_set_acl,
.fiemap = ext4_fiemap,
@@ -2799,10 +2799,10 @@ diff -NurpP --minimal linux-4.9.207/fs/ext4/namei.c linux-4.9.207-vs2.3.9.11/fs/
};
const struct inode_operations ext4_special_inode_operations = {
-diff -NurpP --minimal linux-4.9.207/fs/ext4/super.c linux-4.9.207-vs2.3.9.11/fs/ext4/super.c
---- linux-4.9.207/fs/ext4/super.c 2019-12-25 15:28:36.737325868 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/ext4/super.c 2019-10-05 14:58:45.150315864 +0000
-@@ -1292,6 +1292,7 @@ enum {
+diff -NurpP --minimal linux-4.9.217/fs/ext4/super.c linux-4.9.217-vs2.3.9.12/fs/ext4/super.c
+--- linux-4.9.217/fs/ext4/super.c 2020-03-27 00:51:19.660512926 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/ext4/super.c 2020-04-01 09:40:28.445468277 +0000
+@@ -1302,6 +1302,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,
@@ -2810,7 +2810,7 @@ diff -NurpP --minimal linux-4.9.207/fs/ext4/super.c linux-4.9.207-vs2.3.9.11/fs/
};
static const match_table_t tokens = {
-@@ -1378,6 +1379,9 @@ static const match_table_t tokens = {
+@@ -1388,6 +1389,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 */
@@ -2820,7 +2820,7 @@ diff -NurpP --minimal linux-4.9.207/fs/ext4/super.c linux-4.9.207-vs2.3.9.11/fs/
{Opt_err, NULL},
};
-@@ -1623,6 +1627,20 @@ static int handle_mount_opt(struct super
+@@ -1633,6 +1637,20 @@ static int handle_mount_opt(struct super
case Opt_nolazytime:
sb->s_flags &= ~MS_LAZYTIME;
return 1;
@@ -2841,7 +2841,7 @@ diff -NurpP --minimal linux-4.9.207/fs/ext4/super.c linux-4.9.207-vs2.3.9.11/fs/
}
for (m = ext4_mount_opts; m->token != Opt_err; m++)
-@@ -3598,6 +3616,9 @@ static int ext4_fill_super(struct super_
+@@ -3652,6 +3670,9 @@ static int ext4_fill_super(struct super_
sb->s_iflags |= SB_I_CGROUPWB;
}
@@ -2851,7 +2851,7 @@ diff -NurpP --minimal linux-4.9.207/fs/ext4/super.c linux-4.9.207-vs2.3.9.11/fs/
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-@@ -4996,6 +5017,14 @@ static int ext4_remount(struct super_blo
+@@ -5045,6 +5066,14 @@ static int ext4_remount(struct super_blo
if (sbi->s_mount_flags & EXT4_MF_FS_ABORTED)
ext4_abort(sb, "Abort forced by user");
@@ -2866,9 +2866,9 @@ diff -NurpP --minimal linux-4.9.207/fs/ext4/super.c linux-4.9.207-vs2.3.9.11/fs/
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-4.9.207/fs/fcntl.c linux-4.9.207-vs2.3.9.11/fs/fcntl.c
---- linux-4.9.207/fs/fcntl.c 2019-12-25 15:28:36.887323442 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/fcntl.c 2018-10-20 04:58:13.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/fcntl.c linux-4.9.217-vs2.3.9.12/fs/fcntl.c
+--- linux-4.9.217/fs/fcntl.c 2020-03-27 00:51:19.840510086 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/fcntl.c 2018-10-20 04:58:13.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/pid_namespace.h>
#include <linux/user_namespace.h>
@@ -2886,9 +2886,9 @@ diff -NurpP --minimal linux-4.9.207/fs/fcntl.c linux-4.9.207-vs2.3.9.11/fs/fcntl
if (unlikely(f.file->f_mode & FMODE_PATH)) {
if (!check_fcntl_cmd(cmd))
-diff -NurpP --minimal linux-4.9.207/fs/file.c linux-4.9.207-vs2.3.9.11/fs/file.c
---- linux-4.9.207/fs/file.c 2019-12-25 15:28:36.907323120 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/file.c 2019-10-05 14:58:45.150315864 +0000
+diff -NurpP --minimal linux-4.9.217/fs/file.c linux-4.9.217-vs2.3.9.12/fs/file.c
+--- linux-4.9.217/fs/file.c 2020-03-27 00:51:19.860509770 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/file.c 2019-10-05 14:58:45.150315864 +0000
@@ -22,6 +22,7 @@
#include <linux/spinlock.h>
#include <linux/rcupdate.h>
@@ -2943,9 +2943,9 @@ diff -NurpP --minimal linux-4.9.207/fs/file.c linux-4.9.207-vs2.3.9.11/fs/file.c
return fd;
-diff -NurpP --minimal linux-4.9.207/fs/file_table.c linux-4.9.207-vs2.3.9.11/fs/file_table.c
---- linux-4.9.207/fs/file_table.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/file_table.c 2018-10-20 04:58:13.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/file_table.c linux-4.9.217-vs2.3.9.12/fs/file_table.c
+--- linux-4.9.217/fs/file_table.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/file_table.c 2018-10-20 04:58:13.000000000 +0000
@@ -26,6 +26,8 @@
#include <linux/task_work.h>
#include <linux/ima.h>
@@ -2982,9 +2982,9 @@ diff -NurpP --minimal linux-4.9.207/fs/file_table.c linux-4.9.207-vs2.3.9.11/fs/
file_free(file);
}
}
-diff -NurpP --minimal linux-4.9.207/fs/fs_struct.c linux-4.9.207-vs2.3.9.11/fs/fs_struct.c
---- linux-4.9.207/fs/fs_struct.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/fs_struct.c 2018-10-20 04:58:13.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/fs_struct.c linux-4.9.217-vs2.3.9.12/fs/fs_struct.c
+--- linux-4.9.217/fs/fs_struct.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/fs_struct.c 2018-10-20 04:58:13.000000000 +0000
@@ -4,6 +4,7 @@
#include <linux/path.h>
#include <linux/slab.h>
@@ -3009,9 +3009,9 @@ diff -NurpP --minimal linux-4.9.207/fs/fs_struct.c linux-4.9.207-vs2.3.9.11/fs/f
}
return fs;
}
-diff -NurpP --minimal linux-4.9.207/fs/gfs2/file.c linux-4.9.207-vs2.3.9.11/fs/gfs2/file.c
---- linux-4.9.207/fs/gfs2/file.c 2019-12-25 15:28:37.037321018 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/gfs2/file.c 2018-10-20 04:58:13.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/gfs2/file.c linux-4.9.217-vs2.3.9.12/fs/gfs2/file.c
+--- linux-4.9.217/fs/gfs2/file.c 2020-03-27 00:51:20.390501417 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/gfs2/file.c 2018-10-20 04:58:13.000000000 +0000
@@ -137,6 +137,9 @@ static const u32 fsflags_to_gfs2[32] = {
[12] = GFS2_DIF_EXHASH,
[14] = GFS2_DIF_INHERIT_JDATA,
@@ -3133,9 +3133,9 @@ diff -NurpP --minimal linux-4.9.207/fs/gfs2/file.c linux-4.9.207-vs2.3.9.11/fs/g
static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
switch(cmd) {
-diff -NurpP --minimal linux-4.9.207/fs/gfs2/inode.h linux-4.9.207-vs2.3.9.11/fs/gfs2/inode.h
---- linux-4.9.207/fs/gfs2/inode.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/gfs2/inode.h 2018-10-20 04:58:13.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/gfs2/inode.h linux-4.9.217-vs2.3.9.12/fs/gfs2/inode.h
+--- linux-4.9.217/fs/gfs2/inode.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/gfs2/inode.h 2018-10-20 04:58:13.000000000 +0000
@@ -117,6 +117,7 @@ extern const struct file_operations gfs2
extern const struct file_operations gfs2_dir_fops_nolock;
@@ -3144,9 +3144,9 @@ diff -NurpP --minimal linux-4.9.207/fs/gfs2/inode.h linux-4.9.207-vs2.3.9.11/fs/
#ifdef CONFIG_GFS2_FS_LOCKING_DLM
extern const struct file_operations gfs2_file_fops;
-diff -NurpP --minimal linux-4.9.207/fs/hostfs/hostfs.h linux-4.9.207-vs2.3.9.11/fs/hostfs/hostfs.h
---- linux-4.9.207/fs/hostfs/hostfs.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/hostfs/hostfs.h 2018-10-20 04:58:13.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/hostfs/hostfs.h linux-4.9.217-vs2.3.9.12/fs/hostfs/hostfs.h
+--- linux-4.9.217/fs/hostfs/hostfs.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/hostfs/hostfs.h 2018-10-20 04:58:13.000000000 +0000
@@ -42,6 +42,7 @@ struct hostfs_iattr {
unsigned short ia_mode;
uid_t ia_uid;
@@ -3155,9 +3155,9 @@ diff -NurpP --minimal linux-4.9.207/fs/hostfs/hostfs.h linux-4.9.207-vs2.3.9.11/
loff_t ia_size;
struct timespec ia_atime;
struct timespec ia_mtime;
-diff -NurpP --minimal linux-4.9.207/fs/inode.c linux-4.9.207-vs2.3.9.11/fs/inode.c
---- linux-4.9.207/fs/inode.c 2019-12-25 15:28:37.147319239 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/inode.c 2019-10-05 14:58:45.170315544 +0000
+diff -NurpP --minimal linux-4.9.217/fs/inode.c linux-4.9.217-vs2.3.9.12/fs/inode.c
+--- linux-4.9.217/fs/inode.c 2020-03-27 00:51:20.860494012 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/inode.c 2019-10-05 14:58:45.170315544 +0000
@@ -18,6 +18,7 @@
#include <linux/buffer_head.h> /* for inode_has_buffers */
#include <linux/ratelimit.h>
@@ -3220,9 +3220,9 @@ diff -NurpP --minimal linux-4.9.207/fs/inode.c linux-4.9.207-vs2.3.9.11/fs/inode
}
EXPORT_SYMBOL(inode_init_owner);
-diff -NurpP --minimal linux-4.9.207/fs/ioctl.c linux-4.9.207-vs2.3.9.11/fs/ioctl.c
---- linux-4.9.207/fs/ioctl.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/ioctl.c 2018-10-20 04:58:13.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/ioctl.c linux-4.9.217-vs2.3.9.12/fs/ioctl.c
+--- linux-4.9.217/fs/ioctl.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/ioctl.c 2018-10-20 04:58:13.000000000 +0000
@@ -15,6 +15,9 @@
#include <linux/writeback.h>
#include <linux/buffer_head.h>
@@ -3233,9 +3233,9 @@ diff -NurpP --minimal linux-4.9.207/fs/ioctl.c linux-4.9.207-vs2.3.9.11/fs/ioctl
#include "internal.h"
#include <asm/ioctls.h>
-diff -NurpP --minimal linux-4.9.207/fs/jfs/file.c linux-4.9.207-vs2.3.9.11/fs/jfs/file.c
---- linux-4.9.207/fs/jfs/file.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/jfs/file.c 2018-10-20 04:58:13.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/jfs/file.c linux-4.9.217-vs2.3.9.12/fs/jfs/file.c
+--- linux-4.9.217/fs/jfs/file.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/jfs/file.c 2018-10-20 04:58:13.000000000 +0000
@@ -113,7 +113,8 @@ int jfs_setattr(struct dentry *dentry, s
return rc;
}
@@ -3254,9 +3254,9 @@ diff -NurpP --minimal linux-4.9.207/fs/jfs/file.c linux-4.9.207-vs2.3.9.11/fs/jf
};
const struct file_operations jfs_file_operations = {
-diff -NurpP --minimal linux-4.9.207/fs/jfs/ioctl.c linux-4.9.207-vs2.3.9.11/fs/jfs/ioctl.c
---- linux-4.9.207/fs/jfs/ioctl.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/jfs/ioctl.c 2018-10-20 04:58:13.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/jfs/ioctl.c linux-4.9.217-vs2.3.9.12/fs/jfs/ioctl.c
+--- linux-4.9.217/fs/jfs/ioctl.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/jfs/ioctl.c 2018-10-20 04:58:13.000000000 +0000
@@ -12,6 +12,7 @@
#include <linux/time.h>
#include <linux/sched.h>
@@ -3314,9 +3314,9 @@ diff -NurpP --minimal linux-4.9.207/fs/jfs/ioctl.c linux-4.9.207-vs2.3.9.11/fs/j
flags |= oldflags & ~JFS_FL_USER_MODIFIABLE;
jfs_inode->mode2 = flags;
-diff -NurpP --minimal linux-4.9.207/fs/jfs/jfs_dinode.h linux-4.9.207-vs2.3.9.11/fs/jfs/jfs_dinode.h
---- linux-4.9.207/fs/jfs/jfs_dinode.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/jfs/jfs_dinode.h 2018-10-20 04:58:13.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/jfs/jfs_dinode.h linux-4.9.217-vs2.3.9.12/fs/jfs/jfs_dinode.h
+--- linux-4.9.217/fs/jfs/jfs_dinode.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/jfs/jfs_dinode.h 2018-10-20 04:58:13.000000000 +0000
@@ -161,9 +161,13 @@ struct dinode {
#define JFS_APPEND_FL 0x01000000 /* writes to file may only append */
@@ -3333,9 +3333,9 @@ diff -NurpP --minimal linux-4.9.207/fs/jfs/jfs_dinode.h linux-4.9.207-vs2.3.9.11
#define JFS_FL_INHERIT 0x03C80000
/* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */
-diff -NurpP --minimal linux-4.9.207/fs/jfs/jfs_filsys.h linux-4.9.207-vs2.3.9.11/fs/jfs/jfs_filsys.h
---- linux-4.9.207/fs/jfs/jfs_filsys.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/jfs/jfs_filsys.h 2018-10-20 04:58:13.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/jfs/jfs_filsys.h linux-4.9.217-vs2.3.9.12/fs/jfs/jfs_filsys.h
+--- linux-4.9.217/fs/jfs/jfs_filsys.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/jfs/jfs_filsys.h 2018-10-20 04:58:13.000000000 +0000
@@ -266,6 +266,7 @@
#define JFS_NAME_MAX 255
#define JFS_PATH_MAX BPSIZE
@@ -3344,9 +3344,9 @@ diff -NurpP --minimal linux-4.9.207/fs/jfs/jfs_filsys.h linux-4.9.207-vs2.3.9.11
/*
* file system state (superblock state)
-diff -NurpP --minimal linux-4.9.207/fs/jfs/jfs_imap.c linux-4.9.207-vs2.3.9.11/fs/jfs/jfs_imap.c
---- linux-4.9.207/fs/jfs/jfs_imap.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/jfs/jfs_imap.c 2018-10-20 04:58:13.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/jfs/jfs_imap.c linux-4.9.217-vs2.3.9.12/fs/jfs/jfs_imap.c
+--- linux-4.9.217/fs/jfs/jfs_imap.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/jfs/jfs_imap.c 2018-10-20 04:58:13.000000000 +0000
@@ -46,6 +46,7 @@
#include <linux/pagemap.h>
#include <linux/quotaops.h>
@@ -3410,9 +3410,9 @@ diff -NurpP --minimal linux-4.9.207/fs/jfs/jfs_imap.c linux-4.9.207-vs2.3.9.11/f
jfs_get_inode_flags(jfs_ip);
/*
* mode2 is only needed for storing the higher order bits.
-diff -NurpP --minimal linux-4.9.207/fs/jfs/jfs_inode.c linux-4.9.207-vs2.3.9.11/fs/jfs/jfs_inode.c
---- linux-4.9.207/fs/jfs/jfs_inode.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/jfs/jfs_inode.c 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/jfs/jfs_inode.c linux-4.9.217-vs2.3.9.12/fs/jfs/jfs_inode.c
+--- linux-4.9.217/fs/jfs/jfs_inode.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/jfs/jfs_inode.c 2018-10-20 04:58:14.000000000 +0000
@@ -18,6 +18,7 @@
#include <linux/fs.h>
@@ -3483,9 +3483,9 @@ diff -NurpP --minimal linux-4.9.207/fs/jfs/jfs_inode.c linux-4.9.207-vs2.3.9.11/
}
/*
-diff -NurpP --minimal linux-4.9.207/fs/jfs/jfs_inode.h linux-4.9.207-vs2.3.9.11/fs/jfs/jfs_inode.h
---- linux-4.9.207/fs/jfs/jfs_inode.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/jfs/jfs_inode.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/jfs/jfs_inode.h linux-4.9.217-vs2.3.9.12/fs/jfs/jfs_inode.h
+--- linux-4.9.217/fs/jfs/jfs_inode.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/jfs/jfs_inode.h 2018-10-20 04:58:14.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);
@@ -3494,9 +3494,9 @@ diff -NurpP --minimal linux-4.9.207/fs/jfs/jfs_inode.h linux-4.9.207-vs2.3.9.11/
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.9.207/fs/jfs/namei.c linux-4.9.207-vs2.3.9.11/fs/jfs/namei.c
---- linux-4.9.207/fs/jfs/namei.c 2019-12-25 15:28:37.197318432 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/jfs/namei.c 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/jfs/namei.c linux-4.9.217-vs2.3.9.12/fs/jfs/namei.c
+--- linux-4.9.217/fs/jfs/namei.c 2020-03-27 00:51:21.670481243 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/jfs/namei.c 2018-10-20 04:58:14.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/ctype.h>
#include <linux/quotaops.h>
@@ -3521,9 +3521,9 @@ diff -NurpP --minimal linux-4.9.207/fs/jfs/namei.c linux-4.9.207-vs2.3.9.11/fs/j
};
const struct file_operations jfs_dir_operations = {
-diff -NurpP --minimal linux-4.9.207/fs/jfs/super.c linux-4.9.207-vs2.3.9.11/fs/jfs/super.c
---- linux-4.9.207/fs/jfs/super.c 2019-12-25 15:28:37.197318432 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/jfs/super.c 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/jfs/super.c linux-4.9.217-vs2.3.9.12/fs/jfs/super.c
+--- linux-4.9.217/fs/jfs/super.c 2020-03-27 00:51:21.670481243 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/jfs/super.c 2018-10-20 04:58:14.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,
@@ -3590,9 +3590,9 @@ diff -NurpP --minimal linux-4.9.207/fs/jfs/super.c linux-4.9.207-vs2.3.9.11/fs/j
if (newLVSize) {
pr_err("resize option for remount only\n");
-diff -NurpP --minimal linux-4.9.207/fs/libfs.c linux-4.9.207-vs2.3.9.11/fs/libfs.c
---- linux-4.9.207/fs/libfs.c 2019-12-25 15:28:37.237317786 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/libfs.c 2019-10-22 13:49:06.407707139 +0000
+diff -NurpP --minimal linux-4.9.217/fs/libfs.c linux-4.9.217-vs2.3.9.12/fs/libfs.c
+--- linux-4.9.217/fs/libfs.c 2020-03-27 00:51:21.710480616 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/libfs.c 2019-10-22 13:49:06.407707139 +0000
@@ -180,7 +180,8 @@ static inline unsigned char dt_type(stru
* both impossible due to the lock on directory.
*/
@@ -3639,9 +3639,9 @@ diff -NurpP --minimal linux-4.9.207/fs/libfs.c linux-4.9.207-vs2.3.9.11/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.9.207/fs/locks.c linux-4.9.207-vs2.3.9.11/fs/locks.c
---- linux-4.9.207/fs/locks.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/locks.c 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/locks.c linux-4.9.217-vs2.3.9.12/fs/locks.c
+--- linux-4.9.217/fs/locks.c 2020-03-27 00:51:21.800479197 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/locks.c 2020-04-01 09:40:28.545466623 +0000
@@ -127,6 +127,8 @@
#include <linux/pid_namespace.h>
#include <linux/hashtable.h>
@@ -3828,9 +3828,9 @@ diff -NurpP --minimal linux-4.9.207/fs/locks.c linux-4.9.207-vs2.3.9.11/fs/locks
return 0;
}
-diff -NurpP --minimal linux-4.9.207/fs/mount.h linux-4.9.207-vs2.3.9.11/fs/mount.h
---- linux-4.9.207/fs/mount.h 2019-12-25 15:28:37.257317461 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/mount.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/mount.h linux-4.9.217-vs2.3.9.12/fs/mount.h
+--- linux-4.9.217/fs/mount.h 2020-03-27 00:51:21.850478409 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/mount.h 2018-10-20 04:58:14.000000000 +0000
@@ -69,6 +69,7 @@ struct mount {
struct hlist_head mnt_pins;
struct fs_pin mnt_umount;
@@ -3839,9 +3839,9 @@ diff -NurpP --minimal linux-4.9.207/fs/mount.h linux-4.9.207-vs2.3.9.11/fs/mount
};
#define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */
-diff -NurpP --minimal linux-4.9.207/fs/namei.c linux-4.9.207-vs2.3.9.11/fs/namei.c
---- linux-4.9.207/fs/namei.c 2019-12-25 15:28:37.257317461 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/namei.c 2019-02-22 08:37:55.023061290 +0000
+diff -NurpP --minimal linux-4.9.217/fs/namei.c linux-4.9.217-vs2.3.9.12/fs/namei.c
+--- linux-4.9.217/fs/namei.c 2020-03-27 00:51:21.910477461 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/namei.c 2020-04-01 09:40:28.545466623 +0000
@@ -37,9 +37,19 @@
#include <linux/hash.h>
#include <linux/bitops.h>
@@ -3976,7 +3976,7 @@ diff -NurpP --minimal linux-4.9.207/fs/namei.c linux-4.9.207-vs2.3.9.11/fs/namei
retval = do_inode_permission(inode, mask);
if (retval)
return retval;
-@@ -2824,7 +2925,7 @@ static int may_delete(struct inode *dir,
+@@ -2825,7 +2926,7 @@ static int may_delete(struct inode *dir,
return -EPERM;
if (check_sticky(dir, inode) || IS_APPEND(inode) ||
@@ -3985,7 +3985,7 @@ diff -NurpP --minimal linux-4.9.207/fs/namei.c linux-4.9.207-vs2.3.9.11/fs/namei
return -EPERM;
if (isdir) {
if (!d_is_dir(victim))
-@@ -2912,19 +3013,25 @@ int vfs_create(struct inode *dir, struct
+@@ -2913,19 +3014,25 @@ int vfs_create(struct inode *dir, struct
bool want_excl)
{
int error = may_create(dir, dentry);
@@ -4013,7 +4013,7 @@ diff -NurpP --minimal linux-4.9.207/fs/namei.c linux-4.9.207-vs2.3.9.11/fs/namei
return error;
}
EXPORT_SYMBOL(vfs_create);
-@@ -2962,6 +3069,15 @@ static int may_open(struct path *path, i
+@@ -2963,6 +3070,15 @@ static int may_open(struct path *path, i
break;
}
@@ -4029,7 +4029,7 @@ diff -NurpP --minimal linux-4.9.207/fs/namei.c linux-4.9.207-vs2.3.9.11/fs/namei
error = inode_permission(inode, MAY_OPEN | acc_mode);
if (error)
return error;
-@@ -3420,6 +3536,16 @@ finish_open:
+@@ -3423,6 +3539,16 @@ finish_open:
}
finish_open_created:
error = may_open(&nd->path, acc_mode, open_flag);
@@ -4046,7 +4046,7 @@ diff -NurpP --minimal linux-4.9.207/fs/namei.c linux-4.9.207-vs2.3.9.11/fs/namei
if (error)
goto out;
BUG_ON(*opened & FILE_OPENED); /* once it's opened, it's opened */
-@@ -3523,6 +3649,9 @@ static struct file *path_openat(struct n
+@@ -3526,6 +3652,9 @@ static struct file *path_openat(struct n
int opened = 0;
int error;
@@ -4056,7 +4056,7 @@ diff -NurpP --minimal linux-4.9.207/fs/namei.c linux-4.9.207-vs2.3.9.11/fs/namei
file = get_empty_filp();
if (IS_ERR(file))
return file;
-@@ -3556,6 +3685,12 @@ static struct file *path_openat(struct n
+@@ -3559,6 +3688,12 @@ static struct file *path_openat(struct n
}
}
terminate_walk(nd);
@@ -4069,7 +4069,7 @@ diff -NurpP --minimal linux-4.9.207/fs/namei.c linux-4.9.207-vs2.3.9.11/fs/namei
out2:
if (!(opened & FILE_OPENED)) {
BUG_ON(!error);
-@@ -3676,6 +3811,11 @@ static struct dentry *filename_create(in
+@@ -3679,6 +3814,11 @@ static struct dentry *filename_create(in
goto fail;
}
putname(name);
@@ -4081,7 +4081,7 @@ diff -NurpP --minimal linux-4.9.207/fs/namei.c linux-4.9.207-vs2.3.9.11/fs/namei
return dentry;
fail:
dput(dentry);
-@@ -3794,6 +3934,7 @@ retry:
+@@ -3797,6 +3937,7 @@ retry:
error = vfs_mknod(path.dentry->d_inode,dentry,mode,0);
break;
}
@@ -4089,7 +4089,7 @@ diff -NurpP --minimal linux-4.9.207/fs/namei.c linux-4.9.207-vs2.3.9.11/fs/namei
out:
done_path_create(&path, dentry);
if (retry_estale(error, lookup_flags)) {
-@@ -4215,7 +4356,7 @@ int vfs_link(struct dentry *old_dentry,
+@@ -4218,7 +4359,7 @@ int vfs_link(struct dentry *old_dentry,
/*
* A link to an append-only or immutable file cannot be created.
*/
@@ -4098,7 +4098,7 @@ diff -NurpP --minimal linux-4.9.207/fs/namei.c linux-4.9.207-vs2.3.9.11/fs/namei
return -EPERM;
/*
* Updating the link count will likely cause i_uid and i_gid to
-@@ -4745,6 +4886,326 @@ const char *vfs_get_link(struct dentry *
+@@ -4748,6 +4889,326 @@ const char *vfs_get_link(struct dentry *
}
EXPORT_SYMBOL(vfs_get_link);
@@ -4425,9 +4425,9 @@ diff -NurpP --minimal linux-4.9.207/fs/namei.c linux-4.9.207-vs2.3.9.11/fs/namei
/* get the link contents into pagecache */
const char *page_get_link(struct dentry *dentry, struct inode *inode,
struct delayed_call *callback)
-diff -NurpP --minimal linux-4.9.207/fs/namespace.c linux-4.9.207-vs2.3.9.11/fs/namespace.c
---- linux-4.9.207/fs/namespace.c 2019-12-25 15:28:37.257317461 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/namespace.c 2019-02-22 08:37:55.023061290 +0000
+diff -NurpP --minimal linux-4.9.217/fs/namespace.c linux-4.9.217-vs2.3.9.12/fs/namespace.c
+--- linux-4.9.217/fs/namespace.c 2020-03-27 00:51:21.950476834 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/namespace.c 2019-02-22 08:37:55.023061290 +0000
@@ -24,6 +24,11 @@
#include <linux/magic.h>
#include <linux/bootmem.h>
@@ -4573,9 +4573,9 @@ diff -NurpP --minimal linux-4.9.207/fs/namespace.c linux-4.9.207-vs2.3.9.11/fs/n
free_mnt_ns(ns);
}
-diff -NurpP --minimal linux-4.9.207/fs/nfs/client.c linux-4.9.207-vs2.3.9.11/fs/nfs/client.c
---- linux-4.9.207/fs/nfs/client.c 2019-12-25 15:28:37.347316006 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/nfs/client.c 2019-10-05 14:58:45.410311711 +0000
+diff -NurpP --minimal linux-4.9.217/fs/nfs/client.c linux-4.9.217-vs2.3.9.12/fs/nfs/client.c
+--- linux-4.9.217/fs/nfs/client.c 2020-03-27 00:51:22.630466112 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/nfs/client.c 2019-10-05 14:58:45.410311711 +0000
@@ -586,6 +586,9 @@ int nfs_init_server_rpcclient(struct nfs
if (server->flags & NFS_MOUNT_SOFT)
server->client->cl_softrtry = 1;
@@ -4597,9 +4597,9 @@ diff -NurpP --minimal linux-4.9.207/fs/nfs/client.c linux-4.9.207-vs2.3.9.11/fs/
server->maxfilesize = fsinfo->maxfilesize;
server->time_delta = fsinfo->time_delta;
-diff -NurpP --minimal linux-4.9.207/fs/nfs/dir.c linux-4.9.207-vs2.3.9.11/fs/nfs/dir.c
---- linux-4.9.207/fs/nfs/dir.c 2019-12-25 15:28:37.357315845 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/nfs/dir.c 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/nfs/dir.c linux-4.9.217-vs2.3.9.12/fs/nfs/dir.c
+--- linux-4.9.217/fs/nfs/dir.c 2020-03-27 00:51:22.830462961 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/nfs/dir.c 2020-04-01 09:40:28.555466454 +0000
@@ -37,6 +37,7 @@
#include <linux/sched.h>
#include <linux/kmemleak.h>
@@ -4608,7 +4608,7 @@ diff -NurpP --minimal linux-4.9.207/fs/nfs/dir.c linux-4.9.207-vs2.3.9.11/fs/nfs
#include "delegation.h"
#include "iostat.h"
-@@ -1420,6 +1421,7 @@ struct dentry *nfs_lookup(struct inode *
+@@ -1428,6 +1429,7 @@ struct dentry *nfs_lookup(struct inode *
/* Success: notify readdir to use READDIRPLUS */
nfs_advise_use_readdirplus(dir);
@@ -4616,9 +4616,9 @@ diff -NurpP --minimal linux-4.9.207/fs/nfs/dir.c linux-4.9.207-vs2.3.9.11/fs/nfs
no_entry:
res = d_splice_alias(inode, dentry);
if (res != NULL) {
-diff -NurpP --minimal linux-4.9.207/fs/nfs/inode.c linux-4.9.207-vs2.3.9.11/fs/nfs/inode.c
---- linux-4.9.207/fs/nfs/inode.c 2019-12-25 15:28:37.417314874 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/nfs/inode.c 2019-10-05 14:58:45.430311390 +0000
+diff -NurpP --minimal linux-4.9.217/fs/nfs/inode.c linux-4.9.217-vs2.3.9.12/fs/nfs/inode.c
+--- linux-4.9.217/fs/nfs/inode.c 2020-03-27 00:51:22.940461230 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/nfs/inode.c 2019-10-05 14:58:45.430311390 +0000
@@ -38,6 +38,7 @@
#include <linux/slab.h>
#include <linux/compat.h>
@@ -4744,9 +4744,9 @@ diff -NurpP --minimal linux-4.9.207/fs/nfs/inode.c linux-4.9.207-vs2.3.9.11/fs/n
if (fattr->valid & NFS_ATTR_FATTR_NLINK) {
if (inode->i_nlink != fattr->nlink) {
invalid |= NFS_INO_INVALID_ATTR;
-diff -NurpP --minimal linux-4.9.207/fs/nfs/nfs3xdr.c linux-4.9.207-vs2.3.9.11/fs/nfs/nfs3xdr.c
---- linux-4.9.207/fs/nfs/nfs3xdr.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/nfs/nfs3xdr.c 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/nfs/nfs3xdr.c linux-4.9.217-vs2.3.9.12/fs/nfs/nfs3xdr.c
+--- linux-4.9.217/fs/nfs/nfs3xdr.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/nfs/nfs3xdr.c 2018-10-20 04:58:14.000000000 +0000
@@ -20,6 +20,7 @@
#include <linux/nfs3.h>
#include <linux/nfs_fs.h>
@@ -4892,9 +4892,9 @@ diff -NurpP --minimal linux-4.9.207/fs/nfs/nfs3xdr.c linux-4.9.207-vs2.3.9.11/fs
}
/*
-diff -NurpP --minimal linux-4.9.207/fs/nfs/super.c linux-4.9.207-vs2.3.9.11/fs/nfs/super.c
---- linux-4.9.207/fs/nfs/super.c 2019-12-25 15:28:37.507313419 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/nfs/super.c 2019-10-05 14:58:45.430311390 +0000
+diff -NurpP --minimal linux-4.9.217/fs/nfs/super.c linux-4.9.217-vs2.3.9.12/fs/nfs/super.c
+--- linux-4.9.217/fs/nfs/super.c 2020-03-27 00:51:23.470452877 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/nfs/super.c 2020-04-01 09:40:28.555466454 +0000
@@ -54,6 +54,7 @@
#include <linux/parser.h>
#include <linux/nsproxy.h>
@@ -4968,9 +4968,9 @@ diff -NurpP --minimal linux-4.9.207/fs/nfs/super.c linux-4.9.207-vs2.3.9.11/fs/n
/*
* options that take text values
-diff -NurpP --minimal linux-4.9.207/fs/nfsd/auth.c linux-4.9.207-vs2.3.9.11/fs/nfsd/auth.c
---- linux-4.9.207/fs/nfsd/auth.c 2019-12-25 15:28:37.537312933 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/nfsd/auth.c 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/nfsd/auth.c linux-4.9.217-vs2.3.9.12/fs/nfsd/auth.c
+--- linux-4.9.217/fs/nfsd/auth.c 2020-03-27 00:51:23.680449564 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/nfsd/auth.c 2018-10-20 04:58:14.000000000 +0000
@@ -1,6 +1,7 @@
/* Copyright (C) 1995, 1996 Olaf Kirch <okir at monad.swb.de> */
@@ -4989,9 +4989,9 @@ diff -NurpP --minimal linux-4.9.207/fs/nfsd/auth.c linux-4.9.207-vs2.3.9.11/fs/n
rqgi = rqstp->rq_cred.cr_group_info;
-diff -NurpP --minimal linux-4.9.207/fs/nfsd/nfs3xdr.c linux-4.9.207-vs2.3.9.11/fs/nfsd/nfs3xdr.c
---- linux-4.9.207/fs/nfsd/nfs3xdr.c 2019-12-25 15:28:37.557312612 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/nfsd/nfs3xdr.c 2019-10-05 14:58:45.440311232 +0000
+diff -NurpP --minimal linux-4.9.217/fs/nfsd/nfs3xdr.c linux-4.9.217-vs2.3.9.12/fs/nfsd/nfs3xdr.c
+--- linux-4.9.217/fs/nfsd/nfs3xdr.c 2020-03-27 00:51:23.700449249 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/nfsd/nfs3xdr.c 2019-10-05 14:58:45.440311232 +0000
@@ -8,6 +8,7 @@
#include <linux/namei.h>
@@ -5045,9 +5045,9 @@ diff -NurpP --minimal linux-4.9.207/fs/nfsd/nfs3xdr.c linux-4.9.207-vs2.3.9.11/f
if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) {
p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN);
} else {
-diff -NurpP --minimal linux-4.9.207/fs/nfsd/nfs4xdr.c linux-4.9.207-vs2.3.9.11/fs/nfsd/nfs4xdr.c
---- linux-4.9.207/fs/nfsd/nfs4xdr.c 2019-12-25 15:28:37.557312612 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/nfsd/nfs4xdr.c 2018-10-20 05:55:43.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/nfsd/nfs4xdr.c linux-4.9.217-vs2.3.9.12/fs/nfsd/nfs4xdr.c
+--- linux-4.9.217/fs/nfsd/nfs4xdr.c 2020-03-27 00:51:23.950445311 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/nfsd/nfs4xdr.c 2018-10-20 05:55:43.000000000 +0000
@@ -40,6 +40,7 @@
#include <linux/utsname.h>
#include <linux/pagemap.h>
@@ -5075,9 +5075,9 @@ diff -NurpP --minimal linux-4.9.207/fs/nfsd/nfs4xdr.c linux-4.9.207-vs2.3.9.11/f
if (status)
goto out;
}
-diff -NurpP --minimal linux-4.9.207/fs/nfsd/nfsxdr.c linux-4.9.207-vs2.3.9.11/fs/nfsd/nfsxdr.c
---- linux-4.9.207/fs/nfsd/nfsxdr.c 2019-12-25 15:28:37.567312448 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/nfsd/nfsxdr.c 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/nfsd/nfsxdr.c linux-4.9.217-vs2.3.9.12/fs/nfsd/nfsxdr.c
+--- linux-4.9.217/fs/nfsd/nfsxdr.c 2020-03-27 00:51:24.030444047 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/nfsd/nfsxdr.c 2018-10-20 04:58:14.000000000 +0000
@@ -7,6 +7,7 @@
#include "vfs.h"
#include "xdr.h"
@@ -5129,9 +5129,9 @@ diff -NurpP --minimal linux-4.9.207/fs/nfsd/nfsxdr.c linux-4.9.207-vs2.3.9.11/fs
if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
*p++ = htonl(NFS_MAXPATHLEN);
-diff -NurpP --minimal linux-4.9.207/fs/ocfs2/dlmglue.c linux-4.9.207-vs2.3.9.11/fs/ocfs2/dlmglue.c
---- linux-4.9.207/fs/ocfs2/dlmglue.c 2019-12-25 15:28:37.857307760 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/ocfs2/dlmglue.c 2019-12-25 15:37:51.918430506 +0000
+diff -NurpP --minimal linux-4.9.217/fs/ocfs2/dlmglue.c linux-4.9.217-vs2.3.9.12/fs/ocfs2/dlmglue.c
+--- linux-4.9.217/fs/ocfs2/dlmglue.c 2020-03-27 00:51:25.080427501 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/ocfs2/dlmglue.c 2019-12-25 15:37:51.918430506 +0000
@@ -2120,6 +2120,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));
@@ -5148,9 +5148,9 @@ diff -NurpP --minimal linux-4.9.207/fs/ocfs2/dlmglue.c linux-4.9.207-vs2.3.9.11/
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.9.207/fs/ocfs2/dlmglue.h linux-4.9.207-vs2.3.9.11/fs/ocfs2/dlmglue.h
---- linux-4.9.207/fs/ocfs2/dlmglue.h 2019-12-25 15:28:37.857307760 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/ocfs2/dlmglue.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/ocfs2/dlmglue.h linux-4.9.217-vs2.3.9.12/fs/ocfs2/dlmglue.h
+--- linux-4.9.217/fs/ocfs2/dlmglue.h 2020-03-27 00:51:25.080427501 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/ocfs2/dlmglue.h 2018-10-20 04:58:14.000000000 +0000
@@ -46,7 +46,8 @@ struct ocfs2_meta_lvb {
__be16 lvb_inlink;
__be32 lvb_iattr;
@@ -5161,9 +5161,9 @@ diff -NurpP --minimal linux-4.9.207/fs/ocfs2/dlmglue.h linux-4.9.207-vs2.3.9.11/
};
#define OCFS2_QINFO_LVB_VERSION 1
-diff -NurpP --minimal linux-4.9.207/fs/ocfs2/file.c linux-4.9.207-vs2.3.9.11/fs/ocfs2/file.c
---- linux-4.9.207/fs/ocfs2/file.c 2019-12-25 15:28:37.877307439 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/ocfs2/file.c 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/ocfs2/file.c linux-4.9.217-vs2.3.9.12/fs/ocfs2/file.c
+--- linux-4.9.217/fs/ocfs2/file.c 2020-03-27 00:51:25.110427029 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/ocfs2/file.c 2018-10-20 04:58:14.000000000 +0000
@@ -1151,7 +1151,7 @@ int ocfs2_setattr(struct dentry *dentry,
attr->ia_valid &= ~ATTR_SIZE;
@@ -5173,9 +5173,9 @@ diff -NurpP --minimal linux-4.9.207/fs/ocfs2/file.c linux-4.9.207-vs2.3.9.11/fs/
if (!(attr->ia_valid & OCFS2_VALID_ATTRS))
return 0;
-diff -NurpP --minimal linux-4.9.207/fs/ocfs2/inode.c linux-4.9.207-vs2.3.9.11/fs/ocfs2/inode.c
---- linux-4.9.207/fs/ocfs2/inode.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/ocfs2/inode.c 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/ocfs2/inode.c linux-4.9.217-vs2.3.9.12/fs/ocfs2/inode.c
+--- linux-4.9.217/fs/ocfs2/inode.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/ocfs2/inode.c 2018-10-20 04:58:14.000000000 +0000
@@ -28,6 +28,7 @@
#include <linux/highmem.h>
#include <linux/pagemap.h>
@@ -5272,9 +5272,9 @@ diff -NurpP --minimal linux-4.9.207/fs/ocfs2/inode.c linux-4.9.207-vs2.3.9.11/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.9.207/fs/ocfs2/inode.h linux-4.9.207-vs2.3.9.11/fs/ocfs2/inode.h
---- linux-4.9.207/fs/ocfs2/inode.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/ocfs2/inode.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/ocfs2/inode.h linux-4.9.217-vs2.3.9.12/fs/ocfs2/inode.h
+--- linux-4.9.217/fs/ocfs2/inode.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/ocfs2/inode.h 2018-10-20 04:58:14.000000000 +0000
@@ -155,6 +155,7 @@ int ocfs2_mark_inode_dirty(handle_t *han
void ocfs2_set_inode_flags(struct inode *inode);
@@ -5283,9 +5283,9 @@ diff -NurpP --minimal linux-4.9.207/fs/ocfs2/inode.h linux-4.9.207-vs2.3.9.11/fs
static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode)
{
-diff -NurpP --minimal linux-4.9.207/fs/ocfs2/ioctl.c linux-4.9.207-vs2.3.9.11/fs/ocfs2/ioctl.c
---- linux-4.9.207/fs/ocfs2/ioctl.c 2019-12-25 15:28:37.887307275 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/ocfs2/ioctl.c 2019-12-25 15:37:51.918430506 +0000
+diff -NurpP --minimal linux-4.9.217/fs/ocfs2/ioctl.c linux-4.9.217-vs2.3.9.12/fs/ocfs2/ioctl.c
+--- linux-4.9.217/fs/ocfs2/ioctl.c 2020-03-27 00:51:25.160426241 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/ocfs2/ioctl.c 2019-12-25 15:37:51.918430506 +0000
@@ -76,7 +76,41 @@ static int ocfs2_get_inode_attr(struct i
return status;
}
@@ -5349,9 +5349,9 @@ diff -NurpP --minimal linux-4.9.207/fs/ocfs2/ioctl.c linux-4.9.207-vs2.3.9.11/fs
long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
struct inode *inode = file_inode(filp);
-diff -NurpP --minimal linux-4.9.207/fs/ocfs2/namei.c linux-4.9.207-vs2.3.9.11/fs/ocfs2/namei.c
---- linux-4.9.207/fs/ocfs2/namei.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/ocfs2/namei.c 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/ocfs2/namei.c linux-4.9.217-vs2.3.9.12/fs/ocfs2/namei.c
+--- linux-4.9.217/fs/ocfs2/namei.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/ocfs2/namei.c 2018-10-20 04:58:14.000000000 +0000
@@ -41,6 +41,7 @@
#include <linux/slab.h>
#include <linux/highmem.h>
@@ -5384,9 +5384,9 @@ diff -NurpP --minimal linux-4.9.207/fs/ocfs2/namei.c linux-4.9.207-vs2.3.9.11/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.9.207/fs/ocfs2/ocfs2_fs.h linux-4.9.207-vs2.3.9.11/fs/ocfs2/ocfs2_fs.h
---- linux-4.9.207/fs/ocfs2/ocfs2_fs.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/ocfs2/ocfs2_fs.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/ocfs2/ocfs2_fs.h linux-4.9.217-vs2.3.9.12/fs/ocfs2/ocfs2_fs.h
+--- linux-4.9.217/fs/ocfs2/ocfs2_fs.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/ocfs2/ocfs2_fs.h 2018-10-20 04:58:14.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 */
@@ -5399,9 +5399,9 @@ diff -NurpP --minimal linux-4.9.207/fs/ocfs2/ocfs2_fs.h linux-4.9.207-vs2.3.9.11
#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.9.207/fs/ocfs2/ocfs2.h linux-4.9.207-vs2.3.9.11/fs/ocfs2/ocfs2.h
---- linux-4.9.207/fs/ocfs2/ocfs2.h 2019-12-25 15:28:37.907306953 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/ocfs2/ocfs2.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/ocfs2/ocfs2.h linux-4.9.217-vs2.3.9.12/fs/ocfs2/ocfs2.h
+--- linux-4.9.217/fs/ocfs2/ocfs2.h 2020-03-27 00:51:25.320423716 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/ocfs2/ocfs2.h 2018-10-20 04:58:14.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 */
@@ -5410,9 +5410,9 @@ diff -NurpP --minimal linux-4.9.207/fs/ocfs2/ocfs2.h linux-4.9.207-vs2.3.9.11/fs
};
#define OCFS2_OSB_SOFT_RO 0x0001
-diff -NurpP --minimal linux-4.9.207/fs/ocfs2/super.c linux-4.9.207-vs2.3.9.11/fs/ocfs2/super.c
---- linux-4.9.207/fs/ocfs2/super.c 2019-12-25 15:28:37.927306628 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/ocfs2/super.c 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/ocfs2/super.c linux-4.9.217-vs2.3.9.12/fs/ocfs2/super.c
+--- linux-4.9.217/fs/ocfs2/super.c 2020-03-27 00:51:25.350423246 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/ocfs2/super.c 2018-10-20 04:58:14.000000000 +0000
@@ -188,6 +188,7 @@ enum {
Opt_dir_resv_level,
Opt_journal_async_commit,
@@ -5476,9 +5476,9 @@ diff -NurpP --minimal linux-4.9.207/fs/ocfs2/super.c linux-4.9.207-vs2.3.9.11/fs
default:
mlog(ML_ERROR,
"Unrecognized mount option \"%s\" "
-diff -NurpP --minimal linux-4.9.207/fs/open.c linux-4.9.207-vs2.3.9.11/fs/open.c
---- linux-4.9.207/fs/open.c 2019-12-25 15:28:37.947306307 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/open.c 2019-10-05 14:58:45.460310912 +0000
+diff -NurpP --minimal linux-4.9.217/fs/open.c linux-4.9.217-vs2.3.9.12/fs/open.c
+--- linux-4.9.217/fs/open.c 2020-03-27 00:51:25.400422458 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/open.c 2020-04-01 09:40:28.635465130 +0000
@@ -31,6 +31,11 @@
#include <linux/ima.h>
#include <linux/dnotify.h>
@@ -5553,9 +5553,9 @@ diff -NurpP --minimal linux-4.9.207/fs/open.c linux-4.9.207-vs2.3.9.11/fs/open.c
error = chown_common(&path, user, group);
mnt_drop_write(path.mnt);
out_release:
-diff -NurpP --minimal linux-4.9.207/fs/proc/array.c linux-4.9.207-vs2.3.9.11/fs/proc/array.c
---- linux-4.9.207/fs/proc/array.c 2019-12-25 15:28:37.987305658 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/proc/array.c 2019-10-05 14:58:45.660307716 +0000
+diff -NurpP --minimal linux-4.9.217/fs/proc/array.c linux-4.9.217-vs2.3.9.12/fs/proc/array.c
+--- linux-4.9.217/fs/proc/array.c 2020-03-27 00:51:25.650418515 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/proc/array.c 2019-10-05 14:58:45.660307716 +0000
@@ -86,6 +86,8 @@
#include <linux/string_helpers.h>
#include <linux/user_namespace.h>
@@ -5674,9 +5674,9 @@ diff -NurpP --minimal linux-4.9.207/fs/proc/array.c linux-4.9.207-vs2.3.9.11/fs/
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.9.207/fs/proc/base.c linux-4.9.207-vs2.3.9.11/fs/proc/base.c
---- linux-4.9.207/fs/proc/base.c 2019-12-25 15:28:37.987305658 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/proc/base.c 2019-10-05 14:58:45.660307716 +0000
+diff -NurpP --minimal linux-4.9.217/fs/proc/base.c linux-4.9.217-vs2.3.9.12/fs/proc/base.c
+--- linux-4.9.217/fs/proc/base.c 2020-03-27 00:51:25.650418515 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/proc/base.c 2019-10-05 14:58:45.660307716 +0000
@@ -87,6 +87,8 @@
#include <linux/slab.h>
#include <linux/flex_array.h>
@@ -5814,9 +5814,9 @@ diff -NurpP --minimal linux-4.9.207/fs/proc/base.c linux-4.9.207-vs2.3.9.11/fs/p
ns = dentry->d_sb->s_fs_info;
rcu_read_lock();
-diff -NurpP --minimal linux-4.9.207/fs/proc/generic.c linux-4.9.207-vs2.3.9.11/fs/proc/generic.c
---- linux-4.9.207/fs/proc/generic.c 2019-12-25 15:28:37.987305658 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/proc/generic.c 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/proc/generic.c linux-4.9.217-vs2.3.9.12/fs/proc/generic.c
+--- linux-4.9.217/fs/proc/generic.c 2020-03-27 00:51:25.650418515 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/proc/generic.c 2018-10-20 04:58:14.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/bitops.h>
#include <linux/spinlock.h>
@@ -5891,9 +5891,9 @@ diff -NurpP --minimal linux-4.9.207/fs/proc/generic.c linux-4.9.207-vs2.3.9.11/f
} else {
kfree(ent);
ent = NULL;
-diff -NurpP --minimal linux-4.9.207/fs/proc/inode.c linux-4.9.207-vs2.3.9.11/fs/proc/inode.c
---- linux-4.9.207/fs/proc/inode.c 2019-12-25 15:28:37.997305497 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/proc/inode.c 2018-10-20 05:55:43.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/proc/inode.c linux-4.9.217-vs2.3.9.12/fs/proc/inode.c
+--- linux-4.9.217/fs/proc/inode.c 2020-03-27 00:51:25.670418199 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/proc/inode.c 2018-10-20 05:55:43.000000000 +0000
@@ -433,6 +433,8 @@ struct inode *proc_get_inode(struct supe
inode->i_uid = de->uid;
inode->i_gid = de->gid;
@@ -5903,9 +5903,9 @@ diff -NurpP --minimal linux-4.9.207/fs/proc/inode.c linux-4.9.207-vs2.3.9.11/fs/
if (de->size)
inode->i_size = de->size;
if (de->nlink)
-diff -NurpP --minimal linux-4.9.207/fs/proc/internal.h linux-4.9.207-vs2.3.9.11/fs/proc/internal.h
---- linux-4.9.207/fs/proc/internal.h 2019-12-25 15:28:38.017305173 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/proc/internal.h 2018-10-20 05:55:43.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/proc/internal.h linux-4.9.217-vs2.3.9.12/fs/proc/internal.h
+--- linux-4.9.217/fs/proc/internal.h 2020-03-27 00:51:25.680418042 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/proc/internal.h 2018-10-20 05:55:43.000000000 +0000
@@ -14,6 +14,7 @@
#include <linux/spinlock.h>
#include <linux/atomic.h>
@@ -5972,9 +5972,9 @@ diff -NurpP --minimal linux-4.9.207/fs/proc/internal.h linux-4.9.207-vs2.3.9.11/
/*
* base.c
-diff -NurpP --minimal linux-4.9.207/fs/proc/loadavg.c linux-4.9.207-vs2.3.9.11/fs/proc/loadavg.c
---- linux-4.9.207/fs/proc/loadavg.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/proc/loadavg.c 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/proc/loadavg.c linux-4.9.217-vs2.3.9.12/fs/proc/loadavg.c
+--- linux-4.9.217/fs/proc/loadavg.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/proc/loadavg.c 2018-10-20 04:58:14.000000000 +0000
@@ -12,15 +12,27 @@
static int loadavg_proc_show(struct seq_file *m, void *v)
@@ -6004,9 +6004,9 @@ diff -NurpP --minimal linux-4.9.207/fs/proc/loadavg.c linux-4.9.207-vs2.3.9.11/f
task_active_pid_ns(current)->last_pid);
return 0;
}
-diff -NurpP --minimal linux-4.9.207/fs/proc/meminfo.c linux-4.9.207-vs2.3.9.11/fs/proc/meminfo.c
---- linux-4.9.207/fs/proc/meminfo.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/proc/meminfo.c 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/proc/meminfo.c linux-4.9.217-vs2.3.9.12/fs/proc/meminfo.c
+--- linux-4.9.217/fs/proc/meminfo.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/proc/meminfo.c 2018-10-20 04:58:14.000000000 +0000
@@ -55,7 +55,8 @@ static int meminfo_proc_show(struct seq_
si_swapinfo(&i);
committed = percpu_counter_read_positive(&vm_committed_as);
@@ -6017,9 +6017,9 @@ diff -NurpP --minimal linux-4.9.207/fs/proc/meminfo.c linux-4.9.207-vs2.3.9.11/f
total_swapcache_pages() - i.bufferram;
if (cached < 0)
cached = 0;
-diff -NurpP --minimal linux-4.9.207/fs/proc/root.c linux-4.9.207-vs2.3.9.11/fs/proc/root.c
---- linux-4.9.207/fs/proc/root.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/proc/root.c 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/proc/root.c linux-4.9.217-vs2.3.9.12/fs/proc/root.c
+--- linux-4.9.217/fs/proc/root.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/proc/root.c 2018-10-20 04:58:14.000000000 +0000
@@ -20,9 +20,14 @@
#include <linux/mount.h>
#include <linux/pid_namespace.h>
@@ -6051,9 +6051,9 @@ diff -NurpP --minimal linux-4.9.207/fs/proc/root.c linux-4.9.207-vs2.3.9.11/fs/p
.subdir = RB_ROOT,
.name = "/proc",
};
-diff -NurpP --minimal linux-4.9.207/fs/proc/self.c linux-4.9.207-vs2.3.9.11/fs/proc/self.c
---- linux-4.9.207/fs/proc/self.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/proc/self.c 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/proc/self.c linux-4.9.217-vs2.3.9.12/fs/proc/self.c
+--- linux-4.9.217/fs/proc/self.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/proc/self.c 2018-10-20 04:58:14.000000000 +0000
@@ -1,6 +1,7 @@
#include <linux/sched.h>
#include <linux/slab.h>
@@ -6071,9 +6071,9 @@ diff -NurpP --minimal linux-4.9.207/fs/proc/self.c linux-4.9.207-vs2.3.9.11/fs/p
if (inode) {
inode->i_ino = self_inum;
inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
-diff -NurpP --minimal linux-4.9.207/fs/proc/stat.c linux-4.9.207-vs2.3.9.11/fs/proc/stat.c
---- linux-4.9.207/fs/proc/stat.c 2019-12-25 15:28:38.017305173 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/proc/stat.c 2019-10-13 15:58:54.758080005 +0000
+diff -NurpP --minimal linux-4.9.217/fs/proc/stat.c linux-4.9.217-vs2.3.9.12/fs/proc/stat.c
+--- linux-4.9.217/fs/proc/stat.c 2020-03-27 00:51:25.690417888 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/proc/stat.c 2019-10-13 15:58:54.758080005 +0000
@@ -9,8 +9,10 @@
#include <linux/slab.h>
#include <linux/time.h>
@@ -6117,9 +6117,9 @@ diff -NurpP --minimal linux-4.9.207/fs/proc/stat.c linux-4.9.207-vs2.3.9.11/fs/p
/* 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.9.207/fs/proc/uptime.c linux-4.9.207-vs2.3.9.11/fs/proc/uptime.c
---- linux-4.9.207/fs/proc/uptime.c 2019-12-25 15:28:38.017305173 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/proc/uptime.c 2019-10-13 16:02:19.324763467 +0000
+diff -NurpP --minimal linux-4.9.217/fs/proc/uptime.c linux-4.9.217-vs2.3.9.12/fs/proc/uptime.c
+--- linux-4.9.217/fs/proc/uptime.c 2020-03-27 00:51:25.690417888 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/proc/uptime.c 2019-10-13 16:02:19.324763467 +0000
@@ -5,6 +5,7 @@
#include <linux/seq_file.h>
#include <linux/time.h>
@@ -6136,9 +6136,9 @@ diff -NurpP --minimal linux-4.9.207/fs/proc/uptime.c linux-4.9.207-vs2.3.9.11/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.9.207/fs/proc_namespace.c linux-4.9.207-vs2.3.9.11/fs/proc_namespace.c
---- linux-4.9.207/fs/proc_namespace.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/proc_namespace.c 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/proc_namespace.c linux-4.9.217-vs2.3.9.12/fs/proc_namespace.c
+--- linux-4.9.217/fs/proc_namespace.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/proc_namespace.c 2018-10-20 04:58:14.000000000 +0000
@@ -46,6 +46,8 @@ static int show_sb_opts(struct seq_file
{ MS_DIRSYNC, ",dirsync" },
{ MS_MANDLOCK, ",mand" },
@@ -6252,9 +6252,9 @@ diff -NurpP --minimal linux-4.9.207/fs/proc_namespace.c linux-4.9.207-vs2.3.9.11
/* file system type */
seq_puts(m, "with fstype ");
show_type(m, sb);
-diff -NurpP --minimal linux-4.9.207/fs/quota/dquot.c linux-4.9.207-vs2.3.9.11/fs/quota/dquot.c
---- linux-4.9.207/fs/quota/dquot.c 2019-12-25 15:28:38.017305173 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/quota/dquot.c 2019-12-25 15:37:52.028428731 +0000
+diff -NurpP --minimal linux-4.9.217/fs/quota/dquot.c linux-4.9.217-vs2.3.9.12/fs/quota/dquot.c
+--- linux-4.9.217/fs/quota/dquot.c 2020-03-27 00:51:25.790416308 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/quota/dquot.c 2020-04-01 09:40:28.705463971 +0000
@@ -1659,6 +1659,9 @@ int __dquot_alloc_space(struct inode *in
int reserve = flags & DQUOT_SPACE_RESERVE;
struct dquot **dquots;
@@ -6293,9 +6293,9 @@ diff -NurpP --minimal linux-4.9.207/fs/quota/dquot.c linux-4.9.207-vs2.3.9.11/fs
if (!dquot_active(inode))
return;
-diff -NurpP --minimal linux-4.9.207/fs/quota/quota.c linux-4.9.207-vs2.3.9.11/fs/quota/quota.c
---- linux-4.9.207/fs/quota/quota.c 2019-12-25 15:28:38.027305012 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/quota/quota.c 2018-10-20 05:55:43.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/quota/quota.c linux-4.9.217-vs2.3.9.12/fs/quota/quota.c
+--- linux-4.9.217/fs/quota/quota.c 2020-03-27 00:51:25.840415520 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/quota/quota.c 2018-10-20 05:55:43.000000000 +0000
@@ -8,6 +8,7 @@
#include <linux/fs.h>
#include <linux/namei.h>
@@ -6383,9 +6383,9 @@ diff -NurpP --minimal linux-4.9.207/fs/quota/quota.c linux-4.9.207-vs2.3.9.11/fs
if (quotactl_cmd_write(cmd))
sb = get_super_thawed(bdev);
else
-diff -NurpP --minimal linux-4.9.207/fs/stat.c linux-4.9.207-vs2.3.9.11/fs/stat.c
---- linux-4.9.207/fs/stat.c 2019-12-25 15:28:38.087304041 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/stat.c 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/stat.c linux-4.9.217-vs2.3.9.12/fs/stat.c
+--- linux-4.9.217/fs/stat.c 2020-03-27 00:51:26.590403699 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/stat.c 2018-10-20 04:58:14.000000000 +0000
@@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod
stat->nlink = inode->i_nlink;
stat->uid = inode->i_uid;
@@ -6394,9 +6394,9 @@ diff -NurpP --minimal linux-4.9.207/fs/stat.c linux-4.9.207-vs2.3.9.11/fs/stat.c
stat->rdev = inode->i_rdev;
stat->size = i_size_read(inode);
stat->atime = inode->i_atime;
-diff -NurpP --minimal linux-4.9.207/fs/statfs.c linux-4.9.207-vs2.3.9.11/fs/statfs.c
---- linux-4.9.207/fs/statfs.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/statfs.c 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/statfs.c linux-4.9.217-vs2.3.9.12/fs/statfs.c
+--- linux-4.9.217/fs/statfs.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/statfs.c 2018-10-20 04:58:14.000000000 +0000
@@ -7,6 +7,8 @@
#include <linux/statfs.h>
#include <linux/security.h>
@@ -6415,9 +6415,9 @@ diff -NurpP --minimal linux-4.9.207/fs/statfs.c linux-4.9.207-vs2.3.9.11/fs/stat
return retval;
}
-diff -NurpP --minimal linux-4.9.207/fs/super.c linux-4.9.207-vs2.3.9.11/fs/super.c
---- linux-4.9.207/fs/super.c 2019-12-25 15:28:38.087304041 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/super.c 2019-10-13 10:11:07.125382902 +0000
+diff -NurpP --minimal linux-4.9.217/fs/super.c linux-4.9.217-vs2.3.9.12/fs/super.c
+--- linux-4.9.217/fs/super.c 2020-03-27 00:51:26.590403699 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/super.c 2019-10-13 10:11:07.125382902 +0000
@@ -34,6 +34,8 @@
#include <linux/fsnotify.h>
#include <linux/lockdep.h>
@@ -6470,9 +6470,9 @@ diff -NurpP --minimal linux-4.9.207/fs/super.c linux-4.9.207-vs2.3.9.11/fs/super
error = security_sb_kern_mount(sb, flags, secdata);
if (error)
goto out_sb;
-diff -NurpP --minimal linux-4.9.207/fs/utimes.c linux-4.9.207-vs2.3.9.11/fs/utimes.c
---- linux-4.9.207/fs/utimes.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/utimes.c 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/utimes.c linux-4.9.217-vs2.3.9.12/fs/utimes.c
+--- linux-4.9.217/fs/utimes.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/utimes.c 2018-10-20 04:58:14.000000000 +0000
@@ -8,6 +8,8 @@
#include <linux/stat.h>
#include <linux/utime.h>
@@ -6503,9 +6503,9 @@ diff -NurpP --minimal linux-4.9.207/fs/utimes.c linux-4.9.207-vs2.3.9.11/fs/utim
if (times && times[0].tv_nsec == UTIME_NOW &&
times[1].tv_nsec == UTIME_NOW)
times = NULL;
-diff -NurpP --minimal linux-4.9.207/fs/xattr.c linux-4.9.207-vs2.3.9.11/fs/xattr.c
---- linux-4.9.207/fs/xattr.c 2019-12-25 15:28:38.177302586 +0000
-+++ linux-4.9.207-vs2.3.9.11/fs/xattr.c 2018-10-20 05:55:43.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/fs/xattr.c linux-4.9.217-vs2.3.9.12/fs/xattr.c
+--- linux-4.9.217/fs/xattr.c 2020-03-27 00:51:27.560388412 +0000
++++ linux-4.9.217-vs2.3.9.12/fs/xattr.c 2018-10-20 05:55:43.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/audit.h>
#include <linux/vmalloc.h>
@@ -6523,9 +6523,9 @@ diff -NurpP --minimal linux-4.9.207/fs/xattr.c linux-4.9.207-vs2.3.9.11/fs/xattr
return (mask & MAY_WRITE) ? -EPERM : -ENODATA;
return 0;
}
-diff -NurpP --minimal linux-4.9.207/include/linux/capability.h linux-4.9.207-vs2.3.9.11/include/linux/capability.h
---- linux-4.9.207/include/linux/capability.h 2019-12-25 15:28:38.667294664 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/capability.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/capability.h linux-4.9.217-vs2.3.9.12/include/linux/capability.h
+--- linux-4.9.217/include/linux/capability.h 2020-03-27 00:51:31.040333567 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/capability.h 2018-10-20 04:58:14.000000000 +0000
@@ -78,7 +78,8 @@ extern const kernel_cap_t __cap_init_eff
#else /* HAND-CODED capability initializers */
@@ -6536,9 +6536,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/capability.h linux-4.9.207-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.9.207/include/linux/cred.h linux-4.9.207-vs2.3.9.11/include/linux/cred.h
---- linux-4.9.207/include/linux/cred.h 2019-12-25 15:28:38.737293533 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/cred.h 2019-10-05 14:58:45.680307395 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/cred.h linux-4.9.217-vs2.3.9.12/include/linux/cred.h
+--- linux-4.9.217/include/linux/cred.h 2020-03-27 00:51:31.560325368 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/cred.h 2019-10-05 14:58:45.680307395 +0000
@@ -156,6 +156,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 *);
@@ -6579,9 +6579,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/cred.h linux-4.9.207-vs2.3.9.1
/**
* get_new_cred - Get a reference on a new set of credentials
* @cred: The new credentials to reference
-diff -NurpP --minimal linux-4.9.207/include/linux/dcache.h linux-4.9.207-vs2.3.9.11/include/linux/dcache.h
---- linux-4.9.207/include/linux/dcache.h 2019-12-25 15:28:38.737293533 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/dcache.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/dcache.h linux-4.9.217-vs2.3.9.12/include/linux/dcache.h
+--- linux-4.9.217/include/linux/dcache.h 2020-03-27 00:51:31.570325213 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/dcache.h 2018-10-20 04:58:14.000000000 +0000
@@ -308,8 +308,10 @@ extern char *dentry_path(struct dentry *
*/
static inline struct dentry *dget_dlock(struct dentry *dentry)
@@ -6594,18 +6594,18 @@ diff -NurpP --minimal linux-4.9.207/include/linux/dcache.h linux-4.9.207-vs2.3.9
return dentry;
}
-diff -NurpP --minimal linux-4.9.207/include/linux/devpts_fs.h linux-4.9.207-vs2.3.9.11/include/linux/devpts_fs.h
---- linux-4.9.207/include/linux/devpts_fs.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/devpts_fs.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/devpts_fs.h linux-4.9.217-vs2.3.9.12/include/linux/devpts_fs.h
+--- linux-4.9.217/include/linux/devpts_fs.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/devpts_fs.h 2018-10-20 04:58:14.000000000 +0000
@@ -34,5 +34,4 @@ void devpts_pty_kill(struct dentry *);
#endif
-
#endif /* _LINUX_DEVPTS_FS_H */
-diff -NurpP --minimal linux-4.9.207/include/linux/fs.h linux-4.9.207-vs2.3.9.11/include/linux/fs.h
---- linux-4.9.207/include/linux/fs.h 2019-12-25 15:28:38.777292887 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/fs.h 2019-10-05 14:58:45.690307237 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/fs.h linux-4.9.217-vs2.3.9.12/include/linux/fs.h
+--- linux-4.9.217/include/linux/fs.h 2020-03-27 00:51:31.760322216 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/fs.h 2019-10-05 14:58:45.690307237 +0000
@@ -231,6 +231,7 @@ typedef int (dio_iodone_t)(struct kiocb
#define ATTR_OPEN (1 << 15) /* Truncating from open(O_TRUNC) */
#define ATTR_TIMES_SET (1 << 16)
@@ -6780,9 +6780,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/fs.h linux-4.9.207-vs2.3.9.11/
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.9.207/include/linux/init_task.h linux-4.9.207-vs2.3.9.11/include/linux/init_task.h
---- linux-4.9.207/include/linux/init_task.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/init_task.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/init_task.h linux-4.9.217-vs2.3.9.12/include/linux/init_task.h
+--- linux-4.9.217/include/linux/init_task.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/init_task.h 2018-10-20 04:58:14.000000000 +0000
@@ -271,6 +271,10 @@ extern struct task_group root_task_group
INIT_VTIME(tsk) \
INIT_NUMA_BALANCING(tsk) \
@@ -6794,9 +6794,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/init_task.h linux-4.9.207-vs2.
}
-diff -NurpP --minimal linux-4.9.207/include/linux/ipc.h linux-4.9.207-vs2.3.9.11/include/linux/ipc.h
---- linux-4.9.207/include/linux/ipc.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/ipc.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/ipc.h linux-4.9.217-vs2.3.9.12/include/linux/ipc.h
+--- linux-4.9.217/include/linux/ipc.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/ipc.h 2018-10-20 04:58:14.000000000 +0000
@@ -16,6 +16,7 @@ struct kern_ipc_perm
key_t key;
kuid_t uid;
@@ -6805,9 +6805,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/ipc.h linux-4.9.207-vs2.3.9.11
kuid_t cuid;
kgid_t cgid;
umode_t mode;
-diff -NurpP --minimal linux-4.9.207/include/linux/memcontrol.h linux-4.9.207-vs2.3.9.11/include/linux/memcontrol.h
---- linux-4.9.207/include/linux/memcontrol.h 2019-12-25 15:28:39.087287874 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/memcontrol.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/memcontrol.h linux-4.9.217-vs2.3.9.12/include/linux/memcontrol.h
+--- linux-4.9.217/include/linux/memcontrol.h 2020-03-27 00:51:33.430295898 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/memcontrol.h 2018-10-20 04:58:14.000000000 +0000
@@ -92,6 +92,7 @@ enum mem_cgroup_events_target {
MEM_CGROUP_NTARGETS,
};
@@ -6829,9 +6829,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/memcontrol.h linux-4.9.207-vs2
static inline bool mm_match_cgroup(struct mm_struct *mm,
struct mem_cgroup *memcg)
{
-diff -NurpP --minimal linux-4.9.207/include/linux/mount.h linux-4.9.207-vs2.3.9.11/include/linux/mount.h
---- linux-4.9.207/include/linux/mount.h 2019-12-25 15:28:39.377283185 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/mount.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/mount.h linux-4.9.217-vs2.3.9.12/include/linux/mount.h
+--- linux-4.9.217/include/linux/mount.h 2020-03-27 00:51:37.020239318 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/mount.h 2018-10-20 04:58:14.000000000 +0000
@@ -63,6 +63,9 @@ struct mnt_namespace;
#define MNT_MARKED 0x4000000
#define MNT_UMOUNT 0x8000000
@@ -6842,9 +6842,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/mount.h linux-4.9.207-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.9.207/include/linux/netdevice.h linux-4.9.207-vs2.3.9.11/include/linux/netdevice.h
---- linux-4.9.207/include/linux/netdevice.h 2019-12-25 15:28:39.397282861 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/netdevice.h 2019-12-25 15:37:52.148426794 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/netdevice.h linux-4.9.217-vs2.3.9.12/include/linux/netdevice.h
+--- linux-4.9.217/include/linux/netdevice.h 2020-03-27 00:51:37.160237109 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/netdevice.h 2019-12-25 15:37:52.148426794 +0000
@@ -2489,6 +2489,7 @@ static inline int dev_recursion_level(vo
struct net_device *dev_get_by_index(struct net *net, int ifindex);
@@ -6853,9 +6853,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/netdevice.h linux-4.9.207-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.9.207/include/linux/net.h linux-4.9.207-vs2.3.9.11/include/linux/net.h
---- linux-4.9.207/include/linux/net.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/net.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/net.h linux-4.9.217-vs2.3.9.12/include/linux/net.h
+--- linux-4.9.217/include/linux/net.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/net.h 2018-10-20 04:58:14.000000000 +0000
@@ -44,6 +44,7 @@ struct net;
#define SOCK_NOSPACE 2
#define SOCK_PASSCRED 3
@@ -6864,9 +6864,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/net.h linux-4.9.207-vs2.3.9.11
#ifndef ARCH_HAS_SOCKET_TYPES
/**
-diff -NurpP --minimal linux-4.9.207/include/linux/nsproxy.h linux-4.9.207-vs2.3.9.11/include/linux/nsproxy.h
---- linux-4.9.207/include/linux/nsproxy.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/nsproxy.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/nsproxy.h linux-4.9.217-vs2.3.9.12/include/linux/nsproxy.h
+--- linux-4.9.217/include/linux/nsproxy.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/nsproxy.h 2018-10-20 04:58:14.000000000 +0000
@@ -3,6 +3,7 @@
#include <linux/spinlock.h>
@@ -6916,9 +6916,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/nsproxy.h linux-4.9.207-vs2.3.
}
#endif
-diff -NurpP --minimal linux-4.9.207/include/linux/pid.h linux-4.9.207-vs2.3.9.11/include/linux/pid.h
---- linux-4.9.207/include/linux/pid.h 2019-12-25 15:28:39.507281083 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/pid.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/pid.h linux-4.9.217-vs2.3.9.12/include/linux/pid.h
+--- linux-4.9.217/include/linux/pid.h 2020-03-27 00:51:38.850210473 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/pid.h 2018-10-20 04:58:14.000000000 +0000
@@ -10,7 +10,8 @@ enum pid_type
PIDTYPE_SID,
PIDTYPE_MAX,
@@ -6937,9 +6937,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/pid.h linux-4.9.207-vs2.3.9.11
pid_t pid_vnr(struct pid *pid);
#define do_each_pid_task(pid, type, task) \
-diff -NurpP --minimal linux-4.9.207/include/linux/quotaops.h linux-4.9.207-vs2.3.9.11/include/linux/quotaops.h
---- linux-4.9.207/include/linux/quotaops.h 2019-12-25 15:28:39.587279789 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/quotaops.h 2019-12-25 15:37:52.158426633 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/quotaops.h linux-4.9.217-vs2.3.9.12/include/linux/quotaops.h
+--- linux-4.9.217/include/linux/quotaops.h 2020-03-27 00:51:40.950177377 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/quotaops.h 2019-12-25 15:37:52.158426633 +0000
@@ -8,6 +8,7 @@
#define _LINUX_QUOTAOPS_
@@ -6981,9 +6981,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/quotaops.h linux-4.9.207-vs2.3
}
static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
-diff -NurpP --minimal linux-4.9.207/include/linux/sched.h linux-4.9.207-vs2.3.9.11/include/linux/sched.h
---- linux-4.9.207/include/linux/sched.h 2019-12-25 15:28:39.727277526 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/sched.h 2019-10-05 14:58:45.710306917 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/sched.h linux-4.9.217-vs2.3.9.12/include/linux/sched.h
+--- linux-4.9.217/include/linux/sched.h 2020-03-27 00:51:41.060175640 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/sched.h 2019-10-05 14:58:45.710306917 +0000
@@ -1719,6 +1719,14 @@ struct task_struct {
#endif
struct seccomp seccomp;
@@ -7021,9 +7021,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/sched.h linux-4.9.207-vs2.3.9.
}
-diff -NurpP --minimal linux-4.9.207/include/linux/shmem_fs.h linux-4.9.207-vs2.3.9.11/include/linux/shmem_fs.h
---- linux-4.9.207/include/linux/shmem_fs.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/shmem_fs.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/shmem_fs.h linux-4.9.217-vs2.3.9.12/include/linux/shmem_fs.h
+--- linux-4.9.217/include/linux/shmem_fs.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/shmem_fs.h 2018-10-20 04:58:14.000000000 +0000
@@ -10,6 +10,9 @@
/* inode in-kernel data */
@@ -7034,9 +7034,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/shmem_fs.h linux-4.9.207-vs2.3
struct shmem_inode_info {
spinlock_t lock;
unsigned int seals; /* shmem seals */
-diff -NurpP --minimal linux-4.9.207/include/linux/stat.h linux-4.9.207-vs2.3.9.11/include/linux/stat.h
---- linux-4.9.207/include/linux/stat.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/stat.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/stat.h linux-4.9.217-vs2.3.9.12/include/linux/stat.h
+--- linux-4.9.217/include/linux/stat.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/stat.h 2018-10-20 04:58:14.000000000 +0000
@@ -25,6 +25,7 @@ struct kstat {
unsigned int nlink;
kuid_t uid;
@@ -7045,9 +7045,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/stat.h linux-4.9.207-vs2.3.9.1
dev_t rdev;
loff_t size;
struct timespec atime;
-diff -NurpP --minimal linux-4.9.207/include/linux/sunrpc/auth.h linux-4.9.207-vs2.3.9.11/include/linux/sunrpc/auth.h
---- linux-4.9.207/include/linux/sunrpc/auth.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/sunrpc/auth.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/sunrpc/auth.h linux-4.9.217-vs2.3.9.12/include/linux/sunrpc/auth.h
+--- linux-4.9.217/include/linux/sunrpc/auth.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/sunrpc/auth.h 2018-10-20 04:58:14.000000000 +0000
@@ -46,6 +46,7 @@ enum {
struct auth_cred {
kuid_t uid;
@@ -7056,9 +7056,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/sunrpc/auth.h linux-4.9.207-vs
struct group_info *group_info;
const char *principal;
unsigned long ac_flags;
-diff -NurpP --minimal linux-4.9.207/include/linux/sunrpc/clnt.h linux-4.9.207-vs2.3.9.11/include/linux/sunrpc/clnt.h
---- linux-4.9.207/include/linux/sunrpc/clnt.h 2019-12-25 15:28:39.857275424 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/sunrpc/clnt.h 2018-10-20 05:55:43.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/sunrpc/clnt.h linux-4.9.217-vs2.3.9.12/include/linux/sunrpc/clnt.h
+--- linux-4.9.217/include/linux/sunrpc/clnt.h 2020-03-27 00:51:41.170173910 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/sunrpc/clnt.h 2018-10-20 05:55:43.000000000 +0000
@@ -52,7 +52,8 @@ struct rpc_clnt {
cl_discrtry : 1,/* disconnect before retry */
cl_noretranstimeo: 1,/* No retransmit timeouts */
@@ -7069,9 +7069,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/sunrpc/clnt.h linux-4.9.207-vs
struct rpc_rtt * cl_rtt; /* RTO estimator data */
const struct rpc_timeout *cl_timeout; /* Timeout strategy */
-diff -NurpP --minimal linux-4.9.207/include/linux/types.h linux-4.9.207-vs2.3.9.11/include/linux/types.h
---- linux-4.9.207/include/linux/types.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/types.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/types.h linux-4.9.217-vs2.3.9.12/include/linux/types.h
+--- linux-4.9.217/include/linux/types.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/types.h 2018-10-20 04:58:14.000000000 +0000
@@ -32,6 +32,9 @@ typedef __kernel_uid32_t uid_t;
typedef __kernel_gid32_t gid_t;
typedef __kernel_uid16_t uid16_t;
@@ -7082,9 +7082,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/types.h linux-4.9.207-vs2.3.9.
typedef unsigned long uintptr_t;
-diff -NurpP --minimal linux-4.9.207/include/linux/uidgid.h linux-4.9.207-vs2.3.9.11/include/linux/uidgid.h
---- linux-4.9.207/include/linux/uidgid.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/uidgid.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/uidgid.h linux-4.9.217-vs2.3.9.12/include/linux/uidgid.h
+--- linux-4.9.217/include/linux/uidgid.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/uidgid.h 2018-10-20 04:58:14.000000000 +0000
@@ -21,13 +21,17 @@ typedef struct {
uid_t val;
} kuid_t;
@@ -7181,9 +7181,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/uidgid.h linux-4.9.207-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.9.207/include/linux/vroot.h linux-4.9.207-vs2.3.9.11/include/linux/vroot.h
---- linux-4.9.207/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vroot.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vroot.h linux-4.9.217-vs2.3.9.12/include/linux/vroot.h
+--- linux-4.9.217/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vroot.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,51 @@
+
+/*
@@ -7236,9 +7236,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vroot.h linux-4.9.207-vs2.3.9.
+#define VROOT_CLR_DEV 0x5601
+
+#endif /* _LINUX_VROOT_H */
-diff -NurpP --minimal linux-4.9.207/include/linux/vs_base.h linux-4.9.207-vs2.3.9.11/include/linux/vs_base.h
---- linux-4.9.207/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vs_base.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vs_base.h linux-4.9.217-vs2.3.9.12/include/linux/vs_base.h
+--- linux-4.9.217/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vs_base.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,10 @@
+#ifndef _VS_BASE_H
+#define _VS_BASE_H
@@ -7250,9 +7250,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vs_base.h linux-4.9.207-vs2.3.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.9.207/include/linux/vs_context.h linux-4.9.207-vs2.3.9.11/include/linux/vs_context.h
---- linux-4.9.207/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vs_context.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vs_context.h linux-4.9.217-vs2.3.9.12/include/linux/vs_context.h
+--- linux-4.9.217/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vs_context.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,242 @@
+#ifndef _VS_CONTEXT_H
+#define _VS_CONTEXT_H
@@ -7496,9 +7496,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vs_context.h linux-4.9.207-vs2
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.9.207/include/linux/vs_cowbl.h linux-4.9.207-vs2.3.9.11/include/linux/vs_cowbl.h
---- linux-4.9.207/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vs_cowbl.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vs_cowbl.h linux-4.9.217-vs2.3.9.12/include/linux/vs_cowbl.h
+--- linux-4.9.217/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vs_cowbl.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,48 @@
+#ifndef _VS_COWBL_H
+#define _VS_COWBL_H
@@ -7548,9 +7548,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vs_cowbl.h linux-4.9.207-vs2.3
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.9.207/include/linux/vs_cvirt.h linux-4.9.207-vs2.3.9.11/include/linux/vs_cvirt.h
---- linux-4.9.207/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vs_cvirt.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vs_cvirt.h linux-4.9.217-vs2.3.9.12/include/linux/vs_cvirt.h
+--- linux-4.9.217/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vs_cvirt.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,50 @@
+#ifndef _VS_CVIRT_H
+#define _VS_CVIRT_H
@@ -7602,9 +7602,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vs_cvirt.h linux-4.9.207-vs2.3
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.9.207/include/linux/vs_device.h linux-4.9.207-vs2.3.9.11/include/linux/vs_device.h
---- linux-4.9.207/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vs_device.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vs_device.h linux-4.9.217-vs2.3.9.12/include/linux/vs_device.h
+--- linux-4.9.217/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vs_device.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,45 @@
+#ifndef _VS_DEVICE_H
+#define _VS_DEVICE_H
@@ -7651,9 +7651,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vs_device.h linux-4.9.207-vs2.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.9.207/include/linux/vs_dlimit.h linux-4.9.207-vs2.3.9.11/include/linux/vs_dlimit.h
---- linux-4.9.207/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vs_dlimit.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vs_dlimit.h linux-4.9.217-vs2.3.9.12/include/linux/vs_dlimit.h
+--- linux-4.9.217/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vs_dlimit.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,215 @@
+#ifndef _VS_DLIMIT_H
+#define _VS_DLIMIT_H
@@ -7870,9 +7870,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vs_dlimit.h linux-4.9.207-vs2.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.9.207/include/linux/vserver/base.h linux-4.9.207-vs2.3.9.11/include/linux/vserver/base.h
---- linux-4.9.207/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vserver/base.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vserver/base.h linux-4.9.217-vs2.3.9.12/include/linux/vserver/base.h
+--- linux-4.9.217/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vserver/base.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,184 @@
+#ifndef _VSERVER_BASE_H
+#define _VSERVER_BASE_H
@@ -8058,9 +8058,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vserver/base.h linux-4.9.207-v
+#define nx_info_state(n, m) (__nx_state(n) & (m))
+
+#endif
-diff -NurpP --minimal linux-4.9.207/include/linux/vserver/cacct_cmd.h linux-4.9.207-vs2.3.9.11/include/linux/vserver/cacct_cmd.h
---- linux-4.9.207/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vserver/cacct_cmd.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vserver/cacct_cmd.h linux-4.9.217-vs2.3.9.12/include/linux/vserver/cacct_cmd.h
+--- linux-4.9.217/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vserver/cacct_cmd.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,10 @@
+#ifndef _VSERVER_CACCT_CMD_H
+#define _VSERVER_CACCT_CMD_H
@@ -8072,9 +8072,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vserver/cacct_cmd.h linux-4.9.
+extern int vc_sock_stat(struct vx_info *, void __user *);
+
+#endif /* _VSERVER_CACCT_CMD_H */
-diff -NurpP --minimal linux-4.9.207/include/linux/vserver/cacct_def.h linux-4.9.207-vs2.3.9.11/include/linux/vserver/cacct_def.h
---- linux-4.9.207/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vserver/cacct_def.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vserver/cacct_def.h linux-4.9.217-vs2.3.9.12/include/linux/vserver/cacct_def.h
+--- linux-4.9.217/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vserver/cacct_def.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,43 @@
+#ifndef _VSERVER_CACCT_DEF_H
+#define _VSERVER_CACCT_DEF_H
@@ -8119,9 +8119,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vserver/cacct_def.h linux-4.9.
+#endif
+
+#endif /* _VSERVER_CACCT_DEF_H */
-diff -NurpP --minimal linux-4.9.207/include/linux/vserver/cacct.h linux-4.9.207-vs2.3.9.11/include/linux/vserver/cacct.h
---- linux-4.9.207/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vserver/cacct.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vserver/cacct.h linux-4.9.217-vs2.3.9.12/include/linux/vserver/cacct.h
+--- linux-4.9.217/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vserver/cacct.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,15 @@
+#ifndef _VSERVER_CACCT_H
+#define _VSERVER_CACCT_H
@@ -8138,9 +8138,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vserver/cacct.h linux-4.9.207-
+};
+
+#endif /* _VSERVER_CACCT_H */
-diff -NurpP --minimal linux-4.9.207/include/linux/vserver/cacct_int.h linux-4.9.207-vs2.3.9.11/include/linux/vserver/cacct_int.h
---- linux-4.9.207/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vserver/cacct_int.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vserver/cacct_int.h linux-4.9.217-vs2.3.9.12/include/linux/vserver/cacct_int.h
+--- linux-4.9.217/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vserver/cacct_int.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,17 @@
+#ifndef _VSERVER_CACCT_INT_H
+#define _VSERVER_CACCT_INT_H
@@ -8159,9 +8159,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vserver/cacct_int.h linux-4.9.
+}
+
+#endif /* _VSERVER_CACCT_INT_H */
-diff -NurpP --minimal linux-4.9.207/include/linux/vserver/check.h linux-4.9.207-vs2.3.9.11/include/linux/vserver/check.h
---- linux-4.9.207/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vserver/check.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vserver/check.h linux-4.9.217-vs2.3.9.12/include/linux/vserver/check.h
+--- linux-4.9.217/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vserver/check.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,89 @@
+#ifndef _VSERVER_CHECK_H
+#define _VSERVER_CHECK_H
@@ -8252,9 +8252,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vserver/check.h linux-4.9.207-
+#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1)
+
+#endif
-diff -NurpP --minimal linux-4.9.207/include/linux/vserver/context_cmd.h linux-4.9.207-vs2.3.9.11/include/linux/vserver/context_cmd.h
---- linux-4.9.207/include/linux/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vserver/context_cmd.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vserver/context_cmd.h linux-4.9.217-vs2.3.9.12/include/linux/vserver/context_cmd.h
+--- linux-4.9.217/include/linux/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vserver/context_cmd.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,33 @@
+#ifndef _VSERVER_CONTEXT_CMD_H
+#define _VSERVER_CONTEXT_CMD_H
@@ -8289,9 +8289,9 @@ diff -NurpP --minimal linux-4.9.207/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.9.207/include/linux/vserver/context.h linux-4.9.207-vs2.3.9.11/include/linux/vserver/context.h
---- linux-4.9.207/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vserver/context.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vserver/context.h linux-4.9.217-vs2.3.9.12/include/linux/vserver/context.h
+--- linux-4.9.217/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vserver/context.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,110 @@
+#ifndef _VSERVER_CONTEXT_H
+#define _VSERVER_CONTEXT_H
@@ -8403,9 +8403,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vserver/context.h linux-4.9.20
+
+
+#endif /* _VSERVER_CONTEXT_H */
-diff -NurpP --minimal linux-4.9.207/include/linux/vserver/cvirt_cmd.h linux-4.9.207-vs2.3.9.11/include/linux/vserver/cvirt_cmd.h
---- linux-4.9.207/include/linux/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vserver/cvirt_cmd.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vserver/cvirt_cmd.h linux-4.9.217-vs2.3.9.12/include/linux/vserver/cvirt_cmd.h
+--- linux-4.9.217/include/linux/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vserver/cvirt_cmd.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,13 @@
+#ifndef _VSERVER_CVIRT_CMD_H
+#define _VSERVER_CVIRT_CMD_H
@@ -8420,9 +8420,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vserver/cvirt_cmd.h linux-4.9.
+extern int vc_virt_stat(struct vx_info *, void __user *);
+
+#endif /* _VSERVER_CVIRT_CMD_H */
-diff -NurpP --minimal linux-4.9.207/include/linux/vserver/cvirt_def.h linux-4.9.207-vs2.3.9.11/include/linux/vserver/cvirt_def.h
---- linux-4.9.207/include/linux/vserver/cvirt_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vserver/cvirt_def.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vserver/cvirt_def.h linux-4.9.217-vs2.3.9.12/include/linux/vserver/cvirt_def.h
+--- linux-4.9.217/include/linux/vserver/cvirt_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vserver/cvirt_def.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,80 @@
+#ifndef _VSERVER_CVIRT_DEF_H
+#define _VSERVER_CVIRT_DEF_H
@@ -8504,9 +8504,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vserver/cvirt_def.h linux-4.9.
+#endif
+
+#endif /* _VSERVER_CVIRT_DEF_H */
-diff -NurpP --minimal linux-4.9.207/include/linux/vserver/cvirt.h linux-4.9.207-vs2.3.9.11/include/linux/vserver/cvirt.h
---- linux-4.9.207/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vserver/cvirt.h 2019-10-13 16:04:08.203030205 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vserver/cvirt.h linux-4.9.217-vs2.3.9.12/include/linux/vserver/cvirt.h
+--- linux-4.9.217/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vserver/cvirt.h 2019-10-13 16:04:08.203030205 +0000
@@ -0,0 +1,11 @@
+#ifndef _VSERVER_CVIRT_H
+#define _VSERVER_CVIRT_H
@@ -8519,9 +8519,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vserver/cvirt.h linux-4.9.207-
+int vx_do_syslog(int, char __user *, int);
+
+#endif /* _VSERVER_CVIRT_H */
-diff -NurpP --minimal linux-4.9.207/include/linux/vserver/debug_cmd.h linux-4.9.207-vs2.3.9.11/include/linux/vserver/debug_cmd.h
---- linux-4.9.207/include/linux/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vserver/debug_cmd.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vserver/debug_cmd.h linux-4.9.217-vs2.3.9.12/include/linux/vserver/debug_cmd.h
+--- linux-4.9.217/include/linux/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vserver/debug_cmd.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,37 @@
+#ifndef _VSERVER_DEBUG_CMD_H
+#define _VSERVER_DEBUG_CMD_H
@@ -8560,9 +8560,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vserver/debug_cmd.h linux-4.9.
+#endif /* CONFIG_COMPAT */
+
+#endif /* _VSERVER_DEBUG_CMD_H */
-diff -NurpP --minimal linux-4.9.207/include/linux/vserver/debug.h linux-4.9.207-vs2.3.9.11/include/linux/vserver/debug.h
---- linux-4.9.207/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vserver/debug.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vserver/debug.h linux-4.9.217-vs2.3.9.12/include/linux/vserver/debug.h
+--- linux-4.9.217/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vserver/debug.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,146 @@
+#ifndef _VSERVER_DEBUG_H
+#define _VSERVER_DEBUG_H
@@ -8710,9 +8710,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vserver/debug.h linux-4.9.207-
+
+
+#endif /* _VSERVER_DEBUG_H */
-diff -NurpP --minimal linux-4.9.207/include/linux/vserver/device_cmd.h linux-4.9.207-vs2.3.9.11/include/linux/vserver/device_cmd.h
---- linux-4.9.207/include/linux/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vserver/device_cmd.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vserver/device_cmd.h linux-4.9.217-vs2.3.9.12/include/linux/vserver/device_cmd.h
+--- linux-4.9.217/include/linux/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vserver/device_cmd.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,31 @@
+#ifndef _VSERVER_DEVICE_CMD_H
+#define _VSERVER_DEVICE_CMD_H
@@ -8745,9 +8745,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vserver/device_cmd.h linux-4.9
+#endif /* CONFIG_COMPAT */
+
+#endif /* _VSERVER_DEVICE_CMD_H */
-diff -NurpP --minimal linux-4.9.207/include/linux/vserver/device_def.h linux-4.9.207-vs2.3.9.11/include/linux/vserver/device_def.h
---- linux-4.9.207/include/linux/vserver/device_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vserver/device_def.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vserver/device_def.h linux-4.9.217-vs2.3.9.12/include/linux/vserver/device_def.h
+--- linux-4.9.217/include/linux/vserver/device_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vserver/device_def.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,17 @@
+#ifndef _VSERVER_DEVICE_DEF_H
+#define _VSERVER_DEVICE_DEF_H
@@ -8766,9 +8766,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vserver/device_def.h linux-4.9
+};
+
+#endif /* _VSERVER_DEVICE_DEF_H */
-diff -NurpP --minimal linux-4.9.207/include/linux/vserver/device.h linux-4.9.207-vs2.3.9.11/include/linux/vserver/device.h
---- linux-4.9.207/include/linux/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vserver/device.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vserver/device.h linux-4.9.217-vs2.3.9.12/include/linux/vserver/device.h
+--- linux-4.9.217/include/linux/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vserver/device.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,9 @@
+#ifndef _VSERVER_DEVICE_H
+#define _VSERVER_DEVICE_H
@@ -8779,9 +8779,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vserver/device.h linux-4.9.207
+#else /* _VSERVER_DEVICE_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_DEVICE_H */
-diff -NurpP --minimal linux-4.9.207/include/linux/vserver/dlimit_cmd.h linux-4.9.207-vs2.3.9.11/include/linux/vserver/dlimit_cmd.h
---- linux-4.9.207/include/linux/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vserver/dlimit_cmd.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vserver/dlimit_cmd.h linux-4.9.217-vs2.3.9.12/include/linux/vserver/dlimit_cmd.h
+--- linux-4.9.217/include/linux/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vserver/dlimit_cmd.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,46 @@
+#ifndef _VSERVER_DLIMIT_CMD_H
+#define _VSERVER_DLIMIT_CMD_H
@@ -8829,9 +8829,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vserver/dlimit_cmd.h linux-4.9
+#endif /* CONFIG_COMPAT */
+
+#endif /* _VSERVER_DLIMIT_CMD_H */
-diff -NurpP --minimal linux-4.9.207/include/linux/vserver/dlimit.h linux-4.9.207-vs2.3.9.11/include/linux/vserver/dlimit.h
---- linux-4.9.207/include/linux/vserver/dlimit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vserver/dlimit.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vserver/dlimit.h linux-4.9.217-vs2.3.9.12/include/linux/vserver/dlimit.h
+--- linux-4.9.217/include/linux/vserver/dlimit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vserver/dlimit.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,54 @@
+#ifndef _VSERVER_DLIMIT_H
+#define _VSERVER_DLIMIT_H
@@ -8887,9 +8887,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vserver/dlimit.h linux-4.9.207
+#else /* _VSERVER_DLIMIT_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_DLIMIT_H */
-diff -NurpP --minimal linux-4.9.207/include/linux/vserver/global.h linux-4.9.207-vs2.3.9.11/include/linux/vserver/global.h
---- linux-4.9.207/include/linux/vserver/global.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vserver/global.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vserver/global.h linux-4.9.217-vs2.3.9.12/include/linux/vserver/global.h
+--- linux-4.9.217/include/linux/vserver/global.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vserver/global.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,20 @@
+#ifndef _VSERVER_GLOBAL_H
+#define _VSERVER_GLOBAL_H
@@ -8911,9 +8911,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vserver/global.h linux-4.9.207
+
+
+#endif /* _VSERVER_GLOBAL_H */
-diff -NurpP --minimal linux-4.9.207/include/linux/vserver/history.h linux-4.9.207-vs2.3.9.11/include/linux/vserver/history.h
---- linux-4.9.207/include/linux/vserver/history.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vserver/history.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vserver/history.h linux-4.9.217-vs2.3.9.12/include/linux/vserver/history.h
+--- linux-4.9.217/include/linux/vserver/history.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vserver/history.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,197 @@
+#ifndef _VSERVER_HISTORY_H
+#define _VSERVER_HISTORY_H
@@ -9112,9 +9112,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vserver/history.h linux-4.9.20
+#endif /* CONFIG_VSERVER_HISTORY */
+
+#endif /* _VSERVER_HISTORY_H */
-diff -NurpP --minimal linux-4.9.207/include/linux/vserver/inode_cmd.h linux-4.9.207-vs2.3.9.11/include/linux/vserver/inode_cmd.h
---- linux-4.9.207/include/linux/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vserver/inode_cmd.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vserver/inode_cmd.h linux-4.9.217-vs2.3.9.12/include/linux/vserver/inode_cmd.h
+--- linux-4.9.217/include/linux/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vserver/inode_cmd.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,36 @@
+#ifndef _VSERVER_INODE_CMD_H
+#define _VSERVER_INODE_CMD_H
@@ -9152,9 +9152,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vserver/inode_cmd.h linux-4.9.
+#endif /* CONFIG_COMPAT */
+
+#endif /* _VSERVER_INODE_CMD_H */
-diff -NurpP --minimal linux-4.9.207/include/linux/vserver/inode.h linux-4.9.207-vs2.3.9.11/include/linux/vserver/inode.h
---- linux-4.9.207/include/linux/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vserver/inode.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vserver/inode.h linux-4.9.217-vs2.3.9.12/include/linux/vserver/inode.h
+--- linux-4.9.217/include/linux/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vserver/inode.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,19 @@
+#ifndef _VSERVER_INODE_H
+#define _VSERVER_INODE_H
@@ -9175,9 +9175,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vserver/inode.h linux-4.9.207-
+#else /* _VSERVER_INODE_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_INODE_H */
-diff -NurpP --minimal linux-4.9.207/include/linux/vserver/limit_cmd.h linux-4.9.207-vs2.3.9.11/include/linux/vserver/limit_cmd.h
---- linux-4.9.207/include/linux/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vserver/limit_cmd.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vserver/limit_cmd.h linux-4.9.217-vs2.3.9.12/include/linux/vserver/limit_cmd.h
+--- linux-4.9.217/include/linux/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vserver/limit_cmd.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,35 @@
+#ifndef _VSERVER_LIMIT_CMD_H
+#define _VSERVER_LIMIT_CMD_H
@@ -9214,9 +9214,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vserver/limit_cmd.h linux-4.9.
+#endif /* CONFIG_IA32_EMULATION */
+
+#endif /* _VSERVER_LIMIT_CMD_H */
-diff -NurpP --minimal linux-4.9.207/include/linux/vserver/limit_def.h linux-4.9.207-vs2.3.9.11/include/linux/vserver/limit_def.h
---- linux-4.9.207/include/linux/vserver/limit_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vserver/limit_def.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vserver/limit_def.h linux-4.9.217-vs2.3.9.12/include/linux/vserver/limit_def.h
+--- linux-4.9.217/include/linux/vserver/limit_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vserver/limit_def.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,47 @@
+#ifndef _VSERVER_LIMIT_DEF_H
+#define _VSERVER_LIMIT_DEF_H
@@ -9265,9 +9265,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vserver/limit_def.h linux-4.9.
+#endif
+
+#endif /* _VSERVER_LIMIT_DEF_H */
-diff -NurpP --minimal linux-4.9.207/include/linux/vserver/limit.h linux-4.9.207-vs2.3.9.11/include/linux/vserver/limit.h
---- linux-4.9.207/include/linux/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vserver/limit.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vserver/limit.h linux-4.9.217-vs2.3.9.12/include/linux/vserver/limit.h
+--- linux-4.9.217/include/linux/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vserver/limit.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,67 @@
+#ifndef _VSERVER_LIMIT_H
+#define _VSERVER_LIMIT_H
@@ -9336,9 +9336,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vserver/limit.h linux-4.9.207-
+#define NUM_LIMITS 24
+
+#endif /* _VSERVER_LIMIT_H */
-diff -NurpP --minimal linux-4.9.207/include/linux/vserver/limit_int.h linux-4.9.207-vs2.3.9.11/include/linux/vserver/limit_int.h
---- linux-4.9.207/include/linux/vserver/limit_int.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vserver/limit_int.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vserver/limit_int.h linux-4.9.217-vs2.3.9.12/include/linux/vserver/limit_int.h
+--- linux-4.9.217/include/linux/vserver/limit_int.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vserver/limit_int.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,193 @@
+#ifndef _VSERVER_LIMIT_INT_H
+#define _VSERVER_LIMIT_INT_H
@@ -9533,9 +9533,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vserver/limit_int.h linux-4.9.
+
+
+#endif /* _VSERVER_LIMIT_INT_H */
-diff -NurpP --minimal linux-4.9.207/include/linux/vserver/monitor.h linux-4.9.207-vs2.3.9.11/include/linux/vserver/monitor.h
---- linux-4.9.207/include/linux/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vserver/monitor.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vserver/monitor.h linux-4.9.217-vs2.3.9.12/include/linux/vserver/monitor.h
+--- linux-4.9.217/include/linux/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vserver/monitor.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,6 @@
+#ifndef _VSERVER_MONITOR_H
+#define _VSERVER_MONITOR_H
@@ -9543,9 +9543,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vserver/monitor.h linux-4.9.20
+#include <uapi/vserver/monitor.h>
+
+#endif /* _VSERVER_MONITOR_H */
-diff -NurpP --minimal linux-4.9.207/include/linux/vserver/network_cmd.h linux-4.9.207-vs2.3.9.11/include/linux/vserver/network_cmd.h
---- linux-4.9.207/include/linux/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vserver/network_cmd.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vserver/network_cmd.h linux-4.9.217-vs2.3.9.12/include/linux/vserver/network_cmd.h
+--- linux-4.9.217/include/linux/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vserver/network_cmd.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,37 @@
+#ifndef _VSERVER_NETWORK_CMD_H
+#define _VSERVER_NETWORK_CMD_H
@@ -9584,9 +9584,9 @@ diff -NurpP --minimal linux-4.9.207/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.9.207/include/linux/vserver/network.h linux-4.9.207-vs2.3.9.11/include/linux/vserver/network.h
---- linux-4.9.207/include/linux/vserver/network.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vserver/network.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vserver/network.h linux-4.9.217-vs2.3.9.12/include/linux/vserver/network.h
+--- linux-4.9.217/include/linux/vserver/network.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vserver/network.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,76 @@
+#ifndef _VSERVER_NETWORK_H
+#define _VSERVER_NETWORK_H
@@ -9664,9 +9664,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vserver/network.h linux-4.9.20
+#endif
+
+#endif /* _VSERVER_NETWORK_H */
-diff -NurpP --minimal linux-4.9.207/include/linux/vserver/percpu.h linux-4.9.207-vs2.3.9.11/include/linux/vserver/percpu.h
---- linux-4.9.207/include/linux/vserver/percpu.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vserver/percpu.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vserver/percpu.h linux-4.9.217-vs2.3.9.12/include/linux/vserver/percpu.h
+--- linux-4.9.217/include/linux/vserver/percpu.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vserver/percpu.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,14 @@
+#ifndef _VSERVER_PERCPU_H
+#define _VSERVER_PERCPU_H
@@ -9682,9 +9682,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vserver/percpu.h linux-4.9.207
+#define PERCPU_PERCTX (sizeof(struct _vx_percpu))
+
+#endif /* _VSERVER_PERCPU_H */
-diff -NurpP --minimal linux-4.9.207/include/linux/vserver/pid.h linux-4.9.207-vs2.3.9.11/include/linux/vserver/pid.h
---- linux-4.9.207/include/linux/vserver/pid.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vserver/pid.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vserver/pid.h linux-4.9.217-vs2.3.9.12/include/linux/vserver/pid.h
+--- linux-4.9.217/include/linux/vserver/pid.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vserver/pid.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,51 @@
+#ifndef _VSERVER_PID_H
+#define _VSERVER_PID_H
@@ -9737,9 +9737,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vserver/pid.h linux-4.9.207-vs
+}
+
+#endif
-diff -NurpP --minimal linux-4.9.207/include/linux/vserver/sched_cmd.h linux-4.9.207-vs2.3.9.11/include/linux/vserver/sched_cmd.h
---- linux-4.9.207/include/linux/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vserver/sched_cmd.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vserver/sched_cmd.h linux-4.9.217-vs2.3.9.12/include/linux/vserver/sched_cmd.h
+--- linux-4.9.217/include/linux/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vserver/sched_cmd.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,11 @@
+#ifndef _VSERVER_SCHED_CMD_H
+#define _VSERVER_SCHED_CMD_H
@@ -9752,9 +9752,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vserver/sched_cmd.h linux-4.9.
+extern int vc_get_prio_bias(struct vx_info *, void __user *);
+
+#endif /* _VSERVER_SCHED_CMD_H */
-diff -NurpP --minimal linux-4.9.207/include/linux/vserver/sched_def.h linux-4.9.207-vs2.3.9.11/include/linux/vserver/sched_def.h
---- linux-4.9.207/include/linux/vserver/sched_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vserver/sched_def.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vserver/sched_def.h linux-4.9.217-vs2.3.9.12/include/linux/vserver/sched_def.h
+--- linux-4.9.217/include/linux/vserver/sched_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vserver/sched_def.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,38 @@
+#ifndef _VSERVER_SCHED_DEF_H
+#define _VSERVER_SCHED_DEF_H
@@ -9794,9 +9794,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vserver/sched_def.h linux-4.9.
+#endif
+
+#endif /* _VSERVER_SCHED_DEF_H */
-diff -NurpP --minimal linux-4.9.207/include/linux/vserver/sched.h linux-4.9.207-vs2.3.9.11/include/linux/vserver/sched.h
---- linux-4.9.207/include/linux/vserver/sched.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vserver/sched.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vserver/sched.h linux-4.9.217-vs2.3.9.12/include/linux/vserver/sched.h
+--- linux-4.9.217/include/linux/vserver/sched.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vserver/sched.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,23 @@
+#ifndef _VSERVER_SCHED_H
+#define _VSERVER_SCHED_H
@@ -9821,9 +9821,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vserver/sched.h linux-4.9.207-
+#else /* _VSERVER_SCHED_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_SCHED_H */
-diff -NurpP --minimal linux-4.9.207/include/linux/vserver/signal_cmd.h linux-4.9.207-vs2.3.9.11/include/linux/vserver/signal_cmd.h
---- linux-4.9.207/include/linux/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vserver/signal_cmd.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vserver/signal_cmd.h linux-4.9.217-vs2.3.9.12/include/linux/vserver/signal_cmd.h
+--- linux-4.9.217/include/linux/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vserver/signal_cmd.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,14 @@
+#ifndef _VSERVER_SIGNAL_CMD_H
+#define _VSERVER_SIGNAL_CMD_H
@@ -9839,9 +9839,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vserver/signal_cmd.h linux-4.9
+extern int vc_set_pflags(uint32_t pid, void __user *);
+
+#endif /* _VSERVER_SIGNAL_CMD_H */
-diff -NurpP --minimal linux-4.9.207/include/linux/vserver/signal.h linux-4.9.207-vs2.3.9.11/include/linux/vserver/signal.h
---- linux-4.9.207/include/linux/vserver/signal.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vserver/signal.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vserver/signal.h linux-4.9.217-vs2.3.9.12/include/linux/vserver/signal.h
+--- linux-4.9.217/include/linux/vserver/signal.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vserver/signal.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,14 @@
+#ifndef _VSERVER_SIGNAL_H
+#define _VSERVER_SIGNAL_H
@@ -9857,9 +9857,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vserver/signal.h linux-4.9.207
+#else /* _VSERVER_SIGNAL_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_SIGNAL_H */
-diff -NurpP --minimal linux-4.9.207/include/linux/vserver/space_cmd.h linux-4.9.207-vs2.3.9.11/include/linux/vserver/space_cmd.h
---- linux-4.9.207/include/linux/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vserver/space_cmd.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vserver/space_cmd.h linux-4.9.217-vs2.3.9.12/include/linux/vserver/space_cmd.h
+--- linux-4.9.217/include/linux/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vserver/space_cmd.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,13 @@
+#ifndef _VSERVER_SPACE_CMD_H
+#define _VSERVER_SPACE_CMD_H
@@ -9874,9 +9874,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vserver/space_cmd.h linux-4.9.
+extern int vc_get_space_mask(void __user *, int);
+
+#endif /* _VSERVER_SPACE_CMD_H */
-diff -NurpP --minimal linux-4.9.207/include/linux/vserver/space.h linux-4.9.207-vs2.3.9.11/include/linux/vserver/space.h
---- linux-4.9.207/include/linux/vserver/space.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vserver/space.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vserver/space.h linux-4.9.217-vs2.3.9.12/include/linux/vserver/space.h
+--- linux-4.9.217/include/linux/vserver/space.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vserver/space.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,12 @@
+#ifndef _VSERVER_SPACE_H
+#define _VSERVER_SPACE_H
@@ -9890,9 +9890,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vserver/space.h linux-4.9.207-
+#else /* _VSERVER_SPACE_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_SPACE_H */
-diff -NurpP --minimal linux-4.9.207/include/linux/vserver/switch.h linux-4.9.207-vs2.3.9.11/include/linux/vserver/switch.h
---- linux-4.9.207/include/linux/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vserver/switch.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vserver/switch.h linux-4.9.217-vs2.3.9.12/include/linux/vserver/switch.h
+--- linux-4.9.217/include/linux/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vserver/switch.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,8 @@
+#ifndef _VSERVER_SWITCH_H
+#define _VSERVER_SWITCH_H
@@ -9902,9 +9902,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vserver/switch.h linux-4.9.207
+#include <uapi/vserver/switch.h>
+
+#endif /* _VSERVER_SWITCH_H */
-diff -NurpP --minimal linux-4.9.207/include/linux/vserver/tag_cmd.h linux-4.9.207-vs2.3.9.11/include/linux/vserver/tag_cmd.h
---- linux-4.9.207/include/linux/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vserver/tag_cmd.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vserver/tag_cmd.h linux-4.9.217-vs2.3.9.12/include/linux/vserver/tag_cmd.h
+--- linux-4.9.217/include/linux/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vserver/tag_cmd.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,10 @@
+#ifndef _VSERVER_TAG_CMD_H
+#define _VSERVER_TAG_CMD_H
@@ -9916,9 +9916,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vserver/tag_cmd.h linux-4.9.20
+extern int vc_tag_migrate(uint32_t);
+
+#endif /* _VSERVER_TAG_CMD_H */
-diff -NurpP --minimal linux-4.9.207/include/linux/vserver/tag.h linux-4.9.207-vs2.3.9.11/include/linux/vserver/tag.h
---- linux-4.9.207/include/linux/vserver/tag.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vserver/tag.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vserver/tag.h linux-4.9.217-vs2.3.9.12/include/linux/vserver/tag.h
+--- linux-4.9.217/include/linux/vserver/tag.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vserver/tag.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,160 @@
+#ifndef _DX_TAG_H
+#define _DX_TAG_H
@@ -10080,9 +10080,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vserver/tag.h linux-4.9.207-vs
+#endif
+
+#endif /* _DX_TAG_H */
-diff -NurpP --minimal linux-4.9.207/include/linux/vs_inet6.h linux-4.9.207-vs2.3.9.11/include/linux/vs_inet6.h
---- linux-4.9.207/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vs_inet6.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vs_inet6.h linux-4.9.217-vs2.3.9.12/include/linux/vs_inet6.h
+--- linux-4.9.217/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vs_inet6.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,264 @@
+#ifndef _VS_INET6_H
+#define _VS_INET6_H
@@ -10348,9 +10348,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vs_inet6.h linux-4.9.207-vs2.3
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.9.207/include/linux/vs_inet.h linux-4.9.207-vs2.3.9.11/include/linux/vs_inet.h
---- linux-4.9.207/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vs_inet.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vs_inet.h linux-4.9.217-vs2.3.9.12/include/linux/vs_inet.h
+--- linux-4.9.217/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vs_inet.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,364 @@
+#ifndef _VS_INET_H
+#define _VS_INET_H
@@ -10716,9 +10716,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vs_inet.h linux-4.9.207-vs2.3.
+#else
+// #warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.9.207/include/linux/vs_limit.h linux-4.9.207-vs2.3.9.11/include/linux/vs_limit.h
---- linux-4.9.207/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vs_limit.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vs_limit.h linux-4.9.217-vs2.3.9.12/include/linux/vs_limit.h
+--- linux-4.9.217/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vs_limit.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,140 @@
+#ifndef _VS_LIMIT_H
+#define _VS_LIMIT_H
@@ -10860,9 +10860,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vs_limit.h linux-4.9.207-vs2.3
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.9.207/include/linux/vs_network.h linux-4.9.207-vs2.3.9.11/include/linux/vs_network.h
---- linux-4.9.207/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vs_network.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vs_network.h linux-4.9.217-vs2.3.9.12/include/linux/vs_network.h
+--- linux-4.9.217/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vs_network.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,169 @@
+#ifndef _NX_VS_NETWORK_H
+#define _NX_VS_NETWORK_H
@@ -11033,9 +11033,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vs_network.h linux-4.9.207-vs2
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.9.207/include/linux/vs_pid.h linux-4.9.207-vs2.3.9.11/include/linux/vs_pid.h
---- linux-4.9.207/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vs_pid.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vs_pid.h linux-4.9.217-vs2.3.9.12/include/linux/vs_pid.h
+--- linux-4.9.217/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vs_pid.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,50 @@
+#ifndef _VS_PID_H
+#define _VS_PID_H
@@ -11087,9 +11087,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vs_pid.h linux-4.9.207-vs2.3.9
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.9.207/include/linux/vs_sched.h linux-4.9.207-vs2.3.9.11/include/linux/vs_sched.h
---- linux-4.9.207/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vs_sched.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vs_sched.h linux-4.9.217-vs2.3.9.12/include/linux/vs_sched.h
+--- linux-4.9.217/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vs_sched.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,40 @@
+#ifndef _VS_SCHED_H
+#define _VS_SCHED_H
@@ -11131,9 +11131,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vs_sched.h linux-4.9.207-vs2.3
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.9.207/include/linux/vs_socket.h linux-4.9.207-vs2.3.9.11/include/linux/vs_socket.h
---- linux-4.9.207/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vs_socket.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vs_socket.h linux-4.9.217-vs2.3.9.12/include/linux/vs_socket.h
+--- linux-4.9.217/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vs_socket.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,67 @@
+#ifndef _VS_SOCKET_H
+#define _VS_SOCKET_H
@@ -11202,9 +11202,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vs_socket.h linux-4.9.207-vs2.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.9.207/include/linux/vs_tag.h linux-4.9.207-vs2.3.9.11/include/linux/vs_tag.h
---- linux-4.9.207/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vs_tag.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vs_tag.h linux-4.9.217-vs2.3.9.12/include/linux/vs_tag.h
+--- linux-4.9.217/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vs_tag.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,47 @@
+#ifndef _VS_TAG_H
+#define _VS_TAG_H
@@ -11253,9 +11253,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vs_tag.h linux-4.9.207-vs2.3.9
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.9.207/include/linux/vs_time.h linux-4.9.207-vs2.3.9.11/include/linux/vs_time.h
---- linux-4.9.207/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/linux/vs_time.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/linux/vs_time.h linux-4.9.217-vs2.3.9.12/include/linux/vs_time.h
+--- linux-4.9.217/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/linux/vs_time.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,21 @@
+#ifndef _VS_TIME_H
+#define _VS_TIME_H
@@ -11278,9 +11278,9 @@ diff -NurpP --minimal linux-4.9.207/include/linux/vs_time.h linux-4.9.207-vs2.3.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.9.207/include/net/addrconf.h linux-4.9.207-vs2.3.9.11/include/net/addrconf.h
---- linux-4.9.207/include/net/addrconf.h 2019-12-25 15:28:40.237269280 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/net/addrconf.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/net/addrconf.h linux-4.9.217-vs2.3.9.12/include/net/addrconf.h
+--- linux-4.9.217/include/net/addrconf.h 2020-03-27 00:51:41.560167763 +0000
++++ linux-4.9.217-vs2.3.9.12/include/net/addrconf.h 2018-10-20 04:58:14.000000000 +0000
@@ -85,7 +85,7 @@ struct inet6_ifaddr *ipv6_get_ifaddr(str
int ipv6_dev_get_saddr(struct net *net, const struct net_device *dev,
@@ -11290,9 +11290,9 @@ diff -NurpP --minimal linux-4.9.207/include/net/addrconf.h linux-4.9.207-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.9.207/include/net/af_unix.h linux-4.9.207-vs2.3.9.11/include/net/af_unix.h
---- linux-4.9.207/include/net/af_unix.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/net/af_unix.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/net/af_unix.h linux-4.9.217-vs2.3.9.12/include/net/af_unix.h
+--- linux-4.9.217/include/net/af_unix.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/net/af_unix.h 2018-10-20 04:58:14.000000000 +0000
@@ -4,6 +4,7 @@
#include <linux/socket.h>
#include <linux/un.h>
@@ -11301,9 +11301,9 @@ diff -NurpP --minimal linux-4.9.207/include/net/af_unix.h linux-4.9.207-vs2.3.9.
#include <net/sock.h>
void unix_inflight(struct user_struct *user, struct file *fp);
-diff -NurpP --minimal linux-4.9.207/include/net/inet_timewait_sock.h linux-4.9.207-vs2.3.9.11/include/net/inet_timewait_sock.h
---- linux-4.9.207/include/net/inet_timewait_sock.h 2019-12-25 15:28:41.037256346 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/net/inet_timewait_sock.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/net/inet_timewait_sock.h linux-4.9.217-vs2.3.9.12/include/net/inet_timewait_sock.h
+--- linux-4.9.217/include/net/inet_timewait_sock.h 2020-03-27 00:51:41.750164768 +0000
++++ linux-4.9.217-vs2.3.9.12/include/net/inet_timewait_sock.h 2018-10-20 04:58:14.000000000 +0000
@@ -72,6 +72,10 @@ struct inet_timewait_sock {
#define tw_num __tw_common.skc_num
#define tw_cookie __tw_common.skc_cookie
@@ -11315,9 +11315,9 @@ diff -NurpP --minimal linux-4.9.207/include/net/inet_timewait_sock.h linux-4.9.2
int tw_timeout;
volatile unsigned char tw_substate;
-diff -NurpP --minimal linux-4.9.207/include/net/ip6_route.h linux-4.9.207-vs2.3.9.11/include/net/ip6_route.h
---- linux-4.9.207/include/net/ip6_route.h 2019-12-25 15:28:41.057256025 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/net/ip6_route.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/net/ip6_route.h linux-4.9.217-vs2.3.9.12/include/net/ip6_route.h
+--- linux-4.9.217/include/net/ip6_route.h 2020-03-27 00:51:41.750164768 +0000
++++ linux-4.9.217-vs2.3.9.12/include/net/ip6_route.h 2018-10-20 04:58:14.000000000 +0000
@@ -26,6 +26,7 @@ struct route_info {
#include <linux/ip.h>
#include <linux/ipv6.h>
@@ -11349,9 +11349,9 @@ diff -NurpP --minimal linux-4.9.207/include/net/ip6_route.h linux-4.9.207-vs2.3.
return err;
}
-diff -NurpP --minimal linux-4.9.207/include/net/route.h linux-4.9.207-vs2.3.9.11/include/net/route.h
---- linux-4.9.207/include/net/route.h 2019-12-25 15:28:41.657246322 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/net/route.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/net/route.h linux-4.9.217-vs2.3.9.12/include/net/route.h
+--- linux-4.9.217/include/net/route.h 2020-03-27 00:51:41.900162405 +0000
++++ linux-4.9.217-vs2.3.9.12/include/net/route.h 2018-10-20 04:58:14.000000000 +0000
@@ -226,6 +226,9 @@ static inline void ip_rt_put(struct rtab
dst_release(&rt->dst);
}
@@ -11399,9 +11399,9 @@ diff -NurpP --minimal linux-4.9.207/include/net/route.h linux-4.9.207-vs2.3.9.11
rt = __ip_route_output_key(net, fl4);
if (IS_ERR(rt))
return rt;
-diff -NurpP --minimal linux-4.9.207/include/net/sock.h linux-4.9.207-vs2.3.9.11/include/net/sock.h
---- linux-4.9.207/include/net/sock.h 2019-12-25 15:28:41.707245516 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/net/sock.h 2019-12-25 15:37:52.288424537 +0000
+diff -NurpP --minimal linux-4.9.217/include/net/sock.h linux-4.9.217-vs2.3.9.12/include/net/sock.h
+--- linux-4.9.217/include/net/sock.h 2020-03-27 00:51:41.960161456 +0000
++++ linux-4.9.217-vs2.3.9.12/include/net/sock.h 2020-04-01 09:40:32.325403988 +0000
@@ -187,6 +187,10 @@ struct sock_common {
struct in6_addr skc_v6_daddr;
struct in6_addr skc_v6_rcv_saddr;
@@ -11427,17 +11427,17 @@ diff -NurpP --minimal linux-4.9.207/include/net/sock.h linux-4.9.207-vs2.3.9.11/
#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.9.207/include/uapi/Kbuild linux-4.9.207-vs2.3.9.11/include/uapi/Kbuild
---- linux-4.9.207/include/uapi/Kbuild 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/uapi/Kbuild 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/uapi/Kbuild linux-4.9.217-vs2.3.9.12/include/uapi/Kbuild
+--- linux-4.9.217/include/uapi/Kbuild 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/uapi/Kbuild 2018-10-20 04:58:14.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.9.207/include/uapi/linux/btrfs_tree.h linux-4.9.207-vs2.3.9.11/include/uapi/linux/btrfs_tree.h
---- linux-4.9.207/include/uapi/linux/btrfs_tree.h 2019-12-25 15:28:42.297235975 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/uapi/linux/btrfs_tree.h 2019-02-22 08:37:55.713049558 +0000
+diff -NurpP --minimal linux-4.9.217/include/uapi/linux/btrfs_tree.h linux-4.9.217-vs2.3.9.12/include/uapi/linux/btrfs_tree.h
+--- linux-4.9.217/include/uapi/linux/btrfs_tree.h 2020-03-27 00:51:42.430154051 +0000
++++ linux-4.9.217-vs2.3.9.12/include/uapi/linux/btrfs_tree.h 2019-02-22 08:37:55.713049558 +0000
@@ -564,11 +564,14 @@ struct btrfs_inode_item {
/* modification sequence number for NFS */
__le64 sequence;
@@ -11454,9 +11454,9 @@ diff -NurpP --minimal linux-4.9.207/include/uapi/linux/btrfs_tree.h linux-4.9.20
struct btrfs_timespec atime;
struct btrfs_timespec ctime;
struct btrfs_timespec mtime;
-diff -NurpP --minimal linux-4.9.207/include/uapi/linux/capability.h linux-4.9.207-vs2.3.9.11/include/uapi/linux/capability.h
---- linux-4.9.207/include/uapi/linux/capability.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/uapi/linux/capability.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/uapi/linux/capability.h linux-4.9.217-vs2.3.9.12/include/uapi/linux/capability.h
+--- linux-4.9.217/include/uapi/linux/capability.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/uapi/linux/capability.h 2018-10-20 04:58:14.000000000 +0000
@@ -257,6 +257,7 @@ struct vfs_cap_data {
arbitrary SCSI commands */
/* Allow setting encryption key on loopback filesystem */
@@ -11479,9 +11479,9 @@ diff -NurpP --minimal linux-4.9.207/include/uapi/linux/capability.h linux-4.9.20
/*
* Bit location of each capability (used by user-space library and kernel)
-diff -NurpP --minimal linux-4.9.207/include/uapi/linux/fs.h linux-4.9.207-vs2.3.9.11/include/uapi/linux/fs.h
---- linux-4.9.207/include/uapi/linux/fs.h 2019-12-25 15:28:42.337235329 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/uapi/linux/fs.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/uapi/linux/fs.h linux-4.9.217-vs2.3.9.12/include/uapi/linux/fs.h
+--- linux-4.9.217/include/uapi/linux/fs.h 2020-03-27 00:51:42.450153736 +0000
++++ linux-4.9.217-vs2.3.9.12/include/uapi/linux/fs.h 2018-10-20 04:58:14.000000000 +0000
@@ -130,6 +130,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 */
@@ -11511,9 +11511,9 @@ diff -NurpP --minimal linux-4.9.207/include/uapi/linux/fs.h linux-4.9.207-vs2.3.
#define SYNC_FILE_RANGE_WAIT_BEFORE 1
#define SYNC_FILE_RANGE_WRITE 2
-diff -NurpP --minimal linux-4.9.207/include/uapi/linux/gfs2_ondisk.h linux-4.9.207-vs2.3.9.11/include/uapi/linux/gfs2_ondisk.h
---- linux-4.9.207/include/uapi/linux/gfs2_ondisk.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/uapi/linux/gfs2_ondisk.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/uapi/linux/gfs2_ondisk.h linux-4.9.217-vs2.3.9.12/include/uapi/linux/gfs2_ondisk.h
+--- linux-4.9.217/include/uapi/linux/gfs2_ondisk.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/uapi/linux/gfs2_ondisk.h 2018-10-20 04:58:14.000000000 +0000
@@ -225,6 +225,9 @@ enum {
gfs2fl_Sync = 8,
gfs2fl_System = 9,
@@ -11534,9 +11534,9 @@ diff -NurpP --minimal linux-4.9.207/include/uapi/linux/gfs2_ondisk.h linux-4.9.2
#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.9.207/include/uapi/linux/if_tun.h linux-4.9.207-vs2.3.9.11/include/uapi/linux/if_tun.h
---- linux-4.9.207/include/uapi/linux/if_tun.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/uapi/linux/if_tun.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/uapi/linux/if_tun.h linux-4.9.217-vs2.3.9.12/include/uapi/linux/if_tun.h
+--- linux-4.9.217/include/uapi/linux/if_tun.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/uapi/linux/if_tun.h 2018-10-20 04:58:14.000000000 +0000
@@ -56,6 +56,7 @@
*/
#define TUNSETVNETBE _IOW('T', 222, int)
@@ -11545,9 +11545,9 @@ diff -NurpP --minimal linux-4.9.207/include/uapi/linux/if_tun.h linux-4.9.207-vs
/* TUNSETIFF ifr flags */
#define IFF_TUN 0x0001
-diff -NurpP --minimal linux-4.9.207/include/uapi/linux/major.h linux-4.9.207-vs2.3.9.11/include/uapi/linux/major.h
---- linux-4.9.207/include/uapi/linux/major.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/uapi/linux/major.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/uapi/linux/major.h linux-4.9.217-vs2.3.9.12/include/uapi/linux/major.h
+--- linux-4.9.217/include/uapi/linux/major.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/uapi/linux/major.h 2018-10-20 04:58:14.000000000 +0000
@@ -15,6 +15,7 @@
#define HD_MAJOR IDE0_MAJOR
#define PTY_SLAVE_MAJOR 3
@@ -11556,9 +11556,9 @@ diff -NurpP --minimal linux-4.9.207/include/uapi/linux/major.h linux-4.9.207-vs2
#define TTYAUX_MAJOR 5
#define LP_MAJOR 6
#define VCS_MAJOR 7
-diff -NurpP --minimal linux-4.9.207/include/uapi/linux/nfs_mount.h linux-4.9.207-vs2.3.9.11/include/uapi/linux/nfs_mount.h
---- linux-4.9.207/include/uapi/linux/nfs_mount.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/uapi/linux/nfs_mount.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/uapi/linux/nfs_mount.h linux-4.9.217-vs2.3.9.12/include/uapi/linux/nfs_mount.h
+--- linux-4.9.217/include/uapi/linux/nfs_mount.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/uapi/linux/nfs_mount.h 2018-10-20 04:58:14.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 */
@@ -11569,9 +11569,9 @@ diff -NurpP --minimal linux-4.9.207/include/uapi/linux/nfs_mount.h linux-4.9.207
/* The following are for internal use only */
#define NFS_MOUNT_LOOKUP_CACHE_NONEG 0x10000
-diff -NurpP --minimal linux-4.9.207/include/uapi/linux/reboot.h linux-4.9.207-vs2.3.9.11/include/uapi/linux/reboot.h
---- linux-4.9.207/include/uapi/linux/reboot.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/uapi/linux/reboot.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/uapi/linux/reboot.h linux-4.9.217-vs2.3.9.12/include/uapi/linux/reboot.h
+--- linux-4.9.217/include/uapi/linux/reboot.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/uapi/linux/reboot.h 2018-10-20 04:58:14.000000000 +0000
@@ -33,7 +33,7 @@
#define LINUX_REBOOT_CMD_RESTART2 0xA1B2C3D4
#define LINUX_REBOOT_CMD_SW_SUSPEND 0xD000FCE2
@@ -11581,9 +11581,9 @@ diff -NurpP --minimal linux-4.9.207/include/uapi/linux/reboot.h linux-4.9.207-vs
#endif /* _UAPI_LINUX_REBOOT_H */
-diff -NurpP --minimal linux-4.9.207/include/uapi/linux/sysctl.h linux-4.9.207-vs2.3.9.11/include/uapi/linux/sysctl.h
---- linux-4.9.207/include/uapi/linux/sysctl.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/uapi/linux/sysctl.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/uapi/linux/sysctl.h linux-4.9.217-vs2.3.9.12/include/uapi/linux/sysctl.h
+--- linux-4.9.217/include/uapi/linux/sysctl.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/uapi/linux/sysctl.h 2018-10-20 04:58:14.000000000 +0000
@@ -58,6 +58,7 @@ enum
CTL_ABI=9, /* Binary emulation */
CTL_CPU=10, /* CPU stuff (speed scaling, etc) */
@@ -11600,9 +11600,9 @@ diff -NurpP --minimal linux-4.9.207/include/uapi/linux/sysctl.h linux-4.9.207-vs
KERN_SPARC_REBOOT=21, /* reboot command on Sparc */
KERN_CTLALTDEL=22, /* int: allow ctl-alt-del to reboot */
-diff -NurpP --minimal linux-4.9.207/include/uapi/vserver/cacct_cmd.h linux-4.9.207-vs2.3.9.11/include/uapi/vserver/cacct_cmd.h
---- linux-4.9.207/include/uapi/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/uapi/vserver/cacct_cmd.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/uapi/vserver/cacct_cmd.h linux-4.9.217-vs2.3.9.12/include/uapi/vserver/cacct_cmd.h
+--- linux-4.9.217/include/uapi/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/uapi/vserver/cacct_cmd.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,15 @@
+#ifndef _UAPI_VS_CACCT_CMD_H
+#define _UAPI_VS_CACCT_CMD_H
@@ -11619,9 +11619,9 @@ diff -NurpP --minimal linux-4.9.207/include/uapi/vserver/cacct_cmd.h linux-4.9.2
+};
+
+#endif /* _UAPI_VS_CACCT_CMD_H */
-diff -NurpP --minimal linux-4.9.207/include/uapi/vserver/context_cmd.h linux-4.9.207-vs2.3.9.11/include/uapi/vserver/context_cmd.h
---- linux-4.9.207/include/uapi/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/uapi/vserver/context_cmd.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/uapi/vserver/context_cmd.h linux-4.9.217-vs2.3.9.12/include/uapi/vserver/context_cmd.h
+--- linux-4.9.217/include/uapi/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/uapi/vserver/context_cmd.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,115 @@
+#ifndef _UAPI_VS_CONTEXT_CMD_H
+#define _UAPI_VS_CONTEXT_CMD_H
@@ -11738,9 +11738,9 @@ diff -NurpP --minimal linux-4.9.207/include/uapi/vserver/context_cmd.h linux-4.9
+};
+
+#endif /* _UAPI_VS_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-4.9.207/include/uapi/vserver/context.h linux-4.9.207-vs2.3.9.11/include/uapi/vserver/context.h
---- linux-4.9.207/include/uapi/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/uapi/vserver/context.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/uapi/vserver/context.h linux-4.9.217-vs2.3.9.12/include/uapi/vserver/context.h
+--- linux-4.9.217/include/uapi/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/uapi/vserver/context.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,81 @@
+#ifndef _UAPI_VS_CONTEXT_H
+#define _UAPI_VS_CONTEXT_H
@@ -11823,9 +11823,9 @@ diff -NurpP --minimal linux-4.9.207/include/uapi/vserver/context.h linux-4.9.207
+#define VXC_NAMESPACE 0x02000000
+
+#endif /* _UAPI_VS_CONTEXT_H */
-diff -NurpP --minimal linux-4.9.207/include/uapi/vserver/cvirt_cmd.h linux-4.9.207-vs2.3.9.11/include/uapi/vserver/cvirt_cmd.h
---- linux-4.9.207/include/uapi/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/uapi/vserver/cvirt_cmd.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/uapi/vserver/cvirt_cmd.h linux-4.9.217-vs2.3.9.12/include/uapi/vserver/cvirt_cmd.h
+--- linux-4.9.217/include/uapi/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/uapi/vserver/cvirt_cmd.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,41 @@
+#ifndef _UAPI_VS_CVIRT_CMD_H
+#define _UAPI_VS_CVIRT_CMD_H
@@ -11868,9 +11868,9 @@ diff -NurpP --minimal linux-4.9.207/include/uapi/vserver/cvirt_cmd.h linux-4.9.2
+};
+
+#endif /* _UAPI_VS_CVIRT_CMD_H */
-diff -NurpP --minimal linux-4.9.207/include/uapi/vserver/debug_cmd.h linux-4.9.207-vs2.3.9.11/include/uapi/vserver/debug_cmd.h
---- linux-4.9.207/include/uapi/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/uapi/vserver/debug_cmd.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/uapi/vserver/debug_cmd.h linux-4.9.217-vs2.3.9.12/include/uapi/vserver/debug_cmd.h
+--- linux-4.9.217/include/uapi/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/uapi/vserver/debug_cmd.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,24 @@
+#ifndef _UAPI_VS_DEBUG_CMD_H
+#define _UAPI_VS_DEBUG_CMD_H
@@ -11896,9 +11896,9 @@ diff -NurpP --minimal linux-4.9.207/include/uapi/vserver/debug_cmd.h linux-4.9.2
+};
+
+#endif /* _UAPI_VS_DEBUG_CMD_H */
-diff -NurpP --minimal linux-4.9.207/include/uapi/vserver/device_cmd.h linux-4.9.207-vs2.3.9.11/include/uapi/vserver/device_cmd.h
---- linux-4.9.207/include/uapi/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/uapi/vserver/device_cmd.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/uapi/vserver/device_cmd.h linux-4.9.217-vs2.3.9.12/include/uapi/vserver/device_cmd.h
+--- linux-4.9.217/include/uapi/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/uapi/vserver/device_cmd.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,16 @@
+#ifndef _UAPI_VS_DEVICE_CMD_H
+#define _UAPI_VS_DEVICE_CMD_H
@@ -11916,9 +11916,9 @@ diff -NurpP --minimal linux-4.9.207/include/uapi/vserver/device_cmd.h linux-4.9.
+};
+
+#endif /* _UAPI_VS_DEVICE_CMD_H */
-diff -NurpP --minimal linux-4.9.207/include/uapi/vserver/device.h linux-4.9.207-vs2.3.9.11/include/uapi/vserver/device.h
---- linux-4.9.207/include/uapi/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/uapi/vserver/device.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/uapi/vserver/device.h linux-4.9.217-vs2.3.9.12/include/uapi/vserver/device.h
+--- linux-4.9.217/include/uapi/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/uapi/vserver/device.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,12 @@
+#ifndef _UAPI_VS_DEVICE_H
+#define _UAPI_VS_DEVICE_H
@@ -11932,9 +11932,9 @@ diff -NurpP --minimal linux-4.9.207/include/uapi/vserver/device.h linux-4.9.207-
+#define DATTR_MASK 0x00000013
+
+#endif /* _UAPI_VS_DEVICE_H */
-diff -NurpP --minimal linux-4.9.207/include/uapi/vserver/dlimit_cmd.h linux-4.9.207-vs2.3.9.11/include/uapi/vserver/dlimit_cmd.h
---- linux-4.9.207/include/uapi/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/uapi/vserver/dlimit_cmd.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/uapi/vserver/dlimit_cmd.h linux-4.9.217-vs2.3.9.12/include/uapi/vserver/dlimit_cmd.h
+--- linux-4.9.217/include/uapi/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/uapi/vserver/dlimit_cmd.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,67 @@
+#ifndef _UAPI_VS_DLIMIT_CMD_H
+#define _UAPI_VS_DLIMIT_CMD_H
@@ -12003,9 +12003,9 @@ diff -NurpP --minimal linux-4.9.207/include/uapi/vserver/dlimit_cmd.h linux-4.9.
+}
+
+#endif /* _UAPI_VS_DLIMIT_CMD_H */
-diff -NurpP --minimal linux-4.9.207/include/uapi/vserver/inode_cmd.h linux-4.9.207-vs2.3.9.11/include/uapi/vserver/inode_cmd.h
---- linux-4.9.207/include/uapi/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/uapi/vserver/inode_cmd.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/uapi/vserver/inode_cmd.h linux-4.9.217-vs2.3.9.12/include/uapi/vserver/inode_cmd.h
+--- linux-4.9.217/include/uapi/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/uapi/vserver/inode_cmd.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,26 @@
+#ifndef _UAPI_VS_INODE_CMD_H
+#define _UAPI_VS_INODE_CMD_H
@@ -12033,9 +12033,9 @@ diff -NurpP --minimal linux-4.9.207/include/uapi/vserver/inode_cmd.h linux-4.9.2
+};
+
+#endif /* _UAPI_VS_INODE_CMD_H */
-diff -NurpP --minimal linux-4.9.207/include/uapi/vserver/inode.h linux-4.9.207-vs2.3.9.11/include/uapi/vserver/inode.h
---- linux-4.9.207/include/uapi/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/uapi/vserver/inode.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/uapi/vserver/inode.h linux-4.9.217-vs2.3.9.12/include/uapi/vserver/inode.h
+--- linux-4.9.217/include/uapi/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/uapi/vserver/inode.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,23 @@
+#ifndef _UAPI_VS_INODE_H
+#define _UAPI_VS_INODE_H
@@ -12060,9 +12060,9 @@ diff -NurpP --minimal linux-4.9.207/include/uapi/vserver/inode.h linux-4.9.207-v
+#define FIOC_SETXFLG _IOW('x', 6, long)
+
+#endif /* _UAPI_VS_INODE_H */
-diff -NurpP --minimal linux-4.9.207/include/uapi/vserver/Kbuild linux-4.9.207-vs2.3.9.11/include/uapi/vserver/Kbuild
---- linux-4.9.207/include/uapi/vserver/Kbuild 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/uapi/vserver/Kbuild 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/uapi/vserver/Kbuild linux-4.9.217-vs2.3.9.12/include/uapi/vserver/Kbuild
+--- linux-4.9.217/include/uapi/vserver/Kbuild 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/uapi/vserver/Kbuild 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,9 @@
+
+header-y += context_cmd.h network_cmd.h space_cmd.h \
@@ -12073,9 +12073,9 @@ diff -NurpP --minimal linux-4.9.207/include/uapi/vserver/Kbuild linux-4.9.207-vs
+header-y += switch.h context.h network.h monitor.h \
+ limit.h inode.h device.h
+
-diff -NurpP --minimal linux-4.9.207/include/uapi/vserver/limit_cmd.h linux-4.9.207-vs2.3.9.11/include/uapi/vserver/limit_cmd.h
---- linux-4.9.207/include/uapi/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/uapi/vserver/limit_cmd.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/uapi/vserver/limit_cmd.h linux-4.9.217-vs2.3.9.12/include/uapi/vserver/limit_cmd.h
+--- linux-4.9.217/include/uapi/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/uapi/vserver/limit_cmd.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,40 @@
+#ifndef _UAPI_VS_LIMIT_CMD_H
+#define _UAPI_VS_LIMIT_CMD_H
@@ -12117,9 +12117,9 @@ diff -NurpP --minimal linux-4.9.207/include/uapi/vserver/limit_cmd.h linux-4.9.2
+#define CRLIM_KEEP (~1ULL)
+
+#endif /* _UAPI_VS_LIMIT_CMD_H */
-diff -NurpP --minimal linux-4.9.207/include/uapi/vserver/limit.h linux-4.9.207-vs2.3.9.11/include/uapi/vserver/limit.h
---- linux-4.9.207/include/uapi/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/uapi/vserver/limit.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/uapi/vserver/limit.h linux-4.9.217-vs2.3.9.12/include/uapi/vserver/limit.h
+--- linux-4.9.217/include/uapi/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/uapi/vserver/limit.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,14 @@
+#ifndef _UAPI_VS_LIMIT_H
+#define _UAPI_VS_LIMIT_H
@@ -12135,9 +12135,9 @@ diff -NurpP --minimal linux-4.9.207/include/uapi/vserver/limit.h linux-4.9.207-v
+#define VLIMIT_MAPPED 23
+
+#endif /* _UAPI_VS_LIMIT_H */
-diff -NurpP --minimal linux-4.9.207/include/uapi/vserver/monitor.h linux-4.9.207-vs2.3.9.11/include/uapi/vserver/monitor.h
---- linux-4.9.207/include/uapi/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/uapi/vserver/monitor.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/uapi/vserver/monitor.h linux-4.9.217-vs2.3.9.12/include/uapi/vserver/monitor.h
+--- linux-4.9.217/include/uapi/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/uapi/vserver/monitor.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,96 @@
+#ifndef _UAPI_VS_MONITOR_H
+#define _UAPI_VS_MONITOR_H
@@ -12235,9 +12235,9 @@ diff -NurpP --minimal linux-4.9.207/include/uapi/vserver/monitor.h linux-4.9.207
+};
+
+#endif /* _UAPI_VS_MONITOR_H */
-diff -NurpP --minimal linux-4.9.207/include/uapi/vserver/network_cmd.h linux-4.9.207-vs2.3.9.11/include/uapi/vserver/network_cmd.h
---- linux-4.9.207/include/uapi/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/uapi/vserver/network_cmd.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/uapi/vserver/network_cmd.h linux-4.9.217-vs2.3.9.12/include/uapi/vserver/network_cmd.h
+--- linux-4.9.217/include/uapi/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/uapi/vserver/network_cmd.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,123 @@
+#ifndef _UAPI_VS_NETWORK_CMD_H
+#define _UAPI_VS_NETWORK_CMD_H
@@ -12362,9 +12362,9 @@ diff -NurpP --minimal linux-4.9.207/include/uapi/vserver/network_cmd.h linux-4.9
+};
+
+#endif /* _UAPI_VS_NETWORK_CMD_H */
-diff -NurpP --minimal linux-4.9.207/include/uapi/vserver/network.h linux-4.9.207-vs2.3.9.11/include/uapi/vserver/network.h
---- linux-4.9.207/include/uapi/vserver/network.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/uapi/vserver/network.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/uapi/vserver/network.h linux-4.9.217-vs2.3.9.12/include/uapi/vserver/network.h
+--- linux-4.9.217/include/uapi/vserver/network.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/uapi/vserver/network.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,76 @@
+#ifndef _UAPI_VS_NETWORK_H
+#define _UAPI_VS_NETWORK_H
@@ -12442,9 +12442,9 @@ diff -NurpP --minimal linux-4.9.207/include/uapi/vserver/network.h linux-4.9.207
+#define NXA_MASK_SHOW (NXA_MASK_ALL | NXA_LOOPBACK)
+
+#endif /* _UAPI_VS_NETWORK_H */
-diff -NurpP --minimal linux-4.9.207/include/uapi/vserver/sched_cmd.h linux-4.9.207-vs2.3.9.11/include/uapi/vserver/sched_cmd.h
---- linux-4.9.207/include/uapi/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/uapi/vserver/sched_cmd.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/uapi/vserver/sched_cmd.h linux-4.9.217-vs2.3.9.12/include/uapi/vserver/sched_cmd.h
+--- linux-4.9.217/include/uapi/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/uapi/vserver/sched_cmd.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,13 @@
+#ifndef _UAPI_VS_SCHED_CMD_H
+#define _UAPI_VS_SCHED_CMD_H
@@ -12459,9 +12459,9 @@ diff -NurpP --minimal linux-4.9.207/include/uapi/vserver/sched_cmd.h linux-4.9.2
+#define VCMD_get_prio_bias VC_CMD(SCHED, 5, 0)
+
+#endif /* _UAPI_VS_SCHED_CMD_H */
-diff -NurpP --minimal linux-4.9.207/include/uapi/vserver/signal_cmd.h linux-4.9.207-vs2.3.9.11/include/uapi/vserver/signal_cmd.h
---- linux-4.9.207/include/uapi/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/uapi/vserver/signal_cmd.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/uapi/vserver/signal_cmd.h linux-4.9.217-vs2.3.9.12/include/uapi/vserver/signal_cmd.h
+--- linux-4.9.217/include/uapi/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/uapi/vserver/signal_cmd.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,31 @@
+#ifndef _UAPI_VS_SIGNAL_CMD_H
+#define _UAPI_VS_SIGNAL_CMD_H
@@ -12494,9 +12494,9 @@ diff -NurpP --minimal linux-4.9.207/include/uapi/vserver/signal_cmd.h linux-4.9.
+};
+
+#endif /* _UAPI_VS_SIGNAL_CMD_H */
-diff -NurpP --minimal linux-4.9.207/include/uapi/vserver/space_cmd.h linux-4.9.207-vs2.3.9.11/include/uapi/vserver/space_cmd.h
---- linux-4.9.207/include/uapi/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/uapi/vserver/space_cmd.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/uapi/vserver/space_cmd.h linux-4.9.217-vs2.3.9.12/include/uapi/vserver/space_cmd.h
+--- linux-4.9.217/include/uapi/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/uapi/vserver/space_cmd.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,28 @@
+#ifndef _UAPI_VS_SPACE_CMD_H
+#define _UAPI_VS_SPACE_CMD_H
@@ -12526,9 +12526,9 @@ diff -NurpP --minimal linux-4.9.207/include/uapi/vserver/space_cmd.h linux-4.9.2
+};
+
+#endif /* _UAPI_VS_SPACE_CMD_H */
-diff -NurpP --minimal linux-4.9.207/include/uapi/vserver/switch.h linux-4.9.207-vs2.3.9.11/include/uapi/vserver/switch.h
---- linux-4.9.207/include/uapi/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/uapi/vserver/switch.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/uapi/vserver/switch.h linux-4.9.217-vs2.3.9.12/include/uapi/vserver/switch.h
+--- linux-4.9.217/include/uapi/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/uapi/vserver/switch.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,90 @@
+#ifndef _UAPI_VS_SWITCH_H
+#define _UAPI_VS_SWITCH_H
@@ -12620,9 +12620,9 @@ diff -NurpP --minimal linux-4.9.207/include/uapi/vserver/switch.h linux-4.9.207-
+#define VCMD_get_vci VC_CMD(VERSION, 1, 0)
+
+#endif /* _UAPI_VS_SWITCH_H */
-diff -NurpP --minimal linux-4.9.207/include/uapi/vserver/tag_cmd.h linux-4.9.207-vs2.3.9.11/include/uapi/vserver/tag_cmd.h
---- linux-4.9.207/include/uapi/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/include/uapi/vserver/tag_cmd.h 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/include/uapi/vserver/tag_cmd.h linux-4.9.217-vs2.3.9.12/include/uapi/vserver/tag_cmd.h
+--- linux-4.9.217/include/uapi/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/include/uapi/vserver/tag_cmd.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,14 @@
+#ifndef _UAPI_VS_TAG_CMD_H
+#define _UAPI_VS_TAG_CMD_H
@@ -12638,9 +12638,9 @@ diff -NurpP --minimal linux-4.9.207/include/uapi/vserver/tag_cmd.h linux-4.9.207
+#define VCMD_tag_migrate VC_CMD(TAGMIG, 1, 0)
+
+#endif /* _UAPI_VS_TAG_CMD_H */
-diff -NurpP --minimal linux-4.9.207/init/Kconfig linux-4.9.207-vs2.3.9.11/init/Kconfig
---- linux-4.9.207/init/Kconfig 2019-12-25 15:28:42.767228378 +0000
-+++ linux-4.9.207-vs2.3.9.11/init/Kconfig 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/init/Kconfig linux-4.9.217-vs2.3.9.12/init/Kconfig
+--- linux-4.9.217/init/Kconfig 2020-03-27 00:51:42.790148377 +0000
++++ linux-4.9.217-vs2.3.9.12/init/Kconfig 2018-10-20 04:58:14.000000000 +0000
@@ -958,6 +958,7 @@ config NUMA_BALANCING_DEFAULT_ENABLED
menuconfig CGROUPS
bool "Control Group support"
@@ -12649,9 +12649,9 @@ diff -NurpP --minimal linux-4.9.207/init/Kconfig linux-4.9.207-vs2.3.9.11/init/K
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.9.207/init/main.c linux-4.9.207-vs2.3.9.11/init/main.c
---- linux-4.9.207/init/main.c 2019-12-25 15:28:42.767228378 +0000
-+++ linux-4.9.207-vs2.3.9.11/init/main.c 2019-10-05 14:58:45.760306119 +0000
+diff -NurpP --minimal linux-4.9.217/init/main.c linux-4.9.217-vs2.3.9.12/init/main.c
+--- linux-4.9.217/init/main.c 2020-03-27 00:51:42.800148216 +0000
++++ linux-4.9.217-vs2.3.9.12/init/main.c 2019-10-05 14:58:45.760306119 +0000
@@ -82,6 +82,7 @@
#include <linux/io.h>
#include <linux/kaiser.h>
@@ -12660,9 +12660,9 @@ diff -NurpP --minimal linux-4.9.207/init/main.c linux-4.9.207-vs2.3.9.11/init/ma
#include <asm/io.h>
#include <asm/bugs.h>
-diff -NurpP --minimal linux-4.9.207/ipc/mqueue.c linux-4.9.207-vs2.3.9.11/ipc/mqueue.c
---- linux-4.9.207/ipc/mqueue.c 2019-12-25 15:28:42.797227893 +0000
-+++ linux-4.9.207-vs2.3.9.11/ipc/mqueue.c 2019-10-05 15:01:19.537840241 +0000
+diff -NurpP --minimal linux-4.9.217/ipc/mqueue.c linux-4.9.217-vs2.3.9.12/ipc/mqueue.c
+--- linux-4.9.217/ipc/mqueue.c 2020-03-27 00:51:42.820147901 +0000
++++ linux-4.9.217-vs2.3.9.12/ipc/mqueue.c 2019-10-05 15:01:19.537840241 +0000
@@ -35,6 +35,8 @@
#include <linux/ipc_namespace.h>
#include <linux/user_namespace.h>
@@ -12742,9 +12742,9 @@ diff -NurpP --minimal linux-4.9.207/ipc/mqueue.c linux-4.9.207-vs2.3.9.11/ipc/mq
free_uid(user);
}
if (ipc_ns)
-diff -NurpP --minimal linux-4.9.207/ipc/msg.c linux-4.9.207-vs2.3.9.11/ipc/msg.c
---- linux-4.9.207/ipc/msg.c 2019-12-25 15:28:42.817227568 +0000
-+++ linux-4.9.207-vs2.3.9.11/ipc/msg.c 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/ipc/msg.c linux-4.9.217-vs2.3.9.12/ipc/msg.c
+--- linux-4.9.217/ipc/msg.c 2020-03-27 00:51:42.850147429 +0000
++++ linux-4.9.217-vs2.3.9.12/ipc/msg.c 2018-10-20 04:58:14.000000000 +0000
@@ -37,6 +37,7 @@
#include <linux/rwsem.h>
#include <linux/nsproxy.h>
@@ -12761,9 +12761,9 @@ diff -NurpP --minimal linux-4.9.207/ipc/msg.c linux-4.9.207-vs2.3.9.11/ipc/msg.c
msq->q_perm.security = NULL;
retval = security_msg_queue_alloc(msq);
-diff -NurpP --minimal linux-4.9.207/ipc/namespace.c linux-4.9.207-vs2.3.9.11/ipc/namespace.c
---- linux-4.9.207/ipc/namespace.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/ipc/namespace.c 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/ipc/namespace.c linux-4.9.217-vs2.3.9.12/ipc/namespace.c
+--- linux-4.9.217/ipc/namespace.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/ipc/namespace.c 2018-10-20 04:58:14.000000000 +0000
@@ -13,6 +13,7 @@
#include <linux/mount.h>
#include <linux/user_namespace.h>
@@ -12788,9 +12788,9 @@ diff -NurpP --minimal linux-4.9.207/ipc/namespace.c linux-4.9.207-vs2.3.9.11/ipc
kfree(ns);
}
-diff -NurpP --minimal linux-4.9.207/ipc/sem.c linux-4.9.207-vs2.3.9.11/ipc/sem.c
---- linux-4.9.207/ipc/sem.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/ipc/sem.c 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/ipc/sem.c linux-4.9.217-vs2.3.9.12/ipc/sem.c
+--- linux-4.9.217/ipc/sem.c 2020-03-27 00:51:42.870147113 +0000
++++ linux-4.9.217-vs2.3.9.12/ipc/sem.c 2020-04-01 09:40:32.455401832 +0000
@@ -85,6 +85,8 @@
#include <linux/rwsem.h>
#include <linux/nsproxy.h>
@@ -12828,9 +12828,9 @@ diff -NurpP --minimal linux-4.9.207/ipc/sem.c linux-4.9.207-vs2.3.9.11/ipc/sem.c
ipc_rcu_putref(sma, sem_rcu_free);
}
-diff -NurpP --minimal linux-4.9.207/ipc/shm.c linux-4.9.207-vs2.3.9.11/ipc/shm.c
---- linux-4.9.207/ipc/shm.c 2019-12-25 15:28:42.837227244 +0000
-+++ linux-4.9.207-vs2.3.9.11/ipc/shm.c 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/ipc/shm.c linux-4.9.217-vs2.3.9.12/ipc/shm.c
+--- linux-4.9.217/ipc/shm.c 2020-03-27 00:51:42.870147113 +0000
++++ linux-4.9.217-vs2.3.9.12/ipc/shm.c 2018-10-20 04:58:14.000000000 +0000
@@ -42,6 +42,8 @@
#include <linux/nsproxy.h>
#include <linux/mount.h>
@@ -12888,9 +12888,9 @@ diff -NurpP --minimal linux-4.9.207/ipc/shm.c linux-4.9.207-vs2.3.9.11/ipc/shm.c
return error;
no_id:
-diff -NurpP --minimal linux-4.9.207/kernel/auditsc.c linux-4.9.207-vs2.3.9.11/kernel/auditsc.c
---- linux-4.9.207/kernel/auditsc.c 2019-12-25 15:28:42.937225627 +0000
-+++ linux-4.9.207-vs2.3.9.11/kernel/auditsc.c 2019-12-25 15:37:52.348423568 +0000
+diff -NurpP --minimal linux-4.9.217/kernel/auditsc.c linux-4.9.217-vs2.3.9.12/kernel/auditsc.c
+--- linux-4.9.217/kernel/auditsc.c 2020-03-27 00:51:42.950145853 +0000
++++ linux-4.9.217-vs2.3.9.12/kernel/auditsc.c 2019-12-25 15:37:52.348423568 +0000
@@ -1967,7 +1967,7 @@ static int audit_set_loginuid_perm(kuid_
if (is_audit_feature_set(AUDIT_FEATURE_LOGINUID_IMMUTABLE))
return -EPERM;
@@ -12900,9 +12900,9 @@ diff -NurpP --minimal linux-4.9.207/kernel/auditsc.c linux-4.9.207-vs2.3.9.11/ke
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.9.207/kernel/capability.c linux-4.9.207-vs2.3.9.11/kernel/capability.c
---- linux-4.9.207/kernel/capability.c 2019-12-25 15:28:43.057223690 +0000
-+++ linux-4.9.207-vs2.3.9.11/kernel/capability.c 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/kernel/capability.c linux-4.9.217-vs2.3.9.12/kernel/capability.c
+--- linux-4.9.217/kernel/capability.c 2020-03-27 00:51:43.080143807 +0000
++++ linux-4.9.217-vs2.3.9.12/kernel/capability.c 2018-10-20 04:58:14.000000000 +0000
@@ -17,6 +17,7 @@
#include <linux/syscalls.h>
#include <linux/pid_namespace.h>
@@ -12928,9 +12928,9 @@ diff -NurpP --minimal linux-4.9.207/kernel/capability.c linux-4.9.207-vs2.3.9.11
/**
* has_capability_noaudit - Does a task have a capability (unaudited) in the
* initial user ns
-diff -NurpP --minimal linux-4.9.207/kernel/compat.c linux-4.9.207-vs2.3.9.11/kernel/compat.c
---- linux-4.9.207/kernel/compat.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/kernel/compat.c 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/kernel/compat.c linux-4.9.217-vs2.3.9.12/kernel/compat.c
+--- linux-4.9.217/kernel/compat.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/kernel/compat.c 2018-10-20 04:58:14.000000000 +0000
@@ -27,6 +27,7 @@
#include <linux/times.h>
#include <linux/ptrace.h>
@@ -12948,9 +12948,9 @@ diff -NurpP --minimal linux-4.9.207/kernel/compat.c linux-4.9.207-vs2.3.9.11/ker
return 0;
}
-diff -NurpP --minimal linux-4.9.207/kernel/cred.c linux-4.9.207-vs2.3.9.11/kernel/cred.c
---- linux-4.9.207/kernel/cred.c 2019-12-25 15:28:43.087223204 +0000
-+++ linux-4.9.207-vs2.3.9.11/kernel/cred.c 2019-10-05 14:58:45.880304199 +0000
+diff -NurpP --minimal linux-4.9.217/kernel/cred.c linux-4.9.217-vs2.3.9.12/kernel/cred.c
+--- linux-4.9.217/kernel/cred.c 2020-03-27 00:51:43.110143330 +0000
++++ linux-4.9.217-vs2.3.9.12/kernel/cred.c 2020-04-01 09:40:32.475401502 +0000
@@ -64,31 +64,6 @@ struct cred init_cred = {
.group_info = &init_groups,
};
@@ -13020,9 +13020,9 @@ diff -NurpP --minimal linux-4.9.207/kernel/cred.c linux-4.9.207-vs2.3.9.11/kerne
EXPORT_SYMBOL(prepare_creds);
/*
-diff -NurpP --minimal linux-4.9.207/kernel/exit.c linux-4.9.207-vs2.3.9.11/kernel/exit.c
---- linux-4.9.207/kernel/exit.c 2019-12-25 15:28:43.277220132 +0000
-+++ linux-4.9.207-vs2.3.9.11/kernel/exit.c 2019-02-24 12:44:58.353750946 +0000
+diff -NurpP --minimal linux-4.9.217/kernel/exit.c linux-4.9.217-vs2.3.9.12/kernel/exit.c
+--- linux-4.9.217/kernel/exit.c 2020-03-27 00:51:43.250141127 +0000
++++ linux-4.9.217-vs2.3.9.12/kernel/exit.c 2019-02-24 12:44:58.353750946 +0000
@@ -48,6 +48,10 @@
#include <linux/fs_struct.h>
#include <linux/init_task.h>
@@ -13127,9 +13127,9 @@ diff -NurpP --minimal linux-4.9.207/kernel/exit.c linux-4.9.207-vs2.3.9.11/kerne
check_stack_usage();
preempt_disable();
if (tsk->nr_dirtied)
-diff -NurpP --minimal linux-4.9.207/kernel/fork.c linux-4.9.207-vs2.3.9.11/kernel/fork.c
---- linux-4.9.207/kernel/fork.c 2019-12-25 15:28:43.277220132 +0000
-+++ linux-4.9.207-vs2.3.9.11/kernel/fork.c 2019-10-22 13:47:05.619629084 +0000
+diff -NurpP --minimal linux-4.9.217/kernel/fork.c linux-4.9.217-vs2.3.9.12/kernel/fork.c
+--- linux-4.9.217/kernel/fork.c 2020-03-27 00:51:43.250141127 +0000
++++ linux-4.9.217-vs2.3.9.12/kernel/fork.c 2019-10-22 13:47:05.619629084 +0000
@@ -77,6 +77,9 @@
#include <linux/compiler.h>
#include <linux/sysctl.h>
@@ -13190,9 +13190,9 @@ diff -NurpP --minimal linux-4.9.207/kernel/fork.c linux-4.9.207-vs2.3.9.11/kerne
write_unlock_irq(&tasklist_lock);
proc_fork_connector(p);
-diff -NurpP --minimal linux-4.9.207/kernel/kthread.c linux-4.9.207-vs2.3.9.11/kernel/kthread.c
---- linux-4.9.207/kernel/kthread.c 2019-12-25 15:28:43.417217867 +0000
-+++ linux-4.9.207-vs2.3.9.11/kernel/kthread.c 2018-10-20 05:55:43.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/kernel/kthread.c linux-4.9.217-vs2.3.9.12/kernel/kthread.c
+--- linux-4.9.217/kernel/kthread.c 2020-03-27 00:51:43.440138133 +0000
++++ linux-4.9.217-vs2.3.9.12/kernel/kthread.c 2018-10-20 05:55:43.000000000 +0000
@@ -19,6 +19,7 @@
#include <linux/ptrace.h>
#include <linux/uaccess.h>
@@ -13201,9 +13201,9 @@ diff -NurpP --minimal linux-4.9.207/kernel/kthread.c linux-4.9.207-vs2.3.9.11/ke
#include <trace/events/sched.h>
static DEFINE_SPINLOCK(kthread_create_lock);
-diff -NurpP --minimal linux-4.9.207/kernel/Makefile linux-4.9.207-vs2.3.9.11/kernel/Makefile
---- linux-4.9.207/kernel/Makefile 2019-12-25 15:28:42.867226759 +0000
-+++ linux-4.9.207-vs2.3.9.11/kernel/Makefile 2019-10-05 14:58:46.030301805 +0000
+diff -NurpP --minimal linux-4.9.217/kernel/Makefile linux-4.9.217-vs2.3.9.12/kernel/Makefile
+--- linux-4.9.217/kernel/Makefile 2020-03-27 00:51:42.890146797 +0000
++++ linux-4.9.217-vs2.3.9.12/kernel/Makefile 2019-10-05 14:58:46.030301805 +0000
@@ -40,6 +40,7 @@ obj-y += printk/
obj-y += irq/
obj-y += rcu/
@@ -13212,9 +13212,9 @@ diff -NurpP --minimal linux-4.9.207/kernel/Makefile linux-4.9.207-vs2.3.9.11/ker
obj-$(CONFIG_CHECKPOINT_RESTORE) += kcmp.o
obj-$(CONFIG_FREEZER) += freezer.o
-diff -NurpP --minimal linux-4.9.207/kernel/nsproxy.c linux-4.9.207-vs2.3.9.11/kernel/nsproxy.c
---- linux-4.9.207/kernel/nsproxy.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/kernel/nsproxy.c 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/kernel/nsproxy.c linux-4.9.217-vs2.3.9.12/kernel/nsproxy.c
+--- linux-4.9.217/kernel/nsproxy.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/kernel/nsproxy.c 2018-10-20 04:58:14.000000000 +0000
@@ -20,12 +20,15 @@
#include <linux/mnt_namespace.h>
#include <linux/utsname.h>
@@ -13411,9 +13411,9 @@ diff -NurpP --minimal linux-4.9.207/kernel/nsproxy.c linux-4.9.207-vs2.3.9.11/ke
return -EPERM;
*new_nsp = create_new_namespaces(unshare_flags, current, user_ns,
-diff -NurpP --minimal linux-4.9.207/kernel/pid.c linux-4.9.207-vs2.3.9.11/kernel/pid.c
---- linux-4.9.207/kernel/pid.c 2019-12-25 15:28:43.497216574 +0000
-+++ linux-4.9.207-vs2.3.9.11/kernel/pid.c 2018-10-20 04:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/kernel/pid.c linux-4.9.217-vs2.3.9.12/kernel/pid.c
+--- linux-4.9.217/kernel/pid.c 2020-03-27 00:51:43.530136712 +0000
++++ linux-4.9.217-vs2.3.9.12/kernel/pid.c 2018-10-20 04:58:14.000000000 +0000
@@ -38,6 +38,7 @@
#include <linux/syscalls.h>
#include <linux/proc_ns.h>
@@ -13471,9 +13471,9 @@ diff -NurpP --minimal linux-4.9.207/kernel/pid.c linux-4.9.207-vs2.3.9.11/kernel
pid_t pid_vnr(struct pid *pid)
{
return pid_nr_ns(pid, task_active_pid_ns(current));
-diff -NurpP --minimal linux-4.9.207/kernel/pid_namespace.c linux-4.9.207-vs2.3.9.11/kernel/pid_namespace.c
---- linux-4.9.207/kernel/pid_namespace.c 2019-12-25 15:28:43.497216574 +0000
-+++ linux-4.9.207-vs2.3.9.11/kernel/pid_namespace.c 2019-10-05 14:58:46.030301805 +0000
+diff -NurpP --minimal linux-4.9.217/kernel/pid_namespace.c linux-4.9.217-vs2.3.9.12/kernel/pid_namespace.c
+--- linux-4.9.217/kernel/pid_namespace.c 2020-03-27 00:51:43.530136712 +0000
++++ linux-4.9.217-vs2.3.9.12/kernel/pid_namespace.c 2019-10-05 14:58:46.030301805 +0000
@@ -18,6 +18,7 @@
#include <linux/proc_ns.h>
#include <linux/reboot.h>
@@ -13498,9 +13498,9 @@ diff -NurpP --minimal linux-4.9.207/kernel/pid_namespace.c linux-4.9.207-vs2.3.9
kmem_cache_free(pid_ns_cachep, ns);
out_dec:
dec_pid_namespaces(ucounts);
-diff -NurpP --minimal linux-4.9.207/kernel/printk/printk.c linux-4.9.207-vs2.3.9.11/kernel/printk/printk.c
---- linux-4.9.207/kernel/printk/printk.c 2019-12-25 15:28:43.597214959 +0000
-+++ linux-4.9.207-vs2.3.9.11/kernel/printk/printk.c 2019-12-25 15:37:52.568420017 +0000
+diff -NurpP --minimal linux-4.9.217/kernel/printk/printk.c linux-4.9.217-vs2.3.9.12/kernel/printk/printk.c
+--- linux-4.9.217/kernel/printk/printk.c 2020-03-27 00:51:43.630135138 +0000
++++ linux-4.9.217-vs2.3.9.12/kernel/printk/printk.c 2019-12-25 15:37:52.568420017 +0000
@@ -45,6 +45,7 @@
#include <linux/utsname.h>
#include <linux/ctype.h>
@@ -13568,9 +13568,9 @@ diff -NurpP --minimal linux-4.9.207/kernel/printk/printk.c linux-4.9.207-vs2.3.9
error = syslog_print_all(buf, len, clear);
break;
/* Clear ring buffer */
-diff -NurpP --minimal linux-4.9.207/kernel/ptrace.c linux-4.9.207-vs2.3.9.11/kernel/ptrace.c
---- linux-4.9.207/kernel/ptrace.c 2019-12-25 15:28:43.597214959 +0000
-+++ linux-4.9.207-vs2.3.9.11/kernel/ptrace.c 2019-10-05 14:59:56.929168738 +0000
+diff -NurpP --minimal linux-4.9.217/kernel/ptrace.c linux-4.9.217-vs2.3.9.12/kernel/ptrace.c
+--- linux-4.9.217/kernel/ptrace.c 2020-03-27 00:51:43.630135138 +0000
++++ linux-4.9.217-vs2.3.9.12/kernel/ptrace.c 2019-10-05 14:59:56.929168738 +0000
@@ -23,6 +23,7 @@
#include <linux/syscalls.h>
#include <linux/uaccess.h>
@@ -13591,9 +13591,9 @@ diff -NurpP --minimal linux-4.9.207/kernel/ptrace.c linux-4.9.207-vs2.3.9.11/ker
if (mode & PTRACE_MODE_SCHED)
return 0;
return security_ptrace_access_check(task, mode);
-diff -NurpP --minimal linux-4.9.207/kernel/reboot.c linux-4.9.207-vs2.3.9.11/kernel/reboot.c
---- linux-4.9.207/kernel/reboot.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.207-vs2.3.9.11/kernel/reboot.c 2018-10-20 04:58:15.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/kernel/reboot.c linux-4.9.217-vs2.3.9.12/kernel/reboot.c
+--- linux-4.9.217/kernel/reboot.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.217-vs2.3.9.12/kernel/reboot.c 2018-10-20 04:58:15.000000000 +0000
@@ -16,6 +16,7 @@
#include <linux/syscalls.h>
#include <linux/syscore_ops.h>
@@ -13621,9 +13621,9 @@ diff -NurpP --minimal linux-4.9.207/kernel/reboot.c linux-4.9.207-vs2.3.9.11/ker
mutex_lock(&reboot_mutex);
switch (cmd) {
case LINUX_REBOOT_CMD_RESTART:
-diff -NurpP --minimal linux-4.9.207/kernel/sched/core.c linux-4.9.207-vs2.3.9.11/kernel/sched/core.c
---- linux-4.9.207/kernel/sched/core.c 2019-12-25 15:28:43.667213827 +0000
-+++ linux-4.9.207-vs2.3.9.11/kernel/sched/core.c 2019-10-22 13:47:05.639628767 +0000
+diff -NurpP --minimal linux-4.9.217/kernel/sched/core.c linux-4.9.217-vs2.3.9.12/kernel/sched/core.c
+--- linux-4.9.217/kernel/sched/core.c 2020-03-27 00:51:43.660134665 +0000
++++ linux-4.9.217-vs2.3.9.12/kernel/sched/core.c 2019-10-22 13:47:05.639628767 +0000
@@ -75,6 +75,8 @@
#include <linux/compiler.h>
#include <linux/frame.h>
@@ -13650,9 +13650,9 @@ diff -NurpP --minimal linux-4.9.207/kernel/sched/core.c linux-4.9.207-vs2.3.9.11
retval = security_task_setnice(current, nice);
if (retval)
-diff -NurpP --minimal linux-4.9.207/kernel/sched/cputime.c linux-4.9.207-vs2.3.9.11/kernel/sched/cputime.c
---- linux-4.9.207/kernel/sched/cputime.c 2019-12-25 15:28:43.697213342 +0000
-+++ linux-4.9.207-vs2.3.9.11/kernel/sched/cputime.c 2018-10-20 11:46:17.000000000 +0000
+diff -NurpP --minimal linux-4.9.217/kernel/sched/cputime.c linux-4.9.217-vs2.3.9.12/kernel/sched/cputime.c
+--- linux-4.9.217/kernel/sched/cputime.c 2020-03-27 00:51:43.690134189 +0000
++++ linux-4.9.217-vs2.3.9.12/kernel/sched/cputime.c 2018-10-20 11:46:17.000000000 +0000
@@ -4,6 +4,7 @@
#include <linux/kernel_stat.h>
#include <linux/static_key.h>
@@ -13693,9 +13693,9 @@ diff -NurpP --minimal linux-4.9.207/kernel/sched/cputime.c linux-4.9.207-vs2.3.9
account_group_system_time(p, cputime);
/* Add system time to cpustat. */
-diff -NurpP --minimal linux-4.9.207/kernel/sched/fair.c linux-4.9.207-vs2.3.9.11/kernel/sched/fair.c
<Skipped 1620 lines>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/6690eb62573d9fb3dd4e8cdd04078d8bd95c6747
More information about the pld-cvs-commit
mailing list