-diff -NurpP --minimal linux-3.0-rc5/Documentation/vserver/debug.txt linux-3.0-rc5-vs2.3.1-pre3/Documentation/vserver/debug.txt
---- linux-3.0-rc5/Documentation/vserver/debug.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/Documentation/vserver/debug.txt 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/Documentation/vserver/debug.txt linux-3.10.53-vs2.3.6.8/Documentation/vserver/debug.txt
+--- linux-3.10.53/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/Documentation/vserver/debug.txt 2013-08-22 20:29:59.000000000 +0000
@@ -0,0 +1,154 @@
+
+debug_cvirt:
+ 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.0-rc5/arch/alpha/Kconfig linux-3.0-rc5-vs2.3.1-pre3/arch/alpha/Kconfig
---- linux-3.0-rc5/arch/alpha/Kconfig 2011-07-01 11:13:32.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/alpha/Kconfig 2011-06-10 22:11:24.000000000 +0200
-@@ -668,6 +668,8 @@ config DUMMY_CONSOLE
+diff -NurpP --minimal linux-3.10.53/arch/alpha/Kconfig linux-3.10.53-vs2.3.6.8/arch/alpha/Kconfig
+--- linux-3.10.53/arch/alpha/Kconfig 2013-07-14 17:00:13.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/arch/alpha/Kconfig 2013-08-22 20:29:59.000000000 +0000
+@@ -665,6 +665,8 @@ config DUMMY_CONSOLE
depends on VGA_HOSE
default y
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0-rc5/arch/alpha/kernel/entry.S linux-3.0-rc5-vs2.3.1-pre3/arch/alpha/kernel/entry.S
---- linux-3.0-rc5/arch/alpha/kernel/entry.S 2010-10-21 13:06:45.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/alpha/kernel/entry.S 2011-06-10 22:11:24.000000000 +0200
-@@ -860,24 +860,15 @@ sys_getxgid:
- .globl sys_getxpid
- .ent sys_getxpid
- sys_getxpid:
-+ lda $sp, -16($sp)
-+ stq $26, 0($sp)
- .prologue 0
-- ldq $2, TI_TASK($8)
-
-- /* See linux/kernel/timer.c sys_getppid for discussion
-- about this loop. */
-- ldq $3, TASK_GROUP_LEADER($2)
-- ldq $4, TASK_REAL_PARENT($3)
-- ldl $0, TASK_TGID($2)
--1: ldl $1, TASK_TGID($4)
--#ifdef CONFIG_SMP
-- mov $4, $5
-- mb
-- ldq $3, TASK_GROUP_LEADER($2)
-- ldq $4, TASK_REAL_PARENT($3)
-- cmpeq $4, $5, $5
-- beq $5, 1b
--#endif
-- stq $1, 80($sp)
-+ lda $16, 96($sp)
-+ jsr $26, do_getxpid
-+ ldq $26, 0($sp)
-+
-+ lda $sp, 16($sp)
- ret
- .end sys_getxpid
-
-diff -NurpP --minimal linux-3.0-rc5/arch/alpha/kernel/ptrace.c linux-3.0-rc5-vs2.3.1-pre3/arch/alpha/kernel/ptrace.c
---- linux-3.0-rc5/arch/alpha/kernel/ptrace.c 2011-01-05 21:48:40.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/alpha/kernel/ptrace.c 2011-06-10 22:11:24.000000000 +0200
-@@ -13,6 +13,7 @@
- #include <linux/user.h>
- #include <linux/security.h>
- #include <linux/signal.h>
-+#include <linux/vs_base.h>
-
- #include <asm/uaccess.h>
- #include <asm/pgtable.h>
-diff -NurpP --minimal linux-3.0-rc5/arch/alpha/kernel/systbls.S linux-3.0-rc5-vs2.3.1-pre3/arch/alpha/kernel/systbls.S
---- linux-3.0-rc5/arch/alpha/kernel/systbls.S 2011-07-01 11:13:32.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/alpha/kernel/systbls.S 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/arch/alpha/kernel/systbls.S linux-3.10.53-vs2.3.6.8/arch/alpha/kernel/systbls.S
+--- linux-3.10.53/arch/alpha/kernel/systbls.S 2013-02-19 13:56:11.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/arch/alpha/kernel/systbls.S 2013-08-22 20:29:59.000000000 +0000
@@ -446,7 +446,7 @@ sys_call_table:
.quad sys_stat64 /* 425 */
.quad sys_lstat64
.quad sys_ni_syscall /* sys_mbind */
.quad sys_ni_syscall /* sys_get_mempolicy */
.quad sys_ni_syscall /* sys_set_mempolicy */
-diff -NurpP --minimal linux-3.0-rc5/arch/alpha/kernel/traps.c linux-3.0-rc5-vs2.3.1-pre3/arch/alpha/kernel/traps.c
---- linux-3.0-rc5/arch/alpha/kernel/traps.c 2010-10-21 13:06:46.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/alpha/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200
-@@ -183,7 +183,8 @@ die_if_kernel(char * str, struct pt_regs
+diff -NurpP --minimal linux-3.10.53/arch/alpha/kernel/traps.c linux-3.10.53-vs2.3.6.8/arch/alpha/kernel/traps.c
+--- linux-3.10.53/arch/alpha/kernel/traps.c 2013-07-14 17:00:13.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/arch/alpha/kernel/traps.c 2013-08-22 20:29:59.000000000 +0000
+@@ -177,7 +177,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);
+ add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE);
dik_show_trace((unsigned long *)(regs+1));
-diff -NurpP --minimal linux-3.0-rc5/arch/arm/Kconfig linux-3.0-rc5-vs2.3.1-pre3/arch/arm/Kconfig
---- linux-3.0-rc5/arch/arm/Kconfig 2011-07-01 11:13:32.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/arm/Kconfig 2011-06-10 22:11:24.000000000 +0200
-@@ -2035,6 +2035,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.10.53/arch/arm/Kconfig linux-3.10.53-vs2.3.6.8/arch/arm/Kconfig
+--- linux-3.10.53/arch/arm/Kconfig 2014-08-30 13:38:31.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/arch/arm/Kconfig 2014-08-30 14:03:46.000000000 +0000
+@@ -2239,6 +2239,8 @@ source "fs/Kconfig"
source "arch/arm/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0-rc5/arch/arm/kernel/calls.S linux-3.0-rc5-vs2.3.1-pre3/arch/arm/kernel/calls.S
---- linux-3.0-rc5/arch/arm/kernel/calls.S 2011-07-01 11:13:32.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/arm/kernel/calls.S 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/arch/arm/kernel/calls.S linux-3.10.53-vs2.3.6.8/arch/arm/kernel/calls.S
+--- linux-3.10.53/arch/arm/kernel/calls.S 2013-05-31 13:44:29.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/arch/arm/kernel/calls.S 2013-08-22 20:29:59.000000000 +0000
@@ -322,7 +322,7 @@
/* 310 */ CALL(sys_request_key)
CALL(sys_keyctl)
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-3.0-rc5/arch/arm/kernel/process.c linux-3.0-rc5-vs2.3.1-pre3/arch/arm/kernel/process.c
---- linux-3.0-rc5/arch/arm/kernel/process.c 2011-05-22 16:16:47.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/arm/kernel/process.c 2011-06-10 22:11:24.000000000 +0200
-@@ -315,7 +315,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);
- __backtrace();
- }
-diff -NurpP --minimal linux-3.0-rc5/arch/arm/kernel/traps.c linux-3.0-rc5-vs2.3.1-pre3/arch/arm/kernel/traps.c
---- linux-3.0-rc5/arch/arm/kernel/traps.c 2011-07-01 11:13:32.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/arm/kernel/traps.c 2011-06-22 12:39:12.000000000 +0200
-@@ -242,8 +242,8 @@ static int __die(const char *str, int er
+diff -NurpP --minimal linux-3.10.53/arch/arm/kernel/traps.c linux-3.10.53-vs2.3.6.8/arch/arm/kernel/traps.c
+--- linux-3.10.53/arch/arm/kernel/traps.c 2014-08-30 13:38:32.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/arch/arm/kernel/traps.c 2014-01-22 19:00:34.000000000 +0000
+@@ -246,8 +246,8 @@ static int __die(const char *str, int er
print_modules();
__show_regs(regs);
- printk(KERN_EMERG "Process %.*s (pid: %d, stack limit = 0x%p)\n",
-- TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), thread + 1);
+- TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), end_of_stack(tsk));
+ printk(KERN_EMERG "Process %.*s (pid: %d:#%u, stack limit = 0x%p)\n",
-+ TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), tsk->xid, thread + 1);
++ TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), tsk->xid, end_of_stack(tsk));
if (!user_mode(regs) || in_interrupt()) {
dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-3.0-rc5/arch/cris/Kconfig linux-3.0-rc5-vs2.3.1-pre3/arch/cris/Kconfig
---- linux-3.0-rc5/arch/cris/Kconfig 2011-07-01 11:13:37.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/cris/Kconfig 2011-06-10 22:11:24.000000000 +0200
-@@ -678,6 +678,8 @@ source "drivers/staging/Kconfig"
+diff -NurpP --minimal linux-3.10.53/arch/cris/Kconfig linux-3.10.53-vs2.3.6.8/arch/cris/Kconfig
+--- linux-3.10.53/arch/cris/Kconfig 2013-07-14 17:00:25.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/arch/cris/Kconfig 2013-08-22 20:29:59.000000000 +0000
+@@ -673,6 +673,8 @@ source "drivers/staging/Kconfig"
source "arch/cris/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0-rc5/arch/frv/kernel/kernel_thread.S linux-3.0-rc5-vs2.3.1-pre3/arch/frv/kernel/kernel_thread.S
---- linux-3.0-rc5/arch/frv/kernel/kernel_thread.S 2008-12-25 00:26:37.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/frv/kernel/kernel_thread.S 2011-06-10 22:11:24.000000000 +0200
-@@ -37,7 +37,7 @@ kernel_thread:
-
- # start by forking the current process, but with shared VM
- setlos.p #__NR_clone,gr7 ; syscall number
-- ori gr10,#CLONE_VM,gr8 ; first syscall arg [clone_flags]
-+ ori gr10,#CLONE_KT,gr8 ; first syscall arg [clone_flags]
- sethi.p #0xe4e4,gr9 ; second syscall arg [newsp]
- setlo #0xe4e4,gr9
- setlos.p #0,gr10 ; third syscall arg [parent_tidptr]
-diff -NurpP --minimal linux-3.0-rc5/arch/h8300/Kconfig linux-3.0-rc5-vs2.3.1-pre3/arch/h8300/Kconfig
---- linux-3.0-rc5/arch/h8300/Kconfig 2011-07-01 11:13:37.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/h8300/Kconfig 2011-06-10 22:11:24.000000000 +0200
-@@ -213,6 +213,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.10.53/arch/h8300/Kconfig linux-3.10.53-vs2.3.6.8/arch/h8300/Kconfig
+--- linux-3.10.53/arch/h8300/Kconfig 2013-07-14 17:00:25.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/arch/h8300/Kconfig 2013-08-22 20:29:59.000000000 +0000
+@@ -218,6 +218,8 @@ source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0-rc5/arch/ia64/Kconfig linux-3.0-rc5-vs2.3.1-pre3/arch/ia64/Kconfig
---- linux-3.0-rc5/arch/ia64/Kconfig 2011-07-01 11:13:37.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/ia64/Kconfig 2011-06-10 22:11:24.000000000 +0200
-@@ -671,6 +671,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.10.53/arch/ia64/Kconfig linux-3.10.53-vs2.3.6.8/arch/ia64/Kconfig
+--- linux-3.10.53/arch/ia64/Kconfig 2013-07-14 17:00:25.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/arch/ia64/Kconfig 2013-08-22 20:29:59.000000000 +0000
+@@ -643,6 +643,8 @@ source "fs/Kconfig"
source "arch/ia64/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0-rc5/arch/ia64/include/asm/tlb.h linux-3.0-rc5-vs2.3.1-pre3/arch/ia64/include/asm/tlb.h
---- linux-3.0-rc5/arch/ia64/include/asm/tlb.h 2011-07-01 11:13:37.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/ia64/include/asm/tlb.h 2011-06-10 22:11:24.000000000 +0200
-@@ -40,6 +40,7 @@
- #include <linux/mm.h>
- #include <linux/pagemap.h>
- #include <linux/swap.h>
-+#include <linux/vs_memory.h>
-
- #include <asm/pgalloc.h>
- #include <asm/processor.h>
-diff -NurpP --minimal linux-3.0-rc5/arch/ia64/kernel/entry.S linux-3.0-rc5-vs2.3.1-pre3/arch/ia64/kernel/entry.S
---- linux-3.0-rc5/arch/ia64/kernel/entry.S 2011-07-01 11:13:38.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/ia64/kernel/entry.S 2011-06-10 22:11:24.000000000 +0200
-@@ -1714,7 +1714,7 @@ sys_call_table:
+diff -NurpP --minimal linux-3.10.53/arch/ia64/kernel/entry.S linux-3.10.53-vs2.3.6.8/arch/ia64/kernel/entry.S
+--- linux-3.10.53/arch/ia64/kernel/entry.S 2013-05-31 13:44:38.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/arch/ia64/kernel/entry.S 2013-08-22 20:29:59.000000000 +0000
+@@ -1719,7 +1719,7 @@ sys_call_table:
data8 sys_mq_notify
data8 sys_mq_getsetattr
data8 sys_kexec_load
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -NurpP --minimal linux-3.0-rc5/arch/ia64/kernel/perfmon.c linux-3.0-rc5-vs2.3.1-pre3/arch/ia64/kernel/perfmon.c
---- linux-3.0-rc5/arch/ia64/kernel/perfmon.c 2011-03-15 18:06:39.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/ia64/kernel/perfmon.c 2011-06-10 22:11:24.000000000 +0200
-@@ -42,6 +42,7 @@
- #include <linux/completion.h>
- #include <linux/tracehook.h>
- #include <linux/slab.h>
-+#include <linux/vs_memory.h>
-
- #include <asm/errno.h>
- #include <asm/intrinsics.h>
-diff -NurpP --minimal linux-3.0-rc5/arch/ia64/kernel/process.c linux-3.0-rc5-vs2.3.1-pre3/arch/ia64/kernel/process.c
---- linux-3.0-rc5/arch/ia64/kernel/process.c 2011-03-15 18:06:39.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/ia64/kernel/process.c 2011-06-10 22:11:24.000000000 +0200
-@@ -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.0-rc5/arch/ia64/kernel/ptrace.c linux-3.0-rc5-vs2.3.1-pre3/arch/ia64/kernel/ptrace.c
---- linux-3.0-rc5/arch/ia64/kernel/ptrace.c 2011-01-05 21:48:59.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/ia64/kernel/ptrace.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/arch/ia64/kernel/ptrace.c linux-3.10.53-vs2.3.6.8/arch/ia64/kernel/ptrace.c
+--- linux-3.10.53/arch/ia64/kernel/ptrace.c 2013-02-19 13:56:51.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/arch/ia64/kernel/ptrace.c 2013-08-22 20:29:59.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/regset.h>
#include <linux/elf.h>
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-3.0-rc5/arch/ia64/kernel/traps.c linux-3.0-rc5-vs2.3.1-pre3/arch/ia64/kernel/traps.c
---- linux-3.0-rc5/arch/ia64/kernel/traps.c 2010-07-07 18:31:01.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/ia64/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200
-@@ -59,8 +59,9 @@ die (const char *str, struct pt_regs *re
+diff -NurpP --minimal linux-3.10.53/arch/ia64/kernel/traps.c linux-3.10.53-vs2.3.6.8/arch/ia64/kernel/traps.c
+--- linux-3.10.53/arch/ia64/kernel/traps.c 2013-05-31 13:44:38.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/arch/ia64/kernel/traps.c 2013-08-22 20:29:59.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)
!= NOTIFY_STOP)
show_regs(regs);
-@@ -323,8 +324,9 @@ handle_fpu_swa (int fp_fault, struct pt_
+@@ -324,8 +325,9 @@ handle_fpu_swa (int fp_fault, struct pt_
if ((last.count & 15) < 5 && (ia64_fetchadd(1, &last.count, acq) & 15) < 5) {
last.time = current_jiffies + 5 * HZ;
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.0-rc5/arch/ia64/mm/fault.c linux-3.0-rc5-vs2.3.1-pre3/arch/ia64/mm/fault.c
---- linux-3.0-rc5/arch/ia64/mm/fault.c 2011-07-01 11:13:38.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/ia64/mm/fault.c 2011-06-10 22:28:23.000000000 +0200
-@@ -11,6 +11,7 @@
- #include <linux/kprobes.h>
- #include <linux/kdebug.h>
- #include <linux/prefetch.h>
-+#include <linux/vs_memory.h>
-
- #include <asm/pgtable.h>
- #include <asm/processor.h>
-diff -NurpP --minimal linux-3.0-rc5/arch/m32r/kernel/traps.c linux-3.0-rc5-vs2.3.1-pre3/arch/m32r/kernel/traps.c
---- linux-3.0-rc5/arch/m32r/kernel/traps.c 2009-12-03 20:01:57.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/m32r/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200
-@@ -196,8 +196,9 @@ static void show_registers(struct pt_reg
+diff -NurpP --minimal linux-3.10.53/arch/m32r/kernel/traps.c linux-3.10.53-vs2.3.6.8/arch/m32r/kernel/traps.c
+--- linux-3.10.53/arch/m32r/kernel/traps.c 2013-07-14 17:00:26.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/arch/m32r/kernel/traps.c 2013-08-22 20:29:59.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.0-rc5/arch/m68k/Kconfig linux-3.0-rc5-vs2.3.1-pre3/arch/m68k/Kconfig
---- linux-3.0-rc5/arch/m68k/Kconfig 2011-07-01 11:13:38.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/m68k/Kconfig 2011-06-10 22:11:24.000000000 +0200
-@@ -241,6 +241,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.10.53/arch/m68k/Kconfig linux-3.10.53-vs2.3.6.8/arch/m68k/Kconfig
+--- linux-3.10.53/arch/m68k/Kconfig 2014-08-30 13:38:33.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/arch/m68k/Kconfig 2014-04-22 03:48:10.000000000 +0000
+@@ -135,6 +135,8 @@ source "fs/Kconfig"
source "arch/m68k/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0-rc5/arch/mips/Kconfig linux-3.0-rc5-vs2.3.1-pre3/arch/mips/Kconfig
---- linux-3.0-rc5/arch/mips/Kconfig 2011-07-01 11:13:38.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/mips/Kconfig 2011-06-10 22:11:24.000000000 +0200
-@@ -2485,6 +2485,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.10.53/arch/mips/Kconfig linux-3.10.53-vs2.3.6.8/arch/mips/Kconfig
+--- linux-3.10.53/arch/mips/Kconfig 2014-08-30 13:38:33.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/arch/mips/Kconfig 2013-11-13 17:17:15.000000000 +0000
+@@ -2583,6 +2583,8 @@ source "fs/Kconfig"
source "arch/mips/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0-rc5/arch/mips/kernel/ptrace.c linux-3.0-rc5-vs2.3.1-pre3/arch/mips/kernel/ptrace.c
---- linux-3.0-rc5/arch/mips/kernel/ptrace.c 2011-07-01 11:13:39.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/mips/kernel/ptrace.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/arch/mips/kernel/ptrace.c linux-3.10.53-vs2.3.6.8/arch/mips/kernel/ptrace.c
+--- linux-3.10.53/arch/mips/kernel/ptrace.c 2013-05-31 13:44:42.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/arch/mips/kernel/ptrace.c 2013-08-22 20:29:59.000000000 +0000
@@ -25,6 +25,7 @@
#include <linux/security.h>
#include <linux/audit.h>
#include <asm/byteorder.h>
#include <asm/cpu.h>
-@@ -263,6 +264,9 @@ long arch_ptrace(struct task_struct *chi
+@@ -262,6 +263,9 @@ long arch_ptrace(struct task_struct *chi
void __user *datavp = (void __user *) data;
unsigned long __user *datalp = (void __user *) data;
switch (request) {
/* when I and D space are separate, these will need to be fixed. */
case PTRACE_PEEKTEXT: /* read word at location addr. */
-diff -NurpP --minimal linux-3.0-rc5/arch/mips/kernel/scall32-o32.S linux-3.0-rc5-vs2.3.1-pre3/arch/mips/kernel/scall32-o32.S
---- linux-3.0-rc5/arch/mips/kernel/scall32-o32.S 2011-07-01 11:13:39.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/mips/kernel/scall32-o32.S 2011-06-10 22:11:24.000000000 +0200
-@@ -523,7 +523,7 @@ einval: li v0, -ENOSYS
+diff -NurpP --minimal linux-3.10.53/arch/mips/kernel/scall32-o32.S linux-3.10.53-vs2.3.6.8/arch/mips/kernel/scall32-o32.S
+--- linux-3.10.53/arch/mips/kernel/scall32-o32.S 2013-07-14 17:00:28.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/arch/mips/kernel/scall32-o32.S 2013-08-22 20:29:59.000000000 +0000
+@@ -521,7 +521,7 @@ einval: li v0, -ENOSYS
sys sys_mq_timedreceive 5
sys sys_mq_notify 2 /* 4275 */
sys sys_mq_getsetattr 3
sys sys_waitid 5
sys sys_ni_syscall 0 /* available, was setaltroot */
sys sys_add_key 5 /* 4280 */
-diff -NurpP --minimal linux-3.0-rc5/arch/mips/kernel/scall64-64.S linux-3.0-rc5-vs2.3.1-pre3/arch/mips/kernel/scall64-64.S
---- linux-3.0-rc5/arch/mips/kernel/scall64-64.S 2011-07-01 11:13:39.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/mips/kernel/scall64-64.S 2011-06-10 22:11:24.000000000 +0200
-@@ -362,7 +362,7 @@ sys_call_table:
+diff -NurpP --minimal linux-3.10.53/arch/mips/kernel/scall64-64.S linux-3.10.53-vs2.3.6.8/arch/mips/kernel/scall64-64.S
+--- linux-3.10.53/arch/mips/kernel/scall64-64.S 2013-07-14 17:00:28.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/arch/mips/kernel/scall64-64.S 2013-08-22 20:29:59.000000000 +0000
+@@ -351,7 +351,7 @@ sys_call_table:
PTR sys_mq_timedreceive
PTR sys_mq_notify
PTR sys_mq_getsetattr /* 5235 */
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-3.0-rc5/arch/mips/kernel/scall64-n32.S linux-3.0-rc5-vs2.3.1-pre3/arch/mips/kernel/scall64-n32.S
---- linux-3.0-rc5/arch/mips/kernel/scall64-n32.S 2011-07-01 11:13:39.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/mips/kernel/scall64-n32.S 2011-06-10 22:11:24.000000000 +0200
-@@ -361,7 +361,7 @@ EXPORT(sysn32_call_table)
+diff -NurpP --minimal linux-3.10.53/arch/mips/kernel/scall64-n32.S linux-3.10.53-vs2.3.6.8/arch/mips/kernel/scall64-n32.S
+--- linux-3.10.53/arch/mips/kernel/scall64-n32.S 2013-07-14 17:00:28.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/arch/mips/kernel/scall64-n32.S 2013-08-22 20:29:59.000000000 +0000
+@@ -344,7 +344,7 @@ EXPORT(sysn32_call_table)
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify
PTR compat_sys_mq_getsetattr
PTR compat_sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-3.0-rc5/arch/mips/kernel/scall64-o32.S linux-3.0-rc5-vs2.3.1-pre3/arch/mips/kernel/scall64-o32.S
---- linux-3.0-rc5/arch/mips/kernel/scall64-o32.S 2011-07-01 11:13:39.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/mips/kernel/scall64-o32.S 2011-06-10 22:11:24.000000000 +0200
-@@ -480,7 +480,7 @@ sys_call_table:
+diff -NurpP --minimal linux-3.10.53/arch/mips/kernel/scall64-o32.S linux-3.10.53-vs2.3.6.8/arch/mips/kernel/scall64-o32.S
+--- linux-3.10.53/arch/mips/kernel/scall64-o32.S 2013-07-14 17:00:28.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/arch/mips/kernel/scall64-o32.S 2013-08-22 20:29:59.000000000 +0000
+@@ -469,7 +469,7 @@ sys_call_table:
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify /* 4275 */
PTR compat_sys_mq_getsetattr
- PTR sys_ni_syscall /* sys_vserver */
+ PTR sys32_vserver
- PTR sys_32_waitid
+ PTR compat_sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-diff -NurpP --minimal linux-3.0-rc5/arch/mips/kernel/traps.c linux-3.0-rc5-vs2.3.1-pre3/arch/mips/kernel/traps.c
---- linux-3.0-rc5/arch/mips/kernel/traps.c 2011-05-22 16:17:00.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/mips/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200
-@@ -343,9 +343,10 @@ void show_registers(struct pt_regs *regs
+diff -NurpP --minimal linux-3.10.53/arch/mips/kernel/traps.c linux-3.10.53-vs2.3.6.8/arch/mips/kernel/traps.c
+--- linux-3.10.53/arch/mips/kernel/traps.c 2013-07-14 17:00:28.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/arch/mips/kernel/traps.c 2013-08-22 20:29:59.000000000 +0000
+@@ -331,9 +331,10 @@ void show_registers(struct pt_regs *regs
__show_regs(regs);
print_modules();
if (cpu_has_userlocal) {
unsigned long tls;
-diff -NurpP --minimal linux-3.0-rc5/arch/parisc/Kconfig linux-3.0-rc5-vs2.3.1-pre3/arch/parisc/Kconfig
---- linux-3.0-rc5/arch/parisc/Kconfig 2011-07-01 11:13:42.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/parisc/Kconfig 2011-06-10 22:11:24.000000000 +0200
-@@ -279,6 +279,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.10.53/arch/parisc/Kconfig linux-3.10.53-vs2.3.6.8/arch/parisc/Kconfig
+--- linux-3.10.53/arch/parisc/Kconfig 2013-07-14 17:00:29.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/arch/parisc/Kconfig 2013-08-22 20:29:59.000000000 +0000
+@@ -318,6 +318,8 @@ source "fs/Kconfig"
source "arch/parisc/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0-rc5/arch/parisc/kernel/syscall_table.S linux-3.0-rc5-vs2.3.1-pre3/arch/parisc/kernel/syscall_table.S
---- linux-3.0-rc5/arch/parisc/kernel/syscall_table.S 2011-07-01 11:13:43.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/parisc/kernel/syscall_table.S 2011-06-10 22:11:24.000000000 +0200
-@@ -361,7 +361,7 @@
+diff -NurpP --minimal linux-3.10.53/arch/parisc/kernel/syscall_table.S linux-3.10.53-vs2.3.6.8/arch/parisc/kernel/syscall_table.S
+--- linux-3.10.53/arch/parisc/kernel/syscall_table.S 2014-08-30 13:38:34.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/arch/parisc/kernel/syscall_table.S 2014-06-12 11:14:28.000000000 +0000
+@@ -358,7 +358,7 @@
ENTRY_COMP(mbind) /* 260 */
ENTRY_COMP(get_mempolicy)
ENTRY_COMP(set_mempolicy)
ENTRY_SAME(add_key)
ENTRY_SAME(request_key) /* 265 */
ENTRY_SAME(keyctl)
-diff -NurpP --minimal linux-3.0-rc5/arch/parisc/kernel/traps.c linux-3.0-rc5-vs2.3.1-pre3/arch/parisc/kernel/traps.c
---- linux-3.0-rc5/arch/parisc/kernel/traps.c 2009-09-10 15:25:40.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/parisc/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200
-@@ -236,8 +236,9 @@ void die_if_kernel(char *str, struct pt_
+diff -NurpP --minimal linux-3.10.53/arch/parisc/kernel/traps.c linux-3.10.53-vs2.3.6.8/arch/parisc/kernel/traps.c
+--- linux-3.10.53/arch/parisc/kernel/traps.c 2014-08-30 13:38:34.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/arch/parisc/kernel/traps.c 2013-11-13 17:17:15.000000000 +0000
+@@ -229,8 +229,9 @@ void die_if_kernel(char *str, struct pt_
if (err == 0)
return; /* STFU */
#ifdef PRINT_USER_FAULTS
/* XXX for debugging only */
show_regs(regs);
-@@ -270,8 +271,8 @@ void die_if_kernel(char *str, struct pt_
+@@ -263,8 +264,8 @@ void die_if_kernel(char *str, struct pt_
pdc_console_restart();
if (err)
/* Wot's wrong wif bein' racy? */
if (current->thread.flags & PARISC_KERNEL_DEATH) {
-diff -NurpP --minimal linux-3.0-rc5/arch/parisc/mm/fault.c linux-3.0-rc5-vs2.3.1-pre3/arch/parisc/mm/fault.c
---- linux-3.0-rc5/arch/parisc/mm/fault.c 2010-08-02 16:52:06.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/parisc/mm/fault.c 2011-06-10 22:11:24.000000000 +0200
-@@ -237,8 +237,9 @@ bad_area:
+diff -NurpP --minimal linux-3.10.53/arch/parisc/mm/fault.c linux-3.10.53-vs2.3.6.8/arch/parisc/mm/fault.c
+--- linux-3.10.53/arch/parisc/mm/fault.c 2013-05-31 13:44:44.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/arch/parisc/mm/fault.c 2013-08-22 20:29:59.000000000 +0000
+@@ -257,8 +257,9 @@ bad_area:
#ifdef PRINT_USER_FAULTS
printk(KERN_DEBUG "\n");
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.0-rc5/arch/powerpc/Kconfig linux-3.0-rc5-vs2.3.1-pre3/arch/powerpc/Kconfig
---- linux-3.0-rc5/arch/powerpc/Kconfig 2011-07-01 11:13:43.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/powerpc/Kconfig 2011-06-10 22:11:24.000000000 +0200
-@@ -978,6 +978,8 @@ source "lib/Kconfig"
+diff -NurpP --minimal linux-3.10.53/arch/powerpc/Kconfig linux-3.10.53-vs2.3.6.8/arch/powerpc/Kconfig
+--- linux-3.10.53/arch/powerpc/Kconfig 2014-08-30 13:38:34.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/arch/powerpc/Kconfig 2014-08-30 14:03:47.000000000 +0000
+@@ -1011,6 +1011,8 @@ source "lib/Kconfig"
source "arch/powerpc/Kconfig.debug"
source "security/Kconfig"
config KEYS_COMPAT
-diff -NurpP --minimal linux-3.0-rc5/arch/powerpc/include/asm/unistd.h linux-3.0-rc5-vs2.3.1-pre3/arch/powerpc/include/asm/unistd.h
---- linux-3.0-rc5/arch/powerpc/include/asm/unistd.h 2011-07-01 11:13:44.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/powerpc/include/asm/unistd.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/arch/powerpc/include/uapi/asm/unistd.h linux-3.10.53-vs2.3.6.8/arch/powerpc/include/uapi/asm/unistd.h
+--- linux-3.10.53/arch/powerpc/include/uapi/asm/unistd.h 2013-05-31 13:44:44.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/arch/powerpc/include/uapi/asm/unistd.h 2013-08-22 20:29:59.000000000 +0000
@@ -275,7 +275,7 @@
#endif
#define __NR_rtas 255
#define __NR_migrate_pages 258
#define __NR_mbind 259
#define __NR_get_mempolicy 260
-diff -NurpP --minimal linux-3.0-rc5/arch/powerpc/kernel/process.c linux-3.0-rc5-vs2.3.1-pre3/arch/powerpc/kernel/process.c
---- linux-3.0-rc5/arch/powerpc/kernel/process.c 2011-07-01 11:13:44.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/powerpc/kernel/process.c 2011-06-10 22:11:24.000000000 +0200
-@@ -656,8 +656,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.0-rc5/arch/powerpc/kernel/traps.c linux-3.0-rc5-vs2.3.1-pre3/arch/powerpc/kernel/traps.c
---- linux-3.0-rc5/arch/powerpc/kernel/traps.c 2011-07-01 11:13:44.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/powerpc/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200
-@@ -1075,8 +1075,9 @@ void nonrecoverable_exception(struct pt_
+diff -NurpP --minimal linux-3.10.53/arch/powerpc/kernel/traps.c linux-3.10.53-vs2.3.6.8/arch/powerpc/kernel/traps.c
+--- linux-3.10.53/arch/powerpc/kernel/traps.c 2014-08-30 13:38:35.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/arch/powerpc/kernel/traps.c 2013-11-13 17:17:15.000000000 +0000
+@@ -1231,8 +1231,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.0-rc5/arch/powerpc/kernel/vdso.c linux-3.0-rc5-vs2.3.1-pre3/arch/powerpc/kernel/vdso.c
---- linux-3.0-rc5/arch/powerpc/kernel/vdso.c 2011-05-22 16:17:02.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/powerpc/kernel/vdso.c 2011-06-10 22:11:24.000000000 +0200
-@@ -23,6 +23,7 @@
- #include <linux/security.h>
- #include <linux/bootmem.h>
- #include <linux/memblock.h>
-+#include <linux/vs_memory.h>
-
- #include <asm/pgtable.h>
- #include <asm/system.h>
-diff -NurpP --minimal linux-3.0-rc5/arch/s390/Kconfig linux-3.0-rc5-vs2.3.1-pre3/arch/s390/Kconfig
---- linux-3.0-rc5/arch/s390/Kconfig 2011-07-01 11:13:45.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/s390/Kconfig 2011-07-01 11:35:34.000000000 +0200
-@@ -628,6 +628,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.10.53/arch/s390/Kconfig linux-3.10.53-vs2.3.6.8/arch/s390/Kconfig
+--- linux-3.10.53/arch/s390/Kconfig 2014-08-30 13:38:36.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/arch/s390/Kconfig 2014-04-22 03:48:10.000000000 +0000
+@@ -580,6 +580,8 @@ source "fs/Kconfig"
source "arch/s390/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0-rc5/arch/s390/include/asm/tlb.h linux-3.0-rc5-vs2.3.1-pre3/arch/s390/include/asm/tlb.h
---- linux-3.0-rc5/arch/s390/include/asm/tlb.h 2011-07-01 11:13:45.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/s390/include/asm/tlb.h 2011-06-15 02:40:14.000000000 +0200
-@@ -24,6 +24,8 @@
+diff -NurpP --minimal linux-3.10.53/arch/s390/include/asm/tlb.h linux-3.10.53-vs2.3.6.8/arch/s390/include/asm/tlb.h
+--- linux-3.10.53/arch/s390/include/asm/tlb.h 2014-08-30 13:38:36.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/arch/s390/include/asm/tlb.h 2013-11-13 17:17:15.000000000 +0000
+@@ -24,6 +24,7 @@
#include <linux/mm.h>
#include <linux/pagemap.h>
#include <linux/swap.h>
-+#include <linux/vs_memory.h>
+
#include <asm/processor.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-3.0-rc5/arch/s390/include/asm/unistd.h linux-3.0-rc5-vs2.3.1-pre3/arch/s390/include/asm/unistd.h
---- linux-3.0-rc5/arch/s390/include/asm/unistd.h 2011-07-01 11:13:45.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/s390/include/asm/unistd.h 2011-06-10 22:11:24.000000000 +0200
-@@ -202,7 +202,7 @@
+diff -NurpP --minimal linux-3.10.53/arch/s390/include/uapi/asm/unistd.h linux-3.10.53-vs2.3.6.8/arch/s390/include/uapi/asm/unistd.h
+--- linux-3.10.53/arch/s390/include/uapi/asm/unistd.h 2013-02-19 13:57:16.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/arch/s390/include/uapi/asm/unistd.h 2013-08-22 20:29:59.000000000 +0000
+@@ -200,7 +200,7 @@
#define __NR_clock_gettime (__NR_timer_create+6)
#define __NR_clock_getres (__NR_timer_create+7)
#define __NR_clock_nanosleep (__NR_timer_create+8)
#define __NR_statfs64 265
#define __NR_fstatfs64 266
#define __NR_remap_file_pages 267
-diff -NurpP --minimal linux-3.0-rc5/arch/s390/kernel/ptrace.c linux-3.0-rc5-vs2.3.1-pre3/arch/s390/kernel/ptrace.c
---- linux-3.0-rc5/arch/s390/kernel/ptrace.c 2011-03-15 18:06:45.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/s390/kernel/ptrace.c 2011-06-10 22:11:24.000000000 +0200
-@@ -20,6 +20,7 @@
- #include <linux/regset.h>
+diff -NurpP --minimal linux-3.10.53/arch/s390/kernel/ptrace.c linux-3.10.53-vs2.3.6.8/arch/s390/kernel/ptrace.c
+--- linux-3.10.53/arch/s390/kernel/ptrace.c 2014-08-30 13:38:36.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/arch/s390/kernel/ptrace.c 2014-08-30 14:03:47.000000000 +0000
+@@ -21,6 +21,7 @@
#include <linux/tracehook.h>
#include <linux/seccomp.h>
+ #include <linux/compat.h>
+#include <linux/vs_base.h>
#include <trace/syscall.h>
- #include <asm/compat.h>
#include <asm/segment.h>
-diff -NurpP --minimal linux-3.0-rc5/arch/s390/kernel/syscalls.S linux-3.0-rc5-vs2.3.1-pre3/arch/s390/kernel/syscalls.S
---- linux-3.0-rc5/arch/s390/kernel/syscalls.S 2011-07-01 11:13:45.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/s390/kernel/syscalls.S 2011-06-10 22:11:24.000000000 +0200
+ #include <asm/page.h>
+diff -NurpP --minimal linux-3.10.53/arch/s390/kernel/syscalls.S linux-3.10.53-vs2.3.6.8/arch/s390/kernel/syscalls.S
+--- linux-3.10.53/arch/s390/kernel/syscalls.S 2013-07-14 17:00:34.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/arch/s390/kernel/syscalls.S 2013-08-22 20:29:59.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_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.0-rc5/arch/sh/Kconfig linux-3.0-rc5-vs2.3.1-pre3/arch/sh/Kconfig
---- linux-3.0-rc5/arch/sh/Kconfig 2011-07-01 11:13:45.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/sh/Kconfig 2011-06-10 22:11:24.000000000 +0200
-@@ -888,6 +888,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.10.53/arch/sh/Kconfig linux-3.10.53-vs2.3.6.8/arch/sh/Kconfig
+--- linux-3.10.53/arch/sh/Kconfig 2013-07-14 17:00:35.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/arch/sh/Kconfig 2013-08-22 20:29:59.000000000 +0000
+@@ -928,6 +928,8 @@ source "fs/Kconfig"
source "arch/sh/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0-rc5/arch/sh/kernel/irq.c linux-3.0-rc5-vs2.3.1-pre3/arch/sh/kernel/irq.c
---- linux-3.0-rc5/arch/sh/kernel/irq.c 2011-05-22 16:17:07.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/sh/kernel/irq.c 2011-06-10 22:11:24.000000000 +0200
-@@ -13,6 +13,7 @@
- #include <linux/seq_file.h>
+diff -NurpP --minimal linux-3.10.53/arch/sh/kernel/irq.c linux-3.10.53-vs2.3.6.8/arch/sh/kernel/irq.c
+--- linux-3.10.53/arch/sh/kernel/irq.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/arch/sh/kernel/irq.c 2013-08-22 20:29:59.000000000 +0000
+@@ -14,6 +14,7 @@
#include <linux/ftrace.h>
#include <linux/delay.h>
-+// #include <linux/vs_context.h>
#include <linux/ratelimit.h>
++// #include <linux/vs_context.h>
#include <asm/processor.h>
#include <asm/machvec.h>
-diff -NurpP --minimal linux-3.0-rc5/arch/sh/kernel/vsyscall/vsyscall.c linux-3.0-rc5-vs2.3.1-pre3/arch/sh/kernel/vsyscall/vsyscall.c
---- linux-3.0-rc5/arch/sh/kernel/vsyscall/vsyscall.c 2011-05-22 16:17:07.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/sh/kernel/vsyscall/vsyscall.c 2011-06-10 22:11:24.000000000 +0200
-@@ -18,6 +18,7 @@
- #include <linux/elf.h>
- #include <linux/sched.h>
- #include <linux/err.h>
-+#include <linux/vs_memory.h>
-
- /*
- * Should the kernel map a VDSO page into processes and pass its
-diff -NurpP --minimal linux-3.0-rc5/arch/sparc/Kconfig linux-3.0-rc5-vs2.3.1-pre3/arch/sparc/Kconfig
---- linux-3.0-rc5/arch/sparc/Kconfig 2011-07-01 11:13:46.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/sparc/Kconfig 2011-06-15 02:40:14.000000000 +0200
-@@ -601,6 +601,8 @@ source "fs/Kconfig"
+ #include <asm/uaccess.h>
+diff -NurpP --minimal linux-3.10.53/arch/sparc/Kconfig linux-3.10.53-vs2.3.6.8/arch/sparc/Kconfig
+--- linux-3.10.53/arch/sparc/Kconfig 2014-08-30 13:38:36.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/arch/sparc/Kconfig 2014-08-30 14:03:48.000000000 +0000
+@@ -551,6 +551,8 @@ source "fs/Kconfig"
source "arch/sparc/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0-rc5/arch/sparc/include/asm/tlb_64.h linux-3.0-rc5-vs2.3.1-pre3/arch/sparc/include/asm/tlb_64.h
---- linux-3.0-rc5/arch/sparc/include/asm/tlb_64.h 2011-07-01 11:13:46.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/sparc/include/asm/tlb_64.h 2011-06-10 22:11:24.000000000 +0200
-@@ -3,6 +3,7 @@
-
- #include <linux/swap.h>
- #include <linux/pagemap.h>
-+#include <linux/vs_memory.h>
- #include <asm/pgalloc.h>
- #include <asm/tlbflush.h>
- #include <asm/mmu_context.h>
-diff -NurpP --minimal linux-3.0-rc5/arch/sparc/include/asm/unistd.h linux-3.0-rc5-vs2.3.1-pre3/arch/sparc/include/asm/unistd.h
---- linux-3.0-rc5/arch/sparc/include/asm/unistd.h 2011-07-01 11:13:46.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/sparc/include/asm/unistd.h 2011-06-10 22:11:24.000000000 +0200
-@@ -335,7 +335,7 @@
+diff -NurpP --minimal linux-3.10.53/arch/sparc/include/uapi/asm/unistd.h linux-3.10.53-vs2.3.6.8/arch/sparc/include/uapi/asm/unistd.h
+--- linux-3.10.53/arch/sparc/include/uapi/asm/unistd.h 2013-02-19 13:57:17.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/arch/sparc/include/uapi/asm/unistd.h 2013-08-22 20:29:59.000000000 +0000
+@@ -332,7 +332,7 @@
#define __NR_timer_getoverrun 264
#define __NR_timer_delete 265
#define __NR_timer_create 266
#define __NR_io_setup 268
#define __NR_io_destroy 269
#define __NR_io_submit 270
-diff -NurpP --minimal linux-3.0-rc5/arch/sparc/kernel/systbls_32.S linux-3.0-rc5-vs2.3.1-pre3/arch/sparc/kernel/systbls_32.S
---- linux-3.0-rc5/arch/sparc/kernel/systbls_32.S 2011-07-01 11:13:46.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/sparc/kernel/systbls_32.S 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/arch/sparc/kernel/systbls_32.S linux-3.10.53-vs2.3.6.8/arch/sparc/kernel/systbls_32.S
+--- linux-3.10.53/arch/sparc/kernel/systbls_32.S 2013-05-31 13:44:48.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/arch/sparc/kernel/systbls_32.S 2013-08-22 20:29:59.000000000 +0000
@@ -70,7 +70,7 @@ sys_call_table:
- /*250*/ .long sys_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nfsservctl
+ /*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
/*260*/ .long sys_sched_getaffinity, sys_sched_setaffinity, sys_timer_settime, sys_timer_gettime, sys_timer_getoverrun
-/*265*/ .long sys_timer_delete, sys_timer_create, sys_nis_syscall, sys_io_setup, sys_io_destroy
/*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.0-rc5/arch/sparc/kernel/systbls_64.S linux-3.0-rc5-vs2.3.1-pre3/arch/sparc/kernel/systbls_64.S
---- linux-3.0-rc5/arch/sparc/kernel/systbls_64.S 2011-07-01 11:13:46.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/sparc/kernel/systbls_64.S 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/arch/sparc/kernel/systbls_64.S linux-3.10.53-vs2.3.6.8/arch/sparc/kernel/systbls_64.S
+--- linux-3.10.53/arch/sparc/kernel/systbls_64.S 2013-07-14 17:00:35.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/arch/sparc/kernel/systbls_64.S 2013-08-22 20:29:59.000000000 +0000
@@ -71,7 +71,7 @@ sys_call_table32:
- /*250*/ .word sys_mremap, compat_sys_sysctl, sys32_getsid, sys_fdatasync, sys32_nfsservctl
+ /*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
/*260*/ .word compat_sys_sched_getaffinity, compat_sys_sched_setaffinity, sys32_timer_settime, compat_sys_timer_gettime, sys_timer_getoverrun
- .word sys_timer_delete, compat_sys_timer_create, sys_ni_syscall, compat_sys_io_setup, sys_io_destroy
+ .word sys_timer_delete, compat_sys_timer_create, sys32_vserver, compat_sys_io_setup, sys_io_destroy
/*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 sys32_tee, sys_add_key, sys_request_key, sys_keyctl, compat_sys_openat
-@@ -148,7 +148,7 @@ sys_call_table:
- /*250*/ .word sys_64_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nfsservctl
+ /*280*/ .word sys_tee, sys_add_key, sys_request_key, compat_sys_keyctl, compat_sys_openat
+@@ -149,7 +149,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
- .word sys_timer_delete, sys_timer_create, sys_ni_syscall, sys_io_setup, sys_io_destroy
/*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.0-rc5/arch/um/Kconfig.rest linux-3.0-rc5-vs2.3.1-pre3/arch/um/Kconfig.rest
---- linux-3.0-rc5/arch/um/Kconfig.rest 2009-06-11 17:12:19.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/um/Kconfig.rest 2011-06-10 22:11:24.000000000 +0200
-@@ -18,6 +18,8 @@ source "drivers/connector/Kconfig"
+diff -NurpP --minimal linux-3.10.53/arch/um/Kconfig.rest linux-3.10.53-vs2.3.6.8/arch/um/Kconfig.rest
+--- linux-3.10.53/arch/um/Kconfig.rest 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/arch/um/Kconfig.rest 2013-08-22 20:29:59.000000000 +0000
+@@ -12,6 +12,8 @@ source "arch/um/Kconfig.net"
source "fs/Kconfig"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0-rc5/arch/um/include/asm/tlb.h linux-3.0-rc5-vs2.3.1-pre3/arch/um/include/asm/tlb.h
---- linux-3.0-rc5/arch/um/include/asm/tlb.h 2011-07-01 11:13:46.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/um/include/asm/tlb.h 2011-06-10 22:11:24.000000000 +0200
-@@ -3,6 +3,7 @@
-
- #include <linux/pagemap.h>
- #include <linux/swap.h>
-+#include <linux/vs_memory.h>
- #include <asm/percpu.h>
- #include <asm/pgalloc.h>
- #include <asm/tlbflush.h>
-diff -NurpP --minimal linux-3.0-rc5/arch/um/include/shared/kern_constants.h linux-3.0-rc5-vs2.3.1-pre3/arch/um/include/shared/kern_constants.h
---- linux-3.0-rc5/arch/um/include/shared/kern_constants.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/um/include/shared/kern_constants.h 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1 @@
-+#include "../../../../include/generated/asm-offsets.h"
-diff -NurpP --minimal linux-3.0-rc5/arch/um/include/shared/user_constants.h linux-3.0-rc5-vs2.3.1-pre3/arch/um/include/shared/user_constants.h
---- linux-3.0-rc5/arch/um/include/shared/user_constants.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/um/include/shared/user_constants.h 2011-06-10 22:11:24.000000000 +0200
-@@ -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.0-rc5/arch/x86/Kconfig linux-3.0-rc5-vs2.3.1-pre3/arch/x86/Kconfig
---- linux-3.0-rc5/arch/x86/Kconfig 2011-07-01 11:13:47.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/x86/Kconfig 2011-06-10 22:11:24.000000000 +0200
-@@ -2159,6 +2159,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.10.53/arch/x86/Kconfig linux-3.10.53-vs2.3.6.8/arch/x86/Kconfig
+--- linux-3.10.53/arch/x86/Kconfig 2014-08-30 13:38:36.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/arch/x86/Kconfig 2014-08-30 14:03:48.000000000 +0000
+@@ -2357,6 +2357,8 @@ source "fs/Kconfig"
source "arch/x86/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0-rc5/arch/x86/ia32/ia32entry.S linux-3.0-rc5-vs2.3.1-pre3/arch/x86/ia32/ia32entry.S
---- linux-3.0-rc5/arch/x86/ia32/ia32entry.S 2011-07-01 11:13:47.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/x86/ia32/ia32entry.S 2011-06-10 22:11:24.000000000 +0200
-@@ -776,7 +776,7 @@ ia32_sys_call_table:
- .quad sys_tgkill /* 270 */
- .quad compat_sys_utimes
- .quad sys32_fadvise64_64
-- .quad quiet_ni_syscall /* sys_vserver */
-+ .quad sys32_vserver
- .quad sys_mbind
- .quad compat_sys_get_mempolicy /* 275 */
- .quad sys_set_mempolicy
-diff -NurpP --minimal linux-3.0-rc5/arch/x86/include/asm/unistd_64.h linux-3.0-rc5-vs2.3.1-pre3/arch/x86/include/asm/unistd_64.h
---- linux-3.0-rc5/arch/x86/include/asm/unistd_64.h 2011-07-01 11:13:47.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/x86/include/asm/unistd_64.h 2011-06-10 22:11:24.000000000 +0200
-@@ -535,7 +535,7 @@ __SYSCALL(__NR_tgkill, sys_tgkill)
- #define __NR_utimes 235
- __SYSCALL(__NR_utimes, sys_utimes)
- #define __NR_vserver 236
--__SYSCALL(__NR_vserver, sys_ni_syscall)
-+__SYSCALL(__NR_vserver, sys_vserver)
- #define __NR_mbind 237
- __SYSCALL(__NR_mbind, sys_mbind)
- #define __NR_set_mempolicy 238
-diff -NurpP --minimal linux-3.0-rc5/arch/x86/kernel/syscall_table_32.S linux-3.0-rc5-vs2.3.1-pre3/arch/x86/kernel/syscall_table_32.S
---- linux-3.0-rc5/arch/x86/kernel/syscall_table_32.S 2011-07-01 11:13:48.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/arch/x86/kernel/syscall_table_32.S 2011-06-10 22:11:24.000000000 +0200
-@@ -272,7 +272,7 @@ ENTRY(sys_call_table)
- .long sys_tgkill /* 270 */
- .long sys_utimes
- .long sys_fadvise64_64
-- .long sys_ni_syscall /* sys_vserver */
-+ .long sys_vserver
- .long sys_mbind
- .long sys_get_mempolicy
- .long sys_set_mempolicy
-diff -NurpP --minimal linux-3.0-rc5/block/genhd.c linux-3.0-rc5-vs2.3.1-pre3/block/genhd.c
---- linux-3.0-rc5/block/genhd.c 2011-07-01 11:13:48.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/block/genhd.c 2011-07-01 11:35:34.000000000 +0200
-@@ -1154,17 +1154,17 @@ static int diskstats_show(struct seq_fil
- cpu = part_stat_lock();
- part_round_stats(cpu, hd);
- part_stat_unlock();
-- seq_printf(seqf, "%4d %7d %s %lu %lu %llu "
-- "%u %lu %lu %llu %u %u %u %u\n",
-+ seq_printf(seqf, "%4d %7d %s %lu %lu %lu "
-+ "%u %lu %lu %lu %u %u %u %u\n",
- MAJOR(part_devt(hd)), MINOR(part_devt(hd)),
- disk_name(gp, hd->partno, buf),
- part_stat_read(hd, ios[READ]),
- part_stat_read(hd, merges[READ]),
-- (unsigned long long)part_stat_read(hd, sectors[READ]),
-+ part_stat_read(hd, sectors[READ]),
- jiffies_to_msecs(part_stat_read(hd, ticks[READ])),
- part_stat_read(hd, ios[WRITE]),
- part_stat_read(hd, merges[WRITE]),
-- (unsigned long long)part_stat_read(hd, sectors[WRITE]),
-+ part_stat_read(hd, sectors[WRITE]),
- jiffies_to_msecs(part_stat_read(hd, ticks[WRITE])),
- part_in_flight(hd),
- jiffies_to_msecs(part_stat_read(hd, io_ticks)),
-diff -NurpP --minimal linux-3.0-rc5/drivers/block/Kconfig linux-3.0-rc5-vs2.3.1-pre3/drivers/block/Kconfig
---- linux-3.0-rc5/drivers/block/Kconfig 2011-07-01 11:13:50.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/drivers/block/Kconfig 2011-06-10 22:11:24.000000000 +0200
-@@ -273,6 +273,13 @@ config BLK_DEV_CRYPTOLOOP
+diff -NurpP --minimal linux-3.10.53/arch/x86/syscalls/syscall_32.tbl linux-3.10.53-vs2.3.6.8/arch/x86/syscalls/syscall_32.tbl
+--- linux-3.10.53/arch/x86/syscalls/syscall_32.tbl 2013-07-14 17:00:37.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/arch/x86/syscalls/syscall_32.tbl 2013-08-22 20:29:59.000000000 +0000
+@@ -279,7 +279,7 @@
+ 270 i386 tgkill sys_tgkill
+ 271 i386 utimes sys_utimes compat_sys_utimes
+ 272 i386 fadvise64_64 sys_fadvise64_64 sys32_fadvise64_64
+-273 i386 vserver
++273 i386 vserver sys_vserver sys32_vserver
+ 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.10.53/arch/x86/syscalls/syscall_64.tbl linux-3.10.53-vs2.3.6.8/arch/x86/syscalls/syscall_64.tbl
+--- linux-3.10.53/arch/x86/syscalls/syscall_64.tbl 2014-08-30 13:38:37.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/arch/x86/syscalls/syscall_64.tbl 2014-08-30 14:03:49.000000000 +0000
+@@ -242,7 +242,7 @@
+ 233 common epoll_ctl sys_epoll_ctl
+ 234 common tgkill sys_tgkill
+ 235 common utimes sys_utimes
+-236 64 vserver
++236 64 vserver sys_vserver
+ 237 common mbind sys_mbind
+ 238 common set_mempolicy sys_set_mempolicy
+ 239 common get_mempolicy sys_get_mempolicy
+diff -NurpP --minimal linux-3.10.53/drivers/block/Kconfig linux-3.10.53-vs2.3.6.8/drivers/block/Kconfig
+--- linux-3.10.53/drivers/block/Kconfig 2013-05-31 13:44:51.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/drivers/block/Kconfig 2013-08-22 20:29:59.000000000 +0000
+@@ -278,6 +278,13 @@ config BLK_DEV_CRYPTOLOOP
source "drivers/block/drbd/Kconfig"
config BLK_DEV_NBD
tristate "Network block device support"
depends on NET
-diff -NurpP --minimal linux-3.0-rc5/drivers/block/Makefile linux-3.0-rc5-vs2.3.1-pre3/drivers/block/Makefile
---- linux-3.0-rc5/drivers/block/Makefile 2011-07-01 11:13:50.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/drivers/block/Makefile 2011-06-10 22:11:24.000000000 +0200
-@@ -34,6 +34,7 @@ obj-$(CONFIG_VIODASD) += viodasd.o
+diff -NurpP --minimal linux-3.10.53/drivers/block/Makefile linux-3.10.53-vs2.3.6.8/drivers/block/Makefile
+--- linux-3.10.53/drivers/block/Makefile 2013-07-14 17:00:41.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/drivers/block/Makefile 2013-08-22 20:29:59.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_UB) += ub.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.0-rc5/drivers/block/loop.c linux-3.0-rc5-vs2.3.1-pre3/drivers/block/loop.c
---- linux-3.0-rc5/drivers/block/loop.c 2011-07-01 11:13:50.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/drivers/block/loop.c 2011-06-10 22:11:24.000000000 +0200
-@@ -75,6 +75,7 @@
- #include <linux/kthread.h>
- #include <linux/splice.h>
+diff -NurpP --minimal linux-3.10.53/drivers/block/loop.c linux-3.10.53-vs2.3.6.8/drivers/block/loop.c
+--- linux-3.10.53/drivers/block/loop.c 2014-08-30 13:38:38.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/drivers/block/loop.c 2013-12-23 17:42:39.000000000 +0000
+@@ -76,6 +76,7 @@
#include <linux/sysfs.h>
+ #include <linux/miscdevice.h>
+ #include <linux/falloc.h>
+#include <linux/vs_context.h>
#include <asm/uaccess.h>
-@@ -891,6 +892,7 @@ static int loop_set_fd(struct loop_devic
+@@ -884,6 +885,7 @@ static int loop_set_fd(struct loop_devic
lo->lo_blocksize = lo_blocksize;
lo->lo_device = bdev;
lo->lo_flags = lo_flags;
lo->lo_backing_file = file;
lo->transfer = transfer_none;
lo->ioctl = NULL;
-@@ -1019,6 +1021,7 @@ static int loop_clr_fd(struct loop_devic
+@@ -1028,6 +1030,7 @@ static int loop_clr_fd(struct loop_devic
+ lo->lo_sizelimit = 0;
lo->lo_encrypt_key_size = 0;
- lo->lo_flags = 0;
lo->lo_thread = NULL;
+ lo->lo_xid = 0;
memset(lo->lo_encrypt_key, 0, LO_KEY_SIZE);
memset(lo->lo_crypt_name, 0, LO_NAME_SIZE);
memset(lo->lo_file_name, 0, LO_NAME_SIZE);
-@@ -1057,7 +1060,7 @@ loop_set_status(struct loop_device *lo,
+@@ -1071,7 +1074,7 @@ loop_set_status(struct loop_device *lo,
if (lo->lo_encrypt_key_size &&
- lo->lo_key_owner != uid &&
+ !uid_eq(lo->lo_key_owner, uid) &&
- !capable(CAP_SYS_ADMIN))
+ !vx_capable(CAP_SYS_ADMIN, VXC_ADMIN_CLOOP))
return -EPERM;
if (lo->lo_state != Lo_bound)
return -ENXIO;
-@@ -1141,7 +1144,8 @@ loop_get_status(struct loop_device *lo,
+@@ -1161,7 +1164,8 @@ loop_get_status(struct loop_device *lo,
memcpy(info->lo_crypt_name, lo->lo_crypt_name, LO_NAME_SIZE);
info->lo_encrypt_type =
lo->lo_encryption ? lo->lo_encryption->number : 0;
info->lo_encrypt_key_size = lo->lo_encrypt_key_size;
memcpy(info->lo_encrypt_key, lo->lo_encrypt_key,
lo->lo_encrypt_key_size);
-@@ -1487,6 +1491,9 @@ static int lo_open(struct block_device *
- {
- struct loop_device *lo = bdev->bd_disk->private_data;
+@@ -1503,6 +1507,11 @@ static int lo_open(struct block_device *
+ goto out;
+ }
-+ if (!vx_check(lo->lo_xid, VS_IDENT|VS_HOSTID|VS_ADMIN_P))
-+ return -EACCES;
++ if (!vx_check(lo->lo_xid, VS_IDENT|VS_HOSTID|VS_ADMIN_P)) {
++ err = -EACCES;
++ goto out;
++ }
+
mutex_lock(&lo->lo_ctl_mutex);
lo->lo_refcnt++;
mutex_unlock(&lo->lo_ctl_mutex);
-diff -NurpP --minimal linux-3.0-rc5/drivers/block/vroot.c linux-3.0-rc5-vs2.3.1-pre3/drivers/block/vroot.c
---- linux-3.0-rc5/drivers/block/vroot.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/drivers/block/vroot.c 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,292 @@
+diff -NurpP --minimal linux-3.10.53/drivers/block/vroot.c linux-3.10.53-vs2.3.6.8/drivers/block/vroot.c
+--- linux-3.10.53/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/drivers/block/vroot.c 2013-08-23 00:23:45.000000000 +0000
+@@ -0,0 +1,290 @@
+/*
+ * linux/drivers/block/vroot.c
+ *
+ 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 = {
+ .ioctl = vr_ioctl,
+};
+
-+static int vroot_make_request(struct request_queue *q, struct bio *bio)
++static void vroot_make_request(struct request_queue *q, struct bio *bio)
+{
+ printk("vroot_make_request %p, %p\n", q, bio);
+ bio_io_error(bio);
-+ return 0;
+}
+
+struct block_device *__vroot_get_real_bdev(struct block_device *bdev)
+
+#endif
+
-diff -NurpP --minimal linux-3.0-rc5/drivers/gpu/drm/radeon/r100_reg_safe.h linux-3.0-rc5-vs2.3.1-pre3/drivers/gpu/drm/radeon/r100_reg_safe.h
---- linux-3.0-rc5/drivers/gpu/drm/radeon/r100_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/drivers/gpu/drm/radeon/r100_reg_safe.h 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,28 @@
-+static const unsigned r100_reg_safe_bm[102] = {
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0x17FF1FFF, 0xFFFFFFFC, 0xFFFFFFFF, 0xFF30FFBF,
-+ 0xFFFFFFF8, 0xC3E6FFFF, 0xFFFFF6DF, 0xFFFFFFFF,
-+ 0xFFFFFFCF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFF9F, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0x38E7FE1F, 0xFFC3FF8E, 0x7FF8FFFF, 0xFFFF803C,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFEFFFF, 0xFFFFFFFF,
-+ 0x00000000, 0xFFFFFFFD, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFCFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFEF,
-+};
-diff -NurpP --minimal linux-3.0-rc5/drivers/gpu/drm/radeon/r200_reg_safe.h linux-3.0-rc5-vs2.3.1-pre3/drivers/gpu/drm/radeon/r200_reg_safe.h
---- linux-3.0-rc5/drivers/gpu/drm/radeon/r200_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/drivers/gpu/drm/radeon/r200_reg_safe.h 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,28 @@
-+static const unsigned r200_reg_safe_bm[102] = {
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0x17FF1FFF, 0xFFFFFFFC, 0xFFFFFFFF, 0xFF30FFBF,
-+ 0xFFFFFFF8, 0xC3E6FFFF, 0xFFFFF6DF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFE7FE1F, 0xF003FFFF, 0x7EFFFFFF, 0xFFFF803C,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFEFCE, 0xFFFEFFFF, 0xFFFFFFFE,
-+ 0x020E0FF0, 0xFFCC83FD, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFBFFFF, 0xEFFCFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xDFDFDFDF, 0x3FFDDFDF, 0xFFFFFFFF, 0xFFFFFF7F,
-+ 0xFFFFFFFF, 0x00FFFFFF, 0x00000000, 0x00000000,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFE3F, 0xFFFFFFEF,
-+};
-diff -NurpP --minimal linux-3.0-rc5/drivers/gpu/drm/radeon/r300_reg_safe.h linux-3.0-rc5-vs2.3.1-pre3/drivers/gpu/drm/radeon/r300_reg_safe.h
---- linux-3.0-rc5/drivers/gpu/drm/radeon/r300_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/drivers/gpu/drm/radeon/r300_reg_safe.h 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,42 @@
-+static const unsigned r300_reg_safe_bm[159] = {
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0x17FF1FFF, 0xFFFFFFFC, 0xFFFFFFFF, 0xFF30FFBF,
-+ 0xFFFFFFF8, 0xC3E6FFFF, 0xFFFFF6DF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFF03F,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFEFCE, 0xF00EBFFF, 0x007C0000,
-+ 0xF0000078, 0xFF000009, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFF7FF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFC78, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFF,
-+ 0x38FF8F50, 0xFFF88082, 0xF000000C, 0xFAE009FF,
-+ 0x0000FFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000,
-+ 0x00000000, 0x0000C100, 0x00000000, 0x00000000,
-+ 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+ 0x00000000, 0xFFFF0000, 0xFFFFFFFF, 0xFF80FFFF,
-+ 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+ 0x0003FC01, 0xFFFFFCF8, 0xFF800B19,
-+};
-diff -NurpP --minimal linux-3.0-rc5/drivers/gpu/drm/radeon/r420_reg_safe.h linux-3.0-rc5-vs2.3.1-pre3/drivers/gpu/drm/radeon/r420_reg_safe.h
---- linux-3.0-rc5/drivers/gpu/drm/radeon/r420_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/drivers/gpu/drm/radeon/r420_reg_safe.h 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,42 @@
-+static const unsigned r420_reg_safe_bm[159] = {
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0x17FF1FFF, 0xFFFFFFFC, 0xFFFFFFFF, 0xFF30FFBF,
-+ 0xFFFFFFF8, 0xC3E6FFFF, 0xFFFFF6DF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFF03F,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFEFCE, 0xF00EBFFF, 0x007C0000,
-+ 0xF0000078, 0xFF000009, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFF7FF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFC78, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFF,
-+ 0x38FF8F50, 0xFFF88082, 0xF000000C, 0xFAE009FF,
-+ 0x0000FFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000,
-+ 0x00000000, 0x00000100, 0x00000000, 0x00000000,
-+ 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+ 0x00000000, 0x00000000, 0x00000000, 0xFF800000,
-+ 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+ 0x0003FC01, 0xFFFFFCF8, 0xFF800B19,
-+};
-diff -NurpP --minimal linux-3.0-rc5/drivers/gpu/drm/radeon/rn50_reg_safe.h linux-3.0-rc5-vs2.3.1-pre3/drivers/gpu/drm/radeon/rn50_reg_safe.h
---- linux-3.0-rc5/drivers/gpu/drm/radeon/rn50_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/drivers/gpu/drm/radeon/rn50_reg_safe.h 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,28 @@
-+static const unsigned rn50_reg_safe_bm[102] = {
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0x17FF1FFF, 0xFFFFFFFC, 0xFFFFFFFF, 0xFF30FFBF,
-+ 0xFFFFFFF8, 0xC3E6FFFF, 0xFFFFF6DF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF,
-+};
-diff -NurpP --minimal linux-3.0-rc5/drivers/gpu/drm/radeon/rs600_reg_safe.h linux-3.0-rc5-vs2.3.1-pre3/drivers/gpu/drm/radeon/rs600_reg_safe.h
---- linux-3.0-rc5/drivers/gpu/drm/radeon/rs600_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/drivers/gpu/drm/radeon/rs600_reg_safe.h 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,57 @@
-+static const unsigned rs600_reg_safe_bm[219] = {
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0x17FF1FFF, 0xFFFFFFFC, 0xFFFFFFFF, 0xFF30FFBF,
-+ 0xFFFFFFF8, 0xC3E6FFFF, 0xFFFFF6DF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFF03F,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFEFCE, 0xF00EBFFF, 0x007C0000,
-+ 0xF0000078, 0xFF000009, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFF7FF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFC78, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFF,
-+ 0x38FF8F50, 0xFFF88082, 0xF000000C, 0xFAE009FF,
-+ 0x0000FFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000,
-+ 0x00000000, 0x00000100, 0x00000000, 0x00000000,
-+ 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+ 0x00000000, 0x00000000, 0x00000000, 0xFF800000,
-+ 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+ 0x0003FC01, 0xFFFFFCF8, 0xFF800B19, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+};
-diff -NurpP --minimal linux-3.0-rc5/drivers/gpu/drm/radeon/rv515_reg_safe.h linux-3.0-rc5-vs2.3.1-pre3/drivers/gpu/drm/radeon/rv515_reg_safe.h
---- linux-3.0-rc5/drivers/gpu/drm/radeon/rv515_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/drivers/gpu/drm/radeon/rv515_reg_safe.h 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,57 @@
-+static const unsigned rv515_reg_safe_bm[219] = {
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0x17FF1FFF, 0xFFFFFFFC, 0xFFFFFFFF, 0xFF30FFBF,
-+ 0xFFFFFFF8, 0xC3E6FFFF, 0xFFFFF6DF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFF03F,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFEFCE, 0xF00EBFFF, 0x007C0000,
-+ 0xF0000038, 0xFF000009, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFF7FF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0x1FFFF878, 0xFFFFE000, 0xFFFFFE1E, 0xFFFFFFFF,
-+ 0x388F8F50, 0xFFF88082, 0xFF0000FC, 0xFAE009FF,
-+ 0x0000FFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000,
-+ 0xFFFF8CFC, 0xFFFFC1FF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFF80FFFF,
-+ 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+ 0x0003FC01, 0x3FFFFCF8, 0xFF800B19, 0xFFDFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-+};
-diff -NurpP --minimal linux-3.0-rc5/drivers/infiniband/core/addr.c linux-3.0-rc5-vs2.3.1-pre3/drivers/infiniband/core/addr.c
---- linux-3.0-rc5/drivers/infiniband/core/addr.c 2011-07-01 11:13:52.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/drivers/infiniband/core/addr.c 2011-06-16 14:16:51.000000000 +0200
-@@ -252,7 +252,7 @@ static int addr6_resolve(struct sockaddr
+diff -NurpP --minimal linux-3.10.53/drivers/infiniband/Kconfig linux-3.10.53-vs2.3.6.8/drivers/infiniband/Kconfig
+--- linux-3.10.53/drivers/infiniband/Kconfig 2013-07-14 17:00:49.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/drivers/infiniband/Kconfig 2013-08-22 20:29:59.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.10.53/drivers/infiniband/core/addr.c linux-3.10.53-vs2.3.6.8/drivers/infiniband/core/addr.c
+--- linux-3.10.53/drivers/infiniband/core/addr.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/drivers/infiniband/core/addr.c 2013-08-22 20:29:59.000000000 +0000
+@@ -261,7 +261,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,
if (ret)
goto put;
-diff -NurpP --minimal linux-3.0-rc5/drivers/infiniband/hw/ipath/ipath_user_pages.c linux-3.0-rc5-vs2.3.1-pre3/drivers/infiniband/hw/ipath/ipath_user_pages.c
---- linux-3.0-rc5/drivers/infiniband/hw/ipath/ipath_user_pages.c 2011-05-22 16:17:16.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/drivers/infiniband/hw/ipath/ipath_user_pages.c 2011-06-10 22:11:24.000000000 +0200
-@@ -35,6 +35,7 @@
- #include <linux/device.h>
- #include <linux/slab.h>
- #include <linux/sched.h>
-+#include <linux/vs_memory.h>
-
- #include "ipath_kernel.h"
-
-diff -NurpP --minimal linux-3.0-rc5/drivers/md/dm-ioctl.c linux-3.0-rc5-vs2.3.1-pre3/drivers/md/dm-ioctl.c
---- linux-3.0-rc5/drivers/md/dm-ioctl.c 2011-05-22 16:17:18.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/drivers/md/dm-ioctl.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/drivers/md/dm-ioctl.c linux-3.10.53-vs2.3.6.8/drivers/md/dm-ioctl.c
+--- linux-3.10.53/drivers/md/dm-ioctl.c 2014-08-30 13:38:44.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/drivers/md/dm-ioctl.c 2013-11-13 17:17:15.000000000 +0000
@@ -16,6 +16,7 @@
#include <linux/dm-ioctl.h>
#include <linux/hdreg.h>
dm_get(hc->md);
return hc;
}
-@@ -427,6 +430,9 @@ typedef int (*ioctl_fn)(struct dm_ioctl
+@@ -131,13 +134,15 @@ static struct hash_cell *__get_uuid_cell
+ static struct hash_cell *__get_dev_cell(uint64_t dev)
+ {
+ struct mapped_device *md;
+- struct hash_cell *hc;
++ struct hash_cell *hc = NULL;
+
+ md = dm_get_md(huge_decode_dev(dev));
+ if (!md)
+ return NULL;
+
+- hc = dm_get_mdptr(md);
++ if (vx_check(dm_get_xid(md), VS_WATCH_P | VS_IDENT))
++ hc = dm_get_mdptr(md);
++
+ if (!hc) {
+ dm_put(md);
+ return NULL;
+@@ -445,6 +450,9 @@ typedef int (*ioctl_fn)(struct dm_ioctl
static int remove_all(struct dm_ioctl *param, size_t param_size)
{
dm_hash_remove_all(1);
param->data_size = 0;
return 0;
-@@ -474,6 +480,8 @@ static int list_devices(struct dm_ioctl
+@@ -492,6 +500,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) {
needed += sizeof(struct dm_name_list);
needed += strlen(hc->name) + 1;
needed += ALIGN_MASK;
-@@ -497,6 +505,8 @@ static int list_devices(struct dm_ioctl
+@@ -515,6 +525,8 @@ static int list_devices(struct dm_ioctl
*/
for (i = 0; i < NUM_BUCKETS; i++) {
list_for_each_entry (hc, _name_buckets + i, name_list) {
if (old_nl)
old_nl->next = (uint32_t) ((void *) nl -
(void *) old_nl);
-@@ -731,10 +741,11 @@ static struct hash_cell *__find_device_h
- if (!md)
- goto out;
-
-- mdptr = dm_get_mdptr(md);
-+ if (vx_check(dm_get_xid(md), VS_WATCH_P | VS_IDENT))
-+ mdptr = dm_get_mdptr(md);
-+
- if (!mdptr)
- dm_put(md);
--
- out:
- return mdptr;
- }
-@@ -1577,8 +1588,8 @@ static int ctl_ioctl(uint command, struc
- ioctl_fn fn = NULL;
+@@ -1725,8 +1737,8 @@ static int ctl_ioctl(uint command, struc
size_t input_param_size;
+ struct dm_ioctl param_kernel;
- /* only root can play with this */
- if (!capable(CAP_SYS_ADMIN))
return -EACCES;
if (_IOC_TYPE(command) != DM_IOCTL)
-diff -NurpP --minimal linux-3.0-rc5/drivers/md/dm.c linux-3.0-rc5-vs2.3.1-pre3/drivers/md/dm.c
---- linux-3.0-rc5/drivers/md/dm.c 2011-05-22 16:17:18.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/drivers/md/dm.c 2011-06-10 22:11:24.000000000 +0200
-@@ -20,6 +20,7 @@
+diff -NurpP --minimal linux-3.10.53/drivers/md/dm.c linux-3.10.53-vs2.3.6.8/drivers/md/dm.c
+--- linux-3.10.53/drivers/md/dm.c 2014-08-30 13:38:45.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/drivers/md/dm.c 2014-03-12 13:18:23.000000000 +0000
+@@ -19,6 +19,7 @@
#include <linux/idr.h>
#include <linux/hdreg.h>
#include <linux/delay.h>
#include <trace/events/block.h>
-@@ -119,6 +120,7 @@ struct mapped_device {
+@@ -125,6 +126,7 @@ struct mapped_device {
rwlock_t map_lock;
atomic_t holders;
atomic_t open_count;
-+ xid_t xid;
++ vxid_t xid;
unsigned long flags;
-@@ -326,6 +328,7 @@ int dm_deleting_md(struct mapped_device
+@@ -317,6 +319,7 @@ int dm_deleting_md(struct mapped_device
static int dm_blk_open(struct block_device *bdev, fmode_t mode)
{
struct mapped_device *md;
spin_lock(&_minor_lock);
-@@ -334,18 +337,19 @@ static int dm_blk_open(struct block_devi
+@@ -325,18 +328,19 @@ static int dm_blk_open(struct block_devi
goto out;
if (test_bit(DMF_FREEING, &md->flags) ||
+ return ret;
}
- static int dm_blk_close(struct gendisk *disk, fmode_t mode)
-@@ -566,6 +570,14 @@ int dm_set_geometry(struct mapped_device
+ static void dm_blk_close(struct gendisk *disk, fmode_t mode)
+@@ -552,6 +556,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;
+}
/*-----------------------------------------------------------------
* CRUD START:
* A more elegant soln is in the works that uses the queue
-@@ -1841,6 +1853,7 @@ static struct mapped_device *alloc_dev(i
+@@ -1889,6 +1901,7 @@ static struct mapped_device *alloc_dev(i
INIT_LIST_HEAD(&md->uevent_list);
spin_lock_init(&md->uevent_lock);
md->queue = blk_alloc_queue(GFP_KERNEL);
if (!md->queue)
goto bad_queue;
-diff -NurpP --minimal linux-3.0-rc5/drivers/md/dm.h linux-3.0-rc5-vs2.3.1-pre3/drivers/md/dm.h
---- linux-3.0-rc5/drivers/md/dm.h 2011-05-22 16:17:18.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/drivers/md/dm.h 2011-06-10 22:11:24.000000000 +0200
-@@ -41,6 +41,8 @@ struct dm_dev_internal {
+diff -NurpP --minimal linux-3.10.53/drivers/md/dm.h linux-3.10.53-vs2.3.6.8/drivers/md/dm.h
+--- linux-3.10.53/drivers/md/dm.h 2014-08-30 13:38:45.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/drivers/md/dm.h 2014-03-12 13:18:23.000000000 +0000
+@@ -48,6 +48,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.0-rc5/drivers/net/tun.c linux-3.0-rc5-vs2.3.1-pre3/drivers/net/tun.c
---- linux-3.0-rc5/drivers/net/tun.c 2011-07-01 11:14:01.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/drivers/net/tun.c 2011-06-22 12:39:14.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/drivers/net/tun.c linux-3.10.53-vs2.3.6.8/drivers/net/tun.c
+--- linux-3.10.53/drivers/net/tun.c 2014-08-30 13:38:47.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/drivers/net/tun.c 2014-01-22 19:00:34.000000000 +0000
@@ -64,6 +64,7 @@
#include <linux/nsproxy.h>
#include <linux/virtio_net.h>
#include <net/net_namespace.h>
#include <net/netns/generic.h>
#include <net/rtnetlink.h>
-@@ -121,6 +122,7 @@ struct tun_struct {
+@@ -164,6 +165,7 @@ struct tun_struct {
unsigned int flags;
- uid_t owner;
- gid_t group;
-+ nid_t nid;
+ kuid_t owner;
+ kgid_t group;
++ vnid_t nid;
struct net_device *dev;
- u32 set_features;
-@@ -904,6 +906,7 @@ static void tun_setup(struct net_device
+ netdev_features_t set_features;
+@@ -380,6 +382,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);
++ /* !cap_raised(current_cap(), CAP_NET_ADMIN) */
+ }
- tun->owner = -1;
- tun->group = -1;
-+ tun->nid = current->nid;
+ static void tun_set_real_num_queues(struct tun_struct *tun)
+@@ -1435,6 +1438,7 @@ static void tun_setup(struct net_device
+
+ tun->owner = INVALID_UID;
+ tun->group = INVALID_GID;
++ tun->nid = nx_current_nid();
dev->ethtool_ops = &tun_ethtool_ops;
dev->destructor = tun_free_netdev;
-@@ -1054,7 +1057,7 @@ static int tun_set_iff(struct net *net,
-
- if (((tun->owner != -1 && cred->euid != tun->owner) ||
- (tun->group != -1 && !in_egroup_p(tun->group))) &&
-- !capable(CAP_NET_ADMIN))
-+ !cap_raised(current_cap(), CAP_NET_ADMIN))
- return -EPERM;
- err = security_tun_dev_attach(tun->socket.sk);
- if (err < 0)
-@@ -1068,7 +1071,7 @@ static int tun_set_iff(struct net *net,
- char *name;
- unsigned long flags = 0;
-
-- if (!capable(CAP_NET_ADMIN))
-+ if (!nx_capable(CAP_NET_ADMIN, NXC_TUN_CREATE))
- return -EPERM;
- err = security_tun_dev_create();
+@@ -1626,6 +1630,9 @@ static int tun_set_iff(struct net *net,
if (err < 0)
-@@ -1136,6 +1139,9 @@ static int tun_set_iff(struct net *net,
-
- sk->sk_destruct = tun_sock_destruct;
+ return err;
+ if (!nx_check(tun->nid, VS_IDENT | VS_HOSTID | VS_ADMIN_P))
+ return -EPERM;
+
err = tun_attach(tun, file);
if (err < 0)
- goto failed;
-@@ -1317,6 +1323,16 @@ static long __tun_chr_ioctl(struct file
- tun_debug(KERN_INFO, tun, "group set to %d\n", tun->group);
+ return err;
+@@ -1644,7 +1651,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 (!nx_ns_capable(net->user_ns, CAP_NET_ADMIN, NXC_TUN_CREATE))
+ return -EPERM;
+ err = security_tun_dev_create();
+ if (err < 0)
+@@ -1995,6 +2002,16 @@ static long __tun_chr_ioctl(struct file
+ from_kgid(&init_user_ns, tun->group));
break;
+ case TUNSETNID:
+ 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;
case TUNSETLINK:
/* Only allow setting the type when the interface is down */
if (tun->dev->flags & IFF_UP) {
-diff -NurpP --minimal linux-3.0-rc5/drivers/tty/sysrq.c linux-3.0-rc5-vs2.3.1-pre3/drivers/tty/sysrq.c
---- linux-3.0-rc5/drivers/tty/sysrq.c 2011-05-22 16:17:44.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/drivers/tty/sysrq.c 2011-06-10 22:11:24.000000000 +0200
-@@ -41,6 +41,7 @@
- #include <linux/oom.h>
- #include <linux/slab.h>
- #include <linux/input.h>
+diff -NurpP --minimal linux-3.10.53/drivers/tty/sysrq.c linux-3.10.53-vs2.3.6.8/drivers/tty/sysrq.c
+--- linux-3.10.53/drivers/tty/sysrq.c 2013-07-14 17:01:22.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/drivers/tty/sysrq.c 2013-08-22 20:58:35.000000000 +0000
+@@ -44,6 +44,7 @@
+ #include <linux/uaccess.h>
+ #include <linux/moduleparam.h>
+ #include <linux/jiffies.h>
+#include <linux/vserver/debug.h>
#include <asm/ptrace.h>
#include <asm/irq_regs.h>
-@@ -395,6 +396,21 @@ static struct sysrq_key_op sysrq_unrt_op
+@@ -405,6 +406,21 @@ static struct sysrq_key_op sysrq_unrt_op
.enable_mask = SYSRQ_ENABLE_RTNICE,
};
/* Key Operations table and lock */
static DEFINE_SPINLOCK(sysrq_key_table_lock);
-@@ -449,7 +465,11 @@ static struct sysrq_key_op *sysrq_key_ta
- NULL, /* v */
+@@ -460,7 +476,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 */
+#ifdef CONFIG_VSERVER_DEBUG
+ &sysrq_showvxinfo_op, /* x */
+#else
/* y: May be registered on sparc64 for global register dump */
NULL, /* y */
&sysrq_ftrace_dump_op, /* z */
-@@ -464,6 +484,8 @@ static int sysrq_key_table_key2index(int
+@@ -475,6 +495,8 @@ static int sysrq_key_table_key2index(int
retval = key - '0';
else if ((key >= 'a') && (key <= 'z'))
retval = key + 10 - 'a';
else
retval = -1;
return retval;
-diff -NurpP --minimal linux-3.0-rc5/drivers/tty/tty_io.c linux-3.0-rc5-vs2.3.1-pre3/drivers/tty/tty_io.c
---- linux-3.0-rc5/drivers/tty/tty_io.c 2011-07-01 11:14:14.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/drivers/tty/tty_io.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/drivers/tty/tty_io.c linux-3.10.53-vs2.3.6.8/drivers/tty/tty_io.c
+--- linux-3.10.53/drivers/tty/tty_io.c 2014-08-30 13:38:54.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/drivers/tty/tty_io.c 2014-05-20 04:31:55.000000000 +0000
@@ -104,6 +104,7 @@
#include <linux/kmod.h>
#undef TTY_DEBUG_HANGUP
-@@ -2057,7 +2058,8 @@ static int tiocsti(struct tty_struct *tt
+@@ -2214,7 +2215,8 @@ static int tiocsti(struct tty_struct *tt
char ch, mbz = 0;
struct tty_ldisc *ld;
return -EPERM;
if (get_user(ch, p))
return -EFAULT;
-@@ -2345,6 +2347,7 @@ static int tiocspgrp(struct tty_struct *
+@@ -2502,6 +2504,7 @@ static int tiocspgrp(struct tty_struct *
return -ENOTTY;
if (get_user(pgrp_nr, p))
return -EFAULT;
if (pgrp_nr < 0)
return -EINVAL;
rcu_read_lock();
-diff -NurpP --minimal linux-3.0-rc5/fs/attr.c linux-3.0-rc5-vs2.3.1-pre3/fs/attr.c
---- linux-3.0-rc5/fs/attr.c 2011-07-01 11:14:16.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/attr.c 2011-06-10 22:11:24.000000000 +0200
-@@ -13,6 +13,9 @@
- #include <linux/fsnotify.h>
- #include <linux/fcntl.h>
+diff -NurpP --minimal linux-3.10.53/fs/attr.c linux-3.10.53-vs2.3.6.8/fs/attr.c
+--- linux-3.10.53/fs/attr.c 2014-08-30 13:38:56.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/attr.c 2014-08-30 14:03:54.000000000 +0000
+@@ -15,6 +15,9 @@
#include <linux/security.h>
+ #include <linux/evm.h>
+ #include <linux/ima.h>
+#include <linux/proc_fs.h>
+#include <linux/devpts_fs.h>
+#include <linux/vs_tag.h>
/**
* inode_change_ok - check if attribute changes to an inode are allowed
-@@ -73,6 +76,10 @@ int inode_change_ok(const struct inode *
+@@ -77,6 +80,10 @@ int inode_change_ok(const struct inode *
return -EPERM;
}
return 0;
}
EXPORT_SYMBOL(inode_change_ok);
-@@ -143,6 +150,8 @@ void setattr_copy(struct inode *inode, c
+@@ -147,6 +154,8 @@ void setattr_copy(struct inode *inode, c
inode->i_uid = attr->ia_uid;
if (ia_valid & ATTR_GID)
inode->i_gid = attr->ia_gid;
if (ia_valid & ATTR_ATIME)
inode->i_atime = timespec_trunc(attr->ia_atime,
inode->i_sb->s_time_gran);
-@@ -170,7 +179,8 @@ int notify_change(struct dentry * dentry
- struct timespec now;
- unsigned int ia_valid = attr->ia_valid;
+@@ -177,7 +186,8 @@ int notify_change(struct dentry * dentry
+
+ WARN_ON_ONCE(!mutex_is_locked(&inode->i_mutex));
- if (ia_valid & (ATTR_MODE | ATTR_UID | ATTR_GID | ATTR_TIMES_SET)) {
+ if (ia_valid & (ATTR_MODE | ATTR_UID | ATTR_GID |
if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
return -EPERM;
}
-diff -NurpP --minimal linux-3.0-rc5/fs/binfmt_aout.c linux-3.0-rc5-vs2.3.1-pre3/fs/binfmt_aout.c
---- linux-3.0-rc5/fs/binfmt_aout.c 2010-10-21 13:07:47.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/binfmt_aout.c 2011-06-10 22:11:24.000000000 +0200
-@@ -25,6 +25,7 @@
- #include <linux/init.h>
- #include <linux/coredump.h>
- #include <linux/slab.h>
-+#include <linux/vs_memory.h>
-
- #include <asm/system.h>
- #include <asm/uaccess.h>
-diff -NurpP --minimal linux-3.0-rc5/fs/binfmt_elf.c linux-3.0-rc5-vs2.3.1-pre3/fs/binfmt_elf.c
---- linux-3.0-rc5/fs/binfmt_elf.c 2011-05-22 16:17:48.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/binfmt_elf.c 2011-06-10 22:11:24.000000000 +0200
-@@ -32,6 +32,7 @@
- #include <linux/elf.h>
- #include <linux/utsname.h>
- #include <linux/coredump.h>
-+#include <linux/vs_memory.h>
- #include <asm/uaccess.h>
- #include <asm/param.h>
- #include <asm/page.h>
-diff -NurpP --minimal linux-3.0-rc5/fs/binfmt_flat.c linux-3.0-rc5-vs2.3.1-pre3/fs/binfmt_flat.c
---- linux-3.0-rc5/fs/binfmt_flat.c 2011-07-01 11:14:16.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/binfmt_flat.c 2011-06-10 22:11:24.000000000 +0200
-@@ -35,6 +35,7 @@
- #include <linux/init.h>
- #include <linux/flat.h>
- #include <linux/syscalls.h>
-+#include <linux/vs_memory.h>
-
- #include <asm/byteorder.h>
- #include <asm/system.h>
-diff -NurpP --minimal linux-3.0-rc5/fs/binfmt_som.c linux-3.0-rc5-vs2.3.1-pre3/fs/binfmt_som.c
---- linux-3.0-rc5/fs/binfmt_som.c 2010-02-25 11:52:04.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/binfmt_som.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/fs/block_dev.c linux-3.10.53-vs2.3.6.8/fs/block_dev.c
+--- linux-3.10.53/fs/block_dev.c 2014-08-30 13:38:56.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/block_dev.c 2013-11-13 17:17:15.000000000 +0000
@@ -28,6 +28,7 @@
- #include <linux/shm.h>
- #include <linux/personality.h>
- #include <linux/init.h>
-+#include <linux/vs_memory.h>
-
- #include <asm/uaccess.h>
- #include <asm/pgtable.h>
-diff -NurpP --minimal linux-3.0-rc5/fs/block_dev.c linux-3.0-rc5-vs2.3.1-pre3/fs/block_dev.c
---- linux-3.0-rc5/fs/block_dev.c 2011-07-01 11:14:16.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/block_dev.c 2011-07-01 11:35:34.000000000 +0200
-@@ -25,6 +25,7 @@
- #include <linux/namei.h>
#include <linux/log2.h>
- #include <linux/kmemleak.h>
+ #include <linux/cleancache.h>
+ #include <linux/aio.h>
+#include <linux/vs_device.h>
#include <asm/uaccess.h>
#include "internal.h"
-@@ -553,6 +554,7 @@ struct block_device *bdget(dev_t dev)
+@@ -536,6 +537,7 @@ struct block_device *bdget(dev_t dev)
bdev->bd_invalidated = 0;
inode->i_mode = S_IFBLK;
inode->i_rdev = dev;
inode->i_bdev = bdev;
inode->i_data.a_ops = &def_blk_aops;
mapping_set_gfp_mask(&inode->i_data, GFP_USER);
-@@ -599,6 +601,11 @@ EXPORT_SYMBOL(bdput);
+@@ -583,6 +585,11 @@ EXPORT_SYMBOL(bdput);
static struct block_device *bd_acquire(struct inode *inode)
{
struct block_device *bdev;
spin_lock(&bdev_lock);
bdev = inode->i_bdev;
-@@ -609,7 +616,7 @@ static struct block_device *bd_acquire(s
+@@ -593,7 +600,7 @@ static struct block_device *bd_acquire(s
}
spin_unlock(&bdev_lock);
if (bdev) {
spin_lock(&bdev_lock);
if (!inode->i_bdev) {
-diff -NurpP --minimal linux-3.0-rc5/fs/btrfs/ctree.h linux-3.0-rc5-vs2.3.1-pre3/fs/btrfs/ctree.h
---- linux-3.0-rc5/fs/btrfs/ctree.h 2011-07-01 11:14:16.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/btrfs/ctree.h 2011-07-01 11:35:34.000000000 +0200
-@@ -600,11 +600,14 @@ struct btrfs_inode_item {
+diff -NurpP --minimal linux-3.10.53/fs/btrfs/ctree.h linux-3.10.53-vs2.3.6.8/fs/btrfs/ctree.h
+--- linux-3.10.53/fs/btrfs/ctree.h 2013-07-14 17:01:26.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/btrfs/ctree.h 2013-08-22 20:29:59.000000000 +0000
+@@ -707,11 +707,14 @@ struct btrfs_inode_item {
/* modification sequence number for NFS */
__le64 sequence;
struct btrfs_timespec atime;
struct btrfs_timespec ctime;
struct btrfs_timespec mtime;
-@@ -1354,6 +1357,8 @@ struct btrfs_ioctl_defrag_range_args {
- #define BTRFS_MOUNT_AUTO_DEFRAG (1 << 16)
- #define BTRFS_MOUNT_INODE_MAP_CACHE (1 << 17)
+@@ -1928,6 +1931,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)
+#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_test_opt(root, opt) ((root)->fs_info->mount_opt & \
-@@ -1563,6 +1568,7 @@ BTRFS_SETGET_FUNCS(inode_block_group, st
+ #define btrfs_raw_test_opt(o, opt) ((o) & BTRFS_MOUNT_##opt)
+@@ -2197,6 +2202,7 @@ BTRFS_SETGET_FUNCS(inode_block_group, st
BTRFS_SETGET_FUNCS(inode_nlink, struct btrfs_inode_item, nlink, 32);
BTRFS_SETGET_FUNCS(inode_uid, struct btrfs_inode_item, uid, 32);
BTRFS_SETGET_FUNCS(inode_gid, struct btrfs_inode_item, gid, 32);
BTRFS_SETGET_FUNCS(inode_mode, struct btrfs_inode_item, mode, 32);
BTRFS_SETGET_FUNCS(inode_rdev, struct btrfs_inode_item, rdev, 64);
BTRFS_SETGET_FUNCS(inode_flags, struct btrfs_inode_item, flags, 64);
-@@ -1616,6 +1622,10 @@ BTRFS_SETGET_FUNCS(extent_flags, struct
+@@ -2250,6 +2256,10 @@ BTRFS_SETGET_FUNCS(extent_flags, struct
BTRFS_SETGET_FUNCS(extent_refs_v0, struct btrfs_extent_item_v0, refs, 32);
BTRFS_SETGET_FUNCS(tree_block_level, struct btrfs_tree_block_info, level, 8);
-@@ -2590,6 +2600,7 @@ extern const struct dentry_operations bt
+@@ -3578,6 +3588,7 @@ extern const struct dentry_operations bt
long btrfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
void btrfs_update_iflags(struct inode *inode);
void btrfs_inherit_iflags(struct inode *inode, struct inode *dir);
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.0-rc5/fs/btrfs/disk-io.c linux-3.0-rc5-vs2.3.1-pre3/fs/btrfs/disk-io.c
---- linux-3.0-rc5/fs/btrfs/disk-io.c 2011-07-01 11:14:16.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/btrfs/disk-io.c 2011-06-22 12:39:15.000000000 +0200
-@@ -1765,6 +1765,9 @@ struct btrfs_root *open_ctree(struct sup
+diff -NurpP --minimal linux-3.10.53/fs/btrfs/disk-io.c linux-3.10.53-vs2.3.6.8/fs/btrfs/disk-io.c
+--- linux-3.10.53/fs/btrfs/disk-io.c 2014-08-30 13:38:56.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/btrfs/disk-io.c 2014-08-30 14:03:54.000000000 +0000
+@@ -2360,6 +2360,9 @@ int open_ctree(struct super_block *sb,
goto fail_alloc;
}
features = btrfs_super_incompat_flags(disk_super) &
~BTRFS_FEATURE_INCOMPAT_SUPP;
if (features) {
-diff -NurpP --minimal linux-3.0-rc5/fs/btrfs/inode.c linux-3.0-rc5-vs2.3.1-pre3/fs/btrfs/inode.c
---- linux-3.0-rc5/fs/btrfs/inode.c 2011-07-01 11:14:17.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/btrfs/inode.c 2011-07-01 11:35:34.000000000 +0200
-@@ -38,6 +38,7 @@
- #include <linux/falloc.h>
- #include <linux/slab.h>
- #include <linux/ratelimit.h>
+diff -NurpP --minimal linux-3.10.53/fs/btrfs/inode.c linux-3.10.53-vs2.3.6.8/fs/btrfs/inode.c
+--- linux-3.10.53/fs/btrfs/inode.c 2014-08-30 13:38:56.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/btrfs/inode.c 2014-03-12 13:18:32.000000000 +0000
+@@ -42,6 +42,7 @@
+ #include <linux/mount.h>
+ #include <linux/btrfs.h>
+ #include <linux/blkdev.h>
+#include <linux/vs_tag.h>
#include "compat.h"
#include "ctree.h"
#include "disk-io.h"
-@@ -2508,6 +2509,8 @@ static void btrfs_read_locked_inode(stru
+@@ -3336,6 +3337,9 @@ static void btrfs_read_locked_inode(stru
struct btrfs_key location;
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;
-@@ -2540,8 +2543,13 @@ static void btrfs_read_locked_inode(stru
-
+@@ -3363,8 +3367,14 @@ static void btrfs_read_locked_inode(stru
+ struct btrfs_inode_item);
inode->i_mode = btrfs_inode_mode(leaf, inode_item);
- inode->i_nlink = btrfs_inode_nlink(leaf, inode_item);
-- inode->i_uid = btrfs_inode_uid(leaf, inode_item);
-- inode->i_gid = btrfs_inode_gid(leaf, inode_item);
-+
-+ uid = btrfs_inode_uid(leaf, inode_item);
-+ gid = btrfs_inode_gid(leaf, inode_item);
-+ 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,
-+ btrfs_inode_tag(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));
++
++ 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);
-@@ -2624,6 +2632,9 @@ static void fill_inode_item(struct btrfs
- struct btrfs_inode_item *item,
+@@ -3455,11 +3465,18 @@ static void fill_inode_item(struct btrfs
struct inode *inode)
{
-+ uid_t uid = TAGINO_UID(DX_TAG(inode), inode->i_uid, inode->i_tag);
-+ gid_t gid = TAGINO_GID(DX_TAG(inode), inode->i_gid, inode->i_tag);
-+
- if (!leaf->map_token)
- map_private_extent_buffer(leaf, (unsigned long)item,
- sizeof(struct btrfs_inode_item),
-@@ -2631,8 +2642,11 @@ static void fill_inode_item(struct btrfs
- &leaf->map_start, &leaf->map_len,
- KM_USER1);
-
-- btrfs_set_inode_uid(leaf, item, inode->i_uid);
-- btrfs_set_inode_gid(leaf, item, inode->i_gid);
-+ btrfs_set_inode_uid(leaf, item, uid);
-+ btrfs_set_inode_gid(leaf, item, gid);
+ struct btrfs_map_token token;
++ 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);
+
+- btrfs_set_token_inode_uid(leaf, item, i_uid_read(inode), &token);
+- btrfs_set_token_inode_gid(leaf, item, i_gid_read(inode), &token);
++ btrfs_set_token_inode_uid(leaf, item, uid, &token);
++ btrfs_set_token_inode_gid(leaf, item, gid, &token);
+#ifdef CONFIG_TAGGING_INTERN
-+ btrfs_set_inode_tag(leaf, item, inode->i_tag);
++ btrfs_set_token_inode_tag(leaf, item, i_tag_read(inode), &token);
+#endif
- btrfs_set_inode_size(leaf, item, BTRFS_I(inode)->disk_i_size);
- btrfs_set_inode_mode(leaf, item, inode->i_mode);
- btrfs_set_inode_nlink(leaf, item, inode->i_nlink);
-@@ -7357,6 +7371,7 @@ static const struct inode_operations btr
+ 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);
+@@ -8733,11 +8750,13 @@ 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,
};
static const struct inode_operations btrfs_dir_ro_inode_operations = {
.lookup = btrfs_lookup,
-@@ -7429,6 +7444,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,
};
- static const struct inode_operations btrfs_special_inode_operations = {
- .getattr = btrfs_getattr,
-diff -NurpP --minimal linux-3.0-rc5/fs/btrfs/ioctl.c linux-3.0-rc5-vs2.3.1-pre3/fs/btrfs/ioctl.c
---- linux-3.0-rc5/fs/btrfs/ioctl.c 2011-07-01 11:14:17.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/btrfs/ioctl.c 2011-06-22 12:39:15.000000000 +0200
-@@ -70,10 +70,13 @@ static unsigned int btrfs_flags_to_ioctl
+
+diff -NurpP --minimal linux-3.10.53/fs/btrfs/ioctl.c linux-3.10.53-vs2.3.6.8/fs/btrfs/ioctl.c
+--- linux-3.10.53/fs/btrfs/ioctl.c 2014-08-30 13:38:56.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/btrfs/ioctl.c 2014-03-12 13:18:23.000000000 +0000
+@@ -75,10 +75,13 @@ static unsigned int btrfs_flags_to_ioctl
{
unsigned int iflags = 0;
if (flags & BTRFS_INODE_APPEND)
iflags |= FS_APPEND_FL;
if (flags & BTRFS_INODE_NODUMP)
-@@ -90,28 +93,78 @@ static unsigned int btrfs_flags_to_ioctl
+@@ -95,28 +98,78 @@ static unsigned int btrfs_flags_to_ioctl
else if (flags & BTRFS_INODE_NOCOMPRESS)
iflags |= FS_NOCOMP_FL;
}
/*
-@@ -129,7 +182,7 @@ void btrfs_inherit_iflags(struct inode *
- flags = BTRFS_I(dir)->flags;
+@@ -132,6 +185,7 @@ void btrfs_inherit_iflags(struct inode *
+ return;
- if (S_ISREG(inode->i_mode))
-- flags &= ~BTRFS_INODE_DIRSYNC;
-+ flags &= ~(BTRFS_INODE_DIRSYNC | BTRFS_INODE_BARRIER);
- else if (!S_ISDIR(inode->i_mode))
- flags &= (BTRFS_INODE_NODUMP | BTRFS_INODE_NOATIME);
+ flags = BTRFS_I(dir)->flags;
++ flags &= ~BTRFS_INODE_BARRIER;
-@@ -137,6 +190,30 @@ void btrfs_inherit_iflags(struct inode *
+ if (flags & BTRFS_INODE_NOCOMPRESS) {
+ BTRFS_I(inode)->flags &= ~BTRFS_INODE_COMPRESS;
+@@ -150,6 +204,30 @@ void btrfs_inherit_iflags(struct inode *
btrfs_update_iflags(inode);
}
+
static int btrfs_ioctl_getflags(struct file *file, void __user *arg)
{
- struct btrfs_inode *ip = BTRFS_I(file->f_path.dentry->d_inode);
-@@ -188,7 +265,8 @@ static int btrfs_ioctl_setflags(struct f
+ struct btrfs_inode *ip = BTRFS_I(file_inode(file));
+@@ -212,21 +290,27 @@ static int btrfs_ioctl_setflags(struct f
flags = btrfs_mask_flags(inode->i_mode, flags);
oldflags = btrfs_flags_to_ioctl(ip->flags);
if (!capable(CAP_LINUX_IMMUTABLE)) {
ret = -EPERM;
goto out_unlock;
-@@ -199,14 +277,19 @@ static int btrfs_ioctl_setflags(struct f
- if (ret)
- goto out_unlock;
+ }
+ }
- if (flags & FS_SYNC_FL)
- ip->flags |= BTRFS_INODE_SYNC;
if (flags & FS_APPEND_FL)
ip->flags |= BTRFS_INODE_APPEND;
else
-diff -NurpP --minimal linux-3.0-rc5/fs/btrfs/super.c linux-3.0-rc5-vs2.3.1-pre3/fs/btrfs/super.c
---- linux-3.0-rc5/fs/btrfs/super.c 2011-07-01 11:14:17.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/btrfs/super.c 2011-06-15 02:40:14.000000000 +0200
-@@ -162,7 +162,7 @@ enum {
- Opt_notreelog, Opt_ratio, Opt_flushoncommit, Opt_discard,
- Opt_space_cache, Opt_clear_cache, Opt_user_subvol_rm_allowed,
- Opt_enospc_debug, Opt_subvolrootid, Opt_defrag,
-- Opt_inode_cache, Opt_err,
-+ Opt_inode_cache, Opt_tag, Opt_notag, Opt_tagid, Opt_err,
+diff -NurpP --minimal linux-3.10.53/fs/btrfs/super.c linux-3.10.53-vs2.3.6.8/fs/btrfs/super.c
+--- linux-3.10.53/fs/btrfs/super.c 2013-07-14 17:01:26.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/btrfs/super.c 2013-08-22 20:29:59.000000000 +0000
+@@ -319,7 +319,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,
+- Opt_err,
++ Opt_tag, Opt_notag, Opt_tagid, Opt_err,
};
static match_table_t tokens = {
-@@ -195,6 +195,9 @@ static match_table_t tokens = {
- {Opt_subvolrootid, "subvolrootid=%d"},
- {Opt_defrag, "autodefrag"},
- {Opt_inode_cache, "inode_cache"},
+@@ -359,6 +359,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"},
+ {Opt_fatal_errors, "fatal_errors=%s"},
+ {Opt_tag, "tag"},
+ {Opt_notag, "notag"},
+ {Opt_tagid, "tagid=%u"},
{Opt_err, NULL},
};
-@@ -381,6 +384,22 @@ int btrfs_parse_options(struct btrfs_roo
- printk(KERN_INFO "btrfs: enabling auto defrag");
- btrfs_set_opt(info->mount_opt, AUTO_DEFRAG);
+@@ -624,6 +627,22 @@ int btrfs_parse_options(struct btrfs_roo
+ goto out;
+ }
break;
+#ifndef CONFIG_TAGGING_NONE
+ case Opt_tag:
case Opt_err:
printk(KERN_INFO "btrfs: unrecognized mount option "
"'%s'\n", p);
-@@ -901,6 +920,12 @@ static int btrfs_remount(struct super_bl
- if (ret)
- return -EINVAL;
+@@ -1251,6 +1270,12 @@ static int btrfs_remount(struct super_bl
+ btrfs_resize_thread_pool(fs_info,
+ fs_info->thread_pool_size, old_thread_pool_size);
+ if (btrfs_test_opt(root, TAGGED) && !(sb->s_flags & MS_TAGGED)) {
+ printk("btrfs: %s: tagging not permitted on remount.\n",
+ }
+
if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
- return 0;
+ goto out;
-diff -NurpP --minimal linux-3.0-rc5/fs/char_dev.c linux-3.0-rc5-vs2.3.1-pre3/fs/char_dev.c
---- linux-3.0-rc5/fs/char_dev.c 2011-03-15 18:07:31.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/char_dev.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/fs/char_dev.c linux-3.10.53-vs2.3.6.8/fs/char_dev.c
+--- linux-3.10.53/fs/char_dev.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/char_dev.c 2013-08-22 20:29:59.000000000 +0000
@@ -21,6 +21,8 @@
#include <linux/mutex.h>
#include <linux/backing-dev.h>
if (!kobj)
return -ENXIO;
new = container_of(kobj, struct cdev, kobj);
-diff -NurpP --minimal linux-3.0-rc5/fs/dcache.c linux-3.0-rc5-vs2.3.1-pre3/fs/dcache.c
---- linux-3.0-rc5/fs/dcache.c 2011-07-01 11:14:17.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/dcache.c 2011-06-10 22:35:26.000000000 +0200
-@@ -36,6 +36,7 @@
- #include <linux/bit_spinlock.h>
+diff -NurpP --minimal linux-3.10.53/fs/dcache.c linux-3.10.53-vs2.3.6.8/fs/dcache.c
+--- linux-3.10.53/fs/dcache.c 2014-08-30 13:38:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/dcache.c 2014-03-12 13:18:23.000000000 +0000
+@@ -37,6 +37,7 @@
#include <linux/rculist_bl.h>
#include <linux/prefetch.h>
+ #include <linux/ratelimit.h>
+#include <linux/vs_limit.h>
#include "internal.h"
+ #include "mount.h"
- /*
-@@ -479,6 +480,8 @@ int d_invalidate(struct dentry * dentry)
+@@ -578,6 +579,8 @@ int d_invalidate(struct dentry * dentry)
spin_lock(&dentry->d_lock);
}
/*
* Somebody else still using it?
*
-@@ -506,6 +509,7 @@ EXPORT_SYMBOL(d_invalidate);
+@@ -607,6 +610,7 @@ EXPORT_SYMBOL(d_invalidate);
static inline void __dget_dlock(struct dentry *dentry)
{
dentry->d_count++;
}
static inline void __dget(struct dentry *dentry)
-@@ -1266,6 +1270,9 @@ struct dentry *d_alloc(struct dentry * p
+@@ -1239,6 +1243,9 @@ struct dentry *__d_alloc(struct super_bl
struct dentry *dentry;
char *dname;
dentry = kmem_cache_alloc(dentry_cache, GFP_KERNEL);
if (!dentry)
return NULL;
-@@ -1288,6 +1295,7 @@ struct dentry *d_alloc(struct dentry * p
+@@ -1271,6 +1278,7 @@ struct dentry *__d_alloc(struct super_bl
dentry->d_count = 1;
dentry->d_flags = 0;
spin_lock_init(&dentry->d_lock);
seqcount_init(&dentry->d_seq);
dentry->d_inode = NULL;
-@@ -1947,6 +1955,7 @@ struct dentry *__d_lookup(struct dentry
+@@ -1971,6 +1979,7 @@ struct dentry *__d_lookup(const struct d
}
dentry->d_count++;
found = dentry;
spin_unlock(&dentry->d_lock);
break;
-diff -NurpP --minimal linux-3.0-rc5/fs/devpts/inode.c linux-3.0-rc5-vs2.3.1-pre3/fs/devpts/inode.c
---- linux-3.0-rc5/fs/devpts/inode.c 2011-05-22 16:17:50.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/devpts/inode.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/fs/devpts/inode.c linux-3.10.53-vs2.3.6.8/fs/devpts/inode.c
+--- linux-3.10.53/fs/devpts/inode.c 2014-08-30 13:38:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/devpts/inode.c 2013-12-23 17:42:40.000000000 +0000
@@ -25,6 +25,7 @@
#include <linux/parser.h>
#include <linux/fsnotify.h>
#define DEVPTS_DEFAULT_MODE 0600
/*
-@@ -36,6 +37,20 @@
+@@ -36,6 +37,21 @@
#define DEVPTS_DEFAULT_PTMX_MODE 0000
#define PTMX_MINOR 2
-+static int devpts_permission(struct inode *inode, int mask, unsigned int flags)
++static int devpts_permission(struct inode *inode, int mask)
+{
+ int ret = -EACCES;
+
+ /* devpts is xid tagged */
-+ if (vx_check((xid_t)inode->i_tag, VS_WATCH_P | VS_IDENT))
-+ ret = generic_permission(inode, mask, flags, NULL);
++ if (vx_check((vxid_t)i_tag_read(inode), VS_WATCH_P | VS_IDENT))
++ ret = generic_permission(inode, mask);
+ return ret;
+}
+
+ .permission = devpts_permission,
+};
+
- extern int pty_limit; /* Config limit on Unix98 ptys */
- static DEFINE_MUTEX(allocated_ptys_lock);
-
-@@ -263,6 +278,34 @@ static int devpts_show_options(struct se
++
+ /*
+ * 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
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)de->d_inode->i_tag;
++ xid = (vxid_t)i_tag_read(de->d_inode);
+#ifdef CONFIG_VSERVER_WARN_DEVPTS
+ else
+ vxwprintk_task(1, "devpts " VS_Q("%.*s") " without inode.",
static const struct super_operations devpts_sops = {
.statfs = simple_statfs,
.remount_fs = devpts_remount,
-@@ -302,12 +345,15 @@ devpts_fill_super(struct super_block *s,
- inode = new_inode(s);
- if (!inode)
- goto free_fsi;
-+
- inode->i_ino = 1;
+@@ -388,8 +432,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;
- inode->i_fop = &simple_dir_operations;
+ inode->i_fop = &devpts_dir_operations;
- inode->i_nlink = 2;
+ set_nlink(inode, 2);
+ /* devpts is xid tagged */
-+ inode->i_tag = (tag_t)vx_current_xid();
++ i_tag_write(inode, (vtag_t)vx_current_xid());
- s->s_root = d_alloc_root(inode);
+ s->s_root = d_make_root(inode);
if (s->s_root)
-@@ -494,6 +540,9 @@ int devpts_pty_new(struct inode *ptmx_in
+@@ -593,6 +639,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 */
-+ inode->i_tag = (tag_t)vx_current_xid();
++ i_tag_write(inode, (vtag_t)vx_current_xid());
+ inode->i_op = &devpts_file_inode_operations;
- inode->i_private = tty;
- tty->driver_data = inode;
+ inode->i_private = priv;
-diff -NurpP --minimal linux-3.0-rc5/fs/ext2/balloc.c linux-3.0-rc5-vs2.3.1-pre3/fs/ext2/balloc.c
---- linux-3.0-rc5/fs/ext2/balloc.c 2011-05-22 16:17:51.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/ext2/balloc.c 2011-06-10 22:11:24.000000000 +0200
-@@ -701,7 +701,6 @@ ext2_try_to_allocate(struct super_block
+ sprintf(s, "%d", index);
+diff -NurpP --minimal linux-3.10.53/fs/ext2/balloc.c linux-3.10.53-vs2.3.6.8/fs/ext2/balloc.c
+--- linux-3.10.53/fs/ext2/balloc.c 2013-05-31 13:45:23.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/ext2/balloc.c 2013-08-22 20:29:59.000000000 +0000
+@@ -693,7 +693,6 @@ ext2_try_to_allocate(struct super_block
start = 0;
end = EXT2_BLOCKS_PER_GROUP(sb);
}
BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb));
repeat:
-diff -NurpP --minimal linux-3.0-rc5/fs/ext2/ext2.h linux-3.0-rc5-vs2.3.1-pre3/fs/ext2/ext2.h
---- linux-3.0-rc5/fs/ext2/ext2.h 2011-05-22 16:17:51.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/ext2/ext2.h 2011-06-10 22:11:24.000000000 +0200
-@@ -126,6 +126,7 @@ extern void ext2_set_inode_flags(struct
+diff -NurpP --minimal linux-3.10.53/fs/ext2/ext2.h linux-3.10.53-vs2.3.6.8/fs/ext2/ext2.h
+--- linux-3.10.53/fs/ext2/ext2.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/ext2/ext2.h 2013-08-22 20:29:59.000000000 +0000
+@@ -244,8 +244,12 @@ struct ext2_group_desc
+ #define EXT2_NOTAIL_FL FS_NOTAIL_FL /* file tail should not be merged */
+ #define EXT2_DIRSYNC_FL FS_DIRSYNC_FL /* dirsync behaviour (directories only) */
+ #define EXT2_TOPDIR_FL FS_TOPDIR_FL /* Top of directory hierarchies*/
++#define EXT2_IXUNLINK_FL FS_IXUNLINK_FL /* Immutable invert on unlink */
+ #define EXT2_RESERVED_FL FS_RESERVED_FL /* reserved for ext2 lib */
+
++#define EXT2_BARRIER_FL FS_BARRIER_FL /* Barrier for chroot() */
++#define EXT2_COW_FL FS_COW_FL /* Copy on Write marker */
++
+ #define EXT2_FL_USER_VISIBLE FS_FL_USER_VISIBLE /* User visible flags */
+ #define EXT2_FL_USER_MODIFIABLE FS_FL_USER_MODIFIABLE /* User modifiable flags */
+
+@@ -329,7 +333,8 @@ struct ext2_inode {
+ __u16 i_pad1;
+ __le16 l_i_uid_high; /* these 2 fields */
+ __le16 l_i_gid_high; /* were reserved2[0] */
+- __u32 l_i_reserved2;
++ __le16 l_i_tag; /* Context Tag */
++ __u16 l_i_reserved2;
+ } linux2;
+ struct {
+ __u8 h_i_frag; /* Fragment number */
+@@ -357,6 +362,7 @@ struct ext2_inode {
+ #define i_gid_low i_gid
+ #define i_uid_high osd2.linux2.l_i_uid_high
+ #define i_gid_high osd2.linux2.l_i_gid_high
++#define i_raw_tag osd2.linux2.l_i_tag
+ #define i_reserved2 osd2.linux2.l_i_reserved2
+
+ /*
+@@ -384,6 +390,7 @@ struct ext2_inode {
+ #define EXT2_MOUNT_USRQUOTA 0x020000 /* user quota */
+ #define EXT2_MOUNT_GRPQUOTA 0x040000 /* group quota */
+ #define EXT2_MOUNT_RESERVATION 0x080000 /* Preallocation */
++#define EXT2_MOUNT_TAGGED (1<<24) /* Enable Context Tags */
+
+
+ #define clear_opt(o, opt) o &= ~EXT2_MOUNT_##opt
+@@ -757,6 +764,7 @@ extern void ext2_set_inode_flags(struct
extern void ext2_get_inode_flags(struct ext2_inode_info *);
extern int ext2_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
u64 start, u64 len);
/* ioctl.c */
extern long ext2_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-3.0-rc5/fs/ext2/file.c linux-3.0-rc5-vs2.3.1-pre3/fs/ext2/file.c
---- linux-3.0-rc5/fs/ext2/file.c 2010-08-02 16:52:48.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/ext2/file.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/fs/ext2/file.c linux-3.10.53-vs2.3.6.8/fs/ext2/file.c
+--- linux-3.10.53/fs/ext2/file.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/ext2/file.c 2013-08-22 20:29:59.000000000 +0000
@@ -104,4 +104,5 @@ const struct inode_operations ext2_file_
.setattr = ext2_setattr,
- .check_acl = ext2_check_acl,
+ .get_acl = ext2_get_acl,
.fiemap = ext2_fiemap,
+ .sync_flags = ext2_sync_flags,
};
-diff -NurpP --minimal linux-3.0-rc5/fs/ext2/ialloc.c linux-3.0-rc5-vs2.3.1-pre3/fs/ext2/ialloc.c
---- linux-3.0-rc5/fs/ext2/ialloc.c 2011-05-22 16:17:51.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/ext2/ialloc.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/fs/ext2/ialloc.c linux-3.10.53-vs2.3.6.8/fs/ext2/ialloc.c
+--- linux-3.10.53/fs/ext2/ialloc.c 2013-05-31 13:45:23.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/ext2/ialloc.c 2013-08-22 20:29:59.000000000 +0000
@@ -17,6 +17,7 @@
#include <linux/backing-dev.h>
#include <linux/buffer_head.h>
#include "ext2.h"
#include "xattr.h"
#include "acl.h"
-@@ -549,6 +550,7 @@ got:
+@@ -546,6 +547,7 @@ got:
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.0-rc5/fs/ext2/inode.c linux-3.0-rc5-vs2.3.1-pre3/fs/ext2/inode.c
---- linux-3.0-rc5/fs/ext2/inode.c 2011-05-22 16:17:51.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/ext2/inode.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/fs/ext2/inode.c linux-3.10.53-vs2.3.6.8/fs/ext2/inode.c
+--- linux-3.10.53/fs/ext2/inode.c 2013-07-14 17:01:27.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/ext2/inode.c 2013-08-22 21:46:54.000000000 +0000
@@ -32,6 +32,7 @@
- #include <linux/mpage.h>
#include <linux/fiemap.h>
#include <linux/namei.h>
+ #include <linux/aio.h>
+#include <linux/vs_tag.h>
#include "ext2.h"
#include "acl.h"
#include "xip.h"
-@@ -1167,7 +1168,7 @@ static void ext2_truncate_blocks(struct
+@@ -1180,7 +1181,7 @@ static void ext2_truncate_blocks(struct
return;
if (ext2_inode_is_fast_symlink(inode))
return;
return;
__ext2_truncate_blocks(inode, offset);
}
-@@ -1256,36 +1257,61 @@ void ext2_set_inode_flags(struct inode *
+@@ -1271,36 +1272,61 @@ void ext2_set_inode_flags(struct inode *
{
unsigned int flags = EXT2_I(inode)->i_flags;
}
struct inode *ext2_iget (struct super_block *sb, unsigned long ino)
-@@ -1295,6 +1321,8 @@ struct inode *ext2_iget (struct super_bl
- struct ext2_inode *raw_inode;
- struct inode *inode;
- long ret = -EIO;
-+ uid_t uid;
-+ gid_t gid;
- int n;
-
- inode = iget_locked(sb, ino);
-@@ -1313,12 +1341,17 @@ struct inode *ext2_iget (struct super_bl
- }
-
- inode->i_mode = le16_to_cpu(raw_inode->i_mode);
-- inode->i_uid = (uid_t)le16_to_cpu(raw_inode->i_uid_low);
-- inode->i_gid = (gid_t)le16_to_cpu(raw_inode->i_gid_low);
-+ uid = (uid_t)le16_to_cpu(raw_inode->i_uid_low);
-+ gid = (gid_t)le16_to_cpu(raw_inode->i_gid_low);
- if (!(test_opt (inode->i_sb, NO_UID32))) {
-- inode->i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
-- inode->i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
-+ uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
-+ gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
+@@ -1336,8 +1362,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;
}
-+ 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,
-+ le16_to_cpu(raw_inode->i_raw_tag));
-+
- inode->i_nlink = le16_to_cpu(raw_inode->i_links_count);
+- i_uid_write(inode, i_uid);
+- i_gid_write(inode, i_gid);
++ i_uid_write(inode, INOTAG_UID(DX_TAG(inode), i_uid, i_gid));
++ i_gid_write(inode, INOTAG_GID(DX_TAG(inode), i_uid, i_gid));
++ i_tag_write(inode, INOTAG_TAG(DX_TAG(inode), i_uid, i_gid,
++ le16_to_cpu(raw_inode->i_raw_tag)));
+ set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
inode->i_size = le32_to_cpu(raw_inode->i_size);
inode->i_atime.tv_sec = (signed)le32_to_cpu(raw_inode->i_atime);
-@@ -1416,8 +1449,8 @@ static int __ext2_write_inode(struct ino
+@@ -1435,8 +1463,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 = inode->i_uid;
-- gid_t gid = inode->i_gid;
-+ uid_t uid = TAGINO_UID(DX_TAG(inode), inode->i_uid, inode->i_tag);
-+ gid_t gid = TAGINO_GID(DX_TAG(inode), inode->i_gid, inode->i_tag);
+- uid_t uid = i_uid_read(inode);
+- gid_t gid = i_gid_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;
-@@ -1453,6 +1486,9 @@ static int __ext2_write_inode(struct ino
+@@ -1472,6 +1502,9 @@ static int __ext2_write_inode(struct ino
raw_inode->i_uid_high = 0;
raw_inode->i_gid_high = 0;
}
+#ifdef CONFIG_TAGGING_INTERN
-+ raw_inode->i_raw_tag = cpu_to_le16(inode->i_tag);
++ raw_inode->i_raw_tag = cpu_to_le16(i_tag_read(inode));
+#endif
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);
-@@ -1533,7 +1569,8 @@ int ext2_setattr(struct dentry *dentry,
+@@ -1552,7 +1585,8 @@ int ext2_setattr(struct dentry *dentry,
if (is_quota_modification(inode, iattr))
dquot_initialize(inode);
- if ((iattr->ia_valid & ATTR_UID && iattr->ia_uid != inode->i_uid) ||
-- (iattr->ia_valid & ATTR_GID && iattr->ia_gid != inode->i_gid)) {
-+ (iattr->ia_valid & ATTR_GID && iattr->ia_gid != inode->i_gid) ||
-+ (iattr->ia_valid & ATTR_TAG && iattr->ia_tag != inode->i_tag)) {
+ if ((iattr->ia_valid & ATTR_UID && !uid_eq(iattr->ia_uid, inode->i_uid)) ||
+- (iattr->ia_valid & ATTR_GID && !gid_eq(iattr->ia_gid, inode->i_gid))) {
++ (iattr->ia_valid & ATTR_GID && !gid_eq(iattr->ia_gid, inode->i_gid)) ||
++ (iattr->ia_valid & ATTR_TAG && !tag_eq(iattr->ia_tag, inode->i_tag))) {
error = dquot_transfer(inode, iattr);
if (error)
return error;
-diff -NurpP --minimal linux-3.0-rc5/fs/ext2/ioctl.c linux-3.0-rc5-vs2.3.1-pre3/fs/ext2/ioctl.c
---- linux-3.0-rc5/fs/ext2/ioctl.c 2011-05-22 16:17:51.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/ext2/ioctl.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/fs/ext2/ioctl.c linux-3.10.53-vs2.3.6.8/fs/ext2/ioctl.c
+--- linux-3.10.53/fs/ext2/ioctl.c 2013-05-31 13:45:23.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/ext2/ioctl.c 2013-08-22 20:29:59.000000000 +0000
@@ -17,6 +17,16 @@
#include <asm/uaccess.h>
+
long ext2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
- struct inode *inode = filp->f_dentry->d_inode;
+ struct inode *inode = file_inode(filp);
@@ -51,6 +61,11 @@ long ext2_ioctl(struct file *filp, unsig
flags = ext2_mask_flags(inode->i_mode, flags);
+ flags &= EXT2_FL_USER_MODIFIABLE;
flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE;
ei->i_flags = flags;
- mutex_unlock(&inode->i_mutex);
-diff -NurpP --minimal linux-3.0-rc5/fs/ext2/namei.c linux-3.0-rc5-vs2.3.1-pre3/fs/ext2/namei.c
---- linux-3.0-rc5/fs/ext2/namei.c 2011-05-22 16:17:51.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/ext2/namei.c 2011-06-10 22:11:24.000000000 +0200
+
+diff -NurpP --minimal linux-3.10.53/fs/ext2/namei.c linux-3.10.53-vs2.3.6.8/fs/ext2/namei.c
+--- linux-3.10.53/fs/ext2/namei.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/ext2/namei.c 2013-08-22 20:29:59.000000000 +0000
@@ -32,6 +32,7 @@
#include <linux/pagemap.h>
#include "ext2.h"
#include "xattr.h"
#include "acl.h"
-@@ -75,6 +76,7 @@ static struct dentry *ext2_lookup(struct
- return ERR_PTR(-EIO);
- } else {
- return ERR_CAST(inode);
-+ dx_propagate_tag(nd, inode);
- }
+@@ -73,6 +74,7 @@ static struct dentry *ext2_lookup(struct
+ (unsigned long) ino);
+ return ERR_PTR(-EIO);
}
++ dx_propagate_tag(nd, inode);
}
-@@ -413,6 +415,7 @@ const struct inode_operations ext2_dir_i
+ return d_splice_alias(inode, dentry);
+ }
+@@ -397,6 +399,7 @@ const struct inode_operations ext2_dir_i
+ .removexattr = generic_removexattr,
#endif
.setattr = ext2_setattr,
- .check_acl = ext2_check_acl,
+ .sync_flags = ext2_sync_flags,
+ .get_acl = ext2_get_acl,
};
- const struct inode_operations ext2_special_inode_operations = {
-diff -NurpP --minimal linux-3.0-rc5/fs/ext2/super.c linux-3.0-rc5-vs2.3.1-pre3/fs/ext2/super.c
---- linux-3.0-rc5/fs/ext2/super.c 2011-07-01 11:14:18.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/ext2/super.c 2011-06-10 22:11:24.000000000 +0200
-@@ -394,7 +394,8 @@ enum {
+diff -NurpP --minimal linux-3.10.53/fs/ext2/super.c linux-3.10.53-vs2.3.6.8/fs/ext2/super.c
+--- linux-3.10.53/fs/ext2/super.c 2013-05-31 13:45:23.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/ext2/super.c 2013-08-22 20:29:59.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,
Opt_acl, Opt_noacl, Opt_xip, Opt_ignore, Opt_err, Opt_quota,
};
static const match_table_t tokens = {
-@@ -422,6 +423,9 @@ static const match_table_t tokens = {
+@@ -423,6 +424,9 @@ static const match_table_t tokens = {
{Opt_acl, "acl"},
{Opt_noacl, "noacl"},
{Opt_xip, "xip"},
{Opt_grpquota, "grpquota"},
{Opt_ignore, "noquota"},
{Opt_quota, "quota"},
-@@ -492,6 +496,20 @@ static int parse_options(char *options,
+@@ -506,6 +510,20 @@ static int parse_options(char *options,
case Opt_nouid32:
set_opt (sbi->s_mount_opt, NO_UID32);
break;
case Opt_nocheck:
clear_opt (sbi->s_mount_opt, CHECK);
break;
-@@ -850,6 +868,8 @@ static int ext2_fill_super(struct super_
+@@ -864,6 +882,8 @@ static int ext2_fill_super(struct super_
if (!parse_options((char *) data, sb))
goto failed_mount;
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
((EXT2_SB(sb)->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ?
MS_POSIXACL : 0);
-@@ -1224,6 +1244,14 @@ static int ext2_remount (struct super_bl
+@@ -1269,6 +1289,14 @@ static int ext2_remount (struct super_bl
+ err = -EINVAL;
goto restore_opts;
}
-
++
+ if ((sbi->s_mount_opt & EXT2_MOUNT_TAGGED) &&
+ !(sb->s_flags & MS_TAGGED)) {
+ printk("EXT2-fs: %s: tagging not permitted on remount.\n",
+ err = -EINVAL;
+ goto restore_opts;
+ }
-+
+
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
+diff -NurpP --minimal linux-3.10.53/fs/ext3/ext3.h linux-3.10.53-vs2.3.6.8/fs/ext3/ext3.h
+--- linux-3.10.53/fs/ext3/ext3.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/ext3/ext3.h 2013-08-22 20:29:59.000000000 +0000
+@@ -151,10 +151,14 @@ struct ext3_group_desc
+ #define EXT3_NOTAIL_FL 0x00008000 /* file tail should not be merged */
+ #define EXT3_DIRSYNC_FL 0x00010000 /* dirsync behaviour (directories only) */
+ #define EXT3_TOPDIR_FL 0x00020000 /* Top of directory hierarchies*/
++#define EXT3_IXUNLINK_FL 0x08000000 /* Immutable invert on unlink */
+ #define EXT3_RESERVED_FL 0x80000000 /* reserved for ext3 lib */
-diff -NurpP --minimal linux-3.0-rc5/fs/ext3/file.c linux-3.0-rc5-vs2.3.1-pre3/fs/ext3/file.c
---- linux-3.0-rc5/fs/ext3/file.c 2010-07-07 18:31:51.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/ext3/file.c 2011-06-10 22:11:24.000000000 +0200
-@@ -81,5 +81,6 @@ const struct inode_operations ext3_file_
- #endif
- .check_acl = ext3_check_acl,
- .fiemap = ext3_fiemap,
-+ .sync_flags = ext3_sync_flags,
- };
+-#define EXT3_FL_USER_VISIBLE 0x0003DFFF /* User visible flags */
+-#define EXT3_FL_USER_MODIFIABLE 0x000380FF /* User modifiable flags */
++#define EXT3_BARRIER_FL 0x04000000 /* Barrier for chroot() */
++#define EXT3_COW_FL 0x20000000 /* Copy on Write marker */
++
++#define EXT3_FL_USER_VISIBLE 0x0103DFFF /* User visible flags */
++#define EXT3_FL_USER_MODIFIABLE 0x010380FF /* User modifiable flags */
-diff -NurpP --minimal linux-3.0-rc5/fs/ext3/ialloc.c linux-3.0-rc5-vs2.3.1-pre3/fs/ext3/ialloc.c
---- linux-3.0-rc5/fs/ext3/ialloc.c 2011-05-22 16:17:52.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/ext3/ialloc.c 2011-06-10 22:11:24.000000000 +0200
-@@ -23,6 +23,7 @@
- #include <linux/buffer_head.h>
+ /* 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 {
+ __u16 i_pad1;
+ __le16 l_i_uid_high; /* these 2 fields */
+ __le16 l_i_gid_high; /* were reserved2[0] */
+- __u32 l_i_reserved2;
++ __le16 l_i_tag; /* Context Tag */
++ __u16 l_i_reserved2;
+ } linux2;
+ struct {
+ __u8 h_i_frag; /* Fragment number */
+@@ -320,6 +325,7 @@ struct ext3_inode {
+ #define i_gid_low i_gid
+ #define i_uid_high osd2.linux2.l_i_uid_high
+ #define i_gid_high osd2.linux2.l_i_gid_high
++#define i_raw_tag osd2.linux2.l_i_tag
+ #define i_reserved2 osd2.linux2.l_i_reserved2
+
+ /*
+@@ -364,6 +370,7 @@ struct ext3_inode {
+ #define EXT3_MOUNT_GRPQUOTA 0x200000 /* "old" group quota */
+ #define EXT3_MOUNT_DATA_ERR_ABORT 0x400000 /* Abort on file data write
+ * error in ordered mode */
++#define EXT3_MOUNT_TAGGED (1<<24) /* Enable Context Tags */
+
+ /* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */
+ #ifndef _LINUX_EXT2_FS_H
+@@ -1061,6 +1068,7 @@ extern void ext3_get_inode_flags(struct
+ extern void ext3_set_aops(struct inode *inode);
+ extern int ext3_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
+ u64 start, u64 len);
++extern int ext3_sync_flags(struct inode *, int, int);
+
+ /* ioctl.c */
+ extern long ext3_ioctl(struct file *, unsigned int, unsigned long);
+diff -NurpP --minimal linux-3.10.53/fs/ext3/file.c linux-3.10.53-vs2.3.6.8/fs/ext3/file.c
+--- linux-3.10.53/fs/ext3/file.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/ext3/file.c 2013-08-22 20:29:59.000000000 +0000
+@@ -76,5 +76,6 @@ const struct inode_operations ext3_file_
+ #endif
+ .get_acl = ext3_get_acl,
+ .fiemap = ext3_fiemap,
++ .sync_flags = ext3_sync_flags,
+ };
+
+diff -NurpP --minimal linux-3.10.53/fs/ext3/ialloc.c linux-3.10.53-vs2.3.6.8/fs/ext3/ialloc.c
+--- linux-3.10.53/fs/ext3/ialloc.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/ext3/ialloc.c 2013-08-22 20:29:59.000000000 +0000
+@@ -14,6 +14,7 @@
+
+ #include <linux/quotaops.h>
#include <linux/random.h>
- #include <linux/bitops.h>
+#include <linux/vs_tag.h>
- #include <asm/byteorder.h>
-
-@@ -532,6 +533,7 @@ got:
+ #include "ext3.h"
+ #include "xattr.h"
+@@ -469,6 +470,7 @@ got:
inode->i_mode = mode;
inode->i_uid = current_fsuid();
inode->i_gid = dir->i_gid;
-+ 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.0-rc5/fs/ext3/inode.c linux-3.0-rc5-vs2.3.1-pre3/fs/ext3/inode.c
---- linux-3.0-rc5/fs/ext3/inode.c 2011-07-01 11:14:18.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/ext3/inode.c 2011-06-10 22:11:24.000000000 +0200
-@@ -38,6 +38,7 @@
- #include <linux/bio.h>
- #include <linux/fiemap.h>
+diff -NurpP --minimal linux-3.10.53/fs/ext3/inode.c linux-3.10.53-vs2.3.6.8/fs/ext3/inode.c
+--- linux-3.10.53/fs/ext3/inode.c 2013-07-14 17:01:27.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/ext3/inode.c 2013-08-22 21:21:18.000000000 +0000
+@@ -28,6 +28,8 @@
+ #include <linux/mpage.h>
#include <linux/namei.h>
+ #include <linux/aio.h>
+#include <linux/vs_tag.h>
++
+ #include "ext3.h"
#include "xattr.h"
#include "acl.h"
-
-@@ -2391,7 +2392,7 @@ static void ext3_free_branches(handle_t
-
- int ext3_can_truncate(struct inode *inode)
- {
-- if (IS_APPEND(inode) || IS_IMMUTABLE(inode))
-+ if (IS_APPEND(inode) || IS_IXORUNLINK(inode))
- return 0;
- if (S_ISREG(inode->i_mode))
- return 1;
-@@ -2775,36 +2776,60 @@ void ext3_set_inode_flags(struct inode *
+@@ -2853,36 +2855,60 @@ void ext3_set_inode_flags(struct inode *
{
unsigned int flags = EXT3_I(inode)->i_flags;
}
struct inode *ext3_iget(struct super_block *sb, unsigned long ino)
-@@ -2818,6 +2843,8 @@ struct inode *ext3_iget(struct super_blo
- transaction_t *transaction;
- long ret;
- int block;
-+ uid_t uid;
-+ gid_t gid;
-
- inode = iget_locked(sb, ino);
- if (!inode)
-@@ -2834,12 +2861,17 @@ struct inode *ext3_iget(struct super_blo
- bh = iloc.bh;
- raw_inode = ext3_raw_inode(&iloc);
- inode->i_mode = le16_to_cpu(raw_inode->i_mode);
-- inode->i_uid = (uid_t)le16_to_cpu(raw_inode->i_uid_low);
-- inode->i_gid = (gid_t)le16_to_cpu(raw_inode->i_gid_low);
-+ uid = (uid_t)le16_to_cpu(raw_inode->i_uid_low);
-+ gid = (gid_t)le16_to_cpu(raw_inode->i_gid_low);
- if(!(test_opt (inode->i_sb, NO_UID32))) {
-- inode->i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
-- inode->i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
-+ uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
-+ gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
+@@ -2920,8 +2946,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;
}
-+ 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,
-+ le16_to_cpu(raw_inode->i_raw_tag));
-+
- inode->i_nlink = le16_to_cpu(raw_inode->i_links_count);
+- i_uid_write(inode, i_uid);
+- i_gid_write(inode, i_gid);
++ i_uid_write(inode, INOTAG_UID(DX_TAG(inode), i_uid, i_gid));
++ i_gid_write(inode, INOTAG_GID(DX_TAG(inode), i_uid, i_gid));
++ i_tag_write(inode, INOTAG_TAG(DX_TAG(inode), i_uid, i_gid,
++ le16_to_cpu(raw_inode->i_raw_tag)));
+ set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
inode->i_size = le32_to_cpu(raw_inode->i_size);
inode->i_atime.tv_sec = (signed)le32_to_cpu(raw_inode->i_atime);
-@@ -2994,6 +3026,8 @@ static int ext3_do_update_inode(handle_t
- struct ext3_inode *raw_inode = ext3_raw_inode(iloc);
- struct ext3_inode_info *ei = EXT3_I(inode);
- struct buffer_head *bh = iloc->bh;
-+ uid_t uid = TAGINO_UID(DX_TAG(inode), inode->i_uid, inode->i_tag);
-+ gid_t gid = TAGINO_GID(DX_TAG(inode), inode->i_gid, inode->i_tag);
- int err = 0, rc, block;
-
- again:
-@@ -3008,29 +3042,32 @@ again:
+@@ -3093,8 +3121,10 @@ again:
+
ext3_get_inode_flags(ei);
raw_inode->i_mode = cpu_to_le16(inode->i_mode);
+- i_uid = i_uid_read(inode);
+- i_gid = i_gid_read(inode);
++ i_uid = from_kuid(&init_user_ns,
++ TAGINO_KUID(DX_TAG(inode), inode->i_uid, inode->i_tag));
++ i_gid = from_kgid(&init_user_ns,
++ TAGINO_KGID(DX_TAG(inode), inode->i_gid, inode->i_tag));
if(!(test_opt(inode->i_sb, NO_UID32))) {
-- raw_inode->i_uid_low = cpu_to_le16(low_16_bits(inode->i_uid));
-- raw_inode->i_gid_low = cpu_to_le16(low_16_bits(inode->i_gid));
-+ raw_inode->i_uid_low = cpu_to_le16(low_16_bits(uid));
-+ raw_inode->i_gid_low = cpu_to_le16(low_16_bits(gid));
- /*
- * Fix up interoperability with old kernels. Otherwise, old inodes get
- * re-used with the upper 16 bits of the uid/gid intact
- */
- if(!ei->i_dtime) {
- raw_inode->i_uid_high =
-- cpu_to_le16(high_16_bits(inode->i_uid));
-+ cpu_to_le16(high_16_bits(uid));
- raw_inode->i_gid_high =
-- cpu_to_le16(high_16_bits(inode->i_gid));
-+ cpu_to_le16(high_16_bits(gid));
- } else {
- raw_inode->i_uid_high = 0;
- raw_inode->i_gid_high = 0;
- }
- } else {
- raw_inode->i_uid_low =
-- cpu_to_le16(fs_high2lowuid(inode->i_uid));
-+ cpu_to_le16(fs_high2lowuid(uid));
- raw_inode->i_gid_low =
-- cpu_to_le16(fs_high2lowgid(inode->i_gid));
-+ cpu_to_le16(fs_high2lowgid(gid));
+ 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));
+@@ -3119,6 +3149,9 @@ again:
raw_inode->i_uid_high = 0;
raw_inode->i_gid_high = 0;
}
+#ifdef CONFIG_TAGGING_INTERN
-+ raw_inode->i_raw_tag = cpu_to_le16(inode->i_tag);
++ raw_inode->i_raw_tag = cpu_to_le16(i_tag_read(inode));
+#endif
raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
- raw_inode->i_size = cpu_to_le32(ei->i_disksize);
- raw_inode->i_atime = cpu_to_le32(inode->i_atime.tv_sec);
-@@ -3190,7 +3227,8 @@ int ext3_setattr(struct dentry *dentry,
+ disksize = cpu_to_le32(ei->i_disksize);
+ if (disksize != raw_inode->i_size) {
+@@ -3287,7 +3320,8 @@ int ext3_setattr(struct dentry *dentry,
if (is_quota_modification(inode, attr))
dquot_initialize(inode);
- if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
-- (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid)) {
-+ (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid) ||
-+ (ia_valid & ATTR_TAG && attr->ia_tag != inode->i_tag)) {
+ if ((ia_valid & ATTR_UID && !uid_eq(attr->ia_uid, inode->i_uid)) ||
+- (ia_valid & ATTR_GID && !gid_eq(attr->ia_gid, inode->i_gid))) {
++ (ia_valid & ATTR_GID && !gid_eq(attr->ia_gid, inode->i_gid)) ||
++ (ia_valid & ATTR_TAG && !tag_eq(attr->ia_tag, inode->i_tag))) {
handle_t *handle;
/* (user+group)*(old+new) structure, inode write (sb,
-@@ -3212,6 +3250,8 @@ int ext3_setattr(struct dentry *dentry,
+@@ -3309,6 +3343,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;
error = ext3_mark_inode_dirty(handle, inode);
ext3_journal_stop(handle);
}
-diff -NurpP --minimal linux-3.0-rc5/fs/ext3/ioctl.c linux-3.0-rc5-vs2.3.1-pre3/fs/ext3/ioctl.c
---- linux-3.0-rc5/fs/ext3/ioctl.c 2011-05-22 16:17:52.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/ext3/ioctl.c 2011-06-10 22:11:24.000000000 +0200
-@@ -8,6 +8,7 @@
- */
-
- #include <linux/fs.h>
-+#include <linux/mount.h>
- #include <linux/jbd.h>
- #include <linux/capability.h>
- #include <linux/ext3_fs.h>
-@@ -17,6 +18,34 @@
- #include <linux/compat.h>
+diff -NurpP --minimal linux-3.10.53/fs/ext3/ioctl.c linux-3.10.53-vs2.3.6.8/fs/ext3/ioctl.c
+--- linux-3.10.53/fs/ext3/ioctl.c 2013-05-31 13:45:23.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/ext3/ioctl.c 2013-08-22 20:29:59.000000000 +0000
+@@ -12,6 +12,34 @@
#include <asm/uaccess.h>
+ #include "ext3.h"
+
+int ext3_sync_flags(struct inode *inode, int flags, int vflags)
+
long ext3_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
- struct inode *inode = filp->f_dentry->d_inode;
-@@ -50,6 +79,11 @@ long ext3_ioctl(struct file *filp, unsig
+ struct inode *inode = file_inode(filp);
+@@ -45,6 +73,11 @@ long ext3_ioctl(struct file *filp, unsig
flags = ext3_mask_flags(inode->i_mode, flags);
mutex_lock(&inode->i_mutex);
/* Is it quota file? Do not allow user to mess with it */
-@@ -68,7 +102,9 @@ long ext3_ioctl(struct file *filp, unsig
+@@ -63,7 +96,9 @@ long ext3_ioctl(struct file *filp, unsig
*
* This test looks nicer. Thanks to Pauline Middelink
*/
if (!capable(CAP_LINUX_IMMUTABLE))
goto flags_out;
}
-@@ -93,7 +129,7 @@ long ext3_ioctl(struct file *filp, unsig
+@@ -88,7 +123,7 @@ long ext3_ioctl(struct file *filp, unsig
if (err)
goto flags_err;
flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE;
ei->i_flags = flags;
-diff -NurpP --minimal linux-3.0-rc5/fs/ext3/namei.c linux-3.0-rc5-vs2.3.1-pre3/fs/ext3/namei.c
---- linux-3.0-rc5/fs/ext3/namei.c 2011-07-01 11:14:18.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/ext3/namei.c 2011-06-10 22:11:24.000000000 +0200
-@@ -36,6 +36,7 @@
+diff -NurpP --minimal linux-3.10.53/fs/ext3/namei.c linux-3.10.53-vs2.3.6.8/fs/ext3/namei.c
+--- linux-3.10.53/fs/ext3/namei.c 2014-08-30 13:38:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/ext3/namei.c 2013-11-13 17:17:16.000000000 +0000
+@@ -25,6 +25,8 @@
+ */
+
#include <linux/quotaops.h>
- #include <linux/buffer_head.h>
- #include <linux/bio.h>
+#include <linux/vs_tag.h>
-
++
+ #include "ext3.h"
#include "namei.h"
#include "xattr.h"
-@@ -923,6 +924,7 @@ restart:
- if (bh)
- ll_rw_block(READ_META, 1, &bh);
- }
+@@ -915,6 +917,7 @@ restart:
+ submit_bh(READ | REQ_META | REQ_PRIO,
+ bh);
+ }
+ dx_propagate_tag(nd, inode);
+ }
}
if ((bh = bh_use[ra_ptr++]) == NULL)
- goto next;
-@@ -2534,6 +2536,7 @@ const struct inode_operations ext3_dir_i
+@@ -2524,6 +2527,7 @@ const struct inode_operations ext3_dir_i
+ .listxattr = ext3_listxattr,
.removexattr = generic_removexattr,
#endif
- .check_acl = ext3_check_acl,
+ .sync_flags = ext3_sync_flags,
+ .get_acl = ext3_get_acl,
};
- const struct inode_operations ext3_special_inode_operations = {
-diff -NurpP --minimal linux-3.0-rc5/fs/ext3/super.c linux-3.0-rc5-vs2.3.1-pre3/fs/ext3/super.c
---- linux-3.0-rc5/fs/ext3/super.c 2011-07-01 11:14:18.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/ext3/super.c 2011-06-10 22:11:24.000000000 +0200
-@@ -821,7 +821,8 @@ enum {
+diff -NurpP --minimal linux-3.10.53/fs/ext3/super.c linux-3.10.53-vs2.3.6.8/fs/ext3/super.c
+--- linux-3.10.53/fs/ext3/super.c 2013-07-14 17:01:27.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/ext3/super.c 2013-08-22 20:29:59.000000000 +0000
+@@ -813,7 +813,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,
};
static const match_table_t tokens = {
-@@ -878,6 +879,9 @@ static const match_table_t tokens = {
+@@ -870,6 +871,9 @@ static const match_table_t tokens = {
{Opt_barrier, "barrier"},
{Opt_nobarrier, "nobarrier"},
{Opt_resize, "resize"},
{Opt_err, NULL},
};
-@@ -1030,6 +1034,20 @@ static int parse_options (char *options,
+@@ -1037,6 +1041,20 @@ static int parse_options (char *options,
case Opt_nouid32:
set_opt (sbi->s_mount_opt, NO_UID32);
break;
case Opt_nocheck:
clear_opt (sbi->s_mount_opt, CHECK);
break;
-@@ -1724,6 +1742,9 @@ static int ext3_fill_super (struct super
+@@ -1734,6 +1752,9 @@ static int ext3_fill_super (struct super
NULL, 0))
goto failed_mount;
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-@@ -2604,6 +2625,14 @@ static int ext3_remount (struct super_bl
+@@ -2629,6 +2650,14 @@ static int ext3_remount (struct super_bl
if (test_opt(sb, ABORT))
ext3_abort(sb, __func__, "Abort forced by user");
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-3.0-rc5/fs/ext4/ext4.h linux-3.0-rc5-vs2.3.1-pre3/fs/ext4/ext4.h
---- linux-3.0-rc5/fs/ext4/ext4.h 2011-07-01 11:14:18.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/ext4/ext4.h 2011-06-10 22:11:24.000000000 +0200
-@@ -350,8 +350,12 @@ struct flex_groups {
+diff -NurpP --minimal linux-3.10.53/fs/ext4/ext4.h linux-3.10.53-vs2.3.6.8/fs/ext4/ext4.h
+--- linux-3.10.53/fs/ext4/ext4.h 2014-08-30 13:38:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/ext4/ext4.h 2014-03-12 13:18:32.000000000 +0000
+@@ -397,7 +397,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 */
++#define EXT4_BARRIER_FL 0x04000000 /* Barrier for chroot() */
+#define EXT4_IXUNLINK_FL 0x08000000 /* Immutable invert on unlink */
+ #define EXT4_INLINE_DATA_FL 0x10000000 /* Inode has inline data. */
++#define EXT4_COW_FL 0x20000000 /* Copy on Write marker */
#define EXT4_RESERVED_FL 0x80000000 /* reserved for ext4 lib */
-+#define EXT4_BARRIER_FL 0x04000000 /* Barrier for chroot() */
-+#define EXT4_COW_FL 0x20000000 /* Copy on Write marker */
-+
#define EXT4_FL_USER_VISIBLE 0x004BDFFF /* User visible flags */
- #define EXT4_FL_USER_MODIFIABLE 0x004B80FF /* User modifiable flags */
-
-@@ -608,7 +612,8 @@ struct ext4_inode {
- __le16 l_i_file_acl_high;
+@@ -673,7 +676,7 @@ struct ext4_inode {
__le16 l_i_uid_high; /* these 2 fields */
__le16 l_i_gid_high; /* were reserved2[0] */
-- __u32 l_i_reserved2;
+ __le16 l_i_checksum_lo;/* crc32c(uuid+inum+inode) LE */
+- __le16 l_i_reserved;
+ __le16 l_i_tag; /* Context Tag */
-+ __u16 l_i_reserved2;
} linux2;
struct {
__le16 h_i_reserved1; /* Obsoleted fragment number/size which are removed in ext4 */
-@@ -726,6 +731,7 @@ do { \
+@@ -793,6 +796,7 @@ do { \
#define i_gid_low i_gid
#define i_uid_high osd2.linux2.l_i_uid_high
#define i_gid_high osd2.linux2.l_i_gid_high
+#define i_raw_tag osd2.linux2.l_i_tag
- #define i_reserved2 osd2.linux2.l_i_reserved2
+ #define i_checksum_lo osd2.linux2.l_i_checksum_lo
#elif defined(__GNU__)
-@@ -902,6 +908,7 @@ struct ext4_inode_info {
+@@ -970,6 +974,7 @@ struct ext4_inode_info {
#define EXT4_MOUNT_POSIX_ACL 0x08000 /* POSIX Access Control Lists */
#define EXT4_MOUNT_NO_AUTO_DA_ALLOC 0x10000 /* No auto delalloc mapping */
#define EXT4_MOUNT_BARRIER 0x20000 /* Use block barriers */
#define EXT4_MOUNT_QUOTA 0x80000 /* Some quota option set */
#define EXT4_MOUNT_USRQUOTA 0x100000 /* "old" user quota */
#define EXT4_MOUNT_GRPQUOTA 0x200000 /* "old" group quota */
-@@ -2172,6 +2179,7 @@ extern int ext4_map_blocks(handle_t *han
- struct ext4_map_blocks *map, int flags);
- extern int ext4_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
- __u64 start, __u64 len);
+@@ -2550,6 +2555,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);
+extern int ext4_sync_flags(struct inode *, int, int);
- /* move_extent.c */
- extern int ext4_move_extents(struct file *o_filp, struct file *d_filp,
- __u64 start_orig, __u64 start_donor,
-diff -NurpP --minimal linux-3.0-rc5/fs/ext4/file.c linux-3.0-rc5-vs2.3.1-pre3/fs/ext4/file.c
---- linux-3.0-rc5/fs/ext4/file.c 2011-07-01 11:14:18.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/ext4/file.c 2011-06-10 22:11:24.000000000 +0200
-@@ -282,5 +282,6 @@ const struct inode_operations ext4_file_
- #endif
- .check_acl = ext4_check_acl,
+ extern int ext4_try_to_evict_inline_data(handle_t *handle,
+ struct inode *inode,
+ int needed);
+diff -NurpP --minimal linux-3.10.53/fs/ext4/file.c linux-3.10.53-vs2.3.6.8/fs/ext4/file.c
+--- linux-3.10.53/fs/ext4/file.c 2014-08-30 13:38:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/ext4/file.c 2014-05-20 04:31:55.000000000 +0000
+@@ -651,5 +651,6 @@ const struct inode_operations ext4_file_
+ .removexattr = generic_removexattr,
+ .get_acl = ext4_get_acl,
.fiemap = ext4_fiemap,
+ .sync_flags = ext4_sync_flags,
};
-diff -NurpP --minimal linux-3.0-rc5/fs/ext4/ialloc.c linux-3.0-rc5-vs2.3.1-pre3/fs/ext4/ialloc.c
---- linux-3.0-rc5/fs/ext4/ialloc.c 2011-05-22 16:17:52.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/ext4/ialloc.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/fs/ext4/ialloc.c linux-3.10.53-vs2.3.6.8/fs/ext4/ialloc.c
+--- linux-3.10.53/fs/ext4/ialloc.c 2014-08-30 13:38:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/ext4/ialloc.c 2014-08-30 14:03:54.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/random.h>
#include <linux/bitops.h>
#include <asm/byteorder.h>
#include "ext4.h"
-@@ -992,6 +993,7 @@ got:
+@@ -679,6 +680,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.0-rc5/fs/ext4/inode.c linux-3.0-rc5-vs2.3.1-pre3/fs/ext4/inode.c
---- linux-3.0-rc5/fs/ext4/inode.c 2011-07-01 11:14:18.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/ext4/inode.c 2011-07-01 11:35:34.000000000 +0200
-@@ -42,6 +42,7 @@
- #include <linux/printk.h>
- #include <linux/slab.h>
+ dquot_initialize(inode);
+diff -NurpP --minimal linux-3.10.53/fs/ext4/inode.c linux-3.10.53-vs2.3.6.8/fs/ext4/inode.c
+--- linux-3.10.53/fs/ext4/inode.c 2014-08-30 13:38:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/ext4/inode.c 2014-04-22 03:51:19.000000000 +0000
+@@ -39,6 +39,7 @@
#include <linux/ratelimit.h>
+ #include <linux/aio.h>
+ #include <linux/bitops.h>
+#include <linux/vs_tag.h>
#include "ext4_jbd2.h"
#include "xattr.h"
-@@ -4797,41 +4798,64 @@ void ext4_set_inode_flags(struct inode *
- {
+@@ -4047,42 +4048,67 @@ 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;
+ new_fl |= S_DIRSYNC;
+
-+ inode->i_vflags &= ~(V_BARRIER | V_COW);
+ set_mask_bits(&inode->i_flags,
+- S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC, new_fl);
++ S_IXUNLINK | S_IMMUTABLE |
++ S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC, new_fl);
+
++ 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 */
} while (cmpxchg(&ei->i_flags, old_fl, new_fl) != old_fl);
}
-@@ -4867,6 +4891,8 @@ struct inode *ext4_iget(struct super_blo
- journal_t *journal = EXT4_SB(sb)->s_journal;
- long ret;
- int block;
-+ uid_t uid;
-+ gid_t gid;
-
- inode = iget_locked(sb, ino);
- if (!inode)
-@@ -4882,12 +4908,16 @@ struct inode *ext4_iget(struct super_blo
- goto bad_inode;
- raw_inode = ext4_raw_inode(&iloc);
- inode->i_mode = le16_to_cpu(raw_inode->i_mode);
-- inode->i_uid = (uid_t)le16_to_cpu(raw_inode->i_uid_low);
-- inode->i_gid = (gid_t)le16_to_cpu(raw_inode->i_gid_low);
-+ uid = (uid_t)le16_to_cpu(raw_inode->i_uid_low);
-+ gid = (gid_t)le16_to_cpu(raw_inode->i_gid_low);
- if (!(test_opt(inode->i_sb, NO_UID32))) {
-- inode->i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
-- inode->i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
-+ uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
-+ gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
+@@ -4187,8 +4213,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;
}
-+ 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,
-+ le16_to_cpu(raw_inode->i_raw_tag));
- inode->i_nlink = le16_to_cpu(raw_inode->i_links_count);
+- i_uid_write(inode, i_uid);
+- i_gid_write(inode, i_gid);
++ i_uid_write(inode, INOTAG_UID(DX_TAG(inode), i_uid, i_gid));
++ i_gid_write(inode, INOTAG_GID(DX_TAG(inode), i_uid, i_gid));
++ i_tag_write(inode, INOTAG_TAG(DX_TAG(inode), i_uid, i_gid,
++ le16_to_cpu(raw_inode->i_raw_tag)));
+ set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
ext4_clear_state_flags(ei); /* Only relevant on 32-bit archs */
-@@ -5106,6 +5136,8 @@ static int ext4_do_update_inode(handle_t
- struct ext4_inode *raw_inode = ext4_raw_inode(iloc);
- struct ext4_inode_info *ei = EXT4_I(inode);
- struct buffer_head *bh = iloc->bh;
-+ uid_t uid = TAGINO_UID(DX_TAG(inode), inode->i_uid, inode->i_tag);
-+ gid_t gid = TAGINO_GID(DX_TAG(inode), inode->i_gid, inode->i_tag);
- int err = 0, rc, block;
-
- /* For fields not not tracking in the in-memory inode,
-@@ -5116,29 +5148,32 @@ static int ext4_do_update_inode(handle_t
+@@ -4416,8 +4444,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 = 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(inode->i_uid));
-- raw_inode->i_gid_low = cpu_to_le16(low_16_bits(inode->i_gid));
-+ raw_inode->i_uid_low = cpu_to_le16(low_16_bits(uid));
-+ raw_inode->i_gid_low = cpu_to_le16(low_16_bits(gid));
- /*
- * Fix up interoperability with old kernels. Otherwise, old inodes get
- * re-used with the upper 16 bits of the uid/gid intact
- */
- if (!ei->i_dtime) {
- raw_inode->i_uid_high =
-- cpu_to_le16(high_16_bits(inode->i_uid));
-+ cpu_to_le16(high_16_bits(uid));
- raw_inode->i_gid_high =
-- cpu_to_le16(high_16_bits(inode->i_gid));
-+ cpu_to_le16(high_16_bits(gid));
- } else {
- raw_inode->i_uid_high = 0;
- raw_inode->i_gid_high = 0;
- }
- } else {
- raw_inode->i_uid_low =
-- cpu_to_le16(fs_high2lowuid(inode->i_uid));
-+ cpu_to_le16(fs_high2lowuid(uid));
- raw_inode->i_gid_low =
-- cpu_to_le16(fs_high2lowgid(inode->i_gid));
-+ cpu_to_le16(fs_high2lowgid(gid));
+ 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));
+@@ -4440,6 +4470,9 @@ static int ext4_do_update_inode(handle_t
raw_inode->i_uid_high = 0;
raw_inode->i_gid_high = 0;
}
+#ifdef CONFIG_TAGGING_INTERN
-+ raw_inode->i_raw_tag = cpu_to_le16(inode->i_tag);
++ raw_inode->i_raw_tag = cpu_to_le16(i_tag_read(inode));
+#endif
raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
EXT4_INODE_SET_XTIME(i_ctime, inode, raw_inode);
-@@ -5324,7 +5359,8 @@ int ext4_setattr(struct dentry *dentry,
+@@ -4670,7 +4703,8 @@ int ext4_setattr(struct dentry *dentry,
if (is_quota_modification(inode, attr))
dquot_initialize(inode);
- if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
-- (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid)) {
-+ (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid) ||
-+ (ia_valid & ATTR_TAG && attr->ia_tag != inode->i_tag)) {
+ if ((ia_valid & ATTR_UID && !uid_eq(attr->ia_uid, inode->i_uid)) ||
+- (ia_valid & ATTR_GID && !gid_eq(attr->ia_gid, inode->i_gid))) {
++ (ia_valid & ATTR_GID && !gid_eq(attr->ia_gid, inode->i_gid)) ||
++ (ia_valid & ATTR_TAG && !tag_eq(attr->ia_tag, inode->i_tag))) {
handle_t *handle;
/* (user+group)*(old+new) structure, inode write (sb,
-@@ -5346,6 +5382,8 @@ int ext4_setattr(struct dentry *dentry,
+@@ -4693,6 +4727,8 @@ int ext4_setattr(struct dentry *dentry,
inode->i_uid = attr->ia_uid;
if (attr->ia_valid & ATTR_GID)
inode->i_gid = attr->ia_gid;
error = ext4_mark_inode_dirty(handle, inode);
ext4_journal_stop(handle);
}
-diff -NurpP --minimal linux-3.0-rc5/fs/ext4/ioctl.c linux-3.0-rc5-vs2.3.1-pre3/fs/ext4/ioctl.c
---- linux-3.0-rc5/fs/ext4/ioctl.c 2011-05-22 16:17:52.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/ext4/ioctl.c 2011-06-10 22:11:24.000000000 +0200
-@@ -14,10 +14,39 @@
+diff -NurpP --minimal linux-3.10.53/fs/ext4/ioctl.c linux-3.10.53-vs2.3.6.8/fs/ext4/ioctl.c
+--- linux-3.10.53/fs/ext4/ioctl.c 2014-08-30 13:38:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/ext4/ioctl.c 2014-03-12 13:18:32.000000000 +0000
+@@ -14,6 +14,7 @@
#include <linux/compat.h>
#include <linux/mount.h>
#include <linux/file.h>
#include <asm/uaccess.h>
#include "ext4_jbd2.h"
#include "ext4.h"
+@@ -215,6 +216,33 @@ swap_boot_out:
+ return err;
+ }
-+
+int ext4_sync_flags(struct inode *inode, int flags, int vflags)
+{
+ handle_t *handle = NULL;
+ struct ext4_iloc iloc;
+ int err;
+
-+ handle = ext4_journal_start(inode, 1);
++ handle = ext4_journal_start(inode, EXT4_HT_INODE, 1);
+ if (IS_ERR(handle))
+ return PTR_ERR(handle);
+
+
long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
- struct inode *inode = filp->f_dentry->d_inode;
-@@ -50,6 +79,11 @@ long ext4_ioctl(struct file *filp, unsig
+ struct inode *inode = file_inode(filp);
+@@ -248,6 +276,11 @@ long ext4_ioctl(struct file *filp, unsig
flags = ext4_mask_flags(inode->i_mode, flags);
err = -EPERM;
mutex_lock(&inode->i_mutex);
/* Is it quota file? Do not allow user to mess with it */
-@@ -67,7 +101,9 @@ long ext4_ioctl(struct file *filp, unsig
+@@ -265,7 +298,9 @@ long ext4_ioctl(struct file *filp, unsig
*
* This test looks nicer. Thanks to Pauline Middelink
*/
if (!capable(CAP_LINUX_IMMUTABLE))
goto flags_out;
}
-diff -NurpP --minimal linux-3.0-rc5/fs/ext4/namei.c linux-3.0-rc5-vs2.3.1-pre3/fs/ext4/namei.c
---- linux-3.0-rc5/fs/ext4/namei.c 2011-07-01 11:14:18.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/ext4/namei.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/fs/ext4/namei.c linux-3.10.53-vs2.3.6.8/fs/ext4/namei.c
+--- linux-3.10.53/fs/ext4/namei.c 2014-08-30 13:38:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/ext4/namei.c 2013-11-13 17:17:16.000000000 +0000
@@ -34,6 +34,7 @@
#include <linux/quotaops.h>
#include <linux/buffer_head.h>
#include "ext4.h"
#include "ext4_jbd2.h"
-@@ -924,6 +925,7 @@ restart:
- if (bh)
- ll_rw_block(READ_META, 1, &bh);
+@@ -1299,6 +1300,7 @@ restart:
+ ll_rw_block(READ | REQ_META | REQ_PRIO,
+ 1, &bh);
}
+ dx_propagate_tag(nd, inode);
}
if ((bh = bh_use[ra_ptr++]) == NULL)
goto next;
-@@ -2596,6 +2598,7 @@ const struct inode_operations ext4_dir_i
- #endif
- .check_acl = ext4_check_acl,
+@@ -3177,6 +3179,7 @@ const struct inode_operations ext4_dir_i
+ .removexattr = generic_removexattr,
+ .get_acl = ext4_get_acl,
.fiemap = ext4_fiemap,
+ .sync_flags = ext4_sync_flags,
};
const struct inode_operations ext4_special_inode_operations = {
-diff -NurpP --minimal linux-3.0-rc5/fs/ext4/super.c linux-3.0-rc5-vs2.3.1-pre3/fs/ext4/super.c
---- linux-3.0-rc5/fs/ext4/super.c 2011-07-01 11:14:18.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/ext4/super.c 2011-07-01 11:35:34.000000000 +0200
-@@ -1294,6 +1294,7 @@ enum {
+diff -NurpP --minimal linux-3.10.53/fs/ext4/super.c linux-3.10.53-vs2.3.6.8/fs/ext4/super.c
+--- linux-3.10.53/fs/ext4/super.c 2014-08-30 13:38:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/ext4/super.c 2014-08-30 14:03:54.000000000 +0000
+@@ -1129,7 +1129,7 @@ enum {
+ Opt_inode_readahead_blks, Opt_journal_ioprio,
Opt_dioread_nolock, Opt_dioread_lock,
- Opt_discard, Opt_nodiscard,
- Opt_init_inode_table, Opt_noinit_inode_table,
-+ Opt_tag, Opt_notag, Opt_tagid
+ Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable,
+- Opt_max_dir_size_kb,
++ Opt_max_dir_size_kb, Opt_tag, Opt_notag, Opt_tagid
};
static const match_table_t tokens = {
-@@ -1369,6 +1370,9 @@ static const match_table_t tokens = {
- {Opt_init_inode_table, "init_itable=%u"},
- {Opt_init_inode_table, "init_itable"},
- {Opt_noinit_inode_table, "noinit_itable"},
+@@ -1209,6 +1209,9 @@ static const match_table_t tokens = {
+ {Opt_removed, "reservation"}, /* mount option from ext2/3 */
+ {Opt_removed, "noreservation"}, /* mount option from ext2/3 */
+ {Opt_removed, "journal=%u"}, /* mount option from ext2/3 */
+ {Opt_tag, "tag"},
+ {Opt_notag, "notag"},
+ {Opt_tagid, "tagid=%u"},
{Opt_err, NULL},
};
-@@ -1537,6 +1541,20 @@ static int parse_options(char *options,
- case Opt_nouid32:
- set_opt(sb, NO_UID32);
- break;
+@@ -1439,6 +1442,20 @@ static int handle_mount_opt(struct super
+ case Opt_i_version:
+ sb->s_flags |= MS_I_VERSION;
+ return 1;
+#ifndef CONFIG_TAGGING_NONE
-+ case Opt_tag:
-+ set_opt(sb, TAGGED);
-+ break;
-+ case Opt_notag:
-+ clear_opt(sb, TAGGED);
-+ break;
++ case Opt_tag:
++ set_opt(sb, TAGGED);
++ return 1;
++ case Opt_notag:
++ clear_opt(sb, TAGGED);
++ return 1;
+#endif
+#ifdef CONFIG_PROPAGATE
-+ case Opt_tagid:
-+ /* use args[0] */
-+ set_opt(sb, TAGGED);
-+ break;
++ case Opt_tagid:
++ /* use args[0] */
++ set_opt(sb, TAGGED);
++ return 1;
+#endif
- case Opt_debug:
- set_opt(sb, DEBUG);
- break;
-@@ -3194,6 +3212,9 @@ static int ext4_fill_super(struct super_
- &journal_ioprio, NULL, 0))
- goto failed_mount;
+ }
+
+ for (m = ext4_mount_opts; m->token != Opt_err; m++)
+@@ -3460,6 +3477,9 @@ static int ext4_fill_super(struct super_
+ clear_opt(sb, DELALLOC);
+ }
+ if (EXT4_SB(sb)->s_mount_opt & EXT4_MOUNT_TAGGED)
+ sb->s_flags |= MS_TAGGED;
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-@@ -4324,6 +4345,14 @@ static int ext4_remount(struct super_blo
+@@ -4678,6 +4698,14 @@ static int ext4_remount(struct super_blo
if (sbi->s_mount_flags & EXT4_MF_FS_ABORTED)
ext4_abort(sb, "Abort forced by user");
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-3.0-rc5/fs/fcntl.c linux-3.0-rc5-vs2.3.1-pre3/fs/fcntl.c
---- linux-3.0-rc5/fs/fcntl.c 2011-05-22 16:17:52.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/fcntl.c 2011-06-10 22:11:24.000000000 +0200
-@@ -20,6 +20,7 @@
- #include <linux/signal.h>
+diff -NurpP --minimal linux-3.10.53/fs/fcntl.c linux-3.10.53-vs2.3.6.8/fs/fcntl.c
+--- linux-3.10.53/fs/fcntl.c 2013-05-31 13:45:23.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/fcntl.c 2013-08-22 20:29:59.000000000 +0000
+@@ -21,6 +21,7 @@
#include <linux/rcupdate.h>
#include <linux/pid_namespace.h>
+ #include <linux/user_namespace.h>
+#include <linux/vs_limit.h>
#include <asm/poll.h>
#include <asm/siginfo.h>
-@@ -103,6 +104,8 @@ SYSCALL_DEFINE3(dup3, unsigned int, oldf
-
- if (tofree)
- filp_close(tofree, files);
-+ else
-+ vx_openfd_inc(newfd); /* fd was unused */
-
- return newfd;
+@@ -378,6 +379,8 @@ SYSCALL_DEFINE3(fcntl64, unsigned int, f
-@@ -447,6 +450,8 @@ SYSCALL_DEFINE3(fcntl, unsigned int, fd,
- filp = fget_raw(fd);
- if (!filp)
+ if (!f.file)
goto out;
+ if (!vx_files_avail(1))
+ goto out;
- if (unlikely(filp->f_mode & FMODE_PATH)) {
- if (!check_fcntl_cmd(cmd)) {
-diff -NurpP --minimal linux-3.0-rc5/fs/file.c linux-3.0-rc5-vs2.3.1-pre3/fs/file.c
---- linux-3.0-rc5/fs/file.c 2011-05-22 16:17:52.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/file.c 2011-06-10 22:11:24.000000000 +0200
-@@ -21,6 +21,7 @@
+ if (unlikely(f.file->f_mode & FMODE_PATH)) {
+ if (!check_fcntl_cmd(cmd))
+diff -NurpP --minimal linux-3.10.53/fs/file.c linux-3.10.53-vs2.3.6.8/fs/file.c
+--- linux-3.10.53/fs/file.c 2014-08-30 13:38:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/file.c 2014-03-12 13:18:23.000000000 +0000
+@@ -22,6 +22,7 @@
#include <linux/spinlock.h>
#include <linux/rcupdate.h>
#include <linux/workqueue.h>
+#include <linux/vs_limit.h>
- struct fdtable_defer {
- spinlock_t lock;
-@@ -359,6 +360,8 @@ struct files_struct *dup_fd(struct files
+ int sysctl_nr_open __read_mostly = 1024*1024;
+ int sysctl_nr_open_min = BITS_PER_LONG;
+@@ -311,6 +312,8 @@ struct files_struct *dup_fd(struct files
struct file *f = *old_fds++;
if (f) {
get_file(f);
} else {
/*
* The fd may be claimed in the fd bitmap but not yet
-@@ -466,6 +469,7 @@ repeat:
+@@ -376,9 +379,11 @@ static void close_files(struct files_str
+ filp_close(file, files);
+ cond_resched();
+ }
++ vx_openfd_dec(i);
+ }
+ i++;
+ set >>= 1;
++ cond_resched();
+ }
+ }
+ }
+@@ -503,6 +508,7 @@ repeat:
else
- FD_CLR(fd, fdt->close_on_exec);
+ __clear_close_on_exec(fd, fdt);
error = fd;
+ vx_openfd_inc(fd);
#if 1
/* Sanity check */
if (rcu_dereference_raw(fdt->fd[fd]) != NULL) {
-diff -NurpP --minimal linux-3.0-rc5/fs/file_table.c linux-3.0-rc5-vs2.3.1-pre3/fs/file_table.c
---- linux-3.0-rc5/fs/file_table.c 2011-05-22 16:17:52.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/file_table.c 2011-06-10 22:11:24.000000000 +0200
-@@ -24,6 +24,8 @@
- #include <linux/percpu_counter.h>
- #include <linux/percpu.h>
+@@ -533,6 +539,7 @@ static void __put_unused_fd(struct files
+ __clear_open_fd(fd, fdt);
+ if (fd < files->next_fd)
+ files->next_fd = fd;
++ vx_openfd_dec(fd);
+ }
+
+ void put_unused_fd(unsigned int fd)
+@@ -812,6 +819,8 @@ static int do_dup2(struct files_struct *
+
+ if (tofree)
+ filp_close(tofree, files);
++ else
++ vx_openfd_inc(fd); /* fd was unused */
+
+ return fd;
+
+diff -NurpP --minimal linux-3.10.53/fs/file_table.c linux-3.10.53-vs2.3.6.8/fs/file_table.c
+--- linux-3.10.53/fs/file_table.c 2014-08-30 13:38:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/file_table.c 2014-06-12 11:14:28.000000000 +0000
+@@ -26,6 +26,8 @@
+ #include <linux/hardirq.h>
+ #include <linux/task_work.h>
#include <linux/ima.h>
+#include <linux/vs_limit.h>
+#include <linux/vs_context.h>
- #include <asm/atomic.h>
+ #include <linux/atomic.h>
-@@ -135,6 +137,8 @@ struct file *get_empty_filp(void)
+@@ -140,6 +142,8 @@ struct file *get_empty_filp(void)
spin_lock_init(&f->f_lock);
eventpoll_init_file(f);
/* f->f_version: 0 */
return f;
over:
-@@ -253,6 +257,8 @@ static void __fput(struct file *file)
- }
- fops_put(file->f_op);
- put_pid(file->f_owner.pid);
+@@ -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);
+ vx_files_dec(file);
+ file->f_xid = 0;
- file_sb_list_del(file);
- if ((file->f_mode & (FMODE_READ | FMODE_WRITE)) == FMODE_READ)
- i_readcount_dec(inode);
-@@ -383,6 +389,8 @@ void put_filp(struct file *file)
+ file->f_path.dentry = NULL;
+ file->f_path.mnt = NULL;
+ file->f_inode = NULL;
+@@ -345,6 +351,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.0-rc5/fs/fs_struct.c linux-3.0-rc5-vs2.3.1-pre3/fs/fs_struct.c
---- linux-3.0-rc5/fs/fs_struct.c 2011-03-15 18:07:31.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/fs_struct.c 2011-06-10 22:11:24.000000000 +0200
+ }
+diff -NurpP --minimal linux-3.10.53/fs/fs_struct.c linux-3.10.53-vs2.3.6.8/fs/fs_struct.c
+--- linux-3.10.53/fs/fs_struct.c 2013-05-31 13:45:23.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/fs_struct.c 2013-08-22 20:29:59.000000000 +0000
@@ -4,6 +4,7 @@
#include <linux/path.h>
#include <linux/slab.h>
+#include <linux/vserver/global.h>
#include "internal.h"
- static inline void path_get_longterm(struct path *path)
-@@ -96,6 +97,7 @@ void free_fs_struct(struct fs_struct *fs
+ /*
+@@ -87,6 +88,7 @@ void free_fs_struct(struct fs_struct *fs
{
- path_put_longterm(&fs->root);
- path_put_longterm(&fs->pwd);
+ path_put(&fs->root);
+ path_put(&fs->pwd);
+ atomic_dec(&vs_global_fs);
kmem_cache_free(fs_cachep, fs);
}
-@@ -135,6 +137,7 @@ struct fs_struct *copy_fs_struct(struct
+@@ -124,6 +126,7 @@ struct fs_struct *copy_fs_struct(struct
fs->pwd = old->pwd;
- path_get_longterm(&fs->pwd);
+ path_get(&fs->pwd);
spin_unlock(&old->lock);
+ atomic_inc(&vs_global_fs);
}
return fs;
}
-diff -NurpP --minimal linux-3.0-rc5/fs/gfs2/file.c linux-3.0-rc5-vs2.3.1-pre3/fs/gfs2/file.c
---- linux-3.0-rc5/fs/gfs2/file.c 2011-07-01 11:14:18.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/gfs2/file.c 2011-06-10 22:11:24.000000000 +0200
-@@ -134,6 +134,9 @@ static const u32 fsflags_to_gfs2[32] = {
- [7] = GFS2_DIF_NOATIME,
+diff -NurpP --minimal linux-3.10.53/fs/gfs2/file.c linux-3.10.53-vs2.3.6.8/fs/gfs2/file.c
+--- linux-3.10.53/fs/gfs2/file.c 2013-07-14 17:01:28.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/gfs2/file.c 2013-08-22 20:29:59.000000000 +0000
+@@ -144,6 +144,9 @@ static const u32 fsflags_to_gfs2[32] = {
[12] = GFS2_DIF_EXHASH,
[14] = GFS2_DIF_INHERIT_JDATA,
+ [17] = GFS2_DIF_TOPDIR,
+ [27] = GFS2_DIF_IXUNLINK,
+ [26] = GFS2_DIF_BARRIER,
+ [29] = GFS2_DIF_COW,
};
static const u32 gfs2_to_fsflags[32] = {
-@@ -143,6 +146,9 @@ static const u32 gfs2_to_fsflags[32] = {
- [gfs2fl_NoAtime] = FS_NOATIME_FL,
+@@ -154,6 +157,9 @@ static const u32 gfs2_to_fsflags[32] = {
[gfs2fl_ExHash] = FS_INDEX_FL,
+ [gfs2fl_TopLevel] = FS_TOPDIR_FL,
[gfs2fl_InheritJdata] = FS_JOURNAL_DATA_FL,
+ [gfs2fl_IXUnlink] = FS_IXUNLINK_FL,
+ [gfs2fl_Barrier] = FS_BARRIER_FL,
};
static int gfs2_get_flags(struct file *filp, u32 __user *ptr)
-@@ -173,10 +179,16 @@ void gfs2_set_inode_flags(struct inode *
+@@ -184,12 +190,18 @@ void gfs2_set_inode_flags(struct inode *
{
struct gfs2_inode *ip = GFS2_I(inode);
unsigned int flags = inode->i_flags;
+ unsigned int vflags = inode->i_vflags;
+
+ flags &= ~(S_IMMUTABLE | S_IXUNLINK |
-+ S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC);
++ S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC | S_NOSEC);
-- flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC);
+- flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC|S_NOSEC);
+ if ((ip->i_eattr == 0) && !is_sxid(inode->i_mode))
+ inode->i_flags |= S_NOSEC;
if (ip->i_diskflags & GFS2_DIF_IMMUTABLE)
flags |= S_IMMUTABLE;
+ if (ip->i_diskflags & GFS2_DIF_IXUNLINK)
if (ip->i_diskflags & GFS2_DIF_APPENDONLY)
flags |= S_APPEND;
if (ip->i_diskflags & GFS2_DIF_NOATIME)
-@@ -184,6 +196,43 @@ void gfs2_set_inode_flags(struct inode *
+@@ -197,6 +209,43 @@ void gfs2_set_inode_flags(struct inode *
if (ip->i_diskflags & GFS2_DIF_SYNC)
flags |= S_SYNC;
inode->i_flags = flags;
}
/* Flags that can be set by user space */
-@@ -295,6 +344,37 @@ static int gfs2_set_flags(struct file *f
+@@ -310,6 +359,37 @@ static int gfs2_set_flags(struct file *f
return do_gfs2_set_flags(filp, gfsflags, ~GFS2_DIF_JDATA);
}
+ error = gfs2_meta_inode_buffer(ip, &bh);
+ if (error)
+ goto out_trans_end;
-+ gfs2_trans_add_bh(ip->i_gl, bh, 1);
++ gfs2_trans_add_meta(ip->i_gl, bh);
+ inode->i_flags = flags;
+ inode->i_vflags = vflags;
+ gfs2_get_inode_flags(inode);
static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
switch(cmd) {
-diff -NurpP --minimal linux-3.0-rc5/fs/gfs2/inode.h linux-3.0-rc5-vs2.3.1-pre3/fs/gfs2/inode.h
---- linux-3.0-rc5/fs/gfs2/inode.h 2011-07-01 11:14:18.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/gfs2/inode.h 2011-06-10 22:11:24.000000000 +0200
-@@ -120,6 +120,7 @@ extern const struct file_operations gfs2
+diff -NurpP --minimal linux-3.10.53/fs/gfs2/inode.h linux-3.10.53-vs2.3.6.8/fs/gfs2/inode.h
+--- linux-3.10.53/fs/gfs2/inode.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/gfs2/inode.h 2013-08-22 20:29:59.000000000 +0000
+@@ -117,6 +117,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);
#ifdef CONFIG_GFS2_FS_LOCKING_DLM
extern const struct file_operations gfs2_file_fops;
-diff -NurpP --minimal linux-3.0-rc5/fs/inode.c linux-3.0-rc5-vs2.3.1-pre3/fs/inode.c
---- linux-3.0-rc5/fs/inode.c 2011-07-01 11:14:18.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/inode.c 2011-07-01 11:35:34.000000000 +0200
-@@ -26,6 +26,7 @@
- #include <linux/ima.h>
- #include <linux/cred.h>
+diff -NurpP --minimal linux-3.10.53/fs/hostfs/hostfs.h linux-3.10.53-vs2.3.6.8/fs/hostfs/hostfs.h
+--- linux-3.10.53/fs/hostfs/hostfs.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/hostfs/hostfs.h 2013-08-22 20:29:59.000000000 +0000
+@@ -42,6 +42,7 @@ struct hostfs_iattr {
+ unsigned short ia_mode;
+ uid_t ia_uid;
+ gid_t ia_gid;
++ vtag_t ia_tag;
+ loff_t ia_size;
+ struct timespec ia_atime;
+ struct timespec ia_mtime;
+diff -NurpP --minimal linux-3.10.53/fs/inode.c linux-3.10.53-vs2.3.6.8/fs/inode.c
+--- linux-3.10.53/fs/inode.c 2014-08-30 13:38:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/inode.c 2014-08-30 14:03:54.000000000 +0000
+@@ -17,6 +17,7 @@
+ #include <linux/prefetch.h>
#include <linux/buffer_head.h> /* for inode_has_buffers */
+ #include <linux/ratelimit.h>
+#include <linux/vs_tag.h>
#include "internal.h"
/*
-@@ -146,6 +147,9 @@ int inode_init_always(struct super_block
+@@ -128,6 +129,8 @@ int inode_init_always(struct super_block
struct address_space *const mapping = &inode->i_data;
inode->i_sb = sb;
+
+ /* essential because of inode slab reuse */
-+ inode->i_tag = 0;
inode->i_blkbits = sb->s_blocksize_bits;
inode->i_flags = 0;
atomic_set(&inode->i_count, 1);
-@@ -166,6 +170,7 @@ int inode_init_always(struct super_block
+@@ -137,6 +140,7 @@ int inode_init_always(struct super_block
+ inode->i_opflags = 0;
+ i_uid_write(inode, 0);
+ i_gid_write(inode, 0);
++ i_tag_write(inode, 0);
+ 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
inode->i_bdev = NULL;
inode->i_cdev = NULL;
inode->i_rdev = 0;
inode->dirtied_when = 0;
if (security_inode_alloc(inode))
-@@ -404,6 +409,8 @@ void __insert_inode_hash(struct inode *i
+@@ -483,6 +488,8 @@ void __insert_inode_hash(struct inode *i
}
EXPORT_SYMBOL(__insert_inode_hash);
+EXPORT_SYMBOL_GPL(__iget);
+
/**
- * remove_inode_hash - remove an inode from the hash
+ * __remove_inode_hash - remove an inode from the hash
* @inode: inode to unhash
-@@ -1643,9 +1650,11 @@ void init_special_inode(struct inode *in
+@@ -1799,9 +1806,11 @@ void init_special_inode(struct inode *in
if (S_ISCHR(mode)) {
inode->i_fop = &def_chr_fops;
inode->i_rdev = rdev;
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))
-@@ -1674,6 +1683,7 @@ void inode_init_owner(struct inode *inod
+@@ -1830,6 +1839,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.0-rc5/fs/ioctl.c linux-3.0-rc5-vs2.3.1-pre3/fs/ioctl.c
---- linux-3.0-rc5/fs/ioctl.c 2011-05-22 16:17:52.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/ioctl.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/fs/ioctl.c linux-3.10.53-vs2.3.6.8/fs/ioctl.c
+--- linux-3.10.53/fs/ioctl.c 2013-05-31 13:45:24.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/ioctl.c 2013-08-22 20:29:59.000000000 +0000
@@ -15,6 +15,9 @@
#include <linux/writeback.h>
#include <linux/buffer_head.h>
#include <asm/ioctls.h>
-diff -NurpP --minimal linux-3.0-rc5/fs/ioprio.c linux-3.0-rc5-vs2.3.1-pre3/fs/ioprio.c
---- linux-3.0-rc5/fs/ioprio.c 2011-01-05 21:50:24.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/ioprio.c 2011-06-10 22:11:24.000000000 +0200
-@@ -27,6 +27,7 @@
+diff -NurpP --minimal linux-3.10.53/fs/ioprio.c linux-3.10.53-vs2.3.6.8/fs/ioprio.c
+--- linux-3.10.53/fs/ioprio.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/ioprio.c 2013-08-22 20:29:59.000000000 +0000
+@@ -28,6 +28,7 @@
#include <linux/syscalls.h>
#include <linux/security.h>
#include <linux/pid_namespace.h>
int set_task_ioprio(struct task_struct *task, int ioprio)
{
-@@ -119,6 +120,8 @@ SYSCALL_DEFINE3(ioprio_set, int, which,
+@@ -105,6 +106,8 @@ SYSCALL_DEFINE3(ioprio_set, int, which,
else
pgrp = find_vpid(who);
do_each_pid_thread(pgrp, PIDTYPE_PGID, p) {
ret = set_task_ioprio(p, ioprio);
if (ret)
break;
-@@ -208,6 +211,8 @@ SYSCALL_DEFINE2(ioprio_get, int, which,
+@@ -198,6 +201,8 @@ SYSCALL_DEFINE2(ioprio_get, int, which,
else
pgrp = find_vpid(who);
do_each_pid_thread(pgrp, PIDTYPE_PGID, p) {
tmpio = get_task_ioprio(p);
if (tmpio < 0)
continue;
-diff -NurpP --minimal linux-3.0-rc5/fs/jfs/file.c linux-3.0-rc5-vs2.3.1-pre3/fs/jfs/file.c
---- linux-3.0-rc5/fs/jfs/file.c 2011-07-01 11:14:18.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/jfs/file.c 2011-07-01 11:35:34.000000000 +0200
-@@ -102,7 +102,8 @@ int jfs_setattr(struct dentry *dentry, s
+diff -NurpP --minimal linux-3.10.53/fs/jfs/file.c linux-3.10.53-vs2.3.6.8/fs/jfs/file.c
+--- linux-3.10.53/fs/jfs/file.c 2013-02-19 13:58:48.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/jfs/file.c 2013-08-22 20:29:59.000000000 +0000
+@@ -109,7 +109,8 @@ int jfs_setattr(struct dentry *dentry, s
if (is_quota_modification(inode, iattr))
dquot_initialize(inode);
- if ((iattr->ia_valid & ATTR_UID && iattr->ia_uid != inode->i_uid) ||
-- (iattr->ia_valid & ATTR_GID && iattr->ia_gid != inode->i_gid)) {
-+ (iattr->ia_valid & ATTR_GID && iattr->ia_gid != inode->i_gid) ||
-+ (iattr->ia_valid & ATTR_TAG && iattr->ia_tag != inode->i_tag)) {
+ if ((iattr->ia_valid & ATTR_UID && !uid_eq(iattr->ia_uid, inode->i_uid)) ||
+- (iattr->ia_valid & ATTR_GID && !gid_eq(iattr->ia_gid, inode->i_gid))) {
++ (iattr->ia_valid & ATTR_GID && !gid_eq(iattr->ia_gid, inode->i_gid)) ||
++ (iattr->ia_valid & ATTR_TAG && !tag_eq(iattr->ia_tag, inode->i_tag))) {
rc = dquot_transfer(inode, iattr);
if (rc)
return rc;
-@@ -133,6 +134,7 @@ const struct inode_operations jfs_file_i
+@@ -144,6 +145,7 @@ const struct inode_operations jfs_file_i
#ifdef CONFIG_JFS_POSIX_ACL
- .check_acl = jfs_check_acl,
+ .get_acl = jfs_get_acl,
#endif
+ .sync_flags = jfs_sync_flags,
};
const struct file_operations jfs_file_operations = {
-diff -NurpP --minimal linux-3.0-rc5/fs/jfs/ioctl.c linux-3.0-rc5-vs2.3.1-pre3/fs/jfs/ioctl.c
---- linux-3.0-rc5/fs/jfs/ioctl.c 2011-05-22 16:17:52.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/jfs/ioctl.c 2011-06-10 22:11:24.000000000 +0200
-@@ -11,6 +11,7 @@
- #include <linux/mount.h>
+diff -NurpP --minimal linux-3.10.53/fs/jfs/ioctl.c linux-3.10.53-vs2.3.6.8/fs/jfs/ioctl.c
+--- linux-3.10.53/fs/jfs/ioctl.c 2013-05-31 13:45:24.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/jfs/ioctl.c 2013-08-22 20:29:59.000000000 +0000
+@@ -12,6 +12,7 @@
#include <linux/time.h>
#include <linux/sched.h>
+ #include <linux/blkdev.h>
+#include <linux/mount.h>
#include <asm/current.h>
#include <asm/uaccess.h>
-@@ -52,6 +53,16 @@ static long jfs_map_ext2(unsigned long f
+@@ -56,6 +57,16 @@ static long jfs_map_ext2(unsigned long f
}
+
long jfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
- struct inode *inode = filp->f_dentry->d_inode;
-@@ -85,6 +96,11 @@ long jfs_ioctl(struct file *filp, unsign
+ struct inode *inode = file_inode(filp);
+@@ -89,6 +100,11 @@ long jfs_ioctl(struct file *filp, unsign
if (!S_ISDIR(inode->i_mode))
flags &= ~JFS_DIRSYNC_FL;
/* Is it quota file? Do not allow user to mess with it */
if (IS_NOQUOTA(inode)) {
err = -EPERM;
-@@ -102,8 +118,8 @@ long jfs_ioctl(struct file *filp, unsign
+@@ -106,8 +122,8 @@ long jfs_ioctl(struct file *filp, unsign
* the relevant capability.
*/
if ((oldflags & JFS_IMMUTABLE_FL) ||
if (!capable(CAP_LINUX_IMMUTABLE)) {
mutex_unlock(&inode->i_mutex);
err = -EPERM;
-@@ -111,7 +127,7 @@ long jfs_ioctl(struct file *filp, unsign
+@@ -115,7 +131,7 @@ long jfs_ioctl(struct file *filp, unsign
}
}
flags |= oldflags & ~JFS_FL_USER_MODIFIABLE;
jfs_inode->mode2 = flags;
-diff -NurpP --minimal linux-3.0-rc5/fs/jfs/jfs_dinode.h linux-3.0-rc5-vs2.3.1-pre3/fs/jfs/jfs_dinode.h
---- linux-3.0-rc5/fs/jfs/jfs_dinode.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/jfs/jfs_dinode.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/fs/jfs/jfs_dinode.h linux-3.10.53-vs2.3.6.8/fs/jfs/jfs_dinode.h
+--- linux-3.10.53/fs/jfs/jfs_dinode.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/jfs/jfs_dinode.h 2013-08-22 20:29:59.000000000 +0000
@@ -161,9 +161,13 @@ struct dinode {
#define JFS_APPEND_FL 0x01000000 /* writes to file may only append */
#define JFS_FL_INHERIT 0x03C80000
/* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */
-diff -NurpP --minimal linux-3.0-rc5/fs/jfs/jfs_filsys.h linux-3.0-rc5-vs2.3.1-pre3/fs/jfs/jfs_filsys.h
---- linux-3.0-rc5/fs/jfs/jfs_filsys.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/jfs/jfs_filsys.h 2011-06-10 22:11:24.000000000 +0200
-@@ -263,6 +263,7 @@
+diff -NurpP --minimal linux-3.10.53/fs/jfs/jfs_filsys.h linux-3.10.53-vs2.3.6.8/fs/jfs/jfs_filsys.h
+--- linux-3.10.53/fs/jfs/jfs_filsys.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/jfs/jfs_filsys.h 2013-08-22 20:29:59.000000000 +0000
+@@ -266,6 +266,7 @@
#define JFS_NAME_MAX 255
#define JFS_PATH_MAX BPSIZE
/*
* file system state (superblock state)
-diff -NurpP --minimal linux-3.0-rc5/fs/jfs/jfs_imap.c linux-3.0-rc5-vs2.3.1-pre3/fs/jfs/jfs_imap.c
---- linux-3.0-rc5/fs/jfs/jfs_imap.c 2011-07-01 11:14:18.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/jfs/jfs_imap.c 2011-07-01 11:35:34.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/fs/jfs/jfs_imap.c linux-3.10.53-vs2.3.6.8/fs/jfs/jfs_imap.c
+--- linux-3.10.53/fs/jfs/jfs_imap.c 2013-07-14 17:01:28.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/jfs/jfs_imap.c 2013-08-22 20:29:59.000000000 +0000
@@ -46,6 +46,7 @@
#include <linux/pagemap.h>
#include <linux/quotaops.h>
{
struct jfs_inode_info *jfs_ip = JFS_IP(ip);
struct jfs_sb_info *sbi = JFS_SBI(ip->i_sb);
-+ uid_t uid;
-+ gid_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,18 @@ static int copy_from_dinode(struct dinod
}
- ip->i_nlink = le32_to_cpu(dip->di_nlink);
+ set_nlink(ip, le32_to_cpu(dip->di_nlink));
-- jfs_ip->saved_uid = le32_to_cpu(dip->di_uid);
-+ uid = le32_to_cpu(dip->di_uid);
-+ gid = le32_to_cpu(dip->di_gid);
-+ ip->i_tag = INOTAG_TAG(DX_TAG(ip), uid, gid, 0);
+- jfs_ip->saved_uid = make_kuid(&init_user_ns, le32_to_cpu(dip->di_uid));
++ 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);
- if (sbi->uid == -1)
++ jfs_ip->saved_uid = INOTAG_KUID(DX_TAG(ip), kuid, kgid);
+ if (!uid_valid(sbi->uid))
ip->i_uid = jfs_ip->saved_uid;
else {
ip->i_uid = sbi->uid;
}
-- jfs_ip->saved_gid = le32_to_cpu(dip->di_gid);
-+ jfs_ip->saved_gid = INOTAG_GID(DX_TAG(ip), uid, gid);
- if (sbi->gid == -1)
+- jfs_ip->saved_gid = make_kgid(&init_user_ns, le32_to_cpu(dip->di_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,14 +3157,12 @@ static void copy_to_dinode(struct dinode
+@@ -3150,16 +3157,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);
-- if (sbi->uid == -1)
-- dip->di_uid = cpu_to_le32(ip->i_uid);
+- if (!uid_valid(sbi->uid))
+- dip->di_uid = cpu_to_le32(i_uid_read(ip));
- else
-- dip->di_uid = cpu_to_le32(jfs_ip->saved_uid);
-- if (sbi->gid == -1)
-- dip->di_gid = cpu_to_le32(ip->i_gid);
+- dip->di_uid =cpu_to_le32(from_kuid(&init_user_ns,
+- jfs_ip->saved_uid));
+- if (!gid_valid(sbi->gid))
+- dip->di_gid = cpu_to_le32(i_gid_read(ip));
- else
-- dip->di_gid = cpu_to_le32(jfs_ip->saved_gid);
-+
-+ dip->di_uid = cpu_to_le32(TAGINO_UID(DX_TAG(ip),
-+ (sbi->uid == -1) ? ip->i_uid : jfs_ip->saved_uid, ip->i_tag));
-+ dip->di_gid = cpu_to_le32(TAGINO_GID(DX_TAG(ip),
-+ (sbi->gid == -1) ? ip->i_gid : jfs_ip->saved_gid, ip->i_tag));
-+
+- 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_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_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.0-rc5/fs/jfs/jfs_inode.c linux-3.0-rc5-vs2.3.1-pre3/fs/jfs/jfs_inode.c
---- linux-3.0-rc5/fs/jfs/jfs_inode.c 2010-08-02 16:52:49.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/jfs/jfs_inode.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/fs/jfs/jfs_inode.c linux-3.10.53-vs2.3.6.8/fs/jfs/jfs_inode.c
+--- linux-3.10.53/fs/jfs/jfs_inode.c 2014-08-30 13:38:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/jfs/jfs_inode.c 2013-11-13 17:22:25.000000000 +0000
@@ -18,6 +18,7 @@
#include <linux/fs.h>
}
/*
-diff -NurpP --minimal linux-3.0-rc5/fs/jfs/jfs_inode.h linux-3.0-rc5-vs2.3.1-pre3/fs/jfs/jfs_inode.h
---- linux-3.0-rc5/fs/jfs/jfs_inode.h 2011-07-01 11:14:18.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/jfs/jfs_inode.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/fs/jfs/jfs_inode.h linux-3.10.53-vs2.3.6.8/fs/jfs/jfs_inode.h
+--- linux-3.10.53/fs/jfs/jfs_inode.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/jfs/jfs_inode.h 2013-08-22 20:29:59.000000000 +0000
@@ -39,6 +39,7 @@ extern struct dentry *jfs_fh_to_dentry(s
extern struct dentry *jfs_fh_to_parent(struct super_block *sb, struct fid *fid,
int fh_len, int fh_type);
extern int jfs_get_block(struct inode *, sector_t, struct buffer_head *, int);
extern int jfs_setattr(struct dentry *, struct iattr *);
-diff -NurpP --minimal linux-3.0-rc5/fs/jfs/namei.c linux-3.0-rc5-vs2.3.1-pre3/fs/jfs/namei.c
---- linux-3.0-rc5/fs/jfs/namei.c 2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/jfs/namei.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/fs/jfs/namei.c linux-3.10.53-vs2.3.6.8/fs/jfs/namei.c
+--- linux-3.10.53/fs/jfs/namei.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/jfs/namei.c 2013-08-22 20:29:59.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/ctype.h>
#include <linux/quotaops.h>
#include "jfs_incore.h"
#include "jfs_superblock.h"
#include "jfs_inode.h"
-@@ -1486,6 +1487,7 @@ static struct dentry *jfs_lookup(struct
- return ERR_CAST(ip);
+@@ -1461,6 +1462,7 @@ static struct dentry *jfs_lookup(struct
+ jfs_err("jfs_lookup: iget failed on inum %d", (uint)inum);
}
+ dx_propagate_tag(nd, ip);
return d_splice_alias(ip, dentry);
}
-@@ -1550,6 +1552,7 @@ const struct inode_operations jfs_dir_in
+@@ -1525,6 +1527,7 @@ const struct inode_operations jfs_dir_in
#ifdef CONFIG_JFS_POSIX_ACL
- .check_acl = jfs_check_acl,
+ .get_acl = jfs_get_acl,
#endif
+ .sync_flags = jfs_sync_flags,
};
const struct file_operations jfs_dir_operations = {
-diff -NurpP --minimal linux-3.0-rc5/fs/jfs/super.c linux-3.0-rc5-vs2.3.1-pre3/fs/jfs/super.c
---- linux-3.0-rc5/fs/jfs/super.c 2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/jfs/super.c 2011-06-10 22:11:24.000000000 +0200
-@@ -198,7 +198,8 @@ static void jfs_put_super(struct super_b
- enum {
+diff -NurpP --minimal linux-3.10.53/fs/jfs/super.c linux-3.10.53-vs2.3.6.8/fs/jfs/super.c
+--- linux-3.10.53/fs/jfs/super.c 2013-07-14 17:01:28.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/jfs/super.c 2013-08-22 20:29:59.000000000 +0000
+@@ -199,7 +199,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
-+ Opt_usrquota, Opt_grpquota, Opt_uid, Opt_gid, Opt_umask,
+ Opt_usrquota, Opt_grpquota, Opt_uid, Opt_gid, Opt_umask,
+- Opt_discard, Opt_nodiscard, Opt_discard_minblk
++ Opt_discard, Opt_nodiscard, Opt_discard_minblk,
+ Opt_tag, Opt_notag, Opt_tagid
};
static const match_table_t tokens = {
-@@ -208,6 +209,10 @@ static const match_table_t tokens = {
+@@ -209,6 +210,10 @@ static const match_table_t tokens = {
{Opt_resize, "resize=%u"},
{Opt_resize_nosize, "resize"},
{Opt_errors, "errors=%s"},
{Opt_ignore, "noquota"},
{Opt_ignore, "quota"},
{Opt_usrquota, "usrquota"},
-@@ -342,6 +347,20 @@ static int parse_options(char *options,
+@@ -385,7 +390,20 @@ static int parse_options(char *options,
}
break;
}
+-
+#ifndef CONFIG_TAGGING_NONE
+ case Opt_tag:
+ *flag |= JFS_TAGGED;
default:
printk("jfs: Unrecognized mount option \"%s\" "
" or missing value\n", p);
-@@ -373,6 +392,12 @@ static int jfs_remount(struct super_bloc
+@@ -417,6 +435,12 @@ static int jfs_remount(struct super_bloc
return -EINVAL;
}
+
if (newLVSize) {
if (sb->s_flags & MS_RDONLY) {
- printk(KERN_ERR
-@@ -455,6 +480,9 @@ static int jfs_fill_super(struct super_b
+ pr_err("JFS: resize requires volume" \
+@@ -502,6 +526,9 @@ static int jfs_fill_super(struct super_b
#ifdef CONFIG_JFS_POSIX_ACL
sb->s_flags |= MS_POSIXACL;
#endif
+ sb->s_flags |= MS_TAGGED;
if (newLVSize) {
- printk(KERN_ERR "resize option for remount only\n");
-diff -NurpP --minimal linux-3.0-rc5/fs/libfs.c linux-3.0-rc5-vs2.3.1-pre3/fs/libfs.c
---- linux-3.0-rc5/fs/libfs.c 2011-03-15 18:07:32.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/libfs.c 2011-06-10 22:11:24.000000000 +0200
-@@ -133,7 +133,8 @@ static inline unsigned char dt_type(stru
+ pr_err("resize option for remount only\n");
+diff -NurpP --minimal linux-3.10.53/fs/libfs.c linux-3.10.53-vs2.3.6.8/fs/libfs.c
+--- linux-3.10.53/fs/libfs.c 2013-02-19 13:58:48.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/libfs.c 2013-08-22 20:29:59.000000000 +0000
+@@ -135,7 +135,8 @@ static inline unsigned char dt_type(stru
* both impossible due to the lock on directory.
*/
{
struct dentry *dentry = filp->f_path.dentry;
struct dentry *cursor = filp->private_data;
-@@ -164,6 +165,8 @@ int dcache_readdir(struct file * filp, v
+@@ -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);
+ 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);
-@@ -190,6 +193,17 @@ int dcache_readdir(struct file * filp, v
+@@ -192,6 +195,17 @@ int dcache_readdir(struct file * filp, v
return 0;
}
ssize_t generic_read_dir(struct file *filp, char __user *buf, size_t siz, loff_t *ppos)
{
return -EISDIR;
-@@ -965,6 +979,7 @@ EXPORT_SYMBOL(dcache_dir_close);
+@@ -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(generic_read_dir);
EXPORT_SYMBOL(mount_pseudo);
EXPORT_SYMBOL(simple_write_begin);
-diff -NurpP --minimal linux-3.0-rc5/fs/locks.c linux-3.0-rc5-vs2.3.1-pre3/fs/locks.c
---- linux-3.0-rc5/fs/locks.c 2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/locks.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/fs/locks.c linux-3.10.53-vs2.3.6.8/fs/locks.c
+--- linux-3.10.53/fs/locks.c 2014-08-30 13:38:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/locks.c 2014-05-20 04:31:55.000000000 +0000
@@ -126,6 +126,8 @@
#include <linux/time.h>
#include <linux/rcupdate.h>
#include <asm/uaccess.h>
-@@ -163,6 +168,7 @@ static void locks_init_lock_always(struc
- fl->fl_flags = 0;
- fl->fl_type = 0;
- fl->fl_start = fl->fl_end = 0;
-+ fl->fl_xid = -1;
- }
-
- /* Allocate an empty lock structure. */
-@@ -173,7 +175,12 @@ static struct kmem_cache *filelock_cache
+@@ -184,11 +186,17 @@ static void locks_init_lock_heads(struct
/* Allocate an empty lock structure. */
struct file_lock *locks_alloc_lock(void)
{
-- struct file_lock *fl = kmem_cache_alloc(filelock_cache, GFP_KERNEL);
+- struct file_lock *fl = kmem_cache_zalloc(filelock_cache, GFP_KERNEL);
+ struct file_lock *fl;
-+
+
+- if (fl)
+- locks_init_lock_heads(fl);
+ if (!vx_locks_avail(1))
+ return NULL;
-+
-+ fl = kmem_cache_alloc(filelock_cache, GFP_KERNEL);
- if (fl)
- locks_init_lock_always(fl);
-@@ -190,6 +194,7 @@ void locks_free_lock(struct file_lock *f
++ fl = kmem_cache_zalloc(filelock_cache, GFP_KERNEL);
++
++ if (fl) {
++ locks_init_lock_heads(fl);
++ fl->fl_xid = -1;
++ }
+ return fl;
+ }
+ EXPORT_SYMBOL_GPL(locks_alloc_lock);
+@@ -212,6 +220,7 @@ void locks_free_lock(struct file_lock *f
BUG_ON(!list_empty(&fl->fl_block));
BUG_ON(!list_empty(&fl->fl_link));
locks_release_private(fl);
kmem_cache_free(filelock_cache, fl);
}
-@@ -262,6 +268,7 @@ void locks_copy_lock(struct file_lock *n
+@@ -221,6 +230,7 @@ void locks_init_lock(struct file_lock *f
+ {
+ memset(fl, 0, sizeof(struct file_lock));
+ locks_init_lock_heads(fl);
++ fl->fl_xid = -1;
+ }
+
+ 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;
new->fl_lmops = fl->fl_lmops;
locks_copy_private(new, fl);
}
-@@ -300,6 +307,11 @@ static int flock_make_lock(struct file *
+@@ -299,6 +310,11 @@ static int flock_make_lock(struct file *
fl->fl_flags = FL_FLOCK;
fl->fl_type = type;
fl->fl_end = OFFSET_MAX;
*lock = fl;
return 0;
-@@ -449,6 +461,7 @@ static int lease_init(struct file *filp,
+@@ -438,6 +454,7 @@ static int lease_init(struct file *filp,
fl->fl_owner = current->files;
fl->fl_pid = current->tgid;
fl->fl_file = filp;
fl->fl_flags = FL_LEASE;
-@@ -468,6 +481,11 @@ static struct file_lock *lease_alloc(str
+@@ -457,6 +474,11 @@ static struct file_lock *lease_alloc(str
if (fl == NULL)
return ERR_PTR(error);
error = lease_init(filp, type, fl);
if (error) {
locks_free_lock(fl);
-@@ -769,6 +787,7 @@ static int flock_lock_file(struct file *
+@@ -753,6 +775,7 @@ static int flock_lock_file(struct file *
lock_flocks();
}
find_conflict:
for_each_lock(inode, before) {
struct file_lock *fl = *before;
-@@ -789,6 +808,7 @@ find_conflict:
+@@ -773,6 +796,7 @@ find_conflict:
goto out;
locks_copy_lock(new_fl, request);
locks_insert_lock(before, new_fl);
new_fl = NULL;
error = 0;
-@@ -799,7 +819,8 @@ out:
+@@ -783,7 +807,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;
-@@ -809,6 +830,8 @@ static int __posix_lock_file(struct inod
+@@ -793,6 +818,8 @@ static int __posix_lock_file(struct inod
struct file_lock **before;
int error, added = 0;
/*
* We may need two file_lock structures for this operation,
* so we get them in advance to avoid races.
-@@ -819,7 +842,11 @@ static int __posix_lock_file(struct inod
+@@ -803,7 +830,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();
}
lock_flocks();
-@@ -1018,7 +1045,8 @@ static int __posix_lock_file(struct inod
+@@ -1002,7 +1033,8 @@ static int __posix_lock_file(struct inod
int posix_lock_file(struct file *filp, struct file_lock *fl,
struct file_lock *conflock)
{
-- return __posix_lock_file(filp->f_path.dentry->d_inode, fl, conflock);
-+ return __posix_lock_file(filp->f_path.dentry->d_inode,
+- return __posix_lock_file(file_inode(filp), fl, conflock);
++ return __posix_lock_file(file_inode(filp),
+ fl, conflock, filp->f_xid);
}
EXPORT_SYMBOL(posix_lock_file);
-@@ -1108,7 +1136,7 @@ int locks_mandatory_area(int read_write,
+@@ -1092,7 +1124,7 @@ int locks_mandatory_area(int read_write,
fl.fl_end = offset + count - 1;
for (;;) {
if (error != FILE_LOCK_DEFERRED)
break;
error = wait_event_interruptible(fl.fl_wait, !fl.fl_next);
-@@ -1421,6 +1449,7 @@ int generic_setlease(struct file *filp,
+@@ -1396,6 +1428,7 @@ int generic_add_lease(struct file *filp,
goto out;
locks_insert_lock(before, lease);
return 0;
out:
-@@ -1805,6 +1834,11 @@ int fcntl_setlk(unsigned int fd, struct
+@@ -1835,6 +1868,11 @@ int fcntl_setlk(unsigned int fd, struct
if (file_lock == NULL)
return -ENOLCK;
/*
* This might block, so we do it before checking the inode.
*/
-@@ -1923,6 +1957,11 @@ int fcntl_setlk64(unsigned int fd, struc
+@@ -1953,6 +1991,11 @@ int fcntl_setlk64(unsigned int fd, struc
if (file_lock == NULL)
return -ENOLCK;
/*
* This might block, so we do it before checking the inode.
*/
-@@ -2188,8 +2227,11 @@ static int locks_show(struct seq_file *f
+@@ -2218,8 +2261,11 @@ static int locks_show(struct seq_file *f
lock_get_status(f, fl, *((loff_t *)f->private), "");
return 0;
}
-diff -NurpP --minimal linux-3.0-rc5/fs/namei.c linux-3.0-rc5-vs2.3.1-pre3/fs/namei.c
---- linux-3.0-rc5/fs/namei.c 2011-07-01 11:14:19.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/namei.c 2011-06-22 12:39:15.000000000 +0200
-@@ -32,6 +32,14 @@
- #include <linux/fcntl.h>
- #include <linux/device_cgroup.h>
+diff -NurpP --minimal linux-3.10.53/fs/mount.h linux-3.10.53-vs2.3.6.8/fs/mount.h
+--- linux-3.10.53/fs/mount.h 2014-08-30 13:38:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/mount.h 2014-03-12 13:18:23.000000000 +0000
+@@ -56,6 +56,7 @@ struct mount {
+ int mnt_expiry_mark; /* true if marked for expiry */
+ int mnt_pinned;
+ int mnt_ghosts;
++ 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.10.53/fs/namei.c linux-3.10.53-vs2.3.6.8/fs/namei.c
+--- linux-3.10.53/fs/namei.c 2014-08-30 13:38:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/namei.c 2014-08-30 14:03:54.000000000 +0000
+@@ -34,9 +34,19 @@
#include <linux/fs_struct.h>
+ #include <linux/posix_acl.h>
+ #include <linux/hash.h>
+#include <linux/proc_fs.h>
++#include <linux/magic.h>
+#include <linux/vserver/inode.h>
+#include <linux/vs_base.h>
+#include <linux/vs_tag.h>
#include <asm/uaccess.h>
#include "internal.h"
-@@ -173,6 +181,84 @@ void putname(const char *name)
- EXPORT_SYMBOL(putname);
- #endif
++#include "proc/internal.h"
+ #include "mount.h"
+
+ /* [Feb-1997 T. Schoebel-Theuer]
+@@ -266,6 +276,89 @@ static int check_acl(struct inode *inode
+ return -EAGAIN;
+ }
+static inline int dx_barrier(const struct inode *inode)
+{
+ if (inode->i_sb->s_magic == DEVPTS_SUPER_MAGIC) {
+ /* devpts is xid tagged */
+ if (S_ISDIR(inode->i_mode) ||
-+ vx_check((xid_t)inode->i_tag, 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 */
+ if (!pid)
+ goto out;
+
++ rcu_read_lock();
+ tsk = pid_task(pid, PIDTYPE_PID);
+ vxdprintk(VXD_CBIT(tag, 0), "accessing %p[#%u]",
+ tsk, (tsk ? vx_task_xid(tsk) : 0));
-+ if (tsk && vx_check(vx_task_xid(tsk), VS_IDENT | VS_WATCH_P))
++ if (tsk &&
++ vx_check(vx_task_xid(tsk), VS_IDENT | VS_WATCH_P)) {
++ rcu_read_unlock();
+ return 0;
++ }
++ rcu_read_unlock();
+ }
+ else {
+ /* FIXME: Should we block some entries here? */
+ }
+ else {
+ if (dx_notagcheck(inode->i_sb) ||
-+ dx_check(inode->i_tag, DX_HOSTID | DX_ADMIN | DX_WATCH |
-+ DX_IDENT))
++ dx_check((vxid_t)i_tag_read(inode),
++ DX_HOSTID | DX_ADMIN | DX_WATCH | DX_IDENT))
+ return 0;
+ }
+
+#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;
+}
+
/*
- * This does basic POSIX ACL permission checking
+ * This does the basic permission checking
*/
-@@ -283,10 +369,14 @@ int inode_permission(struct inode *inode
+@@ -389,10 +482,14 @@ int __inode_permission(struct inode *ino
/*
* Nobody gets write access to an immutable file.
*/
+ if (retval)
+ return retval;
+
- if (inode->i_op->permission)
- retval = inode->i_op->permission(inode, mask, 0);
- else
-@@ -580,6 +670,9 @@ static inline int exec_permission(struct
- int ret;
- struct user_namespace *ns = inode_userns(inode);
-
-+ if (dx_barrier(inode))
-+ return -EACCES;
-+
- if (inode->i_op->permission) {
- ret = inode->i_op->permission(inode, MAY_EXEC, flags);
- } else {
-@@ -1082,7 +1175,8 @@ static void follow_dotdot(struct nameida
+ retval = do_inode_permission(inode, mask);
+ if (retval)
+ return retval;
+@@ -1239,7 +1336,8 @@ static void follow_dotdot(struct nameida
if (nd->path.dentry == nd->root.dentry &&
nd->path.mnt == nd->root.mnt) {
}
if (nd->path.dentry != nd->path.mnt->mnt_root) {
/* rare case of legitimate dget_parent()... */
-@@ -1832,7 +1926,7 @@ static int may_delete(struct inode *dir,
- if (IS_APPEND(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))
+@@ -1384,6 +1482,9 @@ static int lookup_fast(struct nameidata
+ goto unlazy;
+ }
+ }
++
++ /* FIXME: check dx permission */
++
+ path->mnt = mnt;
+ path->dentry = dentry;
+ if (unlikely(!__follow_mount_rcu(nd, path, inode)))
+@@ -1414,6 +1515,8 @@ unlazy:
+ }
+ }
+
++ /* FIXME: check dx permission */
++
+ path->mnt = mnt;
+ path->dentry = dentry;
+ err = follow_managed(path, nd->flags);
+@@ -2238,7 +2341,7 @@ static int may_delete(struct inode *dir,
+ if (IS_APPEND(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))
return -EPERM;
if (isdir) {
if (!S_ISDIR(victim->d_inode->i_mode))
-@@ -1959,6 +2053,15 @@ static int may_open(struct path *path, i
+@@ -2318,19 +2421,25 @@ int vfs_create(struct inode *dir, struct
+ bool want_excl)
+ {
+ int error = may_create(dir, dentry);
+- if (error)
++ if (error) {
++ vxdprintk(VXD_CBIT(misc, 3), "may_create failed with %d", error);
+ return error;
++ }
+
+ if (!dir->i_op->create)
+ return -EACCES; /* shouldn't it be ENOSYS? */
+ mode &= S_IALLUGO;
+ mode |= S_IFREG;
+ error = security_inode_create(dir, dentry, mode);
+- if (error)
++ if (error) {
++ vxdprintk(VXD_CBIT(misc, 3), "security_inode_create failed with %d", error);
+ return error;
++ }
+ error = dir->i_op->create(dir, dentry, mode, want_excl);
+ if (!error)
+ fsnotify_create(dir, dentry);
++ else
++ vxdprintk(VXD_CBIT(misc, 3), "i_op->create failed with %d", error);
+ return error;
+ }
+
+@@ -2365,6 +2474,15 @@ static int may_open(struct path *path, i
break;
}
error = inode_permission(inode, acc_mode);
if (error)
return error;
-@@ -2852,7 +2955,7 @@ int vfs_link(struct dentry *old_dentry,
+@@ -2867,6 +2985,16 @@ finish_open:
+ }
+ finish_open_created:
+ error = may_open(&nd->path, acc_mode, open_flag);
++#ifdef CONFIG_VSERVER_COWBL
++ if (error == -EMLINK) {
++ struct dentry *dentry;
++ dentry = cow_break_link(name->name);
++ if (IS_ERR(dentry))
++ error = PTR_ERR(dentry);
++ else
++ dput(dentry);
++ }
++#endif
+ if (error)
+ goto out;
+ file->f_path.mnt = nd->path.mnt;
+@@ -2931,6 +3059,7 @@ static struct file *path_openat(int dfd,
+ int opened = 0;
+ int error;
+
++restart:
+ file = get_empty_filp();
+ if (IS_ERR(file))
+ return file;
+@@ -2967,6 +3096,16 @@ static struct file *path_openat(int dfd,
+ error = do_last(nd, &path, file, op, &opened, pathname);
+ put_link(nd, &link, cookie);
+ }
++
++#ifdef CONFIG_VSERVER_COWBL
++ if (error == -EMLINK) {
++ if (nd->root.mnt && !(nd->flags & LOOKUP_ROOT))
++ path_put(&nd->root);
++ if (base)
++ fput(base);
++ goto restart;
++ }
++#endif
+ out:
+ if (nd->root.mnt && !(nd->flags & LOOKUP_ROOT))
+ path_put(&nd->root);
+@@ -3081,6 +3220,11 @@ struct dentry *kern_path_create(int dfd,
+ goto fail;
+ }
+ *path = nd.path;
++ vxdprintk(VXD_CBIT(misc, 3), "kern_path_create path.dentry = %p (%.*s), dentry = %p (%.*s), d_inode = %p",
++ path->dentry, path->dentry->d_name.len,
++ path->dentry->d_name.name, dentry,
++ dentry->d_name.len, dentry->d_name.name,
++ path->dentry->d_inode);
+ return dentry;
+ fail:
+ dput(dentry);
+@@ -3575,7 +3719,7 @@ int vfs_link(struct dentry *old_dentry,
/*
* A link to an append-only or immutable file cannot be created.
*/
return -EPERM;
if (!dir->i_op->link)
return -EPERM;
-@@ -3238,6 +3341,222 @@ int vfs_follow_link(struct nameidata *nd
+@@ -3979,6 +4123,287 @@ int vfs_follow_link(struct nameidata *nd
return __vfs_follow_link(nd, link);
}
+
+#ifdef CONFIG_VSERVER_COWBL
+
-+#include <linux/file.h>
-+
+static inline
+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)
+{
-+ int ret, mode, pathlen, redo = 0;
++ int ret, mode, pathlen, redo = 0, drop = 1;
+ struct nameidata old_nd, dir_nd;
-+ struct path old_path, new_path;
-+ struct dentry *dir, *res = NULL;
++ struct path dir_path, *old_path, *new_path;
++ struct dentry *dir, *old_dentry, *new_dentry = NULL;
+ struct file *old_file;
+ struct file *new_file;
+ char *to, *path, pad='\251';
+
+ vxdprintk(VXD_CBIT(misc, 1),
+ "cow_break_link(" VS_Q("%s") ")", pathname);
++
+ path = kmalloc(PATH_MAX, GFP_KERNEL);
+ ret = -ENOMEM;
+ if (!path)
+ goto out;
+
-+ /* old_nd will have refs to dentry and mnt */
++ /* old_nd.path will have refs to dentry and mnt */
+ ret = do_path_lookup(AT_FDCWD, pathname, LOOKUP_FOLLOW, &old_nd);
-+ vxdprintk(VXD_CBIT(misc, 2), "do_path_lookup(old): %d", ret);
++ vxdprintk(VXD_CBIT(misc, 2),
++ "do_path_lookup(old): %d", ret);
+ if (ret < 0)
+ goto out_free_path;
+
-+ old_path = old_nd.path;
-+ mode = old_path.dentry->d_inode->i_mode;
++ /* dentry/mnt refs handed over to old_path */
++ old_path = &old_nd.path;
++ /* no explicit reference for old_dentry here */
++ old_dentry = old_path->dentry;
+
-+ to = d_path(&old_path, path, PATH_MAX-2);
++ mode = old_dentry->d_inode->i_mode;
++ to = d_path(old_path, path, PATH_MAX-2);
+ pathlen = strlen(to);
+ vxdprintk(VXD_CBIT(misc, 2),
-+ "old path " VS_Q("%s") " [" VS_Q("%.*s") ":%d]", to,
-+ old_path.dentry->d_name.len, old_path.dentry->d_name.name,
-+ old_path.dentry->d_name.len);
++ "old path " VS_Q("%s") " [%p:" VS_Q("%.*s") ":%d]", to,
++ old_dentry,
++ old_dentry->d_name.len, old_dentry->d_name.name,
++ old_dentry->d_name.len);
+
+ to[pathlen + 1] = 0;
+retry:
++ new_dentry = NULL;
+ to[pathlen] = pad--;
-+ ret = -EMLINK;
++ ret = -ELOOP;
+ if (pad <= '\240')
+ goto out_rel_old;
+
+ vxdprintk(VXD_CBIT(misc, 1), "temp copy " VS_Q("%s"), to);
-+ /* dir_nd will have refs to dentry and mnt */
++
++ /* dir_nd.path will have refs to dentry and mnt */
+ ret = do_path_lookup(AT_FDCWD, to,
+ LOOKUP_PARENT | LOOKUP_OPEN | LOOKUP_CREATE, &dir_nd);
-+ vxdprintk(VXD_CBIT(misc, 2),
-+ "do_path_lookup(new): %d", ret);
++ vxdprintk(VXD_CBIT(misc, 2), "do_path_lookup(new): %d", ret);
+ if (ret < 0)
+ goto retry;
+
-+ /* this puppy downs the inode mutex */
-+ new_path.dentry = lookup_create(&dir_nd, 0);
-+ if (!new_path.dentry || IS_ERR(new_path.dentry)) {
-+ vxdprintk(VXD_CBIT(misc, 2),
-+ "lookup_create(new): %p", new_path.dentry);
-+ mutex_unlock(&dir_nd.path.dentry->d_inode->i_mutex);
++ /* this puppy downs the dir inode mutex if successful.
++ dir_path will hold refs to dentry and mnt and
++ we'll have write access to the mnt */
++ new_dentry = kern_path_create(AT_FDCWD, to, &dir_path, 0);
++ if (!new_dentry || IS_ERR(new_dentry)) {
+ path_put(&dir_nd.path);
++ vxdprintk(VXD_CBIT(misc, 2),
++ "kern_path_create(new) failed with %ld",
++ PTR_ERR(new_dentry));
+ goto retry;
+ }
+ vxdprintk(VXD_CBIT(misc, 2),
-+ "lookup_create(new): %p [" VS_Q("%.*s") ":%d]",
-+ new_path.dentry,
-+ new_path.dentry->d_name.len, new_path.dentry->d_name.name,
-+ new_path.dentry->d_name.len);
++ "kern_path_create(new): %p [" VS_Q("%.*s") ":%d]",
++ new_dentry,
++ new_dentry->d_name.len, new_dentry->d_name.name,
++ new_dentry->d_name.len);
++
++ /* take a reference on new_dentry */
++ dget(new_dentry);
++
++ /* dentry/mnt refs handed over to new_path */
++ new_path = &dir_path;
++
++ /* dentry for old/new dir */
+ dir = dir_nd.path.dentry;
+
-+ ret = vfs_create(dir_nd.path.dentry->d_inode, new_path.dentry, mode, &dir_nd);
++ /* give up reference on dir */
++ dput(new_path->dentry);
++
++ /* new_dentry already has a reference */
++ new_path->dentry = new_dentry;
++
++ ret = vfs_create(dir->d_inode, new_dentry, mode, 1);
+ vxdprintk(VXD_CBIT(misc, 2),
+ "vfs_create(new): %d", ret);
+ if (ret == -EEXIST) {
-+ mutex_unlock(&dir->d_inode->i_mutex);
-+ dput(new_path.dentry);
+ path_put(&dir_nd.path);
++ mutex_unlock(&dir->d_inode->i_mutex);
++ mnt_drop_write(new_path->mnt);
++ path_put(new_path);
++ new_dentry = NULL;
+ goto retry;
+ }
+ else if (ret < 0)
+
+ /* drop out early, ret passes ENOENT */
+ ret = -ENOENT;
-+ if ((redo = d_unhashed(old_path.dentry)))
++ if ((redo = d_unhashed(old_dentry)))
+ goto out_unlock_new;
+
-+ new_path.mnt = dir_nd.path.mnt;
-+ dget(old_path.dentry);
-+ mntget(old_path.mnt);
-+ /* this one cleans up the dentry/mnt in case of failure */
-+ old_file = dentry_open(old_path.dentry, old_path.mnt,
-+ O_RDONLY, current_cred());
++ /* doesn't change refs for old_path */
++ old_file = dentry_open(old_path, O_RDONLY, current_cred());
+ vxdprintk(VXD_CBIT(misc, 2),
+ "dentry_open(old): %p", old_file);
-+ if (!old_file || IS_ERR(old_file)) {
-+ res = IS_ERR(old_file) ? (void *) old_file : res;
++ if (IS_ERR(old_file)) {
++ ret = PTR_ERR(old_file);
+ goto out_unlock_new;
+ }
+
-+ dget(new_path.dentry);
-+ mntget(new_path.mnt);
-+ /* this one cleans up the dentry/mnt in case of failure */
-+ new_file = dentry_open(new_path.dentry, new_path.mnt,
-+ O_WRONLY, current_cred());
++ /* doesn't change refs for new_path */
++ new_file = dentry_open(new_path, O_WRONLY, current_cred());
+ vxdprintk(VXD_CBIT(misc, 2),
+ "dentry_open(new): %p", new_file);
-+
-+ ret = IS_ERR(new_file) ? PTR_ERR(new_file) : -ENOENT;
-+ if (!new_file || IS_ERR(new_file))
++ if (IS_ERR(new_file)) {
++ ret = PTR_ERR(new_file);
+ goto out_fput_old;
++ }
++
++ /* unlock the inode mutex from kern_path_create() */
++ mutex_unlock(&dir->d_inode->i_mutex);
++
++ /* drop write access to mnt */
++ mnt_drop_write(new_path->mnt);
++
++ drop = 0;
+
+ size = i_size_read(old_file->f_dentry->d_inode);
+ ret = do_cow_splice(old_file, new_file, size);
+ ret = -ENOSPC;
+ goto out_fput_both;
+ } else {
-+ struct inode *old_inode = old_path.dentry->d_inode;
-+ struct inode *new_inode = new_path.dentry->d_inode;
++ struct inode *old_inode = old_dentry->d_inode;
++ struct inode *new_inode = new_dentry->d_inode;
+ struct iattr attr = {
+ .ia_uid = old_inode->i_uid,
+ .ia_gid = old_inode->i_gid,
+ mark_inode_dirty(new_inode);
+ }
+
-+ mutex_lock(&old_path.dentry->d_inode->i_sb->s_vfs_rename_mutex);
++ /* lock rename mutex */
++ mutex_lock(&old_dentry->d_inode->i_sb->s_vfs_rename_mutex);
+
+ /* drop out late */
+ ret = -ENOENT;
-+ if ((redo = d_unhashed(old_path.dentry)))
++ if ((redo = d_unhashed(old_dentry)))
+ goto out_unlock;
+
+ vxdprintk(VXD_CBIT(misc, 2),
+ "vfs_rename: [" VS_Q("%*s") ":%d] -> [" VS_Q("%*s") ":%d]",
-+ new_path.dentry->d_name.len, new_path.dentry->d_name.name,
-+ new_path.dentry->d_name.len,
-+ old_path.dentry->d_name.len, old_path.dentry->d_name.name,
-+ old_path.dentry->d_name.len);
-+ ret = vfs_rename(dir_nd.path.dentry->d_inode, new_path.dentry,
-+ old_nd.path.dentry->d_parent->d_inode, old_path.dentry);
++ new_dentry->d_name.len, new_dentry->d_name.name,
++ new_dentry->d_name.len,
++ 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);
+ vxdprintk(VXD_CBIT(misc, 2), "vfs_rename: %d", ret);
-+ res = new_path.dentry;
+
+out_unlock:
-+ mutex_unlock(&old_path.dentry->d_inode->i_sb->s_vfs_rename_mutex);
++ mutex_unlock(&old_dentry->d_inode->i_sb->s_vfs_rename_mutex);
+
+out_fput_both:
+ vxdprintk(VXD_CBIT(misc, 3),
+ fput(old_file);
+
+out_unlock_new:
-+ mutex_unlock(&dir->d_inode->i_mutex);
++ /* drop references from dir_nd.path */
++ path_put(&dir_nd.path);
++
++ if (drop) {
++ /* unlock the inode mutex from kern_path_create() */
++ mutex_unlock(&dir->d_inode->i_mutex);
++
++ /* drop write access to mnt */
++ mnt_drop_write(new_path->mnt);
++ }
++
+ if (!ret)
+ goto out_redo;
+
+ /* error path cleanup */
-+ vfs_unlink(dir->d_inode, new_path.dentry);
-+ dput(new_path.dentry);
++ vfs_unlink(dir->d_inode, new_dentry);
+
+out_redo:
+ if (!redo)
+ goto out_rel_both;
-+ /* lookup dentry once again */
-+ path_put(&old_nd.path);
++
++ /* lookup dentry once again
++ old_nd.path will be freed as old_path in out_rel_old */
+ ret = do_path_lookup(AT_FDCWD, pathname, LOOKUP_FOLLOW, &old_nd);
+ if (ret)
+ goto out_rel_both;
+
-+ new_path.dentry = old_nd.path.dentry;
++ /* drop reference on new_dentry */
++ dput(new_dentry);
++ new_dentry = old_path->dentry;
++ dget(new_dentry);
+ vxdprintk(VXD_CBIT(misc, 2),
+ "do_path_lookup(redo): %p [" VS_Q("%.*s") ":%d]",
-+ new_path.dentry,
-+ new_path.dentry->d_name.len, new_path.dentry->d_name.name,
-+ new_path.dentry->d_name.len);
-+ dget(new_path.dentry);
-+ res = new_path.dentry;
++ new_dentry,
++ new_dentry->d_name.len, new_dentry->d_name.name,
++ new_dentry->d_name.len);
+
+out_rel_both:
-+ path_put(&dir_nd.path);
++ if (new_path)
++ path_put(new_path);
+out_rel_old:
-+ path_put(&old_nd.path);
++ path_put(old_path);
+out_free_path:
+ kfree(path);
+out:
-+ if (ret)
-+ res = ERR_PTR(ret);
-+ return res;
++ if (ret) {
++ dput(new_dentry);
++ new_dentry = ERR_PTR(ret);
++ }
++ vxdprintk(VXD_CBIT(misc, 3),
++ "cow_break_link returning with %p", new_dentry);
++ return new_dentry;
+}
+
+#endif
++
++int vx_info_mnt_namespace(struct mnt_namespace *ns, char *buffer)
++{
++ struct path path;
++ struct vfsmount *vmnt;
++ char *pstr, *root;
++ int length = 0;
++
++ pstr = kmalloc(PATH_MAX, GFP_KERNEL);
++ if (!pstr)
++ return 0;
++
++ vmnt = &ns->root->mnt;
++ path.mnt = vmnt;
++ path.dentry = vmnt->mnt_root;
++ root = d_path(&path, pstr, PATH_MAX - 2);
++ length = sprintf(buffer + length,
++ "Namespace:\t%p [#%u]\n"
++ "RootPath:\t%s\n",
++ ns, atomic_read(&ns->count),
++ root);
++ kfree(pstr);
++ return length;
++}
+
/* get the link contents into pagecache */
static char *page_getlink(struct dentry * dentry, struct page **ppage)
{
-diff -NurpP --minimal linux-3.0-rc5/fs/namespace.c linux-3.0-rc5-vs2.3.1-pre3/fs/namespace.c
---- linux-3.0-rc5/fs/namespace.c 2011-07-01 11:14:19.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/namespace.c 2011-06-13 18:26:48.000000000 +0200
-@@ -31,6 +31,11 @@
- #include <linux/idr.h>
- #include <linux/fs_struct.h>
- #include <linux/fsnotify.h>
+@@ -4102,3 +4527,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.10.53/fs/namespace.c linux-3.10.53-vs2.3.6.8/fs/namespace.c
+--- linux-3.10.53/fs/namespace.c 2014-08-30 13:38:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/namespace.c 2013-11-13 17:17:16.000000000 +0000
+@@ -23,6 +23,11 @@
+ #include <linux/uaccess.h>
+ #include <linux/proc_ns.h>
+ #include <linux/magic.h>
+#include <linux/vs_base.h>
+#include <linux/vs_context.h>
+#include <linux/vs_tag.h>
+#include <linux/vserver/space.h>
+#include <linux/vserver/global.h>
- #include <asm/uaccess.h>
- #include <asm/unistd.h>
#include "pnode.h"
-@@ -724,6 +729,7 @@ static struct vfsmount *clone_mnt(struct
- mnt->mnt_root = dget(root);
- mnt->mnt_mountpoint = mnt->mnt_root;
- mnt->mnt_parent = mnt;
-+ mnt->mnt_tag = old->mnt_tag;
-
- if (flag & CL_SLAVE) {
- list_add(&mnt->mnt_slave, &old->mnt_slave_list);
-@@ -852,6 +858,31 @@ static inline void mangle(struct seq_fil
- seq_escape(m, s, " \t\n\\");
- }
-
-+static int mnt_is_reachable(struct vfsmount *mnt)
-+{
-+ struct path root;
-+ struct dentry *point;
-+ int ret;
-+
-+ if (mnt == mnt->mnt_ns->root)
-+ return 1;
-+
-+ br_read_lock(vfsmount_lock);
-+ root = current->fs->root;
-+ point = root.dentry;
-+
-+ while ((mnt != mnt->mnt_parent) && (mnt != root.mnt)) {
-+ point = mnt->mnt_mountpoint;
-+ mnt = mnt->mnt_parent;
-+ }
-+
-+ ret = (mnt == root.mnt) && is_subdir(point, root.dentry);
-+
-+ br_read_unlock(vfsmount_lock);
-+
-+ return ret;
-+}
-+
- /*
- * Simple .show_options callback for filesystems which don't want to
- * implement more complex mount option showing.
-@@ -954,6 +985,8 @@ static int show_sb_opts(struct seq_file
- { MS_SYNCHRONOUS, ",sync" },
- { MS_DIRSYNC, ",dirsync" },
- { MS_MANDLOCK, ",mand" },
-+ { MS_TAGGED, ",tag" },
-+ { MS_NOTAGCHECK, ",notagcheck" },
- { 0, NULL }
- };
- const struct proc_fs_info *fs_infop;
-@@ -1000,16 +1033,26 @@ static int show_vfsmnt(struct seq_file *
- int err = 0;
- struct path mnt_path = { .dentry = mnt->mnt_root, .mnt = mnt };
-
-- if (mnt->mnt_sb->s_op->show_devname) {
-- err = mnt->mnt_sb->s_op->show_devname(m, mnt);
-- if (err)
-- goto out;
-+ if (vx_flags(VXF_HIDE_MOUNT, 0))
-+ return SEQ_SKIP;
-+ if (!mnt_is_reachable(mnt) && !vx_check(0, VS_WATCH_P))
-+ return SEQ_SKIP;
-+
-+ if (!vx_check(0, VS_ADMIN|VS_WATCH) &&
-+ mnt == current->fs->root.mnt) {
-+ seq_puts(m, "/dev/root / ");
- } else {
-- mangle(m, mnt->mnt_devname ? mnt->mnt_devname : "none");
-+ if (mnt->mnt_sb->s_op->show_devname) {
-+ err = mnt->mnt_sb->s_op->show_devname(m, mnt);
-+ if (err)
-+ goto out;
-+ } else {
-+ mangle(m, mnt->mnt_devname ? mnt->mnt_devname : "none");
-+ }
-+ seq_putc(m, ' ');
-+ seq_path(m, &mnt_path, " \t\n\\");
-+ seq_putc(m, ' ');
- }
-- seq_putc(m, ' ');
-- seq_path(m, &mnt_path, " \t\n\\");
-- seq_putc(m, ' ');
- show_type(m, mnt->mnt_sb);
- seq_puts(m, __mnt_is_readonly(mnt) ? " ro" : " rw");
- err = show_sb_opts(m, mnt->mnt_sb);
-@@ -1039,6 +1082,11 @@ static int show_mountinfo(struct seq_fil
- struct path root = p->root;
- int err = 0;
+ #include "internal.h"
-+ if (vx_flags(VXF_HIDE_MOUNT, 0))
-+ return SEQ_SKIP;
-+ if (!mnt_is_reachable(mnt) && !vx_check(0, VS_WATCH_P))
-+ return SEQ_SKIP;
-+
- seq_printf(m, "%i %i %u:%u ", mnt->mnt_id, mnt->mnt_parent->mnt_id,
- MAJOR(sb->s_dev), MINOR(sb->s_dev));
- if (sb->s_op->show_path)
-@@ -1107,21 +1155,31 @@ static int show_vfsstat(struct seq_file
- struct path mnt_path = { .dentry = mnt->mnt_root, .mnt = mnt };
- int err = 0;
+@@ -780,6 +785,10 @@ vfs_kern_mount(struct file_system_type *
+ if (!type)
+ return ERR_PTR(-ENODEV);
-- /* device */
-- if (mnt->mnt_sb->s_op->show_devname) {
-- err = mnt->mnt_sb->s_op->show_devname(m, mnt);
-+ if (vx_flags(VXF_HIDE_MOUNT, 0))
-+ return SEQ_SKIP;
-+ if (!mnt_is_reachable(mnt) && !vx_check(0, VS_WATCH_P))
-+ return SEQ_SKIP;
++ if ((type->fs_flags & FS_BINARY_MOUNTDATA) &&
++ !vx_capable(CAP_SYS_ADMIN, VXC_BINARY_MOUNT))
++ return ERR_PTR(-EPERM);
+
-+ if (!vx_check(0, VS_ADMIN|VS_WATCH) &&
-+ mnt == current->fs->root.mnt) {
-+ seq_puts(m, "device /dev/root mounted on / ");
- } else {
-- if (mnt->mnt_devname) {
-- seq_puts(m, "device ");
-- mangle(m, mnt->mnt_devname);
-- } else
-- seq_puts(m, "no device");
-- }
-+ /* device */
-+ if (mnt->mnt_sb->s_op->show_devname) {
-+ err = mnt->mnt_sb->s_op->show_devname(m, mnt);
-+ } else {
-+ if (mnt->mnt_devname) {
-+ seq_puts(m, "device ");
-+ mangle(m, mnt->mnt_devname);
-+ } else
-+ seq_puts(m, "no device");
-+ }
-
-- /* mount point */
-- seq_puts(m, " mounted on ");
-- seq_path(m, &mnt_path, " \t\n\\");
-- seq_putc(m, ' ');
-+ /* mount point */
-+ seq_puts(m, " mounted on ");
-+ seq_path(m, &mnt_path, " \t\n\\");
-+ seq_putc(m, ' ');
-+ }
-
- /* file system type */
- seq_puts(m, "with fstype ");
-@@ -1380,7 +1438,7 @@ SYSCALL_DEFINE2(umount, char __user *, n
- goto dput_and_out;
-
- retval = -EPERM;
-- if (!capable(CAP_SYS_ADMIN))
-+ if (!vx_capable(CAP_SYS_ADMIN, VXC_SECURE_MOUNT))
- goto dput_and_out;
-
- retval = do_umount(path.mnt, flags);
-@@ -1406,7 +1464,7 @@ SYSCALL_DEFINE1(oldumount, char __user *
-
- static int mount_is_safe(struct path *path)
+ mnt = alloc_vfsmnt(name);
+ if (!mnt)
+ return ERR_PTR(-ENOMEM);
+@@ -836,6 +845,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);
+ list_add_tail(&mnt->mnt_instance, &sb->s_mounts);
+ br_write_unlock(&vfsmount_lock);
+@@ -1291,7 +1301,8 @@ static int do_umount(struct mount *mnt,
+ */
+ static inline bool may_mount(void)
{
-- if (capable(CAP_SYS_ADMIN))
-+ if (vx_capable(CAP_SYS_ADMIN, VXC_SECURE_MOUNT))
- return 0;
- return -EPERM;
- #ifdef notyet
-@@ -1716,7 +1774,7 @@ static int do_change_type(struct path *p
- int type;
- int err = 0;
-
-- if (!capable(CAP_SYS_ADMIN))
-+ if (!vx_capable(CAP_SYS_ADMIN, VXC_NAMESPACE))
- return -EPERM;
+- 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);
+ }
- if (path->dentry != path->mnt->mnt_root)
-@@ -1732,6 +1790,7 @@ static int do_change_type(struct path *p
+ /*
+@@ -1685,6 +1696,7 @@ static int do_change_type(struct path *p
if (err)
goto out_unlock;
}
+ // mnt->mnt_flags = mnt_flags;
- br_write_lock(vfsmount_lock);
+ br_write_lock(&vfsmount_lock);
for (m = mnt; m; m = (recurse ? next_mnt(m, mnt) : NULL))
-@@ -1747,12 +1806,14 @@ static int do_change_type(struct path *p
+@@ -1700,12 +1712,14 @@ static int do_change_type(struct path *p
* do loopback mount.
*/
- static int do_loopback(struct path *path, char *old_name,
+ 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 vfsmount *mnt = NULL;
- int err = mount_is_safe(path);
+ struct mount *mnt = NULL, *old, *parent;
+ struct mountpoint *mp;
+ int recurse = flags & MS_REC;
+ int err;
+
- if (err)
- return err;
if (!old_name || !*old_name)
-@@ -1818,12 +1879,12 @@ static int change_mount_flags(struct vfs
+ return -EINVAL;
+ err = kern_path(old_name, LOOKUP_FOLLOW|LOOKUP_AUTOMOUNT, &old_path);
+@@ -1780,7 +1794,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;
-
-- if (!capable(CAP_SYS_ADMIN))
-+ if (!vx_capable(CAP_SYS_ADMIN, VXC_SECURE_REMOUNT))
- return -EPERM;
-
- if (!check_mnt(path->mnt))
-@@ -1871,7 +1932,7 @@ static int do_move_mount(struct path *pa
- struct path old_path, parent_path;
- struct vfsmount *p;
- int err = 0;
-- if (!capable(CAP_SYS_ADMIN))
-+ if (!vx_capable(CAP_SYS_ADMIN, VXC_SECURE_MOUNT))
- return -EPERM;
- if (!old_name || !*old_name)
- return -EINVAL;
-@@ -2022,7 +2083,7 @@ static int do_new_mount(struct path *pat
- return -EINVAL;
-
- /* we need capabilities... */
-- if (!capable(CAP_SYS_ADMIN))
-+ if (!vx_capable(CAP_SYS_ADMIN, VXC_SECURE_MOUNT))
- return -EPERM;
-
- mnt = do_kern_mount(type, flags, name, data);
-@@ -2291,6 +2352,7 @@ long do_mount(char *dev_name, char *dir_
+@@ -2264,6 +2278,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)
-@@ -2318,6 +2380,12 @@ long do_mount(char *dev_name, char *dir_
+@@ -2293,6 +2308,12 @@ long do_mount(const char *dev_name, cons
if (!(flags & MS_NOATIME))
mnt_flags |= MNT_RELATIME;
/* Separate the per-mountpoint flags */
if (flags & MS_NOSUID)
mnt_flags |= MNT_NOSUID;
-@@ -2334,15 +2402,17 @@ long do_mount(char *dev_name, char *dir_
+@@ -2309,15 +2330,17 @@ long do_mount(const char *dev_name, cons
if (flags & MS_RDONLY)
mnt_flags |= MNT_READONLY;
-+ if (!capable(CAP_SYS_ADMIN))
++ if (!vx_capable(CAP_SYS_ADMIN, VXC_DEV_MOUNT))
+ mnt_flags |= MNT_NODEV;
flags &= ~(MS_NOSUID | MS_NOEXEC | MS_NODEV | MS_ACTIVE | MS_BORN |
MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
else if (flags & (MS_SHARED | MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE))
retval = do_change_type(&path, flags);
else if (flags & MS_MOVE)
-@@ -2442,6 +2512,7 @@ static struct mnt_namespace *dup_mnt_ns(
- q = next_mnt(q, new_ns->root);
+@@ -2426,6 +2449,7 @@ static struct mnt_namespace *dup_mnt_ns(
+ q = next_mnt(q, new);
}
- up_write(&namespace_sem);
+ namespace_unlock();
+ atomic_inc(&vs_global_mnt_ns);
if (rootmnt)
mntput(rootmnt);
-@@ -2581,9 +2652,10 @@ SYSCALL_DEFINE2(pivot_root, const char _
- goto out3;
-
- error = -EINVAL;
-- if (IS_MNT_SHARED(old.mnt) ||
-- IS_MNT_SHARED(new.mnt->mnt_parent) ||
-- IS_MNT_SHARED(root.mnt->mnt_parent))
-+ if ((IS_MNT_SHARED(old.mnt) ||
-+ IS_MNT_SHARED(new.mnt->mnt_parent) ||
-+ IS_MNT_SHARED(root.mnt->mnt_parent)) &&
+@@ -2624,9 +2648,10 @@ SYSCALL_DEFINE2(pivot_root, const char _
+ new_mnt = real_mount(new.mnt);
+ root_mnt = real_mount(root.mnt);
+ old_mnt = real_mount(old.mnt);
+- 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)) &&
+ !vx_flags(VXF_STATE_SETUP, 0))
goto out4;
- if (!check_mnt(root.mnt) || !check_mnt(new.mnt))
+ if (!check_mnt(root_mnt) || !check_mnt(new_mnt))
goto out4;
-@@ -2715,6 +2787,7 @@ void put_mnt_ns(struct mnt_namespace *ns
- br_write_unlock(vfsmount_lock);
- up_write(&namespace_sem);
- release_mounts(&umount_list);
+@@ -2752,6 +2777,7 @@ void put_mnt_ns(struct mnt_namespace *ns
+ umount_tree(ns->root, 0);
+ br_write_unlock(&vfsmount_lock);
+ namespace_unlock();
+ atomic_dec(&vs_global_mnt_ns);
- kfree(ns);
+ free_mnt_ns(ns);
}
- EXPORT_SYMBOL(put_mnt_ns);
-diff -NurpP --minimal linux-3.0-rc5/fs/nfs/client.c linux-3.0-rc5-vs2.3.1-pre3/fs/nfs/client.c
---- linux-3.0-rc5/fs/nfs/client.c 2011-07-01 11:14:19.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/nfs/client.c 2011-06-10 22:11:24.000000000 +0200
-@@ -780,6 +780,9 @@ static int nfs_init_server_rpcclient(str
+
+diff -NurpP --minimal linux-3.10.53/fs/nfs/client.c linux-3.10.53-vs2.3.6.8/fs/nfs/client.c
+--- linux-3.10.53/fs/nfs/client.c 2013-07-14 17:01:28.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/nfs/client.c 2013-08-22 20:29:59.000000000 +0000
+@@ -684,6 +684,9 @@ int nfs_init_server_rpcclient(struct nfs
if (server->flags & NFS_MOUNT_SOFT)
server->client->cl_softrtry = 1;
+ server->client->cl_tag = 1;
return 0;
}
-
-@@ -951,6 +954,10 @@ static void nfs_server_set_fsinfo(struct
+ EXPORT_SYMBOL_GPL(nfs_init_server_rpcclient);
+@@ -863,6 +866,10 @@ static void nfs_server_set_fsinfo(struct
server->acdirmin = server->acdirmax = 0;
}
server->maxfilesize = fsinfo->maxfilesize;
server->time_delta = fsinfo->time_delta;
-diff -NurpP --minimal linux-3.0-rc5/fs/nfs/dir.c linux-3.0-rc5-vs2.3.1-pre3/fs/nfs/dir.c
---- linux-3.0-rc5/fs/nfs/dir.c 2011-07-01 11:14:19.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/nfs/dir.c 2011-06-10 22:11:24.000000000 +0200
-@@ -35,6 +35,7 @@
+diff -NurpP --minimal linux-3.10.53/fs/nfs/dir.c linux-3.10.53-vs2.3.6.8/fs/nfs/dir.c
+--- linux-3.10.53/fs/nfs/dir.c 2013-07-14 17:01:28.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/nfs/dir.c 2013-08-22 20:29:59.000000000 +0000
+@@ -36,6 +36,7 @@
#include <linux/sched.h>
#include <linux/kmemleak.h>
#include <linux/xattr.h>
#include "delegation.h"
#include "iostat.h"
-@@ -1298,6 +1299,7 @@ static struct dentry *nfs_lookup(struct
- if (IS_ERR(res))
- goto out_unblock_sillyrename;
+@@ -1300,6 +1301,7 @@ struct dentry *nfs_lookup(struct inode *
+ /* Success: notify readdir to use READDIRPLUS */
+ nfs_advise_use_readdirplus(dir);
+ dx_propagate_tag(nd, inode);
no_entry:
res = d_materialise_unique(dentry, inode);
if (res != NULL) {
-diff -NurpP --minimal linux-3.0-rc5/fs/nfs/inode.c linux-3.0-rc5-vs2.3.1-pre3/fs/nfs/inode.c
---- linux-3.0-rc5/fs/nfs/inode.c 2011-07-01 11:14:19.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/nfs/inode.c 2011-07-01 11:35:34.000000000 +0200
-@@ -38,6 +38,7 @@
- #include <linux/nfs_xdr.h>
- #include <linux/slab.h>
+diff -NurpP --minimal linux-3.10.53/fs/nfs/inode.c linux-3.10.53-vs2.3.6.8/fs/nfs/inode.c
+--- linux-3.10.53/fs/nfs/inode.c 2014-08-30 13:38:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/nfs/inode.c 2014-08-30 14:03:54.000000000 +0000
+@@ -39,6 +39,7 @@
#include <linux/compat.h>
+ #include <linux/freezer.h>
+ #include <linux/crc32.h>
+#include <linux/vs_tag.h>
- #include <asm/system.h>
#include <asm/uaccess.h>
-@@ -273,6 +274,8 @@ nfs_fhget(struct super_block *sb, struct
+
+@@ -290,6 +291,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) */
-@@ -321,8 +324,8 @@ nfs_fhget(struct super_block *sb, struct
- nfsi->change_attr = 0;
+@@ -334,8 +337,8 @@ nfs_fhget(struct super_block *sb, struct
+ inode->i_version = 0;
inode->i_size = 0;
- inode->i_nlink = 0;
-- inode->i_uid = -2;
-- inode->i_gid = -2;
-+ uid = -2;
-+ gid = -2;
+ clear_nlink(inode);
+- inode->i_uid = make_kuid(&init_user_ns, -2);
+- inode->i_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));
-
-@@ -359,13 +362,13 @@ nfs_fhget(struct super_block *sb, struct
+ nfsi->write_io = 0;
+@@ -369,11 +372,11 @@ nfs_fhget(struct super_block *sb, struct
else if (nfs_server_capable(inode, NFS_CAP_NLINK))
nfsi->cache_validity |= 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_INO_INVALID_ACCESS
- | NFS_INO_INVALID_ACL;
+ nfsi->cache_validity |= 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_INO_INVALID_ACCESS
-@@ -378,6 +381,11 @@ nfs_fhget(struct super_block *sb, struct
+ nfsi->cache_validity |= NFS_INO_INVALID_ATTR;
+ if (fattr->valid & NFS_ATTR_FATTR_BLOCKS_USED)
+@@ -384,6 +387,11 @@ 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;
-@@ -494,6 +502,8 @@ void nfs_setattr_update_inode(struct ino
+@@ -505,6 +513,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;
NFS_I(inode)->cache_validity |= NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL;
spin_unlock(&inode->i_lock);
}
-@@ -941,6 +951,9 @@ static int nfs_check_inode_attributes(st
+@@ -982,7 +992,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;
-+ uid_t uid;
-+ gid_t gid;
-+ tag_t tag;
-
+-
++ kuid_t kuid;
++ kgid_t kgid;
++ ktag_t ktag;
- /* Has the inode gone and changed behind our back? */
-@@ -964,13 +977,18 @@ static int nfs_check_inode_attributes(st
+ if (nfs_have_delegated_attributes(inode))
+ return 0;
+@@ -1007,13 +1019,18 @@ static int nfs_check_inode_attributes(st
invalid |= NFS_INO_INVALID_ATTR|NFS_INO_REVAL_PAGECACHE;
}
-+ uid = INOTAG_UID(DX_TAG(inode), fattr->uid, fattr->gid);
-+ gid = INOTAG_GID(DX_TAG(inode), fattr->uid, fattr->gid);
-+ tag = INOTAG_TAG(DX_TAG(inode), fattr->uid, fattr->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))
invalid |= NFS_INO_INVALID_ATTR | NFS_INO_INVALID_ACCESS | NFS_INO_INVALID_ACL;
-- if ((fattr->valid & NFS_ATTR_FATTR_OWNER) && inode->i_uid != fattr->uid)
-+ if ((fattr->valid & NFS_ATTR_FATTR_OWNER) && uid != fattr->uid)
+- if ((fattr->valid & NFS_ATTR_FATTR_OWNER) && !uid_eq(inode->i_uid, fattr->uid))
++ if ((fattr->valid & NFS_ATTR_FATTR_OWNER) && !uid_eq(inode->i_uid, kuid))
invalid |= NFS_INO_INVALID_ATTR | NFS_INO_INVALID_ACCESS | NFS_INO_INVALID_ACL;
-- if ((fattr->valid & NFS_ATTR_FATTR_GROUP) && inode->i_gid != fattr->gid)
-+ if ((fattr->valid & NFS_ATTR_FATTR_GROUP) && gid != fattr->gid)
+- if ((fattr->valid & NFS_ATTR_FATTR_GROUP) && !gid_eq(inode->i_gid, fattr->gid))
++ if ((fattr->valid & NFS_ATTR_FATTR_GROUP) && !gid_eq(inode->i_gid, kgid))
invalid |= NFS_INO_INVALID_ATTR | NFS_INO_INVALID_ACCESS | NFS_INO_INVALID_ACL;
+ /* maybe check for tag too? */
/* Has the link count changed? */
if ((fattr->valid & NFS_ATTR_FATTR_NLINK) && inode->i_nlink != fattr->nlink)
-@@ -1205,6 +1223,9 @@ static int nfs_update_inode(struct inode
+@@ -1319,6 +1336,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 ct=%d info=0x%x)\n",
+ dfprintk(VFS, "NFS: %s(%s/%ld fh_crc=0x%08x ct=%d info=0x%x)\n",
__func__, inode->i_sb->s_id, inode->i_ino,
-@@ -1312,6 +1333,9 @@ static int nfs_update_inode(struct inode
+@@ -1423,6 +1443,9 @@ static int nfs_update_inode(struct inode
| NFS_INO_REVAL_PAGECACHE
| NFS_INO_REVAL_FORCED);
-+ uid = INOTAG_UID(DX_TAG(inode), fattr->uid, fattr->gid);
-+ gid = INOTAG_GID(DX_TAG(inode), fattr->uid, fattr->gid);
-+ tag = INOTAG_TAG(DX_TAG(inode), fattr->uid, fattr->gid, 0);
++ 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));
-@@ -1333,9 +1357,9 @@ static int nfs_update_inode(struct inode
- | NFS_INO_REVAL_FORCED);
-
- if (fattr->valid & NFS_ATTR_FATTR_OWNER) {
-- if (inode->i_uid != fattr->uid) {
-+ if (uid != fattr->uid) {
- invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL;
-- inode->i_uid = fattr->uid;
-+ uid = fattr->uid;
- }
- } else if (server->caps & NFS_CAP_OWNER)
- invalid |= save_cache_validity & (NFS_INO_INVALID_ATTR
-@@ -1344,9 +1368,9 @@ static int nfs_update_inode(struct inode
- | NFS_INO_REVAL_FORCED);
-
- if (fattr->valid & NFS_ATTR_FATTR_GROUP) {
-- if (inode->i_gid != fattr->gid) {
-+ if (gid != fattr->gid) {
- invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL;
-- inode->i_gid = fattr->gid;
-+ gid = fattr->gid;
- }
- } else if (server->caps & NFS_CAP_OWNER_GROUP)
- invalid |= save_cache_validity & (NFS_INO_INVALID_ATTR
-@@ -1354,6 +1378,10 @@ static int nfs_update_inode(struct inode
+@@ -1469,6 +1492,10 @@ static int nfs_update_inode(struct inode
| NFS_INO_INVALID_ACL
| NFS_INO_REVAL_FORCED);
-+ inode->i_uid = uid;
-+ inode->i_gid = gid;
-+ inode->i_tag = 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.0-rc5/fs/nfs/nfs3xdr.c linux-3.0-rc5-vs2.3.1-pre3/fs/nfs/nfs3xdr.c
---- linux-3.0-rc5/fs/nfs/nfs3xdr.c 2011-03-15 18:07:32.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/nfs/nfs3xdr.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/fs/nfs/nfs3xdr.c linux-3.10.53-vs2.3.6.8/fs/nfs/nfs3xdr.c
+--- linux-3.10.53/fs/nfs/nfs3xdr.c 2013-05-31 13:45:24.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/nfs/nfs3xdr.c 2013-08-22 20:29:59.000000000 +0000
@@ -20,6 +20,7 @@
#include <linux/nfs3.h>
#include <linux/nfs_fs.h>
#include "internal.h"
#define NFSDBG_FACILITY NFSDBG_XDR
-@@ -562,7 +563,8 @@ static __be32 *xdr_decode_nfstime3(__be3
+@@ -558,7 +559,8 @@ static __be32 *xdr_decode_nfstime3(__be3
* set_mtime mtime;
* };
*/
{
u32 nbytes;
__be32 *p;
-@@ -594,15 +596,19 @@ static void encode_sattr3(struct xdr_str
+@@ -590,15 +592,19 @@ static void encode_sattr3(struct xdr_str
} else
*p++ = xdr_zero;
+ if (attr->ia_valid & ATTR_UID ||
+ (tag && (attr->ia_valid & ATTR_TAG))) {
*p++ = xdr_one;
-- *p++ = cpu_to_be32(attr->ia_uid);
-+ *p++ = cpu_to_be32(TAGINO_UID(tag,
-+ attr->ia_uid, attr->ia_tag));
+- *p++ = cpu_to_be32(from_kuid(&init_user_ns, attr->ia_uid));
++ *p++ = cpu_to_be32(from_kuid(&init_user_ns,
++ TAGINO_KUID(tag, attr->ia_uid, attr->ia_tag)));
} else
*p++ = xdr_zero;
+ if (attr->ia_valid & ATTR_GID ||
+ (tag && (attr->ia_valid & ATTR_TAG))) {
*p++ = xdr_one;
-- *p++ = cpu_to_be32(attr->ia_gid);
-+ *p++ = cpu_to_be32(TAGINO_GID(tag,
-+ attr->ia_gid, attr->ia_tag));
+- *p++ = cpu_to_be32(from_kgid(&init_user_ns, attr->ia_gid));
++ *p++ = cpu_to_be32(from_kgid(&init_user_ns,
++ TAGINO_KGID(tag, attr->ia_gid, attr->ia_tag)));
} else
*p++ = xdr_zero;
-@@ -878,7 +884,7 @@ static void nfs3_xdr_enc_setattr3args(st
+@@ -887,7 +893,7 @@ static void nfs3_xdr_enc_setattr3args(st
const struct nfs3_sattrargs *args)
{
encode_nfs_fh3(xdr, args->fh);
encode_sattrguard3(xdr, args);
}
-@@ -1028,13 +1034,13 @@ static void nfs3_xdr_enc_write3args(stru
+@@ -1037,13 +1043,13 @@ static void nfs3_xdr_enc_write3args(stru
* };
*/
static void encode_createhow3(struct xdr_stream *xdr,
break;
case NFS3_CREATE_EXCLUSIVE:
encode_createverf3(xdr, args->verifier);
-@@ -1049,7 +1055,7 @@ static void nfs3_xdr_enc_create3args(str
+@@ -1058,7 +1064,7 @@ static void nfs3_xdr_enc_create3args(str
const struct nfs3_createargs *args)
{
encode_diropargs3(xdr, args->fh, args->name, args->len);
}
/*
-@@ -1065,7 +1071,7 @@ static void nfs3_xdr_enc_mkdir3args(stru
+@@ -1074,7 +1080,7 @@ static void nfs3_xdr_enc_mkdir3args(stru
const struct nfs3_mkdirargs *args)
{
encode_diropargs3(xdr, args->fh, args->name, args->len);
}
/*
-@@ -1082,9 +1088,9 @@ static void nfs3_xdr_enc_mkdir3args(stru
+@@ -1091,9 +1097,9 @@ static void nfs3_xdr_enc_mkdir3args(stru
* };
*/
static void encode_symlinkdata3(struct xdr_stream *xdr,
encode_nfspath3(xdr, args->pages, args->pathlen);
}
-@@ -1093,7 +1099,7 @@ static void nfs3_xdr_enc_symlink3args(st
+@@ -1102,7 +1108,7 @@ static void nfs3_xdr_enc_symlink3args(st
const struct nfs3_symlinkargs *args)
{
encode_diropargs3(xdr, args->fromfh, args->fromname, args->fromlen);
}
/*
-@@ -1121,24 +1127,24 @@ static void nfs3_xdr_enc_symlink3args(st
+@@ -1130,24 +1136,24 @@ static void nfs3_xdr_enc_symlink3args(st
* };
*/
static void encode_devicedata3(struct xdr_stream *xdr,
break;
case NF3REG:
case NF3DIR:
-@@ -1153,7 +1159,7 @@ static void nfs3_xdr_enc_mknod3args(stru
+@@ -1162,7 +1168,7 @@ static void nfs3_xdr_enc_mknod3args(stru
const struct nfs3_mknodargs *args)
{
encode_diropargs3(xdr, args->fh, args->name, args->len);
}
/*
-diff -NurpP --minimal linux-3.0-rc5/fs/nfs/super.c linux-3.0-rc5-vs2.3.1-pre3/fs/nfs/super.c
---- linux-3.0-rc5/fs/nfs/super.c 2011-07-01 11:14:19.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/nfs/super.c 2011-06-10 22:11:24.000000000 +0200
-@@ -53,6 +53,7 @@
- #include <linux/nfs_xdr.h>
- #include <linux/magic.h>
+diff -NurpP --minimal linux-3.10.53/fs/nfs/super.c linux-3.10.53-vs2.3.6.8/fs/nfs/super.c
+--- linux-3.10.53/fs/nfs/super.c 2013-07-14 17:01:28.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/nfs/super.c 2013-08-22 20:29:59.000000000 +0000
+@@ -55,6 +55,7 @@
#include <linux/parser.h>
+ #include <linux/nsproxy.h>
+ #include <linux/rcupdate.h>
+#include <linux/vs_tag.h>
- #include <asm/system.h>
#include <asm/uaccess.h>
-@@ -87,6 +88,7 @@ enum {
- Opt_sharecache, Opt_nosharecache,
- Opt_resvport, Opt_noresvport,
- Opt_fscache, Opt_nofscache,
-+ Opt_tag, Opt_notag,
- /* Mount options that take integer arguments */
- Opt_port,
-@@ -100,6 +102,7 @@ enum {
+@@ -103,6 +104,7 @@ enum {
+ Opt_mountport,
Opt_mountvers,
- Opt_nfsvers,
Opt_minorversion,
+ Opt_tagid,
/* Mount options that take string arguments */
- Opt_sec, Opt_proto, Opt_mountproto, Opt_mounthost,
-@@ -180,6 +183,10 @@ static const match_table_t nfs_mount_opt
+ Opt_nfsvers,
+@@ -115,6 +117,9 @@ enum {
+ /* Special mount options */
+ Opt_userspace, Opt_deprecated, Opt_sloppy,
+
++ /* Linux-VServer tagging options */
++ Opt_tag, Opt_notag,
++
+ Opt_err
+ };
+
+@@ -184,6 +189,10 @@ static const match_table_t nfs_mount_opt
{ Opt_fscache_uniq, "fsc=%s" },
{ Opt_local_lock, "local_lock=%s" },
+ { Opt_notag, "notag" },
+ { Opt_tagid, "tagid=%u" },
+
- { Opt_err, NULL }
- };
+ /* The following needs to be listed after all other options */
+ { Opt_nfsvers, "v%s" },
-@@ -650,6 +657,7 @@ static void nfs_show_mount_options(struc
+@@ -635,6 +644,7 @@ static void nfs_show_mount_options(struc
{ NFS_MOUNT_NORDIRPLUS, ",nordirplus", "" },
{ NFS_MOUNT_UNSHARED, ",nosharecache", "" },
{ NFS_MOUNT_NORESVPORT, ",noresvport", "" },
{ 0, NULL, NULL }
};
const struct proc_nfs_info *nfs_infop;
-@@ -1198,6 +1206,14 @@ static int nfs_parse_mount_options(char
- kfree(mnt->fscache_uniq);
- mnt->fscache_uniq = NULL;
+@@ -1261,6 +1271,14 @@ static int nfs_parse_mount_options(char
+ case Opt_nomigration:
+ mnt->options &= NFS_OPTION_MIGRATION;
break;
+#ifndef CONFIG_TAGGING_NONE
+ case Opt_tag:
/*
* options that take numeric values
-@@ -1304,6 +1320,12 @@ static int nfs_parse_mount_options(char
+@@ -1347,6 +1365,12 @@ static int nfs_parse_mount_options(char
goto out_invalid_value;
mnt->minorversion = option;
break;
/*
* options that take text values
-diff -NurpP --minimal linux-3.0-rc5/fs/nfsd/auth.c linux-3.0-rc5-vs2.3.1-pre3/fs/nfsd/auth.c
---- linux-3.0-rc5/fs/nfsd/auth.c 2010-02-25 11:52:05.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/nfsd/auth.c 2011-06-10 22:11:24.000000000 +0200
-@@ -1,6 +1,7 @@
- /* Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de> */
+diff -NurpP --minimal linux-3.10.53/fs/nfsd/auth.c linux-3.10.53-vs2.3.6.8/fs/nfsd/auth.c
+--- linux-3.10.53/fs/nfsd/auth.c 2013-05-31 13:45:24.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/nfsd/auth.c 2013-08-22 20:29:59.000000000 +0000
+@@ -2,6 +2,7 @@
#include <linux/sched.h>
+ #include <linux/user_namespace.h>
+#include <linux/vs_tag.h>
#include "nfsd.h"
#include "auth.h"
-@@ -36,6 +37,9 @@ int nfsd_setuser(struct svc_rqst *rqstp,
+@@ -37,6 +38,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.0-rc5/fs/nfsd/nfs3xdr.c linux-3.0-rc5-vs2.3.1-pre3/fs/nfsd/nfs3xdr.c
---- linux-3.0-rc5/fs/nfsd/nfs3xdr.c 2011-07-01 11:14:19.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/nfsd/nfs3xdr.c 2011-06-10 22:11:24.000000000 +0200
-@@ -7,6 +7,7 @@
- */
+diff -NurpP --minimal linux-3.10.53/fs/nfsd/nfs3xdr.c linux-3.10.53-vs2.3.6.8/fs/nfsd/nfs3xdr.c
+--- linux-3.10.53/fs/nfsd/nfs3xdr.c 2013-05-31 13:45:24.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/nfsd/nfs3xdr.c 2013-08-22 20:29:59.000000000 +0000
+@@ -8,6 +8,7 @@
#include <linux/namei.h>
+ #include <linux/sunrpc/svc_xprt.h>
+#include <linux/vs_tag.h>
#include "xdr3.h"
#include "auth.h"
-
-@@ -95,6 +96,8 @@ static __be32 *
+ #include "netns.h"
+@@ -98,6 +99,8 @@ static __be32 *
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;
-@@ -104,12 +107,15 @@ decode_sattr3(__be32 *p, struct iattr *i
+@@ -106,15 +109,18 @@ decode_sattr3(__be32 *p, struct iattr *i
+ iap->ia_mode = ntohl(*p++);
}
if (*p++) {
- iap->ia_valid |= ATTR_UID;
-- iap->ia_uid = ntohl(*p++);
-+ uid = ntohl(*p++);
+- iap->ia_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_valid |= ATTR_GID;
-- iap->ia_gid = ntohl(*p++);
-+ gid = ntohl(*p++);
+- iap->ia_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;
-@@ -165,8 +171,12 @@ encode_fattr3(struct svc_rqst *rqstp, __
+@@ -170,8 +176,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->nlink);
-- *p++ = htonl((u32) nfsd_ruid(rqstp, stat->uid));
-- *p++ = htonl((u32) nfsd_rgid(rqstp, stat->gid));
-+ *p++ = htonl((u32) nfsd_ruid(rqstp,
-+ TAGINO_UID(0 /* FIXME: DX_TAG(dentry->d_inode) */,
+- *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_KUID(0 /* FIXME: DX_TAG(dentry->d_inode) */,
+ stat->uid, stat->tag)));
-+ *p++ = htonl((u32) nfsd_rgid(rqstp,
-+ TAGINO_GID(0 /* FIXME: DX_TAG(dentry->d_inode) */,
++ *p++ = htonl((u32) from_kgid(&init_user_ns,
++ 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.0-rc5/fs/nfsd/nfs4xdr.c linux-3.0-rc5-vs2.3.1-pre3/fs/nfsd/nfs4xdr.c
---- linux-3.0-rc5/fs/nfsd/nfs4xdr.c 2011-07-01 11:14:19.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/nfsd/nfs4xdr.c 2011-06-10 22:11:24.000000000 +0200
-@@ -45,6 +45,7 @@
- #include <linux/statfs.h>
+diff -NurpP --minimal linux-3.10.53/fs/nfsd/nfs4xdr.c linux-3.10.53-vs2.3.6.8/fs/nfsd/nfs4xdr.c
+--- linux-3.10.53/fs/nfsd/nfs4xdr.c 2014-08-30 13:38:58.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/nfsd/nfs4xdr.c 2014-08-30 14:03:54.000000000 +0000
+@@ -46,6 +46,7 @@
#include <linux/utsname.h>
+ #include <linux/pagemap.h>
#include <linux/sunrpc/svcauth_gss.h>
+#include <linux/vs_tag.h>
#include "idmap.h"
#include "acl.h"
-@@ -2090,14 +2091,18 @@ out_acl:
+@@ -2331,14 +2332,18 @@ out_acl:
WRITE32(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),
++ TAGINO_KUID(DX_TAG(dentry->d_inode),
+ stat.uid, stat.tag), &p, &buflen);
if (status == nfserr_resource)
goto out_resource;
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),
++ TAGINO_KGID(DX_TAG(dentry->d_inode),
+ stat.gid, stat.tag), &p, &buflen);
if (status == nfserr_resource)
goto out_resource;
if (status)
-diff -NurpP --minimal linux-3.0-rc5/fs/nfsd/nfsxdr.c linux-3.0-rc5-vs2.3.1-pre3/fs/nfsd/nfsxdr.c
---- linux-3.0-rc5/fs/nfsd/nfsxdr.c 2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/nfsd/nfsxdr.c 2011-06-10 22:11:24.000000000 +0200
-@@ -6,6 +6,7 @@
-
+diff -NurpP --minimal linux-3.10.53/fs/nfsd/nfsxdr.c linux-3.10.53-vs2.3.6.8/fs/nfsd/nfsxdr.c
+--- linux-3.10.53/fs/nfsd/nfsxdr.c 2013-05-31 13:45:24.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/nfsd/nfsxdr.c 2013-08-22 20:29:59.000000000 +0000
+@@ -7,6 +7,7 @@
+ #include "vfs.h"
#include "xdr.h"
#include "auth.h"
+#include <linux/vs_tag.h>
#define NFSDDBG_FACILITY NFSDDBG_XDR
-@@ -88,6 +89,8 @@ static __be32 *
+@@ -89,6 +90,8 @@ static __be32 *
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;
-@@ -101,12 +104,15 @@ decode_sattr(__be32 *p, struct iattr *ia
+@@ -101,15 +104,18 @@ decode_sattr(__be32 *p, struct iattr *ia
+ iap->ia_mode = tmp;
}
if ((tmp = ntohl(*p++)) != (u32)-1) {
- iap->ia_valid |= ATTR_UID;
-- iap->ia_uid = tmp;
-+ uid = tmp;
+- iap->ia_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_valid |= ATTR_GID;
-- iap->ia_gid = tmp;
-+ gid = tmp;
+- iap->ia_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;
-@@ -151,8 +157,10 @@ encode_fattr(struct svc_rqst *rqstp, __b
+@@ -154,8 +160,10 @@ encode_fattr(struct svc_rqst *rqstp, __b
*p++ = htonl(nfs_ftypes[type >> 12]);
*p++ = htonl((u32) stat->mode);
*p++ = htonl((u32) stat->nlink);
-- *p++ = htonl((u32) nfsd_ruid(rqstp, stat->uid));
-- *p++ = htonl((u32) nfsd_rgid(rqstp, stat->gid));
-+ *p++ = htonl((u32) nfsd_ruid(rqstp,
-+ TAGINO_UID(DX_TAG(dentry->d_inode), stat->uid, stat->tag)));
-+ *p++ = htonl((u32) nfsd_rgid(rqstp,
-+ TAGINO_GID(DX_TAG(dentry->d_inode), stat->gid, stat->tag)));
+- *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_KUID(DX_TAG(dentry->d_inode), stat->uid, stat->tag)));
++ *p++ = htonl((u32) from_kgid(&init_user_ns,
++ 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.0-rc5/fs/ocfs2/dlmglue.c linux-3.0-rc5-vs2.3.1-pre3/fs/ocfs2/dlmglue.c
---- linux-3.0-rc5/fs/ocfs2/dlmglue.c 2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/ocfs2/dlmglue.c 2011-06-10 22:11:24.000000000 +0200
-@@ -2041,6 +2041,7 @@ static void __ocfs2_stuff_meta_lvb(struc
+diff -NurpP --minimal linux-3.10.53/fs/ocfs2/dlmglue.c linux-3.10.53-vs2.3.6.8/fs/ocfs2/dlmglue.c
+--- linux-3.10.53/fs/ocfs2/dlmglue.c 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/ocfs2/dlmglue.c 2013-08-22 20:29:59.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(inode->i_uid);
- lvb->lvb_igid = cpu_to_be32(inode->i_gid);
-+ lvb->lvb_itag = cpu_to_be16(inode->i_tag);
+ 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(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 =
-@@ -2091,6 +2092,7 @@ static void ocfs2_refresh_inode_from_lvb
+@@ -2097,6 +2098,7 @@ static void ocfs2_refresh_inode_from_lvb
- inode->i_uid = be32_to_cpu(lvb->lvb_iuid);
- inode->i_gid = be32_to_cpu(lvb->lvb_igid);
-+ inode->i_tag = be16_to_cpu(lvb->lvb_itag);
+ i_uid_write(inode, be32_to_cpu(lvb->lvb_iuid));
+ i_gid_write(inode, be32_to_cpu(lvb->lvb_igid));
++ i_tag_write(inode, be16_to_cpu(lvb->lvb_itag));
inode->i_mode = be16_to_cpu(lvb->lvb_imode);
- inode->i_nlink = be16_to_cpu(lvb->lvb_inlink);
+ set_nlink(inode, be16_to_cpu(lvb->lvb_inlink));
ocfs2_unpack_timespec(&inode->i_atime,
-diff -NurpP --minimal linux-3.0-rc5/fs/ocfs2/dlmglue.h linux-3.0-rc5-vs2.3.1-pre3/fs/ocfs2/dlmglue.h
---- linux-3.0-rc5/fs/ocfs2/dlmglue.h 2010-10-21 13:07:50.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/ocfs2/dlmglue.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/fs/ocfs2/dlmglue.h linux-3.10.53-vs2.3.6.8/fs/ocfs2/dlmglue.h
+--- linux-3.10.53/fs/ocfs2/dlmglue.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/ocfs2/dlmglue.h 2013-08-22 20:29:59.000000000 +0000
@@ -46,7 +46,8 @@ struct ocfs2_meta_lvb {
__be16 lvb_inlink;
__be32 lvb_iattr;
};
#define OCFS2_QINFO_LVB_VERSION 1
-diff -NurpP --minimal linux-3.0-rc5/fs/ocfs2/file.c linux-3.0-rc5-vs2.3.1-pre3/fs/ocfs2/file.c
---- linux-3.0-rc5/fs/ocfs2/file.c 2011-07-01 11:14:20.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/ocfs2/file.c 2011-06-10 22:43:33.000000000 +0200
-@@ -1111,7 +1111,7 @@ int ocfs2_setattr(struct dentry *dentry,
+diff -NurpP --minimal linux-3.10.53/fs/ocfs2/file.c linux-3.10.53-vs2.3.6.8/fs/ocfs2/file.c
+--- linux-3.10.53/fs/ocfs2/file.c 2014-08-30 13:38:58.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/ocfs2/file.c 2014-04-22 03:48:11.000000000 +0000
+@@ -1124,7 +1124,7 @@ int ocfs2_setattr(struct dentry *dentry,
attr->ia_valid &= ~ATTR_SIZE;
#define OCFS2_VALID_ATTRS (ATTR_ATIME | ATTR_MTIME | ATTR_CTIME | ATTR_SIZE \
if (!(attr->ia_valid & OCFS2_VALID_ATTRS))
return 0;
-diff -NurpP --minimal linux-3.0-rc5/fs/ocfs2/inode.c linux-3.0-rc5-vs2.3.1-pre3/fs/ocfs2/inode.c
---- linux-3.0-rc5/fs/ocfs2/inode.c 2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/ocfs2/inode.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/fs/ocfs2/inode.c linux-3.10.53-vs2.3.6.8/fs/ocfs2/inode.c
+--- linux-3.10.53/fs/ocfs2/inode.c 2013-05-31 13:45:24.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/ocfs2/inode.c 2013-08-22 20:29:59.000000000 +0000
@@ -28,6 +28,7 @@
#include <linux/highmem.h>
#include <linux/pagemap.h>
#include <asm/byteorder.h>
-@@ -78,11 +79,13 @@ void ocfs2_set_inode_flags(struct inode
+@@ -78,11 +79,13 @@ void ocfs2_set_inode_flags(struct inode
{
unsigned int flags = OCFS2_I(inode)->ip_attr;
if (flags & OCFS2_SYNC_FL)
inode->i_flags |= S_SYNC;
-@@ -92,25 +95,44 @@ void ocfs2_set_inode_flags(struct inode
+@@ -92,25 +95,44 @@ void ocfs2_set_inode_flags(struct inode
inode->i_flags |= S_NOATIME;
if (flags & OCFS2_DIRSYNC_FL)
inode->i_flags |= S_DIRSYNC;
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);
-- inode->i_uid = le32_to_cpu(fe->i_uid);
-- inode->i_gid = le32_to_cpu(fe->i_gid);
+- i_uid_write(inode, le32_to_cpu(fe->i_uid));
+- i_gid_write(inode, le32_to_cpu(fe->i_gid));
+ uid = le32_to_cpu(fe->i_uid);
+ gid = le32_to_cpu(fe->i_gid);
-+ 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,
-+ /* le16_to_cpu(raw_inode->i_raw_tag)i */ 0);
++ 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,
++ /* le16_to_cpu(raw_inode->i_raw_tag) */ 0));
/* Fast symlinks will have i_size but no allocated clusters. */
- if (S_ISLNK(inode->i_mode) && !fe->i_clusters)
-diff -NurpP --minimal linux-3.0-rc5/fs/ocfs2/inode.h linux-3.0-rc5-vs2.3.1-pre3/fs/ocfs2/inode.h
---- linux-3.0-rc5/fs/ocfs2/inode.h 2011-01-05 21:50:26.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/ocfs2/inode.h 2011-06-10 22:11:24.000000000 +0200
-@@ -151,6 +151,7 @@ struct buffer_head *ocfs2_bread(struct i
+ if (S_ISLNK(inode->i_mode) && !fe->i_clusters) {
+diff -NurpP --minimal linux-3.10.53/fs/ocfs2/inode.h linux-3.10.53-vs2.3.6.8/fs/ocfs2/inode.h
+--- linux-3.10.53/fs/ocfs2/inode.h 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/ocfs2/inode.h 2013-08-22 20:29:59.000000000 +0000
+@@ -152,6 +152,7 @@ struct buffer_head *ocfs2_bread(struct i
void ocfs2_set_inode_flags(struct inode *inode);
void ocfs2_get_inode_flags(struct ocfs2_inode_info *oi);
static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode)
{
-diff -NurpP --minimal linux-3.0-rc5/fs/ocfs2/ioctl.c linux-3.0-rc5-vs2.3.1-pre3/fs/ocfs2/ioctl.c
---- linux-3.0-rc5/fs/ocfs2/ioctl.c 2011-07-01 11:14:20.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/ocfs2/ioctl.c 2011-06-10 22:11:24.000000000 +0200
-@@ -78,7 +78,41 @@ static int ocfs2_get_inode_attr(struct i
+diff -NurpP --minimal linux-3.10.53/fs/ocfs2/ioctl.c linux-3.10.53-vs2.3.6.8/fs/ocfs2/ioctl.c
+--- linux-3.10.53/fs/ocfs2/ioctl.c 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/ocfs2/ioctl.c 2013-08-22 20:29:59.000000000 +0000
+@@ -76,7 +76,41 @@ static int ocfs2_get_inode_attr(struct i
return status;
}
unsigned mask)
{
struct ocfs2_inode_info *ocfs2_inode = OCFS2_I(inode);
-@@ -103,6 +137,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.");
handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS);
if (IS_ERR(handle)) {
status = PTR_ERR(handle);
-@@ -880,6 +919,7 @@ bail:
+@@ -881,6 +920,7 @@ bail:
return status;
}
+
long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
- struct inode *inode = filp->f_path.dentry->d_inode;
-diff -NurpP --minimal linux-3.0-rc5/fs/ocfs2/namei.c linux-3.0-rc5-vs2.3.1-pre3/fs/ocfs2/namei.c
---- linux-3.0-rc5/fs/ocfs2/namei.c 2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/ocfs2/namei.c 2011-06-10 22:11:24.000000000 +0200
+ struct inode *inode = file_inode(filp);
+diff -NurpP --minimal linux-3.10.53/fs/ocfs2/namei.c linux-3.10.53-vs2.3.6.8/fs/ocfs2/namei.c
+--- linux-3.10.53/fs/ocfs2/namei.c 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/ocfs2/namei.c 2013-08-22 20:29:59.000000000 +0000
@@ -41,6 +41,7 @@
#include <linux/slab.h>
#include <linux/highmem.h>
#include <cluster/masklog.h>
-@@ -477,6 +478,7 @@ static int __ocfs2_mknod_locked(struct i
+@@ -475,6 +476,7 @@ static int __ocfs2_mknod_locked(struct i
struct ocfs2_dinode *fe = NULL;
struct ocfs2_extent_list *fel;
u16 feat;
-+ tag_t tag;
++ ktag_t ktag;
*new_fe_bh = NULL;
-@@ -514,8 +516,11 @@ static int __ocfs2_mknod_locked(struct i
+@@ -512,8 +514,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(inode->i_uid);
-- fe->i_gid = cpu_to_le32(inode->i_gid);
-+
-+ tag = dx_current_fstag(osb->sb);
-+ fe->i_uid = cpu_to_le32(TAGINO_UID(DX_TAG(inode), inode->i_uid, tag));
-+ fe->i_gid = cpu_to_le32(TAGINO_GID(DX_TAG(inode), inode->i_gid, tag));
-+ inode->i_tag = tag;
+- fe->i_uid = cpu_to_le32(i_uid_read(inode));
+- fe->i_gid = cpu_to_le32(i_gid_read(inode));
++
++ 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.0-rc5/fs/ocfs2/ocfs2.h linux-3.0-rc5-vs2.3.1-pre3/fs/ocfs2/ocfs2.h
---- linux-3.0-rc5/fs/ocfs2/ocfs2.h 2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/ocfs2/ocfs2.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/fs/ocfs2/ocfs2.h linux-3.10.53-vs2.3.6.8/fs/ocfs2/ocfs2.h
+--- linux-3.10.53/fs/ocfs2/ocfs2.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/ocfs2/ocfs2.h 2013-08-22 20:29:59.000000000 +0000
@@ -272,6 +272,7 @@ enum ocfs2_mount_options
writes */
OCFS2_MOUNT_HB_NONE = 1 << 13, /* No heartbeat */
};
#define OCFS2_OSB_SOFT_RO 0x0001
-diff -NurpP --minimal linux-3.0-rc5/fs/ocfs2/ocfs2_fs.h linux-3.0-rc5-vs2.3.1-pre3/fs/ocfs2/ocfs2_fs.h
---- linux-3.0-rc5/fs/ocfs2/ocfs2_fs.h 2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/ocfs2/ocfs2_fs.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/fs/ocfs2/ocfs2_fs.h linux-3.10.53-vs2.3.6.8/fs/ocfs2/ocfs2_fs.h
+--- linux-3.10.53/fs/ocfs2/ocfs2_fs.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/ocfs2/ocfs2_fs.h 2013-08-22 20:29:59.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 */
#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.0-rc5/fs/ocfs2/super.c linux-3.0-rc5-vs2.3.1-pre3/fs/ocfs2/super.c
---- linux-3.0-rc5/fs/ocfs2/super.c 2011-07-01 11:14:20.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/ocfs2/super.c 2011-06-15 02:40:14.000000000 +0200
-@@ -184,6 +184,7 @@ enum {
+diff -NurpP --minimal linux-3.10.53/fs/ocfs2/super.c linux-3.10.53-vs2.3.6.8/fs/ocfs2/super.c
+--- linux-3.10.53/fs/ocfs2/super.c 2013-05-31 13:45:25.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/ocfs2/super.c 2013-08-22 20:29:59.000000000 +0000
+@@ -185,6 +185,7 @@ enum {
Opt_coherency_full,
Opt_resv_level,
Opt_dir_resv_level,
Opt_err,
};
-@@ -215,6 +216,9 @@ static const match_table_t tokens = {
+@@ -216,6 +217,9 @@ static const match_table_t tokens = {
{Opt_coherency_full, "coherency=full"},
{Opt_resv_level, "resv_level=%u"},
{Opt_dir_resv_level, "dir_resv_level=%u"},
if (ocfs2_mount_local(osb))
snprintf(nodestr, sizeof(nodestr), "local");
else
-@@ -1506,6 +1520,20 @@ static int ocfs2_parse_options(struct su
+@@ -1504,6 +1518,20 @@ static int ocfs2_parse_options(struct su
option < OCFS2_MAX_RESV_LEVEL)
mopt->dir_resv_level = option;
break;
default:
mlog(ML_ERROR,
"Unrecognized mount option \"%s\" "
-diff -NurpP --minimal linux-3.0-rc5/fs/open.c linux-3.0-rc5-vs2.3.1-pre3/fs/open.c
---- linux-3.0-rc5/fs/open.c 2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/open.c 2011-06-10 22:11:24.000000000 +0200
-@@ -30,6 +30,11 @@
- #include <linux/fs_struct.h>
+diff -NurpP --minimal linux-3.10.53/fs/open.c linux-3.10.53-vs2.3.6.8/fs/open.c
+--- linux-3.10.53/fs/open.c 2014-08-30 13:38:58.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/open.c 2014-06-12 11:14:28.000000000 +0000
+@@ -31,6 +31,11 @@
#include <linux/ima.h>
#include <linux/dnotify.h>
+ #include <linux/compat.h>
+#include <linux/vs_base.h>
+#include <linux/vs_limit.h>
+#include <linux/vs_tag.h>
#include "internal.h"
-@@ -494,6 +499,12 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, cons
- error = user_path_at(dfd, filename, LOOKUP_FOLLOW, &path);
- if (error)
- goto out;
-+
+@@ -67,6 +72,11 @@ long vfs_truncate(struct path *path, lof
+ struct inode *inode;
+ long error;
+
+#ifdef CONFIG_VSERVER_COWBL
-+ error = cow_check_and_break(&path);
++ error = cow_check_and_break(path);
+ if (error)
-+ goto dput_and_out;
++ goto out;
+#endif
- inode = path.dentry->d_inode;
+ inode = path->dentry->d_inode;
- error = mnt_want_write(path.mnt);
-@@ -531,11 +542,11 @@ static int chown_common(struct path *pat
- newattrs.ia_valid = ATTR_CTIME;
- if (user != (uid_t) -1) {
+ /* For directories it's -EISDIR, for other non-regulars - -EINVAL */
+@@ -504,6 +514,13 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, cons
+ unsigned int lookup_flags = LOOKUP_FOLLOW;
+ retry:
+ error = user_path_at(dfd, filename, lookup_flags, &path);
++#ifdef CONFIG_VSERVER_COWBL
++ if (!error) {
++ error = cow_check_and_break(&path);
++ if (error)
++ path_put(&path);
++ }
++#endif
+ if (!error) {
+ error = chmod_common(&path, mode);
+ path_put(&path);
+@@ -536,13 +553,15 @@ static int chown_common(struct path *pat
+ if (!uid_valid(uid))
+ return -EINVAL;
newattrs.ia_valid |= ATTR_UID;
-- newattrs.ia_uid = user;
-+ newattrs.ia_uid = dx_map_uid(user);
+- newattrs.ia_uid = uid;
++ 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 = group;
-+ newattrs.ia_gid = dx_map_gid(group);
+- newattrs.ia_gid = gid;
++ newattrs.ia_gid = make_kgid(&init_user_ns,
++ dx_map_gid(group));
}
if (!S_ISDIR(inode->i_mode))
newattrs.ia_valid |=
-@@ -560,6 +571,10 @@ SYSCALL_DEFINE3(chown, const char __user
+@@ -576,6 +595,18 @@ retry:
error = mnt_want_write(path.mnt);
if (error)
goto out_release;
+ error = cow_check_and_break(&path);
+ if (!error)
+#endif
- error = chown_common(&path, user, group);
- mnt_drop_write(path.mnt);
- out_release:
-@@ -587,6 +602,10 @@ SYSCALL_DEFINE5(fchownat, int, dfd, cons
- error = mnt_want_write(path.mnt);
- if (error)
- goto out_release;
+#ifdef CONFIG_VSERVER_COWBL
+ error = cow_check_and_break(&path);
+ if (!error)
+#endif
- error = chown_common(&path, user, group);
- mnt_drop_write(path.mnt);
- out_release:
-@@ -606,6 +625,10 @@ SYSCALL_DEFINE3(lchown, const char __use
- error = mnt_want_write(path.mnt);
- if (error)
- goto out_release;
+#ifdef CONFIG_VSERVER_COWBL
+ error = cow_check_and_break(&path);
+ if (!error)
error = chown_common(&path, user, group);
mnt_drop_write(path.mnt);
out_release:
-@@ -857,6 +880,7 @@ static void __put_unused_fd(struct files
- __FD_CLR(fd, fdt->open_fds);
- if (fd < files->next_fd)
- files->next_fd = fd;
-+ vx_openfd_dec(fd);
- }
-
- void put_unused_fd(unsigned int fd)
-diff -NurpP --minimal linux-3.0-rc5/fs/proc/array.c linux-3.0-rc5-vs2.3.1-pre3/fs/proc/array.c
---- linux-3.0-rc5/fs/proc/array.c 2011-07-01 11:14:20.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/proc/array.c 2011-06-10 22:11:24.000000000 +0200
-@@ -81,6 +81,8 @@
- #include <linux/pid_namespace.h>
+diff -NurpP --minimal linux-3.10.53/fs/proc/array.c linux-3.10.53-vs2.3.6.8/fs/proc/array.c
+--- linux-3.10.53/fs/proc/array.c 2013-05-31 13:45:25.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/proc/array.c 2013-08-22 20:29:59.000000000 +0000
+@@ -82,6 +82,8 @@
#include <linux/ptrace.h>
#include <linux/tracehook.h>
+ #include <linux/user_namespace.h>
+#include <linux/vs_context.h>
+#include <linux/vs_network.h>
#include <asm/pgtable.h>
#include <asm/processor.h>
-@@ -170,6 +172,9 @@ static inline void task_state(struct seq
+@@ -173,6 +175,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;
+
tpid = 0;
if (pid_alive(p)) {
- struct task_struct *tracer = tracehook_tracer_task(p);
-@@ -287,7 +292,7 @@ static inline void task_sig(struct seq_f
+ struct task_struct *tracer = ptrace_parent(p);
+@@ -297,7 +302,7 @@ static inline void task_sig(struct seq_f
}
static void render_cap_t(struct seq_file *m, const char *header,
{
unsigned __capi;
-@@ -312,10 +317,11 @@ static inline void task_cap(struct seq_f
- cap_bset = cred->cap_bset;
- rcu_read_unlock();
+@@ -331,10 +336,11 @@ static inline void task_cap(struct seq_f
+ NORM_CAPS(cap_effective);
+ NORM_CAPS(cap_bset);
- render_cap_t(m, "CapInh:\t", &cap_inheritable);
- render_cap_t(m, "CapPrm:\t", &cap_permitted);
+ render_cap_t(m, "CapBnd:\t", p->vx_info, &cap_bset);
}
- static inline void task_context_switch_counts(struct seq_file *m,
-@@ -337,6 +343,42 @@ static void task_cpus_allowed(struct seq
+ static inline void task_seccomp(struct seq_file *m, struct task_struct *p)
+@@ -363,6 +369,42 @@ static void task_cpus_allowed(struct seq
seq_putc(m, '\n');
}
int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
struct pid *pid, struct task_struct *task)
{
-@@ -353,6 +395,7 @@ int proc_pid_status(struct seq_file *m,
- task_cap(m, task);
+@@ -380,6 +422,7 @@ int proc_pid_status(struct seq_file *m,
+ task_seccomp(m, task);
task_cpus_allowed(m, task);
cpuset_task_status_allowed(m, task);
+ task_vs_id(m, task);
task_context_switch_counts(m, task);
return 0;
}
-@@ -462,6 +505,17 @@ static int do_task_stat(struct seq_file
+@@ -489,6 +532,17 @@ static int do_task_stat(struct seq_file
/* convert nsec -> ticks */
start_time = nsec_to_clock_t(start_time);
+ start_time = 0;
+ }
+
- seq_printf(m, "%d (%s) %c %d %d %d %d %d %u %lu \
- %lu %lu %lu %lu %lu %ld %ld %ld %ld %d 0 %llu %lu %ld %lu %lu %lu %lu %lu \
- %lu %lu %lu %lu %lu %lu %lu %lu %d %d %u %u %llu %lu %ld\n",
-diff -NurpP --minimal linux-3.0-rc5/fs/proc/base.c linux-3.0-rc5-vs2.3.1-pre3/fs/proc/base.c
---- linux-3.0-rc5/fs/proc/base.c 2011-07-01 11:14:20.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/proc/base.c 2011-06-22 12:39:15.000000000 +0200
-@@ -83,6 +83,8 @@
- #include <linux/pid_namespace.h>
- #include <linux/fs_struct.h>
+ 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.10.53/fs/proc/base.c linux-3.10.53-vs2.3.6.8/fs/proc/base.c
+--- linux-3.10.53/fs/proc/base.c 2014-08-30 13:38:58.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/proc/base.c 2014-04-22 03:48:11.000000000 +0000
+@@ -87,6 +87,8 @@
#include <linux/slab.h>
+ #include <linux/flex_array.h>
+ #include <linux/posix-timers.h>
+#include <linux/vs_context.h>
+#include <linux/vs_network.h>
#ifdef CONFIG_HARDWALL
#include <asm/hardwall.h>
#endif
-@@ -1102,11 +1104,16 @@ static ssize_t oom_adjust_write(struct f
- goto err_task_lock;
- }
+@@ -976,11 +978,15 @@ static ssize_t oom_adj_write(struct file
+ oom_adj = (oom_adj * OOM_SCORE_ADJ_MAX) / -OOM_DISABLE;
-- if (oom_adjust < task->signal->oom_adj && !capable(CAP_SYS_RESOURCE)) {
-+ if (oom_adjust < task->signal->oom_adj &&
-+ !vx_capable(CAP_SYS_RESOURCE, VXC_OOM_ADJUST)) {
+ if (oom_adj < task->signal->oom_score_adj &&
+- !capable(CAP_SYS_RESOURCE)) {
++ !vx_capable(CAP_SYS_RESOURCE, VXC_OOM_ADJUST)) {
err = -EACCES;
goto err_sighand;
}
+ /* prevent guest processes from circumventing the oom killer */
-+ if (vx_current_xid() && (oom_adjust == OOM_DISABLE))
-+ oom_adjust = OOM_ADJUST_MIN;
++ if (vx_current_xid() && (oom_adj == OOM_DISABLE))
++ oom_adj = OOM_ADJUST_MIN;
+
- if (oom_adjust != task->signal->oom_adj) {
- if (oom_adjust == OOM_DISABLE)
- atomic_inc(&task->mm->oom_disable_count);
-@@ -1275,7 +1282,7 @@ static ssize_t proc_loginuid_write(struc
- ssize_t length;
- uid_t loginuid;
-
-- if (!capable(CAP_AUDIT_CONTROL))
-+ if (!vx_capable(CAP_AUDIT_CONTROL, VXC_AUDIT_CONTROL))
- return -EPERM;
-
- rcu_read_lock();
-@@ -1722,6 +1729,8 @@ struct inode *proc_pid_make_inode(struct
+ /*
+ * /proc/pid/oom_adj is provided for legacy purposes, ask users to use
+ * /proc/pid/oom_score_adj instead.
+@@ -1559,6 +1565,8 @@ struct inode *proc_pid_make_inode(struct
inode->i_gid = cred->egid;
rcu_read_unlock();
}
+ /* procfs is xid tagged */
-+ inode->i_tag = (tag_t)vx_task_xid(task);
++ i_tag_write(inode, (vtag_t)vx_task_xid(task));
security_task_to_inode(task, inode);
out:
-@@ -1758,6 +1767,8 @@ int pid_getattr(struct vfsmount *mnt, st
+@@ -1604,6 +1612,8 @@ int pid_getattr(struct vfsmount *mnt, st
/* dentry stuff */
/*
* Exceptional case: normally we are not allowed to unhash a busy
* directory. In this case, however, we can do it - no aliasing problems
-@@ -1786,6 +1797,12 @@ int pid_revalidate(struct dentry *dentry
+@@ -1632,6 +1642,12 @@ int pid_revalidate(struct dentry *dentry
task = get_proc_task(inode);
if (task) {
if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
task_dumpable(task)) {
rcu_read_lock();
-@@ -1802,6 +1819,7 @@ int pid_revalidate(struct dentry *dentry
+@@ -1648,6 +1664,7 @@ int pid_revalidate(struct dentry *dentry
put_task_struct(task);
return 1;
}
d_drop(dentry);
return 0;
}
-@@ -2283,6 +2301,13 @@ static struct dentry *proc_pident_lookup
+@@ -2197,6 +2214,13 @@ static struct dentry *proc_pident_lookup
if (!task)
goto out_no_task;
/*
* Yes, it does not scale. And it should not. Don't add
* new entries into /proc/<tgid>/ without very good reasons.
-@@ -2668,7 +2693,7 @@ out_iput:
- static struct dentry *proc_base_lookup(struct inode *dir, struct dentry *dentry)
- {
- struct dentry *error;
-- struct task_struct *task = get_proc_task(dir);
-+ struct task_struct *task = get_proc_task_real(dir);
- const struct pid_entry *p, *last;
-
- error = ERR_PTR(-ENOENT);
-@@ -2762,6 +2787,9 @@ static int proc_pid_personality(struct s
+@@ -2631,6 +2655,9 @@ static int proc_pid_personality(struct s
static const struct file_operations proc_task_operations;
static const struct inode_operations proc_task_inode_operations;
static const struct pid_entry tgid_base_stuff[] = {
DIR("task", S_IRUGO|S_IXUGO, proc_task_inode_operations, proc_task_operations),
DIR("fd", S_IRUSR|S_IXUSR, proc_fd_inode_operations, proc_fd_operations),
-@@ -2825,6 +2853,8 @@ static const struct pid_entry tgid_base_
+@@ -2697,6 +2724,8 @@ static const struct pid_entry tgid_base_
#ifdef CONFIG_CGROUPS
REG("cgroup", S_IRUGO, proc_cgroup_operations),
#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),
- REG("oom_adj", S_IRUGO|S_IWUSR, proc_oom_adjust_operations),
+ REG("oom_adj", S_IRUGO|S_IWUSR, proc_oom_adj_operations),
REG("oom_score_adj", S_IRUGO|S_IWUSR, proc_oom_score_adj_operations),
-@@ -2844,6 +2874,7 @@ static const struct pid_entry tgid_base_
- #ifdef CONFIG_HARDWALL
- INF("hardwall", S_IRUGO, proc_pid_hardwall),
- #endif
-+ ONE("nsproxy", S_IRUGO, proc_pid_nsproxy),
- };
-
- static int proc_tgid_base_readdir(struct file * filp,
-@@ -3036,7 +3067,7 @@ retry:
+@@ -2911,7 +2940,7 @@ retry:
iter.task = NULL;
pid = find_ge_pid(iter.tgid, ns);
if (pid) {
iter.task = pid_task(pid, PIDTYPE_PID);
/* What we to know is if the pid we have find is the
* pid of a thread_group_leader. Testing for task
-@@ -3066,7 +3097,7 @@ static int proc_pid_fill_cache(struct fi
+@@ -2941,7 +2970,7 @@ static int proc_pid_fill_cache(struct fi
struct tgid_iter iter)
{
char name[PROC_NUMBUF];
return proc_fill_cache(filp, dirent, filldir, name, len,
proc_pid_instantiate, iter.task, NULL);
}
-@@ -3083,7 +3114,7 @@ int proc_pid_readdir(struct file * filp,
- goto out_no_task;
- nr = filp->f_pos - FIRST_PROCESS_ENTRY;
+@@ -2982,6 +3011,8 @@ int proc_pid_readdir(struct file * filp,
+ __filldir = fake_filldir;
-- reaper = get_proc_task(filp->f_path.dentry->d_inode);
-+ reaper = get_proc_task_real(filp->f_path.dentry->d_inode);
- if (!reaper)
- goto out_no_task;
-
-@@ -3100,6 +3131,8 @@ int proc_pid_readdir(struct file * filp,
- iter.task;
- iter.tgid += 1, iter = next_tgid(ns, iter)) {
filp->f_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_pid_fill_cache(filp, dirent, __filldir, iter) < 0) {
put_task_struct(iter.task);
goto out;
-@@ -3253,6 +3286,8 @@ static struct dentry *proc_task_lookup(s
+@@ -3074,6 +3105,7 @@ static const struct pid_entry tid_base_s
+ 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_tid_base_readdir(struct file * filp,
+@@ -3142,6 +3174,8 @@ static struct dentry *proc_task_lookup(s
tid = name_to_int(dentry);
if (tid == ~0U)
goto out;
ns = dentry->d_sb->s_fs_info;
rcu_read_lock();
-diff -NurpP --minimal linux-3.0-rc5/fs/proc/generic.c linux-3.0-rc5-vs2.3.1-pre3/fs/proc/generic.c
---- linux-3.0-rc5/fs/proc/generic.c 2011-07-01 11:14:20.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/proc/generic.c 2011-06-10 22:11:24.000000000 +0200
-@@ -22,6 +22,7 @@
+diff -NurpP --minimal linux-3.10.53/fs/proc/generic.c linux-3.10.53-vs2.3.6.8/fs/proc/generic.c
+--- linux-3.10.53/fs/proc/generic.c 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/proc/generic.c 2013-08-22 20:29:59.000000000 +0000
+@@ -23,6 +23,7 @@
#include <linux/bitops.h>
#include <linux/spinlock.h>
#include <linux/completion.h>
#include <asm/uaccess.h>
#include "internal.h"
-@@ -424,11 +425,15 @@ struct dentry *proc_lookup_de(struct pro
+@@ -203,6 +204,8 @@ struct dentry *proc_lookup_de(struct pro
for (de = de->subdir; de ; de = de->next) {
if (de->namelen != dentry->d_name.len)
continue;
if (!memcmp(dentry->d_name.name, de->name, de->namelen)) {
pde_get(de);
spin_unlock(&proc_subdir_lock);
- error = -EINVAL;
- inode = proc_get_inode(dir->i_sb, de);
+@@ -211,6 +214,8 @@ struct dentry *proc_lookup_de(struct pro
+ return ERR_PTR(-ENOMEM);
+ d_set_d_op(dentry, &proc_dentry_operations);
+ d_add(dentry, inode);
+ /* generic proc entries belong to the host */
-+ inode->i_tag = 0;
- goto out_unlock;
++ i_tag_write(inode, 0);
+ return NULL;
}
}
-@@ -506,6 +511,8 @@ int proc_readdir_de(struct proc_dir_entr
+@@ -279,6 +284,8 @@ int proc_readdir_de(struct proc_dir_entr
/* filldir passes info to user space */
pde_get(de);
spin_unlock(&proc_subdir_lock);
if (filldir(dirent, de->name, de->namelen, filp->f_pos,
de->low_ino, de->mode >> 12) < 0) {
-@@ -513,6 +520,7 @@ int proc_readdir_de(struct proc_dir_entr
+@@ -286,6 +293,7 @@ int proc_readdir_de(struct proc_dir_entr
goto out;
}
spin_lock(&proc_subdir_lock);
filp->f_pos++;
next = de->next;
pde_put(de);
-@@ -627,6 +635,7 @@ static struct proc_dir_entry *__proc_cre
+@@ -395,6 +403,7 @@ static struct proc_dir_entry *__proc_cre
+ ent->namelen = len;
+ ent->mode = mode;
ent->nlink = nlink;
- atomic_set(&ent->count, 1);
- ent->pde_users = 0;
+ ent->vx_flags = IATTR_PROC_DEFAULT;
+ atomic_set(&ent->count, 1);
spin_lock_init(&ent->pde_unload_lock);
- ent->pde_unload_completion = NULL;
INIT_LIST_HEAD(&ent->pde_openers);
-@@ -650,7 +659,8 @@ struct proc_dir_entry *proc_symlink(cons
+@@ -418,7 +427,8 @@ struct proc_dir_entry *proc_symlink(cons
kfree(ent->data);
kfree(ent);
ent = NULL;
} else {
kfree(ent);
ent = NULL;
-diff -NurpP --minimal linux-3.0-rc5/fs/proc/inode.c linux-3.0-rc5-vs2.3.1-pre3/fs/proc/inode.c
---- linux-3.0-rc5/fs/proc/inode.c 2011-07-01 11:14:20.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/proc/inode.c 2011-06-10 22:11:24.000000000 +0200
-@@ -442,6 +442,8 @@ struct inode *proc_get_inode(struct supe
+diff -NurpP --minimal linux-3.10.53/fs/proc/inode.c linux-3.10.53-vs2.3.6.8/fs/proc/inode.c
+--- linux-3.10.53/fs/proc/inode.c 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/proc/inode.c 2013-08-22 20:29:59.000000000 +0000
+@@ -387,6 +387,8 @@ struct inode *proc_get_inode(struct supe
inode->i_uid = de->uid;
inode->i_gid = de->gid;
}
if (de->size)
inode->i_size = de->size;
if (de->nlink)
-diff -NurpP --minimal linux-3.0-rc5/fs/proc/internal.h linux-3.0-rc5-vs2.3.1-pre3/fs/proc/internal.h
---- linux-3.0-rc5/fs/proc/internal.h 2011-07-01 11:14:20.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/proc/internal.h 2011-06-10 22:11:24.000000000 +0200
-@@ -10,6 +10,7 @@
- */
-
- #include <linux/proc_fs.h>
+diff -NurpP --minimal linux-3.10.53/fs/proc/internal.h linux-3.10.53-vs2.3.6.8/fs/proc/internal.h
+--- linux-3.10.53/fs/proc/internal.h 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/proc/internal.h 2013-08-22 21:52:30.000000000 +0000
+@@ -14,6 +14,7 @@
+ #include <linux/spinlock.h>
+ #include <linux/atomic.h>
+ #include <linux/binfmts.h>
+#include <linux/vs_pid.h>
- extern struct proc_dir_entry proc_root;
- #ifdef CONFIG_PROC_SYSCTL
-@@ -51,6 +52,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,16 +52,23 @@ 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_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);
+ };
- extern const struct file_operations proc_maps_operations;
-@@ -76,11 +80,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;
+@@ -92,11 +101,16 @@ static inline struct pid *proc_pid(struc
return PROC_I(inode)->pid;
}
+ 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.0-rc5/fs/proc/loadavg.c linux-3.0-rc5-vs2.3.1-pre3/fs/proc/loadavg.c
---- linux-3.0-rc5/fs/proc/loadavg.c 2009-09-10 15:26:23.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/proc/loadavg.c 2011-06-10 22:11:24.000000000 +0200
+ int dumpable = 0;
+@@ -155,6 +169,8 @@ extern int proc_pid_status(struct seq_fi
+ struct pid *, struct task_struct *);
+ extern int proc_pid_statm(struct seq_file *, struct pid_namespace *,
+ struct pid *, struct task_struct *);
++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.10.53/fs/proc/loadavg.c linux-3.10.53-vs2.3.6.8/fs/proc/loadavg.c
+--- linux-3.10.53/fs/proc/loadavg.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/proc/loadavg.c 2013-08-22 20:30:00.000000000 +0000
@@ -12,15 +12,27 @@
static int loadavg_proc_show(struct seq_file *m, void *v)
task_active_pid_ns(current)->last_pid);
return 0;
}
-diff -NurpP --minimal linux-3.0-rc5/fs/proc/meminfo.c linux-3.0-rc5-vs2.3.1-pre3/fs/proc/meminfo.c
---- linux-3.0-rc5/fs/proc/meminfo.c 2011-03-15 18:07:33.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/proc/meminfo.c 2011-06-10 22:11:24.000000000 +0200
-@@ -39,7 +39,8 @@ static int meminfo_proc_show(struct seq_
+diff -NurpP --minimal linux-3.10.53/fs/proc/meminfo.c linux-3.10.53-vs2.3.6.8/fs/proc/meminfo.c
+--- linux-3.10.53/fs/proc/meminfo.c 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/proc/meminfo.c 2013-08-22 20:30:00.000000000 +0000
+@@ -40,7 +40,8 @@ static int meminfo_proc_show(struct seq_
allowed = ((totalram_pages - hugetlb_total_pages())
* sysctl_overcommit_ratio / 100) + total_swap_pages;
- cached = global_page_state(NR_FILE_PAGES) -
+ cached = vx_flags(VXF_VIRT_MEM, 0) ?
+ vx_vsi_cached(&i) : global_page_state(NR_FILE_PAGES) -
- total_swapcache_pages - i.bufferram;
+ total_swapcache_pages() - i.bufferram;
if (cached < 0)
cached = 0;
-diff -NurpP --minimal linux-3.0-rc5/fs/proc/root.c linux-3.0-rc5-vs2.3.1-pre3/fs/proc/root.c
---- linux-3.0-rc5/fs/proc/root.c 2011-07-01 11:14:20.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/proc/root.c 2011-06-22 12:39:15.000000000 +0200
-@@ -18,9 +18,14 @@
- #include <linux/bitops.h>
+diff -NurpP --minimal linux-3.10.53/fs/proc/root.c linux-3.10.53-vs2.3.6.8/fs/proc/root.c
+--- linux-3.10.53/fs/proc/root.c 2014-08-30 13:38:58.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/proc/root.c 2013-11-13 17:19:37.000000000 +0000
+@@ -20,9 +20,14 @@
#include <linux/mount.h>
#include <linux/pid_namespace.h>
+ #include <linux/parser.h>
+#include <linux/vserver/inode.h>
#include "internal.h"
static int proc_test_super(struct super_block *sb, void *data)
{
return sb->s_fs_info == data;
-@@ -125,6 +130,7 @@ void __init proc_root_init(void)
+@@ -111,7 +116,8 @@ static struct dentry *proc_mount(struct
+ options = data;
+
+ if (!current_user_ns()->may_mount_proc ||
+- !ns_capable(ns->user_ns, CAP_SYS_ADMIN))
++ !vx_ns_capable(ns->user_ns,
++ CAP_SYS_ADMIN, VXC_SECURE_MOUNT))
+ return ERR_PTR(-EPERM);
+ }
+
+@@ -185,6 +191,7 @@ void __init proc_root_init(void)
#endif
proc_mkdir("bus", NULL);
proc_sys_init();
}
static int proc_root_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat
-@@ -193,6 +199,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,
+ .vx_flags = IATTR_ADMIN | IATTR_WATCH,
+ .name = "/proc",
};
- int pid_ns_prepare_proc(struct pid_namespace *ns)
-diff -NurpP --minimal linux-3.0-rc5/fs/proc/uptime.c linux-3.0-rc5-vs2.3.1-pre3/fs/proc/uptime.c
---- linux-3.0-rc5/fs/proc/uptime.c 2009-12-03 20:02:53.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/proc/uptime.c 2011-06-10 22:11:24.000000000 +0200
-@@ -4,22 +4,22 @@
- #include <linux/sched.h>
+diff -NurpP --minimal linux-3.10.53/fs/proc/self.c linux-3.10.53-vs2.3.6.8/fs/proc/self.c
+--- linux-3.10.53/fs/proc/self.c 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/proc/self.c 2013-08-23 00:07:45.000000000 +0000
+@@ -2,6 +2,7 @@
+ #include <linux/namei.h>
+ #include <linux/slab.h>
+ #include <linux/pid_namespace.h>
++#include <linux/vserver/inode.h>
+ #include "internal.h"
+
+ /*
+@@ -62,6 +63,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.10.53/fs/proc/stat.c linux-3.10.53-vs2.3.6.8/fs/proc/stat.c
+--- linux-3.10.53/fs/proc/stat.c 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/proc/stat.c 2013-08-22 20:30:00.000000000 +0000
+@@ -9,8 +9,10 @@
+ #include <linux/slab.h>
+ #include <linux/time.h>
+ #include <linux/irqnr.h>
++#include <linux/vserver/cvirt.h>
+ #include <asm/cputime.h>
+ #include <linux/tick.h>
++#include <linux/cpuset.h>
+
+ #ifndef arch_irq_stat_cpu
+ #define arch_irq_stat_cpu(cpu) 0
+@@ -87,14 +89,26 @@ static int show_stat(struct seq_file *p,
+ u64 sum_softirq = 0;
+ unsigned int per_softirq_sums[NR_SOFTIRQS] = {0};
+ struct timespec boottime;
++ cpumask_var_t cpus_allowed;
++ bool virt_cpu = vx_flags(VXF_VIRT_CPU, 0);
+
+ user = nice = system = idle = iowait =
+ irq = softirq = steal = 0;
+ guest = guest_nice = 0;
+ getboottime(&boottime);
++
++ if (vx_flags(VXF_VIRT_UPTIME, 0))
++ vx_vsi_boottime(&boottime);
++
++ if (virt_cpu)
++ cpuset_cpus_allowed(current, cpus_allowed);
++
+ jif = boottime.tv_sec;
+
+ for_each_possible_cpu(i) {
++ if (virt_cpu && !cpumask_test_cpu(i, cpus_allowed))
++ continue;
++
+ user += kcpustat_cpu(i).cpustat[CPUTIME_USER];
+ nice += kcpustat_cpu(i).cpustat[CPUTIME_NICE];
+ system += kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM];
+@@ -131,6 +145,9 @@ static int show_stat(struct seq_file *p,
+ seq_putc(p, '\n');
+
+ for_each_online_cpu(i) {
++ if (virt_cpu && !cpumask_test_cpu(i, cpus_allowed))
++ continue;
++
+ /* 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.10.53/fs/proc/uptime.c linux-3.10.53-vs2.3.6.8/fs/proc/uptime.c
+--- linux-3.10.53/fs/proc/uptime.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/proc/uptime.c 2013-08-22 20:30:00.000000000 +0000
+@@ -5,6 +5,7 @@
#include <linux/seq_file.h>
#include <linux/time.h>
--#include <linux/kernel_stat.h>
+ #include <linux/kernel_stat.h>
+#include <linux/vserver/cvirt.h>
#include <asm/cputime.h>
static int uptime_proc_show(struct seq_file *m, void *v)
- {
- struct timespec uptime;
- struct timespec idle;
-- int i;
-- cputime_t idletime = cputime_zero;
--
-- for_each_possible_cpu(i)
-- idletime = cputime64_add(idletime, kstat_cpu(i).cpustat.idle);
-+ cputime_t idletime = cputime_add(init_task.utime, init_task.stime);
-
- do_posix_clock_monotonic_gettime(&uptime);
- monotonic_to_bootbased(&uptime);
- cputime_to_timespec(idletime, &idle);
+@@ -25,6 +26,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;
+
+ if (vx_flags(VXF_VIRT_UPTIME, 0))
+ vx_vsi_uptime(&uptime, &idle);
seq_printf(m, "%lu.%02lu %lu.%02lu\n",
(unsigned long) uptime.tv_sec,
(uptime.tv_nsec / (NSEC_PER_SEC / 100)),
-diff -NurpP --minimal linux-3.0-rc5/fs/quota/dquot.c linux-3.0-rc5-vs2.3.1-pre3/fs/quota/dquot.c
---- linux-3.0-rc5/fs/quota/dquot.c 2011-07-01 11:14:20.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/quota/dquot.c 2011-06-10 22:11:24.000000000 +0200
-@@ -1548,6 +1548,9 @@ int __dquot_alloc_space(struct inode *in
+diff -NurpP --minimal linux-3.10.53/fs/proc_namespace.c linux-3.10.53-vs2.3.6.8/fs/proc_namespace.c
+--- linux-3.10.53/fs/proc_namespace.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/proc_namespace.c 2013-08-22 20:30:00.000000000 +0000
+@@ -44,6 +44,8 @@ static int show_sb_opts(struct seq_file
+ { MS_SYNCHRONOUS, ",sync" },
+ { MS_DIRSYNC, ",dirsync" },
+ { MS_MANDLOCK, ",mand" },
++ { MS_TAGGED, ",tag" },
++ { MS_NOTAGCHECK, ",notagcheck" },
+ { 0, NULL }
+ };
+ const struct proc_fs_info *fs_infop;
+@@ -80,6 +82,40 @@ static inline void mangle(struct seq_fil
+ seq_escape(m, s, " \t\n\\");
+ }
+
++#ifdef CONFIG_VSERVER_EXTRA_MNT_CHECK
++
++static int mnt_is_reachable(struct vfsmount *vfsmnt)
++{
++ struct path root;
++ struct dentry *point;
++ struct mount *mnt = real_mount(vfsmnt);
++ struct mount *root_mnt;
++ int ret;
++
++ if (mnt == mnt->mnt_ns->root)
++ return 1;
++
++ br_read_lock(&vfsmount_lock);
++ root = current->fs->root;
++ root_mnt = real_mount(root.mnt);
++ point = root.dentry;
++
++ while ((mnt != mnt->mnt_parent) && (mnt != root_mnt)) {
++ point = mnt->mnt_mountpoint;
++ mnt = mnt->mnt_parent;
++ }
++
++ ret = (mnt == root_mnt) && is_subdir(point, root.dentry);
++
++ br_read_unlock(&vfsmount_lock);
++
++ return ret;
++}
++
++#else
++#define mnt_is_reachable(v) (1)
++#endif
++
+ 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 *
+ struct path mnt_path = { .dentry = mnt->mnt_root, .mnt = mnt };
+ struct super_block *sb = mnt_path.dentry->d_sb;
+
++ if (vx_flags(VXF_HIDE_MOUNT, 0))
++ return SEQ_SKIP;
++ if (!mnt_is_reachable(mnt) && !vx_check(0, VS_WATCH_P))
++ return SEQ_SKIP;
++
++ if (!vx_check(0, VS_ADMIN|VS_WATCH) &&
++ mnt == current->fs->root.mnt) {
++ seq_puts(m, "/dev/root / ");
++ goto type;
++ }
++
+ 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 *
+ seq_putc(m, ' ');
+ seq_path(m, &mnt_path, " \t\n\\");
+ seq_putc(m, ' ');
++type:
+ show_type(m, sb);
+ seq_puts(m, __mnt_is_readonly(mnt) ? " ro" : " rw");
+ err = show_sb_opts(m, sb);
+@@ -128,6 +176,11 @@ static int show_mountinfo(struct seq_fil
+ struct path root = p->root;
+ int err = 0;
+
++ if (vx_flags(VXF_HIDE_MOUNT, 0))
++ return SEQ_SKIP;
++ if (!mnt_is_reachable(mnt) && !vx_check(0, VS_WATCH_P))
++ return SEQ_SKIP;
++
+ 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
+ struct super_block *sb = mnt_path.dentry->d_sb;
+ int err = 0;
+
++ if (vx_flags(VXF_HIDE_MOUNT, 0))
++ return SEQ_SKIP;
++ if (!mnt_is_reachable(mnt) && !vx_check(0, VS_WATCH_P))
++ return SEQ_SKIP;
++
++ if (!vx_check(0, VS_ADMIN|VS_WATCH) &&
++ mnt == current->fs->root.mnt) {
++ seq_puts(m, "device /dev/root mounted on / ");
++ goto type;
++ }
++
+ /* device */
+ if (sb->s_op->show_devname) {
+ seq_puts(m, "device ");
+@@ -203,7 +267,7 @@ static int show_vfsstat(struct seq_file
+ seq_puts(m, " mounted on ");
+ seq_path(m, &mnt_path, " \t\n\\");
+ seq_putc(m, ' ');
+-
++type:
+ /* file system type */
+ seq_puts(m, "with fstype ");
+ show_type(m, sb);
+diff -NurpP --minimal linux-3.10.53/fs/quota/dquot.c linux-3.10.53-vs2.3.6.8/fs/quota/dquot.c
+--- linux-3.10.53/fs/quota/dquot.c 2014-08-30 13:38:58.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/quota/dquot.c 2014-03-12 13:18:32.000000000 +0000
+@@ -1593,6 +1593,9 @@ int __dquot_alloc_space(struct inode *in
+ struct dquot **dquots = inode->i_dquot;
int reserve = flags & DQUOT_SPACE_RESERVE;
- int nofail = flags & DQUOT_SPACE_NOFAIL;
+ 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
-@@ -1602,6 +1605,9 @@ int dquot_alloc_inode(const struct inode
- int cnt, ret = 0;
- char warntype[MAXQUOTAS];
+@@ -1648,6 +1651,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))
-@@ -1672,6 +1678,8 @@ void __dquot_free_space(struct inode *in
- char warntype[MAXQUOTAS];
+@@ -1719,6 +1725,8 @@ void __dquot_free_space(struct inode *in
+ struct dquot **dquots = inode->i_dquot;
int reserve = flags & DQUOT_SPACE_RESERVE;
+ 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)) {
-@@ -1710,6 +1718,8 @@ void dquot_free_inode(const struct inode
- unsigned int cnt;
- char warntype[MAXQUOTAS];
+@@ -1763,6 +1771,8 @@ void dquot_free_inode(const struct inode
+ struct dquot_warn warn[MAXQUOTAS];
+ struct dquot * const *dquots = inode->i_dquot;
+ 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.0-rc5/fs/quota/quota.c linux-3.0-rc5-vs2.3.1-pre3/fs/quota/quota.c
---- linux-3.0-rc5/fs/quota/quota.c 2011-03-15 18:07:34.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/quota/quota.c 2011-06-13 18:19:47.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/fs/quota/quota.c linux-3.10.53-vs2.3.6.8/fs/quota/quota.c
+--- linux-3.10.53/fs/quota/quota.c 2013-02-19 13:58:49.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/quota/quota.c 2013-08-22 20:30:00.000000000 +0000
@@ -8,6 +8,7 @@
#include <linux/fs.h>
#include <linux/namei.h>
#include <linux/slab.h>
+#include <linux/vs_context.h>
#include <asm/current.h>
- #include <asm/uaccess.h>
+ #include <linux/uaccess.h>
#include <linux/kernel.h>
-@@ -38,7 +39,7 @@ static int check_quotactl_permission(str
+@@ -37,7 +38,7 @@ static int check_quotactl_permission(str
break;
/*FALLTHROUGH*/
default:
return -EPERM;
}
-@@ -293,6 +294,46 @@ static int do_quotactl(struct super_bloc
- }
- }
+@@ -309,6 +310,46 @@ static int do_quotactl(struct super_bloc
+
+ #ifdef CONFIG_BLOCK
+#if defined(CONFIG_BLK_DEV_VROOT) || defined(CONFIG_BLK_DEV_VROOT_MODULE)
+
+
+#endif
+
- /*
- * look up a superblock on which quota ops will be performed
- * - use the name of a block device to find the superblock thereon
-@@ -310,6 +351,22 @@ static struct super_block *quotactl_bloc
+ /* 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
putname(tmp);
if (IS_ERR(bdev))
return ERR_CAST(bdev);
+#if defined(CONFIG_BLK_DEV_VROOT) || defined(CONFIG_BLK_DEV_VROOT_MODULE)
+ if (bdev && bdev->bd_inode &&
-+ imajor(bdev->bd_inode) == VROOT_MAJOR) {
++ imajor(bdev->bd_inode) == VROOT_MAJOR) {
+ struct block_device *bdnew = (void *)-EINVAL;
+
+ if (vroot_get_real_bdev)
+ bdev = bdnew;
+ }
+#endif
- sb = get_super(bdev);
- bdput(bdev);
- if (!sb)
-diff -NurpP --minimal linux-3.0-rc5/fs/reiserfs/file.c linux-3.0-rc5-vs2.3.1-pre3/fs/reiserfs/file.c
---- linux-3.0-rc5/fs/reiserfs/file.c 2011-01-05 21:50:26.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/reiserfs/file.c 2011-06-10 22:11:24.000000000 +0200
-@@ -312,4 +312,5 @@ const struct inode_operations reiserfs_f
- .listxattr = reiserfs_listxattr,
- .removexattr = reiserfs_removexattr,
- .permission = reiserfs_permission,
-+ .sync_flags = reiserfs_sync_flags,
- };
-diff -NurpP --minimal linux-3.0-rc5/fs/reiserfs/inode.c linux-3.0-rc5-vs2.3.1-pre3/fs/reiserfs/inode.c
---- linux-3.0-rc5/fs/reiserfs/inode.c 2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/reiserfs/inode.c 2011-06-10 22:11:24.000000000 +0200
-@@ -18,6 +18,7 @@
- #include <linux/writeback.h>
- #include <linux/quotaops.h>
- #include <linux/swap.h>
-+#include <linux/vs_tag.h>
+ if (quotactl_cmd_write(cmd))
+ sb = get_super_thawed(bdev);
+ else
+diff -NurpP --minimal linux-3.10.53/fs/stat.c linux-3.10.53-vs2.3.6.8/fs/stat.c
+--- linux-3.10.53/fs/stat.c 2013-05-31 13:45:25.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/stat.c 2013-08-22 20:30:00.000000000 +0000
+@@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod
+ stat->nlink = inode->i_nlink;
+ stat->uid = inode->i_uid;
+ stat->gid = inode->i_gid;
++ stat->tag = inode->i_tag;
+ stat->rdev = inode->i_rdev;
+ stat->size = i_size_read(inode);
+ stat->atime = inode->i_atime;
+diff -NurpP --minimal linux-3.10.53/fs/statfs.c linux-3.10.53-vs2.3.6.8/fs/statfs.c
+--- linux-3.10.53/fs/statfs.c 2014-08-30 13:38:58.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/statfs.c 2013-11-13 17:17:16.000000000 +0000
+@@ -7,6 +7,8 @@
+ #include <linux/statfs.h>
+ #include <linux/security.h>
+ #include <linux/uaccess.h>
++#include <linux/vs_base.h>
++#include <linux/vs_dlimit.h>
+ #include "internal.h"
- int reiserfs_commit_write(struct file *f, struct page *page,
- unsigned from, unsigned to);
-@@ -1131,6 +1132,8 @@ static void init_inode(struct inode *ino
- struct buffer_head *bh;
- struct item_head *ih;
- __u32 rdev;
-+ uid_t uid;
-+ gid_t gid;
- //int version = ITEM_VERSION_1;
-
- bh = PATH_PLAST_BUFFER(path);
-@@ -1151,12 +1154,13 @@ static void init_inode(struct inode *ino
- (struct stat_data_v1 *)B_I_PITEM(bh, ih);
- unsigned long blocks;
-
-+ uid = sd_v1_uid(sd);
-+ gid = sd_v1_gid(sd);
-+
- set_inode_item_key_version(inode, KEY_FORMAT_3_5);
- set_inode_sd_version(inode, STAT_DATA_V1);
- inode->i_mode = sd_v1_mode(sd);
- inode->i_nlink = sd_v1_nlink(sd);
-- inode->i_uid = sd_v1_uid(sd);
-- inode->i_gid = sd_v1_gid(sd);
- inode->i_size = sd_v1_size(sd);
- inode->i_atime.tv_sec = sd_v1_atime(sd);
- inode->i_mtime.tv_sec = sd_v1_mtime(sd);
-@@ -1198,11 +1202,12 @@ static void init_inode(struct inode *ino
- // (directories and symlinks)
- struct stat_data *sd = (struct stat_data *)B_I_PITEM(bh, ih);
-
-+ uid = sd_v2_uid(sd);
-+ gid = sd_v2_gid(sd);
-+
- inode->i_mode = sd_v2_mode(sd);
- inode->i_nlink = sd_v2_nlink(sd);
-- inode->i_uid = sd_v2_uid(sd);
- inode->i_size = sd_v2_size(sd);
-- inode->i_gid = sd_v2_gid(sd);
- inode->i_mtime.tv_sec = sd_v2_mtime(sd);
- inode->i_atime.tv_sec = sd_v2_atime(sd);
- inode->i_ctime.tv_sec = sd_v2_ctime(sd);
-@@ -1232,6 +1237,10 @@ static void init_inode(struct inode *ino
- sd_attrs_to_i_attrs(sd_v2_attrs(sd), inode);
- }
+ static int flags_by_mnt(int mnt_flags)
+@@ -60,6 +62,8 @@ static int statfs_by_dentry(struct dentr
+ retval = dentry->d_sb->s_op->statfs(dentry, buf);
+ if (retval == 0 && buf->f_frsize == 0)
+ buf->f_frsize = buf->f_bsize;
++ if (!vx_check(0, VS_ADMIN|VS_WATCH))
++ vx_vsi_statfs(dentry->d_sb, buf);
+ return retval;
+ }
-+ 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);
-+
- pathrelse(path);
- if (S_ISREG(inode->i_mode)) {
- inode->i_op = &reiserfs_file_inode_operations;
-@@ -1254,13 +1263,15 @@ static void init_inode(struct inode *ino
- static void inode2sd(void *sd, struct inode *inode, loff_t size)
- {
- struct stat_data *sd_v2 = (struct stat_data *)sd;
-+ uid_t uid = TAGINO_UID(DX_TAG(inode), inode->i_uid, inode->i_tag);
-+ gid_t gid = TAGINO_GID(DX_TAG(inode), inode->i_gid, inode->i_tag);
- __u16 flags;
-
-+ set_sd_v2_uid(sd_v2, uid);
-+ set_sd_v2_gid(sd_v2, gid);
- set_sd_v2_mode(sd_v2, inode->i_mode);
- set_sd_v2_nlink(sd_v2, inode->i_nlink);
-- set_sd_v2_uid(sd_v2, inode->i_uid);
- set_sd_v2_size(sd_v2, size);
-- set_sd_v2_gid(sd_v2, inode->i_gid);
- set_sd_v2_mtime(sd_v2, inode->i_mtime.tv_sec);
- set_sd_v2_atime(sd_v2, inode->i_atime.tv_sec);
- set_sd_v2_ctime(sd_v2, inode->i_ctime.tv_sec);
-@@ -2863,14 +2874,19 @@ int reiserfs_commit_write(struct file *f
- void sd_attrs_to_i_attrs(__u16 sd_attrs, struct inode *inode)
- {
- if (reiserfs_attrs(inode->i_sb)) {
-- if (sd_attrs & REISERFS_SYNC_FL)
-- inode->i_flags |= S_SYNC;
-- else
-- inode->i_flags &= ~S_SYNC;
- if (sd_attrs & REISERFS_IMMUTABLE_FL)
- inode->i_flags |= S_IMMUTABLE;
- else
- inode->i_flags &= ~S_IMMUTABLE;
-+ if (sd_attrs & REISERFS_IXUNLINK_FL)
-+ inode->i_flags |= S_IXUNLINK;
-+ else
-+ inode->i_flags &= ~S_IXUNLINK;
-+
-+ if (sd_attrs & REISERFS_SYNC_FL)
-+ inode->i_flags |= S_SYNC;
-+ else
-+ inode->i_flags &= ~S_SYNC;
- if (sd_attrs & REISERFS_APPEND_FL)
- inode->i_flags |= S_APPEND;
- else
-@@ -2883,6 +2899,15 @@ void sd_attrs_to_i_attrs(__u16 sd_attrs,
- REISERFS_I(inode)->i_flags |= i_nopack_mask;
- else
- REISERFS_I(inode)->i_flags &= ~i_nopack_mask;
-+
-+ if (sd_attrs & REISERFS_BARRIER_FL)
-+ inode->i_vflags |= V_BARRIER;
-+ else
-+ inode->i_vflags &= ~V_BARRIER;
-+ if (sd_attrs & REISERFS_COW_FL)
-+ inode->i_vflags |= V_COW;
-+ else
-+ inode->i_vflags &= ~V_COW;
- }
- }
-
-@@ -2893,6 +2918,11 @@ void i_attrs_to_sd_attrs(struct inode *i
- *sd_attrs |= REISERFS_IMMUTABLE_FL;
- else
- *sd_attrs &= ~REISERFS_IMMUTABLE_FL;
-+ if (inode->i_flags & S_IXUNLINK)
-+ *sd_attrs |= REISERFS_IXUNLINK_FL;
-+ else
-+ *sd_attrs &= ~REISERFS_IXUNLINK_FL;
-+
- if (inode->i_flags & S_SYNC)
- *sd_attrs |= REISERFS_SYNC_FL;
- else
-@@ -2905,6 +2935,15 @@ void i_attrs_to_sd_attrs(struct inode *i
- *sd_attrs |= REISERFS_NOTAIL_FL;
- else
- *sd_attrs &= ~REISERFS_NOTAIL_FL;
-+
-+ if (inode->i_vflags & V_BARRIER)
-+ *sd_attrs |= REISERFS_BARRIER_FL;
-+ else
-+ *sd_attrs &= ~REISERFS_BARRIER_FL;
-+ if (inode->i_vflags & V_COW)
-+ *sd_attrs |= REISERFS_COW_FL;
-+ else
-+ *sd_attrs &= ~REISERFS_COW_FL;
- }
- }
-
-@@ -3148,7 +3187,8 @@ int reiserfs_setattr(struct dentry *dent
- }
-
- if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
-- (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid)) {
-+ (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid) ||
-+ (ia_valid & ATTR_TAG && attr->ia_tag != inode->i_tag)) {
- struct reiserfs_transaction_handle th;
- int jbegin_count =
- 2 *
-@@ -3177,6 +3217,9 @@ int reiserfs_setattr(struct dentry *dent
- inode->i_uid = attr->ia_uid;
- if (attr->ia_valid & ATTR_GID)
- inode->i_gid = attr->ia_gid;
-+ if ((attr->ia_valid & ATTR_TAG) &&
-+ IS_TAGGED(inode))
-+ inode->i_tag = attr->ia_tag;
- mark_inode_dirty(inode);
- error = journal_end(&th, inode->i_sb, jbegin_count);
- if (error)
-diff -NurpP --minimal linux-3.0-rc5/fs/reiserfs/ioctl.c linux-3.0-rc5-vs2.3.1-pre3/fs/reiserfs/ioctl.c
---- linux-3.0-rc5/fs/reiserfs/ioctl.c 2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/reiserfs/ioctl.c 2011-06-10 22:11:24.000000000 +0200
-@@ -11,6 +11,21 @@
- #include <linux/pagemap.h>
- #include <linux/compat.h>
-
-+
-+int reiserfs_sync_flags(struct inode *inode, int flags, int vflags)
-+{
-+ __u16 sd_attrs = 0;
-+
-+ inode->i_flags = flags;
-+ inode->i_vflags = vflags;
-+
-+ i_attrs_to_sd_attrs(inode, &sd_attrs);
-+ REISERFS_I(inode)->i_attrs = sd_attrs;
-+ inode->i_ctime = CURRENT_TIME_SEC;
-+ mark_inode_dirty(inode);
-+ return 0;
-+}
-+
- /*
- * reiserfs_ioctl - handler for ioctl for inode
- * supported commands:
-@@ -22,7 +37,7 @@
- long reiserfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
- {
- struct inode *inode = filp->f_path.dentry->d_inode;
-- unsigned int flags;
-+ unsigned int flags, oldflags;
- int err = 0;
-
- reiserfs_write_lock(inode->i_sb);
-@@ -47,6 +62,7 @@ long reiserfs_ioctl(struct file *filp, u
-
- flags = REISERFS_I(inode)->i_attrs;
- i_attrs_to_sd_attrs(inode, (__u16 *) & flags);
-+ flags &= REISERFS_FL_USER_VISIBLE;
- err = put_user(flags, (int __user *)arg);
- break;
- case REISERFS_IOC_SETFLAGS:{
-@@ -67,6 +83,10 @@ long reiserfs_ioctl(struct file *filp, u
- err = -EFAULT;
- goto setflags_out;
- }
-+ if (IS_BARRIER(inode)) {
-+ vxwprintk_task(1, "messing with the barrier.");
-+ return -EACCES;
-+ }
- /*
- * Is it quota file? Do not allow user to mess with it
- */
-@@ -91,6 +111,10 @@ long reiserfs_ioctl(struct file *filp, u
- goto setflags_out;
- }
- }
-+
-+ oldflags = REISERFS_I(inode)->i_attrs;
-+ flags &= REISERFS_FL_USER_MODIFIABLE;
-+ flags |= oldflags & ~REISERFS_FL_USER_MODIFIABLE;
- sd_attrs_to_i_attrs(flags, inode);
- REISERFS_I(inode)->i_attrs = flags;
- inode->i_ctime = CURRENT_TIME_SEC;
-diff -NurpP --minimal linux-3.0-rc5/fs/reiserfs/namei.c linux-3.0-rc5-vs2.3.1-pre3/fs/reiserfs/namei.c
---- linux-3.0-rc5/fs/reiserfs/namei.c 2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/reiserfs/namei.c 2011-06-10 22:11:24.000000000 +0200
-@@ -18,6 +18,7 @@
- #include <linux/reiserfs_acl.h>
- #include <linux/reiserfs_xattr.h>
- #include <linux/quotaops.h>
-+#include <linux/vs_tag.h>
-
- #define INC_DIR_INODE_NLINK(i) if (i->i_nlink != 1) { inc_nlink(i); if (i->i_nlink >= REISERFS_LINK_MAX) i->i_nlink=1; }
- #define DEC_DIR_INODE_NLINK(i) if (i->i_nlink != 1) drop_nlink(i);
-@@ -362,6 +363,7 @@ static struct dentry *reiserfs_lookup(st
- if (retval == IO_ERROR) {
- return ERR_PTR(-EIO);
- }
-+ dx_propagate_tag(nd, inode);
+diff -NurpP --minimal linux-3.10.53/fs/super.c linux-3.10.53-vs2.3.6.8/fs/super.c
+--- linux-3.10.53/fs/super.c 2014-08-30 13:38:58.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/super.c 2013-11-13 17:17:16.000000000 +0000
+@@ -34,6 +34,8 @@
+ #include <linux/cleancache.h>
+ #include <linux/fsnotify.h>
+ #include <linux/lockdep.h>
++#include <linux/magic.h>
++#include <linux/vs_context.h>
+ #include "internal.h"
- return d_splice_alias(inode, dentry);
- }
-@@ -1529,6 +1531,7 @@ const struct inode_operations reiserfs_d
- .listxattr = reiserfs_listxattr,
- .removexattr = reiserfs_removexattr,
- .permission = reiserfs_permission,
-+ .sync_flags = reiserfs_sync_flags,
- };
- /*
-diff -NurpP --minimal linux-3.0-rc5/fs/reiserfs/super.c linux-3.0-rc5-vs2.3.1-pre3/fs/reiserfs/super.c
---- linux-3.0-rc5/fs/reiserfs/super.c 2011-07-01 11:14:20.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/reiserfs/super.c 2011-06-10 22:11:24.000000000 +0200
-@@ -899,6 +899,14 @@ static int reiserfs_parse_options(struct
- {"user_xattr",.setmask = 1 << REISERFS_UNSUPPORTED_OPT},
- {"nouser_xattr",.clrmask = 1 << REISERFS_UNSUPPORTED_OPT},
- #endif
-+#ifndef CONFIG_TAGGING_NONE
-+ {"tagxid",.setmask = 1 << REISERFS_TAGGED},
-+ {"tag",.setmask = 1 << REISERFS_TAGGED},
-+ {"notag",.clrmask = 1 << REISERFS_TAGGED},
-+#endif
-+#ifdef CONFIG_PROPAGATE
-+ {"tag",.arg_required = 'T',.values = NULL},
-+#endif
- #ifdef CONFIG_REISERFS_FS_POSIX_ACL
- {"acl",.setmask = 1 << REISERFS_POSIXACL},
- {"noacl",.clrmask = 1 << REISERFS_POSIXACL},
-@@ -1208,6 +1216,14 @@ static int reiserfs_remount(struct super
- handle_quota_files(s, qf_names, &qfmt);
- #endif
+@@ -1112,6 +1114,13 @@ mount_fs(struct file_system_type *type,
+ WARN_ON(sb->s_bdi == &default_backing_dev_info);
+ sb->s_flags |= MS_BORN;
-+ if ((mount_options & (1 << REISERFS_TAGGED)) &&
-+ !(s->s_flags & MS_TAGGED)) {
-+ reiserfs_warning(s, "super-vs01",
-+ "reiserfs: tagging not permitted on remount.");
-+ err = -EINVAL;
-+ goto out_err;
-+ }
++ error = -EPERM;
++ if (!vx_capable(CAP_SYS_ADMIN, VXC_BINARY_MOUNT) &&
++ !sb->s_bdev &&
++ (sb->s_magic != PROC_SUPER_MAGIC) &&
++ (sb->s_magic != DEVPTS_SUPER_MAGIC))
++ goto out_sb;
+
- handle_attrs(s);
-
- /* Add options that are safe here */
-@@ -1690,6 +1706,10 @@ static int reiserfs_fill_super(struct su
- goto error;
- }
-
-+ /* map mount option tagxid */
-+ if (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_TAGGED))
-+ s->s_flags |= MS_TAGGED;
-+
- rs = SB_DISK_SUPER_BLOCK(s);
- /* Let's do basic sanity check to verify that underlying device is not
- smaller than the filesystem. If the check fails then abort and scream,
-diff -NurpP --minimal linux-3.0-rc5/fs/reiserfs/xattr.c linux-3.0-rc5-vs2.3.1-pre3/fs/reiserfs/xattr.c
---- linux-3.0-rc5/fs/reiserfs/xattr.c 2011-07-01 11:14:20.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/reiserfs/xattr.c 2011-06-22 12:39:15.000000000 +0200
-@@ -40,6 +40,7 @@
- #include <linux/errno.h>
- #include <linux/gfp.h>
- #include <linux/fs.h>
-+#include <linux/mount.h>
- #include <linux/file.h>
- #include <linux/pagemap.h>
- #include <linux/xattr.h>
-diff -NurpP --minimal linux-3.0-rc5/fs/stat.c linux-3.0-rc5-vs2.3.1-pre3/fs/stat.c
---- linux-3.0-rc5/fs/stat.c 2011-05-22 16:17:54.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/stat.c 2011-06-10 22:11:24.000000000 +0200
-@@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod
- stat->nlink = inode->i_nlink;
- stat->uid = inode->i_uid;
- stat->gid = inode->i_gid;
-+ stat->tag = inode->i_tag;
- stat->rdev = inode->i_rdev;
- stat->atime = inode->i_atime;
- stat->mtime = inode->i_mtime;
-diff -NurpP --minimal linux-3.0-rc5/fs/statfs.c linux-3.0-rc5-vs2.3.1-pre3/fs/statfs.c
---- linux-3.0-rc5/fs/statfs.c 2011-05-22 16:17:54.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/statfs.c 2011-06-10 22:11:24.000000000 +0200
-@@ -7,6 +7,8 @@
- #include <linux/statfs.h>
- #include <linux/security.h>
- #include <linux/uaccess.h>
-+#include <linux/vs_base.h>
-+#include <linux/vs_dlimit.h>
-
- static int flags_by_mnt(int mnt_flags)
- {
-@@ -59,6 +61,8 @@ int statfs_by_dentry(struct dentry *dent
- retval = dentry->d_sb->s_op->statfs(dentry, buf);
- if (retval == 0 && buf->f_frsize == 0)
- buf->f_frsize = buf->f_bsize;
-+ if (!vx_check(0, VS_ADMIN|VS_WATCH))
-+ vx_vsi_statfs(dentry->d_sb, buf);
- return retval;
- }
-
-diff -NurpP --minimal linux-3.0-rc5/fs/sysfs/mount.c linux-3.0-rc5-vs2.3.1-pre3/fs/sysfs/mount.c
---- linux-3.0-rc5/fs/sysfs/mount.c 2011-07-01 11:14:20.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/sysfs/mount.c 2011-06-22 12:39:15.000000000 +0200
-@@ -47,7 +47,7 @@ static int sysfs_fill_super(struct super
+ error = security_sb_kern_mount(sb, flags, secdata);
+ if (error)
+ goto out_sb;
+diff -NurpP --minimal linux-3.10.53/fs/sysfs/mount.c linux-3.10.53-vs2.3.6.8/fs/sysfs/mount.c
+--- linux-3.10.53/fs/sysfs/mount.c 2013-05-31 13:45:25.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/sysfs/mount.c 2013-08-22 20:30:00.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_op = &sysfs_ops;
sb->s_time_gran = 1;
-diff -NurpP --minimal linux-3.0-rc5/fs/utimes.c linux-3.0-rc5-vs2.3.1-pre3/fs/utimes.c
---- linux-3.0-rc5/fs/utimes.c 2011-05-22 16:17:54.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/utimes.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/fs/utimes.c linux-3.10.53-vs2.3.6.8/fs/utimes.c
+--- linux-3.10.53/fs/utimes.c 2013-02-19 13:58:49.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/utimes.c 2013-08-22 20:30:00.000000000 +0000
@@ -8,6 +8,8 @@
#include <linux/stat.h>
#include <linux/utime.h>
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;
-+ error = cow_check_and_break(path);
-+ if (error)
-+ goto mnt_drop_write_and_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.0-rc5/fs/xattr.c linux-3.0-rc5-vs2.3.1-pre3/fs/xattr.c
---- linux-3.0-rc5/fs/xattr.c 2011-07-01 11:14:20.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/xattr.c 2011-06-10 23:10:19.000000000 +0200
-@@ -18,6 +18,7 @@
- #include <linux/module.h>
- #include <linux/fsnotify.h>
+diff -NurpP --minimal linux-3.10.53/fs/xattr.c linux-3.10.53-vs2.3.6.8/fs/xattr.c
+--- linux-3.10.53/fs/xattr.c 2013-02-19 13:58:49.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/xattr.c 2013-08-22 20:30:00.000000000 +0000
+@@ -21,6 +21,7 @@
#include <linux/audit.h>
+ #include <linux/vmalloc.h>
+ #include <linux/posix_acl_xattr.h>
+#include <linux/mount.h>
- #include <asm/uaccess.h>
+ #include <asm/uaccess.h>
-@@ -49,7 +50,7 @@ xattr_permission(struct inode *inode, co
+@@ -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)) {
return (mask & MAY_WRITE) ? -EPERM : -ENODATA;
return 0;
}
-diff -NurpP --minimal linux-3.0-rc5/fs/xfs/linux-2.6/xfs_ioctl.c linux-3.0-rc5-vs2.3.1-pre3/fs/xfs/linux-2.6/xfs_ioctl.c
---- linux-3.0-rc5/fs/xfs/linux-2.6/xfs_ioctl.c 2011-05-22 16:17:54.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/xfs/linux-2.6/xfs_ioctl.c 2011-06-10 22:11:24.000000000 +0200
-@@ -28,7 +28,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"
-@@ -748,6 +748,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
-@@ -776,6 +780,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)
-@@ -836,6 +842,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)
-@@ -878,6 +886,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
-@@ -1370,10 +1382,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.0-rc5/fs/xfs/linux-2.6/xfs_ioctl.h linux-3.0-rc5-vs2.3.1-pre3/fs/xfs/linux-2.6/xfs_ioctl.h
---- linux-3.0-rc5/fs/xfs/linux-2.6/xfs_ioctl.h 2010-07-07 18:31:54.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/xfs/linux-2.6/xfs_ioctl.h 2011-06-10 22:11:24.000000000 +0200
-@@ -70,6 +70,12 @@ xfs_handle_to_dentry(
- void __user *uhandle,
- u32 hlen);
+diff -NurpP --minimal linux-3.10.53/fs/xfs/xfs_dinode.h linux-3.10.53-vs2.3.6.8/fs/xfs/xfs_dinode.h
+--- linux-3.10.53/fs/xfs/xfs_dinode.h 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/xfs/xfs_dinode.h 2013-08-22 20:30:00.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 */
+@@ -209,6 +211,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)
+@@ -224,6 +228,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)
-+extern int
-+xfs_sync_flags(
-+ struct inode *inode,
-+ int flags,
-+ int vflags);
+ #ifdef CONFIG_XFS_RT
+ #define XFS_IS_REALTIME_INODE(ip) ((ip)->i_d.di_flags & XFS_DIFLAG_REALTIME)
+@@ -236,6 +241,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)
+
- extern long
- xfs_file_ioctl(
- struct file *filp,
-diff -NurpP --minimal linux-3.0-rc5/fs/xfs/linux-2.6/xfs_iops.c linux-3.0-rc5-vs2.3.1-pre3/fs/xfs/linux-2.6/xfs_iops.c
---- linux-3.0-rc5/fs/xfs/linux-2.6/xfs_iops.c 2011-07-01 11:14:20.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/xfs/linux-2.6/xfs_iops.c 2011-06-22 12:39:15.000000000 +0200
-@@ -30,6 +30,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"
-@@ -48,6 +49,7 @@
- #include <linux/security.h>
- #include <linux/fiemap.h>
- #include <linux/slab.h>
-+#include <linux/vs_tag.h>
-
- /*
- * Bring the timestamps in the XFS inode uptodate.
-@@ -464,6 +466,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;
-@@ -599,6 +602,7 @@ static const struct inode_operations xfs
- .removexattr = generic_removexattr,
- .listxattr = xfs_vn_listxattr,
- .fiemap = xfs_vn_fiemap,
-+ .sync_flags = xfs_sync_flags,
- };
-
- static const struct inode_operations xfs_dir_inode_operations = {
-@@ -624,6 +628,7 @@ static const struct inode_operations xfs
- .getxattr = generic_getxattr,
- .removexattr = generic_removexattr,
- .listxattr = xfs_vn_listxattr,
-+ .sync_flags = xfs_sync_flags,
- };
-
- static const struct inode_operations xfs_dir_ci_inode_operations = {
-@@ -673,6 +678,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
-@@ -685,6 +694,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;
- }
-
- /*
-@@ -716,6 +734,7 @@ xfs_setup_inode(
- inode->i_nlink = 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.0-rc5/fs/xfs/linux-2.6/xfs_linux.h linux-3.0-rc5-vs2.3.1-pre3/fs/xfs/linux-2.6/xfs_linux.h
---- linux-3.0-rc5/fs/xfs/linux-2.6/xfs_linux.h 2011-07-01 11:14:20.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/xfs/linux-2.6/xfs_linux.h 2011-06-10 22:11:24.000000000 +0200
-@@ -115,6 +115,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.0-rc5/fs/xfs/linux-2.6/xfs_super.c linux-3.0-rc5-vs2.3.1-pre3/fs/xfs/linux-2.6/xfs_super.c
---- linux-3.0-rc5/fs/xfs/linux-2.6/xfs_super.c 2011-07-01 11:14:20.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/xfs/linux-2.6/xfs_super.c 2011-06-22 12:39:15.000000000 +0200
-@@ -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.
-@@ -122,10 +125,14 @@ mempool_t *xfs_ioend_pool;
- * in the future, too.
- */
- enum {
-+ Opt_tag, Opt_notag,
- Opt_barrier, Opt_nobarrier, Opt_err
- };
-
- static const match_table_t tokens = {
-+ {Opt_tag, "tagxid"},
-+ {Opt_tag, "tag"},
-+ {Opt_notag, "notag"},
- {Opt_barrier, "barrier"},
- {Opt_nobarrier, "nobarrier"},
- {Opt_err, NULL}
-@@ -373,6 +380,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;
-@@ -1182,6 +1202,16 @@ xfs_fs_remount(
- case Opt_nobarrier:
- mp->m_flags &= ~XFS_MOUNT_BARRIER;
- 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
-@@ -1397,6 +1427,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.0-rc5/fs/xfs/xfs_dinode.h linux-3.0-rc5-vs2.3.1-pre3/fs/xfs/xfs_dinode.h
---- linux-3.0-rc5/fs/xfs/xfs_dinode.h 2011-01-05 21:50:28.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/xfs/xfs_dinode.h 2011-06-10 22:11:24.000000000 +0200
-@@ -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
++#define XFS_DIVFLAG_BARRIER 0x01
++#define XFS_DIVFLAG_COW 0x02
#endif /* __XFS_DINODE_H__ */
-diff -NurpP --minimal linux-3.0-rc5/fs/xfs/xfs_fs.h linux-3.0-rc5-vs2.3.1-pre3/fs/xfs/xfs_fs.h
---- linux-3.0-rc5/fs/xfs/xfs_fs.h 2011-01-05 21:50:28.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/xfs/xfs_fs.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/fs/xfs/xfs_fs.h linux-3.10.53-vs2.3.6.8/fs/xfs/xfs_fs.h
+--- linux-3.10.53/fs/xfs/xfs_fs.h 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/xfs/xfs_fs.h 2013-08-22 20:30:00.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_HASATTR 0x80000000 /* no DIFLAG for this */
/*
-@@ -297,7 +300,8 @@ typedef struct xfs_bstat {
+@@ -304,7 +307,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 */
__u32 bs_dmevmask; /* DMIG event mask */
__u16 bs_dmstate; /* DMIG state info */
__u16 bs_aextents; /* attribute number of extents */
-diff -NurpP --minimal linux-3.0-rc5/fs/xfs/xfs_ialloc.c linux-3.0-rc5-vs2.3.1-pre3/fs/xfs/xfs_ialloc.c
---- linux-3.0-rc5/fs/xfs/xfs_ialloc.c 2011-05-22 16:17:54.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/xfs/xfs_ialloc.c 2011-06-10 22:11:24.000000000 +0200
-@@ -37,7 +37,6 @@
- #include "xfs_error.h"
- #include "xfs_bmap.h"
+diff -NurpP --minimal linux-3.10.53/fs/xfs/xfs_ialloc.c linux-3.10.53-vs2.3.6.8/fs/xfs/xfs_ialloc.c
+--- linux-3.10.53/fs/xfs/xfs_ialloc.c 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/xfs/xfs_ialloc.c 2013-08-22 20:30:00.000000000 +0000
+@@ -39,7 +39,6 @@
+ #include "xfs_cksum.h"
+ #include "xfs_buf_item.h"
-
/*
* Allocation group level functions.
*/
-diff -NurpP --minimal linux-3.0-rc5/fs/xfs/xfs_inode.c linux-3.0-rc5-vs2.3.1-pre3/fs/xfs/xfs_inode.c
---- linux-3.0-rc5/fs/xfs/xfs_inode.c 2011-07-01 11:14:20.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/xfs/xfs_inode.c 2011-06-10 22:11:24.000000000 +0200
-@@ -243,6 +243,7 @@ xfs_inotobp(
- return 0;
- }
-
+diff -NurpP --minimal linux-3.10.53/fs/xfs/xfs_inode.c linux-3.10.53-vs2.3.6.8/fs/xfs/xfs_inode.c
+--- linux-3.10.53/fs/xfs/xfs_inode.c 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/xfs/xfs_inode.c 2013-08-22 21:50:34.000000000 +0000
+@@ -16,6 +16,7 @@
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+ #include <linux/log2.h>
+#include <linux/vs_tag.h>
- /*
- * This routine is called to map an inode to the buffer containing
-@@ -641,15 +642,25 @@ xfs_iformat_btree(
+ #include "xfs.h"
+ #include "xfs_fs.h"
+@@ -836,15 +837,25 @@ xfs_iformat_btree(
STATIC void
xfs_dinode_from_disk(
xfs_icdinode_t *to,
- xfs_dinode_t *from)
+ xfs_dinode_t *from,
-+ int tagged)
++ int tagged)
{
+ uint32_t 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);
-@@ -671,21 +682,26 @@ xfs_dinode_from_disk(
+@@ -866,6 +877,7 @@ 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);
- }
+ if (to->di_version == 3) {
+@@ -883,15 +895,19 @@ xfs_dinode_from_disk(
void
xfs_dinode_to_disk(
xfs_dinode_t *to,
- xfs_icdinode_t *from)
+ xfs_icdinode_t *from,
-+ int tagged)
++ int tagged)
{
to->di_magic = cpu_to_be16(from->di_magic);
to->di_mode = cpu_to_be16(from->di_mode);
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);
-@@ -707,12 +723,14 @@ xfs_dinode_to_disk(
+@@ -913,6 +929,7 @@ 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);
- }
+
+ if (from->di_version == 3) {
+@@ -929,7 +946,8 @@ xfs_dinode_to_disk(
STATIC uint
_xfs_dic2xflags(
{
uint flags = 0;
-@@ -723,6 +741,8 @@ _xfs_dic2xflags(
+@@ -940,6 +958,8 @@ _xfs_dic2xflags(
flags |= XFS_XFLAG_PREALLOC;
if (di_flags & XFS_DIFLAG_IMMUTABLE)
flags |= XFS_XFLAG_IMMUTABLE;
if (di_flags & XFS_DIFLAG_APPEND)
flags |= XFS_XFLAG_APPEND;
if (di_flags & XFS_DIFLAG_SYNC)
-@@ -747,6 +767,10 @@ _xfs_dic2xflags(
+@@ -964,6 +984,10 @@ _xfs_dic2xflags(
flags |= XFS_XFLAG_FILESTREAM;
}
return flags;
}
-@@ -756,7 +780,7 @@ xfs_ip2xflags(
+@@ -973,7 +997,7 @@ xfs_ip2xflags(
{
xfs_icdinode_t *dic = &ip->i_d;
(XFS_IFORK_Q(ip) ? XFS_XFLAG_HASATTR : 0);
}
-@@ -764,7 +788,8 @@ uint
+@@ -981,7 +1005,8 @@ uint
xfs_dic2xflags(
xfs_dinode_t *dip)
{
(XFS_DFORK_Q(dip) ? XFS_XFLAG_HASATTR : 0);
}
-@@ -797,7 +822,6 @@ xfs_iread(
- if (error)
- return error;
- dip = (xfs_dinode_t *)xfs_buf_offset(bp, ip->i_imap.im_boffset);
--
- /*
- * If we got something that isn't an inode it means someone
- * (nfs or dmi) has a stale handle.
-@@ -820,7 +844,8 @@ xfs_iread(
+@@ -1072,7 +1097,8 @@ xfs_iread(
* Otherwise, just get the truly permanent information.
*/
if (dip->di_mode) {
error = xfs_iformat(ip, dip);
if (error) {
#ifdef DEBUG
-@@ -1015,6 +1040,7 @@ xfs_ialloc(
+@@ -1270,6 +1296,7 @@ xfs_ialloc(
ASSERT(ip->i_d.di_nlink == nlink);
ip->i_d.di_uid = current_fsuid();
ip->i_d.di_gid = current_fsgid();
xfs_set_projid(ip, prid);
memset(&(ip->i_d.di_pad[0]), 0, sizeof(ip->i_d.di_pad));
-@@ -1075,6 +1101,7 @@ xfs_ialloc(
+@@ -1329,6 +1356,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:
-@@ -2108,6 +2135,7 @@ xfs_ifree(
+
+ if (ip->i_d.di_version == 3) {
+ ASSERT(ip->i_d.di_ino == ino);
+@@ -2052,6 +2080,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_df.if_ext_max =
-@@ -2987,7 +3015,8 @@ xfs_iflush_int(
+ ip->i_d.di_format = XFS_DINODE_FMT_EXTENTS;
+@@ -2219,7 +2248,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
+@@ -2899,7 +2927,8 @@ xfs_iflush_int(
* because if the inode is dirty at all the core must
* be.
*/
/* 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.0-rc5/fs/xfs/xfs_inode.h linux-3.0-rc5-vs2.3.1-pre3/fs/xfs/xfs_inode.h
---- linux-3.0-rc5/fs/xfs/xfs_inode.h 2011-07-01 11:14:20.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/xfs/xfs_inode.h 2011-07-01 11:35:35.000000000 +0200
-@@ -135,7 +135,9 @@ typedef struct xfs_icdinode {
+diff -NurpP --minimal linux-3.10.53/fs/xfs/xfs_inode.h linux-3.10.53-vs2.3.6.8/fs/xfs/xfs_inode.h
+--- linux-3.10.53/fs/xfs/xfs_inode.h 2013-07-14 17:01:30.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/xfs/xfs_inode.h 2013-08-22 20:30:00.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 */
__uint16_t di_flushiter; /* incremented on flush */
xfs_ictimestamp_t di_atime; /* time last accessed */
xfs_ictimestamp_t di_mtime; /* time last modified */
-@@ -546,7 +548,7 @@ int xfs_itobp(struct xfs_mount *, struc
- int xfs_iread(struct xfs_mount *, struct xfs_trans *,
+@@ -583,7 +585,7 @@ int xfs_iread(struct xfs_mount *, struc
struct xfs_inode *, uint);
+ void xfs_dinode_calc_crc(struct xfs_mount *, struct xfs_dinode *);
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.0-rc5/fs/xfs/xfs_itable.c linux-3.0-rc5-vs2.3.1-pre3/fs/xfs/xfs_itable.c
---- linux-3.0-rc5/fs/xfs/xfs_itable.c 2011-05-22 16:17:54.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/xfs/xfs_itable.c 2011-06-10 22:11:24.000000000 +0200
-@@ -98,6 +98,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;
-
- /*
-diff -NurpP --minimal linux-3.0-rc5/fs/xfs/xfs_log_recover.c linux-3.0-rc5-vs2.3.1-pre3/fs/xfs/xfs_log_recover.c
---- linux-3.0-rc5/fs/xfs/xfs_log_recover.c 2011-07-01 11:14:20.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/xfs/xfs_log_recover.c 2011-06-10 22:11:24.000000000 +0200
-@@ -2343,7 +2343,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.0-rc5/fs/xfs/xfs_mount.h linux-3.0-rc5-vs2.3.1-pre3/fs/xfs/xfs_mount.h
---- linux-3.0-rc5/fs/xfs/xfs_mount.h 2011-07-01 11:14:20.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/xfs/xfs_mount.h 2011-06-10 22:11:24.000000000 +0200
-@@ -249,6 +249,7 @@ typedef struct xfs_mount {
- allocator */
- #define XFS_MOUNT_NOATTR2 (1ULL << 25) /* disable use of attr2 format */
+diff -NurpP --minimal linux-3.10.53/fs/xfs/xfs_ioctl.c linux-3.10.53-vs2.3.6.8/fs/xfs/xfs_ioctl.c
+--- linux-3.10.53/fs/xfs/xfs_ioctl.c 2014-08-30 13:38:58.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/xfs/xfs_ioctl.c 2013-12-23 17:42:40.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"
+@@ -770,6 +770,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
+@@ -798,6 +802,8 @@ xfs_di2lxflags(
-+#define XFS_MOUNT_TAGGED (1ULL << 31) /* context tagging */
+ 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)
+@@ -858,6 +864,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)
+@@ -900,6 +908,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
+@@ -1404,10 +1416,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);
- /*
- * Default minimum read and write sizes.
-diff -NurpP --minimal linux-3.0-rc5/fs/xfs/xfs_vnodeops.c linux-3.0-rc5-vs2.3.1-pre3/fs/xfs/xfs_vnodeops.c
---- linux-3.0-rc5/fs/xfs/xfs_vnodeops.c 2011-07-01 11:14:20.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/xfs/xfs_vnodeops.c 2011-07-01 11:35:35.000000000 +0200
-@@ -50,6 +50,78 @@
- #include "xfs_vnodeops.h"
- #include "xfs_trace.h"
+ case XFS_IOC_FSSETDM: {
+diff -NurpP --minimal linux-3.10.53/fs/xfs/xfs_ioctl.h linux-3.10.53-vs2.3.6.8/fs/xfs/xfs_ioctl.h
+--- linux-3.10.53/fs/xfs/xfs_ioctl.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/xfs/xfs_ioctl.h 2013-08-22 20:30:00.000000000 +0000
+@@ -70,6 +70,12 @@ xfs_handle_to_dentry(
+ void __user *uhandle,
+ u32 hlen);
-+
-+STATIC void
-+xfs_get_inode_flags(
++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.10.53/fs/xfs/xfs_iops.c linux-3.10.53-vs2.3.6.8/fs/xfs/xfs_iops.c
+--- linux-3.10.53/fs/xfs/xfs_iops.c 2013-07-14 17:01:30.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/xfs/xfs_iops.c 2013-08-22 20:30:00.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 <linux/security.h>
+ #include <linux/fiemap.h>
+ #include <linux/slab.h>
++#include <linux/vs_tag.h>
+
+ 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;
+@@ -1054,6 +1057,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 = {
+@@ -1080,6 +1084,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 = {
+@@ -1131,6 +1136,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
+@@ -1143,6 +1152,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;
+ }
+
+ /*
+@@ -1174,6 +1192,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.10.53/fs/xfs/xfs_itable.c linux-3.10.53-vs2.3.6.8/fs/xfs/xfs_itable.c
+--- linux-3.10.53/fs/xfs/xfs_itable.c 2013-02-19 13:58:49.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/xfs/xfs_itable.c 2013-08-22 20:30:00.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.10.53/fs/xfs/xfs_linux.h linux-3.10.53-vs2.3.6.8/fs/xfs/xfs_linux.h
+--- linux-3.10.53/fs/xfs/xfs_linux.h 2013-07-14 17:01:30.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/xfs/xfs_linux.h 2013-08-22 20:30:00.000000000 +0000
+@@ -124,6 +124,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.10.53/fs/xfs/xfs_log_recover.c linux-3.10.53-vs2.3.6.8/fs/xfs/xfs_log_recover.c
+--- linux-3.10.53/fs/xfs/xfs_log_recover.c 2013-07-14 17:01:31.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/xfs/xfs_log_recover.c 2013-08-22 21:48:01.000000000 +0000
+@@ -2662,7 +2662,7 @@ xlog_recover_inode_pass2(
+ }
+
+ /* The core is in in-core format */
+- xfs_dinode_to_disk(dip, dicp);
++ xfs_dinode_to_disk(dip, dicp, mp->m_flags & XFS_MOUNT_TAGGED);
+
+ /* the rest is in on-disk format */
+ if (item->ri_buf[1].i_len > isize) {
+diff -NurpP --minimal linux-3.10.53/fs/xfs/xfs_mount.h linux-3.10.53-vs2.3.6.8/fs/xfs/xfs_mount.h
+--- linux-3.10.53/fs/xfs/xfs_mount.h 2013-07-14 17:01:31.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/xfs/xfs_mount.h 2013-08-22 20:30:00.000000000 +0000
+@@ -253,6 +253,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.10.53/fs/xfs/xfs_super.c linux-3.10.53-vs2.3.6.8/fs/xfs/xfs_super.c
+--- linux-3.10.53/fs/xfs/xfs_super.c 2013-07-14 17:01:31.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/xfs/xfs_super.c 2013-08-22 20:30:00.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
+@@ -1469,6 +1500,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.10.53/fs/xfs/xfs_vnodeops.c linux-3.10.53-vs2.3.6.8/fs/xfs/xfs_vnodeops.c
+--- linux-3.10.53/fs/xfs/xfs_vnodeops.c 2013-07-14 17:01:31.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/fs/xfs/xfs_vnodeops.c 2013-08-22 20:30:00.000000000 +0000
+@@ -155,6 +155,77 @@ xfs_free_eofblocks(
+ return error;
+ }
+
++
++STATIC void
++xfs_get_inode_flags(
+ xfs_inode_t *ip)
+{
+ struct inode *inode = VFS_I(ip);
+ goto error_out;
+
+ xfs_ilock(ip, XFS_ILOCK_EXCL);
-+
-+ xfs_trans_ijoin(tp, ip);
++ xfs_trans_ijoin(tp, ip, 0);
+
+ inode->i_flags = flags;
+ inode->i_vflags = vflags;
+
+
int
- xfs_setattr(
- struct xfs_inode *ip,
-@@ -65,6 +137,7 @@ xfs_setattr(
- uint commit_flags=0;
- uid_t uid=0, iuid=0;
- gid_t gid=0, igid=0;
-+ tag_t tag=0, itag=0;
- struct xfs_dquot *udqp, *gdqp, *olddquot1, *olddquot2;
- int need_iolock = 1;
-
-@@ -147,7 +220,7 @@ xfs_setattr(
- /*
- * Change file ownership. Must be the owner or privileged.
- */
-- if (mask & (ATTR_UID|ATTR_GID)) {
-+ if (mask & (ATTR_UID|ATTR_GID|ATTR_TAG)) {
- /*
- * These IDs could have changed since we last looked at them.
- * But, we're assured that if the ownership did change
-@@ -156,8 +229,10 @@ xfs_setattr(
- */
- iuid = ip->i_d.di_uid;
- igid = ip->i_d.di_gid;
-+ itag = ip->i_d.di_tag;
- gid = (mask & ATTR_GID) ? iattr->ia_gid : igid;
- uid = (mask & ATTR_UID) ? iattr->ia_uid : iuid;
-+ tag = (mask & ATTR_TAG) ? iattr->ia_tag : itag;
-
- /*
- * Do a quota reservation only if uid/gid is actually
-@@ -165,7 +240,8 @@ xfs_setattr(
- */
- if (XFS_IS_QUOTA_RUNNING(mp) &&
- ((XFS_IS_UQUOTA_ON(mp) && iuid != uid) ||
-- (XFS_IS_GQUOTA_ON(mp) && igid != gid))) {
-+ (XFS_IS_GQUOTA_ON(mp) && igid != gid) ||
-+ (XFS_IS_GQUOTA_ON(mp) && itag != tag))) {
- ASSERT(tp);
- code = xfs_qm_vop_chown_reserve(tp, ip, udqp, gdqp,
- capable(CAP_FOWNER) ?
-@@ -329,7 +405,7 @@ xfs_setattr(
- /*
- * Change file ownership. Must be the owner or privileged.
- */
-- if (mask & (ATTR_UID|ATTR_GID)) {
-+ if (mask & (ATTR_UID|ATTR_GID|ATTR_TAG)) {
- /*
- * CAP_FSETID overrides the following restrictions:
- *
-@@ -345,6 +421,10 @@ xfs_setattr(
- * Change the ownerships and register quota modifications
- * in the transaction.
- */
-+ if (itag != tag) {
-+ ip->i_d.di_tag = tag;
-+ inode->i_tag = tag;
-+ }
- if (iuid != uid) {
- if (XFS_IS_QUOTA_RUNNING(mp) && XFS_IS_UQUOTA_ON(mp)) {
- ASSERT(mask & ATTR_UID);
-diff -NurpP --minimal linux-3.0-rc5/fs/xfs/xfs_vnodeops.h linux-3.0-rc5-vs2.3.1-pre3/fs/xfs/xfs_vnodeops.h
---- linux-3.0-rc5/fs/xfs/xfs_vnodeops.h 2011-05-22 16:17:54.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/fs/xfs/xfs_vnodeops.h 2011-06-10 22:11:24.000000000 +0200
-@@ -13,6 +13,7 @@ struct xfs_inode;
- struct xfs_iomap;
-
-
-+int xfs_sync_xflags(struct xfs_inode *ip);
- int xfs_setattr(struct xfs_inode *ip, struct iattr *vap, int flags);
- #define XFS_ATTR_DMI 0x01 /* invocation from a DMI function */
- #define XFS_ATTR_NONBLOCK 0x02 /* return EAGAIN if operation would block */
-diff -NurpP --minimal linux-3.0-rc5/include/asm-generic/tlb.h linux-3.0-rc5-vs2.3.1-pre3/include/asm-generic/tlb.h
---- linux-3.0-rc5/include/asm-generic/tlb.h 2011-07-01 11:14:20.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/asm-generic/tlb.h 2011-06-10 22:11:24.000000000 +0200
-@@ -16,6 +16,7 @@
- #define _ASM_GENERIC__TLB_H
-
- #include <linux/swap.h>
-+#include <linux/vs_memory.h>
- #include <asm/pgalloc.h>
- #include <asm/tlbflush.h>
-
-diff -NurpP --minimal linux-3.0-rc5/include/linux/Kbuild linux-3.0-rc5-vs2.3.1-pre3/include/linux/Kbuild
---- linux-3.0-rc5/include/linux/Kbuild 2011-07-01 11:14:20.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/Kbuild 2011-06-10 22:11:24.000000000 +0200
-@@ -17,6 +17,7 @@ header-y += netfilter_bridge/
- header-y += netfilter_ipv4/
- header-y += netfilter_ipv6/
- header-y += usb/
-+header-y += vserver/
- header-y += wimax/
-
- objhdr-y += version.h
-diff -NurpP --minimal linux-3.0-rc5/include/linux/capability.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/capability.h
---- linux-3.0-rc5/include/linux/capability.h 2011-07-01 11:14:21.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/capability.h 2011-06-10 22:11:24.000000000 +0200
-@@ -279,6 +279,7 @@ struct cpu_vfs_cap_data {
- arbitrary SCSI commands */
- /* Allow setting encryption key on loopback filesystem */
- /* Allow setting zone reclaim policy */
-+/* Allow the selection of a security context */
-
- #define CAP_SYS_ADMIN 21
-
-@@ -362,7 +363,12 @@ struct cpu_vfs_cap_data {
-
- #define CAP_LAST_CAP CAP_WAKE_ALARM
-
--#define cap_valid(x) ((x) >= 0 && (x) <= CAP_LAST_CAP)
-+/* Allow context manipulations */
-+/* Allow changing context info on files */
-+
-+#define CAP_CONTEXT 63
-+
-+#define cap_valid(x) ((x) >= 0 && ((x) <= CAP_LAST_CAP || (x) == CAP_CONTEXT))
-
- /*
- * Bit location of each capability (used by user-space library and kernel)
-diff -NurpP --minimal linux-3.0-rc5/include/linux/cred.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/cred.h
---- linux-3.0-rc5/include/linux/cred.h 2011-07-01 11:14:21.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/cred.h 2011-06-10 22:11:24.000000000 +0200
-@@ -156,6 +156,7 @@ extern void exit_creds(struct task_struc
+ xfs_release(
+ xfs_inode_t *ip)
+diff -NurpP --minimal linux-3.10.53/include/linux/cred.h linux-3.10.53-vs2.3.6.8/include/linux/cred.h
+--- linux-3.10.53/include/linux/cred.h 2013-02-19 13:58:50.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/cred.h 2013-08-22 20:30:00.000000000 +0000
+@@ -143,6 +143,7 @@ extern void exit_creds(struct task_struc
extern int copy_creds(struct task_struct *, unsigned long);
extern const struct cred *get_task_cred(struct task_struct *);
extern struct cred *cred_alloc_blank(void);
extern struct cred *prepare_creds(void);
extern struct cred *prepare_exec_creds(void);
extern int commit_creds(struct cred *);
-@@ -209,6 +210,31 @@ static inline void validate_process_cred
+@@ -196,6 +197,31 @@ static inline void validate_process_cred
}
#endif
/**
* get_new_cred - Get a reference on a new set of credentials
* @cred: The new credentials to reference
-diff -NurpP --minimal linux-3.0-rc5/include/linux/devpts_fs.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/devpts_fs.h
---- linux-3.0-rc5/include/linux/devpts_fs.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/devpts_fs.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/include/linux/devpts_fs.h linux-3.10.53-vs2.3.6.8/include/linux/devpts_fs.h
+--- linux-3.10.53/include/linux/devpts_fs.h 2013-02-19 13:58:50.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/devpts_fs.h 2013-08-22 20:30:00.000000000 +0000
@@ -45,5 +45,4 @@ static inline void devpts_pty_kill(struc
#endif
-
#endif /* _LINUX_DEVPTS_FS_H */
-diff -NurpP --minimal linux-3.0-rc5/include/linux/ext2_fs.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/ext2_fs.h
---- linux-3.0-rc5/include/linux/ext2_fs.h 2010-02-25 11:52:07.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/ext2_fs.h 2011-06-10 22:11:24.000000000 +0200
-@@ -189,8 +189,12 @@ struct ext2_group_desc
- #define EXT2_NOTAIL_FL FS_NOTAIL_FL /* file tail should not be merged */
- #define EXT2_DIRSYNC_FL FS_DIRSYNC_FL /* dirsync behaviour (directories only) */
- #define EXT2_TOPDIR_FL FS_TOPDIR_FL /* Top of directory hierarchies*/
-+#define EXT2_IXUNLINK_FL FS_IXUNLINK_FL /* Immutable invert on unlink */
- #define EXT2_RESERVED_FL FS_RESERVED_FL /* reserved for ext2 lib */
+diff -NurpP --minimal linux-3.10.53/include/linux/fs.h linux-3.10.53-vs2.3.6.8/include/linux/fs.h
+--- linux-3.10.53/include/linux/fs.h 2013-07-14 17:01:32.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/fs.h 2013-08-22 20:30:00.000000000 +0000
+@@ -211,6 +211,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)
-+#define EXT2_BARRIER_FL FS_BARRIER_FL /* Barrier for chroot() */
-+#define EXT2_COW_FL FS_COW_FL /* Copy on Write marker */
-+
- #define EXT2_FL_USER_VISIBLE FS_FL_USER_VISIBLE /* User visible flags */
- #define EXT2_FL_USER_MODIFIABLE FS_FL_USER_MODIFIABLE /* User modifiable flags */
+ /*
+ * This is the Inode Attributes structure, used for notify_change(). It
+@@ -226,6 +227,7 @@ struct iattr {
+ umode_t ia_mode;
+ kuid_t ia_uid;
+ kgid_t ia_gid;
++ ktag_t ia_tag;
+ loff_t ia_size;
+ struct timespec ia_atime;
+ struct timespec ia_mtime;
+@@ -523,7 +525,9 @@ struct inode {
+ unsigned short i_opflags;
+ kuid_t i_uid;
+ kgid_t i_gid;
+- unsigned int i_flags;
++ ktag_t i_tag;
++ unsigned short i_flags;
++ unsigned short i_vflags;
-@@ -274,7 +278,8 @@ struct ext2_inode {
- __u16 i_pad1;
- __le16 l_i_uid_high; /* these 2 fields */
- __le16 l_i_gid_high; /* were reserved2[0] */
-- __u32 l_i_reserved2;
-+ __le16 l_i_tag; /* Context Tag */
-+ __u16 l_i_reserved2;
- } linux2;
- struct {
- __u8 h_i_frag; /* Fragment number */
-@@ -303,6 +308,7 @@ struct ext2_inode {
- #define i_gid_low i_gid
- #define i_uid_high osd2.linux2.l_i_uid_high
- #define i_gid_high osd2.linux2.l_i_gid_high
-+#define i_raw_tag osd2.linux2.l_i_tag
- #define i_reserved2 osd2.linux2.l_i_reserved2
- #endif
+ #ifdef CONFIG_FS_POSIX_ACL
+ struct posix_acl *i_acl;
+@@ -552,6 +556,7 @@ struct inode {
+ unsigned int __i_nlink;
+ };
+ dev_t i_rdev;
++ dev_t i_mdev;
+ loff_t i_size;
+ struct timespec i_atime;
+ struct timespec i_mtime;
+@@ -704,6 +709,11 @@ static inline gid_t i_gid_read(const str
+ return from_kgid(&init_user_ns, inode->i_gid);
+ }
-@@ -347,6 +353,7 @@ struct ext2_inode {
- #define EXT2_MOUNT_USRQUOTA 0x020000 /* user quota */
- #define EXT2_MOUNT_GRPQUOTA 0x040000 /* group quota */
- #define EXT2_MOUNT_RESERVATION 0x080000 /* Preallocation */
-+#define EXT2_MOUNT_TAGGED (1<<24) /* Enable Context Tags */
++static inline vtag_t i_tag_read(const struct inode *inode)
++{
++ return from_ktag(&init_user_ns, inode->i_tag);
++}
++
+ static inline void i_uid_write(struct inode *inode, uid_t uid)
+ {
+ inode->i_uid = make_kuid(&init_user_ns, uid);
+@@ -714,14 +724,19 @@ static inline void i_gid_write(struct in
+ inode->i_gid = make_kgid(&init_user_ns, gid);
+ }
-
- #define clear_opt(o, opt) o &= ~EXT2_MOUNT_##opt
-diff -NurpP --minimal linux-3.0-rc5/include/linux/ext3_fs.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/ext3_fs.h
---- linux-3.0-rc5/include/linux/ext3_fs.h 2011-07-01 11:14:21.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/ext3_fs.h 2011-06-10 22:11:24.000000000 +0200
-@@ -173,10 +173,14 @@ struct ext3_group_desc
- #define EXT3_NOTAIL_FL 0x00008000 /* file tail should not be merged */
- #define EXT3_DIRSYNC_FL 0x00010000 /* dirsync behaviour (directories only) */
- #define EXT3_TOPDIR_FL 0x00020000 /* Top of directory hierarchies*/
-+#define EXT3_IXUNLINK_FL 0x08000000 /* Immutable invert on unlink */
- #define EXT3_RESERVED_FL 0x80000000 /* reserved for ext3 lib */
-
--#define EXT3_FL_USER_VISIBLE 0x0003DFFF /* User visible flags */
--#define EXT3_FL_USER_MODIFIABLE 0x000380FF /* User modifiable flags */
-+#define EXT3_BARRIER_FL 0x04000000 /* Barrier for chroot() */
-+#define EXT3_COW_FL 0x20000000 /* Copy on Write marker */
++static inline void i_tag_write(struct inode *inode, vtag_t tag)
++{
++ inode->i_tag = make_ktag(&init_user_ns, tag);
++}
+
-+#define EXT3_FL_USER_VISIBLE 0x0103DFFF /* User visible flags */
-+#define EXT3_FL_USER_MODIFIABLE 0x010380FF /* User modifiable flags */
+ static inline unsigned iminor(const struct inode *inode)
+ {
+- return MINOR(inode->i_rdev);
++ return MINOR(inode->i_mdev);
+ }
- /* Flags that should be inherited by new inodes from their parent. */
- #define EXT3_FL_INHERITED (EXT3_SECRM_FL | EXT3_UNRM_FL | EXT3_COMPR_FL |\
-@@ -312,7 +316,8 @@ struct ext3_inode {
- __u16 i_pad1;
- __le16 l_i_uid_high; /* these 2 fields */
- __le16 l_i_gid_high; /* were reserved2[0] */
-- __u32 l_i_reserved2;
-+ __le16 l_i_tag; /* Context Tag */
-+ __u16 l_i_reserved2;
- } linux2;
- struct {
- __u8 h_i_frag; /* Fragment number */
-@@ -343,6 +348,7 @@ struct ext3_inode {
- #define i_gid_low i_gid
- #define i_uid_high osd2.linux2.l_i_uid_high
- #define i_gid_high osd2.linux2.l_i_gid_high
-+#define i_raw_tag osd2.linux2.l_i_tag
- #define i_reserved2 osd2.linux2.l_i_reserved2
+ static inline unsigned imajor(const struct inode *inode)
+ {
+- return MAJOR(inode->i_rdev);
++ return MAJOR(inode->i_mdev);
+ }
- #elif defined(__GNU__)
-@@ -405,6 +411,7 @@ struct ext3_inode {
- #define EXT3_MOUNT_GRPQUOTA 0x200000 /* "old" group quota */
- #define EXT3_MOUNT_DATA_ERR_ABORT 0x400000 /* Abort on file data write
- * error in ordered mode */
-+#define EXT3_MOUNT_TAGGED (1<<24) /* Enable Context Tags */
+ extern struct block_device *I_BDEV(struct inode *inode);
+@@ -788,6 +803,7 @@ struct file {
+ loff_t f_pos;
+ struct fown_struct f_owner;
+ const struct cred *f_cred;
++ vxid_t f_xid;
+ struct file_ra_state f_ra;
- /* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */
- #ifndef _LINUX_EXT2_FS_H
-@@ -919,6 +926,7 @@ extern void ext3_get_inode_flags(struct
- extern void ext3_set_aops(struct inode *inode);
- extern int ext3_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
- u64 start, u64 len);
-+extern int ext3_sync_flags(struct inode *, int, int);
+ u64 f_version;
+@@ -939,6 +955,7 @@ struct file_lock {
+ struct file *fl_file;
+ loff_t fl_start;
+ loff_t fl_end;
++ vxid_t fl_xid;
- /* ioctl.c */
- extern long ext3_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-3.0-rc5/include/linux/fs.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/fs.h
---- linux-3.0-rc5/include/linux/fs.h 2011-07-01 11:14:21.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/fs.h 2011-07-01 11:35:35.000000000 +0200
-@@ -208,6 +208,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 */
-+#define MS_TAGGED (1<<25) /* use generic inode tagging */
-+#define MS_TAGID (1<<26) /* use specific tag for this mount */
-+#define MS_NOTAGCHECK (1<<27) /* don't check tags */
- #define MS_NOSEC (1<<28)
- #define MS_BORN (1<<29)
- #define MS_ACTIVE (1<<30)
-@@ -239,6 +242,14 @@ struct inodes_stat_t {
+ struct fasync_struct * fl_fasync; /* for lease break notifications */
+ /* for lease breaks: */
+@@ -1569,6 +1586,7 @@ struct inode_operations {
+ ssize_t (*getxattr) (struct dentry *, const char *, void *, size_t);
+ ssize_t (*listxattr) (struct dentry *, char *, size_t);
+ int (*removexattr) (struct dentry *, const char *);
++ int (*sync_flags) (struct inode *, int, int);
+ int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start,
+ u64 len);
+ int (*update_time)(struct inode *, struct timespec *, int);
+@@ -1581,6 +1599,7 @@ ssize_t rw_copy_check_uvector(int type,
+ unsigned long nr_segs, unsigned long fast_segs,
+ struct iovec *fast_pointer,
+ struct iovec **ret_pointer);
++ssize_t vfs_sendfile(struct file *, struct file *, loff_t *, size_t, loff_t);
+
+ extern ssize_t vfs_read(struct file *, char __user *, size_t, loff_t *);
+ extern ssize_t vfs_write(struct file *, const char __user *, size_t, loff_t *);
+@@ -1634,6 +1653,14 @@ struct super_operations {
#define S_IMA 1024 /* Inode has an associated IMA struct */
#define S_AUTOMOUNT 2048 /* Automount/referral quasi-directory */
#define S_NOSEC 4096 /* no suid or xattr security attributes */
-+#define S_IXUNLINK 16384 /* Immutable Invert on unlink */
++#define S_IXUNLINK 8192 /* Immutable Invert on unlink */
+
+/* Linux-VServer related Inode flags */
+
/*
* Note that nosuid etc flags are inode-specific: setting some file-system
-@@ -261,12 +272,15 @@ struct inodes_stat_t {
- #define IS_DIRSYNC(inode) (__IS_FLG(inode, MS_SYNCHRONOUS|MS_DIRSYNC) || \
- ((inode)->i_flags & (S_SYNC|S_DIRSYNC)))
+@@ -1658,10 +1685,13 @@ struct super_operations {
#define IS_MANDLOCK(inode) __IS_FLG(inode, MS_MANDLOCK)
--#define IS_NOATIME(inode) __IS_FLG(inode, MS_RDONLY|MS_NOATIME)
--#define IS_I_VERSION(inode) __IS_FLG(inode, MS_I_VERSION)
-+#define IS_NOATIME(inode) __IS_FLG(inode, MS_RDONLY|MS_NOATIME)
-+#define IS_I_VERSION(inode) __IS_FLG(inode, MS_I_VERSION)
+ #define IS_NOATIME(inode) __IS_FLG(inode, MS_RDONLY|MS_NOATIME)
+ #define IS_I_VERSION(inode) __IS_FLG(inode, MS_I_VERSION)
+#define IS_TAGGED(inode) __IS_FLG(inode, MS_TAGGED)
#define IS_NOQUOTA(inode) ((inode)->i_flags & S_NOQUOTA)
#define IS_POSIXACL(inode) __IS_FLG(inode, MS_POSIXACL)
#define IS_DEADDIR(inode) ((inode)->i_flags & S_DEAD)
-@@ -277,6 +291,16 @@ struct inodes_stat_t {
+@@ -1672,6 +1702,16 @@ struct super_operations {
#define IS_AUTOMOUNT(inode) ((inode)->i_flags & S_AUTOMOUNT)
#define IS_NOSEC(inode) ((inode)->i_flags & S_NOSEC)
+# define IS_COW_LINK(inode) (0)
+#endif
+
- /* the read-only stuff doesn't really belong here, but any other place is
- probably as bad and I don't want to create yet another include file. */
-
-@@ -362,11 +386,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 */
-+#define FS_IXUNLINK_FL 0x08000000 /* Immutable invert on unlink */
- #define FS_RESERVED_FL 0x80000000 /* reserved for ext2 lib */
-
--#define FS_FL_USER_VISIBLE 0x0003DFFF /* User visible flags */
--#define FS_FL_USER_MODIFIABLE 0x000380FF /* User modifiable flags */
--
-+#define FS_BARRIER_FL 0x04000000 /* Barrier for chroot() */
-+#define FS_COW_FL 0x20000000 /* Copy on Write marker */
-+
-+#define FS_FL_USER_VISIBLE 0x0103DFFF /* User visible flags */
-+#define FS_FL_USER_MODIFIABLE 0x010380FF /* User modifiable flags */
-
- #define SYNC_FILE_RANGE_WAIT_BEFORE 1
- #define SYNC_FILE_RANGE_WRITE 2
-@@ -447,6 +474,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
-@@ -462,6 +490,7 @@ struct iattr {
- umode_t ia_mode;
- uid_t ia_uid;
- gid_t ia_gid;
-+ tag_t ia_tag;
- loff_t ia_size;
- struct timespec ia_atime;
- struct timespec ia_mtime;
-@@ -475,6 +504,9 @@ struct iattr {
- struct file *ia_file;
- };
+ * Inode state bits. Protected by inode->i_lock
+ *
+@@ -1900,6 +1940,9 @@ extern int rw_verify_area(int, struct fi
+ extern int locks_mandatory_locked(struct inode *);
+ extern int locks_mandatory_area(int, struct inode *, struct file *, loff_t, size_t);
+#define ATTR_FLAG_BARRIER 512 /* Barrier for chroot() */
+#define ATTR_FLAG_IXUNLINK 1024 /* Immutable invert on unlink */
+
/*
- * Includes for diskquotas.
- */
-@@ -740,11 +772,13 @@ struct inode {
- umode_t i_mode;
- uid_t i_uid;
- gid_t i_gid;
-+ tag_t i_tag;
- const struct inode_operations *i_op;
- struct super_block *i_sb;
-
- spinlock_t i_lock; /* i_blocks, i_bytes, maybe i_size */
-- unsigned int i_flags;
-+ unsigned short i_flags;
-+ unsigned short i_vflags;
- unsigned long i_state;
- #ifdef CONFIG_SECURITY
- void *i_security;
-@@ -766,6 +800,7 @@ struct inode {
- atomic_t i_count;
- unsigned int i_nlink;
- dev_t i_rdev;
-+ dev_t i_mdev;
- unsigned int i_blkbits;
- u64 i_version;
- loff_t i_size;
-@@ -890,12 +925,12 @@ static inline void i_size_write(struct i
-
- static inline unsigned iminor(const struct inode *inode)
- {
-- return MINOR(inode->i_rdev);
-+ return MINOR(inode->i_mdev);
- }
-
- static inline unsigned imajor(const struct inode *inode)
- {
-- return MAJOR(inode->i_rdev);
-+ return MAJOR(inode->i_mdev);
- }
-
- extern struct block_device *I_BDEV(struct inode *inode);
-@@ -957,6 +992,7 @@ struct file {
- loff_t f_pos;
- struct fown_struct f_owner;
- const struct cred *f_cred;
-+ xid_t f_xid;
- struct file_ra_state f_ra;
-
- u64 f_version;
-@@ -1101,6 +1137,7 @@ struct file_lock {
- struct file *fl_file;
- loff_t fl_start;
- loff_t fl_end;
-+ xid_t fl_xid;
-
- struct fasync_struct * fl_fasync; /* for lease break notifications */
- unsigned long fl_break_time; /* for nonblocking lease breaks */
-@@ -1600,6 +1637,7 @@ struct inode_operations {
- ssize_t (*getxattr) (struct dentry *, const char *, void *, size_t);
- ssize_t (*listxattr) (struct dentry *, char *, size_t);
- int (*removexattr) (struct dentry *, const char *);
-+ int (*sync_flags) (struct inode *, int, int);
- void (*truncate_range)(struct inode *, loff_t, loff_t);
- int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start,
- u64 len);
-@@ -1618,6 +1656,7 @@ extern ssize_t vfs_readv(struct file *,
- unsigned long, loff_t *);
- extern ssize_t vfs_writev(struct file *, const struct iovec __user *,
- unsigned long, loff_t *);
-+ssize_t vfs_sendfile(struct file *, struct file *, loff_t *, size_t, loff_t);
-
- struct super_operations {
- struct inode *(*alloc_inode)(struct super_block *sb);
-@@ -2437,6 +2476,7 @@ extern int dcache_dir_open(struct inode
+ * Candidates for mandatory locking have the setgid bit set
+ * but no group execute bit - an otherwise meaningless combination.
+@@ -2525,6 +2568,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 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.0-rc5/include/linux/gfs2_ondisk.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/gfs2_ondisk.h
---- linux-3.0-rc5/include/linux/gfs2_ondisk.h 2010-07-07 18:31:55.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/gfs2_ondisk.h 2011-06-10 22:11:24.000000000 +0200
-@@ -211,6 +211,9 @@ enum {
- gfs2fl_NoAtime = 7,
- gfs2fl_Sync = 8,
- gfs2fl_System = 9,
-+ gfs2fl_IXUnlink = 16,
-+ gfs2fl_Barrier = 17,
-+ gfs2fl_Cow = 18,
- gfs2fl_TruncInProg = 29,
- gfs2fl_InheritDirectio = 30,
- gfs2fl_InheritJdata = 31,
-@@ -227,6 +230,9 @@ enum {
- #define GFS2_DIF_NOATIME 0x00000080
- #define GFS2_DIF_SYNC 0x00000100
- #define GFS2_DIF_SYSTEM 0x00000200 /* New in gfs2 */
-+#define GFS2_DIF_IXUNLINK 0x00010000
-+#define GFS2_DIF_BARRIER 0x00020000
-+#define GFS2_DIF_COW 0x00040000
- #define GFS2_DIF_TRUNC_IN_PROG 0x20000000 /* New in gfs2 */
- #define GFS2_DIF_INHERIT_DIRECTIO 0x40000000
- #define GFS2_DIF_INHERIT_JDATA 0x80000000
-diff -NurpP --minimal linux-3.0-rc5/include/linux/if_tun.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/if_tun.h
---- linux-3.0-rc5/include/linux/if_tun.h 2010-08-02 16:52:54.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/if_tun.h 2011-06-10 22:11:24.000000000 +0200
-@@ -53,6 +53,7 @@
- #define TUNDETACHFILTER _IOW('T', 214, struct sock_fprog)
- #define TUNGETVNETHDRSZ _IOR('T', 215, int)
- #define TUNSETVNETHDRSZ _IOW('T', 216, int)
-+#define TUNSETNID _IOW('T', 217, int)
-
- /* TUNSETIFF ifr flags */
- #define IFF_TUN 0x0001
-diff -NurpP --minimal linux-3.0-rc5/include/linux/init_task.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/init_task.h
---- linux-3.0-rc5/include/linux/init_task.h 2011-07-01 11:14:21.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/init_task.h 2011-06-10 22:11:24.000000000 +0200
-@@ -193,6 +193,10 @@ extern struct cred init_cred;
- INIT_FTRACE_GRAPH \
- INIT_TRACE_RECURSION \
+diff -NurpP --minimal linux-3.10.53/include/linux/init_task.h linux-3.10.53-vs2.3.6.8/include/linux/init_task.h
+--- linux-3.10.53/include/linux/init_task.h 2013-05-31 13:45:27.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/init_task.h 2013-08-22 20:30:00.000000000 +0000
+@@ -222,6 +222,10 @@ extern struct task_group root_task_group
INIT_TASK_RCU_PREEMPT(tsk) \
+ INIT_CPUSET_SEQ \
+ INIT_VTIME(tsk) \
+ .xid = 0, \
+ .vx_info = NULL, \
+ .nid = 0, \
}
-diff -NurpP --minimal linux-3.0-rc5/include/linux/ipc.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/ipc.h
---- linux-3.0-rc5/include/linux/ipc.h 2009-12-03 20:02:55.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/ipc.h 2011-06-10 22:11:24.000000000 +0200
-@@ -91,6 +91,7 @@ struct kern_ipc_perm
+diff -NurpP --minimal linux-3.10.53/include/linux/ipc.h linux-3.10.53-vs2.3.6.8/include/linux/ipc.h
+--- linux-3.10.53/include/linux/ipc.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/ipc.h 2013-08-22 20:30:00.000000000 +0000
+@@ -16,6 +16,7 @@ struct kern_ipc_perm
key_t key;
- uid_t uid;
- gid_t gid;
-+ xid_t xid;
- uid_t cuid;
- gid_t cgid;
- mode_t mode;
-diff -NurpP --minimal linux-3.0-rc5/include/linux/ipc_namespace.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/ipc_namespace.h
---- linux-3.0-rc5/include/linux/ipc_namespace.h 2011-05-22 16:17:55.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/ipc_namespace.h 2011-06-13 14:09:44.000000000 +0200
-@@ -94,7 +94,8 @@ static inline int mq_init_ns(struct ipc_
-
- #if defined(CONFIG_IPC_NS)
- extern struct ipc_namespace *copy_ipcs(unsigned long flags,
-- struct task_struct *tsk);
-+ struct ipc_namespace *old_ns,
-+ struct user_namespace *user_ns);
- static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns)
- {
- if (ns)
-@@ -105,12 +106,13 @@ static inline struct ipc_namespace *get_
- extern void put_ipc_ns(struct ipc_namespace *ns);
- #else
- static inline struct ipc_namespace *copy_ipcs(unsigned long flags,
-- struct task_struct *tsk)
-+ struct ipc_namespace *old_ns,
-+ struct user_namespace *user_ns)
- {
- if (flags & CLONE_NEWIPC)
- return ERR_PTR(-EINVAL);
-
-- return tsk->nsproxy->ipc_ns;
-+ return old_ns;
- }
-
- static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns)
-diff -NurpP --minimal linux-3.0-rc5/include/linux/loop.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/loop.h
---- linux-3.0-rc5/include/linux/loop.h 2009-09-10 15:26:25.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/loop.h 2011-06-10 22:11:24.000000000 +0200
-@@ -45,6 +45,7 @@ struct loop_device {
+ kuid_t uid;
+ kgid_t gid;
++ vxid_t xid;
+ kuid_t cuid;
+ kgid_t cgid;
+ umode_t mode;
+diff -NurpP --minimal linux-3.10.53/include/linux/loop.h linux-3.10.53-vs2.3.6.8/include/linux/loop.h
+--- linux-3.10.53/include/linux/loop.h 2013-02-19 13:58:51.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/loop.h 2013-08-22 20:30:00.000000000 +0000
+@@ -41,6 +41,7 @@ struct loop_device {
struct loop_func_table *lo_encryption;
__u32 lo_init[2];
- uid_t lo_key_owner; /* Who set the key */
-+ xid_t lo_xid;
+ 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.0-rc5/include/linux/magic.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/magic.h
---- linux-3.0-rc5/include/linux/magic.h 2011-05-22 16:17:55.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/magic.h 2011-06-10 22:11:24.000000000 +0200
-@@ -3,7 +3,7 @@
-
- #define ADFS_SUPER_MAGIC 0xadf5
- #define AFFS_SUPER_MAGIC 0xadff
--#define AFS_SUPER_MAGIC 0x5346414F
-+#define AFS_SUPER_MAGIC 0x5346414F
- #define AUTOFS_SUPER_MAGIC 0x0187
- #define CODA_SUPER_MAGIC 0x73757245
- #define CRAMFS_MAGIC 0x28cd3d45 /* some random number */
-@@ -41,6 +41,7 @@
- #define NFS_SUPER_MAGIC 0x6969
- #define OPENPROM_SUPER_MAGIC 0x9fa1
- #define PROC_SUPER_MAGIC 0x9fa0
-+#define DEVPTS_SUPER_MAGIC 0x1cd1
- #define QNX4_SUPER_MAGIC 0x002f /* qnx4 fs detection */
-
- #define REISERFS_SUPER_MAGIC 0x52654973 /* used by gcc */
-diff -NurpP --minimal linux-3.0-rc5/include/linux/major.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/major.h
---- linux-3.0-rc5/include/linux/major.h 2009-09-10 15:26:25.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/major.h 2011-06-10 22:11:24.000000000 +0200
-@@ -15,6 +15,7 @@
- #define HD_MAJOR IDE0_MAJOR
- #define PTY_SLAVE_MAJOR 3
- #define TTY_MAJOR 4
-+#define VROOT_MAJOR 4
- #define TTYAUX_MAJOR 5
- #define LP_MAJOR 6
- #define VCS_MAJOR 7
-diff -NurpP --minimal linux-3.0-rc5/include/linux/memcontrol.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/memcontrol.h
---- linux-3.0-rc5/include/linux/memcontrol.h 2011-07-01 11:14:21.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/memcontrol.h 2011-06-22 12:39:15.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/include/linux/memcontrol.h linux-3.10.53-vs2.3.6.8/include/linux/memcontrol.h
+--- linux-3.10.53/include/linux/memcontrol.h 2013-05-31 13:45:28.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/memcontrol.h 2013-08-22 20:30:00.000000000 +0000
@@ -86,6 +86,13 @@ extern struct mem_cgroup *try_get_mem_cg
- extern struct mem_cgroup *mem_cgroup_from_task(struct task_struct *p);
- extern struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm);
+ extern struct mem_cgroup *parent_mem_cgroup(struct mem_cgroup *memcg);
+ extern struct mem_cgroup *mem_cgroup_from_cont(struct cgroup *cont);
+extern u64 mem_cgroup_res_read_u64(struct mem_cgroup *mem, int member);
+extern u64 mem_cgroup_memsw_read_u64(struct mem_cgroup *mem, int member);
+extern s64 mem_cgroup_stat_read_mapped(struct mem_cgroup *mem);
+
static inline
- int mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *cgroup)
+ bool mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *memcg)
{
-diff -NurpP --minimal linux-3.0-rc5/include/linux/mm_types.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/mm_types.h
---- linux-3.0-rc5/include/linux/mm_types.h 2011-07-01 11:14:21.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/mm_types.h 2011-06-10 22:11:24.000000000 +0200
-@@ -268,6 +268,7 @@ struct mm_struct {
+diff -NurpP --minimal linux-3.10.53/include/linux/mm_types.h linux-3.10.53-vs2.3.6.8/include/linux/mm_types.h
+--- linux-3.10.53/include/linux/mm_types.h 2014-08-30 13:38:59.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/mm_types.h 2014-01-22 19:00:34.000000000 +0000
+@@ -381,6 +381,7 @@ struct mm_struct {
/* Architecture-specific MM context */
mm_context_t context;
+ struct vx_info *mm_vx_info;
- /* Swap token stuff */
- /*
-diff -NurpP --minimal linux-3.0-rc5/include/linux/mmzone.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/mmzone.h
---- linux-3.0-rc5/include/linux/mmzone.h 2011-07-01 11:14:21.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/mmzone.h 2011-07-01 11:35:35.000000000 +0200
-@@ -654,6 +654,13 @@ typedef struct pglist_data {
- __pgdat->node_start_pfn + __pgdat->node_spanned_pages;\
- })
-
-+#define node_start_pfn(nid) (NODE_DATA(nid)->node_start_pfn)
-+
-+#define node_end_pfn(nid) ({\
-+ pg_data_t *__pgdat = NODE_DATA(nid);\
-+ __pgdat->node_start_pfn + __pgdat->node_spanned_pages;\
-+})
-+
- #include <linux/memory_hotplug.h>
-
- extern struct mutex zonelists_mutex;
-diff -NurpP --minimal linux-3.0-rc5/include/linux/mount.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/mount.h
---- linux-3.0-rc5/include/linux/mount.h 2011-03-15 18:07:39.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/mount.h 2011-06-10 22:11:24.000000000 +0200
-@@ -52,6 +52,9 @@ struct mnt_pcp {
- int mnt_writers;
- };
+ unsigned long flags; /* Must use atomic bitops to access the bits */
+
+diff -NurpP --minimal linux-3.10.53/include/linux/mount.h linux-3.10.53-vs2.3.6.8/include/linux/mount.h
+--- linux-3.10.53/include/linux/mount.h 2013-05-31 13:45:28.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/mount.h 2013-08-22 20:30:00.000000000 +0000
+@@ -49,6 +49,9 @@ struct mnt_namespace;
+
+ #define MNT_LOCK_READONLY 0x400000
+#define MNT_TAGID 0x10000
+#define MNT_NOTAG 0x20000
+
struct vfsmount {
- struct list_head mnt_hash;
- struct vfsmount *mnt_parent; /* fs we are mounted on */
-@@ -86,6 +89,7 @@ struct vfsmount {
- int mnt_expiry_mark; /* true if marked for expiry */
- int mnt_pinned;
- int mnt_ghosts;
-+ tag_t mnt_tag; /* tagging used for vfsmount */
- };
-
- struct file; /* forward dec */
-diff -NurpP --minimal linux-3.0-rc5/include/linux/net.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/net.h
---- linux-3.0-rc5/include/linux/net.h 2011-07-01 11:14:21.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/net.h 2011-06-10 22:11:24.000000000 +0200
-@@ -72,6 +72,7 @@ struct net;
- #define SOCK_NOSPACE 2
+ struct dentry *mnt_root; /* root of the mounted tree */
+ struct super_block *mnt_sb; /* pointer to superblock */
+diff -NurpP --minimal linux-3.10.53/include/linux/net.h linux-3.10.53-vs2.3.6.8/include/linux/net.h
+--- linux-3.10.53/include/linux/net.h 2014-08-30 13:38:59.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/net.h 2014-01-22 19:00:34.000000000 +0000
+@@ -38,6 +38,7 @@ struct net;
#define SOCK_PASSCRED 3
#define SOCK_PASSSEC 4
-+#define SOCK_USER_SOCKET 5
+ #define SOCK_EXTERNALLY_ALLOCATED 5
++#define SOCK_USER_SOCKET 6
#ifndef ARCH_HAS_SOCKET_TYPES
/**
-diff -NurpP --minimal linux-3.0-rc5/include/linux/nfs_mount.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/nfs_mount.h
---- linux-3.0-rc5/include/linux/nfs_mount.h 2011-01-05 21:50:31.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/nfs_mount.h 2011-06-10 22:11:24.000000000 +0200
-@@ -63,7 +63,8 @@ struct nfs_mount_data {
- #define NFS_MOUNT_SECFLAVOUR 0x2000 /* 5 */
- #define NFS_MOUNT_NORDIRPLUS 0x4000 /* 5 */
- #define NFS_MOUNT_UNSHARED 0x8000 /* 5 */
--#define NFS_MOUNT_FLAGMASK 0xFFFF
-+#define NFS_MOUNT_TAGGED 0x10000 /* context tagging */
-+#define NFS_MOUNT_FLAGMASK 0x1FFFF
-
- /* The following are for internal use only */
- #define NFS_MOUNT_LOOKUP_CACHE_NONEG 0x10000
-diff -NurpP --minimal linux-3.0-rc5/include/linux/nsproxy.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/nsproxy.h
---- linux-3.0-rc5/include/linux/nsproxy.h 2011-07-01 11:14:21.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/nsproxy.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/include/linux/netdevice.h linux-3.10.53-vs2.3.6.8/include/linux/netdevice.h
+--- linux-3.10.53/include/linux/netdevice.h 2014-08-30 13:38:59.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/netdevice.h 2014-03-12 13:18:32.000000000 +0000
+@@ -1694,6 +1694,7 @@ extern int init_dummy_netdev(struct net
+
+ 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 netdev_get_name(struct net *net, char *name, int ifindex);
+ extern int dev_restart(struct net_device *dev);
+diff -NurpP --minimal linux-3.10.53/include/linux/nsproxy.h linux-3.10.53-vs2.3.6.8/include/linux/nsproxy.h
+--- linux-3.10.53/include/linux/nsproxy.h 2013-02-19 13:58:51.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/nsproxy.h 2013-08-22 20:30:00.000000000 +0000
@@ -3,6 +3,7 @@
#include <linux/spinlock.h>
struct mnt_namespace;
struct uts_namespace;
-@@ -63,22 +64,33 @@ static inline struct nsproxy *task_nspro
+@@ -63,6 +64,7 @@ static inline struct nsproxy *task_nspro
}
int copy_namespaces(unsigned long flags, struct task_struct *tsk);
void exit_task_namespaces(struct task_struct *tsk);
void switch_task_namespaces(struct task_struct *tsk, struct nsproxy *new);
void free_nsproxy(struct nsproxy *ns);
- int unshare_nsproxy_namespaces(unsigned long, struct nsproxy **,
- struct fs_struct *);
+@@ -70,16 +72,26 @@ int unshare_nsproxy_namespaces(unsigned
+ struct cred *, struct fs_struct *);
+ int __init nsproxy_cache_init(void);
-static inline void put_nsproxy(struct nsproxy *ns)
+#define get_nsproxy(n) __get_nsproxy(n, __FILE__, __LINE__)
}
#endif
-diff -NurpP --minimal linux-3.0-rc5/include/linux/pid.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/pid.h
---- linux-3.0-rc5/include/linux/pid.h 2011-07-01 11:14:21.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/pid.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/include/linux/pid.h linux-3.10.53-vs2.3.6.8/include/linux/pid.h
+--- linux-3.10.53/include/linux/pid.h 2013-05-31 13:45:28.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/pid.h 2013-08-22 20:30:00.000000000 +0000
@@ -8,7 +8,8 @@ enum pid_type
PIDTYPE_PID,
PIDTYPE_PGID,
};
/*
-@@ -171,6 +172,7 @@ static inline pid_t pid_nr(struct pid *p
+@@ -172,6 +173,7 @@ static inline pid_t pid_nr(struct pid *p
}
pid_t pid_nr_ns(struct pid *pid, struct pid_namespace *ns);
pid_t pid_vnr(struct pid *pid);
#define do_each_pid_task(pid, type, task) \
-diff -NurpP --minimal linux-3.0-rc5/include/linux/proc_fs.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/proc_fs.h
---- linux-3.0-rc5/include/linux/proc_fs.h 2011-07-01 11:14:21.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/proc_fs.h 2011-06-10 22:11:24.000000000 +0200
-@@ -56,6 +56,7 @@ struct proc_dir_entry {
- nlink_t nlink;
- uid_t uid;
- gid_t gid;
-+ int vx_flags;
- loff_t size;
- const struct inode_operations *proc_iops;
- /*
-@@ -252,12 +253,18 @@ extern const struct proc_ns_operations n
- extern const struct proc_ns_operations utsns_operations;
- extern const struct proc_ns_operations ipcns_operations;
-
-+struct vx_info;
-+struct nx_info;
-+
- union proc_op {
- int (*proc_get_link)(struct inode *, 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;
-@@ -265,6 +272,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.0-rc5/include/linux/quotaops.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/quotaops.h
---- linux-3.0-rc5/include/linux/quotaops.h 2011-05-22 16:17:57.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/quotaops.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/include/linux/quotaops.h linux-3.10.53-vs2.3.6.8/include/linux/quotaops.h
+--- linux-3.10.53/include/linux/quotaops.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/quotaops.h 2013-08-22 20:30:00.000000000 +0000
@@ -8,6 +8,7 @@
#define _LINUX_QUOTAOPS_
#define DQUOT_SPACE_WARN 0x1
#define DQUOT_SPACE_RESERVE 0x2
-@@ -204,11 +205,12 @@ static inline void dquot_drop(struct ino
+@@ -205,11 +206,12 @@ static inline void dquot_drop(struct ino
static inline int dquot_alloc_inode(const struct inode *inode)
{
}
static inline int dquot_transfer(struct inode *inode, struct iattr *iattr)
-@@ -219,6 +221,10 @@ static inline int dquot_transfer(struct
+@@ -220,6 +222,10 @@ static inline int dquot_transfer(struct
static inline int __dquot_alloc_space(struct inode *inode, qsize_t number,
int flags)
{
if (!(flags & DQUOT_SPACE_RESERVE))
inode_add_bytes(inode, number);
return 0;
-@@ -229,6 +235,7 @@ static inline void __dquot_free_space(st
+@@ -230,6 +236,7 @@ static inline void __dquot_free_space(st
{
if (!(flags & DQUOT_SPACE_RESERVE))
inode_sub_bytes(inode, number);
}
static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
-diff -NurpP --minimal linux-3.0-rc5/include/linux/reboot.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/reboot.h
---- linux-3.0-rc5/include/linux/reboot.h 2010-07-07 18:31:56.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/reboot.h 2011-06-10 22:11:24.000000000 +0200
-@@ -33,6 +33,7 @@
- #define LINUX_REBOOT_CMD_RESTART2 0xA1B2C3D4
- #define LINUX_REBOOT_CMD_SW_SUSPEND 0xD000FCE2
- #define LINUX_REBOOT_CMD_KEXEC 0x45584543
-+#define LINUX_REBOOT_CMD_OOM 0xDEADBEEF
-
-
- #ifdef __KERNEL__
-diff -NurpP --minimal linux-3.0-rc5/include/linux/reiserfs_fs.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/reiserfs_fs.h
---- linux-3.0-rc5/include/linux/reiserfs_fs.h 2011-05-22 16:17:58.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/reiserfs_fs.h 2011-06-10 22:11:24.000000000 +0200
-@@ -976,6 +976,11 @@ struct stat_data_v1 {
- #define REISERFS_COMPR_FL FS_COMPR_FL
- #define REISERFS_NOTAIL_FL FS_NOTAIL_FL
-
-+/* unfortunately reiserfs sdattr is only 16 bit */
-+#define REISERFS_IXUNLINK_FL (FS_IXUNLINK_FL >> 16)
-+#define REISERFS_BARRIER_FL (FS_BARRIER_FL >> 16)
-+#define REISERFS_COW_FL (FS_COW_FL >> 16)
-+
- /* persistent flags that file inherits from the parent directory */
- #define REISERFS_INHERIT_MASK ( REISERFS_IMMUTABLE_FL | \
- REISERFS_SYNC_FL | \
-@@ -985,6 +990,9 @@ struct stat_data_v1 {
- REISERFS_COMPR_FL | \
- REISERFS_NOTAIL_FL )
-
-+#define REISERFS_FL_USER_VISIBLE 0x80FF
-+#define REISERFS_FL_USER_MODIFIABLE 0x80FF
-+
- /* Stat Data on disk (reiserfs version of UFS disk inode minus the
- address blocks) */
- struct stat_data {
-@@ -2073,6 +2081,7 @@ static inline void reiserfs_update_sd(st
- void sd_attrs_to_i_attrs(__u16 sd_attrs, struct inode *inode);
- void i_attrs_to_sd_attrs(struct inode *inode, __u16 * sd_attrs);
- int reiserfs_setattr(struct dentry *dentry, struct iattr *attr);
-+int reiserfs_sync_flags(struct inode *inode, int, int);
-
- int __reiserfs_write_begin(struct page *page, unsigned from, unsigned len);
-
-diff -NurpP --minimal linux-3.0-rc5/include/linux/reiserfs_fs_sb.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/reiserfs_fs_sb.h
---- linux-3.0-rc5/include/linux/reiserfs_fs_sb.h 2010-02-25 11:52:07.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/reiserfs_fs_sb.h 2011-06-10 22:11:24.000000000 +0200
-@@ -476,6 +476,7 @@ enum reiserfs_mount_options {
- REISERFS_EXPOSE_PRIVROOT,
- REISERFS_BARRIER_NONE,
- REISERFS_BARRIER_FLUSH,
-+ REISERFS_TAGGED,
-
- /* Actions on error */
- REISERFS_ERROR_PANIC,
-diff -NurpP --minimal linux-3.0-rc5/include/linux/sched.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/sched.h
---- linux-3.0-rc5/include/linux/sched.h 2011-07-01 11:14:21.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/sched.h 2011-06-15 02:40:14.000000000 +0200
-@@ -1397,6 +1397,14 @@ struct task_struct {
+diff -NurpP --minimal linux-3.10.53/include/linux/sched.h linux-3.10.53-vs2.3.6.8/include/linux/sched.h
+--- linux-3.10.53/include/linux/sched.h 2014-08-30 13:38:59.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/sched.h 2013-11-30 07:53:00.000000000 +0000
+@@ -1237,6 +1237,14 @@ struct task_struct {
#endif
- seccomp_t seccomp;
+ struct seccomp seccomp;
+/* vserver context data */
+ 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;
-@@ -1640,6 +1648,11 @@ struct pid_namespace;
+@@ -1480,6 +1488,11 @@ struct pid_namespace;
pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
struct pid_namespace *ns);
static inline pid_t task_pid_nr(struct task_struct *tsk)
{
return tsk->pid;
-@@ -1653,7 +1666,8 @@ static inline pid_t task_pid_nr_ns(struc
+@@ -1493,7 +1506,8 @@ static inline pid_t task_pid_nr_ns(struc
static inline pid_t task_pid_vnr(struct task_struct *tsk)
{
}
-@@ -1666,7 +1680,7 @@ pid_t task_tgid_nr_ns(struct task_struct
+@@ -1506,7 +1520,7 @@ pid_t task_tgid_nr_ns(struct task_struct
static inline pid_t task_tgid_vnr(struct task_struct *tsk)
{
}
-diff -NurpP --minimal linux-3.0-rc5/include/linux/shmem_fs.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/shmem_fs.h
---- linux-3.0-rc5/include/linux/shmem_fs.h 2011-07-01 11:14:21.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/shmem_fs.h 2011-07-01 11:35:35.000000000 +0200
-@@ -12,6 +12,9 @@
+diff -NurpP --minimal linux-3.10.53/include/linux/shmem_fs.h linux-3.10.53-vs2.3.6.8/include/linux/shmem_fs.h
+--- linux-3.10.53/include/linux/shmem_fs.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/shmem_fs.h 2013-08-22 20:30:00.000000000 +0000
+@@ -9,6 +9,9 @@
- #define SHMEM_SYMLINK_INLINE_LEN (SHMEM_NR_DIRECT * sizeof(swp_entry_t))
+ /* inode in-kernel data */
+#define TMPFS_SUPER_MAGIC 0x01021994
+
struct shmem_inode_info {
spinlock_t lock;
unsigned long flags;
-diff -NurpP --minimal linux-3.0-rc5/include/linux/stat.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/stat.h
---- linux-3.0-rc5/include/linux/stat.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/stat.h 2011-06-10 22:11:24.000000000 +0200
-@@ -66,6 +66,7 @@ struct kstat {
+diff -NurpP --minimal linux-3.10.53/include/linux/stat.h linux-3.10.53-vs2.3.6.8/include/linux/stat.h
+--- linux-3.10.53/include/linux/stat.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/stat.h 2013-08-22 20:30:00.000000000 +0000
+@@ -25,6 +25,7 @@ struct kstat {
unsigned int nlink;
- uid_t uid;
- gid_t gid;
-+ tag_t tag;
+ kuid_t uid;
+ kgid_t gid;
++ ktag_t tag;
dev_t rdev;
loff_t size;
struct timespec atime;
-diff -NurpP --minimal linux-3.0-rc5/include/linux/sunrpc/auth.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/sunrpc/auth.h
---- linux-3.0-rc5/include/linux/sunrpc/auth.h 2011-03-15 18:07:39.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/sunrpc/auth.h 2011-06-10 22:11:24.000000000 +0200
-@@ -25,6 +25,7 @@
+diff -NurpP --minimal linux-3.10.53/include/linux/sunrpc/auth.h linux-3.10.53-vs2.3.6.8/include/linux/sunrpc/auth.h
+--- linux-3.10.53/include/linux/sunrpc/auth.h 2013-07-14 17:01:33.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/sunrpc/auth.h 2013-08-22 20:30:00.000000000 +0000
+@@ -28,6 +28,7 @@ struct rpcsec_gss_info;
struct auth_cred {
- uid_t uid;
- gid_t gid;
-+ tag_t tag;
+ 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.0-rc5/include/linux/sunrpc/clnt.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/sunrpc/clnt.h
---- linux-3.0-rc5/include/linux/sunrpc/clnt.h 2011-05-22 16:17:58.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/sunrpc/clnt.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/include/linux/sunrpc/clnt.h linux-3.10.53-vs2.3.6.8/include/linux/sunrpc/clnt.h
+--- linux-3.10.53/include/linux/sunrpc/clnt.h 2013-07-14 17:01:33.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/sunrpc/clnt.h 2013-08-22 20:30:00.000000000 +0000
@@ -49,7 +49,8 @@ struct rpc_clnt {
unsigned int cl_softrtry : 1,/* soft timeouts */
cl_discrtry : 1,/* disconnect before retry */
struct rpc_rtt * cl_rtt; /* RTO estimator data */
const struct rpc_timeout *cl_timeout; /* Timeout strategy */
-diff -NurpP --minimal linux-3.0-rc5/include/linux/syscalls.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/syscalls.h
---- linux-3.0-rc5/include/linux/syscalls.h 2011-07-01 11:14:22.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/syscalls.h 2011-06-10 22:11:24.000000000 +0200
-@@ -483,6 +483,8 @@ asmlinkage long sys_symlink(const char _
- asmlinkage long sys_unlink(const char __user *pathname);
- asmlinkage long sys_rename(const char __user *oldname,
- const char __user *newname);
-+asmlinkage long sys_copyfile(const char __user *from, const char __user *to,
-+ umode_t mode);
- asmlinkage long sys_chmod(const char __user *filename, mode_t mode);
- asmlinkage long sys_fchmod(unsigned int fd, mode_t mode);
-
-diff -NurpP --minimal linux-3.0-rc5/include/linux/sysctl.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/sysctl.h
---- linux-3.0-rc5/include/linux/sysctl.h 2011-03-15 18:07:40.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/sysctl.h 2011-06-10 22:11:24.000000000 +0200
-@@ -60,6 +60,7 @@ enum
- CTL_ABI=9, /* Binary emulation */
- CTL_CPU=10, /* CPU stuff (speed scaling, etc) */
- CTL_ARLAN=254, /* arlan wireless driver */
-+ CTL_VSERVER=4242, /* Linux-VServer debug */
- CTL_S390DBF=5677, /* s390 debug */
- CTL_SUNRPC=7249, /* sunrpc debug */
- CTL_PM=9899, /* frv power management */
-@@ -94,6 +95,7 @@ enum
-
- KERN_PANIC=15, /* int: panic timeout */
- KERN_REALROOTDEV=16, /* real root device to mount after initrd */
-+ KERN_VSHELPER=17, /* string: path to vshelper policy agent */
-
- KERN_SPARC_REBOOT=21, /* reboot command on Sparc */
- KERN_CTLALTDEL=22, /* int: allow ctl-alt-del to reboot */
-diff -NurpP --minimal linux-3.0-rc5/include/linux/sysfs.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/sysfs.h
---- linux-3.0-rc5/include/linux/sysfs.h 2011-07-01 11:14:22.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/sysfs.h 2011-06-22 12:39:15.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/include/linux/sysfs.h linux-3.10.53-vs2.3.6.8/include/linux/sysfs.h
+--- linux-3.10.53/include/linux/sysfs.h 2013-05-31 13:45:28.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/sysfs.h 2013-08-22 20:30:00.000000000 +0000
@@ -19,6 +19,8 @@
#include <linux/kobject_ns.h>
- #include <asm/atomic.h>
+ #include <linux/atomic.h>
+#define SYSFS_SUPER_MAGIC 0x62656572
+
struct kobject;
struct module;
enum kobj_ns_type;
-diff -NurpP --minimal linux-3.0-rc5/include/linux/time.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/time.h
---- linux-3.0-rc5/include/linux/time.h 2011-07-01 11:14:22.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/time.h 2011-06-10 22:11:24.000000000 +0200
-@@ -256,6 +256,9 @@ static __always_inline void timespec_add
- a->tv_sec += __iter_div_u64_rem(a->tv_nsec + ns, NSEC_PER_SEC, &ns);
- a->tv_nsec = ns;
- }
-+
-+#include <linux/vs_time.h>
-+
- #endif /* __KERNEL__ */
-
- #define NFDBITS __NFDBITS
-diff -NurpP --minimal linux-3.0-rc5/include/linux/types.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/types.h
---- linux-3.0-rc5/include/linux/types.h 2011-05-22 16:17:58.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/types.h 2011-06-10 22:11:24.000000000 +0200
-@@ -40,6 +40,9 @@ typedef __kernel_uid32_t uid_t;
+diff -NurpP --minimal linux-3.10.53/include/linux/types.h linux-3.10.53-vs2.3.6.8/include/linux/types.h
+--- linux-3.10.53/include/linux/types.h 2013-02-19 13:58:52.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/types.h 2013-08-22 20:30:00.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.0-rc5/include/linux/utsname.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/utsname.h
---- linux-3.0-rc5/include/linux/utsname.h 2011-05-22 16:17:58.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/utsname.h 2011-06-13 14:36:48.000000000 +0200
-@@ -54,7 +54,8 @@ static inline void get_uts_ns(struct uts
- }
+diff -NurpP --minimal linux-3.10.53/include/linux/uidgid.h linux-3.10.53-vs2.3.6.8/include/linux/uidgid.h
+--- linux-3.10.53/include/linux/uidgid.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/uidgid.h 2013-08-22 20:30:00.000000000 +0000
+@@ -23,13 +23,17 @@ typedef struct {
+ uid_t val;
+ } kuid_t;
- extern struct uts_namespace *copy_utsname(unsigned long flags,
-- struct task_struct *tsk);
-+ struct uts_namespace *old_ns,
-+ struct user_namespace *user_ns);
- extern void free_uts_ns(struct kref *kref);
+-
+ typedef struct {
+ gid_t val;
+ } kgid_t;
- static inline void put_uts_ns(struct uts_namespace *ns)
-@@ -71,12 +72,13 @@ static inline void put_uts_ns(struct uts
- }
++typedef struct {
++ vtag_t val;
++} ktag_t;
++
+ #define KUIDT_INIT(value) (kuid_t){ value }
+ #define KGIDT_INIT(value) (kgid_t){ value }
++#define KTAGT_INIT(value) (ktag_t){ value }
- static inline struct uts_namespace *copy_utsname(unsigned long flags,
-- struct task_struct *tsk)
-+ struct uts_namespace *old_ns,
-+ struct user_namespace *user_ns)
+ static inline uid_t __kuid_val(kuid_t uid)
{
- if (flags & CLONE_NEWUTS)
- return ERR_PTR(-EINVAL);
+@@ -41,10 +45,16 @@ static inline gid_t __kgid_val(kgid_t gi
+ return gid.val;
+ }
+
++static inline vtag_t __ktag_val(ktag_t tag)
++{
++ return tag.val;
++}
++
+ #else
+
+ typedef uid_t kuid_t;
+ typedef gid_t kgid_t;
++typedef vtag_t ktag_t;
-- return tsk->nsproxy->uts_ns;
-+ return old_ns;
+ 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 vtag_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
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vroot.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vroot.h
---- linux-3.0-rc5/include/linux/vroot.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vroot.h 2011-06-10 22:11:24.000000000 +0200
+ #define GLOBAL_ROOT_UID KUIDT_INIT(0)
+ #define GLOBAL_ROOT_GID KGIDT_INIT(0)
++#define GLOBAL_ROOT_TAG KTAGT_INIT(0)
+
+ #define INVALID_UID KUIDT_INIT(-1)
+ #define INVALID_GID KGIDT_INIT(-1)
++#define INVALID_TAG KTAGT_INIT(-1)
+
+ static inline bool uid_eq(kuid_t left, kuid_t right)
+ {
+@@ -77,6 +95,11 @@ static inline bool gid_eq(kgid_t left, k
+ return __kgid_val(left) == __kgid_val(right);
+ }
+
++static inline bool tag_eq(ktag_t left, ktag_t right)
++{
++ return __ktag_val(left) == __ktag_val(right);
++}
++
+ 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)
+ return !gid_eq(gid, INVALID_GID);
+ }
+
++static inline bool tag_valid(ktag_t tag)
++{
++ return !tag_eq(tag, INVALID_TAG);
++}
++
+ #ifdef CONFIG_USER_NS
+
+ 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 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 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
+ return KGIDT_INIT(gid);
+ }
+
++static inline ktag_t make_ktag(struct user_namespace *from, vtag_t tag)
++{
++ return KTAGT_INIT(tag);
++}
++
+ 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
+ return __kgid_val(kgid);
+ }
+
++static inline vtag_t from_ktag(struct user_namespace *to, ktag_t ktag)
++{
++ return __ktag_val(ktag);
++}
++
+ 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.10.53/include/linux/vroot.h linux-3.10.53-vs2.3.6.8/include/linux/vroot.h
+--- linux-3.10.53/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vroot.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,51 @@
+
+/*
+#define VROOT_CLR_DEV 0x5601
+
+#endif /* _LINUX_VROOT_H */
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vs_base.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vs_base.h
---- linux-3.0-rc5/include/linux/vs_base.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vs_base.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/include/linux/vs_base.h linux-3.10.53-vs2.3.6.8/include/linux/vs_base.h
+--- linux-3.10.53/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vs_base.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,10 @@
+#ifndef _VS_BASE_H
+#define _VS_BASE_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vs_context.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vs_context.h
---- linux-3.0-rc5/include/linux/vs_context.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vs_context.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/include/linux/vs_context.h linux-3.10.53-vs2.3.6.8/include/linux/vs_context.h
+--- linux-3.10.53/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vs_context.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,242 @@
+#ifndef _VS_CONTEXT_H
+#define _VS_CONTEXT_H
+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)
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vs_cowbl.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vs_cowbl.h
---- linux-3.0-rc5/include/linux/vs_cowbl.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vs_cowbl.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/include/linux/vs_cowbl.h linux-3.10.53-vs2.3.6.8/include/linux/vs_cowbl.h
+--- linux-3.10.53/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vs_cowbl.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,48 @@
+#ifndef _VS_COWBL_H
+#define _VS_COWBL_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vs_cvirt.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vs_cvirt.h
---- linux-3.0-rc5/include/linux/vs_cvirt.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vs_cvirt.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/include/linux/vs_cvirt.h linux-3.10.53-vs2.3.6.8/include/linux/vs_cvirt.h
+--- linux-3.10.53/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vs_cvirt.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,50 @@
+#ifndef _VS_CVIRT_H
+#define _VS_CVIRT_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vs_device.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vs_device.h
---- linux-3.0-rc5/include/linux/vs_device.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vs_device.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/include/linux/vs_device.h linux-3.10.53-vs2.3.6.8/include/linux/vs_device.h
+--- linux-3.10.53/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vs_device.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,45 @@
+#ifndef _VS_DEVICE_H
+#define _VS_DEVICE_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vs_dlimit.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vs_dlimit.h
---- linux-3.0-rc5/include/linux/vs_dlimit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vs_dlimit.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/include/linux/vs_dlimit.h linux-3.10.53-vs2.3.6.8/include/linux/vs_dlimit.h
+--- linux-3.10.53/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vs_dlimit.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,215 @@
+#ifndef _VS_DLIMIT_H
+#define _VS_DLIMIT_H
+#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;
+}
+
+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;
+
+}
+
+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;
+}
+
+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;
+
+ 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)
+{
+}
+
+#define dl_prealloc_space(in, bytes) \
-+ __dl_alloc_space((in)->i_sb, (in)->i_tag, (dlsize_t)(bytes), \
++ __dl_alloc_space((in)->i_sb, i_tag_read(in), (dlsize_t)(bytes), \
+ __FILE__, __LINE__ )
+
+#define dl_alloc_space(in, bytes) \
-+ __dl_alloc_space((in)->i_sb, (in)->i_tag, (dlsize_t)(bytes), \
++ __dl_alloc_space((in)->i_sb, i_tag_read(in), (dlsize_t)(bytes), \
+ __FILE__, __LINE__ )
+
+#define dl_reserve_space(in, bytes) \
-+ __dl_alloc_space((in)->i_sb, (in)->i_tag, (dlsize_t)(bytes), \
++ __dl_alloc_space((in)->i_sb, i_tag_read(in), (dlsize_t)(bytes), \
+ __FILE__, __LINE__ )
+
+#define dl_claim_space(in, bytes) (0)
+
+#define dl_release_space(in, bytes) \
-+ __dl_free_space((in)->i_sb, (in)->i_tag, (dlsize_t)(bytes), \
++ __dl_free_space((in)->i_sb, i_tag_read(in), (dlsize_t)(bytes), \
+ __FILE__, __LINE__ )
+
+#define dl_free_space(in, bytes) \
-+ __dl_free_space((in)->i_sb, (in)->i_tag, (dlsize_t)(bytes), \
++ __dl_free_space((in)->i_sb, i_tag_read(in), (dlsize_t)(bytes), \
+ __FILE__, __LINE__ )
+
+
+
+#define dl_alloc_inode(in) \
-+ __dl_alloc_inode((in)->i_sb, (in)->i_tag, __FILE__, __LINE__ )
++ __dl_alloc_inode((in)->i_sb, i_tag_read(in), __FILE__, __LINE__ )
+
+#define dl_free_inode(in) \
-+ __dl_free_inode((in)->i_sb, (in)->i_tag, __FILE__, __LINE__ )
++ __dl_free_inode((in)->i_sb, i_tag_read(in), __FILE__, __LINE__ )
+
+
+#define dl_adjust_block(sb, tag, fb, rb) \
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vs_inet.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vs_inet.h
---- linux-3.0-rc5/include/linux/vs_inet.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vs_inet.h 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,351 @@
+diff -NurpP --minimal linux-3.10.53/include/linux/vs_inet.h linux-3.10.53-vs2.3.6.8/include/linux/vs_inet.h
+--- linux-3.10.53/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vs_inet.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,364 @@
+#ifndef _VS_INET_H
+#define _VS_INET_H
+
+int v4_addr_in_nx_info(struct nx_info *nxi, __be32 addr, uint16_t tmask)
+{
+ struct nx_addr_v4 *nxa;
++ unsigned long irqflags;
+ int ret = 1;
+
+ if (!nxi)
+ (nxi->v4_bcast.s_addr == addr))
+ goto out;
+ ret = 5;
++
+ /* check for v4 addresses */
++ spin_lock_irqsave(&nxi->addr_lock, irqflags);
+ for (nxa = &nxi->v4; nxa; nxa = nxa->next)
+ if (v4_addr_match(nxa, addr, tmask))
-+ goto out;
++ goto out_unlock;
+ ret = 0;
++out_unlock:
++ spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
+out:
+ vxdprintk(VXD_CBIT(net, 0),
+ "v4_addr_in_nx_info(%p[#%u]," NIPQUAD_FMT ",%04x) = %d",
+int v4_nx_addr_in_nx_info(struct nx_info *nxi, struct nx_addr_v4 *nxa, uint16_t mask)
+{
+ struct nx_addr_v4 *ptr;
++ unsigned long irqflags;
++ int ret = 1;
+
++ spin_lock_irqsave(&nxi->addr_lock, irqflags);
+ for (ptr = &nxi->v4; ptr; ptr = ptr->next)
+ if (v4_nx_addr_match(ptr, nxa, mask))
-+ return 1;
-+ return 0;
++ goto out_unlock;
++ ret = 0;
++out_unlock:
++ spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
++ return ret;
+}
+
+#include <net/inet_sock.h>
+ } else if (saddr == IPI_LOOPBACK) {
+ if (nx_info_flags(nxi, NXF_LBACK_REMAP, 0))
+ baddr = nxi->v4_lback.s_addr;
-+ } else { /* normal address bind */
++ } else if (!ipv4_is_multicast(saddr) ||
++ !nx_info_ncaps(nxi, NXC_MULTICAST)) {
++ /* normal address bind */
+ if (!v4_addr_in_nx_info(nxi, saddr, NXA_MASK_BIND))
+ return -EADDRNOTAVAIL;
+ }
+#else
+// #warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vs_inet6.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vs_inet6.h
---- linux-3.0-rc5/include/linux/vs_inet6.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vs_inet6.h 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,246 @@
+diff -NurpP --minimal linux-3.10.53/include/linux/vs_inet6.h linux-3.10.53-vs2.3.6.8/include/linux/vs_inet6.h
+--- linux-3.10.53/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vs_inet6.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,257 @@
+#ifndef _VS_INET6_H
+#define _VS_INET6_H
+
+ const struct in6_addr *addr, uint16_t mask)
+{
+ struct nx_addr_v6 *nxa;
++ unsigned long irqflags;
+ int ret = 1;
+
+ if (!nxi)
+ goto out;
++
++ spin_lock_irqsave(&nxi->addr_lock, irqflags);
+ for (nxa = &nxi->v6; nxa; nxa = nxa->next)
+ if (v6_addr_match(nxa, addr, mask))
-+ goto out;
++ goto out_unlock;
+ ret = 0;
++out_unlock:
++ spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
+out:
+ vxdprintk(VXD_CBIT(net, 0),
+ "v6_addr_in_nx_info(%p[#%u],%pI6,%04x) = %d",
+int v6_nx_addr_in_nx_info(struct nx_info *nxi, struct nx_addr_v6 *nxa, uint16_t mask)
+{
+ struct nx_addr_v6 *ptr;
++ unsigned long irqflags;
++ int ret = 1;
+
++ spin_lock_irqsave(&nxi->addr_lock, irqflags);
+ for (ptr = &nxi->v6; ptr; ptr = ptr->next)
+ if (v6_nx_addr_match(ptr, nxa, mask))
-+ return 1;
-+ return 0;
++ goto out_unlock;
++ ret = 0;
++out_unlock:
++ spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
++ return ret;
+}
+
+
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vs_limit.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vs_limit.h
---- linux-3.0-rc5/include/linux/vs_limit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vs_limit.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/include/linux/vs_limit.h linux-3.10.53-vs2.3.6.8/include/linux/vs_limit.h
+--- linux-3.10.53/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vs_limit.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,140 @@
+#ifndef _VS_LIMIT_H
+#define _VS_LIMIT_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vs_memory.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vs_memory.h
---- linux-3.0-rc5/include/linux/vs_memory.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vs_memory.h 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,58 @@
-+#ifndef _VS_MEMORY_H
-+#define _VS_MEMORY_H
-+
-+#include "vserver/limit.h"
-+#include "vserver/base.h"
-+#include "vserver/context.h"
-+#include "vserver/debug.h"
-+#include "vserver/context.h"
-+#include "vserver/limit_int.h"
-+
-+enum {
-+ VXPT_UNKNOWN = 0,
-+ VXPT_ANON,
-+ VXPT_NONE,
-+ VXPT_FILE,
-+ VXPT_SWAP,
-+ VXPT_WRITE
-+};
-+
-+#if 0
-+#define vx_page_fault(mm, vma, type, ret)
-+#else
-+
-+static inline
-+void __vx_page_fault(struct mm_struct *mm,
-+ struct vm_area_struct *vma, int type, int ret)
-+{
-+ struct vx_info *vxi = mm->mm_vx_info;
-+ int what;
-+/*
-+ static char *page_type[6] =
-+ { "UNKNOWN", "ANON", "NONE", "FILE", "SWAP", "WRITE" };
-+ static char *page_what[4] =
-+ { "FAULT_OOM", "FAULT_SIGBUS", "FAULT_MINOR", "FAULT_MAJOR" };
-+*/
-+
-+ if (!vxi)
-+ return;
-+
-+ what = (ret & 0x3);
-+
-+/* printk("[%d] page[%d][%d] %2x %s %s\n", vxi->vx_id,
-+ type, what, ret, page_type[type], page_what[what]);
-+*/
-+ if (ret & VM_FAULT_WRITE)
-+ what |= 0x4;
-+ atomic_inc(&vxi->cacct.page[type][what]);
-+}
-+
-+#define vx_page_fault(mm, vma, type, ret) __vx_page_fault(mm, vma, type, ret)
-+#endif
-+
-+
-+extern unsigned long vx_badness(struct task_struct *task, struct mm_struct *mm);
-+
-+#else
-+#warning duplicate inclusion
-+#endif
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vs_network.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vs_network.h
---- linux-3.0-rc5/include/linux/vs_network.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vs_network.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/include/linux/vs_network.h linux-3.10.53-vs2.3.6.8/include/linux/vs_network.h
+--- linux-3.10.53/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vs_network.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,169 @@
+#ifndef _NX_VS_NETWORK_H
+#define _NX_VS_NETWORK_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vs_pid.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vs_pid.h
---- linux-3.0-rc5/include/linux/vs_pid.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vs_pid.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/include/linux/vs_pid.h linux-3.10.53-vs2.3.6.8/include/linux/vs_pid.h
+--- linux-3.10.53/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vs_pid.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,50 @@
+#ifndef _VS_PID_H
+#define _VS_PID_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vs_sched.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vs_sched.h
---- linux-3.0-rc5/include/linux/vs_sched.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vs_sched.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/include/linux/vs_sched.h linux-3.10.53-vs2.3.6.8/include/linux/vs_sched.h
+--- linux-3.10.53/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vs_sched.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,40 @@
+#ifndef _VS_SCHED_H
+#define _VS_SCHED_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vs_socket.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vs_socket.h
---- linux-3.0-rc5/include/linux/vs_socket.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vs_socket.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/include/linux/vs_socket.h linux-3.10.53-vs2.3.6.8/include/linux/vs_socket.h
+--- linux-3.10.53/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vs_socket.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,67 @@
+#ifndef _VS_SOCKET_H
+#define _VS_SOCKET_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vs_tag.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vs_tag.h
---- linux-3.0-rc5/include/linux/vs_tag.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vs_tag.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/include/linux/vs_tag.h linux-3.10.53-vs2.3.6.8/include/linux/vs_tag.h
+--- linux-3.10.53/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vs_tag.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,47 @@
+#ifndef _VS_TAG_H
+#define _VS_TAG_H
+ * 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))
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vs_time.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vs_time.h
---- linux-3.0-rc5/include/linux/vs_time.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vs_time.h 2011-06-13 14:57:45.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/include/linux/vs_time.h linux-3.10.53-vs2.3.6.8/include/linux/vs_time.h
+--- linux-3.10.53/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vs_time.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,19 @@
+#ifndef _VS_TIME_H
+#define _VS_TIME_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vserver/Kbuild linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/Kbuild
---- linux-3.0-rc5/include/linux/vserver/Kbuild 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/Kbuild 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,8 @@
-+
-+unifdef-y += context_cmd.h network_cmd.h space_cmd.h \
-+ cacct_cmd.h cvirt_cmd.h limit_cmd.h dlimit_cmd.h \
-+ inode_cmd.h tag_cmd.h sched_cmd.h signal_cmd.h \
-+ debug_cmd.h device_cmd.h
-+
-+unifdef-y += switch.h network.h monitor.h inode.h device.h
-+
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vserver/base.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/base.h
---- linux-3.0-rc5/include/linux/vserver/base.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/base.h 2011-06-13 14:09:44.000000000 +0200
-@@ -0,0 +1,173 @@
-+#ifndef _VX_BASE_H
-+#define _VX_BASE_H
+diff -NurpP --minimal linux-3.10.53/include/linux/vserver/base.h linux-3.10.53-vs2.3.6.8/include/linux/vserver/base.h
+--- linux-3.10.53/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vserver/base.h 2013-10-27 03:40:46.000000000 +0000
+@@ -0,0 +1,184 @@
++#ifndef _VSERVER_BASE_H
++#define _VSERVER_BASE_H
+
+
+/* context state changes */
+#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)))
+ (cap_raised(current_cap(), b) && \
+ !((f) & ~vx_current_umask())))
+
++#define vx_ns_can_unshare(n, b, f) (ns_capable(n, b) || \
++ (cap_raised(current_cap(), b) && \
++ !((f) & ~vx_current_umask())))
++
++#define __vx_wmask(v) ((v)->vx_wmask)
++
++#define vx_current_wmask() __vx_wmask(current_vx_info())
++
+
+#define __vx_state(v) ((v) ? ((v)->vx_state) : 0)
+
+#define nx_info_state(n, m) (__nx_state(n) & (m))
+
+#endif
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vserver/cacct.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/cacct.h
---- linux-3.0-rc5/include/linux/vserver/cacct.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/cacct.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/include/linux/vserver/cacct.h linux-3.10.53-vs2.3.6.8/include/linux/vserver/cacct.h
+--- linux-3.10.53/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vserver/cacct.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,15 @@
-+#ifndef _VX_CACCT_H
-+#define _VX_CACCT_H
++#ifndef _VSERVER_CACCT_H
++#define _VSERVER_CACCT_H
+
+
+enum sock_acc_field {
+ VXA_SOCK_SIZE /* array size */
+};
+
-+#endif /* _VX_CACCT_H */
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vserver/cacct_cmd.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/cacct_cmd.h
---- linux-3.0-rc5/include/linux/vserver/cacct_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/cacct_cmd.h 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,23 @@
-+#ifndef _VX_CACCT_CMD_H
-+#define _VX_CACCT_CMD_H
-+
-+
-+/* virtual host info name commands */
-+
-+#define VCMD_sock_stat VC_CMD(VSTAT, 5, 0)
-+
-+struct vcmd_sock_stat_v0 {
-+ uint32_t field;
-+ uint32_t count[3];
-+ uint64_t total[3];
-+};
-+
++#endif /* _VSERVER_CACCT_H */
+diff -NurpP --minimal linux-3.10.53/include/linux/vserver/cacct_cmd.h linux-3.10.53-vs2.3.6.8/include/linux/vserver/cacct_cmd.h
+--- linux-3.10.53/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vserver/cacct_cmd.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,10 @@
++#ifndef _VSERVER_CACCT_CMD_H
++#define _VSERVER_CACCT_CMD_H
+
-+#ifdef __KERNEL__
+
+#include <linux/compiler.h>
++#include <uapi/vserver/cacct_cmd.h>
+
+extern int vc_sock_stat(struct vx_info *, void __user *);
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_CACCT_CMD_H */
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vserver/cacct_def.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/cacct_def.h
---- linux-3.0-rc5/include/linux/vserver/cacct_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/cacct_def.h 2011-06-10 22:11:24.000000000 +0200
++#endif /* _VSERVER_CACCT_CMD_H */
+diff -NurpP --minimal linux-3.10.53/include/linux/vserver/cacct_def.h linux-3.10.53-vs2.3.6.8/include/linux/vserver/cacct_def.h
+--- linux-3.10.53/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vserver/cacct_def.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,43 @@
-+#ifndef _VX_CACCT_DEF_H
-+#define _VX_CACCT_DEF_H
++#ifndef _VSERVER_CACCT_DEF_H
++#define _VSERVER_CACCT_DEF_H
+
+#include <asm/atomic.h>
+#include <linux/vserver/cacct.h>
+
+#endif
+
-+#endif /* _VX_CACCT_DEF_H */
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vserver/cacct_int.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/cacct_int.h
---- linux-3.0-rc5/include/linux/vserver/cacct_int.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/cacct_int.h 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,21 @@
-+#ifndef _VX_CACCT_INT_H
-+#define _VX_CACCT_INT_H
-+
-+
-+#ifdef __KERNEL__
++#endif /* _VSERVER_CACCT_DEF_H */
+diff -NurpP --minimal linux-3.10.53/include/linux/vserver/cacct_int.h linux-3.10.53-vs2.3.6.8/include/linux/vserver/cacct_int.h
+--- linux-3.10.53/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vserver/cacct_int.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,17 @@
++#ifndef _VSERVER_CACCT_INT_H
++#define _VSERVER_CACCT_INT_H
+
+static inline
+unsigned long vx_sock_count(struct _vx_cacct *cacct, int type, int pos)
+ return atomic_long_read(&cacct->sock[type][pos].total);
+}
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_CACCT_INT_H */
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vserver/check.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/check.h
---- linux-3.0-rc5/include/linux/vserver/check.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/check.h 2011-06-10 22:11:24.000000000 +0200
++#endif /* _VSERVER_CACCT_INT_H */
+diff -NurpP --minimal linux-3.10.53/include/linux/vserver/check.h linux-3.10.53-vs2.3.6.8/include/linux/vserver/check.h
+--- linux-3.10.53/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vserver/check.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,89 @@
-+#ifndef _VS_CHECK_H
-+#define _VS_CHECK_H
++#ifndef _VSERVER_CHECK_H
++#define _VSERVER_CHECK_H
+
+
+#define MAX_S_CONTEXT 65535 /* Arbitrary limit */
+#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1)
+
+#endif
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vserver/context.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/context.h
---- linux-3.0-rc5/include/linux/vserver/context.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/context.h 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,189 @@
-+#ifndef _VX_CONTEXT_H
-+#define _VX_CONTEXT_H
-+
-+#include <linux/types.h>
-+#include <linux/capability.h>
-+
-+
-+/* context flags */
-+
-+#define VXF_INFO_SCHED 0x00000002
-+#define VXF_INFO_NPROC 0x00000004
-+#define VXF_INFO_PRIVATE 0x00000008
-+
-+#define VXF_INFO_INIT 0x00000010
-+#define VXF_INFO_HIDE 0x00000020
-+#define VXF_INFO_ULIMIT 0x00000040
-+#define VXF_INFO_NSPACE 0x00000080
-+
-+#define VXF_SCHED_HARD 0x00000100
-+#define VXF_SCHED_PRIO 0x00000200
-+#define VXF_SCHED_PAUSE 0x00000400
-+
-+#define VXF_VIRT_MEM 0x00010000
-+#define VXF_VIRT_UPTIME 0x00020000
-+#define VXF_VIRT_CPU 0x00040000
-+#define VXF_VIRT_LOAD 0x00080000
-+#define VXF_VIRT_TIME 0x00100000
-+
-+#define VXF_HIDE_MOUNT 0x01000000
-+/* was VXF_HIDE_NETIF 0x02000000 */
-+#define VXF_HIDE_VINFO 0x04000000
-+
-+#define VXF_STATE_SETUP (1ULL << 32)
-+#define VXF_STATE_INIT (1ULL << 33)
-+#define VXF_STATE_ADMIN (1ULL << 34)
-+
-+#define VXF_SC_HELPER (1ULL << 36)
-+#define VXF_REBOOT_KILL (1ULL << 37)
-+#define VXF_PERSISTENT (1ULL << 38)
-+
-+#define VXF_FORK_RSS (1ULL << 48)
-+#define VXF_PROLIFIC (1ULL << 49)
-+
-+#define VXF_IGNEG_NICE (1ULL << 52)
-+
-+#define VXF_ONE_TIME (0x0007ULL << 32)
-+
-+#define VXF_INIT_SET (VXF_STATE_SETUP | VXF_STATE_INIT | VXF_STATE_ADMIN)
-+
-+
-+/* context migration */
-+
-+#define VXM_SET_INIT 0x00000001
-+#define VXM_SET_REAPER 0x00000002
-+
-+/* context caps */
-+
-+#define VXC_CAP_MASK 0x00000000
-+
-+#define VXC_SET_UTSNAME 0x00000001
-+#define VXC_SET_RLIMIT 0x00000002
-+#define VXC_FS_SECURITY 0x00000004
-+#define VXC_FS_TRUSTED 0x00000008
-+#define VXC_TIOCSTI 0x00000010
-+
-+/* was VXC_RAW_ICMP 0x00000100 */
-+#define VXC_SYSLOG 0x00001000
-+#define VXC_OOM_ADJUST 0x00002000
-+#define VXC_AUDIT_CONTROL 0x00004000
-+
-+#define VXC_SECURE_MOUNT 0x00010000
-+#define VXC_SECURE_REMOUNT 0x00020000
-+#define VXC_BINARY_MOUNT 0x00040000
-+
-+#define VXC_QUOTA_CTL 0x00100000
-+#define VXC_ADMIN_MAPPER 0x00200000
-+#define VXC_ADMIN_CLOOP 0x00400000
-+
-+#define VXC_KTHREAD 0x01000000
-+#define VXC_NAMESPACE 0x02000000
-+
+diff -NurpP --minimal linux-3.10.53/include/linux/vserver/context.h linux-3.10.53-vs2.3.6.8/include/linux/vserver/context.h
+--- linux-3.10.53/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vserver/context.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,110 @@
++#ifndef _VSERVER_CONTEXT_H
++#define _VSERVER_CONTEXT_H
+
-+#ifdef __KERNEL__
+
+#include <linux/list.h>
+#include <linux/spinlock.h>
+#include <linux/rcupdate.h>
++#include <uapi/vserver/context.h>
+
+#include "limit_def.h"
+#include "sched_def.h"
+
+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 */
+ uint64_t vx_flags; /* context flags */
+ uint64_t vx_ccaps; /* context caps (vserver) */
+ uint64_t vx_umask; /* unshare mask (guest) */
++ uint64_t vx_wmask; /* warn mask (guest) */
+ kernel_cap_t vx_bcaps; /* bounding caps (system) */
+
+ struct task_struct *vx_reaper; /* guest reaper process */
+
+struct vx_info_save {
+ struct vx_info *vxi;
-+ xid_t xid;
++ vxid_t xid;
+};
+
+
+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);
+
+extern long vs_state_change(struct vx_info *, unsigned int);
+
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_CONTEXT_H */
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vserver/context_cmd.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/context_cmd.h
---- linux-3.0-rc5/include/linux/vserver/context_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/context_cmd.h 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,145 @@
-+#ifndef _VX_CONTEXT_CMD_H
-+#define _VX_CONTEXT_CMD_H
++#endif /* _VSERVER_CONTEXT_H */
+diff -NurpP --minimal linux-3.10.53/include/linux/vserver/context_cmd.h linux-3.10.53-vs2.3.6.8/include/linux/vserver/context_cmd.h
+--- linux-3.10.53/include/linux/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vserver/context_cmd.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,33 @@
++#ifndef _VSERVER_CONTEXT_CMD_H
++#define _VSERVER_CONTEXT_CMD_H
+
++#include <uapi/vserver/context_cmd.h>
+
-+/* vinfo commands */
++extern int vc_task_xid(uint32_t);
+
-+#define VCMD_task_xid VC_CMD(VINFO, 1, 0)
++extern int vc_vx_info(struct vx_info *, void __user *);
+
-+#ifdef __KERNEL__
-+extern int vc_task_xid(uint32_t);
++extern int vc_ctx_stat(struct vx_info *, void __user *);
+
-+#endif /* __KERNEL__ */
++extern int vc_ctx_create(uint32_t, void __user *);
++extern int vc_ctx_migrate(struct vx_info *, void __user *);
+
-+#define VCMD_vx_info VC_CMD(VINFO, 5, 0)
++extern int vc_get_cflags(struct vx_info *, void __user *);
++extern int vc_set_cflags(struct vx_info *, void __user *);
+
-+struct vcmd_vx_info_v0 {
-+ uint32_t xid;
-+ uint32_t initpid;
-+ /* more to come */
-+};
++extern int vc_get_ccaps(struct vx_info *, void __user *);
++extern int vc_set_ccaps(struct vx_info *, void __user *);
+
-+#ifdef __KERNEL__
-+extern int vc_vx_info(struct vx_info *, void __user *);
++extern int vc_get_bcaps(struct vx_info *, void __user *);
++extern int vc_set_bcaps(struct vx_info *, void __user *);
+
-+#endif /* __KERNEL__ */
++extern int vc_get_umask(struct vx_info *, void __user *);
++extern int vc_set_umask(struct vx_info *, void __user *);
+
-+#define VCMD_ctx_stat VC_CMD(VSTAT, 0, 0)
++extern int vc_get_wmask(struct vx_info *, void __user *);
++extern int vc_set_wmask(struct vx_info *, void __user *);
+
-+struct vcmd_ctx_stat_v0 {
-+ uint32_t usecnt;
-+ uint32_t tasks;
-+ /* more to come */
-+};
++extern int vc_get_badness(struct vx_info *, void __user *);
++extern int vc_set_badness(struct vx_info *, void __user *);
+
-+#ifdef __KERNEL__
-+extern int vc_ctx_stat(struct vx_info *, void __user *);
++#endif /* _VSERVER_CONTEXT_CMD_H */
+diff -NurpP --minimal linux-3.10.53/include/linux/vserver/cvirt.h linux-3.10.53-vs2.3.6.8/include/linux/vserver/cvirt.h
+--- linux-3.10.53/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vserver/cvirt.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,18 @@
++#ifndef _VSERVER_CVIRT_H
++#define _VSERVER_CVIRT_H
+
-+#endif /* __KERNEL__ */
++struct timespec;
+
-+/* context commands */
++void vx_vsi_boottime(struct timespec *);
+
-+#define VCMD_ctx_create_v0 VC_CMD(VPROC, 1, 0)
-+#define VCMD_ctx_create VC_CMD(VPROC, 1, 1)
-+
-+struct vcmd_ctx_create {
-+ uint64_t flagword;
-+};
-+
-+#define VCMD_ctx_migrate_v0 VC_CMD(PROCMIG, 1, 0)
-+#define VCMD_ctx_migrate VC_CMD(PROCMIG, 1, 1)
-+
-+struct vcmd_ctx_migrate {
-+ uint64_t flagword;
-+};
-+
-+#ifdef __KERNEL__
-+extern int vc_ctx_create(uint32_t, void __user *);
-+extern int vc_ctx_migrate(struct vx_info *, void __user *);
-+
-+#endif /* __KERNEL__ */
-+
-+
-+/* flag commands */
-+
-+#define VCMD_get_cflags VC_CMD(FLAGS, 1, 0)
-+#define VCMD_set_cflags VC_CMD(FLAGS, 2, 0)
-+
-+struct vcmd_ctx_flags_v0 {
-+ uint64_t flagword;
-+ uint64_t mask;
-+};
-+
-+#ifdef __KERNEL__
-+extern int vc_get_cflags(struct vx_info *, void __user *);
-+extern int vc_set_cflags(struct vx_info *, void __user *);
-+
-+#endif /* __KERNEL__ */
-+
-+
-+/* context caps commands */
-+
-+#define VCMD_get_ccaps VC_CMD(FLAGS, 3, 1)
-+#define VCMD_set_ccaps VC_CMD(FLAGS, 4, 1)
-+
-+struct vcmd_ctx_caps_v1 {
-+ uint64_t ccaps;
-+ uint64_t cmask;
-+};
-+
-+#ifdef __KERNEL__
-+extern int vc_get_ccaps(struct vx_info *, void __user *);
-+extern int vc_set_ccaps(struct vx_info *, void __user *);
-+
-+#endif /* __KERNEL__ */
-+
-+
-+/* bcaps commands */
-+
-+#define VCMD_get_bcaps VC_CMD(FLAGS, 9, 0)
-+#define VCMD_set_bcaps VC_CMD(FLAGS, 10, 0)
-+
-+struct vcmd_bcaps {
-+ uint64_t bcaps;
-+ uint64_t bmask;
-+};
-+
-+#ifdef __KERNEL__
-+extern int vc_get_bcaps(struct vx_info *, void __user *);
-+extern int vc_set_bcaps(struct vx_info *, void __user *);
-+
-+#endif /* __KERNEL__ */
-+
-+
-+/* umask commands */
-+
-+#define VCMD_get_umask VC_CMD(FLAGS, 13, 0)
-+#define VCMD_set_umask VC_CMD(FLAGS, 14, 0)
-+
-+struct vcmd_umask {
-+ uint64_t umask;
-+ uint64_t mask;
-+};
-+
-+#ifdef __KERNEL__
-+extern int vc_get_umask(struct vx_info *, void __user *);
-+extern int vc_set_umask(struct vx_info *, void __user *);
-+
-+#endif /* __KERNEL__ */
-+
-+
-+/* OOM badness */
-+
-+#define VCMD_get_badness VC_CMD(MEMCTRL, 5, 0)
-+#define VCMD_set_badness VC_CMD(MEMCTRL, 6, 0)
-+
-+struct vcmd_badness_v0 {
-+ int64_t bias;
-+};
-+
-+#ifdef __KERNEL__
-+extern int vc_get_badness(struct vx_info *, void __user *);
-+extern int vc_set_badness(struct vx_info *, void __user *);
-+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vserver/cvirt.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/cvirt.h
---- linux-3.0-rc5/include/linux/vserver/cvirt.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/cvirt.h 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,20 @@
-+#ifndef _VX_CVIRT_H
-+#define _VX_CVIRT_H
-+
-+
-+#ifdef __KERNEL__
-+
-+struct timespec;
-+
-+void vx_vsi_uptime(struct timespec *, struct timespec *);
++void vx_vsi_uptime(struct timespec *, struct timespec *);
+
+
+struct vx_info;
+
+int vx_do_syslog(int, char __user *, int);
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_CVIRT_H */
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vserver/cvirt_cmd.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/cvirt_cmd.h
---- linux-3.0-rc5/include/linux/vserver/cvirt_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/cvirt_cmd.h 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,53 @@
-+#ifndef _VX_CVIRT_CMD_H
-+#define _VX_CVIRT_CMD_H
-+
-+
-+/* virtual host info name commands */
-+
-+#define VCMD_set_vhi_name VC_CMD(VHOST, 1, 0)
-+#define VCMD_get_vhi_name VC_CMD(VHOST, 2, 0)
-+
-+struct vcmd_vhi_name_v0 {
-+ uint32_t field;
-+ char name[65];
-+};
-+
-+
-+enum vhi_name_field {
-+ VHIN_CONTEXT = 0,
-+ VHIN_SYSNAME,
-+ VHIN_NODENAME,
-+ VHIN_RELEASE,
-+ VHIN_VERSION,
-+ VHIN_MACHINE,
-+ VHIN_DOMAINNAME,
-+};
-+
++#endif /* _VSERVER_CVIRT_H */
+diff -NurpP --minimal linux-3.10.53/include/linux/vserver/cvirt_cmd.h linux-3.10.53-vs2.3.6.8/include/linux/vserver/cvirt_cmd.h
+--- linux-3.10.53/include/linux/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vserver/cvirt_cmd.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,13 @@
++#ifndef _VSERVER_CVIRT_CMD_H
++#define _VSERVER_CVIRT_CMD_H
+
-+#ifdef __KERNEL__
+
+#include <linux/compiler.h>
++#include <uapi/vserver/cvirt_cmd.h>
+
+extern int vc_set_vhi_name(struct vx_info *, void __user *);
+extern int vc_get_vhi_name(struct vx_info *, void __user *);
+
-+#endif /* __KERNEL__ */
-+
-+#define VCMD_virt_stat VC_CMD(VSTAT, 3, 0)
-+
-+struct vcmd_virt_stat_v0 {
-+ uint64_t offset;
-+ uint64_t uptime;
-+ uint32_t nr_threads;
-+ uint32_t nr_running;
-+ uint32_t nr_uninterruptible;
-+ uint32_t nr_onhold;
-+ uint32_t nr_forks;
-+ uint32_t load[3];
-+};
-+
-+#ifdef __KERNEL__
+extern int vc_virt_stat(struct vx_info *, void __user *);
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_CVIRT_CMD_H */
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vserver/cvirt_def.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/cvirt_def.h
---- linux-3.0-rc5/include/linux/vserver/cvirt_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/cvirt_def.h 2011-06-10 22:11:24.000000000 +0200
++#endif /* _VSERVER_CVIRT_CMD_H */
+diff -NurpP --minimal linux-3.10.53/include/linux/vserver/cvirt_def.h linux-3.10.53-vs2.3.6.8/include/linux/vserver/cvirt_def.h
+--- linux-3.10.53/include/linux/vserver/cvirt_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vserver/cvirt_def.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,80 @@
-+#ifndef _VX_CVIRT_DEF_H
-+#define _VX_CVIRT_DEF_H
++#ifndef _VSERVER_CVIRT_DEF_H
++#define _VSERVER_CVIRT_DEF_H
+
+#include <linux/jiffies.h>
+#include <linux/spinlock.h>
+
+#endif
+
-+#endif /* _VX_CVIRT_DEF_H */
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vserver/debug.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/debug.h
---- linux-3.0-rc5/include/linux/vserver/debug.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/debug.h 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,140 @@
-+#ifndef _VX_DEBUG_H
-+#define _VX_DEBUG_H
++#endif /* _VSERVER_CVIRT_DEF_H */
+diff -NurpP --minimal linux-3.10.53/include/linux/vserver/debug.h linux-3.10.53-vs2.3.6.8/include/linux/vserver/debug.h
+--- linux-3.10.53/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vserver/debug.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,146 @@
++#ifndef _VSERVER_DEBUG_H
++#define _VSERVER_DEBUG_H
+
+
-+#define VXD_CBIT(n, m) (vx_debug_ ## n & (1 << (m)))
-+#define VXD_CMIN(n, m) (vx_debug_ ## n > (m))
-+#define VXD_MASK(n, m) (vx_debug_ ## n & (m))
++#define VXD_CBIT(n, m) (vs_debug_ ## n & (1 << (m)))
++#define VXD_CMIN(n, m) (vs_debug_ ## n > (m))
++#define VXD_MASK(n, m) (vs_debug_ ## n & (m))
+
+#define VXD_DEV(d) (d), (d)->bd_inode->i_ino, \
+ imajor((d)->bd_inode), iminor((d)->bd_inode)
+
+#ifdef CONFIG_VSERVER_DEBUG
+
-+extern unsigned int vx_debug_switch;
-+extern unsigned int vx_debug_xid;
-+extern unsigned int vx_debug_nid;
-+extern unsigned int vx_debug_tag;
-+extern unsigned int vx_debug_net;
-+extern unsigned int vx_debug_limit;
-+extern unsigned int vx_debug_cres;
-+extern unsigned int vx_debug_dlim;
-+extern unsigned int vx_debug_quota;
-+extern unsigned int vx_debug_cvirt;
-+extern unsigned int vx_debug_space;
-+extern unsigned int vx_debug_misc;
++extern unsigned int vs_debug_switch;
++extern unsigned int vs_debug_xid;
++extern unsigned int vs_debug_nid;
++extern unsigned int vs_debug_tag;
++extern unsigned int vs_debug_net;
++extern unsigned int vs_debug_limit;
++extern unsigned int vs_debug_cres;
++extern unsigned int vs_debug_dlim;
++extern unsigned int vs_debug_quota;
++extern unsigned int vs_debug_cvirt;
++extern unsigned int vs_debug_space;
++extern unsigned int vs_debug_perm;
++extern unsigned int vs_debug_misc;
+
+
+#define VX_LOGLEVEL "vxD: "
+
+#else /* CONFIG_VSERVER_DEBUG */
+
-+#define vx_debug_switch 0
-+#define vx_debug_xid 0
-+#define vx_debug_nid 0
-+#define vx_debug_tag 0
-+#define vx_debug_net 0
-+#define vx_debug_limit 0
-+#define vx_debug_cres 0
-+#define vx_debug_dlim 0
-+#define vx_debug_cvirt 0
++#define vs_debug_switch 0
++#define vs_debug_xid 0
++#define vs_debug_nid 0
++#define vs_debug_tag 0
++#define vs_debug_net 0
++#define vs_debug_limit 0
++#define vs_debug_cres 0
++#define vs_debug_dlim 0
++#define vs_debug_quota 0
++#define vs_debug_cvirt 0
++#define vs_debug_space 0
++#define vs_debug_perm 0
++#define vs_debug_misc 0
+
+#define vxdprintk(x...) do { } while (0)
+#define vxlprintk(x...) do { } while (0)
+#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...) \
+#endif
+
+
-+#endif /* _VX_DEBUG_H */
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vserver/debug_cmd.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/debug_cmd.h
---- linux-3.0-rc5/include/linux/vserver/debug_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/debug_cmd.h 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,58 @@
-+#ifndef _VX_DEBUG_CMD_H
-+#define _VX_DEBUG_CMD_H
-+
-+
-+/* debug commands */
-+
-+#define VCMD_dump_history VC_CMD(DEBUG, 1, 0)
-+
-+#define VCMD_read_history VC_CMD(DEBUG, 5, 0)
-+#define VCMD_read_monitor VC_CMD(DEBUG, 6, 0)
-+
-+struct vcmd_read_history_v0 {
-+ uint32_t index;
-+ uint32_t count;
-+ char __user *data;
-+};
-+
-+struct vcmd_read_monitor_v0 {
-+ uint32_t index;
-+ uint32_t count;
-+ char __user *data;
-+};
++#endif /* _VSERVER_DEBUG_H */
+diff -NurpP --minimal linux-3.10.53/include/linux/vserver/debug_cmd.h linux-3.10.53-vs2.3.6.8/include/linux/vserver/debug_cmd.h
+--- linux-3.10.53/include/linux/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vserver/debug_cmd.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,37 @@
++#ifndef _VSERVER_DEBUG_CMD_H
++#define _VSERVER_DEBUG_CMD_H
+
++#include <uapi/vserver/debug_cmd.h>
+
-+#ifdef __KERNEL__
+
+#ifdef CONFIG_COMPAT
+
+
+#endif /* CONFIG_COMPAT */
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_DEBUG_CMD_H */
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vserver/device.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/device.h
---- linux-3.0-rc5/include/linux/vserver/device.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/device.h 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,15 @@
-+#ifndef _VX_DEVICE_H
-+#define _VX_DEVICE_H
-+
-+
-+#define DATTR_CREATE 0x00000001
-+#define DATTR_OPEN 0x00000002
-+
-+#define DATTR_REMAP 0x00000010
++#endif /* _VSERVER_DEBUG_CMD_H */
+diff -NurpP --minimal linux-3.10.53/include/linux/vserver/device.h linux-3.10.53-vs2.3.6.8/include/linux/vserver/device.h
+--- linux-3.10.53/include/linux/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vserver/device.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,9 @@
++#ifndef _VSERVER_DEVICE_H
++#define _VSERVER_DEVICE_H
+
-+#define DATTR_MASK 0x00000013
+
++#include <uapi/vserver/device.h>
+
-+#else /* _VX_DEVICE_H */
++#else /* _VSERVER_DEVICE_H */
+#warning duplicate inclusion
-+#endif /* _VX_DEVICE_H */
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vserver/device_cmd.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/device_cmd.h
---- linux-3.0-rc5/include/linux/vserver/device_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/device_cmd.h 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,44 @@
-+#ifndef _VX_DEVICE_CMD_H
-+#define _VX_DEVICE_CMD_H
-+
-+
-+/* device vserver commands */
-+
-+#define VCMD_set_mapping VC_CMD(DEVICE, 1, 0)
-+#define VCMD_unset_mapping VC_CMD(DEVICE, 2, 0)
-+
-+struct vcmd_set_mapping_v0 {
-+ const char __user *device;
-+ const char __user *target;
-+ uint32_t flags;
-+};
++#endif /* _VSERVER_DEVICE_H */
+diff -NurpP --minimal linux-3.10.53/include/linux/vserver/device_cmd.h linux-3.10.53-vs2.3.6.8/include/linux/vserver/device_cmd.h
+--- linux-3.10.53/include/linux/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vserver/device_cmd.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,31 @@
++#ifndef _VSERVER_DEVICE_CMD_H
++#define _VSERVER_DEVICE_CMD_H
+
++#include <uapi/vserver/device_cmd.h>
+
-+#ifdef __KERNEL__
+
+#ifdef CONFIG_COMPAT
+
+
+#endif /* CONFIG_COMPAT */
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_DEVICE_CMD_H */
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vserver/device_def.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/device_def.h
---- linux-3.0-rc5/include/linux/vserver/device_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/device_def.h 2011-06-10 22:11:24.000000000 +0200
++#endif /* _VSERVER_DEVICE_CMD_H */
+diff -NurpP --minimal linux-3.10.53/include/linux/vserver/device_def.h linux-3.10.53-vs2.3.6.8/include/linux/vserver/device_def.h
+--- linux-3.10.53/include/linux/vserver/device_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vserver/device_def.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,17 @@
-+#ifndef _VX_DEVICE_DEF_H
-+#define _VX_DEVICE_DEF_H
++#ifndef _VSERVER_DEVICE_DEF_H
++#define _VSERVER_DEVICE_DEF_H
+
+#include <linux/types.h>
+
+#endif
+};
+
-+#endif /* _VX_DEVICE_DEF_H */
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vserver/dlimit.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/dlimit.h
---- linux-3.0-rc5/include/linux/vserver/dlimit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/dlimit.h 2011-06-10 22:11:24.000000000 +0200
++#endif /* _VSERVER_DEVICE_DEF_H */
+diff -NurpP --minimal linux-3.10.53/include/linux/vserver/dlimit.h linux-3.10.53-vs2.3.6.8/include/linux/vserver/dlimit.h
+--- linux-3.10.53/include/linux/vserver/dlimit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vserver/dlimit.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,54 @@
-+#ifndef _VX_DLIMIT_H
-+#define _VX_DLIMIT_H
++#ifndef _VSERVER_DLIMIT_H
++#define _VSERVER_DLIMIT_H
+
+#include "switch.h"
+
+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 */
+
+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;
+typedef uint64_t dlsize_t;
+
+#endif /* __KERNEL__ */
-+#else /* _VX_DLIMIT_H */
++#else /* _VSERVER_DLIMIT_H */
+#warning duplicate inclusion
-+#endif /* _VX_DLIMIT_H */
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vserver/dlimit_cmd.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/dlimit_cmd.h
---- linux-3.0-rc5/include/linux/vserver/dlimit_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/dlimit_cmd.h 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,109 @@
-+#ifndef _VX_DLIMIT_CMD_H
-+#define _VX_DLIMIT_CMD_H
++#endif /* _VSERVER_DLIMIT_H */
+diff -NurpP --minimal linux-3.10.53/include/linux/vserver/dlimit_cmd.h linux-3.10.53-vs2.3.6.8/include/linux/vserver/dlimit_cmd.h
+--- linux-3.10.53/include/linux/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vserver/dlimit_cmd.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,46 @@
++#ifndef _VSERVER_DLIMIT_CMD_H
++#define _VSERVER_DLIMIT_CMD_H
+
++#include <uapi/vserver/dlimit_cmd.h>
+
-+/* dlimit vserver commands */
+
-+#define VCMD_add_dlimit VC_CMD(DLIMIT, 1, 0)
-+#define VCMD_rem_dlimit VC_CMD(DLIMIT, 2, 0)
++#ifdef CONFIG_COMPAT
+
-+#define VCMD_set_dlimit VC_CMD(DLIMIT, 5, 0)
-+#define VCMD_get_dlimit VC_CMD(DLIMIT, 6, 0)
++#include <asm/compat.h>
+
-+struct vcmd_ctx_dlimit_base_v0 {
-+ const char __user *name;
++struct vcmd_ctx_dlimit_base_v0_x32 {
++ compat_uptr_t name_ptr;
+ uint32_t flags;
+};
+
-+struct vcmd_ctx_dlimit_v0 {
-+ const char __user *name;
++struct vcmd_ctx_dlimit_v0_x32 {
++ compat_uptr_t name_ptr;
+ uint32_t space_used; /* used space in kbytes */
+ uint32_t space_total; /* maximum space in kbytes */
+ uint32_t inodes_used; /* used inodes */
+ uint32_t flags;
+};
+
-+#define CDLIM_UNSET ((uint32_t)0UL)
-+#define CDLIM_INFINITY ((uint32_t)~0UL)
-+#define CDLIM_KEEP ((uint32_t)~1UL)
++#endif /* CONFIG_COMPAT */
+
-+#define DLIME_UNIT 0
-+#define DLIME_KILO 1
-+#define DLIME_MEGA 2
-+#define DLIME_GIGA 3
++#include <linux/compiler.h>
+
-+#define DLIMF_SHIFT 0x10
++extern int vc_add_dlimit(uint32_t, void __user *);
++extern int vc_rem_dlimit(uint32_t, void __user *);
+
-+#define DLIMS_USED 0
-+#define DLIMS_TOTAL 2
++extern int vc_set_dlimit(uint32_t, void __user *);
++extern int vc_get_dlimit(uint32_t, void __user *);
+
-+static inline
-+uint64_t dlimit_space_32to64(uint32_t val, uint32_t flags, int shift)
-+{
-+ int exp = (flags & DLIMF_SHIFT) ?
-+ (flags >> shift) & DLIME_GIGA : DLIME_KILO;
-+ return ((uint64_t)val) << (10 * exp);
-+}
++#ifdef CONFIG_COMPAT
+
-+static inline
-+uint32_t dlimit_space_64to32(uint64_t val, uint32_t *flags, int shift)
-+{
-+ int exp = 0;
++extern int vc_add_dlimit_x32(uint32_t, void __user *);
++extern int vc_rem_dlimit_x32(uint32_t, void __user *);
+
-+ if (*flags & DLIMF_SHIFT) {
-+ while (val > (1LL << 32) && (exp < 3)) {
-+ val >>= 10;
-+ exp++;
-+ }
-+ *flags &= ~(DLIME_GIGA << shift);
-+ *flags |= exp << shift;
-+ } else
-+ val >>= 10;
-+ return val;
-+}
-+
-+#ifdef __KERNEL__
-+
-+#ifdef CONFIG_COMPAT
-+
-+#include <asm/compat.h>
-+
-+struct vcmd_ctx_dlimit_base_v0_x32 {
-+ compat_uptr_t name_ptr;
-+ uint32_t flags;
-+};
-+
-+struct vcmd_ctx_dlimit_v0_x32 {
-+ compat_uptr_t name_ptr;
-+ uint32_t space_used; /* used space in kbytes */
-+ uint32_t space_total; /* maximum space in kbytes */
-+ uint32_t inodes_used; /* used inodes */
-+ uint32_t inodes_total; /* maximum inodes */
-+ uint32_t reserved; /* reserved for root in % */
-+ uint32_t flags;
-+};
-+
-+#endif /* CONFIG_COMPAT */
-+
-+#include <linux/compiler.h>
-+
-+extern int vc_add_dlimit(uint32_t, void __user *);
-+extern int vc_rem_dlimit(uint32_t, void __user *);
-+
-+extern int vc_set_dlimit(uint32_t, void __user *);
-+extern int vc_get_dlimit(uint32_t, void __user *);
-+
-+#ifdef CONFIG_COMPAT
-+
-+extern int vc_add_dlimit_x32(uint32_t, void __user *);
-+extern int vc_rem_dlimit_x32(uint32_t, void __user *);
-+
-+extern int vc_set_dlimit_x32(uint32_t, void __user *);
-+extern int vc_get_dlimit_x32(uint32_t, void __user *);
++extern int vc_set_dlimit_x32(uint32_t, void __user *);
++extern int vc_get_dlimit_x32(uint32_t, void __user *);
+
+#endif /* CONFIG_COMPAT */
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_DLIMIT_CMD_H */
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vserver/global.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/global.h
---- linux-3.0-rc5/include/linux/vserver/global.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/global.h 2011-06-10 22:11:24.000000000 +0200
++#endif /* _VSERVER_DLIMIT_CMD_H */
+diff -NurpP --minimal linux-3.10.53/include/linux/vserver/global.h linux-3.10.53-vs2.3.6.8/include/linux/vserver/global.h
+--- linux-3.10.53/include/linux/vserver/global.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vserver/global.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,19 @@
-+#ifndef _VX_GLOBAL_H
-+#define _VX_GLOBAL_H
++#ifndef _VSERVER_GLOBAL_H
++#define _VSERVER_GLOBAL_H
+
+
+extern atomic_t vx_global_ctotal;
+extern atomic_t vs_global_pid_ns;
+
+
-+#endif /* _VX_GLOBAL_H */
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vserver/history.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/history.h
---- linux-3.0-rc5/include/linux/vserver/history.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/history.h 2011-06-10 22:11:24.000000000 +0200
++#endif /* _VSERVER_GLOBAL_H */
+diff -NurpP --minimal linux-3.10.53/include/linux/vserver/history.h linux-3.10.53-vs2.3.6.8/include/linux/vserver/history.h
+--- linux-3.10.53/include/linux/vserver/history.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vserver/history.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,197 @@
-+#ifndef _VX_HISTORY_H
-+#define _VX_HISTORY_H
++#ifndef _VSERVER_HISTORY_H
++#define _VSERVER_HISTORY_H
+
+
+enum {
+
+#endif /* CONFIG_VSERVER_HISTORY */
+
-+#endif /* _VX_HISTORY_H */
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vserver/inode.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/inode.h
---- linux-3.0-rc5/include/linux/vserver/inode.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/inode.h 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,39 @@
-+#ifndef _VX_INODE_H
-+#define _VX_INODE_H
-+
-+
-+#define IATTR_TAG 0x01000000
-+
-+#define IATTR_ADMIN 0x00000001
-+#define IATTR_WATCH 0x00000002
-+#define IATTR_HIDE 0x00000004
-+#define IATTR_FLAGS 0x00000007
-+
-+#define IATTR_BARRIER 0x00010000
-+#define IATTR_IXUNLINK 0x00020000
-+#define IATTR_IMMUTABLE 0x00040000
-+#define IATTR_COW 0x00080000
++#endif /* _VSERVER_HISTORY_H */
+diff -NurpP --minimal linux-3.10.53/include/linux/vserver/inode.h linux-3.10.53-vs2.3.6.8/include/linux/vserver/inode.h
+--- linux-3.10.53/include/linux/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vserver/inode.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,19 @@
++#ifndef _VSERVER_INODE_H
++#define _VSERVER_INODE_H
+
-+#ifdef __KERNEL__
++#include <uapi/vserver/inode.h>
+
+
+#ifdef CONFIG_VSERVER_PROC_SECURE
+
+#define vx_hide_check(c, m) (((m) & IATTR_HIDE) ? vx_check(c, m) : 1)
+
-+#endif /* __KERNEL__ */
-+
-+/* inode ioctls */
-+
-+#define FIOC_GETXFLG _IOR('x', 5, long)
-+#define FIOC_SETXFLG _IOW('x', 6, long)
-+
-+#else /* _VX_INODE_H */
++#else /* _VSERVER_INODE_H */
+#warning duplicate inclusion
-+#endif /* _VX_INODE_H */
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vserver/inode_cmd.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/inode_cmd.h
---- linux-3.0-rc5/include/linux/vserver/inode_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/inode_cmd.h 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,59 @@
-+#ifndef _VX_INODE_CMD_H
-+#define _VX_INODE_CMD_H
-+
-+
-+/* inode vserver commands */
-+
-+#define VCMD_get_iattr VC_CMD(INODE, 1, 1)
-+#define VCMD_set_iattr VC_CMD(INODE, 2, 1)
-+
-+#define VCMD_fget_iattr VC_CMD(INODE, 3, 0)
-+#define VCMD_fset_iattr VC_CMD(INODE, 4, 0)
-+
-+struct vcmd_ctx_iattr_v1 {
-+ const char __user *name;
-+ uint32_t tag;
-+ uint32_t flags;
-+ uint32_t mask;
-+};
-+
-+struct vcmd_ctx_fiattr_v0 {
-+ uint32_t tag;
-+ uint32_t flags;
-+ uint32_t mask;
-+};
++#endif /* _VSERVER_INODE_H */
+diff -NurpP --minimal linux-3.10.53/include/linux/vserver/inode_cmd.h linux-3.10.53-vs2.3.6.8/include/linux/vserver/inode_cmd.h
+--- linux-3.10.53/include/linux/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vserver/inode_cmd.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,36 @@
++#ifndef _VSERVER_INODE_CMD_H
++#define _VSERVER_INODE_CMD_H
+
++#include <uapi/vserver/inode_cmd.h>
+
-+#ifdef __KERNEL__
+
+
+#ifdef CONFIG_COMPAT
+
+#endif /* CONFIG_COMPAT */
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_INODE_CMD_H */
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vserver/limit.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/limit.h
---- linux-3.0-rc5/include/linux/vserver/limit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/limit.h 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,71 @@
-+#ifndef _VX_LIMIT_H
-+#define _VX_LIMIT_H
-+
-+#define VLIMIT_NSOCK 16
-+#define VLIMIT_OPENFD 17
-+#define VLIMIT_ANON 18
-+#define VLIMIT_SHMEM 19
-+#define VLIMIT_SEMARY 20
-+#define VLIMIT_NSEMS 21
-+#define VLIMIT_DENTRY 22
-+#define VLIMIT_MAPPED 23
++#endif /* _VSERVER_INODE_CMD_H */
+diff -NurpP --minimal linux-3.10.53/include/linux/vserver/limit.h linux-3.10.53-vs2.3.6.8/include/linux/vserver/limit.h
+--- linux-3.10.53/include/linux/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vserver/limit.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,61 @@
++#ifndef _VSERVER_LIMIT_H
++#define _VSERVER_LIMIT_H
+
++#include <uapi/vserver/limit.h>
+
-+#ifdef __KERNEL__
+
+#define VLIM_NOCHECK ((1L << VLIMIT_DENTRY) | (1L << RLIMIT_RSS))
+
+
+#define NUM_LIMITS 24
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_LIMIT_H */
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vserver/limit_cmd.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/limit_cmd.h
---- linux-3.0-rc5/include/linux/vserver/limit_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/limit_cmd.h 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,71 @@
-+#ifndef _VX_LIMIT_CMD_H
-+#define _VX_LIMIT_CMD_H
-+
-+
-+/* rlimit vserver commands */
-+
-+#define VCMD_get_rlimit VC_CMD(RLIMIT, 1, 0)
-+#define VCMD_set_rlimit VC_CMD(RLIMIT, 2, 0)
-+#define VCMD_get_rlimit_mask VC_CMD(RLIMIT, 3, 0)
-+#define VCMD_reset_hits VC_CMD(RLIMIT, 7, 0)
-+#define VCMD_reset_minmax VC_CMD(RLIMIT, 9, 0)
-+
-+struct vcmd_ctx_rlimit_v0 {
-+ uint32_t id;
-+ uint64_t minimum;
-+ uint64_t softlimit;
-+ uint64_t maximum;
-+};
-+
-+struct vcmd_ctx_rlimit_mask_v0 {
-+ uint32_t minimum;
-+ uint32_t softlimit;
-+ uint32_t maximum;
-+};
-+
-+#define VCMD_rlimit_stat VC_CMD(VSTAT, 1, 0)
-+
-+struct vcmd_rlimit_stat_v0 {
-+ uint32_t id;
-+ uint32_t hits;
-+ uint64_t value;
-+ uint64_t minimum;
-+ uint64_t maximum;
-+};
++#endif /* _VSERVER_LIMIT_H */
+diff -NurpP --minimal linux-3.10.53/include/linux/vserver/limit_cmd.h linux-3.10.53-vs2.3.6.8/include/linux/vserver/limit_cmd.h
+--- linux-3.10.53/include/linux/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vserver/limit_cmd.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,35 @@
++#ifndef _VSERVER_LIMIT_CMD_H
++#define _VSERVER_LIMIT_CMD_H
+
-+#define CRLIM_UNSET (0ULL)
-+#define CRLIM_INFINITY (~0ULL)
-+#define CRLIM_KEEP (~1ULL)
++#include <uapi/vserver/limit_cmd.h>
+
-+#ifdef __KERNEL__
+
+#ifdef CONFIG_IA32_EMULATION
+
+
+#endif /* CONFIG_IA32_EMULATION */
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_LIMIT_CMD_H */
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vserver/limit_def.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/limit_def.h
---- linux-3.0-rc5/include/linux/vserver/limit_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/limit_def.h 2011-06-10 22:11:24.000000000 +0200
++#endif /* _VSERVER_LIMIT_CMD_H */
+diff -NurpP --minimal linux-3.10.53/include/linux/vserver/limit_def.h linux-3.10.53-vs2.3.6.8/include/linux/vserver/limit_def.h
+--- linux-3.10.53/include/linux/vserver/limit_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vserver/limit_def.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,47 @@
-+#ifndef _VX_LIMIT_DEF_H
-+#define _VX_LIMIT_DEF_H
++#ifndef _VSERVER_LIMIT_DEF_H
++#define _VSERVER_LIMIT_DEF_H
+
+#include <asm/atomic.h>
+#include <asm/resource.h>
+
+#endif
+
-+#endif /* _VX_LIMIT_DEF_H */
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vserver/limit_int.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/limit_int.h
---- linux-3.0-rc5/include/linux/vserver/limit_int.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/limit_int.h 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,198 @@
-+#ifndef _VX_LIMIT_INT_H
-+#define _VX_LIMIT_INT_H
-+
-+#include "context.h"
-+
-+#ifdef __KERNEL__
++#endif /* _VSERVER_LIMIT_DEF_H */
+diff -NurpP --minimal linux-3.10.53/include/linux/vserver/limit_int.h linux-3.10.53-vs2.3.6.8/include/linux/vserver/limit_int.h
+--- linux-3.10.53/include/linux/vserver/limit_int.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vserver/limit_int.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,193 @@
++#ifndef _VSERVER_LIMIT_INT_H
++#define _VSERVER_LIMIT_INT_H
+
+#define VXD_RCRES_COND(r) VXD_CBIT(cres, r)
+#define VXD_RLIMIT_COND(r) VXD_CBIT(limit, r)
+}
+
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_LIMIT_INT_H */
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vserver/monitor.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/monitor.h
---- linux-3.0-rc5/include/linux/vserver/monitor.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/monitor.h 2011-06-10 22:11:24.000000000 +0200
++#endif /* _VSERVER_LIMIT_INT_H */
+diff -NurpP --minimal linux-3.10.53/include/linux/vserver/monitor.h linux-3.10.53-vs2.3.6.8/include/linux/vserver/monitor.h
+--- linux-3.10.53/include/linux/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vserver/monitor.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,6 @@
++#ifndef _VSERVER_MONITOR_H
++#define _VSERVER_MONITOR_H
++
++#include <uapi/vserver/monitor.h>
++
++#endif /* _VSERVER_MONITOR_H */
+diff -NurpP --minimal linux-3.10.53/include/linux/vserver/network.h linux-3.10.53-vs2.3.6.8/include/linux/vserver/network.h
+--- linux-3.10.53/include/linux/vserver/network.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vserver/network.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,76 @@
++#ifndef _VSERVER_NETWORK_H
++#define _VSERVER_NETWORK_H
++
++
++#include <linux/list.h>
++#include <linux/spinlock.h>
++#include <linux/rcupdate.h>
++#include <linux/in.h>
++#include <linux/in6.h>
++#include <asm/atomic.h>
++#include <uapi/vserver/network.h>
++
++struct nx_addr_v4 {
++ struct nx_addr_v4 *next;
++ struct in_addr ip[2];
++ struct in_addr mask;
++ uint16_t type;
++ uint16_t flags;
++};
++
++struct nx_addr_v6 {
++ struct nx_addr_v6 *next;
++ struct in6_addr ip;
++ struct in6_addr mask;
++ uint32_t prefix;
++ uint16_t type;
++ uint16_t flags;
++};
++
++struct nx_info {
++ struct hlist_node nx_hlist; /* linked list of nxinfos */
++ vnid_t nx_id; /* vnet id */
++ atomic_t nx_usecnt; /* usage count */
++ atomic_t nx_tasks; /* tasks count */
++ int nx_state; /* context state */
++
++ uint64_t nx_flags; /* network flag word */
++ uint64_t nx_ncaps; /* network capabilities */
++
++ spinlock_t addr_lock; /* protect address changes */
++ struct in_addr v4_lback; /* Loopback address */
++ struct in_addr v4_bcast; /* Broadcast address */
++ struct nx_addr_v4 v4; /* First/Single ipv4 address */
++#ifdef CONFIG_IPV6
++ struct nx_addr_v6 v6; /* First/Single ipv6 address */
++#endif
++ char nx_name[65]; /* network context name */
++};
++
++
++/* status flags */
++
++#define NXS_HASHED 0x0001
++#define NXS_SHUTDOWN 0x0100
++#define NXS_RELEASED 0x8000
++
++extern struct nx_info *lookup_nx_info(int);
++
++extern int get_nid_list(int, unsigned int *, int);
++extern int nid_is_hashed(vnid_t);
++
++extern int nx_migrate_task(struct task_struct *, struct nx_info *);
++
++extern long vs_net_change(struct nx_info *, unsigned int);
++
++struct sock;
++
++
++#define NX_IPV4(n) ((n)->v4.type != NXA_TYPE_NONE)
++#ifdef CONFIG_IPV6
++#define NX_IPV6(n) ((n)->v6.type != NXA_TYPE_NONE)
++#else
++#define NX_IPV6(n) (0)
++#endif
++
++#endif /* _VSERVER_NETWORK_H */
+diff -NurpP --minimal linux-3.10.53/include/linux/vserver/network_cmd.h linux-3.10.53-vs2.3.6.8/include/linux/vserver/network_cmd.h
+--- linux-3.10.53/include/linux/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vserver/network_cmd.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,37 @@
++#ifndef _VSERVER_NETWORK_CMD_H
++#define _VSERVER_NETWORK_CMD_H
++
++#include <uapi/vserver/network_cmd.h>
++
++extern int vc_task_nid(uint32_t);
++
++extern int vc_nx_info(struct nx_info *, void __user *);
++
++extern int vc_net_create(uint32_t, void __user *);
++extern int vc_net_migrate(struct nx_info *, void __user *);
++
++extern int vc_net_add(struct nx_info *, void __user *);
++extern int vc_net_remove(struct nx_info *, void __user *);
++
++extern int vc_net_add_ipv4_v1(struct nx_info *, void __user *);
++extern int vc_net_add_ipv4(struct nx_info *, void __user *);
++
++extern int vc_net_rem_ipv4_v1(struct nx_info *, void __user *);
++extern int vc_net_rem_ipv4(struct nx_info *, void __user *);
++
++extern int vc_net_add_ipv6(struct nx_info *, void __user *);
++extern int vc_net_remove_ipv6(struct nx_info *, void __user *);
++
++extern int vc_add_match_ipv4(struct nx_info *, void __user *);
++extern int vc_get_match_ipv4(struct nx_info *, void __user *);
++
++extern int vc_add_match_ipv6(struct nx_info *, void __user *);
++extern int vc_get_match_ipv6(struct nx_info *, void __user *);
++
++extern int vc_get_nflags(struct nx_info *, void __user *);
++extern int vc_set_nflags(struct nx_info *, void __user *);
++
++extern int vc_get_ncaps(struct nx_info *, void __user *);
++extern int vc_set_ncaps(struct nx_info *, void __user *);
++
++#endif /* _VSERVER_CONTEXT_CMD_H */
+diff -NurpP --minimal linux-3.10.53/include/linux/vserver/percpu.h linux-3.10.53-vs2.3.6.8/include/linux/vserver/percpu.h
+--- linux-3.10.53/include/linux/vserver/percpu.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vserver/percpu.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,14 @@
++#ifndef _VSERVER_PERCPU_H
++#define _VSERVER_PERCPU_H
++
++#include "cvirt_def.h"
++#include "sched_def.h"
++
++struct _vx_percpu {
++ struct _vx_cvirt_pc cvirt;
++ struct _vx_sched_pc sched;
++};
++
++#define PERCPU_PERCTX (sizeof(struct _vx_percpu))
++
++#endif /* _VSERVER_PERCPU_H */
+diff -NurpP --minimal linux-3.10.53/include/linux/vserver/pid.h linux-3.10.53-vs2.3.6.8/include/linux/vserver/pid.h
+--- linux-3.10.53/include/linux/vserver/pid.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vserver/pid.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,51 @@
++#ifndef _VSERVER_PID_H
++#define _VSERVER_PID_H
++
++/* pid faking stuff */
++
++#define vx_info_map_pid(v, p) \
++ __vx_info_map_pid((v), (p), __func__, __FILE__, __LINE__)
++#define vx_info_map_tgid(v,p) vx_info_map_pid(v,p)
++#define vx_map_pid(p) vx_info_map_pid(current_vx_info(), p)
++#define vx_map_tgid(p) vx_map_pid(p)
++
++static inline int __vx_info_map_pid(struct vx_info *vxi, int pid,
++ const char *func, const char *file, int line)
++{
++ if (vx_info_flags(vxi, VXF_INFO_INIT, 0)) {
++ vxfprintk(VXD_CBIT(cvirt, 2),
++ "vx_map_tgid: %p/%llx: %d -> %d",
++ vxi, (long long)vxi->vx_flags, pid,
++ (pid && pid == vxi->vx_initpid) ? 1 : pid,
++ func, file, line);
++ if (pid == 0)
++ return 0;
++ if (pid == vxi->vx_initpid)
++ return 1;
++ }
++ return pid;
++}
++
++#define vx_info_rmap_pid(v, p) \
++ __vx_info_rmap_pid((v), (p), __func__, __FILE__, __LINE__)
++#define vx_rmap_pid(p) vx_info_rmap_pid(current_vx_info(), p)
++#define vx_rmap_tgid(p) vx_rmap_pid(p)
++
++static inline int __vx_info_rmap_pid(struct vx_info *vxi, int pid,
++ const char *func, const char *file, int line)
++{
++ if (vx_info_flags(vxi, VXF_INFO_INIT, 0)) {
++ vxfprintk(VXD_CBIT(cvirt, 2),
++ "vx_rmap_tgid: %p/%llx: %d -> %d",
++ vxi, (long long)vxi->vx_flags, pid,
++ (pid == 1) ? vxi->vx_initpid : pid,
++ func, file, line);
++ if ((pid == 1) && vxi->vx_initpid)
++ return vxi->vx_initpid;
++ if (pid == vxi->vx_initpid)
++ return ~0U;
++ }
++ return pid;
++}
++
++#endif
+diff -NurpP --minimal linux-3.10.53/include/linux/vserver/sched.h linux-3.10.53-vs2.3.6.8/include/linux/vserver/sched.h
+--- linux-3.10.53/include/linux/vserver/sched.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vserver/sched.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,23 @@
++#ifndef _VSERVER_SCHED_H
++#define _VSERVER_SCHED_H
++
++
++#ifdef __KERNEL__
++
++struct timespec;
++
++void vx_vsi_uptime(struct timespec *, struct timespec *);
++
++
++struct vx_info;
++
++void vx_update_load(struct vx_info *);
++
++
++void vx_update_sched_param(struct _vx_sched *sched,
++ struct _vx_sched_pc *sched_pc);
++
++#endif /* __KERNEL__ */
++#else /* _VSERVER_SCHED_H */
++#warning duplicate inclusion
++#endif /* _VSERVER_SCHED_H */
+diff -NurpP --minimal linux-3.10.53/include/linux/vserver/sched_cmd.h linux-3.10.53-vs2.3.6.8/include/linux/vserver/sched_cmd.h
+--- linux-3.10.53/include/linux/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vserver/sched_cmd.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,11 @@
++#ifndef _VSERVER_SCHED_CMD_H
++#define _VSERVER_SCHED_CMD_H
++
++
++#include <linux/compiler.h>
++#include <uapi/vserver/sched_cmd.h>
++
++extern int vc_set_prio_bias(struct vx_info *, void __user *);
++extern int vc_get_prio_bias(struct vx_info *, void __user *);
++
++#endif /* _VSERVER_SCHED_CMD_H */
+diff -NurpP --minimal linux-3.10.53/include/linux/vserver/sched_def.h linux-3.10.53-vs2.3.6.8/include/linux/vserver/sched_def.h
+--- linux-3.10.53/include/linux/vserver/sched_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vserver/sched_def.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,38 @@
++#ifndef _VSERVER_SCHED_DEF_H
++#define _VSERVER_SCHED_DEF_H
++
++#include <linux/spinlock.h>
++#include <linux/jiffies.h>
++#include <linux/cpumask.h>
++#include <asm/atomic.h>
++#include <asm/param.h>
++
++
++/* context sub struct */
++
++struct _vx_sched {
++ int prio_bias; /* bias offset for priority */
++
++ cpumask_t update; /* CPUs which should update */
++};
++
++struct _vx_sched_pc {
++ int prio_bias; /* bias offset for priority */
++
++ uint64_t user_ticks; /* token tick events */
++ uint64_t sys_ticks; /* token tick events */
++ uint64_t hold_ticks; /* token ticks paused */
++};
++
++
++#ifdef CONFIG_VSERVER_DEBUG
++
++static inline void __dump_vx_sched(struct _vx_sched *sched)
++{
++ printk("\t_vx_sched:\n");
++ printk("\t priority = %4d\n", sched->prio_bias);
++}
++
++#endif
++
++#endif /* _VSERVER_SCHED_DEF_H */
+diff -NurpP --minimal linux-3.10.53/include/linux/vserver/signal.h linux-3.10.53-vs2.3.6.8/include/linux/vserver/signal.h
+--- linux-3.10.53/include/linux/vserver/signal.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vserver/signal.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,14 @@
++#ifndef _VSERVER_SIGNAL_H
++#define _VSERVER_SIGNAL_H
++
++
++#ifdef __KERNEL__
++
++struct vx_info;
++
++int vx_info_kill(struct vx_info *, int, int);
++
++#endif /* __KERNEL__ */
++#else /* _VSERVER_SIGNAL_H */
++#warning duplicate inclusion
++#endif /* _VSERVER_SIGNAL_H */
+diff -NurpP --minimal linux-3.10.53/include/linux/vserver/signal_cmd.h linux-3.10.53-vs2.3.6.8/include/linux/vserver/signal_cmd.h
+--- linux-3.10.53/include/linux/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vserver/signal_cmd.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,14 @@
++#ifndef _VSERVER_SIGNAL_CMD_H
++#define _VSERVER_SIGNAL_CMD_H
++
++#include <uapi/vserver/signal_cmd.h>
++
++
++extern int vc_ctx_kill(struct vx_info *, void __user *);
++extern int vc_wait_exit(struct vx_info *, void __user *);
++
++
++extern int vc_get_pflags(uint32_t pid, void __user *);
++extern int vc_set_pflags(uint32_t pid, void __user *);
++
++#endif /* _VSERVER_SIGNAL_CMD_H */
+diff -NurpP --minimal linux-3.10.53/include/linux/vserver/space.h linux-3.10.53-vs2.3.6.8/include/linux/vserver/space.h
+--- linux-3.10.53/include/linux/vserver/space.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vserver/space.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,12 @@
++#ifndef _VSERVER_SPACE_H
++#define _VSERVER_SPACE_H
++
++#include <linux/types.h>
++
++struct vx_info;
++
++int vx_set_space(struct vx_info *vxi, unsigned long mask, unsigned index);
++
++#else /* _VSERVER_SPACE_H */
++#warning duplicate inclusion
++#endif /* _VSERVER_SPACE_H */
+diff -NurpP --minimal linux-3.10.53/include/linux/vserver/space_cmd.h linux-3.10.53-vs2.3.6.8/include/linux/vserver/space_cmd.h
+--- linux-3.10.53/include/linux/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vserver/space_cmd.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,13 @@
++#ifndef _VSERVER_SPACE_CMD_H
++#define _VSERVER_SPACE_CMD_H
++
++#include <uapi/vserver/space_cmd.h>
++
++
++extern int vc_enter_space_v1(struct vx_info *, void __user *);
++extern int vc_set_space_v1(struct vx_info *, void __user *);
++extern int vc_enter_space(struct vx_info *, void __user *);
++extern int vc_set_space(struct vx_info *, void __user *);
++extern int vc_get_space_mask(void __user *, int);
++
++#endif /* _VSERVER_SPACE_CMD_H */
+diff -NurpP --minimal linux-3.10.53/include/linux/vserver/switch.h linux-3.10.53-vs2.3.6.8/include/linux/vserver/switch.h
+--- linux-3.10.53/include/linux/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vserver/switch.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,8 @@
++#ifndef _VSERVER_SWITCH_H
++#define _VSERVER_SWITCH_H
++
++
++#include <linux/errno.h>
++#include <uapi/vserver/switch.h>
++
++#endif /* _VSERVER_SWITCH_H */
+diff -NurpP --minimal linux-3.10.53/include/linux/vserver/tag.h linux-3.10.53-vs2.3.6.8/include/linux/vserver/tag.h
+--- linux-3.10.53/include/linux/vserver/tag.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vserver/tag.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,160 @@
++#ifndef _DX_TAG_H
++#define _DX_TAG_H
++
++#include <linux/types.h>
++#include <linux/uidgid.h>
++
++
++#define DX_TAG(in) (IS_TAGGED(in))
++
++
++#ifdef CONFIG_TAG_NFSD
++#define DX_TAG_NFSD 1
++#else
++#define DX_TAG_NFSD 0
++#endif
++
++
++#ifdef CONFIG_TAGGING_NONE
++
++#define MAX_UID 0xFFFFFFFF
++#define MAX_GID 0xFFFFFFFF
++
++#define INOTAG_TAG(cond, uid, gid, tag) (0)
++
++#define TAGINO_UID(cond, uid, tag) (uid)
++#define TAGINO_GID(cond, gid, tag) (gid)
++
++#endif
++
++
++#ifdef CONFIG_TAGGING_GID16
++
++#define MAX_UID 0xFFFFFFFF
++#define MAX_GID 0x0000FFFF
++
++#define INOTAG_TAG(cond, uid, gid, tag) \
++ ((cond) ? (((gid) >> 16) & 0xFFFF) : 0)
++
++#define TAGINO_UID(cond, uid, tag) (uid)
++#define TAGINO_GID(cond, gid, tag) \
++ ((cond) ? (((gid) & 0xFFFF) | ((tag) << 16)) : (gid))
++
++#endif
++
++
++#ifdef CONFIG_TAGGING_ID24
++
++#define MAX_UID 0x00FFFFFF
++#define MAX_GID 0x00FFFFFF
++
++#define INOTAG_TAG(cond, uid, gid, tag) \
++ ((cond) ? ((((uid) >> 16) & 0xFF00) | (((gid) >> 24) & 0xFF)) : 0)
++
++#define TAGINO_UID(cond, uid, tag) \
++ ((cond) ? (((uid) & 0xFFFFFF) | (((tag) & 0xFF00) << 16)) : (uid))
++#define TAGINO_GID(cond, gid, tag) \
++ ((cond) ? (((gid) & 0xFFFFFF) | (((tag) & 0x00FF) << 24)) : (gid))
++
++#endif
++
++
++#ifdef CONFIG_TAGGING_UID16
++
++#define MAX_UID 0x0000FFFF
++#define MAX_GID 0xFFFFFFFF
++
++#define INOTAG_TAG(cond, uid, gid, tag) \
++ ((cond) ? (((uid) >> 16) & 0xFFFF) : 0)
++
++#define TAGINO_UID(cond, uid, tag) \
++ ((cond) ? (((uid) & 0xFFFF) | ((tag) << 16)) : (uid))
++#define TAGINO_GID(cond, gid, tag) (gid)
++
++#endif
++
++
++#ifdef CONFIG_TAGGING_INTERN
++
++#define MAX_UID 0xFFFFFFFF
++#define MAX_GID 0xFFFFFFFF
++
++#define INOTAG_TAG(cond, uid, gid, tag) \
++ ((cond) ? (tag) : 0)
++
++#define TAGINO_UID(cond, uid, tag) (uid)
++#define TAGINO_GID(cond, gid, tag) (gid)
++
++#endif
++
++
++#ifndef CONFIG_TAGGING_NONE
++#define dx_current_fstag(sb) \
++ ((sb)->s_flags & MS_TAGGED ? dx_current_tag() : 0)
++#else
++#define dx_current_fstag(sb) (0)
++#endif
++
++#ifndef CONFIG_TAGGING_INTERN
++#define TAGINO_TAG(cond, tag) (0)
++#else
++#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)
++{
++ if ((uid > MAX_UID) && (uid != -1))
++ uid = -2;
++ return (uid & MAX_UID);
++}
++
++static inline gid_t dx_map_gid(gid_t gid)
++{
++ if ((gid > MAX_GID) && (gid != -1))
++ gid = -2;
++ return (gid & MAX_GID);
++}
++
++struct peer_tag {
++ int32_t xid;
++ int32_t nid;
++};
++
++#define dx_notagcheck(sb) ((sb) && ((sb)->s_flags & MS_NOTAGCHECK))
++
++int dx_parse_tag(char *string, vtag_t *tag, int remove, int *mnt_flags,
++ unsigned long *flags);
++
++#ifdef CONFIG_PROPAGATE
++
++void __dx_propagate_tag(struct nameidata *nd, struct inode *inode);
++
++#define dx_propagate_tag(n, i) __dx_propagate_tag(n, i)
++
++#else
++#define dx_propagate_tag(n, i) do { } while (0)
++#endif
++
++#endif /* _DX_TAG_H */
+diff -NurpP --minimal linux-3.10.53/include/linux/vserver/tag_cmd.h linux-3.10.53-vs2.3.6.8/include/linux/vserver/tag_cmd.h
+--- linux-3.10.53/include/linux/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/linux/vserver/tag_cmd.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,10 @@
++#ifndef _VSERVER_TAG_CMD_H
++#define _VSERVER_TAG_CMD_H
++
++#include <uapi/vserver/tag_cmd.h>
++
++extern int vc_task_tag(uint32_t);
++
++extern int vc_tag_migrate(uint32_t);
++
++#endif /* _VSERVER_TAG_CMD_H */
+diff -NurpP --minimal linux-3.10.53/include/net/addrconf.h linux-3.10.53-vs2.3.6.8/include/net/addrconf.h
+--- linux-3.10.53/include/net/addrconf.h 2014-08-30 13:38:59.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/net/addrconf.h 2013-11-13 17:19:37.000000000 +0000
+@@ -89,7 +89,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 inet6_dev *idev,
+ struct in6_addr *addr,
+ unsigned char banned_flags);
+diff -NurpP --minimal linux-3.10.53/include/net/af_unix.h linux-3.10.53-vs2.3.6.8/include/net/af_unix.h
+--- linux-3.10.53/include/net/af_unix.h 2013-07-14 17:01:33.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/net/af_unix.h 2013-08-22 20:30:00.000000000 +0000
+@@ -4,6 +4,7 @@
+ #include <linux/socket.h>
+ #include <linux/un.h>
+ #include <linux/mutex.h>
++#include <linux/vs_base.h>
+ #include <net/sock.h>
+
+ extern void unix_inflight(struct file *fp);
+diff -NurpP --minimal linux-3.10.53/include/net/inet_timewait_sock.h linux-3.10.53-vs2.3.6.8/include/net/inet_timewait_sock.h
+--- linux-3.10.53/include/net/inet_timewait_sock.h 2013-05-31 13:45:28.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/net/inet_timewait_sock.h 2013-08-22 20:30:00.000000000 +0000
+@@ -116,6 +116,10 @@ struct inet_timewait_sock {
+ #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
++#define tw_nx_info __tw_common.skc_nx_info
+
+ int tw_timeout;
+ volatile unsigned char tw_substate;
+diff -NurpP --minimal linux-3.10.53/include/net/ip6_route.h linux-3.10.53-vs2.3.6.8/include/net/ip6_route.h
+--- linux-3.10.53/include/net/ip6_route.h 2014-08-30 13:39:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/net/ip6_route.h 2014-06-12 11:14:28.000000000 +0000
+@@ -100,7 +100,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.10.53/include/net/route.h linux-3.10.53-vs2.3.6.8/include/net/route.h
+--- linux-3.10.53/include/net/route.h 2013-02-19 13:58:52.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/net/route.h 2013-08-22 20:30:00.000000000 +0000
+@@ -207,6 +207,9 @@ static inline void ip_rt_put(struct rtab
+ dst_release(&rt->dst);
+ }
+
++#include <linux/vs_base.h>
++#include <linux/vs_inet.h>
++
+ #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
+ protocol, flow_flags, dst, src, dport, sport);
+ }
+
++extern struct rtable *ip_v4_find_src(struct net *net, struct nx_info *,
++ struct flowi4 *);
++
+ 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
+ {
+ 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);
+
+- if (!dst || !src) {
++ if (sk)
++ nx_info = sk->sk_nx_info;
++
++ vxdprintk(VXD_CBIT(net, 4),
++ "ip_route_connect(%p) %p,%p;%lx",
++ sk, nx_info, sk->sk_socket,
++ (sk->sk_socket?sk->sk_socket->flags:0));
++
++ rt = ip_v4_find_src(net, nx_info, fl4);
++ if (IS_ERR(rt))
++ return rt;
++ ip_rt_put(rt);
++
++ if (!fl4->daddr || !fl4->saddr) {
+ rt = __ip_route_output_key(net, fl4);
+ if (IS_ERR(rt))
+ return rt;
+diff -NurpP --minimal linux-3.10.53/include/net/sock.h linux-3.10.53-vs2.3.6.8/include/net/sock.h
+--- linux-3.10.53/include/net/sock.h 2014-08-30 13:39:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/net/sock.h 2014-08-30 14:03:55.000000000 +0000
+@@ -191,6 +191,10 @@ struct sock_common {
+ #ifdef CONFIG_NET_NS
+ struct net *skc_net;
+ #endif
++ vxid_t skc_xid;
++ struct vx_info *skc_vx_info;
++ vnid_t skc_nid;
++ struct nx_info *skc_nx_info;
+ /*
+ * fields between dontcopy_begin/dontcopy_end
+ * are not copied in sock_copy()
+@@ -305,6 +309,10 @@ struct sock {
+ #define sk_bind_node __sk_common.skc_bind_node
+ #define sk_prot __sk_common.skc_prot
+ #define sk_net __sk_common.skc_net
++#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.10.53/include/uapi/Kbuild linux-3.10.53-vs2.3.6.8/include/uapi/Kbuild
+--- linux-3.10.53/include/uapi/Kbuild 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/uapi/Kbuild 2013-08-22 20:30:00.000000000 +0000
+@@ -12,3 +12,4 @@ header-y += video/
+ header-y += drm/
+ header-y += xen/
+ header-y += scsi/
++header-y += vserver/
+diff -NurpP --minimal linux-3.10.53/include/uapi/linux/capability.h linux-3.10.53-vs2.3.6.8/include/uapi/linux/capability.h
+--- linux-3.10.53/include/uapi/linux/capability.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/uapi/linux/capability.h 2013-08-22 20:30:00.000000000 +0000
+@@ -259,6 +259,7 @@ struct vfs_cap_data {
+ arbitrary SCSI commands */
+ /* Allow setting encryption key on loopback filesystem */
+ /* Allow setting zone reclaim policy */
++/* Allow the selection of a security context */
+
+ #define CAP_SYS_ADMIN 21
+
+@@ -345,7 +346,12 @@ struct vfs_cap_data {
+
+ #define CAP_LAST_CAP CAP_BLOCK_SUSPEND
+
+-#define cap_valid(x) ((x) >= 0 && (x) <= CAP_LAST_CAP)
++/* Allow context manipulations */
++/* Allow changing context info on files */
++
++#define CAP_CONTEXT 63
++
++#define cap_valid(x) ((x) >= 0 && ((x) <= CAP_LAST_CAP || (x) == CAP_CONTEXT))
+
+ /*
+ * Bit location of each capability (used by user-space library and kernel)
+diff -NurpP --minimal linux-3.10.53/include/uapi/linux/fs.h linux-3.10.53-vs2.3.6.8/include/uapi/linux/fs.h
+--- linux-3.10.53/include/uapi/linux/fs.h 2013-07-14 17:01:34.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/uapi/linux/fs.h 2013-08-22 20:30:00.000000000 +0000
+@@ -86,6 +86,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 */
++#define MS_TAGGED (1<<8) /* use generic inode tagging */
++#define MS_NOTAGCHECK (1<<9) /* don't check tags */
++#define MS_TAGID (1<<25) /* use specific tag for this mount */
+
+ /* These sb flags are internal to the kernel */
+ #define MS_NOSEC (1<<28)
+@@ -191,11 +194,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 */
++#define FS_IXUNLINK_FL 0x08000000 /* Immutable invert on unlink */
+ #define FS_RESERVED_FL 0x80000000 /* reserved for ext2 lib */
+
+-#define FS_FL_USER_VISIBLE 0x0003DFFF /* User visible flags */
+-#define FS_FL_USER_MODIFIABLE 0x000380FF /* User modifiable flags */
++#define FS_BARRIER_FL 0x04000000 /* Barrier for chroot() */
++#define FS_COW_FL 0x20000000 /* Copy on Write marker */
+
++#define FS_FL_USER_VISIBLE 0x0103DFFF /* User visible flags */
++#define FS_FL_USER_MODIFIABLE 0x010380FF /* User modifiable flags */
+
+ #define SYNC_FILE_RANGE_WAIT_BEFORE 1
+ #define SYNC_FILE_RANGE_WRITE 2
+diff -NurpP --minimal linux-3.10.53/include/uapi/linux/gfs2_ondisk.h linux-3.10.53-vs2.3.6.8/include/uapi/linux/gfs2_ondisk.h
+--- linux-3.10.53/include/uapi/linux/gfs2_ondisk.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/uapi/linux/gfs2_ondisk.h 2013-08-22 20:30:00.000000000 +0000
+@@ -225,6 +225,9 @@ enum {
+ gfs2fl_Sync = 8,
+ gfs2fl_System = 9,
+ gfs2fl_TopLevel = 10,
++ gfs2fl_IXUnlink = 16,
++ gfs2fl_Barrier = 17,
++ gfs2fl_Cow = 18,
+ gfs2fl_TruncInProg = 29,
+ gfs2fl_InheritDirectio = 30,
+ gfs2fl_InheritJdata = 31,
+@@ -242,6 +245,9 @@ enum {
+ #define GFS2_DIF_SYNC 0x00000100
+ #define GFS2_DIF_SYSTEM 0x00000200 /* New in gfs2 */
+ #define GFS2_DIF_TOPDIR 0x00000400 /* New in gfs2 */
++#define GFS2_DIF_IXUNLINK 0x00010000
++#define GFS2_DIF_BARRIER 0x00020000
++#define GFS2_DIF_COW 0x00040000
+ #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.10.53/include/uapi/linux/if_tun.h linux-3.10.53-vs2.3.6.8/include/uapi/linux/if_tun.h
+--- linux-3.10.53/include/uapi/linux/if_tun.h 2013-02-19 13:58:55.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/uapi/linux/if_tun.h 2013-08-22 20:30:00.000000000 +0000
+@@ -56,6 +56,7 @@
+ #define TUNGETVNETHDRSZ _IOR('T', 215, int)
+ #define TUNSETVNETHDRSZ _IOW('T', 216, int)
+ #define TUNSETQUEUE _IOW('T', 217, int)
++#define TUNSETNID _IOW('T', 218, int)
+
+ /* TUNSETIFF ifr flags */
+ #define IFF_TUN 0x0001
+diff -NurpP --minimal linux-3.10.53/include/uapi/linux/major.h linux-3.10.53-vs2.3.6.8/include/uapi/linux/major.h
+--- linux-3.10.53/include/uapi/linux/major.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/uapi/linux/major.h 2013-08-22 20:30:00.000000000 +0000
+@@ -15,6 +15,7 @@
+ #define HD_MAJOR IDE0_MAJOR
+ #define PTY_SLAVE_MAJOR 3
+ #define TTY_MAJOR 4
++#define VROOT_MAJOR 4
+ #define TTYAUX_MAJOR 5
+ #define LP_MAJOR 6
+ #define VCS_MAJOR 7
+diff -NurpP --minimal linux-3.10.53/include/uapi/linux/nfs_mount.h linux-3.10.53-vs2.3.6.8/include/uapi/linux/nfs_mount.h
+--- linux-3.10.53/include/uapi/linux/nfs_mount.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/uapi/linux/nfs_mount.h 2013-08-22 20:30:00.000000000 +0000
+@@ -63,7 +63,8 @@ struct nfs_mount_data {
+ #define NFS_MOUNT_SECFLAVOUR 0x2000 /* 5 */
+ #define NFS_MOUNT_NORDIRPLUS 0x4000 /* 5 */
+ #define NFS_MOUNT_UNSHARED 0x8000 /* 5 */
+-#define NFS_MOUNT_FLAGMASK 0xFFFF
++#define NFS_MOUNT_TAGGED 0x10000 /* context tagging */
++#define NFS_MOUNT_FLAGMASK 0x1FFFF
+
+ /* The following are for internal use only */
+ #define NFS_MOUNT_LOOKUP_CACHE_NONEG 0x10000
+diff -NurpP --minimal linux-3.10.53/include/uapi/linux/reboot.h linux-3.10.53-vs2.3.6.8/include/uapi/linux/reboot.h
+--- linux-3.10.53/include/uapi/linux/reboot.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/uapi/linux/reboot.h 2013-08-22 20:30:00.000000000 +0000
+@@ -33,7 +33,7 @@
+ #define LINUX_REBOOT_CMD_RESTART2 0xA1B2C3D4
+ #define LINUX_REBOOT_CMD_SW_SUSPEND 0xD000FCE2
+ #define LINUX_REBOOT_CMD_KEXEC 0x45584543
+-
++#define LINUX_REBOOT_CMD_OOM 0xDEADBEEF
+
+
+ #endif /* _UAPI_LINUX_REBOOT_H */
+diff -NurpP --minimal linux-3.10.53/include/uapi/linux/sysctl.h linux-3.10.53-vs2.3.6.8/include/uapi/linux/sysctl.h
+--- linux-3.10.53/include/uapi/linux/sysctl.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/uapi/linux/sysctl.h 2013-08-22 20:30:00.000000000 +0000
+@@ -60,6 +60,7 @@ enum
+ CTL_ABI=9, /* Binary emulation */
+ CTL_CPU=10, /* CPU stuff (speed scaling, etc) */
+ CTL_ARLAN=254, /* arlan wireless driver */
++ CTL_VSERVER=4242, /* Linux-VServer debug */
+ CTL_S390DBF=5677, /* s390 debug */
+ CTL_SUNRPC=7249, /* sunrpc debug */
+ CTL_PM=9899, /* frv power management */
+@@ -94,6 +95,7 @@ enum
+
+ KERN_PANIC=15, /* int: panic timeout */
+ KERN_REALROOTDEV=16, /* real root device to mount after initrd */
++ KERN_VSHELPER=17, /* string: path to vshelper policy agent */
+
+ KERN_SPARC_REBOOT=21, /* reboot command on Sparc */
+ KERN_CTLALTDEL=22, /* int: allow ctl-alt-del to reboot */
+diff -NurpP --minimal linux-3.10.53/include/uapi/vserver/Kbuild linux-3.10.53-vs2.3.6.8/include/uapi/vserver/Kbuild
+--- linux-3.10.53/include/uapi/vserver/Kbuild 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/uapi/vserver/Kbuild 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,9 @@
++
++header-y += context_cmd.h network_cmd.h space_cmd.h \
++ cacct_cmd.h cvirt_cmd.h limit_cmd.h dlimit_cmd.h \
++ inode_cmd.h tag_cmd.h sched_cmd.h signal_cmd.h \
++ debug_cmd.h device_cmd.h
++
++header-y += switch.h context.h network.h monitor.h \
++ limit.h inode.h device.h
++
+diff -NurpP --minimal linux-3.10.53/include/uapi/vserver/cacct_cmd.h linux-3.10.53-vs2.3.6.8/include/uapi/vserver/cacct_cmd.h
+--- linux-3.10.53/include/uapi/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/uapi/vserver/cacct_cmd.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,15 @@
++#ifndef _UAPI_VS_CACCT_CMD_H
++#define _UAPI_VS_CACCT_CMD_H
++
++
++/* virtual host info name commands */
++
++#define VCMD_sock_stat VC_CMD(VSTAT, 5, 0)
++
++struct vcmd_sock_stat_v0 {
++ uint32_t field;
++ uint32_t count[3];
++ uint64_t total[3];
++};
++
++#endif /* _UAPI_VS_CACCT_CMD_H */
+diff -NurpP --minimal linux-3.10.53/include/uapi/vserver/context.h linux-3.10.53-vs2.3.6.8/include/uapi/vserver/context.h
+--- linux-3.10.53/include/uapi/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/uapi/vserver/context.h 2013-10-27 03:43:35.000000000 +0000
+@@ -0,0 +1,81 @@
++#ifndef _UAPI_VS_CONTEXT_H
++#define _UAPI_VS_CONTEXT_H
++
++#include <linux/types.h>
++#include <linux/capability.h>
++
++
++/* context flags */
++
++#define VXF_INFO_SCHED 0x00000002
++#define VXF_INFO_NPROC 0x00000004
++#define VXF_INFO_PRIVATE 0x00000008
++
++#define VXF_INFO_INIT 0x00000010
++#define VXF_INFO_HIDE 0x00000020
++#define VXF_INFO_ULIMIT 0x00000040
++#define VXF_INFO_NSPACE 0x00000080
++
++#define VXF_SCHED_HARD 0x00000100
++#define VXF_SCHED_PRIO 0x00000200
++#define VXF_SCHED_PAUSE 0x00000400
++
++#define VXF_VIRT_MEM 0x00010000
++#define VXF_VIRT_UPTIME 0x00020000
++#define VXF_VIRT_CPU 0x00040000
++#define VXF_VIRT_LOAD 0x00080000
++#define VXF_VIRT_TIME 0x00100000
++
++#define VXF_HIDE_MOUNT 0x01000000
++/* was VXF_HIDE_NETIF 0x02000000 */
++#define VXF_HIDE_VINFO 0x04000000
++
++#define VXF_STATE_SETUP (1ULL << 32)
++#define VXF_STATE_INIT (1ULL << 33)
++#define VXF_STATE_ADMIN (1ULL << 34)
++
++#define VXF_SC_HELPER (1ULL << 36)
++#define VXF_REBOOT_KILL (1ULL << 37)
++#define VXF_PERSISTENT (1ULL << 38)
++
++#define VXF_FORK_RSS (1ULL << 48)
++#define VXF_PROLIFIC (1ULL << 49)
++
++#define VXF_IGNEG_NICE (1ULL << 52)
++
++#define VXF_ONE_TIME (0x0007ULL << 32)
++
++#define VXF_INIT_SET (VXF_STATE_SETUP | VXF_STATE_INIT | VXF_STATE_ADMIN)
++
++
++/* context migration */
++
++#define VXM_SET_INIT 0x00000001
++#define VXM_SET_REAPER 0x00000002
++
++/* context caps */
++
++#define VXC_SET_UTSNAME 0x00000001
++#define VXC_SET_RLIMIT 0x00000002
++#define VXC_FS_SECURITY 0x00000004
++#define VXC_FS_TRUSTED 0x00000008
++#define VXC_TIOCSTI 0x00000010
++
++/* was VXC_RAW_ICMP 0x00000100 */
++#define VXC_SYSLOG 0x00001000
++#define VXC_OOM_ADJUST 0x00002000
++#define VXC_AUDIT_CONTROL 0x00004000
++
++#define VXC_SECURE_MOUNT 0x00010000
++/* #define VXC_SECURE_REMOUNT 0x00020000 */
++#define VXC_BINARY_MOUNT 0x00040000
++#define VXC_DEV_MOUNT 0x00080000
++
++#define VXC_QUOTA_CTL 0x00100000
++#define VXC_ADMIN_MAPPER 0x00200000
++#define VXC_ADMIN_CLOOP 0x00400000
++
++#define VXC_KTHREAD 0x01000000
++#define VXC_NAMESPACE 0x02000000
++
++#endif /* _UAPI_VS_CONTEXT_H */
+diff -NurpP --minimal linux-3.10.53/include/uapi/vserver/context_cmd.h linux-3.10.53-vs2.3.6.8/include/uapi/vserver/context_cmd.h
+--- linux-3.10.53/include/uapi/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/uapi/vserver/context_cmd.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,115 @@
++#ifndef _UAPI_VS_CONTEXT_CMD_H
++#define _UAPI_VS_CONTEXT_CMD_H
++
++
++/* vinfo commands */
++
++#define VCMD_task_xid VC_CMD(VINFO, 1, 0)
++
++
++#define VCMD_vx_info VC_CMD(VINFO, 5, 0)
++
++struct vcmd_vx_info_v0 {
++ uint32_t xid;
++ uint32_t initpid;
++ /* more to come */
++};
++
++
++#define VCMD_ctx_stat VC_CMD(VSTAT, 0, 0)
++
++struct vcmd_ctx_stat_v0 {
++ uint32_t usecnt;
++ uint32_t tasks;
++ /* more to come */
++};
++
++
++/* context commands */
++
++#define VCMD_ctx_create_v0 VC_CMD(VPROC, 1, 0)
++#define VCMD_ctx_create VC_CMD(VPROC, 1, 1)
++
++struct vcmd_ctx_create {
++ uint64_t flagword;
++};
++
++#define VCMD_ctx_migrate_v0 VC_CMD(PROCMIG, 1, 0)
++#define VCMD_ctx_migrate VC_CMD(PROCMIG, 1, 1)
++
++struct vcmd_ctx_migrate {
++ uint64_t flagword;
++};
++
++
++
++/* flag commands */
++
++#define VCMD_get_cflags VC_CMD(FLAGS, 1, 0)
++#define VCMD_set_cflags VC_CMD(FLAGS, 2, 0)
++
++struct vcmd_ctx_flags_v0 {
++ uint64_t flagword;
++ uint64_t mask;
++};
++
++
++
++/* context caps commands */
++
++#define VCMD_get_ccaps VC_CMD(FLAGS, 3, 1)
++#define VCMD_set_ccaps VC_CMD(FLAGS, 4, 1)
++
++struct vcmd_ctx_caps_v1 {
++ uint64_t ccaps;
++ uint64_t cmask;
++};
++
++
++
++/* bcaps commands */
++
++#define VCMD_get_bcaps VC_CMD(FLAGS, 9, 0)
++#define VCMD_set_bcaps VC_CMD(FLAGS, 10, 0)
++
++struct vcmd_bcaps {
++ uint64_t bcaps;
++ uint64_t bmask;
++};
++
++
++
++/* umask commands */
++
++#define VCMD_get_umask VC_CMD(FLAGS, 13, 0)
++#define VCMD_set_umask VC_CMD(FLAGS, 14, 0)
++
++struct vcmd_umask {
++ uint64_t umask;
++ uint64_t mask;
++};
++
++
++
++/* wmask commands */
++
++#define VCMD_get_wmask VC_CMD(FLAGS, 15, 0)
++#define VCMD_set_wmask VC_CMD(FLAGS, 16, 0)
++
++struct vcmd_wmask {
++ uint64_t wmask;
++ uint64_t mask;
++};
++
++
++
++/* OOM badness */
++
++#define VCMD_get_badness VC_CMD(MEMCTRL, 5, 0)
++#define VCMD_set_badness VC_CMD(MEMCTRL, 6, 0)
++
++struct vcmd_badness_v0 {
++ int64_t bias;
++};
++
++#endif /* _UAPI_VS_CONTEXT_CMD_H */
+diff -NurpP --minimal linux-3.10.53/include/uapi/vserver/cvirt_cmd.h linux-3.10.53-vs2.3.6.8/include/uapi/vserver/cvirt_cmd.h
+--- linux-3.10.53/include/uapi/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/uapi/vserver/cvirt_cmd.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,41 @@
++#ifndef _UAPI_VS_CVIRT_CMD_H
++#define _UAPI_VS_CVIRT_CMD_H
++
++
++/* virtual host info name commands */
++
++#define VCMD_set_vhi_name VC_CMD(VHOST, 1, 0)
++#define VCMD_get_vhi_name VC_CMD(VHOST, 2, 0)
++
++struct vcmd_vhi_name_v0 {
++ uint32_t field;
++ char name[65];
++};
++
++
++enum vhi_name_field {
++ VHIN_CONTEXT = 0,
++ VHIN_SYSNAME,
++ VHIN_NODENAME,
++ VHIN_RELEASE,
++ VHIN_VERSION,
++ VHIN_MACHINE,
++ VHIN_DOMAINNAME,
++};
++
++
++
++#define VCMD_virt_stat VC_CMD(VSTAT, 3, 0)
++
++struct vcmd_virt_stat_v0 {
++ uint64_t offset;
++ uint64_t uptime;
++ uint32_t nr_threads;
++ uint32_t nr_running;
++ uint32_t nr_uninterruptible;
++ uint32_t nr_onhold;
++ uint32_t nr_forks;
++ uint32_t load[3];
++};
++
++#endif /* _UAPI_VS_CVIRT_CMD_H */
+diff -NurpP --minimal linux-3.10.53/include/uapi/vserver/debug_cmd.h linux-3.10.53-vs2.3.6.8/include/uapi/vserver/debug_cmd.h
+--- linux-3.10.53/include/uapi/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/uapi/vserver/debug_cmd.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,24 @@
++#ifndef _UAPI_VS_DEBUG_CMD_H
++#define _UAPI_VS_DEBUG_CMD_H
++
++
++/* debug commands */
++
++#define VCMD_dump_history VC_CMD(DEBUG, 1, 0)
++
++#define VCMD_read_history VC_CMD(DEBUG, 5, 0)
++#define VCMD_read_monitor VC_CMD(DEBUG, 6, 0)
++
++struct vcmd_read_history_v0 {
++ uint32_t index;
++ uint32_t count;
++ char __user *data;
++};
++
++struct vcmd_read_monitor_v0 {
++ uint32_t index;
++ uint32_t count;
++ char __user *data;
++};
++
++#endif /* _UAPI_VS_DEBUG_CMD_H */
+diff -NurpP --minimal linux-3.10.53/include/uapi/vserver/device.h linux-3.10.53-vs2.3.6.8/include/uapi/vserver/device.h
+--- linux-3.10.53/include/uapi/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/uapi/vserver/device.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,12 @@
++#ifndef _UAPI_VS_DEVICE_H
++#define _UAPI_VS_DEVICE_H
++
++
++#define DATTR_CREATE 0x00000001
++#define DATTR_OPEN 0x00000002
++
++#define DATTR_REMAP 0x00000010
++
++#define DATTR_MASK 0x00000013
++
++#endif /* _UAPI_VS_DEVICE_H */
+diff -NurpP --minimal linux-3.10.53/include/uapi/vserver/device_cmd.h linux-3.10.53-vs2.3.6.8/include/uapi/vserver/device_cmd.h
+--- linux-3.10.53/include/uapi/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/uapi/vserver/device_cmd.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,16 @@
++#ifndef _UAPI_VS_DEVICE_CMD_H
++#define _UAPI_VS_DEVICE_CMD_H
++
++
++/* device vserver commands */
++
++#define VCMD_set_mapping VC_CMD(DEVICE, 1, 0)
++#define VCMD_unset_mapping VC_CMD(DEVICE, 2, 0)
++
++struct vcmd_set_mapping_v0 {
++ const char __user *device;
++ const char __user *target;
++ uint32_t flags;
++};
++
++#endif /* _UAPI_VS_DEVICE_CMD_H */
+diff -NurpP --minimal linux-3.10.53/include/uapi/vserver/dlimit_cmd.h linux-3.10.53-vs2.3.6.8/include/uapi/vserver/dlimit_cmd.h
+--- linux-3.10.53/include/uapi/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/uapi/vserver/dlimit_cmd.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,67 @@
++#ifndef _UAPI_VS_DLIMIT_CMD_H
++#define _UAPI_VS_DLIMIT_CMD_H
++
++
++/* dlimit vserver commands */
++
++#define VCMD_add_dlimit VC_CMD(DLIMIT, 1, 0)
++#define VCMD_rem_dlimit VC_CMD(DLIMIT, 2, 0)
++
++#define VCMD_set_dlimit VC_CMD(DLIMIT, 5, 0)
++#define VCMD_get_dlimit VC_CMD(DLIMIT, 6, 0)
++
++struct vcmd_ctx_dlimit_base_v0 {
++ const char __user *name;
++ uint32_t flags;
++};
++
++struct vcmd_ctx_dlimit_v0 {
++ const char __user *name;
++ uint32_t space_used; /* used space in kbytes */
++ uint32_t space_total; /* maximum space in kbytes */
++ uint32_t inodes_used; /* used inodes */
++ uint32_t inodes_total; /* maximum inodes */
++ uint32_t reserved; /* reserved for root in % */
++ uint32_t flags;
++};
++
++#define CDLIM_UNSET ((uint32_t)0UL)
++#define CDLIM_INFINITY ((uint32_t)~0UL)
++#define CDLIM_KEEP ((uint32_t)~1UL)
++
++#define DLIME_UNIT 0
++#define DLIME_KILO 1
++#define DLIME_MEGA 2
++#define DLIME_GIGA 3
++
++#define DLIMF_SHIFT 0x10
++
++#define DLIMS_USED 0
++#define DLIMS_TOTAL 2
++
++static inline
++uint64_t dlimit_space_32to64(uint32_t val, uint32_t flags, int shift)
++{
++ int exp = (flags & DLIMF_SHIFT) ?
++ (flags >> shift) & DLIME_GIGA : DLIME_KILO;
++ return ((uint64_t)val) << (10 * exp);
++}
++
++static inline
++uint32_t dlimit_space_64to32(uint64_t val, uint32_t *flags, int shift)
++{
++ int exp = 0;
++
++ if (*flags & DLIMF_SHIFT) {
++ while (val > (1LL << 32) && (exp < 3)) {
++ val >>= 10;
++ exp++;
++ }
++ *flags &= ~(DLIME_GIGA << shift);
++ *flags |= exp << shift;
++ } else
++ val >>= 10;
++ return val;
++}
++
++#endif /* _UAPI_VS_DLIMIT_CMD_H */
+diff -NurpP --minimal linux-3.10.53/include/uapi/vserver/inode.h linux-3.10.53-vs2.3.6.8/include/uapi/vserver/inode.h
+--- linux-3.10.53/include/uapi/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/uapi/vserver/inode.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,23 @@
++#ifndef _UAPI_VS_INODE_H
++#define _UAPI_VS_INODE_H
++
++
++#define IATTR_TAG 0x01000000
++
++#define IATTR_ADMIN 0x00000001
++#define IATTR_WATCH 0x00000002
++#define IATTR_HIDE 0x00000004
++#define IATTR_FLAGS 0x00000007
++
++#define IATTR_BARRIER 0x00010000
++#define IATTR_IXUNLINK 0x00020000
++#define IATTR_IMMUTABLE 0x00040000
++#define IATTR_COW 0x00080000
++
++
++/* inode ioctls */
++
++#define FIOC_GETXFLG _IOR('x', 5, long)
++#define FIOC_SETXFLG _IOW('x', 6, long)
++
++#endif /* _UAPI_VS_INODE_H */
+diff -NurpP --minimal linux-3.10.53/include/uapi/vserver/inode_cmd.h linux-3.10.53-vs2.3.6.8/include/uapi/vserver/inode_cmd.h
+--- linux-3.10.53/include/uapi/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/uapi/vserver/inode_cmd.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,26 @@
++#ifndef _UAPI_VS_INODE_CMD_H
++#define _UAPI_VS_INODE_CMD_H
++
++
++/* inode vserver commands */
++
++#define VCMD_get_iattr VC_CMD(INODE, 1, 1)
++#define VCMD_set_iattr VC_CMD(INODE, 2, 1)
++
++#define VCMD_fget_iattr VC_CMD(INODE, 3, 0)
++#define VCMD_fset_iattr VC_CMD(INODE, 4, 0)
++
++struct vcmd_ctx_iattr_v1 {
++ const char __user *name;
++ uint32_t tag;
++ uint32_t flags;
++ uint32_t mask;
++};
++
++struct vcmd_ctx_fiattr_v0 {
++ uint32_t tag;
++ uint32_t flags;
++ uint32_t mask;
++};
++
++#endif /* _UAPI_VS_INODE_CMD_H */
+diff -NurpP --minimal linux-3.10.53/include/uapi/vserver/limit.h linux-3.10.53-vs2.3.6.8/include/uapi/vserver/limit.h
+--- linux-3.10.53/include/uapi/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/uapi/vserver/limit.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,14 @@
++#ifndef _UAPI_VS_LIMIT_H
++#define _UAPI_VS_LIMIT_H
++
++
++#define VLIMIT_NSOCK 16
++#define VLIMIT_OPENFD 17
++#define VLIMIT_ANON 18
++#define VLIMIT_SHMEM 19
++#define VLIMIT_SEMARY 20
++#define VLIMIT_NSEMS 21
++#define VLIMIT_DENTRY 22
++#define VLIMIT_MAPPED 23
++
++#endif /* _UAPI_VS_LIMIT_H */
+diff -NurpP --minimal linux-3.10.53/include/uapi/vserver/limit_cmd.h linux-3.10.53-vs2.3.6.8/include/uapi/vserver/limit_cmd.h
+--- linux-3.10.53/include/uapi/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/uapi/vserver/limit_cmd.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,40 @@
++#ifndef _UAPI_VS_LIMIT_CMD_H
++#define _UAPI_VS_LIMIT_CMD_H
++
++
++/* rlimit vserver commands */
++
++#define VCMD_get_rlimit VC_CMD(RLIMIT, 1, 0)
++#define VCMD_set_rlimit VC_CMD(RLIMIT, 2, 0)
++#define VCMD_get_rlimit_mask VC_CMD(RLIMIT, 3, 0)
++#define VCMD_reset_hits VC_CMD(RLIMIT, 7, 0)
++#define VCMD_reset_minmax VC_CMD(RLIMIT, 9, 0)
++
++struct vcmd_ctx_rlimit_v0 {
++ uint32_t id;
++ uint64_t minimum;
++ uint64_t softlimit;
++ uint64_t maximum;
++};
++
++struct vcmd_ctx_rlimit_mask_v0 {
++ uint32_t minimum;
++ uint32_t softlimit;
++ uint32_t maximum;
++};
++
++#define VCMD_rlimit_stat VC_CMD(VSTAT, 1, 0)
++
++struct vcmd_rlimit_stat_v0 {
++ uint32_t id;
++ uint32_t hits;
++ uint64_t value;
++ uint64_t minimum;
++ uint64_t maximum;
++};
++
++#define CRLIM_UNSET (0ULL)
++#define CRLIM_INFINITY (~0ULL)
++#define CRLIM_KEEP (~1ULL)
++
++#endif /* _UAPI_VS_LIMIT_CMD_H */
+diff -NurpP --minimal linux-3.10.53/include/uapi/vserver/monitor.h linux-3.10.53-vs2.3.6.8/include/uapi/vserver/monitor.h
+--- linux-3.10.53/include/uapi/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/uapi/vserver/monitor.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,96 @@
-+#ifndef _VX_MONITOR_H
-+#define _VX_MONITOR_H
++#ifndef _UAPI_VS_MONITOR_H
++#define _UAPI_VS_MONITOR_H
+
+#include <linux/types.h>
+
++
+enum {
+ VXM_UNUSED = 0,
+
+ };
+};
+
-+
-+#endif /* _VX_MONITOR_H */
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vserver/network.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/network.h
---- linux-3.0-rc5/include/linux/vserver/network.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/network.h 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,146 @@
-+#ifndef _VX_NETWORK_H
-+#define _VX_NETWORK_H
++#endif /* _UAPI_VS_MONITOR_H */
+diff -NurpP --minimal linux-3.10.53/include/uapi/vserver/network.h linux-3.10.53-vs2.3.6.8/include/uapi/vserver/network.h
+--- linux-3.10.53/include/uapi/vserver/network.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/uapi/vserver/network.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,76 @@
++#ifndef _UAPI_VS_NETWORK_H
++#define _UAPI_VS_NETWORK_H
+
+#include <linux/types.h>
+
+
+#define NXC_RAW_ICMP 0x00000100
+
++#define NXC_MULTICAST 0x00001000
++
+
+/* address types */
+
+#define NXA_MASK_BIND (NXA_MASK_ALL | NXA_MOD_BCAST | NXA_MOD_LBACK)
+#define NXA_MASK_SHOW (NXA_MASK_ALL | NXA_LOOPBACK)
+
-+#ifdef __KERNEL__
-+
-+#include <linux/list.h>
-+#include <linux/spinlock.h>
-+#include <linux/rcupdate.h>
-+#include <linux/in.h>
-+#include <linux/in6.h>
-+#include <asm/atomic.h>
-+
-+struct nx_addr_v4 {
-+ struct nx_addr_v4 *next;
-+ struct in_addr ip[2];
-+ struct in_addr mask;
-+ uint16_t type;
-+ uint16_t flags;
-+};
-+
-+struct nx_addr_v6 {
-+ struct nx_addr_v6 *next;
-+ struct in6_addr ip;
-+ struct in6_addr mask;
-+ uint32_t prefix;
-+ uint16_t type;
-+ uint16_t flags;
-+};
-+
-+struct nx_info {
-+ struct hlist_node nx_hlist; /* linked list of nxinfos */
-+ nid_t nx_id; /* vnet id */
-+ atomic_t nx_usecnt; /* usage count */
-+ atomic_t nx_tasks; /* tasks count */
-+ int nx_state; /* context state */
-+
-+ uint64_t nx_flags; /* network flag word */
-+ uint64_t nx_ncaps; /* network capabilities */
-+
-+ struct in_addr v4_lback; /* Loopback address */
-+ struct in_addr v4_bcast; /* Broadcast address */
-+ struct nx_addr_v4 v4; /* First/Single ipv4 address */
-+#ifdef CONFIG_IPV6
-+ struct nx_addr_v6 v6; /* First/Single ipv6 address */
-+#endif
-+ char nx_name[65]; /* network context name */
-+};
-+
-+
-+/* status flags */
-+
-+#define NXS_HASHED 0x0001
-+#define NXS_SHUTDOWN 0x0100
-+#define NXS_RELEASED 0x8000
-+
-+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 nx_migrate_task(struct task_struct *, struct nx_info *);
-+
-+extern long vs_net_change(struct nx_info *, unsigned int);
-+
-+struct sock;
-+
-+
-+#define NX_IPV4(n) ((n)->v4.type != NXA_TYPE_NONE)
-+#ifdef CONFIG_IPV6
-+#define NX_IPV6(n) ((n)->v6.type != NXA_TYPE_NONE)
-+#else
-+#define NX_IPV6(n) (0)
-+#endif
-+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_NETWORK_H */
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vserver/network_cmd.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/network_cmd.h
---- linux-3.0-rc5/include/linux/vserver/network_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/network_cmd.h 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,164 @@
-+#ifndef _VX_NETWORK_CMD_H
-+#define _VX_NETWORK_CMD_H
++#endif /* _UAPI_VS_NETWORK_H */
+diff -NurpP --minimal linux-3.10.53/include/uapi/vserver/network_cmd.h linux-3.10.53-vs2.3.6.8/include/uapi/vserver/network_cmd.h
+--- linux-3.10.53/include/uapi/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/uapi/vserver/network_cmd.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,123 @@
++#ifndef _UAPI_VS_NETWORK_CMD_H
++#define _UAPI_VS_NETWORK_CMD_H
+
+
+/* vinfo commands */
+
+#define VCMD_task_nid VC_CMD(VINFO, 2, 0)
+
-+#ifdef __KERNEL__
-+extern int vc_task_nid(uint32_t);
-+
-+#endif /* __KERNEL__ */
+
+#define VCMD_nx_info VC_CMD(VINFO, 6, 0)
+
+ /* more to come */
+};
+
-+#ifdef __KERNEL__
-+extern int vc_nx_info(struct nx_info *, void __user *);
-+
-+#endif /* __KERNEL__ */
+
+#include <linux/in.h>
+#include <linux/in6.h>
+};
+
+
-+#ifdef __KERNEL__
-+extern int vc_net_create(uint32_t, void __user *);
-+extern int vc_net_migrate(struct nx_info *, void __user *);
-+
-+extern int vc_net_add(struct nx_info *, void __user *);
-+extern int vc_net_remove(struct nx_info *, void __user *);
-+
-+extern int vc_net_add_ipv4_v1(struct nx_info *, void __user *);
-+extern int vc_net_add_ipv4(struct nx_info *, void __user *);
-+
-+extern int vc_net_rem_ipv4_v1(struct nx_info *, void __user *);
-+extern int vc_net_rem_ipv4(struct nx_info *, void __user *);
-+
-+extern int vc_net_add_ipv6(struct nx_info *, void __user *);
-+extern int vc_net_remove_ipv6(struct nx_info *, void __user *);
-+
-+extern int vc_add_match_ipv4(struct nx_info *, void __user *);
-+extern int vc_get_match_ipv4(struct nx_info *, void __user *);
-+
-+extern int vc_add_match_ipv6(struct nx_info *, void __user *);
-+extern int vc_get_match_ipv6(struct nx_info *, void __user *);
-+
-+#endif /* __KERNEL__ */
+
+
+/* flag commands */
+ uint64_t mask;
+};
+
-+#ifdef __KERNEL__
-+extern int vc_get_nflags(struct nx_info *, void __user *);
-+extern int vc_set_nflags(struct nx_info *, void __user *);
-+
-+#endif /* __KERNEL__ */
+
+
+/* network caps commands */
+ uint64_t cmask;
+};
+
-+#ifdef __KERNEL__
-+extern int vc_get_ncaps(struct nx_info *, void __user *);
-+extern int vc_set_ncaps(struct nx_info *, void __user *);
-+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vserver/percpu.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/percpu.h
---- linux-3.0-rc5/include/linux/vserver/percpu.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/percpu.h 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,14 @@
-+#ifndef _VX_PERCPU_H
-+#define _VX_PERCPU_H
-+
-+#include "cvirt_def.h"
-+#include "sched_def.h"
-+
-+struct _vx_percpu {
-+ struct _vx_cvirt_pc cvirt;
-+ struct _vx_sched_pc sched;
-+};
-+
-+#define PERCPU_PERCTX (sizeof(struct _vx_percpu))
-+
-+#endif /* _VX_PERCPU_H */
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vserver/pid.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/pid.h
---- linux-3.0-rc5/include/linux/vserver/pid.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/pid.h 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,51 @@
-+#ifndef _VSERVER_PID_H
-+#define _VSERVER_PID_H
-+
-+/* pid faking stuff */
-+
-+#define vx_info_map_pid(v, p) \
-+ __vx_info_map_pid((v), (p), __func__, __FILE__, __LINE__)
-+#define vx_info_map_tgid(v,p) vx_info_map_pid(v,p)
-+#define vx_map_pid(p) vx_info_map_pid(current_vx_info(), p)
-+#define vx_map_tgid(p) vx_map_pid(p)
-+
-+static inline int __vx_info_map_pid(struct vx_info *vxi, int pid,
-+ const char *func, const char *file, int line)
-+{
-+ if (vx_info_flags(vxi, VXF_INFO_INIT, 0)) {
-+ vxfprintk(VXD_CBIT(cvirt, 2),
-+ "vx_map_tgid: %p/%llx: %d -> %d",
-+ vxi, (long long)vxi->vx_flags, pid,
-+ (pid && pid == vxi->vx_initpid) ? 1 : pid,
-+ func, file, line);
-+ if (pid == 0)
-+ return 0;
-+ if (pid == vxi->vx_initpid)
-+ return 1;
-+ }
-+ return pid;
-+}
-+
-+#define vx_info_rmap_pid(v, p) \
-+ __vx_info_rmap_pid((v), (p), __func__, __FILE__, __LINE__)
-+#define vx_rmap_pid(p) vx_info_rmap_pid(current_vx_info(), p)
-+#define vx_rmap_tgid(p) vx_rmap_pid(p)
-+
-+static inline int __vx_info_rmap_pid(struct vx_info *vxi, int pid,
-+ const char *func, const char *file, int line)
-+{
-+ if (vx_info_flags(vxi, VXF_INFO_INIT, 0)) {
-+ vxfprintk(VXD_CBIT(cvirt, 2),
-+ "vx_rmap_tgid: %p/%llx: %d -> %d",
-+ vxi, (long long)vxi->vx_flags, pid,
-+ (pid == 1) ? vxi->vx_initpid : pid,
-+ func, file, line);
-+ if ((pid == 1) && vxi->vx_initpid)
-+ return vxi->vx_initpid;
-+ if (pid == vxi->vx_initpid)
-+ return ~0U;
-+ }
-+ return pid;
-+}
-+
-+#endif
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vserver/sched.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/sched.h
---- linux-3.0-rc5/include/linux/vserver/sched.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/sched.h 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,23 @@
-+#ifndef _VX_SCHED_H
-+#define _VX_SCHED_H
-+
-+
-+#ifdef __KERNEL__
-+
-+struct timespec;
-+
-+void vx_vsi_uptime(struct timespec *, struct timespec *);
-+
-+
-+struct vx_info;
-+
-+void vx_update_load(struct vx_info *);
-+
-+
-+void vx_update_sched_param(struct _vx_sched *sched,
-+ struct _vx_sched_pc *sched_pc);
-+
-+#endif /* __KERNEL__ */
-+#else /* _VX_SCHED_H */
-+#warning duplicate inclusion
-+#endif /* _VX_SCHED_H */
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vserver/sched_cmd.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/sched_cmd.h
---- linux-3.0-rc5/include/linux/vserver/sched_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/sched_cmd.h 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,21 @@
-+#ifndef _VX_SCHED_CMD_H
-+#define _VX_SCHED_CMD_H
++#endif /* _UAPI_VS_NETWORK_CMD_H */
+diff -NurpP --minimal linux-3.10.53/include/uapi/vserver/sched_cmd.h linux-3.10.53-vs2.3.6.8/include/uapi/vserver/sched_cmd.h
+--- linux-3.10.53/include/uapi/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/uapi/vserver/sched_cmd.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,13 @@
++#ifndef _UAPI_VS_SCHED_CMD_H
++#define _UAPI_VS_SCHED_CMD_H
+
+
+struct vcmd_prio_bias {
+#define VCMD_set_prio_bias VC_CMD(SCHED, 4, 0)
+#define VCMD_get_prio_bias VC_CMD(SCHED, 5, 0)
+
-+#ifdef __KERNEL__
-+
-+#include <linux/compiler.h>
-+
-+extern int vc_set_prio_bias(struct vx_info *, void __user *);
-+extern int vc_get_prio_bias(struct vx_info *, void __user *);
-+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_SCHED_CMD_H */
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vserver/sched_def.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/sched_def.h
---- linux-3.0-rc5/include/linux/vserver/sched_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/sched_def.h 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,38 @@
-+#ifndef _VX_SCHED_DEF_H
-+#define _VX_SCHED_DEF_H
-+
-+#include <linux/spinlock.h>
-+#include <linux/jiffies.h>
-+#include <linux/cpumask.h>
-+#include <asm/atomic.h>
-+#include <asm/param.h>
-+
-+
-+/* context sub struct */
-+
-+struct _vx_sched {
-+ int prio_bias; /* bias offset for priority */
-+
-+ cpumask_t update; /* CPUs which should update */
-+};
-+
-+struct _vx_sched_pc {
-+ int prio_bias; /* bias offset for priority */
-+
-+ uint64_t user_ticks; /* token tick events */
-+ uint64_t sys_ticks; /* token tick events */
-+ uint64_t hold_ticks; /* token ticks paused */
-+};
-+
-+
-+#ifdef CONFIG_VSERVER_DEBUG
-+
-+static inline void __dump_vx_sched(struct _vx_sched *sched)
-+{
-+ printk("\t_vx_sched:\n");
-+ printk("\t priority = %4d\n", sched->prio_bias);
-+}
-+
-+#endif
-+
-+#endif /* _VX_SCHED_DEF_H */
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vserver/signal.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/signal.h
---- linux-3.0-rc5/include/linux/vserver/signal.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/signal.h 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,14 @@
-+#ifndef _VX_SIGNAL_H
-+#define _VX_SIGNAL_H
-+
-+
-+#ifdef __KERNEL__
-+
-+struct vx_info;
-+
-+int vx_info_kill(struct vx_info *, int, int);
-+
-+#endif /* __KERNEL__ */
-+#else /* _VX_SIGNAL_H */
-+#warning duplicate inclusion
-+#endif /* _VX_SIGNAL_H */
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vserver/signal_cmd.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/signal_cmd.h
---- linux-3.0-rc5/include/linux/vserver/signal_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/signal_cmd.h 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,43 @@
-+#ifndef _VX_SIGNAL_CMD_H
-+#define _VX_SIGNAL_CMD_H
++#endif /* _UAPI_VS_SCHED_CMD_H */
+diff -NurpP --minimal linux-3.10.53/include/uapi/vserver/signal_cmd.h linux-3.10.53-vs2.3.6.8/include/uapi/vserver/signal_cmd.h
+--- linux-3.10.53/include/uapi/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/uapi/vserver/signal_cmd.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,31 @@
++#ifndef _UAPI_VS_SIGNAL_CMD_H
++#define _UAPI_VS_SIGNAL_CMD_H
+
+
+/* signalling vserver commands */
+ int32_t exit_code;
+};
+
-+#ifdef __KERNEL__
-+
-+extern int vc_ctx_kill(struct vx_info *, void __user *);
-+extern int vc_wait_exit(struct vx_info *, void __user *);
-+
-+#endif /* __KERNEL__ */
+
+/* process alteration commands */
+
+ uint32_t mask;
+};
+
-+#ifdef __KERNEL__
-+
-+extern int vc_get_pflags(uint32_t pid, void __user *);
-+extern int vc_set_pflags(uint32_t pid, void __user *);
-+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_SIGNAL_CMD_H */
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vserver/space.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/space.h
---- linux-3.0-rc5/include/linux/vserver/space.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/space.h 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,12 @@
-+#ifndef _VX_SPACE_H
-+#define _VX_SPACE_H
-+
-+#include <linux/types.h>
-+
-+struct vx_info;
-+
-+int vx_set_space(struct vx_info *vxi, unsigned long mask, unsigned index);
-+
-+#else /* _VX_SPACE_H */
-+#warning duplicate inclusion
-+#endif /* _VX_SPACE_H */
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vserver/space_cmd.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/space_cmd.h
---- linux-3.0-rc5/include/linux/vserver/space_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/space_cmd.h 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,38 @@
-+#ifndef _VX_SPACE_CMD_H
-+#define _VX_SPACE_CMD_H
++#endif /* _UAPI_VS_SIGNAL_CMD_H */
+diff -NurpP --minimal linux-3.10.53/include/uapi/vserver/space_cmd.h linux-3.10.53-vs2.3.6.8/include/uapi/vserver/space_cmd.h
+--- linux-3.10.53/include/uapi/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/uapi/vserver/space_cmd.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,28 @@
++#ifndef _UAPI_VS_SPACE_CMD_H
++#define _UAPI_VS_SPACE_CMD_H
+
+
+#define VCMD_enter_space_v0 VC_CMD(PROCALT, 1, 0)
+ uint32_t index;
+};
+
-+
-+#ifdef __KERNEL__
-+
-+extern int vc_enter_space_v1(struct vx_info *, void __user *);
-+extern int vc_set_space_v1(struct vx_info *, void __user *);
-+extern int vc_enter_space(struct vx_info *, void __user *);
-+extern int vc_set_space(struct vx_info *, void __user *);
-+extern int vc_get_space_mask(void __user *, int);
-+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_SPACE_CMD_H */
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vserver/switch.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/switch.h
---- linux-3.0-rc5/include/linux/vserver/switch.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/switch.h 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,98 @@
-+#ifndef _VX_SWITCH_H
-+#define _VX_SWITCH_H
++#endif /* _UAPI_VS_SPACE_CMD_H */
+diff -NurpP --minimal linux-3.10.53/include/uapi/vserver/switch.h linux-3.10.53-vs2.3.6.8/include/uapi/vserver/switch.h
+--- linux-3.10.53/include/uapi/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/uapi/vserver/switch.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,90 @@
++#ifndef _UAPI_VS_SWITCH_H
++#define _UAPI_VS_SWITCH_H
+
+#include <linux/types.h>
+
+#define VC_CAT_NETMIG 27
+#define VC_CAT_NETCTRL 28
+
-+#define VC_CAT_TAGMIG 35
-+#define VC_CAT_DLIMIT 36
-+#define VC_CAT_INODE 38
-+
-+#define VC_CAT_VSTAT 40
-+#define VC_CAT_VINFO 46
-+#define VC_CAT_EVENT 48
-+
-+#define VC_CAT_FLAGS 52
-+#define VC_CAT_VSPACE 54
-+#define VC_CAT_DEBUG 56
-+#define VC_CAT_RLIMIT 60
-+
-+#define VC_CAT_SYSTEST 61
-+#define VC_CAT_COMPAT 63
-+
-+/* query version */
-+
-+#define VCMD_get_version VC_CMD(VERSION, 0, 0)
-+#define VCMD_get_vci VC_CMD(VERSION, 1, 0)
-+
-+
-+#ifdef __KERNEL__
-+
-+#include <linux/errno.h>
-+
-+#endif /* __KERNEL__ */
-+
-+#endif /* _VX_SWITCH_H */
-+
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vserver/tag.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/tag.h
---- linux-3.0-rc5/include/linux/vserver/tag.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/tag.h 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,143 @@
-+#ifndef _DX_TAG_H
-+#define _DX_TAG_H
-+
-+#include <linux/types.h>
-+
-+
-+#define DX_TAG(in) (IS_TAGGED(in))
-+
-+
-+#ifdef CONFIG_TAG_NFSD
-+#define DX_TAG_NFSD 1
-+#else
-+#define DX_TAG_NFSD 0
-+#endif
-+
-+
-+#ifdef CONFIG_TAGGING_NONE
-+
-+#define MAX_UID 0xFFFFFFFF
-+#define MAX_GID 0xFFFFFFFF
-+
-+#define INOTAG_TAG(cond, uid, gid, tag) (0)
-+
-+#define TAGINO_UID(cond, uid, tag) (uid)
-+#define TAGINO_GID(cond, gid, tag) (gid)
-+
-+#endif
-+
-+
-+#ifdef CONFIG_TAGGING_GID16
-+
-+#define MAX_UID 0xFFFFFFFF
-+#define MAX_GID 0x0000FFFF
-+
-+#define INOTAG_TAG(cond, uid, gid, tag) \
-+ ((cond) ? (((gid) >> 16) & 0xFFFF) : 0)
-+
-+#define TAGINO_UID(cond, uid, tag) (uid)
-+#define TAGINO_GID(cond, gid, tag) \
-+ ((cond) ? (((gid) & 0xFFFF) | ((tag) << 16)) : (gid))
-+
-+#endif
-+
-+
-+#ifdef CONFIG_TAGGING_ID24
-+
-+#define MAX_UID 0x00FFFFFF
-+#define MAX_GID 0x00FFFFFF
-+
-+#define INOTAG_TAG(cond, uid, gid, tag) \
-+ ((cond) ? ((((uid) >> 16) & 0xFF00) | (((gid) >> 24) & 0xFF)) : 0)
-+
-+#define TAGINO_UID(cond, uid, tag) \
-+ ((cond) ? (((uid) & 0xFFFFFF) | (((tag) & 0xFF00) << 16)) : (uid))
-+#define TAGINO_GID(cond, gid, tag) \
-+ ((cond) ? (((gid) & 0xFFFFFF) | (((tag) & 0x00FF) << 24)) : (gid))
-+
-+#endif
-+
-+
-+#ifdef CONFIG_TAGGING_UID16
-+
-+#define MAX_UID 0x0000FFFF
-+#define MAX_GID 0xFFFFFFFF
-+
-+#define INOTAG_TAG(cond, uid, gid, tag) \
-+ ((cond) ? (((uid) >> 16) & 0xFFFF) : 0)
-+
-+#define TAGINO_UID(cond, uid, tag) \
-+ ((cond) ? (((uid) & 0xFFFF) | ((tag) << 16)) : (uid))
-+#define TAGINO_GID(cond, gid, tag) (gid)
-+
-+#endif
-+
-+
-+#ifdef CONFIG_TAGGING_INTERN
-+
-+#define MAX_UID 0xFFFFFFFF
-+#define MAX_GID 0xFFFFFFFF
-+
-+#define INOTAG_TAG(cond, uid, gid, tag) \
-+ ((cond) ? (tag) : 0)
-+
-+#define TAGINO_UID(cond, uid, tag) (uid)
-+#define TAGINO_GID(cond, gid, tag) (gid)
-+
-+#endif
-+
-+
-+#ifndef CONFIG_TAGGING_NONE
-+#define dx_current_fstag(sb) \
-+ ((sb)->s_flags & MS_TAGGED ? dx_current_tag() : 0)
-+#else
-+#define dx_current_fstag(sb) (0)
-+#endif
-+
-+#ifndef CONFIG_TAGGING_INTERN
-+#define TAGINO_TAG(cond, tag) (0)
-+#else
-+#define TAGINO_TAG(cond, tag) ((cond) ? (tag) : 0)
-+#endif
-+
-+#define INOTAG_UID(cond, uid, gid) \
-+ ((cond) ? ((uid) & MAX_UID) : (uid))
-+#define INOTAG_GID(cond, uid, gid) \
-+ ((cond) ? ((gid) & MAX_GID) : (gid))
-+
-+
-+static inline uid_t dx_map_uid(uid_t uid)
-+{
-+ if ((uid > MAX_UID) && (uid != -1))
-+ uid = -2;
-+ return (uid & MAX_UID);
-+}
-+
-+static inline gid_t dx_map_gid(gid_t gid)
-+{
-+ if ((gid > MAX_GID) && (gid != -1))
-+ gid = -2;
-+ return (gid & MAX_GID);
-+}
-+
-+struct peer_tag {
-+ int32_t xid;
-+ int32_t nid;
-+};
-+
-+#define dx_notagcheck(sb) ((sb) && ((sb)->s_flags & MS_NOTAGCHECK))
-+
-+int dx_parse_tag(char *string, tag_t *tag, int remove, int *mnt_flags,
-+ unsigned long *flags);
-+
-+#ifdef CONFIG_PROPAGATE
-+
-+void __dx_propagate_tag(struct nameidata *nd, struct inode *inode);
-+
-+#define dx_propagate_tag(n, i) __dx_propagate_tag(n, i)
-+
-+#else
-+#define dx_propagate_tag(n, i) do { } while (0)
-+#endif
-+
-+#endif /* _DX_TAG_H */
-diff -NurpP --minimal linux-3.0-rc5/include/linux/vserver/tag_cmd.h linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/tag_cmd.h
---- linux-3.0-rc5/include/linux/vserver/tag_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/linux/vserver/tag_cmd.h 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,22 @@
-+#ifndef _VX_TAG_CMD_H
-+#define _VX_TAG_CMD_H
-+
-+
-+/* vinfo commands */
-+
-+#define VCMD_task_tag VC_CMD(VINFO, 3, 0)
-+
-+#ifdef __KERNEL__
-+extern int vc_task_tag(uint32_t);
-+
-+#endif /* __KERNEL__ */
-+
-+/* context commands */
-+
-+#define VCMD_tag_migrate VC_CMD(TAGMIG, 1, 0)
-+
-+#ifdef __KERNEL__
-+extern int vc_tag_migrate(uint32_t);
-+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_TAG_CMD_H */
-diff -NurpP --minimal linux-3.0-rc5/include/net/addrconf.h linux-3.0-rc5-vs2.3.1-pre3/include/net/addrconf.h
---- linux-3.0-rc5/include/net/addrconf.h 2011-07-01 11:14:22.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/net/addrconf.h 2011-06-10 22:11:24.000000000 +0200
-@@ -80,7 +80,8 @@ extern int ipv6_dev_get_saddr(struct n
- 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.0-rc5/include/net/af_unix.h linux-3.0-rc5-vs2.3.1-pre3/include/net/af_unix.h
---- linux-3.0-rc5/include/net/af_unix.h 2011-07-01 11:14:22.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/net/af_unix.h 2011-06-10 22:11:24.000000000 +0200
-@@ -4,6 +4,7 @@
- #include <linux/socket.h>
- #include <linux/un.h>
- #include <linux/mutex.h>
-+#include <linux/vs_base.h>
- #include <net/sock.h>
-
- extern void unix_inflight(struct file *fp);
-diff -NurpP --minimal linux-3.0-rc5/include/net/inet_timewait_sock.h linux-3.0-rc5-vs2.3.1-pre3/include/net/inet_timewait_sock.h
---- linux-3.0-rc5/include/net/inet_timewait_sock.h 2011-03-15 18:07:40.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/net/inet_timewait_sock.h 2011-06-10 22:11:24.000000000 +0200
-@@ -113,6 +113,10 @@ struct inet_timewait_sock {
- #define tw_net __tw_common.skc_net
- #define tw_daddr __tw_common.skc_daddr
- #define tw_rcv_saddr __tw_common.skc_rcv_saddr
-+#define tw_xid __tw_common.skc_xid
-+#define tw_vx_info __tw_common.skc_vx_info
-+#define tw_nid __tw_common.skc_nid
-+#define tw_nx_info __tw_common.skc_nx_info
- int tw_timeout;
- volatile unsigned char tw_substate;
- unsigned char tw_rcv_wscale;
-diff -NurpP --minimal linux-3.0-rc5/include/net/ip6_route.h linux-3.0-rc5-vs2.3.1-pre3/include/net/ip6_route.h
---- linux-3.0-rc5/include/net/ip6_route.h 2011-07-01 11:14:22.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/net/ip6_route.h 2011-06-16 14:16:51.000000000 +0200
-@@ -86,7 +86,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.0-rc5/include/net/route.h linux-3.0-rc5-vs2.3.1-pre3/include/net/route.h
---- linux-3.0-rc5/include/net/route.h 2011-07-01 11:14:22.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/net/route.h 2011-06-13 18:20:44.000000000 +0200
-@@ -202,6 +202,9 @@ static inline void ip_rt_put(struct rtab
- dst_release(&rt->dst);
- }
-
-+#include <linux/vs_base.h>
-+#include <linux/vs_inet.h>
++#define VC_CAT_TAGMIG 35
++#define VC_CAT_DLIMIT 36
++#define VC_CAT_INODE 38
+
- #define IPTOS_RT_MASK (IPTOS_TOS_MASK & ~3)
-
- extern const __u8 ip_tos2prio[16];
-@@ -253,6 +256,9 @@ static inline void ip_route_connect_init
- protocol, flow_flags, dst, src, dport, sport);
- }
-
-+extern struct rtable *ip_v4_find_src(struct net *net, struct nx_info *,
-+ struct flowi4 *);
++#define VC_CAT_VSTAT 40
++#define VC_CAT_VINFO 46
++#define VC_CAT_EVENT 48
+
- static inline struct rtable *ip_route_connect(struct flowi4 *fl4,
- __be32 dst, __be32 src, u32 tos,
- int oif, u8 protocol,
-@@ -261,11 +267,24 @@ 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);
-
-- if (!dst || !src) {
-+ if (sk)
-+ nx_info = sk->sk_nx_info;
++#define VC_CAT_FLAGS 52
++#define VC_CAT_VSPACE 54
++#define VC_CAT_DEBUG 56
++#define VC_CAT_RLIMIT 60
+
-+ vxdprintk(VXD_CBIT(net, 4),
-+ "ip_route_connect(%p) %p,%p;%lx",
-+ sk, nx_info, sk->sk_socket,
-+ (sk->sk_socket?sk->sk_socket->flags:0));
++#define VC_CAT_SYSTEST 61
++#define VC_CAT_COMPAT 63
+
-+ rt = ip_v4_find_src(net, nx_info, fl4);
-+ if (IS_ERR(rt))
-+ return rt;
++/* query version */
+
-+ if (!fl4->daddr || !fl4->saddr) {
- rt = __ip_route_output_key(net, fl4);
- if (IS_ERR(rt))
- return rt;
-diff -NurpP --minimal linux-3.0-rc5/include/net/sock.h linux-3.0-rc5-vs2.3.1-pre3/include/net/sock.h
---- linux-3.0-rc5/include/net/sock.h 2011-07-01 11:14:22.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/include/net/sock.h 2011-07-01 11:35:35.000000000 +0200
-@@ -149,6 +149,10 @@ struct sock_common {
- #ifdef CONFIG_NET_NS
- struct net *skc_net;
- #endif
-+ xid_t skc_xid;
-+ struct vx_info *skc_vx_info;
-+ nid_t skc_nid;
-+ struct nx_info *skc_nx_info;
- /*
- * fields between dontcopy_begin/dontcopy_end
- * are not copied in sock_copy()
-@@ -256,6 +260,10 @@ struct sock {
- #define sk_bind_node __sk_common.skc_bind_node
- #define sk_prot __sk_common.skc_prot
- #define sk_net __sk_common.skc_net
-+#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.0-rc5/init/Kconfig linux-3.0-rc5-vs2.3.1-pre3/init/Kconfig
---- linux-3.0-rc5/init/Kconfig 2011-07-01 11:14:22.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/init/Kconfig 2011-06-22 12:39:15.000000000 +0200
-@@ -574,6 +574,7 @@ config HAVE_UNSTABLE_SCHED_CLOCK
++#define VCMD_get_version VC_CMD(VERSION, 0, 0)
++#define VCMD_get_vci VC_CMD(VERSION, 1, 0)
++
++#endif /* _UAPI_VS_SWITCH_H */
+diff -NurpP --minimal linux-3.10.53/include/uapi/vserver/tag_cmd.h linux-3.10.53-vs2.3.6.8/include/uapi/vserver/tag_cmd.h
+--- linux-3.10.53/include/uapi/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/include/uapi/vserver/tag_cmd.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,14 @@
++#ifndef _UAPI_VS_TAG_CMD_H
++#define _UAPI_VS_TAG_CMD_H
++
++
++/* vinfo commands */
++
++#define VCMD_task_tag VC_CMD(VINFO, 3, 0)
++
++
++/* context commands */
++
++#define VCMD_tag_migrate VC_CMD(TAGMIG, 1, 0)
++
++#endif /* _UAPI_VS_TAG_CMD_H */
+diff -NurpP --minimal linux-3.10.53/init/Kconfig linux-3.10.53-vs2.3.6.8/init/Kconfig
+--- linux-3.10.53/init/Kconfig 2014-08-30 13:39:01.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/init/Kconfig 2014-04-22 03:48:11.000000000 +0000
+@@ -805,6 +805,7 @@ config NUMA_BALANCING
menuconfig CGROUPS
boolean "Control Group support"
depends on EVENTFD
help
This option adds support for grouping sets of processes together, for
use with process control subsystems such as Cpusets, CFS, memory
-diff -NurpP --minimal linux-3.0-rc5/init/main.c linux-3.0-rc5-vs2.3.1-pre3/init/main.c
---- linux-3.0-rc5/init/main.c 2011-07-01 11:14:22.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/init/main.c 2011-06-22 12:39:15.000000000 +0200
-@@ -68,6 +68,7 @@
- #include <linux/shmem_fs.h>
- #include <linux/slab.h>
- #include <linux/perf_event.h>
+@@ -1067,6 +1068,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.10.53/init/main.c linux-3.10.53-vs2.3.6.8/init/main.c
+--- linux-3.10.53/init/main.c 2014-08-30 13:39:01.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/init/main.c 2014-08-30 14:03:55.000000000 +0000
+@@ -75,6 +75,7 @@
+ #include <linux/blkdev.h>
+ #include <linux/elevator.h>
+ #include <linux/random.h>
+#include <linux/vserver/percpu.h>
#include <asm/io.h>
#include <asm/bugs.h>
-diff -NurpP --minimal linux-3.0-rc5/ipc/mqueue.c linux-3.0-rc5-vs2.3.1-pre3/ipc/mqueue.c
---- linux-3.0-rc5/ipc/mqueue.c 2011-03-15 18:07:41.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/ipc/mqueue.c 2011-06-10 22:11:24.000000000 +0200
-@@ -33,6 +33,8 @@
- #include <linux/pid.h>
+diff -NurpP --minimal linux-3.10.53/ipc/mqueue.c linux-3.10.53-vs2.3.6.8/ipc/mqueue.c
+--- linux-3.10.53/ipc/mqueue.c 2014-08-30 13:39:01.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/ipc/mqueue.c 2014-03-12 13:18:33.000000000 +0000
+@@ -35,6 +35,8 @@
#include <linux/ipc_namespace.h>
+ #include <linux/user_namespace.h>
#include <linux/slab.h>
+#include <linux/vs_context.h>
+#include <linux/vs_limit.h>
#include <net/sock.h>
#include "util.h"
-@@ -66,6 +68,7 @@ struct mqueue_inode_info {
- struct sigevent notify;
+@@ -76,6 +78,7 @@ struct mqueue_inode_info {
struct pid* notify_owner;
+ struct user_namespace *notify_user_ns;
struct user_struct *user; /* user who created, for accounting */
+ struct vx_info *vxi;
struct sock *notify_sock;
struct sk_buff *notify_cookie;
-@@ -126,6 +129,7 @@ static struct inode *mqueue_get_inode(st
- if (S_ISREG(mode)) {
- struct mqueue_inode_info *info;
- struct task_struct *p = current;
-+ struct vx_info *vxi = p->vx_info;
- unsigned long mq_bytes, mq_msg_tblsz;
-
- inode->i_fop = &mqueue_file_operations;
-@@ -139,6 +143,7 @@ static struct inode *mqueue_get_inode(st
- info->notify_owner = NULL;
- info->qsize = 0;
- info->user = NULL; /* set when all is ok */
-+ info->vxi = NULL;
- memset(&info->attr, 0, sizeof(info->attr));
- info->attr.mq_maxmsg = ipc_ns->mq_msg_max;
- info->attr.mq_msgsize = ipc_ns->mq_msgsize_max;
-@@ -157,16 +162,19 @@ static struct inode *mqueue_get_inode(st
- spin_lock(&mq_lock);
- if (u->mq_bytes + mq_bytes < u->mq_bytes ||
- u->mq_bytes + mq_bytes >
-- task_rlimit(p, RLIMIT_MSGQUEUE)) {
-+ task_rlimit(p, RLIMIT_MSGQUEUE) ||
-+ !vx_ipcmsg_avail(vxi, mq_bytes)) {
- spin_unlock(&mq_lock);
- /* mqueue_evict_inode() releases info->messages */
- goto out_inode;
- }
- u->mq_bytes += mq_bytes;
-+ vx_ipcmsg_add(vxi, u, mq_bytes);
+@@ -234,6 +237,7 @@ static struct inode *mqueue_get_inode(st
+ if (S_ISREG(mode)) {
+ struct mqueue_inode_info *info;
+ unsigned long mq_bytes, mq_treesize;
++ struct vx_info *vxi = current_vx_info();
+
+ inode->i_fop = &mqueue_file_operations;
+ inode->i_size = FILENT_SIZE;
+@@ -247,6 +251,7 @@ static struct inode *mqueue_get_inode(st
+ info->notify_user_ns = NULL;
+ info->qsize = 0;
+ info->user = NULL; /* set when all is ok */
++ info->vxi = NULL;
+ info->msg_tree = RB_ROOT;
+ info->node_cache = NULL;
+ memset(&info->attr, 0, sizeof(info->attr));
+@@ -280,17 +285,20 @@ static struct inode *mqueue_get_inode(st
+
+ spin_lock(&mq_lock);
+ if (u->mq_bytes + mq_bytes < u->mq_bytes ||
+- u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE)) {
++ u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE) ||
++ !vx_ipcmsg_avail(vxi, mq_bytes)) {
spin_unlock(&mq_lock);
+ /* mqueue_evict_inode() releases info->messages */
+ ret = -EMFILE;
+ goto out_inode;
+ }
+ u->mq_bytes += mq_bytes;
++ vx_ipcmsg_add(vxi, u, mq_bytes);
+ spin_unlock(&mq_lock);
+
+ /* all is ok */
+ info->user = get_uid(u);
++ info->vxi = get_vx_info(vxi);
+ } else if (S_ISDIR(mode)) {
+ inc_nlink(inode);
+ /* Some things misbehave if size == 0 on a directory */
+@@ -402,8 +410,11 @@ static void mqueue_evict_inode(struct in
- /* all is ok */
- info->user = get_uid(u);
-+ info->vxi = get_vx_info(vxi);
- } else if (S_ISDIR(mode)) {
- inc_nlink(inode);
- /* Some things misbehave if size == 0 on a directory */
-@@ -275,8 +283,11 @@ static void mqueue_evict_inode(struct in
- + info->attr.mq_msgsize);
user = info->user;
if (user) {
+ struct vx_info *vxi = info->vxi;
/*
* get_ns_from_inode() ensures that the
* (ipc_ns = sb->s_fs_info) is either a valid ipc_ns
-@@ -286,6 +297,7 @@ static void mqueue_evict_inode(struct in
+@@ -413,6 +424,7 @@ static void mqueue_evict_inode(struct in
if (ipc_ns)
ipc_ns->mq_queues_count--;
spin_unlock(&mq_lock);
free_uid(user);
}
if (ipc_ns)
-diff -NurpP --minimal linux-3.0-rc5/ipc/msg.c linux-3.0-rc5-vs2.3.1-pre3/ipc/msg.c
---- linux-3.0-rc5/ipc/msg.c 2011-05-22 16:17:59.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/ipc/msg.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/ipc/msg.c linux-3.10.53-vs2.3.6.8/ipc/msg.c
+--- linux-3.10.53/ipc/msg.c 2014-08-30 13:39:01.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/ipc/msg.c 2014-04-22 03:48:11.000000000 +0000
@@ -37,6 +37,7 @@
#include <linux/rwsem.h>
#include <linux/nsproxy.h>
#include <asm/current.h>
#include <asm/uaccess.h>
-@@ -190,6 +191,7 @@ static int newque(struct ipc_namespace *
+@@ -194,6 +195,7 @@ static int newque(struct ipc_namespace *
msq->q_perm.mode = msgflg & S_IRWXUGO;
msq->q_perm.key = key;
msq->q_perm.security = NULL;
retval = security_msg_queue_alloc(msq);
-diff -NurpP --minimal linux-3.0-rc5/ipc/namespace.c linux-3.0-rc5-vs2.3.1-pre3/ipc/namespace.c
---- linux-3.0-rc5/ipc/namespace.c 2011-07-01 11:14:22.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/ipc/namespace.c 2011-06-13 14:09:44.000000000 +0200
-@@ -13,11 +13,12 @@
- #include <linux/mount.h>
- #include <linux/user_namespace.h>
- #include <linux/proc_fs.h>
-+#include <linux/vs_base.h>
-+#include <linux/vserver/global.h>
-
- #include "util.h"
-
--static struct ipc_namespace *create_ipc_ns(struct task_struct *tsk,
-- struct ipc_namespace *old_ns)
-+static struct ipc_namespace *create_ipc_ns(struct user_namespace *user_ns)
- {
- struct ipc_namespace *ns;
- int err;
-@@ -46,19 +47,18 @@ static struct ipc_namespace *create_ipc_
- ipcns_notify(IPCNS_CREATED);
- register_ipcns_notifier(ns);
-
-- ns->user_ns = get_user_ns(task_cred_xxx(tsk, user)->user_ns);
-+ ns->user_ns = get_user_ns(user_ns);
-
- return ns;
- }
-
- struct ipc_namespace *copy_ipcs(unsigned long flags,
-- struct task_struct *tsk)
-+ struct ipc_namespace *old_ns,
-+ struct user_namespace *user_ns)
- {
-- struct ipc_namespace *ns = tsk->nsproxy->ipc_ns;
--
- if (!(flags & CLONE_NEWIPC))
-- return get_ipc_ns(ns);
-- return create_ipc_ns(tsk, ns);
-+ return get_ipc_ns(old_ns);
-+ return create_ipc_ns(user_ns);
- }
-
- /*
-diff -NurpP --minimal linux-3.0-rc5/ipc/sem.c linux-3.0-rc5-vs2.3.1-pre3/ipc/sem.c
---- linux-3.0-rc5/ipc/sem.c 2011-05-22 16:17:59.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/ipc/sem.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/ipc/sem.c linux-3.10.53-vs2.3.6.8/ipc/sem.c
+--- linux-3.10.53/ipc/sem.c 2014-08-30 13:39:01.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/ipc/sem.c 2013-12-23 17:42:40.000000000 +0000
@@ -86,6 +86,8 @@
#include <linux/rwsem.h>
#include <linux/nsproxy.h>
#include <asm/uaccess.h>
#include "util.h"
-@@ -260,6 +262,7 @@ static int newary(struct ipc_namespace *
+@@ -500,6 +502,7 @@ static int newary(struct ipc_namespace *
sma->sem_perm.mode = (semflg & S_IRWXUGO);
sma->sem_perm.key = key;
sma->sem_perm.security = NULL;
retval = security_sem_alloc(sma);
-@@ -275,6 +278,9 @@ static int newary(struct ipc_namespace *
+@@ -514,6 +517,9 @@ static int newary(struct ipc_namespace *
return id;
}
ns->used_sems += nsems;
sma->sem_base = (struct sem *) &sma[1];
-@@ -730,6 +736,9 @@ static void freeary(struct ipc_namespace
+@@ -1103,6 +1109,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.0-rc5/ipc/shm.c linux-3.0-rc5-vs2.3.1-pre3/ipc/shm.c
---- linux-3.0-rc5/ipc/shm.c 2011-07-01 11:14:22.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/ipc/shm.c 2011-06-10 22:11:24.000000000 +0200
-@@ -39,6 +39,8 @@
+
+diff -NurpP --minimal linux-3.10.53/ipc/shm.c linux-3.10.53-vs2.3.6.8/ipc/shm.c
+--- linux-3.10.53/ipc/shm.c 2014-08-30 13:39:01.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/ipc/shm.c 2013-11-30 07:55:52.000000000 +0000
+@@ -42,6 +42,8 @@
#include <linux/nsproxy.h>
#include <linux/mount.h>
#include <linux/ipc_namespace.h>
#include <asm/uaccess.h>
-@@ -173,7 +175,12 @@ static void shm_open(struct vm_area_stru
- */
+@@ -209,10 +211,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))
-@@ -183,6 +190,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))
+@@ -220,6 +226,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);
}
-@@ -355,11 +363,15 @@ static int newseg(struct ipc_namespace *
+@@ -497,11 +504,15 @@ static int newseg(struct ipc_namespace *
if (ns->shm_tot + numpages > ns->shm_ctlall)
return -ENOSPC;
shp->shm_perm.mode = (shmflg & S_IRWXUGO);
shp->mlock_user = NULL;
-@@ -413,6 +425,7 @@ static int newseg(struct ipc_namespace *
- ns->shm_tot += numpages;
- error = shp->shm_perm.id;
- shm_unlock(shp);
+@@ -570,6 +581,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.0-rc5/kernel/Makefile linux-3.0-rc5-vs2.3.1-pre3/kernel/Makefile
---- linux-3.0-rc5/kernel/Makefile 2011-07-01 11:14:22.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/Makefile 2011-06-10 22:11:24.000000000 +0200
-@@ -24,6 +24,7 @@ CFLAGS_REMOVE_sched_clock.o = -pg
- CFLAGS_REMOVE_irq_work.o = -pg
- endif
-
+diff -NurpP --minimal linux-3.10.53/kernel/Makefile linux-3.10.53-vs2.3.6.8/kernel/Makefile
+--- linux-3.10.53/kernel/Makefile 2013-07-14 17:01:34.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/Makefile 2013-08-22 21:18:32.000000000 +0000
+@@ -25,6 +25,7 @@ endif
+ obj-y += sched/
+ obj-y += power/
+ obj-y += cpu/
+obj-y += vserver/
+
+ obj-$(CONFIG_CHECKPOINT_RESTORE) += kcmp.o
obj-$(CONFIG_FREEZER) += freezer.o
- obj-$(CONFIG_PROFILING) += profile.o
- obj-$(CONFIG_SYSCTL_SYSCALL_CHECK) += sysctl_check.o
-diff -NurpP --minimal linux-3.0-rc5/kernel/capability.c linux-3.0-rc5-vs2.3.1-pre3/kernel/capability.c
---- linux-3.0-rc5/kernel/capability.c 2011-07-01 11:14:22.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/capability.c 2011-06-10 22:21:49.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/kernel/auditsc.c linux-3.10.53-vs2.3.6.8/kernel/auditsc.c
+--- linux-3.10.53/kernel/auditsc.c 2014-08-30 13:39:01.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/auditsc.c 2014-08-30 14:03:55.000000000 +0000
+@@ -1991,7 +1991,7 @@ int audit_set_loginuid(kuid_t loginuid)
+ if (audit_loginuid_set(task))
+ return -EPERM;
+ #else /* CONFIG_AUDIT_LOGINUID_IMMUTABLE */
+- 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.10.53/kernel/capability.c linux-3.10.53-vs2.3.6.8/kernel/capability.c
+--- linux-3.10.53/kernel/capability.c 2014-08-30 13:39:01.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/capability.c 2014-08-30 14:03:55.000000000 +0000
@@ -15,6 +15,7 @@
#include <linux/syscalls.h>
#include <linux/pid_namespace.h>
/*
* 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
-@@ -340,6 +342,8 @@ bool has_capability_noaudit(struct task_
+@@ -349,6 +351,8 @@ bool has_ns_capability_noaudit(struct ta
return (ret == 0);
}
+#include <linux/vserver/base.h>
+
/**
- * capable - Determine if the current task has a superior capability in effect
- * @cap: The capability to be tested for
-@@ -369,6 +373,9 @@ EXPORT_SYMBOL(capable);
- */
- bool ns_capable(struct user_namespace *ns, int cap)
- {
-+ /* here for now so we don't require task locking */
-+ if (vs_check_bit(VXC_CAP_MASK, cap) && !vx_mcaps(1L << cap))
-+ return 0;
- if (unlikely(!cap_valid(cap))) {
- printk(KERN_CRIT "capable() called with invalid cap=%u\n", cap);
- BUG();
-diff -NurpP --minimal linux-3.0-rc5/kernel/compat.c linux-3.0-rc5-vs2.3.1-pre3/kernel/compat.c
---- linux-3.0-rc5/kernel/compat.c 2011-07-01 11:14:22.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/compat.c 2011-06-10 22:11:24.000000000 +0200
-@@ -970,7 +970,7 @@ asmlinkage long compat_sys_stime(compat_
+ * has_capability_noaudit - Does a task have a capability (unaudited) in the
+ * initial user ns
+diff -NurpP --minimal linux-3.10.53/kernel/compat.c linux-3.10.53-vs2.3.6.8/kernel/compat.c
+--- linux-3.10.53/kernel/compat.c 2013-07-14 17:01:34.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/compat.c 2013-08-22 20:30:00.000000000 +0000
+@@ -27,6 +27,7 @@
+ #include <linux/times.h>
+ #include <linux/ptrace.h>
+ #include <linux/gfp.h>
++#include <linux/vs_time.h>
+
+ #include <asm/uaccess.h>
+
+@@ -1040,7 +1041,7 @@ asmlinkage long compat_sys_stime(compat_
if (err)
return err;
return 0;
}
-diff -NurpP --minimal linux-3.0-rc5/kernel/cred.c linux-3.0-rc5-vs2.3.1-pre3/kernel/cred.c
---- linux-3.0-rc5/kernel/cred.c 2011-07-01 11:14:22.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/cred.c 2011-06-10 22:11:24.000000000 +0200
-@@ -61,31 +61,6 @@ struct cred init_cred = {
- #endif
+diff -NurpP --minimal linux-3.10.53/kernel/cred.c linux-3.10.53-vs2.3.6.8/kernel/cred.c
+--- linux-3.10.53/kernel/cred.c 2013-02-19 13:58:56.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/cred.c 2013-08-22 20:30:00.000000000 +0000
+@@ -56,31 +56,6 @@ struct cred init_cred = {
+ .group_info = &init_groups,
};
-static inline void set_cred_subscribers(struct cred *cred, int n)
-}
-
/*
- * Dispose of the shared task group credentials
+ * The RCU callback to actually dispose of a set of credentials
*/
-@@ -281,21 +256,16 @@ error:
+@@ -232,21 +207,16 @@ error:
*
* Call commit_creds() or abort_creds() to clean up.
*/
memcpy(new, old, sizeof(struct cred));
atomic_set(&new->usage, 1);
-@@ -322,6 +292,13 @@ error:
+@@ -275,6 +245,13 @@ error:
abort_creds(new);
return NULL;
}
EXPORT_SYMBOL(prepare_creds);
/*
-diff -NurpP --minimal linux-3.0-rc5/kernel/exit.c linux-3.0-rc5-vs2.3.1-pre3/kernel/exit.c
---- linux-3.0-rc5/kernel/exit.c 2011-07-01 11:14:22.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/exit.c 2011-06-22 12:39:15.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/kernel/exit.c linux-3.10.53-vs2.3.6.8/kernel/exit.c
+--- linux-3.10.53/kernel/exit.c 2014-08-30 13:39:01.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/exit.c 2014-05-20 04:31:56.000000000 +0000
@@ -48,6 +48,10 @@
#include <linux/fs_struct.h>
#include <linux/init_task.h>
#include <trace/events/sched.h>
#include <linux/hw_breakpoint.h>
#include <linux/oom.h>
-@@ -494,9 +498,11 @@ static void close_files(struct files_str
- filp_close(file, files);
- cond_resched();
- }
-+ vx_openfd_dec(i);
- }
- i++;
- set >>= 1;
-+ cond_resched();
+@@ -514,15 +518,25 @@ static struct task_struct *find_new_reap
+ __acquires(&tasklist_lock)
+ {
+ struct pid_namespace *pid_ns = task_active_pid_ns(father);
+- struct task_struct *thread;
++ struct vx_info *vxi = task_get_vx_info(father);
++ struct task_struct *thread = father;
++ struct task_struct *reaper;
+
+- thread = father;
+ while_each_thread(father, thread) {
+ if (thread->flags & PF_EXITING)
+ continue;
+ if (unlikely(pid_ns->child_reaper == father))
+ pid_ns->child_reaper = thread;
+- return thread;
++ reaper = thread;
++ goto out_put;
++ }
++
++ reaper = pid_ns->child_reaper;
++ if (vxi) {
++ BUG_ON(!vxi->vx_reaper);
++ if (vxi->vx_reaper != init_pid_ns.child_reaper &&
++ vxi->vx_reaper != father)
++ reaper = vxi->vx_reaper;
+ }
+
+ if (unlikely(pid_ns->child_reaper == father)) {
+@@ -560,7 +574,9 @@ static struct task_struct *find_new_reap
}
}
+
+- return pid_ns->child_reaper;
++out_put:
++ put_vx_info(vxi);
++ return reaper;
}
-@@ -1047,11 +1053,16 @@ NORET_TYPE void do_exit(long code)
- validate_creds_for_do_exit(tsk);
+ /*
+@@ -618,10 +634,15 @@ static void forget_original_parent(struc
+ list_for_each_entry_safe(p, n, &father->children, sibling) {
+ struct task_struct *t = p;
+ do {
+- t->real_parent = reaper;
++ struct task_struct *new_parent = reaper;
++
++ if (unlikely(p == reaper))
++ new_parent = task_active_pid_ns(p)->child_reaper;
++
++ t->real_parent = new_parent;
+ if (t->parent == father) {
+ BUG_ON(t->ptrace);
+- t->parent = t->real_parent;
++ t->parent = new_parent;
+ }
+ if (t->pdeath_signal)
+ group_send_sig_info(t->pdeath_signal,
+@@ -826,6 +847,9 @@ void do_exit(long code)
+ */
+ ptrace_put_breakpoints(tsk);
+
++ /* needs to stay before exit_notify() */
++ exit_vx_info_early(tsk, code);
++
+ exit_notify(tsk, group_dead);
+ #ifdef CONFIG_NUMA
+ task_lock(tsk);
+@@ -879,10 +903,15 @@ void do_exit(long code)
+ smp_mb();
+ raw_spin_unlock_wait(&tsk->pi_lock);
+ /* needs to stay after exit_notify() */
+ exit_vx_info(tsk, code);
+ exit_nx_info(tsk);
+
- preempt_disable();
- exit_rcu();
/* causes final put_task_struct in finish_task_switch(). */
tsk->state = TASK_DEAD;
+ tsk->flags |= PF_NOFREEZE; /* tell freezer to ignore us */
schedule();
+ printk("bad task: %p [%lx]\n", current, current->state);
BUG();
/* Avoid "noreturn function does return". */
for (;;)
-diff -NurpP --minimal linux-3.0-rc5/kernel/fork.c linux-3.0-rc5-vs2.3.1-pre3/kernel/fork.c
---- linux-3.0-rc5/kernel/fork.c 2011-07-01 11:14:22.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/fork.c 2011-06-10 22:21:02.000000000 +0200
-@@ -67,6 +67,10 @@
- #include <linux/user-return-notifier.h>
- #include <linux/oom.h>
- #include <linux/khugepaged.h>
+diff -NurpP --minimal linux-3.10.53/kernel/fork.c linux-3.10.53-vs2.3.6.8/kernel/fork.c
+--- linux-3.10.53/kernel/fork.c 2014-08-30 13:39:01.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/fork.c 2014-08-30 14:04:21.000000000 +0000
+@@ -71,6 +71,9 @@
+ #include <linux/signalfd.h>
+ #include <linux/uprobes.h>
+ #include <linux/aio.h>
+#include <linux/vs_context.h>
+#include <linux/vs_network.h>
+#include <linux/vs_limit.h>
-+#include <linux/vs_memory.h>
#include <asm/pgtable.h>
#include <asm/pgalloc.h>
-@@ -167,6 +171,8 @@ void free_task(struct task_struct *tsk)
- account_kernel_stack(tsk->stack, -1);
+@@ -211,6 +214,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);
+ clr_vx_info(&tsk->vx_info);
+ clr_nx_info(&tsk->nx_info);
ftrace_graph_exit_task(tsk);
- free_task_struct(tsk);
- }
-@@ -505,6 +511,7 @@ static struct mm_struct * mm_init(struct
+ put_seccomp_filter(tsk);
+ arch_release_task_struct(tsk);
+@@ -549,6 +554,7 @@ static struct mm_struct *mm_init(struct
if (likely(!mm_alloc_pgd(mm))) {
mm->def_flags = 0;
mmu_notifier_mm_init(mm);
return mm;
}
-@@ -542,6 +549,7 @@ void __mmdrop(struct mm_struct *mm)
- #ifdef CONFIG_TRANSPARENT_HUGEPAGE
- VM_BUG_ON(mm->pmd_huge_pte);
- #endif
+@@ -601,6 +607,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);
-@@ -729,6 +737,7 @@ struct mm_struct *dup_mm(struct task_str
+@@ -820,6 +827,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);
- /* Initializing for Swap token stuff */
-@@ -772,6 +781,7 @@ fail_nocontext:
+ #ifdef CONFIG_TRANSPARENT_HUGEPAGE
+@@ -861,6 +869,7 @@ fail_nocontext:
* If init_new_context() failed, we cannot use mmput() to free the mm
* because it calls destroy_context()
*/
mm_free_pgd(mm);
free_mm(mm);
return NULL;
-@@ -1057,6 +1067,8 @@ static struct task_struct *copy_process(
+@@ -1139,6 +1148,8 @@ static struct task_struct *copy_process(
+ {
int retval;
struct task_struct *p;
- int cgroup_callbacks_done = 0;
+ struct vx_info *vxi;
+ struct nx_info *nxi;
if ((clone_flags & (CLONE_NEWNS|CLONE_FS)) == (CLONE_NEWNS|CLONE_FS))
return ERR_PTR(-EINVAL);
-@@ -1103,7 +1115,12 @@ static struct task_struct *copy_process(
+@@ -1198,7 +1209,12 @@ static struct task_struct *copy_process(
DEBUG_LOCKS_WARN_ON(!p->hardirqs_enabled);
DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
#endif
if (atomic_read(&p->real_cred->user->processes) >=
task_rlimit(p, RLIMIT_NPROC)) {
if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE) &&
-@@ -1360,6 +1377,18 @@ static struct task_struct *copy_process(
-
+@@ -1480,6 +1496,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;
+ 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.0-rc5/kernel/kthread.c linux-3.0-rc5-vs2.3.1-pre3/kernel/kthread.c
---- linux-3.0-rc5/kernel/kthread.c 2011-07-01 11:14:22.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/kthread.c 2011-06-10 22:11:24.000000000 +0200
-@@ -16,6 +16,7 @@
- #include <linux/mutex.h>
- #include <linux/slab.h>
+diff -NurpP --minimal linux-3.10.53/kernel/kthread.c linux-3.10.53-vs2.3.6.8/kernel/kthread.c
+--- linux-3.10.53/kernel/kthread.c 2013-07-14 17:01:35.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/kthread.c 2013-08-22 21:14:28.000000000 +0000
+@@ -18,6 +18,7 @@
#include <linux/freezer.h>
+ #include <linux/ptrace.h>
+ #include <linux/uaccess.h>
+#include <linux/vs_pid.h>
#include <trace/events/sched.h>
static DEFINE_SPINLOCK(kthread_create_lock);
-diff -NurpP --minimal linux-3.0-rc5/kernel/nsproxy.c linux-3.0-rc5-vs2.3.1-pre3/kernel/nsproxy.c
---- linux-3.0-rc5/kernel/nsproxy.c 2011-07-01 11:14:23.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/nsproxy.c 2011-06-13 14:09:44.000000000 +0200
-@@ -20,6 +20,8 @@
+diff -NurpP --minimal linux-3.10.53/kernel/nsproxy.c linux-3.10.53-vs2.3.6.8/kernel/nsproxy.c
+--- linux-3.10.53/kernel/nsproxy.c 2013-07-14 17:01:35.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/nsproxy.c 2013-08-22 21:09:55.000000000 +0000
+@@ -20,11 +20,14 @@
#include <linux/mnt_namespace.h>
#include <linux/utsname.h>
#include <linux/pid_namespace.h>
+#include <linux/vserver/debug.h>
#include <net/net_namespace.h>
#include <linux/ipc_namespace.h>
- #include <linux/proc_fs.h>
-@@ -46,8 +48,11 @@ static inline struct nsproxy *create_nsp
+ #include <linux/proc_ns.h>
+ #include <linux/file.h>
+ #include <linux/syscalls.h>
++#include "../fs/mount.h"
+
+ static struct kmem_cache *nsproxy_cachep;
+
+@@ -46,8 +49,11 @@ static inline struct nsproxy *create_nsp
struct nsproxy *nsproxy;
nsproxy = kmem_cache_alloc(nsproxy_cachep, GFP_KERNEL);
return nsproxy;
}
-@@ -56,8 +61,11 @@ static inline struct nsproxy *create_nsp
+@@ -56,9 +62,12 @@ static inline struct nsproxy *create_nsp
* Return the newly created nsproxy. Do not attach this to the task,
* leave it to the caller to do proper locking and attach it to task.
*/
-static struct nsproxy *create_new_namespaces(unsigned long flags,
-- struct task_struct *tsk, struct fs_struct *new_fs)
-+static struct nsproxy *unshare_namespaces(unsigned long flags,
-+ struct nsproxy *orig,
-+ struct fs_struct *new_fs,
-+ struct user_namespace *new_user,
-+ struct pid_namespace *new_pid)
+- struct task_struct *tsk, struct user_namespace *user_ns,
+- struct fs_struct *new_fs)
++static struct nsproxy *unshare_namespaces(
++ unsigned long flags,
++ struct nsproxy *orig,
++ struct fs_struct *new_fs,
++ struct user_namespace *new_user,
++ struct pid_namespace *new_pid)
{
struct nsproxy *new_nsp;
int err;
-@@ -66,31 +74,31 @@ static struct nsproxy *create_new_namesp
+@@ -67,31 +76,31 @@ static struct nsproxy *create_new_namesp
if (!new_nsp)
return ERR_PTR(-ENOMEM);
-- new_nsp->mnt_ns = copy_mnt_ns(flags, tsk->nsproxy->mnt_ns, new_fs);
-+ new_nsp->mnt_ns = copy_mnt_ns(flags, orig->mnt_ns, new_fs);
+- new_nsp->mnt_ns = copy_mnt_ns(flags, tsk->nsproxy->mnt_ns, user_ns, new_fs);
++ new_nsp->mnt_ns = copy_mnt_ns(flags, orig->mnt_ns, new_user, new_fs);
if (IS_ERR(new_nsp->mnt_ns)) {
err = PTR_ERR(new_nsp->mnt_ns);
goto out_ns;
}
-- new_nsp->uts_ns = copy_utsname(flags, tsk);
-+ new_nsp->uts_ns = copy_utsname(flags, orig->uts_ns, new_user);
+- new_nsp->uts_ns = copy_utsname(flags, user_ns, tsk->nsproxy->uts_ns);
++ new_nsp->uts_ns = copy_utsname(flags, new_user, orig->uts_ns);
if (IS_ERR(new_nsp->uts_ns)) {
err = PTR_ERR(new_nsp->uts_ns);
goto out_uts;
}
-- new_nsp->ipc_ns = copy_ipcs(flags, tsk);
-+ new_nsp->ipc_ns = copy_ipcs(flags, orig->ipc_ns, new_user);
+- new_nsp->ipc_ns = copy_ipcs(flags, user_ns, tsk->nsproxy->ipc_ns);
++ new_nsp->ipc_ns = copy_ipcs(flags, new_user, orig->ipc_ns);
if (IS_ERR(new_nsp->ipc_ns)) {
err = PTR_ERR(new_nsp->ipc_ns);
goto out_ipc;
}
-- new_nsp->pid_ns = copy_pid_ns(flags, task_active_pid_ns(tsk));
-+ new_nsp->pid_ns = copy_pid_ns(flags, new_pid);
+- 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);
goto out_pid;
}
-- new_nsp->net_ns = copy_net_ns(flags, tsk->nsproxy->net_ns);
-+ new_nsp->net_ns = copy_net_ns(flags, orig->net_ns);
+- new_nsp->net_ns = copy_net_ns(flags, user_ns, tsk->nsproxy->net_ns);
++ new_nsp->net_ns = copy_net_ns(flags, new_user, orig->net_ns);
if (IS_ERR(new_nsp->net_ns)) {
err = PTR_ERR(new_nsp->net_ns);
goto out_net;
-@@ -115,6 +123,40 @@ out_ns:
+@@ -116,6 +125,41 @@ out_ns:
return ERR_PTR(err);
}
+static struct nsproxy *create_new_namespaces(unsigned long flags,
-+ struct task_struct *tsk, struct fs_struct *new_fs)
++ struct task_struct *tsk, struct user_namespace *user_ns,
++ struct fs_struct *new_fs)
++
+{
+ return unshare_namespaces(flags, tsk->nsproxy,
-+ new_fs, task_cred_xxx(tsk, user)->user_ns,
-+ task_active_pid_ns(tsk));
++ new_fs, user_ns, task_active_pid_ns(tsk));
+}
+
+/*
/*
* called from clone. This now handles copy for nsproxy and all
* namespaces therein.
-@@ -122,9 +164,12 @@ out_ns:
- int copy_namespaces(unsigned long flags, struct task_struct *tsk)
+@@ -124,9 +168,12 @@ 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;
if (!old_ns)
return 0;
-@@ -134,7 +179,7 @@ int copy_namespaces(unsigned long flags,
+@@ -136,7 +183,7 @@ int copy_namespaces(unsigned long flags,
CLONE_NEWPID | CLONE_NEWNET)))
return 0;
-- if (!capable(CAP_SYS_ADMIN)) {
-+ if (!vx_can_unshare(CAP_SYS_ADMIN, flags)) {
+- if (!ns_capable(user_ns, CAP_SYS_ADMIN)) {
++ if (!vx_ns_can_unshare(user_ns, CAP_SYS_ADMIN, flags)) {
err = -EPERM;
goto out;
}
-@@ -161,6 +206,9 @@ int copy_namespaces(unsigned long flags,
+@@ -163,6 +210,9 @@ int copy_namespaces(unsigned long flags,
out:
put_nsproxy(old_ns);
return err;
}
-@@ -174,7 +222,9 @@ void free_nsproxy(struct nsproxy *ns)
+@@ -176,7 +226,9 @@ void free_nsproxy(struct nsproxy *ns)
put_ipc_ns(ns->ipc_ns);
if (ns->pid_ns)
put_pid_ns(ns->pid_ns);
kmem_cache_free(nsproxy_cachep, ns);
}
-@@ -187,11 +237,15 @@ int unshare_nsproxy_namespaces(unsigned
- {
+@@ -190,12 +242,16 @@ int unshare_nsproxy_namespaces(unsigned
+ struct user_namespace *user_ns;
int err = 0;
+ vxdprintk(VXD_CBIT(space, 4),
+ unshare_flags, current->nsproxy);
+
if (!(unshare_flags & (CLONE_NEWNS | CLONE_NEWUTS | CLONE_NEWIPC |
- CLONE_NEWNET)))
+ CLONE_NEWNET | CLONE_NEWPID)))
return 0;
-- if (!capable(CAP_SYS_ADMIN))
-+ if (!vx_can_unshare(CAP_SYS_ADMIN, unshare_flags))
+ user_ns = new_cred ? new_cred->user_ns : current_user_ns();
+- if (!ns_capable(user_ns, CAP_SYS_ADMIN))
++ if (!vx_ns_can_unshare(user_ns, CAP_SYS_ADMIN, unshare_flags))
return -EPERM;
- *new_nsp = create_new_namespaces(unshare_flags, current,
-diff -NurpP --minimal linux-3.0-rc5/kernel/pid.c linux-3.0-rc5-vs2.3.1-pre3/kernel/pid.c
---- linux-3.0-rc5/kernel/pid.c 2011-05-22 16:17:59.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/pid.c 2011-06-10 22:11:24.000000000 +0200
-@@ -36,6 +36,7 @@
- #include <linux/pid_namespace.h>
- #include <linux/init_task.h>
+ *new_nsp = create_new_namespaces(unshare_flags, current, user_ns,
+diff -NurpP --minimal linux-3.10.53/kernel/pid.c linux-3.10.53-vs2.3.6.8/kernel/pid.c
+--- linux-3.10.53/kernel/pid.c 2014-08-30 13:39:01.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/pid.c 2013-11-13 17:17:16.000000000 +0000
+@@ -38,6 +38,7 @@
#include <linux/syscalls.h>
+ #include <linux/proc_ns.h>
+ #include <linux/proc_fs.h>
+#include <linux/vs_pid.h>
#define pid_hashfn(nr, ns) \
hash_long((unsigned long)nr + (unsigned long)ns, pidhash_shift)
-@@ -342,7 +343,7 @@ EXPORT_SYMBOL_GPL(find_pid_ns);
+@@ -367,7 +368,7 @@ EXPORT_SYMBOL_GPL(find_pid_ns);
struct pid *find_vpid(int nr)
{
-- return find_pid_ns(nr, current->nsproxy->pid_ns);
-+ return find_pid_ns(vx_rmap_pid(nr), current->nsproxy->pid_ns);
+- return find_pid_ns(nr, task_active_pid_ns(current));
++ return find_pid_ns(vx_rmap_pid(nr), task_active_pid_ns(current));
}
EXPORT_SYMBOL_GPL(find_vpid);
-@@ -402,6 +403,9 @@ void transfer_pid(struct task_struct *ol
+@@ -427,6 +428,9 @@ void transfer_pid(struct task_struct *ol
struct task_struct *pid_task(struct pid *pid, enum pid_type type)
{
struct task_struct *result = NULL;
if (pid) {
struct hlist_node *first;
first = rcu_dereference_check(hlist_first_rcu(&pid->tasks[type]),
-@@ -420,7 +424,7 @@ EXPORT_SYMBOL(pid_task);
- struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
- {
- rcu_lockdep_assert(rcu_read_lock_held());
+@@ -446,7 +450,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");
- return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
+ return pid_task(find_pid_ns(vx_rmap_pid(nr), ns), PIDTYPE_PID);
}
struct task_struct *find_task_by_vpid(pid_t vnr)
-@@ -464,7 +468,7 @@ struct pid *find_get_pid(pid_t nr)
+@@ -490,7 +494,7 @@ struct pid *find_get_pid(pid_t nr)
}
EXPORT_SYMBOL_GPL(find_get_pid);
{
struct upid *upid;
pid_t nr = 0;
-@@ -477,6 +481,11 @@ pid_t pid_nr_ns(struct pid *pid, struct
- return nr;
+@@ -504,6 +508,11 @@ pid_t pid_nr_ns(struct pid *pid, struct
}
+ EXPORT_SYMBOL_GPL(pid_nr_ns);
+pid_t pid_nr_ns(struct pid *pid, struct pid_namespace *ns)
+{
+
pid_t pid_vnr(struct pid *pid)
{
- return pid_nr_ns(pid, current->nsproxy->pid_ns);
-diff -NurpP --minimal linux-3.0-rc5/kernel/pid_namespace.c linux-3.0-rc5-vs2.3.1-pre3/kernel/pid_namespace.c
---- linux-3.0-rc5/kernel/pid_namespace.c 2011-05-22 16:17:59.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/pid_namespace.c 2011-06-10 22:17:45.000000000 +0200
-@@ -15,6 +15,7 @@
- #include <linux/acct.h>
- #include <linux/slab.h>
- #include <linux/proc_fs.h>
+ return pid_nr_ns(pid, task_active_pid_ns(current));
+diff -NurpP --minimal linux-3.10.53/kernel/pid_namespace.c linux-3.10.53-vs2.3.6.8/kernel/pid_namespace.c
+--- linux-3.10.53/kernel/pid_namespace.c 2014-08-30 13:39:01.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/pid_namespace.c 2014-05-20 04:31:56.000000000 +0000
+@@ -18,6 +18,7 @@
+ #include <linux/proc_ns.h>
+ #include <linux/reboot.h>
+ #include <linux/export.h>
+#include <linux/vserver/global.h>
- #define BITS_PER_PAGE (PAGE_SIZE*8)
-
-@@ -88,6 +89,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);
+ atomic_inc(&vs_global_pid_ns);
ns->level = level;
ns->parent = get_pid_ns(parent_pid_ns);
-
-@@ -119,6 +121,7 @@ static void destroy_pid_namespace(struct
-
+ ns->user_ns = get_user_ns(user_ns);
+@@ -140,6 +142,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);
+ atomic_dec(&vs_global_pid_ns);
kmem_cache_free(pid_ns_cachep, ns);
}
-diff -NurpP --minimal linux-3.0-rc5/kernel/posix-timers.c linux-3.0-rc5-vs2.3.1-pre3/kernel/posix-timers.c
---- linux-3.0-rc5/kernel/posix-timers.c 2011-07-01 11:14:23.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/posix-timers.c 2011-06-10 22:11:24.000000000 +0200
-@@ -47,6 +47,7 @@
- #include <linux/wait.h>
+diff -NurpP --minimal linux-3.10.53/kernel/posix-timers.c linux-3.10.53-vs2.3.6.8/kernel/posix-timers.c
+--- linux-3.10.53/kernel/posix-timers.c 2013-07-14 17:01:35.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/posix-timers.c 2013-08-22 21:10:34.000000000 +0000
+@@ -48,6 +48,7 @@
#include <linux/workqueue.h>
- #include <linux/module.h>
+ #include <linux/export.h>
+ #include <linux/hashtable.h>
+#include <linux/vs_context.h>
/*
- * Management arrays for POSIX timers. Timers are kept in slab memory
-@@ -340,6 +341,7 @@ int posix_timer_event(struct k_itimer *t
+ * Management arrays for POSIX timers. Timers are now kept in static hash table
+@@ -398,6 +399,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
+@@ -414,10 +416,18 @@ int posix_timer_event(struct k_itimer *t
rcu_read_lock();
task = pid_task(timr->it_pid, PIDTYPE_PID);
if (task) {
/* If we failed to send the signal the timer stops. */
return ret > 0;
}
-diff -NurpP --minimal linux-3.0-rc5/kernel/printk.c linux-3.0-rc5-vs2.3.1-pre3/kernel/printk.c
---- linux-3.0-rc5/kernel/printk.c 2011-07-01 11:14:23.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/printk.c 2011-06-10 22:11:24.000000000 +0200
-@@ -41,6 +41,7 @@
- #include <linux/cpu.h>
- #include <linux/notifier.h>
- #include <linux/rculist.h>
+diff -NurpP --minimal linux-3.10.53/kernel/printk.c linux-3.10.53-vs2.3.6.8/kernel/printk.c
+--- linux-3.10.53/kernel/printk.c 2014-08-30 13:39:01.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/printk.c 2014-08-30 14:03:55.000000000 +0000
+@@ -45,6 +45,7 @@
+ #include <linux/poll.h>
+ #include <linux/irq_work.h>
+ #include <linux/utsname.h>
+#include <linux/vs_cvirt.h>
#include <asm/uaccess.h>
-@@ -314,7 +315,7 @@ static int check_syslog_permissions(int
+@@ -391,7 +392,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)) {
-@@ -342,12 +343,9 @@ int do_syslog(int type, char __user *buf
+ /*
+ * For historical reasons, accept CAP_SYS_ADMIN too, with
+@@ -1140,12 +1141,9 @@ int do_syslog(int type, char __user *buf
if (error)
return error;
error = -EINVAL;
if (!buf || len < 0)
goto out;
-@@ -358,6 +356,16 @@ int do_syslog(int type, char __user *buf
+@@ -1156,6 +1154,16 @@ int do_syslog(int type, char __user *buf
error = -EFAULT;
goto out;
}
+ break;
+ case SYSLOG_ACTION_READ: /* Read from log */
error = wait_event_interruptible(log_wait,
- (log_start - log_end));
+ syslog_seq != log_next_seq);
if (error)
-@@ -384,16 +392,6 @@ int do_syslog(int type, char __user *buf
+@@ -1168,16 +1176,6 @@ int do_syslog(int type, char __user *buf
/* FALL THRU */
/* Read last kernel messages */
case SYSLOG_ACTION_READ_ALL:
- error = -EFAULT;
- goto out;
- }
- count = len;
- if (count > log_buf_len)
- count = log_buf_len;
-diff -NurpP --minimal linux-3.0-rc5/kernel/ptrace.c linux-3.0-rc5-vs2.3.1-pre3/kernel/ptrace.c
---- linux-3.0-rc5/kernel/ptrace.c 2011-07-01 11:14:23.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/ptrace.c 2011-06-10 22:11:24.000000000 +0200
-@@ -22,6 +22,7 @@
+ error = syslog_print_all(buf, len, clear);
+ break;
+ /* Clear ring buffer */
+diff -NurpP --minimal linux-3.10.53/kernel/ptrace.c linux-3.10.53-vs2.3.6.8/kernel/ptrace.c
+--- linux-3.10.53/kernel/ptrace.c 2014-08-30 13:39:01.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/ptrace.c 2013-11-30 07:53:00.000000000 +0000
+@@ -23,6 +23,7 @@
#include <linux/syscalls.h>
#include <linux/uaccess.h>
#include <linux/regset.h>
+#include <linux/vs_context.h>
#include <linux/hw_breakpoint.h>
+ #include <linux/cn_proc.h>
+ #include <linux/compat.h>
+@@ -264,6 +265,11 @@ ok:
+ }
+ rcu_read_unlock();
-
-@@ -169,6 +170,11 @@ ok:
- dumpable = get_dumpable(task->mm);
- if (!dumpable && !task_ns_capable(task, CAP_SYS_PTRACE))
- return -EPERM;
+ if (!vx_check(task->xid, VS_ADMIN_P|VS_WATCH_P|VS_IDENT))
+ return -EPERM;
+ if (!vx_check(task->xid, VS_IDENT) &&
+ !task_vx_flags(task, VXF_STATE_ADMIN, 0))
+ return -EACCES;
-
return security_ptrace_access_check(task, mode);
}
-diff -NurpP --minimal linux-3.0-rc5/kernel/sched.c linux-3.0-rc5-vs2.3.1-pre3/kernel/sched.c
---- linux-3.0-rc5/kernel/sched.c 2011-07-01 11:14:23.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/sched.c 2011-06-15 02:40:14.000000000 +0200
-@@ -71,6 +71,8 @@
- #include <linux/ctype.h>
- #include <linux/ftrace.h>
- #include <linux/slab.h>
+
+diff -NurpP --minimal linux-3.10.53/kernel/sched/core.c linux-3.10.53-vs2.3.6.8/kernel/sched/core.c
+--- linux-3.10.53/kernel/sched/core.c 2014-08-30 13:39:01.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/sched/core.c 2014-08-30 14:03:55.000000000 +0000
+@@ -73,6 +73,8 @@
+ #include <linux/init_task.h>
+ #include <linux/binfmts.h>
+ #include <linux/context_tracking.h>
+#include <linux/vs_sched.h>
+#include <linux/vs_cvirt.h>
+ #include <asm/switch_to.h>
#include <asm/tlb.h>
- #include <asm/irq_regs.h>
-@@ -3429,9 +3431,17 @@ static void calc_global_nohz(unsigned lo
+@@ -2145,9 +2147,17 @@ EXPORT_SYMBOL(avenrun); /* should be rem
*/
void get_avenrun(unsigned long *loads, unsigned long offset, int shift)
{
+ }
}
- /*
-@@ -3714,16 +3724,19 @@ void account_user_time(struct task_struc
+ static long calc_load_fold_active(struct rq *this_rq)
+@@ -3750,7 +3760,7 @@ SYSCALL_DEFINE1(nice, int, increment)
+ nice = 19;
+
+ 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.10.53/kernel/sched/cputime.c linux-3.10.53-vs2.3.6.8/kernel/sched/cputime.c
+--- linux-3.10.53/kernel/sched/cputime.c 2014-08-30 13:39:01.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/sched/cputime.c 2014-06-12 11:14:28.000000000 +0000
+@@ -4,6 +4,7 @@
+ #include <linux/kernel_stat.h>
+ #include <linux/static_key.h>
+ #include <linux/context_tracking.h>
++#include <linux/vs_sched.h>
+ #include "sched.h"
+
+
+@@ -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 cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
+ struct vx_info *vxi = p->vx_info; /* p is _always_ current */
- cputime64_t tmp;
+ int nice = (TASK_NICE(p) > 0);
+ int index;
/* Add user time to process. */
- p->utime = cputime_add(p->utime, cputime);
- p->utimescaled = cputime_add(p->utimescaled, cputime_scaled);
+ p->utime += cputime;
+ p->utimescaled += cputime_scaled;
+ vx_account_user(vxi, cputime, nice);
account_group_user_time(p, cputime);
+- index = (TASK_NICE(p) > 0) ? CPUTIME_NICE : CPUTIME_USER;
++ index = (nice) ? CPUTIME_NICE : CPUTIME_USER;
+
/* Add user time to cpustat. */
- tmp = cputime_to_cputime64(cputime);
-- if (TASK_NICE(p) > 0)
-+ if (nice)
- cpustat->nice = cputime64_add(cpustat->nice, tmp);
- else
- cpustat->user = cputime64_add(cpustat->user, tmp);
-@@ -3775,10 +3788,12 @@ void __account_system_time(struct task_s
- cputime_t cputime_scaled, cputime64_t *target_cputime64)
+ task_group_account_field(p, index, (__force u64) cputime);
+@@ -189,9 +193,12 @@ static inline
+ void __account_system_time(struct task_struct *p, cputime_t cputime,
+ cputime_t cputime_scaled, int index)
{
- cputime64_t tmp = cputime_to_cputime64(cputime);
+ struct vx_info *vxi = p->vx_info; /* p is _always_ current */
-
++
/* Add system time to process. */
- p->stime = cputime_add(p->stime, cputime);
- p->stimescaled = cputime_add(p->stimescaled, cputime_scaled);
+ p->stime += cputime;
+ p->stimescaled += cputime_scaled;
+ vx_account_system(vxi, cputime, 0 /* do we have idle time? */);
account_group_system_time(p, cputime);
/* Add system time to cpustat. */
-@@ -4936,7 +4951,7 @@ SYSCALL_DEFINE1(nice, int, increment)
- nice = 19;
+diff -NurpP --minimal linux-3.10.53/kernel/sched/fair.c linux-3.10.53-vs2.3.6.8/kernel/sched/fair.c
+--- linux-3.10.53/kernel/sched/fair.c 2014-08-30 13:39:01.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/sched/fair.c 2014-04-22 03:48:11.000000000 +0000
+@@ -29,6 +29,7 @@
+ #include <linux/mempolicy.h>
+ #include <linux/migrate.h>
+ #include <linux/task_work.h>
++#include <linux/vs_cvirt.h>
- if (increment < 0 && !can_nice(current, nice))
-- return -EPERM;
-+ return vx_flags(VXF_IGNEG_NICE, 0) ? 0 : -EPERM;
+ #include <trace/events/sched.h>
- retval = security_task_setnice(current, nice);
- if (retval)
-diff -NurpP --minimal linux-3.0-rc5/kernel/sched_fair.c linux-3.0-rc5-vs2.3.1-pre3/kernel/sched_fair.c
---- linux-3.0-rc5/kernel/sched_fair.c 2011-07-01 11:14:23.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/sched_fair.c 2011-06-10 22:11:24.000000000 +0200
-@@ -998,6 +998,8 @@ enqueue_entity(struct cfs_rq *cfs_rq, st
+@@ -1743,6 +1744,8 @@ enqueue_entity(struct cfs_rq *cfs_rq, st
__enqueue_entity(cfs_rq, se);
se->on_rq = 1;
+ if (entity_is_task(se))
+ vx_activate_task(task_of(se));
- if (cfs_rq->nr_running == 1)
+ if (cfs_rq->nr_running == 1) {
list_add_leaf_cfs_rq(cfs_rq);
- }
-@@ -1074,6 +1076,8 @@ dequeue_entity(struct cfs_rq *cfs_rq, st
+ check_enqueue_throttle(cfs_rq);
+@@ -1824,6 +1827,8 @@ dequeue_entity(struct cfs_rq *cfs_rq, st
if (se != cfs_rq->curr)
__dequeue_entity(cfs_rq, se);
se->on_rq = 0;
+ if (entity_is_task(se))
+ vx_deactivate_task(task_of(se));
- update_cfs_load(cfs_rq, 0);
account_entity_dequeue(cfs_rq, se);
-diff -NurpP --minimal linux-3.0-rc5/kernel/signal.c linux-3.0-rc5-vs2.3.1-pre3/kernel/signal.c
---- linux-3.0-rc5/kernel/signal.c 2011-07-01 11:14:23.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/signal.c 2011-06-22 12:39:16.000000000 +0200
-@@ -28,6 +28,8 @@
- #include <linux/freezer.h>
- #include <linux/pid_namespace.h>
- #include <linux/nsproxy.h>
+ /*
+diff -NurpP --minimal linux-3.10.53/kernel/signal.c linux-3.10.53-vs2.3.6.8/kernel/signal.c
+--- linux-3.10.53/kernel/signal.c 2013-07-14 17:01:35.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/signal.c 2013-08-22 21:13:50.000000000 +0000
+@@ -33,6 +33,8 @@
+ #include <linux/uprobes.h>
+ #include <linux/compat.h>
+ #include <linux/cn_proc.h>
+#include <linux/vs_context.h>
+#include <linux/vs_pid.h>
#define CREATE_TRACE_POINTS
#include <trace/events/signal.h>
-@@ -744,9 +746,18 @@ static int check_kill_permission(int sig
+@@ -790,9 +792,18 @@ static int check_kill_permission(int sig
struct pid *sid;
int error;
if (!si_fromuser(info))
return 0;
-@@ -770,6 +781,20 @@ static int check_kill_permission(int sig
+@@ -816,6 +827,20 @@ static int check_kill_permission(int sig
}
}
return security_task_kill(t, info, sig, 0);
}
-@@ -1239,7 +1264,7 @@ int kill_pid_info(int sig, struct siginf
+@@ -1353,7 +1378,7 @@ int kill_pid_info(int sig, struct siginf
rcu_read_lock();
retry:
p = pid_task(pid, PIDTYPE_PID);
error = group_send_sig_info(sig, info, p);
if (unlikely(error == -ESRCH))
/*
-@@ -1278,7 +1303,7 @@ int kill_pid_info_as_uid(int sig, struct
+@@ -1401,7 +1426,7 @@ int kill_pid_info_as_cred(int sig, struc
rcu_read_lock();
p = pid_task(pid, PIDTYPE_PID);
ret = -ESRCH;
goto out_unlock;
}
-@@ -1333,8 +1358,10 @@ static int kill_something_info(int sig,
+@@ -1453,8 +1478,10 @@ static int kill_something_info(int sig,
struct task_struct * p;
for_each_process(p) {
int err = group_send_sig_info(sig, info, p);
++count;
if (err != -EPERM)
-@@ -2133,6 +2160,11 @@ relock:
+@@ -2308,6 +2335,11 @@ relock:
!sig_kernel_only(signr))
continue;
if (sig_kernel_stop(signr)) {
/*
* The default action is to stop all threads in
-diff -NurpP --minimal linux-3.0-rc5/kernel/softirq.c linux-3.0-rc5-vs2.3.1-pre3/kernel/softirq.c
---- linux-3.0-rc5/kernel/softirq.c 2011-07-01 11:14:23.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/softirq.c 2011-06-22 12:39:16.000000000 +0200
-@@ -24,6 +24,7 @@
- #include <linux/ftrace.h>
+diff -NurpP --minimal linux-3.10.53/kernel/softirq.c linux-3.10.53-vs2.3.6.8/kernel/softirq.c
+--- linux-3.10.53/kernel/softirq.c 2014-08-30 13:39:01.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/softirq.c 2013-11-13 17:17:16.000000000 +0000
+@@ -25,6 +25,7 @@
#include <linux/smp.h>
+ #include <linux/smpboot.h>
#include <linux/tick.h>
+#include <linux/vs_context.h>
#define CREATE_TRACE_POINTS
#include <trace/events/irq.h>
-diff -NurpP --minimal linux-3.0-rc5/kernel/sys.c linux-3.0-rc5-vs2.3.1-pre3/kernel/sys.c
---- linux-3.0-rc5/kernel/sys.c 2011-07-01 11:14:23.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/sys.c 2011-06-10 22:11:24.000000000 +0200
-@@ -43,6 +43,7 @@
- #include <linux/syscalls.h>
- #include <linux/kprobes.h>
- #include <linux/user_namespace.h>
-+#include <linux/vs_pid.h>
+diff -NurpP --minimal linux-3.10.53/kernel/sys.c linux-3.10.53-vs2.3.6.8/kernel/sys.c
+--- linux-3.10.53/kernel/sys.c 2013-07-14 17:01:35.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/sys.c 2013-08-22 20:30:00.000000000 +0000
+@@ -55,6 +55,7 @@
+ #include <linux/cred.h>
#include <linux/kmsg_dump.h>
++#include <linux/vs_pid.h>
+ /* Move somewhere else to avoid recompiling? */
+ #include <generated/utsrelease.h>
-@@ -151,7 +152,10 @@ static int set_one_prio(struct task_stru
+@@ -160,7 +161,10 @@ static int set_one_prio(struct task_stru
goto out;
}
if (niceval < task_nice(p) && !can_nice(p, niceval)) {
goto out;
}
no_nice = security_task_setnice(p, niceval);
-@@ -201,6 +205,8 @@ SYSCALL_DEFINE3(setpriority, int, which,
+@@ -211,6 +215,8 @@ SYSCALL_DEFINE3(setpriority, int, which,
else
pgrp = task_pgrp(current);
do_each_pid_thread(pgrp, PIDTYPE_PGID, p) {
error = set_one_prio(p, niceval, error);
} while_each_pid_thread(pgrp, PIDTYPE_PGID, p);
break;
-@@ -264,6 +270,8 @@ SYSCALL_DEFINE2(getpriority, int, which,
+@@ -276,6 +282,8 @@ SYSCALL_DEFINE2(getpriority, int, which,
else
pgrp = task_pgrp(current);
do_each_pid_thread(pgrp, PIDTYPE_PGID, p) {
niceval = 20 - task_nice(p);
if (niceval > retval)
retval = niceval;
-@@ -383,6 +391,8 @@ EXPORT_SYMBOL_GPL(kernel_power_off);
+@@ -452,6 +460,8 @@ EXPORT_SYMBOL_GPL(kernel_power_off);
static DEFINE_MUTEX(reboot_mutex);
/*
* Reboot system call: for obvious reasons only root may call it,
* and even root needs to set up some magic numbers in the registers
-@@ -415,6 +425,9 @@ SYSCALL_DEFINE4(reboot, int, magic1, int
+@@ -494,6 +504,9 @@ SYSCALL_DEFINE4(reboot, int, magic1, int
if ((cmd == LINUX_REBOOT_CMD_POWER_OFF) && !pm_power_off)
cmd = LINUX_REBOOT_CMD_HALT;
mutex_lock(&reboot_mutex);
switch (cmd) {
case LINUX_REBOOT_CMD_RESTART:
-@@ -1365,7 +1378,7 @@ int do_prlimit(struct task_struct *tsk,
+@@ -1462,7 +1475,8 @@ SYSCALL_DEFINE2(sethostname, char __user
+ int errno;
+ char tmp[__NEW_UTS_LEN];
+
+- if (!ns_capable(current->nsproxy->uts_ns->user_ns, CAP_SYS_ADMIN))
++ if (!vx_ns_capable(current->nsproxy->uts_ns->user_ns,
++ CAP_SYS_ADMIN, VXC_SET_UTSNAME))
+ return -EPERM;
+
+ if (len < 0 || len > __NEW_UTS_LEN)
+@@ -1513,7 +1527,8 @@ SYSCALL_DEFINE2(setdomainname, char __us
+ int errno;
+ char tmp[__NEW_UTS_LEN];
+
+- if (!ns_capable(current->nsproxy->uts_ns->user_ns, CAP_SYS_ADMIN))
++ if (!vx_ns_capable(current->nsproxy->uts_ns->user_ns,
++ CAP_SYS_ADMIN, VXC_SET_UTSNAME))
+ return -EPERM;
+ if (len < 0 || len > __NEW_UTS_LEN)
+ return -EINVAL;
+@@ -1632,7 +1647,7 @@ int do_prlimit(struct task_struct *tsk,
/* Keep the capable check against init_user_ns until
cgroups can contain all limits */
if (new_rlim->rlim_max > rlim->rlim_max &&
retval = -EPERM;
if (!retval)
retval = security_task_setrlimit(tsk->group_leader,
-diff -NurpP --minimal linux-3.0-rc5/kernel/sysctl.c linux-3.0-rc5-vs2.3.1-pre3/kernel/sysctl.c
---- linux-3.0-rc5/kernel/sysctl.c 2011-07-01 11:14:23.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/sysctl.c 2011-06-15 02:40:14.000000000 +0200
-@@ -75,6 +75,7 @@
+@@ -1685,7 +1700,8 @@ static int check_prlimit_permission(stru
+ gid_eq(cred->gid, tcred->sgid) &&
+ gid_eq(cred->gid, tcred->gid))
+ return 0;
+- if (ns_capable(tcred->user_ns, CAP_SYS_RESOURCE))
++ if (vx_ns_capable(tcred->user_ns,
++ CAP_SYS_RESOURCE, VXC_SET_RLIMIT))
+ return 0;
+
+ return -EPERM;
+diff -NurpP --minimal linux-3.10.53/kernel/sysctl.c linux-3.10.53-vs2.3.6.8/kernel/sysctl.c
+--- linux-3.10.53/kernel/sysctl.c 2014-08-30 13:39:01.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/sysctl.c 2014-06-12 11:14:28.000000000 +0000
+@@ -83,6 +83,7 @@
#if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_LOCK_STAT)
#include <linux/lockdep.h>
#endif
#ifdef CONFIG_CHR_DEV_SG
#include <scsi/sg.h>
#endif
-@@ -568,6 +569,13 @@ static struct ctl_table kern_table[] = {
+@@ -633,6 +634,13 @@ static struct ctl_table kern_table[] = {
+ .mode = 0644,
.proc_handler = proc_dostring,
},
- #endif
+ {
+ .procname = "vshelper",
+ .data = &vshelper_path,
+ .mode = 0644,
+ .proc_handler = &proc_dostring,
+ },
+
#ifdef CONFIG_CHR_DEV_SG
{
- .procname = "sg-big-buff",
-diff -NurpP --minimal linux-3.0-rc5/kernel/sysctl_binary.c linux-3.0-rc5-vs2.3.1-pre3/kernel/sysctl_binary.c
---- linux-3.0-rc5/kernel/sysctl_binary.c 2011-05-22 16:17:59.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/sysctl_binary.c 2011-06-10 22:11:24.000000000 +0200
-@@ -73,6 +73,7 @@ static const struct bin_table bin_kern_t
+diff -NurpP --minimal linux-3.10.53/kernel/sysctl_binary.c linux-3.10.53-vs2.3.6.8/kernel/sysctl_binary.c
+--- linux-3.10.53/kernel/sysctl_binary.c 2013-07-14 17:01:35.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/sysctl_binary.c 2013-08-22 20:30:00.000000000 +0000
+@@ -74,6 +74,7 @@ static const struct bin_table bin_kern_t
{ CTL_INT, KERN_PANIC, "panic" },
{ CTL_INT, KERN_REALROOTDEV, "real-root-dev" },
{ CTL_STR, KERN_SPARC_REBOOT, "reboot-cmd" },
{ CTL_INT, KERN_CTLALTDEL, "ctrl-alt-del" },
-diff -NurpP --minimal linux-3.0-rc5/kernel/time/timekeeping.c linux-3.0-rc5-vs2.3.1-pre3/kernel/time/timekeeping.c
---- linux-3.0-rc5/kernel/time/timekeeping.c 2011-07-01 11:14:23.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/time/timekeeping.c 2011-06-10 22:11:24.000000000 +0200
-@@ -233,6 +233,7 @@ void getnstimeofday(struct timespec *ts)
- } while (read_seqretry(&xtime_lock, seq));
+diff -NurpP --minimal linux-3.10.53/kernel/time/timekeeping.c linux-3.10.53-vs2.3.6.8/kernel/time/timekeeping.c
+--- linux-3.10.53/kernel/time/timekeeping.c 2014-08-30 13:39:01.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/time/timekeeping.c 2014-03-12 13:18:23.000000000 +0000
+@@ -22,6 +22,7 @@
+ #include <linux/tick.h>
+ #include <linux/stop_machine.h>
+ #include <linux/pvclock_gtod.h>
++#include <linux/vs_time.h>
+
+ #include "tick-internal.h"
+ #include "ntp_internal.h"
+@@ -694,6 +695,7 @@ void getrawmonotonic(struct timespec *ts
+ } while (read_seqcount_retry(&timekeeper_seq, seq));
timespec_add_ns(ts, nsecs);
+ vx_adjust_timespec(ts);
}
+ EXPORT_SYMBOL(getrawmonotonic);
+
+diff -NurpP --minimal linux-3.10.53/kernel/time.c linux-3.10.53-vs2.3.6.8/kernel/time.c
+--- linux-3.10.53/kernel/time.c 2013-07-14 17:01:35.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/time.c 2013-08-22 20:30:00.000000000 +0000
+@@ -37,6 +37,7 @@
+ #include <linux/fs.h>
+ #include <linux/math64.h>
+ #include <linux/ptrace.h>
++#include <linux/vs_time.h>
- EXPORT_SYMBOL(getnstimeofday);
-diff -NurpP --minimal linux-3.0-rc5/kernel/time.c linux-3.0-rc5-vs2.3.1-pre3/kernel/time.c
---- linux-3.0-rc5/kernel/time.c 2011-05-22 16:17:59.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/time.c 2011-06-10 22:11:24.000000000 +0200
-@@ -92,7 +92,7 @@ SYSCALL_DEFINE1(stime, time_t __user *,
+ #include <asm/uaccess.h>
+ #include <asm/unistd.h>
+@@ -92,7 +93,7 @@ SYSCALL_DEFINE1(stime, time_t __user *,
if (err)
return err;
return 0;
}
-@@ -177,7 +177,7 @@ int do_sys_settimeofday(const struct tim
- /* SMP safe, again the code in arch/foo/time.c should
- * globally block out interrupts when it runs.
- */
+@@ -181,7 +182,7 @@ int do_sys_settimeofday(const struct tim
+ }
+ }
+ if (tv)
- return do_settimeofday(tv);
+ return vx_settimeofday(tv);
- }
return 0;
}
-diff -NurpP --minimal linux-3.0-rc5/kernel/timer.c linux-3.0-rc5-vs2.3.1-pre3/kernel/timer.c
---- linux-3.0-rc5/kernel/timer.c 2011-07-01 11:14:23.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/timer.c 2011-06-15 02:40:14.000000000 +0200
-@@ -40,6 +40,10 @@
- #include <linux/irq_work.h>
- #include <linux/sched.h>
+
+diff -NurpP --minimal linux-3.10.53/kernel/timer.c linux-3.10.53-vs2.3.6.8/kernel/timer.c
+--- linux-3.10.53/kernel/timer.c 2014-08-30 13:39:01.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/timer.c 2014-06-12 11:14:28.000000000 +0000
+@@ -42,6 +42,10 @@
+ #include <linux/sched/sysctl.h>
#include <linux/slab.h>
+ #include <linux/compat.h>
+#include <linux/vs_base.h>
+#include <linux/vs_cvirt.h>
+#include <linux/vs_pid.h>
#include <asm/uaccess.h>
#include <asm/unistd.h>
-@@ -1336,12 +1340,6 @@ SYSCALL_DEFINE1(alarm, unsigned int, sec
-
- #endif
-
--#ifndef __alpha__
--
--/*
-- * The Alpha uses getxpid, getxuid, and getxgid instead. Maybe this
-- * should be moved into arch/i386 instead?
-- */
-
- /**
- * sys_getpid - return the thread group id of the current process
-@@ -1370,10 +1368,23 @@ SYSCALL_DEFINE0(getppid)
- rcu_read_lock();
- pid = task_tgid_vnr(current->real_parent);
- rcu_read_unlock();
-+ return vx_map_pid(pid);
-+}
-
-- return pid;
-+#ifdef __alpha__
-+
-+/*
-+ * The Alpha uses getxpid, getxuid, and getxgid instead.
-+ */
-+
-+asmlinkage long do_getxpid(long *ppid)
-+{
-+ *ppid = sys_getppid();
-+ return sys_getpid();
- }
-
-+#else /* _alpha_ */
-+
- SYSCALL_DEFINE0(getuid)
- {
- /* Only we change this so SMP safe */
-diff -NurpP --minimal linux-3.0-rc5/kernel/user_namespace.c linux-3.0-rc5-vs2.3.1-pre3/kernel/user_namespace.c
---- linux-3.0-rc5/kernel/user_namespace.c 2011-03-15 18:07:42.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/user_namespace.c 2011-06-10 22:11:24.000000000 +0200
-@@ -11,6 +11,7 @@
- #include <linux/user_namespace.h>
- #include <linux/highuid.h>
- #include <linux/cred.h>
+diff -NurpP --minimal linux-3.10.53/kernel/user_namespace.c linux-3.10.53-vs2.3.6.8/kernel/user_namespace.c
+--- linux-3.10.53/kernel/user_namespace.c 2014-08-30 13:39:01.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/user_namespace.c 2014-05-20 04:31:56.000000000 +0000
+@@ -22,6 +22,7 @@
+ #include <linux/ctype.h>
+ #include <linux/projid.h>
+ #include <linux/fs_struct.h>
+#include <linux/vserver/global.h>
static struct kmem_cache *user_ns_cachep __read_mostly;
-@@ -33,6 +34,7 @@ int create_user_ns(struct cred *new)
- return -ENOMEM;
+@@ -94,6 +95,7 @@ int create_user_ns(struct cred *new)
- kref_init(&ns->kref);
+ 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;
+@@ -843,6 +845,8 @@ static void *userns_get(struct task_stru
- for (n = 0; n < UIDHASH_SZ; ++n)
- INIT_HLIST_HEAD(ns->uidhash_table + n);
-@@ -81,6 +83,8 @@ void free_user_ns(struct kref *kref)
- struct user_namespace *ns =
- container_of(kref, struct user_namespace, kref);
-
+ static void userns_put(void *ns)
+ {
+ /* FIXME: maybe move into destroyer? */
+ atomic_dec(&vs_global_user_ns);
- INIT_WORK(&ns->destroyer, free_user_ns_work);
- schedule_work(&ns->destroyer);
+ put_user_ns(ns);
}
-diff -NurpP --minimal linux-3.0-rc5/kernel/utsname.c linux-3.0-rc5-vs2.3.1-pre3/kernel/utsname.c
---- linux-3.0-rc5/kernel/utsname.c 2011-07-01 11:14:23.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/utsname.c 2011-06-13 14:09:44.000000000 +0200
+
+diff -NurpP --minimal linux-3.10.53/kernel/utsname.c linux-3.10.53-vs2.3.6.8/kernel/utsname.c
+--- linux-3.10.53/kernel/utsname.c 2013-07-14 17:01:35.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/utsname.c 2013-08-22 21:03:08.000000000 +0000
@@ -16,14 +16,17 @@
#include <linux/slab.h>
#include <linux/user_namespace.h>
- #include <linux/proc_fs.h>
+ #include <linux/proc_ns.h>
+#include <linux/vserver/global.h>
static struct uts_namespace *create_uts_ns(void)
uts_ns = kmalloc(sizeof(struct uts_namespace), GFP_KERNEL);
- if (uts_ns)
+- kref_init(&uts_ns->kref);
+ if (uts_ns) {
- kref_init(&uts_ns->kref);
++ kref_init(&uts_ns->kref);
+ atomic_inc(&vs_global_uts_ns);
+ }
return uts_ns;
}
-@@ -32,8 +35,8 @@ static struct uts_namespace *create_uts_
- * @old_ns: namespace to clone
- * Return NULL on error (failure to kmalloc), new ns otherwise
- */
--static struct uts_namespace *clone_uts_ns(struct task_struct *tsk,
-- struct uts_namespace *old_ns)
-+static struct uts_namespace *clone_uts_ns(struct uts_namespace *old_ns,
-+ struct user_namespace *old_user)
- {
- struct uts_namespace *ns;
-
-@@ -43,7 +46,7 @@ static struct uts_namespace *clone_uts_n
-
- down_read(&uts_sem);
- memcpy(&ns->name, &old_ns->name, sizeof(ns->name));
-- ns->user_ns = get_user_ns(task_cred_xxx(tsk, user)->user_ns);
-+ ns->user_ns = get_user_ns(old_user);
- up_read(&uts_sem);
- return ns;
- }
-@@ -55,9 +58,9 @@ static struct uts_namespace *clone_uts_n
- * versa.
- */
- struct uts_namespace *copy_utsname(unsigned long flags,
-- struct task_struct *tsk)
-+ struct uts_namespace *old_ns,
-+ struct user_namespace *user_ns)
- {
-- struct uts_namespace *old_ns = tsk->nsproxy->uts_ns;
- struct uts_namespace *new_ns;
-
- BUG_ON(!old_ns);
-@@ -66,7 +69,7 @@ struct uts_namespace *copy_utsname(unsig
- if (!(flags & CLONE_NEWUTS))
- return old_ns;
-
-- new_ns = clone_uts_ns(tsk, old_ns);
-+ new_ns = clone_uts_ns(old_ns, user_ns);
-
- put_uts_ns(old_ns);
- return new_ns;
-@@ -78,6 +81,7 @@ void free_uts_ns(struct kref *kref)
-
+@@ -85,6 +88,7 @@ void free_uts_ns(struct kref *kref)
ns = container_of(kref, struct uts_namespace, kref);
put_user_ns(ns->user_ns);
+ proc_free_inum(ns->proc_inum);
+ atomic_dec(&vs_global_uts_ns);
kfree(ns);
}
-diff -NurpP --minimal linux-3.0-rc5/kernel/vserver/Kconfig linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/Kconfig
---- linux-3.0-rc5/kernel/vserver/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/Kconfig 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,228 @@
+diff -NurpP --minimal linux-3.10.53/kernel/vserver/Kconfig linux-3.10.53-vs2.3.6.8/kernel/vserver/Kconfig
+--- linux-3.10.53/kernel/vserver/Kconfig 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/vserver/Kconfig 2013-11-14 04:29:47.000000000 +0000
+@@ -0,0 +1,230 @@
+#
+# Linux VServer configuration
+#
+
+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,
+ 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
+ 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.
+ This allows you to specify the number of entries in
+ the per-CPU history buffer.
+
-+config VSERVER_LEGACY_MEM
-+ bool "Legacy Memory Limits"
++config VSERVER_EXTRA_MNT_CHECK
++ bool "Extra Checks for Reachability"
+ default n
+ help
-+ This provides fake memory limits to keep
-+ older tools happy in the face of memory
-+ cgroups
++ Set this to yes if you want to do extra checks for
++ vfsmount reachability in the proc filesystem code.
++ This shouldn't be required on any setup utilizing
++ mnt namespaces.
+
+choice
+ prompt "Quotes used in debug and warn messages"
+ select NAMESPACES
+ select UTS_NS
+ select IPC_NS
-+ select USER_NS
++# select USER_NS
+ select SYSVIPC
+
+config VSERVER_SECURITY
+ default y
+ select SECURITY_CAPABILITIES
+
-diff -NurpP --minimal linux-3.0-rc5/kernel/vserver/Makefile linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/Makefile
---- linux-3.0-rc5/kernel/vserver/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/Makefile 2011-06-10 22:11:24.000000000 +0200
++config VSERVER_DISABLED
++ bool
++ default n
++
+diff -NurpP --minimal linux-3.10.53/kernel/vserver/Makefile linux-3.10.53-vs2.3.6.8/kernel/vserver/Makefile
+--- linux-3.10.53/kernel/vserver/Makefile 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/vserver/Makefile 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,18 @@
+#
+# Makefile for the Linux vserver routines.
+vserver-$(CONFIG_VSERVER_MONITOR) += monitor.o
+vserver-$(CONFIG_VSERVER_DEVICE) += device.o
+
-diff -NurpP --minimal linux-3.0-rc5/kernel/vserver/cacct.c linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/cacct.c
---- linux-3.0-rc5/kernel/vserver/cacct.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/cacct.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/kernel/vserver/cacct.c linux-3.10.53-vs2.3.6.8/kernel/vserver/cacct.c
+--- linux-3.10.53/kernel/vserver/cacct.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/vserver/cacct.c 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,42 @@
+/*
+ * linux/kernel/vserver/cacct.c
+ return 0;
+}
+
-diff -NurpP --minimal linux-3.0-rc5/kernel/vserver/cacct_init.h linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/cacct_init.h
---- linux-3.0-rc5/kernel/vserver/cacct_init.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/cacct_init.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/kernel/vserver/cacct_init.h linux-3.10.53-vs2.3.6.8/kernel/vserver/cacct_init.h
+--- linux-3.10.53/kernel/vserver/cacct_init.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/vserver/cacct_init.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,25 @@
+
+
+ return;
+}
+
-diff -NurpP --minimal linux-3.0-rc5/kernel/vserver/cacct_proc.h linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/cacct_proc.h
---- linux-3.0-rc5/kernel/vserver/cacct_proc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/cacct_proc.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/kernel/vserver/cacct_proc.h linux-3.10.53-vs2.3.6.8/kernel/vserver/cacct_proc.h
+--- linux-3.10.53/kernel/vserver/cacct_proc.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/vserver/cacct_proc.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,53 @@
+#ifndef _VX_CACCT_PROC_H
+#define _VX_CACCT_PROC_H
+}
+
+#endif /* _VX_CACCT_PROC_H */
-diff -NurpP --minimal linux-3.0-rc5/kernel/vserver/context.c linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/context.c
---- linux-3.0-rc5/kernel/vserver/context.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/context.c 2011-06-16 14:16:51.000000000 +0200
-@@ -0,0 +1,1080 @@
+diff -NurpP --minimal linux-3.10.53/kernel/vserver/context.c linux-3.10.53-vs2.3.6.8/kernel/vserver/context.c
+--- linux-3.10.53/kernel/vserver/context.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/vserver/context.c 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,1119 @@
+/*
+ * linux/kernel/vserver/context.c
+ *
+ * Virtual Server: Context Support
+ *
-+ * Copyright (C) 2003-2010 Herbert Pötzl
++ * Copyright (C) 2003-2011 Herbert Pötzl
+ *
+ * V0.01 context helper
+ * V0.02 vx_ctx_kill syscall command
+ * V0.16 have __create claim() the vxi
+ * V0.17 removed older and legacy stuff
+ * V0.18 added user credentials
++ * V0.19 added warn mask
+ *
+ */
+
+ * 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;
+ }
+
+ new->vx_flags = VXF_INIT_SET;
-+ new->vx_bcaps = CAP_FULL_SET;
++ new->vx_bcaps = CAP_FULL_SET; // maybe ~CAP_SETPCAP
+ new->vx_ccaps = 0;
+ new->vx_umask = 0;
++ new->vx_wmask = 0;
+
+ new->reboot_cmd = 0;
+ new->exit_code = 0;
+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);
+}
+ * 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;
+
+ * verify that xid is still hashed */
+
-+int xid_is_hashed(xid_t xid)
++int xid_is_hashed(vxid_t xid)
+{
+ int hashed;
+
+ /* no rcu_read_lock() because of spin_lock() */
+ spin_lock(&files->file_lock);
+ fdt = files_fdtable(files);
-+ bptr = fdt->open_fds->fds_bits;
++ bptr = fdt->open_fds;
+ count = fdt->max_fds / (sizeof(unsigned long) * 8);
+ for (total = 0; count > 0; count--) {
+ if (*bptr)
+
+ ret = unshare_nsproxy_namespaces(
+ CLONE_NEWUTS | CLONE_NEWIPC | CLONE_NEWUSER,
-+ &new_nsp, NULL);
++ &new_nsp, NULL, NULL);
+ if (ret)
+ goto out;
+
+int vx_set_reaper(struct vx_info *vxi, struct task_struct *p)
+{
+ struct task_struct *old_reaper;
++ struct vx_info *reaper_vxi;
+
+ if (!vxi)
+ return -EINVAL;
+ if (old_reaper == p)
+ return 0;
+
++ reaper_vxi = task_get_vx_info(p);
++ if (reaper_vxi && reaper_vxi != vxi) {
++ vxwprintk(1,
++ "Unsuitable reaper [" VS_Q("%s") ",%u:#%u] "
++ "for [xid #%u]",
++ p->comm, p->pid, p->xid, vx_current_xid());
++ goto out;
++ }
++
+ /* set new child reaper */
+ get_task_struct(p);
+ vxi->vx_reaper = p;
+ put_task_struct(old_reaper);
++out:
++ put_vx_info(reaper_vxi);
+ return 0;
+}
+
+
+int vc_task_xid(uint32_t id)
+{
-+ xid_t xid;
++ vxid_t xid;
+
+ if (id) {
+ struct task_struct *tsk;
+}
+
+
++int vc_get_wmask(struct vx_info *vxi, void __user *data)
++{
++ struct vcmd_wmask vc_data;
++
++ vc_data.wmask = vxi->vx_wmask;
++ vc_data.mask = ~0ULL;
++
++ if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++ return -EFAULT;
++ return 0;
++}
++
++int vc_set_wmask(struct vx_info *vxi, void __user *data)
++{
++ struct vcmd_wmask vc_data;
++
++ if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++ return -EFAULT;
++
++ vxi->vx_wmask = vs_mask_flags(vxi->vx_wmask,
++ vc_data.wmask, vc_data.mask);
++ return 0;
++}
++
++
+int vc_get_badness(struct vx_info *vxi, void __user *data)
+{
+ struct vcmd_badness_v0 vc_data;
+
+EXPORT_SYMBOL_GPL(free_vx_info);
+
-diff -NurpP --minimal linux-3.0-rc5/kernel/vserver/cvirt.c linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/cvirt.c
---- linux-3.0-rc5/kernel/vserver/cvirt.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/cvirt.c 2011-06-13 14:57:26.000000000 +0200
-@@ -0,0 +1,303 @@
+diff -NurpP --minimal linux-3.10.53/kernel/vserver/cvirt.c linux-3.10.53-vs2.3.6.8/kernel/vserver/cvirt.c
+--- linux-3.10.53/kernel/vserver/cvirt.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/vserver/cvirt.c 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,313 @@
+/*
+ * linux/kernel/vserver/cvirt.c
+ *
+#include <asm/uaccess.h>
+
+
++void vx_vsi_boottime(struct timespec *boottime)
++{
++ struct vx_info *vxi = current_vx_info();
++
++ set_normalized_timespec(boottime,
++ boottime->tv_sec + vxi->cvirt.bias_uptime.tv_sec,
++ boottime->tv_nsec + vxi->cvirt.bias_uptime.tv_nsec);
++ return;
++}
++
+void vx_vsi_uptime(struct timespec *uptime, struct timespec *idle)
+{
+ struct vx_info *vxi = current_vx_info();
+
+#endif
+
-diff -NurpP --minimal linux-3.0-rc5/kernel/vserver/cvirt_init.h linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/cvirt_init.h
---- linux-3.0-rc5/kernel/vserver/cvirt_init.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/cvirt_init.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/kernel/vserver/cvirt_init.h linux-3.10.53-vs2.3.6.8/kernel/vserver/cvirt_init.h
+--- linux-3.10.53/kernel/vserver/cvirt_init.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/vserver/cvirt_init.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,70 @@
+
+
+ return;
+}
+
-diff -NurpP --minimal linux-3.0-rc5/kernel/vserver/cvirt_proc.h linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/cvirt_proc.h
---- linux-3.0-rc5/kernel/vserver/cvirt_proc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/cvirt_proc.h 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,135 @@
+diff -NurpP --minimal linux-3.10.53/kernel/vserver/cvirt_proc.h linux-3.10.53-vs2.3.6.8/kernel/vserver/cvirt_proc.h
+--- linux-3.10.53/kernel/vserver/cvirt_proc.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/vserver/cvirt_proc.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,123 @@
+#ifndef _VX_CVIRT_PROC_H
+#define _VX_CVIRT_PROC_H
+
+#include <linux/utsname.h>
+#include <linux/ipc.h>
+
++extern int vx_info_mnt_namespace(struct mnt_namespace *, char *);
+
+static inline
+int vx_info_proc_nsproxy(struct nsproxy *nsproxy, char *buffer)
+ struct mnt_namespace *ns;
+ struct uts_namespace *uts;
+ struct ipc_namespace *ipc;
-+ struct path path;
-+ char *pstr, *root;
+ int length = 0;
+
+ if (!nsproxy)
+ if (!ns)
+ goto skip_ns;
+
-+ pstr = kmalloc(PATH_MAX, GFP_KERNEL);
-+ if (!pstr)
-+ goto skip_ns;
++ length += vx_info_mnt_namespace(ns, buffer + length);
+
-+ path.mnt = ns->root;
-+ path.dentry = ns->root->mnt_root;
-+ root = d_path(&path, pstr, PATH_MAX - 2);
-+ length += sprintf(buffer + length,
-+ "Namespace:\t%p [#%u]\n"
-+ "RootPath:\t%s\n",
-+ ns, atomic_read(&ns->count),
-+ root);
-+ kfree(pstr);
+skip_ns:
+
+ uts = nsproxy->uts_ns;
+ length += sprintf(buffer + length,
+ "SEMS:\t\t%d %d %d %d %d\n"
+ "MSG:\t\t%d %d %d\n"
-+ "SHM:\t\t%lu %lu %d %d\n",
++ "SHM:\t\t%lu %lu %d %ld\n",
+ ipc->sem_ctls[0], ipc->sem_ctls[1],
+ ipc->sem_ctls[2], ipc->sem_ctls[3],
+ ipc->used_sems,
+}
+
+#endif /* _VX_CVIRT_PROC_H */
-diff -NurpP --minimal linux-3.0-rc5/kernel/vserver/debug.c linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/debug.c
---- linux-3.0-rc5/kernel/vserver/debug.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/debug.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/kernel/vserver/debug.c linux-3.10.53-vs2.3.6.8/kernel/vserver/debug.c
+--- linux-3.10.53/kernel/vserver/debug.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/vserver/debug.c 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,32 @@
+/*
+ * kernel/vserver/debug.c
+
+EXPORT_SYMBOL_GPL(dump_vx_info);
+
-diff -NurpP --minimal linux-3.0-rc5/kernel/vserver/device.c linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/device.c
---- linux-3.0-rc5/kernel/vserver/device.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/device.c 2011-06-10 23:20:56.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/kernel/vserver/device.c linux-3.10.53-vs2.3.6.8/kernel/vserver/device.c
+--- linux-3.10.53/kernel/vserver/device.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/vserver/device.c 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,443 @@
+/*
+ * linux/kernel/vserver/device.c
+ } 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;
+};
+ *
+ * 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;
+ 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);
+#endif /* CONFIG_COMPAT */
+
+
-diff -NurpP --minimal linux-3.0-rc5/kernel/vserver/dlimit.c linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/dlimit.c
---- linux-3.0-rc5/kernel/vserver/dlimit.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/dlimit.c 2011-06-10 23:20:56.000000000 +0200
-@@ -0,0 +1,531 @@
+diff -NurpP --minimal linux-3.10.53/kernel/vserver/dlimit.c linux-3.10.53-vs2.3.6.8/kernel/vserver/dlimit.c
+--- linux-3.10.53/kernel/vserver/dlimit.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/vserver/dlimit.c 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,528 @@
+/*
+ * linux/kernel/vserver/dlimit.c
+ *
+ * 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;
+
+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);
+}
+ * 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 hlist_node *pos;
+ struct dl_info *dli;
+
-+ hlist_for_each_entry_rcu(dli, pos, head, dl_hlist) {
-+
-+ if (dli->dl_tag == tag && dli->dl_sb == sb) {
++ hlist_for_each_entry_rcu(dli, head, dl_hlist) {
++ if (dli->dl_tag == tag && dli->dl_sb == sb)
+ return dli;
-+ }
+ }
+ return NULL;
+}
+
+
-+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;
+
+EXPORT_SYMBOL_GPL(locate_dl_info);
+EXPORT_SYMBOL_GPL(rcu_free_dl_info);
+
-diff -NurpP --minimal linux-3.0-rc5/kernel/vserver/helper.c linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/helper.c
---- linux-3.0-rc5/kernel/vserver/helper.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/helper.c 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,223 @@
+diff -NurpP --minimal linux-3.10.53/kernel/vserver/helper.c linux-3.10.53-vs2.3.6.8/kernel/vserver/helper.c
+--- linux-3.10.53/kernel/vserver/helper.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/vserver/helper.c 2013-08-23 00:55:48.000000000 +0000
+@@ -0,0 +1,242 @@
+/*
+ * linux/kernel/vserver/helper.c
+ *
+
+char vshelper_path[255] = "/sbin/vshelper";
+
++static int vshelper_init(struct subprocess_info *info, struct cred *new_cred)
++{
++ 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(name, argv, envp, sync))) {
-+ printk( KERN_WARNING
-+ "%s: (%s %s) returned %s with %d\n",
++ 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);
+ }
+ return -EAGAIN;
+ vxi->vx_state |= VXS_HELPER;
+
-+ snprintf(id_buf, sizeof(id_buf)-1, "%d", vxi->vx_id);
++ snprintf(id_buf, sizeof(id_buf), "%d", vxi->vx_id);
+
-+ snprintf(cmd_buf, sizeof(cmd_buf)-1, "VS_CMD=%08x", cmd);
-+ snprintf(uid_buf, sizeof(uid_buf)-1, "VS_UID=%d", current_uid());
-+ snprintf(pid_buf, sizeof(pid_buf)-1, "VS_PID=%d", current->pid);
++ snprintf(cmd_buf, sizeof(cmd_buf), "VS_CMD=%08x", cmd);
++ 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) {
+ case LINUX_REBOOT_CMD_RESTART:
+ if (!vx_info_flags(vxi, VXF_SC_HELPER, 0))
+ return 0;
+
-+ snprintf(id_buf, sizeof(id_buf)-1, "%d", vxi->vx_id);
-+ snprintf(cmd_buf, sizeof(cmd_buf)-1, "VS_CMD=%08x", cmd);
++ snprintf(id_buf, sizeof(id_buf), "%d", vxi->vx_id);
++ snprintf(cmd_buf, sizeof(cmd_buf), "VS_CMD=%08x", cmd);
+
+ switch (cmd) {
+ case VSC_STARTUP:
+ if (!nx_info_flags(nxi, NXF_SC_HELPER, 0))
+ return 0;
+
-+ snprintf(id_buf, sizeof(id_buf)-1, "%d", nxi->nx_id);
-+ snprintf(cmd_buf, sizeof(cmd_buf)-1, "VS_CMD=%08x", cmd);
++ snprintf(id_buf, sizeof(id_buf), "%d", nxi->nx_id);
++ snprintf(cmd_buf, sizeof(cmd_buf), "VS_CMD=%08x", cmd);
+
+ switch (cmd) {
+ case VSC_NETUP:
+ return do_vshelper(vshelper_path, argv, envp, 1);
+}
+
-diff -NurpP --minimal linux-3.0-rc5/kernel/vserver/history.c linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/history.c
---- linux-3.0-rc5/kernel/vserver/history.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/history.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/kernel/vserver/history.c linux-3.10.53-vs2.3.6.8/kernel/vserver/history.c
+--- linux-3.10.53/kernel/vserver/history.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/vserver/history.c 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,258 @@
+/*
+ * kernel/vserver/history.c
+
+#endif /* CONFIG_COMPAT */
+
-diff -NurpP --minimal linux-3.0-rc5/kernel/vserver/inet.c linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/inet.c
---- linux-3.0-rc5/kernel/vserver/inet.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/inet.c 2011-06-13 18:20:44.000000000 +0200
-@@ -0,0 +1,225 @@
+diff -NurpP --minimal linux-3.10.53/kernel/vserver/inet.c linux-3.10.53-vs2.3.6.8/kernel/vserver/inet.c
+--- linux-3.10.53/kernel/vserver/inet.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/vserver/inet.c 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,236 @@
+
+#include <linux/in.h>
+#include <linux/inetdevice.h>
++#include <linux/export.h>
+#include <linux/vs_inet.h>
+#include <linux/vs_inet6.h>
+#include <linux/vserver/debug.h>
+ ret = 1;
+ else {
+ struct nx_addr_v4 *ptr;
++ unsigned long irqflags;
+
++ spin_lock_irqsave(&nxi1->addr_lock, irqflags);
+ for (ptr = &nxi1->v4; ptr; ptr = ptr->next) {
+ if (v4_nx_addr_in_nx_info(nxi2, ptr, -1)) {
+ ret = 1;
+ break;
+ }
+ }
++ spin_unlock_irqrestore(&nxi1->addr_lock, irqflags);
+ }
+
+ vxdprintk(VXD_CBIT(net, 2),
+ ret = 1;
+ else {
+ struct nx_addr_v6 *ptr;
++ unsigned long irqflags;
+
++ spin_lock_irqsave(&nxi1->addr_lock, irqflags);
+ for (ptr = &nxi1->v6; ptr; ptr = ptr->next) {
+ if (v6_nx_addr_in_nx_info(nxi2, ptr, -1)) {
+ ret = 1;
+ break;
+ }
+ }
++ spin_unlock_irqrestore(&nxi1->addr_lock, irqflags);
+ }
+
+ vxdprintk(VXD_CBIT(net, 2),
+
+ /* FIXME: handle lback only case */
+ if (!NX_IPV4(nxi))
-+ return ERR_PTR(EPERM);
++ return ERR_PTR(-EPERM);
+
+ vxdprintk(VXD_CBIT(net, 4),
+ "ip_v4_find_src(%p[#%u]) " NIPQUAD_FMT " -> " NIPQUAD_FMT,
+ goto found;
+ }
+
++ WARN_ON_ONCE(in_irq());
++ spin_lock_bh(&nxi->addr_lock);
+ for (ptr = &nxi->v4; ptr; ptr = ptr->next) {
+ __be32 primary = ptr->ip[0].s_addr;
+ __be32 mask = ptr->mask.s_addr;
+ found = fl4->saddr;
+ ip_rt_put(rt);
+ if (found == primary)
-+ goto found;
++ goto found_unlock;
+ }
+ }
+ /* still no source ip? */
+ found = ipv4_is_loopback(fl4->daddr)
+ ? IPI_LOOPBACK : nxi->v4.ip[0].s_addr;
++ found_unlock:
++ spin_unlock_bh(&nxi->addr_lock);
+ found:
+ /* assign src ip to flow */
+ fl4->saddr = found;
+
+ } else {
+ if (!v4_addr_in_nx_info(nxi, fl4->saddr, NXA_MASK_BIND))
-+ return ERR_PTR(EPERM);
++ return ERR_PTR(-EPERM);
+ }
+
+ if (nx_info_flags(nxi, NXF_LBACK_REMAP, 0)) {
+ fl4->saddr = nxi->v4_lback.s_addr;
+ } else if (ipv4_is_loopback(fl4->daddr) &&
+ !nx_info_flags(nxi, NXF_LBACK_ALLOW, 0))
-+ return ERR_PTR(EPERM);
++ return ERR_PTR(-EPERM);
+
+ return NULL;
+}
+
+EXPORT_SYMBOL_GPL(ip_v4_find_src);
+
-diff -NurpP --minimal linux-3.0-rc5/kernel/vserver/init.c linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/init.c
---- linux-3.0-rc5/kernel/vserver/init.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/init.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/kernel/vserver/init.c linux-3.10.53-vs2.3.6.8/kernel/vserver/init.c
+--- linux-3.10.53/kernel/vserver/init.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/vserver/init.c 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,45 @@
+/*
+ * linux/kernel/init.c
+module_init(init_vserver);
+module_exit(exit_vserver);
+
-diff -NurpP --minimal linux-3.0-rc5/kernel/vserver/inode.c linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/inode.c
---- linux-3.0-rc5/kernel/vserver/inode.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/inode.c 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,437 @@
+diff -NurpP --minimal linux-3.10.53/kernel/vserver/inode.c linux-3.10.53-vs2.3.6.8/kernel/vserver/inode.c
+--- linux-3.10.53/kernel/vserver/inode.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/vserver/inode.c 2013-08-22 23:14:01.000000000 +0000
+@@ -0,0 +1,440 @@
+/*
+ * linux/kernel/vserver/inode.c
+ *
+#include <linux/mount.h>
+#include <linux/parser.h>
+#include <linux/namei.h>
++#include <linux/magic.h>
++#include <linux/slab.h>
+#include <linux/vserver/inode.h>
+#include <linux/vserver/inode_cmd.h>
+#include <linux/vs_base.h>
+#include <linux/vs_tag.h>
+
+#include <asm/uaccess.h>
++#include <../../fs/proc/internal.h>
+
+
+static int __vc_get_iattr(struct inode *in, uint32_t *tag, uint32_t *flags, uint32_t *mask)
+ *mask |= IATTR_BARRIER;
+
+ if (IS_TAGGED(in)) {
-+ *tag = in->i_tag;
++ *tag = i_tag_read(in);
+ *mask |= IATTR_TAG;
+ }
+
+ break;
+
+ case DEVPTS_SUPER_MAGIC:
-+ *tag = in->i_tag;
++ *tag = i_tag_read(in);
+ *mask |= IATTR_TAG;
+ break;
+
+
+ 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;
+ }
+
+ }
+}
+
-+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;
+ substring_t args[MAX_OPT_ARGS];
+ int token;
+ char *s, *p, *opts;
-+#if defined(CONFIG_PROPAGATE) || defined(CONFIG_VSERVER_WARN)
++#if defined(CONFIG_PROPAGATE) || defined(CONFIG_VSERVER_DEBUG)
+ int option = 0;
+#endif
+
+ *mnt_flags |= MNT_TAGID;
+ set |= MNT_TAGID;
+ break;
-+#endif
++#endif /* CONFIG_PROPAGATE */
+ case Opt_notagcheck:
+ if (remove)
+ __dx_parse_remove(s, "notagcheck");
+
+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;
+
+ new_tag, (propagate) ? 1 : 0);
+
+ if (propagate)
-+ inode->i_tag = new_tag;
++ i_tag_write(inode, new_tag);
+}
+
+#include <linux/module.h>
+
+#endif /* CONFIG_PROPAGATE */
+
-diff -NurpP --minimal linux-3.0-rc5/kernel/vserver/limit.c linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/limit.c
---- linux-3.0-rc5/kernel/vserver/limit.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/limit.c 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,354 @@
+diff -NurpP --minimal linux-3.10.53/kernel/vserver/limit.c linux-3.10.53-vs2.3.6.8/kernel/vserver/limit.c
+--- linux-3.10.53/kernel/vserver/limit.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/vserver/limit.c 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,345 @@
+/*
+ * linux/kernel/vserver/limit.c
+ *
+
+
+const char *vlimit_name[NUM_LIMITS] = {
-+#ifdef CONFIG_VSERVER_LEGACY_MEM
-+ [RLIMIT_RSS] = "RSS",
-+ [RLIMIT_AS] = "VM",
-+#endif /* CONFIG_VSERVER_LEGACY_MEM */
+ [RLIMIT_CPU] = "CPU",
+ [RLIMIT_NPROC] = "NPROC",
+ [RLIMIT_NOFILE] = "NOFILE",
+ /* minimum */
+ 0
+ , /* softlimit */
-+#ifdef CONFIG_VSERVER_LEGACY_MEM
-+ MASK_ENTRY( RLIMIT_RSS ) |
-+#endif /* CONFIG_VSERVER_LEGACY_MEM */
+ 0
+ , /* maximum */
-+#ifdef CONFIG_VSERVER_LEGACY_MEM
-+ MASK_ENTRY( RLIMIT_RSS ) |
-+ MASK_ENTRY( RLIMIT_AS ) |
-+#endif /* CONFIG_VSERVER_LEGACY_MEM */
+ MASK_ENTRY( RLIMIT_NPROC ) |
+ MASK_ENTRY( RLIMIT_NOFILE ) |
+ MASK_ENTRY( RLIMIT_LOCKS ) |
+
+void vx_vsi_meminfo(struct sysinfo *val)
+{
-+#ifdef CONFIG_CGROUP_MEM_RES_CTLR
-+ struct mem_cgroup *mcg = mem_cgroup_from_task(current);
++#ifdef CONFIG_MEMCG
++ struct mem_cgroup *mcg;
+ u64 res_limit, res_usage;
+
++ rcu_read_lock();
++ mcg = mem_cgroup_from_task(current);
++ rcu_read_unlock();
+ if (!mcg)
-+ return;
++ goto out;
+
+ res_limit = mem_cgroup_res_read_u64(mcg, RES_LIMIT);
+ res_usage = mem_cgroup_res_read_u64(mcg, RES_USAGE);
+ val->bufferram = 0;
+ val->totalhigh = 0;
+ val->freehigh = 0;
-+#endif /* CONFIG_CGROUP_MEM_RES_CTLR */
++out:
++#endif /* CONFIG_MEMCG */
+ return;
+}
+
+void vx_vsi_swapinfo(struct sysinfo *val)
+{
-+#ifdef CONFIG_CGROUP_MEM_RES_CTLR
-+#ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP
-+ struct mem_cgroup *mcg = mem_cgroup_from_task(current);
++#ifdef CONFIG_MEMCG
++#ifdef CONFIG_MEMCG_SWAP
++ struct mem_cgroup *mcg;
+ u64 res_limit, res_usage, memsw_limit, memsw_usage;
+ s64 swap_limit, swap_usage;
+
++ rcu_read_lock();
++ mcg = mem_cgroup_from_task(current);
++ rcu_read_unlock();
+ if (!mcg)
-+ return;
++ goto out;
+
+ res_limit = mem_cgroup_res_read_u64(mcg, RES_LIMIT);
+ res_usage = mem_cgroup_res_read_u64(mcg, RES_USAGE);
+ memsw_limit = mem_cgroup_memsw_read_u64(mcg, RES_LIMIT);
+ memsw_usage = mem_cgroup_memsw_read_u64(mcg, RES_USAGE);
+
++ /* memory unlimited */
+ if (res_limit == RESOURCE_MAX)
-+ return;
++ goto out;
+
+ swap_limit = memsw_limit - res_limit;
++ /* we have a swap limit? */
+ if (memsw_limit != RESOURCE_MAX)
+ val->totalswap = swap_limit >> PAGE_SHIFT;
+
-+ swap_usage = memsw_usage - res_usage;
++ /* calculate swap part */
++ swap_usage = (memsw_usage > res_usage) ?
++ memsw_usage - res_usage : 0;
++
++ /* total shown minus usage gives free swap */
+ val->freeswap = (swap_usage < swap_limit) ?
+ val->totalswap - (swap_usage >> PAGE_SHIFT) : 0;
-+#else /* !CONFIG_CGROUP_MEM_RES_CTLR_SWAP */
++out:
++#else /* !CONFIG_MEMCG_SWAP */
+ val->totalswap = 0;
+ val->freeswap = 0;
-+#endif /* !CONFIG_CGROUP_MEM_RES_CTLR_SWAP */
-+#endif /* CONFIG_CGROUP_MEM_RES_CTLR */
++#endif /* !CONFIG_MEMCG_SWAP */
++#endif /* CONFIG_MEMCG */
+ return;
+}
+
+long vx_vsi_cached(struct sysinfo *val)
+{
-+#ifdef CONFIG_CGROUP_MEM_RES_CTLR
-+ struct mem_cgroup *mcg = mem_cgroup_from_task(current);
-+
-+ return mem_cgroup_stat_read_cache(mcg);
-+#else
-+ return 0;
-+#endif
-+}
-+
-+
-+unsigned long vx_badness(struct task_struct *task, struct mm_struct *mm)
-+{
-+ struct vx_info *vxi = mm->mm_vx_info;
-+ unsigned long points;
-+ rlim_t v, w;
-+
-+ if (!vxi)
-+ return 0;
++ long cache = 0;
++#ifdef CONFIG_MEMCG
++ struct mem_cgroup *mcg;
+
-+ points = vxi->vx_badness_bias;
-+
-+ v = __vx_cres_array_fixup(&vxi->limit, VLA_RSS);
-+ w = __rlim_soft(&vxi->limit, RLIMIT_RSS);
-+ points += (v > w) ? (v - w) : 0;
++ rcu_read_lock();
++ mcg = mem_cgroup_from_task(current);
++ rcu_read_unlock();
++ if (!mcg)
++ goto out;
+
-+ return points;
++ cache = mem_cgroup_stat_read_cache(mcg);
++out:
++#endif
++ return cache;
+}
+
-diff -NurpP --minimal linux-3.0-rc5/kernel/vserver/limit_init.h linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/limit_init.h
---- linux-3.0-rc5/kernel/vserver/limit_init.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/limit_init.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/kernel/vserver/limit_init.h linux-3.10.53-vs2.3.6.8/kernel/vserver/limit_init.h
+--- linux-3.10.53/kernel/vserver/limit_init.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/vserver/limit_init.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,31 @@
+
+
+ }
+}
+
-diff -NurpP --minimal linux-3.0-rc5/kernel/vserver/limit_proc.h linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/limit_proc.h
---- linux-3.0-rc5/kernel/vserver/limit_proc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/limit_proc.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/kernel/vserver/limit_proc.h linux-3.10.53-vs2.3.6.8/kernel/vserver/limit_proc.h
+--- linux-3.10.53/kernel/vserver/limit_proc.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/vserver/limit_proc.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,57 @@
+#ifndef _VX_LIMIT_PROC_H
+#define _VX_LIMIT_PROC_H
+#endif /* _VX_LIMIT_PROC_H */
+
+
-diff -NurpP --minimal linux-3.0-rc5/kernel/vserver/network.c linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/network.c
---- linux-3.0-rc5/kernel/vserver/network.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/network.c 2011-06-10 23:20:56.000000000 +0200
-@@ -0,0 +1,912 @@
+diff -NurpP --minimal linux-3.10.53/kernel/vserver/network.c linux-3.10.53-vs2.3.6.8/kernel/vserver/network.c
+--- linux-3.10.53/kernel/vserver/network.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/vserver/network.c 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,1053 @@
+/*
+ * linux/kernel/vserver/network.c
+ *
+#include <linux/err.h>
+#include <linux/slab.h>
+#include <linux/rcupdate.h>
++#include <net/ipv6.h>
+
+#include <linux/vs_network.h>
+#include <linux/vs_pid.h>
+ * 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;
+
+ INIT_HLIST_NODE(&new->nx_hlist);
+ atomic_set(&new->nx_usecnt, 0);
+ atomic_set(&new->nx_tasks, 0);
++ spin_lock_init(&new->addr_lock);
+ new->nx_state = 0;
+
+ new->nx_flags = NXF_INIT_SET;
+ BUG_ON(atomic_read(&nxi->nx_tasks));
+
+ __dealloc_nx_addr_v4_all(nxi->v4.next);
++#ifdef CONFIG_IPV6
++ __dealloc_nx_addr_v6_all(nxi->v6.next);
++#endif
+
+ nxi->nx_state |= NXS_RELEASED;
+ kfree(nxi);
+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);
+}
+ * 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;
+
+ * verify that nid is still hashed */
+
-+int nid_is_hashed(nid_t nid)
++int nid_is_hashed(vnid_t nid)
+{
+ int hashed;
+
+
+int vc_task_nid(uint32_t id)
+{
-+ nid_t nid;
++ vnid_t nid;
+
+ if (id) {
+ struct task_struct *tsk;
+}
+
+
++static inline
++struct nx_addr_v4 *__find_v4_addr(struct nx_info *nxi,
++ __be32 ip, __be32 ip2, __be32 mask, uint16_t type, uint16_t flags,
++ struct nx_addr_v4 **prev)
++{
++ struct nx_addr_v4 *nxa = &nxi->v4;
++
++ for (; nxa; nxa = nxa->next) {
++ if ((nxa->ip[0].s_addr == ip) &&
++ (nxa->ip[1].s_addr == ip2) &&
++ (nxa->mask.s_addr == mask) &&
++ (nxa->type == type) &&
++ (nxa->flags == flags))
++ return nxa;
++
++ /* save previous entry */
++ if (prev)
++ *prev = nxa;
++ }
++ return NULL;
++}
+
+int do_add_v4_addr(struct nx_info *nxi, __be32 ip, __be32 ip2, __be32 mask,
+ uint16_t type, uint16_t flags)
+{
-+ struct nx_addr_v4 *nxa = &nxi->v4;
++ struct nx_addr_v4 *nxa = NULL;
++ struct nx_addr_v4 *new = __alloc_nx_addr_v4();
++ unsigned long irqflags;
++ int ret = -EEXIST;
+
-+ if (NX_IPV4(nxi)) {
-+ /* locate last entry */
-+ for (; nxa->next; nxa = nxa->next);
-+ nxa->next = __alloc_nx_addr_v4();
-+ nxa = nxa->next;
++ if (IS_ERR(new))
++ return PTR_ERR(new);
+
-+ if (IS_ERR(nxa))
-+ return PTR_ERR(nxa);
-+ }
++ spin_lock_irqsave(&nxi->addr_lock, irqflags);
++ if (__find_v4_addr(nxi, ip, ip2, mask, type, flags, &nxa))
++ goto out_unlock;
++
++ if (NX_IPV4(nxi)) {
++ nxa->next = new;
++ nxa = new;
++ new = NULL;
+
-+ if (nxi->v4.next)
+ /* remove single ip for ip list */
+ nxi->nx_flags &= ~NXF_SINGLE_IP;
++ }
+
+ nxa->ip[0].s_addr = ip;
+ nxa->ip[1].s_addr = ip2;
+ nxa->mask.s_addr = mask;
+ nxa->type = type;
+ nxa->flags = flags;
-+ return 0;
++ ret = 0;
++out_unlock:
++ spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
++ if (new)
++ __dealloc_nx_addr_v4(new);
++ return ret;
+}
+
+int do_remove_v4_addr(struct nx_info *nxi, __be32 ip, __be32 ip2, __be32 mask,
+ uint16_t type, uint16_t flags)
+{
-+ struct nx_addr_v4 *nxa = &nxi->v4;
++ struct nx_addr_v4 *nxa = NULL;
++ struct nx_addr_v4 *old = NULL;
++ unsigned long irqflags;
++ int ret = 0;
+
++ spin_lock_irqsave(&nxi->addr_lock, irqflags);
+ switch (type) {
-+/* case NXA_TYPE_ADDR:
-+ break; */
++ case NXA_TYPE_ADDR:
++ old = __find_v4_addr(nxi, ip, ip2, mask, type, flags, &nxa);
++ if (old) {
++ if (nxa) {
++ nxa->next = old->next;
++ old->next = NULL;
++ } else {
++ if (old->next) {
++ nxa = old;
++ old = old->next;
++ *nxa = *old;
++ old->next = NULL;
++ } else {
++ memset(old, 0, sizeof(*old));
++ old = NULL;
++ }
++ }
++ } else
++ ret = -ESRCH;
++ break;
+
+ case NXA_TYPE_ANY:
-+ __dealloc_nx_addr_v4_all(xchg(&nxa->next, NULL));
++ nxa = &nxi->v4;
++ old = nxa->next;
+ memset(nxa, 0, sizeof(*nxa));
+ break;
+
+ default:
-+ return -EINVAL;
++ ret = -EINVAL;
+ }
-+ return 0;
++ spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
++ __dealloc_nx_addr_v4_all(old);
++ return ret;
+}
+
+
+
+ switch (vc_data.type) {
+ case NXA_TYPE_ANY:
-+ __dealloc_nx_addr_v4_all(xchg(&nxi->v4.next, NULL));
-+ memset(&nxi->v4, 0, sizeof(nxi->v4));
-+ break;
-+
++ return do_remove_v4_addr(nxi, 0, 0, 0, vc_data.type, 0);
+ default:
+ return -EINVAL;
+ }
+
+#ifdef CONFIG_IPV6
+
++static inline
++struct nx_addr_v6 *__find_v6_addr(struct nx_info *nxi,
++ struct in6_addr *ip, struct in6_addr *mask,
++ uint32_t prefix, uint16_t type, uint16_t flags,
++ struct nx_addr_v6 **prev)
++{
++ struct nx_addr_v6 *nxa = &nxi->v6;
++
++ for (; nxa; nxa = nxa->next) {
++ if (ipv6_addr_equal(&nxa->ip, ip) &&
++ ipv6_addr_equal(&nxa->mask, mask) &&
++ (nxa->prefix == prefix) &&
++ (nxa->type == type) &&
++ (nxa->flags == flags))
++ return nxa;
++
++ /* save previous entry */
++ if (prev)
++ *prev = nxa;
++ }
++ return NULL;
++}
++
++
+int do_add_v6_addr(struct nx_info *nxi,
+ struct in6_addr *ip, struct in6_addr *mask,
+ uint32_t prefix, uint16_t type, uint16_t flags)
+{
-+ struct nx_addr_v6 *nxa = &nxi->v6;
++ struct nx_addr_v6 *nxa = NULL;
++ struct nx_addr_v6 *new = __alloc_nx_addr_v6();
++ unsigned long irqflags;
++ int ret = -EEXIST;
+
-+ if (NX_IPV6(nxi)) {
-+ /* locate last entry */
-+ for (; nxa->next; nxa = nxa->next);
-+ nxa->next = __alloc_nx_addr_v6();
-+ nxa = nxa->next;
++ if (IS_ERR(new))
++ return PTR_ERR(new);
++
++ spin_lock_irqsave(&nxi->addr_lock, irqflags);
++ if (__find_v6_addr(nxi, ip, mask, prefix, type, flags, &nxa))
++ goto out_unlock;
+
-+ if (IS_ERR(nxa))
-+ return PTR_ERR(nxa);
++ if (NX_IPV6(nxi)) {
++ nxa->next = new;
++ nxa = new;
++ new = NULL;
+ }
+
+ nxa->ip = *ip;
+ nxa->prefix = prefix;
+ nxa->type = type;
+ nxa->flags = flags;
-+ return 0;
++ ret = 0;
++out_unlock:
++ spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
++ if (new)
++ __dealloc_nx_addr_v6(new);
++ return ret;
+}
+
++int do_remove_v6_addr(struct nx_info *nxi,
++ struct in6_addr *ip, struct in6_addr *mask,
++ uint32_t prefix, uint16_t type, uint16_t flags)
++{
++ struct nx_addr_v6 *nxa = NULL;
++ struct nx_addr_v6 *old = NULL;
++ unsigned long irqflags;
++ int ret = 0;
++
++ spin_lock_irqsave(&nxi->addr_lock, irqflags);
++ switch (type) {
++ case NXA_TYPE_ADDR:
++ old = __find_v6_addr(nxi, ip, mask, prefix, type, flags, &nxa);
++ if (old) {
++ if (nxa) {
++ nxa->next = old->next;
++ old->next = NULL;
++ } else {
++ if (old->next) {
++ nxa = old;
++ old = old->next;
++ *nxa = *old;
++ old->next = NULL;
++ } else {
++ memset(old, 0, sizeof(*old));
++ old = NULL;
++ }
++ }
++ } else
++ ret = -ESRCH;
++ break;
++
++ case NXA_TYPE_ANY:
++ nxa = &nxi->v6;
++ old = nxa->next;
++ memset(nxa, 0, sizeof(*nxa));
++ break;
++
++ default:
++ ret = -EINVAL;
++ }
++ spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
++ __dealloc_nx_addr_v6_all(old);
++ return ret;
++}
+
+int vc_net_add_ipv6(struct nx_info *nxi, void __user *data)
+{
+ return -EFAULT;
+
+ switch (vc_data.type) {
++ case NXA_TYPE_ADDR:
++ memset(&vc_data.mask, ~0, sizeof(vc_data.mask));
++ /* fallthrough */
++ case NXA_TYPE_MASK:
++ return do_remove_v6_addr(nxi, &vc_data.ip, &vc_data.mask,
++ vc_data.prefix, vc_data.type, vc_data.flags);
+ case NXA_TYPE_ANY:
-+ __dealloc_nx_addr_v6_all(xchg(&nxi->v6.next, NULL));
-+ memset(&nxi->v6, 0, sizeof(nxi->v6));
-+ break;
-+
++ return do_remove_v6_addr(nxi, NULL, NULL, 0, vc_data.type, 0);
+ default:
+ return -EINVAL;
+ }
+EXPORT_SYMBOL_GPL(free_nx_info);
+EXPORT_SYMBOL_GPL(unhash_nx_info);
+
-diff -NurpP --minimal linux-3.0-rc5/kernel/vserver/proc.c linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/proc.c
---- linux-3.0-rc5/kernel/vserver/proc.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/proc.c 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,1100 @@
+diff -NurpP --minimal linux-3.10.53/kernel/vserver/proc.c linux-3.10.53-vs2.3.6.8/kernel/vserver/proc.c
+--- linux-3.10.53/kernel/vserver/proc.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/vserver/proc.c 2013-08-22 23:31:37.000000000 +0000
+@@ -0,0 +1,1113 @@
+/*
+ * linux/kernel/vserver/proc.c
+ *
+ * Virtual Context Support
+ *
-+ * Copyright (C) 2003-2007 Herbert Pötzl
++ * Copyright (C) 2003-2011 Herbert Pötzl
+ *
+ * V0.01 basic structure
+ * V0.02 adaptation vs1.3.0
+ * V0.06 inode validation
+ * V0.07 generic rewrite vid
+ * V0.08 remove inode type
++ * V0.09 added u/wmask info
+ *
+ */
+
+#include <linux/proc_fs.h>
+#include <linux/fs_struct.h>
+#include <linux/mount.h>
++#include <linux/namei.h>
+#include <asm/unistd.h>
+
+#include <linux/vs_context.h>
+#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)
+{
+ buffer += sprintf(buffer,
+ "CCaps:\t%016llx\n"
+ "Umask:\t%16llx\n"
++ "Wmask:\t%16llx\n"
+ "Spaces:\t%08lx %08lx\n",
+ (unsigned long long)vxi->vx_ccaps,
+ (unsigned long long)vxi->vx_umask,
++ (unsigned long long)vxi->vx_wmask,
+ vxi->space[0].vx_nsmask, vxi->space[1].vx_nsmask);
+ return buffer - orig;
+}
+ if (p->fop)
+ inode->i_fop = p->fop;
+
-+ inode->i_nlink = (p->mode & S_IFDIR) ? 2 : 1;
++ set_nlink(inode, (p->mode & S_IFDIR) ? 2 : 1);
+ inode->i_flags |= S_IMMUTABLE;
+
+ 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;
+}
+
+/* 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.
+ * reported by readdir 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, void *dirent, filldir_t filldir,
++ char *name, int len, vx_instantiate_t instantiate, int id, void *ptr)
+{
+ struct dentry *child, *dir = filp->f_dentry;
+ struct inode *inode;
+ return lookup_vx_info(PROC_I(inode)->fd);
+}
+
-+static int proc_xid_revalidate(struct dentry *dentry, struct nameidata *nd)
++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;
+
+ if (!xid || xid_is_hashed(xid))
+ return 1;
+
+/* get and revalidate nx_info/nid */
+
-+static int proc_nid_revalidate(struct dentry *dentry, struct nameidata *nd)
++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;
+
+ if (!nid || nid_is_hashed(nid))
+ return 1;
+{
+ 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;
+
+{
+ 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;
+
+}
+
+static struct dentry *proc_xid_lookup(struct inode *dir,
-+ struct dentry *dentry, struct nameidata *nd)
++ struct dentry *dentry, unsigned int flags)
+{
+ struct vs_entry *p = vx_base_stuff;
+ struct dentry *error = ERR_PTR(-ENOENT);
+ 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, dirent, filldir, p->name, p->len,
+ vs_proc_instantiate, PROC_I(inode)->fd, p))
+ goto out;
+ pos++;
+}
+
+static struct dentry *proc_nid_lookup(struct inode *dir,
-+ struct dentry *dentry, struct nameidata *nd)
++ struct dentry *dentry, unsigned int flags)
+{
+ struct vs_entry *p = nx_base_stuff;
+ struct dentry *error = ERR_PTR(-ENOENT);
+ 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, dirent, filldir, p->name, p->len,
+ vs_proc_instantiate, PROC_I(inode)->fd, p))
+ goto out;
+ pos++;
+
+
+static struct dentry *proc_virtual_lookup(struct inode *dir,
-+ struct dentry *dentry, struct nameidata *nd)
++ struct dentry *dentry, unsigned int flags)
+{
+ struct vs_entry *p = vx_virtual_stuff;
+ struct dentry *error = ERR_PTR(-ENOENT);
+
+
+static struct dentry *proc_virtnet_lookup(struct inode *dir,
-+ struct dentry *dentry, struct nameidata *nd)
++ struct dentry *dentry, unsigned int flags)
+{
+ struct vs_entry *p = nx_virtnet_stuff;
+ struct dentry *error = ERR_PTR(-ENOENT);
+ 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, dirent, filldir, p->name, p->len,
+ vs_proc_instantiate, 0, p))
+ goto out;
+ pos++;
+ buf[--j] = '0' + (n % 10);
+ while (n /= 10);
+
-+ if (proc_fill_cache(filp, dirent, filldir,
++ if (vx_proc_fill_cache(filp, dirent, filldir,
+ buf + j, PROC_NUMBUF - j,
+ vs_proc_instantiate, xid, p))
+ goto out;
+ 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, dirent, filldir, p->name, p->len,
+ vs_proc_instantiate, 0, p))
+ goto out;
+ pos++;
+ buf[--j] = '0' + (n % 10);
+ while (n /= 10);
+
-+ if (proc_fill_cache(filp, dirent, filldir,
++ if (vx_proc_fill_cache(filp, dirent, filldir,
+ buf + j, PROC_NUMBUF - j,
+ vs_proc_instantiate, nid, p))
+ goto out;
+ return buffer - orig;
+}
+
-diff -NurpP --minimal linux-3.0-rc5/kernel/vserver/sched.c linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/sched.c
---- linux-3.0-rc5/kernel/vserver/sched.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/sched.c 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,82 @@
+diff -NurpP --minimal linux-3.10.53/kernel/vserver/sched.c linux-3.10.53-vs2.3.6.8/kernel/vserver/sched.c
+--- linux-3.10.53/kernel/vserver/sched.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/vserver/sched.c 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,83 @@
+/*
+ * linux/kernel/vserver/sched.c
+ *
+
+#include <linux/vs_context.h>
+#include <linux/vs_sched.h>
++#include <linux/cpumask.h>
+#include <linux/vserver/sched_cmd.h>
+
+#include <asm/uaccess.h>
+
+ if (data->cpu_id != ~0) {
+ vxi->sched.update = cpumask_of_cpu(data->cpu_id);
-+ cpus_and(vxi->sched.update, cpu_online_map,
-+ vxi->sched.update);
++ cpumask_and(&vxi->sched.update, &vxi->sched.update,
++ cpu_online_mask);
+ } else
-+ vxi->sched.update = cpu_online_map;
++ cpumask_copy(&vxi->sched.update, cpu_online_mask);
+
+ for_each_cpu_mask(cpu, vxi->sched.update)
+ vx_update_sched_param(&vxi->sched,
+ return 0;
+}
+
-diff -NurpP --minimal linux-3.0-rc5/kernel/vserver/sched_init.h linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/sched_init.h
---- linux-3.0-rc5/kernel/vserver/sched_init.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/sched_init.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/kernel/vserver/sched_init.h linux-3.10.53-vs2.3.6.8/kernel/vserver/sched_init.h
+--- linux-3.10.53/kernel/vserver/sched_init.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/vserver/sched_init.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,27 @@
+
+static inline void vx_info_init_sched(struct _vx_sched *sched)
+{
+ return;
+}
-diff -NurpP --minimal linux-3.0-rc5/kernel/vserver/sched_proc.h linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/sched_proc.h
---- linux-3.0-rc5/kernel/vserver/sched_proc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/sched_proc.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/kernel/vserver/sched_proc.h linux-3.10.53-vs2.3.6.8/kernel/vserver/sched_proc.h
+--- linux-3.10.53/kernel/vserver/sched_proc.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/vserver/sched_proc.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,32 @@
+#ifndef _VX_SCHED_PROC_H
+#define _VX_SCHED_PROC_H
+}
+
+#endif /* _VX_SCHED_PROC_H */
-diff -NurpP --minimal linux-3.0-rc5/kernel/vserver/signal.c linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/signal.c
---- linux-3.0-rc5/kernel/vserver/signal.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/signal.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/kernel/vserver/signal.c linux-3.10.53-vs2.3.6.8/kernel/vserver/signal.c
+--- linux-3.10.53/kernel/vserver/signal.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/vserver/signal.c 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,134 @@
+/*
+ * linux/kernel/vserver/signal.c
+ return ret;
+}
+
-diff -NurpP --minimal linux-3.0-rc5/kernel/vserver/space.c linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/space.c
---- linux-3.0-rc5/kernel/vserver/space.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/space.c 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,417 @@
+diff -NurpP --minimal linux-3.10.53/kernel/vserver/space.c linux-3.10.53-vs2.3.6.8/kernel/vserver/space.c
+--- linux-3.10.53/kernel/vserver/space.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/vserver/space.c 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,436 @@
+/*
+ * linux/kernel/vserver/space.c
+ *
+#include <linux/pid_namespace.h>
+#include <linux/ipc_namespace.h>
+#include <net/net_namespace.h>
++#include "../fs/mount.h"
+
+
+static const struct vcmd_space_mask_v1 space_mask_v0 = {
+ .mask = CLONE_FS |
+ CLONE_NEWNS |
++#ifdef CONFIG_UTS_NS
+ CLONE_NEWUTS |
++#endif
++#ifdef CONFIG_IPC_NS
+ CLONE_NEWIPC |
++#endif
++#ifdef CONFIG_USER_NS
+ CLONE_NEWUSER |
++#endif
+ 0
+};
+
+static const struct vcmd_space_mask_v1 space_mask = {
+ .mask = CLONE_FS |
+ CLONE_NEWNS |
++#ifdef CONFIG_UTS_NS
+ CLONE_NEWUTS |
++#endif
++#ifdef CONFIG_IPC_NS
+ CLONE_NEWIPC |
++#endif
++#ifdef CONFIG_USER_NS
+ CLONE_NEWUSER |
++#endif
+#ifdef CONFIG_PID_NS
+ CLONE_NEWPID |
+#endif
+static const struct vcmd_space_mask_v1 default_space_mask = {
+ .mask = CLONE_FS |
+ CLONE_NEWNS |
++#ifdef CONFIG_UTS_NS
+ CLONE_NEWUTS |
++#endif
++#ifdef CONFIG_IPC_NS
+ CLONE_NEWIPC |
++#endif
++#ifdef CONFIG_USER_NS
+ CLONE_NEWUSER |
++#endif
+#ifdef CONFIG_PID_NS
+// CLONE_NEWPID |
+#endif
+int vx_set_space(struct vx_info *vxi, unsigned long mask, unsigned index)
+{
+ struct nsproxy *proxy_vxi, *proxy_cur, *proxy_new;
-+ struct fs_struct *fs_vxi, *fs;
++ struct fs_struct *fs_vxi, *fs = NULL;
+ struct _vx_space *space;
+ int ret, kill = 0;
+
+ return 0;
+}
+
-diff -NurpP --minimal linux-3.0-rc5/kernel/vserver/switch.c linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/switch.c
---- linux-3.0-rc5/kernel/vserver/switch.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/switch.c 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,548 @@
+diff -NurpP --minimal linux-3.10.53/kernel/vserver/switch.c linux-3.10.53-vs2.3.6.8/kernel/vserver/switch.c
+--- linux-3.10.53/kernel/vserver/switch.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/vserver/switch.c 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,556 @@
+/*
+ * linux/kernel/vserver/switch.c
+ *
+ * Virtual Server: Syscall Switch
+ *
-+ * Copyright (C) 2003-2007 Herbert Pötzl
++ * Copyright (C) 2003-2011 Herbert Pötzl
+ *
+ * V0.01 syscall switch
+ * V0.02 added signal to context
+ * V0.09 added tag commands
+ * V0.10 added oom bias
+ * V0.11 added device commands
++ * V0.12 added warn mask
+ *
+ */
+
+ case VCMD_get_umask:
+ return vc_get_umask(vxi, data);
+
++ case VCMD_set_wmask:
++ return vc_set_wmask(vxi, data);
++
++ case VCMD_get_wmask:
++ return vc_get_wmask(vxi, data);
+#ifdef CONFIG_IA32_EMULATION
+ case VCMD_get_rlimit:
+ return __COMPAT(vc_get_rlimit, vxi, data, compat);
+ __VCMD(get_ccaps, 3, VCA_VXI, VCF_INFO);
+ __VCMD(get_cflags, 3, VCA_VXI, VCF_INFO);
+ __VCMD(get_umask, 3, VCA_VXI, VCF_INFO);
++ __VCMD(get_wmask, 3, VCA_VXI, VCF_INFO);
+ __VCMD(get_badness, 3, VCA_VXI, VCF_INFO);
+ __VCMD(get_vhi_name, 3, VCA_VXI, VCF_INFO);
+ __VCMD(get_rlimit, 3, VCA_VXI, VCF_INFO);
+ __VCMD(set_bcaps, 7, VCA_VXI, VCF_ARES | VCF_SETUP);
+ __VCMD(set_cflags, 7, VCA_VXI, VCF_ARES | VCF_SETUP);
+ __VCMD(set_umask, 7, VCA_VXI, VCF_ARES | VCF_SETUP);
++ __VCMD(set_wmask, 7, VCA_VXI, VCF_ARES | VCF_SETUP);
+ __VCMD(set_badness, 7, VCA_VXI, VCF_ARES | VCF_SETUP);
+
+ __VCMD(set_vhi_name, 7, VCA_VXI, VCF_ARES | VCF_SETUP);
+}
+
+#endif /* CONFIG_COMPAT */
-diff -NurpP --minimal linux-3.0-rc5/kernel/vserver/sysctl.c linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/sysctl.c
---- linux-3.0-rc5/kernel/vserver/sysctl.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/sysctl.c 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,241 @@
+diff -NurpP --minimal linux-3.10.53/kernel/vserver/sysctl.c linux-3.10.53-vs2.3.6.8/kernel/vserver/sysctl.c
+--- linux-3.10.53/kernel/vserver/sysctl.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/vserver/sysctl.c 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,247 @@
+/*
+ * kernel/vserver/sysctl.c
+ *
+ CTL_DEBUG_QUOTA,
+ CTL_DEBUG_CVIRT,
+ CTL_DEBUG_SPACE,
++ CTL_DEBUG_PERM,
+ CTL_DEBUG_MISC,
+};
+
+
-+unsigned int vx_debug_switch = 0;
-+unsigned int vx_debug_xid = 0;
-+unsigned int vx_debug_nid = 0;
-+unsigned int vx_debug_tag = 0;
-+unsigned int vx_debug_net = 0;
-+unsigned int vx_debug_limit = 0;
-+unsigned int vx_debug_cres = 0;
-+unsigned int vx_debug_dlim = 0;
-+unsigned int vx_debug_quota = 0;
-+unsigned int vx_debug_cvirt = 0;
-+unsigned int vx_debug_space = 0;
-+unsigned int vx_debug_misc = 0;
++unsigned int vs_debug_switch = 0;
++unsigned int vs_debug_xid = 0;
++unsigned int vs_debug_nid = 0;
++unsigned int vs_debug_tag = 0;
++unsigned int vs_debug_net = 0;
++unsigned int vs_debug_limit = 0;
++unsigned int vs_debug_cres = 0;
++unsigned int vs_debug_dlim = 0;
++unsigned int vs_debug_quota = 0;
++unsigned int vs_debug_cvirt = 0;
++unsigned int vs_debug_space = 0;
++unsigned int vs_debug_perm = 0;
++unsigned int vs_debug_misc = 0;
+
+
+static struct ctl_table_header *vserver_table_header;
+#define CTL_ENTRY(ctl, name) \
+ { \
+ .procname = #name, \
-+ .data = &vx_ ## name, \
++ .data = &vs_ ## name, \
+ .maxlen = sizeof(int), \
+ .mode = 0644, \
+ .proc_handler = &proc_dodebug, \
+ CTL_ENTRY(CTL_DEBUG_QUOTA, debug_quota),
+ CTL_ENTRY(CTL_DEBUG_CVIRT, debug_cvirt),
+ CTL_ENTRY(CTL_DEBUG_SPACE, debug_space),
++ CTL_ENTRY(CTL_DEBUG_PERM, debug_perm),
+ CTL_ENTRY(CTL_DEBUG_MISC, debug_misc),
+ { 0 }
+};
+ { CTL_DEBUG_QUOTA, "quota=%x" },
+ { CTL_DEBUG_CVIRT, "cvirt=%x" },
+ { CTL_DEBUG_SPACE, "space=%x" },
++ { CTL_DEBUG_PERM, "perm=%x" },
+ { CTL_DEBUG_MISC, "misc=%x" },
+ { CTL_DEBUG_ERROR, NULL }
+};
+
+#define HANDLE_CASE(id, name, val) \
+ case CTL_DEBUG_ ## id: \
-+ vx_debug_ ## name = val; \
++ vs_debug_ ## name = val; \
+ printk("vs_debug_" #name "=0x%x\n", val); \
+ break
+
+ HANDLE_CASE(QUOTA, quota, value);
+ HANDLE_CASE(CVIRT, cvirt, value);
+ HANDLE_CASE(SPACE, space, value);
++ HANDLE_CASE(PERM, perm, value);
+ HANDLE_CASE(MISC, misc, value);
+ default:
+ return -EINVAL;
+
+
+
-+EXPORT_SYMBOL_GPL(vx_debug_switch);
-+EXPORT_SYMBOL_GPL(vx_debug_xid);
-+EXPORT_SYMBOL_GPL(vx_debug_nid);
-+EXPORT_SYMBOL_GPL(vx_debug_net);
-+EXPORT_SYMBOL_GPL(vx_debug_limit);
-+EXPORT_SYMBOL_GPL(vx_debug_cres);
-+EXPORT_SYMBOL_GPL(vx_debug_dlim);
-+EXPORT_SYMBOL_GPL(vx_debug_quota);
-+EXPORT_SYMBOL_GPL(vx_debug_cvirt);
-+EXPORT_SYMBOL_GPL(vx_debug_space);
-+EXPORT_SYMBOL_GPL(vx_debug_misc);
++EXPORT_SYMBOL_GPL(vs_debug_switch);
++EXPORT_SYMBOL_GPL(vs_debug_xid);
++EXPORT_SYMBOL_GPL(vs_debug_nid);
++EXPORT_SYMBOL_GPL(vs_debug_net);
++EXPORT_SYMBOL_GPL(vs_debug_limit);
++EXPORT_SYMBOL_GPL(vs_debug_cres);
++EXPORT_SYMBOL_GPL(vs_debug_dlim);
++EXPORT_SYMBOL_GPL(vs_debug_quota);
++EXPORT_SYMBOL_GPL(vs_debug_cvirt);
++EXPORT_SYMBOL_GPL(vs_debug_space);
++EXPORT_SYMBOL_GPL(vs_debug_perm);
++EXPORT_SYMBOL_GPL(vs_debug_misc);
+
-diff -NurpP --minimal linux-3.0-rc5/kernel/vserver/tag.c linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/tag.c
---- linux-3.0-rc5/kernel/vserver/tag.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/tag.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/kernel/vserver/tag.c linux-3.10.53-vs2.3.6.8/kernel/vserver/tag.c
+--- linux-3.10.53/kernel/vserver/tag.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/vserver/tag.c 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,63 @@
+/*
+ * linux/kernel/vserver/tag.c
+#include <linux/vserver/tag_cmd.h>
+
+
-+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();
+
+int vc_task_tag(uint32_t id)
+{
-+ tag_t tag;
++ vtag_t tag;
+
+ if (id) {
+ struct task_struct *tsk;
+}
+
+
-diff -NurpP --minimal linux-3.0-rc5/kernel/vserver/vci_config.h linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/vci_config.h
---- linux-3.0-rc5/kernel/vserver/vci_config.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/kernel/vserver/vci_config.h 2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,76 @@
+diff -NurpP --minimal linux-3.10.53/kernel/vserver/vci_config.h linux-3.10.53-vs2.3.6.8/kernel/vserver/vci_config.h
+--- linux-3.10.53/kernel/vserver/vci_config.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/kernel/vserver/vci_config.h 2013-08-22 20:30:00.000000000 +0000
+@@ -0,0 +1,80 @@
+
+/* interface version */
+
+ VCI_KCBIT_SPACES = 10,
+ VCI_KCBIT_NETV2 = 11,
+ VCI_KCBIT_MEMCG = 12,
++ VCI_KCBIT_MEMCG_SWAP = 13,
+
+ VCI_KCBIT_DEBUG = 16,
+ VCI_KCBIT_HISTORY = 20,
+#endif
+ (1 << VCI_KCBIT_SPACES) |
+ (1 << VCI_KCBIT_NETV2) |
-+#ifdef CONFIG_CGROUP_MEM_RES_CTLR
++#ifdef CONFIG_MEMCG
+ (1 << VCI_KCBIT_MEMCG) |
+#endif
++#ifdef CONFIG_MEMCG_SWAP
++ (1 << VCI_KCBIT_MEMCG_SWAP) |
++#endif
+
+ /* debug options */
+#ifdef CONFIG_VSERVER_DEBUG
+ 0;
+}
+
-diff -NurpP --minimal linux-3.0-rc5/mm/filemap_xip.c linux-3.0-rc5-vs2.3.1-pre3/mm/filemap_xip.c
---- linux-3.0-rc5/mm/filemap_xip.c 2011-07-01 11:14:23.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/mm/filemap_xip.c 2011-06-10 22:11:24.000000000 +0200
-@@ -18,6 +18,7 @@
- #include <linux/seqlock.h>
- #include <linux/mutex.h>
- #include <linux/gfp.h>
-+#include <linux/vs_memory.h>
- #include <asm/tlbflush.h>
- #include <asm/io.h>
-
-diff -NurpP --minimal linux-3.0-rc5/mm/fremap.c linux-3.0-rc5-vs2.3.1-pre3/mm/fremap.c
---- linux-3.0-rc5/mm/fremap.c 2011-07-01 11:14:23.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/mm/fremap.c 2011-06-10 22:11:24.000000000 +0200
-@@ -16,6 +16,7 @@
- #include <linux/module.h>
- #include <linux/syscalls.h>
- #include <linux/mmu_notifier.h>
-+#include <linux/vs_memory.h>
-
- #include <asm/mmu_context.h>
- #include <asm/cacheflush.h>
-diff -NurpP --minimal linux-3.0-rc5/mm/hugetlb.c linux-3.0-rc5-vs2.3.1-pre3/mm/hugetlb.c
---- linux-3.0-rc5/mm/hugetlb.c 2011-07-01 11:14:23.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/mm/hugetlb.c 2011-06-22 12:39:16.000000000 +0200
-@@ -28,6 +28,7 @@
-
- #include <linux/hugetlb.h>
- #include <linux/node.h>
-+#include <linux/vs_memory.h>
- #include "internal.h"
-
- const unsigned long hugetlb_zero = 0, hugetlb_infinity = ~0UL;
-diff -NurpP --minimal linux-3.0-rc5/mm/memcontrol.c linux-3.0-rc5-vs2.3.1-pre3/mm/memcontrol.c
---- linux-3.0-rc5/mm/memcontrol.c 2011-07-01 11:14:23.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/mm/memcontrol.c 2011-07-01 11:35:35.000000000 +0200
-@@ -736,6 +736,31 @@ struct mem_cgroup *mem_cgroup_from_task(
- struct mem_cgroup, css);
+diff -NurpP --minimal linux-3.10.53/mm/memcontrol.c linux-3.10.53-vs2.3.6.8/mm/memcontrol.c
+--- linux-3.10.53/mm/memcontrol.c 2014-08-30 13:39:02.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/mm/memcontrol.c 2014-04-22 03:48:11.000000000 +0000
+@@ -1082,6 +1082,31 @@ struct mem_cgroup *mem_cgroup_from_task(
+ return mem_cgroup_from_css(task_subsys_state(p, mem_cgroup_subsys_id));
}
+u64 mem_cgroup_res_read_u64(struct mem_cgroup *mem, int member)
+
struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm)
{
- struct mem_cgroup *mem = NULL;
-diff -NurpP --minimal linux-3.0-rc5/mm/memory.c linux-3.0-rc5-vs2.3.1-pre3/mm/memory.c
---- linux-3.0-rc5/mm/memory.c 2011-07-01 11:14:23.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/mm/memory.c 2011-07-01 11:35:35.000000000 +0200
-@@ -3331,6 +3331,7 @@ int handle_pte_fault(struct mm_struct *m
- {
- pte_t entry;
- spinlock_t *ptl;
-+ int ret = 0, type = VXPT_UNKNOWN;
-
- entry = *pte;
- if (!pte_present(entry)) {
-@@ -3355,9 +3356,12 @@ int handle_pte_fault(struct mm_struct *m
- if (unlikely(!pte_same(*pte, entry)))
- goto unlock;
- if (flags & FAULT_FLAG_WRITE) {
-- if (!pte_write(entry))
-- return do_wp_page(mm, vma, address,
-+ if (!pte_write(entry)) {
-+ ret = do_wp_page(mm, vma, address,
- pte, pmd, ptl, entry);
-+ type = VXPT_WRITE;
-+ goto out;
-+ }
- entry = pte_mkdirty(entry);
- }
- entry = pte_mkyoung(entry);
-@@ -3375,7 +3379,10 @@ int handle_pte_fault(struct mm_struct *m
- }
- unlock:
- pte_unmap_unlock(pte, ptl);
-- return 0;
-+ ret = 0;
-+out:
-+ vx_page_fault(mm, vma, type, ret);
-+ return ret;
- }
-
- /*
-diff -NurpP --minimal linux-3.0-rc5/mm/mremap.c linux-3.0-rc5-vs2.3.1-pre3/mm/mremap.c
---- linux-3.0-rc5/mm/mremap.c 2011-07-01 11:14:23.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/mm/mremap.c 2011-06-10 22:11:24.000000000 +0200
-@@ -19,6 +19,7 @@
- #include <linux/security.h>
- #include <linux/syscalls.h>
- #include <linux/mmu_notifier.h>
-+#include <linux/vs_memory.h>
-
- #include <asm/uaccess.h>
- #include <asm/cacheflush.h>
-diff -NurpP --minimal linux-3.0-rc5/mm/oom_kill.c linux-3.0-rc5-vs2.3.1-pre3/mm/oom_kill.c
---- linux-3.0-rc5/mm/oom_kill.c 2011-07-01 11:14:23.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/mm/oom_kill.c 2011-06-10 22:11:24.000000000 +0200
-@@ -32,6 +32,9 @@
- #include <linux/mempolicy.h>
- #include <linux/security.h>
- #include <linux/ptrace.h>
+ struct mem_cgroup *memcg = NULL;
+diff -NurpP --minimal linux-3.10.53/mm/oom_kill.c linux-3.10.53-vs2.3.6.8/mm/oom_kill.c
+--- linux-3.10.53/mm/oom_kill.c 2014-08-30 13:39:02.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/mm/oom_kill.c 2014-03-12 13:18:23.000000000 +0000
+@@ -35,6 +35,8 @@
+ #include <linux/freezer.h>
+ #include <linux/ftrace.h>
+ #include <linux/ratelimit.h>
+#include <linux/reboot.h>
-+#include <linux/vs_memory.h>
+#include <linux/vs_context.h>
- int sysctl_panic_on_oom;
- int sysctl_oom_kill_allocating_task;
-@@ -134,11 +137,18 @@ struct task_struct *find_lock_task_mm(st
+ #define CREATE_TRACE_POINTS
+ #include <trace/events/oom.h>
+@@ -113,11 +115,18 @@ struct task_struct *find_lock_task_mm(st
static bool oom_unkillable_task(struct task_struct *p,
- const struct mem_cgroup *mem, const nodemask_t *nodemask)
+ const struct mem_cgroup *memcg, const nodemask_t *nodemask)
{
- if (is_global_init(p))
+ unsigned xid = vx_current_xid();
+ return true;
+
/* When mem_cgroup_out_of_memory() and p is not member of the group */
- if (mem && !task_in_mem_cgroup(p, mem))
+ if (memcg && !task_in_mem_cgroup(p, memcg))
return true;
-@@ -214,6 +224,18 @@ unsigned int oom_badness(struct task_str
- points += p->signal->oom_score_adj;
-
- /*
-+ * add points for context badness and
-+ * reduce badness for processes belonging to
-+ * a different context
-+ */
-+
-+ points += vx_badness(p, p->mm);
-+
-+ if ((vx_current_xid() > 1) &&
-+ vx_current_xid() != vx_task_xid(p))
-+ points /= 16;
-+
-+ /*
- * Never return 0 for an eligible task that may be killed since it's
- * possible that no single user task uses more than 0.1% of memory and
- * no single admin tasks uses more than 3.0%.
-@@ -427,8 +449,8 @@ static int oom_kill_task(struct task_str
- /* mm cannot be safely dereferenced after task_unlock(p) */
- mm = p->mm;
-
-- pr_err("Killed process %d (%s) total-vm:%lukB, anon-rss:%lukB, file-rss:%lukB\n",
-- task_pid_nr(p), p->comm, K(p->mm->total_vm),
-+ pr_err("Killed process %d:#%u (%s) total-vm:%lukB, anon-rss:%lukB, file-rss:%lukB\n",
-+ task_pid_nr(p), p->xid, p->comm, K(p->mm->total_vm),
- K(get_mm_counter(p->mm, MM_ANONPAGES)),
- K(get_mm_counter(p->mm, MM_FILEPAGES)));
- task_unlock(p);
-@@ -482,8 +504,8 @@ static int oom_kill_process(struct task_
- }
+@@ -426,8 +435,8 @@ void oom_kill_process(struct task_struct
+ dump_header(p, gfp_mask, order, memcg, nodemask);
task_lock(p);
- pr_err("%s: Kill process %d (%s) score %d or sacrifice child\n",
task_unlock(p);
/*
-@@ -584,6 +606,8 @@ int unregister_oom_notifier(struct notif
+@@ -472,8 +481,8 @@ void oom_kill_process(struct task_struct
+
+ /* mm cannot safely be dereferenced after task_unlock(victim) */
+ mm = victim->mm;
+- pr_err("Killed process %d (%s) total-vm:%lukB, anon-rss:%lukB, file-rss:%lukB\n",
+- task_pid_nr(victim), victim->comm, K(victim->mm->total_vm),
++ pr_err("Killed process %d:#%u (%s) total-vm:%lukB, anon-rss:%lukB, file-rss:%lukB\n",
++ task_pid_nr(victim), victim->xid, victim->comm, K(victim->mm->total_vm),
+ K(get_mm_counter(victim->mm, MM_ANONPAGES)),
+ K(get_mm_counter(victim->mm, MM_FILEPAGES)));
+ task_unlock(victim);
+@@ -543,6 +552,8 @@ int unregister_oom_notifier(struct notif
}
EXPORT_SYMBOL_GPL(unregister_oom_notifier);
/*
* 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
-@@ -742,7 +766,12 @@ retry:
+@@ -655,7 +666,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);
- read_unlock(&tasklist_lock);
- panic("Out of memory and no killable processes...\n");
+
+ /* avoid panic for guest OOM */
-+ if (current->xid)
++ if (vx_current_xid())
+ vs_oom_action(LINUX_REBOOT_CMD_OOM);
+ else
+ panic("Out of memory and no killable processes...\n");
}
-
- if (oom_kill_process(p, gfp_mask, order, points, totalpages, NULL,
-diff -NurpP --minimal linux-3.0-rc5/mm/page_alloc.c linux-3.0-rc5-vs2.3.1-pre3/mm/page_alloc.c
---- linux-3.0-rc5/mm/page_alloc.c 2011-07-01 11:14:23.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/mm/page_alloc.c 2011-06-10 22:24:12.000000000 +0200
-@@ -57,6 +57,8 @@
- #include <linux/ftrace_event.h>
- #include <linux/memcontrol.h>
- #include <linux/prefetch.h>
+ if (PTR_ERR(p) != -1UL) {
+ oom_kill_process(p, gfp_mask, order, points, totalpages, NULL,
+diff -NurpP --minimal linux-3.10.53/mm/page_alloc.c linux-3.10.53-vs2.3.6.8/mm/page_alloc.c
+--- linux-3.10.53/mm/page_alloc.c 2014-08-30 13:39:02.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/mm/page_alloc.c 2014-08-30 14:03:55.000000000 +0000
+@@ -60,6 +60,8 @@
+ #include <linux/page-debug-flags.h>
+ #include <linux/hugetlb.h>
+ #include <linux/sched/rt.h>
+#include <linux/vs_base.h>
+#include <linux/vs_limit.h>
#include <asm/tlbflush.h>
#include <asm/div64.h>
-@@ -2470,6 +2472,9 @@ void si_meminfo(struct sysinfo *val)
+@@ -2901,6 +2903,9 @@ void si_meminfo(struct sysinfo *val)
val->totalhigh = totalhigh_pages;
val->freehigh = nr_free_highpages();
val->mem_unit = PAGE_SIZE;
}
EXPORT_SYMBOL(si_meminfo);
-@@ -2490,6 +2495,9 @@ void si_meminfo_node(struct sysinfo *val
+@@ -2921,6 +2926,9 @@ void si_meminfo_node(struct sysinfo *val
val->freehigh = 0;
#endif
val->mem_unit = PAGE_SIZE;
}
#endif
-diff -NurpP --minimal linux-3.0-rc5/mm/pgtable-generic.c linux-3.0-rc5-vs2.3.1-pre3/mm/pgtable-generic.c
---- linux-3.0-rc5/mm/pgtable-generic.c 2011-03-15 18:07:42.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/mm/pgtable-generic.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/mm/pgtable-generic.c linux-3.10.53-vs2.3.6.8/mm/pgtable-generic.c
+--- linux-3.10.53/mm/pgtable-generic.c 2014-08-30 13:39:02.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/mm/pgtable-generic.c 2014-01-22 19:00:34.000000000 +0000
@@ -6,6 +6,8 @@
* Copyright (C) 2010 Linus Torvalds
*/
#include <linux/pagemap.h>
#include <asm/tlb.h>
#include <asm-generic/pgtable.h>
-diff -NurpP --minimal linux-3.0-rc5/mm/rmap.c linux-3.0-rc5-vs2.3.1-pre3/mm/rmap.c
---- linux-3.0-rc5/mm/rmap.c 2011-07-01 11:14:23.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/mm/rmap.c 2011-07-01 11:35:35.000000000 +0200
-@@ -57,6 +57,7 @@
- #include <linux/mmu_notifier.h>
- #include <linux/migrate.h>
- #include <linux/hugetlb.h>
-+#include <linux/vs_memory.h>
-
- #include <asm/tlbflush.h>
-
-diff -NurpP --minimal linux-3.0-rc5/mm/shmem.c linux-3.0-rc5-vs2.3.1-pre3/mm/shmem.c
---- linux-3.0-rc5/mm/shmem.c 2011-07-01 11:14:23.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/mm/shmem.c 2011-07-01 11:35:35.000000000 +0200
-@@ -1850,7 +1850,7 @@ static int shmem_statfs(struct dentry *d
+diff -NurpP --minimal linux-3.10.53/mm/shmem.c linux-3.10.53-vs2.3.6.8/mm/shmem.c
+--- linux-3.10.53/mm/shmem.c 2014-08-30 13:39:02.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/mm/shmem.c 2014-08-30 14:03:55.000000000 +0000
+@@ -1991,7 +1991,7 @@ static int shmem_statfs(struct dentry *d
{
struct shmem_sb_info *sbinfo = SHMEM_SB(dentry->d_sb);
buf->f_bsize = PAGE_CACHE_SIZE;
buf->f_namelen = NAME_MAX;
if (sbinfo->max_blocks) {
-@@ -2605,7 +2605,7 @@ int shmem_fill_super(struct super_block
- sb->s_maxbytes = SHMEM_MAX_BYTES;
+@@ -2688,7 +2688,7 @@ int shmem_fill_super(struct super_block
+ sb->s_maxbytes = MAX_LFS_FILESIZE;
sb->s_blocksize = PAGE_CACHE_SIZE;
sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
- sb->s_magic = TMPFS_MAGIC;
sb->s_op = &shmem_ops;
sb->s_time_gran = 1;
#ifdef CONFIG_TMPFS_XATTR
-diff -NurpP --minimal linux-3.0-rc5/mm/slab.c linux-3.0-rc5-vs2.3.1-pre3/mm/slab.c
---- linux-3.0-rc5/mm/slab.c 2011-07-01 11:14:23.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/mm/slab.c 2011-06-15 02:41:23.000000000 +0200
-@@ -411,6 +411,8 @@ static void kmem_list3_init(struct kmem_
+diff -NurpP --minimal linux-3.10.53/mm/slab.c linux-3.10.53-vs2.3.6.8/mm/slab.c
+--- linux-3.10.53/mm/slab.c 2014-08-30 13:39:02.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/mm/slab.c 2013-11-13 17:17:16.000000000 +0000
+@@ -388,6 +388,8 @@ static void kmem_cache_node_init(struct
#define STATS_INC_FREEMISS(x) do { } while (0)
#endif
#if DEBUG
/*
-@@ -3348,6 +3350,7 @@ retry:
+@@ -3314,6 +3316,7 @@ retry:
obj = slab_get_obj(cachep, slabp, nodeid);
check_slabp(cachep, slabp);
+ vx_slab_alloc(cachep, flags);
- l3->free_objects--;
+ n->free_objects--;
/* move slabp to correct slabp list: */
list_del(&slabp->list);
-@@ -3425,6 +3428,7 @@ __cache_alloc_node(struct kmem_cache *ca
+@@ -3393,6 +3396,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:
+ vx_slab_alloc(cachep, flags);
local_irq_restore(save_flags);
ptr = cache_alloc_debugcheck_after(cachep, flags, ptr, caller);
- kmemleak_alloc_recursive(ptr, obj_size(cachep), 1, cachep->flags,
-@@ -3612,6 +3616,7 @@ static inline void __cache_free(struct k
+ kmemleak_alloc_recursive(ptr, cachep->object_size, 1, cachep->flags,
+@@ -3585,6 +3589,7 @@ static inline void __cache_free(struct k
check_irq_off();
kmemleak_free_recursive(objp, cachep->flags);
objp = cache_free_debugcheck(cachep, objp, caller);
+ vx_slab_free(cachep);
- kmemcheck_slab_free(cachep, objp, obj_size(cachep));
+ kmemcheck_slab_free(cachep, objp, cachep->object_size);
-diff -NurpP --minimal linux-3.0-rc5/mm/slab_vs.h linux-3.0-rc5-vs2.3.1-pre3/mm/slab_vs.h
---- linux-3.0-rc5/mm/slab_vs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/mm/slab_vs.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/mm/slab_vs.h linux-3.10.53-vs2.3.6.8/mm/slab_vs.h
+--- linux-3.10.53/mm/slab_vs.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/mm/slab_vs.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,29 @@
+
+#include <linux/vserver/context.h>
+static inline
+void vx_slab_alloc(struct kmem_cache *cachep, gfp_t flags)
+{
-+ int what = gfp_zone(cachep->gfpflags);
++ int what = gfp_zone(cachep->allocflags);
+ struct vx_info *vxi = current_vx_info();
+
+ if (!vxi)
+ return;
+
-+ atomic_add(cachep->buffer_size, &vxi->cacct.slab[what]);
++ atomic_add(cachep->size, &vxi->cacct.slab[what]);
+}
+
+static inline
+void vx_slab_free(struct kmem_cache *cachep)
+{
-+ int what = gfp_zone(cachep->gfpflags);
++ int what = gfp_zone(cachep->allocflags);
+ struct vx_info *vxi = current_vx_info();
+
+ if (!vxi)
+ return;
+
-+ atomic_sub(cachep->buffer_size, &vxi->cacct.slab[what]);
++ atomic_sub(cachep->size, &vxi->cacct.slab[what]);
+}
+
-diff -NurpP --minimal linux-3.0-rc5/mm/swapfile.c linux-3.0-rc5-vs2.3.1-pre3/mm/swapfile.c
---- linux-3.0-rc5/mm/swapfile.c 2011-07-01 11:14:23.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/mm/swapfile.c 2011-07-01 11:35:35.000000000 +0200
-@@ -37,6 +37,8 @@
+diff -NurpP --minimal linux-3.10.53/mm/swapfile.c linux-3.10.53-vs2.3.6.8/mm/swapfile.c
+--- linux-3.10.53/mm/swapfile.c 2013-07-14 17:01:36.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/mm/swapfile.c 2013-08-22 20:30:00.000000000 +0000
+@@ -39,6 +39,7 @@
#include <asm/tlbflush.h>
#include <linux/swapops.h>
#include <linux/page_cgroup.h>
+#include <linux/vs_base.h>
-+#include <linux/vs_memory.h>
static bool swap_count_continued(struct swap_info_struct *, pgoff_t,
unsigned char);
-@@ -1759,6 +1761,16 @@ static int swap_show(struct seq_file *sw
+@@ -1768,6 +1769,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");
return 0;
}
-@@ -2186,6 +2198,8 @@ void si_swapinfo(struct sysinfo *val)
- val->freeswap = nr_swap_pages + nr_to_be_unused;
+@@ -2196,6 +2207,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);
+ if (vx_flags(VXF_VIRT_MEM, 0))
}
/*
-diff -NurpP --minimal linux-3.0-rc5/net/bridge/br_multicast.c linux-3.0-rc5-vs2.3.1-pre3/net/bridge/br_multicast.c
---- linux-3.0-rc5/net/bridge/br_multicast.c 2011-07-01 11:14:26.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/net/bridge/br_multicast.c 2011-06-22 12:39:16.000000000 +0200
-@@ -447,7 +447,7 @@ static struct sk_buff *br_ip6_multicast_
+diff -NurpP --minimal linux-3.10.53/net/bridge/br_multicast.c linux-3.10.53-vs2.3.6.8/net/bridge/br_multicast.c
+--- linux-3.10.53/net/bridge/br_multicast.c 2014-08-30 13:39:02.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/net/bridge/br_multicast.c 2014-04-22 03:48:11.000000000 +0000
+@@ -443,7 +443,7 @@ static struct sk_buff *br_ip6_multicast_
ip6h->hop_limit = 1;
ipv6_addr_set(&ip6h->daddr, htonl(0xff020000), 0, 0, htonl(1));
- ipv6_dev_get_saddr(dev_net(br->dev), br->dev, &ip6h->daddr, 0,
-- &ip6h->saddr);
-+ &ip6h->saddr, NULL);
- ipv6_eth_mc_map(&ip6h->daddr, eth->h_dest);
-
- hopopt = (u8 *)(ip6h + 1);
-diff -NurpP --minimal linux-3.0-rc5/net/core/dev.c linux-3.0-rc5-vs2.3.1-pre3/net/core/dev.c
---- linux-3.0-rc5/net/core/dev.c 2011-07-01 11:14:26.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/net/core/dev.c 2011-06-15 02:40:14.000000000 +0200
-@@ -127,6 +127,7 @@
+ if (ipv6_dev_get_saddr(dev_net(br->dev), br->dev, &ip6h->daddr, 0,
+- &ip6h->saddr)) {
++ &ip6h->saddr, NULL)) {
+ kfree_skb(skb);
+ return NULL;
+ }
+diff -NurpP --minimal linux-3.10.53/net/core/dev.c linux-3.10.53-vs2.3.6.8/net/core/dev.c
+--- linux-3.10.53/net/core/dev.c 2014-08-30 13:39:02.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/net/core/dev.c 2014-08-30 14:03:55.000000000 +0000
+@@ -122,6 +122,7 @@
#include <linux/in.h>
#include <linux/jhash.h>
#include <linux/random.h>
#include <trace/events/napi.h>
#include <trace/events/net.h>
#include <trace/events/skb.h>
-@@ -609,7 +610,8 @@ struct net_device *__dev_get_by_name(str
+@@ -660,7 +661,8 @@ struct net_device *__dev_get_by_name(str
struct hlist_head *head = dev_name_hash(net, name);
- hlist_for_each_entry(dev, p, head, name_hlist)
+ hlist_for_each_entry(dev, head, name_hlist)
- if (!strncmp(dev->name, name, IFNAMSIZ))
+ if (!strncmp(dev->name, name, IFNAMSIZ) &&
+ nx_dev_visible(current_nx_info(), dev))
return dev;
return NULL;
-@@ -635,7 +637,8 @@ struct net_device *dev_get_by_name_rcu(s
+@@ -685,7 +687,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, p, head, name_hlist)
+ hlist_for_each_entry_rcu(dev, head, name_hlist)
- if (!strncmp(dev->name, name, IFNAMSIZ))
+ if (!strncmp(dev->name, name, IFNAMSIZ) &&
+ nx_dev_visible(current_nx_info(), dev))
return dev;
return NULL;
-@@ -686,7 +689,8 @@ struct net_device *__dev_get_by_index(st
+@@ -735,7 +738,8 @@ struct net_device *__dev_get_by_index(st
struct hlist_head *head = dev_index_hash(net, ifindex);
- hlist_for_each_entry(dev, p, head, index_hlist)
+ hlist_for_each_entry(dev, head, index_hlist)
- if (dev->ifindex == ifindex)
+ if ((dev->ifindex == ifindex) &&
+ nx_dev_visible(current_nx_info(), dev))
return dev;
return NULL;
-@@ -711,7 +715,8 @@ struct net_device *dev_get_by_index_rcu(
- struct hlist_head *head = dev_index_hash(net, ifindex);
+@@ -753,7 +757,7 @@ EXPORT_SYMBOL(__dev_get_by_index);
+ * about locking. The caller must hold RCU lock.
+ */
- hlist_for_each_entry_rcu(dev, p, head, index_hlist)
-- if (dev->ifindex == ifindex)
-+ if ((dev->ifindex == ifindex) &&
-+ nx_dev_visible(current_nx_info(), dev))
- return dev;
+-struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex)
++struct net_device *dev_get_by_index_real_rcu(struct net *net, int ifindex)
+ {
+ struct net_device *dev;
+ struct hlist_head *head = dev_index_hash(net, ifindex);
+@@ -764,6 +768,16 @@ struct net_device *dev_get_by_index_rcu(
return NULL;
-@@ -764,7 +769,8 @@ struct net_device *dev_getbyhwaddr_rcu(s
+ }
++EXPORT_SYMBOL(dev_get_by_index_real_rcu);
++
++struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex)
++{
++ struct net_device *dev = dev_get_by_index_real_rcu(net, ifindex);
++
++ if (nx_dev_visible(current_nx_info(), dev))
++ return dev;
++ return NULL;
++}
+ EXPORT_SYMBOL(dev_get_by_index_rcu);
+
+
+@@ -846,7 +860,8 @@ struct net_device *dev_getbyhwaddr_rcu(s
for_each_netdev_rcu(net, dev)
if (dev->type == type &&
return dev;
return NULL;
-@@ -776,9 +782,11 @@ struct net_device *__dev_getfirstbyhwtyp
+@@ -858,9 +873,11 @@ struct net_device *__dev_getfirstbyhwtyp
struct net_device *dev;
ASSERT_RTNL();
return NULL;
}
-@@ -896,6 +904,8 @@ static int __dev_alloc_name(struct net *
+@@ -872,7 +889,8 @@ struct net_device *dev_getfirstbyhwtype(
+
+ rcu_read_lock();
+ for_each_netdev_rcu(net, dev)
+- if (dev->type == type) {
++ if ((dev->type == type) &&
++ nx_dev_visible(current_nx_info(), dev)) {
+ dev_hold(dev);
+ ret = dev;
+ break;
+@@ -900,7 +918,8 @@ struct net_device *dev_get_by_flags_rcu(
+
+ ret = NULL;
+ for_each_netdev_rcu(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;
+ }
+@@ -978,6 +997,8 @@ static int __dev_alloc_name(struct net *
continue;
if (i < 0 || i >= max_netdevices)
continue;
/* avoid cases where sscanf is not exact inverse of printf */
snprintf(buf, IFNAMSIZ, name, i);
-@@ -3937,6 +3947,8 @@ static int dev_ifconf(struct net *net, c
+diff -NurpP --minimal linux-3.10.53/net/core/net-procfs.c linux-3.10.53-vs2.3.6.8/net/core/net-procfs.c
+--- linux-3.10.53/net/core/net-procfs.c 2013-07-14 17:01:37.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/net/core/net-procfs.c 2013-08-22 20:30:00.000000000 +0000
+@@ -1,6 +1,7 @@
+ #include <linux/netdevice.h>
+ #include <linux/proc_fs.h>
+ #include <linux/seq_file.h>
++#include <linux/vs_inet.h>
+ #include <net/wext.h>
- total = 0;
- for_each_netdev(net, dev) {
-+ if (!nx_dev_visible(current_nx_info(), dev))
-+ continue;
- for (i = 0; i < NPROTO; i++) {
- if (gifconf_list[i]) {
- int done;
-@@ -4011,6 +4023,10 @@ static void dev_seq_printf_stats(struct
+ #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 = 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.0-rc5/net/core/rtnetlink.c linux-3.0-rc5-vs2.3.1-pre3/net/core/rtnetlink.c
---- linux-3.0-rc5/net/core/rtnetlink.c 2011-07-01 11:14:26.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/net/core/rtnetlink.c 2011-06-10 22:11:24.000000000 +0200
-@@ -1015,6 +1015,8 @@ static int rtnl_dump_ifinfo(struct sk_bu
- hlist_for_each_entry_rcu(dev, node, head, index_hlist) {
+diff -NurpP --minimal linux-3.10.53/net/core/rtnetlink.c linux-3.10.53-vs2.3.6.8/net/core/rtnetlink.c
+--- linux-3.10.53/net/core/rtnetlink.c 2014-08-30 13:39:02.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/net/core/rtnetlink.c 2014-08-30 14:03:55.000000000 +0000
+@@ -1074,6 +1074,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).pid,
- cb->nlh->nlmsg_seq, 0,
-@@ -1848,6 +1850,9 @@ void rtmsg_ifinfo(int type, struct net_d
- struct sk_buff *skb;
+ err = rtnl_fill_ifinfo(skb, dev, RTM_NEWLINK,
+ NETLINK_CB(cb->skb).portid,
+ cb->nlh->nlmsg_seq, 0,
+@@ -1977,6 +1979,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_nlmsg_size(dev), GFP_KERNEL);
+ skb = nlmsg_new((if_info_size = if_nlmsg_size(dev, 0)), GFP_KERNEL);
if (skb == NULL)
goto errout;
-diff -NurpP --minimal linux-3.0-rc5/net/core/sock.c linux-3.0-rc5-vs2.3.1-pre3/net/core/sock.c
---- linux-3.0-rc5/net/core/sock.c 2011-05-22 16:18:00.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/net/core/sock.c 2011-06-10 22:11:24.000000000 +0200
-@@ -127,6 +127,10 @@
- #include <net/cls_cgroup.h>
+diff -NurpP --minimal linux-3.10.53/net/core/sock.c linux-3.10.53-vs2.3.6.8/net/core/sock.c
+--- linux-3.10.53/net/core/sock.c 2014-08-30 13:39:02.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/net/core/sock.c 2014-08-30 14:03:55.000000000 +0000
+@@ -132,6 +132,10 @@
+ #include <net/netprio_cgroup.h>
#include <linux/filter.h>
+#include <linux/vs_socket.h>
+#include <linux/vs_context.h>
+#include <linux/vs_network.h>
- #ifdef CONFIG_INET
- #include <net/tcp.h>
-@@ -1070,6 +1074,8 @@ static struct sock *sk_prot_alloc(struct
+ #include <trace/events/sock.h>
+
+@@ -1301,6 +1305,8 @@ static struct sock *sk_prot_alloc(struct
goto out_free_sec;
sk_tx_queue_clear(sk);
}
return sk;
-@@ -1169,6 +1175,11 @@ static void __sk_free(struct sock *sk)
+@@ -1409,6 +1415,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));
sk_prot_free(sk->sk_prot_creator, sk);
}
-@@ -1216,6 +1227,8 @@ struct sock *sk_clone(const struct sock
+@@ -1469,6 +1480,8 @@ struct sock *sk_clone_lock(const struct
/* SANITY */
get_net(sock_net(newsk));
sk_node_init(&newsk->sk_node);
sock_lock_init(newsk);
bh_lock_sock(newsk);
-@@ -1271,6 +1284,12 @@ struct sock *sk_clone(const struct sock
+@@ -1525,6 +1538,12 @@ struct sock *sk_clone_lock(const struct
smp_wmb();
atomic_set(&newsk->sk_refcnt, 2);
/*
* Increment the counter in the same struct proto as the master
* sock (sk_refcnt_debug_inc uses newsk->sk_prot->socks, that
-@@ -2017,6 +2036,12 @@ void sock_init_data(struct socket *sock,
+@@ -2320,6 +2339,12 @@ void sock_init_data(struct socket *sock,
sk->sk_stamp = ktime_set(-1L, 0);
+ set_nx_info(&sk->sk_nx_info, current_nx_info());
+ sk->sk_nid = nx_current_nid();
+
+ sk->sk_pacing_rate = ~0U;
/*
* Before updating sk_refcnt, we must commit prior changes to memory
- * (Documentation/RCU/rculist_nulls.txt for details)
-diff -NurpP --minimal linux-3.0-rc5/net/ipv4/af_inet.c linux-3.0-rc5-vs2.3.1-pre3/net/ipv4/af_inet.c
---- linux-3.0-rc5/net/ipv4/af_inet.c 2011-07-01 11:14:26.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/net/ipv4/af_inet.c 2011-06-22 12:39:16.000000000 +0200
-@@ -117,6 +117,7 @@
+diff -NurpP --minimal linux-3.10.53/net/ipv4/af_inet.c linux-3.10.53-vs2.3.6.8/net/ipv4/af_inet.c
+--- linux-3.10.53/net/ipv4/af_inet.c 2014-08-30 13:39:03.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/net/ipv4/af_inet.c 2013-11-13 17:17:16.000000000 +0000
+@@ -118,6 +118,7 @@
#ifdef CONFIG_IP_MROUTE
#include <linux/mroute.h>
#endif
/* The inetsw table contains everything that inet_create needs to
-@@ -326,9 +327,13 @@ lookup_protocol:
+@@ -336,10 +337,13 @@ lookup_protocol:
}
err = -EPERM;
+ if ((protocol == IPPROTO_ICMP) &&
+ nx_capable(CAP_NET_RAW, NXC_RAW_ICMP))
+ goto override;
-+
- if (sock->type == SOCK_RAW && !kern && !capable(CAP_NET_RAW))
+ if (sock->type == SOCK_RAW && !kern &&
+ !ns_capable(net->user_ns, CAP_NET_RAW))
goto out_rcu_unlock;
-
+override:
- err = -EAFNOSUPPORT;
- if (!inet_netns_ok(net, protocol))
- goto out_rcu_unlock;
-@@ -452,6 +457,7 @@ int inet_bind(struct socket *sock, struc
+ sock->ops = answer->ops;
+ answer_prot = answer->prot;
+ answer_no_check = answer->no_check;
+@@ -460,6 +464,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);
+ struct nx_v4_sock_addr nsa;
+ struct net *net = sock_net(sk);
unsigned short snum;
int chk_addr_ret;
- int err;
-@@ -468,7 +474,11 @@ int inet_bind(struct socket *sock, struc
- if (addr->sin_family != AF_INET)
- goto out;
+@@ -484,7 +489,11 @@ int inet_bind(struct socket *sock, struc
+ goto out;
+ }
-- chk_addr_ret = inet_addr_type(sock_net(sk), addr->sin_addr.s_addr);
+- chk_addr_ret = inet_addr_type(net, addr->sin_addr.s_addr);
+ err = v4_map_sock_addr(inet, addr, &nsa);
+ if (err)
+ goto out;
+
-+ chk_addr_ret = inet_addr_type(sock_net(sk), nsa.saddr);
++ chk_addr_ret = inet_addr_type(net, nsa.saddr);
/* Not specified by any standard per-se, however it breaks too
* many applications when removed. It is unfortunate since
-@@ -480,7 +490,7 @@ int inet_bind(struct socket *sock, struc
+@@ -496,7 +505,7 @@ int inet_bind(struct socket *sock, struc
err = -EADDRNOTAVAIL;
if (!sysctl_ip_nonlocal_bind &&
!(inet->freebind || inet->transparent) &&
chk_addr_ret != RTN_LOCAL &&
chk_addr_ret != RTN_MULTICAST &&
chk_addr_ret != RTN_BROADCAST)
-@@ -505,7 +515,7 @@ int inet_bind(struct socket *sock, struc
+@@ -522,7 +531,7 @@ int inet_bind(struct socket *sock, struc
if (sk->sk_state != TCP_CLOSE || inet->inet_num)
goto out_release_sock;
if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST)
inet->inet_saddr = 0; /* Use device */
-@@ -708,11 +718,13 @@ int inet_getname(struct socket *sock, st
+@@ -741,11 +750,13 @@ int inet_getname(struct socket *sock, st
peer == 1))
return -ENOTCONN;
sin->sin_port = inet->inet_dport;
sin->sin_port = inet->inet_sport;
sin->sin_addr.s_addr = addr;
}
-diff -NurpP --minimal linux-3.0-rc5/net/ipv4/devinet.c linux-3.0-rc5-vs2.3.1-pre3/net/ipv4/devinet.c
---- linux-3.0-rc5/net/ipv4/devinet.c 2011-07-01 11:14:26.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/net/ipv4/devinet.c 2011-06-10 22:11:24.000000000 +0200
-@@ -518,6 +518,7 @@ struct in_device *inetdev_by_index(struc
+diff -NurpP --minimal linux-3.10.53/net/ipv4/arp.c linux-3.10.53-vs2.3.6.8/net/ipv4/arp.c
+--- linux-3.10.53/net/ipv4/arp.c 2013-07-14 17:01:37.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/net/ipv4/arp.c 2013-08-22 20:30:00.000000000 +0000
+@@ -1332,6 +1332,7 @@ static void arp_format_neigh_entry(struc
+ struct net_device *dev = n->dev;
+ int hatype = dev->type;
+
++ /* FIXME: check for network context */
+ read_lock(&n->lock);
+ /* Convert hardware address to XX:XX:XX:XX ... form. */
+ #if IS_ENABLED(CONFIG_AX25)
+@@ -1363,6 +1364,7 @@ static void arp_format_pneigh_entry(stru
+ int hatype = dev ? dev->type : 0;
+ char tbuf[16];
+
++ /* FIXME: check for network context */
+ 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.10.53/net/ipv4/devinet.c linux-3.10.53-vs2.3.6.8/net/ipv4/devinet.c
+--- linux-3.10.53/net/ipv4/devinet.c 2014-08-30 13:39:03.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/net/ipv4/devinet.c 2014-03-12 13:18:33.000000000 +0000
+@@ -522,6 +522,7 @@ struct in_device *inetdev_by_index(struc
}
EXPORT_SYMBOL(inetdev_by_index);
/* Called only from RTNL semaphored context. No locks. */
struct in_ifaddr *inet_ifa_byprefix(struct in_device *in_dev, __be32 prefix,
-@@ -759,6 +760,8 @@ int devinet_ioctl(struct net *net, unsig
+@@ -942,6 +943,8 @@ int devinet_ioctl(struct net *net, unsig
in_dev = __in_dev_get_rtnl(dev);
if (in_dev) {
if (tryaddrmatch) {
/* Matthias Andree */
/* compare label and address (4.4BSD style) */
-@@ -767,6 +770,8 @@ int devinet_ioctl(struct net *net, unsig
+@@ -950,6 +953,8 @@ int devinet_ioctl(struct net *net, unsig
This is checked above. */
for (ifap = &in_dev->ifa_list; (ifa = *ifap) != NULL;
ifap = &ifa->ifa_next) {
if (!strcmp(ifr.ifr_name, ifa->ifa_label) &&
sin_orig.sin_addr.s_addr ==
ifa->ifa_local) {
-@@ -779,9 +784,12 @@ int devinet_ioctl(struct net *net, unsig
+@@ -962,9 +967,12 @@ int devinet_ioctl(struct net *net, unsig
comparing just the label */
if (!ifa) {
for (ifap = &in_dev->ifa_list; (ifa = *ifap) != NULL;
}
}
-@@ -934,6 +942,8 @@ static int inet_gifconf(struct net_devic
+@@ -1118,6 +1126,8 @@ static int inet_gifconf(struct net_devic
goto out;
for (ifa = in_dev->ifa_list; ifa; ifa = ifa->ifa_next) {
if (!buf) {
done += sizeof(ifr);
continue;
-@@ -1294,6 +1304,7 @@ static int inet_dump_ifaddr(struct sk_bu
+@@ -1522,6 +1532,7 @@ static int inet_dump_ifaddr(struct sk_bu
struct net_device *dev;
struct in_device *in_dev;
struct in_ifaddr *ifa;
+ struct sock *sk = skb->sk;
struct hlist_head *head;
- struct hlist_node *node;
-@@ -1316,6 +1327,8 @@ static int inet_dump_ifaddr(struct sk_bu
+ s_h = cb->args[0];
+@@ -1545,6 +1556,8 @@ static int inet_dump_ifaddr(struct sk_bu
for (ifa = in_dev->ifa_list, ip_idx = 0; ifa;
ifa = ifa->ifa_next, ip_idx++) {
if (ip_idx < s_ip_idx)
continue;
if (inet_fill_ifaddr(skb, ifa,
-diff -NurpP --minimal linux-3.0-rc5/net/ipv4/inet_connection_sock.c linux-3.0-rc5-vs2.3.1-pre3/net/ipv4/inet_connection_sock.c
---- linux-3.0-rc5/net/ipv4/inet_connection_sock.c 2011-07-01 11:14:26.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/net/ipv4/inet_connection_sock.c 2011-06-10 22:11:24.000000000 +0200
-@@ -52,6 +52,37 @@ void inet_get_local_port_range(int *low,
+diff -NurpP --minimal linux-3.10.53/net/ipv4/fib_trie.c linux-3.10.53-vs2.3.6.8/net/ipv4/fib_trie.c
+--- linux-3.10.53/net/ipv4/fib_trie.c 2014-08-30 13:39:03.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/net/ipv4/fib_trie.c 2013-11-13 17:17:16.000000000 +0000
+@@ -2536,6 +2536,7 @@ static int fib_route_seq_show(struct seq
+ || fa->fa_type == RTN_MULTICAST)
+ continue;
+
++ /* 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.10.53/net/ipv4/inet_connection_sock.c linux-3.10.53-vs2.3.6.8/net/ipv4/inet_connection_sock.c
+--- linux-3.10.53/net/ipv4/inet_connection_sock.c 2013-07-14 17:01:37.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/net/ipv4/inet_connection_sock.c 2013-08-22 20:30:00.000000000 +0000
+@@ -53,6 +53,37 @@ void inet_get_local_port_range(int *low,
}
EXPORT_SYMBOL(inet_get_local_port_range);
+}
+
int inet_csk_bind_conflict(const struct sock *sk,
- const struct inet_bind_bucket *tb)
+ const struct inet_bind_bucket *tb, bool relax)
{
-@@ -74,9 +105,7 @@ int inet_csk_bind_conflict(const struct
- sk->sk_bound_dev_if == sk2->sk_bound_dev_if)) {
- if (!reuse || !sk2->sk_reuse ||
- sk2->sk_state == TCP_LISTEN) {
+@@ -79,17 +110,12 @@ int inet_csk_bind_conflict(const struct
+ (!reuseport || !sk2->sk_reuseport ||
+ (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 (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 (ipv4_rcv_saddr_equal(sk, sk2))
break;
}
}
-diff -NurpP --minimal linux-3.0-rc5/net/ipv4/inet_diag.c linux-3.0-rc5-vs2.3.1-pre3/net/ipv4/inet_diag.c
---- linux-3.0-rc5/net/ipv4/inet_diag.c 2011-07-01 11:14:26.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/net/ipv4/inet_diag.c 2011-06-22 12:39:16.000000000 +0200
-@@ -33,6 +33,8 @@
- #include <linux/stddef.h>
+diff -NurpP --minimal linux-3.10.53/net/ipv4/inet_diag.c linux-3.10.53-vs2.3.6.8/net/ipv4/inet_diag.c
+--- linux-3.10.53/net/ipv4/inet_diag.c 2014-08-30 13:39:03.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/net/ipv4/inet_diag.c 2014-03-12 13:18:23.000000000 +0000
+@@ -31,6 +31,8 @@
- #include <linux/inet_diag.h>
+ #include <linux/inet.h>
+ #include <linux/stddef.h>
+#include <linux/vs_network.h>
+#include <linux/vs_inet.h>
- static const struct inet_diag_handler **inet_diag_table;
-
-@@ -119,8 +121,10 @@ static int inet_csk_diag_fill(struct soc
+ #include <linux/inet_diag.h>
+ #include <linux/sock_diag.h>
+@@ -110,8 +112,10 @@ int inet_sk_diag_fill(struct sock *sk, s
+ memset(&r->id.idiag_src, 0, sizeof(r->id.idiag_src));
+ memset(&r->id.idiag_dst, 0, sizeof(r->id.idiag_dst));
- r->id.idiag_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,
+ r->id.idiag_dst[0] = nx_map_sock_lback(sk->sk_nx_info,
+ inet->inet_daddr);
- #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
- if (r->idiag_family == AF_INET6) {
-@@ -205,8 +209,8 @@ static int inet_twsk_diag_fill(struct in
- r->id.idiag_cookie[1] = (u32)(((unsigned long)tw >> 31) >> 1);
- r->id.idiag_sport = tw->tw_sport;
- r->id.idiag_dport = tw->tw_dport;
+ if (nla_put_u8(skb, INET_DIAG_SHUTDOWN, sk->sk_shutdown))
+ goto errout;
+@@ -254,8 +258,8 @@ static int inet_twsk_diag_fill(struct in
+ memset(&r->id.idiag_src, 0, sizeof(r->id.idiag_src));
+ memset(&r->id.idiag_dst, 0, sizeof(r->id.idiag_dst));
+
- r->id.idiag_src[0] = tw->tw_rcv_saddr;
- r->id.idiag_dst[0] = tw->tw_daddr;
+ r->id.idiag_src[0] = nx_map_sock_lback(tw->tw_nx_info, tw->tw_rcv_saddr);
+ r->id.idiag_dst[0] = nx_map_sock_lback(tw->tw_nx_info, tw->tw_daddr);
+
r->idiag_state = tw->tw_substate;
r->idiag_timer = 3;
- r->idiag_expires = DIV_ROUND_UP(tmo * 1000, HZ);
-@@ -263,6 +267,7 @@ static int inet_diag_get_exact(struct sk
- err = -EINVAL;
+@@ -300,12 +304,14 @@ int inet_diag_dump_one_icsk(struct inet_
- if (req->idiag_family == AF_INET) {
+ err = -EINVAL;
+ if (req->sdiag_family == AF_INET) {
+ /* TODO: lback */
- sk = inet_lookup(&init_net, hashinfo, req->id.idiag_dst[0],
+ sk = inet_lookup(net, hashinfo, req->id.idiag_dst[0],
req->id.idiag_dport, req->id.idiag_src[0],
req->id.idiag_sport, req->id.idiag_if);
-@@ -505,6 +510,7 @@ static int inet_csk_diag_dump(struct soc
- } else
+ }
+ #if IS_ENABLED(CONFIG_IPV6)
+ else if (req->sdiag_family == AF_INET6) {
++ /* TODO: lback */
+ sk = inet6_lookup(net, hashinfo,
+ (struct in6_addr *)req->id.idiag_dst,
+ req->id.idiag_dport,
+@@ -507,6 +513,7 @@ int inet_diag_bc_sk(const struct nlattr
+ } else
#endif
- {
+ {
+ /* TODO: lback */
- entry.saddr = &inet->inet_rcv_saddr;
- entry.daddr = &inet->inet_daddr;
- }
-@@ -543,6 +549,7 @@ static int inet_twsk_diag_dump(struct in
+ entry.saddr = &inet->inet_rcv_saddr;
+ entry.daddr = &inet->inet_daddr;
+ }
+@@ -665,6 +672,7 @@ static int inet_twsk_diag_dump(struct in
} else
#endif
{
entry.saddr = &tw->tw_rcv_saddr;
entry.daddr = &tw->tw_daddr;
}
-@@ -589,8 +596,8 @@ static int inet_diag_fill_req(struct sk_
+@@ -747,8 +755,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_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);
+
r->idiag_expires = jiffies_to_msecs(tmo);
r->idiag_rqueue = 0;
- r->idiag_wqueue = 0;
-@@ -661,6 +668,7 @@ static int inet_diag_dump_reqs(struct sk
+@@ -812,6 +820,7 @@ static int inet_diag_dump_reqs(struct sk
+ r->id.idiag_dport)
continue;
++ /* TODO: lback */
if (bc) {
-+ /* TODO: lback */
- entry.saddr =
- #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
- (entry.family == AF_INET6) ?
-@@ -731,6 +739,8 @@ static int inet_diag_dump(struct sk_buff
- sk_nulls_for_each(sk, node, &ilb->head) {
- struct inet_sock *inet = inet_sk(sk);
+ inet_diag_req_addrs(sk, req, &entry);
+ entry.dport = ntohs(ireq->rmt_port);
+@@ -868,6 +877,8 @@ void inet_diag_dump_icsk(struct inet_has
+ if (!net_eq(sock_net(sk), net))
+ continue;
+ if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
+ continue;
if (num < s_num) {
num++;
continue;
-@@ -797,6 +807,8 @@ skip_listen_ht:
- sk_nulls_for_each(sk, node, &head->chain) {
- struct inet_sock *inet = inet_sk(sk);
+@@ -940,6 +951,8 @@ skip_listen_ht:
+ if (!net_eq(sock_net(sk), net))
+ continue;
+ if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
+ continue;
if (num < s_num)
goto next_normal;
if (!(r->idiag_states & (1 << sk->sk_state)))
-@@ -821,6 +833,8 @@ next_normal:
- inet_twsk_for_each(tw, node,
+@@ -968,7 +981,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->id.idiag_sport != tw->tw_sport &&
-diff -NurpP --minimal linux-3.0-rc5/net/ipv4/inet_hashtables.c linux-3.0-rc5-vs2.3.1-pre3/net/ipv4/inet_hashtables.c
---- linux-3.0-rc5/net/ipv4/inet_hashtables.c 2011-01-05 21:50:42.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/net/ipv4/inet_hashtables.c 2011-06-10 22:11:24.000000000 +0200
-@@ -21,6 +21,7 @@
-
+ if (!(r->idiag_states & (1 << tw->tw_substate)))
+diff -NurpP --minimal linux-3.10.53/net/ipv4/inet_hashtables.c linux-3.10.53-vs2.3.6.8/net/ipv4/inet_hashtables.c
+--- linux-3.10.53/net/ipv4/inet_hashtables.c 2014-08-30 13:39:03.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/net/ipv4/inet_hashtables.c 2013-11-13 17:22:25.000000000 +0000
+@@ -22,6 +22,7 @@
#include <net/inet_connection_sock.h>
#include <net/inet_hashtables.h>
+ #include <net/secure_seq.h>
+#include <net/route.h>
#include <net/ip.h>
/*
-@@ -155,6 +156,11 @@ static inline int compute_score(struct s
+@@ -156,6 +157,11 @@ static inline int compute_score(struct s
if (rcv_saddr != daddr)
return -1;
- score += 2;
+ score += 4;
+ } else {
+ /* block non nx_info ips */
+ if (!v4_addr_in_nx_info(sk->sk_nx_info,
}
if (sk->sk_bound_dev_if) {
if (sk->sk_bound_dev_if != dif)
-@@ -172,7 +178,6 @@ static inline int compute_score(struct s
+@@ -173,7 +179,6 @@ static inline int compute_score(struct s
* wildcarded during the search since they can never be otherwise.
*/
-
struct sock *__inet_lookup_listener(struct net *net,
struct inet_hashinfo *hashinfo,
- const __be32 daddr, const unsigned short hnum,
-@@ -195,6 +200,7 @@ begin:
- hiscore = score;
+ const __be32 saddr, __be16 sport,
+@@ -209,6 +214,7 @@ begin:
+ phash = next_pseudo_random32(phash);
}
}
+
/*
* if the nulls value we got at the end of this lookup is
* not the expected one, we must restart lookup.
-diff -NurpP --minimal linux-3.0-rc5/net/ipv4/netfilter/nf_nat_helper.c linux-3.0-rc5-vs2.3.1-pre3/net/ipv4/netfilter/nf_nat_helper.c
---- linux-3.0-rc5/net/ipv4/netfilter/nf_nat_helper.c 2011-07-01 11:14:26.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/net/ipv4/netfilter/nf_nat_helper.c 2011-06-15 02:40:14.000000000 +0200
-@@ -20,6 +20,7 @@
- #include <net/route.h>
-
- #include <linux/netfilter_ipv4.h>
-+#include <net/route.h>
- #include <net/netfilter/nf_conntrack.h>
- #include <net/netfilter/nf_conntrack_helper.h>
- #include <net/netfilter/nf_conntrack_ecache.h>
-diff -NurpP --minimal linux-3.0-rc5/net/ipv4/netfilter.c linux-3.0-rc5-vs2.3.1-pre3/net/ipv4/netfilter.c
---- linux-3.0-rc5/net/ipv4/netfilter.c 2011-05-22 16:18:00.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/net/ipv4/netfilter.c 2011-06-10 22:11:24.000000000 +0200
-@@ -5,7 +5,7 @@
- #include <linux/ip.h>
+diff -NurpP --minimal linux-3.10.53/net/ipv4/netfilter.c linux-3.10.53-vs2.3.6.8/net/ipv4/netfilter.c
+--- linux-3.10.53/net/ipv4/netfilter.c 2013-07-14 17:01:37.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/net/ipv4/netfilter.c 2013-08-22 20:30:00.000000000 +0000
+@@ -11,7 +11,7 @@
#include <linux/skbuff.h>
#include <linux/gfp.h>
+ #include <linux/export.h>
-#include <net/route.h>
+// #include <net/route.h>
#include <net/xfrm.h>
#include <net/ip.h>
#include <net/netfilter/nf_queue.h>
-diff -NurpP --minimal linux-3.0-rc5/net/ipv4/raw.c linux-3.0-rc5-vs2.3.1-pre3/net/ipv4/raw.c
---- linux-3.0-rc5/net/ipv4/raw.c 2011-07-01 11:14:26.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/net/ipv4/raw.c 2011-06-10 22:11:24.000000000 +0200
-@@ -117,7 +117,7 @@ static struct sock *__raw_v4_lookup(stru
+diff -NurpP --minimal linux-3.10.53/net/ipv4/raw.c linux-3.10.53-vs2.3.6.8/net/ipv4/raw.c
+--- linux-3.10.53/net/ipv4/raw.c 2014-08-30 13:39:03.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/net/ipv4/raw.c 2014-08-30 14:03:55.000000000 +0000
+@@ -116,7 +116,7 @@ static struct sock *__raw_v4_lookup(stru
if (net_eq(sock_net(sk), net) && inet->inet_num == num &&
!(inet->inet_daddr && inet->inet_daddr != raddr) &&
!(sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif))
goto found; /* gotcha */
}
-@@ -385,6 +385,12 @@ static int raw_send_hdrinc(struct sock *
+@@ -395,6 +395,12 @@ static int raw_send_hdrinc(struct sock *
icmp_out_count(net, ((struct icmphdr *)
skb_transport_header(skb))->type);
err = NF_HOOK(NFPROTO_IPV4, NF_INET_LOCAL_OUT, skb, NULL,
rt->dst.dev, dst_output);
if (err > 0)
-@@ -647,17 +653,19 @@ static int raw_bind(struct sock *sk, str
+@@ -581,6 +587,16 @@ static int raw_sendmsg(struct kiocb *ioc
+ goto done;
+ }
+
++ if (sk->sk_nx_info) {
++ rt = ip_v4_find_src(sock_net(sk), sk->sk_nx_info, &fl4);
++ if (IS_ERR(rt)) {
++ err = PTR_ERR(rt);
++ rt = NULL;
++ goto done;
++ }
++ ip_rt_put(rt);
++ }
++
+ security_sk_classify_flow(sk, flowi4_to_flowi(&fl4));
+ rt = ip_route_output_flow(sock_net(sk), &fl4, sk);
+ if (IS_ERR(rt)) {
+@@ -657,17 +673,19 @@ static int raw_bind(struct sock *sk, str
{
struct inet_sock *inet = inet_sk(sk);
struct sockaddr_in *addr = (struct sockaddr_in *) uaddr;
if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST)
inet->inet_saddr = 0; /* Use device */
sk_dst_reset(sk);
-@@ -709,7 +717,8 @@ static int raw_recvmsg(struct kiocb *ioc
+@@ -716,7 +734,8 @@ static int raw_recvmsg(struct kiocb *ioc
/* Copy the address. */
if (sin) {
sin->sin_family = AF_INET;
+ 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));
- }
-@@ -905,7 +914,8 @@ static struct sock *raw_get_first(struct
- struct hlist_node *node;
-
- sk_for_each(sk, node, &state->h->ht[state->bucket])
+ *addr_len = sizeof(*sin);
+@@ -912,7 +931,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])
- if (sock_net(sk) == seq_file_net(seq))
+ if ((sock_net(sk) == seq_file_net(seq)) &&
-+ nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
++ nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
goto found;
}
sk = NULL;
-@@ -921,7 +931,8 @@ static struct sock *raw_get_next(struct
+@@ -928,7 +948,8 @@ static struct sock *raw_get_next(struct
sk = sk_next(sk);
try_again:
;
if (!sk && ++state->bucket < RAW_HTABLE_SIZE) {
sk = sk_head(&state->h->ht[state->bucket]);
-diff -NurpP --minimal linux-3.0-rc5/net/ipv4/tcp.c linux-3.0-rc5-vs2.3.1-pre3/net/ipv4/tcp.c
---- linux-3.0-rc5/net/ipv4/tcp.c 2011-07-01 11:14:26.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/net/ipv4/tcp.c 2011-06-10 22:11:24.000000000 +0200
-@@ -266,6 +266,7 @@
+diff -NurpP --minimal linux-3.10.53/net/ipv4/route.c linux-3.10.53-vs2.3.6.8/net/ipv4/route.c
+--- linux-3.10.53/net/ipv4/route.c 2014-08-30 13:39:03.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/net/ipv4/route.c 2014-08-30 14:03:55.000000000 +0000
+@@ -2023,7 +2023,7 @@ struct rtable *__ip_route_output_key(str
+
+
+ if (fl4->flowi4_oif) {
+- dev_out = dev_get_by_index_rcu(net, fl4->flowi4_oif);
++ dev_out = dev_get_by_index_real_rcu(net, fl4->flowi4_oif);
+ rth = ERR_PTR(-ENODEV);
+ if (dev_out == NULL)
+ goto out;
+diff -NurpP --minimal linux-3.10.53/net/ipv4/tcp.c linux-3.10.53-vs2.3.6.8/net/ipv4/tcp.c
+--- linux-3.10.53/net/ipv4/tcp.c 2014-08-30 13:39:03.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/net/ipv4/tcp.c 2014-08-30 14:03:55.000000000 +0000
+@@ -268,6 +268,7 @@
#include <linux/crypto.h>
#include <linux/time.h>
#include <linux/slab.h>
+#include <linux/in.h>
#include <net/icmp.h>
- #include <net/tcp.h>
-diff -NurpP --minimal linux-3.0-rc5/net/ipv4/tcp_ipv4.c linux-3.0-rc5-vs2.3.1-pre3/net/ipv4/tcp_ipv4.c
---- linux-3.0-rc5/net/ipv4/tcp_ipv4.c 2011-07-01 11:14:26.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/net/ipv4/tcp_ipv4.c 2011-06-22 12:39:16.000000000 +0200
-@@ -2002,6 +2002,12 @@ static void *listening_get_next(struct s
+ #include <net/inet_common.h>
+diff -NurpP --minimal linux-3.10.53/net/ipv4/tcp_ipv4.c linux-3.10.53-vs2.3.6.8/net/ipv4/tcp_ipv4.c
+--- linux-3.10.53/net/ipv4/tcp_ipv4.c 2014-08-30 13:39:03.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/net/ipv4/tcp_ipv4.c 2013-12-23 17:42:40.000000000 +0000
+@@ -2263,6 +2263,12 @@ static void *listening_get_next(struct s
req = req->dl_next;
while (1) {
while (req) {
if (req->rsk_ops->family == st->family) {
cur = req;
goto out;
-@@ -2026,6 +2032,10 @@ get_req:
+@@ -2287,6 +2293,10 @@ get_req:
}
get_sk:
sk_nulls_for_each_from(sk, node) {
if (!net_eq(sock_net(sk), net))
continue;
if (sk->sk_family == st->family) {
-@@ -2102,6 +2112,11 @@ static void *established_get_first(struc
+@@ -2363,6 +2373,11 @@ static void *established_get_first(struc
spin_lock_bh(lock);
sk_nulls_for_each(sk, node, &tcp_hashinfo.ehash[st->bucket].chain) {
if (sk->sk_family != st->family ||
!net_eq(sock_net(sk), net)) {
continue;
-@@ -2112,6 +2127,11 @@ static void *established_get_first(struc
+@@ -2373,6 +2388,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) {
if (tw->tw_family != st->family ||
!net_eq(twsk_net(tw), net)) {
continue;
-@@ -2141,7 +2161,9 @@ static void *established_get_next(struct
+@@ -2402,7 +2422,9 @@ static void *established_get_next(struct
tw = cur;
tw = tw_next(tw);
get_tw:
tw = tw_next(tw);
}
if (tw) {
-@@ -2165,6 +2187,11 @@ get_tw:
+@@ -2426,6 +2448,11 @@ get_tw:
sk = sk_nulls_next(sk);
sk_nulls_for_each_from(sk, node) {
if (sk->sk_family == st->family && net_eq(sock_net(sk), net))
goto found;
}
-@@ -2374,9 +2401,9 @@ static void get_openreq4(struct sock *sk
+@@ -2631,9 +2658,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",
i,
ntohs(ireq->rmt_port),
TCP_SYN_RECV,
0, 0, /* could print option size, but that is af dependent. */
-diff -NurpP --minimal linux-3.0-rc5/net/ipv4/tcp_minisocks.c linux-3.0-rc5-vs2.3.1-pre3/net/ipv4/tcp_minisocks.c
---- linux-3.0-rc5/net/ipv4/tcp_minisocks.c 2011-03-15 18:07:45.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/net/ipv4/tcp_minisocks.c 2011-06-10 22:11:24.000000000 +0200
+@@ -2656,8 +2683,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;
+- __be32 dest = inet->inet_daddr;
+- __be32 src = inet->inet_rcv_saddr;
++ __be32 dest = nx_map_sock_lback(current_nx_info(), inet->inet_daddr);
++ __be32 src = nx_map_sock_lback(current_nx_info(), inet->inet_rcv_saddr);
+ __u16 destp = ntohs(inet->inet_dport);
+ __u16 srcp = ntohs(inet->inet_sport);
+ int rx_queue;
+@@ -2715,8 +2742,8 @@ static void get_timewait4_sock(const str
+ __u16 destp, srcp;
+ long delta = tw->tw_ttd - jiffies;
+
+- dest = tw->tw_daddr;
+- src = tw->tw_rcv_saddr;
++ dest = nx_map_sock_lback(current_nx_info(), tw->tw_daddr);
++ src = nx_map_sock_lback(current_nx_info(), tw->tw_rcv_saddr);
+ destp = ntohs(tw->tw_dport);
+ srcp = ntohs(tw->tw_sport);
+
+diff -NurpP --minimal linux-3.10.53/net/ipv4/tcp_minisocks.c linux-3.10.53-vs2.3.6.8/net/ipv4/tcp_minisocks.c
+--- linux-3.10.53/net/ipv4/tcp_minisocks.c 2013-07-14 17:01:37.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/net/ipv4/tcp_minisocks.c 2013-08-22 20:30:00.000000000 +0000
@@ -23,6 +23,9 @@
#include <linux/slab.h>
#include <linux/sysctl.h>
#include <net/tcp.h>
#include <net/inet_common.h>
#include <net/xfrm.h>
-@@ -335,6 +338,11 @@ void tcp_time_wait(struct sock *sk, int
- tcptw->tw_ts_recent = tp->rx_opt.ts_recent;
+@@ -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;
+ tw->tw_xid = sk->sk_xid;
+ tw->tw_vx_info = NULL;
+ tw->tw_nid = sk->sk_nid;
+ tw->tw_nx_info = NULL;
+
- #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+ #if IS_ENABLED(CONFIG_IPV6)
if (tw->tw_family == PF_INET6) {
struct ipv6_pinfo *np = inet6_sk(sk);
-diff -NurpP --minimal linux-3.0-rc5/net/ipv4/udp.c linux-3.0-rc5-vs2.3.1-pre3/net/ipv4/udp.c
---- linux-3.0-rc5/net/ipv4/udp.c 2011-07-01 11:14:26.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/net/ipv4/udp.c 2011-06-10 22:11:24.000000000 +0200
-@@ -296,14 +296,7 @@ fail:
+diff -NurpP --minimal linux-3.10.53/net/ipv4/udp.c linux-3.10.53-vs2.3.6.8/net/ipv4/udp.c
+--- linux-3.10.53/net/ipv4/udp.c 2014-08-30 13:39:03.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/net/ipv4/udp.c 2013-12-23 17:42:40.000000000 +0000
+@@ -306,14 +306,7 @@ fail:
}
EXPORT_SYMBOL(udp_lib_get_port);
static unsigned int udp4_portaddr_hash(struct net *net, __be32 saddr,
unsigned int port)
-@@ -338,6 +331,11 @@ static inline int compute_score(struct s
+@@ -348,6 +341,11 @@ static inline int compute_score(struct s
if (inet->inet_rcv_saddr != daddr)
return -1;
- score += 2;
+ score += 4;
+ } else {
+ /* block non nx_info ips */
+ if (!v4_addr_in_nx_info(sk->sk_nx_info,
}
if (inet->inet_daddr) {
if (inet->inet_daddr != saddr)
-@@ -441,6 +439,7 @@ exact_match:
+@@ -458,6 +456,7 @@ begin:
return result;
}
/* UDP is nearly always wildcards out the wazoo, it makes no sense to try
* harder than this. -DaveM
*/
-@@ -486,6 +485,11 @@ begin:
+@@ -504,6 +503,11 @@ begin:
sk_nulls_for_each_rcu(sk, node, &hslot->head) {
score = compute_score(sk, net, saddr, hnum, sport,
daddr, dport, dif);
if (score > badness) {
result = sk;
badness = score;
-@@ -499,6 +503,7 @@ begin:
+@@ -528,6 +532,7 @@ begin:
if (get_nulls_value(node) != slot)
goto begin;
if (result) {
if (unlikely(!atomic_inc_not_zero_hint(&result->sk_refcnt, 2)))
result = NULL;
-@@ -508,6 +513,7 @@ begin:
+@@ -537,6 +542,7 @@ begin:
goto begin;
}
}
rcu_read_unlock();
return result;
}
-@@ -550,8 +556,7 @@ static inline struct sock *udp_v4_mcast_
+@@ -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) ||
ipv6_only_sock(s) ||
(s->sk_bound_dev_if && s->sk_bound_dev_if != dif))
continue;
-@@ -1226,7 +1231,8 @@ try_again:
+@@ -965,6 +970,16 @@ int udp_sendmsg(struct kiocb *iocb, stru
+ inet_sk_flowi_flags(sk)|FLOWI_FLAG_CAN_SLEEP,
+ faddr, saddr, dport, inet->inet_sport);
+
++ if (sk->sk_nx_info) {
++ rt = ip_v4_find_src(net, sk->sk_nx_info, fl4);
++ if (IS_ERR(rt)) {
++ err = PTR_ERR(rt);
++ rt = NULL;
++ goto out;
++ }
++ ip_rt_put(rt);
++ }
++
+ 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:
if (sin) {
sin->sin_family = AF_INET;
sin->sin_port = udp_hdr(skb)->source;
+ 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)
-@@ -1967,6 +1973,8 @@ static struct sock *udp_get_first(struct
+@@ -2031,6 +2047,8 @@ static struct sock *udp_get_first(struct
sk_nulls_for_each(sk, node, &hslot->head) {
if (!net_eq(sock_net(sk), net))
continue;
if (sk->sk_family == state->family)
goto found;
}
-@@ -1984,7 +1992,9 @@ static struct sock *udp_get_next(struct
+@@ -2048,7 +2066,9 @@ static struct sock *udp_get_next(struct
do {
sk = sk_nulls_next(sk);
if (!sk) {
if (state->bucket <= state->udp_table->mask)
-diff -NurpP --minimal linux-3.0-rc5/net/ipv6/Kconfig linux-3.0-rc5-vs2.3.1-pre3/net/ipv6/Kconfig
---- linux-3.0-rc5/net/ipv6/Kconfig 2010-08-02 16:52:59.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/net/ipv6/Kconfig 2011-06-10 22:11:24.000000000 +0200
+@@ -2144,8 +2164,8 @@ static void udp4_format_sock(struct sock
+ int bucket, int *len)
+ {
+ struct inet_sock *inet = inet_sk(sp);
+- __be32 dest = inet->inet_daddr;
+- __be32 src = inet->inet_rcv_saddr;
++ __be32 dest = nx_map_sock_lback(current_nx_info(), inet->inet_daddr);
++ __be32 src = nx_map_sock_lback(current_nx_info(), inet->inet_rcv_saddr);
+ __u16 destp = ntohs(inet->inet_dport);
+ __u16 srcp = ntohs(inet->inet_sport);
+
+diff -NurpP --minimal linux-3.10.53/net/ipv6/Kconfig linux-3.10.53-vs2.3.6.8/net/ipv6/Kconfig
+--- linux-3.10.53/net/ipv6/Kconfig 2013-07-14 17:01:38.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/net/ipv6/Kconfig 2013-08-22 20:30:00.000000000 +0000
@@ -4,8 +4,8 @@
# IPv6 as module will cause a CRASH if you try to unload it
---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.0-rc5/net/ipv6/addrconf.c linux-3.0-rc5-vs2.3.1-pre3/net/ipv6/addrconf.c
---- linux-3.0-rc5/net/ipv6/addrconf.c 2011-07-01 11:14:26.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/net/ipv6/addrconf.c 2011-06-10 22:11:24.000000000 +0200
-@@ -87,6 +87,8 @@
-
+diff -NurpP --minimal linux-3.10.53/net/ipv6/addrconf.c linux-3.10.53-vs2.3.6.8/net/ipv6/addrconf.c
+--- linux-3.10.53/net/ipv6/addrconf.c 2014-08-30 13:39:03.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/net/ipv6/addrconf.c 2014-04-22 03:48:11.000000000 +0000
+@@ -94,6 +94,8 @@
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
+ #include <linux/export.h>
+#include <linux/vs_network.h>
+#include <linux/vs_inet6.h>
/* Set to 3 to get tracing... */
#define ACONF_DEBUG 2
-@@ -1108,7 +1110,7 @@ out:
+@@ -1324,7 +1326,7 @@ out:
- int ipv6_dev_get_saddr(struct net *net, struct net_device *dst_dev,
+ int ipv6_dev_get_saddr(struct net *net, const struct net_device *dst_dev,
const struct in6_addr *daddr, unsigned int prefs,
- struct in6_addr *saddr)
+ struct in6_addr *saddr, struct nx_info *nxi)
{
struct ipv6_saddr_score scores[2],
*score = &scores[0], *hiscore = &scores[1];
-@@ -1180,6 +1182,8 @@ int ipv6_dev_get_saddr(struct net *net,
+@@ -1396,6 +1398,8 @@ int ipv6_dev_get_saddr(struct net *net,
dev->name);
continue;
}
score->rule = -1;
bitmap_zero(score->scorebits, IPV6_SADDR_RULE_MAX);
-@@ -3048,7 +3052,10 @@ static void if6_seq_stop(struct seq_file
+@@ -3451,7 +3455,10 @@ static void if6_seq_stop(struct seq_file
static int if6_seq_show(struct seq_file *seq, void *v)
{
struct inet6_ifaddr *ifp = (struct inet6_ifaddr *)v;
&ifp->addr,
ifp->idev->dev->ifindex,
ifp->prefix_len,
-@@ -3554,6 +3561,11 @@ static int in6_dump_addrs(struct inet6_d
+@@ -3955,6 +3962,11 @@ static int in6_dump_addrs(struct inet6_d
struct ifacaddr6 *ifaca;
int err = 1;
int ip_idx = *p_ip_idx;
read_lock_bh(&idev->lock);
switch (type) {
-@@ -3564,6 +3576,8 @@ static int in6_dump_addrs(struct inet6_d
+@@ -3965,6 +3977,8 @@ static int in6_dump_addrs(struct inet6_d
list_for_each_entry(ifa, &idev->addr_list, if_list) {
if (++ip_idx < s_ip_idx)
continue;
+ if (!v6_addr_in_nx_info(nxi, &ifa->addr, -1))
+ continue;
err = inet6_fill_ifaddr(skb, ifa,
- NETLINK_CB(cb->skb).pid,
+ NETLINK_CB(cb->skb).portid,
cb->nlh->nlmsg_seq,
-@@ -3580,6 +3594,8 @@ static int in6_dump_addrs(struct inet6_d
+@@ -3982,6 +3996,8 @@ static int in6_dump_addrs(struct inet6_d
ifmca = ifmca->next, ip_idx++) {
if (ip_idx < s_ip_idx)
continue;
+ if (!v6_addr_in_nx_info(nxi, &ifmca->mca_addr, -1))
+ continue;
err = inet6_fill_ifmcaddr(skb, ifmca,
- NETLINK_CB(cb->skb).pid,
+ NETLINK_CB(cb->skb).portid,
cb->nlh->nlmsg_seq,
-@@ -3595,6 +3611,8 @@ static int in6_dump_addrs(struct inet6_d
+@@ -3997,6 +4013,8 @@ static int in6_dump_addrs(struct inet6_d
ifaca = ifaca->aca_next, ip_idx++) {
if (ip_idx < s_ip_idx)
continue;
+ if (!v6_addr_in_nx_info(nxi, &ifaca->aca_addr, -1))
+ continue;
err = inet6_fill_ifacaddr(skb, ifaca,
- NETLINK_CB(cb->skb).pid,
+ NETLINK_CB(cb->skb).portid,
cb->nlh->nlmsg_seq,
-@@ -3980,6 +3998,11 @@ static int inet6_dump_ifinfo(struct sk_b
+@@ -4025,6 +4043,10 @@ static int inet6_dump_addr(struct sk_buf
struct inet6_dev *idev;
struct hlist_head *head;
- struct hlist_node *node;
-+ struct nx_info *nxi = skb->sk ? skb->sk->sk_nx_info : NULL;
-+
+
+ /* FIXME: maybe disable ipv6 on non v6 guests?
+ if (skb->sk && skb->sk->sk_vx_info)
+ return skb->len; */
++
+ s_h = cb->args[0];
+ s_idx = idx = cb->args[1];
+ s_ip_idx = ip_idx = cb->args[2];
+@@ -4460,6 +4482,7 @@ static int inet6_dump_ifinfo(struct sk_b
+ struct net_device *dev;
+ struct inet6_dev *idev;
+ struct hlist_head *head;
++ struct nx_info *nxi = skb->sk ? skb->sk->sk_nx_info : NULL;
s_h = cb->args[0];
s_idx = cb->args[1];
-@@ -3991,6 +4014,8 @@ static int inet6_dump_ifinfo(struct sk_b
- hlist_for_each_entry_rcu(dev, node, head, index_hlist) {
+@@ -4471,6 +4494,8 @@ static int inet6_dump_ifinfo(struct sk_b
+ hlist_for_each_entry_rcu(dev, head, index_hlist) {
if (idx < s_idx)
goto cont;
+ if (!v6_dev_in_nx_info(dev, nxi))
idev = __in6_dev_get(dev);
if (!idev)
goto cont;
-diff -NurpP --minimal linux-3.0-rc5/net/ipv6/af_inet6.c linux-3.0-rc5-vs2.3.1-pre3/net/ipv6/af_inet6.c
---- linux-3.0-rc5/net/ipv6/af_inet6.c 2011-07-01 11:14:26.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/net/ipv6/af_inet6.c 2011-06-15 02:44:10.000000000 +0200
-@@ -42,6 +42,8 @@
+diff -NurpP --minimal linux-3.10.53/net/ipv6/af_inet6.c linux-3.10.53-vs2.3.6.8/net/ipv6/af_inet6.c
+--- linux-3.10.53/net/ipv6/af_inet6.c 2013-07-14 17:01:38.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/net/ipv6/af_inet6.c 2013-08-22 20:30:00.000000000 +0000
+@@ -43,6 +43,8 @@
#include <linux/netdevice.h>
#include <linux/icmpv6.h>
#include <linux/netfilter_ipv6.h>
#include <net/ip.h>
#include <net/ipv6.h>
-@@ -160,9 +162,12 @@ lookup_protocol:
+@@ -159,10 +161,13 @@ lookup_protocol:
}
err = -EPERM;
+ if ((protocol == IPPROTO_ICMPV6) &&
+ nx_capable(CAP_NET_RAW, NXC_RAW_ICMP))
+ goto override;
- if (sock->type == SOCK_RAW && !kern && !capable(CAP_NET_RAW))
+ if (sock->type == SOCK_RAW && !kern &&
+ !ns_capable(net->user_ns, CAP_NET_RAW))
goto out_rcu_unlock;
-
+override:
sock->ops = answer->ops;
answer_prot = answer->prot;
answer_no_check = answer->no_check;
-@@ -261,6 +266,7 @@ int inet6_bind(struct socket *sock, stru
+@@ -262,6 +267,7 @@ int inet6_bind(struct socket *sock, stru
struct inet_sock *inet = inet_sk(sk);
struct ipv6_pinfo *np = inet6_sk(sk);
struct net *net = sock_net(sk);
__be32 v4addr = 0;
unsigned short snum;
int addr_type = 0;
-@@ -276,6 +282,10 @@ int inet6_bind(struct socket *sock, stru
+@@ -277,6 +283,10 @@ int inet6_bind(struct socket *sock, stru
if (addr->sin6_family != AF_INET6)
- return -EINVAL;
+ return -EAFNOSUPPORT;
+ err = v6_map_sock_addr(inet, addr, &nsa);
+ if (err)
addr_type = ipv6_addr_type(&addr->sin6_addr);
if ((addr_type & IPV6_ADDR_MULTICAST) && sock->type == SOCK_STREAM)
return -EINVAL;
-@@ -307,6 +317,7 @@ int inet6_bind(struct socket *sock, stru
+@@ -308,6 +318,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) &&
-@@ -316,6 +327,10 @@ int inet6_bind(struct socket *sock, stru
+@@ -317,6 +328,10 @@ int inet6_bind(struct socket *sock, stru
err = -EADDRNOTAVAIL;
goto out;
}
} else {
if (addr_type != IPV6_ADDR_ANY) {
struct net_device *dev = NULL;
-@@ -342,6 +357,11 @@ int inet6_bind(struct socket *sock, stru
+@@ -343,6 +358,11 @@ int inet6_bind(struct socket *sock, stru
}
}
+ if (!v6_addr_in_nx_info(sk->sk_nx_info, &addr->sin6_addr, -1)) {
+ err = -EADDRNOTAVAIL;
-+ goto out;
++ goto out_unlock;
+ }
+
/* ipv4 addr of the socket is invalid. Only the
* unspecified and mapped address have a v4 equivalent.
*/
-@@ -358,6 +378,9 @@ int inet6_bind(struct socket *sock, stru
+@@ -359,6 +379,9 @@ int inet6_bind(struct socket *sock, stru
}
}
inet->inet_rcv_saddr = v4addr;
inet->inet_saddr = v4addr;
-@@ -459,9 +482,11 @@ int inet6_getname(struct socket *sock, s
+@@ -460,9 +483,11 @@ int inet6_getname(struct socket *sock, s
return -ENOTCONN;
sin->sin6_port = inet->inet_dport;
- ipv6_addr_copy(&sin->sin6_addr, &np->daddr);
+ sin->sin6_addr = np->daddr;
+ /* FIXME: remap lback? */
if (np->sndflow)
sin->sin6_flowinfo = np->flow_label;
} else {
+ /* FIXME: remap lback? */
if (ipv6_addr_any(&np->rcv_saddr))
- ipv6_addr_copy(&sin->sin6_addr, &np->saddr);
+ sin->sin6_addr = np->saddr;
else
-diff -NurpP --minimal linux-3.0-rc5/net/ipv6/fib6_rules.c linux-3.0-rc5-vs2.3.1-pre3/net/ipv6/fib6_rules.c
---- linux-3.0-rc5/net/ipv6/fib6_rules.c 2011-05-22 16:18:00.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/net/ipv6/fib6_rules.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/net/ipv6/datagram.c linux-3.10.53-vs2.3.6.8/net/ipv6/datagram.c
+--- linux-3.10.53/net/ipv6/datagram.c 2014-08-30 13:39:03.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/net/ipv6/datagram.c 2013-12-23 17:42:40.000000000 +0000
+@@ -656,7 +656,7 @@ int ip6_datagram_send_ctl(struct net *ne
+
+ rcu_read_lock();
+ if (fl6->flowi6_oif) {
+- dev = dev_get_by_index_rcu(net, fl6->flowi6_oif);
++ dev = dev_get_by_index_real_rcu(net, fl6->flowi6_oif);
+ if (!dev) {
+ rcu_read_unlock();
+ return -ENODEV;
+diff -NurpP --minimal linux-3.10.53/net/ipv6/fib6_rules.c linux-3.10.53-vs2.3.6.8/net/ipv6/fib6_rules.c
+--- linux-3.10.53/net/ipv6/fib6_rules.c 2013-02-19 13:58:58.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/net/ipv6/fib6_rules.c 2013-08-22 20:30:00.000000000 +0000
@@ -90,7 +90,7 @@ static int fib6_rule_action(struct fib_r
ip6_dst_idev(&rt->dst)->dev,
&flp6->daddr,
goto again;
if (!ipv6_prefix_equal(&saddr, &r->src.addr,
r->src.plen))
-diff -NurpP --minimal linux-3.0-rc5/net/ipv6/inet6_hashtables.c linux-3.0-rc5-vs2.3.1-pre3/net/ipv6/inet6_hashtables.c
---- linux-3.0-rc5/net/ipv6/inet6_hashtables.c 2011-05-22 16:18:00.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/net/ipv6/inet6_hashtables.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/net/ipv6/inet6_hashtables.c linux-3.10.53-vs2.3.6.8/net/ipv6/inet6_hashtables.c
+--- linux-3.10.53/net/ipv6/inet6_hashtables.c 2014-08-30 13:39:03.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/net/ipv6/inet6_hashtables.c 2013-11-13 17:22:25.000000000 +0000
@@ -16,6 +16,7 @@
#include <linux/module.h>
#include <net/inet_connection_sock.h>
#include <net/inet_hashtables.h>
-@@ -82,7 +83,6 @@ struct sock *__inet6_lookup_established(
+@@ -83,7 +84,6 @@ struct sock *__inet6_lookup_established(
unsigned int slot = hash & hashinfo->ehash_mask;
struct inet_ehash_bucket *head = &hashinfo->ehash[slot];
rcu_read_lock();
begin:
sk_nulls_for_each_rcu(sk, node, &head->chain) {
-@@ -94,7 +94,7 @@ begin:
+@@ -97,7 +97,7 @@ begin:
sock_put(sk);
goto begin;
}
}
}
if (get_nulls_value(node) != slot)
-@@ -140,6 +140,9 @@ static inline int compute_score(struct s
+@@ -147,6 +147,9 @@ static inline int compute_score(struct s
if (!ipv6_addr_equal(&np->rcv_saddr, daddr))
return -1;
score++;
}
if (sk->sk_bound_dev_if) {
if (sk->sk_bound_dev_if != dif)
-diff -NurpP --minimal linux-3.0-rc5/net/ipv6/ip6_output.c linux-3.0-rc5-vs2.3.1-pre3/net/ipv6/ip6_output.c
---- linux-3.0-rc5/net/ipv6/ip6_output.c 2011-07-01 11:14:26.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/net/ipv6/ip6_output.c 2011-06-16 14:16:51.000000000 +0200
-@@ -933,7 +933,8 @@ static int ip6_dst_lookup_tail(struct so
+diff -NurpP --minimal linux-3.10.53/net/ipv6/ip6_output.c linux-3.10.53-vs2.3.6.8/net/ipv6/ip6_output.c
+--- linux-3.10.53/net/ipv6/ip6_output.c 2014-08-30 13:39:03.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/net/ipv6/ip6_output.c 2014-08-30 14:03:55.000000000 +0000
+@@ -917,7 +917,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,
if (err)
goto out_err_release;
}
-diff -NurpP --minimal linux-3.0-rc5/net/ipv6/ndisc.c linux-3.0-rc5-vs2.3.1-pre3/net/ipv6/ndisc.c
---- linux-3.0-rc5/net/ipv6/ndisc.c 2011-07-01 11:14:26.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/net/ipv6/ndisc.c 2011-06-10 22:11:24.000000000 +0200
-@@ -597,7 +597,7 @@ static void ndisc_send_na(struct net_dev
+diff -NurpP --minimal linux-3.10.53/net/ipv6/ndisc.c linux-3.10.53-vs2.3.6.8/net/ipv6/ndisc.c
+--- linux-3.10.53/net/ipv6/ndisc.c 2014-08-30 13:39:03.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/net/ipv6/ndisc.c 2013-11-13 17:17:16.000000000 +0000
+@@ -487,7 +487,7 @@ static void ndisc_send_na(struct net_dev
} else {
if (ipv6_dev_get_saddr(dev_net(dev), dev, daddr,
inet6_sk(dev_net(dev)->ipv6.ndisc_sk)->srcprefs,
return;
src_addr = &tmpaddr;
}
-diff -NurpP --minimal linux-3.0-rc5/net/ipv6/raw.c linux-3.0-rc5-vs2.3.1-pre3/net/ipv6/raw.c
---- linux-3.0-rc5/net/ipv6/raw.c 2011-07-01 11:14:26.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/net/ipv6/raw.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/net/ipv6/netfilter/ip6t_MASQUERADE.c linux-3.10.53-vs2.3.6.8/net/ipv6/netfilter/ip6t_MASQUERADE.c
+--- linux-3.10.53/net/ipv6/netfilter/ip6t_MASQUERADE.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/net/ipv6/netfilter/ip6t_MASQUERADE.c 2013-08-22 20:30:00.000000000 +0000
+@@ -34,7 +34,7 @@ masquerade_tg6(struct sk_buff *skb, cons
+ ctinfo == IP_CT_RELATED_REPLY));
+
+ if (ipv6_dev_get_saddr(dev_net(par->out), par->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.10.53/net/ipv6/raw.c linux-3.10.53-vs2.3.6.8/net/ipv6/raw.c
+--- linux-3.10.53/net/ipv6/raw.c 2014-08-30 13:39:03.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/net/ipv6/raw.c 2013-12-23 17:42:40.000000000 +0000
@@ -30,6 +30,7 @@
#include <linux/icmpv6.h>
#include <linux/netfilter.h>
#include <linux/skbuff.h>
#include <linux/compat.h>
#include <asm/uaccess.h>
-@@ -284,6 +285,13 @@ static int rawv6_bind(struct sock *sk, s
+@@ -283,6 +284,13 @@ static int rawv6_bind(struct sock *sk, s
goto out_unlock;
}
/* ipv4 addr of the socket is invalid. Only the
* unspecified and mapped address have a v4 equivalent.
*/
-diff -NurpP --minimal linux-3.0-rc5/net/ipv6/route.c linux-3.0-rc5-vs2.3.1-pre3/net/ipv6/route.c
---- linux-3.0-rc5/net/ipv6/route.c 2011-07-01 11:14:26.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/net/ipv6/route.c 2011-06-16 14:16:51.000000000 +0200
-@@ -54,6 +54,7 @@
- #include <net/xfrm.h>
+diff -NurpP --minimal linux-3.10.53/net/ipv6/route.c linux-3.10.53-vs2.3.6.8/net/ipv6/route.c
+--- linux-3.10.53/net/ipv6/route.c 2014-08-30 13:39:03.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/net/ipv6/route.c 2014-06-12 11:14:28.000000000 +0000
+@@ -58,6 +58,7 @@
#include <net/netevent.h>
#include <net/netlink.h>
+ #include <net/nexthop.h>
+#include <linux/vs_inet6.h>
#include <asm/uaccess.h>
-@@ -2057,15 +2058,17 @@ int ip6_route_get_saddr(struct net *net,
+@@ -2130,15 +2131,17 @@ int ip6_route_get_saddr(struct net *net,
struct rt6_info *rt,
const struct in6_addr *daddr,
unsigned int prefs,
- if (rt->rt6i_prefsrc.plen)
+ if (rt->rt6i_prefsrc.plen && (!nxi ||
+ v6_addr_in_nx_info(nxi, &rt->rt6i_prefsrc.addr, NXA_TYPE_ADDR)))
- ipv6_addr_copy(saddr, &rt->rt6i_prefsrc.addr);
+ *saddr = rt->rt6i_prefsrc.addr;
else
err = ipv6_dev_get_saddr(net, idev ? idev->dev : NULL,
- daddr, prefs, saddr);
return err;
}
-@@ -2394,7 +2397,8 @@ static int rt6_fill_node(struct net *net
- NLA_PUT_U32(skb, RTA_IIF, iif);
+@@ -2558,7 +2561,8 @@ static int rt6_fill_node(struct net *net
+ goto nla_put_failure;
} else if (dst) {
struct in6_addr saddr_buf;
-- if (ip6_route_get_saddr(net, rt, dst, 0, &saddr_buf) == 0)
+- if (ip6_route_get_saddr(net, rt, dst, 0, &saddr_buf) == 0 &&
+ if (ip6_route_get_saddr(net, rt, dst, 0, &saddr_buf,
-+ (skb->sk ? skb->sk->sk_nx_info : NULL)) == 0)
- NLA_PUT(skb, RTA_PREFSRC, 16, &saddr_buf);
++ (skb->sk ? skb->sk->sk_nx_info : NULL)) == 0 &&
+ nla_put(skb, RTA_PREFSRC, 16, &saddr_buf))
+ goto nla_put_failure;
}
+@@ -2770,6 +2774,7 @@ static int rt6_info_route(struct rt6_inf
+ {
+ struct seq_file *m = p_arg;
-diff -NurpP --minimal linux-3.0-rc5/net/ipv6/tcp_ipv6.c linux-3.0-rc5-vs2.3.1-pre3/net/ipv6/tcp_ipv6.c
---- linux-3.0-rc5/net/ipv6/tcp_ipv6.c 2011-07-01 11:14:26.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/net/ipv6/tcp_ipv6.c 2011-06-22 12:39:16.000000000 +0200
-@@ -69,6 +69,7 @@
++ /* 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.10.53/net/ipv6/tcp_ipv6.c linux-3.10.53-vs2.3.6.8/net/ipv6/tcp_ipv6.c
+--- linux-3.10.53/net/ipv6/tcp_ipv6.c 2014-08-30 13:39:03.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/net/ipv6/tcp_ipv6.c 2013-11-13 17:17:16.000000000 +0000
+@@ -71,6 +71,7 @@
#include <linux/crypto.h>
#include <linux/scatterlist.h>
static void tcp_v6_send_reset(struct sock *sk, struct sk_buff *skb);
static void tcp_v6_reqsk_send_ack(struct sock *sk, struct sk_buff *skb,
-@@ -161,8 +162,15 @@ static int tcp_v6_connect(struct sock *s
+@@ -164,8 +165,15 @@ static int tcp_v6_connect(struct sock *s
* connect() to INADDR_ANY means loopback (BSD'ism).
*/
addr_type = ipv6_addr_type(&usin->sin6_addr);
-diff -NurpP --minimal linux-3.0-rc5/net/ipv6/udp.c linux-3.0-rc5-vs2.3.1-pre3/net/ipv6/udp.c
---- linux-3.0-rc5/net/ipv6/udp.c 2011-07-01 11:14:26.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/net/ipv6/udp.c 2011-06-10 22:11:24.000000000 +0200
-@@ -45,41 +45,67 @@
- #include <net/tcp_states.h>
+diff -NurpP --minimal linux-3.10.53/net/ipv6/udp.c linux-3.10.53-vs2.3.6.8/net/ipv6/udp.c
+--- linux-3.10.53/net/ipv6/udp.c 2014-08-30 13:39:03.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/net/ipv6/udp.c 2013-12-23 17:42:40.000000000 +0000
+@@ -46,42 +46,68 @@
#include <net/ip6_checksum.h>
#include <net/xfrm.h>
+ #include <net/inet6_hashtables.h>
+#include <linux/vs_inet6.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
+ #include <trace/events/skb.h>
#include "udp_impl.h"
-int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
}
static unsigned int udp6_portaddr_hash(struct net *net,
-@@ -143,6 +169,10 @@ static inline int compute_score(struct s
+@@ -145,6 +171,10 @@ static inline int compute_score(struct s
if (!ipv6_addr_equal(&np->rcv_saddr, daddr))
return -1;
score++;
}
if (!ipv6_addr_any(&np->daddr)) {
if (!ipv6_addr_equal(&np->daddr, saddr))
-diff -NurpP --minimal linux-3.0-rc5/net/ipv6/xfrm6_policy.c linux-3.0-rc5-vs2.3.1-pre3/net/ipv6/xfrm6_policy.c
---- linux-3.0-rc5/net/ipv6/xfrm6_policy.c 2011-07-01 11:14:26.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/net/ipv6/xfrm6_policy.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/net/ipv6/xfrm6_policy.c linux-3.10.53-vs2.3.6.8/net/ipv6/xfrm6_policy.c
+--- linux-3.10.53/net/ipv6/xfrm6_policy.c 2013-07-14 17:01:38.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/net/ipv6/xfrm6_policy.c 2013-08-22 20:30:00.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,
dst_release(dst);
return 0;
}
-diff -NurpP --minimal linux-3.0-rc5/netfilter/ipvs/ip_vs_xmit.c linux-3.0-rc5-vs2.3.1-pre3/net/netfilter/ipvs/ip_vs_xmit.c
---- linux-3.0-rc5/net/netfilter/ipvs/ip_vs_xmit.c
-+++ linux-3.0-rc5-vs2.3.1-pre3/net/netfilter/ipvs/ip_vs_xmit.c
-@@ -213,7 +213,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,
+diff -NurpP --minimal linux-3.10.53/net/netfilter/ipvs/ip_vs_xmit.c linux-3.10.53-vs2.3.6.8/net/netfilter/ipvs/ip_vs_xmit.c
+--- linux-3.10.53/net/netfilter/ipvs/ip_vs_xmit.c 2014-08-30 13:39:05.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/net/netfilter/ipvs/ip_vs_xmit.c 2014-08-30 14:03:55.000000000 +0000
+@@ -316,7 +316,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,
- &fl6.daddr, 0, &fl6.saddr) < 0)
+ &fl6.daddr, 0, &fl6.saddr, NULL) < 0)
- goto out_err;
+ goto out_err;
if (do_xfrm) {
dst = xfrm_lookup(net, dst, flowi6_to_flowi(&fl6), NULL, 0);
-diff -NurpP --minimal linux-3.0-rc5/net/netlink/af_netlink.c linux-3.0-rc5-vs2.3.1-pre3/net/netlink/af_netlink.c
---- linux-3.0-rc5/net/netlink/af_netlink.c 2011-07-01 11:14:27.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/net/netlink/af_netlink.c 2011-06-10 22:11:24.000000000 +0200
-@@ -55,6 +55,9 @@
- #include <linux/types.h>
+diff -NurpP --minimal linux-3.10.53/net/netlink/af_netlink.c linux-3.10.53-vs2.3.6.8/net/netlink/af_netlink.c
+--- linux-3.10.53/net/netlink/af_netlink.c 2014-08-30 13:39:05.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/net/netlink/af_netlink.c 2014-08-30 14:03:55.000000000 +0000
+@@ -57,6 +57,9 @@
#include <linux/audit.h>
#include <linux/mutex.h>
+ #include <linux/vmalloc.h>
+#include <linux/vs_context.h>
+#include <linux/vs_network.h>
+#include <linux/vs_limit.h>
+ #include <asm/cacheflush.h>
#include <net/net_namespace.h>
- #include <net/sock.h>
-@@ -1907,6 +1910,8 @@ static struct sock *netlink_seq_socket_i
- sk_for_each(s, node, &hash->table[j]) {
+@@ -2752,6 +2755,8 @@ static struct sock *netlink_seq_socket_i
+ sk_for_each(s, &hash->table[j]) {
if (sock_net(s) != seq_file_net(seq))
continue;
+ if (!nx_check(s->sk_nid, VS_WATCH_P | VS_IDENT))
if (off == pos) {
iter->link = i;
iter->hash_idx = j;
-@@ -1941,7 +1946,8 @@ static void *netlink_seq_next(struct seq
+@@ -2786,7 +2791,8 @@ static void *netlink_seq_next(struct seq
s = v;
do {
s = sk_next(s);
if (s)
return s;
-@@ -1953,7 +1959,8 @@ static void *netlink_seq_next(struct seq
+@@ -2798,7 +2804,8 @@ static void *netlink_seq_next(struct seq
for (; j <= hash->mask; j++) {
s = sk_head(&hash->table[j]);
s = sk_next(s);
if (s) {
iter->link = i;
-diff -NurpP --minimal linux-3.0-rc5/net/socket.c linux-3.0-rc5-vs2.3.1-pre3/net/socket.c
---- linux-3.0-rc5/net/socket.c 2011-07-01 11:14:27.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/net/socket.c 2011-06-16 14:16:51.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/net/socket.c linux-3.10.53-vs2.3.6.8/net/socket.c
+--- linux-3.10.53/net/socket.c 2014-08-30 13:39:05.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/net/socket.c 2014-04-22 03:48:11.000000000 +0000
@@ -98,6 +98,10 @@
#include <net/sock.h>
#include <linux/if_tun.h>
#include <linux/ipv6_route.h>
-@@ -546,6 +550,7 @@ static inline int __sock_sendmsg_nosec(s
+@@ -617,13 +621,29 @@ static inline int __sock_sendmsg_nosec(s
struct msghdr *msg, size_t size)
{
struct sock_iocb *si = kiocb_to_siocb(iocb);
+ size_t len;
- sock_update_classid(sock->sk);
-
-@@ -554,7 +559,22 @@ static inline int __sock_sendmsg_nosec(s
+ si->sock = sock;
+ si->scm = NULL;
si->msg = msg;
si->size = size;
+ vx_sock_fail(sock->sk, size);
+ }
+ vxdprintk(VXD_CBIT(net, 7),
-+ "__sock_sendmsg: %p[%p,%p,%p;%d/%d]:%d/%d",
++ "__sock_sendmsg: %p[%p,%p,%p;%d/%d]:%d/%zu",
+ sock, sock->sk,
+ (sock->sk)?sock->sk->sk_nx_info:0,
+ (sock->sk)?sock->sk->sk_vx_info:0,
}
static inline int __sock_sendmsg(struct kiocb *iocb, struct socket *sock,
-@@ -694,6 +714,7 @@ static inline int __sock_recvmsg_nosec(s
+@@ -767,6 +787,7 @@ static inline int __sock_recvmsg_nosec(s
struct msghdr *msg, size_t size, int flags)
{
struct sock_iocb *si = kiocb_to_siocb(iocb);
+ int len;
- sock_update_classid(sock->sk);
-
-@@ -703,7 +724,18 @@ static inline int __sock_recvmsg_nosec(s
+ si->sock = sock;
+ si->scm = NULL;
+@@ -774,7 +795,18 @@ static inline int __sock_recvmsg_nosec(s
si->size = size;
si->flags = flags;
}
static inline int __sock_recvmsg(struct kiocb *iocb, struct socket *sock,
-@@ -1188,6 +1220,13 @@ int __sock_create(struct net *net, int f
+@@ -1248,6 +1280,13 @@ int __sock_create(struct net *net, int f
if (type < 0 || type >= SOCK_MAX)
return -EINVAL;
/* Compatibility.
This uglymoron is moved from INET layer to here to avoid
-@@ -1323,6 +1362,7 @@ SYSCALL_DEFINE3(socket, int, family, int
+@@ -1382,6 +1421,7 @@ SYSCALL_DEFINE3(socket, int, family, int
if (retval < 0)
goto out;
retval = sock_map_fd(sock, flags & (O_CLOEXEC | O_NONBLOCK));
if (retval < 0)
goto out_release;
-@@ -1364,10 +1404,12 @@ SYSCALL_DEFINE4(socketpair, int, family,
+@@ -1423,10 +1463,12 @@ SYSCALL_DEFINE4(socketpair, int, family,
err = sock_create(family, type, protocol, &sock1);
if (err < 0)
goto out;
err = sock1->ops->socketpair(sock1, sock2);
if (err < 0)
-diff -NurpP --minimal linux-3.0-rc5/net/sunrpc/auth.c linux-3.0-rc5-vs2.3.1-pre3/net/sunrpc/auth.c
---- linux-3.0-rc5/net/sunrpc/auth.c 2011-07-01 11:14:27.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/net/sunrpc/auth.c 2011-06-10 22:11:24.000000000 +0200
-@@ -14,6 +14,7 @@
- #include <linux/hash.h>
+diff -NurpP --minimal linux-3.10.53/net/sunrpc/auth.c linux-3.10.53-vs2.3.6.8/net/sunrpc/auth.c
+--- linux-3.10.53/net/sunrpc/auth.c 2013-07-14 17:01:39.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/net/sunrpc/auth.c 2013-08-22 20:30:00.000000000 +0000
+@@ -15,6 +15,7 @@
#include <linux/sunrpc/clnt.h>
+ #include <linux/sunrpc/gss_api.h>
#include <linux/spinlock.h>
+#include <linux/vs_tag.h>
#ifdef RPC_DEBUG
# define RPCDBG_FACILITY RPCDBG_AUTH
-@@ -427,6 +428,7 @@ rpcauth_lookupcred(struct rpc_auth *auth
+@@ -553,6 +554,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.tag = make_ktag(&init_user_ns, dx_current_tag());
acred.group_info = get_group_info(((struct cred *)cred)->group_info);
ret = auth->au_ops->lookup_cred(auth, &acred, flags);
-@@ -467,6 +469,7 @@ rpcauth_bind_root_cred(struct rpc_task *
+@@ -593,6 +595,7 @@ rpcauth_bind_root_cred(struct rpc_task *
struct auth_cred acred = {
- .uid = 0,
- .gid = 0,
-+ .tag = dx_current_tag(),
+ .uid = GLOBAL_ROOT_UID,
+ .gid = GLOBAL_ROOT_GID,
++ .tag = KTAGT_INIT(dx_current_tag()),
};
dprintk("RPC: %5u looking up %s cred\n",
-diff -NurpP --minimal linux-3.0-rc5/net/sunrpc/auth_unix.c linux-3.0-rc5-vs2.3.1-pre3/net/sunrpc/auth_unix.c
---- linux-3.0-rc5/net/sunrpc/auth_unix.c 2010-10-21 13:08:01.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/net/sunrpc/auth_unix.c 2011-06-10 22:11:24.000000000 +0200
-@@ -12,12 +12,14 @@
- #include <linux/module.h>
+diff -NurpP --minimal linux-3.10.53/net/sunrpc/auth_unix.c linux-3.10.53-vs2.3.6.8/net/sunrpc/auth_unix.c
+--- linux-3.10.53/net/sunrpc/auth_unix.c 2013-05-31 13:45:33.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/net/sunrpc/auth_unix.c 2013-08-22 20:30:00.000000000 +0000
+@@ -13,11 +13,13 @@
#include <linux/sunrpc/clnt.h>
#include <linux/sunrpc/auth.h>
+ #include <linux/user_namespace.h>
+#include <linux/vs_tag.h>
#define NFS_NGROUPS 16
struct unx_cred {
struct rpc_cred uc_base;
- gid_t uc_gid;
-+ tag_t uc_tag;
- gid_t uc_gids[NFS_NGROUPS];
++ ktag_t uc_tag;
+ kgid_t uc_gid;
+ kgid_t uc_gids[NFS_NGROUPS];
};
- #define uc_uid uc_base.cr_uid
-@@ -78,6 +80,7 @@ unx_create_cred(struct rpc_auth *auth, s
+@@ -80,6 +82,7 @@ unx_create_cred(struct rpc_auth *auth, s
groups = NFS_NGROUPS;
cred->uc_gid = acred->gid;
for (i = 0; i < groups; i++)
cred->uc_gids[i] = GROUP_AT(acred->group_info, i);
if (i < NFS_NGROUPS)
-@@ -119,7 +122,9 @@ unx_match(struct auth_cred *acred, struc
+@@ -121,7 +124,9 @@ unx_match(struct auth_cred *acred, struc
unsigned int i;
-- if (cred->uc_uid != acred->uid || cred->uc_gid != acred->gid)
-+ if (cred->uc_uid != acred->uid ||
-+ cred->uc_gid != acred->gid ||
-+ cred->uc_tag != acred->tag)
+- if (!uid_eq(cred->uc_uid, acred->uid) || !gid_eq(cred->uc_gid, acred->gid))
++ if (!uid_eq(cred->uc_uid, acred->uid) ||
++ !gid_eq(cred->uc_gid, acred->gid) ||
++ !tag_eq(cred->uc_tag, acred->tag))
return 0;
if (acred->group_info != NULL)
-@@ -142,7 +147,7 @@ unx_marshal(struct rpc_task *task, __be3
+@@ -146,7 +151,7 @@ unx_marshal(struct rpc_task *task, __be3
struct rpc_clnt *clnt = task->tk_client;
struct unx_cred *cred = container_of(task->tk_rqstp->rq_cred, struct unx_cred, uc_base);
__be32 *base, *hold;
*p++ = htonl(RPC_AUTH_UNIX);
base = p++;
-@@ -152,9 +157,12 @@ unx_marshal(struct rpc_task *task, __be3
- * Copy the UTS nodename captured when the client was created.
+@@ -157,8 +162,11 @@ unx_marshal(struct rpc_task *task, __be3
*/
p = xdr_encode_array(p, clnt->cl_nodename, clnt->cl_nodelen);
-+ tag = task->tk_client->cl_tag;
-- *p++ = htonl((u32) cred->uc_uid);
-- *p++ = htonl((u32) cred->uc_gid);
-+ *p++ = htonl((u32) TAGINO_UID(tag,
-+ cred->uc_uid, cred->uc_tag));
-+ *p++ = htonl((u32) TAGINO_GID(tag,
-+ cred->uc_gid, cred->uc_tag));
+- *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) 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 && cred->uc_gids[i] != (gid_t) NOGROUP; i++)
- *p++ = htonl((u32) cred->uc_gids[i]);
-diff -NurpP --minimal linux-3.0-rc5/net/sunrpc/clnt.c linux-3.0-rc5-vs2.3.1-pre3/net/sunrpc/clnt.c
---- linux-3.0-rc5/net/sunrpc/clnt.c 2011-07-01 11:14:27.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/net/sunrpc/clnt.c 2011-07-01 11:35:35.000000000 +0200
+ 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.10.53/net/sunrpc/clnt.c linux-3.10.53-vs2.3.6.8/net/sunrpc/clnt.c
+--- linux-3.10.53/net/sunrpc/clnt.c 2014-08-30 13:39:05.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/net/sunrpc/clnt.c 2014-03-12 13:18:24.000000000 +0000
@@ -31,6 +31,7 @@
- #include <linux/in.h>
#include <linux/in6.h>
#include <linux/un.h>
+ #include <linux/rcupdate.h>
+#include <linux/vs_cvirt.h>
#include <linux/sunrpc/clnt.h>
- #include <linux/sunrpc/rpc_pipe_fs.h>
-@@ -362,6 +363,9 @@ struct rpc_clnt *rpc_create(struct rpc_c
+ #include <linux/sunrpc/addr.h>
+@@ -486,6 +487,9 @@ struct rpc_clnt *rpc_create(struct rpc_c
if (!(args->flags & RPC_CLNT_CREATE_QUIET))
clnt->cl_chatty = 1;
return clnt;
}
EXPORT_SYMBOL_GPL(rpc_create);
-diff -NurpP --minimal linux-3.0-rc5/net/unix/af_unix.c linux-3.0-rc5-vs2.3.1-pre3/net/unix/af_unix.c
---- linux-3.0-rc5/net/unix/af_unix.c 2011-07-01 11:14:27.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/net/unix/af_unix.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.10.53/net/unix/af_unix.c linux-3.10.53-vs2.3.6.8/net/unix/af_unix.c
+--- linux-3.10.53/net/unix/af_unix.c 2014-08-30 13:39:05.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/net/unix/af_unix.c 2014-04-22 03:48:11.000000000 +0000
@@ -114,6 +114,8 @@
#include <linux/mount.h>
#include <net/checksum.h>
+#include <linux/vs_context.h>
+#include <linux/vs_limit.h>
- static struct hlist_head unix_socket_table[UNIX_HASH_SIZE + 1];
- static DEFINE_SPINLOCK(unix_table_lock);
-@@ -258,6 +260,8 @@ static struct sock *__unix_find_socket_b
+ struct hlist_head unix_socket_table[2 * UNIX_HASH_SIZE];
+ EXPORT_SYMBOL_GPL(unix_socket_table);
+@@ -269,6 +271,8 @@ static struct sock *__unix_find_socket_b
if (!net_eq(sock_net(s), net))
continue;
if (u->addr->len == len &&
!memcmp(u->addr->name, sunname, len))
goto found;
-@@ -2208,6 +2212,8 @@ static struct sock *unix_seq_idx(struct
- for (s = first_unix_socket(&iter->i); s; s = next_unix_socket(&iter->i, s)) {
- if (sock_net(s) != seq_file_net(seq))
+@@ -2276,6 +2280,8 @@ static struct sock *unix_from_bucket(str
+ for (sk = sk_head(&unix_socket_table[bucket]); sk; sk = sk_next(sk)) {
+ if (sock_net(sk) != seq_file_net(seq))
continue;
-+ if (!nx_check(s->sk_nid, VS_WATCH_P | VS_IDENT))
++ if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
+ continue;
- if (off == pos)
- return s;
- ++off;
-@@ -2232,7 +2238,8 @@ static void *unix_seq_next(struct seq_fi
- sk = first_unix_socket(&iter->i);
- else
- sk = next_unix_socket(&iter->i, sk);
-- while (sk && (sock_net(sk) != seq_file_net(seq)))
-+ while (sk && (sock_net(sk) != seq_file_net(seq) ||
-+ !nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)))
- sk = next_unix_socket(&iter->i, sk);
- return sk;
- }
-diff -NurpP --minimal linux-3.0-rc5/scripts/checksyscalls.sh linux-3.0-rc5-vs2.3.1-pre3/scripts/checksyscalls.sh
---- linux-3.0-rc5/scripts/checksyscalls.sh 2011-03-15 18:07:46.000000000 +0100
-+++ linux-3.0-rc5-vs2.3.1-pre3/scripts/checksyscalls.sh 2011-06-10 22:11:24.000000000 +0200
+ if (++count == offset)
+ break;
+ }
+@@ -2293,6 +2299,8 @@ static struct sock *unix_next_socket(str
+ sk = sk_next(sk);
+ if (!sk)
+ goto next_bucket;
++ if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
++ continue;
+ if (sock_net(sk) == seq_file_net(seq))
+ return sk;
+ }
+diff -NurpP --minimal linux-3.10.53/scripts/checksyscalls.sh linux-3.10.53-vs2.3.6.8/scripts/checksyscalls.sh
+--- linux-3.10.53/scripts/checksyscalls.sh 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/scripts/checksyscalls.sh 2013-08-22 20:30:00.000000000 +0000
@@ -193,7 +193,6 @@ cat << EOF
#define __IGNORE_afs_syscall
#define __IGNORE_getpmsg
EOF
}
-diff -NurpP --minimal linux-3.0-rc5/security/commoncap.c linux-3.0-rc5-vs2.3.1-pre3/security/commoncap.c
---- linux-3.0-rc5/security/commoncap.c 2011-07-01 11:14:27.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/security/commoncap.c 2011-06-16 14:16:51.000000000 +0200
-@@ -62,6 +62,7 @@ int cap_netlink_recv(struct sk_buff *skb
- return -EPERM;
- return 0;
- }
-+
- EXPORT_SYMBOL(cap_netlink_recv);
-
- /**
-@@ -83,14 +84,20 @@ EXPORT_SYMBOL(cap_netlink_recv);
- int cap_capable(struct task_struct *tsk, const struct cred *cred,
- struct user_namespace *targ_ns, int cap, int audit)
+diff -NurpP --minimal linux-3.10.53/security/commoncap.c linux-3.10.53-vs2.3.6.8/security/commoncap.c
+--- linux-3.10.53/security/commoncap.c 2013-05-31 13:45:34.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/security/commoncap.c 2013-08-22 20:30:00.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)
{
-+ struct vx_info *vxi = tsk->vx_info;
-+
- for (;;) {
- /* The creator of the user namespace has all caps. */
- if (targ_ns != &init_user_ns && targ_ns->creator == cred->user)
- return 0;
++ struct vx_info *vxi = current_vx_info(); /* FIXME: get vxi from cred? */
+ struct user_namespace *ns = targ_ns;
+ /* See if cred has the capability in the target user namespace
+@@ -84,8 +85,12 @@ int cap_capable(const struct cred *cred,
+ */
+ for (;;) {
/* Do we have the necessary capabilities? */
-- if (targ_ns == cred->user->user_ns)
+- if (ns == cred->user_ns)
- return cap_raised(cred->cap_effective, cap) ? 0 : -EPERM;
-+ if (targ_ns == cred->user->user_ns) {
++ if (ns == cred->user_ns) {
+ if (vx_info_flags(vxi, VXF_STATE_SETUP, 0) &&
+ cap_raised(cred->cap_effective, cap))
+ return 0;
+ }
/* Have we tried all of the parent namespaces? */
- if (targ_ns == &init_user_ns)
-@@ -611,7 +618,7 @@ int cap_inode_setxattr(struct dentry *de
+ if (ns == &init_user_ns)
+@@ -628,7 +633,7 @@ int cap_inode_setxattr(struct dentry *de
if (!strncmp(name, XATTR_SECURITY_PREFIX,
sizeof(XATTR_SECURITY_PREFIX) - 1) &&
return -EPERM;
return 0;
}
-@@ -637,7 +644,7 @@ int cap_inode_removexattr(struct dentry
+@@ -654,7 +659,7 @@ int cap_inode_removexattr(struct dentry
if (!strncmp(name, XATTR_SECURITY_PREFIX,
sizeof(XATTR_SECURITY_PREFIX) - 1) &&
return -EPERM;
return 0;
}
-@@ -971,3 +978,4 @@ int cap_file_mmap(struct file *file, uns
- }
- return ret;
- }
-+
-diff -NurpP --minimal linux-3.0-rc5/security/selinux/hooks.c linux-3.0-rc5-vs2.3.1-pre3/security/selinux/hooks.c
---- linux-3.0-rc5/security/selinux/hooks.c 2011-07-01 11:14:28.000000000 +0200
-+++ linux-3.0-rc5-vs2.3.1-pre3/security/selinux/hooks.c 2011-06-15 02:40:14.000000000 +0200
-@@ -67,7 +67,6 @@
+diff -NurpP --minimal linux-3.10.53/security/selinux/hooks.c linux-3.10.53-vs2.3.6.8/security/selinux/hooks.c
+--- linux-3.10.53/security/selinux/hooks.c 2014-08-30 13:39:05.000000000 +0000
++++ linux-3.10.53-vs2.3.6.8/security/selinux/hooks.c 2014-04-22 03:48:11.000000000 +0000
+@@ -68,7 +68,6 @@
#include <linux/dccp.h>
#include <linux/quota.h>
#include <linux/un.h> /* for Unix socket types */
projects / packages / kernel.git / blobdiff