-diff -NurpP --minimal linux-3.18.5/Documentation/vserver/debug.txt linux-3.18.5-vs2.3.7.3/Documentation/vserver/debug.txt
---- linux-3.18.5/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/Documentation/vserver/debug.txt 2015-01-19 10:57:45.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/Documentation/vserver/debug.txt linux-4.4.110-vs2.3.9/Documentation/vserver/debug.txt
+--- linux-4.4.110/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/Documentation/vserver/debug.txt 2018-01-09 16:36:20.000000000 +0000
@@ -0,0 +1,154 @@
+
+debug_cvirt:
+ "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«"
++ 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«"
++ "old path ?%s?"
+ "path_lookup(old): %d"
+ "vfs_create(new): %d"
+ "vfs_rename: %d"
+
+debug_tag:
+
-+ 7 80 "dx_parse_tag(»%s«): %d:#%d"
++ 7 80 "dx_parse_tag(?%s?): %d:#%d"
+ "dx_propagate_tag(%p[#%lu.%d]): %d,%d"
+
+debug_xid:
+ 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-3.18.5/arch/alpha/Kconfig linux-3.18.5-vs2.3.7.3/arch/alpha/Kconfig
---- linux-3.18.5/arch/alpha/Kconfig 2014-06-12 13:00:27.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/arch/alpha/Kconfig 2015-01-19 10:57:45.000000000 +0000
-@@ -740,6 +740,8 @@ config DUMMY_CONSOLE
+diff -NurpP --minimal linux-4.4.110/arch/alpha/Kconfig linux-4.4.110-vs2.3.9/arch/alpha/Kconfig
+--- linux-4.4.110/arch/alpha/Kconfig 2016-07-05 04:11:34.000000000 +0000
++++ linux-4.4.110-vs2.3.9/arch/alpha/Kconfig 2018-01-09 16:36:20.000000000 +0000
+@@ -745,6 +745,8 @@ config DUMMY_CONSOLE
depends on VGA_HOSE
default y
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.18.5/arch/alpha/kernel/systbls.S linux-3.18.5-vs2.3.7.3/arch/alpha/kernel/systbls.S
---- linux-3.18.5/arch/alpha/kernel/systbls.S 2015-01-16 22:18:10.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/arch/alpha/kernel/systbls.S 2015-01-19 10:57:45.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/arch/alpha/kernel/systbls.S linux-4.4.110-vs2.3.9/arch/alpha/kernel/systbls.S
+--- linux-4.4.110/arch/alpha/kernel/systbls.S 2015-07-06 20:41:36.000000000 +0000
++++ linux-4.4.110-vs2.3.9/arch/alpha/kernel/systbls.S 2018-01-09 16:36:20.000000000 +0000
@@ -446,7 +446,7 @@ sys_call_table:
.quad sys_stat64 /* 425 */
.quad sys_lstat64
.quad sys_ni_syscall /* sys_mbind */
.quad sys_ni_syscall /* sys_get_mempolicy */
.quad sys_ni_syscall /* sys_set_mempolicy */
-diff -NurpP --minimal linux-3.18.5/arch/alpha/kernel/traps.c linux-3.18.5-vs2.3.7.3/arch/alpha/kernel/traps.c
---- linux-3.18.5/arch/alpha/kernel/traps.c 2014-01-22 20:38:10.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/arch/alpha/kernel/traps.c 2015-01-19 10:57:45.000000000 +0000
-@@ -175,7 +175,8 @@ die_if_kernel(char * str, struct pt_regs
+diff -NurpP --minimal linux-4.4.110/arch/alpha/kernel/traps.c linux-4.4.110-vs2.3.9/arch/alpha/kernel/traps.c
+--- linux-4.4.110/arch/alpha/kernel/traps.c 2015-07-06 20:41:36.000000000 +0000
++++ linux-4.4.110-vs2.3.9/arch/alpha/kernel/traps.c 2018-01-09 16:36:20.000000000 +0000
+@@ -174,7 +174,8 @@ die_if_kernel(char * str, struct pt_regs
#ifdef CONFIG_SMP
printk("CPU %d ", hard_smp_processor_id());
#endif
dik_show_regs(regs, r9_15);
add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE);
dik_show_trace((unsigned long *)(regs+1));
-diff -NurpP --minimal linux-3.18.5/arch/arm/Kconfig linux-3.18.5-vs2.3.7.3/arch/arm/Kconfig
---- linux-3.18.5/arch/arm/Kconfig 2015-01-17 02:39:30.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/arch/arm/Kconfig 2015-01-19 10:57:45.000000000 +0000
-@@ -2170,6 +2170,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-4.4.110/arch/arm/Kconfig linux-4.4.110-vs2.3.9/arch/arm/Kconfig
+--- linux-4.4.110/arch/arm/Kconfig 2016-07-05 04:14:23.000000000 +0000
++++ linux-4.4.110-vs2.3.9/arch/arm/Kconfig 2018-01-09 16:36:20.000000000 +0000
+@@ -2159,6 +2159,8 @@ source "fs/Kconfig"
source "arch/arm/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.18.5/arch/arm/kernel/calls.S linux-3.18.5-vs2.3.7.3/arch/arm/kernel/calls.S
---- linux-3.18.5/arch/arm/kernel/calls.S 2015-01-17 02:39:31.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/arch/arm/kernel/calls.S 2015-01-19 10:57:45.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/arch/arm/kernel/calls.S linux-4.4.110-vs2.3.9/arch/arm/kernel/calls.S
+--- linux-4.4.110/arch/arm/kernel/calls.S 2016-07-05 04:14:26.000000000 +0000
++++ linux-4.4.110-vs2.3.9/arch/arm/kernel/calls.S 2018-01-09 16:36:20.000000000 +0000
@@ -322,7 +322,7 @@
/* 310 */ CALL(sys_request_key)
CALL(sys_keyctl)
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-3.18.5/arch/arm/kernel/traps.c linux-3.18.5-vs2.3.7.3/arch/arm/kernel/traps.c
---- linux-3.18.5/arch/arm/kernel/traps.c 2015-01-17 02:39:31.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/arch/arm/kernel/traps.c 2015-01-19 10:57:45.000000000 +0000
-@@ -250,8 +250,8 @@ static int __die(const char *str, int er
+diff -NurpP --minimal linux-4.4.110/arch/arm/kernel/traps.c linux-4.4.110-vs2.3.9/arch/arm/kernel/traps.c
+--- linux-4.4.110/arch/arm/kernel/traps.c 2018-01-09 16:34:28.000000000 +0000
++++ linux-4.4.110-vs2.3.9/arch/arm/kernel/traps.c 2018-01-09 16:36:20.000000000 +0000
+@@ -258,8 +258,8 @@ static int __die(const char *str, int er
print_modules();
__show_regs(regs);
-- printk(KERN_EMERG "Process %.*s (pid: %d, stack limit = 0x%p)\n",
-- TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), end_of_stack(tsk));
-+ printk(KERN_EMERG "Process %.*s (pid: %d:#%u, stack limit = 0x%p)\n",
-+ TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), tsk->xid, end_of_stack(tsk));
+- pr_emerg("Process %.*s (pid: %d, stack limit = 0x%p)\n",
+- TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), end_of_stack(tsk));
++ pr_emerg("Process %.*s (pid: %d:%u, stack limit = 0x%p)\n",
++ TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), tsk->xid, end_of_stack(tsk));
if (!user_mode(regs) || in_interrupt()) {
dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-3.18.5/arch/cris/Kconfig linux-3.18.5-vs2.3.7.3/arch/cris/Kconfig
---- linux-3.18.5/arch/cris/Kconfig 2014-06-12 13:00:42.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/arch/cris/Kconfig 2015-01-19 10:57:45.000000000 +0000
-@@ -556,6 +556,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-4.4.110/arch/cris/Kconfig linux-4.4.110-vs2.3.9/arch/cris/Kconfig
+--- linux-4.4.110/arch/cris/Kconfig 2016-07-05 04:14:27.000000000 +0000
++++ linux-4.4.110-vs2.3.9/arch/cris/Kconfig 2018-01-09 16:36:20.000000000 +0000
+@@ -581,6 +581,8 @@ source "fs/Kconfig"
source "arch/cris/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.18.5/arch/ia64/Kconfig linux-3.18.5-vs2.3.7.3/arch/ia64/Kconfig
---- linux-3.18.5/arch/ia64/Kconfig 2015-01-16 22:18:19.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/arch/ia64/Kconfig 2015-01-19 10:57:45.000000000 +0000
-@@ -636,6 +636,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-4.4.110/arch/ia64/Kconfig linux-4.4.110-vs2.3.9/arch/ia64/Kconfig
+--- linux-4.4.110/arch/ia64/Kconfig 2016-07-05 04:11:39.000000000 +0000
++++ linux-4.4.110-vs2.3.9/arch/ia64/Kconfig 2018-01-09 16:36:21.000000000 +0000
+@@ -606,6 +606,8 @@ source "fs/Kconfig"
source "arch/ia64/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.18.5/arch/ia64/kernel/entry.S linux-3.18.5-vs2.3.7.3/arch/ia64/kernel/entry.S
---- linux-3.18.5/arch/ia64/kernel/entry.S 2015-01-17 02:39:35.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/arch/ia64/kernel/entry.S 2015-01-19 10:57:45.000000000 +0000
-@@ -1706,7 +1706,7 @@ sys_call_table:
+diff -NurpP --minimal linux-4.4.110/arch/ia64/kernel/entry.S linux-4.4.110-vs2.3.9/arch/ia64/kernel/entry.S
+--- linux-4.4.110/arch/ia64/kernel/entry.S 2016-07-05 04:14:27.000000000 +0000
++++ linux-4.4.110-vs2.3.9/arch/ia64/kernel/entry.S 2018-01-09 16:36:21.000000000 +0000
+@@ -1694,7 +1694,7 @@ sys_call_table:
data8 sys_mq_notify
data8 sys_mq_getsetattr
data8 sys_kexec_load
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -NurpP --minimal linux-3.18.5/arch/ia64/kernel/ptrace.c linux-3.18.5-vs2.3.7.3/arch/ia64/kernel/ptrace.c
---- linux-3.18.5/arch/ia64/kernel/ptrace.c 2015-01-17 02:39:35.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/arch/ia64/kernel/ptrace.c 2015-01-19 10:57:45.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/arch/ia64/kernel/ptrace.c linux-4.4.110-vs2.3.9/arch/ia64/kernel/ptrace.c
+--- linux-4.4.110/arch/ia64/kernel/ptrace.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.110-vs2.3.9/arch/ia64/kernel/ptrace.c 2018-01-09 16:36:21.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/regset.h>
#include <linux/elf.h>
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-3.18.5/arch/ia64/kernel/traps.c linux-3.18.5-vs2.3.7.3/arch/ia64/kernel/traps.c
---- linux-3.18.5/arch/ia64/kernel/traps.c 2015-01-17 02:39:35.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/arch/ia64/kernel/traps.c 2015-01-19 10:57:45.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/arch/ia64/kernel/traps.c linux-4.4.110-vs2.3.9/arch/ia64/kernel/traps.c
+--- linux-4.4.110/arch/ia64/kernel/traps.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.110-vs2.3.9/arch/ia64/kernel/traps.c 2018-01-09 16:36:21.000000000 +0000
@@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re
put_cpu();
}
}
}
-diff -NurpP --minimal linux-3.18.5/arch/m32r/kernel/traps.c linux-3.18.5-vs2.3.7.3/arch/m32r/kernel/traps.c
---- linux-3.18.5/arch/m32r/kernel/traps.c 2013-07-14 17:00:26.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/arch/m32r/kernel/traps.c 2015-01-19 10:57:45.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/arch/m32r/kernel/traps.c linux-4.4.110-vs2.3.9/arch/m32r/kernel/traps.c
+--- linux-4.4.110/arch/m32r/kernel/traps.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.110-vs2.3.9/arch/m32r/kernel/traps.c 2018-01-09 16:36:21.000000000 +0000
@@ -184,8 +184,9 @@ static void show_registers(struct pt_reg
} else {
printk("SPI: %08lx\n", sp);
/*
* When in-kernel, we also print out the stack and code at the
-diff -NurpP --minimal linux-3.18.5/arch/m68k/Kconfig linux-3.18.5-vs2.3.7.3/arch/m68k/Kconfig
---- linux-3.18.5/arch/m68k/Kconfig 2014-06-12 13:00:43.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/arch/m68k/Kconfig 2015-01-19 10:57:45.000000000 +0000
-@@ -159,6 +159,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-4.4.110/arch/m68k/Kconfig linux-4.4.110-vs2.3.9/arch/m68k/Kconfig
+--- linux-4.4.110/arch/m68k/Kconfig 2016-07-05 04:11:39.000000000 +0000
++++ linux-4.4.110-vs2.3.9/arch/m68k/Kconfig 2018-01-09 16:36:21.000000000 +0000
+@@ -164,6 +164,8 @@ source "fs/Kconfig"
source "arch/m68k/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.18.5/arch/mips/Kconfig linux-3.18.5-vs2.3.7.3/arch/mips/Kconfig
---- linux-3.18.5/arch/mips/Kconfig 2015-01-17 02:39:35.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/arch/mips/Kconfig 2015-01-19 10:57:45.000000000 +0000
-@@ -2712,6 +2712,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-4.4.110/arch/mips/Kconfig linux-4.4.110-vs2.3.9/arch/mips/Kconfig
+--- linux-4.4.110/arch/mips/Kconfig 2018-01-09 16:34:30.000000000 +0000
++++ linux-4.4.110-vs2.3.9/arch/mips/Kconfig 2018-01-09 16:36:21.000000000 +0000
+@@ -3026,6 +3026,8 @@ source "fs/Kconfig"
source "arch/mips/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.18.5/arch/mips/kernel/ptrace.c linux-3.18.5-vs2.3.7.3/arch/mips/kernel/ptrace.c
---- linux-3.18.5/arch/mips/kernel/ptrace.c 2015-01-17 02:39:36.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/arch/mips/kernel/ptrace.c 2015-01-19 10:57:45.000000000 +0000
-@@ -29,6 +29,7 @@
+diff -NurpP --minimal linux-4.4.110/arch/mips/kernel/ptrace.c linux-4.4.110-vs2.3.9/arch/mips/kernel/ptrace.c
+--- linux-4.4.110/arch/mips/kernel/ptrace.c 2018-01-09 16:34:30.000000000 +0000
++++ linux-4.4.110-vs2.3.9/arch/mips/kernel/ptrace.c 2018-01-09 16:36:21.000000000 +0000
+@@ -30,6 +30,7 @@
#include <linux/audit.h>
#include <linux/seccomp.h>
#include <linux/ftrace.h>
#include <asm/byteorder.h>
#include <asm/cpu.h>
-@@ -544,6 +545,9 @@ long arch_ptrace(struct task_struct *chi
+@@ -690,6 +691,9 @@ long arch_ptrace(struct task_struct *chi
void __user *datavp = (void __user *) data;
unsigned long __user *datalp = (void __user *) data;
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-3.18.5/arch/mips/kernel/scall32-o32.S linux-3.18.5-vs2.3.7.3/arch/mips/kernel/scall32-o32.S
---- linux-3.18.5/arch/mips/kernel/scall32-o32.S 2015-01-17 02:39:36.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/arch/mips/kernel/scall32-o32.S 2015-01-19 10:57:45.000000000 +0000
-@@ -501,7 +501,7 @@ EXPORT(sys_call_table)
+diff -NurpP --minimal linux-4.4.110/arch/mips/kernel/scall32-o32.S linux-4.4.110-vs2.3.9/arch/mips/kernel/scall32-o32.S
+--- linux-4.4.110/arch/mips/kernel/scall32-o32.S 2018-01-09 16:34:30.000000000 +0000
++++ linux-4.4.110-vs2.3.9/arch/mips/kernel/scall32-o32.S 2018-01-09 16:36:21.000000000 +0000
+@@ -512,7 +512,7 @@ EXPORT(sys_call_table)
PTR sys_mq_timedreceive
PTR sys_mq_notify /* 4275 */
PTR sys_mq_getsetattr
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-diff -NurpP --minimal linux-3.18.5/arch/mips/kernel/scall64-64.S linux-3.18.5-vs2.3.7.3/arch/mips/kernel/scall64-64.S
---- linux-3.18.5/arch/mips/kernel/scall64-64.S 2015-01-17 02:39:36.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/arch/mips/kernel/scall64-64.S 2015-01-19 10:57:45.000000000 +0000
-@@ -355,7 +355,7 @@ EXPORT(sys_call_table)
+diff -NurpP --minimal linux-4.4.110/arch/mips/kernel/scall64-64.S linux-4.4.110-vs2.3.9/arch/mips/kernel/scall64-64.S
+--- linux-4.4.110/arch/mips/kernel/scall64-64.S 2018-01-09 16:34:30.000000000 +0000
++++ linux-4.4.110-vs2.3.9/arch/mips/kernel/scall64-64.S 2018-01-09 16:36:21.000000000 +0000
+@@ -349,7 +349,7 @@ EXPORT(sys_call_table)
PTR sys_mq_timedreceive
PTR sys_mq_notify
PTR sys_mq_getsetattr /* 5235 */
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-3.18.5/arch/mips/kernel/scall64-n32.S linux-3.18.5-vs2.3.7.3/arch/mips/kernel/scall64-n32.S
---- linux-3.18.5/arch/mips/kernel/scall64-n32.S 2015-01-17 02:39:36.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/arch/mips/kernel/scall64-n32.S 2015-01-19 10:57:45.000000000 +0000
-@@ -348,7 +348,7 @@ EXPORT(sysn32_call_table)
+diff -NurpP --minimal linux-4.4.110/arch/mips/kernel/scall64-n32.S linux-4.4.110-vs2.3.9/arch/mips/kernel/scall64-n32.S
+--- linux-4.4.110/arch/mips/kernel/scall64-n32.S 2018-01-09 16:34:30.000000000 +0000
++++ linux-4.4.110-vs2.3.9/arch/mips/kernel/scall64-n32.S 2018-01-09 16:36:21.000000000 +0000
+@@ -339,7 +339,7 @@ EXPORT(sysn32_call_table)
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify
PTR compat_sys_mq_getsetattr
PTR compat_sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-3.18.5/arch/mips/kernel/scall64-o32.S linux-3.18.5-vs2.3.7.3/arch/mips/kernel/scall64-o32.S
---- linux-3.18.5/arch/mips/kernel/scall64-o32.S 2015-01-17 02:39:36.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/arch/mips/kernel/scall64-o32.S 2015-01-19 10:57:45.000000000 +0000
-@@ -486,7 +486,7 @@ EXPORT(sys32_call_table)
+diff -NurpP --minimal linux-4.4.110/arch/mips/kernel/scall64-o32.S linux-4.4.110-vs2.3.9/arch/mips/kernel/scall64-o32.S
+--- linux-4.4.110/arch/mips/kernel/scall64-o32.S 2018-01-09 16:34:30.000000000 +0000
++++ linux-4.4.110-vs2.3.9/arch/mips/kernel/scall64-o32.S 2018-01-09 16:36:21.000000000 +0000
+@@ -495,7 +495,7 @@ EXPORT(sys32_call_table)
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify /* 4275 */
PTR compat_sys_mq_getsetattr
PTR compat_sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-diff -NurpP --minimal linux-3.18.5/arch/mips/kernel/traps.c linux-3.18.5-vs2.3.7.3/arch/mips/kernel/traps.c
---- linux-3.18.5/arch/mips/kernel/traps.c 2015-01-16 22:18:20.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/arch/mips/kernel/traps.c 2015-01-19 10:57:45.000000000 +0000
-@@ -341,9 +341,10 @@ void show_registers(struct pt_regs *regs
+diff -NurpP --minimal linux-4.4.110/arch/mips/kernel/traps.c linux-4.4.110-vs2.3.9/arch/mips/kernel/traps.c
+--- linux-4.4.110/arch/mips/kernel/traps.c 2018-01-09 16:34:30.000000000 +0000
++++ linux-4.4.110-vs2.3.9/arch/mips/kernel/traps.c 2018-01-09 16:36:21.000000000 +0000
+@@ -353,9 +353,10 @@ void show_registers(struct pt_regs *regs
__show_regs(regs);
print_modules();
if (cpu_has_userlocal) {
unsigned long tls;
-diff -NurpP --minimal linux-3.18.5/arch/parisc/Kconfig linux-3.18.5-vs2.3.7.3/arch/parisc/Kconfig
---- linux-3.18.5/arch/parisc/Kconfig 2015-01-16 22:18:21.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/arch/parisc/Kconfig 2015-01-19 10:57:45.000000000 +0000
-@@ -337,6 +337,8 @@ config SECCOMP
+diff -NurpP --minimal linux-4.4.110/arch/parisc/Kconfig linux-4.4.110-vs2.3.9/arch/parisc/Kconfig
+--- linux-4.4.110/arch/parisc/Kconfig 2016-07-05 04:14:29.000000000 +0000
++++ linux-4.4.110-vs2.3.9/arch/parisc/Kconfig 2018-01-09 16:36:21.000000000 +0000
+@@ -341,6 +341,8 @@ config SECCOMP
If unsure, say Y. Only embedded should say N here.
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.18.5/arch/parisc/kernel/syscall_table.S linux-3.18.5-vs2.3.7.3/arch/parisc/kernel/syscall_table.S
---- linux-3.18.5/arch/parisc/kernel/syscall_table.S 2015-01-17 02:39:36.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/arch/parisc/kernel/syscall_table.S 2015-01-19 10:57:45.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/arch/parisc/kernel/syscall_table.S linux-4.4.110-vs2.3.9/arch/parisc/kernel/syscall_table.S
+--- linux-4.4.110/arch/parisc/kernel/syscall_table.S 2018-01-09 16:34:31.000000000 +0000
++++ linux-4.4.110-vs2.3.9/arch/parisc/kernel/syscall_table.S 2018-01-09 16:36:21.000000000 +0000
@@ -358,7 +358,7 @@
ENTRY_COMP(mbind) /* 260 */
ENTRY_COMP(get_mempolicy)
+ ENTRY_DIFF(vserver)
ENTRY_SAME(add_key)
ENTRY_SAME(request_key) /* 265 */
- ENTRY_SAME(keyctl)
-diff -NurpP --minimal linux-3.18.5/arch/parisc/kernel/traps.c linux-3.18.5-vs2.3.7.3/arch/parisc/kernel/traps.c
---- linux-3.18.5/arch/parisc/kernel/traps.c 2014-06-12 13:01:26.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/arch/parisc/kernel/traps.c 2015-01-19 10:57:45.000000000 +0000
-@@ -239,8 +239,9 @@ void die_if_kernel(char *str, struct pt_
+ ENTRY_COMP(keyctl)
+diff -NurpP --minimal linux-4.4.110/arch/parisc/kernel/traps.c linux-4.4.110-vs2.3.9/arch/parisc/kernel/traps.c
+--- linux-4.4.110/arch/parisc/kernel/traps.c 2018-01-09 16:34:31.000000000 +0000
++++ linux-4.4.110-vs2.3.9/arch/parisc/kernel/traps.c 2018-01-09 16:36:21.000000000 +0000
+@@ -235,8 +235,9 @@ void die_if_kernel(char *str, struct pt_
return; /* STFU */
parisc_printk_ratelimited(1, regs,
return;
}
-@@ -270,8 +271,8 @@ void die_if_kernel(char *str, struct pt_
+@@ -266,8 +267,8 @@ void die_if_kernel(char *str, struct pt_
pdc_console_restart();
if (err)
/* Wot's wrong wif bein' racy? */
if (current->thread.flags & PARISC_KERNEL_DEATH) {
-diff -NurpP --minimal linux-3.18.5/arch/powerpc/Kconfig linux-3.18.5-vs2.3.7.3/arch/powerpc/Kconfig
---- linux-3.18.5/arch/powerpc/Kconfig 2015-01-17 02:39:36.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/arch/powerpc/Kconfig 2015-01-19 10:57:46.000000000 +0000
-@@ -1068,6 +1068,8 @@ source "lib/Kconfig"
+diff -NurpP --minimal linux-4.4.110/arch/powerpc/Kconfig linux-4.4.110-vs2.3.9/arch/powerpc/Kconfig
+--- linux-4.4.110/arch/powerpc/Kconfig 2018-01-09 16:34:31.000000000 +0000
++++ linux-4.4.110-vs2.3.9/arch/powerpc/Kconfig 2018-01-09 16:36:21.000000000 +0000
+@@ -1080,6 +1080,8 @@ source "lib/Kconfig"
source "arch/powerpc/Kconfig.debug"
+
source "security/Kconfig"
- config KEYS_COMPAT
-diff -NurpP --minimal linux-3.18.5/arch/powerpc/include/uapi/asm/unistd.h linux-3.18.5-vs2.3.7.3/arch/powerpc/include/uapi/asm/unistd.h
---- linux-3.18.5/arch/powerpc/include/uapi/asm/unistd.h 2015-01-17 02:39:36.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/arch/powerpc/include/uapi/asm/unistd.h 2015-01-19 10:57:46.000000000 +0000
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-4.4.110/arch/powerpc/include/uapi/asm/unistd.h linux-4.4.110-vs2.3.9/arch/powerpc/include/uapi/asm/unistd.h
+--- linux-4.4.110/arch/powerpc/include/uapi/asm/unistd.h 2016-07-05 04:14:29.000000000 +0000
++++ linux-4.4.110-vs2.3.9/arch/powerpc/include/uapi/asm/unistd.h 2018-01-09 16:36:21.000000000 +0000
@@ -275,7 +275,7 @@
#endif
#define __NR_rtas 255
#define __NR_migrate_pages 258
#define __NR_mbind 259
#define __NR_get_mempolicy 260
-diff -NurpP --minimal linux-3.18.5/arch/powerpc/kernel/traps.c linux-3.18.5-vs2.3.7.3/arch/powerpc/kernel/traps.c
---- linux-3.18.5/arch/powerpc/kernel/traps.c 2015-01-16 22:18:21.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/arch/powerpc/kernel/traps.c 2015-01-19 10:57:46.000000000 +0000
-@@ -1313,8 +1313,9 @@ void nonrecoverable_exception(struct pt_
+diff -NurpP --minimal linux-4.4.110/arch/powerpc/kernel/traps.c linux-4.4.110-vs2.3.9/arch/powerpc/kernel/traps.c
+--- linux-4.4.110/arch/powerpc/kernel/traps.c 2018-01-09 16:34:31.000000000 +0000
++++ linux-4.4.110-vs2.3.9/arch/powerpc/kernel/traps.c 2018-01-09 16:36:21.000000000 +0000
+@@ -1315,8 +1315,9 @@ void nonrecoverable_exception(struct pt_
void trace_syscall(struct pt_regs *regs)
{
regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted());
}
-diff -NurpP --minimal linux-3.18.5/arch/s390/Kconfig linux-3.18.5-vs2.3.7.3/arch/s390/Kconfig
---- linux-3.18.5/arch/s390/Kconfig 2015-01-17 02:39:40.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/arch/s390/Kconfig 2015-01-19 10:57:46.000000000 +0000
-@@ -652,6 +652,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-4.4.110/arch/s390/Kconfig linux-4.4.110-vs2.3.9/arch/s390/Kconfig
+--- linux-4.4.110/arch/s390/Kconfig 2018-01-09 16:34:32.000000000 +0000
++++ linux-4.4.110-vs2.3.9/arch/s390/Kconfig 2018-01-09 16:36:21.000000000 +0000
+@@ -729,6 +729,8 @@ source "fs/Kconfig"
source "arch/s390/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.18.5/arch/s390/include/asm/tlb.h linux-3.18.5-vs2.3.7.3/arch/s390/include/asm/tlb.h
---- linux-3.18.5/arch/s390/include/asm/tlb.h 2015-01-17 02:39:41.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/arch/s390/include/asm/tlb.h 2015-01-19 10:57:46.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/arch/s390/include/asm/tlb.h linux-4.4.110-vs2.3.9/arch/s390/include/asm/tlb.h
+--- linux-4.4.110/arch/s390/include/asm/tlb.h 2015-07-06 20:41:37.000000000 +0000
++++ linux-4.4.110-vs2.3.9/arch/s390/include/asm/tlb.h 2018-01-09 16:36:21.000000000 +0000
@@ -24,6 +24,7 @@
#include <linux/mm.h>
#include <linux/pagemap.h>
#include <asm/processor.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-3.18.5/arch/s390/include/uapi/asm/unistd.h linux-3.18.5-vs2.3.7.3/arch/s390/include/uapi/asm/unistd.h
---- linux-3.18.5/arch/s390/include/uapi/asm/unistd.h 2015-01-17 02:39:41.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/arch/s390/include/uapi/asm/unistd.h 2015-01-19 10:57:46.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/arch/s390/include/uapi/asm/unistd.h linux-4.4.110-vs2.3.9/arch/s390/include/uapi/asm/unistd.h
+--- linux-4.4.110/arch/s390/include/uapi/asm/unistd.h 2016-07-05 04:14:30.000000000 +0000
++++ linux-4.4.110-vs2.3.9/arch/s390/include/uapi/asm/unistd.h 2018-01-09 16:48:33.000000000 +0000
@@ -200,7 +200,7 @@
- #define __NR_clock_gettime (__NR_timer_create+6)
- #define __NR_clock_getres (__NR_timer_create+7)
- #define __NR_clock_nanosleep (__NR_timer_create+8)
+ #define __NR_clock_gettime 260
+ #define __NR_clock_getres 261
+ #define __NR_clock_nanosleep 262
-/* Number 263 is reserved for vserver */
+#define __NR_vserver 263
#define __NR_statfs64 265
#define __NR_fstatfs64 266
#define __NR_remap_file_pages 267
-diff -NurpP --minimal linux-3.18.5/arch/s390/kernel/ptrace.c linux-3.18.5-vs2.3.7.3/arch/s390/kernel/ptrace.c
---- linux-3.18.5/arch/s390/kernel/ptrace.c 2015-01-17 02:39:41.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/arch/s390/kernel/ptrace.c 2015-01-19 10:57:46.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/arch/s390/kernel/ptrace.c linux-4.4.110-vs2.3.9/arch/s390/kernel/ptrace.c
+--- linux-4.4.110/arch/s390/kernel/ptrace.c 2018-01-09 16:34:32.000000000 +0000
++++ linux-4.4.110-vs2.3.9/arch/s390/kernel/ptrace.c 2018-01-09 16:36:21.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/tracehook.h>
#include <linux/seccomp.h>
#include <trace/syscall.h>
#include <asm/segment.h>
#include <asm/page.h>
-diff -NurpP --minimal linux-3.18.5/arch/s390/kernel/syscalls.S linux-3.18.5-vs2.3.7.3/arch/s390/kernel/syscalls.S
---- linux-3.18.5/arch/s390/kernel/syscalls.S 2015-01-17 02:39:41.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/arch/s390/kernel/syscalls.S 2015-01-19 11:00:51.000000000 +0000
-@@ -271,7 +271,7 @@ SYSCALL(sys_clock_settime,sys_clock_sett
- SYSCALL(sys_clock_gettime,sys_clock_gettime,compat_sys_clock_gettime) /* 260 */
- SYSCALL(sys_clock_getres,sys_clock_getres,compat_sys_clock_getres)
- SYSCALL(sys_clock_nanosleep,sys_clock_nanosleep,compat_sys_clock_nanosleep)
--NI_SYSCALL /* reserved for vserver */
+diff -NurpP --minimal linux-4.4.110/arch/s390/kernel/syscalls.S linux-4.4.110-vs2.3.9/arch/s390/kernel/syscalls.S
+--- linux-4.4.110/arch/s390/kernel/syscalls.S 2018-01-09 16:34:32.000000000 +0000
++++ linux-4.4.110-vs2.3.9/arch/s390/kernel/syscalls.S 2018-01-09 16:36: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)
+ SYSCALL(sys_clock_nanosleep,compat_sys_clock_nanosleep)
+-NI_SYSCALL /* reserved for vserver */
+SYSCALL(sys_vserver,sys_vserver,sys32_vserver)
- SYSCALL(sys_s390_fadvise64_64,sys_ni_syscall,compat_sys_s390_fadvise64_64)
- SYSCALL(sys_statfs64,sys_statfs64,compat_sys_statfs64)
- SYSCALL(sys_fstatfs64,sys_fstatfs64,compat_sys_fstatfs64)
-diff -NurpP --minimal linux-3.18.5/arch/sh/Kconfig linux-3.18.5-vs2.3.7.3/arch/sh/Kconfig
---- linux-3.18.5/arch/sh/Kconfig 2015-01-16 22:18:23.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/arch/sh/Kconfig 2015-01-19 10:57:46.000000000 +0000
-@@ -878,6 +878,8 @@ source "fs/Kconfig"
+ 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.110/arch/sh/Kconfig linux-4.4.110-vs2.3.9/arch/sh/Kconfig
+--- linux-4.4.110/arch/sh/Kconfig 2016-07-05 04:11:46.000000000 +0000
++++ linux-4.4.110-vs2.3.9/arch/sh/Kconfig 2018-01-09 16:36:21.000000000 +0000
+@@ -883,6 +883,8 @@ source "fs/Kconfig"
source "arch/sh/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.18.5/arch/sh/kernel/irq.c linux-3.18.5-vs2.3.7.3/arch/sh/kernel/irq.c
---- linux-3.18.5/arch/sh/kernel/irq.c 2014-06-12 13:01:29.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/arch/sh/kernel/irq.c 2015-01-19 10:57:46.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/arch/sh/kernel/irq.c linux-4.4.110-vs2.3.9/arch/sh/kernel/irq.c
+--- linux-4.4.110/arch/sh/kernel/irq.c 2016-07-05 04:11:46.000000000 +0000
++++ linux-4.4.110-vs2.3.9/arch/sh/kernel/irq.c 2018-01-09 16:36:21.000000000 +0000
@@ -14,6 +14,7 @@
#include <linux/ftrace.h>
#include <linux/delay.h>
#include <asm/processor.h>
#include <asm/machvec.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-3.18.5/arch/sparc/Kconfig linux-3.18.5-vs2.3.7.3/arch/sparc/Kconfig
---- linux-3.18.5/arch/sparc/Kconfig 2015-01-17 02:39:41.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/arch/sparc/Kconfig 2015-01-19 10:57:46.000000000 +0000
-@@ -557,6 +557,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-4.4.110/arch/sparc/Kconfig linux-4.4.110-vs2.3.9/arch/sparc/Kconfig
+--- linux-4.4.110/arch/sparc/Kconfig 2018-01-09 16:34:32.000000000 +0000
++++ linux-4.4.110-vs2.3.9/arch/sparc/Kconfig 2018-01-09 16:36:21.000000000 +0000
+@@ -561,6 +561,8 @@ source "fs/Kconfig"
source "arch/sparc/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.18.5/arch/sparc/include/uapi/asm/unistd.h linux-3.18.5-vs2.3.7.3/arch/sparc/include/uapi/asm/unistd.h
---- linux-3.18.5/arch/sparc/include/uapi/asm/unistd.h 2015-01-17 02:39:41.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/arch/sparc/include/uapi/asm/unistd.h 2015-01-19 10:57:46.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/arch/sparc/include/uapi/asm/unistd.h linux-4.4.110-vs2.3.9/arch/sparc/include/uapi/asm/unistd.h
+--- linux-4.4.110/arch/sparc/include/uapi/asm/unistd.h 2016-07-05 04:14:33.000000000 +0000
++++ linux-4.4.110-vs2.3.9/arch/sparc/include/uapi/asm/unistd.h 2018-01-09 16:36:21.000000000 +0000
@@ -332,7 +332,7 @@
#define __NR_timer_getoverrun 264
#define __NR_timer_delete 265
#define __NR_io_setup 268
#define __NR_io_destroy 269
#define __NR_io_submit 270
-diff -NurpP --minimal linux-3.18.5/arch/sparc/kernel/systbls_32.S linux-3.18.5-vs2.3.7.3/arch/sparc/kernel/systbls_32.S
---- linux-3.18.5/arch/sparc/kernel/systbls_32.S 2015-01-17 02:39:41.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/arch/sparc/kernel/systbls_32.S 2015-01-19 10:57:46.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/arch/sparc/kernel/systbls_32.S linux-4.4.110-vs2.3.9/arch/sparc/kernel/systbls_32.S
+--- linux-4.4.110/arch/sparc/kernel/systbls_32.S 2016-07-05 04:14:33.000000000 +0000
++++ linux-4.4.110-vs2.3.9/arch/sparc/kernel/systbls_32.S 2018-01-09 16:36: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
/*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-3.18.5/arch/sparc/kernel/systbls_64.S linux-3.18.5-vs2.3.7.3/arch/sparc/kernel/systbls_64.S
---- linux-3.18.5/arch/sparc/kernel/systbls_64.S 2015-01-17 02:39:41.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/arch/sparc/kernel/systbls_64.S 2015-01-19 10:57:46.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/arch/sparc/kernel/systbls_64.S linux-4.4.110-vs2.3.9/arch/sparc/kernel/systbls_64.S
+--- linux-4.4.110/arch/sparc/kernel/systbls_64.S 2016-07-05 04:14:33.000000000 +0000
++++ linux-4.4.110-vs2.3.9/arch/sparc/kernel/systbls_64.S 2018-01-09 16:36: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
/*270*/ .word sys32_io_submit, sys_io_cancel, compat_sys_io_getevents, sys32_mq_open, sys_mq_unlink
.word compat_sys_mq_timedsend, compat_sys_mq_timedreceive, compat_sys_mq_notify, compat_sys_mq_getsetattr, compat_sys_waitid
/*280*/ .word sys_tee, sys_add_key, sys_request_key, compat_sys_keyctl, compat_sys_openat
-@@ -150,7 +150,7 @@ sys_call_table:
+@@ -152,7 +152,7 @@ sys_call_table:
/*250*/ .word sys_64_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nis_syscall
.word sys_sync_file_range, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep
/*260*/ .word sys_sched_getaffinity, sys_sched_setaffinity, sys_timer_settime, sys_timer_gettime, sys_timer_getoverrun
/*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-3.18.5/arch/um/Kconfig.rest linux-3.18.5-vs2.3.7.3/arch/um/Kconfig.rest
---- linux-3.18.5/arch/um/Kconfig.rest 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/arch/um/Kconfig.rest 2015-01-19 10:57:46.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/arch/um/Kconfig.rest linux-4.4.110-vs2.3.9/arch/um/Kconfig.rest
+--- linux-4.4.110/arch/um/Kconfig.rest 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.110-vs2.3.9/arch/um/Kconfig.rest 2018-01-09 16:36:21.000000000 +0000
@@ -12,6 +12,8 @@ source "arch/um/Kconfig.net"
source "fs/Kconfig"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.18.5/arch/x86/Kconfig linux-3.18.5-vs2.3.7.3/arch/x86/Kconfig
---- linux-3.18.5/arch/x86/Kconfig 2015-02-05 18:02:39.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/arch/x86/Kconfig 2015-02-05 18:08:00.000000000 +0000
-@@ -2506,6 +2506,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-4.4.110/arch/x86/Kconfig linux-4.4.110-vs2.3.9/arch/x86/Kconfig
+--- linux-4.4.110/arch/x86/Kconfig 2018-01-09 16:34:33.000000000 +0000
++++ linux-4.4.110-vs2.3.9/arch/x86/Kconfig 2018-01-09 16:36:21.000000000 +0000
+@@ -2672,6 +2672,8 @@ source "fs/Kconfig"
source "arch/x86/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.18.5/arch/x86/syscalls/syscall_32.tbl linux-3.18.5-vs2.3.7.3/arch/x86/syscalls/syscall_32.tbl
---- linux-3.18.5/arch/x86/syscalls/syscall_32.tbl 2015-01-17 02:39:43.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/arch/x86/syscalls/syscall_32.tbl 2015-01-19 10:57:46.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/arch/x86/entry/syscalls/syscall_32.tbl linux-4.4.110-vs2.3.9/arch/x86/entry/syscalls/syscall_32.tbl
+--- linux-4.4.110/arch/x86/entry/syscalls/syscall_32.tbl 2018-01-09 16:34:33.000000000 +0000
++++ linux-4.4.110-vs2.3.9/arch/x86/entry/syscalls/syscall_32.tbl 2018-01-10 01:51:14.000000000 +0000
@@ -279,7 +279,7 @@
270 i386 tgkill sys_tgkill
271 i386 utimes sys_utimes compat_sys_utimes
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-3.18.5/arch/x86/syscalls/syscall_64.tbl linux-3.18.5-vs2.3.7.3/arch/x86/syscalls/syscall_64.tbl
---- linux-3.18.5/arch/x86/syscalls/syscall_64.tbl 2015-01-17 02:39:43.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/arch/x86/syscalls/syscall_64.tbl 2015-01-19 10:57:46.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/arch/x86/entry/syscalls/syscall_64.tbl linux-4.4.110-vs2.3.9/arch/x86/entry/syscalls/syscall_64.tbl
+--- linux-4.4.110/arch/x86/entry/syscalls/syscall_64.tbl 2016-07-05 04:14:33.000000000 +0000
++++ linux-4.4.110-vs2.3.9/arch/x86/entry/syscalls/syscall_64.tbl 2018-01-10 01:51:32.000000000 +0000
@@ -242,7 +242,7 @@
233 common epoll_ctl sys_epoll_ctl
234 common tgkill sys_tgkill
237 common mbind sys_mbind
238 common set_mempolicy sys_set_mempolicy
239 common get_mempolicy sys_get_mempolicy
-diff -NurpP --minimal linux-3.18.5/block/ioprio.c linux-3.18.5-vs2.3.7.3/block/ioprio.c
---- linux-3.18.5/block/ioprio.c 2015-01-17 02:39:43.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/block/ioprio.c 2015-01-19 13:00:07.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/block/ioprio.c linux-4.4.110-vs2.3.9/block/ioprio.c
+--- linux-4.4.110/block/ioprio.c 2018-01-09 16:34:34.000000000 +0000
++++ linux-4.4.110-vs2.3.9/block/ioprio.c 2018-01-09 16:36:23.000000000 +0000
@@ -28,6 +28,7 @@
#include <linux/syscalls.h>
#include <linux/security.h>
ret = set_task_ioprio(p, ioprio);
if (ret)
break;
-@@ -200,6 +203,8 @@ SYSCALL_DEFINE2(ioprio_get, int, which,
+@@ -203,6 +206,8 @@ SYSCALL_DEFINE2(ioprio_get, int, which,
else
pgrp = find_vpid(who);
do_each_pid_thread(pgrp, PIDTYPE_PGID, p) {
tmpio = get_task_ioprio(p);
if (tmpio < 0)
continue;
-diff -NurpP --minimal linux-3.18.5/drivers/block/Kconfig linux-3.18.5-vs2.3.7.3/drivers/block/Kconfig
---- linux-3.18.5/drivers/block/Kconfig 2014-06-12 11:33:19.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/drivers/block/Kconfig 2015-01-19 10:57:46.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/drivers/block/Kconfig linux-4.4.110-vs2.3.9/drivers/block/Kconfig
+--- linux-4.4.110/drivers/block/Kconfig 2016-07-05 04:14:35.000000000 +0000
++++ linux-4.4.110-vs2.3.9/drivers/block/Kconfig 2018-01-09 16:36:23.000000000 +0000
@@ -283,6 +283,13 @@ config BLK_DEV_CRYPTOLOOP
source "drivers/block/drbd/Kconfig"
config BLK_DEV_NBD
tristate "Network block device support"
depends on NET
-diff -NurpP --minimal linux-3.18.5/drivers/block/Makefile linux-3.18.5-vs2.3.7.3/drivers/block/Makefile
---- linux-3.18.5/drivers/block/Makefile 2014-06-12 11:33:19.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/drivers/block/Makefile 2015-01-19 10:57:46.000000000 +0000
-@@ -33,6 +33,7 @@ obj-$(CONFIG_VIRTIO_BLK) += virtio_blk.o
+diff -NurpP --minimal linux-4.4.110/drivers/block/Makefile linux-4.4.110-vs2.3.9/drivers/block/Makefile
+--- linux-4.4.110/drivers/block/Makefile 2016-07-05 04:14:35.000000000 +0000
++++ linux-4.4.110-vs2.3.9/drivers/block/Makefile 2018-01-09 16:36:23.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_XEN_BLKDEV_FRONTEND) += xen-blkfront.o
obj-$(CONFIG_XEN_BLKDEV_BACKEND) += xen-blkback/
-diff -NurpP --minimal linux-3.18.5/drivers/block/loop.c linux-3.18.5-vs2.3.7.3/drivers/block/loop.c
---- linux-3.18.5/drivers/block/loop.c 2014-09-03 13:18:40.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/drivers/block/loop.c 2015-01-19 10:57:46.000000000 +0000
-@@ -75,6 +75,7 @@
- #include <linux/sysfs.h>
+diff -NurpP --minimal linux-4.4.110/drivers/block/loop.c linux-4.4.110-vs2.3.9/drivers/block/loop.c
+--- linux-4.4.110/drivers/block/loop.c 2018-01-09 16:34:35.000000000 +0000
++++ linux-4.4.110-vs2.3.9/drivers/block/loop.c 2018-01-09 23:00:25.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>
-@@ -885,6 +886,7 @@ static int loop_set_fd(struct loop_devic
+@@ -935,6 +936,7 @@ static int loop_set_fd(struct loop_devic
lo->lo_blocksize = lo_blocksize;
lo->lo_device = bdev;
lo->lo_flags = lo_flags;
+ lo->lo_xid = vx_current_xid();
lo->lo_backing_file = file;
- lo->transfer = transfer_none;
+ lo->transfer = NULL;
lo->ioctl = NULL;
-@@ -1029,6 +1031,7 @@ static int loop_clr_fd(struct loop_devic
+@@ -1055,6 +1057,7 @@ static int loop_clr_fd(struct loop_devic
+ lo->lo_offset = 0;
lo->lo_sizelimit = 0;
lo->lo_encrypt_key_size = 0;
- lo->lo_thread = NULL;
+ lo->lo_xid = 0;
memset(lo->lo_encrypt_key, 0, LO_KEY_SIZE);
memset(lo->lo_crypt_name, 0, LO_NAME_SIZE);
memset(lo->lo_file_name, 0, LO_NAME_SIZE);
-@@ -1072,7 +1075,7 @@ loop_set_status(struct loop_device *lo,
+@@ -1101,7 +1104,7 @@ loop_set_status(struct loop_device *lo,
if (lo->lo_encrypt_key_size &&
!uid_eq(lo->lo_key_owner, uid) &&
return -EPERM;
if (lo->lo_state != Lo_bound)
return -ENXIO;
-@@ -1162,7 +1165,8 @@ loop_get_status(struct loop_device *lo,
+@@ -1202,7 +1205,8 @@ loop_get_status(struct loop_device *lo,
memcpy(info->lo_crypt_name, lo->lo_crypt_name, LO_NAME_SIZE);
info->lo_encrypt_type =
lo->lo_encryption ? lo->lo_encryption->number : 0;
info->lo_encrypt_key_size = lo->lo_encrypt_key_size;
memcpy(info->lo_encrypt_key, lo->lo_encrypt_key,
lo->lo_encrypt_key_size);
-@@ -1504,6 +1508,11 @@ static int lo_open(struct block_device *
+@@ -1563,6 +1567,11 @@ static int lo_open(struct block_device *
goto out;
}
+ goto out;
+ }
+
- mutex_lock(&lo->lo_ctl_mutex);
- lo->lo_refcnt++;
- mutex_unlock(&lo->lo_ctl_mutex);
-diff -NurpP --minimal linux-3.18.5/drivers/block/loop.h linux-3.18.5-vs2.3.7.3/drivers/block/loop.h
---- linux-3.18.5/drivers/block/loop.h 2013-11-25 15:44:28.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/drivers/block/loop.h 2015-01-19 10:57:46.000000000 +0000
-@@ -41,6 +41,7 @@ struct loop_device {
+ atomic_inc(&lo->lo_refcnt);
+ out:
+ mutex_unlock(&loop_index_mutex);
+diff -NurpP --minimal linux-4.4.110/drivers/block/loop.h linux-4.4.110-vs2.3.9/drivers/block/loop.h
+--- linux-4.4.110/drivers/block/loop.h 2016-07-05 04:14:35.000000000 +0000
++++ linux-4.4.110-vs2.3.9/drivers/block/loop.h 2018-01-09 16:36:23.000000000 +0000
+@@ -43,6 +43,7 @@ struct loop_device {
struct loop_func_table *lo_encryption;
__u32 lo_init[2];
kuid_t lo_key_owner; /* Who set the key */
int (*ioctl)(struct loop_device *, int cmd,
unsigned long arg);
-diff -NurpP --minimal linux-3.18.5/drivers/block/vroot.c linux-3.18.5-vs2.3.7.3/drivers/block/vroot.c
---- linux-3.18.5/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/drivers/block/vroot.c 2015-01-19 10:57:46.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/drivers/block/vroot.c linux-4.4.110-vs2.3.9/drivers/block/vroot.c
+--- linux-4.4.110/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/drivers/block/vroot.c 2018-01-09 16:36:23.000000000 +0000
@@ -0,0 +1,290 @@
+/*
+ * linux/drivers/block/vroot.c
+ *
-+ * written by Herbert Pötzl, 9/11/2002
-+ * ported to 2.6.10 by Herbert Pötzl, 30/12/2004
++ * written by Herbert P?tzl, 9/11/2002
++ * ported to 2.6.10 by Herbert P?tzl, 30/12/2004
+ *
+ * based on the loop.c code by Theodore Ts'o.
+ *
-+ * Copyright (C) 2002-2007 by Herbert Pötzl.
++ * Copyright (C) 2002-2007 by Herbert P?tzl.
+ * Redistribution of this file is permitted under the
+ * GNU General Public License.
+ *
+ goto out;
+
+ error = -EINVAL;
-+ inode = file->f_dentry->d_inode;
++ inode = file->f_path.dentry->d_inode;
+
+
+ if (S_ISBLK(inode->i_mode)) {
+MODULE_LICENSE("GPL");
+MODULE_ALIAS_BLOCKDEV_MAJOR(VROOT_MAJOR);
+
-+MODULE_AUTHOR ("Herbert Pötzl");
++MODULE_AUTHOR ("Herbert P?tzl");
+MODULE_DESCRIPTION ("Virtual Root Device Mapper");
+
+
+
+#endif
+
-diff -NurpP --minimal linux-3.18.5/drivers/infiniband/core/addr.c linux-3.18.5-vs2.3.7.3/drivers/infiniband/core/addr.c
---- linux-3.18.5/drivers/infiniband/core/addr.c 2014-06-12 11:33:41.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/drivers/infiniband/core/addr.c 2015-01-19 10:57:46.000000000 +0000
-@@ -284,7 +284,7 @@ static int addr6_resolve(struct sockaddr
+diff -NurpP --minimal linux-4.4.110/drivers/infiniband/core/addr.c linux-4.4.110-vs2.3.9/drivers/infiniband/core/addr.c
+--- linux-4.4.110/drivers/infiniband/core/addr.c 2018-01-09 16:34:44.000000000 +0000
++++ linux-4.4.110-vs2.3.9/drivers/infiniband/core/addr.c 2018-01-09 16:49:06.000000000 +0000
+@@ -283,7 +283,7 @@ static int addr6_resolve(struct sockaddr
if (ipv6_addr_any(&fl6.saddr)) {
- ret = ipv6_dev_get_saddr(&init_net, ip6_dst_idev(dst)->dev,
+ ret = ipv6_dev_get_saddr(addr->net, ip6_dst_idev(dst)->dev,
- &fl6.daddr, 0, &fl6.saddr);
+ &fl6.daddr, 0, &fl6.saddr, NULL);
if (ret)
goto put;
-diff -NurpP --minimal linux-3.18.5/drivers/md/dm-ioctl.c linux-3.18.5-vs2.3.7.3/drivers/md/dm-ioctl.c
---- linux-3.18.5/drivers/md/dm-ioctl.c 2015-01-17 02:39:51.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/drivers/md/dm-ioctl.c 2015-01-19 10:57:46.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/drivers/md/dm-ioctl.c linux-4.4.110-vs2.3.9/drivers/md/dm-ioctl.c
+--- linux-4.4.110/drivers/md/dm-ioctl.c 2018-01-09 16:34:46.000000000 +0000
++++ linux-4.4.110-vs2.3.9/drivers/md/dm-ioctl.c 2018-01-09 16:36:23.000000000 +0000
@@ -16,6 +16,7 @@
#include <linux/dm-ioctl.h>
#include <linux/hdreg.h>
if (old_nl)
old_nl->next = (uint32_t) ((void *) nl -
(void *) old_nl);
-@@ -1797,8 +1809,8 @@ static int ctl_ioctl(uint command, struc
+@@ -1801,8 +1813,8 @@ static int ctl_ioctl(uint command, struc
size_t input_param_size;
struct dm_ioctl param_kernel;
return -EACCES;
if (_IOC_TYPE(command) != DM_IOCTL)
-diff -NurpP --minimal linux-3.18.5/drivers/md/dm.c linux-3.18.5-vs2.3.7.3/drivers/md/dm.c
---- linux-3.18.5/drivers/md/dm.c 2015-02-05 18:02:42.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/drivers/md/dm.c 2015-01-28 11:48:02.000000000 +0000
-@@ -19,6 +19,7 @@
- #include <linux/idr.h>
- #include <linux/hdreg.h>
- #include <linux/delay.h>
+diff -NurpP --minimal linux-4.4.110/drivers/md/dm.c linux-4.4.110-vs2.3.9/drivers/md/dm.c
+--- linux-4.4.110/drivers/md/dm.c 2018-01-09 16:34:46.000000000 +0000
++++ linux-4.4.110-vs2.3.9/drivers/md/dm.c 2018-01-09 16:49:30.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>
-@@ -134,6 +135,7 @@ struct mapped_device {
+@@ -144,6 +145,7 @@ struct mapped_device {
struct mutex suspend_lock;
atomic_t holders;
atomic_t open_count;
/*
* The current mapping.
-@@ -397,6 +399,7 @@ int dm_deleting_md(struct mapped_device
+@@ -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;
spin_lock(&_minor_lock);
-@@ -405,18 +408,19 @@ static int dm_blk_open(struct block_devi
+@@ -453,17 +456,19 @@ static int dm_blk_open(struct block_devi
goto out;
if (test_bit(DMF_FREEING, &md->flags) ||
dm_get(md);
atomic_inc(&md->open_count);
--
+ ret = 0;
out:
spin_unlock(&_minor_lock);
}
static void dm_blk_close(struct gendisk *disk, fmode_t mode)
-@@ -819,6 +823,14 @@ int dm_set_geometry(struct mapped_device
+@@ -909,6 +914,14 @@ int dm_set_geometry(struct mapped_device
return 0;
}
/*-----------------------------------------------------------------
* CRUD START:
* A more elegant soln is in the works that uses the queue
-@@ -2077,6 +2089,7 @@ static struct mapped_device *alloc_dev(i
+@@ -2380,6 +2393,7 @@ static struct mapped_device *alloc_dev(i
INIT_LIST_HEAD(&md->table_devices);
spin_lock_init(&md->uevent_lock);
+ md->xid = vx_current_xid();
md->queue = blk_alloc_queue(GFP_KERNEL);
if (!md->queue)
- goto bad_queue;
-diff -NurpP --minimal linux-3.18.5/drivers/md/dm.h linux-3.18.5-vs2.3.7.3/drivers/md/dm.h
---- linux-3.18.5/drivers/md/dm.h 2015-01-17 02:39:51.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/drivers/md/dm.h 2015-01-19 10:57:46.000000000 +0000
-@@ -50,6 +50,8 @@ struct dm_dev_internal {
+ goto bad;
+diff -NurpP --minimal linux-4.4.110/drivers/md/dm.h linux-4.4.110-vs2.3.9/drivers/md/dm.h
+--- linux-4.4.110/drivers/md/dm.h 2016-07-05 04:12:06.000000000 +0000
++++ linux-4.4.110-vs2.3.9/drivers/md/dm.h 2018-01-09 16:36:24.000000000 +0000
+@@ -52,6 +52,8 @@ struct dm_dev_internal {
struct dm_table;
struct dm_md_mempools;
/*-----------------------------------------------------------------
* Internal table functions.
*---------------------------------------------------------------*/
-diff -NurpP --minimal linux-3.18.5/drivers/net/tun.c linux-3.18.5-vs2.3.7.3/drivers/net/tun.c
---- linux-3.18.5/drivers/net/tun.c 2015-01-17 02:40:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/drivers/net/tun.c 2015-01-19 10:57:46.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/drivers/net/tun.c linux-4.4.110-vs2.3.9/drivers/net/tun.c
+--- linux-4.4.110/drivers/net/tun.c 2018-01-09 16:34:53.000000000 +0000
++++ linux-4.4.110-vs2.3.9/drivers/net/tun.c 2018-01-09 16:36:24.000000000 +0000
@@ -65,6 +65,7 @@
#include <linux/nsproxy.h>
#include <linux/virtio_net.h>
#include <linux/rcupdate.h>
+#include <linux/vs_network.h>
- #include <net/ipv6.h>
#include <net/net_namespace.h>
#include <net/netns/generic.h>
-@@ -171,6 +172,7 @@ struct tun_struct {
+ #include <net/rtnetlink.h>
+@@ -181,6 +182,7 @@ struct tun_struct {
unsigned int flags;
kuid_t owner;
kgid_t group;
struct net_device *dev;
netdev_features_t set_features;
-@@ -404,6 +406,7 @@ static inline bool tun_not_capable(struc
+@@ -475,6 +477,7 @@ static inline bool tun_not_capable(struc
return ((uid_valid(tun->owner) && !uid_eq(cred->euid, tun->owner)) ||
(gid_valid(tun->group) && !in_egroup_p(tun->group))) &&
!ns_capable(net->user_ns, CAP_NET_ADMIN);
}
static void tun_set_real_num_queues(struct tun_struct *tun)
-@@ -1413,6 +1416,7 @@ static void tun_setup(struct net_device
+@@ -1463,6 +1466,7 @@ static void tun_setup(struct net_device
tun->owner = INVALID_UID;
tun->group = INVALID_GID;
dev->ethtool_ops = &tun_ethtool_ops;
dev->destructor = tun_free_netdev;
-@@ -1629,7 +1633,7 @@ static int tun_set_iff(struct net *net,
+@@ -1657,7 +1661,7 @@ static int tun_set_iff(struct net *net,
int queues = ifr->ifr_flags & IFF_MULTI_QUEUE ?
MAX_TAP_QUEUES : 1;
return -EPERM;
err = security_tun_dev_create();
if (err < 0)
-@@ -1996,6 +2000,16 @@ static long __tun_chr_ioctl(struct file
+@@ -2010,6 +2014,16 @@ static long __tun_chr_ioctl(struct file
from_kgid(&init_user_ns, tun->group));
break;
case TUNSETLINK:
/* Only allow setting the type when the interface is down */
if (tun->dev->flags & IFF_UP) {
-diff -NurpP --minimal linux-3.18.5/drivers/scsi/cxgbi/libcxgbi.c linux-3.18.5-vs2.3.7.3/drivers/scsi/cxgbi/libcxgbi.c
---- linux-3.18.5/drivers/scsi/cxgbi/libcxgbi.c 2015-01-17 02:40:05.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/drivers/scsi/cxgbi/libcxgbi.c 2015-02-06 01:59:47.000000000 +0000
-@@ -764,7 +764,8 @@ static struct cxgbi_sock *cxgbi_check_ro
+diff -NurpP --minimal linux-4.4.110/drivers/scsi/cxgbi/libcxgbi.c linux-4.4.110-vs2.3.9/drivers/scsi/cxgbi/libcxgbi.c
+--- linux-4.4.110/drivers/scsi/cxgbi/libcxgbi.c 2015-10-29 09:21:24.000000000 +0000
++++ linux-4.4.110-vs2.3.9/drivers/scsi/cxgbi/libcxgbi.c 2018-01-09 16:36:24.000000000 +0000
+@@ -768,7 +768,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,
if (err) {
pr_info("failed to get source address to reach %pI6\n",
&daddr6->sin6_addr);
-diff -NurpP --minimal linux-3.18.5/drivers/tty/sysrq.c linux-3.18.5-vs2.3.7.3/drivers/tty/sysrq.c
---- linux-3.18.5/drivers/tty/sysrq.c 2015-01-16 22:19:12.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/drivers/tty/sysrq.c 2015-01-19 11:01:25.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/drivers/tty/sysrq.c linux-4.4.110-vs2.3.9/drivers/tty/sysrq.c
+--- linux-4.4.110/drivers/tty/sysrq.c 2018-01-09 16:35:02.000000000 +0000
++++ linux-4.4.110-vs2.3.9/drivers/tty/sysrq.c 2018-01-09 16:36:24.000000000 +0000
@@ -47,6 +47,7 @@
#include <linux/syscalls.h>
#include <linux/of.h>
#include <asm/ptrace.h>
#include <asm/irq_regs.h>
-@@ -408,6 +409,21 @@ static struct sysrq_key_op sysrq_unrt_op
+@@ -421,6 +422,21 @@ static struct sysrq_key_op sysrq_unrt_op
.enable_mask = SYSRQ_ENABLE_RTNICE,
};
/* Key Operations table and lock */
static DEFINE_SPINLOCK(sysrq_key_table_lock);
-@@ -463,7 +479,11 @@ static struct sysrq_key_op *sysrq_key_ta
- &sysrq_showstate_blocked_op, /* w */
+@@ -477,7 +493,11 @@ static struct sysrq_key_op *sysrq_key_ta
+ /* x: May be registered on mips for TLB dump */
/* x: May be registered on ppc/powerpc for xmon */
/* x: May be registered on sparc64 for global PMU dump */
+#ifdef CONFIG_VSERVER_DEBUG
/* y: May be registered on sparc64 for global register dump */
NULL, /* y */
&sysrq_ftrace_dump_op, /* z */
-@@ -478,6 +498,8 @@ static int sysrq_key_table_key2index(int
+@@ -492,6 +512,8 @@ static int sysrq_key_table_key2index(int
retval = key - '0';
else if ((key >= 'a') && (key <= 'z'))
retval = key + 10 - 'a';
else
retval = -1;
return retval;
-diff -NurpP --minimal linux-3.18.5/drivers/tty/tty_io.c linux-3.18.5-vs2.3.7.3/drivers/tty/tty_io.c
---- linux-3.18.5/drivers/tty/tty_io.c 2015-01-17 02:40:14.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/drivers/tty/tty_io.c 2015-01-19 10:57:46.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/drivers/tty/tty_io.c linux-4.4.110-vs2.3.9/drivers/tty/tty_io.c
+--- linux-4.4.110/drivers/tty/tty_io.c 2018-01-09 16:35:02.000000000 +0000
++++ linux-4.4.110-vs2.3.9/drivers/tty/tty_io.c 2018-01-09 16:36:24.000000000 +0000
@@ -104,6 +104,7 @@
#include <linux/kmod.h>
+#include <linux/vs_pid.h>
#undef TTY_DEBUG_HANGUP
-
-@@ -2237,7 +2238,8 @@ static int tiocsti(struct tty_struct *tt
+ #ifdef TTY_DEBUG_HANGUP
+@@ -2280,7 +2281,8 @@ static int tiocsti(struct tty_struct *tt
char ch, mbz = 0;
struct tty_ldisc *ld;
return -EPERM;
if (get_user(ch, p))
return -EFAULT;
-@@ -2525,6 +2527,7 @@ static int tiocspgrp(struct tty_struct *
+@@ -2593,6 +2595,7 @@ static int tiocspgrp(struct tty_struct *
return -ENOTTY;
if (get_user(pgrp_nr, p))
return -EFAULT;
if (pgrp_nr < 0)
return -EINVAL;
rcu_read_lock();
-diff -NurpP --minimal linux-3.18.5/fs/attr.c linux-3.18.5-vs2.3.7.3/fs/attr.c
---- linux-3.18.5/fs/attr.c 2014-09-03 13:19:35.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/attr.c 2015-01-19 10:57:46.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/fs/attr.c linux-4.4.110-vs2.3.9/fs/attr.c
+--- linux-4.4.110/fs/attr.c 2018-01-09 16:35:04.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/attr.c 2018-01-09 17:27:12.000000000 +0000
@@ -15,6 +15,9 @@
#include <linux/security.h>
#include <linux/evm.h>
if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
return -EPERM;
}
-diff -NurpP --minimal linux-3.18.5/fs/block_dev.c linux-3.18.5-vs2.3.7.3/fs/block_dev.c
---- linux-3.18.5/fs/block_dev.c 2015-01-17 02:40:16.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/block_dev.c 2015-01-19 10:57:46.000000000 +0000
-@@ -28,6 +28,7 @@
+diff -NurpP --minimal linux-4.4.110/fs/block_dev.c linux-4.4.110-vs2.3.9/fs/block_dev.c
+--- linux-4.4.110/fs/block_dev.c 2018-01-09 16:35:04.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/block_dev.c 2018-01-09 17:16:29.000000000 +0000
+@@ -29,6 +29,7 @@
#include <linux/log2.h>
#include <linux/cleancache.h>
- #include <linux/aio.h>
+ #include <linux/dax.h>
+#include <linux/vs_device.h>
#include <asm/uaccess.h>
#include "internal.h"
-@@ -575,6 +576,7 @@ struct block_device *bdget(dev_t dev)
+@@ -645,6 +646,7 @@ struct block_device *bdget(dev_t dev)
bdev->bd_invalidated = 0;
inode->i_mode = S_IFBLK;
inode->i_rdev = dev;
inode->i_bdev = bdev;
inode->i_data.a_ops = &def_blk_aops;
mapping_set_gfp_mask(&inode->i_data, GFP_USER);
-@@ -622,6 +624,11 @@ EXPORT_SYMBOL(bdput);
+@@ -691,6 +693,11 @@ EXPORT_SYMBOL(bdput);
static struct block_device *bd_acquire(struct inode *inode)
{
struct block_device *bdev;
spin_lock(&bdev_lock);
bdev = inode->i_bdev;
-@@ -632,7 +639,7 @@ static struct block_device *bd_acquire(s
+@@ -701,7 +708,7 @@ static struct block_device *bd_acquire(s
}
spin_unlock(&bdev_lock);
if (bdev) {
spin_lock(&bdev_lock);
if (!inode->i_bdev) {
-diff -NurpP --minimal linux-3.18.5/fs/btrfs/ctree.h linux-3.18.5-vs2.3.7.3/fs/btrfs/ctree.h
---- linux-3.18.5/fs/btrfs/ctree.h 2015-01-17 02:40:16.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/btrfs/ctree.h 2015-01-19 10:57:46.000000000 +0000
-@@ -728,11 +728,14 @@ struct btrfs_inode_item {
+diff -NurpP --minimal linux-4.4.110/fs/btrfs/ctree.h linux-4.4.110-vs2.3.9/fs/btrfs/ctree.h
+--- linux-4.4.110/fs/btrfs/ctree.h 2018-01-09 16:35:04.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/btrfs/ctree.h 2018-01-09 16:36:24.000000000 +0000
+@@ -731,11 +731,14 @@ struct btrfs_inode_item {
/* modification sequence number for NFS */
__le64 sequence;
struct btrfs_timespec atime;
struct btrfs_timespec ctime;
struct btrfs_timespec mtime;
-@@ -2098,6 +2101,8 @@ struct btrfs_ioctl_defrag_range_args {
+@@ -2189,6 +2192,8 @@ struct btrfs_ioctl_defrag_range_args {
#define BTRFS_DEFAULT_COMMIT_INTERVAL (30)
#define BTRFS_DEFAULT_MAX_INLINE (8192)
#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)
-@@ -2381,6 +2386,7 @@ BTRFS_SETGET_FUNCS(inode_block_group, st
+@@ -2528,6 +2533,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);
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);
-@@ -2453,6 +2459,10 @@ BTRFS_SETGET_FUNCS(extent_flags, struct
+@@ -2575,6 +2581,10 @@ BTRFS_SETGET_FUNCS(extent_flags, struct
BTRFS_SETGET_FUNCS(extent_refs_v0, struct btrfs_extent_item_v0, refs, 32);
BTRFS_SETGET_FUNCS(tree_block_level, struct btrfs_tree_block_info, level, 8);
-@@ -3864,6 +3874,7 @@ long btrfs_ioctl(struct file *file, unsi
+@@ -4022,6 +4032,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);
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-3.18.5/fs/btrfs/disk-io.c linux-3.18.5-vs2.3.7.3/fs/btrfs/disk-io.c
---- linux-3.18.5/fs/btrfs/disk-io.c 2015-02-05 18:02:44.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/btrfs/disk-io.c 2015-01-19 10:57:46.000000000 +0000
-@@ -2460,6 +2460,9 @@ int open_ctree(struct super_block *sb,
+diff -NurpP --minimal linux-4.4.110/fs/btrfs/disk-io.c linux-4.4.110-vs2.3.9/fs/btrfs/disk-io.c
+--- linux-4.4.110/fs/btrfs/disk-io.c 2018-01-09 16:35:05.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/btrfs/disk-io.c 2018-01-09 16:36:24.000000000 +0000
+@@ -2736,6 +2736,9 @@ int open_ctree(struct super_block *sb,
goto fail_alloc;
}
features = btrfs_super_incompat_flags(disk_super) &
~BTRFS_FEATURE_INCOMPAT_SUPP;
if (features) {
-diff -NurpP --minimal linux-3.18.5/fs/btrfs/inode.c linux-3.18.5-vs2.3.7.3/fs/btrfs/inode.c
---- linux-3.18.5/fs/btrfs/inode.c 2015-01-17 02:40:16.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/btrfs/inode.c 2015-01-19 12:26:30.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/fs/btrfs/inode.c linux-4.4.110-vs2.3.9/fs/btrfs/inode.c
+--- linux-4.4.110/fs/btrfs/inode.c 2018-01-09 16:35:05.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/btrfs/inode.c 2018-01-09 16:36:24.000000000 +0000
@@ -43,6 +43,7 @@
- #include <linux/btrfs.h>
#include <linux/blkdev.h>
#include <linux/posix_acl_xattr.h>
+ #include <linux/uio.h>
+#include <linux/vs_tag.h>
#include "ctree.h"
#include "disk-io.h"
#include "transaction.h"
-@@ -3477,6 +3478,9 @@ static void btrfs_read_locked_inode(stru
+@@ -3611,6 +3612,9 @@ static void btrfs_read_locked_inode(stru
unsigned long ptr;
int maybe_acls;
u32 rdev;
int ret;
bool filled = false;
int first_xattr_slot;
-@@ -3504,8 +3508,14 @@ static void btrfs_read_locked_inode(stru
+@@ -3638,8 +3642,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));
+ inode->i_tag = INOTAG_KTAG(DX_TAG(inode), kuid, kgid, ktag);
btrfs_i_size_write(inode, btrfs_inode_size(leaf, inode_item));
- tspec = btrfs_inode_atime(inode_item);
-@@ -3629,11 +3639,18 @@ static void fill_inode_item(struct btrfs
+ inode->i_atime.tv_sec = btrfs_timespec_sec(leaf, &inode_item->atime);
+@@ -3795,11 +3805,18 @@ static void fill_inode_item(struct btrfs
struct inode *inode)
{
struct btrfs_map_token token;
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);
-@@ -9459,6 +9476,7 @@ static const struct inode_operations btr
+@@ -10062,6 +10079,7 @@ static const struct inode_operations btr
.listxattr = btrfs_listxattr,
.removexattr = btrfs_removexattr,
.permission = btrfs_permission,
.get_acl = btrfs_get_acl,
.set_acl = btrfs_set_acl,
.update_time = btrfs_update_time,
-@@ -9467,6 +9485,7 @@ static const struct inode_operations btr
+@@ -10070,6 +10088,7 @@ static const struct inode_operations btr
static const struct inode_operations btrfs_dir_ro_inode_operations = {
.lookup = btrfs_lookup,
.permission = btrfs_permission,
.get_acl = btrfs_get_acl,
.set_acl = btrfs_set_acl,
.update_time = btrfs_update_time,
-@@ -9537,6 +9556,7 @@ static const struct inode_operations btr
+@@ -10140,6 +10159,7 @@ static const struct inode_operations btr
.removexattr = btrfs_removexattr,
.permission = btrfs_permission,
.fiemap = btrfs_fiemap,
.get_acl = btrfs_get_acl,
.set_acl = btrfs_set_acl,
.update_time = btrfs_update_time,
-diff -NurpP --minimal linux-3.18.5/fs/btrfs/ioctl.c linux-3.18.5-vs2.3.7.3/fs/btrfs/ioctl.c
---- linux-3.18.5/fs/btrfs/ioctl.c 2015-01-17 02:40:16.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/btrfs/ioctl.c 2015-01-21 09:54:51.000000000 +0000
-@@ -107,10 +107,13 @@ static unsigned int btrfs_flags_to_ioctl
+diff -NurpP --minimal linux-4.4.110/fs/btrfs/ioctl.c linux-4.4.110-vs2.3.9/fs/btrfs/ioctl.c
+--- linux-4.4.110/fs/btrfs/ioctl.c 2018-01-09 16:35:05.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/btrfs/ioctl.c 2018-01-09 16:36:24.000000000 +0000
+@@ -108,10 +108,13 @@ static unsigned int btrfs_flags_to_ioctl
{
unsigned int iflags = 0;
if (flags & BTRFS_INODE_APPEND)
iflags |= FS_APPEND_FL;
if (flags & BTRFS_INODE_NODUMP)
-@@ -127,34 +130,84 @@ static unsigned int btrfs_flags_to_ioctl
+@@ -128,34 +131,84 @@ static unsigned int btrfs_flags_to_ioctl
else if (flags & BTRFS_INODE_NOCOMPRESS)
iflags |= FS_NOCOMP_FL;
* Inherit flags from the parent inode.
*
* Currently only the compression flags and the cow flags are inherited.
-@@ -167,6 +220,7 @@ void btrfs_inherit_iflags(struct inode *
+@@ -168,6 +221,7 @@ void btrfs_inherit_iflags(struct inode *
return;
flags = BTRFS_I(dir)->flags;
if (flags & BTRFS_INODE_NOCOMPRESS) {
BTRFS_I(inode)->flags &= ~BTRFS_INODE_COMPRESS;
-@@ -185,6 +239,30 @@ void btrfs_inherit_iflags(struct inode *
+@@ -186,6 +240,30 @@ void btrfs_inherit_iflags(struct inode *
btrfs_update_iflags(inode);
}
static int btrfs_ioctl_getflags(struct file *file, void __user *arg)
{
struct btrfs_inode *ip = BTRFS_I(file_inode(file));
-@@ -247,21 +325,27 @@ static int btrfs_ioctl_setflags(struct f
+@@ -248,21 +326,27 @@ static int btrfs_ioctl_setflags(struct f
flags = btrfs_mask_flags(inode->i_mode, flags);
oldflags = btrfs_flags_to_ioctl(ip->flags);
if (flags & FS_APPEND_FL)
ip->flags |= BTRFS_INODE_APPEND;
else
-diff -NurpP --minimal linux-3.18.5/fs/btrfs/super.c linux-3.18.5-vs2.3.7.3/fs/btrfs/super.c
---- linux-3.18.5/fs/btrfs/super.c 2015-02-05 18:02:44.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/btrfs/super.c 2015-01-19 10:57:46.000000000 +0000
-@@ -325,7 +325,7 @@ enum {
- Opt_commit_interval, Opt_barrier, Opt_nodefrag, Opt_nodiscard,
- Opt_noenospc_debug, Opt_noflushoncommit, Opt_acl, Opt_datacow,
- Opt_datasum, Opt_treelog, Opt_noinode_cache,
+diff -NurpP --minimal linux-4.4.110/fs/btrfs/super.c linux-4.4.110-vs2.3.9/fs/btrfs/super.c
+--- linux-4.4.110/fs/btrfs/super.c 2018-01-09 16:35:05.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/btrfs/super.c 2018-01-09 17:25:27.000000000 +0000
+@@ -306,7 +306,7 @@ enum {
+ #ifdef CONFIG_BTRFS_DEBUG
+ Opt_fragment_data, Opt_fragment_metadata, Opt_fragment_all,
+ #endif
- Opt_err,
+ Opt_tag, Opt_notag, Opt_tagid, Opt_err,
};
static match_table_t tokens = {
-@@ -377,6 +377,9 @@ static match_table_t tokens = {
- {Opt_rescan_uuid_tree, "rescan_uuid_tree"},
- {Opt_fatal_errors, "fatal_errors=%s"},
- {Opt_commit_interval, "commit=%d"},
+@@ -363,6 +363,9 @@ static match_table_t tokens = {
+ {Opt_fragment_metadata, "fragment=metadata"},
+ {Opt_fragment_all, "fragment=all"},
+ #endif
+ {Opt_tag, "tag"},
+ {Opt_notag, "notag"},
+ {Opt_tagid, "tagid=%u"},
{Opt_err, NULL},
};
-@@ -743,6 +746,22 @@ int btrfs_parse_options(struct btrfs_roo
- info->commit_interval = BTRFS_DEFAULT_COMMIT_INTERVAL;
- }
+@@ -745,6 +748,22 @@ int btrfs_parse_options(struct btrfs_roo
+ btrfs_set_opt(info->mount_opt, FRAGMENT_DATA);
break;
+ #endif
+#ifndef CONFIG_TAGGING_NONE
+ case Opt_tag:
+ printk(KERN_INFO "btrfs: use tagging\n");
case Opt_err:
btrfs_info(root->fs_info, "unrecognized mount option '%s'", p);
ret = -EINVAL;
-@@ -1495,6 +1514,12 @@ static int btrfs_remount(struct super_bl
+@@ -1647,6 +1666,12 @@ static int btrfs_remount(struct super_bl
btrfs_resize_thread_pool(fs_info,
fs_info->thread_pool_size, old_thread_pool_size);
if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
goto out;
-diff -NurpP --minimal linux-3.18.5/fs/char_dev.c linux-3.18.5-vs2.3.7.3/fs/char_dev.c
---- linux-3.18.5/fs/char_dev.c 2014-01-22 20:39:05.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/char_dev.c 2015-01-19 10:57:46.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/fs/char_dev.c linux-4.4.110-vs2.3.9/fs/char_dev.c
+--- linux-4.4.110/fs/char_dev.c 2016-07-05 04:12:30.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/char_dev.c 2018-01-09 16:36:24.000000000 +0000
@@ -21,6 +21,8 @@
#include <linux/mutex.h>
#include <linux/backing-dev.h>
#include "internal.h"
-@@ -372,14 +374,21 @@ static int chrdev_open(struct inode *ino
+@@ -350,14 +352,21 @@ static int chrdev_open(struct inode *ino
struct cdev *p;
struct cdev *new = NULL;
int ret = 0;
if (!kobj)
return -ENXIO;
new = container_of(kobj, struct cdev, kobj);
-diff -NurpP --minimal linux-3.18.5/fs/dcache.c linux-3.18.5-vs2.3.7.3/fs/dcache.c
---- linux-3.18.5/fs/dcache.c 2015-02-05 18:02:45.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/dcache.c 2015-01-19 12:06:59.000000000 +0000
-@@ -38,6 +38,7 @@
- #include <linux/prefetch.h>
+diff -NurpP --minimal linux-4.4.110/fs/dcache.c linux-4.4.110-vs2.3.9/fs/dcache.c
+--- linux-4.4.110/fs/dcache.c 2018-01-09 16:35:05.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/dcache.c 2018-01-09 16:36:24.000000000 +0000
+@@ -39,6 +39,7 @@
#include <linux/ratelimit.h>
#include <linux/list_lru.h>
+ #include <linux/kasan.h>
+#include <linux/vs_limit.h>
+
#include "internal.h"
#include "mount.h"
+@@ -677,6 +678,7 @@ static inline bool fast_dput(struct dent
+ spin_lock(&dentry->d_lock);
+ if (dentry->d_lockref.count > 1) {
+ dentry->d_lockref.count--;
++ vx_dentry_dec(dentry);
+ spin_unlock(&dentry->d_lock);
+ return 1;
+ }
+@@ -806,6 +808,7 @@ repeat:
+ dentry_lru_add(dentry);
+
+ dentry->d_lockref.count--;
++ vx_dentry_dec(dentry);
+ spin_unlock(&dentry->d_lock);
+ return;
-@@ -654,6 +655,7 @@ EXPORT_SYMBOL(dput);
+@@ -823,6 +826,7 @@ EXPORT_SYMBOL(dput);
static inline void __dget_dlock(struct dentry *dentry)
{
dentry->d_lockref.count++;
}
static inline void __dget(struct dentry *dentry)
-@@ -666,6 +668,8 @@ struct dentry *dget_parent(struct dentry
+@@ -835,6 +839,8 @@ struct dentry *dget_parent(struct dentry
int gotref;
struct dentry *ret;
/*
* Do optimistic parent lookup without any
* locking.
-@@ -1410,6 +1414,9 @@ struct dentry *__d_alloc(struct super_bl
+@@ -865,6 +871,7 @@ repeat:
+ rcu_read_unlock();
+ BUG_ON(!ret->d_lockref.count);
+ ret->d_lockref.count++;
++ vx_dentry_inc(ret);
+ spin_unlock(&ret->d_lock);
+ return ret;
+ }
+@@ -1019,6 +1026,7 @@ static void shrink_dentry_list(struct li
+ parent = lock_parent(dentry);
+ if (dentry->d_lockref.count != 1) {
+ dentry->d_lockref.count--;
++ vx_dentry_dec(dentry);
+ spin_unlock(&dentry->d_lock);
+ if (parent)
+ spin_unlock(&parent->d_lock);
+@@ -1581,6 +1589,9 @@ struct dentry *__d_alloc(struct super_bl
struct dentry *dentry;
char *dname;
dentry = kmem_cache_alloc(dentry_cache, GFP_KERNEL);
if (!dentry)
return NULL;
-@@ -1445,6 +1452,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;
spin_lock_init(&dentry->d_lock);
seqcount_init(&dentry->d_seq);
dentry->d_inode = NULL;
-@@ -2184,6 +2192,7 @@ struct dentry *__d_lookup(const struct d
+@@ -2355,6 +2367,7 @@ struct dentry *__d_lookup(const struct d
}
dentry->d_lockref.count++;
found = dentry;
spin_unlock(&dentry->d_lock);
break;
-diff -NurpP --minimal linux-3.18.5/fs/devpts/inode.c linux-3.18.5-vs2.3.7.3/fs/devpts/inode.c
---- linux-3.18.5/fs/devpts/inode.c 2014-09-03 13:19:39.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/devpts/inode.c 2015-01-19 10:57:47.000000000 +0000
+@@ -3371,6 +3384,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--;
++ vx_dentry_dec(dentry);
+ }
+ }
+ return D_WALK_CONTINUE;
+diff -NurpP --minimal linux-4.4.110/fs/devpts/inode.c linux-4.4.110-vs2.3.9/fs/devpts/inode.c
+--- linux-4.4.110/fs/devpts/inode.c 2018-01-09 16:35:05.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/devpts/inode.c 2018-01-09 16:36:24.000000000 +0000
@@ -27,6 +27,7 @@
#include <linux/parser.h>
#include <linux/fsnotify.h>
/*
* sysctl support for setting limits on the number of Unix98 ptys allocated.
* Otherwise one can eat up all kernel memory by opening /dev/ptmx repeatedly.
-@@ -350,6 +366,34 @@ static int devpts_show_options(struct se
+@@ -353,6 +369,34 @@ static int devpts_show_options(struct se
return 0;
}
static const struct super_operations devpts_sops = {
.statfs = simple_statfs,
.remount_fs = devpts_remount,
-@@ -393,8 +437,10 @@ devpts_fill_super(struct super_block *s,
+@@ -397,8 +441,10 @@ devpts_fill_super(struct super_block *s,
inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO | S_IWUSR;
inode->i_op = &simple_dir_inode_operations;
s->s_root = d_make_root(inode);
if (s->s_root)
-@@ -598,6 +644,9 @@ struct inode *devpts_pty_new(struct inod
+@@ -630,6 +676,9 @@ struct inode *devpts_pty_new(struct pts_
inode->i_gid = opts->setgid ? opts->gid : current_fsgid();
inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
init_special_inode(inode, S_IFCHR|opts->mode, device);
inode->i_private = priv;
sprintf(s, "%d", index);
-diff -NurpP --minimal linux-3.18.5/fs/ext2/balloc.c linux-3.18.5-vs2.3.7.3/fs/ext2/balloc.c
---- linux-3.18.5/fs/ext2/balloc.c 2013-05-31 13:45:23.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/ext2/balloc.c 2015-01-19 10:57:47.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/fs/ext2/balloc.c linux-4.4.110-vs2.3.9/fs/ext2/balloc.c
+--- linux-4.4.110/fs/ext2/balloc.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/ext2/balloc.c 2018-01-09 16:36:24.000000000 +0000
@@ -693,7 +693,6 @@ ext2_try_to_allocate(struct super_block
start = 0;
end = EXT2_BLOCKS_PER_GROUP(sb);
BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb));
repeat:
-diff -NurpP --minimal linux-3.18.5/fs/ext2/ext2.h linux-3.18.5-vs2.3.7.3/fs/ext2/ext2.h
---- linux-3.18.5/fs/ext2/ext2.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/ext2/ext2.h 2015-01-19 10:57:47.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/fs/ext2/ext2.h linux-4.4.110-vs2.3.9/fs/ext2/ext2.h
+--- linux-4.4.110/fs/ext2/ext2.h 2016-07-05 04:15:07.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/ext2/ext2.h 2018-01-09 16:36:24.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) */
#define i_reserved2 osd2.linux2.l_i_reserved2
/*
-@@ -384,6 +390,7 @@ struct ext2_inode {
- #define EXT2_MOUNT_USRQUOTA 0x020000 /* user quota */
- #define EXT2_MOUNT_GRPQUOTA 0x040000 /* group quota */
- #define EXT2_MOUNT_RESERVATION 0x080000 /* Preallocation */
-+#define EXT2_MOUNT_TAGGED (1<<24) /* Enable Context Tags */
+@@ -389,6 +395,7 @@ struct ext2_inode {
+ #else
+ #define EXT2_MOUNT_DAX 0
+ #endif
++#define EXT2_MOUNT_TAGGED 0x200000 /* Enable Context Tags */
#define clear_opt(o, opt) o &= ~EXT2_MOUNT_##opt
-@@ -757,6 +764,7 @@ extern void ext2_set_inode_flags(struct
+@@ -776,6 +783,7 @@ extern void ext2_set_inode_flags(struct
extern void ext2_get_inode_flags(struct ext2_inode_info *);
extern int ext2_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
u64 start, u64 len);
/* ioctl.c */
extern long ext2_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-3.18.5/fs/ext2/file.c linux-3.18.5-vs2.3.7.3/fs/ext2/file.c
---- linux-3.18.5/fs/ext2/file.c 2014-09-03 13:19:39.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/ext2/file.c 2015-01-19 10:57:47.000000000 +0000
-@@ -105,4 +105,5 @@ const struct inode_operations ext2_file_
+diff -NurpP --minimal linux-4.4.110/fs/ext2/file.c linux-4.4.110-vs2.3.9/fs/ext2/file.c
+--- linux-4.4.110/fs/ext2/file.c 2016-07-05 04:15:07.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/ext2/file.c 2018-01-09 16:36:24.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-3.18.5/fs/ext2/ialloc.c linux-3.18.5-vs2.3.7.3/fs/ext2/ialloc.c
---- linux-3.18.5/fs/ext2/ialloc.c 2014-06-12 13:02:41.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/ext2/ialloc.c 2015-01-19 10:57:47.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/fs/ext2/ialloc.c linux-4.4.110-vs2.3.9/fs/ext2/ialloc.c
+--- linux-4.4.110/fs/ext2/ialloc.c 2016-07-05 04:12:30.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/ext2/ialloc.c 2018-01-09 16:36:24.000000000 +0000
@@ -17,6 +17,7 @@
#include <linux/backing-dev.h>
#include <linux/buffer_head.h>
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-3.18.5/fs/ext2/inode.c linux-3.18.5-vs2.3.7.3/fs/ext2/inode.c
---- linux-3.18.5/fs/ext2/inode.c 2014-09-03 13:19:39.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/ext2/inode.c 2015-01-19 10:57:47.000000000 +0000
-@@ -32,6 +32,7 @@
+diff -NurpP --minimal linux-4.4.110/fs/ext2/inode.c linux-4.4.110-vs2.3.9/fs/ext2/inode.c
+--- linux-4.4.110/fs/ext2/inode.c 2016-07-05 04:15:07.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/ext2/inode.c 2018-01-09 16:36:24.000000000 +0000
+@@ -33,6 +33,7 @@
#include <linux/fiemap.h>
#include <linux/namei.h>
- #include <linux/aio.h>
+ #include <linux/uio.h>
+#include <linux/vs_tag.h>
#include "ext2.h"
#include "acl.h"
- #include "xip.h"
-@@ -1182,7 +1183,7 @@ static void ext2_truncate_blocks(struct
+ #include "xattr.h"
+@@ -1188,7 +1189,7 @@ static void ext2_truncate_blocks(struct
return;
if (ext2_inode_is_fast_symlink(inode))
return;
- if (IS_APPEND(inode) || IS_IMMUTABLE(inode))
+ if (IS_APPEND(inode) || IS_IXORUNLINK(inode))
return;
- __ext2_truncate_blocks(inode, offset);
- }
-@@ -1273,36 +1274,61 @@ void ext2_set_inode_flags(struct inode *
+
+ dax_sem_down_write(EXT2_I(inode));
+@@ -1284,39 +1285,62 @@ void ext2_set_inode_flags(struct inode *
{
unsigned int flags = EXT2_I(inode)->i_flags;
-- inode->i_flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC);
-+ inode->i_flags &= ~(S_IMMUTABLE | S_IXUNLINK |
+- inode->i_flags &= ~(S_SYNC | S_APPEND | S_IMMUTABLE | S_NOATIME |
+- S_DIRSYNC | S_DAX);
++ inode->i_flags &= ~(S_IMMUTABLE | S_IXUNLINK | S_DAX |
+ S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC);
+
-+
+ if (flags & EXT2_IMMUTABLE_FL)
+ inode->i_flags |= S_IMMUTABLE;
+ if (flags & EXT2_IXUNLINK_FL)
inode->i_flags |= S_NOATIME;
if (flags & EXT2_DIRSYNC_FL)
inode->i_flags |= S_DIRSYNC;
+ if (test_opt(inode->i_sb, DAX))
+ inode->i_flags |= S_DAX;
+
+ inode->i_vflags &= ~(V_BARRIER | V_COW);
+
}
struct inode *ext2_iget (struct super_block *sb, unsigned long ino)
-@@ -1338,8 +1364,10 @@ struct inode *ext2_iget (struct super_bl
+@@ -1352,8 +1376,10 @@ struct inode *ext2_iget (struct super_bl
i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
}
set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
inode->i_size = le32_to_cpu(raw_inode->i_size);
inode->i_atime.tv_sec = (signed)le32_to_cpu(raw_inode->i_atime);
-@@ -1437,8 +1465,10 @@ static int __ext2_write_inode(struct ino
+@@ -1449,8 +1475,10 @@ static int __ext2_write_inode(struct ino
struct ext2_inode_info *ei = EXT2_I(inode);
struct super_block *sb = inode->i_sb;
ino_t ino = inode->i_ino;
struct buffer_head * bh;
struct ext2_inode * raw_inode = ext2_get_inode(sb, ino, &bh);
int n;
-@@ -1474,6 +1504,9 @@ static int __ext2_write_inode(struct ino
+@@ -1486,6 +1514,9 @@ static int __ext2_write_inode(struct ino
raw_inode->i_uid_high = 0;
raw_inode->i_gid_high = 0;
}
raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
raw_inode->i_size = cpu_to_le32(inode->i_size);
raw_inode->i_atime = cpu_to_le32(inode->i_atime.tv_sec);
-@@ -1554,7 +1587,8 @@ int ext2_setattr(struct dentry *dentry,
- if (is_quota_modification(inode, iattr))
- dquot_initialize(inode);
+@@ -1569,7 +1600,8 @@ int ext2_setattr(struct dentry *dentry,
+ return error;
+ }
if ((iattr->ia_valid & ATTR_UID && !uid_eq(iattr->ia_uid, inode->i_uid)) ||
- (iattr->ia_valid & ATTR_GID && !gid_eq(iattr->ia_gid, inode->i_gid))) {
+ (iattr->ia_valid & ATTR_GID && !gid_eq(iattr->ia_gid, inode->i_gid)) ||
error = dquot_transfer(inode, iattr);
if (error)
return error;
-diff -NurpP --minimal linux-3.18.5/fs/ext2/ioctl.c linux-3.18.5-vs2.3.7.3/fs/ext2/ioctl.c
---- linux-3.18.5/fs/ext2/ioctl.c 2013-05-31 13:45:23.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/ext2/ioctl.c 2015-01-19 10:57:47.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/fs/ext2/ioctl.c linux-4.4.110-vs2.3.9/fs/ext2/ioctl.c
+--- linux-4.4.110/fs/ext2/ioctl.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/ext2/ioctl.c 2018-01-09 16:36:24.000000000 +0000
@@ -17,6 +17,16 @@
#include <asm/uaccess.h>
flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE;
ei->i_flags = flags;
-diff -NurpP --minimal linux-3.18.5/fs/ext2/namei.c linux-3.18.5-vs2.3.7.3/fs/ext2/namei.c
---- linux-3.18.5/fs/ext2/namei.c 2014-06-12 11:34:57.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/ext2/namei.c 2015-01-19 10:57:47.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/fs/ext2/namei.c linux-4.4.110-vs2.3.9/fs/ext2/namei.c
+--- linux-4.4.110/fs/ext2/namei.c 2016-07-05 04:15:07.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/ext2/namei.c 2018-01-09 16:36:24.000000000 +0000
@@ -32,6 +32,7 @@
#include <linux/pagemap.h>
#include "ext2.h"
#include "xattr.h"
#include "acl.h"
-@@ -73,6 +74,7 @@ static struct dentry *ext2_lookup(struct
+@@ -72,6 +73,7 @@ static struct dentry *ext2_lookup(struct
(unsigned long) ino);
return ERR_PTR(-EIO);
}
}
return d_splice_alias(inode, dentry);
}
-@@ -433,6 +435,7 @@ const struct inode_operations ext2_speci
+@@ -446,6 +448,7 @@ const struct inode_operations ext2_speci
.removexattr = generic_removexattr,
#endif
.setattr = ext2_setattr,
.get_acl = ext2_get_acl,
.set_acl = ext2_set_acl,
};
-diff -NurpP --minimal linux-3.18.5/fs/ext2/super.c linux-3.18.5-vs2.3.7.3/fs/ext2/super.c
---- linux-3.18.5/fs/ext2/super.c 2015-01-17 02:40:17.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/ext2/super.c 2015-01-19 10:57:47.000000000 +0000
-@@ -395,7 +395,8 @@ enum {
+diff -NurpP --minimal linux-4.4.110/fs/ext2/super.c linux-4.4.110-vs2.3.9/fs/ext2/super.c
+--- linux-4.4.110/fs/ext2/super.c 2016-07-05 04:15:07.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/ext2/super.c 2018-01-09 16:36:24.000000000 +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,
- Opt_acl, Opt_noacl, Opt_xip, Opt_ignore, Opt_err, Opt_quota,
+ Opt_acl, Opt_noacl, Opt_xip, Opt_dax, Opt_ignore, Opt_err, Opt_quota,
- Opt_usrquota, Opt_grpquota, Opt_reservation, Opt_noreservation
+ Opt_usrquota, Opt_grpquota, Opt_reservation, Opt_noreservation,
+ Opt_tag, Opt_notag, Opt_tagid
};
static const match_table_t tokens = {
-@@ -423,6 +424,9 @@ static const match_table_t tokens = {
+@@ -436,6 +437,9 @@ static const match_table_t tokens = {
{Opt_acl, "acl"},
{Opt_noacl, "noacl"},
{Opt_xip, "xip"},
+ {Opt_tag, "tag"},
+ {Opt_notag, "notag"},
+ {Opt_tagid, "tagid=%u"},
+ {Opt_dax, "dax"},
{Opt_grpquota, "grpquota"},
{Opt_ignore, "noquota"},
- {Opt_quota, "quota"},
-@@ -506,6 +510,20 @@ static int parse_options(char *options,
+@@ -520,6 +524,20 @@ static int parse_options(char *options,
case Opt_nouid32:
set_opt (sbi->s_mount_opt, NO_UID32);
break;
case Opt_nocheck:
clear_opt (sbi->s_mount_opt, CHECK);
break;
-@@ -864,6 +882,8 @@ static int ext2_fill_super(struct super_
+@@ -884,6 +902,8 @@ static int ext2_fill_super(struct super_
if (!parse_options((char *) data, sb))
goto failed_mount;
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
((EXT2_SB(sb)->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ?
MS_POSIXACL : 0);
-@@ -1270,6 +1290,14 @@ static int ext2_remount (struct super_bl
+@@ -1294,6 +1314,14 @@ static int ext2_remount (struct super_bl
err = -EINVAL;
goto restore_opts;
}
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-3.18.5/fs/ext3/ext3.h linux-3.18.5-vs2.3.7.3/fs/ext3/ext3.h
---- linux-3.18.5/fs/ext3/ext3.h 2015-01-17 02:40:17.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/ext3/ext3.h 2015-01-19 10:57:47.000000000 +0000
-@@ -151,10 +151,14 @@ struct ext3_group_desc
- #define EXT3_NOTAIL_FL 0x00008000 /* file tail should not be merged */
- #define EXT3_DIRSYNC_FL 0x00010000 /* dirsync behaviour (directories only) */
- #define EXT3_TOPDIR_FL 0x00020000 /* Top of directory hierarchies*/
-+#define EXT3_IXUNLINK_FL 0x08000000 /* Immutable invert on unlink */
- #define EXT3_RESERVED_FL 0x80000000 /* reserved for ext3 lib */
-
--#define EXT3_FL_USER_VISIBLE 0x0003DFFF /* User visible flags */
--#define EXT3_FL_USER_MODIFIABLE 0x000380FF /* User modifiable flags */
-+#define EXT3_BARRIER_FL 0x04000000 /* Barrier for chroot() */
-+#define EXT3_COW_FL 0x20000000 /* Copy on Write marker */
-+
-+#define EXT3_FL_USER_VISIBLE 0x0103DFFF /* User visible flags */
-+#define EXT3_FL_USER_MODIFIABLE 0x010380FF /* User modifiable flags */
-
- /* Flags that should be inherited by new inodes from their parent. */
- #define EXT3_FL_INHERITED (EXT3_SECRM_FL | EXT3_UNRM_FL | EXT3_COMPR_FL |\
-@@ -292,7 +296,8 @@ struct ext3_inode {
- __u16 i_pad1;
- __le16 l_i_uid_high; /* these 2 fields */
- __le16 l_i_gid_high; /* were reserved2[0] */
-- __u32 l_i_reserved2;
-+ __le16 l_i_tag; /* Context Tag */
-+ __u16 l_i_reserved2;
- } linux2;
- struct {
- __u8 h_i_frag; /* Fragment number */
-@@ -322,6 +327,7 @@ struct ext3_inode {
- #define i_gid_low i_gid
- #define i_uid_high osd2.linux2.l_i_uid_high
- #define i_gid_high osd2.linux2.l_i_gid_high
-+#define i_raw_tag osd2.linux2.l_i_tag
- #define i_reserved2 osd2.linux2.l_i_reserved2
-
- /*
-@@ -366,6 +372,7 @@ struct ext3_inode {
- #define EXT3_MOUNT_GRPQUOTA 0x200000 /* "old" group quota */
- #define EXT3_MOUNT_DATA_ERR_ABORT 0x400000 /* Abort on file data write
- * error in ordered mode */
-+#define EXT3_MOUNT_TAGGED (1<<24) /* Enable Context Tags */
-
- /* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */
- #ifndef _LINUX_EXT2_FS_H
-@@ -1063,6 +1070,7 @@ extern void ext3_get_inode_flags(struct
- extern void ext3_set_aops(struct inode *inode);
- extern int ext3_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
- u64 start, u64 len);
-+extern int ext3_sync_flags(struct inode *, int, int);
-
- /* ioctl.c */
- extern long ext3_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-3.18.5/fs/ext3/file.c linux-3.18.5-vs2.3.7.3/fs/ext3/file.c
---- linux-3.18.5/fs/ext3/file.c 2014-09-03 13:19:39.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/ext3/file.c 2015-01-19 10:57:47.000000000 +0000
-@@ -77,5 +77,6 @@ const struct inode_operations ext3_file_
- .get_acl = ext3_get_acl,
- .set_acl = ext3_set_acl,
- .fiemap = ext3_fiemap,
-+ .sync_flags = ext3_sync_flags,
- };
-
-diff -NurpP --minimal linux-3.18.5/fs/ext3/ialloc.c linux-3.18.5-vs2.3.7.3/fs/ext3/ialloc.c
---- linux-3.18.5/fs/ext3/ialloc.c 2014-06-12 13:02:41.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/ext3/ialloc.c 2015-01-19 10:57:47.000000000 +0000
-@@ -14,6 +14,7 @@
-
- #include <linux/quotaops.h>
- #include <linux/random.h>
-+#include <linux/vs_tag.h>
-
- #include "ext3.h"
- #include "xattr.h"
-@@ -469,6 +470,7 @@ got:
- inode->i_mode = mode;
- inode->i_uid = current_fsuid();
- inode->i_gid = dir->i_gid;
-+ i_tag_write(inode, dx_current_fstag(sb));
- } else
- inode_init_owner(inode, dir, mode);
-
-diff -NurpP --minimal linux-3.18.5/fs/ext3/inode.c linux-3.18.5-vs2.3.7.3/fs/ext3/inode.c
---- linux-3.18.5/fs/ext3/inode.c 2014-09-03 13:19:39.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/ext3/inode.c 2015-01-19 10:57:47.000000000 +0000
-@@ -28,6 +28,8 @@
- #include <linux/mpage.h>
- #include <linux/namei.h>
- #include <linux/aio.h>
-+#include <linux/vs_tag.h>
-+
- #include "ext3.h"
- #include "xattr.h"
- #include "acl.h"
-@@ -2813,36 +2815,60 @@ void ext3_set_inode_flags(struct inode *
- {
- unsigned int flags = EXT3_I(inode)->i_flags;
-
-- inode->i_flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC);
-+ inode->i_flags &= ~(S_IMMUTABLE | S_IXUNLINK |
-+ S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC);
-+
-+ if (flags & EXT3_IMMUTABLE_FL)
-+ inode->i_flags |= S_IMMUTABLE;
-+ if (flags & EXT3_IXUNLINK_FL)
-+ inode->i_flags |= S_IXUNLINK;
-+
- if (flags & EXT3_SYNC_FL)
- inode->i_flags |= S_SYNC;
- if (flags & EXT3_APPEND_FL)
- inode->i_flags |= S_APPEND;
-- if (flags & EXT3_IMMUTABLE_FL)
-- inode->i_flags |= S_IMMUTABLE;
- if (flags & EXT3_NOATIME_FL)
- inode->i_flags |= S_NOATIME;
- if (flags & EXT3_DIRSYNC_FL)
- inode->i_flags |= S_DIRSYNC;
-+
-+ inode->i_vflags &= ~(V_BARRIER | V_COW);
-+
-+ if (flags & EXT3_BARRIER_FL)
-+ inode->i_vflags |= V_BARRIER;
-+ if (flags & EXT3_COW_FL)
-+ inode->i_vflags |= V_COW;
- }
-
- /* Propagate flags from i_flags to EXT3_I(inode)->i_flags */
- void ext3_get_inode_flags(struct ext3_inode_info *ei)
- {
- unsigned int flags = ei->vfs_inode.i_flags;
-+ unsigned int vflags = ei->vfs_inode.i_vflags;
-+
-+ ei->i_flags &= ~(EXT3_SYNC_FL | EXT3_APPEND_FL |
-+ EXT3_IMMUTABLE_FL | EXT3_IXUNLINK_FL |
-+ EXT3_NOATIME_FL | EXT3_DIRSYNC_FL |
-+ EXT3_BARRIER_FL | EXT3_COW_FL);
-+
-+ if (flags & S_IMMUTABLE)
-+ ei->i_flags |= EXT3_IMMUTABLE_FL;
-+ if (flags & S_IXUNLINK)
-+ ei->i_flags |= EXT3_IXUNLINK_FL;
-
-- ei->i_flags &= ~(EXT3_SYNC_FL|EXT3_APPEND_FL|
-- EXT3_IMMUTABLE_FL|EXT3_NOATIME_FL|EXT3_DIRSYNC_FL);
- if (flags & S_SYNC)
- ei->i_flags |= EXT3_SYNC_FL;
- if (flags & S_APPEND)
- ei->i_flags |= EXT3_APPEND_FL;
-- if (flags & S_IMMUTABLE)
-- ei->i_flags |= EXT3_IMMUTABLE_FL;
- if (flags & S_NOATIME)
- ei->i_flags |= EXT3_NOATIME_FL;
- if (flags & S_DIRSYNC)
- ei->i_flags |= EXT3_DIRSYNC_FL;
-+
-+ if (vflags & V_BARRIER)
-+ ei->i_flags |= EXT3_BARRIER_FL;
-+ if (vflags & V_COW)
-+ ei->i_flags |= EXT3_COW_FL;
- }
-
- struct inode *ext3_iget(struct super_block *sb, unsigned long ino)
-@@ -2880,8 +2906,10 @@ struct inode *ext3_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;
- }
-- i_uid_write(inode, i_uid);
-- i_gid_write(inode, i_gid);
-+ i_uid_write(inode, INOTAG_UID(DX_TAG(inode), i_uid, i_gid));
-+ i_gid_write(inode, INOTAG_GID(DX_TAG(inode), i_uid, i_gid));
-+ i_tag_write(inode, INOTAG_TAG(DX_TAG(inode), i_uid, i_gid,
-+ le16_to_cpu(raw_inode->i_raw_tag)));
- set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
- inode->i_size = le32_to_cpu(raw_inode->i_size);
- inode->i_atime.tv_sec = (signed)le32_to_cpu(raw_inode->i_atime);
-@@ -3053,8 +3081,10 @@ again:
-
- ext3_get_inode_flags(ei);
- raw_inode->i_mode = cpu_to_le16(inode->i_mode);
-- i_uid = i_uid_read(inode);
-- i_gid = i_gid_read(inode);
-+ i_uid = from_kuid(&init_user_ns,
-+ TAGINO_KUID(DX_TAG(inode), inode->i_uid, inode->i_tag));
-+ i_gid = from_kgid(&init_user_ns,
-+ TAGINO_KGID(DX_TAG(inode), inode->i_gid, inode->i_tag));
- 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));
-@@ -3079,6 +3109,9 @@ again:
- raw_inode->i_uid_high = 0;
- raw_inode->i_gid_high = 0;
- }
-+#ifdef CONFIG_TAGGING_INTERN
-+ raw_inode->i_raw_tag = cpu_to_le16(i_tag_read(inode));
-+#endif
- raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
- disksize = cpu_to_le32(ei->i_disksize);
- if (disksize != raw_inode->i_size) {
-@@ -3251,7 +3284,8 @@ int ext3_setattr(struct dentry *dentry,
- if (is_quota_modification(inode, attr))
- dquot_initialize(inode);
- if ((ia_valid & ATTR_UID && !uid_eq(attr->ia_uid, inode->i_uid)) ||
-- (ia_valid & ATTR_GID && !gid_eq(attr->ia_gid, inode->i_gid))) {
-+ (ia_valid & ATTR_GID && !gid_eq(attr->ia_gid, inode->i_gid)) ||
-+ (ia_valid & ATTR_TAG && !tag_eq(attr->ia_tag, inode->i_tag))) {
- handle_t *handle;
-
- /* (user+group)*(old+new) structure, inode write (sb,
-@@ -3273,6 +3307,8 @@ int ext3_setattr(struct dentry *dentry,
- inode->i_uid = attr->ia_uid;
- if (attr->ia_valid & ATTR_GID)
- inode->i_gid = attr->ia_gid;
-+ if ((attr->ia_valid & ATTR_TAG) && IS_TAGGED(inode))
-+ inode->i_tag = attr->ia_tag;
- error = ext3_mark_inode_dirty(handle, inode);
- ext3_journal_stop(handle);
- }
-diff -NurpP --minimal linux-3.18.5/fs/ext3/ioctl.c linux-3.18.5-vs2.3.7.3/fs/ext3/ioctl.c
---- linux-3.18.5/fs/ext3/ioctl.c 2013-05-31 13:45:23.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/ext3/ioctl.c 2015-01-19 10:57:47.000000000 +0000
-@@ -12,6 +12,34 @@
- #include <asm/uaccess.h>
- #include "ext3.h"
-
-+
-+int ext3_sync_flags(struct inode *inode, int flags, int vflags)
-+{
-+ handle_t *handle = NULL;
-+ struct ext3_iloc iloc;
-+ int err;
-+
-+ handle = ext3_journal_start(inode, 1);
-+ if (IS_ERR(handle))
-+ return PTR_ERR(handle);
-+
-+ if (IS_SYNC(inode))
-+ handle->h_sync = 1;
-+ err = ext3_reserve_inode_write(handle, inode, &iloc);
-+ if (err)
-+ goto flags_err;
-+
-+ inode->i_flags = flags;
-+ inode->i_vflags = vflags;
-+ ext3_get_inode_flags(EXT3_I(inode));
-+ inode->i_ctime = CURRENT_TIME_SEC;
-+
-+ err = ext3_mark_iloc_dirty(handle, inode, &iloc);
-+flags_err:
-+ ext3_journal_stop(handle);
-+ return err;
-+}
-+
- long ext3_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
- {
- struct inode *inode = file_inode(filp);
-@@ -45,6 +73,11 @@ long ext3_ioctl(struct file *filp, unsig
-
- flags = ext3_mask_flags(inode->i_mode, flags);
-
-+ if (IS_BARRIER(inode)) {
-+ vxwprintk_task(1, "messing with the barrier.");
-+ return -EACCES;
-+ }
-+
- mutex_lock(&inode->i_mutex);
-
- /* Is it quota file? Do not allow user to mess with it */
-@@ -63,7 +96,9 @@ long ext3_ioctl(struct file *filp, unsig
- *
- * This test looks nicer. Thanks to Pauline Middelink
- */
-- if ((flags ^ oldflags) & (EXT3_APPEND_FL | EXT3_IMMUTABLE_FL)) {
-+ if ((oldflags & EXT3_IMMUTABLE_FL) ||
-+ ((flags ^ oldflags) & (EXT3_APPEND_FL |
-+ EXT3_IMMUTABLE_FL | EXT3_IXUNLINK_FL))) {
- if (!capable(CAP_LINUX_IMMUTABLE))
- goto flags_out;
- }
-@@ -88,7 +123,7 @@ long ext3_ioctl(struct file *filp, unsig
- if (err)
- goto flags_err;
-
-- flags = flags & EXT3_FL_USER_MODIFIABLE;
-+ flags &= EXT3_FL_USER_MODIFIABLE;
- flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE;
- ei->i_flags = flags;
-
-diff -NurpP --minimal linux-3.18.5/fs/ext3/namei.c linux-3.18.5-vs2.3.7.3/fs/ext3/namei.c
---- linux-3.18.5/fs/ext3/namei.c 2014-06-12 11:34:57.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/ext3/namei.c 2015-01-19 10:57:47.000000000 +0000
-@@ -25,6 +25,8 @@
- */
-
- #include <linux/quotaops.h>
-+#include <linux/vs_tag.h>
-+
- #include "ext3.h"
- #include "namei.h"
- #include "xattr.h"
-@@ -915,6 +917,7 @@ restart:
- submit_bh(READ | REQ_META | REQ_PRIO,
- bh);
- }
-+ dx_propagate_tag(nd, inode);
- }
- }
- if ((bh = bh_use[ra_ptr++]) == NULL)
-@@ -2568,6 +2571,7 @@ const struct inode_operations ext3_dir_i
- .listxattr = ext3_listxattr,
- .removexattr = generic_removexattr,
- #endif
-+ .sync_flags = ext3_sync_flags,
- .get_acl = ext3_get_acl,
- .set_acl = ext3_set_acl,
- };
-diff -NurpP --minimal linux-3.18.5/fs/ext3/super.c linux-3.18.5-vs2.3.7.3/fs/ext3/super.c
---- linux-3.18.5/fs/ext3/super.c 2015-01-17 02:40:17.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/ext3/super.c 2015-01-19 10:57:47.000000000 +0000
-@@ -826,7 +826,8 @@ enum {
- Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
- Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota,
- Opt_noquota, Opt_ignore, Opt_barrier, Opt_nobarrier, Opt_err,
-- Opt_resize, Opt_usrquota, Opt_grpquota
-+ Opt_resize, Opt_usrquota, Opt_grpquota,
-+ Opt_tag, Opt_notag, Opt_tagid
- };
-
- static const match_table_t tokens = {
-@@ -884,6 +885,9 @@ static const match_table_t tokens = {
- {Opt_barrier, "barrier"},
- {Opt_nobarrier, "nobarrier"},
- {Opt_resize, "resize"},
-+ {Opt_tag, "tag"},
-+ {Opt_notag, "notag"},
-+ {Opt_tagid, "tagid=%u"},
- {Opt_err, NULL},
- };
-
-@@ -1056,6 +1060,20 @@ static int parse_options (char *options,
- case Opt_nouid32:
- set_opt (sbi->s_mount_opt, NO_UID32);
- break;
-+#ifndef CONFIG_TAGGING_NONE
-+ case Opt_tag:
-+ set_opt (sbi->s_mount_opt, TAGGED);
-+ break;
-+ case Opt_notag:
-+ clear_opt (sbi->s_mount_opt, TAGGED);
-+ break;
-+#endif
-+#ifdef CONFIG_PROPAGATE
-+ case Opt_tagid:
-+ /* use args[0] */
-+ set_opt (sbi->s_mount_opt, TAGGED);
-+ break;
-+#endif
- case Opt_nocheck:
- clear_opt (sbi->s_mount_opt, CHECK);
- break;
-@@ -1781,6 +1799,9 @@ static int ext3_fill_super (struct super
- NULL, 0))
- goto failed_mount;
-
-+ if (EXT3_SB(sb)->s_mount_opt & EXT3_MOUNT_TAGGED)
-+ sb->s_flags |= MS_TAGGED;
-+
- sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
- (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-
-@@ -2678,6 +2699,14 @@ static int ext3_remount (struct super_bl
- if (test_opt(sb, ABORT))
- ext3_abort(sb, __func__, "Abort forced by user");
-
-+ if ((sbi->s_mount_opt & EXT3_MOUNT_TAGGED) &&
-+ !(sb->s_flags & MS_TAGGED)) {
-+ printk("EXT3-fs: %s: tagging not permitted on remount.\n",
-+ sb->s_id);
-+ err = -EINVAL;
-+ goto restore_opts;
-+ }
-+
- sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
- (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-
-diff -NurpP --minimal linux-3.18.5/fs/ext4/ext4.h linux-3.18.5-vs2.3.7.3/fs/ext4/ext4.h
---- linux-3.18.5/fs/ext4/ext4.h 2015-01-17 02:40:17.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/ext4/ext4.h 2015-01-19 10:57:47.000000000 +0000
-@@ -385,7 +385,10 @@ struct flex_groups {
+diff -NurpP --minimal linux-4.4.110/fs/ext4/ext4.h linux-4.4.110-vs2.3.9/fs/ext4/ext4.h
+--- linux-4.4.110/fs/ext4/ext4.h 2018-01-09 16:35:06.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/ext4/ext4.h 2018-01-09 17:33:10.000000000 +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 */
#define EXT4_EOFBLOCKS_FL 0x00400000 /* Blocks allocated beyond EOF */
+#define EXT4_BARRIER_FL 0x04000000 /* Barrier for chroot() */
+#define EXT4_IXUNLINK_FL 0x08000000 /* Immutable invert on unlink */
#define EXT4_INLINE_DATA_FL 0x10000000 /* Inode has inline data. */
-+#define EXT4_COW_FL 0x20000000 /* Copy on Write marker */
+ #define EXT4_PROJINHERIT_FL 0x20000000 /* Create with parents projid */
++#define EXT4_COW_FL 0x40000000 /* Copy on Write marker */
#define EXT4_RESERVED_FL 0x80000000 /* reserved for ext4 lib */
#define EXT4_FL_USER_VISIBLE 0x004BDFFF /* User visible flags */
-@@ -671,7 +674,7 @@ struct ext4_inode {
+@@ -674,7 +677,7 @@ struct ext4_inode {
__le16 l_i_uid_high; /* these 2 fields */
__le16 l_i_gid_high; /* were reserved2[0] */
__le16 l_i_checksum_lo;/* crc32c(uuid+inum+inode) LE */
} linux2;
struct {
__le16 h_i_reserved1; /* Obsoleted fragment number/size which are removed in ext4 */
-@@ -791,6 +794,7 @@ do { \
+@@ -831,6 +834,7 @@ do { \
#define i_gid_low i_gid
#define i_uid_high osd2.linux2.l_i_uid_high
#define i_gid_high osd2.linux2.l_i_gid_high
#define i_checksum_lo osd2.linux2.l_i_checksum_lo
#elif defined(__GNU__)
-@@ -980,6 +984,7 @@ struct ext4_inode_info {
+@@ -1068,6 +1072,7 @@ struct ext4_inode_info {
#define EXT4_MOUNT_POSIX_ACL 0x08000 /* POSIX Access Control Lists */
#define EXT4_MOUNT_NO_AUTO_DA_ALLOC 0x10000 /* No auto delalloc mapping */
#define EXT4_MOUNT_BARRIER 0x20000 /* Use block barriers */
#define EXT4_MOUNT_QUOTA 0x80000 /* Some quota option set */
#define EXT4_MOUNT_USRQUOTA 0x100000 /* "old" user quota */
#define EXT4_MOUNT_GRPQUOTA 0x200000 /* "old" group quota */
-@@ -2644,6 +2649,7 @@ extern struct buffer_head *ext4_get_firs
- extern int ext4_inline_data_fiemap(struct inode *inode,
- struct fiemap_extent_info *fieinfo,
- int *has_inline);
+@@ -2501,6 +2506,7 @@ extern int ext4_punch_hole(struct inode
+ extern int ext4_truncate_restart_trans(handle_t *, struct inode *, int nblocks);
+ extern void ext4_set_inode_flags(struct inode *);
+ extern void ext4_get_inode_flags(struct ext4_inode_info *);
+extern int ext4_sync_flags(struct inode *, int, int);
- extern int ext4_try_to_evict_inline_data(handle_t *handle,
- struct inode *inode,
- int needed);
-diff -NurpP --minimal linux-3.18.5/fs/ext4/file.c linux-3.18.5-vs2.3.7.3/fs/ext4/file.c
---- linux-3.18.5/fs/ext4/file.c 2015-01-17 02:40:17.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/ext4/file.c 2015-01-19 10:57:47.000000000 +0000
-@@ -610,5 +610,6 @@ const struct inode_operations ext4_file_
+ 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.110/fs/ext4/file.c linux-4.4.110-vs2.3.9/fs/ext4/file.c
+--- linux-4.4.110/fs/ext4/file.c 2018-01-09 16:35:06.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/ext4/file.c 2018-01-09 16:36:31.000000000 +0000
+@@ -749,5 +749,6 @@ const struct inode_operations ext4_file_
.get_acl = ext4_get_acl,
.set_acl = ext4_set_acl,
.fiemap = ext4_fiemap,
+ .sync_flags = ext4_sync_flags,
};
-diff -NurpP --minimal linux-3.18.5/fs/ext4/ialloc.c linux-3.18.5-vs2.3.7.3/fs/ext4/ialloc.c
---- linux-3.18.5/fs/ext4/ialloc.c 2015-01-17 02:40:17.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/ext4/ialloc.c 2015-01-19 10:57:47.000000000 +0000
-@@ -22,6 +22,7 @@
+diff -NurpP --minimal linux-4.4.110/fs/ext4/ialloc.c linux-4.4.110-vs2.3.9/fs/ext4/ialloc.c
+--- linux-4.4.110/fs/ext4/ialloc.c 2018-01-09 16:35:06.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/ext4/ialloc.c 2018-01-09 16:36:31.000000000 +0000
+@@ -21,6 +21,7 @@
#include <linux/random.h>
#include <linux/bitops.h>
#include <linux/blkdev.h>
#include <asm/byteorder.h>
#include "ext4.h"
-@@ -754,6 +755,7 @@ struct inode *__ext4_new_inode(handle_t
+@@ -799,6 +800,7 @@ struct inode *__ext4_new_inode(handle_t
inode->i_mode = mode;
inode->i_uid = current_fsuid();
inode->i_gid = dir->i_gid;
+ i_tag_write(inode, dx_current_fstag(sb));
} else
inode_init_owner(inode, dir, mode);
- dquot_initialize(inode);
-diff -NurpP --minimal linux-3.18.5/fs/ext4/inode.c linux-3.18.5-vs2.3.7.3/fs/ext4/inode.c
---- linux-3.18.5/fs/ext4/inode.c 2015-01-17 02:40:17.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/ext4/inode.c 2015-01-19 12:50:18.000000000 +0000
-@@ -39,6 +39,7 @@
- #include <linux/ratelimit.h>
- #include <linux/aio.h>
+ err = dquot_initialize(inode);
+diff -NurpP --minimal linux-4.4.110/fs/ext4/inode.c linux-4.4.110-vs2.3.9/fs/ext4/inode.c
+--- linux-4.4.110/fs/ext4/inode.c 2018-01-09 16:35:06.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/ext4/inode.c 2018-01-09 16:36:31.000000000 +0000
+@@ -37,6 +37,7 @@
+ #include <linux/printk.h>
+ #include <linux/slab.h>
#include <linux/bitops.h>
+#include <linux/vs_tag.h>
#include "ext4_jbd2.h"
#include "xattr.h"
-@@ -3811,42 +3812,66 @@ void ext4_set_inode_flags(struct inode *
+@@ -4128,12 +4129,15 @@ void ext4_set_inode_flags(struct inode *
unsigned int flags = EXT4_I(inode)->i_flags;
unsigned int new_fl = 0;
if (flags & EXT4_NOATIME_FL)
new_fl |= S_NOATIME;
if (flags & EXT4_DIRSYNC_FL)
- new_fl |= S_DIRSYNC;
+@@ -4141,31 +4145,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,
-- S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC);
-+ S_IXUNLINK | S_IMMUTABLE |
+- S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC|S_DAX);
++ S_IXUNLINK | S_IMMUTABLE | S_DAX |
+ S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC);
+
+ new_fl = 0;
} while (cmpxchg(&ei->i_flags, old_fl, new_fl) != old_fl);
}
-@@ -3950,8 +3975,10 @@ struct inode *ext4_iget(struct super_blo
+@@ -4269,8 +4294,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;
}
set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
ext4_clear_state_flags(ei); /* Only relevant on 32-bit archs */
-@@ -4191,8 +4218,10 @@ static int ext4_do_update_inode(handle_t
+@@ -4583,8 +4610,10 @@ static int ext4_do_update_inode(handle_t
ext4_get_inode_flags(ei);
raw_inode->i_mode = cpu_to_le16(inode->i_mode);
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));
-@@ -4215,6 +4244,9 @@ static int ext4_do_update_inode(handle_t
+@@ -4607,6 +4636,9 @@ static int ext4_do_update_inode(handle_t
raw_inode->i_uid_high = 0;
raw_inode->i_gid_high = 0;
}
raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
EXT4_INODE_SET_XTIME(i_ctime, inode, raw_inode);
-@@ -4458,7 +4490,8 @@ int ext4_setattr(struct dentry *dentry,
- if (is_quota_modification(inode, attr))
- dquot_initialize(inode);
+@@ -4852,7 +4884,8 @@ int ext4_setattr(struct dentry *dentry,
+ return error;
+ }
if ((ia_valid & ATTR_UID && !uid_eq(attr->ia_uid, inode->i_uid)) ||
- (ia_valid & ATTR_GID && !gid_eq(attr->ia_gid, inode->i_gid))) {
+ (ia_valid & ATTR_GID && !gid_eq(attr->ia_gid, inode->i_gid)) ||
handle_t *handle;
/* (user+group)*(old+new) structure, inode write (sb,
-@@ -4481,6 +4514,8 @@ int ext4_setattr(struct dentry *dentry,
+@@ -4875,6 +4908,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;
error = ext4_mark_inode_dirty(handle, inode);
ext4_journal_stop(handle);
}
-diff -NurpP --minimal linux-3.18.5/fs/ext4/ioctl.c linux-3.18.5-vs2.3.7.3/fs/ext4/ioctl.c
---- linux-3.18.5/fs/ext4/ioctl.c 2015-01-17 02:40:17.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/ext4/ioctl.c 2015-01-19 10:57:47.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/fs/ext4/ioctl.c linux-4.4.110-vs2.3.9/fs/ext4/ioctl.c
+--- linux-4.4.110/fs/ext4/ioctl.c 2018-01-09 16:35:06.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/ext4/ioctl.c 2018-01-09 16:36:31.000000000 +0000
@@ -14,6 +14,7 @@
- #include <linux/compat.h>
#include <linux/mount.h>
#include <linux/file.h>
+ #include <linux/random.h>
+#include <linux/vs_tag.h>
#include <asm/uaccess.h>
#include "ext4_jbd2.h"
#include "ext4.h"
-@@ -198,6 +199,33 @@ journal_err_out:
- return err;
+@@ -202,6 +203,33 @@ static int uuid_is_zero(__u8 u[16])
+ return 1;
}
+int ext4_sync_flags(struct inode *inode, int flags, int vflags)
long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
struct inode *inode = file_inode(filp);
-@@ -231,6 +259,11 @@ long ext4_ioctl(struct file *filp, unsig
+@@ -235,6 +263,11 @@ long ext4_ioctl(struct file *filp, unsig
flags = ext4_mask_flags(inode->i_mode, flags);
err = -EPERM;
mutex_lock(&inode->i_mutex);
/* Is it quota file? Do not allow user to mess with it */
-@@ -248,7 +281,9 @@ long ext4_ioctl(struct file *filp, unsig
+@@ -252,7 +285,9 @@ long ext4_ioctl(struct file *filp, unsig
*
* This test looks nicer. Thanks to Pauline Middelink
*/
if (!capable(CAP_LINUX_IMMUTABLE))
goto flags_out;
}
-diff -NurpP --minimal linux-3.18.5/fs/ext4/namei.c linux-3.18.5-vs2.3.7.3/fs/ext4/namei.c
---- linux-3.18.5/fs/ext4/namei.c 2015-01-17 02:40:17.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/ext4/namei.c 2015-01-19 10:57:47.000000000 +0000
-@@ -34,6 +34,7 @@
+diff -NurpP --minimal linux-4.4.110/fs/ext4/namei.c linux-4.4.110-vs2.3.9/fs/ext4/namei.c
+--- linux-4.4.110/fs/ext4/namei.c 2018-01-09 16:35:06.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/ext4/namei.c 2018-01-09 16:36:31.000000000 +0000
+@@ -33,6 +33,7 @@
#include <linux/quotaops.h>
#include <linux/buffer_head.h>
#include <linux/bio.h>
#include "ext4.h"
#include "ext4_jbd2.h"
-@@ -1279,6 +1280,7 @@ restart:
+@@ -1444,6 +1445,7 @@ restart:
ll_rw_block(READ | REQ_META | REQ_PRIO,
1, &bh);
}
}
if ((bh = bh_use[ra_ptr++]) == NULL)
goto next;
-@@ -3539,6 +3541,7 @@ const struct inode_operations ext4_dir_i
+@@ -3881,6 +3883,7 @@ const struct inode_operations ext4_dir_i
.get_acl = ext4_get_acl,
.set_acl = ext4_set_acl,
.fiemap = ext4_fiemap,
};
const struct inode_operations ext4_special_inode_operations = {
-diff -NurpP --minimal linux-3.18.5/fs/ext4/super.c linux-3.18.5-vs2.3.7.3/fs/ext4/super.c
---- linux-3.18.5/fs/ext4/super.c 2015-01-17 02:40:17.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/ext4/super.c 2015-01-19 10:57:47.000000000 +0000
-@@ -1146,7 +1146,7 @@ enum {
- Opt_inode_readahead_blks, Opt_journal_ioprio,
+diff -NurpP --minimal linux-4.4.110/fs/ext4/super.c linux-4.4.110-vs2.3.9/fs/ext4/super.c
+--- linux-4.4.110/fs/ext4/super.c 2018-01-09 16:35:06.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/ext4/super.c 2018-01-09 16:36:32.000000000 +0000
+@@ -1165,6 +1165,7 @@ enum {
Opt_dioread_nolock, Opt_dioread_lock,
Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable,
-- Opt_max_dir_size_kb,
-+ Opt_max_dir_size_kb, Opt_tag, Opt_notag, Opt_tagid
+ Opt_max_dir_size_kb, Opt_nojournal_checksum,
++ Opt_tag, Opt_notag, Opt_tagid
};
static const match_table_t tokens = {
-@@ -1227,6 +1227,9 @@ static const match_table_t tokens = {
+@@ -1250,6 +1251,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 */
{Opt_err, NULL},
};
-@@ -1459,6 +1462,20 @@ static int handle_mount_opt(struct super
- case Opt_i_version:
- sb->s_flags |= MS_I_VERSION;
+@@ -1492,6 +1496,20 @@ static int handle_mount_opt(struct super
+ case Opt_nolazytime:
+ sb->s_flags &= ~MS_LAZYTIME;
return 1;
+#ifndef CONFIG_TAGGING_NONE
+ case Opt_tag:
}
for (m = ext4_mount_opts; m->token != Opt_err; m++)
-@@ -3600,6 +3617,9 @@ static int ext4_fill_super(struct super_
- clear_opt(sb, DELALLOC);
+@@ -3379,6 +3397,9 @@ static int ext4_fill_super(struct super_
+ sb->s_iflags |= SB_I_CGROUPWB;
}
+ if (EXT4_SB(sb)->s_mount_opt & EXT4_MOUNT_TAGGED)
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-@@ -4872,6 +4892,14 @@ static int ext4_remount(struct super_blo
+@@ -4727,6 +4748,14 @@ static int ext4_remount(struct super_blo
if (sbi->s_mount_flags & EXT4_MF_FS_ABORTED)
ext4_abort(sb, "Abort forced by user");
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-3.18.5/fs/fcntl.c linux-3.18.5-vs2.3.7.3/fs/fcntl.c
---- linux-3.18.5/fs/fcntl.c 2015-01-17 02:40:17.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/fcntl.c 2015-01-19 11:48:08.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/fs/fcntl.c linux-4.4.110-vs2.3.9/fs/fcntl.c
+--- linux-4.4.110/fs/fcntl.c 2018-01-09 16:35:06.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/fcntl.c 2018-01-09 16:36:32.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/pid_namespace.h>
#include <linux/user_namespace.h>
if (unlikely(f.file->f_mode & FMODE_PATH)) {
if (!check_fcntl_cmd(cmd))
-diff -NurpP --minimal linux-3.18.5/fs/file.c linux-3.18.5-vs2.3.7.3/fs/file.c
---- linux-3.18.5/fs/file.c 2015-01-17 02:40:17.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/file.c 2015-01-19 10:57:47.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/fs/file.c linux-4.4.110-vs2.3.9/fs/file.c
+--- linux-4.4.110/fs/file.c 2016-07-05 04:15:07.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/file.c 2018-01-09 16:36:32.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/spinlock.h>
#include <linux/rcupdate.h>
int sysctl_nr_open __read_mostly = 1024*1024;
int sysctl_nr_open_min = BITS_PER_LONG;
-@@ -309,6 +310,8 @@ struct files_struct *dup_fd(struct files
+@@ -356,6 +357,8 @@ struct files_struct *dup_fd(struct files
struct file *f = *old_fds++;
if (f) {
get_file(f);
} else {
/*
* The fd may be claimed in the fd bitmap but not yet
-@@ -369,9 +372,11 @@ static struct fdtable *close_files(struc
+@@ -405,9 +408,11 @@ static struct fdtable *close_files(struc
filp_close(file, files);
cond_resched_rcu_qs();
}
}
}
-@@ -487,6 +492,7 @@ repeat:
+@@ -538,6 +543,7 @@ repeat:
else
__clear_close_on_exec(fd, fdt);
error = fd;
#if 1
/* Sanity check */
if (rcu_access_pointer(fdt->fd[fd]) != NULL) {
-@@ -517,6 +523,7 @@ static void __put_unused_fd(struct files
+@@ -568,6 +574,7 @@ static void __put_unused_fd(struct files
__clear_open_fd(fd, fdt);
if (fd < files->next_fd)
files->next_fd = fd;
}
void put_unused_fd(unsigned int fd)
-@@ -784,6 +791,8 @@ __releases(&files->file_lock)
+@@ -850,6 +857,8 @@ __releases(&files->file_lock)
if (tofree)
filp_close(tofree, files);
return fd;
-diff -NurpP --minimal linux-3.18.5/fs/file_table.c linux-3.18.5-vs2.3.7.3/fs/file_table.c
---- linux-3.18.5/fs/file_table.c 2015-01-17 02:40:17.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/file_table.c 2015-01-19 12:36:42.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/fs/file_table.c linux-4.4.110-vs2.3.9/fs/file_table.c
+--- linux-4.4.110/fs/file_table.c 2015-10-29 09:21:35.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/file_table.c 2018-01-09 17:25:51.000000000 +0000
@@ -26,6 +26,8 @@
- #include <linux/hardirq.h>
#include <linux/task_work.h>
#include <linux/ima.h>
+ #include <linux/swap.h>
+#include <linux/vs_limit.h>
+#include <linux/vs_context.h>
file_free(file);
}
}
-diff -NurpP --minimal linux-3.18.5/fs/fs_struct.c linux-3.18.5-vs2.3.7.3/fs/fs_struct.c
---- linux-3.18.5/fs/fs_struct.c 2014-01-22 20:39:06.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/fs_struct.c 2015-01-19 10:57:47.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/fs/fs_struct.c linux-4.4.110-vs2.3.9/fs/fs_struct.c
+--- linux-4.4.110/fs/fs_struct.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/fs_struct.c 2018-01-09 16:36:32.000000000 +0000
@@ -4,6 +4,7 @@
#include <linux/path.h>
#include <linux/slab.h>
}
return fs;
}
-diff -NurpP --minimal linux-3.18.5/fs/gfs2/file.c linux-3.18.5-vs2.3.7.3/fs/gfs2/file.c
---- linux-3.18.5/fs/gfs2/file.c 2015-01-17 02:40:17.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/gfs2/file.c 2015-01-19 10:57:47.000000000 +0000
-@@ -138,6 +138,9 @@ static const u32 fsflags_to_gfs2[32] = {
+diff -NurpP --minimal linux-4.4.110/fs/gfs2/file.c linux-4.4.110-vs2.3.9/fs/gfs2/file.c
+--- linux-4.4.110/fs/gfs2/file.c 2018-01-09 16:35:06.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/gfs2/file.c 2018-01-09 17:23:53.000000000 +0000
+@@ -137,6 +137,9 @@ static const u32 fsflags_to_gfs2[32] = {
[12] = GFS2_DIF_EXHASH,
[14] = GFS2_DIF_INHERIT_JDATA,
[17] = GFS2_DIF_TOPDIR,
};
static const u32 gfs2_to_fsflags[32] = {
-@@ -148,6 +151,9 @@ static const u32 gfs2_to_fsflags[32] = {
+@@ -147,6 +150,9 @@ static const u32 gfs2_to_fsflags[32] = {
[gfs2fl_ExHash] = FS_INDEX_FL,
[gfs2fl_TopLevel] = FS_TOPDIR_FL,
[gfs2fl_InheritJdata] = FS_JOURNAL_DATA_FL,
};
static int gfs2_get_flags(struct file *filp, u32 __user *ptr)
-@@ -178,12 +184,18 @@ void gfs2_set_inode_flags(struct inode *
+@@ -177,12 +183,17 @@ void gfs2_set_inode_flags(struct inode *
{
struct gfs2_inode *ip = GFS2_I(inode);
unsigned int flags = inode->i_flags;
+ unsigned int vflags = inode->i_vflags;
-+
-+ flags &= ~(S_IMMUTABLE | S_IXUNLINK |
-+ S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC | S_NOSEC);
- flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC|S_NOSEC);
++ flags &= ~(S_IMMUTABLE | S_IXUNLINK |
++ S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC | S_NOSEC);
++
if ((ip->i_eattr == 0) && !is_sxid(inode->i_mode))
- inode->i_flags |= S_NOSEC;
+ flags |= S_NOSEC;
if (ip->i_diskflags & GFS2_DIF_IMMUTABLE)
flags |= S_IMMUTABLE;
+ if (ip->i_diskflags & GFS2_DIF_IXUNLINK)
+ flags |= S_IXUNLINK;
-+
if (ip->i_diskflags & GFS2_DIF_APPENDONLY)
flags |= S_APPEND;
if (ip->i_diskflags & GFS2_DIF_NOATIME)
-@@ -191,6 +203,43 @@ void gfs2_set_inode_flags(struct inode *
+@@ -190,6 +201,43 @@ void gfs2_set_inode_flags(struct inode *
if (ip->i_diskflags & GFS2_DIF_SYNC)
flags |= S_SYNC;
inode->i_flags = flags;
}
/* Flags that can be set by user space */
-@@ -304,6 +353,37 @@ static int gfs2_set_flags(struct file *f
+@@ -305,6 +353,37 @@ static int gfs2_set_flags(struct file *f
return do_gfs2_set_flags(filp, gfsflags, ~GFS2_DIF_JDATA);
}
static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
switch(cmd) {
-diff -NurpP --minimal linux-3.18.5/fs/gfs2/inode.h linux-3.18.5-vs2.3.7.3/fs/gfs2/inode.h
---- linux-3.18.5/fs/gfs2/inode.h 2013-11-25 15:45:01.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/gfs2/inode.h 2015-01-19 10:57:47.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/fs/gfs2/inode.h linux-4.4.110-vs2.3.9/fs/gfs2/inode.h
+--- linux-4.4.110/fs/gfs2/inode.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/gfs2/inode.h 2018-01-09 16:36:32.000000000 +0000
@@ -118,6 +118,7 @@ extern const struct file_operations gfs2
extern const struct file_operations gfs2_dir_fops_nolock;
#ifdef CONFIG_GFS2_FS_LOCKING_DLM
extern const struct file_operations gfs2_file_fops;
-diff -NurpP --minimal linux-3.18.5/fs/hostfs/hostfs.h linux-3.18.5-vs2.3.7.3/fs/hostfs/hostfs.h
---- linux-3.18.5/fs/hostfs/hostfs.h 2015-01-16 22:19:18.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/hostfs/hostfs.h 2015-01-19 10:57:47.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/fs/hostfs/hostfs.h linux-4.4.110-vs2.3.9/fs/hostfs/hostfs.h
+--- linux-4.4.110/fs/hostfs/hostfs.h 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/hostfs/hostfs.h 2018-01-09 16:36:32.000000000 +0000
@@ -42,6 +42,7 @@ struct hostfs_iattr {
unsigned short ia_mode;
uid_t ia_uid;
loff_t ia_size;
struct timespec ia_atime;
struct timespec ia_mtime;
-diff -NurpP --minimal linux-3.18.5/fs/inode.c linux-3.18.5-vs2.3.7.3/fs/inode.c
---- linux-3.18.5/fs/inode.c 2015-01-16 22:19:18.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/inode.c 2015-01-19 10:57:47.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/fs/inode.c linux-4.4.110-vs2.3.9/fs/inode.c
+--- linux-4.4.110/fs/inode.c 2018-01-09 16:35:06.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/inode.c 2018-01-09 16:36:32.000000000 +0000
@@ -18,6 +18,7 @@
#include <linux/buffer_head.h> /* for inode_has_buffers */
#include <linux/ratelimit.h>
#include <linux/list_lru.h>
+#include <linux/vs_tag.h>
+ #include <trace/events/writeback.h>
#include "internal.h"
- /*
-@@ -129,6 +130,8 @@ int inode_init_always(struct super_block
+@@ -133,6 +134,8 @@ int inode_init_always(struct super_block
struct address_space *const mapping = &inode->i_data;
inode->i_sb = sb;
inode->i_blkbits = sb->s_blocksize_bits;
inode->i_flags = 0;
atomic_set(&inode->i_count, 1);
-@@ -138,6 +141,7 @@ int inode_init_always(struct super_block
+@@ -142,6 +145,7 @@ int inode_init_always(struct super_block
inode->i_opflags = 0;
i_uid_write(inode, 0);
i_gid_write(inode, 0);
atomic_set(&inode->i_writecount, 0);
inode->i_size = 0;
inode->i_blocks = 0;
-@@ -150,6 +154,7 @@ int inode_init_always(struct super_block
- inode->i_bdev = NULL;
+@@ -152,6 +156,7 @@ int inode_init_always(struct super_block
inode->i_cdev = NULL;
+ inode->i_link = NULL;
inode->i_rdev = 0;
+ inode->i_mdev = 0;
inode->dirtied_when = 0;
if (security_inode_alloc(inode))
-@@ -478,6 +483,8 @@ void __insert_inode_hash(struct inode *i
+@@ -469,6 +474,8 @@ void __insert_inode_hash(struct inode *i
}
EXPORT_SYMBOL(__insert_inode_hash);
/**
* __remove_inode_hash - remove an inode from the hash
* @inode: inode to unhash
-@@ -1795,9 +1802,11 @@ void init_special_inode(struct inode *in
+@@ -1911,9 +1918,11 @@ void init_special_inode(struct inode *in
if (S_ISCHR(mode)) {
inode->i_fop = &def_chr_fops;
inode->i_rdev = rdev;
} else if (S_ISFIFO(mode))
inode->i_fop = &pipefifo_fops;
else if (S_ISSOCK(mode))
-@@ -1826,6 +1835,7 @@ void inode_init_owner(struct inode *inod
+@@ -1942,6 +1951,7 @@ void inode_init_owner(struct inode *inod
} else
inode->i_gid = current_fsgid();
inode->i_mode = mode;
}
EXPORT_SYMBOL(inode_init_owner);
-diff -NurpP --minimal linux-3.18.5/fs/ioctl.c linux-3.18.5-vs2.3.7.3/fs/ioctl.c
---- linux-3.18.5/fs/ioctl.c 2014-01-22 20:39:06.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/ioctl.c 2015-01-19 10:57:47.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/fs/ioctl.c linux-4.4.110-vs2.3.9/fs/ioctl.c
+--- linux-4.4.110/fs/ioctl.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/ioctl.c 2018-01-09 16:36:32.000000000 +0000
@@ -15,6 +15,9 @@
#include <linux/writeback.h>
#include <linux/buffer_head.h>
#include <asm/ioctls.h>
-diff -NurpP --minimal linux-3.18.5/fs/jfs/file.c linux-3.18.5-vs2.3.7.3/fs/jfs/file.c
---- linux-3.18.5/fs/jfs/file.c 2014-09-03 13:19:40.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/jfs/file.c 2015-01-19 10:58:03.000000000 +0000
-@@ -110,7 +110,8 @@ int jfs_setattr(struct dentry *dentry, s
- if (is_quota_modification(inode, iattr))
- dquot_initialize(inode);
+diff -NurpP --minimal linux-4.4.110/fs/jfs/file.c linux-4.4.110-vs2.3.9/fs/jfs/file.c
+--- linux-4.4.110/fs/jfs/file.c 2016-07-05 04:12:33.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/jfs/file.c 2018-01-09 16:36:32.000000000 +0000
+@@ -113,7 +113,8 @@ int jfs_setattr(struct dentry *dentry, s
+ return rc;
+ }
if ((iattr->ia_valid & ATTR_UID && !uid_eq(iattr->ia_uid, inode->i_uid)) ||
- (iattr->ia_valid & ATTR_GID && !gid_eq(iattr->ia_gid, inode->i_gid))) {
+ (iattr->ia_valid & ATTR_GID && !gid_eq(iattr->ia_gid, inode->i_gid)) ||
rc = dquot_transfer(inode, iattr);
if (rc)
return rc;
-@@ -146,6 +147,7 @@ const struct inode_operations jfs_file_i
+@@ -149,6 +150,7 @@ const struct inode_operations jfs_file_i
.get_acl = jfs_get_acl,
.set_acl = jfs_set_acl,
#endif
};
const struct file_operations jfs_file_operations = {
-diff -NurpP --minimal linux-3.18.5/fs/jfs/ioctl.c linux-3.18.5-vs2.3.7.3/fs/jfs/ioctl.c
---- linux-3.18.5/fs/jfs/ioctl.c 2013-05-31 13:45:24.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/jfs/ioctl.c 2015-01-19 10:58:03.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/fs/jfs/ioctl.c linux-4.4.110-vs2.3.9/fs/jfs/ioctl.c
+--- linux-4.4.110/fs/jfs/ioctl.c 2015-10-29 09:21:36.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/jfs/ioctl.c 2018-01-09 16:36:32.000000000 +0000
@@ -12,6 +12,7 @@
#include <linux/time.h>
#include <linux/sched.h>
flags |= oldflags & ~JFS_FL_USER_MODIFIABLE;
jfs_inode->mode2 = flags;
-diff -NurpP --minimal linux-3.18.5/fs/jfs/jfs_dinode.h linux-3.18.5-vs2.3.7.3/fs/jfs/jfs_dinode.h
---- linux-3.18.5/fs/jfs/jfs_dinode.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/jfs/jfs_dinode.h 2015-01-19 10:58:03.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/fs/jfs/jfs_dinode.h linux-4.4.110-vs2.3.9/fs/jfs/jfs_dinode.h
+--- linux-4.4.110/fs/jfs/jfs_dinode.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/jfs/jfs_dinode.h 2018-01-09 16:36:32.000000000 +0000
@@ -161,9 +161,13 @@ struct dinode {
#define JFS_APPEND_FL 0x01000000 /* writes to file may only append */
#define JFS_FL_INHERIT 0x03C80000
/* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */
-diff -NurpP --minimal linux-3.18.5/fs/jfs/jfs_filsys.h linux-3.18.5-vs2.3.7.3/fs/jfs/jfs_filsys.h
---- linux-3.18.5/fs/jfs/jfs_filsys.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/jfs/jfs_filsys.h 2015-01-19 10:58:03.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/fs/jfs/jfs_filsys.h linux-4.4.110-vs2.3.9/fs/jfs/jfs_filsys.h
+--- linux-4.4.110/fs/jfs/jfs_filsys.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/jfs/jfs_filsys.h 2018-01-09 16:36:32.000000000 +0000
@@ -266,6 +266,7 @@
#define JFS_NAME_MAX 255
#define JFS_PATH_MAX BPSIZE
/*
* file system state (superblock state)
-diff -NurpP --minimal linux-3.18.5/fs/jfs/jfs_imap.c linux-3.18.5-vs2.3.7.3/fs/jfs/jfs_imap.c
---- linux-3.18.5/fs/jfs/jfs_imap.c 2013-11-25 15:45:01.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/jfs/jfs_imap.c 2015-01-19 10:58:03.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/fs/jfs/jfs_imap.c linux-4.4.110-vs2.3.9/fs/jfs/jfs_imap.c
+--- linux-4.4.110/fs/jfs/jfs_imap.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/jfs/jfs_imap.c 2018-01-09 16:36:32.000000000 +0000
@@ -46,6 +46,7 @@
#include <linux/pagemap.h>
#include <linux/quotaops.h>
jfs_get_inode_flags(jfs_ip);
/*
* mode2 is only needed for storing the higher order bits.
-diff -NurpP --minimal linux-3.18.5/fs/jfs/jfs_inode.c linux-3.18.5-vs2.3.7.3/fs/jfs/jfs_inode.c
---- linux-3.18.5/fs/jfs/jfs_inode.c 2014-09-03 13:19:40.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/jfs/jfs_inode.c 2015-01-21 09:53:08.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/fs/jfs/jfs_inode.c linux-4.4.110-vs2.3.9/fs/jfs/jfs_inode.c
+--- linux-4.4.110/fs/jfs/jfs_inode.c 2016-07-05 04:12:33.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/jfs/jfs_inode.c 2018-01-09 16:36:32.000000000 +0000
@@ -18,6 +18,7 @@
#include <linux/fs.h>
}
/*
-diff -NurpP --minimal linux-3.18.5/fs/jfs/jfs_inode.h linux-3.18.5-vs2.3.7.3/fs/jfs/jfs_inode.h
---- linux-3.18.5/fs/jfs/jfs_inode.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/jfs/jfs_inode.h 2015-01-19 10:58:03.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/fs/jfs/jfs_inode.h linux-4.4.110-vs2.3.9/fs/jfs/jfs_inode.h
+--- linux-4.4.110/fs/jfs/jfs_inode.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/jfs/jfs_inode.h 2018-01-09 16:36:32.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);
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-3.18.5/fs/jfs/namei.c linux-3.18.5-vs2.3.7.3/fs/jfs/namei.c
---- linux-3.18.5/fs/jfs/namei.c 2014-06-12 11:34:58.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/jfs/namei.c 2015-01-19 10:58:03.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/fs/jfs/namei.c linux-4.4.110-vs2.3.9/fs/jfs/namei.c
+--- linux-4.4.110/fs/jfs/namei.c 2016-07-05 04:15:08.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/jfs/namei.c 2018-01-09 16:36:32.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/ctype.h>
#include <linux/quotaops.h>
#include "jfs_incore.h"
#include "jfs_superblock.h"
#include "jfs_inode.h"
-@@ -1461,6 +1462,7 @@ static struct dentry *jfs_lookup(struct
+@@ -1480,6 +1481,7 @@ static struct dentry *jfs_lookup(struct
jfs_err("jfs_lookup: iget failed on inum %d", (uint)inum);
}
return d_splice_alias(ip, dentry);
}
-@@ -1526,6 +1528,7 @@ const struct inode_operations jfs_dir_in
+@@ -1545,6 +1547,7 @@ const struct inode_operations jfs_dir_in
.get_acl = jfs_get_acl,
.set_acl = jfs_set_acl,
#endif
};
const struct file_operations jfs_dir_operations = {
-diff -NurpP --minimal linux-3.18.5/fs/jfs/super.c linux-3.18.5-vs2.3.7.3/fs/jfs/super.c
---- linux-3.18.5/fs/jfs/super.c 2015-01-17 02:40:19.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/jfs/super.c 2015-01-19 10:58:03.000000000 +0000
-@@ -203,7 +203,8 @@ enum {
+diff -NurpP --minimal linux-4.4.110/fs/jfs/super.c linux-4.4.110-vs2.3.9/fs/jfs/super.c
+--- linux-4.4.110/fs/jfs/super.c 2018-01-09 16:35:06.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/jfs/super.c 2018-01-09 16:36:32.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,
Opt_usrquota, Opt_grpquota, Opt_uid, Opt_gid, Opt_umask,
};
static const match_table_t tokens = {
-@@ -213,6 +214,10 @@ static const match_table_t tokens = {
+@@ -216,6 +217,10 @@ static const match_table_t tokens = {
{Opt_resize, "resize=%u"},
{Opt_resize_nosize, "resize"},
{Opt_errors, "errors=%s"},
{Opt_ignore, "noquota"},
{Opt_ignore, "quota"},
{Opt_usrquota, "usrquota"},
-@@ -402,7 +407,20 @@ static int parse_options(char *options,
+@@ -405,7 +410,20 @@ static int parse_options(char *options,
pr_err("JFS: discard option not supported on device\n");
break;
}
default:
printk("jfs: Unrecognized mount option \"%s\" or missing value\n",
p);
-@@ -434,6 +452,12 @@ static int jfs_remount(struct super_bloc
+@@ -437,6 +455,12 @@ static int jfs_remount(struct super_bloc
if (!parse_options(data, sb, &newLVSize, &flag))
return -EINVAL;
if (newLVSize) {
pr_err("resize option for remount only\n");
-diff -NurpP --minimal linux-3.18.5/fs/libfs.c linux-3.18.5-vs2.3.7.3/fs/libfs.c
---- linux-3.18.5/fs/libfs.c 2015-02-05 18:02:45.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/libfs.c 2015-01-22 07:27:38.000000000 +0000
-@@ -146,13 +146,14 @@ static inline unsigned char dt_type(stru
+diff -NurpP --minimal linux-4.4.110/fs/libfs.c linux-4.4.110-vs2.3.9/fs/libfs.c
+--- linux-4.4.110/fs/libfs.c 2016-07-05 04:12:33.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/libfs.c 2018-01-09 16:36:32.000000000 +0000
+@@ -141,13 +141,14 @@ static inline unsigned char dt_type(stru
* both impossible due to the lock on directory.
*/
return 0;
spin_lock(&dentry->d_lock);
if (ctx->pos == 2)
-@@ -160,6 +161,8 @@ int dcache_readdir(struct file *file, st
+@@ -155,6 +156,8 @@ int dcache_readdir(struct file *file, st
for (p = q->next; p != &dentry->d_subdirs; p = p->next) {
struct dentry *next = list_entry(p, struct dentry, d_child);
spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
if (!simple_positive(next)) {
spin_unlock(&next->d_lock);
-@@ -182,8 +185,22 @@ int dcache_readdir(struct file *file, st
+@@ -177,8 +180,22 @@ int dcache_readdir(struct file *file, st
spin_unlock(&dentry->d_lock);
return 0;
}
ssize_t generic_read_dir(struct file *filp, char __user *buf, size_t siz, loff_t *ppos)
{
return -EISDIR;
-diff -NurpP --minimal linux-3.18.5/fs/locks.c linux-3.18.5-vs2.3.7.3/fs/locks.c
---- linux-3.18.5/fs/locks.c 2015-02-05 18:02:45.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/locks.c 2015-01-28 11:48:02.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/fs/locks.c linux-4.4.110-vs2.3.9/fs/locks.c
+--- linux-4.4.110/fs/locks.c 2018-01-09 16:35:06.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/locks.c 2018-01-09 16:36:32.000000000 +0000
@@ -129,6 +129,8 @@
#include <linux/hashtable.h>
#include <linux/percpu.h>
#define CREATE_TRACE_POINTS
#include <trace/events/filelock.h>
-@@ -214,11 +216,17 @@ static void locks_init_lock_heads(struct
+@@ -255,11 +257,15 @@ static void locks_init_lock_heads(struct
/* Allocate an empty lock structure. */
struct file_lock *locks_alloc_lock(void)
{
- if (fl)
- locks_init_lock_heads(fl);
-+ if (!vx_locks_avail(1))
-+ return NULL;
-
+ fl = kmem_cache_zalloc(filelock_cache, GFP_KERNEL);
-+
+
+ if (fl) {
+ locks_init_lock_heads(fl);
++ vx_locks_inc(fl);
+ fl->fl_xid = -1;
+ }
return fl;
}
EXPORT_SYMBOL_GPL(locks_alloc_lock);
-@@ -246,6 +254,7 @@ void locks_free_lock(struct file_lock *f
- BUG_ON(!list_empty(&fl->fl_block));
- BUG_ON(!hlist_unhashed(&fl->fl_link));
-
-+ vx_locks_dec(fl);
- locks_release_private(fl);
- kmem_cache_free(filelock_cache, fl);
- }
-@@ -267,6 +276,7 @@ void locks_init_lock(struct file_lock *f
+@@ -311,6 +317,7 @@ void locks_init_lock(struct file_lock *f
{
memset(fl, 0, sizeof(struct file_lock));
locks_init_lock_heads(fl);
}
EXPORT_SYMBOL(locks_init_lock);
-@@ -284,6 +294,7 @@ void locks_copy_conflock(struct file_loc
+@@ -328,6 +335,7 @@ void locks_copy_conflock(struct file_loc
new->fl_start = fl->fl_start;
new->fl_end = fl->fl_end;
new->fl_lmops = fl->fl_lmops;
new->fl_ops = NULL;
if (fl->fl_lmops) {
-@@ -345,6 +356,11 @@ flock_make_lock(struct file *filp, unsig
+@@ -389,7 +397,10 @@ flock_make_lock(struct file *filp, unsig
fl->fl_flags = FL_FLOCK;
fl->fl_type = type;
fl->fl_end = OFFSET_MAX;
+-
+
+ vxd_assert(filp->f_xid == vx_current_xid(),
+ "f_xid(%d) == current(%d)", filp->f_xid, vx_current_xid());
+ fl->fl_xid = filp->f_xid;
-+ vx_locks_inc(fl);
-
return fl;
}
-@@ -467,6 +483,7 @@ static int lease_init(struct file *filp,
+
+@@ -511,6 +522,7 @@ static int lease_init(struct file *filp,
fl->fl_owner = filp;
fl->fl_pid = current->tgid;
fl->fl_file = filp;
fl->fl_flags = FL_LEASE;
-@@ -486,6 +503,11 @@ static struct file_lock *lease_alloc(str
+@@ -530,6 +542,10 @@ static struct file_lock *lease_alloc(str
if (fl == NULL)
return ERR_PTR(error);
+ if (filp)
+ vxd_assert(filp->f_xid == fl->fl_xid,
+ "f_xid(%d) == fl_xid(%d)", filp->f_xid, fl->fl_xid);
-+ vx_locks_inc(fl);
error = lease_init(filp, type, fl);
if (error) {
locks_free_lock(fl);
-@@ -892,6 +914,7 @@ static int flock_lock_file(struct file *
- spin_lock(&inode->i_lock);
+@@ -908,6 +924,7 @@ static int flock_lock_inode(struct inode
+ goto out;
}
+ new_fl->fl_xid = -1;
find_conflict:
- for_each_lock(inode, before) {
- struct file_lock *fl = *before;
-@@ -912,6 +935,7 @@ find_conflict:
- goto out;
- locks_copy_lock(new_fl, request);
- locks_insert_lock(before, new_fl);
-+ vx_locks_inc(new_fl);
- new_fl = NULL;
- error = 0;
-
-@@ -923,7 +947,8 @@ out:
+ list_for_each_entry(fl, &ctx->flc_flock, fl_list) {
+ if (!flock_locks_conflict(request, fl))
+@@ -934,7 +951,8 @@ out:
return error;
}
+static int __posix_lock_file(struct inode *inode, struct file_lock *request,
+ struct file_lock *conflock, vxid_t xid)
{
- struct file_lock *fl;
+ struct file_lock *fl, *tmp;
struct file_lock *new_fl = NULL;
-@@ -935,6 +960,8 @@ static int __posix_lock_file(struct inod
- bool added = false;
- LIST_HEAD(dispose);
+@@ -950,6 +968,9 @@ static int __posix_lock_file(struct inod
+ if (!ctx)
+ return (request->fl_type == F_UNLCK) ? 0 : -ENOMEM;
-+ vxd_assert(xid == vx_current_xid(),
-+ "xid(%d) == current(%d)", xid, vx_current_xid());
++ if (xid)
++ vxd_assert(xid == vx_current_xid(),
++ "xid(%d) == current(%d)", xid, vx_current_xid());
/*
* We may need two file_lock structures for this operation,
* so we get them in advance to avoid races.
-@@ -945,7 +972,11 @@ static int __posix_lock_file(struct inod
+@@ -960,7 +981,11 @@ static int __posix_lock_file(struct inod
(request->fl_type != F_UNLCK ||
request->fl_start != 0 || request->fl_end != OFFSET_MAX)) {
new_fl = locks_alloc_lock();
+ new_fl->fl_xid = xid;
-+ vx_locks_inc(new_fl);
++ // vx_locks_inc(new_fl);
new_fl2 = locks_alloc_lock();
+ new_fl2->fl_xid = xid;
-+ vx_locks_inc(new_fl2);
++ // vx_locks_inc(new_fl2);
}
- spin_lock(&inode->i_lock);
-@@ -1158,7 +1189,8 @@ static int __posix_lock_file(struct inod
+ spin_lock(&ctx->flc_lock);
+@@ -1162,7 +1187,8 @@ static int __posix_lock_file(struct inod
int posix_lock_file(struct file *filp, struct file_lock *fl,
struct file_lock *conflock)
{
}
EXPORT_SYMBOL(posix_lock_file);
-@@ -1252,7 +1284,7 @@ int locks_mandatory_area(int read_write,
+@@ -1178,7 +1204,7 @@ static int posix_lock_inode_wait(struct
+ int error;
+ might_sleep ();
+ for (;;) {
+- error = __posix_lock_file(inode, fl, NULL);
++ error = __posix_lock_file(inode, fl, NULL, 0);
+ if (error != FILE_LOCK_DEFERRED)
+ break;
+ error = wait_event_interruptible(fl->fl_wait, !fl->fl_next);
+@@ -1257,10 +1283,13 @@ int locks_mandatory_area(int read_write,
+ fl.fl_end = offset + count - 1;
+
+ for (;;) {
++ vxid_t f_xid = 0;
++
if (filp) {
fl.fl_owner = filp;
fl.fl_flags &= ~FL_SLEEP;
- error = __posix_lock_file(inode, &fl, NULL);
-+ error = __posix_lock_file(inode, &fl, NULL, filp->f_xid);
++ f_xid = filp->f_xid;
++ error = __posix_lock_file(inode, &fl, NULL, f_xid);
if (!error)
break;
}
-@@ -1260,7 +1292,7 @@ int locks_mandatory_area(int read_write,
+@@ -1268,7 +1297,7 @@ int locks_mandatory_area(int read_write,
if (sleep)
fl.fl_flags |= FL_SLEEP;
fl.fl_owner = current->files;
- error = __posix_lock_file(inode, &fl, NULL);
-+ error = __posix_lock_file(inode, &fl, NULL, filp->f_xid);
++ error = __posix_lock_file(inode, &fl, NULL, f_xid);
if (error != FILE_LOCK_DEFERRED)
break;
error = wait_event_interruptible(fl.fl_wait, !fl.fl_next);
-@@ -1655,6 +1687,7 @@ generic_add_lease(struct file *filp, lon
- goto out;
-
- locks_insert_lock(before, lease);
-+ vx_locks_inc(lease);
- /*
- * The check in break_lease() is lockless. It's possible for another
- * open to race in after we did the earlier check for a conflicting
-@@ -2110,6 +2143,11 @@ int fcntl_setlk(unsigned int fd, struct
+@@ -2165,6 +2194,11 @@ int fcntl_setlk(unsigned int fd, struct
if (file_lock == NULL)
return -ENOLCK;
+ vxd_assert(filp->f_xid == vx_current_xid(),
+ "f_xid(%d) == current(%d)", filp->f_xid, vx_current_xid());
+ file_lock->fl_xid = filp->f_xid;
-+ vx_locks_inc(file_lock);
++ // vx_locks_inc(file_lock);
+
/*
* This might block, so we do it before checking the inode.
*/
-@@ -2250,6 +2288,11 @@ int fcntl_setlk64(unsigned int fd, struc
+@@ -2307,6 +2341,11 @@ int fcntl_setlk64(unsigned int fd, struc
if (file_lock == NULL)
return -ENOLCK;
+ vxd_assert(filp->f_xid == vx_current_xid(),
+ "f_xid(%d) == current(%d)", filp->f_xid, vx_current_xid());
+ file_lock->fl_xid = filp->f_xid;
-+ vx_locks_inc(file_lock);
++ // vx_locks_inc(file_lock);
+
/*
* This might block, so we do it before checking the inode.
*/
-@@ -2557,8 +2600,11 @@ static int locks_show(struct seq_file *f
+@@ -2620,8 +2659,11 @@ static int locks_show(struct seq_file *f
lock_get_status(f, fl, iter->li_pos, "");
return 0;
}
-diff -NurpP --minimal linux-3.18.5/fs/mount.h linux-3.18.5-vs2.3.7.3/fs/mount.h
---- linux-3.18.5/fs/mount.h 2015-01-17 02:40:19.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/mount.h 2015-01-19 10:58:03.000000000 +0000
-@@ -62,6 +62,7 @@ struct mount {
- int mnt_expiry_mark; /* true if marked for expiry */
+diff -NurpP --minimal linux-4.4.110/fs/mount.h linux-4.4.110-vs2.3.9/fs/mount.h
+--- linux-4.4.110/fs/mount.h 2018-01-09 16:35:06.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/mount.h 2018-01-09 16:36:32.000000000 +0000
+@@ -68,6 +68,7 @@ struct mount {
struct hlist_head mnt_pins;
- struct path mnt_ex_mountpoint;
+ struct fs_pin mnt_umount;
+ struct dentry *mnt_ex_mountpoint;
+ vtag_t mnt_tag; /* tagging used for vfsmount */
};
#define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */
-diff -NurpP --minimal linux-3.18.5/fs/namei.c linux-3.18.5-vs2.3.7.3/fs/namei.c
---- linux-3.18.5/fs/namei.c 2015-01-17 02:40:19.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/namei.c 2015-01-22 08:31:30.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/fs/namei.c linux-4.4.110-vs2.3.9/fs/namei.c
+--- linux-4.4.110/fs/namei.c 2018-01-09 16:35:06.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/namei.c 2018-01-09 17:21:19.000000000 +0000
@@ -34,10 +34,20 @@
#include <linux/device_cgroup.h>
#include <linux/fs_struct.h>
#include "mount.h"
/* [Feb-1997 T. Schoebel-Theuer]
-@@ -278,6 +288,93 @@ static int check_acl(struct inode *inode
+@@ -283,6 +293,93 @@ static int check_acl(struct inode *inode
return -EAGAIN;
}
/*
* This does the basic permission checking
*/
-@@ -402,10 +499,14 @@ int __inode_permission(struct inode *ino
+@@ -407,10 +504,14 @@ int __inode_permission(struct inode *ino
/*
* Nobody gets write access to an immutable file.
*/
retval = do_inode_permission(inode, mask);
if (retval)
return retval;
-@@ -1416,6 +1517,9 @@ static int lookup_fast(struct nameidata
- goto unlazy;
- }
- }
+@@ -1583,6 +1684,9 @@ static int lookup_fast(struct nameidata
+ */
+ if (negative)
+ return -ENOENT;
+
+ /* FIXME: check dx permission */
+
path->mnt = mnt;
path->dentry = dentry;
- if (likely(__follow_mount_rcu(nd, path, inode)))
-@@ -1442,6 +1546,8 @@ unlazy:
- goto need_lookup;
+ if (likely(__follow_mount_rcu(nd, path, inode, seqp)))
+@@ -1613,6 +1717,8 @@ unlazy:
+ dput(dentry);
+ return -ENOENT;
}
-
-+ /* FIXME: check dx permission */
+
++ /* FIXME: check dx permission */
path->mnt = mnt;
path->dentry = dentry;
- err = follow_managed(path, nd->flags);
-@@ -2434,7 +2540,7 @@ static int may_delete(struct inode *dir,
+ err = follow_managed(path, nd);
+@@ -2571,7 +2677,7 @@ static int may_delete(struct inode *dir,
return -EPERM;
if (check_sticky(dir, inode) || IS_APPEND(inode) ||
return -EPERM;
if (isdir) {
if (!d_is_dir(victim))
-@@ -2516,19 +2622,25 @@ int vfs_create(struct inode *dir, struct
+@@ -2653,19 +2759,25 @@ int vfs_create(struct inode *dir, struct
bool want_excl)
{
int error = may_create(dir, dentry);
return error;
}
EXPORT_SYMBOL(vfs_create);
-@@ -2564,6 +2676,15 @@ static int may_open(struct path *path, i
+@@ -2701,6 +2813,15 @@ static int may_open(struct path *path, i
break;
}
error = inode_permission(inode, acc_mode);
if (error)
return error;
-@@ -3058,6 +3179,16 @@ finish_open:
+@@ -3178,6 +3299,16 @@ finish_open:
}
finish_open_created:
error = may_open(&nd->path, acc_mode, open_flag);
if (error)
goto out;
-@@ -3187,6 +3318,7 @@ static struct file *path_openat(int dfd,
+@@ -3302,6 +3433,9 @@ static struct file *path_openat(struct n
int opened = 0;
int error;
++#ifdef CONFIG_VSERVER_COWBL
+restart:
++#endif
file = get_empty_filp();
if (IS_ERR(file))
return file;
-@@ -3228,6 +3360,16 @@ static struct file *path_openat(int dfd,
- error = do_last(nd, &path, file, op, &opened, pathname);
- put_link(nd, &link, cookie);
- }
-+
-+#ifdef CONFIG_VSERVER_COWBL
-+ if (error == -EMLINK) {
-+ if (nd->root.mnt && !(nd->flags & LOOKUP_ROOT))
-+ path_put(&nd->root);
-+ if (base)
-+ fput(base);
-+ goto restart;
-+ }
-+#endif
- out:
- if (nd->root.mnt && !(nd->flags & LOOKUP_ROOT))
- path_put(&nd->root);
-@@ -3343,6 +3485,11 @@ struct dentry *kern_path_create(int dfd,
+@@ -3448,6 +3582,11 @@ static struct dentry *filename_create(in
goto fail;
}
- *path = nd.path;
-+ vxdprintk(VXD_CBIT(misc, 3), "kern_path_create path.dentry = %p (%.*s), dentry = %p (%.*s), d_inode = %p",
+ putname(name);
++ vxdprintk(VXD_CBIT(misc, 3), "filename_create path.dentry = %p (%.*s), dentry = %p (%.*s), d_inode = %p",
+ path->dentry, path->dentry->d_name.len,
+ path->dentry->d_name.name, dentry,
+ dentry->d_name.len, dentry->d_name.name,
return dentry;
fail:
dput(dentry);
-@@ -3899,7 +4046,7 @@ int vfs_link(struct dentry *old_dentry,
+@@ -3564,6 +3703,13 @@ retry:
+ error = vfs_mknod(path.dentry->d_inode,dentry,mode,0);
+ break;
+ }
++
++#ifdef CONFIG_VSERVER_COWBL
++ if (error == -EMLINK) {
++ path_cleanup(nd);
++ goto restart;
++ }
++#endif
+ out:
+ done_path_create(&path, dentry);
+ if (retry_estale(error, lookup_flags)) {
+@@ -4010,7 +4156,7 @@ int vfs_link(struct dentry *old_dentry,
/*
* A link to an append-only or immutable file cannot be created.
*/
return -EPERM;
if (!dir->i_op->link)
return -EPERM;
-@@ -4404,6 +4551,289 @@ int generic_readlink(struct dentry *dent
+@@ -4519,6 +4665,295 @@ int generic_readlink(struct dentry *dent
}
EXPORT_SYMBOL(generic_readlink);
+ struct file *new_file;
+ char *to, *path, pad='\251';
+ loff_t size;
++ struct filename *filename = getname_kernel(pathname);
++ struct filename *to_filename;
+
+ vxdprintk(VXD_CBIT(misc, 1),
+ "cow_break_link(" VS_Q("%s") ")", pathname);
+
+ path = kmalloc(PATH_MAX, GFP_KERNEL);
+ ret = -ENOMEM;
-+ if (!path)
++ if (!path || IS_ERR(filename))
+ goto out;
+
+ /* old_nd.path will have refs to dentry and mnt */
-+ ret = do_path_lookup(AT_FDCWD, pathname, LOOKUP_FOLLOW, &old_nd);
++ ret = filename_lookup(AT_FDCWD, filename, LOOKUP_FOLLOW, &old_nd);
+ vxdprintk(VXD_CBIT(misc, 2),
+ "do_path_lookup(old): %d", ret);
+ if (ret < 0)
+ vxdprintk(VXD_CBIT(misc, 1), "temp copy " VS_Q("%s"), to);
+
+ /* dir_nd.path will have refs to dentry and mnt */
-+ ret = do_path_lookup(AT_FDCWD, to,
++ to_filename = getname_kernel(to);
++ ret = filename_lookup(AT_FDCWD, to_filename,
+ LOOKUP_PARENT | LOOKUP_OPEN | LOOKUP_CREATE, &dir_nd);
++ putname(to_filename);
+ vxdprintk(VXD_CBIT(misc, 2), "do_path_lookup(new): %d", ret);
+ if (ret < 0)
+ goto retry;
+ else if (ret < 0)
+ goto out_unlock_new;
+
-+ /* drop out early, ret passes ENOENT */
++ /* the old file went away */
+ ret = -ENOENT;
+ if ((redo = d_unhashed(old_dentry)))
+ goto out_unlock_new;
+
+ drop = 0;
+
-+ size = i_size_read(old_file->f_dentry->d_inode);
++ size = i_size_read(old_file->f_path.dentry->d_inode);
+ ret = do_cow_splice(old_file, new_file, size);
+ vxdprintk(VXD_CBIT(misc, 2), "do_splice_direct: %d", ret);
+ if (ret < 0) {
+
+ /* lookup dentry once again
+ old_nd.path will be freed as old_path in out_rel_old */
-+ ret = do_path_lookup(AT_FDCWD, pathname, LOOKUP_FOLLOW, &old_nd);
++ ret = filename_lookup(AT_FDCWD, filename, LOOKUP_FOLLOW, &old_nd);
+ if (ret)
+ goto out_rel_both;
+
+ dput(new_dentry);
+ new_dentry = ERR_PTR(ret);
+ }
++ if (!IS_ERR(filename))
++ putname(filename);
+ vxdprintk(VXD_CBIT(misc, 3),
+ "cow_break_link returning with %p", new_dentry);
+ return new_dentry;
/* get the link contents into pagecache */
static char *page_getlink(struct dentry * dentry, struct page **ppage)
{
-diff -NurpP --minimal linux-3.18.5/fs/namespace.c linux-3.18.5-vs2.3.7.3/fs/namespace.c
---- linux-3.18.5/fs/namespace.c 2015-02-05 18:02:45.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/namespace.c 2015-01-19 12:08:57.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/fs/namespace.c linux-4.4.110-vs2.3.9/fs/namespace.c
+--- linux-4.4.110/fs/namespace.c 2018-01-09 16:35:06.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/namespace.c 2018-01-09 16:36:32.000000000 +0000
@@ -24,6 +24,11 @@
#include <linux/magic.h>
#include <linux/bootmem.h>
#include "pnode.h"
#include "internal.h"
-@@ -897,6 +902,10 @@ vfs_kern_mount(struct file_system_type *
+@@ -971,6 +976,10 @@ vfs_kern_mount(struct file_system_type *
if (!type)
return ERR_PTR(-ENODEV);
mnt = alloc_vfsmnt(name);
if (!mnt)
return ERR_PTR(-ENOMEM);
-@@ -971,6 +980,7 @@ static struct mount *clone_mnt(struct mo
+@@ -1046,6 +1055,7 @@ static struct mount *clone_mnt(struct mo
mnt->mnt.mnt_root = dget(root);
mnt->mnt_mountpoint = mnt->mnt.mnt_root;
mnt->mnt_parent = mnt;
lock_mount_hash();
list_add_tail(&mnt->mnt_instance, &sb->s_mounts);
unlock_mount_hash();
-@@ -1508,7 +1518,8 @@ out_unlock:
+@@ -1620,7 +1630,8 @@ out_unlock:
*/
static inline bool may_mount(void)
{
}
/*
-@@ -1969,6 +1980,7 @@ static int do_change_type(struct path *p
+@@ -2121,6 +2132,7 @@ static int do_change_type(struct path *p
if (err)
goto out_unlock;
}
lock_mount_hash();
for (m = mnt; m; m = (recurse ? next_mnt(m, mnt) : NULL))
-@@ -1997,12 +2009,14 @@ static bool has_locked_children(struct m
+@@ -2149,12 +2161,14 @@ static bool has_locked_children(struct m
* do loopback mount.
*/
static int do_loopback(struct path *path, const char *old_name,
if (!old_name || !*old_name)
return -EINVAL;
err = kern_path(old_name, LOOKUP_FOLLOW|LOOKUP_AUTOMOUNT, &old_path);
-@@ -2079,7 +2093,7 @@ static int change_mount_flags(struct vfs
+@@ -2234,7 +2248,7 @@ static int change_mount_flags(struct vfs
* on it - tough luck.
*/
static int do_remount(struct path *path, int flags, int mnt_flags,
{
int err;
struct super_block *sb = path->mnt->mnt_sb;
-@@ -2579,6 +2593,7 @@ long do_mount(const char *dev_name, cons
+@@ -2742,6 +2756,7 @@ long do_mount(const char *dev_name, cons
struct path path;
int retval = 0;
int mnt_flags = 0;
/* Discard magic */
if ((flags & MS_MGC_MSK) == MS_MGC_VAL)
-@@ -2604,6 +2619,12 @@ long do_mount(const char *dev_name, cons
+@@ -2767,6 +2782,12 @@ long do_mount(const char *dev_name, cons
if (!(flags & MS_NOATIME))
mnt_flags |= MNT_RELATIME;
/* Separate the per-mountpoint flags */
if (flags & MS_NOSUID)
mnt_flags |= MNT_NOSUID;
-@@ -2628,15 +2649,17 @@ long do_mount(const char *dev_name, cons
+@@ -2791,15 +2812,17 @@ long do_mount(const char *dev_name, cons
mnt_flags |= path.mnt->mnt_flags & MNT_ATIME_MASK;
}
else if (flags & (MS_SHARED | MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE))
retval = do_change_type(&path, flags);
else if (flags & MS_MOVE)
-@@ -2752,6 +2775,7 @@ struct mnt_namespace *copy_mnt_ns(unsign
+@@ -2919,6 +2942,7 @@ struct mnt_namespace *copy_mnt_ns(unsign
p = next_mnt(p, old);
}
namespace_unlock();
if (rootmnt)
mntput(rootmnt);
-@@ -2926,9 +2950,10 @@ SYSCALL_DEFINE2(pivot_root, const char _
+@@ -3094,9 +3118,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);
goto out4;
if (!check_mnt(root_mnt) || !check_mnt(new_mnt))
goto out4;
-@@ -3063,6 +3088,7 @@ void put_mnt_ns(struct mnt_namespace *ns
+@@ -3234,6 +3259,7 @@ void put_mnt_ns(struct mnt_namespace *ns
if (!atomic_dec_and_test(&ns->count))
return;
drop_collected_mounts(&ns->root->mnt);
free_mnt_ns(ns);
}
-diff -NurpP --minimal linux-3.18.5/fs/nfs/client.c linux-3.18.5-vs2.3.7.3/fs/nfs/client.c
---- linux-3.18.5/fs/nfs/client.c 2015-01-17 02:40:19.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/nfs/client.c 2015-01-19 10:58:03.000000000 +0000
-@@ -693,6 +693,9 @@ int nfs_init_server_rpcclient(struct nfs
+diff -NurpP --minimal linux-4.4.110/fs/nfs/client.c linux-4.4.110-vs2.3.9/fs/nfs/client.c
+--- linux-4.4.110/fs/nfs/client.c 2016-07-05 04:15:08.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/nfs/client.c 2018-01-09 16:36:32.000000000 +0000
+@@ -583,6 +583,9 @@ int nfs_init_server_rpcclient(struct nfs
if (server->flags & NFS_MOUNT_SOFT)
server->client->cl_softrtry = 1;
return 0;
}
EXPORT_SYMBOL_GPL(nfs_init_server_rpcclient);
-@@ -871,6 +874,10 @@ static void nfs_server_set_fsinfo(struct
+@@ -760,6 +763,10 @@ static void nfs_server_set_fsinfo(struct
server->acdirmin = server->acdirmax = 0;
}
server->maxfilesize = fsinfo->maxfilesize;
server->time_delta = fsinfo->time_delta;
-diff -NurpP --minimal linux-3.18.5/fs/nfs/dir.c linux-3.18.5-vs2.3.7.3/fs/nfs/dir.c
---- linux-3.18.5/fs/nfs/dir.c 2015-01-17 02:40:19.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/nfs/dir.c 2015-01-19 10:58:03.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/fs/nfs/dir.c linux-4.4.110-vs2.3.9/fs/nfs/dir.c
+--- linux-4.4.110/fs/nfs/dir.c 2018-01-09 16:35:07.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/nfs/dir.c 2018-01-09 16:36:32.000000000 +0000
@@ -37,6 +37,7 @@
#include <linux/sched.h>
#include <linux/kmemleak.h>
#include "delegation.h"
#include "iostat.h"
-@@ -1392,6 +1393,7 @@ struct dentry *nfs_lookup(struct inode *
+@@ -1396,6 +1397,7 @@ struct dentry *nfs_lookup(struct inode *
/* Success: notify readdir to use READDIRPLUS */
nfs_advise_use_readdirplus(dir);
+ dx_propagate_tag(nd, inode);
no_entry:
- res = d_materialise_unique(dentry, inode);
+ res = d_splice_alias(inode, dentry);
if (res != NULL) {
-diff -NurpP --minimal linux-3.18.5/fs/nfs/inode.c linux-3.18.5-vs2.3.7.3/fs/nfs/inode.c
---- linux-3.18.5/fs/nfs/inode.c 2015-01-17 02:40:19.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/nfs/inode.c 2015-01-19 11:44:24.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/fs/nfs/inode.c linux-4.4.110-vs2.3.9/fs/nfs/inode.c
+--- linux-4.4.110/fs/nfs/inode.c 2018-01-09 16:35:07.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/nfs/inode.c 2018-01-09 16:36:32.000000000 +0000
@@ -38,6 +38,7 @@
#include <linux/slab.h>
#include <linux/compat.h>
#include <asm/uaccess.h>
-@@ -368,6 +369,8 @@ nfs_fhget(struct super_block *sb, struct
+@@ -376,6 +377,8 @@ nfs_fhget(struct super_block *sb, struct
if (inode->i_state & I_NEW) {
struct nfs_inode *nfsi = NFS_I(inode);
unsigned long now = jiffies;
/* We set i_ino for the few things that still rely on it,
* such as stat(2) */
-@@ -412,8 +415,8 @@ nfs_fhget(struct super_block *sb, struct
+@@ -419,8 +422,8 @@ nfs_fhget(struct super_block *sb, struct
inode->i_version = 0;
inode->i_size = 0;
clear_nlink(inode);
inode->i_blocks = 0;
memset(nfsi->cookieverf, 0, sizeof(nfsi->cookieverf));
nfsi->write_io = 0;
-@@ -447,11 +450,11 @@ nfs_fhget(struct super_block *sb, struct
+@@ -455,11 +458,11 @@ nfs_fhget(struct super_block *sb, struct
else if (nfs_server_capable(inode, NFS_CAP_NLINK))
nfs_set_cache_invalid(inode, NFS_INO_INVALID_ATTR);
if (fattr->valid & NFS_ATTR_FATTR_OWNER)
else if (nfs_server_capable(inode, NFS_CAP_OWNER_GROUP))
nfs_set_cache_invalid(inode, NFS_INO_INVALID_ATTR);
if (fattr->valid & NFS_ATTR_FATTR_BLOCKS_USED)
-@@ -462,6 +465,10 @@ nfs_fhget(struct super_block *sb, struct
+@@ -470,6 +473,10 @@ nfs_fhget(struct super_block *sb, struct
*/
inode->i_blocks = nfs_calc_block_size(fattr->du.nfs3.used);
}
nfs_setsecurity(inode, fattr, label);
-@@ -592,6 +599,8 @@ void nfs_setattr_update_inode(struct ino
+@@ -611,6 +618,8 @@ void nfs_setattr_update_inode(struct ino
inode->i_uid = attr->ia_uid;
if ((attr->ia_valid & ATTR_GID) != 0)
inode->i_gid = attr->ia_gid;
+ inode->i_tag = attr->ia_tag;
nfs_set_cache_invalid(inode, NFS_INO_INVALID_ACCESS
| NFS_INO_INVALID_ACL);
- spin_unlock(&inode->i_lock);
-@@ -1171,7 +1180,9 @@ static int nfs_check_inode_attributes(st
+ }
+@@ -1235,7 +1244,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;
if (nfs_have_delegated_attributes(inode))
return 0;
-@@ -1196,13 +1207,18 @@ static int nfs_check_inode_attributes(st
- invalid |= NFS_INO_INVALID_ATTR|NFS_INO_REVAL_PAGECACHE;
- }
+@@ -1262,13 +1273,18 @@ static int nfs_check_inode_attributes(st
+ if (nfsi->nrequests != 0)
+ invalid &= ~NFS_INO_REVAL_PAGECACHE;
+ kuid = INOTAG_KUID(DX_TAG(inode), fattr->uid, fattr->gid);
+ kgid = INOTAG_KGID(DX_TAG(inode), fattr->uid, fattr->gid);
/* Has the link count changed? */
if ((fattr->valid & NFS_ATTR_FATTR_NLINK) && inode->i_nlink != fattr->nlink)
-@@ -1533,6 +1549,9 @@ static int nfs_update_inode(struct inode
- unsigned long invalid = 0;
+@@ -1642,6 +1658,9 @@ static int nfs_update_inode(struct inode
unsigned long now = jiffies;
unsigned long save_cache_validity;
+ bool cache_revalidated = true;
+ kuid_t kuid;
+ kgid_t kgid;
+ ktag_t ktag;
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,
-@@ -1637,6 +1656,9 @@ static int nfs_update_inode(struct inode
- | NFS_INO_REVAL_PAGECACHE
- | NFS_INO_REVAL_FORCED);
+@@ -1752,6 +1771,9 @@ static int nfs_update_inode(struct inode
+ cache_revalidated = false;
+ }
+ kuid = TAGINO_KUID(DX_TAG(inode), inode->i_uid, inode->i_tag);
+ kgid = TAGINO_KGID(DX_TAG(inode), inode->i_gid, inode->i_tag);
if (fattr->valid & NFS_ATTR_FATTR_ATIME)
memcpy(&inode->i_atime, &fattr->atime, sizeof(inode->i_atime));
-@@ -1683,6 +1705,10 @@ static int nfs_update_inode(struct inode
- | NFS_INO_INVALID_ACL
- | NFS_INO_REVAL_FORCED);
+@@ -1806,6 +1828,10 @@ static int nfs_update_inode(struct inode
+ cache_revalidated = false;
+ }
+ inode->i_uid = INOTAG_KUID(DX_TAG(inode), kuid, kgid);
+ inode->i_gid = INOTAG_KGID(DX_TAG(inode), kuid, kgid);
if (fattr->valid & NFS_ATTR_FATTR_NLINK) {
if (inode->i_nlink != fattr->nlink) {
invalid |= NFS_INO_INVALID_ATTR;
-diff -NurpP --minimal linux-3.18.5/fs/nfs/nfs3xdr.c linux-3.18.5-vs2.3.7.3/fs/nfs/nfs3xdr.c
---- linux-3.18.5/fs/nfs/nfs3xdr.c 2014-09-03 13:19:40.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/nfs/nfs3xdr.c 2015-01-19 10:58:03.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/fs/nfs/nfs3xdr.c linux-4.4.110-vs2.3.9/fs/nfs/nfs3xdr.c
+--- linux-4.4.110/fs/nfs/nfs3xdr.c 2016-07-05 04:12:33.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/nfs/nfs3xdr.c 2018-01-09 17:17:07.000000000 +0000
@@ -20,6 +20,7 @@
#include <linux/nfs3.h>
#include <linux/nfs_fs.h>
encode_diropargs3(xdr, args->fromfh, args->fromname, args->fromlen);
- encode_symlinkdata3(xdr, args);
+ encode_symlinkdata3(xdr, args, req->rq_task->tk_client->cl_tag);
+ xdr->buf->flags |= XDRBUF_WRITE;
}
- /*
-@@ -1130,24 +1136,24 @@ static void nfs3_xdr_enc_symlink3args(st
+@@ -1131,24 +1137,24 @@ static void nfs3_xdr_enc_symlink3args(st
* };
*/
static void encode_devicedata3(struct xdr_stream *xdr,
break;
case NF3REG:
case NF3DIR:
-@@ -1162,7 +1168,7 @@ static void nfs3_xdr_enc_mknod3args(stru
+@@ -1163,7 +1169,7 @@ static void nfs3_xdr_enc_mknod3args(stru
const struct nfs3_mknodargs *args)
{
encode_diropargs3(xdr, args->fh, args->name, args->len);
}
/*
-diff -NurpP --minimal linux-3.18.5/fs/nfs/super.c linux-3.18.5-vs2.3.7.3/fs/nfs/super.c
---- linux-3.18.5/fs/nfs/super.c 2015-01-17 02:40:19.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/nfs/super.c 2015-01-19 10:58:03.000000000 +0000
-@@ -55,6 +55,7 @@
+diff -NurpP --minimal linux-4.4.110/fs/nfs/super.c linux-4.4.110-vs2.3.9/fs/nfs/super.c
+--- linux-4.4.110/fs/nfs/super.c 2018-01-09 16:35:07.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/nfs/super.c 2018-01-09 16:36:32.000000000 +0000
+@@ -54,6 +54,7 @@
#include <linux/parser.h>
#include <linux/nsproxy.h>
#include <linux/rcupdate.h>
#include <asm/uaccess.h>
-@@ -103,6 +104,7 @@ enum {
+@@ -102,6 +103,7 @@ enum {
Opt_mountport,
Opt_mountvers,
Opt_minorversion,
/* Mount options that take string arguments */
Opt_nfsvers,
-@@ -115,6 +117,9 @@ enum {
+@@ -114,6 +116,9 @@ enum {
/* Special mount options */
Opt_userspace, Opt_deprecated, Opt_sloppy,
Opt_err
};
-@@ -184,6 +189,10 @@ static const match_table_t nfs_mount_opt
+@@ -183,6 +188,10 @@ static const match_table_t nfs_mount_opt
{ Opt_fscache_uniq, "fsc=%s" },
{ Opt_local_lock, "local_lock=%s" },
/* The following needs to be listed after all other options */
{ Opt_nfsvers, "v%s" },
-@@ -638,6 +647,7 @@ static void nfs_show_mount_options(struc
+@@ -642,6 +651,7 @@ static void nfs_show_mount_options(struc
{ NFS_MOUNT_NORDIRPLUS, ",nordirplus", "" },
{ NFS_MOUNT_UNSHARED, ",nosharecache", "" },
{ NFS_MOUNT_NORESVPORT, ",noresvport", "" },
{ 0, NULL, NULL }
};
const struct proc_nfs_info *nfs_infop;
-@@ -1320,6 +1330,14 @@ static int nfs_parse_mount_options(char
+@@ -1324,6 +1334,14 @@ static int nfs_parse_mount_options(char
case Opt_nomigration:
- mnt->options &= NFS_OPTION_MIGRATION;
+ mnt->options &= ~NFS_OPTION_MIGRATION;
break;
+#ifndef CONFIG_TAGGING_NONE
+ case Opt_tag:
/*
* options that take numeric values
-@@ -1406,6 +1424,12 @@ static int nfs_parse_mount_options(char
+@@ -1410,6 +1428,12 @@ static int nfs_parse_mount_options(char
goto out_invalid_value;
mnt->minorversion = option;
break;
/*
* options that take text values
-diff -NurpP --minimal linux-3.18.5/fs/nfsd/auth.c linux-3.18.5-vs2.3.7.3/fs/nfsd/auth.c
---- linux-3.18.5/fs/nfsd/auth.c 2015-01-16 22:19:19.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/nfsd/auth.c 2015-01-19 12:46:19.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/fs/nfsd/auth.c linux-4.4.110-vs2.3.9/fs/nfsd/auth.c
+--- linux-4.4.110/fs/nfsd/auth.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/nfsd/auth.c 2018-01-09 16:36:32.000000000 +0000
@@ -1,6 +1,7 @@
/* Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de> */
rqgi = rqstp->rq_cred.cr_group_info;
-diff -NurpP --minimal linux-3.18.5/fs/nfsd/nfs3xdr.c linux-3.18.5-vs2.3.7.3/fs/nfsd/nfs3xdr.c
---- linux-3.18.5/fs/nfsd/nfs3xdr.c 2015-01-16 22:19:19.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/nfsd/nfs3xdr.c 2015-01-19 10:58:03.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/fs/nfsd/nfs3xdr.c linux-4.4.110-vs2.3.9/fs/nfsd/nfs3xdr.c
+--- linux-4.4.110/fs/nfsd/nfs3xdr.c 2018-01-09 16:35:07.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/nfsd/nfs3xdr.c 2018-01-09 16:36:32.000000000 +0000
@@ -8,6 +8,7 @@
#include <linux/namei.h>
if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) {
p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN);
} else {
-diff -NurpP --minimal linux-3.18.5/fs/nfsd/nfs4xdr.c linux-3.18.5-vs2.3.7.3/fs/nfsd/nfs4xdr.c
---- linux-3.18.5/fs/nfsd/nfs4xdr.c 2015-02-05 18:02:45.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/nfsd/nfs4xdr.c 2015-01-19 12:45:51.000000000 +0000
-@@ -39,6 +39,7 @@
+diff -NurpP --minimal linux-4.4.110/fs/nfsd/nfs4xdr.c linux-4.4.110-vs2.3.9/fs/nfsd/nfs4xdr.c
+--- linux-4.4.110/fs/nfsd/nfs4xdr.c 2018-01-09 16:35:07.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/nfsd/nfs4xdr.c 2018-01-09 16:36:32.000000000 +0000
+@@ -40,6 +40,7 @@
#include <linux/utsname.h>
#include <linux/pagemap.h>
#include <linux/sunrpc/svcauth_gss.h>
#include "idmap.h"
#include "acl.h"
-@@ -2436,12 +2437,16 @@ out_acl:
+@@ -2637,12 +2638,16 @@ out_acl:
*p++ = cpu_to_be32(stat.nlink);
}
if (bmval1 & FATTR4_WORD1_OWNER) {
if (status)
goto out;
}
-diff -NurpP --minimal linux-3.18.5/fs/nfsd/nfsxdr.c linux-3.18.5-vs2.3.7.3/fs/nfsd/nfsxdr.c
---- linux-3.18.5/fs/nfsd/nfsxdr.c 2015-01-16 22:19:19.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/nfsd/nfsxdr.c 2015-01-19 10:58:03.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/fs/nfsd/nfsxdr.c linux-4.4.110-vs2.3.9/fs/nfsd/nfsxdr.c
+--- linux-4.4.110/fs/nfsd/nfsxdr.c 2018-01-09 16:35:07.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/nfsd/nfsxdr.c 2018-01-09 16:36:32.000000000 +0000
@@ -7,6 +7,7 @@
#include "vfs.h"
#include "xdr.h"
if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
*p++ = htonl(NFS_MAXPATHLEN);
-diff -NurpP --minimal linux-3.18.5/fs/ocfs2/dlmglue.c linux-3.18.5-vs2.3.7.3/fs/ocfs2/dlmglue.c
---- linux-3.18.5/fs/ocfs2/dlmglue.c 2015-01-17 02:40:20.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/ocfs2/dlmglue.c 2015-01-19 10:58:03.000000000 +0000
-@@ -2047,6 +2047,7 @@ static void __ocfs2_stuff_meta_lvb(struc
+diff -NurpP --minimal linux-4.4.110/fs/ocfs2/dlmglue.c linux-4.4.110-vs2.3.9/fs/ocfs2/dlmglue.c
+--- linux-4.4.110/fs/ocfs2/dlmglue.c 2018-01-09 16:35:07.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/ocfs2/dlmglue.c 2018-01-09 16:36:32.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));
lvb->lvb_igid = cpu_to_be32(i_gid_read(inode));
lvb->lvb_imode = cpu_to_be16(inode->i_mode);
lvb->lvb_inlink = cpu_to_be16(inode->i_nlink);
lvb->lvb_iatime_packed =
-@@ -2097,6 +2098,7 @@ static void ocfs2_refresh_inode_from_lvb
+@@ -2178,6 +2179,7 @@ static void ocfs2_refresh_inode_from_lvb
i_uid_write(inode, be32_to_cpu(lvb->lvb_iuid));
i_gid_write(inode, be32_to_cpu(lvb->lvb_igid));
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-3.18.5/fs/ocfs2/dlmglue.h linux-3.18.5-vs2.3.7.3/fs/ocfs2/dlmglue.h
---- linux-3.18.5/fs/ocfs2/dlmglue.h 2014-06-12 13:02:45.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/ocfs2/dlmglue.h 2015-01-19 10:58:03.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/fs/ocfs2/dlmglue.h linux-4.4.110-vs2.3.9/fs/ocfs2/dlmglue.h
+--- linux-4.4.110/fs/ocfs2/dlmglue.h 2018-01-09 16:35:07.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/ocfs2/dlmglue.h 2018-01-09 16:36:32.000000000 +0000
@@ -46,7 +46,8 @@ struct ocfs2_meta_lvb {
__be16 lvb_inlink;
__be32 lvb_iattr;
};
#define OCFS2_QINFO_LVB_VERSION 1
-diff -NurpP --minimal linux-3.18.5/fs/ocfs2/file.c linux-3.18.5-vs2.3.7.3/fs/ocfs2/file.c
---- linux-3.18.5/fs/ocfs2/file.c 2015-01-17 02:40:20.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/ocfs2/file.c 2015-01-19 10:58:03.000000000 +0000
-@@ -1139,7 +1139,7 @@ int ocfs2_setattr(struct dentry *dentry,
+diff -NurpP --minimal linux-4.4.110/fs/ocfs2/file.c linux-4.4.110-vs2.3.9/fs/ocfs2/file.c
+--- linux-4.4.110/fs/ocfs2/file.c 2018-01-09 16:35:07.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/ocfs2/file.c 2018-01-09 16:36:32.000000000 +0000
+@@ -1151,7 +1151,7 @@ int ocfs2_setattr(struct dentry *dentry,
attr->ia_valid &= ~ATTR_SIZE;
#define OCFS2_VALID_ATTRS (ATTR_ATIME | ATTR_MTIME | ATTR_CTIME | ATTR_SIZE \
if (!(attr->ia_valid & OCFS2_VALID_ATTRS))
return 0;
-diff -NurpP --minimal linux-3.18.5/fs/ocfs2/inode.c linux-3.18.5-vs2.3.7.3/fs/ocfs2/inode.c
---- linux-3.18.5/fs/ocfs2/inode.c 2014-06-12 13:02:45.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/ocfs2/inode.c 2015-01-19 10:58:03.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/fs/ocfs2/inode.c linux-4.4.110-vs2.3.9/fs/ocfs2/inode.c
+--- linux-4.4.110/fs/ocfs2/inode.c 2016-07-05 04:12:34.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/ocfs2/inode.c 2018-01-09 16:36:32.000000000 +0000
@@ -28,6 +28,7 @@
#include <linux/highmem.h>
#include <linux/pagemap.h>
/* Fast symlinks will have i_size but no allocated clusters. */
if (S_ISLNK(inode->i_mode) && !fe->i_clusters) {
-diff -NurpP --minimal linux-3.18.5/fs/ocfs2/inode.h linux-3.18.5-vs2.3.7.3/fs/ocfs2/inode.h
---- linux-3.18.5/fs/ocfs2/inode.h 2015-01-17 02:40:20.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/ocfs2/inode.h 2015-01-19 10:58:03.000000000 +0000
-@@ -157,6 +157,7 @@ struct buffer_head *ocfs2_bread(struct i
+diff -NurpP --minimal linux-4.4.110/fs/ocfs2/inode.h linux-4.4.110-vs2.3.9/fs/ocfs2/inode.h
+--- linux-4.4.110/fs/ocfs2/inode.h 2016-07-05 04:15:08.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/ocfs2/inode.h 2018-01-09 16:36:32.000000000 +0000
+@@ -161,6 +161,7 @@ struct buffer_head *ocfs2_bread(struct i
void ocfs2_set_inode_flags(struct inode *inode);
void ocfs2_get_inode_flags(struct ocfs2_inode_info *oi);
static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode)
{
-diff -NurpP --minimal linux-3.18.5/fs/ocfs2/ioctl.c linux-3.18.5-vs2.3.7.3/fs/ocfs2/ioctl.c
---- linux-3.18.5/fs/ocfs2/ioctl.c 2015-01-16 22:19:19.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/ocfs2/ioctl.c 2015-01-19 10:58:03.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/fs/ocfs2/ioctl.c linux-4.4.110-vs2.3.9/fs/ocfs2/ioctl.c
+--- linux-4.4.110/fs/ocfs2/ioctl.c 2015-10-29 09:21:37.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/ocfs2/ioctl.c 2018-01-09 16:36:32.000000000 +0000
@@ -76,7 +76,41 @@ static int ocfs2_get_inode_attr(struct i
return status;
}
long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
struct inode *inode = file_inode(filp);
-diff -NurpP --minimal linux-3.18.5/fs/ocfs2/namei.c linux-3.18.5-vs2.3.7.3/fs/ocfs2/namei.c
---- linux-3.18.5/fs/ocfs2/namei.c 2015-02-05 18:02:45.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/ocfs2/namei.c 2015-01-19 12:15:49.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/fs/ocfs2/namei.c linux-4.4.110-vs2.3.9/fs/ocfs2/namei.c
+--- linux-4.4.110/fs/ocfs2/namei.c 2018-01-09 16:35:07.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/ocfs2/namei.c 2018-01-09 16:36:32.000000000 +0000
@@ -41,6 +41,7 @@
#include <linux/slab.h>
#include <linux/highmem.h>
#include <cluster/masklog.h>
-@@ -524,6 +525,7 @@ static int __ocfs2_mknod_locked(struct i
+@@ -516,6 +517,7 @@ static int __ocfs2_mknod_locked(struct i
struct ocfs2_extent_list *fel;
u16 feat;
struct ocfs2_inode_info *oi = OCFS2_I(inode);
*new_fe_bh = NULL;
-@@ -561,8 +563,13 @@ static int __ocfs2_mknod_locked(struct i
+@@ -553,8 +555,13 @@ static int __ocfs2_mknod_locked(struct i
fe->i_suballoc_loc = cpu_to_le64(suballoc_loc);
fe->i_suballoc_bit = cpu_to_le16(suballoc_bit);
fe->i_suballoc_slot = cpu_to_le16(inode_ac->ac_alloc_slot);
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-3.18.5/fs/ocfs2/ocfs2.h linux-3.18.5-vs2.3.7.3/fs/ocfs2/ocfs2.h
---- linux-3.18.5/fs/ocfs2/ocfs2.h 2014-09-03 13:19:40.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/ocfs2/ocfs2.h 2015-01-19 10:58:03.000000000 +0000
-@@ -273,6 +273,7 @@ enum ocfs2_mount_options
- writes */
- OCFS2_MOUNT_HB_NONE = 1 << 13, /* No heartbeat */
- OCFS2_MOUNT_HB_GLOBAL = 1 << 14, /* Global heartbeat */
-+ OCFS2_MOUNT_TAGGED = 1 << 15, /* use tagging */
+diff -NurpP --minimal linux-4.4.110/fs/ocfs2/ocfs2.h linux-4.4.110-vs2.3.9/fs/ocfs2/ocfs2.h
+--- linux-4.4.110/fs/ocfs2/ocfs2.h 2018-01-09 16:35:07.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/ocfs2/ocfs2.h 2018-01-09 17:21:54.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-3.18.5/fs/ocfs2/ocfs2_fs.h linux-3.18.5-vs2.3.7.3/fs/ocfs2/ocfs2_fs.h
---- linux-3.18.5/fs/ocfs2/ocfs2_fs.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/ocfs2/ocfs2_fs.h 2015-01-19 10:58:03.000000000 +0000
-@@ -266,6 +266,11 @@
+diff -NurpP --minimal linux-4.4.110/fs/ocfs2/ocfs2_fs.h linux-4.4.110-vs2.3.9/fs/ocfs2/ocfs2_fs.h
+--- linux-4.4.110/fs/ocfs2/ocfs2_fs.h 2016-07-05 04:12:34.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/ocfs2/ocfs2_fs.h 2018-01-09 16:36:32.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 */
#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-3.18.5/fs/ocfs2/super.c linux-3.18.5-vs2.3.7.3/fs/ocfs2/super.c
---- linux-3.18.5/fs/ocfs2/super.c 2015-01-17 02:40:20.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/ocfs2/super.c 2015-01-19 10:58:03.000000000 +0000
-@@ -185,6 +185,7 @@ enum {
- Opt_coherency_full,
- Opt_resv_level,
+diff -NurpP --minimal linux-4.4.110/fs/ocfs2/super.c linux-4.4.110-vs2.3.9/fs/ocfs2/super.c
+--- linux-4.4.110/fs/ocfs2/super.c 2016-07-05 04:12:34.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/ocfs2/super.c 2018-01-09 17:22:51.000000000 +0000
+@@ -193,6 +193,7 @@ enum {
Opt_dir_resv_level,
+ Opt_journal_async_commit,
+ Opt_err_cont,
+ Opt_tag, Opt_notag, Opt_tagid,
Opt_err,
};
-@@ -216,6 +217,9 @@ static const match_table_t tokens = {
- {Opt_coherency_full, "coherency=full"},
- {Opt_resv_level, "resv_level=%u"},
+@@ -226,6 +227,9 @@ static const match_table_t tokens = {
{Opt_dir_resv_level, "dir_resv_level=%u"},
+ {Opt_journal_async_commit, "journal_async_commit"},
+ {Opt_err_cont, "errors=continue"},
+ {Opt_tag, "tag"},
+ {Opt_notag, "notag"},
+ {Opt_tagid, "tagid=%u"},
{Opt_err, NULL}
};
-@@ -666,6 +670,13 @@ static int ocfs2_remount(struct super_bl
+@@ -677,6 +681,13 @@ static int ocfs2_remount(struct super_bl
goto out;
}
/* We're going to/from readonly mode. */
if ((*flags & MS_RDONLY) != (sb->s_flags & MS_RDONLY)) {
/* Disable quota accounting before remounting RO */
-@@ -1185,6 +1196,9 @@ static int ocfs2_fill_super(struct super
+@@ -1166,6 +1177,9 @@ static int ocfs2_fill_super(struct super
ocfs2_complete_mount_recovery(osb);
if (ocfs2_mount_local(osb))
snprintf(nodestr, sizeof(nodestr), "local");
else
-@@ -1493,6 +1507,20 @@ static int ocfs2_parse_options(struct su
- option < OCFS2_MAX_RESV_LEVEL)
- mopt->dir_resv_level = option;
+@@ -1486,6 +1500,20 @@ static int ocfs2_parse_options(struct su
+ case Opt_journal_async_commit:
+ mopt->mount_opt |= OCFS2_MOUNT_JOURNAL_ASYNC_COMMIT;
break;
+#ifndef CONFIG_TAGGING_NONE
+ case Opt_tag:
default:
mlog(ML_ERROR,
"Unrecognized mount option \"%s\" "
-diff -NurpP --minimal linux-3.18.5/fs/open.c linux-3.18.5-vs2.3.7.3/fs/open.c
---- linux-3.18.5/fs/open.c 2015-01-17 02:40:20.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/open.c 2015-01-19 10:58:03.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/fs/open.c linux-4.4.110-vs2.3.9/fs/open.c
+--- linux-4.4.110/fs/open.c 2018-01-09 16:35:07.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/open.c 2018-01-09 16:36:32.000000000 +0000
@@ -31,6 +31,11 @@
#include <linux/ima.h>
#include <linux/dnotify.h>
#include "internal.h"
-@@ -68,6 +73,11 @@ long vfs_truncate(struct path *path, lof
+@@ -70,6 +75,11 @@ long vfs_truncate(struct path *path, lof
struct inode *inode;
long error;
inode = path->dentry->d_inode;
/* For directories it's -EISDIR, for other non-regulars - -EINVAL */
-@@ -530,6 +540,13 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, cons
+@@ -548,6 +558,13 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, cons
unsigned int lookup_flags = LOOKUP_FOLLOW;
retry:
error = user_path_at(dfd, filename, lookup_flags, &path);
if (!error) {
error = chmod_common(&path, mode);
path_put(&path);
-@@ -563,13 +580,15 @@ static int chown_common(struct path *pat
+@@ -582,13 +599,15 @@ retry_deleg:
if (!uid_valid(uid))
return -EINVAL;
newattrs.ia_valid |= ATTR_UID;
}
if (!S_ISDIR(inode->i_mode))
newattrs.ia_valid |=
-@@ -608,6 +627,18 @@ retry:
+@@ -626,6 +645,10 @@ retry:
error = mnt_want_write(path.mnt);
if (error)
goto out_release;
+#ifdef CONFIG_VSERVER_COWBL
+ error = cow_check_and_break(&path);
+ if (!error)
-+#endif
-+#ifdef CONFIG_VSERVER_COWBL
-+ error = cow_check_and_break(&path);
-+ if (!error)
-+#endif
-+#ifdef CONFIG_VSERVER_COWBL
-+ error = cow_check_and_break(&path);
-+ if (!error)
+#endif
error = chown_common(&path, user, group);
mnt_drop_write(path.mnt);
out_release:
-diff -NurpP --minimal linux-3.18.5/fs/proc/array.c linux-3.18.5-vs2.3.7.3/fs/proc/array.c
---- linux-3.18.5/fs/proc/array.c 2015-01-16 22:19:20.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/proc/array.c 2015-01-21 06:37:56.000000000 +0000
-@@ -82,6 +82,8 @@
- #include <linux/ptrace.h>
+diff -NurpP --minimal linux-4.4.110/fs/proc/array.c linux-4.4.110-vs2.3.9/fs/proc/array.c
+--- linux-4.4.110/fs/proc/array.c 2018-01-09 16:35:07.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/proc/array.c 2018-01-09 17:30:44.000000000 +0000
+@@ -83,6 +83,8 @@
#include <linux/tracehook.h>
+ #include <linux/string_helpers.h>
#include <linux/user_namespace.h>
+#include <linux/vs_context.h>
+#include <linux/vs_network.h>
#include <asm/pgtable.h>
#include <asm/processor.h>
-@@ -164,6 +166,9 @@ static inline void task_state(struct seq
- rcu_read_lock();
+@@ -154,6 +156,9 @@ static inline void task_state(struct seq
ppid = pid_alive(p) ?
task_tgid_nr_ns(rcu_dereference(p->real_parent), ns) : 0;
+
+ if (unlikely(vx_current_initpid(p->pid)))
+ ppid = 0;
+
- tpid = 0;
- if (pid_alive(p)) {
- struct task_struct *tracer = ptrace_parent(p);
-@@ -289,8 +294,8 @@ static inline void task_sig(struct seq_f
+ tracer = ptrace_parent(p);
+ if (tracer)
+ tpid = task_pid_nr_ns(tracer, ns);
+@@ -292,8 +297,8 @@ static inline void task_sig(struct seq_f
render_sigset_t(m, "SigCgt:\t", &caught);
}
{
unsigned __capi;
-@@ -315,10 +320,11 @@ static inline void task_cap(struct seq_f
- cap_bset = cred->cap_bset;
+@@ -320,11 +325,12 @@ static inline void task_cap(struct seq_f
+ cap_ambient = cred->cap_ambient;
rcu_read_unlock();
- render_cap_t(m, "CapInh:\t", &cap_inheritable);
- render_cap_t(m, "CapPrm:\t", &cap_permitted);
- render_cap_t(m, "CapEff:\t", &cap_effective);
- render_cap_t(m, "CapBnd:\t", &cap_bset);
+- render_cap_t(m, "CapAmb:\t", &cap_ambient);
+ /* FIXME: maybe move the p->vx_info masking to __task_cred() ? */
+ render_cap_t(m, "CapInh:\t", p->vx_info, &cap_inheritable);
+ render_cap_t(m, "CapPrm:\t", p->vx_info, &cap_permitted);
+ render_cap_t(m, "CapEff:\t", p->vx_info, &cap_effective);
+ render_cap_t(m, "CapBnd:\t", p->vx_info, &cap_bset);
++ render_cap_t(m, "CapAmb:\t", p->vx_info, &cap_ambient);
}
static inline void task_seccomp(struct seq_file *m, struct task_struct *p)
-@@ -347,6 +353,43 @@ static void task_cpus_allowed(struct seq
- seq_putc(m, '\n');
+@@ -351,6 +357,43 @@ static void task_cpus_allowed(struct seq
+ cpumask_pr_args(&task->cpus_allowed));
}
+int proc_pid_nsproxy(struct seq_file *m, struct pid_namespace *ns,
int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
struct pid *pid, struct task_struct *task)
{
-@@ -364,6 +407,7 @@ int proc_pid_status(struct seq_file *m,
+@@ -368,6 +411,7 @@ int proc_pid_status(struct seq_file *m,
task_seccomp(m, task);
task_cpus_allowed(m, task);
cpuset_task_status_allowed(m, task);
task_context_switch_counts(m, task);
return 0;
}
-@@ -467,6 +511,17 @@ static int do_task_stat(struct seq_file
+@@ -471,6 +515,17 @@ static int do_task_stat(struct seq_file
/* convert nsec -> ticks */
start_time = nsec_to_clock_t(task->real_start_time);
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-3.18.5/fs/proc/base.c linux-3.18.5-vs2.3.7.3/fs/proc/base.c
---- linux-3.18.5/fs/proc/base.c 2015-02-05 18:02:45.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/proc/base.c 2015-01-22 09:04:57.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/fs/proc/base.c linux-4.4.110-vs2.3.9/fs/proc/base.c
+--- linux-4.4.110/fs/proc/base.c 2018-01-09 16:35:07.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/proc/base.c 2018-01-09 16:36:32.000000000 +0000
@@ -87,6 +87,8 @@
#include <linux/slab.h>
#include <linux/flex_array.h>
#ifdef CONFIG_HARDWALL
#include <asm/hardwall.h>
#endif
-@@ -884,11 +886,15 @@ static ssize_t oom_adj_write(struct file
+@@ -1097,11 +1099,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 &&
/*
* /proc/pid/oom_adj is provided for legacy purposes, ask users to use
* /proc/pid/oom_score_adj instead.
-@@ -1476,6 +1482,8 @@ struct inode *proc_pid_make_inode(struct
+@@ -1666,6 +1672,8 @@ struct inode *proc_pid_make_inode(struct
inode->i_gid = cred->egid;
rcu_read_unlock();
}
security_task_to_inode(task, inode);
out:
-@@ -1521,6 +1529,8 @@ int pid_getattr(struct vfsmount *mnt, st
+@@ -1711,6 +1719,8 @@ int pid_getattr(struct vfsmount *mnt, st
/* dentry stuff */
/*
* Exceptional case: normally we are not allowed to unhash a busy
* directory. In this case, however, we can do it - no aliasing problems
-@@ -1549,6 +1559,19 @@ int pid_revalidate(struct dentry *dentry
+@@ -1739,6 +1749,19 @@ int pid_revalidate(struct dentry *dentry
task = get_proc_task(inode);
if (task) {
if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
task_dumpable(task)) {
rcu_read_lock();
-@@ -2085,6 +2108,13 @@ static struct dentry *proc_pident_lookup
+@@ -2283,6 +2306,13 @@ static struct dentry *proc_pident_lookup
if (!task)
goto out_no_task;
/*
* Yes, it does not scale. And it should not. Don't add
* new entries into /proc/<tgid>/ without very good reasons.
-@@ -2534,6 +2564,11 @@ static int proc_pid_personality(struct s
+@@ -2725,6 +2755,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;
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),
-@@ -2600,6 +2635,8 @@ static const struct pid_entry tgid_base_
+@@ -2789,6 +2824,8 @@ static const struct pid_entry tgid_base_
#ifdef CONFIG_CGROUPS
ONE("cgroup", S_IRUGO, proc_cgroup_show),
#endif
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),
-@@ -2811,7 +2848,7 @@ retry:
+@@ -3003,7 +3040,7 @@ retry:
iter.task = NULL;
pid = find_ge_pid(iter.tgid, ns);
if (pid) {
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
-@@ -2869,8 +2906,10 @@ int proc_pid_readdir(struct file *file,
+@@ -3063,8 +3100,10 @@ int proc_pid_readdir(struct file *file,
if (!has_pid_permissions(ns, iter.task, 2))
continue;
if (!proc_fill_cache(file, ctx, name, len,
proc_pid_instantiate, iter.task, NULL)) {
put_task_struct(iter.task);
-@@ -2967,6 +3006,7 @@ static const struct pid_entry tid_base_s
+@@ -3161,6 +3200,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
};
static int proc_tid_base_readdir(struct file *file, struct dir_context *ctx)
-@@ -3033,6 +3073,8 @@ static struct dentry *proc_task_lookup(s
+@@ -3227,6 +3267,8 @@ static struct dentry *proc_task_lookup(s
tid = name_to_int(&dentry->d_name);
if (tid == ~0U)
goto out;
ns = dentry->d_sb->s_fs_info;
rcu_read_lock();
-diff -NurpP --minimal linux-3.18.5/fs/proc/generic.c linux-3.18.5-vs2.3.7.3/fs/proc/generic.c
---- linux-3.18.5/fs/proc/generic.c 2015-01-16 22:19:20.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/proc/generic.c 2015-01-22 08:31:12.000000000 +0000
-@@ -23,6 +23,7 @@
+diff -NurpP --minimal linux-4.4.110/fs/proc/generic.c linux-4.4.110-vs2.3.9/fs/proc/generic.c
+--- linux-4.4.110/fs/proc/generic.c 2018-01-09 16:35:07.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/proc/generic.c 2018-01-09 17:29:24.000000000 +0000
+@@ -22,6 +22,7 @@
#include <linux/bitops.h>
#include <linux/spinlock.h>
#include <linux/completion.h>
#include <asm/uaccess.h>
#include "internal.h"
-@@ -186,6 +187,12 @@ struct dentry *proc_lookup_de(struct pro
- for (de = de->subdir; de ; de = de->next) {
- if (de->namelen != dentry->d_name.len)
- continue;
-+ if (!vx_hide_check(0, de->vx_flags)) {
-+ vxdprintk(VXD_CBIT(misc, 9),
-+ VS_Q("%*s") " hidden in proc_lookup_de()",
-+ de->namelen, de->name);
-+ continue;
+@@ -66,8 +67,16 @@ static struct proc_dir_entry *pde_subdir
+ node = node->rb_left;
+ else if (result > 0)
+ node = node->rb_right;
+- else
++ else {
++ if (!vx_hide_check(0, de->vx_flags)) {
++ vxdprintk(VXD_CBIT(misc, 9),
++ VS_Q("%*s")
++ " hidden in pde_subdir_find()",
++ de->namelen, de->name);
++ return 0;
++ }
+ return de;
+ }
- if (!memcmp(dentry->d_name.name, de->name, de->namelen)) {
- pde_get(de);
- spin_unlock(&proc_subdir_lock);
-@@ -194,6 +201,8 @@ struct dentry *proc_lookup_de(struct pro
- return ERR_PTR(-ENOMEM);
- d_set_d_op(dentry, &simple_dentry_operations);
- d_add(dentry, inode);
+ }
+ return NULL;
+ }
+@@ -241,6 +250,8 @@ struct dentry *proc_lookup_de(struct pro
+ return ERR_PTR(-ENOMEM);
+ d_set_d_op(dentry, &simple_dentry_operations);
+ d_add(dentry, inode);
+ /* generic proc entries belong to the host */
+ i_tag_write(inode, 0);
- return NULL;
- }
+ return NULL;
}
-@@ -241,6 +250,13 @@ int proc_readdir_de(struct proc_dir_entr
+ read_unlock(&proc_subdir_lock);
+@@ -287,6 +298,12 @@ int proc_readdir_de(struct proc_dir_entr
do {
struct proc_dir_entry *next;
pde_get(de);
-+
+ if (!vx_hide_check(0, de->vx_flags)) {
+ vxdprintk(VXD_CBIT(misc, 9),
+ VS_Q("%*s") " hidden in proc_readdir_de()",
+ de->namelen, de->name);
+ goto skip;
+ }
- spin_unlock(&proc_subdir_lock);
+ read_unlock(&proc_subdir_lock);
if (!dir_emit(ctx, de->name, de->namelen,
de->low_ino, de->mode >> 12)) {
-@@ -248,6 +264,7 @@ int proc_readdir_de(struct proc_dir_entr
+@@ -294,6 +311,7 @@ int proc_readdir_de(struct proc_dir_entr
return 0;
}
- spin_lock(&proc_subdir_lock);
+ read_lock(&proc_subdir_lock);
+ skip:
ctx->pos++;
- next = de->next;
+ next = pde_subdir_next(de);
pde_put(de);
-@@ -354,6 +371,7 @@ static struct proc_dir_entry *__proc_cre
- ent->namelen = qstr.len;
+@@ -387,6 +405,7 @@ static struct proc_dir_entry *__proc_cre
ent->mode = mode;
ent->nlink = nlink;
+ ent->subdir = RB_ROOT;
+ ent->vx_flags = IATTR_PROC_DEFAULT;
atomic_set(&ent->count, 1);
spin_lock_init(&ent->pde_unload_lock);
INIT_LIST_HEAD(&ent->pde_openers);
-@@ -377,7 +395,8 @@ struct proc_dir_entry *proc_symlink(cons
+@@ -411,7 +430,8 @@ struct proc_dir_entry *proc_symlink(cons
kfree(ent->data);
kfree(ent);
ent = NULL;
} else {
kfree(ent);
ent = NULL;
-diff -NurpP --minimal linux-3.18.5/fs/proc/inode.c linux-3.18.5-vs2.3.7.3/fs/proc/inode.c
---- linux-3.18.5/fs/proc/inode.c 2015-01-16 22:19:20.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/proc/inode.c 2015-01-19 10:58:03.000000000 +0000
-@@ -415,6 +415,8 @@ struct inode *proc_get_inode(struct supe
+diff -NurpP --minimal linux-4.4.110/fs/proc/inode.c linux-4.4.110-vs2.3.9/fs/proc/inode.c
+--- linux-4.4.110/fs/proc/inode.c 2015-10-29 09:21:39.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/proc/inode.c 2018-01-09 16:36:32.000000000 +0000
+@@ -431,6 +431,8 @@ struct inode *proc_get_inode(struct supe
inode->i_uid = de->uid;
inode->i_gid = de->gid;
}
if (de->size)
inode->i_size = de->size;
if (de->nlink)
-diff -NurpP --minimal linux-3.18.5/fs/proc/internal.h linux-3.18.5-vs2.3.7.3/fs/proc/internal.h
---- linux-3.18.5/fs/proc/internal.h 2015-01-17 02:40:20.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/proc/internal.h 2015-01-19 12:40:33.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/fs/proc/internal.h linux-4.4.110-vs2.3.9/fs/proc/internal.h
+--- linux-4.4.110/fs/proc/internal.h 2015-10-29 09:21:39.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/proc/internal.h 2018-01-09 16:36:32.000000000 +0000
@@ -14,6 +14,7 @@
#include <linux/spinlock.h>
#include <linux/atomic.h>
struct ctl_table_header;
struct mempolicy;
-@@ -35,6 +36,7 @@ struct proc_dir_entry {
+@@ -34,6 +35,7 @@ struct proc_dir_entry {
nlink_t nlink;
kuid_t uid;
kgid_t gid;
loff_t size;
const struct inode_operations *proc_iops;
const struct file_operations *proc_fops;
-@@ -50,15 +52,22 @@ struct proc_dir_entry {
+@@ -51,15 +53,22 @@ struct proc_dir_entry {
char name[];
};
int fd;
union proc_op op;
struct proc_dir_entry *pde;
-@@ -91,11 +100,16 @@ static inline struct pid *proc_pid(struc
+@@ -92,11 +101,16 @@ static inline struct pid *proc_pid(struc
return PROC_I(inode)->pid;
}
static inline int task_dumpable(struct task_struct *task)
{
int dumpable = 0;
-@@ -154,6 +168,8 @@ extern int proc_pid_status(struct seq_fi
+@@ -155,6 +169,8 @@ extern int proc_pid_status(struct seq_fi
struct pid *, struct task_struct *);
extern int proc_pid_statm(struct seq_file *, struct pid_namespace *,
struct pid *, struct task_struct *);
/*
* base.c
-diff -NurpP --minimal linux-3.18.5/fs/proc/loadavg.c linux-3.18.5-vs2.3.7.3/fs/proc/loadavg.c
---- linux-3.18.5/fs/proc/loadavg.c 2014-06-12 11:34:59.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/proc/loadavg.c 2015-01-19 10:58:03.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/fs/proc/loadavg.c linux-4.4.110-vs2.3.9/fs/proc/loadavg.c
+--- linux-4.4.110/fs/proc/loadavg.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/proc/loadavg.c 2018-01-09 16:36:32.000000000 +0000
@@ -12,15 +12,27 @@
static int loadavg_proc_show(struct seq_file *m, void *v)
task_active_pid_ns(current)->last_pid);
return 0;
}
-diff -NurpP --minimal linux-3.18.5/fs/proc/meminfo.c linux-3.18.5-vs2.3.7.3/fs/proc/meminfo.c
---- linux-3.18.5/fs/proc/meminfo.c 2015-01-16 22:19:20.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/proc/meminfo.c 2015-01-19 10:58:03.000000000 +0000
-@@ -41,7 +41,8 @@ static int meminfo_proc_show(struct seq_
+diff -NurpP --minimal linux-4.4.110/fs/proc/meminfo.c linux-4.4.110-vs2.3.9/fs/proc/meminfo.c
+--- linux-4.4.110/fs/proc/meminfo.c 2016-07-05 04:15:09.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/proc/meminfo.c 2018-01-09 16:36:32.000000000 +0000
+@@ -43,7 +43,8 @@ static int meminfo_proc_show(struct seq_
si_swapinfo(&i);
committed = percpu_counter_read_positive(&vm_committed_as);
total_swapcache_pages() - i.bufferram;
if (cached < 0)
cached = 0;
-diff -NurpP --minimal linux-3.18.5/fs/proc/root.c linux-3.18.5-vs2.3.7.3/fs/proc/root.c
---- linux-3.18.5/fs/proc/root.c 2015-01-16 22:19:20.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/proc/root.c 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/fs/proc/root.c linux-4.4.110-vs2.3.9/fs/proc/root.c
+--- linux-4.4.110/fs/proc/root.c 2018-01-09 16:35:08.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/proc/root.c 2018-01-09 16:36:32.000000000 +0000
@@ -20,9 +20,14 @@
#include <linux/mount.h>
#include <linux/pid_namespace.h>
static int proc_test_super(struct super_block *sb, void *data)
{
return sb->s_fs_info == data;
-@@ -116,7 +121,8 @@ static struct dentry *proc_mount(struct
- return ERR_PTR(-EPERM);
+@@ -113,7 +118,8 @@ static struct dentry *proc_mount(struct
+ options = data;
/* Does the mounter have privilege over the pid namespace? */
- if (!ns_capable(ns->user_ns, CAP_SYS_ADMIN))
return ERR_PTR(-EPERM);
}
-@@ -190,6 +196,7 @@ void __init proc_root_init(void)
+@@ -196,6 +202,7 @@ void __init proc_root_init(void)
proc_tty_init();
proc_mkdir("bus", NULL);
proc_sys_init();
}
static int proc_root_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat
-@@ -251,6 +258,7 @@ struct proc_dir_entry proc_root = {
+@@ -257,6 +264,7 @@ struct proc_dir_entry proc_root = {
.proc_iops = &proc_root_inode_operations,
.proc_fops = &proc_root_operations,
.parent = &proc_root,
+ .vx_flags = IATTR_ADMIN | IATTR_WATCH,
+ .subdir = RB_ROOT,
.name = "/proc",
};
-
-diff -NurpP --minimal linux-3.18.5/fs/proc/self.c linux-3.18.5-vs2.3.7.3/fs/proc/self.c
---- linux-3.18.5/fs/proc/self.c 2014-06-12 13:02:46.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/proc/self.c 2015-01-19 10:58:04.000000000 +0000
-@@ -2,6 +2,7 @@
- #include <linux/namei.h>
+diff -NurpP --minimal linux-4.4.110/fs/proc/self.c linux-4.4.110-vs2.3.9/fs/proc/self.c
+--- linux-4.4.110/fs/proc/self.c 2015-10-29 09:21:39.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/proc/self.c 2018-01-09 16:36:32.000000000 +0000
+@@ -1,6 +1,7 @@
+ #include <linux/sched.h>
#include <linux/slab.h>
#include <linux/pid_namespace.h>
+#include <linux/vserver/inode.h>
#include "internal.h"
/*
-@@ -54,6 +55,8 @@ int proc_setup_self(struct super_block *
+@@ -52,6 +53,8 @@ int proc_setup_self(struct super_block *
self = d_alloc_name(s->s_root, "self");
if (self) {
struct inode *inode = new_inode_pseudo(s);
if (inode) {
inode->i_ino = self_inum;
inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
-diff -NurpP --minimal linux-3.18.5/fs/proc/stat.c linux-3.18.5-vs2.3.7.3/fs/proc/stat.c
---- linux-3.18.5/fs/proc/stat.c 2015-02-05 18:02:45.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/proc/stat.c 2015-01-28 11:48:02.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/fs/proc/stat.c linux-4.4.110-vs2.3.9/fs/proc/stat.c
+--- linux-4.4.110/fs/proc/stat.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/proc/stat.c 2018-01-09 16:36:32.000000000 +0000
@@ -9,8 +9,10 @@
#include <linux/slab.h>
#include <linux/time.h>
/* 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-3.18.5/fs/proc/uptime.c linux-3.18.5-vs2.3.7.3/fs/proc/uptime.c
---- linux-3.18.5/fs/proc/uptime.c 2014-06-12 13:02:46.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/proc/uptime.c 2015-01-19 12:41:00.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/fs/proc/uptime.c linux-4.4.110-vs2.3.9/fs/proc/uptime.c
+--- linux-4.4.110/fs/proc/uptime.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/proc/uptime.c 2018-01-09 16:36:32.000000000 +0000
@@ -5,6 +5,7 @@
#include <linux/seq_file.h>
#include <linux/time.h>
seq_printf(m, "%lu.%02lu %lu.%02lu\n",
(unsigned long) uptime.tv_sec,
(uptime.tv_nsec / (NSEC_PER_SEC / 100)),
-diff -NurpP --minimal linux-3.18.5/fs/proc_namespace.c linux-3.18.5-vs2.3.7.3/fs/proc_namespace.c
---- linux-3.18.5/fs/proc_namespace.c 2015-01-16 22:19:20.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/proc_namespace.c 2015-01-19 10:58:04.000000000 +0000
-@@ -44,6 +44,8 @@ static int show_sb_opts(struct seq_file
- { MS_SYNCHRONOUS, ",sync" },
+diff -NurpP --minimal linux-4.4.110/fs/proc_namespace.c linux-4.4.110-vs2.3.9/fs/proc_namespace.c
+--- linux-4.4.110/fs/proc_namespace.c 2018-01-09 16:35:08.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/proc_namespace.c 2018-01-09 16:36:32.000000000 +0000
+@@ -46,6 +46,8 @@ static int show_sb_opts(struct seq_file
{ MS_DIRSYNC, ",dirsync" },
{ MS_MANDLOCK, ",mand" },
+ { MS_LAZYTIME, ",lazytime" },
+ { MS_TAGGED, ",tag" },
+ { MS_NOTAGCHECK, ",notagcheck" },
{ 0, NULL }
};
const struct proc_fs_info *fs_infop;
-@@ -80,6 +82,38 @@ static inline void mangle(struct seq_fil
+@@ -82,6 +84,38 @@ static inline void mangle(struct seq_fil
seq_escape(m, s, " \t\n\\");
}
static void show_type(struct seq_file *m, struct super_block *sb)
{
mangle(m, sb->s_type->name);
-@@ -96,6 +130,17 @@ static int show_vfsmnt(struct seq_file *
+@@ -99,6 +133,17 @@ static int show_vfsmnt(struct seq_file *
struct path mnt_path = { .dentry = mnt->mnt_root, .mnt = mnt };
struct super_block *sb = mnt_path.dentry->d_sb;
if (sb->s_op->show_devname) {
err = sb->s_op->show_devname(m, mnt_path.dentry);
if (err)
-@@ -106,6 +151,7 @@ static int show_vfsmnt(struct seq_file *
- seq_putc(m, ' ');
- seq_path(m, &mnt_path, " \t\n\\");
+@@ -112,6 +157,7 @@ static int show_vfsmnt(struct seq_file *
+ if (err)
+ goto out;
seq_putc(m, ' ');
+type:
show_type(m, sb);
seq_puts(m, __mnt_is_readonly(mnt) ? " ro" : " rw");
err = show_sb_opts(m, sb);
-@@ -128,6 +174,11 @@ static int show_mountinfo(struct seq_fil
- struct path root = p->root;
+@@ -133,6 +179,11 @@ static int show_mountinfo(struct seq_fil
+ struct path mnt_path = { .dentry = mnt->mnt_root, .mnt = mnt };
int err = 0;
+ if (vx_flags(VXF_HIDE_MOUNT, 0))
seq_printf(m, "%i %i %u:%u ", r->mnt_id, r->mnt_parent->mnt_id,
MAJOR(sb->s_dev), MINOR(sb->s_dev));
if (sb->s_op->show_path)
-@@ -187,6 +238,17 @@ static int show_vfsstat(struct seq_file
+@@ -193,6 +244,17 @@ static int show_vfsstat(struct seq_file
struct super_block *sb = mnt_path.dentry->d_sb;
int err = 0;
/* device */
if (sb->s_op->show_devname) {
seq_puts(m, "device ");
-@@ -203,7 +265,7 @@ static int show_vfsstat(struct seq_file
- seq_puts(m, " mounted on ");
- seq_path(m, &mnt_path, " \t\n\\");
+@@ -214,7 +276,7 @@ static int show_vfsstat(struct seq_file
+ if (err)
+ goto out;
seq_putc(m, ' ');
-
+type:
/* file system type */
seq_puts(m, "with fstype ");
show_type(m, sb);
-diff -NurpP --minimal linux-3.18.5/fs/quota/dquot.c linux-3.18.5-vs2.3.7.3/fs/quota/dquot.c
---- linux-3.18.5/fs/quota/dquot.c 2015-01-17 02:40:20.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/quota/dquot.c 2015-01-19 23:44:31.000000000 +0000
-@@ -1598,6 +1598,12 @@ int __dquot_alloc_space(struct inode *in
- struct dquot **dquots = inode->i_dquot;
+diff -NurpP --minimal linux-4.4.110/fs/quota/dquot.c linux-4.4.110-vs2.3.9/fs/quota/dquot.c
+--- linux-4.4.110/fs/quota/dquot.c 2018-01-09 16:35:08.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/quota/dquot.c 2018-01-09 16:36:32.000000000 +0000
+@@ -1643,6 +1643,9 @@ int __dquot_alloc_space(struct inode *in
int reserve = flags & DQUOT_SPACE_RESERVE;
+ struct dquot **dquots;
-+ if ((ret = dl_alloc_inode(inode)))
-+ return ret;
-+
+ if ((ret = dl_alloc_space(inode, number)))
+ return ret;
+
if (!dquot_active(inode)) {
inode_incr_space(inode, number, reserve);
goto out;
-@@ -1649,6 +1655,9 @@ int dquot_alloc_inode(const struct inode
+@@ -1695,6 +1698,9 @@ int dquot_alloc_inode(struct inode *inod
struct dquot_warn warn[MAXQUOTAS];
- struct dquot * const *dquots = inode->i_dquot;
+ struct dquot * const *dquots;
+ if ((ret = dl_alloc_inode(inode)))
+ return ret;
if (!dquot_active(inode))
return 0;
for (cnt = 0; cnt < MAXQUOTAS; cnt++)
-@@ -1748,6 +1757,8 @@ void __dquot_free_space(struct inode *in
- struct dquot **dquots = inode->i_dquot;
+@@ -1797,6 +1803,8 @@ void __dquot_free_space(struct inode *in
+ struct dquot **dquots;
int reserve = flags & DQUOT_SPACE_RESERVE, index;
+ dl_free_space(inode, number);
if (!dquot_active(inode)) {
inode_decr_space(inode, number, reserve);
return;
-@@ -1791,6 +1802,8 @@ void dquot_free_inode(const struct inode
- struct dquot * const *dquots = inode->i_dquot;
+@@ -1841,6 +1849,8 @@ void dquot_free_inode(struct inode *inod
+ struct dquot * const *dquots;
int index;
+ dl_free_inode(inode);
if (!dquot_active(inode))
return;
-diff -NurpP --minimal linux-3.18.5/fs/quota/quota.c linux-3.18.5-vs2.3.7.3/fs/quota/quota.c
---- linux-3.18.5/fs/quota/quota.c 2015-01-16 22:19:20.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/quota/quota.c 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/fs/quota/quota.c linux-4.4.110-vs2.3.9/fs/quota/quota.c
+--- linux-4.4.110/fs/quota/quota.c 2016-07-05 04:12:34.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/quota/quota.c 2018-01-09 16:36:32.000000000 +0000
@@ -8,6 +8,7 @@
#include <linux/fs.h>
#include <linux/namei.h>
return -EPERM;
}
-@@ -350,6 +351,46 @@ static int do_quotactl(struct super_bloc
+@@ -702,6 +703,46 @@ static int do_quotactl(struct super_bloc
#ifdef CONFIG_BLOCK
/* Return 1 if 'cmd' will block on frozen filesystem */
static int quotactl_cmd_write(int cmd)
{
-@@ -385,6 +426,22 @@ static struct super_block *quotactl_bloc
+@@ -737,6 +778,22 @@ static struct super_block *quotactl_bloc
putname(tmp);
if (IS_ERR(bdev))
return ERR_CAST(bdev);
if (quotactl_cmd_write(cmd))
sb = get_super_thawed(bdev);
else
-diff -NurpP --minimal linux-3.18.5/fs/stat.c linux-3.18.5-vs2.3.7.3/fs/stat.c
---- linux-3.18.5/fs/stat.c 2014-01-22 20:39:07.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/stat.c 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/fs/stat.c linux-4.4.110-vs2.3.9/fs/stat.c
+--- linux-4.4.110/fs/stat.c 2018-01-09 16:35:08.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/stat.c 2018-01-09 16:36:32.000000000 +0000
@@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod
stat->nlink = inode->i_nlink;
stat->uid = inode->i_uid;
stat->rdev = inode->i_rdev;
stat->size = i_size_read(inode);
stat->atime = inode->i_atime;
-diff -NurpP --minimal linux-3.18.5/fs/statfs.c linux-3.18.5-vs2.3.7.3/fs/statfs.c
---- linux-3.18.5/fs/statfs.c 2013-11-25 15:47:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/statfs.c 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/fs/statfs.c linux-4.4.110-vs2.3.9/fs/statfs.c
+--- linux-4.4.110/fs/statfs.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/statfs.c 2018-01-09 16:36:32.000000000 +0000
@@ -7,6 +7,8 @@
#include <linux/statfs.h>
#include <linux/security.h>
return retval;
}
-diff -NurpP --minimal linux-3.18.5/fs/super.c linux-3.18.5-vs2.3.7.3/fs/super.c
---- linux-3.18.5/fs/super.c 2015-01-17 02:40:20.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/super.c 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/fs/super.c linux-4.4.110-vs2.3.9/fs/super.c
+--- linux-4.4.110/fs/super.c 2018-01-09 16:35:08.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/super.c 2018-01-09 16:36:32.000000000 +0000
@@ -33,6 +33,8 @@
#include <linux/cleancache.h>
#include <linux/fsnotify.h>
#include "internal.h"
-@@ -1114,6 +1116,13 @@ mount_fs(struct file_system_type *type,
- WARN_ON(sb->s_bdi == &default_backing_dev_info);
+@@ -1131,6 +1133,13 @@ mount_fs(struct file_system_type *type,
+ WARN_ON(!sb->s_bdi);
sb->s_flags |= MS_BORN;
+ error = -EPERM;
error = security_sb_kern_mount(sb, flags, secdata);
if (error)
goto out_sb;
-diff -NurpP --minimal linux-3.18.5/fs/utimes.c linux-3.18.5-vs2.3.7.3/fs/utimes.c
---- linux-3.18.5/fs/utimes.c 2014-01-22 20:39:07.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/utimes.c 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/fs/utimes.c linux-4.4.110-vs2.3.9/fs/utimes.c
+--- linux-4.4.110/fs/utimes.c 2018-01-09 16:35:08.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/utimes.c 2018-01-09 16:36:32.000000000 +0000
@@ -8,6 +8,8 @@
#include <linux/stat.h>
#include <linux/utime.h>
if (times && times[0].tv_nsec == UTIME_NOW &&
times[1].tv_nsec == UTIME_NOW)
times = NULL;
-diff -NurpP --minimal linux-3.18.5/fs/xattr.c linux-3.18.5-vs2.3.7.3/fs/xattr.c
---- linux-3.18.5/fs/xattr.c 2015-01-17 02:40:20.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/fs/xattr.c 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/fs/xattr.c linux-4.4.110-vs2.3.9/fs/xattr.c
+--- linux-4.4.110/fs/xattr.c 2018-01-09 16:35:08.000000000 +0000
++++ linux-4.4.110-vs2.3.9/fs/xattr.c 2018-01-09 16:36:32.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/audit.h>
#include <linux/vmalloc.h>
return (mask & MAY_WRITE) ? -EPERM : -ENODATA;
return 0;
}
-diff -NurpP --minimal linux-3.18.5/include/linux/capability.h linux-3.18.5-vs2.3.7.3/include/linux/capability.h
---- linux-3.18.5/include/linux/capability.h 2015-01-16 22:19:21.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/capability.h 2015-01-19 10:58:04.000000000 +0000
-@@ -79,7 +79,8 @@ extern const kernel_cap_t __cap_init_eff
+diff -NurpP --minimal linux-4.4.110/include/linux/capability.h linux-4.4.110-vs2.3.9/include/linux/capability.h
+--- linux-4.4.110/include/linux/capability.h 2018-01-09 16:35:09.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/capability.h 2018-01-09 16:36:32.000000000 +0000
+@@ -77,7 +77,8 @@ extern const kernel_cap_t __cap_init_eff
#else /* HAND-CODED capability initializers */
#define CAP_LAST_U32 ((_KERNEL_CAPABILITY_U32S) - 1)
# 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-3.18.5/include/linux/cred.h linux-3.18.5-vs2.3.7.3/include/linux/cred.h
---- linux-3.18.5/include/linux/cred.h 2015-02-05 18:02:45.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/cred.h 2015-01-19 10:58:04.000000000 +0000
-@@ -144,6 +144,7 @@ extern void exit_creds(struct task_struc
+diff -NurpP --minimal linux-4.4.110/include/linux/cred.h linux-4.4.110-vs2.3.9/include/linux/cred.h
+--- linux-4.4.110/include/linux/cred.h 2018-01-09 16:35:09.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/cred.h 2018-01-09 16:36:32.000000000 +0000
+@@ -160,6 +160,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);
extern struct cred *prepare_creds(void);
extern struct cred *prepare_exec_creds(void);
extern int commit_creds(struct cred *);
-@@ -197,6 +198,31 @@ static inline void validate_process_cred
+@@ -220,6 +221,31 @@ static inline bool cap_ambient_invariant
+ cred->cap_inheritable));
}
- #endif
+static inline void set_cred_subscribers(struct cred *cred, int n)
+{
/**
* get_new_cred - Get a reference on a new set of credentials
* @cred: The new credentials to reference
-diff -NurpP --minimal linux-3.18.5/include/linux/devpts_fs.h linux-3.18.5-vs2.3.7.3/include/linux/devpts_fs.h
---- linux-3.18.5/include/linux/devpts_fs.h 2013-02-19 13:58:50.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/devpts_fs.h 2015-01-19 10:58:04.000000000 +0000
-@@ -45,5 +45,4 @@ static inline void devpts_pty_kill(struc
+diff -NurpP --minimal linux-4.4.110/include/linux/dcache.h linux-4.4.110-vs2.3.9/include/linux/dcache.h
+--- linux-4.4.110/include/linux/dcache.h 2018-01-09 16:35:09.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/dcache.h 2018-01-09 16:36:32.000000000 +0000
+@@ -10,6 +10,7 @@
+ #include <linux/cache.h>
+ #include <linux/rcupdate.h>
+ #include <linux/lockref.h>
++// #include <linux/vs_limit.h>
+
+ struct path;
+ struct vfsmount;
+@@ -351,8 +352,10 @@ extern char *dentry_path(struct dentry *
+ */
+ static inline struct dentry *dget_dlock(struct dentry *dentry)
+ {
+- if (dentry)
++ if (dentry) {
+ dentry->d_lockref.count++;
++ // vx_dentry_inc(dentry);
++ }
+ return dentry;
+ }
+
+diff -NurpP --minimal linux-4.4.110/include/linux/devpts_fs.h linux-4.4.110-vs2.3.9/include/linux/devpts_fs.h
+--- linux-4.4.110/include/linux/devpts_fs.h 2018-01-09 16:35:09.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/devpts_fs.h 2018-01-09 16:36:32.000000000 +0000
+@@ -35,5 +35,4 @@ void devpts_pty_kill(struct inode *inode
#endif
-
#endif /* _LINUX_DEVPTS_FS_H */
-diff -NurpP --minimal linux-3.18.5/include/linux/fs.h linux-3.18.5-vs2.3.7.3/include/linux/fs.h
---- linux-3.18.5/include/linux/fs.h 2015-01-17 02:40:21.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/fs.h 2015-01-19 10:58:04.000000000 +0000
-@@ -221,6 +221,7 @@ typedef void (dio_iodone_t)(struct kiocb
- #define ATTR_KILL_PRIV (1 << 14)
+diff -NurpP --minimal linux-4.4.110/include/linux/fs.h linux-4.4.110-vs2.3.9/include/linux/fs.h
+--- linux-4.4.110/include/linux/fs.h 2018-01-09 16:35:09.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/fs.h 2018-01-09 16:43:56.000000000 +0000
+@@ -227,6 +227,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_TAG (1 << 17)
+ #define ATTR_TOUCH (1 << 17)
++#define ATTR_TAG (1 << 18)
/*
* Whiteout is represented by a char device. The following constants define the
-@@ -243,6 +244,7 @@ struct iattr {
+@@ -249,6 +250,7 @@ struct iattr {
umode_t ia_mode;
kuid_t ia_uid;
kgid_t ia_gid;
loff_t ia_size;
struct timespec ia_atime;
struct timespec ia_mtime;
-@@ -540,7 +542,9 @@ struct inode {
+@@ -587,7 +589,9 @@ struct inode {
unsigned short i_opflags;
kuid_t i_uid;
kgid_t i_gid;
#ifdef CONFIG_FS_POSIX_ACL
struct posix_acl *i_acl;
-@@ -569,6 +573,7 @@ struct inode {
+@@ -616,6 +620,7 @@ struct inode {
unsigned int __i_nlink;
};
dev_t i_rdev;
loff_t i_size;
struct timespec i_atime;
struct timespec i_mtime;
-@@ -730,6 +735,11 @@ static inline gid_t i_gid_read(const str
+@@ -814,6 +819,11 @@ static inline gid_t i_gid_read(const str
return from_kgid(&init_user_ns, inode->i_gid);
}
static inline void i_uid_write(struct inode *inode, uid_t uid)
{
inode->i_uid = make_kuid(&init_user_ns, uid);
-@@ -740,14 +750,19 @@ static inline void i_gid_write(struct in
+@@ -824,14 +834,19 @@ static inline void i_gid_write(struct in
inode->i_gid = make_kgid(&init_user_ns, gid);
}
}
extern struct block_device *I_BDEV(struct inode *inode);
-@@ -805,6 +820,7 @@ struct file {
+@@ -888,6 +903,7 @@ struct file {
loff_t f_pos;
struct fown_struct f_owner;
const struct cred *f_cred;
struct file_ra_state f_ra;
u64 f_version;
-@@ -929,6 +945,7 @@ struct file_lock {
+@@ -1022,6 +1038,7 @@ struct file_lock {
struct file *fl_file;
loff_t fl_start;
loff_t fl_end;
struct fasync_struct * fl_fasync; /* for lease break notifications */
/* for lease breaks: */
-@@ -1542,6 +1559,7 @@ struct inode_operations {
+@@ -1698,6 +1715,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 *);
int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start,
u64 len);
int (*update_time)(struct inode *, struct timespec *, int);
-@@ -1559,6 +1577,7 @@ ssize_t rw_copy_check_uvector(int type,
+@@ -1712,6 +1730,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);
+ssize_t vfs_sendfile(struct file *, struct file *, loff_t *, size_t, loff_t);
- 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 *);
-@@ -1612,6 +1631,14 @@ struct super_operations {
- #define S_IMA 1024 /* Inode has an associated IMA struct */
- #define S_AUTOMOUNT 2048 /* Automount/referral quasi-directory */
- #define S_NOSEC 4096 /* no suid or xattr security attributes */
-+#define S_IXUNLINK 8192 /* Immutable Invert on unlink */
+ 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 *);
+@@ -1777,6 +1796,14 @@ struct super_operations {
+ #else
+ #define S_DAX 0 /* Make all the DAX code disappear */
+ #endif
++#define S_IXUNLINK 16384 /* Immutable Invert on unlink */
+
+/* Linux-VServer related Inode flags */
+
/*
* Note that nosuid etc flags are inode-specific: setting some file-system
-@@ -1636,10 +1663,13 @@ struct super_operations {
+@@ -1801,10 +1828,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)
#define IS_POSIXACL(inode) __IS_FLG(inode, MS_POSIXACL)
#define IS_DEADDIR(inode) ((inode)->i_flags & S_DEAD)
-@@ -1653,6 +1683,16 @@ struct super_operations {
+@@ -1819,6 +1849,16 @@ struct super_operations {
#define IS_WHITEOUT(inode) (S_ISCHR(inode->i_mode) && \
(inode)->i_rdev == WHITEOUT_DEV)
/*
* Inode state bits. Protected by inode->i_lock
*
-@@ -1902,6 +1942,9 @@ extern struct kobject *fs_kobj;
+@@ -2075,6 +2115,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);
/*
* Candidates for mandatory locking have the setgid bit set
* but no group execute bit - an otherwise meaningless combination.
-@@ -2610,6 +2653,7 @@ extern int dcache_dir_open(struct inode
+@@ -2830,6 +2873,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 *);
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-3.18.5/include/linux/init_task.h linux-3.18.5-vs2.3.7.3/include/linux/init_task.h
---- linux-3.18.5/include/linux/init_task.h 2015-01-17 02:40:21.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/init_task.h 2015-01-19 10:58:04.000000000 +0000
-@@ -237,6 +237,10 @@ extern struct task_group root_task_group
- INIT_CPUSET_SEQ(tsk) \
- INIT_RT_MUTEXES(tsk) \
+diff -NurpP --minimal linux-4.4.110/include/linux/init_task.h linux-4.4.110-vs2.3.9/include/linux/init_task.h
+--- linux-4.4.110/include/linux/init_task.h 2016-07-05 04:15:10.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/init_task.h 2018-01-09 16:36:32.000000000 +0000
+@@ -260,6 +260,10 @@ extern struct task_group root_task_group
INIT_VTIME(tsk) \
+ INIT_NUMA_BALANCING(tsk) \
+ INIT_KASAN(tsk) \
+ .xid = 0, \
+ .vx_info = NULL, \
+ .nid = 0, \
}
-diff -NurpP --minimal linux-3.18.5/include/linux/ipc.h linux-3.18.5-vs2.3.7.3/include/linux/ipc.h
---- linux-3.18.5/include/linux/ipc.h 2014-06-12 11:35:01.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/ipc.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/ipc.h linux-4.4.110-vs2.3.9/include/linux/ipc.h
+--- linux-4.4.110/include/linux/ipc.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/ipc.h 2018-01-09 16:36:32.000000000 +0000
@@ -16,6 +16,7 @@ struct kern_ipc_perm
key_t key;
kuid_t uid;
kuid_t cuid;
kgid_t cgid;
umode_t mode;
-diff -NurpP --minimal linux-3.18.5/include/linux/memcontrol.h linux-3.18.5-vs2.3.7.3/include/linux/memcontrol.h
---- linux-3.18.5/include/linux/memcontrol.h 2015-01-17 02:40:21.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/memcontrol.h 2015-01-19 10:58:04.000000000 +0000
-@@ -79,6 +79,13 @@ extern struct mem_cgroup *mem_cgroup_fro
- extern struct mem_cgroup *parent_mem_cgroup(struct mem_cgroup *memcg);
- extern struct mem_cgroup *mem_cgroup_from_css(struct cgroup_subsys_state *css);
-
-+extern u64 mem_cgroup_res_read_u64(struct mem_cgroup *mem, int member);
-+extern u64 mem_cgroup_memsw_read_u64(struct mem_cgroup *mem, int member);
-+
-+extern s64 mem_cgroup_stat_read_cache(struct mem_cgroup *mem);
-+extern s64 mem_cgroup_stat_read_anon(struct mem_cgroup *mem);
-+extern s64 mem_cgroup_stat_read_mapped(struct mem_cgroup *mem);
-+
- static inline
- bool mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *memcg)
+diff -NurpP --minimal linux-4.4.110/include/linux/memcontrol.h linux-4.4.110-vs2.3.9/include/linux/memcontrol.h
+--- linux-4.4.110/include/linux/memcontrol.h 2018-01-09 16:35:09.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/memcontrol.h 2018-01-09 16:36:32.000000000 +0000
+@@ -113,6 +113,7 @@ struct cg_proto {
+ struct mem_cgroup *memcg;
+ };
+
++
+ #ifdef CONFIG_MEMCG
+ struct mem_cgroup_stat_cpu {
+ long count[MEM_CGROUP_STAT_NSTATS];
+@@ -338,6 +339,11 @@ static inline bool mem_cgroup_is_descend
+ return cgroup_is_descendant(memcg->css.cgroup, root->css.cgroup);
+ }
+
++extern u64 mem_cgroup_mem_usage_pages(struct mem_cgroup *memcg);
++extern u64 mem_cgroup_mem_limit_pages(struct mem_cgroup *memcg);
++extern u64 mem_cgroup_memsw_usage_pages(struct mem_cgroup *memcg);
++extern u64 mem_cgroup_memsw_limit_pages(struct mem_cgroup *memcg);
++
+ static inline bool mm_match_cgroup(struct mm_struct *mm,
+ struct mem_cgroup *memcg)
{
-diff -NurpP --minimal linux-3.18.5/include/linux/mount.h linux-3.18.5-vs2.3.7.3/include/linux/mount.h
---- linux-3.18.5/include/linux/mount.h 2015-01-17 02:40:21.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/mount.h 2015-01-19 10:58:04.000000000 +0000
-@@ -62,6 +62,9 @@ struct mnt_namespace;
- #define MNT_SYNC_UMOUNT 0x2000000
+diff -NurpP --minimal linux-4.4.110/include/linux/mount.h linux-4.4.110-vs2.3.9/include/linux/mount.h
+--- linux-4.4.110/include/linux/mount.h 2018-01-09 16:35:09.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/mount.h 2018-01-09 16:36:32.000000000 +0000
+@@ -63,6 +63,9 @@ struct mnt_namespace;
#define MNT_MARKED 0x4000000
+ #define MNT_UMOUNT 0x8000000
+#define MNT_TAGID 0x10000
+#define MNT_NOTAG 0x20000
struct vfsmount {
struct dentry *mnt_root; /* root of the mounted tree */
struct super_block *mnt_sb; /* pointer to superblock */
-diff -NurpP --minimal linux-3.18.5/include/linux/net.h linux-3.18.5-vs2.3.7.3/include/linux/net.h
---- linux-3.18.5/include/linux/net.h 2014-06-12 13:02:49.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/net.h 2015-01-19 10:58:04.000000000 +0000
-@@ -39,6 +39,7 @@ struct net;
+diff -NurpP --minimal linux-4.4.110/include/linux/net.h linux-4.4.110-vs2.3.9/include/linux/net.h
+--- linux-4.4.110/include/linux/net.h 2018-01-09 16:35:09.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/net.h 2018-01-09 16:42:30.000000000 +0000
+@@ -43,6 +43,7 @@ struct net;
+ #define SOCK_NOSPACE 2
#define SOCK_PASSCRED 3
#define SOCK_PASSSEC 4
- #define SOCK_EXTERNALLY_ALLOCATED 5
-+#define SOCK_USER_SOCKET 6
++#define SOCK_USER_SOCKET 5
#ifndef ARCH_HAS_SOCKET_TYPES
/**
-diff -NurpP --minimal linux-3.18.5/include/linux/netdevice.h linux-3.18.5-vs2.3.7.3/include/linux/netdevice.h
---- linux-3.18.5/include/linux/netdevice.h 2015-02-05 18:02:45.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/netdevice.h 2015-01-28 11:48:02.000000000 +0000
-@@ -2124,6 +2124,7 @@ int init_dummy_netdev(struct net_device
+diff -NurpP --minimal linux-4.4.110/include/linux/netdevice.h linux-4.4.110-vs2.3.9/include/linux/netdevice.h
+--- linux-4.4.110/include/linux/netdevice.h 2018-01-09 16:35:09.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/netdevice.h 2018-01-09 16:36:32.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_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-3.18.5/include/linux/nsproxy.h linux-3.18.5-vs2.3.7.3/include/linux/nsproxy.h
---- linux-3.18.5/include/linux/nsproxy.h 2015-01-16 22:19:23.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/nsproxy.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/nsproxy.h linux-4.4.110-vs2.3.9/include/linux/nsproxy.h
+--- linux-4.4.110/include/linux/nsproxy.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/nsproxy.h 2018-01-09 16:36:32.000000000 +0000
@@ -3,6 +3,7 @@
#include <linux/spinlock.h>
}
#endif
-diff -NurpP --minimal linux-3.18.5/include/linux/pid.h linux-3.18.5-vs2.3.7.3/include/linux/pid.h
---- linux-3.18.5/include/linux/pid.h 2013-11-25 15:45:06.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/pid.h 2015-01-19 10:58:04.000000000 +0000
-@@ -8,7 +8,8 @@ enum pid_type
- PIDTYPE_PID,
- PIDTYPE_PGID,
+diff -NurpP --minimal linux-4.4.110/include/linux/pid.h linux-4.4.110-vs2.3.9/include/linux/pid.h
+--- linux-4.4.110/include/linux/pid.h 2018-01-09 16:35:09.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/pid.h 2018-01-09 16:45:21.000000000 +0000
+@@ -10,7 +10,8 @@ enum pid_type
PIDTYPE_SID,
-- PIDTYPE_MAX
-+ PIDTYPE_MAX,
-+ PIDTYPE_REALPID
+ PIDTYPE_MAX,
+ /* only valid to __task_pid_nr_ns() */
+- __PIDTYPE_TGID
++ __PIDTYPE_TGID,
++ __PIDTYPE_REALPID
};
/*
-@@ -170,6 +171,7 @@ static inline pid_t pid_nr(struct pid *p
+@@ -172,6 +173,7 @@ static inline pid_t pid_nr(struct pid *p
}
pid_t pid_nr_ns(struct pid *pid, struct pid_namespace *ns);
pid_t pid_vnr(struct pid *pid);
#define do_each_pid_task(pid, type, task) \
-diff -NurpP --minimal linux-3.18.5/include/linux/quotaops.h linux-3.18.5-vs2.3.7.3/include/linux/quotaops.h
---- linux-3.18.5/include/linux/quotaops.h 2014-06-12 13:02:49.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/quotaops.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/quotaops.h linux-4.4.110-vs2.3.9/include/linux/quotaops.h
+--- linux-4.4.110/include/linux/quotaops.h 2016-07-05 04:12:37.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/quotaops.h 2018-01-09 16:36:32.000000000 +0000
@@ -8,6 +8,7 @@
#define _LINUX_QUOTAOPS_
#define DQUOT_SPACE_WARN 0x1
#define DQUOT_SPACE_RESERVE 0x2
-@@ -215,11 +216,12 @@ static inline void dquot_drop(struct ino
+@@ -211,11 +212,12 @@ static inline void dquot_drop(struct ino
- static inline int dquot_alloc_inode(const struct inode *inode)
+ static inline int dquot_alloc_inode(struct inode *inode)
{
- return 0;
+ return dl_alloc_inode(inode);
}
- static inline void dquot_free_inode(const struct inode *inode)
+ static inline void dquot_free_inode(struct inode *inode)
{
+ dl_free_inode(inode);
}
static inline int dquot_transfer(struct inode *inode, struct iattr *iattr)
-@@ -230,6 +232,10 @@ static inline int dquot_transfer(struct
+@@ -226,6 +228,10 @@ static inline int dquot_transfer(struct
static inline int __dquot_alloc_space(struct inode *inode, qsize_t number,
int flags)
{
if (!(flags & DQUOT_SPACE_RESERVE))
inode_add_bytes(inode, number);
return 0;
-@@ -240,6 +246,7 @@ static inline void __dquot_free_space(st
+@@ -236,6 +242,7 @@ static inline void __dquot_free_space(st
{
if (!(flags & DQUOT_SPACE_RESERVE))
inode_sub_bytes(inode, number);
}
static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
-diff -NurpP --minimal linux-3.18.5/include/linux/sched.h linux-3.18.5-vs2.3.7.3/include/linux/sched.h
---- linux-3.18.5/include/linux/sched.h 2015-01-17 02:40:22.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/sched.h 2015-01-19 10:58:04.000000000 +0000
-@@ -1438,6 +1438,14 @@ struct task_struct {
+diff -NurpP --minimal linux-4.4.110/include/linux/sched.h linux-4.4.110-vs2.3.9/include/linux/sched.h
+--- linux-4.4.110/include/linux/sched.h 2018-01-09 16:35:09.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/sched.h 2018-01-09 16:36:32.000000000 +0000
+@@ -1600,6 +1600,14 @@ struct task_struct {
#endif
struct seccomp seccomp;
/* Thread group tracking */
u32 parent_exec_id;
u32 self_exec_id;
-@@ -1743,6 +1751,11 @@ struct pid_namespace;
+@@ -1927,6 +1935,11 @@ struct pid_namespace;
pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
struct pid_namespace *ns);
static inline pid_t task_pid_nr(struct task_struct *tsk)
{
return tsk->pid;
-@@ -1756,7 +1769,8 @@ static inline pid_t task_pid_nr_ns(struc
+@@ -1940,7 +1953,8 @@ static inline pid_t task_pid_nr_ns(struc
static inline pid_t task_pid_vnr(struct task_struct *tsk)
{
}
-@@ -1769,7 +1783,7 @@ pid_t task_tgid_nr_ns(struct task_struct
-
- static inline pid_t task_tgid_vnr(struct task_struct *tsk)
- {
-- return pid_vnr(task_tgid(tsk));
-+ return vx_map_tgid(pid_vnr(task_tgid(tsk)));
- }
-
-
-diff -NurpP --minimal linux-3.18.5/include/linux/shmem_fs.h linux-3.18.5-vs2.3.7.3/include/linux/shmem_fs.h
---- linux-3.18.5/include/linux/shmem_fs.h 2015-01-16 22:19:23.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/shmem_fs.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/shmem_fs.h linux-4.4.110-vs2.3.9/include/linux/shmem_fs.h
+--- linux-4.4.110/include/linux/shmem_fs.h 2018-01-09 16:35:09.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/shmem_fs.h 2018-01-09 16:36:32.000000000 +0000
@@ -10,6 +10,9 @@
/* inode in-kernel data */
struct shmem_inode_info {
spinlock_t lock;
unsigned int seals; /* shmem seals */
-diff -NurpP --minimal linux-3.18.5/include/linux/stat.h linux-3.18.5-vs2.3.7.3/include/linux/stat.h
---- linux-3.18.5/include/linux/stat.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/stat.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/stat.h linux-4.4.110-vs2.3.9/include/linux/stat.h
+--- linux-4.4.110/include/linux/stat.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/stat.h 2018-01-09 16:36:32.000000000 +0000
@@ -25,6 +25,7 @@ struct kstat {
unsigned int nlink;
kuid_t uid;
dev_t rdev;
loff_t size;
struct timespec atime;
-diff -NurpP --minimal linux-3.18.5/include/linux/sunrpc/auth.h linux-3.18.5-vs2.3.7.3/include/linux/sunrpc/auth.h
---- linux-3.18.5/include/linux/sunrpc/auth.h 2015-01-16 22:19:23.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/sunrpc/auth.h 2015-01-19 10:58:04.000000000 +0000
-@@ -36,6 +36,7 @@ enum {
+diff -NurpP --minimal linux-4.4.110/include/linux/sunrpc/auth.h linux-4.4.110-vs2.3.9/include/linux/sunrpc/auth.h
+--- linux-4.4.110/include/linux/sunrpc/auth.h 2016-07-05 04:12:37.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/sunrpc/auth.h 2018-01-09 16:36:32.000000000 +0000
+@@ -40,6 +40,7 @@ enum {
struct auth_cred {
kuid_t uid;
kgid_t gid;
struct group_info *group_info;
const char *principal;
unsigned long ac_flags;
-diff -NurpP --minimal linux-3.18.5/include/linux/sunrpc/clnt.h linux-3.18.5-vs2.3.7.3/include/linux/sunrpc/clnt.h
---- linux-3.18.5/include/linux/sunrpc/clnt.h 2014-06-12 13:02:50.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/sunrpc/clnt.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/sunrpc/clnt.h linux-4.4.110-vs2.3.9/include/linux/sunrpc/clnt.h
+--- linux-4.4.110/include/linux/sunrpc/clnt.h 2018-01-09 16:35:09.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/sunrpc/clnt.h 2018-01-09 16:36:32.000000000 +0000
@@ -51,7 +51,8 @@ struct rpc_clnt {
cl_discrtry : 1,/* disconnect before retry */
cl_noretranstimeo: 1,/* No retransmit timeouts */
struct rpc_rtt * cl_rtt; /* RTO estimator data */
const struct rpc_timeout *cl_timeout; /* Timeout strategy */
-diff -NurpP --minimal linux-3.18.5/include/linux/types.h linux-3.18.5-vs2.3.7.3/include/linux/types.h
---- linux-3.18.5/include/linux/types.h 2014-09-03 13:19:43.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/types.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/types.h linux-4.4.110-vs2.3.9/include/linux/types.h
+--- linux-4.4.110/include/linux/types.h 2016-07-05 04:15:11.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/types.h 2018-01-09 16:36:32.000000000 +0000
@@ -32,6 +32,9 @@ typedef __kernel_uid32_t uid_t;
typedef __kernel_gid32_t gid_t;
typedef __kernel_uid16_t uid16_t;
typedef unsigned long uintptr_t;
-diff -NurpP --minimal linux-3.18.5/include/linux/uidgid.h linux-3.18.5-vs2.3.7.3/include/linux/uidgid.h
---- linux-3.18.5/include/linux/uidgid.h 2014-06-12 11:35:03.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/uidgid.h 2015-01-25 18:11:57.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/uidgid.h linux-4.4.110-vs2.3.9/include/linux/uidgid.h
+--- linux-4.4.110/include/linux/uidgid.h 2015-07-06 20:41:43.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/uidgid.h 2018-01-09 16:36:32.000000000 +0000
@@ -21,13 +21,17 @@ typedef struct {
uid_t val;
} kuid_t;
#define KGIDT_INIT(value) (kgid_t){ value }
+#define KTAGT_INIT(value) (ktag_t){ value }
+ #ifdef CONFIG_MULTIUSER
static inline uid_t __kuid_val(kuid_t uid)
- {
-@@ -39,11 +43,18 @@ static inline gid_t __kgid_val(kgid_t gi
- return gid.val;
+@@ -51,11 +55,18 @@ static inline gid_t __kgid_val(kgid_t gi
}
+ #endif
+static inline vtag_t __ktag_val(ktag_t tag)
+{
static inline bool uid_eq(kuid_t left, kuid_t right)
{
-@@ -55,6 +66,11 @@ static inline bool gid_eq(kgid_t left, k
+@@ -67,6 +78,11 @@ static inline bool gid_eq(kgid_t left, k
return __kgid_val(left) == __kgid_val(right);
}
static inline bool uid_gt(kuid_t left, kuid_t right)
{
return __kuid_val(left) > __kuid_val(right);
-@@ -105,13 +121,21 @@ static inline bool gid_valid(kgid_t gid)
- return !gid_eq(gid, INVALID_GID);
+@@ -117,13 +133,21 @@ static inline bool gid_valid(kgid_t gid)
+ return __kgid_val(gid) != (gid_t) -1;
}
+static inline bool tag_valid(ktag_t tag)
extern uid_t from_kuid_munged(struct user_namespace *to, kuid_t uid);
extern gid_t from_kgid_munged(struct user_namespace *to, kgid_t gid);
-@@ -137,6 +161,11 @@ static inline kgid_t make_kgid(struct us
+@@ -149,6 +173,11 @@ static inline kgid_t make_kgid(struct us
return KGIDT_INIT(gid);
}
static inline uid_t from_kuid(struct user_namespace *to, kuid_t kuid)
{
return __kuid_val(kuid);
-@@ -147,6 +176,11 @@ static inline gid_t from_kgid(struct use
+@@ -159,6 +188,11 @@ static inline gid_t from_kgid(struct use
return __kgid_val(kgid);
}
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-3.18.5/include/linux/vroot.h linux-3.18.5-vs2.3.7.3/include/linux/vroot.h
---- linux-3.18.5/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vroot.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vroot.h linux-4.4.110-vs2.3.9/include/linux/vroot.h
+--- linux-4.4.110/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vroot.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,51 @@
+
+/*
+ * include/linux/vroot.h
+ *
-+ * written by Herbert Pötzl, 9/11/2002
-+ * ported to 2.6 by Herbert Pötzl, 30/12/2004
++ * written by Herbert P?tzl, 9/11/2002
++ * ported to 2.6 by Herbert P?tzl, 30/12/2004
+ *
-+ * Copyright (C) 2002-2007 by Herbert Pötzl.
++ * Copyright (C) 2002-2007 by Herbert P?tzl.
+ * Redistribution of this file is permitted under the
+ * GNU General Public License.
+ */
+#define VROOT_CLR_DEV 0x5601
+
+#endif /* _LINUX_VROOT_H */
-diff -NurpP --minimal linux-3.18.5/include/linux/vs_base.h linux-3.18.5-vs2.3.7.3/include/linux/vs_base.h
---- linux-3.18.5/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vs_base.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vs_base.h linux-4.4.110-vs2.3.9/include/linux/vs_base.h
+--- linux-4.4.110/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vs_base.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,10 @@
+#ifndef _VS_BASE_H
+#define _VS_BASE_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.18.5/include/linux/vs_context.h linux-3.18.5-vs2.3.7.3/include/linux/vs_context.h
---- linux-3.18.5/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vs_context.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vs_context.h linux-4.4.110-vs2.3.9/include/linux/vs_context.h
+--- linux-4.4.110/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vs_context.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,242 @@
+#ifndef _VS_CONTEXT_H
+#define _VS_CONTEXT_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.18.5/include/linux/vs_cowbl.h linux-3.18.5-vs2.3.7.3/include/linux/vs_cowbl.h
---- linux-3.18.5/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vs_cowbl.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vs_cowbl.h linux-4.4.110-vs2.3.9/include/linux/vs_cowbl.h
+--- linux-4.4.110/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vs_cowbl.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,48 @@
+#ifndef _VS_COWBL_H
+#define _VS_COWBL_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.18.5/include/linux/vs_cvirt.h linux-3.18.5-vs2.3.7.3/include/linux/vs_cvirt.h
---- linux-3.18.5/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vs_cvirt.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vs_cvirt.h linux-4.4.110-vs2.3.9/include/linux/vs_cvirt.h
+--- linux-4.4.110/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vs_cvirt.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,50 @@
+#ifndef _VS_CVIRT_H
+#define _VS_CVIRT_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.18.5/include/linux/vs_device.h linux-3.18.5-vs2.3.7.3/include/linux/vs_device.h
---- linux-3.18.5/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vs_device.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vs_device.h linux-4.4.110-vs2.3.9/include/linux/vs_device.h
+--- linux-4.4.110/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vs_device.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,45 @@
+#ifndef _VS_DEVICE_H
+#define _VS_DEVICE_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.18.5/include/linux/vs_dlimit.h linux-3.18.5-vs2.3.7.3/include/linux/vs_dlimit.h
---- linux-3.18.5/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vs_dlimit.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vs_dlimit.h linux-4.4.110-vs2.3.9/include/linux/vs_dlimit.h
+--- linux-4.4.110/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vs_dlimit.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,215 @@
+#ifndef _VS_DLIMIT_H
+#define _VS_DLIMIT_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.18.5/include/linux/vs_inet.h linux-3.18.5-vs2.3.7.3/include/linux/vs_inet.h
---- linux-3.18.5/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vs_inet.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vs_inet.h linux-4.4.110-vs2.3.9/include/linux/vs_inet.h
+--- linux-4.4.110/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vs_inet.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,364 @@
+#ifndef _VS_INET_H
+#define _VS_INET_H
+#else
+// #warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.18.5/include/linux/vs_inet6.h linux-3.18.5-vs2.3.7.3/include/linux/vs_inet6.h
---- linux-3.18.5/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vs_inet6.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vs_inet6.h linux-4.4.110-vs2.3.9/include/linux/vs_inet6.h
+--- linux-4.4.110/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vs_inet6.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,257 @@
+#ifndef _VS_INET6_H
+#define _VS_INET6_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.18.5/include/linux/vs_limit.h linux-3.18.5-vs2.3.7.3/include/linux/vs_limit.h
---- linux-3.18.5/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vs_limit.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vs_limit.h linux-4.4.110-vs2.3.9/include/linux/vs_limit.h
+--- linux-4.4.110/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vs_limit.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,140 @@
+#ifndef _VS_LIMIT_H
+#define _VS_LIMIT_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.18.5/include/linux/vs_network.h linux-3.18.5-vs2.3.7.3/include/linux/vs_network.h
---- linux-3.18.5/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vs_network.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vs_network.h linux-4.4.110-vs2.3.9/include/linux/vs_network.h
+--- linux-4.4.110/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vs_network.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,169 @@
+#ifndef _NX_VS_NETWORK_H
+#define _NX_VS_NETWORK_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.18.5/include/linux/vs_pid.h linux-3.18.5-vs2.3.7.3/include/linux/vs_pid.h
---- linux-3.18.5/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vs_pid.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vs_pid.h linux-4.4.110-vs2.3.9/include/linux/vs_pid.h
+--- linux-4.4.110/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vs_pid.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,50 @@
+#ifndef _VS_PID_H
+#define _VS_PID_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.18.5/include/linux/vs_sched.h linux-3.18.5-vs2.3.7.3/include/linux/vs_sched.h
---- linux-3.18.5/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vs_sched.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vs_sched.h linux-4.4.110-vs2.3.9/include/linux/vs_sched.h
+--- linux-4.4.110/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vs_sched.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,40 @@
+#ifndef _VS_SCHED_H
+#define _VS_SCHED_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.18.5/include/linux/vs_socket.h linux-3.18.5-vs2.3.7.3/include/linux/vs_socket.h
---- linux-3.18.5/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vs_socket.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vs_socket.h linux-4.4.110-vs2.3.9/include/linux/vs_socket.h
+--- linux-4.4.110/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vs_socket.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,67 @@
+#ifndef _VS_SOCKET_H
+#define _VS_SOCKET_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.18.5/include/linux/vs_tag.h linux-3.18.5-vs2.3.7.3/include/linux/vs_tag.h
---- linux-3.18.5/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vs_tag.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vs_tag.h linux-4.4.110-vs2.3.9/include/linux/vs_tag.h
+--- linux-4.4.110/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vs_tag.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,47 @@
+#ifndef _VS_TAG_H
+#define _VS_TAG_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.18.5/include/linux/vs_time.h linux-3.18.5-vs2.3.7.3/include/linux/vs_time.h
---- linux-3.18.5/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vs_time.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vs_time.h linux-4.4.110-vs2.3.9/include/linux/vs_time.h
+--- linux-4.4.110/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vs_time.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,19 @@
+#ifndef _VS_TIME_H
+#define _VS_TIME_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.18.5/include/linux/vserver/base.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/base.h
---- linux-3.18.5/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/base.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vserver/base.h linux-4.4.110-vs2.3.9/include/linux/vserver/base.h
+--- linux-4.4.110/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vserver/base.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,184 @@
+#ifndef _VSERVER_BASE_H
+#define _VSERVER_BASE_H
+#define nx_info_state(n, m) (__nx_state(n) & (m))
+
+#endif
-diff -NurpP --minimal linux-3.18.5/include/linux/vserver/cacct.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/cacct.h
---- linux-3.18.5/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/cacct.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vserver/cacct.h linux-4.4.110-vs2.3.9/include/linux/vserver/cacct.h
+--- linux-4.4.110/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vserver/cacct.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,15 @@
+#ifndef _VSERVER_CACCT_H
+#define _VSERVER_CACCT_H
+};
+
+#endif /* _VSERVER_CACCT_H */
-diff -NurpP --minimal linux-3.18.5/include/linux/vserver/cacct_cmd.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/cacct_cmd.h
---- linux-3.18.5/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/cacct_cmd.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vserver/cacct_cmd.h linux-4.4.110-vs2.3.9/include/linux/vserver/cacct_cmd.h
+--- linux-4.4.110/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vserver/cacct_cmd.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,10 @@
+#ifndef _VSERVER_CACCT_CMD_H
+#define _VSERVER_CACCT_CMD_H
+extern int vc_sock_stat(struct vx_info *, void __user *);
+
+#endif /* _VSERVER_CACCT_CMD_H */
-diff -NurpP --minimal linux-3.18.5/include/linux/vserver/cacct_def.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/cacct_def.h
---- linux-3.18.5/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/cacct_def.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vserver/cacct_def.h linux-4.4.110-vs2.3.9/include/linux/vserver/cacct_def.h
+--- linux-4.4.110/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vserver/cacct_def.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,43 @@
+#ifndef _VSERVER_CACCT_DEF_H
+#define _VSERVER_CACCT_DEF_H
+#endif
+
+#endif /* _VSERVER_CACCT_DEF_H */
-diff -NurpP --minimal linux-3.18.5/include/linux/vserver/cacct_int.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/cacct_int.h
---- linux-3.18.5/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/cacct_int.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vserver/cacct_int.h linux-4.4.110-vs2.3.9/include/linux/vserver/cacct_int.h
+--- linux-4.4.110/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vserver/cacct_int.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,17 @@
+#ifndef _VSERVER_CACCT_INT_H
+#define _VSERVER_CACCT_INT_H
+}
+
+#endif /* _VSERVER_CACCT_INT_H */
-diff -NurpP --minimal linux-3.18.5/include/linux/vserver/check.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/check.h
---- linux-3.18.5/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/check.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vserver/check.h linux-4.4.110-vs2.3.9/include/linux/vserver/check.h
+--- linux-4.4.110/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vserver/check.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,89 @@
+#ifndef _VSERVER_CHECK_H
+#define _VSERVER_CHECK_H
+#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1)
+
+#endif
-diff -NurpP --minimal linux-3.18.5/include/linux/vserver/context.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/context.h
---- linux-3.18.5/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/context.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vserver/context.h linux-4.4.110-vs2.3.9/include/linux/vserver/context.h
+--- linux-4.4.110/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vserver/context.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,110 @@
+#ifndef _VSERVER_CONTEXT_H
+#define _VSERVER_CONTEXT_H
+
+
+#endif /* _VSERVER_CONTEXT_H */
-diff -NurpP --minimal linux-3.18.5/include/linux/vserver/context_cmd.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/context_cmd.h
---- linux-3.18.5/include/linux/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/context_cmd.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vserver/context_cmd.h linux-4.4.110-vs2.3.9/include/linux/vserver/context_cmd.h
+--- linux-4.4.110/include/linux/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vserver/context_cmd.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,33 @@
+#ifndef _VSERVER_CONTEXT_CMD_H
+#define _VSERVER_CONTEXT_CMD_H
+extern int vc_set_badness(struct vx_info *, void __user *);
+
+#endif /* _VSERVER_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-3.18.5/include/linux/vserver/cvirt.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/cvirt.h
---- linux-3.18.5/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/cvirt.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vserver/cvirt.h linux-4.4.110-vs2.3.9/include/linux/vserver/cvirt.h
+--- linux-4.4.110/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vserver/cvirt.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,18 @@
+#ifndef _VSERVER_CVIRT_H
+#define _VSERVER_CVIRT_H
+int vx_do_syslog(int, char __user *, int);
+
+#endif /* _VSERVER_CVIRT_H */
-diff -NurpP --minimal linux-3.18.5/include/linux/vserver/cvirt_cmd.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/cvirt_cmd.h
---- linux-3.18.5/include/linux/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/cvirt_cmd.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vserver/cvirt_cmd.h linux-4.4.110-vs2.3.9/include/linux/vserver/cvirt_cmd.h
+--- linux-4.4.110/include/linux/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vserver/cvirt_cmd.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,13 @@
+#ifndef _VSERVER_CVIRT_CMD_H
+#define _VSERVER_CVIRT_CMD_H
+extern int vc_virt_stat(struct vx_info *, void __user *);
+
+#endif /* _VSERVER_CVIRT_CMD_H */
-diff -NurpP --minimal linux-3.18.5/include/linux/vserver/cvirt_def.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/cvirt_def.h
---- linux-3.18.5/include/linux/vserver/cvirt_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/cvirt_def.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vserver/cvirt_def.h linux-4.4.110-vs2.3.9/include/linux/vserver/cvirt_def.h
+--- linux-4.4.110/include/linux/vserver/cvirt_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vserver/cvirt_def.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,80 @@
+#ifndef _VSERVER_CVIRT_DEF_H
+#define _VSERVER_CVIRT_DEF_H
+#endif
+
+#endif /* _VSERVER_CVIRT_DEF_H */
-diff -NurpP --minimal linux-3.18.5/include/linux/vserver/debug.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/debug.h
---- linux-3.18.5/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/debug.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vserver/debug.h linux-4.4.110-vs2.3.9/include/linux/vserver/debug.h
+--- linux-4.4.110/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vserver/debug.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,146 @@
+#ifndef _VSERVER_DEBUG_H
+#define _VSERVER_DEBUG_H
+
+
+#endif /* _VSERVER_DEBUG_H */
-diff -NurpP --minimal linux-3.18.5/include/linux/vserver/debug_cmd.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/debug_cmd.h
---- linux-3.18.5/include/linux/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/debug_cmd.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vserver/debug_cmd.h linux-4.4.110-vs2.3.9/include/linux/vserver/debug_cmd.h
+--- linux-4.4.110/include/linux/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vserver/debug_cmd.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,37 @@
+#ifndef _VSERVER_DEBUG_CMD_H
+#define _VSERVER_DEBUG_CMD_H
+#endif /* CONFIG_COMPAT */
+
+#endif /* _VSERVER_DEBUG_CMD_H */
-diff -NurpP --minimal linux-3.18.5/include/linux/vserver/device.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/device.h
---- linux-3.18.5/include/linux/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/device.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vserver/device.h linux-4.4.110-vs2.3.9/include/linux/vserver/device.h
+--- linux-4.4.110/include/linux/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vserver/device.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,9 @@
+#ifndef _VSERVER_DEVICE_H
+#define _VSERVER_DEVICE_H
+#else /* _VSERVER_DEVICE_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_DEVICE_H */
-diff -NurpP --minimal linux-3.18.5/include/linux/vserver/device_cmd.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/device_cmd.h
---- linux-3.18.5/include/linux/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/device_cmd.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vserver/device_cmd.h linux-4.4.110-vs2.3.9/include/linux/vserver/device_cmd.h
+--- linux-4.4.110/include/linux/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vserver/device_cmd.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,31 @@
+#ifndef _VSERVER_DEVICE_CMD_H
+#define _VSERVER_DEVICE_CMD_H
+#endif /* CONFIG_COMPAT */
+
+#endif /* _VSERVER_DEVICE_CMD_H */
-diff -NurpP --minimal linux-3.18.5/include/linux/vserver/device_def.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/device_def.h
---- linux-3.18.5/include/linux/vserver/device_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/device_def.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vserver/device_def.h linux-4.4.110-vs2.3.9/include/linux/vserver/device_def.h
+--- linux-4.4.110/include/linux/vserver/device_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vserver/device_def.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,17 @@
+#ifndef _VSERVER_DEVICE_DEF_H
+#define _VSERVER_DEVICE_DEF_H
+};
+
+#endif /* _VSERVER_DEVICE_DEF_H */
-diff -NurpP --minimal linux-3.18.5/include/linux/vserver/dlimit.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/dlimit.h
---- linux-3.18.5/include/linux/vserver/dlimit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/dlimit.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vserver/dlimit.h linux-4.4.110-vs2.3.9/include/linux/vserver/dlimit.h
+--- linux-4.4.110/include/linux/vserver/dlimit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vserver/dlimit.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,54 @@
+#ifndef _VSERVER_DLIMIT_H
+#define _VSERVER_DLIMIT_H
+#else /* _VSERVER_DLIMIT_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_DLIMIT_H */
-diff -NurpP --minimal linux-3.18.5/include/linux/vserver/dlimit_cmd.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/dlimit_cmd.h
---- linux-3.18.5/include/linux/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/dlimit_cmd.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vserver/dlimit_cmd.h linux-4.4.110-vs2.3.9/include/linux/vserver/dlimit_cmd.h
+--- linux-4.4.110/include/linux/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vserver/dlimit_cmd.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,46 @@
+#ifndef _VSERVER_DLIMIT_CMD_H
+#define _VSERVER_DLIMIT_CMD_H
+#endif /* CONFIG_COMPAT */
+
+#endif /* _VSERVER_DLIMIT_CMD_H */
-diff -NurpP --minimal linux-3.18.5/include/linux/vserver/global.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/global.h
---- linux-3.18.5/include/linux/vserver/global.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/global.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vserver/global.h linux-4.4.110-vs2.3.9/include/linux/vserver/global.h
+--- linux-4.4.110/include/linux/vserver/global.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vserver/global.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,19 @@
+#ifndef _VSERVER_GLOBAL_H
+#define _VSERVER_GLOBAL_H
+
+
+#endif /* _VSERVER_GLOBAL_H */
-diff -NurpP --minimal linux-3.18.5/include/linux/vserver/history.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/history.h
---- linux-3.18.5/include/linux/vserver/history.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/history.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vserver/history.h linux-4.4.110-vs2.3.9/include/linux/vserver/history.h
+--- linux-4.4.110/include/linux/vserver/history.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vserver/history.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,197 @@
+#ifndef _VSERVER_HISTORY_H
+#define _VSERVER_HISTORY_H
+#endif /* CONFIG_VSERVER_HISTORY */
+
+#endif /* _VSERVER_HISTORY_H */
-diff -NurpP --minimal linux-3.18.5/include/linux/vserver/inode.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/inode.h
---- linux-3.18.5/include/linux/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/inode.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vserver/inode.h linux-4.4.110-vs2.3.9/include/linux/vserver/inode.h
+--- linux-4.4.110/include/linux/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vserver/inode.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,19 @@
+#ifndef _VSERVER_INODE_H
+#define _VSERVER_INODE_H
+#else /* _VSERVER_INODE_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_INODE_H */
-diff -NurpP --minimal linux-3.18.5/include/linux/vserver/inode_cmd.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/inode_cmd.h
---- linux-3.18.5/include/linux/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/inode_cmd.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vserver/inode_cmd.h linux-4.4.110-vs2.3.9/include/linux/vserver/inode_cmd.h
+--- linux-4.4.110/include/linux/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vserver/inode_cmd.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,36 @@
+#ifndef _VSERVER_INODE_CMD_H
+#define _VSERVER_INODE_CMD_H
+#endif /* CONFIG_COMPAT */
+
+#endif /* _VSERVER_INODE_CMD_H */
-diff -NurpP --minimal linux-3.18.5/include/linux/vserver/limit.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/limit.h
---- linux-3.18.5/include/linux/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/limit.h 2015-01-19 10:58:04.000000000 +0000
-@@ -0,0 +1,61 @@
+diff -NurpP --minimal linux-4.4.110/include/linux/vserver/limit.h linux-4.4.110-vs2.3.9/include/linux/vserver/limit.h
+--- linux-4.4.110/include/linux/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vserver/limit.h 2018-01-09 16:36:32.000000000 +0000
+@@ -0,0 +1,67 @@
+#ifndef _VSERVER_LIMIT_H
+#define _VSERVER_LIMIT_H
+
+
+struct sysinfo;
+
++#ifdef CONFIG_MEMCG
+void vx_vsi_meminfo(struct sysinfo *);
+void vx_vsi_swapinfo(struct sysinfo *);
+long vx_vsi_cached(struct sysinfo *);
++#else /* !CONFIG_MEMCG */
++#define vx_vsi_meminfo(s) do { } while (0)
++#define vx_vsi_swapinfo(s) do { } while (0)
++#define vx_vsi_cached(s) (0L)
++#endif /* !CONFIG_MEMCG */
+
+#define NUM_LIMITS 24
+
+#endif /* _VSERVER_LIMIT_H */
-diff -NurpP --minimal linux-3.18.5/include/linux/vserver/limit_cmd.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/limit_cmd.h
---- linux-3.18.5/include/linux/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/limit_cmd.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vserver/limit_cmd.h linux-4.4.110-vs2.3.9/include/linux/vserver/limit_cmd.h
+--- linux-4.4.110/include/linux/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vserver/limit_cmd.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,35 @@
+#ifndef _VSERVER_LIMIT_CMD_H
+#define _VSERVER_LIMIT_CMD_H
+#endif /* CONFIG_IA32_EMULATION */
+
+#endif /* _VSERVER_LIMIT_CMD_H */
-diff -NurpP --minimal linux-3.18.5/include/linux/vserver/limit_def.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/limit_def.h
---- linux-3.18.5/include/linux/vserver/limit_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/limit_def.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vserver/limit_def.h linux-4.4.110-vs2.3.9/include/linux/vserver/limit_def.h
+--- linux-4.4.110/include/linux/vserver/limit_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vserver/limit_def.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,47 @@
+#ifndef _VSERVER_LIMIT_DEF_H
+#define _VSERVER_LIMIT_DEF_H
+#endif
+
+#endif /* _VSERVER_LIMIT_DEF_H */
-diff -NurpP --minimal linux-3.18.5/include/linux/vserver/limit_int.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/limit_int.h
---- linux-3.18.5/include/linux/vserver/limit_int.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/limit_int.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vserver/limit_int.h linux-4.4.110-vs2.3.9/include/linux/vserver/limit_int.h
+--- linux-4.4.110/include/linux/vserver/limit_int.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vserver/limit_int.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,193 @@
+#ifndef _VSERVER_LIMIT_INT_H
+#define _VSERVER_LIMIT_INT_H
+
+
+#endif /* _VSERVER_LIMIT_INT_H */
-diff -NurpP --minimal linux-3.18.5/include/linux/vserver/monitor.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/monitor.h
---- linux-3.18.5/include/linux/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/monitor.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vserver/monitor.h linux-4.4.110-vs2.3.9/include/linux/vserver/monitor.h
+--- linux-4.4.110/include/linux/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vserver/monitor.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,6 @@
+#ifndef _VSERVER_MONITOR_H
+#define _VSERVER_MONITOR_H
+#include <uapi/vserver/monitor.h>
+
+#endif /* _VSERVER_MONITOR_H */
-diff -NurpP --minimal linux-3.18.5/include/linux/vserver/network.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/network.h
---- linux-3.18.5/include/linux/vserver/network.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/network.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vserver/network.h linux-4.4.110-vs2.3.9/include/linux/vserver/network.h
+--- linux-4.4.110/include/linux/vserver/network.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vserver/network.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,76 @@
+#ifndef _VSERVER_NETWORK_H
+#define _VSERVER_NETWORK_H
+#endif
+
+#endif /* _VSERVER_NETWORK_H */
-diff -NurpP --minimal linux-3.18.5/include/linux/vserver/network_cmd.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/network_cmd.h
---- linux-3.18.5/include/linux/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/network_cmd.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vserver/network_cmd.h linux-4.4.110-vs2.3.9/include/linux/vserver/network_cmd.h
+--- linux-4.4.110/include/linux/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vserver/network_cmd.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,37 @@
+#ifndef _VSERVER_NETWORK_CMD_H
+#define _VSERVER_NETWORK_CMD_H
+extern int vc_set_ncaps(struct nx_info *, void __user *);
+
+#endif /* _VSERVER_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-3.18.5/include/linux/vserver/percpu.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/percpu.h
---- linux-3.18.5/include/linux/vserver/percpu.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/percpu.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vserver/percpu.h linux-4.4.110-vs2.3.9/include/linux/vserver/percpu.h
+--- linux-4.4.110/include/linux/vserver/percpu.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vserver/percpu.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,14 @@
+#ifndef _VSERVER_PERCPU_H
+#define _VSERVER_PERCPU_H
+#define PERCPU_PERCTX (sizeof(struct _vx_percpu))
+
+#endif /* _VSERVER_PERCPU_H */
-diff -NurpP --minimal linux-3.18.5/include/linux/vserver/pid.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/pid.h
---- linux-3.18.5/include/linux/vserver/pid.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/pid.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vserver/pid.h linux-4.4.110-vs2.3.9/include/linux/vserver/pid.h
+--- linux-4.4.110/include/linux/vserver/pid.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vserver/pid.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,51 @@
+#ifndef _VSERVER_PID_H
+#define _VSERVER_PID_H
+}
+
+#endif
-diff -NurpP --minimal linux-3.18.5/include/linux/vserver/sched.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/sched.h
---- linux-3.18.5/include/linux/vserver/sched.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/sched.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vserver/sched.h linux-4.4.110-vs2.3.9/include/linux/vserver/sched.h
+--- linux-4.4.110/include/linux/vserver/sched.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vserver/sched.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,23 @@
+#ifndef _VSERVER_SCHED_H
+#define _VSERVER_SCHED_H
+#else /* _VSERVER_SCHED_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_SCHED_H */
-diff -NurpP --minimal linux-3.18.5/include/linux/vserver/sched_cmd.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/sched_cmd.h
---- linux-3.18.5/include/linux/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/sched_cmd.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vserver/sched_cmd.h linux-4.4.110-vs2.3.9/include/linux/vserver/sched_cmd.h
+--- linux-4.4.110/include/linux/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vserver/sched_cmd.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,11 @@
+#ifndef _VSERVER_SCHED_CMD_H
+#define _VSERVER_SCHED_CMD_H
+extern int vc_get_prio_bias(struct vx_info *, void __user *);
+
+#endif /* _VSERVER_SCHED_CMD_H */
-diff -NurpP --minimal linux-3.18.5/include/linux/vserver/sched_def.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/sched_def.h
---- linux-3.18.5/include/linux/vserver/sched_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/sched_def.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vserver/sched_def.h linux-4.4.110-vs2.3.9/include/linux/vserver/sched_def.h
+--- linux-4.4.110/include/linux/vserver/sched_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vserver/sched_def.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,38 @@
+#ifndef _VSERVER_SCHED_DEF_H
+#define _VSERVER_SCHED_DEF_H
+#endif
+
+#endif /* _VSERVER_SCHED_DEF_H */
-diff -NurpP --minimal linux-3.18.5/include/linux/vserver/signal.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/signal.h
---- linux-3.18.5/include/linux/vserver/signal.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/signal.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vserver/signal.h linux-4.4.110-vs2.3.9/include/linux/vserver/signal.h
+--- linux-4.4.110/include/linux/vserver/signal.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vserver/signal.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,14 @@
+#ifndef _VSERVER_SIGNAL_H
+#define _VSERVER_SIGNAL_H
+#else /* _VSERVER_SIGNAL_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_SIGNAL_H */
-diff -NurpP --minimal linux-3.18.5/include/linux/vserver/signal_cmd.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/signal_cmd.h
---- linux-3.18.5/include/linux/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/signal_cmd.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vserver/signal_cmd.h linux-4.4.110-vs2.3.9/include/linux/vserver/signal_cmd.h
+--- linux-4.4.110/include/linux/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vserver/signal_cmd.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,14 @@
+#ifndef _VSERVER_SIGNAL_CMD_H
+#define _VSERVER_SIGNAL_CMD_H
+extern int vc_set_pflags(uint32_t pid, void __user *);
+
+#endif /* _VSERVER_SIGNAL_CMD_H */
-diff -NurpP --minimal linux-3.18.5/include/linux/vserver/space.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/space.h
---- linux-3.18.5/include/linux/vserver/space.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/space.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vserver/space.h linux-4.4.110-vs2.3.9/include/linux/vserver/space.h
+--- linux-4.4.110/include/linux/vserver/space.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vserver/space.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,12 @@
+#ifndef _VSERVER_SPACE_H
+#define _VSERVER_SPACE_H
+#else /* _VSERVER_SPACE_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_SPACE_H */
-diff -NurpP --minimal linux-3.18.5/include/linux/vserver/space_cmd.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/space_cmd.h
---- linux-3.18.5/include/linux/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/space_cmd.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vserver/space_cmd.h linux-4.4.110-vs2.3.9/include/linux/vserver/space_cmd.h
+--- linux-4.4.110/include/linux/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vserver/space_cmd.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,13 @@
+#ifndef _VSERVER_SPACE_CMD_H
+#define _VSERVER_SPACE_CMD_H
+extern int vc_get_space_mask(void __user *, int);
+
+#endif /* _VSERVER_SPACE_CMD_H */
-diff -NurpP --minimal linux-3.18.5/include/linux/vserver/switch.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/switch.h
---- linux-3.18.5/include/linux/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/switch.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vserver/switch.h linux-4.4.110-vs2.3.9/include/linux/vserver/switch.h
+--- linux-4.4.110/include/linux/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vserver/switch.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,8 @@
+#ifndef _VSERVER_SWITCH_H
+#define _VSERVER_SWITCH_H
+#include <uapi/vserver/switch.h>
+
+#endif /* _VSERVER_SWITCH_H */
-diff -NurpP --minimal linux-3.18.5/include/linux/vserver/tag.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/tag.h
---- linux-3.18.5/include/linux/vserver/tag.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/tag.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vserver/tag.h linux-4.4.110-vs2.3.9/include/linux/vserver/tag.h
+--- linux-4.4.110/include/linux/vserver/tag.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vserver/tag.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,160 @@
+#ifndef _DX_TAG_H
+#define _DX_TAG_H
+#endif
+
+#endif /* _DX_TAG_H */
-diff -NurpP --minimal linux-3.18.5/include/linux/vserver/tag_cmd.h linux-3.18.5-vs2.3.7.3/include/linux/vserver/tag_cmd.h
---- linux-3.18.5/include/linux/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/linux/vserver/tag_cmd.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/linux/vserver/tag_cmd.h linux-4.4.110-vs2.3.9/include/linux/vserver/tag_cmd.h
+--- linux-4.4.110/include/linux/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/linux/vserver/tag_cmd.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,10 @@
+#ifndef _VSERVER_TAG_CMD_H
+#define _VSERVER_TAG_CMD_H
+extern int vc_tag_migrate(uint32_t);
+
+#endif /* _VSERVER_TAG_CMD_H */
-diff -NurpP --minimal linux-3.18.5/include/net/addrconf.h linux-3.18.5-vs2.3.7.3/include/net/addrconf.h
---- linux-3.18.5/include/net/addrconf.h 2015-01-17 02:40:22.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/net/addrconf.h 2015-01-19 10:58:04.000000000 +0000
-@@ -79,7 +79,7 @@ struct inet6_ifaddr *ipv6_get_ifaddr(str
+diff -NurpP --minimal linux-4.4.110/include/net/addrconf.h linux-4.4.110-vs2.3.9/include/net/addrconf.h
+--- linux-4.4.110/include/net/addrconf.h 2018-01-09 16:35:10.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/net/addrconf.h 2018-01-09 16:36:32.000000000 +0000
+@@ -84,7 +84,7 @@ struct inet6_ifaddr *ipv6_get_ifaddr(str
int ipv6_dev_get_saddr(struct net *net, const struct net_device *dev,
const struct in6_addr *daddr, unsigned int srcprefs,
int __ipv6_get_lladdr(struct inet6_dev *idev, struct in6_addr *addr,
u32 banned_flags);
int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr,
-diff -NurpP --minimal linux-3.18.5/include/net/af_unix.h linux-3.18.5-vs2.3.7.3/include/net/af_unix.h
---- linux-3.18.5/include/net/af_unix.h 2013-11-25 15:47:02.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/net/af_unix.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/net/af_unix.h linux-4.4.110-vs2.3.9/include/net/af_unix.h
+--- linux-4.4.110/include/net/af_unix.h 2018-01-09 16:35:10.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/net/af_unix.h 2018-01-09 16:36:32.000000000 +0000
@@ -4,6 +4,7 @@
#include <linux/socket.h>
#include <linux/un.h>
#include <linux/mutex.h>
-+#include <linux/vs_base.h>
++// #include <linux/vs_base.h>
#include <net/sock.h>
- void unix_inflight(struct file *fp);
-diff -NurpP --minimal linux-3.18.5/include/net/inet_timewait_sock.h linux-3.18.5-vs2.3.7.3/include/net/inet_timewait_sock.h
---- linux-3.18.5/include/net/inet_timewait_sock.h 2015-01-16 22:19:24.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/net/inet_timewait_sock.h 2015-01-19 10:58:04.000000000 +0000
-@@ -122,6 +122,10 @@ struct inet_timewait_sock {
- #define tw_v6_rcv_saddr __tw_common.skc_v6_rcv_saddr
- #define tw_dport __tw_common.skc_dport
+ void unix_inflight(struct user_struct *user, struct file *fp);
+diff -NurpP --minimal linux-4.4.110/include/net/inet_timewait_sock.h linux-4.4.110-vs2.3.9/include/net/inet_timewait_sock.h
+--- linux-4.4.110/include/net/inet_timewait_sock.h 2016-07-05 04:15:11.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/net/inet_timewait_sock.h 2018-01-09 16:40:17.000000000 +0000
+@@ -71,6 +71,10 @@ struct inet_timewait_sock {
#define tw_num __tw_common.skc_num
+ #define tw_cookie __tw_common.skc_cookie
+ #define tw_dr __tw_common.skc_tw_dr
+#define tw_xid __tw_common.skc_xid
+#define tw_vx_info __tw_common.skc_vx_info
+#define tw_nid __tw_common.skc_nid
int tw_timeout;
volatile unsigned char tw_substate;
-diff -NurpP --minimal linux-3.18.5/include/net/ip6_route.h linux-3.18.5-vs2.3.7.3/include/net/ip6_route.h
---- linux-3.18.5/include/net/ip6_route.h 2014-09-03 13:19:43.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/net/ip6_route.h 2015-01-19 10:58:04.000000000 +0000
-@@ -80,7 +80,7 @@ int ip6_del_rt(struct rt6_info *);
+diff -NurpP --minimal linux-4.4.110/include/net/ip6_route.h linux-4.4.110-vs2.3.9/include/net/ip6_route.h
+--- linux-4.4.110/include/net/ip6_route.h 2018-01-09 16:35:10.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/net/ip6_route.h 2018-01-09 16:36:32.000000000 +0000
+@@ -90,7 +90,7 @@ int ip6_del_rt(struct rt6_info *);
int ip6_route_get_saddr(struct net *net, struct rt6_info *rt,
const struct in6_addr *daddr, unsigned int prefs,
struct rt6_info *rt6_lookup(struct net *net, const struct in6_addr *daddr,
const struct in6_addr *saddr, int oif, int flags);
-diff -NurpP --minimal linux-3.18.5/include/net/route.h linux-3.18.5-vs2.3.7.3/include/net/route.h
---- linux-3.18.5/include/net/route.h 2014-06-12 13:02:51.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/net/route.h 2015-01-19 10:58:04.000000000 +0000
-@@ -205,6 +205,9 @@ static inline void ip_rt_put(struct rtab
+diff -NurpP --minimal linux-4.4.110/include/net/route.h linux-4.4.110-vs2.3.9/include/net/route.h
+--- linux-4.4.110/include/net/route.h 2016-07-05 04:15:11.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/net/route.h 2018-01-09 16:39:47.000000000 +0000
+@@ -223,6 +223,9 @@ static inline void ip_rt_put(struct rtab
dst_release(&rt->dst);
}
#define IPTOS_RT_MASK (IPTOS_TOS_MASK & ~3)
extern const __u8 ip_tos2prio[16];
-@@ -252,6 +255,9 @@ static inline void ip_route_connect_init
+@@ -270,6 +273,9 @@ static inline void ip_route_connect_init
protocol, flow_flags, dst, src, dport, sport);
}
static inline struct rtable *ip_route_connect(struct flowi4 *fl4,
__be32 dst, __be32 src, u32 tos,
int oif, u8 protocol,
-@@ -260,11 +266,25 @@ static inline struct rtable *ip_route_co
+@@ -278,6 +284,7 @@ static inline struct rtable *ip_route_co
{
struct net *net = sock_net(sk);
struct rtable *rt;
ip_route_connect_init(fl4, dst, src, tos, oif, protocol,
sport, dport, sk);
+@@ -291,7 +298,21 @@ static inline struct rtable *ip_route_co
+ src = fl4->saddr;
+ }
- if (!dst || !src) {
++
+ if (sk)
+ nx_info = sk->sk_nx_info;
+
rt = __ip_route_output_key(net, fl4);
if (IS_ERR(rt))
return rt;
-diff -NurpP --minimal linux-3.18.5/include/net/sock.h linux-3.18.5-vs2.3.7.3/include/net/sock.h
---- linux-3.18.5/include/net/sock.h 2015-01-17 02:40:22.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/net/sock.h 2015-01-19 10:58:04.000000000 +0000
-@@ -193,6 +193,10 @@ struct sock_common {
- #ifdef CONFIG_NET_NS
- struct net *skc_net;
+diff -NurpP --minimal linux-4.4.110/include/net/sock.h linux-4.4.110-vs2.3.9/include/net/sock.h
+--- linux-4.4.110/include/net/sock.h 2018-01-09 16:35:10.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/net/sock.h 2018-01-09 16:41:40.000000000 +0000
+@@ -201,6 +201,10 @@ struct sock_common {
+ struct in6_addr skc_v6_daddr;
+ struct in6_addr skc_v6_rcv_saddr;
#endif
+ vxid_t skc_xid;
+ struct vx_info *skc_vx_info;
+ vnid_t skc_nid;
+ struct nx_info *skc_nx_info;
- #if IS_ENABLED(CONFIG_IPV6)
- struct in6_addr skc_v6_daddr;
-@@ -327,7 +331,11 @@ struct sock {
+ atomic64_t skc_cookie;
+
+@@ -349,8 +353,12 @@ struct sock {
#define sk_prot __sk_common.skc_prot
#define sk_net __sk_common.skc_net
#define sk_v6_daddr __sk_common.skc_v6_daddr
-#define sk_v6_rcv_saddr __sk_common.skc_v6_rcv_saddr
+#define sk_v6_rcv_saddr __sk_common.skc_v6_rcv_saddr
+ #define sk_cookie __sk_common.skc_cookie
+#define sk_xid __sk_common.skc_xid
+#define sk_vx_info __sk_common.skc_vx_info
+#define sk_nid __sk_common.skc_nid
+#define sk_nx_info __sk_common.skc_nx_info
-
- socket_lock_t sk_lock;
- struct sk_buff_head sk_receive_queue;
-diff -NurpP --minimal linux-3.18.5/include/uapi/Kbuild linux-3.18.5-vs2.3.7.3/include/uapi/Kbuild
---- linux-3.18.5/include/uapi/Kbuild 2015-01-17 02:40:22.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/uapi/Kbuild 2015-01-19 10:59:16.000000000 +0000
+ #define sk_incoming_cpu __sk_common.skc_incoming_cpu
+ #define sk_flags __sk_common.skc_flags
+ #define sk_rxhash __sk_common.skc_rxhash
+diff -NurpP --minimal linux-4.4.110/include/uapi/Kbuild linux-4.4.110-vs2.3.9/include/uapi/Kbuild
+--- linux-4.4.110/include/uapi/Kbuild 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/uapi/Kbuild 2018-01-09 16:36:32.000000000 +0000
@@ -13,3 +13,4 @@ header-y += drm/
header-y += xen/
header-y += scsi/
header-y += misc/
+header-y += vserver/
-diff -NurpP --minimal linux-3.18.5/include/uapi/linux/capability.h linux-3.18.5-vs2.3.7.3/include/uapi/linux/capability.h
---- linux-3.18.5/include/uapi/linux/capability.h 2014-09-03 13:19:44.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/uapi/linux/capability.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/uapi/linux/capability.h linux-4.4.110-vs2.3.9/include/uapi/linux/capability.h
+--- linux-4.4.110/include/uapi/linux/capability.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/uapi/linux/capability.h 2018-01-09 16:36:32.000000000 +0000
@@ -259,6 +259,7 @@ struct vfs_cap_data {
arbitrary SCSI commands */
/* Allow setting encryption key on loopback filesystem */
/*
* Bit location of each capability (used by user-space library and kernel)
-diff -NurpP --minimal linux-3.18.5/include/uapi/linux/fs.h linux-3.18.5-vs2.3.7.3/include/uapi/linux/fs.h
---- linux-3.18.5/include/uapi/linux/fs.h 2015-01-17 02:40:23.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/uapi/linux/fs.h 2015-01-19 10:58:04.000000000 +0000
-@@ -90,6 +90,9 @@ struct inodes_stat_t {
- #define MS_KERNMOUNT (1<<22) /* this is a kern_mount call */
+diff -NurpP --minimal linux-4.4.110/include/uapi/linux/fs.h linux-4.4.110-vs2.3.9/include/uapi/linux/fs.h
+--- linux-4.4.110/include/uapi/linux/fs.h 2016-07-05 04:15:11.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/uapi/linux/fs.h 2018-01-09 16:47:48.000000000 +0000
+@@ -91,6 +91,9 @@ struct inodes_stat_t {
#define MS_I_VERSION (1<<23) /* Update inode I_version field */
#define MS_STRICTATIME (1<<24) /* Always perform atime updates */
+ #define MS_LAZYTIME (1<<25) /* Update the on-disk [acm]times lazily */
+#define MS_TAGGED (1<<8) /* use generic inode tagging */
+#define MS_NOTAGCHECK (1<<9) /* don't check tags */
-+#define MS_TAGID (1<<25) /* use specific tag for this mount */
++#define MS_TAGID (1<<26) /* use specific tag for this mount */
/* These sb flags are internal to the kernel */
#define MS_NOSEC (1<<28)
-@@ -195,11 +198,14 @@ struct inodes_stat_t {
+@@ -197,12 +200,15 @@ struct inodes_stat_t {
#define FS_EXTENT_FL 0x00080000 /* Extents */
#define FS_DIRECTIO_FL 0x00100000 /* Use direct i/o */
#define FS_NOCOW_FL 0x00800000 /* Do not cow file */
+#define FS_IXUNLINK_FL 0x08000000 /* Immutable invert on unlink */
+ #define FS_PROJINHERIT_FL 0x20000000 /* Create with parents projid */
#define FS_RESERVED_FL 0x80000000 /* reserved for ext2 lib */
-#define FS_FL_USER_VISIBLE 0x0003DFFF /* User visible flags */
-#define FS_FL_USER_MODIFIABLE 0x000380FF /* User modifiable flags */
+-
+#define FS_BARRIER_FL 0x04000000 /* Barrier for chroot() */
+#define FS_COW_FL 0x20000000 /* Copy on Write marker */
-
++
+#define FS_FL_USER_VISIBLE 0x0103DFFF /* User visible flags */
+#define FS_FL_USER_MODIFIABLE 0x010380FF /* User modifiable flags */
#define SYNC_FILE_RANGE_WAIT_BEFORE 1
#define SYNC_FILE_RANGE_WRITE 2
-diff -NurpP --minimal linux-3.18.5/include/uapi/linux/gfs2_ondisk.h linux-3.18.5-vs2.3.7.3/include/uapi/linux/gfs2_ondisk.h
---- linux-3.18.5/include/uapi/linux/gfs2_ondisk.h 2014-09-03 13:19:44.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/uapi/linux/gfs2_ondisk.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/uapi/linux/gfs2_ondisk.h linux-4.4.110-vs2.3.9/include/uapi/linux/gfs2_ondisk.h
+--- linux-4.4.110/include/uapi/linux/gfs2_ondisk.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/uapi/linux/gfs2_ondisk.h 2018-01-09 16:36:32.000000000 +0000
@@ -225,6 +225,9 @@ enum {
gfs2fl_Sync = 8,
gfs2fl_System = 9,
#define GFS2_DIF_TRUNC_IN_PROG 0x20000000 /* New in gfs2 */
#define GFS2_DIF_INHERIT_DIRECTIO 0x40000000 /* only in gfs1 */
#define GFS2_DIF_INHERIT_JDATA 0x80000000
-diff -NurpP --minimal linux-3.18.5/include/uapi/linux/if_tun.h linux-3.18.5-vs2.3.7.3/include/uapi/linux/if_tun.h
---- linux-3.18.5/include/uapi/linux/if_tun.h 2013-11-25 15:47:02.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/uapi/linux/if_tun.h 2015-01-19 10:58:04.000000000 +0000
-@@ -58,6 +58,7 @@
- #define TUNSETQUEUE _IOW('T', 217, int)
- #define TUNSETIFINDEX _IOW('T', 218, unsigned int)
- #define TUNGETFILTER _IOR('T', 219, struct sock_fprog)
-+#define TUNSETNID _IOW('T', 220, int)
+diff -NurpP --minimal linux-4.4.110/include/uapi/linux/if_tun.h linux-4.4.110-vs2.3.9/include/uapi/linux/if_tun.h
+--- linux-4.4.110/include/uapi/linux/if_tun.h 2015-10-29 09:21:42.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/uapi/linux/if_tun.h 2018-01-09 16:46:34.000000000 +0000
+@@ -56,6 +56,7 @@
+ */
+ #define TUNSETVNETBE _IOW('T', 222, int)
+ #define TUNGETVNETBE _IOR('T', 223, int)
++#define TUNSETNID _IOW('T', 224, int)
/* TUNSETIFF ifr flags */
#define IFF_TUN 0x0001
-diff -NurpP --minimal linux-3.18.5/include/uapi/linux/major.h linux-3.18.5-vs2.3.7.3/include/uapi/linux/major.h
---- linux-3.18.5/include/uapi/linux/major.h 2014-01-22 20:39:12.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/uapi/linux/major.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/uapi/linux/major.h linux-4.4.110-vs2.3.9/include/uapi/linux/major.h
+--- linux-4.4.110/include/uapi/linux/major.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/uapi/linux/major.h 2018-01-09 16:36:33.000000000 +0000
@@ -15,6 +15,7 @@
#define HD_MAJOR IDE0_MAJOR
#define PTY_SLAVE_MAJOR 3
#define TTYAUX_MAJOR 5
#define LP_MAJOR 6
#define VCS_MAJOR 7
-diff -NurpP --minimal linux-3.18.5/include/uapi/linux/nfs_mount.h linux-3.18.5-vs2.3.7.3/include/uapi/linux/nfs_mount.h
---- linux-3.18.5/include/uapi/linux/nfs_mount.h 2014-01-22 20:39:12.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/uapi/linux/nfs_mount.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/uapi/linux/nfs_mount.h linux-4.4.110-vs2.3.9/include/uapi/linux/nfs_mount.h
+--- linux-4.4.110/include/uapi/linux/nfs_mount.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/uapi/linux/nfs_mount.h 2018-01-09 16:36:33.000000000 +0000
@@ -63,7 +63,8 @@ struct nfs_mount_data {
#define NFS_MOUNT_SECFLAVOUR 0x2000 /* 5 non-text parsed mount data only */
#define NFS_MOUNT_NORDIRPLUS 0x4000 /* 5 */
/* The following are for internal use only */
#define NFS_MOUNT_LOOKUP_CACHE_NONEG 0x10000
-diff -NurpP --minimal linux-3.18.5/include/uapi/linux/reboot.h linux-3.18.5-vs2.3.7.3/include/uapi/linux/reboot.h
---- linux-3.18.5/include/uapi/linux/reboot.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/uapi/linux/reboot.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/uapi/linux/reboot.h linux-4.4.110-vs2.3.9/include/uapi/linux/reboot.h
+--- linux-4.4.110/include/uapi/linux/reboot.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/uapi/linux/reboot.h 2018-01-09 16:36:33.000000000 +0000
@@ -33,7 +33,7 @@
#define LINUX_REBOOT_CMD_RESTART2 0xA1B2C3D4
#define LINUX_REBOOT_CMD_SW_SUSPEND 0xD000FCE2
#endif /* _UAPI_LINUX_REBOOT_H */
-diff -NurpP --minimal linux-3.18.5/include/uapi/linux/sysctl.h linux-3.18.5-vs2.3.7.3/include/uapi/linux/sysctl.h
---- linux-3.18.5/include/uapi/linux/sysctl.h 2015-01-16 22:19:26.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/uapi/linux/sysctl.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/uapi/linux/sysctl.h linux-4.4.110-vs2.3.9/include/uapi/linux/sysctl.h
+--- linux-4.4.110/include/uapi/linux/sysctl.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/uapi/linux/sysctl.h 2018-01-09 16:36:33.000000000 +0000
@@ -60,6 +60,7 @@ enum
CTL_ABI=9, /* Binary emulation */
CTL_CPU=10, /* CPU stuff (speed scaling, etc) */
KERN_SPARC_REBOOT=21, /* reboot command on Sparc */
KERN_CTLALTDEL=22, /* int: allow ctl-alt-del to reboot */
-diff -NurpP --minimal linux-3.18.5/include/uapi/vserver/Kbuild linux-3.18.5-vs2.3.7.3/include/uapi/vserver/Kbuild
---- linux-3.18.5/include/uapi/vserver/Kbuild 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/uapi/vserver/Kbuild 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/uapi/vserver/Kbuild linux-4.4.110-vs2.3.9/include/uapi/vserver/Kbuild
+--- linux-4.4.110/include/uapi/vserver/Kbuild 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/uapi/vserver/Kbuild 2018-01-09 16:36:33.000000000 +0000
@@ -0,0 +1,9 @@
+
+header-y += context_cmd.h network_cmd.h space_cmd.h \
+header-y += switch.h context.h network.h monitor.h \
+ limit.h inode.h device.h
+
-diff -NurpP --minimal linux-3.18.5/include/uapi/vserver/cacct_cmd.h linux-3.18.5-vs2.3.7.3/include/uapi/vserver/cacct_cmd.h
---- linux-3.18.5/include/uapi/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/uapi/vserver/cacct_cmd.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/uapi/vserver/cacct_cmd.h linux-4.4.110-vs2.3.9/include/uapi/vserver/cacct_cmd.h
+--- linux-4.4.110/include/uapi/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/uapi/vserver/cacct_cmd.h 2018-01-09 16:36:33.000000000 +0000
@@ -0,0 +1,15 @@
+#ifndef _UAPI_VS_CACCT_CMD_H
+#define _UAPI_VS_CACCT_CMD_H
+};
+
+#endif /* _UAPI_VS_CACCT_CMD_H */
-diff -NurpP --minimal linux-3.18.5/include/uapi/vserver/context.h linux-3.18.5-vs2.3.7.3/include/uapi/vserver/context.h
---- linux-3.18.5/include/uapi/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/uapi/vserver/context.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/uapi/vserver/context.h linux-4.4.110-vs2.3.9/include/uapi/vserver/context.h
+--- linux-4.4.110/include/uapi/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/uapi/vserver/context.h 2018-01-09 16:36:33.000000000 +0000
@@ -0,0 +1,81 @@
+#ifndef _UAPI_VS_CONTEXT_H
+#define _UAPI_VS_CONTEXT_H
+#define VXC_NAMESPACE 0x02000000
+
+#endif /* _UAPI_VS_CONTEXT_H */
-diff -NurpP --minimal linux-3.18.5/include/uapi/vserver/context_cmd.h linux-3.18.5-vs2.3.7.3/include/uapi/vserver/context_cmd.h
---- linux-3.18.5/include/uapi/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/uapi/vserver/context_cmd.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/uapi/vserver/context_cmd.h linux-4.4.110-vs2.3.9/include/uapi/vserver/context_cmd.h
+--- linux-4.4.110/include/uapi/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/uapi/vserver/context_cmd.h 2018-01-09 16:36:33.000000000 +0000
@@ -0,0 +1,115 @@
+#ifndef _UAPI_VS_CONTEXT_CMD_H
+#define _UAPI_VS_CONTEXT_CMD_H
+};
+
+#endif /* _UAPI_VS_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-3.18.5/include/uapi/vserver/cvirt_cmd.h linux-3.18.5-vs2.3.7.3/include/uapi/vserver/cvirt_cmd.h
---- linux-3.18.5/include/uapi/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/uapi/vserver/cvirt_cmd.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/uapi/vserver/cvirt_cmd.h linux-4.4.110-vs2.3.9/include/uapi/vserver/cvirt_cmd.h
+--- linux-4.4.110/include/uapi/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/uapi/vserver/cvirt_cmd.h 2018-01-09 16:36:33.000000000 +0000
@@ -0,0 +1,41 @@
+#ifndef _UAPI_VS_CVIRT_CMD_H
+#define _UAPI_VS_CVIRT_CMD_H
+};
+
+#endif /* _UAPI_VS_CVIRT_CMD_H */
-diff -NurpP --minimal linux-3.18.5/include/uapi/vserver/debug_cmd.h linux-3.18.5-vs2.3.7.3/include/uapi/vserver/debug_cmd.h
---- linux-3.18.5/include/uapi/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/uapi/vserver/debug_cmd.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/uapi/vserver/debug_cmd.h linux-4.4.110-vs2.3.9/include/uapi/vserver/debug_cmd.h
+--- linux-4.4.110/include/uapi/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/uapi/vserver/debug_cmd.h 2018-01-09 16:36:33.000000000 +0000
@@ -0,0 +1,24 @@
+#ifndef _UAPI_VS_DEBUG_CMD_H
+#define _UAPI_VS_DEBUG_CMD_H
+};
+
+#endif /* _UAPI_VS_DEBUG_CMD_H */
-diff -NurpP --minimal linux-3.18.5/include/uapi/vserver/device.h linux-3.18.5-vs2.3.7.3/include/uapi/vserver/device.h
---- linux-3.18.5/include/uapi/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/uapi/vserver/device.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/uapi/vserver/device.h linux-4.4.110-vs2.3.9/include/uapi/vserver/device.h
+--- linux-4.4.110/include/uapi/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/uapi/vserver/device.h 2018-01-09 16:36:33.000000000 +0000
@@ -0,0 +1,12 @@
+#ifndef _UAPI_VS_DEVICE_H
+#define _UAPI_VS_DEVICE_H
+#define DATTR_MASK 0x00000013
+
+#endif /* _UAPI_VS_DEVICE_H */
-diff -NurpP --minimal linux-3.18.5/include/uapi/vserver/device_cmd.h linux-3.18.5-vs2.3.7.3/include/uapi/vserver/device_cmd.h
---- linux-3.18.5/include/uapi/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/uapi/vserver/device_cmd.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/uapi/vserver/device_cmd.h linux-4.4.110-vs2.3.9/include/uapi/vserver/device_cmd.h
+--- linux-4.4.110/include/uapi/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/uapi/vserver/device_cmd.h 2018-01-09 16:36:33.000000000 +0000
@@ -0,0 +1,16 @@
+#ifndef _UAPI_VS_DEVICE_CMD_H
+#define _UAPI_VS_DEVICE_CMD_H
+};
+
+#endif /* _UAPI_VS_DEVICE_CMD_H */
-diff -NurpP --minimal linux-3.18.5/include/uapi/vserver/dlimit_cmd.h linux-3.18.5-vs2.3.7.3/include/uapi/vserver/dlimit_cmd.h
---- linux-3.18.5/include/uapi/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/uapi/vserver/dlimit_cmd.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/uapi/vserver/dlimit_cmd.h linux-4.4.110-vs2.3.9/include/uapi/vserver/dlimit_cmd.h
+--- linux-4.4.110/include/uapi/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/uapi/vserver/dlimit_cmd.h 2018-01-09 16:36:33.000000000 +0000
@@ -0,0 +1,67 @@
+#ifndef _UAPI_VS_DLIMIT_CMD_H
+#define _UAPI_VS_DLIMIT_CMD_H
+}
+
+#endif /* _UAPI_VS_DLIMIT_CMD_H */
-diff -NurpP --minimal linux-3.18.5/include/uapi/vserver/inode.h linux-3.18.5-vs2.3.7.3/include/uapi/vserver/inode.h
---- linux-3.18.5/include/uapi/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/uapi/vserver/inode.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/uapi/vserver/inode.h linux-4.4.110-vs2.3.9/include/uapi/vserver/inode.h
+--- linux-4.4.110/include/uapi/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/uapi/vserver/inode.h 2018-01-09 16:36:33.000000000 +0000
@@ -0,0 +1,23 @@
+#ifndef _UAPI_VS_INODE_H
+#define _UAPI_VS_INODE_H
+#define FIOC_SETXFLG _IOW('x', 6, long)
+
+#endif /* _UAPI_VS_INODE_H */
-diff -NurpP --minimal linux-3.18.5/include/uapi/vserver/inode_cmd.h linux-3.18.5-vs2.3.7.3/include/uapi/vserver/inode_cmd.h
---- linux-3.18.5/include/uapi/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/uapi/vserver/inode_cmd.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/uapi/vserver/inode_cmd.h linux-4.4.110-vs2.3.9/include/uapi/vserver/inode_cmd.h
+--- linux-4.4.110/include/uapi/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/uapi/vserver/inode_cmd.h 2018-01-09 16:36:33.000000000 +0000
@@ -0,0 +1,26 @@
+#ifndef _UAPI_VS_INODE_CMD_H
+#define _UAPI_VS_INODE_CMD_H
+};
+
+#endif /* _UAPI_VS_INODE_CMD_H */
-diff -NurpP --minimal linux-3.18.5/include/uapi/vserver/limit.h linux-3.18.5-vs2.3.7.3/include/uapi/vserver/limit.h
---- linux-3.18.5/include/uapi/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/uapi/vserver/limit.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/uapi/vserver/limit.h linux-4.4.110-vs2.3.9/include/uapi/vserver/limit.h
+--- linux-4.4.110/include/uapi/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/uapi/vserver/limit.h 2018-01-09 16:36:33.000000000 +0000
@@ -0,0 +1,14 @@
+#ifndef _UAPI_VS_LIMIT_H
+#define _UAPI_VS_LIMIT_H
+#define VLIMIT_MAPPED 23
+
+#endif /* _UAPI_VS_LIMIT_H */
-diff -NurpP --minimal linux-3.18.5/include/uapi/vserver/limit_cmd.h linux-3.18.5-vs2.3.7.3/include/uapi/vserver/limit_cmd.h
---- linux-3.18.5/include/uapi/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/uapi/vserver/limit_cmd.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/uapi/vserver/limit_cmd.h linux-4.4.110-vs2.3.9/include/uapi/vserver/limit_cmd.h
+--- linux-4.4.110/include/uapi/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/uapi/vserver/limit_cmd.h 2018-01-09 16:36:33.000000000 +0000
@@ -0,0 +1,40 @@
+#ifndef _UAPI_VS_LIMIT_CMD_H
+#define _UAPI_VS_LIMIT_CMD_H
+#define CRLIM_KEEP (~1ULL)
+
+#endif /* _UAPI_VS_LIMIT_CMD_H */
-diff -NurpP --minimal linux-3.18.5/include/uapi/vserver/monitor.h linux-3.18.5-vs2.3.7.3/include/uapi/vserver/monitor.h
---- linux-3.18.5/include/uapi/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/uapi/vserver/monitor.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/uapi/vserver/monitor.h linux-4.4.110-vs2.3.9/include/uapi/vserver/monitor.h
+--- linux-4.4.110/include/uapi/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/uapi/vserver/monitor.h 2018-01-09 16:36:33.000000000 +0000
@@ -0,0 +1,96 @@
+#ifndef _UAPI_VS_MONITOR_H
+#define _UAPI_VS_MONITOR_H
+};
+
+#endif /* _UAPI_VS_MONITOR_H */
-diff -NurpP --minimal linux-3.18.5/include/uapi/vserver/network.h linux-3.18.5-vs2.3.7.3/include/uapi/vserver/network.h
---- linux-3.18.5/include/uapi/vserver/network.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/uapi/vserver/network.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/uapi/vserver/network.h linux-4.4.110-vs2.3.9/include/uapi/vserver/network.h
+--- linux-4.4.110/include/uapi/vserver/network.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/uapi/vserver/network.h 2018-01-09 16:36:33.000000000 +0000
@@ -0,0 +1,76 @@
+#ifndef _UAPI_VS_NETWORK_H
+#define _UAPI_VS_NETWORK_H
+#define NXA_MASK_SHOW (NXA_MASK_ALL | NXA_LOOPBACK)
+
+#endif /* _UAPI_VS_NETWORK_H */
-diff -NurpP --minimal linux-3.18.5/include/uapi/vserver/network_cmd.h linux-3.18.5-vs2.3.7.3/include/uapi/vserver/network_cmd.h
---- linux-3.18.5/include/uapi/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/uapi/vserver/network_cmd.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/uapi/vserver/network_cmd.h linux-4.4.110-vs2.3.9/include/uapi/vserver/network_cmd.h
+--- linux-4.4.110/include/uapi/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/uapi/vserver/network_cmd.h 2018-01-09 16:36:33.000000000 +0000
@@ -0,0 +1,123 @@
+#ifndef _UAPI_VS_NETWORK_CMD_H
+#define _UAPI_VS_NETWORK_CMD_H
+};
+
+#endif /* _UAPI_VS_NETWORK_CMD_H */
-diff -NurpP --minimal linux-3.18.5/include/uapi/vserver/sched_cmd.h linux-3.18.5-vs2.3.7.3/include/uapi/vserver/sched_cmd.h
---- linux-3.18.5/include/uapi/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/uapi/vserver/sched_cmd.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/uapi/vserver/sched_cmd.h linux-4.4.110-vs2.3.9/include/uapi/vserver/sched_cmd.h
+--- linux-4.4.110/include/uapi/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/uapi/vserver/sched_cmd.h 2018-01-09 16:36:33.000000000 +0000
@@ -0,0 +1,13 @@
+#ifndef _UAPI_VS_SCHED_CMD_H
+#define _UAPI_VS_SCHED_CMD_H
+#define VCMD_get_prio_bias VC_CMD(SCHED, 5, 0)
+
+#endif /* _UAPI_VS_SCHED_CMD_H */
-diff -NurpP --minimal linux-3.18.5/include/uapi/vserver/signal_cmd.h linux-3.18.5-vs2.3.7.3/include/uapi/vserver/signal_cmd.h
---- linux-3.18.5/include/uapi/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/uapi/vserver/signal_cmd.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/uapi/vserver/signal_cmd.h linux-4.4.110-vs2.3.9/include/uapi/vserver/signal_cmd.h
+--- linux-4.4.110/include/uapi/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/uapi/vserver/signal_cmd.h 2018-01-09 16:36:33.000000000 +0000
@@ -0,0 +1,31 @@
+#ifndef _UAPI_VS_SIGNAL_CMD_H
+#define _UAPI_VS_SIGNAL_CMD_H
+};
+
+#endif /* _UAPI_VS_SIGNAL_CMD_H */
-diff -NurpP --minimal linux-3.18.5/include/uapi/vserver/space_cmd.h linux-3.18.5-vs2.3.7.3/include/uapi/vserver/space_cmd.h
---- linux-3.18.5/include/uapi/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/uapi/vserver/space_cmd.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/uapi/vserver/space_cmd.h linux-4.4.110-vs2.3.9/include/uapi/vserver/space_cmd.h
+--- linux-4.4.110/include/uapi/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/uapi/vserver/space_cmd.h 2018-01-09 16:36:33.000000000 +0000
@@ -0,0 +1,28 @@
+#ifndef _UAPI_VS_SPACE_CMD_H
+#define _UAPI_VS_SPACE_CMD_H
+};
+
+#endif /* _UAPI_VS_SPACE_CMD_H */
-diff -NurpP --minimal linux-3.18.5/include/uapi/vserver/switch.h linux-3.18.5-vs2.3.7.3/include/uapi/vserver/switch.h
---- linux-3.18.5/include/uapi/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/uapi/vserver/switch.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/uapi/vserver/switch.h linux-4.4.110-vs2.3.9/include/uapi/vserver/switch.h
+--- linux-4.4.110/include/uapi/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/uapi/vserver/switch.h 2018-01-09 16:36:33.000000000 +0000
@@ -0,0 +1,90 @@
+#ifndef _UAPI_VS_SWITCH_H
+#define _UAPI_VS_SWITCH_H
+#define VCMD_get_vci VC_CMD(VERSION, 1, 0)
+
+#endif /* _UAPI_VS_SWITCH_H */
-diff -NurpP --minimal linux-3.18.5/include/uapi/vserver/tag_cmd.h linux-3.18.5-vs2.3.7.3/include/uapi/vserver/tag_cmd.h
---- linux-3.18.5/include/uapi/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/include/uapi/vserver/tag_cmd.h 2015-01-19 10:58:04.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/include/uapi/vserver/tag_cmd.h linux-4.4.110-vs2.3.9/include/uapi/vserver/tag_cmd.h
+--- linux-4.4.110/include/uapi/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/include/uapi/vserver/tag_cmd.h 2018-01-09 16:36:33.000000000 +0000
@@ -0,0 +1,14 @@
+#ifndef _UAPI_VS_TAG_CMD_H
+#define _UAPI_VS_TAG_CMD_H
+#define VCMD_tag_migrate VC_CMD(TAGMIG, 1, 0)
+
+#endif /* _UAPI_VS_TAG_CMD_H */
-diff -NurpP --minimal linux-3.18.5/init/Kconfig linux-3.18.5-vs2.3.7.3/init/Kconfig
---- linux-3.18.5/init/Kconfig 2015-01-17 02:40:23.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/init/Kconfig 2015-01-19 13:07:13.000000000 +0000
-@@ -923,6 +923,7 @@ config NUMA_BALANCING
+diff -NurpP --minimal linux-4.4.110/init/Kconfig linux-4.4.110-vs2.3.9/init/Kconfig
+--- linux-4.4.110/init/Kconfig 2016-07-05 04:15:12.000000000 +0000
++++ linux-4.4.110-vs2.3.9/init/Kconfig 2018-01-09 16:36:33.000000000 +0000
+@@ -927,6 +927,7 @@ config NUMA_BALANCING_DEFAULT_ENABLED
menuconfig CGROUPS
- boolean "Control Group support"
+ bool "Control Group support"
select KERNFS
+ default y
help
This option adds support for grouping sets of processes together, for
use with process control subsystems such as Cpusets, CFS, memory
-diff -NurpP --minimal linux-3.18.5/init/main.c linux-3.18.5-vs2.3.7.3/init/main.c
---- linux-3.18.5/init/main.c 2015-01-17 02:40:23.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/init/main.c 2015-01-19 11:05:25.000000000 +0000
-@@ -78,6 +78,7 @@
- #include <linux/context_tracking.h>
- #include <linux/random.h>
- #include <linux/list.h>
+diff -NurpP --minimal linux-4.4.110/init/main.c linux-4.4.110-vs2.3.9/init/main.c
+--- linux-4.4.110/init/main.c 2018-01-09 16:35:10.000000000 +0000
++++ linux-4.4.110-vs2.3.9/init/main.c 2018-01-09 16:58:21.000000000 +0000
+@@ -82,6 +82,7 @@
+ #include <linux/proc_ns.h>
+ #include <linux/io.h>
+ #include <linux/kaiser.h>
+#include <linux/vserver/percpu.h>
#include <asm/io.h>
#include <asm/bugs.h>
-diff -NurpP --minimal linux-3.18.5/ipc/mqueue.c linux-3.18.5-vs2.3.7.3/ipc/mqueue.c
---- linux-3.18.5/ipc/mqueue.c 2014-06-12 13:02:52.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/ipc/mqueue.c 2015-01-19 10:58:05.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/ipc/mqueue.c linux-4.4.110-vs2.3.9/ipc/mqueue.c
+--- linux-4.4.110/ipc/mqueue.c 2018-01-09 16:35:10.000000000 +0000
++++ linux-4.4.110-vs2.3.9/ipc/mqueue.c 2018-01-09 16:36:33.000000000 +0000
@@ -35,6 +35,8 @@
#include <linux/ipc_namespace.h>
#include <linux/user_namespace.h>
#include <net/sock.h>
#include "util.h"
-@@ -76,6 +78,7 @@ struct mqueue_inode_info {
+@@ -75,6 +77,7 @@ struct mqueue_inode_info {
struct pid *notify_owner;
struct user_namespace *notify_user_ns;
struct user_struct *user; /* user who created, for accounting */
struct sock *notify_sock;
struct sk_buff *notify_cookie;
-@@ -234,6 +237,7 @@ static struct inode *mqueue_get_inode(st
+@@ -230,6 +233,7 @@ static struct inode *mqueue_get_inode(st
if (S_ISREG(mode)) {
struct mqueue_inode_info *info;
unsigned long mq_bytes, mq_treesize;
inode->i_fop = &mqueue_file_operations;
inode->i_size = FILENT_SIZE;
-@@ -247,6 +251,7 @@ static struct inode *mqueue_get_inode(st
+@@ -243,6 +247,7 @@ static struct inode *mqueue_get_inode(st
info->notify_user_ns = NULL;
info->qsize = 0;
info->user = NULL; /* set when all is ok */
info->msg_tree = RB_ROOT;
info->node_cache = NULL;
memset(&info->attr, 0, sizeof(info->attr));
-@@ -280,17 +285,20 @@ static struct inode *mqueue_get_inode(st
+@@ -276,17 +281,20 @@ static struct inode *mqueue_get_inode(st
spin_lock(&mq_lock);
if (u->mq_bytes + mq_bytes < u->mq_bytes ||
} else if (S_ISDIR(mode)) {
inc_nlink(inode);
/* Some things misbehave if size == 0 on a directory */
-@@ -402,8 +410,11 @@ static void mqueue_evict_inode(struct in
+@@ -398,8 +406,11 @@ static void mqueue_evict_inode(struct in
user = info->user;
if (user) {
/*
* get_ns_from_inode() ensures that the
* (ipc_ns = sb->s_fs_info) is either a valid ipc_ns
-@@ -413,6 +424,7 @@ static void mqueue_evict_inode(struct in
+@@ -409,6 +420,7 @@ static void mqueue_evict_inode(struct in
if (ipc_ns)
ipc_ns->mq_queues_count--;
spin_unlock(&mq_lock);
free_uid(user);
}
if (ipc_ns)
-diff -NurpP --minimal linux-3.18.5/ipc/msg.c linux-3.18.5-vs2.3.7.3/ipc/msg.c
---- linux-3.18.5/ipc/msg.c 2014-09-03 13:19:44.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/ipc/msg.c 2015-01-19 10:58:05.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/ipc/msg.c linux-4.4.110-vs2.3.9/ipc/msg.c
+--- linux-4.4.110/ipc/msg.c 2018-01-09 16:35:10.000000000 +0000
++++ linux-4.4.110-vs2.3.9/ipc/msg.c 2018-01-09 16:36:33.000000000 +0000
@@ -37,6 +37,7 @@
#include <linux/rwsem.h>
#include <linux/nsproxy.h>
msq->q_perm.security = NULL;
retval = security_msg_queue_alloc(msq);
-diff -NurpP --minimal linux-3.18.5/ipc/sem.c linux-3.18.5-vs2.3.7.3/ipc/sem.c
---- linux-3.18.5/ipc/sem.c 2015-01-17 02:40:23.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/ipc/sem.c 2015-01-19 10:58:05.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/ipc/sem.c linux-4.4.110-vs2.3.9/ipc/sem.c
+--- linux-4.4.110/ipc/sem.c 2018-01-09 16:35:10.000000000 +0000
++++ linux-4.4.110-vs2.3.9/ipc/sem.c 2018-01-09 16:36:33.000000000 +0000
@@ -85,6 +85,8 @@
#include <linux/rwsem.h>
#include <linux/nsproxy.h>
#include <linux/uaccess.h>
#include "util.h"
-@@ -499,6 +501,7 @@ static int newary(struct ipc_namespace *
+@@ -533,6 +535,7 @@ static int newary(struct ipc_namespace *
sma->sem_perm.mode = (semflg & S_IRWXUGO);
sma->sem_perm.key = key;
sma->sem_perm.security = NULL;
retval = security_sem_alloc(sma);
-@@ -528,6 +531,9 @@ static int newary(struct ipc_namespace *
+@@ -563,6 +566,9 @@ static int newary(struct ipc_namespace *
return id;
}
ns->used_sems += nsems;
sem_unlock(sma, -1);
rcu_read_unlock();
-@@ -1116,6 +1122,9 @@ static void freeary(struct ipc_namespace
+@@ -1151,6 +1157,9 @@ static void freeary(struct ipc_namespace
wake_up_sem_queue_do(&tasks);
ns->used_sems -= sma->sem_nsems;
ipc_rcu_putref(sma, sem_rcu_free);
}
-diff -NurpP --minimal linux-3.18.5/ipc/shm.c linux-3.18.5-vs2.3.7.3/ipc/shm.c
---- linux-3.18.5/ipc/shm.c 2015-01-17 02:40:23.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/ipc/shm.c 2015-01-19 10:58:05.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/ipc/shm.c linux-4.4.110-vs2.3.9/ipc/shm.c
+--- linux-4.4.110/ipc/shm.c 2018-01-09 16:35:10.000000000 +0000
++++ linux-4.4.110-vs2.3.9/ipc/shm.c 2018-01-09 16:36:33.000000000 +0000
@@ -42,6 +42,8 @@
#include <linux/nsproxy.h>
#include <linux/mount.h>
#include <linux/uaccess.h>
-@@ -210,10 +212,14 @@ static void shm_open(struct vm_area_stru
+@@ -228,10 +230,14 @@ static void shm_open(struct vm_area_stru
static void shm_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp)
{
struct file *shm_file;
shm_rmid(ns, shp);
shm_unlock(shp);
if (!is_file_hugepages(shm_file))
-@@ -221,6 +227,7 @@ static void shm_destroy(struct ipc_names
- else if (shp->mlock_user)
- user_shm_unlock(file_inode(shm_file)->i_size, shp->mlock_user);
+@@ -240,6 +246,7 @@ static void shm_destroy(struct ipc_names
+ user_shm_unlock(i_size_read(file_inode(shm_file)),
+ shp->mlock_user);
fput(shm_file);
+ put_vx_info(vxi);
ipc_rcu_putref(shp, shm_rcu_free);
}
-@@ -502,11 +509,15 @@ static int newseg(struct ipc_namespace *
+@@ -537,11 +544,15 @@ static int newseg(struct ipc_namespace *
ns->shm_tot + numpages > ns->shm_ctlall)
return -ENOSPC;
shp->shm_perm.mode = (shmflg & S_IRWXUGO);
shp->mlock_user = NULL;
-@@ -576,6 +587,7 @@ static int newseg(struct ipc_namespace *
+@@ -612,6 +623,7 @@ static int newseg(struct ipc_namespace *
ipc_unlock_object(&shp->shm_perm);
rcu_read_unlock();
return error;
no_id:
-diff -NurpP --minimal linux-3.18.5/kernel/Makefile linux-3.18.5-vs2.3.7.3/kernel/Makefile
---- linux-3.18.5/kernel/Makefile 2015-01-17 02:40:23.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/Makefile 2015-01-19 10:58:05.000000000 +0000
-@@ -26,6 +26,7 @@ obj-y += power/
- obj-y += printk/
+diff -NurpP --minimal linux-4.4.110/kernel/Makefile linux-4.4.110-vs2.3.9/kernel/Makefile
+--- linux-4.4.110/kernel/Makefile 2016-07-05 04:12:38.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/Makefile 2018-01-09 16:36:33.000000000 +0000
+@@ -29,6 +29,7 @@ obj-y += printk/
obj-y += irq/
obj-y += rcu/
+ obj-y += livepatch/
+obj-y += vserver/
obj-$(CONFIG_CHECKPOINT_RESTORE) += kcmp.o
obj-$(CONFIG_FREEZER) += freezer.o
-diff -NurpP --minimal linux-3.18.5/kernel/auditsc.c linux-3.18.5-vs2.3.7.3/kernel/auditsc.c
---- linux-3.18.5/kernel/auditsc.c 2015-01-17 02:40:23.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/auditsc.c 2015-01-19 10:58:05.000000000 +0000
-@@ -2025,7 +2025,7 @@ static int audit_set_loginuid_perm(kuid_
+diff -NurpP --minimal linux-4.4.110/kernel/auditsc.c linux-4.4.110-vs2.3.9/kernel/auditsc.c
+--- linux-4.4.110/kernel/auditsc.c 2018-01-09 16:35:12.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/auditsc.c 2018-01-09 16:36:33.000000000 +0000
+@@ -1962,7 +1962,7 @@ static int audit_set_loginuid_perm(kuid_
if (is_audit_feature_set(AUDIT_FEATURE_LOGINUID_IMMUTABLE))
return -EPERM;
/* it is set, you need permission */
return -EPERM;
/* reject if this is not an unset and we don't allow that */
if (is_audit_feature_set(AUDIT_FEATURE_ONLY_UNSET_LOGINUID) && uid_valid(loginuid))
-diff -NurpP --minimal linux-3.18.5/kernel/capability.c linux-3.18.5-vs2.3.7.3/kernel/capability.c
---- linux-3.18.5/kernel/capability.c 2015-01-16 22:19:27.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/capability.c 2015-01-19 10:58:05.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/kernel/capability.c linux-4.4.110-vs2.3.9/kernel/capability.c
+--- linux-4.4.110/kernel/capability.c 2018-01-09 16:35:12.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/capability.c 2018-01-09 16:36:33.000000000 +0000
@@ -17,6 +17,7 @@
#include <linux/syscalls.h>
#include <linux/pid_namespace.h>
#include <asm/uaccess.h>
/*
-@@ -106,6 +107,7 @@ static int cap_validate_magic(cap_user_h
+@@ -107,6 +108,7 @@ static int cap_validate_magic(cap_user_h
return 0;
}
/*
* The only thing that can change the capabilities of the current
* process is the current process. As such, we can't be in this code
-@@ -343,6 +345,8 @@ bool has_ns_capability_noaudit(struct ta
+@@ -344,6 +346,8 @@ bool has_ns_capability_noaudit(struct ta
return (ret == 0);
}
/**
* has_capability_noaudit - Does a task have a capability (unaudited) in the
* initial user ns
-diff -NurpP --minimal linux-3.18.5/kernel/compat.c linux-3.18.5-vs2.3.7.3/kernel/compat.c
---- linux-3.18.5/kernel/compat.c 2015-01-16 22:19:27.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/compat.c 2015-01-19 10:58:05.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/kernel/compat.c linux-4.4.110-vs2.3.9/kernel/compat.c
+--- linux-4.4.110/kernel/compat.c 2015-07-06 20:41:43.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/compat.c 2018-01-09 16:36:33.000000000 +0000
@@ -27,6 +27,7 @@
#include <linux/times.h>
#include <linux/ptrace.h>
#include <asm/uaccess.h>
-@@ -1058,7 +1059,7 @@ COMPAT_SYSCALL_DEFINE1(stime, compat_tim
+@@ -1059,7 +1060,7 @@ COMPAT_SYSCALL_DEFINE1(stime, compat_tim
if (err)
return err;
return 0;
}
-diff -NurpP --minimal linux-3.18.5/kernel/cred.c linux-3.18.5-vs2.3.7.3/kernel/cred.c
---- linux-3.18.5/kernel/cred.c 2013-02-19 13:58:56.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/cred.c 2015-01-19 10:58:05.000000000 +0000
-@@ -56,31 +56,6 @@ struct cred init_cred = {
+diff -NurpP --minimal linux-4.4.110/kernel/cred.c linux-4.4.110-vs2.3.9/kernel/cred.c
+--- linux-4.4.110/kernel/cred.c 2018-01-09 16:35:12.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/cred.c 2018-01-09 16:36:33.000000000 +0000
+@@ -64,31 +64,6 @@ struct cred init_cred = {
.group_info = &init_groups,
};
/*
* The RCU callback to actually dispose of a set of credentials
*/
-@@ -232,21 +207,16 @@ error:
+@@ -240,21 +215,16 @@ error:
*
* Call commit_creds() or abort_creds() to clean up.
*/
memcpy(new, old, sizeof(struct cred));
atomic_set(&new->usage, 1);
-@@ -275,6 +245,13 @@ error:
+@@ -283,6 +253,13 @@ error:
abort_creds(new);
return NULL;
}
EXPORT_SYMBOL(prepare_creds);
/*
-diff -NurpP --minimal linux-3.18.5/kernel/exit.c linux-3.18.5-vs2.3.7.3/kernel/exit.c
---- linux-3.18.5/kernel/exit.c 2015-02-05 18:02:45.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/exit.c 2015-01-19 11:06:12.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/kernel/exit.c linux-4.4.110-vs2.3.9/kernel/exit.c
+--- linux-4.4.110/kernel/exit.c 2018-01-09 16:35:12.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/exit.c 2018-01-09 16:59:03.000000000 +0000
@@ -48,6 +48,10 @@
#include <linux/fs_struct.h>
#include <linux/init_task.h>
#include <trace/events/sched.h>
#include <linux/hw_breakpoint.h>
#include <linux/oom.h>
-@@ -474,15 +478,25 @@ static struct task_struct *find_new_reap
- __acquires(&tasklist_lock)
+@@ -456,14 +460,24 @@ static struct task_struct *find_child_re
{
struct pid_namespace *pid_ns = task_active_pid_ns(father);
-- struct task_struct *thread;
+ struct task_struct *reaper = pid_ns->child_reaper;
+ struct vx_info *vxi = task_get_vx_info(father);
-+ struct task_struct *thread = father;
-+ struct task_struct *reaper;
-
-- thread = father;
- while_each_thread(father, thread) {
- if (thread->flags & PF_EXITING)
- continue;
- if (unlikely(pid_ns->child_reaper == father))
- pid_ns->child_reaper = thread;
-- return thread;
-+ reaper = thread;
-+ goto out_put;
-+ }
+
-+ reaper = pid_ns->child_reaper;
+ if (vxi) {
+ BUG_ON(!vxi->vx_reaper);
+ if (vxi->vx_reaper != init_pid_ns.child_reaper &&
-+ vxi->vx_reaper != father)
++ vxi->vx_reaper != father) {
+ reaper = vxi->vx_reaper;
- }
++ goto out_put;
++ }
++ }
- if (unlikely(pid_ns->child_reaper == father)) {
-@@ -520,7 +534,9 @@ static struct task_struct *find_new_reap
- }
+ if (likely(reaper != father))
+- return reaper;
++ goto out_put;
+
+ reaper = find_alive_thread(father);
+ if (reaper) {
+ pid_ns->child_reaper = reaper;
+- return reaper;
++ goto out_put;
}
-- return pid_ns->child_reaper;
+ write_unlock_irq(&tasklist_lock);
+@@ -474,7 +488,10 @@ static struct task_struct *find_child_re
+ zap_pid_ns_processes(pid_ns);
+ write_lock_irq(&tasklist_lock);
+
+- return father;
++ reaper = father;
+out_put:
+ put_vx_info(vxi);
+ return reaper;
}
/*
-@@ -572,10 +588,15 @@ static void forget_original_parent(struc
- struct task_struct *t = p;
+@@ -562,9 +579,13 @@ static void forget_original_parent(struc
+ return;
- do {
+ reaper = find_new_reaper(father, reaper);
+- list_for_each_entry(p, &father->children, sibling) {
++ for (p = list_first_entry(&father->children, struct task_struct, sibling);
++ &p->sibling != &father->children; ) {
++ struct task_struct *next, *this_reaper = reaper;
++ if (p == reaper)
++ this_reaper = task_active_pid_ns(reaper)->child_reaper;
+ for_each_thread(p, t) {
- t->real_parent = reaper;
-+ struct task_struct *new_parent = reaper;
-+
-+ if (unlikely(p == reaper))
-+ new_parent = task_active_pid_ns(p)->child_reaper;
-+
-+ t->real_parent = new_parent;
- if (t->parent == father) {
- BUG_ON(t->ptrace);
-- t->parent = t->real_parent;
-+ t->parent = new_parent;
- }
- if (t->pdeath_signal)
- group_send_sig_info(t->pdeath_signal,
-@@ -777,6 +798,9 @@ void do_exit(long code)
++ t->real_parent = this_reaper;
+ BUG_ON((!t->ptrace) != (t->parent == father));
+ if (likely(!t->ptrace))
+ t->parent = t->real_parent;
+@@ -576,10 +597,13 @@ static void forget_original_parent(struc
+ * If this is a threaded reparent there is no need to
+ * notify anyone anything has happened.
+ */
+- if (!same_thread_group(reaper, father))
++ if (!same_thread_group(this_reaper, father))
+ reparent_leader(father, p, dead);
++ next = list_next_entry(p, sibling);
++ list_add(&p->sibling, &this_reaper->children);
++ p = next;
+ }
+- list_splice_tail_init(&father->children, &reaper->children);
++ INIT_LIST_HEAD(&father->children);
+ }
+
+ /*
+@@ -763,6 +787,9 @@ void do_exit(long code)
*/
flush_ptrace_hw_breakpoint(tsk);
+ /* needs to stay before exit_notify() */
+ exit_vx_info_early(tsk, code);
+
+ TASKS_RCU(preempt_disable());
TASKS_RCU(tasks_rcu_i = __srcu_read_lock(&tasks_rcu_exit_srcu));
- exit_notify(tsk, group_dead);
- proc_exit_connector(tsk);
-@@ -834,10 +858,15 @@ void do_exit(long code)
+ TASKS_RCU(preempt_enable());
+@@ -822,10 +849,15 @@ void do_exit(long code)
smp_mb();
raw_spin_unlock_wait(&tsk->pi_lock);
BUG();
/* Avoid "noreturn function does return". */
for (;;)
-diff -NurpP --minimal linux-3.18.5/kernel/fork.c linux-3.18.5-vs2.3.7.3/kernel/fork.c
---- linux-3.18.5/kernel/fork.c 2015-01-17 02:40:23.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/fork.c 2015-01-21 09:21:45.000000000 +0000
-@@ -74,6 +74,9 @@
- #include <linux/uprobes.h>
+diff -NurpP --minimal linux-4.4.110/kernel/fork.c linux-4.4.110-vs2.3.9/kernel/fork.c
+--- linux-4.4.110/kernel/fork.c 2018-01-09 16:35:12.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/fork.c 2018-01-09 17:00:00.000000000 +0000
+@@ -76,6 +76,9 @@
#include <linux/aio.h>
#include <linux/compiler.h>
+ #include <linux/sysctl.h>
+#include <linux/vs_context.h>
+#include <linux/vs_network.h>
+#include <linux/vs_limit.h>
#include <asm/pgtable.h>
#include <asm/pgalloc.h>
-@@ -214,6 +217,8 @@ void free_task(struct task_struct *tsk)
+@@ -227,6 +230,8 @@ void free_task(struct task_struct *tsk)
arch_release_thread_info(tsk->stack);
free_thread_info(tsk->stack);
rt_mutex_debug_task_free(tsk);
ftrace_graph_exit_task(tsk);
put_seccomp_filter(tsk);
arch_release_task_struct(tsk);
-@@ -1188,6 +1193,8 @@ static struct task_struct *copy_process(
+@@ -1282,6 +1287,8 @@ static struct task_struct *copy_process(
{
int retval;
struct task_struct *p;
+ struct vx_info *vxi;
+ struct nx_info *nxi;
+ void *cgrp_ss_priv[CGROUP_CANFORK_COUNT] = {};
if ((clone_flags & (CLONE_NEWNS|CLONE_FS)) == (CLONE_NEWNS|CLONE_FS))
- return ERR_PTR(-EINVAL);
-@@ -1249,7 +1256,12 @@ static struct task_struct *copy_process(
+@@ -1343,7 +1350,12 @@ static struct task_struct *copy_process(
DEBUG_LOCKS_WARN_ON(!p->hardirqs_enabled);
DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
#endif
if (atomic_read(&p->real_cred->user->processes) >=
task_rlimit(p, RLIMIT_NPROC)) {
if (p->real_cred->user != INIT_USER &&
-@@ -1535,6 +1547,18 @@ static struct task_struct *copy_process(
+@@ -1640,6 +1652,18 @@ static struct task_struct *copy_process(
total_forks++;
spin_unlock(¤t->sighand->siglock);
syscall_tracepoint_update(p);
write_unlock_irq(&tasklist_lock);
proc_fork_connector(p);
-diff -NurpP --minimal linux-3.18.5/kernel/kthread.c linux-3.18.5-vs2.3.7.3/kernel/kthread.c
---- linux-3.18.5/kernel/kthread.c 2015-01-17 02:40:23.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/kthread.c 2015-01-19 10:58:05.000000000 +0000
-@@ -18,6 +18,7 @@
- #include <linux/freezer.h>
+diff -NurpP --minimal linux-4.4.110/kernel/kthread.c linux-4.4.110-vs2.3.9/kernel/kthread.c
+--- linux-4.4.110/kernel/kthread.c 2018-01-09 16:35:12.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/kthread.c 2018-01-09 17:01:06.000000000 +0000
+@@ -19,6 +19,7 @@
#include <linux/ptrace.h>
#include <linux/uaccess.h>
+ #include <linux/cgroup.h>
+#include <linux/vs_pid.h>
#include <trace/events/sched.h>
static DEFINE_SPINLOCK(kthread_create_lock);
-diff -NurpP --minimal linux-3.18.5/kernel/nsproxy.c linux-3.18.5-vs2.3.7.3/kernel/nsproxy.c
---- linux-3.18.5/kernel/nsproxy.c 2015-01-16 22:19:27.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/nsproxy.c 2015-01-19 10:58:05.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/kernel/nsproxy.c linux-4.4.110-vs2.3.9/kernel/nsproxy.c
+--- linux-4.4.110/kernel/nsproxy.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/nsproxy.c 2018-01-09 16:36:33.000000000 +0000
@@ -20,11 +20,14 @@
#include <linux/mnt_namespace.h>
#include <linux/utsname.h>
return -EPERM;
*new_nsp = create_new_namespaces(unshare_flags, current, user_ns,
-diff -NurpP --minimal linux-3.18.5/kernel/pid.c linux-3.18.5-vs2.3.7.3/kernel/pid.c
---- linux-3.18.5/kernel/pid.c 2015-02-05 18:02:45.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/pid.c 2015-01-19 10:58:05.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/kernel/pid.c linux-4.4.110-vs2.3.9/kernel/pid.c
+--- linux-4.4.110/kernel/pid.c 2018-01-09 16:35:13.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/pid.c 2018-01-09 21:54:23.000000000 +0000
@@ -38,6 +38,7 @@
#include <linux/syscalls.h>
#include <linux/proc_ns.h>
#define pid_hashfn(nr, ns) \
hash_long((unsigned long)nr + (unsigned long)ns, pidhash_shift)
-@@ -375,7 +376,7 @@ EXPORT_SYMBOL_GPL(find_pid_ns);
+@@ -379,7 +380,7 @@ EXPORT_SYMBOL_GPL(find_pid_ns);
struct pid *find_vpid(int nr)
{
}
EXPORT_SYMBOL_GPL(find_vpid);
-@@ -431,6 +432,9 @@ void transfer_pid(struct task_struct *ol
+@@ -435,6 +436,9 @@ void transfer_pid(struct task_struct *ol
struct task_struct *pid_task(struct pid *pid, enum pid_type type)
{
struct task_struct *result = NULL;
+
-+ if (type == PIDTYPE_REALPID)
++ if (type == __PIDTYPE_REALPID)
+ type = PIDTYPE_PID;
if (pid) {
struct hlist_node *first;
first = rcu_dereference_check(hlist_first_rcu(&pid->tasks[type]),
-@@ -450,7 +454,7 @@ struct task_struct *find_task_by_pid_ns(
- rcu_lockdep_assert(rcu_read_lock_held(),
- "find_task_by_pid_ns() needs rcu_read_lock()"
- " protection");
+@@ -453,7 +457,7 @@ struct task_struct *find_task_by_pid_ns(
+ {
+ RCU_LOCKDEP_WARN(!rcu_read_lock_held(),
+ "find_task_by_pid_ns() needs rcu_read_lock() protection");
- return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
+ return pid_task(find_pid_ns(vx_rmap_pid(nr), ns), PIDTYPE_PID);
}
struct task_struct *find_task_by_vpid(pid_t vnr)
-@@ -494,7 +498,7 @@ struct pid *find_get_pid(pid_t nr)
+@@ -497,7 +501,7 @@ struct pid *find_get_pid(pid_t nr)
}
EXPORT_SYMBOL_GPL(find_get_pid);
{
struct upid *upid;
pid_t nr = 0;
-@@ -508,6 +512,11 @@ pid_t pid_nr_ns(struct pid *pid, struct
+@@ -511,6 +515,11 @@ pid_t pid_nr_ns(struct pid *pid, struct
}
EXPORT_SYMBOL_GPL(pid_nr_ns);
pid_t pid_vnr(struct pid *pid)
{
return pid_nr_ns(pid, task_active_pid_ns(current));
-diff -NurpP --minimal linux-3.18.5/kernel/pid_namespace.c linux-3.18.5-vs2.3.7.3/kernel/pid_namespace.c
---- linux-3.18.5/kernel/pid_namespace.c 2014-06-12 13:02:52.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/pid_namespace.c 2015-01-19 10:58:05.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/kernel/pid_namespace.c linux-4.4.110-vs2.3.9/kernel/pid_namespace.c
+--- linux-4.4.110/kernel/pid_namespace.c 2018-01-09 16:35:13.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/pid_namespace.c 2018-01-09 16:36:33.000000000 +0000
@@ -18,6 +18,7 @@
#include <linux/proc_ns.h>
#include <linux/reboot.h>
struct pid_cache {
int nr_ids;
-@@ -110,6 +111,7 @@ static struct pid_namespace *create_pid_
- goto out_free_map;
+@@ -111,6 +112,7 @@ static struct pid_namespace *create_pid_
+ ns->ns.ops = &pidns_operations;
kref_init(&ns->kref);
+ atomic_inc(&vs_global_pid_ns);
ns->level = level;
ns->parent = get_pid_ns(parent_pid_ns);
ns->user_ns = get_user_ns(user_ns);
-@@ -127,6 +129,7 @@ static struct pid_namespace *create_pid_
+@@ -128,6 +130,7 @@ static struct pid_namespace *create_pid_
out_free_map:
kfree(ns->pidmap[0].page);
out_free:
kmem_cache_free(pid_ns_cachep, ns);
out:
return ERR_PTR(err);
-diff -NurpP --minimal linux-3.18.5/kernel/printk/printk.c linux-3.18.5-vs2.3.7.3/kernel/printk/printk.c
---- linux-3.18.5/kernel/printk/printk.c 2015-01-17 02:40:23.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/printk/printk.c 2015-01-19 11:13:25.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/kernel/printk/printk.c linux-4.4.110-vs2.3.9/kernel/printk/printk.c
+--- linux-4.4.110/kernel/printk/printk.c 2018-01-09 16:35:13.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/printk/printk.c 2018-01-09 16:36:33.000000000 +0000
@@ -46,6 +46,7 @@
- #include <linux/irq_work.h>
#include <linux/utsname.h>
#include <linux/ctype.h>
+ #include <linux/uio.h>
+#include <linux/vs_cvirt.h>
#include <asm/uaccess.h>
-@@ -490,7 +491,7 @@ static int check_syslog_permissions(int
- return 0;
+@@ -502,7 +503,7 @@ int check_syslog_permissions(int type, i
+ goto ok;
if (syslog_action_restricted(type)) {
- if (capable(CAP_SYSLOG))
+ if (vx_capable(CAP_SYSLOG, VXC_SYSLOG))
- return 0;
+ goto ok;
/*
* For historical reasons, accept CAP_SYS_ADMIN too, with
-@@ -1270,12 +1271,9 @@ int do_syslog(int type, char __user *buf
+@@ -1304,12 +1305,9 @@ int do_syslog(int type, char __user *buf
if (error)
- return error;
+ goto out;
- switch (type) {
- case SYSLOG_ACTION_CLOSE: /* Close log */
error = -EINVAL;
if (!buf || len < 0)
goto out;
-@@ -1286,6 +1284,16 @@ int do_syslog(int type, char __user *buf
+@@ -1320,6 +1318,16 @@ int do_syslog(int type, char __user *buf
error = -EFAULT;
goto out;
}
error = wait_event_interruptible(log_wait,
syslog_seq != log_next_seq);
if (error)
-@@ -1298,16 +1306,6 @@ int do_syslog(int type, char __user *buf
+@@ -1332,16 +1340,6 @@ int do_syslog(int type, char __user *buf
/* FALL THRU */
/* Read last kernel messages */
case SYSLOG_ACTION_READ_ALL:
error = syslog_print_all(buf, len, clear);
break;
/* Clear ring buffer */
-diff -NurpP --minimal linux-3.18.5/kernel/ptrace.c linux-3.18.5-vs2.3.7.3/kernel/ptrace.c
---- linux-3.18.5/kernel/ptrace.c 2015-01-16 22:19:27.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/ptrace.c 2015-01-19 10:58:13.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/kernel/ptrace.c linux-4.4.110-vs2.3.9/kernel/ptrace.c
+--- linux-4.4.110/kernel/ptrace.c 2018-01-09 16:35:13.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/ptrace.c 2018-01-09 16:36:33.000000000 +0000
@@ -23,6 +23,7 @@
#include <linux/syscalls.h>
#include <linux/uaccess.h>
#include <linux/hw_breakpoint.h>
#include <linux/cn_proc.h>
#include <linux/compat.h>
-@@ -258,6 +259,11 @@ ok:
- }
- rcu_read_unlock();
+@@ -295,6 +296,11 @@ ok:
+ !ptrace_has_cap(mm->user_ns, mode)))
+ return -EPERM;
+ if (!vx_check(task->xid, VS_ADMIN_P|VS_WATCH_P|VS_IDENT))
+ return -EPERM;
return security_ptrace_access_check(task, mode);
}
-diff -NurpP --minimal linux-3.18.5/kernel/reboot.c linux-3.18.5-vs2.3.7.3/kernel/reboot.c
---- linux-3.18.5/kernel/reboot.c 2015-01-17 02:40:23.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/reboot.c 2015-01-19 10:58:13.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/kernel/reboot.c linux-4.4.110-vs2.3.9/kernel/reboot.c
+--- linux-4.4.110/kernel/reboot.c 2016-07-05 04:12:39.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/reboot.c 2018-01-09 16:36:33.000000000 +0000
@@ -16,6 +16,7 @@
#include <linux/syscalls.h>
#include <linux/syscore_ops.h>
mutex_lock(&reboot_mutex);
switch (cmd) {
case LINUX_REBOOT_CMD_RESTART:
-diff -NurpP --minimal linux-3.18.5/kernel/sched/core.c linux-3.18.5-vs2.3.7.3/kernel/sched/core.c
---- linux-3.18.5/kernel/sched/core.c 2015-02-05 18:02:45.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/sched/core.c 2015-01-19 11:06:53.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/kernel/sched/core.c linux-4.4.110-vs2.3.9/kernel/sched/core.c
+--- linux-4.4.110/kernel/sched/core.c 2018-01-09 16:35:13.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/sched/core.c 2018-01-09 16:36:33.000000000 +0000
@@ -74,6 +74,8 @@
#include <linux/binfmts.h>
#include <linux/context_tracking.h>
#include <asm/switch_to.h>
#include <asm/tlb.h>
-@@ -3192,7 +3194,7 @@ SYSCALL_DEFINE1(nice, int, increment)
+@@ -3558,7 +3560,7 @@ SYSCALL_DEFINE1(nice, int, increment)
nice = clamp_val(nice, MIN_NICE, MAX_NICE);
if (increment < 0 && !can_nice(current, nice))
retval = security_task_setnice(current, nice);
if (retval)
-diff -NurpP --minimal linux-3.18.5/kernel/sched/cputime.c linux-3.18.5-vs2.3.7.3/kernel/sched/cputime.c
---- linux-3.18.5/kernel/sched/cputime.c 2015-01-17 02:40:23.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/sched/cputime.c 2015-01-19 11:08:36.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/kernel/sched/cputime.c linux-4.4.110-vs2.3.9/kernel/sched/cputime.c
+--- linux-4.4.110/kernel/sched/cputime.c 2018-01-09 16:35:13.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/sched/cputime.c 2018-01-09 16:36:33.000000000 +0000
@@ -4,6 +4,7 @@
#include <linux/kernel_stat.h>
#include <linux/static_key.h>
account_group_system_time(p, cputime);
/* Add system time to cpustat. */
-diff -NurpP --minimal linux-3.18.5/kernel/sched/fair.c linux-3.18.5-vs2.3.7.3/kernel/sched/fair.c
---- linux-3.18.5/kernel/sched/fair.c 2015-01-17 02:40:23.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/sched/fair.c 2015-01-19 10:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/kernel/sched/fair.c linux-4.4.110-vs2.3.9/kernel/sched/fair.c
+--- linux-4.4.110/kernel/sched/fair.c 2018-01-09 16:35:13.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/sched/fair.c 2018-01-09 16:36:33.000000000 +0000
@@ -30,6 +30,7 @@
#include <linux/mempolicy.h>
#include <linux/migrate.h>
#include <trace/events/sched.h>
-@@ -2840,6 +2841,8 @@ enqueue_entity(struct cfs_rq *cfs_rq, st
+@@ -3055,6 +3056,8 @@ enqueue_entity(struct cfs_rq *cfs_rq, st
__enqueue_entity(cfs_rq, se);
se->on_rq = 1;
if (cfs_rq->nr_running == 1) {
list_add_leaf_cfs_rq(cfs_rq);
check_enqueue_throttle(cfs_rq);
-@@ -2921,6 +2924,8 @@ dequeue_entity(struct cfs_rq *cfs_rq, st
+@@ -3136,6 +3139,8 @@ dequeue_entity(struct cfs_rq *cfs_rq, st
if (se != cfs_rq->curr)
__dequeue_entity(cfs_rq, se);
se->on_rq = 0;
account_entity_dequeue(cfs_rq, se);
/*
-diff -NurpP --minimal linux-3.18.5/kernel/sched/proc.c linux-3.18.5-vs2.3.7.3/kernel/sched/proc.c
---- linux-3.18.5/kernel/sched/proc.c 2015-01-16 22:19:27.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/sched/proc.c 2015-01-19 10:58:14.000000000 +0000
-@@ -71,9 +71,17 @@ EXPORT_SYMBOL(avenrun); /* should be rem
- */
- void get_avenrun(unsigned long *loads, unsigned long offset, int shift)
- {
-- loads[0] = (avenrun[0] + offset) << shift;
-- loads[1] = (avenrun[1] + offset) << shift;
-- loads[2] = (avenrun[2] + offset) << shift;
-+ if (vx_flags(VXF_VIRT_LOAD, 0)) {
-+ struct vx_info *vxi = current_vx_info();
-+
-+ loads[0] = (vxi->cvirt.load[0] + offset) << shift;
-+ loads[1] = (vxi->cvirt.load[1] + offset) << shift;
-+ loads[2] = (vxi->cvirt.load[2] + offset) << shift;
-+ } else {
-+ loads[0] = (avenrun[0] + offset) << shift;
-+ loads[1] = (avenrun[1] + offset) << shift;
-+ loads[2] = (avenrun[2] + offset) << shift;
-+ }
- }
-
- long calc_load_fold_active(struct rq *this_rq)
-diff -NurpP --minimal linux-3.18.5/kernel/signal.c linux-3.18.5-vs2.3.7.3/kernel/signal.c
---- linux-3.18.5/kernel/signal.c 2015-01-16 22:19:27.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/signal.c 2015-01-19 13:14:52.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/kernel/signal.c linux-4.4.110-vs2.3.9/kernel/signal.c
+--- linux-4.4.110/kernel/signal.c 2018-01-09 16:35:13.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/signal.c 2018-01-09 16:36:34.000000000 +0000
@@ -34,6 +34,8 @@
#include <linux/compat.h>
#include <linux/cn_proc.h>
#define CREATE_TRACE_POINTS
#include <trace/events/signal.h>
-@@ -767,9 +769,18 @@ static int check_kill_permission(int sig
+@@ -724,9 +726,18 @@ static int check_kill_permission(int sig
struct pid *sid;
int error;
if (!si_fromuser(info))
return 0;
-@@ -793,6 +804,20 @@ static int check_kill_permission(int sig
+@@ -750,6 +761,20 @@ static int check_kill_permission(int sig
}
}
return security_task_kill(t, info, sig, 0);
}
-@@ -1334,7 +1359,7 @@ int kill_pid_info(int sig, struct siginf
- rcu_read_lock();
- retry:
- p = pid_task(pid, PIDTYPE_PID);
-- if (p) {
-+ if (p && vx_check(vx_task_xid(p), VS_IDENT)) {
- error = group_send_sig_info(sig, info, p);
- if (unlikely(error == -ESRCH))
- /*
-@@ -1382,7 +1407,7 @@ int kill_pid_info_as_cred(int sig, struc
+@@ -1301,8 +1326,14 @@ int kill_pid_info(int sig, struct siginf
+ for (;;) {
+ rcu_read_lock();
+ p = pid_task(pid, PIDTYPE_PID);
+- if (p)
+- error = group_send_sig_info(sig, info, p);
++ if (p) {
++ if (vx_check(vx_task_xid(p), VS_IDENT))
++ error = group_send_sig_info(sig, info, p);
++ else {
++ rcu_read_unlock();
++ return -ESRCH;
++ }
++ }
+ rcu_read_unlock();
+ if (likely(!p || error != -ESRCH))
+ return error;
+@@ -1347,7 +1378,7 @@ int kill_pid_info_as_cred(int sig, struc
rcu_read_lock();
p = pid_task(pid, PIDTYPE_PID);
ret = -ESRCH;
goto out_unlock;
}
-@@ -1434,8 +1459,10 @@ static int kill_something_info(int sig,
+@@ -1399,8 +1430,10 @@ static int kill_something_info(int sig,
struct task_struct * p;
for_each_process(p) {
int err = group_send_sig_info(sig, info, p);
++count;
if (err != -EPERM)
-@@ -2288,6 +2315,11 @@ relock:
+@@ -2253,6 +2286,11 @@ relock:
!sig_kernel_only(signr))
continue;
if (sig_kernel_stop(signr)) {
/*
* The default action is to stop all threads in
-diff -NurpP --minimal linux-3.18.5/kernel/softirq.c linux-3.18.5-vs2.3.7.3/kernel/softirq.c
---- linux-3.18.5/kernel/softirq.c 2015-01-17 02:40:23.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/softirq.c 2015-01-19 11:09:03.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/kernel/softirq.c linux-4.4.110-vs2.3.9/kernel/softirq.c
+--- linux-4.4.110/kernel/softirq.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/softirq.c 2018-01-09 16:36:34.000000000 +0000
@@ -26,6 +26,7 @@
#include <linux/smpboot.h>
#include <linux/tick.h>
#define CREATE_TRACE_POINTS
#include <trace/events/irq.h>
-diff -NurpP --minimal linux-3.18.5/kernel/sys.c linux-3.18.5-vs2.3.7.3/kernel/sys.c
---- linux-3.18.5/kernel/sys.c 2015-01-17 02:40:23.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/sys.c 2015-01-19 11:17:00.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/kernel/sys.c linux-4.4.110-vs2.3.9/kernel/sys.c
+--- linux-4.4.110/kernel/sys.c 2018-01-09 16:35:13.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/sys.c 2018-01-09 17:00:36.000000000 +0000
@@ -54,6 +54,7 @@
#include <linux/cred.h>
/* Move somewhere else to avoid recompiling? */
#include <generated/utsrelease.h>
-@@ -145,7 +146,10 @@ static int set_one_prio(struct task_stru
+@@ -157,7 +158,10 @@ static int set_one_prio(struct task_stru
goto out;
}
if (niceval < task_nice(p) && !can_nice(p, niceval)) {
goto out;
}
no_nice = security_task_setnice(p, niceval);
-@@ -196,6 +200,8 @@ SYSCALL_DEFINE3(setpriority, int, which,
+@@ -208,6 +212,8 @@ SYSCALL_DEFINE3(setpriority, int, which,
else
pgrp = task_pgrp(current);
do_each_pid_thread(pgrp, PIDTYPE_PGID, p) {
error = set_one_prio(p, niceval, error);
} while_each_pid_thread(pgrp, PIDTYPE_PGID, p);
break;
-@@ -262,6 +268,8 @@ SYSCALL_DEFINE2(getpriority, int, which,
+@@ -274,6 +280,8 @@ SYSCALL_DEFINE2(getpriority, int, which,
else
pgrp = task_pgrp(current);
do_each_pid_thread(pgrp, PIDTYPE_PGID, p) {
niceval = nice_to_rlimit(task_nice(p));
if (niceval > retval)
retval = niceval;
-@@ -278,6 +286,8 @@ SYSCALL_DEFINE2(getpriority, int, which,
+@@ -290,6 +298,8 @@ SYSCALL_DEFINE2(getpriority, int, which,
goto out_unlock; /* No processes for this user */
}
do_each_thread(g, p) {
+ if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT))
+ continue;
- if (uid_eq(task_uid(p), uid)) {
+ if (uid_eq(task_uid(p), uid) && task_pid_vnr(p)) {
niceval = nice_to_rlimit(task_nice(p));
if (niceval > retval)
-@@ -1202,7 +1212,8 @@ SYSCALL_DEFINE2(sethostname, char __user
+@@ -1217,7 +1227,8 @@ SYSCALL_DEFINE2(sethostname, char __user
int errno;
char tmp[__NEW_UTS_LEN];
return -EPERM;
if (len < 0 || len > __NEW_UTS_LEN)
-@@ -1253,7 +1264,8 @@ SYSCALL_DEFINE2(setdomainname, char __us
+@@ -1268,7 +1279,8 @@ SYSCALL_DEFINE2(setdomainname, char __us
int errno;
char tmp[__NEW_UTS_LEN];
return -EPERM;
if (len < 0 || len > __NEW_UTS_LEN)
return -EINVAL;
-@@ -1371,7 +1383,7 @@ int do_prlimit(struct task_struct *tsk,
+@@ -1386,7 +1398,7 @@ int do_prlimit(struct task_struct *tsk,
/* Keep the capable check against init_user_ns until
cgroups can contain all limits */
if (new_rlim->rlim_max > rlim->rlim_max &&
retval = -EPERM;
if (!retval)
retval = security_task_setrlimit(tsk->group_leader,
-@@ -1424,7 +1436,8 @@ static int check_prlimit_permission(stru
+@@ -1439,7 +1451,8 @@ static int check_prlimit_permission(stru
gid_eq(cred->gid, tcred->sgid) &&
gid_eq(cred->gid, tcred->gid))
return 0;
return 0;
return -EPERM;
-diff -NurpP --minimal linux-3.18.5/kernel/sysctl.c linux-3.18.5-vs2.3.7.3/kernel/sysctl.c
---- linux-3.18.5/kernel/sysctl.c 2015-01-17 02:40:23.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/sysctl.c 2015-02-02 01:19:02.000000000 +0000
-@@ -84,6 +84,7 @@
+diff -NurpP --minimal linux-4.4.110/kernel/sysctl.c linux-4.4.110-vs2.3.9/kernel/sysctl.c
+--- linux-4.4.110/kernel/sysctl.c 2018-01-09 16:35:13.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/sysctl.c 2018-01-09 16:36:34.000000000 +0000
+@@ -87,6 +87,7 @@
#if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_LOCK_STAT)
#include <linux/lockdep.h>
#endif
#ifdef CONFIG_CHR_DEV_SG
#include <scsi/sg.h>
#endif
-@@ -278,6 +279,13 @@ static int max_extfrag_threshold = 1000;
+@@ -279,6 +280,13 @@ static int max_extfrag_threshold = 1000;
static struct ctl_table kern_table[] = {
{
.procname = "sched_child_runs_first",
.data = &sysctl_sched_child_runs_first,
.maxlen = sizeof(unsigned int),
-@@ -1300,7 +1308,6 @@ static struct ctl_table vm_table[] = {
- .extra1 = &min_extfrag_threshold,
- .extra2 = &max_extfrag_threshold,
+@@ -1385,7 +1393,6 @@ static struct ctl_table vm_table[] = {
+ .extra1 = &zero,
+ .extra2 = &one,
},
-
#endif /* CONFIG_COMPACTION */
{
.procname = "min_free_kbytes",
-diff -NurpP --minimal linux-3.18.5/kernel/sysctl_binary.c linux-3.18.5-vs2.3.7.3/kernel/sysctl_binary.c
---- linux-3.18.5/kernel/sysctl_binary.c 2015-01-17 02:40:23.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/sysctl_binary.c 2015-01-19 10:58:14.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/kernel/sysctl_binary.c linux-4.4.110-vs2.3.9/kernel/sysctl_binary.c
+--- linux-4.4.110/kernel/sysctl_binary.c 2018-01-09 16:35:13.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/sysctl_binary.c 2018-01-09 16:36:34.000000000 +0000
@@ -73,6 +73,7 @@ static const struct bin_table bin_kern_t
{ CTL_INT, KERN_PANIC, "panic" },
{ CTL_STR, KERN_SPARC_REBOOT, "reboot-cmd" },
{ CTL_INT, KERN_CTLALTDEL, "ctrl-alt-del" },
-diff -NurpP --minimal linux-3.18.5/kernel/time/posix-timers.c linux-3.18.5-vs2.3.7.3/kernel/time/posix-timers.c
---- linux-3.18.5/kernel/time/posix-timers.c 2015-01-17 02:40:23.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/time/posix-timers.c 2015-01-19 13:01:37.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/kernel/time/posix-timers.c linux-4.4.110-vs2.3.9/kernel/time/posix-timers.c
+--- linux-4.4.110/kernel/time/posix-timers.c 2018-01-09 16:35:13.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/time/posix-timers.c 2018-01-09 16:36:34.000000000 +0000
@@ -48,6 +48,7 @@
#include <linux/workqueue.h>
#include <linux/export.h>
#include "timekeeping.h"
-@@ -400,6 +401,7 @@ int posix_timer_event(struct k_itimer *t
+@@ -407,6 +408,7 @@ int posix_timer_event(struct k_itimer *t
{
struct task_struct *task;
int shared, ret = -1;
/*
* FIXME: if ->sigq is queued we can race with
* dequeue_signal()->do_schedule_next_timer().
-@@ -416,10 +418,18 @@ int posix_timer_event(struct k_itimer *t
+@@ -423,10 +425,18 @@ int posix_timer_event(struct k_itimer *t
rcu_read_lock();
task = pid_task(timr->it_pid, PIDTYPE_PID);
if (task) {
/* If we failed to send the signal the timer stops. */
return ret > 0;
}
-diff -NurpP --minimal linux-3.18.5/kernel/time/time.c linux-3.18.5-vs2.3.7.3/kernel/time/time.c
---- linux-3.18.5/kernel/time/time.c 2015-02-05 18:02:46.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/time/time.c 2015-02-05 18:08:00.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/kernel/time/time.c linux-4.4.110-vs2.3.9/kernel/time/time.c
+--- linux-4.4.110/kernel/time/time.c 2016-07-05 04:12:39.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/time/time.c 2018-01-09 16:36:34.000000000 +0000
@@ -37,6 +37,7 @@
#include <linux/fs.h>
#include <linux/math64.h>
return 0;
}
-@@ -182,7 +183,7 @@ int do_sys_settimeofday(const struct tim
+@@ -186,7 +187,7 @@ int do_sys_settimeofday(const struct tim
}
}
if (tv)
return 0;
}
-diff -NurpP --minimal linux-3.18.5/kernel/time/timekeeping.c linux-3.18.5-vs2.3.7.3/kernel/time/timekeeping.c
---- linux-3.18.5/kernel/time/timekeeping.c 2015-01-16 22:19:28.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/time/timekeeping.c 2015-01-19 11:18:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/kernel/time/timekeeping.c linux-4.4.110-vs2.3.9/kernel/time/timekeeping.c
+--- linux-4.4.110/kernel/time/timekeeping.c 2018-01-09 16:35:13.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/time/timekeeping.c 2018-01-09 17:02:47.000000000 +0000
@@ -23,6 +23,7 @@
#include <linux/stop_machine.h>
#include <linux/pvclock_gtod.h>
#include "tick-internal.h"
#include "ntp_internal.h"
-@@ -680,7 +681,9 @@ void getnstime_raw_and_real(struct times
+@@ -921,7 +922,9 @@ void ktime_get_raw_and_real_ts64(struct
} while (read_seqcount_retry(&tk_core.seq, seq));
- timespec_add_ns(ts_raw, nsecs_raw);
+ timespec64_add_ns(ts_raw, nsecs_raw);
+ vx_adjust_timespec(ts_raw);
- timespec_add_ns(ts_real, nsecs_real);
+ timespec64_add_ns(ts_real, nsecs_real);
+ vx_adjust_timespec(ts_real);
}
- EXPORT_SYMBOL(getnstime_raw_and_real);
+ EXPORT_SYMBOL(ktime_get_raw_and_real_ts64);
-diff -NurpP --minimal linux-3.18.5/kernel/time/timer.c linux-3.18.5-vs2.3.7.3/kernel/time/timer.c
---- linux-3.18.5/kernel/time/timer.c 2015-01-17 02:40:23.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/time/timer.c 2015-01-19 13:02:42.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/kernel/time/timer.c linux-4.4.110-vs2.3.9/kernel/time/timer.c
+--- linux-4.4.110/kernel/time/timer.c 2018-01-09 16:35:13.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/time/timer.c 2018-01-09 16:36:34.000000000 +0000
@@ -42,6 +42,10 @@
#include <linux/sched/sysctl.h>
#include <linux/slab.h>
#include <asm/uaccess.h>
#include <asm/unistd.h>
-diff -NurpP --minimal linux-3.18.5/kernel/user_namespace.c linux-3.18.5-vs2.3.7.3/kernel/user_namespace.c
---- linux-3.18.5/kernel/user_namespace.c 2015-02-05 18:02:46.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/user_namespace.c 2015-01-25 18:29:17.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/kernel/user_namespace.c linux-4.4.110-vs2.3.9/kernel/user_namespace.c
+--- linux-4.4.110/kernel/user_namespace.c 2016-07-05 04:12:39.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/user_namespace.c 2018-01-09 16:36:34.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/ctype.h>
#include <linux/projid.h>
static struct kmem_cache *user_ns_cachep __read_mostly;
static DEFINE_MUTEX(userns_state_mutex);
-@@ -95,6 +96,7 @@ int create_user_ns(struct cred *new)
+@@ -97,6 +98,7 @@ int create_user_ns(struct cred *new)
atomic_set(&ns->count, 1);
/* Leave the new->user_ns reference with the new user namespace. */
ns->parent = parent_ns;
ns->level = parent_ns->level + 1;
ns->owner = owner;
-@@ -356,6 +358,18 @@ gid_t from_kgid_munged(struct user_names
+@@ -145,6 +147,7 @@ void free_user_ns(struct user_namespace
+ key_put(ns->persistent_keyring_register);
+ #endif
+ ns_free_inum(&ns->ns);
++ atomic_dec(&vs_global_user_ns);
+ kmem_cache_free(user_ns_cachep, ns);
+ ns = parent;
+ } while (atomic_dec_and_test(&parent->count));
+@@ -358,6 +361,18 @@ gid_t from_kgid_munged(struct user_names
}
EXPORT_SYMBOL(from_kgid_munged);
/**
* make_kprojid - Map a user-namespace projid pair into a kprojid.
* @ns: User namespace that the projid is in
-@@ -956,6 +970,8 @@ static void *userns_get(struct task_stru
-
- static void userns_put(void *ns)
- {
-+ /* FIXME: maybe move into destroyer? */
-+ atomic_dec(&vs_global_user_ns);
- put_user_ns(ns);
- }
-
-diff -NurpP --minimal linux-3.18.5/kernel/utsname.c linux-3.18.5-vs2.3.7.3/kernel/utsname.c
---- linux-3.18.5/kernel/utsname.c 2015-01-16 22:19:28.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/utsname.c 2015-01-19 10:58:31.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/kernel/utsname.c linux-4.4.110-vs2.3.9/kernel/utsname.c
+--- linux-4.4.110/kernel/utsname.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/utsname.c 2018-01-09 16:36:34.000000000 +0000
@@ -16,14 +16,17 @@
#include <linux/slab.h>
#include <linux/user_namespace.h>
return uts_ns;
}
-@@ -85,6 +88,7 @@ void free_uts_ns(struct kref *kref)
+@@ -87,6 +90,7 @@ void free_uts_ns(struct kref *kref)
ns = container_of(kref, struct uts_namespace, kref);
put_user_ns(ns->user_ns);
- proc_free_inum(ns->proc_inum);
+ ns_free_inum(&ns->ns);
+ atomic_dec(&vs_global_uts_ns);
kfree(ns);
}
-diff -NurpP --minimal linux-3.18.5/kernel/vserver/Kconfig linux-3.18.5-vs2.3.7.3/kernel/vserver/Kconfig
---- linux-3.18.5/kernel/vserver/Kconfig 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/vserver/Kconfig 2015-01-19 10:58:31.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/kernel/vserver/Kconfig linux-4.4.110-vs2.3.9/kernel/vserver/Kconfig
+--- linux-4.4.110/kernel/vserver/Kconfig 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/vserver/Kconfig 2018-01-09 16:36:34.000000000 +0000
@@ -0,0 +1,230 @@
+#
+# Linux VServer configuration
+ bool
+ default n
+
-diff -NurpP --minimal linux-3.18.5/kernel/vserver/Makefile linux-3.18.5-vs2.3.7.3/kernel/vserver/Makefile
---- linux-3.18.5/kernel/vserver/Makefile 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/vserver/Makefile 2015-01-19 10:58:31.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/kernel/vserver/Makefile linux-4.4.110-vs2.3.9/kernel/vserver/Makefile
+--- linux-4.4.110/kernel/vserver/Makefile 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/vserver/Makefile 2018-01-09 16:36:34.000000000 +0000
@@ -0,0 +1,18 @@
+#
+# Makefile for the Linux vserver routines.
+vserver-$(CONFIG_VSERVER_MONITOR) += monitor.o
+vserver-$(CONFIG_VSERVER_DEVICE) += device.o
+
-diff -NurpP --minimal linux-3.18.5/kernel/vserver/cacct.c linux-3.18.5-vs2.3.7.3/kernel/vserver/cacct.c
---- linux-3.18.5/kernel/vserver/cacct.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/vserver/cacct.c 2015-01-19 10:58:31.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/kernel/vserver/cacct.c linux-4.4.110-vs2.3.9/kernel/vserver/cacct.c
+--- linux-4.4.110/kernel/vserver/cacct.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/vserver/cacct.c 2018-01-09 16:36:34.000000000 +0000
@@ -0,0 +1,42 @@
+/*
+ * linux/kernel/vserver/cacct.c
+ *
+ * Virtual Server: Context Accounting
+ *
-+ * Copyright (C) 2006-2007 Herbert Pötzl
++ * Copyright (C) 2006-2007 Herbert P?tzl
+ *
+ * V0.01 added accounting stats
+ *
+ return 0;
+}
+
-diff -NurpP --minimal linux-3.18.5/kernel/vserver/cacct_init.h linux-3.18.5-vs2.3.7.3/kernel/vserver/cacct_init.h
---- linux-3.18.5/kernel/vserver/cacct_init.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/vserver/cacct_init.h 2015-01-19 10:58:31.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/kernel/vserver/cacct_init.h linux-4.4.110-vs2.3.9/kernel/vserver/cacct_init.h
+--- linux-4.4.110/kernel/vserver/cacct_init.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/vserver/cacct_init.h 2018-01-09 16:36:34.000000000 +0000
@@ -0,0 +1,25 @@
+
+
+ return;
+}
+
-diff -NurpP --minimal linux-3.18.5/kernel/vserver/cacct_proc.h linux-3.18.5-vs2.3.7.3/kernel/vserver/cacct_proc.h
---- linux-3.18.5/kernel/vserver/cacct_proc.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/vserver/cacct_proc.h 2015-01-19 10:58:31.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/kernel/vserver/cacct_proc.h linux-4.4.110-vs2.3.9/kernel/vserver/cacct_proc.h
+--- linux-4.4.110/kernel/vserver/cacct_proc.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/vserver/cacct_proc.h 2018-01-09 16:36:34.000000000 +0000
@@ -0,0 +1,53 @@
+#ifndef _VX_CACCT_PROC_H
+#define _VX_CACCT_PROC_H
+}
+
+#endif /* _VX_CACCT_PROC_H */
-diff -NurpP --minimal linux-3.18.5/kernel/vserver/context.c linux-3.18.5-vs2.3.7.3/kernel/vserver/context.c
---- linux-3.18.5/kernel/vserver/context.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/vserver/context.c 2015-01-19 10:58:31.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/kernel/vserver/context.c linux-4.4.110-vs2.3.9/kernel/vserver/context.c
+--- linux-4.4.110/kernel/vserver/context.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/vserver/context.c 2018-01-09 16:36:34.000000000 +0000
@@ -0,0 +1,1119 @@
+/*
+ * linux/kernel/vserver/context.c
+ *
+ * Virtual Server: Context Support
+ *
-+ * Copyright (C) 2003-2011 Herbert Pötzl
++ * Copyright (C) 2003-2011 Herbert P?tzl
+ *
+ * V0.01 context helper
+ * V0.02 vx_ctx_kill syscall command
+
+EXPORT_SYMBOL_GPL(free_vx_info);
+
-diff -NurpP --minimal linux-3.18.5/kernel/vserver/cvirt.c linux-3.18.5-vs2.3.7.3/kernel/vserver/cvirt.c
---- linux-3.18.5/kernel/vserver/cvirt.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/vserver/cvirt.c 2015-01-19 10:58:31.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/kernel/vserver/cvirt.c linux-4.4.110-vs2.3.9/kernel/vserver/cvirt.c
+--- linux-4.4.110/kernel/vserver/cvirt.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/vserver/cvirt.c 2018-01-09 22:27:39.000000000 +0000
@@ -0,0 +1,313 @@
+/*
+ * linux/kernel/vserver/cvirt.c
+ *
+ * Virtual Server: Context Virtualization
+ *
-+ * Copyright (C) 2004-2007 Herbert Pötzl
++ * Copyright (C) 2004-2007 Herbert P?tzl
+ *
+ * V0.01 broken out from limit.c
+ * V0.02 added utsname stuff
+ struct _vx_cvirt *cvirt = &vxi->cvirt;
+ struct timespec uptime;
+
-+ do_posix_clock_monotonic_gettime(&uptime);
++ ktime_get_ts(&uptime);
+ set_normalized_timespec(&uptime,
+ uptime.tv_sec - cvirt->bias_uptime.tv_sec,
+ uptime.tv_nsec - cvirt->bias_uptime.tv_nsec);
+
+#endif
+
-diff -NurpP --minimal linux-3.18.5/kernel/vserver/cvirt_init.h linux-3.18.5-vs2.3.7.3/kernel/vserver/cvirt_init.h
---- linux-3.18.5/kernel/vserver/cvirt_init.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/vserver/cvirt_init.h 2015-01-19 10:58:31.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/kernel/vserver/cvirt_init.h linux-4.4.110-vs2.3.9/kernel/vserver/cvirt_init.h
+--- linux-4.4.110/kernel/vserver/cvirt_init.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/vserver/cvirt_init.h 2018-01-09 22:16:00.000000000 +0000
@@ -0,0 +1,70 @@
+
+
+ uint64_t idle_jiffies = vx_idle_jiffies();
+ uint64_t nsuptime;
+
-+ do_posix_clock_monotonic_gettime(&cvirt->bias_uptime);
++ ktime_get_ts(&cvirt->bias_uptime);
+ nsuptime = (unsigned long long)cvirt->bias_uptime.tv_sec
+ * NSEC_PER_SEC + cvirt->bias_uptime.tv_nsec;
+ cvirt->bias_clock = nsec_to_clock_t(nsuptime);
+ return;
+}
+
-diff -NurpP --minimal linux-3.18.5/kernel/vserver/cvirt_proc.h linux-3.18.5-vs2.3.7.3/kernel/vserver/cvirt_proc.h
---- linux-3.18.5/kernel/vserver/cvirt_proc.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/vserver/cvirt_proc.h 2015-01-19 10:58:31.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/kernel/vserver/cvirt_proc.h linux-4.4.110-vs2.3.9/kernel/vserver/cvirt_proc.h
+--- linux-4.4.110/kernel/vserver/cvirt_proc.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/vserver/cvirt_proc.h 2018-01-09 16:36:34.000000000 +0000
@@ -0,0 +1,123 @@
+#ifndef _VX_CVIRT_PROC_H
+#define _VX_CVIRT_PROC_H
+}
+
+#endif /* _VX_CVIRT_PROC_H */
-diff -NurpP --minimal linux-3.18.5/kernel/vserver/debug.c linux-3.18.5-vs2.3.7.3/kernel/vserver/debug.c
---- linux-3.18.5/kernel/vserver/debug.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/vserver/debug.c 2015-01-19 10:58:31.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/kernel/vserver/debug.c linux-4.4.110-vs2.3.9/kernel/vserver/debug.c
+--- linux-4.4.110/kernel/vserver/debug.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/vserver/debug.c 2018-01-09 16:36:34.000000000 +0000
@@ -0,0 +1,32 @@
+/*
+ * kernel/vserver/debug.c
+ *
-+ * Copyright (C) 2005-2007 Herbert Pötzl
++ * Copyright (C) 2005-2007 Herbert P?tzl
+ *
+ * V0.01 vx_info dump support
+ *
+
+EXPORT_SYMBOL_GPL(dump_vx_info);
+
-diff -NurpP --minimal linux-3.18.5/kernel/vserver/device.c linux-3.18.5-vs2.3.7.3/kernel/vserver/device.c
---- linux-3.18.5/kernel/vserver/device.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/vserver/device.c 2015-01-19 10:58:31.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/kernel/vserver/device.c linux-4.4.110-vs2.3.9/kernel/vserver/device.c
+--- linux-4.4.110/kernel/vserver/device.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/vserver/device.c 2018-01-09 16:36:34.000000000 +0000
@@ -0,0 +1,443 @@
+/*
+ * linux/kernel/vserver/device.c
+ *
+ * Linux-VServer: Device Support
+ *
-+ * Copyright (C) 2006 Herbert Pötzl
++ * Copyright (C) 2006 Herbert P?tzl
+ * Copyright (C) 2007 Daniel Hokka Zakrisson
+ *
+ * V0.01 device mapping basics
+static inline int __user_device(const char __user *name, dev_t *dev,
+ umode_t *mode)
+{
-+ struct nameidata nd;
++ struct path path;
+ int ret;
+
+ if (!name) {
+ *dev = 0;
+ return 0;
+ }
-+ ret = user_lpath(name, &nd.path);
++ ret = user_lpath(name, &path);
+ if (ret)
+ return ret;
-+ if (nd.path.dentry->d_inode) {
-+ *dev = nd.path.dentry->d_inode->i_rdev;
-+ *mode = nd.path.dentry->d_inode->i_mode;
++ if (path.dentry->d_inode) {
++ *dev = path.dentry->d_inode->i_rdev;
++ *mode = path.dentry->d_inode->i_mode;
+ }
-+ path_put(&nd.path);
++ path_put(&path);
+ return 0;
+}
+
+#endif /* CONFIG_COMPAT */
+
+
-diff -NurpP --minimal linux-3.18.5/kernel/vserver/dlimit.c linux-3.18.5-vs2.3.7.3/kernel/vserver/dlimit.c
---- linux-3.18.5/kernel/vserver/dlimit.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/vserver/dlimit.c 2015-01-19 10:58:31.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/kernel/vserver/dlimit.c linux-4.4.110-vs2.3.9/kernel/vserver/dlimit.c
+--- linux-4.4.110/kernel/vserver/dlimit.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/vserver/dlimit.c 2018-01-09 16:36:34.000000000 +0000
@@ -0,0 +1,528 @@
+/*
+ * linux/kernel/vserver/dlimit.c
+ *
+ * Virtual Server: Context Disk Limits
+ *
-+ * Copyright (C) 2004-2009 Herbert Pötzl
++ * Copyright (C) 2004-2009 Herbert P?tzl
+ *
+ * V0.01 initial version
+ * V0.02 compat32 splitup
+EXPORT_SYMBOL_GPL(locate_dl_info);
+EXPORT_SYMBOL_GPL(rcu_free_dl_info);
+
-diff -NurpP --minimal linux-3.18.5/kernel/vserver/helper.c linux-3.18.5-vs2.3.7.3/kernel/vserver/helper.c
---- linux-3.18.5/kernel/vserver/helper.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/vserver/helper.c 2015-01-19 10:58:31.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/kernel/vserver/helper.c linux-4.4.110-vs2.3.9/kernel/vserver/helper.c
+--- linux-4.4.110/kernel/vserver/helper.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/vserver/helper.c 2018-01-09 16:36:34.000000000 +0000
@@ -0,0 +1,242 @@
+/*
+ * linux/kernel/vserver/helper.c
+ *
+ * Virtual Context Support
+ *
-+ * Copyright (C) 2004-2007 Herbert Pötzl
++ * Copyright (C) 2004-2007 Herbert P?tzl
+ *
+ * V0.01 basic helper
+ *
+ return do_vshelper(vshelper_path, argv, envp, 1);
+}
+
-diff -NurpP --minimal linux-3.18.5/kernel/vserver/history.c linux-3.18.5-vs2.3.7.3/kernel/vserver/history.c
---- linux-3.18.5/kernel/vserver/history.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/vserver/history.c 2015-01-19 10:58:31.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/kernel/vserver/history.c linux-4.4.110-vs2.3.9/kernel/vserver/history.c
+--- linux-4.4.110/kernel/vserver/history.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/vserver/history.c 2018-01-09 16:36:34.000000000 +0000
@@ -0,0 +1,258 @@
+/*
+ * kernel/vserver/history.c
+ *
+ * Virtual Context History Backtrace
+ *
-+ * Copyright (C) 2004-2007 Herbert Pötzl
++ * Copyright (C) 2004-2007 Herbert P?tzl
+ *
+ * V0.01 basic structure
+ * V0.02 hash/unhash and trace
+
+#endif /* CONFIG_COMPAT */
+
-diff -NurpP --minimal linux-3.18.5/kernel/vserver/inet.c linux-3.18.5-vs2.3.7.3/kernel/vserver/inet.c
---- linux-3.18.5/kernel/vserver/inet.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/vserver/inet.c 2015-01-19 10:58:31.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/kernel/vserver/inet.c linux-4.4.110-vs2.3.9/kernel/vserver/inet.c
+--- linux-4.4.110/kernel/vserver/inet.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/vserver/inet.c 2018-01-09 16:36:34.000000000 +0000
@@ -0,0 +1,236 @@
+
+#include <linux/in.h>
+
+EXPORT_SYMBOL_GPL(ip_v4_find_src);
+
-diff -NurpP --minimal linux-3.18.5/kernel/vserver/init.c linux-3.18.5-vs2.3.7.3/kernel/vserver/init.c
---- linux-3.18.5/kernel/vserver/init.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/vserver/init.c 2015-01-19 10:58:31.000000000 +0000
-@@ -0,0 +1,45 @@
+diff -NurpP --minimal linux-4.4.110/kernel/vserver/init.c linux-4.4.110-vs2.3.9/kernel/vserver/init.c
+--- linux-4.4.110/kernel/vserver/init.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/vserver/init.c 2018-01-09 22:31:39.000000000 +0000
+@@ -0,0 +1,46 @@
+/*
+ * linux/kernel/init.c
+ *
+ * Virtual Server Init
+ *
-+ * Copyright (C) 2004-2007 Herbert Pötzl
++ * Copyright (C) 2004-2007 Herbert P?tzl
+ *
+ * V0.01 basic structure
+ *
+ */
+
+#include <linux/init.h>
++#include <linux/module.h>
+
+int vserver_register_sysctl(void);
+void vserver_unregister_sysctl(void);
+module_init(init_vserver);
+module_exit(exit_vserver);
+
-diff -NurpP --minimal linux-3.18.5/kernel/vserver/inode.c linux-3.18.5-vs2.3.7.3/kernel/vserver/inode.c
---- linux-3.18.5/kernel/vserver/inode.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/vserver/inode.c 2015-01-19 10:58:31.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/kernel/vserver/inode.c linux-4.4.110-vs2.3.9/kernel/vserver/inode.c
+--- linux-4.4.110/kernel/vserver/inode.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/vserver/inode.c 2018-01-09 22:24:56.000000000 +0000
@@ -0,0 +1,440 @@
+/*
+ * linux/kernel/vserver/inode.c
+ *
+ * Virtual Server: File System Support
+ *
-+ * Copyright (C) 2004-2007 Herbert Pötzl
++ * Copyright (C) 2004-2007 Herbert P?tzl
+ *
+ * V0.01 separated from vcontext V0.05
+ * V0.02 moved to tag (instead of xid)
+ return -EFAULT;
+
+ filp = fget(fd);
-+ if (!filp || !filp->f_dentry || !filp->f_dentry->d_inode)
++ if (!filp || !filp->f_path.dentry || !filp->f_path.dentry->d_inode)
+ return -EBADF;
+
-+ ret = __vc_get_iattr(filp->f_dentry->d_inode,
++ ret = __vc_get_iattr(filp->f_path.dentry->d_inode,
+ &vc_data.tag, &vc_data.flags, &vc_data.mask);
+
+ fput(filp);
+ return -EFAULT;
+
+ filp = fget(fd);
-+ if (!filp || !filp->f_dentry || !filp->f_dentry->d_inode)
++ if (!filp || !filp->f_path.dentry || !filp->f_path.dentry->d_inode)
+ return -EBADF;
+
-+ ret = __vc_set_iattr(filp->f_dentry, &vc_data.tag,
++ ret = __vc_set_iattr(filp->f_path.dentry, &vc_data.tag,
+ &vc_data.flags, &vc_data.mask);
+
+ fput(filp);
+
+#endif /* CONFIG_PROPAGATE */
+
-diff -NurpP --minimal linux-3.18.5/kernel/vserver/limit.c linux-3.18.5-vs2.3.7.3/kernel/vserver/limit.c
---- linux-3.18.5/kernel/vserver/limit.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/vserver/limit.c 2015-01-19 10:58:31.000000000 +0000
-@@ -0,0 +1,345 @@
+diff -NurpP --minimal linux-4.4.110/kernel/vserver/limit.c linux-4.4.110-vs2.3.9/kernel/vserver/limit.c
+--- linux-4.4.110/kernel/vserver/limit.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/vserver/limit.c 2018-01-09 16:36:34.000000000 +0000
+@@ -0,0 +1,343 @@
+/*
+ * linux/kernel/vserver/limit.c
+ *
+ * Virtual Server: Context Limits
+ *
-+ * Copyright (C) 2004-2010 Herbert Pötzl
++ * Copyright (C) 2004-2010 Herbert P?tzl
+ *
+ * V0.01 broken out from vcontext V0.05
+ * V0.02 changed vcmds to vxi arg
+#include <linux/sched.h>
+#include <linux/module.h>
+#include <linux/memcontrol.h>
-+#include <linux/res_counter.h>
++#include <linux/page_counter.h>
+#include <linux/vs_limit.h>
+#include <linux/vserver/limit.h>
+#include <linux/vserver/limit_cmd.h>
+}
+
+
++#ifdef CONFIG_MEMCG
+void vx_vsi_meminfo(struct sysinfo *val)
+{
-+#ifdef CONFIG_MEMCG
+ struct mem_cgroup *mcg;
+ u64 res_limit, res_usage;
+
+ if (!mcg)
+ goto out;
+
-+ res_limit = mem_cgroup_res_read_u64(mcg, RES_LIMIT);
-+ res_usage = mem_cgroup_res_read_u64(mcg, RES_USAGE);
++ res_limit = mem_cgroup_mem_limit_pages(mcg);
++ res_usage = mem_cgroup_mem_usage_pages(mcg);
+
-+ if (res_limit != RES_COUNTER_MAX)
-+ val->totalram = (res_limit >> PAGE_SHIFT);
-+ val->freeram = val->totalram - (res_usage >> PAGE_SHIFT);
++ if (res_limit != PAGE_COUNTER_MAX)
++ val->totalram = res_limit;
++ val->freeram = val->totalram - res_usage;
+ val->bufferram = 0;
+ val->totalhigh = 0;
+ val->freehigh = 0;
+out:
-+#endif /* CONFIG_MEMCG */
+ return;
+}
+
+void vx_vsi_swapinfo(struct sysinfo *val)
+{
-+#ifdef CONFIG_MEMCG
+#ifdef CONFIG_MEMCG_SWAP
+ struct mem_cgroup *mcg;
+ u64 res_limit, res_usage, memsw_limit, memsw_usage;
+ if (!mcg)
+ goto out;
+
-+ res_limit = mem_cgroup_res_read_u64(mcg, RES_LIMIT);
-+ res_usage = mem_cgroup_res_read_u64(mcg, RES_USAGE);
-+ memsw_limit = mem_cgroup_memsw_read_u64(mcg, RES_LIMIT);
-+ memsw_usage = mem_cgroup_memsw_read_u64(mcg, RES_USAGE);
++ res_limit = mem_cgroup_mem_limit_pages(mcg);
++ res_usage = mem_cgroup_mem_usage_pages(mcg);
++ memsw_limit = mem_cgroup_memsw_limit_pages(mcg);
++ memsw_usage = mem_cgroup_memsw_usage_pages(mcg);
+
+ /* memory unlimited */
-+ if (res_limit == RES_COUNTER_MAX)
++ if (res_limit == PAGE_COUNTER_MAX)
+ goto out;
+
+ swap_limit = memsw_limit - res_limit;
+ /* we have a swap limit? */
-+ if (memsw_limit != RES_COUNTER_MAX)
-+ val->totalswap = swap_limit >> PAGE_SHIFT;
++ if (memsw_limit != PAGE_COUNTER_MAX)
++ val->totalswap = swap_limit;
+
+ /* calculate swap part */
+ swap_usage = (memsw_usage > res_usage) ?
+
+ /* total shown minus usage gives free swap */
+ val->freeswap = (swap_usage < swap_limit) ?
-+ val->totalswap - (swap_usage >> PAGE_SHIFT) : 0;
++ val->totalswap - swap_usage : 0;
+out:
+#else /* !CONFIG_MEMCG_SWAP */
+ val->totalswap = 0;
+ val->freeswap = 0;
+#endif /* !CONFIG_MEMCG_SWAP */
-+#endif /* CONFIG_MEMCG */
+ return;
+}
+
+long vx_vsi_cached(struct sysinfo *val)
+{
+ long cache = 0;
-+#ifdef CONFIG_MEMCG
++#ifdef CONFIG_MEMCG_BROKEN
+ struct mem_cgroup *mcg;
+
+ rcu_read_lock();
+ if (!mcg)
+ goto out;
+
-+ cache = mem_cgroup_stat_read_cache(mcg);
++ // cache = mem_cgroup_stat_read_cache(mcg);
+out:
+#endif
+ return cache;
+}
++#endif /* !CONFIG_MEMCG */
+
-diff -NurpP --minimal linux-3.18.5/kernel/vserver/limit_init.h linux-3.18.5-vs2.3.7.3/kernel/vserver/limit_init.h
---- linux-3.18.5/kernel/vserver/limit_init.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/vserver/limit_init.h 2015-01-19 10:58:31.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/kernel/vserver/limit_init.h linux-4.4.110-vs2.3.9/kernel/vserver/limit_init.h
+--- linux-4.4.110/kernel/vserver/limit_init.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/vserver/limit_init.h 2018-01-09 16:36:34.000000000 +0000
@@ -0,0 +1,31 @@
+
+
+ }
+}
+
-diff -NurpP --minimal linux-3.18.5/kernel/vserver/limit_proc.h linux-3.18.5-vs2.3.7.3/kernel/vserver/limit_proc.h
---- linux-3.18.5/kernel/vserver/limit_proc.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/vserver/limit_proc.h 2015-01-19 10:58:31.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/kernel/vserver/limit_proc.h linux-4.4.110-vs2.3.9/kernel/vserver/limit_proc.h
+--- linux-4.4.110/kernel/vserver/limit_proc.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/vserver/limit_proc.h 2018-01-09 16:36:34.000000000 +0000
@@ -0,0 +1,57 @@
+#ifndef _VX_LIMIT_PROC_H
+#define _VX_LIMIT_PROC_H
+#endif /* _VX_LIMIT_PROC_H */
+
+
-diff -NurpP --minimal linux-3.18.5/kernel/vserver/network.c linux-3.18.5-vs2.3.7.3/kernel/vserver/network.c
---- linux-3.18.5/kernel/vserver/network.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/vserver/network.c 2015-01-19 10:58:31.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/kernel/vserver/network.c linux-4.4.110-vs2.3.9/kernel/vserver/network.c
+--- linux-4.4.110/kernel/vserver/network.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/vserver/network.c 2018-01-09 16:36:34.000000000 +0000
@@ -0,0 +1,1053 @@
+/*
+ * linux/kernel/vserver/network.c
+ *
+ * Virtual Server: Network Support
+ *
-+ * Copyright (C) 2003-2007 Herbert Pötzl
++ * Copyright (C) 2003-2007 Herbert P?tzl
+ *
+ * V0.01 broken out from vcontext V0.05
+ * V0.02 cleaned up implementation
+EXPORT_SYMBOL_GPL(free_nx_info);
+EXPORT_SYMBOL_GPL(unhash_nx_info);
+
-diff -NurpP --minimal linux-3.18.5/kernel/vserver/proc.c linux-3.18.5-vs2.3.7.3/kernel/vserver/proc.c
---- linux-3.18.5/kernel/vserver/proc.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/vserver/proc.c 2015-01-21 08:57:26.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/kernel/vserver/proc.c linux-4.4.110-vs2.3.9/kernel/vserver/proc.c
+--- linux-4.4.110/kernel/vserver/proc.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/vserver/proc.c 2018-01-09 16:36:34.000000000 +0000
@@ -0,0 +1,1100 @@
+/*
+ * linux/kernel/vserver/proc.c
+ *
+ * Virtual Context Support
+ *
-+ * Copyright (C) 2003-2011 Herbert Pötzl
++ * Copyright (C) 2003-2011 Herbert P?tzl
+ *
+ * V0.01 basic structure
+ * V0.02 adaptation vs1.3.0
+static int vx_proc_fill_cache(struct file *filp, struct dir_context *ctx,
+ char *name, int len, vx_instantiate_t instantiate, int id, void *ptr)
+{
-+ struct dentry *child, *dir = filp->f_dentry;
++ struct dentry *child, *dir = filp->f_path.dentry;
+ struct inode *inode;
+ struct qstr qname;
+ ino_t ino = 0;
+static ssize_t proc_vs_info_read(struct file *file, char __user *buf,
+ size_t count, loff_t *ppos)
+{
-+ struct inode *inode = file->f_dentry->d_inode;
++ struct inode *inode = file->f_path.dentry->d_inode;
+ unsigned long page;
+ ssize_t length = 0;
+
+static ssize_t proc_vx_info_read(struct file *file, char __user *buf,
+ size_t count, loff_t *ppos)
+{
-+ struct inode *inode = file->f_dentry->d_inode;
++ struct inode *inode = file->f_path.dentry->d_inode;
+ struct vx_info *vxi = NULL;
+ vxid_t xid = PROC_I(inode)->fd;
+ unsigned long page;
+static ssize_t proc_nx_info_read(struct file *file, char __user *buf,
+ size_t count, loff_t *ppos)
+{
-+ struct inode *inode = file->f_dentry->d_inode;
++ struct inode *inode = file->f_path.dentry->d_inode;
+ struct nx_info *nxi = NULL;
+ vnid_t nid = PROC_I(inode)->fd;
+ unsigned long page;
+
+static int proc_xid_iterate(struct file *filp, struct dir_context *ctx)
+{
-+ struct dentry *dentry = filp->f_dentry;
++ struct dentry *dentry = filp->f_path.dentry;
+ struct inode *inode = dentry->d_inode;
+ struct vs_entry *p = vx_base_stuff;
+ int size = sizeof(vx_base_stuff) / sizeof(struct vs_entry);
+
+static int proc_nid_iterate(struct file *filp, struct dir_context *ctx)
+{
-+ struct dentry *dentry = filp->f_dentry;
++ struct dentry *dentry = filp->f_path.dentry;
+ struct inode *inode = dentry->d_inode;
+ struct vs_entry *p = nx_base_stuff;
+ int size = sizeof(nx_base_stuff) / sizeof(struct vs_entry);
+
+int proc_virtual_iterate(struct file *filp, struct dir_context *ctx)
+{
-+ struct dentry *dentry = filp->f_dentry;
++ struct dentry *dentry = filp->f_path.dentry;
+ struct inode *inode = dentry->d_inode;
+ struct vs_entry *p = vx_virtual_stuff;
+ int size = sizeof(vx_virtual_stuff) / sizeof(struct vs_entry);
+
+int proc_virtnet_iterate(struct file *filp, struct dir_context *ctx)
+{
-+ struct dentry *dentry = filp->f_dentry;
++ struct dentry *dentry = filp->f_path.dentry;
+ struct inode *inode = dentry->d_inode;
+ struct vs_entry *p = nx_virtnet_stuff;
+ int size = sizeof(nx_virtnet_stuff) / sizeof(struct vs_entry);
+ return 0;
+}
+
-diff -NurpP --minimal linux-3.18.5/kernel/vserver/sched.c linux-3.18.5-vs2.3.7.3/kernel/vserver/sched.c
---- linux-3.18.5/kernel/vserver/sched.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/vserver/sched.c 2015-01-19 10:58:31.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/kernel/vserver/sched.c linux-4.4.110-vs2.3.9/kernel/vserver/sched.c
+--- linux-4.4.110/kernel/vserver/sched.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/vserver/sched.c 2018-01-09 16:36:34.000000000 +0000
@@ -0,0 +1,83 @@
+/*
+ * linux/kernel/vserver/sched.c
+ *
+ * Virtual Server: Scheduler Support
+ *
-+ * Copyright (C) 2004-2010 Herbert Pötzl
++ * Copyright (C) 2004-2010 Herbert P?tzl
+ *
+ * V0.01 adapted Sam Vilains version to 2.6.3
+ * V0.02 removed legacy interface
+ data->prio_bias = MIN_PRIO_BIAS;
+
+ if (data->cpu_id != ~0) {
-+ vxi->sched.update = cpumask_of_cpu(data->cpu_id);
++ vxi->sched.update = *get_cpu_mask(data->cpu_id);
+ cpumask_and(&vxi->sched.update, &vxi->sched.update,
+ cpu_online_mask);
+ } else
+ cpumask_copy(&vxi->sched.update, cpu_online_mask);
+
-+ for_each_cpu_mask(cpu, vxi->sched.update)
++ for ((cpu) = 0; (cpu) < 1; (cpu)++, (void)vxi->sched.update)
+ vx_update_sched_param(&vxi->sched,
+ &vx_per_cpu(vxi, sched_pc, cpu));
+ return 0;
+ return 0;
+}
+
-diff -NurpP --minimal linux-3.18.5/kernel/vserver/sched_init.h linux-3.18.5-vs2.3.7.3/kernel/vserver/sched_init.h
---- linux-3.18.5/kernel/vserver/sched_init.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/vserver/sched_init.h 2015-01-19 10:58:31.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/kernel/vserver/sched_init.h linux-4.4.110-vs2.3.9/kernel/vserver/sched_init.h
+--- linux-4.4.110/kernel/vserver/sched_init.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/vserver/sched_init.h 2018-01-09 16:36:34.000000000 +0000
@@ -0,0 +1,27 @@
+
+static inline void vx_info_init_sched(struct _vx_sched *sched)
+{
+ return;
+}
-diff -NurpP --minimal linux-3.18.5/kernel/vserver/sched_proc.h linux-3.18.5-vs2.3.7.3/kernel/vserver/sched_proc.h
---- linux-3.18.5/kernel/vserver/sched_proc.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/vserver/sched_proc.h 2015-01-19 10:58:31.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/kernel/vserver/sched_proc.h linux-4.4.110-vs2.3.9/kernel/vserver/sched_proc.h
+--- linux-4.4.110/kernel/vserver/sched_proc.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/vserver/sched_proc.h 2018-01-09 16:36:34.000000000 +0000
@@ -0,0 +1,32 @@
+#ifndef _VX_SCHED_PROC_H
+#define _VX_SCHED_PROC_H
+}
+
+#endif /* _VX_SCHED_PROC_H */
-diff -NurpP --minimal linux-3.18.5/kernel/vserver/signal.c linux-3.18.5-vs2.3.7.3/kernel/vserver/signal.c
---- linux-3.18.5/kernel/vserver/signal.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/vserver/signal.c 2015-01-19 10:58:31.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/kernel/vserver/signal.c linux-4.4.110-vs2.3.9/kernel/vserver/signal.c
+--- linux-4.4.110/kernel/vserver/signal.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/vserver/signal.c 2018-01-09 16:36:34.000000000 +0000
@@ -0,0 +1,134 @@
+/*
+ * linux/kernel/vserver/signal.c
+ *
+ * Virtual Server: Signal Support
+ *
-+ * Copyright (C) 2003-2007 Herbert Pötzl
++ * Copyright (C) 2003-2007 Herbert P?tzl
+ *
+ * V0.01 broken out from vcontext V0.05
+ * V0.02 changed vcmds to vxi arg
+ return ret;
+}
+
-diff -NurpP --minimal linux-3.18.5/kernel/vserver/space.c linux-3.18.5-vs2.3.7.3/kernel/vserver/space.c
---- linux-3.18.5/kernel/vserver/space.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/vserver/space.c 2015-01-25 18:27:56.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/kernel/vserver/space.c linux-4.4.110-vs2.3.9/kernel/vserver/space.c
+--- linux-4.4.110/kernel/vserver/space.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/vserver/space.c 2018-01-09 16:36:34.000000000 +0000
@@ -0,0 +1,436 @@
+/*
+ * linux/kernel/vserver/space.c
+ *
+ * Virtual Server: Context Space Support
+ *
-+ * Copyright (C) 2003-2010 Herbert Pötzl
++ * Copyright (C) 2003-2010 Herbert P?tzl
+ *
+ * V0.01 broken out from context.c 0.07
+ * V0.02 added task locking for namespace
+ return 0;
+}
+
-diff -NurpP --minimal linux-3.18.5/kernel/vserver/switch.c linux-3.18.5-vs2.3.7.3/kernel/vserver/switch.c
---- linux-3.18.5/kernel/vserver/switch.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/vserver/switch.c 2015-01-19 10:58:31.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/kernel/vserver/switch.c linux-4.4.110-vs2.3.9/kernel/vserver/switch.c
+--- linux-4.4.110/kernel/vserver/switch.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/vserver/switch.c 2018-01-09 16:36:34.000000000 +0000
@@ -0,0 +1,556 @@
+/*
+ * linux/kernel/vserver/switch.c
+ *
+ * Virtual Server: Syscall Switch
+ *
-+ * Copyright (C) 2003-2011 Herbert Pötzl
++ * Copyright (C) 2003-2011 Herbert P?tzl
+ *
+ * V0.01 syscall switch
+ * V0.02 added signal to context
+}
+
+#endif /* CONFIG_COMPAT */
-diff -NurpP --minimal linux-3.18.5/kernel/vserver/sysctl.c linux-3.18.5-vs2.3.7.3/kernel/vserver/sysctl.c
---- linux-3.18.5/kernel/vserver/sysctl.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/vserver/sysctl.c 2015-01-19 18:06:52.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/kernel/vserver/sysctl.c linux-4.4.110-vs2.3.9/kernel/vserver/sysctl.c
+--- linux-4.4.110/kernel/vserver/sysctl.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/vserver/sysctl.c 2018-01-09 16:36:34.000000000 +0000
@@ -0,0 +1,247 @@
+/*
+ * kernel/vserver/sysctl.c
+ *
+ * Virtual Context Support
+ *
-+ * Copyright (C) 2004-2007 Herbert Pötzl
++ * Copyright (C) 2004-2007 Herbert P?tzl
+ *
+ * V0.01 basic structure
+ *
+EXPORT_SYMBOL_GPL(vs_debug_perm);
+EXPORT_SYMBOL_GPL(vs_debug_misc);
+
-diff -NurpP --minimal linux-3.18.5/kernel/vserver/tag.c linux-3.18.5-vs2.3.7.3/kernel/vserver/tag.c
---- linux-3.18.5/kernel/vserver/tag.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/vserver/tag.c 2015-01-19 10:58:31.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/kernel/vserver/tag.c linux-4.4.110-vs2.3.9/kernel/vserver/tag.c
+--- linux-4.4.110/kernel/vserver/tag.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/vserver/tag.c 2018-01-09 16:36:34.000000000 +0000
@@ -0,0 +1,63 @@
+/*
+ * linux/kernel/vserver/tag.c
+ *
+ * Virtual Server: Shallow Tag Space
+ *
-+ * Copyright (C) 2007 Herbert Pötzl
++ * Copyright (C) 2007 Herbert P?tzl
+ *
+ * V0.01 basic implementation
+ *
+}
+
+
-diff -NurpP --minimal linux-3.18.5/kernel/vserver/vci_config.h linux-3.18.5-vs2.3.7.3/kernel/vserver/vci_config.h
---- linux-3.18.5/kernel/vserver/vci_config.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/kernel/vserver/vci_config.h 2015-01-19 10:58:31.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/kernel/vserver/vci_config.h linux-4.4.110-vs2.3.9/kernel/vserver/vci_config.h
+--- linux-4.4.110/kernel/vserver/vci_config.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/kernel/vserver/vci_config.h 2018-01-09 16:36:34.000000000 +0000
@@ -0,0 +1,80 @@
+
+/* interface version */
+ 0;
+}
+
-diff -NurpP --minimal linux-3.18.5/mm/memcontrol.c linux-3.18.5-vs2.3.7.3/mm/memcontrol.c
---- linux-3.18.5/mm/memcontrol.c 2015-01-17 02:40:24.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/mm/memcontrol.c 2015-01-19 11:03:45.000000000 +0000
-@@ -2653,6 +2653,31 @@ static struct mem_cgroup *mem_cgroup_loo
- return mem_cgroup_from_id(id);
+diff -NurpP --minimal linux-4.4.110/mm/memcontrol.c linux-4.4.110-vs2.3.9/mm/memcontrol.c
+--- linux-4.4.110/mm/memcontrol.c 2018-01-09 16:35:14.000000000 +0000
++++ linux-4.4.110-vs2.3.9/mm/memcontrol.c 2018-01-09 16:36:34.000000000 +0000
+@@ -2888,6 +2888,28 @@ static u64 mem_cgroup_read_u64(struct cg
+ }
}
-+u64 mem_cgroup_res_read_u64(struct mem_cgroup *mem, int member)
++u64 mem_cgroup_mem_usage_pages(struct mem_cgroup *memcg)
+{
-+ return res_counter_read_u64(&mem->res, member);
++ return mem_cgroup_usage(memcg, false) >> PAGE_SHIFT;
+}
+
-+u64 mem_cgroup_memsw_read_u64(struct mem_cgroup *mem, int member)
++u64 mem_cgroup_mem_limit_pages(struct mem_cgroup *memcg)
+{
-+ return res_counter_read_u64(&mem->memsw, member);
++ return (u64)memcg->memory.limit;
+}
+
-+s64 mem_cgroup_stat_read_cache(struct mem_cgroup *mem)
++u64 mem_cgroup_memsw_usage_pages(struct mem_cgroup *memcg)
+{
-+ return mem_cgroup_read_stat(mem, MEM_CGROUP_STAT_CACHE);
++ return mem_cgroup_usage(memcg, true) >> PAGE_SHIFT;
+}
+
-+s64 mem_cgroup_stat_read_anon(struct mem_cgroup *mem)
++u64 mem_cgroup_memsw_limit_pages(struct mem_cgroup *memcg)
+{
-+ return mem_cgroup_read_stat(mem, MEM_CGROUP_STAT_RSS);
++ return (u64)memcg->memsw.limit;
+}
+
-+s64 mem_cgroup_stat_read_mapped(struct mem_cgroup *mem)
-+{
-+ return mem_cgroup_read_stat(mem, MEM_CGROUP_STAT_FILE_MAPPED);
-+}
+
- /*
- * try_get_mem_cgroup_from_page - look up page's memcg association
- * @page: the page
-diff -NurpP --minimal linux-3.18.5/mm/oom_kill.c linux-3.18.5-vs2.3.7.3/mm/oom_kill.c
---- linux-3.18.5/mm/oom_kill.c 2015-01-17 02:40:24.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/mm/oom_kill.c 2015-01-19 10:58:31.000000000 +0000
++
+ #ifdef CONFIG_MEMCG_KMEM
+ static int memcg_activate_kmem(struct mem_cgroup *memcg,
+ unsigned long nr_pages)
+diff -NurpP --minimal linux-4.4.110/mm/oom_kill.c linux-4.4.110-vs2.3.9/mm/oom_kill.c
+--- linux-4.4.110/mm/oom_kill.c 2016-07-05 04:15:13.000000000 +0000
++++ linux-4.4.110-vs2.3.9/mm/oom_kill.c 2018-01-09 16:56:23.000000000 +0000
@@ -35,6 +35,8 @@
#include <linux/freezer.h>
#include <linux/ftrace.h>
#define CREATE_TRACE_POINTS
#include <trace/events/oom.h>
-@@ -121,11 +123,18 @@ found:
+@@ -131,11 +133,18 @@ static inline bool is_sysrq_oom(struct o
static bool oom_unkillable_task(struct task_struct *p,
- const struct mem_cgroup *memcg, const nodemask_t *nodemask)
+ struct mem_cgroup *memcg, const nodemask_t *nodemask)
{
- if (is_global_init(p))
+ unsigned xid = vx_current_xid();
/* When mem_cgroup_out_of_memory() and p is not member of the group */
if (memcg && !task_in_mem_cgroup(p, memcg))
return true;
-@@ -453,8 +462,8 @@ void oom_kill_process(struct task_struct
- dump_header(p, gfp_mask, order, memcg, nodemask);
+@@ -534,8 +543,8 @@ void oom_kill_process(struct oom_control
+ if (__ratelimit(&oom_rs))
+ dump_header(oc, p, memcg);
- task_lock(p);
-- pr_err("%s: Kill process %d (%s) score %d or sacrifice child\n",
+- pr_err("%s: Kill process %d (%s) score %u or sacrifice child\n",
- message, task_pid_nr(p), p->comm, points);
+ pr_err("%s: Kill process %d:#%u (%s) score %d or sacrifice child\n",
+ message, task_pid_nr(p), p->xid, p->comm, points);
- task_unlock(p);
/*
-@@ -497,8 +506,8 @@ void oom_kill_process(struct task_struct
-
- /* mm cannot safely be dereferenced after task_unlock(victim) */
- mm = victim->mm;
+ * If any of p's children has a different mm and is eligible for kill,
+@@ -585,8 +594,8 @@ void oom_kill_process(struct oom_control
+ */
+ do_send_sig_info(SIGKILL, SEND_SIG_FORCED, victim, true);
+ mark_oom_victim(victim);
- pr_err("Killed process %d (%s) total-vm:%lukB, anon-rss:%lukB, file-rss:%lukB\n",
- task_pid_nr(victim), victim->comm, K(victim->mm->total_vm),
-+ pr_err("Killed process %d:#%u (%s) total-vm:%lukB, anon-rss:%lukB, file-rss:%lukB\n",
++ pr_err("Killed process %d:%u (%s) total-vm:%lukB, anon-rss:%lukB, file-rss:%lukB\n",
+ task_pid_nr(victim), victim->xid, victim->comm, K(victim->mm->total_vm),
K(get_mm_counter(victim->mm, MM_ANONPAGES)),
K(get_mm_counter(victim->mm, MM_FILEPAGES)));
task_unlock(victim);
-@@ -569,6 +578,8 @@ int unregister_oom_notifier(struct notif
+@@ -622,6 +631,8 @@ void oom_kill_process(struct oom_control
}
- EXPORT_SYMBOL_GPL(unregister_oom_notifier);
+ #undef K
+long vs_oom_action(unsigned int);
+
/*
- * Try to acquire the OOM killer lock for the zones in zonelist. Returns zero
- * if a parallel OOM killing is already taking place that includes a zone in
-@@ -677,7 +688,12 @@ void out_of_memory(struct zonelist *zone
+ * Determines whether the kernel must panic because of the panic_on_oom sysctl.
+ */
+@@ -722,7 +733,12 @@ bool out_of_memory(struct oom_control *o
/* Found nothing?!?! Either we hang forever, or we panic. */
- if (!p) {
- dump_header(NULL, gfp_mask, order, NULL, mpol_mask);
+ if (!p && !is_sysrq_oom(oc)) {
+ dump_header(oc, NULL, NULL);
- panic("Out of memory and no killable processes...\n");
+
+ /* avoid panic for guest OOM */
+ else
+ panic("Out of memory and no killable processes...\n");
}
- if (p != (void *)-1UL) {
- oom_kill_process(p, gfp_mask, order, points, totalpages, NULL,
-diff -NurpP --minimal linux-3.18.5/mm/page_alloc.c linux-3.18.5-vs2.3.7.3/mm/page_alloc.c
---- linux-3.18.5/mm/page_alloc.c 2015-01-17 02:40:24.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/mm/page_alloc.c 2015-01-19 10:58:31.000000000 +0000
-@@ -59,6 +59,8 @@
- #include <linux/page-debug-flags.h>
- #include <linux/hugetlb.h>
+ if (p && p != (void *)-1UL) {
+ oom_kill_process(oc, p, points, totalpages, NULL,
+diff -NurpP --minimal linux-4.4.110/mm/page_alloc.c linux-4.4.110-vs2.3.9/mm/page_alloc.c
+--- linux-4.4.110/mm/page_alloc.c 2018-01-09 16:35:14.000000000 +0000
++++ linux-4.4.110-vs2.3.9/mm/page_alloc.c 2018-01-09 16:57:52.000000000 +0000
+@@ -62,6 +62,8 @@
#include <linux/sched/rt.h>
+ #include <linux/page_owner.h>
+ #include <linux/kthread.h>
+#include <linux/vs_base.h>
+#include <linux/vs_limit.h>
#include <asm/sections.h>
#include <asm/tlbflush.h>
-@@ -3096,6 +3098,9 @@ void si_meminfo(struct sysinfo *val)
+@@ -3661,6 +3663,9 @@ void si_meminfo(struct sysinfo *val)
val->totalhigh = totalhigh_pages;
val->freehigh = nr_free_highpages();
val->mem_unit = PAGE_SIZE;
}
EXPORT_SYMBOL(si_meminfo);
-@@ -3121,6 +3126,9 @@ void si_meminfo_node(struct sysinfo *val
+@@ -3686,6 +3691,9 @@ void si_meminfo_node(struct sysinfo *val
val->freehigh = 0;
#endif
val->mem_unit = PAGE_SIZE;
}
#endif
-diff -NurpP --minimal linux-3.18.5/mm/pgtable-generic.c linux-3.18.5-vs2.3.7.3/mm/pgtable-generic.c
---- linux-3.18.5/mm/pgtable-generic.c 2015-01-16 22:19:29.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/mm/pgtable-generic.c 2015-01-19 10:58:31.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/mm/pgtable-generic.c linux-4.4.110-vs2.3.9/mm/pgtable-generic.c
+--- linux-4.4.110/mm/pgtable-generic.c 2018-01-09 16:35:14.000000000 +0000
++++ linux-4.4.110-vs2.3.9/mm/pgtable-generic.c 2018-01-09 16:36:34.000000000 +0000
@@ -6,6 +6,8 @@
* Copyright (C) 2010 Linus Torvalds
*/
#include <linux/pagemap.h>
#include <asm/tlb.h>
#include <asm-generic/pgtable.h>
-diff -NurpP --minimal linux-3.18.5/mm/shmem.c linux-3.18.5-vs2.3.7.3/mm/shmem.c
---- linux-3.18.5/mm/shmem.c 2015-01-17 02:40:24.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/mm/shmem.c 2015-01-19 10:58:31.000000000 +0000
-@@ -2183,7 +2183,7 @@ static int shmem_statfs(struct dentry *d
+diff -NurpP --minimal linux-4.4.110/mm/shmem.c linux-4.4.110-vs2.3.9/mm/shmem.c
+--- linux-4.4.110/mm/shmem.c 2018-01-09 16:35:14.000000000 +0000
++++ linux-4.4.110-vs2.3.9/mm/shmem.c 2018-01-09 16:36:34.000000000 +0000
+@@ -2198,7 +2198,7 @@ static int shmem_statfs(struct dentry *d
{
struct shmem_sb_info *sbinfo = SHMEM_SB(dentry->d_sb);
buf->f_bsize = PAGE_CACHE_SIZE;
buf->f_namelen = NAME_MAX;
if (sbinfo->max_blocks) {
-@@ -3036,7 +3036,7 @@ int shmem_fill_super(struct super_block
+@@ -3044,7 +3044,7 @@ int shmem_fill_super(struct super_block
sb->s_maxbytes = MAX_LFS_FILESIZE;
sb->s_blocksize = PAGE_CACHE_SIZE;
sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
sb->s_op = &shmem_ops;
sb->s_time_gran = 1;
#ifdef CONFIG_TMPFS_XATTR
-diff -NurpP --minimal linux-3.18.5/mm/slab.c linux-3.18.5-vs2.3.7.3/mm/slab.c
---- linux-3.18.5/mm/slab.c 2015-01-17 02:40:24.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/mm/slab.c 2015-01-19 10:58:31.000000000 +0000
-@@ -336,6 +336,8 @@ static void kmem_cache_node_init(struct
+diff -NurpP --minimal linux-4.4.110/mm/slab.c linux-4.4.110-vs2.3.9/mm/slab.c
+--- linux-4.4.110/mm/slab.c 2016-07-05 04:15:13.000000000 +0000
++++ linux-4.4.110-vs2.3.9/mm/slab.c 2018-01-09 16:36:34.000000000 +0000
+@@ -337,6 +337,8 @@ static void kmem_cache_node_init(struct
#define STATS_INC_FREEMISS(x) do { } while (0)
#endif
#if DEBUG
/*
-@@ -3168,6 +3170,7 @@ slab_alloc_node(struct kmem_cache *cache
+@@ -3183,6 +3185,7 @@ slab_alloc_node(struct kmem_cache *cache
/* ___cache_alloc_node can fall back to other nodes */
ptr = ____cache_alloc_node(cachep, flags, nodeid);
out:
local_irq_restore(save_flags);
ptr = cache_alloc_debugcheck_after(cachep, flags, ptr, caller);
kmemleak_alloc_recursive(ptr, cachep->object_size, 1, cachep->flags,
-@@ -3354,6 +3357,7 @@ static inline void __cache_free(struct k
+@@ -3371,6 +3374,7 @@ static inline void __cache_free(struct k
check_irq_off();
kmemleak_free_recursive(objp, cachep->flags);
objp = cache_free_debugcheck(cachep, objp, caller);
kmemcheck_slab_free(cachep, objp, cachep->object_size);
-diff -NurpP --minimal linux-3.18.5/mm/slab_vs.h linux-3.18.5-vs2.3.7.3/mm/slab_vs.h
---- linux-3.18.5/mm/slab_vs.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/mm/slab_vs.h 2015-01-19 10:58:31.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/mm/slab_vs.h linux-4.4.110-vs2.3.9/mm/slab_vs.h
+--- linux-4.4.110/mm/slab_vs.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.110-vs2.3.9/mm/slab_vs.h 2018-01-09 16:36:34.000000000 +0000
@@ -0,0 +1,29 @@
+
+#include <linux/vserver/context.h>
+ atomic_sub(cachep->size, &vxi->cacct.slab[what]);
+}
+
-diff -NurpP --minimal linux-3.18.5/mm/swapfile.c linux-3.18.5-vs2.3.7.3/mm/swapfile.c
---- linux-3.18.5/mm/swapfile.c 2015-01-16 22:19:29.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/mm/swapfile.c 2015-01-19 10:58:31.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/mm/swapfile.c linux-4.4.110-vs2.3.9/mm/swapfile.c
+--- linux-4.4.110/mm/swapfile.c 2018-01-09 16:35:14.000000000 +0000
++++ linux-4.4.110-vs2.3.9/mm/swapfile.c 2018-01-09 16:36:34.000000000 +0000
@@ -39,6 +39,7 @@
#include <asm/tlbflush.h>
#include <linux/swapops.h>
- #include <linux/page_cgroup.h>
+ #include <linux/swap_cgroup.h>
+#include <linux/vs_base.h>
static bool swap_count_continued(struct swap_info_struct *, pgoff_t,
unsigned char);
-@@ -2028,6 +2029,16 @@ static int swap_show(struct seq_file *sw
+@@ -2070,6 +2071,16 @@ static int swap_show(struct seq_file *sw
if (si == SEQ_START_TOKEN) {
seq_puts(swap,"Filename\t\t\t\tType\t\tSize\tUsed\tPriority\n");
+ if (vx_flags(VXF_VIRT_MEM, 0)) {
-+ struct sysinfo si;
++ struct sysinfo si = { 0 };
+
+ vx_vsi_swapinfo(&si);
+ if (si.totalswap < (1 << 10))
return 0;
}
-@@ -2576,6 +2587,8 @@ void si_swapinfo(struct sysinfo *val)
+@@ -2609,6 +2620,8 @@ void si_swapinfo(struct sysinfo *val)
val->freeswap = atomic_long_read(&nr_swap_pages) + nr_to_be_unused;
val->totalswap = total_swap_pages + nr_to_be_unused;
spin_unlock(&swap_lock);
}
/*
-diff -NurpP --minimal linux-3.18.5/net/bridge/br_multicast.c linux-3.18.5-vs2.3.7.3/net/bridge/br_multicast.c
---- linux-3.18.5/net/bridge/br_multicast.c 2015-01-17 02:40:24.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/net/bridge/br_multicast.c 2015-01-19 10:58:31.000000000 +0000
-@@ -448,7 +448,7 @@ static struct sk_buff *br_ip6_multicast_
+diff -NurpP --minimal linux-4.4.110/net/bridge/br_multicast.c linux-4.4.110-vs2.3.9/net/bridge/br_multicast.c
+--- linux-4.4.110/net/bridge/br_multicast.c 2018-01-09 16:35:14.000000000 +0000
++++ linux-4.4.110-vs2.3.9/net/bridge/br_multicast.c 2018-01-09 16:36:34.000000000 +0000
+@@ -462,7 +462,7 @@ static struct sk_buff *br_ip6_multicast_
ip6h->hop_limit = 1;
ipv6_addr_set(&ip6h->daddr, htonl(0xff020000), 0, 0, htonl(1));
if (ipv6_dev_get_saddr(dev_net(br->dev), br->dev, &ip6h->daddr, 0,
- &ip6h->saddr)) {
+ &ip6h->saddr, NULL)) {
kfree_skb(skb);
+ br->has_ipv6_addr = 0;
return NULL;
- }
-diff -NurpP --minimal linux-3.18.5/net/core/dev.c linux-3.18.5-vs2.3.7.3/net/core/dev.c
---- linux-3.18.5/net/core/dev.c 2015-02-05 18:02:46.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/net/core/dev.c 2015-01-28 11:48:02.000000000 +0000
-@@ -122,6 +122,7 @@
+diff -NurpP --minimal linux-4.4.110/net/core/dev.c linux-4.4.110-vs2.3.9/net/core/dev.c
+--- linux-4.4.110/net/core/dev.c 2018-01-09 16:35:15.000000000 +0000
++++ linux-4.4.110-vs2.3.9/net/core/dev.c 2018-01-09 16:36:34.000000000 +0000
+@@ -124,6 +124,7 @@
#include <linux/in.h>
#include <linux/jhash.h>
#include <linux/random.h>
#include <trace/events/napi.h>
#include <trace/events/net.h>
#include <trace/events/skb.h>
-@@ -674,7 +675,8 @@ struct net_device *__dev_get_by_name(str
+@@ -726,7 +727,8 @@ struct net_device *__dev_get_by_name(str
struct hlist_head *head = dev_name_hash(net, name);
hlist_for_each_entry(dev, head, name_hlist)
return dev;
return NULL;
-@@ -699,7 +701,8 @@ struct net_device *dev_get_by_name_rcu(s
+@@ -751,7 +753,8 @@ struct net_device *dev_get_by_name_rcu(s
struct hlist_head *head = dev_name_hash(net, name);
hlist_for_each_entry_rcu(dev, head, name_hlist)
return dev;
return NULL;
-@@ -749,7 +752,8 @@ struct net_device *__dev_get_by_index(st
+@@ -801,7 +804,8 @@ struct net_device *__dev_get_by_index(st
struct hlist_head *head = dev_index_hash(net, ifindex);
hlist_for_each_entry(dev, head, index_hlist)
return dev;
return NULL;
-@@ -767,7 +771,7 @@ EXPORT_SYMBOL(__dev_get_by_index);
+@@ -819,7 +823,7 @@ EXPORT_SYMBOL(__dev_get_by_index);
* about locking. The caller must hold RCU lock.
*/
{
struct net_device *dev;
struct hlist_head *head = dev_index_hash(net, ifindex);
-@@ -778,6 +782,16 @@ struct net_device *dev_get_by_index_rcu(
+@@ -830,6 +834,16 @@ struct net_device *dev_get_by_index_rcu(
return NULL;
}
EXPORT_SYMBOL(dev_get_by_index_rcu);
-@@ -860,7 +874,8 @@ struct net_device *dev_getbyhwaddr_rcu(s
+@@ -912,7 +926,8 @@ struct net_device *dev_getbyhwaddr_rcu(s
for_each_netdev_rcu(net, dev)
if (dev->type == type &&
return dev;
return NULL;
-@@ -872,9 +887,11 @@ struct net_device *__dev_getfirstbyhwtyp
+@@ -924,9 +939,11 @@ struct net_device *__dev_getfirstbyhwtyp
struct net_device *dev;
ASSERT_RTNL();
return NULL;
}
-@@ -886,7 +903,8 @@ struct net_device *dev_getfirstbyhwtype(
+@@ -938,7 +955,8 @@ struct net_device *dev_getfirstbyhwtype(
rcu_read_lock();
for_each_netdev_rcu(net, dev)
dev_hold(dev);
ret = dev;
break;
-@@ -916,7 +934,8 @@ struct net_device *__dev_get_by_flags(st
+@@ -968,7 +986,8 @@ struct net_device *__dev_get_by_flags(st
ret = NULL;
for_each_netdev(net, dev) {
ret = dev;
break;
}
-@@ -994,6 +1013,8 @@ static int __dev_alloc_name(struct net *
+@@ -1046,6 +1065,8 @@ static int __dev_alloc_name(struct net *
continue;
if (i < 0 || i >= max_netdevices)
continue;
/* avoid cases where sscanf is not exact inverse of printf */
snprintf(buf, IFNAMSIZ, name, i);
-diff -NurpP --minimal linux-3.18.5/net/core/net-procfs.c linux-3.18.5-vs2.3.7.3/net/core/net-procfs.c
---- linux-3.18.5/net/core/net-procfs.c 2013-11-25 15:45:09.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/net/core/net-procfs.c 2015-01-19 10:58:31.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/net/core/net-procfs.c linux-4.4.110-vs2.3.9/net/core/net-procfs.c
+--- linux-4.4.110/net/core/net-procfs.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.110-vs2.3.9/net/core/net-procfs.c 2018-01-09 16:36:34.000000000 +0000
@@ -1,6 +1,7 @@
#include <linux/netdevice.h>
#include <linux/proc_fs.h>
seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
"%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
dev->name, stats->rx_bytes, stats->rx_packets,
-diff -NurpP --minimal linux-3.18.5/net/core/rtnetlink.c linux-3.18.5-vs2.3.7.3/net/core/rtnetlink.c
---- linux-3.18.5/net/core/rtnetlink.c 2015-01-17 02:40:24.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/net/core/rtnetlink.c 2015-01-19 10:58:31.000000000 +0000
-@@ -1280,6 +1280,8 @@ static int rtnl_dump_ifinfo(struct sk_bu
- hlist_for_each_entry_rcu(dev, head, index_hlist) {
+diff -NurpP --minimal linux-4.4.110/net/core/rtnetlink.c linux-4.4.110-vs2.3.9/net/core/rtnetlink.c
+--- linux-4.4.110/net/core/rtnetlink.c 2018-01-09 16:35:15.000000000 +0000
++++ linux-4.4.110-vs2.3.9/net/core/rtnetlink.c 2018-01-09 16:36:34.000000000 +0000
+@@ -1456,6 +1456,8 @@ static int rtnl_dump_ifinfo(struct sk_bu
+ hlist_for_each_entry(dev, head, index_hlist) {
if (idx < s_idx)
goto cont;
+ if (!nx_dev_visible(skb->sk->sk_nx_info, dev))
err = rtnl_fill_ifinfo(skb, dev, RTM_NEWLINK,
NETLINK_CB(cb->skb).portid,
cb->nlh->nlmsg_seq, 0,
-@@ -2229,6 +2231,9 @@ void rtmsg_ifinfo(int type, struct net_d
- int err = -ENOBUFS;
- size_t if_info_size;
+@@ -2559,6 +2561,9 @@ void rtmsg_ifinfo(int type, struct net_d
+ {
+ struct sk_buff *skb;
+ if (!nx_dev_visible(current_nx_info(), dev))
+ return;
+
- skb = nlmsg_new((if_info_size = if_nlmsg_size(dev, 0)), flags);
- if (skb == NULL)
- goto errout;
-diff -NurpP --minimal linux-3.18.5/net/core/sock.c linux-3.18.5-vs2.3.7.3/net/core/sock.c
---- linux-3.18.5/net/core/sock.c 2015-01-17 02:40:24.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/net/core/sock.c 2015-01-19 10:58:31.000000000 +0000
-@@ -133,6 +133,10 @@
- #include <net/netprio_cgroup.h>
+ if (dev->reg_state != NETREG_REGISTERED)
+ return;
+
+diff -NurpP --minimal linux-4.4.110/net/core/sock.c linux-4.4.110-vs2.3.9/net/core/sock.c
+--- linux-4.4.110/net/core/sock.c 2018-01-09 16:35:15.000000000 +0000
++++ linux-4.4.110-vs2.3.9/net/core/sock.c 2018-01-09 17:15:58.000000000 +0000
+@@ -134,6 +134,10 @@
+ #include <linux/sock_diag.h>
#include <linux/filter.h>
+#include <linux/vs_socket.h>
#include <trace/events/sock.h>
-@@ -1310,6 +1314,8 @@ static struct sock *sk_prot_alloc(struct
+@@ -1363,6 +1367,8 @@ static struct sock *sk_prot_alloc(struct
goto out_free_sec;
sk_tx_queue_clear(sk);
}
return sk;
-@@ -1406,6 +1412,11 @@ static void __sk_free(struct sock *sk)
- put_cred(sk->sk_peer_cred);
+@@ -1469,6 +1475,11 @@ void sk_destruct(struct sock *sk)
put_pid(sk->sk_peer_pid);
- put_net(sock_net(sk));
+ if (likely(sk->sk_net_refcnt))
+ put_net(sock_net(sk));
+ vx_sock_dec(sk);
+ clr_vx_info(&sk->sk_vx_info);
+ sk->sk_xid = -1;
sk_prot_free(sk->sk_prot_creator, sk);
}
-@@ -1467,6 +1478,8 @@ struct sock *sk_clone_lock(const struct
-
+@@ -1521,6 +1532,8 @@ struct sock *sk_clone_lock(const struct
/* SANITY */
- get_net(sock_net(newsk));
+ if (likely(newsk->sk_net_refcnt))
+ get_net(sock_net(newsk));
+ sock_vx_init(newsk);
+ sock_nx_init(newsk);
sk_node_init(&newsk->sk_node);
sock_lock_init(newsk);
bh_lock_sock(newsk);
-@@ -1524,6 +1537,12 @@ struct sock *sk_clone_lock(const struct
+@@ -1586,6 +1599,12 @@ struct sock *sk_clone_lock(const struct
smp_wmb();
atomic_set(&newsk->sk_refcnt, 2);
/*
* Increment the counter in the same struct proto as the master
* sock (sk_refcnt_debug_inc uses newsk->sk_prot->socks, that
-@@ -2302,6 +2321,12 @@ void sock_init_data(struct socket *sock,
+@@ -2424,6 +2443,12 @@ void sock_init_data(struct socket *sock,
sk->sk_stamp = ktime_set(-1L, 0);
#ifdef CONFIG_NET_RX_BUSY_POLL
sk->sk_napi_id = 0;
sk->sk_ll_usec = sysctl_net_busy_read;
-diff -NurpP --minimal linux-3.18.5/net/ipv4/af_inet.c linux-3.18.5-vs2.3.7.3/net/ipv4/af_inet.c
---- linux-3.18.5/net/ipv4/af_inet.c 2015-01-17 02:40:24.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/net/ipv4/af_inet.c 2015-01-19 10:58:31.000000000 +0000
-@@ -118,6 +118,7 @@
- #ifdef CONFIG_IP_MROUTE
- #include <linux/mroute.h>
- #endif
-+#include <linux/vs_limit.h>
-
-
- /* The inetsw table contains everything that inet_create needs to
-@@ -305,10 +306,13 @@ lookup_protocol:
+diff -NurpP --minimal linux-4.4.110/net/ipv4/af_inet.c linux-4.4.110-vs2.3.9/net/ipv4/af_inet.c
+--- linux-4.4.110/net/ipv4/af_inet.c 2018-01-09 16:35:15.000000000 +0000
++++ linux-4.4.110-vs2.3.9/net/ipv4/af_inet.c 2018-01-09 17:11:11.000000000 +0000
+@@ -308,10 +308,15 @@ lookup_protocol:
}
err = -EPERM;
+ if ((protocol == IPPROTO_ICMP) &&
+ nx_capable(CAP_NET_RAW, NXC_RAW_ICMP))
+ goto override;
++
if (sock->type == SOCK_RAW && !kern &&
!ns_capable(net->user_ns, CAP_NET_RAW))
goto out_rcu_unlock;
--
+
+override:
sock->ops = answer->ops;
answer_prot = answer->prot;
answer_flags = answer->flags;
-@@ -423,6 +427,7 @@ int inet_bind(struct socket *sock, struc
- struct sockaddr_in *addr = (struct sockaddr_in *)uaddr;
+@@ -425,6 +430,7 @@ int inet_bind(struct socket *sock, struc
struct sock *sk = sock->sk;
struct inet_sock *inet = inet_sk(sk);
-+ struct nx_v4_sock_addr nsa;
struct net *net = sock_net(sk);
++ struct nx_v4_sock_addr nsa;
unsigned short snum;
int chk_addr_ret;
-@@ -447,7 +452,11 @@ int inet_bind(struct socket *sock, struc
- goto out;
+ u32 tb_id = RT_TABLE_LOCAL;
+@@ -450,7 +456,11 @@ int inet_bind(struct socket *sock, struc
}
-- chk_addr_ret = inet_addr_type(net, addr->sin_addr.s_addr);
+ tb_id = l3mdev_fib_table_by_index(net, sk->sk_bound_dev_if) ? : tb_id;
+- chk_addr_ret = inet_addr_type_table(net, addr->sin_addr.s_addr, tb_id);
+ err = v4_map_sock_addr(inet, addr, &nsa);
+ if (err)
+ goto out;
+
-+ chk_addr_ret = inet_addr_type(net, nsa.saddr);
++ chk_addr_ret = inet_addr_type_table(net, nsa.saddr, tb_id);
/* Not specified by any standard per-se, however it breaks too
* many applications when removed. It is unfortunate since
-@@ -459,7 +468,7 @@ int inet_bind(struct socket *sock, struc
+@@ -462,7 +472,7 @@ int inet_bind(struct socket *sock, struc
err = -EADDRNOTAVAIL;
if (!net->ipv4.sysctl_ip_nonlocal_bind &&
!(inet->freebind || inet->transparent) &&
chk_addr_ret != RTN_LOCAL &&
chk_addr_ret != RTN_MULTICAST &&
chk_addr_ret != RTN_BROADCAST)
-@@ -485,7 +494,7 @@ int inet_bind(struct socket *sock, struc
+@@ -488,7 +498,7 @@ int inet_bind(struct socket *sock, struc
if (sk->sk_state != TCP_CLOSE || inet->inet_num)
goto out_release_sock;
if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST)
inet->inet_saddr = 0; /* Use device */
-@@ -704,11 +713,13 @@ int inet_getname(struct socket *sock, st
+@@ -708,11 +718,13 @@ int inet_getname(struct socket *sock, st
peer == 1))
return -ENOTCONN;
sin->sin_port = inet->inet_dport;
sin->sin_port = inet->inet_sport;
sin->sin_addr.s_addr = addr;
}
-diff -NurpP --minimal linux-3.18.5/net/ipv4/arp.c linux-3.18.5-vs2.3.7.3/net/ipv4/arp.c
---- linux-3.18.5/net/ipv4/arp.c 2015-01-17 02:40:24.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/net/ipv4/arp.c 2015-01-19 10:58:31.000000000 +0000
-@@ -1349,6 +1349,7 @@ static void arp_format_neigh_entry(struc
+@@ -896,6 +908,7 @@ static int inet_compat_ioctl(struct sock
+ return err;
+ }
+ #endif
++#include <linux/vs_limit.h>
+
+ const struct proto_ops inet_stream_ops = {
+ .family = PF_INET,
+diff -NurpP --minimal linux-4.4.110/net/ipv4/arp.c linux-4.4.110-vs2.3.9/net/ipv4/arp.c
+--- linux-4.4.110/net/ipv4/arp.c 2018-01-09 16:35:15.000000000 +0000
++++ linux-4.4.110-vs2.3.9/net/ipv4/arp.c 2018-01-09 16:36:34.000000000 +0000
+@@ -1290,6 +1290,7 @@ static void arp_format_neigh_entry(struc
struct net_device *dev = n->dev;
int hatype = dev->type;
read_lock(&n->lock);
/* Convert hardware address to XX:XX:XX:XX ... form. */
#if IS_ENABLED(CONFIG_AX25)
-@@ -1380,6 +1381,7 @@ static void arp_format_pneigh_entry(stru
+@@ -1321,6 +1322,7 @@ static void arp_format_pneigh_entry(stru
int hatype = dev ? dev->type : 0;
char tbuf[16];
sprintf(tbuf, "%pI4", n->key);
seq_printf(seq, "%-16s 0x%-10x0x%-10x%s * %s\n",
tbuf, hatype, ATF_PUBL | ATF_PERM, "00:00:00:00:00:00",
-diff -NurpP --minimal linux-3.18.5/net/ipv4/devinet.c linux-3.18.5-vs2.3.7.3/net/ipv4/devinet.c
---- linux-3.18.5/net/ipv4/devinet.c 2015-01-16 22:19:30.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/net/ipv4/devinet.c 2015-01-19 10:58:31.000000000 +0000
-@@ -534,6 +534,7 @@ struct in_device *inetdev_by_index(struc
+diff -NurpP --minimal linux-4.4.110/net/ipv4/devinet.c linux-4.4.110-vs2.3.9/net/ipv4/devinet.c
+--- linux-4.4.110/net/ipv4/devinet.c 2018-01-09 16:35:15.000000000 +0000
++++ linux-4.4.110-vs2.3.9/net/ipv4/devinet.c 2018-01-09 16:36:34.000000000 +0000
+@@ -538,6 +538,7 @@ struct in_device *inetdev_by_index(struc
}
EXPORT_SYMBOL(inetdev_by_index);
/* Called only from RTNL semaphored context. No locks. */
struct in_ifaddr *inet_ifa_byprefix(struct in_device *in_dev, __be32 prefix,
-@@ -958,6 +959,8 @@ int devinet_ioctl(struct net *net, unsig
+@@ -992,6 +993,8 @@ int devinet_ioctl(struct net *net, unsig
in_dev = __in_dev_get_rtnl(dev);
if (in_dev) {
if (tryaddrmatch) {
/* Matthias Andree */
/* compare label and address (4.4BSD style) */
-@@ -966,6 +969,8 @@ int devinet_ioctl(struct net *net, unsig
+@@ -1000,6 +1003,8 @@ int devinet_ioctl(struct net *net, unsig
This is checked above. */
for (ifap = &in_dev->ifa_list; (ifa = *ifap) != NULL;
ifap = &ifa->ifa_next) {
if (!strcmp(ifr.ifr_name, ifa->ifa_label) &&
sin_orig.sin_addr.s_addr ==
ifa->ifa_local) {
-@@ -978,9 +983,12 @@ int devinet_ioctl(struct net *net, unsig
+@@ -1012,9 +1017,12 @@ int devinet_ioctl(struct net *net, unsig
comparing just the label */
if (!ifa) {
for (ifap = &in_dev->ifa_list; (ifa = *ifap) != NULL;
}
}
-@@ -1134,6 +1142,8 @@ static int inet_gifconf(struct net_devic
+@@ -1168,6 +1176,8 @@ static int inet_gifconf(struct net_devic
goto out;
for (ifa = in_dev->ifa_list; ifa; ifa = ifa->ifa_next) {
if (!buf) {
done += sizeof(ifr);
continue;
-@@ -1538,6 +1548,7 @@ static int inet_dump_ifaddr(struct sk_bu
+@@ -1573,6 +1583,7 @@ static int inet_dump_ifaddr(struct sk_bu
struct net_device *dev;
struct in_device *in_dev;
struct in_ifaddr *ifa;
struct hlist_head *head;
s_h = cb->args[0];
-@@ -1561,6 +1572,8 @@ static int inet_dump_ifaddr(struct sk_bu
+@@ -1596,6 +1607,8 @@ static int inet_dump_ifaddr(struct sk_bu
for (ifa = in_dev->ifa_list, ip_idx = 0; ifa;
ifa = ifa->ifa_next, ip_idx++) {
if (ip_idx < s_ip_idx)
continue;
if (inet_fill_ifaddr(skb, ifa,
-diff -NurpP --minimal linux-3.18.5/net/ipv4/fib_trie.c linux-3.18.5-vs2.3.7.3/net/ipv4/fib_trie.c
---- linux-3.18.5/net/ipv4/fib_trie.c 2015-01-16 22:19:30.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/net/ipv4/fib_trie.c 2015-01-19 10:58:31.000000000 +0000
-@@ -2530,6 +2530,7 @@ static int fib_route_seq_show(struct seq
-
- seq_setwidth(seq, 127);
-
-+ /* FIXME: check for network context? */
- if (fi)
- seq_printf(seq,
- "%s\t%08X\t%08X\t%04X\t%d\t%u\t"
-diff -NurpP --minimal linux-3.18.5/net/ipv4/inet_connection_sock.c linux-3.18.5-vs2.3.7.3/net/ipv4/inet_connection_sock.c
---- linux-3.18.5/net/ipv4/inet_connection_sock.c 2014-09-03 13:19:48.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/net/ipv4/inet_connection_sock.c 2015-01-19 10:58:31.000000000 +0000
-@@ -42,6 +42,37 @@ void inet_get_local_port_range(struct ne
+diff -NurpP --minimal linux-4.4.110/net/ipv4/fib_trie.c linux-4.4.110-vs2.3.9/net/ipv4/fib_trie.c
+--- linux-4.4.110/net/ipv4/fib_trie.c 2018-01-09 16:35:15.000000000 +0000
++++ linux-4.4.110-vs2.3.9/net/ipv4/fib_trie.c 2018-01-09 16:36:34.000000000 +0000
+@@ -2591,6 +2591,7 @@ static int fib_route_seq_show(struct seq
+
+ seq_setwidth(seq, 127);
+
++ /* FIXME: check for network context? */
+ if (fi)
+ seq_printf(seq,
+ "%s\t%08X\t%08X\t%04X\t%d\t%u\t"
+diff -NurpP --minimal linux-4.4.110/net/ipv4/inet_connection_sock.c linux-4.4.110-vs2.3.9/net/ipv4/inet_connection_sock.c
+--- linux-4.4.110/net/ipv4/inet_connection_sock.c 2018-01-09 16:35:15.000000000 +0000
++++ linux-4.4.110-vs2.3.9/net/ipv4/inet_connection_sock.c 2018-01-09 16:36:34.000000000 +0000
+@@ -43,6 +43,37 @@ void inet_get_local_port_range(struct ne
}
EXPORT_SYMBOL(inet_get_local_port_range);
int inet_csk_bind_conflict(const struct sock *sk,
const struct inet_bind_bucket *tb, bool relax)
{
-@@ -69,15 +100,13 @@ int inet_csk_bind_conflict(const struct
+@@ -70,15 +101,13 @@ int inet_csk_bind_conflict(const struct
(sk2->sk_state != TCP_TIME_WAIT &&
!uid_eq(uid, sock_i_uid(sk2))))) {
break;
}
}
-diff -NurpP --minimal linux-3.18.5/net/ipv4/inet_diag.c linux-3.18.5-vs2.3.7.3/net/ipv4/inet_diag.c
---- linux-3.18.5/net/ipv4/inet_diag.c 2014-02-01 02:17:51.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/net/ipv4/inet_diag.c 2015-01-19 10:58:31.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/net/ipv4/inet_diag.c linux-4.4.110-vs2.3.9/net/ipv4/inet_diag.c
+--- linux-4.4.110/net/ipv4/inet_diag.c 2016-07-05 04:15:14.000000000 +0000
++++ linux-4.4.110-vs2.3.9/net/ipv4/inet_diag.c 2018-01-09 16:36:34.000000000 +0000
@@ -31,6 +31,8 @@
#include <linux/inet.h>
#include <linux/inet_diag.h>
#include <linux/sock_diag.h>
-@@ -110,8 +112,10 @@ int inet_sk_diag_fill(struct sock *sk, s
- memset(&r->id.idiag_src, 0, sizeof(r->id.idiag_src));
- memset(&r->id.idiag_dst, 0, sizeof(r->id.idiag_dst));
-
-- r->id.idiag_src[0] = inet->inet_rcv_saddr;
-- r->id.idiag_dst[0] = inet->inet_daddr;
-+ r->id.idiag_src[0] = nx_map_sock_lback(sk->sk_nx_info,
-+ inet->inet_rcv_saddr);
-+ r->id.idiag_dst[0] = nx_map_sock_lback(sk->sk_nx_info,
-+ inet->inet_daddr);
-
- if (nla_put_u8(skb, INET_DIAG_SHUTDOWN, sk->sk_shutdown))
- goto errout;
-@@ -254,8 +258,8 @@ static int inet_twsk_diag_fill(struct in
- memset(&r->id.idiag_src, 0, sizeof(r->id.idiag_src));
- memset(&r->id.idiag_dst, 0, sizeof(r->id.idiag_dst));
-
-- r->id.idiag_src[0] = tw->tw_rcv_saddr;
-- r->id.idiag_dst[0] = tw->tw_daddr;
-+ r->id.idiag_src[0] = nx_map_sock_lback(tw->tw_nx_info, tw->tw_rcv_saddr);
-+ r->id.idiag_dst[0] = nx_map_sock_lback(tw->tw_nx_info, tw->tw_daddr);
-
- r->idiag_state = tw->tw_substate;
- r->idiag_timer = 3;
-@@ -298,12 +302,14 @@ int inet_diag_dump_one_icsk(struct inet_
-
- err = -EINVAL;
- if (req->sdiag_family == AF_INET) {
-+ /* TODO: lback */
- sk = inet_lookup(net, hashinfo, req->id.idiag_dst[0],
- req->id.idiag_dport, req->id.idiag_src[0],
- req->id.idiag_sport, req->id.idiag_if);
- }
- #if IS_ENABLED(CONFIG_IPV6)
- else if (req->sdiag_family == AF_INET6) {
-+ /* TODO: lback */
- sk = inet6_lookup(net, hashinfo,
- (struct in6_addr *)req->id.idiag_dst,
- req->id.idiag_dport,
-@@ -501,6 +507,7 @@ int inet_diag_bc_sk(const struct nlattr
- } else
- #endif
- {
-+ /* TODO: lback */
- entry.saddr = &inet->inet_rcv_saddr;
- entry.daddr = &inet->inet_daddr;
- }
-@@ -659,6 +666,7 @@ static int inet_twsk_diag_dump(struct so
- } else
- #endif
- {
-+ /* TODO: lback */
- entry.saddr = &tw->tw_rcv_saddr;
- entry.daddr = &tw->tw_daddr;
- }
-@@ -741,8 +749,8 @@ static int inet_diag_fill_req(struct sk_
- memset(&r->id.idiag_src, 0, sizeof(r->id.idiag_src));
- memset(&r->id.idiag_dst, 0, sizeof(r->id.idiag_dst));
-
-- r->id.idiag_src[0] = ireq->ir_loc_addr;
-- r->id.idiag_dst[0] = ireq->ir_rmt_addr;
-+ r->id.idiag_src[0] = nx_map_sock_lback(sk->sk_nx_info, ireq->ir_loc_addr);
-+ r->id.idiag_dst[0] = nx_map_sock_lback(sk->sk_nx_info, ireq->ir_rmt_addr);
-
- r->idiag_expires = jiffies_to_msecs(tmo);
- r->idiag_rqueue = 0;
-@@ -806,6 +814,7 @@ static int inet_diag_dump_reqs(struct sk
- r->id.idiag_dport)
- continue;
-
-+ /* TODO: lback */
- if (bc) {
- inet_diag_req_addrs(sk, req, &entry);
- entry.dport = ntohs(ireq->ir_rmt_port);
-@@ -862,6 +871,8 @@ void inet_diag_dump_icsk(struct inet_has
+@@ -761,6 +763,8 @@ void inet_diag_dump_icsk(struct inet_has
if (!net_eq(sock_net(sk), net))
continue;
if (num < s_num) {
num++;
continue;
-@@ -934,6 +945,8 @@ skip_listen_ht:
+@@ -822,6 +826,8 @@ skip_listen_ht:
if (!net_eq(sock_net(sk), net))
continue;
if (num < s_num)
goto next_normal;
state = (sk->sk_state == TCP_TIME_WAIT) ?
-diff -NurpP --minimal linux-3.18.5/net/ipv4/inet_hashtables.c linux-3.18.5-vs2.3.7.3/net/ipv4/inet_hashtables.c
---- linux-3.18.5/net/ipv4/inet_hashtables.c 2015-01-17 02:40:24.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/net/ipv4/inet_hashtables.c 2015-01-19 10:58:31.000000000 +0000
-@@ -22,6 +22,7 @@
+diff -NurpP --minimal linux-4.4.110/net/ipv4/inet_hashtables.c linux-4.4.110-vs2.3.9/net/ipv4/inet_hashtables.c
+--- linux-4.4.110/net/ipv4/inet_hashtables.c 2016-07-05 04:15:14.000000000 +0000
++++ linux-4.4.110-vs2.3.9/net/ipv4/inet_hashtables.c 2018-01-09 16:36:34.000000000 +0000
+@@ -23,6 +23,7 @@
#include <net/inet_connection_sock.h>
#include <net/inet_hashtables.h>
#include <net/secure_seq.h>
+#include <net/route.h>
#include <net/ip.h>
- static unsigned int inet_ehashfn(struct net *net, const __be32 laddr,
-@@ -181,6 +182,11 @@ static inline int compute_score(struct s
+ static u32 inet_ehashfn(const struct net *net, const __be32 laddr,
+@@ -183,6 +184,11 @@ static inline int compute_score(struct s
if (rcv_saddr != daddr)
return -1;
score += 4;
}
if (sk->sk_bound_dev_if) {
if (sk->sk_bound_dev_if != dif)
-@@ -198,7 +204,6 @@ static inline int compute_score(struct s
+@@ -202,7 +208,6 @@ static inline int compute_score(struct s
* wildcarded during the search since they can never be otherwise.
*/
struct sock *__inet_lookup_listener(struct net *net,
struct inet_hashinfo *hashinfo,
const __be32 saddr, __be16 sport,
-@@ -234,6 +239,7 @@ begin:
+@@ -238,6 +243,7 @@ begin:
phash = next_pseudo_random32(phash);
}
}
/*
* if the nulls value we got at the end of this lookup is
* not the expected one, we must restart lookup.
-diff -NurpP --minimal linux-3.18.5/net/ipv4/netfilter.c linux-3.18.5-vs2.3.7.3/net/ipv4/netfilter.c
---- linux-3.18.5/net/ipv4/netfilter.c 2014-06-12 13:02:57.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/net/ipv4/netfilter.c 2015-01-19 10:58:31.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/net/ipv4/netfilter.c linux-4.4.110-vs2.3.9/net/ipv4/netfilter.c
+--- linux-4.4.110/net/ipv4/netfilter.c 2016-07-05 04:15:14.000000000 +0000
++++ linux-4.4.110-vs2.3.9/net/ipv4/netfilter.c 2018-01-09 16:36:34.000000000 +0000
@@ -11,7 +11,7 @@
#include <linux/skbuff.h>
#include <linux/gfp.h>
#include <net/xfrm.h>
#include <net/ip.h>
#include <net/netfilter/nf_queue.h>
-diff -NurpP --minimal linux-3.18.5/net/ipv4/raw.c linux-3.18.5-vs2.3.7.3/net/ipv4/raw.c
---- linux-3.18.5/net/ipv4/raw.c 2015-01-16 22:19:30.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/net/ipv4/raw.c 2015-01-19 10:58:31.000000000 +0000
-@@ -117,7 +117,7 @@ static struct sock *__raw_v4_lookup(stru
+diff -NurpP --minimal linux-4.4.110/net/ipv4/raw.c linux-4.4.110-vs2.3.9/net/ipv4/raw.c
+--- linux-4.4.110/net/ipv4/raw.c 2018-01-09 16:35:15.000000000 +0000
++++ linux-4.4.110-vs2.3.9/net/ipv4/raw.c 2018-01-09 17:06:10.000000000 +0000
+@@ -126,7 +126,7 @@ static struct sock *__raw_v4_lookup(stru
if (net_eq(sock_net(sk), net) && inet->inet_num == num &&
!(inet->inet_daddr && inet->inet_daddr != raddr) &&
!(sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif))
goto found; /* gotcha */
}
-@@ -402,6 +402,12 @@ static int raw_send_hdrinc(struct sock *
- icmp_out_count(net, ((struct icmphdr *)
- skb_transport_header(skb))->type);
+@@ -416,6 +416,12 @@ static int raw_send_hdrinc(struct sock *
+ skb_transport_header(skb))->type);
+ }
+ err = -EPERM;
+ if (!nx_check(0, VS_ADMIN) && !capable(CAP_NET_RAW) &&
+ !v4_addr_in_nx_info(sk->sk_nx_info, iph->saddr, NXA_MASK_BIND))
+ goto error_free;
+
- err = NF_HOOK(NFPROTO_IPV4, NF_INET_LOCAL_OUT, skb, NULL,
- rt->dst.dev, dst_output);
- if (err > 0)
-@@ -590,6 +596,16 @@ static int raw_sendmsg(struct kiocb *ioc
+ err = NF_HOOK(NFPROTO_IPV4, NF_INET_LOCAL_OUT,
+ net, sk, skb, NULL, rt->dst.dev,
+ dst_output);
+@@ -626,6 +632,16 @@ static int raw_sendmsg(struct sock *sk,
goto done;
}
+ }
+
security_sk_classify_flow(sk, flowi4_to_flowi(&fl4));
- rt = ip_route_output_flow(sock_net(sk), &fl4, sk);
+ rt = ip_route_output_flow(net, &fl4, sk);
if (IS_ERR(rt)) {
-@@ -668,17 +684,19 @@ static int raw_bind(struct sock *sk, str
+@@ -704,17 +720,19 @@ static int raw_bind(struct sock *sk, str
{
struct inet_sock *inet = inet_sk(sk);
struct sockaddr_in *addr = (struct sockaddr_in *) uaddr;
if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST)
inet->inet_saddr = 0; /* Use device */
sk_dst_reset(sk);
-@@ -727,7 +745,8 @@ static int raw_recvmsg(struct kiocb *ioc
+@@ -763,7 +781,8 @@ static int raw_recvmsg(struct sock *sk,
/* Copy the address. */
if (sin) {
sin->sin_family = AF_INET;
sin->sin_port = 0;
memset(&sin->sin_zero, 0, sizeof(sin->sin_zero));
*addr_len = sizeof(*sin);
-@@ -923,7 +942,8 @@ static struct sock *raw_get_first(struct
+@@ -959,7 +978,8 @@ static struct sock *raw_get_first(struct
for (state->bucket = 0; state->bucket < RAW_HTABLE_SIZE;
++state->bucket) {
sk_for_each(sk, &state->h->ht[state->bucket])
goto found;
}
sk = NULL;
-@@ -939,7 +959,8 @@ static struct sock *raw_get_next(struct
+@@ -975,7 +995,8 @@ static struct sock *raw_get_next(struct
sk = sk_next(sk);
try_again:
;
if (!sk && ++state->bucket < RAW_HTABLE_SIZE) {
sk = sk_head(&state->h->ht[state->bucket]);
-diff -NurpP --minimal linux-3.18.5/net/ipv4/route.c linux-3.18.5-vs2.3.7.3/net/ipv4/route.c
---- linux-3.18.5/net/ipv4/route.c 2015-01-17 02:40:25.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/net/ipv4/route.c 2015-01-19 10:58:31.000000000 +0000
-@@ -2071,7 +2071,7 @@ struct rtable *__ip_route_output_key(str
+diff -NurpP --minimal linux-4.4.110/net/ipv4/route.c linux-4.4.110-vs2.3.9/net/ipv4/route.c
+--- linux-4.4.110/net/ipv4/route.c 2018-01-09 16:35:15.000000000 +0000
++++ linux-4.4.110-vs2.3.9/net/ipv4/route.c 2018-01-09 16:36:34.000000000 +0000
+@@ -2226,7 +2226,7 @@ struct rtable *__ip_route_output_key_has
if (fl4->flowi4_oif) {
- dev_out = dev_get_by_index_rcu(net, fl4->flowi4_oif);
+ dev_out = dev_get_by_index_real_rcu(net, fl4->flowi4_oif);
rth = ERR_PTR(-ENODEV);
- if (dev_out == NULL)
+ if (!dev_out)
goto out;
-diff -NurpP --minimal linux-3.18.5/net/ipv4/tcp.c linux-3.18.5-vs2.3.7.3/net/ipv4/tcp.c
---- linux-3.18.5/net/ipv4/tcp.c 2015-01-17 02:40:25.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/net/ipv4/tcp.c 2015-01-19 10:58:31.000000000 +0000
-@@ -268,6 +268,7 @@
+diff -NurpP --minimal linux-4.4.110/net/ipv4/tcp.c linux-4.4.110-vs2.3.9/net/ipv4/tcp.c
+--- linux-4.4.110/net/ipv4/tcp.c 2018-01-09 16:35:15.000000000 +0000
++++ linux-4.4.110-vs2.3.9/net/ipv4/tcp.c 2018-01-09 16:36:34.000000000 +0000
+@@ -269,6 +269,7 @@
#include <linux/crypto.h>
#include <linux/time.h>
#include <linux/slab.h>
#include <net/icmp.h>
#include <net/inet_common.h>
-diff -NurpP --minimal linux-3.18.5/net/ipv4/tcp_ipv4.c linux-3.18.5-vs2.3.7.3/net/ipv4/tcp_ipv4.c
---- linux-3.18.5/net/ipv4/tcp_ipv4.c 2015-02-05 18:02:46.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/net/ipv4/tcp_ipv4.c 2015-01-19 10:58:31.000000000 +0000
-@@ -1885,6 +1885,12 @@ static void *listening_get_next(struct s
- req = req->dl_next;
- while (1) {
- while (req) {
-+ vxdprintk(VXD_CBIT(net, 6),
-+ "sk,req: %p [#%d] (from %d)", req->sk,
-+ (req->sk)?req->sk->sk_nid:0, nx_current_nid());
-+ if (req->sk &&
-+ !nx_check(req->sk->sk_nid, VS_WATCH_P | VS_IDENT))
-+ continue;
- if (req->rsk_ops->family == st->family) {
- cur = req;
- goto out;
-@@ -1909,6 +1915,10 @@ get_req:
- }
+diff -NurpP --minimal linux-4.4.110/net/ipv4/tcp_ipv4.c linux-4.4.110-vs2.3.9/net/ipv4/tcp_ipv4.c
+--- linux-4.4.110/net/ipv4/tcp_ipv4.c 2018-01-09 16:35:15.000000000 +0000
++++ linux-4.4.110-vs2.3.9/net/ipv4/tcp_ipv4.c 2018-01-09 17:13:45.000000000 +0000
+@@ -1885,6 +1885,10 @@ static void *listening_get_next(struct s
+ sk = sk_nulls_next(sk);
get_sk:
sk_nulls_for_each_from(sk, node) {
+ vxdprintk(VXD_CBIT(net, 6), "sk: %p [#%d] (from %d)",
if (!net_eq(sock_net(sk), net))
continue;
if (sk->sk_family == st->family) {
-@@ -1983,6 +1993,11 @@ static void *established_get_first(struc
+@@ -1949,6 +1953,11 @@ static void *established_get_first(struc
spin_lock_bh(lock);
sk_nulls_for_each(sk, node, &tcp_hashinfo.ehash[st->bucket].chain) {
if (sk->sk_family != st->family ||
!net_eq(sock_net(sk), net)) {
continue;
-@@ -2009,6 +2024,11 @@ static void *established_get_next(struct
+@@ -1975,6 +1984,11 @@ static void *established_get_next(struct
sk = sk_nulls_next(sk);
sk_nulls_for_each_from(sk, node) {
if (sk->sk_family == st->family && net_eq(sock_net(sk), net))
return sk;
}
-@@ -2207,9 +2227,9 @@ static void get_openreq4(const struct so
+@@ -2166,9 +2180,9 @@ static void get_openreq4(const struct re
seq_printf(f, "%4d: %08X:%04X %08X:%04X"
" %02X %08X:%08X %02X:%08lX %08X %5u %8d %u %d %pK",
i,
- ireq->ir_loc_addr,
+ nx_map_sock_lback(current_nx_info(), ireq->ir_loc_addr),
- ntohs(inet_sk(sk)->inet_sport),
+ ireq->ir_num,
- ireq->ir_rmt_addr,
+ nx_map_sock_lback(current_nx_info(), ireq->ir_rmt_addr),
ntohs(ireq->ir_rmt_port),
TCP_SYN_RECV,
0, 0, /* could print option size, but that is af dependent. */
-@@ -2231,8 +2251,8 @@ static void get_tcp4_sock(struct sock *s
+@@ -2191,8 +2205,8 @@ static void get_tcp4_sock(struct sock *s
const struct inet_connection_sock *icsk = inet_csk(sk);
const struct inet_sock *inet = inet_sk(sk);
- struct fastopen_queue *fastopenq = icsk->icsk_accept_queue.fastopenq;
+ const struct fastopen_queue *fastopenq = &icsk->icsk_accept_queue.fastopenq;
- __be32 dest = inet->inet_daddr;
- __be32 src = inet->inet_rcv_saddr;
+ __be32 dest = nx_map_sock_lback(current_nx_info(), inet->inet_daddr);
__u16 destp = ntohs(inet->inet_dport);
__u16 srcp = ntohs(inet->inet_sport);
int rx_queue;
-@@ -2289,8 +2309,8 @@ static void get_timewait4_sock(const str
+@@ -2251,8 +2265,8 @@ static void get_timewait4_sock(const str
+ __be32 dest, src;
__u16 destp, srcp;
- s32 delta = tw->tw_ttd - inet_tw_time_stamp();
- dest = tw->tw_daddr;
- src = tw->tw_rcv_saddr;
destp = ntohs(tw->tw_dport);
srcp = ntohs(tw->tw_sport);
-diff -NurpP --minimal linux-3.18.5/net/ipv4/tcp_minisocks.c linux-3.18.5-vs2.3.7.3/net/ipv4/tcp_minisocks.c
---- linux-3.18.5/net/ipv4/tcp_minisocks.c 2015-01-17 02:40:25.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/net/ipv4/tcp_minisocks.c 2015-01-19 10:58:31.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/net/ipv4/tcp_minisocks.c linux-4.4.110-vs2.3.9/net/ipv4/tcp_minisocks.c
+--- linux-4.4.110/net/ipv4/tcp_minisocks.c 2018-01-09 16:35:15.000000000 +0000
++++ linux-4.4.110-vs2.3.9/net/ipv4/tcp_minisocks.c 2018-01-09 16:36:34.000000000 +0000
@@ -23,6 +23,9 @@
#include <linux/slab.h>
#include <linux/sysctl.h>
#include <net/tcp.h>
#include <net/inet_common.h>
#include <net/xfrm.h>
-@@ -290,6 +293,11 @@ void tcp_time_wait(struct sock *sk, int
- tcptw->tw_ts_recent_stamp = tp->rx_opt.ts_recent_stamp;
+@@ -291,6 +294,11 @@ void tcp_time_wait(struct sock *sk, int
tcptw->tw_ts_offset = tp->tsoffset;
+ tcptw->tw_last_oow_ack_time = 0;
+ tw->tw_xid = sk->sk_xid;
+ tw->tw_vx_info = NULL;
#if IS_ENABLED(CONFIG_IPV6)
if (tw->tw_family == PF_INET6) {
struct ipv6_pinfo *np = inet6_sk(sk);
-diff -NurpP --minimal linux-3.18.5/net/ipv4/udp.c linux-3.18.5-vs2.3.7.3/net/ipv4/udp.c
---- linux-3.18.5/net/ipv4/udp.c 2015-01-17 02:40:25.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/net/ipv4/udp.c 2015-01-19 10:58:31.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/net/ipv4/udp.c linux-4.4.110-vs2.3.9/net/ipv4/udp.c
+--- linux-4.4.110/net/ipv4/udp.c 2018-01-09 16:35:15.000000000 +0000
++++ linux-4.4.110-vs2.3.9/net/ipv4/udp.c 2018-01-09 16:36:34.000000000 +0000
@@ -309,14 +309,7 @@ fail:
}
EXPORT_SYMBOL(udp_lib_get_port);
-}
+extern int ipv4_rcv_saddr_equal(const struct sock *, const struct sock *);
- static unsigned int udp4_portaddr_hash(struct net *net, __be32 saddr,
- unsigned int port)
-@@ -351,6 +344,11 @@ static inline int compute_score(struct s
- if (inet->inet_rcv_saddr != daddr)
- return -1;
- score += 4;
+ static u32 udp4_portaddr_hash(const struct net *net, __be32 saddr,
+ unsigned int port)
+@@ -355,6 +348,11 @@ static inline int compute_score(struct s
+ if (inet->inet_rcv_saddr != daddr)
+ return -1;
+ score += 4;
+ } else {
+ /* block non nx_info ips */
+ if (!v4_addr_in_nx_info(sk->sk_nx_info,
+ daddr, NXA_MASK_BIND))
+ return -1;
- }
- if (inet->inet_daddr) {
- if (inet->inet_daddr != saddr)
-@@ -473,6 +471,7 @@ begin:
+ }
+
+ if (inet->inet_daddr) {
+@@ -489,6 +487,7 @@ begin:
return result;
}
/* UDP is nearly always wildcards out the wazoo, it makes no sense to try
* harder than this. -DaveM
*/
-@@ -519,6 +518,11 @@ begin:
+@@ -535,6 +534,11 @@ begin:
sk_nulls_for_each_rcu(sk, node, &hslot->head) {
score = compute_score(sk, net, saddr, hnum, sport,
daddr, dport, dif);
if (score > badness) {
result = sk;
badness = score;
-@@ -543,6 +547,7 @@ begin:
+@@ -559,6 +563,7 @@ begin:
if (get_nulls_value(node) != slot)
goto begin;
if (result) {
if (unlikely(!atomic_inc_not_zero_hint(&result->sk_refcnt, 2)))
result = NULL;
-@@ -552,6 +557,7 @@ begin:
+@@ -568,6 +573,7 @@ begin:
goto begin;
}
}
rcu_read_unlock();
return result;
}
-@@ -586,7 +592,7 @@ static inline bool __udp_is_mcast_sock(s
+@@ -602,7 +608,7 @@ static inline bool __udp_is_mcast_sock(s
udp_sk(sk)->udp_port_hash != hnum ||
(inet->inet_daddr && inet->inet_daddr != rmt_addr) ||
(inet->inet_dport != rmt_port && inet->inet_dport) ||
ipv6_only_sock(sk) ||
(sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif))
return false;
-@@ -1008,6 +1014,16 @@ int udp_sendmsg(struct kiocb *iocb, stru
- inet_sk_flowi_flags(sk),
- faddr, saddr, dport, inet->inet_sport);
+@@ -1033,6 +1039,16 @@ int udp_sendmsg(struct sock *sk, struct
+ goto out;
+ }
+ if (sk->sk_nx_info) {
+ rt = ip_v4_find_src(net, sk->sk_nx_info, fl4);
security_sk_classify_flow(sk, flowi4_to_flowi(fl4));
rt = ip_route_output_flow(net, fl4, sk);
if (IS_ERR(rt)) {
-@@ -1312,7 +1328,8 @@ try_again:
+@@ -1337,7 +1353,8 @@ try_again:
if (sin) {
sin->sin_family = AF_INET;
sin->sin_port = udp_hdr(skb)->source;
memset(sin->sin_zero, 0, sizeof(sin->sin_zero));
*addr_len = sizeof(*sin);
}
-@@ -2271,6 +2288,8 @@ static struct sock *udp_get_first(struct
+@@ -2319,6 +2336,8 @@ static struct sock *udp_get_first(struct
sk_nulls_for_each(sk, node, &hslot->head) {
if (!net_eq(sock_net(sk), net))
continue;
if (sk->sk_family == state->family)
goto found;
}
-@@ -2288,7 +2307,9 @@ static struct sock *udp_get_next(struct
+@@ -2336,7 +2355,9 @@ static struct sock *udp_get_next(struct
do {
sk = sk_nulls_next(sk);
if (!sk) {
if (state->bucket <= state->udp_table->mask)
-@@ -2384,8 +2405,8 @@ static void udp4_format_sock(struct sock
+@@ -2432,8 +2453,8 @@ static void udp4_format_sock(struct sock
int bucket)
{
struct inet_sock *inet = inet_sk(sp);
__u16 destp = ntohs(inet->inet_dport);
__u16 srcp = ntohs(inet->inet_sport);
-diff -NurpP --minimal linux-3.18.5/net/ipv6/Kconfig linux-3.18.5-vs2.3.7.3/net/ipv6/Kconfig
---- linux-3.18.5/net/ipv6/Kconfig 2014-06-12 11:35:11.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/net/ipv6/Kconfig 2015-01-19 10:58:31.000000000 +0000
-@@ -4,8 +4,8 @@
-
- # IPv6 as module will cause a CRASH if you try to unload it
- menuconfig IPV6
-- tristate "The IPv6 protocol"
-- default m
-+ bool "The IPv6 protocol"
-+ default n
- ---help---
- This is complemental support for the IP version 6.
- You will still be able to do traditional IPv4 networking as well.
-diff -NurpP --minimal linux-3.18.5/net/ipv6/addrconf.c linux-3.18.5-vs2.3.7.3/net/ipv6/addrconf.c
---- linux-3.18.5/net/ipv6/addrconf.c 2015-01-17 02:40:25.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/net/ipv6/addrconf.c 2015-01-19 10:58:31.000000000 +0000
-@@ -90,6 +90,8 @@
+diff -NurpP --minimal linux-4.4.110/net/ipv6/addrconf.c linux-4.4.110-vs2.3.9/net/ipv6/addrconf.c
+--- linux-4.4.110/net/ipv6/addrconf.c 2018-01-09 16:35:15.000000000 +0000
++++ linux-4.4.110-vs2.3.9/net/ipv6/addrconf.c 2018-01-09 23:41:55.000000000 +0000
+@@ -92,6 +92,8 @@
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
#include <linux/export.h>
/* Set to 3 to get tracing... */
#define ACONF_DEBUG 2
-@@ -1319,7 +1321,7 @@ out:
+@@ -1442,7 +1444,8 @@ static int __ipv6_dev_get_saddr(struct n
+ struct ipv6_saddr_dst *dst,
+ struct inet6_dev *idev,
+ struct ipv6_saddr_score *scores,
+- int hiscore_idx)
++ int hiscore_idx,
++ struct nx_info *nxi)
+ {
+ struct ipv6_saddr_score *score = &scores[1 - hiscore_idx], *hiscore = &scores[hiscore_idx];
+
+@@ -1472,6 +1475,8 @@ static int __ipv6_dev_get_saddr(struct n
+ idev->dev->name);
+ continue;
+ }
++ if (!v6_addr_in_nx_info(nxi, &score->ifa->addr, -1))
++ continue;
+
+ score->rule = -1;
+ bitmap_zero(score->scorebits, IPV6_SADDR_RULE_MAX);
+@@ -1519,7 +1524,7 @@ out:
int ipv6_dev_get_saddr(struct net *net, const struct net_device *dst_dev,
const struct in6_addr *daddr, unsigned int prefs,
- struct in6_addr *saddr)
+ struct in6_addr *saddr, struct nx_info *nxi)
{
- struct ipv6_saddr_score scores[2],
- *score = &scores[0], *hiscore = &scores[1];
-@@ -1391,6 +1393,8 @@ int ipv6_dev_get_saddr(struct net *net,
- dev->name);
+ struct ipv6_saddr_score scores[2], *hiscore;
+ struct ipv6_saddr_dst dst;
+@@ -1568,13 +1573,15 @@ int ipv6_dev_get_saddr(struct net *net,
+
+ if (use_oif_addr) {
+ if (idev)
+- hiscore_idx = __ipv6_dev_get_saddr(net, &dst, idev, scores, hiscore_idx);
++ hiscore_idx = __ipv6_dev_get_saddr(net, &dst,
++ idev, scores, hiscore_idx, nxi);
+ } else {
+ for_each_netdev_rcu(net, dev) {
+ idev = __in6_dev_get(dev);
+ if (!idev)
continue;
- }
-+ if (!v6_addr_in_nx_info(nxi, &score->ifa->addr, -1))
-+ continue;
-
- score->rule = -1;
- bitmap_zero(score->scorebits, IPV6_SADDR_RULE_MAX);
-@@ -3503,7 +3507,10 @@ static void if6_seq_stop(struct seq_file
+- hiscore_idx = __ipv6_dev_get_saddr(net, &dst, idev, scores, hiscore_idx);
++ hiscore_idx = __ipv6_dev_get_saddr(net, &dst,
++ idev, scores, hiscore_idx, nxi);
+ }
+ }
+ rcu_read_unlock();
+@@ -3846,7 +3853,10 @@ static void if6_seq_stop(struct seq_file
static int if6_seq_show(struct seq_file *seq, void *v)
{
struct inet6_ifaddr *ifp = (struct inet6_ifaddr *)v;
&ifp->addr,
ifp->idev->dev->ifindex,
ifp->prefix_len,
-@@ -4084,6 +4091,11 @@ static int in6_dump_addrs(struct inet6_d
+@@ -4430,6 +4440,11 @@ static int in6_dump_addrs(struct inet6_d
struct ifacaddr6 *ifaca;
int err = 1;
int ip_idx = *p_ip_idx;
read_lock_bh(&idev->lock);
switch (type) {
-@@ -4094,6 +4106,8 @@ static int in6_dump_addrs(struct inet6_d
+@@ -4440,6 +4455,8 @@ static int in6_dump_addrs(struct inet6_d
list_for_each_entry(ifa, &idev->addr_list, if_list) {
if (++ip_idx < s_ip_idx)
continue;
-+ if (!v6_addr_in_nx_info(nxi, &ifa->addr, -1))
-+ continue;
++ if (!v6_addr_in_nx_info(nxi, &ifa->addr, -1))
++ continue;
err = inet6_fill_ifaddr(skb, ifa,
NETLINK_CB(cb->skb).portid,
cb->nlh->nlmsg_seq,
-@@ -4111,6 +4125,8 @@ static int in6_dump_addrs(struct inet6_d
+@@ -4457,6 +4474,8 @@ static int in6_dump_addrs(struct inet6_d
ifmca = ifmca->next, ip_idx++) {
if (ip_idx < s_ip_idx)
continue;
-+ if (!v6_addr_in_nx_info(nxi, &ifmca->mca_addr, -1))
-+ continue;
++ if (!v6_addr_in_nx_info(nxi, &ifmca->mca_addr, -1))
++ continue;
err = inet6_fill_ifmcaddr(skb, ifmca,
NETLINK_CB(cb->skb).portid,
cb->nlh->nlmsg_seq,
-@@ -4126,6 +4142,8 @@ static int in6_dump_addrs(struct inet6_d
+@@ -4472,6 +4491,8 @@ static int in6_dump_addrs(struct inet6_d
ifaca = ifaca->aca_next, ip_idx++) {
if (ip_idx < s_ip_idx)
continue;
-+ if (!v6_addr_in_nx_info(nxi, &ifaca->aca_addr, -1))
-+ continue;
++ if (!v6_addr_in_nx_info(nxi, &ifaca->aca_addr, -1))
++ continue;
err = inet6_fill_ifacaddr(skb, ifaca,
NETLINK_CB(cb->skb).portid,
cb->nlh->nlmsg_seq,
-@@ -4154,6 +4172,10 @@ static int inet6_dump_addr(struct sk_buf
+@@ -4500,6 +4521,10 @@ static int inet6_dump_addr(struct sk_buf
struct inet6_dev *idev;
struct hlist_head *head;
s_h = cb->args[0];
s_idx = idx = cb->args[1];
s_ip_idx = ip_idx = cb->args[2];
-@@ -4617,6 +4639,7 @@ static int inet6_dump_ifinfo(struct sk_b
+@@ -5008,6 +5033,7 @@ static int inet6_dump_ifinfo(struct sk_b
struct net_device *dev;
struct inet6_dev *idev;
struct hlist_head *head;
s_h = cb->args[0];
s_idx = cb->args[1];
-@@ -4628,6 +4651,8 @@ static int inet6_dump_ifinfo(struct sk_b
+@@ -5019,6 +5045,8 @@ static int inet6_dump_ifinfo(struct sk_b
hlist_for_each_entry_rcu(dev, head, index_hlist) {
if (idx < s_idx)
goto cont;
idev = __in6_dev_get(dev);
if (!idev)
goto cont;
-diff -NurpP --minimal linux-3.18.5/net/ipv6/af_inet6.c linux-3.18.5-vs2.3.7.3/net/ipv6/af_inet6.c
---- linux-3.18.5/net/ipv6/af_inet6.c 2015-01-17 02:40:25.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/net/ipv6/af_inet6.c 2015-01-19 10:58:31.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/net/ipv6/af_inet6.c linux-4.4.110-vs2.3.9/net/ipv6/af_inet6.c
+--- linux-4.4.110/net/ipv6/af_inet6.c 2018-01-09 16:35:15.000000000 +0000
++++ linux-4.4.110-vs2.3.9/net/ipv6/af_inet6.c 2018-01-09 16:36:34.000000000 +0000
@@ -43,6 +43,8 @@
#include <linux/netdevice.h>
#include <linux/icmpv6.h>
#include <net/ip.h>
#include <net/ipv6.h>
-@@ -155,10 +157,13 @@ lookup_protocol:
+@@ -158,10 +160,13 @@ lookup_protocol:
}
err = -EPERM;
sock->ops = answer->ops;
answer_prot = answer->prot;
answer_flags = answer->flags;
-@@ -256,6 +261,7 @@ int inet6_bind(struct socket *sock, stru
+@@ -259,6 +264,7 @@ int inet6_bind(struct socket *sock, stru
struct inet_sock *inet = inet_sk(sk);
struct ipv6_pinfo *np = inet6_sk(sk);
struct net *net = sock_net(sk);
__be32 v4addr = 0;
unsigned short snum;
int addr_type = 0;
-@@ -271,6 +277,10 @@ int inet6_bind(struct socket *sock, stru
+@@ -274,6 +280,10 @@ int inet6_bind(struct socket *sock, stru
if (addr->sin6_family != AF_INET6)
return -EAFNOSUPPORT;
addr_type = ipv6_addr_type(&addr->sin6_addr);
if ((addr_type & IPV6_ADDR_MULTICAST) && sock->type == SOCK_STREAM)
return -EINVAL;
-@@ -311,6 +321,10 @@ int inet6_bind(struct socket *sock, stru
+@@ -314,6 +324,10 @@ int inet6_bind(struct socket *sock, stru
err = -EADDRNOTAVAIL;
goto out;
}
} else {
if (addr_type != IPV6_ADDR_ANY) {
struct net_device *dev = NULL;
-@@ -337,6 +351,11 @@ int inet6_bind(struct socket *sock, stru
+@@ -340,6 +354,11 @@ int inet6_bind(struct socket *sock, stru
}
}
/* ipv4 addr of the socket is invalid. Only the
* unspecified and mapped address have a v4 equivalent.
*/
-@@ -353,6 +372,9 @@ int inet6_bind(struct socket *sock, stru
+@@ -357,6 +376,9 @@ int inet6_bind(struct socket *sock, stru
}
}
inet->inet_rcv_saddr = v4addr;
inet->inet_saddr = v4addr;
-@@ -454,9 +476,11 @@ int inet6_getname(struct socket *sock, s
+@@ -461,9 +483,11 @@ int inet6_getname(struct socket *sock, s
return -ENOTCONN;
sin->sin6_port = inet->inet_dport;
sin->sin6_addr = sk->sk_v6_daddr;
if (ipv6_addr_any(&sk->sk_v6_rcv_saddr))
sin->sin6_addr = np->saddr;
else
-diff -NurpP --minimal linux-3.18.5/net/ipv6/datagram.c linux-3.18.5-vs2.3.7.3/net/ipv6/datagram.c
---- linux-3.18.5/net/ipv6/datagram.c 2015-01-17 02:40:25.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/net/ipv6/datagram.c 2015-01-19 10:58:31.000000000 +0000
-@@ -675,7 +675,7 @@ int ip6_datagram_send_ctl(struct net *ne
+diff -NurpP --minimal linux-4.4.110/net/ipv6/datagram.c linux-4.4.110-vs2.3.9/net/ipv6/datagram.c
+--- linux-4.4.110/net/ipv6/datagram.c 2018-01-09 16:35:15.000000000 +0000
++++ linux-4.4.110-vs2.3.9/net/ipv6/datagram.c 2018-01-09 16:36:34.000000000 +0000
+@@ -733,7 +733,7 @@ int ip6_datagram_send_ctl(struct net *ne
rcu_read_lock();
if (fl6->flowi6_oif) {
if (!dev) {
rcu_read_unlock();
return -ENODEV;
-diff -NurpP --minimal linux-3.18.5/net/ipv6/fib6_rules.c linux-3.18.5-vs2.3.7.3/net/ipv6/fib6_rules.c
---- linux-3.18.5/net/ipv6/fib6_rules.c 2014-06-12 11:35:11.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/net/ipv6/fib6_rules.c 2015-01-19 10:58:31.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/net/ipv6/fib6_rules.c linux-4.4.110-vs2.3.9/net/ipv6/fib6_rules.c
+--- linux-4.4.110/net/ipv6/fib6_rules.c 2018-01-09 16:35:15.000000000 +0000
++++ linux-4.4.110-vs2.3.9/net/ipv6/fib6_rules.c 2018-01-09 16:36:34.000000000 +0000
@@ -97,7 +97,7 @@ static int fib6_rule_action(struct fib_r
ip6_dst_idev(&rt->dst)->dev,
&flp6->daddr,
goto again;
if (!ipv6_prefix_equal(&saddr, &r->src.addr,
r->src.plen))
-diff -NurpP --minimal linux-3.18.5/net/ipv6/inet6_hashtables.c linux-3.18.5-vs2.3.7.3/net/ipv6/inet6_hashtables.c
---- linux-3.18.5/net/ipv6/inet6_hashtables.c 2015-01-17 02:40:25.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/net/ipv6/inet6_hashtables.c 2015-01-19 10:58:31.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/net/ipv6/inet6_hashtables.c linux-4.4.110-vs2.3.9/net/ipv6/inet6_hashtables.c
+--- linux-4.4.110/net/ipv6/inet6_hashtables.c 2016-07-05 04:15:14.000000000 +0000
++++ linux-4.4.110-vs2.3.9/net/ipv6/inet6_hashtables.c 2018-01-09 16:36:34.000000000 +0000
@@ -16,6 +16,7 @@
#include <linux/module.h>
#include <net/inet_connection_sock.h>
#include <net/inet_hashtables.h>
-@@ -116,7 +117,6 @@ struct sock *__inet6_lookup_established(
+@@ -66,7 +67,6 @@ struct sock *__inet6_lookup_established(
unsigned int slot = hash & hashinfo->ehash_mask;
struct inet_ehash_bucket *head = &hashinfo->ehash[slot];
rcu_read_lock();
begin:
sk_nulls_for_each_rcu(sk, node, &head->chain) {
-@@ -158,6 +158,9 @@ static inline int compute_score(struct s
+@@ -108,6 +108,9 @@ static inline int compute_score(struct s
if (!ipv6_addr_equal(&sk->sk_v6_rcv_saddr, daddr))
return -1;
score++;
}
if (sk->sk_bound_dev_if) {
if (sk->sk_bound_dev_if != dif)
-diff -NurpP --minimal linux-3.18.5/net/ipv6/ip6_fib.c linux-3.18.5-vs2.3.7.3/net/ipv6/ip6_fib.c
---- linux-3.18.5/net/ipv6/ip6_fib.c 2015-01-17 02:40:25.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/net/ipv6/ip6_fib.c 2015-01-19 10:58:31.000000000 +0000
-@@ -1845,6 +1845,7 @@ static int ipv6_route_seq_show(struct se
+diff -NurpP --minimal linux-4.4.110/net/ipv6/ip6_fib.c linux-4.4.110-vs2.3.9/net/ipv6/ip6_fib.c
+--- linux-4.4.110/net/ipv6/ip6_fib.c 2018-01-09 16:35:15.000000000 +0000
++++ linux-4.4.110-vs2.3.9/net/ipv6/ip6_fib.c 2018-01-09 16:36:34.000000000 +0000
+@@ -1968,6 +1968,7 @@ static int ipv6_route_seq_show(struct se
struct rt6_info *rt = v;
struct ipv6_route_iter *iter = seq->private;
seq_printf(seq, "%pi6 %02x ", &rt->rt6i_dst.addr, rt->rt6i_dst.plen);
#ifdef CONFIG_IPV6_SUBTREES
-diff -NurpP --minimal linux-3.18.5/net/ipv6/ip6_output.c linux-3.18.5-vs2.3.7.3/net/ipv6/ip6_output.c
---- linux-3.18.5/net/ipv6/ip6_output.c 2015-01-17 02:40:25.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/net/ipv6/ip6_output.c 2015-01-19 10:58:31.000000000 +0000
-@@ -907,7 +907,8 @@ static int ip6_dst_lookup_tail(struct so
- struct rt6_info *rt = (struct rt6_info *) *dst;
+diff -NurpP --minimal linux-4.4.110/net/ipv6/ip6_output.c linux-4.4.110-vs2.3.9/net/ipv6/ip6_output.c
+--- linux-4.4.110/net/ipv6/ip6_output.c 2018-01-09 16:35:15.000000000 +0000
++++ linux-4.4.110-vs2.3.9/net/ipv6/ip6_output.c 2018-01-09 16:36:34.000000000 +0000
+@@ -941,7 +941,8 @@ static int ip6_dst_lookup_tail(struct ne
+ rt = (*dst)->error ? NULL : (struct rt6_info *)*dst;
err = ip6_route_get_saddr(net, rt, &fl6->daddr,
sk ? inet6_sk(sk)->srcprefs : 0,
- &fl6->saddr);
+ sk ? sk->sk_nx_info : NULL);
if (err)
goto out_err_release;
- }
-diff -NurpP --minimal linux-3.18.5/net/ipv6/ndisc.c linux-3.18.5-vs2.3.7.3/net/ipv6/ndisc.c
---- linux-3.18.5/net/ipv6/ndisc.c 2015-01-17 02:40:25.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/net/ipv6/ndisc.c 2015-01-19 10:58:31.000000000 +0000
-@@ -487,7 +487,7 @@ void ndisc_send_na(struct net_device *de
+
+diff -NurpP --minimal linux-4.4.110/net/ipv6/ndisc.c linux-4.4.110-vs2.3.9/net/ipv6/ndisc.c
+--- linux-4.4.110/net/ipv6/ndisc.c 2016-07-05 04:15:14.000000000 +0000
++++ linux-4.4.110-vs2.3.9/net/ipv6/ndisc.c 2018-01-09 16:36:34.000000000 +0000
+@@ -501,7 +501,7 @@ void ndisc_send_na(struct net_device *de
} else {
if (ipv6_dev_get_saddr(dev_net(dev), dev, daddr,
inet6_sk(dev_net(dev)->ipv6.ndisc_sk)->srcprefs,
return;
src_addr = &tmpaddr;
}
-diff -NurpP --minimal linux-3.18.5/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c linux-3.18.5-vs2.3.7.3/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c
---- linux-3.18.5/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c 2015-01-17 02:40:25.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c 2015-01-19 23:51:41.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c linux-4.4.110-vs2.3.9/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c
+--- linux-4.4.110/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c 2016-07-05 04:15:14.000000000 +0000
++++ linux-4.4.110-vs2.3.9/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c 2018-01-09 17:04:44.000000000 +0000
@@ -35,7 +35,7 @@ nf_nat_masquerade_ipv6(struct sk_buff *s
ctinfo == IP_CT_RELATED_REPLY));
- if (ipv6_dev_get_saddr(dev_net(out), out,
+ if (ipv6_dev_get_saddr(nf_ct_net(ct), out,
- &ipv6_hdr(skb)->daddr, 0, &src) < 0)
+ &ipv6_hdr(skb)->daddr, 0, &src, NULL) < 0)
return NF_DROP;
nfct_nat(ct)->masq_index = out->ifindex;
-diff -NurpP --minimal linux-3.18.5/net/ipv6/raw.c linux-3.18.5-vs2.3.7.3/net/ipv6/raw.c
---- linux-3.18.5/net/ipv6/raw.c 2015-01-17 02:40:25.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/net/ipv6/raw.c 2015-01-19 10:58:31.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/net/ipv6/raw.c linux-4.4.110-vs2.3.9/net/ipv6/raw.c
+--- linux-4.4.110/net/ipv6/raw.c 2018-01-09 16:35:16.000000000 +0000
++++ linux-4.4.110-vs2.3.9/net/ipv6/raw.c 2018-01-09 16:36:34.000000000 +0000
@@ -30,6 +30,7 @@
#include <linux/icmpv6.h>
#include <linux/netfilter.h>
+#include <linux/vs_inet6.h>
#include <linux/skbuff.h>
#include <linux/compat.h>
- #include <asm/uaccess.h>
+ #include <linux/uaccess.h>
@@ -291,6 +292,13 @@ static int rawv6_bind(struct sock *sk, s
goto out_unlock;
}
/* ipv4 addr of the socket is invalid. Only the
* unspecified and mapped address have a v4 equivalent.
*/
-diff -NurpP --minimal linux-3.18.5/net/ipv6/route.c linux-3.18.5-vs2.3.7.3/net/ipv6/route.c
---- linux-3.18.5/net/ipv6/route.c 2015-01-17 02:40:25.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/net/ipv6/route.c 2015-01-19 11:21:40.000000000 +0000
-@@ -58,6 +58,7 @@
- #include <net/netevent.h>
- #include <net/netlink.h>
- #include <net/nexthop.h>
+diff -NurpP --minimal linux-4.4.110/net/ipv6/route.c linux-4.4.110-vs2.3.9/net/ipv6/route.c
+--- linux-4.4.110/net/ipv6/route.c 2018-01-09 16:35:16.000000000 +0000
++++ linux-4.4.110-vs2.3.9/net/ipv6/route.c 2018-01-09 17:03:24.000000000 +0000
+@@ -62,6 +62,7 @@
+ #include <net/lwtunnel.h>
+ #include <net/ip_tunnels.h>
+ #include <net/l3mdev.h>
+#include <linux/vs_inet6.h>
#include <asm/uaccess.h>
-@@ -2183,15 +2184,17 @@ int ip6_route_get_saddr(struct net *net,
+@@ -2545,16 +2546,18 @@ int ip6_route_get_saddr(struct net *net,
struct rt6_info *rt,
const struct in6_addr *daddr,
unsigned int prefs,
+ struct in6_addr *saddr,
+ struct nx_info *nxi)
{
- struct inet6_dev *idev = ip6_dst_idev((struct dst_entry *)rt);
+ struct inet6_dev *idev =
+ rt ? ip6_dst_idev((struct dst_entry *)rt) : NULL;
int err = 0;
-- if (rt->rt6i_prefsrc.plen)
-+ if (rt->rt6i_prefsrc.plen && (!nxi ||
+- if (rt && rt->rt6i_prefsrc.plen)
++ if (rt && rt->rt6i_prefsrc.plen && (!nxi ||
+ v6_addr_in_nx_info(nxi, &rt->rt6i_prefsrc.addr, NXA_TYPE_ADDR)))
*saddr = rt->rt6i_prefsrc.addr;
else
return err;
}
-@@ -2632,7 +2635,8 @@ static int rt6_fill_node(struct net *net
+@@ -3168,7 +3171,8 @@ static int rt6_fill_node(struct net *net
goto nla_put_failure;
} else if (dst) {
struct in6_addr saddr_buf;
- if (ip6_route_get_saddr(net, rt, dst, 0, &saddr_buf) == 0 &&
+ if (ip6_route_get_saddr(net, rt, dst, 0, &saddr_buf,
+ (skb->sk ? skb->sk->sk_nx_info : NULL)) == 0 &&
- nla_put(skb, RTA_PREFSRC, 16, &saddr_buf))
+ nla_put_in6_addr(skb, RTA_PREFSRC, &saddr_buf))
goto nla_put_failure;
}
-diff -NurpP --minimal linux-3.18.5/net/ipv6/tcp_ipv6.c linux-3.18.5-vs2.3.7.3/net/ipv6/tcp_ipv6.c
---- linux-3.18.5/net/ipv6/tcp_ipv6.c 2015-02-05 18:02:46.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/net/ipv6/tcp_ipv6.c 2015-01-28 11:48:02.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/net/ipv6/tcp_ipv6.c linux-4.4.110-vs2.3.9/net/ipv6/tcp_ipv6.c
+--- linux-4.4.110/net/ipv6/tcp_ipv6.c 2018-01-09 16:35:16.000000000 +0000
++++ linux-4.4.110-vs2.3.9/net/ipv6/tcp_ipv6.c 2018-01-09 16:36:34.000000000 +0000
@@ -69,6 +69,7 @@
#include <linux/crypto.h>
#include <linux/scatterlist.h>
+#include <linux/vs_inet6.h>
- static void tcp_v6_send_reset(struct sock *sk, struct sk_buff *skb);
- static void tcp_v6_reqsk_send_ack(struct sock *sk, struct sk_buff *skb,
-@@ -164,8 +165,15 @@ static int tcp_v6_connect(struct sock *s
- * connect() to INADDR_ANY means loopback (BSD'ism).
+ static void tcp_v6_send_reset(const struct sock *sk, struct sk_buff *skb);
+ static void tcp_v6_reqsk_send_ack(const struct sock *sk, struct sk_buff *skb,
+@@ -150,11 +151,18 @@ static int tcp_v6_connect(struct sock *s
*/
-- if (ipv6_addr_any(&usin->sin6_addr))
-- usin->sin6_addr.s6_addr[15] = 0x1;
-+ if(ipv6_addr_any(&usin->sin6_addr)) {
+ if (ipv6_addr_any(&usin->sin6_addr)) {
+- if (ipv6_addr_v4mapped(&sk->sk_v6_rcv_saddr))
+- ipv6_addr_set_v4mapped(htonl(INADDR_LOOPBACK),
+- &usin->sin6_addr);
+- else
+- usin->sin6_addr = in6addr_loopback;
+ struct nx_info *nxi = sk->sk_nx_info;
+
+ if (nxi && nx_info_has_v6(nxi))
+ /* FIXME: remap lback? */
+ usin->sin6_addr = nxi->v6.ip;
-+ else
-+ usin->sin6_addr.s6_addr[15] = 0x1;
-+ }
++ else {
++ if (ipv6_addr_v4mapped(&sk->sk_v6_rcv_saddr))
++ ipv6_addr_set_v4mapped(htonl(INADDR_LOOPBACK),
++ &usin->sin6_addr);
++ else
++ usin->sin6_addr = in6addr_loopback;
++ }
+ }
addr_type = ipv6_addr_type(&usin->sin6_addr);
-
-diff -NurpP --minimal linux-3.18.5/net/ipv6/udp.c linux-3.18.5-vs2.3.7.3/net/ipv6/udp.c
---- linux-3.18.5/net/ipv6/udp.c 2015-01-17 02:40:25.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/net/ipv6/udp.c 2015-01-19 10:58:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/net/ipv6/udp.c linux-4.4.110-vs2.3.9/net/ipv6/udp.c
+--- linux-4.4.110/net/ipv6/udp.c 2018-01-09 16:35:16.000000000 +0000
++++ linux-4.4.110-vs2.3.9/net/ipv6/udp.c 2018-01-09 16:36:34.000000000 +0000
@@ -47,6 +47,7 @@
#include <net/xfrm.h>
#include <net/inet6_hashtables.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
-@@ -159,6 +160,10 @@ static inline int compute_score(struct s
- if (inet->inet_dport != sport)
- return -1;
- score++;
+@@ -76,32 +77,60 @@ static u32 udp6_ehashfn(const struct net
+ udp_ipv6_hash_secret + net_hash_mix(net));
+ }
+
+-int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
++int ipv6_rcv_saddr_equal(const struct sock *sk1, const struct sock *sk2)
+ {
++ const struct in6_addr *sk1_rcv_saddr6 = inet6_rcv_saddr(sk1);
+ const struct in6_addr *sk2_rcv_saddr6 = inet6_rcv_saddr(sk2);
++ __be32 sk1_rcv_saddr = sk1->sk_rcv_saddr;
++ __be32 sk2_rcv_saddr = sk2->sk_rcv_saddr;
+ int sk2_ipv6only = inet_v6_ipv6only(sk2);
+- int addr_type = ipv6_addr_type(&sk->sk_v6_rcv_saddr);
++ int addr_type1 = ipv6_addr_type(sk1_rcv_saddr6);
+ int addr_type2 = sk2_rcv_saddr6 ? ipv6_addr_type(sk2_rcv_saddr6) : IPV6_ADDR_MAPPED;
+
+ /* if both are mapped, treat as IPv4 */
+- if (addr_type == IPV6_ADDR_MAPPED && addr_type2 == IPV6_ADDR_MAPPED)
+- return (!sk2_ipv6only &&
+- (!sk->sk_rcv_saddr || !sk2->sk_rcv_saddr ||
+- sk->sk_rcv_saddr == sk2->sk_rcv_saddr));
++ if (addr_type1 == IPV6_ADDR_MAPPED && addr_type2 == IPV6_ADDR_MAPPED) {
++ if (!sk2_ipv6only &&
++ (!sk1->sk_rcv_saddr || !sk2->sk_rcv_saddr ||
++ sk1->sk_rcv_saddr == sk2->sk_rcv_saddr))
++ goto vs_v4;
++ else
++ return 0;
++ }
+
+ if (addr_type2 == IPV6_ADDR_ANY &&
+- !(sk2_ipv6only && addr_type == IPV6_ADDR_MAPPED))
+- return 1;
++ !(sk2_ipv6only && addr_type1 == IPV6_ADDR_MAPPED))
++ goto vs;
+
+- if (addr_type == IPV6_ADDR_ANY &&
+- !(ipv6_only_sock(sk) && addr_type2 == IPV6_ADDR_MAPPED))
+- return 1;
++ if (addr_type1 == IPV6_ADDR_ANY &&
++ !(ipv6_only_sock(sk1) && addr_type2 == IPV6_ADDR_MAPPED))
++ goto vs;
+
+ if (sk2_rcv_saddr6 &&
+- ipv6_addr_equal(&sk->sk_v6_rcv_saddr, sk2_rcv_saddr6))
+- return 1;
++ ipv6_addr_equal(&sk1->sk_v6_rcv_saddr, sk2_rcv_saddr6))
++ goto vs;
+
+ return 0;
++
++vs_v4:
++ if (!sk1_rcv_saddr && !sk2_rcv_saddr)
++ return nx_v4_addr_conflict(sk1->sk_nx_info, sk2->sk_nx_info);
++ if (!sk2_rcv_saddr)
++ return v4_addr_in_nx_info(sk1->sk_nx_info, sk2_rcv_saddr, -1);
++ if (!sk1_rcv_saddr)
++ return v4_addr_in_nx_info(sk2->sk_nx_info, sk1_rcv_saddr, -1);
++ return 1;
++vs:
++ if (addr_type2 == IPV6_ADDR_ANY && addr_type1 == IPV6_ADDR_ANY)
++ return nx_v6_addr_conflict(sk1->sk_nx_info, sk2->sk_nx_info);
++ else if (addr_type2 == IPV6_ADDR_ANY)
++ return v6_addr_in_nx_info(sk2->sk_nx_info, sk1_rcv_saddr6, -1);
++ else if (addr_type1 == IPV6_ADDR_ANY) {
++ if (addr_type2 == IPV6_ADDR_MAPPED)
++ return nx_v4_addr_conflict(sk1->sk_nx_info, sk2->sk_nx_info);
++ else
++ return v6_addr_in_nx_info(sk1->sk_nx_info, sk2_rcv_saddr6, -1);
++ }
++ return 1;
+ }
+
+ static u32 udp6_portaddr_hash(const struct net *net,
+@@ -162,6 +191,10 @@ static inline int compute_score(struct s
+ if (inet->inet_dport != sport)
+ return -1;
+ score++;
+ } else {
+ /* block non nx_info ips */
+ if (!v6_addr_in_nx_info(sk->sk_nx_info, daddr, -1))
+ return -1;
- }
- if (!ipv6_addr_any(&sk->sk_v6_rcv_saddr)) {
- if (!ipv6_addr_equal(&sk->sk_v6_rcv_saddr, daddr))
-diff -NurpP --minimal linux-3.18.5/net/ipv6/xfrm6_policy.c linux-3.18.5-vs2.3.7.3/net/ipv6/xfrm6_policy.c
---- linux-3.18.5/net/ipv6/xfrm6_policy.c 2015-01-17 02:40:25.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/net/ipv6/xfrm6_policy.c 2015-01-19 10:58:32.000000000 +0000
-@@ -63,7 +63,7 @@ static int xfrm6_get_saddr(struct net *n
+ }
+
+ if (!ipv6_addr_any(&sk->sk_v6_rcv_saddr)) {
+diff -NurpP --minimal linux-4.4.110/net/ipv6/xfrm6_policy.c linux-4.4.110-vs2.3.9/net/ipv6/xfrm6_policy.c
+--- linux-4.4.110/net/ipv6/xfrm6_policy.c 2016-07-05 04:15:14.000000000 +0000
++++ linux-4.4.110-vs2.3.9/net/ipv6/xfrm6_policy.c 2018-01-09 16:36:34.000000000 +0000
+@@ -64,7 +64,8 @@ static int xfrm6_get_saddr(struct net *n
+ return -EHOSTUNREACH;
+
dev = ip6_dst_idev(dst)->dev;
- ipv6_dev_get_saddr(dev_net(dev), dev,
- (struct in6_addr *)&daddr->a6, 0,
-- (struct in6_addr *)&saddr->a6);
-+ (struct in6_addr *)&saddr->a6, NULL);
+- ipv6_dev_get_saddr(dev_net(dev), dev, &daddr->in6, 0, &saddr->in6);
++ ipv6_dev_get_saddr(dev_net(dev), dev, &daddr->in6,
++ 0, &saddr->in6, NULL);
dst_release(dst);
return 0;
}
-diff -NurpP --minimal linux-3.18.5/net/netfilter/ipvs/ip_vs_xmit.c linux-3.18.5-vs2.3.7.3/net/netfilter/ipvs/ip_vs_xmit.c
---- linux-3.18.5/net/netfilter/ipvs/ip_vs_xmit.c 2015-01-17 02:40:25.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/net/netfilter/ipvs/ip_vs_xmit.c 2015-01-19 10:58:32.000000000 +0000
-@@ -379,7 +379,7 @@ __ip_vs_route_output_v6(struct net *net,
+diff -NurpP --minimal linux-4.4.110/net/netfilter/ipvs/ip_vs_xmit.c linux-4.4.110-vs2.3.9/net/netfilter/ipvs/ip_vs_xmit.c
+--- linux-4.4.110/net/netfilter/ipvs/ip_vs_xmit.c 2016-07-05 04:15:15.000000000 +0000
++++ linux-4.4.110-vs2.3.9/net/netfilter/ipvs/ip_vs_xmit.c 2018-01-09 16:36:34.000000000 +0000
+@@ -381,7 +381,7 @@ __ip_vs_route_output_v6(struct net *net,
return dst;
if (ipv6_addr_any(&fl6.saddr) &&
ipv6_dev_get_saddr(net, ip6_dst_idev(dst)->dev,
goto out_err;
if (do_xfrm) {
dst = xfrm_lookup(net, dst, flowi6_to_flowi(&fl6), NULL, 0);
-diff -NurpP --minimal linux-3.18.5/net/netlink/af_netlink.c linux-3.18.5-vs2.3.7.3/net/netlink/af_netlink.c
---- linux-3.18.5/net/netlink/af_netlink.c 2015-02-05 18:02:46.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/net/netlink/af_netlink.c 2015-01-28 11:48:02.000000000 +0000
-@@ -61,6 +61,9 @@
- #include <linux/rhashtable.h>
+diff -NurpP --minimal linux-4.4.110/net/netlink/af_netlink.c linux-4.4.110-vs2.3.9/net/netlink/af_netlink.c
+--- linux-4.4.110/net/netlink/af_netlink.c 2018-01-09 16:35:16.000000000 +0000
++++ linux-4.4.110-vs2.3.9/net/netlink/af_netlink.c 2018-01-09 16:36:34.000000000 +0000
+@@ -62,6 +62,8 @@
#include <asm/cacheflush.h>
#include <linux/hash.h>
+ #include <linux/genetlink.h>
+#include <linux/vs_context.h>
+#include <linux/vs_network.h>
-+#include <linux/vs_limit.h>
#include <net/net_namespace.h>
#include <net/sock.h>
-@@ -2899,6 +2902,8 @@ static struct sock *netlink_seq_socket_i
+@@ -2460,7 +2462,8 @@ static void *__netlink_seq_next(struct s
+ if (err)
+ return ERR_PTR(err);
+ }
+- } while (sock_net(&nlk->sk) != seq_file_net(seq));
++ } while ((sock_net(&nlk->sk) != seq_file_net(seq)) ||
++ !nx_check(nlk->sk.sk_nid, VS_WATCH_P | VS_IDENT));
- if (sock_net(s) != seq_file_net(seq))
- continue;
-+ if (!nx_check(s->sk_nid, VS_WATCH_P | VS_IDENT))
-+ continue;
- if (off == pos) {
- iter->link = i;
- iter->hash_idx = j;
-diff -NurpP --minimal linux-3.18.5/net/socket.c linux-3.18.5-vs2.3.7.3/net/socket.c
---- linux-3.18.5/net/socket.c 2015-01-17 02:40:30.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/net/socket.c 2015-01-19 10:58:32.000000000 +0000
-@@ -99,6 +99,9 @@
+ return nlk;
+ }
+diff -NurpP --minimal linux-4.4.110/net/socket.c linux-4.4.110-vs2.3.9/net/socket.c
+--- linux-4.4.110/net/socket.c 2018-01-09 16:35:17.000000000 +0000
++++ linux-4.4.110-vs2.3.9/net/socket.c 2018-01-09 16:36:34.000000000 +0000
+@@ -99,10 +99,12 @@
#include <net/sock.h>
#include <linux/netfilter.h>
#include <linux/if_tun.h>
#include <linux/ipv6_route.h>
-@@ -634,13 +637,29 @@ static inline int __sock_sendmsg_nosec(s
- struct msghdr *msg, size_t size)
- {
- struct sock_iocb *si = kiocb_to_siocb(iocb);
-+ size_t len;
-
- si->sock = sock;
- si->scm = NULL;
- si->msg = msg;
- si->size = size;
+-#include <linux/route.h>
+ #include <linux/sockios.h>
+ #include <linux/atalk.h>
+ #include <net/busy_poll.h>
+@@ -608,8 +610,24 @@ EXPORT_SYMBOL(__sock_tx_timestamp);
-- return sock->ops->sendmsg(iocb, sock, msg, size);
-+ len = sock->ops->sendmsg(iocb, sock, msg, size);
+ static inline int sock_sendmsg_nosec(struct socket *sock, struct msghdr *msg)
+ {
+- int ret = sock->ops->sendmsg(sock, msg, msg_data_left(msg));
+- BUG_ON(ret == -EIOCBQUEUED);
++ size_t size = msg_data_left(msg);
++ int ret = sock->ops->sendmsg(sock, msg, size);
++#if 0
+ if (sock->sk) {
-+ if (len == size)
-+ vx_sock_send(sock->sk, size);
-+ else
++ if (!ret)
+ vx_sock_fail(sock->sk, size);
++ else
++ vx_sock_send(sock->sk, size);
+ }
++#endif
+ vxdprintk(VXD_CBIT(net, 7),
-+ "__sock_sendmsg: %p[%p,%p,%p;%d/%d]:%d/%zu",
-+ sock, sock->sk,
-+ (sock->sk)?sock->sk->sk_nx_info:0,
-+ (sock->sk)?sock->sk->sk_vx_info:0,
-+ (sock->sk)?sock->sk->sk_xid:0,
-+ (sock->sk)?sock->sk->sk_nid:0,
-+ (unsigned int)size, len);
-+ return len;
- }
-
- static inline int __sock_sendmsg(struct kiocb *iocb, struct socket *sock,
-@@ -780,6 +799,7 @@ static inline int __sock_recvmsg_nosec(s
- struct msghdr *msg, size_t size, int flags)
- {
- struct sock_iocb *si = kiocb_to_siocb(iocb);
-+ int len;
-
- si->sock = sock;
- si->scm = NULL;
-@@ -787,7 +807,18 @@ static inline int __sock_recvmsg_nosec(s
- si->size = size;
- si->flags = flags;
-
-- return sock->ops->recvmsg(iocb, sock, msg, size, flags);
-+ len = sock->ops->recvmsg(iocb, sock, msg, size, flags);
-+ if ((len >= 0) && sock->sk)
-+ vx_sock_recv(sock->sk, len);
-+ vxdprintk(VXD_CBIT(net, 7),
-+ "__sock_recvmsg: %p[%p,%p,%p;%d/%d]:%d/%d",
++ "sock_sendmsg_nosec: %p[%p,%p,%p;%d/%d]:%zu/%zu",
+ sock, sock->sk,
+ (sock->sk)?sock->sk->sk_nx_info:0,
+ (sock->sk)?sock->sk->sk_vx_info:0,
+ (sock->sk)?sock->sk->sk_xid:0,
+ (sock->sk)?sock->sk->sk_nid:0,
-+ (unsigned int)size, len);
-+ return len;
++ size, msg_data_left(msg));
+ return ret;
}
- static inline int __sock_recvmsg(struct kiocb *iocb, struct socket *sock,
-@@ -1264,6 +1295,13 @@ int __sock_create(struct net *net, int f
+@@ -1100,6 +1118,13 @@ int __sock_create(struct net *net, int f
if (type < 0 || type >= SOCK_MAX)
return -EINVAL;
/* Compatibility.
This uglymoron is moved from INET layer to here to avoid
-@@ -1398,6 +1436,7 @@ SYSCALL_DEFINE3(socket, int, family, int
+@@ -1234,6 +1259,7 @@ SYSCALL_DEFINE3(socket, int, family, int
if (retval < 0)
goto out;
retval = sock_map_fd(sock, flags & (O_CLOEXEC | O_NONBLOCK));
if (retval < 0)
goto out_release;
-@@ -1439,10 +1478,12 @@ SYSCALL_DEFINE4(socketpair, int, family,
+@@ -1275,10 +1301,12 @@ SYSCALL_DEFINE4(socketpair, int, family,
err = sock_create(family, type, protocol, &sock1);
if (err < 0)
goto out;
err = sock1->ops->socketpair(sock1, sock2);
if (err < 0)
-diff -NurpP --minimal linux-3.18.5/net/sunrpc/auth.c linux-3.18.5-vs2.3.7.3/net/sunrpc/auth.c
---- linux-3.18.5/net/sunrpc/auth.c 2015-01-16 22:19:32.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/net/sunrpc/auth.c 2015-01-19 11:18:55.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/net/sunrpc/auth.c linux-4.4.110-vs2.3.9/net/sunrpc/auth.c
+--- linux-4.4.110/net/sunrpc/auth.c 2015-10-29 09:21:46.000000000 +0000
++++ linux-4.4.110-vs2.3.9/net/sunrpc/auth.c 2018-01-09 16:36:34.000000000 +0000
@@ -15,6 +15,7 @@
#include <linux/sunrpc/clnt.h>
#include <linux/sunrpc/gss_api.h>
#include <linux/spinlock.h>
+#include <linux/vs_tag.h>
- #ifdef RPC_DEBUG
+ #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
# define RPCDBG_FACILITY RPCDBG_AUTH
@@ -630,6 +631,7 @@ rpcauth_lookupcred(struct rpc_auth *auth
memset(&acred, 0, sizeof(acred));
};
dprintk("RPC: %5u looking up %s cred\n",
-diff -NurpP --minimal linux-3.18.5/net/sunrpc/auth_unix.c linux-3.18.5-vs2.3.7.3/net/sunrpc/auth_unix.c
---- linux-3.18.5/net/sunrpc/auth_unix.c 2013-11-25 15:47:08.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/net/sunrpc/auth_unix.c 2015-01-19 10:58:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/net/sunrpc/auth_unix.c linux-4.4.110-vs2.3.9/net/sunrpc/auth_unix.c
+--- linux-4.4.110/net/sunrpc/auth_unix.c 2016-07-05 04:12:45.000000000 +0000
++++ linux-4.4.110-vs2.3.9/net/sunrpc/auth_unix.c 2018-01-09 16:36:34.000000000 +0000
@@ -13,11 +13,13 @@
#include <linux/sunrpc/clnt.h>
#include <linux/sunrpc/auth.h>
hold = p++;
for (i = 0; i < 16 && gid_valid(cred->uc_gids[i]); i++)
*p++ = htonl((u32) from_kgid(&init_user_ns, cred->uc_gids[i]));
-diff -NurpP --minimal linux-3.18.5/net/sunrpc/clnt.c linux-3.18.5-vs2.3.7.3/net/sunrpc/clnt.c
---- linux-3.18.5/net/sunrpc/clnt.c 2015-01-17 02:40:30.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/net/sunrpc/clnt.c 2015-01-19 10:58:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/net/sunrpc/clnt.c linux-4.4.110-vs2.3.9/net/sunrpc/clnt.c
+--- linux-4.4.110/net/sunrpc/clnt.c 2018-01-09 16:35:17.000000000 +0000
++++ linux-4.4.110-vs2.3.9/net/sunrpc/clnt.c 2018-01-09 16:36:34.000000000 +0000
@@ -31,6 +31,7 @@
#include <linux/in.h>
#include <linux/in6.h>
#include <linux/sunrpc/clnt.h>
#include <linux/sunrpc/addr.h>
-@@ -468,6 +469,9 @@ struct rpc_clnt *rpc_create_xprt(struct
+@@ -477,6 +478,9 @@ static struct rpc_clnt *rpc_create_xprt(
if (!(args->flags & RPC_CLNT_CREATE_QUIET))
clnt->cl_chatty = 1;
+ clnt->cl_tag = 1; */
return clnt;
}
- EXPORT_SYMBOL_GPL(rpc_create_xprt);
-diff -NurpP --minimal linux-3.18.5/net/unix/af_unix.c linux-3.18.5-vs2.3.7.3/net/unix/af_unix.c
---- linux-3.18.5/net/unix/af_unix.c 2014-09-03 13:19:49.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/net/unix/af_unix.c 2015-01-19 10:58:32.000000000 +0000
+
+diff -NurpP --minimal linux-4.4.110/net/unix/af_unix.c linux-4.4.110-vs2.3.9/net/unix/af_unix.c
+--- linux-4.4.110/net/unix/af_unix.c 2018-01-09 16:35:17.000000000 +0000
++++ linux-4.4.110-vs2.3.9/net/unix/af_unix.c 2018-01-09 16:36:34.000000000 +0000
@@ -117,6 +117,8 @@
#include <net/checksum.h>
#include <linux/security.h>
struct hlist_head unix_socket_table[2 * UNIX_HASH_SIZE];
EXPORT_SYMBOL_GPL(unix_socket_table);
-@@ -272,6 +274,8 @@ static struct sock *__unix_find_socket_b
+@@ -282,6 +284,8 @@ static struct sock *__unix_find_socket_b
if (!net_eq(sock_net(s), net))
continue;
if (u->addr->len == len &&
!memcmp(u->addr->name, sunname, len))
goto found;
-@@ -2283,6 +2287,8 @@ static struct sock *unix_from_bucket(str
+@@ -2741,6 +2745,8 @@ static struct sock *unix_from_bucket(str
for (sk = sk_head(&unix_socket_table[bucket]); sk; sk = sk_next(sk)) {
if (sock_net(sk) != seq_file_net(seq))
continue;
if (++count == offset)
break;
}
-@@ -2300,6 +2306,8 @@ static struct sock *unix_next_socket(str
+@@ -2758,6 +2764,8 @@ static struct sock *unix_next_socket(str
sk = sk_next(sk);
if (!sk)
goto next_bucket;
if (sock_net(sk) == seq_file_net(seq))
return sk;
}
-diff -NurpP --minimal linux-3.18.5/scripts/checksyscalls.sh linux-3.18.5-vs2.3.7.3/scripts/checksyscalls.sh
---- linux-3.18.5/scripts/checksyscalls.sh 2014-06-12 13:03:01.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/scripts/checksyscalls.sh 2015-01-19 10:58:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.110/scripts/checksyscalls.sh linux-4.4.110-vs2.3.9/scripts/checksyscalls.sh
+--- linux-4.4.110/scripts/checksyscalls.sh 2015-10-29 09:21:46.000000000 +0000
++++ linux-4.4.110-vs2.3.9/scripts/checksyscalls.sh 2018-01-09 16:36:34.000000000 +0000
@@ -196,7 +196,6 @@ cat << EOF
#define __IGNORE_afs_syscall
#define __IGNORE_getpmsg
EOF
}
-diff -NurpP --minimal linux-3.18.5/security/commoncap.c linux-3.18.5-vs2.3.7.3/security/commoncap.c
---- linux-3.18.5/security/commoncap.c 2015-01-16 22:19:32.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/security/commoncap.c 2015-01-19 10:58:32.000000000 +0000
-@@ -76,6 +76,7 @@ int cap_netlink_send(struct sock *sk, st
+diff -NurpP --minimal linux-4.4.110/security/commoncap.c linux-4.4.110-vs2.3.9/security/commoncap.c
+--- linux-4.4.110/security/commoncap.c 2018-01-09 16:35:18.000000000 +0000
++++ linux-4.4.110-vs2.3.9/security/commoncap.c 2018-01-09 16:36:34.000000000 +0000
+@@ -71,6 +71,7 @@ static void warn_setuid_and_fcaps_mixed(
int cap_capable(const struct cred *cred, struct user_namespace *targ_ns,
int cap, int audit)
{
struct user_namespace *ns = targ_ns;
/* See if cred has the capability in the target user namespace
-@@ -84,8 +85,12 @@ int cap_capable(const struct cred *cred,
+@@ -79,8 +80,12 @@ int cap_capable(const struct cred *cred,
*/
for (;;) {
/* Do we have the necessary capabilities? */
/* Have we tried all of the parent namespaces? */
if (ns == &init_user_ns)
-@@ -631,7 +636,7 @@ int cap_inode_setxattr(struct dentry *de
+@@ -664,7 +669,7 @@ int cap_inode_setxattr(struct dentry *de
if (!strncmp(name, XATTR_SECURITY_PREFIX,
sizeof(XATTR_SECURITY_PREFIX) - 1) &&
return -EPERM;
return 0;
}
-@@ -657,7 +662,7 @@ int cap_inode_removexattr(struct dentry
+@@ -690,7 +695,7 @@ int cap_inode_removexattr(struct dentry
if (!strncmp(name, XATTR_SECURITY_PREFIX,
sizeof(XATTR_SECURITY_PREFIX) - 1) &&
return -EPERM;
return 0;
}
-diff -NurpP --minimal linux-3.18.5/security/selinux/hooks.c linux-3.18.5-vs2.3.7.3/security/selinux/hooks.c
---- linux-3.18.5/security/selinux/hooks.c 2015-01-17 02:40:31.000000000 +0000
-+++ linux-3.18.5-vs2.3.7.3/security/selinux/hooks.c 2015-01-19 10:58:32.000000000 +0000
-@@ -68,7 +68,6 @@
+diff -NurpP --minimal linux-4.4.110/security/selinux/hooks.c linux-4.4.110-vs2.3.9/security/selinux/hooks.c
+--- linux-4.4.110/security/selinux/hooks.c 2018-01-09 16:35:18.000000000 +0000
++++ linux-4.4.110-vs2.3.9/security/selinux/hooks.c 2018-01-09 16:36:34.000000000 +0000
+@@ -67,7 +67,6 @@
#include <linux/dccp.h>
#include <linux/quota.h>
#include <linux/un.h> /* for Unix socket types */
projects / packages / kernel.git / commitdiff