X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=kernel-vserver-2.3.patch;h=1f7aa6f129fec3d0bc6477a0db49aa85d2d5c4bc;hb=fa873409dfcce98aa3a4e6a0b654891b7bf0f55d;hp=161ea162646572c927cfdf01147fd4dbeb91e2ac;hpb=b00e13aa43adcdb9d23251878ba661124a7d056b;p=packages%2Fkernel.git diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch index 161ea162..1f7aa6f1 100644 --- a/kernel-vserver-2.3.patch +++ b/kernel-vserver-2.3.patch @@ -1,6 +1,6 @@ -diff -NurpP --minimal linux-3.9.4/Documentation/vserver/debug.txt linux-3.9.4-vs2.3.6.1/Documentation/vserver/debug.txt ---- linux-3.9.4/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/Documentation/vserver/debug.txt 2013-05-31 14:47:10.000000000 +0000 +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 @@ -0,0 +1,154 @@ + +debug_cvirt: @@ -156,10 +156,10 @@ diff -NurpP --minimal linux-3.9.4/Documentation/vserver/debug.txt linux-3.9.4-vs + 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.9.4/arch/alpha/Kconfig linux-3.9.4-vs2.3.6.1/arch/alpha/Kconfig ---- linux-3.9.4/arch/alpha/Kconfig 2013-05-31 13:44:28.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/arch/alpha/Kconfig 2013-05-31 14:47:10.000000000 +0000 -@@ -669,6 +669,8 @@ config DUMMY_CONSOLE +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 depends on VGA_HOSE default y @@ -168,9 +168,9 @@ diff -NurpP --minimal linux-3.9.4/arch/alpha/Kconfig linux-3.9.4-vs2.3.6.1/arch/ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.9.4/arch/alpha/kernel/systbls.S linux-3.9.4-vs2.3.6.1/arch/alpha/kernel/systbls.S ---- linux-3.9.4/arch/alpha/kernel/systbls.S 2013-02-19 13:56:11.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/arch/alpha/kernel/systbls.S 2013-05-31 14:47:11.000000000 +0000 +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 @@ -446,7 +446,7 @@ sys_call_table: .quad sys_stat64 /* 425 */ .quad sys_lstat64 @@ -180,23 +180,23 @@ diff -NurpP --minimal linux-3.9.4/arch/alpha/kernel/systbls.S linux-3.9.4-vs2.3. .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.9.4/arch/alpha/kernel/traps.c linux-3.9.4-vs2.3.6.1/arch/alpha/kernel/traps.c ---- linux-3.9.4/arch/alpha/kernel/traps.c 2013-05-31 13:44:28.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/arch/alpha/kernel/traps.c 2013-05-31 14:47:11.000000000 +0000 -@@ -184,7 +184,8 @@ die_if_kernel(char * str, struct pt_regs +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 #ifdef CONFIG_SMP printk("CPU %d ", hard_smp_processor_id()); #endif - printk("%s(%d): %s %ld\n", current->comm, task_pid_nr(current), str, err); -+ printk("%s(%d[#%u]): %s %ld\n", current->comm, ++ printk("%s(%d:#%u): %s %ld\n", current->comm, + task_pid_nr(current), current->xid, str, err); 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.9.4/arch/arm/Kconfig linux-3.9.4-vs2.3.6.1/arch/arm/Kconfig ---- linux-3.9.4/arch/arm/Kconfig 2013-05-31 13:44:29.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/arch/arm/Kconfig 2013-05-31 14:47:11.000000000 +0000 -@@ -2353,6 +2353,8 @@ source "fs/Kconfig" +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" source "arch/arm/Kconfig.debug" @@ -205,9 +205,9 @@ diff -NurpP --minimal linux-3.9.4/arch/arm/Kconfig linux-3.9.4-vs2.3.6.1/arch/ar source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.9.4/arch/arm/kernel/calls.S linux-3.9.4-vs2.3.6.1/arch/arm/kernel/calls.S ---- linux-3.9.4/arch/arm/kernel/calls.S 2013-05-31 13:44:29.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/arch/arm/kernel/calls.S 2013-05-31 14:47:11.000000000 +0000 +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 @@ -322,7 +322,7 @@ /* 310 */ CALL(sys_request_key) CALL(sys_keyctl) @@ -217,23 +217,10 @@ diff -NurpP --minimal linux-3.9.4/arch/arm/kernel/calls.S linux-3.9.4-vs2.3.6.1/ CALL(sys_ioprio_set) /* 315 */ CALL(sys_ioprio_get) CALL(sys_inotify_init) -diff -NurpP --minimal linux-3.9.4/arch/arm/kernel/process.c linux-3.9.4-vs2.3.6.1/arch/arm/kernel/process.c ---- linux-3.9.4/arch/arm/kernel/process.c 2013-05-31 13:44:29.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/arch/arm/kernel/process.c 2013-05-31 14:47:11.000000000 +0000 -@@ -332,7 +332,8 @@ void __show_regs(struct pt_regs *regs) - void show_regs(struct pt_regs * regs) - { - printk("\n"); -- printk("Pid: %d, comm: %20s\n", task_pid_nr(current), current->comm); -+ printk("Pid: %d[#%u], comm: %20s\n", -+ task_pid_nr(current), current->xid, current->comm); - __show_regs(regs); - dump_stack(); - } -diff -NurpP --minimal linux-3.9.4/arch/arm/kernel/traps.c linux-3.9.4-vs2.3.6.1/arch/arm/kernel/traps.c ---- linux-3.9.4/arch/arm/kernel/traps.c 2013-05-31 13:44:29.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/arch/arm/kernel/traps.c 2013-05-31 14:47:11.000000000 +0000 -@@ -249,8 +249,8 @@ static int __die(const char *str, int er +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 print_modules(); __show_regs(regs); @@ -244,10 +231,10 @@ diff -NurpP --minimal linux-3.9.4/arch/arm/kernel/traps.c linux-3.9.4-vs2.3.6.1/ if (!user_mode(regs) || in_interrupt()) { dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp, -diff -NurpP --minimal linux-3.9.4/arch/cris/Kconfig linux-3.9.4-vs2.3.6.1/arch/cris/Kconfig ---- linux-3.9.4/arch/cris/Kconfig 2013-05-31 13:44:37.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/arch/cris/Kconfig 2013-05-31 14:47:11.000000000 +0000 -@@ -674,6 +674,8 @@ source "drivers/staging/Kconfig" +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" source "arch/cris/Kconfig.debug" @@ -256,22 +243,10 @@ diff -NurpP --minimal linux-3.9.4/arch/cris/Kconfig linux-3.9.4-vs2.3.6.1/arch/c source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.9.4/arch/h8300/Kconfig linux-3.9.4-vs2.3.6.1/arch/h8300/Kconfig ---- linux-3.9.4/arch/h8300/Kconfig 2013-05-31 13:44:38.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/arch/h8300/Kconfig 2013-05-31 14:47:11.000000000 +0000 -@@ -221,6 +221,8 @@ source "fs/Kconfig" - - source "arch/h8300/Kconfig.debug" - -+source "kernel/vserver/Kconfig" -+ - source "security/Kconfig" - - source "crypto/Kconfig" -diff -NurpP --minimal linux-3.9.4/arch/ia64/Kconfig linux-3.9.4-vs2.3.6.1/arch/ia64/Kconfig ---- linux-3.9.4/arch/ia64/Kconfig 2013-05-31 13:44:38.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/arch/ia64/Kconfig 2013-05-31 14:47:11.000000000 +0000 -@@ -645,6 +645,8 @@ source "fs/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" source "arch/ia64/Kconfig.debug" @@ -280,10 +255,10 @@ diff -NurpP --minimal linux-3.9.4/arch/ia64/Kconfig linux-3.9.4-vs2.3.6.1/arch/i source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.9.4/arch/ia64/kernel/entry.S linux-3.9.4-vs2.3.6.1/arch/ia64/kernel/entry.S ---- linux-3.9.4/arch/ia64/kernel/entry.S 2013-05-31 13:44:38.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/arch/ia64/kernel/entry.S 2013-05-31 14:47:11.000000000 +0000 -@@ -1719,7 +1719,7 @@ sys_call_table: +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: data8 sys_mq_notify data8 sys_mq_getsetattr data8 sys_kexec_load @@ -292,23 +267,9 @@ diff -NurpP --minimal linux-3.9.4/arch/ia64/kernel/entry.S linux-3.9.4-vs2.3.6.1 data8 sys_waitid // 1270 data8 sys_add_key data8 sys_request_key -diff -NurpP --minimal linux-3.9.4/arch/ia64/kernel/process.c linux-3.9.4-vs2.3.6.1/arch/ia64/kernel/process.c ---- linux-3.9.4/arch/ia64/kernel/process.c 2013-05-31 13:44:38.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/arch/ia64/kernel/process.c 2013-05-31 14:47:11.000000000 +0000 -@@ -109,8 +109,8 @@ show_regs (struct pt_regs *regs) - unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri; - - print_modules(); -- printk("\nPid: %d, CPU %d, comm: %20s\n", task_pid_nr(current), -- smp_processor_id(), current->comm); -+ printk("\nPid: %d[#%u], CPU %d, comm: %20s\n", task_pid_nr(current), -+ current->xid, smp_processor_id(), current->comm); - printk("psr : %016lx ifs : %016lx ip : [<%016lx>] %s (%s)\n", - regs->cr_ipsr, regs->cr_ifs, ip, print_tainted(), - init_utsname()->release); -diff -NurpP --minimal linux-3.9.4/arch/ia64/kernel/ptrace.c linux-3.9.4-vs2.3.6.1/arch/ia64/kernel/ptrace.c ---- linux-3.9.4/arch/ia64/kernel/ptrace.c 2013-02-19 13:56:51.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/arch/ia64/kernel/ptrace.c 2013-05-31 14:47:11.000000000 +0000 +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 @@ -21,6 +21,7 @@ #include #include @@ -317,16 +278,16 @@ diff -NurpP --minimal linux-3.9.4/arch/ia64/kernel/ptrace.c linux-3.9.4-vs2.3.6. #include #include -diff -NurpP --minimal linux-3.9.4/arch/ia64/kernel/traps.c linux-3.9.4-vs2.3.6.1/arch/ia64/kernel/traps.c ---- linux-3.9.4/arch/ia64/kernel/traps.c 2013-05-31 13:44:38.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/arch/ia64/kernel/traps.c 2013-05-31 14:47:11.000000000 +0000 +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 @@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re put_cpu(); if (++die.lock_owner_depth < 3) { - printk("%s[%d]: %s %ld [%d]\n", - current->comm, task_pid_nr(current), str, err, ++die_counter); -+ printk("%s[%d[#%u]]: %s %ld [%d]\n", ++ printk("%s[%d:#%u]: %s %ld [%d]\n", + current->comm, task_pid_nr(current), current->xid, + str, err, ++die_counter); if (notify_die(DIE_OOPS, str, regs, err, 255, SIGSEGV) @@ -338,31 +299,31 @@ diff -NurpP --minimal linux-3.9.4/arch/ia64/kernel/traps.c linux-3.9.4-vs2.3.6.1 printk(KERN_WARNING - "%s(%d): floating-point assist fault at ip %016lx, isr %016lx\n", - current->comm, task_pid_nr(current), regs->cr_iip + ia64_psr(regs)->ri, isr); -+ "%s(%d[#%u]): floating-point assist fault at ip %016lx, isr %016lx\n", ++ "%s(%d:#%u): floating-point assist fault at ip %016lx, isr %016lx\n", + current->comm, task_pid_nr(current), current->xid, + regs->cr_iip + ia64_psr(regs)->ri, isr); } } } -diff -NurpP --minimal linux-3.9.4/arch/m32r/kernel/traps.c linux-3.9.4-vs2.3.6.1/arch/m32r/kernel/traps.c ---- linux-3.9.4/arch/m32r/kernel/traps.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/arch/m32r/kernel/traps.c 2013-05-31 14:47:11.000000000 +0000 -@@ -195,8 +195,9 @@ static void show_registers(struct pt_reg +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 +@@ -184,8 +184,9 @@ static void show_registers(struct pt_reg } else { printk("SPI: %08lx\n", sp); } - printk("Process %s (pid: %d, process nr: %d, stackpage=%08lx)", - current->comm, task_pid_nr(current), 0xffff & i, 4096+(unsigned long)current); -+ printk("Process %s (pid: %d[#%u], process nr: %d, stackpage=%08lx)", ++ printk("Process %s (pid: %d:#%u, process nr: %d, stackpage=%08lx)", + current->comm, task_pid_nr(current), current->xid, + 0xffff & i, 4096+(unsigned long)current); /* * When in-kernel, we also print out the stack and code at the -diff -NurpP --minimal linux-3.9.4/arch/m68k/Kconfig linux-3.9.4-vs2.3.6.1/arch/m68k/Kconfig ---- linux-3.9.4/arch/m68k/Kconfig 2013-05-31 13:44:38.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/arch/m68k/Kconfig 2013-05-31 14:47:11.000000000 +0000 -@@ -137,6 +137,8 @@ source "fs/Kconfig" +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" source "arch/m68k/Kconfig.debug" @@ -371,10 +332,10 @@ diff -NurpP --minimal linux-3.9.4/arch/m68k/Kconfig linux-3.9.4-vs2.3.6.1/arch/m source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.9.4/arch/mips/Kconfig linux-3.9.4-vs2.3.6.1/arch/mips/Kconfig ---- linux-3.9.4/arch/mips/Kconfig 2013-05-31 13:44:39.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/arch/mips/Kconfig 2013-05-31 14:47:11.000000000 +0000 -@@ -2550,6 +2550,8 @@ source "fs/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" source "arch/mips/Kconfig.debug" @@ -383,18 +344,18 @@ diff -NurpP --minimal linux-3.9.4/arch/mips/Kconfig linux-3.9.4-vs2.3.6.1/arch/m source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.9.4/arch/mips/kernel/ptrace.c linux-3.9.4-vs2.3.6.1/arch/mips/kernel/ptrace.c ---- linux-3.9.4/arch/mips/kernel/ptrace.c 2013-05-31 13:44:42.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/arch/mips/kernel/ptrace.c 2013-05-31 14:47:11.000000000 +0000 -@@ -25,6 +25,7 @@ - #include +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 @@ #include #include + #include +#include #include #include -@@ -262,6 +263,9 @@ long arch_ptrace(struct task_struct *chi +@@ -544,6 +545,9 @@ long arch_ptrace(struct task_struct *chi void __user *datavp = (void __user *) data; unsigned long __user *datalp = (void __user *) data; @@ -404,22 +365,22 @@ diff -NurpP --minimal linux-3.9.4/arch/mips/kernel/ptrace.c linux-3.9.4-vs2.3.6. 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.9.4/arch/mips/kernel/scall32-o32.S linux-3.9.4-vs2.3.6.1/arch/mips/kernel/scall32-o32.S ---- linux-3.9.4/arch/mips/kernel/scall32-o32.S 2013-05-31 13:44:42.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/arch/mips/kernel/scall32-o32.S 2013-05-31 14:47:11.000000000 +0000 -@@ -512,7 +512,7 @@ einval: li v0, -ENOSYS - sys sys_mq_timedreceive 5 - sys sys_mq_notify 2 /* 4275 */ - sys sys_mq_getsetattr 3 -- sys sys_ni_syscall 0 /* sys_vserver */ -+ sys sys_vserver 3 - sys sys_waitid 5 - sys sys_ni_syscall 0 /* available, was setaltroot */ - sys sys_add_key 5 /* 4280 */ -diff -NurpP --minimal linux-3.9.4/arch/mips/kernel/scall64-64.S linux-3.9.4-vs2.3.6.1/arch/mips/kernel/scall64-64.S ---- linux-3.9.4/arch/mips/kernel/scall64-64.S 2013-05-31 13:44:42.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/arch/mips/kernel/scall64-64.S 2013-05-31 14:47:11.000000000 +0000 -@@ -351,7 +351,7 @@ sys_call_table: +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) + PTR sys_mq_timedreceive + PTR sys_mq_notify /* 4275 */ + PTR sys_mq_getsetattr +- PTR sys_ni_syscall /* sys_vserver */ ++ PTR sys_vserver + 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) PTR sys_mq_timedreceive PTR sys_mq_notify PTR sys_mq_getsetattr /* 5235 */ @@ -428,10 +389,10 @@ diff -NurpP --minimal linux-3.9.4/arch/mips/kernel/scall64-64.S linux-3.9.4-vs2. PTR sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key -diff -NurpP --minimal linux-3.9.4/arch/mips/kernel/scall64-n32.S linux-3.9.4-vs2.3.6.1/arch/mips/kernel/scall64-n32.S ---- linux-3.9.4/arch/mips/kernel/scall64-n32.S 2013-05-31 13:44:42.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/arch/mips/kernel/scall64-n32.S 2013-05-31 14:47:11.000000000 +0000 -@@ -344,7 +344,7 @@ EXPORT(sysn32_call_table) +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) PTR compat_sys_mq_timedreceive PTR compat_sys_mq_notify PTR compat_sys_mq_getsetattr @@ -440,10 +401,10 @@ diff -NurpP --minimal linux-3.9.4/arch/mips/kernel/scall64-n32.S linux-3.9.4-vs2 PTR compat_sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key -diff -NurpP --minimal linux-3.9.4/arch/mips/kernel/scall64-o32.S linux-3.9.4-vs2.3.6.1/arch/mips/kernel/scall64-o32.S ---- linux-3.9.4/arch/mips/kernel/scall64-o32.S 2013-05-31 13:44:42.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/arch/mips/kernel/scall64-o32.S 2013-05-31 15:07:53.000000000 +0000 -@@ -469,7 +469,7 @@ sys_call_table: +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) PTR compat_sys_mq_timedreceive PTR compat_sys_mq_notify /* 4275 */ PTR compat_sys_mq_getsetattr @@ -452,10 +413,10 @@ diff -NurpP --minimal linux-3.9.4/arch/mips/kernel/scall64-o32.S linux-3.9.4-vs2 PTR compat_sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key /* 4280 */ -diff -NurpP --minimal linux-3.9.4/arch/mips/kernel/traps.c linux-3.9.4-vs2.3.6.1/arch/mips/kernel/traps.c ---- linux-3.9.4/arch/mips/kernel/traps.c 2013-05-31 13:44:42.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/arch/mips/kernel/traps.c 2013-05-31 14:47:11.000000000 +0000 -@@ -348,9 +348,10 @@ void show_registers(struct pt_regs *regs +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 __show_regs(regs); print_modules(); @@ -469,21 +430,21 @@ diff -NurpP --minimal linux-3.9.4/arch/mips/kernel/traps.c linux-3.9.4-vs2.3.6.1 if (cpu_has_userlocal) { unsigned long tls; -diff -NurpP --minimal linux-3.9.4/arch/parisc/Kconfig linux-3.9.4-vs2.3.6.1/arch/parisc/Kconfig ---- linux-3.9.4/arch/parisc/Kconfig 2013-05-31 13:44:44.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/arch/parisc/Kconfig 2013-05-31 14:47:11.000000000 +0000 -@@ -308,6 +308,8 @@ source "fs/Kconfig" +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 - source "arch/parisc/Kconfig.debug" + If unsure, say Y. Only embedded should say N here. +source "kernel/vserver/Kconfig" + source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.9.4/arch/parisc/kernel/syscall_table.S linux-3.9.4-vs2.3.6.1/arch/parisc/kernel/syscall_table.S ---- linux-3.9.4/arch/parisc/kernel/syscall_table.S 2013-05-31 13:44:44.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/arch/parisc/kernel/syscall_table.S 2013-05-31 14:47:11.000000000 +0000 +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 @@ -358,7 +358,7 @@ ENTRY_COMP(mbind) /* 260 */ ENTRY_COMP(get_mempolicy) @@ -493,22 +454,22 @@ diff -NurpP --minimal linux-3.9.4/arch/parisc/kernel/syscall_table.S linux-3.9.4 ENTRY_SAME(add_key) ENTRY_SAME(request_key) /* 265 */ ENTRY_SAME(keyctl) -diff -NurpP --minimal linux-3.9.4/arch/parisc/kernel/traps.c linux-3.9.4-vs2.3.6.1/arch/parisc/kernel/traps.c ---- linux-3.9.4/arch/parisc/kernel/traps.c 2013-05-31 13:44:44.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/arch/parisc/kernel/traps.c 2013-05-31 14:47:11.000000000 +0000 -@@ -235,8 +235,9 @@ void die_if_kernel(char *str, struct pt_ - if (err == 0) +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_ return; /* STFU */ -- printk(KERN_CRIT "%s (pid %d): %s (code %ld) at " RFMT "\n", + parisc_printk_ratelimited(1, regs, +- KERN_CRIT "%s (pid %d): %s (code %ld) at " RFMT "\n", - current->comm, task_pid_nr(current), str, err, regs->iaoq[0]); -+ printk(KERN_CRIT "%s (pid %d:#%u): %s (code %ld) at " RFMT "\n", ++ KERN_CRIT "%s (pid %d:#%u): %s (code %ld) at " RFMT "\n", + current->comm, task_pid_nr(current), current->xid, + str, err, regs->iaoq[0]); - #ifdef PRINT_USER_FAULTS - /* XXX for debugging only */ - show_regs(regs); -@@ -269,8 +270,8 @@ void die_if_kernel(char *str, struct pt_ + + return; + } +@@ -270,8 +271,8 @@ void die_if_kernel(char *str, struct pt_ pdc_console_restart(); if (err) @@ -519,25 +480,10 @@ diff -NurpP --minimal linux-3.9.4/arch/parisc/kernel/traps.c linux-3.9.4-vs2.3.6 /* Wot's wrong wif bein' racy? */ if (current->thread.flags & PARISC_KERNEL_DEATH) { -diff -NurpP --minimal linux-3.9.4/arch/parisc/mm/fault.c linux-3.9.4-vs2.3.6.1/arch/parisc/mm/fault.c ---- linux-3.9.4/arch/parisc/mm/fault.c 2013-05-31 13:44:44.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/arch/parisc/mm/fault.c 2013-05-31 14:47:11.000000000 +0000 -@@ -257,8 +257,9 @@ bad_area: - - #ifdef PRINT_USER_FAULTS - printk(KERN_DEBUG "\n"); -- printk(KERN_DEBUG "do_page_fault() pid=%d command='%s' type=%lu address=0x%08lx\n", -- task_pid_nr(tsk), tsk->comm, code, address); -+ printk(KERN_DEBUG "do_page_fault() pid=%d:#%u " -+ "command='%s' type=%lu address=0x%08lx\n", -+ task_pid_nr(tsk), tsk->xid, tsk->comm, code, address); - if (vma) { - printk(KERN_DEBUG "vm_start = 0x%08lx, vm_end = 0x%08lx\n", - vma->vm_start, vma->vm_end); -diff -NurpP --minimal linux-3.9.4/arch/powerpc/Kconfig linux-3.9.4-vs2.3.6.1/arch/powerpc/Kconfig ---- linux-3.9.4/arch/powerpc/Kconfig 2013-05-31 13:44:44.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/arch/powerpc/Kconfig 2013-05-31 14:47:11.000000000 +0000 -@@ -1027,6 +1027,8 @@ source "lib/Kconfig" +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" source "arch/powerpc/Kconfig.debug" @@ -546,9 +492,9 @@ diff -NurpP --minimal linux-3.9.4/arch/powerpc/Kconfig linux-3.9.4-vs2.3.6.1/arc source "security/Kconfig" config KEYS_COMPAT -diff -NurpP --minimal linux-3.9.4/arch/powerpc/include/uapi/asm/unistd.h linux-3.9.4-vs2.3.6.1/arch/powerpc/include/uapi/asm/unistd.h ---- linux-3.9.4/arch/powerpc/include/uapi/asm/unistd.h 2013-05-31 13:44:44.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/arch/powerpc/include/uapi/asm/unistd.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -275,7 +275,7 @@ #endif #define __NR_rtas 255 @@ -558,40 +504,25 @@ diff -NurpP --minimal linux-3.9.4/arch/powerpc/include/uapi/asm/unistd.h linux-3 #define __NR_migrate_pages 258 #define __NR_mbind 259 #define __NR_get_mempolicy 260 -diff -NurpP --minimal linux-3.9.4/arch/powerpc/kernel/process.c linux-3.9.4-vs2.3.6.1/arch/powerpc/kernel/process.c ---- linux-3.9.4/arch/powerpc/kernel/process.c 2013-05-31 13:44:44.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/arch/powerpc/kernel/process.c 2013-05-31 14:47:11.000000000 +0000 -@@ -850,8 +850,9 @@ void show_regs(struct pt_regs * regs) - #else - printk("DAR: "REG", DSISR: %08lx\n", regs->dar, regs->dsisr); - #endif -- printk("TASK = %p[%d] '%s' THREAD: %p", -- current, task_pid_nr(current), current->comm, task_thread_info(current)); -+ printk("TASK = %p[%d,#%u] '%s' THREAD: %p", -+ current, task_pid_nr(current), current->xid, -+ current->comm, task_thread_info(current)); - - #ifdef CONFIG_SMP - printk(" CPU: %d", raw_smp_processor_id()); -diff -NurpP --minimal linux-3.9.4/arch/powerpc/kernel/traps.c linux-3.9.4-vs2.3.6.1/arch/powerpc/kernel/traps.c ---- linux-3.9.4/arch/powerpc/kernel/traps.c 2013-05-31 14:22:26.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/arch/powerpc/kernel/traps.c 2013-05-31 14:47:11.000000000 +0000 -@@ -1167,8 +1167,9 @@ void nonrecoverable_exception(struct pt_ +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_ void trace_syscall(struct pt_regs *regs) { - printk("Task: %p(%d), PC: %08lX/%08lX, Syscall: %3ld, Result: %s%ld %s\n", - current, task_pid_nr(current), regs->nip, regs->link, regs->gpr[0], -+ printk("Task: %p(%d[#%u]), PC: %08lX/%08lX, Syscall: %3ld, Result: %s%ld %s\n", ++ printk("Task: %p(%d:#%u), PC: %08lX/%08lX, Syscall: %3ld, Result: %s%ld %s\n", + current, task_pid_nr(current), current->xid, + regs->nip, regs->link, regs->gpr[0], regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted()); } -diff -NurpP --minimal linux-3.9.4/arch/s390/Kconfig linux-3.9.4-vs2.3.6.1/arch/s390/Kconfig ---- linux-3.9.4/arch/s390/Kconfig 2013-05-31 13:44:45.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/arch/s390/Kconfig 2013-05-31 14:47:11.000000000 +0000 -@@ -592,6 +592,8 @@ source "fs/Kconfig" +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" source "arch/s390/Kconfig.debug" @@ -600,9 +531,9 @@ diff -NurpP --minimal linux-3.9.4/arch/s390/Kconfig linux-3.9.4-vs2.3.6.1/arch/s source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.9.4/arch/s390/include/asm/tlb.h linux-3.9.4-vs2.3.6.1/arch/s390/include/asm/tlb.h ---- linux-3.9.4/arch/s390/include/asm/tlb.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/arch/s390/include/asm/tlb.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -24,6 +24,7 @@ #include #include @@ -611,9 +542,9 @@ diff -NurpP --minimal linux-3.9.4/arch/s390/include/asm/tlb.h linux-3.9.4-vs2.3. #include #include #include -diff -NurpP --minimal linux-3.9.4/arch/s390/include/uapi/asm/unistd.h linux-3.9.4-vs2.3.6.1/arch/s390/include/uapi/asm/unistd.h ---- linux-3.9.4/arch/s390/include/uapi/asm/unistd.h 2013-02-19 13:57:16.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/arch/s390/include/uapi/asm/unistd.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -200,7 +200,7 @@ #define __NR_clock_gettime (__NR_timer_create+6) #define __NR_clock_getres (__NR_timer_create+7) @@ -623,9 +554,9 @@ diff -NurpP --minimal linux-3.9.4/arch/s390/include/uapi/asm/unistd.h linux-3.9. #define __NR_statfs64 265 #define __NR_fstatfs64 266 #define __NR_remap_file_pages 267 -diff -NurpP --minimal linux-3.9.4/arch/s390/kernel/ptrace.c linux-3.9.4-vs2.3.6.1/arch/s390/kernel/ptrace.c ---- linux-3.9.4/arch/s390/kernel/ptrace.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/arch/s390/kernel/ptrace.c 2013-05-31 14:47:11.000000000 +0000 +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 @@ -21,6 +21,7 @@ #include #include @@ -634,22 +565,22 @@ diff -NurpP --minimal linux-3.9.4/arch/s390/kernel/ptrace.c linux-3.9.4-vs2.3.6. #include #include #include -diff -NurpP --minimal linux-3.9.4/arch/s390/kernel/syscalls.S linux-3.9.4-vs2.3.6.1/arch/s390/kernel/syscalls.S ---- linux-3.9.4/arch/s390/kernel/syscalls.S 2013-05-31 13:44:45.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/arch/s390/kernel/syscalls.S 2013-05-31 14:47:11.000000000 +0000 +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,sys32_clock_gettime_wrapper) /* 260 */ - SYSCALL(sys_clock_getres,sys_clock_getres,sys32_clock_getres_wrapper) - SYSCALL(sys_clock_nanosleep,sys_clock_nanosleep,sys32_clock_nanosleep_wrapper) + 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 */ +SYSCALL(sys_vserver,sys_vserver,sys32_vserver) - SYSCALL(sys_s390_fadvise64_64,sys_ni_syscall,sys32_fadvise64_64_wrapper) - SYSCALL(sys_statfs64,sys_statfs64,compat_sys_statfs64_wrapper) - SYSCALL(sys_fstatfs64,sys_fstatfs64,compat_sys_fstatfs64_wrapper) -diff -NurpP --minimal linux-3.9.4/arch/sh/Kconfig linux-3.9.4-vs2.3.6.1/arch/sh/Kconfig ---- linux-3.9.4/arch/sh/Kconfig 2013-05-31 13:44:45.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/arch/sh/Kconfig 2013-05-31 14:47:11.000000000 +0000 -@@ -951,6 +951,8 @@ source "fs/Kconfig" + 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" source "arch/sh/Kconfig.debug" @@ -658,9 +589,9 @@ diff -NurpP --minimal linux-3.9.4/arch/sh/Kconfig linux-3.9.4-vs2.3.6.1/arch/sh/ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.9.4/arch/sh/kernel/irq.c linux-3.9.4-vs2.3.6.1/arch/sh/kernel/irq.c ---- linux-3.9.4/arch/sh/kernel/irq.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/arch/sh/kernel/irq.c 2013-05-31 14:47:11.000000000 +0000 +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 @@ -14,6 +14,7 @@ #include #include @@ -669,10 +600,10 @@ diff -NurpP --minimal linux-3.9.4/arch/sh/kernel/irq.c linux-3.9.4-vs2.3.6.1/arc #include #include #include -diff -NurpP --minimal linux-3.9.4/arch/sparc/Kconfig linux-3.9.4-vs2.3.6.1/arch/sparc/Kconfig ---- linux-3.9.4/arch/sparc/Kconfig 2013-05-31 13:44:47.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/arch/sparc/Kconfig 2013-05-31 14:47:11.000000000 +0000 -@@ -559,6 +559,8 @@ source "fs/Kconfig" +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" source "arch/sparc/Kconfig.debug" @@ -681,9 +612,9 @@ diff -NurpP --minimal linux-3.9.4/arch/sparc/Kconfig linux-3.9.4-vs2.3.6.1/arch/ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.9.4/arch/sparc/include/uapi/asm/unistd.h linux-3.9.4-vs2.3.6.1/arch/sparc/include/uapi/asm/unistd.h ---- linux-3.9.4/arch/sparc/include/uapi/asm/unistd.h 2013-02-19 13:57:17.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/arch/sparc/include/uapi/asm/unistd.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -332,7 +332,7 @@ #define __NR_timer_getoverrun 264 #define __NR_timer_delete 265 @@ -693,9 +624,9 @@ diff -NurpP --minimal linux-3.9.4/arch/sparc/include/uapi/asm/unistd.h linux-3.9 #define __NR_io_setup 268 #define __NR_io_destroy 269 #define __NR_io_submit 270 -diff -NurpP --minimal linux-3.9.4/arch/sparc/kernel/systbls_32.S linux-3.9.4-vs2.3.6.1/arch/sparc/kernel/systbls_32.S ---- linux-3.9.4/arch/sparc/kernel/systbls_32.S 2013-05-31 13:44:48.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/arch/sparc/kernel/systbls_32.S 2013-05-31 14:47:11.000000000 +0000 +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 @@ -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 @@ -705,9 +636,9 @@ diff -NurpP --minimal linux-3.9.4/arch/sparc/kernel/systbls_32.S linux-3.9.4-vs2 /*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.9.4/arch/sparc/kernel/systbls_64.S linux-3.9.4-vs2.3.6.1/arch/sparc/kernel/systbls_64.S ---- linux-3.9.4/arch/sparc/kernel/systbls_64.S 2013-05-31 13:44:48.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/arch/sparc/kernel/systbls_64.S 2013-05-31 14:47:11.000000000 +0000 +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 @@ -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 @@ -717,7 +648,7 @@ diff -NurpP --minimal linux-3.9.4/arch/sparc/kernel/systbls_64.S linux-3.9.4-vs2 /*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 -@@ -149,7 +149,7 @@ sys_call_table: +@@ -150,7 +150,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 @@ -726,9 +657,9 @@ diff -NurpP --minimal linux-3.9.4/arch/sparc/kernel/systbls_64.S linux-3.9.4-vs2 /*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.9.4/arch/um/Kconfig.rest linux-3.9.4-vs2.3.6.1/arch/um/Kconfig.rest ---- linux-3.9.4/arch/um/Kconfig.rest 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/arch/um/Kconfig.rest 2013-05-31 14:47:11.000000000 +0000 +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 @@ -12,6 +12,8 @@ source "arch/um/Kconfig.net" source "fs/Kconfig" @@ -738,59 +669,10 @@ diff -NurpP --minimal linux-3.9.4/arch/um/Kconfig.rest linux-3.9.4-vs2.3.6.1/arc source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.9.4/arch/um/include/shared/kern_constants.h linux-3.9.4-vs2.3.6.1/arch/um/include/shared/kern_constants.h ---- linux-3.9.4/arch/um/include/shared/kern_constants.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/arch/um/include/shared/kern_constants.h 2013-05-31 14:47:11.000000000 +0000 -@@ -0,0 +1 @@ -+#include "../../../../include/generated/asm-offsets.h" -diff -NurpP --minimal linux-3.9.4/arch/um/include/shared/user_constants.h linux-3.9.4-vs2.3.6.1/arch/um/include/shared/user_constants.h ---- linux-3.9.4/arch/um/include/shared/user_constants.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/arch/um/include/shared/user_constants.h 2013-05-31 14:47:11.000000000 +0000 -@@ -0,0 +1,40 @@ -+/* -+ * DO NOT MODIFY. -+ * -+ * This file was generated by arch/um/Makefile -+ * -+ */ -+ -+#define HOST_SC_CR2 176 /* offsetof(struct sigcontext, cr2) # */ -+#define HOST_SC_ERR 152 /* offsetof(struct sigcontext, err) # */ -+#define HOST_SC_TRAPNO 160 /* offsetof(struct sigcontext, trapno) # */ -+#define HOST_FP_SIZE 64 /* sizeof(struct _fpstate) / sizeof(unsigned long) # */ -+#define HOST_RBX 5 /* RBX # */ -+#define HOST_RCX 11 /* RCX # */ -+#define HOST_RDI 14 /* RDI # */ -+#define HOST_RSI 13 /* RSI # */ -+#define HOST_RDX 12 /* RDX # */ -+#define HOST_RBP 4 /* RBP # */ -+#define HOST_RAX 10 /* RAX # */ -+#define HOST_R8 9 /* R8 # */ -+#define HOST_R9 8 /* R9 # */ -+#define HOST_R10 7 /* R10 # */ -+#define HOST_R11 6 /* R11 # */ -+#define HOST_R12 3 /* R12 # */ -+#define HOST_R13 2 /* R13 # */ -+#define HOST_R14 1 /* R14 # */ -+#define HOST_R15 0 /* R15 # */ -+#define HOST_ORIG_RAX 15 /* ORIG_RAX # */ -+#define HOST_CS 17 /* CS # */ -+#define HOST_SS 20 /* SS # */ -+#define HOST_EFLAGS 18 /* EFLAGS # */ -+#define HOST_IP 16 /* RIP # */ -+#define HOST_SP 19 /* RSP # */ -+#define UM_FRAME_SIZE 216 /* sizeof(struct user_regs_struct) # */ -+#define UM_POLLIN 1 /* POLLIN # */ -+#define UM_POLLPRI 2 /* POLLPRI # */ -+#define UM_POLLOUT 4 /* POLLOUT # */ -+#define UM_PROT_READ 1 /* PROT_READ # */ -+#define UM_PROT_WRITE 2 /* PROT_WRITE # */ -+#define UM_PROT_EXEC 4 /* PROT_EXEC # */ -+ -diff -NurpP --minimal linux-3.9.4/arch/x86/Kconfig linux-3.9.4-vs2.3.6.1/arch/x86/Kconfig ---- linux-3.9.4/arch/x86/Kconfig 2013-05-31 14:22:26.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/arch/x86/Kconfig 2013-05-31 14:47:11.000000000 +0000 -@@ -2341,6 +2341,8 @@ source "fs/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" source "arch/x86/Kconfig.debug" @@ -799,9 +681,9 @@ diff -NurpP --minimal linux-3.9.4/arch/x86/Kconfig linux-3.9.4-vs2.3.6.1/arch/x8 source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.9.4/arch/x86/syscalls/syscall_32.tbl linux-3.9.4-vs2.3.6.1/arch/x86/syscalls/syscall_32.tbl ---- linux-3.9.4/arch/x86/syscalls/syscall_32.tbl 2013-05-31 13:44:50.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/arch/x86/syscalls/syscall_32.tbl 2013-05-31 14:47:11.000000000 +0000 +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 @@ -279,7 +279,7 @@ 270 i386 tgkill sys_tgkill 271 i386 utimes sys_utimes compat_sys_utimes @@ -811,9 +693,9 @@ diff -NurpP --minimal linux-3.9.4/arch/x86/syscalls/syscall_32.tbl linux-3.9.4-v 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.9.4/arch/x86/syscalls/syscall_64.tbl linux-3.9.4-vs2.3.6.1/arch/x86/syscalls/syscall_64.tbl ---- linux-3.9.4/arch/x86/syscalls/syscall_64.tbl 2013-05-31 13:44:50.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/arch/x86/syscalls/syscall_64.tbl 2013-05-31 14:47:11.000000000 +0000 +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 @@ -242,7 +242,7 @@ 233 common epoll_ctl sys_epoll_ctl 234 common tgkill sys_tgkill @@ -823,10 +705,39 @@ diff -NurpP --minimal linux-3.9.4/arch/x86/syscalls/syscall_64.tbl linux-3.9.4-v 237 common mbind sys_mbind 238 common set_mempolicy sys_set_mempolicy 239 common get_mempolicy sys_get_mempolicy -diff -NurpP --minimal linux-3.9.4/drivers/block/Kconfig linux-3.9.4-vs2.3.6.1/drivers/block/Kconfig ---- linux-3.9.4/drivers/block/Kconfig 2013-05-31 13:44:51.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/drivers/block/Kconfig 2013-05-31 14:47:11.000000000 +0000 -@@ -278,6 +278,13 @@ config BLK_DEV_CRYPTOLOOP +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 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + int set_task_ioprio(struct task_struct *task, int ioprio) + { +@@ -105,6 +106,8 @@ SYSCALL_DEFINE3(ioprio_set, int, which, + else + pgrp = find_vpid(who); + do_each_pid_thread(pgrp, PIDTYPE_PGID, p) { ++ if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT)) ++ continue; + ret = set_task_ioprio(p, ioprio); + if (ret) + break; +@@ -200,6 +203,8 @@ SYSCALL_DEFINE2(ioprio_get, int, which, + else + pgrp = find_vpid(who); + do_each_pid_thread(pgrp, PIDTYPE_PGID, p) { ++ if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT)) ++ continue; + 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 +@@ -283,6 +283,13 @@ config BLK_DEV_CRYPTOLOOP source "drivers/block/drbd/Kconfig" @@ -840,29 +751,29 @@ diff -NurpP --minimal linux-3.9.4/drivers/block/Kconfig linux-3.9.4-vs2.3.6.1/dr config BLK_DEV_NBD tristate "Network block device support" depends on NET -diff -NurpP --minimal linux-3.9.4/drivers/block/Makefile linux-3.9.4-vs2.3.6.1/drivers/block/Makefile ---- linux-3.9.4/drivers/block/Makefile 2013-05-31 13:44:51.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/drivers/block/Makefile 2013-05-31 14:47:11.000000000 +0000 +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 - obj-$(CONFIG_VIODASD) += viodasd.o + obj-$(CONFIG_BLK_DEV_SX8) += sx8.o obj-$(CONFIG_BLK_DEV_HD) += hd.o +obj-$(CONFIG_BLK_DEV_VROOT) += vroot.o obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o obj-$(CONFIG_XEN_BLKDEV_BACKEND) += xen-blkback/ -diff -NurpP --minimal linux-3.9.4/drivers/block/loop.c linux-3.9.4-vs2.3.6.1/drivers/block/loop.c ---- linux-3.9.4/drivers/block/loop.c 2013-05-31 13:44:51.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/drivers/block/loop.c 2013-05-31 14:47:11.000000000 +0000 -@@ -76,6 +76,7 @@ +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 #include #include +#include + #include "loop.h" #include - -@@ -882,6 +883,7 @@ static int loop_set_fd(struct loop_devic +@@ -885,6 +886,7 @@ static int loop_set_fd(struct loop_devic lo->lo_blocksize = lo_blocksize; lo->lo_device = bdev; lo->lo_flags = lo_flags; @@ -870,7 +781,7 @@ diff -NurpP --minimal linux-3.9.4/drivers/block/loop.c linux-3.9.4-vs2.3.6.1/dri lo->lo_backing_file = file; lo->transfer = transfer_none; lo->ioctl = NULL; -@@ -1033,6 +1035,7 @@ static int loop_clr_fd(struct loop_devic +@@ -1029,6 +1031,7 @@ static int loop_clr_fd(struct loop_devic lo->lo_sizelimit = 0; lo->lo_encrypt_key_size = 0; lo->lo_thread = NULL; @@ -878,7 +789,7 @@ diff -NurpP --minimal linux-3.9.4/drivers/block/loop.c linux-3.9.4-vs2.3.6.1/dri 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); -@@ -1076,7 +1079,7 @@ loop_set_status(struct loop_device *lo, +@@ -1072,7 +1075,7 @@ loop_set_status(struct loop_device *lo, if (lo->lo_encrypt_key_size && !uid_eq(lo->lo_key_owner, uid) && @@ -887,7 +798,7 @@ diff -NurpP --minimal linux-3.9.4/drivers/block/loop.c linux-3.9.4-vs2.3.6.1/dri return -EPERM; if (lo->lo_state != Lo_bound) return -ENXIO; -@@ -1166,7 +1169,8 @@ loop_get_status(struct loop_device *lo, +@@ -1162,7 +1165,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; @@ -897,7 +808,7 @@ diff -NurpP --minimal linux-3.9.4/drivers/block/loop.c linux-3.9.4-vs2.3.6.1/dri info->lo_encrypt_key_size = lo->lo_encrypt_key_size; memcpy(info->lo_encrypt_key, lo->lo_encrypt_key, lo->lo_encrypt_key_size); -@@ -1508,6 +1512,11 @@ static int lo_open(struct block_device * +@@ -1504,6 +1508,11 @@ static int lo_open(struct block_device * goto out; } @@ -909,10 +820,21 @@ diff -NurpP --minimal linux-3.9.4/drivers/block/loop.c linux-3.9.4-vs2.3.6.1/dri mutex_lock(&lo->lo_ctl_mutex); lo->lo_refcnt++; mutex_unlock(&lo->lo_ctl_mutex); -diff -NurpP --minimal linux-3.9.4/drivers/block/vroot.c linux-3.9.4-vs2.3.6.1/drivers/block/vroot.c ---- linux-3.9.4/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/drivers/block/vroot.c 2013-05-31 14:47:11.000000000 +0000 -@@ -0,0 +1,291 @@ +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 { + struct loop_func_table *lo_encryption; + __u32 lo_init[2]; + kuid_t lo_key_owner; /* Who set the key */ ++ vxid_t lo_xid; + 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 +@@ -0,0 +1,290 @@ +/* + * linux/drivers/block/vroot.c + * @@ -1043,14 +965,13 @@ diff -NurpP --minimal linux-3.9.4/drivers/block/vroot.c linux-3.9.4-vs2.3.6.1/dr + return 0; +} + -+static int vr_release(struct gendisk *disk, fmode_t mode) ++static void vr_release(struct gendisk *disk, fmode_t mode) +{ + struct vroot_device *vr = disk->private_data; + + down(&vr->vr_ctl_mutex); + --vr->vr_refcnt; + up(&vr->vr_ctl_mutex); -+ return 0; +} + +static struct block_device_operations vr_fops = { @@ -1204,22 +1125,10 @@ diff -NurpP --minimal linux-3.9.4/drivers/block/vroot.c linux-3.9.4-vs2.3.6.1/dr + +#endif + -diff -NurpP --minimal linux-3.9.4/drivers/infiniband/Kconfig linux-3.9.4-vs2.3.6.1/drivers/infiniband/Kconfig ---- linux-3.9.4/drivers/infiniband/Kconfig 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/drivers/infiniband/Kconfig 2013-05-31 14:47:11.000000000 +0000 -@@ -39,7 +39,7 @@ config INFINIBAND_USER_MEM - config INFINIBAND_ADDR_TRANS - bool - depends on INET -- depends on !(INFINIBAND = y && IPV6 = m) -+ depends on !(INFINIBAND = y && IPV6 = y) - default y - - source "drivers/infiniband/hw/mthca/Kconfig" -diff -NurpP --minimal linux-3.9.4/drivers/infiniband/core/addr.c linux-3.9.4-vs2.3.6.1/drivers/infiniband/core/addr.c ---- linux-3.9.4/drivers/infiniband/core/addr.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/drivers/infiniband/core/addr.c 2013-05-31 14:47:11.000000000 +0000 -@@ -261,7 +261,7 @@ static int addr6_resolve(struct sockaddr +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 if (ipv6_addr_any(&fl6.saddr)) { ret = ipv6_dev_get_saddr(&init_net, ip6_dst_idev(dst)->dev, @@ -1228,9 +1137,9 @@ diff -NurpP --minimal linux-3.9.4/drivers/infiniband/core/addr.c linux-3.9.4-vs2 if (ret) goto put; -diff -NurpP --minimal linux-3.9.4/drivers/md/dm-ioctl.c linux-3.9.4-vs2.3.6.1/drivers/md/dm-ioctl.c ---- linux-3.9.4/drivers/md/dm-ioctl.c 2013-05-31 13:44:59.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/drivers/md/dm-ioctl.c 2013-05-31 14:47:11.000000000 +0000 +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 @@ -16,6 +16,7 @@ #include #include @@ -1239,7 +1148,7 @@ diff -NurpP --minimal linux-3.9.4/drivers/md/dm-ioctl.c linux-3.9.4-vs2.3.6.1/dr #include -@@ -106,7 +107,8 @@ static struct hash_cell *__get_name_cell +@@ -114,7 +115,8 @@ static struct hash_cell *__get_name_cell unsigned int h = hash_str(str); list_for_each_entry (hc, _name_buckets + h, name_list) @@ -1249,7 +1158,7 @@ diff -NurpP --minimal linux-3.9.4/drivers/md/dm-ioctl.c linux-3.9.4-vs2.3.6.1/dr dm_get(hc->md); return hc; } -@@ -120,7 +122,8 @@ static struct hash_cell *__get_uuid_cell +@@ -128,7 +130,8 @@ static struct hash_cell *__get_uuid_cell unsigned int h = hash_str(str); list_for_each_entry (hc, _uuid_buckets + h, uuid_list) @@ -1259,7 +1168,7 @@ diff -NurpP --minimal linux-3.9.4/drivers/md/dm-ioctl.c linux-3.9.4-vs2.3.6.1/dr dm_get(hc->md); return hc; } -@@ -131,13 +134,15 @@ static struct hash_cell *__get_uuid_cell +@@ -139,13 +142,15 @@ static struct hash_cell *__get_uuid_cell static struct hash_cell *__get_dev_cell(uint64_t dev) { struct mapped_device *md; @@ -1277,17 +1186,17 @@ diff -NurpP --minimal linux-3.9.4/drivers/md/dm-ioctl.c linux-3.9.4-vs2.3.6.1/dr if (!hc) { dm_put(md); return NULL; -@@ -445,6 +450,9 @@ typedef int (*ioctl_fn)(struct dm_ioctl +@@ -467,6 +472,9 @@ typedef int (*ioctl_fn)(struct dm_ioctl static int remove_all(struct dm_ioctl *param, size_t param_size) { + if (!vx_check(0, VS_ADMIN)) + return -EPERM; + - dm_hash_remove_all(1); + dm_hash_remove_all(true, !!(param->flags & DM_DEFERRED_REMOVE), false); param->data_size = 0; return 0; -@@ -492,6 +500,8 @@ static int list_devices(struct dm_ioctl +@@ -514,6 +522,8 @@ static int list_devices(struct dm_ioctl */ for (i = 0; i < NUM_BUCKETS; i++) { list_for_each_entry (hc, _name_buckets + i, name_list) { @@ -1296,7 +1205,7 @@ diff -NurpP --minimal linux-3.9.4/drivers/md/dm-ioctl.c linux-3.9.4-vs2.3.6.1/dr needed += sizeof(struct dm_name_list); needed += strlen(hc->name) + 1; needed += ALIGN_MASK; -@@ -515,6 +525,8 @@ static int list_devices(struct dm_ioctl +@@ -537,6 +547,8 @@ static int list_devices(struct dm_ioctl */ for (i = 0; i < NUM_BUCKETS; i++) { list_for_each_entry (hc, _name_buckets + i, name_list) { @@ -1305,7 +1214,7 @@ diff -NurpP --minimal linux-3.9.4/drivers/md/dm-ioctl.c linux-3.9.4-vs2.3.6.1/dr if (old_nl) old_nl->next = (uint32_t) ((void *) nl - (void *) old_nl); -@@ -1722,8 +1734,8 @@ static int ctl_ioctl(uint command, struc +@@ -1797,8 +1809,8 @@ static int ctl_ioctl(uint command, struc size_t input_param_size; struct dm_ioctl param_kernel; @@ -1316,9 +1225,9 @@ diff -NurpP --minimal linux-3.9.4/drivers/md/dm-ioctl.c linux-3.9.4-vs2.3.6.1/dr return -EACCES; if (_IOC_TYPE(command) != DM_IOCTL) -diff -NurpP --minimal linux-3.9.4/drivers/md/dm.c linux-3.9.4-vs2.3.6.1/drivers/md/dm.c ---- linux-3.9.4/drivers/md/dm.c 2013-05-31 13:44:59.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/drivers/md/dm.c 2013-05-31 14:47:11.000000000 +0000 +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 #include @@ -1327,15 +1236,15 @@ diff -NurpP --minimal linux-3.9.4/drivers/md/dm.c linux-3.9.4-vs2.3.6.1/drivers/ #include -@@ -125,6 +126,7 @@ struct mapped_device { - rwlock_t map_lock; +@@ -134,6 +135,7 @@ struct mapped_device { + struct mutex suspend_lock; atomic_t holders; atomic_t open_count; -+ xid_t xid; - - unsigned long flags; ++ vxid_t xid; -@@ -317,6 +319,7 @@ int dm_deleting_md(struct mapped_device + /* + * The current mapping. +@@ -397,6 +399,7 @@ int dm_deleting_md(struct mapped_device static int dm_blk_open(struct block_device *bdev, fmode_t mode) { struct mapped_device *md; @@ -1343,7 +1252,7 @@ diff -NurpP --minimal linux-3.9.4/drivers/md/dm.c linux-3.9.4-vs2.3.6.1/drivers/ spin_lock(&_minor_lock); -@@ -325,18 +328,19 @@ static int dm_blk_open(struct block_devi +@@ -405,18 +408,19 @@ static int dm_blk_open(struct block_devi goto out; if (test_bit(DMF_FREEING, &md->flags) || @@ -1368,15 +1277,15 @@ diff -NurpP --minimal linux-3.9.4/drivers/md/dm.c linux-3.9.4-vs2.3.6.1/drivers/ + return ret; } - static int dm_blk_close(struct gendisk *disk, fmode_t mode) -@@ -547,6 +551,14 @@ int dm_set_geometry(struct mapped_device + static void dm_blk_close(struct gendisk *disk, fmode_t mode) +@@ -819,6 +823,14 @@ int dm_set_geometry(struct mapped_device return 0; } +/* + * Get the xid associated with a dm device + */ -+xid_t dm_get_xid(struct mapped_device *md) ++vxid_t dm_get_xid(struct mapped_device *md) +{ + return md->xid; +} @@ -1384,46 +1293,46 @@ diff -NurpP --minimal linux-3.9.4/drivers/md/dm.c linux-3.9.4-vs2.3.6.1/drivers/ /*----------------------------------------------------------------- * CRUD START: * A more elegant soln is in the works that uses the queue -@@ -1884,6 +1896,7 @@ static struct mapped_device *alloc_dev(i - INIT_LIST_HEAD(&md->uevent_list); +@@ -2077,6 +2089,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.9.4/drivers/md/dm.h linux-3.9.4-vs2.3.6.1/drivers/md/dm.h ---- linux-3.9.4/drivers/md/dm.h 2013-02-19 13:57:51.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/drivers/md/dm.h 2013-05-31 14:47:11.000000000 +0000 -@@ -46,6 +46,8 @@ struct dm_dev_internal { +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 { struct dm_table; struct dm_md_mempools; -+xid_t dm_get_xid(struct mapped_device *md); ++vxid_t dm_get_xid(struct mapped_device *md); + /*----------------------------------------------------------------- * Internal table functions. *---------------------------------------------------------------*/ -diff -NurpP --minimal linux-3.9.4/drivers/net/tun.c linux-3.9.4-vs2.3.6.1/drivers/net/tun.c ---- linux-3.9.4/drivers/net/tun.c 2013-05-31 14:22:27.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/drivers/net/tun.c 2013-05-31 20:01:45.000000000 +0000 -@@ -64,6 +64,7 @@ +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 +@@ -65,6 +65,7 @@ #include #include #include +#include + #include #include #include - #include -@@ -164,6 +165,7 @@ struct tun_struct { +@@ -171,6 +172,7 @@ struct tun_struct { unsigned int flags; kuid_t owner; kgid_t group; -+ nid_t nid; ++ vnid_t nid; struct net_device *dev; netdev_features_t set_features; -@@ -380,6 +382,7 @@ static inline bool tun_not_capable(struc +@@ -404,6 +406,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); @@ -1431,7 +1340,7 @@ diff -NurpP --minimal linux-3.9.4/drivers/net/tun.c linux-3.9.4-vs2.3.6.1/driver } static void tun_set_real_num_queues(struct tun_struct *tun) -@@ -1404,6 +1407,7 @@ static void tun_setup(struct net_device +@@ -1413,6 +1416,7 @@ static void tun_setup(struct net_device tun->owner = INVALID_UID; tun->group = INVALID_GID; @@ -1439,26 +1348,16 @@ diff -NurpP --minimal linux-3.9.4/drivers/net/tun.c linux-3.9.4-vs2.3.6.1/driver dev->ethtool_ops = &tun_ethtool_ops; dev->destructor = tun_free_netdev; -@@ -1591,6 +1595,9 @@ static int tun_set_iff(struct net *net, - if (err < 0) - return err; - -+ if (!nx_check(tun->nid, VS_IDENT | VS_HOSTID | VS_ADMIN_P)) -+ return -EPERM; -+ - err = tun_attach(tun, file); - if (err < 0) - return err; -@@ -1605,7 +1612,7 @@ static int tun_set_iff(struct net *net, +@@ -1629,7 +1633,7 @@ static int tun_set_iff(struct net *net, int queues = ifr->ifr_flags & IFF_MULTI_QUEUE ? MAX_TAP_QUEUES : 1; - if (!ns_capable(net->user_ns, CAP_NET_ADMIN)) -+ if (!vx_ns_capable(net->user_ns, CAP_NET_ADMIN, NXC_TUN_CREATE)) ++ if (!nx_ns_capable(net->user_ns, CAP_NET_ADMIN, NXC_TUN_CREATE)) return -EPERM; err = security_tun_dev_create(); if (err < 0) -@@ -1950,6 +1957,16 @@ static long __tun_chr_ioctl(struct file +@@ -1996,6 +2000,16 @@ static long __tun_chr_ioctl(struct file from_kgid(&init_user_ns, tun->group)); break; @@ -1467,7 +1366,7 @@ diff -NurpP --minimal linux-3.9.4/drivers/net/tun.c linux-3.9.4-vs2.3.6.1/driver + return -EPERM; + + /* Set nid owner of the device */ -+ tun->nid = (nid_t) arg; ++ tun->nid = (vnid_t) arg; + + tun_debug(KERN_INFO, tun, "nid owner set to %u\n", tun->nid); + break; @@ -1475,57 +1374,31 @@ diff -NurpP --minimal linux-3.9.4/drivers/net/tun.c linux-3.9.4-vs2.3.6.1/driver case TUNSETLINK: /* Only allow setting the type when the interface is down */ if (tun->dev->flags & IFF_UP) { -diff -NurpP --minimal linux-3.9.4/drivers/staging/csr/csr_wifi_hip_xbv.c linux-3.9.4-vs2.3.6.1/drivers/staging/csr/csr_wifi_hip_xbv.c ---- linux-3.9.4/drivers/staging/csr/csr_wifi_hip_xbv.c 2013-02-19 13:58:32.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/drivers/staging/csr/csr_wifi_hip_xbv.c 2013-05-31 14:47:11.000000000 +0000 -@@ -55,7 +55,7 @@ typedef struct - { - char t_name[4]; - u32 t_len; --} tag_t; -+} ctag_t; - - - #define TAG_EQ(i, v) (((i)[0] == (v)[0]) && \ -@@ -90,7 +90,7 @@ typedef struct - u32 ptr; - } xbv_stack_t; - --static s32 read_tag(card_t *card, ct_t *ct, tag_t *tag); -+static s32 read_tag(card_t *card, ct_t *ct, ctag_t *tag); - static s32 read_bytes(card_t *card, ct_t *ct, void *buf, u32 len); - static s32 read_uint(card_t *card, ct_t *ct, u32 *u, u32 len); - static s32 xbv_check(xbv1_t *fwinfo, const xbv_stack_t *stack, -@@ -160,7 +160,7 @@ static u32 write_fwdl_to_ptdl(void *buf, - CsrResult xbv1_parse(card_t *card, fwreadfn_t readfn, void *dlpriv, xbv1_t *fwinfo) - { - ct_t ct; -- tag_t tag; -+ ctag_t tag; - xbv_stack_t stack; - - ct.dlpriv = dlpriv; -@@ -505,7 +505,7 @@ static u32 xbv2uint(u8 *ptr, s32 len) - } - - --static s32 read_tag(card_t *card, ct_t *ct, tag_t *tag) -+static s32 read_tag(card_t *card, ct_t *ct, ctag_t *tag) - { - u8 buf[8]; - s32 n; -diff -NurpP --minimal linux-3.9.4/drivers/tty/sysrq.c linux-3.9.4-vs2.3.6.1/drivers/tty/sysrq.c ---- linux-3.9.4/drivers/tty/sysrq.c 2013-05-31 13:45:19.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/drivers/tty/sysrq.c 2013-05-31 15:08:19.000000000 +0000 -@@ -43,6 +43,7 @@ - #include - #include - #include +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 + struct inet6_dev *idev = ip6_dst_idev((struct dst_entry *)rt); + + err = ipv6_dev_get_saddr(&init_net, idev ? idev->dev : NULL, +- &daddr6->sin6_addr, 0, &pref_saddr); ++ &daddr6->sin6_addr, 0, &pref_saddr, ++ 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 +@@ -47,6 +47,7 @@ + #include + #include + #include +#include #include #include -@@ -401,6 +402,21 @@ static struct sysrq_key_op sysrq_unrt_op +@@ -408,6 +409,21 @@ static struct sysrq_key_op sysrq_unrt_op .enable_mask = SYSRQ_ENABLE_RTNICE, }; @@ -1547,7 +1420,7 @@ diff -NurpP --minimal linux-3.9.4/drivers/tty/sysrq.c linux-3.9.4-vs2.3.6.1/driv /* Key Operations table and lock */ static DEFINE_SPINLOCK(sysrq_key_table_lock); -@@ -456,7 +472,11 @@ static struct sysrq_key_op *sysrq_key_ta +@@ -463,7 +479,11 @@ static struct sysrq_key_op *sysrq_key_ta &sysrq_showstate_blocked_op, /* w */ /* x: May be registered on ppc/powerpc for xmon */ /* x: May be registered on sparc64 for global PMU dump */ @@ -1559,7 +1432,7 @@ diff -NurpP --minimal linux-3.9.4/drivers/tty/sysrq.c linux-3.9.4-vs2.3.6.1/driv /* y: May be registered on sparc64 for global register dump */ NULL, /* y */ &sysrq_ftrace_dump_op, /* z */ -@@ -471,6 +491,8 @@ static int sysrq_key_table_key2index(int +@@ -478,6 +498,8 @@ static int sysrq_key_table_key2index(int retval = key - '0'; else if ((key >= 'a') && (key <= 'z')) retval = key + 10 - 'a'; @@ -1568,9 +1441,9 @@ diff -NurpP --minimal linux-3.9.4/drivers/tty/sysrq.c linux-3.9.4-vs2.3.6.1/driv else retval = -1; return retval; -diff -NurpP --minimal linux-3.9.4/drivers/tty/tty_io.c linux-3.9.4-vs2.3.6.1/drivers/tty/tty_io.c ---- linux-3.9.4/drivers/tty/tty_io.c 2013-05-31 14:22:27.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/drivers/tty/tty_io.c 2013-05-31 14:47:11.000000000 +0000 +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 @@ -104,6 +104,7 @@ #include @@ -1579,7 +1452,7 @@ diff -NurpP --minimal linux-3.9.4/drivers/tty/tty_io.c linux-3.9.4-vs2.3.6.1/dri #undef TTY_DEBUG_HANGUP -@@ -2144,7 +2145,8 @@ static int tiocsti(struct tty_struct *tt +@@ -2237,7 +2238,8 @@ static int tiocsti(struct tty_struct *tt char ch, mbz = 0; struct tty_ldisc *ld; @@ -1589,7 +1462,7 @@ diff -NurpP --minimal linux-3.9.4/drivers/tty/tty_io.c linux-3.9.4-vs2.3.6.1/dri return -EPERM; if (get_user(ch, p)) return -EFAULT; -@@ -2432,6 +2434,7 @@ static int tiocspgrp(struct tty_struct * +@@ -2525,6 +2527,7 @@ static int tiocspgrp(struct tty_struct * return -ENOTTY; if (get_user(pgrp_nr, p)) return -EFAULT; @@ -1597,9 +1470,9 @@ diff -NurpP --minimal linux-3.9.4/drivers/tty/tty_io.c linux-3.9.4-vs2.3.6.1/dri if (pgrp_nr < 0) return -EINVAL; rcu_read_lock(); -diff -NurpP --minimal linux-3.9.4/fs/attr.c linux-3.9.4-vs2.3.6.1/fs/attr.c ---- linux-3.9.4/fs/attr.c 2013-02-19 13:58:46.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/attr.c 2013-05-31 14:47:11.000000000 +0000 +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 @@ -15,6 +15,9 @@ #include #include @@ -1630,7 +1503,7 @@ diff -NurpP --minimal linux-3.9.4/fs/attr.c linux-3.9.4-vs2.3.6.1/fs/attr.c if (ia_valid & ATTR_ATIME) inode->i_atime = timespec_trunc(attr->ia_atime, inode->i_sb->s_time_gran); -@@ -177,7 +186,8 @@ int notify_change(struct dentry * dentry +@@ -197,7 +206,8 @@ int notify_change(struct dentry * dentry WARN_ON_ONCE(!mutex_is_locked(&inode->i_mutex)); @@ -1640,18 +1513,18 @@ diff -NurpP --minimal linux-3.9.4/fs/attr.c linux-3.9.4-vs2.3.6.1/fs/attr.c if (IS_IMMUTABLE(inode) || IS_APPEND(inode)) return -EPERM; } -diff -NurpP --minimal linux-3.9.4/fs/block_dev.c linux-3.9.4-vs2.3.6.1/fs/block_dev.c ---- linux-3.9.4/fs/block_dev.c 2013-05-31 13:45:22.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/block_dev.c 2013-05-31 14:47:11.000000000 +0000 -@@ -27,6 +27,7 @@ - #include +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 @@ #include #include + #include +#include #include #include "internal.h" -@@ -528,6 +529,7 @@ struct block_device *bdget(dev_t dev) +@@ -575,6 +576,7 @@ struct block_device *bdget(dev_t dev) bdev->bd_invalidated = 0; inode->i_mode = S_IFBLK; inode->i_rdev = dev; @@ -1659,7 +1532,7 @@ diff -NurpP --minimal linux-3.9.4/fs/block_dev.c linux-3.9.4-vs2.3.6.1/fs/block_ inode->i_bdev = bdev; inode->i_data.a_ops = &def_blk_aops; mapping_set_gfp_mask(&inode->i_data, GFP_USER); -@@ -575,6 +577,11 @@ EXPORT_SYMBOL(bdput); +@@ -622,6 +624,11 @@ EXPORT_SYMBOL(bdput); static struct block_device *bd_acquire(struct inode *inode) { struct block_device *bdev; @@ -1671,7 +1544,7 @@ diff -NurpP --minimal linux-3.9.4/fs/block_dev.c linux-3.9.4-vs2.3.6.1/fs/block_ spin_lock(&bdev_lock); bdev = inode->i_bdev; -@@ -585,7 +592,7 @@ static struct block_device *bd_acquire(s +@@ -632,7 +639,7 @@ static struct block_device *bd_acquire(s } spin_unlock(&bdev_lock); @@ -1680,10 +1553,10 @@ diff -NurpP --minimal linux-3.9.4/fs/block_dev.c linux-3.9.4-vs2.3.6.1/fs/block_ if (bdev) { spin_lock(&bdev_lock); if (!inode->i_bdev) { -diff -NurpP --minimal linux-3.9.4/fs/btrfs/ctree.h linux-3.9.4-vs2.3.6.1/fs/btrfs/ctree.h ---- linux-3.9.4/fs/btrfs/ctree.h 2013-05-31 13:45:22.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/btrfs/ctree.h 2013-05-31 14:47:11.000000000 +0000 -@@ -705,11 +705,14 @@ struct btrfs_inode_item { +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 { /* modification sequence number for NFS */ __le64 sequence; @@ -1699,16 +1572,16 @@ diff -NurpP --minimal linux-3.9.4/fs/btrfs/ctree.h linux-3.9.4-vs2.3.6.1/fs/btrf struct btrfs_timespec atime; struct btrfs_timespec ctime; struct btrfs_timespec mtime; -@@ -1901,6 +1904,8 @@ struct btrfs_ioctl_defrag_range_args { - #define BTRFS_MOUNT_CHECK_INTEGRITY_INCLUDING_EXTENT_DATA (1 << 21) - #define BTRFS_MOUNT_PANIC_ON_FATAL_ERROR (1 << 22) +@@ -2098,6 +2101,8 @@ struct btrfs_ioctl_defrag_range_args { + #define BTRFS_DEFAULT_COMMIT_INTERVAL (30) + #define BTRFS_DEFAULT_MAX_INLINE (8192) +#define BTRFS_MOUNT_TAGGED (1 << 24) + #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) -@@ -2170,6 +2175,7 @@ BTRFS_SETGET_FUNCS(inode_block_group, st +@@ -2381,6 +2386,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); @@ -1716,7 +1589,7 @@ diff -NurpP --minimal linux-3.9.4/fs/btrfs/ctree.h linux-3.9.4-vs2.3.6.1/fs/btrf 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); -@@ -2223,6 +2229,10 @@ BTRFS_SETGET_FUNCS(extent_flags, struct +@@ -2453,6 +2459,10 @@ BTRFS_SETGET_FUNCS(extent_flags, struct BTRFS_SETGET_FUNCS(extent_refs_v0, struct btrfs_extent_item_v0, refs, 32); @@ -1727,18 +1600,18 @@ diff -NurpP --minimal linux-3.9.4/fs/btrfs/ctree.h linux-3.9.4-vs2.3.6.1/fs/btrf BTRFS_SETGET_FUNCS(tree_block_level, struct btrfs_tree_block_info, level, 8); -@@ -3581,6 +3591,7 @@ extern const struct dentry_operations bt - long btrfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg); +@@ -3864,6 +3874,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_sync_flags(struct inode *inode, int, int); 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.9.4/fs/btrfs/disk-io.c linux-3.9.4-vs2.3.6.1/fs/btrfs/disk-io.c ---- linux-3.9.4/fs/btrfs/disk-io.c 2013-05-31 13:45:22.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/btrfs/disk-io.c 2013-05-31 14:47:11.000000000 +0000 -@@ -2258,6 +2258,9 @@ int open_ctree(struct super_block *sb, +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, goto fail_alloc; } @@ -1748,50 +1621,52 @@ diff -NurpP --minimal linux-3.9.4/fs/btrfs/disk-io.c linux-3.9.4-vs2.3.6.1/fs/bt features = btrfs_super_incompat_flags(disk_super) & ~BTRFS_FEATURE_INCOMPAT_SUPP; if (features) { -diff -NurpP --minimal linux-3.9.4/fs/btrfs/inode.c linux-3.9.4-vs2.3.6.1/fs/btrfs/inode.c ---- linux-3.9.4/fs/btrfs/inode.c 2013-05-31 14:22:27.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/btrfs/inode.c 2013-05-31 20:42:33.000000000 +0000 -@@ -41,6 +41,7 @@ - #include +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 +@@ -43,6 +43,7 @@ #include #include + #include +#include - #include "compat.h" #include "ctree.h" #include "disk-io.h" -@@ -3312,6 +3313,8 @@ static void btrfs_read_locked_inode(stru - struct btrfs_key location; + #include "transaction.h" +@@ -3477,6 +3478,9 @@ static void btrfs_read_locked_inode(stru + unsigned long ptr; int maybe_acls; u32 rdev; -+ uid_t uid; -+ gid_t gid; ++ kuid_t kuid; ++ kgid_t kgid; ++ ktag_t ktag; int ret; bool filled = false; - -@@ -3339,8 +3342,13 @@ static void btrfs_read_locked_inode(stru + int first_xattr_slot; +@@ -3504,8 +3508,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)); - i_uid_write(inode, btrfs_inode_uid(leaf, inode_item)); - i_gid_write(inode, btrfs_inode_gid(leaf, inode_item)); + -+ uid = btrfs_inode_uid(leaf, inode_item); -+ gid = btrfs_inode_gid(leaf, inode_item); -+ i_uid_write(inode, INOTAG_UID(DX_TAG(inode), uid, gid)); -+ i_gid_write(inode, INOTAG_GID(DX_TAG(inode), uid, gid)); -+ i_tag_write(inode, INOTAG_TAG(DX_TAG(inode), uid, gid, -+ btrfs_inode_tag(leaf, inode_item))); ++ kuid = make_kuid(&init_user_ns, btrfs_inode_uid(leaf, inode_item)); ++ kgid = make_kgid(&init_user_ns, btrfs_inode_gid(leaf, inode_item)); ++ ktag = make_ktag(&init_user_ns, btrfs_inode_tag(leaf, inode_item)); ++ ++ inode->i_uid = INOTAG_KUID(DX_TAG(inode), kuid, kgid); ++ inode->i_gid = INOTAG_KGID(DX_TAG(inode), kuid, kgid); ++ 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); -@@ -3431,11 +3439,18 @@ static void fill_inode_item(struct btrfs +@@ -3629,11 +3639,18 @@ static void fill_inode_item(struct btrfs struct inode *inode) { struct btrfs_map_token token; -+ uid_t uid = TAGINO_UID(DX_TAG(inode), -+ i_uid_read(inode), i_tag_read(inode)); -+ gid_t gid = TAGINO_GID(DX_TAG(inode), -+ i_gid_read(inode), i_tag_read(inode)); ++ uid_t uid = from_kuid(&init_user_ns, ++ TAGINO_KUID(DX_TAG(inode), inode->i_uid, inode->i_tag)); ++ gid_t gid = from_kgid(&init_user_ns, ++ TAGINO_KGID(DX_TAG(inode), inode->i_gid, inode->i_tag)); btrfs_init_map_token(&token); @@ -1805,24 +1680,34 @@ diff -NurpP --minimal linux-3.9.4/fs/btrfs/inode.c linux-3.9.4-vs2.3.6.1/fs/btrf 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); -@@ -8683,11 +8698,13 @@ static const struct inode_operations btr +@@ -9459,6 +9476,7 @@ static const struct inode_operations btr .listxattr = btrfs_listxattr, .removexattr = btrfs_removexattr, .permission = btrfs_permission, + .sync_flags = btrfs_sync_flags, .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 static const struct inode_operations btrfs_dir_ro_inode_operations = { .lookup = btrfs_lookup, .permission = btrfs_permission, + .sync_flags = btrfs_sync_flags, .get_acl = btrfs_get_acl, - }; - -diff -NurpP --minimal linux-3.9.4/fs/btrfs/ioctl.c linux-3.9.4-vs2.3.6.1/fs/btrfs/ioctl.c ---- linux-3.9.4/fs/btrfs/ioctl.c 2013-05-31 14:22:27.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/btrfs/ioctl.c 2013-05-31 14:47:11.000000000 +0000 -@@ -75,10 +75,13 @@ static unsigned int btrfs_flags_to_ioctl + .set_acl = btrfs_set_acl, + .update_time = btrfs_update_time, +@@ -9537,6 +9556,7 @@ static const struct inode_operations btr + .removexattr = btrfs_removexattr, + .permission = btrfs_permission, + .fiemap = btrfs_fiemap, ++ .sync_flags = btrfs_sync_flags, + .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 { unsigned int iflags = 0; @@ -1838,7 +1723,7 @@ diff -NurpP --minimal linux-3.9.4/fs/btrfs/ioctl.c linux-3.9.4-vs2.3.6.1/fs/btrf if (flags & BTRFS_INODE_APPEND) iflags |= FS_APPEND_FL; if (flags & BTRFS_INODE_NODUMP) -@@ -95,28 +98,78 @@ static unsigned int btrfs_flags_to_ioctl +@@ -127,34 +130,84 @@ static unsigned int btrfs_flags_to_ioctl else if (flags & BTRFS_INODE_NOCOMPRESS) iflags |= FS_NOCOMP_FL; @@ -1856,36 +1741,40 @@ diff -NurpP --minimal linux-3.9.4/fs/btrfs/ioctl.c linux-3.9.4-vs2.3.6.1/fs/btrf void btrfs_update_iflags(struct inode *inode) { struct btrfs_inode *ip = BTRFS_I(inode); - -- 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); + unsigned int new_fl = 0; - if (ip->flags & BTRFS_INODE_SYNC) -- inode->i_flags |= S_SYNC; +- new_fl |= S_SYNC; if (ip->flags & BTRFS_INODE_IMMUTABLE) - inode->i_flags |= S_IMMUTABLE; + new_fl |= S_IMMUTABLE; + if (ip->flags & BTRFS_INODE_IXUNLINK) -+ inode->i_flags |= S_IXUNLINK; ++ new_fl |= S_IXUNLINK; + + if (ip->flags & BTRFS_INODE_SYNC) -+ inode->i_flags |= S_SYNC; ++ new_fl |= S_SYNC; if (ip->flags & BTRFS_INODE_APPEND) - inode->i_flags |= S_APPEND; + new_fl |= S_APPEND; if (ip->flags & BTRFS_INODE_NOATIME) - inode->i_flags |= S_NOATIME; + new_fl |= S_NOATIME; if (ip->flags & BTRFS_INODE_DIRSYNC) - inode->i_flags |= S_DIRSYNC; -+ -+ inode->i_vflags &= ~(V_BARRIER | V_COW); + new_fl |= S_DIRSYNC; +- + set_mask_bits(&inode->i_flags, +- S_SYNC | S_APPEND | S_IMMUTABLE | S_NOATIME | S_DIRSYNC, ++ S_SYNC | S_APPEND | S_IMMUTABLE | S_IXUNLINK | S_NOATIME | S_DIRSYNC, + new_fl); + ++ new_fl = 0; + if (ip->flags & BTRFS_INODE_BARRIER) -+ inode->i_vflags |= V_BARRIER; ++ new_fl |= V_BARRIER; + if (ip->flags & BTRFS_INODE_COW) -+ inode->i_vflags |= V_COW; -+} ++ new_fl |= V_COW; + -+/* ++ set_mask_bits(&inode->i_vflags, ++ V_BARRIER | V_COW, new_fl); + } + + /* + * Update btrfs internal flags from inode->i_(v)flags. + */ +void btrfs_update_flags(struct inode *inode) @@ -1918,10 +1807,13 @@ diff -NurpP --minimal linux-3.9.4/fs/btrfs/ioctl.c linux-3.9.4-vs2.3.6.1/fs/btrf + ip->flags |= BTRFS_INODE_BARRIER; + if (vflags & V_COW) + ip->flags |= BTRFS_INODE_COW; - } - - /* -@@ -132,6 +185,7 @@ void btrfs_inherit_iflags(struct inode * ++ } ++ ++/* + * 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 * return; flags = BTRFS_I(dir)->flags; @@ -1929,7 +1821,7 @@ diff -NurpP --minimal linux-3.9.4/fs/btrfs/ioctl.c linux-3.9.4-vs2.3.6.1/fs/btrf if (flags & BTRFS_INODE_NOCOMPRESS) { BTRFS_I(inode)->flags &= ~BTRFS_INODE_COMPRESS; -@@ -150,6 +204,30 @@ void btrfs_inherit_iflags(struct inode * +@@ -185,6 +239,30 @@ void btrfs_inherit_iflags(struct inode * btrfs_update_iflags(inode); } @@ -1960,7 +1852,7 @@ diff -NurpP --minimal linux-3.9.4/fs/btrfs/ioctl.c linux-3.9.4-vs2.3.6.1/fs/btrf static int btrfs_ioctl_getflags(struct file *file, void __user *arg) { struct btrfs_inode *ip = BTRFS_I(file_inode(file)); -@@ -212,21 +290,27 @@ static int btrfs_ioctl_setflags(struct f +@@ -247,21 +325,27 @@ static int btrfs_ioctl_setflags(struct f flags = btrfs_mask_flags(inode->i_mode, flags); oldflags = btrfs_flags_to_ioctl(ip->flags); @@ -1993,30 +1885,30 @@ diff -NurpP --minimal linux-3.9.4/fs/btrfs/ioctl.c linux-3.9.4-vs2.3.6.1/fs/btrf if (flags & FS_APPEND_FL) ip->flags |= BTRFS_INODE_APPEND; else -diff -NurpP --minimal linux-3.9.4/fs/btrfs/super.c linux-3.9.4-vs2.3.6.1/fs/btrfs/super.c ---- linux-3.9.4/fs/btrfs/super.c 2013-05-31 13:45:22.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/btrfs/super.c 2013-05-31 14:47:11.000000000 +0000 -@@ -321,7 +321,7 @@ enum { - Opt_no_space_cache, Opt_recovery, Opt_skip_balance, - Opt_check_integrity, Opt_check_integrity_including_extent_data, - Opt_check_integrity_print_mask, Opt_fatal_errors, +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, - Opt_err, + Opt_tag, Opt_notag, Opt_tagid, Opt_err, }; static match_table_t tokens = { -@@ -361,6 +361,9 @@ static match_table_t tokens = { - {Opt_check_integrity_including_extent_data, "check_int_data"}, - {Opt_check_integrity_print_mask, "check_int_print_mask=%d"}, +@@ -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"}, + {Opt_tag, "tag"}, + {Opt_notag, "notag"}, + {Opt_tagid, "tagid=%u"}, {Opt_err, NULL}, }; -@@ -626,6 +629,22 @@ int btrfs_parse_options(struct btrfs_roo - goto out; +@@ -743,6 +746,22 @@ int btrfs_parse_options(struct btrfs_roo + info->commit_interval = BTRFS_DEFAULT_COMMIT_INTERVAL; } break; +#ifndef CONFIG_TAGGING_NONE @@ -2036,9 +1928,9 @@ diff -NurpP --minimal linux-3.9.4/fs/btrfs/super.c linux-3.9.4-vs2.3.6.1/fs/btrf + break; +#endif case Opt_err: - printk(KERN_INFO "btrfs: unrecognized mount option " - "'%s'\n", p); -@@ -1258,6 +1277,12 @@ static int btrfs_remount(struct super_bl + btrfs_info(root->fs_info, "unrecognized mount option '%s'", p); + ret = -EINVAL; +@@ -1495,6 +1514,12 @@ static int btrfs_remount(struct super_bl btrfs_resize_thread_pool(fs_info, fs_info->thread_pool_size, old_thread_pool_size); @@ -2051,9 +1943,9 @@ diff -NurpP --minimal linux-3.9.4/fs/btrfs/super.c linux-3.9.4-vs2.3.6.1/fs/btrf if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY)) goto out; -diff -NurpP --minimal linux-3.9.4/fs/char_dev.c linux-3.9.4-vs2.3.6.1/fs/char_dev.c ---- linux-3.9.4/fs/char_dev.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/char_dev.c 2013-05-31 14:47:11.000000000 +0000 +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 @@ -21,6 +21,8 @@ #include #include @@ -2063,7 +1955,7 @@ diff -NurpP --minimal linux-3.9.4/fs/char_dev.c linux-3.9.4-vs2.3.6.1/fs/char_de #include "internal.h" -@@ -371,14 +373,21 @@ static int chrdev_open(struct inode *ino +@@ -372,14 +374,21 @@ static int chrdev_open(struct inode *ino struct cdev *p; struct cdev *new = NULL; int ret = 0; @@ -2086,35 +1978,35 @@ diff -NurpP --minimal linux-3.9.4/fs/char_dev.c linux-3.9.4-vs2.3.6.1/fs/char_de if (!kobj) return -ENXIO; new = container_of(kobj, struct cdev, kobj); -diff -NurpP --minimal linux-3.9.4/fs/dcache.c linux-3.9.4-vs2.3.6.1/fs/dcache.c ---- linux-3.9.4/fs/dcache.c 2013-05-31 14:22:27.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/dcache.c 2013-05-31 14:47:11.000000000 +0000 -@@ -37,6 +37,7 @@ - #include +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 #include + #include +#include #include "internal.h" #include "mount.h" -@@ -593,6 +594,8 @@ int d_invalidate(struct dentry * dentry) - spin_lock(&dentry->d_lock); - } - -+ vx_dentry_dec(dentry); -+ - /* - * Somebody else still using it? - * -@@ -622,6 +625,7 @@ EXPORT_SYMBOL(d_invalidate); +@@ -654,6 +655,7 @@ EXPORT_SYMBOL(dput); static inline void __dget_dlock(struct dentry *dentry) { - dentry->d_count++; + dentry->d_lockref.count++; + vx_dentry_inc(dentry); } static inline void __dget(struct dentry *dentry) -@@ -1252,6 +1256,9 @@ struct dentry *__d_alloc(struct super_bl +@@ -666,6 +668,8 @@ struct dentry *dget_parent(struct dentry + int gotref; + struct dentry *ret; + ++ vx_dentry_dec(dentry); ++ + /* + * Do optimistic parent lookup without any + * locking. +@@ -1410,6 +1414,9 @@ struct dentry *__d_alloc(struct super_bl struct dentry *dentry; char *dname; @@ -2124,26 +2016,26 @@ diff -NurpP --minimal linux-3.9.4/fs/dcache.c linux-3.9.4-vs2.3.6.1/fs/dcache.c dentry = kmem_cache_alloc(dentry_cache, GFP_KERNEL); if (!dentry) return NULL; -@@ -1284,6 +1291,7 @@ struct dentry *__d_alloc(struct super_bl +@@ -1445,6 +1452,7 @@ struct dentry *__d_alloc(struct super_bl - dentry->d_count = 1; + dentry->d_lockref.count = 1; dentry->d_flags = 0; + vx_dentry_inc(dentry); spin_lock_init(&dentry->d_lock); seqcount_init(&dentry->d_seq); dentry->d_inode = NULL; -@@ -1984,6 +1992,7 @@ struct dentry *__d_lookup(const struct d +@@ -2184,6 +2192,7 @@ struct dentry *__d_lookup(const struct d } - dentry->d_count++; + dentry->d_lockref.count++; + vx_dentry_inc(dentry); found = dentry; spin_unlock(&dentry->d_lock); break; -diff -NurpP --minimal linux-3.9.4/fs/devpts/inode.c linux-3.9.4-vs2.3.6.1/fs/devpts/inode.c ---- linux-3.9.4/fs/devpts/inode.c 2013-05-31 13:45:23.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/devpts/inode.c 2013-05-31 15:42:25.000000000 +0000 -@@ -25,6 +25,7 @@ +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 +@@ -27,6 +27,7 @@ #include #include #include @@ -2151,7 +2043,7 @@ diff -NurpP --minimal linux-3.9.4/fs/devpts/inode.c linux-3.9.4-vs2.3.6.1/fs/dev #define DEVPTS_DEFAULT_MODE 0600 /* -@@ -36,6 +37,21 @@ +@@ -38,6 +39,21 @@ #define DEVPTS_DEFAULT_PTMX_MODE 0000 #define PTMX_MINOR 2 @@ -2160,7 +2052,7 @@ diff -NurpP --minimal linux-3.9.4/fs/devpts/inode.c linux-3.9.4-vs2.3.6.1/fs/dev + int ret = -EACCES; + + /* devpts is xid tagged */ -+ if (vx_check((xid_t)i_tag_read(inode), VS_WATCH_P | VS_IDENT)) ++ if (vx_check((vxid_t)i_tag_read(inode), VS_WATCH_P | VS_IDENT)) + ret = generic_permission(inode, mask); + return ret; +} @@ -2173,17 +2065,17 @@ diff -NurpP --minimal linux-3.9.4/fs/devpts/inode.c linux-3.9.4-vs2.3.6.1/fs/dev /* * 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. -@@ -345,6 +361,34 @@ static int devpts_show_options(struct se +@@ -350,6 +366,34 @@ static int devpts_show_options(struct se return 0; } +static int devpts_filter(struct dentry *de) +{ -+ xid_t xid = 0; ++ vxid_t xid = 0; + + /* devpts is xid tagged */ + if (de && de->d_inode) -+ xid = (xid_t)i_tag_read(de->d_inode); ++ xid = (vxid_t)i_tag_read(de->d_inode); +#ifdef CONFIG_VSERVER_WARN_DEVPTS + else + vxwprintk_task(1, "devpts " VS_Q("%.*s") " without inode.", @@ -2192,9 +2084,9 @@ diff -NurpP --minimal linux-3.9.4/fs/devpts/inode.c linux-3.9.4-vs2.3.6.1/fs/dev + return vx_check(xid, VS_WATCH_P | VS_IDENT); +} + -+static int devpts_readdir(struct file * filp, void * dirent, filldir_t filldir) ++static int devpts_readdir(struct file * filp, struct dir_context *ctx) +{ -+ return dcache_readdir_filter(filp, dirent, filldir, devpts_filter); ++ return dcache_readdir_filter(filp, ctx, devpts_filter); +} + +static struct file_operations devpts_dir_operations = { @@ -2202,13 +2094,13 @@ diff -NurpP --minimal linux-3.9.4/fs/devpts/inode.c linux-3.9.4-vs2.3.6.1/fs/dev + .release = dcache_dir_close, + .llseek = dcache_dir_lseek, + .read = generic_read_dir, -+ .readdir = devpts_readdir, ++ .iterate = devpts_readdir, +}; + static const struct super_operations devpts_sops = { .statfs = simple_statfs, .remount_fs = devpts_remount, -@@ -388,8 +432,10 @@ devpts_fill_super(struct super_block *s, +@@ -393,8 +437,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; @@ -2216,23 +2108,23 @@ diff -NurpP --minimal linux-3.9.4/fs/devpts/inode.c linux-3.9.4-vs2.3.6.1/fs/dev + inode->i_fop = &devpts_dir_operations; set_nlink(inode, 2); + /* devpts is xid tagged */ -+ i_tag_write(inode, (tag_t)vx_current_xid()); ++ i_tag_write(inode, (vtag_t)vx_current_xid()); s->s_root = d_make_root(inode); if (s->s_root) -@@ -592,6 +638,9 @@ struct inode *devpts_pty_new(struct inod +@@ -598,6 +644,9 @@ struct inode *devpts_pty_new(struct inod 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); + /* devpts is xid tagged */ -+ i_tag_write(inode, (tag_t)vx_current_xid()); ++ i_tag_write(inode, (vtag_t)vx_current_xid()); + inode->i_op = &devpts_file_inode_operations; inode->i_private = priv; sprintf(s, "%d", index); -diff -NurpP --minimal linux-3.9.4/fs/ext2/balloc.c linux-3.9.4-vs2.3.6.1/fs/ext2/balloc.c ---- linux-3.9.4/fs/ext2/balloc.c 2013-05-31 13:45:23.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/ext2/balloc.c 2013-05-31 14:47:11.000000000 +0000 +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 @@ -693,7 +693,6 @@ ext2_try_to_allocate(struct super_block start = 0; end = EXT2_BLOCKS_PER_GROUP(sb); @@ -2241,9 +2133,9 @@ diff -NurpP --minimal linux-3.9.4/fs/ext2/balloc.c linux-3.9.4-vs2.3.6.1/fs/ext2 BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb)); repeat: -diff -NurpP --minimal linux-3.9.4/fs/ext2/ext2.h linux-3.9.4-vs2.3.6.1/fs/ext2/ext2.h ---- linux-3.9.4/fs/ext2/ext2.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/ext2/ext2.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -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) */ @@ -2291,18 +2183,18 @@ diff -NurpP --minimal linux-3.9.4/fs/ext2/ext2.h linux-3.9.4-vs2.3.6.1/fs/ext2/e /* ioctl.c */ extern long ext2_ioctl(struct file *, unsigned int, unsigned long); -diff -NurpP --minimal linux-3.9.4/fs/ext2/file.c linux-3.9.4-vs2.3.6.1/fs/ext2/file.c ---- linux-3.9.4/fs/ext2/file.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/ext2/file.c 2013-05-31 14:47:11.000000000 +0000 -@@ -104,4 +104,5 @@ const struct inode_operations ext2_file_ - .setattr = ext2_setattr, +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_ .get_acl = ext2_get_acl, + .set_acl = ext2_set_acl, .fiemap = ext2_fiemap, + .sync_flags = ext2_sync_flags, }; -diff -NurpP --minimal linux-3.9.4/fs/ext2/ialloc.c linux-3.9.4-vs2.3.6.1/fs/ext2/ialloc.c ---- linux-3.9.4/fs/ext2/ialloc.c 2013-05-31 13:45:23.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/ext2/ialloc.c 2013-05-31 14:47:11.000000000 +0000 +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 @@ -17,6 +17,7 @@ #include #include @@ -2315,22 +2207,22 @@ diff -NurpP --minimal linux-3.9.4/fs/ext2/ialloc.c linux-3.9.4-vs2.3.6.1/fs/ext2 inode->i_mode = mode; inode->i_uid = current_fsuid(); inode->i_gid = dir->i_gid; -+ inode->i_tag = dx_current_fstag(sb); ++ i_tag_write(inode, dx_current_fstag(sb)); } else inode_init_owner(inode, dir, mode); -diff -NurpP --minimal linux-3.9.4/fs/ext2/inode.c linux-3.9.4-vs2.3.6.1/fs/ext2/inode.c ---- linux-3.9.4/fs/ext2/inode.c 2013-05-31 13:45:23.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/ext2/inode.c 2013-05-31 14:47:11.000000000 +0000 -@@ -31,6 +31,7 @@ - #include +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 @@ #include #include + #include +#include #include "ext2.h" #include "acl.h" #include "xip.h" -@@ -1179,7 +1180,7 @@ static void ext2_truncate_blocks(struct +@@ -1182,7 +1183,7 @@ static void ext2_truncate_blocks(struct return; if (ext2_inode_is_fast_symlink(inode)) return; @@ -2339,7 +2231,7 @@ diff -NurpP --minimal linux-3.9.4/fs/ext2/inode.c linux-3.9.4-vs2.3.6.1/fs/ext2/ return; __ext2_truncate_blocks(inode, offset); } -@@ -1270,36 +1271,61 @@ void ext2_set_inode_flags(struct inode * +@@ -1273,36 +1274,61 @@ void ext2_set_inode_flags(struct inode * { unsigned int flags = EXT2_I(inode)->i_flags; @@ -2408,7 +2300,7 @@ diff -NurpP --minimal linux-3.9.4/fs/ext2/inode.c linux-3.9.4-vs2.3.6.1/fs/ext2/ } struct inode *ext2_iget (struct super_block *sb, unsigned long ino) -@@ -1335,8 +1361,10 @@ struct inode *ext2_iget (struct super_bl +@@ -1338,8 +1364,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; } @@ -2421,20 +2313,20 @@ diff -NurpP --minimal linux-3.9.4/fs/ext2/inode.c linux-3.9.4-vs2.3.6.1/fs/ext2/ 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); -@@ -1434,8 +1462,10 @@ static int __ext2_write_inode(struct ino +@@ -1437,8 +1465,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; - uid_t uid = i_uid_read(inode); - gid_t gid = i_gid_read(inode); -+ uid_t uid = TAGINO_UID(DX_TAG(inode), -+ i_uid_read(inode), i_tag_read(inode)); -+ gid_t gid = TAGINO_GID(DX_TAG(inode), -+ i_gid_read(inode), i_tag_read(inode)); ++ uid_t uid = from_kuid(&init_user_ns, ++ TAGINO_KUID(DX_TAG(inode), inode->i_uid, inode->i_tag)); ++ gid_t gid = from_kgid(&init_user_ns, ++ TAGINO_KGID(DX_TAG(inode), inode->i_gid, inode->i_tag)); struct buffer_head * bh; struct ext2_inode * raw_inode = ext2_get_inode(sb, ino, &bh); int n; -@@ -1471,6 +1501,9 @@ static int __ext2_write_inode(struct ino +@@ -1474,6 +1504,9 @@ static int __ext2_write_inode(struct ino raw_inode->i_uid_high = 0; raw_inode->i_gid_high = 0; } @@ -2444,7 +2336,7 @@ diff -NurpP --minimal linux-3.9.4/fs/ext2/inode.c linux-3.9.4-vs2.3.6.1/fs/ext2/ 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); -@@ -1551,7 +1584,8 @@ int ext2_setattr(struct dentry *dentry, +@@ -1554,7 +1587,8 @@ int ext2_setattr(struct dentry *dentry, if (is_quota_modification(inode, iattr)) dquot_initialize(inode); if ((iattr->ia_valid & ATTR_UID && !uid_eq(iattr->ia_uid, inode->i_uid)) || @@ -2454,9 +2346,9 @@ diff -NurpP --minimal linux-3.9.4/fs/ext2/inode.c linux-3.9.4-vs2.3.6.1/fs/ext2/ error = dquot_transfer(inode, iattr); if (error) return error; -diff -NurpP --minimal linux-3.9.4/fs/ext2/ioctl.c linux-3.9.4-vs2.3.6.1/fs/ext2/ioctl.c ---- linux-3.9.4/fs/ext2/ioctl.c 2013-05-31 13:45:23.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/ext2/ioctl.c 2013-05-31 14:47:11.000000000 +0000 +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 @@ -17,6 +17,16 @@ #include @@ -2506,9 +2398,9 @@ diff -NurpP --minimal linux-3.9.4/fs/ext2/ioctl.c linux-3.9.4-vs2.3.6.1/fs/ext2/ flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE; ei->i_flags = flags; -diff -NurpP --minimal linux-3.9.4/fs/ext2/namei.c linux-3.9.4-vs2.3.6.1/fs/ext2/namei.c ---- linux-3.9.4/fs/ext2/namei.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/ext2/namei.c 2013-05-31 14:47:11.000000000 +0000 +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 @@ -32,6 +32,7 @@ #include @@ -2525,17 +2417,17 @@ diff -NurpP --minimal linux-3.9.4/fs/ext2/namei.c linux-3.9.4-vs2.3.6.1/fs/ext2/ } return d_splice_alias(inode, dentry); } -@@ -397,6 +399,7 @@ const struct inode_operations ext2_dir_i +@@ -433,6 +435,7 @@ const struct inode_operations ext2_speci .removexattr = generic_removexattr, #endif .setattr = ext2_setattr, + .sync_flags = ext2_sync_flags, .get_acl = ext2_get_acl, + .set_acl = ext2_set_acl, }; - -diff -NurpP --minimal linux-3.9.4/fs/ext2/super.c linux-3.9.4-vs2.3.6.1/fs/ext2/super.c ---- linux-3.9.4/fs/ext2/super.c 2013-05-31 13:45:23.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/ext2/super.c 2013-05-31 14:47:11.000000000 +0000 +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 { Opt_err_ro, Opt_nouid32, Opt_nocheck, Opt_debug, Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr, @@ -2586,7 +2478,7 @@ diff -NurpP --minimal linux-3.9.4/fs/ext2/super.c linux-3.9.4-vs2.3.6.1/fs/ext2/ sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | ((EXT2_SB(sb)->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0); -@@ -1269,6 +1289,14 @@ static int ext2_remount (struct super_bl +@@ -1270,6 +1290,14 @@ static int ext2_remount (struct super_bl err = -EINVAL; goto restore_opts; } @@ -2601,9 +2493,9 @@ diff -NurpP --minimal linux-3.9.4/fs/ext2/super.c linux-3.9.4-vs2.3.6.1/fs/ext2/ sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | ((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0); -diff -NurpP --minimal linux-3.9.4/fs/ext3/ext3.h linux-3.9.4-vs2.3.6.1/fs/ext3/ext3.h ---- linux-3.9.4/fs/ext3/ext3.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/ext3/ext3.h 2013-05-31 14:47:11.000000000 +0000 +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) */ @@ -2621,7 +2513,7 @@ diff -NurpP --minimal linux-3.9.4/fs/ext3/ext3.h linux-3.9.4-vs2.3.6.1/fs/ext3/e /* Flags that should be inherited by new inodes from their parent. */ #define EXT3_FL_INHERITED (EXT3_SECRM_FL | EXT3_UNRM_FL | EXT3_COMPR_FL |\ -@@ -290,7 +294,8 @@ struct ext3_inode { +@@ -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] */ @@ -2631,7 +2523,7 @@ diff -NurpP --minimal linux-3.9.4/fs/ext3/ext3.h linux-3.9.4-vs2.3.6.1/fs/ext3/e } linux2; struct { __u8 h_i_frag; /* Fragment number */ -@@ -320,6 +325,7 @@ struct ext3_inode { +@@ -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 @@ -2639,7 +2531,7 @@ diff -NurpP --minimal linux-3.9.4/fs/ext3/ext3.h linux-3.9.4-vs2.3.6.1/fs/ext3/e #define i_reserved2 osd2.linux2.l_i_reserved2 /* -@@ -364,6 +370,7 @@ struct ext3_inode { +@@ -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 */ @@ -2647,7 +2539,7 @@ diff -NurpP --minimal linux-3.9.4/fs/ext3/ext3.h linux-3.9.4-vs2.3.6.1/fs/ext3/e /* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */ #ifndef _LINUX_EXT2_FS_H -@@ -1061,6 +1068,7 @@ extern void ext3_get_inode_flags(struct +@@ -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); @@ -2655,19 +2547,19 @@ diff -NurpP --minimal linux-3.9.4/fs/ext3/ext3.h linux-3.9.4-vs2.3.6.1/fs/ext3/e /* ioctl.c */ extern long ext3_ioctl(struct file *, unsigned int, unsigned long); -diff -NurpP --minimal linux-3.9.4/fs/ext3/file.c linux-3.9.4-vs2.3.6.1/fs/ext3/file.c ---- linux-3.9.4/fs/ext3/file.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/ext3/file.c 2013-05-31 14:47:11.000000000 +0000 -@@ -76,5 +76,6 @@ const struct inode_operations ext3_file_ - #endif +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.9.4/fs/ext3/ialloc.c linux-3.9.4-vs2.3.6.1/fs/ext3/ialloc.c ---- linux-3.9.4/fs/ext3/ialloc.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/ext3/ialloc.c 2013-05-31 14:47:11.000000000 +0000 +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 @@ -2680,23 +2572,23 @@ diff -NurpP --minimal linux-3.9.4/fs/ext3/ialloc.c linux-3.9.4-vs2.3.6.1/fs/ext3 inode->i_mode = mode; inode->i_uid = current_fsuid(); inode->i_gid = dir->i_gid; -+ inode->i_tag = dx_current_fstag(sb); ++ i_tag_write(inode, dx_current_fstag(sb)); } else inode_init_owner(inode, dir, mode); -diff -NurpP --minimal linux-3.9.4/fs/ext3/inode.c linux-3.9.4-vs2.3.6.1/fs/ext3/inode.c ---- linux-3.9.4/fs/ext3/inode.c 2013-05-31 13:45:23.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/ext3/inode.c 2013-05-31 14:47:11.000000000 +0000 -@@ -27,6 +27,8 @@ - #include +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 #include + #include +#include + #include "ext3.h" #include "xattr.h" #include "acl.h" -@@ -2851,36 +2853,60 @@ void ext3_set_inode_flags(struct inode * +@@ -2813,36 +2815,60 @@ void ext3_set_inode_flags(struct inode * { unsigned int flags = EXT3_I(inode)->i_flags; @@ -2764,7 +2656,7 @@ diff -NurpP --minimal linux-3.9.4/fs/ext3/inode.c linux-3.9.4-vs2.3.6.1/fs/ext3/ } struct inode *ext3_iget(struct super_block *sb, unsigned long ino) -@@ -2918,8 +2944,10 @@ struct inode *ext3_iget(struct super_blo +@@ -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; } @@ -2777,20 +2669,20 @@ diff -NurpP --minimal linux-3.9.4/fs/ext3/inode.c linux-3.9.4-vs2.3.6.1/fs/ext3/ 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); -@@ -3091,8 +3119,10 @@ again: +@@ -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 = TAGINO_UID(DX_TAG(inode), -+ i_uid_read(inode), i_tag_read(inode)); -+ i_gid = TAGINO_GID(DX_TAG(inode), -+ i_gid_read(inode), i_tag_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)); -@@ -3117,6 +3147,9 @@ again: +@@ -3079,6 +3109,9 @@ again: raw_inode->i_uid_high = 0; raw_inode->i_gid_high = 0; } @@ -2800,7 +2692,7 @@ diff -NurpP --minimal linux-3.9.4/fs/ext3/inode.c linux-3.9.4-vs2.3.6.1/fs/ext3/ raw_inode->i_links_count = cpu_to_le16(inode->i_nlink); disksize = cpu_to_le32(ei->i_disksize); if (disksize != raw_inode->i_size) { -@@ -3285,7 +3318,8 @@ int ext3_setattr(struct dentry *dentry, +@@ -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)) || @@ -2810,7 +2702,7 @@ diff -NurpP --minimal linux-3.9.4/fs/ext3/inode.c linux-3.9.4-vs2.3.6.1/fs/ext3/ handle_t *handle; /* (user+group)*(old+new) structure, inode write (sb, -@@ -3307,6 +3341,8 @@ int ext3_setattr(struct dentry *dentry, +@@ -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; @@ -2819,9 +2711,9 @@ diff -NurpP --minimal linux-3.9.4/fs/ext3/inode.c linux-3.9.4-vs2.3.6.1/fs/ext3/ error = ext3_mark_inode_dirty(handle, inode); ext3_journal_stop(handle); } -diff -NurpP --minimal linux-3.9.4/fs/ext3/ioctl.c linux-3.9.4-vs2.3.6.1/fs/ext3/ioctl.c ---- linux-3.9.4/fs/ext3/ioctl.c 2013-05-31 13:45:23.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/ext3/ioctl.c 2013-05-31 14:47:11.000000000 +0000 +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 #include "ext3.h" @@ -2889,9 +2781,9 @@ diff -NurpP --minimal linux-3.9.4/fs/ext3/ioctl.c linux-3.9.4-vs2.3.6.1/fs/ext3/ flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE; ei->i_flags = flags; -diff -NurpP --minimal linux-3.9.4/fs/ext3/namei.c linux-3.9.4-vs2.3.6.1/fs/ext3/namei.c ---- linux-3.9.4/fs/ext3/namei.c 2013-05-31 13:45:23.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/ext3/namei.c 2013-05-31 14:47:11.000000000 +0000 +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 @@ */ @@ -2901,7 +2793,7 @@ diff -NurpP --minimal linux-3.9.4/fs/ext3/namei.c linux-3.9.4-vs2.3.6.1/fs/ext3/ #include "ext3.h" #include "namei.h" #include "xattr.h" -@@ -918,6 +920,7 @@ restart: +@@ -915,6 +917,7 @@ restart: submit_bh(READ | REQ_META | REQ_PRIO, bh); } @@ -2909,18 +2801,18 @@ diff -NurpP --minimal linux-3.9.4/fs/ext3/namei.c linux-3.9.4-vs2.3.6.1/fs/ext3/ } } if ((bh = bh_use[ra_ptr++]) == NULL) -@@ -2527,6 +2530,7 @@ const struct inode_operations ext3_dir_i +@@ -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.9.4/fs/ext3/super.c linux-3.9.4-vs2.3.6.1/fs/ext3/super.c ---- linux-3.9.4/fs/ext3/super.c 2013-05-31 13:45:23.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/ext3/super.c 2013-05-31 14:47:11.000000000 +0000 -@@ -816,7 +816,8 @@ enum { +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, @@ -2930,7 +2822,7 @@ diff -NurpP --minimal linux-3.9.4/fs/ext3/super.c linux-3.9.4-vs2.3.6.1/fs/ext3/ }; static const match_table_t tokens = { -@@ -873,6 +874,9 @@ 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"}, @@ -2940,7 +2832,7 @@ diff -NurpP --minimal linux-3.9.4/fs/ext3/super.c linux-3.9.4-vs2.3.6.1/fs/ext3/ {Opt_err, NULL}, }; -@@ -1040,6 +1044,20 @@ static int parse_options (char *options, +@@ -1056,6 +1060,20 @@ static int parse_options (char *options, case Opt_nouid32: set_opt (sbi->s_mount_opt, NO_UID32); break; @@ -2961,7 +2853,7 @@ diff -NurpP --minimal linux-3.9.4/fs/ext3/super.c linux-3.9.4-vs2.3.6.1/fs/ext3/ case Opt_nocheck: clear_opt (sbi->s_mount_opt, CHECK); break; -@@ -1737,6 +1755,9 @@ static int ext3_fill_super (struct super +@@ -1781,6 +1799,9 @@ static int ext3_fill_super (struct super NULL, 0)) goto failed_mount; @@ -2971,7 +2863,7 @@ diff -NurpP --minimal linux-3.9.4/fs/ext3/super.c linux-3.9.4-vs2.3.6.1/fs/ext3/ sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); -@@ -2633,6 +2654,14 @@ static int ext3_remount (struct super_bl +@@ -2678,6 +2699,14 @@ static int ext3_remount (struct super_bl if (test_opt(sb, ABORT)) ext3_abort(sb, __func__, "Abort forced by user"); @@ -2986,10 +2878,10 @@ diff -NurpP --minimal linux-3.9.4/fs/ext3/super.c linux-3.9.4-vs2.3.6.1/fs/ext3/ sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); -diff -NurpP --minimal linux-3.9.4/fs/ext4/ext4.h linux-3.9.4-vs2.3.6.1/fs/ext4/ext4.h ---- linux-3.9.4/fs/ext4/ext4.h 2013-05-31 13:45:23.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/ext4/ext4.h 2013-05-31 16:22:49.000000000 +0000 -@@ -399,7 +399,10 @@ struct flex_groups { +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 { #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 */ @@ -3000,7 +2892,7 @@ diff -NurpP --minimal linux-3.9.4/fs/ext4/ext4.h linux-3.9.4-vs2.3.6.1/fs/ext4/e #define EXT4_RESERVED_FL 0x80000000 /* reserved for ext4 lib */ #define EXT4_FL_USER_VISIBLE 0x004BDFFF /* User visible flags */ -@@ -674,7 +677,7 @@ struct ext4_inode { +@@ -671,7 +674,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 */ @@ -3009,7 +2901,7 @@ diff -NurpP --minimal linux-3.9.4/fs/ext4/ext4.h linux-3.9.4-vs2.3.6.1/fs/ext4/e } linux2; struct { __le16 h_i_reserved1; /* Obsoleted fragment number/size which are removed in ext4 */ -@@ -792,6 +795,7 @@ do { \ +@@ -791,6 +794,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 @@ -3017,7 +2909,7 @@ diff -NurpP --minimal linux-3.9.4/fs/ext4/ext4.h linux-3.9.4-vs2.3.6.1/fs/ext4/e #define i_checksum_lo osd2.linux2.l_i_checksum_lo #elif defined(__GNU__) -@@ -969,6 +973,7 @@ struct ext4_inode_info { +@@ -980,6 +984,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 */ @@ -3025,7 +2917,7 @@ diff -NurpP --minimal linux-3.9.4/fs/ext4/ext4.h linux-3.9.4-vs2.3.6.1/fs/ext4/e #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 */ -@@ -2527,6 +2532,7 @@ extern struct buffer_head *ext4_get_firs +@@ -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); @@ -3033,19 +2925,19 @@ diff -NurpP --minimal linux-3.9.4/fs/ext4/ext4.h linux-3.9.4-vs2.3.6.1/fs/ext4/e extern int ext4_try_to_evict_inline_data(handle_t *handle, struct inode *inode, int needed); -diff -NurpP --minimal linux-3.9.4/fs/ext4/file.c linux-3.9.4-vs2.3.6.1/fs/ext4/file.c ---- linux-3.9.4/fs/ext4/file.c 2013-05-31 13:45:23.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/ext4/file.c 2013-05-31 14:47:11.000000000 +0000 -@@ -650,5 +650,6 @@ const struct inode_operations ext4_file_ - .removexattr = generic_removexattr, +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_ .get_acl = ext4_get_acl, + .set_acl = ext4_set_acl, .fiemap = ext4_fiemap, + .sync_flags = ext4_sync_flags, }; -diff -NurpP --minimal linux-3.9.4/fs/ext4/ialloc.c linux-3.9.4-vs2.3.6.1/fs/ext4/ialloc.c ---- linux-3.9.4/fs/ext4/ialloc.c 2013-05-31 13:45:23.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/ext4/ialloc.c 2013-05-31 14:47:11.000000000 +0000 +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 @@ #include #include @@ -3054,55 +2946,57 @@ diff -NurpP --minimal linux-3.9.4/fs/ext4/ialloc.c linux-3.9.4-vs2.3.6.1/fs/ext4 #include #include "ext4.h" -@@ -859,6 +860,7 @@ got: +@@ -754,6 +755,7 @@ struct inode *__ext4_new_inode(handle_t inode->i_mode = mode; inode->i_uid = current_fsuid(); inode->i_gid = dir->i_gid; -+ inode->i_tag = dx_current_fstag(sb); ++ i_tag_write(inode, dx_current_fstag(sb)); } else inode_init_owner(inode, dir, mode); - -diff -NurpP --minimal linux-3.9.4/fs/ext4/inode.c linux-3.9.4-vs2.3.6.1/fs/ext4/inode.c ---- linux-3.9.4/fs/ext4/inode.c 2013-05-31 14:22:27.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/ext4/inode.c 2013-05-31 14:47:11.000000000 +0000 -@@ -37,6 +37,7 @@ - #include - #include + 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 + #include + #include +#include #include "ext4_jbd2.h" #include "xattr.h" -@@ -3870,41 +3871,64 @@ void ext4_set_inode_flags(struct inode * - { +@@ -3811,42 +3812,66 @@ void ext4_set_inode_flags(struct inode * unsigned int flags = EXT4_I(inode)->i_flags; + unsigned int new_fl = 0; -- 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 & EXT4_IMMUTABLE_FL) -+ inode->i_flags |= S_IMMUTABLE; ++ new_fl |= S_IMMUTABLE; + if (flags & EXT4_IXUNLINK_FL) -+ inode->i_flags |= S_IXUNLINK; ++ new_fl |= S_IXUNLINK; + if (flags & EXT4_SYNC_FL) - inode->i_flags |= S_SYNC; + new_fl |= S_SYNC; if (flags & EXT4_APPEND_FL) - inode->i_flags |= S_APPEND; + new_fl |= S_APPEND; - if (flags & EXT4_IMMUTABLE_FL) -- inode->i_flags |= S_IMMUTABLE; +- new_fl |= S_IMMUTABLE; if (flags & EXT4_NOATIME_FL) - inode->i_flags |= S_NOATIME; + new_fl |= S_NOATIME; if (flags & EXT4_DIRSYNC_FL) - inode->i_flags |= S_DIRSYNC; -+ -+ inode->i_vflags &= ~(V_BARRIER | V_COW); + new_fl |= S_DIRSYNC; + 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_NOATIME | S_DIRSYNC); + ++ new_fl = 0; + if (flags & EXT4_BARRIER_FL) -+ inode->i_vflags |= V_BARRIER; ++ new_fl |= V_BARRIER; + if (flags & EXT4_COW_FL) -+ inode->i_vflags |= V_COW; ++ new_fl |= V_COW; ++ ++ set_mask_bits(&inode->i_vflags, ++ V_BARRIER | V_COW, new_fl); } /* Propagate flags from i_flags to EXT4_I(inode)->i_flags */ @@ -3145,7 +3039,7 @@ diff -NurpP --minimal linux-3.9.4/fs/ext4/inode.c linux-3.9.4-vs2.3.6.1/fs/ext4/ } while (cmpxchg(&ei->i_flags, old_fl, new_fl) != old_fl); } -@@ -4009,8 +4033,10 @@ struct inode *ext4_iget(struct super_blo +@@ -3950,8 +3975,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; } @@ -3158,20 +3052,20 @@ diff -NurpP --minimal linux-3.9.4/fs/ext4/inode.c linux-3.9.4-vs2.3.6.1/fs/ext4/ set_nlink(inode, le16_to_cpu(raw_inode->i_links_count)); ext4_clear_state_flags(ei); /* Only relevant on 32-bit archs */ -@@ -4233,8 +4259,10 @@ static int ext4_do_update_inode(handle_t +@@ -4191,8 +4218,10 @@ static int ext4_do_update_inode(handle_t ext4_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 = TAGINO_UID(DX_TAG(inode), -+ i_uid_read(inode), i_tag_read(inode)); -+ i_gid = TAGINO_GID(DX_TAG(inode), -+ i_gid_read(inode), i_tag_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)); -@@ -4257,6 +4285,9 @@ static int ext4_do_update_inode(handle_t +@@ -4215,6 +4244,9 @@ static int ext4_do_update_inode(handle_t raw_inode->i_uid_high = 0; raw_inode->i_gid_high = 0; } @@ -3181,7 +3075,7 @@ diff -NurpP --minimal linux-3.9.4/fs/ext4/inode.c linux-3.9.4-vs2.3.6.1/fs/ext4/ raw_inode->i_links_count = cpu_to_le16(inode->i_nlink); EXT4_INODE_SET_XTIME(i_ctime, inode, raw_inode); -@@ -4487,7 +4518,8 @@ int ext4_setattr(struct dentry *dentry, +@@ -4458,7 +4490,8 @@ int ext4_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)) || @@ -3191,7 +3085,7 @@ diff -NurpP --minimal linux-3.9.4/fs/ext4/inode.c linux-3.9.4-vs2.3.6.1/fs/ext4/ handle_t *handle; /* (user+group)*(old+new) structure, inode write (sb, -@@ -4510,6 +4542,8 @@ int ext4_setattr(struct dentry *dentry, +@@ -4481,6 +4514,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; @@ -3200,10 +3094,10 @@ diff -NurpP --minimal linux-3.9.4/fs/ext4/inode.c linux-3.9.4-vs2.3.6.1/fs/ext4/ error = ext4_mark_inode_dirty(handle, inode); ext4_journal_stop(handle); } -diff -NurpP --minimal linux-3.9.4/fs/ext4/ioctl.c linux-3.9.4-vs2.3.6.1/fs/ext4/ioctl.c ---- linux-3.9.4/fs/ext4/ioctl.c 2013-05-31 13:45:23.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/ext4/ioctl.c 2013-05-31 19:50:08.000000000 +0000 -@@ -14,12 +14,40 @@ +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 +@@ -14,6 +14,7 @@ #include #include #include @@ -3211,8 +3105,9 @@ diff -NurpP --minimal linux-3.9.4/fs/ext4/ioctl.c linux-3.9.4-vs2.3.6.1/fs/ext4/ #include #include "ext4_jbd2.h" #include "ext4.h" - - #define MAX_32_NUM ((((unsigned long long) 1) << 32) - 1) +@@ -198,6 +199,33 @@ journal_err_out: + return err; + } +int ext4_sync_flags(struct inode *inode, int flags, int vflags) +{ @@ -3244,7 +3139,7 @@ diff -NurpP --minimal linux-3.9.4/fs/ext4/ioctl.c linux-3.9.4-vs2.3.6.1/fs/ext4/ long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { struct inode *inode = file_inode(filp); -@@ -53,6 +81,11 @@ long ext4_ioctl(struct file *filp, unsig +@@ -231,6 +259,11 @@ long ext4_ioctl(struct file *filp, unsig flags = ext4_mask_flags(inode->i_mode, flags); @@ -3256,7 +3151,7 @@ diff -NurpP --minimal linux-3.9.4/fs/ext4/ioctl.c linux-3.9.4-vs2.3.6.1/fs/ext4/ err = -EPERM; mutex_lock(&inode->i_mutex); /* Is it quota file? Do not allow user to mess with it */ -@@ -70,7 +103,9 @@ long ext4_ioctl(struct file *filp, unsig +@@ -248,7 +281,9 @@ long ext4_ioctl(struct file *filp, unsig * * This test looks nicer. Thanks to Pauline Middelink */ @@ -3267,9 +3162,9 @@ diff -NurpP --minimal linux-3.9.4/fs/ext4/ioctl.c linux-3.9.4-vs2.3.6.1/fs/ext4/ if (!capable(CAP_LINUX_IMMUTABLE)) goto flags_out; } -diff -NurpP --minimal linux-3.9.4/fs/ext4/namei.c linux-3.9.4-vs2.3.6.1/fs/ext4/namei.c ---- linux-3.9.4/fs/ext4/namei.c 2013-05-31 13:45:23.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/ext4/namei.c 2013-05-31 14:47:11.000000000 +0000 +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 @@ #include #include @@ -3278,7 +3173,7 @@ diff -NurpP --minimal linux-3.9.4/fs/ext4/namei.c linux-3.9.4-vs2.3.6.1/fs/ext4/ #include "ext4.h" #include "ext4_jbd2.h" -@@ -1290,6 +1291,7 @@ restart: +@@ -1279,6 +1280,7 @@ restart: ll_rw_block(READ | REQ_META | REQ_PRIO, 1, &bh); } @@ -3286,18 +3181,18 @@ diff -NurpP --minimal linux-3.9.4/fs/ext4/namei.c linux-3.9.4-vs2.3.6.1/fs/ext4/ } if ((bh = bh_use[ra_ptr++]) == NULL) goto next; -@@ -3190,6 +3192,7 @@ const struct inode_operations ext4_dir_i - .removexattr = generic_removexattr, +@@ -3539,6 +3541,7 @@ const struct inode_operations ext4_dir_i .get_acl = ext4_get_acl, + .set_acl = ext4_set_acl, .fiemap = ext4_fiemap, + .sync_flags = ext4_sync_flags, }; const struct inode_operations ext4_special_inode_operations = { -diff -NurpP --minimal linux-3.9.4/fs/ext4/super.c linux-3.9.4-vs2.3.6.1/fs/ext4/super.c ---- linux-3.9.4/fs/ext4/super.c 2013-05-31 14:22:27.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/ext4/super.c 2013-05-31 14:47:11.000000000 +0000 -@@ -1131,7 +1131,7 @@ enum { +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, Opt_dioread_nolock, Opt_dioread_lock, Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable, @@ -3306,7 +3201,7 @@ diff -NurpP --minimal linux-3.9.4/fs/ext4/super.c linux-3.9.4-vs2.3.6.1/fs/ext4/ }; static const match_table_t tokens = { -@@ -1211,6 +1211,9 @@ static const match_table_t tokens = { +@@ -1227,6 +1227,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 */ @@ -3316,7 +3211,7 @@ diff -NurpP --minimal linux-3.9.4/fs/ext4/super.c linux-3.9.4-vs2.3.6.1/fs/ext4/ {Opt_err, NULL}, }; -@@ -1441,6 +1444,20 @@ static int handle_mount_opt(struct super +@@ -1459,6 +1462,20 @@ static int handle_mount_opt(struct super case Opt_i_version: sb->s_flags |= MS_I_VERSION; return 1; @@ -3337,7 +3232,7 @@ diff -NurpP --minimal linux-3.9.4/fs/ext4/super.c linux-3.9.4-vs2.3.6.1/fs/ext4/ } for (m = ext4_mount_opts; m->token != Opt_err; m++) -@@ -3401,6 +3418,9 @@ static int ext4_fill_super(struct super_ +@@ -3600,6 +3617,9 @@ static int ext4_fill_super(struct super_ clear_opt(sb, DELALLOC); } @@ -3347,7 +3242,7 @@ diff -NurpP --minimal linux-3.9.4/fs/ext4/super.c linux-3.9.4-vs2.3.6.1/fs/ext4/ sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); -@@ -4587,6 +4607,14 @@ static int ext4_remount(struct super_blo +@@ -4872,6 +4892,14 @@ static int ext4_remount(struct super_blo if (sbi->s_mount_flags & EXT4_MF_FS_ABORTED) ext4_abort(sb, "Abort forced by user"); @@ -3362,18 +3257,18 @@ diff -NurpP --minimal linux-3.9.4/fs/ext4/super.c linux-3.9.4-vs2.3.6.1/fs/ext4/ sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); -diff -NurpP --minimal linux-3.9.4/fs/fcntl.c linux-3.9.4-vs2.3.6.1/fs/fcntl.c ---- linux-3.9.4/fs/fcntl.c 2013-05-31 13:45:23.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/fcntl.c 2013-05-31 14:47:11.000000000 +0000 -@@ -21,6 +21,7 @@ - #include +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 +@@ -22,6 +22,7 @@ #include #include + #include +#include #include #include -@@ -378,6 +379,8 @@ SYSCALL_DEFINE3(fcntl64, unsigned int, f +@@ -385,6 +386,8 @@ SYSCALL_DEFINE3(fcntl64, unsigned int, f if (!f.file) goto out; @@ -3382,18 +3277,18 @@ diff -NurpP --minimal linux-3.9.4/fs/fcntl.c linux-3.9.4-vs2.3.6.1/fs/fcntl.c if (unlikely(f.file->f_mode & FMODE_PATH)) { if (!check_fcntl_cmd(cmd)) -diff -NurpP --minimal linux-3.9.4/fs/file.c linux-3.9.4-vs2.3.6.1/fs/file.c ---- linux-3.9.4/fs/file.c 2013-05-31 13:45:23.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/file.c 2013-05-31 14:47:11.000000000 +0000 +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 @@ -22,6 +22,7 @@ #include #include #include +#include - struct fdtable_defer { - spinlock_t lock; -@@ -364,6 +365,8 @@ struct files_struct *dup_fd(struct files + 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 struct file *f = *old_fds++; if (f) { get_file(f); @@ -3402,9 +3297,9 @@ diff -NurpP --minimal linux-3.9.4/fs/file.c linux-3.9.4-vs2.3.6.1/fs/file.c } else { /* * The fd may be claimed in the fd bitmap but not yet -@@ -429,9 +432,11 @@ static void close_files(struct files_str +@@ -369,9 +372,11 @@ static struct fdtable *close_files(struc filp_close(file, files); - cond_resched(); + cond_resched_rcu_qs(); } + vx_openfd_dec(i); } @@ -3413,16 +3308,16 @@ diff -NurpP --minimal linux-3.9.4/fs/file.c linux-3.9.4-vs2.3.6.1/fs/file.c + cond_resched(); } } - } -@@ -567,6 +572,7 @@ repeat: + +@@ -487,6 +492,7 @@ repeat: else __clear_close_on_exec(fd, fdt); error = fd; + vx_openfd_inc(fd); #if 1 /* Sanity check */ - if (rcu_dereference_raw(fdt->fd[fd]) != NULL) { -@@ -597,6 +603,7 @@ static void __put_unused_fd(struct files + if (rcu_access_pointer(fdt->fd[fd]) != NULL) { +@@ -517,6 +523,7 @@ static void __put_unused_fd(struct files __clear_open_fd(fd, fdt); if (fd < files->next_fd) files->next_fd = fd; @@ -3430,7 +3325,7 @@ diff -NurpP --minimal linux-3.9.4/fs/file.c linux-3.9.4-vs2.3.6.1/fs/file.c } void put_unused_fd(unsigned int fd) -@@ -876,6 +883,8 @@ static int do_dup2(struct files_struct * +@@ -784,6 +791,8 @@ __releases(&files->file_lock) if (tofree) filp_close(tofree, files); @@ -3439,9 +3334,9 @@ diff -NurpP --minimal linux-3.9.4/fs/file.c linux-3.9.4-vs2.3.6.1/fs/file.c return fd; -diff -NurpP --minimal linux-3.9.4/fs/file_table.c linux-3.9.4-vs2.3.6.1/fs/file_table.c ---- linux-3.9.4/fs/file_table.c 2013-05-31 13:45:23.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/file_table.c 2013-05-31 14:47:11.000000000 +0000 +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 @@ -26,6 +26,8 @@ #include #include @@ -3451,8 +3346,8 @@ diff -NurpP --minimal linux-3.9.4/fs/file_table.c linux-3.9.4-vs2.3.6.1/fs/file_ #include -@@ -140,6 +142,8 @@ struct file *get_empty_filp(void) - spin_lock_init(&f->f_lock); +@@ -137,6 +139,8 @@ struct file *get_empty_filp(void) + mutex_init(&f->f_pos_lock); eventpoll_init_file(f); /* f->f_version: 0 */ + f->f_xid = vx_current_xid(); @@ -3460,27 +3355,27 @@ diff -NurpP --minimal linux-3.9.4/fs/file_table.c linux-3.9.4-vs2.3.6.1/fs/file_ return f; over: -@@ -257,6 +261,8 @@ static void __fput(struct file *file) - i_readcount_dec(inode); - if (file->f_mode & FMODE_WRITE) - drop_file_write_access(file); +@@ -219,6 +223,8 @@ static void __fput(struct file *file) + put_write_access(inode); + __mnt_drop_write(mnt); + } + vx_files_dec(file); + file->f_xid = 0; file->f_path.dentry = NULL; file->f_path.mnt = NULL; file->f_inode = NULL; -@@ -344,6 +350,8 @@ void put_filp(struct file *file) +@@ -305,6 +311,8 @@ void put_filp(struct file *file) { if (atomic_long_dec_and_test(&file->f_count)) { security_file_free(file); + vx_files_dec(file); + file->f_xid = 0; - file_sb_list_del(file); file_free(file); } -diff -NurpP --minimal linux-3.9.4/fs/fs_struct.c linux-3.9.4-vs2.3.6.1/fs/fs_struct.c ---- linux-3.9.4/fs/fs_struct.c 2013-05-31 13:45:23.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/fs_struct.c 2013-05-31 14:47:11.000000000 +0000 + } +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 @@ -4,6 +4,7 @@ #include #include @@ -3505,10 +3400,10 @@ diff -NurpP --minimal linux-3.9.4/fs/fs_struct.c linux-3.9.4-vs2.3.6.1/fs/fs_str } return fs; } -diff -NurpP --minimal linux-3.9.4/fs/gfs2/file.c linux-3.9.4-vs2.3.6.1/fs/gfs2/file.c ---- linux-3.9.4/fs/gfs2/file.c 2013-05-31 13:45:23.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/gfs2/file.c 2013-05-31 19:54:27.000000000 +0000 -@@ -143,6 +143,9 @@ static const u32 fsflags_to_gfs2[32] = { +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] = { [12] = GFS2_DIF_EXHASH, [14] = GFS2_DIF_INHERIT_JDATA, [17] = GFS2_DIF_TOPDIR, @@ -3518,7 +3413,7 @@ diff -NurpP --minimal linux-3.9.4/fs/gfs2/file.c linux-3.9.4-vs2.3.6.1/fs/gfs2/f }; static const u32 gfs2_to_fsflags[32] = { -@@ -153,6 +156,9 @@ static const u32 gfs2_to_fsflags[32] = { +@@ -148,6 +151,9 @@ static const u32 gfs2_to_fsflags[32] = { [gfs2fl_ExHash] = FS_INDEX_FL, [gfs2fl_TopLevel] = FS_TOPDIR_FL, [gfs2fl_InheritJdata] = FS_JOURNAL_DATA_FL, @@ -3528,7 +3423,7 @@ diff -NurpP --minimal linux-3.9.4/fs/gfs2/file.c linux-3.9.4-vs2.3.6.1/fs/gfs2/f }; static int gfs2_get_flags(struct file *filp, u32 __user *ptr) -@@ -183,12 +189,18 @@ void gfs2_set_inode_flags(struct inode * +@@ -178,12 +184,18 @@ void gfs2_set_inode_flags(struct inode * { struct gfs2_inode *ip = GFS2_I(inode); unsigned int flags = inode->i_flags; @@ -3548,7 +3443,7 @@ diff -NurpP --minimal linux-3.9.4/fs/gfs2/file.c linux-3.9.4-vs2.3.6.1/fs/gfs2/f if (ip->i_diskflags & GFS2_DIF_APPENDONLY) flags |= S_APPEND; if (ip->i_diskflags & GFS2_DIF_NOATIME) -@@ -196,6 +208,43 @@ void gfs2_set_inode_flags(struct inode * +@@ -191,6 +203,43 @@ void gfs2_set_inode_flags(struct inode * if (ip->i_diskflags & GFS2_DIF_SYNC) flags |= S_SYNC; inode->i_flags = flags; @@ -3592,7 +3487,7 @@ diff -NurpP --minimal linux-3.9.4/fs/gfs2/file.c linux-3.9.4-vs2.3.6.1/fs/gfs2/f } /* Flags that can be set by user space */ -@@ -309,6 +358,37 @@ static int gfs2_set_flags(struct file *f +@@ -304,6 +353,37 @@ static int gfs2_set_flags(struct file *f return do_gfs2_set_flags(filp, gfsflags, ~GFS2_DIF_JDATA); } @@ -3630,10 +3525,10 @@ diff -NurpP --minimal linux-3.9.4/fs/gfs2/file.c linux-3.9.4-vs2.3.6.1/fs/gfs2/f static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { switch(cmd) { -diff -NurpP --minimal linux-3.9.4/fs/gfs2/inode.h linux-3.9.4-vs2.3.6.1/fs/gfs2/inode.h ---- linux-3.9.4/fs/gfs2/inode.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/gfs2/inode.h 2013-05-31 14:47:11.000000000 +0000 -@@ -117,6 +117,7 @@ extern const struct file_operations gfs2 +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 +@@ -118,6 +118,7 @@ extern const struct file_operations gfs2 extern const struct file_operations gfs2_dir_fops_nolock; extern void gfs2_set_inode_flags(struct inode *inode); @@ -3641,29 +3536,29 @@ diff -NurpP --minimal linux-3.9.4/fs/gfs2/inode.h linux-3.9.4-vs2.3.6.1/fs/gfs2/ #ifdef CONFIG_GFS2_FS_LOCKING_DLM extern const struct file_operations gfs2_file_fops; -diff -NurpP --minimal linux-3.9.4/fs/hostfs/hostfs.h linux-3.9.4-vs2.3.6.1/fs/hostfs/hostfs.h ---- linux-3.9.4/fs/hostfs/hostfs.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/hostfs/hostfs.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -42,6 +42,7 @@ struct hostfs_iattr { unsigned short ia_mode; uid_t ia_uid; gid_t ia_gid; -+ tag_t ia_tag; ++ vtag_t ia_tag; loff_t ia_size; struct timespec ia_atime; struct timespec ia_mtime; -diff -NurpP --minimal linux-3.9.4/fs/inode.c linux-3.9.4-vs2.3.6.1/fs/inode.c ---- linux-3.9.4/fs/inode.c 2013-05-31 13:45:24.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/inode.c 2013-05-31 14:47:11.000000000 +0000 -@@ -17,6 +17,7 @@ - #include +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 +@@ -18,6 +18,7 @@ #include /* for inode_has_buffers */ #include + #include +#include #include "internal.h" /* -@@ -128,6 +129,8 @@ int inode_init_always(struct super_block +@@ -129,6 +130,8 @@ int inode_init_always(struct super_block struct address_space *const mapping = &inode->i_data; inode->i_sb = sb; @@ -3672,7 +3567,7 @@ diff -NurpP --minimal linux-3.9.4/fs/inode.c linux-3.9.4-vs2.3.6.1/fs/inode.c inode->i_blkbits = sb->s_blocksize_bits; inode->i_flags = 0; atomic_set(&inode->i_count, 1); -@@ -137,6 +140,7 @@ int inode_init_always(struct super_block +@@ -138,6 +141,7 @@ int inode_init_always(struct super_block inode->i_opflags = 0; i_uid_write(inode, 0); i_gid_write(inode, 0); @@ -3680,7 +3575,7 @@ diff -NurpP --minimal linux-3.9.4/fs/inode.c linux-3.9.4-vs2.3.6.1/fs/inode.c atomic_set(&inode->i_writecount, 0); inode->i_size = 0; inode->i_blocks = 0; -@@ -149,6 +153,7 @@ int inode_init_always(struct super_block +@@ -150,6 +154,7 @@ int inode_init_always(struct super_block inode->i_bdev = NULL; inode->i_cdev = NULL; inode->i_rdev = 0; @@ -3688,7 +3583,7 @@ diff -NurpP --minimal linux-3.9.4/fs/inode.c linux-3.9.4-vs2.3.6.1/fs/inode.c inode->dirtied_when = 0; if (security_inode_alloc(inode)) -@@ -483,6 +488,8 @@ void __insert_inode_hash(struct inode *i +@@ -478,6 +483,8 @@ void __insert_inode_hash(struct inode *i } EXPORT_SYMBOL(__insert_inode_hash); @@ -3697,7 +3592,7 @@ diff -NurpP --minimal linux-3.9.4/fs/inode.c linux-3.9.4-vs2.3.6.1/fs/inode.c /** * __remove_inode_hash - remove an inode from the hash * @inode: inode to unhash -@@ -1799,9 +1806,11 @@ void init_special_inode(struct inode *in +@@ -1795,9 +1802,11 @@ void init_special_inode(struct inode *in if (S_ISCHR(mode)) { inode->i_fop = &def_chr_fops; inode->i_rdev = rdev; @@ -3707,19 +3602,19 @@ diff -NurpP --minimal linux-3.9.4/fs/inode.c linux-3.9.4-vs2.3.6.1/fs/inode.c inode->i_rdev = rdev; + inode->i_mdev = rdev; } else if (S_ISFIFO(mode)) - inode->i_fop = &def_fifo_fops; + inode->i_fop = &pipefifo_fops; else if (S_ISSOCK(mode)) -@@ -1830,6 +1839,7 @@ void inode_init_owner(struct inode *inod +@@ -1826,6 +1835,7 @@ void inode_init_owner(struct inode *inod } else inode->i_gid = current_fsgid(); inode->i_mode = mode; -+ inode->i_tag = dx_current_fstag(inode->i_sb); ++ i_tag_write(inode, dx_current_fstag(inode->i_sb)); } EXPORT_SYMBOL(inode_init_owner); -diff -NurpP --minimal linux-3.9.4/fs/ioctl.c linux-3.9.4-vs2.3.6.1/fs/ioctl.c ---- linux-3.9.4/fs/ioctl.c 2013-05-31 13:45:24.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/ioctl.c 2013-05-31 14:47:11.000000000 +0000 +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 @@ -15,6 +15,9 @@ #include #include @@ -3730,39 +3625,10 @@ diff -NurpP --minimal linux-3.9.4/fs/ioctl.c linux-3.9.4-vs2.3.6.1/fs/ioctl.c #include -diff -NurpP --minimal linux-3.9.4/fs/ioprio.c linux-3.9.4-vs2.3.6.1/fs/ioprio.c ---- linux-3.9.4/fs/ioprio.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/ioprio.c 2013-05-31 14:47:11.000000000 +0000 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - int set_task_ioprio(struct task_struct *task, int ioprio) - { -@@ -105,6 +106,8 @@ SYSCALL_DEFINE3(ioprio_set, int, which, - else - pgrp = find_vpid(who); - do_each_pid_thread(pgrp, PIDTYPE_PGID, p) { -+ if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT)) -+ continue; - ret = set_task_ioprio(p, ioprio); - if (ret) - break; -@@ -198,6 +201,8 @@ SYSCALL_DEFINE2(ioprio_get, int, which, - else - pgrp = find_vpid(who); - do_each_pid_thread(pgrp, PIDTYPE_PGID, p) { -+ if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT)) -+ continue; - tmpio = get_task_ioprio(p); - if (tmpio < 0) - continue; -diff -NurpP --minimal linux-3.9.4/fs/jfs/file.c linux-3.9.4-vs2.3.6.1/fs/jfs/file.c ---- linux-3.9.4/fs/jfs/file.c 2013-02-19 13:58:48.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/jfs/file.c 2013-05-31 14:47:11.000000000 +0000 -@@ -109,7 +109,8 @@ int jfs_setattr(struct dentry *dentry, s +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); if ((iattr->ia_valid & ATTR_UID && !uid_eq(iattr->ia_uid, inode->i_uid)) || @@ -3772,17 +3638,17 @@ diff -NurpP --minimal linux-3.9.4/fs/jfs/file.c linux-3.9.4-vs2.3.6.1/fs/jfs/fil rc = dquot_transfer(inode, iattr); if (rc) return rc; -@@ -144,6 +145,7 @@ const struct inode_operations jfs_file_i - #ifdef CONFIG_JFS_POSIX_ACL +@@ -146,6 +147,7 @@ const struct inode_operations jfs_file_i .get_acl = jfs_get_acl, + .set_acl = jfs_set_acl, #endif + .sync_flags = jfs_sync_flags, }; const struct file_operations jfs_file_operations = { -diff -NurpP --minimal linux-3.9.4/fs/jfs/ioctl.c linux-3.9.4-vs2.3.6.1/fs/jfs/ioctl.c ---- linux-3.9.4/fs/jfs/ioctl.c 2013-05-31 13:45:24.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/jfs/ioctl.c 2013-05-31 14:47:11.000000000 +0000 +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 @@ -12,6 +12,7 @@ #include #include @@ -3840,9 +3706,9 @@ diff -NurpP --minimal linux-3.9.4/fs/jfs/ioctl.c linux-3.9.4-vs2.3.6.1/fs/jfs/io flags |= oldflags & ~JFS_FL_USER_MODIFIABLE; jfs_inode->mode2 = flags; -diff -NurpP --minimal linux-3.9.4/fs/jfs/jfs_dinode.h linux-3.9.4-vs2.3.6.1/fs/jfs/jfs_dinode.h ---- linux-3.9.4/fs/jfs/jfs_dinode.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/jfs/jfs_dinode.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -161,9 +161,13 @@ struct dinode { #define JFS_APPEND_FL 0x01000000 /* writes to file may only append */ @@ -3859,9 +3725,9 @@ diff -NurpP --minimal linux-3.9.4/fs/jfs/jfs_dinode.h linux-3.9.4-vs2.3.6.1/fs/j #define JFS_FL_INHERIT 0x03C80000 /* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */ -diff -NurpP --minimal linux-3.9.4/fs/jfs/jfs_filsys.h linux-3.9.4-vs2.3.6.1/fs/jfs/jfs_filsys.h ---- linux-3.9.4/fs/jfs/jfs_filsys.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/jfs/jfs_filsys.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -266,6 +266,7 @@ #define JFS_NAME_MAX 255 #define JFS_PATH_MAX BPSIZE @@ -3870,9 +3736,9 @@ diff -NurpP --minimal linux-3.9.4/fs/jfs/jfs_filsys.h linux-3.9.4-vs2.3.6.1/fs/j /* * file system state (superblock state) -diff -NurpP --minimal linux-3.9.4/fs/jfs/jfs_imap.c linux-3.9.4-vs2.3.6.1/fs/jfs/jfs_imap.c ---- linux-3.9.4/fs/jfs/jfs_imap.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/jfs/jfs_imap.c 2013-05-31 14:47:11.000000000 +0000 +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 @@ -46,6 +46,7 @@ #include #include @@ -3881,26 +3747,25 @@ diff -NurpP --minimal linux-3.9.4/fs/jfs/jfs_imap.c linux-3.9.4-vs2.3.6.1/fs/jfs #include "jfs_incore.h" #include "jfs_inode.h" -@@ -3058,6 +3059,8 @@ static int copy_from_dinode(struct dinod +@@ -3047,6 +3048,8 @@ static int copy_from_dinode(struct dinod { struct jfs_inode_info *jfs_ip = JFS_IP(ip); struct jfs_sb_info *sbi = JFS_SBI(ip->i_sb); -+ kuid_t uid; -+ kgid_t gid; ++ kuid_t kuid; ++ kgid_t kgid; jfs_ip->fileset = le32_to_cpu(dip->di_fileset); jfs_ip->mode2 = le32_to_cpu(dip->di_mode); -@@ -3078,14 +3081,19 @@ static int copy_from_dinode(struct dinod +@@ -3067,14 +3070,18 @@ static int copy_from_dinode(struct dinod } set_nlink(ip, le32_to_cpu(dip->di_nlink)); - jfs_ip->saved_uid = make_kuid(&init_user_ns, le32_to_cpu(dip->di_uid)); -+ uid = make_kuid(&init_user_ns, le32_to_cpu(dip->di_uid)); -+ gid = make_kgid(&init_user_ns, le32_to_cpu(dip->di_gid)); -+ ip->i_tag = make_ktag(&init_user_ns, -+ INOTAG_TAG(DX_TAG(ip), uid, gid, 0)); ++ kuid = make_kuid(&init_user_ns, le32_to_cpu(dip->di_uid)); ++ kgid = make_kgid(&init_user_ns, le32_to_cpu(dip->di_gid)); ++ ip->i_tag = INOTAG_KTAG(DX_TAG(ip), kuid, kgid, GLOBAL_ROOT_TAG); + -+ jfs_ip->saved_uid = INOTAG_UID(DX_TAG(ip), uid, gid); ++ jfs_ip->saved_uid = INOTAG_KUID(DX_TAG(ip), kuid, kgid); if (!uid_valid(sbi->uid)) ip->i_uid = jfs_ip->saved_uid; else { @@ -3908,11 +3773,11 @@ diff -NurpP --minimal linux-3.9.4/fs/jfs/jfs_imap.c linux-3.9.4-vs2.3.6.1/fs/jfs } - jfs_ip->saved_gid = make_kgid(&init_user_ns, le32_to_cpu(dip->di_gid)); -+ jfs_ip->saved_gid = INOTAG_GID(DX_TAG(ip), uid, gid); ++ jfs_ip->saved_gid = INOTAG_KGID(DX_TAG(ip), kuid, kgid); if (!gid_valid(sbi->gid)) ip->i_gid = jfs_ip->saved_gid; else { -@@ -3150,16 +3158,14 @@ static void copy_to_dinode(struct dinode +@@ -3139,16 +3146,14 @@ static void copy_to_dinode(struct dinode dip->di_size = cpu_to_le64(ip->i_size); dip->di_nblocks = cpu_to_le64(PBLK2LBLK(ip->i_sb, ip->i_blocks)); dip->di_nlink = cpu_to_le32(ip->i_nlink); @@ -3927,19 +3792,19 @@ diff -NurpP --minimal linux-3.9.4/fs/jfs/jfs_imap.c linux-3.9.4-vs2.3.6.1/fs/jfs - dip->di_gid = cpu_to_le32(from_kgid(&init_user_ns, - jfs_ip->saved_gid)); + dip->di_uid = cpu_to_le32(from_kuid(&init_user_ns, -+ TAGINO_UID(DX_TAG(ip), ++ TAGINO_KUID(DX_TAG(ip), + !uid_valid(sbi->uid) ? ip->i_uid : jfs_ip->saved_uid, + ip->i_tag))); -+ dip->di_gid = cpu_to_le32(from_kuid(&init_user_ns, -+ TAGINO_GID(DX_TAG(ip), ++ dip->di_gid = cpu_to_le32(from_kgid(&init_user_ns, ++ TAGINO_KGID(DX_TAG(ip), + !gid_valid(sbi->gid) ? ip->i_gid : jfs_ip->saved_gid, + ip->i_tag))); jfs_get_inode_flags(jfs_ip); /* * mode2 is only needed for storing the higher order bits. -diff -NurpP --minimal linux-3.9.4/fs/jfs/jfs_inode.c linux-3.9.4-vs2.3.6.1/fs/jfs/jfs_inode.c ---- linux-3.9.4/fs/jfs/jfs_inode.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/jfs/jfs_inode.c 2013-05-31 14:47:11.000000000 +0000 +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 @@ -18,6 +18,7 @@ #include @@ -3948,37 +3813,35 @@ diff -NurpP --minimal linux-3.9.4/fs/jfs/jfs_inode.c linux-3.9.4-vs2.3.6.1/fs/jf #include "jfs_incore.h" #include "jfs_inode.h" #include "jfs_filsys.h" -@@ -30,29 +31,46 @@ void jfs_set_inode_flags(struct inode *i - { - unsigned int flags = JFS_IP(inode)->mode2; - -- inode->i_flags &= ~(S_IMMUTABLE | S_APPEND | -- S_NOATIME | S_DIRSYNC | S_SYNC); -+ inode->i_flags &= ~(S_IMMUTABLE | S_IXUNLINK | -+ S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC); +@@ -33,26 +34,45 @@ void jfs_set_inode_flags(struct inode *i if (flags & JFS_IMMUTABLE_FL) - inode->i_flags |= S_IMMUTABLE; + new_fl |= S_IMMUTABLE; + if (flags & JFS_IXUNLINK_FL) + inode->i_flags |= S_IXUNLINK; + + if (flags & JFS_SYNC_FL) + inode->i_flags |= S_SYNC; if (flags & JFS_APPEND_FL) - inode->i_flags |= S_APPEND; + new_fl |= S_APPEND; if (flags & JFS_NOATIME_FL) - inode->i_flags |= S_NOATIME; + new_fl |= S_NOATIME; if (flags & JFS_DIRSYNC_FL) - inode->i_flags |= S_DIRSYNC; + new_fl |= S_DIRSYNC; - if (flags & JFS_SYNC_FL) -- inode->i_flags |= S_SYNC; -+ -+ inode->i_vflags &= ~(V_BARRIER | V_COW); +- new_fl |= S_SYNC; +- inode_set_flags(inode, new_fl, S_IMMUTABLE | S_APPEND | S_NOATIME | ++ inode_set_flags(inode, new_fl, S_IMMUTABLE | S_IXUNLINK | S_APPEND | S_NOATIME | + S_DIRSYNC | S_SYNC); + ++ new_fl = 0; + if (flags & JFS_BARRIER_FL) -+ inode->i_vflags |= V_BARRIER; ++ new_fl |= V_BARRIER; + if (flags & JFS_COW_FL) -+ inode->i_vflags |= V_COW; ++ new_fl |= V_COW; ++ ++ set_mask_bits(&inode->i_vflags, ++ V_BARRIER | V_COW, new_fl); } void jfs_get_inode_flags(struct jfs_inode_info *jfs_ip) @@ -4001,7 +3864,7 @@ diff -NurpP --minimal linux-3.9.4/fs/jfs/jfs_inode.c linux-3.9.4-vs2.3.6.1/fs/jf if (flags & S_APPEND) jfs_ip->mode2 |= JFS_APPEND_FL; if (flags & S_NOATIME) -@@ -61,6 +79,11 @@ void jfs_get_inode_flags(struct jfs_inod +@@ -61,6 +81,11 @@ void jfs_get_inode_flags(struct jfs_inod jfs_ip->mode2 |= JFS_DIRSYNC_FL; if (flags & S_SYNC) jfs_ip->mode2 |= JFS_SYNC_FL; @@ -4013,9 +3876,9 @@ diff -NurpP --minimal linux-3.9.4/fs/jfs/jfs_inode.c linux-3.9.4-vs2.3.6.1/fs/jf } /* -diff -NurpP --minimal linux-3.9.4/fs/jfs/jfs_inode.h linux-3.9.4-vs2.3.6.1/fs/jfs/jfs_inode.h ---- linux-3.9.4/fs/jfs/jfs_inode.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/jfs/jfs_inode.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -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); @@ -4024,9 +3887,9 @@ diff -NurpP --minimal linux-3.9.4/fs/jfs/jfs_inode.h linux-3.9.4-vs2.3.6.1/fs/jf 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.9.4/fs/jfs/namei.c linux-3.9.4-vs2.3.6.1/fs/jfs/namei.c ---- linux-3.9.4/fs/jfs/namei.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/jfs/namei.c 2013-05-31 14:47:11.000000000 +0000 +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 @@ -22,6 +22,7 @@ #include #include @@ -4043,18 +3906,18 @@ diff -NurpP --minimal linux-3.9.4/fs/jfs/namei.c linux-3.9.4-vs2.3.6.1/fs/jfs/na return d_splice_alias(ip, dentry); } -@@ -1525,6 +1527,7 @@ const struct inode_operations jfs_dir_in - #ifdef CONFIG_JFS_POSIX_ACL +@@ -1526,6 +1528,7 @@ const struct inode_operations jfs_dir_in .get_acl = jfs_get_acl, + .set_acl = jfs_set_acl, #endif + .sync_flags = jfs_sync_flags, }; const struct file_operations jfs_dir_operations = { -diff -NurpP --minimal linux-3.9.4/fs/jfs/super.c linux-3.9.4-vs2.3.6.1/fs/jfs/super.c ---- linux-3.9.4/fs/jfs/super.c 2013-05-31 13:45:24.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/jfs/super.c 2013-05-31 14:47:11.000000000 +0000 -@@ -199,7 +199,8 @@ enum { +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 { 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, @@ -4064,7 +3927,7 @@ diff -NurpP --minimal linux-3.9.4/fs/jfs/super.c linux-3.9.4-vs2.3.6.1/fs/jfs/su }; static const match_table_t tokens = { -@@ -209,6 +210,10 @@ static const match_table_t tokens = { +@@ -213,6 +214,10 @@ static const match_table_t tokens = { {Opt_resize, "resize=%u"}, {Opt_resize_nosize, "resize"}, {Opt_errors, "errors=%s"}, @@ -4075,8 +3938,8 @@ diff -NurpP --minimal linux-3.9.4/fs/jfs/super.c linux-3.9.4-vs2.3.6.1/fs/jfs/su {Opt_ignore, "noquota"}, {Opt_ignore, "quota"}, {Opt_usrquota, "usrquota"}, -@@ -385,7 +390,20 @@ static int parse_options(char *options, - } +@@ -402,7 +407,20 @@ static int parse_options(char *options, + pr_err("JFS: discard option not supported on device\n"); break; } - @@ -4095,11 +3958,11 @@ diff -NurpP --minimal linux-3.9.4/fs/jfs/super.c linux-3.9.4-vs2.3.6.1/fs/jfs/su + break; +#endif default: - printk("jfs: Unrecognized mount option \"%s\" " - " or missing value\n", p); -@@ -417,6 +435,12 @@ static int jfs_remount(struct super_bloc + printk("jfs: Unrecognized mount option \"%s\" or missing value\n", + p); +@@ -434,6 +452,12 @@ static int jfs_remount(struct super_bloc + if (!parse_options(data, sb, &newLVSize, &flag)) return -EINVAL; - } + if ((flag & JFS_TAGGED) && !(sb->s_flags & MS_TAGGED)) { + printk(KERN_ERR "JFS: %s: tagging not permitted on remount.\n", @@ -4109,8 +3972,8 @@ diff -NurpP --minimal linux-3.9.4/fs/jfs/super.c linux-3.9.4-vs2.3.6.1/fs/jfs/su + if (newLVSize) { if (sb->s_flags & MS_RDONLY) { - pr_err("JFS: resize requires volume" \ -@@ -502,6 +526,9 @@ static int jfs_fill_super(struct super_b + pr_err("JFS: resize requires volume to be mounted read-write\n"); +@@ -517,6 +541,9 @@ static int jfs_fill_super(struct super_b #ifdef CONFIG_JFS_POSIX_ACL sb->s_flags |= MS_POSIXACL; #endif @@ -4120,67 +3983,73 @@ diff -NurpP --minimal linux-3.9.4/fs/jfs/super.c linux-3.9.4-vs2.3.6.1/fs/jfs/su if (newLVSize) { pr_err("resize option for remount only\n"); -diff -NurpP --minimal linux-3.9.4/fs/libfs.c linux-3.9.4-vs2.3.6.1/fs/libfs.c ---- linux-3.9.4/fs/libfs.c 2013-02-19 13:58:48.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/libfs.c 2013-05-31 14:47:11.000000000 +0000 -@@ -135,7 +135,8 @@ static inline unsigned char dt_type(stru +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 * both impossible due to the lock on directory. */ --int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir) +-int dcache_readdir(struct file *file, struct dir_context *ctx) +static inline int do_dcache_readdir_filter(struct file *filp, -+ void *dirent, filldir_t filldir, int (*filter)(struct dentry *dentry)) ++ struct dir_context *ctx, int (*filter)(struct dentry *dentry)) { - struct dentry *dentry = filp->f_path.dentry; - struct dentry *cursor = filp->private_data; -@@ -166,6 +167,8 @@ int dcache_readdir(struct file * filp, v - for (p=q->next; p != &dentry->d_subdirs; p=p->next) { - struct dentry *next; - next = list_entry(p, struct dentry, d_u.d_child); -+ if (filter && !filter(next)) -+ continue; - spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED); - if (!simple_positive(next)) { - spin_unlock(&next->d_lock); -@@ -192,6 +195,17 @@ int dcache_readdir(struct file * filp, v +- struct dentry *dentry = file->f_path.dentry; +- struct dentry *cursor = file->private_data; ++ struct dentry *dentry = filp->f_path.dentry; ++ struct dentry *cursor = filp->private_data; + struct list_head *p, *q = &cursor->d_child; + +- if (!dir_emit_dots(file, ctx)) ++ if (!dir_emit_dots(filp, ctx)) + return 0; + spin_lock(&dentry->d_lock); + if (ctx->pos == 2) +@@ -160,6 +161,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); ++ if (filter && !filter(next)) ++ continue; + 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 + spin_unlock(&dentry->d_lock); return 0; } ++ + EXPORT_SYMBOL(dcache_readdir); -+int dcache_readdir(struct file *filp, void *dirent, filldir_t filldir) ++int dcache_readdir(struct file *filp, struct dir_context *ctx) +{ -+ return do_dcache_readdir_filter(filp, dirent, filldir, NULL); ++ return do_dcache_readdir_filter(filp, ctx, NULL); +} + -+int dcache_readdir_filter(struct file *filp, void *dirent, filldir_t filldir, ++EXPORT_SYMBOL(dcache_readdir_filter); ++ ++int dcache_readdir_filter(struct file *filp, struct dir_context *ctx, + int (*filter)(struct dentry *)) +{ -+ return do_dcache_readdir_filter(filp, dirent, filldir, filter); ++ return do_dcache_readdir_filter(filp, ctx, filter); +} + ssize_t generic_read_dir(struct file *filp, char __user *buf, size_t siz, loff_t *ppos) { return -EISDIR; -@@ -981,6 +995,7 @@ EXPORT_SYMBOL(dcache_dir_close); - EXPORT_SYMBOL(dcache_dir_lseek); - EXPORT_SYMBOL(dcache_dir_open); - EXPORT_SYMBOL(dcache_readdir); -+EXPORT_SYMBOL(dcache_readdir_filter); - EXPORT_SYMBOL(generic_read_dir); - EXPORT_SYMBOL(mount_pseudo); - EXPORT_SYMBOL(simple_write_begin); -diff -NurpP --minimal linux-3.9.4/fs/locks.c linux-3.9.4-vs2.3.6.1/fs/locks.c ---- linux-3.9.4/fs/locks.c 2013-05-31 13:45:24.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/locks.c 2013-05-31 15:53:57.000000000 +0000 -@@ -126,6 +126,8 @@ - #include - #include - #include +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 +@@ -129,6 +129,8 @@ + #include + #include + #include +#include +#include - #include - -@@ -184,11 +186,17 @@ static void locks_init_lock_heads(struct + #define CREATE_TRACE_POINTS + #include +@@ -214,11 +216,17 @@ static void locks_init_lock_heads(struct /* Allocate an empty lock structure. */ struct file_lock *locks_alloc_lock(void) { @@ -4201,15 +4070,15 @@ diff -NurpP --minimal linux-3.9.4/fs/locks.c linux-3.9.4-vs2.3.6.1/fs/locks.c return fl; } EXPORT_SYMBOL_GPL(locks_alloc_lock); -@@ -212,6 +220,7 @@ void locks_free_lock(struct file_lock *f +@@ -246,6 +254,7 @@ void locks_free_lock(struct file_lock *f BUG_ON(!list_empty(&fl->fl_block)); - BUG_ON(!list_empty(&fl->fl_link)); + BUG_ON(!hlist_unhashed(&fl->fl_link)); + vx_locks_dec(fl); locks_release_private(fl); kmem_cache_free(filelock_cache, fl); } -@@ -221,6 +230,7 @@ void locks_init_lock(struct file_lock *f +@@ -267,6 +276,7 @@ void locks_init_lock(struct file_lock *f { memset(fl, 0, sizeof(struct file_lock)); locks_init_lock_heads(fl); @@ -4217,15 +4086,15 @@ diff -NurpP --minimal linux-3.9.4/fs/locks.c linux-3.9.4-vs2.3.6.1/fs/locks.c } EXPORT_SYMBOL(locks_init_lock); -@@ -261,6 +271,7 @@ void locks_copy_lock(struct file_lock *n - new->fl_file = fl->fl_file; - new->fl_ops = fl->fl_ops; +@@ -284,6 +294,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_xid = fl->fl_xid; + new->fl_ops = NULL; - locks_copy_private(new, fl); - } -@@ -299,6 +310,11 @@ static int flock_make_lock(struct file * + if (fl->fl_lmops) { +@@ -345,6 +356,11 @@ flock_make_lock(struct file *filp, unsig fl->fl_flags = FL_FLOCK; fl->fl_type = type; fl->fl_end = OFFSET_MAX; @@ -4235,17 +4104,17 @@ diff -NurpP --minimal linux-3.9.4/fs/locks.c linux-3.9.4-vs2.3.6.1/fs/locks.c + fl->fl_xid = filp->f_xid; + vx_locks_inc(fl); - *lock = fl; - return 0; -@@ -438,6 +454,7 @@ static int lease_init(struct file *filp, + return fl; + } +@@ -467,6 +483,7 @@ static int lease_init(struct file *filp, - fl->fl_owner = current->files; + fl->fl_owner = filp; fl->fl_pid = current->tgid; + fl->fl_xid = vx_current_xid(); fl->fl_file = filp; fl->fl_flags = FL_LEASE; -@@ -457,6 +474,11 @@ static struct file_lock *lease_alloc(str +@@ -486,6 +503,11 @@ static struct file_lock *lease_alloc(str if (fl == NULL) return ERR_PTR(error); @@ -4257,15 +4126,15 @@ diff -NurpP --minimal linux-3.9.4/fs/locks.c linux-3.9.4-vs2.3.6.1/fs/locks.c error = lease_init(filp, type, fl); if (error) { locks_free_lock(fl); -@@ -753,6 +775,7 @@ static int flock_lock_file(struct file * - lock_flocks(); +@@ -892,6 +914,7 @@ static int flock_lock_file(struct file * + spin_lock(&inode->i_lock); } + new_fl->fl_xid = -1; find_conflict: for_each_lock(inode, before) { struct file_lock *fl = *before; -@@ -773,6 +796,7 @@ find_conflict: +@@ -912,6 +935,7 @@ find_conflict: goto out; locks_copy_lock(new_fl, request); locks_insert_lock(before, new_fl); @@ -4273,26 +4142,26 @@ diff -NurpP --minimal linux-3.9.4/fs/locks.c linux-3.9.4-vs2.3.6.1/fs/locks.c new_fl = NULL; error = 0; -@@ -783,7 +807,8 @@ out: +@@ -923,7 +947,8 @@ out: return error; } -static int __posix_lock_file(struct inode *inode, struct file_lock *request, struct file_lock *conflock) +static int __posix_lock_file(struct inode *inode, struct file_lock *request, -+ struct file_lock *conflock, xid_t xid) ++ struct file_lock *conflock, vxid_t xid) { struct file_lock *fl; struct file_lock *new_fl = NULL; -@@ -793,6 +818,8 @@ static int __posix_lock_file(struct inod - struct file_lock **before; - int error, added = 0; +@@ -935,6 +960,8 @@ static int __posix_lock_file(struct inod + bool added = false; + LIST_HEAD(dispose); + 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. -@@ -803,7 +830,11 @@ static int __posix_lock_file(struct inod +@@ -945,7 +972,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(); @@ -4303,8 +4172,8 @@ diff -NurpP --minimal linux-3.9.4/fs/locks.c linux-3.9.4-vs2.3.6.1/fs/locks.c + vx_locks_inc(new_fl2); } - lock_flocks(); -@@ -1002,7 +1033,8 @@ static int __posix_lock_file(struct inod + spin_lock(&inode->i_lock); +@@ -1158,7 +1189,8 @@ static int __posix_lock_file(struct inod int posix_lock_file(struct file *filp, struct file_lock *fl, struct file_lock *conflock) { @@ -4314,24 +4183,33 @@ diff -NurpP --minimal linux-3.9.4/fs/locks.c linux-3.9.4-vs2.3.6.1/fs/locks.c } EXPORT_SYMBOL(posix_lock_file); -@@ -1092,7 +1124,7 @@ int locks_mandatory_area(int read_write, - fl.fl_end = offset + count - 1; - - for (;;) { +@@ -1252,7 +1284,7 @@ int locks_mandatory_area(int read_write, + 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); + if (!error) + break; + } +@@ -1260,7 +1292,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); if (error != FILE_LOCK_DEFERRED) break; error = wait_event_interruptible(fl.fl_wait, !fl.fl_next); -@@ -1397,6 +1429,7 @@ int generic_add_lease(struct file *filp, +@@ -1655,6 +1687,7 @@ generic_add_lease(struct file *filp, lon goto out; locks_insert_lock(before, lease); + vx_locks_inc(lease); - return 0; - - out: -@@ -1836,6 +1869,11 @@ int fcntl_setlk(unsigned int fd, struct + /* + * 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 if (file_lock == NULL) return -ENOLCK; @@ -4343,7 +4221,7 @@ diff -NurpP --minimal linux-3.9.4/fs/locks.c linux-3.9.4-vs2.3.6.1/fs/locks.c /* * This might block, so we do it before checking the inode. */ -@@ -1954,6 +1992,11 @@ int fcntl_setlk64(unsigned int fd, struc +@@ -2250,6 +2288,11 @@ int fcntl_setlk64(unsigned int fd, struc if (file_lock == NULL) return -ENOLCK; @@ -4355,38 +4233,39 @@ diff -NurpP --minimal linux-3.9.4/fs/locks.c linux-3.9.4-vs2.3.6.1/fs/locks.c /* * This might block, so we do it before checking the inode. */ -@@ -2219,8 +2262,11 @@ static int locks_show(struct seq_file *f +@@ -2557,8 +2600,11 @@ static int locks_show(struct seq_file *f - lock_get_status(f, fl, *((loff_t *)f->private), ""); + lock_get_status(f, fl, iter->li_pos, ""); - list_for_each_entry(bfl, &fl->fl_block, fl_block) + list_for_each_entry(bfl, &fl->fl_block, fl_block) { + if (!vx_check(fl->fl_xid, VS_WATCH_P | VS_IDENT)) + continue; - lock_get_status(f, bfl, *((loff_t *)f->private), " ->"); + lock_get_status(f, bfl, iter->li_pos, " ->"); + } return 0; } -diff -NurpP --minimal linux-3.9.4/fs/mount.h linux-3.9.4-vs2.3.6.1/fs/mount.h ---- linux-3.9.4/fs/mount.h 2013-02-19 13:58:48.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/mount.h 2013-05-31 14:47:11.000000000 +0000 -@@ -49,6 +49,7 @@ struct mount { +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 */ - int mnt_pinned; - int mnt_ghosts; -+ tag_t mnt_tag; /* tagging used for vfsmount */ + struct hlist_head mnt_pins; + struct path 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.9.4/fs/namei.c linux-3.9.4-vs2.3.6.1/fs/namei.c ---- linux-3.9.4/fs/namei.c 2013-05-31 14:22:27.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/namei.c 2013-06-01 00:22:21.000000000 +0000 -@@ -34,6 +34,14 @@ +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 +@@ -34,10 +34,20 @@ #include #include #include +#include ++#include +#include +#include +#include @@ -4394,10 +4273,15 @@ diff -NurpP --minimal linux-3.9.4/fs/namei.c linux-3.9.4-vs2.3.6.1/fs/namei.c +#include +#include +#include + #include #include #include "internal.h" -@@ -266,6 +274,89 @@ static int check_acl(struct inode *inode ++#include "proc/internal.h" + #include "mount.h" + + /* [Feb-1997 T. Schoebel-Theuer] +@@ -278,6 +288,93 @@ static int check_acl(struct inode *inode return -EAGAIN; } @@ -4418,7 +4302,7 @@ diff -NurpP --minimal linux-3.9.4/fs/namei.c linux-3.9.4-vs2.3.6.1/fs/namei.c + if (inode->i_sb->s_magic == DEVPTS_SUPER_MAGIC) { + /* devpts is xid tagged */ + if (S_ISDIR(inode->i_mode) || -+ vx_check((xid_t)i_tag_read(inode), VS_IDENT | VS_WATCH_P)) ++ vx_check((vxid_t)i_tag_read(inode), VS_IDENT | VS_WATCH_P)) + return 0; + + /* just pretend we didn't find anything */ @@ -4427,8 +4311,12 @@ diff -NurpP --minimal linux-3.9.4/fs/namei.c linux-3.9.4-vs2.3.6.1/fs/namei.c + else if (inode->i_sb->s_magic == PROC_SUPER_MAGIC) { + struct proc_dir_entry *de = PDE(inode); + -+ if (de && !vx_hide_check(0, de->vx_flags)) ++ if (de && !vx_hide_check(0, de->vx_flags)) { ++ vxdprintk(VXD_CBIT(misc, 9), ++ VS_Q("%*s") " hidden by _dx_permission", ++ de->namelen, de->name); + goto out; ++ } + + if ((mask & (MAY_WRITE | MAY_APPEND))) { + struct pid *pid; @@ -4460,7 +4348,7 @@ diff -NurpP --minimal linux-3.9.4/fs/namei.c linux-3.9.4-vs2.3.6.1/fs/namei.c + } + else { + if (dx_notagcheck(inode->i_sb) || -+ dx_check((xid_t)i_tag_read(inode), ++ dx_check((vxid_t)i_tag_read(inode), + DX_HOSTID | DX_ADMIN | DX_WATCH | DX_IDENT)) + return 0; + } @@ -4478,8 +4366,8 @@ diff -NurpP --minimal linux-3.9.4/fs/namei.c linux-3.9.4-vs2.3.6.1/fs/namei.c +#endif + vxwprintk_task(1, + "denied [0x%x] access to inode %s:%p[#%d,%lu]", -+ mask, inode->i_sb->s_id, inode, inode->i_tag, -+ inode->i_ino); ++ mask, inode->i_sb->s_id, inode, ++ i_tag_read(inode), inode->i_ino); + } + return ret; +} @@ -4487,7 +4375,7 @@ diff -NurpP --minimal linux-3.9.4/fs/namei.c linux-3.9.4-vs2.3.6.1/fs/namei.c /* * This does the basic permission checking */ -@@ -388,10 +479,14 @@ int __inode_permission(struct inode *ino +@@ -402,10 +499,14 @@ int __inode_permission(struct inode *ino /* * Nobody gets write access to an immutable file. */ @@ -4503,17 +4391,7 @@ diff -NurpP --minimal linux-3.9.4/fs/namei.c linux-3.9.4-vs2.3.6.1/fs/namei.c retval = do_inode_permission(inode, mask); if (retval) return retval; -@@ -1238,7 +1333,8 @@ static void follow_dotdot(struct nameida - - if (nd->path.dentry == nd->root.dentry && - nd->path.mnt == nd->root.mnt) { -- break; -+ /* for sane '/' avoid follow_mount() */ -+ return; - } - if (nd->path.dentry != nd->path.mnt->mnt_root) { - /* rare case of legitimate dget_parent()... */ -@@ -1383,6 +1479,9 @@ static int lookup_fast(struct nameidata +@@ -1416,6 +1517,9 @@ static int lookup_fast(struct nameidata goto unlazy; } } @@ -4522,9 +4400,9 @@ diff -NurpP --minimal linux-3.9.4/fs/namei.c linux-3.9.4-vs2.3.6.1/fs/namei.c + path->mnt = mnt; path->dentry = dentry; - if (unlikely(!__follow_mount_rcu(nd, path, inode))) -@@ -1413,6 +1512,8 @@ unlazy: - } + if (likely(__follow_mount_rcu(nd, path, inode))) +@@ -1442,6 +1546,8 @@ unlazy: + goto need_lookup; } + /* FIXME: check dx permission */ @@ -4532,16 +4410,16 @@ diff -NurpP --minimal linux-3.9.4/fs/namei.c linux-3.9.4-vs2.3.6.1/fs/namei.c path->mnt = mnt; path->dentry = dentry; err = follow_managed(path, nd->flags); -@@ -2237,7 +2338,7 @@ static int may_delete(struct inode *dir, - if (IS_APPEND(dir)) +@@ -2434,7 +2540,7 @@ static int may_delete(struct inode *dir, return -EPERM; - if (check_sticky(dir, victim->d_inode)||IS_APPEND(victim->d_inode)|| -- IS_IMMUTABLE(victim->d_inode) || IS_SWAPFILE(victim->d_inode)) -+ IS_IXORUNLINK(victim->d_inode) || IS_SWAPFILE(victim->d_inode)) + + if (check_sticky(dir, inode) || IS_APPEND(inode) || +- IS_IMMUTABLE(inode) || IS_SWAPFILE(inode)) ++ IS_IXORUNLINK(inode) || IS_SWAPFILE(inode)) return -EPERM; if (isdir) { - if (!S_ISDIR(victim->d_inode->i_mode)) -@@ -2316,19 +2417,25 @@ int vfs_create(struct inode *dir, struct + if (!d_is_dir(victim)) +@@ -2516,19 +2622,25 @@ int vfs_create(struct inode *dir, struct bool want_excl) { int error = may_create(dir, dentry); @@ -4568,8 +4446,8 @@ diff -NurpP --minimal linux-3.9.4/fs/namei.c linux-3.9.4-vs2.3.6.1/fs/namei.c + vxdprintk(VXD_CBIT(misc, 3), "i_op->create failed with %d", error); return error; } - -@@ -2363,6 +2470,15 @@ static int may_open(struct path *path, i + EXPORT_SYMBOL(vfs_create); +@@ -2564,6 +2676,15 @@ static int may_open(struct path *path, i break; } @@ -4585,7 +4463,7 @@ diff -NurpP --minimal linux-3.9.4/fs/namei.c linux-3.9.4-vs2.3.6.1/fs/namei.c error = inode_permission(inode, acc_mode); if (error) return error; -@@ -2865,6 +2981,16 @@ finish_open: +@@ -3058,6 +3179,16 @@ finish_open: } finish_open_created: error = may_open(&nd->path, acc_mode, open_flag); @@ -4601,8 +4479,8 @@ diff -NurpP --minimal linux-3.9.4/fs/namei.c linux-3.9.4-vs2.3.6.1/fs/namei.c +#endif if (error) goto out; - file->f_path.mnt = nd->path.mnt; -@@ -2929,6 +3055,7 @@ static struct file *path_openat(int dfd, + +@@ -3187,6 +3318,7 @@ static struct file *path_openat(int dfd, int opened = 0; int error; @@ -4610,7 +4488,7 @@ diff -NurpP --minimal linux-3.9.4/fs/namei.c linux-3.9.4-vs2.3.6.1/fs/namei.c file = get_empty_filp(); if (IS_ERR(file)) return file; -@@ -2965,6 +3092,16 @@ static struct file *path_openat(int dfd, +@@ -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); } @@ -4627,7 +4505,7 @@ diff -NurpP --minimal linux-3.9.4/fs/namei.c linux-3.9.4-vs2.3.6.1/fs/namei.c out: if (nd->root.mnt && !(nd->flags & LOOKUP_ROOT)) path_put(&nd->root); -@@ -3079,6 +3216,11 @@ struct dentry *kern_path_create(int dfd, +@@ -3343,6 +3485,11 @@ struct dentry *kern_path_create(int dfd, goto fail; } *path = nd.path; @@ -4639,7 +4517,7 @@ diff -NurpP --minimal linux-3.9.4/fs/namei.c linux-3.9.4-vs2.3.6.1/fs/namei.c return dentry; fail: dput(dentry); -@@ -3573,7 +3715,7 @@ int vfs_link(struct dentry *old_dentry, +@@ -3899,7 +4046,7 @@ int vfs_link(struct dentry *old_dentry, /* * A link to an append-only or immutable file cannot be created. */ @@ -4648,9 +4526,9 @@ diff -NurpP --minimal linux-3.9.4/fs/namei.c linux-3.9.4-vs2.3.6.1/fs/namei.c return -EPERM; if (!dir->i_op->link) return -EPERM; -@@ -3976,6 +4118,286 @@ int vfs_follow_link(struct nameidata *nd - return __vfs_follow_link(nd, link); +@@ -4404,6 +4551,289 @@ int generic_readlink(struct dentry *dent } + EXPORT_SYMBOL(generic_readlink); + +#ifdef CONFIG_VSERVER_COWBL @@ -4659,8 +4537,9 @@ diff -NurpP --minimal linux-3.9.4/fs/namei.c linux-3.9.4-vs2.3.6.1/fs/namei.c +long do_cow_splice(struct file *in, struct file *out, size_t len) +{ + loff_t ppos = 0; ++ loff_t opos = 0; + -+ return do_splice_direct(in, &ppos, out, len, 0); ++ return do_splice_direct(in, &ppos, out, &opos, len, 0); +} + +struct dentry *cow_break_link(const char *pathname) @@ -4833,7 +4712,7 @@ diff -NurpP --minimal linux-3.9.4/fs/namei.c linux-3.9.4-vs2.3.6.1/fs/namei.c + old_dentry->d_name.len, old_dentry->d_name.name, + old_dentry->d_name.len); + ret = vfs_rename(dir_nd.path.dentry->d_inode, new_dentry, -+ old_dentry->d_parent->d_inode, old_dentry); ++ old_dentry->d_parent->d_inode, old_dentry, NULL, 0); + vxdprintk(VXD_CBIT(misc, 2), "vfs_rename: %d", ret); + +out_unlock: @@ -4867,7 +4746,7 @@ diff -NurpP --minimal linux-3.9.4/fs/namei.c linux-3.9.4-vs2.3.6.1/fs/namei.c + goto out_redo; + + /* error path cleanup */ -+ vfs_unlink(dir->d_inode, new_dentry); ++ vfs_unlink(dir->d_inode, new_dentry, NULL); + +out_redo: + if (!redo) @@ -4931,22 +4810,19 @@ diff -NurpP --minimal linux-3.9.4/fs/namei.c linux-3.9.4-vs2.3.6.1/fs/namei.c + kfree(pstr); + return length; +} ++ ++EXPORT_SYMBOL(vx_info_mnt_namespace); + /* get the link contents into pagecache */ static char *page_getlink(struct dentry * dentry, struct page **ppage) { -@@ -4099,3 +4521,4 @@ EXPORT_SYMBOL(vfs_symlink); - EXPORT_SYMBOL(vfs_unlink); - EXPORT_SYMBOL(dentry_unhash); - EXPORT_SYMBOL(generic_readlink); -+EXPORT_SYMBOL(vx_info_mnt_namespace); -diff -NurpP --minimal linux-3.9.4/fs/namespace.c linux-3.9.4-vs2.3.6.1/fs/namespace.c ---- linux-3.9.4/fs/namespace.c 2013-05-31 14:22:27.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/namespace.c 2013-05-31 18:47:18.000000000 +0000 -@@ -22,6 +22,11 @@ - #include /* fsnotify_vfsmount_delete */ - #include - #include +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 +@@ -24,6 +24,11 @@ + #include + #include + #include +#include +#include +#include @@ -4955,7 +4831,7 @@ diff -NurpP --minimal linux-3.9.4/fs/namespace.c linux-3.9.4-vs2.3.6.1/fs/namesp #include "pnode.h" #include "internal.h" -@@ -751,6 +756,10 @@ vfs_kern_mount(struct file_system_type * +@@ -897,6 +902,10 @@ vfs_kern_mount(struct file_system_type * if (!type) return ERR_PTR(-ENODEV); @@ -4966,64 +4842,66 @@ diff -NurpP --minimal linux-3.9.4/fs/namespace.c linux-3.9.4-vs2.3.6.1/fs/namesp mnt = alloc_vfsmnt(name); if (!mnt) return ERR_PTR(-ENOMEM); -@@ -807,6 +816,7 @@ static struct mount *clone_mnt(struct mo +@@ -971,6 +980,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; -+ mnt->mnt_tag = old->mnt_tag; - br_write_lock(&vfsmount_lock); ++ mnt->mnt_tag = old->mnt_tag; + lock_mount_hash(); list_add_tail(&mnt->mnt_instance, &sb->s_mounts); - br_write_unlock(&vfsmount_lock); -@@ -1639,6 +1649,7 @@ static int do_change_type(struct path *p + unlock_mount_hash(); +@@ -1508,7 +1518,8 @@ out_unlock: + */ + static inline bool may_mount(void) + { +- return ns_capable(current->nsproxy->mnt_ns->user_ns, CAP_SYS_ADMIN); ++ return vx_ns_capable(current->nsproxy->mnt_ns->user_ns, ++ CAP_SYS_ADMIN, VXC_SECURE_MOUNT); + } + + /* +@@ -1969,6 +1980,7 @@ static int do_change_type(struct path *p if (err) goto out_unlock; } + // mnt->mnt_flags = mnt_flags; - br_write_lock(&vfsmount_lock); + lock_mount_hash(); for (m = mnt; m; m = (recurse ? next_mnt(m, mnt) : NULL)) -@@ -1654,12 +1665,14 @@ static int do_change_type(struct path *p +@@ -1997,12 +2009,14 @@ static bool has_locked_children(struct m * do loopback mount. */ static int do_loopback(struct path *path, const char *old_name, - int recurse) -+ tag_t tag, unsigned long flags, int mnt_flags) ++ vtag_t tag, unsigned long flags, int mnt_flags) { - LIST_HEAD(umount_list); struct path old_path; - struct mount *mnt = NULL, *old; + struct mount *mnt = NULL, *old, *parent; + struct mountpoint *mp; + int recurse = flags & MS_REC; int err; + if (!old_name || !*old_name) return -EINVAL; err = kern_path(old_name, LOOKUP_FOLLOW|LOOKUP_AUTOMOUNT, &old_path); -@@ -1733,7 +1746,7 @@ static int change_mount_flags(struct vfs +@@ -2079,7 +2093,7 @@ static int change_mount_flags(struct vfs * on it - tough luck. */ static int do_remount(struct path *path, int flags, int mnt_flags, - void *data) -+ void *data, xid_t xid) ++ void *data, vxid_t xid) { int err; struct super_block *sb = path->mnt->mnt_sb; -@@ -2046,7 +2059,6 @@ void mark_mounts_for_expiry(struct list_ - } - br_write_unlock(&vfsmount_lock); - up_write(&namespace_sem); -- - release_mounts(&umounts); - } - -@@ -2218,6 +2230,7 @@ long do_mount(const char *dev_name, cons +@@ -2579,6 +2593,7 @@ long do_mount(const char *dev_name, cons struct path path; int retval = 0; int mnt_flags = 0; -+ tag_t tag = 0; ++ vtag_t tag = 0; /* Discard magic */ if ((flags & MS_MGC_MSK) == MS_MGC_VAL) -@@ -2247,6 +2260,12 @@ long do_mount(const char *dev_name, cons +@@ -2604,6 +2619,12 @@ long do_mount(const char *dev_name, cons if (!(flags & MS_NOATIME)) mnt_flags |= MNT_RELATIME; @@ -5036,9 +4914,9 @@ diff -NurpP --minimal linux-3.9.4/fs/namespace.c linux-3.9.4-vs2.3.6.1/fs/namesp /* Separate the per-mountpoint flags */ if (flags & MS_NOSUID) mnt_flags |= MNT_NOSUID; -@@ -2263,15 +2282,17 @@ long do_mount(const char *dev_name, cons - if (flags & MS_RDONLY) - mnt_flags |= MNT_READONLY; +@@ -2628,15 +2649,17 @@ long do_mount(const char *dev_name, cons + mnt_flags |= path.mnt->mnt_flags & MNT_ATIME_MASK; + } + if (!vx_capable(CAP_SYS_ADMIN, VXC_DEV_MOUNT)) + mnt_flags |= MNT_NODEV; @@ -5056,20 +4934,20 @@ diff -NurpP --minimal linux-3.9.4/fs/namespace.c linux-3.9.4-vs2.3.6.1/fs/namesp else if (flags & (MS_SHARED | MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE)) retval = do_change_type(&path, flags); else if (flags & MS_MOVE) -@@ -2380,6 +2401,7 @@ static struct mnt_namespace *dup_mnt_ns( - q = next_mnt(q, new); +@@ -2752,6 +2775,7 @@ struct mnt_namespace *copy_mnt_ns(unsign + p = next_mnt(p, old); } - up_write(&namespace_sem); + namespace_unlock(); + atomic_inc(&vs_global_mnt_ns); if (rootmnt) mntput(rootmnt); -@@ -2575,9 +2597,10 @@ SYSCALL_DEFINE2(pivot_root, const char _ - error = -EINVAL; +@@ -2926,9 +2950,10 @@ SYSCALL_DEFINE2(pivot_root, const char _ new_mnt = real_mount(new.mnt); root_mnt = real_mount(root.mnt); -- if (IS_MNT_SHARED(real_mount(old.mnt)) || -+ if ((IS_MNT_SHARED(real_mount(old.mnt)) || + old_mnt = real_mount(old.mnt); +- if (IS_MNT_SHARED(old_mnt) || ++ if ((IS_MNT_SHARED(old_mnt) || IS_MNT_SHARED(new_mnt->mnt_parent) || - IS_MNT_SHARED(root_mnt->mnt_parent)) + IS_MNT_SHARED(root_mnt->mnt_parent)) && @@ -5077,18 +4955,18 @@ diff -NurpP --minimal linux-3.9.4/fs/namespace.c linux-3.9.4-vs2.3.6.1/fs/namesp goto out4; if (!check_mnt(root_mnt) || !check_mnt(new_mnt)) goto out4; -@@ -2703,6 +2726,7 @@ void put_mnt_ns(struct mnt_namespace *ns - br_write_unlock(&vfsmount_lock); - up_write(&namespace_sem); - release_mounts(&umount_list); +@@ -3063,6 +3088,7 @@ void put_mnt_ns(struct mnt_namespace *ns + if (!atomic_dec_and_test(&ns->count)) + return; + drop_collected_mounts(&ns->root->mnt); + atomic_dec(&vs_global_mnt_ns); free_mnt_ns(ns); } -diff -NurpP --minimal linux-3.9.4/fs/nfs/client.c linux-3.9.4-vs2.3.6.1/fs/nfs/client.c ---- linux-3.9.4/fs/nfs/client.c 2013-05-31 13:45:24.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/nfs/client.c 2013-05-31 14:47:11.000000000 +0000 -@@ -682,6 +682,9 @@ int nfs_init_server_rpcclient(struct nfs +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 if (server->flags & NFS_MOUNT_SOFT) server->client->cl_softrtry = 1; @@ -5098,7 +4976,7 @@ diff -NurpP --minimal linux-3.9.4/fs/nfs/client.c linux-3.9.4-vs2.3.6.1/fs/nfs/c return 0; } EXPORT_SYMBOL_GPL(nfs_init_server_rpcclient); -@@ -861,6 +864,10 @@ static void nfs_server_set_fsinfo(struct +@@ -871,6 +874,10 @@ static void nfs_server_set_fsinfo(struct server->acdirmin = server->acdirmax = 0; } @@ -5109,10 +4987,10 @@ diff -NurpP --minimal linux-3.9.4/fs/nfs/client.c linux-3.9.4-vs2.3.6.1/fs/nfs/c server->maxfilesize = fsinfo->maxfilesize; server->time_delta = fsinfo->time_delta; -diff -NurpP --minimal linux-3.9.4/fs/nfs/dir.c linux-3.9.4-vs2.3.6.1/fs/nfs/dir.c ---- linux-3.9.4/fs/nfs/dir.c 2013-05-31 13:45:24.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/nfs/dir.c 2013-05-31 14:47:11.000000000 +0000 -@@ -36,6 +36,7 @@ +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 +@@ -37,6 +37,7 @@ #include #include #include @@ -5120,7 +4998,7 @@ diff -NurpP --minimal linux-3.9.4/fs/nfs/dir.c linux-3.9.4-vs2.3.6.1/fs/nfs/dir. #include "delegation.h" #include "iostat.h" -@@ -1300,6 +1301,7 @@ struct dentry *nfs_lookup(struct inode * +@@ -1392,6 +1393,7 @@ struct dentry *nfs_lookup(struct inode * /* Success: notify readdir to use READDIRPLUS */ nfs_advise_use_readdirplus(dir); @@ -5128,94 +5006,89 @@ diff -NurpP --minimal linux-3.9.4/fs/nfs/dir.c linux-3.9.4-vs2.3.6.1/fs/nfs/dir. no_entry: res = d_materialise_unique(dentry, inode); if (res != NULL) { -diff -NurpP --minimal linux-3.9.4/fs/nfs/inode.c linux-3.9.4-vs2.3.6.1/fs/nfs/inode.c ---- linux-3.9.4/fs/nfs/inode.c 2013-05-31 13:45:24.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/nfs/inode.c 2013-05-31 20:37:45.000000000 +0000 -@@ -39,6 +39,7 @@ +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 +@@ -38,6 +38,7 @@ + #include #include #include - #include +#include #include -@@ -290,6 +291,8 @@ nfs_fhget(struct super_block *sb, struct +@@ -368,6 +369,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; -+ uid_t uid; -+ gid_t gid; ++ kuid_t kuid; ++ kgid_t kgid; /* We set i_ino for the few things that still rely on it, * such as stat(2) */ -@@ -334,8 +337,8 @@ nfs_fhget(struct super_block *sb, struct +@@ -412,8 +415,8 @@ nfs_fhget(struct super_block *sb, struct inode->i_version = 0; inode->i_size = 0; clear_nlink(inode); - inode->i_uid = make_kuid(&init_user_ns, -2); - inode->i_gid = make_kgid(&init_user_ns, -2); -+ uid = make_kuid(&init_user_ns, -2); -+ gid = make_kgid(&init_user_ns, -2); ++ kuid = make_kuid(&init_user_ns, -2); ++ kgid = make_kgid(&init_user_ns, -2); inode->i_blocks = 0; memset(nfsi->cookieverf, 0, sizeof(nfsi->cookieverf)); nfsi->write_io = 0; -@@ -369,11 +372,11 @@ nfs_fhget(struct super_block *sb, struct +@@ -447,11 +450,11 @@ nfs_fhget(struct super_block *sb, struct else if (nfs_server_capable(inode, NFS_CAP_NLINK)) - nfsi->cache_validity |= NFS_INO_INVALID_ATTR; + nfs_set_cache_invalid(inode, NFS_INO_INVALID_ATTR); if (fattr->valid & NFS_ATTR_FATTR_OWNER) - inode->i_uid = fattr->uid; -+ uid = fattr->uid; ++ kuid = fattr->uid; else if (nfs_server_capable(inode, NFS_CAP_OWNER)) - nfsi->cache_validity |= NFS_INO_INVALID_ATTR; + nfs_set_cache_invalid(inode, NFS_INO_INVALID_ATTR); if (fattr->valid & NFS_ATTR_FATTR_GROUP) - inode->i_gid = fattr->gid; -+ gid = fattr->gid; ++ kgid = fattr->gid; else if (nfs_server_capable(inode, NFS_CAP_OWNER_GROUP)) - nfsi->cache_validity |= NFS_INO_INVALID_ATTR; + nfs_set_cache_invalid(inode, NFS_INO_INVALID_ATTR); if (fattr->valid & NFS_ATTR_FATTR_BLOCKS_USED) -@@ -384,6 +387,11 @@ nfs_fhget(struct super_block *sb, struct +@@ -462,6 +465,10 @@ nfs_fhget(struct super_block *sb, struct */ inode->i_blocks = nfs_calc_block_size(fattr->du.nfs3.used); } -+ inode->i_uid = INOTAG_UID(DX_TAG(inode), uid, gid); -+ inode->i_gid = INOTAG_GID(DX_TAG(inode), uid, gid); -+ inode->i_tag = INOTAG_TAG(DX_TAG(inode), uid, gid, 0); ++ inode->i_uid = INOTAG_KUID(DX_TAG(inode), kuid, kgid); ++ inode->i_gid = INOTAG_KGID(DX_TAG(inode), kuid, kgid); ++ inode->i_tag = INOTAG_KTAG(DX_TAG(inode), kuid, kgid, GLOBAL_ROOT_TAG); + /* maybe fattr->xid someday */ -+ - nfsi->attrtimeo = NFS_MINATTRTIMEO(inode); - nfsi->attrtimeo_timestamp = now; - nfsi->access_cache = RB_ROOT; -@@ -505,6 +513,8 @@ void nfs_setattr_update_inode(struct ino + + nfs_setsecurity(inode, fattr, label); + +@@ -592,6 +599,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; + if ((attr->ia_valid & ATTR_TAG) && IS_TAGGED(inode)) + inode->i_tag = attr->ia_tag; - NFS_I(inode)->cache_validity |= NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL; + nfs_set_cache_invalid(inode, NFS_INO_INVALID_ACCESS + | NFS_INO_INVALID_ACL); spin_unlock(&inode->i_lock); - } -@@ -980,6 +990,11 @@ static int nfs_check_inode_attributes(st +@@ -1171,7 +1180,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; +- + kuid_t kuid; + kgid_t kgid; + ktag_t ktag; -+ uid_t uid; -+ gid_t gid; - if (nfs_have_delegated_attributes(inode)) -@@ -1005,13 +1020,21 @@ static int nfs_check_inode_attributes(st + return 0; +@@ -1196,13 +1207,18 @@ static int nfs_check_inode_attributes(st invalid |= NFS_INO_INVALID_ATTR|NFS_INO_REVAL_PAGECACHE; } -+ uid = from_kuid(&init_user_ns, fattr->uid); -+ gid = from_kgid(&init_user_ns, fattr->gid); -+ -+ kuid = make_kuid(&init_user_ns, INOTAG_UID(DX_TAG(inode), uid, gid)); -+ kgid = make_kgid(&init_user_ns, INOTAG_GID(DX_TAG(inode), uid, gid)); -+ ktag = make_ktag(&init_user_ns, INOTAG_TAG(DX_TAG(inode), uid, gid, 0)); ++ kuid = INOTAG_KUID(DX_TAG(inode), fattr->uid, fattr->gid); ++ kgid = INOTAG_KGID(DX_TAG(inode), fattr->uid, fattr->gid); ++ ktag = INOTAG_KTAG(DX_TAG(inode), fattr->uid, fattr->gid, GLOBAL_ROOT_TAG); + /* Have any file permissions changed? */ if ((fattr->valid & NFS_ATTR_FATTR_MODE) && (inode->i_mode & S_IALLUGO) != (fattr->mode & S_IALLUGO)) @@ -5230,40 +5103,40 @@ diff -NurpP --minimal linux-3.9.4/fs/nfs/inode.c linux-3.9.4-vs2.3.6.1/fs/nfs/in /* Has the link count changed? */ if ((fattr->valid & NFS_ATTR_FATTR_NLINK) && inode->i_nlink != fattr->nlink) -@@ -1317,6 +1340,9 @@ static int nfs_update_inode(struct inode +@@ -1533,6 +1549,9 @@ static int nfs_update_inode(struct inode unsigned long invalid = 0; unsigned long now = jiffies; unsigned long save_cache_validity; -+ uid_t uid; -+ gid_t gid; -+ tag_t tag; ++ kuid_t kuid; ++ kgid_t kgid; ++ ktag_t ktag; - dfprintk(VFS, "NFS: %s(%s/%ld fh_crc=0x%08x ct=%d info=0x%x)\n", + 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, -@@ -1418,6 +1444,9 @@ static int nfs_update_inode(struct inode +@@ -1637,6 +1656,9 @@ static int nfs_update_inode(struct inode | NFS_INO_REVAL_PAGECACHE | NFS_INO_REVAL_FORCED); -+ uid = TAGINO_UID(DX_TAG(inode), inode->i_uid, inode->i_tag); -+ gid = TAGINO_GID(DX_TAG(inode), inode->i_gid, inode->i_tag); -+ tag = inode->i_tag; ++ kuid = TAGINO_KUID(DX_TAG(inode), inode->i_uid, inode->i_tag); ++ kgid = TAGINO_KGID(DX_TAG(inode), inode->i_gid, inode->i_tag); ++ ktag = TAGINO_KTAG(DX_TAG(inode), inode->i_tag); if (fattr->valid & NFS_ATTR_FATTR_ATIME) memcpy(&inode->i_atime, &fattr->atime, sizeof(inode->i_atime)); -@@ -1460,6 +1489,10 @@ static int nfs_update_inode(struct inode +@@ -1683,6 +1705,10 @@ static int nfs_update_inode(struct inode | NFS_INO_INVALID_ACL | NFS_INO_REVAL_FORCED); -+ inode->i_uid = INOTAG_UID(DX_TAG(inode), uid, gid); -+ inode->i_gid = INOTAG_GID(DX_TAG(inode), uid, gid); -+ inode->i_tag = INOTAG_TAG(DX_TAG(inode), uid, gid, tag); ++ inode->i_uid = INOTAG_KUID(DX_TAG(inode), kuid, kgid); ++ inode->i_gid = INOTAG_KGID(DX_TAG(inode), kuid, kgid); ++ inode->i_tag = INOTAG_KTAG(DX_TAG(inode), kuid, kgid, ktag); + if (fattr->valid & NFS_ATTR_FATTR_NLINK) { if (inode->i_nlink != fattr->nlink) { invalid |= NFS_INO_INVALID_ATTR; -diff -NurpP --minimal linux-3.9.4/fs/nfs/nfs3xdr.c linux-3.9.4-vs2.3.6.1/fs/nfs/nfs3xdr.c ---- linux-3.9.4/fs/nfs/nfs3xdr.c 2013-05-31 13:45:24.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/nfs/nfs3xdr.c 2013-05-31 15:33:48.000000000 +0000 +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 @@ -20,6 +20,7 @@ #include #include @@ -5291,8 +5164,8 @@ diff -NurpP --minimal linux-3.9.4/fs/nfs/nfs3xdr.c linux-3.9.4-vs2.3.6.1/fs/nfs/ + (tag && (attr->ia_valid & ATTR_TAG))) { *p++ = xdr_one; - *p++ = cpu_to_be32(from_kuid(&init_user_ns, attr->ia_uid)); -+ *p++ = cpu_to_be32(TAGINO_UID(tag, -+ from_kuid(&init_user_ns, attr->ia_uid), attr->ia_tag)); ++ *p++ = cpu_to_be32(from_kuid(&init_user_ns, ++ TAGINO_KUID(tag, attr->ia_uid, attr->ia_tag))); } else *p++ = xdr_zero; @@ -5301,8 +5174,8 @@ diff -NurpP --minimal linux-3.9.4/fs/nfs/nfs3xdr.c linux-3.9.4-vs2.3.6.1/fs/nfs/ + (tag && (attr->ia_valid & ATTR_TAG))) { *p++ = xdr_one; - *p++ = cpu_to_be32(from_kgid(&init_user_ns, attr->ia_gid)); -+ *p++ = cpu_to_be32(TAGINO_GID(tag, -+ from_kgid(&init_user_ns, attr->ia_gid), attr->ia_tag)); ++ *p++ = cpu_to_be32(from_kgid(&init_user_ns, ++ TAGINO_KGID(tag, attr->ia_gid, attr->ia_tag))); } else *p++ = xdr_zero; @@ -5409,9 +5282,9 @@ diff -NurpP --minimal linux-3.9.4/fs/nfs/nfs3xdr.c linux-3.9.4-vs2.3.6.1/fs/nfs/ } /* -diff -NurpP --minimal linux-3.9.4/fs/nfs/super.c linux-3.9.4-vs2.3.6.1/fs/nfs/super.c ---- linux-3.9.4/fs/nfs/super.c 2013-05-31 13:45:24.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/nfs/super.c 2013-05-31 15:41:34.000000000 +0000 +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 @@ #include #include @@ -5449,7 +5322,7 @@ diff -NurpP --minimal linux-3.9.4/fs/nfs/super.c linux-3.9.4-vs2.3.6.1/fs/nfs/su /* The following needs to be listed after all other options */ { Opt_nfsvers, "v%s" }, -@@ -635,6 +644,7 @@ static void nfs_show_mount_options(struc +@@ -638,6 +647,7 @@ static void nfs_show_mount_options(struc { NFS_MOUNT_NORDIRPLUS, ",nordirplus", "" }, { NFS_MOUNT_UNSHARED, ",nosharecache", "" }, { NFS_MOUNT_NORESVPORT, ",noresvport", "" }, @@ -5457,7 +5330,7 @@ diff -NurpP --minimal linux-3.9.4/fs/nfs/super.c linux-3.9.4-vs2.3.6.1/fs/nfs/su { 0, NULL, NULL } }; const struct proc_nfs_info *nfs_infop; -@@ -1261,6 +1271,14 @@ static int nfs_parse_mount_options(char +@@ -1320,6 +1330,14 @@ static int nfs_parse_mount_options(char case Opt_nomigration: mnt->options &= NFS_OPTION_MIGRATION; break; @@ -5472,7 +5345,7 @@ diff -NurpP --minimal linux-3.9.4/fs/nfs/super.c linux-3.9.4-vs2.3.6.1/fs/nfs/su /* * options that take numeric values -@@ -1347,6 +1365,12 @@ static int nfs_parse_mount_options(char +@@ -1406,6 +1424,12 @@ static int nfs_parse_mount_options(char goto out_invalid_value; mnt->minorversion = option; break; @@ -5485,30 +5358,30 @@ diff -NurpP --minimal linux-3.9.4/fs/nfs/super.c linux-3.9.4-vs2.3.6.1/fs/nfs/su /* * options that take text values -diff -NurpP --minimal linux-3.9.4/fs/nfsd/auth.c linux-3.9.4-vs2.3.6.1/fs/nfsd/auth.c ---- linux-3.9.4/fs/nfsd/auth.c 2013-05-31 13:45:24.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/nfsd/auth.c 2013-05-31 14:47:11.000000000 +0000 -@@ -2,6 +2,7 @@ +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 +@@ -1,6 +1,7 @@ + /* Copyright (C) 1995, 1996 Olaf Kirch */ #include - #include +#include #include "nfsd.h" #include "auth.h" -@@ -37,6 +38,9 @@ int nfsd_setuser(struct svc_rqst *rqstp, +@@ -35,6 +36,9 @@ int nfsd_setuser(struct svc_rqst *rqstp, new->fsuid = rqstp->rq_cred.cr_uid; new->fsgid = rqstp->rq_cred.cr_gid; + /* FIXME: this desperately needs a tag :) -+ new->xid = (xid_t)INOTAG_TAG(DX_TAG_NFSD, cred.cr_uid, cred.cr_gid, 0); ++ new->xid = (vxid_t)INOTAG_TAG(DX_TAG_NFSD, cred.cr_uid, cred.cr_gid, 0); + */ rqgi = rqstp->rq_cred.cr_group_info; -diff -NurpP --minimal linux-3.9.4/fs/nfsd/nfs3xdr.c linux-3.9.4-vs2.3.6.1/fs/nfsd/nfs3xdr.c ---- linux-3.9.4/fs/nfsd/nfs3xdr.c 2013-05-31 13:45:24.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/nfsd/nfs3xdr.c 2013-05-31 16:17:38.000000000 +0000 +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 @@ -8,6 +8,7 @@ #include @@ -5521,8 +5394,8 @@ diff -NurpP --minimal linux-3.9.4/fs/nfsd/nfs3xdr.c linux-3.9.4-vs2.3.6.1/fs/nfs decode_sattr3(__be32 *p, struct iattr *iap) { u32 tmp; -+ uid_t uid = 0; -+ gid_t gid = 0; ++ kuid_t kuid = GLOBAL_ROOT_UID; ++ kgid_t kgid = GLOBAL_ROOT_GID; iap->ia_valid = 0; @@ -5531,41 +5404,41 @@ diff -NurpP --minimal linux-3.9.4/fs/nfsd/nfs3xdr.c linux-3.9.4-vs2.3.6.1/fs/nfs } if (*p++) { - iap->ia_uid = make_kuid(&init_user_ns, ntohl(*p++)); -+ uid = make_kuid(&init_user_ns, ntohl(*p++)); ++ kuid = make_kuid(&init_user_ns, ntohl(*p++)); if (uid_valid(iap->ia_uid)) iap->ia_valid |= ATTR_UID; } if (*p++) { - iap->ia_gid = make_kgid(&init_user_ns, ntohl(*p++)); -+ gid = make_kgid(&init_user_ns, ntohl(*p++)); ++ kgid = make_kgid(&init_user_ns, ntohl(*p++)); if (gid_valid(iap->ia_gid)) iap->ia_valid |= ATTR_GID; } -+ iap->ia_uid = INOTAG_UID(DX_TAG_NFSD, uid, gid); -+ iap->ia_gid = INOTAG_GID(DX_TAG_NFSD, uid, gid); -+ iap->ia_tag = INOTAG_TAG(DX_TAG_NFSD, uid, gid, 0); ++ iap->ia_uid = INOTAG_KUID(DX_TAG_NFSD, kuid, kgid); ++ iap->ia_gid = INOTAG_KGID(DX_TAG_NFSD, kuid, kgid); ++ iap->ia_tag = INOTAG_KTAG(DX_TAG_NFSD, kuid, kgid, GLOBAL_ROOT_TAG); if (*p++) { u64 newsize; -@@ -170,8 +176,12 @@ encode_fattr3(struct svc_rqst *rqstp, __ +@@ -167,8 +173,12 @@ encode_fattr3(struct svc_rqst *rqstp, __ *p++ = htonl(nfs3_ftypes[(stat->mode & S_IFMT) >> 12]); - *p++ = htonl((u32) stat->mode); + *p++ = htonl((u32) (stat->mode & S_IALLUGO)); *p++ = htonl((u32) stat->nlink); - *p++ = htonl((u32) from_kuid(&init_user_ns, stat->uid)); - *p++ = htonl((u32) from_kgid(&init_user_ns, stat->gid)); + *p++ = htonl((u32) from_kuid(&init_user_ns, -+ TAGINO_UID(0 /* FIXME: DX_TAG(dentry->d_inode) */, ++ TAGINO_KUID(0 /* FIXME: DX_TAG(dentry->d_inode) */, + stat->uid, stat->tag))); + *p++ = htonl((u32) from_kgid(&init_user_ns, -+ TAGINO_GID(0 /* FIXME: DX_TAG(dentry->d_inode) */, ++ TAGINO_KGID(0 /* FIXME: DX_TAG(dentry->d_inode) */, + stat->gid, stat->tag))); if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) { p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN); } else { -diff -NurpP --minimal linux-3.9.4/fs/nfsd/nfs4xdr.c linux-3.9.4-vs2.3.6.1/fs/nfsd/nfs4xdr.c ---- linux-3.9.4/fs/nfsd/nfs4xdr.c 2013-05-31 14:22:27.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/nfsd/nfs4xdr.c 2013-05-31 14:47:11.000000000 +0000 -@@ -46,6 +46,7 @@ +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 @@ #include #include #include @@ -5573,30 +5446,28 @@ diff -NurpP --minimal linux-3.9.4/fs/nfsd/nfs4xdr.c linux-3.9.4-vs2.3.6.1/fs/nfs #include "idmap.h" #include "acl.h" -@@ -2349,14 +2350,18 @@ out_acl: - WRITE32(stat.nlink); +@@ -2436,12 +2437,16 @@ out_acl: + *p++ = cpu_to_be32(stat.nlink); } if (bmval1 & FATTR4_WORD1_OWNER) { -- status = nfsd4_encode_user(rqstp, stat.uid, &p, &buflen); -+ status = nfsd4_encode_user(rqstp, -+ TAGINO_UID(DX_TAG(dentry->d_inode), -+ stat.uid, stat.tag), &p, &buflen); - if (status == nfserr_resource) - goto out_resource; +- status = nfsd4_encode_user(xdr, rqstp, stat.uid); ++ status = nfsd4_encode_user(xdr, rqstp, ++ TAGINO_KUID(DX_TAG(dentry->d_inode), ++ stat.uid, stat.tag)); if (status) goto out; } if (bmval1 & FATTR4_WORD1_OWNER_GROUP) { -- status = nfsd4_encode_group(rqstp, stat.gid, &p, &buflen); -+ status = nfsd4_encode_group(rqstp, -+ TAGINO_GID(DX_TAG(dentry->d_inode), -+ stat.gid, stat.tag), &p, &buflen); - if (status == nfserr_resource) - goto out_resource; +- status = nfsd4_encode_group(xdr, rqstp, stat.gid); ++ status = nfsd4_encode_group(xdr, rqstp, ++ TAGINO_KGID(DX_TAG(dentry->d_inode), ++ stat.gid, stat.tag)); if (status) -diff -NurpP --minimal linux-3.9.4/fs/nfsd/nfsxdr.c linux-3.9.4-vs2.3.6.1/fs/nfsd/nfsxdr.c ---- linux-3.9.4/fs/nfsd/nfsxdr.c 2013-05-31 13:45:24.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/nfsd/nfsxdr.c 2013-05-31 16:20:53.000000000 +0000 + 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 @@ -7,6 +7,7 @@ #include "vfs.h" #include "xdr.h" @@ -5609,8 +5480,8 @@ diff -NurpP --minimal linux-3.9.4/fs/nfsd/nfsxdr.c linux-3.9.4-vs2.3.6.1/fs/nfsd decode_sattr(__be32 *p, struct iattr *iap) { u32 tmp, tmp1; -+ uid_t uid = 0; -+ gid_t gid = 0; ++ kuid_t kuid = GLOBAL_ROOT_UID; ++ kgid_t kgid = GLOBAL_ROOT_GID; iap->ia_valid = 0; @@ -5619,19 +5490,19 @@ diff -NurpP --minimal linux-3.9.4/fs/nfsd/nfsxdr.c linux-3.9.4-vs2.3.6.1/fs/nfsd } if ((tmp = ntohl(*p++)) != (u32)-1) { - iap->ia_uid = make_kuid(&init_user_ns, tmp); -+ uid = make_kuid(&init_user_ns, tmp); ++ kuid = make_kuid(&init_user_ns, tmp); if (uid_valid(iap->ia_uid)) iap->ia_valid |= ATTR_UID; } if ((tmp = ntohl(*p++)) != (u32)-1) { - iap->ia_gid = make_kgid(&init_user_ns, tmp); -+ gid = make_kgid(&init_user_ns, tmp); ++ kgid = make_kgid(&init_user_ns, tmp); if (gid_valid(iap->ia_gid)) iap->ia_valid |= ATTR_GID; } -+ iap->ia_uid = INOTAG_UID(DX_TAG_NFSD, uid, gid); -+ iap->ia_gid = INOTAG_GID(DX_TAG_NFSD, uid, gid); -+ iap->ia_tag = INOTAG_TAG(DX_TAG_NFSD, uid, gid, 0); ++ iap->ia_uid = INOTAG_KUID(DX_TAG_NFSD, kuid, kgid); ++ iap->ia_gid = INOTAG_KGID(DX_TAG_NFSD, kuid, kgid); ++ iap->ia_tag = INOTAG_KTAG(DX_TAG_NFSD, kuid, kgid, GLOBAL_ROOT_TAG); if ((tmp = ntohl(*p++)) != (u32)-1) { iap->ia_valid |= ATTR_SIZE; iap->ia_size = tmp; @@ -5642,20 +5513,20 @@ diff -NurpP --minimal linux-3.9.4/fs/nfsd/nfsxdr.c linux-3.9.4-vs2.3.6.1/fs/nfsd - *p++ = htonl((u32) from_kuid(&init_user_ns, stat->uid)); - *p++ = htonl((u32) from_kgid(&init_user_ns, stat->gid)); + *p++ = htonl((u32) from_kuid(&init_user_ns, -+ TAGINO_UID(DX_TAG(dentry->d_inode), stat->uid, stat->tag))); ++ TAGINO_KUID(DX_TAG(dentry->d_inode), stat->uid, stat->tag))); + *p++ = htonl((u32) from_kgid(&init_user_ns, -+ TAGINO_GID(DX_TAG(dentry->d_inode), stat->gid, stat->tag))); ++ TAGINO_KGID(DX_TAG(dentry->d_inode), stat->gid, stat->tag))); if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) { *p++ = htonl(NFS_MAXPATHLEN); -diff -NurpP --minimal linux-3.9.4/fs/ocfs2/dlmglue.c linux-3.9.4-vs2.3.6.1/fs/ocfs2/dlmglue.c ---- linux-3.9.4/fs/ocfs2/dlmglue.c 2013-05-31 13:45:24.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/ocfs2/dlmglue.c 2013-05-31 15:47:29.000000000 +0000 +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 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_itag = cpu_to_be16(inode->i_tag); ++ lvb->lvb_itag = cpu_to_be16(i_tag_read(inode)); lvb->lvb_imode = cpu_to_be16(inode->i_mode); lvb->lvb_inlink = cpu_to_be16(inode->i_nlink); lvb->lvb_iatime_packed = @@ -5667,9 +5538,9 @@ diff -NurpP --minimal linux-3.9.4/fs/ocfs2/dlmglue.c linux-3.9.4-vs2.3.6.1/fs/oc 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.9.4/fs/ocfs2/dlmglue.h linux-3.9.4-vs2.3.6.1/fs/ocfs2/dlmglue.h ---- linux-3.9.4/fs/ocfs2/dlmglue.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/ocfs2/dlmglue.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -46,7 +46,8 @@ struct ocfs2_meta_lvb { __be16 lvb_inlink; __be32 lvb_iattr; @@ -5680,10 +5551,10 @@ diff -NurpP --minimal linux-3.9.4/fs/ocfs2/dlmglue.h linux-3.9.4-vs2.3.6.1/fs/oc }; #define OCFS2_QINFO_LVB_VERSION 1 -diff -NurpP --minimal linux-3.9.4/fs/ocfs2/file.c linux-3.9.4-vs2.3.6.1/fs/ocfs2/file.c ---- linux-3.9.4/fs/ocfs2/file.c 2013-05-31 13:45:24.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/ocfs2/file.c 2013-05-31 14:47:11.000000000 +0000 -@@ -1124,7 +1124,7 @@ int ocfs2_setattr(struct dentry *dentry, +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, attr->ia_valid &= ~ATTR_SIZE; #define OCFS2_VALID_ATTRS (ATTR_ATIME | ATTR_MTIME | ATTR_CTIME | ATTR_SIZE \ @@ -5692,9 +5563,9 @@ diff -NurpP --minimal linux-3.9.4/fs/ocfs2/file.c linux-3.9.4-vs2.3.6.1/fs/ocfs2 if (!(attr->ia_valid & OCFS2_VALID_ATTRS)) return 0; -diff -NurpP --minimal linux-3.9.4/fs/ocfs2/inode.c linux-3.9.4-vs2.3.6.1/fs/ocfs2/inode.c ---- linux-3.9.4/fs/ocfs2/inode.c 2013-05-31 13:45:24.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/ocfs2/inode.c 2013-05-31 20:39:47.000000000 +0000 +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 @@ -28,6 +28,7 @@ #include #include @@ -5767,7 +5638,7 @@ diff -NurpP --minimal linux-3.9.4/fs/ocfs2/inode.c linux-3.9.4-vs2.3.6.1/fs/ocfs } struct inode *ocfs2_ilookup(struct super_block *sb, u64 blkno) -@@ -241,6 +263,8 @@ void ocfs2_populate_inode(struct inode * +@@ -268,6 +290,8 @@ void ocfs2_populate_inode(struct inode * struct super_block *sb; struct ocfs2_super *osb; int use_plocks = 1; @@ -5776,7 +5647,7 @@ diff -NurpP --minimal linux-3.9.4/fs/ocfs2/inode.c linux-3.9.4-vs2.3.6.1/fs/ocfs sb = inode->i_sb; osb = OCFS2_SB(sb); -@@ -269,8 +293,12 @@ void ocfs2_populate_inode(struct inode * +@@ -296,8 +320,12 @@ void ocfs2_populate_inode(struct inode * inode->i_generation = le32_to_cpu(fe->i_generation); inode->i_rdev = huge_decode_dev(le64_to_cpu(fe->id1.dev1.i_rdev)); inode->i_mode = le16_to_cpu(fe->i_mode); @@ -5791,10 +5662,10 @@ diff -NurpP --minimal linux-3.9.4/fs/ocfs2/inode.c linux-3.9.4-vs2.3.6.1/fs/ocfs /* Fast symlinks will have i_size but no allocated clusters. */ if (S_ISLNK(inode->i_mode) && !fe->i_clusters) { -diff -NurpP --minimal linux-3.9.4/fs/ocfs2/inode.h linux-3.9.4-vs2.3.6.1/fs/ocfs2/inode.h ---- linux-3.9.4/fs/ocfs2/inode.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/ocfs2/inode.h 2013-05-31 14:47:11.000000000 +0000 -@@ -154,6 +154,7 @@ struct buffer_head *ocfs2_bread(struct i +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 void ocfs2_set_inode_flags(struct inode *inode); void ocfs2_get_inode_flags(struct ocfs2_inode_info *oi); @@ -5802,9 +5673,9 @@ diff -NurpP --minimal linux-3.9.4/fs/ocfs2/inode.h linux-3.9.4-vs2.3.6.1/fs/ocfs static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode) { -diff -NurpP --minimal linux-3.9.4/fs/ocfs2/ioctl.c linux-3.9.4-vs2.3.6.1/fs/ocfs2/ioctl.c ---- linux-3.9.4/fs/ocfs2/ioctl.c 2013-05-31 13:45:24.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/ocfs2/ioctl.c 2013-05-31 14:47:11.000000000 +0000 +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 @@ -76,7 +76,41 @@ static int ocfs2_get_inode_attr(struct i return status; } @@ -5848,9 +5719,9 @@ diff -NurpP --minimal linux-3.9.4/fs/ocfs2/ioctl.c linux-3.9.4-vs2.3.6.1/fs/ocfs unsigned mask) { struct ocfs2_inode_info *ocfs2_inode = OCFS2_I(inode); -@@ -101,6 +135,11 @@ static int ocfs2_set_inode_attr(struct i - if (!S_ISDIR(inode->i_mode)) - flags &= ~OCFS2_DIRSYNC_FL; +@@ -116,6 +150,11 @@ static int ocfs2_set_inode_attr(struct i + goto bail_unlock; + } + if (IS_BARRIER(inode)) { + vxwprintk_task(1, "messing with the barrier."); @@ -5860,7 +5731,7 @@ diff -NurpP --minimal linux-3.9.4/fs/ocfs2/ioctl.c linux-3.9.4-vs2.3.6.1/fs/ocfs handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS); if (IS_ERR(handle)) { status = PTR_ERR(handle); -@@ -879,6 +918,7 @@ bail: +@@ -841,6 +880,7 @@ bail: return status; } @@ -5868,9 +5739,9 @@ diff -NurpP --minimal linux-3.9.4/fs/ocfs2/ioctl.c linux-3.9.4-vs2.3.6.1/fs/ocfs long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { struct inode *inode = file_inode(filp); -diff -NurpP --minimal linux-3.9.4/fs/ocfs2/namei.c linux-3.9.4-vs2.3.6.1/fs/ocfs2/namei.c ---- linux-3.9.4/fs/ocfs2/namei.c 2013-05-31 13:45:24.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/ocfs2/namei.c 2013-05-31 15:52:25.000000000 +0000 +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 @@ -41,6 +41,7 @@ #include #include @@ -5879,42 +5750,44 @@ diff -NurpP --minimal linux-3.9.4/fs/ocfs2/namei.c linux-3.9.4-vs2.3.6.1/fs/ocfs #include -@@ -475,6 +476,7 @@ static int __ocfs2_mknod_locked(struct i - struct ocfs2_dinode *fe = NULL; +@@ -524,6 +525,7 @@ static int __ocfs2_mknod_locked(struct i struct ocfs2_extent_list *fel; u16 feat; -+ tag_t tag; + struct ocfs2_inode_info *oi = OCFS2_I(inode); ++ ktag_t ktag; *new_fe_bh = NULL; -@@ -512,8 +514,11 @@ static int __ocfs2_mknod_locked(struct i +@@ -561,8 +563,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_uid = cpu_to_le32(i_uid_read(inode)); - fe->i_gid = cpu_to_le32(i_gid_read(inode)); + -+ tag = dx_current_fstag(osb->sb); -+ fe->i_uid = cpu_to_le32(TAGINO_UID(DX_TAG(inode), i_uid_read(inode), tag)); -+ fe->i_gid = cpu_to_le32(TAGINO_GID(DX_TAG(inode), i_gid_read(inode), tag)); -+ inode->i_tag = tag; /* is this correct? */ ++ ktag = make_ktag(&init_user_ns, dx_current_fstag(osb->sb)); ++ fe->i_uid = cpu_to_le32(from_kuid(&init_user_ns, ++ TAGINO_KUID(DX_TAG(inode), inode->i_uid, ktag))); ++ fe->i_gid = cpu_to_le32(from_kgid(&init_user_ns, ++ TAGINO_KGID(DX_TAG(inode), inode->i_gid, ktag))); ++ inode->i_tag = ktag; /* is this correct? */ 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.9.4/fs/ocfs2/ocfs2.h linux-3.9.4-vs2.3.6.1/fs/ocfs2/ocfs2.h ---- linux-3.9.4/fs/ocfs2/ocfs2.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/ocfs2/ocfs2.h 2013-05-31 14:47:11.000000000 +0000 -@@ -272,6 +272,7 @@ enum ocfs2_mount_options +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 */ }; - #define OCFS2_OSB_SOFT_RO 0x0001 -diff -NurpP --minimal linux-3.9.4/fs/ocfs2/ocfs2_fs.h linux-3.9.4-vs2.3.6.1/fs/ocfs2/ocfs2_fs.h ---- linux-3.9.4/fs/ocfs2/ocfs2_fs.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/ocfs2/ocfs2_fs.h 2013-05-31 14:47:11.000000000 +0000 + #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 @@ #define OCFS2_TOPDIR_FL FS_TOPDIR_FL /* Top of directory hierarchies*/ #define OCFS2_RESERVED_FL FS_RESERVED_FL /* reserved for ext2 lib */ @@ -5927,9 +5800,9 @@ diff -NurpP --minimal linux-3.9.4/fs/ocfs2/ocfs2_fs.h linux-3.9.4-vs2.3.6.1/fs/o #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.9.4/fs/ocfs2/super.c linux-3.9.4-vs2.3.6.1/fs/ocfs2/super.c ---- linux-3.9.4/fs/ocfs2/super.c 2013-05-31 13:45:25.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/ocfs2/super.c 2013-05-31 14:47:11.000000000 +0000 +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, @@ -5948,7 +5821,7 @@ diff -NurpP --minimal linux-3.9.4/fs/ocfs2/super.c linux-3.9.4-vs2.3.6.1/fs/ocfs {Opt_err, NULL} }; -@@ -662,6 +666,13 @@ static int ocfs2_remount(struct super_bl +@@ -666,6 +670,13 @@ static int ocfs2_remount(struct super_bl goto out; } @@ -5962,7 +5835,7 @@ diff -NurpP --minimal linux-3.9.4/fs/ocfs2/super.c linux-3.9.4-vs2.3.6.1/fs/ocfs /* We're going to/from readonly mode. */ if ((*flags & MS_RDONLY) != (sb->s_flags & MS_RDONLY)) { /* Disable quota accounting before remounting RO */ -@@ -1177,6 +1188,9 @@ static int ocfs2_fill_super(struct super +@@ -1185,6 +1196,9 @@ static int ocfs2_fill_super(struct super ocfs2_complete_mount_recovery(osb); @@ -5972,7 +5845,7 @@ diff -NurpP --minimal linux-3.9.4/fs/ocfs2/super.c linux-3.9.4-vs2.3.6.1/fs/ocfs if (ocfs2_mount_local(osb)) snprintf(nodestr, sizeof(nodestr), "local"); else -@@ -1504,6 +1518,20 @@ static int ocfs2_parse_options(struct su +@@ -1493,6 +1507,20 @@ static int ocfs2_parse_options(struct su option < OCFS2_MAX_RESV_LEVEL) mopt->dir_resv_level = option; break; @@ -5993,9 +5866,9 @@ diff -NurpP --minimal linux-3.9.4/fs/ocfs2/super.c linux-3.9.4-vs2.3.6.1/fs/ocfs default: mlog(ML_ERROR, "Unrecognized mount option \"%s\" " -diff -NurpP --minimal linux-3.9.4/fs/open.c linux-3.9.4-vs2.3.6.1/fs/open.c ---- linux-3.9.4/fs/open.c 2013-05-31 13:45:25.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/open.c 2013-05-31 21:09:19.000000000 +0000 +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 @@ -31,6 +31,11 @@ #include #include @@ -6008,7 +5881,7 @@ diff -NurpP --minimal linux-3.9.4/fs/open.c linux-3.9.4-vs2.3.6.1/fs/open.c #include "internal.h" -@@ -67,6 +72,11 @@ long vfs_truncate(struct path *path, lof +@@ -68,6 +73,11 @@ long vfs_truncate(struct path *path, lof struct inode *inode; long error; @@ -6020,7 +5893,7 @@ diff -NurpP --minimal linux-3.9.4/fs/open.c linux-3.9.4-vs2.3.6.1/fs/open.c inode = path->dentry->d_inode; /* For directories it's -EISDIR, for other non-regulars - -EINVAL */ -@@ -532,6 +542,13 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, cons +@@ -530,6 +540,13 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, cons unsigned int lookup_flags = LOOKUP_FOLLOW; retry: error = user_path_at(dfd, filename, lookup_flags, &path); @@ -6034,23 +5907,25 @@ diff -NurpP --minimal linux-3.9.4/fs/open.c linux-3.9.4-vs2.3.6.1/fs/open.c if (!error) { error = chmod_common(&path, mode); path_put(&path); -@@ -564,13 +581,13 @@ static int chown_common(struct path *pat +@@ -563,13 +580,15 @@ static int chown_common(struct path *pat if (!uid_valid(uid)) return -EINVAL; newattrs.ia_valid |= ATTR_UID; - newattrs.ia_uid = uid; -+ newattrs.ia_uid = dx_map_uid(user); ++ newattrs.ia_uid = make_kuid(&init_user_ns, ++ dx_map_uid(user)); } if (group != (gid_t) -1) { if (!gid_valid(gid)) return -EINVAL; newattrs.ia_valid |= ATTR_GID; - newattrs.ia_gid = gid; -+ newattrs.ia_gid = dx_map_gid(group); ++ newattrs.ia_gid = make_kgid(&init_user_ns, ++ dx_map_gid(group)); } if (!S_ISDIR(inode->i_mode)) newattrs.ia_valid |= -@@ -604,6 +621,18 @@ retry: +@@ -608,6 +627,18 @@ retry: error = mnt_want_write(path.mnt); if (error) goto out_release; @@ -6069,9 +5944,9 @@ diff -NurpP --minimal linux-3.9.4/fs/open.c linux-3.9.4-vs2.3.6.1/fs/open.c error = chown_common(&path, user, group); mnt_drop_write(path.mnt); out_release: -diff -NurpP --minimal linux-3.9.4/fs/proc/array.c linux-3.9.4-vs2.3.6.1/fs/proc/array.c ---- linux-3.9.4/fs/proc/array.c 2013-05-31 13:45:25.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/proc/array.c 2013-05-31 14:47:11.000000000 +0000 +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 #include @@ -6081,7 +5956,7 @@ diff -NurpP --minimal linux-3.9.4/fs/proc/array.c linux-3.9.4-vs2.3.6.1/fs/proc/ #include #include -@@ -173,6 +175,9 @@ static inline void task_state(struct seq +@@ -164,6 +166,9 @@ static inline void task_state(struct seq rcu_read_lock(); ppid = pid_alive(p) ? task_tgid_nr_ns(rcu_dereference(p->real_parent), ns) : 0; @@ -6091,18 +5966,20 @@ diff -NurpP --minimal linux-3.9.4/fs/proc/array.c linux-3.9.4-vs2.3.6.1/fs/proc/ tpid = 0; if (pid_alive(p)) { struct task_struct *tracer = ptrace_parent(p); -@@ -297,7 +302,7 @@ static inline void task_sig(struct seq_f +@@ -289,8 +294,8 @@ static inline void task_sig(struct seq_f + render_sigset_t(m, "SigCgt:\t", &caught); } - static void render_cap_t(struct seq_file *m, const char *header, +-static void render_cap_t(struct seq_file *m, const char *header, - kernel_cap_t *a) ++void render_cap_t(struct seq_file *m, const char *header, + struct vx_info *vxi, kernel_cap_t *a) { unsigned __capi; -@@ -331,10 +336,11 @@ static inline void task_cap(struct seq_f - NORM_CAPS(cap_effective); - NORM_CAPS(cap_bset); +@@ -315,10 +320,11 @@ static inline void task_cap(struct seq_f + cap_bset = cred->cap_bset; + rcu_read_unlock(); - render_cap_t(m, "CapInh:\t", &cap_inheritable); - render_cap_t(m, "CapPrm:\t", &cap_permitted); @@ -6116,7 +5993,7 @@ diff -NurpP --minimal linux-3.9.4/fs/proc/array.c linux-3.9.4-vs2.3.6.1/fs/proc/ } static inline void task_seccomp(struct seq_file *m, struct task_struct *p) -@@ -363,6 +369,42 @@ static void task_cpus_allowed(struct seq +@@ -347,6 +353,43 @@ static void task_cpus_allowed(struct seq seq_putc(m, '\n'); } @@ -6139,8 +6016,9 @@ diff -NurpP --minimal linux-3.9.4/fs/proc/array.c linux-3.9.4-vs2.3.6.1/fs/proc/ + (task->nsproxy->ipc_ns == init_task.nsproxy->ipc_ns ? 'I' : '-'), + task->nsproxy->mnt_ns, + (task->nsproxy->mnt_ns == init_task.nsproxy->mnt_ns ? 'I' : '-'), -+ task->nsproxy->pid_ns, -+ (task->nsproxy->pid_ns == init_task.nsproxy->pid_ns ? 'I' : '-'), ++ task->nsproxy->pid_ns_for_children, ++ (task->nsproxy->pid_ns_for_children == ++ init_task.nsproxy->pid_ns_for_children ? 'I' : '-'), + task->nsproxy->net_ns, + (task->nsproxy->net_ns == init_task.nsproxy->net_ns ? 'I' : '-')); + return 0; @@ -6151,15 +6029,15 @@ diff -NurpP --minimal linux-3.9.4/fs/proc/array.c linux-3.9.4-vs2.3.6.1/fs/proc/ + if (task_vx_flags(task, VXF_HIDE_VINFO, 0)) + return; + -+ seq_printf(m, "VxID: %d\n", vx_task_xid(task)); -+ seq_printf(m, "NxID: %d\n", nx_task_nid(task)); ++ seq_printf(m, "VxID:\t%d\n", vx_task_xid(task)); ++ seq_printf(m, "NxID:\t%d\n", nx_task_nid(task)); +} + + int proc_pid_status(struct seq_file *m, struct pid_namespace *ns, struct pid *pid, struct task_struct *task) { -@@ -380,6 +422,7 @@ int proc_pid_status(struct seq_file *m, +@@ -364,6 +407,7 @@ int proc_pid_status(struct seq_file *m, task_seccomp(m, task); task_cpus_allowed(m, task); cpuset_task_status_allowed(m, task); @@ -6167,9 +6045,9 @@ diff -NurpP --minimal linux-3.9.4/fs/proc/array.c linux-3.9.4-vs2.3.6.1/fs/proc/ task_context_switch_counts(m, task); return 0; } -@@ -489,6 +532,17 @@ static int do_task_stat(struct seq_file +@@ -467,6 +511,17 @@ static int do_task_stat(struct seq_file /* convert nsec -> ticks */ - start_time = nsec_to_clock_t(start_time); + start_time = nsec_to_clock_t(task->real_start_time); + /* fixup start time for virt uptime */ + if (vx_flags(VXF_VIRT_UPTIME, 0)) { @@ -6185,19 +6063,19 @@ diff -NurpP --minimal linux-3.9.4/fs/proc/array.c linux-3.9.4-vs2.3.6.1/fs/proc/ 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.9.4/fs/proc/base.c linux-3.9.4-vs2.3.6.1/fs/proc/base.c ---- linux-3.9.4/fs/proc/base.c 2013-05-31 13:45:25.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/proc/base.c 2013-05-31 14:47:11.000000000 +0000 -@@ -86,6 +86,8 @@ - #include +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 +@@ -87,6 +87,8 @@ #include #include + #include +#include +#include #ifdef CONFIG_HARDWALL #include #endif -@@ -944,11 +946,15 @@ static ssize_t oom_adj_write(struct file +@@ -884,11 +886,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 && @@ -6214,46 +6092,45 @@ diff -NurpP --minimal linux-3.9.4/fs/proc/base.c linux-3.9.4-vs2.3.6.1/fs/proc/b /* * /proc/pid/oom_adj is provided for legacy purposes, ask users to use * /proc/pid/oom_score_adj instead. -@@ -1528,6 +1534,8 @@ struct inode *proc_pid_make_inode(struct +@@ -1476,6 +1482,8 @@ struct inode *proc_pid_make_inode(struct inode->i_gid = cred->egid; rcu_read_unlock(); } + /* procfs is xid tagged */ -+ i_tag_write(inode, (tag_t)vx_task_xid(task)); ++ i_tag_write(inode, (vtag_t)vx_task_xid(task)); security_task_to_inode(task, inode); out: -@@ -1573,6 +1581,8 @@ int pid_getattr(struct vfsmount *mnt, st +@@ -1521,6 +1529,8 @@ int pid_getattr(struct vfsmount *mnt, st /* dentry stuff */ -+static unsigned name_to_int(struct dentry *dentry); ++// static unsigned name_to_int(struct dentry *dentry); + /* * Exceptional case: normally we are not allowed to unhash a busy * directory. In this case, however, we can do it - no aliasing problems -@@ -1601,6 +1611,12 @@ int pid_revalidate(struct dentry *dentry +@@ -1549,6 +1559,19 @@ int pid_revalidate(struct dentry *dentry task = get_proc_task(inode); if (task) { -+ unsigned pid = name_to_int(dentry); -+ -+ if (pid != ~0U && pid != vx_map_pid(task->pid)) { ++ unsigned pid = name_to_int(&dentry->d_name); ++ ++ if (pid != ~0U && pid != vx_map_pid(task->pid) && ++ pid != __task_pid_nr_ns(task, PIDTYPE_PID, ++ task_active_pid_ns(task))) { ++ vxdprintk(VXD_CBIT(misc, 10), ++ VS_Q("%*s") " dropped by pid_revalidate(%d!=%d)", ++ dentry->d_name.len, dentry->d_name.name, ++ pid, vx_map_pid(task->pid)); + put_task_struct(task); -+ goto drop; ++ d_drop(dentry); ++ return 0; + } if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) || task_dumpable(task)) { rcu_read_lock(); -@@ -1617,6 +1633,7 @@ int pid_revalidate(struct dentry *dentry - put_task_struct(task); - return 1; - } -+drop: - d_drop(dentry); - return 0; - } -@@ -2059,6 +2076,13 @@ static struct dentry *proc_pident_lookup +@@ -2085,6 +2108,13 @@ static struct dentry *proc_pident_lookup if (!task) goto out_no_task; @@ -6267,34 +6144,28 @@ diff -NurpP --minimal linux-3.9.4/fs/proc/base.c linux-3.9.4-vs2.3.6.1/fs/proc/b /* * Yes, it does not scale. And it should not. Don't add * new entries into /proc// without very good reasons. -@@ -2493,6 +2517,9 @@ static int proc_pid_personality(struct s +@@ -2534,6 +2564,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; -+extern int proc_pid_vx_info(struct task_struct *, char *); -+extern int proc_pid_nx_info(struct task_struct *, char *); ++extern int proc_pid_vx_info(struct seq_file *, ++ struct pid_namespace *, struct pid *, struct task_struct *); ++extern int proc_pid_nx_info(struct seq_file *, ++ struct pid_namespace *, struct pid *, struct task_struct *); + 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), -@@ -2559,6 +2586,8 @@ static const struct pid_entry tgid_base_ +@@ -2600,6 +2635,8 @@ static const struct pid_entry tgid_base_ #ifdef CONFIG_CGROUPS - REG("cgroup", S_IRUGO, proc_cgroup_operations), + ONE("cgroup", S_IRUGO, proc_cgroup_show), #endif -+ INF("vinfo", S_IRUGO, proc_pid_vx_info), -+ INF("ninfo", S_IRUGO, proc_pid_nx_info), - INF("oom_score", S_IRUGO, proc_oom_score), ++ ONE("vinfo", S_IRUGO, proc_pid_vx_info), ++ ONE("ninfo", S_IRUGO, proc_pid_nx_info), + 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), -@@ -2583,6 +2612,7 @@ static const struct pid_entry tgid_base_ - REG("gid_map", S_IRUGO|S_IWUSR, proc_gid_map_operations), - REG("projid_map", S_IRUGO|S_IWUSR, proc_projid_map_operations), - #endif -+ ONE("nsproxy", S_IRUGO, proc_pid_nsproxy), - }; - - static int proc_tgid_base_readdir(struct file * filp, -@@ -2770,7 +2800,7 @@ retry: +@@ -2811,7 +2848,7 @@ retry: iter.task = NULL; pid = find_ge_pid(iter.tgid, ns); if (pid) { @@ -6303,26 +6174,28 @@ diff -NurpP --minimal linux-3.9.4/fs/proc/base.c linux-3.9.4-vs2.3.6.1/fs/proc/b 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 -@@ -2800,7 +2830,7 @@ static int proc_pid_fill_cache(struct fi - struct tgid_iter iter) - { - char name[PROC_NUMBUF]; -- int len = snprintf(name, sizeof(name), "%d", iter.tgid); -+ int len = snprintf(name, sizeof(name), "%d", vx_map_tgid(iter.tgid)); - return proc_fill_cache(filp, dirent, filldir, name, len, - proc_pid_instantiate, iter.task, NULL); - } -@@ -2833,6 +2863,8 @@ int proc_pid_readdir(struct file * filp, - __filldir = fake_filldir; +@@ -2869,8 +2906,10 @@ int proc_pid_readdir(struct file *file, + if (!has_pid_permissions(ns, iter.task, 2)) + continue; - filp->f_pos = iter.tgid + TGID_OFFSET; +- len = snprintf(name, sizeof(name), "%d", iter.tgid); ++ len = snprintf(name, sizeof(name), "%d", vx_map_tgid(iter.tgid)); + ctx->pos = iter.tgid + TGID_OFFSET; + if (!vx_proc_task_visible(iter.task)) + continue; - if (proc_pid_fill_cache(filp, dirent, __filldir, iter) < 0) { + if (!proc_fill_cache(file, ctx, name, len, + proc_pid_instantiate, iter.task, NULL)) { put_task_struct(iter.task); - goto out; -@@ -2993,6 +3025,8 @@ static struct dentry *proc_task_lookup(s - tid = name_to_int(dentry); +@@ -2967,6 +3006,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 ++ ONE("nsproxy", S_IRUGO, proc_pid_nsproxy), + }; + + static int proc_tid_base_readdir(struct file *file, struct dir_context *ctx) +@@ -3033,6 +3073,8 @@ static struct dentry *proc_task_lookup(s + tid = name_to_int(&dentry->d_name); if (tid == ~0U) goto out; + if (vx_current_initpid(tid)) @@ -6330,9 +6203,9 @@ diff -NurpP --minimal linux-3.9.4/fs/proc/base.c linux-3.9.4-vs2.3.6.1/fs/proc/b ns = dentry->d_sb->s_fs_info; rcu_read_lock(); -diff -NurpP --minimal linux-3.9.4/fs/proc/generic.c linux-3.9.4-vs2.3.6.1/fs/proc/generic.c ---- linux-3.9.4/fs/proc/generic.c 2013-05-31 13:45:25.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/proc/generic.c 2013-05-31 16:13:42.000000000 +0000 +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 @@ #include #include @@ -6341,50 +6214,59 @@ diff -NurpP --minimal linux-3.9.4/fs/proc/generic.c linux-3.9.4-vs2.3.6.1/fs/pro #include #include "internal.h" -@@ -409,6 +410,8 @@ struct dentry *proc_lookup_de(struct pro +@@ -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)) ++ 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; ++ } if (!memcmp(dentry->d_name.name, de->name, de->namelen)) { pde_get(de); spin_unlock(&proc_subdir_lock); -@@ -417,6 +420,8 @@ struct dentry *proc_lookup_de(struct pro +@@ -194,6 +201,8 @@ struct dentry *proc_lookup_de(struct pro return ERR_PTR(-ENOMEM); - d_set_d_op(dentry, &proc_dentry_operations); + 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; } } -@@ -485,6 +490,8 @@ int proc_readdir_de(struct proc_dir_entr - - /* filldir passes info to user space */ - pde_get(de); -+ if (!vx_hide_check(0, de->vx_flags)) -+ goto skip; - spin_unlock(&proc_subdir_lock); - if (filldir(dirent, de->name, de->namelen, filp->f_pos, - de->low_ino, de->mode >> 12) < 0) { -@@ -492,6 +499,7 @@ int proc_readdir_de(struct proc_dir_entr - goto out; - } - spin_lock(&proc_subdir_lock); -+ skip: - filp->f_pos++; - next = de->next; - pde_put(de); -@@ -603,6 +611,7 @@ static struct proc_dir_entry *__proc_cre - ent->namelen = len; +@@ -241,6 +250,13 @@ 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); + 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 + return 0; + } + spin_lock(&proc_subdir_lock); ++ skip: + ctx->pos++; + next = de->next; + pde_put(de); +@@ -354,6 +371,7 @@ static struct proc_dir_entry *__proc_cre + ent->namelen = qstr.len; ent->mode = mode; ent->nlink = nlink; + ent->vx_flags = IATTR_PROC_DEFAULT; atomic_set(&ent->count, 1); spin_lock_init(&ent->pde_unload_lock); INIT_LIST_HEAD(&ent->pde_openers); -@@ -626,7 +635,8 @@ struct proc_dir_entry *proc_symlink(cons +@@ -377,7 +395,8 @@ struct proc_dir_entry *proc_symlink(cons kfree(ent->data); kfree(ent); ent = NULL; @@ -6394,10 +6276,10 @@ diff -NurpP --minimal linux-3.9.4/fs/proc/generic.c linux-3.9.4-vs2.3.6.1/fs/pro } else { kfree(ent); ent = NULL; -diff -NurpP --minimal linux-3.9.4/fs/proc/inode.c linux-3.9.4-vs2.3.6.1/fs/proc/inode.c ---- linux-3.9.4/fs/proc/inode.c 2013-05-31 13:45:25.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/proc/inode.c 2013-05-31 14:47:11.000000000 +0000 -@@ -458,6 +458,8 @@ struct inode *proc_get_inode(struct supe +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 inode->i_uid = de->uid; inode->i_gid = de->gid; } @@ -6406,29 +6288,49 @@ diff -NurpP --minimal linux-3.9.4/fs/proc/inode.c linux-3.9.4-vs2.3.6.1/fs/proc/ if (de->size) inode->i_size = de->size; if (de->nlink) -diff -NurpP --minimal linux-3.9.4/fs/proc/internal.h linux-3.9.4-vs2.3.6.1/fs/proc/internal.h ---- linux-3.9.4/fs/proc/internal.h 2013-05-31 13:45:25.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/proc/internal.h 2013-05-31 16:04:34.000000000 +0000 -@@ -12,6 +12,8 @@ - #include - #include +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 +@@ -14,6 +14,7 @@ + #include + #include #include +#include -+ - struct ctl_table_header; - struct mempolicy; -@@ -56,6 +58,9 @@ extern int proc_pid_status(struct seq_fi - struct pid *pid, struct task_struct *task); - extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns, - struct pid *pid, struct task_struct *task); -+extern int proc_pid_nsproxy(struct seq_file *m, struct pid_namespace *ns, -+ struct pid *pid, struct task_struct *task); + struct ctl_table_header; + struct mempolicy; +@@ -35,6 +36,7 @@ struct proc_dir_entry { + nlink_t nlink; + kuid_t uid; + kgid_t gid; ++ int vx_flags; + loff_t size; + const struct inode_operations *proc_iops; + const struct file_operations *proc_fops; +@@ -50,15 +52,22 @@ struct proc_dir_entry { + char name[]; + }; + ++struct vx_info; ++struct nx_info; + - extern loff_t mem_lseek(struct file *file, loff_t offset, int orig); + union proc_op { + int (*proc_get_link)(struct dentry *, struct path *); + int (*proc_show)(struct seq_file *m, + struct pid_namespace *ns, struct pid *pid, + struct task_struct *task); ++ int (*proc_vs_read)(char *page); ++ int (*proc_vxi_read)(struct vx_info *vxi, char *page); ++ int (*proc_nxi_read)(struct nx_info *nxi, char *page); + }; - extern const struct file_operations proc_tid_children_operations; -@@ -89,11 +94,16 @@ static inline struct pid *proc_pid(struc + struct proc_inode { + struct pid *pid; ++ int vx_flags; + int fd; + union proc_op op; + struct proc_dir_entry *pde; +@@ -91,11 +100,16 @@ static inline struct pid *proc_pid(struc return PROC_I(inode)->pid; } @@ -6443,12 +6345,21 @@ diff -NurpP --minimal linux-3.9.4/fs/proc/internal.h linux-3.9.4-vs2.3.6.1/fs/pr + return vx_get_proc_task(inode, proc_pid(inode)); +} + - static inline int proc_fd(struct inode *inode) + static inline int task_dumpable(struct task_struct *task) { - return PROC_I(inode)->fd; -diff -NurpP --minimal linux-3.9.4/fs/proc/loadavg.c linux-3.9.4-vs2.3.6.1/fs/proc/loadavg.c ---- linux-3.9.4/fs/proc/loadavg.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/proc/loadavg.c 2013-05-31 14:47:11.000000000 +0000 + int dumpable = 0; +@@ -154,6 +168,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 *); ++extern int proc_pid_nsproxy(struct seq_file *m, struct pid_namespace *ns, ++ struct pid *pid, struct task_struct *task); + + /* + * 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 @@ -12,15 +12,27 @@ static int loadavg_proc_show(struct seq_file *m, void *v) @@ -6478,12 +6389,12 @@ diff -NurpP --minimal linux-3.9.4/fs/proc/loadavg.c linux-3.9.4-vs2.3.6.1/fs/pro task_active_pid_ns(current)->last_pid); return 0; } -diff -NurpP --minimal linux-3.9.4/fs/proc/meminfo.c linux-3.9.4-vs2.3.6.1/fs/proc/meminfo.c ---- linux-3.9.4/fs/proc/meminfo.c 2013-05-31 13:45:25.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/proc/meminfo.c 2013-05-31 16:05:39.000000000 +0000 -@@ -39,7 +39,8 @@ static int meminfo_proc_show(struct seq_ - allowed = ((totalram_pages - hugetlb_total_pages()) - * sysctl_overcommit_ratio / 100) + total_swap_pages; +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_ + si_swapinfo(&i); + committed = percpu_counter_read_positive(&vm_committed_as); - cached = global_page_state(NR_FILE_PAGES) - + cached = vx_flags(VXF_VIRT_MEM, 0) ? @@ -6491,9 +6402,9 @@ diff -NurpP --minimal linux-3.9.4/fs/proc/meminfo.c linux-3.9.4-vs2.3.6.1/fs/pro total_swapcache_pages() - i.bufferram; if (cached < 0) cached = 0; -diff -NurpP --minimal linux-3.9.4/fs/proc/root.c linux-3.9.4-vs2.3.6.1/fs/proc/root.c ---- linux-3.9.4/fs/proc/root.c 2013-05-31 13:45:25.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/proc/root.c 2013-05-31 14:47:11.000000000 +0000 +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 @@ -20,9 +20,14 @@ #include #include @@ -6509,15 +6420,25 @@ diff -NurpP --minimal linux-3.9.4/fs/proc/root.c linux-3.9.4-vs2.3.6.1/fs/proc/r static int proc_test_super(struct super_block *sb, void *data) { return sb->s_fs_info == data; -@@ -182,6 +187,7 @@ void __init proc_root_init(void) - #endif +@@ -116,7 +121,8 @@ static struct dentry *proc_mount(struct + return ERR_PTR(-EPERM); + + /* Does the mounter have privilege over the pid namespace? */ +- if (!ns_capable(ns->user_ns, CAP_SYS_ADMIN)) ++ if (!vx_ns_capable(ns->user_ns, ++ CAP_SYS_ADMIN, VXC_SECURE_MOUNT)) + return ERR_PTR(-EPERM); + } + +@@ -190,6 +196,7 @@ void __init proc_root_init(void) + proc_tty_init(); proc_mkdir("bus", NULL); proc_sys_init(); + proc_vx_init(); } static int proc_root_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat -@@ -248,6 +254,7 @@ struct proc_dir_entry proc_root = { +@@ -251,6 +258,7 @@ struct proc_dir_entry proc_root = { .proc_iops = &proc_root_inode_operations, .proc_fops = &proc_root_operations, .parent = &proc_root, @@ -6525,32 +6446,35 @@ diff -NurpP --minimal linux-3.9.4/fs/proc/root.c linux-3.9.4-vs2.3.6.1/fs/proc/r .name = "/proc", }; -diff -NurpP --minimal linux-3.9.4/fs/proc/self.c linux-3.9.4-vs2.3.6.1/fs/proc/self.c ---- linux-3.9.4/fs/proc/self.c 2013-02-19 13:58:49.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/proc/self.c 2013-05-31 20:57:54.000000000 +0000 -@@ -1,6 +1,7 @@ - #include - #include +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 + #include + #include +#include + #include "internal.h" /* - * /proc/self: -@@ -56,4 +57,5 @@ void __init proc_self_init(void) - mode = S_IFLNK | S_IRWXUGO; - proc_self_symlink = proc_create("self", mode, NULL, NULL ); - proc_self_symlink->proc_iops = &proc_self_inode_operations; -+ proc_self_symlink->vx_flags = IATTR_PROC_SYMLINK; - } -diff -NurpP --minimal linux-3.9.4/fs/proc/stat.c linux-3.9.4-vs2.3.6.1/fs/proc/stat.c ---- linux-3.9.4/fs/proc/stat.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/proc/stat.c 2013-05-31 14:47:11.000000000 +0000 +@@ -54,6 +55,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); ++ ++ // self->vx_flags = IATTR_PROC_SYMLINK; + 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 @@ -9,8 +9,10 @@ #include #include #include +#include - #include + #include #include +#include @@ -6593,18 +6517,18 @@ diff -NurpP --minimal linux-3.9.4/fs/proc/stat.c linux-3.9.4-vs2.3.6.1/fs/proc/s /* 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.9.4/fs/proc/uptime.c linux-3.9.4-vs2.3.6.1/fs/proc/uptime.c ---- linux-3.9.4/fs/proc/uptime.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/proc/uptime.c 2013-05-31 14:47:11.000000000 +0000 +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 @@ -5,6 +5,7 @@ #include #include #include +#include - #include + #include static int uptime_proc_show(struct seq_file *m, void *v) -@@ -25,6 +26,10 @@ static int uptime_proc_show(struct seq_f +@@ -24,6 +25,10 @@ static int uptime_proc_show(struct seq_f nsec = cputime64_to_jiffies64(idletime) * TICK_NSEC; idle.tv_sec = div_u64_rem(nsec, NSEC_PER_SEC, &rem); idle.tv_nsec = rem; @@ -6615,9 +6539,9 @@ diff -NurpP --minimal linux-3.9.4/fs/proc/uptime.c linux-3.9.4-vs2.3.6.1/fs/proc 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.9.4/fs/proc_namespace.c linux-3.9.4-vs2.3.6.1/fs/proc_namespace.c ---- linux-3.9.4/fs/proc_namespace.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/proc_namespace.c 2013-05-31 17:17:53.000000000 +0000 +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" }, { MS_DIRSYNC, ",dirsync" }, @@ -6627,7 +6551,7 @@ diff -NurpP --minimal linux-3.9.4/fs/proc_namespace.c linux-3.9.4-vs2.3.6.1/fs/p { 0, NULL } }; const struct proc_fs_info *fs_infop; -@@ -80,6 +82,40 @@ static inline void mangle(struct seq_fil +@@ -80,6 +82,38 @@ static inline void mangle(struct seq_fil seq_escape(m, s, " \t\n\\"); } @@ -6644,7 +6568,7 @@ diff -NurpP --minimal linux-3.9.4/fs/proc_namespace.c linux-3.9.4-vs2.3.6.1/fs/p + if (mnt == mnt->mnt_ns->root) + return 1; + -+ br_read_lock(&vfsmount_lock); ++ rcu_read_lock(); + root = current->fs->root; + root_mnt = real_mount(root.mnt); + point = root.dentry; @@ -6653,11 +6577,9 @@ diff -NurpP --minimal linux-3.9.4/fs/proc_namespace.c linux-3.9.4-vs2.3.6.1/fs/p + point = mnt->mnt_mountpoint; + mnt = mnt->mnt_parent; + } ++ rcu_read_unlock(); + + ret = (mnt == root_mnt) && is_subdir(point, root.dentry); -+ -+ br_read_unlock(&vfsmount_lock); -+ + return ret; +} + @@ -6668,7 +6590,7 @@ diff -NurpP --minimal linux-3.9.4/fs/proc_namespace.c linux-3.9.4-vs2.3.6.1/fs/p static void show_type(struct seq_file *m, struct super_block *sb) { mangle(m, sb->s_type->name); -@@ -96,6 +132,17 @@ static int show_vfsmnt(struct seq_file * +@@ -96,6 +130,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; @@ -6686,7 +6608,7 @@ diff -NurpP --minimal linux-3.9.4/fs/proc_namespace.c linux-3.9.4-vs2.3.6.1/fs/p if (sb->s_op->show_devname) { err = sb->s_op->show_devname(m, mnt_path.dentry); if (err) -@@ -106,6 +153,7 @@ static int show_vfsmnt(struct seq_file * +@@ -106,6 +151,7 @@ static int show_vfsmnt(struct seq_file * seq_putc(m, ' '); seq_path(m, &mnt_path, " \t\n\\"); seq_putc(m, ' '); @@ -6694,7 +6616,7 @@ diff -NurpP --minimal linux-3.9.4/fs/proc_namespace.c linux-3.9.4-vs2.3.6.1/fs/p show_type(m, sb); seq_puts(m, __mnt_is_readonly(mnt) ? " ro" : " rw"); err = show_sb_opts(m, sb); -@@ -128,6 +176,11 @@ static int show_mountinfo(struct seq_fil +@@ -128,6 +174,11 @@ static int show_mountinfo(struct seq_fil struct path root = p->root; int err = 0; @@ -6706,7 +6628,7 @@ diff -NurpP --minimal linux-3.9.4/fs/proc_namespace.c linux-3.9.4-vs2.3.6.1/fs/p 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 +240,17 @@ static int show_vfsstat(struct seq_file +@@ -187,6 +238,17 @@ static int show_vfsstat(struct seq_file struct super_block *sb = mnt_path.dentry->d_sb; int err = 0; @@ -6724,7 +6646,7 @@ diff -NurpP --minimal linux-3.9.4/fs/proc_namespace.c linux-3.9.4-vs2.3.6.1/fs/p /* device */ if (sb->s_op->show_devname) { seq_puts(m, "device "); -@@ -203,7 +267,7 @@ static int show_vfsstat(struct seq_file +@@ -203,7 +265,7 @@ static int show_vfsstat(struct seq_file seq_puts(m, " mounted on "); seq_path(m, &mnt_path, " \t\n\\"); seq_putc(m, ' '); @@ -6733,50 +6655,53 @@ diff -NurpP --minimal linux-3.9.4/fs/proc_namespace.c linux-3.9.4-vs2.3.6.1/fs/p /* file system type */ seq_puts(m, "with fstype "); show_type(m, sb); -diff -NurpP --minimal linux-3.9.4/fs/quota/dquot.c linux-3.9.4-vs2.3.6.1/fs/quota/dquot.c ---- linux-3.9.4/fs/quota/dquot.c 2013-05-31 13:45:25.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/quota/dquot.c 2013-05-31 14:47:11.000000000 +0000 -@@ -1585,6 +1585,9 @@ int __dquot_alloc_space(struct inode *in +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; int reserve = flags & DQUOT_SPACE_RESERVE; ++ if ((ret = dl_alloc_inode(inode))) ++ return ret; ++ + if ((ret = dl_alloc_space(inode, number))) + return ret; + - /* - * First test before acquiring mutex - solves deadlocks when we - * re-enter the quota code and are already holding the mutex -@@ -1640,6 +1643,9 @@ int dquot_alloc_inode(const struct inode + if (!dquot_active(inode)) { + inode_incr_space(inode, number, reserve); + goto out; +@@ -1649,6 +1655,9 @@ int dquot_alloc_inode(const struct inode struct dquot_warn warn[MAXQUOTAS]; struct dquot * const *dquots = inode->i_dquot; + if ((ret = dl_alloc_inode(inode))) + return ret; + - /* First test before acquiring mutex - solves deadlocks when we - * re-enter the quota code and are already holding the mutex */ if (!dquot_active(inode)) -@@ -1711,6 +1717,8 @@ void __dquot_free_space(struct inode *in + 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; - int reserve = flags & DQUOT_SPACE_RESERVE; + int reserve = flags & DQUOT_SPACE_RESERVE, index; + dl_free_space(inode, number); + - /* First test before acquiring mutex - solves deadlocks when we - * re-enter the quota code and are already holding the mutex */ if (!dquot_active(inode)) { -@@ -1755,6 +1763,8 @@ void dquot_free_inode(const struct inode - struct dquot_warn warn[MAXQUOTAS]; + 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; + int index; + dl_free_inode(inode); + - /* First test before acquiring mutex - solves deadlocks when we - * re-enter the quota code and are already holding the mutex */ if (!dquot_active(inode)) -diff -NurpP --minimal linux-3.9.4/fs/quota/quota.c linux-3.9.4-vs2.3.6.1/fs/quota/quota.c ---- linux-3.9.4/fs/quota/quota.c 2013-02-19 13:58:49.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/quota/quota.c 2013-05-31 14:47:11.000000000 +0000 + 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 @@ -8,6 +8,7 @@ #include #include @@ -6785,7 +6710,7 @@ diff -NurpP --minimal linux-3.9.4/fs/quota/quota.c linux-3.9.4-vs2.3.6.1/fs/quot #include #include #include -@@ -37,7 +38,7 @@ static int check_quotactl_permission(str +@@ -38,7 +39,7 @@ static int check_quotactl_permission(str break; /*FALLTHROUGH*/ default: @@ -6794,7 +6719,7 @@ diff -NurpP --minimal linux-3.9.4/fs/quota/quota.c linux-3.9.4-vs2.3.6.1/fs/quot return -EPERM; } -@@ -309,6 +310,46 @@ static int do_quotactl(struct super_bloc +@@ -350,6 +351,46 @@ static int do_quotactl(struct super_bloc #ifdef CONFIG_BLOCK @@ -6841,7 +6766,7 @@ diff -NurpP --minimal linux-3.9.4/fs/quota/quota.c linux-3.9.4-vs2.3.6.1/fs/quot /* Return 1 if 'cmd' will block on frozen filesystem */ static int quotactl_cmd_write(int cmd) { -@@ -343,6 +384,22 @@ static struct super_block *quotactl_bloc +@@ -385,6 +426,22 @@ static struct super_block *quotactl_bloc putname(tmp); if (IS_ERR(bdev)) return ERR_CAST(bdev); @@ -6864,9 +6789,9 @@ diff -NurpP --minimal linux-3.9.4/fs/quota/quota.c linux-3.9.4-vs2.3.6.1/fs/quot if (quotactl_cmd_write(cmd)) sb = get_super_thawed(bdev); else -diff -NurpP --minimal linux-3.9.4/fs/stat.c linux-3.9.4-vs2.3.6.1/fs/stat.c ---- linux-3.9.4/fs/stat.c 2013-05-31 13:45:25.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/stat.c 2013-05-31 14:47:11.000000000 +0000 +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 @@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod stat->nlink = inode->i_nlink; stat->uid = inode->i_uid; @@ -6875,9 +6800,9 @@ diff -NurpP --minimal linux-3.9.4/fs/stat.c linux-3.9.4-vs2.3.6.1/fs/stat.c stat->rdev = inode->i_rdev; stat->size = i_size_read(inode); stat->atime = inode->i_atime; -diff -NurpP --minimal linux-3.9.4/fs/statfs.c linux-3.9.4-vs2.3.6.1/fs/statfs.c ---- linux-3.9.4/fs/statfs.c 2013-02-19 13:58:49.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/statfs.c 2013-05-31 14:47:11.000000000 +0000 +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 @@ -7,6 +7,8 @@ #include #include @@ -6896,10 +6821,10 @@ diff -NurpP --minimal linux-3.9.4/fs/statfs.c linux-3.9.4-vs2.3.6.1/fs/statfs.c return retval; } -diff -NurpP --minimal linux-3.9.4/fs/super.c linux-3.9.4-vs2.3.6.1/fs/super.c ---- linux-3.9.4/fs/super.c 2013-05-31 13:45:25.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/super.c 2013-05-31 14:47:11.000000000 +0000 -@@ -34,6 +34,8 @@ +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 +@@ -33,6 +33,8 @@ #include #include #include @@ -6908,7 +6833,7 @@ diff -NurpP --minimal linux-3.9.4/fs/super.c linux-3.9.4-vs2.3.6.1/fs/super.c #include "internal.h" -@@ -1117,6 +1119,13 @@ mount_fs(struct file_system_type *type, +@@ -1114,6 +1116,13 @@ mount_fs(struct file_system_type *type, WARN_ON(sb->s_bdi == &default_backing_dev_info); sb->s_flags |= MS_BORN; @@ -6922,21 +6847,9 @@ diff -NurpP --minimal linux-3.9.4/fs/super.c linux-3.9.4-vs2.3.6.1/fs/super.c error = security_sb_kern_mount(sb, flags, secdata); if (error) goto out_sb; -diff -NurpP --minimal linux-3.9.4/fs/sysfs/mount.c linux-3.9.4-vs2.3.6.1/fs/sysfs/mount.c ---- linux-3.9.4/fs/sysfs/mount.c 2013-05-31 13:45:25.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/sysfs/mount.c 2013-05-31 14:47:11.000000000 +0000 -@@ -48,7 +48,7 @@ static int sysfs_fill_super(struct super - - sb->s_blocksize = PAGE_CACHE_SIZE; - sb->s_blocksize_bits = PAGE_CACHE_SHIFT; -- sb->s_magic = SYSFS_MAGIC; -+ sb->s_magic = SYSFS_SUPER_MAGIC; - sb->s_op = &sysfs_ops; - sb->s_time_gran = 1; - -diff -NurpP --minimal linux-3.9.4/fs/utimes.c linux-3.9.4-vs2.3.6.1/fs/utimes.c ---- linux-3.9.4/fs/utimes.c 2013-02-19 13:58:49.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/utimes.c 2013-05-31 22:40:16.000000000 +0000 +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 @@ -8,6 +8,8 @@ #include #include @@ -6946,698 +6859,64 @@ diff -NurpP --minimal linux-3.9.4/fs/utimes.c linux-3.9.4-vs2.3.6.1/fs/utimes.c #include #include -@@ -52,12 +54,18 @@ static int utimes_common(struct path *pa +@@ -52,13 +54,19 @@ static int utimes_common(struct path *pa { int error; struct iattr newattrs; - struct inode *inode = path->dentry->d_inode; -+ struct inode *inode; -+ -+ error = cow_check_and_break(path); -+ if (error) -+ goto out; - - error = mnt_want_write(path->mnt); - if (error) - goto out; - -+ inode = path->dentry->d_inode; -+ - if (times && times[0].tv_nsec == UTIME_NOW && - times[1].tv_nsec == UTIME_NOW) - times = NULL; -diff -NurpP --minimal linux-3.9.4/fs/xattr.c linux-3.9.4-vs2.3.6.1/fs/xattr.c ---- linux-3.9.4/fs/xattr.c 2013-02-19 13:58:49.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/xattr.c 2013-05-31 14:47:11.000000000 +0000 -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - - #include - -@@ -52,7 +53,7 @@ xattr_permission(struct inode *inode, co - * The trusted.* namespace can only be accessed by privileged users. - */ - if (!strncmp(name, XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN)) { -- if (!capable(CAP_SYS_ADMIN)) -+ if (!vx_capable(CAP_SYS_ADMIN, VXC_FS_TRUSTED)) - return (mask & MAY_WRITE) ? -EPERM : -ENODATA; - return 0; - } -diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_dinode.h linux-3.9.4-vs2.3.6.1/fs/xfs/xfs_dinode.h ---- linux-3.9.4/fs/xfs/xfs_dinode.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/xfs/xfs_dinode.h 2013-05-31 14:47:11.000000000 +0000 -@@ -51,7 +51,9 @@ typedef struct xfs_dinode { - __be32 di_nlink; /* number of links to file */ - __be16 di_projid_lo; /* lower part of owner's project id */ - __be16 di_projid_hi; /* higher part owner's project id */ -- __u8 di_pad[6]; /* unused, zeroed space */ -+ __u8 di_pad[2]; /* unused, zeroed space */ -+ __be16 di_tag; /* context tagging */ -+ __be16 di_vflags; /* vserver specific flags */ - __be16 di_flushiter; /* incremented on flush */ - xfs_timestamp_t di_atime; /* time last accessed */ - xfs_timestamp_t di_mtime; /* time last modified */ -@@ -184,6 +186,8 @@ static inline void xfs_dinode_put_rdev(s - #define XFS_DIFLAG_EXTSZINHERIT_BIT 12 /* inherit inode extent size */ - #define XFS_DIFLAG_NODEFRAG_BIT 13 /* do not reorganize/defragment */ - #define XFS_DIFLAG_FILESTREAM_BIT 14 /* use filestream allocator */ -+#define XFS_DIFLAG_IXUNLINK_BIT 15 /* Immutable inver on unlink */ -+ - #define XFS_DIFLAG_REALTIME (1 << XFS_DIFLAG_REALTIME_BIT) - #define XFS_DIFLAG_PREALLOC (1 << XFS_DIFLAG_PREALLOC_BIT) - #define XFS_DIFLAG_NEWRTBM (1 << XFS_DIFLAG_NEWRTBM_BIT) -@@ -199,6 +203,7 @@ static inline void xfs_dinode_put_rdev(s - #define XFS_DIFLAG_EXTSZINHERIT (1 << XFS_DIFLAG_EXTSZINHERIT_BIT) - #define XFS_DIFLAG_NODEFRAG (1 << XFS_DIFLAG_NODEFRAG_BIT) - #define XFS_DIFLAG_FILESTREAM (1 << XFS_DIFLAG_FILESTREAM_BIT) -+#define XFS_DIFLAG_IXUNLINK (1 << XFS_DIFLAG_IXUNLINK_BIT) - - #ifdef CONFIG_XFS_RT - #define XFS_IS_REALTIME_INODE(ip) ((ip)->i_d.di_flags & XFS_DIFLAG_REALTIME) -@@ -211,6 +216,10 @@ static inline void xfs_dinode_put_rdev(s - XFS_DIFLAG_IMMUTABLE | XFS_DIFLAG_APPEND | XFS_DIFLAG_SYNC | \ - XFS_DIFLAG_NOATIME | XFS_DIFLAG_NODUMP | XFS_DIFLAG_RTINHERIT | \ - XFS_DIFLAG_PROJINHERIT | XFS_DIFLAG_NOSYMLINKS | XFS_DIFLAG_EXTSIZE | \ -- XFS_DIFLAG_EXTSZINHERIT | XFS_DIFLAG_NODEFRAG | XFS_DIFLAG_FILESTREAM) -+ XFS_DIFLAG_EXTSZINHERIT | XFS_DIFLAG_NODEFRAG | XFS_DIFLAG_FILESTREAM | \ -+ XFS_DIFLAG_IXUNLINK) -+ -+#define XFS_DIVFLAG_BARRIER 0x01 -+#define XFS_DIVFLAG_COW 0x02 - - #endif /* __XFS_DINODE_H__ */ -diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_fs.h linux-3.9.4-vs2.3.6.1/fs/xfs/xfs_fs.h ---- linux-3.9.4/fs/xfs/xfs_fs.h 2013-02-19 13:58:49.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/xfs/xfs_fs.h 2013-05-31 14:47:11.000000000 +0000 -@@ -67,6 +67,9 @@ struct fsxattr { - #define XFS_XFLAG_EXTSZINHERIT 0x00001000 /* inherit inode extent size */ - #define XFS_XFLAG_NODEFRAG 0x00002000 /* do not defragment */ - #define XFS_XFLAG_FILESTREAM 0x00004000 /* use filestream allocator */ -+#define XFS_XFLAG_IXUNLINK 0x00008000 /* immutable invert on unlink */ -+#define XFS_XFLAG_BARRIER 0x10000000 /* chroot() barrier */ -+#define XFS_XFLAG_COW 0x20000000 /* copy on write mark */ - #define XFS_XFLAG_HASATTR 0x80000000 /* no DIFLAG for this */ - - /* -@@ -303,7 +306,8 @@ typedef struct xfs_bstat { - #define bs_projid bs_projid_lo /* (previously just bs_projid) */ - __u16 bs_forkoff; /* inode fork offset in bytes */ - __u16 bs_projid_hi; /* higher part of project id */ -- unsigned char bs_pad[10]; /* pad space, unused */ -+ unsigned char bs_pad[8]; /* pad space, unused */ -+ __u16 bs_tag; /* context tagging */ - __u32 bs_dmevmask; /* DMIG event mask */ - __u16 bs_dmstate; /* DMIG state info */ - __u16 bs_aextents; /* attribute number of extents */ -diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_ialloc.c linux-3.9.4-vs2.3.6.1/fs/xfs/xfs_ialloc.c ---- linux-3.9.4/fs/xfs/xfs_ialloc.c 2013-05-31 13:45:25.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/xfs/xfs_ialloc.c 2013-05-31 14:47:11.000000000 +0000 -@@ -37,7 +37,6 @@ - #include "xfs_error.h" - #include "xfs_bmap.h" - -- - /* - * Allocation group level functions. - */ -diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_inode.c linux-3.9.4-vs2.3.6.1/fs/xfs/xfs_inode.c ---- linux-3.9.4/fs/xfs/xfs_inode.c 2013-05-31 13:45:25.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/xfs/xfs_inode.c 2013-05-31 14:47:11.000000000 +0000 -@@ -16,6 +16,7 @@ - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - #include -+#include - - #include "xfs.h" - #include "xfs_fs.h" -@@ -835,15 +836,25 @@ xfs_iformat_btree( - STATIC void - xfs_dinode_from_disk( - xfs_icdinode_t *to, -- xfs_dinode_t *from) -+ xfs_dinode_t *from, -+ int tagged) - { -+ uint32_t uid, gid, tag; -+ - to->di_magic = be16_to_cpu(from->di_magic); - to->di_mode = be16_to_cpu(from->di_mode); - to->di_version = from ->di_version; - to->di_format = from->di_format; - to->di_onlink = be16_to_cpu(from->di_onlink); -- to->di_uid = be32_to_cpu(from->di_uid); -- to->di_gid = be32_to_cpu(from->di_gid); -+ -+ uid = be32_to_cpu(from->di_uid); -+ gid = be32_to_cpu(from->di_gid); -+ tag = be16_to_cpu(from->di_tag); -+ -+ to->di_uid = INOTAG_UID(tagged, uid, gid); -+ to->di_gid = INOTAG_GID(tagged, uid, gid); -+ to->di_tag = INOTAG_TAG(tagged, uid, gid, tag); -+ - to->di_nlink = be32_to_cpu(from->di_nlink); - to->di_projid_lo = be16_to_cpu(from->di_projid_lo); - to->di_projid_hi = be16_to_cpu(from->di_projid_hi); -@@ -865,21 +876,26 @@ xfs_dinode_from_disk( - to->di_dmevmask = be32_to_cpu(from->di_dmevmask); - to->di_dmstate = be16_to_cpu(from->di_dmstate); - to->di_flags = be16_to_cpu(from->di_flags); -+ to->di_vflags = be16_to_cpu(from->di_vflags); - to->di_gen = be32_to_cpu(from->di_gen); - } - - void - xfs_dinode_to_disk( - xfs_dinode_t *to, -- xfs_icdinode_t *from) -+ xfs_icdinode_t *from, -+ int tagged) - { - to->di_magic = cpu_to_be16(from->di_magic); - to->di_mode = cpu_to_be16(from->di_mode); - to->di_version = from ->di_version; - to->di_format = from->di_format; - to->di_onlink = cpu_to_be16(from->di_onlink); -- to->di_uid = cpu_to_be32(from->di_uid); -- to->di_gid = cpu_to_be32(from->di_gid); -+ -+ to->di_uid = cpu_to_be32(TAGINO_UID(tagged, from->di_uid, from->di_tag)); -+ to->di_gid = cpu_to_be32(TAGINO_GID(tagged, from->di_gid, from->di_tag)); -+ to->di_tag = cpu_to_be16(TAGINO_TAG(tagged, from->di_tag)); -+ - to->di_nlink = cpu_to_be32(from->di_nlink); - to->di_projid_lo = cpu_to_be16(from->di_projid_lo); - to->di_projid_hi = cpu_to_be16(from->di_projid_hi); -@@ -901,12 +917,14 @@ xfs_dinode_to_disk( - to->di_dmevmask = cpu_to_be32(from->di_dmevmask); - to->di_dmstate = cpu_to_be16(from->di_dmstate); - to->di_flags = cpu_to_be16(from->di_flags); -+ to->di_vflags = cpu_to_be16(from->di_vflags); - to->di_gen = cpu_to_be32(from->di_gen); - } - - STATIC uint - _xfs_dic2xflags( -- __uint16_t di_flags) -+ __uint16_t di_flags, -+ __uint16_t di_vflags) - { - uint flags = 0; - -@@ -917,6 +935,8 @@ _xfs_dic2xflags( - flags |= XFS_XFLAG_PREALLOC; - if (di_flags & XFS_DIFLAG_IMMUTABLE) - flags |= XFS_XFLAG_IMMUTABLE; -+ if (di_flags & XFS_DIFLAG_IXUNLINK) -+ flags |= XFS_XFLAG_IXUNLINK; - if (di_flags & XFS_DIFLAG_APPEND) - flags |= XFS_XFLAG_APPEND; - if (di_flags & XFS_DIFLAG_SYNC) -@@ -941,6 +961,10 @@ _xfs_dic2xflags( - flags |= XFS_XFLAG_FILESTREAM; - } - -+ if (di_vflags & XFS_DIVFLAG_BARRIER) -+ flags |= FS_BARRIER_FL; -+ if (di_vflags & XFS_DIVFLAG_COW) -+ flags |= FS_COW_FL; - return flags; - } - -@@ -950,7 +974,7 @@ xfs_ip2xflags( - { - xfs_icdinode_t *dic = &ip->i_d; - -- return _xfs_dic2xflags(dic->di_flags) | -+ return _xfs_dic2xflags(dic->di_flags, dic->di_vflags) | - (XFS_IFORK_Q(ip) ? XFS_XFLAG_HASATTR : 0); - } - -@@ -958,7 +982,8 @@ uint - xfs_dic2xflags( - xfs_dinode_t *dip) - { -- return _xfs_dic2xflags(be16_to_cpu(dip->di_flags)) | -+ return _xfs_dic2xflags(be16_to_cpu(dip->di_flags), -+ be16_to_cpu(dip->di_vflags)) | - (XFS_DFORK_Q(dip) ? XFS_XFLAG_HASATTR : 0); - } - -@@ -1012,7 +1037,8 @@ xfs_iread( - * Otherwise, just get the truly permanent information. - */ - if (dip->di_mode) { -- xfs_dinode_from_disk(&ip->i_d, dip); -+ xfs_dinode_from_disk(&ip->i_d, dip, -+ mp->m_flags & XFS_MOUNT_TAGGED); - error = xfs_iformat(ip, dip); - if (error) { - #ifdef DEBUG -@@ -1199,6 +1225,7 @@ xfs_ialloc( - ASSERT(ip->i_d.di_nlink == nlink); - ip->i_d.di_uid = current_fsuid(); - ip->i_d.di_gid = current_fsgid(); -+ ip->i_d.di_tag = current_fstag(&ip->i_vnode); - xfs_set_projid(ip, prid); - memset(&(ip->i_d.di_pad[0]), 0, sizeof(ip->i_d.di_pad)); - -@@ -1258,6 +1285,7 @@ xfs_ialloc( - ip->i_d.di_dmevmask = 0; - ip->i_d.di_dmstate = 0; - ip->i_d.di_flags = 0; -+ ip->i_d.di_vflags = 0; - flags = XFS_ILOG_CORE; - switch (mode & S_IFMT) { - case S_IFIFO: -@@ -1952,6 +1980,7 @@ xfs_ifree( - } - ip->i_d.di_mode = 0; /* mark incore inode as free */ - ip->i_d.di_flags = 0; -+ ip->i_d.di_vflags = 0; - ip->i_d.di_dmevmask = 0; - ip->i_d.di_forkoff = 0; /* mark the attr fork not in use */ - ip->i_d.di_format = XFS_DINODE_FMT_EXTENTS; -@@ -2118,7 +2147,6 @@ xfs_iroot_realloc( - return; - } - -- - /* - * This is called when the amount of space needed for if_data - * is increased or decreased. The change in size is indicated by -@@ -2800,7 +2828,8 @@ xfs_iflush_int( - * because if the inode is dirty at all the core must - * be. - */ -- xfs_dinode_to_disk(dip, &ip->i_d); -+ xfs_dinode_to_disk(dip, &ip->i_d, -+ mp->m_flags & XFS_MOUNT_TAGGED); - - /* Wrap, we never let the log put out DI_MAX_FLUSH */ - if (ip->i_d.di_flushiter == DI_MAX_FLUSH) -diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_inode.h linux-3.9.4-vs2.3.6.1/fs/xfs/xfs_inode.h ---- linux-3.9.4/fs/xfs/xfs_inode.h 2013-05-31 13:45:25.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/xfs/xfs_inode.h 2013-05-31 14:47:11.000000000 +0000 -@@ -134,7 +134,9 @@ typedef struct xfs_icdinode { - __uint32_t di_nlink; /* number of links to file */ - __uint16_t di_projid_lo; /* lower part of owner's project id */ - __uint16_t di_projid_hi; /* higher part of owner's project id */ -- __uint8_t di_pad[6]; /* unused, zeroed space */ -+ __uint8_t di_pad[2]; /* unused, zeroed space */ -+ __uint16_t di_tag; /* context tagging */ -+ __uint16_t di_vflags; /* vserver specific flags */ - __uint16_t di_flushiter; /* incremented on flush */ - xfs_ictimestamp_t di_atime; /* time last accessed */ - xfs_ictimestamp_t di_mtime; /* time last modified */ -@@ -556,7 +558,7 @@ int xfs_imap_to_bp(struct xfs_mount *, - int xfs_iread(struct xfs_mount *, struct xfs_trans *, - struct xfs_inode *, uint); - void xfs_dinode_to_disk(struct xfs_dinode *, -- struct xfs_icdinode *); -+ struct xfs_icdinode *, int); - void xfs_idestroy_fork(struct xfs_inode *, int); - void xfs_idata_realloc(struct xfs_inode *, int, int); - void xfs_iroot_realloc(struct xfs_inode *, int, int); -diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_ioctl.c linux-3.9.4-vs2.3.6.1/fs/xfs/xfs_ioctl.c ---- linux-3.9.4/fs/xfs/xfs_ioctl.c 2013-05-31 13:45:25.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/xfs/xfs_ioctl.c 2013-05-31 14:47:11.000000000 +0000 -@@ -26,7 +26,7 @@ - #include "xfs_bmap_btree.h" - #include "xfs_dinode.h" - #include "xfs_inode.h" --#include "xfs_ioctl.h" -+// #include "xfs_ioctl.h" - #include "xfs_rtalloc.h" - #include "xfs_itable.h" - #include "xfs_error.h" -@@ -763,6 +763,10 @@ xfs_merge_ioc_xflags( - xflags |= XFS_XFLAG_IMMUTABLE; - else - xflags &= ~XFS_XFLAG_IMMUTABLE; -+ if (flags & FS_IXUNLINK_FL) -+ xflags |= XFS_XFLAG_IXUNLINK; -+ else -+ xflags &= ~XFS_XFLAG_IXUNLINK; - if (flags & FS_APPEND_FL) - xflags |= XFS_XFLAG_APPEND; - else -@@ -791,6 +795,8 @@ xfs_di2lxflags( - - if (di_flags & XFS_DIFLAG_IMMUTABLE) - flags |= FS_IMMUTABLE_FL; -+ if (di_flags & XFS_DIFLAG_IXUNLINK) -+ flags |= FS_IXUNLINK_FL; - if (di_flags & XFS_DIFLAG_APPEND) - flags |= FS_APPEND_FL; - if (di_flags & XFS_DIFLAG_SYNC) -@@ -851,6 +857,8 @@ xfs_set_diflags( - di_flags = (ip->i_d.di_flags & XFS_DIFLAG_PREALLOC); - if (xflags & XFS_XFLAG_IMMUTABLE) - di_flags |= XFS_DIFLAG_IMMUTABLE; -+ if (xflags & XFS_XFLAG_IXUNLINK) -+ di_flags |= XFS_DIFLAG_IXUNLINK; - if (xflags & XFS_XFLAG_APPEND) - di_flags |= XFS_DIFLAG_APPEND; - if (xflags & XFS_XFLAG_SYNC) -@@ -893,6 +901,10 @@ xfs_diflags_to_linux( - inode->i_flags |= S_IMMUTABLE; - else - inode->i_flags &= ~S_IMMUTABLE; -+ if (xflags & XFS_XFLAG_IXUNLINK) -+ inode->i_flags |= S_IXUNLINK; -+ else -+ inode->i_flags &= ~S_IXUNLINK; - if (xflags & XFS_XFLAG_APPEND) - inode->i_flags |= S_APPEND; - else -@@ -1397,10 +1409,18 @@ xfs_file_ioctl( - case XFS_IOC_FSGETXATTRA: - return xfs_ioc_fsgetxattr(ip, 1, arg); - case XFS_IOC_FSSETXATTR: -+ if (IS_BARRIER(inode)) { -+ vxwprintk_task(1, "messing with the barrier."); -+ return -XFS_ERROR(EACCES); -+ } - return xfs_ioc_fssetxattr(ip, filp, arg); - case XFS_IOC_GETXFLAGS: - return xfs_ioc_getxflags(ip, arg); - case XFS_IOC_SETXFLAGS: -+ if (IS_BARRIER(inode)) { -+ vxwprintk_task(1, "messing with the barrier."); -+ return -XFS_ERROR(EACCES); -+ } - return xfs_ioc_setxflags(ip, filp, arg); - - case XFS_IOC_FSSETDM: { -diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_ioctl.h linux-3.9.4-vs2.3.6.1/fs/xfs/xfs_ioctl.h ---- linux-3.9.4/fs/xfs/xfs_ioctl.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/xfs/xfs_ioctl.h 2013-05-31 14:47:11.000000000 +0000 -@@ -70,6 +70,12 @@ xfs_handle_to_dentry( - void __user *uhandle, - u32 hlen); - -+extern int -+xfs_sync_flags( -+ struct inode *inode, -+ int flags, -+ int vflags); -+ - extern long - xfs_file_ioctl( - struct file *filp, -diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_iops.c linux-3.9.4-vs2.3.6.1/fs/xfs/xfs_iops.c ---- linux-3.9.4/fs/xfs/xfs_iops.c 2013-02-19 13:58:49.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/xfs/xfs_iops.c 2013-05-31 14:47:11.000000000 +0000 -@@ -28,6 +28,7 @@ - #include "xfs_bmap_btree.h" - #include "xfs_dinode.h" - #include "xfs_inode.h" -+#include "xfs_ioctl.h" - #include "xfs_bmap.h" - #include "xfs_rtalloc.h" - #include "xfs_error.h" -@@ -47,6 +48,7 @@ - #include - #include - #include -+#include - - static int - xfs_initxattrs( -@@ -422,6 +424,7 @@ xfs_vn_getattr( - stat->nlink = ip->i_d.di_nlink; - stat->uid = ip->i_d.di_uid; - stat->gid = ip->i_d.di_gid; -+ stat->tag = ip->i_d.di_tag; - stat->ino = ip->i_ino; - stat->atime = inode->i_atime; - stat->mtime = inode->i_mtime; -@@ -1037,6 +1040,7 @@ static const struct inode_operations xfs - .listxattr = xfs_vn_listxattr, - .fiemap = xfs_vn_fiemap, - .update_time = xfs_vn_update_time, -+ .sync_flags = xfs_sync_flags, - }; - - static const struct inode_operations xfs_dir_inode_operations = { -@@ -1063,6 +1067,7 @@ static const struct inode_operations xfs - .removexattr = generic_removexattr, - .listxattr = xfs_vn_listxattr, - .update_time = xfs_vn_update_time, -+ .sync_flags = xfs_sync_flags, - }; - - static const struct inode_operations xfs_dir_ci_inode_operations = { -@@ -1114,6 +1119,10 @@ xfs_diflags_to_iflags( - inode->i_flags |= S_IMMUTABLE; - else - inode->i_flags &= ~S_IMMUTABLE; -+ if (ip->i_d.di_flags & XFS_DIFLAG_IXUNLINK) -+ inode->i_flags |= S_IXUNLINK; -+ else -+ inode->i_flags &= ~S_IXUNLINK; - if (ip->i_d.di_flags & XFS_DIFLAG_APPEND) - inode->i_flags |= S_APPEND; - else -@@ -1126,6 +1135,15 @@ xfs_diflags_to_iflags( - inode->i_flags |= S_NOATIME; - else - inode->i_flags &= ~S_NOATIME; -+ -+ if (ip->i_d.di_vflags & XFS_DIVFLAG_BARRIER) -+ inode->i_vflags |= V_BARRIER; -+ else -+ inode->i_vflags &= ~V_BARRIER; -+ if (ip->i_d.di_vflags & XFS_DIVFLAG_COW) -+ inode->i_vflags |= V_COW; -+ else -+ inode->i_vflags &= ~V_COW; - } - - /* -@@ -1157,6 +1175,7 @@ xfs_setup_inode( - set_nlink(inode, ip->i_d.di_nlink); - inode->i_uid = ip->i_d.di_uid; - inode->i_gid = ip->i_d.di_gid; -+ inode->i_tag = ip->i_d.di_tag; - - switch (inode->i_mode & S_IFMT) { - case S_IFBLK: -diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_itable.c linux-3.9.4-vs2.3.6.1/fs/xfs/xfs_itable.c ---- linux-3.9.4/fs/xfs/xfs_itable.c 2013-02-19 13:58:49.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/xfs/xfs_itable.c 2013-05-31 14:47:11.000000000 +0000 -@@ -97,6 +97,7 @@ xfs_bulkstat_one_int( - buf->bs_mode = dic->di_mode; - buf->bs_uid = dic->di_uid; - buf->bs_gid = dic->di_gid; -+ buf->bs_tag = dic->di_tag; - buf->bs_size = dic->di_size; - buf->bs_atime.tv_sec = dic->di_atime.t_sec; - buf->bs_atime.tv_nsec = dic->di_atime.t_nsec; -diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_linux.h linux-3.9.4-vs2.3.6.1/fs/xfs/xfs_linux.h ---- linux-3.9.4/fs/xfs/xfs_linux.h 2013-02-19 13:58:49.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/xfs/xfs_linux.h 2013-05-31 14:47:11.000000000 +0000 -@@ -123,6 +123,7 @@ - - #define current_cpu() (raw_smp_processor_id()) - #define current_pid() (current->pid) -+#define current_fstag(vp) (dx_current_fstag((vp)->i_sb)) - #define current_test_flags(f) (current->flags & (f)) - #define current_set_flags_nested(sp, f) \ - (*(sp) = current->flags, current->flags |= (f)) -diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_log_recover.c linux-3.9.4-vs2.3.6.1/fs/xfs/xfs_log_recover.c ---- linux-3.9.4/fs/xfs/xfs_log_recover.c 2013-05-31 13:45:25.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/xfs/xfs_log_recover.c 2013-05-31 14:47:11.000000000 +0000 -@@ -2361,7 +2361,8 @@ xlog_recover_inode_pass2( - } - - /* The core is in in-core format */ -- xfs_dinode_to_disk(dip, item->ri_buf[1].i_addr); -+ xfs_dinode_to_disk(dip, item->ri_buf[1].i_addr, -+ mp->m_flags & XFS_MOUNT_TAGGED); - - /* the rest is in on-disk format */ - if (item->ri_buf[1].i_len > sizeof(struct xfs_icdinode)) { -diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_mount.h linux-3.9.4-vs2.3.6.1/fs/xfs/xfs_mount.h ---- linux-3.9.4/fs/xfs/xfs_mount.h 2013-05-31 13:45:25.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/xfs/xfs_mount.h 2013-05-31 14:47:11.000000000 +0000 -@@ -254,6 +254,7 @@ typedef struct xfs_mount { - allocator */ - #define XFS_MOUNT_NOATTR2 (1ULL << 25) /* disable use of attr2 format */ - -+#define XFS_MOUNT_TAGGED (1ULL << 31) /* context tagging */ - - /* - * Default minimum read and write sizes. -diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_super.c linux-3.9.4-vs2.3.6.1/fs/xfs/xfs_super.c ---- linux-3.9.4/fs/xfs/xfs_super.c 2013-05-31 13:45:25.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/xfs/xfs_super.c 2013-05-31 14:47:11.000000000 +0000 -@@ -114,6 +114,9 @@ mempool_t *xfs_ioend_pool; - #define MNTOPT_NODELAYLOG "nodelaylog" /* Delayed logging disabled */ - #define MNTOPT_DISCARD "discard" /* Discard unused blocks */ - #define MNTOPT_NODISCARD "nodiscard" /* Do not discard unused blocks */ -+#define MNTOPT_TAGXID "tagxid" /* context tagging for inodes */ -+#define MNTOPT_TAGGED "tag" /* context tagging for inodes */ -+#define MNTOPT_NOTAGTAG "notag" /* do not use context tagging */ - - /* - * Table driven mount option parser. -@@ -126,6 +129,8 @@ enum { - Opt_nobarrier, - Opt_inode64, - Opt_inode32, -+ Opt_tag, -+ Opt_notag, - Opt_err - }; - -@@ -134,6 +139,9 @@ static const match_table_t tokens = { - {Opt_nobarrier, "nobarrier"}, - {Opt_inode64, "inode64"}, - {Opt_inode32, "inode32"}, -+ {Opt_tag, "tagxid"}, -+ {Opt_tag, "tag"}, -+ {Opt_notag, "notag"}, - {Opt_err, NULL} - }; - -@@ -392,6 +400,19 @@ xfs_parseargs( - } else if (!strcmp(this_char, "irixsgid")) { - xfs_warn(mp, - "irixsgid is now a sysctl(2) variable, option is deprecated."); -+#ifndef CONFIG_TAGGING_NONE -+ } else if (!strcmp(this_char, MNTOPT_TAGGED)) { -+ mp->m_flags |= XFS_MOUNT_TAGGED; -+ } else if (!strcmp(this_char, MNTOPT_NOTAGTAG)) { -+ mp->m_flags &= ~XFS_MOUNT_TAGGED; -+ } else if (!strcmp(this_char, MNTOPT_TAGXID)) { -+ mp->m_flags |= XFS_MOUNT_TAGGED; -+#endif -+#ifdef CONFIG_PROPAGATE -+ } else if (!strcmp(this_char, MNTOPT_TAGGED)) { -+ /* use value */ -+ mp->m_flags |= XFS_MOUNT_TAGGED; -+#endif - } else { - xfs_warn(mp, "unknown mount option [%s].", this_char); - return EINVAL; -@@ -1238,6 +1259,16 @@ xfs_fs_remount( - case Opt_inode32: - mp->m_maxagi = xfs_set_inode32(mp); - break; -+ case Opt_tag: -+ if (!(sb->s_flags & MS_TAGGED)) { -+ printk(KERN_INFO -+ "XFS: %s: tagging not permitted on remount.\n", -+ sb->s_id); -+ return -EINVAL; -+ } -+ break; -+ case Opt_notag: -+ break; - default: - /* - * Logically we would return an error here to prevent -@@ -1458,6 +1489,9 @@ xfs_fs_fill_super( - if (error) - goto out_free_sb; - -+ if (mp->m_flags & XFS_MOUNT_TAGGED) -+ sb->s_flags |= MS_TAGGED; -+ - /* - * we must configure the block size in the superblock before we run the - * full mount process as the mount process can lookup and cache inodes. -diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_vnodeops.c linux-3.9.4-vs2.3.6.1/fs/xfs/xfs_vnodeops.c ---- linux-3.9.4/fs/xfs/xfs_vnodeops.c 2013-05-31 13:45:25.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/fs/xfs/xfs_vnodeops.c 2013-05-31 14:47:11.000000000 +0000 -@@ -104,6 +104,77 @@ xfs_readlink_bmap( - return error; - } - -+ -+STATIC void -+xfs_get_inode_flags( -+ xfs_inode_t *ip) -+{ -+ struct inode *inode = VFS_I(ip); -+ unsigned int flags = inode->i_flags; -+ unsigned int vflags = inode->i_vflags; -+ -+ if (flags & S_IMMUTABLE) -+ ip->i_d.di_flags |= XFS_DIFLAG_IMMUTABLE; -+ else -+ ip->i_d.di_flags &= ~XFS_DIFLAG_IMMUTABLE; -+ if (flags & S_IXUNLINK) -+ ip->i_d.di_flags |= XFS_DIFLAG_IXUNLINK; -+ else -+ ip->i_d.di_flags &= ~XFS_DIFLAG_IXUNLINK; -+ -+ if (vflags & V_BARRIER) -+ ip->i_d.di_vflags |= XFS_DIVFLAG_BARRIER; -+ else -+ ip->i_d.di_vflags &= ~XFS_DIVFLAG_BARRIER; -+ if (vflags & V_COW) -+ ip->i_d.di_vflags |= XFS_DIVFLAG_COW; -+ else -+ ip->i_d.di_vflags &= ~XFS_DIVFLAG_COW; -+} -+ -+int -+xfs_sync_flags( -+ struct inode *inode, -+ int flags, -+ int vflags) -+{ -+ struct xfs_inode *ip = XFS_I(inode); -+ struct xfs_mount *mp = ip->i_mount; -+ struct xfs_trans *tp; -+ unsigned int lock_flags = 0; -+ int code; -+ -+ tp = xfs_trans_alloc(mp, XFS_TRANS_SETATTR_NOT_SIZE); -+ code = xfs_trans_reserve(tp, 0, XFS_ICHANGE_LOG_RES(mp), 0, 0, 0); -+ if (code) -+ goto error_out; -+ -+ xfs_ilock(ip, XFS_ILOCK_EXCL); -+ xfs_trans_ijoin(tp, ip, 0); -+ -+ inode->i_flags = flags; -+ inode->i_vflags = vflags; -+ xfs_get_inode_flags(ip); -+ -+ xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE); -+ xfs_trans_ichgtime(tp, ip, XFS_ICHGTIME_CHG); -+ -+ XFS_STATS_INC(xs_ig_attrchg); -+ -+ if (mp->m_flags & XFS_MOUNT_WSYNC) -+ xfs_trans_set_sync(tp); -+ code = xfs_trans_commit(tp, 0); -+ xfs_iunlock(ip, XFS_ILOCK_EXCL); -+ return code; -+ -+error_out: -+ xfs_trans_cancel(tp, 0); -+ if (lock_flags) -+ xfs_iunlock(ip, XFS_ILOCK_EXCL); -+ return code; -+} + struct inode *delegated_inode = NULL; ++ struct inode *inode; + ++ error = cow_check_and_break(path); ++ if (error) ++ goto out; + + error = mnt_want_write(path->mnt); + if (error) + goto out; + ++ inode = path->dentry->d_inode; + - int - xfs_readlink( - xfs_inode_t *ip, -diff -NurpP --minimal linux-3.9.4/include/linux/cred.h linux-3.9.4-vs2.3.6.1/include/linux/cred.h ---- linux-3.9.4/include/linux/cred.h 2013-02-19 13:58:50.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/cred.h 2013-05-31 14:47:11.000000000 +0000 -@@ -143,6 +143,7 @@ extern void exit_creds(struct task_struc + 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 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #include + +@@ -52,7 +53,7 @@ xattr_permission(struct inode *inode, co + * The trusted.* namespace can only be accessed by privileged users. + */ + if (!strncmp(name, XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN)) { +- if (!capable(CAP_SYS_ADMIN)) ++ if (!vx_capable(CAP_SYS_ADMIN, VXC_FS_TRUSTED)) + 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 + #else /* HAND-CODED capability initializers */ + + #define CAP_LAST_U32 ((_KERNEL_CAPABILITY_U32S) - 1) +-#define CAP_LAST_U32_VALID_MASK (CAP_TO_MASK(CAP_LAST_CAP + 1) -1) ++#define CAP_LAST_U32_VALID_MASK ((CAP_TO_MASK(CAP_LAST_CAP + 1) -1) \ ++ | CAP_TO_MASK(CAP_CONTEXT)) + + # 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 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); @@ -7645,7 +6924,7 @@ diff -NurpP --minimal linux-3.9.4/include/linux/cred.h linux-3.9.4-vs2.3.6.1/inc extern struct cred *prepare_creds(void); extern struct cred *prepare_exec_creds(void); extern int commit_creds(struct cred *); -@@ -196,6 +197,31 @@ static inline void validate_process_cred +@@ -197,6 +198,31 @@ static inline void validate_process_cred } #endif @@ -7677,27 +6956,27 @@ diff -NurpP --minimal linux-3.9.4/include/linux/cred.h linux-3.9.4-vs2.3.6.1/inc /** * get_new_cred - Get a reference on a new set of credentials * @cred: The new credentials to reference -diff -NurpP --minimal linux-3.9.4/include/linux/devpts_fs.h linux-3.9.4-vs2.3.6.1/include/linux/devpts_fs.h ---- linux-3.9.4/include/linux/devpts_fs.h 2013-02-19 13:58:50.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/devpts_fs.h 2013-05-31 14:47:11.000000000 +0000 +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 #endif - #endif /* _LINUX_DEVPTS_FS_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/fs.h linux-3.9.4-vs2.3.6.1/include/linux/fs.h ---- linux-3.9.4/include/linux/fs.h 2013-05-31 13:45:27.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/fs.h 2013-05-31 14:47:11.000000000 +0000 -@@ -211,6 +211,7 @@ typedef void (dio_iodone_t)(struct kiocb +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) #define ATTR_OPEN (1 << 15) /* Truncating from open(O_TRUNC) */ #define ATTR_TIMES_SET (1 << 16) +#define ATTR_TAG (1 << 17) /* - * This is the Inode Attributes structure, used for notify_change(). It -@@ -226,6 +227,7 @@ struct iattr { + * Whiteout is represented by a char device. The following constants define the +@@ -243,6 +244,7 @@ struct iattr { umode_t ia_mode; kuid_t ia_uid; kgid_t ia_gid; @@ -7705,7 +6984,7 @@ diff -NurpP --minimal linux-3.9.4/include/linux/fs.h linux-3.9.4-vs2.3.6.1/inclu loff_t ia_size; struct timespec ia_atime; struct timespec ia_mtime; -@@ -523,7 +525,9 @@ struct inode { +@@ -540,7 +542,9 @@ struct inode { unsigned short i_opflags; kuid_t i_uid; kgid_t i_gid; @@ -7716,7 +6995,7 @@ diff -NurpP --minimal linux-3.9.4/include/linux/fs.h linux-3.9.4-vs2.3.6.1/inclu #ifdef CONFIG_FS_POSIX_ACL struct posix_acl *i_acl; -@@ -552,6 +556,7 @@ struct inode { +@@ -569,6 +573,7 @@ struct inode { unsigned int __i_nlink; }; dev_t i_rdev; @@ -7724,11 +7003,11 @@ diff -NurpP --minimal linux-3.9.4/include/linux/fs.h linux-3.9.4-vs2.3.6.1/inclu loff_t i_size; struct timespec i_atime; struct timespec i_mtime; -@@ -702,6 +707,11 @@ static inline gid_t i_gid_read(const str +@@ -730,6 +735,11 @@ static inline gid_t i_gid_read(const str return from_kgid(&init_user_ns, inode->i_gid); } -+static inline tag_t i_tag_read(const struct inode *inode) ++static inline vtag_t i_tag_read(const struct inode *inode) +{ + return from_ktag(&init_user_ns, inode->i_tag); +} @@ -7736,11 +7015,11 @@ diff -NurpP --minimal linux-3.9.4/include/linux/fs.h linux-3.9.4-vs2.3.6.1/inclu static inline void i_uid_write(struct inode *inode, uid_t uid) { inode->i_uid = make_kuid(&init_user_ns, uid); -@@ -712,14 +722,19 @@ static inline void i_gid_write(struct in +@@ -740,14 +750,19 @@ static inline void i_gid_write(struct in inode->i_gid = make_kgid(&init_user_ns, gid); } -+static inline void i_tag_write(struct inode *inode, tag_t tag) ++static inline void i_tag_write(struct inode *inode, vtag_t tag) +{ + inode->i_tag = make_ktag(&init_user_ns, tag); +} @@ -7758,23 +7037,23 @@ diff -NurpP --minimal linux-3.9.4/include/linux/fs.h linux-3.9.4-vs2.3.6.1/inclu } extern struct block_device *I_BDEV(struct inode *inode); -@@ -786,6 +801,7 @@ struct file { +@@ -805,6 +820,7 @@ struct file { loff_t f_pos; struct fown_struct f_owner; const struct cred *f_cred; -+ xid_t f_xid; ++ vxid_t f_xid; struct file_ra_state f_ra; u64 f_version; -@@ -937,6 +953,7 @@ struct file_lock { +@@ -929,6 +945,7 @@ struct file_lock { struct file *fl_file; loff_t fl_start; loff_t fl_end; -+ xid_t fl_xid; ++ vxid_t fl_xid; struct fasync_struct * fl_fasync; /* for lease break notifications */ /* for lease breaks: */ -@@ -1567,6 +1584,7 @@ struct inode_operations { +@@ -1542,6 +1559,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 *); @@ -7782,7 +7061,7 @@ diff -NurpP --minimal linux-3.9.4/include/linux/fs.h linux-3.9.4-vs2.3.6.1/inclu int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start, u64 len); int (*update_time)(struct inode *, struct timespec *, int); -@@ -1579,6 +1597,7 @@ ssize_t rw_copy_check_uvector(int type, +@@ -1559,6 +1577,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); @@ -7790,7 +7069,7 @@ diff -NurpP --minimal linux-3.9.4/include/linux/fs.h linux-3.9.4-vs2.3.6.1/inclu 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 *); -@@ -1632,6 +1651,14 @@ struct super_operations { +@@ -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 */ @@ -7805,7 +7084,7 @@ diff -NurpP --minimal linux-3.9.4/include/linux/fs.h linux-3.9.4-vs2.3.6.1/inclu /* * Note that nosuid etc flags are inode-specific: setting some file-system -@@ -1656,10 +1683,13 @@ struct super_operations { +@@ -1636,10 +1663,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) @@ -7819,9 +7098,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/fs.h linux-3.9.4-vs2.3.6.1/inclu #define IS_POSIXACL(inode) __IS_FLG(inode, MS_POSIXACL) #define IS_DEADDIR(inode) ((inode)->i_flags & S_DEAD) -@@ -1670,6 +1700,16 @@ struct super_operations { - #define IS_AUTOMOUNT(inode) ((inode)->i_flags & S_AUTOMOUNT) - #define IS_NOSEC(inode) ((inode)->i_flags & S_NOSEC) +@@ -1653,6 +1683,16 @@ struct super_operations { + #define IS_WHITEOUT(inode) (S_ISCHR(inode->i_mode) && \ + (inode)->i_rdev == WHITEOUT_DEV) +#define IS_BARRIER(inode) (S_ISDIR((inode)->i_mode) && ((inode)->i_vflags & V_BARRIER)) + @@ -7836,8 +7115,8 @@ diff -NurpP --minimal linux-3.9.4/include/linux/fs.h linux-3.9.4-vs2.3.6.1/inclu /* * Inode state bits. Protected by inode->i_lock * -@@ -1898,6 +1938,9 @@ extern int rw_verify_area(int, struct fi - extern int locks_mandatory_locked(struct inode *); +@@ -1902,6 +1942,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); +#define ATTR_FLAG_BARRIER 512 /* Barrier for chroot() */ @@ -7846,20 +7125,20 @@ diff -NurpP --minimal linux-3.9.4/include/linux/fs.h linux-3.9.4-vs2.3.6.1/inclu /* * Candidates for mandatory locking have the setgid bit set * but no group execute bit - an otherwise meaningless combination. -@@ -2509,6 +2552,7 @@ extern int dcache_dir_open(struct inode +@@ -2610,6 +2653,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 *, void *, filldir_t); -+extern int dcache_readdir_filter(struct file *, void *, filldir_t, int (*)(struct dentry *)); + extern int dcache_readdir(struct file *, struct dir_context *); ++extern int dcache_readdir_filter(struct file *, struct dir_context *, int (*)(struct dentry *)); 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.9.4/include/linux/init_task.h linux-3.9.4-vs2.3.6.1/include/linux/init_task.h ---- linux-3.9.4/include/linux/init_task.h 2013-05-31 13:45:27.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/init_task.h 2013-05-31 14:53:41.000000000 +0000 -@@ -222,6 +222,10 @@ extern struct task_group root_task_group - INIT_TASK_RCU_PREEMPT(tsk) \ - INIT_CPUSET_SEQ \ +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) \ INIT_VTIME(tsk) \ + .xid = 0, \ + .vx_info = NULL, \ @@ -7868,34 +7147,23 @@ diff -NurpP --minimal linux-3.9.4/include/linux/init_task.h linux-3.9.4-vs2.3.6. } -diff -NurpP --minimal linux-3.9.4/include/linux/ipc.h linux-3.9.4-vs2.3.6.1/include/linux/ipc.h ---- linux-3.9.4/include/linux/ipc.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/ipc.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -16,6 +16,7 @@ struct kern_ipc_perm key_t key; kuid_t uid; kgid_t gid; -+ xid_t xid; ++ vxid_t xid; kuid_t cuid; kgid_t cgid; umode_t mode; -diff -NurpP --minimal linux-3.9.4/include/linux/loop.h linux-3.9.4-vs2.3.6.1/include/linux/loop.h ---- linux-3.9.4/include/linux/loop.h 2013-02-19 13:58:51.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/loop.h 2013-05-31 14:47:11.000000000 +0000 -@@ -41,6 +41,7 @@ struct loop_device { - struct loop_func_table *lo_encryption; - __u32 lo_init[2]; - kuid_t lo_key_owner; /* Who set the key */ -+ xid_t lo_xid; - int (*ioctl)(struct loop_device *, int cmd, - unsigned long arg); - -diff -NurpP --minimal linux-3.9.4/include/linux/memcontrol.h linux-3.9.4-vs2.3.6.1/include/linux/memcontrol.h ---- linux-3.9.4/include/linux/memcontrol.h 2013-05-31 13:45:28.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/memcontrol.h 2013-05-31 14:47:11.000000000 +0000 -@@ -86,6 +86,13 @@ extern struct mem_cgroup *try_get_mem_cg +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_cont(struct cgroup *cont); + 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); @@ -7907,23 +7175,12 @@ diff -NurpP --minimal linux-3.9.4/include/linux/memcontrol.h linux-3.9.4-vs2.3.6 static inline bool mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *memcg) { -diff -NurpP --minimal linux-3.9.4/include/linux/mm_types.h linux-3.9.4-vs2.3.6.1/include/linux/mm_types.h ---- linux-3.9.4/include/linux/mm_types.h 2013-05-31 13:45:28.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/mm_types.h 2013-05-31 14:47:11.000000000 +0000 -@@ -380,6 +380,7 @@ struct mm_struct { - - /* Architecture-specific MM context */ - mm_context_t context; -+ struct vx_info *mm_vx_info; - - unsigned long flags; /* Must use atomic bitops to access the bits */ - -diff -NurpP --minimal linux-3.9.4/include/linux/mount.h linux-3.9.4-vs2.3.6.1/include/linux/mount.h ---- linux-3.9.4/include/linux/mount.h 2013-05-31 13:45:28.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/mount.h 2013-05-31 14:47:11.000000000 +0000 -@@ -49,6 +49,9 @@ struct mnt_namespace; - - #define MNT_LOCK_READONLY 0x400000 +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 + #define MNT_MARKED 0x4000000 +#define MNT_TAGID 0x10000 +#define MNT_NOTAG 0x20000 @@ -7931,10 +7188,10 @@ diff -NurpP --minimal linux-3.9.4/include/linux/mount.h linux-3.9.4-vs2.3.6.1/in struct vfsmount { struct dentry *mnt_root; /* root of the mounted tree */ struct super_block *mnt_sb; /* pointer to superblock */ -diff -NurpP --minimal linux-3.9.4/include/linux/net.h linux-3.9.4-vs2.3.6.1/include/linux/net.h ---- linux-3.9.4/include/linux/net.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/net.h 2013-05-31 14:47:11.000000000 +0000 -@@ -38,6 +38,7 @@ struct net; +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; #define SOCK_PASSCRED 3 #define SOCK_PASSSEC 4 #define SOCK_EXTERNALLY_ALLOCATED 5 @@ -7942,20 +7199,20 @@ diff -NurpP --minimal linux-3.9.4/include/linux/net.h linux-3.9.4-vs2.3.6.1/incl #ifndef ARCH_HAS_SOCKET_TYPES /** -diff -NurpP --minimal linux-3.9.4/include/linux/netdevice.h linux-3.9.4-vs2.3.6.1/include/linux/netdevice.h ---- linux-3.9.4/include/linux/netdevice.h 2013-05-31 13:45:28.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/netdevice.h 2013-05-31 14:47:11.000000000 +0000 -@@ -1688,6 +1688,7 @@ extern void netdev_resync_ops(struct ne - - extern struct net_device *dev_get_by_index(struct net *net, int ifindex); - extern struct net_device *__dev_get_by_index(struct net *net, int ifindex); -+extern struct net_device *dev_get_by_index_real_rcu(struct net *net, int ifindex); - extern struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex); - extern int dev_restart(struct net_device *dev); - #ifdef CONFIG_NETPOLL_TRAP -diff -NurpP --minimal linux-3.9.4/include/linux/nsproxy.h linux-3.9.4-vs2.3.6.1/include/linux/nsproxy.h ---- linux-3.9.4/include/linux/nsproxy.h 2013-02-19 13:58:51.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/nsproxy.h 2013-05-31 17:17:53.000000000 +0000 +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 + + struct net_device *dev_get_by_index(struct net *net, int ifindex); + struct net_device *__dev_get_by_index(struct net *net, int ifindex); ++struct net_device *dev_get_by_index_real_rcu(struct net *net, int ifindex); + struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex); + int netdev_get_name(struct net *net, char *name, int ifindex); + int dev_restart(struct net_device *dev); +diff -NurpP --minimal linux-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 @@ -3,6 +3,7 @@ #include @@ -7964,8 +7221,8 @@ diff -NurpP --minimal linux-3.9.4/include/linux/nsproxy.h linux-3.9.4-vs2.3.6.1/ struct mnt_namespace; struct uts_namespace; -@@ -63,6 +64,7 @@ static inline struct nsproxy *task_nspro - } +@@ -63,6 +64,7 @@ extern struct nsproxy init_nsproxy; + */ int copy_namespaces(unsigned long flags, struct task_struct *tsk); +struct nsproxy *copy_nsproxy(struct nsproxy *orig); @@ -8005,9 +7262,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/nsproxy.h linux-3.9.4-vs2.3.6.1/ } #endif -diff -NurpP --minimal linux-3.9.4/include/linux/pid.h linux-3.9.4-vs2.3.6.1/include/linux/pid.h ---- linux-3.9.4/include/linux/pid.h 2013-05-31 13:45:28.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/pid.h 2013-05-31 14:47:11.000000000 +0000 +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, @@ -8018,7 +7275,7 @@ diff -NurpP --minimal linux-3.9.4/include/linux/pid.h linux-3.9.4-vs2.3.6.1/incl }; /* -@@ -172,6 +173,7 @@ static inline pid_t pid_nr(struct pid *p +@@ -170,6 +171,7 @@ static inline pid_t pid_nr(struct pid *p } pid_t pid_nr_ns(struct pid *pid, struct pid_namespace *ns); @@ -8026,47 +7283,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/pid.h linux-3.9.4-vs2.3.6.1/incl pid_t pid_vnr(struct pid *pid); #define do_each_pid_task(pid, type, task) \ -diff -NurpP --minimal linux-3.9.4/include/linux/proc_fs.h linux-3.9.4-vs2.3.6.1/include/linux/proc_fs.h ---- linux-3.9.4/include/linux/proc_fs.h 2013-05-31 13:45:28.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/proc_fs.h 2013-05-31 14:47:11.000000000 +0000 -@@ -58,6 +58,7 @@ struct proc_dir_entry { - nlink_t nlink; - kuid_t uid; - kgid_t gid; -+ int vx_flags; - loff_t size; - const struct inode_operations *proc_iops; - /* -@@ -274,12 +275,18 @@ extern const struct proc_ns_operations p - extern const struct proc_ns_operations userns_operations; - extern const struct proc_ns_operations mntns_operations; - -+struct vx_info; -+struct nx_info; -+ - union proc_op { - int (*proc_get_link)(struct dentry *, struct path *); - int (*proc_read)(struct task_struct *task, char *page); - int (*proc_show)(struct seq_file *m, - struct pid_namespace *ns, struct pid *pid, - struct task_struct *task); -+ int (*proc_vs_read)(char *page); -+ int (*proc_vxi_read)(struct vx_info *vxi, char *page); -+ int (*proc_nxi_read)(struct nx_info *nxi, char *page); - }; - - struct ctl_table_header; -@@ -287,6 +294,7 @@ struct ctl_table; - - struct proc_inode { - struct pid *pid; -+ int vx_flags; - int fd; - union proc_op op; - struct proc_dir_entry *pde; -diff -NurpP --minimal linux-3.9.4/include/linux/quotaops.h linux-3.9.4-vs2.3.6.1/include/linux/quotaops.h ---- linux-3.9.4/include/linux/quotaops.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/quotaops.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -8,6 +8,7 @@ #define _LINUX_QUOTAOPS_ @@ -8075,7 +7294,7 @@ diff -NurpP --minimal linux-3.9.4/include/linux/quotaops.h linux-3.9.4-vs2.3.6.1 #define DQUOT_SPACE_WARN 0x1 #define DQUOT_SPACE_RESERVE 0x2 -@@ -205,11 +206,12 @@ static inline void dquot_drop(struct ino +@@ -215,11 +216,12 @@ static inline void dquot_drop(struct ino static inline int dquot_alloc_inode(const struct inode *inode) { @@ -8089,7 +7308,7 @@ diff -NurpP --minimal linux-3.9.4/include/linux/quotaops.h linux-3.9.4-vs2.3.6.1 } static inline int dquot_transfer(struct inode *inode, struct iattr *iattr) -@@ -220,6 +222,10 @@ static inline int dquot_transfer(struct +@@ -230,6 +232,10 @@ static inline int dquot_transfer(struct static inline int __dquot_alloc_space(struct inode *inode, qsize_t number, int flags) { @@ -8100,7 +7319,7 @@ diff -NurpP --minimal linux-3.9.4/include/linux/quotaops.h linux-3.9.4-vs2.3.6.1 if (!(flags & DQUOT_SPACE_RESERVE)) inode_add_bytes(inode, number); return 0; -@@ -230,6 +236,7 @@ static inline void __dquot_free_space(st +@@ -240,6 +246,7 @@ static inline void __dquot_free_space(st { if (!(flags & DQUOT_SPACE_RESERVE)) inode_sub_bytes(inode, number); @@ -8108,10 +7327,10 @@ diff -NurpP --minimal linux-3.9.4/include/linux/quotaops.h linux-3.9.4-vs2.3.6.1 } static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number) -diff -NurpP --minimal linux-3.9.4/include/linux/sched.h linux-3.9.4-vs2.3.6.1/include/linux/sched.h ---- linux-3.9.4/include/linux/sched.h 2013-05-31 14:22:27.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/sched.h 2013-05-31 14:47:11.000000000 +0000 -@@ -1398,6 +1398,14 @@ struct task_struct { +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 { #endif struct seccomp seccomp; @@ -8119,14 +7338,14 @@ diff -NurpP --minimal linux-3.9.4/include/linux/sched.h linux-3.9.4-vs2.3.6.1/in + struct vx_info *vx_info; + struct nx_info *nx_info; + -+ xid_t xid; -+ nid_t nid; -+ tag_t tag; ++ vxid_t xid; ++ vnid_t nid; ++ vtag_t tag; + /* Thread group tracking */ u32 parent_exec_id; u32 self_exec_id; -@@ -1637,6 +1645,11 @@ struct pid_namespace; +@@ -1743,6 +1751,11 @@ struct pid_namespace; pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type, struct pid_namespace *ns); @@ -8138,7 +7357,7 @@ diff -NurpP --minimal linux-3.9.4/include/linux/sched.h linux-3.9.4-vs2.3.6.1/in static inline pid_t task_pid_nr(struct task_struct *tsk) { return tsk->pid; -@@ -1650,7 +1663,8 @@ static inline pid_t task_pid_nr_ns(struc +@@ -1756,7 +1769,8 @@ static inline pid_t task_pid_nr_ns(struc static inline pid_t task_pid_vnr(struct task_struct *tsk) { @@ -8148,7 +7367,7 @@ diff -NurpP --minimal linux-3.9.4/include/linux/sched.h linux-3.9.4-vs2.3.6.1/in } -@@ -1663,7 +1677,7 @@ pid_t task_tgid_nr_ns(struct task_struct +@@ -1769,7 +1783,7 @@ pid_t task_tgid_nr_ns(struct task_struct static inline pid_t task_tgid_vnr(struct task_struct *tsk) { @@ -8157,10 +7376,10 @@ diff -NurpP --minimal linux-3.9.4/include/linux/sched.h linux-3.9.4-vs2.3.6.1/in } -diff -NurpP --minimal linux-3.9.4/include/linux/shmem_fs.h linux-3.9.4-vs2.3.6.1/include/linux/shmem_fs.h ---- linux-3.9.4/include/linux/shmem_fs.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/shmem_fs.h 2013-05-31 14:47:11.000000000 +0000 -@@ -9,6 +9,9 @@ +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 +@@ -10,6 +10,9 @@ /* inode in-kernel data */ @@ -8169,35 +7388,35 @@ diff -NurpP --minimal linux-3.9.4/include/linux/shmem_fs.h linux-3.9.4-vs2.3.6.1 + struct shmem_inode_info { spinlock_t lock; - unsigned long flags; -diff -NurpP --minimal linux-3.9.4/include/linux/stat.h linux-3.9.4-vs2.3.6.1/include/linux/stat.h ---- linux-3.9.4/include/linux/stat.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/stat.h 2013-05-31 14:47:11.000000000 +0000 + 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 @@ -25,6 +25,7 @@ struct kstat { unsigned int nlink; kuid_t uid; kgid_t gid; -+ tag_t tag; ++ ktag_t tag; dev_t rdev; loff_t size; struct timespec atime; -diff -NurpP --minimal linux-3.9.4/include/linux/sunrpc/auth.h linux-3.9.4-vs2.3.6.1/include/linux/sunrpc/auth.h ---- linux-3.9.4/include/linux/sunrpc/auth.h 2013-05-31 13:45:28.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/sunrpc/auth.h 2013-05-31 14:52:57.000000000 +0000 -@@ -26,6 +26,7 @@ +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 { struct auth_cred { kuid_t uid; kgid_t gid; + ktag_t tag; struct group_info *group_info; const char *principal; - unsigned char machine_cred : 1; -diff -NurpP --minimal linux-3.9.4/include/linux/sunrpc/clnt.h linux-3.9.4-vs2.3.6.1/include/linux/sunrpc/clnt.h ---- linux-3.9.4/include/linux/sunrpc/clnt.h 2013-05-31 13:45:28.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/sunrpc/clnt.h 2013-05-31 14:47:11.000000000 +0000 -@@ -49,7 +49,8 @@ struct rpc_clnt { - unsigned int cl_softrtry : 1,/* soft timeouts */ + 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 +@@ -51,7 +51,8 @@ struct rpc_clnt { cl_discrtry : 1,/* disconnect before retry */ + cl_noretranstimeo: 1,/* No retransmit timeouts */ cl_autobind : 1,/* use getport() */ - cl_chatty : 1;/* be verbose */ + cl_chatty : 1,/* be verbose */ @@ -8205,35 +7424,23 @@ diff -NurpP --minimal linux-3.9.4/include/linux/sunrpc/clnt.h linux-3.9.4-vs2.3. struct rpc_rtt * cl_rtt; /* RTO estimator data */ const struct rpc_timeout *cl_timeout; /* Timeout strategy */ -diff -NurpP --minimal linux-3.9.4/include/linux/sysfs.h linux-3.9.4-vs2.3.6.1/include/linux/sysfs.h ---- linux-3.9.4/include/linux/sysfs.h 2013-05-31 13:45:28.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/sysfs.h 2013-05-31 14:47:11.000000000 +0000 -@@ -19,6 +19,8 @@ - #include - #include - -+#define SYSFS_SUPER_MAGIC 0x62656572 -+ - struct kobject; - struct module; - enum kobj_ns_type; -diff -NurpP --minimal linux-3.9.4/include/linux/types.h linux-3.9.4-vs2.3.6.1/include/linux/types.h ---- linux-3.9.4/include/linux/types.h 2013-02-19 13:58:52.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/types.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -32,6 +32,9 @@ typedef __kernel_uid32_t uid_t; typedef __kernel_gid32_t gid_t; typedef __kernel_uid16_t uid16_t; typedef __kernel_gid16_t gid16_t; -+typedef unsigned int xid_t; -+typedef unsigned int nid_t; -+typedef unsigned int tag_t; ++typedef unsigned int vxid_t; ++typedef unsigned int vnid_t; ++typedef unsigned int vtag_t; typedef unsigned long uintptr_t; -diff -NurpP --minimal linux-3.9.4/include/linux/uidgid.h linux-3.9.4-vs2.3.6.1/include/linux/uidgid.h ---- linux-3.9.4/include/linux/uidgid.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/uidgid.h 2013-05-31 14:47:11.000000000 +0000 -@@ -23,13 +23,17 @@ typedef struct { +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 +@@ -21,13 +21,17 @@ typedef struct { uid_t val; } kuid_t; @@ -8243,7 +7450,7 @@ diff -NurpP --minimal linux-3.9.4/include/linux/uidgid.h linux-3.9.4-vs2.3.6.1/i } kgid_t; +typedef struct { -+ tag_t val; ++ vtag_t val; +} ktag_t; + #define KUIDT_INIT(value) (kuid_t){ value } @@ -8252,38 +7459,15 @@ diff -NurpP --minimal linux-3.9.4/include/linux/uidgid.h linux-3.9.4-vs2.3.6.1/i static inline uid_t __kuid_val(kuid_t uid) { -@@ -41,10 +45,16 @@ static inline gid_t __kgid_val(kgid_t gi +@@ -39,11 +43,18 @@ static inline gid_t __kgid_val(kgid_t gi return gid.val; } -+static inline tag_t __ktag_val(ktag_t tag) ++static inline vtag_t __ktag_val(ktag_t tag) +{ + return tag.val; +} + - #else - - typedef uid_t kuid_t; - typedef gid_t kgid_t; -+typedef tag_t ktag_t; - - static inline uid_t __kuid_val(kuid_t uid) - { -@@ -56,16 +66,24 @@ static inline gid_t __kgid_val(kgid_t gi - return gid; - } - -+static inline tag_t __ktag_val(ktag_t tag) -+{ -+ return tag; -+} -+ - #define KUIDT_INIT(value) ((kuid_t) value ) - #define KGIDT_INIT(value) ((kgid_t) value ) -+#define KTAGT_INIT(value) ((ktag_t) value ) - - #endif - #define GLOBAL_ROOT_UID KUIDT_INIT(0) #define GLOBAL_ROOT_GID KGIDT_INIT(0) +#define GLOBAL_ROOT_TAG KTAGT_INIT(0) @@ -8294,7 +7478,7 @@ diff -NurpP --minimal linux-3.9.4/include/linux/uidgid.h linux-3.9.4-vs2.3.6.1/i static inline bool uid_eq(kuid_t left, kuid_t right) { -@@ -77,6 +95,11 @@ static inline bool gid_eq(kgid_t left, k +@@ -55,6 +66,11 @@ static inline bool gid_eq(kgid_t left, k return __kgid_val(left) == __kgid_val(right); } @@ -8306,7 +7490,7 @@ diff -NurpP --minimal linux-3.9.4/include/linux/uidgid.h linux-3.9.4-vs2.3.6.1/i static inline bool uid_gt(kuid_t left, kuid_t right) { return __kuid_val(left) > __kuid_val(right); -@@ -127,13 +150,21 @@ static inline bool gid_valid(kgid_t gid) +@@ -105,13 +121,21 @@ static inline bool gid_valid(kgid_t gid) return !gid_eq(gid, INVALID_GID); } @@ -8319,20 +7503,20 @@ diff -NurpP --minimal linux-3.9.4/include/linux/uidgid.h linux-3.9.4-vs2.3.6.1/i extern kuid_t make_kuid(struct user_namespace *from, uid_t uid); extern kgid_t make_kgid(struct user_namespace *from, gid_t gid); -+extern krag_t make_ktag(struct user_namespace *from, gid_t gid); ++extern ktag_t make_ktag(struct user_namespace *from, gid_t gid); extern uid_t from_kuid(struct user_namespace *to, kuid_t uid); extern gid_t from_kgid(struct user_namespace *to, kgid_t gid); -+extern tag_t from_ktag(struct user_namespace *to, ktag_t tag); ++extern vtag_t from_ktag(struct user_namespace *to, 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); -@@ -159,6 +190,11 @@ static inline kgid_t make_kgid(struct us +@@ -137,6 +161,11 @@ static inline kgid_t make_kgid(struct us return KGIDT_INIT(gid); } -+static inline ktag_t make_ktag(struct user_namespace *from, tag_t tag) ++static inline ktag_t make_ktag(struct user_namespace *from, vtag_t tag) +{ + return KTAGT_INIT(tag); +} @@ -8340,11 +7524,11 @@ diff -NurpP --minimal linux-3.9.4/include/linux/uidgid.h linux-3.9.4-vs2.3.6.1/i static inline uid_t from_kuid(struct user_namespace *to, kuid_t kuid) { return __kuid_val(kuid); -@@ -169,6 +205,11 @@ static inline gid_t from_kgid(struct use +@@ -147,6 +176,11 @@ static inline gid_t from_kgid(struct use return __kgid_val(kgid); } -+static inline tag_t from_ktag(struct user_namespace *to, ktag_t ktag) ++static inline vtag_t from_ktag(struct user_namespace *to, ktag_t ktag) +{ + return __ktag_val(ktag); +} @@ -8352,9 +7536,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/uidgid.h linux-3.9.4-vs2.3.6.1/i 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.9.4/include/linux/vroot.h linux-3.9.4-vs2.3.6.1/include/linux/vroot.h ---- linux-3.9.4/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vroot.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,51 @@ + +/* @@ -8407,9 +7591,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vroot.h linux-3.9.4-vs2.3.6.1/in +#define VROOT_CLR_DEV 0x5601 + +#endif /* _LINUX_VROOT_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vs_base.h linux-3.9.4-vs2.3.6.1/include/linux/vs_base.h ---- linux-3.9.4/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vs_base.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,10 @@ +#ifndef _VS_BASE_H +#define _VS_BASE_H @@ -8421,9 +7605,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vs_base.h linux-3.9.4-vs2.3.6.1/ +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.9.4/include/linux/vs_context.h linux-3.9.4-vs2.3.6.1/include/linux/vs_context.h ---- linux-3.9.4/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vs_context.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,242 @@ +#ifndef _VS_CONTEXT_H +#define _VS_CONTEXT_H @@ -8636,7 +7820,7 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vs_context.h linux-3.9.4-vs2.3.6 +static inline void __enter_vx_admin(struct vx_info_save *vxis) +{ + vxis->vxi = xchg(¤t->vx_info, NULL); -+ vxis->xid = xchg(¤t->xid, (xid_t)0); ++ vxis->xid = xchg(¤t->xid, (vxid_t)0); +} + +static inline void __leave_vx_admin(struct vx_info_save *vxis) @@ -8667,9 +7851,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vs_context.h linux-3.9.4-vs2.3.6 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.9.4/include/linux/vs_cowbl.h linux-3.9.4-vs2.3.6.1/include/linux/vs_cowbl.h ---- linux-3.9.4/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vs_cowbl.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,48 @@ +#ifndef _VS_COWBL_H +#define _VS_COWBL_H @@ -8719,9 +7903,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vs_cowbl.h linux-3.9.4-vs2.3.6.1 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.9.4/include/linux/vs_cvirt.h linux-3.9.4-vs2.3.6.1/include/linux/vs_cvirt.h ---- linux-3.9.4/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vs_cvirt.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,50 @@ +#ifndef _VS_CVIRT_H +#define _VS_CVIRT_H @@ -8773,9 +7957,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vs_cvirt.h linux-3.9.4-vs2.3.6.1 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.9.4/include/linux/vs_device.h linux-3.9.4-vs2.3.6.1/include/linux/vs_device.h ---- linux-3.9.4/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vs_device.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,45 @@ +#ifndef _VS_DEVICE_H +#define _VS_DEVICE_H @@ -8822,9 +8006,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vs_device.h linux-3.9.4-vs2.3.6. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.9.4/include/linux/vs_dlimit.h linux-3.9.4-vs2.3.6.1/include/linux/vs_dlimit.h ---- linux-3.9.4/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vs_dlimit.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,215 @@ +#ifndef _VS_DLIMIT_H +#define _VS_DLIMIT_H @@ -8874,7 +8058,7 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vs_dlimit.h linux-3.9.4-vs2.3.6. +#define __dlimit_char(d) ((d) ? '*' : ' ') + +static inline int __dl_alloc_space(struct super_block *sb, -+ tag_t tag, dlsize_t nr, const char *file, int line) ++ vtag_t tag, dlsize_t nr, const char *file, int line) +{ + struct dl_info *dli = NULL; + int ret = 0; @@ -8900,7 +8084,7 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vs_dlimit.h linux-3.9.4-vs2.3.6. +} + +static inline void __dl_free_space(struct super_block *sb, -+ tag_t tag, dlsize_t nr, const char *_file, int _line) ++ vtag_t tag, dlsize_t nr, const char *_file, int _line) +{ + struct dl_info *dli = NULL; + @@ -8925,7 +8109,7 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vs_dlimit.h linux-3.9.4-vs2.3.6. +} + +static inline int __dl_alloc_inode(struct super_block *sb, -+ tag_t tag, const char *_file, int _line) ++ vtag_t tag, const char *_file, int _line) +{ + struct dl_info *dli; + int ret = 0; @@ -8947,7 +8131,7 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vs_dlimit.h linux-3.9.4-vs2.3.6. +} + +static inline void __dl_free_inode(struct super_block *sb, -+ tag_t tag, const char *_file, int _line) ++ vtag_t tag, const char *_file, int _line) +{ + struct dl_info *dli; + @@ -8968,7 +8152,7 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vs_dlimit.h linux-3.9.4-vs2.3.6. + sb, tag, __dlimit_char(dli), _file, _line); +} + -+static inline void __dl_adjust_block(struct super_block *sb, tag_t tag, ++static inline void __dl_adjust_block(struct super_block *sb, vtag_t tag, + unsigned long long *free_blocks, unsigned long long *root_blocks, + const char *_file, int _line) +{ @@ -9041,9 +8225,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vs_dlimit.h linux-3.9.4-vs2.3.6. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.9.4/include/linux/vs_inet.h linux-3.9.4-vs2.3.6.1/include/linux/vs_inet.h ---- linux-3.9.4/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vs_inet.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,364 @@ +#ifndef _VS_INET_H +#define _VS_INET_H @@ -9225,7 +8409,7 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vs_inet.h linux-3.9.4-vs2.3.6.1/ +int __v4_addr_match_socket(const struct sock *sk, struct nx_addr_v4 *nxa) +{ + struct nx_info *nxi = sk->sk_nx_info; -+ __be32 saddr = sk_rcv_saddr(sk); ++ __be32 saddr = sk->sk_rcv_saddr; + + vxdprintk(VXD_CBIT(net, 5), + "__v4_addr_in_socket(%p," NXAV4_FMT ") %p:" NIPQUAD_FMT " %p;%lx", @@ -9409,9 +8593,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vs_inet.h linux-3.9.4-vs2.3.6.1/ +#else +// #warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.9.4/include/linux/vs_inet6.h linux-3.9.4-vs2.3.6.1/include/linux/vs_inet6.h ---- linux-3.9.4/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vs_inet6.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,257 @@ +#ifndef _VS_INET6_H +#define _VS_INET6_H @@ -9514,7 +8698,7 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vs_inet6.h linux-3.9.4-vs2.3.6.1 + struct in6_addr *addr) +{ + struct sock *sk = &inet->sk; -+ struct in6_addr *saddr = inet6_rcv_saddr(sk); ++ const struct in6_addr *saddr = inet6_rcv_saddr(sk); + + if (!ipv6_addr_any(addr) && + ipv6_addr_equal(saddr, addr)) @@ -9535,7 +8719,7 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vs_inet6.h linux-3.9.4-vs2.3.6.1 +int __v6_addr_match_socket(const struct sock *sk, struct nx_addr_v6 *nxa) +{ + struct nx_info *nxi = sk->sk_nx_info; -+ struct in6_addr *saddr = inet6_rcv_saddr(sk); ++ const struct in6_addr *saddr = inet6_rcv_saddr(sk); + + vxdprintk(VXD_CBIT(net, 5), + "__v6_addr_in_socket(%p," NXAV6_FMT ") %p:%pI6 %p;%lx", @@ -9670,9 +8854,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vs_inet6.h linux-3.9.4-vs2.3.6.1 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.9.4/include/linux/vs_limit.h linux-3.9.4-vs2.3.6.1/include/linux/vs_limit.h ---- linux-3.9.4/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vs_limit.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,140 @@ +#ifndef _VS_LIMIT_H +#define _VS_LIMIT_H @@ -9750,12 +8934,12 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vs_limit.h linux-3.9.4-vs2.3.6.1 +/* dentry limits */ + +#define vx_dentry_inc(d) do { \ -+ if ((d)->d_count == 1) \ ++ if (d_count(d) == 1) \ + vx_acc_cres(current_vx_info(), 1, d, VLIMIT_DENTRY); \ + } while (0) + +#define vx_dentry_dec(d) do { \ -+ if ((d)->d_count == 0) \ ++ if (d_count(d) == 0) \ + vx_acc_cres(current_vx_info(),-1, d, VLIMIT_DENTRY); \ + } while (0) + @@ -9814,9 +8998,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vs_limit.h linux-3.9.4-vs2.3.6.1 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.9.4/include/linux/vs_network.h linux-3.9.4-vs2.3.6.1/include/linux/vs_network.h ---- linux-3.9.4/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vs_network.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,169 @@ +#ifndef _NX_VS_NETWORK_H +#define _NX_VS_NETWORK_H @@ -9987,9 +9171,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vs_network.h linux-3.9.4-vs2.3.6 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.9.4/include/linux/vs_pid.h linux-3.9.4-vs2.3.6.1/include/linux/vs_pid.h ---- linux-3.9.4/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vs_pid.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,50 @@ +#ifndef _VS_PID_H +#define _VS_PID_H @@ -10041,9 +9225,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vs_pid.h linux-3.9.4-vs2.3.6.1/i +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.9.4/include/linux/vs_sched.h linux-3.9.4-vs2.3.6.1/include/linux/vs_sched.h ---- linux-3.9.4/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vs_sched.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,40 @@ +#ifndef _VS_SCHED_H +#define _VS_SCHED_H @@ -10085,9 +9269,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vs_sched.h linux-3.9.4-vs2.3.6.1 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.9.4/include/linux/vs_socket.h linux-3.9.4-vs2.3.6.1/include/linux/vs_socket.h ---- linux-3.9.4/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vs_socket.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,67 @@ +#ifndef _VS_SOCKET_H +#define _VS_SOCKET_H @@ -10156,9 +9340,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vs_socket.h linux-3.9.4-vs2.3.6. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.9.4/include/linux/vs_tag.h linux-3.9.4-vs2.3.6.1/include/linux/vs_tag.h ---- linux-3.9.4/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vs_tag.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,47 @@ +#ifndef _VS_TAG_H +#define _VS_TAG_H @@ -10189,7 +9373,7 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vs_tag.h linux-3.9.4-vs2.3.6.1/i + * check current context for ADMIN/WATCH and + * optionally against supplied argument + */ -+static inline int __dx_check(tag_t cid, tag_t id, unsigned int mode) ++static inline int __dx_check(vtag_t cid, vtag_t id, unsigned int mode) +{ + if (mode & DX_ARG_MASK) { + if ((mode & DX_IDENT) && (id == cid)) @@ -10207,9 +9391,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vs_tag.h linux-3.9.4-vs2.3.6.1/i +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.9.4/include/linux/vs_time.h linux-3.9.4-vs2.3.6.1/include/linux/vs_time.h ---- linux-3.9.4/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vs_time.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,19 @@ +#ifndef _VS_TIME_H +#define _VS_TIME_H @@ -10230,10 +9414,10 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vs_time.h linux-3.9.4-vs2.3.6.1/ +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/base.h linux-3.9.4-vs2.3.6.1/include/linux/vserver/base.h ---- linux-3.9.4/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vserver/base.h 2013-05-31 17:55:09.000000000 +0000 -@@ -0,0 +1,181 @@ +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 +@@ -0,0 +1,184 @@ +#ifndef _VSERVER_BASE_H +#define _VSERVER_BASE_H + @@ -10379,6 +9563,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/base.h linux-3.9.4-vs2.3 +#define nx_capable(b, c) (capable(b) || \ + (cap_raised(current_cap(), b) && nx_ncaps(c))) + ++#define nx_ns_capable(n, b, c) (ns_capable(n, b) || \ ++ (cap_raised(current_cap(), b) && nx_ncaps(c))) ++ +#define vx_task_initpid(t, n) \ + ((t)->vx_info && \ + ((t)->vx_info->vx_initpid == (n))) @@ -10415,9 +9602,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/base.h linux-3.9.4-vs2.3 +#define nx_info_state(n, m) (__nx_state(n) & (m)) + +#endif -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/cacct.h linux-3.9.4-vs2.3.6.1/include/linux/vserver/cacct.h ---- linux-3.9.4/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vserver/cacct.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,15 @@ +#ifndef _VSERVER_CACCT_H +#define _VSERVER_CACCT_H @@ -10434,9 +9621,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/cacct.h linux-3.9.4-vs2. +}; + +#endif /* _VSERVER_CACCT_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/cacct_cmd.h linux-3.9.4-vs2.3.6.1/include/linux/vserver/cacct_cmd.h ---- linux-3.9.4/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vserver/cacct_cmd.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,10 @@ +#ifndef _VSERVER_CACCT_CMD_H +#define _VSERVER_CACCT_CMD_H @@ -10448,9 +9635,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/cacct_cmd.h linux-3.9.4- +extern int vc_sock_stat(struct vx_info *, void __user *); + +#endif /* _VSERVER_CACCT_CMD_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/cacct_def.h linux-3.9.4-vs2.3.6.1/include/linux/vserver/cacct_def.h ---- linux-3.9.4/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vserver/cacct_def.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,43 @@ +#ifndef _VSERVER_CACCT_DEF_H +#define _VSERVER_CACCT_DEF_H @@ -10495,9 +9682,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/cacct_def.h linux-3.9.4- +#endif + +#endif /* _VSERVER_CACCT_DEF_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/cacct_int.h linux-3.9.4-vs2.3.6.1/include/linux/vserver/cacct_int.h ---- linux-3.9.4/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vserver/cacct_int.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,17 @@ +#ifndef _VSERVER_CACCT_INT_H +#define _VSERVER_CACCT_INT_H @@ -10516,9 +9703,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/cacct_int.h linux-3.9.4- +} + +#endif /* _VSERVER_CACCT_INT_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/check.h linux-3.9.4-vs2.3.6.1/include/linux/vserver/check.h ---- linux-3.9.4/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vserver/check.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,89 @@ +#ifndef _VSERVER_CHECK_H +#define _VSERVER_CHECK_H @@ -10609,9 +9796,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/check.h linux-3.9.4-vs2. +#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1) + +#endif -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/context.h linux-3.9.4-vs2.3.6.1/include/linux/vserver/context.h ---- linux-3.9.4/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vserver/context.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,110 @@ +#ifndef _VSERVER_CONTEXT_H +#define _VSERVER_CONTEXT_H @@ -10644,7 +9831,7 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/context.h linux-3.9.4-vs + +struct vx_info { + struct hlist_node vx_hlist; /* linked list of contexts */ -+ xid_t vx_id; /* context id */ ++ vxid_t vx_id; /* context id */ + atomic_t vx_usecnt; /* usage count */ + atomic_t vx_tasks; /* tasks count */ + struct vx_info *vx_parent; /* parent context */ @@ -10695,7 +9882,7 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/context.h linux-3.9.4-vs + +struct vx_info_save { + struct vx_info *vxi; -+ xid_t xid; ++ vxid_t xid; +}; + + @@ -10715,7 +9902,7 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/context.h linux-3.9.4-vs +extern struct vx_info *lookup_or_create_vx_info(int); + +extern int get_xid_list(int, unsigned int *, int); -+extern int xid_is_hashed(xid_t); ++extern int xid_is_hashed(vxid_t); + +extern int vx_migrate_task(struct task_struct *, struct vx_info *, int); + @@ -10723,9 +9910,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/context.h linux-3.9.4-vs + + +#endif /* _VSERVER_CONTEXT_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/context_cmd.h linux-3.9.4-vs2.3.6.1/include/linux/vserver/context_cmd.h ---- linux-3.9.4/include/linux/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vserver/context_cmd.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,33 @@ +#ifndef _VSERVER_CONTEXT_CMD_H +#define _VSERVER_CONTEXT_CMD_H @@ -10760,9 +9947,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/context_cmd.h linux-3.9. +extern int vc_set_badness(struct vx_info *, void __user *); + +#endif /* _VSERVER_CONTEXT_CMD_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/cvirt.h linux-3.9.4-vs2.3.6.1/include/linux/vserver/cvirt.h ---- linux-3.9.4/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vserver/cvirt.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,18 @@ +#ifndef _VSERVER_CVIRT_H +#define _VSERVER_CVIRT_H @@ -10782,9 +9969,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/cvirt.h linux-3.9.4-vs2. +int vx_do_syslog(int, char __user *, int); + +#endif /* _VSERVER_CVIRT_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/cvirt_cmd.h linux-3.9.4-vs2.3.6.1/include/linux/vserver/cvirt_cmd.h ---- linux-3.9.4/include/linux/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vserver/cvirt_cmd.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,13 @@ +#ifndef _VSERVER_CVIRT_CMD_H +#define _VSERVER_CVIRT_CMD_H @@ -10799,9 +9986,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/cvirt_cmd.h linux-3.9.4- +extern int vc_virt_stat(struct vx_info *, void __user *); + +#endif /* _VSERVER_CVIRT_CMD_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/cvirt_def.h linux-3.9.4-vs2.3.6.1/include/linux/vserver/cvirt_def.h ---- linux-3.9.4/include/linux/vserver/cvirt_def.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vserver/cvirt_def.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,80 @@ +#ifndef _VSERVER_CVIRT_DEF_H +#define _VSERVER_CVIRT_DEF_H @@ -10883,10 +10070,10 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/cvirt_def.h linux-3.9.4- +#endif + +#endif /* _VSERVER_CVIRT_DEF_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/debug.h linux-3.9.4-vs2.3.6.1/include/linux/vserver/debug.h ---- linux-3.9.4/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vserver/debug.h 2013-05-31 14:47:11.000000000 +0000 -@@ -0,0 +1,145 @@ +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 +@@ -0,0 +1,146 @@ +#ifndef _VSERVER_DEBUG_H +#define _VSERVER_DEBUG_H + @@ -11013,7 +10200,8 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/debug.h linux-3.9.4-vs2. +#define vxwprintk_task(c, f, x...) \ + vxwprintk(c, VX_WARN_TASK f, \ + current->comm, current->pid, \ -+ current->xid, current->nid, current->tag, ##x) ++ current->xid, current->nid, \ ++ current->tag, ##x) +#define vxwprintk_xid(c, f, x...) \ + vxwprintk(c, VX_WARN_XID f, current->xid, x) +#define vxwprintk_nid(c, f, x...) \ @@ -11032,9 +10220,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/debug.h linux-3.9.4-vs2. + + +#endif /* _VSERVER_DEBUG_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/debug_cmd.h linux-3.9.4-vs2.3.6.1/include/linux/vserver/debug_cmd.h ---- linux-3.9.4/include/linux/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vserver/debug_cmd.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,37 @@ +#ifndef _VSERVER_DEBUG_CMD_H +#define _VSERVER_DEBUG_CMD_H @@ -11073,9 +10261,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/debug_cmd.h linux-3.9.4- +#endif /* CONFIG_COMPAT */ + +#endif /* _VSERVER_DEBUG_CMD_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/device.h linux-3.9.4-vs2.3.6.1/include/linux/vserver/device.h ---- linux-3.9.4/include/linux/vserver/device.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vserver/device.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,9 @@ +#ifndef _VSERVER_DEVICE_H +#define _VSERVER_DEVICE_H @@ -11086,9 +10274,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/device.h linux-3.9.4-vs2 +#else /* _VSERVER_DEVICE_H */ +#warning duplicate inclusion +#endif /* _VSERVER_DEVICE_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/device_cmd.h linux-3.9.4-vs2.3.6.1/include/linux/vserver/device_cmd.h ---- linux-3.9.4/include/linux/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vserver/device_cmd.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,31 @@ +#ifndef _VSERVER_DEVICE_CMD_H +#define _VSERVER_DEVICE_CMD_H @@ -11121,9 +10309,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/device_cmd.h linux-3.9.4 +#endif /* CONFIG_COMPAT */ + +#endif /* _VSERVER_DEVICE_CMD_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/device_def.h linux-3.9.4-vs2.3.6.1/include/linux/vserver/device_def.h ---- linux-3.9.4/include/linux/vserver/device_def.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vserver/device_def.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,17 @@ +#ifndef _VSERVER_DEVICE_DEF_H +#define _VSERVER_DEVICE_DEF_H @@ -11142,9 +10330,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/device_def.h linux-3.9.4 +}; + +#endif /* _VSERVER_DEVICE_DEF_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/dlimit.h linux-3.9.4-vs2.3.6.1/include/linux/vserver/dlimit.h ---- linux-3.9.4/include/linux/vserver/dlimit.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vserver/dlimit.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,54 @@ +#ifndef _VSERVER_DLIMIT_H +#define _VSERVER_DLIMIT_H @@ -11166,7 +10354,7 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/dlimit.h linux-3.9.4-vs2 +struct dl_info { + struct hlist_node dl_hlist; /* linked list of contexts */ + struct rcu_head dl_rcu; /* the rcu head */ -+ tag_t dl_tag; /* context tag */ ++ vtag_t dl_tag; /* context tag */ + atomic_t dl_usecnt; /* usage count */ + atomic_t dl_refcnt; /* reference count */ + @@ -11187,7 +10375,7 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/dlimit.h linux-3.9.4-vs2 +extern void rcu_free_dl_info(struct rcu_head *); +extern void unhash_dl_info(struct dl_info *); + -+extern struct dl_info *locate_dl_info(struct super_block *, tag_t); ++extern struct dl_info *locate_dl_info(struct super_block *, vtag_t); + + +struct kstatfs; @@ -11200,9 +10388,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/dlimit.h linux-3.9.4-vs2 +#else /* _VSERVER_DLIMIT_H */ +#warning duplicate inclusion +#endif /* _VSERVER_DLIMIT_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/dlimit_cmd.h linux-3.9.4-vs2.3.6.1/include/linux/vserver/dlimit_cmd.h ---- linux-3.9.4/include/linux/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vserver/dlimit_cmd.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,46 @@ +#ifndef _VSERVER_DLIMIT_CMD_H +#define _VSERVER_DLIMIT_CMD_H @@ -11250,9 +10438,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/dlimit_cmd.h linux-3.9.4 +#endif /* CONFIG_COMPAT */ + +#endif /* _VSERVER_DLIMIT_CMD_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/global.h linux-3.9.4-vs2.3.6.1/include/linux/vserver/global.h ---- linux-3.9.4/include/linux/vserver/global.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vserver/global.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,19 @@ +#ifndef _VSERVER_GLOBAL_H +#define _VSERVER_GLOBAL_H @@ -11273,9 +10461,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/global.h linux-3.9.4-vs2 + + +#endif /* _VSERVER_GLOBAL_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/history.h linux-3.9.4-vs2.3.6.1/include/linux/vserver/history.h ---- linux-3.9.4/include/linux/vserver/history.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vserver/history.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,197 @@ +#ifndef _VSERVER_HISTORY_H +#define _VSERVER_HISTORY_H @@ -11474,9 +10662,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/history.h linux-3.9.4-vs +#endif /* CONFIG_VSERVER_HISTORY */ + +#endif /* _VSERVER_HISTORY_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/inode.h linux-3.9.4-vs2.3.6.1/include/linux/vserver/inode.h ---- linux-3.9.4/include/linux/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vserver/inode.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,19 @@ +#ifndef _VSERVER_INODE_H +#define _VSERVER_INODE_H @@ -11497,9 +10685,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/inode.h linux-3.9.4-vs2. +#else /* _VSERVER_INODE_H */ +#warning duplicate inclusion +#endif /* _VSERVER_INODE_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/inode_cmd.h linux-3.9.4-vs2.3.6.1/include/linux/vserver/inode_cmd.h ---- linux-3.9.4/include/linux/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vserver/inode_cmd.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,36 @@ +#ifndef _VSERVER_INODE_CMD_H +#define _VSERVER_INODE_CMD_H @@ -11537,9 +10725,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/inode_cmd.h linux-3.9.4- +#endif /* CONFIG_COMPAT */ + +#endif /* _VSERVER_INODE_CMD_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/limit.h linux-3.9.4-vs2.3.6.1/include/linux/vserver/limit.h ---- linux-3.9.4/include/linux/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vserver/limit.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ +#ifndef _VSERVER_LIMIT_H +#define _VSERVER_LIMIT_H @@ -11602,9 +10790,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/limit.h linux-3.9.4-vs2. +#define NUM_LIMITS 24 + +#endif /* _VSERVER_LIMIT_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/limit_cmd.h linux-3.9.4-vs2.3.6.1/include/linux/vserver/limit_cmd.h ---- linux-3.9.4/include/linux/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vserver/limit_cmd.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,35 @@ +#ifndef _VSERVER_LIMIT_CMD_H +#define _VSERVER_LIMIT_CMD_H @@ -11641,9 +10829,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/limit_cmd.h linux-3.9.4- +#endif /* CONFIG_IA32_EMULATION */ + +#endif /* _VSERVER_LIMIT_CMD_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/limit_def.h linux-3.9.4-vs2.3.6.1/include/linux/vserver/limit_def.h ---- linux-3.9.4/include/linux/vserver/limit_def.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vserver/limit_def.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,47 @@ +#ifndef _VSERVER_LIMIT_DEF_H +#define _VSERVER_LIMIT_DEF_H @@ -11692,9 +10880,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/limit_def.h linux-3.9.4- +#endif + +#endif /* _VSERVER_LIMIT_DEF_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/limit_int.h linux-3.9.4-vs2.3.6.1/include/linux/vserver/limit_int.h ---- linux-3.9.4/include/linux/vserver/limit_int.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vserver/limit_int.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,193 @@ +#ifndef _VSERVER_LIMIT_INT_H +#define _VSERVER_LIMIT_INT_H @@ -11889,9 +11077,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/limit_int.h linux-3.9.4- + + +#endif /* _VSERVER_LIMIT_INT_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/monitor.h linux-3.9.4-vs2.3.6.1/include/linux/vserver/monitor.h ---- linux-3.9.4/include/linux/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vserver/monitor.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,6 @@ +#ifndef _VSERVER_MONITOR_H +#define _VSERVER_MONITOR_H @@ -11899,9 +11087,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/monitor.h linux-3.9.4-vs +#include + +#endif /* _VSERVER_MONITOR_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/network.h linux-3.9.4-vs2.3.6.1/include/linux/vserver/network.h ---- linux-3.9.4/include/linux/vserver/network.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vserver/network.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,76 @@ +#ifndef _VSERVER_NETWORK_H +#define _VSERVER_NETWORK_H @@ -11934,7 +11122,7 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/network.h linux-3.9.4-vs + +struct nx_info { + struct hlist_node nx_hlist; /* linked list of nxinfos */ -+ nid_t nx_id; /* vnet id */ ++ vnid_t nx_id; /* vnet id */ + atomic_t nx_usecnt; /* usage count */ + atomic_t nx_tasks; /* tasks count */ + int nx_state; /* context state */ @@ -11962,7 +11150,7 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/network.h linux-3.9.4-vs +extern struct nx_info *lookup_nx_info(int); + +extern int get_nid_list(int, unsigned int *, int); -+extern int nid_is_hashed(nid_t); ++extern int nid_is_hashed(vnid_t); + +extern int nx_migrate_task(struct task_struct *, struct nx_info *); + @@ -11979,9 +11167,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/network.h linux-3.9.4-vs +#endif + +#endif /* _VSERVER_NETWORK_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/network_cmd.h linux-3.9.4-vs2.3.6.1/include/linux/vserver/network_cmd.h ---- linux-3.9.4/include/linux/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vserver/network_cmd.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,37 @@ +#ifndef _VSERVER_NETWORK_CMD_H +#define _VSERVER_NETWORK_CMD_H @@ -12020,9 +11208,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/network_cmd.h linux-3.9. +extern int vc_set_ncaps(struct nx_info *, void __user *); + +#endif /* _VSERVER_CONTEXT_CMD_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/percpu.h linux-3.9.4-vs2.3.6.1/include/linux/vserver/percpu.h ---- linux-3.9.4/include/linux/vserver/percpu.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vserver/percpu.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,14 @@ +#ifndef _VSERVER_PERCPU_H +#define _VSERVER_PERCPU_H @@ -12038,9 +11226,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/percpu.h linux-3.9.4-vs2 +#define PERCPU_PERCTX (sizeof(struct _vx_percpu)) + +#endif /* _VSERVER_PERCPU_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/pid.h linux-3.9.4-vs2.3.6.1/include/linux/vserver/pid.h ---- linux-3.9.4/include/linux/vserver/pid.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vserver/pid.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,51 @@ +#ifndef _VSERVER_PID_H +#define _VSERVER_PID_H @@ -12093,9 +11281,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/pid.h linux-3.9.4-vs2.3. +} + +#endif -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/sched.h linux-3.9.4-vs2.3.6.1/include/linux/vserver/sched.h ---- linux-3.9.4/include/linux/vserver/sched.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vserver/sched.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,23 @@ +#ifndef _VSERVER_SCHED_H +#define _VSERVER_SCHED_H @@ -12120,9 +11308,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/sched.h linux-3.9.4-vs2. +#else /* _VSERVER_SCHED_H */ +#warning duplicate inclusion +#endif /* _VSERVER_SCHED_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/sched_cmd.h linux-3.9.4-vs2.3.6.1/include/linux/vserver/sched_cmd.h ---- linux-3.9.4/include/linux/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vserver/sched_cmd.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,11 @@ +#ifndef _VSERVER_SCHED_CMD_H +#define _VSERVER_SCHED_CMD_H @@ -12135,9 +11323,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/sched_cmd.h linux-3.9.4- +extern int vc_get_prio_bias(struct vx_info *, void __user *); + +#endif /* _VSERVER_SCHED_CMD_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/sched_def.h linux-3.9.4-vs2.3.6.1/include/linux/vserver/sched_def.h ---- linux-3.9.4/include/linux/vserver/sched_def.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vserver/sched_def.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,38 @@ +#ifndef _VSERVER_SCHED_DEF_H +#define _VSERVER_SCHED_DEF_H @@ -12177,9 +11365,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/sched_def.h linux-3.9.4- +#endif + +#endif /* _VSERVER_SCHED_DEF_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/signal.h linux-3.9.4-vs2.3.6.1/include/linux/vserver/signal.h ---- linux-3.9.4/include/linux/vserver/signal.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vserver/signal.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,14 @@ +#ifndef _VSERVER_SIGNAL_H +#define _VSERVER_SIGNAL_H @@ -12195,9 +11383,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/signal.h linux-3.9.4-vs2 +#else /* _VSERVER_SIGNAL_H */ +#warning duplicate inclusion +#endif /* _VSERVER_SIGNAL_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/signal_cmd.h linux-3.9.4-vs2.3.6.1/include/linux/vserver/signal_cmd.h ---- linux-3.9.4/include/linux/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vserver/signal_cmd.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,14 @@ +#ifndef _VSERVER_SIGNAL_CMD_H +#define _VSERVER_SIGNAL_CMD_H @@ -12213,9 +11401,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/signal_cmd.h linux-3.9.4 +extern int vc_set_pflags(uint32_t pid, void __user *); + +#endif /* _VSERVER_SIGNAL_CMD_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/space.h linux-3.9.4-vs2.3.6.1/include/linux/vserver/space.h ---- linux-3.9.4/include/linux/vserver/space.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vserver/space.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,12 @@ +#ifndef _VSERVER_SPACE_H +#define _VSERVER_SPACE_H @@ -12229,9 +11417,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/space.h linux-3.9.4-vs2. +#else /* _VSERVER_SPACE_H */ +#warning duplicate inclusion +#endif /* _VSERVER_SPACE_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/space_cmd.h linux-3.9.4-vs2.3.6.1/include/linux/vserver/space_cmd.h ---- linux-3.9.4/include/linux/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vserver/space_cmd.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,13 @@ +#ifndef _VSERVER_SPACE_CMD_H +#define _VSERVER_SPACE_CMD_H @@ -12246,9 +11434,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/space_cmd.h linux-3.9.4- +extern int vc_get_space_mask(void __user *, int); + +#endif /* _VSERVER_SPACE_CMD_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/switch.h linux-3.9.4-vs2.3.6.1/include/linux/vserver/switch.h ---- linux-3.9.4/include/linux/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vserver/switch.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,8 @@ +#ifndef _VSERVER_SWITCH_H +#define _VSERVER_SWITCH_H @@ -12258,14 +11446,15 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/switch.h linux-3.9.4-vs2 +#include + +#endif /* _VSERVER_SWITCH_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/tag.h linux-3.9.4-vs2.3.6.1/include/linux/vserver/tag.h ---- linux-3.9.4/include/linux/vserver/tag.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vserver/tag.h 2013-05-31 14:47:11.000000000 +0000 -@@ -0,0 +1,143 @@ +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 +@@ -0,0 +1,160 @@ +#ifndef _DX_TAG_H +#define _DX_TAG_H + +#include ++#include + + +#define DX_TAG(in) (IS_TAGGED(in)) @@ -12364,11 +11553,27 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/tag.h linux-3.9.4-vs2.3. +#define TAGINO_TAG(cond, tag) ((cond) ? (tag) : 0) +#endif + ++#define TAGINO_KUID(cond, kuid, ktag) \ ++ KUIDT_INIT(TAGINO_UID(cond, __kuid_val(kuid), __ktag_val(ktag))) ++#define TAGINO_KGID(cond, kgid, ktag) \ ++ KGIDT_INIT(TAGINO_GID(cond, __kgid_val(kgid), __ktag_val(ktag))) ++#define TAGINO_KTAG(cond, ktag) \ ++ KTAGT_INIT(TAGINO_TAG(cond, __ktag_val(ktag))) ++ ++ +#define INOTAG_UID(cond, uid, gid) \ + ((cond) ? ((uid) & MAX_UID) : (uid)) +#define INOTAG_GID(cond, uid, gid) \ + ((cond) ? ((gid) & MAX_GID) : (gid)) + ++#define INOTAG_KUID(cond, kuid, kgid) \ ++ KUIDT_INIT(INOTAG_UID(cond, __kuid_val(kuid), __kgid_val(kgid))) ++#define INOTAG_KGID(cond, kuid, kgid) \ ++ KGIDT_INIT(INOTAG_GID(cond, __kuid_val(kuid), __kgid_val(kgid))) ++#define INOTAG_KTAG(cond, kuid, kgid, ktag) \ ++ KTAGT_INIT(INOTAG_TAG(cond, \ ++ __kuid_val(kuid), __kgid_val(kgid), __ktag_val(ktag))) ++ + +static inline uid_t dx_map_uid(uid_t uid) +{ @@ -12391,7 +11596,7 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/tag.h linux-3.9.4-vs2.3. + +#define dx_notagcheck(sb) ((sb) && ((sb)->s_flags & MS_NOTAGCHECK)) + -+int dx_parse_tag(char *string, tag_t *tag, int remove, int *mnt_flags, ++int dx_parse_tag(char *string, vtag_t *tag, int remove, int *mnt_flags, + unsigned long *flags); + +#ifdef CONFIG_PROPAGATE @@ -12405,9 +11610,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/tag.h linux-3.9.4-vs2.3. +#endif + +#endif /* _DX_TAG_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/tag_cmd.h linux-3.9.4-vs2.3.6.1/include/linux/vserver/tag_cmd.h ---- linux-3.9.4/include/linux/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/linux/vserver/tag_cmd.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,10 @@ +#ifndef _VSERVER_TAG_CMD_H +#define _VSERVER_TAG_CMD_H @@ -12419,22 +11624,21 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/tag_cmd.h linux-3.9.4-vs +extern int vc_tag_migrate(uint32_t); + +#endif /* _VSERVER_TAG_CMD_H */ -diff -NurpP --minimal linux-3.9.4/include/net/addrconf.h linux-3.9.4-vs2.3.6.1/include/net/addrconf.h ---- linux-3.9.4/include/net/addrconf.h 2013-05-31 13:45:28.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/net/addrconf.h 2013-05-31 17:17:53.000000000 +0000 -@@ -85,7 +85,8 @@ extern int ipv6_dev_get_saddr(struct n - const struct net_device *dev, - const struct in6_addr *daddr, - unsigned int srcprefs, -- struct in6_addr *saddr); -+ struct in6_addr *saddr, -+ struct nx_info *nxi); - extern int ipv6_get_lladdr(struct net_device *dev, - struct in6_addr *addr, - unsigned char banned_flags); -diff -NurpP --minimal linux-3.9.4/include/net/af_unix.h linux-3.9.4-vs2.3.6.1/include/net/af_unix.h ---- linux-3.9.4/include/net/af_unix.h 2013-02-19 13:58:52.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/net/af_unix.h 2013-05-31 17:17:53.000000000 +0000 +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 + + int ipv6_dev_get_saddr(struct net *net, const struct net_device *dev, + const struct in6_addr *daddr, unsigned int srcprefs, +- struct in6_addr *saddr); ++ struct in6_addr *saddr, struct nx_info *nxi); + 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 @@ -4,6 +4,7 @@ #include #include @@ -12442,14 +11646,14 @@ diff -NurpP --minimal linux-3.9.4/include/net/af_unix.h linux-3.9.4-vs2.3.6.1/in +#include #include - extern void unix_inflight(struct file *fp); -diff -NurpP --minimal linux-3.9.4/include/net/inet_timewait_sock.h linux-3.9.4-vs2.3.6.1/include/net/inet_timewait_sock.h ---- linux-3.9.4/include/net/inet_timewait_sock.h 2013-05-31 13:45:28.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/net/inet_timewait_sock.h 2013-05-31 17:18:34.000000000 +0000 -@@ -116,6 +116,10 @@ struct inet_timewait_sock { + 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 #define tw_num __tw_common.skc_num - #define tw_portpair __tw_common.skc_portpair +#define tw_xid __tw_common.skc_xid +#define tw_vx_info __tw_common.skc_vx_info +#define tw_nid __tw_common.skc_nid @@ -12457,23 +11661,22 @@ diff -NurpP --minimal linux-3.9.4/include/net/inet_timewait_sock.h linux-3.9.4-v int tw_timeout; volatile unsigned char tw_substate; -diff -NurpP --minimal linux-3.9.4/include/net/ip6_route.h linux-3.9.4-vs2.3.6.1/include/net/ip6_route.h ---- linux-3.9.4/include/net/ip6_route.h 2013-05-31 13:45:28.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/net/ip6_route.h 2013-05-31 17:17:53.000000000 +0000 -@@ -95,7 +95,8 @@ extern int ip6_route_get_saddr(struct - struct rt6_info *rt, - const struct in6_addr *daddr, - unsigned int prefs, -- struct in6_addr *saddr); -+ struct in6_addr *saddr, -+ struct nx_info *nxi); - - extern struct rt6_info *rt6_lookup(struct net *net, - const struct in6_addr *daddr, -diff -NurpP --minimal linux-3.9.4/include/net/route.h linux-3.9.4-vs2.3.6.1/include/net/route.h ---- linux-3.9.4/include/net/route.h 2013-02-19 13:58:52.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/net/route.h 2013-05-31 17:17:53.000000000 +0000 -@@ -207,6 +207,9 @@ static inline void ip_rt_put(struct rtab +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 *); + + 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 in6_addr *saddr, struct nx_info *nxi); + + 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 dst_release(&rt->dst); } @@ -12483,7 +11686,7 @@ diff -NurpP --minimal linux-3.9.4/include/net/route.h linux-3.9.4-vs2.3.6.1/incl #define IPTOS_RT_MASK (IPTOS_TOS_MASK & ~3) extern const __u8 ip_tos2prio[16]; -@@ -256,6 +259,9 @@ static inline void ip_route_connect_init +@@ -252,6 +255,9 @@ static inline void ip_route_connect_init protocol, flow_flags, dst, src, dport, sport); } @@ -12493,14 +11696,14 @@ diff -NurpP --minimal linux-3.9.4/include/net/route.h linux-3.9.4-vs2.3.6.1/incl static inline struct rtable *ip_route_connect(struct flowi4 *fl4, __be32 dst, __be32 src, u32 tos, int oif, u8 protocol, -@@ -264,11 +270,25 @@ static inline struct rtable *ip_route_co +@@ -260,11 +266,25 @@ static inline struct rtable *ip_route_co { struct net *net = sock_net(sk); struct rtable *rt; + struct nx_info *nx_info = current_nx_info(); ip_route_connect_init(fl4, dst, src, tos, oif, protocol, - sport, dport, sk, can_sleep); + sport, dport, sk); - if (!dst || !src) { + if (sk) @@ -12520,42 +11723,44 @@ diff -NurpP --minimal linux-3.9.4/include/net/route.h linux-3.9.4-vs2.3.6.1/incl rt = __ip_route_output_key(net, fl4); if (IS_ERR(rt)) return rt; -diff -NurpP --minimal linux-3.9.4/include/net/sock.h linux-3.9.4-vs2.3.6.1/include/net/sock.h ---- linux-3.9.4/include/net/sock.h 2013-05-31 14:22:27.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/net/sock.h 2013-05-31 17:17:53.000000000 +0000 -@@ -191,6 +191,10 @@ struct sock_common { +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; #endif -+ xid_t skc_xid; ++ vxid_t skc_xid; + struct vx_info *skc_vx_info; -+ nid_t skc_nid; ++ vnid_t skc_nid; + struct nx_info *skc_nx_info; - /* - * fields between dontcopy_begin/dontcopy_end - * are not copied in sock_copy() -@@ -304,6 +308,10 @@ struct sock { - #define sk_bind_node __sk_common.skc_bind_node + + #if IS_ENABLED(CONFIG_IPV6) + struct in6_addr skc_v6_daddr; +@@ -327,7 +331,11 @@ 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_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.9.4/include/uapi/Kbuild linux-3.9.4-vs2.3.6.1/include/uapi/Kbuild ---- linux-3.9.4/include/uapi/Kbuild 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/uapi/Kbuild 2013-05-31 14:47:11.000000000 +0000 -@@ -12,3 +12,4 @@ header-y += video/ - header-y += drm/ +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 +@@ -13,3 +13,4 @@ header-y += drm/ header-y += xen/ header-y += scsi/ + header-y += misc/ +header-y += vserver/ -diff -NurpP --minimal linux-3.9.4/include/uapi/linux/capability.h linux-3.9.4-vs2.3.6.1/include/uapi/linux/capability.h ---- linux-3.9.4/include/uapi/linux/capability.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/uapi/linux/capability.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -259,6 +259,7 @@ struct vfs_cap_data { arbitrary SCSI commands */ /* Allow setting encryption key on loopback filesystem */ @@ -12564,9 +11769,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/linux/capability.h linux-3.9.4-vs #define CAP_SYS_ADMIN 21 -@@ -345,7 +346,12 @@ struct vfs_cap_data { +@@ -354,7 +355,12 @@ struct vfs_cap_data { - #define CAP_LAST_CAP CAP_BLOCK_SUSPEND + #define CAP_LAST_CAP CAP_AUDIT_READ -#define cap_valid(x) ((x) >= 0 && (x) <= CAP_LAST_CAP) +/* Allow context manipulations */ @@ -12578,10 +11783,10 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/linux/capability.h linux-3.9.4-vs /* * Bit location of each capability (used by user-space library and kernel) -diff -NurpP --minimal linux-3.9.4/include/uapi/linux/fs.h linux-3.9.4-vs2.3.6.1/include/uapi/linux/fs.h ---- linux-3.9.4/include/uapi/linux/fs.h 2013-05-31 13:45:29.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/uapi/linux/fs.h 2013-05-31 23:07:43.000000000 +0000 -@@ -86,6 +86,9 @@ struct inodes_stat_t { +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 */ #define MS_I_VERSION (1<<23) /* Update inode I_version field */ #define MS_STRICTATIME (1<<24) /* Always perform atime updates */ @@ -12590,8 +11795,8 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/linux/fs.h linux-3.9.4-vs2.3.6.1/ +#define MS_TAGID (1<<25) /* use specific tag for this mount */ /* These sb flags are internal to the kernel */ - #define MS_SNAP_STABLE (1<<27) /* Snapshot pages during writeback, if needed */ -@@ -192,11 +195,14 @@ struct inodes_stat_t { + #define MS_NOSEC (1<<28) +@@ -195,11 +198,14 @@ 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 */ @@ -12608,9 +11813,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/linux/fs.h linux-3.9.4-vs2.3.6.1/ #define SYNC_FILE_RANGE_WAIT_BEFORE 1 #define SYNC_FILE_RANGE_WRITE 2 -diff -NurpP --minimal linux-3.9.4/include/uapi/linux/gfs2_ondisk.h linux-3.9.4-vs2.3.6.1/include/uapi/linux/gfs2_ondisk.h ---- linux-3.9.4/include/uapi/linux/gfs2_ondisk.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/uapi/linux/gfs2_ondisk.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -225,6 +225,9 @@ enum { gfs2fl_Sync = 8, gfs2fl_System = 9, @@ -12631,20 +11836,20 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/linux/gfs2_ondisk.h linux-3.9.4-v #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.9.4/include/uapi/linux/if_tun.h linux-3.9.4-vs2.3.6.1/include/uapi/linux/if_tun.h ---- linux-3.9.4/include/uapi/linux/if_tun.h 2013-02-19 13:58:55.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/uapi/linux/if_tun.h 2013-05-31 15:00:16.000000000 +0000 -@@ -56,6 +56,7 @@ - #define TUNGETVNETHDRSZ _IOR('T', 215, int) - #define TUNSETVNETHDRSZ _IOW('T', 216, int) +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 TUNSETNID _IOW('T', 218, int) + #define TUNSETIFINDEX _IOW('T', 218, unsigned int) + #define TUNGETFILTER _IOR('T', 219, struct sock_fprog) ++#define TUNSETNID _IOW('T', 220, int) /* TUNSETIFF ifr flags */ #define IFF_TUN 0x0001 -diff -NurpP --minimal linux-3.9.4/include/uapi/linux/major.h linux-3.9.4-vs2.3.6.1/include/uapi/linux/major.h ---- linux-3.9.4/include/uapi/linux/major.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/uapi/linux/major.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -15,6 +15,7 @@ #define HD_MAJOR IDE0_MAJOR #define PTY_SLAVE_MAJOR 3 @@ -12653,11 +11858,11 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/linux/major.h linux-3.9.4-vs2.3.6 #define TTYAUX_MAJOR 5 #define LP_MAJOR 6 #define VCS_MAJOR 7 -diff -NurpP --minimal linux-3.9.4/include/uapi/linux/nfs_mount.h linux-3.9.4-vs2.3.6.1/include/uapi/linux/nfs_mount.h ---- linux-3.9.4/include/uapi/linux/nfs_mount.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/uapi/linux/nfs_mount.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -63,7 +63,8 @@ struct nfs_mount_data { - #define NFS_MOUNT_SECFLAVOUR 0x2000 /* 5 */ + #define NFS_MOUNT_SECFLAVOUR 0x2000 /* 5 non-text parsed mount data only */ #define NFS_MOUNT_NORDIRPLUS 0x4000 /* 5 */ #define NFS_MOUNT_UNSHARED 0x8000 /* 5 */ -#define NFS_MOUNT_FLAGMASK 0xFFFF @@ -12666,9 +11871,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/linux/nfs_mount.h linux-3.9.4-vs2 /* The following are for internal use only */ #define NFS_MOUNT_LOOKUP_CACHE_NONEG 0x10000 -diff -NurpP --minimal linux-3.9.4/include/uapi/linux/reboot.h linux-3.9.4-vs2.3.6.1/include/uapi/linux/reboot.h ---- linux-3.9.4/include/uapi/linux/reboot.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/uapi/linux/reboot.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -33,7 +33,7 @@ #define LINUX_REBOOT_CMD_RESTART2 0xA1B2C3D4 #define LINUX_REBOOT_CMD_SW_SUSPEND 0xD000FCE2 @@ -12678,9 +11883,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/linux/reboot.h linux-3.9.4-vs2.3. #endif /* _UAPI_LINUX_REBOOT_H */ -diff -NurpP --minimal linux-3.9.4/include/uapi/linux/sysctl.h linux-3.9.4-vs2.3.6.1/include/uapi/linux/sysctl.h ---- linux-3.9.4/include/uapi/linux/sysctl.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/uapi/linux/sysctl.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -60,6 +60,7 @@ enum CTL_ABI=9, /* Binary emulation */ CTL_CPU=10, /* CPU stuff (speed scaling, etc) */ @@ -12697,9 +11902,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/linux/sysctl.h linux-3.9.4-vs2.3. KERN_SPARC_REBOOT=21, /* reboot command on Sparc */ KERN_CTLALTDEL=22, /* int: allow ctl-alt-del to reboot */ -diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/Kbuild linux-3.9.4-vs2.3.6.1/include/uapi/vserver/Kbuild ---- linux-3.9.4/include/uapi/vserver/Kbuild 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/uapi/vserver/Kbuild 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,9 @@ + +header-y += context_cmd.h network_cmd.h space_cmd.h \ @@ -12710,9 +11915,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/Kbuild linux-3.9.4-vs2.3. +header-y += switch.h context.h network.h monitor.h \ + limit.h inode.h device.h + -diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/cacct_cmd.h linux-3.9.4-vs2.3.6.1/include/uapi/vserver/cacct_cmd.h ---- linux-3.9.4/include/uapi/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/uapi/vserver/cacct_cmd.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,15 @@ +#ifndef _UAPI_VS_CACCT_CMD_H +#define _UAPI_VS_CACCT_CMD_H @@ -12729,9 +11934,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/cacct_cmd.h linux-3.9.4-v +}; + +#endif /* _UAPI_VS_CACCT_CMD_H */ -diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/context.h linux-3.9.4-vs2.3.6.1/include/uapi/vserver/context.h ---- linux-3.9.4/include/uapi/vserver/context.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/uapi/vserver/context.h 2013-05-31 19:44:13.000000000 +0000 +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 @@ -0,0 +1,81 @@ +#ifndef _UAPI_VS_CONTEXT_H +#define _UAPI_VS_CONTEXT_H @@ -12801,8 +12006,8 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/context.h linux-3.9.4-vs2 +#define VXC_OOM_ADJUST 0x00002000 +#define VXC_AUDIT_CONTROL 0x00004000 + -+/* #define VXC_SECURE_MOUNT 0x00010000 -+#define VXC_SECURE_REMOUNT 0x00020000 */ ++#define VXC_SECURE_MOUNT 0x00010000 ++/* #define VXC_SECURE_REMOUNT 0x00020000 */ +#define VXC_BINARY_MOUNT 0x00040000 +#define VXC_DEV_MOUNT 0x00080000 + @@ -12814,9 +12019,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/context.h linux-3.9.4-vs2 +#define VXC_NAMESPACE 0x02000000 + +#endif /* _UAPI_VS_CONTEXT_H */ -diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/context_cmd.h linux-3.9.4-vs2.3.6.1/include/uapi/vserver/context_cmd.h ---- linux-3.9.4/include/uapi/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/uapi/vserver/context_cmd.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,115 @@ +#ifndef _UAPI_VS_CONTEXT_CMD_H +#define _UAPI_VS_CONTEXT_CMD_H @@ -12933,9 +12138,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/context_cmd.h linux-3.9.4 +}; + +#endif /* _UAPI_VS_CONTEXT_CMD_H */ -diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/cvirt_cmd.h linux-3.9.4-vs2.3.6.1/include/uapi/vserver/cvirt_cmd.h ---- linux-3.9.4/include/uapi/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/uapi/vserver/cvirt_cmd.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,41 @@ +#ifndef _UAPI_VS_CVIRT_CMD_H +#define _UAPI_VS_CVIRT_CMD_H @@ -12978,9 +12183,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/cvirt_cmd.h linux-3.9.4-v +}; + +#endif /* _UAPI_VS_CVIRT_CMD_H */ -diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/debug_cmd.h linux-3.9.4-vs2.3.6.1/include/uapi/vserver/debug_cmd.h ---- linux-3.9.4/include/uapi/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/uapi/vserver/debug_cmd.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,24 @@ +#ifndef _UAPI_VS_DEBUG_CMD_H +#define _UAPI_VS_DEBUG_CMD_H @@ -13006,9 +12211,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/debug_cmd.h linux-3.9.4-v +}; + +#endif /* _UAPI_VS_DEBUG_CMD_H */ -diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/device.h linux-3.9.4-vs2.3.6.1/include/uapi/vserver/device.h ---- linux-3.9.4/include/uapi/vserver/device.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/uapi/vserver/device.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,12 @@ +#ifndef _UAPI_VS_DEVICE_H +#define _UAPI_VS_DEVICE_H @@ -13022,9 +12227,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/device.h linux-3.9.4-vs2. +#define DATTR_MASK 0x00000013 + +#endif /* _UAPI_VS_DEVICE_H */ -diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/device_cmd.h linux-3.9.4-vs2.3.6.1/include/uapi/vserver/device_cmd.h ---- linux-3.9.4/include/uapi/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/uapi/vserver/device_cmd.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,16 @@ +#ifndef _UAPI_VS_DEVICE_CMD_H +#define _UAPI_VS_DEVICE_CMD_H @@ -13042,9 +12247,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/device_cmd.h linux-3.9.4- +}; + +#endif /* _UAPI_VS_DEVICE_CMD_H */ -diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/dlimit_cmd.h linux-3.9.4-vs2.3.6.1/include/uapi/vserver/dlimit_cmd.h ---- linux-3.9.4/include/uapi/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/uapi/vserver/dlimit_cmd.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,67 @@ +#ifndef _UAPI_VS_DLIMIT_CMD_H +#define _UAPI_VS_DLIMIT_CMD_H @@ -13113,9 +12318,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/dlimit_cmd.h linux-3.9.4- +} + +#endif /* _UAPI_VS_DLIMIT_CMD_H */ -diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/inode.h linux-3.9.4-vs2.3.6.1/include/uapi/vserver/inode.h ---- linux-3.9.4/include/uapi/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/uapi/vserver/inode.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,23 @@ +#ifndef _UAPI_VS_INODE_H +#define _UAPI_VS_INODE_H @@ -13140,9 +12345,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/inode.h linux-3.9.4-vs2.3 +#define FIOC_SETXFLG _IOW('x', 6, long) + +#endif /* _UAPI_VS_INODE_H */ -diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/inode_cmd.h linux-3.9.4-vs2.3.6.1/include/uapi/vserver/inode_cmd.h ---- linux-3.9.4/include/uapi/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/uapi/vserver/inode_cmd.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,26 @@ +#ifndef _UAPI_VS_INODE_CMD_H +#define _UAPI_VS_INODE_CMD_H @@ -13170,9 +12375,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/inode_cmd.h linux-3.9.4-v +}; + +#endif /* _UAPI_VS_INODE_CMD_H */ -diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/limit.h linux-3.9.4-vs2.3.6.1/include/uapi/vserver/limit.h ---- linux-3.9.4/include/uapi/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/uapi/vserver/limit.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,14 @@ +#ifndef _UAPI_VS_LIMIT_H +#define _UAPI_VS_LIMIT_H @@ -13188,9 +12393,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/limit.h linux-3.9.4-vs2.3 +#define VLIMIT_MAPPED 23 + +#endif /* _UAPI_VS_LIMIT_H */ -diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/limit_cmd.h linux-3.9.4-vs2.3.6.1/include/uapi/vserver/limit_cmd.h ---- linux-3.9.4/include/uapi/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/uapi/vserver/limit_cmd.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,40 @@ +#ifndef _UAPI_VS_LIMIT_CMD_H +#define _UAPI_VS_LIMIT_CMD_H @@ -13232,9 +12437,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/limit_cmd.h linux-3.9.4-v +#define CRLIM_KEEP (~1ULL) + +#endif /* _UAPI_VS_LIMIT_CMD_H */ -diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/monitor.h linux-3.9.4-vs2.3.6.1/include/uapi/vserver/monitor.h ---- linux-3.9.4/include/uapi/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/uapi/vserver/monitor.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,96 @@ +#ifndef _UAPI_VS_MONITOR_H +#define _UAPI_VS_MONITOR_H @@ -13332,9 +12537,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/monitor.h linux-3.9.4-vs2 +}; + +#endif /* _UAPI_VS_MONITOR_H */ -diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/network.h linux-3.9.4-vs2.3.6.1/include/uapi/vserver/network.h ---- linux-3.9.4/include/uapi/vserver/network.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/uapi/vserver/network.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,76 @@ +#ifndef _UAPI_VS_NETWORK_H +#define _UAPI_VS_NETWORK_H @@ -13412,9 +12617,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/network.h linux-3.9.4-vs2 +#define NXA_MASK_SHOW (NXA_MASK_ALL | NXA_LOOPBACK) + +#endif /* _UAPI_VS_NETWORK_H */ -diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/network_cmd.h linux-3.9.4-vs2.3.6.1/include/uapi/vserver/network_cmd.h ---- linux-3.9.4/include/uapi/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/uapi/vserver/network_cmd.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,123 @@ +#ifndef _UAPI_VS_NETWORK_CMD_H +#define _UAPI_VS_NETWORK_CMD_H @@ -13539,9 +12744,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/network_cmd.h linux-3.9.4 +}; + +#endif /* _UAPI_VS_NETWORK_CMD_H */ -diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/sched_cmd.h linux-3.9.4-vs2.3.6.1/include/uapi/vserver/sched_cmd.h ---- linux-3.9.4/include/uapi/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/uapi/vserver/sched_cmd.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,13 @@ +#ifndef _UAPI_VS_SCHED_CMD_H +#define _UAPI_VS_SCHED_CMD_H @@ -13556,9 +12761,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/sched_cmd.h linux-3.9.4-v +#define VCMD_get_prio_bias VC_CMD(SCHED, 5, 0) + +#endif /* _UAPI_VS_SCHED_CMD_H */ -diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/signal_cmd.h linux-3.9.4-vs2.3.6.1/include/uapi/vserver/signal_cmd.h ---- linux-3.9.4/include/uapi/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/uapi/vserver/signal_cmd.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,31 @@ +#ifndef _UAPI_VS_SIGNAL_CMD_H +#define _UAPI_VS_SIGNAL_CMD_H @@ -13591,9 +12796,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/signal_cmd.h linux-3.9.4- +}; + +#endif /* _UAPI_VS_SIGNAL_CMD_H */ -diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/space_cmd.h linux-3.9.4-vs2.3.6.1/include/uapi/vserver/space_cmd.h ---- linux-3.9.4/include/uapi/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/uapi/vserver/space_cmd.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,28 @@ +#ifndef _UAPI_VS_SPACE_CMD_H +#define _UAPI_VS_SPACE_CMD_H @@ -13623,9 +12828,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/space_cmd.h linux-3.9.4-v +}; + +#endif /* _UAPI_VS_SPACE_CMD_H */ -diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/switch.h linux-3.9.4-vs2.3.6.1/include/uapi/vserver/switch.h ---- linux-3.9.4/include/uapi/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/uapi/vserver/switch.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,90 @@ +#ifndef _UAPI_VS_SWITCH_H +#define _UAPI_VS_SWITCH_H @@ -13717,9 +12922,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/switch.h linux-3.9.4-vs2. +#define VCMD_get_vci VC_CMD(VERSION, 1, 0) + +#endif /* _UAPI_VS_SWITCH_H */ -diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/tag_cmd.h linux-3.9.4-vs2.3.6.1/include/uapi/vserver/tag_cmd.h ---- linux-3.9.4/include/uapi/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/include/uapi/vserver/tag_cmd.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,14 @@ +#ifndef _UAPI_VS_TAG_CMD_H +#define _UAPI_VS_TAG_CMD_H @@ -13735,39 +12940,31 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/tag_cmd.h linux-3.9.4-vs2 +#define VCMD_tag_migrate VC_CMD(TAGMIG, 1, 0) + +#endif /* _UAPI_VS_TAG_CMD_H */ -diff -NurpP --minimal linux-3.9.4/init/Kconfig linux-3.9.4-vs2.3.6.1/init/Kconfig ---- linux-3.9.4/init/Kconfig 2013-05-31 13:45:29.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/init/Kconfig 2013-05-31 14:47:11.000000000 +0000 -@@ -760,6 +760,7 @@ config NUMA_BALANCING +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 menuconfig CGROUPS boolean "Control Group support" - depends on EVENTFD + 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 -@@ -1022,6 +1023,7 @@ config IPC_NS - config USER_NS - bool "User namespace" - depends on UIDGID_CONVERTED -+ depends on VSERVER_DISABLED - select UIDGID_STRICT_TYPE_CHECKS - - default n -diff -NurpP --minimal linux-3.9.4/init/main.c linux-3.9.4-vs2.3.6.1/init/main.c ---- linux-3.9.4/init/main.c 2013-05-31 13:45:29.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/init/main.c 2013-05-31 15:09:17.000000000 +0000 -@@ -72,6 +72,7 @@ - #include - #include - #include +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 + #include + #include +#include #include #include -diff -NurpP --minimal linux-3.9.4/ipc/mqueue.c linux-3.9.4-vs2.3.6.1/ipc/mqueue.c ---- linux-3.9.4/ipc/mqueue.c 2013-05-31 13:45:29.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/ipc/mqueue.c 2013-05-31 14:47:11.000000000 +0000 +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 @@ -35,6 +35,8 @@ #include #include @@ -13778,7 +12975,7 @@ diff -NurpP --minimal linux-3.9.4/ipc/mqueue.c linux-3.9.4-vs2.3.6.1/ipc/mqueue. #include #include "util.h" @@ -76,6 +78,7 @@ struct mqueue_inode_info { - struct pid* notify_owner; + struct pid *notify_owner; struct user_namespace *notify_user_ns; struct user_struct *user; /* user who created, for accounting */ + struct vx_info *vxi; @@ -13843,9 +13040,9 @@ diff -NurpP --minimal linux-3.9.4/ipc/mqueue.c linux-3.9.4-vs2.3.6.1/ipc/mqueue. free_uid(user); } if (ipc_ns) -diff -NurpP --minimal linux-3.9.4/ipc/msg.c linux-3.9.4-vs2.3.6.1/ipc/msg.c ---- linux-3.9.4/ipc/msg.c 2013-05-31 13:45:29.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/ipc/msg.c 2013-05-31 14:47:11.000000000 +0000 +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 @@ -37,6 +37,7 @@ #include #include @@ -13853,8 +13050,8 @@ diff -NurpP --minimal linux-3.9.4/ipc/msg.c linux-3.9.4-vs2.3.6.1/ipc/msg.c +#include #include - #include -@@ -190,6 +191,7 @@ static int newque(struct ipc_namespace * + #include +@@ -129,6 +130,7 @@ static int newque(struct ipc_namespace * msq->q_perm.mode = msgflg & S_IRWXUGO; msq->q_perm.key = key; @@ -13862,19 +13059,19 @@ diff -NurpP --minimal linux-3.9.4/ipc/msg.c linux-3.9.4-vs2.3.6.1/ipc/msg.c msq->q_perm.security = NULL; retval = security_msg_queue_alloc(msq); -diff -NurpP --minimal linux-3.9.4/ipc/sem.c linux-3.9.4-vs2.3.6.1/ipc/sem.c ---- linux-3.9.4/ipc/sem.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/ipc/sem.c 2013-05-31 14:47:11.000000000 +0000 -@@ -86,6 +86,8 @@ +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 +@@ -85,6 +85,8 @@ #include #include #include +#include +#include - #include + #include #include "util.h" -@@ -306,6 +308,7 @@ static int newary(struct ipc_namespace * +@@ -499,6 +501,7 @@ static int newary(struct ipc_namespace * sma->sem_perm.mode = (semflg & S_IRWXUGO); sma->sem_perm.key = key; @@ -13882,7 +13079,7 @@ diff -NurpP --minimal linux-3.9.4/ipc/sem.c linux-3.9.4-vs2.3.6.1/ipc/sem.c sma->sem_perm.security = NULL; retval = security_sem_alloc(sma); -@@ -321,6 +324,9 @@ static int newary(struct ipc_namespace * +@@ -528,6 +531,9 @@ static int newary(struct ipc_namespace * return id; } ns->used_sems += nsems; @@ -13890,54 +13087,56 @@ diff -NurpP --minimal linux-3.9.4/ipc/sem.c linux-3.9.4-vs2.3.6.1/ipc/sem.c + vx_semary_inc(sma); + vx_nsems_add(sma, nsems); - sma->sem_base = (struct sem *) &sma[1]; - -@@ -770,6 +776,9 @@ static void freeary(struct ipc_namespace + sem_unlock(sma, -1); + rcu_read_unlock(); +@@ -1116,6 +1122,9 @@ static void freeary(struct ipc_namespace wake_up_sem_queue_do(&tasks); ns->used_sems -= sma->sem_nsems; + /* FIXME: obsoleted? */ + vx_nsems_sub(sma, sma->sem_nsems); + vx_semary_dec(sma); - security_sem_free(sma); - ipc_rcu_putref(sma); + ipc_rcu_putref(sma, sem_rcu_free); } -diff -NurpP --minimal linux-3.9.4/ipc/shm.c linux-3.9.4-vs2.3.6.1/ipc/shm.c ---- linux-3.9.4/ipc/shm.c 2013-05-31 14:22:27.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/ipc/shm.c 2013-05-31 14:47:11.000000000 +0000 -@@ -39,6 +39,8 @@ + +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 +@@ -42,6 +42,8 @@ #include #include #include +#include +#include - #include + #include -@@ -187,7 +189,12 @@ static void shm_open(struct vm_area_stru - */ +@@ -210,10 +212,14 @@ static void shm_open(struct vm_area_stru static void shm_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp) { -- ns->shm_tot -= (shp->shm_segsz + PAGE_SIZE - 1) >> PAGE_SHIFT; + struct file *shm_file; + struct vx_info *vxi = lookup_vx_info(shp->shm_perm.xid); + int numpages = (shp->shm_segsz + PAGE_SIZE - 1) >> PAGE_SHIFT; -+ + + shm_file = shp->shm_file; + shp->shm_file = NULL; +- ns->shm_tot -= (shp->shm_segsz + PAGE_SIZE - 1) >> PAGE_SHIFT; + vx_ipcshm_sub(vxi, shp, numpages); + ns->shm_tot -= numpages; + shm_rmid(ns, shp); shm_unlock(shp); - if (!is_file_hugepages(shp->shm_file)) -@@ -197,6 +204,7 @@ static void shm_destroy(struct ipc_names - shp->mlock_user); - fput (shp->shm_file); - security_shm_free(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); + fput(shm_file); + put_vx_info(vxi); - ipc_rcu_putref(shp); + ipc_rcu_putref(shp, shm_rcu_free); } -@@ -474,11 +482,15 @@ static int newseg(struct ipc_namespace * - if (ns->shm_tot + numpages > ns->shm_ctlall) +@@ -502,11 +509,15 @@ static int newseg(struct ipc_namespace * + ns->shm_tot + numpages > ns->shm_ctlall) return -ENOSPC; + if (!vx_ipcshm_avail(current_vx_info(), numpages)) @@ -13952,41 +13151,41 @@ diff -NurpP --minimal linux-3.9.4/ipc/shm.c linux-3.9.4-vs2.3.6.1/ipc/shm.c shp->shm_perm.mode = (shmflg & S_IRWXUGO); shp->mlock_user = NULL; -@@ -544,6 +556,7 @@ static int newseg(struct ipc_namespace * - ns->shm_tot += numpages; - error = shp->shm_perm.id; - shm_unlock(shp); +@@ -576,6 +587,7 @@ static int newseg(struct ipc_namespace * + + ipc_unlock_object(&shp->shm_perm); + rcu_read_unlock(); + vx_ipcshm_add(current_vx_info(), key, numpages); return error; no_id: -diff -NurpP --minimal linux-3.9.4/kernel/Makefile linux-3.9.4-vs2.3.6.1/kernel/Makefile ---- linux-3.9.4/kernel/Makefile 2013-05-31 14:22:27.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/Makefile 2013-05-31 14:47:11.000000000 +0000 -@@ -24,6 +24,7 @@ endif - - obj-y += sched/ - obj-y += power/ +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/ + obj-y += irq/ + obj-y += rcu/ +obj-y += vserver/ obj-$(CONFIG_CHECKPOINT_RESTORE) += kcmp.o obj-$(CONFIG_FREEZER) += freezer.o -diff -NurpP --minimal linux-3.9.4/kernel/auditsc.c linux-3.9.4-vs2.3.6.1/kernel/auditsc.c ---- linux-3.9.4/kernel/auditsc.c 2013-05-31 14:22:27.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/auditsc.c 2013-05-31 14:47:11.000000000 +0000 -@@ -2315,7 +2315,7 @@ int audit_set_loginuid(kuid_t loginuid) - if (audit_loginuid_set(task)) +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_ + if (is_audit_feature_set(AUDIT_FEATURE_LOGINUID_IMMUTABLE)) return -EPERM; - #else /* CONFIG_AUDIT_LOGINUID_IMMUTABLE */ + /* it is set, you need permission */ - if (!capable(CAP_AUDIT_CONTROL)) + if (!vx_capable(CAP_AUDIT_CONTROL, VXC_AUDIT_CONTROL)) return -EPERM; - #endif /* CONFIG_AUDIT_LOGINUID_IMMUTABLE */ - -diff -NurpP --minimal linux-3.9.4/kernel/capability.c linux-3.9.4-vs2.3.6.1/kernel/capability.c ---- linux-3.9.4/kernel/capability.c 2013-05-31 13:45:29.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/capability.c 2013-05-31 14:47:11.000000000 +0000 -@@ -15,6 +15,7 @@ + /* 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 +@@ -17,6 +17,7 @@ #include #include #include @@ -13994,7 +13193,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/capability.c linux-3.9.4-vs2.3.6.1/kern #include /* -@@ -116,6 +117,7 @@ static int cap_validate_magic(cap_user_h +@@ -106,6 +107,7 @@ static int cap_validate_magic(cap_user_h return 0; } @@ -14002,7 +13201,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/capability.c linux-3.9.4-vs2.3.6.1/kern /* * 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 -@@ -349,6 +351,8 @@ bool has_ns_capability_noaudit(struct ta +@@ -343,6 +345,8 @@ bool has_ns_capability_noaudit(struct ta return (ret == 0); } @@ -14011,9 +13210,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/capability.c linux-3.9.4-vs2.3.6.1/kern /** * has_capability_noaudit - Does a task have a capability (unaudited) in the * initial user ns -diff -NurpP --minimal linux-3.9.4/kernel/compat.c linux-3.9.4-vs2.3.6.1/kernel/compat.c ---- linux-3.9.4/kernel/compat.c 2013-05-31 13:45:29.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/compat.c 2013-05-31 14:47:11.000000000 +0000 +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 @@ -27,6 +27,7 @@ #include #include @@ -14022,7 +13221,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/compat.c linux-3.9.4-vs2.3.6.1/kernel/c #include -@@ -1059,7 +1060,7 @@ asmlinkage long compat_sys_stime(compat_ +@@ -1058,7 +1059,7 @@ COMPAT_SYSCALL_DEFINE1(stime, compat_tim if (err) return err; @@ -14031,9 +13230,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/compat.c linux-3.9.4-vs2.3.6.1/kernel/c return 0; } -diff -NurpP --minimal linux-3.9.4/kernel/cred.c linux-3.9.4-vs2.3.6.1/kernel/cred.c ---- linux-3.9.4/kernel/cred.c 2013-02-19 13:58:56.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/cred.c 2013-05-31 14:47:11.000000000 +0000 +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 = { .group_info = &init_groups, }; @@ -14103,9 +13302,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/cred.c linux-3.9.4-vs2.3.6.1/kernel/cre EXPORT_SYMBOL(prepare_creds); /* -diff -NurpP --minimal linux-3.9.4/kernel/exit.c linux-3.9.4-vs2.3.6.1/kernel/exit.c ---- linux-3.9.4/kernel/exit.c 2013-05-31 13:45:29.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/exit.c 2013-05-31 14:47:11.000000000 +0000 +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 @@ -48,6 +48,10 @@ #include #include @@ -14117,7 +13316,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/exit.c linux-3.9.4-vs2.3.6.1/kernel/exi #include #include #include -@@ -514,15 +518,25 @@ static struct task_struct *find_new_reap +@@ -474,15 +478,25 @@ static struct task_struct *find_new_reap __acquires(&tasklist_lock) { struct pid_namespace *pid_ns = task_active_pid_ns(father); @@ -14146,7 +13345,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/exit.c linux-3.9.4-vs2.3.6.1/kernel/exi } if (unlikely(pid_ns->child_reaper == father)) { -@@ -560,7 +574,9 @@ static struct task_struct *find_new_reap +@@ -520,7 +534,9 @@ static struct task_struct *find_new_reap } } @@ -14157,9 +13356,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/exit.c linux-3.9.4-vs2.3.6.1/kernel/exi } /* -@@ -611,10 +627,15 @@ static void forget_original_parent(struc - list_for_each_entry_safe(p, n, &father->children, sibling) { +@@ -572,10 +588,15 @@ static void forget_original_parent(struc struct task_struct *t = p; + do { - t->real_parent = reaper; + struct task_struct *new_parent = reaper; @@ -14175,17 +13374,17 @@ diff -NurpP --minimal linux-3.9.4/kernel/exit.c linux-3.9.4-vs2.3.6.1/kernel/exi } if (t->pdeath_signal) group_send_sig_info(t->pdeath_signal, -@@ -821,6 +842,9 @@ void do_exit(long code) +@@ -777,6 +798,9 @@ void do_exit(long code) */ - ptrace_put_breakpoints(tsk); + flush_ptrace_hw_breakpoint(tsk); + /* needs to stay before exit_notify() */ + exit_vx_info_early(tsk, code); + + TASKS_RCU(tasks_rcu_i = __srcu_read_lock(&tasks_rcu_exit_srcu)); exit_notify(tsk, group_dead); - #ifdef CONFIG_NUMA - task_lock(tsk); -@@ -874,10 +898,15 @@ void do_exit(long code) + proc_exit_connector(tsk); +@@ -834,10 +858,15 @@ void do_exit(long code) smp_mb(); raw_spin_unlock_wait(&tsk->pi_lock); @@ -14201,20 +13400,20 @@ diff -NurpP --minimal linux-3.9.4/kernel/exit.c linux-3.9.4-vs2.3.6.1/kernel/exi BUG(); /* Avoid "noreturn function does return". */ for (;;) -diff -NurpP --minimal linux-3.9.4/kernel/fork.c linux-3.9.4-vs2.3.6.1/kernel/fork.c ---- linux-3.9.4/kernel/fork.c 2013-05-31 13:45:29.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/fork.c 2013-05-31 14:47:11.000000000 +0000 -@@ -70,6 +70,9 @@ - #include - #include +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 + #include + #include +#include +#include +#include #include #include -@@ -210,6 +213,8 @@ void free_task(struct task_struct *tsk) +@@ -214,6 +217,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); @@ -14223,39 +13422,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/fork.c linux-3.9.4-vs2.3.6.1/kernel/for ftrace_graph_exit_task(tsk); put_seccomp_filter(tsk); arch_release_task_struct(tsk); -@@ -547,6 +552,7 @@ static struct mm_struct *mm_init(struct - if (likely(!mm_alloc_pgd(mm))) { - mm->def_flags = 0; - mmu_notifier_mm_init(mm); -+ set_vx_info(&mm->mm_vx_info, p->vx_info); - return mm; - } - -@@ -599,6 +605,7 @@ void __mmdrop(struct mm_struct *mm) - destroy_context(mm); - mmu_notifier_mm_destroy(mm); - check_mm(mm); -+ clr_vx_info(&mm->mm_vx_info); - free_mm(mm); - } - EXPORT_SYMBOL_GPL(__mmdrop); -@@ -818,6 +825,7 @@ struct mm_struct *dup_mm(struct task_str - goto fail_nomem; - - memcpy(mm, oldmm, sizeof(*mm)); -+ mm->mm_vx_info = NULL; - mm_init_cpumask(mm); - - #ifdef CONFIG_TRANSPARENT_HUGEPAGE -@@ -859,6 +867,7 @@ fail_nocontext: - * If init_new_context() failed, we cannot use mmput() to free the mm - * because it calls destroy_context() - */ -+ clr_vx_info(&mm->mm_vx_info); - mm_free_pgd(mm); - free_mm(mm); - return NULL; -@@ -1137,6 +1146,8 @@ static struct task_struct *copy_process( +@@ -1188,6 +1193,8 @@ static struct task_struct *copy_process( { int retval; struct task_struct *p; @@ -14264,7 +13431,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/fork.c linux-3.9.4-vs2.3.6.1/kernel/for if ((clone_flags & (CLONE_NEWNS|CLONE_FS)) == (CLONE_NEWNS|CLONE_FS)) return ERR_PTR(-EINVAL); -@@ -1195,7 +1206,12 @@ static struct task_struct *copy_process( +@@ -1249,7 +1256,12 @@ static struct task_struct *copy_process( DEBUG_LOCKS_WARN_ON(!p->hardirqs_enabled); DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled); #endif @@ -14276,11 +13443,11 @@ diff -NurpP --minimal linux-3.9.4/kernel/fork.c linux-3.9.4-vs2.3.6.1/kernel/for + goto bad_fork_free; if (atomic_read(&p->real_cred->user->processes) >= task_rlimit(p, RLIMIT_NPROC)) { - if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE) && -@@ -1472,6 +1488,18 @@ static struct task_struct *copy_process( - + if (p->real_cred->user != INIT_USER && +@@ -1535,6 +1547,18 @@ static struct task_struct *copy_process( total_forks++; spin_unlock(¤t->sighand->siglock); + syscall_tracepoint_update(p); + + /* p is copy of current */ + vxi = p->vx_info; @@ -14294,22 +13461,22 @@ diff -NurpP --minimal linux-3.9.4/kernel/fork.c linux-3.9.4-vs2.3.6.1/kernel/for + if (nxi) + claim_nx_info(nxi, p); write_unlock_irq(&tasklist_lock); + proc_fork_connector(p); - cgroup_post_fork(p); -diff -NurpP --minimal linux-3.9.4/kernel/kthread.c linux-3.9.4-vs2.3.6.1/kernel/kthread.c ---- linux-3.9.4/kernel/kthread.c 2013-05-31 13:45:30.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/kthread.c 2013-05-31 14:47:11.000000000 +0000 -@@ -17,6 +17,7 @@ - #include +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 #include + #include +#include #include static DEFINE_SPINLOCK(kthread_create_lock); -diff -NurpP --minimal linux-3.9.4/kernel/nsproxy.c linux-3.9.4-vs2.3.6.1/kernel/nsproxy.c ---- linux-3.9.4/kernel/nsproxy.c 2013-05-31 13:45:30.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/nsproxy.c 2013-05-31 19:28:43.000000000 +0000 +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 @@ -20,11 +20,14 @@ #include #include @@ -14318,7 +13485,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/nsproxy.c linux-3.9.4-vs2.3.6.1/kernel/ +#include #include #include - #include + #include #include #include +#include "../fs/mount.h" @@ -14354,7 +13521,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/nsproxy.c linux-3.9.4-vs2.3.6.1/kernel/ { struct nsproxy *new_nsp; int err; -@@ -67,31 +76,31 @@ static struct nsproxy *create_new_namesp +@@ -67,32 +76,31 @@ static struct nsproxy *create_new_namesp if (!new_nsp) return ERR_PTR(-ENOMEM); @@ -14379,10 +13546,11 @@ diff -NurpP --minimal linux-3.9.4/kernel/nsproxy.c linux-3.9.4-vs2.3.6.1/kernel/ goto out_ipc; } -- new_nsp->pid_ns = copy_pid_ns(flags, user_ns, tsk->nsproxy->pid_ns); -+ new_nsp->pid_ns = copy_pid_ns(flags, new_user, new_pid); - if (IS_ERR(new_nsp->pid_ns)) { - err = PTR_ERR(new_nsp->pid_ns); +- new_nsp->pid_ns_for_children = +- copy_pid_ns(flags, user_ns, tsk->nsproxy->pid_ns_for_children); ++ new_nsp->pid_ns_for_children = copy_pid_ns(flags, new_user, new_pid); + if (IS_ERR(new_nsp->pid_ns_for_children)) { + err = PTR_ERR(new_nsp->pid_ns_for_children); goto out_pid; } @@ -14391,7 +13559,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/nsproxy.c linux-3.9.4-vs2.3.6.1/kernel/ if (IS_ERR(new_nsp->net_ns)) { err = PTR_ERR(new_nsp->net_ns); goto out_net; -@@ -116,6 +125,41 @@ out_ns: +@@ -117,6 +125,41 @@ out_ns: return ERR_PTR(err); } @@ -14422,8 +13590,8 @@ diff -NurpP --minimal linux-3.9.4/kernel/nsproxy.c linux-3.9.4-vs2.3.6.1/kernel/ + get_uts_ns(ns->uts_ns); + if (ns->ipc_ns) + get_ipc_ns(ns->ipc_ns); -+ if (ns->pid_ns) -+ get_pid_ns(ns->pid_ns); ++ if (ns->pid_ns_for_children) ++ get_pid_ns(ns->pid_ns_for_children); + if (ns->net_ns) + get_net(ns->net_ns); + } @@ -14433,43 +13601,41 @@ diff -NurpP --minimal linux-3.9.4/kernel/nsproxy.c linux-3.9.4-vs2.3.6.1/kernel/ /* * called from clone. This now handles copy for nsproxy and all * namespaces therein. -@@ -124,9 +168,12 @@ int copy_namespaces(unsigned long flags, +@@ -125,7 +168,10 @@ int copy_namespaces(unsigned long flags, { struct nsproxy *old_ns = tsk->nsproxy; struct user_namespace *user_ns = task_cred_xxx(tsk, user_ns); - struct nsproxy *new_ns; + struct nsproxy *new_ns = NULL; - int err = 0; - ++ + vxdprintk(VXD_CBIT(space, 7), "copy_namespaces(0x%08lx,%p[%p])", + flags, tsk, old_ns); -+ - if (!old_ns) - return 0; -@@ -136,7 +183,7 @@ int copy_namespaces(unsigned long flags, - CLONE_NEWPID | CLONE_NEWNET))) + if (likely(!(flags & (CLONE_NEWNS | CLONE_NEWUTS | CLONE_NEWIPC | + CLONE_NEWPID | CLONE_NEWNET)))) { +@@ -133,7 +179,7 @@ int copy_namespaces(unsigned long flags, return 0; - -- if (!ns_capable(user_ns, CAP_SYS_ADMIN)) { -+ if (!vx_ns_can_unshare(user_ns, CAP_SYS_ADMIN, flags)) { - err = -EPERM; - goto out; } -@@ -163,6 +210,9 @@ int copy_namespaces(unsigned long flags, - out: - put_nsproxy(old_ns); +- if (!ns_capable(user_ns, CAP_SYS_ADMIN)) ++ if (!vx_ns_can_unshare(user_ns, CAP_SYS_ADMIN, flags)) + return -EPERM; + + /* +@@ -152,6 +198,9 @@ int copy_namespaces(unsigned long flags, + return PTR_ERR(new_ns); + + tsk->nsproxy = new_ns; + vxdprintk(VXD_CBIT(space, 3), -+ "copy_namespaces(0x%08lx,%p[%p]) = %d [%p]", -+ flags, tsk, old_ns, err, new_ns); - return err; ++ "copy_namespaces(0x%08lx,%p[%p]) = [%p]", ++ flags, tsk, old_ns, new_ns); + return 0; } -@@ -176,7 +226,9 @@ void free_nsproxy(struct nsproxy *ns) +@@ -165,7 +214,9 @@ void free_nsproxy(struct nsproxy *ns) put_ipc_ns(ns->ipc_ns); - if (ns->pid_ns) - put_pid_ns(ns->pid_ns); + if (ns->pid_ns_for_children) + put_pid_ns(ns->pid_ns_for_children); - put_net(ns->net_ns); + if (ns->net_ns) + put_net(ns->net_ns); @@ -14477,7 +13643,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/nsproxy.c linux-3.9.4-vs2.3.6.1/kernel/ kmem_cache_free(nsproxy_cachep, ns); } -@@ -190,12 +242,16 @@ int unshare_nsproxy_namespaces(unsigned +@@ -179,12 +230,16 @@ int unshare_nsproxy_namespaces(unsigned struct user_namespace *user_ns; int err = 0; @@ -14495,18 +13661,18 @@ diff -NurpP --minimal linux-3.9.4/kernel/nsproxy.c linux-3.9.4-vs2.3.6.1/kernel/ return -EPERM; *new_nsp = create_new_namespaces(unshare_flags, current, user_ns, -diff -NurpP --minimal linux-3.9.4/kernel/pid.c linux-3.9.4-vs2.3.6.1/kernel/pid.c ---- linux-3.9.4/kernel/pid.c 2013-05-31 13:45:30.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/pid.c 2013-05-31 15:24:34.000000000 +0000 -@@ -37,6 +37,7 @@ - #include +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 +@@ -38,6 +38,7 @@ #include + #include #include +#include #define pid_hashfn(nr, ns) \ hash_long((unsigned long)nr + (unsigned long)ns, pidhash_shift) -@@ -364,7 +365,7 @@ EXPORT_SYMBOL_GPL(find_pid_ns); +@@ -375,7 +376,7 @@ EXPORT_SYMBOL_GPL(find_pid_ns); struct pid *find_vpid(int nr) { @@ -14515,7 +13681,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/pid.c linux-3.9.4-vs2.3.6.1/kernel/pid. } EXPORT_SYMBOL_GPL(find_vpid); -@@ -424,6 +425,9 @@ void transfer_pid(struct task_struct *ol +@@ -431,6 +432,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; @@ -14525,7 +13691,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/pid.c linux-3.9.4-vs2.3.6.1/kernel/pid. if (pid) { struct hlist_node *first; first = rcu_dereference_check(hlist_first_rcu(&pid->tasks[type]), -@@ -443,7 +447,7 @@ struct task_struct *find_task_by_pid_ns( +@@ -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"); @@ -14534,7 +13700,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/pid.c linux-3.9.4-vs2.3.6.1/kernel/pid. } struct task_struct *find_task_by_vpid(pid_t vnr) -@@ -487,7 +491,7 @@ struct pid *find_get_pid(pid_t nr) +@@ -494,7 +498,7 @@ struct pid *find_get_pid(pid_t nr) } EXPORT_SYMBOL_GPL(find_get_pid); @@ -14543,7 +13709,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/pid.c linux-3.9.4-vs2.3.6.1/kernel/pid. { struct upid *upid; pid_t nr = 0; -@@ -501,6 +505,11 @@ pid_t pid_nr_ns(struct pid *pid, struct +@@ -508,6 +512,11 @@ pid_t pid_nr_ns(struct pid *pid, struct } EXPORT_SYMBOL_GPL(pid_nr_ns); @@ -14555,18 +13721,18 @@ diff -NurpP --minimal linux-3.9.4/kernel/pid.c linux-3.9.4-vs2.3.6.1/kernel/pid. pid_t pid_vnr(struct pid *pid) { return pid_nr_ns(pid, task_active_pid_ns(current)); -diff -NurpP --minimal linux-3.9.4/kernel/pid_namespace.c linux-3.9.4-vs2.3.6.1/kernel/pid_namespace.c ---- linux-3.9.4/kernel/pid_namespace.c 2013-05-31 13:45:30.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/pid_namespace.c 2013-05-31 17:59:48.000000000 +0000 +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 @@ -18,6 +18,7 @@ - #include + #include #include #include +#include - #define BITS_PER_PAGE (PAGE_SIZE*8) - -@@ -112,6 +113,7 @@ static struct pid_namespace *create_pid_ + struct pid_cache { + int nr_ids; +@@ -110,6 +111,7 @@ static struct pid_namespace *create_pid_ goto out_free_map; kref_init(&ns->kref); @@ -14574,73 +13740,35 @@ diff -NurpP --minimal linux-3.9.4/kernel/pid_namespace.c linux-3.9.4-vs2.3.6.1/k ns->level = level; ns->parent = get_pid_ns(parent_pid_ns); ns->user_ns = get_user_ns(user_ns); -@@ -142,6 +144,7 @@ static void destroy_pid_namespace(struct - for (i = 0; i < PIDMAP_ENTRIES; i++) - kfree(ns->pidmap[i].page); - put_user_ns(ns->user_ns); +@@ -127,6 +129,7 @@ static struct pid_namespace *create_pid_ + out_free_map: + kfree(ns->pidmap[0].page); + out_free: + atomic_dec(&vs_global_pid_ns); kmem_cache_free(pid_ns_cachep, ns); - } - -diff -NurpP --minimal linux-3.9.4/kernel/posix-timers.c linux-3.9.4-vs2.3.6.1/kernel/posix-timers.c ---- linux-3.9.4/kernel/posix-timers.c 2013-05-31 13:45:30.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/posix-timers.c 2013-05-31 14:47:11.000000000 +0000 -@@ -47,6 +47,7 @@ - #include - #include - #include -+#include - - /* - * Management arrays for POSIX timers. Timers are kept in slab memory -@@ -340,6 +341,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(). -@@ -356,10 +358,18 @@ int posix_timer_event(struct k_itimer *t - rcu_read_lock(); - task = pid_task(timr->it_pid, PIDTYPE_PID); - if (task) { -+ struct vx_info_save vxis; -+ struct vx_info *vxi; -+ -+ vxi = get_vx_info(task->vx_info); -+ enter_vx_info(vxi, &vxis); - shared = !(timr->it_sigev_notify & SIGEV_THREAD_ID); - ret = send_sigqueue(timr->sigq, task, shared); -+ leave_vx_info(&vxis); -+ put_vx_info(vxi); - } - rcu_read_unlock(); -+ - /* If we failed to send the signal the timer stops. */ - return ret > 0; - } -diff -NurpP --minimal linux-3.9.4/kernel/printk.c linux-3.9.4-vs2.3.6.1/kernel/printk.c ---- linux-3.9.4/kernel/printk.c 2013-05-31 13:45:30.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/printk.c 2013-05-31 15:23:35.000000000 +0000 -@@ -43,6 +43,7 @@ - #include - #include + 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 +@@ -46,6 +46,7 @@ #include + #include + #include +#include #include -@@ -841,7 +842,7 @@ static int check_syslog_permissions(int +@@ -490,7 +491,7 @@ static int check_syslog_permissions(int return 0; if (syslog_action_restricted(type)) { - if (capable(CAP_SYSLOG)) + if (vx_capable(CAP_SYSLOG, VXC_SYSLOG)) return 0; - /* For historical reasons, accept CAP_SYS_ADMIN too, with a warning */ - if (capable(CAP_SYS_ADMIN)) { -@@ -1135,12 +1136,9 @@ int do_syslog(int type, char __user *buf + /* + * For historical reasons, accept CAP_SYS_ADMIN too, with +@@ -1270,12 +1271,9 @@ int do_syslog(int type, char __user *buf if (error) return error; @@ -14656,7 +13784,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/printk.c linux-3.9.4-vs2.3.6.1/kernel/p error = -EINVAL; if (!buf || len < 0) goto out; -@@ -1151,6 +1149,16 @@ int do_syslog(int type, char __user *buf +@@ -1286,6 +1284,16 @@ int do_syslog(int type, char __user *buf error = -EFAULT; goto out; } @@ -14673,7 +13801,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/printk.c linux-3.9.4-vs2.3.6.1/kernel/p error = wait_event_interruptible(log_wait, syslog_seq != log_next_seq); if (error) -@@ -1163,16 +1171,6 @@ int do_syslog(int type, char __user *buf +@@ -1298,16 +1306,6 @@ int do_syslog(int type, char __user *buf /* FALL THRU */ /* Read last kernel messages */ case SYSLOG_ACTION_READ_ALL: @@ -14690,18 +13818,18 @@ diff -NurpP --minimal linux-3.9.4/kernel/printk.c linux-3.9.4-vs2.3.6.1/kernel/p error = syslog_print_all(buf, len, clear); break; /* Clear ring buffer */ -diff -NurpP --minimal linux-3.9.4/kernel/ptrace.c linux-3.9.4-vs2.3.6.1/kernel/ptrace.c ---- linux-3.9.4/kernel/ptrace.c 2013-05-31 13:45:30.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/ptrace.c 2013-05-31 15:22:34.000000000 +0000 -@@ -22,6 +22,7 @@ +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 +@@ -23,6 +23,7 @@ #include #include #include +#include #include #include - -@@ -261,6 +262,11 @@ ok: + #include +@@ -258,6 +259,11 @@ ok: } rcu_read_unlock(); @@ -14713,51 +13841,60 @@ diff -NurpP --minimal linux-3.9.4/kernel/ptrace.c linux-3.9.4-vs2.3.6.1/kernel/p return security_ptrace_access_check(task, mode); } -diff -NurpP --minimal linux-3.9.4/kernel/sched/core.c linux-3.9.4-vs2.3.6.1/kernel/sched/core.c ---- linux-3.9.4/kernel/sched/core.c 2013-05-31 13:45:30.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/sched/core.c 2013-05-31 15:17:22.000000000 +0000 -@@ -73,6 +73,8 @@ - #include +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 +@@ -16,6 +16,7 @@ + #include + #include + #include ++#include + + /* + * this indicates whether you can reboot with ctrl-alt-del: the default is yes +@@ -269,6 +270,8 @@ EXPORT_SYMBOL_GPL(kernel_power_off); + + static DEFINE_MUTEX(reboot_mutex); + ++long vs_reboot(unsigned int, void __user *); ++ + /* + * Reboot system call: for obvious reasons only root may call it, + * and even root needs to set up some magic numbers in the registers +@@ -311,6 +314,9 @@ SYSCALL_DEFINE4(reboot, int, magic1, int + if ((cmd == LINUX_REBOOT_CMD_POWER_OFF) && !pm_power_off) + cmd = LINUX_REBOOT_CMD_HALT; + ++ if (!vx_check(0, VS_ADMIN|VS_WATCH)) ++ return vs_reboot(cmd, arg); ++ + 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 +@@ -74,6 +74,8 @@ #include #include + #include +#include +#include #include #include -@@ -2091,9 +2093,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; -+ } - } - - static long calc_load_fold_active(struct rq *this_rq) -@@ -3704,7 +3714,7 @@ SYSCALL_DEFINE1(nice, int, increment) - nice = 19; +@@ -3192,7 +3194,7 @@ SYSCALL_DEFINE1(nice, int, increment) + nice = clamp_val(nice, MIN_NICE, MAX_NICE); if (increment < 0 && !can_nice(current, nice)) - return -EPERM; + return vx_flags(VXF_IGNEG_NICE, 0) ? 0 : -EPERM; retval = security_task_setnice(current, nice); if (retval) -diff -NurpP --minimal linux-3.9.4/kernel/sched/cputime.c linux-3.9.4-vs2.3.6.1/kernel/sched/cputime.c ---- linux-3.9.4/kernel/sched/cputime.c 2013-05-31 14:22:27.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/sched/cputime.c 2013-05-31 15:17:55.000000000 +0000 +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 @@ -4,6 +4,7 @@ #include #include @@ -14766,12 +13903,12 @@ diff -NurpP --minimal linux-3.9.4/kernel/sched/cputime.c linux-3.9.4-vs2.3.6.1/k #include "sched.h" -@@ -151,14 +152,17 @@ static inline void task_group_account_fi +@@ -135,14 +136,17 @@ static inline void task_group_account_fi void account_user_time(struct task_struct *p, cputime_t cputime, cputime_t cputime_scaled) { + struct vx_info *vxi = p->vx_info; /* p is _always_ current */ -+ int nice = (TASK_NICE(p) > 0); ++ int nice = (task_nice(p) > 0); int index; /* Add user time to process. */ @@ -14780,12 +13917,12 @@ diff -NurpP --minimal linux-3.9.4/kernel/sched/cputime.c linux-3.9.4-vs2.3.6.1/k + vx_account_user(vxi, cputime, nice); account_group_user_time(p, cputime); -- index = (TASK_NICE(p) > 0) ? CPUTIME_NICE : CPUTIME_USER; +- index = (task_nice(p) > 0) ? CPUTIME_NICE : CPUTIME_USER; + index = (nice) ? CPUTIME_NICE : CPUTIME_USER; /* Add user time to cpustat. */ task_group_account_field(p, index, (__force u64) cputime); -@@ -205,9 +209,12 @@ static inline +@@ -189,9 +193,12 @@ static inline void __account_system_time(struct task_struct *p, cputime_t cputime, cputime_t cputime_scaled, int index) { @@ -14798,10 +13935,10 @@ diff -NurpP --minimal linux-3.9.4/kernel/sched/cputime.c linux-3.9.4-vs2.3.6.1/k account_group_system_time(p, cputime); /* Add system time to cpustat. */ -diff -NurpP --minimal linux-3.9.4/kernel/sched/fair.c linux-3.9.4-vs2.3.6.1/kernel/sched/fair.c ---- linux-3.9.4/kernel/sched/fair.c 2013-05-31 13:45:30.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/sched/fair.c 2013-05-31 15:19:37.000000000 +0000 -@@ -29,6 +29,7 @@ +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 +@@ -30,6 +30,7 @@ #include #include #include @@ -14809,7 +13946,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/sched/fair.c linux-3.9.4-vs2.3.6.1/kern #include -@@ -1714,6 +1715,8 @@ enqueue_entity(struct cfs_rq *cfs_rq, st +@@ -2840,6 +2841,8 @@ enqueue_entity(struct cfs_rq *cfs_rq, st __enqueue_entity(cfs_rq, se); se->on_rq = 1; @@ -14818,7 +13955,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/sched/fair.c linux-3.9.4-vs2.3.6.1/kern if (cfs_rq->nr_running == 1) { list_add_leaf_cfs_rq(cfs_rq); check_enqueue_throttle(cfs_rq); -@@ -1795,6 +1798,8 @@ dequeue_entity(struct cfs_rq *cfs_rq, st +@@ -2921,6 +2924,8 @@ dequeue_entity(struct cfs_rq *cfs_rq, st if (se != cfs_rq->curr) __dequeue_entity(cfs_rq, se); se->on_rq = 0; @@ -14826,20 +13963,44 @@ diff -NurpP --minimal linux-3.9.4/kernel/sched/fair.c linux-3.9.4-vs2.3.6.1/kern + vx_deactivate_task(task_of(se)); account_entity_dequeue(cfs_rq, se); - /* -diff -NurpP --minimal linux-3.9.4/kernel/signal.c linux-3.9.4-vs2.3.6.1/kernel/signal.c ---- linux-3.9.4/kernel/signal.c 2013-05-31 13:45:30.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/signal.c 2013-05-31 15:20:05.000000000 +0000 -@@ -32,6 +32,8 @@ - #include - #include + /* +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 +@@ -34,6 +34,8 @@ #include + #include + #include +#include +#include + #define CREATE_TRACE_POINTS #include - -@@ -789,9 +791,18 @@ static int check_kill_permission(int sig +@@ -767,9 +769,18 @@ static int check_kill_permission(int sig struct pid *sid; int error; @@ -14858,7 +14019,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/signal.c linux-3.9.4-vs2.3.6.1/kernel/s if (!si_fromuser(info)) return 0; -@@ -815,6 +826,20 @@ static int check_kill_permission(int sig +@@ -793,6 +804,20 @@ static int check_kill_permission(int sig } } @@ -14879,7 +14040,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/signal.c linux-3.9.4-vs2.3.6.1/kernel/s return security_task_kill(t, info, sig, 0); } -@@ -1351,7 +1376,7 @@ int kill_pid_info(int sig, struct siginf +@@ -1334,7 +1359,7 @@ int kill_pid_info(int sig, struct siginf rcu_read_lock(); retry: p = pid_task(pid, PIDTYPE_PID); @@ -14888,7 +14049,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/signal.c linux-3.9.4-vs2.3.6.1/kernel/s error = group_send_sig_info(sig, info, p); if (unlikely(error == -ESRCH)) /* -@@ -1399,7 +1424,7 @@ int kill_pid_info_as_cred(int sig, struc +@@ -1382,7 +1407,7 @@ int kill_pid_info_as_cred(int sig, struc rcu_read_lock(); p = pid_task(pid, PIDTYPE_PID); @@ -14897,7 +14058,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/signal.c linux-3.9.4-vs2.3.6.1/kernel/s ret = -ESRCH; goto out_unlock; } -@@ -1451,8 +1476,10 @@ static int kill_something_info(int sig, +@@ -1434,8 +1459,10 @@ static int kill_something_info(int sig, struct task_struct * p; for_each_process(p) { @@ -14910,41 +14071,41 @@ diff -NurpP --minimal linux-3.9.4/kernel/signal.c linux-3.9.4-vs2.3.6.1/kernel/s int err = group_send_sig_info(sig, info, p); ++count; if (err != -EPERM) -@@ -2306,6 +2333,11 @@ relock: +@@ -2288,6 +2315,11 @@ relock: !sig_kernel_only(signr)) continue; + /* virtual init is protected against user signals */ -+ if ((info->si_code == SI_USER) && ++ if ((ksig->info.si_code == SI_USER) && + vx_current_initpid(current->pid)) + continue; + if (sig_kernel_stop(signr)) { /* * The default action is to stop all threads in -diff -NurpP --minimal linux-3.9.4/kernel/softirq.c linux-3.9.4-vs2.3.6.1/kernel/softirq.c ---- linux-3.9.4/kernel/softirq.c 2013-05-31 13:45:30.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/softirq.c 2013-05-31 14:47:11.000000000 +0000 -@@ -25,6 +25,7 @@ - #include +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 +@@ -26,6 +26,7 @@ #include #include + #include +#include #define CREATE_TRACE_POINTS #include -diff -NurpP --minimal linux-3.9.4/kernel/sys.c linux-3.9.4-vs2.3.6.1/kernel/sys.c ---- linux-3.9.4/kernel/sys.c 2013-05-31 13:45:30.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/sys.c 2013-05-31 15:23:14.000000000 +0000 -@@ -50,6 +50,7 @@ - #include +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 +@@ -54,6 +54,7 @@ + #include #include +#include /* Move somewhere else to avoid recompiling? */ #include -@@ -155,7 +156,10 @@ static int set_one_prio(struct task_stru +@@ -145,7 +146,10 @@ static int set_one_prio(struct task_stru goto out; } if (niceval < task_nice(p) && !can_nice(p, niceval)) { @@ -14956,44 +14117,34 @@ diff -NurpP --minimal linux-3.9.4/kernel/sys.c linux-3.9.4-vs2.3.6.1/kernel/sys. goto out; } no_nice = security_task_setnice(p, niceval); -@@ -206,6 +210,8 @@ SYSCALL_DEFINE3(setpriority, int, which, - else - pgrp = task_pgrp(current); - do_each_pid_thread(pgrp, PIDTYPE_PGID, p) { -+ if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT)) -+ continue; - error = set_one_prio(p, niceval, error); - } while_each_pid_thread(pgrp, PIDTYPE_PGID, p); - break; -@@ -271,6 +277,8 @@ SYSCALL_DEFINE2(getpriority, int, which, - else - pgrp = task_pgrp(current); - do_each_pid_thread(pgrp, PIDTYPE_PGID, p) { -+ if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT)) -+ continue; - niceval = 20 - task_nice(p); +@@ -196,6 +200,8 @@ SYSCALL_DEFINE3(setpriority, int, which, + else + pgrp = task_pgrp(current); + do_each_pid_thread(pgrp, PIDTYPE_PGID, p) { ++ if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT)) ++ continue; + 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, + else + pgrp = task_pgrp(current); + do_each_pid_thread(pgrp, PIDTYPE_PGID, p) { ++ if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT)) ++ continue; + niceval = nice_to_rlimit(task_nice(p)); + if (niceval > retval) + retval = niceval; +@@ -278,6 +286,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)) { + niceval = nice_to_rlimit(task_nice(p)); if (niceval > retval) - retval = niceval; -@@ -424,6 +432,8 @@ EXPORT_SYMBOL_GPL(kernel_power_off); - - static DEFINE_MUTEX(reboot_mutex); - -+long vs_reboot(unsigned int, void __user *); -+ - /* - * Reboot system call: for obvious reasons only root may call it, - * and even root needs to set up some magic numbers in the registers -@@ -466,6 +476,9 @@ SYSCALL_DEFINE4(reboot, int, magic1, int - if ((cmd == LINUX_REBOOT_CMD_POWER_OFF) && !pm_power_off) - cmd = LINUX_REBOOT_CMD_HALT; - -+ if (!vx_check(0, VS_ADMIN|VS_WATCH)) -+ return vs_reboot(cmd, arg); -+ - mutex_lock(&reboot_mutex); - switch (cmd) { - case LINUX_REBOOT_CMD_RESTART: -@@ -1373,7 +1386,8 @@ SYSCALL_DEFINE2(sethostname, char __user +@@ -1202,7 +1212,8 @@ SYSCALL_DEFINE2(sethostname, char __user int errno; char tmp[__NEW_UTS_LEN]; @@ -15003,7 +14154,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/sys.c linux-3.9.4-vs2.3.6.1/kernel/sys. return -EPERM; if (len < 0 || len > __NEW_UTS_LEN) -@@ -1424,7 +1438,8 @@ SYSCALL_DEFINE2(setdomainname, char __us +@@ -1253,7 +1264,8 @@ SYSCALL_DEFINE2(setdomainname, char __us int errno; char tmp[__NEW_UTS_LEN]; @@ -15013,7 +14164,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/sys.c linux-3.9.4-vs2.3.6.1/kernel/sys. return -EPERM; if (len < 0 || len > __NEW_UTS_LEN) return -EINVAL; -@@ -1543,7 +1558,7 @@ int do_prlimit(struct task_struct *tsk, +@@ -1371,7 +1383,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 && @@ -15022,7 +14173,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/sys.c linux-3.9.4-vs2.3.6.1/kernel/sys. retval = -EPERM; if (!retval) retval = security_task_setrlimit(tsk->group_leader, -@@ -1596,7 +1611,8 @@ static int check_prlimit_permission(stru +@@ -1424,7 +1436,8 @@ static int check_prlimit_permission(stru gid_eq(cred->gid, tcred->sgid) && gid_eq(cred->gid, tcred->gid)) return 0; @@ -15032,10 +14183,10 @@ diff -NurpP --minimal linux-3.9.4/kernel/sys.c linux-3.9.4-vs2.3.6.1/kernel/sys. return 0; return -EPERM; -diff -NurpP --minimal linux-3.9.4/kernel/sysctl.c linux-3.9.4-vs2.3.6.1/kernel/sysctl.c ---- linux-3.9.4/kernel/sysctl.c 2013-05-31 13:45:30.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/sysctl.c 2013-05-31 15:28:39.000000000 +0000 -@@ -83,6 +83,7 @@ +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 @@ #if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_LOCK_STAT) #include #endif @@ -15043,23 +14194,31 @@ diff -NurpP --minimal linux-3.9.4/kernel/sysctl.c linux-3.9.4-vs2.3.6.1/kernel/s #ifdef CONFIG_CHR_DEV_SG #include #endif -@@ -629,6 +630,13 @@ static struct ctl_table kern_table[] = { - .mode = 0644, - .proc_handler = proc_dostring, - }, -+ { +@@ -278,6 +279,13 @@ static int max_extfrag_threshold = 1000; + + static struct ctl_table kern_table[] = { + { + .procname = "vshelper", + .data = &vshelper_path, + .maxlen = 256, + .mode = 0644, -+ .proc_handler = &proc_dostring, ++ .proc_handler = proc_dostring, + }, - - #ifdef CONFIG_CHR_DEV_SG ++ { + .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, + }, +- + #endif /* CONFIG_COMPACTION */ { -diff -NurpP --minimal linux-3.9.4/kernel/sysctl_binary.c linux-3.9.4-vs2.3.6.1/kernel/sysctl_binary.c ---- linux-3.9.4/kernel/sysctl_binary.c 2013-05-31 13:45:30.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/sysctl_binary.c 2013-05-31 14:47:11.000000000 +0000 + .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 @@ -73,6 +73,7 @@ static const struct bin_table bin_kern_t { CTL_INT, KERN_PANIC, "panic" }, @@ -15068,28 +14227,47 @@ diff -NurpP --minimal linux-3.9.4/kernel/sysctl_binary.c linux-3.9.4-vs2.3.6.1/k { CTL_STR, KERN_SPARC_REBOOT, "reboot-cmd" }, { CTL_INT, KERN_CTLALTDEL, "ctrl-alt-del" }, -diff -NurpP --minimal linux-3.9.4/kernel/time/timekeeping.c linux-3.9.4-vs2.3.6.1/kernel/time/timekeeping.c ---- linux-3.9.4/kernel/time/timekeeping.c 2013-05-31 13:45:30.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/time/timekeeping.c 2013-05-31 15:24:55.000000000 +0000 -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - +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 +@@ -48,6 +48,7 @@ + #include + #include + #include ++#include - static struct timekeeper timekeeper; -@@ -594,6 +595,7 @@ void getrawmonotonic(struct timespec *ts - } while (read_seqretry(&tk->lock, seq)); + #include "timekeeping.h" - timespec_add_ns(ts, nsecs); -+ vx_adjust_timespec(ts); +@@ -400,6 +401,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 + rcu_read_lock(); + task = pid_task(timr->it_pid, PIDTYPE_PID); + if (task) { ++ struct vx_info_save vxis; ++ struct vx_info *vxi; ++ ++ vxi = get_vx_info(task->vx_info); ++ enter_vx_info(vxi, &vxis); + shared = !(timr->it_sigev_notify & SIGEV_THREAD_ID); + ret = send_sigqueue(timr->sigq, task, shared); ++ leave_vx_info(&vxis); ++ put_vx_info(vxi); + } + rcu_read_unlock(); ++ + /* If we failed to send the signal the timer stops. */ + return ret > 0; } - EXPORT_SYMBOL(getrawmonotonic); - -diff -NurpP --minimal linux-3.9.4/kernel/time.c linux-3.9.4-vs2.3.6.1/kernel/time.c ---- linux-3.9.4/kernel/time.c 2013-05-31 13:45:30.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/time.c 2013-05-31 14:47:11.000000000 +0000 +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 @@ -37,6 +37,7 @@ #include #include @@ -15098,7 +14276,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/time.c linux-3.9.4-vs2.3.6.1/kernel/tim #include #include -@@ -92,7 +93,7 @@ SYSCALL_DEFINE1(stime, time_t __user *, +@@ -93,7 +94,7 @@ SYSCALL_DEFINE1(stime, time_t __user *, if (err) return err; @@ -15107,7 +14285,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/time.c linux-3.9.4-vs2.3.6.1/kernel/tim return 0; } -@@ -180,7 +181,7 @@ int do_sys_settimeofday(const struct tim +@@ -182,7 +183,7 @@ int do_sys_settimeofday(const struct tim } } if (tv) @@ -15116,13 +14294,34 @@ diff -NurpP --minimal linux-3.9.4/kernel/time.c linux-3.9.4-vs2.3.6.1/kernel/tim return 0; } -diff -NurpP --minimal linux-3.9.4/kernel/timer.c linux-3.9.4-vs2.3.6.1/kernel/timer.c ---- linux-3.9.4/kernel/timer.c 2013-05-31 14:22:27.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/timer.c 2013-05-31 14:47:11.000000000 +0000 -@@ -41,6 +41,10 @@ - #include +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 +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + + #include "tick-internal.h" + #include "ntp_internal.h" +@@ -680,7 +681,9 @@ void getnstime_raw_and_real(struct times + } while (read_seqcount_retry(&tk_core.seq, seq)); + + timespec_add_ns(ts_raw, nsecs_raw); ++ vx_adjust_timespec(ts_raw); + timespec_add_ns(ts_real, nsecs_real); ++ vx_adjust_timespec(ts_real); + } + EXPORT_SYMBOL(getnstime_raw_and_real); + +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 +@@ -42,6 +42,10 @@ #include #include + #include +#include +#include +#include @@ -15130,9 +14329,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/timer.c linux-3.9.4-vs2.3.6.1/kernel/ti #include #include -diff -NurpP --minimal linux-3.9.4/kernel/user_namespace.c linux-3.9.4-vs2.3.6.1/kernel/user_namespace.c ---- linux-3.9.4/kernel/user_namespace.c 2013-05-31 13:45:30.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/user_namespace.c 2013-05-31 17:44:56.000000000 +0000 +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 @@ -22,6 +22,7 @@ #include #include @@ -15140,16 +14339,35 @@ diff -NurpP --minimal linux-3.9.4/kernel/user_namespace.c linux-3.9.4-vs2.3.6.1/ +#include static struct kmem_cache *user_ns_cachep __read_mostly; - -@@ -91,6 +92,7 @@ int create_user_ns(struct cred *new) + static DEFINE_MUTEX(userns_state_mutex); +@@ -95,6 +96,7 @@ int create_user_ns(struct cred *new) atomic_set(&ns->count, 1); /* Leave the new->user_ns reference with the new user namespace. */ + atomic_inc(&vs_global_user_ns); ns->parent = parent_ns; + ns->level = parent_ns->level + 1; ns->owner = owner; - ns->group = group; -@@ -835,6 +837,8 @@ static void *userns_get(struct task_stru +@@ -356,6 +358,18 @@ gid_t from_kgid_munged(struct user_names + } + EXPORT_SYMBOL(from_kgid_munged); + ++ktag_t make_ktag(struct user_namespace *from, vtag_t tag) ++{ ++ return KTAGT_INIT(tag); ++} ++EXPORT_SYMBOL(make_ktag); ++ ++vtag_t from_ktag(struct user_namespace *to, ktag_t tag) ++{ ++ return __ktag_val(tag); ++} ++EXPORT_SYMBOL(from_ktag); ++ + /** + * 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) { @@ -15158,13 +14376,13 @@ diff -NurpP --minimal linux-3.9.4/kernel/user_namespace.c linux-3.9.4-vs2.3.6.1/ put_user_ns(ns); } -diff -NurpP --minimal linux-3.9.4/kernel/utsname.c linux-3.9.4-vs2.3.6.1/kernel/utsname.c ---- linux-3.9.4/kernel/utsname.c 2013-05-31 13:45:30.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/utsname.c 2013-05-31 15:15:55.000000000 +0000 +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 @@ -16,14 +16,17 @@ #include #include - #include + #include +#include static struct uts_namespace *create_uts_ns(void) @@ -15188,10 +14406,10 @@ diff -NurpP --minimal linux-3.9.4/kernel/utsname.c linux-3.9.4-vs2.3.6.1/kernel/ kfree(ns); } -diff -NurpP --minimal linux-3.9.4/kernel/vserver/Kconfig linux-3.9.4-vs2.3.6.1/kernel/vserver/Kconfig ---- linux-3.9.4/kernel/vserver/Kconfig 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/vserver/Kconfig 2013-05-31 14:47:11.000000000 +0000 -@@ -0,0 +1,233 @@ +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 +@@ -0,0 +1,230 @@ +# +# Linux VServer configuration +# @@ -15208,8 +14426,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/Kconfig linux-3.9.4-vs2.3.6.1/k + +config VSERVER_AUTO_SINGLE + bool "Automatic Single IP Special Casing" -+ depends on EXPERIMENTAL -+ default y ++ default n + help + This allows network contexts with a single IP to + automatically remap 0.0.0.0 bindings to that IP, @@ -15229,8 +14446,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/Kconfig linux-3.9.4-vs2.3.6.1/k + link and create a copy of the unified file) + +config VSERVER_VTIME -+ bool "Enable Virtualized Guest Time" -+ depends on EXPERIMENTAL ++ bool "Enable Virtualized Guest Time (EXPERIMENTAL)" + default n + help + This enables per guest time offsets to allow for @@ -15239,8 +14455,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/Kconfig linux-3.9.4-vs2.3.6.1/k + therefore should not be enabled without good reason. + +config VSERVER_DEVICE -+ bool "Enable Guest Device Mapping" -+ depends on EXPERIMENTAL ++ bool "Enable Guest Device Mapping (EXPERIMENTAL)" + default n + help + This enables generic device remapping. @@ -15425,9 +14640,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/Kconfig linux-3.9.4-vs2.3.6.1/k + bool + default n + -diff -NurpP --minimal linux-3.9.4/kernel/vserver/Makefile linux-3.9.4-vs2.3.6.1/kernel/vserver/Makefile ---- linux-3.9.4/kernel/vserver/Makefile 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/vserver/Makefile 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,18 @@ +# +# Makefile for the Linux vserver routines. @@ -15447,9 +14662,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/Makefile linux-3.9.4-vs2.3.6.1/ +vserver-$(CONFIG_VSERVER_MONITOR) += monitor.o +vserver-$(CONFIG_VSERVER_DEVICE) += device.o + -diff -NurpP --minimal linux-3.9.4/kernel/vserver/cacct.c linux-3.9.4-vs2.3.6.1/kernel/vserver/cacct.c ---- linux-3.9.4/kernel/vserver/cacct.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/vserver/cacct.c 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,42 @@ +/* + * linux/kernel/vserver/cacct.c @@ -15493,9 +14708,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/cacct.c linux-3.9.4-vs2.3.6.1/k + return 0; +} + -diff -NurpP --minimal linux-3.9.4/kernel/vserver/cacct_init.h linux-3.9.4-vs2.3.6.1/kernel/vserver/cacct_init.h ---- linux-3.9.4/kernel/vserver/cacct_init.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/vserver/cacct_init.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,25 @@ + + @@ -15522,9 +14737,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/cacct_init.h linux-3.9.4-vs2.3. + return; +} + -diff -NurpP --minimal linux-3.9.4/kernel/vserver/cacct_proc.h linux-3.9.4-vs2.3.6.1/kernel/vserver/cacct_proc.h ---- linux-3.9.4/kernel/vserver/cacct_proc.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/vserver/cacct_proc.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,53 @@ +#ifndef _VX_CACCT_PROC_H +#define _VX_CACCT_PROC_H @@ -15579,9 +14794,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/cacct_proc.h linux-3.9.4-vs2.3. +} + +#endif /* _VX_CACCT_PROC_H */ -diff -NurpP --minimal linux-3.9.4/kernel/vserver/context.c linux-3.9.4-vs2.3.6.1/kernel/vserver/context.c ---- linux-3.9.4/kernel/vserver/context.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/vserver/context.c 2013-05-31 19:34:32.000000000 +0000 +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 @@ -0,0 +1,1119 @@ +/* + * linux/kernel/vserver/context.c @@ -15655,7 +14870,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/context.c linux-3.9.4-vs2.3.6.1 + * allocate an initialized vx_info struct + * doesn't make it visible (hash) */ + -+static struct vx_info *__alloc_vx_info(xid_t xid) ++static struct vx_info *__alloc_vx_info(vxid_t xid) +{ + struct vx_info *new = NULL; + int cpu, index; @@ -15854,7 +15069,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/context.c linux-3.9.4-vs2.3.6.1 +static DEFINE_SPINLOCK(vx_info_hash_lock); + + -+static inline unsigned int __hashval(xid_t xid) ++static inline unsigned int __hashval(vxid_t xid) +{ + return (xid % VX_HASH_SIZE); +} @@ -15918,7 +15133,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/context.c linux-3.9.4-vs2.3.6.1 + * requires the hash_lock to be held + * doesn't increment the vx_refcnt */ + -+static inline struct vx_info *__lookup_vx_info(xid_t xid) ++static inline struct vx_info *__lookup_vx_info(vxid_t xid) +{ + struct hlist_head *head = &vx_info_hash[__hashval(xid)]; + struct hlist_node *pos; @@ -16020,7 +15235,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/context.c linux-3.9.4-vs2.3.6.1 + + * verify that xid is still hashed */ + -+int xid_is_hashed(xid_t xid) ++int xid_is_hashed(vxid_t xid) +{ + int hashed; + @@ -16375,7 +15590,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/context.c linux-3.9.4-vs2.3.6.1 + +int vc_task_xid(uint32_t id) +{ -+ xid_t xid; ++ vxid_t xid; + + if (id) { + struct task_struct *tsk; @@ -16702,9 +15917,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/context.c linux-3.9.4-vs2.3.6.1 + +EXPORT_SYMBOL_GPL(free_vx_info); + -diff -NurpP --minimal linux-3.9.4/kernel/vserver/cvirt.c linux-3.9.4-vs2.3.6.1/kernel/vserver/cvirt.c ---- linux-3.9.4/kernel/vserver/cvirt.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/vserver/cvirt.c 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,313 @@ +/* + * linux/kernel/vserver/cvirt.c @@ -17019,9 +16234,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/cvirt.c linux-3.9.4-vs2.3.6.1/k + +#endif + -diff -NurpP --minimal linux-3.9.4/kernel/vserver/cvirt_init.h linux-3.9.4-vs2.3.6.1/kernel/vserver/cvirt_init.h ---- linux-3.9.4/kernel/vserver/cvirt_init.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/vserver/cvirt_init.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,70 @@ + + @@ -17093,9 +16308,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/cvirt_init.h linux-3.9.4-vs2.3. + return; +} + -diff -NurpP --minimal linux-3.9.4/kernel/vserver/cvirt_proc.h linux-3.9.4-vs2.3.6.1/kernel/vserver/cvirt_proc.h ---- linux-3.9.4/kernel/vserver/cvirt_proc.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/vserver/cvirt_proc.h 2013-05-31 19:38:26.000000000 +0000 +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 @@ -0,0 +1,123 @@ +#ifndef _VX_CVIRT_PROC_H +#define _VX_CVIRT_PROC_H @@ -17220,9 +16435,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/cvirt_proc.h linux-3.9.4-vs2.3. +} + +#endif /* _VX_CVIRT_PROC_H */ -diff -NurpP --minimal linux-3.9.4/kernel/vserver/debug.c linux-3.9.4-vs2.3.6.1/kernel/vserver/debug.c ---- linux-3.9.4/kernel/vserver/debug.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/vserver/debug.c 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,32 @@ +/* + * kernel/vserver/debug.c @@ -17256,9 +16471,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/debug.c linux-3.9.4-vs2.3.6.1/k + +EXPORT_SYMBOL_GPL(dump_vx_info); + -diff -NurpP --minimal linux-3.9.4/kernel/vserver/device.c linux-3.9.4-vs2.3.6.1/kernel/vserver/device.c ---- linux-3.9.4/kernel/vserver/device.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/vserver/device.c 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,443 @@ +/* + * linux/kernel/vserver/device.c @@ -17298,7 +16513,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/device.c linux-3.9.4-vs2.3.6.1/ + } u; +#define dm_hlist u.hlist +#define dm_list u.list -+ xid_t xid; ++ vxid_t xid; + dev_t device; + struct vx_dmap_target target; +}; @@ -17410,7 +16625,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/device.c linux-3.9.4-vs2.3.6.1/ + * + * caller must hold hash_lock + */ -+static inline int __find_mapping(xid_t xid, dev_t device, umode_t mode, ++static inline int __find_mapping(vxid_t xid, dev_t device, umode_t mode, + struct vs_mapping **local, struct vs_mapping **global) +{ + struct hlist_head *hash = dmap_main_hash; @@ -17452,7 +16667,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/device.c linux-3.9.4-vs2.3.6.1/ + struct vs_mapping *vdm, *global; + struct vx_dmap_target *vdmt; + int ret = 0; -+ xid_t xid = vxi->vx_id; ++ vxid_t xid = vxi->vx_id; + int index; + + spin_lock(hash_lock); @@ -17703,9 +16918,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/device.c linux-3.9.4-vs2.3.6.1/ +#endif /* CONFIG_COMPAT */ + + -diff -NurpP --minimal linux-3.9.4/kernel/vserver/dlimit.c linux-3.9.4-vs2.3.6.1/kernel/vserver/dlimit.c ---- linux-3.9.4/kernel/vserver/dlimit.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/vserver/dlimit.c 2013-05-31 19:37:39.000000000 +0000 +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 @@ -0,0 +1,528 @@ +/* + * linux/kernel/vserver/dlimit.c @@ -17736,7 +16951,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/dlimit.c linux-3.9.4-vs2.3.6.1/ + * allocate an initialized dl_info struct + * doesn't make it visible (hash) */ + -+static struct dl_info *__alloc_dl_info(struct super_block *sb, tag_t tag) ++static struct dl_info *__alloc_dl_info(struct super_block *sb, vtag_t tag) +{ + struct dl_info *new = NULL; + @@ -17793,7 +17008,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/dlimit.c linux-3.9.4-vs2.3.6.1/ +static DEFINE_SPINLOCK(dl_info_hash_lock); + + -+static inline unsigned int __hashval(struct super_block *sb, tag_t tag) ++static inline unsigned int __hashval(struct super_block *sb, vtag_t tag) +{ + return ((tag ^ (unsigned long)sb) % DL_HASH_SIZE); +} @@ -17835,7 +17050,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/dlimit.c linux-3.9.4-vs2.3.6.1/ + * requires the rcu_read_lock() + * doesn't increment the dl_refcnt */ + -+static inline struct dl_info *__lookup_dl_info(struct super_block *sb, tag_t tag) ++static inline struct dl_info *__lookup_dl_info(struct super_block *sb, vtag_t tag) +{ + struct hlist_head *head = &dl_info_hash[__hashval(sb, tag)]; + struct dl_info *dli; @@ -17848,7 +17063,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/dlimit.c linux-3.9.4-vs2.3.6.1/ +} + + -+struct dl_info *locate_dl_info(struct super_block *sb, tag_t tag) ++struct dl_info *locate_dl_info(struct super_block *sb, vtag_t tag) +{ + struct dl_info *dli; + @@ -18235,10 +17450,10 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/dlimit.c linux-3.9.4-vs2.3.6.1/ +EXPORT_SYMBOL_GPL(locate_dl_info); +EXPORT_SYMBOL_GPL(rcu_free_dl_info); + -diff -NurpP --minimal linux-3.9.4/kernel/vserver/helper.c linux-3.9.4-vs2.3.6.1/kernel/vserver/helper.c ---- linux-3.9.4/kernel/vserver/helper.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/vserver/helper.c 2013-05-31 14:47:11.000000000 +0000 -@@ -0,0 +1,229 @@ +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 +@@ -0,0 +1,242 @@ +/* + * linux/kernel/vserver/helper.c + * @@ -18261,17 +17476,29 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/helper.c linux-3.9.4-vs2.3.6.1/ + +static int vshelper_init(struct subprocess_info *info, struct cred *new_cred) +{ -+ current->flags &= ~PF_THREAD_BOUND; ++ current->flags &= ~PF_NO_SETAFFINITY; + return 0; +} + ++static int vs_call_usermodehelper(char *path, char **argv, char **envp, int wait) ++{ ++ struct subprocess_info *info; ++ gfp_t gfp_mask = (wait == UMH_NO_WAIT) ? GFP_ATOMIC : GFP_KERNEL; ++ ++ info = call_usermodehelper_setup(path, argv, envp, gfp_mask, ++ vshelper_init, NULL, NULL); ++ if (info == NULL) ++ return -ENOMEM; ++ ++ return call_usermodehelper_exec(info, wait); ++} ++ +static int do_vshelper(char *name, char *argv[], char *envp[], int sync) +{ + int ret; + -+ if ((ret = call_usermodehelper_fns(name, argv, envp, -+ sync ? UMH_WAIT_PROC : UMH_WAIT_EXEC, -+ vshelper_init, NULL, NULL))) { ++ if ((ret = vs_call_usermodehelper(name, argv, envp, ++ sync ? UMH_WAIT_PROC : UMH_WAIT_EXEC))) { + printk(KERN_WARNING "%s: (%s %s) returned %s with %d\n", + name, argv[1], argv[2], + sync ? "sync" : "async", ret); @@ -18312,7 +17539,8 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/helper.c linux-3.9.4-vs2.3.6.1/ + snprintf(id_buf, sizeof(id_buf), "%d", vxi->vx_id); + + snprintf(cmd_buf, sizeof(cmd_buf), "VS_CMD=%08x", cmd); -+ snprintf(uid_buf, sizeof(uid_buf), "VS_UID=%d", current_uid()); ++ snprintf(uid_buf, sizeof(uid_buf), "VS_UID=%d", ++ from_kuid(&init_user_ns, current_uid())); + snprintf(pid_buf, sizeof(pid_buf), "VS_PID=%d", current->pid); + + switch (cmd) { @@ -18468,9 +17696,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/helper.c linux-3.9.4-vs2.3.6.1/ + return do_vshelper(vshelper_path, argv, envp, 1); +} + -diff -NurpP --minimal linux-3.9.4/kernel/vserver/history.c linux-3.9.4-vs2.3.6.1/kernel/vserver/history.c ---- linux-3.9.4/kernel/vserver/history.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/vserver/history.c 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,258 @@ +/* + * kernel/vserver/history.c @@ -18730,9 +17958,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/history.c linux-3.9.4-vs2.3.6.1 + +#endif /* CONFIG_COMPAT */ + -diff -NurpP --minimal linux-3.9.4/kernel/vserver/inet.c linux-3.9.4-vs2.3.6.1/kernel/vserver/inet.c ---- linux-3.9.4/kernel/vserver/inet.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/vserver/inet.c 2013-05-31 22:43:05.000000000 +0000 +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 @@ -0,0 +1,236 @@ + +#include @@ -18970,9 +18198,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/inet.c linux-3.9.4-vs2.3.6.1/ke + +EXPORT_SYMBOL_GPL(ip_v4_find_src); + -diff -NurpP --minimal linux-3.9.4/kernel/vserver/init.c linux-3.9.4-vs2.3.6.1/kernel/vserver/init.c ---- linux-3.9.4/kernel/vserver/init.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/vserver/init.c 2013-05-31 14:47:11.000000000 +0000 +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 @@ +/* + * linux/kernel/init.c @@ -19019,10 +18247,10 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/init.c linux-3.9.4-vs2.3.6.1/ke +module_init(init_vserver); +module_exit(exit_vserver); + -diff -NurpP --minimal linux-3.9.4/kernel/vserver/inode.c linux-3.9.4-vs2.3.6.1/kernel/vserver/inode.c ---- linux-3.9.4/kernel/vserver/inode.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/vserver/inode.c 2013-05-31 14:47:11.000000000 +0000 -@@ -0,0 +1,437 @@ +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 +@@ -0,0 +1,440 @@ +/* + * linux/kernel/vserver/inode.c + * @@ -19043,12 +18271,15 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/inode.c linux-3.9.4-vs2.3.6.1/k +#include +#include +#include ++#include ++#include +#include +#include +#include +#include + +#include ++#include <../../fs/proc/internal.h> + + +static int __vc_get_iattr(struct inode *in, uint32_t *tag, uint32_t *flags, uint32_t *mask) @@ -19192,7 +18423,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/inode.c linux-3.9.4-vs2.3.6.1/k + + mutex_lock(&in->i_mutex); + if (*mask & IATTR_TAG) { -+ attr.ia_tag = *tag; ++ attr.ia_tag = make_ktag(&init_user_ns, *tag); + attr.ia_valid |= ATTR_TAG; + } + @@ -19364,7 +18595,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/inode.c linux-3.9.4-vs2.3.6.1/k + } +} + -+int dx_parse_tag(char *string, tag_t *tag, int remove, int *mnt_flags, ++int dx_parse_tag(char *string, vtag_t *tag, int remove, int *mnt_flags, + unsigned long *flags) +{ + int set = 0; @@ -19431,7 +18662,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/inode.c linux-3.9.4-vs2.3.6.1/k + +void __dx_propagate_tag(struct nameidata *nd, struct inode *inode) +{ -+ tag_t new_tag = 0; ++ vtag_t new_tag = 0; + struct vfsmount *mnt; + int propagate; + @@ -19460,9 +18691,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/inode.c linux-3.9.4-vs2.3.6.1/k + +#endif /* CONFIG_PROPAGATE */ + -diff -NurpP --minimal linux-3.9.4/kernel/vserver/limit.c linux-3.9.4-vs2.3.6.1/kernel/vserver/limit.c ---- linux-3.9.4/kernel/vserver/limit.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/vserver/limit.c 2013-05-31 14:47:11.000000000 +0000 +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 @@ +/* + * linux/kernel/vserver/limit.c @@ -19736,7 +18967,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/limit.c linux-3.9.4-vs2.3.6.1/k + res_limit = mem_cgroup_res_read_u64(mcg, RES_LIMIT); + res_usage = mem_cgroup_res_read_u64(mcg, RES_USAGE); + -+ if (res_limit != RESOURCE_MAX) ++ if (res_limit != RES_COUNTER_MAX) + val->totalram = (res_limit >> PAGE_SHIFT); + val->freeram = val->totalram - (res_usage >> PAGE_SHIFT); + val->bufferram = 0; @@ -19767,12 +18998,12 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/limit.c linux-3.9.4-vs2.3.6.1/k + memsw_usage = mem_cgroup_memsw_read_u64(mcg, RES_USAGE); + + /* memory unlimited */ -+ if (res_limit == RESOURCE_MAX) ++ if (res_limit == RES_COUNTER_MAX) + goto out; + + swap_limit = memsw_limit - res_limit; + /* we have a swap limit? */ -+ if (memsw_limit != RESOURCE_MAX) ++ if (memsw_limit != RES_COUNTER_MAX) + val->totalswap = swap_limit >> PAGE_SHIFT; + + /* calculate swap part */ @@ -19809,9 +19040,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/limit.c linux-3.9.4-vs2.3.6.1/k + return cache; +} + -diff -NurpP --minimal linux-3.9.4/kernel/vserver/limit_init.h linux-3.9.4-vs2.3.6.1/kernel/vserver/limit_init.h ---- linux-3.9.4/kernel/vserver/limit_init.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/vserver/limit_init.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,31 @@ + + @@ -19844,9 +19075,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/limit_init.h linux-3.9.4-vs2.3. + } +} + -diff -NurpP --minimal linux-3.9.4/kernel/vserver/limit_proc.h linux-3.9.4-vs2.3.6.1/kernel/vserver/limit_proc.h ---- linux-3.9.4/kernel/vserver/limit_proc.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/vserver/limit_proc.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,57 @@ +#ifndef _VX_LIMIT_PROC_H +#define _VX_LIMIT_PROC_H @@ -19905,9 +19136,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/limit_proc.h linux-3.9.4-vs2.3. +#endif /* _VX_LIMIT_PROC_H */ + + -diff -NurpP --minimal linux-3.9.4/kernel/vserver/network.c linux-3.9.4-vs2.3.6.1/kernel/vserver/network.c ---- linux-3.9.4/kernel/vserver/network.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/vserver/network.c 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,1053 @@ +/* + * linux/kernel/vserver/network.c @@ -20027,7 +19258,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/network.c linux-3.9.4-vs2.3.6.1 + * allocate an initialized nx_info struct + * doesn't make it visible (hash) */ + -+static struct nx_info *__alloc_nx_info(nid_t nid) ++static struct nx_info *__alloc_nx_info(vnid_t nid) +{ + struct nx_info *new = NULL; + @@ -20128,7 +19359,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/network.c linux-3.9.4-vs2.3.6.1 +static DEFINE_SPINLOCK(nx_info_hash_lock); + + -+static inline unsigned int __hashval(nid_t nid) ++static inline unsigned int __hashval(vnid_t nid) +{ + return (nid % NX_HASH_SIZE); +} @@ -20185,7 +19416,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/network.c linux-3.9.4-vs2.3.6.1 + * requires the hash_lock to be held + * doesn't increment the nx_refcnt */ + -+static inline struct nx_info *__lookup_nx_info(nid_t nid) ++static inline struct nx_info *__lookup_nx_info(vnid_t nid) +{ + struct hlist_head *head = &nx_info_hash[__hashval(nid)]; + struct hlist_node *pos; @@ -20285,7 +19516,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/network.c linux-3.9.4-vs2.3.6.1 + + * verify that nid is still hashed */ + -+int nid_is_hashed(nid_t nid) ++int nid_is_hashed(vnid_t nid) +{ + int hashed; + @@ -20429,7 +19660,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/network.c linux-3.9.4-vs2.3.6.1 + +int vc_task_nid(uint32_t id) +{ -+ nid_t nid; ++ vnid_t nid; + + if (id) { + struct task_struct *tsk; @@ -20962,10 +20193,10 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/network.c linux-3.9.4-vs2.3.6.1 +EXPORT_SYMBOL_GPL(free_nx_info); +EXPORT_SYMBOL_GPL(unhash_nx_info); + -diff -NurpP --minimal linux-3.9.4/kernel/vserver/proc.c linux-3.9.4-vs2.3.6.1/kernel/vserver/proc.c ---- linux-3.9.4/kernel/vserver/proc.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/vserver/proc.c 2013-05-31 14:47:11.000000000 +0000 -@@ -0,0 +1,1110 @@ +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 +@@ -0,0 +1,1100 @@ +/* + * linux/kernel/vserver/proc.c + * @@ -21008,6 +20239,8 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/proc.c linux-3.9.4-vs2.3.6.1/ke +#include "sched_proc.h" +#include "vci_config.h" + ++#include <../../fs/proc/internal.h> ++ + +static inline char *print_cap_t(char *buffer, kernel_cap_t *c) +{ @@ -21256,9 +20489,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/proc.c linux-3.9.4-vs2.3.6.1/ke + + inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME; + -+ inode->i_uid = 0; -+ inode->i_gid = 0; -+ inode->i_tag = 0; ++ i_uid_write(inode, 0); ++ i_gid_write(inode, 0); ++ i_tag_write(inode, 0); +out: + return inode; +} @@ -21283,7 +20516,8 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/proc.c linux-3.9.4-vs2.3.6.1/ke + +/* Lookups */ + -+typedef struct dentry *instantiate_t(struct inode *, struct dentry *, int, void *); ++typedef struct dentry *vx_instantiate_t(struct inode *, struct dentry *, int, void *); ++ + +/* + * Fill a directory entry. @@ -21293,12 +20527,12 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/proc.c linux-3.9.4-vs2.3.6.1/ke + * + * Since all of the proc inode numbers are dynamically generated, the inode + * numbers do not exist until the inode is cache. This means creating the -+ * the dcache entry in readdir is necessary to keep the inode numbers -+ * reported by readdir in sync with the inode numbers reported ++ * the dcache entry in iterate is necessary to keep the inode numbers ++ * reported by iterate in sync with the inode numbers reported + * by stat. + */ -+static int proc_fill_cache(struct file *filp, void *dirent, filldir_t filldir, -+ char *name, int len, instantiate_t instantiate, int id, void *ptr) ++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 inode *inode; @@ -21332,10 +20566,8 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/proc.c linux-3.9.4-vs2.3.6.1/ke + dput(child); +end_instantiate: + if (!ino) -+ ino = find_inode_number(dir, &qname); -+ if (!ino) + ino = 1; -+ return filldir(dirent, name, len, filp->f_pos, ino, type); ++ return !dir_emit(ctx, name, len, ino, type); +} + + @@ -21351,7 +20583,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/proc.c linux-3.9.4-vs2.3.6.1/ke +static int proc_xid_revalidate(struct dentry *dentry, unsigned int flags) +{ + struct inode *inode = dentry->d_inode; -+ xid_t xid = PROC_I(inode)->fd; ++ vxid_t xid = PROC_I(inode)->fd; + + if (flags & LOOKUP_RCU) /* FIXME: can be dropped? */ + return -ECHILD; @@ -21368,7 +20600,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/proc.c linux-3.9.4-vs2.3.6.1/ke +static int proc_nid_revalidate(struct dentry *dentry, unsigned int flags) +{ + struct inode *inode = dentry->d_inode; -+ nid_t nid = PROC_I(inode)->fd; ++ vnid_t nid = PROC_I(inode)->fd; + + if (flags & LOOKUP_RCU) /* FIXME: can be dropped? */ + return -ECHILD; @@ -21415,7 +20647,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/proc.c linux-3.9.4-vs2.3.6.1/ke +{ + struct inode *inode = file->f_dentry->d_inode; + struct vx_info *vxi = NULL; -+ xid_t xid = PROC_I(inode)->fd; ++ vxid_t xid = PROC_I(inode)->fd; + unsigned long page; + ssize_t length = 0; + @@ -21451,7 +20683,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/proc.c linux-3.9.4-vs2.3.6.1/ke +{ + struct inode *inode = file->f_dentry->d_inode; + struct nx_info *nxi = NULL; -+ nid_t nid = PROC_I(inode)->fd; ++ vnid_t nid = PROC_I(inode)->fd; + unsigned long page; + ssize_t length = 0; + @@ -21572,43 +20804,40 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/proc.c linux-3.9.4-vs2.3.6.1/ke + return error; +} + -+static int proc_xid_readdir(struct file *filp, -+ void *dirent, filldir_t filldir) ++static int proc_xid_iterate(struct file *filp, struct dir_context *ctx) +{ + struct dentry *dentry = filp->f_dentry; + struct inode *inode = dentry->d_inode; + struct vs_entry *p = vx_base_stuff; + int size = sizeof(vx_base_stuff) / sizeof(struct vs_entry); -+ int pos, index; ++ int index; + u64 ino; + -+ pos = filp->f_pos; -+ switch (pos) { ++ switch (ctx->pos) { + case 0: + ino = inode->i_ino; -+ if (filldir(dirent, ".", 1, pos, ino, DT_DIR) < 0) ++ if (!dir_emit(ctx, ".", 1, ino, DT_DIR) < 0) + goto out; -+ pos++; ++ ctx->pos++; + /* fall through */ + case 1: + ino = parent_ino(dentry); -+ if (filldir(dirent, "..", 2, pos, ino, DT_DIR) < 0) ++ if (!dir_emit(ctx, "..", 2, ino, DT_DIR) < 0) + goto out; -+ pos++; ++ ctx->pos++; + /* fall through */ + default: -+ index = pos - 2; ++ index = ctx->pos - 2; + if (index >= size) + goto out; + for (p += index; p->name; p++) { -+ if (proc_fill_cache(filp, dirent, filldir, p->name, p->len, ++ if (vx_proc_fill_cache(filp, ctx, p->name, p->len, + vs_proc_instantiate, PROC_I(inode)->fd, p)) + goto out; -+ pos++; ++ ctx->pos++; + } + } +out: -+ filp->f_pos = pos; + return 1; +} + @@ -21656,43 +20885,40 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/proc.c linux-3.9.4-vs2.3.6.1/ke + return error; +} + -+static int proc_nid_readdir(struct file *filp, -+ void *dirent, filldir_t filldir) ++static int proc_nid_iterate(struct file *filp, struct dir_context *ctx) +{ + struct dentry *dentry = filp->f_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 pos, index; ++ int index; + u64 ino; + -+ pos = filp->f_pos; -+ switch (pos) { ++ switch (ctx->pos) { + case 0: + ino = inode->i_ino; -+ if (filldir(dirent, ".", 1, pos, ino, DT_DIR) < 0) ++ if (!dir_emit(ctx, ".", 1, ino, DT_DIR) < 0) + goto out; -+ pos++; ++ ctx->pos++; + /* fall through */ + case 1: + ino = parent_ino(dentry); -+ if (filldir(dirent, "..", 2, pos, ino, DT_DIR) < 0) ++ if (!dir_emit(ctx, "..", 2, ino, DT_DIR) < 0) + goto out; -+ pos++; ++ ctx->pos++; + /* fall through */ + default: -+ index = pos - 2; ++ index = ctx->pos - 2; + if (index >= size) + goto out; + for (p += index; p->name; p++) { -+ if (proc_fill_cache(filp, dirent, filldir, p->name, p->len, ++ if (vx_proc_fill_cache(filp, ctx, p->name, p->len, + vs_proc_instantiate, PROC_I(inode)->fd, p)) + goto out; -+ pos++; ++ ctx->pos++; + } + } +out: -+ filp->f_pos = pos; + return 1; +} + @@ -21724,7 +20950,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/proc.c linux-3.9.4-vs2.3.6.1/ke + +static struct file_operations proc_xid_file_operations = { + .read = generic_read_dir, -+ .readdir = proc_xid_readdir, ++ .iterate = proc_xid_iterate, +}; + +static struct inode_operations proc_xid_inode_operations = { @@ -21766,7 +20992,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/proc.c linux-3.9.4-vs2.3.6.1/ke + +static struct file_operations proc_nid_file_operations = { + .read = generic_read_dir, -+ .readdir = proc_nid_readdir, ++ .iterate = proc_nid_iterate, +}; + +static struct inode_operations proc_nid_inode_operations = { @@ -21809,45 +21035,43 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/proc.c linux-3.9.4-vs2.3.6.1/ke + +#define PROC_MAXVIDS 32 + -+int proc_virtual_readdir(struct file *filp, -+ void *dirent, filldir_t filldir) ++int proc_virtual_iterate(struct file *filp, struct dir_context *ctx) +{ + struct dentry *dentry = filp->f_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 pos, index; ++ int index; + unsigned int xid_array[PROC_MAXVIDS]; + char buf[PROC_NUMBUF]; + unsigned int nr_xids, i; + u64 ino; + -+ pos = filp->f_pos; -+ switch (pos) { ++ switch (ctx->pos) { + case 0: + ino = inode->i_ino; -+ if (filldir(dirent, ".", 1, pos, ino, DT_DIR) < 0) ++ if (!dir_emit(ctx, ".", 1, ino, DT_DIR) < 0) + goto out; -+ pos++; ++ ctx->pos++; + /* fall through */ + case 1: + ino = parent_ino(dentry); -+ if (filldir(dirent, "..", 2, pos, ino, DT_DIR) < 0) ++ if (!dir_emit(ctx, "..", 2, ino, DT_DIR) < 0) + goto out; -+ pos++; ++ ctx->pos++; + /* fall through */ + default: -+ index = pos - 2; ++ index = ctx->pos - 2; + if (index >= size) + goto entries; + for (p += index; p->name; p++) { -+ if (proc_fill_cache(filp, dirent, filldir, p->name, p->len, ++ if (vx_proc_fill_cache(filp, ctx, p->name, p->len, + vs_proc_instantiate, 0, p)) + goto out; -+ pos++; ++ ctx->pos++; + } + entries: -+ index = pos - size; ++ index = ctx->pos - size; + p = &vx_virtual_stuff[size - 1]; + nr_xids = get_xid_list(index, xid_array, PROC_MAXVIDS); + for (i = 0; i < nr_xids; i++) { @@ -21859,15 +21083,14 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/proc.c linux-3.9.4-vs2.3.6.1/ke + buf[--j] = '0' + (n % 10); + while (n /= 10); + -+ if (proc_fill_cache(filp, dirent, filldir, ++ if (vx_proc_fill_cache(filp, ctx, + buf + j, PROC_NUMBUF - j, + vs_proc_instantiate, xid, p)) + goto out; -+ pos++; ++ ctx->pos++; + } + } +out: -+ filp->f_pos = pos; + return 0; +} + @@ -21883,7 +21106,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/proc.c linux-3.9.4-vs2.3.6.1/ke + +static struct file_operations proc_virtual_dir_operations = { + .read = generic_read_dir, -+ .readdir = proc_virtual_readdir, ++ .iterate = proc_virtual_iterate, +}; + +static struct inode_operations proc_virtual_dir_inode_operations = { @@ -21893,47 +21116,43 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/proc.c linux-3.9.4-vs2.3.6.1/ke + + + -+ -+ -+int proc_virtnet_readdir(struct file *filp, -+ void *dirent, filldir_t filldir) ++int proc_virtnet_iterate(struct file *filp, struct dir_context *ctx) +{ + struct dentry *dentry = filp->f_dentry; + struct inode *inode = dentry->d_inode; + struct vs_entry *p = nx_virtnet_stuff; + int size = sizeof(nx_virtnet_stuff) / sizeof(struct vs_entry); -+ int pos, index; ++ int index; + unsigned int nid_array[PROC_MAXVIDS]; + char buf[PROC_NUMBUF]; + unsigned int nr_nids, i; + u64 ino; + -+ pos = filp->f_pos; -+ switch (pos) { ++ switch (ctx->pos) { + case 0: + ino = inode->i_ino; -+ if (filldir(dirent, ".", 1, pos, ino, DT_DIR) < 0) ++ if (!dir_emit(ctx, ".", 1, ino, DT_DIR) < 0) + goto out; -+ pos++; ++ ctx->pos++; + /* fall through */ + case 1: + ino = parent_ino(dentry); -+ if (filldir(dirent, "..", 2, pos, ino, DT_DIR) < 0) ++ if (!dir_emit(ctx, "..", 2, ino, DT_DIR) < 0) + goto out; -+ pos++; ++ ctx->pos++; + /* fall through */ + default: -+ index = pos - 2; ++ index = ctx->pos - 2; + if (index >= size) + goto entries; + for (p += index; p->name; p++) { -+ if (proc_fill_cache(filp, dirent, filldir, p->name, p->len, ++ if (vx_proc_fill_cache(filp, ctx, p->name, p->len, + vs_proc_instantiate, 0, p)) + goto out; -+ pos++; ++ ctx->pos++; + } + entries: -+ index = pos - size; ++ index = ctx->pos - size; + p = &nx_virtnet_stuff[size - 1]; + nr_nids = get_nid_list(index, nid_array, PROC_MAXVIDS); + for (i = 0; i < nr_nids; i++) { @@ -21945,15 +21164,14 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/proc.c linux-3.9.4-vs2.3.6.1/ke + buf[--j] = '0' + (n % 10); + while (n /= 10); + -+ if (proc_fill_cache(filp, dirent, filldir, ++ if (vx_proc_fill_cache(filp, ctx, + buf + j, PROC_NUMBUF - j, + vs_proc_instantiate, nid, p)) + goto out; -+ pos++; ++ ctx->pos++; + } + } +out: -+ filp->f_pos = pos; + return 0; +} + @@ -21969,7 +21187,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/proc.c linux-3.9.4-vs2.3.6.1/ke + +static struct file_operations proc_virtnet_dir_operations = { + .read = generic_read_dir, -+ .readdir = proc_virtnet_readdir, ++ .iterate = proc_virtnet_iterate, +}; + +static struct inode_operations proc_virtnet_dir_inode_operations = { @@ -22003,82 +21221,85 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/proc.c linux-3.9.4-vs2.3.6.1/ke + +/* per pid info */ + ++void render_cap_t(struct seq_file *, const char *, ++ struct vx_info *, kernel_cap_t *); ++ + -+int proc_pid_vx_info(struct task_struct *p, char *buffer) ++int proc_pid_vx_info( ++ struct seq_file *m, ++ struct pid_namespace *ns, ++ struct pid *pid, ++ struct task_struct *p) +{ + struct vx_info *vxi; -+ char *orig = buffer; + -+ buffer += sprintf(buffer, "XID:\t%d\n", vx_task_xid(p)); ++ seq_printf(m, "XID:\t%d\n", vx_task_xid(p)); + + vxi = task_get_vx_info(p); + if (!vxi) -+ goto out; ++ return 0; + -+ buffer += sprintf(buffer, "BCaps:\t"); -+ buffer = print_cap_t(buffer, &vxi->vx_bcaps); -+ buffer += sprintf(buffer, "\n"); -+ buffer += sprintf(buffer, "CCaps:\t%016llx\n", ++ render_cap_t(m, "BCaps:\t", vxi, &vxi->vx_bcaps); ++ seq_printf(m, "CCaps:\t%016llx\n", + (unsigned long long)vxi->vx_ccaps); -+ buffer += sprintf(buffer, "CFlags:\t%016llx\n", ++ seq_printf(m, "CFlags:\t%016llx\n", + (unsigned long long)vxi->vx_flags); -+ buffer += sprintf(buffer, "CIPid:\t%d\n", vxi->vx_initpid); ++ seq_printf(m, "CIPid:\t%d\n", vxi->vx_initpid); + + put_vx_info(vxi); -+out: -+ return buffer - orig; ++ return 0; +} + + -+int proc_pid_nx_info(struct task_struct *p, char *buffer) ++int proc_pid_nx_info( ++ struct seq_file *m, ++ struct pid_namespace *ns, ++ struct pid *pid, ++ struct task_struct *p) +{ + struct nx_info *nxi; + struct nx_addr_v4 *v4a; +#ifdef CONFIG_IPV6 + struct nx_addr_v6 *v6a; +#endif -+ char *orig = buffer; + int i; + -+ buffer += sprintf(buffer, "NID:\t%d\n", nx_task_nid(p)); ++ seq_printf(m, "NID:\t%d\n", nx_task_nid(p)); + + nxi = task_get_nx_info(p); + if (!nxi) -+ goto out; ++ return 0; + -+ buffer += sprintf(buffer, "NCaps:\t%016llx\n", ++ seq_printf(m, "NCaps:\t%016llx\n", + (unsigned long long)nxi->nx_ncaps); -+ buffer += sprintf(buffer, "NFlags:\t%016llx\n", ++ seq_printf(m, "NFlags:\t%016llx\n", + (unsigned long long)nxi->nx_flags); + -+ buffer += sprintf(buffer, -+ "V4Root[bcast]:\t" NIPQUAD_FMT "\n", ++ seq_printf(m, "V4Root[bcast]:\t" NIPQUAD_FMT "\n", + NIPQUAD(nxi->v4_bcast.s_addr)); -+ buffer += sprintf (buffer, -+ "V4Root[lback]:\t" NIPQUAD_FMT "\n", ++ seq_printf(m, "V4Root[lback]:\t" NIPQUAD_FMT "\n", + NIPQUAD(nxi->v4_lback.s_addr)); + if (!NX_IPV4(nxi)) + goto skip_v4; + for (i = 0, v4a = &nxi->v4; v4a; i++, v4a = v4a->next) -+ buffer += sprintf(buffer, "V4Root[%d]:\t" NXAV4_FMT "\n", ++ seq_printf(m, "V4Root[%d]:\t" NXAV4_FMT "\n", + i, NXAV4(v4a)); +skip_v4: +#ifdef CONFIG_IPV6 + if (!NX_IPV6(nxi)) + goto skip_v6; + for (i = 0, v6a = &nxi->v6; v6a; i++, v6a = v6a->next) -+ buffer += sprintf(buffer, "V6Root[%d]:\t" NXAV6_FMT "\n", ++ seq_printf(m, "V6Root[%d]:\t" NXAV6_FMT "\n", + i, NXAV6(v6a)); +skip_v6: +#endif + put_nx_info(nxi); -+out: -+ return buffer - orig; ++ return 0; +} + -diff -NurpP --minimal linux-3.9.4/kernel/vserver/sched.c linux-3.9.4-vs2.3.6.1/kernel/vserver/sched.c ---- linux-3.9.4/kernel/vserver/sched.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/vserver/sched.c 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,83 @@ +/* + * linux/kernel/vserver/sched.c @@ -22163,9 +21384,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/sched.c linux-3.9.4-vs2.3.6.1/k + return 0; +} + -diff -NurpP --minimal linux-3.9.4/kernel/vserver/sched_init.h linux-3.9.4-vs2.3.6.1/kernel/vserver/sched_init.h ---- linux-3.9.4/kernel/vserver/sched_init.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/vserver/sched_init.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,27 @@ + +static inline void vx_info_init_sched(struct _vx_sched *sched) @@ -22194,9 +21415,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/sched_init.h linux-3.9.4-vs2.3. +{ + return; +} -diff -NurpP --minimal linux-3.9.4/kernel/vserver/sched_proc.h linux-3.9.4-vs2.3.6.1/kernel/vserver/sched_proc.h ---- linux-3.9.4/kernel/vserver/sched_proc.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/vserver/sched_proc.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,32 @@ +#ifndef _VX_SCHED_PROC_H +#define _VX_SCHED_PROC_H @@ -22230,9 +21451,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/sched_proc.h linux-3.9.4-vs2.3. +} + +#endif /* _VX_SCHED_PROC_H */ -diff -NurpP --minimal linux-3.9.4/kernel/vserver/signal.c linux-3.9.4-vs2.3.6.1/kernel/vserver/signal.c ---- linux-3.9.4/kernel/vserver/signal.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/vserver/signal.c 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,134 @@ +/* + * linux/kernel/vserver/signal.c @@ -22368,9 +21589,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/signal.c linux-3.9.4-vs2.3.6.1/ + return ret; +} + -diff -NurpP --minimal linux-3.9.4/kernel/vserver/space.c linux-3.9.4-vs2.3.6.1/kernel/vserver/space.c ---- linux-3.9.4/kernel/vserver/space.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/vserver/space.c 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,436 @@ +/* + * linux/kernel/vserver/space.c @@ -22462,7 +21683,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/space.c linux-3.9.4-vs2.3.6.1/k + CLONE_NEWIPC | +#endif +#ifdef CONFIG_USER_NS -+ CLONE_NEWUSER | ++// CLONE_NEWUSER | +#endif +#ifdef CONFIG_PID_NS +// CLONE_NEWPID | @@ -22521,10 +21742,10 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/space.c linux-3.9.4-vs2.3.6.1/k + +#ifdef CONFIG_PID_NS + if (mask & CLONE_NEWPID) { -+ old_pid = nsproxy->pid_ns; -+ nsproxy->pid_ns = new_nsproxy->pid_ns; -+ if (nsproxy->pid_ns) -+ get_pid_ns(nsproxy->pid_ns); ++ old_pid = nsproxy->pid_ns_for_children; ++ nsproxy->pid_ns_for_children = new_nsproxy->pid_ns_for_children; ++ if (nsproxy->pid_ns_for_children) ++ get_pid_ns(nsproxy->pid_ns_for_children); + } else + old_pid = NULL; +#endif @@ -22808,9 +22029,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/space.c linux-3.9.4-vs2.3.6.1/k + return 0; +} + -diff -NurpP --minimal linux-3.9.4/kernel/vserver/switch.c linux-3.9.4-vs2.3.6.1/kernel/vserver/switch.c ---- linux-3.9.4/kernel/vserver/switch.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/vserver/switch.c 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,556 @@ +/* + * linux/kernel/vserver/switch.c @@ -23368,9 +22589,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/switch.c linux-3.9.4-vs2.3.6.1/ +} + +#endif /* CONFIG_COMPAT */ -diff -NurpP --minimal linux-3.9.4/kernel/vserver/sysctl.c linux-3.9.4-vs2.3.6.1/kernel/vserver/sysctl.c ---- linux-3.9.4/kernel/vserver/sysctl.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/vserver/sysctl.c 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,247 @@ +/* + * kernel/vserver/sysctl.c @@ -23423,7 +22644,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/sysctl.c linux-3.9.4-vs2.3.6.1/ + + +static struct ctl_table_header *vserver_table_header; -+static ctl_table vserver_root_table[]; ++static struct ctl_table vserver_root_table[]; + + +void vserver_register_sysctl(void) @@ -23443,7 +22664,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/sysctl.c linux-3.9.4-vs2.3.6.1/ +} + + -+static int proc_dodebug(ctl_table *table, int write, ++static int proc_dodebug(struct ctl_table *table, int write, + void __user *buffer, size_t *lenp, loff_t *ppos) +{ + char tmpbuf[20], *p, c; @@ -23513,7 +22734,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/sysctl.c linux-3.9.4-vs2.3.6.1/ + .extra2 = &zero, \ + } + -+static ctl_table vserver_debug_table[] = { ++static struct ctl_table vserver_debug_table[] = { + CTL_ENTRY(CTL_DEBUG_SWITCH, debug_switch), + CTL_ENTRY(CTL_DEBUG_XID, debug_xid), + CTL_ENTRY(CTL_DEBUG_NID, debug_nid), @@ -23530,7 +22751,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/sysctl.c linux-3.9.4-vs2.3.6.1/ + { 0 } +}; + -+static ctl_table vserver_root_table[] = { ++static struct ctl_table vserver_root_table[] = { + { + .procname = "vserver", + .mode = 0555, @@ -23619,9 +22840,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/sysctl.c linux-3.9.4-vs2.3.6.1/ +EXPORT_SYMBOL_GPL(vs_debug_perm); +EXPORT_SYMBOL_GPL(vs_debug_misc); + -diff -NurpP --minimal linux-3.9.4/kernel/vserver/tag.c linux-3.9.4-vs2.3.6.1/kernel/vserver/tag.c ---- linux-3.9.4/kernel/vserver/tag.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/vserver/tag.c 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,63 @@ +/* + * linux/kernel/vserver/tag.c @@ -23642,7 +22863,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/tag.c linux-3.9.4-vs2.3.6.1/ker +#include + + -+int dx_migrate_task(struct task_struct *p, tag_t tag) ++int dx_migrate_task(struct task_struct *p, vtag_t tag) +{ + if (!p) + BUG(); @@ -23666,7 +22887,7 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/tag.c linux-3.9.4-vs2.3.6.1/ker + +int vc_task_tag(uint32_t id) +{ -+ tag_t tag; ++ vtag_t tag; + + if (id) { + struct task_struct *tsk; @@ -23686,9 +22907,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/tag.c linux-3.9.4-vs2.3.6.1/ker +} + + -diff -NurpP --minimal linux-3.9.4/kernel/vserver/vci_config.h linux-3.9.4-vs2.3.6.1/kernel/vserver/vci_config.h ---- linux-3.9.4/kernel/vserver/vci_config.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/kernel/vserver/vci_config.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,80 @@ + +/* interface version */ @@ -23770,11 +22991,11 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/vci_config.h linux-3.9.4-vs2.3. + 0; +} + -diff -NurpP --minimal linux-3.9.4/mm/memcontrol.c linux-3.9.4-vs2.3.6.1/mm/memcontrol.c ---- linux-3.9.4/mm/memcontrol.c 2013-05-31 13:45:31.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/mm/memcontrol.c 2013-05-31 14:47:11.000000000 +0000 -@@ -1046,6 +1046,31 @@ struct mem_cgroup *mem_cgroup_from_task( - return mem_cgroup_from_css(task_subsys_state(p, mem_cgroup_subsys_id)); +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); } +u64 mem_cgroup_res_read_u64(struct mem_cgroup *mem, int member) @@ -23802,12 +23023,12 @@ diff -NurpP --minimal linux-3.9.4/mm/memcontrol.c linux-3.9.4-vs2.3.6.1/mm/memco + return mem_cgroup_read_stat(mem, MEM_CGROUP_STAT_FILE_MAPPED); +} + - struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm) - { - struct mem_cgroup *memcg = NULL; -diff -NurpP --minimal linux-3.9.4/mm/oom_kill.c linux-3.9.4-vs2.3.6.1/mm/oom_kill.c ---- linux-3.9.4/mm/oom_kill.c 2013-05-31 13:45:31.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/mm/oom_kill.c 2013-05-31 14:47:11.000000000 +0000 + /* + * 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 @@ -35,6 +35,8 @@ #include #include @@ -23817,7 +23038,7 @@ diff -NurpP --minimal linux-3.9.4/mm/oom_kill.c linux-3.9.4-vs2.3.6.1/mm/oom_kil #define CREATE_TRACE_POINTS #include -@@ -113,11 +115,18 @@ struct task_struct *find_lock_task_mm(st +@@ -121,11 +123,18 @@ found: static bool oom_unkillable_task(struct task_struct *p, const struct mem_cgroup *memcg, const nodemask_t *nodemask) { @@ -23837,7 +23058,7 @@ diff -NurpP --minimal linux-3.9.4/mm/oom_kill.c linux-3.9.4-vs2.3.6.1/mm/oom_kil /* When mem_cgroup_out_of_memory() and p is not member of the group */ if (memcg && !task_in_mem_cgroup(p, memcg)) return true; -@@ -426,8 +435,8 @@ void oom_kill_process(struct task_struct +@@ -453,8 +462,8 @@ void oom_kill_process(struct task_struct dump_header(p, gfp_mask, order, memcg, nodemask); task_lock(p); @@ -23848,7 +23069,7 @@ diff -NurpP --minimal linux-3.9.4/mm/oom_kill.c linux-3.9.4-vs2.3.6.1/mm/oom_kil task_unlock(p); /* -@@ -472,8 +481,8 @@ void oom_kill_process(struct task_struct +@@ -497,8 +506,8 @@ void oom_kill_process(struct task_struct /* mm cannot safely be dereferenced after task_unlock(victim) */ mm = victim->mm; @@ -23859,7 +23080,7 @@ diff -NurpP --minimal linux-3.9.4/mm/oom_kill.c linux-3.9.4-vs2.3.6.1/mm/oom_kil K(get_mm_counter(victim->mm, MM_ANONPAGES)), K(get_mm_counter(victim->mm, MM_FILEPAGES))); task_unlock(victim); -@@ -543,6 +552,8 @@ int unregister_oom_notifier(struct notif +@@ -569,6 +578,8 @@ int unregister_oom_notifier(struct notif } EXPORT_SYMBOL_GPL(unregister_oom_notifier); @@ -23868,7 +23089,7 @@ diff -NurpP --minimal linux-3.9.4/mm/oom_kill.c linux-3.9.4-vs2.3.6.1/mm/oom_kil /* * 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 -@@ -655,7 +666,12 @@ void out_of_memory(struct zonelist *zone +@@ -677,7 +688,12 @@ void out_of_memory(struct zonelist *zone /* Found nothing?!?! Either we hang forever, or we panic. */ if (!p) { dump_header(NULL, gfp_mask, order, NULL, mpol_mask); @@ -23880,21 +23101,21 @@ diff -NurpP --minimal linux-3.9.4/mm/oom_kill.c linux-3.9.4-vs2.3.6.1/mm/oom_kil + else + panic("Out of memory and no killable processes...\n"); } - if (PTR_ERR(p) != -1UL) { + if (p != (void *)-1UL) { oom_kill_process(p, gfp_mask, order, points, totalpages, NULL, -diff -NurpP --minimal linux-3.9.4/mm/page_alloc.c linux-3.9.4-vs2.3.6.1/mm/page_alloc.c ---- linux-3.9.4/mm/page_alloc.c 2013-05-31 13:45:31.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/mm/page_alloc.c 2013-05-31 15:08:50.000000000 +0000 +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 #include + #include #include +#include +#include + #include #include - #include -@@ -2873,6 +2875,9 @@ void si_meminfo(struct sysinfo *val) +@@ -3096,6 +3098,9 @@ void si_meminfo(struct sysinfo *val) val->totalhigh = totalhigh_pages; val->freehigh = nr_free_highpages(); val->mem_unit = PAGE_SIZE; @@ -23904,7 +23125,7 @@ diff -NurpP --minimal linux-3.9.4/mm/page_alloc.c linux-3.9.4-vs2.3.6.1/mm/page_ } EXPORT_SYMBOL(si_meminfo); -@@ -2893,6 +2898,9 @@ void si_meminfo_node(struct sysinfo *val +@@ -3121,6 +3126,9 @@ void si_meminfo_node(struct sysinfo *val val->freehigh = 0; #endif val->mem_unit = PAGE_SIZE; @@ -23914,9 +23135,9 @@ diff -NurpP --minimal linux-3.9.4/mm/page_alloc.c linux-3.9.4-vs2.3.6.1/mm/page_ } #endif -diff -NurpP --minimal linux-3.9.4/mm/pgtable-generic.c linux-3.9.4-vs2.3.6.1/mm/pgtable-generic.c ---- linux-3.9.4/mm/pgtable-generic.c 2013-02-19 13:58:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/mm/pgtable-generic.c 2013-05-31 14:47:11.000000000 +0000 +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 @@ -6,6 +6,8 @@ * Copyright (C) 2010 Linus Torvalds */ @@ -23926,10 +23147,10 @@ diff -NurpP --minimal linux-3.9.4/mm/pgtable-generic.c linux-3.9.4-vs2.3.6.1/mm/ #include #include #include -diff -NurpP --minimal linux-3.9.4/mm/shmem.c linux-3.9.4-vs2.3.6.1/mm/shmem.c ---- linux-3.9.4/mm/shmem.c 2013-05-31 13:45:31.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/mm/shmem.c 2013-05-31 14:47:11.000000000 +0000 -@@ -1909,7 +1909,7 @@ static int shmem_statfs(struct dentry *d +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 { struct shmem_sb_info *sbinfo = SHMEM_SB(dentry->d_sb); @@ -23938,7 +23159,7 @@ diff -NurpP --minimal linux-3.9.4/mm/shmem.c linux-3.9.4-vs2.3.6.1/mm/shmem.c buf->f_bsize = PAGE_CACHE_SIZE; buf->f_namelen = NAME_MAX; if (sbinfo->max_blocks) { -@@ -2606,7 +2606,7 @@ int shmem_fill_super(struct super_block +@@ -3036,7 +3036,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; @@ -23947,10 +23168,10 @@ diff -NurpP --minimal linux-3.9.4/mm/shmem.c linux-3.9.4-vs2.3.6.1/mm/shmem.c sb->s_op = &shmem_ops; sb->s_time_gran = 1; #ifdef CONFIG_TMPFS_XATTR -diff -NurpP --minimal linux-3.9.4/mm/slab.c linux-3.9.4-vs2.3.6.1/mm/slab.c ---- linux-3.9.4/mm/slab.c 2013-05-31 13:45:31.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/mm/slab.c 2013-05-31 14:47:11.000000000 +0000 -@@ -429,6 +429,8 @@ static void kmem_list3_init(struct kmem_ +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 #define STATS_INC_FREEMISS(x) do { } while (0) #endif @@ -23959,15 +23180,7 @@ diff -NurpP --minimal linux-3.9.4/mm/slab.c linux-3.9.4-vs2.3.6.1/mm/slab.c #if DEBUG /* -@@ -3438,6 +3440,7 @@ retry: - - obj = slab_get_obj(cachep, slabp, nodeid); - check_slabp(cachep, slabp); -+ vx_slab_alloc(cachep, flags); - l3->free_objects--; - /* move slabp to correct slabp list: */ - list_del(&slabp->list); -@@ -3517,6 +3520,7 @@ slab_alloc_node(struct kmem_cache *cache +@@ -3168,6 +3170,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: @@ -23975,7 +23188,7 @@ diff -NurpP --minimal linux-3.9.4/mm/slab.c linux-3.9.4-vs2.3.6.1/mm/slab.c local_irq_restore(save_flags); ptr = cache_alloc_debugcheck_after(cachep, flags, ptr, caller); kmemleak_alloc_recursive(ptr, cachep->object_size, 1, cachep->flags, -@@ -3709,6 +3713,7 @@ static inline void __cache_free(struct k +@@ -3354,6 +3357,7 @@ static inline void __cache_free(struct k check_irq_off(); kmemleak_free_recursive(objp, cachep->flags); objp = cache_free_debugcheck(cachep, objp, caller); @@ -23983,9 +23196,9 @@ diff -NurpP --minimal linux-3.9.4/mm/slab.c linux-3.9.4-vs2.3.6.1/mm/slab.c kmemcheck_slab_free(cachep, objp, cachep->object_size); -diff -NurpP --minimal linux-3.9.4/mm/slab_vs.h linux-3.9.4-vs2.3.6.1/mm/slab_vs.h ---- linux-3.9.4/mm/slab_vs.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/mm/slab_vs.h 2013-05-31 14:47:11.000000000 +0000 +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 @@ -0,0 +1,29 @@ + +#include @@ -24016,9 +23229,9 @@ diff -NurpP --minimal linux-3.9.4/mm/slab_vs.h linux-3.9.4-vs2.3.6.1/mm/slab_vs. + atomic_sub(cachep->size, &vxi->cacct.slab[what]); +} + -diff -NurpP --minimal linux-3.9.4/mm/swapfile.c linux-3.9.4-vs2.3.6.1/mm/swapfile.c ---- linux-3.9.4/mm/swapfile.c 2013-05-31 13:45:31.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/mm/swapfile.c 2013-05-31 14:47:11.000000000 +0000 +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 @@ -39,6 +39,7 @@ #include #include @@ -24027,7 +23240,7 @@ diff -NurpP --minimal linux-3.9.4/mm/swapfile.c linux-3.9.4-vs2.3.6.1/mm/swapfil static bool swap_count_continued(struct swap_info_struct *, pgoff_t, unsigned char); -@@ -1767,6 +1768,16 @@ static int swap_show(struct seq_file *sw +@@ -2028,6 +2029,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"); @@ -24044,7 +23257,7 @@ diff -NurpP --minimal linux-3.9.4/mm/swapfile.c linux-3.9.4-vs2.3.6.1/mm/swapfil return 0; } -@@ -2195,6 +2206,8 @@ void si_swapinfo(struct sysinfo *val) +@@ -2576,6 +2587,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); @@ -24053,10 +23266,10 @@ diff -NurpP --minimal linux-3.9.4/mm/swapfile.c linux-3.9.4-vs2.3.6.1/mm/swapfil } /* -diff -NurpP --minimal linux-3.9.4/net/bridge/br_multicast.c linux-3.9.4-vs2.3.6.1/net/bridge/br_multicast.c ---- linux-3.9.4/net/bridge/br_multicast.c 2013-05-31 13:45:31.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/net/bridge/br_multicast.c 2013-05-31 17:17:53.000000000 +0000 -@@ -443,7 +443,7 @@ static struct sk_buff *br_ip6_multicast_ +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_ 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, @@ -24065,9 +23278,9 @@ diff -NurpP --minimal linux-3.9.4/net/bridge/br_multicast.c linux-3.9.4-vs2.3.6. kfree_skb(skb); return NULL; } -diff -NurpP --minimal linux-3.9.4/net/core/dev.c linux-3.9.4-vs2.3.6.1/net/core/dev.c ---- linux-3.9.4/net/core/dev.c 2013-05-31 14:22:27.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/net/core/dev.c 2013-05-31 18:37:38.000000000 +0000 +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 @@ #include #include @@ -24076,7 +23289,7 @@ diff -NurpP --minimal linux-3.9.4/net/core/dev.c linux-3.9.4-vs2.3.6.1/net/core/ #include #include #include -@@ -662,7 +663,8 @@ struct net_device *__dev_get_by_name(str +@@ -674,7 +675,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) @@ -24086,7 +23299,7 @@ diff -NurpP --minimal linux-3.9.4/net/core/dev.c linux-3.9.4-vs2.3.6.1/net/core/ return dev; return NULL; -@@ -687,7 +689,8 @@ struct net_device *dev_get_by_name_rcu(s +@@ -699,7 +701,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) @@ -24096,7 +23309,7 @@ diff -NurpP --minimal linux-3.9.4/net/core/dev.c linux-3.9.4-vs2.3.6.1/net/core/ return dev; return NULL; -@@ -737,7 +740,8 @@ struct net_device *__dev_get_by_index(st +@@ -749,7 +752,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) @@ -24106,7 +23319,7 @@ diff -NurpP --minimal linux-3.9.4/net/core/dev.c linux-3.9.4-vs2.3.6.1/net/core/ return dev; return NULL; -@@ -755,7 +759,7 @@ EXPORT_SYMBOL(__dev_get_by_index); +@@ -767,7 +771,7 @@ EXPORT_SYMBOL(__dev_get_by_index); * about locking. The caller must hold RCU lock. */ @@ -24115,7 +23328,7 @@ diff -NurpP --minimal linux-3.9.4/net/core/dev.c linux-3.9.4-vs2.3.6.1/net/core/ { struct net_device *dev; struct hlist_head *head = dev_index_hash(net, ifindex); -@@ -766,6 +770,16 @@ struct net_device *dev_get_by_index_rcu( +@@ -778,6 +782,16 @@ struct net_device *dev_get_by_index_rcu( return NULL; } @@ -24132,7 +23345,7 @@ diff -NurpP --minimal linux-3.9.4/net/core/dev.c linux-3.9.4-vs2.3.6.1/net/core/ EXPORT_SYMBOL(dev_get_by_index_rcu); -@@ -814,7 +828,8 @@ struct net_device *dev_getbyhwaddr_rcu(s +@@ -860,7 +874,8 @@ struct net_device *dev_getbyhwaddr_rcu(s for_each_netdev_rcu(net, dev) if (dev->type == type && @@ -24142,7 +23355,7 @@ diff -NurpP --minimal linux-3.9.4/net/core/dev.c linux-3.9.4-vs2.3.6.1/net/core/ return dev; return NULL; -@@ -826,9 +841,11 @@ struct net_device *__dev_getfirstbyhwtyp +@@ -872,9 +887,11 @@ struct net_device *__dev_getfirstbyhwtyp struct net_device *dev; ASSERT_RTNL(); @@ -24156,7 +23369,7 @@ diff -NurpP --minimal linux-3.9.4/net/core/dev.c linux-3.9.4-vs2.3.6.1/net/core/ return NULL; } -@@ -840,7 +857,8 @@ struct net_device *dev_getfirstbyhwtype( +@@ -886,7 +903,8 @@ struct net_device *dev_getfirstbyhwtype( rcu_read_lock(); for_each_netdev_rcu(net, dev) @@ -24166,17 +23379,17 @@ diff -NurpP --minimal linux-3.9.4/net/core/dev.c linux-3.9.4-vs2.3.6.1/net/core/ dev_hold(dev); ret = dev; break; -@@ -868,7 +886,8 @@ struct net_device *dev_get_by_flags_rcu( +@@ -916,7 +934,8 @@ struct net_device *__dev_get_by_flags(st ret = NULL; - for_each_netdev_rcu(net, dev) { + for_each_netdev(net, dev) { - if (((dev->flags ^ if_flags) & mask) == 0) { + if ((((dev->flags ^ if_flags) & mask) == 0) && + nx_dev_visible(current_nx_info(), dev)) { ret = dev; break; } -@@ -946,6 +965,8 @@ static int __dev_alloc_name(struct net * +@@ -994,6 +1013,8 @@ static int __dev_alloc_name(struct net * continue; if (i < 0 || i >= max_netdevices) continue; @@ -24185,32 +23398,58 @@ diff -NurpP --minimal linux-3.9.4/net/core/dev.c linux-3.9.4-vs2.3.6.1/net/core/ /* avoid cases where sscanf is not exact inverse of printf */ snprintf(buf, IFNAMSIZ, name, i); -diff -NurpP --minimal linux-3.9.4/net/core/rtnetlink.c linux-3.9.4-vs2.3.6.1/net/core/rtnetlink.c ---- linux-3.9.4/net/core/rtnetlink.c 2013-05-31 13:45:32.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/net/core/rtnetlink.c 2013-05-31 17:17:54.000000000 +0000 -@@ -1085,6 +1085,8 @@ static int rtnl_dump_ifinfo(struct sk_bu +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 +@@ -1,6 +1,7 @@ + #include + #include + #include ++#include + #include + + #define BUCKET_SPACE (32 - NETDEV_HASHBITS - 1) +@@ -77,8 +78,13 @@ static void dev_seq_stop(struct seq_file + static void dev_seq_printf_stats(struct seq_file *seq, struct net_device *dev) + { + struct rtnl_link_stats64 temp; +- const struct rtnl_link_stats64 *stats = dev_get_stats(dev, &temp); ++ const struct rtnl_link_stats64 *stats; ++ ++ /* device visible inside network context? */ ++ if (!nx_dev_visible(current_nx_info(), dev)) ++ return; + ++ stats = dev_get_stats(dev, &temp); + 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) { if (idx < s_idx) goto cont; + if (!nx_dev_visible(skb->sk->sk_nx_info, dev)) + continue; - if (rtnl_fill_ifinfo(skb, dev, RTM_NEWLINK, - NETLINK_CB(cb->skb).portid, - cb->nlh->nlmsg_seq, 0, -@@ -1974,6 +1976,9 @@ void rtmsg_ifinfo(int type, struct net_d + 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; + if (!nx_dev_visible(current_nx_info(), dev)) + return; + - skb = nlmsg_new((if_info_size = if_nlmsg_size(dev, 0)), GFP_KERNEL); + skb = nlmsg_new((if_info_size = if_nlmsg_size(dev, 0)), flags); if (skb == NULL) goto errout; -diff -NurpP --minimal linux-3.9.4/net/core/sock.c linux-3.9.4-vs2.3.6.1/net/core/sock.c ---- linux-3.9.4/net/core/sock.c 2013-05-31 14:22:27.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/net/core/sock.c 2013-05-31 17:17:54.000000000 +0000 -@@ -132,6 +132,10 @@ +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 #include @@ -24221,7 +23460,7 @@ diff -NurpP --minimal linux-3.9.4/net/core/sock.c linux-3.9.4-vs2.3.6.1/net/core #include -@@ -1257,6 +1261,8 @@ static struct sock *sk_prot_alloc(struct +@@ -1310,6 +1314,8 @@ static struct sock *sk_prot_alloc(struct goto out_free_sec; sk_tx_queue_clear(sk); } @@ -24230,7 +23469,7 @@ diff -NurpP --minimal linux-3.9.4/net/core/sock.c linux-3.9.4-vs2.3.6.1/net/core return sk; -@@ -1367,6 +1373,11 @@ static void __sk_free(struct sock *sk) +@@ -1406,6 +1412,11 @@ static void __sk_free(struct sock *sk) put_cred(sk->sk_peer_cred); put_pid(sk->sk_peer_pid); put_net(sock_net(sk)); @@ -24242,7 +23481,7 @@ diff -NurpP --minimal linux-3.9.4/net/core/sock.c linux-3.9.4-vs2.3.6.1/net/core sk_prot_free(sk->sk_prot_creator, sk); } -@@ -1427,6 +1438,8 @@ struct sock *sk_clone_lock(const struct +@@ -1467,6 +1478,8 @@ struct sock *sk_clone_lock(const struct /* SANITY */ get_net(sock_net(newsk)); @@ -24251,7 +23490,7 @@ diff -NurpP --minimal linux-3.9.4/net/core/sock.c linux-3.9.4-vs2.3.6.1/net/core sk_node_init(&newsk->sk_node); sock_lock_init(newsk); bh_lock_sock(newsk); -@@ -1483,6 +1496,12 @@ struct sock *sk_clone_lock(const struct +@@ -1524,6 +1537,12 @@ struct sock *sk_clone_lock(const struct smp_wmb(); atomic_set(&newsk->sk_refcnt, 2); @@ -24264,7 +23503,7 @@ diff -NurpP --minimal linux-3.9.4/net/core/sock.c linux-3.9.4-vs2.3.6.1/net/core /* * Increment the counter in the same struct proto as the master * sock (sk_refcnt_debug_inc uses newsk->sk_prot->socks, that -@@ -2278,6 +2297,12 @@ void sock_init_data(struct socket *sock, +@@ -2302,6 +2321,12 @@ void sock_init_data(struct socket *sock, sk->sk_stamp = ktime_set(-1L, 0); @@ -24274,12 +23513,12 @@ diff -NurpP --minimal linux-3.9.4/net/core/sock.c linux-3.9.4-vs2.3.6.1/net/core + set_nx_info(&sk->sk_nx_info, current_nx_info()); + sk->sk_nid = nx_current_nid(); + - /* - * Before updating sk_refcnt, we must commit prior changes to memory - * (Documentation/RCU/rculist_nulls.txt for details) -diff -NurpP --minimal linux-3.9.4/net/ipv4/af_inet.c linux-3.9.4-vs2.3.6.1/net/ipv4/af_inet.c ---- linux-3.9.4/net/ipv4/af_inet.c 2013-05-31 13:45:32.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/net/ipv4/af_inet.c 2013-05-31 18:24:05.000000000 +0000 + #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 @@ -24288,18 +23527,22 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/af_inet.c linux-3.9.4-vs2.3.6.1/net/i /* The inetsw table contains everything that inet_create needs to -@@ -336,6 +337,10 @@ lookup_protocol: +@@ -305,10 +306,13 @@ lookup_protocol: } err = -EPERM; + if ((protocol == IPPROTO_ICMP) && + nx_capable(CAP_NET_RAW, NXC_RAW_ICMP)) + goto override; -+override: if (sock->type == SOCK_RAW && !kern && !ns_capable(net->user_ns, CAP_NET_RAW)) goto out_rcu_unlock; -@@ -460,6 +465,7 @@ int inet_bind(struct socket *sock, struc +- ++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; struct sock *sk = sock->sk; struct inet_sock *inet = inet_sk(sk); @@ -24307,7 +23550,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/af_inet.c linux-3.9.4-vs2.3.6.1/net/i struct net *net = sock_net(sk); unsigned short snum; int chk_addr_ret; -@@ -484,7 +490,11 @@ int inet_bind(struct socket *sock, struc +@@ -447,7 +452,11 @@ int inet_bind(struct socket *sock, struc goto out; } @@ -24320,16 +23563,16 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/af_inet.c linux-3.9.4-vs2.3.6.1/net/i /* Not specified by any standard per-se, however it breaks too * many applications when removed. It is unfortunate since -@@ -496,7 +506,7 @@ int inet_bind(struct socket *sock, struc +@@ -459,7 +468,7 @@ int inet_bind(struct socket *sock, struc err = -EADDRNOTAVAIL; - if (!sysctl_ip_nonlocal_bind && + if (!net->ipv4.sysctl_ip_nonlocal_bind && !(inet->freebind || inet->transparent) && - addr->sin_addr.s_addr != htonl(INADDR_ANY) && + nsa.saddr != htonl(INADDR_ANY) && chk_addr_ret != RTN_LOCAL && chk_addr_ret != RTN_MULTICAST && chk_addr_ret != RTN_BROADCAST) -@@ -522,7 +532,7 @@ int inet_bind(struct socket *sock, struc +@@ -485,7 +494,7 @@ int inet_bind(struct socket *sock, struc if (sk->sk_state != TCP_CLOSE || inet->inet_num) goto out_release_sock; @@ -24338,7 +23581,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/af_inet.c linux-3.9.4-vs2.3.6.1/net/i if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST) inet->inet_saddr = 0; /* Use device */ -@@ -741,11 +751,13 @@ int inet_getname(struct socket *sock, st +@@ -704,11 +713,13 @@ int inet_getname(struct socket *sock, st peer == 1)) return -ENOTCONN; sin->sin_port = inet->inet_dport; @@ -24353,10 +23596,10 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/af_inet.c linux-3.9.4-vs2.3.6.1/net/i sin->sin_port = inet->inet_sport; sin->sin_addr.s_addr = addr; } -diff -NurpP --minimal linux-3.9.4/net/ipv4/arp.c linux-3.9.4-vs2.3.6.1/net/ipv4/arp.c ---- linux-3.9.4/net/ipv4/arp.c 2013-05-31 13:45:32.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/net/ipv4/arp.c 2013-05-31 17:17:54.000000000 +0000 -@@ -1317,6 +1317,7 @@ static void arp_format_neigh_entry(struc +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 struct net_device *dev = n->dev; int hatype = dev->type; @@ -24364,7 +23607,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/arp.c linux-3.9.4-vs2.3.6.1/net/ipv4/ read_lock(&n->lock); /* Convert hardware address to XX:XX:XX:XX ... form. */ #if IS_ENABLED(CONFIG_AX25) -@@ -1348,6 +1349,7 @@ static void arp_format_pneigh_entry(stru +@@ -1380,6 +1381,7 @@ static void arp_format_pneigh_entry(stru int hatype = dev ? dev->type : 0; char tbuf[16]; @@ -24372,10 +23615,10 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/arp.c linux-3.9.4-vs2.3.6.1/net/ipv4/ 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.9.4/net/ipv4/devinet.c linux-3.9.4-vs2.3.6.1/net/ipv4/devinet.c ---- linux-3.9.4/net/ipv4/devinet.c 2013-05-31 13:45:32.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/net/ipv4/devinet.c 2013-05-31 17:17:54.000000000 +0000 -@@ -522,6 +522,7 @@ struct in_device *inetdev_by_index(struc +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 } EXPORT_SYMBOL(inetdev_by_index); @@ -24383,7 +23626,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/devinet.c linux-3.9.4-vs2.3.6.1/net/i /* Called only from RTNL semaphored context. No locks. */ struct in_ifaddr *inet_ifa_byprefix(struct in_device *in_dev, __be32 prefix, -@@ -940,6 +941,8 @@ int devinet_ioctl(struct net *net, unsig +@@ -958,6 +959,8 @@ int devinet_ioctl(struct net *net, unsig in_dev = __in_dev_get_rtnl(dev); if (in_dev) { @@ -24392,7 +23635,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/devinet.c linux-3.9.4-vs2.3.6.1/net/i if (tryaddrmatch) { /* Matthias Andree */ /* compare label and address (4.4BSD style) */ -@@ -948,6 +951,8 @@ int devinet_ioctl(struct net *net, unsig +@@ -966,6 +969,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) { @@ -24401,7 +23644,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/devinet.c linux-3.9.4-vs2.3.6.1/net/i if (!strcmp(ifr.ifr_name, ifa->ifa_label) && sin_orig.sin_addr.s_addr == ifa->ifa_local) { -@@ -960,9 +965,12 @@ int devinet_ioctl(struct net *net, unsig +@@ -978,9 +983,12 @@ int devinet_ioctl(struct net *net, unsig comparing just the label */ if (!ifa) { for (ifap = &in_dev->ifa_list; (ifa = *ifap) != NULL; @@ -24415,7 +23658,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/devinet.c linux-3.9.4-vs2.3.6.1/net/i } } -@@ -1116,6 +1124,8 @@ static int inet_gifconf(struct net_devic +@@ -1134,6 +1142,8 @@ static int inet_gifconf(struct net_devic goto out; for (ifa = in_dev->ifa_list; ifa; ifa = ifa->ifa_next) { @@ -24424,7 +23667,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/devinet.c linux-3.9.4-vs2.3.6.1/net/i if (!buf) { done += sizeof(ifr); continue; -@@ -1519,6 +1529,7 @@ static int inet_dump_ifaddr(struct sk_bu +@@ -1538,6 +1548,7 @@ static int inet_dump_ifaddr(struct sk_bu struct net_device *dev; struct in_device *in_dev; struct in_ifaddr *ifa; @@ -24432,7 +23675,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/devinet.c linux-3.9.4-vs2.3.6.1/net/i struct hlist_head *head; s_h = cb->args[0]; -@@ -1540,6 +1551,8 @@ static int inet_dump_ifaddr(struct sk_bu +@@ -1561,6 +1572,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++) { @@ -24441,28 +23684,28 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/devinet.c linux-3.9.4-vs2.3.6.1/net/i if (ip_idx < s_ip_idx) continue; if (inet_fill_ifaddr(skb, ifa, -diff -NurpP --minimal linux-3.9.4/net/ipv4/fib_trie.c linux-3.9.4-vs2.3.6.1/net/ipv4/fib_trie.c ---- linux-3.9.4/net/ipv4/fib_trie.c 2013-05-31 13:45:32.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/net/ipv4/fib_trie.c 2013-05-31 17:17:54.000000000 +0000 -@@ -2548,6 +2548,7 @@ static int fib_route_seq_show(struct seq - || fa->fa_type == RTN_MULTICAST) - continue; +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.9.4/net/ipv4/inet_connection_sock.c linux-3.9.4-vs2.3.6.1/net/ipv4/inet_connection_sock.c ---- linux-3.9.4/net/ipv4/inet_connection_sock.c 2013-05-31 13:45:32.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/net/ipv4/inet_connection_sock.c 2013-05-31 18:29:56.000000000 +0000 -@@ -53,6 +53,37 @@ void inet_get_local_port_range(int *low, +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 } EXPORT_SYMBOL(inet_get_local_port_range); +int ipv4_rcv_saddr_equal(const struct sock *sk1, const struct sock *sk2) +{ -+ __be32 sk1_rcv_saddr = sk_rcv_saddr(sk1), -+ sk2_rcv_saddr = sk_rcv_saddr(sk2); ++ __be32 sk1_rcv_saddr = sk1->sk_rcv_saddr, ++ sk2_rcv_saddr = sk2->sk_rcv_saddr; + + if (inet_v6_ipv6only(sk2)) + return 0; @@ -24493,29 +23736,27 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/inet_connection_sock.c linux-3.9.4-vs int inet_csk_bind_conflict(const struct sock *sk, const struct inet_bind_bucket *tb, bool relax) { -@@ -79,17 +110,12 @@ int inet_csk_bind_conflict(const struct - (!reuseport || !sk2->sk_reuseport || +@@ -69,15 +100,13 @@ int inet_csk_bind_conflict(const struct (sk2->sk_state != TCP_TIME_WAIT && !uid_eq(uid, sock_i_uid(sk2))))) { -- const __be32 sk2_rcv_saddr = sk_rcv_saddr(sk2); -- if (!sk2_rcv_saddr || !sk_rcv_saddr(sk) || -- sk2_rcv_saddr == sk_rcv_saddr(sk)) + +- if (!sk2->sk_rcv_saddr || !sk->sk_rcv_saddr || +- sk2->sk_rcv_saddr == sk->sk_rcv_saddr) + if (ipv4_rcv_saddr_equal(sk, sk2)) break; } if (!relax && reuse && sk2->sk_reuse && sk2->sk_state != TCP_LISTEN) { -- const __be32 sk2_rcv_saddr = sk_rcv_saddr(sk2); -- -- if (!sk2_rcv_saddr || !sk_rcv_saddr(sk) || -- sk2_rcv_saddr == sk_rcv_saddr(sk)) + +- if (!sk2->sk_rcv_saddr || !sk->sk_rcv_saddr || +- sk2->sk_rcv_saddr == sk->sk_rcv_saddr) + if (ipv4_rcv_saddr_equal(sk, sk2)) break; } } -diff -NurpP --minimal linux-3.9.4/net/ipv4/inet_diag.c linux-3.9.4-vs2.3.6.1/net/ipv4/inet_diag.c ---- linux-3.9.4/net/ipv4/inet_diag.c 2013-02-19 13:58:58.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/net/ipv4/inet_diag.c 2013-05-31 17:17:54.000000000 +0000 +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 @@ -31,6 +31,8 @@ #include @@ -24525,10 +23766,10 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/inet_diag.c linux-3.9.4-vs2.3.6.1/net #include #include -@@ -106,8 +108,10 @@ int inet_sk_diag_fill(struct sock *sk, s +@@ -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_sport = inet->inet_sport; - r->id.idiag_dport = inet->inet_dport; - 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, @@ -24538,18 +23779,18 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/inet_diag.c linux-3.9.4-vs2.3.6.1/net if (nla_put_u8(skb, INET_DIAG_SHUTDOWN, sk->sk_shutdown)) goto errout; -@@ -242,8 +246,8 @@ static int inet_twsk_diag_fill(struct in - sock_diag_save_cookie(tw, r->id.idiag_cookie); - r->id.idiag_sport = tw->tw_sport; - r->id.idiag_dport = tw->tw_dport; +@@ -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; - r->idiag_expires = DIV_ROUND_UP(tmo * 1000, HZ); -@@ -287,12 +291,14 @@ int inet_diag_dump_one_icsk(struct inet_ +@@ -298,12 +302,14 @@ int inet_diag_dump_one_icsk(struct inet_ err = -EINVAL; if (req->sdiag_family == AF_INET) { @@ -24564,7 +23805,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/inet_diag.c linux-3.9.4-vs2.3.6.1/net sk = inet6_lookup(net, hashinfo, (struct in6_addr *)req->id.idiag_dst, req->id.idiag_dport, -@@ -494,6 +500,7 @@ int inet_diag_bc_sk(const struct nlattr +@@ -501,6 +507,7 @@ int inet_diag_bc_sk(const struct nlattr } else #endif { @@ -24572,7 +23813,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/inet_diag.c linux-3.9.4-vs2.3.6.1/net entry.saddr = &inet->inet_rcv_saddr; entry.daddr = &inet->inet_daddr; } -@@ -652,6 +659,7 @@ static int inet_twsk_diag_dump(struct in +@@ -659,6 +666,7 @@ static int inet_twsk_diag_dump(struct so } else #endif { @@ -24580,26 +23821,26 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/inet_diag.c linux-3.9.4-vs2.3.6.1/net entry.saddr = &tw->tw_rcv_saddr; entry.daddr = &tw->tw_daddr; } -@@ -730,8 +738,8 @@ static int inet_diag_fill_req(struct sk_ - - r->id.idiag_sport = inet->inet_sport; - r->id.idiag_dport = ireq->rmt_port; -- r->id.idiag_src[0] = ireq->loc_addr; -- r->id.idiag_dst[0] = ireq->rmt_addr; -+ r->id.idiag_src[0] = nx_map_sock_lback(sk->sk_nx_info, ireq->loc_addr); -+ r->id.idiag_dst[0] = nx_map_sock_lback(sk->sk_nx_info, ireq->rmt_addr); +@@ -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; - r->idiag_wqueue = 0; -@@ -794,6 +802,7 @@ static int inet_diag_dump_reqs(struct sk +@@ -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->rmt_port); -@@ -850,6 +859,8 @@ void inet_diag_dump_icsk(struct inet_has + entry.dport = ntohs(ireq->ir_rmt_port); +@@ -862,6 +871,8 @@ void inet_diag_dump_icsk(struct inet_has if (!net_eq(sock_net(sk), net)) continue; @@ -24608,7 +23849,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/inet_diag.c linux-3.9.4-vs2.3.6.1/net if (num < s_num) { num++; continue; -@@ -922,6 +933,8 @@ skip_listen_ht: +@@ -934,6 +945,8 @@ skip_listen_ht: if (!net_eq(sock_net(sk), net)) continue; @@ -24616,20 +23857,10 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/inet_diag.c linux-3.9.4-vs2.3.6.1/net + continue; if (num < s_num) goto next_normal; - if (!(r->idiag_states & (1 << sk->sk_state))) -@@ -950,7 +963,8 @@ next_normal: - &head->twchain) { - if (!net_eq(twsk_net(tw), net)) - continue; -- -+ if (!nx_check(tw->tw_nid, VS_WATCH_P | VS_IDENT)) -+ continue; - if (num < s_num) - goto next_dying; - if (r->sdiag_family != AF_UNSPEC && -diff -NurpP --minimal linux-3.9.4/net/ipv4/inet_hashtables.c linux-3.9.4-vs2.3.6.1/net/ipv4/inet_hashtables.c ---- linux-3.9.4/net/ipv4/inet_hashtables.c 2013-05-31 13:45:32.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/net/ipv4/inet_hashtables.c 2013-05-31 18:20:50.000000000 +0000 + 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 @@ #include #include @@ -24637,8 +23868,8 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/inet_hashtables.c linux-3.9.4-vs2.3.6 +#include #include - /* -@@ -156,6 +157,11 @@ static inline int compute_score(struct s + static unsigned int inet_ehashfn(struct net *net, const __be32 laddr, +@@ -181,6 +182,11 @@ static inline int compute_score(struct s if (rcv_saddr != daddr) return -1; score += 4; @@ -24650,7 +23881,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/inet_hashtables.c linux-3.9.4-vs2.3.6 } if (sk->sk_bound_dev_if) { if (sk->sk_bound_dev_if != dif) -@@ -173,7 +179,6 @@ static inline int compute_score(struct s +@@ -198,7 +204,6 @@ static inline int compute_score(struct s * wildcarded during the search since they can never be otherwise. */ @@ -24658,7 +23889,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/inet_hashtables.c linux-3.9.4-vs2.3.6 struct sock *__inet_lookup_listener(struct net *net, struct inet_hashinfo *hashinfo, const __be32 saddr, __be16 sport, -@@ -209,6 +214,7 @@ begin: +@@ -234,6 +239,7 @@ begin: phash = next_pseudo_random32(phash); } } @@ -24666,10 +23897,10 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/inet_hashtables.c linux-3.9.4-vs2.3.6 /* * 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.9.4/net/ipv4/netfilter.c linux-3.9.4-vs2.3.6.1/net/ipv4/netfilter.c ---- linux-3.9.4/net/ipv4/netfilter.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/net/ipv4/netfilter.c 2013-05-31 17:17:54.000000000 +0000 -@@ -6,7 +6,7 @@ +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 +@@ -11,7 +11,7 @@ #include #include #include @@ -24678,10 +23909,10 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/netfilter.c linux-3.9.4-vs2.3.6.1/net #include #include #include -diff -NurpP --minimal linux-3.9.4/net/ipv4/raw.c linux-3.9.4-vs2.3.6.1/net/ipv4/raw.c ---- linux-3.9.4/net/ipv4/raw.c 2013-05-31 13:45:32.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/net/ipv4/raw.c 2013-05-31 18:19:38.000000000 +0000 -@@ -116,7 +116,7 @@ static struct sock *__raw_v4_lookup(stru +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 if (net_eq(sock_net(sk), net) && inet->inet_num == num && !(inet->inet_daddr && inet->inet_daddr != raddr) && @@ -24690,7 +23921,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/raw.c linux-3.9.4-vs2.3.6.1/net/ipv4/ !(sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif)) goto found; /* gotcha */ } -@@ -395,6 +395,12 @@ static int raw_send_hdrinc(struct sock * +@@ -402,6 +402,12 @@ static int raw_send_hdrinc(struct sock * icmp_out_count(net, ((struct icmphdr *) skb_transport_header(skb))->type); @@ -24703,7 +23934,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/raw.c linux-3.9.4-vs2.3.6.1/net/ipv4/ err = NF_HOOK(NFPROTO_IPV4, NF_INET_LOCAL_OUT, skb, NULL, rt->dst.dev, dst_output); if (err > 0) -@@ -580,6 +586,16 @@ static int raw_sendmsg(struct kiocb *ioc +@@ -590,6 +596,16 @@ static int raw_sendmsg(struct kiocb *ioc goto done; } @@ -24720,7 +23951,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/raw.c linux-3.9.4-vs2.3.6.1/net/ipv4/ security_sk_classify_flow(sk, flowi4_to_flowi(&fl4)); rt = ip_route_output_flow(sock_net(sk), &fl4, sk); if (IS_ERR(rt)) { -@@ -656,17 +672,19 @@ static int raw_bind(struct sock *sk, str +@@ -668,17 +684,19 @@ static int raw_bind(struct sock *sk, str { struct inet_sock *inet = inet_sk(sk); struct sockaddr_in *addr = (struct sockaddr_in *) uaddr; @@ -24743,7 +23974,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/raw.c linux-3.9.4-vs2.3.6.1/net/ipv4/ if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST) inet->inet_saddr = 0; /* Use device */ sk_dst_reset(sk); -@@ -718,7 +736,8 @@ static int raw_recvmsg(struct kiocb *ioc +@@ -727,7 +745,8 @@ static int raw_recvmsg(struct kiocb *ioc /* Copy the address. */ if (sin) { sin->sin_family = AF_INET; @@ -24752,8 +23983,8 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/raw.c linux-3.9.4-vs2.3.6.1/net/ipv4/ + nx_map_sock_lback(sk->sk_nx_info, ip_hdr(skb)->saddr); sin->sin_port = 0; memset(&sin->sin_zero, 0, sizeof(sin->sin_zero)); - } -@@ -913,7 +932,8 @@ static struct sock *raw_get_first(struct + *addr_len = sizeof(*sin); +@@ -923,7 +942,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]) @@ -24763,7 +23994,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/raw.c linux-3.9.4-vs2.3.6.1/net/ipv4/ goto found; } sk = NULL; -@@ -929,7 +949,8 @@ static struct sock *raw_get_next(struct +@@ -939,7 +959,8 @@ static struct sock *raw_get_next(struct sk = sk_next(sk); try_again: ; @@ -24773,10 +24004,10 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/raw.c linux-3.9.4-vs2.3.6.1/net/ipv4/ if (!sk && ++state->bucket < RAW_HTABLE_SIZE) { sk = sk_head(&state->h->ht[state->bucket]); -diff -NurpP --minimal linux-3.9.4/net/ipv4/route.c linux-3.9.4-vs2.3.6.1/net/ipv4/route.c ---- linux-3.9.4/net/ipv4/route.c 2013-05-31 13:45:32.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/net/ipv4/route.c 2013-05-31 17:17:54.000000000 +0000 -@@ -1998,7 +1998,7 @@ struct rtable *__ip_route_output_key(str +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 if (fl4->flowi4_oif) { @@ -24785,9 +24016,9 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/route.c linux-3.9.4-vs2.3.6.1/net/ipv rth = ERR_PTR(-ENODEV); if (dev_out == NULL) goto out; -diff -NurpP --minimal linux-3.9.4/net/ipv4/tcp.c linux-3.9.4-vs2.3.6.1/net/ipv4/tcp.c ---- linux-3.9.4/net/ipv4/tcp.c 2013-05-31 13:45:32.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/net/ipv4/tcp.c 2013-05-31 17:17:54.000000000 +0000 +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 @@ #include #include @@ -24796,10 +24027,10 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/tcp.c linux-3.9.4-vs2.3.6.1/net/ipv4/ #include #include -diff -NurpP --minimal linux-3.9.4/net/ipv4/tcp_ipv4.c linux-3.9.4-vs2.3.6.1/net/ipv4/tcp_ipv4.c ---- linux-3.9.4/net/ipv4/tcp_ipv4.c 2013-05-31 13:45:32.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/net/ipv4/tcp_ipv4.c 2013-05-31 17:17:54.000000000 +0000 -@@ -2260,6 +2260,12 @@ static void *listening_get_next(struct s +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) { @@ -24812,7 +24043,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/tcp_ipv4.c linux-3.9.4-vs2.3.6.1/net/ if (req->rsk_ops->family == st->family) { cur = req; goto out; -@@ -2284,6 +2290,10 @@ get_req: +@@ -1909,6 +1915,10 @@ get_req: } get_sk: sk_nulls_for_each_from(sk, node) { @@ -24823,7 +24054,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/tcp_ipv4.c linux-3.9.4-vs2.3.6.1/net/ if (!net_eq(sock_net(sk), net)) continue; if (sk->sk_family == st->family) { -@@ -2360,6 +2370,11 @@ static void *established_get_first(struc +@@ -1983,6 +1993,11 @@ static void *established_get_first(struc spin_lock_bh(lock); sk_nulls_for_each(sk, node, &tcp_hashinfo.ehash[st->bucket].chain) { @@ -24835,31 +24066,8 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/tcp_ipv4.c linux-3.9.4-vs2.3.6.1/net/ if (sk->sk_family != st->family || !net_eq(sock_net(sk), net)) { continue; -@@ -2370,6 +2385,11 @@ static void *established_get_first(struc - st->state = TCP_SEQ_STATE_TIME_WAIT; - inet_twsk_for_each(tw, node, - &tcp_hashinfo.ehash[st->bucket].twchain) { -+ vxdprintk(VXD_CBIT(net, 6), -+ "tw: %p [#%d] (from %d)", -+ tw, tw->tw_nid, nx_current_nid()); -+ if (!nx_check(tw->tw_nid, VS_WATCH_P | VS_IDENT)) -+ continue; - if (tw->tw_family != st->family || - !net_eq(twsk_net(tw), net)) { - continue; -@@ -2399,7 +2419,9 @@ static void *established_get_next(struct - tw = cur; - tw = tw_next(tw); - get_tw: -- while (tw && (tw->tw_family != st->family || !net_eq(twsk_net(tw), net))) { -+ while (tw && (tw->tw_family != st->family || -+ !net_eq(twsk_net(tw), net) || -+ !nx_check(tw->tw_nid, VS_WATCH_P | VS_IDENT))) { - tw = tw_next(tw); - } - if (tw) { -@@ -2423,6 +2445,11 @@ get_tw: - sk = sk_nulls_next(sk); +@@ -2009,6 +2024,11 @@ static void *established_get_next(struct + sk = sk_nulls_next(sk); sk_nulls_for_each_from(sk, node) { + vxdprintk(VXD_CBIT(net, 6), @@ -24868,21 +24076,21 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/tcp_ipv4.c linux-3.9.4-vs2.3.6.1/net/ + if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)) + continue; if (sk->sk_family == st->family && net_eq(sock_net(sk), net)) - goto found; + return sk; } -@@ -2628,9 +2655,9 @@ static void get_openreq4(const struct so +@@ -2207,9 +2227,9 @@ static void get_openreq4(const struct so seq_printf(f, "%4d: %08X:%04X %08X:%04X" - " %02X %08X:%08X %02X:%08lX %08X %5d %8d %u %d %pK%n", + " %02X %08X:%08X %02X:%08lX %08X %5u %8d %u %d %pK", i, -- ireq->loc_addr, -+ nx_map_sock_lback(current_nx_info(), ireq->loc_addr), +- ireq->ir_loc_addr, ++ nx_map_sock_lback(current_nx_info(), ireq->ir_loc_addr), ntohs(inet_sk(sk)->inet_sport), -- ireq->rmt_addr, -+ nx_map_sock_lback(current_nx_info(), ireq->rmt_addr), - ntohs(ireq->rmt_port), +- 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. */ -@@ -2653,8 +2680,8 @@ static void get_tcp4_sock(struct sock *s +@@ -2231,8 +2251,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; @@ -24893,9 +24101,9 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/tcp_ipv4.c linux-3.9.4-vs2.3.6.1/net/ __u16 destp = ntohs(inet->inet_dport); __u16 srcp = ntohs(inet->inet_sport); int rx_queue; -@@ -2710,8 +2737,8 @@ static void get_timewait4_sock(const str +@@ -2289,8 +2309,8 @@ static void get_timewait4_sock(const str __u16 destp, srcp; - long delta = tw->tw_ttd - jiffies; + s32 delta = tw->tw_ttd - inet_tw_time_stamp(); - dest = tw->tw_daddr; - src = tw->tw_rcv_saddr; @@ -24904,9 +24112,9 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/tcp_ipv4.c linux-3.9.4-vs2.3.6.1/net/ destp = ntohs(tw->tw_dport); srcp = ntohs(tw->tw_sport); -diff -NurpP --minimal linux-3.9.4/net/ipv4/tcp_minisocks.c linux-3.9.4-vs2.3.6.1/net/ipv4/tcp_minisocks.c ---- linux-3.9.4/net/ipv4/tcp_minisocks.c 2013-05-31 14:22:27.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/net/ipv4/tcp_minisocks.c 2013-05-31 17:17:54.000000000 +0000 +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 @@ -23,6 +23,9 @@ #include #include @@ -24917,7 +24125,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/tcp_minisocks.c linux-3.9.4-vs2.3.6.1 #include #include #include -@@ -291,6 +294,11 @@ void tcp_time_wait(struct sock *sk, int +@@ -290,6 +293,11 @@ void tcp_time_wait(struct sock *sk, int tcptw->tw_ts_recent_stamp = tp->rx_opt.ts_recent_stamp; tcptw->tw_ts_offset = tp->tsoffset; @@ -24929,10 +24137,10 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/tcp_minisocks.c linux-3.9.4-vs2.3.6.1 #if IS_ENABLED(CONFIG_IPV6) if (tw->tw_family == PF_INET6) { struct ipv6_pinfo *np = inet6_sk(sk); -diff -NurpP --minimal linux-3.9.4/net/ipv4/udp.c linux-3.9.4-vs2.3.6.1/net/ipv4/udp.c ---- linux-3.9.4/net/ipv4/udp.c 2013-05-31 13:45:32.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/net/ipv4/udp.c 2013-05-31 18:26:00.000000000 +0000 -@@ -306,14 +306,7 @@ fail: +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 +@@ -309,14 +309,7 @@ fail: } EXPORT_SYMBOL(udp_lib_get_port); @@ -24948,7 +24156,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/udp.c linux-3.9.4-vs2.3.6.1/net/ipv4/ static unsigned int udp4_portaddr_hash(struct net *net, __be32 saddr, unsigned int port) -@@ -348,6 +341,11 @@ static inline int compute_score(struct s +@@ -351,6 +344,11 @@ static inline int compute_score(struct s if (inet->inet_rcv_saddr != daddr) return -1; score += 4; @@ -24960,7 +24168,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/udp.c linux-3.9.4-vs2.3.6.1/net/ipv4/ } if (inet->inet_daddr) { if (inet->inet_daddr != saddr) -@@ -458,6 +456,7 @@ begin: +@@ -473,6 +471,7 @@ begin: return result; } @@ -24968,7 +24176,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/udp.c linux-3.9.4-vs2.3.6.1/net/ipv4/ /* UDP is nearly always wildcards out the wazoo, it makes no sense to try * harder than this. -DaveM */ -@@ -504,6 +503,11 @@ begin: +@@ -519,6 +518,11 @@ begin: sk_nulls_for_each_rcu(sk, node, &hslot->head) { score = compute_score(sk, net, saddr, hnum, sport, daddr, dport, dif); @@ -24980,7 +24188,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/udp.c linux-3.9.4-vs2.3.6.1/net/ipv4/ if (score > badness) { result = sk; badness = score; -@@ -528,6 +532,7 @@ begin: +@@ -543,6 +547,7 @@ begin: if (get_nulls_value(node) != slot) goto begin; @@ -24988,7 +24196,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/udp.c linux-3.9.4-vs2.3.6.1/net/ipv4/ if (result) { if (unlikely(!atomic_inc_not_zero_hint(&result->sk_refcnt, 2))) result = NULL; -@@ -537,6 +542,7 @@ begin: +@@ -552,6 +557,7 @@ begin: goto begin; } } @@ -24996,18 +24204,17 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/udp.c linux-3.9.4-vs2.3.6.1/net/ipv4/ rcu_read_unlock(); return result; } -@@ -580,8 +586,7 @@ static inline struct sock *udp_v4_mcast_ - udp_sk(s)->udp_port_hash != hnum || - (inet->inet_daddr && inet->inet_daddr != rmt_addr) || - (inet->inet_dport != rmt_port && inet->inet_dport) || -- (inet->inet_rcv_saddr && -- inet->inet_rcv_saddr != loc_addr) || -+ !v4_sock_addr_match(sk->sk_nx_info, inet, loc_addr) || - ipv6_only_sock(s) || - (s->sk_bound_dev_if && s->sk_bound_dev_if != dif)) - continue; -@@ -964,6 +969,16 @@ int udp_sendmsg(struct kiocb *iocb, stru - inet_sk_flowi_flags(sk)|FLOWI_FLAG_CAN_SLEEP, +@@ -586,7 +592,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) || +- (inet->inet_rcv_saddr && inet->inet_rcv_saddr != loc_addr) || ++ !v4_sock_addr_match(sk->sk_nx_info, inet, loc_addr) || + 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); + if (sk->sk_nx_info) { @@ -25023,7 +24230,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/udp.c linux-3.9.4-vs2.3.6.1/net/ipv4/ security_sk_classify_flow(sk, flowi4_to_flowi(fl4)); rt = ip_route_output_flow(net, fl4, sk); if (IS_ERR(rt)) { -@@ -1269,7 +1284,8 @@ try_again: +@@ -1312,7 +1328,8 @@ try_again: if (sin) { sin->sin_family = AF_INET; sin->sin_port = udp_hdr(skb)->source; @@ -25031,9 +24238,9 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/udp.c linux-3.9.4-vs2.3.6.1/net/ipv4/ + sin->sin_addr.s_addr = nx_map_sock_lback( + skb->sk->sk_nx_info, ip_hdr(skb)->saddr); memset(sin->sin_zero, 0, sizeof(sin->sin_zero)); + *addr_len = sizeof(*sin); } - if (inet->cmsg_flags) -@@ -2025,6 +2041,8 @@ static struct sock *udp_get_first(struct +@@ -2271,6 +2288,8 @@ static struct sock *udp_get_first(struct sk_nulls_for_each(sk, node, &hslot->head) { if (!net_eq(sock_net(sk), net)) continue; @@ -25042,7 +24249,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/udp.c linux-3.9.4-vs2.3.6.1/net/ipv4/ if (sk->sk_family == state->family) goto found; } -@@ -2042,7 +2060,9 @@ static struct sock *udp_get_next(struct +@@ -2288,7 +2307,9 @@ static struct sock *udp_get_next(struct do { sk = sk_nulls_next(sk); @@ -25053,8 +24260,8 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/udp.c linux-3.9.4-vs2.3.6.1/net/ipv4/ if (!sk) { if (state->bucket <= state->udp_table->mask) -@@ -2138,8 +2158,8 @@ static void udp4_format_sock(struct sock - int bucket, int *len) +@@ -2384,8 +2405,8 @@ static void udp4_format_sock(struct sock + int bucket) { struct inet_sock *inet = inet_sk(sp); - __be32 dest = inet->inet_daddr; @@ -25064,9 +24271,9 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/udp.c linux-3.9.4-vs2.3.6.1/net/ipv4/ __u16 destp = ntohs(inet->inet_dport); __u16 srcp = ntohs(inet->inet_sport); -diff -NurpP --minimal linux-3.9.4/net/ipv6/Kconfig linux-3.9.4-vs2.3.6.1/net/ipv6/Kconfig ---- linux-3.9.4/net/ipv6/Kconfig 2013-05-31 13:45:32.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/net/ipv6/Kconfig 2013-05-31 17:17:54.000000000 +0000 +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 @@ -25078,10 +24285,10 @@ diff -NurpP --minimal linux-3.9.4/net/ipv6/Kconfig linux-3.9.4-vs2.3.6.1/net/ipv ---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.9.4/net/ipv6/addrconf.c linux-3.9.4-vs2.3.6.1/net/ipv6/addrconf.c ---- linux-3.9.4/net/ipv6/addrconf.c 2013-05-31 13:45:32.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/net/ipv6/addrconf.c 2013-05-31 20:07:39.000000000 +0000 -@@ -93,6 +93,8 @@ +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 @@ #include #include #include @@ -25090,7 +24297,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv6/addrconf.c linux-3.9.4-vs2.3.6.1/net/ /* Set to 3 to get tracing... */ #define ACONF_DEBUG 2 -@@ -1250,7 +1252,7 @@ out: +@@ -1319,7 +1321,7 @@ out: int ipv6_dev_get_saddr(struct net *net, const struct net_device *dst_dev, const struct in6_addr *daddr, unsigned int prefs, @@ -25099,7 +24306,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv6/addrconf.c linux-3.9.4-vs2.3.6.1/net/ { struct ipv6_saddr_score scores[2], *score = &scores[0], *hiscore = &scores[1]; -@@ -1322,6 +1324,8 @@ int ipv6_dev_get_saddr(struct net *net, +@@ -1391,6 +1393,8 @@ int ipv6_dev_get_saddr(struct net *net, dev->name); continue; } @@ -25108,7 +24315,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv6/addrconf.c linux-3.9.4-vs2.3.6.1/net/ score->rule = -1; bitmap_zero(score->scorebits, IPV6_SADDR_RULE_MAX); -@@ -3311,7 +3315,10 @@ static void if6_seq_stop(struct seq_file +@@ -3503,7 +3507,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; @@ -25120,7 +24327,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv6/addrconf.c linux-3.9.4-vs2.3.6.1/net/ &ifp->addr, ifp->idev->dev->ifindex, ifp->prefix_len, -@@ -3815,6 +3822,11 @@ static int in6_dump_addrs(struct inet6_d +@@ -4084,6 +4091,11 @@ static int in6_dump_addrs(struct inet6_d struct ifacaddr6 *ifaca; int err = 1; int ip_idx = *p_ip_idx; @@ -25132,7 +24339,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv6/addrconf.c linux-3.9.4-vs2.3.6.1/net/ read_lock_bh(&idev->lock); switch (type) { -@@ -3825,6 +3837,8 @@ static int in6_dump_addrs(struct inet6_d +@@ -4094,6 +4106,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; @@ -25141,7 +24348,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv6/addrconf.c linux-3.9.4-vs2.3.6.1/net/ err = inet6_fill_ifaddr(skb, ifa, NETLINK_CB(cb->skb).portid, cb->nlh->nlmsg_seq, -@@ -3841,6 +3855,8 @@ static int in6_dump_addrs(struct inet6_d +@@ -4111,6 +4125,8 @@ static int in6_dump_addrs(struct inet6_d ifmca = ifmca->next, ip_idx++) { if (ip_idx < s_ip_idx) continue; @@ -25150,7 +24357,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv6/addrconf.c linux-3.9.4-vs2.3.6.1/net/ err = inet6_fill_ifmcaddr(skb, ifmca, NETLINK_CB(cb->skb).portid, cb->nlh->nlmsg_seq, -@@ -3856,6 +3872,8 @@ static int in6_dump_addrs(struct inet6_d +@@ -4126,6 +4142,8 @@ static int in6_dump_addrs(struct inet6_d ifaca = ifaca->aca_next, ip_idx++) { if (ip_idx < s_ip_idx) continue; @@ -25159,7 +24366,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv6/addrconf.c linux-3.9.4-vs2.3.6.1/net/ err = inet6_fill_ifacaddr(skb, ifaca, NETLINK_CB(cb->skb).portid, cb->nlh->nlmsg_seq, -@@ -3884,6 +3902,10 @@ static int inet6_dump_addr(struct sk_buf +@@ -4154,6 +4172,10 @@ static int inet6_dump_addr(struct sk_buf struct inet6_dev *idev; struct hlist_head *head; @@ -25170,7 +24377,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv6/addrconf.c linux-3.9.4-vs2.3.6.1/net/ s_h = cb->args[0]; s_idx = idx = cb->args[1]; s_ip_idx = ip_idx = cb->args[2]; -@@ -4238,6 +4260,7 @@ static int inet6_dump_ifinfo(struct sk_b +@@ -4617,6 +4639,7 @@ static int inet6_dump_ifinfo(struct sk_b struct net_device *dev; struct inet6_dev *idev; struct hlist_head *head; @@ -25178,7 +24385,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv6/addrconf.c linux-3.9.4-vs2.3.6.1/net/ s_h = cb->args[0]; s_idx = cb->args[1]; -@@ -4249,6 +4272,8 @@ static int inet6_dump_ifinfo(struct sk_b +@@ -4628,6 +4651,8 @@ static int inet6_dump_ifinfo(struct sk_b hlist_for_each_entry_rcu(dev, head, index_hlist) { if (idx < s_idx) goto cont; @@ -25187,9 +24394,9 @@ diff -NurpP --minimal linux-3.9.4/net/ipv6/addrconf.c linux-3.9.4-vs2.3.6.1/net/ idev = __in6_dev_get(dev); if (!idev) goto cont; -diff -NurpP --minimal linux-3.9.4/net/ipv6/af_inet6.c linux-3.9.4-vs2.3.6.1/net/ipv6/af_inet6.c ---- linux-3.9.4/net/ipv6/af_inet6.c 2013-05-31 13:45:32.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/net/ipv6/af_inet6.c 2013-05-31 20:04:41.000000000 +0000 +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 @@ -43,6 +43,8 @@ #include #include @@ -25199,7 +24406,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv6/af_inet6.c linux-3.9.4-vs2.3.6.1/net/ #include #include -@@ -160,10 +162,13 @@ lookup_protocol: +@@ -155,10 +157,13 @@ lookup_protocol: } err = -EPERM; @@ -25213,8 +24420,8 @@ diff -NurpP --minimal linux-3.9.4/net/ipv6/af_inet6.c linux-3.9.4-vs2.3.6.1/net/ +override: sock->ops = answer->ops; answer_prot = answer->prot; - answer_no_check = answer->no_check; -@@ -263,6 +268,7 @@ int inet6_bind(struct socket *sock, stru + answer_flags = answer->flags; +@@ -256,6 +261,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); @@ -25222,7 +24429,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv6/af_inet6.c linux-3.9.4-vs2.3.6.1/net/ __be32 v4addr = 0; unsigned short snum; int addr_type = 0; -@@ -278,6 +284,10 @@ int inet6_bind(struct socket *sock, stru +@@ -271,6 +277,10 @@ int inet6_bind(struct socket *sock, stru if (addr->sin6_family != AF_INET6) return -EAFNOSUPPORT; @@ -25233,15 +24440,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv6/af_inet6.c linux-3.9.4-vs2.3.6.1/net/ addr_type = ipv6_addr_type(&addr->sin6_addr); if ((addr_type & IPV6_ADDR_MULTICAST) && sock->type == SOCK_STREAM) return -EINVAL; -@@ -309,6 +319,7 @@ int inet6_bind(struct socket *sock, stru - /* Reproduce AF_INET checks to make the bindings consistent */ - v4addr = addr->sin6_addr.s6_addr32[3]; - chk_addr_ret = inet_addr_type(net, v4addr); -+ - if (!sysctl_ip_nonlocal_bind && - !(inet->freebind || inet->transparent) && - v4addr != htonl(INADDR_ANY) && -@@ -318,6 +329,10 @@ int inet6_bind(struct socket *sock, stru +@@ -311,6 +321,10 @@ int inet6_bind(struct socket *sock, stru err = -EADDRNOTAVAIL; goto out; } @@ -25252,7 +24451,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv6/af_inet6.c linux-3.9.4-vs2.3.6.1/net/ } else { if (addr_type != IPV6_ADDR_ANY) { struct net_device *dev = NULL; -@@ -344,6 +359,11 @@ int inet6_bind(struct socket *sock, stru +@@ -337,6 +351,11 @@ int inet6_bind(struct socket *sock, stru } } @@ -25264,7 +24463,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv6/af_inet6.c linux-3.9.4-vs2.3.6.1/net/ /* ipv4 addr of the socket is invalid. Only the * unspecified and mapped address have a v4 equivalent. */ -@@ -360,6 +380,9 @@ int inet6_bind(struct socket *sock, stru +@@ -353,6 +372,9 @@ int inet6_bind(struct socket *sock, stru } } @@ -25274,22 +24473,22 @@ diff -NurpP --minimal linux-3.9.4/net/ipv6/af_inet6.c linux-3.9.4-vs2.3.6.1/net/ inet->inet_rcv_saddr = v4addr; inet->inet_saddr = v4addr; -@@ -461,9 +484,11 @@ int inet6_getname(struct socket *sock, s +@@ -454,9 +476,11 @@ int inet6_getname(struct socket *sock, s return -ENOTCONN; sin->sin6_port = inet->inet_dport; - sin->sin6_addr = np->daddr; + sin->sin6_addr = sk->sk_v6_daddr; + /* FIXME: remap lback? */ if (np->sndflow) sin->sin6_flowinfo = np->flow_label; } else { + /* FIXME: remap lback? */ - if (ipv6_addr_any(&np->rcv_saddr)) + if (ipv6_addr_any(&sk->sk_v6_rcv_saddr)) sin->sin6_addr = np->saddr; else -diff -NurpP --minimal linux-3.9.4/net/ipv6/datagram.c linux-3.9.4-vs2.3.6.1/net/ipv6/datagram.c ---- linux-3.9.4/net/ipv6/datagram.c 2013-05-31 13:45:32.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/net/ipv6/datagram.c 2013-05-31 17:17:54.000000000 +0000 -@@ -648,7 +648,7 @@ int ip6_datagram_send_ctl(struct net *ne +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 rcu_read_lock(); if (fl6->flowi6_oif) { @@ -25298,10 +24497,10 @@ diff -NurpP --minimal linux-3.9.4/net/ipv6/datagram.c linux-3.9.4-vs2.3.6.1/net/ if (!dev) { rcu_read_unlock(); return -ENODEV; -diff -NurpP --minimal linux-3.9.4/net/ipv6/fib6_rules.c linux-3.9.4-vs2.3.6.1/net/ipv6/fib6_rules.c ---- linux-3.9.4/net/ipv6/fib6_rules.c 2013-02-19 13:58:58.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/net/ipv6/fib6_rules.c 2013-05-31 17:17:54.000000000 +0000 -@@ -90,7 +90,7 @@ static int fib6_rule_action(struct fib_r +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 +@@ -97,7 +97,7 @@ static int fib6_rule_action(struct fib_r ip6_dst_idev(&rt->dst)->dev, &flp6->daddr, rt6_flags2srcprefs(flags), @@ -25310,9 +24509,9 @@ diff -NurpP --minimal linux-3.9.4/net/ipv6/fib6_rules.c linux-3.9.4-vs2.3.6.1/ne goto again; if (!ipv6_prefix_equal(&saddr, &r->src.addr, r->src.plen)) -diff -NurpP --minimal linux-3.9.4/net/ipv6/inet6_hashtables.c linux-3.9.4-vs2.3.6.1/net/ipv6/inet6_hashtables.c ---- linux-3.9.4/net/ipv6/inet6_hashtables.c 2013-05-31 13:45:32.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/net/ipv6/inet6_hashtables.c 2013-05-31 17:17:54.000000000 +0000 +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 @@ -16,6 +16,7 @@ #include @@ -25321,7 +24520,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv6/inet6_hashtables.c linux-3.9.4-vs2.3. #include #include -@@ -83,7 +84,6 @@ struct sock *__inet6_lookup_established( +@@ -116,7 +117,6 @@ struct sock *__inet6_lookup_established( unsigned int slot = hash & hashinfo->ehash_mask; struct inet_ehash_bucket *head = &hashinfo->ehash[slot]; @@ -25329,17 +24528,8 @@ diff -NurpP --minimal linux-3.9.4/net/ipv6/inet6_hashtables.c linux-3.9.4-vs2.3. rcu_read_lock(); begin: sk_nulls_for_each_rcu(sk, node, &head->chain) { -@@ -97,7 +97,7 @@ begin: - sock_put(sk); - goto begin; - } -- goto out; -+ goto out; - } - } - if (get_nulls_value(node) != slot) -@@ -147,6 +147,9 @@ static inline int compute_score(struct s - if (!ipv6_addr_equal(&np->rcv_saddr, daddr)) +@@ -158,6 +158,9 @@ static inline int compute_score(struct s + if (!ipv6_addr_equal(&sk->sk_v6_rcv_saddr, daddr)) return -1; score++; + } else { @@ -25348,10 +24538,21 @@ diff -NurpP --minimal linux-3.9.4/net/ipv6/inet6_hashtables.c linux-3.9.4-vs2.3. } if (sk->sk_bound_dev_if) { if (sk->sk_bound_dev_if != dif) -diff -NurpP --minimal linux-3.9.4/net/ipv6/ip6_output.c linux-3.9.4-vs2.3.6.1/net/ipv6/ip6_output.c ---- linux-3.9.4/net/ipv6/ip6_output.c 2013-05-31 13:45:32.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/net/ipv6/ip6_output.c 2013-05-31 17:17:54.000000000 +0000 -@@ -877,7 +877,8 @@ static int ip6_dst_lookup_tail(struct so +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 + struct rt6_info *rt = v; + struct ipv6_route_iter *iter = seq->private; + ++ /* FIXME: check for network context? */ + 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; err = ip6_route_get_saddr(net, rt, &fl6->daddr, sk ? inet6_sk(sk)->srcprefs : 0, @@ -25361,10 +24562,10 @@ diff -NurpP --minimal linux-3.9.4/net/ipv6/ip6_output.c linux-3.9.4-vs2.3.6.1/ne if (err) goto out_err_release; } -diff -NurpP --minimal linux-3.9.4/net/ipv6/ndisc.c linux-3.9.4-vs2.3.6.1/net/ipv6/ndisc.c ---- linux-3.9.4/net/ipv6/ndisc.c 2013-05-31 13:45:32.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/net/ipv6/ndisc.c 2013-05-31 17:17:54.000000000 +0000 -@@ -485,7 +485,7 @@ static void ndisc_send_na(struct net_dev +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 } else { if (ipv6_dev_get_saddr(dev_net(dev), dev, daddr, inet6_sk(dev_net(dev)->ipv6.ndisc_sk)->srcprefs, @@ -25373,21 +24574,21 @@ diff -NurpP --minimal linux-3.9.4/net/ipv6/ndisc.c linux-3.9.4-vs2.3.6.1/net/ipv return; src_addr = &tmpaddr; } -diff -NurpP --minimal linux-3.9.4/net/ipv6/netfilter/ip6t_MASQUERADE.c linux-3.9.4-vs2.3.6.1/net/ipv6/netfilter/ip6t_MASQUERADE.c ---- linux-3.9.4/net/ipv6/netfilter/ip6t_MASQUERADE.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/net/ipv6/netfilter/ip6t_MASQUERADE.c 2013-05-31 17:17:54.000000000 +0000 -@@ -34,7 +34,7 @@ masquerade_tg6(struct sk_buff *skb, cons +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 +@@ -35,7 +35,7 @@ nf_nat_masquerade_ipv6(struct sk_buff *s ctinfo == IP_CT_RELATED_REPLY)); - if (ipv6_dev_get_saddr(dev_net(par->out), par->out, + if (ipv6_dev_get_saddr(dev_net(out), out, - &ipv6_hdr(skb)->daddr, 0, &src) < 0) + &ipv6_hdr(skb)->daddr, 0, &src, NULL) < 0) return NF_DROP; - nfct_nat(ct)->masq_index = par->out->ifindex; -diff -NurpP --minimal linux-3.9.4/net/ipv6/raw.c linux-3.9.4-vs2.3.6.1/net/ipv6/raw.c ---- linux-3.9.4/net/ipv6/raw.c 2013-05-31 13:45:32.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/net/ipv6/raw.c 2013-05-31 17:17:54.000000000 +0000 + 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 @@ -30,6 +30,7 @@ #include #include @@ -25396,7 +24597,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv6/raw.c linux-3.9.4-vs2.3.6.1/net/ipv6/ #include #include #include -@@ -283,6 +284,13 @@ static int rawv6_bind(struct sock *sk, s +@@ -291,6 +292,13 @@ static int rawv6_bind(struct sock *sk, s goto out_unlock; } @@ -25410,9 +24611,9 @@ diff -NurpP --minimal linux-3.9.4/net/ipv6/raw.c linux-3.9.4-vs2.3.6.1/net/ipv6/ /* ipv4 addr of the socket is invalid. Only the * unspecified and mapped address have a v4 equivalent. */ -diff -NurpP --minimal linux-3.9.4/net/ipv6/route.c linux-3.9.4-vs2.3.6.1/net/ipv6/route.c ---- linux-3.9.4/net/ipv6/route.c 2013-05-31 13:45:32.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/net/ipv6/route.c 2013-05-31 18:10:38.000000000 +0000 +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 #include @@ -25421,7 +24622,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv6/route.c linux-3.9.4-vs2.3.6.1/net/ipv #include -@@ -2079,15 +2080,17 @@ int ip6_route_get_saddr(struct net *net, +@@ -2183,15 +2184,17 @@ int ip6_route_get_saddr(struct net *net, struct rt6_info *rt, const struct in6_addr *daddr, unsigned int prefs, @@ -25429,7 +24630,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv6/route.c linux-3.9.4-vs2.3.6.1/net/ipv + struct in6_addr *saddr, + struct nx_info *nxi) { - struct inet6_dev *idev = ip6_dst_idev((struct dst_entry*)rt); + struct inet6_dev *idev = ip6_dst_idev((struct dst_entry *)rt); int err = 0; - if (rt->rt6i_prefsrc.plen) + if (rt->rt6i_prefsrc.plen && (!nxi || @@ -25442,7 +24643,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv6/route.c linux-3.9.4-vs2.3.6.1/net/ipv return err; } -@@ -2507,7 +2510,8 @@ static int rt6_fill_node(struct net *net +@@ -2632,7 +2635,8 @@ static int rt6_fill_node(struct net *net goto nla_put_failure; } else if (dst) { struct in6_addr saddr_buf; @@ -25452,18 +24653,10 @@ diff -NurpP --minimal linux-3.9.4/net/ipv6/route.c linux-3.9.4-vs2.3.6.1/net/ipv nla_put(skb, RTA_PREFSRC, 16, &saddr_buf)) goto nla_put_failure; } -@@ -2719,6 +2723,7 @@ static int rt6_info_route(struct rt6_inf - { - struct seq_file *m = p_arg; - -+ /* FIXME: check for network context? */ - seq_printf(m, "%pi6 %02x ", &rt->rt6i_dst.addr, rt->rt6i_dst.plen); - - #ifdef CONFIG_IPV6_SUBTREES -diff -NurpP --minimal linux-3.9.4/net/ipv6/tcp_ipv6.c linux-3.9.4-vs2.3.6.1/net/ipv6/tcp_ipv6.c ---- linux-3.9.4/net/ipv6/tcp_ipv6.c 2013-05-31 14:22:27.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/net/ipv6/tcp_ipv6.c 2013-05-31 17:17:54.000000000 +0000 -@@ -71,6 +71,7 @@ +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 +@@ -69,6 +69,7 @@ #include #include @@ -25475,7 +24668,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv6/tcp_ipv6.c linux-3.9.4-vs2.3.6.1/net/ * connect() to INADDR_ANY means loopback (BSD'ism). */ -- if(ipv6_addr_any(&usin->sin6_addr)) +- if (ipv6_addr_any(&usin->sin6_addr)) - usin->sin6_addr.s6_addr[15] = 0x1; + if(ipv6_addr_any(&usin->sin6_addr)) { + struct nx_info *nxi = sk->sk_nx_info; @@ -25489,93 +24682,19 @@ diff -NurpP --minimal linux-3.9.4/net/ipv6/tcp_ipv6.c linux-3.9.4-vs2.3.6.1/net/ addr_type = ipv6_addr_type(&usin->sin6_addr); -diff -NurpP --minimal linux-3.9.4/net/ipv6/udp.c linux-3.9.4-vs2.3.6.1/net/ipv6/udp.c ---- linux-3.9.4/net/ipv6/udp.c 2013-05-31 14:22:27.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/net/ipv6/udp.c 2013-05-31 18:16:01.000000000 +0000 -@@ -46,42 +46,68 @@ - #include +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 +@@ -47,6 +47,7 @@ #include #include + #include +#include #include #include - #include - #include "udp_impl.h" - --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 *sk_rcv_saddr6 = &inet6_sk(sk)->rcv_saddr; -+ const struct in6_addr *sk1_rcv_saddr6 = &inet6_sk(sk1)->rcv_saddr; - const struct in6_addr *sk2_rcv_saddr6 = inet6_rcv_saddr(sk2); -- __be32 sk1_rcv_saddr = sk_rcv_saddr(sk); -+ __be32 sk1_rcv_saddr = sk_rcv_saddr(sk1); - __be32 sk2_rcv_saddr = sk_rcv_saddr(sk2); -- int sk_ipv6only = ipv6_only_sock(sk); -+ int sk1_ipv6only = ipv6_only_sock(sk1); - int sk2_ipv6only = inet_v6_ipv6only(sk2); -- int addr_type = ipv6_addr_type(sk_rcv_saddr6); -+ int addr_type = 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 && -+ if (addr_type == IPV6_ADDR_MAPPED && addr_type2 == IPV6_ADDR_MAPPED) { -+ if (!sk2_ipv6only && - (!sk1_rcv_saddr || !sk2_rcv_saddr || -- sk1_rcv_saddr == sk2_rcv_saddr)); -+ sk1_rcv_saddr == sk2_rcv_saddr)) -+ goto vs_v4; -+ else -+ return 0; -+ } - - if (addr_type2 == IPV6_ADDR_ANY && - !(sk2_ipv6only && addr_type == IPV6_ADDR_MAPPED)) -- return 1; -+ goto vs; - - if (addr_type == IPV6_ADDR_ANY && -- !(sk_ipv6only && addr_type2 == IPV6_ADDR_MAPPED)) -- return 1; -+ !(sk1_ipv6only && addr_type2 == IPV6_ADDR_MAPPED)) -+ goto vs; - - if (sk2_rcv_saddr6 && -- ipv6_addr_equal(sk_rcv_saddr6, sk2_rcv_saddr6)) -- return 1; -+ ipv6_addr_equal(sk1_rcv_saddr6, 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_type == 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_type == 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 unsigned int udp6_portaddr_hash(struct net *net, -@@ -145,6 +171,10 @@ static inline int compute_score(struct s - if (!ipv6_addr_equal(&np->rcv_saddr, daddr)) +@@ -159,6 +160,10 @@ static inline int compute_score(struct s + if (inet->inet_dport != sport) return -1; score++; + } else { @@ -25583,11 +24702,11 @@ diff -NurpP --minimal linux-3.9.4/net/ipv6/udp.c linux-3.9.4-vs2.3.6.1/net/ipv6/ + if (!v6_addr_in_nx_info(sk->sk_nx_info, daddr, -1)) + return -1; } - if (!ipv6_addr_any(&np->daddr)) { - if (!ipv6_addr_equal(&np->daddr, saddr)) -diff -NurpP --minimal linux-3.9.4/net/ipv6/xfrm6_policy.c linux-3.9.4-vs2.3.6.1/net/ipv6/xfrm6_policy.c ---- linux-3.9.4/net/ipv6/xfrm6_policy.c 2013-05-31 14:22:27.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/net/ipv6/xfrm6_policy.c 2013-05-31 17:17:54.000000000 +0000 + 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 dev = ip6_dst_idev(dst)->dev; ipv6_dev_get_saddr(dev_net(dev), dev, @@ -25597,10 +24716,10 @@ diff -NurpP --minimal linux-3.9.4/net/ipv6/xfrm6_policy.c linux-3.9.4-vs2.3.6.1/ dst_release(dst); return 0; } -diff -NurpP --minimal linux-3.9.4/net/netfilter/ipvs/ip_vs_xmit.c linux-3.9.4-vs2.3.6.1/net/netfilter/ipvs/ip_vs_xmit.c ---- linux-3.9.4/net/netfilter/ipvs/ip_vs_xmit.c 2013-02-19 13:58:59.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/net/netfilter/ipvs/ip_vs_xmit.c 2013-05-31 17:17:54.000000000 +0000 -@@ -273,7 +273,7 @@ __ip_vs_route_output_v6(struct net *net, +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, return dst; if (ipv6_addr_any(&fl6.saddr) && ipv6_dev_get_saddr(net, ip6_dst_idev(dst)->dev, @@ -25609,21 +24728,21 @@ diff -NurpP --minimal linux-3.9.4/net/netfilter/ipvs/ip_vs_xmit.c linux-3.9.4-vs goto out_err; if (do_xfrm) { dst = xfrm_lookup(net, dst, flowi6_to_flowi(&fl6), NULL, 0); -diff -NurpP --minimal linux-3.9.4/net/netlink/af_netlink.c linux-3.9.4-vs2.3.6.1/net/netlink/af_netlink.c ---- linux-3.9.4/net/netlink/af_netlink.c 2013-05-31 13:45:33.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/net/netlink/af_netlink.c 2013-05-31 17:17:54.000000000 +0000 -@@ -55,6 +55,9 @@ - #include - #include - #include +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 + #include + #include +#include +#include +#include #include #include -@@ -1976,6 +1979,8 @@ static struct sock *netlink_seq_socket_i - sk_for_each(s, &hash->table[j]) { +@@ -2899,6 +2902,8 @@ static struct sock *netlink_seq_socket_i + if (sock_net(s) != seq_file_net(seq)) continue; + if (!nx_check(s->sk_nid, VS_WATCH_P | VS_IDENT)) @@ -25631,41 +24750,20 @@ diff -NurpP --minimal linux-3.9.4/net/netlink/af_netlink.c linux-3.9.4-vs2.3.6.1 if (off == pos) { iter->link = i; iter->hash_idx = j; -@@ -2010,7 +2015,8 @@ static void *netlink_seq_next(struct seq - s = v; - do { - s = sk_next(s); -- } while (s && sock_net(s) != seq_file_net(seq)); -+ } while (s && (sock_net(s) != seq_file_net(seq) || -+ !nx_check(s->sk_nid, VS_WATCH_P | VS_IDENT))); - if (s) - return s; - -@@ -2022,7 +2028,8 @@ static void *netlink_seq_next(struct seq - - for (; j <= hash->mask; j++) { - s = sk_head(&hash->table[j]); -- while (s && sock_net(s) != seq_file_net(seq)) -+ while (s && (sock_net(s) != seq_file_net(seq) || -+ !nx_check(s->sk_nid, VS_WATCH_P | VS_IDENT))) - s = sk_next(s); - if (s) { - iter->link = i; -diff -NurpP --minimal linux-3.9.4/net/socket.c linux-3.9.4-vs2.3.6.1/net/socket.c ---- linux-3.9.4/net/socket.c 2013-05-31 13:45:33.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/net/socket.c 2013-05-31 17:17:54.000000000 +0000 -@@ -98,6 +98,10 @@ +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 @@ #include #include -+#include +#include +#include +#include #include #include -@@ -617,13 +621,29 @@ static inline int __sock_sendmsg_nosec(s +@@ -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); @@ -25696,7 +24794,7 @@ diff -NurpP --minimal linux-3.9.4/net/socket.c linux-3.9.4-vs2.3.6.1/net/socket. } static inline int __sock_sendmsg(struct kiocb *iocb, struct socket *sock, -@@ -779,6 +799,7 @@ static inline int __sock_recvmsg_nosec(s +@@ -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); @@ -25704,7 +24802,7 @@ diff -NurpP --minimal linux-3.9.4/net/socket.c linux-3.9.4-vs2.3.6.1/net/socket. si->sock = sock; si->scm = NULL; -@@ -786,7 +807,18 @@ static inline int __sock_recvmsg_nosec(s +@@ -787,7 +807,18 @@ static inline int __sock_recvmsg_nosec(s si->size = size; si->flags = flags; @@ -25724,7 +24822,7 @@ diff -NurpP --minimal linux-3.9.4/net/socket.c linux-3.9.4-vs2.3.6.1/net/socket. } static inline int __sock_recvmsg(struct kiocb *iocb, struct socket *sock, -@@ -1269,6 +1301,13 @@ int __sock_create(struct net *net, int f +@@ -1264,6 +1295,13 @@ int __sock_create(struct net *net, int f if (type < 0 || type >= SOCK_MAX) return -EINVAL; @@ -25738,7 +24836,7 @@ diff -NurpP --minimal linux-3.9.4/net/socket.c linux-3.9.4-vs2.3.6.1/net/socket. /* Compatibility. This uglymoron is moved from INET layer to here to avoid -@@ -1403,6 +1442,7 @@ SYSCALL_DEFINE3(socket, int, family, int +@@ -1398,6 +1436,7 @@ SYSCALL_DEFINE3(socket, int, family, int if (retval < 0) goto out; @@ -25746,7 +24844,7 @@ diff -NurpP --minimal linux-3.9.4/net/socket.c linux-3.9.4-vs2.3.6.1/net/socket. retval = sock_map_fd(sock, flags & (O_CLOEXEC | O_NONBLOCK)); if (retval < 0) goto out_release; -@@ -1444,10 +1484,12 @@ SYSCALL_DEFINE4(socketpair, int, family, +@@ -1439,10 +1478,12 @@ SYSCALL_DEFINE4(socketpair, int, family, err = sock_create(family, type, protocol, &sock1); if (err < 0) goto out; @@ -25759,9 +24857,9 @@ diff -NurpP --minimal linux-3.9.4/net/socket.c linux-3.9.4-vs2.3.6.1/net/socket. err = sock1->ops->socketpair(sock1, sock2); if (err < 0) -diff -NurpP --minimal linux-3.9.4/net/sunrpc/auth.c linux-3.9.4-vs2.3.6.1/net/sunrpc/auth.c ---- linux-3.9.4/net/sunrpc/auth.c 2013-05-31 13:45:33.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/net/sunrpc/auth.c 2013-05-31 18:01:00.000000000 +0000 +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 @@ -15,6 +15,7 @@ #include #include @@ -25770,25 +24868,25 @@ diff -NurpP --minimal linux-3.9.4/net/sunrpc/auth.c linux-3.9.4-vs2.3.6.1/net/su #ifdef RPC_DEBUG # define RPCDBG_FACILITY RPCDBG_AUTH -@@ -480,6 +481,7 @@ rpcauth_lookupcred(struct rpc_auth *auth +@@ -630,6 +631,7 @@ rpcauth_lookupcred(struct rpc_auth *auth memset(&acred, 0, sizeof(acred)); acred.uid = cred->fsuid; acred.gid = cred->fsgid; -+ acred.tag = dx_current_tag(); - acred.group_info = get_group_info(((struct cred *)cred)->group_info); - ++ acred.tag = make_ktag(&init_user_ns, dx_current_tag()); + acred.group_info = cred->group_info; ret = auth->au_ops->lookup_cred(auth, &acred, flags); -@@ -520,6 +522,7 @@ rpcauth_bind_root_cred(struct rpc_task * + return ret; +@@ -669,6 +671,7 @@ rpcauth_bind_root_cred(struct rpc_task * struct auth_cred acred = { .uid = GLOBAL_ROOT_UID, .gid = GLOBAL_ROOT_GID, -+ .tag = dx_current_tag(), ++ .tag = KTAGT_INIT(dx_current_tag()), }; dprintk("RPC: %5u looking up %s cred\n", -diff -NurpP --minimal linux-3.9.4/net/sunrpc/auth_unix.c linux-3.9.4-vs2.3.6.1/net/sunrpc/auth_unix.c ---- linux-3.9.4/net/sunrpc/auth_unix.c 2013-05-31 13:45:33.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/net/sunrpc/auth_unix.c 2013-05-31 18:05:54.000000000 +0000 +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 @@ -13,11 +13,13 @@ #include #include @@ -25831,34 +24929,32 @@ diff -NurpP --minimal linux-3.9.4/net/sunrpc/auth_unix.c linux-3.9.4-vs2.3.6.1/n *p++ = htonl(RPC_AUTH_UNIX); base = p++; -@@ -157,8 +162,13 @@ unx_marshal(struct rpc_task *task, __be3 +@@ -157,8 +162,11 @@ unx_marshal(struct rpc_task *task, __be3 */ p = xdr_encode_array(p, clnt->cl_nodename, clnt->cl_nodelen); - *p++ = htonl((u32) from_kuid(&init_user_ns, cred->uc_uid)); - *p++ = htonl((u32) from_kgid(&init_user_ns, cred->uc_gid)); + tag = task->tk_client->cl_tag; -+ *p++ = htonl((u32) TAGINO_UID(tag, -+ from_kuid(&init_user_ns, cred->uc_uid), -+ from_ktag(&init_user_ns, cred->uc_tag))); -+ *p++ = htonl((u32) TAGINO_GID(tag, -+ from_kgid(&init_user_ns, cred->uc_gid), -+ from_ktag(&init_user_ns, cred->uc_tag))); ++ *p++ = htonl((u32) from_kuid(&init_user_ns, ++ TAGINO_KUID(tag, cred->uc_uid, cred->uc_tag))); ++ *p++ = htonl((u32) from_kgid(&init_user_ns, ++ TAGINO_KGID(tag, cred->uc_gid, cred->uc_tag))); 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.9.4/net/sunrpc/clnt.c linux-3.9.4-vs2.3.6.1/net/sunrpc/clnt.c ---- linux-3.9.4/net/sunrpc/clnt.c 2013-05-31 13:45:33.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/net/sunrpc/clnt.c 2013-05-31 17:17:54.000000000 +0000 +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 @@ -31,6 +31,7 @@ + #include #include #include - #include +#include #include #include -@@ -482,6 +483,9 @@ struct rpc_clnt *rpc_create(struct rpc_c +@@ -468,6 +469,9 @@ struct rpc_clnt *rpc_create_xprt(struct if (!(args->flags & RPC_CLNT_CREATE_QUIET)) clnt->cl_chatty = 1; @@ -25867,20 +24963,20 @@ diff -NurpP --minimal linux-3.9.4/net/sunrpc/clnt.c linux-3.9.4-vs2.3.6.1/net/su + clnt->cl_tag = 1; */ return clnt; } - EXPORT_SYMBOL_GPL(rpc_create); -diff -NurpP --minimal linux-3.9.4/net/unix/af_unix.c linux-3.9.4-vs2.3.6.1/net/unix/af_unix.c ---- linux-3.9.4/net/unix/af_unix.c 2013-05-31 13:45:33.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/net/unix/af_unix.c 2013-05-31 17:17:54.000000000 +0000 -@@ -114,6 +114,8 @@ - #include + 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 +@@ -117,6 +117,8 @@ #include #include + #include +#include +#include struct hlist_head unix_socket_table[2 * UNIX_HASH_SIZE]; EXPORT_SYMBOL_GPL(unix_socket_table); -@@ -270,6 +272,8 @@ static struct sock *__unix_find_socket_b +@@ -272,6 +274,8 @@ static struct sock *__unix_find_socket_b if (!net_eq(sock_net(s), net)) continue; @@ -25889,7 +24985,7 @@ diff -NurpP --minimal linux-3.9.4/net/unix/af_unix.c linux-3.9.4-vs2.3.6.1/net/u if (u->addr->len == len && !memcmp(u->addr->name, sunname, len)) goto found; -@@ -2256,6 +2260,8 @@ static struct sock *unix_from_bucket(str +@@ -2283,6 +2287,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; @@ -25898,7 +24994,7 @@ diff -NurpP --minimal linux-3.9.4/net/unix/af_unix.c linux-3.9.4-vs2.3.6.1/net/u if (++count == offset) break; } -@@ -2273,6 +2279,8 @@ static struct sock *unix_next_socket(str +@@ -2300,6 +2306,8 @@ static struct sock *unix_next_socket(str sk = sk_next(sk); if (!sk) goto next_bucket; @@ -25907,10 +25003,10 @@ diff -NurpP --minimal linux-3.9.4/net/unix/af_unix.c linux-3.9.4-vs2.3.6.1/net/u if (sock_net(sk) == seq_file_net(seq)) return sk; } -diff -NurpP --minimal linux-3.9.4/scripts/checksyscalls.sh linux-3.9.4-vs2.3.6.1/scripts/checksyscalls.sh ---- linux-3.9.4/scripts/checksyscalls.sh 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/scripts/checksyscalls.sh 2013-05-31 14:47:11.000000000 +0000 -@@ -193,7 +193,6 @@ cat << EOF +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 +@@ -196,7 +196,6 @@ cat << EOF #define __IGNORE_afs_syscall #define __IGNORE_getpmsg #define __IGNORE_putpmsg @@ -25918,159 +25014,9 @@ diff -NurpP --minimal linux-3.9.4/scripts/checksyscalls.sh linux-3.9.4-vs2.3.6.1 EOF } -diff -NurpP --minimal linux-3.9.4/scripts/mod/devicetable-offsets.h linux-3.9.4-vs2.3.6.1/scripts/mod/devicetable-offsets.h ---- linux-3.9.4/scripts/mod/devicetable-offsets.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/scripts/mod/devicetable-offsets.h 2013-06-01 00:22:25.000000000 +0000 -@@ -0,0 +1,146 @@ -+#ifndef __DEVICEVTABLE_OFFSETS_H__ -+#define __DEVICEVTABLE_OFFSETS_H__ -+/* -+ * DO NOT MODIFY. -+ * -+ * This file was generated by Kbuild -+ * -+ */ -+ -+#define SIZE_usb_device_id 32 /* sizeof(struct usb_device_id) # */ -+#define OFF_usb_device_id_match_flags 0 /* offsetof(struct usb_device_id, match_flags) # */ -+#define OFF_usb_device_id_idVendor 2 /* offsetof(struct usb_device_id, idVendor) # */ -+#define OFF_usb_device_id_idProduct 4 /* offsetof(struct usb_device_id, idProduct) # */ -+#define OFF_usb_device_id_bcdDevice_lo 6 /* offsetof(struct usb_device_id, bcdDevice_lo) # */ -+#define OFF_usb_device_id_bcdDevice_hi 8 /* offsetof(struct usb_device_id, bcdDevice_hi) # */ -+#define OFF_usb_device_id_bDeviceClass 10 /* offsetof(struct usb_device_id, bDeviceClass) # */ -+#define OFF_usb_device_id_bDeviceSubClass 11 /* offsetof(struct usb_device_id, bDeviceSubClass) # */ -+#define OFF_usb_device_id_bDeviceProtocol 12 /* offsetof(struct usb_device_id, bDeviceProtocol) # */ -+#define OFF_usb_device_id_bInterfaceClass 13 /* offsetof(struct usb_device_id, bInterfaceClass) # */ -+#define OFF_usb_device_id_bInterfaceSubClass 14 /* offsetof(struct usb_device_id, bInterfaceSubClass) # */ -+#define OFF_usb_device_id_bInterfaceProtocol 15 /* offsetof(struct usb_device_id, bInterfaceProtocol) # */ -+#define OFF_usb_device_id_bInterfaceNumber 16 /* offsetof(struct usb_device_id, bInterfaceNumber) # */ -+#define SIZE_hid_device_id 24 /* sizeof(struct hid_device_id) # */ -+#define OFF_hid_device_id_bus 0 /* offsetof(struct hid_device_id, bus) # */ -+#define OFF_hid_device_id_group 2 /* offsetof(struct hid_device_id, group) # */ -+#define OFF_hid_device_id_vendor 4 /* offsetof(struct hid_device_id, vendor) # */ -+#define OFF_hid_device_id_product 8 /* offsetof(struct hid_device_id, product) # */ -+#define SIZE_ieee1394_device_id 32 /* sizeof(struct ieee1394_device_id) # */ -+#define OFF_ieee1394_device_id_match_flags 0 /* offsetof(struct ieee1394_device_id, match_flags) # */ -+#define OFF_ieee1394_device_id_vendor_id 4 /* offsetof(struct ieee1394_device_id, vendor_id) # */ -+#define OFF_ieee1394_device_id_model_id 8 /* offsetof(struct ieee1394_device_id, model_id) # */ -+#define OFF_ieee1394_device_id_specifier_id 12 /* offsetof(struct ieee1394_device_id, specifier_id) # */ -+#define OFF_ieee1394_device_id_version 16 /* offsetof(struct ieee1394_device_id, version) # */ -+#define SIZE_pci_device_id 32 /* sizeof(struct pci_device_id) # */ -+#define OFF_pci_device_id_vendor 0 /* offsetof(struct pci_device_id, vendor) # */ -+#define OFF_pci_device_id_device 4 /* offsetof(struct pci_device_id, device) # */ -+#define OFF_pci_device_id_subvendor 8 /* offsetof(struct pci_device_id, subvendor) # */ -+#define OFF_pci_device_id_subdevice 12 /* offsetof(struct pci_device_id, subdevice) # */ -+#define OFF_pci_device_id_class 16 /* offsetof(struct pci_device_id, class) # */ -+#define OFF_pci_device_id_class_mask 20 /* offsetof(struct pci_device_id, class_mask) # */ -+#define SIZE_ccw_device_id 16 /* sizeof(struct ccw_device_id) # */ -+#define OFF_ccw_device_id_match_flags 0 /* offsetof(struct ccw_device_id, match_flags) # */ -+#define OFF_ccw_device_id_cu_type 2 /* offsetof(struct ccw_device_id, cu_type) # */ -+#define OFF_ccw_device_id_cu_model 6 /* offsetof(struct ccw_device_id, cu_model) # */ -+#define OFF_ccw_device_id_dev_type 4 /* offsetof(struct ccw_device_id, dev_type) # */ -+#define OFF_ccw_device_id_dev_model 7 /* offsetof(struct ccw_device_id, dev_model) # */ -+#define SIZE_ap_device_id 16 /* sizeof(struct ap_device_id) # */ -+#define OFF_ap_device_id_dev_type 2 /* offsetof(struct ap_device_id, dev_type) # */ -+#define SIZE_css_device_id 16 /* sizeof(struct css_device_id) # */ -+#define OFF_css_device_id_type 1 /* offsetof(struct css_device_id, type) # */ -+#define SIZE_serio_device_id 4 /* sizeof(struct serio_device_id) # */ -+#define OFF_serio_device_id_type 0 /* offsetof(struct serio_device_id, type) # */ -+#define OFF_serio_device_id_proto 3 /* offsetof(struct serio_device_id, proto) # */ -+#define OFF_serio_device_id_id 2 /* offsetof(struct serio_device_id, id) # */ -+#define OFF_serio_device_id_extra 1 /* offsetof(struct serio_device_id, extra) # */ -+#define SIZE_acpi_device_id 24 /* sizeof(struct acpi_device_id) # */ -+#define OFF_acpi_device_id_id 0 /* offsetof(struct acpi_device_id, id) # */ -+#define SIZE_pnp_device_id 16 /* sizeof(struct pnp_device_id) # */ -+#define OFF_pnp_device_id_id 0 /* offsetof(struct pnp_device_id, id) # */ -+#define SIZE_pnp_card_device_id 80 /* sizeof(struct pnp_card_device_id) # */ -+#define OFF_pnp_card_device_id_devs 16 /* offsetof(struct pnp_card_device_id, devs) # */ -+#define SIZE_pcmcia_device_id 80 /* sizeof(struct pcmcia_device_id) # */ -+#define OFF_pcmcia_device_id_match_flags 0 /* offsetof(struct pcmcia_device_id, match_flags) # */ -+#define OFF_pcmcia_device_id_manf_id 2 /* offsetof(struct pcmcia_device_id, manf_id) # */ -+#define OFF_pcmcia_device_id_card_id 4 /* offsetof(struct pcmcia_device_id, card_id) # */ -+#define OFF_pcmcia_device_id_func_id 6 /* offsetof(struct pcmcia_device_id, func_id) # */ -+#define OFF_pcmcia_device_id_function 7 /* offsetof(struct pcmcia_device_id, function) # */ -+#define OFF_pcmcia_device_id_device_no 8 /* offsetof(struct pcmcia_device_id, device_no) # */ -+#define OFF_pcmcia_device_id_prod_id_hash 12 /* offsetof(struct pcmcia_device_id, prod_id_hash) # */ -+#define SIZE_of_device_id 200 /* sizeof(struct of_device_id) # */ -+#define OFF_of_device_id_name 0 /* offsetof(struct of_device_id, name) # */ -+#define OFF_of_device_id_type 32 /* offsetof(struct of_device_id, type) # */ -+#define OFF_of_device_id_compatible 64 /* offsetof(struct of_device_id, compatible) # */ -+#define SIZE_vio_device_id 64 /* sizeof(struct vio_device_id) # */ -+#define OFF_vio_device_id_type 0 /* offsetof(struct vio_device_id, type) # */ -+#define OFF_vio_device_id_compat 32 /* offsetof(struct vio_device_id, compat) # */ -+#define SIZE_input_device_id 192 /* sizeof(struct input_device_id) # */ -+#define OFF_input_device_id_flags 0 /* offsetof(struct input_device_id, flags) # */ -+#define OFF_input_device_id_bustype 8 /* offsetof(struct input_device_id, bustype) # */ -+#define OFF_input_device_id_vendor 10 /* offsetof(struct input_device_id, vendor) # */ -+#define OFF_input_device_id_product 12 /* offsetof(struct input_device_id, product) # */ -+#define OFF_input_device_id_version 14 /* offsetof(struct input_device_id, version) # */ -+#define OFF_input_device_id_evbit 16 /* offsetof(struct input_device_id, evbit) # */ -+#define OFF_input_device_id_keybit 24 /* offsetof(struct input_device_id, keybit) # */ -+#define OFF_input_device_id_relbit 120 /* offsetof(struct input_device_id, relbit) # */ -+#define OFF_input_device_id_absbit 128 /* offsetof(struct input_device_id, absbit) # */ -+#define OFF_input_device_id_mscbit 136 /* offsetof(struct input_device_id, mscbit) # */ -+#define OFF_input_device_id_ledbit 144 /* offsetof(struct input_device_id, ledbit) # */ -+#define OFF_input_device_id_sndbit 152 /* offsetof(struct input_device_id, sndbit) # */ -+#define OFF_input_device_id_ffbit 160 /* offsetof(struct input_device_id, ffbit) # */ -+#define OFF_input_device_id_swbit 176 /* offsetof(struct input_device_id, swbit) # */ -+#define SIZE_eisa_device_id 16 /* sizeof(struct eisa_device_id) # */ -+#define OFF_eisa_device_id_sig 0 /* offsetof(struct eisa_device_id, sig) # */ -+#define SIZE_parisc_device_id 8 /* sizeof(struct parisc_device_id) # */ -+#define OFF_parisc_device_id_hw_type 0 /* offsetof(struct parisc_device_id, hw_type) # */ -+#define OFF_parisc_device_id_hversion 2 /* offsetof(struct parisc_device_id, hversion) # */ -+#define OFF_parisc_device_id_hversion_rev 1 /* offsetof(struct parisc_device_id, hversion_rev) # */ -+#define OFF_parisc_device_id_sversion 4 /* offsetof(struct parisc_device_id, sversion) # */ -+#define SIZE_sdio_device_id 16 /* sizeof(struct sdio_device_id) # */ -+#define OFF_sdio_device_id_class 0 /* offsetof(struct sdio_device_id, class) # */ -+#define OFF_sdio_device_id_vendor 2 /* offsetof(struct sdio_device_id, vendor) # */ -+#define OFF_sdio_device_id_device 4 /* offsetof(struct sdio_device_id, device) # */ -+#define SIZE_ssb_device_id 6 /* sizeof(struct ssb_device_id) # */ -+#define OFF_ssb_device_id_vendor 0 /* offsetof(struct ssb_device_id, vendor) # */ -+#define OFF_ssb_device_id_coreid 2 /* offsetof(struct ssb_device_id, coreid) # */ -+#define OFF_ssb_device_id_revision 4 /* offsetof(struct ssb_device_id, revision) # */ -+#define SIZE_bcma_device_id 6 /* sizeof(struct bcma_device_id) # */ -+#define OFF_bcma_device_id_manuf 0 /* offsetof(struct bcma_device_id, manuf) # */ -+#define OFF_bcma_device_id_id 2 /* offsetof(struct bcma_device_id, id) # */ -+#define OFF_bcma_device_id_rev 4 /* offsetof(struct bcma_device_id, rev) # */ -+#define OFF_bcma_device_id_class 5 /* offsetof(struct bcma_device_id, class) # */ -+#define SIZE_virtio_device_id 8 /* sizeof(struct virtio_device_id) # */ -+#define OFF_virtio_device_id_device 0 /* offsetof(struct virtio_device_id, device) # */ -+#define OFF_virtio_device_id_vendor 4 /* offsetof(struct virtio_device_id, vendor) # */ -+#define SIZE_hv_vmbus_device_id 24 /* sizeof(struct hv_vmbus_device_id) # */ -+#define OFF_hv_vmbus_device_id_guid 0 /* offsetof(struct hv_vmbus_device_id, guid) # */ -+#define SIZE_i2c_device_id 32 /* sizeof(struct i2c_device_id) # */ -+#define OFF_i2c_device_id_name 0 /* offsetof(struct i2c_device_id, name) # */ -+#define SIZE_spi_device_id 40 /* sizeof(struct spi_device_id) # */ -+#define OFF_spi_device_id_name 0 /* offsetof(struct spi_device_id, name) # */ -+#define SIZE_dmi_system_id 344 /* sizeof(struct dmi_system_id) # */ -+#define OFF_dmi_system_id_matches 16 /* offsetof(struct dmi_system_id, matches) # */ -+#define SIZE_platform_device_id 32 /* sizeof(struct platform_device_id) # */ -+#define OFF_platform_device_id_name 0 /* offsetof(struct platform_device_id, name) # */ -+#define SIZE_mdio_device_id 8 /* sizeof(struct mdio_device_id) # */ -+#define OFF_mdio_device_id_phy_id 0 /* offsetof(struct mdio_device_id, phy_id) # */ -+#define OFF_mdio_device_id_phy_id_mask 4 /* offsetof(struct mdio_device_id, phy_id_mask) # */ -+#define SIZE_zorro_device_id 16 /* sizeof(struct zorro_device_id) # */ -+#define OFF_zorro_device_id_id 0 /* offsetof(struct zorro_device_id, id) # */ -+#define SIZE_isapnp_device_id 16 /* sizeof(struct isapnp_device_id) # */ -+#define OFF_isapnp_device_id_vendor 4 /* offsetof(struct isapnp_device_id, vendor) # */ -+#define OFF_isapnp_device_id_function 6 /* offsetof(struct isapnp_device_id, function) # */ -+#define SIZE_ipack_device_id 12 /* sizeof(struct ipack_device_id) # */ -+#define OFF_ipack_device_id_format 0 /* offsetof(struct ipack_device_id, format) # */ -+#define OFF_ipack_device_id_vendor 4 /* offsetof(struct ipack_device_id, vendor) # */ -+#define OFF_ipack_device_id_device 8 /* offsetof(struct ipack_device_id, device) # */ -+#define SIZE_amba_id 16 /* sizeof(struct amba_id) # */ -+#define OFF_amba_id_id 0 /* offsetof(struct amba_id, id) # */ -+#define OFF_amba_id_mask 4 /* offsetof(struct amba_id, mask) # */ -+#define SIZE_x86_cpu_id 16 /* sizeof(struct x86_cpu_id) # */ -+#define OFF_x86_cpu_id_feature 6 /* offsetof(struct x86_cpu_id, feature) # */ -+#define OFF_x86_cpu_id_family 2 /* offsetof(struct x86_cpu_id, family) # */ -+#define OFF_x86_cpu_id_model 4 /* offsetof(struct x86_cpu_id, model) # */ -+#define OFF_x86_cpu_id_vendor 0 /* offsetof(struct x86_cpu_id, vendor) # */ -+ -+#endif -diff -NurpP --minimal linux-3.9.4/security/commoncap.c linux-3.9.4-vs2.3.6.1/security/commoncap.c ---- linux-3.9.4/security/commoncap.c 2013-05-31 13:45:34.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/security/commoncap.c 2013-05-31 15:07:02.000000000 +0000 +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 int cap_capable(const struct cred *cred, struct user_namespace *targ_ns, int cap, int audit) @@ -26094,7 +25040,7 @@ diff -NurpP --minimal linux-3.9.4/security/commoncap.c linux-3.9.4-vs2.3.6.1/sec /* Have we tried all of the parent namespaces? */ if (ns == &init_user_ns) -@@ -628,7 +633,7 @@ int cap_inode_setxattr(struct dentry *de +@@ -631,7 +636,7 @@ int cap_inode_setxattr(struct dentry *de if (!strncmp(name, XATTR_SECURITY_PREFIX, sizeof(XATTR_SECURITY_PREFIX) - 1) && @@ -26103,7 +25049,7 @@ diff -NurpP --minimal linux-3.9.4/security/commoncap.c linux-3.9.4-vs2.3.6.1/sec return -EPERM; return 0; } -@@ -654,7 +659,7 @@ int cap_inode_removexattr(struct dentry +@@ -657,7 +662,7 @@ int cap_inode_removexattr(struct dentry if (!strncmp(name, XATTR_SECURITY_PREFIX, sizeof(XATTR_SECURITY_PREFIX) - 1) && @@ -26112,10 +25058,10 @@ diff -NurpP --minimal linux-3.9.4/security/commoncap.c linux-3.9.4-vs2.3.6.1/sec return -EPERM; return 0; } -diff -NurpP --minimal linux-3.9.4/security/selinux/hooks.c linux-3.9.4-vs2.3.6.1/security/selinux/hooks.c ---- linux-3.9.4/security/selinux/hooks.c 2013-05-31 13:45:34.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.1/security/selinux/hooks.c 2013-05-31 14:47:11.000000000 +0000 -@@ -67,7 +67,6 @@ +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 @@ #include #include #include /* for Unix socket types */