[packages/kernel/LINUX_4_9] rel 2; update to latest available vs patch 4.9.312-vs2.3.9.13 (which is from 2022)
arekm
arekm at pld-linux.org
Wed Jul 3 14:16:34 CEST 2024
commit 62fbe409cbd991b27b68173cd03ed14c7842184a
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Wed Jul 3 13:27:02 2024 +0200
rel 2; update to latest available vs patch 4.9.312-vs2.3.9.13 (which is from 2022)
kernel-vserver-2.3.patch | 9450 ++++++++++++++++++++++----------------------
kernel-vserver-fixes.patch | 67 +-
kernel.spec | 4 +-
3 files changed, 4714 insertions(+), 4807 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index c97500c7..3c1c471a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -71,7 +71,7 @@
%define have_pcmcia 0
%endif
-%define rel 1
+%define rel 2
%define basever 4.9
%define postver .337
@@ -187,7 +187,7 @@ 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.217-vs2.3.9.12
+%define vserver_patch 4.9.312-vs2.3.9.13
# http://vserver.13thfloor.at/Experimental/patch-4.9.217-vs2.3.9.12.diff
# note there are additional patches from above url:
# - *fix* are real fixes (we want these)
diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index b4ac0283..457ed137 100644
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -1,164 +1,6 @@
-diff -urNp -x '*.orig' linux-4.9/Documentation/vserver/debug.txt linux-4.9/Documentation/vserver/debug.txt
---- linux-4.9/Documentation/vserver/debug.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.9/Documentation/vserver/debug.txt 2021-02-24 15:47:45.047741532 +0100
-@@ -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 -urNp -x '*.orig' linux-4.9/arch/alpha/Kconfig linux-4.9/arch/alpha/Kconfig
---- linux-4.9/arch/alpha/Kconfig 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/arch/alpha/Kconfig 2021-02-24 15:47:45.037741219 +0100
+diff -NurpP --minimal linux-4.9.312/arch/alpha/Kconfig linux-4.9.312-vs2.3.9.13/arch/alpha/Kconfig
+--- linux-4.9.312/arch/alpha/Kconfig 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/arch/alpha/Kconfig linux-4.9/arch/alpha/Kconfig
source "security/Kconfig"
source "crypto/Kconfig"
-diff -urNp -x '*.orig' linux-4.9/arch/alpha/kernel/systbls.S linux-4.9/arch/alpha/kernel/systbls.S
---- linux-4.9/arch/alpha/kernel/systbls.S 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/arch/alpha/kernel/systbls.S 2021-02-24 15:47:45.037741219 +0100
+diff -NurpP --minimal linux-4.9.312/arch/alpha/kernel/systbls.S linux-4.9.312-vs2.3.9.13/arch/alpha/kernel/systbls.S
+--- linux-4.9.312/arch/alpha/kernel/systbls.S 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/arch/alpha/kernel/systbls.S linux-4.9/arch/alph
.quad sys_ni_syscall /* sys_mbind */
.quad sys_ni_syscall /* sys_get_mempolicy */
.quad sys_ni_syscall /* sys_set_mempolicy */
-diff -urNp -x '*.orig' linux-4.9/arch/alpha/kernel/traps.c linux-4.9/arch/alpha/kernel/traps.c
---- linux-4.9/arch/alpha/kernel/traps.c 2021-02-24 15:47:30.747294162 +0100
-+++ linux-4.9/arch/alpha/kernel/traps.c 2021-02-24 15:47:45.037741219 +0100
+diff -NurpP --minimal linux-4.9.312/arch/alpha/kernel/traps.c linux-4.9.312-vs2.3.9.13/arch/alpha/kernel/traps.c
+--- linux-4.9.312/arch/alpha/kernel/traps.c 2022-05-07 13:51:50.778259947 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/arch/alpha/kernel/traps.c linux-4.9/arch/alpha/
dik_show_regs(regs, r9_15);
add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE);
dik_show_trace((unsigned long *)(regs+1));
-diff -urNp -x '*.orig' linux-4.9/arch/arm/Kconfig linux-4.9/arch/arm/Kconfig
---- linux-4.9/arch/arm/Kconfig 2021-02-24 15:47:30.757294474 +0100
-+++ linux-4.9/arch/arm/Kconfig 2021-02-24 15:47:45.041074656 +0100
-@@ -2202,6 +2202,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-4.9.312/arch/arm/Kconfig linux-4.9.312-vs2.3.9.13/arch/arm/Kconfig
+--- linux-4.9.312/arch/arm/Kconfig 2022-05-07 13:51:50.870258519 +0000
++++ linux-4.9.312-vs2.3.9.13/arch/arm/Kconfig 2021-12-20 13:27:41.100025480 +0000
+@@ -2198,6 +2198,8 @@ source "fs/Kconfig"
source "arch/arm/Kconfig.debug"
@@ -205,9 +47,9 @@ diff -urNp -x '*.orig' linux-4.9/arch/arm/Kconfig linux-4.9/arch/arm/Kconfig
source "security/Kconfig"
source "crypto/Kconfig"
-diff -urNp -x '*.orig' linux-4.9/arch/arm/kernel/calls.S linux-4.9/arch/arm/kernel/calls.S
---- linux-4.9/arch/arm/kernel/calls.S 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/arch/arm/kernel/calls.S 2021-02-24 15:47:45.041074656 +0100
+diff -NurpP --minimal linux-4.9.312/arch/arm/kernel/calls.S linux-4.9.312-vs2.3.9.13/arch/arm/kernel/calls.S
+--- linux-4.9.312/arch/arm/kernel/calls.S 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/arch/arm/kernel/calls.S 2018-10-20 04:58:12.000000000 +0000
@@ -322,7 +322,7 @@
/* 310 */ CALL(sys_request_key)
CALL(sys_keyctl)
@@ -217,10 +59,10 @@ diff -urNp -x '*.orig' linux-4.9/arch/arm/kernel/calls.S linux-4.9/arch/arm/kern
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -urNp -x '*.orig' linux-4.9/arch/arm/kernel/traps.c linux-4.9/arch/arm/kernel/traps.c
---- linux-4.9/arch/arm/kernel/traps.c 2021-02-24 15:47:30.797295726 +0100
-+++ linux-4.9/arch/arm/kernel/traps.c 2021-02-24 15:47:45.041074656 +0100
-@@ -279,8 +279,8 @@ static int __die(const char *str, int er
+diff -NurpP --minimal linux-4.9.312/arch/arm/kernel/traps.c linux-4.9.312-vs2.3.9.13/arch/arm/kernel/traps.c
+--- linux-4.9.312/arch/arm/kernel/traps.c 2022-05-07 13:51:51.406250203 +0000
++++ linux-4.9.312-vs2.3.9.13/arch/arm/kernel/traps.c 2022-05-07 14:02:10.884606274 +0000
+@@ -280,8 +280,8 @@ static int __die(const char *str, int er
print_modules();
__show_regs(regs);
@@ -231,9 +73,9 @@ diff -urNp -x '*.orig' linux-4.9/arch/arm/kernel/traps.c linux-4.9/arch/arm/kern
if (!user_mode(regs) || in_interrupt()) {
dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
-diff -urNp -x '*.orig' linux-4.9/arch/cris/Kconfig linux-4.9/arch/cris/Kconfig
---- linux-4.9/arch/cris/Kconfig 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/arch/cris/Kconfig 2021-02-24 15:47:45.041074656 +0100
+diff -NurpP --minimal linux-4.9.312/arch/cris/Kconfig linux-4.9.312-vs2.3.9.13/arch/cris/Kconfig
+--- linux-4.9.312/arch/cris/Kconfig 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/arch/cris/Kconfig linux-4.9/arch/cris/Kconfig
source "security/Kconfig"
source "crypto/Kconfig"
-diff -urNp -x '*.orig' linux-4.9/arch/ia64/Kconfig linux-4.9/arch/ia64/Kconfig
---- linux-4.9/arch/ia64/Kconfig 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/arch/ia64/Kconfig 2021-02-24 15:47:45.041074656 +0100
+diff -NurpP --minimal linux-4.9.312/arch/ia64/Kconfig linux-4.9.312-vs2.3.9.13/arch/ia64/Kconfig
+--- linux-4.9.312/arch/ia64/Kconfig 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/arch/ia64/Kconfig linux-4.9/arch/ia64/Kconfig
source "security/Kconfig"
source "crypto/Kconfig"
-diff -urNp -x '*.orig' linux-4.9/arch/ia64/kernel/entry.S linux-4.9/arch/ia64/kernel/entry.S
---- linux-4.9/arch/ia64/kernel/entry.S 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/arch/ia64/kernel/entry.S 2021-02-24 15:47:45.041074656 +0100
+diff -NurpP --minimal linux-4.9.312/arch/ia64/kernel/entry.S linux-4.9.312-vs2.3.9.13/arch/ia64/kernel/entry.S
+--- linux-4.9.312/arch/ia64/kernel/entry.S 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/arch/ia64/kernel/entry.S linux-4.9/arch/ia64/ke
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -urNp -x '*.orig' linux-4.9/arch/ia64/kernel/ptrace.c linux-4.9/arch/ia64/kernel/ptrace.c
---- linux-4.9/arch/ia64/kernel/ptrace.c 2021-02-24 15:47:30.857297603 +0100
-+++ linux-4.9/arch/ia64/kernel/ptrace.c 2021-02-24 15:47:45.041074656 +0100
+diff -NurpP --minimal linux-4.9.312/arch/ia64/kernel/ptrace.c linux-4.9.312-vs2.3.9.13/arch/ia64/kernel/ptrace.c
+--- linux-4.9.312/arch/ia64/kernel/ptrace.c 2022-05-07 13:51:52.834228046 +0000
++++ linux-4.9.312-vs2.3.9.13/arch/ia64/kernel/ptrace.c 2021-07-12 22:41:16.609423854 +0000
@@ -21,6 +21,7 @@
#include <linux/regset.h>
#include <linux/elf.h>
@@ -278,9 +120,9 @@ diff -urNp -x '*.orig' linux-4.9/arch/ia64/kernel/ptrace.c linux-4.9/arch/ia64/k
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -urNp -x '*.orig' linux-4.9/arch/ia64/kernel/traps.c linux-4.9/arch/ia64/kernel/traps.c
---- linux-4.9/arch/ia64/kernel/traps.c 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/arch/ia64/kernel/traps.c 2021-02-24 15:47:45.041074656 +0100
+diff -NurpP --minimal linux-4.9.312/arch/ia64/kernel/traps.c linux-4.9.312-vs2.3.9.13/arch/ia64/kernel/traps.c
+--- linux-4.9.312/arch/ia64/kernel/traps.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/arch/ia64/kernel/traps.c linux-4.9/arch/ia64/ke
}
}
}
-diff -urNp -x '*.orig' linux-4.9/arch/m32r/kernel/traps.c linux-4.9/arch/m32r/kernel/traps.c
---- linux-4.9/arch/m32r/kernel/traps.c 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/arch/m32r/kernel/traps.c 2021-02-24 15:47:45.041074656 +0100
+diff -NurpP --minimal linux-4.9.312/arch/m32r/kernel/traps.c linux-4.9.312-vs2.3.9.13/arch/m32r/kernel/traps.c
+--- linux-4.9.312/arch/m32r/kernel/traps.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/arch/m32r/kernel/traps.c linux-4.9/arch/m32r/ke
/*
* When in-kernel, we also print out the stack and code at the
-diff -urNp -x '*.orig' linux-4.9/arch/m68k/Kconfig linux-4.9/arch/m68k/Kconfig
---- linux-4.9/arch/m68k/Kconfig 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/arch/m68k/Kconfig 2021-02-24 15:47:45.041074656 +0100
+diff -NurpP --minimal linux-4.9.312/arch/m68k/Kconfig linux-4.9.312-vs2.3.9.13/arch/m68k/Kconfig
+--- linux-4.9.312/arch/m68k/Kconfig 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/arch/m68k/Kconfig linux-4.9/arch/m68k/Kconfig
source "security/Kconfig"
source "crypto/Kconfig"
-diff -urNp -x '*.orig' linux-4.9/arch/mips/Kconfig linux-4.9/arch/mips/Kconfig
---- linux-4.9/arch/mips/Kconfig 2021-02-24 15:47:30.863964478 +0100
-+++ linux-4.9/arch/mips/Kconfig 2021-02-24 15:47:45.044408094 +0100
-@@ -3194,6 +3194,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-4.9.312/arch/mips/Kconfig linux-4.9.312-vs2.3.9.13/arch/mips/Kconfig
+--- linux-4.9.312/arch/mips/Kconfig 2022-05-07 13:51:53.138223329 +0000
++++ linux-4.9.312-vs2.3.9.13/arch/mips/Kconfig 2021-12-20 13:27:41.220023601 +0000
+@@ -3198,6 +3198,8 @@ source "fs/Kconfig"
source "arch/mips/Kconfig.debug"
@@ -344,9 +186,9 @@ diff -urNp -x '*.orig' linux-4.9/arch/mips/Kconfig linux-4.9/arch/mips/Kconfig
source "security/Kconfig"
source "crypto/Kconfig"
-diff -urNp -x '*.orig' linux-4.9/arch/mips/kernel/ptrace.c linux-4.9/arch/mips/kernel/ptrace.c
---- linux-4.9/arch/mips/kernel/ptrace.c 2021-02-24 15:47:30.880631666 +0100
-+++ linux-4.9/arch/mips/kernel/ptrace.c 2021-02-24 15:47:45.044408094 +0100
+diff -NurpP --minimal linux-4.9.312/arch/mips/kernel/ptrace.c linux-4.9.312-vs2.3.9.13/arch/mips/kernel/ptrace.c
+--- linux-4.9.312/arch/mips/kernel/ptrace.c 2022-05-07 13:51:54.262205890 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/arch/mips/kernel/ptrace.c linux-4.9/arch/mips/k
switch (request) {
/* when I and D space are separate, these will need to be fixed. */
case PTRACE_PEEKTEXT: /* read word at location addr. */
-diff -urNp -x '*.orig' linux-4.9/arch/mips/kernel/scall32-o32.S linux-4.9/arch/mips/kernel/scall32-o32.S
---- linux-4.9/arch/mips/kernel/scall32-o32.S 2021-02-24 15:47:30.880631666 +0100
-+++ linux-4.9/arch/mips/kernel/scall32-o32.S 2021-02-24 15:47:45.044408094 +0100
+diff -NurpP --minimal linux-4.9.312/arch/mips/kernel/scall32-o32.S linux-4.9.312-vs2.3.9.13/arch/mips/kernel/scall32-o32.S
+--- linux-4.9.312/arch/mips/kernel/scall32-o32.S 2022-05-07 13:51:54.270205766 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/arch/mips/kernel/scall32-o32.S linux-4.9/arch/m
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-diff -urNp -x '*.orig' linux-4.9/arch/mips/kernel/scall64-64.S linux-4.9/arch/mips/kernel/scall64-64.S
---- linux-4.9/arch/mips/kernel/scall64-64.S 2021-02-24 15:47:30.880631666 +0100
-+++ linux-4.9/arch/mips/kernel/scall64-64.S 2021-02-24 15:47:45.044408094 +0100
+diff -NurpP --minimal linux-4.9.312/arch/mips/kernel/scall64-64.S linux-4.9.312-vs2.3.9.13/arch/mips/kernel/scall64-64.S
+--- linux-4.9.312/arch/mips/kernel/scall64-64.S 2022-05-07 13:51:54.270205766 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/arch/mips/kernel/scall64-64.S linux-4.9/arch/mi
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -urNp -x '*.orig' linux-4.9/arch/mips/kernel/scall64-n32.S linux-4.9/arch/mips/kernel/scall64-n32.S
---- linux-4.9/arch/mips/kernel/scall64-n32.S 2021-02-24 15:47:30.880631666 +0100
-+++ linux-4.9/arch/mips/kernel/scall64-n32.S 2021-02-24 15:47:45.044408094 +0100
+diff -NurpP --minimal linux-4.9.312/arch/mips/kernel/scall64-n32.S linux-4.9.312-vs2.3.9.13/arch/mips/kernel/scall64-n32.S
+--- linux-4.9.312/arch/mips/kernel/scall64-n32.S 2022-05-07 13:51:54.274205704 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/arch/mips/kernel/scall64-n32.S linux-4.9/arch/m
PTR compat_sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -urNp -x '*.orig' linux-4.9/arch/mips/kernel/scall64-o32.S linux-4.9/arch/mips/kernel/scall64-o32.S
---- linux-4.9/arch/mips/kernel/scall64-o32.S 2021-02-24 15:47:30.880631666 +0100
-+++ linux-4.9/arch/mips/kernel/scall64-o32.S 2021-02-24 15:47:45.044408094 +0100
+diff -NurpP --minimal linux-4.9.312/arch/mips/kernel/scall64-o32.S linux-4.9.312-vs2.3.9.13/arch/mips/kernel/scall64-o32.S
+--- linux-4.9.312/arch/mips/kernel/scall64-o32.S 2022-05-07 13:51:54.274205704 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/arch/mips/kernel/scall64-o32.S linux-4.9/arch/m
PTR compat_sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-diff -urNp -x '*.orig' linux-4.9/arch/mips/kernel/traps.c linux-4.9/arch/mips/kernel/traps.c
---- linux-4.9/arch/mips/kernel/traps.c 2021-02-24 15:47:30.880631666 +0100
-+++ linux-4.9/arch/mips/kernel/traps.c 2021-02-24 15:47:45.044408094 +0100
+diff -NurpP --minimal linux-4.9.312/arch/mips/kernel/traps.c linux-4.9.312-vs2.3.9.13/arch/mips/kernel/traps.c
+--- linux-4.9.312/arch/mips/kernel/traps.c 2022-05-07 13:51:54.274205704 +0000
++++ linux-4.9.312-vs2.3.9.13/arch/mips/kernel/traps.c 2022-05-07 14:02:10.940605393 +0000
@@ -361,9 +361,10 @@ void show_registers(struct pt_regs *regs
__show_regs(regs);
@@ -430,9 +272,9 @@ diff -urNp -x '*.orig' linux-4.9/arch/mips/kernel/traps.c linux-4.9/arch/mips/ke
if (cpu_has_userlocal) {
unsigned long tls;
-diff -urNp -x '*.orig' linux-4.9/arch/parisc/Kconfig linux-4.9/arch/parisc/Kconfig
---- linux-4.9/arch/parisc/Kconfig 2021-02-24 15:47:30.893965417 +0100
-+++ linux-4.9/arch/parisc/Kconfig 2021-02-24 15:47:45.044408094 +0100
+diff -NurpP --minimal linux-4.9.312/arch/parisc/Kconfig linux-4.9.312-vs2.3.9.13/arch/parisc/Kconfig
+--- linux-4.9.312/arch/parisc/Kconfig 2022-05-07 13:51:54.690199249 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/arch/parisc/Kconfig linux-4.9/arch/parisc/Kconf
source "security/Kconfig"
source "crypto/Kconfig"
-diff -urNp -x '*.orig' linux-4.9/arch/parisc/kernel/syscall_table.S linux-4.9/arch/parisc/kernel/syscall_table.S
---- linux-4.9/arch/parisc/kernel/syscall_table.S 2021-02-24 15:47:30.897298854 +0100
-+++ linux-4.9/arch/parisc/kernel/syscall_table.S 2021-02-24 15:47:45.044408094 +0100
+diff -NurpP --minimal linux-4.9.312/arch/parisc/kernel/syscall_table.S linux-4.9.312-vs2.3.9.13/arch/parisc/kernel/syscall_table.S
+--- linux-4.9.312/arch/parisc/kernel/syscall_table.S 2022-05-07 13:51:54.810197387 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/arch/parisc/kernel/syscall_table.S linux-4.9/ar
ENTRY_SAME(add_key)
ENTRY_SAME(request_key) /* 265 */
ENTRY_COMP(keyctl)
-diff -urNp -x '*.orig' linux-4.9/arch/parisc/kernel/traps.c linux-4.9/arch/parisc/kernel/traps.c
---- linux-4.9/arch/parisc/kernel/traps.c 2021-02-24 15:47:30.897298854 +0100
-+++ linux-4.9/arch/parisc/kernel/traps.c 2021-02-24 15:47:45.044408094 +0100
+diff -NurpP --minimal linux-4.9.312/arch/parisc/kernel/traps.c linux-4.9.312-vs2.3.9.13/arch/parisc/kernel/traps.c
+--- linux-4.9.312/arch/parisc/kernel/traps.c 2022-05-07 13:51:54.810197387 +0000
++++ linux-4.9.312-vs2.3.9.13/arch/parisc/kernel/traps.c 2022-05-07 14:02:10.956605141 +0000
@@ -235,8 +235,9 @@ void die_if_kernel(char *str, struct pt_
return; /* STFU */
@@ -480,21 +322,9 @@ diff -urNp -x '*.orig' linux-4.9/arch/parisc/kernel/traps.c linux-4.9/arch/paris
/* Wot's wrong wif bein' racy? */
if (current->thread.flags & PARISC_KERNEL_DEATH) {
-diff -urNp -x '*.orig' linux-4.9/arch/powerpc/Kconfig linux-4.9/arch/powerpc/Kconfig
---- linux-4.9/arch/powerpc/Kconfig 2021-02-24 15:47:30.900632291 +0100
-+++ linux-4.9/arch/powerpc/Kconfig 2021-02-24 15:47:45.044408094 +0100
-@@ -1092,6 +1092,8 @@ source "lib/Kconfig"
-
- source "arch/powerpc/Kconfig.debug"
-
-+source "kernel/vserver/Kconfig"
-+
- source "security/Kconfig"
-
- source "crypto/Kconfig"
-diff -urNp -x '*.orig' linux-4.9/arch/powerpc/include/uapi/asm/unistd.h linux-4.9/arch/powerpc/include/uapi/asm/unistd.h
---- linux-4.9/arch/powerpc/include/uapi/asm/unistd.h 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/arch/powerpc/include/uapi/asm/unistd.h 2021-02-24 15:47:45.044408094 +0100
+diff -NurpP --minimal linux-4.9.312/arch/powerpc/include/uapi/asm/unistd.h linux-4.9.312-vs2.3.9.13/arch/powerpc/include/uapi/asm/unistd.h
+--- linux-4.9.312/arch/powerpc/include/uapi/asm/unistd.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/arch/powerpc/include/uapi/asm/unistd.h linux-4.
#define __NR_migrate_pages 258
#define __NR_mbind 259
#define __NR_get_mempolicy 260
-diff -urNp -x '*.orig' linux-4.9/arch/s390/Kconfig linux-4.9/arch/s390/Kconfig
---- linux-4.9/arch/s390/Kconfig 2021-02-24 15:47:30.947300418 +0100
-+++ linux-4.9/arch/s390/Kconfig 2021-02-24 15:47:45.044408094 +0100
-@@ -775,6 +775,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-4.9.312/arch/powerpc/Kconfig linux-4.9.312-vs2.3.9.13/arch/powerpc/Kconfig
+--- linux-4.9.312/arch/powerpc/Kconfig 2022-05-07 13:51:54.822197201 +0000
++++ linux-4.9.312-vs2.3.9.13/arch/powerpc/Kconfig 2021-07-12 22:41:17.629410987 +0000
+@@ -1092,6 +1092,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 -urNp -x '*.orig' linux-4.9/arch/s390/include/asm/tlb.h linux-4.9/arch/s390/include/asm/tlb.h
---- linux-4.9/arch/s390/include/asm/tlb.h 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/arch/s390/include/asm/tlb.h 2021-02-24 15:47:45.044408094 +0100
+diff -NurpP --minimal linux-4.9.312/arch/s390/include/asm/tlb.h linux-4.9.312-vs2.3.9.13/arch/s390/include/asm/tlb.h
+--- linux-4.9.312/arch/s390/include/asm/tlb.h 2022-05-07 13:51:56.002178892 +0000
++++ linux-4.9.312-vs2.3.9.13/arch/s390/include/asm/tlb.h 2021-12-20 13:27:41.630017168 +0000
@@ -24,6 +24,7 @@
#include <linux/mm.h>
#include <linux/pagemap.h>
@@ -527,9 +357,9 @@ diff -urNp -x '*.orig' linux-4.9/arch/s390/include/asm/tlb.h linux-4.9/arch/s390
#include <asm/processor.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-diff -urNp -x '*.orig' linux-4.9/arch/s390/include/uapi/asm/unistd.h linux-4.9/arch/s390/include/uapi/asm/unistd.h
---- linux-4.9/arch/s390/include/uapi/asm/unistd.h 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/arch/s390/include/uapi/asm/unistd.h 2021-02-24 15:47:45.044408094 +0100
+diff -NurpP --minimal linux-4.9.312/arch/s390/include/uapi/asm/unistd.h linux-4.9.312-vs2.3.9.13/arch/s390/include/uapi/asm/unistd.h
+--- linux-4.9.312/arch/s390/include/uapi/asm/unistd.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/arch/s390/include/uapi/asm/unistd.h linux-4.9/a
#define __NR_statfs64 265
#define __NR_fstatfs64 266
#define __NR_remap_file_pages 267
-diff -urNp -x '*.orig' linux-4.9/arch/s390/kernel/ptrace.c linux-4.9/arch/s390/kernel/ptrace.c
---- linux-4.9/arch/s390/kernel/ptrace.c 2021-02-24 15:47:30.957300731 +0100
-+++ linux-4.9/arch/s390/kernel/ptrace.c 2021-02-24 15:47:45.047741532 +0100
+diff -NurpP --minimal linux-4.9.312/arch/s390/Kconfig linux-4.9.312-vs2.3.9.13/arch/s390/Kconfig
+--- linux-4.9.312/arch/s390/Kconfig 2022-05-07 13:51:55.930180010 +0000
++++ linux-4.9.312-vs2.3.9.13/arch/s390/Kconfig 2021-12-20 13:27:41.630017168 +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.312/arch/s390/kernel/ptrace.c linux-4.9.312-vs2.3.9.13/arch/s390/kernel/ptrace.c
+--- linux-4.9.312/arch/s390/kernel/ptrace.c 2022-05-07 13:51:56.078177713 +0000
++++ linux-4.9.312-vs2.3.9.13/arch/s390/kernel/ptrace.c 2021-07-12 22:41:18.069405434 +0000
@@ -21,6 +21,7 @@
#include <linux/tracehook.h>
#include <linux/seccomp.h>
@@ -550,9 +392,9 @@ diff -urNp -x '*.orig' linux-4.9/arch/s390/kernel/ptrace.c linux-4.9/arch/s390/k
#include <trace/syscall.h>
#include <asm/segment.h>
#include <asm/page.h>
-diff -urNp -x '*.orig' linux-4.9/arch/s390/kernel/syscalls.S linux-4.9/arch/s390/kernel/syscalls.S
---- linux-4.9/arch/s390/kernel/syscalls.S 2021-02-24 15:47:30.960634169 +0100
-+++ linux-4.9/arch/s390/kernel/syscalls.S 2021-02-24 15:47:45.047741532 +0100
+diff -NurpP --minimal linux-4.9.312/arch/s390/kernel/syscalls.S linux-4.9.312-vs2.3.9.13/arch/s390/kernel/syscalls.S
+--- linux-4.9.312/arch/s390/kernel/syscalls.S 2022-05-07 13:51:56.078177713 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/arch/s390/kernel/syscalls.S linux-4.9/arch/s390
SYSCALL(sys_ni_syscall,compat_sys_s390_fadvise64_64)
SYSCALL(sys_statfs64,compat_sys_statfs64)
SYSCALL(sys_fstatfs64,compat_sys_fstatfs64)
-diff -urNp -x '*.orig' linux-4.9/arch/sh/Kconfig linux-4.9/arch/sh/Kconfig
---- linux-4.9/arch/sh/Kconfig 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/arch/sh/Kconfig 2021-02-24 15:47:45.047741532 +0100
+diff -NurpP --minimal linux-4.9.312/arch/sh/Kconfig linux-4.9.312-vs2.3.9.13/arch/sh/Kconfig
+--- linux-4.9.312/arch/sh/Kconfig 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/arch/sh/Kconfig linux-4.9/arch/sh/Kconfig
source "security/Kconfig"
source "crypto/Kconfig"
-diff -urNp -x '*.orig' linux-4.9/arch/sh/kernel/irq.c linux-4.9/arch/sh/kernel/irq.c
---- linux-4.9/arch/sh/kernel/irq.c 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/arch/sh/kernel/irq.c 2021-02-24 15:47:45.047741532 +0100
+diff -NurpP --minimal linux-4.9.312/arch/sh/kernel/irq.c linux-4.9.312-vs2.3.9.13/arch/sh/kernel/irq.c
+--- linux-4.9.312/arch/sh/kernel/irq.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/arch/sh/kernel/irq.c linux-4.9/arch/sh/kernel/i
#include <asm/processor.h>
#include <asm/machvec.h>
#include <asm/uaccess.h>
-diff -urNp -x '*.orig' linux-4.9/arch/sparc/Kconfig linux-4.9/arch/sparc/Kconfig
---- linux-4.9/arch/sparc/Kconfig 2021-02-24 15:47:30.967301044 +0100
-+++ linux-4.9/arch/sparc/Kconfig 2021-02-24 15:47:45.047741532 +0100
-@@ -584,6 +584,8 @@ source "fs/Kconfig"
-
- source "arch/sparc/Kconfig.debug"
-
-+source "kernel/vserver/Kconfig"
-+
- source "security/Kconfig"
-
- source "crypto/Kconfig"
-diff -urNp -x '*.orig' linux-4.9/arch/sparc/include/uapi/asm/unistd.h linux-4.9/arch/sparc/include/uapi/asm/unistd.h
---- linux-4.9/arch/sparc/include/uapi/asm/unistd.h 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/arch/sparc/include/uapi/asm/unistd.h 2021-02-24 15:47:45.047741532 +0100
+diff -NurpP --minimal linux-4.9.312/arch/sparc/include/uapi/asm/unistd.h linux-4.9.312-vs2.3.9.13/arch/sparc/include/uapi/asm/unistd.h
+--- linux-4.9.312/arch/sparc/include/uapi/asm/unistd.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/arch/sparc/include/uapi/asm/unistd.h linux-4.9/
#define __NR_io_setup 268
#define __NR_io_destroy 269
#define __NR_io_submit 270
-diff -urNp -x '*.orig' linux-4.9/arch/sparc/kernel/systbls_32.S linux-4.9/arch/sparc/kernel/systbls_32.S
---- linux-4.9/arch/sparc/kernel/systbls_32.S 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/arch/sparc/kernel/systbls_32.S 2021-02-24 15:47:45.047741532 +0100
+diff -NurpP --minimal linux-4.9.312/arch/sparc/Kconfig linux-4.9.312-vs2.3.9.13/arch/sparc/Kconfig
+--- linux-4.9.312/arch/sparc/Kconfig 2022-05-07 13:51:56.374173120 +0000
++++ linux-4.9.312-vs2.3.9.13/arch/sparc/Kconfig 2021-07-12 22:41:18.389401398 +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.312/arch/sparc/kernel/systbls_32.S linux-4.9.312-vs2.3.9.13/arch/sparc/kernel/systbls_32.S
+--- linux-4.9.312/arch/sparc/kernel/systbls_32.S 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/arch/sparc/kernel/systbls_32.S linux-4.9/arch/s
/*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 -urNp -x '*.orig' linux-4.9/arch/sparc/kernel/systbls_64.S linux-4.9/arch/sparc/kernel/systbls_64.S
---- linux-4.9/arch/sparc/kernel/systbls_64.S 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/arch/sparc/kernel/systbls_64.S 2021-02-24 15:47:45.047741532 +0100
+diff -NurpP --minimal linux-4.9.312/arch/sparc/kernel/systbls_64.S linux-4.9.312-vs2.3.9.13/arch/sparc/kernel/systbls_64.S
+--- linux-4.9.312/arch/sparc/kernel/systbls_64.S 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/arch/sparc/kernel/systbls_64.S linux-4.9/arch/s
/*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 -urNp -x '*.orig' linux-4.9/arch/um/Kconfig.rest linux-4.9/arch/um/Kconfig.rest
---- linux-4.9/arch/um/Kconfig.rest 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/arch/um/Kconfig.rest 2021-02-24 15:47:45.047741532 +0100
+diff -NurpP --minimal linux-4.9.312/arch/um/Kconfig.rest linux-4.9.312-vs2.3.9.13/arch/um/Kconfig.rest
+--- linux-4.9.312/arch/um/Kconfig.rest 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/arch/um/Kconfig.rest linux-4.9/arch/um/Kconfig.
source "security/Kconfig"
source "crypto/Kconfig"
-diff -urNp -x '*.orig' linux-4.9/arch/x86/Kconfig linux-4.9/arch/x86/Kconfig
---- linux-4.9/arch/x86/Kconfig 2021-02-24 15:47:30.980634795 +0100
-+++ linux-4.9/arch/x86/Kconfig 2021-02-24 15:47:45.047741532 +0100
-@@ -2810,6 +2810,8 @@ source "fs/Kconfig"
-
- source "arch/x86/Kconfig.debug"
-
-+source "kernel/vserver/Kconfig"
-+
- source "security/Kconfig"
-
- source "crypto/Kconfig"
-diff -urNp -x '*.orig' linux-4.9/arch/x86/entry/syscalls/syscall_32.tbl linux-4.9/arch/x86/entry/syscalls/syscall_32.tbl
---- linux-4.9/arch/x86/entry/syscalls/syscall_32.tbl 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/arch/x86/entry/syscalls/syscall_32.tbl 2021-02-24 15:47:45.047741532 +0100
+diff -NurpP --minimal linux-4.9.312/arch/x86/entry/syscalls/syscall_32.tbl linux-4.9.312-vs2.3.9.13/arch/x86/entry/syscalls/syscall_32.tbl
+--- linux-4.9.312/arch/x86/entry/syscalls/syscall_32.tbl 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/arch/x86/entry/syscalls/syscall_32.tbl linux-4.
274 i386 mbind sys_mbind
275 i386 get_mempolicy sys_get_mempolicy compat_sys_get_mempolicy
276 i386 set_mempolicy sys_set_mempolicy
-diff -urNp -x '*.orig' linux-4.9/arch/x86/entry/syscalls/syscall_64.tbl linux-4.9/arch/x86/entry/syscalls/syscall_64.tbl
---- linux-4.9/arch/x86/entry/syscalls/syscall_64.tbl 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/arch/x86/entry/syscalls/syscall_64.tbl 2021-02-24 15:47:45.047741532 +0100
+diff -NurpP --minimal linux-4.9.312/arch/x86/entry/syscalls/syscall_64.tbl linux-4.9.312-vs2.3.9.13/arch/x86/entry/syscalls/syscall_64.tbl
+--- linux-4.9.312/arch/x86/entry/syscalls/syscall_64.tbl 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/arch/x86/entry/syscalls/syscall_64.tbl linux-4.
237 common mbind sys_mbind
238 common set_mempolicy sys_set_mempolicy
239 common get_mempolicy sys_get_mempolicy
-diff -urNp -x '*.orig' linux-4.9/block/ioprio.c linux-4.9/block/ioprio.c
---- linux-4.9/block/ioprio.c 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/block/ioprio.c 2021-02-24 15:47:45.047741532 +0100
+diff -NurpP --minimal linux-4.9.312/arch/x86/Kconfig linux-4.9.312-vs2.3.9.13/arch/x86/Kconfig
+--- linux-4.9.312/arch/x86/Kconfig 2022-05-07 13:51:56.726167659 +0000
++++ linux-4.9.312-vs2.3.9.13/arch/x86/Kconfig 2022-05-07 14:02:10.984604701 +0000
+@@ -2807,6 +2807,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.312/block/ioprio.c linux-4.9.312-vs2.3.9.13/block/ioprio.c
+--- linux-4.9.312/block/ioprio.c 2022-05-07 13:51:58.434141158 +0000
++++ linux-4.9.312-vs2.3.9.13/block/ioprio.c 2021-12-20 13:27:42.300006657 +0000
@@ -28,6 +28,7 @@
#include <linux/syscalls.h>
#include <linux/security.h>
@@ -710,7 +552,7 @@ diff -urNp -x '*.orig' linux-4.9/block/ioprio.c linux-4.9/block/ioprio.c
ret = set_task_ioprio(p, ioprio);
if (ret)
break;
-@@ -203,6 +206,8 @@ SYSCALL_DEFINE2(ioprio_get, int, which,
+@@ -204,6 +207,8 @@ SYSCALL_DEFINE2(ioprio_get, int, which,
pgrp = find_vpid(who);
read_lock(&tasklist_lock);
do_each_pid_thread(pgrp, PIDTYPE_PGID, p) {
@@ -719,60 +561,207 @@ diff -urNp -x '*.orig' linux-4.9/block/ioprio.c linux-4.9/block/ioprio.c
tmpio = get_task_ioprio(p);
if (tmpio < 0)
continue;
-diff -urNp -x '*.orig' linux-4.9/drivers/block/Kconfig linux-4.9/drivers/block/Kconfig
---- linux-4.9/drivers/block/Kconfig 2021-02-24 15:47:31.113972298 +0100
-+++ linux-4.9/drivers/block/Kconfig 2021-02-24 15:47:45.047741532 +0100
-@@ -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.312/Documentation/vserver/debug.txt linux-4.9.312-vs2.3.9.13/Documentation/vserver/debug.txt
+--- linux-4.9.312/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/drivers/block/Makefile linux-4.9/drivers/block/Makefile
---- linux-4.9/drivers/block/Makefile 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/drivers/block/Makefile 2021-02-24 15:47:45.051074969 +0100
-@@ -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 -urNp -x '*.orig' linux-4.9/drivers/block/loop.c linux-4.9/drivers/block/loop.c
---- linux-4.9/drivers/block/loop.c 2021-02-24 15:47:31.117305737 +0100
-+++ linux-4.9/drivers/block/loop.c 2021-02-24 15:47:45.051074969 +0100
-@@ -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);
++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.312/drivers/block/Kconfig linux-4.9.312-vs2.3.9.13/drivers/block/Kconfig
+--- linux-4.9.312/drivers/block/Kconfig 2022-05-07 13:52:00.882103175 +0000
++++ linux-4.9.312-vs2.3.9.13/drivers/block/Kconfig 2021-12-20 13:27:43.129993638 +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.312/drivers/block/loop.c linux-4.9.312-vs2.3.9.13/drivers/block/loop.c
+--- linux-4.9.312/drivers/block/loop.c 2022-05-07 13:52:01.202098210 +0000
++++ linux-4.9.312-vs2.3.9.13/drivers/block/loop.c 2022-05-07 14:02:11.164601869 +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,
@@ -805,9 +794,9 @@ diff -urNp -x '*.orig' linux-4.9/drivers/block/loop.c linux-4.9/drivers/block/lo
atomic_inc(&lo->lo_refcnt);
out:
mutex_unlock(&loop_index_mutex);
-diff -urNp -x '*.orig' linux-4.9/drivers/block/loop.h linux-4.9/drivers/block/loop.h
---- linux-4.9/drivers/block/loop.h 2021-02-24 15:47:31.117305737 +0100
-+++ linux-4.9/drivers/block/loop.h 2021-02-24 15:47:45.051074969 +0100
+diff -NurpP --minimal linux-4.9.312/drivers/block/loop.h linux-4.9.312-vs2.3.9.13/drivers/block/loop.h
+--- linux-4.9.312/drivers/block/loop.h 2022-05-07 13:52:01.214098023 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/drivers/block/loop.h linux-4.9/drivers/block/lo
int (*ioctl)(struct loop_device *, int cmd,
unsigned long arg);
-diff -urNp -x '*.orig' linux-4.9/drivers/block/vroot.c linux-4.9/drivers/block/vroot.c
---- linux-4.9/drivers/block/vroot.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.9/drivers/block/vroot.c 2021-02-24 15:47:45.051074969 +0100
+diff -NurpP --minimal linux-4.9.312/drivers/block/Makefile linux-4.9.312-vs2.3.9.13/drivers/block/Makefile
+--- linux-4.9.312/drivers/block/Makefile 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/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.312/drivers/block/vroot.c linux-4.9.312-vs2.3.9.13/drivers/block/vroot.c
+--- linux-4.9.312/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/drivers/block/vroot.c 2018-10-20 04:58:13.000000000 +0000
@@ -0,0 +1,291 @@
+/*
+ * linux/drivers/block/vroot.c
@@ -1111,126 +1111,27 @@ diff -urNp -x '*.orig' linux-4.9/drivers/block/vroot.c linux-4.9/drivers/block/v
+
+#endif
+
-diff -urNp -x '*.orig' linux-4.9/drivers/md/dm-core.h linux-4.9/drivers/md/dm-core.h
---- linux-4.9/drivers/md/dm-core.h 2021-02-24 15:47:31.450649498 +0100
-+++ linux-4.9/drivers/md/dm-core.h 2021-02-24 15:47:45.051074969 +0100
-@@ -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 -urNp -x '*.orig' linux-4.9/drivers/md/dm-ioctl.c linux-4.9/drivers/md/dm-ioctl.c
---- linux-4.9/drivers/md/dm-ioctl.c 2021-02-24 15:47:31.450649498 +0100
-+++ linux-4.9/drivers/md/dm-ioctl.c 2021-02-24 15:47:45.051074969 +0100
-@@ -16,6 +16,7 @@
- #include <linux/hdreg.h>
- #include <linux/compat.h>
- #include <linux/nospec.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.312/drivers/md/dm.c linux-4.9.312-vs2.3.9.13/drivers/md/dm.c
+--- linux-4.9.312/drivers/md/dm.c 2022-05-07 13:52:09.753965519 +0000
++++ linux-4.9.312-vs2.3.9.13/drivers/md/dm.c 2020-04-01 09:40:21.845577638 +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;
+ spin_lock(&_minor_lock);
-- 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);
-@@ -1800,8 +1812,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 -urNp -x '*.orig' linux-4.9/drivers/md/dm.c linux-4.9/drivers/md/dm.c
---- linux-4.9/drivers/md/dm.c 2021-02-24 15:47:31.457316373 +0100
-+++ linux-4.9/drivers/md/dm.c 2021-02-24 15:47:45.051074969 +0100
-@@ -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);
-
-@@ -308,17 +310,19 @@ static int dm_blk_open(struct block_devi
- goto out;
+@@ -308,17 +310,19 @@ static int dm_blk_open(struct block_devi
+ goto out;
if (test_bit(DMF_FREEING, &md->flags) ||
- dm_deleting_md(md)) {
@@ -1277,9 +1178,20 @@ diff -urNp -x '*.orig' linux-4.9/drivers/md/dm.c linux-4.9/drivers/md/dm.c
md->queue = blk_alloc_queue_node(GFP_KERNEL, numa_node_id);
if (!md->queue)
-diff -urNp -x '*.orig' linux-4.9/drivers/md/dm.h linux-4.9/drivers/md/dm.h
---- linux-4.9/drivers/md/dm.h 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/drivers/md/dm.h 2021-02-24 15:47:45.051074969 +0100
+diff -NurpP --minimal linux-4.9.312/drivers/md/dm-core.h linux-4.9.312-vs2.3.9.13/drivers/md/dm-core.h
+--- linux-4.9.312/drivers/md/dm-core.h 2022-05-07 13:52:09.677966698 +0000
++++ linux-4.9.312-vs2.3.9.13/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.312/drivers/md/dm.h linux-4.9.312-vs2.3.9.13/drivers/md/dm.h
+--- linux-4.9.312/drivers/md/dm.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/drivers/md/dm.h linux-4.9/drivers/md/dm.h
/*-----------------------------------------------------------------
* Internal table functions.
*---------------------------------------------------------------*/
-diff -urNp -x '*.orig' linux-4.9/drivers/net/tun.c linux-4.9/drivers/net/tun.c
---- linux-4.9/drivers/net/tun.c 2021-02-24 15:47:31.743992008 +0100
-+++ linux-4.9/drivers/net/tun.c 2021-02-24 15:47:45.051074969 +0100
+diff -NurpP --minimal linux-4.9.312/drivers/md/dm-ioctl.c linux-4.9.312-vs2.3.9.13/drivers/md/dm-ioctl.c
+--- linux-4.9.312/drivers/md/dm-ioctl.c 2022-05-07 13:52:09.697966387 +0000
++++ linux-4.9.312-vs2.3.9.13/drivers/md/dm-ioctl.c 2022-05-07 14:04:09.242742736 +0000
+@@ -17,6 +17,7 @@
+ #include <linux/hdreg.h>
+ #include <linux/compat.h>
+ #include <linux/nospec.h>
++#include <linux/vs_context.h>
+
+ #include <asm/uaccess.h>
+
+@@ -115,7 +116,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;
+ }
+@@ -129,7 +131,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;
+ }
+@@ -140,13 +143,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;
+@@ -468,6 +473,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;
+@@ -515,6 +523,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;
+@@ -538,6 +548,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);
+@@ -1802,8 +1814,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.312/drivers/net/tun.c linux-4.9.312-vs2.3.9.13/drivers/net/tun.c
+--- linux-4.9.312/drivers/net/tun.c 2022-05-07 13:52:16.265864479 +0000
++++ linux-4.9.312-vs2.3.9.13/drivers/net/tun.c 2021-12-20 13:27:50.369880074 +0000
@@ -65,6 +65,7 @@
#include <linux/nsproxy.h>
#include <linux/virtio_net.h>
@@ -1300,7 +1300,7 @@ diff -urNp -x '*.orig' linux-4.9/drivers/net/tun.c linux-4.9/drivers/net/tun.c
#include <net/net_namespace.h>
#include <net/netns/generic.h>
#include <net/rtnetlink.h>
-@@ -194,6 +195,7 @@ struct tun_struct {
+@@ -202,6 +203,7 @@ struct tun_struct {
unsigned int flags;
kuid_t owner;
kgid_t group;
@@ -1308,7 +1308,7 @@ diff -urNp -x '*.orig' linux-4.9/drivers/net/tun.c linux-4.9/drivers/net/tun.c
struct net_device *dev;
netdev_features_t set_features;
-@@ -490,6 +492,7 @@ static inline bool tun_not_capable(struc
+@@ -498,6 +500,7 @@ static inline bool tun_not_capable(struc
return ((uid_valid(tun->owner) && !uid_eq(cred->euid, tun->owner)) ||
(gid_valid(tun->group) && !in_egroup_p(tun->group))) &&
!ns_capable(net->user_ns, CAP_NET_ADMIN);
@@ -1316,7 +1316,7 @@ diff -urNp -x '*.orig' linux-4.9/drivers/net/tun.c linux-4.9/drivers/net/tun.c
}
static void tun_set_real_num_queues(struct tun_struct *tun)
-@@ -1569,6 +1572,7 @@ static void tun_setup(struct net_device
+@@ -1582,6 +1585,7 @@ static void tun_setup(struct net_device
tun->owner = INVALID_UID;
tun->group = INVALID_GID;
@@ -1324,7 +1324,7 @@ diff -urNp -x '*.orig' linux-4.9/drivers/net/tun.c linux-4.9/drivers/net/tun.c
dev->ethtool_ops = &tun_ethtool_ops;
dev->destructor = tun_free_netdev;
-@@ -1782,7 +1786,7 @@ static int tun_set_iff(struct net *net,
+@@ -1795,7 +1799,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 -urNp -x '*.orig' linux-4.9/drivers/net/tun.c linux-4.9/drivers/net/tun.c
return -EPERM;
err = security_tun_dev_create();
if (err < 0)
-@@ -2151,6 +2155,16 @@ static long __tun_chr_ioctl(struct file
+@@ -2203,6 +2207,16 @@ static long __tun_chr_ioctl(struct file
from_kgid(&init_user_ns, tun->group));
break;
@@ -1350,9 +1350,9 @@ diff -urNp -x '*.orig' linux-4.9/drivers/net/tun.c linux-4.9/drivers/net/tun.c
case TUNSETLINK:
/* Only allow setting the type when the interface is down */
if (tun->dev->flags & IFF_UP) {
-diff -urNp -x '*.orig' linux-4.9/drivers/scsi/cxgbi/libcxgbi.c linux-4.9/drivers/scsi/cxgbi/libcxgbi.c
---- linux-4.9/drivers/scsi/cxgbi/libcxgbi.c 2021-02-24 15:47:31.947331702 +0100
-+++ linux-4.9/drivers/scsi/cxgbi/libcxgbi.c 2021-02-24 15:47:45.051074969 +0100
+diff -NurpP --minimal linux-4.9.312/drivers/scsi/cxgbi/libcxgbi.c linux-4.9.312-vs2.3.9.13/drivers/scsi/cxgbi/libcxgbi.c
+--- linux-4.9.312/drivers/scsi/cxgbi/libcxgbi.c 2022-05-07 13:52:21.537782679 +0000
++++ linux-4.9.312-vs2.3.9.13/drivers/scsi/cxgbi/libcxgbi.c 2020-04-01 09:40:26.325503408 +0000
@@ -777,7 +777,8 @@ static struct cxgbi_sock *cxgbi_check_ro
struct inet6_dev *idev = ip6_dst_idev((struct dst_entry *)rt);
@@ -1363,9 +1363,9 @@ diff -urNp -x '*.orig' linux-4.9/drivers/scsi/cxgbi/libcxgbi.c linux-4.9/drivers
if (err) {
pr_info("failed to get source address to reach %pI6\n",
&daddr6->sin6_addr);
-diff -urNp -x '*.orig' linux-4.9/drivers/tty/sysrq.c linux-4.9/drivers/tty/sysrq.c
---- linux-4.9/drivers/tty/sysrq.c 2021-02-24 15:47:32.084002644 +0100
-+++ linux-4.9/drivers/tty/sysrq.c 2021-02-24 15:47:45.051074969 +0100
+diff -NurpP --minimal linux-4.9.312/drivers/tty/sysrq.c linux-4.9.312-vs2.3.9.13/drivers/tty/sysrq.c
+--- linux-4.9.312/drivers/tty/sysrq.c 2022-05-07 13:52:27.449690949 +0000
++++ linux-4.9.312-vs2.3.9.13/drivers/tty/sysrq.c 2020-04-01 09:40:27.395485676 +0000
@@ -47,6 +47,7 @@
#include <linux/syscalls.h>
#include <linux/of.h>
@@ -1417,9 +1417,9 @@ diff -urNp -x '*.orig' linux-4.9/drivers/tty/sysrq.c linux-4.9/drivers/tty/sysrq
else
retval = -1;
return retval;
-diff -urNp -x '*.orig' linux-4.9/drivers/tty/tty_io.c linux-4.9/drivers/tty/tty_io.c
---- linux-4.9/drivers/tty/tty_io.c 2021-02-24 15:47:32.084002644 +0100
-+++ linux-4.9/drivers/tty/tty_io.c 2021-02-24 15:47:45.054408406 +0100
+diff -NurpP --minimal linux-4.9.312/drivers/tty/tty_io.c linux-4.9.312-vs2.3.9.13/drivers/tty/tty_io.c
+--- linux-4.9.312/drivers/tty/tty_io.c 2022-05-07 13:52:27.469690639 +0000
++++ linux-4.9.312-vs2.3.9.13/drivers/tty/tty_io.c 2021-12-20 13:27:53.889824801 +0000
@@ -104,6 +104,7 @@
#include <linux/kmod.h>
@@ -1428,7 +1428,7 @@ diff -urNp -x '*.orig' linux-4.9/drivers/tty/tty_io.c linux-4.9/drivers/tty/tty_
#undef TTY_DEBUG_HANGUP
#ifdef TTY_DEBUG_HANGUP
-@@ -2321,7 +2322,8 @@ static int tiocsti(struct tty_struct *tt
+@@ -2319,7 +2320,8 @@ static int tiocsti(struct tty_struct *tt
char ch, mbz = 0;
struct tty_ldisc *ld;
@@ -1446,9 +1446,9 @@ diff -urNp -x '*.orig' linux-4.9/drivers/tty/tty_io.c linux-4.9/drivers/tty/tty_
if (pgrp_nr < 0)
return -EINVAL;
-diff -urNp -x '*.orig' linux-4.9/fs/attr.c linux-4.9/fs/attr.c
---- linux-4.9/fs/attr.c 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/fs/attr.c 2021-02-24 15:47:45.054408406 +0100
+diff -NurpP --minimal linux-4.9.312/fs/attr.c linux-4.9.312-vs2.3.9.13/fs/attr.c
+--- linux-4.9.312/fs/attr.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/fs/attr.c linux-4.9/fs/attr.c
if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
return -EPERM;
}
-diff -urNp -x '*.orig' linux-4.9/fs/block_dev.c linux-4.9/fs/block_dev.c
---- linux-4.9/fs/block_dev.c 2021-02-24 15:47:32.207339836 +0100
-+++ linux-4.9/fs/block_dev.c 2021-02-24 15:47:45.054408406 +0100
+diff -NurpP --minimal linux-4.9.312/fs/block_dev.c linux-4.9.312-vs2.3.9.13/fs/block_dev.c
+--- linux-4.9.312/fs/block_dev.c 2022-05-07 13:52:29.897652966 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/block_dev.c 2021-07-12 22:41:33.159216156 +0000
@@ -31,6 +31,7 @@
#include <linux/dax.h>
#include <linux/badblocks.h>
@@ -1529,9 +1529,9 @@ diff -urNp -x '*.orig' linux-4.9/fs/block_dev.c linux-4.9/fs/block_dev.c
if (bdev) {
spin_lock(&bdev_lock);
if (!inode->i_bdev) {
-diff -urNp -x '*.orig' linux-4.9/fs/btrfs/ctree.h linux-4.9/fs/btrfs/ctree.h
---- linux-4.9/fs/btrfs/ctree.h 2021-02-24 15:47:32.210673274 +0100
-+++ linux-4.9/fs/btrfs/ctree.h 2021-02-24 15:47:45.054408406 +0100
+diff -NurpP --minimal linux-4.9.312/fs/btrfs/ctree.h linux-4.9.312-vs2.3.9.13/fs/btrfs/ctree.h
+--- linux-4.9.312/fs/btrfs/ctree.h 2022-05-07 13:52:29.945652222 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/btrfs/ctree.h 2021-07-12 22:41:33.179215905 +0000
@@ -1319,6 +1319,8 @@ static inline u32 BTRFS_MAX_XATTR_SIZE(c
#define BTRFS_DEFAULT_COMMIT_INTERVAL (30)
#define BTRFS_DEFAULT_MAX_INLINE (2048)
@@ -1568,9 +1568,9 @@ diff -urNp -x '*.orig' linux-4.9/fs/btrfs/ctree.h linux-4.9/fs/btrfs/ctree.h
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 -urNp -x '*.orig' linux-4.9/fs/btrfs/disk-io.c linux-4.9/fs/btrfs/disk-io.c
---- linux-4.9/fs/btrfs/disk-io.c 2021-02-24 15:47:32.210673274 +0100
-+++ linux-4.9/fs/btrfs/disk-io.c 2021-02-24 15:47:45.054408406 +0100
+diff -NurpP --minimal linux-4.9.312/fs/btrfs/disk-io.c linux-4.9.312-vs2.3.9.13/fs/btrfs/disk-io.c
+--- linux-4.9.312/fs/btrfs/disk-io.c 2022-05-07 13:52:29.969651850 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/btrfs/disk-io.c 2021-07-12 22:41:33.209215532 +0000
@@ -2712,6 +2712,9 @@ int open_ctree(struct super_block *sb,
goto fail_alloc;
}
@@ -1581,9 +1581,9 @@ diff -urNp -x '*.orig' linux-4.9/fs/btrfs/disk-io.c linux-4.9/fs/btrfs/disk-io.c
features = btrfs_super_incompat_flags(disk_super) &
~BTRFS_FEATURE_INCOMPAT_SUPP;
if (features) {
-diff -urNp -x '*.orig' linux-4.9/fs/btrfs/inode.c linux-4.9/fs/btrfs/inode.c
---- linux-4.9/fs/btrfs/inode.c 2021-02-24 15:47:32.217340149 +0100
-+++ linux-4.9/fs/btrfs/inode.c 2021-02-24 15:47:45.057741845 +0100
+diff -NurpP --minimal linux-4.9.312/fs/btrfs/inode.c linux-4.9.312-vs2.3.9.13/fs/btrfs/inode.c
+--- linux-4.9.312/fs/btrfs/inode.c 2022-05-07 13:52:30.025650981 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/btrfs/inode.c 2021-12-20 13:27:55.269803119 +0000
@@ -43,6 +43,7 @@
#include <linux/blkdev.h>
#include <linux/posix_acl_xattr.h>
@@ -1640,7 +1640,7 @@ diff -urNp -x '*.orig' linux-4.9/fs/btrfs/inode.c linux-4.9/fs/btrfs/inode.c
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);
-@@ -10687,6 +10704,7 @@ static const struct inode_operations btr
+@@ -10693,6 +10710,7 @@ static const struct inode_operations btr
.mknod = btrfs_mknod,
.listxattr = btrfs_listxattr,
.permission = btrfs_permission,
@@ -1648,7 +1648,7 @@ diff -urNp -x '*.orig' linux-4.9/fs/btrfs/inode.c linux-4.9/fs/btrfs/inode.c
.get_acl = btrfs_get_acl,
.set_acl = btrfs_set_acl,
.update_time = btrfs_update_time,
-@@ -10695,6 +10713,7 @@ static const struct inode_operations btr
+@@ -10701,6 +10719,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 -urNp -x '*.orig' linux-4.9/fs/btrfs/inode.c linux-4.9/fs/btrfs/inode.c
.update_time = btrfs_update_time,
};
-@@ -10760,6 +10779,7 @@ static const struct inode_operations btr
+@@ -10766,6 +10785,7 @@ static const struct inode_operations btr
.listxattr = btrfs_listxattr,
.permission = btrfs_permission,
.fiemap = btrfs_fiemap,
@@ -1664,9 +1664,9 @@ diff -urNp -x '*.orig' linux-4.9/fs/btrfs/inode.c linux-4.9/fs/btrfs/inode.c
.get_acl = btrfs_get_acl,
.set_acl = btrfs_set_acl,
.update_time = btrfs_update_time,
-diff -urNp -x '*.orig' linux-4.9/fs/btrfs/ioctl.c linux-4.9/fs/btrfs/ioctl.c
---- linux-4.9/fs/btrfs/ioctl.c 2021-02-24 15:47:32.217340149 +0100
-+++ linux-4.9/fs/btrfs/ioctl.c 2021-02-24 15:47:45.057741845 +0100
+diff -NurpP --minimal linux-4.9.312/fs/btrfs/ioctl.c linux-4.9.312-vs2.3.9.13/fs/btrfs/ioctl.c
+--- linux-4.9.312/fs/btrfs/ioctl.c 2022-05-07 13:52:30.029650919 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/btrfs/ioctl.c 2021-07-12 22:41:33.219215409 +0000
@@ -110,10 +110,13 @@ static unsigned int btrfs_flags_to_ioctl
{
unsigned int iflags = 0;
@@ -1845,9 +1845,9 @@ diff -urNp -x '*.orig' linux-4.9/fs/btrfs/ioctl.c linux-4.9/fs/btrfs/ioctl.c
if (flags & FS_APPEND_FL)
ip->flags |= BTRFS_INODE_APPEND;
else
-diff -urNp -x '*.orig' linux-4.9/fs/btrfs/super.c linux-4.9/fs/btrfs/super.c
---- linux-4.9/fs/btrfs/super.c 2021-02-24 15:47:32.224007024 +0100
-+++ linux-4.9/fs/btrfs/super.c 2021-02-24 15:47:45.057741845 +0100
+diff -NurpP --minimal linux-4.9.312/fs/btrfs/super.c linux-4.9.312-vs2.3.9.13/fs/btrfs/super.c
+--- linux-4.9.312/fs/btrfs/super.c 2022-05-07 13:52:30.049650608 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/btrfs/super.c 2021-07-12 22:41:33.219215409 +0000
@@ -327,7 +327,7 @@ enum {
#ifdef CONFIG_BTRFS_DEBUG
Opt_fragment_data, Opt_fragment_metadata, Opt_fragment_all,
@@ -1903,9 +1903,9 @@ diff -urNp -x '*.orig' linux-4.9/fs/btrfs/super.c linux-4.9/fs/btrfs/super.c
if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
goto out;
-diff -urNp -x '*.orig' linux-4.9/fs/char_dev.c linux-4.9/fs/char_dev.c
---- linux-4.9/fs/char_dev.c 2021-02-24 15:47:32.230673899 +0100
-+++ linux-4.9/fs/char_dev.c 2021-02-24 15:47:45.057741845 +0100
+diff -NurpP --minimal linux-4.9.312/fs/char_dev.c linux-4.9.312-vs2.3.9.13/fs/char_dev.c
+--- linux-4.9.312/fs/char_dev.c 2022-05-07 13:52:30.157648932 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/char_dev.c 2021-07-12 22:41:33.329214034 +0000
@@ -21,6 +21,8 @@
#include <linux/mutex.h>
#include <linux/backing-dev.h>
@@ -1938,9 +1938,9 @@ diff -urNp -x '*.orig' linux-4.9/fs/char_dev.c linux-4.9/fs/char_dev.c
if (!kobj)
return -ENXIO;
new = container_of(kobj, struct cdev, kobj);
-diff -urNp -x '*.orig' linux-4.9/fs/dcache.c linux-4.9/fs/dcache.c
---- linux-4.9/fs/dcache.c 2021-02-24 15:47:32.247341088 +0100
-+++ linux-4.9/fs/dcache.c 2021-02-24 15:47:45.061075282 +0100
+diff -NurpP --minimal linux-4.9.312/fs/dcache.c linux-4.9.312-vs2.3.9.13/fs/dcache.c
+--- linux-4.9.312/fs/dcache.c 2022-05-07 13:52:30.281647009 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/dcache.c 2019-10-05 14:58:45.150315864 +0000
@@ -39,6 +39,7 @@
#include <linux/ratelimit.h>
#include <linux/list_lru.h>
@@ -2032,9 +2032,9 @@ diff -urNp -x '*.orig' linux-4.9/fs/dcache.c linux-4.9/fs/dcache.c
}
}
return D_WALK_CONTINUE;
-diff -urNp -x '*.orig' linux-4.9/fs/devpts/inode.c linux-4.9/fs/devpts/inode.c
---- linux-4.9/fs/devpts/inode.c 2021-02-24 15:47:32.247341088 +0100
-+++ linux-4.9/fs/devpts/inode.c 2021-02-24 15:47:45.061075282 +0100
+diff -NurpP --minimal linux-4.9.312/fs/devpts/inode.c linux-4.9.312-vs2.3.9.13/fs/devpts/inode.c
+--- linux-4.9.312/fs/devpts/inode.c 2022-05-07 13:52:30.289646884 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/devpts/inode.c 2019-10-05 14:58:45.150315864 +0000
@@ -27,6 +27,7 @@
#include <linux/parser.h>
#include <linux/fsnotify.h>
@@ -2122,10 +2122,10 @@ diff -urNp -x '*.orig' linux-4.9/fs/devpts/inode.c linux-4.9/fs/devpts/inode.c
sprintf(s, "%d", index);
-diff -urNp -x '*.orig' linux-4.9/fs/ext2/balloc.c linux-4.9/fs/ext2/balloc.c
---- linux-4.9/fs/ext2/balloc.c 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/fs/ext2/balloc.c 2021-02-24 15:47:45.061075282 +0100
-@@ -693,7 +693,6 @@ ext2_try_to_allocate(struct super_block
+diff -NurpP --minimal linux-4.9.312/fs/ext2/balloc.c linux-4.9.312-vs2.3.9.13/fs/ext2/balloc.c
+--- linux-4.9.312/fs/ext2/balloc.c 2022-05-07 13:52:30.569642540 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/ext2/balloc.c 2021-12-20 13:27:55.609797779 +0000
+@@ -691,7 +691,6 @@ ext2_try_to_allocate(struct super_block
start = 0;
end = EXT2_BLOCKS_PER_GROUP(sb);
}
@@ -2133,9 +2133,9 @@ diff -urNp -x '*.orig' linux-4.9/fs/ext2/balloc.c linux-4.9/fs/ext2/balloc.c
BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb));
repeat:
-diff -urNp -x '*.orig' linux-4.9/fs/ext2/ext2.h linux-4.9/fs/ext2/ext2.h
---- linux-4.9/fs/ext2/ext2.h 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/fs/ext2/ext2.h 2021-02-24 15:47:45.061075282 +0100
+diff -NurpP --minimal linux-4.9.312/fs/ext2/ext2.h linux-4.9.312-vs2.3.9.13/fs/ext2/ext2.h
+--- linux-4.9.312/fs/ext2/ext2.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/fs/ext2/ext2.h linux-4.9/fs/ext2/ext2.h
/* ioctl.c */
extern long ext2_ioctl(struct file *, unsigned int, unsigned long);
-diff -urNp -x '*.orig' linux-4.9/fs/ext2/file.c linux-4.9/fs/ext2/file.c
---- linux-4.9/fs/ext2/file.c 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/fs/ext2/file.c 2021-02-24 15:47:45.061075282 +0100
+diff -NurpP --minimal linux-4.9.312/fs/ext2/file.c linux-4.9.312-vs2.3.9.13/fs/ext2/file.c
+--- linux-4.9.312/fs/ext2/file.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/fs/ext2/ialloc.c linux-4.9/fs/ext2/ialloc.c
---- linux-4.9/fs/ext2/ialloc.c 2021-02-24 15:47:32.254007963 +0100
-+++ linux-4.9/fs/ext2/ialloc.c 2021-02-24 15:47:45.061075282 +0100
+diff -NurpP --minimal linux-4.9.312/fs/ext2/ialloc.c linux-4.9.312-vs2.3.9.13/fs/ext2/ialloc.c
+--- linux-4.9.312/fs/ext2/ialloc.c 2022-05-07 13:52:30.569642540 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/ext2/ialloc.c 2021-07-12 22:41:33.639210168 +0000
@@ -17,6 +17,7 @@
#include <linux/backing-dev.h>
#include <linux/buffer_head.h>
@@ -2211,9 +2211,9 @@ diff -urNp -x '*.orig' linux-4.9/fs/ext2/ialloc.c linux-4.9/fs/ext2/ialloc.c
} else
inode_init_owner(inode, dir, mode);
-diff -urNp -x '*.orig' linux-4.9/fs/ext2/inode.c linux-4.9/fs/ext2/inode.c
---- linux-4.9/fs/ext2/inode.c 2021-02-24 15:47:32.254007963 +0100
-+++ linux-4.9/fs/ext2/inode.c 2021-02-24 15:47:45.061075282 +0100
+diff -NurpP --minimal linux-4.9.312/fs/ext2/inode.c linux-4.9.312-vs2.3.9.13/fs/ext2/inode.c
+--- linux-4.9.312/fs/ext2/inode.c 2022-05-07 13:52:30.609641919 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/ext2/inode.c 2019-12-25 15:37:51.438438255 +0000
@@ -35,6 +35,7 @@
#include <linux/iomap.h>
#include <linux/namei.h>
@@ -2338,9 +2338,9 @@ diff -urNp -x '*.orig' linux-4.9/fs/ext2/inode.c linux-4.9/fs/ext2/inode.c
error = dquot_transfer(inode, iattr);
if (error)
return error;
-diff -urNp -x '*.orig' linux-4.9/fs/ext2/ioctl.c linux-4.9/fs/ext2/ioctl.c
---- linux-4.9/fs/ext2/ioctl.c 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/fs/ext2/ioctl.c 2021-02-24 15:47:45.061075282 +0100
+diff -NurpP --minimal linux-4.9.312/fs/ext2/ioctl.c linux-4.9.312-vs2.3.9.13/fs/ext2/ioctl.c
+--- linux-4.9.312/fs/ext2/ioctl.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/fs/ext2/ioctl.c linux-4.9/fs/ext2/ioctl.c
flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE;
ei->i_flags = flags;
-diff -urNp -x '*.orig' linux-4.9/fs/ext2/namei.c linux-4.9/fs/ext2/namei.c
---- linux-4.9/fs/ext2/namei.c 2021-02-24 15:47:32.254007963 +0100
-+++ linux-4.9/fs/ext2/namei.c 2021-02-24 15:47:45.061075282 +0100
+diff -NurpP --minimal linux-4.9.312/fs/ext2/namei.c linux-4.9.312-vs2.3.9.13/fs/ext2/namei.c
+--- linux-4.9.312/fs/ext2/namei.c 2022-05-07 13:52:30.629641609 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/fs/ext2/namei.c linux-4.9/fs/ext2/namei.c
.get_acl = ext2_get_acl,
.set_acl = ext2_set_acl,
};
-diff -urNp -x '*.orig' linux-4.9/fs/ext2/super.c linux-4.9/fs/ext2/super.c
---- linux-4.9/fs/ext2/super.c 2021-02-24 15:47:32.254007963 +0100
-+++ linux-4.9/fs/ext2/super.c 2021-02-24 15:47:45.061075282 +0100
+diff -NurpP --minimal linux-4.9.312/fs/ext2/super.c linux-4.9.312-vs2.3.9.13/fs/ext2/super.c
+--- linux-4.9.312/fs/ext2/super.c 2022-05-07 13:52:30.645641361 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/ext2/super.c 2022-05-07 14:02:11.748592682 +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 -urNp -x '*.orig' linux-4.9/fs/ext2/super.c linux-4.9/fs/ext2/super.c
case Opt_nocheck:
clear_opt (sbi->s_mount_opt, CHECK);
break;
-@@ -898,6 +916,8 @@ static int ext2_fill_super(struct super_
+@@ -902,6 +920,8 @@ static int ext2_fill_super(struct super_
if (!parse_options((char *) data, sb))
goto failed_mount;
@@ -2470,7 +2470,7 @@ diff -urNp -x '*.orig' linux-4.9/fs/ext2/super.c linux-4.9/fs/ext2/super.c
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
((EXT2_SB(sb)->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ?
MS_POSIXACL : 0);
-@@ -1311,6 +1331,14 @@ static int ext2_remount (struct super_bl
+@@ -1315,6 +1335,14 @@ static int ext2_remount (struct super_bl
err = -EINVAL;
goto restore_opts;
}
@@ -2485,9 +2485,9 @@ diff -urNp -x '*.orig' linux-4.9/fs/ext2/super.c linux-4.9/fs/ext2/super.c
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
-diff -urNp -x '*.orig' linux-4.9/fs/ext4/ext4.h linux-4.9/fs/ext4/ext4.h
---- linux-4.9/fs/ext4/ext4.h 2021-02-24 15:47:32.254007963 +0100
-+++ linux-4.9/fs/ext4/ext4.h 2021-02-24 15:47:45.064408719 +0100
+diff -NurpP --minimal linux-4.9.312/fs/ext4/ext4.h linux-4.9.312-vs2.3.9.13/fs/ext4/ext4.h
+--- linux-4.9.312/fs/ext4/ext4.h 2022-05-07 13:52:30.757639623 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/ext4/ext4.h 2021-07-12 22:41:33.639210168 +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,9 +2533,9 @@ diff -urNp -x '*.orig' linux-4.9/fs/ext4/ext4.h linux-4.9/fs/ext4/ext4.h
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 -urNp -x '*.orig' linux-4.9/fs/ext4/file.c linux-4.9/fs/ext4/file.c
---- linux-4.9/fs/ext4/file.c 2021-02-24 15:47:32.257341400 +0100
-+++ linux-4.9/fs/ext4/file.c 2021-02-24 15:47:45.064408719 +0100
+diff -NurpP --minimal linux-4.9.312/fs/ext4/file.c linux-4.9.312-vs2.3.9.13/fs/ext4/file.c
+--- linux-4.9.312/fs/ext4/file.c 2022-05-07 13:52:30.861638009 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/ext4/file.c 2019-10-05 14:58:45.150315864 +0000
@@ -698,5 +698,6 @@ const struct inode_operations ext4_file_
.get_acl = ext4_get_acl,
.set_acl = ext4_set_acl,
@@ -2543,9 +2543,9 @@ diff -urNp -x '*.orig' linux-4.9/fs/ext4/file.c linux-4.9/fs/ext4/file.c
+ .sync_flags = ext4_sync_flags,
};
-diff -urNp -x '*.orig' linux-4.9/fs/ext4/ialloc.c linux-4.9/fs/ext4/ialloc.c
---- linux-4.9/fs/ext4/ialloc.c 2021-02-24 15:47:32.257341400 +0100
-+++ linux-4.9/fs/ext4/ialloc.c 2021-02-24 15:47:45.064408719 +0100
+diff -NurpP --minimal linux-4.9.312/fs/ext4/ialloc.c linux-4.9.312-vs2.3.9.13/fs/ext4/ialloc.c
+--- linux-4.9.312/fs/ext4/ialloc.c 2022-05-07 13:52:30.901637389 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/ext4/ialloc.c 2021-12-20 13:27:55.699796363 +0000
@@ -21,6 +21,7 @@
#include <linux/random.h>
#include <linux/bitops.h>
@@ -2554,7 +2554,7 @@ diff -urNp -x '*.orig' linux-4.9/fs/ext4/ialloc.c linux-4.9/fs/ext4/ialloc.c
#include <asm/byteorder.h>
#include "ext4.h"
-@@ -780,6 +781,7 @@ struct inode *__ext4_new_inode(handle_t
+@@ -779,6 +780,7 @@ struct inode *__ext4_new_inode(handle_t
inode->i_mode = mode;
inode->i_uid = current_fsuid();
inode->i_gid = dir->i_gid;
@@ -2562,9 +2562,9 @@ diff -urNp -x '*.orig' linux-4.9/fs/ext4/ialloc.c linux-4.9/fs/ext4/ialloc.c
} else
inode_init_owner(inode, dir, mode);
-diff -urNp -x '*.orig' linux-4.9/fs/ext4/inode.c linux-4.9/fs/ext4/inode.c
---- linux-4.9/fs/ext4/inode.c 2021-02-24 15:47:32.260674838 +0100
-+++ linux-4.9/fs/ext4/inode.c 2021-02-24 15:47:45.064408719 +0100
+diff -NurpP --minimal linux-4.9.312/fs/ext4/inode.c linux-4.9.312-vs2.3.9.13/fs/ext4/inode.c
+--- linux-4.9.312/fs/ext4/inode.c 2022-05-07 13:52:30.961636458 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/ext4/inode.c 2022-05-07 14:02:11.752592620 +0000
@@ -37,6 +37,7 @@
#include <linux/printk.h>
#include <linux/slab.h>
@@ -2573,7 +2573,7 @@ diff -urNp -x '*.orig' linux-4.9/fs/ext4/inode.c linux-4.9/fs/ext4/inode.c
#include "ext4_jbd2.h"
#include "xattr.h"
-@@ -4399,12 +4400,15 @@ void ext4_set_inode_flags(struct inode *
+@@ -4432,12 +4433,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 -urNp -x '*.orig' linux-4.9/fs/ext4/inode.c linux-4.9/fs/ext4/inode.c
if (flags & EXT4_NOATIME_FL)
new_fl |= S_NOATIME;
if (flags & EXT4_DIRSYNC_FL)
-@@ -4412,31 +4416,52 @@ void ext4_set_inode_flags(struct inode *
+@@ -4445,31 +4449,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 -urNp -x '*.orig' linux-4.9/fs/ext4/inode.c linux-4.9/fs/ext4/inode.c
} while (cmpxchg(&ei->i_flags, old_fl, new_fl) != old_fl);
}
-@@ -4584,8 +4609,10 @@ struct inode *__ext4_iget(struct super_b
+@@ -4617,8 +4642,10 @@ struct inode *__ext4_iget(struct super_b
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 -urNp -x '*.orig' linux-4.9/fs/ext4/inode.c linux-4.9/fs/ext4/inode.c
ei->i_projid = make_kprojid(&init_user_ns, i_projid);
set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
-@@ -4909,8 +4936,10 @@ static int ext4_do_update_inode(handle_t
+@@ -4942,8 +4969,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 -urNp -x '*.orig' linux-4.9/fs/ext4/inode.c linux-4.9/fs/ext4/inode.c
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));
-@@ -4934,6 +4963,9 @@ static int ext4_do_update_inode(handle_t
+@@ -4967,6 +4996,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 -urNp -x '*.orig' linux-4.9/fs/ext4/inode.c linux-4.9/fs/ext4/inode.c
raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
EXT4_INODE_SET_XTIME(i_ctime, inode, raw_inode);
-@@ -5191,7 +5223,8 @@ int ext4_setattr(struct dentry *dentry,
+@@ -5224,7 +5256,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 -urNp -x '*.orig' linux-4.9/fs/ext4/inode.c linux-4.9/fs/ext4/inode.c
handle_t *handle;
/* (user+group)*(old+new) structure, inode write (sb,
-@@ -5214,6 +5247,8 @@ int ext4_setattr(struct dentry *dentry,
+@@ -5247,6 +5280,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 -urNp -x '*.orig' linux-4.9/fs/ext4/inode.c linux-4.9/fs/ext4/inode.c
error = ext4_mark_inode_dirty(handle, inode);
ext4_journal_stop(handle);
}
-diff -urNp -x '*.orig' linux-4.9/fs/ext4/ioctl.c linux-4.9/fs/ext4/ioctl.c
---- linux-4.9/fs/ext4/ioctl.c 2021-02-24 15:47:32.260674838 +0100
-+++ linux-4.9/fs/ext4/ioctl.c 2021-02-24 15:47:45.064408719 +0100
+diff -NurpP --minimal linux-4.9.312/fs/ext4/ioctl.c linux-4.9.312-vs2.3.9.13/fs/ext4/ioctl.c
+--- linux-4.9.312/fs/ext4/ioctl.c 2022-05-07 13:52:30.981636147 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/ext4/ioctl.c 2022-05-07 14:02:11.752592620 +0000
@@ -15,6 +15,7 @@
#include <linux/file.h>
#include <linux/quotaops.h>
@@ -2772,9 +2772,9 @@ diff -urNp -x '*.orig' linux-4.9/fs/ext4/ioctl.c linux-4.9/fs/ext4/ioctl.c
inode_lock(inode);
err = ext4_ioctl_setflags(inode, flags);
inode_unlock(inode);
-diff -urNp -x '*.orig' linux-4.9/fs/ext4/namei.c linux-4.9/fs/ext4/namei.c
---- linux-4.9/fs/ext4/namei.c 2021-02-24 15:47:32.260674838 +0100
-+++ linux-4.9/fs/ext4/namei.c 2021-02-24 15:47:45.064408719 +0100
+diff -NurpP --minimal linux-4.9.312/fs/ext4/namei.c linux-4.9.312-vs2.3.9.13/fs/ext4/namei.c
+--- linux-4.9.312/fs/ext4/namei.c 2022-05-07 13:52:31.097634348 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/ext4/namei.c 2021-07-12 22:41:33.689209544 +0000
@@ -33,6 +33,7 @@
#include <linux/quotaops.h>
#include <linux/buffer_head.h>
@@ -2791,7 +2791,7 @@ diff -urNp -x '*.orig' linux-4.9/fs/ext4/namei.c linux-4.9/fs/ext4/namei.c
}
if ((bh = bh_use[ra_ptr++]) == NULL)
goto next;
-@@ -3935,6 +3937,7 @@ const struct inode_operations ext4_dir_i
+@@ -3960,6 +3962,7 @@ const struct inode_operations ext4_dir_i
.get_acl = ext4_get_acl,
.set_acl = ext4_set_acl,
.fiemap = ext4_fiemap,
@@ -2799,9 +2799,9 @@ diff -urNp -x '*.orig' linux-4.9/fs/ext4/namei.c linux-4.9/fs/ext4/namei.c
};
const struct inode_operations ext4_special_inode_operations = {
-diff -urNp -x '*.orig' linux-4.9/fs/ext4/super.c linux-4.9/fs/ext4/super.c
---- linux-4.9/fs/ext4/super.c 2021-02-24 15:47:32.264008276 +0100
-+++ linux-4.9/fs/ext4/super.c 2021-02-24 15:47:45.067742158 +0100
+diff -NurpP --minimal linux-4.9.312/fs/ext4/super.c linux-4.9.312-vs2.3.9.13/fs/ext4/super.c
+--- linux-4.9.312/fs/ext4/super.c 2022-05-07 13:52:31.181633044 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/ext4/super.c 2022-05-07 14:02:11.756592557 +0000
@@ -1294,6 +1294,7 @@ enum {
Opt_dioread_nolock, Opt_dioread_lock,
Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable,
@@ -2841,7 +2841,7 @@ diff -urNp -x '*.orig' linux-4.9/fs/ext4/super.c linux-4.9/fs/ext4/super.c
}
for (m = ext4_mount_opts; m->token != Opt_err; m++)
-@@ -3645,6 +3663,9 @@ static int ext4_fill_super(struct super_
+@@ -3647,6 +3665,9 @@ static int ext4_fill_super(struct super_
sb->s_iflags |= SB_I_CGROUPWB;
}
@@ -2851,7 +2851,7 @@ diff -urNp -x '*.orig' linux-4.9/fs/ext4/super.c linux-4.9/fs/ext4/super.c
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-@@ -5032,6 +5053,14 @@ static int ext4_remount(struct super_blo
+@@ -5045,6 +5066,14 @@ static int ext4_remount(struct super_blo
if (sbi->s_mount_flags & EXT4_MF_FS_ABORTED)
ext4_abort(sb, "Abort forced by user");
@@ -2866,9 +2866,9 @@ diff -urNp -x '*.orig' linux-4.9/fs/ext4/super.c linux-4.9/fs/ext4/super.c
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-diff -urNp -x '*.orig' linux-4.9/fs/fcntl.c linux-4.9/fs/fcntl.c
---- linux-4.9/fs/fcntl.c 2021-02-24 15:47:32.270675151 +0100
-+++ linux-4.9/fs/fcntl.c 2021-02-24 15:47:45.067742158 +0100
+diff -NurpP --minimal linux-4.9.312/fs/fcntl.c linux-4.9.312-vs2.3.9.13/fs/fcntl.c
+--- linux-4.9.312/fs/fcntl.c 2022-05-07 13:52:31.441629010 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/fs/fcntl.c linux-4.9/fs/fcntl.c
if (unlikely(f.file->f_mode & FMODE_PATH)) {
if (!check_fcntl_cmd(cmd))
-diff -urNp -x '*.orig' linux-4.9/fs/file.c linux-4.9/fs/file.c
---- linux-4.9/fs/file.c 2021-02-24 15:47:32.270675151 +0100
-+++ linux-4.9/fs/file.c 2021-02-24 15:47:45.067742158 +0100
+diff -NurpP --minimal linux-4.9.312/fs/file.c linux-4.9.312-vs2.3.9.13/fs/file.c
+--- linux-4.9.312/fs/file.c 2022-05-07 13:52:31.473628514 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/file.c 2022-05-07 14:02:11.756592557 +0000
@@ -22,6 +22,7 @@
#include <linux/spinlock.h>
#include <linux/rcupdate.h>
@@ -2934,7 +2934,7 @@ diff -urNp -x '*.orig' linux-4.9/fs/file.c linux-4.9/fs/file.c
}
void put_unused_fd(unsigned int fd)
-@@ -857,6 +864,8 @@ __releases(&files->file_lock)
+@@ -907,6 +914,8 @@ __releases(&files->file_lock)
if (tofree)
filp_close(tofree, files);
@@ -2943,9 +2943,9 @@ diff -urNp -x '*.orig' linux-4.9/fs/file.c linux-4.9/fs/file.c
return fd;
-diff -urNp -x '*.orig' linux-4.9/fs/file_table.c linux-4.9/fs/file_table.c
---- linux-4.9/fs/file_table.c 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/fs/file_table.c 2021-02-24 15:47:45.067742158 +0100
+diff -NurpP --minimal linux-4.9.312/fs/file_table.c linux-4.9.312-vs2.3.9.13/fs/file_table.c
+--- linux-4.9.312/fs/file_table.c 2022-05-07 13:52:31.553627272 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/file_table.c 2021-12-20 13:27:55.729795891 +0000
@@ -26,6 +26,8 @@
#include <linux/task_work.h>
#include <linux/ima.h>
@@ -2973,7 +2973,7 @@ diff -urNp -x '*.orig' linux-4.9/fs/file_table.c linux-4.9/fs/file_table.c
file->f_path.dentry = NULL;
file->f_path.mnt = NULL;
file->f_inode = NULL;
-@@ -305,6 +311,8 @@ void put_filp(struct file *file)
+@@ -310,6 +316,8 @@ void put_filp(struct file *file)
{
if (atomic_long_dec_and_test(&file->f_count)) {
security_file_free(file);
@@ -2982,9 +2982,9 @@ diff -urNp -x '*.orig' linux-4.9/fs/file_table.c linux-4.9/fs/file_table.c
file_free(file);
}
}
-diff -urNp -x '*.orig' linux-4.9/fs/fs_struct.c linux-4.9/fs/fs_struct.c
---- linux-4.9/fs/fs_struct.c 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/fs/fs_struct.c 2021-02-24 15:47:45.067742158 +0100
+diff -NurpP --minimal linux-4.9.312/fs/fs_struct.c linux-4.9.312-vs2.3.9.13/fs/fs_struct.c
+--- linux-4.9.312/fs/fs_struct.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/fs/fs_struct.c linux-4.9/fs/fs_struct.c
}
return fs;
}
-diff -urNp -x '*.orig' linux-4.9/fs/gfs2/file.c linux-4.9/fs/gfs2/file.c
---- linux-4.9/fs/gfs2/file.c 2021-02-24 15:47:32.277342026 +0100
-+++ linux-4.9/fs/gfs2/file.c 2021-02-24 15:47:45.067742158 +0100
+diff -NurpP --minimal linux-4.9.312/fs/gfs2/file.c linux-4.9.312-vs2.3.9.13/fs/gfs2/file.c
+--- linux-4.9.312/fs/gfs2/file.c 2022-05-07 13:52:32.005620259 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/fs/gfs2/file.c linux-4.9/fs/gfs2/file.c
static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
switch(cmd) {
-diff -urNp -x '*.orig' linux-4.9/fs/gfs2/inode.h linux-4.9/fs/gfs2/inode.h
---- linux-4.9/fs/gfs2/inode.h 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/fs/gfs2/inode.h 2021-02-24 15:47:45.067742158 +0100
+diff -NurpP --minimal linux-4.9.312/fs/gfs2/inode.h linux-4.9.312-vs2.3.9.13/fs/gfs2/inode.h
+--- linux-4.9.312/fs/gfs2/inode.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/fs/gfs2/inode.h linux-4.9/fs/gfs2/inode.h
#ifdef CONFIG_GFS2_FS_LOCKING_DLM
extern const struct file_operations gfs2_file_fops;
-diff -urNp -x '*.orig' linux-4.9/fs/hostfs/hostfs.h linux-4.9/fs/hostfs/hostfs.h
---- linux-4.9/fs/hostfs/hostfs.h 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/fs/hostfs/hostfs.h 2021-02-24 15:47:45.067742158 +0100
+diff -NurpP --minimal linux-4.9.312/fs/hostfs/hostfs.h linux-4.9.312-vs2.3.9.13/fs/hostfs/hostfs.h
+--- linux-4.9.312/fs/hostfs/hostfs.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/fs/hostfs/hostfs.h linux-4.9/fs/hostfs/hostfs.h
loff_t ia_size;
struct timespec ia_atime;
struct timespec ia_mtime;
-diff -urNp -x '*.orig' linux-4.9/fs/inode.c linux-4.9/fs/inode.c
---- linux-4.9/fs/inode.c 2021-02-24 15:47:32.280675463 +0100
-+++ linux-4.9/fs/inode.c 2021-02-24 15:47:45.067742158 +0100
+diff -NurpP --minimal linux-4.9.312/fs/inode.c linux-4.9.312-vs2.3.9.13/fs/inode.c
+--- linux-4.9.312/fs/inode.c 2022-05-07 13:52:38.793514938 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/inode.c 2021-07-12 22:41:33.819207920 +0000
@@ -18,6 +18,7 @@
#include <linux/buffer_head.h> /* for inode_has_buffers */
#include <linux/ratelimit.h>
@@ -3220,9 +3220,9 @@ diff -urNp -x '*.orig' linux-4.9/fs/inode.c linux-4.9/fs/inode.c
}
EXPORT_SYMBOL(inode_init_owner);
-diff -urNp -x '*.orig' linux-4.9/fs/ioctl.c linux-4.9/fs/ioctl.c
---- linux-4.9/fs/ioctl.c 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/fs/ioctl.c 2021-02-24 15:47:45.067742158 +0100
+diff -NurpP --minimal linux-4.9.312/fs/ioctl.c linux-4.9.312-vs2.3.9.13/fs/ioctl.c
+--- linux-4.9.312/fs/ioctl.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/fs/ioctl.c linux-4.9/fs/ioctl.c
#include "internal.h"
#include <asm/ioctls.h>
-diff -urNp -x '*.orig' linux-4.9/fs/jfs/file.c linux-4.9/fs/jfs/file.c
---- linux-4.9/fs/jfs/file.c 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/fs/jfs/file.c 2021-02-24 15:47:45.067742158 +0100
+diff -NurpP --minimal linux-4.9.312/fs/jfs/file.c linux-4.9.312-vs2.3.9.13/fs/jfs/file.c
+--- linux-4.9.312/fs/jfs/file.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/fs/jfs/file.c linux-4.9/fs/jfs/file.c
};
const struct file_operations jfs_file_operations = {
-diff -urNp -x '*.orig' linux-4.9/fs/jfs/ioctl.c linux-4.9/fs/jfs/ioctl.c
---- linux-4.9/fs/jfs/ioctl.c 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/fs/jfs/ioctl.c 2021-02-24 15:47:45.067742158 +0100
+diff -NurpP --minimal linux-4.9.312/fs/jfs/ioctl.c linux-4.9.312-vs2.3.9.13/fs/jfs/ioctl.c
+--- linux-4.9.312/fs/jfs/ioctl.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/fs/jfs/ioctl.c linux-4.9/fs/jfs/ioctl.c
flags |= oldflags & ~JFS_FL_USER_MODIFIABLE;
jfs_inode->mode2 = flags;
-diff -urNp -x '*.orig' linux-4.9/fs/jfs/jfs_dinode.h linux-4.9/fs/jfs/jfs_dinode.h
---- linux-4.9/fs/jfs/jfs_dinode.h 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/fs/jfs/jfs_dinode.h 2021-02-24 15:47:45.067742158 +0100
+diff -NurpP --minimal linux-4.9.312/fs/jfs/jfs_dinode.h linux-4.9.312-vs2.3.9.13/fs/jfs/jfs_dinode.h
+--- linux-4.9.312/fs/jfs/jfs_dinode.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/fs/jfs/jfs_dinode.h linux-4.9/fs/jfs/jfs_dinode
#define JFS_FL_INHERIT 0x03C80000
/* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */
-diff -urNp -x '*.orig' linux-4.9/fs/jfs/jfs_filsys.h linux-4.9/fs/jfs/jfs_filsys.h
---- linux-4.9/fs/jfs/jfs_filsys.h 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/fs/jfs/jfs_filsys.h 2021-02-24 15:47:45.067742158 +0100
+diff -NurpP --minimal linux-4.9.312/fs/jfs/jfs_filsys.h linux-4.9.312-vs2.3.9.13/fs/jfs/jfs_filsys.h
+--- linux-4.9.312/fs/jfs/jfs_filsys.h 2022-05-07 13:52:38.937512703 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/jfs/jfs_filsys.h 2021-07-12 22:41:33.929206546 +0000
@@ -266,6 +266,7 @@
#define JFS_NAME_MAX 255
#define JFS_PATH_MAX BPSIZE
@@ -3344,9 +3344,9 @@ diff -urNp -x '*.orig' linux-4.9/fs/jfs/jfs_filsys.h linux-4.9/fs/jfs/jfs_filsys
/*
* file system state (superblock state)
-diff -urNp -x '*.orig' linux-4.9/fs/jfs/jfs_imap.c linux-4.9/fs/jfs/jfs_imap.c
---- linux-4.9/fs/jfs/jfs_imap.c 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/fs/jfs/jfs_imap.c 2021-02-24 15:47:45.071075595 +0100
+diff -NurpP --minimal linux-4.9.312/fs/jfs/jfs_imap.c linux-4.9.312-vs2.3.9.13/fs/jfs/jfs_imap.c
+--- linux-4.9.312/fs/jfs/jfs_imap.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/fs/jfs/jfs_imap.c linux-4.9/fs/jfs/jfs_imap.c
jfs_get_inode_flags(jfs_ip);
/*
* mode2 is only needed for storing the higher order bits.
-diff -urNp -x '*.orig' linux-4.9/fs/jfs/jfs_inode.c linux-4.9/fs/jfs/jfs_inode.c
---- linux-4.9/fs/jfs/jfs_inode.c 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/fs/jfs/jfs_inode.c 2021-02-24 15:47:45.071075595 +0100
+diff -NurpP --minimal linux-4.9.312/fs/jfs/jfs_inode.c linux-4.9.312-vs2.3.9.13/fs/jfs/jfs_inode.c
+--- linux-4.9.312/fs/jfs/jfs_inode.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/fs/jfs/jfs_inode.c linux-4.9/fs/jfs/jfs_inode.c
}
/*
-diff -urNp -x '*.orig' linux-4.9/fs/jfs/jfs_inode.h linux-4.9/fs/jfs/jfs_inode.h
---- linux-4.9/fs/jfs/jfs_inode.h 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/fs/jfs/jfs_inode.h 2021-02-24 15:47:45.071075595 +0100
+diff -NurpP --minimal linux-4.9.312/fs/jfs/jfs_inode.h linux-4.9.312-vs2.3.9.13/fs/jfs/jfs_inode.h
+--- linux-4.9.312/fs/jfs/jfs_inode.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/fs/jfs/jfs_inode.h linux-4.9/fs/jfs/jfs_inode.h
extern int jfs_get_block(struct inode *, sector_t, struct buffer_head *, int);
extern int jfs_setattr(struct dentry *, struct iattr *);
-diff -urNp -x '*.orig' linux-4.9/fs/jfs/namei.c linux-4.9/fs/jfs/namei.c
---- linux-4.9/fs/jfs/namei.c 2021-02-24 15:47:32.287342339 +0100
-+++ linux-4.9/fs/jfs/namei.c 2021-02-24 15:47:45.071075595 +0100
+diff -NurpP --minimal linux-4.9.312/fs/jfs/namei.c linux-4.9.312-vs2.3.9.13/fs/jfs/namei.c
+--- linux-4.9.312/fs/jfs/namei.c 2022-05-07 13:52:38.969512207 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/fs/jfs/namei.c linux-4.9/fs/jfs/namei.c
};
const struct file_operations jfs_dir_operations = {
-diff -urNp -x '*.orig' linux-4.9/fs/jfs/super.c linux-4.9/fs/jfs/super.c
---- linux-4.9/fs/jfs/super.c 2021-02-24 15:47:32.287342339 +0100
-+++ linux-4.9/fs/jfs/super.c 2021-02-24 15:47:45.071075595 +0100
+diff -NurpP --minimal linux-4.9.312/fs/jfs/super.c linux-4.9.312-vs2.3.9.13/fs/jfs/super.c
+--- linux-4.9.312/fs/jfs/super.c 2022-05-07 13:52:38.969512207 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/fs/jfs/super.c linux-4.9/fs/jfs/super.c
if (newLVSize) {
pr_err("resize option for remount only\n");
-diff -urNp -x '*.orig' linux-4.9/fs/libfs.c linux-4.9/fs/libfs.c
---- linux-4.9/fs/libfs.c 2021-02-24 15:47:32.287342339 +0100
-+++ linux-4.9/fs/libfs.c 2021-02-24 15:47:45.071075595 +0100
+diff -NurpP --minimal linux-4.9.312/fs/libfs.c linux-4.9.312-vs2.3.9.13/fs/libfs.c
+--- linux-4.9.312/fs/libfs.c 2022-05-07 13:52:38.981512021 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/libfs.c 2021-07-12 22:41:33.929206546 +0000
@@ -180,7 +180,8 @@ static inline unsigned char dt_type(stru
* both impossible due to the lock on directory.
*/
@@ -3639,9 +3639,9 @@ diff -urNp -x '*.orig' linux-4.9/fs/libfs.c linux-4.9/fs/libfs.c
ssize_t generic_read_dir(struct file *filp, char __user *buf, size_t siz, loff_t *ppos)
{
return -EISDIR;
-diff -urNp -x '*.orig' linux-4.9/fs/locks.c linux-4.9/fs/locks.c
---- linux-4.9/fs/locks.c 2021-02-24 15:47:32.287342339 +0100
-+++ linux-4.9/fs/locks.c 2021-02-24 15:47:45.071075595 +0100
+diff -NurpP --minimal linux-4.9.312/fs/locks.c linux-4.9.312-vs2.3.9.13/fs/locks.c
+--- linux-4.9.312/fs/locks.c 2022-05-07 13:52:39.017511462 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/locks.c 2020-04-01 09:40:28.545466623 +0000
@@ -127,6 +127,8 @@
#include <linux/pid_namespace.h>
#include <linux/hashtable.h>
@@ -3828,9 +3828,9 @@ diff -urNp -x '*.orig' linux-4.9/fs/locks.c linux-4.9/fs/locks.c
return 0;
}
-diff -urNp -x '*.orig' linux-4.9/fs/mount.h linux-4.9/fs/mount.h
---- linux-4.9/fs/mount.h 2021-02-24 15:47:32.287342339 +0100
-+++ linux-4.9/fs/mount.h 2021-02-24 15:47:45.071075595 +0100
+diff -NurpP --minimal linux-4.9.312/fs/mount.h linux-4.9.312-vs2.3.9.13/fs/mount.h
+--- linux-4.9.312/fs/mount.h 2022-05-07 13:52:39.081510469 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/fs/mount.h linux-4.9/fs/mount.h
};
#define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */
-diff -urNp -x '*.orig' linux-4.9/fs/namei.c linux-4.9/fs/namei.c
---- linux-4.9/fs/namei.c 2021-02-24 15:47:32.290675776 +0100
-+++ linux-4.9/fs/namei.c 2021-02-24 15:47:45.071075595 +0100
+diff -NurpP --minimal linux-4.9.312/fs/namei.c linux-4.9.312-vs2.3.9.13/fs/namei.c
+--- linux-4.9.312/fs/namei.c 2022-05-07 13:52:39.137509600 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/namei.c 2020-04-01 09:40:28.545466623 +0000
@@ -37,9 +37,19 @@
#include <linux/hash.h>
#include <linux/bitops.h>
@@ -4425,9 +4425,9 @@ diff -urNp -x '*.orig' linux-4.9/fs/namei.c linux-4.9/fs/namei.c
/* get the link contents into pagecache */
const char *page_get_link(struct dentry *dentry, struct inode *inode,
struct delayed_call *callback)
-diff -urNp -x '*.orig' linux-4.9/fs/namespace.c linux-4.9/fs/namespace.c
---- linux-4.9/fs/namespace.c 2021-02-24 15:47:32.290675776 +0100
-+++ linux-4.9/fs/namespace.c 2021-02-24 15:47:45.074409033 +0100
+diff -NurpP --minimal linux-4.9.312/fs/namespace.c linux-4.9.312-vs2.3.9.13/fs/namespace.c
+--- linux-4.9.312/fs/namespace.c 2022-05-07 13:52:39.157509290 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/namespace.c 2021-12-20 13:27:55.999791650 +0000
@@ -24,6 +24,11 @@
#include <linux/magic.h>
#include <linux/bootmem.h>
@@ -4469,7 +4469,7 @@ diff -urNp -x '*.orig' linux-4.9/fs/namespace.c linux-4.9/fs/namespace.c
}
#ifdef CONFIG_MANDATORY_FILE_LOCKING
-@@ -2181,6 +2192,7 @@ static int do_change_type(struct path *p
+@@ -2215,6 +2226,7 @@ static int do_change_type(struct path *p
if (err)
goto out_unlock;
}
@@ -4477,7 +4477,7 @@ diff -urNp -x '*.orig' linux-4.9/fs/namespace.c linux-4.9/fs/namespace.c
lock_mount_hash();
for (m = mnt; m; m = (recurse ? next_mnt(m, mnt) : NULL))
-@@ -2209,12 +2221,14 @@ static bool has_locked_children(struct m
+@@ -2230,12 +2242,14 @@ static int do_change_type(struct path *p
* do loopback mount.
*/
static int do_loopback(struct path *path, const char *old_name,
@@ -4493,7 +4493,7 @@ diff -urNp -x '*.orig' linux-4.9/fs/namespace.c linux-4.9/fs/namespace.c
if (!old_name || !*old_name)
return -EINVAL;
err = kern_path(old_name, LOOKUP_FOLLOW|LOOKUP_AUTOMOUNT, &old_path);
-@@ -2294,7 +2308,7 @@ static int change_mount_flags(struct vfs
+@@ -2315,7 +2329,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 -urNp -x '*.orig' linux-4.9/fs/namespace.c linux-4.9/fs/namespace.c
{
int err;
struct super_block *sb = path->mnt->mnt_sb;
-@@ -2779,6 +2793,7 @@ long do_mount(const char *dev_name, cons
+@@ -2800,6 +2814,7 @@ long do_mount(const char *dev_name, cons
struct path path;
int retval = 0;
int mnt_flags = 0;
@@ -4510,7 +4510,7 @@ diff -urNp -x '*.orig' linux-4.9/fs/namespace.c linux-4.9/fs/namespace.c
/* Discard magic */
if ((flags & MS_MGC_MSK) == MS_MGC_VAL)
-@@ -2806,6 +2821,12 @@ long do_mount(const char *dev_name, cons
+@@ -2827,6 +2842,12 @@ long do_mount(const char *dev_name, cons
if (!(flags & MS_NOATIME))
mnt_flags |= MNT_RELATIME;
@@ -4523,7 +4523,7 @@ diff -urNp -x '*.orig' linux-4.9/fs/namespace.c linux-4.9/fs/namespace.c
/* Separate the per-mountpoint flags */
if (flags & MS_NOSUID)
mnt_flags |= MNT_NOSUID;
-@@ -2830,15 +2851,18 @@ long do_mount(const char *dev_name, cons
+@@ -2851,15 +2872,18 @@ long do_mount(const char *dev_name, cons
mnt_flags |= path.mnt->mnt_flags & MNT_ATIME_MASK;
}
@@ -4544,7 +4544,7 @@ diff -urNp -x '*.orig' linux-4.9/fs/namespace.c linux-4.9/fs/namespace.c
else if (flags & (MS_SHARED | MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE))
retval = do_change_type(&path, flags);
else if (flags & MS_MOVE)
-@@ -2979,6 +3003,7 @@ struct mnt_namespace *copy_mnt_ns(unsign
+@@ -3000,6 +3024,7 @@ struct mnt_namespace *copy_mnt_ns(unsign
p = next_mnt(p, old);
}
namespace_unlock();
@@ -4552,7 +4552,7 @@ diff -urNp -x '*.orig' linux-4.9/fs/namespace.c linux-4.9/fs/namespace.c
if (rootmnt)
mntput(rootmnt);
-@@ -3154,9 +3179,10 @@ SYSCALL_DEFINE2(pivot_root, const char _
+@@ -3175,9 +3200,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 -urNp -x '*.orig' linux-4.9/fs/namespace.c linux-4.9/fs/namespace.c
goto out4;
if (!check_mnt(root_mnt) || !check_mnt(new_mnt))
goto out4;
-@@ -3294,6 +3320,7 @@ void put_mnt_ns(struct mnt_namespace *ns
+@@ -3315,6 +3341,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 -urNp -x '*.orig' linux-4.9/fs/namespace.c linux-4.9/fs/namespace.c
free_mnt_ns(ns);
}
-diff -urNp -x '*.orig' linux-4.9/fs/nfs/client.c linux-4.9/fs/nfs/client.c
---- linux-4.9/fs/nfs/client.c 2021-02-24 15:47:32.290675776 +0100
-+++ linux-4.9/fs/nfs/client.c 2021-02-24 15:47:45.074409033 +0100
+diff -NurpP --minimal linux-4.9.312/fs/nfs/client.c linux-4.9.312-vs2.3.9.13/fs/nfs/client.c
+--- linux-4.9.312/fs/nfs/client.c 2022-05-07 13:52:39.213508421 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/nfs/client.c 2022-05-07 14:02:11.772592306 +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 -urNp -x '*.orig' linux-4.9/fs/nfs/client.c linux-4.9/fs/nfs/client.c
server->maxfilesize = fsinfo->maxfilesize;
server->time_delta = fsinfo->time_delta;
-diff -urNp -x '*.orig' linux-4.9/fs/nfs/dir.c linux-4.9/fs/nfs/dir.c
---- linux-4.9/fs/nfs/dir.c 2021-02-24 15:47:32.294009214 +0100
-+++ linux-4.9/fs/nfs/dir.c 2021-02-24 15:47:45.074409033 +0100
+diff -NurpP --minimal linux-4.9.312/fs/nfs/dir.c linux-4.9.312-vs2.3.9.13/fs/nfs/dir.c
+--- linux-4.9.312/fs/nfs/dir.c 2022-05-07 13:52:39.217508359 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/nfs/dir.c 2022-05-07 14:02:11.772592306 +0000
@@ -37,6 +37,7 @@
#include <linux/sched.h>
#include <linux/kmemleak.h>
@@ -4616,9 +4616,9 @@ diff -urNp -x '*.orig' linux-4.9/fs/nfs/dir.c linux-4.9/fs/nfs/dir.c
no_entry:
res = d_splice_alias(inode, dentry);
if (res != NULL) {
-diff -urNp -x '*.orig' linux-4.9/fs/nfs/inode.c linux-4.9/fs/nfs/inode.c
---- linux-4.9/fs/nfs/inode.c 2021-02-24 15:47:32.294009214 +0100
-+++ linux-4.9/fs/nfs/inode.c 2021-02-24 15:47:45.074409033 +0100
+diff -NurpP --minimal linux-4.9.312/fs/nfs/inode.c linux-4.9.312-vs2.3.9.13/fs/nfs/inode.c
+--- linux-4.9.312/fs/nfs/inode.c 2022-05-07 13:52:39.245507924 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/nfs/inode.c 2022-05-07 14:02:11.772592306 +0000
@@ -38,6 +38,7 @@
#include <linux/slab.h>
#include <linux/compat.h>
@@ -4681,7 +4681,7 @@ diff -urNp -x '*.orig' linux-4.9/fs/nfs/inode.c linux-4.9/fs/nfs/inode.c
nfs_set_cache_invalid(inode, NFS_INO_INVALID_ACCESS
| NFS_INO_INVALID_ACL);
}
-@@ -1273,7 +1282,9 @@ static int nfs_check_inode_attributes(st
+@@ -1270,7 +1279,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 -urNp -x '*.orig' linux-4.9/fs/nfs/inode.c linux-4.9/fs/nfs/inode.c
if (nfs_have_delegated_attributes(inode))
return 0;
-@@ -1302,13 +1313,18 @@ static int nfs_check_inode_attributes(st
+@@ -1299,13 +1310,18 @@ static int nfs_check_inode_attributes(st
}
}
@@ -4713,7 +4713,7 @@ diff -urNp -x '*.orig' linux-4.9/fs/nfs/inode.c linux-4.9/fs/nfs/inode.c
/* Has the link count changed? */
if ((fattr->valid & NFS_ATTR_FATTR_NLINK) && inode->i_nlink != fattr->nlink)
-@@ -1667,6 +1683,9 @@ static int nfs_update_inode(struct inode
+@@ -1664,6 +1680,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 -urNp -x '*.orig' linux-4.9/fs/nfs/inode.c linux-4.9/fs/nfs/inode.c
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,
-@@ -1786,6 +1805,9 @@ static int nfs_update_inode(struct inode
+@@ -1783,6 +1802,9 @@ static int nfs_update_inode(struct inode
cache_revalidated = false;
}
@@ -4733,7 +4733,7 @@ diff -urNp -x '*.orig' linux-4.9/fs/nfs/inode.c linux-4.9/fs/nfs/inode.c
if (fattr->valid & NFS_ATTR_FATTR_ATIME)
memcpy(&inode->i_atime, &fattr->atime, sizeof(inode->i_atime));
-@@ -1840,6 +1862,10 @@ static int nfs_update_inode(struct inode
+@@ -1837,6 +1859,10 @@ static int nfs_update_inode(struct inode
cache_revalidated = false;
}
@@ -4744,9 +4744,9 @@ diff -urNp -x '*.orig' linux-4.9/fs/nfs/inode.c linux-4.9/fs/nfs/inode.c
if (fattr->valid & NFS_ATTR_FATTR_NLINK) {
if (inode->i_nlink != fattr->nlink) {
invalid |= NFS_INO_INVALID_ATTR;
-diff -urNp -x '*.orig' linux-4.9/fs/nfs/nfs3xdr.c linux-4.9/fs/nfs/nfs3xdr.c
---- linux-4.9/fs/nfs/nfs3xdr.c 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/fs/nfs/nfs3xdr.c 2021-02-24 15:47:45.074409033 +0100
+diff -NurpP --minimal linux-4.9.312/fs/nfs/nfs3xdr.c linux-4.9.312-vs2.3.9.13/fs/nfs/nfs3xdr.c
+--- linux-4.9.312/fs/nfs/nfs3xdr.c 2022-05-07 13:52:39.289507242 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/nfs/nfs3xdr.c 2021-07-12 22:41:34.079204675 +0000
@@ -20,6 +20,7 @@
#include <linux/nfs3.h>
#include <linux/nfs_fs.h>
@@ -4755,7 +4755,7 @@ diff -urNp -x '*.orig' linux-4.9/fs/nfs/nfs3xdr.c linux-4.9/fs/nfs/nfs3xdr.c
#include "internal.h"
#define NFSDBG_FACILITY NFSDBG_XDR
-@@ -558,7 +559,8 @@ static __be32 *xdr_decode_nfstime3(__be3
+@@ -559,7 +560,8 @@ static __be32 *xdr_decode_nfstime3(__be3
* set_mtime mtime;
* };
*/
@@ -4765,7 +4765,7 @@ diff -urNp -x '*.orig' linux-4.9/fs/nfs/nfs3xdr.c linux-4.9/fs/nfs/nfs3xdr.c
{
u32 nbytes;
__be32 *p;
-@@ -590,15 +592,19 @@ static void encode_sattr3(struct xdr_str
+@@ -591,15 +593,19 @@ static void encode_sattr3(struct xdr_str
} else
*p++ = xdr_zero;
@@ -4789,7 +4789,7 @@ diff -urNp -x '*.orig' linux-4.9/fs/nfs/nfs3xdr.c linux-4.9/fs/nfs/nfs3xdr.c
} else
*p++ = xdr_zero;
-@@ -887,7 +893,7 @@ static void nfs3_xdr_enc_setattr3args(st
+@@ -888,7 +894,7 @@ static void nfs3_xdr_enc_setattr3args(st
const struct nfs3_sattrargs *args)
{
encode_nfs_fh3(xdr, args->fh);
@@ -4798,7 +4798,7 @@ diff -urNp -x '*.orig' linux-4.9/fs/nfs/nfs3xdr.c linux-4.9/fs/nfs/nfs3xdr.c
encode_sattrguard3(xdr, args);
}
-@@ -1037,13 +1043,13 @@ static void nfs3_xdr_enc_write3args(stru
+@@ -1038,13 +1044,13 @@ static void nfs3_xdr_enc_write3args(stru
* };
*/
static void encode_createhow3(struct xdr_stream *xdr,
@@ -4814,7 +4814,7 @@ diff -urNp -x '*.orig' linux-4.9/fs/nfs/nfs3xdr.c linux-4.9/fs/nfs/nfs3xdr.c
break;
case NFS3_CREATE_EXCLUSIVE:
encode_createverf3(xdr, args->verifier);
-@@ -1058,7 +1064,7 @@ static void nfs3_xdr_enc_create3args(str
+@@ -1059,7 +1065,7 @@ static void nfs3_xdr_enc_create3args(str
const struct nfs3_createargs *args)
{
encode_diropargs3(xdr, args->fh, args->name, args->len);
@@ -4823,7 +4823,7 @@ diff -urNp -x '*.orig' linux-4.9/fs/nfs/nfs3xdr.c linux-4.9/fs/nfs/nfs3xdr.c
}
/*
-@@ -1074,7 +1080,7 @@ static void nfs3_xdr_enc_mkdir3args(stru
+@@ -1075,7 +1081,7 @@ static void nfs3_xdr_enc_mkdir3args(stru
const struct nfs3_mkdirargs *args)
{
encode_diropargs3(xdr, args->fh, args->name, args->len);
@@ -4832,7 +4832,7 @@ diff -urNp -x '*.orig' linux-4.9/fs/nfs/nfs3xdr.c linux-4.9/fs/nfs/nfs3xdr.c
}
/*
-@@ -1091,9 +1097,9 @@ static void nfs3_xdr_enc_mkdir3args(stru
+@@ -1092,9 +1098,9 @@ static void nfs3_xdr_enc_mkdir3args(stru
* };
*/
static void encode_symlinkdata3(struct xdr_stream *xdr,
@@ -4844,7 +4844,7 @@ diff -urNp -x '*.orig' linux-4.9/fs/nfs/nfs3xdr.c linux-4.9/fs/nfs/nfs3xdr.c
encode_nfspath3(xdr, args->pages, args->pathlen);
}
-@@ -1102,7 +1108,7 @@ static void nfs3_xdr_enc_symlink3args(st
+@@ -1103,7 +1109,7 @@ static void nfs3_xdr_enc_symlink3args(st
const struct nfs3_symlinkargs *args)
{
encode_diropargs3(xdr, args->fromfh, args->fromname, args->fromlen);
@@ -4853,7 +4853,7 @@ diff -urNp -x '*.orig' linux-4.9/fs/nfs/nfs3xdr.c linux-4.9/fs/nfs/nfs3xdr.c
xdr->buf->flags |= XDRBUF_WRITE;
}
-@@ -1131,24 +1137,24 @@ static void nfs3_xdr_enc_symlink3args(st
+@@ -1132,24 +1138,24 @@ static void nfs3_xdr_enc_symlink3args(st
* };
*/
static void encode_devicedata3(struct xdr_stream *xdr,
@@ -4883,7 +4883,7 @@ diff -urNp -x '*.orig' linux-4.9/fs/nfs/nfs3xdr.c linux-4.9/fs/nfs/nfs3xdr.c
break;
case NF3REG:
case NF3DIR:
-@@ -1163,7 +1169,7 @@ static void nfs3_xdr_enc_mknod3args(stru
+@@ -1164,7 +1170,7 @@ static void nfs3_xdr_enc_mknod3args(stru
const struct nfs3_mknodargs *args)
{
encode_diropargs3(xdr, args->fh, args->name, args->len);
@@ -4892,9 +4892,9 @@ diff -urNp -x '*.orig' linux-4.9/fs/nfs/nfs3xdr.c linux-4.9/fs/nfs/nfs3xdr.c
}
/*
-diff -urNp -x '*.orig' linux-4.9/fs/nfs/super.c linux-4.9/fs/nfs/super.c
---- linux-4.9/fs/nfs/super.c 2021-02-24 15:47:32.300676089 +0100
-+++ linux-4.9/fs/nfs/super.c 2021-02-24 15:47:45.074409033 +0100
+diff -NurpP --minimal linux-4.9.312/fs/nfs/super.c linux-4.9.312-vs2.3.9.13/fs/nfs/super.c
+--- linux-4.9.312/fs/nfs/super.c 2022-05-07 13:52:39.373505939 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/nfs/super.c 2020-04-01 09:40:28.555466454 +0000
@@ -54,6 +54,7 @@
#include <linux/parser.h>
#include <linux/nsproxy.h>
@@ -4968,9 +4968,9 @@ diff -urNp -x '*.orig' linux-4.9/fs/nfs/super.c linux-4.9/fs/nfs/super.c
/*
* options that take text values
-diff -urNp -x '*.orig' linux-4.9/fs/nfsd/auth.c linux-4.9/fs/nfsd/auth.c
---- linux-4.9/fs/nfsd/auth.c 2021-02-24 15:47:32.300676089 +0100
-+++ linux-4.9/fs/nfsd/auth.c 2021-02-24 15:47:45.074409033 +0100
+diff -NurpP --minimal linux-4.9.312/fs/nfsd/auth.c linux-4.9.312-vs2.3.9.13/fs/nfsd/auth.c
+--- linux-4.9.312/fs/nfsd/auth.c 2022-05-07 13:52:39.405505442 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/fs/nfsd/auth.c linux-4.9/fs/nfsd/auth.c
rqgi = rqstp->rq_cred.cr_group_info;
-diff -urNp -x '*.orig' linux-4.9/fs/nfsd/nfs3xdr.c linux-4.9/fs/nfsd/nfs3xdr.c
---- linux-4.9/fs/nfsd/nfs3xdr.c 2021-02-24 15:47:32.300676089 +0100
-+++ linux-4.9/fs/nfsd/nfs3xdr.c 2021-02-24 15:47:45.077742470 +0100
+diff -NurpP --minimal linux-4.9.312/fs/nfsd/nfs3xdr.c linux-4.9.312-vs2.3.9.13/fs/nfsd/nfs3xdr.c
+--- linux-4.9.312/fs/nfsd/nfs3xdr.c 2022-05-07 13:52:39.417505257 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/nfsd/nfs3xdr.c 2021-07-12 22:41:34.149203802 +0000
@@ -8,6 +8,7 @@
#include <linux/namei.h>
@@ -5045,9 +5045,9 @@ diff -urNp -x '*.orig' linux-4.9/fs/nfsd/nfs3xdr.c linux-4.9/fs/nfsd/nfs3xdr.c
if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) {
p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN);
} else {
-diff -urNp -x '*.orig' linux-4.9/fs/nfsd/nfs4xdr.c linux-4.9/fs/nfsd/nfs4xdr.c
---- linux-4.9/fs/nfsd/nfs4xdr.c 2021-02-24 15:47:32.304009527 +0100
-+++ linux-4.9/fs/nfsd/nfs4xdr.c 2021-02-24 15:47:45.077742470 +0100
+diff -NurpP --minimal linux-4.9.312/fs/nfsd/nfs4xdr.c linux-4.9.312-vs2.3.9.13/fs/nfsd/nfs4xdr.c
+--- linux-4.9.312/fs/nfsd/nfs4xdr.c 2022-05-07 13:52:39.425505132 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/nfsd/nfs4xdr.c 2021-12-20 13:27:56.139789450 +0000
@@ -40,6 +40,7 @@
#include <linux/utsname.h>
#include <linux/pagemap.h>
@@ -5075,9 +5075,9 @@ diff -urNp -x '*.orig' linux-4.9/fs/nfsd/nfs4xdr.c linux-4.9/fs/nfsd/nfs4xdr.c
if (status)
goto out;
}
-diff -urNp -x '*.orig' linux-4.9/fs/nfsd/nfsxdr.c linux-4.9/fs/nfsd/nfsxdr.c
---- linux-4.9/fs/nfsd/nfsxdr.c 2021-02-24 15:47:32.307342964 +0100
-+++ linux-4.9/fs/nfsd/nfsxdr.c 2021-02-24 15:47:45.077742470 +0100
+diff -NurpP --minimal linux-4.9.312/fs/nfsd/nfsxdr.c linux-4.9.312-vs2.3.9.13/fs/nfsd/nfsxdr.c
+--- linux-4.9.312/fs/nfsd/nfsxdr.c 2022-05-07 13:52:39.453504697 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/fs/nfsd/nfsxdr.c linux-4.9/fs/nfsd/nfsxdr.c
if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
*p++ = htonl(NFS_MAXPATHLEN);
-diff -urNp -x '*.orig' linux-4.9/fs/ocfs2/dlmglue.c linux-4.9/fs/ocfs2/dlmglue.c
---- linux-4.9/fs/ocfs2/dlmglue.c 2021-02-24 15:47:32.314009840 +0100
-+++ linux-4.9/fs/ocfs2/dlmglue.c 2021-02-24 15:47:45.077742470 +0100
+diff -NurpP --minimal linux-4.9.312/fs/ocfs2/dlmglue.c linux-4.9.312-vs2.3.9.13/fs/ocfs2/dlmglue.c
+--- linux-4.9.312/fs/ocfs2/dlmglue.c 2022-05-07 13:52:39.609502277 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/ocfs2/dlmglue.c 2021-12-20 13:27:56.289787094 +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 -urNp -x '*.orig' linux-4.9/fs/ocfs2/dlmglue.c linux-4.9/fs/ocfs2/dlmglue.c
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 -urNp -x '*.orig' linux-4.9/fs/ocfs2/dlmglue.h linux-4.9/fs/ocfs2/dlmglue.h
---- linux-4.9/fs/ocfs2/dlmglue.h 2021-02-24 15:47:32.314009840 +0100
-+++ linux-4.9/fs/ocfs2/dlmglue.h 2021-02-24 15:47:45.077742470 +0100
+diff -NurpP --minimal linux-4.9.312/fs/ocfs2/dlmglue.h linux-4.9.312-vs2.3.9.13/fs/ocfs2/dlmglue.h
+--- linux-4.9.312/fs/ocfs2/dlmglue.h 2022-05-07 13:52:39.609502277 +0000
++++ linux-4.9.312-vs2.3.9.13/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,10 +5161,10 @@ diff -urNp -x '*.orig' linux-4.9/fs/ocfs2/dlmglue.h linux-4.9/fs/ocfs2/dlmglue.h
};
#define OCFS2_QINFO_LVB_VERSION 1
-diff -urNp -x '*.orig' linux-4.9/fs/ocfs2/file.c linux-4.9/fs/ocfs2/file.c
---- linux-4.9/fs/ocfs2/file.c 2021-02-24 15:47:32.314009840 +0100
-+++ linux-4.9/fs/ocfs2/file.c 2021-02-24 15:47:45.077742470 +0100
-@@ -1151,7 +1151,7 @@ int ocfs2_setattr(struct dentry *dentry,
+diff -NurpP --minimal linux-4.9.312/fs/ocfs2/file.c linux-4.9.312-vs2.3.9.13/fs/ocfs2/file.c
+--- linux-4.9.312/fs/ocfs2/file.c 2022-05-07 13:52:39.617502152 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/ocfs2/file.c 2021-12-20 13:27:56.309786779 +0000
+@@ -1155,7 +1155,7 @@ int ocfs2_setattr(struct dentry *dentry,
attr->ia_valid &= ~ATTR_SIZE;
#define OCFS2_VALID_ATTRS (ATTR_ATIME | ATTR_MTIME | ATTR_CTIME | ATTR_SIZE \
@@ -5173,9 +5173,9 @@ diff -urNp -x '*.orig' linux-4.9/fs/ocfs2/file.c linux-4.9/fs/ocfs2/file.c
if (!(attr->ia_valid & OCFS2_VALID_ATTRS))
return 0;
-diff -urNp -x '*.orig' linux-4.9/fs/ocfs2/inode.c linux-4.9/fs/ocfs2/inode.c
---- linux-4.9/fs/ocfs2/inode.c 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/fs/ocfs2/inode.c 2021-02-24 15:47:45.077742470 +0100
+diff -NurpP --minimal linux-4.9.312/fs/ocfs2/inode.c linux-4.9.312-vs2.3.9.13/fs/ocfs2/inode.c
+--- linux-4.9.312/fs/ocfs2/inode.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/fs/ocfs2/inode.c linux-4.9/fs/ocfs2/inode.c
/* Fast symlinks will have i_size but no allocated clusters. */
if (S_ISLNK(inode->i_mode) && !fe->i_clusters) {
-diff -urNp -x '*.orig' linux-4.9/fs/ocfs2/inode.h linux-4.9/fs/ocfs2/inode.h
---- linux-4.9/fs/ocfs2/inode.h 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/fs/ocfs2/inode.h 2021-02-24 15:47:45.077742470 +0100
+diff -NurpP --minimal linux-4.9.312/fs/ocfs2/inode.h linux-4.9.312-vs2.3.9.13/fs/ocfs2/inode.h
+--- linux-4.9.312/fs/ocfs2/inode.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/fs/ocfs2/inode.h linux-4.9/fs/ocfs2/inode.h
static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode)
{
-diff -urNp -x '*.orig' linux-4.9/fs/ocfs2/ioctl.c linux-4.9/fs/ocfs2/ioctl.c
---- linux-4.9/fs/ocfs2/ioctl.c 2021-02-24 15:47:32.314009840 +0100
-+++ linux-4.9/fs/ocfs2/ioctl.c 2021-02-24 15:47:45.077742470 +0100
+diff -NurpP --minimal linux-4.9.312/fs/ocfs2/ioctl.c linux-4.9.312-vs2.3.9.13/fs/ocfs2/ioctl.c
+--- linux-4.9.312/fs/ocfs2/ioctl.c 2022-05-07 13:52:39.629501966 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/fs/ocfs2/ioctl.c linux-4.9/fs/ocfs2/ioctl.c
long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
struct inode *inode = file_inode(filp);
-diff -urNp -x '*.orig' linux-4.9/fs/ocfs2/namei.c linux-4.9/fs/ocfs2/namei.c
---- linux-4.9/fs/ocfs2/namei.c 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/fs/ocfs2/namei.c 2021-02-24 15:47:45.081075908 +0100
+diff -NurpP --minimal linux-4.9.312/fs/ocfs2/namei.c linux-4.9.312-vs2.3.9.13/fs/ocfs2/namei.c
+--- linux-4.9.312/fs/ocfs2/namei.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/fs/ocfs2/namei.c linux-4.9/fs/ocfs2/namei.c
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 -urNp -x '*.orig' linux-4.9/fs/ocfs2/ocfs2.h linux-4.9/fs/ocfs2/ocfs2.h
---- linux-4.9/fs/ocfs2/ocfs2.h 2021-02-24 15:47:32.317343277 +0100
-+++ linux-4.9/fs/ocfs2/ocfs2.h 2021-02-24 15:47:45.081075908 +0100
-@@ -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 -urNp -x '*.orig' linux-4.9/fs/ocfs2/ocfs2_fs.h linux-4.9/fs/ocfs2/ocfs2_fs.h
---- linux-4.9/fs/ocfs2/ocfs2_fs.h 2021-02-24 15:47:32.317343277 +0100
-+++ linux-4.9/fs/ocfs2/ocfs2_fs.h 2021-02-24 15:47:45.081075908 +0100
+diff -NurpP --minimal linux-4.9.312/fs/ocfs2/ocfs2_fs.h linux-4.9.312-vs2.3.9.13/fs/ocfs2/ocfs2_fs.h
+--- linux-4.9.312/fs/ocfs2/ocfs2_fs.h 2022-05-07 13:52:39.653501594 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/ocfs2/ocfs2_fs.h 2021-07-12 22:41:34.269202304 +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 -urNp -x '*.orig' linux-4.9/fs/ocfs2/ocfs2_fs.h linux-4.9/fs/ocfs2/ocfs2_fs
#define OCFS2_FL_VISIBLE FS_FL_USER_VISIBLE /* User visible flags */
#define OCFS2_FL_MODIFIABLE FS_FL_USER_MODIFIABLE /* User modifiable flags */
-diff -urNp -x '*.orig' linux-4.9/fs/ocfs2/super.c linux-4.9/fs/ocfs2/super.c
---- linux-4.9/fs/ocfs2/super.c 2021-02-24 15:47:32.317343277 +0100
-+++ linux-4.9/fs/ocfs2/super.c 2021-02-24 15:47:45.081075908 +0100
+diff -NurpP --minimal linux-4.9.312/fs/ocfs2/ocfs2.h linux-4.9.312-vs2.3.9.13/fs/ocfs2/ocfs2.h
+--- linux-4.9.312/fs/ocfs2/ocfs2.h 2022-05-07 13:52:39.653501594 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/ocfs2/ocfs2.h 2021-07-12 22:41:34.269202304 +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.312/fs/ocfs2/super.c linux-4.9.312-vs2.3.9.13/fs/ocfs2/super.c
+--- linux-4.9.312/fs/ocfs2/super.c 2022-05-07 13:52:39.677501221 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/ocfs2/super.c 2021-12-20 13:27:56.349786151 +0000
@@ -188,6 +188,7 @@ enum {
Opt_dir_resv_level,
Opt_journal_async_commit,
@@ -5476,9 +5476,9 @@ diff -urNp -x '*.orig' linux-4.9/fs/ocfs2/super.c linux-4.9/fs/ocfs2/super.c
default:
mlog(ML_ERROR,
"Unrecognized mount option \"%s\" "
-diff -urNp -x '*.orig' linux-4.9/fs/open.c linux-4.9/fs/open.c
---- linux-4.9/fs/open.c 2021-02-24 15:47:32.320676715 +0100
-+++ linux-4.9/fs/open.c 2021-02-24 15:47:45.081075908 +0100
+diff -NurpP --minimal linux-4.9.312/fs/open.c linux-4.9.312-vs2.3.9.13/fs/open.c
+--- linux-4.9.312/fs/open.c 2022-05-07 13:52:39.697500911 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/open.c 2020-04-01 09:40:28.635465130 +0000
@@ -31,6 +31,11 @@
#include <linux/ima.h>
#include <linux/dnotify.h>
@@ -5553,9 +5553,9 @@ diff -urNp -x '*.orig' linux-4.9/fs/open.c linux-4.9/fs/open.c
error = chown_common(&path, user, group);
mnt_drop_write(path.mnt);
out_release:
-diff -urNp -x '*.orig' linux-4.9/fs/proc/array.c linux-4.9/fs/proc/array.c
---- linux-4.9/fs/proc/array.c 2021-02-24 15:47:32.324010153 +0100
-+++ linux-4.9/fs/proc/array.c 2021-02-24 15:47:45.081075908 +0100
+diff -NurpP --minimal linux-4.9.312/fs/proc/array.c linux-4.9.312-vs2.3.9.13/fs/proc/array.c
+--- linux-4.9.312/fs/proc/array.c 2022-05-07 13:52:39.765499856 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/proc/array.c 2020-04-19 00:54:52.163080084 +0000
@@ -86,6 +86,8 @@
#include <linux/string_helpers.h>
#include <linux/user_namespace.h>
@@ -5656,27 +5656,9 @@ diff -urNp -x '*.orig' linux-4.9/fs/proc/array.c linux-4.9/fs/proc/array.c
task_context_switch_counts(m, task);
return 0;
}
-@@ -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);
-
-+ /* fixup start time for virt uptime */
-+ if (vx_flags(VXF_VIRT_UPTIME, 0)) {
-+ unsigned long long bias =
-+ current->vx_info->cvirt.bias_clock;
-+
-+ if (start_time > bias)
-+ start_time -= bias;
-+ else
-+ start_time = 0;
-+ }
-+
- 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 -urNp -x '*.orig' linux-4.9/fs/proc/base.c linux-4.9/fs/proc/base.c
---- linux-4.9/fs/proc/base.c 2021-02-24 15:47:32.324010153 +0100
-+++ linux-4.9/fs/proc/base.c 2021-02-24 15:47:45.081075908 +0100
+diff -NurpP --minimal linux-4.9.312/fs/proc/base.c linux-4.9.312-vs2.3.9.13/fs/proc/base.c
+--- linux-4.9.312/fs/proc/base.c 2022-05-07 13:52:39.765499856 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/proc/base.c 2021-12-20 13:27:56.509783638 +0000
@@ -87,6 +87,8 @@
#include <linux/slab.h>
#include <linux/flex_array.h>
@@ -5755,7 +5737,7 @@ diff -urNp -x '*.orig' linux-4.9/fs/proc/base.c linux-4.9/fs/proc/base.c
/*
* Yes, it does not scale. And it should not. Don't add
* new entries into /proc/<tgid>/ without very good reasons.
-@@ -2884,6 +2915,11 @@ static int proc_pid_personality(struct s
+@@ -2897,6 +2928,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 +5749,7 @@ diff -urNp -x '*.orig' linux-4.9/fs/proc/base.c linux-4.9/fs/proc/base.c
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),
-@@ -2948,6 +2984,8 @@ static const struct pid_entry tgid_base_
+@@ -2961,6 +2997,8 @@ static const struct pid_entry tgid_base_
#ifdef CONFIG_CGROUPS
ONE("cgroup", S_IRUGO, proc_cgroup_show),
#endif
@@ -5776,7 +5758,7 @@ diff -urNp -x '*.orig' linux-4.9/fs/proc/base.c linux-4.9/fs/proc/base.c
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),
-@@ -3163,7 +3201,7 @@ retry:
+@@ -3176,7 +3214,7 @@ retry:
iter.task = NULL;
pid = find_ge_pid(iter.tgid, ns);
if (pid) {
@@ -5785,7 +5767,7 @@ diff -urNp -x '*.orig' linux-4.9/fs/proc/base.c linux-4.9/fs/proc/base.c
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
-@@ -3223,8 +3261,10 @@ int proc_pid_readdir(struct file *file,
+@@ -3236,8 +3274,10 @@ int proc_pid_readdir(struct file *file,
if (!has_pid_permissions(ns, iter.task, 2))
continue;
@@ -5797,7 +5779,7 @@ diff -urNp -x '*.orig' linux-4.9/fs/proc/base.c linux-4.9/fs/proc/base.c
if (!proc_fill_cache(file, ctx, name, len,
proc_pid_instantiate, iter.task, NULL)) {
put_task_struct(iter.task);
-@@ -3361,6 +3401,7 @@ static const struct pid_entry tid_base_s
+@@ -3374,6 +3414,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 +5787,7 @@ diff -urNp -x '*.orig' linux-4.9/fs/proc/base.c linux-4.9/fs/proc/base.c
};
static int proc_tid_base_readdir(struct file *file, struct dir_context *ctx)
-@@ -3427,6 +3468,8 @@ static struct dentry *proc_task_lookup(s
+@@ -3440,6 +3481,8 @@ static struct dentry *proc_task_lookup(s
tid = name_to_int(&dentry->d_name);
if (tid == ~0U)
goto out;
@@ -5814,9 +5796,9 @@ diff -urNp -x '*.orig' linux-4.9/fs/proc/base.c linux-4.9/fs/proc/base.c
ns = dentry->d_sb->s_fs_info;
rcu_read_lock();
-diff -urNp -x '*.orig' linux-4.9/fs/proc/generic.c linux-4.9/fs/proc/generic.c
---- linux-4.9/fs/proc/generic.c 2021-02-24 15:47:32.324010153 +0100
-+++ linux-4.9/fs/proc/generic.c 2021-02-24 15:47:45.081075908 +0100
+diff -NurpP --minimal linux-4.9.312/fs/proc/generic.c linux-4.9.312-vs2.3.9.13/fs/proc/generic.c
+--- linux-4.9.312/fs/proc/generic.c 2022-05-07 13:52:39.765499856 +0000
++++ linux-4.9.312-vs2.3.9.13/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 +5873,9 @@ diff -urNp -x '*.orig' linux-4.9/fs/proc/generic.c linux-4.9/fs/proc/generic.c
} else {
kfree(ent);
ent = NULL;
-diff -urNp -x '*.orig' linux-4.9/fs/proc/inode.c linux-4.9/fs/proc/inode.c
---- linux-4.9/fs/proc/inode.c 2021-02-24 15:47:32.324010153 +0100
-+++ linux-4.9/fs/proc/inode.c 2021-02-24 15:47:45.081075908 +0100
+diff -NurpP --minimal linux-4.9.312/fs/proc/inode.c linux-4.9.312-vs2.3.9.13/fs/proc/inode.c
+--- linux-4.9.312/fs/proc/inode.c 2022-05-07 13:52:39.777499671 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/proc/inode.c 2021-07-12 22:41:34.419200432 +0000
@@ -433,6 +433,8 @@ struct inode *proc_get_inode(struct supe
inode->i_uid = de->uid;
inode->i_gid = de->gid;
@@ -5903,9 +5885,9 @@ diff -urNp -x '*.orig' linux-4.9/fs/proc/inode.c linux-4.9/fs/proc/inode.c
if (de->size)
inode->i_size = de->size;
if (de->nlink)
-diff -urNp -x '*.orig' linux-4.9/fs/proc/internal.h linux-4.9/fs/proc/internal.h
---- linux-4.9/fs/proc/internal.h 2021-02-24 15:47:32.324010153 +0100
-+++ linux-4.9/fs/proc/internal.h 2021-02-24 15:47:45.084409345 +0100
+diff -NurpP --minimal linux-4.9.312/fs/proc/internal.h linux-4.9.312-vs2.3.9.13/fs/proc/internal.h
+--- linux-4.9.312/fs/proc/internal.h 2022-05-07 13:52:39.785499546 +0000
++++ linux-4.9.312-vs2.3.9.13/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 +5954,9 @@ diff -urNp -x '*.orig' linux-4.9/fs/proc/internal.h linux-4.9/fs/proc/internal.h
/*
* base.c
-diff -urNp -x '*.orig' linux-4.9/fs/proc/loadavg.c linux-4.9/fs/proc/loadavg.c
---- linux-4.9/fs/proc/loadavg.c 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/fs/proc/loadavg.c 2021-02-24 15:47:45.084409345 +0100
+diff -NurpP --minimal linux-4.9.312/fs/proc/loadavg.c linux-4.9.312-vs2.3.9.13/fs/proc/loadavg.c
+--- linux-4.9.312/fs/proc/loadavg.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/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 +5986,9 @@ diff -urNp -x '*.orig' linux-4.9/fs/proc/loadavg.c linux-4.9/fs/proc/loadavg.c
task_active_pid_ns(current)->last_pid);
return 0;
}
-diff -urNp -x '*.orig' linux-4.9/fs/proc/meminfo.c linux-4.9/fs/proc/meminfo.c
---- linux-4.9/fs/proc/meminfo.c 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/fs/proc/meminfo.c 2021-02-24 15:47:45.084409345 +0100
+diff -NurpP --minimal linux-4.9.312/fs/proc/meminfo.c linux-4.9.312-vs2.3.9.13/fs/proc/meminfo.c
+--- linux-4.9.312/fs/proc/meminfo.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/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 +5999,9 @@ diff -urNp -x '*.orig' linux-4.9/fs/proc/meminfo.c linux-4.9/fs/proc/meminfo.c
total_swapcache_pages() - i.bufferram;
if (cached < 0)
cached = 0;
-diff -urNp -x '*.orig' linux-4.9/fs/proc/root.c linux-4.9/fs/proc/root.c
---- linux-4.9/fs/proc/root.c 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/fs/proc/root.c 2021-02-24 15:47:45.084409345 +0100
+diff -NurpP --minimal linux-4.9.312/fs/proc/root.c linux-4.9.312-vs2.3.9.13/fs/proc/root.c
+--- linux-4.9.312/fs/proc/root.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/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 +6033,9 @@ diff -urNp -x '*.orig' linux-4.9/fs/proc/root.c linux-4.9/fs/proc/root.c
.subdir = RB_ROOT,
.name = "/proc",
};
-diff -urNp -x '*.orig' linux-4.9/fs/proc/self.c linux-4.9/fs/proc/self.c
---- linux-4.9/fs/proc/self.c 2021-02-24 15:47:32.324010153 +0100
-+++ linux-4.9/fs/proc/self.c 2021-02-24 15:47:45.084409345 +0100
+diff -NurpP --minimal linux-4.9.312/fs/proc/self.c linux-4.9.312-vs2.3.9.13/fs/proc/self.c
+--- linux-4.9.312/fs/proc/self.c 2022-05-07 13:52:39.793499423 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/proc/self.c 2021-07-12 22:48:49.233981031 +0000
@@ -1,6 +1,7 @@
#include <linux/sched.h>
#include <linux/slab.h>
@@ -6071,9 +6053,9 @@ diff -urNp -x '*.orig' linux-4.9/fs/proc/self.c linux-4.9/fs/proc/self.c
if (inode) {
inode->i_ino = self_inum;
inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
-diff -urNp -x '*.orig' linux-4.9/fs/proc/stat.c linux-4.9/fs/proc/stat.c
---- linux-4.9/fs/proc/stat.c 2021-02-24 15:47:32.324010153 +0100
-+++ linux-4.9/fs/proc/stat.c 2021-02-24 15:47:45.084409345 +0100
+diff -NurpP --minimal linux-4.9.312/fs/proc/stat.c linux-4.9.312-vs2.3.9.13/fs/proc/stat.c
+--- linux-4.9.312/fs/proc/stat.c 2022-05-07 13:52:39.793499423 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/proc/stat.c 2019-10-13 15:58:54.758080005 +0000
@@ -9,8 +9,10 @@
#include <linux/slab.h>
#include <linux/time.h>
@@ -6117,9 +6099,9 @@ diff -urNp -x '*.orig' linux-4.9/fs/proc/stat.c linux-4.9/fs/proc/stat.c
/* 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 -urNp -x '*.orig' linux-4.9/fs/proc/uptime.c linux-4.9/fs/proc/uptime.c
---- linux-4.9/fs/proc/uptime.c 2021-02-24 15:47:32.327343590 +0100
-+++ linux-4.9/fs/proc/uptime.c 2021-02-24 15:47:45.084409345 +0100
+diff -NurpP --minimal linux-4.9.312/fs/proc/uptime.c linux-4.9.312-vs2.3.9.13/fs/proc/uptime.c
+--- linux-4.9.312/fs/proc/uptime.c 2022-05-07 13:52:39.797499360 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/proc/uptime.c 2020-04-18 23:42:47.412036999 +0000
@@ -5,6 +5,7 @@
#include <linux/seq_file.h>
#include <linux/time.h>
@@ -6128,17 +6110,20 @@ diff -urNp -x '*.orig' linux-4.9/fs/proc/uptime.c linux-4.9/fs/proc/uptime.c
static int uptime_proc_show(struct seq_file *m, void *v)
{
-@@ -21,6 +22,7 @@ static int uptime_proc_show(struct seq_f
+@@ -21,6 +22,10 @@ static int uptime_proc_show(struct seq_f
get_monotonic_boottime(&uptime);
idle.tv_sec = div_u64_rem(nsec, NSEC_PER_SEC, &rem);
idle.tv_nsec = rem;
++
++ 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 -urNp -x '*.orig' linux-4.9/fs/proc_namespace.c linux-4.9/fs/proc_namespace.c
---- linux-4.9/fs/proc_namespace.c 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/fs/proc_namespace.c 2021-02-24 15:47:45.084409345 +0100
+diff -NurpP --minimal linux-4.9.312/fs/proc_namespace.c linux-4.9.312-vs2.3.9.13/fs/proc_namespace.c
+--- linux-4.9.312/fs/proc_namespace.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/proc_namespace.c 2018-10-20 04:58:14.000000000 +0000
@@ -46,6 +46,8 @@ static int show_sb_opts(struct seq_file
{ MS_DIRSYNC, ",dirsync" },
{ MS_MANDLOCK, ",mand" },
@@ -6252,10 +6237,10 @@ diff -urNp -x '*.orig' linux-4.9/fs/proc_namespace.c linux-4.9/fs/proc_namespace
/* file system type */
seq_puts(m, "with fstype ");
show_type(m, sb);
-diff -urNp -x '*.orig' linux-4.9/fs/quota/dquot.c linux-4.9/fs/quota/dquot.c
---- linux-4.9/fs/quota/dquot.c 2021-02-24 15:47:32.327343590 +0100
-+++ linux-4.9/fs/quota/dquot.c 2021-02-24 15:47:45.084409345 +0100
-@@ -1659,6 +1659,9 @@ int __dquot_alloc_space(struct inode *in
+diff -NurpP --minimal linux-4.9.312/fs/quota/dquot.c linux-4.9.312-vs2.3.9.13/fs/quota/dquot.c
+--- linux-4.9.312/fs/quota/dquot.c 2022-05-07 13:52:39.813499111 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/quota/dquot.c 2022-05-07 14:02:11.784592116 +0000
+@@ -1664,6 +1664,9 @@ int __dquot_alloc_space(struct inode *in
int reserve = flags & DQUOT_SPACE_RESERVE;
struct dquot **dquots;
@@ -6265,7 +6250,7 @@ diff -urNp -x '*.orig' linux-4.9/fs/quota/dquot.c linux-4.9/fs/quota/dquot.c
if (!dquot_active(inode)) {
inode_incr_space(inode, number, reserve);
goto out;
-@@ -1711,6 +1714,9 @@ int dquot_alloc_inode(struct inode *inod
+@@ -1716,6 +1719,9 @@ int dquot_alloc_inode(struct inode *inod
struct dquot_warn warn[MAXQUOTAS];
struct dquot * const *dquots;
@@ -6275,7 +6260,7 @@ diff -urNp -x '*.orig' linux-4.9/fs/quota/dquot.c linux-4.9/fs/quota/dquot.c
if (!dquot_active(inode))
return 0;
for (cnt = 0; cnt < MAXQUOTAS; cnt++)
-@@ -1813,6 +1819,8 @@ void __dquot_free_space(struct inode *in
+@@ -1818,6 +1824,8 @@ void __dquot_free_space(struct inode *in
struct dquot **dquots;
int reserve = flags & DQUOT_SPACE_RESERVE, index;
@@ -6284,7 +6269,7 @@ diff -urNp -x '*.orig' linux-4.9/fs/quota/dquot.c linux-4.9/fs/quota/dquot.c
if (!dquot_active(inode)) {
inode_decr_space(inode, number, reserve);
return;
-@@ -1857,6 +1865,8 @@ void dquot_free_inode(struct inode *inod
+@@ -1862,6 +1870,8 @@ void dquot_free_inode(struct inode *inod
struct dquot * const *dquots;
int index;
@@ -6293,9 +6278,9 @@ diff -urNp -x '*.orig' linux-4.9/fs/quota/dquot.c linux-4.9/fs/quota/dquot.c
if (!dquot_active(inode))
return;
-diff -urNp -x '*.orig' linux-4.9/fs/quota/quota.c linux-4.9/fs/quota/quota.c
---- linux-4.9/fs/quota/quota.c 2021-02-24 15:47:32.327343590 +0100
-+++ linux-4.9/fs/quota/quota.c 2021-02-24 15:47:45.084409345 +0100
+diff -NurpP --minimal linux-4.9.312/fs/quota/quota.c linux-4.9.312-vs2.3.9.13/fs/quota/quota.c
+--- linux-4.9.312/fs/quota/quota.c 2022-05-07 13:52:39.825498925 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/quota/quota.c 2018-10-20 05:55:43.000000000 +0000
@@ -8,6 +8,7 @@
#include <linux/fs.h>
#include <linux/namei.h>
@@ -6383,9 +6368,9 @@ diff -urNp -x '*.orig' linux-4.9/fs/quota/quota.c linux-4.9/fs/quota/quota.c
if (quotactl_cmd_write(cmd))
sb = get_super_thawed(bdev);
else
-diff -urNp -x '*.orig' linux-4.9/fs/stat.c linux-4.9/fs/stat.c
---- linux-4.9/fs/stat.c 2021-02-24 15:47:32.334010466 +0100
-+++ linux-4.9/fs/stat.c 2021-02-24 15:47:45.084409345 +0100
+diff -NurpP --minimal linux-4.9.312/fs/stat.c linux-4.9.312-vs2.3.9.13/fs/stat.c
+--- linux-4.9.312/fs/stat.c 2022-05-07 13:52:39.933497249 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/stat.c 2018-10-20 04:58:14.000000000 +0000
@@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod
stat->nlink = inode->i_nlink;
stat->uid = inode->i_uid;
@@ -6394,9 +6379,9 @@ diff -urNp -x '*.orig' linux-4.9/fs/stat.c linux-4.9/fs/stat.c
stat->rdev = inode->i_rdev;
stat->size = i_size_read(inode);
stat->atime = inode->i_atime;
-diff -urNp -x '*.orig' linux-4.9/fs/statfs.c linux-4.9/fs/statfs.c
---- linux-4.9/fs/statfs.c 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/fs/statfs.c 2021-02-24 15:47:45.084409345 +0100
+diff -NurpP --minimal linux-4.9.312/fs/statfs.c linux-4.9.312-vs2.3.9.13/fs/statfs.c
+--- linux-4.9.312/fs/statfs.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/statfs.c 2018-10-20 04:58:14.000000000 +0000
@@ -7,6 +7,8 @@
#include <linux/statfs.h>
#include <linux/security.h>
@@ -6415,9 +6400,9 @@ diff -urNp -x '*.orig' linux-4.9/fs/statfs.c linux-4.9/fs/statfs.c
return retval;
}
-diff -urNp -x '*.orig' linux-4.9/fs/super.c linux-4.9/fs/super.c
---- linux-4.9/fs/super.c 2021-02-24 15:47:32.334010466 +0100
-+++ linux-4.9/fs/super.c 2021-02-24 15:47:45.084409345 +0100
+diff -NurpP --minimal linux-4.9.312/fs/super.c linux-4.9.312-vs2.3.9.13/fs/super.c
+--- linux-4.9.312/fs/super.c 2022-05-07 13:52:39.933497249 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/super.c 2022-05-07 14:02:11.788592054 +0000
@@ -34,6 +34,8 @@
#include <linux/fsnotify.h>
#include <linux/lockdep.h>
@@ -6470,9 +6455,9 @@ diff -urNp -x '*.orig' linux-4.9/fs/super.c linux-4.9/fs/super.c
error = security_sb_kern_mount(sb, flags, secdata);
if (error)
goto out_sb;
-diff -urNp -x '*.orig' linux-4.9/fs/utimes.c linux-4.9/fs/utimes.c
---- linux-4.9/fs/utimes.c 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/fs/utimes.c 2021-02-24 15:47:45.084409345 +0100
+diff -NurpP --minimal linux-4.9.312/fs/utimes.c linux-4.9.312-vs2.3.9.13/fs/utimes.c
+--- linux-4.9.312/fs/utimes.c 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/utimes.c 2018-10-20 04:58:14.000000000 +0000
@@ -8,6 +8,8 @@
#include <linux/stat.h>
#include <linux/utime.h>
@@ -6503,9 +6488,9 @@ diff -urNp -x '*.orig' linux-4.9/fs/utimes.c linux-4.9/fs/utimes.c
if (times && times[0].tv_nsec == UTIME_NOW &&
times[1].tv_nsec == UTIME_NOW)
times = NULL;
-diff -urNp -x '*.orig' linux-4.9/fs/xattr.c linux-4.9/fs/xattr.c
---- linux-4.9/fs/xattr.c 2021-02-24 15:47:32.340677341 +0100
-+++ linux-4.9/fs/xattr.c 2021-02-24 15:47:45.084409345 +0100
+diff -NurpP --minimal linux-4.9.312/fs/xattr.c linux-4.9.312-vs2.3.9.13/fs/xattr.c
+--- linux-4.9.312/fs/xattr.c 2022-05-07 13:52:40.029495760 +0000
++++ linux-4.9.312-vs2.3.9.13/fs/xattr.c 2021-07-12 22:41:34.619197937 +0000
@@ -21,6 +21,7 @@
#include <linux/audit.h>
#include <linux/vmalloc.h>
@@ -6523,9 +6508,9 @@ diff -urNp -x '*.orig' linux-4.9/fs/xattr.c linux-4.9/fs/xattr.c
return (mask & MAY_WRITE) ? -EPERM : -ENODATA;
return 0;
}
-diff -urNp -x '*.orig' linux-4.9/include/linux/capability.h linux-4.9/include/linux/capability.h
---- linux-4.9/include/linux/capability.h 2021-02-24 15:47:32.377345154 +0100
-+++ linux-4.9/include/linux/capability.h 2021-02-24 15:47:45.084409345 +0100
+diff -NurpP --minimal linux-4.9.312/include/linux/capability.h linux-4.9.312-vs2.3.9.13/include/linux/capability.h
+--- linux-4.9.312/include/linux/capability.h 2022-05-07 13:52:40.397490050 +0000
++++ linux-4.9.312-vs2.3.9.13/include/linux/capability.h 2018-10-20 04:58:14.000000000 +0000
@@ -78,7 +78,8 @@ extern const kernel_cap_t __cap_init_eff
#else /* HAND-CODED capability initializers */
@@ -6536,9 +6521,9 @@ diff -urNp -x '*.orig' linux-4.9/include/linux/capability.h linux-4.9/include/li
# define CAP_EMPTY_SET ((kernel_cap_t){{ 0, 0 }})
# define CAP_FULL_SET ((kernel_cap_t){{ ~0, CAP_LAST_U32_VALID_MASK }})
-diff -urNp -x '*.orig' linux-4.9/include/linux/cred.h linux-4.9/include/linux/cred.h
---- linux-4.9/include/linux/cred.h 2021-02-24 15:47:32.380678592 +0100
-+++ linux-4.9/include/linux/cred.h 2021-02-24 15:47:45.087742783 +0100
+diff -NurpP --minimal linux-4.9.312/include/linux/cred.h linux-4.9.312-vs2.3.9.13/include/linux/cred.h
+--- linux-4.9.312/include/linux/cred.h 2022-05-07 13:52:40.441489368 +0000
++++ linux-4.9.312-vs2.3.9.13/include/linux/cred.h 2021-12-20 13:27:56.969776410 +0000
@@ -156,6 +156,7 @@ extern void exit_creds(struct task_struc
extern int copy_creds(struct task_struct *, unsigned long);
extern const struct cred *get_task_cred(struct task_struct *);
@@ -6579,9 +6564,9 @@ diff -urNp -x '*.orig' linux-4.9/include/linux/cred.h linux-4.9/include/linux/cr
/**
* get_new_cred - Get a reference on a new set of credentials
* @cred: The new credentials to reference
-diff -urNp -x '*.orig' linux-4.9/include/linux/dcache.h linux-4.9/include/linux/dcache.h
---- linux-4.9/include/linux/dcache.h 2021-02-24 15:47:32.380678592 +0100
-+++ linux-4.9/include/linux/dcache.h 2021-02-24 15:47:45.087742783 +0100
+diff -NurpP --minimal linux-4.9.312/include/linux/dcache.h linux-4.9.312-vs2.3.9.13/include/linux/dcache.h
+--- linux-4.9.312/include/linux/dcache.h 2022-05-07 13:52:40.441489368 +0000
++++ linux-4.9.312-vs2.3.9.13/include/linux/dcache.h 2018-10-20 04:58:14.000000000 +0000
@@ -308,8 +308,10 @@ extern char *dentry_path(struct dentry *
*/
static inline struct dentry *dget_dlock(struct dentry *dentry)
@@ -6594,18 +6579,18 @@ diff -urNp -x '*.orig' linux-4.9/include/linux/dcache.h linux-4.9/include/linux/
return dentry;
}
-diff -urNp -x '*.orig' linux-4.9/include/linux/devpts_fs.h linux-4.9/include/linux/devpts_fs.h
---- linux-4.9/include/linux/devpts_fs.h 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/include/linux/devpts_fs.h 2021-02-24 15:47:45.087742783 +0100
+diff -NurpP --minimal linux-4.9.312/include/linux/devpts_fs.h linux-4.9.312-vs2.3.9.13/include/linux/devpts_fs.h
+--- linux-4.9.312/include/linux/devpts_fs.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/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 -urNp -x '*.orig' linux-4.9/include/linux/fs.h linux-4.9/include/linux/fs.h
---- linux-4.9/include/linux/fs.h 2021-02-24 15:47:32.384012030 +0100
-+++ linux-4.9/include/linux/fs.h 2021-02-24 15:47:45.087742783 +0100
+diff -NurpP --minimal linux-4.9.312/include/linux/fs.h linux-4.9.312-vs2.3.9.13/include/linux/fs.h
+--- linux-4.9.312/include/linux/fs.h 2022-05-07 13:52:40.477488809 +0000
++++ linux-4.9.312-vs2.3.9.13/include/linux/fs.h 2021-12-20 13:27:57.089774525 +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)
@@ -6671,7 +6656,7 @@ diff -urNp -x '*.orig' linux-4.9/include/linux/fs.h linux-4.9/include/linux/fs.h
struct file_ra_state f_ra;
u64 f_version;
-@@ -1044,6 +1055,7 @@ struct file_lock {
+@@ -1046,6 +1057,7 @@ struct file_lock {
struct file *fl_file;
loff_t fl_start;
loff_t fl_end;
@@ -6679,7 +6664,7 @@ diff -urNp -x '*.orig' linux-4.9/include/linux/fs.h linux-4.9/include/linux/fs.h
struct fasync_struct * fl_fasync; /* for lease break notifications */
/* for lease breaks: */
-@@ -1477,6 +1489,11 @@ static inline gid_t i_gid_read(const str
+@@ -1479,6 +1491,11 @@ static inline gid_t i_gid_read(const str
return from_kgid(inode->i_sb->s_user_ns, inode->i_gid);
}
@@ -6691,7 +6676,7 @@ diff -urNp -x '*.orig' linux-4.9/include/linux/fs.h linux-4.9/include/linux/fs.h
static inline void i_uid_write(struct inode *inode, uid_t uid)
{
inode->i_uid = make_kuid(inode->i_sb->s_user_ns, uid);
-@@ -1766,6 +1783,7 @@ struct inode_operations {
+@@ -1768,6 +1785,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);
@@ -6699,7 +6684,7 @@ diff -urNp -x '*.orig' linux-4.9/include/linux/fs.h linux-4.9/include/linux/fs.h
int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start,
u64 len);
int (*update_time)(struct inode *, struct timespec *, int);
-@@ -1780,6 +1798,7 @@ ssize_t rw_copy_check_uvector(int type,
+@@ -1782,6 +1800,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);
@@ -6707,7 +6692,7 @@ diff -urNp -x '*.orig' linux-4.9/include/linux/fs.h linux-4.9/include/linux/fs.h
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 *);
-@@ -1851,6 +1870,14 @@ struct super_operations {
+@@ -1853,6 +1872,14 @@ struct super_operations {
#else
#define S_DAX 0 /* Make all the DAX code disappear */
#endif
@@ -6722,7 +6707,7 @@ diff -urNp -x '*.orig' linux-4.9/include/linux/fs.h linux-4.9/include/linux/fs.h
/*
* Note that nosuid etc flags are inode-specific: setting some file-system
-@@ -1875,10 +1902,13 @@ struct super_operations {
+@@ -1877,10 +1904,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)
@@ -6736,7 +6721,7 @@ diff -urNp -x '*.orig' linux-4.9/include/linux/fs.h linux-4.9/include/linux/fs.h
#define IS_POSIXACL(inode) __IS_FLG(inode, MS_POSIXACL)
#define IS_DEADDIR(inode) ((inode)->i_flags & S_DEAD)
-@@ -1898,6 +1928,16 @@ static inline bool HAS_UNMAPPED_ID(struc
+@@ -1900,6 +1930,16 @@ static inline bool HAS_UNMAPPED_ID(struc
return !uid_valid(inode->i_uid) || !gid_valid(inode->i_gid);
}
@@ -6753,7 +6738,7 @@ diff -urNp -x '*.orig' linux-4.9/include/linux/fs.h linux-4.9/include/linux/fs.h
/*
* Inode state bits. Protected by inode->i_lock
*
-@@ -2167,6 +2207,9 @@ extern struct kobject *fs_kobj;
+@@ -2169,6 +2209,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);
@@ -6763,7 +6748,7 @@ diff -urNp -x '*.orig' linux-4.9/include/linux/fs.h linux-4.9/include/linux/fs.h
/*
* Candidates for mandatory locking have the setgid bit set
* but no group execute bit - an otherwise meaningless combination.
-@@ -2347,7 +2390,7 @@ struct filename {
+@@ -2349,7 +2392,7 @@ struct filename {
const char iname[];
};
@@ -6772,7 +6757,7 @@ diff -urNp -x '*.orig' linux-4.9/include/linux/fs.h linux-4.9/include/linux/fs.h
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,
-@@ -2978,6 +3021,7 @@ extern int dcache_dir_open(struct inode
+@@ -2980,6 +3023,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 *);
@@ -6780,9 +6765,9 @@ diff -urNp -x '*.orig' linux-4.9/include/linux/fs.h linux-4.9/include/linux/fs.h
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 -urNp -x '*.orig' linux-4.9/include/linux/init_task.h linux-4.9/include/linux/init_task.h
---- linux-4.9/include/linux/init_task.h 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/include/linux/init_task.h 2021-02-24 15:47:45.087742783 +0100
+diff -NurpP --minimal linux-4.9.312/include/linux/init_task.h linux-4.9.312-vs2.3.9.13/include/linux/init_task.h
+--- linux-4.9.312/include/linux/init_task.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/include/linux/init_task.h 2018-10-20 04:58:14.000000000 +0000
@@ -271,6 +271,10 @@ extern struct task_group root_task_group
INIT_VTIME(tsk) \
INIT_NUMA_BALANCING(tsk) \
@@ -6794,9 +6779,9 @@ diff -urNp -x '*.orig' linux-4.9/include/linux/init_task.h linux-4.9/include/lin
}
-diff -urNp -x '*.orig' linux-4.9/include/linux/ipc.h linux-4.9/include/linux/ipc.h
---- linux-4.9/include/linux/ipc.h 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/include/linux/ipc.h 2021-02-24 15:47:45.087742783 +0100
+diff -NurpP --minimal linux-4.9.312/include/linux/ipc.h linux-4.9.312-vs2.3.9.13/include/linux/ipc.h
+--- linux-4.9.312/include/linux/ipc.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/include/linux/ipc.h 2018-10-20 04:58:14.000000000 +0000
@@ -16,6 +16,7 @@ struct kern_ipc_perm
key_t key;
kuid_t uid;
@@ -6805,9 +6790,9 @@ diff -urNp -x '*.orig' linux-4.9/include/linux/ipc.h linux-4.9/include/linux/ipc
kuid_t cuid;
kgid_t cgid;
umode_t mode;
-diff -urNp -x '*.orig' linux-4.9/include/linux/memcontrol.h linux-4.9/include/linux/memcontrol.h
---- linux-4.9/include/linux/memcontrol.h 2021-02-24 15:47:32.397345780 +0100
-+++ linux-4.9/include/linux/memcontrol.h 2021-02-24 15:47:45.087742783 +0100
+diff -NurpP --minimal linux-4.9.312/include/linux/memcontrol.h linux-4.9.312-vs2.3.9.13/include/linux/memcontrol.h
+--- linux-4.9.312/include/linux/memcontrol.h 2022-05-07 13:52:40.661485954 +0000
++++ linux-4.9.312-vs2.3.9.13/include/linux/memcontrol.h 2021-07-12 22:41:34.879194693 +0000
@@ -92,6 +92,7 @@ enum mem_cgroup_events_target {
MEM_CGROUP_NTARGETS,
};
@@ -6829,9 +6814,9 @@ diff -urNp -x '*.orig' linux-4.9/include/linux/memcontrol.h linux-4.9/include/li
static inline bool mm_match_cgroup(struct mm_struct *mm,
struct mem_cgroup *memcg)
{
-diff -urNp -x '*.orig' linux-4.9/include/linux/mount.h linux-4.9/include/linux/mount.h
---- linux-4.9/include/linux/mount.h 2021-02-24 15:47:32.400679218 +0100
-+++ linux-4.9/include/linux/mount.h 2021-02-24 15:47:45.087742783 +0100
+diff -NurpP --minimal linux-4.9.312/include/linux/mount.h linux-4.9.312-vs2.3.9.13/include/linux/mount.h
+--- linux-4.9.312/include/linux/mount.h 2022-05-07 13:52:40.753484527 +0000
++++ linux-4.9.312-vs2.3.9.13/include/linux/mount.h 2018-10-20 04:58:14.000000000 +0000
@@ -63,6 +63,9 @@ struct mnt_namespace;
#define MNT_MARKED 0x4000000
#define MNT_UMOUNT 0x8000000
@@ -6842,9 +6827,20 @@ diff -urNp -x '*.orig' linux-4.9/include/linux/mount.h linux-4.9/include/linux/m
struct vfsmount {
struct dentry *mnt_root; /* root of the mounted tree */
struct super_block *mnt_sb; /* pointer to superblock */
-diff -urNp -x '*.orig' linux-4.9/include/linux/net.h linux-4.9/include/linux/net.h
---- linux-4.9/include/linux/net.h 2021-02-24 15:47:32.400679218 +0100
-+++ linux-4.9/include/linux/net.h 2021-02-24 15:47:45.091076220 +0100
+diff -NurpP --minimal linux-4.9.312/include/linux/netdevice.h linux-4.9.312-vs2.3.9.13/include/linux/netdevice.h
+--- linux-4.9.312/include/linux/netdevice.h 2022-05-07 13:52:40.769484279 +0000
++++ linux-4.9.312-vs2.3.9.13/include/linux/netdevice.h 2022-05-07 14:02:11.804591803 +0000
+@@ -2490,6 +2490,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.312/include/linux/net.h linux-4.9.312-vs2.3.9.13/include/linux/net.h
+--- linux-4.9.312/include/linux/net.h 2022-05-07 13:52:40.769484279 +0000
++++ linux-4.9.312-vs2.3.9.13/include/linux/net.h 2021-07-12 22:41:34.949193820 +0000
@@ -44,6 +44,7 @@ struct net;
#define SOCK_NOSPACE 2
#define SOCK_PASSCRED 3
@@ -6853,20 +6849,9 @@ diff -urNp -x '*.orig' linux-4.9/include/linux/net.h linux-4.9/include/linux/net
#ifndef ARCH_HAS_SOCKET_TYPES
/**
-diff -urNp -x '*.orig' linux-4.9/include/linux/netdevice.h linux-4.9/include/linux/netdevice.h
---- linux-4.9/include/linux/netdevice.h 2021-02-24 15:47:33.074033615 +0100
-+++ linux-4.9/include/linux/netdevice.h 2021-02-24 15:47:45.087742783 +0100
-@@ -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 -urNp -x '*.orig' linux-4.9/include/linux/nsproxy.h linux-4.9/include/linux/nsproxy.h
---- linux-4.9/include/linux/nsproxy.h 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/include/linux/nsproxy.h 2021-02-24 15:47:45.091076220 +0100
+diff -NurpP --minimal linux-4.9.312/include/linux/nsproxy.h linux-4.9.312-vs2.3.9.13/include/linux/nsproxy.h
+--- linux-4.9.312/include/linux/nsproxy.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/include/linux/nsproxy.h 2018-10-20 04:58:14.000000000 +0000
@@ -3,6 +3,7 @@
#include <linux/spinlock.h>
@@ -6916,9 +6901,9 @@ diff -urNp -x '*.orig' linux-4.9/include/linux/nsproxy.h linux-4.9/include/linux
}
#endif
-diff -urNp -x '*.orig' linux-4.9/include/linux/pid.h linux-4.9/include/linux/pid.h
---- linux-4.9/include/linux/pid.h 2021-02-24 15:47:32.407346093 +0100
-+++ linux-4.9/include/linux/pid.h 2021-02-24 15:47:45.091076220 +0100
+diff -NurpP --minimal linux-4.9.312/include/linux/pid.h linux-4.9.312-vs2.3.9.13/include/linux/pid.h
+--- linux-4.9.312/include/linux/pid.h 2022-05-07 13:52:40.789483968 +0000
++++ linux-4.9.312-vs2.3.9.13/include/linux/pid.h 2018-10-20 04:58:14.000000000 +0000
@@ -10,7 +10,8 @@ enum pid_type
PIDTYPE_SID,
PIDTYPE_MAX,
@@ -6937,9 +6922,9 @@ diff -urNp -x '*.orig' linux-4.9/include/linux/pid.h linux-4.9/include/linux/pid
pid_t pid_vnr(struct pid *pid);
#define do_each_pid_task(pid, type, task) \
-diff -urNp -x '*.orig' linux-4.9/include/linux/quotaops.h linux-4.9/include/linux/quotaops.h
---- linux-4.9/include/linux/quotaops.h 2021-02-24 15:47:32.410679531 +0100
-+++ linux-4.9/include/linux/quotaops.h 2021-02-24 15:47:45.091076220 +0100
+diff -NurpP --minimal linux-4.9.312/include/linux/quotaops.h linux-4.9.312-vs2.3.9.13/include/linux/quotaops.h
+--- linux-4.9.312/include/linux/quotaops.h 2022-05-07 13:52:40.841483161 +0000
++++ linux-4.9.312-vs2.3.9.13/include/linux/quotaops.h 2019-12-25 15:37:52.158426633 +0000
@@ -8,6 +8,7 @@
#define _LINUX_QUOTAOPS_
@@ -6981,9 +6966,9 @@ diff -urNp -x '*.orig' linux-4.9/include/linux/quotaops.h linux-4.9/include/linu
}
static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
-diff -urNp -x '*.orig' linux-4.9/include/linux/sched.h linux-4.9/include/linux/sched.h
---- linux-4.9/include/linux/sched.h 2021-02-24 15:47:32.414012968 +0100
-+++ linux-4.9/include/linux/sched.h 2021-02-24 15:47:45.091076220 +0100
+diff -NurpP --minimal linux-4.9.312/include/linux/sched.h linux-4.9.312-vs2.3.9.13/include/linux/sched.h
+--- linux-4.9.312/include/linux/sched.h 2022-05-07 13:52:40.873482665 +0000
++++ linux-4.9.312-vs2.3.9.13/include/linux/sched.h 2021-12-20 13:27:57.229772326 +0000
@@ -1719,6 +1719,14 @@ struct task_struct {
#endif
struct seccomp seccomp;
@@ -7021,9 +7006,9 @@ diff -urNp -x '*.orig' linux-4.9/include/linux/sched.h linux-4.9/include/linux/s
}
-diff -urNp -x '*.orig' linux-4.9/include/linux/shmem_fs.h linux-4.9/include/linux/shmem_fs.h
---- linux-4.9/include/linux/shmem_fs.h 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/include/linux/shmem_fs.h 2021-02-24 15:47:45.091076220 +0100
+diff -NurpP --minimal linux-4.9.312/include/linux/shmem_fs.h linux-4.9.312-vs2.3.9.13/include/linux/shmem_fs.h
+--- linux-4.9.312/include/linux/shmem_fs.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/include/linux/shmem_fs.h 2018-10-20 04:58:14.000000000 +0000
@@ -10,6 +10,9 @@
/* inode in-kernel data */
@@ -7034,9 +7019,9 @@ diff -urNp -x '*.orig' linux-4.9/include/linux/shmem_fs.h linux-4.9/include/linu
struct shmem_inode_info {
spinlock_t lock;
unsigned int seals; /* shmem seals */
-diff -urNp -x '*.orig' linux-4.9/include/linux/stat.h linux-4.9/include/linux/stat.h
---- linux-4.9/include/linux/stat.h 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/include/linux/stat.h 2021-02-24 15:47:45.091076220 +0100
+diff -NurpP --minimal linux-4.9.312/include/linux/stat.h linux-4.9.312-vs2.3.9.13/include/linux/stat.h
+--- linux-4.9.312/include/linux/stat.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/include/linux/stat.h 2018-10-20 04:58:14.000000000 +0000
@@ -25,6 +25,7 @@ struct kstat {
unsigned int nlink;
kuid_t uid;
@@ -7045,9 +7030,9 @@ diff -urNp -x '*.orig' linux-4.9/include/linux/stat.h linux-4.9/include/linux/st
dev_t rdev;
loff_t size;
struct timespec atime;
-diff -urNp -x '*.orig' linux-4.9/include/linux/sunrpc/auth.h linux-4.9/include/linux/sunrpc/auth.h
---- linux-4.9/include/linux/sunrpc/auth.h 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/include/linux/sunrpc/auth.h 2021-02-24 15:47:45.091076220 +0100
+diff -NurpP --minimal linux-4.9.312/include/linux/sunrpc/auth.h linux-4.9.312-vs2.3.9.13/include/linux/sunrpc/auth.h
+--- linux-4.9.312/include/linux/sunrpc/auth.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/include/linux/sunrpc/auth.h 2018-10-20 04:58:14.000000000 +0000
@@ -46,6 +46,7 @@ enum {
struct auth_cred {
kuid_t uid;
@@ -7056,9 +7041,9 @@ diff -urNp -x '*.orig' linux-4.9/include/linux/sunrpc/auth.h linux-4.9/include/l
struct group_info *group_info;
const char *principal;
unsigned long ac_flags;
-diff -urNp -x '*.orig' linux-4.9/include/linux/sunrpc/clnt.h linux-4.9/include/linux/sunrpc/clnt.h
---- linux-4.9/include/linux/sunrpc/clnt.h 2021-02-24 15:47:32.417346405 +0100
-+++ linux-4.9/include/linux/sunrpc/clnt.h 2021-02-24 15:47:45.091076220 +0100
+diff -NurpP --minimal linux-4.9.312/include/linux/sunrpc/clnt.h linux-4.9.312-vs2.3.9.13/include/linux/sunrpc/clnt.h
+--- linux-4.9.312/include/linux/sunrpc/clnt.h 2022-05-07 13:52:40.957481361 +0000
++++ linux-4.9.312-vs2.3.9.13/include/linux/sunrpc/clnt.h 2018-10-20 05:55:43.000000000 +0000
@@ -52,7 +52,8 @@ struct rpc_clnt {
cl_discrtry : 1,/* disconnect before retry */
cl_noretranstimeo: 1,/* No retransmit timeouts */
@@ -7069,9 +7054,9 @@ diff -urNp -x '*.orig' linux-4.9/include/linux/sunrpc/clnt.h linux-4.9/include/l
struct rpc_rtt * cl_rtt; /* RTO estimator data */
const struct rpc_timeout *cl_timeout; /* Timeout strategy */
-diff -urNp -x '*.orig' linux-4.9/include/linux/types.h linux-4.9/include/linux/types.h
---- linux-4.9/include/linux/types.h 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/include/linux/types.h 2021-02-24 15:47:45.091076220 +0100
+diff -NurpP --minimal linux-4.9.312/include/linux/types.h linux-4.9.312-vs2.3.9.13/include/linux/types.h
+--- linux-4.9.312/include/linux/types.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/include/linux/types.h 2018-10-20 04:58:14.000000000 +0000
@@ -32,6 +32,9 @@ typedef __kernel_uid32_t uid_t;
typedef __kernel_gid32_t gid_t;
typedef __kernel_uid16_t uid16_t;
@@ -7082,9 +7067,9 @@ diff -urNp -x '*.orig' linux-4.9/include/linux/types.h linux-4.9/include/linux/t
typedef unsigned long uintptr_t;
-diff -urNp -x '*.orig' linux-4.9/include/linux/uidgid.h linux-4.9/include/linux/uidgid.h
---- linux-4.9/include/linux/uidgid.h 2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/include/linux/uidgid.h 2021-02-24 15:47:45.091076220 +0100
+diff -NurpP --minimal linux-4.9.312/include/linux/uidgid.h linux-4.9.312-vs2.3.9.13/include/linux/uidgid.h
+--- linux-4.9.312/include/linux/uidgid.h 2016-12-11 19:17:54.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/include/linux/uidgid.h 2018-10-20 04:58:14.000000000 +0000
@@ -21,13 +21,17 @@ typedef struct {
uid_t val;
} kuid_t;
@@ -7181,9 +7166,9 @@ diff -urNp -x '*.orig' linux-4.9/include/linux/uidgid.h linux-4.9/include/linux/
static inline uid_t from_kuid_munged(struct user_namespace *to, kuid_t kuid)
{
uid_t uid = from_kuid(to, kuid);
-diff -urNp -x '*.orig' linux-4.9/include/linux/vroot.h linux-4.9/include/linux/vroot.h
---- linux-4.9/include/linux/vroot.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.9/include/linux/vroot.h 2021-02-24 15:47:45.091076220 +0100
+diff -NurpP --minimal linux-4.9.312/include/linux/vroot.h linux-4.9.312-vs2.3.9.13/include/linux/vroot.h
+--- linux-4.9.312/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/include/linux/vroot.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,51 @@
+
+/*
@@ -7236,9 +7221,9 @@ diff -urNp -x '*.orig' linux-4.9/include/linux/vroot.h linux-4.9/include/linux/v
+#define VROOT_CLR_DEV 0x5601
+
+#endif /* _LINUX_VROOT_H */
-diff -urNp -x '*.orig' linux-4.9/include/linux/vs_base.h linux-4.9/include/linux/vs_base.h
---- linux-4.9/include/linux/vs_base.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.9/include/linux/vs_base.h 2021-02-24 15:47:45.091076220 +0100
+diff -NurpP --minimal linux-4.9.312/include/linux/vs_base.h linux-4.9.312-vs2.3.9.13/include/linux/vs_base.h
+--- linux-4.9.312/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/include/linux/vs_base.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,10 @@
+#ifndef _VS_BASE_H
+#define _VS_BASE_H
@@ -7250,9 +7235,9 @@ diff -urNp -x '*.orig' linux-4.9/include/linux/vs_base.h linux-4.9/include/linux
+#else
+#warning duplicate inclusion
+#endif
-diff -urNp -x '*.orig' linux-4.9/include/linux/vs_context.h linux-4.9/include/linux/vs_context.h
---- linux-4.9/include/linux/vs_context.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.9/include/linux/vs_context.h 2021-02-24 15:47:45.091076220 +0100
+diff -NurpP --minimal linux-4.9.312/include/linux/vs_context.h linux-4.9.312-vs2.3.9.13/include/linux/vs_context.h
+--- linux-4.9.312/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/include/linux/vs_context.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,242 @@
+#ifndef _VS_CONTEXT_H
+#define _VS_CONTEXT_H
@@ -7496,9 +7481,9 @@ diff -urNp -x '*.orig' linux-4.9/include/linux/vs_context.h linux-4.9/include/li
+#else
+#warning duplicate inclusion
+#endif
-diff -urNp -x '*.orig' linux-4.9/include/linux/vs_cowbl.h linux-4.9/include/linux/vs_cowbl.h
---- linux-4.9/include/linux/vs_cowbl.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.9/include/linux/vs_cowbl.h 2021-02-24 15:47:45.094409658 +0100
+diff -NurpP --minimal linux-4.9.312/include/linux/vs_cowbl.h linux-4.9.312-vs2.3.9.13/include/linux/vs_cowbl.h
+--- linux-4.9.312/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/include/linux/vs_cowbl.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,48 @@
+#ifndef _VS_COWBL_H
+#define _VS_COWBL_H
@@ -7548,9 +7533,9 @@ diff -urNp -x '*.orig' linux-4.9/include/linux/vs_cowbl.h linux-4.9/include/linu
+#else
+#warning duplicate inclusion
+#endif
-diff -urNp -x '*.orig' linux-4.9/include/linux/vs_cvirt.h linux-4.9/include/linux/vs_cvirt.h
---- linux-4.9/include/linux/vs_cvirt.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.9/include/linux/vs_cvirt.h 2021-02-24 15:47:45.094409658 +0100
+diff -NurpP --minimal linux-4.9.312/include/linux/vs_cvirt.h linux-4.9.312-vs2.3.9.13/include/linux/vs_cvirt.h
+--- linux-4.9.312/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/include/linux/vs_cvirt.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,50 @@
+#ifndef _VS_CVIRT_H
+#define _VS_CVIRT_H
@@ -7602,9 +7587,9 @@ diff -urNp -x '*.orig' linux-4.9/include/linux/vs_cvirt.h linux-4.9/include/linu
+#else
+#warning duplicate inclusion
+#endif
-diff -urNp -x '*.orig' linux-4.9/include/linux/vs_device.h linux-4.9/include/linux/vs_device.h
---- linux-4.9/include/linux/vs_device.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.9/include/linux/vs_device.h 2021-02-24 15:47:45.094409658 +0100
+diff -NurpP --minimal linux-4.9.312/include/linux/vs_device.h linux-4.9.312-vs2.3.9.13/include/linux/vs_device.h
+--- linux-4.9.312/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/include/linux/vs_device.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,45 @@
+#ifndef _VS_DEVICE_H
+#define _VS_DEVICE_H
@@ -7651,9 +7636,9 @@ diff -urNp -x '*.orig' linux-4.9/include/linux/vs_device.h linux-4.9/include/lin
+#else
+#warning duplicate inclusion
+#endif
-diff -urNp -x '*.orig' linux-4.9/include/linux/vs_dlimit.h linux-4.9/include/linux/vs_dlimit.h
---- linux-4.9/include/linux/vs_dlimit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.9/include/linux/vs_dlimit.h 2021-02-24 15:47:45.094409658 +0100
+diff -NurpP --minimal linux-4.9.312/include/linux/vs_dlimit.h linux-4.9.312-vs2.3.9.13/include/linux/vs_dlimit.h
+--- linux-4.9.312/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/include/linux/vs_dlimit.h 2018-10-20 04:58:14.000000000 +0000
@@ -0,0 +1,215 @@
+#ifndef _VS_DLIMIT_H
+#define _VS_DLIMIT_H
@@ -7870,3429 +7855,3432 @@ diff -urNp -x '*.orig' linux-4.9/include/linux/vs_dlimit.h linux-4.9/include/lin
+#else
+#warning duplicate inclusion
+#endif
-diff -urNp -x '*.orig' linux-4.9/include/linux/vs_inet.h linux-4.9/include/linux/vs_inet.h
---- linux-4.9/include/linux/vs_inet.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.9/include/linux/vs_inet.h 2021-02-24 15:47:45.097743096 +0100
-@@ -0,0 +1,364 @@
-+#ifndef _VS_INET_H
-+#define _VS_INET_H
+diff -NurpP --minimal linux-4.9.312/include/linux/vserver/base.h linux-4.9.312-vs2.3.9.13/include/linux/vserver/base.h
+--- linux-4.9.312/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.9.312-vs2.3.9.13/include/linux/vserver/base.h 2018-10-20 04:58:14.000000000 +0000
+@@ -0,0 +1,184 @@
++#ifndef _VSERVER_BASE_H
++#define _VSERVER_BASE_H
+
-+#include "vserver/base.h"
-+#include "vserver/network.h"
-+#include "vserver/debug.h"
+
-+#define IPI_LOOPBACK htonl(INADDR_LOOPBACK)
++/* context state changes */
+
-+#define NXAV4(a) NIPQUAD((a)->ip[0]), NIPQUAD((a)->ip[1]), \
-+ NIPQUAD((a)->mask), (a)->type
-+#define NXAV4_FMT "[" NIPQUAD_FMT "-" NIPQUAD_FMT "/" NIPQUAD_FMT ":%04x]"
++enum {
++ VSC_STARTUP = 1,
++ VSC_SHUTDOWN,
+
-+#define NIPQUAD(addr) \
-+ ((unsigned char *)&addr)[0], \
-+ ((unsigned char *)&addr)[1], \
-+ ((unsigned char *)&addr)[2], \
-+ ((unsigned char *)&addr)[3]
++ VSC_NETUP,
++ VSC_NETDOWN,
++};
+
-+#define NIPQUAD_FMT "%u.%u.%u.%u"
+
+
-+static inline
-+int v4_addr_match(struct nx_addr_v4 *nxa, __be32 addr, uint16_t tmask)
-+{
-+ __be32 ip = nxa->ip[0].s_addr;
-+ __be32 mask = nxa->mask.s_addr;
-+ __be32 bcast = ip | ~mask;
-+ int ret = 0;
++#define vx_task_xid(t) ((t)->xid)
+
-+ switch (nxa->type & tmask) {
-+ case NXA_TYPE_MASK:
-+ ret = (ip == (addr & mask));
-+ break;
-+ case NXA_TYPE_ADDR:
-+ ret = 3;
-+ if (addr == ip)
-+ break;
-+ /* fall through to broadcast */
-+ case NXA_MOD_BCAST:
-+ ret = ((tmask & NXA_MOD_BCAST) && (addr == bcast));
-+ break;
-+ case NXA_TYPE_RANGE:
-+ ret = ((nxa->ip[0].s_addr <= addr) &&
-+ (nxa->ip[1].s_addr > addr));
-+ break;
-+ case NXA_TYPE_ANY:
-+ ret = 2;
-+ break;
-+ }
++#define vx_current_xid() vx_task_xid(current)
+
-+ vxdprintk(VXD_CBIT(net, 0),
-+ "v4_addr_match(%p" NXAV4_FMT "," NIPQUAD_FMT ",%04x) = %d",
-+ nxa, NXAV4(nxa), NIPQUAD(addr), tmask, ret);
-+ return ret;
-+}
++#define current_vx_info() (current->vx_info)
+
-+static inline
-+int v4_addr_in_nx_info(struct nx_info *nxi, __be32 addr, uint16_t tmask)
-+{
-+ struct nx_addr_v4 *nxa;
-+ unsigned long irqflags;
-+ int ret = 1;
+
-+ if (!nxi)
-+ goto out;
++#define nx_task_nid(t) ((t)->nid)
+
-+ ret = 2;
-+ /* allow 127.0.0.1 when remapping lback */
-+ if ((tmask & NXA_LOOPBACK) &&
-+ (addr == IPI_LOOPBACK) &&
-+ nx_info_flags(nxi, NXF_LBACK_REMAP, 0))
-+ goto out;
-+ ret = 3;
-+ /* check for lback address */
-+ if ((tmask & NXA_MOD_LBACK) &&
-+ (nxi->v4_lback.s_addr == addr))
-+ goto out;
-+ ret = 4;
-+ /* check for broadcast address */
-+ if ((tmask & NXA_MOD_BCAST) &&
-+ (nxi->v4_bcast.s_addr == addr))
-+ goto out;
-+ ret = 5;
++#define nx_current_nid() nx_task_nid(current)
+
-+ /* check for v4 addresses */
-+ spin_lock_irqsave(&nxi->addr_lock, irqflags);
-+ for (nxa = &nxi->v4; nxa; nxa = nxa->next)
-+ if (v4_addr_match(nxa, addr, tmask))
-+ goto out_unlock;
-+ ret = 0;
-+out_unlock:
-+ spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
-+out:
-+ vxdprintk(VXD_CBIT(net, 0),
-+ "v4_addr_in_nx_info(%p[#%u]," NIPQUAD_FMT ",%04x) = %d",
-+ nxi, nxi ? nxi->nx_id : 0, NIPQUAD(addr), tmask, ret);
-+ return ret;
-+}
++#define current_nx_info() (current->nx_info)
+
-+static inline
-+int v4_nx_addr_match(struct nx_addr_v4 *nxa, struct nx_addr_v4 *addr, uint16_t mask)
-+{
-+ /* FIXME: needs full range checks */
-+ return v4_addr_match(nxa, addr->ip[0].s_addr, mask);
-+}
+
-+static inline
-+int v4_nx_addr_in_nx_info(struct nx_info *nxi, struct nx_addr_v4 *nxa, uint16_t mask)
-+{
-+ struct nx_addr_v4 *ptr;
-+ unsigned long irqflags;
-+ int ret = 1;
++/* generic flag merging */
+
-+ spin_lock_irqsave(&nxi->addr_lock, irqflags);
-+ for (ptr = &nxi->v4; ptr; ptr = ptr->next)
-+ if (v4_nx_addr_match(ptr, nxa, mask))
-+ goto out_unlock;
-+ ret = 0;
-+out_unlock:
-+ spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
-+ return ret;
-+}
++#define vs_check_flags(v, m, f) (((v) & (m)) ^ (f))
+
-+#include <net/inet_sock.h>
++#define vs_mask_flags(v, f, m) (((v) & ~(m)) | ((f) & (m)))
+
-+/*
-+ * Check if a given address matches for a socket
-+ *
-+ * nxi: the socket's nx_info if any
-+ * addr: to be verified address
-+ */
-+static inline
-+int v4_sock_addr_match (
-+ struct nx_info *nxi,
-+ struct inet_sock *inet,
-+ __be32 addr)
-+{
-+ __be32 saddr = inet->inet_rcv_saddr;
-+ __be32 bcast = nxi ? nxi->v4_bcast.s_addr : INADDR_BROADCAST;
++#define vs_mask_mask(v, f, m) (((v) & ~(m)) | ((v) & (f) & (m)))
+
-+ if (addr && (saddr == addr || bcast == addr))
-+ return 1;
-+ if (!saddr)
-+ return v4_addr_in_nx_info(nxi, addr, NXA_MASK_BIND);
-+ return 0;
-+}
++#define vs_check_bit(v, n) ((v) & (1LL << (n)))
+
+
-+/* inet related checks and helpers */
++/* context flags */
+
++#define __vx_flags(v) ((v) ? (v)->vx_flags : 0)
+
-+struct in_ifaddr;
-+struct net_device;
-+struct sock;
++#define vx_current_flags() __vx_flags(current_vx_info())
+
-+#ifdef CONFIG_INET
++#define vx_info_flags(v, m, f) \
++ vs_check_flags(__vx_flags(v), m, f)
+
-+#include <linux/netdevice.h>
-+#include <linux/inetdevice.h>
-+#include <net/inet_sock.h>
-+#include <net/inet_timewait_sock.h>
++#define task_vx_flags(t, m, f) \
++ ((t) && vx_info_flags((t)->vx_info, m, f))
+
++#define vx_flags(m, f) vx_info_flags(current_vx_info(), m, f)
+
-+int dev_in_nx_info(struct net_device *, struct nx_info *);
-+int v4_dev_in_nx_info(struct net_device *, struct nx_info *);
-+int nx_v4_addr_conflict(struct nx_info *, struct nx_info *);
+
++/* context caps */
+
-+/*
-+ * check if address is covered by socket
-+ *
-+ * sk: the socket to check against
-+ * addr: the address in question (must be != 0)
-+ */
++#define __vx_ccaps(v) ((v) ? (v)->vx_ccaps : 0)
+
-+static inline
-+int __v4_addr_match_socket(const struct sock *sk, struct nx_addr_v4 *nxa)
-+{
-+ struct nx_info *nxi = sk->sk_nx_info;
-+ __be32 saddr = sk->sk_rcv_saddr;
++#define vx_current_ccaps() __vx_ccaps(current_vx_info())
+
-+ vxdprintk(VXD_CBIT(net, 5),
-+ "__v4_addr_in_socket(%p," NXAV4_FMT ") %p:" NIPQUAD_FMT " %p;%lx",
-+ sk, NXAV4(nxa), nxi, NIPQUAD(saddr), sk->sk_socket,
-+ (sk->sk_socket?sk->sk_socket->flags:0));
++#define vx_info_ccaps(v, c) (__vx_ccaps(v) & (c))
+
-+ if (saddr) { /* direct address match */
-+ return v4_addr_match(nxa, saddr, -1);
-+ } else if (nxi) { /* match against nx_info */
-+ return v4_nx_addr_in_nx_info(nxi, nxa, -1);
-+ } else { /* unrestricted any socket */
-+ return 1;
-+ }
-+}
++#define vx_ccaps(c) vx_info_ccaps(current_vx_info(), (c))
+
+
+
-+static inline
-+int nx_dev_visible(struct nx_info *nxi, struct net_device *dev)
-+{
-+ vxdprintk(VXD_CBIT(net, 1),
-+ "nx_dev_visible(%p[#%u],%p " VS_Q("%s") ") %d",
-+ nxi, nxi ? nxi->nx_id : 0, dev, dev->name,
-+ nxi ? dev_in_nx_info(dev, nxi) : 0);
++/* network flags */
+
-+ if (!nx_info_flags(nxi, NXF_HIDE_NETIF, 0))
-+ return 1;
-+ if (dev_in_nx_info(dev, nxi))
-+ return 1;
-+ return 0;
-+}
++#define __nx_flags(n) ((n) ? (n)->nx_flags : 0)
+
++#define nx_current_flags() __nx_flags(current_nx_info())
+
-+static inline
-+int v4_ifa_in_nx_info(struct in_ifaddr *ifa, struct nx_info *nxi)
-+{
-+ if (!nxi)
-+ return 1;
-+ if (!ifa)
-+ return 0;
-+ return v4_addr_in_nx_info(nxi, ifa->ifa_local, NXA_MASK_SHOW);
-+}
++#define nx_info_flags(n, m, f) \
++ vs_check_flags(__nx_flags(n), m, f)
+
-+static inline
-+int nx_v4_ifa_visible(struct nx_info *nxi, struct in_ifaddr *ifa)
-+{
-+ vxdprintk(VXD_CBIT(net, 1), "nx_v4_ifa_visible(%p[#%u],%p) %d",
-+ nxi, nxi ? nxi->nx_id : 0, ifa,
-+ nxi ? v4_ifa_in_nx_info(ifa, nxi) : 0);
++#define task_nx_flags(t, m, f) \
++ ((t) && nx_info_flags((t)->nx_info, m, f))
+
-+ if (!nx_info_flags(nxi, NXF_HIDE_NETIF, 0))
-+ return 1;
-+ if (v4_ifa_in_nx_info(ifa, nxi))
-+ return 1;
-+ return 0;
-+}
++#define nx_flags(m, f) nx_info_flags(current_nx_info(), m, f)
+
+
-+struct nx_v4_sock_addr {
-+ __be32 saddr; /* Address used for validation */
-+ __be32 baddr; /* Address used for socket bind */
-+};
++/* network caps */
+
-+static inline
-+int v4_map_sock_addr(struct inet_sock *inet, struct sockaddr_in *addr,
-+ struct nx_v4_sock_addr *nsa)
-+{
-+ struct sock *sk = &inet->sk;
-+ struct nx_info *nxi = sk->sk_nx_info;
-+ __be32 saddr = addr->sin_addr.s_addr;
-+ __be32 baddr = saddr;
++#define __nx_ncaps(n) ((n) ? (n)->nx_ncaps : 0)
+
-+ vxdprintk(VXD_CBIT(net, 3),
-+ "inet_bind(%p)* %p,%p;%lx " NIPQUAD_FMT,
-+ sk, sk->sk_nx_info, sk->sk_socket,
-+ (sk->sk_socket ? sk->sk_socket->flags : 0),
-+ NIPQUAD(saddr));
++#define nx_current_ncaps() __nx_ncaps(current_nx_info())
+
-+ if (nxi) {
-+ if (saddr == INADDR_ANY) {
-+ if (nx_info_flags(nxi, NXF_SINGLE_IP, 0))
-+ baddr = nxi->v4.ip[0].s_addr;
-+ } else if (saddr == IPI_LOOPBACK) {
-+ if (nx_info_flags(nxi, NXF_LBACK_REMAP, 0))
-+ baddr = nxi->v4_lback.s_addr;
-+ } else if (!ipv4_is_multicast(saddr) ||
-+ !nx_info_ncaps(nxi, NXC_MULTICAST)) {
-+ /* normal address bind */
-+ if (!v4_addr_in_nx_info(nxi, saddr, NXA_MASK_BIND))
-+ return -EADDRNOTAVAIL;
-+ }
-+ }
++#define nx_info_ncaps(n, c) (__nx_ncaps(n) & (c))
+
-+ vxdprintk(VXD_CBIT(net, 3),
-+ "inet_bind(%p) " NIPQUAD_FMT ", " NIPQUAD_FMT,
-+ sk, NIPQUAD(saddr), NIPQUAD(baddr));
++#define nx_ncaps(c) nx_info_ncaps(current_nx_info(), c)
+
-+ nsa->saddr = saddr;
-+ nsa->baddr = baddr;
-+ return 0;
-+}
+
-+static inline
-+void v4_set_sock_addr(struct inet_sock *inet, struct nx_v4_sock_addr *nsa)
-+{
-+ inet->inet_saddr = nsa->baddr;
-+ inet->inet_rcv_saddr = nsa->baddr;
-+}
++/* context mask capabilities */
+
++#define __vx_mcaps(v) ((v) ? (v)->vx_ccaps >> 32UL : ~0 )
+
-+/*
-+ * helper to simplify inet_lookup_listener
-+ *
-+ * nxi: the socket's nx_info if any
-+ * addr: to be verified address
-+ * saddr: socket address
-+ */
-+static inline int v4_inet_addr_match (
-+ struct nx_info *nxi,
-+ __be32 addr,
-+ __be32 saddr)
-+{
-+ if (addr && (saddr == addr))
-+ return 1;
-+ if (!saddr)
-+ return nxi ? v4_addr_in_nx_info(nxi, addr, NXA_MASK_BIND) : 1;
-+ return 0;
-+}
++#define vx_info_mcaps(v, c) (__vx_mcaps(v) & (c))
+
-+static inline __be32 nx_map_sock_lback(struct nx_info *nxi, __be32 addr)
-+{
-+ if (nx_info_flags(nxi, NXF_HIDE_LBACK, 0) &&
-+ (addr == nxi->v4_lback.s_addr))
-+ return IPI_LOOPBACK;
-+ return addr;
-+}
++#define vx_mcaps(c) vx_info_mcaps(current_vx_info(), c)
+
-+static inline
-+int nx_info_has_v4(struct nx_info *nxi)
-+{
-+ if (!nxi)
-+ return 1;
-+ if (NX_IPV4(nxi))
-+ return 1;
-+ if (nx_info_flags(nxi, NXF_LBACK_REMAP, 0))
-+ return 1;
-+ return 0;
-+}
+
-+#else /* CONFIG_INET */
++/* context bcap mask */
+
-+static inline
-+int nx_dev_visible(struct nx_info *n, struct net_device *d)
-+{
-+ return 1;
-+}
++#define __vx_bcaps(v) ((v)->vx_bcaps)
+
-+static inline
-+int nx_v4_addr_conflict(struct nx_info *n, uint32_t a, const struct sock *s)
-+{
-+ return 1;
-+}
++#define vx_current_bcaps() __vx_bcaps(current_vx_info())
+
-+static inline
-+int v4_ifa_in_nx_info(struct in_ifaddr *a, struct nx_info *n)
-+{
-+ return 1;
-+}
+
-+static inline
-+int nx_info_has_v4(struct nx_info *nxi)
-+{
-+ return 0;
-+}
++/* mask given bcaps */
+
-+#endif /* CONFIG_INET */
++#define vx_info_mbcaps(v, c) ((v) ? cap_intersect(__vx_bcaps(v), c) : c)
+
-+#define current_nx_info_has_v4() \
-+ nx_info_has_v4(current_nx_info())
++#define vx_mbcaps(c) vx_info_mbcaps(current_vx_info(), c)
+
-+#else
-+// #warning duplicate inclusion
-+#endif
-diff -urNp -x '*.orig' linux-4.9/include/linux/vs_inet6.h linux-4.9/include/linux/vs_inet6.h
---- linux-4.9/include/linux/vs_inet6.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.9/include/linux/vs_inet6.h 2021-02-24 15:47:45.097743096 +0100
-@@ -0,0 +1,264 @@
-+#ifndef _VS_INET6_H
-+#define _VS_INET6_H
+
-+#include "vserver/base.h"
-+#include "vserver/network.h"
-+#include "vserver/debug.h"
++/* masked cap_bset */
+
-+#include <net/ipv6.h>
++#define vx_info_cap_bset(v) vx_info_mbcaps(v, current->cap_bset)
+
-+#define NXAV6(a) &(a)->ip, &(a)->mask, (a)->prefix, (a)->type
-+#define NXAV6_FMT "[%pI6/%pI6/%d:%04x]"
++#define vx_current_cap_bset() vx_info_cap_bset(current_vx_info())
+
++#if 0
<Skipped 9504 lines>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/62fbe409cbd991b27b68173cd03ed14c7842184a
More information about the pld-cvs-commit
mailing list