[packages/kernel/LINUX_4_4] - up to 4.4.211
arekm
arekm at pld-linux.org
Thu Jan 23 13:11:22 CET 2020
commit 3cc86a71a866b530ffd9f214b3fc18f61a24ea90
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Thu Jan 23 13:11:13 2020 +0100
- up to 4.4.211
kernel-vserver-2.3.patch | 9088 +++++++++++++++++++++++-----------------------
kernel.spec | 8 +-
2 files changed, 4539 insertions(+), 4557 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index ad5671f3..b8406085 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -72,7 +72,7 @@
%define rel 1
%define basever 4.4
-%define postver .210
+%define postver .211
# define this to '-%{basever}' for longterm branch
%define versuffix -%{basever}
@@ -124,7 +124,7 @@ Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz
# Source0-md5: 9a78fa2eb6c68ca5a40ed5af08142599
%if "%{postver}" != ".0"
Patch0: http://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
-# Patch0-md5: 2dae120fdcbfc83c4d9215ea460c6391
+# Patch0-md5: 1c2b9b8e5bf579db8ef193d5906060e3
%endif
Source1: kernel.sysconfig
@@ -192,8 +192,8 @@ Patch59: kernel-rndis_host-wm5.patch
# http://patches.aircrack-ng.org/hostap-kernel-2.6.18.patch
Patch85: kernel-hostap.patch
-%define vserver_patch 4.4.161-vs2.3.9.8
-# http://vserver.13thfloor.at/Experimental/patch-4.4.161-vs2.3.9.8.diff
+%define vserver_patch 4.4.197-vs2.3.9.8
+# http://vserver.13thfloor.at/Experimental/patch-4.4.197-vs2.3.9.8.diff
# note there are additional patches from above url:
# - *fix* are real fixes (we want these)
# - *feat* are new features/tests (we don't want these)
diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index cf828c8b..40e2b790 100644
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -1,164 +1,6 @@
-diff -NurpP --minimal linux-4.4.161/Documentation/vserver/debug.txt linux-4.4.161-vs2.3.9.8/Documentation/vserver/debug.txt
---- linux-4.4.161/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/Documentation/vserver/debug.txt 2018-10-20 04:57:21.000000000 +0000
-@@ -0,0 +1,154 @@
-+
-+debug_cvirt:
-+
-+ 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.4.161/arch/alpha/Kconfig linux-4.4.161-vs2.3.9.8/arch/alpha/Kconfig
---- linux-4.4.161/arch/alpha/Kconfig 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/arch/alpha/Kconfig 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/arch/alpha/Kconfig linux-4.4.197-vs2.3.9.8/arch/alpha/Kconfig
+--- linux-4.4.197/arch/alpha/Kconfig 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/arch/alpha/Kconfig 2018-10-20 04:57:21.000000000 +0000
@@ -745,6 +745,8 @@ config DUMMY_CONSOLE
depends on VGA_HOSE
default y
@@ -168,9 +10,9 @@ diff -NurpP --minimal linux-4.4.161/arch/alpha/Kconfig linux-4.4.161-vs2.3.9.8/a
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.4.161/arch/alpha/kernel/systbls.S linux-4.4.161-vs2.3.9.8/arch/alpha/kernel/systbls.S
---- linux-4.4.161/arch/alpha/kernel/systbls.S 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/arch/alpha/kernel/systbls.S 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/arch/alpha/kernel/systbls.S linux-4.4.197-vs2.3.9.8/arch/alpha/kernel/systbls.S
+--- linux-4.4.197/arch/alpha/kernel/systbls.S 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/arch/alpha/kernel/systbls.S 2018-10-20 04:57:21.000000000 +0000
@@ -446,7 +446,7 @@ sys_call_table:
.quad sys_stat64 /* 425 */
.quad sys_lstat64
@@ -180,9 +22,9 @@ diff -NurpP --minimal linux-4.4.161/arch/alpha/kernel/systbls.S linux-4.4.161-vs
.quad sys_ni_syscall /* sys_mbind */
.quad sys_ni_syscall /* sys_get_mempolicy */
.quad sys_ni_syscall /* sys_set_mempolicy */
-diff -NurpP --minimal linux-4.4.161/arch/alpha/kernel/traps.c linux-4.4.161-vs2.3.9.8/arch/alpha/kernel/traps.c
---- linux-4.4.161/arch/alpha/kernel/traps.c 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/arch/alpha/kernel/traps.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/arch/alpha/kernel/traps.c linux-4.4.197-vs2.3.9.8/arch/alpha/kernel/traps.c
+--- linux-4.4.197/arch/alpha/kernel/traps.c 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/arch/alpha/kernel/traps.c 2018-10-20 04:57:21.000000000 +0000
@@ -174,7 +174,8 @@ die_if_kernel(char * str, struct pt_regs
#ifdef CONFIG_SMP
printk("CPU %d ", hard_smp_processor_id());
@@ -193,10 +35,10 @@ diff -NurpP --minimal linux-4.4.161/arch/alpha/kernel/traps.c linux-4.4.161-vs2.
dik_show_regs(regs, r9_15);
add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE);
dik_show_trace((unsigned long *)(regs+1));
-diff -NurpP --minimal linux-4.4.161/arch/arm/Kconfig linux-4.4.161-vs2.3.9.8/arch/arm/Kconfig
---- linux-4.4.161/arch/arm/Kconfig 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/arch/arm/Kconfig 2018-10-20 04:57:21.000000000 +0000
-@@ -2159,6 +2159,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-4.4.197/arch/arm/Kconfig linux-4.4.197-vs2.3.9.8/arch/arm/Kconfig
+--- linux-4.4.197/arch/arm/Kconfig 2019-10-22 12:33:36.159591972 +0000
++++ linux-4.4.197-vs2.3.9.8/arch/arm/Kconfig 2019-10-05 14:35:09.563172476 +0000
+@@ -2160,6 +2160,8 @@ source "fs/Kconfig"
source "arch/arm/Kconfig.debug"
@@ -205,9 +47,9 @@ diff -NurpP --minimal linux-4.4.161/arch/arm/Kconfig linux-4.4.161-vs2.3.9.8/arc
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.4.161/arch/arm/kernel/calls.S linux-4.4.161-vs2.3.9.8/arch/arm/kernel/calls.S
---- linux-4.4.161/arch/arm/kernel/calls.S 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/arch/arm/kernel/calls.S 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/arch/arm/kernel/calls.S linux-4.4.197-vs2.3.9.8/arch/arm/kernel/calls.S
+--- linux-4.4.197/arch/arm/kernel/calls.S 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/arch/arm/kernel/calls.S 2018-10-20 04:57:21.000000000 +0000
@@ -322,7 +322,7 @@
/* 310 */ CALL(sys_request_key)
CALL(sys_keyctl)
@@ -217,9 +59,9 @@ diff -NurpP --minimal linux-4.4.161/arch/arm/kernel/calls.S linux-4.4.161-vs2.3.
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-4.4.161/arch/arm/kernel/traps.c linux-4.4.161-vs2.3.9.8/arch/arm/kernel/traps.c
---- linux-4.4.161/arch/arm/kernel/traps.c 2018-10-20 02:34:24.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/arch/arm/kernel/traps.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/arch/arm/kernel/traps.c linux-4.4.197-vs2.3.9.8/arch/arm/kernel/traps.c
+--- linux-4.4.197/arch/arm/kernel/traps.c 2019-10-22 12:33:37.079577261 +0000
++++ linux-4.4.197-vs2.3.9.8/arch/arm/kernel/traps.c 2018-10-20 04:57:21.000000000 +0000
@@ -259,8 +259,8 @@ static int __die(const char *str, int er
print_modules();
@@ -231,9 +73,9 @@ diff -NurpP --minimal linux-4.4.161/arch/arm/kernel/traps.c linux-4.4.161-vs2.3.
if (!user_mode(regs) || in_interrupt()) {
dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-4.4.161/arch/cris/Kconfig linux-4.4.161-vs2.3.9.8/arch/cris/Kconfig
---- linux-4.4.161/arch/cris/Kconfig 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/arch/cris/Kconfig 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/arch/cris/Kconfig linux-4.4.197-vs2.3.9.8/arch/cris/Kconfig
+--- linux-4.4.197/arch/cris/Kconfig 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/arch/cris/Kconfig 2018-10-20 04:57:21.000000000 +0000
@@ -581,6 +581,8 @@ source "fs/Kconfig"
source "arch/cris/Kconfig.debug"
@@ -243,9 +85,9 @@ diff -NurpP --minimal linux-4.4.161/arch/cris/Kconfig linux-4.4.161-vs2.3.9.8/ar
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.4.161/arch/ia64/Kconfig linux-4.4.161-vs2.3.9.8/arch/ia64/Kconfig
---- linux-4.4.161/arch/ia64/Kconfig 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/arch/ia64/Kconfig 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/arch/ia64/Kconfig linux-4.4.197-vs2.3.9.8/arch/ia64/Kconfig
+--- linux-4.4.197/arch/ia64/Kconfig 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/arch/ia64/Kconfig 2018-10-20 04:57:21.000000000 +0000
@@ -606,6 +606,8 @@ source "fs/Kconfig"
source "arch/ia64/Kconfig.debug"
@@ -255,9 +97,9 @@ diff -NurpP --minimal linux-4.4.161/arch/ia64/Kconfig linux-4.4.161-vs2.3.9.8/ar
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.4.161/arch/ia64/kernel/entry.S linux-4.4.161-vs2.3.9.8/arch/ia64/kernel/entry.S
---- linux-4.4.161/arch/ia64/kernel/entry.S 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/arch/ia64/kernel/entry.S 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/arch/ia64/kernel/entry.S linux-4.4.197-vs2.3.9.8/arch/ia64/kernel/entry.S
+--- linux-4.4.197/arch/ia64/kernel/entry.S 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/arch/ia64/kernel/entry.S 2018-10-20 04:57:21.000000000 +0000
@@ -1694,7 +1694,7 @@ sys_call_table:
data8 sys_mq_notify
data8 sys_mq_getsetattr
@@ -267,9 +109,9 @@ diff -NurpP --minimal linux-4.4.161/arch/ia64/kernel/entry.S linux-4.4.161-vs2.3
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -NurpP --minimal linux-4.4.161/arch/ia64/kernel/ptrace.c linux-4.4.161-vs2.3.9.8/arch/ia64/kernel/ptrace.c
---- linux-4.4.161/arch/ia64/kernel/ptrace.c 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/arch/ia64/kernel/ptrace.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/arch/ia64/kernel/ptrace.c linux-4.4.197-vs2.3.9.8/arch/ia64/kernel/ptrace.c
+--- linux-4.4.197/arch/ia64/kernel/ptrace.c 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/arch/ia64/kernel/ptrace.c 2018-10-20 04:57:21.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/regset.h>
#include <linux/elf.h>
@@ -278,9 +120,9 @@ diff -NurpP --minimal linux-4.4.161/arch/ia64/kernel/ptrace.c linux-4.4.161-vs2.
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-4.4.161/arch/ia64/kernel/traps.c linux-4.4.161-vs2.3.9.8/arch/ia64/kernel/traps.c
---- linux-4.4.161/arch/ia64/kernel/traps.c 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/arch/ia64/kernel/traps.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/arch/ia64/kernel/traps.c linux-4.4.197-vs2.3.9.8/arch/ia64/kernel/traps.c
+--- linux-4.4.197/arch/ia64/kernel/traps.c 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/arch/ia64/kernel/traps.c 2018-10-20 04:57:21.000000000 +0000
@@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re
put_cpu();
@@ -305,9 +147,9 @@ diff -NurpP --minimal linux-4.4.161/arch/ia64/kernel/traps.c linux-4.4.161-vs2.3
}
}
}
-diff -NurpP --minimal linux-4.4.161/arch/m32r/kernel/traps.c linux-4.4.161-vs2.3.9.8/arch/m32r/kernel/traps.c
---- linux-4.4.161/arch/m32r/kernel/traps.c 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/arch/m32r/kernel/traps.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/arch/m32r/kernel/traps.c linux-4.4.197-vs2.3.9.8/arch/m32r/kernel/traps.c
+--- linux-4.4.197/arch/m32r/kernel/traps.c 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/arch/m32r/kernel/traps.c 2018-10-20 04:57:21.000000000 +0000
@@ -184,8 +184,9 @@ static void show_registers(struct pt_reg
} else {
printk("SPI: %08lx\n", sp);
@@ -320,9 +162,9 @@ diff -NurpP --minimal linux-4.4.161/arch/m32r/kernel/traps.c linux-4.4.161-vs2.3
/*
* When in-kernel, we also print out the stack and code at the
-diff -NurpP --minimal linux-4.4.161/arch/m68k/Kconfig linux-4.4.161-vs2.3.9.8/arch/m68k/Kconfig
---- linux-4.4.161/arch/m68k/Kconfig 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/arch/m68k/Kconfig 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/arch/m68k/Kconfig linux-4.4.197-vs2.3.9.8/arch/m68k/Kconfig
+--- linux-4.4.197/arch/m68k/Kconfig 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/arch/m68k/Kconfig 2018-10-20 04:57:21.000000000 +0000
@@ -164,6 +164,8 @@ source "fs/Kconfig"
source "arch/m68k/Kconfig.debug"
@@ -332,10 +174,10 @@ diff -NurpP --minimal linux-4.4.161/arch/m68k/Kconfig linux-4.4.161-vs2.3.9.8/ar
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.4.161/arch/mips/Kconfig linux-4.4.161-vs2.3.9.8/arch/mips/Kconfig
---- linux-4.4.161/arch/mips/Kconfig 2018-10-20 02:34:25.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/arch/mips/Kconfig 2018-10-20 04:57:21.000000000 +0000
-@@ -3026,6 +3026,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-4.4.197/arch/mips/Kconfig linux-4.4.197-vs2.3.9.8/arch/mips/Kconfig
+--- linux-4.4.197/arch/mips/Kconfig 2019-10-22 12:33:39.449539373 +0000
++++ linux-4.4.197-vs2.3.9.8/arch/mips/Kconfig 2019-10-05 14:35:11.293145033 +0000
+@@ -3028,6 +3028,8 @@ source "fs/Kconfig"
source "arch/mips/Kconfig.debug"
@@ -344,9 +186,9 @@ diff -NurpP --minimal linux-4.4.161/arch/mips/Kconfig linux-4.4.161-vs2.3.9.8/ar
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.4.161/arch/mips/kernel/ptrace.c linux-4.4.161-vs2.3.9.8/arch/mips/kernel/ptrace.c
---- linux-4.4.161/arch/mips/kernel/ptrace.c 2018-10-20 02:34:25.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/arch/mips/kernel/ptrace.c 2018-10-20 05:50:17.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/arch/mips/kernel/ptrace.c linux-4.4.197-vs2.3.9.8/arch/mips/kernel/ptrace.c
+--- linux-4.4.197/arch/mips/kernel/ptrace.c 2019-10-22 12:33:40.109528821 +0000
++++ linux-4.4.197-vs2.3.9.8/arch/mips/kernel/ptrace.c 2019-02-22 08:20:24.721111089 +0000
@@ -30,6 +30,7 @@
#include <linux/audit.h>
#include <linux/seccomp.h>
@@ -355,7 +197,7 @@ diff -NurpP --minimal linux-4.4.161/arch/mips/kernel/ptrace.c linux-4.4.161-vs2.
#include <asm/byteorder.h>
#include <asm/cpu.h>
-@@ -801,6 +802,9 @@ long arch_ptrace(struct task_struct *chi
+@@ -800,6 +801,9 @@ long arch_ptrace(struct task_struct *chi
void __user *datavp = (void __user *) data;
unsigned long __user *datalp = (void __user *) data;
@@ -365,9 +207,9 @@ diff -NurpP --minimal linux-4.4.161/arch/mips/kernel/ptrace.c linux-4.4.161-vs2.
switch (request) {
/* when I and D space are separate, these will need to be fixed. */
case PTRACE_PEEKTEXT: /* read word at location addr. */
-diff -NurpP --minimal linux-4.4.161/arch/mips/kernel/scall32-o32.S linux-4.4.161-vs2.3.9.8/arch/mips/kernel/scall32-o32.S
---- linux-4.4.161/arch/mips/kernel/scall32-o32.S 2018-10-20 02:34:25.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/arch/mips/kernel/scall32-o32.S 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/arch/mips/kernel/scall32-o32.S linux-4.4.197-vs2.3.9.8/arch/mips/kernel/scall32-o32.S
+--- linux-4.4.197/arch/mips/kernel/scall32-o32.S 2019-10-22 12:33:40.109528821 +0000
++++ linux-4.4.197-vs2.3.9.8/arch/mips/kernel/scall32-o32.S 2018-10-20 04:57:21.000000000 +0000
@@ -512,7 +512,7 @@ EXPORT(sys_call_table)
PTR sys_mq_timedreceive
PTR sys_mq_notify /* 4275 */
@@ -377,9 +219,9 @@ diff -NurpP --minimal linux-4.4.161/arch/mips/kernel/scall32-o32.S linux-4.4.161
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-diff -NurpP --minimal linux-4.4.161/arch/mips/kernel/scall64-64.S linux-4.4.161-vs2.3.9.8/arch/mips/kernel/scall64-64.S
---- linux-4.4.161/arch/mips/kernel/scall64-64.S 2018-10-20 02:34:25.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/arch/mips/kernel/scall64-64.S 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/arch/mips/kernel/scall64-64.S linux-4.4.197-vs2.3.9.8/arch/mips/kernel/scall64-64.S
+--- linux-4.4.197/arch/mips/kernel/scall64-64.S 2019-10-22 12:33:40.109528821 +0000
++++ linux-4.4.197-vs2.3.9.8/arch/mips/kernel/scall64-64.S 2018-10-20 04:57:21.000000000 +0000
@@ -349,7 +349,7 @@ EXPORT(sys_call_table)
PTR sys_mq_timedreceive
PTR sys_mq_notify
@@ -389,9 +231,9 @@ diff -NurpP --minimal linux-4.4.161/arch/mips/kernel/scall64-64.S linux-4.4.161-
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-4.4.161/arch/mips/kernel/scall64-n32.S linux-4.4.161-vs2.3.9.8/arch/mips/kernel/scall64-n32.S
---- linux-4.4.161/arch/mips/kernel/scall64-n32.S 2018-10-20 02:34:25.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/arch/mips/kernel/scall64-n32.S 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/arch/mips/kernel/scall64-n32.S linux-4.4.197-vs2.3.9.8/arch/mips/kernel/scall64-n32.S
+--- linux-4.4.197/arch/mips/kernel/scall64-n32.S 2019-10-22 12:33:40.129528501 +0000
++++ linux-4.4.197-vs2.3.9.8/arch/mips/kernel/scall64-n32.S 2018-10-20 04:57:21.000000000 +0000
@@ -339,7 +339,7 @@ EXPORT(sysn32_call_table)
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify
@@ -401,9 +243,9 @@ diff -NurpP --minimal linux-4.4.161/arch/mips/kernel/scall64-n32.S linux-4.4.161
PTR compat_sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-4.4.161/arch/mips/kernel/scall64-o32.S linux-4.4.161-vs2.3.9.8/arch/mips/kernel/scall64-o32.S
---- linux-4.4.161/arch/mips/kernel/scall64-o32.S 2018-10-20 02:34:25.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/arch/mips/kernel/scall64-o32.S 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/arch/mips/kernel/scall64-o32.S linux-4.4.197-vs2.3.9.8/arch/mips/kernel/scall64-o32.S
+--- linux-4.4.197/arch/mips/kernel/scall64-o32.S 2019-10-22 12:33:40.129528501 +0000
++++ linux-4.4.197-vs2.3.9.8/arch/mips/kernel/scall64-o32.S 2019-10-05 14:35:11.423142972 +0000
@@ -495,7 +495,7 @@ EXPORT(sys32_call_table)
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify /* 4275 */
@@ -413,9 +255,9 @@ diff -NurpP --minimal linux-4.4.161/arch/mips/kernel/scall64-o32.S linux-4.4.161
PTR compat_sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-diff -NurpP --minimal linux-4.4.161/arch/mips/kernel/traps.c linux-4.4.161-vs2.3.9.8/arch/mips/kernel/traps.c
---- linux-4.4.161/arch/mips/kernel/traps.c 2018-10-20 02:34:25.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/arch/mips/kernel/traps.c 2018-10-20 05:50:17.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/arch/mips/kernel/traps.c linux-4.4.197-vs2.3.9.8/arch/mips/kernel/traps.c
+--- linux-4.4.197/arch/mips/kernel/traps.c 2019-10-22 12:33:40.129528501 +0000
++++ linux-4.4.197-vs2.3.9.8/arch/mips/kernel/traps.c 2019-02-22 08:20:24.761110407 +0000
@@ -354,9 +354,10 @@ void show_registers(struct pt_regs *regs
__show_regs(regs);
@@ -430,9 +272,9 @@ diff -NurpP --minimal linux-4.4.161/arch/mips/kernel/traps.c linux-4.4.161-vs2.3
if (cpu_has_userlocal) {
unsigned long tls;
-diff -NurpP --minimal linux-4.4.161/arch/parisc/Kconfig linux-4.4.161-vs2.3.9.8/arch/parisc/Kconfig
---- linux-4.4.161/arch/parisc/Kconfig 2018-10-20 02:34:25.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/arch/parisc/Kconfig 2018-10-20 05:50:17.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/arch/parisc/Kconfig linux-4.4.197-vs2.3.9.8/arch/parisc/Kconfig
+--- linux-4.4.197/arch/parisc/Kconfig 2019-10-22 12:33:40.439523543 +0000
++++ linux-4.4.197-vs2.3.9.8/arch/parisc/Kconfig 2018-10-20 05:50:17.000000000 +0000
@@ -341,6 +341,8 @@ config SECCOMP
If unsure, say Y. Only embedded should say N here.
@@ -442,9 +284,9 @@ diff -NurpP --minimal linux-4.4.161/arch/parisc/Kconfig linux-4.4.161-vs2.3.9.8/
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.4.161/arch/parisc/kernel/syscall_table.S linux-4.4.161-vs2.3.9.8/arch/parisc/kernel/syscall_table.S
---- linux-4.4.161/arch/parisc/kernel/syscall_table.S 2018-10-20 02:34:25.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/arch/parisc/kernel/syscall_table.S 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/arch/parisc/kernel/syscall_table.S linux-4.4.197-vs2.3.9.8/arch/parisc/kernel/syscall_table.S
+--- linux-4.4.197/arch/parisc/kernel/syscall_table.S 2019-10-22 12:33:40.519522264 +0000
++++ linux-4.4.197-vs2.3.9.8/arch/parisc/kernel/syscall_table.S 2018-10-20 04:57:21.000000000 +0000
@@ -358,7 +358,7 @@
ENTRY_COMP(mbind) /* 260 */
ENTRY_COMP(get_mempolicy)
@@ -454,9 +296,9 @@ diff -NurpP --minimal linux-4.4.161/arch/parisc/kernel/syscall_table.S linux-4.4
ENTRY_SAME(add_key)
ENTRY_SAME(request_key) /* 265 */
ENTRY_COMP(keyctl)
-diff -NurpP --minimal linux-4.4.161/arch/parisc/kernel/traps.c linux-4.4.161-vs2.3.9.8/arch/parisc/kernel/traps.c
---- linux-4.4.161/arch/parisc/kernel/traps.c 2018-10-20 02:34:25.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/arch/parisc/kernel/traps.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/arch/parisc/kernel/traps.c linux-4.4.197-vs2.3.9.8/arch/parisc/kernel/traps.c
+--- linux-4.4.197/arch/parisc/kernel/traps.c 2019-10-22 12:33:40.519522264 +0000
++++ linux-4.4.197-vs2.3.9.8/arch/parisc/kernel/traps.c 2019-02-22 08:20:24.921107689 +0000
@@ -235,8 +235,9 @@ void die_if_kernel(char *str, struct pt_
return; /* STFU */
@@ -480,21 +322,9 @@ diff -NurpP --minimal linux-4.4.161/arch/parisc/kernel/traps.c linux-4.4.161-vs2
/* Wot's wrong wif bein' racy? */
if (current->thread.flags & PARISC_KERNEL_DEATH) {
-diff -NurpP --minimal linux-4.4.161/arch/powerpc/Kconfig linux-4.4.161-vs2.3.9.8/arch/powerpc/Kconfig
---- linux-4.4.161/arch/powerpc/Kconfig 2018-10-20 02:34:25.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/arch/powerpc/Kconfig 2018-10-20 04:57:21.000000000 +0000
-@@ -1081,6 +1081,8 @@ source "lib/Kconfig"
-
- source "arch/powerpc/Kconfig.debug"
-
-+source "kernel/vserver/Kconfig"
-+
- source "security/Kconfig"
-
- source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.4.161/arch/powerpc/include/uapi/asm/unistd.h linux-4.4.161-vs2.3.9.8/arch/powerpc/include/uapi/asm/unistd.h
---- linux-4.4.161/arch/powerpc/include/uapi/asm/unistd.h 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/arch/powerpc/include/uapi/asm/unistd.h 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/arch/powerpc/include/uapi/asm/unistd.h linux-4.4.197-vs2.3.9.8/arch/powerpc/include/uapi/asm/unistd.h
+--- linux-4.4.197/arch/powerpc/include/uapi/asm/unistd.h 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/arch/powerpc/include/uapi/asm/unistd.h 2018-10-20 04:57:21.000000000 +0000
@@ -275,7 +275,7 @@
#endif
#define __NR_rtas 255
@@ -504,9 +334,21 @@ diff -NurpP --minimal linux-4.4.161/arch/powerpc/include/uapi/asm/unistd.h linux
#define __NR_migrate_pages 258
#define __NR_mbind 259
#define __NR_get_mempolicy 260
-diff -NurpP --minimal linux-4.4.161/arch/powerpc/kernel/traps.c linux-4.4.161-vs2.3.9.8/arch/powerpc/kernel/traps.c
---- linux-4.4.161/arch/powerpc/kernel/traps.c 2018-10-20 02:34:25.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/arch/powerpc/kernel/traps.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/arch/powerpc/Kconfig linux-4.4.197-vs2.3.9.8/arch/powerpc/Kconfig
+--- linux-4.4.197/arch/powerpc/Kconfig 2019-10-22 12:33:40.549521785 +0000
++++ linux-4.4.197-vs2.3.9.8/arch/powerpc/Kconfig 2019-10-05 14:35:12.013133612 +0000
+@@ -1086,6 +1086,8 @@ source "lib/Kconfig"
+
+ source "arch/powerpc/Kconfig.debug"
+
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-4.4.197/arch/powerpc/kernel/traps.c linux-4.4.197-vs2.3.9.8/arch/powerpc/kernel/traps.c
+--- linux-4.4.197/arch/powerpc/kernel/traps.c 2019-10-22 12:33:40.869516670 +0000
++++ linux-4.4.197-vs2.3.9.8/arch/powerpc/kernel/traps.c 2018-10-20 04:57:21.000000000 +0000
@@ -1315,8 +1315,9 @@ void nonrecoverable_exception(struct pt_
void trace_syscall(struct pt_regs *regs)
@@ -519,21 +361,9 @@ diff -NurpP --minimal linux-4.4.161/arch/powerpc/kernel/traps.c linux-4.4.161-vs
regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted());
}
-diff -NurpP --minimal linux-4.4.161/arch/s390/Kconfig linux-4.4.161-vs2.3.9.8/arch/s390/Kconfig
---- linux-4.4.161/arch/s390/Kconfig 2018-10-20 02:34:25.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/arch/s390/Kconfig 2018-10-20 04:57:21.000000000 +0000
-@@ -776,6 +776,8 @@ source "fs/Kconfig"
-
- source "arch/s390/Kconfig.debug"
-
-+source "kernel/vserver/Kconfig"
-+
- source "security/Kconfig"
-
- source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.4.161/arch/s390/include/asm/tlb.h linux-4.4.161-vs2.3.9.8/arch/s390/include/asm/tlb.h
---- linux-4.4.161/arch/s390/include/asm/tlb.h 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/arch/s390/include/asm/tlb.h 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/arch/s390/include/asm/tlb.h linux-4.4.197-vs2.3.9.8/arch/s390/include/asm/tlb.h
+--- linux-4.4.197/arch/s390/include/asm/tlb.h 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/arch/s390/include/asm/tlb.h 2018-10-20 04:57:21.000000000 +0000
@@ -24,6 +24,7 @@
#include <linux/mm.h>
#include <linux/pagemap.h>
@@ -542,9 +372,9 @@ diff -NurpP --minimal linux-4.4.161/arch/s390/include/asm/tlb.h linux-4.4.161-vs
#include <asm/processor.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-4.4.161/arch/s390/include/uapi/asm/unistd.h linux-4.4.161-vs2.3.9.8/arch/s390/include/uapi/asm/unistd.h
---- linux-4.4.161/arch/s390/include/uapi/asm/unistd.h 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/arch/s390/include/uapi/asm/unistd.h 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/arch/s390/include/uapi/asm/unistd.h linux-4.4.197-vs2.3.9.8/arch/s390/include/uapi/asm/unistd.h
+--- linux-4.4.197/arch/s390/include/uapi/asm/unistd.h 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/arch/s390/include/uapi/asm/unistd.h 2018-10-20 04:57:21.000000000 +0000
@@ -200,7 +200,7 @@
#define __NR_clock_gettime 260
#define __NR_clock_getres 261
@@ -554,9 +384,21 @@ diff -NurpP --minimal linux-4.4.161/arch/s390/include/uapi/asm/unistd.h linux-4.
#define __NR_statfs64 265
#define __NR_fstatfs64 266
#define __NR_remap_file_pages 267
-diff -NurpP --minimal linux-4.4.161/arch/s390/kernel/ptrace.c linux-4.4.161-vs2.3.9.8/arch/s390/kernel/ptrace.c
---- linux-4.4.161/arch/s390/kernel/ptrace.c 2018-10-20 02:34:25.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/arch/s390/kernel/ptrace.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/arch/s390/Kconfig linux-4.4.197-vs2.3.9.8/arch/s390/Kconfig
+--- linux-4.4.197/arch/s390/Kconfig 2019-10-22 12:33:41.279510116 +0000
++++ linux-4.4.197-vs2.3.9.8/arch/s390/Kconfig 2018-10-20 04:57:21.000000000 +0000
+@@ -776,6 +776,8 @@ source "fs/Kconfig"
+
+ source "arch/s390/Kconfig.debug"
+
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-4.4.197/arch/s390/kernel/ptrace.c linux-4.4.197-vs2.3.9.8/arch/s390/kernel/ptrace.c
+--- linux-4.4.197/arch/s390/kernel/ptrace.c 2019-10-22 12:33:41.379508517 +0000
++++ linux-4.4.197-vs2.3.9.8/arch/s390/kernel/ptrace.c 2018-10-20 04:57:21.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/tracehook.h>
#include <linux/seccomp.h>
@@ -565,9 +407,9 @@ diff -NurpP --minimal linux-4.4.161/arch/s390/kernel/ptrace.c linux-4.4.161-vs2.
#include <trace/syscall.h>
#include <asm/segment.h>
#include <asm/page.h>
-diff -NurpP --minimal linux-4.4.161/arch/s390/kernel/syscalls.S linux-4.4.161-vs2.3.9.8/arch/s390/kernel/syscalls.S
---- linux-4.4.161/arch/s390/kernel/syscalls.S 2018-10-20 02:34:25.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/arch/s390/kernel/syscalls.S 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/arch/s390/kernel/syscalls.S linux-4.4.197-vs2.3.9.8/arch/s390/kernel/syscalls.S
+--- linux-4.4.197/arch/s390/kernel/syscalls.S 2019-10-22 12:33:41.379508517 +0000
++++ linux-4.4.197-vs2.3.9.8/arch/s390/kernel/syscalls.S 2018-10-20 04:57:21.000000000 +0000
@@ -271,7 +271,7 @@ SYSCALL(sys_clock_settime,compat_sys_clo
SYSCALL(sys_clock_gettime,compat_sys_clock_gettime) /* 260 */
SYSCALL(sys_clock_getres,compat_sys_clock_getres)
@@ -577,9 +419,9 @@ diff -NurpP --minimal linux-4.4.161/arch/s390/kernel/syscalls.S linux-4.4.161-vs
SYSCALL(sys_ni_syscall,compat_sys_s390_fadvise64_64)
SYSCALL(sys_statfs64,compat_sys_statfs64)
SYSCALL(sys_fstatfs64,compat_sys_fstatfs64)
-diff -NurpP --minimal linux-4.4.161/arch/sh/Kconfig linux-4.4.161-vs2.3.9.8/arch/sh/Kconfig
---- linux-4.4.161/arch/sh/Kconfig 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/arch/sh/Kconfig 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/arch/sh/Kconfig linux-4.4.197-vs2.3.9.8/arch/sh/Kconfig
+--- linux-4.4.197/arch/sh/Kconfig 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/arch/sh/Kconfig 2018-10-20 04:57:21.000000000 +0000
@@ -883,6 +883,8 @@ source "fs/Kconfig"
source "arch/sh/Kconfig.debug"
@@ -589,9 +431,9 @@ diff -NurpP --minimal linux-4.4.161/arch/sh/Kconfig linux-4.4.161-vs2.3.9.8/arch
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.4.161/arch/sh/kernel/irq.c linux-4.4.161-vs2.3.9.8/arch/sh/kernel/irq.c
---- linux-4.4.161/arch/sh/kernel/irq.c 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/arch/sh/kernel/irq.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/arch/sh/kernel/irq.c linux-4.4.197-vs2.3.9.8/arch/sh/kernel/irq.c
+--- linux-4.4.197/arch/sh/kernel/irq.c 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/arch/sh/kernel/irq.c 2018-10-20 04:57:21.000000000 +0000
@@ -14,6 +14,7 @@
#include <linux/ftrace.h>
#include <linux/delay.h>
@@ -600,21 +442,9 @@ diff -NurpP --minimal linux-4.4.161/arch/sh/kernel/irq.c linux-4.4.161-vs2.3.9.8
#include <asm/processor.h>
#include <asm/machvec.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-4.4.161/arch/sparc/Kconfig linux-4.4.161-vs2.3.9.8/arch/sparc/Kconfig
---- linux-4.4.161/arch/sparc/Kconfig 2018-10-20 02:34:25.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/arch/sparc/Kconfig 2018-10-20 04:57:21.000000000 +0000
-@@ -561,6 +561,8 @@ source "fs/Kconfig"
-
- source "arch/sparc/Kconfig.debug"
-
-+source "kernel/vserver/Kconfig"
-+
- source "security/Kconfig"
-
- source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.4.161/arch/sparc/include/uapi/asm/unistd.h linux-4.4.161-vs2.3.9.8/arch/sparc/include/uapi/asm/unistd.h
---- linux-4.4.161/arch/sparc/include/uapi/asm/unistd.h 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/arch/sparc/include/uapi/asm/unistd.h 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/arch/sparc/include/uapi/asm/unistd.h linux-4.4.197-vs2.3.9.8/arch/sparc/include/uapi/asm/unistd.h
+--- linux-4.4.197/arch/sparc/include/uapi/asm/unistd.h 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/arch/sparc/include/uapi/asm/unistd.h 2018-10-20 04:57:21.000000000 +0000
@@ -332,7 +332,7 @@
#define __NR_timer_getoverrun 264
#define __NR_timer_delete 265
@@ -624,9 +454,21 @@ diff -NurpP --minimal linux-4.4.161/arch/sparc/include/uapi/asm/unistd.h linux-4
#define __NR_io_setup 268
#define __NR_io_destroy 269
#define __NR_io_submit 270
-diff -NurpP --minimal linux-4.4.161/arch/sparc/kernel/systbls_32.S linux-4.4.161-vs2.3.9.8/arch/sparc/kernel/systbls_32.S
---- linux-4.4.161/arch/sparc/kernel/systbls_32.S 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/arch/sparc/kernel/systbls_32.S 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/arch/sparc/Kconfig linux-4.4.197-vs2.3.9.8/arch/sparc/Kconfig
+--- linux-4.4.197/arch/sparc/Kconfig 2019-10-22 12:33:41.589505158 +0000
++++ linux-4.4.197-vs2.3.9.8/arch/sparc/Kconfig 2018-10-20 04:57:21.000000000 +0000
+@@ -561,6 +561,8 @@ source "fs/Kconfig"
+
+ source "arch/sparc/Kconfig.debug"
+
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-4.4.197/arch/sparc/kernel/systbls_32.S linux-4.4.197-vs2.3.9.8/arch/sparc/kernel/systbls_32.S
+--- linux-4.4.197/arch/sparc/kernel/systbls_32.S 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/arch/sparc/kernel/systbls_32.S 2018-10-20 04:57:21.000000000 +0000
@@ -70,7 +70,7 @@ sys_call_table:
/*250*/ .long sys_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_ni_syscall
/*255*/ .long sys_sync_file_range, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep
@@ -636,9 +478,9 @@ diff -NurpP --minimal linux-4.4.161/arch/sparc/kernel/systbls_32.S linux-4.4.161
/*270*/ .long sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink
/*275*/ .long sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid
/*280*/ .long sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat
-diff -NurpP --minimal linux-4.4.161/arch/sparc/kernel/systbls_64.S linux-4.4.161-vs2.3.9.8/arch/sparc/kernel/systbls_64.S
---- linux-4.4.161/arch/sparc/kernel/systbls_64.S 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/arch/sparc/kernel/systbls_64.S 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/arch/sparc/kernel/systbls_64.S linux-4.4.197-vs2.3.9.8/arch/sparc/kernel/systbls_64.S
+--- linux-4.4.197/arch/sparc/kernel/systbls_64.S 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/arch/sparc/kernel/systbls_64.S 2018-10-20 04:57:21.000000000 +0000
@@ -71,7 +71,7 @@ sys_call_table32:
/*250*/ .word sys_mremap, compat_sys_sysctl, sys_getsid, sys_fdatasync, sys_nis_syscall
.word sys32_sync_file_range, compat_sys_clock_settime, compat_sys_clock_gettime, compat_sys_clock_getres, sys32_clock_nanosleep
@@ -657,9 +499,9 @@ diff -NurpP --minimal linux-4.4.161/arch/sparc/kernel/systbls_64.S linux-4.4.161
/*270*/ .word sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink
.word sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid
/*280*/ .word sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat
-diff -NurpP --minimal linux-4.4.161/arch/um/Kconfig.rest linux-4.4.161-vs2.3.9.8/arch/um/Kconfig.rest
---- linux-4.4.161/arch/um/Kconfig.rest 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/arch/um/Kconfig.rest 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/arch/um/Kconfig.rest linux-4.4.197-vs2.3.9.8/arch/um/Kconfig.rest
+--- linux-4.4.197/arch/um/Kconfig.rest 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/arch/um/Kconfig.rest 2018-10-20 04:57:21.000000000 +0000
@@ -12,6 +12,8 @@ source "arch/um/Kconfig.net"
source "fs/Kconfig"
@@ -669,21 +511,9 @@ diff -NurpP --minimal linux-4.4.161/arch/um/Kconfig.rest linux-4.4.161-vs2.3.9.8
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.4.161/arch/x86/Kconfig linux-4.4.161-vs2.3.9.8/arch/x86/Kconfig
---- linux-4.4.161/arch/x86/Kconfig 2018-10-20 02:34:25.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/arch/x86/Kconfig 2018-10-20 04:57:21.000000000 +0000
-@@ -2693,6 +2693,8 @@ source "fs/Kconfig"
-
- source "arch/x86/Kconfig.debug"
-
-+source "kernel/vserver/Kconfig"
-+
- source "security/Kconfig"
-
- source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.4.161/arch/x86/entry/syscalls/syscall_32.tbl linux-4.4.161-vs2.3.9.8/arch/x86/entry/syscalls/syscall_32.tbl
---- linux-4.4.161/arch/x86/entry/syscalls/syscall_32.tbl 2018-10-20 02:34:25.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/arch/x86/entry/syscalls/syscall_32.tbl 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/arch/x86/entry/syscalls/syscall_32.tbl linux-4.4.197-vs2.3.9.8/arch/x86/entry/syscalls/syscall_32.tbl
+--- linux-4.4.197/arch/x86/entry/syscalls/syscall_32.tbl 2019-10-22 12:33:43.129480539 +0000
++++ linux-4.4.197-vs2.3.9.8/arch/x86/entry/syscalls/syscall_32.tbl 2018-10-20 04:57:21.000000000 +0000
@@ -279,7 +279,7 @@
270 i386 tgkill sys_tgkill
271 i386 utimes sys_utimes compat_sys_utimes
@@ -693,9 +523,9 @@ diff -NurpP --minimal linux-4.4.161/arch/x86/entry/syscalls/syscall_32.tbl linux
274 i386 mbind sys_mbind
275 i386 get_mempolicy sys_get_mempolicy compat_sys_get_mempolicy
276 i386 set_mempolicy sys_set_mempolicy
-diff -NurpP --minimal linux-4.4.161/arch/x86/entry/syscalls/syscall_64.tbl linux-4.4.161-vs2.3.9.8/arch/x86/entry/syscalls/syscall_64.tbl
---- linux-4.4.161/arch/x86/entry/syscalls/syscall_64.tbl 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/arch/x86/entry/syscalls/syscall_64.tbl 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/arch/x86/entry/syscalls/syscall_64.tbl linux-4.4.197-vs2.3.9.8/arch/x86/entry/syscalls/syscall_64.tbl
+--- linux-4.4.197/arch/x86/entry/syscalls/syscall_64.tbl 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/arch/x86/entry/syscalls/syscall_64.tbl 2018-10-20 04:57:21.000000000 +0000
@@ -242,7 +242,7 @@
233 common epoll_ctl sys_epoll_ctl
234 common tgkill sys_tgkill
@@ -705,9 +535,21 @@ diff -NurpP --minimal linux-4.4.161/arch/x86/entry/syscalls/syscall_64.tbl linux
237 common mbind sys_mbind
238 common set_mempolicy sys_set_mempolicy
239 common get_mempolicy sys_get_mempolicy
-diff -NurpP --minimal linux-4.4.161/block/ioprio.c linux-4.4.161-vs2.3.9.8/block/ioprio.c
---- linux-4.4.161/block/ioprio.c 2018-10-20 02:34:26.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/block/ioprio.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/arch/x86/Kconfig linux-4.4.197-vs2.3.9.8/arch/x86/Kconfig
+--- linux-4.4.197/arch/x86/Kconfig 2019-10-22 12:33:42.989482775 +0000
++++ linux-4.4.197-vs2.3.9.8/arch/x86/Kconfig 2019-10-05 14:35:14.203098872 +0000
+@@ -2680,6 +2680,8 @@ source "fs/Kconfig"
+
+ source "arch/x86/Kconfig.debug"
+
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-4.4.197/block/ioprio.c linux-4.4.197-vs2.3.9.8/block/ioprio.c
+--- linux-4.4.197/block/ioprio.c 2019-10-22 12:33:45.859436891 +0000
++++ linux-4.4.197-vs2.3.9.8/block/ioprio.c 2018-10-20 04:57:21.000000000 +0000
@@ -28,6 +28,7 @@
#include <linux/syscalls.h>
#include <linux/security.h>
@@ -734,48 +576,195 @@ diff -NurpP --minimal linux-4.4.161/block/ioprio.c linux-4.4.161-vs2.3.9.8/block
tmpio = get_task_ioprio(p);
if (tmpio < 0)
continue;
-diff -NurpP --minimal linux-4.4.161/drivers/block/Kconfig linux-4.4.161-vs2.3.9.8/drivers/block/Kconfig
---- linux-4.4.161/drivers/block/Kconfig 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/drivers/block/Kconfig 2018-10-20 04:57:21.000000000 +0000
-@@ -283,6 +283,13 @@ config BLK_DEV_CRYPTOLOOP
-
- source "drivers/block/drbd/Kconfig"
-
-+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.4.197/Documentation/vserver/debug.txt linux-4.4.197-vs2.3.9.8/Documentation/vserver/debug.txt
+--- linux-4.4.197/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/Documentation/vserver/debug.txt 2018-10-20 04:57:21.000000000 +0000
+@@ -0,0 +1,154 @@
+
- config BLK_DEV_NBD
- tristate "Network block device support"
- depends on NET
-diff -NurpP --minimal linux-4.4.161/drivers/block/Makefile linux-4.4.161-vs2.3.9.8/drivers/block/Makefile
---- linux-4.4.161/drivers/block/Makefile 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/drivers/block/Makefile 2018-10-20 04:57:21.000000000 +0000
-@@ -32,6 +32,7 @@ obj-$(CONFIG_VIRTIO_BLK) += virtio_blk.o
-
- obj-$(CONFIG_BLK_DEV_SX8) += sx8.o
- 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.4.161/drivers/block/loop.c linux-4.4.161-vs2.3.9.8/drivers/block/loop.c
---- linux-4.4.161/drivers/block/loop.c 2018-10-20 02:34:26.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/drivers/block/loop.c 2018-10-20 04:57:21.000000000 +0000
-@@ -76,6 +76,7 @@
- #include <linux/miscdevice.h>
- #include <linux/falloc.h>
- #include <linux/uio.h>
-+#include <linux/vs_context.h>
- #include "loop.h"
-
- #include <asm/uaccess.h>
-@@ -947,6 +948,7 @@ static int loop_set_fd(struct loop_devic
- lo->lo_blocksize = lo_blocksize;
- lo->lo_device = bdev;
++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.4.197/drivers/block/Kconfig linux-4.4.197-vs2.3.9.8/drivers/block/Kconfig
+--- linux-4.4.197/drivers/block/Kconfig 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/drivers/block/Kconfig 2018-10-20 04:57:21.000000000 +0000
+@@ -283,6 +283,13 @@ config BLK_DEV_CRYPTOLOOP
+
+ source "drivers/block/drbd/Kconfig"
+
++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.4.197/drivers/block/loop.c linux-4.4.197-vs2.3.9.8/drivers/block/loop.c
+--- linux-4.4.197/drivers/block/loop.c 2019-10-22 12:33:47.979402997 +0000
++++ linux-4.4.197-vs2.3.9.8/drivers/block/loop.c 2019-10-05 14:35:16.743058580 +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>
+@@ -947,6 +948,7 @@ static int loop_set_fd(struct loop_devic
+ lo->lo_blocksize = lo_blocksize;
+ lo->lo_device = bdev;
lo->lo_flags = lo_flags;
+ lo->lo_xid = vx_current_xid();
lo->lo_backing_file = file;
@@ -820,9 +809,9 @@ diff -NurpP --minimal linux-4.4.161/drivers/block/loop.c linux-4.4.161-vs2.3.9.8
atomic_inc(&lo->lo_refcnt);
out:
mutex_unlock(&loop_index_mutex);
-diff -NurpP --minimal linux-4.4.161/drivers/block/loop.h linux-4.4.161-vs2.3.9.8/drivers/block/loop.h
---- linux-4.4.161/drivers/block/loop.h 2018-10-20 02:34:26.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/drivers/block/loop.h 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/drivers/block/loop.h linux-4.4.197-vs2.3.9.8/drivers/block/loop.h
+--- linux-4.4.197/drivers/block/loop.h 2019-10-22 12:33:47.979402997 +0000
++++ linux-4.4.197-vs2.3.9.8/drivers/block/loop.h 2019-10-05 14:35:16.753058421 +0000
@@ -43,6 +43,7 @@ struct loop_device {
struct loop_func_table *lo_encryption;
__u32 lo_init[2];
@@ -831,9 +820,20 @@ diff -NurpP --minimal linux-4.4.161/drivers/block/loop.h linux-4.4.161-vs2.3.9.8
int (*ioctl)(struct loop_device *, int cmd,
unsigned long arg);
-diff -NurpP --minimal linux-4.4.161/drivers/block/vroot.c linux-4.4.161-vs2.3.9.8/drivers/block/vroot.c
---- linux-4.4.161/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/drivers/block/vroot.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/drivers/block/Makefile linux-4.4.197-vs2.3.9.8/drivers/block/Makefile
+--- linux-4.4.197/drivers/block/Makefile 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/drivers/block/Makefile 2018-10-20 04:57:21.000000000 +0000
+@@ -32,6 +32,7 @@ obj-$(CONFIG_VIRTIO_BLK) += virtio_blk.o
+
+ obj-$(CONFIG_BLK_DEV_SX8) += sx8.o
+ 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.4.197/drivers/block/vroot.c linux-4.4.197-vs2.3.9.8/drivers/block/vroot.c
+--- linux-4.4.197/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/drivers/block/vroot.c 2018-10-20 04:57:21.000000000 +0000
@@ -0,0 +1,291 @@
+/*
+ * linux/drivers/block/vroot.c
@@ -1126,9 +1126,9 @@ diff -NurpP --minimal linux-4.4.161/drivers/block/vroot.c linux-4.4.161-vs2.3.9.
+
+#endif
+
-diff -NurpP --minimal linux-4.4.161/drivers/infiniband/core/addr.c linux-4.4.161-vs2.3.9.8/drivers/infiniband/core/addr.c
---- linux-4.4.161/drivers/infiniband/core/addr.c 2018-10-20 02:34:27.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/drivers/infiniband/core/addr.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/drivers/infiniband/core/addr.c linux-4.4.197-vs2.3.9.8/drivers/infiniband/core/addr.c
+--- linux-4.4.197/drivers/infiniband/core/addr.c 2019-10-22 12:33:58.339237367 +0000
++++ linux-4.4.197-vs2.3.9.8/drivers/infiniband/core/addr.c 2019-10-05 14:35:19.353017176 +0000
@@ -299,7 +299,7 @@ static int addr6_resolve(struct sockaddr
if (ipv6_addr_any(&fl6.saddr)) {
@@ -1138,129 +1138,41 @@ diff -NurpP --minimal linux-4.4.161/drivers/infiniband/core/addr.c linux-4.4.161
if (ret)
goto put;
-diff -NurpP --minimal linux-4.4.161/drivers/md/dm-ioctl.c linux-4.4.161-vs2.3.9.8/drivers/md/dm-ioctl.c
---- linux-4.4.161/drivers/md/dm-ioctl.c 2018-10-20 02:34:27.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/drivers/md/dm-ioctl.c 2018-10-20 04:57:21.000000000 +0000
-@@ -16,6 +16,7 @@
- #include <linux/dm-ioctl.h>
- #include <linux/hdreg.h>
- #include <linux/compat.h>
-+#include <linux/vs_context.h>
-
- #include <asm/uaccess.h>
+diff -NurpP --minimal linux-4.4.197/drivers/md/dm.c linux-4.4.197-vs2.3.9.8/drivers/md/dm.c
+--- linux-4.4.197/drivers/md/dm.c 2019-10-22 12:33:59.859213069 +0000
++++ linux-4.4.197-vs2.3.9.8/drivers/md/dm.c 2018-10-20 04:57:21.000000000 +0000
+@@ -25,6 +25,7 @@
+ #include <linux/elevator.h> /* for rq_end_sector() */
+ #include <linux/blk-mq.h>
+ #include <linux/pr.h>
++#include <linux/vs_base.h>
-@@ -114,7 +115,8 @@ static struct hash_cell *__get_name_cell
- unsigned int h = hash_str(str);
+ #include <trace/events/block.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);
+@@ -144,6 +145,7 @@ struct mapped_device {
+ struct mutex suspend_lock;
+ atomic_t holders;
+ atomic_t open_count;
++ vxid_t xid;
- 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)
+ /*
+ * The current mapping.
+@@ -445,6 +447,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
+@@ -453,17 +456,19 @@ static int dm_blk_open(struct block_devi
+ goto out;
- 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);
-@@ -1801,8 +1813,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.4.161/drivers/md/dm.c linux-4.4.161-vs2.3.9.8/drivers/md/dm.c
---- linux-4.4.161/drivers/md/dm.c 2018-10-20 02:34:27.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/drivers/md/dm.c 2018-10-20 04:57:21.000000000 +0000
-@@ -25,6 +25,7 @@
- #include <linux/elevator.h> /* for rq_end_sector() */
- #include <linux/blk-mq.h>
- #include <linux/pr.h>
-+#include <linux/vs_base.h>
-
- #include <trace/events/block.h>
-
-@@ -144,6 +145,7 @@ struct mapped_device {
- struct mutex suspend_lock;
- atomic_t holders;
- atomic_t open_count;
-+ vxid_t xid;
-
- /*
- * The current mapping.
-@@ -445,6 +447,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);
-
-@@ -453,17 +456,19 @@ static int dm_blk_open(struct block_devi
- goto out;
-
- if (test_bit(DMF_FREEING, &md->flags) ||
-- dm_deleting_md(md)) {
-- md = NULL;
-+ dm_deleting_md(md))
-+ goto out;
+ if (test_bit(DMF_FREEING, &md->flags) ||
+- dm_deleting_md(md)) {
+- md = NULL;
++ dm_deleting_md(md))
++ goto out;
+
+ ret = -EACCES;
+ if (!vx_check(md->xid, VS_IDENT|VS_HOSTID))
@@ -1301,9 +1213,9 @@ diff -NurpP --minimal linux-4.4.161/drivers/md/dm.c linux-4.4.161-vs2.3.9.8/driv
md->queue = blk_alloc_queue(GFP_KERNEL);
if (!md->queue)
goto bad;
-diff -NurpP --minimal linux-4.4.161/drivers/md/dm.h linux-4.4.161-vs2.3.9.8/drivers/md/dm.h
---- linux-4.4.161/drivers/md/dm.h 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/drivers/md/dm.h 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/drivers/md/dm.h linux-4.4.197-vs2.3.9.8/drivers/md/dm.h
+--- linux-4.4.197/drivers/md/dm.h 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/drivers/md/dm.h 2018-10-20 04:57:21.000000000 +0000
@@ -52,6 +52,8 @@ struct dm_dev_internal {
struct dm_table;
struct dm_md_mempools;
@@ -1313,9 +1225,97 @@ diff -NurpP --minimal linux-4.4.161/drivers/md/dm.h linux-4.4.161-vs2.3.9.8/driv
/*-----------------------------------------------------------------
* Internal table functions.
*---------------------------------------------------------------*/
-diff -NurpP --minimal linux-4.4.161/drivers/net/tun.c linux-4.4.161-vs2.3.9.8/drivers/net/tun.c
---- linux-4.4.161/drivers/net/tun.c 2018-10-20 02:34:28.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/drivers/net/tun.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/drivers/md/dm-ioctl.c linux-4.4.197-vs2.3.9.8/drivers/md/dm-ioctl.c
+--- linux-4.4.197/drivers/md/dm-ioctl.c 2019-10-22 12:33:59.539218184 +0000
++++ linux-4.4.197-vs2.3.9.8/drivers/md/dm-ioctl.c 2019-02-22 08:20:28.131053160 +0000
+@@ -16,6 +16,7 @@
+ #include <linux/dm-ioctl.h>
+ #include <linux/hdreg.h>
+ #include <linux/compat.h>
++#include <linux/vs_context.h>
+
+ #include <asm/uaccess.h>
+
+@@ -114,7 +115,8 @@ static struct hash_cell *__get_name_cell
+ unsigned int h = hash_str(str);
+
+ list_for_each_entry (hc, _name_buckets + h, name_list)
+- if (!strcmp(hc->name, str)) {
++ if (vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT) &&
++ !strcmp(hc->name, str)) {
+ dm_get(hc->md);
+ return hc;
+ }
+@@ -128,7 +130,8 @@ static struct hash_cell *__get_uuid_cell
+ unsigned int h = hash_str(str);
+
+ list_for_each_entry (hc, _uuid_buckets + h, uuid_list)
+- if (!strcmp(hc->uuid, str)) {
++ if (vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT) &&
++ !strcmp(hc->uuid, str)) {
+ dm_get(hc->md);
+ return hc;
+ }
+@@ -139,13 +142,15 @@ static struct hash_cell *__get_uuid_cell
+ static struct hash_cell *__get_dev_cell(uint64_t dev)
+ {
+ struct mapped_device *md;
+- struct hash_cell *hc;
++ struct hash_cell *hc = NULL;
+
+ md = dm_get_md(huge_decode_dev(dev));
+ if (!md)
+ return NULL;
+
+- hc = dm_get_mdptr(md);
++ if (vx_check(dm_get_xid(md), VS_WATCH_P | VS_IDENT))
++ hc = dm_get_mdptr(md);
++
+ if (!hc) {
+ dm_put(md);
+ return NULL;
+@@ -467,6 +472,9 @@ typedef int (*ioctl_fn)(struct dm_ioctl
+
+ static int remove_all(struct dm_ioctl *param, size_t param_size)
+ {
++ if (!vx_check(0, VS_ADMIN))
++ return -EPERM;
++
+ dm_hash_remove_all(true, !!(param->flags & DM_DEFERRED_REMOVE), false);
+ param->data_size = 0;
+ return 0;
+@@ -514,6 +522,8 @@ static int list_devices(struct dm_ioctl
+ */
+ for (i = 0; i < NUM_BUCKETS; i++) {
+ list_for_each_entry (hc, _name_buckets + i, name_list) {
++ if (!vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT))
++ continue;
+ needed += sizeof(struct dm_name_list);
+ needed += strlen(hc->name) + 1;
+ needed += ALIGN_MASK;
+@@ -537,6 +547,8 @@ static int list_devices(struct dm_ioctl
+ */
+ for (i = 0; i < NUM_BUCKETS; i++) {
+ list_for_each_entry (hc, _name_buckets + i, name_list) {
++ if (!vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT))
++ continue;
+ if (old_nl)
+ old_nl->next = (uint32_t) ((void *) nl -
+ (void *) old_nl);
+@@ -1795,8 +1807,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.4.197/drivers/net/tun.c linux-4.4.197-vs2.3.9.8/drivers/net/tun.c
+--- linux-4.4.197/drivers/net/tun.c 2019-10-22 12:34:11.439027933 +0000
++++ linux-4.4.197-vs2.3.9.8/drivers/net/tun.c 2019-10-05 14:35:25.262923426 +0000
@@ -65,6 +65,7 @@
#include <linux/nsproxy.h>
#include <linux/virtio_net.h>
@@ -1340,7 +1340,7 @@ diff -NurpP --minimal linux-4.4.161/drivers/net/tun.c linux-4.4.161-vs2.3.9.8/dr
}
static void tun_set_real_num_queues(struct tun_struct *tun)
-@@ -1463,6 +1466,7 @@ static void tun_setup(struct net_device
+@@ -1465,6 +1468,7 @@ static void tun_setup(struct net_device
tun->owner = INVALID_UID;
tun->group = INVALID_GID;
@@ -1348,7 +1348,7 @@ diff -NurpP --minimal linux-4.4.161/drivers/net/tun.c linux-4.4.161-vs2.3.9.8/dr
dev->ethtool_ops = &tun_ethtool_ops;
dev->destructor = tun_free_netdev;
-@@ -1657,7 +1661,7 @@ static int tun_set_iff(struct net *net,
+@@ -1661,7 +1665,7 @@ static int tun_set_iff(struct net *net,
int queues = ifr->ifr_flags & IFF_MULTI_QUEUE ?
MAX_TAP_QUEUES : 1;
@@ -1357,7 +1357,7 @@ diff -NurpP --minimal linux-4.4.161/drivers/net/tun.c linux-4.4.161-vs2.3.9.8/dr
return -EPERM;
err = security_tun_dev_create();
if (err < 0)
-@@ -2010,6 +2014,16 @@ static long __tun_chr_ioctl(struct file
+@@ -2018,6 +2022,16 @@ static long __tun_chr_ioctl(struct file
from_kgid(&init_user_ns, tun->group));
break;
@@ -1374,10 +1374,10 @@ diff -NurpP --minimal linux-4.4.161/drivers/net/tun.c linux-4.4.161-vs2.3.9.8/dr
case TUNSETLINK:
/* Only allow setting the type when the interface is down */
if (tun->dev->flags & IFF_UP) {
-diff -NurpP --minimal linux-4.4.161/drivers/scsi/cxgbi/libcxgbi.c linux-4.4.161-vs2.3.9.8/drivers/scsi/cxgbi/libcxgbi.c
---- linux-4.4.161/drivers/scsi/cxgbi/libcxgbi.c 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/drivers/scsi/cxgbi/libcxgbi.c 2018-10-20 04:57:21.000000000 +0000
-@@ -768,7 +768,8 @@ static struct cxgbi_sock *cxgbi_check_ro
+diff -NurpP --minimal linux-4.4.197/drivers/scsi/cxgbi/libcxgbi.c linux-4.4.197-vs2.3.9.8/drivers/scsi/cxgbi/libcxgbi.c
+--- linux-4.4.197/drivers/scsi/cxgbi/libcxgbi.c 2019-10-22 12:34:17.668928331 +0000
++++ linux-4.4.197-vs2.3.9.8/drivers/scsi/cxgbi/libcxgbi.c 2019-10-05 14:35:27.572886782 +0000
+@@ -772,7 +772,8 @@ static struct cxgbi_sock *cxgbi_check_ro
struct inet6_dev *idev = ip6_dst_idev((struct dst_entry *)rt);
err = ipv6_dev_get_saddr(&init_net, idev ? idev->dev : NULL,
@@ -1387,9 +1387,9 @@ diff -NurpP --minimal linux-4.4.161/drivers/scsi/cxgbi/libcxgbi.c linux-4.4.161-
if (err) {
pr_info("failed to get source address to reach %pI6\n",
&daddr6->sin6_addr);
-diff -NurpP --minimal linux-4.4.161/drivers/tty/sysrq.c linux-4.4.161-vs2.3.9.8/drivers/tty/sysrq.c
---- linux-4.4.161/drivers/tty/sysrq.c 2018-10-20 02:34:29.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/drivers/tty/sysrq.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/drivers/tty/sysrq.c linux-4.4.197-vs2.3.9.8/drivers/tty/sysrq.c
+--- linux-4.4.197/drivers/tty/sysrq.c 2019-10-22 12:34:22.888844914 +0000
++++ linux-4.4.197-vs2.3.9.8/drivers/tty/sysrq.c 2018-10-20 04:57:21.000000000 +0000
@@ -47,6 +47,7 @@
#include <linux/syscalls.h>
#include <linux/of.h>
@@ -1441,9 +1441,9 @@ diff -NurpP --minimal linux-4.4.161/drivers/tty/sysrq.c linux-4.4.161-vs2.3.9.8/
else
retval = -1;
return retval;
-diff -NurpP --minimal linux-4.4.161/drivers/tty/tty_io.c linux-4.4.161-vs2.3.9.8/drivers/tty/tty_io.c
---- linux-4.4.161/drivers/tty/tty_io.c 2018-10-20 02:34:29.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/drivers/tty/tty_io.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/drivers/tty/tty_io.c linux-4.4.197-vs2.3.9.8/drivers/tty/tty_io.c
+--- linux-4.4.197/drivers/tty/tty_io.c 2019-10-22 12:34:22.888844914 +0000
++++ linux-4.4.197-vs2.3.9.8/drivers/tty/tty_io.c 2019-10-05 14:35:30.532839829 +0000
@@ -104,6 +104,7 @@
#include <linux/kmod.h>
@@ -1452,7 +1452,7 @@ diff -NurpP --minimal linux-4.4.161/drivers/tty/tty_io.c linux-4.4.161-vs2.3.9.8
#undef TTY_DEBUG_HANGUP
#ifdef TTY_DEBUG_HANGUP
-@@ -2291,7 +2292,8 @@ static int tiocsti(struct tty_struct *tt
+@@ -2293,7 +2294,8 @@ static int tiocsti(struct tty_struct *tt
char ch, mbz = 0;
struct tty_ldisc *ld;
@@ -1462,7 +1462,7 @@ diff -NurpP --minimal linux-4.4.161/drivers/tty/tty_io.c linux-4.4.161-vs2.3.9.8
return -EPERM;
if (get_user(ch, p))
return -EFAULT;
-@@ -2604,6 +2606,7 @@ static int tiocspgrp(struct tty_struct *
+@@ -2607,6 +2609,7 @@ static int tiocspgrp(struct tty_struct *
return -ENOTTY;
if (get_user(pgrp_nr, p))
return -EFAULT;
@@ -1470,9 +1470,9 @@ diff -NurpP --minimal linux-4.4.161/drivers/tty/tty_io.c linux-4.4.161-vs2.3.9.8
if (pgrp_nr < 0)
return -EINVAL;
rcu_read_lock();
-diff -NurpP --minimal linux-4.4.161/fs/attr.c linux-4.4.161-vs2.3.9.8/fs/attr.c
---- linux-4.4.161/fs/attr.c 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/attr.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/attr.c linux-4.4.197-vs2.3.9.8/fs/attr.c
+--- linux-4.4.197/fs/attr.c 2019-10-22 12:34:30.078730021 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/attr.c 2018-10-20 04:57:21.000000000 +0000
@@ -15,6 +15,9 @@
#include <linux/security.h>
#include <linux/evm.h>
@@ -1513,9 +1513,9 @@ diff -NurpP --minimal linux-4.4.161/fs/attr.c linux-4.4.161-vs2.3.9.8/fs/attr.c
if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
return -EPERM;
}
-diff -NurpP --minimal linux-4.4.161/fs/block_dev.c linux-4.4.161-vs2.3.9.8/fs/block_dev.c
---- linux-4.4.161/fs/block_dev.c 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/block_dev.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/block_dev.c linux-4.4.197-vs2.3.9.8/fs/block_dev.c
+--- linux-4.4.197/fs/block_dev.c 2019-10-22 12:34:30.558722354 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/block_dev.c 2018-10-20 04:57:21.000000000 +0000
@@ -29,6 +29,7 @@
#include <linux/log2.h>
#include <linux/cleancache.h>
@@ -1553,10 +1553,10 @@ diff -NurpP --minimal linux-4.4.161/fs/block_dev.c linux-4.4.161-vs2.3.9.8/fs/bl
if (bdev) {
spin_lock(&bdev_lock);
if (!inode->i_bdev) {
-diff -NurpP --minimal linux-4.4.161/fs/btrfs/ctree.h linux-4.4.161-vs2.3.9.8/fs/btrfs/ctree.h
---- linux-4.4.161/fs/btrfs/ctree.h 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/btrfs/ctree.h 2018-10-20 04:57:21.000000000 +0000
-@@ -731,11 +731,14 @@ struct btrfs_inode_item {
+diff -NurpP --minimal linux-4.4.197/fs/btrfs/ctree.h linux-4.4.197-vs2.3.9.8/fs/btrfs/ctree.h
+--- linux-4.4.197/fs/btrfs/ctree.h 2019-10-22 12:34:30.658720753 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/btrfs/ctree.h 2019-02-22 08:20:32.700975524 +0000
+@@ -732,11 +732,14 @@ struct btrfs_inode_item {
/* modification sequence number for NFS */
__le64 sequence;
@@ -1572,7 +1572,7 @@ diff -NurpP --minimal linux-4.4.161/fs/btrfs/ctree.h linux-4.4.161-vs2.3.9.8/fs/
struct btrfs_timespec atime;
struct btrfs_timespec ctime;
struct btrfs_timespec mtime;
-@@ -2189,6 +2192,8 @@ struct btrfs_ioctl_defrag_range_args {
+@@ -2191,6 +2194,8 @@ struct btrfs_ioctl_defrag_range_args {
#define BTRFS_DEFAULT_COMMIT_INTERVAL (30)
#define BTRFS_DEFAULT_MAX_INLINE (8192)
@@ -1581,7 +1581,7 @@ diff -NurpP --minimal linux-4.4.161/fs/btrfs/ctree.h linux-4.4.161-vs2.3.9.8/fs/
#define btrfs_clear_opt(o, opt) ((o) &= ~BTRFS_MOUNT_##opt)
#define btrfs_set_opt(o, opt) ((o) |= BTRFS_MOUNT_##opt)
#define btrfs_raw_test_opt(o, opt) ((o) & BTRFS_MOUNT_##opt)
-@@ -2528,6 +2533,7 @@ BTRFS_SETGET_FUNCS(inode_block_group, st
+@@ -2533,6 +2538,7 @@ BTRFS_SETGET_FUNCS(inode_block_group, st
BTRFS_SETGET_FUNCS(inode_nlink, struct btrfs_inode_item, nlink, 32);
BTRFS_SETGET_FUNCS(inode_uid, struct btrfs_inode_item, uid, 32);
BTRFS_SETGET_FUNCS(inode_gid, struct btrfs_inode_item, gid, 32);
@@ -1589,7 +1589,7 @@ diff -NurpP --minimal linux-4.4.161/fs/btrfs/ctree.h linux-4.4.161-vs2.3.9.8/fs/
BTRFS_SETGET_FUNCS(inode_mode, struct btrfs_inode_item, mode, 32);
BTRFS_SETGET_FUNCS(inode_rdev, struct btrfs_inode_item, rdev, 64);
BTRFS_SETGET_FUNCS(inode_flags, struct btrfs_inode_item, flags, 64);
-@@ -2575,6 +2581,10 @@ BTRFS_SETGET_FUNCS(extent_flags, struct
+@@ -2580,6 +2586,10 @@ BTRFS_SETGET_FUNCS(extent_flags, struct
BTRFS_SETGET_FUNCS(extent_refs_v0, struct btrfs_extent_item_v0, refs, 32);
@@ -1600,7 +1600,7 @@ diff -NurpP --minimal linux-4.4.161/fs/btrfs/ctree.h linux-4.4.161-vs2.3.9.8/fs/
BTRFS_SETGET_FUNCS(tree_block_level, struct btrfs_tree_block_info, level, 8);
-@@ -4022,6 +4032,7 @@ long btrfs_ioctl(struct file *file, unsi
+@@ -4043,6 +4053,7 @@ long btrfs_ioctl(struct file *file, unsi
void btrfs_update_iflags(struct inode *inode);
void btrfs_inherit_iflags(struct inode *inode, struct inode *dir);
int btrfs_is_empty_uuid(u8 *uuid);
@@ -1608,10 +1608,10 @@ diff -NurpP --minimal linux-4.4.161/fs/btrfs/ctree.h linux-4.4.161-vs2.3.9.8/fs/
int btrfs_defrag_file(struct inode *inode, struct file *file,
struct btrfs_ioctl_defrag_range_args *range,
u64 newer_than, unsigned long max_pages);
-diff -NurpP --minimal linux-4.4.161/fs/btrfs/disk-io.c linux-4.4.161-vs2.3.9.8/fs/btrfs/disk-io.c
---- linux-4.4.161/fs/btrfs/disk-io.c 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/btrfs/disk-io.c 2018-10-20 05:50:20.000000000 +0000
-@@ -2737,6 +2737,9 @@ int open_ctree(struct super_block *sb,
+diff -NurpP --minimal linux-4.4.197/fs/btrfs/disk-io.c linux-4.4.197-vs2.3.9.8/fs/btrfs/disk-io.c
+--- linux-4.4.197/fs/btrfs/disk-io.c 2019-10-22 12:34:30.668720596 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/btrfs/disk-io.c 2019-02-22 08:20:32.700975524 +0000
+@@ -2667,6 +2667,9 @@ int open_ctree(struct super_block *sb,
goto fail_alloc;
}
@@ -1621,9 +1621,9 @@ diff -NurpP --minimal linux-4.4.161/fs/btrfs/disk-io.c linux-4.4.161-vs2.3.9.8/f
features = btrfs_super_incompat_flags(disk_super) &
~BTRFS_FEATURE_INCOMPAT_SUPP;
if (features) {
-diff -NurpP --minimal linux-4.4.161/fs/btrfs/inode.c linux-4.4.161-vs2.3.9.8/fs/btrfs/inode.c
---- linux-4.4.161/fs/btrfs/inode.c 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/btrfs/inode.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/btrfs/inode.c linux-4.4.197-vs2.3.9.8/fs/btrfs/inode.c
+--- linux-4.4.197/fs/btrfs/inode.c 2019-10-22 12:34:30.728719635 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/btrfs/inode.c 2019-02-22 08:20:32.720975184 +0000
@@ -43,6 +43,7 @@
#include <linux/blkdev.h>
#include <linux/posix_acl_xattr.h>
@@ -1632,7 +1632,7 @@ diff -NurpP --minimal linux-4.4.161/fs/btrfs/inode.c linux-4.4.161-vs2.3.9.8/fs/
#include "ctree.h"
#include "disk-io.h"
#include "transaction.h"
-@@ -3649,6 +3650,9 @@ static void btrfs_read_locked_inode(stru
+@@ -3650,6 +3651,9 @@ static void btrfs_read_locked_inode(stru
unsigned long ptr;
int maybe_acls;
u32 rdev;
@@ -1642,7 +1642,7 @@ diff -NurpP --minimal linux-4.4.161/fs/btrfs/inode.c linux-4.4.161-vs2.3.9.8/fs/
int ret;
bool filled = false;
int first_xattr_slot;
-@@ -3676,8 +3680,14 @@ static void btrfs_read_locked_inode(stru
+@@ -3677,8 +3681,14 @@ static void btrfs_read_locked_inode(stru
struct btrfs_inode_item);
inode->i_mode = btrfs_inode_mode(leaf, inode_item);
set_nlink(inode, btrfs_inode_nlink(leaf, inode_item));
@@ -1659,7 +1659,7 @@ diff -NurpP --minimal linux-4.4.161/fs/btrfs/inode.c linux-4.4.161-vs2.3.9.8/fs/
btrfs_i_size_write(inode, btrfs_inode_size(leaf, inode_item));
inode->i_atime.tv_sec = btrfs_timespec_sec(leaf, &inode_item->atime);
-@@ -3833,11 +3843,18 @@ static void fill_inode_item(struct btrfs
+@@ -3834,11 +3844,18 @@ static void fill_inode_item(struct btrfs
struct inode *inode)
{
struct btrfs_map_token token;
@@ -1680,7 +1680,7 @@ diff -NurpP --minimal linux-4.4.161/fs/btrfs/inode.c linux-4.4.161-vs2.3.9.8/fs/
btrfs_set_token_inode_size(leaf, item, BTRFS_I(inode)->disk_i_size,
&token);
btrfs_set_token_inode_mode(leaf, item, inode->i_mode, &token);
-@@ -10092,6 +10109,7 @@ static const struct inode_operations btr
+@@ -10093,6 +10110,7 @@ static const struct inode_operations btr
.listxattr = btrfs_listxattr,
.removexattr = btrfs_removexattr,
.permission = btrfs_permission,
@@ -1688,7 +1688,7 @@ diff -NurpP --minimal linux-4.4.161/fs/btrfs/inode.c linux-4.4.161-vs2.3.9.8/fs/
.get_acl = btrfs_get_acl,
.set_acl = btrfs_set_acl,
.update_time = btrfs_update_time,
-@@ -10100,6 +10118,7 @@ static const struct inode_operations btr
+@@ -10101,6 +10119,7 @@ static const struct inode_operations btr
static const struct inode_operations btrfs_dir_ro_inode_operations = {
.lookup = btrfs_lookup,
.permission = btrfs_permission,
@@ -1696,7 +1696,7 @@ diff -NurpP --minimal linux-4.4.161/fs/btrfs/inode.c linux-4.4.161-vs2.3.9.8/fs/
.get_acl = btrfs_get_acl,
.set_acl = btrfs_set_acl,
.update_time = btrfs_update_time,
-@@ -10170,6 +10189,7 @@ static const struct inode_operations btr
+@@ -10171,6 +10190,7 @@ static const struct inode_operations btr
.removexattr = btrfs_removexattr,
.permission = btrfs_permission,
.fiemap = btrfs_fiemap,
@@ -1704,9 +1704,9 @@ diff -NurpP --minimal linux-4.4.161/fs/btrfs/inode.c linux-4.4.161-vs2.3.9.8/fs/
.get_acl = btrfs_get_acl,
.set_acl = btrfs_set_acl,
.update_time = btrfs_update_time,
-diff -NurpP --minimal linux-4.4.161/fs/btrfs/ioctl.c linux-4.4.161-vs2.3.9.8/fs/btrfs/ioctl.c
---- linux-4.4.161/fs/btrfs/ioctl.c 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/btrfs/ioctl.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/btrfs/ioctl.c linux-4.4.197-vs2.3.9.8/fs/btrfs/ioctl.c
+--- linux-4.4.197/fs/btrfs/ioctl.c 2019-10-22 12:34:30.728719635 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/btrfs/ioctl.c 2019-02-22 08:20:32.720975184 +0000
@@ -108,10 +108,13 @@ static unsigned int btrfs_flags_to_ioctl
{
unsigned int iflags = 0;
@@ -1885,9 +1885,9 @@ diff -NurpP --minimal linux-4.4.161/fs/btrfs/ioctl.c linux-4.4.161-vs2.3.9.8/fs/
if (flags & FS_APPEND_FL)
ip->flags |= BTRFS_INODE_APPEND;
else
-diff -NurpP --minimal linux-4.4.161/fs/btrfs/super.c linux-4.4.161-vs2.3.9.8/fs/btrfs/super.c
---- linux-4.4.161/fs/btrfs/super.c 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/btrfs/super.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/btrfs/super.c linux-4.4.197-vs2.3.9.8/fs/btrfs/super.c
+--- linux-4.4.197/fs/btrfs/super.c 2019-10-22 12:34:30.738719477 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/btrfs/super.c 2019-02-22 08:20:32.730975015 +0000
@@ -306,7 +306,7 @@ enum {
#ifdef CONFIG_BTRFS_DEBUG
Opt_fragment_data, Opt_fragment_metadata, Opt_fragment_all,
@@ -1943,9 +1943,9 @@ diff -NurpP --minimal linux-4.4.161/fs/btrfs/super.c linux-4.4.161-vs2.3.9.8/fs/
if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
goto out;
-diff -NurpP --minimal linux-4.4.161/fs/char_dev.c linux-4.4.161-vs2.3.9.8/fs/char_dev.c
---- linux-4.4.161/fs/char_dev.c 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/char_dev.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/char_dev.c linux-4.4.197-vs2.3.9.8/fs/char_dev.c
+--- linux-4.4.197/fs/char_dev.c 2019-10-22 12:34:30.948716122 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/char_dev.c 2019-10-05 14:35:32.892802392 +0000
@@ -21,6 +21,8 @@
#include <linux/mutex.h>
#include <linux/backing-dev.h>
@@ -1955,7 +1955,7 @@ diff -NurpP --minimal linux-4.4.161/fs/char_dev.c linux-4.4.161-vs2.3.9.8/fs/cha
#include "internal.h"
-@@ -350,14 +352,21 @@ static int chrdev_open(struct inode *ino
+@@ -356,14 +358,21 @@ static int chrdev_open(struct inode *ino
struct cdev *p;
struct cdev *new = NULL;
int ret = 0;
@@ -1978,9 +1978,9 @@ diff -NurpP --minimal linux-4.4.161/fs/char_dev.c linux-4.4.161-vs2.3.9.8/fs/cha
if (!kobj)
return -ENXIO;
new = container_of(kobj, struct cdev, kobj);
-diff -NurpP --minimal linux-4.4.161/fs/dcache.c linux-4.4.161-vs2.3.9.8/fs/dcache.c
---- linux-4.4.161/fs/dcache.c 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/dcache.c 2018-10-20 05:50:20.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/dcache.c linux-4.4.197-vs2.3.9.8/fs/dcache.c
+--- linux-4.4.197/fs/dcache.c 2019-10-22 12:34:31.358709568 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/dcache.c 2019-10-05 14:35:33.302795887 +0000
@@ -39,6 +39,7 @@
#include <linux/ratelimit.h>
#include <linux/list_lru.h>
@@ -2038,7 +2038,7 @@ diff -NurpP --minimal linux-4.4.161/fs/dcache.c linux-4.4.161-vs2.3.9.8/fs/dcach
spin_unlock(&dentry->d_lock);
if (parent)
spin_unlock(&parent->d_lock);
-@@ -1587,6 +1595,9 @@ struct dentry *__d_alloc(struct super_bl
+@@ -1581,6 +1589,9 @@ struct dentry *__d_alloc(struct super_bl
struct dentry *dentry;
char *dname;
@@ -2048,7 +2048,7 @@ diff -NurpP --minimal linux-4.4.161/fs/dcache.c linux-4.4.161-vs2.3.9.8/fs/dcach
dentry = kmem_cache_alloc(dentry_cache, GFP_KERNEL);
if (!dentry)
return NULL;
-@@ -1625,6 +1636,7 @@ struct dentry *__d_alloc(struct super_bl
+@@ -1619,6 +1630,7 @@ struct dentry *__d_alloc(struct super_bl
dentry->d_lockref.count = 1;
dentry->d_flags = 0;
@@ -2056,7 +2056,7 @@ diff -NurpP --minimal linux-4.4.161/fs/dcache.c linux-4.4.161-vs2.3.9.8/fs/dcach
spin_lock_init(&dentry->d_lock);
seqcount_init(&dentry->d_seq);
dentry->d_inode = NULL;
-@@ -2385,6 +2397,7 @@ struct dentry *__d_lookup(const struct d
+@@ -2379,6 +2391,7 @@ struct dentry *__d_lookup(const struct d
}
dentry->d_lockref.count++;
@@ -2064,7 +2064,7 @@ diff -NurpP --minimal linux-4.4.161/fs/dcache.c linux-4.4.161-vs2.3.9.8/fs/dcach
found = dentry;
spin_unlock(&dentry->d_lock);
break;
-@@ -3401,6 +3414,7 @@ static enum d_walk_ret d_genocide_kill(v
+@@ -3395,6 +3408,7 @@ static enum d_walk_ret d_genocide_kill(v
if (!(dentry->d_flags & DCACHE_GENOCIDE)) {
dentry->d_flags |= DCACHE_GENOCIDE;
dentry->d_lockref.count--;
@@ -2072,9 +2072,9 @@ diff -NurpP --minimal linux-4.4.161/fs/dcache.c linux-4.4.161-vs2.3.9.8/fs/dcach
}
}
return D_WALK_CONTINUE;
-diff -NurpP --minimal linux-4.4.161/fs/devpts/inode.c linux-4.4.161-vs2.3.9.8/fs/devpts/inode.c
---- linux-4.4.161/fs/devpts/inode.c 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/devpts/inode.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/devpts/inode.c linux-4.4.197-vs2.3.9.8/fs/devpts/inode.c
+--- linux-4.4.197/fs/devpts/inode.c 2019-10-22 12:34:31.418708612 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/devpts/inode.c 2018-10-20 04:57:21.000000000 +0000
@@ -27,6 +27,7 @@
#include <linux/parser.h>
#include <linux/fsnotify.h>
@@ -2162,9 +2162,9 @@ diff -NurpP --minimal linux-4.4.161/fs/devpts/inode.c linux-4.4.161-vs2.3.9.8/fs
inode->i_private = priv;
sprintf(s, "%d", index);
-diff -NurpP --minimal linux-4.4.161/fs/ext2/balloc.c linux-4.4.161-vs2.3.9.8/fs/ext2/balloc.c
---- linux-4.4.161/fs/ext2/balloc.c 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/ext2/balloc.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/ext2/balloc.c linux-4.4.197-vs2.3.9.8/fs/ext2/balloc.c
+--- linux-4.4.197/fs/ext2/balloc.c 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/ext2/balloc.c 2018-10-20 04:57:21.000000000 +0000
@@ -693,7 +693,6 @@ ext2_try_to_allocate(struct super_block
start = 0;
end = EXT2_BLOCKS_PER_GROUP(sb);
@@ -2173,9 +2173,9 @@ diff -NurpP --minimal linux-4.4.161/fs/ext2/balloc.c linux-4.4.161-vs2.3.9.8/fs/
BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb));
repeat:
-diff -NurpP --minimal linux-4.4.161/fs/ext2/ext2.h linux-4.4.161-vs2.3.9.8/fs/ext2/ext2.h
---- linux-4.4.161/fs/ext2/ext2.h 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/ext2/ext2.h 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/ext2/ext2.h linux-4.4.197-vs2.3.9.8/fs/ext2/ext2.h
+--- linux-4.4.197/fs/ext2/ext2.h 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/ext2/ext2.h 2018-10-20 04:57:21.000000000 +0000
@@ -244,8 +244,12 @@ struct ext2_group_desc
#define EXT2_NOTAIL_FL FS_NOTAIL_FL /* file tail should not be merged */
#define EXT2_DIRSYNC_FL FS_DIRSYNC_FL /* dirsync behaviour (directories only) */
@@ -2223,18 +2223,18 @@ diff -NurpP --minimal linux-4.4.161/fs/ext2/ext2.h linux-4.4.161-vs2.3.9.8/fs/ex
/* ioctl.c */
extern long ext2_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-4.4.161/fs/ext2/file.c linux-4.4.161-vs2.3.9.8/fs/ext2/file.c
---- linux-4.4.161/fs/ext2/file.c 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/ext2/file.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/ext2/file.c linux-4.4.197-vs2.3.9.8/fs/ext2/file.c
+--- linux-4.4.197/fs/ext2/file.c 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/ext2/file.c 2018-10-20 04:57:21.000000000 +0000
@@ -202,4 +202,5 @@ const struct inode_operations ext2_file_
.get_acl = ext2_get_acl,
.set_acl = ext2_set_acl,
.fiemap = ext2_fiemap,
+ .sync_flags = ext2_sync_flags,
};
-diff -NurpP --minimal linux-4.4.161/fs/ext2/ialloc.c linux-4.4.161-vs2.3.9.8/fs/ext2/ialloc.c
---- linux-4.4.161/fs/ext2/ialloc.c 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/ext2/ialloc.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/ext2/ialloc.c linux-4.4.197-vs2.3.9.8/fs/ext2/ialloc.c
+--- linux-4.4.197/fs/ext2/ialloc.c 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/ext2/ialloc.c 2018-10-20 04:57:21.000000000 +0000
@@ -17,6 +17,7 @@
#include <linux/backing-dev.h>
#include <linux/buffer_head.h>
@@ -2251,9 +2251,9 @@ diff -NurpP --minimal linux-4.4.161/fs/ext2/ialloc.c linux-4.4.161-vs2.3.9.8/fs/
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-4.4.161/fs/ext2/inode.c linux-4.4.161-vs2.3.9.8/fs/ext2/inode.c
---- linux-4.4.161/fs/ext2/inode.c 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/ext2/inode.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/ext2/inode.c linux-4.4.197-vs2.3.9.8/fs/ext2/inode.c
+--- linux-4.4.197/fs/ext2/inode.c 2019-10-22 12:34:31.748703336 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/ext2/inode.c 2018-10-20 04:57:21.000000000 +0000
@@ -33,6 +33,7 @@
#include <linux/fiemap.h>
#include <linux/namei.h>
@@ -2379,9 +2379,9 @@ diff -NurpP --minimal linux-4.4.161/fs/ext2/inode.c linux-4.4.161-vs2.3.9.8/fs/e
error = dquot_transfer(inode, iattr);
if (error)
return error;
-diff -NurpP --minimal linux-4.4.161/fs/ext2/ioctl.c linux-4.4.161-vs2.3.9.8/fs/ext2/ioctl.c
---- linux-4.4.161/fs/ext2/ioctl.c 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/ext2/ioctl.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/ext2/ioctl.c linux-4.4.197-vs2.3.9.8/fs/ext2/ioctl.c
+--- linux-4.4.197/fs/ext2/ioctl.c 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/ext2/ioctl.c 2018-10-20 04:57:21.000000000 +0000
@@ -17,6 +17,16 @@
#include <asm/uaccess.h>
@@ -2431,9 +2431,9 @@ diff -NurpP --minimal linux-4.4.161/fs/ext2/ioctl.c linux-4.4.161-vs2.3.9.8/fs/e
flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE;
ei->i_flags = flags;
-diff -NurpP --minimal linux-4.4.161/fs/ext2/namei.c linux-4.4.161-vs2.3.9.8/fs/ext2/namei.c
---- linux-4.4.161/fs/ext2/namei.c 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/ext2/namei.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/ext2/namei.c linux-4.4.197-vs2.3.9.8/fs/ext2/namei.c
+--- linux-4.4.197/fs/ext2/namei.c 2019-10-22 12:34:31.748703336 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/ext2/namei.c 2018-10-20 04:57:21.000000000 +0000
@@ -32,6 +32,7 @@
#include <linux/pagemap.h>
@@ -2458,9 +2458,9 @@ diff -NurpP --minimal linux-4.4.161/fs/ext2/namei.c linux-4.4.161-vs2.3.9.8/fs/e
.get_acl = ext2_get_acl,
.set_acl = ext2_set_acl,
};
-diff -NurpP --minimal linux-4.4.161/fs/ext2/super.c linux-4.4.161-vs2.3.9.8/fs/ext2/super.c
---- linux-4.4.161/fs/ext2/super.c 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/ext2/super.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/ext2/super.c linux-4.4.197-vs2.3.9.8/fs/ext2/super.c
+--- linux-4.4.197/fs/ext2/super.c 2019-10-22 12:34:31.748703336 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/ext2/super.c 2019-10-05 14:35:33.502792714 +0000
@@ -408,7 +408,8 @@ enum {
Opt_err_ro, Opt_nouid32, Opt_nocheck, Opt_debug,
Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr,
@@ -2502,7 +2502,7 @@ diff -NurpP --minimal linux-4.4.161/fs/ext2/super.c linux-4.4.161-vs2.3.9.8/fs/e
case Opt_nocheck:
clear_opt (sbi->s_mount_opt, CHECK);
break;
-@@ -884,6 +902,8 @@ static int ext2_fill_super(struct super_
+@@ -895,6 +913,8 @@ static int ext2_fill_super(struct super_
if (!parse_options((char *) data, sb))
goto failed_mount;
@@ -2511,7 +2511,7 @@ diff -NurpP --minimal linux-4.4.161/fs/ext2/super.c linux-4.4.161-vs2.3.9.8/fs/e
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
((EXT2_SB(sb)->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ?
MS_POSIXACL : 0);
-@@ -1294,6 +1314,14 @@ static int ext2_remount (struct super_bl
+@@ -1305,6 +1325,14 @@ static int ext2_remount (struct super_bl
err = -EINVAL;
goto restore_opts;
}
@@ -2526,9 +2526,9 @@ diff -NurpP --minimal linux-4.4.161/fs/ext2/super.c linux-4.4.161-vs2.3.9.8/fs/e
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-4.4.161/fs/ext4/ext4.h linux-4.4.161-vs2.3.9.8/fs/ext4/ext4.h
---- linux-4.4.161/fs/ext4/ext4.h 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/ext4/ext4.h 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/ext4/ext4.h linux-4.4.197-vs2.3.9.8/fs/ext4/ext4.h
+--- linux-4.4.197/fs/ext4/ext4.h 2019-10-22 12:34:31.838701898 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/ext4/ext4.h 2019-02-22 08:20:33.340964652 +0000
@@ -375,8 +375,11 @@ struct flex_groups {
#define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */
#define EXT4_EA_INODE_FL 0x00200000 /* Inode used for large EA */
@@ -2574,9 +2574,9 @@ diff -NurpP --minimal linux-4.4.161/fs/ext4/ext4.h linux-4.4.161-vs2.3.9.8/fs/ex
extern int ext4_alloc_da_blocks(struct inode *inode);
extern void ext4_set_aops(struct inode *inode);
extern int ext4_writepage_trans_blocks(struct inode *);
-diff -NurpP --minimal linux-4.4.161/fs/ext4/file.c linux-4.4.161-vs2.3.9.8/fs/ext4/file.c
---- linux-4.4.161/fs/ext4/file.c 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/ext4/file.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/ext4/file.c linux-4.4.197-vs2.3.9.8/fs/ext4/file.c
+--- linux-4.4.197/fs/ext4/file.c 2019-10-22 12:34:31.848701739 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/ext4/file.c 2019-10-05 14:35:33.542792081 +0000
@@ -749,5 +749,6 @@ const struct inode_operations ext4_file_
.get_acl = ext4_get_acl,
.set_acl = ext4_set_acl,
@@ -2584,9 +2584,9 @@ diff -NurpP --minimal linux-4.4.161/fs/ext4/file.c linux-4.4.161-vs2.3.9.8/fs/ex
+ .sync_flags = ext4_sync_flags,
};
-diff -NurpP --minimal linux-4.4.161/fs/ext4/ialloc.c linux-4.4.161-vs2.3.9.8/fs/ext4/ialloc.c
---- linux-4.4.161/fs/ext4/ialloc.c 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/ext4/ialloc.c 2018-10-20 05:50:20.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/ext4/ialloc.c linux-4.4.197-vs2.3.9.8/fs/ext4/ialloc.c
+--- linux-4.4.197/fs/ext4/ialloc.c 2019-10-22 12:34:31.848701739 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/ext4/ialloc.c 2018-10-20 05:50:20.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/random.h>
#include <linux/bitops.h>
@@ -2603,9 +2603,9 @@ diff -NurpP --minimal linux-4.4.161/fs/ext4/ialloc.c linux-4.4.161-vs2.3.9.8/fs/
} else
inode_init_owner(inode, dir, mode);
err = dquot_initialize(inode);
-diff -NurpP --minimal linux-4.4.161/fs/ext4/inode.c linux-4.4.161-vs2.3.9.8/fs/ext4/inode.c
---- linux-4.4.161/fs/ext4/inode.c 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/ext4/inode.c 2018-10-20 05:50:20.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/ext4/inode.c linux-4.4.197-vs2.3.9.8/fs/ext4/inode.c
+--- linux-4.4.197/fs/ext4/inode.c 2019-10-22 12:34:31.858701581 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/ext4/inode.c 2019-10-05 14:35:33.602791127 +0000
@@ -37,6 +37,7 @@
#include <linux/printk.h>
#include <linux/slab.h>
@@ -2614,7 +2614,7 @@ diff -NurpP --minimal linux-4.4.161/fs/ext4/inode.c linux-4.4.161-vs2.3.9.8/fs/e
#include "ext4_jbd2.h"
#include "xattr.h"
-@@ -4129,12 +4130,15 @@ void ext4_set_inode_flags(struct inode *
+@@ -4138,12 +4139,15 @@ void ext4_set_inode_flags(struct inode *
unsigned int flags = EXT4_I(inode)->i_flags;
unsigned int new_fl = 0;
@@ -2632,7 +2632,7 @@ diff -NurpP --minimal linux-4.4.161/fs/ext4/inode.c linux-4.4.161-vs2.3.9.8/fs/e
if (flags & EXT4_NOATIME_FL)
new_fl |= S_NOATIME;
if (flags & EXT4_DIRSYNC_FL)
-@@ -4142,31 +4146,52 @@ void ext4_set_inode_flags(struct inode *
+@@ -4151,31 +4155,52 @@ void ext4_set_inode_flags(struct inode *
if (test_opt(inode->i_sb, DAX))
new_fl |= S_DAX;
inode_set_flags(inode, new_fl,
@@ -2690,7 +2690,7 @@ diff -NurpP --minimal linux-4.4.161/fs/ext4/inode.c linux-4.4.161-vs2.3.9.8/fs/e
} while (cmpxchg(&ei->i_flags, old_fl, new_fl) != old_fl);
}
-@@ -4276,8 +4301,10 @@ struct inode *ext4_iget(struct super_blo
+@@ -4285,8 +4310,10 @@ struct inode *ext4_iget(struct super_blo
i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
}
@@ -2703,7 +2703,7 @@ diff -NurpP --minimal linux-4.4.161/fs/ext4/inode.c linux-4.4.161-vs2.3.9.8/fs/e
set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
ext4_clear_state_flags(ei); /* Only relevant on 32-bit archs */
-@@ -4591,8 +4618,10 @@ static int ext4_do_update_inode(handle_t
+@@ -4600,8 +4627,10 @@ static int ext4_do_update_inode(handle_t
ext4_get_inode_flags(ei);
raw_inode->i_mode = cpu_to_le16(inode->i_mode);
@@ -2716,7 +2716,7 @@ diff -NurpP --minimal linux-4.4.161/fs/ext4/inode.c linux-4.4.161-vs2.3.9.8/fs/e
if (!(test_opt(inode->i_sb, NO_UID32))) {
raw_inode->i_uid_low = cpu_to_le16(low_16_bits(i_uid));
raw_inode->i_gid_low = cpu_to_le16(low_16_bits(i_gid));
-@@ -4615,6 +4644,9 @@ static int ext4_do_update_inode(handle_t
+@@ -4624,6 +4653,9 @@ static int ext4_do_update_inode(handle_t
raw_inode->i_uid_high = 0;
raw_inode->i_gid_high = 0;
}
@@ -2726,7 +2726,7 @@ diff -NurpP --minimal linux-4.4.161/fs/ext4/inode.c linux-4.4.161-vs2.3.9.8/fs/e
raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
EXT4_INODE_SET_XTIME(i_ctime, inode, raw_inode);
-@@ -4860,7 +4892,8 @@ int ext4_setattr(struct dentry *dentry,
+@@ -4869,7 +4901,8 @@ int ext4_setattr(struct dentry *dentry,
return error;
}
if ((ia_valid & ATTR_UID && !uid_eq(attr->ia_uid, inode->i_uid)) ||
@@ -2736,7 +2736,7 @@ diff -NurpP --minimal linux-4.4.161/fs/ext4/inode.c linux-4.4.161-vs2.3.9.8/fs/e
handle_t *handle;
/* (user+group)*(old+new) structure, inode write (sb,
-@@ -4883,6 +4916,8 @@ int ext4_setattr(struct dentry *dentry,
+@@ -4892,6 +4925,8 @@ int ext4_setattr(struct dentry *dentry,
inode->i_uid = attr->ia_uid;
if (attr->ia_valid & ATTR_GID)
inode->i_gid = attr->ia_gid;
@@ -2745,9 +2745,9 @@ diff -NurpP --minimal linux-4.4.161/fs/ext4/inode.c linux-4.4.161-vs2.3.9.8/fs/e
error = ext4_mark_inode_dirty(handle, inode);
ext4_journal_stop(handle);
}
-diff -NurpP --minimal linux-4.4.161/fs/ext4/ioctl.c linux-4.4.161-vs2.3.9.8/fs/ext4/ioctl.c
---- linux-4.4.161/fs/ext4/ioctl.c 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/ext4/ioctl.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/ext4/ioctl.c linux-4.4.197-vs2.3.9.8/fs/ext4/ioctl.c
+--- linux-4.4.197/fs/ext4/ioctl.c 2019-10-22 12:34:31.858701581 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/ext4/ioctl.c 2019-10-05 14:35:33.662790177 +0000
@@ -14,6 +14,7 @@
#include <linux/mount.h>
#include <linux/file.h>
@@ -2813,9 +2813,9 @@ diff -NurpP --minimal linux-4.4.161/fs/ext4/ioctl.c linux-4.4.161-vs2.3.9.8/fs/e
if (!capable(CAP_LINUX_IMMUTABLE))
goto flags_out;
}
-diff -NurpP --minimal linux-4.4.161/fs/ext4/namei.c linux-4.4.161-vs2.3.9.8/fs/ext4/namei.c
---- linux-4.4.161/fs/ext4/namei.c 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/ext4/namei.c 2018-10-20 05:50:20.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/ext4/namei.c linux-4.4.197-vs2.3.9.8/fs/ext4/namei.c
+--- linux-4.4.197/fs/ext4/namei.c 2019-10-22 12:34:31.868701419 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/ext4/namei.c 2019-02-22 08:20:33.380963972 +0000
@@ -33,6 +33,7 @@
#include <linux/quotaops.h>
#include <linux/buffer_head.h>
@@ -2824,7 +2824,7 @@ diff -NurpP --minimal linux-4.4.161/fs/ext4/namei.c linux-4.4.161-vs2.3.9.8/fs/e
#include "ext4.h"
#include "ext4_jbd2.h"
-@@ -1445,6 +1446,7 @@ restart:
+@@ -1446,6 +1447,7 @@ restart:
ll_rw_block(READ | REQ_META | REQ_PRIO,
1, &bh);
}
@@ -2832,7 +2832,7 @@ diff -NurpP --minimal linux-4.4.161/fs/ext4/namei.c linux-4.4.161-vs2.3.9.8/fs/e
}
if ((bh = bh_use[ra_ptr++]) == NULL)
goto next;
-@@ -3881,6 +3883,7 @@ const struct inode_operations ext4_dir_i
+@@ -3884,6 +3886,7 @@ const struct inode_operations ext4_dir_i
.get_acl = ext4_get_acl,
.set_acl = ext4_set_acl,
.fiemap = ext4_fiemap,
@@ -2840,10 +2840,10 @@ diff -NurpP --minimal linux-4.4.161/fs/ext4/namei.c linux-4.4.161-vs2.3.9.8/fs/e
};
const struct inode_operations ext4_special_inode_operations = {
-diff -NurpP --minimal linux-4.4.161/fs/ext4/super.c linux-4.4.161-vs2.3.9.8/fs/ext4/super.c
---- linux-4.4.161/fs/ext4/super.c 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/ext4/super.c 2018-10-20 05:50:20.000000000 +0000
-@@ -1166,6 +1166,7 @@ enum {
+diff -NurpP --minimal linux-4.4.197/fs/ext4/super.c linux-4.4.197-vs2.3.9.8/fs/ext4/super.c
+--- linux-4.4.197/fs/ext4/super.c 2019-10-22 12:34:31.868701419 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/ext4/super.c 2019-10-05 14:35:33.702789543 +0000
+@@ -1177,6 +1177,7 @@ enum {
Opt_dioread_nolock, Opt_dioread_lock,
Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable,
Opt_max_dir_size_kb, Opt_nojournal_checksum,
@@ -2851,7 +2851,7 @@ diff -NurpP --minimal linux-4.4.161/fs/ext4/super.c linux-4.4.161-vs2.3.9.8/fs/e
};
static const match_table_t tokens = {
-@@ -1251,6 +1252,9 @@ static const match_table_t tokens = {
+@@ -1262,6 +1263,9 @@ static const match_table_t tokens = {
{Opt_removed, "reservation"}, /* mount option from ext2/3 */
{Opt_removed, "noreservation"}, /* mount option from ext2/3 */
{Opt_removed, "journal=%u"}, /* mount option from ext2/3 */
@@ -2861,7 +2861,7 @@ diff -NurpP --minimal linux-4.4.161/fs/ext4/super.c linux-4.4.161-vs2.3.9.8/fs/e
{Opt_err, NULL},
};
-@@ -1493,6 +1497,20 @@ static int handle_mount_opt(struct super
+@@ -1504,6 +1508,20 @@ static int handle_mount_opt(struct super
case Opt_nolazytime:
sb->s_flags &= ~MS_LAZYTIME;
return 1;
@@ -2882,7 +2882,7 @@ diff -NurpP --minimal linux-4.4.161/fs/ext4/super.c linux-4.4.161-vs2.3.9.8/fs/e
}
for (m = ext4_mount_opts; m->token != Opt_err; m++)
-@@ -3414,6 +3432,9 @@ static int ext4_fill_super(struct super_
+@@ -3425,6 +3443,9 @@ static int ext4_fill_super(struct super_
sb->s_iflags |= SB_I_CGROUPWB;
}
@@ -2892,7 +2892,7 @@ diff -NurpP --minimal linux-4.4.161/fs/ext4/super.c linux-4.4.161-vs2.3.9.8/fs/e
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-@@ -4792,6 +4813,14 @@ static int ext4_remount(struct super_blo
+@@ -4803,6 +4824,14 @@ static int ext4_remount(struct super_blo
if (sbi->s_mount_flags & EXT4_MF_FS_ABORTED)
ext4_abort(sb, "Abort forced by user");
@@ -2907,9 +2907,9 @@ diff -NurpP --minimal linux-4.4.161/fs/ext4/super.c linux-4.4.161-vs2.3.9.8/fs/e
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-4.4.161/fs/fcntl.c linux-4.4.161-vs2.3.9.8/fs/fcntl.c
---- linux-4.4.161/fs/fcntl.c 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/fcntl.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/fcntl.c linux-4.4.197-vs2.3.9.8/fs/fcntl.c
+--- linux-4.4.197/fs/fcntl.c 2019-10-22 12:34:32.028698862 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/fcntl.c 2018-10-20 04:57:21.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/pid_namespace.h>
#include <linux/user_namespace.h>
@@ -2927,9 +2927,9 @@ diff -NurpP --minimal linux-4.4.161/fs/fcntl.c linux-4.4.161-vs2.3.9.8/fs/fcntl.
if (unlikely(f.file->f_mode & FMODE_PATH)) {
if (!check_fcntl_cmd(cmd))
-diff -NurpP --minimal linux-4.4.161/fs/file.c linux-4.4.161-vs2.3.9.8/fs/file.c
---- linux-4.4.161/fs/file.c 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/file.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/file.c linux-4.4.197-vs2.3.9.8/fs/file.c
+--- linux-4.4.197/fs/file.c 2019-10-22 12:34:32.038698704 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/file.c 2019-10-05 14:35:33.802787957 +0000
@@ -22,6 +22,7 @@
#include <linux/spinlock.h>
#include <linux/rcupdate.h>
@@ -2959,7 +2959,7 @@ diff -NurpP --minimal linux-4.4.161/fs/file.c linux-4.4.161-vs2.3.9.8/fs/file.c
}
}
-@@ -538,6 +543,7 @@ repeat:
+@@ -539,6 +544,7 @@ repeat:
else
__clear_close_on_exec(fd, fdt);
error = fd;
@@ -2967,7 +2967,7 @@ diff -NurpP --minimal linux-4.4.161/fs/file.c linux-4.4.161-vs2.3.9.8/fs/file.c
#if 1
/* Sanity check */
if (rcu_access_pointer(fdt->fd[fd]) != NULL) {
-@@ -568,6 +574,7 @@ static void __put_unused_fd(struct files
+@@ -569,6 +575,7 @@ static void __put_unused_fd(struct files
__clear_open_fd(fd, fdt);
if (fd < files->next_fd)
files->next_fd = fd;
@@ -2975,7 +2975,7 @@ diff -NurpP --minimal linux-4.4.161/fs/file.c linux-4.4.161-vs2.3.9.8/fs/file.c
}
void put_unused_fd(unsigned int fd)
-@@ -850,6 +857,8 @@ __releases(&files->file_lock)
+@@ -851,6 +858,8 @@ __releases(&files->file_lock)
if (tofree)
filp_close(tofree, files);
@@ -2984,9 +2984,9 @@ diff -NurpP --minimal linux-4.4.161/fs/file.c linux-4.4.161-vs2.3.9.8/fs/file.c
return fd;
-diff -NurpP --minimal linux-4.4.161/fs/file_table.c linux-4.4.161-vs2.3.9.8/fs/file_table.c
---- linux-4.4.161/fs/file_table.c 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/file_table.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/file_table.c linux-4.4.197-vs2.3.9.8/fs/file_table.c
+--- linux-4.4.197/fs/file_table.c 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/file_table.c 2018-10-20 04:57:21.000000000 +0000
@@ -26,6 +26,8 @@
#include <linux/task_work.h>
#include <linux/ima.h>
@@ -3023,9 +3023,9 @@ diff -NurpP --minimal linux-4.4.161/fs/file_table.c linux-4.4.161-vs2.3.9.8/fs/f
file_free(file);
}
}
-diff -NurpP --minimal linux-4.4.161/fs/fs_struct.c linux-4.4.161-vs2.3.9.8/fs/fs_struct.c
---- linux-4.4.161/fs/fs_struct.c 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/fs_struct.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/fs_struct.c linux-4.4.197-vs2.3.9.8/fs/fs_struct.c
+--- linux-4.4.197/fs/fs_struct.c 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/fs_struct.c 2018-10-20 04:57:21.000000000 +0000
@@ -4,6 +4,7 @@
#include <linux/path.h>
#include <linux/slab.h>
@@ -3050,9 +3050,9 @@ diff -NurpP --minimal linux-4.4.161/fs/fs_struct.c linux-4.4.161-vs2.3.9.8/fs/fs
}
return fs;
}
-diff -NurpP --minimal linux-4.4.161/fs/gfs2/file.c linux-4.4.161-vs2.3.9.8/fs/gfs2/file.c
---- linux-4.4.161/fs/gfs2/file.c 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/gfs2/file.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/gfs2/file.c linux-4.4.197-vs2.3.9.8/fs/gfs2/file.c
+--- linux-4.4.197/fs/gfs2/file.c 2019-10-22 12:34:32.208695985 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/gfs2/file.c 2018-10-20 04:57:21.000000000 +0000
@@ -137,6 +137,9 @@ static const u32 fsflags_to_gfs2[32] = {
[12] = GFS2_DIF_EXHASH,
[14] = GFS2_DIF_INHERIT_JDATA,
@@ -3174,9 +3174,9 @@ diff -NurpP --minimal linux-4.4.161/fs/gfs2/file.c linux-4.4.161-vs2.3.9.8/fs/gf
static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
switch(cmd) {
-diff -NurpP --minimal linux-4.4.161/fs/gfs2/inode.h linux-4.4.161-vs2.3.9.8/fs/gfs2/inode.h
---- linux-4.4.161/fs/gfs2/inode.h 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/gfs2/inode.h 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/gfs2/inode.h linux-4.4.197-vs2.3.9.8/fs/gfs2/inode.h
+--- linux-4.4.197/fs/gfs2/inode.h 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/gfs2/inode.h 2018-10-20 04:57:21.000000000 +0000
@@ -118,6 +118,7 @@ extern const struct file_operations gfs2
extern const struct file_operations gfs2_dir_fops_nolock;
@@ -3185,9 +3185,9 @@ diff -NurpP --minimal linux-4.4.161/fs/gfs2/inode.h linux-4.4.161-vs2.3.9.8/fs/g
#ifdef CONFIG_GFS2_FS_LOCKING_DLM
extern const struct file_operations gfs2_file_fops;
-diff -NurpP --minimal linux-4.4.161/fs/hostfs/hostfs.h linux-4.4.161-vs2.3.9.8/fs/hostfs/hostfs.h
---- linux-4.4.161/fs/hostfs/hostfs.h 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/hostfs/hostfs.h 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/hostfs/hostfs.h linux-4.4.197-vs2.3.9.8/fs/hostfs/hostfs.h
+--- linux-4.4.197/fs/hostfs/hostfs.h 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/hostfs/hostfs.h 2018-10-20 04:57:21.000000000 +0000
@@ -42,6 +42,7 @@ struct hostfs_iattr {
unsigned short ia_mode;
uid_t ia_uid;
@@ -3196,9 +3196,9 @@ diff -NurpP --minimal linux-4.4.161/fs/hostfs/hostfs.h linux-4.4.161-vs2.3.9.8/f
loff_t ia_size;
struct timespec ia_atime;
struct timespec ia_mtime;
-diff -NurpP --minimal linux-4.4.161/fs/inode.c linux-4.4.161-vs2.3.9.8/fs/inode.c
---- linux-4.4.161/fs/inode.c 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/inode.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/inode.c linux-4.4.197-vs2.3.9.8/fs/inode.c
+--- linux-4.4.197/fs/inode.c 2019-10-22 12:34:32.438692310 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/inode.c 2019-10-05 14:35:34.142782561 +0000
@@ -18,6 +18,7 @@
#include <linux/buffer_head.h> /* for inode_has_buffers */
#include <linux/ratelimit.h>
@@ -3231,8 +3231,8 @@ diff -NurpP --minimal linux-4.4.161/fs/inode.c linux-4.4.161-vs2.3.9.8/fs/inode.
+ inode->i_mdev = 0;
inode->dirtied_when = 0;
- if (security_inode_alloc(inode))
-@@ -469,6 +474,8 @@ void __insert_inode_hash(struct inode *i
+ #ifdef CONFIG_CGROUP_WRITEBACK
+@@ -475,6 +480,8 @@ void __insert_inode_hash(struct inode *i
}
EXPORT_SYMBOL(__insert_inode_hash);
@@ -3241,7 +3241,7 @@ diff -NurpP --minimal linux-4.4.161/fs/inode.c linux-4.4.161-vs2.3.9.8/fs/inode.
/**
* __remove_inode_hash - remove an inode from the hash
* @inode: inode to unhash
-@@ -1911,9 +1918,11 @@ void init_special_inode(struct inode *in
+@@ -1922,9 +1929,11 @@ void init_special_inode(struct inode *in
if (S_ISCHR(mode)) {
inode->i_fop = &def_chr_fops;
inode->i_rdev = rdev;
@@ -3253,7 +3253,7 @@ diff -NurpP --minimal linux-4.4.161/fs/inode.c linux-4.4.161-vs2.3.9.8/fs/inode.
} else if (S_ISFIFO(mode))
inode->i_fop = &pipefifo_fops;
else if (S_ISSOCK(mode))
-@@ -1948,6 +1957,7 @@ void inode_init_owner(struct inode *inod
+@@ -1959,6 +1968,7 @@ void inode_init_owner(struct inode *inod
} else
inode->i_gid = current_fsgid();
inode->i_mode = mode;
@@ -3261,9 +3261,9 @@ diff -NurpP --minimal linux-4.4.161/fs/inode.c linux-4.4.161-vs2.3.9.8/fs/inode.
}
EXPORT_SYMBOL(inode_init_owner);
-diff -NurpP --minimal linux-4.4.161/fs/ioctl.c linux-4.4.161-vs2.3.9.8/fs/ioctl.c
---- linux-4.4.161/fs/ioctl.c 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/ioctl.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/ioctl.c linux-4.4.197-vs2.3.9.8/fs/ioctl.c
+--- linux-4.4.197/fs/ioctl.c 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/ioctl.c 2018-10-20 04:57:21.000000000 +0000
@@ -15,6 +15,9 @@
#include <linux/writeback.h>
#include <linux/buffer_head.h>
@@ -3274,9 +3274,9 @@ diff -NurpP --minimal linux-4.4.161/fs/ioctl.c linux-4.4.161-vs2.3.9.8/fs/ioctl.
#include <asm/ioctls.h>
-diff -NurpP --minimal linux-4.4.161/fs/jfs/file.c linux-4.4.161-vs2.3.9.8/fs/jfs/file.c
---- linux-4.4.161/fs/jfs/file.c 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/jfs/file.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/jfs/file.c linux-4.4.197-vs2.3.9.8/fs/jfs/file.c
+--- linux-4.4.197/fs/jfs/file.c 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/jfs/file.c 2018-10-20 04:57:21.000000000 +0000
@@ -113,7 +113,8 @@ int jfs_setattr(struct dentry *dentry, s
return rc;
}
@@ -3295,9 +3295,9 @@ diff -NurpP --minimal linux-4.4.161/fs/jfs/file.c linux-4.4.161-vs2.3.9.8/fs/jfs
};
const struct file_operations jfs_file_operations = {
-diff -NurpP --minimal linux-4.4.161/fs/jfs/ioctl.c linux-4.4.161-vs2.3.9.8/fs/jfs/ioctl.c
---- linux-4.4.161/fs/jfs/ioctl.c 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/jfs/ioctl.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/jfs/ioctl.c linux-4.4.197-vs2.3.9.8/fs/jfs/ioctl.c
+--- linux-4.4.197/fs/jfs/ioctl.c 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/jfs/ioctl.c 2018-10-20 04:57:21.000000000 +0000
@@ -12,6 +12,7 @@
#include <linux/time.h>
#include <linux/sched.h>
@@ -3355,9 +3355,9 @@ diff -NurpP --minimal linux-4.4.161/fs/jfs/ioctl.c linux-4.4.161-vs2.3.9.8/fs/jf
flags |= oldflags & ~JFS_FL_USER_MODIFIABLE;
jfs_inode->mode2 = flags;
-diff -NurpP --minimal linux-4.4.161/fs/jfs/jfs_dinode.h linux-4.4.161-vs2.3.9.8/fs/jfs/jfs_dinode.h
---- linux-4.4.161/fs/jfs/jfs_dinode.h 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/jfs/jfs_dinode.h 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/jfs/jfs_dinode.h linux-4.4.197-vs2.3.9.8/fs/jfs/jfs_dinode.h
+--- linux-4.4.197/fs/jfs/jfs_dinode.h 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/jfs/jfs_dinode.h 2018-10-20 04:57:21.000000000 +0000
@@ -161,9 +161,13 @@ struct dinode {
#define JFS_APPEND_FL 0x01000000 /* writes to file may only append */
@@ -3374,9 +3374,9 @@ diff -NurpP --minimal linux-4.4.161/fs/jfs/jfs_dinode.h linux-4.4.161-vs2.3.9.8/
#define JFS_FL_INHERIT 0x03C80000
/* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */
-diff -NurpP --minimal linux-4.4.161/fs/jfs/jfs_filsys.h linux-4.4.161-vs2.3.9.8/fs/jfs/jfs_filsys.h
---- linux-4.4.161/fs/jfs/jfs_filsys.h 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/jfs/jfs_filsys.h 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/jfs/jfs_filsys.h linux-4.4.197-vs2.3.9.8/fs/jfs/jfs_filsys.h
+--- linux-4.4.197/fs/jfs/jfs_filsys.h 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/jfs/jfs_filsys.h 2018-10-20 04:57:21.000000000 +0000
@@ -266,6 +266,7 @@
#define JFS_NAME_MAX 255
#define JFS_PATH_MAX BPSIZE
@@ -3385,9 +3385,9 @@ diff -NurpP --minimal linux-4.4.161/fs/jfs/jfs_filsys.h linux-4.4.161-vs2.3.9.8/
/*
* file system state (superblock state)
-diff -NurpP --minimal linux-4.4.161/fs/jfs/jfs_imap.c linux-4.4.161-vs2.3.9.8/fs/jfs/jfs_imap.c
---- linux-4.4.161/fs/jfs/jfs_imap.c 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/jfs/jfs_imap.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/jfs/jfs_imap.c linux-4.4.197-vs2.3.9.8/fs/jfs/jfs_imap.c
+--- linux-4.4.197/fs/jfs/jfs_imap.c 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/jfs/jfs_imap.c 2018-10-20 04:57:21.000000000 +0000
@@ -46,6 +46,7 @@
#include <linux/pagemap.h>
#include <linux/quotaops.h>
@@ -3451,9 +3451,9 @@ diff -NurpP --minimal linux-4.4.161/fs/jfs/jfs_imap.c linux-4.4.161-vs2.3.9.8/fs
jfs_get_inode_flags(jfs_ip);
/*
* mode2 is only needed for storing the higher order bits.
-diff -NurpP --minimal linux-4.4.161/fs/jfs/jfs_inode.c linux-4.4.161-vs2.3.9.8/fs/jfs/jfs_inode.c
---- linux-4.4.161/fs/jfs/jfs_inode.c 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/jfs/jfs_inode.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/jfs/jfs_inode.c linux-4.4.197-vs2.3.9.8/fs/jfs/jfs_inode.c
+--- linux-4.4.197/fs/jfs/jfs_inode.c 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/jfs/jfs_inode.c 2018-10-20 04:57:21.000000000 +0000
@@ -18,6 +18,7 @@
#include <linux/fs.h>
@@ -3524,9 +3524,9 @@ diff -NurpP --minimal linux-4.4.161/fs/jfs/jfs_inode.c linux-4.4.161-vs2.3.9.8/f
}
/*
-diff -NurpP --minimal linux-4.4.161/fs/jfs/jfs_inode.h linux-4.4.161-vs2.3.9.8/fs/jfs/jfs_inode.h
---- linux-4.4.161/fs/jfs/jfs_inode.h 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/jfs/jfs_inode.h 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/jfs/jfs_inode.h linux-4.4.197-vs2.3.9.8/fs/jfs/jfs_inode.h
+--- linux-4.4.197/fs/jfs/jfs_inode.h 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/jfs/jfs_inode.h 2018-10-20 04:57:21.000000000 +0000
@@ -39,6 +39,7 @@ extern struct dentry *jfs_fh_to_dentry(s
extern struct dentry *jfs_fh_to_parent(struct super_block *sb, struct fid *fid,
int fh_len, int fh_type);
@@ -3535,9 +3535,9 @@ diff -NurpP --minimal linux-4.4.161/fs/jfs/jfs_inode.h linux-4.4.161-vs2.3.9.8/f
extern int jfs_get_block(struct inode *, sector_t, struct buffer_head *, int);
extern int jfs_setattr(struct dentry *, struct iattr *);
-diff -NurpP --minimal linux-4.4.161/fs/jfs/namei.c linux-4.4.161-vs2.3.9.8/fs/jfs/namei.c
---- linux-4.4.161/fs/jfs/namei.c 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/jfs/namei.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/jfs/namei.c linux-4.4.197-vs2.3.9.8/fs/jfs/namei.c
+--- linux-4.4.197/fs/jfs/namei.c 2019-10-22 12:34:32.898684963 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/jfs/namei.c 2018-10-20 04:57:21.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/ctype.h>
#include <linux/quotaops.h>
@@ -3562,9 +3562,9 @@ diff -NurpP --minimal linux-4.4.161/fs/jfs/namei.c linux-4.4.161-vs2.3.9.8/fs/jf
};
const struct file_operations jfs_dir_operations = {
-diff -NurpP --minimal linux-4.4.161/fs/jfs/super.c linux-4.4.161-vs2.3.9.8/fs/jfs/super.c
---- linux-4.4.161/fs/jfs/super.c 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/jfs/super.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/jfs/super.c linux-4.4.197-vs2.3.9.8/fs/jfs/super.c
+--- linux-4.4.197/fs/jfs/super.c 2019-10-22 12:34:32.928684480 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/jfs/super.c 2018-10-20 04:57:21.000000000 +0000
@@ -206,7 +206,8 @@ enum {
Opt_integrity, Opt_nointegrity, Opt_iocharset, Opt_resize,
Opt_resize_nosize, Opt_errors, Opt_ignore, Opt_err, Opt_quota,
@@ -3631,9 +3631,9 @@ diff -NurpP --minimal linux-4.4.161/fs/jfs/super.c linux-4.4.161-vs2.3.9.8/fs/jf
if (newLVSize) {
pr_err("resize option for remount only\n");
-diff -NurpP --minimal linux-4.4.161/fs/libfs.c linux-4.4.161-vs2.3.9.8/fs/libfs.c
---- linux-4.4.161/fs/libfs.c 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/libfs.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/libfs.c linux-4.4.197-vs2.3.9.8/fs/libfs.c
+--- linux-4.4.197/fs/libfs.c 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/libfs.c 2018-10-20 04:57:21.000000000 +0000
@@ -141,13 +141,14 @@ static inline unsigned char dt_type(stru
* both impossible due to the lock on directory.
*/
@@ -3685,9 +3685,9 @@ diff -NurpP --minimal linux-4.4.161/fs/libfs.c linux-4.4.161-vs2.3.9.8/fs/libfs.
ssize_t generic_read_dir(struct file *filp, char __user *buf, size_t siz, loff_t *ppos)
{
return -EISDIR;
-diff -NurpP --minimal linux-4.4.161/fs/locks.c linux-4.4.161-vs2.3.9.8/fs/locks.c
---- linux-4.4.161/fs/locks.c 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/locks.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/locks.c linux-4.4.197-vs2.3.9.8/fs/locks.c
+--- linux-4.4.197/fs/locks.c 2019-10-22 12:34:33.328678089 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/locks.c 2018-10-20 04:57:21.000000000 +0000
@@ -129,6 +129,8 @@
#include <linux/hashtable.h>
#include <linux/percpu.h>
@@ -3883,9 +3883,9 @@ diff -NurpP --minimal linux-4.4.161/fs/locks.c linux-4.4.161-vs2.3.9.8/fs/locks.
return 0;
}
-diff -NurpP --minimal linux-4.4.161/fs/mount.h linux-4.4.161-vs2.3.9.8/fs/mount.h
---- linux-4.4.161/fs/mount.h 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/mount.h 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/mount.h linux-4.4.197-vs2.3.9.8/fs/mount.h
+--- linux-4.4.197/fs/mount.h 2019-10-22 12:34:33.348677769 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/mount.h 2018-10-20 04:57:21.000000000 +0000
@@ -68,6 +68,7 @@ struct mount {
struct hlist_head mnt_pins;
struct fs_pin mnt_umount;
@@ -3894,9 +3894,9 @@ diff -NurpP --minimal linux-4.4.161/fs/mount.h linux-4.4.161-vs2.3.9.8/fs/mount.
};
#define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */
-diff -NurpP --minimal linux-4.4.161/fs/namei.c linux-4.4.161-vs2.3.9.8/fs/namei.c
---- linux-4.4.161/fs/namei.c 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/namei.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/namei.c linux-4.4.197-vs2.3.9.8/fs/namei.c
+--- linux-4.4.197/fs/namei.c 2019-10-22 12:34:33.358677612 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/namei.c 2019-02-22 08:20:34.040952763 +0000
@@ -34,10 +34,20 @@
#include <linux/device_cgroup.h>
#include <linux/fs_struct.h>
@@ -4028,7 +4028,7 @@ diff -NurpP --minimal linux-4.4.161/fs/namei.c linux-4.4.161-vs2.3.9.8/fs/namei.
retval = do_inode_permission(inode, mask);
if (retval)
return retval;
-@@ -1585,6 +1686,9 @@ static int lookup_fast(struct nameidata
+@@ -1626,6 +1727,9 @@ static int lookup_fast(struct nameidata
*/
if (negative)
return -ENOENT;
@@ -4038,7 +4038,7 @@ diff -NurpP --minimal linux-4.4.161/fs/namei.c linux-4.4.161-vs2.3.9.8/fs/namei.
path->mnt = mnt;
path->dentry = dentry;
if (likely(__follow_mount_rcu(nd, path, inode, seqp)))
-@@ -1615,6 +1719,8 @@ unlazy:
+@@ -1656,6 +1760,8 @@ unlazy:
dput(dentry);
return -ENOENT;
}
@@ -4047,7 +4047,7 @@ diff -NurpP --minimal linux-4.4.161/fs/namei.c linux-4.4.161-vs2.3.9.8/fs/namei.
path->mnt = mnt;
path->dentry = dentry;
err = follow_managed(path, nd);
-@@ -2576,7 +2682,7 @@ static int may_delete(struct inode *dir,
+@@ -2617,7 +2723,7 @@ static int may_delete(struct inode *dir,
return -EPERM;
if (check_sticky(dir, inode) || IS_APPEND(inode) ||
@@ -4056,7 +4056,7 @@ diff -NurpP --minimal linux-4.4.161/fs/namei.c linux-4.4.161-vs2.3.9.8/fs/namei.
return -EPERM;
if (isdir) {
if (!d_is_dir(victim))
-@@ -2658,19 +2764,25 @@ int vfs_create(struct inode *dir, struct
+@@ -2699,19 +2805,25 @@ int vfs_create(struct inode *dir, struct
bool want_excl)
{
int error = may_create(dir, dentry);
@@ -4084,7 +4084,7 @@ diff -NurpP --minimal linux-4.4.161/fs/namei.c linux-4.4.161-vs2.3.9.8/fs/namei.
return error;
}
EXPORT_SYMBOL(vfs_create);
-@@ -2706,6 +2818,15 @@ static int may_open(struct path *path, i
+@@ -2747,6 +2859,15 @@ static int may_open(struct path *path, i
break;
}
@@ -4100,7 +4100,7 @@ diff -NurpP --minimal linux-4.4.161/fs/namei.c linux-4.4.161-vs2.3.9.8/fs/namei.
error = inode_permission(inode, acc_mode);
if (error)
return error;
-@@ -3183,6 +3304,16 @@ finish_open:
+@@ -3230,6 +3351,16 @@ finish_open:
}
finish_open_created:
error = may_open(&nd->path, acc_mode, open_flag);
@@ -4117,7 +4117,7 @@ diff -NurpP --minimal linux-4.4.161/fs/namei.c linux-4.4.161-vs2.3.9.8/fs/namei.
if (error)
goto out;
-@@ -3307,6 +3438,9 @@ static struct file *path_openat(struct n
+@@ -3354,6 +3485,9 @@ static struct file *path_openat(struct n
int opened = 0;
int error;
@@ -4127,7 +4127,7 @@ diff -NurpP --minimal linux-4.4.161/fs/namei.c linux-4.4.161-vs2.3.9.8/fs/namei.
file = get_empty_filp();
if (IS_ERR(file))
return file;
-@@ -3333,6 +3467,12 @@ static struct file *path_openat(struct n
+@@ -3380,6 +3514,12 @@ static struct file *path_openat(struct n
}
}
terminate_walk(nd);
@@ -4140,7 +4140,7 @@ diff -NurpP --minimal linux-4.4.161/fs/namei.c linux-4.4.161-vs2.3.9.8/fs/namei.
out2:
if (!(opened & FILE_OPENED)) {
BUG_ON(!error);
-@@ -3453,6 +3593,11 @@ static struct dentry *filename_create(in
+@@ -3500,6 +3640,11 @@ static struct dentry *filename_create(in
goto fail;
}
putname(name);
@@ -4152,7 +4152,7 @@ diff -NurpP --minimal linux-4.4.161/fs/namei.c linux-4.4.161-vs2.3.9.8/fs/namei.
return dentry;
fail:
dput(dentry);
-@@ -3569,6 +3714,7 @@ retry:
+@@ -3616,6 +3761,7 @@ retry:
error = vfs_mknod(path.dentry->d_inode,dentry,mode,0);
break;
}
@@ -4160,7 +4160,7 @@ diff -NurpP --minimal linux-4.4.161/fs/namei.c linux-4.4.161-vs2.3.9.8/fs/namei.
out:
done_path_create(&path, dentry);
if (retry_estale(error, lookup_flags)) {
-@@ -4015,7 +4161,7 @@ int vfs_link(struct dentry *old_dentry,
+@@ -4062,7 +4208,7 @@ int vfs_link(struct dentry *old_dentry,
/*
* A link to an append-only or immutable file cannot be created.
*/
@@ -4169,7 +4169,7 @@ diff -NurpP --minimal linux-4.4.161/fs/namei.c linux-4.4.161-vs2.3.9.8/fs/namei.
return -EPERM;
if (!dir->i_op->link)
return -EPERM;
-@@ -4524,6 +4670,330 @@ int generic_readlink(struct dentry *dent
+@@ -4571,6 +4717,330 @@ int generic_readlink(struct dentry *dent
}
EXPORT_SYMBOL(generic_readlink);
@@ -4500,9 +4500,9 @@ diff -NurpP --minimal linux-4.4.161/fs/namei.c linux-4.4.161-vs2.3.9.8/fs/namei.
/* get the link contents into pagecache */
static char *page_getlink(struct dentry * dentry, struct page **ppage)
{
-diff -NurpP --minimal linux-4.4.161/fs/namespace.c linux-4.4.161-vs2.3.9.8/fs/namespace.c
---- linux-4.4.161/fs/namespace.c 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/namespace.c 2018-10-20 05:50:20.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/namespace.c linux-4.4.197-vs2.3.9.8/fs/namespace.c
+--- linux-4.4.197/fs/namespace.c 2019-10-22 12:34:33.388677130 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/namespace.c 2019-02-22 08:20:34.040952763 +0000
@@ -24,6 +24,11 @@
#include <linux/magic.h>
#include <linux/bootmem.h>
@@ -4534,7 +4534,7 @@ diff -NurpP --minimal linux-4.4.161/fs/namespace.c linux-4.4.161-vs2.3.9.8/fs/na
lock_mount_hash();
list_add_tail(&mnt->mnt_instance, &sb->s_mounts);
unlock_mount_hash();
-@@ -1645,7 +1655,8 @@ out_unlock:
+@@ -1651,7 +1661,8 @@ out_unlock:
*/
static inline bool may_mount(void)
{
@@ -4544,7 +4544,7 @@ diff -NurpP --minimal linux-4.4.161/fs/namespace.c linux-4.4.161-vs2.3.9.8/fs/na
}
/*
-@@ -2146,6 +2157,7 @@ static int do_change_type(struct path *p
+@@ -2158,6 +2169,7 @@ static int do_change_type(struct path *p
if (err)
goto out_unlock;
}
@@ -4552,7 +4552,7 @@ diff -NurpP --minimal linux-4.4.161/fs/namespace.c linux-4.4.161-vs2.3.9.8/fs/na
lock_mount_hash();
for (m = mnt; m; m = (recurse ? next_mnt(m, mnt) : NULL))
-@@ -2174,12 +2186,14 @@ static bool has_locked_children(struct m
+@@ -2186,12 +2198,14 @@ static bool has_locked_children(struct m
* do loopback mount.
*/
static int do_loopback(struct path *path, const char *old_name,
@@ -4568,7 +4568,7 @@ diff -NurpP --minimal linux-4.4.161/fs/namespace.c linux-4.4.161-vs2.3.9.8/fs/na
if (!old_name || !*old_name)
return -EINVAL;
err = kern_path(old_name, LOOKUP_FOLLOW|LOOKUP_AUTOMOUNT, &old_path);
-@@ -2259,7 +2273,7 @@ static int change_mount_flags(struct vfs
+@@ -2271,7 +2285,7 @@ static int change_mount_flags(struct vfs
* on it - tough luck.
*/
static int do_remount(struct path *path, int flags, int mnt_flags,
@@ -4577,7 +4577,7 @@ diff -NurpP --minimal linux-4.4.161/fs/namespace.c linux-4.4.161-vs2.3.9.8/fs/na
{
int err;
struct super_block *sb = path->mnt->mnt_sb;
-@@ -2767,6 +2781,7 @@ long do_mount(const char *dev_name, cons
+@@ -2779,6 +2793,7 @@ long do_mount(const char *dev_name, cons
struct path path;
int retval = 0;
int mnt_flags = 0;
@@ -4585,7 +4585,7 @@ diff -NurpP --minimal linux-4.4.161/fs/namespace.c linux-4.4.161-vs2.3.9.8/fs/na
/* Discard magic */
if ((flags & MS_MGC_MSK) == MS_MGC_VAL)
-@@ -2792,6 +2807,12 @@ long do_mount(const char *dev_name, cons
+@@ -2804,6 +2819,12 @@ long do_mount(const char *dev_name, cons
if (!(flags & MS_NOATIME))
mnt_flags |= MNT_RELATIME;
@@ -4598,7 +4598,7 @@ diff -NurpP --minimal linux-4.4.161/fs/namespace.c linux-4.4.161-vs2.3.9.8/fs/na
/* Separate the per-mountpoint flags */
if (flags & MS_NOSUID)
mnt_flags |= MNT_NOSUID;
-@@ -2816,15 +2837,17 @@ long do_mount(const char *dev_name, cons
+@@ -2828,15 +2849,17 @@ long do_mount(const char *dev_name, cons
mnt_flags |= path.mnt->mnt_flags & MNT_ATIME_MASK;
}
@@ -4618,7 +4618,7 @@ diff -NurpP --minimal linux-4.4.161/fs/namespace.c linux-4.4.161-vs2.3.9.8/fs/na
else if (flags & (MS_SHARED | MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE))
retval = do_change_type(&path, flags);
else if (flags & MS_MOVE)
-@@ -2944,6 +2967,7 @@ struct mnt_namespace *copy_mnt_ns(unsign
+@@ -2956,6 +2979,7 @@ struct mnt_namespace *copy_mnt_ns(unsign
p = next_mnt(p, old);
}
namespace_unlock();
@@ -4626,7 +4626,7 @@ diff -NurpP --minimal linux-4.4.161/fs/namespace.c linux-4.4.161-vs2.3.9.8/fs/na
if (rootmnt)
mntput(rootmnt);
-@@ -3119,9 +3143,10 @@ SYSCALL_DEFINE2(pivot_root, const char _
+@@ -3131,9 +3155,10 @@ SYSCALL_DEFINE2(pivot_root, const char _
new_mnt = real_mount(new.mnt);
root_mnt = real_mount(root.mnt);
old_mnt = real_mount(old.mnt);
@@ -4639,7 +4639,7 @@ diff -NurpP --minimal linux-4.4.161/fs/namespace.c linux-4.4.161-vs2.3.9.8/fs/na
goto out4;
if (!check_mnt(root_mnt) || !check_mnt(new_mnt))
goto out4;
-@@ -3259,6 +3284,7 @@ void put_mnt_ns(struct mnt_namespace *ns
+@@ -3271,6 +3296,7 @@ void put_mnt_ns(struct mnt_namespace *ns
if (!atomic_dec_and_test(&ns->count))
return;
drop_collected_mounts(&ns->root->mnt);
@@ -4647,9 +4647,9 @@ diff -NurpP --minimal linux-4.4.161/fs/namespace.c linux-4.4.161-vs2.3.9.8/fs/na
free_mnt_ns(ns);
}
-diff -NurpP --minimal linux-4.4.161/fs/nfs/client.c linux-4.4.161-vs2.3.9.8/fs/nfs/client.c
---- linux-4.4.161/fs/nfs/client.c 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/nfs/client.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/nfs/client.c linux-4.4.197-vs2.3.9.8/fs/nfs/client.c
+--- linux-4.4.197/fs/nfs/client.c 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/nfs/client.c 2018-10-20 04:57:21.000000000 +0000
@@ -583,6 +583,9 @@ int nfs_init_server_rpcclient(struct nfs
if (server->flags & NFS_MOUNT_SOFT)
server->client->cl_softrtry = 1;
@@ -4671,9 +4671,9 @@ diff -NurpP --minimal linux-4.4.161/fs/nfs/client.c linux-4.4.161-vs2.3.9.8/fs/n
server->maxfilesize = fsinfo->maxfilesize;
server->time_delta = fsinfo->time_delta;
-diff -NurpP --minimal linux-4.4.161/fs/nfs/dir.c linux-4.4.161-vs2.3.9.8/fs/nfs/dir.c
---- linux-4.4.161/fs/nfs/dir.c 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/nfs/dir.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/nfs/dir.c linux-4.4.197-vs2.3.9.8/fs/nfs/dir.c
+--- linux-4.4.197/fs/nfs/dir.c 2019-10-22 12:34:34.018667063 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/nfs/dir.c 2018-10-20 04:57:21.000000000 +0000
@@ -37,6 +37,7 @@
#include <linux/sched.h>
#include <linux/kmemleak.h>
@@ -4690,9 +4690,9 @@ diff -NurpP --minimal linux-4.4.161/fs/nfs/dir.c linux-4.4.161-vs2.3.9.8/fs/nfs/
no_entry:
res = d_splice_alias(inode, dentry);
if (res != NULL) {
-diff -NurpP --minimal linux-4.4.161/fs/nfs/inode.c linux-4.4.161-vs2.3.9.8/fs/nfs/inode.c
---- linux-4.4.161/fs/nfs/inode.c 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/nfs/inode.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/nfs/inode.c linux-4.4.197-vs2.3.9.8/fs/nfs/inode.c
+--- linux-4.4.197/fs/nfs/inode.c 2019-10-22 12:34:34.128665305 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/nfs/inode.c 2019-10-05 14:35:34.462777487 +0000
@@ -38,6 +38,7 @@
#include <linux/slab.h>
#include <linux/compat.h>
@@ -4755,7 +4755,7 @@ diff -NurpP --minimal linux-4.4.161/fs/nfs/inode.c linux-4.4.161-vs2.3.9.8/fs/nf
nfs_set_cache_invalid(inode, NFS_INO_INVALID_ACCESS
| NFS_INO_INVALID_ACL);
}
-@@ -1235,7 +1244,9 @@ static int nfs_check_inode_attributes(st
+@@ -1236,7 +1245,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;
@@ -4766,7 +4766,7 @@ diff -NurpP --minimal linux-4.4.161/fs/nfs/inode.c linux-4.4.161-vs2.3.9.8/fs/nf
if (nfs_have_delegated_attributes(inode))
return 0;
-@@ -1262,13 +1273,18 @@ static int nfs_check_inode_attributes(st
+@@ -1263,13 +1274,18 @@ static int nfs_check_inode_attributes(st
if (nfsi->nrequests != 0)
invalid &= ~NFS_INO_REVAL_PAGECACHE;
@@ -4787,7 +4787,7 @@ diff -NurpP --minimal linux-4.4.161/fs/nfs/inode.c linux-4.4.161-vs2.3.9.8/fs/nf
/* Has the link count changed? */
if ((fattr->valid & NFS_ATTR_FATTR_NLINK) && inode->i_nlink != fattr->nlink)
-@@ -1642,6 +1658,9 @@ static int nfs_update_inode(struct inode
+@@ -1643,6 +1659,9 @@ static int nfs_update_inode(struct inode
unsigned long now = jiffies;
unsigned long save_cache_validity;
bool cache_revalidated = true;
@@ -4797,7 +4797,7 @@ diff -NurpP --minimal linux-4.4.161/fs/nfs/inode.c linux-4.4.161-vs2.3.9.8/fs/nf
dfprintk(VFS, "NFS: %s(%s/%lu fh_crc=0x%08x ct=%d info=0x%x)\n",
__func__, inode->i_sb->s_id, inode->i_ino,
-@@ -1752,6 +1771,9 @@ static int nfs_update_inode(struct inode
+@@ -1753,6 +1772,9 @@ static int nfs_update_inode(struct inode
cache_revalidated = false;
}
@@ -4807,7 +4807,7 @@ diff -NurpP --minimal linux-4.4.161/fs/nfs/inode.c linux-4.4.161-vs2.3.9.8/fs/nf
if (fattr->valid & NFS_ATTR_FATTR_ATIME)
memcpy(&inode->i_atime, &fattr->atime, sizeof(inode->i_atime));
-@@ -1806,6 +1828,10 @@ static int nfs_update_inode(struct inode
+@@ -1807,6 +1829,10 @@ static int nfs_update_inode(struct inode
cache_revalidated = false;
}
@@ -4818,9 +4818,9 @@ diff -NurpP --minimal linux-4.4.161/fs/nfs/inode.c linux-4.4.161-vs2.3.9.8/fs/nf
if (fattr->valid & NFS_ATTR_FATTR_NLINK) {
if (inode->i_nlink != fattr->nlink) {
invalid |= NFS_INO_INVALID_ATTR;
-diff -NurpP --minimal linux-4.4.161/fs/nfs/nfs3xdr.c linux-4.4.161-vs2.3.9.8/fs/nfs/nfs3xdr.c
---- linux-4.4.161/fs/nfs/nfs3xdr.c 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/nfs/nfs3xdr.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/nfs/nfs3xdr.c linux-4.4.197-vs2.3.9.8/fs/nfs/nfs3xdr.c
+--- linux-4.4.197/fs/nfs/nfs3xdr.c 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/nfs/nfs3xdr.c 2018-10-20 04:57:21.000000000 +0000
@@ -20,6 +20,7 @@
#include <linux/nfs3.h>
#include <linux/nfs_fs.h>
@@ -4966,9 +4966,9 @@ diff -NurpP --minimal linux-4.4.161/fs/nfs/nfs3xdr.c linux-4.4.161-vs2.3.9.8/fs/
}
/*
-diff -NurpP --minimal linux-4.4.161/fs/nfs/super.c linux-4.4.161-vs2.3.9.8/fs/nfs/super.c
---- linux-4.4.161/fs/nfs/super.c 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/nfs/super.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/nfs/super.c linux-4.4.197-vs2.3.9.8/fs/nfs/super.c
+--- linux-4.4.197/fs/nfs/super.c 2019-10-22 12:34:34.278662909 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/nfs/super.c 2019-10-05 14:35:34.622774949 +0000
@@ -54,6 +54,7 @@
#include <linux/parser.h>
#include <linux/nsproxy.h>
@@ -5042,9 +5042,9 @@ diff -NurpP --minimal linux-4.4.161/fs/nfs/super.c linux-4.4.161-vs2.3.9.8/fs/nf
/*
* options that take text values
-diff -NurpP --minimal linux-4.4.161/fs/nfsd/auth.c linux-4.4.161-vs2.3.9.8/fs/nfsd/auth.c
---- linux-4.4.161/fs/nfsd/auth.c 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/nfsd/auth.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/nfsd/auth.c linux-4.4.197-vs2.3.9.8/fs/nfsd/auth.c
+--- linux-4.4.197/fs/nfsd/auth.c 2019-10-22 12:34:34.608657638 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/nfsd/auth.c 2018-10-20 04:57:21.000000000 +0000
@@ -1,6 +1,7 @@
/* Copyright (C) 1995, 1996 Olaf Kirch <okir at monad.swb.de> */
@@ -5063,9 +5063,9 @@ diff -NurpP --minimal linux-4.4.161/fs/nfsd/auth.c linux-4.4.161-vs2.3.9.8/fs/nf
rqgi = rqstp->rq_cred.cr_group_info;
-diff -NurpP --minimal linux-4.4.161/fs/nfsd/nfs3xdr.c linux-4.4.161-vs2.3.9.8/fs/nfsd/nfs3xdr.c
---- linux-4.4.161/fs/nfsd/nfs3xdr.c 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/nfsd/nfs3xdr.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/nfsd/nfs3xdr.c linux-4.4.197-vs2.3.9.8/fs/nfsd/nfs3xdr.c
+--- linux-4.4.197/fs/nfsd/nfs3xdr.c 2019-10-22 12:34:34.648656997 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/nfsd/nfs3xdr.c 2019-10-05 14:35:34.682773996 +0000
@@ -8,6 +8,7 @@
#include <linux/namei.h>
@@ -5119,9 +5119,9 @@ diff -NurpP --minimal linux-4.4.161/fs/nfsd/nfs3xdr.c linux-4.4.161-vs2.3.9.8/fs
if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) {
p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN);
} else {
-diff -NurpP --minimal linux-4.4.161/fs/nfsd/nfs4xdr.c linux-4.4.161-vs2.3.9.8/fs/nfsd/nfs4xdr.c
---- linux-4.4.161/fs/nfsd/nfs4xdr.c 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/nfsd/nfs4xdr.c 2018-10-20 05:50:20.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/nfsd/nfs4xdr.c linux-4.4.197-vs2.3.9.8/fs/nfsd/nfs4xdr.c
+--- linux-4.4.197/fs/nfsd/nfs4xdr.c 2019-10-22 12:34:34.708656037 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/nfsd/nfs4xdr.c 2018-10-20 05:50:20.000000000 +0000
@@ -40,6 +40,7 @@
#include <linux/utsname.h>
#include <linux/pagemap.h>
@@ -5149,9 +5149,9 @@ diff -NurpP --minimal linux-4.4.161/fs/nfsd/nfs4xdr.c linux-4.4.161-vs2.3.9.8/fs
if (status)
goto out;
}
-diff -NurpP --minimal linux-4.4.161/fs/nfsd/nfsxdr.c linux-4.4.161-vs2.3.9.8/fs/nfsd/nfsxdr.c
---- linux-4.4.161/fs/nfsd/nfsxdr.c 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/nfsd/nfsxdr.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/nfsd/nfsxdr.c linux-4.4.197-vs2.3.9.8/fs/nfsd/nfsxdr.c
+--- linux-4.4.197/fs/nfsd/nfsxdr.c 2019-10-22 12:34:34.718655878 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/nfsd/nfsxdr.c 2018-10-20 04:57:21.000000000 +0000
@@ -7,6 +7,7 @@
#include "vfs.h"
#include "xdr.h"
@@ -5203,9 +5203,9 @@ diff -NurpP --minimal linux-4.4.161/fs/nfsd/nfsxdr.c linux-4.4.161-vs2.3.9.8/fs/
if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
*p++ = htonl(NFS_MAXPATHLEN);
-diff -NurpP --minimal linux-4.4.161/fs/ocfs2/dlmglue.c linux-4.4.161-vs2.3.9.8/fs/ocfs2/dlmglue.c
---- linux-4.4.161/fs/ocfs2/dlmglue.c 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/ocfs2/dlmglue.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/ocfs2/dlmglue.c linux-4.4.197-vs2.3.9.8/fs/ocfs2/dlmglue.c
+--- linux-4.4.197/fs/ocfs2/dlmglue.c 2019-10-22 12:34:35.158648847 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/ocfs2/dlmglue.c 2018-10-20 04:57:21.000000000 +0000
@@ -2128,6 +2128,7 @@ static void __ocfs2_stuff_meta_lvb(struc
lvb->lvb_iclusters = cpu_to_be32(oi->ip_clusters);
lvb->lvb_iuid = cpu_to_be32(i_uid_read(inode));
@@ -5222,9 +5222,9 @@ diff -NurpP --minimal linux-4.4.161/fs/ocfs2/dlmglue.c linux-4.4.161-vs2.3.9.8/f
inode->i_mode = be16_to_cpu(lvb->lvb_imode);
set_nlink(inode, be16_to_cpu(lvb->lvb_inlink));
ocfs2_unpack_timespec(&inode->i_atime,
-diff -NurpP --minimal linux-4.4.161/fs/ocfs2/dlmglue.h linux-4.4.161-vs2.3.9.8/fs/ocfs2/dlmglue.h
---- linux-4.4.161/fs/ocfs2/dlmglue.h 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/ocfs2/dlmglue.h 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/ocfs2/dlmglue.h linux-4.4.197-vs2.3.9.8/fs/ocfs2/dlmglue.h
+--- linux-4.4.197/fs/ocfs2/dlmglue.h 2019-10-22 12:34:35.158648847 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/ocfs2/dlmglue.h 2018-10-20 04:57:21.000000000 +0000
@@ -46,7 +46,8 @@ struct ocfs2_meta_lvb {
__be16 lvb_inlink;
__be32 lvb_iattr;
@@ -5235,9 +5235,9 @@ diff -NurpP --minimal linux-4.4.161/fs/ocfs2/dlmglue.h linux-4.4.161-vs2.3.9.8/f
};
#define OCFS2_QINFO_LVB_VERSION 1
-diff -NurpP --minimal linux-4.4.161/fs/ocfs2/file.c linux-4.4.161-vs2.3.9.8/fs/ocfs2/file.c
---- linux-4.4.161/fs/ocfs2/file.c 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/ocfs2/file.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/ocfs2/file.c linux-4.4.197-vs2.3.9.8/fs/ocfs2/file.c
+--- linux-4.4.197/fs/ocfs2/file.c 2019-10-22 12:34:35.158648847 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/ocfs2/file.c 2018-10-20 04:57:21.000000000 +0000
@@ -1151,7 +1151,7 @@ int ocfs2_setattr(struct dentry *dentry,
attr->ia_valid &= ~ATTR_SIZE;
@@ -5247,9 +5247,9 @@ diff -NurpP --minimal linux-4.4.161/fs/ocfs2/file.c linux-4.4.161-vs2.3.9.8/fs/o
if (!(attr->ia_valid & OCFS2_VALID_ATTRS))
return 0;
-diff -NurpP --minimal linux-4.4.161/fs/ocfs2/inode.c linux-4.4.161-vs2.3.9.8/fs/ocfs2/inode.c
---- linux-4.4.161/fs/ocfs2/inode.c 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/ocfs2/inode.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/ocfs2/inode.c linux-4.4.197-vs2.3.9.8/fs/ocfs2/inode.c
+--- linux-4.4.197/fs/ocfs2/inode.c 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/ocfs2/inode.c 2018-10-20 04:57:21.000000000 +0000
@@ -28,6 +28,7 @@
#include <linux/highmem.h>
#include <linux/pagemap.h>
@@ -5346,9 +5346,9 @@ diff -NurpP --minimal linux-4.4.161/fs/ocfs2/inode.c linux-4.4.161-vs2.3.9.8/fs/
/* Fast symlinks will have i_size but no allocated clusters. */
if (S_ISLNK(inode->i_mode) && !fe->i_clusters) {
-diff -NurpP --minimal linux-4.4.161/fs/ocfs2/inode.h linux-4.4.161-vs2.3.9.8/fs/ocfs2/inode.h
---- linux-4.4.161/fs/ocfs2/inode.h 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/ocfs2/inode.h 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/ocfs2/inode.h linux-4.4.197-vs2.3.9.8/fs/ocfs2/inode.h
+--- linux-4.4.197/fs/ocfs2/inode.h 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/ocfs2/inode.h 2018-10-20 04:57:21.000000000 +0000
@@ -161,6 +161,7 @@ struct buffer_head *ocfs2_bread(struct i
void ocfs2_set_inode_flags(struct inode *inode);
@@ -5357,9 +5357,9 @@ diff -NurpP --minimal linux-4.4.161/fs/ocfs2/inode.h linux-4.4.161-vs2.3.9.8/fs/
static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode)
{
-diff -NurpP --minimal linux-4.4.161/fs/ocfs2/ioctl.c linux-4.4.161-vs2.3.9.8/fs/ocfs2/ioctl.c
---- linux-4.4.161/fs/ocfs2/ioctl.c 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/ocfs2/ioctl.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/ocfs2/ioctl.c linux-4.4.197-vs2.3.9.8/fs/ocfs2/ioctl.c
+--- linux-4.4.197/fs/ocfs2/ioctl.c 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/ocfs2/ioctl.c 2018-10-20 04:57:21.000000000 +0000
@@ -76,7 +76,41 @@ static int ocfs2_get_inode_attr(struct i
return status;
}
@@ -5423,9 +5423,9 @@ diff -NurpP --minimal linux-4.4.161/fs/ocfs2/ioctl.c linux-4.4.161-vs2.3.9.8/fs/
long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
struct inode *inode = file_inode(filp);
-diff -NurpP --minimal linux-4.4.161/fs/ocfs2/namei.c linux-4.4.161-vs2.3.9.8/fs/ocfs2/namei.c
---- linux-4.4.161/fs/ocfs2/namei.c 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/ocfs2/namei.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/ocfs2/namei.c linux-4.4.197-vs2.3.9.8/fs/ocfs2/namei.c
+--- linux-4.4.197/fs/ocfs2/namei.c 2019-10-22 12:34:35.168648690 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/ocfs2/namei.c 2018-10-20 04:57:21.000000000 +0000
@@ -41,6 +41,7 @@
#include <linux/slab.h>
#include <linux/highmem.h>
@@ -5458,20 +5458,9 @@ diff -NurpP --minimal linux-4.4.161/fs/ocfs2/namei.c linux-4.4.161-vs2.3.9.8/fs/
fe->i_mode = cpu_to_le16(inode->i_mode);
if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode))
fe->id1.dev1.i_rdev = cpu_to_le64(huge_encode_dev(dev));
-diff -NurpP --minimal linux-4.4.161/fs/ocfs2/ocfs2.h linux-4.4.161-vs2.3.9.8/fs/ocfs2/ocfs2.h
---- linux-4.4.161/fs/ocfs2/ocfs2.h 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/ocfs2/ocfs2.h 2018-10-20 04:57:21.000000000 +0000
-@@ -289,6 +289,7 @@ enum ocfs2_mount_options
- OCFS2_MOUNT_JOURNAL_ASYNC_COMMIT = 1 << 15, /* Journal Async Commit */
- OCFS2_MOUNT_ERRORS_CONT = 1 << 16, /* Return EIO to the calling process on error */
- 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.4.161/fs/ocfs2/ocfs2_fs.h linux-4.4.161-vs2.3.9.8/fs/ocfs2/ocfs2_fs.h
---- linux-4.4.161/fs/ocfs2/ocfs2_fs.h 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/ocfs2/ocfs2_fs.h 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/ocfs2/ocfs2_fs.h linux-4.4.197-vs2.3.9.8/fs/ocfs2/ocfs2_fs.h
+--- linux-4.4.197/fs/ocfs2/ocfs2_fs.h 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/ocfs2/ocfs2_fs.h 2018-10-20 04:57:21.000000000 +0000
@@ -275,6 +275,11 @@
#define OCFS2_TOPDIR_FL FS_TOPDIR_FL /* Top of directory hierarchies*/
#define OCFS2_RESERVED_FL FS_RESERVED_FL /* reserved for ext2 lib */
@@ -5484,9 +5473,20 @@ diff -NurpP --minimal linux-4.4.161/fs/ocfs2/ocfs2_fs.h linux-4.4.161-vs2.3.9.8/
#define OCFS2_FL_VISIBLE FS_FL_USER_VISIBLE /* User visible flags */
#define OCFS2_FL_MODIFIABLE FS_FL_USER_MODIFIABLE /* User modifiable flags */
-diff -NurpP --minimal linux-4.4.161/fs/ocfs2/super.c linux-4.4.161-vs2.3.9.8/fs/ocfs2/super.c
---- linux-4.4.161/fs/ocfs2/super.c 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/ocfs2/super.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/ocfs2/ocfs2.h linux-4.4.197-vs2.3.9.8/fs/ocfs2/ocfs2.h
+--- linux-4.4.197/fs/ocfs2/ocfs2.h 2019-10-22 12:34:35.168648690 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/ocfs2/ocfs2.h 2018-10-20 04:57:21.000000000 +0000
+@@ -289,6 +289,7 @@ enum ocfs2_mount_options
+ OCFS2_MOUNT_JOURNAL_ASYNC_COMMIT = 1 << 15, /* Journal Async Commit */
+ OCFS2_MOUNT_ERRORS_CONT = 1 << 16, /* Return EIO to the calling process on error */
+ 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.4.197/fs/ocfs2/super.c linux-4.4.197-vs2.3.9.8/fs/ocfs2/super.c
+--- linux-4.4.197/fs/ocfs2/super.c 2019-10-22 12:34:35.168648690 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/ocfs2/super.c 2018-10-20 04:57:21.000000000 +0000
@@ -193,6 +193,7 @@ enum {
Opt_dir_resv_level,
Opt_journal_async_commit,
@@ -5550,9 +5550,9 @@ diff -NurpP --minimal linux-4.4.161/fs/ocfs2/super.c linux-4.4.161-vs2.3.9.8/fs/
default:
mlog(ML_ERROR,
"Unrecognized mount option \"%s\" "
-diff -NurpP --minimal linux-4.4.161/fs/open.c linux-4.4.161-vs2.3.9.8/fs/open.c
---- linux-4.4.161/fs/open.c 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/open.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/open.c linux-4.4.197-vs2.3.9.8/fs/open.c
+--- linux-4.4.197/fs/open.c 2019-10-22 12:34:35.188648370 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/open.c 2019-10-05 14:35:34.862771141 +0000
@@ -31,6 +31,11 @@
#include <linux/ima.h>
#include <linux/dnotify.h>
@@ -5577,7 +5577,7 @@ diff -NurpP --minimal linux-4.4.161/fs/open.c linux-4.4.161-vs2.3.9.8/fs/open.c
inode = path->dentry->d_inode;
/* For directories it's -EISDIR, for other non-regulars - -EINVAL */
-@@ -548,6 +558,13 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, cons
+@@ -567,6 +577,13 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, cons
unsigned int lookup_flags = LOOKUP_FOLLOW;
retry:
error = user_path_at(dfd, filename, lookup_flags, &path);
@@ -5591,7 +5591,7 @@ diff -NurpP --minimal linux-4.4.161/fs/open.c linux-4.4.161-vs2.3.9.8/fs/open.c
if (!error) {
error = chmod_common(&path, mode);
path_put(&path);
-@@ -582,13 +599,15 @@ retry_deleg:
+@@ -601,13 +618,15 @@ retry_deleg:
if (!uid_valid(uid))
return -EINVAL;
newattrs.ia_valid |= ATTR_UID;
@@ -5609,7 +5609,7 @@ diff -NurpP --minimal linux-4.4.161/fs/open.c linux-4.4.161-vs2.3.9.8/fs/open.c
}
if (!S_ISDIR(inode->i_mode))
newattrs.ia_valid |=
-@@ -626,6 +645,10 @@ retry:
+@@ -645,6 +664,10 @@ retry:
error = mnt_want_write(path.mnt);
if (error)
goto out_release;
@@ -5620,9 +5620,9 @@ diff -NurpP --minimal linux-4.4.161/fs/open.c linux-4.4.161-vs2.3.9.8/fs/open.c
error = chown_common(&path, user, group);
mnt_drop_write(path.mnt);
out_release:
-diff -NurpP --minimal linux-4.4.161/fs/proc/array.c linux-4.4.161-vs2.3.9.8/fs/proc/array.c
---- linux-4.4.161/fs/proc/array.c 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/proc/array.c 2018-10-20 05:50:20.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/proc/array.c linux-4.4.197-vs2.3.9.8/fs/proc/array.c
+--- linux-4.4.197/fs/proc/array.c 2019-10-22 12:34:35.328646133 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/proc/array.c 2019-02-22 08:20:34.160950722 +0000
@@ -84,6 +84,8 @@
#include <linux/tracehook.h>
#include <linux/string_helpers.h>
@@ -5741,9 +5741,9 @@ diff -NurpP --minimal linux-4.4.161/fs/proc/array.c linux-4.4.161-vs2.3.9.8/fs/p
seq_printf(m, "%d (%s) %c", pid_nr_ns(pid, ns), tcomm, state);
seq_put_decimal_ll(m, ' ', ppid);
seq_put_decimal_ll(m, ' ', pgid);
-diff -NurpP --minimal linux-4.4.161/fs/proc/base.c linux-4.4.161-vs2.3.9.8/fs/proc/base.c
---- linux-4.4.161/fs/proc/base.c 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/proc/base.c 2018-10-20 05:50:20.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/proc/base.c linux-4.4.197-vs2.3.9.8/fs/proc/base.c
+--- linux-4.4.197/fs/proc/base.c 2019-10-22 12:34:35.338645971 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/proc/base.c 2019-02-22 08:20:34.200950045 +0000
@@ -87,6 +87,8 @@
#include <linux/slab.h>
#include <linux/flex_array.h>
@@ -5753,7 +5753,7 @@ diff -NurpP --minimal linux-4.4.161/fs/proc/base.c linux-4.4.161-vs2.3.9.8/fs/pr
#ifdef CONFIG_HARDWALL
#include <asm/hardwall.h>
#endif
-@@ -1120,11 +1122,15 @@ static ssize_t oom_adj_write(struct file
+@@ -1125,11 +1127,15 @@ static ssize_t oom_adj_write(struct file
oom_adj = (oom_adj * OOM_SCORE_ADJ_MAX) / -OOM_DISABLE;
if (oom_adj < task->signal->oom_score_adj &&
@@ -5770,7 +5770,7 @@ diff -NurpP --minimal linux-4.4.161/fs/proc/base.c linux-4.4.161-vs2.3.9.8/fs/pr
/*
* /proc/pid/oom_adj is provided for legacy purposes, ask users to use
* /proc/pid/oom_score_adj instead.
-@@ -1689,6 +1695,8 @@ struct inode *proc_pid_make_inode(struct
+@@ -1694,6 +1700,8 @@ struct inode *proc_pid_make_inode(struct
inode->i_gid = cred->egid;
rcu_read_unlock();
}
@@ -5779,7 +5779,7 @@ diff -NurpP --minimal linux-4.4.161/fs/proc/base.c linux-4.4.161-vs2.3.9.8/fs/pr
security_task_to_inode(task, inode);
out:
-@@ -1734,6 +1742,8 @@ int pid_getattr(struct vfsmount *mnt, st
+@@ -1739,6 +1747,8 @@ int pid_getattr(struct vfsmount *mnt, st
/* dentry stuff */
@@ -5788,7 +5788,7 @@ diff -NurpP --minimal linux-4.4.161/fs/proc/base.c linux-4.4.161-vs2.3.9.8/fs/pr
/*
* Exceptional case: normally we are not allowed to unhash a busy
* directory. In this case, however, we can do it - no aliasing problems
-@@ -1762,6 +1772,19 @@ int pid_revalidate(struct dentry *dentry
+@@ -1767,6 +1777,19 @@ int pid_revalidate(struct dentry *dentry
task = get_proc_task(inode);
if (task) {
@@ -5808,7 +5808,7 @@ diff -NurpP --minimal linux-4.4.161/fs/proc/base.c linux-4.4.161-vs2.3.9.8/fs/pr
if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
task_dumpable(task)) {
rcu_read_lock();
-@@ -2331,6 +2354,13 @@ static struct dentry *proc_pident_lookup
+@@ -2336,6 +2359,13 @@ static struct dentry *proc_pident_lookup
if (!task)
goto out_no_task;
@@ -5822,7 +5822,7 @@ diff -NurpP --minimal linux-4.4.161/fs/proc/base.c linux-4.4.161-vs2.3.9.8/fs/pr
/*
* Yes, it does not scale. And it should not. Don't add
* new entries into /proc/<tgid>/ without very good reasons.
-@@ -2773,6 +2803,11 @@ static int proc_pid_personality(struct s
+@@ -2778,6 +2808,11 @@ static int proc_pid_personality(struct s
static const struct file_operations proc_task_operations;
static const struct inode_operations proc_task_inode_operations;
@@ -5834,7 +5834,7 @@ diff -NurpP --minimal linux-4.4.161/fs/proc/base.c linux-4.4.161-vs2.3.9.8/fs/pr
static const struct pid_entry tgid_base_stuff[] = {
DIR("task", S_IRUGO|S_IXUGO, proc_task_inode_operations, proc_task_operations),
DIR("fd", S_IRUSR|S_IXUSR, proc_fd_inode_operations, proc_fd_operations),
-@@ -2837,6 +2872,8 @@ static const struct pid_entry tgid_base_
+@@ -2842,6 +2877,8 @@ static const struct pid_entry tgid_base_
#ifdef CONFIG_CGROUPS
ONE("cgroup", S_IRUGO, proc_cgroup_show),
#endif
@@ -5843,7 +5843,7 @@ diff -NurpP --minimal linux-4.4.161/fs/proc/base.c linux-4.4.161-vs2.3.9.8/fs/pr
ONE("oom_score", S_IRUGO, proc_oom_score),
REG("oom_adj", S_IRUGO|S_IWUSR, proc_oom_adj_operations),
REG("oom_score_adj", S_IRUGO|S_IWUSR, proc_oom_score_adj_operations),
-@@ -3051,7 +3088,7 @@ retry:
+@@ -3056,7 +3093,7 @@ retry:
iter.task = NULL;
pid = find_ge_pid(iter.tgid, ns);
if (pid) {
@@ -5852,7 +5852,7 @@ diff -NurpP --minimal linux-4.4.161/fs/proc/base.c linux-4.4.161-vs2.3.9.8/fs/pr
iter.task = pid_task(pid, PIDTYPE_PID);
/* What we to know is if the pid we have find is the
* pid of a thread_group_leader. Testing for task
-@@ -3111,8 +3148,10 @@ int proc_pid_readdir(struct file *file,
+@@ -3116,8 +3153,10 @@ int proc_pid_readdir(struct file *file,
if (!has_pid_permissions(ns, iter.task, 2))
continue;
@@ -5864,7 +5864,7 @@ diff -NurpP --minimal linux-4.4.161/fs/proc/base.c linux-4.4.161-vs2.3.9.8/fs/pr
if (!proc_fill_cache(file, ctx, name, len,
proc_pid_instantiate, iter.task, NULL)) {
put_task_struct(iter.task);
-@@ -3249,6 +3288,7 @@ static const struct pid_entry tid_base_s
+@@ -3254,6 +3293,7 @@ static const struct pid_entry tid_base_s
REG("projid_map", S_IRUGO|S_IWUSR, proc_projid_map_operations),
REG("setgroups", S_IRUGO|S_IWUSR, proc_setgroups_operations),
#endif
@@ -5872,7 +5872,7 @@ diff -NurpP --minimal linux-4.4.161/fs/proc/base.c linux-4.4.161-vs2.3.9.8/fs/pr
};
static int proc_tid_base_readdir(struct file *file, struct dir_context *ctx)
-@@ -3315,6 +3355,8 @@ static struct dentry *proc_task_lookup(s
+@@ -3320,6 +3360,8 @@ static struct dentry *proc_task_lookup(s
tid = name_to_int(&dentry->d_name);
if (tid == ~0U)
goto out;
@@ -5881,9 +5881,9 @@ diff -NurpP --minimal linux-4.4.161/fs/proc/base.c linux-4.4.161-vs2.3.9.8/fs/pr
ns = dentry->d_sb->s_fs_info;
rcu_read_lock();
-diff -NurpP --minimal linux-4.4.161/fs/proc/generic.c linux-4.4.161-vs2.3.9.8/fs/proc/generic.c
---- linux-4.4.161/fs/proc/generic.c 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/proc/generic.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/proc/generic.c linux-4.4.197-vs2.3.9.8/fs/proc/generic.c
+--- linux-4.4.197/fs/proc/generic.c 2019-10-22 12:34:35.338645971 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/proc/generic.c 2018-10-20 04:57:21.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/bitops.h>
#include <linux/spinlock.h>
@@ -5958,9 +5958,9 @@ diff -NurpP --minimal linux-4.4.161/fs/proc/generic.c linux-4.4.161-vs2.3.9.8/fs
} else {
kfree(ent);
ent = NULL;
-diff -NurpP --minimal linux-4.4.161/fs/proc/inode.c linux-4.4.161-vs2.3.9.8/fs/proc/inode.c
---- linux-4.4.161/fs/proc/inode.c 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/proc/inode.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/proc/inode.c linux-4.4.197-vs2.3.9.8/fs/proc/inode.c
+--- linux-4.4.197/fs/proc/inode.c 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/proc/inode.c 2018-10-20 04:57:21.000000000 +0000
@@ -431,6 +431,8 @@ struct inode *proc_get_inode(struct supe
inode->i_uid = de->uid;
inode->i_gid = de->gid;
@@ -5970,9 +5970,9 @@ diff -NurpP --minimal linux-4.4.161/fs/proc/inode.c linux-4.4.161-vs2.3.9.8/fs/p
if (de->size)
inode->i_size = de->size;
if (de->nlink)
-diff -NurpP --minimal linux-4.4.161/fs/proc/internal.h linux-4.4.161-vs2.3.9.8/fs/proc/internal.h
---- linux-4.4.161/fs/proc/internal.h 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/proc/internal.h 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/proc/internal.h linux-4.4.197-vs2.3.9.8/fs/proc/internal.h
+--- linux-4.4.197/fs/proc/internal.h 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/proc/internal.h 2018-10-20 04:57:21.000000000 +0000
@@ -14,6 +14,7 @@
#include <linux/spinlock.h>
#include <linux/atomic.h>
@@ -6039,9 +6039,9 @@ diff -NurpP --minimal linux-4.4.161/fs/proc/internal.h linux-4.4.161-vs2.3.9.8/f
/*
* base.c
-diff -NurpP --minimal linux-4.4.161/fs/proc/loadavg.c linux-4.4.161-vs2.3.9.8/fs/proc/loadavg.c
---- linux-4.4.161/fs/proc/loadavg.c 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/proc/loadavg.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/proc/loadavg.c linux-4.4.197-vs2.3.9.8/fs/proc/loadavg.c
+--- linux-4.4.197/fs/proc/loadavg.c 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/proc/loadavg.c 2018-10-20 04:57:21.000000000 +0000
@@ -12,15 +12,27 @@
static int loadavg_proc_show(struct seq_file *m, void *v)
@@ -6071,9 +6071,9 @@ diff -NurpP --minimal linux-4.4.161/fs/proc/loadavg.c linux-4.4.161-vs2.3.9.8/fs
task_active_pid_ns(current)->last_pid);
return 0;
}
-diff -NurpP --minimal linux-4.4.161/fs/proc/meminfo.c linux-4.4.161-vs2.3.9.8/fs/proc/meminfo.c
---- linux-4.4.161/fs/proc/meminfo.c 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/proc/meminfo.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/proc/meminfo.c linux-4.4.197-vs2.3.9.8/fs/proc/meminfo.c
+--- linux-4.4.197/fs/proc/meminfo.c 2019-10-22 12:34:35.338645971 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/proc/meminfo.c 2018-10-20 04:57:21.000000000 +0000
@@ -43,7 +43,8 @@ static int meminfo_proc_show(struct seq_
si_swapinfo(&i);
committed = percpu_counter_read_positive(&vm_committed_as);
@@ -6084,28 +6084,9 @@ diff -NurpP --minimal linux-4.4.161/fs/proc/meminfo.c linux-4.4.161-vs2.3.9.8/fs
total_swapcache_pages() - i.bufferram;
if (cached < 0)
cached = 0;
-@@ -67,13 +68,16 @@ static int meminfo_proc_show(struct seq_
- */
- pagecache = pages[LRU_ACTIVE_FILE] + pages[LRU_INACTIVE_FILE];
- pagecache -= min(pagecache / 2, wmark_low);
-- available += pagecache;
-+
-+ if (!vx_flags(VXF_VIRT_MEM, 0))
-+ available += pagecache;
-
- /*
- * Part of the reclaimable slab consists of items that are in use,
- * and cannot be freed. Cap this estimate at the low watermark.
- */
-- available += global_page_state(NR_SLAB_RECLAIMABLE) -
-+ if (!vx_flags(VXF_VIRT_MEM, 0))
-+ available += global_page_state(NR_SLAB_RECLAIMABLE) -
- min(global_page_state(NR_SLAB_RECLAIMABLE) / 2, wmark_low);
-
- if (available < 0)
-diff -NurpP --minimal linux-4.4.161/fs/proc/root.c linux-4.4.161-vs2.3.9.8/fs/proc/root.c
---- linux-4.4.161/fs/proc/root.c 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/proc/root.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/proc/root.c linux-4.4.197-vs2.3.9.8/fs/proc/root.c
+--- linux-4.4.197/fs/proc/root.c 2019-10-22 12:34:35.358645651 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/proc/root.c 2018-10-20 04:57:21.000000000 +0000
@@ -20,9 +20,14 @@
#include <linux/mount.h>
#include <linux/pid_namespace.h>
@@ -6147,9 +6128,9 @@ diff -NurpP --minimal linux-4.4.161/fs/proc/root.c linux-4.4.161-vs2.3.9.8/fs/pr
.subdir = RB_ROOT,
.name = "/proc",
};
-diff -NurpP --minimal linux-4.4.161/fs/proc/self.c linux-4.4.161-vs2.3.9.8/fs/proc/self.c
---- linux-4.4.161/fs/proc/self.c 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/proc/self.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/proc/self.c linux-4.4.197-vs2.3.9.8/fs/proc/self.c
+--- linux-4.4.197/fs/proc/self.c 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/proc/self.c 2018-10-20 04:57:21.000000000 +0000
@@ -1,6 +1,7 @@
#include <linux/sched.h>
#include <linux/slab.h>
@@ -6167,9 +6148,9 @@ diff -NurpP --minimal linux-4.4.161/fs/proc/self.c linux-4.4.161-vs2.3.9.8/fs/pr
if (inode) {
inode->i_ino = self_inum;
inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
-diff -NurpP --minimal linux-4.4.161/fs/proc/stat.c linux-4.4.161-vs2.3.9.8/fs/proc/stat.c
---- linux-4.4.161/fs/proc/stat.c 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/proc/stat.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/proc/stat.c linux-4.4.197-vs2.3.9.8/fs/proc/stat.c
+--- linux-4.4.197/fs/proc/stat.c 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/proc/stat.c 2018-10-20 04:57:21.000000000 +0000
@@ -9,8 +9,10 @@
#include <linux/slab.h>
#include <linux/time.h>
@@ -6218,9 +6199,9 @@ diff -NurpP --minimal linux-4.4.161/fs/proc/stat.c linux-4.4.161-vs2.3.9.8/fs/pr
/* Copy values here to work around gcc-2.95.3, gcc-2.96 */
user = kcpustat_cpu(i).cpustat[CPUTIME_USER];
nice = kcpustat_cpu(i).cpustat[CPUTIME_NICE];
-diff -NurpP --minimal linux-4.4.161/fs/proc/uptime.c linux-4.4.161-vs2.3.9.8/fs/proc/uptime.c
---- linux-4.4.161/fs/proc/uptime.c 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/proc/uptime.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/proc/uptime.c linux-4.4.197-vs2.3.9.8/fs/proc/uptime.c
+--- linux-4.4.197/fs/proc/uptime.c 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/proc/uptime.c 2018-10-20 04:57:21.000000000 +0000
@@ -5,6 +5,7 @@
#include <linux/seq_file.h>
#include <linux/time.h>
@@ -6240,9 +6221,9 @@ diff -NurpP --minimal linux-4.4.161/fs/proc/uptime.c linux-4.4.161-vs2.3.9.8/fs/
seq_printf(m, "%lu.%02lu %lu.%02lu\n",
(unsigned long) uptime.tv_sec,
(uptime.tv_nsec / (NSEC_PER_SEC / 100)),
-diff -NurpP --minimal linux-4.4.161/fs/proc_namespace.c linux-4.4.161-vs2.3.9.8/fs/proc_namespace.c
---- linux-4.4.161/fs/proc_namespace.c 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/proc_namespace.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/proc_namespace.c linux-4.4.197-vs2.3.9.8/fs/proc_namespace.c
+--- linux-4.4.197/fs/proc_namespace.c 2019-10-22 12:34:35.388645172 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/proc_namespace.c 2018-10-20 04:57:21.000000000 +0000
@@ -46,6 +46,8 @@ static int show_sb_opts(struct seq_file
{ MS_DIRSYNC, ",dirsync" },
{ MS_MANDLOCK, ",mand" },
@@ -6356,9 +6337,9 @@ diff -NurpP --minimal linux-4.4.161/fs/proc_namespace.c linux-4.4.161-vs2.3.9.8/
/* file system type */
seq_puts(m, "with fstype ");
show_type(m, sb);
-diff -NurpP --minimal linux-4.4.161/fs/quota/dquot.c linux-4.4.161-vs2.3.9.8/fs/quota/dquot.c
---- linux-4.4.161/fs/quota/dquot.c 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/quota/dquot.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/quota/dquot.c linux-4.4.197-vs2.3.9.8/fs/quota/dquot.c
+--- linux-4.4.197/fs/quota/dquot.c 2019-10-22 12:34:35.478643734 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/quota/dquot.c 2018-10-20 04:57:21.000000000 +0000
@@ -1643,6 +1643,9 @@ int __dquot_alloc_space(struct inode *in
int reserve = flags & DQUOT_SPACE_RESERVE;
struct dquot **dquots;
@@ -6397,9 +6378,9 @@ diff -NurpP --minimal linux-4.4.161/fs/quota/dquot.c linux-4.4.161-vs2.3.9.8/fs/
if (!dquot_active(inode))
return;
-diff -NurpP --minimal linux-4.4.161/fs/quota/quota.c linux-4.4.161-vs2.3.9.8/fs/quota/quota.c
---- linux-4.4.161/fs/quota/quota.c 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/quota/quota.c 2018-10-20 05:50:20.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/quota/quota.c linux-4.4.197-vs2.3.9.8/fs/quota/quota.c
+--- linux-4.4.197/fs/quota/quota.c 2019-10-22 12:34:35.498643414 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/quota/quota.c 2018-10-20 05:50:20.000000000 +0000
@@ -8,6 +8,7 @@
#include <linux/fs.h>
#include <linux/namei.h>
@@ -6487,9 +6468,9 @@ diff -NurpP --minimal linux-4.4.161/fs/quota/quota.c linux-4.4.161-vs2.3.9.8/fs/
if (quotactl_cmd_write(cmd))
sb = get_super_thawed(bdev);
else
-diff -NurpP --minimal linux-4.4.161/fs/stat.c linux-4.4.161-vs2.3.9.8/fs/stat.c
---- linux-4.4.161/fs/stat.c 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/stat.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/stat.c linux-4.4.197-vs2.3.9.8/fs/stat.c
+--- linux-4.4.197/fs/stat.c 2019-10-22 12:34:35.708640058 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/stat.c 2018-10-20 04:57:21.000000000 +0000
@@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod
stat->nlink = inode->i_nlink;
stat->uid = inode->i_uid;
@@ -6498,9 +6479,9 @@ diff -NurpP --minimal linux-4.4.161/fs/stat.c linux-4.4.161-vs2.3.9.8/fs/stat.c
stat->rdev = inode->i_rdev;
stat->size = i_size_read(inode);
stat->atime = inode->i_atime;
-diff -NurpP --minimal linux-4.4.161/fs/statfs.c linux-4.4.161-vs2.3.9.8/fs/statfs.c
---- linux-4.4.161/fs/statfs.c 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/statfs.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/statfs.c linux-4.4.197-vs2.3.9.8/fs/statfs.c
+--- linux-4.4.197/fs/statfs.c 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/statfs.c 2018-10-20 04:57:21.000000000 +0000
@@ -7,6 +7,8 @@
#include <linux/statfs.h>
#include <linux/security.h>
@@ -6519,9 +6500,9 @@ diff -NurpP --minimal linux-4.4.161/fs/statfs.c linux-4.4.161-vs2.3.9.8/fs/statf
return retval;
}
-diff -NurpP --minimal linux-4.4.161/fs/super.c linux-4.4.161-vs2.3.9.8/fs/super.c
---- linux-4.4.161/fs/super.c 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/super.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/super.c linux-4.4.197-vs2.3.9.8/fs/super.c
+--- linux-4.4.197/fs/super.c 2019-10-22 12:34:35.718639901 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/super.c 2019-02-22 08:20:34.220949702 +0000
@@ -33,6 +33,8 @@
#include <linux/cleancache.h>
#include <linux/fsnotify.h>
@@ -6531,8 +6512,8 @@ diff -NurpP --minimal linux-4.4.161/fs/super.c linux-4.4.161-vs2.3.9.8/fs/super.
#include "internal.h"
-@@ -1135,6 +1137,13 @@ mount_fs(struct file_system_type *type,
- WARN_ON(!sb->s_bdi);
+@@ -1153,6 +1155,13 @@ mount_fs(struct file_system_type *type,
+ smp_wmb();
sb->s_flags |= MS_BORN;
+ error = -EPERM;
@@ -6545,9 +6526,9 @@ diff -NurpP --minimal linux-4.4.161/fs/super.c linux-4.4.161-vs2.3.9.8/fs/super.
error = security_sb_kern_mount(sb, flags, secdata);
if (error)
goto out_sb;
-diff -NurpP --minimal linux-4.4.161/fs/utimes.c linux-4.4.161-vs2.3.9.8/fs/utimes.c
---- linux-4.4.161/fs/utimes.c 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/utimes.c 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/utimes.c linux-4.4.197-vs2.3.9.8/fs/utimes.c
+--- linux-4.4.197/fs/utimes.c 2019-10-22 12:34:36.098633826 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/utimes.c 2018-10-20 04:57:21.000000000 +0000
@@ -8,6 +8,8 @@
#include <linux/stat.h>
#include <linux/utime.h>
@@ -6578,9 +6559,9 @@ diff -NurpP --minimal linux-4.4.161/fs/utimes.c linux-4.4.161-vs2.3.9.8/fs/utime
if (times && times[0].tv_nsec == UTIME_NOW &&
times[1].tv_nsec == UTIME_NOW)
times = NULL;
-diff -NurpP --minimal linux-4.4.161/fs/xattr.c linux-4.4.161-vs2.3.9.8/fs/xattr.c
---- linux-4.4.161/fs/xattr.c 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/fs/xattr.c 2018-10-20 05:50:20.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/fs/xattr.c linux-4.4.197-vs2.3.9.8/fs/xattr.c
+--- linux-4.4.197/fs/xattr.c 2019-10-22 12:34:36.098633826 +0000
++++ linux-4.4.197-vs2.3.9.8/fs/xattr.c 2018-10-20 05:50:20.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/audit.h>
#include <linux/vmalloc.h>
@@ -6598,9 +6579,9 @@ diff -NurpP --minimal linux-4.4.161/fs/xattr.c linux-4.4.161-vs2.3.9.8/fs/xattr.
return (mask & MAY_WRITE) ? -EPERM : -ENODATA;
return 0;
}
-diff -NurpP --minimal linux-4.4.161/include/linux/capability.h linux-4.4.161-vs2.3.9.8/include/linux/capability.h
---- linux-4.4.161/include/linux/capability.h 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/include/linux/capability.h 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/include/linux/capability.h linux-4.4.197-vs2.3.9.8/include/linux/capability.h
+--- linux-4.4.197/include/linux/capability.h 2019-10-22 12:34:36.818622321 +0000
++++ linux-4.4.197-vs2.3.9.8/include/linux/capability.h 2018-10-20 04:57:21.000000000 +0000
@@ -77,7 +77,8 @@ extern const kernel_cap_t __cap_init_eff
#else /* HAND-CODED capability initializers */
@@ -6611,10 +6592,10 @@ diff -NurpP --minimal linux-4.4.161/include/linux/capability.h linux-4.4.161-vs2
# define CAP_EMPTY_SET ((kernel_cap_t){{ 0, 0 }})
# define CAP_FULL_SET ((kernel_cap_t){{ ~0, CAP_LAST_U32_VALID_MASK }})
-diff -NurpP --minimal linux-4.4.161/include/linux/cred.h linux-4.4.161-vs2.3.9.8/include/linux/cred.h
---- linux-4.4.161/include/linux/cred.h 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/include/linux/cred.h 2018-10-20 04:57:21.000000000 +0000
-@@ -161,6 +161,7 @@ extern void exit_creds(struct task_struc
+diff -NurpP --minimal linux-4.4.197/include/linux/cred.h linux-4.4.197-vs2.3.9.8/include/linux/cred.h
+--- linux-4.4.197/include/linux/cred.h 2019-10-22 12:34:36.938620404 +0000
++++ linux-4.4.197-vs2.3.9.8/include/linux/cred.h 2019-10-05 14:35:35.422762257 +0000
+@@ -165,6 +165,7 @@ extern void exit_creds(struct task_struc
extern int copy_creds(struct task_struct *, unsigned long);
extern const struct cred *get_task_cred(struct task_struct *);
extern struct cred *cred_alloc_blank(void);
@@ -6622,7 +6603,7 @@ diff -NurpP --minimal linux-4.4.161/include/linux/cred.h linux-4.4.161-vs2.3.9.8
extern struct cred *prepare_creds(void);
extern struct cred *prepare_exec_creds(void);
extern int commit_creds(struct cred *);
-@@ -221,6 +222,31 @@ static inline bool cap_ambient_invariant
+@@ -225,6 +226,31 @@ static inline bool cap_ambient_invariant
cred->cap_inheritable));
}
@@ -6654,9 +6635,9 @@ diff -NurpP --minimal linux-4.4.161/include/linux/cred.h linux-4.4.161-vs2.3.9.8
/**
* get_new_cred - Get a reference on a new set of credentials
* @cred: The new credentials to reference
-diff -NurpP --minimal linux-4.4.161/include/linux/dcache.h linux-4.4.161-vs2.3.9.8/include/linux/dcache.h
---- linux-4.4.161/include/linux/dcache.h 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/include/linux/dcache.h 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/include/linux/dcache.h linux-4.4.197-vs2.3.9.8/include/linux/dcache.h
+--- linux-4.4.197/include/linux/dcache.h 2019-10-22 12:34:36.958620084 +0000
++++ linux-4.4.197-vs2.3.9.8/include/linux/dcache.h 2018-10-20 04:57:21.000000000 +0000
@@ -10,6 +10,7 @@
#include <linux/cache.h>
#include <linux/rcupdate.h>
@@ -6677,19 +6658,19 @@ diff -NurpP --minimal linux-4.4.161/include/linux/dcache.h linux-4.4.161-vs2.3.9
return dentry;
}
-diff -NurpP --minimal linux-4.4.161/include/linux/devpts_fs.h linux-4.4.161-vs2.3.9.8/include/linux/devpts_fs.h
---- linux-4.4.161/include/linux/devpts_fs.h 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/include/linux/devpts_fs.h 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/include/linux/devpts_fs.h linux-4.4.197-vs2.3.9.8/include/linux/devpts_fs.h
+--- linux-4.4.197/include/linux/devpts_fs.h 2019-10-22 12:34:36.958620084 +0000
++++ linux-4.4.197-vs2.3.9.8/include/linux/devpts_fs.h 2018-10-20 04:57:21.000000000 +0000
@@ -35,5 +35,4 @@ void devpts_pty_kill(struct inode *inode
#endif
-
#endif /* _LINUX_DEVPTS_FS_H */
-diff -NurpP --minimal linux-4.4.161/include/linux/fs.h linux-4.4.161-vs2.3.9.8/include/linux/fs.h
---- linux-4.4.161/include/linux/fs.h 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/include/linux/fs.h 2018-10-20 04:57:21.000000000 +0000
-@@ -227,6 +227,7 @@ typedef void (dax_iodone_t)(struct buffe
+diff -NurpP --minimal linux-4.4.197/include/linux/fs.h linux-4.4.197-vs2.3.9.8/include/linux/fs.h
+--- linux-4.4.197/include/linux/fs.h 2019-10-22 12:34:36.968619927 +0000
++++ linux-4.4.197-vs2.3.9.8/include/linux/fs.h 2019-10-05 14:35:35.442761942 +0000
+@@ -232,6 +232,7 @@ typedef void (dax_iodone_t)(struct buffe
#define ATTR_OPEN (1 << 15) /* Truncating from open(O_TRUNC) */
#define ATTR_TIMES_SET (1 << 16)
#define ATTR_TOUCH (1 << 17)
@@ -6697,7 +6678,7 @@ diff -NurpP --minimal linux-4.4.161/include/linux/fs.h linux-4.4.161-vs2.3.9.8/i
/*
* Whiteout is represented by a char device. The following constants define the
-@@ -249,6 +250,7 @@ struct iattr {
+@@ -254,6 +255,7 @@ struct iattr {
umode_t ia_mode;
kuid_t ia_uid;
kgid_t ia_gid;
@@ -6705,7 +6686,7 @@ diff -NurpP --minimal linux-4.4.161/include/linux/fs.h linux-4.4.161-vs2.3.9.8/i
loff_t ia_size;
struct timespec ia_atime;
struct timespec ia_mtime;
-@@ -587,7 +589,9 @@ struct inode {
+@@ -592,7 +594,9 @@ struct inode {
unsigned short i_opflags;
kuid_t i_uid;
kgid_t i_gid;
@@ -6716,7 +6697,7 @@ diff -NurpP --minimal linux-4.4.161/include/linux/fs.h linux-4.4.161-vs2.3.9.8/i
#ifdef CONFIG_FS_POSIX_ACL
struct posix_acl *i_acl;
-@@ -616,6 +620,7 @@ struct inode {
+@@ -621,6 +625,7 @@ struct inode {
unsigned int __i_nlink;
};
dev_t i_rdev;
@@ -6724,7 +6705,7 @@ diff -NurpP --minimal linux-4.4.161/include/linux/fs.h linux-4.4.161-vs2.3.9.8/i
loff_t i_size;
struct timespec i_atime;
struct timespec i_mtime;
-@@ -814,6 +819,11 @@ static inline gid_t i_gid_read(const str
+@@ -819,6 +824,11 @@ static inline gid_t i_gid_read(const str
return from_kgid(&init_user_ns, inode->i_gid);
}
@@ -6736,7 +6717,7 @@ diff -NurpP --minimal linux-4.4.161/include/linux/fs.h linux-4.4.161-vs2.3.9.8/i
static inline void i_uid_write(struct inode *inode, uid_t uid)
{
inode->i_uid = make_kuid(&init_user_ns, uid);
-@@ -824,14 +834,19 @@ static inline void i_gid_write(struct in
+@@ -829,14 +839,19 @@ static inline void i_gid_write(struct in
inode->i_gid = make_kgid(&init_user_ns, gid);
}
@@ -6758,7 +6739,7 @@ diff -NurpP --minimal linux-4.4.161/include/linux/fs.h linux-4.4.161-vs2.3.9.8/i
}
extern struct block_device *I_BDEV(struct inode *inode);
-@@ -888,6 +903,7 @@ struct file {
+@@ -893,6 +908,7 @@ struct file {
loff_t f_pos;
struct fown_struct f_owner;
const struct cred *f_cred;
@@ -6766,7 +6747,7 @@ diff -NurpP --minimal linux-4.4.161/include/linux/fs.h linux-4.4.161-vs2.3.9.8/i
struct file_ra_state f_ra;
u64 f_version;
-@@ -1022,6 +1038,7 @@ struct file_lock {
+@@ -1027,6 +1043,7 @@ struct file_lock {
struct file *fl_file;
loff_t fl_start;
loff_t fl_end;
@@ -6774,7 +6755,7 @@ diff -NurpP --minimal linux-4.4.161/include/linux/fs.h linux-4.4.161-vs2.3.9.8/i
struct fasync_struct * fl_fasync; /* for lease break notifications */
/* for lease breaks: */
-@@ -1699,6 +1716,7 @@ struct inode_operations {
+@@ -1704,6 +1721,7 @@ struct inode_operations {
ssize_t (*getxattr) (struct dentry *, const char *, void *, size_t);
ssize_t (*listxattr) (struct dentry *, char *, size_t);
int (*removexattr) (struct dentry *, const char *);
@@ -6782,7 +6763,7 @@ diff -NurpP --minimal linux-4.4.161/include/linux/fs.h linux-4.4.161-vs2.3.9.8/i
int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start,
u64 len);
int (*update_time)(struct inode *, struct timespec *, int);
-@@ -1713,6 +1731,7 @@ ssize_t rw_copy_check_uvector(int type,
+@@ -1718,6 +1736,7 @@ ssize_t rw_copy_check_uvector(int type,
unsigned long nr_segs, unsigned long fast_segs,
struct iovec *fast_pointer,
struct iovec **ret_pointer);
@@ -6790,7 +6771,7 @@ diff -NurpP --minimal linux-4.4.161/include/linux/fs.h linux-4.4.161-vs2.3.9.8/i
extern ssize_t __vfs_read(struct file *, char __user *, size_t, loff_t *);
extern ssize_t __vfs_write(struct file *, const char __user *, size_t, loff_t *);
-@@ -1778,6 +1797,14 @@ struct super_operations {
+@@ -1783,6 +1802,14 @@ struct super_operations {
#else
#define S_DAX 0 /* Make all the DAX code disappear */
#endif
@@ -6805,7 +6786,7 @@ diff -NurpP --minimal linux-4.4.161/include/linux/fs.h linux-4.4.161-vs2.3.9.8/i
/*
* Note that nosuid etc flags are inode-specific: setting some file-system
-@@ -1802,10 +1829,13 @@ struct super_operations {
+@@ -1807,10 +1834,13 @@ struct super_operations {
#define IS_MANDLOCK(inode) __IS_FLG(inode, MS_MANDLOCK)
#define IS_NOATIME(inode) __IS_FLG(inode, MS_RDONLY|MS_NOATIME)
#define IS_I_VERSION(inode) __IS_FLG(inode, MS_I_VERSION)
@@ -6819,7 +6800,7 @@ diff -NurpP --minimal linux-4.4.161/include/linux/fs.h linux-4.4.161-vs2.3.9.8/i
#define IS_POSIXACL(inode) __IS_FLG(inode, MS_POSIXACL)
#define IS_DEADDIR(inode) ((inode)->i_flags & S_DEAD)
-@@ -1820,6 +1850,16 @@ struct super_operations {
+@@ -1825,6 +1855,16 @@ struct super_operations {
#define IS_WHITEOUT(inode) (S_ISCHR(inode->i_mode) && \
(inode)->i_rdev == WHITEOUT_DEV)
@@ -6836,7 +6817,7 @@ diff -NurpP --minimal linux-4.4.161/include/linux/fs.h linux-4.4.161-vs2.3.9.8/i
/*
* Inode state bits. Protected by inode->i_lock
*
-@@ -2076,6 +2116,9 @@ extern struct kobject *fs_kobj;
+@@ -2081,6 +2121,9 @@ extern struct kobject *fs_kobj;
extern int locks_mandatory_locked(struct file *);
extern int locks_mandatory_area(int, struct inode *, struct file *, loff_t, size_t);
@@ -6846,7 +6827,7 @@ diff -NurpP --minimal linux-4.4.161/include/linux/fs.h linux-4.4.161-vs2.3.9.8/i
/*
* Candidates for mandatory locking have the setgid bit set
* but no group execute bit - an otherwise meaningless combination.
-@@ -2831,6 +2874,7 @@ extern int dcache_dir_open(struct inode
+@@ -2837,6 +2880,7 @@ extern int dcache_dir_open(struct inode
extern int dcache_dir_close(struct inode *, struct file *);
extern loff_t dcache_dir_lseek(struct file *, loff_t, int);
extern int dcache_readdir(struct file *, struct dir_context *);
@@ -6854,9 +6835,9 @@ diff -NurpP --minimal linux-4.4.161/include/linux/fs.h linux-4.4.161-vs2.3.9.8/i
extern int simple_setattr(struct dentry *, struct iattr *);
extern int simple_getattr(struct vfsmount *, struct dentry *, struct kstat *);
extern int simple_statfs(struct dentry *, struct kstatfs *);
-diff -NurpP --minimal linux-4.4.161/include/linux/init_task.h linux-4.4.161-vs2.3.9.8/include/linux/init_task.h
---- linux-4.4.161/include/linux/init_task.h 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/include/linux/init_task.h 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/include/linux/init_task.h linux-4.4.197-vs2.3.9.8/include/linux/init_task.h
+--- linux-4.4.197/include/linux/init_task.h 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/include/linux/init_task.h 2018-10-20 04:57:21.000000000 +0000
@@ -260,6 +260,10 @@ extern struct task_group root_task_group
INIT_VTIME(tsk) \
INIT_NUMA_BALANCING(tsk) \
@@ -6868,9 +6849,9 @@ diff -NurpP --minimal linux-4.4.161/include/linux/init_task.h linux-4.4.161-vs2.
}
-diff -NurpP --minimal linux-4.4.161/include/linux/ipc.h linux-4.4.161-vs2.3.9.8/include/linux/ipc.h
---- linux-4.4.161/include/linux/ipc.h 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/include/linux/ipc.h 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/include/linux/ipc.h linux-4.4.197-vs2.3.9.8/include/linux/ipc.h
+--- linux-4.4.197/include/linux/ipc.h 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/include/linux/ipc.h 2018-10-20 04:57:21.000000000 +0000
@@ -16,6 +16,7 @@ struct kern_ipc_perm
key_t key;
kuid_t uid;
@@ -6879,9 +6860,9 @@ diff -NurpP --minimal linux-4.4.161/include/linux/ipc.h linux-4.4.161-vs2.3.9.8/
kuid_t cuid;
kgid_t cgid;
umode_t mode;
-diff -NurpP --minimal linux-4.4.161/include/linux/memcontrol.h linux-4.4.161-vs2.3.9.8/include/linux/memcontrol.h
---- linux-4.4.161/include/linux/memcontrol.h 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/include/linux/memcontrol.h 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/include/linux/memcontrol.h linux-4.4.197-vs2.3.9.8/include/linux/memcontrol.h
+--- linux-4.4.197/include/linux/memcontrol.h 2019-10-22 12:34:37.858605703 +0000
++++ linux-4.4.197-vs2.3.9.8/include/linux/memcontrol.h 2018-10-20 04:57:21.000000000 +0000
@@ -113,6 +113,7 @@ struct cg_proto {
struct mem_cgroup *memcg;
};
@@ -6903,9 +6884,9 @@ diff -NurpP --minimal linux-4.4.161/include/linux/memcontrol.h linux-4.4.161-vs2
static inline bool mm_match_cgroup(struct mm_struct *mm,
struct mem_cgroup *memcg)
{
-diff -NurpP --minimal linux-4.4.161/include/linux/mount.h linux-4.4.161-vs2.3.9.8/include/linux/mount.h
---- linux-4.4.161/include/linux/mount.h 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/include/linux/mount.h 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/include/linux/mount.h linux-4.4.197-vs2.3.9.8/include/linux/mount.h
+--- linux-4.4.197/include/linux/mount.h 2019-10-22 12:34:38.708592123 +0000
++++ linux-4.4.197-vs2.3.9.8/include/linux/mount.h 2018-10-20 04:57:21.000000000 +0000
@@ -63,6 +63,9 @@ struct mnt_namespace;
#define MNT_MARKED 0x4000000
#define MNT_UMOUNT 0x8000000
@@ -6916,9 +6897,20 @@ diff -NurpP --minimal linux-4.4.161/include/linux/mount.h linux-4.4.161-vs2.3.9.
struct vfsmount {
struct dentry *mnt_root; /* root of the mounted tree */
struct super_block *mnt_sb; /* pointer to superblock */
-diff -NurpP --minimal linux-4.4.161/include/linux/net.h linux-4.4.161-vs2.3.9.8/include/linux/net.h
---- linux-4.4.161/include/linux/net.h 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/include/linux/net.h 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/include/linux/netdevice.h linux-4.4.197-vs2.3.9.8/include/linux/netdevice.h
+--- linux-4.4.197/include/linux/netdevice.h 2019-10-22 12:34:38.768591162 +0000
++++ linux-4.4.197-vs2.3.9.8/include/linux/netdevice.h 2019-02-22 08:20:34.370947154 +0000
+@@ -2303,6 +2303,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.4.197/include/linux/net.h linux-4.4.197-vs2.3.9.8/include/linux/net.h
+--- linux-4.4.197/include/linux/net.h 2019-10-22 12:34:38.738591641 +0000
++++ linux-4.4.197-vs2.3.9.8/include/linux/net.h 2018-10-20 04:57:21.000000000 +0000
@@ -43,6 +43,7 @@ struct net;
#define SOCK_NOSPACE 2
#define SOCK_PASSCRED 3
@@ -6927,20 +6919,9 @@ diff -NurpP --minimal linux-4.4.161/include/linux/net.h linux-4.4.161-vs2.3.9.8/
#ifndef ARCH_HAS_SOCKET_TYPES
/**
-diff -NurpP --minimal linux-4.4.161/include/linux/netdevice.h linux-4.4.161-vs2.3.9.8/include/linux/netdevice.h
---- linux-4.4.161/include/linux/netdevice.h 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/include/linux/netdevice.h 2018-10-20 04:57:21.000000000 +0000
-@@ -2296,6 +2296,7 @@ static inline int dev_recursion_level(vo
-
- struct net_device *dev_get_by_index(struct net *net, int ifindex);
- 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.4.161/include/linux/nsproxy.h linux-4.4.161-vs2.3.9.8/include/linux/nsproxy.h
---- linux-4.4.161/include/linux/nsproxy.h 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/include/linux/nsproxy.h 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/include/linux/nsproxy.h linux-4.4.197-vs2.3.9.8/include/linux/nsproxy.h
+--- linux-4.4.197/include/linux/nsproxy.h 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/include/linux/nsproxy.h 2018-10-20 04:57:21.000000000 +0000
@@ -3,6 +3,7 @@
#include <linux/spinlock.h>
@@ -6990,9 +6971,9 @@ diff -NurpP --minimal linux-4.4.161/include/linux/nsproxy.h linux-4.4.161-vs2.3.
}
#endif
-diff -NurpP --minimal linux-4.4.161/include/linux/pid.h linux-4.4.161-vs2.3.9.8/include/linux/pid.h
---- linux-4.4.161/include/linux/pid.h 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/include/linux/pid.h 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/include/linux/pid.h linux-4.4.197-vs2.3.9.8/include/linux/pid.h
+--- linux-4.4.197/include/linux/pid.h 2019-10-22 12:34:38.858589724 +0000
++++ linux-4.4.197-vs2.3.9.8/include/linux/pid.h 2018-10-20 04:57:21.000000000 +0000
@@ -10,7 +10,8 @@ enum pid_type
PIDTYPE_SID,
PIDTYPE_MAX,
@@ -7011,9 +6992,9 @@ diff -NurpP --minimal linux-4.4.161/include/linux/pid.h linux-4.4.161-vs2.3.9.8/
pid_t pid_vnr(struct pid *pid);
#define do_each_pid_task(pid, type, task) \
-diff -NurpP --minimal linux-4.4.161/include/linux/quotaops.h linux-4.4.161-vs2.3.9.8/include/linux/quotaops.h
---- linux-4.4.161/include/linux/quotaops.h 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/include/linux/quotaops.h 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/include/linux/quotaops.h linux-4.4.197-vs2.3.9.8/include/linux/quotaops.h
+--- linux-4.4.197/include/linux/quotaops.h 2019-10-22 12:34:38.948588285 +0000
++++ linux-4.4.197-vs2.3.9.8/include/linux/quotaops.h 2019-10-05 14:35:35.702757815 +0000
@@ -8,6 +8,7 @@
#define _LINUX_QUOTAOPS_
@@ -7055,9 +7036,9 @@ diff -NurpP --minimal linux-4.4.161/include/linux/quotaops.h linux-4.4.161-vs2.3
}
static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
-diff -NurpP --minimal linux-4.4.161/include/linux/sched.h linux-4.4.161-vs2.3.9.8/include/linux/sched.h
---- linux-4.4.161/include/linux/sched.h 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/include/linux/sched.h 2018-10-20 05:50:20.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/include/linux/sched.h linux-4.4.197-vs2.3.9.8/include/linux/sched.h
+--- linux-4.4.197/include/linux/sched.h 2019-10-22 12:34:38.988587649 +0000
++++ linux-4.4.197-vs2.3.9.8/include/linux/sched.h 2019-10-05 14:35:35.742757182 +0000
@@ -1601,6 +1601,14 @@ struct task_struct {
#endif
struct seccomp seccomp;
@@ -7095,9 +7076,9 @@ diff -NurpP --minimal linux-4.4.161/include/linux/sched.h linux-4.4.161-vs2.3.9.
}
-diff -NurpP --minimal linux-4.4.161/include/linux/shmem_fs.h linux-4.4.161-vs2.3.9.8/include/linux/shmem_fs.h
---- linux-4.4.161/include/linux/shmem_fs.h 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/include/linux/shmem_fs.h 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/include/linux/shmem_fs.h linux-4.4.197-vs2.3.9.8/include/linux/shmem_fs.h
+--- linux-4.4.197/include/linux/shmem_fs.h 2019-10-22 12:34:39.018587167 +0000
++++ linux-4.4.197-vs2.3.9.8/include/linux/shmem_fs.h 2018-10-20 04:57:21.000000000 +0000
@@ -10,6 +10,9 @@
/* inode in-kernel data */
@@ -7108,9 +7089,9 @@ diff -NurpP --minimal linux-4.4.161/include/linux/shmem_fs.h linux-4.4.161-vs2.3
struct shmem_inode_info {
spinlock_t lock;
unsigned int seals; /* shmem seals */
-diff -NurpP --minimal linux-4.4.161/include/linux/stat.h linux-4.4.161-vs2.3.9.8/include/linux/stat.h
---- linux-4.4.161/include/linux/stat.h 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/include/linux/stat.h 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/include/linux/stat.h linux-4.4.197-vs2.3.9.8/include/linux/stat.h
+--- linux-4.4.197/include/linux/stat.h 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/include/linux/stat.h 2018-10-20 04:57:21.000000000 +0000
@@ -25,6 +25,7 @@ struct kstat {
unsigned int nlink;
kuid_t uid;
@@ -7119,9 +7100,9 @@ diff -NurpP --minimal linux-4.4.161/include/linux/stat.h linux-4.4.161-vs2.3.9.8
dev_t rdev;
loff_t size;
struct timespec atime;
-diff -NurpP --minimal linux-4.4.161/include/linux/sunrpc/auth.h linux-4.4.161-vs2.3.9.8/include/linux/sunrpc/auth.h
---- linux-4.4.161/include/linux/sunrpc/auth.h 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/include/linux/sunrpc/auth.h 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/include/linux/sunrpc/auth.h linux-4.4.197-vs2.3.9.8/include/linux/sunrpc/auth.h
+--- linux-4.4.197/include/linux/sunrpc/auth.h 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/include/linux/sunrpc/auth.h 2018-10-20 04:57:21.000000000 +0000
@@ -40,6 +40,7 @@ enum {
struct auth_cred {
kuid_t uid;
@@ -7130,9 +7111,9 @@ diff -NurpP --minimal linux-4.4.161/include/linux/sunrpc/auth.h linux-4.4.161-vs
struct group_info *group_info;
const char *principal;
unsigned long ac_flags;
-diff -NurpP --minimal linux-4.4.161/include/linux/sunrpc/clnt.h linux-4.4.161-vs2.3.9.8/include/linux/sunrpc/clnt.h
---- linux-4.4.161/include/linux/sunrpc/clnt.h 2018-10-20 02:34:30.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/include/linux/sunrpc/clnt.h 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/include/linux/sunrpc/clnt.h linux-4.4.197-vs2.3.9.8/include/linux/sunrpc/clnt.h
+--- linux-4.4.197/include/linux/sunrpc/clnt.h 2019-10-22 12:34:39.118585570 +0000
++++ linux-4.4.197-vs2.3.9.8/include/linux/sunrpc/clnt.h 2018-10-20 04:57:21.000000000 +0000
@@ -51,7 +51,8 @@ struct rpc_clnt {
cl_discrtry : 1,/* disconnect before retry */
cl_noretranstimeo: 1,/* No retransmit timeouts */
@@ -7143,9 +7124,9 @@ diff -NurpP --minimal linux-4.4.161/include/linux/sunrpc/clnt.h linux-4.4.161-vs
struct rpc_rtt * cl_rtt; /* RTO estimator data */
const struct rpc_timeout *cl_timeout; /* Timeout strategy */
-diff -NurpP --minimal linux-4.4.161/include/linux/types.h linux-4.4.161-vs2.3.9.8/include/linux/types.h
---- linux-4.4.161/include/linux/types.h 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/include/linux/types.h 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/include/linux/types.h linux-4.4.197-vs2.3.9.8/include/linux/types.h
+--- linux-4.4.197/include/linux/types.h 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/include/linux/types.h 2018-10-20 04:57:21.000000000 +0000
@@ -32,6 +32,9 @@ typedef __kernel_uid32_t uid_t;
typedef __kernel_gid32_t gid_t;
typedef __kernel_uid16_t uid16_t;
@@ -7156,9 +7137,9 @@ diff -NurpP --minimal linux-4.4.161/include/linux/types.h linux-4.4.161-vs2.3.9.
typedef unsigned long uintptr_t;
-diff -NurpP --minimal linux-4.4.161/include/linux/uidgid.h linux-4.4.161-vs2.3.9.8/include/linux/uidgid.h
---- linux-4.4.161/include/linux/uidgid.h 2016-01-10 23:01:32.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/include/linux/uidgid.h 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/include/linux/uidgid.h linux-4.4.197-vs2.3.9.8/include/linux/uidgid.h
+--- linux-4.4.197/include/linux/uidgid.h 2016-01-10 23:01:32.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/include/linux/uidgid.h 2018-10-20 04:57:21.000000000 +0000
@@ -21,13 +21,17 @@ typedef struct {
uid_t val;
} kuid_t;
@@ -7255,9 +7236,9 @@ diff -NurpP --minimal linux-4.4.161/include/linux/uidgid.h linux-4.4.161-vs2.3.9
static inline uid_t from_kuid_munged(struct user_namespace *to, kuid_t kuid)
{
uid_t uid = from_kuid(to, kuid);
-diff -NurpP --minimal linux-4.4.161/include/linux/vroot.h linux-4.4.161-vs2.3.9.8/include/linux/vroot.h
---- linux-4.4.161/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/include/linux/vroot.h 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/include/linux/vroot.h linux-4.4.197-vs2.3.9.8/include/linux/vroot.h
+--- linux-4.4.197/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/include/linux/vroot.h 2018-10-20 04:57:21.000000000 +0000
@@ -0,0 +1,51 @@
+
+/*
@@ -7310,9 +7291,9 @@ diff -NurpP --minimal linux-4.4.161/include/linux/vroot.h linux-4.4.161-vs2.3.9.
+#define VROOT_CLR_DEV 0x5601
+
+#endif /* _LINUX_VROOT_H */
-diff -NurpP --minimal linux-4.4.161/include/linux/vs_base.h linux-4.4.161-vs2.3.9.8/include/linux/vs_base.h
---- linux-4.4.161/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/include/linux/vs_base.h 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/include/linux/vs_base.h linux-4.4.197-vs2.3.9.8/include/linux/vs_base.h
+--- linux-4.4.197/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/include/linux/vs_base.h 2018-10-20 04:57:21.000000000 +0000
@@ -0,0 +1,10 @@
+#ifndef _VS_BASE_H
+#define _VS_BASE_H
@@ -7324,9 +7305,9 @@ diff -NurpP --minimal linux-4.4.161/include/linux/vs_base.h linux-4.4.161-vs2.3.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.4.161/include/linux/vs_context.h linux-4.4.161-vs2.3.9.8/include/linux/vs_context.h
---- linux-4.4.161/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/include/linux/vs_context.h 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/include/linux/vs_context.h linux-4.4.197-vs2.3.9.8/include/linux/vs_context.h
+--- linux-4.4.197/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/include/linux/vs_context.h 2018-10-20 04:57:21.000000000 +0000
@@ -0,0 +1,242 @@
+#ifndef _VS_CONTEXT_H
+#define _VS_CONTEXT_H
@@ -7570,9 +7551,9 @@ diff -NurpP --minimal linux-4.4.161/include/linux/vs_context.h linux-4.4.161-vs2
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.4.161/include/linux/vs_cowbl.h linux-4.4.161-vs2.3.9.8/include/linux/vs_cowbl.h
---- linux-4.4.161/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/include/linux/vs_cowbl.h 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/include/linux/vs_cowbl.h linux-4.4.197-vs2.3.9.8/include/linux/vs_cowbl.h
+--- linux-4.4.197/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/include/linux/vs_cowbl.h 2018-10-20 04:57:21.000000000 +0000
@@ -0,0 +1,48 @@
+#ifndef _VS_COWBL_H
+#define _VS_COWBL_H
@@ -7622,9 +7603,9 @@ diff -NurpP --minimal linux-4.4.161/include/linux/vs_cowbl.h linux-4.4.161-vs2.3
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.4.161/include/linux/vs_cvirt.h linux-4.4.161-vs2.3.9.8/include/linux/vs_cvirt.h
---- linux-4.4.161/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/include/linux/vs_cvirt.h 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/include/linux/vs_cvirt.h linux-4.4.197-vs2.3.9.8/include/linux/vs_cvirt.h
+--- linux-4.4.197/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/include/linux/vs_cvirt.h 2018-10-20 04:57:21.000000000 +0000
@@ -0,0 +1,50 @@
+#ifndef _VS_CVIRT_H
+#define _VS_CVIRT_H
@@ -7676,9 +7657,9 @@ diff -NurpP --minimal linux-4.4.161/include/linux/vs_cvirt.h linux-4.4.161-vs2.3
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.4.161/include/linux/vs_device.h linux-4.4.161-vs2.3.9.8/include/linux/vs_device.h
---- linux-4.4.161/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/include/linux/vs_device.h 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/include/linux/vs_device.h linux-4.4.197-vs2.3.9.8/include/linux/vs_device.h
+--- linux-4.4.197/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/include/linux/vs_device.h 2018-10-20 04:57:21.000000000 +0000
@@ -0,0 +1,45 @@
+#ifndef _VS_DEVICE_H
+#define _VS_DEVICE_H
@@ -7725,9 +7706,9 @@ diff -NurpP --minimal linux-4.4.161/include/linux/vs_device.h linux-4.4.161-vs2.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.4.161/include/linux/vs_dlimit.h linux-4.4.161-vs2.3.9.8/include/linux/vs_dlimit.h
---- linux-4.4.161/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/include/linux/vs_dlimit.h 2018-10-20 04:57:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.197/include/linux/vs_dlimit.h linux-4.4.197-vs2.3.9.8/include/linux/vs_dlimit.h
+--- linux-4.4.197/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/include/linux/vs_dlimit.h 2018-10-20 04:57:21.000000000 +0000
@@ -0,0 +1,215 @@
+#ifndef _VS_DLIMIT_H
+#define _VS_DLIMIT_H
@@ -7944,3414 +7925,3414 @@ diff -NurpP --minimal linux-4.4.161/include/linux/vs_dlimit.h linux-4.4.161-vs2.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.4.161/include/linux/vs_inet.h linux-4.4.161-vs2.3.9.8/include/linux/vs_inet.h
---- linux-4.4.161/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.161-vs2.3.9.8/include/linux/vs_inet.h 2018-10-20 04:57:21.000000000 +0000
-@@ -0,0 +1,364 @@
-+#ifndef _VS_INET_H
-+#define _VS_INET_H
+diff -NurpP --minimal linux-4.4.197/include/linux/vserver/base.h linux-4.4.197-vs2.3.9.8/include/linux/vserver/base.h
+--- linux-4.4.197/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.197-vs2.3.9.8/include/linux/vserver/base.h 2018-10-20 04:57:21.000000000 +0000
+@@ -0,0 +1,184 @@
++#ifndef _VSERVER_BASE_H
++#define _VSERVER_BASE_H
+
-+#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)))
<Skipped 9486 lines>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/3cc86a71a866b530ffd9f214b3fc18f61a24ea90
More information about the pld-cvs-commit
mailing list