[packages/kernel/LINUX_4_9] - update vserver patch to vs2.3.9.8
arekm
arekm at pld-linux.org
Sat Oct 27 21:24:50 CEST 2018
commit 09a55596c186e0d0eb8bace170863be6fde7b0bf
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Sat Oct 27 21:24:38 2018 +0200
- update vserver patch to vs2.3.9.8
kernel-vserver-2.3.patch | 2778 ++++++++++++++++++++++++----------------------
kernel.spec | 4 +-
2 files changed, 1422 insertions(+), 1360 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index ae338629..3f162dbd 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -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.82-vs2.3.9.7
-# http://vserver.13thfloor.at/Experimental/patch-4.9.80-vs2.3.9.7.diff
+%define vserver_patch 4.9.135-vs2.3.9.8
+# http://vserver.13thfloor.at/Experimental/patch-4.9.135-vs2.3.9.8.diff
# note there are additional patches from above url:
# - *fix* are real fixes (we want these)
# - *feat* are new features/tests (we don't want these)
diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index 4831ab61..9496a0e3 100644
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -1,6 +1,6 @@
-diff -NurpP --minimal linux-4.9.82/Documentation/vserver/debug.txt linux-4.9.82-vs2.3.9.7/Documentation/vserver/debug.txt
---- linux-4.9.82/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/Documentation/vserver/debug.txt 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/Documentation/vserver/debug.txt linux-4.9.135-vs2.3.9.8/Documentation/vserver/debug.txt
+--- linux-4.9.135/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/Documentation/vserver/debug.txt 2018-10-20 04:58:12.000000000 +0000
@@ -0,0 +1,154 @@
+
+debug_cvirt:
@@ -156,9 +156,9 @@ diff -NurpP --minimal linux-4.9.82/Documentation/vserver/debug.txt linux-4.9.82-
+ 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.82/arch/alpha/Kconfig linux-4.9.82-vs2.3.9.7/arch/alpha/Kconfig
---- linux-4.9.82/arch/alpha/Kconfig 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/arch/alpha/Kconfig 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/arch/alpha/Kconfig linux-4.9.135-vs2.3.9.8/arch/alpha/Kconfig
+--- linux-4.9.135/arch/alpha/Kconfig 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/arch/alpha/Kconfig 2018-10-20 04:58:12.000000000 +0000
@@ -743,6 +743,8 @@ config DUMMY_CONSOLE
depends on VGA_HOSE
default y
@@ -168,9 +168,9 @@ diff -NurpP --minimal linux-4.9.82/arch/alpha/Kconfig linux-4.9.82-vs2.3.9.7/arc
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.9.82/arch/alpha/kernel/systbls.S linux-4.9.82-vs2.3.9.7/arch/alpha/kernel/systbls.S
---- linux-4.9.82/arch/alpha/kernel/systbls.S 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/arch/alpha/kernel/systbls.S 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/arch/alpha/kernel/systbls.S linux-4.9.135-vs2.3.9.8/arch/alpha/kernel/systbls.S
+--- linux-4.9.135/arch/alpha/kernel/systbls.S 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -180,9 +180,9 @@ diff -NurpP --minimal linux-4.9.82/arch/alpha/kernel/systbls.S linux-4.9.82-vs2.
.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.82/arch/alpha/kernel/traps.c linux-4.9.82-vs2.3.9.7/arch/alpha/kernel/traps.c
---- linux-4.9.82/arch/alpha/kernel/traps.c 2018-02-22 21:18:14.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/arch/alpha/kernel/traps.c 2018-02-22 21:31:39.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/arch/alpha/kernel/traps.c linux-4.9.135-vs2.3.9.8/arch/alpha/kernel/traps.c
+--- linux-4.9.135/arch/alpha/kernel/traps.c 2018-10-20 10:38:42.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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());
@@ -193,9 +193,9 @@ diff -NurpP --minimal linux-4.9.82/arch/alpha/kernel/traps.c linux-4.9.82-vs2.3.
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.82/arch/arm/Kconfig linux-4.9.82-vs2.3.9.7/arch/arm/Kconfig
---- linux-4.9.82/arch/arm/Kconfig 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/arch/arm/Kconfig 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/arch/arm/Kconfig linux-4.9.135-vs2.3.9.8/arch/arm/Kconfig
+--- linux-4.9.135/arch/arm/Kconfig 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/arch/arm/Kconfig 2018-10-20 04:58:12.000000000 +0000
@@ -2199,6 +2199,8 @@ source "fs/Kconfig"
source "arch/arm/Kconfig.debug"
@@ -205,9 +205,9 @@ diff -NurpP --minimal linux-4.9.82/arch/arm/Kconfig linux-4.9.82-vs2.3.9.7/arch/
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.9.82/arch/arm/kernel/calls.S linux-4.9.82-vs2.3.9.7/arch/arm/kernel/calls.S
---- linux-4.9.82/arch/arm/kernel/calls.S 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/arch/arm/kernel/calls.S 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/arch/arm/kernel/calls.S linux-4.9.135-vs2.3.9.8/arch/arm/kernel/calls.S
+--- linux-4.9.135/arch/arm/kernel/calls.S 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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)
@@ -217,10 +217,10 @@ diff -NurpP --minimal linux-4.9.82/arch/arm/kernel/calls.S linux-4.9.82-vs2.3.9.
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-4.9.82/arch/arm/kernel/traps.c linux-4.9.82-vs2.3.9.7/arch/arm/kernel/traps.c
---- linux-4.9.82/arch/arm/kernel/traps.c 2018-02-22 21:18:14.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/arch/arm/kernel/traps.c 2018-01-10 02:50:49.000000000 +0000
-@@ -278,8 +278,8 @@ static int __die(const char *str, int er
+diff -NurpP --minimal linux-4.9.135/arch/arm/kernel/traps.c linux-4.9.135-vs2.3.9.8/arch/arm/kernel/traps.c
+--- linux-4.9.135/arch/arm/kernel/traps.c 2018-10-20 10:38:42.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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();
__show_regs(regs);
@@ -231,9 +231,9 @@ diff -NurpP --minimal linux-4.9.82/arch/arm/kernel/traps.c linux-4.9.82-vs2.3.9.
if (!user_mode(regs) || in_interrupt()) {
dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-4.9.82/arch/cris/Kconfig linux-4.9.82-vs2.3.9.7/arch/cris/Kconfig
---- linux-4.9.82/arch/cris/Kconfig 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/arch/cris/Kconfig 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/arch/cris/Kconfig linux-4.9.135-vs2.3.9.8/arch/cris/Kconfig
+--- linux-4.9.135/arch/cris/Kconfig 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/arch/cris/Kconfig 2018-10-20 04:58:12.000000000 +0000
@@ -583,6 +583,8 @@ source "fs/Kconfig"
source "arch/cris/Kconfig.debug"
@@ -243,9 +243,9 @@ diff -NurpP --minimal linux-4.9.82/arch/cris/Kconfig linux-4.9.82-vs2.3.9.7/arch
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.9.82/arch/ia64/Kconfig linux-4.9.82-vs2.3.9.7/arch/ia64/Kconfig
---- linux-4.9.82/arch/ia64/Kconfig 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/arch/ia64/Kconfig 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/arch/ia64/Kconfig linux-4.9.135-vs2.3.9.8/arch/ia64/Kconfig
+--- linux-4.9.135/arch/ia64/Kconfig 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/arch/ia64/Kconfig 2018-10-20 04:58:12.000000000 +0000
@@ -602,6 +602,8 @@ source "fs/Kconfig"
source "arch/ia64/Kconfig.debug"
@@ -255,9 +255,9 @@ diff -NurpP --minimal linux-4.9.82/arch/ia64/Kconfig linux-4.9.82-vs2.3.9.7/arch
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.9.82/arch/ia64/kernel/entry.S linux-4.9.82-vs2.3.9.7/arch/ia64/kernel/entry.S
---- linux-4.9.82/arch/ia64/kernel/entry.S 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/arch/ia64/kernel/entry.S 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/arch/ia64/kernel/entry.S linux-4.9.135-vs2.3.9.8/arch/ia64/kernel/entry.S
+--- linux-4.9.135/arch/ia64/kernel/entry.S 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -267,9 +267,9 @@ diff -NurpP --minimal linux-4.9.82/arch/ia64/kernel/entry.S linux-4.9.82-vs2.3.9
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -NurpP --minimal linux-4.9.82/arch/ia64/kernel/ptrace.c linux-4.9.82-vs2.3.9.7/arch/ia64/kernel/ptrace.c
---- linux-4.9.82/arch/ia64/kernel/ptrace.c 2018-02-22 21:18:15.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/arch/ia64/kernel/ptrace.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/arch/ia64/kernel/ptrace.c linux-4.9.135-vs2.3.9.8/arch/ia64/kernel/ptrace.c
+--- linux-4.9.135/arch/ia64/kernel/ptrace.c 2018-10-20 10:38:44.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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>
@@ -278,9 +278,9 @@ diff -NurpP --minimal linux-4.9.82/arch/ia64/kernel/ptrace.c linux-4.9.82-vs2.3.
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-4.9.82/arch/ia64/kernel/traps.c linux-4.9.82-vs2.3.9.7/arch/ia64/kernel/traps.c
---- linux-4.9.82/arch/ia64/kernel/traps.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/arch/ia64/kernel/traps.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/arch/ia64/kernel/traps.c linux-4.9.135-vs2.3.9.8/arch/ia64/kernel/traps.c
+--- linux-4.9.135/arch/ia64/kernel/traps.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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();
@@ -305,9 +305,9 @@ diff -NurpP --minimal linux-4.9.82/arch/ia64/kernel/traps.c linux-4.9.82-vs2.3.9
}
}
}
-diff -NurpP --minimal linux-4.9.82/arch/m32r/kernel/traps.c linux-4.9.82-vs2.3.9.7/arch/m32r/kernel/traps.c
---- linux-4.9.82/arch/m32r/kernel/traps.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/arch/m32r/kernel/traps.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/arch/m32r/kernel/traps.c linux-4.9.135-vs2.3.9.8/arch/m32r/kernel/traps.c
+--- linux-4.9.135/arch/m32r/kernel/traps.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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);
@@ -320,9 +320,9 @@ diff -NurpP --minimal linux-4.9.82/arch/m32r/kernel/traps.c linux-4.9.82-vs2.3.9
/*
* When in-kernel, we also print out the stack and code at the
-diff -NurpP --minimal linux-4.9.82/arch/m68k/Kconfig linux-4.9.82-vs2.3.9.7/arch/m68k/Kconfig
---- linux-4.9.82/arch/m68k/Kconfig 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/arch/m68k/Kconfig 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/arch/m68k/Kconfig linux-4.9.135-vs2.3.9.8/arch/m68k/Kconfig
+--- linux-4.9.135/arch/m68k/Kconfig 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/arch/m68k/Kconfig 2018-10-20 04:58:12.000000000 +0000
@@ -163,6 +163,8 @@ source "fs/Kconfig"
source "arch/m68k/Kconfig.debug"
@@ -332,10 +332,10 @@ diff -NurpP --minimal linux-4.9.82/arch/m68k/Kconfig linux-4.9.82-vs2.3.9.7/arch
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.9.82/arch/mips/Kconfig linux-4.9.82-vs2.3.9.7/arch/mips/Kconfig
---- linux-4.9.82/arch/mips/Kconfig 2018-02-22 21:18:15.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/arch/mips/Kconfig 2018-01-10 02:50:49.000000000 +0000
-@@ -3189,6 +3189,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-4.9.135/arch/mips/Kconfig linux-4.9.135-vs2.3.9.8/arch/mips/Kconfig
+--- linux-4.9.135/arch/mips/Kconfig 2018-10-20 10:38:44.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/arch/mips/Kconfig 2018-10-20 04:58:12.000000000 +0000
+@@ -3190,6 +3190,8 @@ source "fs/Kconfig"
source "arch/mips/Kconfig.debug"
@@ -344,9 +344,9 @@ diff -NurpP --minimal linux-4.9.82/arch/mips/Kconfig linux-4.9.82-vs2.3.9.7/arch
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.9.82/arch/mips/kernel/ptrace.c linux-4.9.82-vs2.3.9.7/arch/mips/kernel/ptrace.c
---- linux-4.9.82/arch/mips/kernel/ptrace.c 2018-02-22 21:18:16.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/arch/mips/kernel/ptrace.c 2018-01-25 00:21:31.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/arch/mips/kernel/ptrace.c linux-4.9.135-vs2.3.9.8/arch/mips/kernel/ptrace.c
+--- linux-4.9.135/arch/mips/kernel/ptrace.c 2018-10-20 10:38:44.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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>
@@ -355,7 +355,7 @@ diff -NurpP --minimal linux-4.9.82/arch/mips/kernel/ptrace.c linux-4.9.82-vs2.3.
#include <asm/byteorder.h>
#include <asm/cpu.h>
-@@ -784,6 +785,9 @@ long arch_ptrace(struct task_struct *chi
+@@ -798,6 +799,9 @@ long arch_ptrace(struct task_struct *chi
void __user *datavp = (void __user *) data;
unsigned long __user *datalp = (void __user *) data;
@@ -365,9 +365,9 @@ diff -NurpP --minimal linux-4.9.82/arch/mips/kernel/ptrace.c linux-4.9.82-vs2.3.
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.82/arch/mips/kernel/scall32-o32.S linux-4.9.82-vs2.3.9.7/arch/mips/kernel/scall32-o32.S
---- linux-4.9.82/arch/mips/kernel/scall32-o32.S 2018-02-22 21:18:16.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/arch/mips/kernel/scall32-o32.S 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/arch/mips/kernel/scall32-o32.S linux-4.9.135-vs2.3.9.8/arch/mips/kernel/scall32-o32.S
+--- linux-4.9.135/arch/mips/kernel/scall32-o32.S 2018-10-20 10:38:44.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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 */
@@ -377,9 +377,9 @@ diff -NurpP --minimal linux-4.9.82/arch/mips/kernel/scall32-o32.S linux-4.9.82-v
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-diff -NurpP --minimal linux-4.9.82/arch/mips/kernel/scall64-64.S linux-4.9.82-vs2.3.9.7/arch/mips/kernel/scall64-64.S
---- linux-4.9.82/arch/mips/kernel/scall64-64.S 2018-02-22 21:18:16.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/arch/mips/kernel/scall64-64.S 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/arch/mips/kernel/scall64-64.S linux-4.9.135-vs2.3.9.8/arch/mips/kernel/scall64-64.S
+--- linux-4.9.135/arch/mips/kernel/scall64-64.S 2018-10-20 10:38:44.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -389,9 +389,9 @@ diff -NurpP --minimal linux-4.9.82/arch/mips/kernel/scall64-64.S linux-4.9.82-vs
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-4.9.82/arch/mips/kernel/scall64-n32.S linux-4.9.82-vs2.3.9.7/arch/mips/kernel/scall64-n32.S
---- linux-4.9.82/arch/mips/kernel/scall64-n32.S 2018-02-22 21:18:16.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/arch/mips/kernel/scall64-n32.S 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/arch/mips/kernel/scall64-n32.S linux-4.9.135-vs2.3.9.8/arch/mips/kernel/scall64-n32.S
+--- linux-4.9.135/arch/mips/kernel/scall64-n32.S 2018-10-20 10:38:44.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -401,9 +401,9 @@ diff -NurpP --minimal linux-4.9.82/arch/mips/kernel/scall64-n32.S linux-4.9.82-v
PTR compat_sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-4.9.82/arch/mips/kernel/scall64-o32.S linux-4.9.82-vs2.3.9.7/arch/mips/kernel/scall64-o32.S
---- linux-4.9.82/arch/mips/kernel/scall64-o32.S 2018-02-22 21:18:16.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/arch/mips/kernel/scall64-o32.S 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/arch/mips/kernel/scall64-o32.S linux-4.9.135-vs2.3.9.8/arch/mips/kernel/scall64-o32.S
+--- linux-4.9.135/arch/mips/kernel/scall64-o32.S 2018-10-20 10:38:44.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/arch/mips/kernel/scall64-o32.S 2018-10-20 04:58:12.000000000 +0000
@@ -499,7 +499,7 @@ EXPORT(sys32_call_table)
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify /* 4275 */
@@ -413,10 +413,10 @@ diff -NurpP --minimal linux-4.9.82/arch/mips/kernel/scall64-o32.S linux-4.9.82-v
PTR compat_sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-diff -NurpP --minimal linux-4.9.82/arch/mips/kernel/traps.c linux-4.9.82-vs2.3.9.7/arch/mips/kernel/traps.c
---- linux-4.9.82/arch/mips/kernel/traps.c 2018-02-22 21:18:16.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/arch/mips/kernel/traps.c 2018-01-10 02:50:49.000000000 +0000
-@@ -360,9 +360,10 @@ void show_registers(struct pt_regs *regs
+diff -NurpP --minimal linux-4.9.135/arch/mips/kernel/traps.c linux-4.9.135-vs2.3.9.8/arch/mips/kernel/traps.c
+--- linux-4.9.135/arch/mips/kernel/traps.c 2018-10-20 10:38:44.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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);
print_modules();
@@ -430,9 +430,9 @@ diff -NurpP --minimal linux-4.9.82/arch/mips/kernel/traps.c linux-4.9.82-vs2.3.9
if (cpu_has_userlocal) {
unsigned long tls;
-diff -NurpP --minimal linux-4.9.82/arch/parisc/Kconfig linux-4.9.82-vs2.3.9.7/arch/parisc/Kconfig
---- linux-4.9.82/arch/parisc/Kconfig 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/arch/parisc/Kconfig 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/arch/parisc/Kconfig linux-4.9.135-vs2.3.9.8/arch/parisc/Kconfig
+--- linux-4.9.135/arch/parisc/Kconfig 2018-10-20 10:38:44.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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.
@@ -442,9 +442,9 @@ diff -NurpP --minimal linux-4.9.82/arch/parisc/Kconfig linux-4.9.82-vs2.3.9.7/ar
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.9.82/arch/parisc/kernel/syscall_table.S linux-4.9.82-vs2.3.9.7/arch/parisc/kernel/syscall_table.S
---- linux-4.9.82/arch/parisc/kernel/syscall_table.S 2018-02-22 21:18:16.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/arch/parisc/kernel/syscall_table.S 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/arch/parisc/kernel/syscall_table.S linux-4.9.135-vs2.3.9.8/arch/parisc/kernel/syscall_table.S
+--- linux-4.9.135/arch/parisc/kernel/syscall_table.S 2018-10-20 10:38:45.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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)
@@ -454,9 +454,9 @@ diff -NurpP --minimal linux-4.9.82/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.82/arch/parisc/kernel/traps.c linux-4.9.82-vs2.3.9.7/arch/parisc/kernel/traps.c
---- linux-4.9.82/arch/parisc/kernel/traps.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/arch/parisc/kernel/traps.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/arch/parisc/kernel/traps.c linux-4.9.135-vs2.3.9.8/arch/parisc/kernel/traps.c
+--- linux-4.9.135/arch/parisc/kernel/traps.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/arch/parisc/kernel/traps.c 2018-10-20 04:58:13.000000000 +0000
@@ -235,8 +235,9 @@ void die_if_kernel(char *str, struct pt_
return; /* STFU */
@@ -480,9 +480,9 @@ diff -NurpP --minimal linux-4.9.82/arch/parisc/kernel/traps.c linux-4.9.82-vs2.3
/* Wot's wrong wif bein' racy? */
if (current->thread.flags & PARISC_KERNEL_DEATH) {
-diff -NurpP --minimal linux-4.9.82/arch/powerpc/Kconfig linux-4.9.82-vs2.3.9.7/arch/powerpc/Kconfig
---- linux-4.9.82/arch/powerpc/Kconfig 2018-02-22 21:18:16.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/arch/powerpc/Kconfig 2018-02-22 21:31:39.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/arch/powerpc/Kconfig linux-4.9.135-vs2.3.9.8/arch/powerpc/Kconfig
+--- linux-4.9.135/arch/powerpc/Kconfig 2018-10-20 10:38:45.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/arch/powerpc/Kconfig 2018-10-20 04:58:13.000000000 +0000
@@ -1086,6 +1086,8 @@ source "lib/Kconfig"
source "arch/powerpc/Kconfig.debug"
@@ -492,9 +492,9 @@ diff -NurpP --minimal linux-4.9.82/arch/powerpc/Kconfig linux-4.9.82-vs2.3.9.7/a
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.9.82/arch/powerpc/include/uapi/asm/unistd.h linux-4.9.82-vs2.3.9.7/arch/powerpc/include/uapi/asm/unistd.h
---- linux-4.9.82/arch/powerpc/include/uapi/asm/unistd.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/arch/powerpc/include/uapi/asm/unistd.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/arch/powerpc/include/uapi/asm/unistd.h linux-4.9.135-vs2.3.9.8/arch/powerpc/include/uapi/asm/unistd.h
+--- linux-4.9.135/arch/powerpc/include/uapi/asm/unistd.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/arch/powerpc/include/uapi/asm/unistd.h 2018-10-20 04:58:13.000000000 +0000
@@ -275,7 +275,7 @@
#endif
#define __NR_rtas 255
@@ -504,10 +504,10 @@ diff -NurpP --minimal linux-4.9.82/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.82/arch/s390/Kconfig linux-4.9.82-vs2.3.9.7/arch/s390/Kconfig
---- linux-4.9.82/arch/s390/Kconfig 2018-02-22 21:18:17.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/arch/s390/Kconfig 2018-01-10 02:50:49.000000000 +0000
-@@ -729,6 +729,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-4.9.135/arch/s390/Kconfig linux-4.9.135-vs2.3.9.8/arch/s390/Kconfig
+--- linux-4.9.135/arch/s390/Kconfig 2018-10-20 10:38:45.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/arch/s390/Kconfig 2018-10-20 04:58:13.000000000 +0000
+@@ -775,6 +775,8 @@ source "fs/Kconfig"
source "arch/s390/Kconfig.debug"
@@ -516,9 +516,9 @@ diff -NurpP --minimal linux-4.9.82/arch/s390/Kconfig linux-4.9.82-vs2.3.9.7/arch
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.9.82/arch/s390/include/asm/tlb.h linux-4.9.82-vs2.3.9.7/arch/s390/include/asm/tlb.h
---- linux-4.9.82/arch/s390/include/asm/tlb.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/arch/s390/include/asm/tlb.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/arch/s390/include/asm/tlb.h linux-4.9.135-vs2.3.9.8/arch/s390/include/asm/tlb.h
+--- linux-4.9.135/arch/s390/include/asm/tlb.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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>
@@ -527,9 +527,9 @@ diff -NurpP --minimal linux-4.9.82/arch/s390/include/asm/tlb.h linux-4.9.82-vs2.
#include <asm/processor.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-4.9.82/arch/s390/include/uapi/asm/unistd.h linux-4.9.82-vs2.3.9.7/arch/s390/include/uapi/asm/unistd.h
---- linux-4.9.82/arch/s390/include/uapi/asm/unistd.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/arch/s390/include/uapi/asm/unistd.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/arch/s390/include/uapi/asm/unistd.h linux-4.9.135-vs2.3.9.8/arch/s390/include/uapi/asm/unistd.h
+--- linux-4.9.135/arch/s390/include/uapi/asm/unistd.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -539,9 +539,9 @@ diff -NurpP --minimal linux-4.9.82/arch/s390/include/uapi/asm/unistd.h linux-4.9
#define __NR_statfs64 265
#define __NR_fstatfs64 266
#define __NR_remap_file_pages 267
-diff -NurpP --minimal linux-4.9.82/arch/s390/kernel/ptrace.c linux-4.9.82-vs2.3.9.7/arch/s390/kernel/ptrace.c
---- linux-4.9.82/arch/s390/kernel/ptrace.c 2018-02-22 21:18:17.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/arch/s390/kernel/ptrace.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/arch/s390/kernel/ptrace.c linux-4.9.135-vs2.3.9.8/arch/s390/kernel/ptrace.c
+--- linux-4.9.135/arch/s390/kernel/ptrace.c 2018-10-20 10:38:46.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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>
@@ -550,9 +550,9 @@ diff -NurpP --minimal linux-4.9.82/arch/s390/kernel/ptrace.c linux-4.9.82-vs2.3.
#include <trace/syscall.h>
#include <asm/segment.h>
#include <asm/page.h>
-diff -NurpP --minimal linux-4.9.82/arch/s390/kernel/syscalls.S linux-4.9.82-vs2.3.9.7/arch/s390/kernel/syscalls.S
---- linux-4.9.82/arch/s390/kernel/syscalls.S 2018-02-22 21:18:17.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/arch/s390/kernel/syscalls.S 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/arch/s390/kernel/syscalls.S linux-4.9.135-vs2.3.9.8/arch/s390/kernel/syscalls.S
+--- linux-4.9.135/arch/s390/kernel/syscalls.S 2018-10-20 10:38:46.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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)
@@ -562,9 +562,9 @@ diff -NurpP --minimal linux-4.9.82/arch/s390/kernel/syscalls.S linux-4.9.82-vs2.
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.82/arch/sh/Kconfig linux-4.9.82-vs2.3.9.7/arch/sh/Kconfig
---- linux-4.9.82/arch/sh/Kconfig 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/arch/sh/Kconfig 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/arch/sh/Kconfig linux-4.9.135-vs2.3.9.8/arch/sh/Kconfig
+--- linux-4.9.135/arch/sh/Kconfig 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/arch/sh/Kconfig 2018-10-20 04:58:13.000000000 +0000
@@ -904,6 +904,8 @@ source "fs/Kconfig"
source "arch/sh/Kconfig.debug"
@@ -574,9 +574,9 @@ diff -NurpP --minimal linux-4.9.82/arch/sh/Kconfig linux-4.9.82-vs2.3.9.7/arch/s
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.9.82/arch/sh/kernel/irq.c linux-4.9.82-vs2.3.9.7/arch/sh/kernel/irq.c
---- linux-4.9.82/arch/sh/kernel/irq.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/arch/sh/kernel/irq.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/arch/sh/kernel/irq.c linux-4.9.135-vs2.3.9.8/arch/sh/kernel/irq.c
+--- linux-4.9.135/arch/sh/kernel/irq.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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>
@@ -585,9 +585,9 @@ diff -NurpP --minimal linux-4.9.82/arch/sh/kernel/irq.c linux-4.9.82-vs2.3.9.7/a
#include <asm/processor.h>
#include <asm/machvec.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-4.9.82/arch/sparc/Kconfig linux-4.9.82-vs2.3.9.7/arch/sparc/Kconfig
---- linux-4.9.82/arch/sparc/Kconfig 2018-02-22 21:18:17.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/arch/sparc/Kconfig 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/arch/sparc/Kconfig linux-4.9.135-vs2.3.9.8/arch/sparc/Kconfig
+--- linux-4.9.135/arch/sparc/Kconfig 2018-10-20 10:38:46.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/arch/sparc/Kconfig 2018-10-20 04:58:13.000000000 +0000
@@ -580,6 +580,8 @@ source "fs/Kconfig"
source "arch/sparc/Kconfig.debug"
@@ -597,9 +597,9 @@ diff -NurpP --minimal linux-4.9.82/arch/sparc/Kconfig linux-4.9.82-vs2.3.9.7/arc
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.9.82/arch/sparc/include/uapi/asm/unistd.h linux-4.9.82-vs2.3.9.7/arch/sparc/include/uapi/asm/unistd.h
---- linux-4.9.82/arch/sparc/include/uapi/asm/unistd.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/arch/sparc/include/uapi/asm/unistd.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/arch/sparc/include/uapi/asm/unistd.h linux-4.9.135-vs2.3.9.8/arch/sparc/include/uapi/asm/unistd.h
+--- linux-4.9.135/arch/sparc/include/uapi/asm/unistd.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -609,9 +609,9 @@ diff -NurpP --minimal linux-4.9.82/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.82/arch/sparc/kernel/systbls_32.S linux-4.9.82-vs2.3.9.7/arch/sparc/kernel/systbls_32.S
---- linux-4.9.82/arch/sparc/kernel/systbls_32.S 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/arch/sparc/kernel/systbls_32.S 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/arch/sparc/kernel/systbls_32.S linux-4.9.135-vs2.3.9.8/arch/sparc/kernel/systbls_32.S
+--- linux-4.9.135/arch/sparc/kernel/systbls_32.S 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -621,9 +621,9 @@ diff -NurpP --minimal linux-4.9.82/arch/sparc/kernel/systbls_32.S linux-4.9.82-v
/*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.82/arch/sparc/kernel/systbls_64.S linux-4.9.82-vs2.3.9.7/arch/sparc/kernel/systbls_64.S
---- linux-4.9.82/arch/sparc/kernel/systbls_64.S 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/arch/sparc/kernel/systbls_64.S 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/arch/sparc/kernel/systbls_64.S linux-4.9.135-vs2.3.9.8/arch/sparc/kernel/systbls_64.S
+--- linux-4.9.135/arch/sparc/kernel/systbls_64.S 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -642,9 +642,9 @@ diff -NurpP --minimal linux-4.9.82/arch/sparc/kernel/systbls_64.S linux-4.9.82-v
/*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.82/arch/um/Kconfig.rest linux-4.9.82-vs2.3.9.7/arch/um/Kconfig.rest
---- linux-4.9.82/arch/um/Kconfig.rest 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/arch/um/Kconfig.rest 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/arch/um/Kconfig.rest linux-4.9.135-vs2.3.9.8/arch/um/Kconfig.rest
+--- linux-4.9.135/arch/um/Kconfig.rest 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/arch/um/Kconfig.rest 2018-10-20 04:58:13.000000000 +0000
@@ -12,6 +12,8 @@ source "arch/um/Kconfig.net"
source "fs/Kconfig"
@@ -654,10 +654,10 @@ diff -NurpP --minimal linux-4.9.82/arch/um/Kconfig.rest linux-4.9.82-vs2.3.9.7/a
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.9.82/arch/x86/Kconfig linux-4.9.82-vs2.3.9.7/arch/x86/Kconfig
---- linux-4.9.82/arch/x86/Kconfig 2018-02-22 21:18:17.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/arch/x86/Kconfig 2018-01-25 00:21:31.000000000 +0000
-@@ -2777,6 +2777,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-4.9.135/arch/x86/Kconfig linux-4.9.135-vs2.3.9.8/arch/x86/Kconfig
+--- linux-4.9.135/arch/x86/Kconfig 2018-10-20 10:38:46.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/arch/x86/Kconfig 2018-10-20 05:55:34.000000000 +0000
+@@ -2778,6 +2778,8 @@ source "fs/Kconfig"
source "arch/x86/Kconfig.debug"
@@ -666,9 +666,9 @@ diff -NurpP --minimal linux-4.9.82/arch/x86/Kconfig linux-4.9.82-vs2.3.9.7/arch/
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.9.82/arch/x86/entry/syscalls/syscall_32.tbl linux-4.9.82-vs2.3.9.7/arch/x86/entry/syscalls/syscall_32.tbl
---- linux-4.9.82/arch/x86/entry/syscalls/syscall_32.tbl 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/arch/x86/entry/syscalls/syscall_32.tbl 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/arch/x86/entry/syscalls/syscall_32.tbl linux-4.9.135-vs2.3.9.8/arch/x86/entry/syscalls/syscall_32.tbl
+--- linux-4.9.135/arch/x86/entry/syscalls/syscall_32.tbl 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -678,9 +678,9 @@ diff -NurpP --minimal linux-4.9.82/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.82/arch/x86/entry/syscalls/syscall_64.tbl linux-4.9.82-vs2.3.9.7/arch/x86/entry/syscalls/syscall_64.tbl
---- linux-4.9.82/arch/x86/entry/syscalls/syscall_64.tbl 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/arch/x86/entry/syscalls/syscall_64.tbl 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/arch/x86/entry/syscalls/syscall_64.tbl linux-4.9.135-vs2.3.9.8/arch/x86/entry/syscalls/syscall_64.tbl
+--- linux-4.9.135/arch/x86/entry/syscalls/syscall_64.tbl 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -690,9 +690,9 @@ diff -NurpP --minimal linux-4.9.82/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.82/block/ioprio.c linux-4.9.82-vs2.3.9.7/block/ioprio.c
---- linux-4.9.82/block/ioprio.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/block/ioprio.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/block/ioprio.c linux-4.9.135-vs2.3.9.8/block/ioprio.c
+--- linux-4.9.135/block/ioprio.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/block/ioprio.c 2018-10-20 04:58:13.000000000 +0000
@@ -28,6 +28,7 @@
#include <linux/syscalls.h>
#include <linux/security.h>
@@ -719,9 +719,9 @@ diff -NurpP --minimal linux-4.9.82/block/ioprio.c linux-4.9.82-vs2.3.9.7/block/i
tmpio = get_task_ioprio(p);
if (tmpio < 0)
continue;
-diff -NurpP --minimal linux-4.9.82/drivers/block/Kconfig linux-4.9.82-vs2.3.9.7/drivers/block/Kconfig
---- linux-4.9.82/drivers/block/Kconfig 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/drivers/block/Kconfig 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/drivers/block/Kconfig linux-4.9.135-vs2.3.9.8/drivers/block/Kconfig
+--- linux-4.9.135/drivers/block/Kconfig 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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.82/drivers/block/Kconfig linux-4.9.82-vs2.3.9.7/
config BLK_DEV_NBD
tristate "Network block device support"
depends on NET
-diff -NurpP --minimal linux-4.9.82/drivers/block/Makefile linux-4.9.82-vs2.3.9.7/drivers/block/Makefile
---- linux-4.9.82/drivers/block/Makefile 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/drivers/block/Makefile 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/drivers/block/Makefile linux-4.9.135-vs2.3.9.8/drivers/block/Makefile
+--- linux-4.9.135/drivers/block/Makefile 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -747,9 +747,9 @@ diff -NurpP --minimal linux-4.9.82/drivers/block/Makefile linux-4.9.82-vs2.3.9.7
obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o
obj-$(CONFIG_XEN_BLKDEV_BACKEND) += xen-blkback/
-diff -NurpP --minimal linux-4.9.82/drivers/block/loop.c linux-4.9.82-vs2.3.9.7/drivers/block/loop.c
---- linux-4.9.82/drivers/block/loop.c 2018-02-22 21:18:20.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/drivers/block/loop.c 2018-02-10 15:15:43.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/drivers/block/loop.c linux-4.9.135-vs2.3.9.8/drivers/block/loop.c
+--- linux-4.9.135/drivers/block/loop.c 2018-10-20 10:38:49.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/drivers/block/loop.c 2018-10-20 04:58:13.000000000 +0000
@@ -76,6 +76,7 @@
#include <linux/miscdevice.h>
#include <linux/falloc.h>
@@ -758,7 +758,7 @@ diff -NurpP --minimal linux-4.9.82/drivers/block/loop.c linux-4.9.82-vs2.3.9.7/d
#include "loop.h"
#include <asm/uaccess.h>
-@@ -924,6 +925,7 @@ static int loop_set_fd(struct loop_devic
+@@ -936,6 +937,7 @@ static int loop_set_fd(struct loop_devic
lo->lo_blocksize = lo_blocksize;
lo->lo_device = bdev;
lo->lo_flags = lo_flags;
@@ -766,7 +766,7 @@ diff -NurpP --minimal linux-4.9.82/drivers/block/loop.c linux-4.9.82-vs2.3.9.7/d
lo->lo_backing_file = file;
lo->transfer = NULL;
lo->ioctl = NULL;
-@@ -1044,6 +1046,7 @@ static int loop_clr_fd(struct loop_devic
+@@ -1056,6 +1058,7 @@ static int loop_clr_fd(struct loop_devic
lo->lo_offset = 0;
lo->lo_sizelimit = 0;
lo->lo_encrypt_key_size = 0;
@@ -774,7 +774,7 @@ diff -NurpP --minimal linux-4.9.82/drivers/block/loop.c linux-4.9.82-vs2.3.9.7/d
memset(lo->lo_encrypt_key, 0, LO_KEY_SIZE);
memset(lo->lo_crypt_name, 0, LO_NAME_SIZE);
memset(lo->lo_file_name, 0, LO_NAME_SIZE);
-@@ -1090,7 +1093,7 @@ loop_set_status(struct loop_device *lo,
+@@ -1102,7 +1105,7 @@ loop_set_status(struct loop_device *lo,
if (lo->lo_encrypt_key_size &&
!uid_eq(lo->lo_key_owner, uid) &&
@@ -783,7 +783,7 @@ diff -NurpP --minimal linux-4.9.82/drivers/block/loop.c linux-4.9.82-vs2.3.9.7/d
return -EPERM;
if (lo->lo_state != Lo_bound)
return -ENXIO;
-@@ -1191,7 +1194,8 @@ loop_get_status(struct loop_device *lo,
+@@ -1207,7 +1210,8 @@ loop_get_status(struct loop_device *lo,
memcpy(info->lo_crypt_name, lo->lo_crypt_name, LO_NAME_SIZE);
info->lo_encrypt_type =
lo->lo_encryption ? lo->lo_encryption->number : 0;
@@ -793,7 +793,7 @@ diff -NurpP --minimal linux-4.9.82/drivers/block/loop.c linux-4.9.82-vs2.3.9.7/d
info->lo_encrypt_key_size = lo->lo_encrypt_key_size;
memcpy(info->lo_encrypt_key, lo->lo_encrypt_key,
lo->lo_encrypt_key_size);
-@@ -1552,6 +1556,11 @@ static int lo_open(struct block_device *
+@@ -1568,6 +1572,11 @@ static int lo_open(struct block_device *
goto out;
}
@@ -805,9 +805,9 @@ diff -NurpP --minimal linux-4.9.82/drivers/block/loop.c linux-4.9.82-vs2.3.9.7/d
atomic_inc(&lo->lo_refcnt);
out:
mutex_unlock(&loop_index_mutex);
-diff -NurpP --minimal linux-4.9.82/drivers/block/loop.h linux-4.9.82-vs2.3.9.7/drivers/block/loop.h
---- linux-4.9.82/drivers/block/loop.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/drivers/block/loop.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/drivers/block/loop.h linux-4.9.135-vs2.3.9.8/drivers/block/loop.h
+--- linux-4.9.135/drivers/block/loop.h 2018-10-20 10:38:49.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/drivers/block/loop.h 2018-10-20 04:58:13.000000000 +0000
@@ -43,6 +43,7 @@ struct loop_device {
struct loop_func_table *lo_encryption;
__u32 lo_init[2];
@@ -816,9 +816,9 @@ diff -NurpP --minimal linux-4.9.82/drivers/block/loop.h linux-4.9.82-vs2.3.9.7/d
int (*ioctl)(struct loop_device *, int cmd,
unsigned long arg);
-diff -NurpP --minimal linux-4.9.82/drivers/block/vroot.c linux-4.9.82-vs2.3.9.7/drivers/block/vroot.c
---- linux-4.9.82/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/drivers/block/vroot.c 2018-01-13 22:00:41.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/drivers/block/vroot.c linux-4.9.135-vs2.3.9.8/drivers/block/vroot.c
+--- linux-4.9.135/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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.82/drivers/block/vroot.c linux-4.9.82-vs2.3.9.7/
+
+#endif
+
-diff -NurpP --minimal linux-4.9.82/drivers/md/dm-core.h linux-4.9.82-vs2.3.9.7/drivers/md/dm-core.h
---- linux-4.9.82/drivers/md/dm-core.h 2018-02-22 21:18:28.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/drivers/md/dm-core.h 2018-01-10 08:35:10.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/drivers/md/dm-core.h linux-4.9.135-vs2.3.9.8/drivers/md/dm-core.h
+--- linux-4.9.135/drivers/md/dm-core.h 2018-10-20 10:38:58.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/drivers/md/dm-core.h 2018-10-20 04:58:13.000000000 +0000
@@ -52,6 +52,7 @@ struct mapped_device {
atomic_t holders;
@@ -1122,9 +1122,9 @@ diff -NurpP --minimal linux-4.9.82/drivers/md/dm-core.h linux-4.9.82-vs2.3.9.7/d
struct dm_target *immutable_target;
struct target_type *immutable_target_type;
-diff -NurpP --minimal linux-4.9.82/drivers/md/dm-ioctl.c linux-4.9.82-vs2.3.9.7/drivers/md/dm-ioctl.c
---- linux-4.9.82/drivers/md/dm-ioctl.c 2018-02-22 21:18:28.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/drivers/md/dm-ioctl.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/drivers/md/dm-ioctl.c linux-4.9.135-vs2.3.9.8/drivers/md/dm-ioctl.c
+--- linux-4.9.135/drivers/md/dm-ioctl.c 2018-10-20 10:38:58.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/drivers/md/dm-ioctl.c 2018-10-20 04:58:13.000000000 +0000
@@ -16,6 +16,7 @@
#include <linux/dm-ioctl.h>
#include <linux/hdreg.h>
@@ -1210,9 +1210,9 @@ diff -NurpP --minimal linux-4.9.82/drivers/md/dm-ioctl.c linux-4.9.82-vs2.3.9.7/
return -EACCES;
if (_IOC_TYPE(command) != DM_IOCTL)
-diff -NurpP --minimal linux-4.9.82/drivers/md/dm.c linux-4.9.82-vs2.3.9.7/drivers/md/dm.c
---- linux-4.9.82/drivers/md/dm.c 2018-02-22 21:18:28.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/drivers/md/dm.c 2018-01-10 08:32:35.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/drivers/md/dm.c linux-4.9.135-vs2.3.9.8/drivers/md/dm.c
+--- linux-4.9.135/drivers/md/dm.c 2018-10-20 10:38:58.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/drivers/md/dm.c 2018-10-20 04:58:13.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/wait.h>
#include <linux/pr.h>
@@ -1269,7 +1269,7 @@ diff -NurpP --minimal linux-4.9.82/drivers/md/dm.c linux-4.9.82-vs2.3.9.7/driver
/*-----------------------------------------------------------------
* CRUD START:
* A more elegant soln is in the works that uses the queue
-@@ -1548,6 +1560,7 @@ static struct mapped_device *alloc_dev(i
+@@ -1549,6 +1561,7 @@ static struct mapped_device *alloc_dev(i
INIT_LIST_HEAD(&md->uevent_list);
INIT_LIST_HEAD(&md->table_devices);
spin_lock_init(&md->uevent_lock);
@@ -1277,9 +1277,9 @@ diff -NurpP --minimal linux-4.9.82/drivers/md/dm.c linux-4.9.82-vs2.3.9.7/driver
md->queue = blk_alloc_queue_node(GFP_KERNEL, numa_node_id);
if (!md->queue)
-diff -NurpP --minimal linux-4.9.82/drivers/md/dm.h linux-4.9.82-vs2.3.9.7/drivers/md/dm.h
---- linux-4.9.82/drivers/md/dm.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/drivers/md/dm.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/drivers/md/dm.h linux-4.9.135-vs2.3.9.8/drivers/md/dm.h
+--- linux-4.9.135/drivers/md/dm.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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;
@@ -1289,9 +1289,9 @@ diff -NurpP --minimal linux-4.9.82/drivers/md/dm.h linux-4.9.82-vs2.3.9.7/driver
/*-----------------------------------------------------------------
* Internal table functions.
*---------------------------------------------------------------*/
-diff -NurpP --minimal linux-4.9.82/drivers/net/tun.c linux-4.9.82-vs2.3.9.7/drivers/net/tun.c
---- linux-4.9.82/drivers/net/tun.c 2018-02-22 21:18:32.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/drivers/net/tun.c 2018-02-10 15:15:43.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/drivers/net/tun.c linux-4.9.135-vs2.3.9.8/drivers/net/tun.c
+--- linux-4.9.135/drivers/net/tun.c 2018-10-20 10:39:05.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/drivers/net/tun.c 2018-10-20 04:58:13.000000000 +0000
@@ -65,6 +65,7 @@
#include <linux/nsproxy.h>
#include <linux/virtio_net.h>
@@ -1350,9 +1350,9 @@ diff -NurpP --minimal linux-4.9.82/drivers/net/tun.c linux-4.9.82-vs2.3.9.7/driv
case TUNSETLINK:
/* Only allow setting the type when the interface is down */
if (tun->dev->flags & IFF_UP) {
-diff -NurpP --minimal linux-4.9.82/drivers/scsi/cxgbi/libcxgbi.c linux-4.9.82-vs2.3.9.7/drivers/scsi/cxgbi/libcxgbi.c
---- linux-4.9.82/drivers/scsi/cxgbi/libcxgbi.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/drivers/scsi/cxgbi/libcxgbi.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/drivers/scsi/cxgbi/libcxgbi.c linux-4.9.135-vs2.3.9.8/drivers/scsi/cxgbi/libcxgbi.c
+--- linux-4.9.135/drivers/scsi/cxgbi/libcxgbi.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/drivers/scsi/cxgbi/libcxgbi.c 2018-10-20 04:58:13.000000000 +0000
@@ -772,7 +772,8 @@ static struct cxgbi_sock *cxgbi_check_ro
struct inet6_dev *idev = ip6_dst_idev((struct dst_entry *)rt);
@@ -1363,9 +1363,9 @@ diff -NurpP --minimal linux-4.9.82/drivers/scsi/cxgbi/libcxgbi.c linux-4.9.82-vs
if (err) {
pr_info("failed to get source address to reach %pI6\n",
&daddr6->sin6_addr);
-diff -NurpP --minimal linux-4.9.82/drivers/tty/sysrq.c linux-4.9.82-vs2.3.9.7/drivers/tty/sysrq.c
---- linux-4.9.82/drivers/tty/sysrq.c 2018-02-22 21:18:37.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/drivers/tty/sysrq.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/drivers/tty/sysrq.c linux-4.9.135-vs2.3.9.8/drivers/tty/sysrq.c
+--- linux-4.9.135/drivers/tty/sysrq.c 2018-10-20 10:39:13.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/drivers/tty/sysrq.c 2018-10-20 04:58:13.000000000 +0000
@@ -47,6 +47,7 @@
#include <linux/syscalls.h>
#include <linux/of.h>
@@ -1417,9 +1417,9 @@ diff -NurpP --minimal linux-4.9.82/drivers/tty/sysrq.c linux-4.9.82-vs2.3.9.7/dr
else
retval = -1;
return retval;
-diff -NurpP --minimal linux-4.9.82/drivers/tty/tty_io.c linux-4.9.82-vs2.3.9.7/drivers/tty/tty_io.c
---- linux-4.9.82/drivers/tty/tty_io.c 2018-02-22 21:18:37.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/drivers/tty/tty_io.c 2018-02-10 15:15:43.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/drivers/tty/tty_io.c linux-4.9.135-vs2.3.9.8/drivers/tty/tty_io.c
+--- linux-4.9.135/drivers/tty/tty_io.c 2018-10-20 10:39:13.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/drivers/tty/tty_io.c 2018-10-20 05:55:42.000000000 +0000
@@ -104,6 +104,7 @@
#include <linux/kmod.h>
@@ -1428,7 +1428,7 @@ diff -NurpP --minimal linux-4.9.82/drivers/tty/tty_io.c linux-4.9.82-vs2.3.9.7/d
#undef TTY_DEBUG_HANGUP
#ifdef TTY_DEBUG_HANGUP
-@@ -2292,7 +2293,8 @@ static int tiocsti(struct tty_struct *tt
+@@ -2308,7 +2309,8 @@ static int tiocsti(struct tty_struct *tt
char ch, mbz = 0;
struct tty_ldisc *ld;
@@ -1438,7 +1438,7 @@ diff -NurpP --minimal linux-4.9.82/drivers/tty/tty_io.c linux-4.9.82-vs2.3.9.7/d
return -EPERM;
if (get_user(ch, p))
return -EFAULT;
-@@ -2607,6 +2609,7 @@ static int tiocspgrp(struct tty_struct *
+@@ -2623,6 +2625,7 @@ static int tiocspgrp(struct tty_struct *
return -ENOTTY;
if (get_user(pgrp_nr, p))
return -EFAULT;
@@ -1446,9 +1446,9 @@ diff -NurpP --minimal linux-4.9.82/drivers/tty/tty_io.c linux-4.9.82-vs2.3.9.7/d
if (pgrp_nr < 0)
return -EINVAL;
rcu_read_lock();
-diff -NurpP --minimal linux-4.9.82/fs/attr.c linux-4.9.82-vs2.3.9.7/fs/attr.c
---- linux-4.9.82/fs/attr.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/attr.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/attr.c linux-4.9.135-vs2.3.9.8/fs/attr.c
+--- linux-4.9.135/fs/attr.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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.82/fs/attr.c linux-4.9.82-vs2.3.9.7/fs/attr.c
if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
return -EPERM;
}
-diff -NurpP --minimal linux-4.9.82/fs/block_dev.c linux-4.9.82-vs2.3.9.7/fs/block_dev.c
---- linux-4.9.82/fs/block_dev.c 2018-02-22 21:18:42.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/block_dev.c 2018-01-13 00:48:31.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/block_dev.c linux-4.9.135-vs2.3.9.8/fs/block_dev.c
+--- linux-4.9.135/fs/block_dev.c 2018-10-20 10:39:16.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/fs/block_dev.c 2018-10-20 04:58:13.000000000 +0000
@@ -31,6 +31,7 @@
#include <linux/dax.h>
#include <linux/badblocks.h>
@@ -1529,9 +1529,9 @@ diff -NurpP --minimal linux-4.9.82/fs/block_dev.c linux-4.9.82-vs2.3.9.7/fs/bloc
if (bdev) {
spin_lock(&bdev_lock);
if (!inode->i_bdev) {
-diff -NurpP --minimal linux-4.9.82/fs/btrfs/ctree.h linux-4.9.82-vs2.3.9.7/fs/btrfs/ctree.h
---- linux-4.9.82/fs/btrfs/ctree.h 2018-02-22 21:18:43.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/btrfs/ctree.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/btrfs/ctree.h linux-4.9.135-vs2.3.9.8/fs/btrfs/ctree.h
+--- linux-4.9.135/fs/btrfs/ctree.h 2018-10-20 10:39:16.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/fs/btrfs/ctree.h 2018-10-20 04:58:13.000000000 +0000
@@ -1321,6 +1321,8 @@ static inline u32 BTRFS_MAX_XATTR_SIZE(c
#define BTRFS_DEFAULT_COMMIT_INTERVAL (30)
#define BTRFS_DEFAULT_MAX_INLINE (2048)
@@ -1568,10 +1568,10 @@ diff -NurpP --minimal linux-4.9.82/fs/btrfs/ctree.h linux-4.9.82-vs2.3.9.7/fs/bt
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.82/fs/btrfs/disk-io.c linux-4.9.82-vs2.3.9.7/fs/btrfs/disk-io.c
---- linux-4.9.82/fs/btrfs/disk-io.c 2018-02-22 21:18:43.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/btrfs/disk-io.c 2018-01-13 05:55:56.000000000 +0000
-@@ -2850,6 +2850,9 @@ int open_ctree(struct super_block *sb,
+diff -NurpP --minimal linux-4.9.135/fs/btrfs/disk-io.c linux-4.9.135-vs2.3.9.8/fs/btrfs/disk-io.c
+--- linux-4.9.135/fs/btrfs/disk-io.c 2018-10-20 10:39:16.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/fs/btrfs/disk-io.c 2018-10-20 05:55:42.000000000 +0000
+@@ -2852,6 +2852,9 @@ int open_ctree(struct super_block *sb,
goto fail_alloc;
}
@@ -1581,9 +1581,9 @@ diff -NurpP --minimal linux-4.9.82/fs/btrfs/disk-io.c linux-4.9.82-vs2.3.9.7/fs/
features = btrfs_super_incompat_flags(disk_super) &
~BTRFS_FEATURE_INCOMPAT_SUPP;
if (features) {
-diff -NurpP --minimal linux-4.9.82/fs/btrfs/inode.c linux-4.9.82-vs2.3.9.7/fs/btrfs/inode.c
---- linux-4.9.82/fs/btrfs/inode.c 2018-02-22 21:18:43.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/btrfs/inode.c 2018-02-22 21:31:40.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/btrfs/inode.c linux-4.9.135-vs2.3.9.8/fs/btrfs/inode.c
+--- linux-4.9.135/fs/btrfs/inode.c 2018-10-20 10:39:16.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/fs/btrfs/inode.c 2018-10-20 04:58:13.000000000 +0000
@@ -43,6 +43,7 @@
#include <linux/blkdev.h>
#include <linux/posix_acl_xattr.h>
@@ -1592,7 +1592,7 @@ diff -NurpP --minimal linux-4.9.82/fs/btrfs/inode.c linux-4.9.82-vs2.3.9.7/fs/bt
#include "ctree.h"
#include "disk-io.h"
#include "transaction.h"
-@@ -3669,6 +3670,9 @@ static int btrfs_read_locked_inode(struc
+@@ -3701,6 +3702,9 @@ static int btrfs_read_locked_inode(struc
unsigned long ptr;
int maybe_acls;
u32 rdev;
@@ -1602,7 +1602,7 @@ diff -NurpP --minimal linux-4.9.82/fs/btrfs/inode.c linux-4.9.82-vs2.3.9.7/fs/bt
int ret;
bool filled = false;
int first_xattr_slot;
-@@ -3701,8 +3705,14 @@ static int btrfs_read_locked_inode(struc
+@@ -3733,8 +3737,14 @@ static int btrfs_read_locked_inode(struc
struct btrfs_inode_item);
inode->i_mode = btrfs_inode_mode(leaf, inode_item);
set_nlink(inode, btrfs_inode_nlink(leaf, inode_item));
@@ -1619,7 +1619,7 @@ diff -NurpP --minimal linux-4.9.82/fs/btrfs/inode.c linux-4.9.82-vs2.3.9.7/fs/bt
btrfs_i_size_write(inode, btrfs_inode_size(leaf, inode_item));
inode->i_atime.tv_sec = btrfs_timespec_sec(leaf, &inode_item->atime);
-@@ -3857,11 +3867,18 @@ static void fill_inode_item(struct btrfs
+@@ -3889,11 +3899,18 @@ static void fill_inode_item(struct btrfs
struct inode *inode)
{
struct btrfs_map_token token;
@@ -1640,7 +1640,7 @@ diff -NurpP --minimal linux-4.9.82/fs/btrfs/inode.c linux-4.9.82-vs2.3.9.7/fs/bt
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);
-@@ -10620,6 +10637,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.82/fs/btrfs/inode.c linux-4.9.82-vs2.3.9.7/fs/bt
.get_acl = btrfs_get_acl,
.set_acl = btrfs_set_acl,
.update_time = btrfs_update_time,
-@@ -10628,6 +10646,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.82/fs/btrfs/inode.c linux-4.9.82-vs2.3.9.7/fs/bt
.update_time = btrfs_update_time,
};
-@@ -10693,6 +10712,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.82/fs/btrfs/inode.c linux-4.9.82-vs2.3.9.7/fs/bt
.get_acl = btrfs_get_acl,
.set_acl = btrfs_set_acl,
.update_time = btrfs_update_time,
-diff -NurpP --minimal linux-4.9.82/fs/btrfs/ioctl.c linux-4.9.82-vs2.3.9.7/fs/btrfs/ioctl.c
---- linux-4.9.82/fs/btrfs/ioctl.c 2018-02-22 21:18:43.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/btrfs/ioctl.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/btrfs/ioctl.c linux-4.9.135-vs2.3.9.8/fs/btrfs/ioctl.c
+--- linux-4.9.135/fs/btrfs/ioctl.c 2018-10-20 10:39:16.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/fs/btrfs/ioctl.c 2018-10-20 04:58:13.000000000 +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.82/fs/btrfs/ioctl.c linux-4.9.82-vs2.3.9.7/fs/bt
if (flags & FS_APPEND_FL)
ip->flags |= BTRFS_INODE_APPEND;
else
-diff -NurpP --minimal linux-4.9.82/fs/btrfs/super.c linux-4.9.82-vs2.3.9.7/fs/btrfs/super.c
---- linux-4.9.82/fs/btrfs/super.c 2018-02-22 21:18:43.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/btrfs/super.c 2018-01-13 05:51:52.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/btrfs/super.c linux-4.9.135-vs2.3.9.8/fs/btrfs/super.c
+--- linux-4.9.135/fs/btrfs/super.c 2018-10-20 10:39:16.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/fs/btrfs/super.c 2018-10-20 04:58:13.000000000 +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.82/fs/btrfs/super.c linux-4.9.82-vs2.3.9.7/fs/bt
if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
goto out;
-diff -NurpP --minimal linux-4.9.82/fs/char_dev.c linux-4.9.82-vs2.3.9.7/fs/char_dev.c
---- linux-4.9.82/fs/char_dev.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/char_dev.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/char_dev.c linux-4.9.135-vs2.3.9.8/fs/char_dev.c
+--- linux-4.9.135/fs/char_dev.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/fs/char_dev.c 2018-10-20 04:58:13.000000000 +0000
@@ -21,6 +21,8 @@
#include <linux/mutex.h>
#include <linux/backing-dev.h>
@@ -1938,9 +1938,9 @@ diff -NurpP --minimal linux-4.9.82/fs/char_dev.c linux-4.9.82-vs2.3.9.7/fs/char_
if (!kobj)
return -ENXIO;
new = container_of(kobj, struct cdev, kobj);
-diff -NurpP --minimal linux-4.9.82/fs/dcache.c linux-4.9.82-vs2.3.9.7/fs/dcache.c
---- linux-4.9.82/fs/dcache.c 2018-02-22 21:18:45.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/dcache.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/dcache.c linux-4.9.135-vs2.3.9.8/fs/dcache.c
+--- linux-4.9.135/fs/dcache.c 2018-10-20 10:39:17.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/fs/dcache.c 2018-10-20 05:55:42.000000000 +0000
@@ -39,6 +39,7 @@
#include <linux/ratelimit.h>
#include <linux/list_lru.h>
@@ -1949,7 +1949,7 @@ diff -NurpP --minimal linux-4.9.82/fs/dcache.c linux-4.9.82-vs2.3.9.7/fs/dcache.
#include "internal.h"
#include "mount.h"
-@@ -680,6 +681,7 @@ static inline bool fast_dput(struct dent
+@@ -690,6 +691,7 @@ static inline bool fast_dput(struct dent
spin_lock(&dentry->d_lock);
if (dentry->d_lockref.count > 1) {
dentry->d_lockref.count--;
@@ -1957,7 +1957,7 @@ diff -NurpP --minimal linux-4.9.82/fs/dcache.c linux-4.9.82-vs2.3.9.7/fs/dcache.
spin_unlock(&dentry->d_lock);
return 1;
}
-@@ -811,6 +813,7 @@ repeat:
+@@ -821,6 +823,7 @@ repeat:
dentry_lru_add(dentry);
dentry->d_lockref.count--;
@@ -1965,7 +1965,7 @@ diff -NurpP --minimal linux-4.9.82/fs/dcache.c linux-4.9.82-vs2.3.9.7/fs/dcache.
spin_unlock(&dentry->d_lock);
return;
-@@ -828,6 +831,7 @@ EXPORT_SYMBOL(dput);
+@@ -838,6 +841,7 @@ EXPORT_SYMBOL(dput);
static inline void __dget_dlock(struct dentry *dentry)
{
dentry->d_lockref.count++;
@@ -1973,7 +1973,7 @@ diff -NurpP --minimal linux-4.9.82/fs/dcache.c linux-4.9.82-vs2.3.9.7/fs/dcache.
}
static inline void __dget(struct dentry *dentry)
-@@ -840,6 +844,8 @@ struct dentry *dget_parent(struct dentry
+@@ -850,6 +854,8 @@ struct dentry *dget_parent(struct dentry
int gotref;
struct dentry *ret;
@@ -1982,7 +1982,7 @@ diff -NurpP --minimal linux-4.9.82/fs/dcache.c linux-4.9.82-vs2.3.9.7/fs/dcache.
/*
* Do optimistic parent lookup without any
* locking.
-@@ -870,6 +876,7 @@ repeat:
+@@ -880,6 +886,7 @@ repeat:
rcu_read_unlock();
BUG_ON(!ret->d_lockref.count);
ret->d_lockref.count++;
@@ -1990,7 +1990,7 @@ diff -NurpP --minimal linux-4.9.82/fs/dcache.c linux-4.9.82-vs2.3.9.7/fs/dcache.
spin_unlock(&ret->d_lock);
return ret;
}
-@@ -1024,6 +1031,7 @@ static void shrink_dentry_list(struct li
+@@ -1034,6 +1041,7 @@ static void shrink_dentry_list(struct li
parent = lock_parent(dentry);
if (dentry->d_lockref.count != 1) {
dentry->d_lockref.count--;
@@ -1998,7 +1998,7 @@ diff -NurpP --minimal linux-4.9.82/fs/dcache.c linux-4.9.82-vs2.3.9.7/fs/dcache.
spin_unlock(&dentry->d_lock);
if (parent)
spin_unlock(&parent->d_lock);
-@@ -1590,6 +1598,9 @@ struct dentry *__d_alloc(struct super_bl
+@@ -1600,6 +1608,9 @@ struct dentry *__d_alloc(struct super_bl
char *dname;
int err;
@@ -2008,7 +2008,7 @@ diff -NurpP --minimal linux-4.9.82/fs/dcache.c linux-4.9.82-vs2.3.9.7/fs/dcache.
dentry = kmem_cache_alloc(dentry_cache, GFP_KERNEL);
if (!dentry)
return NULL;
-@@ -1633,6 +1644,7 @@ struct dentry *__d_alloc(struct super_bl
+@@ -1643,6 +1654,7 @@ struct dentry *__d_alloc(struct super_bl
dentry->d_lockref.count = 1;
dentry->d_flags = 0;
@@ -2016,7 +2016,7 @@ diff -NurpP --minimal linux-4.9.82/fs/dcache.c linux-4.9.82-vs2.3.9.7/fs/dcache.
spin_lock_init(&dentry->d_lock);
seqcount_init(&dentry->d_seq);
dentry->d_inode = NULL;
-@@ -2282,6 +2294,7 @@ struct dentry *__d_lookup(const struct d
+@@ -2316,6 +2328,7 @@ struct dentry *__d_lookup(const struct d
goto next;
dentry->d_lockref.count++;
@@ -2024,7 +2024,7 @@ diff -NurpP --minimal linux-4.9.82/fs/dcache.c linux-4.9.82-vs2.3.9.7/fs/dcache.
found = dentry;
spin_unlock(&dentry->d_lock);
break;
-@@ -3532,6 +3545,7 @@ static enum d_walk_ret d_genocide_kill(v
+@@ -3574,6 +3587,7 @@ static enum d_walk_ret d_genocide_kill(v
if (!(dentry->d_flags & DCACHE_GENOCIDE)) {
dentry->d_flags |= DCACHE_GENOCIDE;
dentry->d_lockref.count--;
@@ -2032,9 +2032,9 @@ diff -NurpP --minimal linux-4.9.82/fs/dcache.c linux-4.9.82-vs2.3.9.7/fs/dcache.
}
}
return D_WALK_CONTINUE;
-diff -NurpP --minimal linux-4.9.82/fs/devpts/inode.c linux-4.9.82-vs2.3.9.7/fs/devpts/inode.c
---- linux-4.9.82/fs/devpts/inode.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/devpts/inode.c 2018-01-13 01:06:29.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/devpts/inode.c linux-4.9.135-vs2.3.9.8/fs/devpts/inode.c
+--- linux-4.9.135/fs/devpts/inode.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/fs/devpts/inode.c 2018-10-20 04:58:13.000000000 +0000
@@ -27,6 +27,7 @@
#include <linux/parser.h>
#include <linux/fsnotify.h>
@@ -2122,9 +2122,9 @@ diff -NurpP --minimal linux-4.9.82/fs/devpts/inode.c linux-4.9.82-vs2.3.9.7/fs/d
sprintf(s, "%d", index);
-diff -NurpP --minimal linux-4.9.82/fs/ext2/balloc.c linux-4.9.82-vs2.3.9.7/fs/ext2/balloc.c
---- linux-4.9.82/fs/ext2/balloc.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/ext2/balloc.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/ext2/balloc.c linux-4.9.135-vs2.3.9.8/fs/ext2/balloc.c
+--- linux-4.9.135/fs/ext2/balloc.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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.82/fs/ext2/balloc.c linux-4.9.82-vs2.3.9.7/fs/ex
BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb));
repeat:
-diff -NurpP --minimal linux-4.9.82/fs/ext2/ext2.h linux-4.9.82-vs2.3.9.7/fs/ext2/ext2.h
---- linux-4.9.82/fs/ext2/ext2.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/ext2/ext2.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/ext2/ext2.h linux-4.9.135-vs2.3.9.8/fs/ext2/ext2.h
+--- linux-4.9.135/fs/ext2/ext2.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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.82/fs/ext2/ext2.h linux-4.9.82-vs2.3.9.7/fs/ext2
/* ioctl.c */
extern long ext2_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-4.9.82/fs/ext2/file.c linux-4.9.82-vs2.3.9.7/fs/ext2/file.c
---- linux-4.9.82/fs/ext2/file.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/ext2/file.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/ext2/file.c linux-4.9.135-vs2.3.9.8/fs/ext2/file.c
+--- linux-4.9.135/fs/ext2/file.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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.82/fs/ext2/ialloc.c linux-4.9.82-vs2.3.9.7/fs/ext2/ialloc.c
---- linux-4.9.82/fs/ext2/ialloc.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/ext2/ialloc.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/ext2/ialloc.c linux-4.9.135-vs2.3.9.8/fs/ext2/ialloc.c
+--- linux-4.9.135/fs/ext2/ialloc.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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.82/fs/ext2/ialloc.c linux-4.9.82-vs2.3.9.7/fs/ex
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-4.9.82/fs/ext2/inode.c linux-4.9.82-vs2.3.9.7/fs/ext2/inode.c
---- linux-4.9.82/fs/ext2/inode.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/ext2/inode.c 2018-01-13 01:19:54.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/ext2/inode.c linux-4.9.135-vs2.3.9.8/fs/ext2/inode.c
+--- linux-4.9.135/fs/ext2/inode.c 2018-10-20 10:39:17.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/fs/ext2/inode.c 2018-10-20 04:58:13.000000000 +0000
@@ -35,6 +35,7 @@
#include <linux/iomap.h>
#include <linux/namei.h>
@@ -2222,7 +2222,7 @@ diff -NurpP --minimal linux-4.9.82/fs/ext2/inode.c linux-4.9.82-vs2.3.9.7/fs/ext
#include "ext2.h"
#include "acl.h"
#include "xattr.h"
-@@ -1367,39 +1368,61 @@ void ext2_set_inode_flags(struct inode *
+@@ -1357,39 +1358,61 @@ void ext2_set_inode_flags(struct inode *
{
unsigned int flags = EXT2_I(inode)->i_flags;
@@ -2292,7 +2292,7 @@ diff -NurpP --minimal linux-4.9.82/fs/ext2/inode.c linux-4.9.82-vs2.3.9.7/fs/ext
}
struct inode *ext2_iget (struct super_block *sb, unsigned long ino)
-@@ -1435,8 +1458,10 @@ struct inode *ext2_iget (struct super_bl
+@@ -1425,8 +1448,10 @@ struct inode *ext2_iget (struct super_bl
i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
}
@@ -2305,7 +2305,7 @@ diff -NurpP --minimal linux-4.9.82/fs/ext2/inode.c linux-4.9.82-vs2.3.9.7/fs/ext
set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
inode->i_size = le32_to_cpu(raw_inode->i_size);
inode->i_atime.tv_sec = (signed)le32_to_cpu(raw_inode->i_atime);
-@@ -1543,8 +1568,10 @@ static int __ext2_write_inode(struct ino
+@@ -1533,8 +1558,10 @@ static int __ext2_write_inode(struct ino
struct ext2_inode_info *ei = EXT2_I(inode);
struct super_block *sb = inode->i_sb;
ino_t ino = inode->i_ino;
@@ -2318,7 +2318,7 @@ diff -NurpP --minimal linux-4.9.82/fs/ext2/inode.c linux-4.9.82-vs2.3.9.7/fs/ext
struct buffer_head * bh;
struct ext2_inode * raw_inode = ext2_get_inode(sb, ino, &bh);
int n;
-@@ -1580,6 +1607,9 @@ static int __ext2_write_inode(struct ino
+@@ -1570,6 +1597,9 @@ static int __ext2_write_inode(struct ino
raw_inode->i_uid_high = 0;
raw_inode->i_gid_high = 0;
}
@@ -2328,7 +2328,7 @@ diff -NurpP --minimal linux-4.9.82/fs/ext2/inode.c linux-4.9.82-vs2.3.9.7/fs/ext
raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
raw_inode->i_size = cpu_to_le32(inode->i_size);
raw_inode->i_atime = cpu_to_le32(inode->i_atime.tv_sec);
-@@ -1663,7 +1693,8 @@ int ext2_setattr(struct dentry *dentry,
+@@ -1653,7 +1683,8 @@ int ext2_setattr(struct dentry *dentry,
return error;
}
if ((iattr->ia_valid & ATTR_UID && !uid_eq(iattr->ia_uid, inode->i_uid)) ||
@@ -2338,9 +2338,9 @@ diff -NurpP --minimal linux-4.9.82/fs/ext2/inode.c linux-4.9.82-vs2.3.9.7/fs/ext
error = dquot_transfer(inode, iattr);
if (error)
return error;
-diff -NurpP --minimal linux-4.9.82/fs/ext2/ioctl.c linux-4.9.82-vs2.3.9.7/fs/ext2/ioctl.c
---- linux-4.9.82/fs/ext2/ioctl.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/ext2/ioctl.c 2018-01-13 01:20:40.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/ext2/ioctl.c linux-4.9.135-vs2.3.9.8/fs/ext2/ioctl.c
+--- linux-4.9.135/fs/ext2/ioctl.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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.82/fs/ext2/ioctl.c linux-4.9.82-vs2.3.9.7/fs/ext
flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE;
ei->i_flags = flags;
-diff -NurpP --minimal linux-4.9.82/fs/ext2/namei.c linux-4.9.82-vs2.3.9.7/fs/ext2/namei.c
---- linux-4.9.82/fs/ext2/namei.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/ext2/namei.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/ext2/namei.c linux-4.9.135-vs2.3.9.8/fs/ext2/namei.c
+--- linux-4.9.135/fs/ext2/namei.c 2018-10-20 10:39:17.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/fs/ext2/namei.c 2018-10-20 04:58:13.000000000 +0000
@@ -32,6 +32,7 @@
#include <linux/pagemap.h>
@@ -2401,7 +2401,7 @@ diff -NurpP --minimal linux-4.9.82/fs/ext2/namei.c linux-4.9.82-vs2.3.9.7/fs/ext
#include "ext2.h"
#include "xattr.h"
#include "acl.h"
-@@ -72,6 +73,7 @@ static struct dentry *ext2_lookup(struct
+@@ -71,6 +72,7 @@ static struct dentry *ext2_lookup(struct
(unsigned long) ino);
return ERR_PTR(-EIO);
}
@@ -2409,7 +2409,7 @@ diff -NurpP --minimal linux-4.9.82/fs/ext2/namei.c linux-4.9.82-vs2.3.9.7/fs/ext
}
return d_splice_alias(inode, dentry);
}
-@@ -445,6 +447,7 @@ const struct inode_operations ext2_speci
+@@ -443,6 +445,7 @@ const struct inode_operations ext2_speci
.listxattr = ext2_listxattr,
#endif
.setattr = ext2_setattr,
@@ -2417,9 +2417,9 @@ diff -NurpP --minimal linux-4.9.82/fs/ext2/namei.c linux-4.9.82-vs2.3.9.7/fs/ext
.get_acl = ext2_get_acl,
.set_acl = ext2_set_acl,
};
-diff -NurpP --minimal linux-4.9.82/fs/ext2/super.c linux-4.9.82-vs2.3.9.7/fs/ext2/super.c
---- linux-4.9.82/fs/ext2/super.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/ext2/super.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/ext2/super.c linux-4.9.135-vs2.3.9.8/fs/ext2/super.c
+--- linux-4.9.135/fs/ext2/super.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/fs/ext2/super.c 2018-10-20 04:58:13.000000000 +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.82/fs/ext2/super.c linux-4.9.82-vs2.3.9.7/fs/ext
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.82/fs/ext4/ext4.h linux-4.9.82-vs2.3.9.7/fs/ext4/ext4.h
---- linux-4.9.82/fs/ext4/ext4.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/ext4/ext4.h 2018-01-13 02:00:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/ext4/ext4.h linux-4.9.135-vs2.3.9.8/fs/ext4/ext4.h
+--- linux-4.9.135/fs/ext4/ext4.h 2018-10-20 10:39:17.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/fs/ext4/ext4.h 2018-10-20 11:46:17.000000000 +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.82/fs/ext4/ext4.h linux-4.9.82-vs2.3.9.7/fs/ext4
#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 */
-@@ -2497,6 +2502,7 @@ extern int ext4_punch_hole(struct inode
+@@ -2492,6 +2497,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.82/fs/ext4/ext4.h linux-4.9.82-vs2.3.9.7/fs/ext4
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.82/fs/ext4/file.c linux-4.9.82-vs2.3.9.7/fs/ext4/file.c
---- linux-4.9.82/fs/ext4/file.c 2018-02-22 21:18:46.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/ext4/file.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/ext4/file.c linux-4.9.135-vs2.3.9.8/fs/ext4/file.c
+--- linux-4.9.135/fs/ext4/file.c 2018-10-20 10:39:17.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/fs/ext4/file.c 2018-10-20 04:58:13.000000000 +0000
@@ -691,5 +691,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.82/fs/ext4/file.c linux-4.9.82-vs2.3.9.7/fs/ext4
+ .sync_flags = ext4_sync_flags,
};
-diff -NurpP --minimal linux-4.9.82/fs/ext4/ialloc.c linux-4.9.82-vs2.3.9.7/fs/ext4/ialloc.c
---- linux-4.9.82/fs/ext4/ialloc.c 2018-02-22 21:18:46.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/ext4/ialloc.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/ext4/ialloc.c linux-4.9.135-vs2.3.9.8/fs/ext4/ialloc.c
+--- linux-4.9.135/fs/ext4/ialloc.c 2018-10-20 10:39:17.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/fs/ext4/ialloc.c 2018-10-20 05:55:42.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/random.h>
#include <linux/bitops.h>
@@ -2554,7 +2554,7 @@ diff -NurpP --minimal linux-4.9.82/fs/ext4/ialloc.c linux-4.9.82-vs2.3.9.7/fs/ex
#include <asm/byteorder.h>
#include "ext4.h"
-@@ -799,6 +800,7 @@ struct inode *__ext4_new_inode(handle_t
+@@ -777,6 +778,7 @@ struct inode *__ext4_new_inode(handle_t
inode->i_mode = mode;
inode->i_uid = current_fsuid();
inode->i_gid = dir->i_gid;
@@ -2562,9 +2562,9 @@ diff -NurpP --minimal linux-4.9.82/fs/ext4/ialloc.c linux-4.9.82-vs2.3.9.7/fs/ex
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-4.9.82/fs/ext4/inode.c linux-4.9.82-vs2.3.9.7/fs/ext4/inode.c
---- linux-4.9.82/fs/ext4/inode.c 2018-02-22 21:18:46.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/ext4/inode.c 2018-01-13 02:02:12.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/ext4/inode.c linux-4.9.135-vs2.3.9.8/fs/ext4/inode.c
+--- linux-4.9.135/fs/ext4/inode.c 2018-10-20 10:39:17.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/fs/ext4/inode.c 2018-10-20 05:55:42.000000000 +0000
@@ -37,6 +37,7 @@
#include <linux/printk.h>
#include <linux/slab.h>
@@ -2573,7 +2573,7 @@ diff -NurpP --minimal linux-4.9.82/fs/ext4/inode.c linux-4.9.82-vs2.3.9.7/fs/ext
#include "ext4_jbd2.h"
#include "xattr.h"
-@@ -4374,12 +4375,15 @@ void ext4_set_inode_flags(struct inode *
+@@ -4380,12 +4381,15 @@ void ext4_set_inode_flags(struct inode *
unsigned int flags = EXT4_I(inode)->i_flags;
unsigned int new_fl = 0;
@@ -2591,7 +2591,7 @@ diff -NurpP --minimal linux-4.9.82/fs/ext4/inode.c linux-4.9.82-vs2.3.9.7/fs/ext
if (flags & EXT4_NOATIME_FL)
new_fl |= S_NOATIME;
if (flags & EXT4_DIRSYNC_FL)
-@@ -4387,31 +4391,52 @@ void ext4_set_inode_flags(struct inode *
+@@ -4393,31 +4397,52 @@ void ext4_set_inode_flags(struct inode *
if (test_opt(inode->i_sb, DAX) && S_ISREG(inode->i_mode))
new_fl |= S_DAX;
inode_set_flags(inode, new_fl,
@@ -2649,7 +2649,7 @@ diff -NurpP --minimal linux-4.9.82/fs/ext4/inode.c linux-4.9.82-vs2.3.9.7/fs/ext
} while (cmpxchg(&ei->i_flags, old_fl, new_fl) != old_fl);
}
-@@ -4531,8 +4556,10 @@ struct inode *ext4_iget(struct super_blo
+@@ -4543,8 +4568,10 @@ struct inode *ext4_iget(struct super_blo
i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
}
@@ -2662,7 +2662,7 @@ diff -NurpP --minimal linux-4.9.82/fs/ext4/inode.c linux-4.9.82-vs2.3.9.7/fs/ext
ei->i_projid = make_kprojid(&init_user_ns, i_projid);
set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
-@@ -4848,8 +4875,10 @@ static int ext4_do_update_inode(handle_t
+@@ -4860,8 +4887,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.82/fs/ext4/inode.c linux-4.9.82-vs2.3.9.7/fs/ext
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));
-@@ -4873,6 +4902,9 @@ static int ext4_do_update_inode(handle_t
+@@ -4885,6 +4914,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.82/fs/ext4/inode.c linux-4.9.82-vs2.3.9.7/fs/ext
raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
EXT4_INODE_SET_XTIME(i_ctime, inode, raw_inode);
-@@ -5126,7 +5158,8 @@ int ext4_setattr(struct dentry *dentry,
+@@ -5138,7 +5170,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.82/fs/ext4/inode.c linux-4.9.82-vs2.3.9.7/fs/ext
handle_t *handle;
/* (user+group)*(old+new) structure, inode write (sb,
-@@ -5149,6 +5182,8 @@ int ext4_setattr(struct dentry *dentry,
+@@ -5161,6 +5194,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.82/fs/ext4/inode.c linux-4.9.82-vs2.3.9.7/fs/ext
error = ext4_mark_inode_dirty(handle, inode);
ext4_journal_stop(handle);
}
-diff -NurpP --minimal linux-4.9.82/fs/ext4/ioctl.c linux-4.9.82-vs2.3.9.7/fs/ext4/ioctl.c
---- linux-4.9.82/fs/ext4/ioctl.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/ext4/ioctl.c 2018-01-13 02:03:59.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/ext4/ioctl.c linux-4.9.135-vs2.3.9.8/fs/ext4/ioctl.c
+--- linux-4.9.135/fs/ext4/ioctl.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/fs/ext4/ioctl.c 2018-10-20 04:58:13.000000000 +0000
@@ -15,6 +15,7 @@
#include <linux/file.h>
#include <linux/quotaops.h>
@@ -2772,9 +2772,9 @@ diff -NurpP --minimal linux-4.9.82/fs/ext4/ioctl.c linux-4.9.82-vs2.3.9.7/fs/ext
inode_lock(inode);
err = ext4_ioctl_setflags(inode, flags);
inode_unlock(inode);
-diff -NurpP --minimal linux-4.9.82/fs/ext4/namei.c linux-4.9.82-vs2.3.9.7/fs/ext4/namei.c
---- linux-4.9.82/fs/ext4/namei.c 2018-02-22 21:18:46.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/ext4/namei.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/ext4/namei.c linux-4.9.135-vs2.3.9.8/fs/ext4/namei.c
+--- linux-4.9.135/fs/ext4/namei.c 2018-10-20 10:39:17.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/fs/ext4/namei.c 2018-10-20 05:55:42.000000000 +0000
@@ -33,6 +33,7 @@
#include <linux/quotaops.h>
#include <linux/buffer_head.h>
@@ -2783,7 +2783,7 @@ diff -NurpP --minimal linux-4.9.82/fs/ext4/namei.c linux-4.9.82-vs2.3.9.7/fs/ext
#include "ext4.h"
#include "ext4_jbd2.h"
-@@ -1459,6 +1460,7 @@ restart:
+@@ -1460,6 +1461,7 @@ restart:
REQ_META | REQ_PRIO,
1, &bh);
}
@@ -2791,7 +2791,7 @@ diff -NurpP --minimal linux-4.9.82/fs/ext4/namei.c linux-4.9.82-vs2.3.9.7/fs/ext
}
if ((bh = bh_use[ra_ptr++]) == NULL)
goto next;
-@@ -3906,6 +3908,7 @@ const struct inode_operations ext4_dir_i
+@@ -3911,6 +3913,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.82/fs/ext4/namei.c linux-4.9.82-vs2.3.9.7/fs/ext
};
const struct inode_operations ext4_special_inode_operations = {
-diff -NurpP --minimal linux-4.9.82/fs/ext4/super.c linux-4.9.82-vs2.3.9.7/fs/ext4/super.c
---- linux-4.9.82/fs/ext4/super.c 2018-02-22 21:18:46.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/ext4/super.c 2018-01-10 02:50:49.000000000 +0000
-@@ -1280,6 +1280,7 @@ enum {
+diff -NurpP --minimal linux-4.9.135/fs/ext4/super.c linux-4.9.135-vs2.3.9.8/fs/ext4/super.c
+--- linux-4.9.135/fs/ext4/super.c 2018-10-20 10:39:17.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/fs/ext4/super.c 2018-10-20 05:55:42.000000000 +0000
+@@ -1281,6 +1281,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.82/fs/ext4/super.c linux-4.9.82-vs2.3.9.7/fs/ext
};
static const match_table_t tokens = {
-@@ -1366,6 +1367,9 @@ static const match_table_t tokens = {
+@@ -1367,6 +1368,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.82/fs/ext4/super.c linux-4.9.82-vs2.3.9.7/fs/ext
{Opt_err, NULL},
};
-@@ -1611,6 +1615,20 @@ static int handle_mount_opt(struct super
+@@ -1612,6 +1616,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.82/fs/ext4/super.c linux-4.9.82-vs2.3.9.7/fs/ext
}
for (m = ext4_mount_opts; m->token != Opt_err; m++)
-@@ -3550,6 +3568,9 @@ static int ext4_fill_super(struct super_
+@@ -3587,6 +3605,9 @@ static int ext4_fill_super(struct super_
sb->s_iflags |= SB_I_CGROUPWB;
}
@@ -2851,7 +2851,7 @@ diff -NurpP --minimal linux-4.9.82/fs/ext4/super.c linux-4.9.82-vs2.3.9.7/fs/ext
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-@@ -4917,6 +4938,14 @@ static int ext4_remount(struct super_blo
+@@ -4984,6 +5005,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.82/fs/ext4/super.c linux-4.9.82-vs2.3.9.7/fs/ext
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-4.9.82/fs/fcntl.c linux-4.9.82-vs2.3.9.7/fs/fcntl.c
---- linux-4.9.82/fs/fcntl.c 2018-02-22 21:18:46.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/fcntl.c 2018-02-10 15:15:43.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/fcntl.c linux-4.9.135-vs2.3.9.8/fs/fcntl.c
+--- linux-4.9.135/fs/fcntl.c 2018-10-20 10:39:17.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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.82/fs/fcntl.c linux-4.9.82-vs2.3.9.7/fs/fcntl.c
if (unlikely(f.file->f_mode & FMODE_PATH)) {
if (!check_fcntl_cmd(cmd))
-diff -NurpP --minimal linux-4.9.82/fs/file.c linux-4.9.82-vs2.3.9.7/fs/file.c
---- linux-4.9.82/fs/file.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/file.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/file.c linux-4.9.135-vs2.3.9.8/fs/file.c
+--- linux-4.9.135/fs/file.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/fs/file.c 2018-10-20 04:58:13.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/spinlock.h>
#include <linux/rcupdate.h>
@@ -2943,9 +2943,9 @@ diff -NurpP --minimal linux-4.9.82/fs/file.c linux-4.9.82-vs2.3.9.7/fs/file.c
return fd;
-diff -NurpP --minimal linux-4.9.82/fs/file_table.c linux-4.9.82-vs2.3.9.7/fs/file_table.c
---- linux-4.9.82/fs/file_table.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/file_table.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/file_table.c linux-4.9.135-vs2.3.9.8/fs/file_table.c
+--- linux-4.9.135/fs/file_table.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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.82/fs/file_table.c linux-4.9.82-vs2.3.9.7/fs/fil
file_free(file);
}
}
-diff -NurpP --minimal linux-4.9.82/fs/fs_struct.c linux-4.9.82-vs2.3.9.7/fs/fs_struct.c
---- linux-4.9.82/fs/fs_struct.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/fs_struct.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/fs_struct.c linux-4.9.135-vs2.3.9.8/fs/fs_struct.c
+--- linux-4.9.135/fs/fs_struct.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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.82/fs/fs_struct.c linux-4.9.82-vs2.3.9.7/fs/fs_s
}
return fs;
}
-diff -NurpP --minimal linux-4.9.82/fs/gfs2/file.c linux-4.9.82-vs2.3.9.7/fs/gfs2/file.c
---- linux-4.9.82/fs/gfs2/file.c 2018-02-22 21:18:47.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/gfs2/file.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/gfs2/file.c linux-4.9.135-vs2.3.9.8/fs/gfs2/file.c
+--- linux-4.9.135/fs/gfs2/file.c 2018-10-20 10:39:17.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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.82/fs/gfs2/file.c linux-4.9.82-vs2.3.9.7/fs/gfs2
static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
switch(cmd) {
-diff -NurpP --minimal linux-4.9.82/fs/gfs2/inode.h linux-4.9.82-vs2.3.9.7/fs/gfs2/inode.h
---- linux-4.9.82/fs/gfs2/inode.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/gfs2/inode.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/gfs2/inode.h linux-4.9.135-vs2.3.9.8/fs/gfs2/inode.h
+--- linux-4.9.135/fs/gfs2/inode.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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.82/fs/gfs2/inode.h linux-4.9.82-vs2.3.9.7/fs/gfs
#ifdef CONFIG_GFS2_FS_LOCKING_DLM
extern const struct file_operations gfs2_file_fops;
-diff -NurpP --minimal linux-4.9.82/fs/hostfs/hostfs.h linux-4.9.82-vs2.3.9.7/fs/hostfs/hostfs.h
---- linux-4.9.82/fs/hostfs/hostfs.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/hostfs/hostfs.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/hostfs/hostfs.h linux-4.9.135-vs2.3.9.8/fs/hostfs/hostfs.h
+--- linux-4.9.135/fs/hostfs/hostfs.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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.82/fs/hostfs/hostfs.h linux-4.9.82-vs2.3.9.7/fs/
loff_t ia_size;
struct timespec ia_atime;
struct timespec ia_mtime;
-diff -NurpP --minimal linux-4.9.82/fs/inode.c linux-4.9.82-vs2.3.9.7/fs/inode.c
---- linux-4.9.82/fs/inode.c 2018-02-22 21:18:47.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/inode.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/inode.c linux-4.9.135-vs2.3.9.8/fs/inode.c
+--- linux-4.9.135/fs/inode.c 2018-10-20 10:39:17.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/fs/inode.c 2018-10-20 04:58:13.000000000 +0000
@@ -18,6 +18,7 @@
#include <linux/buffer_head.h> /* for inode_has_buffers */
#include <linux/ratelimit.h>
@@ -3212,7 +3212,7 @@ diff -NurpP --minimal linux-4.9.82/fs/inode.c linux-4.9.82-vs2.3.9.7/fs/inode.c
} else if (S_ISFIFO(mode))
inode->i_fop = &pipefifo_fops;
else if (S_ISSOCK(mode))
-@@ -2008,6 +2017,7 @@ void inode_init_owner(struct inode *inod
+@@ -2014,6 +2023,7 @@ void inode_init_owner(struct inode *inod
} else
inode->i_gid = current_fsgid();
inode->i_mode = mode;
@@ -3220,9 +3220,9 @@ diff -NurpP --minimal linux-4.9.82/fs/inode.c linux-4.9.82-vs2.3.9.7/fs/inode.c
}
EXPORT_SYMBOL(inode_init_owner);
-diff -NurpP --minimal linux-4.9.82/fs/ioctl.c linux-4.9.82-vs2.3.9.7/fs/ioctl.c
---- linux-4.9.82/fs/ioctl.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/ioctl.c 2018-01-13 01:03:36.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/ioctl.c linux-4.9.135-vs2.3.9.8/fs/ioctl.c
+--- linux-4.9.135/fs/ioctl.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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.82/fs/ioctl.c linux-4.9.82-vs2.3.9.7/fs/ioctl.c
#include "internal.h"
#include <asm/ioctls.h>
-diff -NurpP --minimal linux-4.9.82/fs/jfs/file.c linux-4.9.82-vs2.3.9.7/fs/jfs/file.c
---- linux-4.9.82/fs/jfs/file.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/jfs/file.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/jfs/file.c linux-4.9.135-vs2.3.9.8/fs/jfs/file.c
+--- linux-4.9.135/fs/jfs/file.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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.82/fs/jfs/file.c linux-4.9.82-vs2.3.9.7/fs/jfs/f
};
const struct file_operations jfs_file_operations = {
-diff -NurpP --minimal linux-4.9.82/fs/jfs/ioctl.c linux-4.9.82-vs2.3.9.7/fs/jfs/ioctl.c
---- linux-4.9.82/fs/jfs/ioctl.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/jfs/ioctl.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/jfs/ioctl.c linux-4.9.135-vs2.3.9.8/fs/jfs/ioctl.c
+--- linux-4.9.135/fs/jfs/ioctl.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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.82/fs/jfs/ioctl.c linux-4.9.82-vs2.3.9.7/fs/jfs/
flags |= oldflags & ~JFS_FL_USER_MODIFIABLE;
jfs_inode->mode2 = flags;
-diff -NurpP --minimal linux-4.9.82/fs/jfs/jfs_dinode.h linux-4.9.82-vs2.3.9.7/fs/jfs/jfs_dinode.h
---- linux-4.9.82/fs/jfs/jfs_dinode.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/jfs/jfs_dinode.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/jfs/jfs_dinode.h linux-4.9.135-vs2.3.9.8/fs/jfs/jfs_dinode.h
+--- linux-4.9.135/fs/jfs/jfs_dinode.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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.82/fs/jfs/jfs_dinode.h linux-4.9.82-vs2.3.9.7/fs
#define JFS_FL_INHERIT 0x03C80000
/* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */
-diff -NurpP --minimal linux-4.9.82/fs/jfs/jfs_filsys.h linux-4.9.82-vs2.3.9.7/fs/jfs/jfs_filsys.h
---- linux-4.9.82/fs/jfs/jfs_filsys.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/jfs/jfs_filsys.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/jfs/jfs_filsys.h linux-4.9.135-vs2.3.9.8/fs/jfs/jfs_filsys.h
+--- linux-4.9.135/fs/jfs/jfs_filsys.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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.82/fs/jfs/jfs_filsys.h linux-4.9.82-vs2.3.9.7/fs
/*
* file system state (superblock state)
-diff -NurpP --minimal linux-4.9.82/fs/jfs/jfs_imap.c linux-4.9.82-vs2.3.9.7/fs/jfs/jfs_imap.c
---- linux-4.9.82/fs/jfs/jfs_imap.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/jfs/jfs_imap.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/jfs/jfs_imap.c linux-4.9.135-vs2.3.9.8/fs/jfs/jfs_imap.c
+--- linux-4.9.135/fs/jfs/jfs_imap.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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.82/fs/jfs/jfs_imap.c linux-4.9.82-vs2.3.9.7/fs/j
jfs_get_inode_flags(jfs_ip);
/*
* mode2 is only needed for storing the higher order bits.
-diff -NurpP --minimal linux-4.9.82/fs/jfs/jfs_inode.c linux-4.9.82-vs2.3.9.7/fs/jfs/jfs_inode.c
---- linux-4.9.82/fs/jfs/jfs_inode.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/jfs/jfs_inode.c 2018-01-14 06:01:31.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/jfs/jfs_inode.c linux-4.9.135-vs2.3.9.8/fs/jfs/jfs_inode.c
+--- linux-4.9.135/fs/jfs/jfs_inode.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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.82/fs/jfs/jfs_inode.c linux-4.9.82-vs2.3.9.7/fs/
}
/*
-diff -NurpP --minimal linux-4.9.82/fs/jfs/jfs_inode.h linux-4.9.82-vs2.3.9.7/fs/jfs/jfs_inode.h
---- linux-4.9.82/fs/jfs/jfs_inode.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/jfs/jfs_inode.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/jfs/jfs_inode.h linux-4.9.135-vs2.3.9.8/fs/jfs/jfs_inode.h
+--- linux-4.9.135/fs/jfs/jfs_inode.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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.82/fs/jfs/jfs_inode.h linux-4.9.82-vs2.3.9.7/fs/
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.82/fs/jfs/namei.c linux-4.9.82-vs2.3.9.7/fs/jfs/namei.c
---- linux-4.9.82/fs/jfs/namei.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/jfs/namei.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/jfs/namei.c linux-4.9.135-vs2.3.9.8/fs/jfs/namei.c
+--- linux-4.9.135/fs/jfs/namei.c 2018-10-20 10:39:17.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/fs/jfs/namei.c 2018-10-20 04:58:14.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/ctype.h>
#include <linux/quotaops.h>
@@ -3505,7 +3505,7 @@ diff -NurpP --minimal linux-4.9.82/fs/jfs/namei.c linux-4.9.82-vs2.3.9.7/fs/jfs/
#include "jfs_incore.h"
#include "jfs_superblock.h"
#include "jfs_inode.h"
-@@ -1484,6 +1485,7 @@ static struct dentry *jfs_lookup(struct
+@@ -1480,6 +1481,7 @@ static struct dentry *jfs_lookup(struct
jfs_err("jfs_lookup: iget failed on inum %d", (uint)inum);
}
@@ -3513,7 +3513,7 @@ diff -NurpP --minimal linux-4.9.82/fs/jfs/namei.c linux-4.9.82-vs2.3.9.7/fs/jfs/
return d_splice_alias(ip, dentry);
}
-@@ -1546,6 +1548,7 @@ const struct inode_operations jfs_dir_in
+@@ -1542,6 +1544,7 @@ const struct inode_operations jfs_dir_in
.get_acl = jfs_get_acl,
.set_acl = jfs_set_acl,
#endif
@@ -3521,9 +3521,9 @@ diff -NurpP --minimal linux-4.9.82/fs/jfs/namei.c linux-4.9.82-vs2.3.9.7/fs/jfs/
};
const struct file_operations jfs_dir_operations = {
-diff -NurpP --minimal linux-4.9.82/fs/jfs/super.c linux-4.9.82-vs2.3.9.7/fs/jfs/super.c
---- linux-4.9.82/fs/jfs/super.c 2018-02-22 21:18:47.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/jfs/super.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/jfs/super.c linux-4.9.135-vs2.3.9.8/fs/jfs/super.c
+--- linux-4.9.135/fs/jfs/super.c 2018-10-20 10:39:17.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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.82/fs/jfs/super.c linux-4.9.82-vs2.3.9.7/fs/jfs/
if (newLVSize) {
pr_err("resize option for remount only\n");
-diff -NurpP --minimal linux-4.9.82/fs/libfs.c linux-4.9.82-vs2.3.9.7/fs/libfs.c
---- linux-4.9.82/fs/libfs.c 2018-02-22 21:18:47.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/libfs.c 2018-01-13 01:03:09.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/libfs.c linux-4.9.135-vs2.3.9.8/fs/libfs.c
+--- linux-4.9.135/fs/libfs.c 2018-10-20 10:39:17.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/fs/libfs.c 2018-10-20 04:58:14.000000000 +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.82/fs/libfs.c linux-4.9.82-vs2.3.9.7/fs/libfs.c
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.82/fs/locks.c linux-4.9.82-vs2.3.9.7/fs/locks.c
---- linux-4.9.82/fs/locks.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/locks.c 2018-01-13 01:28:30.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/locks.c linux-4.9.135-vs2.3.9.8/fs/locks.c
+--- linux-4.9.135/fs/locks.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/fs/locks.c 2018-10-20 04:58:14.000000000 +0000
@@ -127,6 +127,8 @@
#include <linux/pid_namespace.h>
#include <linux/hashtable.h>
@@ -3828,9 +3828,9 @@ diff -NurpP --minimal linux-4.9.82/fs/locks.c linux-4.9.82-vs2.3.9.7/fs/locks.c
return 0;
}
-diff -NurpP --minimal linux-4.9.82/fs/mount.h linux-4.9.82-vs2.3.9.7/fs/mount.h
---- linux-4.9.82/fs/mount.h 2018-02-22 21:18:47.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/mount.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/mount.h linux-4.9.135-vs2.3.9.8/fs/mount.h
+--- linux-4.9.135/fs/mount.h 2018-10-20 10:39:17.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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.82/fs/mount.h linux-4.9.82-vs2.3.9.7/fs/mount.h
};
#define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */
-diff -NurpP --minimal linux-4.9.82/fs/namei.c linux-4.9.82-vs2.3.9.7/fs/namei.c
---- linux-4.9.82/fs/namei.c 2018-02-22 21:18:47.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/namei.c 2018-01-13 05:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/namei.c linux-4.9.135-vs2.3.9.8/fs/namei.c
+--- linux-4.9.135/fs/namei.c 2018-10-20 10:39:17.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/fs/namei.c 2018-10-20 04:58:14.000000000 +0000
@@ -37,9 +37,19 @@
#include <linux/hash.h>
#include <linux/bitops.h>
@@ -3862,7 +3862,7 @@ diff -NurpP --minimal linux-4.9.82/fs/namei.c linux-4.9.82-vs2.3.9.7/fs/namei.c
#include "mount.h"
/* [Feb-1997 T. Schoebel-Theuer]
-@@ -285,6 +295,93 @@ static int check_acl(struct inode *inode
+@@ -286,6 +296,93 @@ static int check_acl(struct inode *inode
return -EAGAIN;
}
@@ -3956,7 +3956,7 @@ diff -NurpP --minimal linux-4.9.82/fs/namei.c linux-4.9.82-vs2.3.9.7/fs/namei.c
/*
* This does the basic permission checking
*/
-@@ -409,7 +506,7 @@ int __inode_permission(struct inode *ino
+@@ -410,7 +507,7 @@ int __inode_permission(struct inode *ino
/*
* Nobody gets write access to an immutable file.
*/
@@ -3965,7 +3965,7 @@ diff -NurpP --minimal linux-4.9.82/fs/namei.c linux-4.9.82-vs2.3.9.7/fs/namei.c
return -EPERM;
/*
-@@ -421,6 +518,10 @@ int __inode_permission(struct inode *ino
+@@ -422,6 +519,10 @@ int __inode_permission(struct inode *ino
return -EACCES;
}
@@ -3976,7 +3976,7 @@ diff -NurpP --minimal linux-4.9.82/fs/namei.c linux-4.9.82-vs2.3.9.7/fs/namei.c
retval = do_inode_permission(inode, mask);
if (retval)
return retval;
-@@ -2781,7 +2882,7 @@ static int may_delete(struct inode *dir,
+@@ -2783,7 +2884,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.82/fs/namei.c linux-4.9.82-vs2.3.9.7/fs/namei.c
return -EPERM;
if (isdir) {
if (!d_is_dir(victim))
-@@ -2869,19 +2970,25 @@ int vfs_create(struct inode *dir, struct
+@@ -2871,19 +2972,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.82/fs/namei.c linux-4.9.82-vs2.3.9.7/fs/namei.c
return error;
}
EXPORT_SYMBOL(vfs_create);
-@@ -2919,6 +3026,15 @@ static int may_open(struct path *path, i
+@@ -2921,6 +3028,15 @@ static int may_open(struct path *path, i
break;
}
@@ -4029,7 +4029,7 @@ diff -NurpP --minimal linux-4.9.82/fs/namei.c linux-4.9.82-vs2.3.9.7/fs/namei.c
error = inode_permission(inode, MAY_OPEN | acc_mode);
if (error)
return error;
-@@ -3371,6 +3487,16 @@ finish_open:
+@@ -3373,6 +3489,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.82/fs/namei.c linux-4.9.82-vs2.3.9.7/fs/namei.c
if (error)
goto out;
BUG_ON(*opened & FILE_OPENED); /* once it's opened, it's opened */
-@@ -3474,6 +3600,9 @@ static struct file *path_openat(struct n
+@@ -3476,6 +3602,9 @@ static struct file *path_openat(struct n
int opened = 0;
int error;
@@ -4056,7 +4056,7 @@ diff -NurpP --minimal linux-4.9.82/fs/namei.c linux-4.9.82-vs2.3.9.7/fs/namei.c
file = get_empty_filp();
if (IS_ERR(file))
return file;
-@@ -3507,6 +3636,12 @@ static struct file *path_openat(struct n
+@@ -3509,6 +3638,12 @@ static struct file *path_openat(struct n
}
}
terminate_walk(nd);
@@ -4069,7 +4069,7 @@ diff -NurpP --minimal linux-4.9.82/fs/namei.c linux-4.9.82-vs2.3.9.7/fs/namei.c
out2:
if (!(opened & FILE_OPENED)) {
BUG_ON(!error);
-@@ -3627,6 +3762,11 @@ static struct dentry *filename_create(in
+@@ -3629,6 +3764,11 @@ static struct dentry *filename_create(in
goto fail;
}
putname(name);
@@ -4081,7 +4081,7 @@ diff -NurpP --minimal linux-4.9.82/fs/namei.c linux-4.9.82-vs2.3.9.7/fs/namei.c
return dentry;
fail:
dput(dentry);
-@@ -3745,6 +3885,7 @@ retry:
+@@ -3747,6 +3887,7 @@ retry:
error = vfs_mknod(path.dentry->d_inode,dentry,mode,0);
break;
}
@@ -4089,7 +4089,7 @@ diff -NurpP --minimal linux-4.9.82/fs/namei.c linux-4.9.82-vs2.3.9.7/fs/namei.c
out:
done_path_create(&path, dentry);
if (retry_estale(error, lookup_flags)) {
-@@ -4166,7 +4307,7 @@ int vfs_link(struct dentry *old_dentry,
+@@ -4168,7 +4309,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.82/fs/namei.c linux-4.9.82-vs2.3.9.7/fs/namei.c
return -EPERM;
/*
* Updating the link count will likely cause i_uid and i_gid to
-@@ -4696,6 +4837,326 @@ const char *vfs_get_link(struct dentry *
+@@ -4698,6 +4839,326 @@ const char *vfs_get_link(struct dentry *
}
EXPORT_SYMBOL(vfs_get_link);
@@ -4425,9 +4425,9 @@ diff -NurpP --minimal linux-4.9.82/fs/namei.c linux-4.9.82-vs2.3.9.7/fs/namei.c
/* 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.82/fs/namespace.c linux-4.9.82-vs2.3.9.7/fs/namespace.c
---- linux-4.9.82/fs/namespace.c 2018-02-22 21:18:47.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/namespace.c 2018-01-13 01:17:24.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/namespace.c linux-4.9.135-vs2.3.9.8/fs/namespace.c
+--- linux-4.9.135/fs/namespace.c 2018-10-20 10:39:17.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/fs/namespace.c 2018-10-20 05:55:43.000000000 +0000
@@ -24,6 +24,11 @@
#include <linux/magic.h>
#include <linux/bootmem.h>
@@ -4440,7 +4440,7 @@ diff -NurpP --minimal linux-4.9.82/fs/namespace.c linux-4.9.82-vs2.3.9.7/fs/name
#include "pnode.h"
#include "internal.h"
-@@ -971,6 +976,10 @@ vfs_kern_mount(struct file_system_type *
+@@ -980,6 +985,10 @@ vfs_kern_mount(struct file_system_type *
if (!type)
return ERR_PTR(-ENODEV);
@@ -4451,7 +4451,7 @@ diff -NurpP --minimal linux-4.9.82/fs/namespace.c linux-4.9.82-vs2.3.9.7/fs/name
mnt = alloc_vfsmnt(name);
if (!mnt)
return ERR_PTR(-ENOMEM);
-@@ -1061,6 +1070,7 @@ static struct mount *clone_mnt(struct mo
+@@ -1071,6 +1080,7 @@ static struct mount *clone_mnt(struct mo
mnt->mnt.mnt_root = dget(root);
mnt->mnt_mountpoint = mnt->mnt.mnt_root;
mnt->mnt_parent = mnt;
@@ -4459,7 +4459,7 @@ diff -NurpP --minimal linux-4.9.82/fs/namespace.c linux-4.9.82-vs2.3.9.7/fs/name
lock_mount_hash();
list_add_tail(&mnt->mnt_instance, &sb->s_mounts);
unlock_mount_hash();
-@@ -1635,7 +1645,8 @@ out_unlock:
+@@ -1660,7 +1670,8 @@ out_unlock:
*/
static inline bool may_mount(void)
{
@@ -4469,7 +4469,7 @@ diff -NurpP --minimal linux-4.9.82/fs/namespace.c linux-4.9.82-vs2.3.9.7/fs/name
}
static inline bool may_mandlock(void)
-@@ -2144,6 +2155,7 @@ static int do_change_type(struct path *p
+@@ -2169,6 +2180,7 @@ static int do_change_type(struct path *p
if (err)
goto out_unlock;
}
@@ -4477,7 +4477,7 @@ diff -NurpP --minimal linux-4.9.82/fs/namespace.c linux-4.9.82-vs2.3.9.7/fs/name
lock_mount_hash();
for (m = mnt; m; m = (recurse ? next_mnt(m, mnt) : NULL))
-@@ -2172,12 +2184,14 @@ static bool has_locked_children(struct m
+@@ -2197,12 +2209,14 @@ static bool has_locked_children(struct m
* do loopback mount.
*/
static int do_loopback(struct path *path, const char *old_name,
@@ -4493,7 +4493,7 @@ diff -NurpP --minimal linux-4.9.82/fs/namespace.c linux-4.9.82-vs2.3.9.7/fs/name
if (!old_name || !*old_name)
return -EINVAL;
err = kern_path(old_name, LOOKUP_FOLLOW|LOOKUP_AUTOMOUNT, &old_path);
-@@ -2257,7 +2271,7 @@ static int change_mount_flags(struct vfs
+@@ -2282,7 +2296,7 @@ static int change_mount_flags(struct vfs
* on it - tough luck.
*/
static int do_remount(struct path *path, int flags, int mnt_flags,
@@ -4502,7 +4502,7 @@ diff -NurpP --minimal linux-4.9.82/fs/namespace.c linux-4.9.82-vs2.3.9.7/fs/name
{
int err;
struct super_block *sb = path->mnt->mnt_sb;
-@@ -2742,6 +2756,7 @@ long do_mount(const char *dev_name, cons
+@@ -2767,6 +2781,7 @@ long do_mount(const char *dev_name, cons
struct path path;
int retval = 0;
int mnt_flags = 0;
@@ -4510,7 +4510,7 @@ diff -NurpP --minimal linux-4.9.82/fs/namespace.c linux-4.9.82-vs2.3.9.7/fs/name
/* Discard magic */
if ((flags & MS_MGC_MSK) == MS_MGC_VAL)
-@@ -2769,6 +2784,12 @@ long do_mount(const char *dev_name, cons
+@@ -2794,6 +2809,12 @@ long do_mount(const char *dev_name, cons
if (!(flags & MS_NOATIME))
mnt_flags |= MNT_RELATIME;
@@ -4523,7 +4523,7 @@ diff -NurpP --minimal linux-4.9.82/fs/namespace.c linux-4.9.82-vs2.3.9.7/fs/name
/* Separate the per-mountpoint flags */
if (flags & MS_NOSUID)
mnt_flags |= MNT_NOSUID;
-@@ -2793,15 +2814,18 @@ long do_mount(const char *dev_name, cons
+@@ -2818,15 +2839,18 @@ long do_mount(const char *dev_name, cons
mnt_flags |= path.mnt->mnt_flags & MNT_ATIME_MASK;
}
@@ -4544,7 +4544,7 @@ diff -NurpP --minimal linux-4.9.82/fs/namespace.c linux-4.9.82-vs2.3.9.7/fs/name
else if (flags & (MS_SHARED | MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE))
retval = do_change_type(&path, flags);
else if (flags & MS_MOVE)
-@@ -2942,6 +2966,7 @@ struct mnt_namespace *copy_mnt_ns(unsign
+@@ -2967,6 +2991,7 @@ struct mnt_namespace *copy_mnt_ns(unsign
p = next_mnt(p, old);
}
namespace_unlock();
@@ -4552,7 +4552,7 @@ diff -NurpP --minimal linux-4.9.82/fs/namespace.c linux-4.9.82-vs2.3.9.7/fs/name
if (rootmnt)
mntput(rootmnt);
-@@ -3117,9 +3142,10 @@ SYSCALL_DEFINE2(pivot_root, const char _
+@@ -3142,9 +3167,10 @@ SYSCALL_DEFINE2(pivot_root, const char _
new_mnt = real_mount(new.mnt);
root_mnt = real_mount(root.mnt);
old_mnt = real_mount(old.mnt);
@@ -4565,7 +4565,7 @@ diff -NurpP --minimal linux-4.9.82/fs/namespace.c linux-4.9.82-vs2.3.9.7/fs/name
goto out4;
if (!check_mnt(root_mnt) || !check_mnt(new_mnt))
goto out4;
-@@ -3257,6 +3283,7 @@ void put_mnt_ns(struct mnt_namespace *ns
+@@ -3282,6 +3308,7 @@ void put_mnt_ns(struct mnt_namespace *ns
if (!atomic_dec_and_test(&ns->count))
return;
drop_collected_mounts(&ns->root->mnt);
@@ -4573,9 +4573,9 @@ diff -NurpP --minimal linux-4.9.82/fs/namespace.c linux-4.9.82-vs2.3.9.7/fs/name
free_mnt_ns(ns);
}
-diff -NurpP --minimal linux-4.9.82/fs/nfs/client.c linux-4.9.82-vs2.3.9.7/fs/nfs/client.c
---- linux-4.9.82/fs/nfs/client.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/nfs/client.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/nfs/client.c linux-4.9.135-vs2.3.9.8/fs/nfs/client.c
+--- linux-4.9.135/fs/nfs/client.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/fs/nfs/client.c 2018-10-20 04:58:14.000000000 +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.82/fs/nfs/client.c linux-4.9.82-vs2.3.9.7/fs/nfs
server->maxfilesize = fsinfo->maxfilesize;
server->time_delta = fsinfo->time_delta;
-diff -NurpP --minimal linux-4.9.82/fs/nfs/dir.c linux-4.9.82-vs2.3.9.7/fs/nfs/dir.c
---- linux-4.9.82/fs/nfs/dir.c 2018-02-22 21:18:47.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/nfs/dir.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/nfs/dir.c linux-4.9.135-vs2.3.9.8/fs/nfs/dir.c
+--- linux-4.9.135/fs/nfs/dir.c 2018-10-20 10:39:17.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/fs/nfs/dir.c 2018-10-20 04:58:14.000000000 +0000
@@ -37,6 +37,7 @@
#include <linux/sched.h>
#include <linux/kmemleak.h>
@@ -4616,9 +4616,9 @@ diff -NurpP --minimal linux-4.9.82/fs/nfs/dir.c linux-4.9.82-vs2.3.9.7/fs/nfs/di
no_entry:
res = d_splice_alias(inode, dentry);
if (res != NULL) {
-diff -NurpP --minimal linux-4.9.82/fs/nfs/inode.c linux-4.9.82-vs2.3.9.7/fs/nfs/inode.c
---- linux-4.9.82/fs/nfs/inode.c 2018-02-22 21:18:47.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/nfs/inode.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/nfs/inode.c linux-4.9.135-vs2.3.9.8/fs/nfs/inode.c
+--- linux-4.9.135/fs/nfs/inode.c 2018-10-20 10:39:17.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/fs/nfs/inode.c 2018-10-20 04:58:14.000000000 +0000
@@ -38,6 +38,7 @@
#include <linux/slab.h>
#include <linux/compat.h>
@@ -4744,9 +4744,9 @@ diff -NurpP --minimal linux-4.9.82/fs/nfs/inode.c linux-4.9.82-vs2.3.9.7/fs/nfs/
if (fattr->valid & NFS_ATTR_FATTR_NLINK) {
if (inode->i_nlink != fattr->nlink) {
invalid |= NFS_INO_INVALID_ATTR;
-diff -NurpP --minimal linux-4.9.82/fs/nfs/nfs3xdr.c linux-4.9.82-vs2.3.9.7/fs/nfs/nfs3xdr.c
---- linux-4.9.82/fs/nfs/nfs3xdr.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/nfs/nfs3xdr.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/nfs/nfs3xdr.c linux-4.9.135-vs2.3.9.8/fs/nfs/nfs3xdr.c
+--- linux-4.9.135/fs/nfs/nfs3xdr.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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.82/fs/nfs/nfs3xdr.c linux-4.9.82-vs2.3.9.7/fs/nf
}
/*
-diff -NurpP --minimal linux-4.9.82/fs/nfs/super.c linux-4.9.82-vs2.3.9.7/fs/nfs/super.c
---- linux-4.9.82/fs/nfs/super.c 2018-02-22 21:18:48.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/nfs/super.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/nfs/super.c linux-4.9.135-vs2.3.9.8/fs/nfs/super.c
+--- linux-4.9.135/fs/nfs/super.c 2018-10-20 10:39:17.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/fs/nfs/super.c 2018-10-20 04:58:14.000000000 +0000
@@ -54,6 +54,7 @@
#include <linux/parser.h>
#include <linux/nsproxy.h>
@@ -4968,9 +4968,9 @@ diff -NurpP --minimal linux-4.9.82/fs/nfs/super.c linux-4.9.82-vs2.3.9.7/fs/nfs/
/*
* options that take text values
-diff -NurpP --minimal linux-4.9.82/fs/nfsd/auth.c linux-4.9.82-vs2.3.9.7/fs/nfsd/auth.c
---- linux-4.9.82/fs/nfsd/auth.c 2018-02-22 21:18:48.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/nfsd/auth.c 2018-02-10 15:15:43.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/nfsd/auth.c linux-4.9.135-vs2.3.9.8/fs/nfsd/auth.c
+--- linux-4.9.135/fs/nfsd/auth.c 2018-10-20 10:39:18.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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.82/fs/nfsd/auth.c linux-4.9.82-vs2.3.9.7/fs/nfsd
rqgi = rqstp->rq_cred.cr_group_info;
-diff -NurpP --minimal linux-4.9.82/fs/nfsd/nfs3xdr.c linux-4.9.82-vs2.3.9.7/fs/nfsd/nfs3xdr.c
---- linux-4.9.82/fs/nfsd/nfs3xdr.c 2018-02-22 21:18:48.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/nfsd/nfs3xdr.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/nfsd/nfs3xdr.c linux-4.9.135-vs2.3.9.8/fs/nfsd/nfs3xdr.c
+--- linux-4.9.135/fs/nfsd/nfs3xdr.c 2018-10-20 10:39:18.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/fs/nfsd/nfs3xdr.c 2018-10-20 04:58:14.000000000 +0000
@@ -8,6 +8,7 @@
#include <linux/namei.h>
@@ -5045,9 +5045,9 @@ diff -NurpP --minimal linux-4.9.82/fs/nfsd/nfs3xdr.c linux-4.9.82-vs2.3.9.7/fs/n
if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) {
p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN);
} else {
-diff -NurpP --minimal linux-4.9.82/fs/nfsd/nfs4xdr.c linux-4.9.82-vs2.3.9.7/fs/nfsd/nfs4xdr.c
---- linux-4.9.82/fs/nfsd/nfs4xdr.c 2018-02-22 21:18:48.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/nfsd/nfs4xdr.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/nfsd/nfs4xdr.c linux-4.9.135-vs2.3.9.8/fs/nfsd/nfs4xdr.c
+--- linux-4.9.135/fs/nfsd/nfs4xdr.c 2018-10-20 10:39:18.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/fs/nfsd/nfs4xdr.c 2018-10-20 05:55:43.000000000 +0000
@@ -40,6 +40,7 @@
#include <linux/utsname.h>
#include <linux/pagemap.h>
@@ -5056,7 +5056,7 @@ diff -NurpP --minimal linux-4.9.82/fs/nfsd/nfs4xdr.c linux-4.9.82-vs2.3.9.7/fs/n
#include "idmap.h"
#include "acl.h"
-@@ -2677,12 +2678,16 @@ out_acl:
+@@ -2679,12 +2680,16 @@ out_acl:
*p++ = cpu_to_be32(stat.nlink);
}
if (bmval1 & FATTR4_WORD1_OWNER) {
@@ -5075,9 +5075,9 @@ diff -NurpP --minimal linux-4.9.82/fs/nfsd/nfs4xdr.c linux-4.9.82-vs2.3.9.7/fs/n
if (status)
goto out;
}
-diff -NurpP --minimal linux-4.9.82/fs/nfsd/nfsxdr.c linux-4.9.82-vs2.3.9.7/fs/nfsd/nfsxdr.c
---- linux-4.9.82/fs/nfsd/nfsxdr.c 2018-02-22 21:18:48.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/nfsd/nfsxdr.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/nfsd/nfsxdr.c linux-4.9.135-vs2.3.9.8/fs/nfsd/nfsxdr.c
+--- linux-4.9.135/fs/nfsd/nfsxdr.c 2018-10-20 10:39:18.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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.82/fs/nfsd/nfsxdr.c linux-4.9.82-vs2.3.9.7/fs/nf
if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
*p++ = htonl(NFS_MAXPATHLEN);
-diff -NurpP --minimal linux-4.9.82/fs/ocfs2/dlmglue.c linux-4.9.82-vs2.3.9.7/fs/ocfs2/dlmglue.c
---- linux-4.9.82/fs/ocfs2/dlmglue.c 2018-02-22 21:18:49.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/ocfs2/dlmglue.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/ocfs2/dlmglue.c linux-4.9.135-vs2.3.9.8/fs/ocfs2/dlmglue.c
+--- linux-4.9.135/fs/ocfs2/dlmglue.c 2018-10-20 10:39:18.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/fs/ocfs2/dlmglue.c 2018-10-20 04:58:14.000000000 +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.82/fs/ocfs2/dlmglue.c linux-4.9.82-vs2.3.9.7/fs/
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.82/fs/ocfs2/dlmglue.h linux-4.9.82-vs2.3.9.7/fs/ocfs2/dlmglue.h
---- linux-4.9.82/fs/ocfs2/dlmglue.h 2018-02-22 21:18:49.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/ocfs2/dlmglue.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/ocfs2/dlmglue.h linux-4.9.135-vs2.3.9.8/fs/ocfs2/dlmglue.h
+--- linux-4.9.135/fs/ocfs2/dlmglue.h 2018-10-20 10:39:18.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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.82/fs/ocfs2/dlmglue.h linux-4.9.82-vs2.3.9.7/fs/
};
#define OCFS2_QINFO_LVB_VERSION 1
-diff -NurpP --minimal linux-4.9.82/fs/ocfs2/file.c linux-4.9.82-vs2.3.9.7/fs/ocfs2/file.c
---- linux-4.9.82/fs/ocfs2/file.c 2018-02-22 21:18:49.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/ocfs2/file.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/ocfs2/file.c linux-4.9.135-vs2.3.9.8/fs/ocfs2/file.c
+--- linux-4.9.135/fs/ocfs2/file.c 2018-10-20 10:39:18.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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.82/fs/ocfs2/file.c linux-4.9.82-vs2.3.9.7/fs/ocf
if (!(attr->ia_valid & OCFS2_VALID_ATTRS))
return 0;
-diff -NurpP --minimal linux-4.9.82/fs/ocfs2/inode.c linux-4.9.82-vs2.3.9.7/fs/ocfs2/inode.c
---- linux-4.9.82/fs/ocfs2/inode.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/ocfs2/inode.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/ocfs2/inode.c linux-4.9.135-vs2.3.9.8/fs/ocfs2/inode.c
+--- linux-4.9.135/fs/ocfs2/inode.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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.82/fs/ocfs2/inode.c linux-4.9.82-vs2.3.9.7/fs/oc
/* 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.82/fs/ocfs2/inode.h linux-4.9.82-vs2.3.9.7/fs/ocfs2/inode.h
---- linux-4.9.82/fs/ocfs2/inode.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/ocfs2/inode.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/ocfs2/inode.h linux-4.9.135-vs2.3.9.8/fs/ocfs2/inode.h
+--- linux-4.9.135/fs/ocfs2/inode.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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.82/fs/ocfs2/inode.h linux-4.9.82-vs2.3.9.7/fs/oc
static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode)
{
-diff -NurpP --minimal linux-4.9.82/fs/ocfs2/ioctl.c linux-4.9.82-vs2.3.9.7/fs/ocfs2/ioctl.c
---- linux-4.9.82/fs/ocfs2/ioctl.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/ocfs2/ioctl.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/ocfs2/ioctl.c linux-4.9.135-vs2.3.9.8/fs/ocfs2/ioctl.c
+--- linux-4.9.135/fs/ocfs2/ioctl.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/fs/ocfs2/ioctl.c 2018-10-20 04:58:14.000000000 +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.82/fs/ocfs2/ioctl.c linux-4.9.82-vs2.3.9.7/fs/oc
long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
struct inode *inode = file_inode(filp);
-diff -NurpP --minimal linux-4.9.82/fs/ocfs2/namei.c linux-4.9.82-vs2.3.9.7/fs/ocfs2/namei.c
---- linux-4.9.82/fs/ocfs2/namei.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/ocfs2/namei.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/ocfs2/namei.c linux-4.9.135-vs2.3.9.8/fs/ocfs2/namei.c
+--- linux-4.9.135/fs/ocfs2/namei.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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.82/fs/ocfs2/namei.c linux-4.9.82-vs2.3.9.7/fs/oc
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.82/fs/ocfs2/ocfs2.h linux-4.9.82-vs2.3.9.7/fs/ocfs2/ocfs2.h
---- linux-4.9.82/fs/ocfs2/ocfs2.h 2018-02-22 21:18:49.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/ocfs2/ocfs2.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/ocfs2/ocfs2.h linux-4.9.135-vs2.3.9.8/fs/ocfs2/ocfs2.h
+--- linux-4.9.135/fs/ocfs2/ocfs2.h 2018-10-20 10:39:18.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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 */
@@ -5395,9 +5395,9 @@ diff -NurpP --minimal linux-4.9.82/fs/ocfs2/ocfs2.h linux-4.9.82-vs2.3.9.7/fs/oc
};
#define OCFS2_OSB_SOFT_RO 0x0001
-diff -NurpP --minimal linux-4.9.82/fs/ocfs2/ocfs2_fs.h linux-4.9.82-vs2.3.9.7/fs/ocfs2/ocfs2_fs.h
---- linux-4.9.82/fs/ocfs2/ocfs2_fs.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/ocfs2/ocfs2_fs.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/ocfs2/ocfs2_fs.h linux-4.9.135-vs2.3.9.8/fs/ocfs2/ocfs2_fs.h
+--- linux-4.9.135/fs/ocfs2/ocfs2_fs.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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 */
@@ -5410,9 +5410,9 @@ diff -NurpP --minimal linux-4.9.82/fs/ocfs2/ocfs2_fs.h linux-4.9.82-vs2.3.9.7/fs
#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.82/fs/ocfs2/super.c linux-4.9.82-vs2.3.9.7/fs/ocfs2/super.c
---- linux-4.9.82/fs/ocfs2/super.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/ocfs2/super.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/ocfs2/super.c linux-4.9.135-vs2.3.9.8/fs/ocfs2/super.c
+--- linux-4.9.135/fs/ocfs2/super.c 2018-10-20 10:39:18.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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,
@@ -5431,7 +5431,7 @@ diff -NurpP --minimal linux-4.9.82/fs/ocfs2/super.c linux-4.9.82-vs2.3.9.7/fs/oc
{Opt_err, NULL}
};
-@@ -673,6 +677,13 @@ static int ocfs2_remount(struct super_bl
+@@ -672,6 +676,13 @@ static int ocfs2_remount(struct super_bl
goto out;
}
@@ -5445,7 +5445,7 @@ diff -NurpP --minimal linux-4.9.82/fs/ocfs2/super.c linux-4.9.82-vs2.3.9.7/fs/oc
/* We're going to/from readonly mode. */
if ((*flags & MS_RDONLY) != (sb->s_flags & MS_RDONLY)) {
/* Disable quota accounting before remounting RO */
-@@ -1162,6 +1173,9 @@ static int ocfs2_fill_super(struct super
+@@ -1161,6 +1172,9 @@ static int ocfs2_fill_super(struct super
ocfs2_complete_mount_recovery(osb);
@@ -5455,7 +5455,7 @@ diff -NurpP --minimal linux-4.9.82/fs/ocfs2/super.c linux-4.9.82-vs2.3.9.7/fs/oc
if (ocfs2_mount_local(osb))
snprintf(nodestr, sizeof(nodestr), "local");
else
-@@ -1481,6 +1495,20 @@ static int ocfs2_parse_options(struct su
+@@ -1480,6 +1494,20 @@ static int ocfs2_parse_options(struct su
case Opt_journal_async_commit:
mopt->mount_opt |= OCFS2_MOUNT_JOURNAL_ASYNC_COMMIT;
break;
@@ -5476,9 +5476,9 @@ diff -NurpP --minimal linux-4.9.82/fs/ocfs2/super.c linux-4.9.82-vs2.3.9.7/fs/oc
default:
mlog(ML_ERROR,
"Unrecognized mount option \"%s\" "
-diff -NurpP --minimal linux-4.9.82/fs/open.c linux-4.9.82-vs2.3.9.7/fs/open.c
---- linux-4.9.82/fs/open.c 2018-02-22 21:18:49.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/open.c 2018-01-13 22:17:33.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/open.c linux-4.9.135-vs2.3.9.8/fs/open.c
+--- linux-4.9.135/fs/open.c 2018-10-20 10:39:18.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/fs/open.c 2018-10-20 04:58:14.000000000 +0000
@@ -31,6 +31,11 @@
#include <linux/ima.h>
#include <linux/dnotify.h>
@@ -5553,10 +5553,10 @@ diff -NurpP --minimal linux-4.9.82/fs/open.c linux-4.9.82-vs2.3.9.7/fs/open.c
error = chown_common(&path, user, group);
mnt_drop_write(path.mnt);
out_release:
-diff -NurpP --minimal linux-4.9.82/fs/proc/array.c linux-4.9.82-vs2.3.9.7/fs/proc/array.c
---- linux-4.9.82/fs/proc/array.c 2018-02-22 21:18:51.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/proc/array.c 2018-01-25 00:21:32.000000000 +0000
-@@ -85,6 +85,8 @@
+diff -NurpP --minimal linux-4.9.135/fs/proc/array.c linux-4.9.135-vs2.3.9.8/fs/proc/array.c
+--- linux-4.9.135/fs/proc/array.c 2018-10-20 10:39:18.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/fs/proc/array.c 2018-10-20 04:58:14.000000000 +0000
+@@ -86,6 +86,8 @@
#include <linux/string_helpers.h>
#include <linux/user_namespace.h>
#include <linux/fs_struct.h>
@@ -5565,7 +5565,7 @@ diff -NurpP --minimal linux-4.9.82/fs/proc/array.c linux-4.9.82-vs2.3.9.7/fs/pro
#include <asm/pgtable.h>
#include <asm/processor.h>
-@@ -169,6 +171,9 @@ static inline void task_state(struct seq
+@@ -170,6 +172,9 @@ static inline void task_state(struct seq
ppid = pid_alive(p) ?
task_tgid_nr_ns(rcu_dereference(p->real_parent), ns) : 0;
@@ -5575,7 +5575,7 @@ diff -NurpP --minimal linux-4.9.82/fs/proc/array.c linux-4.9.82-vs2.3.9.7/fs/pro
tracer = ptrace_parent(p);
if (tracer)
tpid = task_pid_nr_ns(tracer, ns);
-@@ -306,8 +311,8 @@ static inline void task_sig(struct seq_f
+@@ -307,8 +312,8 @@ static inline void task_sig(struct seq_f
render_sigset_t(m, "SigCgt:\t", &caught);
}
@@ -5586,7 +5586,7 @@ diff -NurpP --minimal linux-4.9.82/fs/proc/array.c linux-4.9.82-vs2.3.9.7/fs/pro
{
unsigned __capi;
-@@ -334,11 +339,12 @@ static inline void task_cap(struct seq_f
+@@ -335,11 +340,12 @@ static inline void task_cap(struct seq_f
cap_ambient = cred->cap_ambient;
rcu_read_unlock();
@@ -5604,7 +5604,7 @@ diff -NurpP --minimal linux-4.9.82/fs/proc/array.c linux-4.9.82-vs2.3.9.7/fs/pro
}
static inline void task_seccomp(struct seq_file *m, struct task_struct *p)
-@@ -365,6 +371,43 @@ static void task_cpus_allowed(struct seq
+@@ -390,6 +396,43 @@ static void task_cpus_allowed(struct seq
cpumask_pr_args(&task->cpus_allowed));
}
@@ -5648,7 +5648,7 @@ diff -NurpP --minimal linux-4.9.82/fs/proc/array.c linux-4.9.82-vs2.3.9.7/fs/pro
int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
struct pid *pid, struct task_struct *task)
{
-@@ -382,6 +425,7 @@ int proc_pid_status(struct seq_file *m,
+@@ -407,6 +450,7 @@ int proc_pid_status(struct seq_file *m,
task_seccomp(m, task);
task_cpus_allowed(m, task);
cpuset_task_status_allowed(m, task);
@@ -5656,7 +5656,7 @@ diff -NurpP --minimal linux-4.9.82/fs/proc/array.c linux-4.9.82-vs2.3.9.7/fs/pro
task_context_switch_counts(m, task);
return 0;
}
-@@ -497,6 +541,17 @@ static int do_task_stat(struct seq_file
+@@ -522,6 +566,17 @@ static int do_task_stat(struct seq_file
/* convert nsec -> ticks */
start_time = nsec_to_clock_t(task->real_start_time);
@@ -5674,9 +5674,9 @@ diff -NurpP --minimal linux-4.9.82/fs/proc/array.c linux-4.9.82-vs2.3.9.7/fs/pro
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.82/fs/proc/base.c linux-4.9.82-vs2.3.9.7/fs/proc/base.c
---- linux-4.9.82/fs/proc/base.c 2018-02-22 21:18:51.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/proc/base.c 2018-01-13 01:59:11.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/proc/base.c linux-4.9.135-vs2.3.9.8/fs/proc/base.c
+--- linux-4.9.135/fs/proc/base.c 2018-10-20 10:39:18.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/fs/proc/base.c 2018-10-20 05:55:43.000000000 +0000
@@ -87,6 +87,8 @@
#include <linux/slab.h>
#include <linux/flex_array.h>
@@ -5686,7 +5686,7 @@ diff -NurpP --minimal linux-4.9.82/fs/proc/base.c linux-4.9.82-vs2.3.9.7/fs/proc
#ifdef CONFIG_HARDWALL
#include <asm/hardwall.h>
#endif
-@@ -1063,10 +1065,15 @@ static int __set_oom_adj(struct file *fi
+@@ -1079,10 +1081,15 @@ static int __set_oom_adj(struct file *fi
mutex_lock(&oom_adj_mutex);
if (legacy) {
if (oom_adj < task->signal->oom_score_adj &&
@@ -5703,7 +5703,7 @@ diff -NurpP --minimal linux-4.9.82/fs/proc/base.c linux-4.9.82-vs2.3.9.7/fs/proc
/*
* /proc/pid/oom_adj is provided for legacy purposes, ask users to use
* /proc/pid/oom_score_adj instead.
-@@ -1696,6 +1703,8 @@ struct inode *proc_pid_make_inode(struct
+@@ -1712,6 +1719,8 @@ struct inode *proc_pid_make_inode(struct
inode->i_gid = cred->egid;
rcu_read_unlock();
}
@@ -5712,7 +5712,7 @@ diff -NurpP --minimal linux-4.9.82/fs/proc/base.c linux-4.9.82-vs2.3.9.7/fs/proc
security_task_to_inode(task, inode);
out:
-@@ -1741,6 +1750,8 @@ int pid_getattr(struct vfsmount *mnt, st
+@@ -1757,6 +1766,8 @@ int pid_getattr(struct vfsmount *mnt, st
/* dentry stuff */
@@ -5721,7 +5721,7 @@ diff -NurpP --minimal linux-4.9.82/fs/proc/base.c linux-4.9.82-vs2.3.9.7/fs/proc
/*
* Exceptional case: normally we are not allowed to unhash a busy
* directory. In this case, however, we can do it - no aliasing problems
-@@ -1769,6 +1780,19 @@ int pid_revalidate(struct dentry *dentry
+@@ -1785,6 +1796,19 @@ int pid_revalidate(struct dentry *dentry
task = get_proc_task(inode);
if (task) {
@@ -5741,7 +5741,7 @@ diff -NurpP --minimal linux-4.9.82/fs/proc/base.c linux-4.9.82-vs2.3.9.7/fs/proc
if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
task_dumpable(task)) {
rcu_read_lock();
-@@ -2408,6 +2432,13 @@ static struct dentry *proc_pident_lookup
+@@ -2449,6 +2473,13 @@ static struct dentry *proc_pident_lookup
if (!task)
goto out_no_task;
@@ -5755,7 +5755,7 @@ diff -NurpP --minimal linux-4.9.82/fs/proc/base.c linux-4.9.82-vs2.3.9.7/fs/proc
/*
* Yes, it does not scale. And it should not. Don't add
* new entries into /proc/<tgid>/ without very good reasons.
-@@ -2847,6 +2878,11 @@ static int proc_pid_personality(struct s
+@@ -2888,6 +2919,11 @@ static int proc_pid_personality(struct s
static const struct file_operations proc_task_operations;
static const struct inode_operations proc_task_inode_operations;
@@ -5767,7 +5767,7 @@ diff -NurpP --minimal linux-4.9.82/fs/proc/base.c linux-4.9.82-vs2.3.9.7/fs/proc
static const struct pid_entry tgid_base_stuff[] = {
DIR("task", S_IRUGO|S_IXUGO, proc_task_inode_operations, proc_task_operations),
DIR("fd", S_IRUSR|S_IXUSR, proc_fd_inode_operations, proc_fd_operations),
-@@ -2911,6 +2947,8 @@ static const struct pid_entry tgid_base_
+@@ -2952,6 +2988,8 @@ static const struct pid_entry tgid_base_
#ifdef CONFIG_CGROUPS
ONE("cgroup", S_IRUGO, proc_cgroup_show),
#endif
@@ -5776,7 +5776,7 @@ diff -NurpP --minimal linux-4.9.82/fs/proc/base.c linux-4.9.82-vs2.3.9.7/fs/proc
ONE("oom_score", S_IRUGO, proc_oom_score),
REG("oom_adj", S_IRUGO|S_IWUSR, proc_oom_adj_operations),
REG("oom_score_adj", S_IRUGO|S_IWUSR, proc_oom_score_adj_operations),
-@@ -3126,7 +3164,7 @@ retry:
+@@ -3167,7 +3205,7 @@ retry:
iter.task = NULL;
pid = find_ge_pid(iter.tgid, ns);
if (pid) {
@@ -5785,7 +5785,7 @@ diff -NurpP --minimal linux-4.9.82/fs/proc/base.c linux-4.9.82-vs2.3.9.7/fs/proc
iter.task = pid_task(pid, PIDTYPE_PID);
/* What we to know is if the pid we have find is the
* pid of a thread_group_leader. Testing for task
-@@ -3186,8 +3224,10 @@ int proc_pid_readdir(struct file *file,
+@@ -3227,8 +3265,10 @@ int proc_pid_readdir(struct file *file,
if (!has_pid_permissions(ns, iter.task, 2))
continue;
@@ -5797,7 +5797,7 @@ diff -NurpP --minimal linux-4.9.82/fs/proc/base.c linux-4.9.82-vs2.3.9.7/fs/proc
if (!proc_fill_cache(file, ctx, name, len,
proc_pid_instantiate, iter.task, NULL)) {
put_task_struct(iter.task);
-@@ -3324,6 +3364,7 @@ static const struct pid_entry tid_base_s
+@@ -3365,6 +3405,7 @@ static const struct pid_entry tid_base_s
REG("projid_map", S_IRUGO|S_IWUSR, proc_projid_map_operations),
REG("setgroups", S_IRUGO|S_IWUSR, proc_setgroups_operations),
#endif
@@ -5805,7 +5805,7 @@ diff -NurpP --minimal linux-4.9.82/fs/proc/base.c linux-4.9.82-vs2.3.9.7/fs/proc
};
static int proc_tid_base_readdir(struct file *file, struct dir_context *ctx)
-@@ -3390,6 +3431,8 @@ static struct dentry *proc_task_lookup(s
+@@ -3431,6 +3472,8 @@ static struct dentry *proc_task_lookup(s
tid = name_to_int(&dentry->d_name);
if (tid == ~0U)
goto out;
@@ -5814,9 +5814,9 @@ diff -NurpP --minimal linux-4.9.82/fs/proc/base.c linux-4.9.82-vs2.3.9.7/fs/proc
ns = dentry->d_sb->s_fs_info;
rcu_read_lock();
-diff -NurpP --minimal linux-4.9.82/fs/proc/generic.c linux-4.9.82-vs2.3.9.7/fs/proc/generic.c
---- linux-4.9.82/fs/proc/generic.c 2018-02-22 21:18:51.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/proc/generic.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/proc/generic.c linux-4.9.135-vs2.3.9.8/fs/proc/generic.c
+--- linux-4.9.135/fs/proc/generic.c 2018-10-20 10:39:18.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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,10 +5891,10 @@ diff -NurpP --minimal linux-4.9.82/fs/proc/generic.c linux-4.9.82-vs2.3.9.7/fs/p
} else {
kfree(ent);
ent = NULL;
-diff -NurpP --minimal linux-4.9.82/fs/proc/inode.c linux-4.9.82-vs2.3.9.7/fs/proc/inode.c
---- linux-4.9.82/fs/proc/inode.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/proc/inode.c 2018-01-10 02:50:49.000000000 +0000
-@@ -432,6 +432,8 @@ struct inode *proc_get_inode(struct supe
+diff -NurpP --minimal linux-4.9.135/fs/proc/inode.c linux-4.9.135-vs2.3.9.8/fs/proc/inode.c
+--- linux-4.9.135/fs/proc/inode.c 2018-10-20 10:39:18.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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.82/fs/proc/inode.c linux-4.9.82-vs2.3.9.7/fs/pro
if (de->size)
inode->i_size = de->size;
if (de->nlink)
-diff -NurpP --minimal linux-4.9.82/fs/proc/internal.h linux-4.9.82-vs2.3.9.7/fs/proc/internal.h
---- linux-4.9.82/fs/proc/internal.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/proc/internal.h 2018-01-13 01:48:13.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/proc/internal.h linux-4.9.135-vs2.3.9.8/fs/proc/internal.h
+--- linux-4.9.135/fs/proc/internal.h 2018-10-20 10:39:18.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/fs/proc/internal.h 2018-10-20 05:55:43.000000000 +0000
@@ -14,6 +14,7 @@
#include <linux/spinlock.h>
#include <linux/atomic.h>
@@ -5945,7 +5945,7 @@ diff -NurpP --minimal linux-4.9.82/fs/proc/internal.h linux-4.9.82-vs2.3.9.7/fs/
unsigned int fd;
union proc_op op;
struct proc_dir_entry *pde;
-@@ -92,11 +101,16 @@ static inline struct pid *proc_pid(struc
+@@ -93,11 +102,16 @@ static inline struct pid *proc_pid(struc
return PROC_I(inode)->pid;
}
@@ -5963,7 +5963,7 @@ diff -NurpP --minimal linux-4.9.82/fs/proc/internal.h linux-4.9.82-vs2.3.9.7/fs/
static inline int task_dumpable(struct task_struct *task)
{
int dumpable = 0;
-@@ -155,6 +169,8 @@ extern int proc_pid_status(struct seq_fi
+@@ -156,6 +170,8 @@ extern int proc_pid_status(struct seq_fi
struct pid *, struct task_struct *);
extern int proc_pid_statm(struct seq_file *, struct pid_namespace *,
struct pid *, struct task_struct *);
@@ -5972,9 +5972,9 @@ diff -NurpP --minimal linux-4.9.82/fs/proc/internal.h linux-4.9.82-vs2.3.9.7/fs/
/*
* base.c
-diff -NurpP --minimal linux-4.9.82/fs/proc/loadavg.c linux-4.9.82-vs2.3.9.7/fs/proc/loadavg.c
---- linux-4.9.82/fs/proc/loadavg.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/proc/loadavg.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/proc/loadavg.c linux-4.9.135-vs2.3.9.8/fs/proc/loadavg.c
+--- linux-4.9.135/fs/proc/loadavg.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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.82/fs/proc/loadavg.c linux-4.9.82-vs2.3.9.7/fs/p
task_active_pid_ns(current)->last_pid);
return 0;
}
-diff -NurpP --minimal linux-4.9.82/fs/proc/meminfo.c linux-4.9.82-vs2.3.9.7/fs/proc/meminfo.c
---- linux-4.9.82/fs/proc/meminfo.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/proc/meminfo.c 2018-01-13 01:55:40.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/proc/meminfo.c linux-4.9.135-vs2.3.9.8/fs/proc/meminfo.c
+--- linux-4.9.135/fs/proc/meminfo.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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.82/fs/proc/meminfo.c linux-4.9.82-vs2.3.9.7/fs/p
total_swapcache_pages() - i.bufferram;
if (cached < 0)
cached = 0;
-diff -NurpP --minimal linux-4.9.82/fs/proc/root.c linux-4.9.82-vs2.3.9.7/fs/proc/root.c
---- linux-4.9.82/fs/proc/root.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/proc/root.c 2018-01-13 01:48:57.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/proc/root.c linux-4.9.135-vs2.3.9.8/fs/proc/root.c
+--- linux-4.9.135/fs/proc/root.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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.82/fs/proc/root.c linux-4.9.82-vs2.3.9.7/fs/proc
.subdir = RB_ROOT,
.name = "/proc",
};
-diff -NurpP --minimal linux-4.9.82/fs/proc/self.c linux-4.9.82-vs2.3.9.7/fs/proc/self.c
---- linux-4.9.82/fs/proc/self.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/proc/self.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/proc/self.c linux-4.9.135-vs2.3.9.8/fs/proc/self.c
+--- linux-4.9.135/fs/proc/self.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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.82/fs/proc/self.c linux-4.9.82-vs2.3.9.7/fs/proc
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.82/fs/proc/stat.c linux-4.9.82-vs2.3.9.7/fs/proc/stat.c
---- linux-4.9.82/fs/proc/stat.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/proc/stat.c 2018-01-16 00:55:05.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/proc/stat.c linux-4.9.135-vs2.3.9.8/fs/proc/stat.c
+--- linux-4.9.135/fs/proc/stat.c 2018-10-20 10:39:18.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/fs/proc/stat.c 2018-10-20 11:46:17.000000000 +0000
@@ -9,8 +9,10 @@
#include <linux/slab.h>
#include <linux/time.h>
@@ -6120,9 +6120,9 @@ diff -NurpP --minimal linux-4.9.82/fs/proc/stat.c linux-4.9.82-vs2.3.9.7/fs/proc
/* 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.82/fs/proc/uptime.c linux-4.9.82-vs2.3.9.7/fs/proc/uptime.c
---- linux-4.9.82/fs/proc/uptime.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/proc/uptime.c 2018-01-16 00:56:48.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/proc/uptime.c linux-4.9.135-vs2.3.9.8/fs/proc/uptime.c
+--- linux-4.9.135/fs/proc/uptime.c 2018-10-20 10:39:18.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/fs/proc/uptime.c 2018-10-20 11:47:26.000000000 +0000
@@ -5,6 +5,7 @@
#include <linux/seq_file.h>
#include <linux/time.h>
@@ -6131,8 +6131,8 @@ diff -NurpP --minimal linux-4.9.82/fs/proc/uptime.c linux-4.9.82-vs2.3.9.7/fs/pr
static int uptime_proc_show(struct seq_file *m, void *v)
{
-@@ -24,6 +25,10 @@ static int uptime_proc_show(struct seq_f
- nsec = cputime64_to_jiffies64(idletime) * TICK_NSEC;
+@@ -21,6 +22,10 @@ static int uptime_proc_show(struct seq_f
+ get_monotonic_boottime(&uptime);
idle.tv_sec = div_u64_rem(nsec, NSEC_PER_SEC, &rem);
idle.tv_nsec = rem;
+
@@ -6142,9 +6142,9 @@ diff -NurpP --minimal linux-4.9.82/fs/proc/uptime.c linux-4.9.82-vs2.3.9.7/fs/pr
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.82/fs/proc_namespace.c linux-4.9.82-vs2.3.9.7/fs/proc_namespace.c
---- linux-4.9.82/fs/proc_namespace.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/proc_namespace.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/proc_namespace.c linux-4.9.135-vs2.3.9.8/fs/proc_namespace.c
+--- linux-4.9.135/fs/proc_namespace.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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" },
@@ -6258,9 +6258,9 @@ diff -NurpP --minimal linux-4.9.82/fs/proc_namespace.c linux-4.9.82-vs2.3.9.7/fs
/* file system type */
seq_puts(m, "with fstype ");
show_type(m, sb);
-diff -NurpP --minimal linux-4.9.82/fs/quota/dquot.c linux-4.9.82-vs2.3.9.7/fs/quota/dquot.c
---- linux-4.9.82/fs/quota/dquot.c 2018-02-22 21:18:51.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/quota/dquot.c 2018-02-10 15:15:43.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/quota/dquot.c linux-4.9.135-vs2.3.9.8/fs/quota/dquot.c
+--- linux-4.9.135/fs/quota/dquot.c 2018-10-20 10:39:18.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/fs/quota/dquot.c 2018-10-20 04:58:14.000000000 +0000
@@ -1658,6 +1658,9 @@ int __dquot_alloc_space(struct inode *in
int reserve = flags & DQUOT_SPACE_RESERVE;
struct dquot **dquots;
@@ -6299,9 +6299,9 @@ diff -NurpP --minimal linux-4.9.82/fs/quota/dquot.c linux-4.9.82-vs2.3.9.7/fs/qu
if (!dquot_active(inode))
return;
-diff -NurpP --minimal linux-4.9.82/fs/quota/quota.c linux-4.9.82-vs2.3.9.7/fs/quota/quota.c
---- linux-4.9.82/fs/quota/quota.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/quota/quota.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/quota/quota.c linux-4.9.135-vs2.3.9.8/fs/quota/quota.c
+--- linux-4.9.135/fs/quota/quota.c 2018-10-20 10:39:18.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/fs/quota/quota.c 2018-10-20 05:55:43.000000000 +0000
@@ -8,6 +8,7 @@
#include <linux/fs.h>
#include <linux/namei.h>
@@ -6310,7 +6310,7 @@ diff -NurpP --minimal linux-4.9.82/fs/quota/quota.c linux-4.9.82-vs2.3.9.7/fs/qu
#include <asm/current.h>
#include <linux/uaccess.h>
#include <linux/kernel.h>
-@@ -38,7 +39,7 @@ static int check_quotactl_permission(str
+@@ -39,7 +40,7 @@ static int check_quotactl_permission(str
break;
/*FALLTHROUGH*/
default:
@@ -6319,7 +6319,7 @@ diff -NurpP --minimal linux-4.9.82/fs/quota/quota.c linux-4.9.82-vs2.3.9.7/fs/qu
return -EPERM;
}
-@@ -768,6 +769,46 @@ static int do_quotactl(struct super_bloc
+@@ -770,6 +771,46 @@ static int do_quotactl(struct super_bloc
#ifdef CONFIG_BLOCK
@@ -6366,7 +6366,7 @@ diff -NurpP --minimal linux-4.9.82/fs/quota/quota.c linux-4.9.82-vs2.3.9.7/fs/qu
/* Return 1 if 'cmd' will block on frozen filesystem */
static int quotactl_cmd_write(int cmd)
{
-@@ -809,6 +850,22 @@ static struct super_block *quotactl_bloc
+@@ -811,6 +852,22 @@ static struct super_block *quotactl_bloc
putname(tmp);
if (IS_ERR(bdev))
return ERR_CAST(bdev);
@@ -6389,9 +6389,9 @@ diff -NurpP --minimal linux-4.9.82/fs/quota/quota.c linux-4.9.82-vs2.3.9.7/fs/qu
if (quotactl_cmd_write(cmd))
sb = get_super_thawed(bdev);
else
-diff -NurpP --minimal linux-4.9.82/fs/stat.c linux-4.9.82-vs2.3.9.7/fs/stat.c
---- linux-4.9.82/fs/stat.c 2018-02-22 21:18:51.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/stat.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/stat.c linux-4.9.135-vs2.3.9.8/fs/stat.c
+--- linux-4.9.135/fs/stat.c 2018-10-20 10:39:18.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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;
@@ -6400,9 +6400,9 @@ diff -NurpP --minimal linux-4.9.82/fs/stat.c linux-4.9.82-vs2.3.9.7/fs/stat.c
stat->rdev = inode->i_rdev;
stat->size = i_size_read(inode);
stat->atime = inode->i_atime;
-diff -NurpP --minimal linux-4.9.82/fs/statfs.c linux-4.9.82-vs2.3.9.7/fs/statfs.c
---- linux-4.9.82/fs/statfs.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/statfs.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/statfs.c linux-4.9.135-vs2.3.9.8/fs/statfs.c
+--- linux-4.9.135/fs/statfs.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/fs/statfs.c 2018-10-20 04:58:14.000000000 +0000
@@ -7,6 +7,8 @@
#include <linux/statfs.h>
#include <linux/security.h>
@@ -6421,9 +6421,9 @@ diff -NurpP --minimal linux-4.9.82/fs/statfs.c linux-4.9.82-vs2.3.9.7/fs/statfs.
return retval;
}
-diff -NurpP --minimal linux-4.9.82/fs/super.c linux-4.9.82-vs2.3.9.7/fs/super.c
---- linux-4.9.82/fs/super.c 2018-02-22 21:18:51.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/super.c 2018-01-13 01:53:26.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/super.c linux-4.9.135-vs2.3.9.8/fs/super.c
+--- linux-4.9.135/fs/super.c 2018-10-20 10:39:18.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/fs/super.c 2018-10-20 04:58:14.000000000 +0000
@@ -34,6 +34,8 @@
#include <linux/fsnotify.h>
#include <linux/lockdep.h>
@@ -6433,7 +6433,7 @@ diff -NurpP --minimal linux-4.9.82/fs/super.c linux-4.9.82-vs2.3.9.7/fs/super.c
#include "internal.h"
-@@ -981,7 +983,8 @@ struct dentry *mount_ns(struct file_syst
+@@ -985,7 +987,8 @@ struct dentry *mount_ns(struct file_syst
/* Don't allow mounting unless the caller has CAP_SYS_ADMIN
* over the namespace.
*/
@@ -6443,7 +6443,7 @@ diff -NurpP --minimal linux-4.9.82/fs/super.c linux-4.9.82-vs2.3.9.7/fs/super.c
return ERR_PTR(-EPERM);
sb = sget_userns(fs_type, ns_test_super, ns_set_super, flags,
-@@ -1191,6 +1194,13 @@ mount_fs(struct file_system_type *type,
+@@ -1195,6 +1198,13 @@ mount_fs(struct file_system_type *type,
WARN_ON(!sb->s_bdi);
sb->s_flags |= MS_BORN;
@@ -6457,9 +6457,9 @@ diff -NurpP --minimal linux-4.9.82/fs/super.c linux-4.9.82-vs2.3.9.7/fs/super.c
error = security_sb_kern_mount(sb, flags, secdata);
if (error)
goto out_sb;
-diff -NurpP --minimal linux-4.9.82/fs/utimes.c linux-4.9.82-vs2.3.9.7/fs/utimes.c
---- linux-4.9.82/fs/utimes.c 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/utimes.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/utimes.c linux-4.9.135-vs2.3.9.8/fs/utimes.c
+--- linux-4.9.135/fs/utimes.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/fs/utimes.c 2018-10-20 04:58:14.000000000 +0000
@@ -8,6 +8,8 @@
#include <linux/stat.h>
#include <linux/utime.h>
@@ -6490,9 +6490,9 @@ diff -NurpP --minimal linux-4.9.82/fs/utimes.c linux-4.9.82-vs2.3.9.7/fs/utimes.
if (times && times[0].tv_nsec == UTIME_NOW &&
times[1].tv_nsec == UTIME_NOW)
times = NULL;
-diff -NurpP --minimal linux-4.9.82/fs/xattr.c linux-4.9.82-vs2.3.9.7/fs/xattr.c
---- linux-4.9.82/fs/xattr.c 2018-02-22 21:18:51.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/fs/xattr.c 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/fs/xattr.c linux-4.9.135-vs2.3.9.8/fs/xattr.c
+--- linux-4.9.135/fs/xattr.c 2018-10-20 10:39:18.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/fs/xattr.c 2018-10-20 05:55:43.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/audit.h>
#include <linux/vmalloc.h>
@@ -6510,9 +6510,9 @@ diff -NurpP --minimal linux-4.9.82/fs/xattr.c linux-4.9.82-vs2.3.9.7/fs/xattr.c
return (mask & MAY_WRITE) ? -EPERM : -ENODATA;
return 0;
}
-diff -NurpP --minimal linux-4.9.82/include/linux/capability.h linux-4.9.82-vs2.3.9.7/include/linux/capability.h
---- linux-4.9.82/include/linux/capability.h 2018-02-22 21:18:53.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/capability.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/capability.h linux-4.9.135-vs2.3.9.8/include/linux/capability.h
+--- linux-4.9.135/include/linux/capability.h 2018-10-20 10:39:19.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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 */
@@ -6523,9 +6523,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/capability.h linux-4.9.82-vs2.3
# 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.82/include/linux/cred.h linux-4.9.82-vs2.3.9.7/include/linux/cred.h
---- linux-4.9.82/include/linux/cred.h 2018-02-22 21:18:53.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/cred.h 2018-01-13 21:30:31.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/cred.h linux-4.9.135-vs2.3.9.8/include/linux/cred.h
+--- linux-4.9.135/include/linux/cred.h 2018-10-20 10:39:19.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/include/linux/cred.h 2018-10-20 04:58:14.000000000 +0000
@@ -152,6 +152,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 *);
@@ -6566,10 +6566,10 @@ diff -NurpP --minimal linux-4.9.82/include/linux/cred.h linux-4.9.82-vs2.3.9.7/i
/**
* get_new_cred - Get a reference on a new set of credentials
* @cred: The new credentials to reference
-diff -NurpP --minimal linux-4.9.82/include/linux/dcache.h linux-4.9.82-vs2.3.9.7/include/linux/dcache.h
---- linux-4.9.82/include/linux/dcache.h 2018-02-22 21:18:53.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/dcache.h 2018-01-10 02:50:49.000000000 +0000
-@@ -307,8 +307,10 @@ extern char *dentry_path(struct dentry *
+diff -NurpP --minimal linux-4.9.135/include/linux/dcache.h linux-4.9.135-vs2.3.9.8/include/linux/dcache.h
+--- linux-4.9.135/include/linux/dcache.h 2018-10-20 10:39:19.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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)
{
@@ -6581,19 +6581,19 @@ diff -NurpP --minimal linux-4.9.82/include/linux/dcache.h linux-4.9.82-vs2.3.9.7
return dentry;
}
-diff -NurpP --minimal linux-4.9.82/include/linux/devpts_fs.h linux-4.9.82-vs2.3.9.7/include/linux/devpts_fs.h
---- linux-4.9.82/include/linux/devpts_fs.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/devpts_fs.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/devpts_fs.h linux-4.9.135-vs2.3.9.8/include/linux/devpts_fs.h
+--- linux-4.9.135/include/linux/devpts_fs.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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.82/include/linux/fs.h linux-4.9.82-vs2.3.9.7/include/linux/fs.h
---- linux-4.9.82/include/linux/fs.h 2018-02-22 21:18:53.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/fs.h 2018-01-13 22:18:13.000000000 +0000
-@@ -225,6 +225,7 @@ typedef int (dio_iodone_t)(struct kiocb
+diff -NurpP --minimal linux-4.9.135/include/linux/fs.h linux-4.9.135-vs2.3.9.8/include/linux/fs.h
+--- linux-4.9.135/include/linux/fs.h 2018-10-20 10:39:19.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/include/linux/fs.h 2018-10-20 04:58:14.000000000 +0000
+@@ -226,6 +226,7 @@ typedef int (dio_iodone_t)(struct kiocb
#define ATTR_OPEN (1 << 15) /* Truncating from open(O_TRUNC) */
#define ATTR_TIMES_SET (1 << 16)
#define ATTR_TOUCH (1 << 17)
@@ -6601,7 +6601,7 @@ diff -NurpP --minimal linux-4.9.82/include/linux/fs.h linux-4.9.82-vs2.3.9.7/inc
/*
* Whiteout is represented by a char device. The following constants define the
-@@ -247,6 +248,7 @@ struct iattr {
+@@ -248,6 +249,7 @@ struct iattr {
umode_t ia_mode;
kuid_t ia_uid;
kgid_t ia_gid;
@@ -6609,7 +6609,7 @@ diff -NurpP --minimal linux-4.9.82/include/linux/fs.h linux-4.9.82-vs2.3.9.7/inc
loff_t ia_size;
struct timespec ia_atime;
struct timespec ia_mtime;
-@@ -606,7 +608,9 @@ struct inode {
+@@ -607,7 +609,9 @@ struct inode {
unsigned short i_opflags;
kuid_t i_uid;
kgid_t i_gid;
@@ -6620,7 +6620,7 @@ diff -NurpP --minimal linux-4.9.82/include/linux/fs.h linux-4.9.82-vs2.3.9.7/inc
#ifdef CONFIG_FS_POSIX_ACL
struct posix_acl *i_acl;
-@@ -635,6 +639,7 @@ struct inode {
+@@ -636,6 +640,7 @@ struct inode {
unsigned int __i_nlink;
};
dev_t i_rdev;
@@ -6628,7 +6628,7 @@ diff -NurpP --minimal linux-4.9.82/include/linux/fs.h linux-4.9.82-vs2.3.9.7/inc
loff_t i_size;
struct timespec i_atime;
struct timespec i_mtime;
-@@ -839,14 +844,19 @@ static inline void i_size_write(struct i
+@@ -840,14 +845,19 @@ static inline void i_size_write(struct i
#endif
}
@@ -6650,7 +6650,7 @@ diff -NurpP --minimal linux-4.9.82/include/linux/fs.h linux-4.9.82-vs2.3.9.7/inc
}
extern struct block_device *I_BDEV(struct inode *inode);
-@@ -903,6 +913,7 @@ struct file {
+@@ -904,6 +914,7 @@ struct file {
loff_t f_pos;
struct fown_struct f_owner;
const struct cred *f_cred;
@@ -6658,7 +6658,7 @@ diff -NurpP --minimal linux-4.9.82/include/linux/fs.h linux-4.9.82-vs2.3.9.7/inc
struct file_ra_state f_ra;
u64 f_version;
-@@ -1037,6 +1048,7 @@ struct file_lock {
+@@ -1038,6 +1049,7 @@ struct file_lock {
struct file *fl_file;
loff_t fl_start;
loff_t fl_end;
@@ -6666,7 +6666,7 @@ diff -NurpP --minimal linux-4.9.82/include/linux/fs.h linux-4.9.82-vs2.3.9.7/inc
struct fasync_struct * fl_fasync; /* for lease break notifications */
/* for lease breaks: */
-@@ -1469,6 +1481,11 @@ static inline gid_t i_gid_read(const str
+@@ -1471,6 +1483,11 @@ static inline gid_t i_gid_read(const str
return from_kgid(inode->i_sb->s_user_ns, inode->i_gid);
}
@@ -6678,7 +6678,7 @@ diff -NurpP --minimal linux-4.9.82/include/linux/fs.h linux-4.9.82-vs2.3.9.7/inc
static inline void i_uid_write(struct inode *inode, uid_t uid)
{
inode->i_uid = make_kuid(inode->i_sb->s_user_ns, uid);
-@@ -1758,6 +1775,7 @@ struct inode_operations {
+@@ -1760,6 +1777,7 @@ struct inode_operations {
int (*setattr) (struct dentry *, struct iattr *);
int (*getattr) (struct vfsmount *mnt, struct dentry *, struct kstat *);
ssize_t (*listxattr) (struct dentry *, char *, size_t);
@@ -6686,7 +6686,7 @@ diff -NurpP --minimal linux-4.9.82/include/linux/fs.h linux-4.9.82-vs2.3.9.7/inc
int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start,
u64 len);
int (*update_time)(struct inode *, struct timespec *, int);
-@@ -1772,6 +1790,7 @@ ssize_t rw_copy_check_uvector(int type,
+@@ -1774,6 +1792,7 @@ ssize_t rw_copy_check_uvector(int type,
unsigned long nr_segs, unsigned long fast_segs,
struct iovec *fast_pointer,
struct iovec **ret_pointer);
@@ -6694,7 +6694,7 @@ diff -NurpP --minimal linux-4.9.82/include/linux/fs.h linux-4.9.82-vs2.3.9.7/inc
extern ssize_t __vfs_read(struct file *, char __user *, size_t, loff_t *);
extern ssize_t __vfs_write(struct file *, const char __user *, size_t, loff_t *);
-@@ -1843,6 +1862,14 @@ struct super_operations {
+@@ -1845,6 +1864,14 @@ struct super_operations {
#else
#define S_DAX 0 /* Make all the DAX code disappear */
#endif
@@ -6709,7 +6709,7 @@ diff -NurpP --minimal linux-4.9.82/include/linux/fs.h linux-4.9.82-vs2.3.9.7/inc
/*
* Note that nosuid etc flags are inode-specific: setting some file-system
-@@ -1867,10 +1894,13 @@ struct super_operations {
+@@ -1869,10 +1896,13 @@ struct super_operations {
#define IS_MANDLOCK(inode) __IS_FLG(inode, MS_MANDLOCK)
#define IS_NOATIME(inode) __IS_FLG(inode, MS_RDONLY|MS_NOATIME)
#define IS_I_VERSION(inode) __IS_FLG(inode, MS_I_VERSION)
@@ -6723,7 +6723,7 @@ diff -NurpP --minimal linux-4.9.82/include/linux/fs.h linux-4.9.82-vs2.3.9.7/inc
#define IS_POSIXACL(inode) __IS_FLG(inode, MS_POSIXACL)
#define IS_DEADDIR(inode) ((inode)->i_flags & S_DEAD)
-@@ -1890,6 +1920,16 @@ static inline bool HAS_UNMAPPED_ID(struc
+@@ -1892,6 +1922,16 @@ static inline bool HAS_UNMAPPED_ID(struc
return !uid_valid(inode->i_uid) || !gid_valid(inode->i_gid);
}
@@ -6740,7 +6740,7 @@ diff -NurpP --minimal linux-4.9.82/include/linux/fs.h linux-4.9.82-vs2.3.9.7/inc
/*
* Inode state bits. Protected by inode->i_lock
*
-@@ -2155,6 +2195,9 @@ extern struct kobject *fs_kobj;
+@@ -2157,6 +2197,9 @@ extern struct kobject *fs_kobj;
extern int locks_mandatory_locked(struct file *);
extern int locks_mandatory_area(struct inode *, struct file *, loff_t, loff_t, unsigned char);
@@ -6750,7 +6750,7 @@ diff -NurpP --minimal linux-4.9.82/include/linux/fs.h linux-4.9.82-vs2.3.9.7/inc
/*
* Candidates for mandatory locking have the setgid bit set
* but no group execute bit - an otherwise meaningless combination.
-@@ -2335,7 +2378,7 @@ struct filename {
+@@ -2337,7 +2380,7 @@ struct filename {
const char iname[];
};
@@ -6759,7 +6759,7 @@ diff -NurpP --minimal linux-4.9.82/include/linux/fs.h linux-4.9.82-vs2.3.9.7/inc
extern int do_truncate(struct dentry *, loff_t start, unsigned int time_attrs,
struct file *filp);
extern int vfs_fallocate(struct file *file, int mode, loff_t offset,
-@@ -2965,6 +3008,7 @@ extern int dcache_dir_open(struct inode
+@@ -2967,6 +3010,7 @@ extern int dcache_dir_open(struct inode
extern int dcache_dir_close(struct inode *, struct file *);
extern loff_t dcache_dir_lseek(struct file *, loff_t, int);
extern int dcache_readdir(struct file *, struct dir_context *);
@@ -6767,9 +6767,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/fs.h linux-4.9.82-vs2.3.9.7/inc
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.82/include/linux/init_task.h linux-4.9.82-vs2.3.9.7/include/linux/init_task.h
---- linux-4.9.82/include/linux/init_task.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/init_task.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/init_task.h linux-4.9.135-vs2.3.9.8/include/linux/init_task.h
+--- linux-4.9.135/include/linux/init_task.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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) \
@@ -6781,9 +6781,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/init_task.h linux-4.9.82-vs2.3.
}
-diff -NurpP --minimal linux-4.9.82/include/linux/ipc.h linux-4.9.82-vs2.3.9.7/include/linux/ipc.h
---- linux-4.9.82/include/linux/ipc.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/ipc.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/ipc.h linux-4.9.135-vs2.3.9.8/include/linux/ipc.h
+--- linux-4.9.135/include/linux/ipc.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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;
@@ -6792,9 +6792,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/ipc.h linux-4.9.82-vs2.3.9.7/in
kuid_t cuid;
kgid_t cgid;
umode_t mode;
-diff -NurpP --minimal linux-4.9.82/include/linux/memcontrol.h linux-4.9.82-vs2.3.9.7/include/linux/memcontrol.h
---- linux-4.9.82/include/linux/memcontrol.h 2018-02-22 21:18:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/memcontrol.h 2018-01-25 00:07:15.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/memcontrol.h linux-4.9.135-vs2.3.9.8/include/linux/memcontrol.h
+--- linux-4.9.135/include/linux/memcontrol.h 2018-10-20 10:39:19.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/include/linux/memcontrol.h 2018-10-20 04:58:14.000000000 +0000
@@ -92,6 +92,7 @@ enum mem_cgroup_events_target {
MEM_CGROUP_NTARGETS,
};
@@ -6816,9 +6816,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/memcontrol.h linux-4.9.82-vs2.3
static inline bool mm_match_cgroup(struct mm_struct *mm,
struct mem_cgroup *memcg)
{
-diff -NurpP --minimal linux-4.9.82/include/linux/mount.h linux-4.9.82-vs2.3.9.7/include/linux/mount.h
---- linux-4.9.82/include/linux/mount.h 2018-02-22 21:18:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/mount.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/mount.h linux-4.9.135-vs2.3.9.8/include/linux/mount.h
+--- linux-4.9.135/include/linux/mount.h 2018-10-20 10:39:19.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -6829,9 +6829,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/mount.h linux-4.9.82-vs2.3.9.7/
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.82/include/linux/net.h linux-4.9.82-vs2.3.9.7/include/linux/net.h
---- linux-4.9.82/include/linux/net.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/net.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/net.h linux-4.9.135-vs2.3.9.8/include/linux/net.h
+--- linux-4.9.135/include/linux/net.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -6840,10 +6840,10 @@ diff -NurpP --minimal linux-4.9.82/include/linux/net.h linux-4.9.82-vs2.3.9.7/in
#ifndef ARCH_HAS_SOCKET_TYPES
/**
-diff -NurpP --minimal linux-4.9.82/include/linux/netdevice.h linux-4.9.82-vs2.3.9.7/include/linux/netdevice.h
---- linux-4.9.82/include/linux/netdevice.h 2018-02-22 21:18:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/netdevice.h 2018-01-10 02:50:49.000000000 +0000
-@@ -2474,6 +2474,7 @@ static inline int dev_recursion_level(vo
+diff -NurpP --minimal linux-4.9.135/include/linux/netdevice.h linux-4.9.135-vs2.3.9.8/include/linux/netdevice.h
+--- linux-4.9.135/include/linux/netdevice.h 2018-10-20 10:39:19.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/include/linux/netdevice.h 2018-10-20 05:55:43.000000000 +0000
+@@ -2481,6 +2481,7 @@ static inline int dev_recursion_level(vo
struct net_device *dev_get_by_index(struct net *net, int ifindex);
struct net_device *__dev_get_by_index(struct net *net, int ifindex);
@@ -6851,9 +6851,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/netdevice.h linux-4.9.82-vs2.3.
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.82/include/linux/nsproxy.h linux-4.9.82-vs2.3.9.7/include/linux/nsproxy.h
---- linux-4.9.82/include/linux/nsproxy.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/nsproxy.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/nsproxy.h linux-4.9.135-vs2.3.9.8/include/linux/nsproxy.h
+--- linux-4.9.135/include/linux/nsproxy.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/include/linux/nsproxy.h 2018-10-20 04:58:14.000000000 +0000
@@ -3,6 +3,7 @@
#include <linux/spinlock.h>
@@ -6903,9 +6903,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/nsproxy.h linux-4.9.82-vs2.3.9.
}
#endif
-diff -NurpP --minimal linux-4.9.82/include/linux/pid.h linux-4.9.82-vs2.3.9.7/include/linux/pid.h
---- linux-4.9.82/include/linux/pid.h 2018-02-22 21:18:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/pid.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/pid.h linux-4.9.135-vs2.3.9.8/include/linux/pid.h
+--- linux-4.9.135/include/linux/pid.h 2018-10-20 10:39:20.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/include/linux/pid.h 2018-10-20 04:58:14.000000000 +0000
@@ -10,7 +10,8 @@ enum pid_type
PIDTYPE_SID,
PIDTYPE_MAX,
@@ -6924,9 +6924,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/pid.h linux-4.9.82-vs2.3.9.7/in
pid_t pid_vnr(struct pid *pid);
#define do_each_pid_task(pid, type, task) \
-diff -NurpP --minimal linux-4.9.82/include/linux/quotaops.h linux-4.9.82-vs2.3.9.7/include/linux/quotaops.h
---- linux-4.9.82/include/linux/quotaops.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/quotaops.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/quotaops.h linux-4.9.135-vs2.3.9.8/include/linux/quotaops.h
+--- linux-4.9.135/include/linux/quotaops.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/include/linux/quotaops.h 2018-10-20 04:58:14.000000000 +0000
@@ -8,6 +8,7 @@
#define _LINUX_QUOTAOPS_
@@ -6968,10 +6968,10 @@ diff -NurpP --minimal linux-4.9.82/include/linux/quotaops.h linux-4.9.82-vs2.3.9
}
static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
-diff -NurpP --minimal linux-4.9.82/include/linux/sched.h linux-4.9.82-vs2.3.9.7/include/linux/sched.h
---- linux-4.9.82/include/linux/sched.h 2018-02-22 21:18:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/sched.h 2018-01-10 02:50:49.000000000 +0000
-@@ -1717,6 +1717,14 @@ struct task_struct {
+diff -NurpP --minimal linux-4.9.135/include/linux/sched.h linux-4.9.135-vs2.3.9.8/include/linux/sched.h
+--- linux-4.9.135/include/linux/sched.h 2018-10-20 10:39:20.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/include/linux/sched.h 2018-10-20 05:55:43.000000000 +0000
+@@ -1718,6 +1718,14 @@ struct task_struct {
#endif
struct seccomp seccomp;
@@ -6986,7 +6986,7 @@ diff -NurpP --minimal linux-4.9.82/include/linux/sched.h linux-4.9.82-vs2.3.9.7/
/* Thread group tracking */
u32 parent_exec_id;
u32 self_exec_id;
-@@ -2110,6 +2118,11 @@ struct pid_namespace;
+@@ -2111,6 +2119,11 @@ struct pid_namespace;
pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
struct pid_namespace *ns);
@@ -6998,7 +6998,7 @@ diff -NurpP --minimal linux-4.9.82/include/linux/sched.h linux-4.9.82-vs2.3.9.7/
static inline pid_t task_pid_nr(struct task_struct *tsk)
{
return tsk->pid;
-@@ -2123,7 +2136,8 @@ static inline pid_t task_pid_nr_ns(struc
+@@ -2124,7 +2137,8 @@ static inline pid_t task_pid_nr_ns(struc
static inline pid_t task_pid_vnr(struct task_struct *tsk)
{
@@ -7008,9 +7008,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/sched.h linux-4.9.82-vs2.3.9.7/
}
-diff -NurpP --minimal linux-4.9.82/include/linux/shmem_fs.h linux-4.9.82-vs2.3.9.7/include/linux/shmem_fs.h
---- linux-4.9.82/include/linux/shmem_fs.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/shmem_fs.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/shmem_fs.h linux-4.9.135-vs2.3.9.8/include/linux/shmem_fs.h
+--- linux-4.9.135/include/linux/shmem_fs.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/include/linux/shmem_fs.h 2018-10-20 04:58:14.000000000 +0000
@@ -10,6 +10,9 @@
/* inode in-kernel data */
@@ -7021,9 +7021,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/shmem_fs.h linux-4.9.82-vs2.3.9
struct shmem_inode_info {
spinlock_t lock;
unsigned int seals; /* shmem seals */
-diff -NurpP --minimal linux-4.9.82/include/linux/stat.h linux-4.9.82-vs2.3.9.7/include/linux/stat.h
---- linux-4.9.82/include/linux/stat.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/stat.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/stat.h linux-4.9.135-vs2.3.9.8/include/linux/stat.h
+--- linux-4.9.135/include/linux/stat.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/include/linux/stat.h 2018-10-20 04:58:14.000000000 +0000
@@ -25,6 +25,7 @@ struct kstat {
unsigned int nlink;
kuid_t uid;
@@ -7032,9 +7032,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/stat.h linux-4.9.82-vs2.3.9.7/i
dev_t rdev;
loff_t size;
struct timespec atime;
-diff -NurpP --minimal linux-4.9.82/include/linux/sunrpc/auth.h linux-4.9.82-vs2.3.9.7/include/linux/sunrpc/auth.h
---- linux-4.9.82/include/linux/sunrpc/auth.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/sunrpc/auth.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/sunrpc/auth.h linux-4.9.135-vs2.3.9.8/include/linux/sunrpc/auth.h
+--- linux-4.9.135/include/linux/sunrpc/auth.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/include/linux/sunrpc/auth.h 2018-10-20 04:58:14.000000000 +0000
@@ -46,6 +46,7 @@ enum {
struct auth_cred {
kuid_t uid;
@@ -7043,9 +7043,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/sunrpc/auth.h linux-4.9.82-vs2.
struct group_info *group_info;
const char *principal;
unsigned long ac_flags;
-diff -NurpP --minimal linux-4.9.82/include/linux/sunrpc/clnt.h linux-4.9.82-vs2.3.9.7/include/linux/sunrpc/clnt.h
---- linux-4.9.82/include/linux/sunrpc/clnt.h 2018-02-22 21:18:55.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/sunrpc/clnt.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/sunrpc/clnt.h linux-4.9.135-vs2.3.9.8/include/linux/sunrpc/clnt.h
+--- linux-4.9.135/include/linux/sunrpc/clnt.h 2018-10-20 10:39:20.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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 */
@@ -7056,9 +7056,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/sunrpc/clnt.h linux-4.9.82-vs2.
struct rpc_rtt * cl_rtt; /* RTO estimator data */
const struct rpc_timeout *cl_timeout; /* Timeout strategy */
-diff -NurpP --minimal linux-4.9.82/include/linux/types.h linux-4.9.82-vs2.3.9.7/include/linux/types.h
---- linux-4.9.82/include/linux/types.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/types.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/types.h linux-4.9.135-vs2.3.9.8/include/linux/types.h
+--- linux-4.9.135/include/linux/types.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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;
@@ -7069,9 +7069,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/types.h linux-4.9.82-vs2.3.9.7/
typedef unsigned long uintptr_t;
-diff -NurpP --minimal linux-4.9.82/include/linux/uidgid.h linux-4.9.82-vs2.3.9.7/include/linux/uidgid.h
---- linux-4.9.82/include/linux/uidgid.h 2016-12-11 19:17:54.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/uidgid.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/uidgid.h linux-4.9.135-vs2.3.9.8/include/linux/uidgid.h
+--- linux-4.9.135/include/linux/uidgid.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/include/linux/uidgid.h 2018-10-20 04:58:14.000000000 +0000
@@ -21,13 +21,17 @@ typedef struct {
uid_t val;
} kuid_t;
@@ -7168,9 +7168,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/uidgid.h linux-4.9.82-vs2.3.9.7
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.82/include/linux/vroot.h linux-4.9.82-vs2.3.9.7/include/linux/vroot.h
---- linux-4.9.82/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vroot.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vroot.h linux-4.9.135-vs2.3.9.8/include/linux/vroot.h
+--- linux-4.9.135/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/include/linux/vroot.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,51 @@
+
+/*
@@ -7223,9 +7223,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vroot.h linux-4.9.82-vs2.3.9.7/
+#define VROOT_CLR_DEV 0x5601
+
+#endif /* _LINUX_VROOT_H */
-diff -NurpP --minimal linux-4.9.82/include/linux/vs_base.h linux-4.9.82-vs2.3.9.7/include/linux/vs_base.h
---- linux-4.9.82/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vs_base.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vs_base.h linux-4.9.135-vs2.3.9.8/include/linux/vs_base.h
+--- linux-4.9.135/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -7237,9 +7237,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vs_base.h linux-4.9.82-vs2.3.9.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.9.82/include/linux/vs_context.h linux-4.9.82-vs2.3.9.7/include/linux/vs_context.h
---- linux-4.9.82/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vs_context.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vs_context.h linux-4.9.135-vs2.3.9.8/include/linux/vs_context.h
+--- linux-4.9.135/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -7483,9 +7483,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vs_context.h linux-4.9.82-vs2.3
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.9.82/include/linux/vs_cowbl.h linux-4.9.82-vs2.3.9.7/include/linux/vs_cowbl.h
---- linux-4.9.82/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vs_cowbl.h 2018-01-13 22:17:14.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vs_cowbl.h linux-4.9.135-vs2.3.9.8/include/linux/vs_cowbl.h
+--- linux-4.9.135/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -7535,9 +7535,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vs_cowbl.h linux-4.9.82-vs2.3.9
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.9.82/include/linux/vs_cvirt.h linux-4.9.82-vs2.3.9.7/include/linux/vs_cvirt.h
---- linux-4.9.82/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vs_cvirt.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vs_cvirt.h linux-4.9.135-vs2.3.9.8/include/linux/vs_cvirt.h
+--- linux-4.9.135/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -7589,9 +7589,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vs_cvirt.h linux-4.9.82-vs2.3.9
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.9.82/include/linux/vs_device.h linux-4.9.82-vs2.3.9.7/include/linux/vs_device.h
---- linux-4.9.82/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vs_device.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vs_device.h linux-4.9.135-vs2.3.9.8/include/linux/vs_device.h
+--- linux-4.9.135/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -7638,9 +7638,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vs_device.h linux-4.9.82-vs2.3.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.9.82/include/linux/vs_dlimit.h linux-4.9.82-vs2.3.9.7/include/linux/vs_dlimit.h
---- linux-4.9.82/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vs_dlimit.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vs_dlimit.h linux-4.9.135-vs2.3.9.8/include/linux/vs_dlimit.h
+--- linux-4.9.135/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -7857,9 +7857,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vs_dlimit.h linux-4.9.82-vs2.3.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.9.82/include/linux/vs_inet.h linux-4.9.82-vs2.3.9.7/include/linux/vs_inet.h
---- linux-4.9.82/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vs_inet.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vs_inet.h linux-4.9.135-vs2.3.9.8/include/linux/vs_inet.h
+--- linux-4.9.135/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -8225,9 +8225,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vs_inet.h linux-4.9.82-vs2.3.9.
+#else
+// #warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.9.82/include/linux/vs_inet6.h linux-4.9.82-vs2.3.9.7/include/linux/vs_inet6.h
---- linux-4.9.82/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vs_inet6.h 2018-01-16 10:02:29.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vs_inet6.h linux-4.9.135-vs2.3.9.8/include/linux/vs_inet6.h
+--- linux-4.9.135/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -8493,9 +8493,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vs_inet6.h linux-4.9.82-vs2.3.9
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.9.82/include/linux/vs_limit.h linux-4.9.82-vs2.3.9.7/include/linux/vs_limit.h
---- linux-4.9.82/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vs_limit.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vs_limit.h linux-4.9.135-vs2.3.9.8/include/linux/vs_limit.h
+--- linux-4.9.135/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -8637,9 +8637,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vs_limit.h linux-4.9.82-vs2.3.9
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.9.82/include/linux/vs_network.h linux-4.9.82-vs2.3.9.7/include/linux/vs_network.h
---- linux-4.9.82/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vs_network.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vs_network.h linux-4.9.135-vs2.3.9.8/include/linux/vs_network.h
+--- linux-4.9.135/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -8810,9 +8810,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vs_network.h linux-4.9.82-vs2.3
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.9.82/include/linux/vs_pid.h linux-4.9.82-vs2.3.9.7/include/linux/vs_pid.h
---- linux-4.9.82/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vs_pid.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vs_pid.h linux-4.9.135-vs2.3.9.8/include/linux/vs_pid.h
+--- linux-4.9.135/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -8864,9 +8864,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vs_pid.h linux-4.9.82-vs2.3.9.7
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.9.82/include/linux/vs_sched.h linux-4.9.82-vs2.3.9.7/include/linux/vs_sched.h
---- linux-4.9.82/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vs_sched.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vs_sched.h linux-4.9.135-vs2.3.9.8/include/linux/vs_sched.h
+--- linux-4.9.135/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -8908,9 +8908,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vs_sched.h linux-4.9.82-vs2.3.9
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.9.82/include/linux/vs_socket.h linux-4.9.82-vs2.3.9.7/include/linux/vs_socket.h
---- linux-4.9.82/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vs_socket.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vs_socket.h linux-4.9.135-vs2.3.9.8/include/linux/vs_socket.h
+--- linux-4.9.135/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -8979,9 +8979,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vs_socket.h linux-4.9.82-vs2.3.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.9.82/include/linux/vs_tag.h linux-4.9.82-vs2.3.9.7/include/linux/vs_tag.h
---- linux-4.9.82/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vs_tag.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vs_tag.h linux-4.9.135-vs2.3.9.8/include/linux/vs_tag.h
+--- linux-4.9.135/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -9030,9 +9030,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vs_tag.h linux-4.9.82-vs2.3.9.7
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.9.82/include/linux/vs_time.h linux-4.9.82-vs2.3.9.7/include/linux/vs_time.h
---- linux-4.9.82/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vs_time.h 2018-01-16 00:51:52.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vs_time.h linux-4.9.135-vs2.3.9.8/include/linux/vs_time.h
+--- linux-4.9.135/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -9055,9 +9055,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vs_time.h linux-4.9.82-vs2.3.9.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.9.82/include/linux/vserver/base.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/base.h
---- linux-4.9.82/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/base.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vserver/base.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/base.h
+--- linux-4.9.135/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -9243,9 +9243,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vserver/base.h linux-4.9.82-vs2
+#define nx_info_state(n, m) (__nx_state(n) & (m))
+
+#endif
-diff -NurpP --minimal linux-4.9.82/include/linux/vserver/cacct.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/cacct.h
---- linux-4.9.82/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/cacct.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vserver/cacct.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/cacct.h
+--- linux-4.9.135/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -9262,9 +9262,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vserver/cacct.h linux-4.9.82-vs
+};
+
+#endif /* _VSERVER_CACCT_H */
-diff -NurpP --minimal linux-4.9.82/include/linux/vserver/cacct_cmd.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/cacct_cmd.h
---- linux-4.9.82/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/cacct_cmd.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vserver/cacct_cmd.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/cacct_cmd.h
+--- linux-4.9.135/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -9276,9 +9276,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vserver/cacct_cmd.h linux-4.9.8
+extern int vc_sock_stat(struct vx_info *, void __user *);
+
+#endif /* _VSERVER_CACCT_CMD_H */
-diff -NurpP --minimal linux-4.9.82/include/linux/vserver/cacct_def.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/cacct_def.h
---- linux-4.9.82/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/cacct_def.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vserver/cacct_def.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/cacct_def.h
+--- linux-4.9.135/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -9323,9 +9323,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vserver/cacct_def.h linux-4.9.8
+#endif
+
+#endif /* _VSERVER_CACCT_DEF_H */
-diff -NurpP --minimal linux-4.9.82/include/linux/vserver/cacct_int.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/cacct_int.h
---- linux-4.9.82/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/cacct_int.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vserver/cacct_int.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/cacct_int.h
+--- linux-4.9.135/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -9344,9 +9344,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vserver/cacct_int.h linux-4.9.8
+}
+
+#endif /* _VSERVER_CACCT_INT_H */
-diff -NurpP --minimal linux-4.9.82/include/linux/vserver/check.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/check.h
---- linux-4.9.82/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/check.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vserver/check.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/check.h
+--- linux-4.9.135/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -9437,9 +9437,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vserver/check.h linux-4.9.82-vs
+#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1)
+
+#endif
-diff -NurpP --minimal linux-4.9.82/include/linux/vserver/context.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/context.h
---- linux-4.9.82/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/context.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vserver/context.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/context.h
+--- linux-4.9.135/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -9551,9 +9551,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vserver/context.h linux-4.9.82-
+
+
+#endif /* _VSERVER_CONTEXT_H */
-diff -NurpP --minimal linux-4.9.82/include/linux/vserver/context_cmd.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/context_cmd.h
---- linux-4.9.82/include/linux/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/context_cmd.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vserver/context_cmd.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/context_cmd.h
+--- linux-4.9.135/include/linux/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -9588,9 +9588,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vserver/context_cmd.h linux-4.9
+extern int vc_set_badness(struct vx_info *, void __user *);
+
+#endif /* _VSERVER_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-4.9.82/include/linux/vserver/cvirt.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/cvirt.h
---- linux-4.9.82/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/cvirt.h 2018-01-16 00:54:34.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vserver/cvirt.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/cvirt.h
+--- linux-4.9.135/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/include/linux/vserver/cvirt.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,18 @@
+#ifndef _VSERVER_CVIRT_H
+#define _VSERVER_CVIRT_H
@@ -9610,9 +9610,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vserver/cvirt.h linux-4.9.82-vs
+int vx_do_syslog(int, char __user *, int);
+
+#endif /* _VSERVER_CVIRT_H */
-diff -NurpP --minimal linux-4.9.82/include/linux/vserver/cvirt_cmd.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/cvirt_cmd.h
---- linux-4.9.82/include/linux/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/cvirt_cmd.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vserver/cvirt_cmd.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/cvirt_cmd.h
+--- linux-4.9.135/include/linux/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -9627,9 +9627,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vserver/cvirt_cmd.h linux-4.9.8
+extern int vc_virt_stat(struct vx_info *, void __user *);
+
+#endif /* _VSERVER_CVIRT_CMD_H */
-diff -NurpP --minimal linux-4.9.82/include/linux/vserver/cvirt_def.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/cvirt_def.h
---- linux-4.9.82/include/linux/vserver/cvirt_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/cvirt_def.h 2018-01-10 10:07:41.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vserver/cvirt_def.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/cvirt_def.h
+--- linux-4.9.135/include/linux/vserver/cvirt_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -9711,9 +9711,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vserver/cvirt_def.h linux-4.9.8
+#endif
+
+#endif /* _VSERVER_CVIRT_DEF_H */
-diff -NurpP --minimal linux-4.9.82/include/linux/vserver/debug.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/debug.h
---- linux-4.9.82/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/debug.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vserver/debug.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/debug.h
+--- linux-4.9.135/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -9861,9 +9861,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vserver/debug.h linux-4.9.82-vs
+
+
+#endif /* _VSERVER_DEBUG_H */
-diff -NurpP --minimal linux-4.9.82/include/linux/vserver/debug_cmd.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/debug_cmd.h
---- linux-4.9.82/include/linux/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/debug_cmd.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vserver/debug_cmd.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/debug_cmd.h
+--- linux-4.9.135/include/linux/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -9902,9 +9902,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vserver/debug_cmd.h linux-4.9.8
+#endif /* CONFIG_COMPAT */
+
+#endif /* _VSERVER_DEBUG_CMD_H */
-diff -NurpP --minimal linux-4.9.82/include/linux/vserver/device.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/device.h
---- linux-4.9.82/include/linux/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/device.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vserver/device.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/device.h
+--- linux-4.9.135/include/linux/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -9915,9 +9915,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vserver/device.h linux-4.9.82-v
+#else /* _VSERVER_DEVICE_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_DEVICE_H */
-diff -NurpP --minimal linux-4.9.82/include/linux/vserver/device_cmd.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/device_cmd.h
---- linux-4.9.82/include/linux/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/device_cmd.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vserver/device_cmd.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/device_cmd.h
+--- linux-4.9.135/include/linux/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -9950,9 +9950,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vserver/device_cmd.h linux-4.9.
+#endif /* CONFIG_COMPAT */
+
+#endif /* _VSERVER_DEVICE_CMD_H */
-diff -NurpP --minimal linux-4.9.82/include/linux/vserver/device_def.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/device_def.h
---- linux-4.9.82/include/linux/vserver/device_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/device_def.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vserver/device_def.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/device_def.h
+--- linux-4.9.135/include/linux/vserver/device_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -9971,9 +9971,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vserver/device_def.h linux-4.9.
+};
+
+#endif /* _VSERVER_DEVICE_DEF_H */
-diff -NurpP --minimal linux-4.9.82/include/linux/vserver/dlimit.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/dlimit.h
---- linux-4.9.82/include/linux/vserver/dlimit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/dlimit.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vserver/dlimit.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/dlimit.h
+--- linux-4.9.135/include/linux/vserver/dlimit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -10029,9 +10029,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vserver/dlimit.h linux-4.9.82-v
+#else /* _VSERVER_DLIMIT_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_DLIMIT_H */
-diff -NurpP --minimal linux-4.9.82/include/linux/vserver/dlimit_cmd.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/dlimit_cmd.h
---- linux-4.9.82/include/linux/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/dlimit_cmd.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vserver/dlimit_cmd.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/dlimit_cmd.h
+--- linux-4.9.135/include/linux/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -10079,9 +10079,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vserver/dlimit_cmd.h linux-4.9.
+#endif /* CONFIG_COMPAT */
+
+#endif /* _VSERVER_DLIMIT_CMD_H */
-diff -NurpP --minimal linux-4.9.82/include/linux/vserver/global.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/global.h
---- linux-4.9.82/include/linux/vserver/global.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/global.h 2018-01-13 03:51:55.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vserver/global.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/global.h
+--- linux-4.9.135/include/linux/vserver/global.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -10103,9 +10103,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vserver/global.h linux-4.9.82-v
+
+
+#endif /* _VSERVER_GLOBAL_H */
-diff -NurpP --minimal linux-4.9.82/include/linux/vserver/history.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/history.h
---- linux-4.9.82/include/linux/vserver/history.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/history.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vserver/history.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/history.h
+--- linux-4.9.135/include/linux/vserver/history.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -10304,9 +10304,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vserver/history.h linux-4.9.82-
+#endif /* CONFIG_VSERVER_HISTORY */
+
+#endif /* _VSERVER_HISTORY_H */
-diff -NurpP --minimal linux-4.9.82/include/linux/vserver/inode.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/inode.h
---- linux-4.9.82/include/linux/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/inode.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vserver/inode.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/inode.h
+--- linux-4.9.135/include/linux/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -10327,9 +10327,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vserver/inode.h linux-4.9.82-vs
+#else /* _VSERVER_INODE_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_INODE_H */
-diff -NurpP --minimal linux-4.9.82/include/linux/vserver/inode_cmd.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/inode_cmd.h
---- linux-4.9.82/include/linux/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/inode_cmd.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vserver/inode_cmd.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/inode_cmd.h
+--- linux-4.9.135/include/linux/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -10367,9 +10367,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vserver/inode_cmd.h linux-4.9.8
+#endif /* CONFIG_COMPAT */
+
+#endif /* _VSERVER_INODE_CMD_H */
-diff -NurpP --minimal linux-4.9.82/include/linux/vserver/limit.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/limit.h
---- linux-4.9.82/include/linux/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/limit.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vserver/limit.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/limit.h
+--- linux-4.9.135/include/linux/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -10438,9 +10438,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vserver/limit.h linux-4.9.82-vs
+#define NUM_LIMITS 24
+
+#endif /* _VSERVER_LIMIT_H */
-diff -NurpP --minimal linux-4.9.82/include/linux/vserver/limit_cmd.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/limit_cmd.h
---- linux-4.9.82/include/linux/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/limit_cmd.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vserver/limit_cmd.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/limit_cmd.h
+--- linux-4.9.135/include/linux/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -10477,9 +10477,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vserver/limit_cmd.h linux-4.9.8
+#endif /* CONFIG_IA32_EMULATION */
+
+#endif /* _VSERVER_LIMIT_CMD_H */
-diff -NurpP --minimal linux-4.9.82/include/linux/vserver/limit_def.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/limit_def.h
---- linux-4.9.82/include/linux/vserver/limit_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/limit_def.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vserver/limit_def.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/limit_def.h
+--- linux-4.9.135/include/linux/vserver/limit_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -10528,9 +10528,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vserver/limit_def.h linux-4.9.8
+#endif
+
+#endif /* _VSERVER_LIMIT_DEF_H */
-diff -NurpP --minimal linux-4.9.82/include/linux/vserver/limit_int.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/limit_int.h
---- linux-4.9.82/include/linux/vserver/limit_int.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/limit_int.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vserver/limit_int.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/limit_int.h
+--- linux-4.9.135/include/linux/vserver/limit_int.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -10725,9 +10725,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vserver/limit_int.h linux-4.9.8
+
+
+#endif /* _VSERVER_LIMIT_INT_H */
-diff -NurpP --minimal linux-4.9.82/include/linux/vserver/monitor.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/monitor.h
---- linux-4.9.82/include/linux/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/monitor.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vserver/monitor.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/monitor.h
+--- linux-4.9.135/include/linux/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -10735,9 +10735,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vserver/monitor.h linux-4.9.82-
+#include <uapi/vserver/monitor.h>
+
+#endif /* _VSERVER_MONITOR_H */
-diff -NurpP --minimal linux-4.9.82/include/linux/vserver/network.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/network.h
---- linux-4.9.82/include/linux/vserver/network.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/network.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vserver/network.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/network.h
+--- linux-4.9.135/include/linux/vserver/network.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -10815,9 +10815,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vserver/network.h linux-4.9.82-
+#endif
+
+#endif /* _VSERVER_NETWORK_H */
-diff -NurpP --minimal linux-4.9.82/include/linux/vserver/network_cmd.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/network_cmd.h
---- linux-4.9.82/include/linux/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/network_cmd.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vserver/network_cmd.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/network_cmd.h
+--- linux-4.9.135/include/linux/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -10856,9 +10856,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vserver/network_cmd.h linux-4.9
+extern int vc_set_ncaps(struct nx_info *, void __user *);
+
+#endif /* _VSERVER_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-4.9.82/include/linux/vserver/percpu.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/percpu.h
---- linux-4.9.82/include/linux/vserver/percpu.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/percpu.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vserver/percpu.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/percpu.h
+--- linux-4.9.135/include/linux/vserver/percpu.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -10874,9 +10874,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vserver/percpu.h linux-4.9.82-v
+#define PERCPU_PERCTX (sizeof(struct _vx_percpu))
+
+#endif /* _VSERVER_PERCPU_H */
-diff -NurpP --minimal linux-4.9.82/include/linux/vserver/pid.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/pid.h
---- linux-4.9.82/include/linux/vserver/pid.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/pid.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vserver/pid.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/pid.h
+--- linux-4.9.135/include/linux/vserver/pid.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -10929,9 +10929,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vserver/pid.h linux-4.9.82-vs2.
+}
+
+#endif
-diff -NurpP --minimal linux-4.9.82/include/linux/vserver/sched.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/sched.h
---- linux-4.9.82/include/linux/vserver/sched.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/sched.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vserver/sched.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/sched.h
+--- linux-4.9.135/include/linux/vserver/sched.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -10956,9 +10956,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vserver/sched.h linux-4.9.82-vs
+#else /* _VSERVER_SCHED_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_SCHED_H */
-diff -NurpP --minimal linux-4.9.82/include/linux/vserver/sched_cmd.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/sched_cmd.h
---- linux-4.9.82/include/linux/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/sched_cmd.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vserver/sched_cmd.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/sched_cmd.h
+--- linux-4.9.135/include/linux/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -10971,9 +10971,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vserver/sched_cmd.h linux-4.9.8
+extern int vc_get_prio_bias(struct vx_info *, void __user *);
+
+#endif /* _VSERVER_SCHED_CMD_H */
-diff -NurpP --minimal linux-4.9.82/include/linux/vserver/sched_def.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/sched_def.h
---- linux-4.9.82/include/linux/vserver/sched_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/sched_def.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vserver/sched_def.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/sched_def.h
+--- linux-4.9.135/include/linux/vserver/sched_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -11013,9 +11013,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vserver/sched_def.h linux-4.9.8
+#endif
+
+#endif /* _VSERVER_SCHED_DEF_H */
-diff -NurpP --minimal linux-4.9.82/include/linux/vserver/signal.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/signal.h
---- linux-4.9.82/include/linux/vserver/signal.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/signal.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vserver/signal.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/signal.h
+--- linux-4.9.135/include/linux/vserver/signal.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -11031,9 +11031,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vserver/signal.h linux-4.9.82-v
+#else /* _VSERVER_SIGNAL_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_SIGNAL_H */
-diff -NurpP --minimal linux-4.9.82/include/linux/vserver/signal_cmd.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/signal_cmd.h
---- linux-4.9.82/include/linux/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/signal_cmd.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vserver/signal_cmd.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/signal_cmd.h
+--- linux-4.9.135/include/linux/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -11049,9 +11049,9 @@ diff -NurpP --minimal linux-4.9.82/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.82/include/linux/vserver/space.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/space.h
---- linux-4.9.82/include/linux/vserver/space.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/space.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vserver/space.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/space.h
+--- linux-4.9.135/include/linux/vserver/space.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -11065,9 +11065,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vserver/space.h linux-4.9.82-vs
+#else /* _VSERVER_SPACE_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_SPACE_H */
-diff -NurpP --minimal linux-4.9.82/include/linux/vserver/space_cmd.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/space_cmd.h
---- linux-4.9.82/include/linux/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/space_cmd.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vserver/space_cmd.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/space_cmd.h
+--- linux-4.9.135/include/linux/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -11082,9 +11082,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vserver/space_cmd.h linux-4.9.8
+extern int vc_get_space_mask(void __user *, int);
+
+#endif /* _VSERVER_SPACE_CMD_H */
-diff -NurpP --minimal linux-4.9.82/include/linux/vserver/switch.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/switch.h
---- linux-4.9.82/include/linux/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/switch.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vserver/switch.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/switch.h
+--- linux-4.9.135/include/linux/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.135-vs2.3.9.8/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
@@ -11094,9 +11094,9 @@ diff -NurpP --minimal linux-4.9.82/include/linux/vserver/switch.h linux-4.9.82-v
+#include <uapi/vserver/switch.h>
+
+#endif /* _VSERVER_SWITCH_H */
-diff -NurpP --minimal linux-4.9.82/include/linux/vserver/tag.h linux-4.9.82-vs2.3.9.7/include/linux/vserver/tag.h
---- linux-4.9.82/include/linux/vserver/tag.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.9.82-vs2.3.9.7/include/linux/vserver/tag.h 2018-01-10 02:50:49.000000000 +0000
+diff -NurpP --minimal linux-4.9.135/include/linux/vserver/tag.h linux-4.9.135-vs2.3.9.8/include/linux/vserver/tag.h
+--- linux-4.9.135/include/linux/vserver/tag.h 1970-01-01 00:00:00.000000000 +0000
<Skipped 2814 lines>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/09a55596c186e0d0eb8bace170863be6fde7b0bf
More information about the pld-cvs-commit
mailing list