[packages/kernel/LINUX_4_9] - up to 4.9.207-vs2.3.9.11
arekm
arekm at pld-linux.org
Wed Feb 26 17:47:15 CET 2020
commit 3261cfd5d1b911e181087d903701015ea24a1045
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Wed Feb 26 17:46:50 2020 +0100
- up to 4.9.207-vs2.3.9.11
kernel-vserver-2.3.patch | 9213 ++++++++++++++++++++++----------------------
kernel-vserver-fixes.patch | 15 +
kernel.spec | 4 +-
3 files changed, 4642 insertions(+), 4590 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index b322ce25..08dcaa61 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.135-vs2.3.9.8
-# http://vserver.13thfloor.at/Experimental/patch-4.9.135-vs2.3.9.8.diff
+%define vserver_patch 4.9.207-vs2.3.9.11
+# http://vserver.13thfloor.at/Experimental/patch-4.9.207-vs2.3.9.11.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 a595a0ee..3d91691e 100644
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -1,164 +1,6 @@
-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:
-+
-+ 2 4 "vx_map_tgid: %p/%llx: %d -> %d"
-+ "vx_rmap_tgid: %p/%llx: %d -> %d"
-+
-+debug_dlim:
-+
-+ 0 1 "ALLOC (%p,#%d)%c inode (%d)"
-+ "FREE (%p,#%d)%c inode"
-+ 1 2 "ALLOC (%p,#%d)%c %lld bytes (%d)"
-+ "FREE (%p,#%d)%c %lld bytes"
-+ 2 4 "ADJUST: %lld,%lld on %ld,%ld [mult=%d]"
-+ 3 8 "ext3_has_free_blocks(%p): %lu<%lu+1, %c, %u!=%u r=%d"
-+ "ext3_has_free_blocks(%p): free=%lu, root=%lu"
-+ "rcu_free_dl_info(%p)"
-+ 4 10 "alloc_dl_info(%p,%d) = %p"
-+ "dealloc_dl_info(%p)"
-+ "get_dl_info(%p[#%d.%d])"
-+ "put_dl_info(%p[#%d.%d])"
-+ 5 20 "alloc_dl_info(%p,%d)*"
-+ 6 40 "__hash_dl_info: %p[#%d]"
-+ "__unhash_dl_info: %p[#%d]"
-+ 7 80 "locate_dl_info(%p,#%d) = %p"
-+
-+debug_misc:
-+
-+ 0 1 "destroy_dqhash: %p [#0x%08x] c=%d"
-+ "new_dqhash: %p [#0x%08x]"
-+ "vroot[%d]_clr_dev: dev=%p[%lu,%d:%d]"
-+ "vroot[%d]_get_real_bdev: dev=%p[%lu,%d:%d]"
-+ "vroot[%d]_set_dev: dev=%p[%lu,%d:%d]"
-+ "vroot_get_real_bdev not set"
-+ 1 2 "cow_break_link(?%s?)"
-+ "temp copy ?%s?"
-+ 2 4 "dentry_open(new): %p"
-+ "dentry_open(old): %p"
-+ "lookup_create(new): %p"
-+ "old path ?%s?"
-+ "path_lookup(old): %d"
-+ "vfs_create(new): %d"
-+ "vfs_rename: %d"
-+ "vfs_sendfile: %d"
-+ 3 8 "fput(new_file=%p[#%d])"
-+ "fput(old_file=%p[#%d])"
-+ 4 10 "vx_info_kill(%p[#%d],%d,%d) = %d"
-+ "vx_info_kill(%p[#%d],%d,%d)*"
-+ 5 20 "vs_reboot(%p[#%d],%d)"
-+ 6 40 "dropping task %p[#%u,%u] for %p[#%u,%u]"
-+
-+debug_net:
-+
-+ 2 4 "nx_addr_conflict(%p,%p) %d.%d,%d.%d"
-+ 3 8 "inet_bind(%p) %d.%d.%d.%d, %d.%d.%d.%d, %d.%d.%d.%d"
-+ "inet_bind(%p)* %p,%p;%lx %d.%d.%d.%d"
-+ 4 10 "ip_route_connect(%p) %p,%p;%lx"
-+ 5 20 "__addr_in_socket(%p,%d.%d.%d.%d) %p:%d.%d.%d.%d %p;%lx"
-+ 6 40 "sk,egf: %p [#%d] (from %d)"
-+ "sk,egn: %p [#%d] (from %d)"
-+ "sk,req: %p [#%d] (from %d)"
-+ "sk: %p [#%d] (from %d)"
-+ "tw: %p [#%d] (from %d)"
-+ 7 80 "__sock_recvmsg: %p[%p,%p,%p;%d]:%d/%d"
-+ "__sock_sendmsg: %p[%p,%p,%p;%d]:%d/%d"
-+
-+debug_nid:
-+
-+ 0 1 "__lookup_nx_info(#%u): %p[#%u]"
-+ "alloc_nx_info(%d) = %p"
-+ "create_nx_info(%d) (dynamic rejected)"
-+ "create_nx_info(%d) = %p (already there)"
-+ "create_nx_info(%d) = %p (new)"
-+ "dealloc_nx_info(%p)"
-+ 1 2 "alloc_nx_info(%d)*"
-+ "create_nx_info(%d)*"
-+ 2 4 "get_nx_info(%p[#%d.%d])"
-+ "put_nx_info(%p[#%d.%d])"
-+ 3 8 "claim_nx_info(%p[#%d.%d.%d]) %p"
-+ "clr_nx_info(%p[#%d.%d])"
-+ "init_nx_info(%p[#%d.%d])"
-+ "release_nx_info(%p[#%d.%d.%d]) %p"
-+ "set_nx_info(%p[#%d.%d])"
-+ 4 10 "__hash_nx_info: %p[#%d]"
-+ "__nx_dynamic_id: [#%d]"
-+ "__unhash_nx_info: %p[#%d.%d.%d]"
-+ 5 20 "moved task %p into nxi:%p[#%d]"
-+ "nx_migrate_task(%p,%p[#%d.%d.%d])"
-+ "task_get_nx_info(%p)"
-+ 6 40 "nx_clear_persistent(%p[#%d])"
-+
-+debug_quota:
-+
-+ 0 1 "quota_sync_dqh(%p,%d) discard inode %p"
-+ 1 2 "quota_sync_dqh(%p,%d)"
-+ "sync_dquots(%p,%d)"
-+ "sync_dquots_dqh(%p,%d)"
-+ 3 8 "do_quotactl(%p,%d,cmd=%d,id=%d,%p)"
-+
-+debug_switch:
-+
-+ 0 1 "vc: VCMD_%02d_%d[%d], %d,%p [%d,%d,%x,%x]"
-+ 1 2 "vc: VCMD_%02d_%d[%d] = %08lx(%ld) [%d,%d]"
-+ 4 10 "%s: (%s %s) returned %s with %d"
-+
-+debug_tag:
-+
-+ 7 80 "dx_parse_tag(?%s?): %d:#%d"
-+ "dx_propagate_tag(%p[#%lu.%d]): %d,%d"
-+
-+debug_xid:
-+
-+ 0 1 "__lookup_vx_info(#%u): %p[#%u]"
-+ "alloc_vx_info(%d) = %p"
-+ "alloc_vx_info(%d)*"
-+ "create_vx_info(%d) (dynamic rejected)"
-+ "create_vx_info(%d) = %p (already there)"
-+ "create_vx_info(%d) = %p (new)"
-+ "dealloc_vx_info(%p)"
-+ "loc_vx_info(%d) = %p (found)"
-+ "loc_vx_info(%d) = %p (new)"
-+ "loc_vx_info(%d) = %p (not available)"
-+ 1 2 "create_vx_info(%d)*"
-+ "loc_vx_info(%d)*"
-+ 2 4 "get_vx_info(%p[#%d.%d])"
-+ "put_vx_info(%p[#%d.%d])"
-+ 3 8 "claim_vx_info(%p[#%d.%d.%d]) %p"
-+ "clr_vx_info(%p[#%d.%d])"
-+ "init_vx_info(%p[#%d.%d])"
-+ "release_vx_info(%p[#%d.%d.%d]) %p"
-+ "set_vx_info(%p[#%d.%d])"
-+ 4 10 "__hash_vx_info: %p[#%d]"
-+ "__unhash_vx_info: %p[#%d.%d.%d]"
-+ "__vx_dynamic_id: [#%d]"
-+ 5 20 "enter_vx_info(%p[#%d],%p) %p[#%d,%p]"
-+ "leave_vx_info(%p[#%d,%p]) %p[#%d,%p]"
-+ "moved task %p into vxi:%p[#%d]"
-+ "task_get_vx_info(%p)"
-+ "vx_migrate_task(%p,%p[#%d.%d])"
-+ 6 40 "vx_clear_persistent(%p[#%d])"
-+ "vx_exit_init(%p[#%d],%p[#%d,%d,%d])"
-+ "vx_set_init(%p[#%d],%p[#%d,%d,%d])"
-+ "vx_set_persistent(%p[#%d])"
-+ "vx_set_reaper(%p[#%d],%p[#%d,%d])"
-+ 7 80 "vx_child_reaper(%p[#%u,%u]) = %p[#%u,%u]"
-+
-+
-+debug_limit:
-+
-+ n 2^n "vx_acc_cres[%5d,%s,%2d]: %5d%s"
-+ "vx_cres_avail[%5d,%s,%2d]: %5ld > %5d + %5d"
-+
-+ 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.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
+diff -NurpP --minimal linux-4.9.207/arch/alpha/Kconfig linux-4.9.207-vs2.3.9.11/arch/alpha/Kconfig
+--- linux-4.9.207/arch/alpha/Kconfig 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/arch/alpha/Kconfig 2018-10-20 04:58:12.000000000 +0000
@@ -743,6 +743,8 @@ config DUMMY_CONSOLE
depends on VGA_HOSE
default y
@@ -168,9 +10,9 @@ diff -NurpP --minimal linux-4.9.135/arch/alpha/Kconfig linux-4.9.135-vs2.3.9.8/a
source "security/Kconfig"
source "crypto/Kconfig"
-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
+diff -NurpP --minimal linux-4.9.207/arch/alpha/kernel/systbls.S linux-4.9.207-vs2.3.9.11/arch/alpha/kernel/systbls.S
+--- linux-4.9.207/arch/alpha/kernel/systbls.S 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/arch/alpha/kernel/systbls.S 2018-10-20 04:58:12.000000000 +0000
@@ -446,7 +446,7 @@ sys_call_table:
.quad sys_stat64 /* 425 */
.quad sys_lstat64
@@ -180,9 +22,9 @@ diff -NurpP --minimal linux-4.9.135/arch/alpha/kernel/systbls.S linux-4.9.135-vs
.quad sys_ni_syscall /* sys_mbind */
.quad sys_ni_syscall /* sys_get_mempolicy */
.quad sys_ni_syscall /* sys_set_mempolicy */
-diff -NurpP --minimal linux-4.9.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
+diff -NurpP --minimal linux-4.9.207/arch/alpha/kernel/traps.c linux-4.9.207-vs2.3.9.11/arch/alpha/kernel/traps.c
+--- linux-4.9.207/arch/alpha/kernel/traps.c 2019-12-25 15:27:26.328464250 +0000
++++ linux-4.9.207-vs2.3.9.11/arch/alpha/kernel/traps.c 2018-10-20 04:58:12.000000000 +0000
@@ -179,7 +179,8 @@ die_if_kernel(char * str, struct pt_regs
#ifdef CONFIG_SMP
printk("CPU %d ", hard_smp_processor_id());
@@ -193,10 +35,10 @@ diff -NurpP --minimal linux-4.9.135/arch/alpha/kernel/traps.c linux-4.9.135-vs2.
dik_show_regs(regs, r9_15);
add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE);
dik_show_trace((unsigned long *)(regs+1));
-diff -NurpP --minimal linux-4.9.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"
+diff -NurpP --minimal linux-4.9.207/arch/arm/Kconfig linux-4.9.207-vs2.3.9.11/arch/arm/Kconfig
+--- linux-4.9.207/arch/arm/Kconfig 2019-12-25 15:27:26.428462634 +0000
++++ linux-4.9.207-vs2.3.9.11/arch/arm/Kconfig 2019-10-05 14:58:36.470454583 +0000
+@@ -2200,6 +2200,8 @@ source "fs/Kconfig"
source "arch/arm/Kconfig.debug"
@@ -205,9 +47,9 @@ diff -NurpP --minimal linux-4.9.135/arch/arm/Kconfig linux-4.9.135-vs2.3.9.8/arc
source "security/Kconfig"
source "crypto/Kconfig"
-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
+diff -NurpP --minimal linux-4.9.207/arch/arm/kernel/calls.S linux-4.9.207-vs2.3.9.11/arch/arm/kernel/calls.S
+--- linux-4.9.207/arch/arm/kernel/calls.S 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/arch/arm/kernel/calls.S 2018-10-20 04:58:12.000000000 +0000
@@ -322,7 +322,7 @@
/* 310 */ CALL(sys_request_key)
CALL(sys_keyctl)
@@ -217,9 +59,9 @@ diff -NurpP --minimal linux-4.9.135/arch/arm/kernel/calls.S linux-4.9.135-vs2.3.
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-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
+diff -NurpP --minimal linux-4.9.207/arch/arm/kernel/traps.c linux-4.9.207-vs2.3.9.11/arch/arm/kernel/traps.c
+--- linux-4.9.207/arch/arm/kernel/traps.c 2019-12-25 15:27:26.938454388 +0000
++++ linux-4.9.207-vs2.3.9.11/arch/arm/kernel/traps.c 2018-10-20 04:58:12.000000000 +0000
@@ -279,8 +279,8 @@ static int __die(const char *str, int er
print_modules();
@@ -231,9 +73,9 @@ diff -NurpP --minimal linux-4.9.135/arch/arm/kernel/traps.c linux-4.9.135-vs2.3.
if (!user_mode(regs) || in_interrupt()) {
dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
-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
+diff -NurpP --minimal linux-4.9.207/arch/cris/Kconfig linux-4.9.207-vs2.3.9.11/arch/cris/Kconfig
+--- linux-4.9.207/arch/cris/Kconfig 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/arch/cris/Kconfig 2018-10-20 04:58:12.000000000 +0000
@@ -583,6 +583,8 @@ source "fs/Kconfig"
source "arch/cris/Kconfig.debug"
@@ -243,9 +85,9 @@ diff -NurpP --minimal linux-4.9.135/arch/cris/Kconfig linux-4.9.135-vs2.3.9.8/ar
source "security/Kconfig"
source "crypto/Kconfig"
-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
+diff -NurpP --minimal linux-4.9.207/arch/ia64/Kconfig linux-4.9.207-vs2.3.9.11/arch/ia64/Kconfig
+--- linux-4.9.207/arch/ia64/Kconfig 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/arch/ia64/Kconfig 2018-10-20 04:58:12.000000000 +0000
@@ -602,6 +602,8 @@ source "fs/Kconfig"
source "arch/ia64/Kconfig.debug"
@@ -255,9 +97,9 @@ diff -NurpP --minimal linux-4.9.135/arch/ia64/Kconfig linux-4.9.135-vs2.3.9.8/ar
source "security/Kconfig"
source "crypto/Kconfig"
-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
+diff -NurpP --minimal linux-4.9.207/arch/ia64/kernel/entry.S linux-4.9.207-vs2.3.9.11/arch/ia64/kernel/entry.S
+--- linux-4.9.207/arch/ia64/kernel/entry.S 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/arch/ia64/kernel/entry.S 2018-10-20 04:58:12.000000000 +0000
@@ -1697,7 +1697,7 @@ sys_call_table:
data8 sys_mq_notify
data8 sys_mq_getsetattr
@@ -267,9 +109,9 @@ diff -NurpP --minimal linux-4.9.135/arch/ia64/kernel/entry.S linux-4.9.135-vs2.3
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-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
+diff -NurpP --minimal linux-4.9.207/arch/ia64/kernel/ptrace.c linux-4.9.207-vs2.3.9.11/arch/ia64/kernel/ptrace.c
+--- linux-4.9.207/arch/ia64/kernel/ptrace.c 2019-12-25 15:27:28.308432237 +0000
++++ linux-4.9.207-vs2.3.9.11/arch/ia64/kernel/ptrace.c 2018-10-20 04:58:12.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/regset.h>
#include <linux/elf.h>
@@ -278,9 +120,9 @@ diff -NurpP --minimal linux-4.9.135/arch/ia64/kernel/ptrace.c linux-4.9.135-vs2.
#include <asm/pgtable.h>
#include <asm/processor.h>
-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
+diff -NurpP --minimal linux-4.9.207/arch/ia64/kernel/traps.c linux-4.9.207-vs2.3.9.11/arch/ia64/kernel/traps.c
+--- linux-4.9.207/arch/ia64/kernel/traps.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/arch/ia64/kernel/traps.c 2018-10-20 04:58:12.000000000 +0000
@@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re
put_cpu();
@@ -305,9 +147,9 @@ diff -NurpP --minimal linux-4.9.135/arch/ia64/kernel/traps.c linux-4.9.135-vs2.3
}
}
}
-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
+diff -NurpP --minimal linux-4.9.207/arch/m32r/kernel/traps.c linux-4.9.207-vs2.3.9.11/arch/m32r/kernel/traps.c
+--- linux-4.9.207/arch/m32r/kernel/traps.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/arch/m32r/kernel/traps.c 2018-10-20 04:58:12.000000000 +0000
@@ -184,8 +184,9 @@ static void show_registers(struct pt_reg
} else {
printk("SPI: %08lx\n", sp);
@@ -320,9 +162,9 @@ diff -NurpP --minimal linux-4.9.135/arch/m32r/kernel/traps.c linux-4.9.135-vs2.3
/*
* When in-kernel, we also print out the stack and code at the
-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
+diff -NurpP --minimal linux-4.9.207/arch/m68k/Kconfig linux-4.9.207-vs2.3.9.11/arch/m68k/Kconfig
+--- linux-4.9.207/arch/m68k/Kconfig 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/arch/m68k/Kconfig 2018-10-20 04:58:12.000000000 +0000
@@ -163,6 +163,8 @@ source "fs/Kconfig"
source "arch/m68k/Kconfig.debug"
@@ -332,10 +174,10 @@ diff -NurpP --minimal linux-4.9.135/arch/m68k/Kconfig linux-4.9.135-vs2.3.9.8/ar
source "security/Kconfig"
source "crypto/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"
+diff -NurpP --minimal linux-4.9.207/arch/mips/Kconfig linux-4.9.207-vs2.3.9.11/arch/mips/Kconfig
+--- linux-4.9.207/arch/mips/Kconfig 2019-12-25 15:27:28.488429329 +0000
++++ linux-4.9.207-vs2.3.9.11/arch/mips/Kconfig 2019-12-25 15:37:43.808561393 +0000
+@@ -3193,6 +3193,8 @@ source "fs/Kconfig"
source "arch/mips/Kconfig.debug"
@@ -344,9 +186,9 @@ diff -NurpP --minimal linux-4.9.135/arch/mips/Kconfig linux-4.9.135-vs2.3.9.8/ar
source "security/Kconfig"
source "crypto/Kconfig"
-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
+diff -NurpP --minimal linux-4.9.207/arch/mips/kernel/ptrace.c linux-4.9.207-vs2.3.9.11/arch/mips/kernel/ptrace.c
+--- linux-4.9.207/arch/mips/kernel/ptrace.c 2019-12-25 15:27:28.848423509 +0000
++++ linux-4.9.207-vs2.3.9.11/arch/mips/kernel/ptrace.c 2018-10-20 05:55:33.000000000 +0000
@@ -30,6 +30,7 @@
#include <linux/audit.h>
#include <linux/seccomp.h>
@@ -365,9 +207,9 @@ diff -NurpP --minimal linux-4.9.135/arch/mips/kernel/ptrace.c linux-4.9.135-vs2.
switch (request) {
/* when I and D space are separate, these will need to be fixed. */
case PTRACE_PEEKTEXT: /* read word at location addr. */
-diff -NurpP --minimal linux-4.9.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
+diff -NurpP --minimal linux-4.9.207/arch/mips/kernel/scall32-o32.S linux-4.9.207-vs2.3.9.11/arch/mips/kernel/scall32-o32.S
+--- linux-4.9.207/arch/mips/kernel/scall32-o32.S 2019-12-25 15:27:28.848423509 +0000
++++ linux-4.9.207-vs2.3.9.11/arch/mips/kernel/scall32-o32.S 2018-10-20 04:58:12.000000000 +0000
@@ -511,7 +511,7 @@ EXPORT(sys_call_table)
PTR sys_mq_timedreceive
PTR sys_mq_notify /* 4275 */
@@ -377,9 +219,9 @@ diff -NurpP --minimal linux-4.9.135/arch/mips/kernel/scall32-o32.S linux-4.9.135
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-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
+diff -NurpP --minimal linux-4.9.207/arch/mips/kernel/scall64-64.S linux-4.9.207-vs2.3.9.11/arch/mips/kernel/scall64-64.S
+--- linux-4.9.207/arch/mips/kernel/scall64-64.S 2019-12-25 15:27:28.848423509 +0000
++++ linux-4.9.207-vs2.3.9.11/arch/mips/kernel/scall64-64.S 2018-10-20 04:58:12.000000000 +0000
@@ -348,7 +348,7 @@ EXPORT(sys_call_table)
PTR sys_mq_timedreceive
PTR sys_mq_notify
@@ -389,9 +231,9 @@ diff -NurpP --minimal linux-4.9.135/arch/mips/kernel/scall64-64.S linux-4.9.135-
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-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
+diff -NurpP --minimal linux-4.9.207/arch/mips/kernel/scall64-n32.S linux-4.9.207-vs2.3.9.11/arch/mips/kernel/scall64-n32.S
+--- linux-4.9.207/arch/mips/kernel/scall64-n32.S 2019-12-25 15:27:28.848423509 +0000
++++ linux-4.9.207-vs2.3.9.11/arch/mips/kernel/scall64-n32.S 2018-10-20 04:58:12.000000000 +0000
@@ -343,7 +343,7 @@ EXPORT(sysn32_call_table)
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify
@@ -401,9 +243,9 @@ diff -NurpP --minimal linux-4.9.135/arch/mips/kernel/scall64-n32.S linux-4.9.135
PTR compat_sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-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
+diff -NurpP --minimal linux-4.9.207/arch/mips/kernel/scall64-o32.S linux-4.9.207-vs2.3.9.11/arch/mips/kernel/scall64-o32.S
+--- linux-4.9.207/arch/mips/kernel/scall64-o32.S 2019-12-25 15:27:28.848423509 +0000
++++ linux-4.9.207-vs2.3.9.11/arch/mips/kernel/scall64-o32.S 2019-10-05 14:58:36.920447392 +0000
@@ -499,7 +499,7 @@ EXPORT(sys32_call_table)
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify /* 4275 */
@@ -413,9 +255,9 @@ diff -NurpP --minimal linux-4.9.135/arch/mips/kernel/scall64-o32.S linux-4.9.135
PTR compat_sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-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
+diff -NurpP --minimal linux-4.9.207/arch/mips/kernel/traps.c linux-4.9.207-vs2.3.9.11/arch/mips/kernel/traps.c
+--- linux-4.9.207/arch/mips/kernel/traps.c 2019-12-25 15:27:28.848423509 +0000
++++ linux-4.9.207-vs2.3.9.11/arch/mips/kernel/traps.c 2018-10-20 04:58:13.000000000 +0000
@@ -361,9 +361,10 @@ void show_registers(struct pt_regs *regs
__show_regs(regs);
@@ -430,9 +272,9 @@ diff -NurpP --minimal linux-4.9.135/arch/mips/kernel/traps.c linux-4.9.135-vs2.3
if (cpu_has_userlocal) {
unsigned long tls;
-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
+diff -NurpP --minimal linux-4.9.207/arch/parisc/Kconfig linux-4.9.207-vs2.3.9.11/arch/parisc/Kconfig
+--- linux-4.9.207/arch/parisc/Kconfig 2019-12-25 15:27:29.098419467 +0000
++++ linux-4.9.207-vs2.3.9.11/arch/parisc/Kconfig 2018-10-20 05:55:33.000000000 +0000
@@ -348,6 +348,8 @@ config SECCOMP
If unsure, say Y. Only embedded should say N here.
@@ -442,9 +284,9 @@ diff -NurpP --minimal linux-4.9.135/arch/parisc/Kconfig linux-4.9.135-vs2.3.9.8/
source "security/Kconfig"
source "crypto/Kconfig"
-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
+diff -NurpP --minimal linux-4.9.207/arch/parisc/kernel/syscall_table.S linux-4.9.207-vs2.3.9.11/arch/parisc/kernel/syscall_table.S
+--- linux-4.9.207/arch/parisc/kernel/syscall_table.S 2019-12-25 15:27:29.198417850 +0000
++++ linux-4.9.207-vs2.3.9.11/arch/parisc/kernel/syscall_table.S 2018-10-20 04:58:13.000000000 +0000
@@ -358,7 +358,7 @@
ENTRY_COMP(mbind) /* 260 */
ENTRY_COMP(get_mempolicy)
@@ -454,9 +296,9 @@ diff -NurpP --minimal linux-4.9.135/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.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
+diff -NurpP --minimal linux-4.9.207/arch/parisc/kernel/traps.c linux-4.9.207-vs2.3.9.11/arch/parisc/kernel/traps.c
+--- linux-4.9.207/arch/parisc/kernel/traps.c 2019-12-25 15:27:29.208417686 +0000
++++ linux-4.9.207-vs2.3.9.11/arch/parisc/kernel/traps.c 2019-02-22 08:37:49.463155825 +0000
@@ -235,8 +235,9 @@ void die_if_kernel(char *str, struct pt_
return; /* STFU */
@@ -480,21 +322,9 @@ diff -NurpP --minimal linux-4.9.135/arch/parisc/kernel/traps.c linux-4.9.135-vs2
/* Wot's wrong wif bein' racy? */
if (current->thread.flags & PARISC_KERNEL_DEATH) {
-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"
-
-+source "kernel/vserver/Kconfig"
-+
- source "security/Kconfig"
-
- source "crypto/Kconfig"
-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
+diff -NurpP --minimal linux-4.9.207/arch/powerpc/include/uapi/asm/unistd.h linux-4.9.207-vs2.3.9.11/arch/powerpc/include/uapi/asm/unistd.h
+--- linux-4.9.207/arch/powerpc/include/uapi/asm/unistd.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/arch/powerpc/include/uapi/asm/unistd.h 2018-10-20 04:58:13.000000000 +0000
@@ -275,7 +275,7 @@
#endif
#define __NR_rtas 255
@@ -504,21 +334,21 @@ diff -NurpP --minimal linux-4.9.135/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.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"
+diff -NurpP --minimal linux-4.9.207/arch/powerpc/Kconfig linux-4.9.207-vs2.3.9.11/arch/powerpc/Kconfig
+--- linux-4.9.207/arch/powerpc/Kconfig 2019-12-25 15:27:29.218417525 +0000
++++ linux-4.9.207-vs2.3.9.11/arch/powerpc/Kconfig 2019-10-05 14:58:37.110444356 +0000
+@@ -1091,6 +1091,8 @@ source "lib/Kconfig"
- source "arch/s390/Kconfig.debug"
+ source "arch/powerpc/Kconfig.debug"
+source "kernel/vserver/Kconfig"
+
source "security/Kconfig"
source "crypto/Kconfig"
-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
+diff -NurpP --minimal linux-4.9.207/arch/s390/include/asm/tlb.h linux-4.9.207-vs2.3.9.11/arch/s390/include/asm/tlb.h
+--- linux-4.9.207/arch/s390/include/asm/tlb.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/arch/s390/include/asm/tlb.h 2018-10-20 04:58:13.000000000 +0000
@@ -24,6 +24,7 @@
#include <linux/mm.h>
#include <linux/pagemap.h>
@@ -527,9 +357,9 @@ diff -NurpP --minimal linux-4.9.135/arch/s390/include/asm/tlb.h linux-4.9.135-vs
#include <asm/processor.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-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
+diff -NurpP --minimal linux-4.9.207/arch/s390/include/uapi/asm/unistd.h linux-4.9.207-vs2.3.9.11/arch/s390/include/uapi/asm/unistd.h
+--- linux-4.9.207/arch/s390/include/uapi/asm/unistd.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/arch/s390/include/uapi/asm/unistd.h 2018-10-20 04:58:13.000000000 +0000
@@ -200,7 +200,7 @@
#define __NR_clock_gettime 260
#define __NR_clock_getres 261
@@ -539,9 +369,21 @@ diff -NurpP --minimal linux-4.9.135/arch/s390/include/uapi/asm/unistd.h linux-4.
#define __NR_statfs64 265
#define __NR_fstatfs64 266
#define __NR_remap_file_pages 267
-diff -NurpP --minimal linux-4.9.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
+diff -NurpP --minimal linux-4.9.207/arch/s390/Kconfig linux-4.9.207-vs2.3.9.11/arch/s390/Kconfig
+--- linux-4.9.207/arch/s390/Kconfig 2019-12-25 15:27:30.238401034 +0000
++++ linux-4.9.207-vs2.3.9.11/arch/s390/Kconfig 2018-10-20 04:58:13.000000000 +0000
+@@ -775,6 +775,8 @@ source "fs/Kconfig"
+
+ source "arch/s390/Kconfig.debug"
+
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-4.9.207/arch/s390/kernel/ptrace.c linux-4.9.207-vs2.3.9.11/arch/s390/kernel/ptrace.c
+--- linux-4.9.207/arch/s390/kernel/ptrace.c 2019-12-25 15:27:30.598395214 +0000
++++ linux-4.9.207-vs2.3.9.11/arch/s390/kernel/ptrace.c 2018-10-20 04:58:13.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/tracehook.h>
#include <linux/seccomp.h>
@@ -550,9 +392,9 @@ diff -NurpP --minimal linux-4.9.135/arch/s390/kernel/ptrace.c linux-4.9.135-vs2.
#include <trace/syscall.h>
#include <asm/segment.h>
#include <asm/page.h>
-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
+diff -NurpP --minimal linux-4.9.207/arch/s390/kernel/syscalls.S linux-4.9.207-vs2.3.9.11/arch/s390/kernel/syscalls.S
+--- linux-4.9.207/arch/s390/kernel/syscalls.S 2019-12-25 15:27:30.598395214 +0000
++++ linux-4.9.207-vs2.3.9.11/arch/s390/kernel/syscalls.S 2018-10-20 04:58:13.000000000 +0000
@@ -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 +404,9 @@ diff -NurpP --minimal linux-4.9.135/arch/s390/kernel/syscalls.S linux-4.9.135-vs
SYSCALL(sys_ni_syscall,compat_sys_s390_fadvise64_64)
SYSCALL(sys_statfs64,compat_sys_statfs64)
SYSCALL(sys_fstatfs64,compat_sys_fstatfs64)
-diff -NurpP --minimal linux-4.9.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
+diff -NurpP --minimal linux-4.9.207/arch/sh/Kconfig linux-4.9.207-vs2.3.9.11/arch/sh/Kconfig
+--- linux-4.9.207/arch/sh/Kconfig 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/arch/sh/Kconfig 2018-10-20 04:58:13.000000000 +0000
@@ -904,6 +904,8 @@ source "fs/Kconfig"
source "arch/sh/Kconfig.debug"
@@ -574,9 +416,9 @@ diff -NurpP --minimal linux-4.9.135/arch/sh/Kconfig linux-4.9.135-vs2.3.9.8/arch
source "security/Kconfig"
source "crypto/Kconfig"
-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
+diff -NurpP --minimal linux-4.9.207/arch/sh/kernel/irq.c linux-4.9.207-vs2.3.9.11/arch/sh/kernel/irq.c
+--- linux-4.9.207/arch/sh/kernel/irq.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/arch/sh/kernel/irq.c 2018-10-20 04:58:13.000000000 +0000
@@ -14,6 +14,7 @@
#include <linux/ftrace.h>
#include <linux/delay.h>
@@ -585,21 +427,9 @@ diff -NurpP --minimal linux-4.9.135/arch/sh/kernel/irq.c linux-4.9.135-vs2.3.9.8
#include <asm/processor.h>
#include <asm/machvec.h>
#include <asm/uaccess.h>
-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"
-
-+source "kernel/vserver/Kconfig"
-+
- source "security/Kconfig"
-
- source "crypto/Kconfig"
-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
+diff -NurpP --minimal linux-4.9.207/arch/sparc/include/uapi/asm/unistd.h linux-4.9.207-vs2.3.9.11/arch/sparc/include/uapi/asm/unistd.h
+--- linux-4.9.207/arch/sparc/include/uapi/asm/unistd.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/arch/sparc/include/uapi/asm/unistd.h 2018-10-20 04:58:13.000000000 +0000
@@ -332,7 +332,7 @@
#define __NR_timer_getoverrun 264
#define __NR_timer_delete 265
@@ -609,9 +439,21 @@ diff -NurpP --minimal linux-4.9.135/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.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
+diff -NurpP --minimal linux-4.9.207/arch/sparc/Kconfig linux-4.9.207-vs2.3.9.11/arch/sparc/Kconfig
+--- linux-4.9.207/arch/sparc/Kconfig 2019-12-25 15:27:31.178385837 +0000
++++ linux-4.9.207-vs2.3.9.11/arch/sparc/Kconfig 2019-02-22 08:37:49.523154806 +0000
+@@ -584,6 +584,8 @@ source "fs/Kconfig"
+
+ source "arch/sparc/Kconfig.debug"
+
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-4.9.207/arch/sparc/kernel/systbls_32.S linux-4.9.207-vs2.3.9.11/arch/sparc/kernel/systbls_32.S
+--- linux-4.9.207/arch/sparc/kernel/systbls_32.S 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/arch/sparc/kernel/systbls_32.S 2018-10-20 04:58:13.000000000 +0000
@@ -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 +463,9 @@ diff -NurpP --minimal linux-4.9.135/arch/sparc/kernel/systbls_32.S linux-4.9.135
/*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.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
+diff -NurpP --minimal linux-4.9.207/arch/sparc/kernel/systbls_64.S linux-4.9.207-vs2.3.9.11/arch/sparc/kernel/systbls_64.S
+--- linux-4.9.207/arch/sparc/kernel/systbls_64.S 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/arch/sparc/kernel/systbls_64.S 2018-10-20 04:58:13.000000000 +0000
@@ -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 +484,9 @@ diff -NurpP --minimal linux-4.9.135/arch/sparc/kernel/systbls_64.S linux-4.9.135
/*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.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
+diff -NurpP --minimal linux-4.9.207/arch/um/Kconfig.rest linux-4.9.207-vs2.3.9.11/arch/um/Kconfig.rest
+--- linux-4.9.207/arch/um/Kconfig.rest 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/arch/um/Kconfig.rest 2018-10-20 04:58:13.000000000 +0000
@@ -12,6 +12,8 @@ source "arch/um/Kconfig.net"
source "fs/Kconfig"
@@ -654,21 +496,9 @@ diff -NurpP --minimal linux-4.9.135/arch/um/Kconfig.rest linux-4.9.135-vs2.3.9.8
source "security/Kconfig"
source "crypto/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"
-
-+source "kernel/vserver/Kconfig"
-+
- source "security/Kconfig"
-
- source "crypto/Kconfig"
-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
+diff -NurpP --minimal linux-4.9.207/arch/x86/entry/syscalls/syscall_32.tbl linux-4.9.207-vs2.3.9.11/arch/x86/entry/syscalls/syscall_32.tbl
+--- linux-4.9.207/arch/x86/entry/syscalls/syscall_32.tbl 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/arch/x86/entry/syscalls/syscall_32.tbl 2018-10-20 04:58:13.000000000 +0000
@@ -279,7 +279,7 @@
270 i386 tgkill sys_tgkill
271 i386 utimes sys_utimes compat_sys_utimes
@@ -678,9 +508,9 @@ diff -NurpP --minimal linux-4.9.135/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.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
+diff -NurpP --minimal linux-4.9.207/arch/x86/entry/syscalls/syscall_64.tbl linux-4.9.207-vs2.3.9.11/arch/x86/entry/syscalls/syscall_64.tbl
+--- linux-4.9.207/arch/x86/entry/syscalls/syscall_64.tbl 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/arch/x86/entry/syscalls/syscall_64.tbl 2018-10-20 04:58:13.000000000 +0000
@@ -242,7 +242,7 @@
233 common epoll_ctl sys_epoll_ctl
234 common tgkill sys_tgkill
@@ -690,9 +520,21 @@ diff -NurpP --minimal linux-4.9.135/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.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
+diff -NurpP --minimal linux-4.9.207/arch/x86/Kconfig linux-4.9.207-vs2.3.9.11/arch/x86/Kconfig
+--- linux-4.9.207/arch/x86/Kconfig 2019-12-25 15:27:31.878374518 +0000
++++ linux-4.9.207-vs2.3.9.11/arch/x86/Kconfig 2019-12-25 15:37:44.298553484 +0000
+@@ -2810,6 +2810,8 @@ source "fs/Kconfig"
+
+ source "arch/x86/Kconfig.debug"
+
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-4.9.207/block/ioprio.c linux-4.9.207-vs2.3.9.11/block/ioprio.c
+--- linux-4.9.207/block/ioprio.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/block/ioprio.c 2018-10-20 04:58:13.000000000 +0000
@@ -28,6 +28,7 @@
#include <linux/syscalls.h>
#include <linux/security.h>
@@ -719,64 +561,211 @@ diff -NurpP --minimal linux-4.9.135/block/ioprio.c linux-4.9.135-vs2.3.9.8/block
tmpio = get_task_ioprio(p);
if (tmpio < 0)
continue;
-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"
-
-+config BLK_DEV_VROOT
-+ tristate "Virtual Root device support"
-+ depends on QUOTACTL
-+ ---help---
-+ Saying Y here will allow you to use quota/fs ioctls on a shared
-+ partition within a virtual server without compromising security.
+diff -NurpP --minimal linux-4.9.207/Documentation/vserver/debug.txt linux-4.9.207-vs2.3.9.11/Documentation/vserver/debug.txt
+--- linux-4.9.207/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/Documentation/vserver/debug.txt 2018-10-20 04:58:12.000000000 +0000
+@@ -0,0 +1,154 @@
+
- config BLK_DEV_NBD
- tristate "Network block device support"
- depends on NET
-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
- obj-$(CONFIG_BLK_DEV_HD) += hd.o
-+obj-$(CONFIG_BLK_DEV_VROOT) += vroot.o
-
- obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o
- obj-$(CONFIG_XEN_BLKDEV_BACKEND) += xen-blkback/
-diff -NurpP --minimal linux-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>
- #include <linux/uio.h>
-+#include <linux/vs_context.h>
- #include "loop.h"
-
- #include <asm/uaccess.h>
-@@ -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;
-+ lo->lo_xid = vx_current_xid();
- lo->lo_backing_file = file;
- lo->transfer = NULL;
- lo->ioctl = NULL;
-@@ -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;
-+ lo->lo_xid = 0;
- 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);
-@@ -1102,7 +1105,7 @@ loop_set_status(struct loop_device *lo,
-
- if (lo->lo_encrypt_key_size &&
++debug_cvirt:
++
++ 2 4 "vx_map_tgid: %p/%llx: %d -> %d"
++ "vx_rmap_tgid: %p/%llx: %d -> %d"
++
++debug_dlim:
++
++ 0 1 "ALLOC (%p,#%d)%c inode (%d)"
++ "FREE (%p,#%d)%c inode"
++ 1 2 "ALLOC (%p,#%d)%c %lld bytes (%d)"
++ "FREE (%p,#%d)%c %lld bytes"
++ 2 4 "ADJUST: %lld,%lld on %ld,%ld [mult=%d]"
++ 3 8 "ext3_has_free_blocks(%p): %lu<%lu+1, %c, %u!=%u r=%d"
++ "ext3_has_free_blocks(%p): free=%lu, root=%lu"
++ "rcu_free_dl_info(%p)"
++ 4 10 "alloc_dl_info(%p,%d) = %p"
++ "dealloc_dl_info(%p)"
++ "get_dl_info(%p[#%d.%d])"
++ "put_dl_info(%p[#%d.%d])"
++ 5 20 "alloc_dl_info(%p,%d)*"
++ 6 40 "__hash_dl_info: %p[#%d]"
++ "__unhash_dl_info: %p[#%d]"
++ 7 80 "locate_dl_info(%p,#%d) = %p"
++
++debug_misc:
++
++ 0 1 "destroy_dqhash: %p [#0x%08x] c=%d"
++ "new_dqhash: %p [#0x%08x]"
++ "vroot[%d]_clr_dev: dev=%p[%lu,%d:%d]"
++ "vroot[%d]_get_real_bdev: dev=%p[%lu,%d:%d]"
++ "vroot[%d]_set_dev: dev=%p[%lu,%d:%d]"
++ "vroot_get_real_bdev not set"
++ 1 2 "cow_break_link(?%s?)"
++ "temp copy ?%s?"
++ 2 4 "dentry_open(new): %p"
++ "dentry_open(old): %p"
++ "lookup_create(new): %p"
++ "old path ?%s?"
++ "path_lookup(old): %d"
++ "vfs_create(new): %d"
++ "vfs_rename: %d"
++ "vfs_sendfile: %d"
++ 3 8 "fput(new_file=%p[#%d])"
++ "fput(old_file=%p[#%d])"
++ 4 10 "vx_info_kill(%p[#%d],%d,%d) = %d"
++ "vx_info_kill(%p[#%d],%d,%d)*"
++ 5 20 "vs_reboot(%p[#%d],%d)"
++ 6 40 "dropping task %p[#%u,%u] for %p[#%u,%u]"
++
++debug_net:
++
++ 2 4 "nx_addr_conflict(%p,%p) %d.%d,%d.%d"
++ 3 8 "inet_bind(%p) %d.%d.%d.%d, %d.%d.%d.%d, %d.%d.%d.%d"
++ "inet_bind(%p)* %p,%p;%lx %d.%d.%d.%d"
++ 4 10 "ip_route_connect(%p) %p,%p;%lx"
++ 5 20 "__addr_in_socket(%p,%d.%d.%d.%d) %p:%d.%d.%d.%d %p;%lx"
++ 6 40 "sk,egf: %p [#%d] (from %d)"
++ "sk,egn: %p [#%d] (from %d)"
++ "sk,req: %p [#%d] (from %d)"
++ "sk: %p [#%d] (from %d)"
++ "tw: %p [#%d] (from %d)"
++ 7 80 "__sock_recvmsg: %p[%p,%p,%p;%d]:%d/%d"
++ "__sock_sendmsg: %p[%p,%p,%p;%d]:%d/%d"
++
++debug_nid:
++
++ 0 1 "__lookup_nx_info(#%u): %p[#%u]"
++ "alloc_nx_info(%d) = %p"
++ "create_nx_info(%d) (dynamic rejected)"
++ "create_nx_info(%d) = %p (already there)"
++ "create_nx_info(%d) = %p (new)"
++ "dealloc_nx_info(%p)"
++ 1 2 "alloc_nx_info(%d)*"
++ "create_nx_info(%d)*"
++ 2 4 "get_nx_info(%p[#%d.%d])"
++ "put_nx_info(%p[#%d.%d])"
++ 3 8 "claim_nx_info(%p[#%d.%d.%d]) %p"
++ "clr_nx_info(%p[#%d.%d])"
++ "init_nx_info(%p[#%d.%d])"
++ "release_nx_info(%p[#%d.%d.%d]) %p"
++ "set_nx_info(%p[#%d.%d])"
++ 4 10 "__hash_nx_info: %p[#%d]"
++ "__nx_dynamic_id: [#%d]"
++ "__unhash_nx_info: %p[#%d.%d.%d]"
++ 5 20 "moved task %p into nxi:%p[#%d]"
++ "nx_migrate_task(%p,%p[#%d.%d.%d])"
++ "task_get_nx_info(%p)"
++ 6 40 "nx_clear_persistent(%p[#%d])"
++
++debug_quota:
++
++ 0 1 "quota_sync_dqh(%p,%d) discard inode %p"
++ 1 2 "quota_sync_dqh(%p,%d)"
++ "sync_dquots(%p,%d)"
++ "sync_dquots_dqh(%p,%d)"
++ 3 8 "do_quotactl(%p,%d,cmd=%d,id=%d,%p)"
++
++debug_switch:
++
++ 0 1 "vc: VCMD_%02d_%d[%d], %d,%p [%d,%d,%x,%x]"
++ 1 2 "vc: VCMD_%02d_%d[%d] = %08lx(%ld) [%d,%d]"
++ 4 10 "%s: (%s %s) returned %s with %d"
++
++debug_tag:
++
++ 7 80 "dx_parse_tag(?%s?): %d:#%d"
++ "dx_propagate_tag(%p[#%lu.%d]): %d,%d"
++
++debug_xid:
++
++ 0 1 "__lookup_vx_info(#%u): %p[#%u]"
++ "alloc_vx_info(%d) = %p"
++ "alloc_vx_info(%d)*"
++ "create_vx_info(%d) (dynamic rejected)"
++ "create_vx_info(%d) = %p (already there)"
++ "create_vx_info(%d) = %p (new)"
++ "dealloc_vx_info(%p)"
++ "loc_vx_info(%d) = %p (found)"
++ "loc_vx_info(%d) = %p (new)"
++ "loc_vx_info(%d) = %p (not available)"
++ 1 2 "create_vx_info(%d)*"
++ "loc_vx_info(%d)*"
++ 2 4 "get_vx_info(%p[#%d.%d])"
++ "put_vx_info(%p[#%d.%d])"
++ 3 8 "claim_vx_info(%p[#%d.%d.%d]) %p"
++ "clr_vx_info(%p[#%d.%d])"
++ "init_vx_info(%p[#%d.%d])"
++ "release_vx_info(%p[#%d.%d.%d]) %p"
++ "set_vx_info(%p[#%d.%d])"
++ 4 10 "__hash_vx_info: %p[#%d]"
++ "__unhash_vx_info: %p[#%d.%d.%d]"
++ "__vx_dynamic_id: [#%d]"
++ 5 20 "enter_vx_info(%p[#%d],%p) %p[#%d,%p]"
++ "leave_vx_info(%p[#%d,%p]) %p[#%d,%p]"
++ "moved task %p into vxi:%p[#%d]"
++ "task_get_vx_info(%p)"
++ "vx_migrate_task(%p,%p[#%d.%d])"
++ 6 40 "vx_clear_persistent(%p[#%d])"
++ "vx_exit_init(%p[#%d],%p[#%d,%d,%d])"
++ "vx_set_init(%p[#%d],%p[#%d,%d,%d])"
++ "vx_set_persistent(%p[#%d])"
++ "vx_set_reaper(%p[#%d],%p[#%d,%d])"
++ 7 80 "vx_child_reaper(%p[#%u,%u]) = %p[#%u,%u]"
++
++
++debug_limit:
++
++ n 2^n "vx_acc_cres[%5d,%s,%2d]: %5d%s"
++ "vx_cres_avail[%5d,%s,%2d]: %5ld > %5d + %5d"
++
++ m 2^m "vx_acc_page[%5d,%s,%2d]: %5d%s"
++ "vx_acc_pages[%5d,%s,%2d]: %5d += %5d"
++ "vx_pages_avail[%5d,%s,%2d]: %5ld > %5d + %5d"
+diff -NurpP --minimal linux-4.9.207/drivers/block/Kconfig linux-4.9.207-vs2.3.9.11/drivers/block/Kconfig
+--- linux-4.9.207/drivers/block/Kconfig 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/drivers/block/Kconfig 2018-10-20 04:58:13.000000000 +0000
+@@ -273,6 +273,13 @@ config BLK_DEV_CRYPTOLOOP
+
+ source "drivers/block/drbd/Kconfig"
+
++config BLK_DEV_VROOT
++ tristate "Virtual Root device support"
++ depends on QUOTACTL
++ ---help---
++ Saying Y here will allow you to use quota/fs ioctls on a shared
++ partition within a virtual server without compromising security.
++
+ config BLK_DEV_NBD
+ tristate "Network block device support"
+ depends on NET
+diff -NurpP --minimal linux-4.9.207/drivers/block/loop.c linux-4.9.207-vs2.3.9.11/drivers/block/loop.c
+--- linux-4.9.207/drivers/block/loop.c 2019-12-25 15:27:36.368301926 +0000
++++ linux-4.9.207-vs2.3.9.11/drivers/block/loop.c 2019-12-25 15:37:45.418535409 +0000
+@@ -76,6 +76,7 @@
+ #include <linux/miscdevice.h>
+ #include <linux/falloc.h>
+ #include <linux/uio.h>
++#include <linux/vs_context.h>
+ #include "loop.h"
+
+ #include <asm/uaccess.h>
+@@ -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;
++ lo->lo_xid = vx_current_xid();
+ lo->lo_backing_file = file;
+ lo->transfer = NULL;
+ lo->ioctl = NULL;
+@@ -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;
++ lo->lo_xid = 0;
+ 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);
+@@ -1102,7 +1105,7 @@ loop_set_status(struct loop_device *lo,
+
+ if (lo->lo_encrypt_key_size &&
!uid_eq(lo->lo_key_owner, uid) &&
- !capable(CAP_SYS_ADMIN))
+ !vx_capable(CAP_SYS_ADMIN, VXC_ADMIN_CLOOP))
@@ -793,7 +782,7 @@ diff -NurpP --minimal linux-4.9.135/drivers/block/loop.c linux-4.9.135-vs2.3.9.8
info->lo_encrypt_key_size = lo->lo_encrypt_key_size;
memcpy(info->lo_encrypt_key, lo->lo_encrypt_key,
lo->lo_encrypt_key_size);
-@@ -1568,6 +1572,11 @@ static int lo_open(struct block_device *
+@@ -1569,6 +1573,11 @@ static int lo_open(struct block_device *
goto out;
}
@@ -805,9 +794,9 @@ diff -NurpP --minimal linux-4.9.135/drivers/block/loop.c linux-4.9.135-vs2.3.9.8
atomic_inc(&lo->lo_refcnt);
out:
mutex_unlock(&loop_index_mutex);
-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
+diff -NurpP --minimal linux-4.9.207/drivers/block/loop.h linux-4.9.207-vs2.3.9.11/drivers/block/loop.h
+--- linux-4.9.207/drivers/block/loop.h 2019-12-25 15:27:36.388301601 +0000
++++ linux-4.9.207-vs2.3.9.11/drivers/block/loop.h 2019-10-05 14:58:39.110412393 +0000
@@ -43,6 +43,7 @@ struct loop_device {
struct loop_func_table *lo_encryption;
__u32 lo_init[2];
@@ -816,9 +805,20 @@ diff -NurpP --minimal linux-4.9.135/drivers/block/loop.h linux-4.9.135-vs2.3.9.8
int (*ioctl)(struct loop_device *, int cmd,
unsigned long arg);
-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
+diff -NurpP --minimal linux-4.9.207/drivers/block/Makefile linux-4.9.207-vs2.3.9.11/drivers/block/Makefile
+--- linux-4.9.207/drivers/block/Makefile 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/drivers/block/Makefile 2018-10-20 04:58:13.000000000 +0000
+@@ -31,6 +31,7 @@ obj-$(CONFIG_VIRTIO_BLK) += virtio_blk.o
+
+ obj-$(CONFIG_BLK_DEV_SX8) += sx8.o
+ obj-$(CONFIG_BLK_DEV_HD) += hd.o
++obj-$(CONFIG_BLK_DEV_VROOT) += vroot.o
+
+ obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o
+ obj-$(CONFIG_XEN_BLKDEV_BACKEND) += xen-blkback/
+diff -NurpP --minimal linux-4.9.207/drivers/block/vroot.c linux-4.9.207-vs2.3.9.11/drivers/block/vroot.c
+--- linux-4.9.207/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/drivers/block/vroot.c 2018-10-20 04:58:13.000000000 +0000
@@ -0,0 +1,291 @@
+/*
+ * linux/drivers/block/vroot.c
@@ -1111,123 +1111,24 @@ diff -NurpP --minimal linux-4.9.135/drivers/block/vroot.c linux-4.9.135-vs2.3.9.
+
+#endif
+
-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;
- atomic_t open_count;
-+ vxid_t xid;
-
- struct dm_target *immutable_target;
- struct target_type *immutable_target_type;
-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>
- #include <linux/compat.h>
-+#include <linux/vs_context.h>
-
- #include <asm/uaccess.h>
-
-@@ -114,7 +115,8 @@ static struct hash_cell *__get_name_cell
- unsigned int h = hash_str(str);
+diff -NurpP --minimal linux-4.9.207/drivers/md/dm.c linux-4.9.207-vs2.3.9.11/drivers/md/dm.c
+--- linux-4.9.207/drivers/md/dm.c 2019-12-25 15:28:01.727891912 +0000
++++ linux-4.9.207-vs2.3.9.11/drivers/md/dm.c 2019-12-25 15:37:45.988526209 +0000
+@@ -22,6 +22,7 @@
+ #include <linux/wait.h>
+ #include <linux/pr.h>
+ #include <linux/vmalloc.h>
++#include <linux/vs_base.h>
- list_for_each_entry (hc, _name_buckets + h, name_list)
-- if (!strcmp(hc->name, str)) {
-+ if (vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT) &&
-+ !strcmp(hc->name, str)) {
- dm_get(hc->md);
- return hc;
- }
-@@ -128,7 +130,8 @@ static struct hash_cell *__get_uuid_cell
- unsigned int h = hash_str(str);
+ #define DM_MSG_PREFIX "core"
- list_for_each_entry (hc, _uuid_buckets + h, uuid_list)
-- if (!strcmp(hc->uuid, str)) {
-+ if (vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT) &&
-+ !strcmp(hc->uuid, str)) {
- dm_get(hc->md);
- return hc;
- }
-@@ -139,13 +142,15 @@ static struct hash_cell *__get_uuid_cell
- static struct hash_cell *__get_dev_cell(uint64_t dev)
+@@ -300,6 +301,7 @@ int dm_deleting_md(struct mapped_device
+ static int dm_blk_open(struct block_device *bdev, fmode_t mode)
{
struct mapped_device *md;
-- struct hash_cell *hc;
-+ struct hash_cell *hc = NULL;
++ int ret = -ENXIO;
- md = dm_get_md(huge_decode_dev(dev));
- if (!md)
- return NULL;
-
-- hc = dm_get_mdptr(md);
-+ if (vx_check(dm_get_xid(md), VS_WATCH_P | VS_IDENT))
-+ hc = dm_get_mdptr(md);
-+
- if (!hc) {
- dm_put(md);
- return NULL;
-@@ -467,6 +472,9 @@ typedef int (*ioctl_fn)(struct dm_ioctl
-
- static int remove_all(struct dm_ioctl *param, size_t param_size)
- {
-+ if (!vx_check(0, VS_ADMIN))
-+ return -EPERM;
-+
- dm_hash_remove_all(true, !!(param->flags & DM_DEFERRED_REMOVE), false);
- param->data_size = 0;
- return 0;
-@@ -514,6 +522,8 @@ static int list_devices(struct dm_ioctl
- */
- for (i = 0; i < NUM_BUCKETS; i++) {
- list_for_each_entry (hc, _name_buckets + i, name_list) {
-+ if (!vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT))
-+ continue;
- needed += sizeof(struct dm_name_list);
- needed += strlen(hc->name) + 1;
- needed += ALIGN_MASK;
-@@ -537,6 +547,8 @@ static int list_devices(struct dm_ioctl
- */
- for (i = 0; i < NUM_BUCKETS; i++) {
- list_for_each_entry (hc, _name_buckets + i, name_list) {
-+ if (!vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT))
-+ continue;
- if (old_nl)
- old_nl->next = (uint32_t) ((void *) nl -
- (void *) old_nl);
-@@ -1805,8 +1817,8 @@ static int ctl_ioctl(uint command, struc
- size_t input_param_size;
- struct dm_ioctl param_kernel;
-
-- /* only root can play with this */
-- if (!capable(CAP_SYS_ADMIN))
-+ /* only root and certain contexts can play with this */
-+ if (!vx_capable(CAP_SYS_ADMIN, VXC_ADMIN_MAPPER))
- return -EACCES;
-
- if (_IOC_TYPE(command) != DM_IOCTL)
-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>
- #include <linux/vmalloc.h>
-+#include <linux/vs_base.h>
-
- #define DM_MSG_PREFIX "core"
-
-@@ -300,6 +301,7 @@ int dm_deleting_md(struct mapped_device
- static int dm_blk_open(struct block_device *bdev, fmode_t mode)
- {
- struct mapped_device *md;
-+ int ret = -ENXIO;
-
- spin_lock(&_minor_lock);
+ spin_lock(&_minor_lock);
@@ -308,17 +310,19 @@ static int dm_blk_open(struct block_devi
goto out;
@@ -1277,9 +1178,20 @@ diff -NurpP --minimal linux-4.9.135/drivers/md/dm.c linux-4.9.135-vs2.3.9.8/driv
md->queue = blk_alloc_queue_node(GFP_KERNEL, numa_node_id);
if (!md->queue)
-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
+diff -NurpP --minimal linux-4.9.207/drivers/md/dm-core.h linux-4.9.207-vs2.3.9.11/drivers/md/dm-core.h
+--- linux-4.9.207/drivers/md/dm-core.h 2019-12-25 15:28:01.677892718 +0000
++++ linux-4.9.207-vs2.3.9.11/drivers/md/dm-core.h 2018-10-20 04:58:13.000000000 +0000
+@@ -52,6 +52,7 @@ struct mapped_device {
+
+ atomic_t holders;
+ atomic_t open_count;
++ vxid_t xid;
+
+ struct dm_target *immutable_target;
+ struct target_type *immutable_target_type;
+diff -NurpP --minimal linux-4.9.207/drivers/md/dm.h linux-4.9.207-vs2.3.9.11/drivers/md/dm.h
+--- linux-4.9.207/drivers/md/dm.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/drivers/md/dm.h 2018-10-20 04:58:13.000000000 +0000
@@ -45,6 +45,8 @@ struct dm_dev_internal {
struct dm_table;
struct dm_md_mempools;
@@ -1289,9 +1201,97 @@ diff -NurpP --minimal linux-4.9.135/drivers/md/dm.h linux-4.9.135-vs2.3.9.8/driv
/*-----------------------------------------------------------------
* Internal table functions.
*---------------------------------------------------------------*/
-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
+diff -NurpP --minimal linux-4.9.207/drivers/md/dm-ioctl.c linux-4.9.207-vs2.3.9.11/drivers/md/dm-ioctl.c
+--- linux-4.9.207/drivers/md/dm-ioctl.c 2019-12-25 15:28:01.687892558 +0000
++++ linux-4.9.207-vs2.3.9.11/drivers/md/dm-ioctl.c 2019-02-22 08:37:51.173126752 +0000
+@@ -16,6 +16,7 @@
+ #include <linux/dm-ioctl.h>
+ #include <linux/hdreg.h>
+ #include <linux/compat.h>
++#include <linux/vs_context.h>
+
+ #include <asm/uaccess.h>
+
+@@ -114,7 +115,8 @@ static struct hash_cell *__get_name_cell
+ unsigned int h = hash_str(str);
+
+ list_for_each_entry (hc, _name_buckets + h, name_list)
+- if (!strcmp(hc->name, str)) {
++ if (vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT) &&
++ !strcmp(hc->name, str)) {
+ dm_get(hc->md);
+ return hc;
+ }
+@@ -128,7 +130,8 @@ static struct hash_cell *__get_uuid_cell
+ unsigned int h = hash_str(str);
+
+ list_for_each_entry (hc, _uuid_buckets + h, uuid_list)
+- if (!strcmp(hc->uuid, str)) {
++ if (vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT) &&
++ !strcmp(hc->uuid, str)) {
+ dm_get(hc->md);
+ return hc;
+ }
+@@ -139,13 +142,15 @@ static struct hash_cell *__get_uuid_cell
+ static struct hash_cell *__get_dev_cell(uint64_t dev)
+ {
+ struct mapped_device *md;
+- struct hash_cell *hc;
++ struct hash_cell *hc = NULL;
+
+ md = dm_get_md(huge_decode_dev(dev));
+ if (!md)
+ return NULL;
+
+- hc = dm_get_mdptr(md);
++ if (vx_check(dm_get_xid(md), VS_WATCH_P | VS_IDENT))
++ hc = dm_get_mdptr(md);
++
+ if (!hc) {
+ dm_put(md);
+ return NULL;
+@@ -467,6 +472,9 @@ typedef int (*ioctl_fn)(struct dm_ioctl
+
+ static int remove_all(struct dm_ioctl *param, size_t param_size)
+ {
++ if (!vx_check(0, VS_ADMIN))
++ return -EPERM;
++
+ dm_hash_remove_all(true, !!(param->flags & DM_DEFERRED_REMOVE), false);
+ param->data_size = 0;
+ return 0;
+@@ -514,6 +522,8 @@ static int list_devices(struct dm_ioctl
+ */
+ for (i = 0; i < NUM_BUCKETS; i++) {
+ list_for_each_entry (hc, _name_buckets + i, name_list) {
++ if (!vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT))
++ continue;
+ needed += sizeof(struct dm_name_list);
+ needed += strlen(hc->name) + 1;
+ needed += ALIGN_MASK;
+@@ -537,6 +547,8 @@ static int list_devices(struct dm_ioctl
+ */
+ for (i = 0; i < NUM_BUCKETS; i++) {
+ list_for_each_entry (hc, _name_buckets + i, name_list) {
++ if (!vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT))
++ continue;
+ if (old_nl)
+ old_nl->next = (uint32_t) ((void *) nl -
+ (void *) old_nl);
+@@ -1799,8 +1811,8 @@ static int ctl_ioctl(uint command, struc
+ size_t input_param_size;
+ struct dm_ioctl param_kernel;
+
+- /* only root can play with this */
+- if (!capable(CAP_SYS_ADMIN))
++ /* only root and certain contexts can play with this */
++ if (!vx_capable(CAP_SYS_ADMIN, VXC_ADMIN_MAPPER))
+ return -EACCES;
+
+ if (_IOC_TYPE(command) != DM_IOCTL)
+diff -NurpP --minimal linux-4.9.207/drivers/net/tun.c linux-4.9.207-vs2.3.9.11/drivers/net/tun.c
+--- linux-4.9.207/drivers/net/tun.c 2019-12-25 15:28:13.097708081 +0000
++++ linux-4.9.207-vs2.3.9.11/drivers/net/tun.c 2019-10-05 14:58:41.040381546 +0000
@@ -65,6 +65,7 @@
#include <linux/nsproxy.h>
#include <linux/virtio_net.h>
@@ -1324,7 +1324,7 @@ diff -NurpP --minimal linux-4.9.135/drivers/net/tun.c linux-4.9.135-vs2.3.9.8/dr
dev->ethtool_ops = &tun_ethtool_ops;
dev->destructor = tun_free_netdev;
-@@ -1769,7 +1773,7 @@ static int tun_set_iff(struct net *net,
+@@ -1771,7 +1775,7 @@ static int tun_set_iff(struct net *net,
int queues = ifr->ifr_flags & IFF_MULTI_QUEUE ?
MAX_TAP_QUEUES : 1;
@@ -1333,7 +1333,7 @@ diff -NurpP --minimal linux-4.9.135/drivers/net/tun.c linux-4.9.135-vs2.3.9.8/dr
return -EPERM;
err = security_tun_dev_create();
if (err < 0)
-@@ -2134,6 +2138,16 @@ static long __tun_chr_ioctl(struct file
+@@ -2140,6 +2144,16 @@ static long __tun_chr_ioctl(struct file
from_kgid(&init_user_ns, tun->group));
break;
@@ -1350,10 +1350,10 @@ diff -NurpP --minimal linux-4.9.135/drivers/net/tun.c linux-4.9.135-vs2.3.9.8/dr
case TUNSETLINK:
/* Only allow setting the type when the interface is down */
if (tun->dev->flags & IFF_UP) {
-diff -NurpP --minimal linux-4.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
+diff -NurpP --minimal linux-4.9.207/drivers/scsi/cxgbi/libcxgbi.c linux-4.9.207-vs2.3.9.11/drivers/scsi/cxgbi/libcxgbi.c
+--- linux-4.9.207/drivers/scsi/cxgbi/libcxgbi.c 2019-12-25 15:28:19.947597331 +0000
++++ linux-4.9.207-vs2.3.9.11/drivers/scsi/cxgbi/libcxgbi.c 2019-10-05 14:58:43.270345911 +0000
+@@ -776,7 +776,8 @@ static struct cxgbi_sock *cxgbi_check_ro
struct inet6_dev *idev = ip6_dst_idev((struct dst_entry *)rt);
err = ipv6_dev_get_saddr(&init_net, idev ? idev->dev : NULL,
@@ -1363,9 +1363,9 @@ diff -NurpP --minimal linux-4.9.135/drivers/scsi/cxgbi/libcxgbi.c linux-4.9.135-
if (err) {
pr_info("failed to get source address to reach %pI6\n",
&daddr6->sin6_addr);
-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
+diff -NurpP --minimal linux-4.9.207/drivers/tty/sysrq.c linux-4.9.207-vs2.3.9.11/drivers/tty/sysrq.c
+--- linux-4.9.207/drivers/tty/sysrq.c 2019-12-25 15:28:24.267527483 +0000
++++ linux-4.9.207-vs2.3.9.11/drivers/tty/sysrq.c 2018-10-20 04:58:13.000000000 +0000
@@ -47,6 +47,7 @@
#include <linux/syscalls.h>
#include <linux/of.h>
@@ -1417,9 +1417,9 @@ diff -NurpP --minimal linux-4.9.135/drivers/tty/sysrq.c linux-4.9.135-vs2.3.9.8/
else
retval = -1;
return retval;
-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
+diff -NurpP --minimal linux-4.9.207/drivers/tty/tty_io.c linux-4.9.207-vs2.3.9.11/drivers/tty/tty_io.c
+--- linux-4.9.207/drivers/tty/tty_io.c 2019-12-25 15:28:24.287527162 +0000
++++ linux-4.9.207-vs2.3.9.11/drivers/tty/tty_io.c 2019-10-05 14:58:43.980334565 +0000
@@ -104,6 +104,7 @@
#include <linux/kmod.h>
@@ -1428,7 +1428,7 @@ diff -NurpP --minimal linux-4.9.135/drivers/tty/tty_io.c linux-4.9.135-vs2.3.9.8
#undef TTY_DEBUG_HANGUP
#ifdef TTY_DEBUG_HANGUP
-@@ -2308,7 +2309,8 @@ static int tiocsti(struct tty_struct *tt
+@@ -2318,7 +2319,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.135/drivers/tty/tty_io.c linux-4.9.135-vs2.3.9.8
return -EPERM;
if (get_user(ch, p))
return -EFAULT;
-@@ -2623,6 +2625,7 @@ static int tiocspgrp(struct tty_struct *
+@@ -2634,6 +2636,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.135/drivers/tty/tty_io.c linux-4.9.135-vs2.3.9.8
if (pgrp_nr < 0)
return -EINVAL;
rcu_read_lock();
-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
+diff -NurpP --minimal linux-4.9.207/fs/attr.c linux-4.9.207-vs2.3.9.11/fs/attr.c
+--- linux-4.9.207/fs/attr.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/attr.c 2018-10-20 04:58:13.000000000 +0000
@@ -15,6 +15,9 @@
#include <linux/security.h>
#include <linux/evm.h>
@@ -1489,9 +1489,9 @@ diff -NurpP --minimal linux-4.9.135/fs/attr.c linux-4.9.135-vs2.3.9.8/fs/attr.c
if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
return -EPERM;
}
-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
+diff -NurpP --minimal linux-4.9.207/fs/block_dev.c linux-4.9.207-vs2.3.9.11/fs/block_dev.c
+--- linux-4.9.207/fs/block_dev.c 2019-12-25 15:28:35.697342685 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/block_dev.c 2019-02-22 08:37:54.463070814 +0000
@@ -31,6 +31,7 @@
#include <linux/dax.h>
#include <linux/badblocks.h>
@@ -1500,7 +1500,7 @@ diff -NurpP --minimal linux-4.9.135/fs/block_dev.c linux-4.9.135-vs2.3.9.8/fs/bl
#include <asm/uaccess.h>
#include "internal.h"
-@@ -720,6 +721,7 @@ struct block_device *bdget(dev_t dev)
+@@ -734,6 +735,7 @@ struct block_device *bdget(dev_t dev)
bdev->bd_invalidated = 0;
inode->i_mode = S_IFBLK;
inode->i_rdev = dev;
@@ -1508,7 +1508,7 @@ diff -NurpP --minimal linux-4.9.135/fs/block_dev.c linux-4.9.135-vs2.3.9.8/fs/bl
inode->i_bdev = bdev;
inode->i_data.a_ops = &def_blk_aops;
mapping_set_gfp_mask(&inode->i_data, GFP_USER);
-@@ -766,6 +768,11 @@ EXPORT_SYMBOL(bdput);
+@@ -780,6 +782,11 @@ EXPORT_SYMBOL(bdput);
static struct block_device *bd_acquire(struct inode *inode)
{
struct block_device *bdev;
@@ -1520,7 +1520,7 @@ diff -NurpP --minimal linux-4.9.135/fs/block_dev.c linux-4.9.135-vs2.3.9.8/fs/bl
spin_lock(&bdev_lock);
bdev = inode->i_bdev;
-@@ -776,7 +783,7 @@ static struct block_device *bd_acquire(s
+@@ -790,7 +797,7 @@ static struct block_device *bd_acquire(s
}
spin_unlock(&bdev_lock);
@@ -1529,9 +1529,9 @@ diff -NurpP --minimal linux-4.9.135/fs/block_dev.c linux-4.9.135-vs2.3.9.8/fs/bl
if (bdev) {
spin_lock(&bdev_lock);
if (!inode->i_bdev) {
-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
+diff -NurpP --minimal linux-4.9.207/fs/btrfs/ctree.h linux-4.9.207-vs2.3.9.11/fs/btrfs/ctree.h
+--- linux-4.9.207/fs/btrfs/ctree.h 2019-12-25 15:28:35.767341551 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/btrfs/ctree.h 2019-02-22 08:37:54.473070642 +0000
@@ -1321,6 +1321,8 @@ static inline u32 BTRFS_MAX_XATTR_SIZE(c
#define BTRFS_DEFAULT_COMMIT_INTERVAL (30)
#define BTRFS_DEFAULT_MAX_INLINE (2048)
@@ -1541,7 +1541,7 @@ diff -NurpP --minimal linux-4.9.135/fs/btrfs/ctree.h linux-4.9.135-vs2.3.9.8/fs/
#define btrfs_clear_opt(o, opt) ((o) &= ~BTRFS_MOUNT_##opt)
#define btrfs_set_opt(o, opt) ((o) |= BTRFS_MOUNT_##opt)
#define btrfs_raw_test_opt(o, opt) ((o) & BTRFS_MOUNT_##opt)
-@@ -1668,6 +1670,7 @@ BTRFS_SETGET_FUNCS(inode_block_group, st
+@@ -1671,6 +1673,7 @@ BTRFS_SETGET_FUNCS(inode_block_group, st
BTRFS_SETGET_FUNCS(inode_nlink, struct btrfs_inode_item, nlink, 32);
BTRFS_SETGET_FUNCS(inode_uid, struct btrfs_inode_item, uid, 32);
BTRFS_SETGET_FUNCS(inode_gid, struct btrfs_inode_item, gid, 32);
@@ -1549,7 +1549,7 @@ diff -NurpP --minimal linux-4.9.135/fs/btrfs/ctree.h linux-4.9.135-vs2.3.9.8/fs/
BTRFS_SETGET_FUNCS(inode_mode, struct btrfs_inode_item, mode, 32);
BTRFS_SETGET_FUNCS(inode_rdev, struct btrfs_inode_item, rdev, 64);
BTRFS_SETGET_FUNCS(inode_flags, struct btrfs_inode_item, flags, 64);
-@@ -1715,6 +1718,10 @@ BTRFS_SETGET_FUNCS(extent_flags, struct
+@@ -1718,6 +1721,10 @@ BTRFS_SETGET_FUNCS(extent_flags, struct
BTRFS_SETGET_FUNCS(extent_refs_v0, struct btrfs_extent_item_v0, refs, 32);
@@ -1560,7 +1560,7 @@ diff -NurpP --minimal linux-4.9.135/fs/btrfs/ctree.h linux-4.9.135-vs2.3.9.8/fs/
BTRFS_SETGET_FUNCS(tree_block_level, struct btrfs_tree_block_info, level, 8);
-@@ -3197,6 +3204,7 @@ int btrfs_ioctl_get_supported_features(v
+@@ -3201,6 +3208,7 @@ int btrfs_ioctl_get_supported_features(v
void btrfs_update_iflags(struct inode *inode);
void btrfs_inherit_iflags(struct inode *inode, struct inode *dir);
int btrfs_is_empty_uuid(u8 *uuid);
@@ -1568,10 +1568,10 @@ diff -NurpP --minimal linux-4.9.135/fs/btrfs/ctree.h linux-4.9.135-vs2.3.9.8/fs/
int btrfs_defrag_file(struct inode *inode, struct file *file,
struct btrfs_ioctl_defrag_range_args *range,
u64 newer_than, unsigned long max_pages);
-diff -NurpP --minimal linux-4.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,
+diff -NurpP --minimal linux-4.9.207/fs/btrfs/disk-io.c linux-4.9.207-vs2.3.9.11/fs/btrfs/disk-io.c
+--- linux-4.9.207/fs/btrfs/disk-io.c 2019-12-25 15:28:35.787341229 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/btrfs/disk-io.c 2019-02-22 08:37:54.473070642 +0000
+@@ -2706,6 +2706,9 @@ int open_ctree(struct super_block *sb,
goto fail_alloc;
}
@@ -1581,9 +1581,9 @@ diff -NurpP --minimal linux-4.9.135/fs/btrfs/disk-io.c linux-4.9.135-vs2.3.9.8/f
features = btrfs_super_incompat_flags(disk_super) &
~BTRFS_FEATURE_INCOMPAT_SUPP;
if (features) {
-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
+diff -NurpP --minimal linux-4.9.207/fs/btrfs/inode.c linux-4.9.207-vs2.3.9.11/fs/btrfs/inode.c
+--- linux-4.9.207/fs/btrfs/inode.c 2019-12-25 15:28:35.847340258 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/btrfs/inode.c 2019-12-25 15:37:51.118443417 +0000
@@ -43,6 +43,7 @@
#include <linux/blkdev.h>
#include <linux/posix_acl_xattr.h>
@@ -1640,7 +1640,7 @@ diff -NurpP --minimal linux-4.9.135/fs/btrfs/inode.c linux-4.9.135-vs2.3.9.8/fs/
btrfs_set_token_inode_size(leaf, item, BTRFS_I(inode)->disk_i_size,
&token);
btrfs_set_token_inode_mode(leaf, item, inode->i_mode, &token);
-@@ -10646,6 +10663,7 @@ static const struct inode_operations btr
+@@ -10649,6 +10666,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.135/fs/btrfs/inode.c linux-4.9.135-vs2.3.9.8/fs/
.get_acl = btrfs_get_acl,
.set_acl = btrfs_set_acl,
.update_time = btrfs_update_time,
-@@ -10654,6 +10672,7 @@ static const struct inode_operations btr
+@@ -10657,6 +10675,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.135/fs/btrfs/inode.c linux-4.9.135-vs2.3.9.8/fs/
.update_time = btrfs_update_time,
};
-@@ -10719,6 +10738,7 @@ static const struct inode_operations btr
+@@ -10722,6 +10741,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.135/fs/btrfs/inode.c linux-4.9.135-vs2.3.9.8/fs/
.get_acl = btrfs_get_acl,
.set_acl = btrfs_set_acl,
.update_time = btrfs_update_time,
-diff -NurpP --minimal linux-4.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
+diff -NurpP --minimal linux-4.9.207/fs/btrfs/ioctl.c linux-4.9.207-vs2.3.9.11/fs/btrfs/ioctl.c
+--- linux-4.9.207/fs/btrfs/ioctl.c 2019-12-25 15:28:35.847340258 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/btrfs/ioctl.c 2019-10-05 14:58:45.120316346 +0000
@@ -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.135/fs/btrfs/ioctl.c linux-4.9.135-vs2.3.9.8/fs/
if (flags & FS_APPEND_FL)
ip->flags |= BTRFS_INODE_APPEND;
else
-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
+diff -NurpP --minimal linux-4.9.207/fs/btrfs/super.c linux-4.9.207-vs2.3.9.11/fs/btrfs/super.c
+--- linux-4.9.207/fs/btrfs/super.c 2019-12-25 15:28:35.857340098 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/btrfs/super.c 2019-02-22 08:37:54.503070133 +0000
@@ -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.135/fs/btrfs/super.c linux-4.9.135-vs2.3.9.8/fs/
if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
goto out;
-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
+diff -NurpP --minimal linux-4.9.207/fs/char_dev.c linux-4.9.207-vs2.3.9.11/fs/char_dev.c
+--- linux-4.9.207/fs/char_dev.c 2019-12-25 15:28:36.037337186 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/char_dev.c 2019-10-05 14:58:45.140316026 +0000
@@ -21,6 +21,8 @@
#include <linux/mutex.h>
#include <linux/backing-dev.h>
@@ -1915,7 +1915,7 @@ diff -NurpP --minimal linux-4.9.135/fs/char_dev.c linux-4.9.135-vs2.3.9.8/fs/cha
#include "internal.h"
-@@ -354,14 +356,21 @@ static int chrdev_open(struct inode *ino
+@@ -360,14 +362,21 @@ static int chrdev_open(struct inode *ino
struct cdev *p;
struct cdev *new = NULL;
int ret = 0;
@@ -1938,9 +1938,9 @@ diff -NurpP --minimal linux-4.9.135/fs/char_dev.c linux-4.9.135-vs2.3.9.8/fs/cha
if (!kobj)
return -ENXIO;
new = container_of(kobj, struct cdev, kobj);
-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
+diff -NurpP --minimal linux-4.9.207/fs/dcache.c linux-4.9.207-vs2.3.9.11/fs/dcache.c
+--- linux-4.9.207/fs/dcache.c 2019-12-25 15:28:36.257333629 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/dcache.c 2019-10-05 14:58:45.150315864 +0000
@@ -39,6 +39,7 @@
#include <linux/ratelimit.h>
#include <linux/list_lru.h>
@@ -1998,7 +1998,7 @@ diff -NurpP --minimal linux-4.9.135/fs/dcache.c linux-4.9.135-vs2.3.9.8/fs/dcach
spin_unlock(&dentry->d_lock);
if (parent)
spin_unlock(&parent->d_lock);
-@@ -1600,6 +1608,9 @@ struct dentry *__d_alloc(struct super_bl
+@@ -1594,6 +1602,9 @@ struct dentry *__d_alloc(struct super_bl
char *dname;
int err;
@@ -2008,7 +2008,7 @@ diff -NurpP --minimal linux-4.9.135/fs/dcache.c linux-4.9.135-vs2.3.9.8/fs/dcach
dentry = kmem_cache_alloc(dentry_cache, GFP_KERNEL);
if (!dentry)
return NULL;
-@@ -1643,6 +1654,7 @@ struct dentry *__d_alloc(struct super_bl
+@@ -1637,6 +1648,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.135/fs/dcache.c linux-4.9.135-vs2.3.9.8/fs/dcach
spin_lock_init(&dentry->d_lock);
seqcount_init(&dentry->d_seq);
dentry->d_inode = NULL;
-@@ -2316,6 +2328,7 @@ struct dentry *__d_lookup(const struct d
+@@ -2310,6 +2322,7 @@ struct dentry *__d_lookup(const struct d
goto next;
dentry->d_lockref.count++;
@@ -2024,7 +2024,7 @@ diff -NurpP --minimal linux-4.9.135/fs/dcache.c linux-4.9.135-vs2.3.9.8/fs/dcach
found = dentry;
spin_unlock(&dentry->d_lock);
break;
-@@ -3574,6 +3587,7 @@ static enum d_walk_ret d_genocide_kill(v
+@@ -3568,6 +3581,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.135/fs/dcache.c linux-4.9.135-vs2.3.9.8/fs/dcach
}
}
return D_WALK_CONTINUE;
-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
+diff -NurpP --minimal linux-4.9.207/fs/devpts/inode.c linux-4.9.207-vs2.3.9.11/fs/devpts/inode.c
+--- linux-4.9.207/fs/devpts/inode.c 2019-12-25 15:28:36.287333144 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/devpts/inode.c 2019-10-05 14:58:45.150315864 +0000
@@ -27,6 +27,7 @@
#include <linux/parser.h>
#include <linux/fsnotify.h>
@@ -2100,7 +2100,7 @@ diff -NurpP --minimal linux-4.9.135/fs/devpts/inode.c linux-4.9.135-vs2.3.9.8/fs
static const struct super_operations devpts_sops = {
.statfs = simple_statfs,
.remount_fs = devpts_remount,
-@@ -415,8 +459,10 @@ devpts_fill_super(struct super_block *s,
+@@ -416,8 +460,10 @@ devpts_fill_super(struct super_block *s,
inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO | S_IWUSR;
inode->i_op = &simple_dir_inode_operations;
@@ -2112,7 +2112,7 @@ diff -NurpP --minimal linux-4.9.135/fs/devpts/inode.c linux-4.9.135-vs2.3.9.8/fs
s->s_root = d_make_root(inode);
if (!s->s_root) {
-@@ -542,6 +588,9 @@ struct dentry *devpts_pty_new(struct pts
+@@ -543,6 +589,9 @@ struct dentry *devpts_pty_new(struct pts
inode->i_gid = opts->setgid ? opts->gid : current_fsgid();
inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
init_special_inode(inode, S_IFCHR|opts->mode, MKDEV(UNIX98_PTY_SLAVE_MAJOR, index));
@@ -2122,9 +2122,9 @@ diff -NurpP --minimal linux-4.9.135/fs/devpts/inode.c linux-4.9.135-vs2.3.9.8/fs
sprintf(s, "%d", index);
-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
+diff -NurpP --minimal linux-4.9.207/fs/ext2/balloc.c linux-4.9.207-vs2.3.9.11/fs/ext2/balloc.c
+--- linux-4.9.207/fs/ext2/balloc.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/ext2/balloc.c 2018-10-20 04:58:13.000000000 +0000
@@ -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.135/fs/ext2/balloc.c linux-4.9.135-vs2.3.9.8/fs/
BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb));
repeat:
-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
+diff -NurpP --minimal linux-4.9.207/fs/ext2/ext2.h linux-4.9.207-vs2.3.9.11/fs/ext2/ext2.h
+--- linux-4.9.207/fs/ext2/ext2.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/ext2/ext2.h 2018-10-20 04:58:13.000000000 +0000
@@ -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.135/fs/ext2/ext2.h linux-4.9.135-vs2.3.9.8/fs/ex
/* ioctl.c */
extern long ext2_ioctl(struct file *, unsigned int, unsigned long);
-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
+diff -NurpP --minimal linux-4.9.207/fs/ext2/file.c linux-4.9.207-vs2.3.9.11/fs/ext2/file.c
+--- linux-4.9.207/fs/ext2/file.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/ext2/file.c 2018-10-20 04:58:13.000000000 +0000
@@ -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.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
+diff -NurpP --minimal linux-4.9.207/fs/ext2/ialloc.c linux-4.9.207-vs2.3.9.11/fs/ext2/ialloc.c
+--- linux-4.9.207/fs/ext2/ialloc.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/ext2/ialloc.c 2018-10-20 04:58:13.000000000 +0000
@@ -17,6 +17,7 @@
#include <linux/backing-dev.h>
#include <linux/buffer_head.h>
@@ -2211,9 +2211,9 @@ diff -NurpP --minimal linux-4.9.135/fs/ext2/ialloc.c linux-4.9.135-vs2.3.9.8/fs/
} else
inode_init_owner(inode, dir, mode);
-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
+diff -NurpP --minimal linux-4.9.207/fs/ext2/inode.c linux-4.9.207-vs2.3.9.11/fs/ext2/inode.c
+--- linux-4.9.207/fs/ext2/inode.c 2019-12-25 15:28:36.507329586 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/ext2/inode.c 2019-12-25 15:37:51.438438255 +0000
@@ -35,6 +35,7 @@
#include <linux/iomap.h>
#include <linux/namei.h>
@@ -2222,7 +2222,7 @@ diff -NurpP --minimal linux-4.9.135/fs/ext2/inode.c linux-4.9.135-vs2.3.9.8/fs/e
#include "ext2.h"
#include "acl.h"
#include "xattr.h"
-@@ -1357,39 +1358,61 @@ void ext2_set_inode_flags(struct inode *
+@@ -1360,39 +1361,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.135/fs/ext2/inode.c linux-4.9.135-vs2.3.9.8/fs/e
}
struct inode *ext2_iget (struct super_block *sb, unsigned long ino)
-@@ -1425,8 +1448,10 @@ struct inode *ext2_iget (struct super_bl
+@@ -1428,8 +1451,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.135/fs/ext2/inode.c linux-4.9.135-vs2.3.9.8/fs/e
set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
inode->i_size = le32_to_cpu(raw_inode->i_size);
inode->i_atime.tv_sec = (signed)le32_to_cpu(raw_inode->i_atime);
-@@ -1533,8 +1558,10 @@ static int __ext2_write_inode(struct ino
+@@ -1536,8 +1561,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.135/fs/ext2/inode.c linux-4.9.135-vs2.3.9.8/fs/e
struct buffer_head * bh;
struct ext2_inode * raw_inode = ext2_get_inode(sb, ino, &bh);
int n;
-@@ -1570,6 +1597,9 @@ static int __ext2_write_inode(struct ino
+@@ -1573,6 +1600,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.135/fs/ext2/inode.c linux-4.9.135-vs2.3.9.8/fs/e
raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
raw_inode->i_size = cpu_to_le32(inode->i_size);
raw_inode->i_atime = cpu_to_le32(inode->i_atime.tv_sec);
-@@ -1653,7 +1683,8 @@ int ext2_setattr(struct dentry *dentry,
+@@ -1656,7 +1686,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.135/fs/ext2/inode.c linux-4.9.135-vs2.3.9.8/fs/e
error = dquot_transfer(inode, iattr);
if (error)
return error;
-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
+diff -NurpP --minimal linux-4.9.207/fs/ext2/ioctl.c linux-4.9.207-vs2.3.9.11/fs/ext2/ioctl.c
+--- linux-4.9.207/fs/ext2/ioctl.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/ext2/ioctl.c 2018-10-20 04:58:13.000000000 +0000
@@ -17,6 +17,16 @@
#include <asm/uaccess.h>
@@ -2390,9 +2390,9 @@ diff -NurpP --minimal linux-4.9.135/fs/ext2/ioctl.c linux-4.9.135-vs2.3.9.8/fs/e
flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE;
ei->i_flags = flags;
-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
+diff -NurpP --minimal linux-4.9.207/fs/ext2/namei.c linux-4.9.207-vs2.3.9.11/fs/ext2/namei.c
+--- linux-4.9.207/fs/ext2/namei.c 2019-12-25 15:28:36.517329425 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/ext2/namei.c 2018-10-20 04:58:13.000000000 +0000
@@ -32,6 +32,7 @@
#include <linux/pagemap.h>
@@ -2417,9 +2417,9 @@ diff -NurpP --minimal linux-4.9.135/fs/ext2/namei.c linux-4.9.135-vs2.3.9.8/fs/e
.get_acl = ext2_get_acl,
.set_acl = ext2_set_acl,
};
-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
+diff -NurpP --minimal linux-4.9.207/fs/ext2/super.c linux-4.9.207-vs2.3.9.11/fs/ext2/super.c
+--- linux-4.9.207/fs/ext2/super.c 2019-12-25 15:28:36.537329101 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/ext2/super.c 2019-10-05 14:58:45.150315864 +0000
@@ -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,
@@ -2461,7 +2461,7 @@ diff -NurpP --minimal linux-4.9.135/fs/ext2/super.c linux-4.9.135-vs2.3.9.8/fs/e
case Opt_nocheck:
clear_opt (sbi->s_mount_opt, CHECK);
break;
-@@ -887,6 +905,8 @@ static int ext2_fill_super(struct super_
+@@ -898,6 +916,8 @@ static int ext2_fill_super(struct super_
if (!parse_options((char *) data, sb))
goto failed_mount;
@@ -2470,7 +2470,7 @@ diff -NurpP --minimal linux-4.9.135/fs/ext2/super.c linux-4.9.135-vs2.3.9.8/fs/e
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
((EXT2_SB(sb)->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ?
MS_POSIXACL : 0);
-@@ -1300,6 +1320,14 @@ static int ext2_remount (struct super_bl
+@@ -1311,6 +1331,14 @@ static int ext2_remount (struct super_bl
err = -EINVAL;
goto restore_opts;
}
@@ -2485,9 +2485,9 @@ diff -NurpP --minimal linux-4.9.135/fs/ext2/super.c linux-4.9.135-vs2.3.9.8/fs/e
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-4.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
+diff -NurpP --minimal linux-4.9.207/fs/ext4/ext4.h linux-4.9.207-vs2.3.9.11/fs/ext4/ext4.h
+--- linux-4.9.207/fs/ext4/ext4.h 2019-12-25 15:28:36.597328134 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/ext4/ext4.h 2018-10-20 11:46:17.000000000 +0000
@@ -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 */
@@ -2533,19 +2533,19 @@ diff -NurpP --minimal linux-4.9.135/fs/ext4/ext4.h linux-4.9.135-vs2.3.9.8/fs/ex
extern int ext4_alloc_da_blocks(struct inode *inode);
extern void ext4_set_aops(struct inode *inode);
extern int ext4_writepage_trans_blocks(struct inode *);
-diff -NurpP --minimal linux-4.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_
+diff -NurpP --minimal linux-4.9.207/fs/ext4/file.c linux-4.9.207-vs2.3.9.11/fs/ext4/file.c
+--- linux-4.9.207/fs/ext4/file.c 2019-12-25 15:28:36.617327809 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/ext4/file.c 2019-10-05 14:58:45.150315864 +0000
+@@ -698,5 +698,6 @@ const struct inode_operations ext4_file_
.get_acl = ext4_get_acl,
.set_acl = ext4_set_acl,
.fiemap = ext4_fiemap,
+ .sync_flags = ext4_sync_flags,
};
-diff -NurpP --minimal linux-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
+diff -NurpP --minimal linux-4.9.207/fs/ext4/ialloc.c linux-4.9.207-vs2.3.9.11/fs/ext4/ialloc.c
+--- linux-4.9.207/fs/ext4/ialloc.c 2019-12-25 15:28:36.617327809 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/ext4/ialloc.c 2018-10-20 05:55:42.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/random.h>
#include <linux/bitops.h>
@@ -2562,9 +2562,9 @@ diff -NurpP --minimal linux-4.9.135/fs/ext4/ialloc.c linux-4.9.135-vs2.3.9.8/fs/
} else
inode_init_owner(inode, dir, mode);
-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
+diff -NurpP --minimal linux-4.9.207/fs/ext4/inode.c linux-4.9.207-vs2.3.9.11/fs/ext4/inode.c
+--- linux-4.9.207/fs/ext4/inode.c 2019-12-25 15:28:36.667327000 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/ext4/inode.c 2019-12-25 15:37:51.518436962 +0000
@@ -37,6 +37,7 @@
#include <linux/printk.h>
#include <linux/slab.h>
@@ -2573,7 +2573,7 @@ diff -NurpP --minimal linux-4.9.135/fs/ext4/inode.c linux-4.9.135-vs2.3.9.8/fs/e
#include "ext4_jbd2.h"
#include "xattr.h"
-@@ -4380,12 +4381,15 @@ void ext4_set_inode_flags(struct inode *
+@@ -4390,12 +4391,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.135/fs/ext4/inode.c linux-4.9.135-vs2.3.9.8/fs/e
if (flags & EXT4_NOATIME_FL)
new_fl |= S_NOATIME;
if (flags & EXT4_DIRSYNC_FL)
-@@ -4393,31 +4397,52 @@ void ext4_set_inode_flags(struct inode *
+@@ -4403,31 +4407,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.135/fs/ext4/inode.c linux-4.9.135-vs2.3.9.8/fs/e
} while (cmpxchg(&ei->i_flags, old_fl, new_fl) != old_fl);
}
-@@ -4543,8 +4568,10 @@ struct inode *ext4_iget(struct super_blo
+@@ -4553,8 +4578,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.135/fs/ext4/inode.c linux-4.9.135-vs2.3.9.8/fs/e
ei->i_projid = make_kprojid(&init_user_ns, i_projid);
set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
-@@ -4860,8 +4887,10 @@ static int ext4_do_update_inode(handle_t
+@@ -4870,8 +4897,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.135/fs/ext4/inode.c linux-4.9.135-vs2.3.9.8/fs/e
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));
-@@ -4885,6 +4914,9 @@ static int ext4_do_update_inode(handle_t
+@@ -4895,6 +4924,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.135/fs/ext4/inode.c linux-4.9.135-vs2.3.9.8/fs/e
raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
EXT4_INODE_SET_XTIME(i_ctime, inode, raw_inode);
-@@ -5138,7 +5170,8 @@ int ext4_setattr(struct dentry *dentry,
+@@ -5152,7 +5184,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.135/fs/ext4/inode.c linux-4.9.135-vs2.3.9.8/fs/e
handle_t *handle;
/* (user+group)*(old+new) structure, inode write (sb,
-@@ -5161,6 +5194,8 @@ int ext4_setattr(struct dentry *dentry,
+@@ -5175,6 +5208,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.135/fs/ext4/inode.c linux-4.9.135-vs2.3.9.8/fs/e
error = ext4_mark_inode_dirty(handle, inode);
ext4_journal_stop(handle);
}
-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
+diff -NurpP --minimal linux-4.9.207/fs/ext4/ioctl.c linux-4.9.207-vs2.3.9.11/fs/ext4/ioctl.c
+--- linux-4.9.207/fs/ext4/ioctl.c 2019-12-25 15:28:36.707326353 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/ext4/ioctl.c 2019-10-05 14:58:45.150315864 +0000
@@ -15,6 +15,7 @@
#include <linux/file.h>
#include <linux/quotaops.h>
@@ -2726,7 +2726,7 @@ diff -NurpP --minimal linux-4.9.135/fs/ext4/ioctl.c linux-4.9.135-vs2.3.9.8/fs/e
if (!capable(CAP_LINUX_IMMUTABLE))
goto flags_out;
}
-@@ -430,6 +433,33 @@ static inline unsigned long ext4_xflags_
+@@ -432,6 +435,33 @@ static inline unsigned long ext4_xflags_
return iflags;
}
@@ -2760,7 +2760,7 @@ diff -NurpP --minimal linux-4.9.135/fs/ext4/ioctl.c linux-4.9.135-vs2.3.9.8/fs/e
long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
struct inode *inode = file_inode(filp);
-@@ -459,6 +489,11 @@ long ext4_ioctl(struct file *filp, unsig
+@@ -461,6 +491,11 @@ long ext4_ioctl(struct file *filp, unsig
flags = ext4_mask_flags(inode->i_mode, flags);
@@ -2772,9 +2772,9 @@ diff -NurpP --minimal linux-4.9.135/fs/ext4/ioctl.c linux-4.9.135-vs2.3.9.8/fs/e
inode_lock(inode);
err = ext4_ioctl_setflags(inode, flags);
inode_unlock(inode);
-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
+diff -NurpP --minimal linux-4.9.207/fs/ext4/namei.c linux-4.9.207-vs2.3.9.11/fs/ext4/namei.c
+--- linux-4.9.207/fs/ext4/namei.c 2019-12-25 15:28:36.737325868 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/ext4/namei.c 2019-10-05 14:58:45.150315864 +0000
@@ -33,6 +33,7 @@
#include <linux/quotaops.h>
#include <linux/buffer_head.h>
@@ -2783,7 +2783,7 @@ diff -NurpP --minimal linux-4.9.135/fs/ext4/namei.c linux-4.9.135-vs2.3.9.8/fs/e
#include "ext4.h"
#include "ext4_jbd2.h"
-@@ -1460,6 +1461,7 @@ restart:
+@@ -1474,6 +1475,7 @@ restart:
REQ_META | REQ_PRIO,
1, &bh);
}
@@ -2791,7 +2791,7 @@ diff -NurpP --minimal linux-4.9.135/fs/ext4/namei.c linux-4.9.135-vs2.3.9.8/fs/e
}
if ((bh = bh_use[ra_ptr++]) == NULL)
goto next;
-@@ -3911,6 +3913,7 @@ const struct inode_operations ext4_dir_i
+@@ -3943,6 +3945,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.135/fs/ext4/namei.c linux-4.9.135-vs2.3.9.8/fs/e
};
const struct inode_operations ext4_special_inode_operations = {
-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 {
+diff -NurpP --minimal linux-4.9.207/fs/ext4/super.c linux-4.9.207-vs2.3.9.11/fs/ext4/super.c
+--- linux-4.9.207/fs/ext4/super.c 2019-12-25 15:28:36.737325868 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/ext4/super.c 2019-10-05 14:58:45.150315864 +0000
+@@ -1292,6 +1292,7 @@ enum {
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.135/fs/ext4/super.c linux-4.9.135-vs2.3.9.8/fs/e
};
static const match_table_t tokens = {
-@@ -1367,6 +1368,9 @@ static const match_table_t tokens = {
+@@ -1378,6 +1379,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.135/fs/ext4/super.c linux-4.9.135-vs2.3.9.8/fs/e
{Opt_err, NULL},
};
-@@ -1612,6 +1616,20 @@ static int handle_mount_opt(struct super
+@@ -1623,6 +1627,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.135/fs/ext4/super.c linux-4.9.135-vs2.3.9.8/fs/e
}
for (m = ext4_mount_opts; m->token != Opt_err; m++)
-@@ -3587,6 +3605,9 @@ static int ext4_fill_super(struct super_
+@@ -3598,6 +3616,9 @@ static int ext4_fill_super(struct super_
sb->s_iflags |= SB_I_CGROUPWB;
}
@@ -2851,7 +2851,7 @@ diff -NurpP --minimal linux-4.9.135/fs/ext4/super.c linux-4.9.135-vs2.3.9.8/fs/e
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-@@ -4984,6 +5005,14 @@ static int ext4_remount(struct super_blo
+@@ -4996,6 +5017,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.135/fs/ext4/super.c linux-4.9.135-vs2.3.9.8/fs/e
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-4.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
+diff -NurpP --minimal linux-4.9.207/fs/fcntl.c linux-4.9.207-vs2.3.9.11/fs/fcntl.c
+--- linux-4.9.207/fs/fcntl.c 2019-12-25 15:28:36.887323442 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/fcntl.c 2018-10-20 04:58:13.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/pid_namespace.h>
#include <linux/user_namespace.h>
@@ -2886,9 +2886,9 @@ diff -NurpP --minimal linux-4.9.135/fs/fcntl.c linux-4.9.135-vs2.3.9.8/fs/fcntl.
if (unlikely(f.file->f_mode & FMODE_PATH)) {
if (!check_fcntl_cmd(cmd))
-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
+diff -NurpP --minimal linux-4.9.207/fs/file.c linux-4.9.207-vs2.3.9.11/fs/file.c
+--- linux-4.9.207/fs/file.c 2019-12-25 15:28:36.907323120 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/file.c 2019-10-05 14:58:45.150315864 +0000
@@ -22,6 +22,7 @@
#include <linux/spinlock.h>
#include <linux/rcupdate.h>
@@ -2918,7 +2918,7 @@ diff -NurpP --minimal linux-4.9.135/fs/file.c linux-4.9.135-vs2.3.9.8/fs/file.c
}
}
-@@ -539,6 +544,7 @@ repeat:
+@@ -540,6 +545,7 @@ repeat:
else
__clear_close_on_exec(fd, fdt);
error = fd;
@@ -2926,7 +2926,7 @@ diff -NurpP --minimal linux-4.9.135/fs/file.c linux-4.9.135-vs2.3.9.8/fs/file.c
#if 1
/* Sanity check */
if (rcu_access_pointer(fdt->fd[fd]) != NULL) {
-@@ -569,6 +575,7 @@ static void __put_unused_fd(struct files
+@@ -570,6 +576,7 @@ static void __put_unused_fd(struct files
__clear_open_fd(fd, fdt);
if (fd < files->next_fd)
files->next_fd = fd;
@@ -2934,7 +2934,7 @@ diff -NurpP --minimal linux-4.9.135/fs/file.c linux-4.9.135-vs2.3.9.8/fs/file.c
}
void put_unused_fd(unsigned int fd)
-@@ -856,6 +863,8 @@ __releases(&files->file_lock)
+@@ -857,6 +864,8 @@ __releases(&files->file_lock)
if (tofree)
filp_close(tofree, files);
@@ -2943,9 +2943,9 @@ diff -NurpP --minimal linux-4.9.135/fs/file.c linux-4.9.135-vs2.3.9.8/fs/file.c
return fd;
-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
+diff -NurpP --minimal linux-4.9.207/fs/file_table.c linux-4.9.207-vs2.3.9.11/fs/file_table.c
+--- linux-4.9.207/fs/file_table.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/file_table.c 2018-10-20 04:58:13.000000000 +0000
@@ -26,6 +26,8 @@
#include <linux/task_work.h>
#include <linux/ima.h>
@@ -2982,9 +2982,9 @@ diff -NurpP --minimal linux-4.9.135/fs/file_table.c linux-4.9.135-vs2.3.9.8/fs/f
file_free(file);
}
}
-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
+diff -NurpP --minimal linux-4.9.207/fs/fs_struct.c linux-4.9.207-vs2.3.9.11/fs/fs_struct.c
+--- linux-4.9.207/fs/fs_struct.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/fs_struct.c 2018-10-20 04:58:13.000000000 +0000
@@ -4,6 +4,7 @@
#include <linux/path.h>
#include <linux/slab.h>
@@ -3009,9 +3009,9 @@ diff -NurpP --minimal linux-4.9.135/fs/fs_struct.c linux-4.9.135-vs2.3.9.8/fs/fs
}
return fs;
}
-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
+diff -NurpP --minimal linux-4.9.207/fs/gfs2/file.c linux-4.9.207-vs2.3.9.11/fs/gfs2/file.c
+--- linux-4.9.207/fs/gfs2/file.c 2019-12-25 15:28:37.037321018 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/gfs2/file.c 2018-10-20 04:58:13.000000000 +0000
@@ -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.135/fs/gfs2/file.c linux-4.9.135-vs2.3.9.8/fs/gf
static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
switch(cmd) {
-diff -NurpP --minimal linux-4.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
+diff -NurpP --minimal linux-4.9.207/fs/gfs2/inode.h linux-4.9.207-vs2.3.9.11/fs/gfs2/inode.h
+--- linux-4.9.207/fs/gfs2/inode.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/gfs2/inode.h 2018-10-20 04:58:13.000000000 +0000
@@ -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.135/fs/gfs2/inode.h linux-4.9.135-vs2.3.9.8/fs/g
#ifdef CONFIG_GFS2_FS_LOCKING_DLM
extern const struct file_operations gfs2_file_fops;
-diff -NurpP --minimal linux-4.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
+diff -NurpP --minimal linux-4.9.207/fs/hostfs/hostfs.h linux-4.9.207-vs2.3.9.11/fs/hostfs/hostfs.h
+--- linux-4.9.207/fs/hostfs/hostfs.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/hostfs/hostfs.h 2018-10-20 04:58:13.000000000 +0000
@@ -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.135/fs/hostfs/hostfs.h linux-4.9.135-vs2.3.9.8/f
loff_t ia_size;
struct timespec ia_atime;
struct timespec ia_mtime;
-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
+diff -NurpP --minimal linux-4.9.207/fs/inode.c linux-4.9.207-vs2.3.9.11/fs/inode.c
+--- linux-4.9.207/fs/inode.c 2019-12-25 15:28:37.147319239 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/inode.c 2019-10-05 14:58:45.170315544 +0000
@@ -18,6 +18,7 @@
#include <linux/buffer_head.h> /* for inode_has_buffers */
#include <linux/ratelimit.h>
@@ -3200,7 +3200,7 @@ diff -NurpP --minimal linux-4.9.135/fs/inode.c linux-4.9.135-vs2.3.9.8/fs/inode.
/**
* __remove_inode_hash - remove an inode from the hash
* @inode: inode to unhash
-@@ -1977,9 +1984,11 @@ void init_special_inode(struct inode *in
+@@ -1982,9 +1989,11 @@ void init_special_inode(struct inode *in
if (S_ISCHR(mode)) {
inode->i_fop = &def_chr_fops;
inode->i_rdev = rdev;
@@ -3212,7 +3212,7 @@ diff -NurpP --minimal linux-4.9.135/fs/inode.c linux-4.9.135-vs2.3.9.8/fs/inode.
} else if (S_ISFIFO(mode))
inode->i_fop = &pipefifo_fops;
else if (S_ISSOCK(mode))
-@@ -2014,6 +2023,7 @@ void inode_init_owner(struct inode *inod
+@@ -2019,6 +2028,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.135/fs/inode.c linux-4.9.135-vs2.3.9.8/fs/inode.
}
EXPORT_SYMBOL(inode_init_owner);
-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
+diff -NurpP --minimal linux-4.9.207/fs/ioctl.c linux-4.9.207-vs2.3.9.11/fs/ioctl.c
+--- linux-4.9.207/fs/ioctl.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/ioctl.c 2018-10-20 04:58:13.000000000 +0000
@@ -15,6 +15,9 @@
#include <linux/writeback.h>
#include <linux/buffer_head.h>
@@ -3233,9 +3233,9 @@ diff -NurpP --minimal linux-4.9.135/fs/ioctl.c linux-4.9.135-vs2.3.9.8/fs/ioctl.
#include "internal.h"
#include <asm/ioctls.h>
-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
+diff -NurpP --minimal linux-4.9.207/fs/jfs/file.c linux-4.9.207-vs2.3.9.11/fs/jfs/file.c
+--- linux-4.9.207/fs/jfs/file.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/jfs/file.c 2018-10-20 04:58:13.000000000 +0000
@@ -113,7 +113,8 @@ int jfs_setattr(struct dentry *dentry, s
return rc;
}
@@ -3254,9 +3254,9 @@ diff -NurpP --minimal linux-4.9.135/fs/jfs/file.c linux-4.9.135-vs2.3.9.8/fs/jfs
};
const struct file_operations jfs_file_operations = {
-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
+diff -NurpP --minimal linux-4.9.207/fs/jfs/ioctl.c linux-4.9.207-vs2.3.9.11/fs/jfs/ioctl.c
+--- linux-4.9.207/fs/jfs/ioctl.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/jfs/ioctl.c 2018-10-20 04:58:13.000000000 +0000
@@ -12,6 +12,7 @@
#include <linux/time.h>
#include <linux/sched.h>
@@ -3314,9 +3314,9 @@ diff -NurpP --minimal linux-4.9.135/fs/jfs/ioctl.c linux-4.9.135-vs2.3.9.8/fs/jf
flags |= oldflags & ~JFS_FL_USER_MODIFIABLE;
jfs_inode->mode2 = flags;
-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
+diff -NurpP --minimal linux-4.9.207/fs/jfs/jfs_dinode.h linux-4.9.207-vs2.3.9.11/fs/jfs/jfs_dinode.h
+--- linux-4.9.207/fs/jfs/jfs_dinode.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/jfs/jfs_dinode.h 2018-10-20 04:58:13.000000000 +0000
@@ -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.135/fs/jfs/jfs_dinode.h linux-4.9.135-vs2.3.9.8/
#define JFS_FL_INHERIT 0x03C80000
/* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */
-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
+diff -NurpP --minimal linux-4.9.207/fs/jfs/jfs_filsys.h linux-4.9.207-vs2.3.9.11/fs/jfs/jfs_filsys.h
+--- linux-4.9.207/fs/jfs/jfs_filsys.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/jfs/jfs_filsys.h 2018-10-20 04:58:13.000000000 +0000
@@ -266,6 +266,7 @@
#define JFS_NAME_MAX 255
#define JFS_PATH_MAX BPSIZE
@@ -3344,9 +3344,9 @@ diff -NurpP --minimal linux-4.9.135/fs/jfs/jfs_filsys.h linux-4.9.135-vs2.3.9.8/
/*
* file system state (superblock state)
-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
+diff -NurpP --minimal linux-4.9.207/fs/jfs/jfs_imap.c linux-4.9.207-vs2.3.9.11/fs/jfs/jfs_imap.c
+--- linux-4.9.207/fs/jfs/jfs_imap.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/jfs/jfs_imap.c 2018-10-20 04:58:13.000000000 +0000
@@ -46,6 +46,7 @@
#include <linux/pagemap.h>
#include <linux/quotaops.h>
@@ -3410,9 +3410,9 @@ diff -NurpP --minimal linux-4.9.135/fs/jfs/jfs_imap.c linux-4.9.135-vs2.3.9.8/fs
jfs_get_inode_flags(jfs_ip);
/*
* mode2 is only needed for storing the higher order bits.
-diff -NurpP --minimal linux-4.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
+diff -NurpP --minimal linux-4.9.207/fs/jfs/jfs_inode.c linux-4.9.207-vs2.3.9.11/fs/jfs/jfs_inode.c
+--- linux-4.9.207/fs/jfs/jfs_inode.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/jfs/jfs_inode.c 2018-10-20 04:58:14.000000000 +0000
@@ -18,6 +18,7 @@
#include <linux/fs.h>
@@ -3483,9 +3483,9 @@ diff -NurpP --minimal linux-4.9.135/fs/jfs/jfs_inode.c linux-4.9.135-vs2.3.9.8/f
}
/*
-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
+diff -NurpP --minimal linux-4.9.207/fs/jfs/jfs_inode.h linux-4.9.207-vs2.3.9.11/fs/jfs/jfs_inode.h
+--- linux-4.9.207/fs/jfs/jfs_inode.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/jfs/jfs_inode.h 2018-10-20 04:58:14.000000000 +0000
@@ -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.135/fs/jfs/jfs_inode.h linux-4.9.135-vs2.3.9.8/f
extern int jfs_get_block(struct inode *, sector_t, struct buffer_head *, int);
extern int jfs_setattr(struct dentry *, struct iattr *);
-diff -NurpP --minimal linux-4.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
+diff -NurpP --minimal linux-4.9.207/fs/jfs/namei.c linux-4.9.207-vs2.3.9.11/fs/jfs/namei.c
+--- linux-4.9.207/fs/jfs/namei.c 2019-12-25 15:28:37.197318432 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/jfs/namei.c 2018-10-20 04:58:14.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/ctype.h>
#include <linux/quotaops.h>
@@ -3521,9 +3521,9 @@ diff -NurpP --minimal linux-4.9.135/fs/jfs/namei.c linux-4.9.135-vs2.3.9.8/fs/jf
};
const struct file_operations jfs_dir_operations = {
-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
+diff -NurpP --minimal linux-4.9.207/fs/jfs/super.c linux-4.9.207-vs2.3.9.11/fs/jfs/super.c
+--- linux-4.9.207/fs/jfs/super.c 2019-12-25 15:28:37.197318432 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/jfs/super.c 2018-10-20 04:58:14.000000000 +0000
@@ -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.135/fs/jfs/super.c linux-4.9.135-vs2.3.9.8/fs/jf
if (newLVSize) {
pr_err("resize option for remount only\n");
-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
+diff -NurpP --minimal linux-4.9.207/fs/libfs.c linux-4.9.207-vs2.3.9.11/fs/libfs.c
+--- linux-4.9.207/fs/libfs.c 2019-12-25 15:28:37.237317786 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/libfs.c 2019-10-22 13:49:06.407707139 +0000
@@ -180,7 +180,8 @@ static inline unsigned char dt_type(stru
* both impossible due to the lock on directory.
*/
@@ -3603,7 +3603,7 @@ diff -NurpP --minimal linux-4.9.135/fs/libfs.c linux-4.9.135-vs2.3.9.8/fs/libfs.
{
struct dentry *dentry = file->f_path.dentry;
struct dentry *cursor = file->private_data;
-@@ -194,9 +195,10 @@ int dcache_readdir(struct file *file, st
+@@ -197,9 +198,10 @@ int dcache_readdir(struct file *file, st
p = &cursor->d_child;
while ((p = scan_positives(cursor, p, 1, &next)) != anchor) {
@@ -3616,8 +3616,8 @@ diff -NurpP --minimal linux-4.9.135/fs/libfs.c linux-4.9.135-vs2.3.9.8/fs/libfs.
ctx->pos++;
}
spin_lock(&dentry->d_lock);
-@@ -205,8 +207,22 @@ int dcache_readdir(struct file *file, st
- move_cursor(cursor, p);
+@@ -209,8 +211,22 @@ int dcache_readdir(struct file *file, st
+
return 0;
}
+
@@ -3639,9 +3639,9 @@ diff -NurpP --minimal linux-4.9.135/fs/libfs.c linux-4.9.135-vs2.3.9.8/fs/libfs.
ssize_t generic_read_dir(struct file *filp, char __user *buf, size_t siz, loff_t *ppos)
{
return -EISDIR;
-diff -NurpP --minimal linux-4.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
+diff -NurpP --minimal linux-4.9.207/fs/locks.c linux-4.9.207-vs2.3.9.11/fs/locks.c
+--- linux-4.9.207/fs/locks.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/locks.c 2018-10-20 04:58:14.000000000 +0000
@@ -127,6 +127,8 @@
#include <linux/pid_namespace.h>
#include <linux/hashtable.h>
@@ -3828,9 +3828,9 @@ diff -NurpP --minimal linux-4.9.135/fs/locks.c linux-4.9.135-vs2.3.9.8/fs/locks.
return 0;
}
-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
+diff -NurpP --minimal linux-4.9.207/fs/mount.h linux-4.9.207-vs2.3.9.11/fs/mount.h
+--- linux-4.9.207/fs/mount.h 2019-12-25 15:28:37.257317461 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/mount.h 2018-10-20 04:58:14.000000000 +0000
@@ -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.135/fs/mount.h linux-4.9.135-vs2.3.9.8/fs/mount.
};
#define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */
-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
+diff -NurpP --minimal linux-4.9.207/fs/namei.c linux-4.9.207-vs2.3.9.11/fs/namei.c
+--- linux-4.9.207/fs/namei.c 2019-12-25 15:28:37.257317461 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/namei.c 2019-02-22 08:37:55.023061290 +0000
@@ -37,9 +37,19 @@
#include <linux/hash.h>
#include <linux/bitops.h>
@@ -3976,7 +3976,7 @@ diff -NurpP --minimal linux-4.9.135/fs/namei.c linux-4.9.135-vs2.3.9.8/fs/namei.
retval = do_inode_permission(inode, mask);
if (retval)
return retval;
-@@ -2783,7 +2884,7 @@ static int may_delete(struct inode *dir,
+@@ -2824,7 +2925,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.135/fs/namei.c linux-4.9.135-vs2.3.9.8/fs/namei.
return -EPERM;
if (isdir) {
if (!d_is_dir(victim))
-@@ -2871,19 +2972,25 @@ int vfs_create(struct inode *dir, struct
+@@ -2912,19 +3013,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.135/fs/namei.c linux-4.9.135-vs2.3.9.8/fs/namei.
return error;
}
EXPORT_SYMBOL(vfs_create);
-@@ -2921,6 +3028,15 @@ static int may_open(struct path *path, i
+@@ -2962,6 +3069,15 @@ static int may_open(struct path *path, i
break;
}
@@ -4029,7 +4029,7 @@ diff -NurpP --minimal linux-4.9.135/fs/namei.c linux-4.9.135-vs2.3.9.8/fs/namei.
error = inode_permission(inode, MAY_OPEN | acc_mode);
if (error)
return error;
-@@ -3373,6 +3489,16 @@ finish_open:
+@@ -3420,6 +3536,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.135/fs/namei.c linux-4.9.135-vs2.3.9.8/fs/namei.
if (error)
goto out;
BUG_ON(*opened & FILE_OPENED); /* once it's opened, it's opened */
-@@ -3476,6 +3602,9 @@ static struct file *path_openat(struct n
+@@ -3523,6 +3649,9 @@ static struct file *path_openat(struct n
int opened = 0;
int error;
@@ -4056,7 +4056,7 @@ diff -NurpP --minimal linux-4.9.135/fs/namei.c linux-4.9.135-vs2.3.9.8/fs/namei.
file = get_empty_filp();
if (IS_ERR(file))
return file;
-@@ -3509,6 +3638,12 @@ static struct file *path_openat(struct n
+@@ -3556,6 +3685,12 @@ static struct file *path_openat(struct n
}
}
terminate_walk(nd);
@@ -4069,7 +4069,7 @@ diff -NurpP --minimal linux-4.9.135/fs/namei.c linux-4.9.135-vs2.3.9.8/fs/namei.
out2:
if (!(opened & FILE_OPENED)) {
BUG_ON(!error);
-@@ -3629,6 +3764,11 @@ static struct dentry *filename_create(in
+@@ -3676,6 +3811,11 @@ static struct dentry *filename_create(in
goto fail;
}
putname(name);
@@ -4081,7 +4081,7 @@ diff -NurpP --minimal linux-4.9.135/fs/namei.c linux-4.9.135-vs2.3.9.8/fs/namei.
return dentry;
fail:
dput(dentry);
-@@ -3747,6 +3887,7 @@ retry:
+@@ -3794,6 +3934,7 @@ retry:
error = vfs_mknod(path.dentry->d_inode,dentry,mode,0);
break;
}
@@ -4089,7 +4089,7 @@ diff -NurpP --minimal linux-4.9.135/fs/namei.c linux-4.9.135-vs2.3.9.8/fs/namei.
out:
done_path_create(&path, dentry);
if (retry_estale(error, lookup_flags)) {
-@@ -4168,7 +4309,7 @@ int vfs_link(struct dentry *old_dentry,
+@@ -4215,7 +4356,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.135/fs/namei.c linux-4.9.135-vs2.3.9.8/fs/namei.
return -EPERM;
/*
* Updating the link count will likely cause i_uid and i_gid to
-@@ -4698,6 +4839,326 @@ const char *vfs_get_link(struct dentry *
+@@ -4745,6 +4886,326 @@ const char *vfs_get_link(struct dentry *
}
EXPORT_SYMBOL(vfs_get_link);
@@ -4425,9 +4425,9 @@ diff -NurpP --minimal linux-4.9.135/fs/namei.c linux-4.9.135-vs2.3.9.8/fs/namei.
/* get the link contents into pagecache */
const char *page_get_link(struct dentry *dentry, struct inode *inode,
struct delayed_call *callback)
-diff -NurpP --minimal linux-4.9.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
+diff -NurpP --minimal linux-4.9.207/fs/namespace.c linux-4.9.207-vs2.3.9.11/fs/namespace.c
+--- linux-4.9.207/fs/namespace.c 2019-12-25 15:28:37.257317461 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/namespace.c 2019-02-22 08:37:55.023061290 +0000
@@ -24,6 +24,11 @@
#include <linux/magic.h>
#include <linux/bootmem.h>
@@ -4459,7 +4459,7 @@ diff -NurpP --minimal linux-4.9.135/fs/namespace.c linux-4.9.135-vs2.3.9.8/fs/na
lock_mount_hash();
list_add_tail(&mnt->mnt_instance, &sb->s_mounts);
unlock_mount_hash();
-@@ -1660,7 +1670,8 @@ out_unlock:
+@@ -1666,7 +1676,8 @@ out_unlock:
*/
static inline bool may_mount(void)
{
@@ -4469,7 +4469,7 @@ diff -NurpP --minimal linux-4.9.135/fs/namespace.c linux-4.9.135-vs2.3.9.8/fs/na
}
static inline bool may_mandlock(void)
-@@ -2169,6 +2180,7 @@ static int do_change_type(struct path *p
+@@ -2181,6 +2192,7 @@ static int do_change_type(struct path *p
if (err)
goto out_unlock;
}
@@ -4477,7 +4477,7 @@ diff -NurpP --minimal linux-4.9.135/fs/namespace.c linux-4.9.135-vs2.3.9.8/fs/na
lock_mount_hash();
for (m = mnt; m; m = (recurse ? next_mnt(m, mnt) : NULL))
-@@ -2197,12 +2209,14 @@ static bool has_locked_children(struct m
+@@ -2209,12 +2221,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.135/fs/namespace.c linux-4.9.135-vs2.3.9.8/fs/na
if (!old_name || !*old_name)
return -EINVAL;
err = kern_path(old_name, LOOKUP_FOLLOW|LOOKUP_AUTOMOUNT, &old_path);
-@@ -2282,7 +2296,7 @@ static int change_mount_flags(struct vfs
+@@ -2294,7 +2308,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.135/fs/namespace.c linux-4.9.135-vs2.3.9.8/fs/na
{
int err;
struct super_block *sb = path->mnt->mnt_sb;
-@@ -2767,6 +2781,7 @@ long do_mount(const char *dev_name, cons
+@@ -2779,6 +2793,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.135/fs/namespace.c linux-4.9.135-vs2.3.9.8/fs/na
/* Discard magic */
if ((flags & MS_MGC_MSK) == MS_MGC_VAL)
-@@ -2794,6 +2809,12 @@ long do_mount(const char *dev_name, cons
+@@ -2806,6 +2821,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.135/fs/namespace.c linux-4.9.135-vs2.3.9.8/fs/na
/* Separate the per-mountpoint flags */
if (flags & MS_NOSUID)
mnt_flags |= MNT_NOSUID;
-@@ -2818,15 +2839,18 @@ long do_mount(const char *dev_name, cons
+@@ -2830,15 +2851,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.135/fs/namespace.c linux-4.9.135-vs2.3.9.8/fs/na
else if (flags & (MS_SHARED | MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE))
retval = do_change_type(&path, flags);
else if (flags & MS_MOVE)
-@@ -2967,6 +2991,7 @@ struct mnt_namespace *copy_mnt_ns(unsign
+@@ -2979,6 +3003,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.135/fs/namespace.c linux-4.9.135-vs2.3.9.8/fs/na
if (rootmnt)
mntput(rootmnt);
-@@ -3142,9 +3167,10 @@ SYSCALL_DEFINE2(pivot_root, const char _
+@@ -3154,9 +3179,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.135/fs/namespace.c linux-4.9.135-vs2.3.9.8/fs/na
goto out4;
if (!check_mnt(root_mnt) || !check_mnt(new_mnt))
goto out4;
-@@ -3282,6 +3308,7 @@ void put_mnt_ns(struct mnt_namespace *ns
+@@ -3294,6 +3320,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.135/fs/namespace.c linux-4.9.135-vs2.3.9.8/fs/na
free_mnt_ns(ns);
}
-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
+diff -NurpP --minimal linux-4.9.207/fs/nfs/client.c linux-4.9.207-vs2.3.9.11/fs/nfs/client.c
+--- linux-4.9.207/fs/nfs/client.c 2019-12-25 15:28:37.347316006 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/nfs/client.c 2019-10-05 14:58:45.410311711 +0000
@@ -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.135/fs/nfs/client.c linux-4.9.135-vs2.3.9.8/fs/n
server->maxfilesize = fsinfo->maxfilesize;
server->time_delta = fsinfo->time_delta;
-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
+diff -NurpP --minimal linux-4.9.207/fs/nfs/dir.c linux-4.9.207-vs2.3.9.11/fs/nfs/dir.c
+--- linux-4.9.207/fs/nfs/dir.c 2019-12-25 15:28:37.357315845 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/nfs/dir.c 2018-10-20 04:58:14.000000000 +0000
@@ -37,6 +37,7 @@
#include <linux/sched.h>
#include <linux/kmemleak.h>
@@ -4616,9 +4616,9 @@ diff -NurpP --minimal linux-4.9.135/fs/nfs/dir.c linux-4.9.135-vs2.3.9.8/fs/nfs/
no_entry:
res = d_splice_alias(inode, dentry);
if (res != NULL) {
-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
+diff -NurpP --minimal linux-4.9.207/fs/nfs/inode.c linux-4.9.207-vs2.3.9.11/fs/nfs/inode.c
+--- linux-4.9.207/fs/nfs/inode.c 2019-12-25 15:28:37.417314874 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/nfs/inode.c 2019-10-05 14:58:45.430311390 +0000
@@ -38,6 +38,7 @@
#include <linux/slab.h>
#include <linux/compat.h>
@@ -4681,7 +4681,7 @@ diff -NurpP --minimal linux-4.9.135/fs/nfs/inode.c linux-4.9.135-vs2.3.9.8/fs/nf
nfs_set_cache_invalid(inode, NFS_INO_INVALID_ACCESS
| NFS_INO_INVALID_ACL);
}
-@@ -1272,7 +1281,9 @@ static int nfs_check_inode_attributes(st
+@@ -1273,7 +1282,9 @@ static int nfs_check_inode_attributes(st
struct nfs_inode *nfsi = NFS_I(inode);
loff_t cur_size, new_isize;
unsigned long invalid = 0;
@@ -4692,7 +4692,7 @@ diff -NurpP --minimal linux-4.9.135/fs/nfs/inode.c linux-4.9.135-vs2.3.9.8/fs/nf
if (nfs_have_delegated_attributes(inode))
return 0;
-@@ -1301,13 +1312,18 @@ static int nfs_check_inode_attributes(st
+@@ -1302,13 +1313,18 @@ static int nfs_check_inode_attributes(st
}
}
@@ -4713,7 +4713,7 @@ diff -NurpP --minimal linux-4.9.135/fs/nfs/inode.c linux-4.9.135-vs2.3.9.8/fs/nf
/* Has the link count changed? */
if ((fattr->valid & NFS_ATTR_FATTR_NLINK) && inode->i_nlink != fattr->nlink)
-@@ -1666,6 +1682,9 @@ static int nfs_update_inode(struct inode
+@@ -1667,6 +1683,9 @@ static int nfs_update_inode(struct inode
unsigned long save_cache_validity;
bool have_writers = nfs_file_has_buffered_writers(nfsi);
bool cache_revalidated = true;
@@ -4723,7 +4723,7 @@ diff -NurpP --minimal linux-4.9.135/fs/nfs/inode.c linux-4.9.135-vs2.3.9.8/fs/nf
dfprintk(VFS, "NFS: %s(%s/%lu fh_crc=0x%08x ct=%d info=0x%x)\n",
__func__, inode->i_sb->s_id, inode->i_ino,
-@@ -1785,6 +1804,9 @@ static int nfs_update_inode(struct inode
+@@ -1786,6 +1805,9 @@ static int nfs_update_inode(struct inode
cache_revalidated = false;
}
@@ -4733,7 +4733,7 @@ diff -NurpP --minimal linux-4.9.135/fs/nfs/inode.c linux-4.9.135-vs2.3.9.8/fs/nf
if (fattr->valid & NFS_ATTR_FATTR_ATIME)
memcpy(&inode->i_atime, &fattr->atime, sizeof(inode->i_atime));
-@@ -1839,6 +1861,10 @@ static int nfs_update_inode(struct inode
+@@ -1840,6 +1862,10 @@ static int nfs_update_inode(struct inode
cache_revalidated = false;
}
@@ -4744,9 +4744,9 @@ diff -NurpP --minimal linux-4.9.135/fs/nfs/inode.c linux-4.9.135-vs2.3.9.8/fs/nf
if (fattr->valid & NFS_ATTR_FATTR_NLINK) {
if (inode->i_nlink != fattr->nlink) {
invalid |= NFS_INO_INVALID_ATTR;
-diff -NurpP --minimal linux-4.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
+diff -NurpP --minimal linux-4.9.207/fs/nfs/nfs3xdr.c linux-4.9.207-vs2.3.9.11/fs/nfs/nfs3xdr.c
+--- linux-4.9.207/fs/nfs/nfs3xdr.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/nfs/nfs3xdr.c 2018-10-20 04:58:14.000000000 +0000
@@ -20,6 +20,7 @@
#include <linux/nfs3.h>
#include <linux/nfs_fs.h>
@@ -4892,9 +4892,9 @@ diff -NurpP --minimal linux-4.9.135/fs/nfs/nfs3xdr.c linux-4.9.135-vs2.3.9.8/fs/
}
/*
-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
+diff -NurpP --minimal linux-4.9.207/fs/nfs/super.c linux-4.9.207-vs2.3.9.11/fs/nfs/super.c
+--- linux-4.9.207/fs/nfs/super.c 2019-12-25 15:28:37.507313419 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/nfs/super.c 2019-10-05 14:58:45.430311390 +0000
@@ -54,6 +54,7 @@
#include <linux/parser.h>
#include <linux/nsproxy.h>
@@ -4968,9 +4968,9 @@ diff -NurpP --minimal linux-4.9.135/fs/nfs/super.c linux-4.9.135-vs2.3.9.8/fs/nf
/*
* options that take text values
-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
+diff -NurpP --minimal linux-4.9.207/fs/nfsd/auth.c linux-4.9.207-vs2.3.9.11/fs/nfsd/auth.c
+--- linux-4.9.207/fs/nfsd/auth.c 2019-12-25 15:28:37.537312933 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/nfsd/auth.c 2018-10-20 04:58:14.000000000 +0000
@@ -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.135/fs/nfsd/auth.c linux-4.9.135-vs2.3.9.8/fs/nf
rqgi = rqstp->rq_cred.cr_group_info;
-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
+diff -NurpP --minimal linux-4.9.207/fs/nfsd/nfs3xdr.c linux-4.9.207-vs2.3.9.11/fs/nfsd/nfs3xdr.c
+--- linux-4.9.207/fs/nfsd/nfs3xdr.c 2019-12-25 15:28:37.557312612 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/nfsd/nfs3xdr.c 2019-10-05 14:58:45.440311232 +0000
@@ -8,6 +8,7 @@
#include <linux/namei.h>
@@ -5045,9 +5045,9 @@ diff -NurpP --minimal linux-4.9.135/fs/nfsd/nfs3xdr.c linux-4.9.135-vs2.3.9.8/fs
if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) {
p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN);
} else {
-diff -NurpP --minimal linux-4.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
+diff -NurpP --minimal linux-4.9.207/fs/nfsd/nfs4xdr.c linux-4.9.207-vs2.3.9.11/fs/nfsd/nfs4xdr.c
+--- linux-4.9.207/fs/nfsd/nfs4xdr.c 2019-12-25 15:28:37.557312612 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/nfsd/nfs4xdr.c 2018-10-20 05:55:43.000000000 +0000
@@ -40,6 +40,7 @@
#include <linux/utsname.h>
#include <linux/pagemap.h>
@@ -5075,9 +5075,9 @@ diff -NurpP --minimal linux-4.9.135/fs/nfsd/nfs4xdr.c linux-4.9.135-vs2.3.9.8/fs
if (status)
goto out;
}
-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
+diff -NurpP --minimal linux-4.9.207/fs/nfsd/nfsxdr.c linux-4.9.207-vs2.3.9.11/fs/nfsd/nfsxdr.c
+--- linux-4.9.207/fs/nfsd/nfsxdr.c 2019-12-25 15:28:37.567312448 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/nfsd/nfsxdr.c 2018-10-20 04:58:14.000000000 +0000
@@ -7,6 +7,7 @@
#include "vfs.h"
#include "xdr.h"
@@ -5129,9 +5129,9 @@ diff -NurpP --minimal linux-4.9.135/fs/nfsd/nfsxdr.c linux-4.9.135-vs2.3.9.8/fs/
if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
*p++ = htonl(NFS_MAXPATHLEN);
-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
+diff -NurpP --minimal linux-4.9.207/fs/ocfs2/dlmglue.c linux-4.9.207-vs2.3.9.11/fs/ocfs2/dlmglue.c
+--- linux-4.9.207/fs/ocfs2/dlmglue.c 2019-12-25 15:28:37.857307760 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/ocfs2/dlmglue.c 2019-12-25 15:37:51.918430506 +0000
@@ -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.135/fs/ocfs2/dlmglue.c linux-4.9.135-vs2.3.9.8/f
inode->i_mode = be16_to_cpu(lvb->lvb_imode);
set_nlink(inode, be16_to_cpu(lvb->lvb_inlink));
ocfs2_unpack_timespec(&inode->i_atime,
-diff -NurpP --minimal linux-4.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
+diff -NurpP --minimal linux-4.9.207/fs/ocfs2/dlmglue.h linux-4.9.207-vs2.3.9.11/fs/ocfs2/dlmglue.h
+--- linux-4.9.207/fs/ocfs2/dlmglue.h 2019-12-25 15:28:37.857307760 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/ocfs2/dlmglue.h 2018-10-20 04:58:14.000000000 +0000
@@ -46,7 +46,8 @@ struct ocfs2_meta_lvb {
__be16 lvb_inlink;
__be32 lvb_iattr;
@@ -5161,9 +5161,9 @@ diff -NurpP --minimal linux-4.9.135/fs/ocfs2/dlmglue.h linux-4.9.135-vs2.3.9.8/f
};
#define OCFS2_QINFO_LVB_VERSION 1
-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
+diff -NurpP --minimal linux-4.9.207/fs/ocfs2/file.c linux-4.9.207-vs2.3.9.11/fs/ocfs2/file.c
+--- linux-4.9.207/fs/ocfs2/file.c 2019-12-25 15:28:37.877307439 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/ocfs2/file.c 2018-10-20 04:58:14.000000000 +0000
@@ -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.135/fs/ocfs2/file.c linux-4.9.135-vs2.3.9.8/fs/o
if (!(attr->ia_valid & OCFS2_VALID_ATTRS))
return 0;
-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
+diff -NurpP --minimal linux-4.9.207/fs/ocfs2/inode.c linux-4.9.207-vs2.3.9.11/fs/ocfs2/inode.c
+--- linux-4.9.207/fs/ocfs2/inode.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/ocfs2/inode.c 2018-10-20 04:58:14.000000000 +0000
@@ -28,6 +28,7 @@
#include <linux/highmem.h>
#include <linux/pagemap.h>
@@ -5272,9 +5272,9 @@ diff -NurpP --minimal linux-4.9.135/fs/ocfs2/inode.c linux-4.9.135-vs2.3.9.8/fs/
/* Fast symlinks will have i_size but no allocated clusters. */
if (S_ISLNK(inode->i_mode) && !fe->i_clusters) {
-diff -NurpP --minimal linux-4.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
+diff -NurpP --minimal linux-4.9.207/fs/ocfs2/inode.h linux-4.9.207-vs2.3.9.11/fs/ocfs2/inode.h
+--- linux-4.9.207/fs/ocfs2/inode.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/ocfs2/inode.h 2018-10-20 04:58:14.000000000 +0000
@@ -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.135/fs/ocfs2/inode.h linux-4.9.135-vs2.3.9.8/fs/
static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode)
{
-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
+diff -NurpP --minimal linux-4.9.207/fs/ocfs2/ioctl.c linux-4.9.207-vs2.3.9.11/fs/ocfs2/ioctl.c
+--- linux-4.9.207/fs/ocfs2/ioctl.c 2019-12-25 15:28:37.887307275 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/ocfs2/ioctl.c 2019-12-25 15:37:51.918430506 +0000
@@ -76,7 +76,41 @@ static int ocfs2_get_inode_attr(struct i
return status;
}
@@ -5349,9 +5349,9 @@ diff -NurpP --minimal linux-4.9.135/fs/ocfs2/ioctl.c linux-4.9.135-vs2.3.9.8/fs/
long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
struct inode *inode = file_inode(filp);
-diff -NurpP --minimal linux-4.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
+diff -NurpP --minimal linux-4.9.207/fs/ocfs2/namei.c linux-4.9.207-vs2.3.9.11/fs/ocfs2/namei.c
+--- linux-4.9.207/fs/ocfs2/namei.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/ocfs2/namei.c 2018-10-20 04:58:14.000000000 +0000
@@ -41,6 +41,7 @@
#include <linux/slab.h>
#include <linux/highmem.h>
@@ -5384,20 +5384,9 @@ diff -NurpP --minimal linux-4.9.135/fs/ocfs2/namei.c linux-4.9.135-vs2.3.9.8/fs/
fe->i_mode = cpu_to_le16(inode->i_mode);
if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode))
fe->id1.dev1.i_rdev = cpu_to_le64(huge_encode_dev(dev));
-diff -NurpP --minimal linux-4.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 */
- OCFS2_MOUNT_ERRORS_ROFS = 1 << 17, /* Change filesystem to read-only on error */
-+ OCFS2_MOUNT_TAGGED = 1 << 18, /* use tagging */
- };
-
- #define OCFS2_OSB_SOFT_RO 0x0001
-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
+diff -NurpP --minimal linux-4.9.207/fs/ocfs2/ocfs2_fs.h linux-4.9.207-vs2.3.9.11/fs/ocfs2/ocfs2_fs.h
+--- linux-4.9.207/fs/ocfs2/ocfs2_fs.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/ocfs2/ocfs2_fs.h 2018-10-20 04:58:14.000000000 +0000
@@ -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 +5399,20 @@ diff -NurpP --minimal linux-4.9.135/fs/ocfs2/ocfs2_fs.h linux-4.9.135-vs2.3.9.8/
#define OCFS2_FL_VISIBLE FS_FL_USER_VISIBLE /* User visible flags */
#define OCFS2_FL_MODIFIABLE FS_FL_USER_MODIFIABLE /* User modifiable flags */
-diff -NurpP --minimal linux-4.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
+diff -NurpP --minimal linux-4.9.207/fs/ocfs2/ocfs2.h linux-4.9.207-vs2.3.9.11/fs/ocfs2/ocfs2.h
+--- linux-4.9.207/fs/ocfs2/ocfs2.h 2019-12-25 15:28:37.907306953 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/ocfs2/ocfs2.h 2018-10-20 04:58:14.000000000 +0000
+@@ -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 */
+ OCFS2_MOUNT_ERRORS_ROFS = 1 << 17, /* Change filesystem to read-only on error */
++ OCFS2_MOUNT_TAGGED = 1 << 18, /* use tagging */
+ };
+
+ #define OCFS2_OSB_SOFT_RO 0x0001
+diff -NurpP --minimal linux-4.9.207/fs/ocfs2/super.c linux-4.9.207-vs2.3.9.11/fs/ocfs2/super.c
+--- linux-4.9.207/fs/ocfs2/super.c 2019-12-25 15:28:37.927306628 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/ocfs2/super.c 2018-10-20 04:58:14.000000000 +0000
@@ -188,6 +188,7 @@ enum {
Opt_dir_resv_level,
Opt_journal_async_commit,
@@ -5476,9 +5476,9 @@ diff -NurpP --minimal linux-4.9.135/fs/ocfs2/super.c linux-4.9.135-vs2.3.9.8/fs/
default:
mlog(ML_ERROR,
"Unrecognized mount option \"%s\" "
-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
+diff -NurpP --minimal linux-4.9.207/fs/open.c linux-4.9.207-vs2.3.9.11/fs/open.c
+--- linux-4.9.207/fs/open.c 2019-12-25 15:28:37.947306307 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/open.c 2019-10-05 14:58:45.460310912 +0000
@@ -31,6 +31,11 @@
#include <linux/ima.h>
#include <linux/dnotify.h>
@@ -5510,7 +5510,7 @@ diff -NurpP --minimal linux-4.9.135/fs/open.c linux-4.9.135-vs2.3.9.8/fs/open.c
inode = path->dentry->d_inode;
/* For directories it's -EISDIR, for other non-regulars - -EINVAL */
-@@ -565,6 +575,13 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, cons
+@@ -584,6 +594,13 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, cons
unsigned int lookup_flags = LOOKUP_FOLLOW;
retry:
error = user_path_at(dfd, filename, lookup_flags, &path);
@@ -5524,7 +5524,7 @@ diff -NurpP --minimal linux-4.9.135/fs/open.c linux-4.9.135-vs2.3.9.8/fs/open.c
if (!error) {
error = chmod_common(&path, mode);
path_put(&path);
-@@ -599,13 +616,15 @@ retry_deleg:
+@@ -618,13 +635,15 @@ retry_deleg:
if (!uid_valid(uid))
return -EINVAL;
newattrs.ia_valid |= ATTR_UID;
@@ -5542,7 +5542,7 @@ diff -NurpP --minimal linux-4.9.135/fs/open.c linux-4.9.135-vs2.3.9.8/fs/open.c
}
if (!S_ISDIR(inode->i_mode))
newattrs.ia_valid |=
-@@ -643,6 +662,10 @@ retry:
+@@ -662,6 +681,10 @@ retry:
error = mnt_want_write(path.mnt);
if (error)
goto out_release;
@@ -5553,9 +5553,9 @@ diff -NurpP --minimal linux-4.9.135/fs/open.c linux-4.9.135-vs2.3.9.8/fs/open.c
error = chown_common(&path, user, group);
mnt_drop_write(path.mnt);
out_release:
-diff -NurpP --minimal linux-4.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
+diff -NurpP --minimal linux-4.9.207/fs/proc/array.c linux-4.9.207-vs2.3.9.11/fs/proc/array.c
+--- linux-4.9.207/fs/proc/array.c 2019-12-25 15:28:37.987305658 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/proc/array.c 2019-10-05 14:58:45.660307716 +0000
@@ -86,6 +86,8 @@
#include <linux/string_helpers.h>
#include <linux/user_namespace.h>
@@ -5604,7 +5604,7 @@ diff -NurpP --minimal linux-4.9.135/fs/proc/array.c linux-4.9.135-vs2.3.9.8/fs/p
}
static inline void task_seccomp(struct seq_file *m, struct task_struct *p)
-@@ -390,6 +396,43 @@ static void task_cpus_allowed(struct seq
+@@ -391,6 +397,43 @@ static void task_cpus_allowed(struct seq
cpumask_pr_args(&task->cpus_allowed));
}
@@ -5648,7 +5648,7 @@ diff -NurpP --minimal linux-4.9.135/fs/proc/array.c linux-4.9.135-vs2.3.9.8/fs/p
int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
struct pid *pid, struct task_struct *task)
{
-@@ -407,6 +450,7 @@ int proc_pid_status(struct seq_file *m,
+@@ -408,6 +451,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.135/fs/proc/array.c linux-4.9.135-vs2.3.9.8/fs/p
task_context_switch_counts(m, task);
return 0;
}
-@@ -522,6 +566,17 @@ static int do_task_stat(struct seq_file
+@@ -523,6 +567,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.135/fs/proc/array.c linux-4.9.135-vs2.3.9.8/fs/p
seq_printf(m, "%d (%s) %c", pid_nr_ns(pid, ns), tcomm, state);
seq_put_decimal_ll(m, " ", ppid);
seq_put_decimal_ll(m, " ", pgid);
-diff -NurpP --minimal linux-4.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
+diff -NurpP --minimal linux-4.9.207/fs/proc/base.c linux-4.9.207-vs2.3.9.11/fs/proc/base.c
+--- linux-4.9.207/fs/proc/base.c 2019-12-25 15:28:37.987305658 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/proc/base.c 2019-10-05 14:58:45.660307716 +0000
@@ -87,6 +87,8 @@
#include <linux/slab.h>
#include <linux/flex_array.h>
@@ -5703,7 +5703,7 @@ diff -NurpP --minimal linux-4.9.135/fs/proc/base.c linux-4.9.135-vs2.3.9.8/fs/pr
/*
* /proc/pid/oom_adj is provided for legacy purposes, ask users to use
* /proc/pid/oom_score_adj instead.
-@@ -1712,6 +1719,8 @@ struct inode *proc_pid_make_inode(struct
+@@ -1708,6 +1715,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.135/fs/proc/base.c linux-4.9.135-vs2.3.9.8/fs/pr
security_task_to_inode(task, inode);
out:
-@@ -1757,6 +1766,8 @@ int pid_getattr(struct vfsmount *mnt, st
+@@ -1753,6 +1762,8 @@ int pid_getattr(struct vfsmount *mnt, st
/* dentry stuff */
@@ -5721,7 +5721,7 @@ diff -NurpP --minimal linux-4.9.135/fs/proc/base.c linux-4.9.135-vs2.3.9.8/fs/pr
/*
* Exceptional case: normally we are not allowed to unhash a busy
* directory. In this case, however, we can do it - no aliasing problems
-@@ -1785,6 +1796,19 @@ int pid_revalidate(struct dentry *dentry
+@@ -1781,6 +1792,19 @@ int pid_revalidate(struct dentry *dentry
task = get_proc_task(inode);
if (task) {
@@ -5741,7 +5741,7 @@ diff -NurpP --minimal linux-4.9.135/fs/proc/base.c linux-4.9.135-vs2.3.9.8/fs/pr
if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
task_dumpable(task)) {
rcu_read_lock();
-@@ -2449,6 +2473,13 @@ static struct dentry *proc_pident_lookup
+@@ -2445,6 +2469,13 @@ static struct dentry *proc_pident_lookup
if (!task)
goto out_no_task;
@@ -5755,7 +5755,7 @@ diff -NurpP --minimal linux-4.9.135/fs/proc/base.c linux-4.9.135-vs2.3.9.8/fs/pr
/*
* Yes, it does not scale. And it should not. Don't add
* new entries into /proc/<tgid>/ without very good reasons.
-@@ -2888,6 +2919,11 @@ static int proc_pid_personality(struct s
+@@ -2884,6 +2915,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.135/fs/proc/base.c linux-4.9.135-vs2.3.9.8/fs/pr
static const struct pid_entry tgid_base_stuff[] = {
DIR("task", S_IRUGO|S_IXUGO, proc_task_inode_operations, proc_task_operations),
DIR("fd", S_IRUSR|S_IXUSR, proc_fd_inode_operations, proc_fd_operations),
-@@ -2952,6 +2988,8 @@ static const struct pid_entry tgid_base_
+@@ -2948,6 +2984,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.135/fs/proc/base.c linux-4.9.135-vs2.3.9.8/fs/pr
ONE("oom_score", S_IRUGO, proc_oom_score),
REG("oom_adj", S_IRUGO|S_IWUSR, proc_oom_adj_operations),
REG("oom_score_adj", S_IRUGO|S_IWUSR, proc_oom_score_adj_operations),
-@@ -3167,7 +3205,7 @@ retry:
+@@ -3163,7 +3201,7 @@ retry:
iter.task = NULL;
pid = find_ge_pid(iter.tgid, ns);
if (pid) {
@@ -5785,7 +5785,7 @@ diff -NurpP --minimal linux-4.9.135/fs/proc/base.c linux-4.9.135-vs2.3.9.8/fs/pr
iter.task = pid_task(pid, PIDTYPE_PID);
/* What we to know is if the pid we have find is the
* pid of a thread_group_leader. Testing for task
-@@ -3227,8 +3265,10 @@ int proc_pid_readdir(struct file *file,
+@@ -3223,8 +3261,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.135/fs/proc/base.c linux-4.9.135-vs2.3.9.8/fs/pr
if (!proc_fill_cache(file, ctx, name, len,
proc_pid_instantiate, iter.task, NULL)) {
put_task_struct(iter.task);
-@@ -3365,6 +3405,7 @@ static const struct pid_entry tid_base_s
+@@ -3361,6 +3401,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.135/fs/proc/base.c linux-4.9.135-vs2.3.9.8/fs/pr
};
static int proc_tid_base_readdir(struct file *file, struct dir_context *ctx)
-@@ -3431,6 +3472,8 @@ static struct dentry *proc_task_lookup(s
+@@ -3427,6 +3468,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.135/fs/proc/base.c linux-4.9.135-vs2.3.9.8/fs/pr
ns = dentry->d_sb->s_fs_info;
rcu_read_lock();
-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
+diff -NurpP --minimal linux-4.9.207/fs/proc/generic.c linux-4.9.207-vs2.3.9.11/fs/proc/generic.c
+--- linux-4.9.207/fs/proc/generic.c 2019-12-25 15:28:37.987305658 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/proc/generic.c 2018-10-20 04:58:14.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/bitops.h>
#include <linux/spinlock.h>
@@ -5891,9 +5891,9 @@ diff -NurpP --minimal linux-4.9.135/fs/proc/generic.c linux-4.9.135-vs2.3.9.8/fs
} else {
kfree(ent);
ent = NULL;
-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
+diff -NurpP --minimal linux-4.9.207/fs/proc/inode.c linux-4.9.207-vs2.3.9.11/fs/proc/inode.c
+--- linux-4.9.207/fs/proc/inode.c 2019-12-25 15:28:37.997305497 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/proc/inode.c 2018-10-20 05:55:43.000000000 +0000
@@ -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.135/fs/proc/inode.c linux-4.9.135-vs2.3.9.8/fs/p
if (de->size)
inode->i_size = de->size;
if (de->nlink)
-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
+diff -NurpP --minimal linux-4.9.207/fs/proc/internal.h linux-4.9.207-vs2.3.9.11/fs/proc/internal.h
+--- linux-4.9.207/fs/proc/internal.h 2019-12-25 15:28:38.017305173 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/proc/internal.h 2018-10-20 05:55:43.000000000 +0000
@@ -14,6 +14,7 @@
#include <linux/spinlock.h>
#include <linux/atomic.h>
@@ -5972,9 +5972,9 @@ diff -NurpP --minimal linux-4.9.135/fs/proc/internal.h linux-4.9.135-vs2.3.9.8/f
/*
* base.c
-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
+diff -NurpP --minimal linux-4.9.207/fs/proc/loadavg.c linux-4.9.207-vs2.3.9.11/fs/proc/loadavg.c
+--- linux-4.9.207/fs/proc/loadavg.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/proc/loadavg.c 2018-10-20 04:58:14.000000000 +0000
@@ -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.135/fs/proc/loadavg.c linux-4.9.135-vs2.3.9.8/fs
task_active_pid_ns(current)->last_pid);
return 0;
}
-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
+diff -NurpP --minimal linux-4.9.207/fs/proc/meminfo.c linux-4.9.207-vs2.3.9.11/fs/proc/meminfo.c
+--- linux-4.9.207/fs/proc/meminfo.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/proc/meminfo.c 2018-10-20 04:58:14.000000000 +0000
@@ -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.135/fs/proc/meminfo.c linux-4.9.135-vs2.3.9.8/fs
total_swapcache_pages() - i.bufferram;
if (cached < 0)
cached = 0;
-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
+diff -NurpP --minimal linux-4.9.207/fs/proc/root.c linux-4.9.207-vs2.3.9.11/fs/proc/root.c
+--- linux-4.9.207/fs/proc/root.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/proc/root.c 2018-10-20 04:58:14.000000000 +0000
@@ -20,9 +20,14 @@
#include <linux/mount.h>
#include <linux/pid_namespace.h>
@@ -6051,9 +6051,9 @@ diff -NurpP --minimal linux-4.9.135/fs/proc/root.c linux-4.9.135-vs2.3.9.8/fs/pr
.subdir = RB_ROOT,
.name = "/proc",
};
-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
+diff -NurpP --minimal linux-4.9.207/fs/proc/self.c linux-4.9.207-vs2.3.9.11/fs/proc/self.c
+--- linux-4.9.207/fs/proc/self.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/proc/self.c 2018-10-20 04:58:14.000000000 +0000
@@ -1,6 +1,7 @@
#include <linux/sched.h>
#include <linux/slab.h>
@@ -6071,9 +6071,9 @@ diff -NurpP --minimal linux-4.9.135/fs/proc/self.c linux-4.9.135-vs2.3.9.8/fs/pr
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.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
+diff -NurpP --minimal linux-4.9.207/fs/proc/stat.c linux-4.9.207-vs2.3.9.11/fs/proc/stat.c
+--- linux-4.9.207/fs/proc/stat.c 2019-12-25 15:28:38.017305173 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/proc/stat.c 2019-10-13 15:58:54.758080005 +0000
@@ -9,8 +9,10 @@
#include <linux/slab.h>
#include <linux/time.h>
@@ -6085,7 +6085,7 @@ diff -NurpP --minimal linux-4.9.135/fs/proc/stat.c linux-4.9.135-vs2.3.9.8/fs/pr
#ifndef arch_irq_stat_cpu
#define arch_irq_stat_cpu(cpu) 0
-@@ -86,13 +88,24 @@ static int show_stat(struct seq_file *p,
+@@ -86,13 +88,21 @@ static int show_stat(struct seq_file *p,
u64 sum_softirq = 0;
unsigned int per_softirq_sums[NR_SOFTIRQS] = {0};
struct timespec64 boottime;
@@ -6097,9 +6097,6 @@ diff -NurpP --minimal linux-4.9.135/fs/proc/stat.c linux-4.9.135-vs2.3.9.8/fs/pr
guest = guest_nice = 0;
getboottime64(&boottime);
-+ if (vx_flags(VXF_VIRT_UPTIME, 0))
-+ vx_vsi_boottime64(&boottime);
-+
+ if (virt_cpu)
+ cpuset_cpus_allowed(current, cpus_allowed);
+
@@ -6110,7 +6107,7 @@ diff -NurpP --minimal linux-4.9.135/fs/proc/stat.c linux-4.9.135-vs2.3.9.8/fs/pr
user += kcpustat_cpu(i).cpustat[CPUTIME_USER];
nice += kcpustat_cpu(i).cpustat[CPUTIME_NICE];
system += kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM];
-@@ -128,6 +141,9 @@ static int show_stat(struct seq_file *p,
+@@ -128,6 +138,9 @@ static int show_stat(struct seq_file *p,
seq_putc(p, '\n');
for_each_online_cpu(i) {
@@ -6120,9 +6117,9 @@ diff -NurpP --minimal linux-4.9.135/fs/proc/stat.c linux-4.9.135-vs2.3.9.8/fs/pr
/* Copy values here to work around gcc-2.95.3, gcc-2.96 */
user = kcpustat_cpu(i).cpustat[CPUTIME_USER];
nice = kcpustat_cpu(i).cpustat[CPUTIME_NICE];
-diff -NurpP --minimal linux-4.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
+diff -NurpP --minimal linux-4.9.207/fs/proc/uptime.c linux-4.9.207-vs2.3.9.11/fs/proc/uptime.c
+--- linux-4.9.207/fs/proc/uptime.c 2019-12-25 15:28:38.017305173 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/proc/uptime.c 2019-10-13 16:02:19.324763467 +0000
@@ -5,6 +5,7 @@
#include <linux/seq_file.h>
#include <linux/time.h>
@@ -6131,20 +6128,17 @@ diff -NurpP --minimal linux-4.9.135/fs/proc/uptime.c linux-4.9.135-vs2.3.9.8/fs/
static int uptime_proc_show(struct seq_file *m, void *v)
{
-@@ -21,6 +22,10 @@ static int uptime_proc_show(struct seq_f
+@@ -21,6 +22,7 @@ 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;
-+
-+ if (vx_flags(VXF_VIRT_UPTIME, 0))
-+ vx_vsi_uptime(&uptime, &idle);
+
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.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
+diff -NurpP --minimal linux-4.9.207/fs/proc_namespace.c linux-4.9.207-vs2.3.9.11/fs/proc_namespace.c
+--- linux-4.9.207/fs/proc_namespace.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/proc_namespace.c 2018-10-20 04:58:14.000000000 +0000
@@ -46,6 +46,8 @@ static int show_sb_opts(struct seq_file
{ MS_DIRSYNC, ",dirsync" },
{ MS_MANDLOCK, ",mand" },
@@ -6258,10 +6252,10 @@ diff -NurpP --minimal linux-4.9.135/fs/proc_namespace.c linux-4.9.135-vs2.3.9.8/
/* file system type */
seq_puts(m, "with fstype ");
show_type(m, sb);
-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
+diff -NurpP --minimal linux-4.9.207/fs/quota/dquot.c linux-4.9.207-vs2.3.9.11/fs/quota/dquot.c
+--- linux-4.9.207/fs/quota/dquot.c 2019-12-25 15:28:38.017305173 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/quota/dquot.c 2019-12-25 15:37:52.028428731 +0000
+@@ -1659,6 +1659,9 @@ int __dquot_alloc_space(struct inode *in
int reserve = flags & DQUOT_SPACE_RESERVE;
struct dquot **dquots;
@@ -6271,7 +6265,7 @@ diff -NurpP --minimal linux-4.9.135/fs/quota/dquot.c linux-4.9.135-vs2.3.9.8/fs/
if (!dquot_active(inode)) {
inode_incr_space(inode, number, reserve);
goto out;
-@@ -1710,6 +1713,9 @@ int dquot_alloc_inode(struct inode *inod
+@@ -1711,6 +1714,9 @@ int dquot_alloc_inode(struct inode *inod
struct dquot_warn warn[MAXQUOTAS];
struct dquot * const *dquots;
@@ -6281,7 +6275,7 @@ diff -NurpP --minimal linux-4.9.135/fs/quota/dquot.c linux-4.9.135-vs2.3.9.8/fs/
if (!dquot_active(inode))
return 0;
for (cnt = 0; cnt < MAXQUOTAS; cnt++)
-@@ -1812,6 +1818,8 @@ void __dquot_free_space(struct inode *in
+@@ -1813,6 +1819,8 @@ void __dquot_free_space(struct inode *in
struct dquot **dquots;
int reserve = flags & DQUOT_SPACE_RESERVE, index;
@@ -6290,7 +6284,7 @@ diff -NurpP --minimal linux-4.9.135/fs/quota/dquot.c linux-4.9.135-vs2.3.9.8/fs/
if (!dquot_active(inode)) {
inode_decr_space(inode, number, reserve);
return;
-@@ -1856,6 +1864,8 @@ void dquot_free_inode(struct inode *inod
+@@ -1857,6 +1865,8 @@ void dquot_free_inode(struct inode *inod
struct dquot * const *dquots;
int index;
@@ -6299,9 +6293,9 @@ diff -NurpP --minimal linux-4.9.135/fs/quota/dquot.c linux-4.9.135-vs2.3.9.8/fs/
if (!dquot_active(inode))
return;
-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
+diff -NurpP --minimal linux-4.9.207/fs/quota/quota.c linux-4.9.207-vs2.3.9.11/fs/quota/quota.c
+--- linux-4.9.207/fs/quota/quota.c 2019-12-25 15:28:38.027305012 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/quota/quota.c 2018-10-20 05:55:43.000000000 +0000
@@ -8,6 +8,7 @@
#include <linux/fs.h>
#include <linux/namei.h>
@@ -6389,9 +6383,9 @@ diff -NurpP --minimal linux-4.9.135/fs/quota/quota.c linux-4.9.135-vs2.3.9.8/fs/
if (quotactl_cmd_write(cmd))
sb = get_super_thawed(bdev);
else
-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
+diff -NurpP --minimal linux-4.9.207/fs/stat.c linux-4.9.207-vs2.3.9.11/fs/stat.c
+--- linux-4.9.207/fs/stat.c 2019-12-25 15:28:38.087304041 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/stat.c 2018-10-20 04:58:14.000000000 +0000
@@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod
stat->nlink = inode->i_nlink;
stat->uid = inode->i_uid;
@@ -6400,9 +6394,9 @@ diff -NurpP --minimal linux-4.9.135/fs/stat.c linux-4.9.135-vs2.3.9.8/fs/stat.c
stat->rdev = inode->i_rdev;
stat->size = i_size_read(inode);
stat->atime = inode->i_atime;
-diff -NurpP --minimal linux-4.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
+diff -NurpP --minimal linux-4.9.207/fs/statfs.c linux-4.9.207-vs2.3.9.11/fs/statfs.c
+--- linux-4.9.207/fs/statfs.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/statfs.c 2018-10-20 04:58:14.000000000 +0000
@@ -7,6 +7,8 @@
#include <linux/statfs.h>
#include <linux/security.h>
@@ -6421,9 +6415,9 @@ diff -NurpP --minimal linux-4.9.135/fs/statfs.c linux-4.9.135-vs2.3.9.8/fs/statf
return retval;
}
-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
+diff -NurpP --minimal linux-4.9.207/fs/super.c linux-4.9.207-vs2.3.9.11/fs/super.c
+--- linux-4.9.207/fs/super.c 2019-12-25 15:28:38.087304041 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/super.c 2019-10-13 10:11:07.125382902 +0000
@@ -34,6 +34,8 @@
#include <linux/fsnotify.h>
#include <linux/lockdep.h>
@@ -6433,7 +6427,26 @@ diff -NurpP --minimal linux-4.9.135/fs/super.c linux-4.9.135-vs2.3.9.8/fs/super.
#include "internal.h"
-@@ -985,7 +987,8 @@ struct dentry *mount_ns(struct file_syst
+@@ -482,7 +484,7 @@ struct super_block *sget_userns(struct f
+
+ if (!(flags & (MS_KERNMOUNT|MS_SUBMOUNT)) &&
+ !(type->fs_flags & FS_USERNS_MOUNT) &&
+- !capable(CAP_SYS_ADMIN))
++ !vx_capable(CAP_SYS_ADMIN, VXC_SECURE_MOUNT))
+ return ERR_PTR(-EPERM);
+ retry:
+ spin_lock(&sb_lock);
+@@ -563,7 +565,8 @@ struct super_block *sget(struct file_sys
+ user_ns = &init_user_ns;
+
+ /* Ensure the requestor has permissions over the target filesystem */
+- if (!(flags & (MS_KERNMOUNT|MS_SUBMOUNT)) && !ns_capable(user_ns, CAP_SYS_ADMIN))
++ if (!(flags & (MS_KERNMOUNT|MS_SUBMOUNT)) &&
++ !vx_ns_capable(user_ns, CAP_SYS_ADMIN, VXC_SECURE_MOUNT))
+ return ERR_PTR(-EPERM);
+
+ return sget_userns(type, test, set, flags, user_ns, data);
+@@ -995,7 +998,8 @@ struct dentry *mount_ns(struct file_syst
/* Don't allow mounting unless the caller has CAP_SYS_ADMIN
* over the namespace.
*/
@@ -6443,8 +6456,8 @@ diff -NurpP --minimal linux-4.9.135/fs/super.c linux-4.9.135-vs2.3.9.8/fs/super.
return ERR_PTR(-EPERM);
sb = sget_userns(fs_type, ns_test_super, ns_set_super, flags,
-@@ -1195,6 +1198,13 @@ mount_fs(struct file_system_type *type,
- WARN_ON(!sb->s_bdi);
+@@ -1213,6 +1217,13 @@ mount_fs(struct file_system_type *type,
+ smp_wmb();
sb->s_flags |= MS_BORN;
+ error = -EPERM;
@@ -6457,9 +6470,9 @@ diff -NurpP --minimal linux-4.9.135/fs/super.c linux-4.9.135-vs2.3.9.8/fs/super.
error = security_sb_kern_mount(sb, flags, secdata);
if (error)
goto out_sb;
-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
+diff -NurpP --minimal linux-4.9.207/fs/utimes.c linux-4.9.207-vs2.3.9.11/fs/utimes.c
+--- linux-4.9.207/fs/utimes.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/utimes.c 2018-10-20 04:58:14.000000000 +0000
@@ -8,6 +8,8 @@
#include <linux/stat.h>
#include <linux/utime.h>
@@ -6490,9 +6503,9 @@ diff -NurpP --minimal linux-4.9.135/fs/utimes.c linux-4.9.135-vs2.3.9.8/fs/utime
if (times && times[0].tv_nsec == UTIME_NOW &&
times[1].tv_nsec == UTIME_NOW)
times = NULL;
-diff -NurpP --minimal linux-4.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
+diff -NurpP --minimal linux-4.9.207/fs/xattr.c linux-4.9.207-vs2.3.9.11/fs/xattr.c
+--- linux-4.9.207/fs/xattr.c 2019-12-25 15:28:38.177302586 +0000
++++ linux-4.9.207-vs2.3.9.11/fs/xattr.c 2018-10-20 05:55:43.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/audit.h>
#include <linux/vmalloc.h>
@@ -6510,9 +6523,9 @@ diff -NurpP --minimal linux-4.9.135/fs/xattr.c linux-4.9.135-vs2.3.9.8/fs/xattr.
return (mask & MAY_WRITE) ? -EPERM : -ENODATA;
return 0;
}
-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
+diff -NurpP --minimal linux-4.9.207/include/linux/capability.h linux-4.9.207-vs2.3.9.11/include/linux/capability.h
+--- linux-4.9.207/include/linux/capability.h 2019-12-25 15:28:38.667294664 +0000
++++ linux-4.9.207-vs2.3.9.11/include/linux/capability.h 2018-10-20 04:58:14.000000000 +0000
@@ -78,7 +78,8 @@ extern const kernel_cap_t __cap_init_eff
#else /* HAND-CODED capability initializers */
@@ -6523,10 +6536,10 @@ diff -NurpP --minimal linux-4.9.135/include/linux/capability.h linux-4.9.135-vs2
# define CAP_EMPTY_SET ((kernel_cap_t){{ 0, 0 }})
# define CAP_FULL_SET ((kernel_cap_t){{ ~0, CAP_LAST_U32_VALID_MASK }})
-diff -NurpP --minimal linux-4.9.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
+diff -NurpP --minimal linux-4.9.207/include/linux/cred.h linux-4.9.207-vs2.3.9.11/include/linux/cred.h
+--- linux-4.9.207/include/linux/cred.h 2019-12-25 15:28:38.737293533 +0000
++++ linux-4.9.207-vs2.3.9.11/include/linux/cred.h 2019-10-05 14:58:45.680307395 +0000
+@@ -156,6 +156,7 @@ extern void exit_creds(struct task_struc
extern int copy_creds(struct task_struct *, unsigned long);
extern const struct cred *get_task_cred(struct task_struct *);
extern struct cred *cred_alloc_blank(void);
@@ -6534,7 +6547,7 @@ diff -NurpP --minimal linux-4.9.135/include/linux/cred.h linux-4.9.135-vs2.3.9.8
extern struct cred *prepare_creds(void);
extern struct cred *prepare_exec_creds(void);
extern int commit_creds(struct cred *);
-@@ -212,6 +213,31 @@ static inline bool cap_ambient_invariant
+@@ -216,6 +217,31 @@ static inline bool cap_ambient_invariant
cred->cap_inheritable));
}
@@ -6566,9 +6579,9 @@ diff -NurpP --minimal linux-4.9.135/include/linux/cred.h linux-4.9.135-vs2.3.9.8
/**
* get_new_cred - Get a reference on a new set of credentials
* @cred: The new credentials to reference
-diff -NurpP --minimal linux-4.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
+diff -NurpP --minimal linux-4.9.207/include/linux/dcache.h linux-4.9.207-vs2.3.9.11/include/linux/dcache.h
+--- linux-4.9.207/include/linux/dcache.h 2019-12-25 15:28:38.737293533 +0000
++++ linux-4.9.207-vs2.3.9.11/include/linux/dcache.h 2018-10-20 04:58:14.000000000 +0000
@@ -308,8 +308,10 @@ extern char *dentry_path(struct dentry *
*/
static inline struct dentry *dget_dlock(struct dentry *dentry)
@@ -6581,19 +6594,19 @@ diff -NurpP --minimal linux-4.9.135/include/linux/dcache.h linux-4.9.135-vs2.3.9
return dentry;
}
-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
+diff -NurpP --minimal linux-4.9.207/include/linux/devpts_fs.h linux-4.9.207-vs2.3.9.11/include/linux/devpts_fs.h
+--- linux-4.9.207/include/linux/devpts_fs.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/include/linux/devpts_fs.h 2018-10-20 04:58:14.000000000 +0000
@@ -34,5 +34,4 @@ void devpts_pty_kill(struct dentry *);
#endif
-
#endif /* _LINUX_DEVPTS_FS_H */
-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
+diff -NurpP --minimal linux-4.9.207/include/linux/fs.h linux-4.9.207-vs2.3.9.11/include/linux/fs.h
+--- linux-4.9.207/include/linux/fs.h 2019-12-25 15:28:38.777292887 +0000
++++ linux-4.9.207-vs2.3.9.11/include/linux/fs.h 2019-10-05 14:58:45.690307237 +0000
+@@ -231,6 +231,7 @@ typedef int (dio_iodone_t)(struct kiocb
#define ATTR_OPEN (1 << 15) /* Truncating from open(O_TRUNC) */
#define ATTR_TIMES_SET (1 << 16)
#define ATTR_TOUCH (1 << 17)
@@ -6601,7 +6614,7 @@ diff -NurpP --minimal linux-4.9.135/include/linux/fs.h linux-4.9.135-vs2.3.9.8/i
/*
* Whiteout is represented by a char device. The following constants define the
-@@ -248,6 +249,7 @@ struct iattr {
+@@ -253,6 +254,7 @@ struct iattr {
umode_t ia_mode;
kuid_t ia_uid;
kgid_t ia_gid;
@@ -6609,7 +6622,7 @@ diff -NurpP --minimal linux-4.9.135/include/linux/fs.h linux-4.9.135-vs2.3.9.8/i
loff_t ia_size;
struct timespec ia_atime;
struct timespec ia_mtime;
-@@ -607,7 +609,9 @@ struct inode {
+@@ -612,7 +614,9 @@ struct inode {
unsigned short i_opflags;
kuid_t i_uid;
kgid_t i_gid;
@@ -6620,7 +6633,7 @@ diff -NurpP --minimal linux-4.9.135/include/linux/fs.h linux-4.9.135-vs2.3.9.8/i
#ifdef CONFIG_FS_POSIX_ACL
struct posix_acl *i_acl;
-@@ -636,6 +640,7 @@ struct inode {
+@@ -641,6 +645,7 @@ struct inode {
unsigned int __i_nlink;
};
dev_t i_rdev;
@@ -6628,7 +6641,7 @@ diff -NurpP --minimal linux-4.9.135/include/linux/fs.h linux-4.9.135-vs2.3.9.8/i
loff_t i_size;
struct timespec i_atime;
struct timespec i_mtime;
-@@ -840,14 +845,19 @@ static inline void i_size_write(struct i
+@@ -845,14 +850,19 @@ static inline void i_size_write(struct i
#endif
}
@@ -6650,7 +6663,7 @@ diff -NurpP --minimal linux-4.9.135/include/linux/fs.h linux-4.9.135-vs2.3.9.8/i
}
extern struct block_device *I_BDEV(struct inode *inode);
-@@ -904,6 +914,7 @@ struct file {
+@@ -909,6 +919,7 @@ struct file {
loff_t f_pos;
struct fown_struct f_owner;
const struct cred *f_cred;
@@ -6658,7 +6671,7 @@ diff -NurpP --minimal linux-4.9.135/include/linux/fs.h linux-4.9.135-vs2.3.9.8/i
struct file_ra_state f_ra;
u64 f_version;
-@@ -1038,6 +1049,7 @@ struct file_lock {
+@@ -1043,6 +1054,7 @@ struct file_lock {
struct file *fl_file;
loff_t fl_start;
loff_t fl_end;
@@ -6666,7 +6679,7 @@ diff -NurpP --minimal linux-4.9.135/include/linux/fs.h linux-4.9.135-vs2.3.9.8/i
struct fasync_struct * fl_fasync; /* for lease break notifications */
/* for lease breaks: */
-@@ -1471,6 +1483,11 @@ static inline gid_t i_gid_read(const str
+@@ -1476,6 +1488,11 @@ static inline gid_t i_gid_read(const str
return from_kgid(inode->i_sb->s_user_ns, inode->i_gid);
}
@@ -6678,7 +6691,7 @@ diff -NurpP --minimal linux-4.9.135/include/linux/fs.h linux-4.9.135-vs2.3.9.8/i
static inline void i_uid_write(struct inode *inode, uid_t uid)
{
inode->i_uid = make_kuid(inode->i_sb->s_user_ns, uid);
-@@ -1760,6 +1777,7 @@ struct inode_operations {
+@@ -1765,6 +1782,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 +6699,7 @@ diff -NurpP --minimal linux-4.9.135/include/linux/fs.h linux-4.9.135-vs2.3.9.8/i
int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start,
u64 len);
int (*update_time)(struct inode *, struct timespec *, int);
-@@ -1774,6 +1792,7 @@ ssize_t rw_copy_check_uvector(int type,
+@@ -1779,6 +1797,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 +6707,7 @@ diff -NurpP --minimal linux-4.9.135/include/linux/fs.h linux-4.9.135-vs2.3.9.8/i
extern ssize_t __vfs_read(struct file *, char __user *, size_t, loff_t *);
extern ssize_t __vfs_write(struct file *, const char __user *, size_t, loff_t *);
-@@ -1845,6 +1864,14 @@ struct super_operations {
+@@ -1850,6 +1869,14 @@ struct super_operations {
#else
#define S_DAX 0 /* Make all the DAX code disappear */
#endif
@@ -6709,7 +6722,7 @@ diff -NurpP --minimal linux-4.9.135/include/linux/fs.h linux-4.9.135-vs2.3.9.8/i
/*
* Note that nosuid etc flags are inode-specific: setting some file-system
-@@ -1869,10 +1896,13 @@ struct super_operations {
+@@ -1874,10 +1901,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 +6736,7 @@ diff -NurpP --minimal linux-4.9.135/include/linux/fs.h linux-4.9.135-vs2.3.9.8/i
#define IS_POSIXACL(inode) __IS_FLG(inode, MS_POSIXACL)
#define IS_DEADDIR(inode) ((inode)->i_flags & S_DEAD)
-@@ -1892,6 +1922,16 @@ static inline bool HAS_UNMAPPED_ID(struc
+@@ -1897,6 +1927,16 @@ static inline bool HAS_UNMAPPED_ID(struc
return !uid_valid(inode->i_uid) || !gid_valid(inode->i_gid);
}
@@ -6740,7 +6753,7 @@ diff -NurpP --minimal linux-4.9.135/include/linux/fs.h linux-4.9.135-vs2.3.9.8/i
/*
* Inode state bits. Protected by inode->i_lock
*
-@@ -2157,6 +2197,9 @@ extern struct kobject *fs_kobj;
+@@ -2162,6 +2202,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 +6763,7 @@ diff -NurpP --minimal linux-4.9.135/include/linux/fs.h linux-4.9.135-vs2.3.9.8/i
/*
* Candidates for mandatory locking have the setgid bit set
* but no group execute bit - an otherwise meaningless combination.
-@@ -2337,7 +2380,7 @@ struct filename {
+@@ -2342,7 +2385,7 @@ struct filename {
const char iname[];
};
@@ -6759,7 +6772,7 @@ diff -NurpP --minimal linux-4.9.135/include/linux/fs.h linux-4.9.135-vs2.3.9.8/i
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,
-@@ -2967,6 +3010,7 @@ extern int dcache_dir_open(struct inode
+@@ -2973,6 +3016,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 +6780,9 @@ diff -NurpP --minimal linux-4.9.135/include/linux/fs.h linux-4.9.135-vs2.3.9.8/i
extern int simple_setattr(struct dentry *, struct iattr *);
extern int simple_getattr(struct vfsmount *, struct dentry *, struct kstat *);
extern int simple_statfs(struct dentry *, struct kstatfs *);
-diff -NurpP --minimal linux-4.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
+diff -NurpP --minimal linux-4.9.207/include/linux/init_task.h linux-4.9.207-vs2.3.9.11/include/linux/init_task.h
+--- linux-4.9.207/include/linux/init_task.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/include/linux/init_task.h 2018-10-20 04:58:14.000000000 +0000
@@ -271,6 +271,10 @@ extern struct task_group root_task_group
INIT_VTIME(tsk) \
INIT_NUMA_BALANCING(tsk) \
@@ -6781,9 +6794,9 @@ diff -NurpP --minimal linux-4.9.135/include/linux/init_task.h linux-4.9.135-vs2.
}
-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
+diff -NurpP --minimal linux-4.9.207/include/linux/ipc.h linux-4.9.207-vs2.3.9.11/include/linux/ipc.h
+--- linux-4.9.207/include/linux/ipc.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/include/linux/ipc.h 2018-10-20 04:58:14.000000000 +0000
@@ -16,6 +16,7 @@ struct kern_ipc_perm
key_t key;
kuid_t uid;
@@ -6792,9 +6805,9 @@ diff -NurpP --minimal linux-4.9.135/include/linux/ipc.h linux-4.9.135-vs2.3.9.8/
kuid_t cuid;
kgid_t cgid;
umode_t mode;
-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
+diff -NurpP --minimal linux-4.9.207/include/linux/memcontrol.h linux-4.9.207-vs2.3.9.11/include/linux/memcontrol.h
+--- linux-4.9.207/include/linux/memcontrol.h 2019-12-25 15:28:39.087287874 +0000
++++ linux-4.9.207-vs2.3.9.11/include/linux/memcontrol.h 2018-10-20 04:58:14.000000000 +0000
@@ -92,6 +92,7 @@ enum mem_cgroup_events_target {
MEM_CGROUP_NTARGETS,
};
@@ -6816,9 +6829,9 @@ diff -NurpP --minimal linux-4.9.135/include/linux/memcontrol.h linux-4.9.135-vs2
static inline bool mm_match_cgroup(struct mm_struct *mm,
struct mem_cgroup *memcg)
{
-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
+diff -NurpP --minimal linux-4.9.207/include/linux/mount.h linux-4.9.207-vs2.3.9.11/include/linux/mount.h
+--- linux-4.9.207/include/linux/mount.h 2019-12-25 15:28:39.377283185 +0000
++++ linux-4.9.207-vs2.3.9.11/include/linux/mount.h 2018-10-20 04:58:14.000000000 +0000
@@ -63,6 +63,9 @@ struct mnt_namespace;
#define MNT_MARKED 0x4000000
#define MNT_UMOUNT 0x8000000
@@ -6829,9 +6842,20 @@ diff -NurpP --minimal linux-4.9.135/include/linux/mount.h linux-4.9.135-vs2.3.9.
struct vfsmount {
struct dentry *mnt_root; /* root of the mounted tree */
struct super_block *mnt_sb; /* pointer to superblock */
-diff -NurpP --minimal linux-4.9.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
+diff -NurpP --minimal linux-4.9.207/include/linux/netdevice.h linux-4.9.207-vs2.3.9.11/include/linux/netdevice.h
+--- linux-4.9.207/include/linux/netdevice.h 2019-12-25 15:28:39.397282861 +0000
++++ linux-4.9.207-vs2.3.9.11/include/linux/netdevice.h 2019-12-25 15:37:52.148426794 +0000
+@@ -2489,6 +2489,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);
++struct net_device *dev_get_by_index_real_rcu(struct net *net, int ifindex);
+ struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex);
+ int netdev_get_name(struct net *net, char *name, int ifindex);
+ int dev_restart(struct net_device *dev);
+diff -NurpP --minimal linux-4.9.207/include/linux/net.h linux-4.9.207-vs2.3.9.11/include/linux/net.h
+--- linux-4.9.207/include/linux/net.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/include/linux/net.h 2018-10-20 04:58:14.000000000 +0000
@@ -44,6 +44,7 @@ struct net;
#define SOCK_NOSPACE 2
#define SOCK_PASSCRED 3
@@ -6840,20 +6864,9 @@ diff -NurpP --minimal linux-4.9.135/include/linux/net.h linux-4.9.135-vs2.3.9.8/
#ifndef ARCH_HAS_SOCKET_TYPES
/**
-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);
-+struct net_device *dev_get_by_index_real_rcu(struct net *net, int ifindex);
- struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex);
- int netdev_get_name(struct net *net, char *name, int ifindex);
- int dev_restart(struct net_device *dev);
-diff -NurpP --minimal linux-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
+diff -NurpP --minimal linux-4.9.207/include/linux/nsproxy.h linux-4.9.207-vs2.3.9.11/include/linux/nsproxy.h
+--- linux-4.9.207/include/linux/nsproxy.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/include/linux/nsproxy.h 2018-10-20 04:58:14.000000000 +0000
@@ -3,6 +3,7 @@
#include <linux/spinlock.h>
@@ -6903,9 +6916,9 @@ diff -NurpP --minimal linux-4.9.135/include/linux/nsproxy.h linux-4.9.135-vs2.3.
}
#endif
-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
+diff -NurpP --minimal linux-4.9.207/include/linux/pid.h linux-4.9.207-vs2.3.9.11/include/linux/pid.h
+--- linux-4.9.207/include/linux/pid.h 2019-12-25 15:28:39.507281083 +0000
++++ linux-4.9.207-vs2.3.9.11/include/linux/pid.h 2018-10-20 04:58:14.000000000 +0000
@@ -10,7 +10,8 @@ enum pid_type
PIDTYPE_SID,
PIDTYPE_MAX,
@@ -6924,9 +6937,9 @@ diff -NurpP --minimal linux-4.9.135/include/linux/pid.h linux-4.9.135-vs2.3.9.8/
pid_t pid_vnr(struct pid *pid);
#define do_each_pid_task(pid, type, task) \
-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
+diff -NurpP --minimal linux-4.9.207/include/linux/quotaops.h linux-4.9.207-vs2.3.9.11/include/linux/quotaops.h
+--- linux-4.9.207/include/linux/quotaops.h 2019-12-25 15:28:39.587279789 +0000
++++ linux-4.9.207-vs2.3.9.11/include/linux/quotaops.h 2019-12-25 15:37:52.158426633 +0000
@@ -8,6 +8,7 @@
#define _LINUX_QUOTAOPS_
@@ -6935,7 +6948,7 @@ diff -NurpP --minimal linux-4.9.135/include/linux/quotaops.h linux-4.9.135-vs2.3
#define DQUOT_SPACE_WARN 0x1
#define DQUOT_SPACE_RESERVE 0x2
-@@ -214,11 +215,12 @@ static inline void dquot_drop(struct ino
+@@ -224,11 +225,12 @@ static inline void dquot_drop(struct ino
static inline int dquot_alloc_inode(struct inode *inode)
{
@@ -6949,7 +6962,7 @@ diff -NurpP --minimal linux-4.9.135/include/linux/quotaops.h linux-4.9.135-vs2.3
}
static inline int dquot_transfer(struct inode *inode, struct iattr *iattr)
-@@ -229,6 +231,10 @@ static inline int dquot_transfer(struct
+@@ -239,6 +241,10 @@ static inline int dquot_transfer(struct
static inline int __dquot_alloc_space(struct inode *inode, qsize_t number,
int flags)
{
@@ -6960,7 +6973,7 @@ diff -NurpP --minimal linux-4.9.135/include/linux/quotaops.h linux-4.9.135-vs2.3
if (!(flags & DQUOT_SPACE_RESERVE))
inode_add_bytes(inode, number);
return 0;
-@@ -239,6 +245,7 @@ static inline void __dquot_free_space(st
+@@ -249,6 +255,7 @@ static inline void __dquot_free_space(st
{
if (!(flags & DQUOT_SPACE_RESERVE))
inode_sub_bytes(inode, number);
@@ -6968,10 +6981,10 @@ diff -NurpP --minimal linux-4.9.135/include/linux/quotaops.h linux-4.9.135-vs2.3
}
static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
-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 {
+diff -NurpP --minimal linux-4.9.207/include/linux/sched.h linux-4.9.207-vs2.3.9.11/include/linux/sched.h
+--- linux-4.9.207/include/linux/sched.h 2019-12-25 15:28:39.727277526 +0000
++++ linux-4.9.207-vs2.3.9.11/include/linux/sched.h 2019-10-05 14:58:45.710306917 +0000
+@@ -1719,6 +1719,14 @@ struct task_struct {
#endif
struct seccomp seccomp;
@@ -6986,7 +6999,7 @@ diff -NurpP --minimal linux-4.9.135/include/linux/sched.h linux-4.9.135-vs2.3.9.
/* Thread group tracking */
u32 parent_exec_id;
u32 self_exec_id;
-@@ -2111,6 +2119,11 @@ struct pid_namespace;
+@@ -2112,6 +2120,11 @@ struct pid_namespace;
pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
struct pid_namespace *ns);
@@ -6998,7 +7011,7 @@ diff -NurpP --minimal linux-4.9.135/include/linux/sched.h linux-4.9.135-vs2.3.9.
static inline pid_t task_pid_nr(struct task_struct *tsk)
{
return tsk->pid;
-@@ -2124,7 +2137,8 @@ static inline pid_t task_pid_nr_ns(struc
+@@ -2125,7 +2138,8 @@ static inline pid_t task_pid_nr_ns(struc
static inline pid_t task_pid_vnr(struct task_struct *tsk)
{
@@ -7008,9 +7021,9 @@ diff -NurpP --minimal linux-4.9.135/include/linux/sched.h linux-4.9.135-vs2.3.9.
}
-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
+diff -NurpP --minimal linux-4.9.207/include/linux/shmem_fs.h linux-4.9.207-vs2.3.9.11/include/linux/shmem_fs.h
+--- linux-4.9.207/include/linux/shmem_fs.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/include/linux/shmem_fs.h 2018-10-20 04:58:14.000000000 +0000
@@ -10,6 +10,9 @@
/* inode in-kernel data */
@@ -7021,9 +7034,9 @@ diff -NurpP --minimal linux-4.9.135/include/linux/shmem_fs.h linux-4.9.135-vs2.3
struct shmem_inode_info {
spinlock_t lock;
unsigned int seals; /* shmem seals */
-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
+diff -NurpP --minimal linux-4.9.207/include/linux/stat.h linux-4.9.207-vs2.3.9.11/include/linux/stat.h
+--- linux-4.9.207/include/linux/stat.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/include/linux/stat.h 2018-10-20 04:58:14.000000000 +0000
@@ -25,6 +25,7 @@ struct kstat {
unsigned int nlink;
kuid_t uid;
@@ -7032,9 +7045,9 @@ diff -NurpP --minimal linux-4.9.135/include/linux/stat.h linux-4.9.135-vs2.3.9.8
dev_t rdev;
loff_t size;
struct timespec atime;
-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
+diff -NurpP --minimal linux-4.9.207/include/linux/sunrpc/auth.h linux-4.9.207-vs2.3.9.11/include/linux/sunrpc/auth.h
+--- linux-4.9.207/include/linux/sunrpc/auth.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/include/linux/sunrpc/auth.h 2018-10-20 04:58:14.000000000 +0000
@@ -46,6 +46,7 @@ enum {
struct auth_cred {
kuid_t uid;
@@ -7043,9 +7056,9 @@ diff -NurpP --minimal linux-4.9.135/include/linux/sunrpc/auth.h linux-4.9.135-vs
struct group_info *group_info;
const char *principal;
unsigned long ac_flags;
-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
+diff -NurpP --minimal linux-4.9.207/include/linux/sunrpc/clnt.h linux-4.9.207-vs2.3.9.11/include/linux/sunrpc/clnt.h
+--- linux-4.9.207/include/linux/sunrpc/clnt.h 2019-12-25 15:28:39.857275424 +0000
++++ linux-4.9.207-vs2.3.9.11/include/linux/sunrpc/clnt.h 2018-10-20 05:55:43.000000000 +0000
@@ -52,7 +52,8 @@ struct rpc_clnt {
cl_discrtry : 1,/* disconnect before retry */
cl_noretranstimeo: 1,/* No retransmit timeouts */
@@ -7056,9 +7069,9 @@ diff -NurpP --minimal linux-4.9.135/include/linux/sunrpc/clnt.h linux-4.9.135-vs
struct rpc_rtt * cl_rtt; /* RTO estimator data */
const struct rpc_timeout *cl_timeout; /* Timeout strategy */
-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
+diff -NurpP --minimal linux-4.9.207/include/linux/types.h linux-4.9.207-vs2.3.9.11/include/linux/types.h
+--- linux-4.9.207/include/linux/types.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/include/linux/types.h 2018-10-20 04:58:14.000000000 +0000
@@ -32,6 +32,9 @@ typedef __kernel_uid32_t uid_t;
typedef __kernel_gid32_t gid_t;
typedef __kernel_uid16_t uid16_t;
@@ -7069,9 +7082,9 @@ diff -NurpP --minimal linux-4.9.135/include/linux/types.h linux-4.9.135-vs2.3.9.
typedef unsigned long uintptr_t;
-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
+diff -NurpP --minimal linux-4.9.207/include/linux/uidgid.h linux-4.9.207-vs2.3.9.11/include/linux/uidgid.h
+--- linux-4.9.207/include/linux/uidgid.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/include/linux/uidgid.h 2018-10-20 04:58:14.000000000 +0000
@@ -21,13 +21,17 @@ typedef struct {
uid_t val;
} kuid_t;
@@ -7168,9 +7181,9 @@ diff -NurpP --minimal linux-4.9.135/include/linux/uidgid.h linux-4.9.135-vs2.3.9
static inline uid_t from_kuid_munged(struct user_namespace *to, kuid_t kuid)
{
uid_t uid = from_kuid(to, kuid);
-diff -NurpP --minimal linux-4.9.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
+diff -NurpP --minimal linux-4.9.207/include/linux/vroot.h linux-4.9.207-vs2.3.9.11/include/linux/vroot.h
+--- linux-4.9.207/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/include/linux/vroot.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,51 @@
+
+/*
@@ -7223,9 +7236,9 @@ diff -NurpP --minimal linux-4.9.135/include/linux/vroot.h linux-4.9.135-vs2.3.9.
+#define VROOT_CLR_DEV 0x5601
+
+#endif /* _LINUX_VROOT_H */
-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
+diff -NurpP --minimal linux-4.9.207/include/linux/vs_base.h linux-4.9.207-vs2.3.9.11/include/linux/vs_base.h
+--- linux-4.9.207/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/include/linux/vs_base.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,10 @@
+#ifndef _VS_BASE_H
+#define _VS_BASE_H
@@ -7237,9 +7250,9 @@ diff -NurpP --minimal linux-4.9.135/include/linux/vs_base.h linux-4.9.135-vs2.3.
+#else
+#warning duplicate inclusion
+#endif
-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
+diff -NurpP --minimal linux-4.9.207/include/linux/vs_context.h linux-4.9.207-vs2.3.9.11/include/linux/vs_context.h
+--- linux-4.9.207/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/include/linux/vs_context.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,242 @@
+#ifndef _VS_CONTEXT_H
+#define _VS_CONTEXT_H
@@ -7483,9 +7496,9 @@ diff -NurpP --minimal linux-4.9.135/include/linux/vs_context.h linux-4.9.135-vs2
+#else
+#warning duplicate inclusion
+#endif
-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
+diff -NurpP --minimal linux-4.9.207/include/linux/vs_cowbl.h linux-4.9.207-vs2.3.9.11/include/linux/vs_cowbl.h
+--- linux-4.9.207/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/include/linux/vs_cowbl.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,48 @@
+#ifndef _VS_COWBL_H
+#define _VS_COWBL_H
@@ -7535,9 +7548,9 @@ diff -NurpP --minimal linux-4.9.135/include/linux/vs_cowbl.h linux-4.9.135-vs2.3
+#else
+#warning duplicate inclusion
+#endif
-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
+diff -NurpP --minimal linux-4.9.207/include/linux/vs_cvirt.h linux-4.9.207-vs2.3.9.11/include/linux/vs_cvirt.h
+--- linux-4.9.207/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.207-vs2.3.9.11/include/linux/vs_cvirt.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,50 @@
+#ifndef _VS_CVIRT_H
+#define _VS_CVIRT_H
@@ -7589,9 +7602,9 @@ diff -NurpP --minimal linux-4.9.135/include/linux/vs_cvirt.h linux-4.9.135-vs2.3
+#else
<Skipped 9784 lines>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/3261cfd5d1b911e181087d903701015ea24a1045
More information about the pld-cvs-commit
mailing list