From: Arkadiusz Miśkiewicz Date: Mon, 3 Jun 2013 21:02:26 +0000 (+0200) Subject: - rel 3; vserver patch up to patch-3.9.4-vs2.3.6.3.diff X-Git-Tag: auto/th/kernel-3.9.4-3 X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=a4a22af893eb86a7f089feda7120059ac9784b95;p=packages%2Fkernel.git - rel 3; vserver patch up to patch-3.9.4-vs2.3.6.3.diff --- diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch index 74e8edda..304cef25 100644 --- a/kernel-vserver-2.3.patch +++ b/kernel-vserver-2.3.patch @@ -1,6 +1,6 @@ -diff -NurpP --minimal linux-3.9.4/Documentation/vserver/debug.txt linux-3.9.4-vs2.3.6.2/Documentation/vserver/debug.txt +diff -NurpP --minimal linux-3.9.4/Documentation/vserver/debug.txt linux-3.9.4-vs2.3.6.3/Documentation/vserver/debug.txt --- linux-3.9.4/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/Documentation/vserver/debug.txt 2013-05-31 14:47:10.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/Documentation/vserver/debug.txt 2013-05-31 14:47:10.000000000 +0000 @@ -0,0 +1,154 @@ + +debug_cvirt: @@ -156,9 +156,9 @@ diff -NurpP --minimal linux-3.9.4/Documentation/vserver/debug.txt linux-3.9.4-vs + m 2^m "vx_acc_page[%5d,%s,%2d]: %5d%s" + "vx_acc_pages[%5d,%s,%2d]: %5d += %5d" + "vx_pages_avail[%5d,%s,%2d]: %5ld > %5d + %5d" -diff -NurpP --minimal linux-3.9.4/arch/alpha/Kconfig linux-3.9.4-vs2.3.6.2/arch/alpha/Kconfig +diff -NurpP --minimal linux-3.9.4/arch/alpha/Kconfig linux-3.9.4-vs2.3.6.3/arch/alpha/Kconfig --- linux-3.9.4/arch/alpha/Kconfig 2013-05-31 13:44:28.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/arch/alpha/Kconfig 2013-05-31 14:47:10.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/arch/alpha/Kconfig 2013-05-31 14:47:10.000000000 +0000 @@ -669,6 +669,8 @@ config DUMMY_CONSOLE depends on VGA_HOSE default y @@ -168,9 +168,9 @@ diff -NurpP --minimal linux-3.9.4/arch/alpha/Kconfig linux-3.9.4-vs2.3.6.2/arch/ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.9.4/arch/alpha/kernel/systbls.S linux-3.9.4-vs2.3.6.2/arch/alpha/kernel/systbls.S +diff -NurpP --minimal linux-3.9.4/arch/alpha/kernel/systbls.S linux-3.9.4-vs2.3.6.3/arch/alpha/kernel/systbls.S --- linux-3.9.4/arch/alpha/kernel/systbls.S 2013-02-19 13:56:11.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/arch/alpha/kernel/systbls.S 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/arch/alpha/kernel/systbls.S 2013-05-31 14:47:11.000000000 +0000 @@ -446,7 +446,7 @@ sys_call_table: .quad sys_stat64 /* 425 */ .quad sys_lstat64 @@ -180,9 +180,9 @@ diff -NurpP --minimal linux-3.9.4/arch/alpha/kernel/systbls.S linux-3.9.4-vs2.3. .quad sys_ni_syscall /* sys_mbind */ .quad sys_ni_syscall /* sys_get_mempolicy */ .quad sys_ni_syscall /* sys_set_mempolicy */ -diff -NurpP --minimal linux-3.9.4/arch/alpha/kernel/traps.c linux-3.9.4-vs2.3.6.2/arch/alpha/kernel/traps.c +diff -NurpP --minimal linux-3.9.4/arch/alpha/kernel/traps.c linux-3.9.4-vs2.3.6.3/arch/alpha/kernel/traps.c --- linux-3.9.4/arch/alpha/kernel/traps.c 2013-05-31 13:44:28.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/arch/alpha/kernel/traps.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/arch/alpha/kernel/traps.c 2013-05-31 14:47:11.000000000 +0000 @@ -184,7 +184,8 @@ die_if_kernel(char * str, struct pt_regs #ifdef CONFIG_SMP printk("CPU %d ", hard_smp_processor_id()); @@ -193,9 +193,9 @@ diff -NurpP --minimal linux-3.9.4/arch/alpha/kernel/traps.c linux-3.9.4-vs2.3.6. dik_show_regs(regs, r9_15); add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE); dik_show_trace((unsigned long *)(regs+1)); -diff -NurpP --minimal linux-3.9.4/arch/arm/Kconfig linux-3.9.4-vs2.3.6.2/arch/arm/Kconfig +diff -NurpP --minimal linux-3.9.4/arch/arm/Kconfig linux-3.9.4-vs2.3.6.3/arch/arm/Kconfig --- linux-3.9.4/arch/arm/Kconfig 2013-05-31 13:44:29.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/arch/arm/Kconfig 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/arch/arm/Kconfig 2013-05-31 14:47:11.000000000 +0000 @@ -2353,6 +2353,8 @@ source "fs/Kconfig" source "arch/arm/Kconfig.debug" @@ -205,9 +205,9 @@ diff -NurpP --minimal linux-3.9.4/arch/arm/Kconfig linux-3.9.4-vs2.3.6.2/arch/ar source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.9.4/arch/arm/kernel/calls.S linux-3.9.4-vs2.3.6.2/arch/arm/kernel/calls.S +diff -NurpP --minimal linux-3.9.4/arch/arm/kernel/calls.S linux-3.9.4-vs2.3.6.3/arch/arm/kernel/calls.S --- linux-3.9.4/arch/arm/kernel/calls.S 2013-05-31 13:44:29.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/arch/arm/kernel/calls.S 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/arch/arm/kernel/calls.S 2013-05-31 14:47:11.000000000 +0000 @@ -322,7 +322,7 @@ /* 310 */ CALL(sys_request_key) CALL(sys_keyctl) @@ -217,9 +217,9 @@ diff -NurpP --minimal linux-3.9.4/arch/arm/kernel/calls.S linux-3.9.4-vs2.3.6.2/ CALL(sys_ioprio_set) /* 315 */ CALL(sys_ioprio_get) CALL(sys_inotify_init) -diff -NurpP --minimal linux-3.9.4/arch/arm/kernel/process.c linux-3.9.4-vs2.3.6.2/arch/arm/kernel/process.c +diff -NurpP --minimal linux-3.9.4/arch/arm/kernel/process.c linux-3.9.4-vs2.3.6.3/arch/arm/kernel/process.c --- linux-3.9.4/arch/arm/kernel/process.c 2013-05-31 13:44:29.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/arch/arm/kernel/process.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/arch/arm/kernel/process.c 2013-05-31 14:47:11.000000000 +0000 @@ -332,7 +332,8 @@ void __show_regs(struct pt_regs *regs) void show_regs(struct pt_regs * regs) { @@ -230,9 +230,9 @@ diff -NurpP --minimal linux-3.9.4/arch/arm/kernel/process.c linux-3.9.4-vs2.3.6. __show_regs(regs); dump_stack(); } -diff -NurpP --minimal linux-3.9.4/arch/arm/kernel/traps.c linux-3.9.4-vs2.3.6.2/arch/arm/kernel/traps.c +diff -NurpP --minimal linux-3.9.4/arch/arm/kernel/traps.c linux-3.9.4-vs2.3.6.3/arch/arm/kernel/traps.c --- linux-3.9.4/arch/arm/kernel/traps.c 2013-05-31 13:44:29.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/arch/arm/kernel/traps.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/arch/arm/kernel/traps.c 2013-05-31 14:47:11.000000000 +0000 @@ -249,8 +249,8 @@ static int __die(const char *str, int er print_modules(); @@ -244,9 +244,9 @@ diff -NurpP --minimal linux-3.9.4/arch/arm/kernel/traps.c linux-3.9.4-vs2.3.6.2/ if (!user_mode(regs) || in_interrupt()) { dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp, -diff -NurpP --minimal linux-3.9.4/arch/cris/Kconfig linux-3.9.4-vs2.3.6.2/arch/cris/Kconfig +diff -NurpP --minimal linux-3.9.4/arch/cris/Kconfig linux-3.9.4-vs2.3.6.3/arch/cris/Kconfig --- linux-3.9.4/arch/cris/Kconfig 2013-05-31 13:44:37.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/arch/cris/Kconfig 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/arch/cris/Kconfig 2013-05-31 14:47:11.000000000 +0000 @@ -674,6 +674,8 @@ source "drivers/staging/Kconfig" source "arch/cris/Kconfig.debug" @@ -256,9 +256,9 @@ diff -NurpP --minimal linux-3.9.4/arch/cris/Kconfig linux-3.9.4-vs2.3.6.2/arch/c source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.9.4/arch/h8300/Kconfig linux-3.9.4-vs2.3.6.2/arch/h8300/Kconfig +diff -NurpP --minimal linux-3.9.4/arch/h8300/Kconfig linux-3.9.4-vs2.3.6.3/arch/h8300/Kconfig --- linux-3.9.4/arch/h8300/Kconfig 2013-05-31 13:44:38.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/arch/h8300/Kconfig 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/arch/h8300/Kconfig 2013-05-31 14:47:11.000000000 +0000 @@ -221,6 +221,8 @@ source "fs/Kconfig" source "arch/h8300/Kconfig.debug" @@ -268,9 +268,9 @@ diff -NurpP --minimal linux-3.9.4/arch/h8300/Kconfig linux-3.9.4-vs2.3.6.2/arch/ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.9.4/arch/ia64/Kconfig linux-3.9.4-vs2.3.6.2/arch/ia64/Kconfig +diff -NurpP --minimal linux-3.9.4/arch/ia64/Kconfig linux-3.9.4-vs2.3.6.3/arch/ia64/Kconfig --- linux-3.9.4/arch/ia64/Kconfig 2013-05-31 13:44:38.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/arch/ia64/Kconfig 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/arch/ia64/Kconfig 2013-05-31 14:47:11.000000000 +0000 @@ -645,6 +645,8 @@ source "fs/Kconfig" source "arch/ia64/Kconfig.debug" @@ -280,9 +280,9 @@ diff -NurpP --minimal linux-3.9.4/arch/ia64/Kconfig linux-3.9.4-vs2.3.6.2/arch/i source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.9.4/arch/ia64/kernel/entry.S linux-3.9.4-vs2.3.6.2/arch/ia64/kernel/entry.S +diff -NurpP --minimal linux-3.9.4/arch/ia64/kernel/entry.S linux-3.9.4-vs2.3.6.3/arch/ia64/kernel/entry.S --- linux-3.9.4/arch/ia64/kernel/entry.S 2013-05-31 13:44:38.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/arch/ia64/kernel/entry.S 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/arch/ia64/kernel/entry.S 2013-05-31 14:47:11.000000000 +0000 @@ -1719,7 +1719,7 @@ sys_call_table: data8 sys_mq_notify data8 sys_mq_getsetattr @@ -292,9 +292,9 @@ diff -NurpP --minimal linux-3.9.4/arch/ia64/kernel/entry.S linux-3.9.4-vs2.3.6.2 data8 sys_waitid // 1270 data8 sys_add_key data8 sys_request_key -diff -NurpP --minimal linux-3.9.4/arch/ia64/kernel/process.c linux-3.9.4-vs2.3.6.2/arch/ia64/kernel/process.c +diff -NurpP --minimal linux-3.9.4/arch/ia64/kernel/process.c linux-3.9.4-vs2.3.6.3/arch/ia64/kernel/process.c --- linux-3.9.4/arch/ia64/kernel/process.c 2013-05-31 13:44:38.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/arch/ia64/kernel/process.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/arch/ia64/kernel/process.c 2013-05-31 14:47:11.000000000 +0000 @@ -109,8 +109,8 @@ show_regs (struct pt_regs *regs) unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri; @@ -306,9 +306,9 @@ diff -NurpP --minimal linux-3.9.4/arch/ia64/kernel/process.c linux-3.9.4-vs2.3.6 printk("psr : %016lx ifs : %016lx ip : [<%016lx>] %s (%s)\n", regs->cr_ipsr, regs->cr_ifs, ip, print_tainted(), init_utsname()->release); -diff -NurpP --minimal linux-3.9.4/arch/ia64/kernel/ptrace.c linux-3.9.4-vs2.3.6.2/arch/ia64/kernel/ptrace.c +diff -NurpP --minimal linux-3.9.4/arch/ia64/kernel/ptrace.c linux-3.9.4-vs2.3.6.3/arch/ia64/kernel/ptrace.c --- linux-3.9.4/arch/ia64/kernel/ptrace.c 2013-02-19 13:56:51.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/arch/ia64/kernel/ptrace.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/arch/ia64/kernel/ptrace.c 2013-05-31 14:47:11.000000000 +0000 @@ -21,6 +21,7 @@ #include #include @@ -317,9 +317,9 @@ diff -NurpP --minimal linux-3.9.4/arch/ia64/kernel/ptrace.c linux-3.9.4-vs2.3.6. #include #include -diff -NurpP --minimal linux-3.9.4/arch/ia64/kernel/traps.c linux-3.9.4-vs2.3.6.2/arch/ia64/kernel/traps.c +diff -NurpP --minimal linux-3.9.4/arch/ia64/kernel/traps.c linux-3.9.4-vs2.3.6.3/arch/ia64/kernel/traps.c --- linux-3.9.4/arch/ia64/kernel/traps.c 2013-05-31 13:44:38.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/arch/ia64/kernel/traps.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/arch/ia64/kernel/traps.c 2013-05-31 14:47:11.000000000 +0000 @@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re put_cpu(); @@ -344,9 +344,9 @@ diff -NurpP --minimal linux-3.9.4/arch/ia64/kernel/traps.c linux-3.9.4-vs2.3.6.2 } } } -diff -NurpP --minimal linux-3.9.4/arch/m32r/kernel/traps.c linux-3.9.4-vs2.3.6.2/arch/m32r/kernel/traps.c +diff -NurpP --minimal linux-3.9.4/arch/m32r/kernel/traps.c linux-3.9.4-vs2.3.6.3/arch/m32r/kernel/traps.c --- linux-3.9.4/arch/m32r/kernel/traps.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/arch/m32r/kernel/traps.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/arch/m32r/kernel/traps.c 2013-05-31 14:47:11.000000000 +0000 @@ -195,8 +195,9 @@ static void show_registers(struct pt_reg } else { printk("SPI: %08lx\n", sp); @@ -359,9 +359,9 @@ diff -NurpP --minimal linux-3.9.4/arch/m32r/kernel/traps.c linux-3.9.4-vs2.3.6.2 /* * When in-kernel, we also print out the stack and code at the -diff -NurpP --minimal linux-3.9.4/arch/m68k/Kconfig linux-3.9.4-vs2.3.6.2/arch/m68k/Kconfig +diff -NurpP --minimal linux-3.9.4/arch/m68k/Kconfig linux-3.9.4-vs2.3.6.3/arch/m68k/Kconfig --- linux-3.9.4/arch/m68k/Kconfig 2013-05-31 13:44:38.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/arch/m68k/Kconfig 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/arch/m68k/Kconfig 2013-05-31 14:47:11.000000000 +0000 @@ -137,6 +137,8 @@ source "fs/Kconfig" source "arch/m68k/Kconfig.debug" @@ -371,9 +371,9 @@ diff -NurpP --minimal linux-3.9.4/arch/m68k/Kconfig linux-3.9.4-vs2.3.6.2/arch/m source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.9.4/arch/mips/Kconfig linux-3.9.4-vs2.3.6.2/arch/mips/Kconfig +diff -NurpP --minimal linux-3.9.4/arch/mips/Kconfig linux-3.9.4-vs2.3.6.3/arch/mips/Kconfig --- linux-3.9.4/arch/mips/Kconfig 2013-05-31 13:44:39.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/arch/mips/Kconfig 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/arch/mips/Kconfig 2013-05-31 14:47:11.000000000 +0000 @@ -2550,6 +2550,8 @@ source "fs/Kconfig" source "arch/mips/Kconfig.debug" @@ -383,9 +383,9 @@ diff -NurpP --minimal linux-3.9.4/arch/mips/Kconfig linux-3.9.4-vs2.3.6.2/arch/m source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.9.4/arch/mips/kernel/ptrace.c linux-3.9.4-vs2.3.6.2/arch/mips/kernel/ptrace.c +diff -NurpP --minimal linux-3.9.4/arch/mips/kernel/ptrace.c linux-3.9.4-vs2.3.6.3/arch/mips/kernel/ptrace.c --- linux-3.9.4/arch/mips/kernel/ptrace.c 2013-05-31 13:44:42.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/arch/mips/kernel/ptrace.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/arch/mips/kernel/ptrace.c 2013-05-31 14:47:11.000000000 +0000 @@ -25,6 +25,7 @@ #include #include @@ -404,9 +404,9 @@ diff -NurpP --minimal linux-3.9.4/arch/mips/kernel/ptrace.c linux-3.9.4-vs2.3.6. switch (request) { /* when I and D space are separate, these will need to be fixed. */ case PTRACE_PEEKTEXT: /* read word at location addr. */ -diff -NurpP --minimal linux-3.9.4/arch/mips/kernel/scall32-o32.S linux-3.9.4-vs2.3.6.2/arch/mips/kernel/scall32-o32.S +diff -NurpP --minimal linux-3.9.4/arch/mips/kernel/scall32-o32.S linux-3.9.4-vs2.3.6.3/arch/mips/kernel/scall32-o32.S --- linux-3.9.4/arch/mips/kernel/scall32-o32.S 2013-05-31 13:44:42.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/arch/mips/kernel/scall32-o32.S 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/arch/mips/kernel/scall32-o32.S 2013-05-31 14:47:11.000000000 +0000 @@ -512,7 +512,7 @@ einval: li v0, -ENOSYS sys sys_mq_timedreceive 5 sys sys_mq_notify 2 /* 4275 */ @@ -416,9 +416,9 @@ diff -NurpP --minimal linux-3.9.4/arch/mips/kernel/scall32-o32.S linux-3.9.4-vs2 sys sys_waitid 5 sys sys_ni_syscall 0 /* available, was setaltroot */ sys sys_add_key 5 /* 4280 */ -diff -NurpP --minimal linux-3.9.4/arch/mips/kernel/scall64-64.S linux-3.9.4-vs2.3.6.2/arch/mips/kernel/scall64-64.S +diff -NurpP --minimal linux-3.9.4/arch/mips/kernel/scall64-64.S linux-3.9.4-vs2.3.6.3/arch/mips/kernel/scall64-64.S --- linux-3.9.4/arch/mips/kernel/scall64-64.S 2013-05-31 13:44:42.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/arch/mips/kernel/scall64-64.S 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/arch/mips/kernel/scall64-64.S 2013-05-31 14:47:11.000000000 +0000 @@ -351,7 +351,7 @@ sys_call_table: PTR sys_mq_timedreceive PTR sys_mq_notify @@ -428,9 +428,9 @@ diff -NurpP --minimal linux-3.9.4/arch/mips/kernel/scall64-64.S linux-3.9.4-vs2. PTR sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key -diff -NurpP --minimal linux-3.9.4/arch/mips/kernel/scall64-n32.S linux-3.9.4-vs2.3.6.2/arch/mips/kernel/scall64-n32.S +diff -NurpP --minimal linux-3.9.4/arch/mips/kernel/scall64-n32.S linux-3.9.4-vs2.3.6.3/arch/mips/kernel/scall64-n32.S --- linux-3.9.4/arch/mips/kernel/scall64-n32.S 2013-05-31 13:44:42.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/arch/mips/kernel/scall64-n32.S 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/arch/mips/kernel/scall64-n32.S 2013-05-31 14:47:11.000000000 +0000 @@ -344,7 +344,7 @@ EXPORT(sysn32_call_table) PTR compat_sys_mq_timedreceive PTR compat_sys_mq_notify @@ -440,9 +440,9 @@ diff -NurpP --minimal linux-3.9.4/arch/mips/kernel/scall64-n32.S linux-3.9.4-vs2 PTR compat_sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key -diff -NurpP --minimal linux-3.9.4/arch/mips/kernel/scall64-o32.S linux-3.9.4-vs2.3.6.2/arch/mips/kernel/scall64-o32.S +diff -NurpP --minimal linux-3.9.4/arch/mips/kernel/scall64-o32.S linux-3.9.4-vs2.3.6.3/arch/mips/kernel/scall64-o32.S --- linux-3.9.4/arch/mips/kernel/scall64-o32.S 2013-05-31 13:44:42.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/arch/mips/kernel/scall64-o32.S 2013-05-31 15:07:53.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/arch/mips/kernel/scall64-o32.S 2013-05-31 15:07:53.000000000 +0000 @@ -469,7 +469,7 @@ sys_call_table: PTR compat_sys_mq_timedreceive PTR compat_sys_mq_notify /* 4275 */ @@ -452,9 +452,9 @@ diff -NurpP --minimal linux-3.9.4/arch/mips/kernel/scall64-o32.S linux-3.9.4-vs2 PTR compat_sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key /* 4280 */ -diff -NurpP --minimal linux-3.9.4/arch/mips/kernel/traps.c linux-3.9.4-vs2.3.6.2/arch/mips/kernel/traps.c +diff -NurpP --minimal linux-3.9.4/arch/mips/kernel/traps.c linux-3.9.4-vs2.3.6.3/arch/mips/kernel/traps.c --- linux-3.9.4/arch/mips/kernel/traps.c 2013-05-31 13:44:42.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/arch/mips/kernel/traps.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/arch/mips/kernel/traps.c 2013-05-31 14:47:11.000000000 +0000 @@ -348,9 +348,10 @@ void show_registers(struct pt_regs *regs __show_regs(regs); @@ -469,9 +469,9 @@ diff -NurpP --minimal linux-3.9.4/arch/mips/kernel/traps.c linux-3.9.4-vs2.3.6.2 if (cpu_has_userlocal) { unsigned long tls; -diff -NurpP --minimal linux-3.9.4/arch/parisc/Kconfig linux-3.9.4-vs2.3.6.2/arch/parisc/Kconfig +diff -NurpP --minimal linux-3.9.4/arch/parisc/Kconfig linux-3.9.4-vs2.3.6.3/arch/parisc/Kconfig --- linux-3.9.4/arch/parisc/Kconfig 2013-05-31 13:44:44.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/arch/parisc/Kconfig 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/arch/parisc/Kconfig 2013-05-31 14:47:11.000000000 +0000 @@ -308,6 +308,8 @@ source "fs/Kconfig" source "arch/parisc/Kconfig.debug" @@ -481,9 +481,9 @@ diff -NurpP --minimal linux-3.9.4/arch/parisc/Kconfig linux-3.9.4-vs2.3.6.2/arch source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.9.4/arch/parisc/kernel/syscall_table.S linux-3.9.4-vs2.3.6.2/arch/parisc/kernel/syscall_table.S +diff -NurpP --minimal linux-3.9.4/arch/parisc/kernel/syscall_table.S linux-3.9.4-vs2.3.6.3/arch/parisc/kernel/syscall_table.S --- linux-3.9.4/arch/parisc/kernel/syscall_table.S 2013-05-31 13:44:44.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/arch/parisc/kernel/syscall_table.S 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/arch/parisc/kernel/syscall_table.S 2013-05-31 14:47:11.000000000 +0000 @@ -358,7 +358,7 @@ ENTRY_COMP(mbind) /* 260 */ ENTRY_COMP(get_mempolicy) @@ -493,9 +493,9 @@ diff -NurpP --minimal linux-3.9.4/arch/parisc/kernel/syscall_table.S linux-3.9.4 ENTRY_SAME(add_key) ENTRY_SAME(request_key) /* 265 */ ENTRY_SAME(keyctl) -diff -NurpP --minimal linux-3.9.4/arch/parisc/kernel/traps.c linux-3.9.4-vs2.3.6.2/arch/parisc/kernel/traps.c +diff -NurpP --minimal linux-3.9.4/arch/parisc/kernel/traps.c linux-3.9.4-vs2.3.6.3/arch/parisc/kernel/traps.c --- linux-3.9.4/arch/parisc/kernel/traps.c 2013-05-31 13:44:44.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/arch/parisc/kernel/traps.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/arch/parisc/kernel/traps.c 2013-05-31 14:47:11.000000000 +0000 @@ -235,8 +235,9 @@ void die_if_kernel(char *str, struct pt_ if (err == 0) return; /* STFU */ @@ -519,9 +519,9 @@ diff -NurpP --minimal linux-3.9.4/arch/parisc/kernel/traps.c linux-3.9.4-vs2.3.6 /* Wot's wrong wif bein' racy? */ if (current->thread.flags & PARISC_KERNEL_DEATH) { -diff -NurpP --minimal linux-3.9.4/arch/parisc/mm/fault.c linux-3.9.4-vs2.3.6.2/arch/parisc/mm/fault.c +diff -NurpP --minimal linux-3.9.4/arch/parisc/mm/fault.c linux-3.9.4-vs2.3.6.3/arch/parisc/mm/fault.c --- linux-3.9.4/arch/parisc/mm/fault.c 2013-05-31 13:44:44.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/arch/parisc/mm/fault.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/arch/parisc/mm/fault.c 2013-05-31 14:47:11.000000000 +0000 @@ -257,8 +257,9 @@ bad_area: #ifdef PRINT_USER_FAULTS @@ -534,9 +534,9 @@ diff -NurpP --minimal linux-3.9.4/arch/parisc/mm/fault.c linux-3.9.4-vs2.3.6.2/a if (vma) { printk(KERN_DEBUG "vm_start = 0x%08lx, vm_end = 0x%08lx\n", vma->vm_start, vma->vm_end); -diff -NurpP --minimal linux-3.9.4/arch/powerpc/Kconfig linux-3.9.4-vs2.3.6.2/arch/powerpc/Kconfig +diff -NurpP --minimal linux-3.9.4/arch/powerpc/Kconfig linux-3.9.4-vs2.3.6.3/arch/powerpc/Kconfig --- linux-3.9.4/arch/powerpc/Kconfig 2013-05-31 13:44:44.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/arch/powerpc/Kconfig 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/arch/powerpc/Kconfig 2013-05-31 14:47:11.000000000 +0000 @@ -1027,6 +1027,8 @@ source "lib/Kconfig" source "arch/powerpc/Kconfig.debug" @@ -546,9 +546,9 @@ diff -NurpP --minimal linux-3.9.4/arch/powerpc/Kconfig linux-3.9.4-vs2.3.6.2/arc source "security/Kconfig" config KEYS_COMPAT -diff -NurpP --minimal linux-3.9.4/arch/powerpc/include/uapi/asm/unistd.h linux-3.9.4-vs2.3.6.2/arch/powerpc/include/uapi/asm/unistd.h +diff -NurpP --minimal linux-3.9.4/arch/powerpc/include/uapi/asm/unistd.h linux-3.9.4-vs2.3.6.3/arch/powerpc/include/uapi/asm/unistd.h --- linux-3.9.4/arch/powerpc/include/uapi/asm/unistd.h 2013-05-31 13:44:44.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/arch/powerpc/include/uapi/asm/unistd.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/arch/powerpc/include/uapi/asm/unistd.h 2013-05-31 14:47:11.000000000 +0000 @@ -275,7 +275,7 @@ #endif #define __NR_rtas 255 @@ -558,9 +558,9 @@ diff -NurpP --minimal linux-3.9.4/arch/powerpc/include/uapi/asm/unistd.h linux-3 #define __NR_migrate_pages 258 #define __NR_mbind 259 #define __NR_get_mempolicy 260 -diff -NurpP --minimal linux-3.9.4/arch/powerpc/kernel/process.c linux-3.9.4-vs2.3.6.2/arch/powerpc/kernel/process.c +diff -NurpP --minimal linux-3.9.4/arch/powerpc/kernel/process.c linux-3.9.4-vs2.3.6.3/arch/powerpc/kernel/process.c --- linux-3.9.4/arch/powerpc/kernel/process.c 2013-05-31 13:44:44.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/arch/powerpc/kernel/process.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/arch/powerpc/kernel/process.c 2013-05-31 14:47:11.000000000 +0000 @@ -850,8 +850,9 @@ void show_regs(struct pt_regs * regs) #else printk("DAR: "REG", DSISR: %08lx\n", regs->dar, regs->dsisr); @@ -573,9 +573,9 @@ diff -NurpP --minimal linux-3.9.4/arch/powerpc/kernel/process.c linux-3.9.4-vs2. #ifdef CONFIG_SMP printk(" CPU: %d", raw_smp_processor_id()); -diff -NurpP --minimal linux-3.9.4/arch/powerpc/kernel/traps.c linux-3.9.4-vs2.3.6.2/arch/powerpc/kernel/traps.c +diff -NurpP --minimal linux-3.9.4/arch/powerpc/kernel/traps.c linux-3.9.4-vs2.3.6.3/arch/powerpc/kernel/traps.c --- linux-3.9.4/arch/powerpc/kernel/traps.c 2013-05-31 14:22:26.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/arch/powerpc/kernel/traps.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/arch/powerpc/kernel/traps.c 2013-05-31 14:47:11.000000000 +0000 @@ -1167,8 +1167,9 @@ void nonrecoverable_exception(struct pt_ void trace_syscall(struct pt_regs *regs) @@ -588,9 +588,9 @@ diff -NurpP --minimal linux-3.9.4/arch/powerpc/kernel/traps.c linux-3.9.4-vs2.3. regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted()); } -diff -NurpP --minimal linux-3.9.4/arch/s390/Kconfig linux-3.9.4-vs2.3.6.2/arch/s390/Kconfig +diff -NurpP --minimal linux-3.9.4/arch/s390/Kconfig linux-3.9.4-vs2.3.6.3/arch/s390/Kconfig --- linux-3.9.4/arch/s390/Kconfig 2013-05-31 13:44:45.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/arch/s390/Kconfig 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/arch/s390/Kconfig 2013-05-31 14:47:11.000000000 +0000 @@ -592,6 +592,8 @@ source "fs/Kconfig" source "arch/s390/Kconfig.debug" @@ -600,9 +600,9 @@ diff -NurpP --minimal linux-3.9.4/arch/s390/Kconfig linux-3.9.4-vs2.3.6.2/arch/s source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.9.4/arch/s390/include/asm/tlb.h linux-3.9.4-vs2.3.6.2/arch/s390/include/asm/tlb.h +diff -NurpP --minimal linux-3.9.4/arch/s390/include/asm/tlb.h linux-3.9.4-vs2.3.6.3/arch/s390/include/asm/tlb.h --- linux-3.9.4/arch/s390/include/asm/tlb.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/arch/s390/include/asm/tlb.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/arch/s390/include/asm/tlb.h 2013-05-31 14:47:11.000000000 +0000 @@ -24,6 +24,7 @@ #include #include @@ -611,9 +611,9 @@ diff -NurpP --minimal linux-3.9.4/arch/s390/include/asm/tlb.h linux-3.9.4-vs2.3. #include #include #include -diff -NurpP --minimal linux-3.9.4/arch/s390/include/uapi/asm/unistd.h linux-3.9.4-vs2.3.6.2/arch/s390/include/uapi/asm/unistd.h +diff -NurpP --minimal linux-3.9.4/arch/s390/include/uapi/asm/unistd.h linux-3.9.4-vs2.3.6.3/arch/s390/include/uapi/asm/unistd.h --- linux-3.9.4/arch/s390/include/uapi/asm/unistd.h 2013-02-19 13:57:16.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/arch/s390/include/uapi/asm/unistd.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/arch/s390/include/uapi/asm/unistd.h 2013-05-31 14:47:11.000000000 +0000 @@ -200,7 +200,7 @@ #define __NR_clock_gettime (__NR_timer_create+6) #define __NR_clock_getres (__NR_timer_create+7) @@ -623,9 +623,9 @@ diff -NurpP --minimal linux-3.9.4/arch/s390/include/uapi/asm/unistd.h linux-3.9. #define __NR_statfs64 265 #define __NR_fstatfs64 266 #define __NR_remap_file_pages 267 -diff -NurpP --minimal linux-3.9.4/arch/s390/kernel/ptrace.c linux-3.9.4-vs2.3.6.2/arch/s390/kernel/ptrace.c +diff -NurpP --minimal linux-3.9.4/arch/s390/kernel/ptrace.c linux-3.9.4-vs2.3.6.3/arch/s390/kernel/ptrace.c --- linux-3.9.4/arch/s390/kernel/ptrace.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/arch/s390/kernel/ptrace.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/arch/s390/kernel/ptrace.c 2013-05-31 14:47:11.000000000 +0000 @@ -21,6 +21,7 @@ #include #include @@ -634,9 +634,9 @@ diff -NurpP --minimal linux-3.9.4/arch/s390/kernel/ptrace.c linux-3.9.4-vs2.3.6. #include #include #include -diff -NurpP --minimal linux-3.9.4/arch/s390/kernel/syscalls.S linux-3.9.4-vs2.3.6.2/arch/s390/kernel/syscalls.S +diff -NurpP --minimal linux-3.9.4/arch/s390/kernel/syscalls.S linux-3.9.4-vs2.3.6.3/arch/s390/kernel/syscalls.S --- linux-3.9.4/arch/s390/kernel/syscalls.S 2013-05-31 13:44:45.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/arch/s390/kernel/syscalls.S 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/arch/s390/kernel/syscalls.S 2013-05-31 14:47:11.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) @@ -646,9 +646,9 @@ diff -NurpP --minimal linux-3.9.4/arch/s390/kernel/syscalls.S linux-3.9.4-vs2.3. SYSCALL(sys_s390_fadvise64_64,sys_ni_syscall,sys32_fadvise64_64_wrapper) SYSCALL(sys_statfs64,sys_statfs64,compat_sys_statfs64_wrapper) SYSCALL(sys_fstatfs64,sys_fstatfs64,compat_sys_fstatfs64_wrapper) -diff -NurpP --minimal linux-3.9.4/arch/sh/Kconfig linux-3.9.4-vs2.3.6.2/arch/sh/Kconfig +diff -NurpP --minimal linux-3.9.4/arch/sh/Kconfig linux-3.9.4-vs2.3.6.3/arch/sh/Kconfig --- linux-3.9.4/arch/sh/Kconfig 2013-05-31 13:44:45.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/arch/sh/Kconfig 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/arch/sh/Kconfig 2013-05-31 14:47:11.000000000 +0000 @@ -951,6 +951,8 @@ source "fs/Kconfig" source "arch/sh/Kconfig.debug" @@ -658,9 +658,9 @@ diff -NurpP --minimal linux-3.9.4/arch/sh/Kconfig linux-3.9.4-vs2.3.6.2/arch/sh/ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.9.4/arch/sh/kernel/irq.c linux-3.9.4-vs2.3.6.2/arch/sh/kernel/irq.c +diff -NurpP --minimal linux-3.9.4/arch/sh/kernel/irq.c linux-3.9.4-vs2.3.6.3/arch/sh/kernel/irq.c --- linux-3.9.4/arch/sh/kernel/irq.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/arch/sh/kernel/irq.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/arch/sh/kernel/irq.c 2013-05-31 14:47:11.000000000 +0000 @@ -14,6 +14,7 @@ #include #include @@ -669,9 +669,9 @@ diff -NurpP --minimal linux-3.9.4/arch/sh/kernel/irq.c linux-3.9.4-vs2.3.6.2/arc #include #include #include -diff -NurpP --minimal linux-3.9.4/arch/sparc/Kconfig linux-3.9.4-vs2.3.6.2/arch/sparc/Kconfig +diff -NurpP --minimal linux-3.9.4/arch/sparc/Kconfig linux-3.9.4-vs2.3.6.3/arch/sparc/Kconfig --- linux-3.9.4/arch/sparc/Kconfig 2013-05-31 13:44:47.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/arch/sparc/Kconfig 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/arch/sparc/Kconfig 2013-05-31 14:47:11.000000000 +0000 @@ -559,6 +559,8 @@ source "fs/Kconfig" source "arch/sparc/Kconfig.debug" @@ -681,9 +681,9 @@ diff -NurpP --minimal linux-3.9.4/arch/sparc/Kconfig linux-3.9.4-vs2.3.6.2/arch/ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.9.4/arch/sparc/include/uapi/asm/unistd.h linux-3.9.4-vs2.3.6.2/arch/sparc/include/uapi/asm/unistd.h +diff -NurpP --minimal linux-3.9.4/arch/sparc/include/uapi/asm/unistd.h linux-3.9.4-vs2.3.6.3/arch/sparc/include/uapi/asm/unistd.h --- linux-3.9.4/arch/sparc/include/uapi/asm/unistd.h 2013-02-19 13:57:17.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/arch/sparc/include/uapi/asm/unistd.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/arch/sparc/include/uapi/asm/unistd.h 2013-05-31 14:47:11.000000000 +0000 @@ -332,7 +332,7 @@ #define __NR_timer_getoverrun 264 #define __NR_timer_delete 265 @@ -693,9 +693,9 @@ diff -NurpP --minimal linux-3.9.4/arch/sparc/include/uapi/asm/unistd.h linux-3.9 #define __NR_io_setup 268 #define __NR_io_destroy 269 #define __NR_io_submit 270 -diff -NurpP --minimal linux-3.9.4/arch/sparc/kernel/systbls_32.S linux-3.9.4-vs2.3.6.2/arch/sparc/kernel/systbls_32.S +diff -NurpP --minimal linux-3.9.4/arch/sparc/kernel/systbls_32.S linux-3.9.4-vs2.3.6.3/arch/sparc/kernel/systbls_32.S --- linux-3.9.4/arch/sparc/kernel/systbls_32.S 2013-05-31 13:44:48.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/arch/sparc/kernel/systbls_32.S 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/arch/sparc/kernel/systbls_32.S 2013-05-31 14:47:11.000000000 +0000 @@ -70,7 +70,7 @@ sys_call_table: /*250*/ .long sys_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_ni_syscall /*255*/ .long sys_sync_file_range, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep @@ -705,9 +705,9 @@ diff -NurpP --minimal linux-3.9.4/arch/sparc/kernel/systbls_32.S linux-3.9.4-vs2 /*270*/ .long sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink /*275*/ .long sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid /*280*/ .long sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat -diff -NurpP --minimal linux-3.9.4/arch/sparc/kernel/systbls_64.S linux-3.9.4-vs2.3.6.2/arch/sparc/kernel/systbls_64.S +diff -NurpP --minimal linux-3.9.4/arch/sparc/kernel/systbls_64.S linux-3.9.4-vs2.3.6.3/arch/sparc/kernel/systbls_64.S --- linux-3.9.4/arch/sparc/kernel/systbls_64.S 2013-05-31 13:44:48.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/arch/sparc/kernel/systbls_64.S 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/arch/sparc/kernel/systbls_64.S 2013-05-31 14:47:11.000000000 +0000 @@ -71,7 +71,7 @@ sys_call_table32: /*250*/ .word sys_mremap, compat_sys_sysctl, sys_getsid, sys_fdatasync, sys_nis_syscall .word sys32_sync_file_range, compat_sys_clock_settime, compat_sys_clock_gettime, compat_sys_clock_getres, sys32_clock_nanosleep @@ -726,9 +726,9 @@ diff -NurpP --minimal linux-3.9.4/arch/sparc/kernel/systbls_64.S linux-3.9.4-vs2 /*270*/ .word sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink .word sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid /*280*/ .word sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat -diff -NurpP --minimal linux-3.9.4/arch/um/Kconfig.rest linux-3.9.4-vs2.3.6.2/arch/um/Kconfig.rest +diff -NurpP --minimal linux-3.9.4/arch/um/Kconfig.rest linux-3.9.4-vs2.3.6.3/arch/um/Kconfig.rest --- linux-3.9.4/arch/um/Kconfig.rest 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/arch/um/Kconfig.rest 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/arch/um/Kconfig.rest 2013-05-31 14:47:11.000000000 +0000 @@ -12,6 +12,8 @@ source "arch/um/Kconfig.net" source "fs/Kconfig" @@ -738,9 +738,9 @@ diff -NurpP --minimal linux-3.9.4/arch/um/Kconfig.rest linux-3.9.4-vs2.3.6.2/arc source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.9.4/arch/x86/Kconfig linux-3.9.4-vs2.3.6.2/arch/x86/Kconfig +diff -NurpP --minimal linux-3.9.4/arch/x86/Kconfig linux-3.9.4-vs2.3.6.3/arch/x86/Kconfig --- linux-3.9.4/arch/x86/Kconfig 2013-05-31 14:22:26.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/arch/x86/Kconfig 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/arch/x86/Kconfig 2013-05-31 14:47:11.000000000 +0000 @@ -2341,6 +2341,8 @@ source "fs/Kconfig" source "arch/x86/Kconfig.debug" @@ -750,9 +750,9 @@ diff -NurpP --minimal linux-3.9.4/arch/x86/Kconfig linux-3.9.4-vs2.3.6.2/arch/x8 source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.9.4/arch/x86/syscalls/syscall_32.tbl linux-3.9.4-vs2.3.6.2/arch/x86/syscalls/syscall_32.tbl +diff -NurpP --minimal linux-3.9.4/arch/x86/syscalls/syscall_32.tbl linux-3.9.4-vs2.3.6.3/arch/x86/syscalls/syscall_32.tbl --- linux-3.9.4/arch/x86/syscalls/syscall_32.tbl 2013-05-31 13:44:50.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/arch/x86/syscalls/syscall_32.tbl 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/arch/x86/syscalls/syscall_32.tbl 2013-05-31 14:47:11.000000000 +0000 @@ -279,7 +279,7 @@ 270 i386 tgkill sys_tgkill 271 i386 utimes sys_utimes compat_sys_utimes @@ -762,9 +762,9 @@ diff -NurpP --minimal linux-3.9.4/arch/x86/syscalls/syscall_32.tbl linux-3.9.4-v 274 i386 mbind sys_mbind 275 i386 get_mempolicy sys_get_mempolicy compat_sys_get_mempolicy 276 i386 set_mempolicy sys_set_mempolicy -diff -NurpP --minimal linux-3.9.4/arch/x86/syscalls/syscall_64.tbl linux-3.9.4-vs2.3.6.2/arch/x86/syscalls/syscall_64.tbl +diff -NurpP --minimal linux-3.9.4/arch/x86/syscalls/syscall_64.tbl linux-3.9.4-vs2.3.6.3/arch/x86/syscalls/syscall_64.tbl --- linux-3.9.4/arch/x86/syscalls/syscall_64.tbl 2013-05-31 13:44:50.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/arch/x86/syscalls/syscall_64.tbl 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/arch/x86/syscalls/syscall_64.tbl 2013-05-31 14:47:11.000000000 +0000 @@ -242,7 +242,7 @@ 233 common epoll_ctl sys_epoll_ctl 234 common tgkill sys_tgkill @@ -774,9 +774,9 @@ diff -NurpP --minimal linux-3.9.4/arch/x86/syscalls/syscall_64.tbl linux-3.9.4-v 237 common mbind sys_mbind 238 common set_mempolicy sys_set_mempolicy 239 common get_mempolicy sys_get_mempolicy -diff -NurpP --minimal linux-3.9.4/drivers/block/Kconfig linux-3.9.4-vs2.3.6.2/drivers/block/Kconfig +diff -NurpP --minimal linux-3.9.4/drivers/block/Kconfig linux-3.9.4-vs2.3.6.3/drivers/block/Kconfig --- linux-3.9.4/drivers/block/Kconfig 2013-05-31 13:44:51.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/drivers/block/Kconfig 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/drivers/block/Kconfig 2013-05-31 14:47:11.000000000 +0000 @@ -278,6 +278,13 @@ config BLK_DEV_CRYPTOLOOP source "drivers/block/drbd/Kconfig" @@ -791,9 +791,9 @@ diff -NurpP --minimal linux-3.9.4/drivers/block/Kconfig linux-3.9.4-vs2.3.6.2/dr config BLK_DEV_NBD tristate "Network block device support" depends on NET -diff -NurpP --minimal linux-3.9.4/drivers/block/Makefile linux-3.9.4-vs2.3.6.2/drivers/block/Makefile +diff -NurpP --minimal linux-3.9.4/drivers/block/Makefile linux-3.9.4-vs2.3.6.3/drivers/block/Makefile --- linux-3.9.4/drivers/block/Makefile 2013-05-31 13:44:51.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/drivers/block/Makefile 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/drivers/block/Makefile 2013-05-31 14:47:11.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 @@ -802,9 +802,9 @@ diff -NurpP --minimal linux-3.9.4/drivers/block/Makefile linux-3.9.4-vs2.3.6.2/d obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o obj-$(CONFIG_XEN_BLKDEV_BACKEND) += xen-blkback/ -diff -NurpP --minimal linux-3.9.4/drivers/block/loop.c linux-3.9.4-vs2.3.6.2/drivers/block/loop.c +diff -NurpP --minimal linux-3.9.4/drivers/block/loop.c linux-3.9.4-vs2.3.6.3/drivers/block/loop.c --- linux-3.9.4/drivers/block/loop.c 2013-05-31 13:44:51.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/drivers/block/loop.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/drivers/block/loop.c 2013-05-31 14:47:11.000000000 +0000 @@ -76,6 +76,7 @@ #include #include @@ -860,9 +860,9 @@ diff -NurpP --minimal linux-3.9.4/drivers/block/loop.c linux-3.9.4-vs2.3.6.2/dri mutex_lock(&lo->lo_ctl_mutex); lo->lo_refcnt++; mutex_unlock(&lo->lo_ctl_mutex); -diff -NurpP --minimal linux-3.9.4/drivers/block/vroot.c linux-3.9.4-vs2.3.6.2/drivers/block/vroot.c +diff -NurpP --minimal linux-3.9.4/drivers/block/vroot.c linux-3.9.4-vs2.3.6.3/drivers/block/vroot.c --- linux-3.9.4/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/drivers/block/vroot.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/drivers/block/vroot.c 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,291 @@ +/* + * linux/drivers/block/vroot.c @@ -1155,9 +1155,9 @@ diff -NurpP --minimal linux-3.9.4/drivers/block/vroot.c linux-3.9.4-vs2.3.6.2/dr + +#endif + -diff -NurpP --minimal linux-3.9.4/drivers/infiniband/Kconfig linux-3.9.4-vs2.3.6.2/drivers/infiniband/Kconfig +diff -NurpP --minimal linux-3.9.4/drivers/infiniband/Kconfig linux-3.9.4-vs2.3.6.3/drivers/infiniband/Kconfig --- linux-3.9.4/drivers/infiniband/Kconfig 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/drivers/infiniband/Kconfig 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/drivers/infiniband/Kconfig 2013-05-31 14:47:11.000000000 +0000 @@ -39,7 +39,7 @@ config INFINIBAND_USER_MEM config INFINIBAND_ADDR_TRANS bool @@ -1167,9 +1167,9 @@ diff -NurpP --minimal linux-3.9.4/drivers/infiniband/Kconfig linux-3.9.4-vs2.3.6 default y source "drivers/infiniband/hw/mthca/Kconfig" -diff -NurpP --minimal linux-3.9.4/drivers/infiniband/core/addr.c linux-3.9.4-vs2.3.6.2/drivers/infiniband/core/addr.c +diff -NurpP --minimal linux-3.9.4/drivers/infiniband/core/addr.c linux-3.9.4-vs2.3.6.3/drivers/infiniband/core/addr.c --- linux-3.9.4/drivers/infiniband/core/addr.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/drivers/infiniband/core/addr.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/drivers/infiniband/core/addr.c 2013-05-31 14:47:11.000000000 +0000 @@ -261,7 +261,7 @@ static int addr6_resolve(struct sockaddr if (ipv6_addr_any(&fl6.saddr)) { @@ -1179,9 +1179,9 @@ diff -NurpP --minimal linux-3.9.4/drivers/infiniband/core/addr.c linux-3.9.4-vs2 if (ret) goto put; -diff -NurpP --minimal linux-3.9.4/drivers/md/dm-ioctl.c linux-3.9.4-vs2.3.6.2/drivers/md/dm-ioctl.c +diff -NurpP --minimal linux-3.9.4/drivers/md/dm-ioctl.c linux-3.9.4-vs2.3.6.3/drivers/md/dm-ioctl.c --- linux-3.9.4/drivers/md/dm-ioctl.c 2013-05-31 13:44:59.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/drivers/md/dm-ioctl.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/drivers/md/dm-ioctl.c 2013-05-31 14:47:11.000000000 +0000 @@ -16,6 +16,7 @@ #include #include @@ -1267,9 +1267,9 @@ diff -NurpP --minimal linux-3.9.4/drivers/md/dm-ioctl.c linux-3.9.4-vs2.3.6.2/dr return -EACCES; if (_IOC_TYPE(command) != DM_IOCTL) -diff -NurpP --minimal linux-3.9.4/drivers/md/dm.c linux-3.9.4-vs2.3.6.2/drivers/md/dm.c +diff -NurpP --minimal linux-3.9.4/drivers/md/dm.c linux-3.9.4-vs2.3.6.3/drivers/md/dm.c --- linux-3.9.4/drivers/md/dm.c 2013-05-31 13:44:59.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/drivers/md/dm.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/drivers/md/dm.c 2013-05-31 14:47:11.000000000 +0000 @@ -19,6 +19,7 @@ #include #include @@ -1343,9 +1343,9 @@ diff -NurpP --minimal linux-3.9.4/drivers/md/dm.c linux-3.9.4-vs2.3.6.2/drivers/ md->queue = blk_alloc_queue(GFP_KERNEL); if (!md->queue) goto bad_queue; -diff -NurpP --minimal linux-3.9.4/drivers/md/dm.h linux-3.9.4-vs2.3.6.2/drivers/md/dm.h +diff -NurpP --minimal linux-3.9.4/drivers/md/dm.h linux-3.9.4-vs2.3.6.3/drivers/md/dm.h --- linux-3.9.4/drivers/md/dm.h 2013-02-19 13:57:51.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/drivers/md/dm.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/drivers/md/dm.h 2013-05-31 14:47:11.000000000 +0000 @@ -46,6 +46,8 @@ struct dm_dev_internal { struct dm_table; struct dm_md_mempools; @@ -1355,9 +1355,9 @@ diff -NurpP --minimal linux-3.9.4/drivers/md/dm.h linux-3.9.4-vs2.3.6.2/drivers/ /*----------------------------------------------------------------- * Internal table functions. *---------------------------------------------------------------*/ -diff -NurpP --minimal linux-3.9.4/drivers/net/tun.c linux-3.9.4-vs2.3.6.2/drivers/net/tun.c +diff -NurpP --minimal linux-3.9.4/drivers/net/tun.c linux-3.9.4-vs2.3.6.3/drivers/net/tun.c --- linux-3.9.4/drivers/net/tun.c 2013-05-31 14:22:27.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/drivers/net/tun.c 2013-05-31 20:01:45.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/drivers/net/tun.c 2013-05-31 20:01:45.000000000 +0000 @@ -64,6 +64,7 @@ #include #include @@ -1426,9 +1426,9 @@ diff -NurpP --minimal linux-3.9.4/drivers/net/tun.c linux-3.9.4-vs2.3.6.2/driver case TUNSETLINK: /* Only allow setting the type when the interface is down */ if (tun->dev->flags & IFF_UP) { -diff -NurpP --minimal linux-3.9.4/drivers/staging/csr/csr_wifi_hip_xbv.c linux-3.9.4-vs2.3.6.2/drivers/staging/csr/csr_wifi_hip_xbv.c +diff -NurpP --minimal linux-3.9.4/drivers/staging/csr/csr_wifi_hip_xbv.c linux-3.9.4-vs2.3.6.3/drivers/staging/csr/csr_wifi_hip_xbv.c --- linux-3.9.4/drivers/staging/csr/csr_wifi_hip_xbv.c 2013-02-19 13:58:32.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/drivers/staging/csr/csr_wifi_hip_xbv.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/drivers/staging/csr/csr_wifi_hip_xbv.c 2013-05-31 14:47:11.000000000 +0000 @@ -55,7 +55,7 @@ typedef struct { char t_name[4]; @@ -1465,9 +1465,9 @@ diff -NurpP --minimal linux-3.9.4/drivers/staging/csr/csr_wifi_hip_xbv.c linux-3 { u8 buf[8]; s32 n; -diff -NurpP --minimal linux-3.9.4/drivers/tty/sysrq.c linux-3.9.4-vs2.3.6.2/drivers/tty/sysrq.c +diff -NurpP --minimal linux-3.9.4/drivers/tty/sysrq.c linux-3.9.4-vs2.3.6.3/drivers/tty/sysrq.c --- linux-3.9.4/drivers/tty/sysrq.c 2013-05-31 13:45:19.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/drivers/tty/sysrq.c 2013-05-31 15:08:19.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/drivers/tty/sysrq.c 2013-05-31 15:08:19.000000000 +0000 @@ -43,6 +43,7 @@ #include #include @@ -1519,9 +1519,9 @@ diff -NurpP --minimal linux-3.9.4/drivers/tty/sysrq.c linux-3.9.4-vs2.3.6.2/driv else retval = -1; return retval; -diff -NurpP --minimal linux-3.9.4/drivers/tty/tty_io.c linux-3.9.4-vs2.3.6.2/drivers/tty/tty_io.c +diff -NurpP --minimal linux-3.9.4/drivers/tty/tty_io.c linux-3.9.4-vs2.3.6.3/drivers/tty/tty_io.c --- linux-3.9.4/drivers/tty/tty_io.c 2013-05-31 14:22:27.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/drivers/tty/tty_io.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/drivers/tty/tty_io.c 2013-05-31 14:47:11.000000000 +0000 @@ -104,6 +104,7 @@ #include @@ -1548,9 +1548,9 @@ diff -NurpP --minimal linux-3.9.4/drivers/tty/tty_io.c linux-3.9.4-vs2.3.6.2/dri if (pgrp_nr < 0) return -EINVAL; rcu_read_lock(); -diff -NurpP --minimal linux-3.9.4/fs/attr.c linux-3.9.4-vs2.3.6.2/fs/attr.c +diff -NurpP --minimal linux-3.9.4/fs/attr.c linux-3.9.4-vs2.3.6.3/fs/attr.c --- linux-3.9.4/fs/attr.c 2013-02-19 13:58:46.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/attr.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/attr.c 2013-05-31 14:47:11.000000000 +0000 @@ -15,6 +15,9 @@ #include #include @@ -1591,9 +1591,9 @@ diff -NurpP --minimal linux-3.9.4/fs/attr.c linux-3.9.4-vs2.3.6.2/fs/attr.c if (IS_IMMUTABLE(inode) || IS_APPEND(inode)) return -EPERM; } -diff -NurpP --minimal linux-3.9.4/fs/block_dev.c linux-3.9.4-vs2.3.6.2/fs/block_dev.c +diff -NurpP --minimal linux-3.9.4/fs/block_dev.c linux-3.9.4-vs2.3.6.3/fs/block_dev.c --- linux-3.9.4/fs/block_dev.c 2013-05-31 13:45:22.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/block_dev.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/block_dev.c 2013-05-31 14:47:11.000000000 +0000 @@ -27,6 +27,7 @@ #include #include @@ -1631,9 +1631,9 @@ diff -NurpP --minimal linux-3.9.4/fs/block_dev.c linux-3.9.4-vs2.3.6.2/fs/block_ if (bdev) { spin_lock(&bdev_lock); if (!inode->i_bdev) { -diff -NurpP --minimal linux-3.9.4/fs/btrfs/ctree.h linux-3.9.4-vs2.3.6.2/fs/btrfs/ctree.h +diff -NurpP --minimal linux-3.9.4/fs/btrfs/ctree.h linux-3.9.4-vs2.3.6.3/fs/btrfs/ctree.h --- linux-3.9.4/fs/btrfs/ctree.h 2013-05-31 13:45:22.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/btrfs/ctree.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/btrfs/ctree.h 2013-05-31 14:47:11.000000000 +0000 @@ -705,11 +705,14 @@ struct btrfs_inode_item { /* modification sequence number for NFS */ __le64 sequence; @@ -1686,9 +1686,9 @@ diff -NurpP --minimal linux-3.9.4/fs/btrfs/ctree.h linux-3.9.4-vs2.3.6.2/fs/btrf int btrfs_defrag_file(struct inode *inode, struct file *file, struct btrfs_ioctl_defrag_range_args *range, u64 newer_than, unsigned long max_pages); -diff -NurpP --minimal linux-3.9.4/fs/btrfs/disk-io.c linux-3.9.4-vs2.3.6.2/fs/btrfs/disk-io.c +diff -NurpP --minimal linux-3.9.4/fs/btrfs/disk-io.c linux-3.9.4-vs2.3.6.3/fs/btrfs/disk-io.c --- linux-3.9.4/fs/btrfs/disk-io.c 2013-05-31 13:45:22.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/btrfs/disk-io.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/btrfs/disk-io.c 2013-05-31 14:47:11.000000000 +0000 @@ -2258,6 +2258,9 @@ int open_ctree(struct super_block *sb, goto fail_alloc; } @@ -1699,9 +1699,9 @@ diff -NurpP --minimal linux-3.9.4/fs/btrfs/disk-io.c linux-3.9.4-vs2.3.6.2/fs/bt features = btrfs_super_incompat_flags(disk_super) & ~BTRFS_FEATURE_INCOMPAT_SUPP; if (features) { -diff -NurpP --minimal linux-3.9.4/fs/btrfs/inode.c linux-3.9.4-vs2.3.6.2/fs/btrfs/inode.c +diff -NurpP --minimal linux-3.9.4/fs/btrfs/inode.c linux-3.9.4-vs2.3.6.3/fs/btrfs/inode.c --- linux-3.9.4/fs/btrfs/inode.c 2013-05-31 14:22:27.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/btrfs/inode.c 2013-05-31 20:42:33.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/btrfs/inode.c 2013-06-03 19:37:03.000000000 +0000 @@ -41,6 +41,7 @@ #include #include @@ -1710,39 +1710,41 @@ diff -NurpP --minimal linux-3.9.4/fs/btrfs/inode.c linux-3.9.4-vs2.3.6.2/fs/btrf #include "compat.h" #include "ctree.h" #include "disk-io.h" -@@ -3312,6 +3313,8 @@ static void btrfs_read_locked_inode(stru +@@ -3312,6 +3313,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; -@@ -3339,8 +3342,13 @@ static void btrfs_read_locked_inode(stru +@@ -3339,8 +3343,14 @@ static void btrfs_read_locked_inode(stru struct btrfs_inode_item); inode->i_mode = btrfs_inode_mode(leaf, inode_item); set_nlink(inode, btrfs_inode_nlink(leaf, inode_item)); - i_uid_write(inode, btrfs_inode_uid(leaf, inode_item)); - i_gid_write(inode, btrfs_inode_gid(leaf, inode_item)); + -+ uid = btrfs_inode_uid(leaf, inode_item); -+ gid = btrfs_inode_gid(leaf, inode_item); -+ i_uid_write(inode, INOTAG_UID(DX_TAG(inode), uid, gid)); -+ i_gid_write(inode, INOTAG_GID(DX_TAG(inode), uid, gid)); -+ i_tag_write(inode, INOTAG_TAG(DX_TAG(inode), uid, gid, -+ btrfs_inode_tag(leaf, inode_item))); ++ kuid = make_kuid(&init_user_ns, btrfs_inode_uid(leaf, inode_item)); ++ kgid = make_kgid(&init_user_ns, btrfs_inode_gid(leaf, inode_item)); ++ ktag = make_ktag(&init_user_ns, btrfs_inode_tag(leaf, inode_item)); ++ ++ inode->i_uid = INOTAG_KUID(DX_TAG(inode), kuid, kgid); ++ inode->i_gid = INOTAG_KGID(DX_TAG(inode), kuid, kgid); ++ inode->i_tag = INOTAG_KTAG(DX_TAG(inode), kuid, kgid, ktag); btrfs_i_size_write(inode, btrfs_inode_size(leaf, inode_item)); tspec = btrfs_inode_atime(inode_item); -@@ -3431,11 +3439,18 @@ static void fill_inode_item(struct btrfs +@@ -3431,11 +3441,18 @@ static void fill_inode_item(struct btrfs struct inode *inode) { struct btrfs_map_token token; -+ uid_t uid = TAGINO_UID(DX_TAG(inode), -+ i_uid_read(inode), i_tag_read(inode)); -+ gid_t gid = TAGINO_GID(DX_TAG(inode), -+ i_gid_read(inode), i_tag_read(inode)); ++ uid_t uid = from_kuid(&init_user_ns, ++ TAGINO_KUID(DX_TAG(inode), inode->i_uid, inode->i_tag)); ++ gid_t gid = from_kgid(&init_user_ns, ++ TAGINO_KGID(DX_TAG(inode), inode->i_gid, inode->i_tag)); btrfs_init_map_token(&token); @@ -1756,7 +1758,7 @@ diff -NurpP --minimal linux-3.9.4/fs/btrfs/inode.c linux-3.9.4-vs2.3.6.2/fs/btrf btrfs_set_token_inode_size(leaf, item, BTRFS_I(inode)->disk_i_size, &token); btrfs_set_token_inode_mode(leaf, item, inode->i_mode, &token); -@@ -8683,11 +8698,13 @@ static const struct inode_operations btr +@@ -8683,11 +8700,13 @@ static const struct inode_operations btr .listxattr = btrfs_listxattr, .removexattr = btrfs_removexattr, .permission = btrfs_permission, @@ -1770,9 +1772,9 @@ diff -NurpP --minimal linux-3.9.4/fs/btrfs/inode.c linux-3.9.4-vs2.3.6.2/fs/btrf .get_acl = btrfs_get_acl, }; -diff -NurpP --minimal linux-3.9.4/fs/btrfs/ioctl.c linux-3.9.4-vs2.3.6.2/fs/btrfs/ioctl.c +diff -NurpP --minimal linux-3.9.4/fs/btrfs/ioctl.c linux-3.9.4-vs2.3.6.3/fs/btrfs/ioctl.c --- linux-3.9.4/fs/btrfs/ioctl.c 2013-05-31 14:22:27.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/btrfs/ioctl.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/btrfs/ioctl.c 2013-05-31 14:47:11.000000000 +0000 @@ -75,10 +75,13 @@ static unsigned int btrfs_flags_to_ioctl { unsigned int iflags = 0; @@ -1944,9 +1946,9 @@ diff -NurpP --minimal linux-3.9.4/fs/btrfs/ioctl.c linux-3.9.4-vs2.3.6.2/fs/btrf if (flags & FS_APPEND_FL) ip->flags |= BTRFS_INODE_APPEND; else -diff -NurpP --minimal linux-3.9.4/fs/btrfs/super.c linux-3.9.4-vs2.3.6.2/fs/btrfs/super.c +diff -NurpP --minimal linux-3.9.4/fs/btrfs/super.c linux-3.9.4-vs2.3.6.3/fs/btrfs/super.c --- linux-3.9.4/fs/btrfs/super.c 2013-05-31 13:45:22.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/btrfs/super.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/btrfs/super.c 2013-05-31 14:47:11.000000000 +0000 @@ -321,7 +321,7 @@ enum { Opt_no_space_cache, Opt_recovery, Opt_skip_balance, Opt_check_integrity, Opt_check_integrity_including_extent_data, @@ -2002,9 +2004,9 @@ diff -NurpP --minimal linux-3.9.4/fs/btrfs/super.c linux-3.9.4-vs2.3.6.2/fs/btrf if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY)) goto out; -diff -NurpP --minimal linux-3.9.4/fs/char_dev.c linux-3.9.4-vs2.3.6.2/fs/char_dev.c +diff -NurpP --minimal linux-3.9.4/fs/char_dev.c linux-3.9.4-vs2.3.6.3/fs/char_dev.c --- linux-3.9.4/fs/char_dev.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/char_dev.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/char_dev.c 2013-05-31 14:47:11.000000000 +0000 @@ -21,6 +21,8 @@ #include #include @@ -2037,9 +2039,9 @@ diff -NurpP --minimal linux-3.9.4/fs/char_dev.c linux-3.9.4-vs2.3.6.2/fs/char_de if (!kobj) return -ENXIO; new = container_of(kobj, struct cdev, kobj); -diff -NurpP --minimal linux-3.9.4/fs/dcache.c linux-3.9.4-vs2.3.6.2/fs/dcache.c +diff -NurpP --minimal linux-3.9.4/fs/dcache.c linux-3.9.4-vs2.3.6.3/fs/dcache.c --- linux-3.9.4/fs/dcache.c 2013-05-31 14:22:27.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/dcache.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/dcache.c 2013-05-31 14:47:11.000000000 +0000 @@ -37,6 +37,7 @@ #include #include @@ -2091,9 +2093,9 @@ diff -NurpP --minimal linux-3.9.4/fs/dcache.c linux-3.9.4-vs2.3.6.2/fs/dcache.c found = dentry; spin_unlock(&dentry->d_lock); break; -diff -NurpP --minimal linux-3.9.4/fs/devpts/inode.c linux-3.9.4-vs2.3.6.2/fs/devpts/inode.c +diff -NurpP --minimal linux-3.9.4/fs/devpts/inode.c linux-3.9.4-vs2.3.6.3/fs/devpts/inode.c --- linux-3.9.4/fs/devpts/inode.c 2013-05-31 13:45:23.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/devpts/inode.c 2013-05-31 15:42:25.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/devpts/inode.c 2013-05-31 15:42:25.000000000 +0000 @@ -25,6 +25,7 @@ #include #include @@ -2181,9 +2183,9 @@ diff -NurpP --minimal linux-3.9.4/fs/devpts/inode.c linux-3.9.4-vs2.3.6.2/fs/dev inode->i_private = priv; sprintf(s, "%d", index); -diff -NurpP --minimal linux-3.9.4/fs/ext2/balloc.c linux-3.9.4-vs2.3.6.2/fs/ext2/balloc.c +diff -NurpP --minimal linux-3.9.4/fs/ext2/balloc.c linux-3.9.4-vs2.3.6.3/fs/ext2/balloc.c --- linux-3.9.4/fs/ext2/balloc.c 2013-05-31 13:45:23.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/ext2/balloc.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/ext2/balloc.c 2013-05-31 14:47:11.000000000 +0000 @@ -693,7 +693,6 @@ ext2_try_to_allocate(struct super_block start = 0; end = EXT2_BLOCKS_PER_GROUP(sb); @@ -2192,9 +2194,9 @@ diff -NurpP --minimal linux-3.9.4/fs/ext2/balloc.c linux-3.9.4-vs2.3.6.2/fs/ext2 BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb)); repeat: -diff -NurpP --minimal linux-3.9.4/fs/ext2/ext2.h linux-3.9.4-vs2.3.6.2/fs/ext2/ext2.h +diff -NurpP --minimal linux-3.9.4/fs/ext2/ext2.h linux-3.9.4-vs2.3.6.3/fs/ext2/ext2.h --- linux-3.9.4/fs/ext2/ext2.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/ext2/ext2.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/ext2/ext2.h 2013-05-31 14:47:11.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) */ @@ -2242,18 +2244,18 @@ diff -NurpP --minimal linux-3.9.4/fs/ext2/ext2.h linux-3.9.4-vs2.3.6.2/fs/ext2/e /* ioctl.c */ extern long ext2_ioctl(struct file *, unsigned int, unsigned long); -diff -NurpP --minimal linux-3.9.4/fs/ext2/file.c linux-3.9.4-vs2.3.6.2/fs/ext2/file.c +diff -NurpP --minimal linux-3.9.4/fs/ext2/file.c linux-3.9.4-vs2.3.6.3/fs/ext2/file.c --- linux-3.9.4/fs/ext2/file.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/ext2/file.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/ext2/file.c 2013-05-31 14:47:11.000000000 +0000 @@ -104,4 +104,5 @@ const struct inode_operations ext2_file_ .setattr = ext2_setattr, .get_acl = ext2_get_acl, .fiemap = ext2_fiemap, + .sync_flags = ext2_sync_flags, }; -diff -NurpP --minimal linux-3.9.4/fs/ext2/ialloc.c linux-3.9.4-vs2.3.6.2/fs/ext2/ialloc.c +diff -NurpP --minimal linux-3.9.4/fs/ext2/ialloc.c linux-3.9.4-vs2.3.6.3/fs/ext2/ialloc.c --- linux-3.9.4/fs/ext2/ialloc.c 2013-05-31 13:45:23.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/ext2/ialloc.c 2013-06-01 09:31:28.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/ext2/ialloc.c 2013-06-03 18:58:16.000000000 +0000 @@ -17,6 +17,7 @@ #include #include @@ -2262,18 +2264,17 @@ diff -NurpP --minimal linux-3.9.4/fs/ext2/ialloc.c linux-3.9.4-vs2.3.6.2/fs/ext2 #include "ext2.h" #include "xattr.h" #include "acl.h" -@@ -546,6 +547,8 @@ got: +@@ -546,6 +547,7 @@ got: inode->i_mode = mode; inode->i_uid = current_fsuid(); inode->i_gid = dir->i_gid; -+ inode->i_tag = make_ktag(&init_user_ns, -+ dx_current_fstag(sb)); ++ i_tag_write(inode, dx_current_fstag(sb)); } else inode_init_owner(inode, dir, mode); -diff -NurpP --minimal linux-3.9.4/fs/ext2/inode.c linux-3.9.4-vs2.3.6.2/fs/ext2/inode.c +diff -NurpP --minimal linux-3.9.4/fs/ext2/inode.c linux-3.9.4-vs2.3.6.3/fs/ext2/inode.c --- linux-3.9.4/fs/ext2/inode.c 2013-05-31 13:45:23.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/ext2/inode.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/ext2/inode.c 2013-06-03 19:42:51.000000000 +0000 @@ -31,6 +31,7 @@ #include #include @@ -2379,10 +2380,10 @@ diff -NurpP --minimal linux-3.9.4/fs/ext2/inode.c linux-3.9.4-vs2.3.6.2/fs/ext2/ ino_t ino = inode->i_ino; - uid_t uid = i_uid_read(inode); - gid_t gid = i_gid_read(inode); -+ uid_t uid = TAGINO_UID(DX_TAG(inode), -+ i_uid_read(inode), i_tag_read(inode)); -+ gid_t gid = TAGINO_GID(DX_TAG(inode), -+ i_gid_read(inode), i_tag_read(inode)); ++ uid_t uid = from_kuid(&init_user_ns, ++ TAGINO_KUID(DX_TAG(inode), inode->i_uid, inode->i_tag)); ++ gid_t gid = from_kgid(&init_user_ns, ++ TAGINO_KGID(DX_TAG(inode), inode->i_gid, inode->i_tag)); struct buffer_head * bh; struct ext2_inode * raw_inode = ext2_get_inode(sb, ino, &bh); int n; @@ -2406,9 +2407,9 @@ diff -NurpP --minimal linux-3.9.4/fs/ext2/inode.c linux-3.9.4-vs2.3.6.2/fs/ext2/ error = dquot_transfer(inode, iattr); if (error) return error; -diff -NurpP --minimal linux-3.9.4/fs/ext2/ioctl.c linux-3.9.4-vs2.3.6.2/fs/ext2/ioctl.c +diff -NurpP --minimal linux-3.9.4/fs/ext2/ioctl.c linux-3.9.4-vs2.3.6.3/fs/ext2/ioctl.c --- linux-3.9.4/fs/ext2/ioctl.c 2013-05-31 13:45:23.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/ext2/ioctl.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/ext2/ioctl.c 2013-05-31 14:47:11.000000000 +0000 @@ -17,6 +17,16 @@ #include @@ -2458,9 +2459,9 @@ diff -NurpP --minimal linux-3.9.4/fs/ext2/ioctl.c linux-3.9.4-vs2.3.6.2/fs/ext2/ flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE; ei->i_flags = flags; -diff -NurpP --minimal linux-3.9.4/fs/ext2/namei.c linux-3.9.4-vs2.3.6.2/fs/ext2/namei.c +diff -NurpP --minimal linux-3.9.4/fs/ext2/namei.c linux-3.9.4-vs2.3.6.3/fs/ext2/namei.c --- linux-3.9.4/fs/ext2/namei.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/ext2/namei.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/ext2/namei.c 2013-05-31 14:47:11.000000000 +0000 @@ -32,6 +32,7 @@ #include @@ -2485,9 +2486,9 @@ diff -NurpP --minimal linux-3.9.4/fs/ext2/namei.c linux-3.9.4-vs2.3.6.2/fs/ext2/ .get_acl = ext2_get_acl, }; -diff -NurpP --minimal linux-3.9.4/fs/ext2/super.c linux-3.9.4-vs2.3.6.2/fs/ext2/super.c +diff -NurpP --minimal linux-3.9.4/fs/ext2/super.c linux-3.9.4-vs2.3.6.3/fs/ext2/super.c --- linux-3.9.4/fs/ext2/super.c 2013-05-31 13:45:23.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/ext2/super.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/ext2/super.c 2013-05-31 14:47:11.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, @@ -2553,9 +2554,9 @@ diff -NurpP --minimal linux-3.9.4/fs/ext2/super.c linux-3.9.4-vs2.3.6.2/fs/ext2/ sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | ((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0); -diff -NurpP --minimal linux-3.9.4/fs/ext3/ext3.h linux-3.9.4-vs2.3.6.2/fs/ext3/ext3.h +diff -NurpP --minimal linux-3.9.4/fs/ext3/ext3.h linux-3.9.4-vs2.3.6.3/fs/ext3/ext3.h --- linux-3.9.4/fs/ext3/ext3.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/ext3/ext3.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/ext3/ext3.h 2013-05-31 14:47:11.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) */ @@ -2607,9 +2608,9 @@ diff -NurpP --minimal linux-3.9.4/fs/ext3/ext3.h linux-3.9.4-vs2.3.6.2/fs/ext3/e /* ioctl.c */ extern long ext3_ioctl(struct file *, unsigned int, unsigned long); -diff -NurpP --minimal linux-3.9.4/fs/ext3/file.c linux-3.9.4-vs2.3.6.2/fs/ext3/file.c +diff -NurpP --minimal linux-3.9.4/fs/ext3/file.c linux-3.9.4-vs2.3.6.3/fs/ext3/file.c --- linux-3.9.4/fs/ext3/file.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/ext3/file.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/ext3/file.c 2013-05-31 14:47:11.000000000 +0000 @@ -76,5 +76,6 @@ const struct inode_operations ext3_file_ #endif .get_acl = ext3_get_acl, @@ -2617,9 +2618,9 @@ diff -NurpP --minimal linux-3.9.4/fs/ext3/file.c linux-3.9.4-vs2.3.6.2/fs/ext3/f + .sync_flags = ext3_sync_flags, }; -diff -NurpP --minimal linux-3.9.4/fs/ext3/ialloc.c linux-3.9.4-vs2.3.6.2/fs/ext3/ialloc.c +diff -NurpP --minimal linux-3.9.4/fs/ext3/ialloc.c linux-3.9.4-vs2.3.6.3/fs/ext3/ialloc.c --- linux-3.9.4/fs/ext3/ialloc.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/ext3/ialloc.c 2013-06-01 09:40:15.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/ext3/ialloc.c 2013-06-03 19:43:33.000000000 +0000 @@ -14,6 +14,7 @@ #include @@ -2628,18 +2629,17 @@ diff -NurpP --minimal linux-3.9.4/fs/ext3/ialloc.c linux-3.9.4-vs2.3.6.2/fs/ext3 #include "ext3.h" #include "xattr.h" -@@ -469,6 +470,8 @@ got: +@@ -469,6 +470,7 @@ got: inode->i_mode = mode; inode->i_uid = current_fsuid(); inode->i_gid = dir->i_gid; -+ inode->i_tag = make_ktag(&init_user_ns, -+ dx_current_fstag(sb)); ++ i_tag_write(inode, dx_current_fstag(sb)); } else inode_init_owner(inode, dir, mode); -diff -NurpP --minimal linux-3.9.4/fs/ext3/inode.c linux-3.9.4-vs2.3.6.2/fs/ext3/inode.c +diff -NurpP --minimal linux-3.9.4/fs/ext3/inode.c linux-3.9.4-vs2.3.6.3/fs/ext3/inode.c --- linux-3.9.4/fs/ext3/inode.c 2013-05-31 13:45:23.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/ext3/inode.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/ext3/inode.c 2013-06-03 19:44:35.000000000 +0000 @@ -27,6 +27,8 @@ #include #include @@ -2736,10 +2736,10 @@ diff -NurpP --minimal linux-3.9.4/fs/ext3/inode.c linux-3.9.4-vs2.3.6.2/fs/ext3/ raw_inode->i_mode = cpu_to_le16(inode->i_mode); - i_uid = i_uid_read(inode); - i_gid = i_gid_read(inode); -+ i_uid = TAGINO_UID(DX_TAG(inode), -+ i_uid_read(inode), i_tag_read(inode)); -+ i_gid = TAGINO_GID(DX_TAG(inode), -+ i_gid_read(inode), i_tag_read(inode)); ++ i_uid = from_kuid(&init_user_ns, ++ TAGINO_KUID(DX_TAG(inode), inode->i_uid, inode->i_tag)); ++ i_gid = from_kgid(&init_user_ns, ++ TAGINO_KGID(DX_TAG(inode), inode->i_gid, inode->i_tag)); if(!(test_opt(inode->i_sb, NO_UID32))) { raw_inode->i_uid_low = cpu_to_le16(low_16_bits(i_uid)); raw_inode->i_gid_low = cpu_to_le16(low_16_bits(i_gid)); @@ -2772,9 +2772,9 @@ diff -NurpP --minimal linux-3.9.4/fs/ext3/inode.c linux-3.9.4-vs2.3.6.2/fs/ext3/ error = ext3_mark_inode_dirty(handle, inode); ext3_journal_stop(handle); } -diff -NurpP --minimal linux-3.9.4/fs/ext3/ioctl.c linux-3.9.4-vs2.3.6.2/fs/ext3/ioctl.c +diff -NurpP --minimal linux-3.9.4/fs/ext3/ioctl.c linux-3.9.4-vs2.3.6.3/fs/ext3/ioctl.c --- linux-3.9.4/fs/ext3/ioctl.c 2013-05-31 13:45:23.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/ext3/ioctl.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/ext3/ioctl.c 2013-05-31 14:47:11.000000000 +0000 @@ -12,6 +12,34 @@ #include #include "ext3.h" @@ -2842,9 +2842,9 @@ diff -NurpP --minimal linux-3.9.4/fs/ext3/ioctl.c linux-3.9.4-vs2.3.6.2/fs/ext3/ flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE; ei->i_flags = flags; -diff -NurpP --minimal linux-3.9.4/fs/ext3/namei.c linux-3.9.4-vs2.3.6.2/fs/ext3/namei.c +diff -NurpP --minimal linux-3.9.4/fs/ext3/namei.c linux-3.9.4-vs2.3.6.3/fs/ext3/namei.c --- linux-3.9.4/fs/ext3/namei.c 2013-05-31 13:45:23.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/ext3/namei.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/ext3/namei.c 2013-05-31 14:47:11.000000000 +0000 @@ -25,6 +25,8 @@ */ @@ -2870,9 +2870,9 @@ diff -NurpP --minimal linux-3.9.4/fs/ext3/namei.c linux-3.9.4-vs2.3.6.2/fs/ext3/ .get_acl = ext3_get_acl, }; -diff -NurpP --minimal linux-3.9.4/fs/ext3/super.c linux-3.9.4-vs2.3.6.2/fs/ext3/super.c +diff -NurpP --minimal linux-3.9.4/fs/ext3/super.c linux-3.9.4-vs2.3.6.3/fs/ext3/super.c --- linux-3.9.4/fs/ext3/super.c 2013-05-31 13:45:23.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/ext3/super.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/ext3/super.c 2013-05-31 14:47:11.000000000 +0000 @@ -816,7 +816,8 @@ enum { Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota, Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota, @@ -2939,9 +2939,9 @@ diff -NurpP --minimal linux-3.9.4/fs/ext3/super.c linux-3.9.4-vs2.3.6.2/fs/ext3/ sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); -diff -NurpP --minimal linux-3.9.4/fs/ext4/ext4.h linux-3.9.4-vs2.3.6.2/fs/ext4/ext4.h +diff -NurpP --minimal linux-3.9.4/fs/ext4/ext4.h linux-3.9.4-vs2.3.6.3/fs/ext4/ext4.h --- linux-3.9.4/fs/ext4/ext4.h 2013-05-31 13:45:23.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/ext4/ext4.h 2013-05-31 16:22:49.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/ext4/ext4.h 2013-05-31 16:22:49.000000000 +0000 @@ -399,7 +399,10 @@ struct flex_groups { #define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */ #define EXT4_EA_INODE_FL 0x00200000 /* Inode used for large EA */ @@ -2986,9 +2986,9 @@ diff -NurpP --minimal linux-3.9.4/fs/ext4/ext4.h linux-3.9.4-vs2.3.6.2/fs/ext4/e extern int ext4_try_to_evict_inline_data(handle_t *handle, struct inode *inode, int needed); -diff -NurpP --minimal linux-3.9.4/fs/ext4/file.c linux-3.9.4-vs2.3.6.2/fs/ext4/file.c +diff -NurpP --minimal linux-3.9.4/fs/ext4/file.c linux-3.9.4-vs2.3.6.3/fs/ext4/file.c --- linux-3.9.4/fs/ext4/file.c 2013-05-31 13:45:23.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/ext4/file.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/ext4/file.c 2013-05-31 14:47:11.000000000 +0000 @@ -650,5 +650,6 @@ const struct inode_operations ext4_file_ .removexattr = generic_removexattr, .get_acl = ext4_get_acl, @@ -2996,9 +2996,9 @@ diff -NurpP --minimal linux-3.9.4/fs/ext4/file.c linux-3.9.4-vs2.3.6.2/fs/ext4/f + .sync_flags = ext4_sync_flags, }; -diff -NurpP --minimal linux-3.9.4/fs/ext4/ialloc.c linux-3.9.4-vs2.3.6.2/fs/ext4/ialloc.c +diff -NurpP --minimal linux-3.9.4/fs/ext4/ialloc.c linux-3.9.4-vs2.3.6.3/fs/ext4/ialloc.c --- linux-3.9.4/fs/ext4/ialloc.c 2013-05-31 13:45:23.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/ext4/ialloc.c 2013-06-01 09:46:49.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/ext4/ialloc.c 2013-06-03 19:45:15.000000000 +0000 @@ -22,6 +22,7 @@ #include #include @@ -3007,18 +3007,17 @@ diff -NurpP --minimal linux-3.9.4/fs/ext4/ialloc.c linux-3.9.4-vs2.3.6.2/fs/ext4 #include #include "ext4.h" -@@ -859,6 +860,8 @@ got: +@@ -859,6 +860,7 @@ got: inode->i_mode = mode; inode->i_uid = current_fsuid(); inode->i_gid = dir->i_gid; -+ inode->i_tag = make_ktag(&init_user_ns, -+ dx_current_fstag(sb)); ++ i_tag_write(inode, dx_current_fstag(sb)); } else inode_init_owner(inode, dir, mode); -diff -NurpP --minimal linux-3.9.4/fs/ext4/inode.c linux-3.9.4-vs2.3.6.2/fs/ext4/inode.c +diff -NurpP --minimal linux-3.9.4/fs/ext4/inode.c linux-3.9.4-vs2.3.6.3/fs/ext4/inode.c --- linux-3.9.4/fs/ext4/inode.c 2013-05-31 14:22:27.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/ext4/inode.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/ext4/inode.c 2013-06-03 19:45:35.000000000 +0000 @@ -37,6 +37,7 @@ #include #include @@ -3118,10 +3117,10 @@ diff -NurpP --minimal linux-3.9.4/fs/ext4/inode.c linux-3.9.4-vs2.3.6.2/fs/ext4/ raw_inode->i_mode = cpu_to_le16(inode->i_mode); - i_uid = i_uid_read(inode); - i_gid = i_gid_read(inode); -+ i_uid = TAGINO_UID(DX_TAG(inode), -+ i_uid_read(inode), i_tag_read(inode)); -+ i_gid = TAGINO_GID(DX_TAG(inode), -+ i_gid_read(inode), i_tag_read(inode)); ++ i_uid = from_kuid(&init_user_ns, ++ TAGINO_KUID(DX_TAG(inode), inode->i_uid, inode->i_tag)); ++ i_gid = from_kgid(&init_user_ns, ++ TAGINO_KGID(DX_TAG(inode), inode->i_gid, inode->i_tag)); if (!(test_opt(inode->i_sb, NO_UID32))) { raw_inode->i_uid_low = cpu_to_le16(low_16_bits(i_uid)); raw_inode->i_gid_low = cpu_to_le16(low_16_bits(i_gid)); @@ -3154,9 +3153,9 @@ diff -NurpP --minimal linux-3.9.4/fs/ext4/inode.c linux-3.9.4-vs2.3.6.2/fs/ext4/ error = ext4_mark_inode_dirty(handle, inode); ext4_journal_stop(handle); } -diff -NurpP --minimal linux-3.9.4/fs/ext4/ioctl.c linux-3.9.4-vs2.3.6.2/fs/ext4/ioctl.c +diff -NurpP --minimal linux-3.9.4/fs/ext4/ioctl.c linux-3.9.4-vs2.3.6.3/fs/ext4/ioctl.c --- linux-3.9.4/fs/ext4/ioctl.c 2013-05-31 13:45:23.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/ext4/ioctl.c 2013-05-31 19:50:08.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/ext4/ioctl.c 2013-05-31 19:50:08.000000000 +0000 @@ -14,12 +14,40 @@ #include #include @@ -3221,9 +3220,9 @@ diff -NurpP --minimal linux-3.9.4/fs/ext4/ioctl.c linux-3.9.4-vs2.3.6.2/fs/ext4/ if (!capable(CAP_LINUX_IMMUTABLE)) goto flags_out; } -diff -NurpP --minimal linux-3.9.4/fs/ext4/namei.c linux-3.9.4-vs2.3.6.2/fs/ext4/namei.c +diff -NurpP --minimal linux-3.9.4/fs/ext4/namei.c linux-3.9.4-vs2.3.6.3/fs/ext4/namei.c --- linux-3.9.4/fs/ext4/namei.c 2013-05-31 13:45:23.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/ext4/namei.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/ext4/namei.c 2013-05-31 14:47:11.000000000 +0000 @@ -34,6 +34,7 @@ #include #include @@ -3248,9 +3247,9 @@ diff -NurpP --minimal linux-3.9.4/fs/ext4/namei.c linux-3.9.4-vs2.3.6.2/fs/ext4/ }; const struct inode_operations ext4_special_inode_operations = { -diff -NurpP --minimal linux-3.9.4/fs/ext4/super.c linux-3.9.4-vs2.3.6.2/fs/ext4/super.c +diff -NurpP --minimal linux-3.9.4/fs/ext4/super.c linux-3.9.4-vs2.3.6.3/fs/ext4/super.c --- linux-3.9.4/fs/ext4/super.c 2013-05-31 14:22:27.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/ext4/super.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/ext4/super.c 2013-05-31 14:47:11.000000000 +0000 @@ -1131,7 +1131,7 @@ enum { Opt_inode_readahead_blks, Opt_journal_ioprio, Opt_dioread_nolock, Opt_dioread_lock, @@ -3316,9 +3315,9 @@ diff -NurpP --minimal linux-3.9.4/fs/ext4/super.c linux-3.9.4-vs2.3.6.2/fs/ext4/ sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); -diff -NurpP --minimal linux-3.9.4/fs/fcntl.c linux-3.9.4-vs2.3.6.2/fs/fcntl.c +diff -NurpP --minimal linux-3.9.4/fs/fcntl.c linux-3.9.4-vs2.3.6.3/fs/fcntl.c --- linux-3.9.4/fs/fcntl.c 2013-05-31 13:45:23.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/fcntl.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/fcntl.c 2013-05-31 14:47:11.000000000 +0000 @@ -21,6 +21,7 @@ #include #include @@ -3336,9 +3335,9 @@ diff -NurpP --minimal linux-3.9.4/fs/fcntl.c linux-3.9.4-vs2.3.6.2/fs/fcntl.c if (unlikely(f.file->f_mode & FMODE_PATH)) { if (!check_fcntl_cmd(cmd)) -diff -NurpP --minimal linux-3.9.4/fs/file.c linux-3.9.4-vs2.3.6.2/fs/file.c +diff -NurpP --minimal linux-3.9.4/fs/file.c linux-3.9.4-vs2.3.6.3/fs/file.c --- linux-3.9.4/fs/file.c 2013-05-31 13:45:23.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/file.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/file.c 2013-05-31 14:47:11.000000000 +0000 @@ -22,6 +22,7 @@ #include #include @@ -3393,9 +3392,9 @@ diff -NurpP --minimal linux-3.9.4/fs/file.c linux-3.9.4-vs2.3.6.2/fs/file.c return fd; -diff -NurpP --minimal linux-3.9.4/fs/file_table.c linux-3.9.4-vs2.3.6.2/fs/file_table.c +diff -NurpP --minimal linux-3.9.4/fs/file_table.c linux-3.9.4-vs2.3.6.3/fs/file_table.c --- linux-3.9.4/fs/file_table.c 2013-05-31 13:45:23.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/file_table.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/file_table.c 2013-05-31 14:47:11.000000000 +0000 @@ -26,6 +26,8 @@ #include #include @@ -3432,9 +3431,9 @@ diff -NurpP --minimal linux-3.9.4/fs/file_table.c linux-3.9.4-vs2.3.6.2/fs/file_ file_sb_list_del(file); file_free(file); } -diff -NurpP --minimal linux-3.9.4/fs/fs_struct.c linux-3.9.4-vs2.3.6.2/fs/fs_struct.c +diff -NurpP --minimal linux-3.9.4/fs/fs_struct.c linux-3.9.4-vs2.3.6.3/fs/fs_struct.c --- linux-3.9.4/fs/fs_struct.c 2013-05-31 13:45:23.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/fs_struct.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/fs_struct.c 2013-05-31 14:47:11.000000000 +0000 @@ -4,6 +4,7 @@ #include #include @@ -3459,9 +3458,9 @@ diff -NurpP --minimal linux-3.9.4/fs/fs_struct.c linux-3.9.4-vs2.3.6.2/fs/fs_str } return fs; } -diff -NurpP --minimal linux-3.9.4/fs/gfs2/file.c linux-3.9.4-vs2.3.6.2/fs/gfs2/file.c +diff -NurpP --minimal linux-3.9.4/fs/gfs2/file.c linux-3.9.4-vs2.3.6.3/fs/gfs2/file.c --- linux-3.9.4/fs/gfs2/file.c 2013-05-31 13:45:23.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/gfs2/file.c 2013-05-31 19:54:27.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/gfs2/file.c 2013-05-31 19:54:27.000000000 +0000 @@ -143,6 +143,9 @@ static const u32 fsflags_to_gfs2[32] = { [12] = GFS2_DIF_EXHASH, [14] = GFS2_DIF_INHERIT_JDATA, @@ -3584,9 +3583,9 @@ diff -NurpP --minimal linux-3.9.4/fs/gfs2/file.c linux-3.9.4-vs2.3.6.2/fs/gfs2/f static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { switch(cmd) { -diff -NurpP --minimal linux-3.9.4/fs/gfs2/inode.h linux-3.9.4-vs2.3.6.2/fs/gfs2/inode.h +diff -NurpP --minimal linux-3.9.4/fs/gfs2/inode.h linux-3.9.4-vs2.3.6.3/fs/gfs2/inode.h --- linux-3.9.4/fs/gfs2/inode.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/gfs2/inode.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/gfs2/inode.h 2013-05-31 14:47:11.000000000 +0000 @@ -117,6 +117,7 @@ extern const struct file_operations gfs2 extern const struct file_operations gfs2_dir_fops_nolock; @@ -3595,9 +3594,9 @@ diff -NurpP --minimal linux-3.9.4/fs/gfs2/inode.h linux-3.9.4-vs2.3.6.2/fs/gfs2/ #ifdef CONFIG_GFS2_FS_LOCKING_DLM extern const struct file_operations gfs2_file_fops; -diff -NurpP --minimal linux-3.9.4/fs/hostfs/hostfs.h linux-3.9.4-vs2.3.6.2/fs/hostfs/hostfs.h +diff -NurpP --minimal linux-3.9.4/fs/hostfs/hostfs.h linux-3.9.4-vs2.3.6.3/fs/hostfs/hostfs.h --- linux-3.9.4/fs/hostfs/hostfs.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/hostfs/hostfs.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/hostfs/hostfs.h 2013-05-31 14:47:11.000000000 +0000 @@ -42,6 +42,7 @@ struct hostfs_iattr { unsigned short ia_mode; uid_t ia_uid; @@ -3606,9 +3605,9 @@ diff -NurpP --minimal linux-3.9.4/fs/hostfs/hostfs.h linux-3.9.4-vs2.3.6.2/fs/ho loff_t ia_size; struct timespec ia_atime; struct timespec ia_mtime; -diff -NurpP --minimal linux-3.9.4/fs/inode.c linux-3.9.4-vs2.3.6.2/fs/inode.c +diff -NurpP --minimal linux-3.9.4/fs/inode.c linux-3.9.4-vs2.3.6.3/fs/inode.c --- linux-3.9.4/fs/inode.c 2013-05-31 13:45:24.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/inode.c 2013-06-01 09:01:48.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/inode.c 2013-06-03 18:32:17.000000000 +0000 @@ -17,6 +17,7 @@ #include #include /* for inode_has_buffers */ @@ -3671,9 +3670,9 @@ diff -NurpP --minimal linux-3.9.4/fs/inode.c linux-3.9.4-vs2.3.6.2/fs/inode.c } EXPORT_SYMBOL(inode_init_owner); -diff -NurpP --minimal linux-3.9.4/fs/ioctl.c linux-3.9.4-vs2.3.6.2/fs/ioctl.c +diff -NurpP --minimal linux-3.9.4/fs/ioctl.c linux-3.9.4-vs2.3.6.3/fs/ioctl.c --- linux-3.9.4/fs/ioctl.c 2013-05-31 13:45:24.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/ioctl.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/ioctl.c 2013-05-31 14:47:11.000000000 +0000 @@ -15,6 +15,9 @@ #include #include @@ -3684,9 +3683,9 @@ diff -NurpP --minimal linux-3.9.4/fs/ioctl.c linux-3.9.4-vs2.3.6.2/fs/ioctl.c #include -diff -NurpP --minimal linux-3.9.4/fs/ioprio.c linux-3.9.4-vs2.3.6.2/fs/ioprio.c +diff -NurpP --minimal linux-3.9.4/fs/ioprio.c linux-3.9.4-vs2.3.6.3/fs/ioprio.c --- linux-3.9.4/fs/ioprio.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/ioprio.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/ioprio.c 2013-05-31 14:47:11.000000000 +0000 @@ -28,6 +28,7 @@ #include #include @@ -3713,9 +3712,9 @@ diff -NurpP --minimal linux-3.9.4/fs/ioprio.c linux-3.9.4-vs2.3.6.2/fs/ioprio.c tmpio = get_task_ioprio(p); if (tmpio < 0) continue; -diff -NurpP --minimal linux-3.9.4/fs/jfs/file.c linux-3.9.4-vs2.3.6.2/fs/jfs/file.c +diff -NurpP --minimal linux-3.9.4/fs/jfs/file.c linux-3.9.4-vs2.3.6.3/fs/jfs/file.c --- linux-3.9.4/fs/jfs/file.c 2013-02-19 13:58:48.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/jfs/file.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/jfs/file.c 2013-05-31 14:47:11.000000000 +0000 @@ -109,7 +109,8 @@ int jfs_setattr(struct dentry *dentry, s if (is_quota_modification(inode, iattr)) dquot_initialize(inode); @@ -3734,9 +3733,9 @@ diff -NurpP --minimal linux-3.9.4/fs/jfs/file.c linux-3.9.4-vs2.3.6.2/fs/jfs/fil }; const struct file_operations jfs_file_operations = { -diff -NurpP --minimal linux-3.9.4/fs/jfs/ioctl.c linux-3.9.4-vs2.3.6.2/fs/jfs/ioctl.c +diff -NurpP --minimal linux-3.9.4/fs/jfs/ioctl.c linux-3.9.4-vs2.3.6.3/fs/jfs/ioctl.c --- linux-3.9.4/fs/jfs/ioctl.c 2013-05-31 13:45:24.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/jfs/ioctl.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/jfs/ioctl.c 2013-05-31 14:47:11.000000000 +0000 @@ -12,6 +12,7 @@ #include #include @@ -3794,9 +3793,9 @@ diff -NurpP --minimal linux-3.9.4/fs/jfs/ioctl.c linux-3.9.4-vs2.3.6.2/fs/jfs/io flags |= oldflags & ~JFS_FL_USER_MODIFIABLE; jfs_inode->mode2 = flags; -diff -NurpP --minimal linux-3.9.4/fs/jfs/jfs_dinode.h linux-3.9.4-vs2.3.6.2/fs/jfs/jfs_dinode.h +diff -NurpP --minimal linux-3.9.4/fs/jfs/jfs_dinode.h linux-3.9.4-vs2.3.6.3/fs/jfs/jfs_dinode.h --- linux-3.9.4/fs/jfs/jfs_dinode.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/jfs/jfs_dinode.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/jfs/jfs_dinode.h 2013-05-31 14:47:11.000000000 +0000 @@ -161,9 +161,13 @@ struct dinode { #define JFS_APPEND_FL 0x01000000 /* writes to file may only append */ @@ -3813,9 +3812,9 @@ diff -NurpP --minimal linux-3.9.4/fs/jfs/jfs_dinode.h linux-3.9.4-vs2.3.6.2/fs/j #define JFS_FL_INHERIT 0x03C80000 /* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */ -diff -NurpP --minimal linux-3.9.4/fs/jfs/jfs_filsys.h linux-3.9.4-vs2.3.6.2/fs/jfs/jfs_filsys.h +diff -NurpP --minimal linux-3.9.4/fs/jfs/jfs_filsys.h linux-3.9.4-vs2.3.6.3/fs/jfs/jfs_filsys.h --- linux-3.9.4/fs/jfs/jfs_filsys.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/jfs/jfs_filsys.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/jfs/jfs_filsys.h 2013-05-31 14:47:11.000000000 +0000 @@ -266,6 +266,7 @@ #define JFS_NAME_MAX 255 #define JFS_PATH_MAX BPSIZE @@ -3824,9 +3823,9 @@ diff -NurpP --minimal linux-3.9.4/fs/jfs/jfs_filsys.h linux-3.9.4-vs2.3.6.2/fs/j /* * file system state (superblock state) -diff -NurpP --minimal linux-3.9.4/fs/jfs/jfs_imap.c linux-3.9.4-vs2.3.6.2/fs/jfs/jfs_imap.c +diff -NurpP --minimal linux-3.9.4/fs/jfs/jfs_imap.c linux-3.9.4-vs2.3.6.3/fs/jfs/jfs_imap.c --- linux-3.9.4/fs/jfs/jfs_imap.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/jfs/jfs_imap.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/jfs/jfs_imap.c 2013-06-03 19:53:45.000000000 +0000 @@ -46,6 +46,7 @@ #include #include @@ -3839,22 +3838,21 @@ diff -NurpP --minimal linux-3.9.4/fs/jfs/jfs_imap.c linux-3.9.4-vs2.3.6.2/fs/jfs { struct jfs_inode_info *jfs_ip = JFS_IP(ip); struct jfs_sb_info *sbi = JFS_SBI(ip->i_sb); -+ kuid_t uid; -+ kgid_t gid; ++ kuid_t kuid; ++ kgid_t kgid; jfs_ip->fileset = le32_to_cpu(dip->di_fileset); jfs_ip->mode2 = le32_to_cpu(dip->di_mode); -@@ -3078,14 +3081,19 @@ static int copy_from_dinode(struct dinod +@@ -3078,14 +3081,18 @@ static int copy_from_dinode(struct dinod } set_nlink(ip, le32_to_cpu(dip->di_nlink)); - jfs_ip->saved_uid = make_kuid(&init_user_ns, le32_to_cpu(dip->di_uid)); -+ uid = make_kuid(&init_user_ns, le32_to_cpu(dip->di_uid)); -+ gid = make_kgid(&init_user_ns, le32_to_cpu(dip->di_gid)); -+ ip->i_tag = make_ktag(&init_user_ns, -+ INOTAG_TAG(DX_TAG(ip), uid, gid, 0)); ++ kuid = make_kuid(&init_user_ns, le32_to_cpu(dip->di_uid)); ++ kgid = make_kgid(&init_user_ns, le32_to_cpu(dip->di_gid)); ++ ip->i_tag = INOTAG_KTAG(DX_TAG(ip), kuid, kgid, GLOBAL_ROOT_TAG); + -+ jfs_ip->saved_uid = INOTAG_UID(DX_TAG(ip), uid, gid); ++ jfs_ip->saved_uid = INOTAG_KUID(DX_TAG(ip), kuid, kgid); if (!uid_valid(sbi->uid)) ip->i_uid = jfs_ip->saved_uid; else { @@ -3862,11 +3860,11 @@ diff -NurpP --minimal linux-3.9.4/fs/jfs/jfs_imap.c linux-3.9.4-vs2.3.6.2/fs/jfs } - jfs_ip->saved_gid = make_kgid(&init_user_ns, le32_to_cpu(dip->di_gid)); -+ jfs_ip->saved_gid = INOTAG_GID(DX_TAG(ip), uid, gid); ++ jfs_ip->saved_gid = INOTAG_KGID(DX_TAG(ip), kuid, kgid); if (!gid_valid(sbi->gid)) ip->i_gid = jfs_ip->saved_gid; else { -@@ -3150,16 +3158,14 @@ static void copy_to_dinode(struct dinode +@@ -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); @@ -3881,19 +3879,19 @@ diff -NurpP --minimal linux-3.9.4/fs/jfs/jfs_imap.c linux-3.9.4-vs2.3.6.2/fs/jfs - dip->di_gid = cpu_to_le32(from_kgid(&init_user_ns, - jfs_ip->saved_gid)); + dip->di_uid = cpu_to_le32(from_kuid(&init_user_ns, -+ TAGINO_UID(DX_TAG(ip), ++ TAGINO_KUID(DX_TAG(ip), + !uid_valid(sbi->uid) ? ip->i_uid : jfs_ip->saved_uid, + ip->i_tag))); -+ dip->di_gid = cpu_to_le32(from_kuid(&init_user_ns, -+ TAGINO_GID(DX_TAG(ip), ++ dip->di_gid = cpu_to_le32(from_kgid(&init_user_ns, ++ TAGINO_KGID(DX_TAG(ip), + !gid_valid(sbi->gid) ? ip->i_gid : jfs_ip->saved_gid, + ip->i_tag))); jfs_get_inode_flags(jfs_ip); /* * mode2 is only needed for storing the higher order bits. -diff -NurpP --minimal linux-3.9.4/fs/jfs/jfs_inode.c linux-3.9.4-vs2.3.6.2/fs/jfs/jfs_inode.c +diff -NurpP --minimal linux-3.9.4/fs/jfs/jfs_inode.c linux-3.9.4-vs2.3.6.3/fs/jfs/jfs_inode.c --- linux-3.9.4/fs/jfs/jfs_inode.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/jfs/jfs_inode.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/jfs/jfs_inode.c 2013-05-31 14:47:11.000000000 +0000 @@ -18,6 +18,7 @@ #include @@ -3967,9 +3965,9 @@ diff -NurpP --minimal linux-3.9.4/fs/jfs/jfs_inode.c linux-3.9.4-vs2.3.6.2/fs/jf } /* -diff -NurpP --minimal linux-3.9.4/fs/jfs/jfs_inode.h linux-3.9.4-vs2.3.6.2/fs/jfs/jfs_inode.h +diff -NurpP --minimal linux-3.9.4/fs/jfs/jfs_inode.h linux-3.9.4-vs2.3.6.3/fs/jfs/jfs_inode.h --- linux-3.9.4/fs/jfs/jfs_inode.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/jfs/jfs_inode.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/jfs/jfs_inode.h 2013-05-31 14:47:11.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); @@ -3978,9 +3976,9 @@ diff -NurpP --minimal linux-3.9.4/fs/jfs/jfs_inode.h linux-3.9.4-vs2.3.6.2/fs/jf extern int jfs_get_block(struct inode *, sector_t, struct buffer_head *, int); extern int jfs_setattr(struct dentry *, struct iattr *); -diff -NurpP --minimal linux-3.9.4/fs/jfs/namei.c linux-3.9.4-vs2.3.6.2/fs/jfs/namei.c +diff -NurpP --minimal linux-3.9.4/fs/jfs/namei.c linux-3.9.4-vs2.3.6.3/fs/jfs/namei.c --- linux-3.9.4/fs/jfs/namei.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/jfs/namei.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/jfs/namei.c 2013-05-31 14:47:11.000000000 +0000 @@ -22,6 +22,7 @@ #include #include @@ -4005,9 +4003,9 @@ diff -NurpP --minimal linux-3.9.4/fs/jfs/namei.c linux-3.9.4-vs2.3.6.2/fs/jfs/na }; const struct file_operations jfs_dir_operations = { -diff -NurpP --minimal linux-3.9.4/fs/jfs/super.c linux-3.9.4-vs2.3.6.2/fs/jfs/super.c +diff -NurpP --minimal linux-3.9.4/fs/jfs/super.c linux-3.9.4-vs2.3.6.3/fs/jfs/super.c --- linux-3.9.4/fs/jfs/super.c 2013-05-31 13:45:24.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/jfs/super.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/jfs/super.c 2013-05-31 14:47:11.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, @@ -4074,9 +4072,9 @@ diff -NurpP --minimal linux-3.9.4/fs/jfs/super.c linux-3.9.4-vs2.3.6.2/fs/jfs/su if (newLVSize) { pr_err("resize option for remount only\n"); -diff -NurpP --minimal linux-3.9.4/fs/libfs.c linux-3.9.4-vs2.3.6.2/fs/libfs.c +diff -NurpP --minimal linux-3.9.4/fs/libfs.c linux-3.9.4-vs2.3.6.3/fs/libfs.c --- linux-3.9.4/fs/libfs.c 2013-02-19 13:58:48.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/libfs.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/libfs.c 2013-05-31 14:47:11.000000000 +0000 @@ -135,7 +135,8 @@ static inline unsigned char dt_type(stru * both impossible due to the lock on directory. */ @@ -4122,9 +4120,9 @@ diff -NurpP --minimal linux-3.9.4/fs/libfs.c linux-3.9.4-vs2.3.6.2/fs/libfs.c EXPORT_SYMBOL(generic_read_dir); EXPORT_SYMBOL(mount_pseudo); EXPORT_SYMBOL(simple_write_begin); -diff -NurpP --minimal linux-3.9.4/fs/locks.c linux-3.9.4-vs2.3.6.2/fs/locks.c +diff -NurpP --minimal linux-3.9.4/fs/locks.c linux-3.9.4-vs2.3.6.3/fs/locks.c --- linux-3.9.4/fs/locks.c 2013-05-31 13:45:24.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/locks.c 2013-05-31 15:53:57.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/locks.c 2013-05-31 15:53:57.000000000 +0000 @@ -126,6 +126,8 @@ #include #include @@ -4322,9 +4320,9 @@ diff -NurpP --minimal linux-3.9.4/fs/locks.c linux-3.9.4-vs2.3.6.2/fs/locks.c return 0; } -diff -NurpP --minimal linux-3.9.4/fs/mount.h linux-3.9.4-vs2.3.6.2/fs/mount.h +diff -NurpP --minimal linux-3.9.4/fs/mount.h linux-3.9.4-vs2.3.6.3/fs/mount.h --- linux-3.9.4/fs/mount.h 2013-02-19 13:58:48.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/mount.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/mount.h 2013-05-31 14:47:11.000000000 +0000 @@ -49,6 +49,7 @@ struct mount { int mnt_expiry_mark; /* true if marked for expiry */ int mnt_pinned; @@ -4333,9 +4331,9 @@ diff -NurpP --minimal linux-3.9.4/fs/mount.h linux-3.9.4-vs2.3.6.2/fs/mount.h }; #define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */ -diff -NurpP --minimal linux-3.9.4/fs/namei.c linux-3.9.4-vs2.3.6.2/fs/namei.c +diff -NurpP --minimal linux-3.9.4/fs/namei.c linux-3.9.4-vs2.3.6.3/fs/namei.c --- linux-3.9.4/fs/namei.c 2013-05-31 14:22:27.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/namei.c 2013-06-01 09:00:16.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/namei.c 2013-06-01 09:00:16.000000000 +0000 @@ -34,6 +34,14 @@ #include #include @@ -4894,9 +4892,9 @@ diff -NurpP --minimal linux-3.9.4/fs/namei.c linux-3.9.4-vs2.3.6.2/fs/namei.c EXPORT_SYMBOL(dentry_unhash); EXPORT_SYMBOL(generic_readlink); +EXPORT_SYMBOL(vx_info_mnt_namespace); -diff -NurpP --minimal linux-3.9.4/fs/namespace.c linux-3.9.4-vs2.3.6.2/fs/namespace.c +diff -NurpP --minimal linux-3.9.4/fs/namespace.c linux-3.9.4-vs2.3.6.3/fs/namespace.c --- linux-3.9.4/fs/namespace.c 2013-05-31 14:22:27.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/namespace.c 2013-05-31 18:47:18.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/namespace.c 2013-05-31 18:47:18.000000000 +0000 @@ -22,6 +22,11 @@ #include /* fsnotify_vfsmount_delete */ #include @@ -5039,9 +5037,9 @@ diff -NurpP --minimal linux-3.9.4/fs/namespace.c linux-3.9.4-vs2.3.6.2/fs/namesp free_mnt_ns(ns); } -diff -NurpP --minimal linux-3.9.4/fs/nfs/client.c linux-3.9.4-vs2.3.6.2/fs/nfs/client.c +diff -NurpP --minimal linux-3.9.4/fs/nfs/client.c linux-3.9.4-vs2.3.6.3/fs/nfs/client.c --- linux-3.9.4/fs/nfs/client.c 2013-05-31 13:45:24.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/nfs/client.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/nfs/client.c 2013-05-31 14:47:11.000000000 +0000 @@ -682,6 +682,9 @@ int nfs_init_server_rpcclient(struct nfs if (server->flags & NFS_MOUNT_SOFT) server->client->cl_softrtry = 1; @@ -5063,9 +5061,9 @@ diff -NurpP --minimal linux-3.9.4/fs/nfs/client.c linux-3.9.4-vs2.3.6.2/fs/nfs/c server->maxfilesize = fsinfo->maxfilesize; server->time_delta = fsinfo->time_delta; -diff -NurpP --minimal linux-3.9.4/fs/nfs/dir.c linux-3.9.4-vs2.3.6.2/fs/nfs/dir.c +diff -NurpP --minimal linux-3.9.4/fs/nfs/dir.c linux-3.9.4-vs2.3.6.3/fs/nfs/dir.c --- linux-3.9.4/fs/nfs/dir.c 2013-05-31 13:45:24.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/nfs/dir.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/nfs/dir.c 2013-05-31 14:47:11.000000000 +0000 @@ -36,6 +36,7 @@ #include #include @@ -5082,9 +5080,9 @@ diff -NurpP --minimal linux-3.9.4/fs/nfs/dir.c linux-3.9.4-vs2.3.6.2/fs/nfs/dir. no_entry: res = d_materialise_unique(dentry, inode); if (res != NULL) { -diff -NurpP --minimal linux-3.9.4/fs/nfs/inode.c linux-3.9.4-vs2.3.6.2/fs/nfs/inode.c +diff -NurpP --minimal linux-3.9.4/fs/nfs/inode.c linux-3.9.4-vs2.3.6.3/fs/nfs/inode.c --- linux-3.9.4/fs/nfs/inode.c 2013-05-31 13:45:24.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/nfs/inode.c 2013-05-31 20:37:45.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/nfs/inode.c 2013-06-03 19:32:53.000000000 +0000 @@ -39,6 +39,7 @@ #include #include @@ -5097,8 +5095,8 @@ diff -NurpP --minimal linux-3.9.4/fs/nfs/inode.c linux-3.9.4-vs2.3.6.2/fs/nfs/in 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) */ @@ -5108,8 +5106,8 @@ diff -NurpP --minimal linux-3.9.4/fs/nfs/inode.c linux-3.9.4-vs2.3.6.2/fs/nfs/in clear_nlink(inode); - inode->i_uid = make_kuid(&init_user_ns, -2); - inode->i_gid = make_kgid(&init_user_ns, -2); -+ uid = make_kuid(&init_user_ns, -2); -+ gid = make_kgid(&init_user_ns, -2); ++ kuid = make_kuid(&init_user_ns, -2); ++ kgid = make_kgid(&init_user_ns, -2); inode->i_blocks = 0; memset(nfsi->cookieverf, 0, sizeof(nfsi->cookieverf)); nfsi->write_io = 0; @@ -5118,12 +5116,12 @@ diff -NurpP --minimal linux-3.9.4/fs/nfs/inode.c linux-3.9.4-vs2.3.6.2/fs/nfs/in 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; 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; if (fattr->valid & NFS_ATTR_FATTR_BLOCKS_USED) @@ -5131,9 +5129,9 @@ diff -NurpP --minimal linux-3.9.4/fs/nfs/inode.c linux-3.9.4-vs2.3.6.2/fs/nfs/in */ 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); @@ -5148,28 +5146,24 @@ diff -NurpP --minimal linux-3.9.4/fs/nfs/inode.c linux-3.9.4-vs2.3.6.2/fs/nfs/in NFS_I(inode)->cache_validity |= NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL; spin_unlock(&inode->i_lock); } -@@ -980,6 +990,11 @@ static int nfs_check_inode_attributes(st +@@ -980,7 +990,9 @@ static int nfs_check_inode_attributes(st struct nfs_inode *nfsi = NFS_I(inode); loff_t cur_size, new_isize; unsigned long invalid = 0; +- + kuid_t kuid; + kgid_t kgid; + ktag_t ktag; -+ uid_t uid; -+ gid_t gid; - if (nfs_have_delegated_attributes(inode)) -@@ -1005,13 +1020,21 @@ static int nfs_check_inode_attributes(st + return 0; +@@ -1005,13 +1017,18 @@ static int nfs_check_inode_attributes(st invalid |= NFS_INO_INVALID_ATTR|NFS_INO_REVAL_PAGECACHE; } -+ uid = from_kuid(&init_user_ns, fattr->uid); -+ gid = from_kgid(&init_user_ns, fattr->gid); -+ -+ kuid = make_kuid(&init_user_ns, INOTAG_UID(DX_TAG(inode), uid, gid)); -+ kgid = make_kgid(&init_user_ns, INOTAG_GID(DX_TAG(inode), uid, gid)); -+ ktag = make_ktag(&init_user_ns, INOTAG_TAG(DX_TAG(inode), uid, gid, 0)); ++ kuid = INOTAG_KUID(DX_TAG(inode), fattr->uid, fattr->gid); ++ kgid = INOTAG_KGID(DX_TAG(inode), fattr->uid, fattr->gid); ++ ktag = INOTAG_KTAG(DX_TAG(inode), fattr->uid, fattr->gid, GLOBAL_ROOT_TAG); + /* Have any file permissions changed? */ if ((fattr->valid & NFS_ATTR_FATTR_MODE) && (inode->i_mode & S_IALLUGO) != (fattr->mode & S_IALLUGO)) @@ -5184,40 +5178,40 @@ diff -NurpP --minimal linux-3.9.4/fs/nfs/inode.c linux-3.9.4-vs2.3.6.2/fs/nfs/in /* Has the link count changed? */ if ((fattr->valid & NFS_ATTR_FATTR_NLINK) && inode->i_nlink != fattr->nlink) -@@ -1317,6 +1340,9 @@ static int nfs_update_inode(struct inode +@@ -1317,6 +1334,9 @@ static int nfs_update_inode(struct inode unsigned long invalid = 0; unsigned long now = jiffies; unsigned long save_cache_validity; -+ uid_t uid; -+ gid_t gid; -+ tag_t tag; ++ kuid_t kuid; ++ kgid_t kgid; ++ ktag_t ktag; dfprintk(VFS, "NFS: %s(%s/%ld fh_crc=0x%08x ct=%d info=0x%x)\n", __func__, inode->i_sb->s_id, inode->i_ino, -@@ -1418,6 +1444,9 @@ static int nfs_update_inode(struct inode +@@ -1418,6 +1438,9 @@ static int nfs_update_inode(struct inode | NFS_INO_REVAL_PAGECACHE | NFS_INO_REVAL_FORCED); -+ uid = TAGINO_UID(DX_TAG(inode), inode->i_uid, inode->i_tag); -+ gid = TAGINO_GID(DX_TAG(inode), inode->i_gid, inode->i_tag); -+ tag = inode->i_tag; ++ kuid = TAGINO_KUID(DX_TAG(inode), inode->i_uid, inode->i_tag); ++ kgid = TAGINO_KGID(DX_TAG(inode), inode->i_gid, inode->i_tag); ++ ktag = TAGINO_KTAG(DX_TAG(inode), inode->i_tag); if (fattr->valid & NFS_ATTR_FATTR_ATIME) memcpy(&inode->i_atime, &fattr->atime, sizeof(inode->i_atime)); -@@ -1460,6 +1489,10 @@ static int nfs_update_inode(struct inode +@@ -1460,6 +1483,10 @@ static int nfs_update_inode(struct inode | NFS_INO_INVALID_ACL | NFS_INO_REVAL_FORCED); -+ inode->i_uid = INOTAG_UID(DX_TAG(inode), uid, gid); -+ inode->i_gid = INOTAG_GID(DX_TAG(inode), uid, gid); -+ inode->i_tag = INOTAG_TAG(DX_TAG(inode), uid, gid, tag); ++ inode->i_uid = INOTAG_KUID(DX_TAG(inode), kuid, kgid); ++ inode->i_gid = INOTAG_KGID(DX_TAG(inode), kuid, kgid); ++ inode->i_tag = INOTAG_KTAG(DX_TAG(inode), kuid, kgid, ktag); + if (fattr->valid & NFS_ATTR_FATTR_NLINK) { if (inode->i_nlink != fattr->nlink) { invalid |= NFS_INO_INVALID_ATTR; -diff -NurpP --minimal linux-3.9.4/fs/nfs/nfs3xdr.c linux-3.9.4-vs2.3.6.2/fs/nfs/nfs3xdr.c +diff -NurpP --minimal linux-3.9.4/fs/nfs/nfs3xdr.c linux-3.9.4-vs2.3.6.3/fs/nfs/nfs3xdr.c --- linux-3.9.4/fs/nfs/nfs3xdr.c 2013-05-31 13:45:24.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/nfs/nfs3xdr.c 2013-05-31 15:33:48.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/nfs/nfs3xdr.c 2013-06-03 19:33:10.000000000 +0000 @@ -20,6 +20,7 @@ #include #include @@ -5245,8 +5239,8 @@ diff -NurpP --minimal linux-3.9.4/fs/nfs/nfs3xdr.c linux-3.9.4-vs2.3.6.2/fs/nfs/ + (tag && (attr->ia_valid & ATTR_TAG))) { *p++ = xdr_one; - *p++ = cpu_to_be32(from_kuid(&init_user_ns, attr->ia_uid)); -+ *p++ = cpu_to_be32(TAGINO_UID(tag, -+ from_kuid(&init_user_ns, attr->ia_uid), attr->ia_tag)); ++ *p++ = cpu_to_be32(from_kuid(&init_user_ns, ++ TAGINO_KUID(tag, attr->ia_uid, attr->ia_tag))); } else *p++ = xdr_zero; @@ -5255,8 +5249,8 @@ diff -NurpP --minimal linux-3.9.4/fs/nfs/nfs3xdr.c linux-3.9.4-vs2.3.6.2/fs/nfs/ + (tag && (attr->ia_valid & ATTR_TAG))) { *p++ = xdr_one; - *p++ = cpu_to_be32(from_kgid(&init_user_ns, attr->ia_gid)); -+ *p++ = cpu_to_be32(TAGINO_GID(tag, -+ from_kgid(&init_user_ns, attr->ia_gid), attr->ia_tag)); ++ *p++ = cpu_to_be32(from_kgid(&init_user_ns, ++ TAGINO_KGID(tag, attr->ia_gid, attr->ia_tag))); } else *p++ = xdr_zero; @@ -5363,9 +5357,9 @@ diff -NurpP --minimal linux-3.9.4/fs/nfs/nfs3xdr.c linux-3.9.4-vs2.3.6.2/fs/nfs/ } /* -diff -NurpP --minimal linux-3.9.4/fs/nfs/super.c linux-3.9.4-vs2.3.6.2/fs/nfs/super.c +diff -NurpP --minimal linux-3.9.4/fs/nfs/super.c linux-3.9.4-vs2.3.6.3/fs/nfs/super.c --- linux-3.9.4/fs/nfs/super.c 2013-05-31 13:45:24.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/nfs/super.c 2013-05-31 15:41:34.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/nfs/super.c 2013-05-31 15:41:34.000000000 +0000 @@ -55,6 +55,7 @@ #include #include @@ -5439,9 +5433,9 @@ diff -NurpP --minimal linux-3.9.4/fs/nfs/super.c linux-3.9.4-vs2.3.6.2/fs/nfs/su /* * options that take text values -diff -NurpP --minimal linux-3.9.4/fs/nfsd/auth.c linux-3.9.4-vs2.3.6.2/fs/nfsd/auth.c +diff -NurpP --minimal linux-3.9.4/fs/nfsd/auth.c linux-3.9.4-vs2.3.6.3/fs/nfsd/auth.c --- linux-3.9.4/fs/nfsd/auth.c 2013-05-31 13:45:24.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/nfsd/auth.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/nfsd/auth.c 2013-05-31 14:47:11.000000000 +0000 @@ -2,6 +2,7 @@ #include @@ -5460,9 +5454,9 @@ diff -NurpP --minimal linux-3.9.4/fs/nfsd/auth.c linux-3.9.4-vs2.3.6.2/fs/nfsd/a rqgi = rqstp->rq_cred.cr_group_info; -diff -NurpP --minimal linux-3.9.4/fs/nfsd/nfs3xdr.c linux-3.9.4-vs2.3.6.2/fs/nfsd/nfs3xdr.c +diff -NurpP --minimal linux-3.9.4/fs/nfsd/nfs3xdr.c linux-3.9.4-vs2.3.6.3/fs/nfsd/nfs3xdr.c --- linux-3.9.4/fs/nfsd/nfs3xdr.c 2013-05-31 13:45:24.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/nfsd/nfs3xdr.c 2013-05-31 16:17:38.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/nfsd/nfs3xdr.c 2013-06-03 19:57:43.000000000 +0000 @@ -8,6 +8,7 @@ #include @@ -5475,8 +5469,8 @@ diff -NurpP --minimal linux-3.9.4/fs/nfsd/nfs3xdr.c linux-3.9.4-vs2.3.6.2/fs/nfs decode_sattr3(__be32 *p, struct iattr *iap) { u32 tmp; -+ uid_t uid = 0; -+ gid_t gid = 0; ++ kuid_t kuid = GLOBAL_ROOT_UID; ++ kgid_t kgid = GLOBAL_ROOT_GID; iap->ia_valid = 0; @@ -5485,19 +5479,19 @@ diff -NurpP --minimal linux-3.9.4/fs/nfsd/nfs3xdr.c linux-3.9.4-vs2.3.6.2/fs/nfs } if (*p++) { - iap->ia_uid = make_kuid(&init_user_ns, ntohl(*p++)); -+ uid = make_kuid(&init_user_ns, ntohl(*p++)); ++ kuid = make_kuid(&init_user_ns, ntohl(*p++)); if (uid_valid(iap->ia_uid)) iap->ia_valid |= ATTR_UID; } if (*p++) { - iap->ia_gid = make_kgid(&init_user_ns, ntohl(*p++)); -+ gid = make_kgid(&init_user_ns, ntohl(*p++)); ++ kgid = make_kgid(&init_user_ns, ntohl(*p++)); if (gid_valid(iap->ia_gid)) iap->ia_valid |= ATTR_GID; } -+ iap->ia_uid = INOTAG_UID(DX_TAG_NFSD, uid, gid); -+ iap->ia_gid = INOTAG_GID(DX_TAG_NFSD, uid, gid); -+ iap->ia_tag = INOTAG_TAG(DX_TAG_NFSD, uid, gid, 0); ++ iap->ia_uid = INOTAG_KUID(DX_TAG_NFSD, kuid, kgid); ++ iap->ia_gid = INOTAG_KGID(DX_TAG_NFSD, kuid, kgid); ++ iap->ia_tag = INOTAG_KTAG(DX_TAG_NFSD, kuid, kgid, GLOBAL_ROOT_TAG); if (*p++) { u64 newsize; @@ -5508,17 +5502,17 @@ diff -NurpP --minimal linux-3.9.4/fs/nfsd/nfs3xdr.c linux-3.9.4-vs2.3.6.2/fs/nfs - *p++ = htonl((u32) from_kuid(&init_user_ns, stat->uid)); - *p++ = htonl((u32) from_kgid(&init_user_ns, stat->gid)); + *p++ = htonl((u32) from_kuid(&init_user_ns, -+ TAGINO_UID(0 /* FIXME: DX_TAG(dentry->d_inode) */, ++ TAGINO_KUID(0 /* FIXME: DX_TAG(dentry->d_inode) */, + stat->uid, stat->tag))); + *p++ = htonl((u32) from_kgid(&init_user_ns, -+ TAGINO_GID(0 /* FIXME: DX_TAG(dentry->d_inode) */, ++ TAGINO_KGID(0 /* FIXME: DX_TAG(dentry->d_inode) */, + stat->gid, stat->tag))); if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) { p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN); } else { -diff -NurpP --minimal linux-3.9.4/fs/nfsd/nfs4xdr.c linux-3.9.4-vs2.3.6.2/fs/nfsd/nfs4xdr.c +diff -NurpP --minimal linux-3.9.4/fs/nfsd/nfs4xdr.c linux-3.9.4-vs2.3.6.3/fs/nfsd/nfs4xdr.c --- linux-3.9.4/fs/nfsd/nfs4xdr.c 2013-05-31 14:22:27.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/nfsd/nfs4xdr.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/nfsd/nfs4xdr.c 2013-06-03 19:33:44.000000000 +0000 @@ -46,6 +46,7 @@ #include #include @@ -5533,7 +5527,7 @@ diff -NurpP --minimal linux-3.9.4/fs/nfsd/nfs4xdr.c linux-3.9.4-vs2.3.6.2/fs/nfs 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; @@ -5543,14 +5537,14 @@ diff -NurpP --minimal linux-3.9.4/fs/nfsd/nfs4xdr.c linux-3.9.4-vs2.3.6.2/fs/nfs 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.9.4/fs/nfsd/nfsxdr.c linux-3.9.4-vs2.3.6.2/fs/nfsd/nfsxdr.c +diff -NurpP --minimal linux-3.9.4/fs/nfsd/nfsxdr.c linux-3.9.4-vs2.3.6.3/fs/nfsd/nfsxdr.c --- linux-3.9.4/fs/nfsd/nfsxdr.c 2013-05-31 13:45:24.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/nfsd/nfsxdr.c 2013-05-31 16:20:53.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/nfsd/nfsxdr.c 2013-06-03 19:56:35.000000000 +0000 @@ -7,6 +7,7 @@ #include "vfs.h" #include "xdr.h" @@ -5563,8 +5557,8 @@ diff -NurpP --minimal linux-3.9.4/fs/nfsd/nfsxdr.c linux-3.9.4-vs2.3.6.2/fs/nfsd decode_sattr(__be32 *p, struct iattr *iap) { u32 tmp, tmp1; -+ uid_t uid = 0; -+ gid_t gid = 0; ++ kuid_t kuid = GLOBAL_ROOT_UID; ++ kgid_t kgid = GLOBAL_ROOT_GID; iap->ia_valid = 0; @@ -5573,19 +5567,19 @@ diff -NurpP --minimal linux-3.9.4/fs/nfsd/nfsxdr.c linux-3.9.4-vs2.3.6.2/fs/nfsd } if ((tmp = ntohl(*p++)) != (u32)-1) { - iap->ia_uid = make_kuid(&init_user_ns, tmp); -+ uid = make_kuid(&init_user_ns, tmp); ++ kuid = make_kuid(&init_user_ns, tmp); if (uid_valid(iap->ia_uid)) iap->ia_valid |= ATTR_UID; } if ((tmp = ntohl(*p++)) != (u32)-1) { - iap->ia_gid = make_kgid(&init_user_ns, tmp); -+ gid = make_kgid(&init_user_ns, tmp); ++ kgid = make_kgid(&init_user_ns, tmp); if (gid_valid(iap->ia_gid)) iap->ia_valid |= ATTR_GID; } -+ iap->ia_uid = INOTAG_UID(DX_TAG_NFSD, uid, gid); -+ iap->ia_gid = INOTAG_GID(DX_TAG_NFSD, uid, gid); -+ iap->ia_tag = INOTAG_TAG(DX_TAG_NFSD, uid, gid, 0); ++ iap->ia_uid = INOTAG_KUID(DX_TAG_NFSD, kuid, kgid); ++ iap->ia_gid = INOTAG_KGID(DX_TAG_NFSD, kuid, kgid); ++ iap->ia_tag = INOTAG_KTAG(DX_TAG_NFSD, kuid, kgid, GLOBAL_ROOT_TAG); if ((tmp = ntohl(*p++)) != (u32)-1) { iap->ia_valid |= ATTR_SIZE; iap->ia_size = tmp; @@ -5596,20 +5590,20 @@ diff -NurpP --minimal linux-3.9.4/fs/nfsd/nfsxdr.c linux-3.9.4-vs2.3.6.2/fs/nfsd - *p++ = htonl((u32) from_kuid(&init_user_ns, stat->uid)); - *p++ = htonl((u32) from_kgid(&init_user_ns, stat->gid)); + *p++ = htonl((u32) from_kuid(&init_user_ns, -+ TAGINO_UID(DX_TAG(dentry->d_inode), stat->uid, stat->tag))); ++ TAGINO_KUID(DX_TAG(dentry->d_inode), stat->uid, stat->tag))); + *p++ = htonl((u32) from_kgid(&init_user_ns, -+ TAGINO_GID(DX_TAG(dentry->d_inode), stat->gid, stat->tag))); ++ TAGINO_KGID(DX_TAG(dentry->d_inode), stat->gid, stat->tag))); if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) { *p++ = htonl(NFS_MAXPATHLEN); -diff -NurpP --minimal linux-3.9.4/fs/ocfs2/dlmglue.c linux-3.9.4-vs2.3.6.2/fs/ocfs2/dlmglue.c +diff -NurpP --minimal linux-3.9.4/fs/ocfs2/dlmglue.c linux-3.9.4-vs2.3.6.3/fs/ocfs2/dlmglue.c --- linux-3.9.4/fs/ocfs2/dlmglue.c 2013-05-31 13:45:24.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/ocfs2/dlmglue.c 2013-05-31 15:47:29.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/ocfs2/dlmglue.c 2013-06-03 19:59:20.000000000 +0000 @@ -2047,6 +2047,7 @@ static void __ocfs2_stuff_meta_lvb(struc lvb->lvb_iclusters = cpu_to_be32(oi->ip_clusters); lvb->lvb_iuid = cpu_to_be32(i_uid_read(inode)); lvb->lvb_igid = cpu_to_be32(i_gid_read(inode)); -+ lvb->lvb_itag = cpu_to_be16(inode->i_tag); ++ lvb->lvb_itag = cpu_to_be16(i_tag_read(inode)); lvb->lvb_imode = cpu_to_be16(inode->i_mode); lvb->lvb_inlink = cpu_to_be16(inode->i_nlink); lvb->lvb_iatime_packed = @@ -5621,9 +5615,9 @@ diff -NurpP --minimal linux-3.9.4/fs/ocfs2/dlmglue.c linux-3.9.4-vs2.3.6.2/fs/oc inode->i_mode = be16_to_cpu(lvb->lvb_imode); set_nlink(inode, be16_to_cpu(lvb->lvb_inlink)); ocfs2_unpack_timespec(&inode->i_atime, -diff -NurpP --minimal linux-3.9.4/fs/ocfs2/dlmglue.h linux-3.9.4-vs2.3.6.2/fs/ocfs2/dlmglue.h +diff -NurpP --minimal linux-3.9.4/fs/ocfs2/dlmglue.h linux-3.9.4-vs2.3.6.3/fs/ocfs2/dlmglue.h --- linux-3.9.4/fs/ocfs2/dlmglue.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/ocfs2/dlmglue.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/ocfs2/dlmglue.h 2013-05-31 14:47:11.000000000 +0000 @@ -46,7 +46,8 @@ struct ocfs2_meta_lvb { __be16 lvb_inlink; __be32 lvb_iattr; @@ -5634,9 +5628,9 @@ diff -NurpP --minimal linux-3.9.4/fs/ocfs2/dlmglue.h linux-3.9.4-vs2.3.6.2/fs/oc }; #define OCFS2_QINFO_LVB_VERSION 1 -diff -NurpP --minimal linux-3.9.4/fs/ocfs2/file.c linux-3.9.4-vs2.3.6.2/fs/ocfs2/file.c +diff -NurpP --minimal linux-3.9.4/fs/ocfs2/file.c linux-3.9.4-vs2.3.6.3/fs/ocfs2/file.c --- linux-3.9.4/fs/ocfs2/file.c 2013-05-31 13:45:24.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/ocfs2/file.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/ocfs2/file.c 2013-05-31 14:47:11.000000000 +0000 @@ -1124,7 +1124,7 @@ int ocfs2_setattr(struct dentry *dentry, attr->ia_valid &= ~ATTR_SIZE; @@ -5646,9 +5640,9 @@ diff -NurpP --minimal linux-3.9.4/fs/ocfs2/file.c linux-3.9.4-vs2.3.6.2/fs/ocfs2 if (!(attr->ia_valid & OCFS2_VALID_ATTRS)) return 0; -diff -NurpP --minimal linux-3.9.4/fs/ocfs2/inode.c linux-3.9.4-vs2.3.6.2/fs/ocfs2/inode.c +diff -NurpP --minimal linux-3.9.4/fs/ocfs2/inode.c linux-3.9.4-vs2.3.6.3/fs/ocfs2/inode.c --- linux-3.9.4/fs/ocfs2/inode.c 2013-05-31 13:45:24.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/ocfs2/inode.c 2013-05-31 20:39:47.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/ocfs2/inode.c 2013-05-31 20:39:47.000000000 +0000 @@ -28,6 +28,7 @@ #include #include @@ -5745,9 +5739,9 @@ diff -NurpP --minimal linux-3.9.4/fs/ocfs2/inode.c linux-3.9.4-vs2.3.6.2/fs/ocfs /* Fast symlinks will have i_size but no allocated clusters. */ if (S_ISLNK(inode->i_mode) && !fe->i_clusters) { -diff -NurpP --minimal linux-3.9.4/fs/ocfs2/inode.h linux-3.9.4-vs2.3.6.2/fs/ocfs2/inode.h +diff -NurpP --minimal linux-3.9.4/fs/ocfs2/inode.h linux-3.9.4-vs2.3.6.3/fs/ocfs2/inode.h --- linux-3.9.4/fs/ocfs2/inode.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/ocfs2/inode.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/ocfs2/inode.h 2013-05-31 14:47:11.000000000 +0000 @@ -154,6 +154,7 @@ struct buffer_head *ocfs2_bread(struct i void ocfs2_set_inode_flags(struct inode *inode); @@ -5756,9 +5750,9 @@ diff -NurpP --minimal linux-3.9.4/fs/ocfs2/inode.h linux-3.9.4-vs2.3.6.2/fs/ocfs static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode) { -diff -NurpP --minimal linux-3.9.4/fs/ocfs2/ioctl.c linux-3.9.4-vs2.3.6.2/fs/ocfs2/ioctl.c +diff -NurpP --minimal linux-3.9.4/fs/ocfs2/ioctl.c linux-3.9.4-vs2.3.6.3/fs/ocfs2/ioctl.c --- linux-3.9.4/fs/ocfs2/ioctl.c 2013-05-31 13:45:24.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/ocfs2/ioctl.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/ocfs2/ioctl.c 2013-05-31 14:47:11.000000000 +0000 @@ -76,7 +76,41 @@ static int ocfs2_get_inode_attr(struct i return status; } @@ -5822,9 +5816,9 @@ diff -NurpP --minimal linux-3.9.4/fs/ocfs2/ioctl.c linux-3.9.4-vs2.3.6.2/fs/ocfs long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { struct inode *inode = file_inode(filp); -diff -NurpP --minimal linux-3.9.4/fs/ocfs2/namei.c linux-3.9.4-vs2.3.6.2/fs/ocfs2/namei.c +diff -NurpP --minimal linux-3.9.4/fs/ocfs2/namei.c linux-3.9.4-vs2.3.6.3/fs/ocfs2/namei.c --- linux-3.9.4/fs/ocfs2/namei.c 2013-05-31 13:45:24.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/ocfs2/namei.c 2013-05-31 15:52:25.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/ocfs2/namei.c 2013-06-03 20:00:35.000000000 +0000 @@ -41,6 +41,7 @@ #include #include @@ -5837,27 +5831,29 @@ diff -NurpP --minimal linux-3.9.4/fs/ocfs2/namei.c linux-3.9.4-vs2.3.6.2/fs/ocfs struct ocfs2_dinode *fe = NULL; struct ocfs2_extent_list *fel; u16 feat; -+ tag_t tag; ++ ktag_t ktag; *new_fe_bh = NULL; -@@ -512,8 +514,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(i_uid_read(inode)); - fe->i_gid = cpu_to_le32(i_gid_read(inode)); + -+ tag = dx_current_fstag(osb->sb); -+ fe->i_uid = cpu_to_le32(TAGINO_UID(DX_TAG(inode), i_uid_read(inode), tag)); -+ fe->i_gid = cpu_to_le32(TAGINO_GID(DX_TAG(inode), i_gid_read(inode), tag)); -+ inode->i_tag = tag; /* is this correct? */ ++ ktag = make_ktag(&init_user_ns, dx_current_fstag(osb->sb)); ++ fe->i_uid = cpu_to_le32(from_kuid(&init_user_ns, ++ TAGINO_KUID(DX_TAG(inode), inode->i_uid, ktag))); ++ fe->i_gid = cpu_to_le32(from_kgid(&init_user_ns, ++ TAGINO_KGID(DX_TAG(inode), inode->i_gid, ktag))); ++ inode->i_tag = ktag; /* is this correct? */ fe->i_mode = cpu_to_le16(inode->i_mode); if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode)) fe->id1.dev1.i_rdev = cpu_to_le64(huge_encode_dev(dev)); -diff -NurpP --minimal linux-3.9.4/fs/ocfs2/ocfs2.h linux-3.9.4-vs2.3.6.2/fs/ocfs2/ocfs2.h +diff -NurpP --minimal linux-3.9.4/fs/ocfs2/ocfs2.h linux-3.9.4-vs2.3.6.3/fs/ocfs2/ocfs2.h --- linux-3.9.4/fs/ocfs2/ocfs2.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/ocfs2/ocfs2.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/ocfs2/ocfs2.h 2013-05-31 14:47:11.000000000 +0000 @@ -272,6 +272,7 @@ enum ocfs2_mount_options writes */ OCFS2_MOUNT_HB_NONE = 1 << 13, /* No heartbeat */ @@ -5866,9 +5862,9 @@ diff -NurpP --minimal linux-3.9.4/fs/ocfs2/ocfs2.h linux-3.9.4-vs2.3.6.2/fs/ocfs }; #define OCFS2_OSB_SOFT_RO 0x0001 -diff -NurpP --minimal linux-3.9.4/fs/ocfs2/ocfs2_fs.h linux-3.9.4-vs2.3.6.2/fs/ocfs2/ocfs2_fs.h +diff -NurpP --minimal linux-3.9.4/fs/ocfs2/ocfs2_fs.h linux-3.9.4-vs2.3.6.3/fs/ocfs2/ocfs2_fs.h --- linux-3.9.4/fs/ocfs2/ocfs2_fs.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/ocfs2/ocfs2_fs.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/ocfs2/ocfs2_fs.h 2013-05-31 14:47:11.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 */ @@ -5881,9 +5877,9 @@ diff -NurpP --minimal linux-3.9.4/fs/ocfs2/ocfs2_fs.h linux-3.9.4-vs2.3.6.2/fs/o #define OCFS2_FL_VISIBLE FS_FL_USER_VISIBLE /* User visible flags */ #define OCFS2_FL_MODIFIABLE FS_FL_USER_MODIFIABLE /* User modifiable flags */ -diff -NurpP --minimal linux-3.9.4/fs/ocfs2/super.c linux-3.9.4-vs2.3.6.2/fs/ocfs2/super.c +diff -NurpP --minimal linux-3.9.4/fs/ocfs2/super.c linux-3.9.4-vs2.3.6.3/fs/ocfs2/super.c --- linux-3.9.4/fs/ocfs2/super.c 2013-05-31 13:45:25.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/ocfs2/super.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/ocfs2/super.c 2013-05-31 14:47:11.000000000 +0000 @@ -185,6 +185,7 @@ enum { Opt_coherency_full, Opt_resv_level, @@ -5947,9 +5943,9 @@ diff -NurpP --minimal linux-3.9.4/fs/ocfs2/super.c linux-3.9.4-vs2.3.6.2/fs/ocfs default: mlog(ML_ERROR, "Unrecognized mount option \"%s\" " -diff -NurpP --minimal linux-3.9.4/fs/open.c linux-3.9.4-vs2.3.6.2/fs/open.c +diff -NurpP --minimal linux-3.9.4/fs/open.c linux-3.9.4-vs2.3.6.3/fs/open.c --- linux-3.9.4/fs/open.c 2013-05-31 13:45:25.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/open.c 2013-06-01 08:41:29.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/open.c 2013-06-01 08:41:29.000000000 +0000 @@ -31,6 +31,11 @@ #include #include @@ -6025,9 +6021,9 @@ diff -NurpP --minimal linux-3.9.4/fs/open.c linux-3.9.4-vs2.3.6.2/fs/open.c error = chown_common(&path, user, group); mnt_drop_write(path.mnt); out_release: -diff -NurpP --minimal linux-3.9.4/fs/proc/array.c linux-3.9.4-vs2.3.6.2/fs/proc/array.c +diff -NurpP --minimal linux-3.9.4/fs/proc/array.c linux-3.9.4-vs2.3.6.3/fs/proc/array.c --- linux-3.9.4/fs/proc/array.c 2013-05-31 13:45:25.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/proc/array.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/proc/array.c 2013-05-31 14:47:11.000000000 +0000 @@ -82,6 +82,8 @@ #include #include @@ -6141,9 +6137,9 @@ diff -NurpP --minimal linux-3.9.4/fs/proc/array.c linux-3.9.4-vs2.3.6.2/fs/proc/ seq_printf(m, "%d (%s) %c", pid_nr_ns(pid, ns), tcomm, state); seq_put_decimal_ll(m, ' ', ppid); seq_put_decimal_ll(m, ' ', pgid); -diff -NurpP --minimal linux-3.9.4/fs/proc/base.c linux-3.9.4-vs2.3.6.2/fs/proc/base.c +diff -NurpP --minimal linux-3.9.4/fs/proc/base.c linux-3.9.4-vs2.3.6.3/fs/proc/base.c --- linux-3.9.4/fs/proc/base.c 2013-05-31 13:45:25.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/proc/base.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/proc/base.c 2013-05-31 14:47:11.000000000 +0000 @@ -86,6 +86,8 @@ #include #include @@ -6286,9 +6282,9 @@ diff -NurpP --minimal linux-3.9.4/fs/proc/base.c linux-3.9.4-vs2.3.6.2/fs/proc/b ns = dentry->d_sb->s_fs_info; rcu_read_lock(); -diff -NurpP --minimal linux-3.9.4/fs/proc/generic.c linux-3.9.4-vs2.3.6.2/fs/proc/generic.c +diff -NurpP --minimal linux-3.9.4/fs/proc/generic.c linux-3.9.4-vs2.3.6.3/fs/proc/generic.c --- linux-3.9.4/fs/proc/generic.c 2013-05-31 13:45:25.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/proc/generic.c 2013-05-31 16:13:42.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/proc/generic.c 2013-05-31 16:13:42.000000000 +0000 @@ -23,6 +23,7 @@ #include #include @@ -6350,9 +6346,9 @@ diff -NurpP --minimal linux-3.9.4/fs/proc/generic.c linux-3.9.4-vs2.3.6.2/fs/pro } else { kfree(ent); ent = NULL; -diff -NurpP --minimal linux-3.9.4/fs/proc/inode.c linux-3.9.4-vs2.3.6.2/fs/proc/inode.c +diff -NurpP --minimal linux-3.9.4/fs/proc/inode.c linux-3.9.4-vs2.3.6.3/fs/proc/inode.c --- linux-3.9.4/fs/proc/inode.c 2013-05-31 13:45:25.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/proc/inode.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/proc/inode.c 2013-05-31 14:47:11.000000000 +0000 @@ -458,6 +458,8 @@ struct inode *proc_get_inode(struct supe inode->i_uid = de->uid; inode->i_gid = de->gid; @@ -6362,9 +6358,9 @@ diff -NurpP --minimal linux-3.9.4/fs/proc/inode.c linux-3.9.4-vs2.3.6.2/fs/proc/ if (de->size) inode->i_size = de->size; if (de->nlink) -diff -NurpP --minimal linux-3.9.4/fs/proc/internal.h linux-3.9.4-vs2.3.6.2/fs/proc/internal.h +diff -NurpP --minimal linux-3.9.4/fs/proc/internal.h linux-3.9.4-vs2.3.6.3/fs/proc/internal.h --- linux-3.9.4/fs/proc/internal.h 2013-05-31 13:45:25.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/proc/internal.h 2013-05-31 16:04:34.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/proc/internal.h 2013-05-31 16:04:34.000000000 +0000 @@ -12,6 +12,8 @@ #include #include @@ -6402,9 +6398,9 @@ diff -NurpP --minimal linux-3.9.4/fs/proc/internal.h linux-3.9.4-vs2.3.6.2/fs/pr static inline int proc_fd(struct inode *inode) { return PROC_I(inode)->fd; -diff -NurpP --minimal linux-3.9.4/fs/proc/loadavg.c linux-3.9.4-vs2.3.6.2/fs/proc/loadavg.c +diff -NurpP --minimal linux-3.9.4/fs/proc/loadavg.c linux-3.9.4-vs2.3.6.3/fs/proc/loadavg.c --- linux-3.9.4/fs/proc/loadavg.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/proc/loadavg.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/proc/loadavg.c 2013-05-31 14:47:11.000000000 +0000 @@ -12,15 +12,27 @@ static int loadavg_proc_show(struct seq_file *m, void *v) @@ -6434,9 +6430,9 @@ diff -NurpP --minimal linux-3.9.4/fs/proc/loadavg.c linux-3.9.4-vs2.3.6.2/fs/pro task_active_pid_ns(current)->last_pid); return 0; } -diff -NurpP --minimal linux-3.9.4/fs/proc/meminfo.c linux-3.9.4-vs2.3.6.2/fs/proc/meminfo.c +diff -NurpP --minimal linux-3.9.4/fs/proc/meminfo.c linux-3.9.4-vs2.3.6.3/fs/proc/meminfo.c --- linux-3.9.4/fs/proc/meminfo.c 2013-05-31 13:45:25.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/proc/meminfo.c 2013-05-31 16:05:39.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/proc/meminfo.c 2013-05-31 16:05:39.000000000 +0000 @@ -39,7 +39,8 @@ static int meminfo_proc_show(struct seq_ allowed = ((totalram_pages - hugetlb_total_pages()) * sysctl_overcommit_ratio / 100) + total_swap_pages; @@ -6447,9 +6443,9 @@ diff -NurpP --minimal linux-3.9.4/fs/proc/meminfo.c linux-3.9.4-vs2.3.6.2/fs/pro total_swapcache_pages() - i.bufferram; if (cached < 0) cached = 0; -diff -NurpP --minimal linux-3.9.4/fs/proc/root.c linux-3.9.4-vs2.3.6.2/fs/proc/root.c +diff -NurpP --minimal linux-3.9.4/fs/proc/root.c linux-3.9.4-vs2.3.6.3/fs/proc/root.c --- linux-3.9.4/fs/proc/root.c 2013-05-31 13:45:25.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/proc/root.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/proc/root.c 2013-05-31 14:47:11.000000000 +0000 @@ -20,9 +20,14 @@ #include #include @@ -6481,9 +6477,9 @@ diff -NurpP --minimal linux-3.9.4/fs/proc/root.c linux-3.9.4-vs2.3.6.2/fs/proc/r .name = "/proc", }; -diff -NurpP --minimal linux-3.9.4/fs/proc/self.c linux-3.9.4-vs2.3.6.2/fs/proc/self.c +diff -NurpP --minimal linux-3.9.4/fs/proc/self.c linux-3.9.4-vs2.3.6.3/fs/proc/self.c --- linux-3.9.4/fs/proc/self.c 2013-02-19 13:58:49.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/proc/self.c 2013-05-31 20:57:54.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/proc/self.c 2013-05-31 20:57:54.000000000 +0000 @@ -1,6 +1,7 @@ #include #include @@ -6498,9 +6494,9 @@ diff -NurpP --minimal linux-3.9.4/fs/proc/self.c linux-3.9.4-vs2.3.6.2/fs/proc/s proc_self_symlink->proc_iops = &proc_self_inode_operations; + proc_self_symlink->vx_flags = IATTR_PROC_SYMLINK; } -diff -NurpP --minimal linux-3.9.4/fs/proc/stat.c linux-3.9.4-vs2.3.6.2/fs/proc/stat.c +diff -NurpP --minimal linux-3.9.4/fs/proc/stat.c linux-3.9.4-vs2.3.6.3/fs/proc/stat.c --- linux-3.9.4/fs/proc/stat.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/proc/stat.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/proc/stat.c 2013-05-31 14:47:11.000000000 +0000 @@ -9,8 +9,10 @@ #include #include @@ -6549,9 +6545,9 @@ diff -NurpP --minimal linux-3.9.4/fs/proc/stat.c linux-3.9.4-vs2.3.6.2/fs/proc/s /* Copy values here to work around gcc-2.95.3, gcc-2.96 */ user = kcpustat_cpu(i).cpustat[CPUTIME_USER]; nice = kcpustat_cpu(i).cpustat[CPUTIME_NICE]; -diff -NurpP --minimal linux-3.9.4/fs/proc/uptime.c linux-3.9.4-vs2.3.6.2/fs/proc/uptime.c +diff -NurpP --minimal linux-3.9.4/fs/proc/uptime.c linux-3.9.4-vs2.3.6.3/fs/proc/uptime.c --- linux-3.9.4/fs/proc/uptime.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/proc/uptime.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/proc/uptime.c 2013-05-31 14:47:11.000000000 +0000 @@ -5,6 +5,7 @@ #include #include @@ -6571,9 +6567,9 @@ diff -NurpP --minimal linux-3.9.4/fs/proc/uptime.c linux-3.9.4-vs2.3.6.2/fs/proc seq_printf(m, "%lu.%02lu %lu.%02lu\n", (unsigned long) uptime.tv_sec, (uptime.tv_nsec / (NSEC_PER_SEC / 100)), -diff -NurpP --minimal linux-3.9.4/fs/proc_namespace.c linux-3.9.4-vs2.3.6.2/fs/proc_namespace.c +diff -NurpP --minimal linux-3.9.4/fs/proc_namespace.c linux-3.9.4-vs2.3.6.3/fs/proc_namespace.c --- linux-3.9.4/fs/proc_namespace.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/proc_namespace.c 2013-05-31 17:17:53.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/proc_namespace.c 2013-05-31 17:17:53.000000000 +0000 @@ -44,6 +44,8 @@ static int show_sb_opts(struct seq_file { MS_SYNCHRONOUS, ",sync" }, { MS_DIRSYNC, ",dirsync" }, @@ -6689,9 +6685,9 @@ diff -NurpP --minimal linux-3.9.4/fs/proc_namespace.c linux-3.9.4-vs2.3.6.2/fs/p /* file system type */ seq_puts(m, "with fstype "); show_type(m, sb); -diff -NurpP --minimal linux-3.9.4/fs/quota/dquot.c linux-3.9.4-vs2.3.6.2/fs/quota/dquot.c +diff -NurpP --minimal linux-3.9.4/fs/quota/dquot.c linux-3.9.4-vs2.3.6.3/fs/quota/dquot.c --- linux-3.9.4/fs/quota/dquot.c 2013-05-31 13:45:25.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/quota/dquot.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/quota/dquot.c 2013-05-31 14:47:11.000000000 +0000 @@ -1585,6 +1585,9 @@ int __dquot_alloc_space(struct inode *in struct dquot **dquots = inode->i_dquot; int reserve = flags & DQUOT_SPACE_RESERVE; @@ -6730,9 +6726,9 @@ diff -NurpP --minimal linux-3.9.4/fs/quota/dquot.c linux-3.9.4-vs2.3.6.2/fs/quot /* First test before acquiring mutex - solves deadlocks when we * re-enter the quota code and are already holding the mutex */ if (!dquot_active(inode)) -diff -NurpP --minimal linux-3.9.4/fs/quota/quota.c linux-3.9.4-vs2.3.6.2/fs/quota/quota.c +diff -NurpP --minimal linux-3.9.4/fs/quota/quota.c linux-3.9.4-vs2.3.6.3/fs/quota/quota.c --- linux-3.9.4/fs/quota/quota.c 2013-02-19 13:58:49.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/quota/quota.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/quota/quota.c 2013-05-31 14:47:11.000000000 +0000 @@ -8,6 +8,7 @@ #include #include @@ -6820,9 +6816,9 @@ diff -NurpP --minimal linux-3.9.4/fs/quota/quota.c linux-3.9.4-vs2.3.6.2/fs/quot if (quotactl_cmd_write(cmd)) sb = get_super_thawed(bdev); else -diff -NurpP --minimal linux-3.9.4/fs/stat.c linux-3.9.4-vs2.3.6.2/fs/stat.c +diff -NurpP --minimal linux-3.9.4/fs/stat.c linux-3.9.4-vs2.3.6.3/fs/stat.c --- linux-3.9.4/fs/stat.c 2013-05-31 13:45:25.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/stat.c 2013-06-01 08:53:01.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/stat.c 2013-06-01 08:53:01.000000000 +0000 @@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod stat->nlink = inode->i_nlink; stat->uid = inode->i_uid; @@ -6831,9 +6827,9 @@ diff -NurpP --minimal linux-3.9.4/fs/stat.c linux-3.9.4-vs2.3.6.2/fs/stat.c stat->rdev = inode->i_rdev; stat->size = i_size_read(inode); stat->atime = inode->i_atime; -diff -NurpP --minimal linux-3.9.4/fs/statfs.c linux-3.9.4-vs2.3.6.2/fs/statfs.c +diff -NurpP --minimal linux-3.9.4/fs/statfs.c linux-3.9.4-vs2.3.6.3/fs/statfs.c --- linux-3.9.4/fs/statfs.c 2013-02-19 13:58:49.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/statfs.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/statfs.c 2013-05-31 14:47:11.000000000 +0000 @@ -7,6 +7,8 @@ #include #include @@ -6852,9 +6848,9 @@ diff -NurpP --minimal linux-3.9.4/fs/statfs.c linux-3.9.4-vs2.3.6.2/fs/statfs.c return retval; } -diff -NurpP --minimal linux-3.9.4/fs/super.c linux-3.9.4-vs2.3.6.2/fs/super.c +diff -NurpP --minimal linux-3.9.4/fs/super.c linux-3.9.4-vs2.3.6.3/fs/super.c --- linux-3.9.4/fs/super.c 2013-05-31 13:45:25.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/super.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/super.c 2013-05-31 14:47:11.000000000 +0000 @@ -34,6 +34,8 @@ #include #include @@ -6878,9 +6874,9 @@ diff -NurpP --minimal linux-3.9.4/fs/super.c linux-3.9.4-vs2.3.6.2/fs/super.c error = security_sb_kern_mount(sb, flags, secdata); if (error) goto out_sb; -diff -NurpP --minimal linux-3.9.4/fs/sysfs/mount.c linux-3.9.4-vs2.3.6.2/fs/sysfs/mount.c +diff -NurpP --minimal linux-3.9.4/fs/sysfs/mount.c linux-3.9.4-vs2.3.6.3/fs/sysfs/mount.c --- linux-3.9.4/fs/sysfs/mount.c 2013-05-31 13:45:25.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/sysfs/mount.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/sysfs/mount.c 2013-05-31 14:47:11.000000000 +0000 @@ -48,7 +48,7 @@ static int sysfs_fill_super(struct super sb->s_blocksize = PAGE_CACHE_SIZE; @@ -6890,9 +6886,9 @@ diff -NurpP --minimal linux-3.9.4/fs/sysfs/mount.c linux-3.9.4-vs2.3.6.2/fs/sysf sb->s_op = &sysfs_ops; sb->s_time_gran = 1; -diff -NurpP --minimal linux-3.9.4/fs/utimes.c linux-3.9.4-vs2.3.6.2/fs/utimes.c +diff -NurpP --minimal linux-3.9.4/fs/utimes.c linux-3.9.4-vs2.3.6.3/fs/utimes.c --- linux-3.9.4/fs/utimes.c 2013-02-19 13:58:49.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/utimes.c 2013-05-31 22:40:16.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/utimes.c 2013-05-31 22:40:16.000000000 +0000 @@ -8,6 +8,8 @@ #include #include @@ -6922,9 +6918,9 @@ diff -NurpP --minimal linux-3.9.4/fs/utimes.c linux-3.9.4-vs2.3.6.2/fs/utimes.c if (times && times[0].tv_nsec == UTIME_NOW && times[1].tv_nsec == UTIME_NOW) times = NULL; -diff -NurpP --minimal linux-3.9.4/fs/xattr.c linux-3.9.4-vs2.3.6.2/fs/xattr.c +diff -NurpP --minimal linux-3.9.4/fs/xattr.c linux-3.9.4-vs2.3.6.3/fs/xattr.c --- linux-3.9.4/fs/xattr.c 2013-02-19 13:58:49.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/xattr.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/xattr.c 2013-05-31 14:47:11.000000000 +0000 @@ -21,6 +21,7 @@ #include #include @@ -6942,9 +6938,9 @@ diff -NurpP --minimal linux-3.9.4/fs/xattr.c linux-3.9.4-vs2.3.6.2/fs/xattr.c return (mask & MAY_WRITE) ? -EPERM : -ENODATA; return 0; } -diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_dinode.h linux-3.9.4-vs2.3.6.2/fs/xfs/xfs_dinode.h +diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_dinode.h linux-3.9.4-vs2.3.6.3/fs/xfs/xfs_dinode.h --- linux-3.9.4/fs/xfs/xfs_dinode.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/xfs/xfs_dinode.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/xfs/xfs_dinode.h 2013-05-31 14:47:11.000000000 +0000 @@ -51,7 +51,9 @@ typedef struct xfs_dinode { __be32 di_nlink; /* number of links to file */ __be16 di_projid_lo; /* lower part of owner's project id */ @@ -6985,9 +6981,9 @@ diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_dinode.h linux-3.9.4-vs2.3.6.2/fs/x +#define XFS_DIVFLAG_COW 0x02 #endif /* __XFS_DINODE_H__ */ -diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_fs.h linux-3.9.4-vs2.3.6.2/fs/xfs/xfs_fs.h +diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_fs.h linux-3.9.4-vs2.3.6.3/fs/xfs/xfs_fs.h --- linux-3.9.4/fs/xfs/xfs_fs.h 2013-02-19 13:58:49.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/xfs/xfs_fs.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/xfs/xfs_fs.h 2013-05-31 14:47:11.000000000 +0000 @@ -67,6 +67,9 @@ struct fsxattr { #define XFS_XFLAG_EXTSZINHERIT 0x00001000 /* inherit inode extent size */ #define XFS_XFLAG_NODEFRAG 0x00002000 /* do not defragment */ @@ -7008,9 +7004,9 @@ diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_fs.h linux-3.9.4-vs2.3.6.2/fs/xfs/x __u32 bs_dmevmask; /* DMIG event mask */ __u16 bs_dmstate; /* DMIG state info */ __u16 bs_aextents; /* attribute number of extents */ -diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_ialloc.c linux-3.9.4-vs2.3.6.2/fs/xfs/xfs_ialloc.c +diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_ialloc.c linux-3.9.4-vs2.3.6.3/fs/xfs/xfs_ialloc.c --- linux-3.9.4/fs/xfs/xfs_ialloc.c 2013-05-31 13:45:25.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/xfs/xfs_ialloc.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/xfs/xfs_ialloc.c 2013-05-31 14:47:11.000000000 +0000 @@ -37,7 +37,6 @@ #include "xfs_error.h" #include "xfs_bmap.h" @@ -7019,9 +7015,9 @@ diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_ialloc.c linux-3.9.4-vs2.3.6.2/fs/x /* * Allocation group level functions. */ -diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_inode.c linux-3.9.4-vs2.3.6.2/fs/xfs/xfs_inode.c +diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_inode.c linux-3.9.4-vs2.3.6.3/fs/xfs/xfs_inode.c --- linux-3.9.4/fs/xfs/xfs_inode.c 2013-05-31 13:45:25.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/xfs/xfs_inode.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/xfs/xfs_inode.c 2013-06-03 19:35:13.000000000 +0000 @@ -16,6 +16,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -7196,9 +7192,9 @@ diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_inode.c linux-3.9.4-vs2.3.6.2/fs/xf /* Wrap, we never let the log put out DI_MAX_FLUSH */ if (ip->i_d.di_flushiter == DI_MAX_FLUSH) -diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_inode.h linux-3.9.4-vs2.3.6.2/fs/xfs/xfs_inode.h +diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_inode.h linux-3.9.4-vs2.3.6.3/fs/xfs/xfs_inode.h --- linux-3.9.4/fs/xfs/xfs_inode.h 2013-05-31 13:45:25.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/xfs/xfs_inode.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/xfs/xfs_inode.h 2013-05-31 14:47:11.000000000 +0000 @@ -134,7 +134,9 @@ typedef struct xfs_icdinode { __uint32_t di_nlink; /* number of links to file */ __uint16_t di_projid_lo; /* lower part of owner's project id */ @@ -7219,9 +7215,9 @@ diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_inode.h linux-3.9.4-vs2.3.6.2/fs/xf void xfs_idestroy_fork(struct xfs_inode *, int); void xfs_idata_realloc(struct xfs_inode *, int, int); void xfs_iroot_realloc(struct xfs_inode *, int, int); -diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_ioctl.c linux-3.9.4-vs2.3.6.2/fs/xfs/xfs_ioctl.c +diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_ioctl.c linux-3.9.4-vs2.3.6.3/fs/xfs/xfs_ioctl.c --- linux-3.9.4/fs/xfs/xfs_ioctl.c 2013-05-31 13:45:25.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/xfs/xfs_ioctl.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/xfs/xfs_ioctl.c 2013-05-31 14:47:11.000000000 +0000 @@ -26,7 +26,7 @@ #include "xfs_bmap_btree.h" #include "xfs_dinode.h" @@ -7290,9 +7286,9 @@ diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_ioctl.c linux-3.9.4-vs2.3.6.2/fs/xf return xfs_ioc_setxflags(ip, filp, arg); case XFS_IOC_FSSETDM: { -diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_ioctl.h linux-3.9.4-vs2.3.6.2/fs/xfs/xfs_ioctl.h +diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_ioctl.h linux-3.9.4-vs2.3.6.3/fs/xfs/xfs_ioctl.h --- linux-3.9.4/fs/xfs/xfs_ioctl.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/xfs/xfs_ioctl.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/xfs/xfs_ioctl.h 2013-05-31 14:47:11.000000000 +0000 @@ -70,6 +70,12 @@ xfs_handle_to_dentry( void __user *uhandle, u32 hlen); @@ -7306,9 +7302,9 @@ diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_ioctl.h linux-3.9.4-vs2.3.6.2/fs/xf extern long xfs_file_ioctl( struct file *filp, -diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_iops.c linux-3.9.4-vs2.3.6.2/fs/xfs/xfs_iops.c +diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_iops.c linux-3.9.4-vs2.3.6.3/fs/xfs/xfs_iops.c --- linux-3.9.4/fs/xfs/xfs_iops.c 2013-02-19 13:58:49.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/xfs/xfs_iops.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/xfs/xfs_iops.c 2013-05-31 14:47:11.000000000 +0000 @@ -28,6 +28,7 @@ #include "xfs_bmap_btree.h" #include "xfs_dinode.h" @@ -7384,9 +7380,9 @@ diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_iops.c linux-3.9.4-vs2.3.6.2/fs/xfs switch (inode->i_mode & S_IFMT) { case S_IFBLK: -diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_itable.c linux-3.9.4-vs2.3.6.2/fs/xfs/xfs_itable.c +diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_itable.c linux-3.9.4-vs2.3.6.3/fs/xfs/xfs_itable.c --- linux-3.9.4/fs/xfs/xfs_itable.c 2013-02-19 13:58:49.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/xfs/xfs_itable.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/xfs/xfs_itable.c 2013-05-31 14:47:11.000000000 +0000 @@ -97,6 +97,7 @@ xfs_bulkstat_one_int( buf->bs_mode = dic->di_mode; buf->bs_uid = dic->di_uid; @@ -7395,9 +7391,9 @@ diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_itable.c linux-3.9.4-vs2.3.6.2/fs/x buf->bs_size = dic->di_size; buf->bs_atime.tv_sec = dic->di_atime.t_sec; buf->bs_atime.tv_nsec = dic->di_atime.t_nsec; -diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_linux.h linux-3.9.4-vs2.3.6.2/fs/xfs/xfs_linux.h +diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_linux.h linux-3.9.4-vs2.3.6.3/fs/xfs/xfs_linux.h --- linux-3.9.4/fs/xfs/xfs_linux.h 2013-02-19 13:58:49.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/xfs/xfs_linux.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/xfs/xfs_linux.h 2013-05-31 14:47:11.000000000 +0000 @@ -123,6 +123,7 @@ #define current_cpu() (raw_smp_processor_id()) @@ -7406,9 +7402,9 @@ diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_linux.h linux-3.9.4-vs2.3.6.2/fs/xf #define current_test_flags(f) (current->flags & (f)) #define current_set_flags_nested(sp, f) \ (*(sp) = current->flags, current->flags |= (f)) -diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_log_recover.c linux-3.9.4-vs2.3.6.2/fs/xfs/xfs_log_recover.c +diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_log_recover.c linux-3.9.4-vs2.3.6.3/fs/xfs/xfs_log_recover.c --- linux-3.9.4/fs/xfs/xfs_log_recover.c 2013-05-31 13:45:25.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/xfs/xfs_log_recover.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/xfs/xfs_log_recover.c 2013-05-31 14:47:11.000000000 +0000 @@ -2361,7 +2361,8 @@ xlog_recover_inode_pass2( } @@ -7419,9 +7415,9 @@ diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_log_recover.c linux-3.9.4-vs2.3.6.2 /* the rest is in on-disk format */ if (item->ri_buf[1].i_len > sizeof(struct xfs_icdinode)) { -diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_mount.h linux-3.9.4-vs2.3.6.2/fs/xfs/xfs_mount.h +diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_mount.h linux-3.9.4-vs2.3.6.3/fs/xfs/xfs_mount.h --- linux-3.9.4/fs/xfs/xfs_mount.h 2013-05-31 13:45:25.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/xfs/xfs_mount.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/xfs/xfs_mount.h 2013-05-31 14:47:11.000000000 +0000 @@ -254,6 +254,7 @@ typedef struct xfs_mount { allocator */ #define XFS_MOUNT_NOATTR2 (1ULL << 25) /* disable use of attr2 format */ @@ -7430,9 +7426,9 @@ diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_mount.h linux-3.9.4-vs2.3.6.2/fs/xf /* * Default minimum read and write sizes. -diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_super.c linux-3.9.4-vs2.3.6.2/fs/xfs/xfs_super.c +diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_super.c linux-3.9.4-vs2.3.6.3/fs/xfs/xfs_super.c --- linux-3.9.4/fs/xfs/xfs_super.c 2013-05-31 13:45:25.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/xfs/xfs_super.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/xfs/xfs_super.c 2013-05-31 14:47:11.000000000 +0000 @@ -114,6 +114,9 @@ mempool_t *xfs_ioend_pool; #define MNTOPT_NODELAYLOG "nodelaylog" /* Delayed logging disabled */ #define MNTOPT_DISCARD "discard" /* Discard unused blocks */ @@ -7509,9 +7505,9 @@ diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_super.c linux-3.9.4-vs2.3.6.2/fs/xf /* * we must configure the block size in the superblock before we run the * full mount process as the mount process can lookup and cache inodes. -diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_vnodeops.c linux-3.9.4-vs2.3.6.2/fs/xfs/xfs_vnodeops.c +diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_vnodeops.c linux-3.9.4-vs2.3.6.3/fs/xfs/xfs_vnodeops.c --- linux-3.9.4/fs/xfs/xfs_vnodeops.c 2013-05-31 13:45:25.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/fs/xfs/xfs_vnodeops.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/fs/xfs/xfs_vnodeops.c 2013-05-31 14:47:11.000000000 +0000 @@ -104,6 +104,77 @@ xfs_readlink_bmap( return error; } @@ -7590,9 +7586,9 @@ diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_vnodeops.c linux-3.9.4-vs2.3.6.2/fs int xfs_readlink( xfs_inode_t *ip, -diff -NurpP --minimal linux-3.9.4/include/linux/cred.h linux-3.9.4-vs2.3.6.2/include/linux/cred.h +diff -NurpP --minimal linux-3.9.4/include/linux/cred.h linux-3.9.4-vs2.3.6.3/include/linux/cred.h --- linux-3.9.4/include/linux/cred.h 2013-02-19 13:58:50.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/cred.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/cred.h 2013-05-31 14:47:11.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 *); @@ -7633,18 +7629,18 @@ diff -NurpP --minimal linux-3.9.4/include/linux/cred.h linux-3.9.4-vs2.3.6.2/inc /** * get_new_cred - Get a reference on a new set of credentials * @cred: The new credentials to reference -diff -NurpP --minimal linux-3.9.4/include/linux/devpts_fs.h linux-3.9.4-vs2.3.6.2/include/linux/devpts_fs.h +diff -NurpP --minimal linux-3.9.4/include/linux/devpts_fs.h linux-3.9.4-vs2.3.6.3/include/linux/devpts_fs.h --- linux-3.9.4/include/linux/devpts_fs.h 2013-02-19 13:58:50.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/devpts_fs.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/devpts_fs.h 2013-05-31 14:47:11.000000000 +0000 @@ -45,5 +45,4 @@ static inline void devpts_pty_kill(struc #endif - #endif /* _LINUX_DEVPTS_FS_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/fs.h linux-3.9.4-vs2.3.6.2/include/linux/fs.h +diff -NurpP --minimal linux-3.9.4/include/linux/fs.h linux-3.9.4-vs2.3.6.3/include/linux/fs.h --- linux-3.9.4/include/linux/fs.h 2013-05-31 13:45:27.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/fs.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/fs.h 2013-05-31 14:47:11.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) */ @@ -7810,9 +7806,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/fs.h linux-3.9.4-vs2.3.6.2/inclu extern int simple_setattr(struct dentry *, struct iattr *); extern int simple_getattr(struct vfsmount *, struct dentry *, struct kstat *); extern int simple_statfs(struct dentry *, struct kstatfs *); -diff -NurpP --minimal linux-3.9.4/include/linux/init_task.h linux-3.9.4-vs2.3.6.2/include/linux/init_task.h +diff -NurpP --minimal linux-3.9.4/include/linux/init_task.h linux-3.9.4-vs2.3.6.3/include/linux/init_task.h --- linux-3.9.4/include/linux/init_task.h 2013-05-31 13:45:27.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/init_task.h 2013-05-31 14:53:41.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/init_task.h 2013-05-31 14:53:41.000000000 +0000 @@ -222,6 +222,10 @@ extern struct task_group root_task_group INIT_TASK_RCU_PREEMPT(tsk) \ INIT_CPUSET_SEQ \ @@ -7824,9 +7820,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/init_task.h linux-3.9.4-vs2.3.6. } -diff -NurpP --minimal linux-3.9.4/include/linux/ipc.h linux-3.9.4-vs2.3.6.2/include/linux/ipc.h +diff -NurpP --minimal linux-3.9.4/include/linux/ipc.h linux-3.9.4-vs2.3.6.3/include/linux/ipc.h --- linux-3.9.4/include/linux/ipc.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/ipc.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/ipc.h 2013-05-31 14:47:11.000000000 +0000 @@ -16,6 +16,7 @@ struct kern_ipc_perm key_t key; kuid_t uid; @@ -7835,9 +7831,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/ipc.h linux-3.9.4-vs2.3.6.2/incl kuid_t cuid; kgid_t cgid; umode_t mode; -diff -NurpP --minimal linux-3.9.4/include/linux/loop.h linux-3.9.4-vs2.3.6.2/include/linux/loop.h +diff -NurpP --minimal linux-3.9.4/include/linux/loop.h linux-3.9.4-vs2.3.6.3/include/linux/loop.h --- linux-3.9.4/include/linux/loop.h 2013-02-19 13:58:51.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/loop.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/loop.h 2013-05-31 14:47:11.000000000 +0000 @@ -41,6 +41,7 @@ struct loop_device { struct loop_func_table *lo_encryption; __u32 lo_init[2]; @@ -7846,9 +7842,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/loop.h linux-3.9.4-vs2.3.6.2/inc int (*ioctl)(struct loop_device *, int cmd, unsigned long arg); -diff -NurpP --minimal linux-3.9.4/include/linux/memcontrol.h linux-3.9.4-vs2.3.6.2/include/linux/memcontrol.h +diff -NurpP --minimal linux-3.9.4/include/linux/memcontrol.h linux-3.9.4-vs2.3.6.3/include/linux/memcontrol.h --- linux-3.9.4/include/linux/memcontrol.h 2013-05-31 13:45:28.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/memcontrol.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/memcontrol.h 2013-05-31 14:47:11.000000000 +0000 @@ -86,6 +86,13 @@ extern struct mem_cgroup *try_get_mem_cg extern struct mem_cgroup *parent_mem_cgroup(struct mem_cgroup *memcg); extern struct mem_cgroup *mem_cgroup_from_cont(struct cgroup *cont); @@ -7863,9 +7859,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/memcontrol.h linux-3.9.4-vs2.3.6 static inline bool mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *memcg) { -diff -NurpP --minimal linux-3.9.4/include/linux/mm_types.h linux-3.9.4-vs2.3.6.2/include/linux/mm_types.h +diff -NurpP --minimal linux-3.9.4/include/linux/mm_types.h linux-3.9.4-vs2.3.6.3/include/linux/mm_types.h --- linux-3.9.4/include/linux/mm_types.h 2013-05-31 13:45:28.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/mm_types.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/mm_types.h 2013-05-31 14:47:11.000000000 +0000 @@ -380,6 +380,7 @@ struct mm_struct { /* Architecture-specific MM context */ @@ -7874,9 +7870,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/mm_types.h linux-3.9.4-vs2.3.6.2 unsigned long flags; /* Must use atomic bitops to access the bits */ -diff -NurpP --minimal linux-3.9.4/include/linux/mount.h linux-3.9.4-vs2.3.6.2/include/linux/mount.h +diff -NurpP --minimal linux-3.9.4/include/linux/mount.h linux-3.9.4-vs2.3.6.3/include/linux/mount.h --- linux-3.9.4/include/linux/mount.h 2013-05-31 13:45:28.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/mount.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/mount.h 2013-05-31 14:47:11.000000000 +0000 @@ -49,6 +49,9 @@ struct mnt_namespace; #define MNT_LOCK_READONLY 0x400000 @@ -7887,9 +7883,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/mount.h linux-3.9.4-vs2.3.6.2/in struct vfsmount { struct dentry *mnt_root; /* root of the mounted tree */ struct super_block *mnt_sb; /* pointer to superblock */ -diff -NurpP --minimal linux-3.9.4/include/linux/net.h linux-3.9.4-vs2.3.6.2/include/linux/net.h +diff -NurpP --minimal linux-3.9.4/include/linux/net.h linux-3.9.4-vs2.3.6.3/include/linux/net.h --- linux-3.9.4/include/linux/net.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/net.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/net.h 2013-05-31 14:47:11.000000000 +0000 @@ -38,6 +38,7 @@ struct net; #define SOCK_PASSCRED 3 #define SOCK_PASSSEC 4 @@ -7898,9 +7894,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/net.h linux-3.9.4-vs2.3.6.2/incl #ifndef ARCH_HAS_SOCKET_TYPES /** -diff -NurpP --minimal linux-3.9.4/include/linux/netdevice.h linux-3.9.4-vs2.3.6.2/include/linux/netdevice.h +diff -NurpP --minimal linux-3.9.4/include/linux/netdevice.h linux-3.9.4-vs2.3.6.3/include/linux/netdevice.h --- linux-3.9.4/include/linux/netdevice.h 2013-05-31 13:45:28.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/netdevice.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/netdevice.h 2013-05-31 14:47:11.000000000 +0000 @@ -1688,6 +1688,7 @@ extern void netdev_resync_ops(struct ne extern struct net_device *dev_get_by_index(struct net *net, int ifindex); @@ -7909,9 +7905,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/netdevice.h linux-3.9.4-vs2.3.6. extern struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex); extern int dev_restart(struct net_device *dev); #ifdef CONFIG_NETPOLL_TRAP -diff -NurpP --minimal linux-3.9.4/include/linux/nsproxy.h linux-3.9.4-vs2.3.6.2/include/linux/nsproxy.h +diff -NurpP --minimal linux-3.9.4/include/linux/nsproxy.h linux-3.9.4-vs2.3.6.3/include/linux/nsproxy.h --- linux-3.9.4/include/linux/nsproxy.h 2013-02-19 13:58:51.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/nsproxy.h 2013-05-31 17:17:53.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/nsproxy.h 2013-05-31 17:17:53.000000000 +0000 @@ -3,6 +3,7 @@ #include @@ -7961,9 +7957,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/nsproxy.h linux-3.9.4-vs2.3.6.2/ } #endif -diff -NurpP --minimal linux-3.9.4/include/linux/pid.h linux-3.9.4-vs2.3.6.2/include/linux/pid.h +diff -NurpP --minimal linux-3.9.4/include/linux/pid.h linux-3.9.4-vs2.3.6.3/include/linux/pid.h --- linux-3.9.4/include/linux/pid.h 2013-05-31 13:45:28.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/pid.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/pid.h 2013-05-31 14:47:11.000000000 +0000 @@ -8,7 +8,8 @@ enum pid_type PIDTYPE_PID, PIDTYPE_PGID, @@ -7982,9 +7978,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/pid.h linux-3.9.4-vs2.3.6.2/incl pid_t pid_vnr(struct pid *pid); #define do_each_pid_task(pid, type, task) \ -diff -NurpP --minimal linux-3.9.4/include/linux/proc_fs.h linux-3.9.4-vs2.3.6.2/include/linux/proc_fs.h +diff -NurpP --minimal linux-3.9.4/include/linux/proc_fs.h linux-3.9.4-vs2.3.6.3/include/linux/proc_fs.h --- linux-3.9.4/include/linux/proc_fs.h 2013-05-31 13:45:28.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/proc_fs.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/proc_fs.h 2013-05-31 14:47:11.000000000 +0000 @@ -58,6 +58,7 @@ struct proc_dir_entry { nlink_t nlink; kuid_t uid; @@ -8020,9 +8016,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/proc_fs.h linux-3.9.4-vs2.3.6.2/ int fd; union proc_op op; struct proc_dir_entry *pde; -diff -NurpP --minimal linux-3.9.4/include/linux/quotaops.h linux-3.9.4-vs2.3.6.2/include/linux/quotaops.h +diff -NurpP --minimal linux-3.9.4/include/linux/quotaops.h linux-3.9.4-vs2.3.6.3/include/linux/quotaops.h --- linux-3.9.4/include/linux/quotaops.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/quotaops.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/quotaops.h 2013-05-31 14:47:11.000000000 +0000 @@ -8,6 +8,7 @@ #define _LINUX_QUOTAOPS_ @@ -8064,9 +8060,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/quotaops.h linux-3.9.4-vs2.3.6.2 } static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number) -diff -NurpP --minimal linux-3.9.4/include/linux/sched.h linux-3.9.4-vs2.3.6.2/include/linux/sched.h +diff -NurpP --minimal linux-3.9.4/include/linux/sched.h linux-3.9.4-vs2.3.6.3/include/linux/sched.h --- linux-3.9.4/include/linux/sched.h 2013-05-31 14:22:27.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/sched.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/sched.h 2013-06-03 17:32:54.000000000 +0000 @@ -1398,6 +1398,14 @@ struct task_struct { #endif struct seccomp seccomp; @@ -8113,9 +8109,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/sched.h linux-3.9.4-vs2.3.6.2/in } -diff -NurpP --minimal linux-3.9.4/include/linux/shmem_fs.h linux-3.9.4-vs2.3.6.2/include/linux/shmem_fs.h +diff -NurpP --minimal linux-3.9.4/include/linux/shmem_fs.h linux-3.9.4-vs2.3.6.3/include/linux/shmem_fs.h --- linux-3.9.4/include/linux/shmem_fs.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/shmem_fs.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/shmem_fs.h 2013-05-31 14:47:11.000000000 +0000 @@ -9,6 +9,9 @@ /* inode in-kernel data */ @@ -8126,9 +8122,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/shmem_fs.h linux-3.9.4-vs2.3.6.2 struct shmem_inode_info { spinlock_t lock; unsigned long flags; -diff -NurpP --minimal linux-3.9.4/include/linux/stat.h linux-3.9.4-vs2.3.6.2/include/linux/stat.h +diff -NurpP --minimal linux-3.9.4/include/linux/stat.h linux-3.9.4-vs2.3.6.3/include/linux/stat.h --- linux-3.9.4/include/linux/stat.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/stat.h 2013-06-01 08:53:13.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/stat.h 2013-06-01 08:53:13.000000000 +0000 @@ -25,6 +25,7 @@ struct kstat { unsigned int nlink; kuid_t uid; @@ -8137,9 +8133,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/stat.h linux-3.9.4-vs2.3.6.2/inc dev_t rdev; loff_t size; struct timespec atime; -diff -NurpP --minimal linux-3.9.4/include/linux/sunrpc/auth.h linux-3.9.4-vs2.3.6.2/include/linux/sunrpc/auth.h +diff -NurpP --minimal linux-3.9.4/include/linux/sunrpc/auth.h linux-3.9.4-vs2.3.6.3/include/linux/sunrpc/auth.h --- linux-3.9.4/include/linux/sunrpc/auth.h 2013-05-31 13:45:28.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/sunrpc/auth.h 2013-05-31 14:52:57.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/sunrpc/auth.h 2013-05-31 14:52:57.000000000 +0000 @@ -26,6 +26,7 @@ struct auth_cred { kuid_t uid; @@ -8148,9 +8144,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/sunrpc/auth.h linux-3.9.4-vs2.3. struct group_info *group_info; const char *principal; unsigned char machine_cred : 1; -diff -NurpP --minimal linux-3.9.4/include/linux/sunrpc/clnt.h linux-3.9.4-vs2.3.6.2/include/linux/sunrpc/clnt.h +diff -NurpP --minimal linux-3.9.4/include/linux/sunrpc/clnt.h linux-3.9.4-vs2.3.6.3/include/linux/sunrpc/clnt.h --- linux-3.9.4/include/linux/sunrpc/clnt.h 2013-05-31 13:45:28.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/sunrpc/clnt.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/sunrpc/clnt.h 2013-05-31 14:47:11.000000000 +0000 @@ -49,7 +49,8 @@ struct rpc_clnt { unsigned int cl_softrtry : 1,/* soft timeouts */ cl_discrtry : 1,/* disconnect before retry */ @@ -8161,9 +8157,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/sunrpc/clnt.h linux-3.9.4-vs2.3. struct rpc_rtt * cl_rtt; /* RTO estimator data */ const struct rpc_timeout *cl_timeout; /* Timeout strategy */ -diff -NurpP --minimal linux-3.9.4/include/linux/sysfs.h linux-3.9.4-vs2.3.6.2/include/linux/sysfs.h +diff -NurpP --minimal linux-3.9.4/include/linux/sysfs.h linux-3.9.4-vs2.3.6.3/include/linux/sysfs.h --- linux-3.9.4/include/linux/sysfs.h 2013-05-31 13:45:28.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/sysfs.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/sysfs.h 2013-05-31 14:47:11.000000000 +0000 @@ -19,6 +19,8 @@ #include #include @@ -8173,9 +8169,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/sysfs.h linux-3.9.4-vs2.3.6.2/in struct kobject; struct module; enum kobj_ns_type; -diff -NurpP --minimal linux-3.9.4/include/linux/types.h linux-3.9.4-vs2.3.6.2/include/linux/types.h +diff -NurpP --minimal linux-3.9.4/include/linux/types.h linux-3.9.4-vs2.3.6.3/include/linux/types.h --- linux-3.9.4/include/linux/types.h 2013-02-19 13:58:52.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/types.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/types.h 2013-05-31 14:47:11.000000000 +0000 @@ -32,6 +32,9 @@ typedef __kernel_uid32_t uid_t; typedef __kernel_gid32_t gid_t; typedef __kernel_uid16_t uid16_t; @@ -8186,9 +8182,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/types.h linux-3.9.4-vs2.3.6.2/in typedef unsigned long uintptr_t; -diff -NurpP --minimal linux-3.9.4/include/linux/uidgid.h linux-3.9.4-vs2.3.6.2/include/linux/uidgid.h +diff -NurpP --minimal linux-3.9.4/include/linux/uidgid.h linux-3.9.4-vs2.3.6.3/include/linux/uidgid.h --- linux-3.9.4/include/linux/uidgid.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/uidgid.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/uidgid.h 2013-05-31 14:47:11.000000000 +0000 @@ -23,13 +23,17 @@ typedef struct { uid_t val; } kuid_t; @@ -8308,9 +8304,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/uidgid.h linux-3.9.4-vs2.3.6.2/i static inline uid_t from_kuid_munged(struct user_namespace *to, kuid_t kuid) { uid_t uid = from_kuid(to, kuid); -diff -NurpP --minimal linux-3.9.4/include/linux/vroot.h linux-3.9.4-vs2.3.6.2/include/linux/vroot.h +diff -NurpP --minimal linux-3.9.4/include/linux/vroot.h linux-3.9.4-vs2.3.6.3/include/linux/vroot.h --- linux-3.9.4/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vroot.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vroot.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,51 @@ + +/* @@ -8363,9 +8359,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vroot.h linux-3.9.4-vs2.3.6.2/in +#define VROOT_CLR_DEV 0x5601 + +#endif /* _LINUX_VROOT_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vs_base.h linux-3.9.4-vs2.3.6.2/include/linux/vs_base.h +diff -NurpP --minimal linux-3.9.4/include/linux/vs_base.h linux-3.9.4-vs2.3.6.3/include/linux/vs_base.h --- linux-3.9.4/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vs_base.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vs_base.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,10 @@ +#ifndef _VS_BASE_H +#define _VS_BASE_H @@ -8377,9 +8373,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vs_base.h linux-3.9.4-vs2.3.6.2/ +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.9.4/include/linux/vs_context.h linux-3.9.4-vs2.3.6.2/include/linux/vs_context.h +diff -NurpP --minimal linux-3.9.4/include/linux/vs_context.h linux-3.9.4-vs2.3.6.3/include/linux/vs_context.h --- linux-3.9.4/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vs_context.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vs_context.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,242 @@ +#ifndef _VS_CONTEXT_H +#define _VS_CONTEXT_H @@ -8623,9 +8619,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vs_context.h linux-3.9.4-vs2.3.6 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.9.4/include/linux/vs_cowbl.h linux-3.9.4-vs2.3.6.2/include/linux/vs_cowbl.h +diff -NurpP --minimal linux-3.9.4/include/linux/vs_cowbl.h linux-3.9.4-vs2.3.6.3/include/linux/vs_cowbl.h --- linux-3.9.4/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vs_cowbl.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vs_cowbl.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,48 @@ +#ifndef _VS_COWBL_H +#define _VS_COWBL_H @@ -8675,9 +8671,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vs_cowbl.h linux-3.9.4-vs2.3.6.2 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.9.4/include/linux/vs_cvirt.h linux-3.9.4-vs2.3.6.2/include/linux/vs_cvirt.h +diff -NurpP --minimal linux-3.9.4/include/linux/vs_cvirt.h linux-3.9.4-vs2.3.6.3/include/linux/vs_cvirt.h --- linux-3.9.4/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vs_cvirt.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vs_cvirt.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,50 @@ +#ifndef _VS_CVIRT_H +#define _VS_CVIRT_H @@ -8729,9 +8725,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vs_cvirt.h linux-3.9.4-vs2.3.6.2 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.9.4/include/linux/vs_device.h linux-3.9.4-vs2.3.6.2/include/linux/vs_device.h +diff -NurpP --minimal linux-3.9.4/include/linux/vs_device.h linux-3.9.4-vs2.3.6.3/include/linux/vs_device.h --- linux-3.9.4/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vs_device.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vs_device.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,45 @@ +#ifndef _VS_DEVICE_H +#define _VS_DEVICE_H @@ -8778,9 +8774,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vs_device.h linux-3.9.4-vs2.3.6. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.9.4/include/linux/vs_dlimit.h linux-3.9.4-vs2.3.6.2/include/linux/vs_dlimit.h +diff -NurpP --minimal linux-3.9.4/include/linux/vs_dlimit.h linux-3.9.4-vs2.3.6.3/include/linux/vs_dlimit.h --- linux-3.9.4/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vs_dlimit.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vs_dlimit.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,215 @@ +#ifndef _VS_DLIMIT_H +#define _VS_DLIMIT_H @@ -8997,9 +8993,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vs_dlimit.h linux-3.9.4-vs2.3.6. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.9.4/include/linux/vs_inet.h linux-3.9.4-vs2.3.6.2/include/linux/vs_inet.h +diff -NurpP --minimal linux-3.9.4/include/linux/vs_inet.h linux-3.9.4-vs2.3.6.3/include/linux/vs_inet.h --- linux-3.9.4/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vs_inet.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vs_inet.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,364 @@ +#ifndef _VS_INET_H +#define _VS_INET_H @@ -9365,9 +9361,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vs_inet.h linux-3.9.4-vs2.3.6.2/ +#else +// #warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.9.4/include/linux/vs_inet6.h linux-3.9.4-vs2.3.6.2/include/linux/vs_inet6.h +diff -NurpP --minimal linux-3.9.4/include/linux/vs_inet6.h linux-3.9.4-vs2.3.6.3/include/linux/vs_inet6.h --- linux-3.9.4/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vs_inet6.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vs_inet6.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,257 @@ +#ifndef _VS_INET6_H +#define _VS_INET6_H @@ -9626,9 +9622,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vs_inet6.h linux-3.9.4-vs2.3.6.2 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.9.4/include/linux/vs_limit.h linux-3.9.4-vs2.3.6.2/include/linux/vs_limit.h +diff -NurpP --minimal linux-3.9.4/include/linux/vs_limit.h linux-3.9.4-vs2.3.6.3/include/linux/vs_limit.h --- linux-3.9.4/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vs_limit.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vs_limit.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,140 @@ +#ifndef _VS_LIMIT_H +#define _VS_LIMIT_H @@ -9770,9 +9766,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vs_limit.h linux-3.9.4-vs2.3.6.2 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.9.4/include/linux/vs_network.h linux-3.9.4-vs2.3.6.2/include/linux/vs_network.h +diff -NurpP --minimal linux-3.9.4/include/linux/vs_network.h linux-3.9.4-vs2.3.6.3/include/linux/vs_network.h --- linux-3.9.4/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vs_network.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vs_network.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,169 @@ +#ifndef _NX_VS_NETWORK_H +#define _NX_VS_NETWORK_H @@ -9943,9 +9939,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vs_network.h linux-3.9.4-vs2.3.6 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.9.4/include/linux/vs_pid.h linux-3.9.4-vs2.3.6.2/include/linux/vs_pid.h +diff -NurpP --minimal linux-3.9.4/include/linux/vs_pid.h linux-3.9.4-vs2.3.6.3/include/linux/vs_pid.h --- linux-3.9.4/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vs_pid.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vs_pid.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,50 @@ +#ifndef _VS_PID_H +#define _VS_PID_H @@ -9997,9 +9993,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vs_pid.h linux-3.9.4-vs2.3.6.2/i +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.9.4/include/linux/vs_sched.h linux-3.9.4-vs2.3.6.2/include/linux/vs_sched.h +diff -NurpP --minimal linux-3.9.4/include/linux/vs_sched.h linux-3.9.4-vs2.3.6.3/include/linux/vs_sched.h --- linux-3.9.4/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vs_sched.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vs_sched.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,40 @@ +#ifndef _VS_SCHED_H +#define _VS_SCHED_H @@ -10041,9 +10037,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vs_sched.h linux-3.9.4-vs2.3.6.2 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.9.4/include/linux/vs_socket.h linux-3.9.4-vs2.3.6.2/include/linux/vs_socket.h +diff -NurpP --minimal linux-3.9.4/include/linux/vs_socket.h linux-3.9.4-vs2.3.6.3/include/linux/vs_socket.h --- linux-3.9.4/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vs_socket.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vs_socket.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,67 @@ +#ifndef _VS_SOCKET_H +#define _VS_SOCKET_H @@ -10112,9 +10108,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vs_socket.h linux-3.9.4-vs2.3.6. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.9.4/include/linux/vs_tag.h linux-3.9.4-vs2.3.6.2/include/linux/vs_tag.h +diff -NurpP --minimal linux-3.9.4/include/linux/vs_tag.h linux-3.9.4-vs2.3.6.3/include/linux/vs_tag.h --- linux-3.9.4/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vs_tag.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vs_tag.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,47 @@ +#ifndef _VS_TAG_H +#define _VS_TAG_H @@ -10163,9 +10159,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vs_tag.h linux-3.9.4-vs2.3.6.2/i +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.9.4/include/linux/vs_time.h linux-3.9.4-vs2.3.6.2/include/linux/vs_time.h +diff -NurpP --minimal linux-3.9.4/include/linux/vs_time.h linux-3.9.4-vs2.3.6.3/include/linux/vs_time.h --- linux-3.9.4/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vs_time.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vs_time.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,19 @@ +#ifndef _VS_TIME_H +#define _VS_TIME_H @@ -10186,9 +10182,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vs_time.h linux-3.9.4-vs2.3.6.2/ +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/base.h linux-3.9.4-vs2.3.6.2/include/linux/vserver/base.h +diff -NurpP --minimal linux-3.9.4/include/linux/vserver/base.h linux-3.9.4-vs2.3.6.3/include/linux/vserver/base.h --- linux-3.9.4/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vserver/base.h 2013-05-31 17:55:09.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vserver/base.h 2013-05-31 17:55:09.000000000 +0000 @@ -0,0 +1,181 @@ +#ifndef _VSERVER_BASE_H +#define _VSERVER_BASE_H @@ -10371,9 +10367,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/base.h linux-3.9.4-vs2.3 +#define nx_info_state(n, m) (__nx_state(n) & (m)) + +#endif -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/cacct.h linux-3.9.4-vs2.3.6.2/include/linux/vserver/cacct.h +diff -NurpP --minimal linux-3.9.4/include/linux/vserver/cacct.h linux-3.9.4-vs2.3.6.3/include/linux/vserver/cacct.h --- linux-3.9.4/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vserver/cacct.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vserver/cacct.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,15 @@ +#ifndef _VSERVER_CACCT_H +#define _VSERVER_CACCT_H @@ -10390,9 +10386,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/cacct.h linux-3.9.4-vs2. +}; + +#endif /* _VSERVER_CACCT_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/cacct_cmd.h linux-3.9.4-vs2.3.6.2/include/linux/vserver/cacct_cmd.h +diff -NurpP --minimal linux-3.9.4/include/linux/vserver/cacct_cmd.h linux-3.9.4-vs2.3.6.3/include/linux/vserver/cacct_cmd.h --- linux-3.9.4/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vserver/cacct_cmd.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vserver/cacct_cmd.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,10 @@ +#ifndef _VSERVER_CACCT_CMD_H +#define _VSERVER_CACCT_CMD_H @@ -10404,9 +10400,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/cacct_cmd.h linux-3.9.4- +extern int vc_sock_stat(struct vx_info *, void __user *); + +#endif /* _VSERVER_CACCT_CMD_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/cacct_def.h linux-3.9.4-vs2.3.6.2/include/linux/vserver/cacct_def.h +diff -NurpP --minimal linux-3.9.4/include/linux/vserver/cacct_def.h linux-3.9.4-vs2.3.6.3/include/linux/vserver/cacct_def.h --- linux-3.9.4/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vserver/cacct_def.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vserver/cacct_def.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,43 @@ +#ifndef _VSERVER_CACCT_DEF_H +#define _VSERVER_CACCT_DEF_H @@ -10451,9 +10447,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/cacct_def.h linux-3.9.4- +#endif + +#endif /* _VSERVER_CACCT_DEF_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/cacct_int.h linux-3.9.4-vs2.3.6.2/include/linux/vserver/cacct_int.h +diff -NurpP --minimal linux-3.9.4/include/linux/vserver/cacct_int.h linux-3.9.4-vs2.3.6.3/include/linux/vserver/cacct_int.h --- linux-3.9.4/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vserver/cacct_int.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vserver/cacct_int.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,17 @@ +#ifndef _VSERVER_CACCT_INT_H +#define _VSERVER_CACCT_INT_H @@ -10472,9 +10468,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/cacct_int.h linux-3.9.4- +} + +#endif /* _VSERVER_CACCT_INT_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/check.h linux-3.9.4-vs2.3.6.2/include/linux/vserver/check.h +diff -NurpP --minimal linux-3.9.4/include/linux/vserver/check.h linux-3.9.4-vs2.3.6.3/include/linux/vserver/check.h --- linux-3.9.4/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vserver/check.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vserver/check.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,89 @@ +#ifndef _VSERVER_CHECK_H +#define _VSERVER_CHECK_H @@ -10565,9 +10561,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/check.h linux-3.9.4-vs2. +#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1) + +#endif -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/context.h linux-3.9.4-vs2.3.6.2/include/linux/vserver/context.h +diff -NurpP --minimal linux-3.9.4/include/linux/vserver/context.h linux-3.9.4-vs2.3.6.3/include/linux/vserver/context.h --- linux-3.9.4/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vserver/context.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vserver/context.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,110 @@ +#ifndef _VSERVER_CONTEXT_H +#define _VSERVER_CONTEXT_H @@ -10679,9 +10675,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/context.h linux-3.9.4-vs + + +#endif /* _VSERVER_CONTEXT_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/context_cmd.h linux-3.9.4-vs2.3.6.2/include/linux/vserver/context_cmd.h +diff -NurpP --minimal linux-3.9.4/include/linux/vserver/context_cmd.h linux-3.9.4-vs2.3.6.3/include/linux/vserver/context_cmd.h --- linux-3.9.4/include/linux/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vserver/context_cmd.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vserver/context_cmd.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,33 @@ +#ifndef _VSERVER_CONTEXT_CMD_H +#define _VSERVER_CONTEXT_CMD_H @@ -10716,9 +10712,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/context_cmd.h linux-3.9. +extern int vc_set_badness(struct vx_info *, void __user *); + +#endif /* _VSERVER_CONTEXT_CMD_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/cvirt.h linux-3.9.4-vs2.3.6.2/include/linux/vserver/cvirt.h +diff -NurpP --minimal linux-3.9.4/include/linux/vserver/cvirt.h linux-3.9.4-vs2.3.6.3/include/linux/vserver/cvirt.h --- linux-3.9.4/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vserver/cvirt.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vserver/cvirt.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,18 @@ +#ifndef _VSERVER_CVIRT_H +#define _VSERVER_CVIRT_H @@ -10738,9 +10734,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/cvirt.h linux-3.9.4-vs2. +int vx_do_syslog(int, char __user *, int); + +#endif /* _VSERVER_CVIRT_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/cvirt_cmd.h linux-3.9.4-vs2.3.6.2/include/linux/vserver/cvirt_cmd.h +diff -NurpP --minimal linux-3.9.4/include/linux/vserver/cvirt_cmd.h linux-3.9.4-vs2.3.6.3/include/linux/vserver/cvirt_cmd.h --- linux-3.9.4/include/linux/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vserver/cvirt_cmd.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vserver/cvirt_cmd.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,13 @@ +#ifndef _VSERVER_CVIRT_CMD_H +#define _VSERVER_CVIRT_CMD_H @@ -10755,9 +10751,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/cvirt_cmd.h linux-3.9.4- +extern int vc_virt_stat(struct vx_info *, void __user *); + +#endif /* _VSERVER_CVIRT_CMD_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/cvirt_def.h linux-3.9.4-vs2.3.6.2/include/linux/vserver/cvirt_def.h +diff -NurpP --minimal linux-3.9.4/include/linux/vserver/cvirt_def.h linux-3.9.4-vs2.3.6.3/include/linux/vserver/cvirt_def.h --- linux-3.9.4/include/linux/vserver/cvirt_def.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vserver/cvirt_def.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vserver/cvirt_def.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,80 @@ +#ifndef _VSERVER_CVIRT_DEF_H +#define _VSERVER_CVIRT_DEF_H @@ -10839,10 +10835,10 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/cvirt_def.h linux-3.9.4- +#endif + +#endif /* _VSERVER_CVIRT_DEF_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/debug.h linux-3.9.4-vs2.3.6.2/include/linux/vserver/debug.h +diff -NurpP --minimal linux-3.9.4/include/linux/vserver/debug.h linux-3.9.4-vs2.3.6.3/include/linux/vserver/debug.h --- linux-3.9.4/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vserver/debug.h 2013-05-31 14:47:11.000000000 +0000 -@@ -0,0 +1,145 @@ ++++ linux-3.9.4-vs2.3.6.3/include/linux/vserver/debug.h 2013-06-03 18:27:34.000000000 +0000 +@@ -0,0 +1,146 @@ +#ifndef _VSERVER_DEBUG_H +#define _VSERVER_DEBUG_H + @@ -10969,7 +10965,8 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/debug.h linux-3.9.4-vs2. +#define vxwprintk_task(c, f, x...) \ + vxwprintk(c, VX_WARN_TASK f, \ + current->comm, current->pid, \ -+ current->xid, current->nid, current->tag, ##x) ++ current->xid, current->nid, \ ++ current->tag, ##x) +#define vxwprintk_xid(c, f, x...) \ + vxwprintk(c, VX_WARN_XID f, current->xid, x) +#define vxwprintk_nid(c, f, x...) \ @@ -10988,9 +10985,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/debug.h linux-3.9.4-vs2. + + +#endif /* _VSERVER_DEBUG_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/debug_cmd.h linux-3.9.4-vs2.3.6.2/include/linux/vserver/debug_cmd.h +diff -NurpP --minimal linux-3.9.4/include/linux/vserver/debug_cmd.h linux-3.9.4-vs2.3.6.3/include/linux/vserver/debug_cmd.h --- linux-3.9.4/include/linux/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vserver/debug_cmd.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vserver/debug_cmd.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,37 @@ +#ifndef _VSERVER_DEBUG_CMD_H +#define _VSERVER_DEBUG_CMD_H @@ -11029,9 +11026,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/debug_cmd.h linux-3.9.4- +#endif /* CONFIG_COMPAT */ + +#endif /* _VSERVER_DEBUG_CMD_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/device.h linux-3.9.4-vs2.3.6.2/include/linux/vserver/device.h +diff -NurpP --minimal linux-3.9.4/include/linux/vserver/device.h linux-3.9.4-vs2.3.6.3/include/linux/vserver/device.h --- linux-3.9.4/include/linux/vserver/device.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vserver/device.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vserver/device.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,9 @@ +#ifndef _VSERVER_DEVICE_H +#define _VSERVER_DEVICE_H @@ -11042,9 +11039,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/device.h linux-3.9.4-vs2 +#else /* _VSERVER_DEVICE_H */ +#warning duplicate inclusion +#endif /* _VSERVER_DEVICE_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/device_cmd.h linux-3.9.4-vs2.3.6.2/include/linux/vserver/device_cmd.h +diff -NurpP --minimal linux-3.9.4/include/linux/vserver/device_cmd.h linux-3.9.4-vs2.3.6.3/include/linux/vserver/device_cmd.h --- linux-3.9.4/include/linux/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vserver/device_cmd.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vserver/device_cmd.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,31 @@ +#ifndef _VSERVER_DEVICE_CMD_H +#define _VSERVER_DEVICE_CMD_H @@ -11077,9 +11074,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/device_cmd.h linux-3.9.4 +#endif /* CONFIG_COMPAT */ + +#endif /* _VSERVER_DEVICE_CMD_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/device_def.h linux-3.9.4-vs2.3.6.2/include/linux/vserver/device_def.h +diff -NurpP --minimal linux-3.9.4/include/linux/vserver/device_def.h linux-3.9.4-vs2.3.6.3/include/linux/vserver/device_def.h --- linux-3.9.4/include/linux/vserver/device_def.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vserver/device_def.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vserver/device_def.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,17 @@ +#ifndef _VSERVER_DEVICE_DEF_H +#define _VSERVER_DEVICE_DEF_H @@ -11098,9 +11095,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/device_def.h linux-3.9.4 +}; + +#endif /* _VSERVER_DEVICE_DEF_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/dlimit.h linux-3.9.4-vs2.3.6.2/include/linux/vserver/dlimit.h +diff -NurpP --minimal linux-3.9.4/include/linux/vserver/dlimit.h linux-3.9.4-vs2.3.6.3/include/linux/vserver/dlimit.h --- linux-3.9.4/include/linux/vserver/dlimit.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vserver/dlimit.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vserver/dlimit.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,54 @@ +#ifndef _VSERVER_DLIMIT_H +#define _VSERVER_DLIMIT_H @@ -11156,9 +11153,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/dlimit.h linux-3.9.4-vs2 +#else /* _VSERVER_DLIMIT_H */ +#warning duplicate inclusion +#endif /* _VSERVER_DLIMIT_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/dlimit_cmd.h linux-3.9.4-vs2.3.6.2/include/linux/vserver/dlimit_cmd.h +diff -NurpP --minimal linux-3.9.4/include/linux/vserver/dlimit_cmd.h linux-3.9.4-vs2.3.6.3/include/linux/vserver/dlimit_cmd.h --- linux-3.9.4/include/linux/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vserver/dlimit_cmd.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vserver/dlimit_cmd.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,46 @@ +#ifndef _VSERVER_DLIMIT_CMD_H +#define _VSERVER_DLIMIT_CMD_H @@ -11206,9 +11203,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/dlimit_cmd.h linux-3.9.4 +#endif /* CONFIG_COMPAT */ + +#endif /* _VSERVER_DLIMIT_CMD_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/global.h linux-3.9.4-vs2.3.6.2/include/linux/vserver/global.h +diff -NurpP --minimal linux-3.9.4/include/linux/vserver/global.h linux-3.9.4-vs2.3.6.3/include/linux/vserver/global.h --- linux-3.9.4/include/linux/vserver/global.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vserver/global.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vserver/global.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,19 @@ +#ifndef _VSERVER_GLOBAL_H +#define _VSERVER_GLOBAL_H @@ -11229,9 +11226,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/global.h linux-3.9.4-vs2 + + +#endif /* _VSERVER_GLOBAL_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/history.h linux-3.9.4-vs2.3.6.2/include/linux/vserver/history.h +diff -NurpP --minimal linux-3.9.4/include/linux/vserver/history.h linux-3.9.4-vs2.3.6.3/include/linux/vserver/history.h --- linux-3.9.4/include/linux/vserver/history.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vserver/history.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vserver/history.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,197 @@ +#ifndef _VSERVER_HISTORY_H +#define _VSERVER_HISTORY_H @@ -11430,9 +11427,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/history.h linux-3.9.4-vs +#endif /* CONFIG_VSERVER_HISTORY */ + +#endif /* _VSERVER_HISTORY_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/inode.h linux-3.9.4-vs2.3.6.2/include/linux/vserver/inode.h +diff -NurpP --minimal linux-3.9.4/include/linux/vserver/inode.h linux-3.9.4-vs2.3.6.3/include/linux/vserver/inode.h --- linux-3.9.4/include/linux/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vserver/inode.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vserver/inode.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,19 @@ +#ifndef _VSERVER_INODE_H +#define _VSERVER_INODE_H @@ -11453,9 +11450,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/inode.h linux-3.9.4-vs2. +#else /* _VSERVER_INODE_H */ +#warning duplicate inclusion +#endif /* _VSERVER_INODE_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/inode_cmd.h linux-3.9.4-vs2.3.6.2/include/linux/vserver/inode_cmd.h +diff -NurpP --minimal linux-3.9.4/include/linux/vserver/inode_cmd.h linux-3.9.4-vs2.3.6.3/include/linux/vserver/inode_cmd.h --- linux-3.9.4/include/linux/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vserver/inode_cmd.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vserver/inode_cmd.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,36 @@ +#ifndef _VSERVER_INODE_CMD_H +#define _VSERVER_INODE_CMD_H @@ -11493,9 +11490,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/inode_cmd.h linux-3.9.4- +#endif /* CONFIG_COMPAT */ + +#endif /* _VSERVER_INODE_CMD_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/limit.h linux-3.9.4-vs2.3.6.2/include/linux/vserver/limit.h +diff -NurpP --minimal linux-3.9.4/include/linux/vserver/limit.h linux-3.9.4-vs2.3.6.3/include/linux/vserver/limit.h --- linux-3.9.4/include/linux/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vserver/limit.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vserver/limit.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,61 @@ +#ifndef _VSERVER_LIMIT_H +#define _VSERVER_LIMIT_H @@ -11558,9 +11555,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/limit.h linux-3.9.4-vs2. +#define NUM_LIMITS 24 + +#endif /* _VSERVER_LIMIT_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/limit_cmd.h linux-3.9.4-vs2.3.6.2/include/linux/vserver/limit_cmd.h +diff -NurpP --minimal linux-3.9.4/include/linux/vserver/limit_cmd.h linux-3.9.4-vs2.3.6.3/include/linux/vserver/limit_cmd.h --- linux-3.9.4/include/linux/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vserver/limit_cmd.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vserver/limit_cmd.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,35 @@ +#ifndef _VSERVER_LIMIT_CMD_H +#define _VSERVER_LIMIT_CMD_H @@ -11597,9 +11594,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/limit_cmd.h linux-3.9.4- +#endif /* CONFIG_IA32_EMULATION */ + +#endif /* _VSERVER_LIMIT_CMD_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/limit_def.h linux-3.9.4-vs2.3.6.2/include/linux/vserver/limit_def.h +diff -NurpP --minimal linux-3.9.4/include/linux/vserver/limit_def.h linux-3.9.4-vs2.3.6.3/include/linux/vserver/limit_def.h --- linux-3.9.4/include/linux/vserver/limit_def.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vserver/limit_def.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vserver/limit_def.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,47 @@ +#ifndef _VSERVER_LIMIT_DEF_H +#define _VSERVER_LIMIT_DEF_H @@ -11648,9 +11645,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/limit_def.h linux-3.9.4- +#endif + +#endif /* _VSERVER_LIMIT_DEF_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/limit_int.h linux-3.9.4-vs2.3.6.2/include/linux/vserver/limit_int.h +diff -NurpP --minimal linux-3.9.4/include/linux/vserver/limit_int.h linux-3.9.4-vs2.3.6.3/include/linux/vserver/limit_int.h --- linux-3.9.4/include/linux/vserver/limit_int.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vserver/limit_int.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vserver/limit_int.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,193 @@ +#ifndef _VSERVER_LIMIT_INT_H +#define _VSERVER_LIMIT_INT_H @@ -11845,9 +11842,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/limit_int.h linux-3.9.4- + + +#endif /* _VSERVER_LIMIT_INT_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/monitor.h linux-3.9.4-vs2.3.6.2/include/linux/vserver/monitor.h +diff -NurpP --minimal linux-3.9.4/include/linux/vserver/monitor.h linux-3.9.4-vs2.3.6.3/include/linux/vserver/monitor.h --- linux-3.9.4/include/linux/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vserver/monitor.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vserver/monitor.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,6 @@ +#ifndef _VSERVER_MONITOR_H +#define _VSERVER_MONITOR_H @@ -11855,9 +11852,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/monitor.h linux-3.9.4-vs +#include + +#endif /* _VSERVER_MONITOR_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/network.h linux-3.9.4-vs2.3.6.2/include/linux/vserver/network.h +diff -NurpP --minimal linux-3.9.4/include/linux/vserver/network.h linux-3.9.4-vs2.3.6.3/include/linux/vserver/network.h --- linux-3.9.4/include/linux/vserver/network.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vserver/network.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vserver/network.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,76 @@ +#ifndef _VSERVER_NETWORK_H +#define _VSERVER_NETWORK_H @@ -11935,9 +11932,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/network.h linux-3.9.4-vs +#endif + +#endif /* _VSERVER_NETWORK_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/network_cmd.h linux-3.9.4-vs2.3.6.2/include/linux/vserver/network_cmd.h +diff -NurpP --minimal linux-3.9.4/include/linux/vserver/network_cmd.h linux-3.9.4-vs2.3.6.3/include/linux/vserver/network_cmd.h --- linux-3.9.4/include/linux/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vserver/network_cmd.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vserver/network_cmd.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,37 @@ +#ifndef _VSERVER_NETWORK_CMD_H +#define _VSERVER_NETWORK_CMD_H @@ -11976,9 +11973,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/network_cmd.h linux-3.9. +extern int vc_set_ncaps(struct nx_info *, void __user *); + +#endif /* _VSERVER_CONTEXT_CMD_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/percpu.h linux-3.9.4-vs2.3.6.2/include/linux/vserver/percpu.h +diff -NurpP --minimal linux-3.9.4/include/linux/vserver/percpu.h linux-3.9.4-vs2.3.6.3/include/linux/vserver/percpu.h --- linux-3.9.4/include/linux/vserver/percpu.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vserver/percpu.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vserver/percpu.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,14 @@ +#ifndef _VSERVER_PERCPU_H +#define _VSERVER_PERCPU_H @@ -11994,9 +11991,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/percpu.h linux-3.9.4-vs2 +#define PERCPU_PERCTX (sizeof(struct _vx_percpu)) + +#endif /* _VSERVER_PERCPU_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/pid.h linux-3.9.4-vs2.3.6.2/include/linux/vserver/pid.h +diff -NurpP --minimal linux-3.9.4/include/linux/vserver/pid.h linux-3.9.4-vs2.3.6.3/include/linux/vserver/pid.h --- linux-3.9.4/include/linux/vserver/pid.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vserver/pid.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vserver/pid.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,51 @@ +#ifndef _VSERVER_PID_H +#define _VSERVER_PID_H @@ -12049,9 +12046,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/pid.h linux-3.9.4-vs2.3. +} + +#endif -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/sched.h linux-3.9.4-vs2.3.6.2/include/linux/vserver/sched.h +diff -NurpP --minimal linux-3.9.4/include/linux/vserver/sched.h linux-3.9.4-vs2.3.6.3/include/linux/vserver/sched.h --- linux-3.9.4/include/linux/vserver/sched.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vserver/sched.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vserver/sched.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,23 @@ +#ifndef _VSERVER_SCHED_H +#define _VSERVER_SCHED_H @@ -12076,9 +12073,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/sched.h linux-3.9.4-vs2. +#else /* _VSERVER_SCHED_H */ +#warning duplicate inclusion +#endif /* _VSERVER_SCHED_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/sched_cmd.h linux-3.9.4-vs2.3.6.2/include/linux/vserver/sched_cmd.h +diff -NurpP --minimal linux-3.9.4/include/linux/vserver/sched_cmd.h linux-3.9.4-vs2.3.6.3/include/linux/vserver/sched_cmd.h --- linux-3.9.4/include/linux/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vserver/sched_cmd.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vserver/sched_cmd.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,11 @@ +#ifndef _VSERVER_SCHED_CMD_H +#define _VSERVER_SCHED_CMD_H @@ -12091,9 +12088,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/sched_cmd.h linux-3.9.4- +extern int vc_get_prio_bias(struct vx_info *, void __user *); + +#endif /* _VSERVER_SCHED_CMD_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/sched_def.h linux-3.9.4-vs2.3.6.2/include/linux/vserver/sched_def.h +diff -NurpP --minimal linux-3.9.4/include/linux/vserver/sched_def.h linux-3.9.4-vs2.3.6.3/include/linux/vserver/sched_def.h --- linux-3.9.4/include/linux/vserver/sched_def.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vserver/sched_def.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vserver/sched_def.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,38 @@ +#ifndef _VSERVER_SCHED_DEF_H +#define _VSERVER_SCHED_DEF_H @@ -12133,9 +12130,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/sched_def.h linux-3.9.4- +#endif + +#endif /* _VSERVER_SCHED_DEF_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/signal.h linux-3.9.4-vs2.3.6.2/include/linux/vserver/signal.h +diff -NurpP --minimal linux-3.9.4/include/linux/vserver/signal.h linux-3.9.4-vs2.3.6.3/include/linux/vserver/signal.h --- linux-3.9.4/include/linux/vserver/signal.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vserver/signal.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vserver/signal.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,14 @@ +#ifndef _VSERVER_SIGNAL_H +#define _VSERVER_SIGNAL_H @@ -12151,9 +12148,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/signal.h linux-3.9.4-vs2 +#else /* _VSERVER_SIGNAL_H */ +#warning duplicate inclusion +#endif /* _VSERVER_SIGNAL_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/signal_cmd.h linux-3.9.4-vs2.3.6.2/include/linux/vserver/signal_cmd.h +diff -NurpP --minimal linux-3.9.4/include/linux/vserver/signal_cmd.h linux-3.9.4-vs2.3.6.3/include/linux/vserver/signal_cmd.h --- linux-3.9.4/include/linux/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vserver/signal_cmd.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vserver/signal_cmd.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,14 @@ +#ifndef _VSERVER_SIGNAL_CMD_H +#define _VSERVER_SIGNAL_CMD_H @@ -12169,9 +12166,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/signal_cmd.h linux-3.9.4 +extern int vc_set_pflags(uint32_t pid, void __user *); + +#endif /* _VSERVER_SIGNAL_CMD_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/space.h linux-3.9.4-vs2.3.6.2/include/linux/vserver/space.h +diff -NurpP --minimal linux-3.9.4/include/linux/vserver/space.h linux-3.9.4-vs2.3.6.3/include/linux/vserver/space.h --- linux-3.9.4/include/linux/vserver/space.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vserver/space.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vserver/space.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,12 @@ +#ifndef _VSERVER_SPACE_H +#define _VSERVER_SPACE_H @@ -12185,9 +12182,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/space.h linux-3.9.4-vs2. +#else /* _VSERVER_SPACE_H */ +#warning duplicate inclusion +#endif /* _VSERVER_SPACE_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/space_cmd.h linux-3.9.4-vs2.3.6.2/include/linux/vserver/space_cmd.h +diff -NurpP --minimal linux-3.9.4/include/linux/vserver/space_cmd.h linux-3.9.4-vs2.3.6.3/include/linux/vserver/space_cmd.h --- linux-3.9.4/include/linux/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vserver/space_cmd.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vserver/space_cmd.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,13 @@ +#ifndef _VSERVER_SPACE_CMD_H +#define _VSERVER_SPACE_CMD_H @@ -12202,9 +12199,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/space_cmd.h linux-3.9.4- +extern int vc_get_space_mask(void __user *, int); + +#endif /* _VSERVER_SPACE_CMD_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/switch.h linux-3.9.4-vs2.3.6.2/include/linux/vserver/switch.h +diff -NurpP --minimal linux-3.9.4/include/linux/vserver/switch.h linux-3.9.4-vs2.3.6.3/include/linux/vserver/switch.h --- linux-3.9.4/include/linux/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vserver/switch.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vserver/switch.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,8 @@ +#ifndef _VSERVER_SWITCH_H +#define _VSERVER_SWITCH_H @@ -12214,14 +12211,15 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/switch.h linux-3.9.4-vs2 +#include + +#endif /* _VSERVER_SWITCH_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/tag.h linux-3.9.4-vs2.3.6.2/include/linux/vserver/tag.h +diff -NurpP --minimal linux-3.9.4/include/linux/vserver/tag.h linux-3.9.4-vs2.3.6.3/include/linux/vserver/tag.h --- linux-3.9.4/include/linux/vserver/tag.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vserver/tag.h 2013-06-01 08:36:17.000000000 +0000 -@@ -0,0 +1,149 @@ ++++ linux-3.9.4-vs2.3.6.3/include/linux/vserver/tag.h 2013-06-03 20:23:02.000000000 +0000 +@@ -0,0 +1,160 @@ +#ifndef _DX_TAG_H +#define _DX_TAG_H + +#include ++#include + + +#define DX_TAG(in) (IS_TAGGED(in)) @@ -12320,11 +12318,27 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/tag.h linux-3.9.4-vs2.3. +#define TAGINO_TAG(cond, tag) ((cond) ? (tag) : 0) +#endif + ++#define TAGINO_KUID(cond, kuid, ktag) \ ++ KUIDT_INIT(TAGINO_UID(cond, __kuid_val(kuid), __ktag_val(ktag))) ++#define TAGINO_KGID(cond, kgid, ktag) \ ++ KGIDT_INIT(TAGINO_GID(cond, __kgid_val(kgid), __ktag_val(ktag))) ++#define TAGINO_KTAG(cond, ktag) \ ++ KTAGT_INIT(TAGINO_TAG(cond, __ktag_val(ktag))) ++ ++ +#define INOTAG_UID(cond, uid, gid) \ + ((cond) ? ((uid) & MAX_UID) : (uid)) +#define INOTAG_GID(cond, uid, gid) \ + ((cond) ? ((gid) & MAX_GID) : (gid)) + ++#define INOTAG_KUID(cond, kuid, kgid) \ ++ KUIDT_INIT(INOTAG_UID(cond, __kuid_val(kuid), __kgid_val(kgid))) ++#define INOTAG_KGID(cond, kuid, kgid) \ ++ KGIDT_INIT(INOTAG_GID(cond, __kuid_val(kuid), __kgid_val(kgid))) ++#define INOTAG_KTAG(cond, kuid, kgid, ktag) \ ++ KTAGT_INIT(INOTAG_TAG(cond, \ ++ __kuid_val(kuid), __kgid_val(kgid), __ktag_val(ktag))) ++ + +static inline uid_t dx_map_uid(uid_t uid) +{ @@ -12333,9 +12347,6 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/tag.h linux-3.9.4-vs2.3. + return (uid & MAX_UID); +} + -+#define dx_map_kuid(n, u) \ -+ make_kuid(n, dx_map_uid(from_kuid(n, u))) -+ +static inline gid_t dx_map_gid(gid_t gid) +{ + if ((gid > MAX_GID) && (gid != -1)) @@ -12343,9 +12354,6 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/tag.h linux-3.9.4-vs2.3. + return (gid & MAX_GID); +} + -+#define dx_map_kgid(n, u) \ -+ make_kgid(n, dx_map_gid(from_kgid(n, u))) -+ +struct peer_tag { + int32_t xid; + int32_t nid; @@ -12367,9 +12375,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/tag.h linux-3.9.4-vs2.3. +#endif + +#endif /* _DX_TAG_H */ -diff -NurpP --minimal linux-3.9.4/include/linux/vserver/tag_cmd.h linux-3.9.4-vs2.3.6.2/include/linux/vserver/tag_cmd.h +diff -NurpP --minimal linux-3.9.4/include/linux/vserver/tag_cmd.h linux-3.9.4-vs2.3.6.3/include/linux/vserver/tag_cmd.h --- linux-3.9.4/include/linux/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/linux/vserver/tag_cmd.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/linux/vserver/tag_cmd.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,10 @@ +#ifndef _VSERVER_TAG_CMD_H +#define _VSERVER_TAG_CMD_H @@ -12381,9 +12389,9 @@ diff -NurpP --minimal linux-3.9.4/include/linux/vserver/tag_cmd.h linux-3.9.4-vs +extern int vc_tag_migrate(uint32_t); + +#endif /* _VSERVER_TAG_CMD_H */ -diff -NurpP --minimal linux-3.9.4/include/net/addrconf.h linux-3.9.4-vs2.3.6.2/include/net/addrconf.h +diff -NurpP --minimal linux-3.9.4/include/net/addrconf.h linux-3.9.4-vs2.3.6.3/include/net/addrconf.h --- linux-3.9.4/include/net/addrconf.h 2013-05-31 13:45:28.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/net/addrconf.h 2013-05-31 17:17:53.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/net/addrconf.h 2013-05-31 17:17:53.000000000 +0000 @@ -85,7 +85,8 @@ extern int ipv6_dev_get_saddr(struct n const struct net_device *dev, const struct in6_addr *daddr, @@ -12394,9 +12402,9 @@ diff -NurpP --minimal linux-3.9.4/include/net/addrconf.h linux-3.9.4-vs2.3.6.2/i extern int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr, unsigned char banned_flags); -diff -NurpP --minimal linux-3.9.4/include/net/af_unix.h linux-3.9.4-vs2.3.6.2/include/net/af_unix.h +diff -NurpP --minimal linux-3.9.4/include/net/af_unix.h linux-3.9.4-vs2.3.6.3/include/net/af_unix.h --- linux-3.9.4/include/net/af_unix.h 2013-02-19 13:58:52.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/net/af_unix.h 2013-05-31 17:17:53.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/net/af_unix.h 2013-05-31 17:17:53.000000000 +0000 @@ -4,6 +4,7 @@ #include #include @@ -12405,9 +12413,9 @@ diff -NurpP --minimal linux-3.9.4/include/net/af_unix.h linux-3.9.4-vs2.3.6.2/in #include extern void unix_inflight(struct file *fp); -diff -NurpP --minimal linux-3.9.4/include/net/inet_timewait_sock.h linux-3.9.4-vs2.3.6.2/include/net/inet_timewait_sock.h +diff -NurpP --minimal linux-3.9.4/include/net/inet_timewait_sock.h linux-3.9.4-vs2.3.6.3/include/net/inet_timewait_sock.h --- linux-3.9.4/include/net/inet_timewait_sock.h 2013-05-31 13:45:28.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/net/inet_timewait_sock.h 2013-05-31 17:18:34.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/net/inet_timewait_sock.h 2013-05-31 17:18:34.000000000 +0000 @@ -116,6 +116,10 @@ struct inet_timewait_sock { #define tw_dport __tw_common.skc_dport #define tw_num __tw_common.skc_num @@ -12419,9 +12427,9 @@ diff -NurpP --minimal linux-3.9.4/include/net/inet_timewait_sock.h linux-3.9.4-v int tw_timeout; volatile unsigned char tw_substate; -diff -NurpP --minimal linux-3.9.4/include/net/ip6_route.h linux-3.9.4-vs2.3.6.2/include/net/ip6_route.h +diff -NurpP --minimal linux-3.9.4/include/net/ip6_route.h linux-3.9.4-vs2.3.6.3/include/net/ip6_route.h --- linux-3.9.4/include/net/ip6_route.h 2013-05-31 13:45:28.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/net/ip6_route.h 2013-05-31 17:17:53.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/net/ip6_route.h 2013-05-31 17:17:53.000000000 +0000 @@ -95,7 +95,8 @@ extern int ip6_route_get_saddr(struct struct rt6_info *rt, const struct in6_addr *daddr, @@ -12432,9 +12440,9 @@ diff -NurpP --minimal linux-3.9.4/include/net/ip6_route.h linux-3.9.4-vs2.3.6.2/ extern struct rt6_info *rt6_lookup(struct net *net, const struct in6_addr *daddr, -diff -NurpP --minimal linux-3.9.4/include/net/route.h linux-3.9.4-vs2.3.6.2/include/net/route.h +diff -NurpP --minimal linux-3.9.4/include/net/route.h linux-3.9.4-vs2.3.6.3/include/net/route.h --- linux-3.9.4/include/net/route.h 2013-02-19 13:58:52.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/net/route.h 2013-05-31 17:17:53.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/net/route.h 2013-05-31 17:17:53.000000000 +0000 @@ -207,6 +207,9 @@ static inline void ip_rt_put(struct rtab dst_release(&rt->dst); } @@ -12482,9 +12490,9 @@ diff -NurpP --minimal linux-3.9.4/include/net/route.h linux-3.9.4-vs2.3.6.2/incl rt = __ip_route_output_key(net, fl4); if (IS_ERR(rt)) return rt; -diff -NurpP --minimal linux-3.9.4/include/net/sock.h linux-3.9.4-vs2.3.6.2/include/net/sock.h +diff -NurpP --minimal linux-3.9.4/include/net/sock.h linux-3.9.4-vs2.3.6.3/include/net/sock.h --- linux-3.9.4/include/net/sock.h 2013-05-31 14:22:27.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/net/sock.h 2013-05-31 17:17:53.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/net/sock.h 2013-05-31 17:17:53.000000000 +0000 @@ -191,6 +191,10 @@ struct sock_common { #ifdef CONFIG_NET_NS struct net *skc_net; @@ -12507,17 +12515,17 @@ diff -NurpP --minimal linux-3.9.4/include/net/sock.h linux-3.9.4-vs2.3.6.2/inclu socket_lock_t sk_lock; struct sk_buff_head sk_receive_queue; /* -diff -NurpP --minimal linux-3.9.4/include/uapi/Kbuild linux-3.9.4-vs2.3.6.2/include/uapi/Kbuild +diff -NurpP --minimal linux-3.9.4/include/uapi/Kbuild linux-3.9.4-vs2.3.6.3/include/uapi/Kbuild --- linux-3.9.4/include/uapi/Kbuild 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/uapi/Kbuild 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/uapi/Kbuild 2013-05-31 14:47:11.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.9.4/include/uapi/linux/capability.h linux-3.9.4-vs2.3.6.2/include/uapi/linux/capability.h +diff -NurpP --minimal linux-3.9.4/include/uapi/linux/capability.h linux-3.9.4-vs2.3.6.3/include/uapi/linux/capability.h --- linux-3.9.4/include/uapi/linux/capability.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/uapi/linux/capability.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/uapi/linux/capability.h 2013-05-31 14:47:11.000000000 +0000 @@ -259,6 +259,7 @@ struct vfs_cap_data { arbitrary SCSI commands */ /* Allow setting encryption key on loopback filesystem */ @@ -12540,9 +12548,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/linux/capability.h linux-3.9.4-vs /* * Bit location of each capability (used by user-space library and kernel) -diff -NurpP --minimal linux-3.9.4/include/uapi/linux/fs.h linux-3.9.4-vs2.3.6.2/include/uapi/linux/fs.h +diff -NurpP --minimal linux-3.9.4/include/uapi/linux/fs.h linux-3.9.4-vs2.3.6.3/include/uapi/linux/fs.h --- linux-3.9.4/include/uapi/linux/fs.h 2013-05-31 13:45:29.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/uapi/linux/fs.h 2013-05-31 23:07:43.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/uapi/linux/fs.h 2013-05-31 23:07:43.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 */ @@ -12570,9 +12578,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/linux/fs.h linux-3.9.4-vs2.3.6.2/ #define SYNC_FILE_RANGE_WAIT_BEFORE 1 #define SYNC_FILE_RANGE_WRITE 2 -diff -NurpP --minimal linux-3.9.4/include/uapi/linux/gfs2_ondisk.h linux-3.9.4-vs2.3.6.2/include/uapi/linux/gfs2_ondisk.h +diff -NurpP --minimal linux-3.9.4/include/uapi/linux/gfs2_ondisk.h linux-3.9.4-vs2.3.6.3/include/uapi/linux/gfs2_ondisk.h --- linux-3.9.4/include/uapi/linux/gfs2_ondisk.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/uapi/linux/gfs2_ondisk.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/uapi/linux/gfs2_ondisk.h 2013-05-31 14:47:11.000000000 +0000 @@ -225,6 +225,9 @@ enum { gfs2fl_Sync = 8, gfs2fl_System = 9, @@ -12593,9 +12601,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/linux/gfs2_ondisk.h linux-3.9.4-v #define GFS2_DIF_TRUNC_IN_PROG 0x20000000 /* New in gfs2 */ #define GFS2_DIF_INHERIT_DIRECTIO 0x40000000 /* only in gfs1 */ #define GFS2_DIF_INHERIT_JDATA 0x80000000 -diff -NurpP --minimal linux-3.9.4/include/uapi/linux/if_tun.h linux-3.9.4-vs2.3.6.2/include/uapi/linux/if_tun.h +diff -NurpP --minimal linux-3.9.4/include/uapi/linux/if_tun.h linux-3.9.4-vs2.3.6.3/include/uapi/linux/if_tun.h --- linux-3.9.4/include/uapi/linux/if_tun.h 2013-02-19 13:58:55.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/uapi/linux/if_tun.h 2013-05-31 15:00:16.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/uapi/linux/if_tun.h 2013-05-31 15:00:16.000000000 +0000 @@ -56,6 +56,7 @@ #define TUNGETVNETHDRSZ _IOR('T', 215, int) #define TUNSETVNETHDRSZ _IOW('T', 216, int) @@ -12604,9 +12612,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/linux/if_tun.h linux-3.9.4-vs2.3. /* TUNSETIFF ifr flags */ #define IFF_TUN 0x0001 -diff -NurpP --minimal linux-3.9.4/include/uapi/linux/major.h linux-3.9.4-vs2.3.6.2/include/uapi/linux/major.h +diff -NurpP --minimal linux-3.9.4/include/uapi/linux/major.h linux-3.9.4-vs2.3.6.3/include/uapi/linux/major.h --- linux-3.9.4/include/uapi/linux/major.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/uapi/linux/major.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/uapi/linux/major.h 2013-05-31 14:47:11.000000000 +0000 @@ -15,6 +15,7 @@ #define HD_MAJOR IDE0_MAJOR #define PTY_SLAVE_MAJOR 3 @@ -12615,9 +12623,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/linux/major.h linux-3.9.4-vs2.3.6 #define TTYAUX_MAJOR 5 #define LP_MAJOR 6 #define VCS_MAJOR 7 -diff -NurpP --minimal linux-3.9.4/include/uapi/linux/nfs_mount.h linux-3.9.4-vs2.3.6.2/include/uapi/linux/nfs_mount.h +diff -NurpP --minimal linux-3.9.4/include/uapi/linux/nfs_mount.h linux-3.9.4-vs2.3.6.3/include/uapi/linux/nfs_mount.h --- linux-3.9.4/include/uapi/linux/nfs_mount.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/uapi/linux/nfs_mount.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/uapi/linux/nfs_mount.h 2013-05-31 14:47:11.000000000 +0000 @@ -63,7 +63,8 @@ struct nfs_mount_data { #define NFS_MOUNT_SECFLAVOUR 0x2000 /* 5 */ #define NFS_MOUNT_NORDIRPLUS 0x4000 /* 5 */ @@ -12628,9 +12636,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/linux/nfs_mount.h linux-3.9.4-vs2 /* The following are for internal use only */ #define NFS_MOUNT_LOOKUP_CACHE_NONEG 0x10000 -diff -NurpP --minimal linux-3.9.4/include/uapi/linux/reboot.h linux-3.9.4-vs2.3.6.2/include/uapi/linux/reboot.h +diff -NurpP --minimal linux-3.9.4/include/uapi/linux/reboot.h linux-3.9.4-vs2.3.6.3/include/uapi/linux/reboot.h --- linux-3.9.4/include/uapi/linux/reboot.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/uapi/linux/reboot.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/uapi/linux/reboot.h 2013-05-31 14:47:11.000000000 +0000 @@ -33,7 +33,7 @@ #define LINUX_REBOOT_CMD_RESTART2 0xA1B2C3D4 #define LINUX_REBOOT_CMD_SW_SUSPEND 0xD000FCE2 @@ -12640,9 +12648,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/linux/reboot.h linux-3.9.4-vs2.3. #endif /* _UAPI_LINUX_REBOOT_H */ -diff -NurpP --minimal linux-3.9.4/include/uapi/linux/sysctl.h linux-3.9.4-vs2.3.6.2/include/uapi/linux/sysctl.h +diff -NurpP --minimal linux-3.9.4/include/uapi/linux/sysctl.h linux-3.9.4-vs2.3.6.3/include/uapi/linux/sysctl.h --- linux-3.9.4/include/uapi/linux/sysctl.h 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/uapi/linux/sysctl.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/uapi/linux/sysctl.h 2013-05-31 14:47:11.000000000 +0000 @@ -60,6 +60,7 @@ enum CTL_ABI=9, /* Binary emulation */ CTL_CPU=10, /* CPU stuff (speed scaling, etc) */ @@ -12659,9 +12667,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/linux/sysctl.h linux-3.9.4-vs2.3. KERN_SPARC_REBOOT=21, /* reboot command on Sparc */ KERN_CTLALTDEL=22, /* int: allow ctl-alt-del to reboot */ -diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/Kbuild linux-3.9.4-vs2.3.6.2/include/uapi/vserver/Kbuild +diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/Kbuild linux-3.9.4-vs2.3.6.3/include/uapi/vserver/Kbuild --- linux-3.9.4/include/uapi/vserver/Kbuild 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/uapi/vserver/Kbuild 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/uapi/vserver/Kbuild 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,9 @@ + +header-y += context_cmd.h network_cmd.h space_cmd.h \ @@ -12672,9 +12680,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/Kbuild linux-3.9.4-vs2.3. +header-y += switch.h context.h network.h monitor.h \ + limit.h inode.h device.h + -diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/cacct_cmd.h linux-3.9.4-vs2.3.6.2/include/uapi/vserver/cacct_cmd.h +diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/cacct_cmd.h linux-3.9.4-vs2.3.6.3/include/uapi/vserver/cacct_cmd.h --- linux-3.9.4/include/uapi/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/uapi/vserver/cacct_cmd.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/uapi/vserver/cacct_cmd.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,15 @@ +#ifndef _UAPI_VS_CACCT_CMD_H +#define _UAPI_VS_CACCT_CMD_H @@ -12691,9 +12699,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/cacct_cmd.h linux-3.9.4-v +}; + +#endif /* _UAPI_VS_CACCT_CMD_H */ -diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/context.h linux-3.9.4-vs2.3.6.2/include/uapi/vserver/context.h +diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/context.h linux-3.9.4-vs2.3.6.3/include/uapi/vserver/context.h --- linux-3.9.4/include/uapi/vserver/context.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/uapi/vserver/context.h 2013-05-31 19:44:13.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/uapi/vserver/context.h 2013-05-31 19:44:13.000000000 +0000 @@ -0,0 +1,81 @@ +#ifndef _UAPI_VS_CONTEXT_H +#define _UAPI_VS_CONTEXT_H @@ -12776,9 +12784,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/context.h linux-3.9.4-vs2 +#define VXC_NAMESPACE 0x02000000 + +#endif /* _UAPI_VS_CONTEXT_H */ -diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/context_cmd.h linux-3.9.4-vs2.3.6.2/include/uapi/vserver/context_cmd.h +diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/context_cmd.h linux-3.9.4-vs2.3.6.3/include/uapi/vserver/context_cmd.h --- linux-3.9.4/include/uapi/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/uapi/vserver/context_cmd.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/uapi/vserver/context_cmd.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,115 @@ +#ifndef _UAPI_VS_CONTEXT_CMD_H +#define _UAPI_VS_CONTEXT_CMD_H @@ -12895,9 +12903,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/context_cmd.h linux-3.9.4 +}; + +#endif /* _UAPI_VS_CONTEXT_CMD_H */ -diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/cvirt_cmd.h linux-3.9.4-vs2.3.6.2/include/uapi/vserver/cvirt_cmd.h +diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/cvirt_cmd.h linux-3.9.4-vs2.3.6.3/include/uapi/vserver/cvirt_cmd.h --- linux-3.9.4/include/uapi/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/uapi/vserver/cvirt_cmd.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/uapi/vserver/cvirt_cmd.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,41 @@ +#ifndef _UAPI_VS_CVIRT_CMD_H +#define _UAPI_VS_CVIRT_CMD_H @@ -12940,9 +12948,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/cvirt_cmd.h linux-3.9.4-v +}; + +#endif /* _UAPI_VS_CVIRT_CMD_H */ -diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/debug_cmd.h linux-3.9.4-vs2.3.6.2/include/uapi/vserver/debug_cmd.h +diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/debug_cmd.h linux-3.9.4-vs2.3.6.3/include/uapi/vserver/debug_cmd.h --- linux-3.9.4/include/uapi/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/uapi/vserver/debug_cmd.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/uapi/vserver/debug_cmd.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,24 @@ +#ifndef _UAPI_VS_DEBUG_CMD_H +#define _UAPI_VS_DEBUG_CMD_H @@ -12968,9 +12976,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/debug_cmd.h linux-3.9.4-v +}; + +#endif /* _UAPI_VS_DEBUG_CMD_H */ -diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/device.h linux-3.9.4-vs2.3.6.2/include/uapi/vserver/device.h +diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/device.h linux-3.9.4-vs2.3.6.3/include/uapi/vserver/device.h --- linux-3.9.4/include/uapi/vserver/device.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/uapi/vserver/device.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/uapi/vserver/device.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,12 @@ +#ifndef _UAPI_VS_DEVICE_H +#define _UAPI_VS_DEVICE_H @@ -12984,9 +12992,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/device.h linux-3.9.4-vs2. +#define DATTR_MASK 0x00000013 + +#endif /* _UAPI_VS_DEVICE_H */ -diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/device_cmd.h linux-3.9.4-vs2.3.6.2/include/uapi/vserver/device_cmd.h +diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/device_cmd.h linux-3.9.4-vs2.3.6.3/include/uapi/vserver/device_cmd.h --- linux-3.9.4/include/uapi/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/uapi/vserver/device_cmd.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/uapi/vserver/device_cmd.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,16 @@ +#ifndef _UAPI_VS_DEVICE_CMD_H +#define _UAPI_VS_DEVICE_CMD_H @@ -13004,9 +13012,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/device_cmd.h linux-3.9.4- +}; + +#endif /* _UAPI_VS_DEVICE_CMD_H */ -diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/dlimit_cmd.h linux-3.9.4-vs2.3.6.2/include/uapi/vserver/dlimit_cmd.h +diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/dlimit_cmd.h linux-3.9.4-vs2.3.6.3/include/uapi/vserver/dlimit_cmd.h --- linux-3.9.4/include/uapi/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/uapi/vserver/dlimit_cmd.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/uapi/vserver/dlimit_cmd.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,67 @@ +#ifndef _UAPI_VS_DLIMIT_CMD_H +#define _UAPI_VS_DLIMIT_CMD_H @@ -13075,9 +13083,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/dlimit_cmd.h linux-3.9.4- +} + +#endif /* _UAPI_VS_DLIMIT_CMD_H */ -diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/inode.h linux-3.9.4-vs2.3.6.2/include/uapi/vserver/inode.h +diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/inode.h linux-3.9.4-vs2.3.6.3/include/uapi/vserver/inode.h --- linux-3.9.4/include/uapi/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/uapi/vserver/inode.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/uapi/vserver/inode.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,23 @@ +#ifndef _UAPI_VS_INODE_H +#define _UAPI_VS_INODE_H @@ -13102,9 +13110,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/inode.h linux-3.9.4-vs2.3 +#define FIOC_SETXFLG _IOW('x', 6, long) + +#endif /* _UAPI_VS_INODE_H */ -diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/inode_cmd.h linux-3.9.4-vs2.3.6.2/include/uapi/vserver/inode_cmd.h +diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/inode_cmd.h linux-3.9.4-vs2.3.6.3/include/uapi/vserver/inode_cmd.h --- linux-3.9.4/include/uapi/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/uapi/vserver/inode_cmd.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/uapi/vserver/inode_cmd.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,26 @@ +#ifndef _UAPI_VS_INODE_CMD_H +#define _UAPI_VS_INODE_CMD_H @@ -13132,9 +13140,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/inode_cmd.h linux-3.9.4-v +}; + +#endif /* _UAPI_VS_INODE_CMD_H */ -diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/limit.h linux-3.9.4-vs2.3.6.2/include/uapi/vserver/limit.h +diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/limit.h linux-3.9.4-vs2.3.6.3/include/uapi/vserver/limit.h --- linux-3.9.4/include/uapi/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/uapi/vserver/limit.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/uapi/vserver/limit.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,14 @@ +#ifndef _UAPI_VS_LIMIT_H +#define _UAPI_VS_LIMIT_H @@ -13150,9 +13158,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/limit.h linux-3.9.4-vs2.3 +#define VLIMIT_MAPPED 23 + +#endif /* _UAPI_VS_LIMIT_H */ -diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/limit_cmd.h linux-3.9.4-vs2.3.6.2/include/uapi/vserver/limit_cmd.h +diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/limit_cmd.h linux-3.9.4-vs2.3.6.3/include/uapi/vserver/limit_cmd.h --- linux-3.9.4/include/uapi/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/uapi/vserver/limit_cmd.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/uapi/vserver/limit_cmd.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,40 @@ +#ifndef _UAPI_VS_LIMIT_CMD_H +#define _UAPI_VS_LIMIT_CMD_H @@ -13194,9 +13202,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/limit_cmd.h linux-3.9.4-v +#define CRLIM_KEEP (~1ULL) + +#endif /* _UAPI_VS_LIMIT_CMD_H */ -diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/monitor.h linux-3.9.4-vs2.3.6.2/include/uapi/vserver/monitor.h +diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/monitor.h linux-3.9.4-vs2.3.6.3/include/uapi/vserver/monitor.h --- linux-3.9.4/include/uapi/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/uapi/vserver/monitor.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/uapi/vserver/monitor.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,96 @@ +#ifndef _UAPI_VS_MONITOR_H +#define _UAPI_VS_MONITOR_H @@ -13294,9 +13302,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/monitor.h linux-3.9.4-vs2 +}; + +#endif /* _UAPI_VS_MONITOR_H */ -diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/network.h linux-3.9.4-vs2.3.6.2/include/uapi/vserver/network.h +diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/network.h linux-3.9.4-vs2.3.6.3/include/uapi/vserver/network.h --- linux-3.9.4/include/uapi/vserver/network.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/uapi/vserver/network.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/uapi/vserver/network.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,76 @@ +#ifndef _UAPI_VS_NETWORK_H +#define _UAPI_VS_NETWORK_H @@ -13374,9 +13382,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/network.h linux-3.9.4-vs2 +#define NXA_MASK_SHOW (NXA_MASK_ALL | NXA_LOOPBACK) + +#endif /* _UAPI_VS_NETWORK_H */ -diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/network_cmd.h linux-3.9.4-vs2.3.6.2/include/uapi/vserver/network_cmd.h +diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/network_cmd.h linux-3.9.4-vs2.3.6.3/include/uapi/vserver/network_cmd.h --- linux-3.9.4/include/uapi/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/uapi/vserver/network_cmd.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/uapi/vserver/network_cmd.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,123 @@ +#ifndef _UAPI_VS_NETWORK_CMD_H +#define _UAPI_VS_NETWORK_CMD_H @@ -13501,9 +13509,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/network_cmd.h linux-3.9.4 +}; + +#endif /* _UAPI_VS_NETWORK_CMD_H */ -diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/sched_cmd.h linux-3.9.4-vs2.3.6.2/include/uapi/vserver/sched_cmd.h +diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/sched_cmd.h linux-3.9.4-vs2.3.6.3/include/uapi/vserver/sched_cmd.h --- linux-3.9.4/include/uapi/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/uapi/vserver/sched_cmd.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/uapi/vserver/sched_cmd.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,13 @@ +#ifndef _UAPI_VS_SCHED_CMD_H +#define _UAPI_VS_SCHED_CMD_H @@ -13518,9 +13526,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/sched_cmd.h linux-3.9.4-v +#define VCMD_get_prio_bias VC_CMD(SCHED, 5, 0) + +#endif /* _UAPI_VS_SCHED_CMD_H */ -diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/signal_cmd.h linux-3.9.4-vs2.3.6.2/include/uapi/vserver/signal_cmd.h +diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/signal_cmd.h linux-3.9.4-vs2.3.6.3/include/uapi/vserver/signal_cmd.h --- linux-3.9.4/include/uapi/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/uapi/vserver/signal_cmd.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/uapi/vserver/signal_cmd.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,31 @@ +#ifndef _UAPI_VS_SIGNAL_CMD_H +#define _UAPI_VS_SIGNAL_CMD_H @@ -13553,9 +13561,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/signal_cmd.h linux-3.9.4- +}; + +#endif /* _UAPI_VS_SIGNAL_CMD_H */ -diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/space_cmd.h linux-3.9.4-vs2.3.6.2/include/uapi/vserver/space_cmd.h +diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/space_cmd.h linux-3.9.4-vs2.3.6.3/include/uapi/vserver/space_cmd.h --- linux-3.9.4/include/uapi/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/uapi/vserver/space_cmd.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/uapi/vserver/space_cmd.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,28 @@ +#ifndef _UAPI_VS_SPACE_CMD_H +#define _UAPI_VS_SPACE_CMD_H @@ -13585,9 +13593,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/space_cmd.h linux-3.9.4-v +}; + +#endif /* _UAPI_VS_SPACE_CMD_H */ -diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/switch.h linux-3.9.4-vs2.3.6.2/include/uapi/vserver/switch.h +diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/switch.h linux-3.9.4-vs2.3.6.3/include/uapi/vserver/switch.h --- linux-3.9.4/include/uapi/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/uapi/vserver/switch.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/uapi/vserver/switch.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,90 @@ +#ifndef _UAPI_VS_SWITCH_H +#define _UAPI_VS_SWITCH_H @@ -13679,9 +13687,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/switch.h linux-3.9.4-vs2. +#define VCMD_get_vci VC_CMD(VERSION, 1, 0) + +#endif /* _UAPI_VS_SWITCH_H */ -diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/tag_cmd.h linux-3.9.4-vs2.3.6.2/include/uapi/vserver/tag_cmd.h +diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/tag_cmd.h linux-3.9.4-vs2.3.6.3/include/uapi/vserver/tag_cmd.h --- linux-3.9.4/include/uapi/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/include/uapi/vserver/tag_cmd.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/include/uapi/vserver/tag_cmd.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,14 @@ +#ifndef _UAPI_VS_TAG_CMD_H +#define _UAPI_VS_TAG_CMD_H @@ -13697,9 +13705,9 @@ diff -NurpP --minimal linux-3.9.4/include/uapi/vserver/tag_cmd.h linux-3.9.4-vs2 +#define VCMD_tag_migrate VC_CMD(TAGMIG, 1, 0) + +#endif /* _UAPI_VS_TAG_CMD_H */ -diff -NurpP --minimal linux-3.9.4/init/Kconfig linux-3.9.4-vs2.3.6.2/init/Kconfig +diff -NurpP --minimal linux-3.9.4/init/Kconfig linux-3.9.4-vs2.3.6.3/init/Kconfig --- linux-3.9.4/init/Kconfig 2013-05-31 13:45:29.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/init/Kconfig 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/init/Kconfig 2013-05-31 14:47:11.000000000 +0000 @@ -760,6 +760,7 @@ config NUMA_BALANCING menuconfig CGROUPS boolean "Control Group support" @@ -13716,9 +13724,9 @@ diff -NurpP --minimal linux-3.9.4/init/Kconfig linux-3.9.4-vs2.3.6.2/init/Kconfi select UIDGID_STRICT_TYPE_CHECKS default n -diff -NurpP --minimal linux-3.9.4/init/main.c linux-3.9.4-vs2.3.6.2/init/main.c +diff -NurpP --minimal linux-3.9.4/init/main.c linux-3.9.4-vs2.3.6.3/init/main.c --- linux-3.9.4/init/main.c 2013-05-31 13:45:29.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/init/main.c 2013-05-31 15:09:17.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/init/main.c 2013-05-31 15:09:17.000000000 +0000 @@ -72,6 +72,7 @@ #include #include @@ -13727,9 +13735,9 @@ diff -NurpP --minimal linux-3.9.4/init/main.c linux-3.9.4-vs2.3.6.2/init/main.c #include #include -diff -NurpP --minimal linux-3.9.4/ipc/mqueue.c linux-3.9.4-vs2.3.6.2/ipc/mqueue.c +diff -NurpP --minimal linux-3.9.4/ipc/mqueue.c linux-3.9.4-vs2.3.6.3/ipc/mqueue.c --- linux-3.9.4/ipc/mqueue.c 2013-05-31 13:45:29.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/ipc/mqueue.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/ipc/mqueue.c 2013-05-31 14:47:11.000000000 +0000 @@ -35,6 +35,8 @@ #include #include @@ -13805,9 +13813,9 @@ diff -NurpP --minimal linux-3.9.4/ipc/mqueue.c linux-3.9.4-vs2.3.6.2/ipc/mqueue. free_uid(user); } if (ipc_ns) -diff -NurpP --minimal linux-3.9.4/ipc/msg.c linux-3.9.4-vs2.3.6.2/ipc/msg.c +diff -NurpP --minimal linux-3.9.4/ipc/msg.c linux-3.9.4-vs2.3.6.3/ipc/msg.c --- linux-3.9.4/ipc/msg.c 2013-05-31 13:45:29.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/ipc/msg.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/ipc/msg.c 2013-05-31 14:47:11.000000000 +0000 @@ -37,6 +37,7 @@ #include #include @@ -13824,9 +13832,9 @@ diff -NurpP --minimal linux-3.9.4/ipc/msg.c linux-3.9.4-vs2.3.6.2/ipc/msg.c msq->q_perm.security = NULL; retval = security_msg_queue_alloc(msq); -diff -NurpP --minimal linux-3.9.4/ipc/sem.c linux-3.9.4-vs2.3.6.2/ipc/sem.c +diff -NurpP --minimal linux-3.9.4/ipc/sem.c linux-3.9.4-vs2.3.6.3/ipc/sem.c --- linux-3.9.4/ipc/sem.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/ipc/sem.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/ipc/sem.c 2013-05-31 14:47:11.000000000 +0000 @@ -86,6 +86,8 @@ #include #include @@ -13864,9 +13872,9 @@ diff -NurpP --minimal linux-3.9.4/ipc/sem.c linux-3.9.4-vs2.3.6.2/ipc/sem.c security_sem_free(sma); ipc_rcu_putref(sma); } -diff -NurpP --minimal linux-3.9.4/ipc/shm.c linux-3.9.4-vs2.3.6.2/ipc/shm.c +diff -NurpP --minimal linux-3.9.4/ipc/shm.c linux-3.9.4-vs2.3.6.3/ipc/shm.c --- linux-3.9.4/ipc/shm.c 2013-05-31 14:22:27.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/ipc/shm.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/ipc/shm.c 2013-05-31 14:47:11.000000000 +0000 @@ -39,6 +39,8 @@ #include #include @@ -13922,9 +13930,9 @@ diff -NurpP --minimal linux-3.9.4/ipc/shm.c linux-3.9.4-vs2.3.6.2/ipc/shm.c return error; no_id: -diff -NurpP --minimal linux-3.9.4/kernel/Makefile linux-3.9.4-vs2.3.6.2/kernel/Makefile +diff -NurpP --minimal linux-3.9.4/kernel/Makefile linux-3.9.4-vs2.3.6.3/kernel/Makefile --- linux-3.9.4/kernel/Makefile 2013-05-31 14:22:27.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/Makefile 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/Makefile 2013-05-31 14:47:11.000000000 +0000 @@ -24,6 +24,7 @@ endif obj-y += sched/ @@ -13933,9 +13941,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/Makefile linux-3.9.4-vs2.3.6.2/kernel/M obj-$(CONFIG_CHECKPOINT_RESTORE) += kcmp.o obj-$(CONFIG_FREEZER) += freezer.o -diff -NurpP --minimal linux-3.9.4/kernel/auditsc.c linux-3.9.4-vs2.3.6.2/kernel/auditsc.c +diff -NurpP --minimal linux-3.9.4/kernel/auditsc.c linux-3.9.4-vs2.3.6.3/kernel/auditsc.c --- linux-3.9.4/kernel/auditsc.c 2013-05-31 14:22:27.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/auditsc.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/auditsc.c 2013-05-31 14:47:11.000000000 +0000 @@ -2315,7 +2315,7 @@ int audit_set_loginuid(kuid_t loginuid) if (audit_loginuid_set(task)) return -EPERM; @@ -13945,9 +13953,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/auditsc.c linux-3.9.4-vs2.3.6.2/kernel/ return -EPERM; #endif /* CONFIG_AUDIT_LOGINUID_IMMUTABLE */ -diff -NurpP --minimal linux-3.9.4/kernel/capability.c linux-3.9.4-vs2.3.6.2/kernel/capability.c +diff -NurpP --minimal linux-3.9.4/kernel/capability.c linux-3.9.4-vs2.3.6.3/kernel/capability.c --- linux-3.9.4/kernel/capability.c 2013-05-31 13:45:29.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/capability.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/capability.c 2013-05-31 14:47:11.000000000 +0000 @@ -15,6 +15,7 @@ #include #include @@ -13973,9 +13981,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/capability.c linux-3.9.4-vs2.3.6.2/kern /** * has_capability_noaudit - Does a task have a capability (unaudited) in the * initial user ns -diff -NurpP --minimal linux-3.9.4/kernel/compat.c linux-3.9.4-vs2.3.6.2/kernel/compat.c +diff -NurpP --minimal linux-3.9.4/kernel/compat.c linux-3.9.4-vs2.3.6.3/kernel/compat.c --- linux-3.9.4/kernel/compat.c 2013-05-31 13:45:29.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/compat.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/compat.c 2013-05-31 14:47:11.000000000 +0000 @@ -27,6 +27,7 @@ #include #include @@ -13993,9 +14001,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/compat.c linux-3.9.4-vs2.3.6.2/kernel/c return 0; } -diff -NurpP --minimal linux-3.9.4/kernel/cred.c linux-3.9.4-vs2.3.6.2/kernel/cred.c +diff -NurpP --minimal linux-3.9.4/kernel/cred.c linux-3.9.4-vs2.3.6.3/kernel/cred.c --- linux-3.9.4/kernel/cred.c 2013-02-19 13:58:56.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/cred.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/cred.c 2013-05-31 14:47:11.000000000 +0000 @@ -56,31 +56,6 @@ struct cred init_cred = { .group_info = &init_groups, }; @@ -14065,9 +14073,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/cred.c linux-3.9.4-vs2.3.6.2/kernel/cre EXPORT_SYMBOL(prepare_creds); /* -diff -NurpP --minimal linux-3.9.4/kernel/exit.c linux-3.9.4-vs2.3.6.2/kernel/exit.c +diff -NurpP --minimal linux-3.9.4/kernel/exit.c linux-3.9.4-vs2.3.6.3/kernel/exit.c --- linux-3.9.4/kernel/exit.c 2013-05-31 13:45:29.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/exit.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/exit.c 2013-05-31 14:47:11.000000000 +0000 @@ -48,6 +48,10 @@ #include #include @@ -14163,9 +14171,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/exit.c linux-3.9.4-vs2.3.6.2/kernel/exi BUG(); /* Avoid "noreturn function does return". */ for (;;) -diff -NurpP --minimal linux-3.9.4/kernel/fork.c linux-3.9.4-vs2.3.6.2/kernel/fork.c +diff -NurpP --minimal linux-3.9.4/kernel/fork.c linux-3.9.4-vs2.3.6.3/kernel/fork.c --- linux-3.9.4/kernel/fork.c 2013-05-31 13:45:29.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/fork.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/fork.c 2013-05-31 14:47:11.000000000 +0000 @@ -70,6 +70,9 @@ #include #include @@ -14258,9 +14266,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/fork.c linux-3.9.4-vs2.3.6.2/kernel/for write_unlock_irq(&tasklist_lock); proc_fork_connector(p); cgroup_post_fork(p); -diff -NurpP --minimal linux-3.9.4/kernel/kthread.c linux-3.9.4-vs2.3.6.2/kernel/kthread.c +diff -NurpP --minimal linux-3.9.4/kernel/kthread.c linux-3.9.4-vs2.3.6.3/kernel/kthread.c --- linux-3.9.4/kernel/kthread.c 2013-05-31 13:45:30.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/kthread.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/kthread.c 2013-05-31 14:47:11.000000000 +0000 @@ -17,6 +17,7 @@ #include #include @@ -14269,9 +14277,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/kthread.c linux-3.9.4-vs2.3.6.2/kernel/ #include static DEFINE_SPINLOCK(kthread_create_lock); -diff -NurpP --minimal linux-3.9.4/kernel/nsproxy.c linux-3.9.4-vs2.3.6.2/kernel/nsproxy.c +diff -NurpP --minimal linux-3.9.4/kernel/nsproxy.c linux-3.9.4-vs2.3.6.3/kernel/nsproxy.c --- linux-3.9.4/kernel/nsproxy.c 2013-05-31 13:45:30.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/nsproxy.c 2013-05-31 19:28:43.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/nsproxy.c 2013-05-31 19:28:43.000000000 +0000 @@ -20,11 +20,14 @@ #include #include @@ -14457,9 +14465,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/nsproxy.c linux-3.9.4-vs2.3.6.2/kernel/ return -EPERM; *new_nsp = create_new_namespaces(unshare_flags, current, user_ns, -diff -NurpP --minimal linux-3.9.4/kernel/pid.c linux-3.9.4-vs2.3.6.2/kernel/pid.c +diff -NurpP --minimal linux-3.9.4/kernel/pid.c linux-3.9.4-vs2.3.6.3/kernel/pid.c --- linux-3.9.4/kernel/pid.c 2013-05-31 13:45:30.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/pid.c 2013-05-31 15:24:34.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/pid.c 2013-05-31 15:24:34.000000000 +0000 @@ -37,6 +37,7 @@ #include #include @@ -14517,9 +14525,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/pid.c linux-3.9.4-vs2.3.6.2/kernel/pid. pid_t pid_vnr(struct pid *pid) { return pid_nr_ns(pid, task_active_pid_ns(current)); -diff -NurpP --minimal linux-3.9.4/kernel/pid_namespace.c linux-3.9.4-vs2.3.6.2/kernel/pid_namespace.c +diff -NurpP --minimal linux-3.9.4/kernel/pid_namespace.c linux-3.9.4-vs2.3.6.3/kernel/pid_namespace.c --- linux-3.9.4/kernel/pid_namespace.c 2013-05-31 13:45:30.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/pid_namespace.c 2013-05-31 17:59:48.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/pid_namespace.c 2013-05-31 17:59:48.000000000 +0000 @@ -18,6 +18,7 @@ #include #include @@ -14544,9 +14552,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/pid_namespace.c linux-3.9.4-vs2.3.6.2/k kmem_cache_free(pid_ns_cachep, ns); } -diff -NurpP --minimal linux-3.9.4/kernel/posix-timers.c linux-3.9.4-vs2.3.6.2/kernel/posix-timers.c +diff -NurpP --minimal linux-3.9.4/kernel/posix-timers.c linux-3.9.4-vs2.3.6.3/kernel/posix-timers.c --- linux-3.9.4/kernel/posix-timers.c 2013-05-31 13:45:30.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/posix-timers.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/posix-timers.c 2013-05-31 14:47:11.000000000 +0000 @@ -47,6 +47,7 @@ #include #include @@ -14582,9 +14590,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/posix-timers.c linux-3.9.4-vs2.3.6.2/ke /* If we failed to send the signal the timer stops. */ return ret > 0; } -diff -NurpP --minimal linux-3.9.4/kernel/printk.c linux-3.9.4-vs2.3.6.2/kernel/printk.c +diff -NurpP --minimal linux-3.9.4/kernel/printk.c linux-3.9.4-vs2.3.6.3/kernel/printk.c --- linux-3.9.4/kernel/printk.c 2013-05-31 13:45:30.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/printk.c 2013-05-31 15:23:35.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/printk.c 2013-05-31 15:23:35.000000000 +0000 @@ -43,6 +43,7 @@ #include #include @@ -14652,9 +14660,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/printk.c linux-3.9.4-vs2.3.6.2/kernel/p error = syslog_print_all(buf, len, clear); break; /* Clear ring buffer */ -diff -NurpP --minimal linux-3.9.4/kernel/ptrace.c linux-3.9.4-vs2.3.6.2/kernel/ptrace.c +diff -NurpP --minimal linux-3.9.4/kernel/ptrace.c linux-3.9.4-vs2.3.6.3/kernel/ptrace.c --- linux-3.9.4/kernel/ptrace.c 2013-05-31 13:45:30.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/ptrace.c 2013-05-31 15:22:34.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/ptrace.c 2013-05-31 15:22:34.000000000 +0000 @@ -22,6 +22,7 @@ #include #include @@ -14675,9 +14683,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/ptrace.c linux-3.9.4-vs2.3.6.2/kernel/p return security_ptrace_access_check(task, mode); } -diff -NurpP --minimal linux-3.9.4/kernel/sched/core.c linux-3.9.4-vs2.3.6.2/kernel/sched/core.c +diff -NurpP --minimal linux-3.9.4/kernel/sched/core.c linux-3.9.4-vs2.3.6.3/kernel/sched/core.c --- linux-3.9.4/kernel/sched/core.c 2013-05-31 13:45:30.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/sched/core.c 2013-05-31 15:17:22.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/sched/core.c 2013-05-31 15:17:22.000000000 +0000 @@ -73,6 +73,8 @@ #include #include @@ -14717,9 +14725,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/sched/core.c linux-3.9.4-vs2.3.6.2/kern retval = security_task_setnice(current, nice); if (retval) -diff -NurpP --minimal linux-3.9.4/kernel/sched/cputime.c linux-3.9.4-vs2.3.6.2/kernel/sched/cputime.c +diff -NurpP --minimal linux-3.9.4/kernel/sched/cputime.c linux-3.9.4-vs2.3.6.3/kernel/sched/cputime.c --- linux-3.9.4/kernel/sched/cputime.c 2013-05-31 14:22:27.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/sched/cputime.c 2013-05-31 15:17:55.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/sched/cputime.c 2013-05-31 15:17:55.000000000 +0000 @@ -4,6 +4,7 @@ #include #include @@ -14760,9 +14768,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/sched/cputime.c linux-3.9.4-vs2.3.6.2/k account_group_system_time(p, cputime); /* Add system time to cpustat. */ -diff -NurpP --minimal linux-3.9.4/kernel/sched/fair.c linux-3.9.4-vs2.3.6.2/kernel/sched/fair.c +diff -NurpP --minimal linux-3.9.4/kernel/sched/fair.c linux-3.9.4-vs2.3.6.3/kernel/sched/fair.c --- linux-3.9.4/kernel/sched/fair.c 2013-05-31 13:45:30.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/sched/fair.c 2013-05-31 15:19:37.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/sched/fair.c 2013-05-31 15:19:37.000000000 +0000 @@ -29,6 +29,7 @@ #include #include @@ -14789,9 +14797,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/sched/fair.c linux-3.9.4-vs2.3.6.2/kern account_entity_dequeue(cfs_rq, se); /* -diff -NurpP --minimal linux-3.9.4/kernel/signal.c linux-3.9.4-vs2.3.6.2/kernel/signal.c +diff -NurpP --minimal linux-3.9.4/kernel/signal.c linux-3.9.4-vs2.3.6.3/kernel/signal.c --- linux-3.9.4/kernel/signal.c 2013-05-31 13:45:30.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/signal.c 2013-05-31 15:20:05.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/signal.c 2013-05-31 15:20:05.000000000 +0000 @@ -32,6 +32,8 @@ #include #include @@ -14884,9 +14892,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/signal.c linux-3.9.4-vs2.3.6.2/kernel/s if (sig_kernel_stop(signr)) { /* * The default action is to stop all threads in -diff -NurpP --minimal linux-3.9.4/kernel/softirq.c linux-3.9.4-vs2.3.6.2/kernel/softirq.c +diff -NurpP --minimal linux-3.9.4/kernel/softirq.c linux-3.9.4-vs2.3.6.3/kernel/softirq.c --- linux-3.9.4/kernel/softirq.c 2013-05-31 13:45:30.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/softirq.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/softirq.c 2013-05-31 14:47:11.000000000 +0000 @@ -25,6 +25,7 @@ #include #include @@ -14895,9 +14903,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/softirq.c linux-3.9.4-vs2.3.6.2/kernel/ #define CREATE_TRACE_POINTS #include -diff -NurpP --minimal linux-3.9.4/kernel/sys.c linux-3.9.4-vs2.3.6.2/kernel/sys.c +diff -NurpP --minimal linux-3.9.4/kernel/sys.c linux-3.9.4-vs2.3.6.3/kernel/sys.c --- linux-3.9.4/kernel/sys.c 2013-05-31 13:45:30.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/sys.c 2013-05-31 15:23:14.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/sys.c 2013-05-31 15:23:14.000000000 +0000 @@ -50,6 +50,7 @@ #include @@ -14994,9 +15002,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/sys.c linux-3.9.4-vs2.3.6.2/kernel/sys. return 0; return -EPERM; -diff -NurpP --minimal linux-3.9.4/kernel/sysctl.c linux-3.9.4-vs2.3.6.2/kernel/sysctl.c +diff -NurpP --minimal linux-3.9.4/kernel/sysctl.c linux-3.9.4-vs2.3.6.3/kernel/sysctl.c --- linux-3.9.4/kernel/sysctl.c 2013-05-31 13:45:30.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/sysctl.c 2013-05-31 15:28:39.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/sysctl.c 2013-05-31 15:28:39.000000000 +0000 @@ -83,6 +83,7 @@ #if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_LOCK_STAT) #include @@ -15019,9 +15027,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/sysctl.c linux-3.9.4-vs2.3.6.2/kernel/s #ifdef CONFIG_CHR_DEV_SG { -diff -NurpP --minimal linux-3.9.4/kernel/sysctl_binary.c linux-3.9.4-vs2.3.6.2/kernel/sysctl_binary.c +diff -NurpP --minimal linux-3.9.4/kernel/sysctl_binary.c linux-3.9.4-vs2.3.6.3/kernel/sysctl_binary.c --- linux-3.9.4/kernel/sysctl_binary.c 2013-05-31 13:45:30.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/sysctl_binary.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/sysctl_binary.c 2013-05-31 14:47:11.000000000 +0000 @@ -73,6 +73,7 @@ static const struct bin_table bin_kern_t { CTL_INT, KERN_PANIC, "panic" }, @@ -15030,9 +15038,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/sysctl_binary.c linux-3.9.4-vs2.3.6.2/k { CTL_STR, KERN_SPARC_REBOOT, "reboot-cmd" }, { CTL_INT, KERN_CTLALTDEL, "ctrl-alt-del" }, -diff -NurpP --minimal linux-3.9.4/kernel/time/timekeeping.c linux-3.9.4-vs2.3.6.2/kernel/time/timekeeping.c +diff -NurpP --minimal linux-3.9.4/kernel/time/timekeeping.c linux-3.9.4-vs2.3.6.3/kernel/time/timekeeping.c --- linux-3.9.4/kernel/time/timekeeping.c 2013-05-31 13:45:30.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/time/timekeeping.c 2013-05-31 15:24:55.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/time/timekeeping.c 2013-05-31 15:24:55.000000000 +0000 @@ -22,6 +22,7 @@ #include #include @@ -15049,9 +15057,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/time/timekeeping.c linux-3.9.4-vs2.3.6. } EXPORT_SYMBOL(getrawmonotonic); -diff -NurpP --minimal linux-3.9.4/kernel/time.c linux-3.9.4-vs2.3.6.2/kernel/time.c +diff -NurpP --minimal linux-3.9.4/kernel/time.c linux-3.9.4-vs2.3.6.3/kernel/time.c --- linux-3.9.4/kernel/time.c 2013-05-31 13:45:30.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/time.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/time.c 2013-05-31 14:47:11.000000000 +0000 @@ -37,6 +37,7 @@ #include #include @@ -15078,9 +15086,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/time.c linux-3.9.4-vs2.3.6.2/kernel/tim return 0; } -diff -NurpP --minimal linux-3.9.4/kernel/timer.c linux-3.9.4-vs2.3.6.2/kernel/timer.c +diff -NurpP --minimal linux-3.9.4/kernel/timer.c linux-3.9.4-vs2.3.6.3/kernel/timer.c --- linux-3.9.4/kernel/timer.c 2013-05-31 14:22:27.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/timer.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/timer.c 2013-05-31 14:47:11.000000000 +0000 @@ -41,6 +41,10 @@ #include #include @@ -15092,9 +15100,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/timer.c linux-3.9.4-vs2.3.6.2/kernel/ti #include #include -diff -NurpP --minimal linux-3.9.4/kernel/user_namespace.c linux-3.9.4-vs2.3.6.2/kernel/user_namespace.c +diff -NurpP --minimal linux-3.9.4/kernel/user_namespace.c linux-3.9.4-vs2.3.6.3/kernel/user_namespace.c --- linux-3.9.4/kernel/user_namespace.c 2013-05-31 13:45:30.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/user_namespace.c 2013-05-31 17:44:56.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/user_namespace.c 2013-05-31 17:44:56.000000000 +0000 @@ -22,6 +22,7 @@ #include #include @@ -15120,9 +15128,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/user_namespace.c linux-3.9.4-vs2.3.6.2/ put_user_ns(ns); } -diff -NurpP --minimal linux-3.9.4/kernel/utsname.c linux-3.9.4-vs2.3.6.2/kernel/utsname.c +diff -NurpP --minimal linux-3.9.4/kernel/utsname.c linux-3.9.4-vs2.3.6.3/kernel/utsname.c --- linux-3.9.4/kernel/utsname.c 2013-05-31 13:45:30.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/utsname.c 2013-05-31 15:15:55.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/utsname.c 2013-05-31 15:15:55.000000000 +0000 @@ -16,14 +16,17 @@ #include #include @@ -15150,9 +15158,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/utsname.c linux-3.9.4-vs2.3.6.2/kernel/ kfree(ns); } -diff -NurpP --minimal linux-3.9.4/kernel/vserver/Kconfig linux-3.9.4-vs2.3.6.2/kernel/vserver/Kconfig +diff -NurpP --minimal linux-3.9.4/kernel/vserver/Kconfig linux-3.9.4-vs2.3.6.3/kernel/vserver/Kconfig --- linux-3.9.4/kernel/vserver/Kconfig 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/vserver/Kconfig 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/vserver/Kconfig 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,233 @@ +# +# Linux VServer configuration @@ -15387,9 +15395,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/Kconfig linux-3.9.4-vs2.3.6.2/k + bool + default n + -diff -NurpP --minimal linux-3.9.4/kernel/vserver/Makefile linux-3.9.4-vs2.3.6.2/kernel/vserver/Makefile +diff -NurpP --minimal linux-3.9.4/kernel/vserver/Makefile linux-3.9.4-vs2.3.6.3/kernel/vserver/Makefile --- linux-3.9.4/kernel/vserver/Makefile 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/vserver/Makefile 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/vserver/Makefile 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,18 @@ +# +# Makefile for the Linux vserver routines. @@ -15409,9 +15417,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/Makefile linux-3.9.4-vs2.3.6.2/ +vserver-$(CONFIG_VSERVER_MONITOR) += monitor.o +vserver-$(CONFIG_VSERVER_DEVICE) += device.o + -diff -NurpP --minimal linux-3.9.4/kernel/vserver/cacct.c linux-3.9.4-vs2.3.6.2/kernel/vserver/cacct.c +diff -NurpP --minimal linux-3.9.4/kernel/vserver/cacct.c linux-3.9.4-vs2.3.6.3/kernel/vserver/cacct.c --- linux-3.9.4/kernel/vserver/cacct.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/vserver/cacct.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/vserver/cacct.c 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,42 @@ +/* + * linux/kernel/vserver/cacct.c @@ -15455,9 +15463,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/cacct.c linux-3.9.4-vs2.3.6.2/k + return 0; +} + -diff -NurpP --minimal linux-3.9.4/kernel/vserver/cacct_init.h linux-3.9.4-vs2.3.6.2/kernel/vserver/cacct_init.h +diff -NurpP --minimal linux-3.9.4/kernel/vserver/cacct_init.h linux-3.9.4-vs2.3.6.3/kernel/vserver/cacct_init.h --- linux-3.9.4/kernel/vserver/cacct_init.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/vserver/cacct_init.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/vserver/cacct_init.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,25 @@ + + @@ -15484,9 +15492,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/cacct_init.h linux-3.9.4-vs2.3. + return; +} + -diff -NurpP --minimal linux-3.9.4/kernel/vserver/cacct_proc.h linux-3.9.4-vs2.3.6.2/kernel/vserver/cacct_proc.h +diff -NurpP --minimal linux-3.9.4/kernel/vserver/cacct_proc.h linux-3.9.4-vs2.3.6.3/kernel/vserver/cacct_proc.h --- linux-3.9.4/kernel/vserver/cacct_proc.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/vserver/cacct_proc.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/vserver/cacct_proc.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,53 @@ +#ifndef _VX_CACCT_PROC_H +#define _VX_CACCT_PROC_H @@ -15541,9 +15549,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/cacct_proc.h linux-3.9.4-vs2.3. +} + +#endif /* _VX_CACCT_PROC_H */ -diff -NurpP --minimal linux-3.9.4/kernel/vserver/context.c linux-3.9.4-vs2.3.6.2/kernel/vserver/context.c +diff -NurpP --minimal linux-3.9.4/kernel/vserver/context.c linux-3.9.4-vs2.3.6.3/kernel/vserver/context.c --- linux-3.9.4/kernel/vserver/context.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/vserver/context.c 2013-05-31 19:34:32.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/vserver/context.c 2013-05-31 19:34:32.000000000 +0000 @@ -0,0 +1,1119 @@ +/* + * linux/kernel/vserver/context.c @@ -16664,9 +16672,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/context.c linux-3.9.4-vs2.3.6.2 + +EXPORT_SYMBOL_GPL(free_vx_info); + -diff -NurpP --minimal linux-3.9.4/kernel/vserver/cvirt.c linux-3.9.4-vs2.3.6.2/kernel/vserver/cvirt.c +diff -NurpP --minimal linux-3.9.4/kernel/vserver/cvirt.c linux-3.9.4-vs2.3.6.3/kernel/vserver/cvirt.c --- linux-3.9.4/kernel/vserver/cvirt.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/vserver/cvirt.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/vserver/cvirt.c 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,313 @@ +/* + * linux/kernel/vserver/cvirt.c @@ -16981,9 +16989,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/cvirt.c linux-3.9.4-vs2.3.6.2/k + +#endif + -diff -NurpP --minimal linux-3.9.4/kernel/vserver/cvirt_init.h linux-3.9.4-vs2.3.6.2/kernel/vserver/cvirt_init.h +diff -NurpP --minimal linux-3.9.4/kernel/vserver/cvirt_init.h linux-3.9.4-vs2.3.6.3/kernel/vserver/cvirt_init.h --- linux-3.9.4/kernel/vserver/cvirt_init.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/vserver/cvirt_init.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/vserver/cvirt_init.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,70 @@ + + @@ -17055,9 +17063,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/cvirt_init.h linux-3.9.4-vs2.3. + return; +} + -diff -NurpP --minimal linux-3.9.4/kernel/vserver/cvirt_proc.h linux-3.9.4-vs2.3.6.2/kernel/vserver/cvirt_proc.h +diff -NurpP --minimal linux-3.9.4/kernel/vserver/cvirt_proc.h linux-3.9.4-vs2.3.6.3/kernel/vserver/cvirt_proc.h --- linux-3.9.4/kernel/vserver/cvirt_proc.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/vserver/cvirt_proc.h 2013-05-31 19:38:26.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/vserver/cvirt_proc.h 2013-05-31 19:38:26.000000000 +0000 @@ -0,0 +1,123 @@ +#ifndef _VX_CVIRT_PROC_H +#define _VX_CVIRT_PROC_H @@ -17182,9 +17190,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/cvirt_proc.h linux-3.9.4-vs2.3. +} + +#endif /* _VX_CVIRT_PROC_H */ -diff -NurpP --minimal linux-3.9.4/kernel/vserver/debug.c linux-3.9.4-vs2.3.6.2/kernel/vserver/debug.c +diff -NurpP --minimal linux-3.9.4/kernel/vserver/debug.c linux-3.9.4-vs2.3.6.3/kernel/vserver/debug.c --- linux-3.9.4/kernel/vserver/debug.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/vserver/debug.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/vserver/debug.c 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,32 @@ +/* + * kernel/vserver/debug.c @@ -17218,9 +17226,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/debug.c linux-3.9.4-vs2.3.6.2/k + +EXPORT_SYMBOL_GPL(dump_vx_info); + -diff -NurpP --minimal linux-3.9.4/kernel/vserver/device.c linux-3.9.4-vs2.3.6.2/kernel/vserver/device.c +diff -NurpP --minimal linux-3.9.4/kernel/vserver/device.c linux-3.9.4-vs2.3.6.3/kernel/vserver/device.c --- linux-3.9.4/kernel/vserver/device.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/vserver/device.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/vserver/device.c 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,443 @@ +/* + * linux/kernel/vserver/device.c @@ -17665,9 +17673,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/device.c linux-3.9.4-vs2.3.6.2/ +#endif /* CONFIG_COMPAT */ + + -diff -NurpP --minimal linux-3.9.4/kernel/vserver/dlimit.c linux-3.9.4-vs2.3.6.2/kernel/vserver/dlimit.c +diff -NurpP --minimal linux-3.9.4/kernel/vserver/dlimit.c linux-3.9.4-vs2.3.6.3/kernel/vserver/dlimit.c --- linux-3.9.4/kernel/vserver/dlimit.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/vserver/dlimit.c 2013-05-31 19:37:39.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/vserver/dlimit.c 2013-05-31 19:37:39.000000000 +0000 @@ -0,0 +1,528 @@ +/* + * linux/kernel/vserver/dlimit.c @@ -18197,9 +18205,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/dlimit.c linux-3.9.4-vs2.3.6.2/ +EXPORT_SYMBOL_GPL(locate_dl_info); +EXPORT_SYMBOL_GPL(rcu_free_dl_info); + -diff -NurpP --minimal linux-3.9.4/kernel/vserver/helper.c linux-3.9.4-vs2.3.6.2/kernel/vserver/helper.c +diff -NurpP --minimal linux-3.9.4/kernel/vserver/helper.c linux-3.9.4-vs2.3.6.3/kernel/vserver/helper.c --- linux-3.9.4/kernel/vserver/helper.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/vserver/helper.c 2013-06-01 08:27:59.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/vserver/helper.c 2013-06-01 08:27:59.000000000 +0000 @@ -0,0 +1,230 @@ +/* + * linux/kernel/vserver/helper.c @@ -18431,9 +18439,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/helper.c linux-3.9.4-vs2.3.6.2/ + return do_vshelper(vshelper_path, argv, envp, 1); +} + -diff -NurpP --minimal linux-3.9.4/kernel/vserver/history.c linux-3.9.4-vs2.3.6.2/kernel/vserver/history.c +diff -NurpP --minimal linux-3.9.4/kernel/vserver/history.c linux-3.9.4-vs2.3.6.3/kernel/vserver/history.c --- linux-3.9.4/kernel/vserver/history.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/vserver/history.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/vserver/history.c 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,258 @@ +/* + * kernel/vserver/history.c @@ -18693,9 +18701,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/history.c linux-3.9.4-vs2.3.6.2 + +#endif /* CONFIG_COMPAT */ + -diff -NurpP --minimal linux-3.9.4/kernel/vserver/inet.c linux-3.9.4-vs2.3.6.2/kernel/vserver/inet.c +diff -NurpP --minimal linux-3.9.4/kernel/vserver/inet.c linux-3.9.4-vs2.3.6.3/kernel/vserver/inet.c --- linux-3.9.4/kernel/vserver/inet.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/vserver/inet.c 2013-05-31 22:43:05.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/vserver/inet.c 2013-05-31 22:43:05.000000000 +0000 @@ -0,0 +1,236 @@ + +#include @@ -18933,9 +18941,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/inet.c linux-3.9.4-vs2.3.6.2/ke + +EXPORT_SYMBOL_GPL(ip_v4_find_src); + -diff -NurpP --minimal linux-3.9.4/kernel/vserver/init.c linux-3.9.4-vs2.3.6.2/kernel/vserver/init.c +diff -NurpP --minimal linux-3.9.4/kernel/vserver/init.c linux-3.9.4-vs2.3.6.3/kernel/vserver/init.c --- linux-3.9.4/kernel/vserver/init.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/vserver/init.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/vserver/init.c 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,45 @@ +/* + * linux/kernel/init.c @@ -18982,9 +18990,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/init.c linux-3.9.4-vs2.3.6.2/ke +module_init(init_vserver); +module_exit(exit_vserver); + -diff -NurpP --minimal linux-3.9.4/kernel/vserver/inode.c linux-3.9.4-vs2.3.6.2/kernel/vserver/inode.c +diff -NurpP --minimal linux-3.9.4/kernel/vserver/inode.c linux-3.9.4-vs2.3.6.3/kernel/vserver/inode.c --- linux-3.9.4/kernel/vserver/inode.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/vserver/inode.c 2013-06-01 08:26:06.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/vserver/inode.c 2013-06-01 08:26:06.000000000 +0000 @@ -0,0 +1,437 @@ +/* + * linux/kernel/vserver/inode.c @@ -19423,9 +19431,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/inode.c linux-3.9.4-vs2.3.6.2/k + +#endif /* CONFIG_PROPAGATE */ + -diff -NurpP --minimal linux-3.9.4/kernel/vserver/limit.c linux-3.9.4-vs2.3.6.2/kernel/vserver/limit.c +diff -NurpP --minimal linux-3.9.4/kernel/vserver/limit.c linux-3.9.4-vs2.3.6.3/kernel/vserver/limit.c --- linux-3.9.4/kernel/vserver/limit.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/vserver/limit.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/vserver/limit.c 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,345 @@ +/* + * linux/kernel/vserver/limit.c @@ -19772,9 +19780,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/limit.c linux-3.9.4-vs2.3.6.2/k + return cache; +} + -diff -NurpP --minimal linux-3.9.4/kernel/vserver/limit_init.h linux-3.9.4-vs2.3.6.2/kernel/vserver/limit_init.h +diff -NurpP --minimal linux-3.9.4/kernel/vserver/limit_init.h linux-3.9.4-vs2.3.6.3/kernel/vserver/limit_init.h --- linux-3.9.4/kernel/vserver/limit_init.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/vserver/limit_init.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/vserver/limit_init.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,31 @@ + + @@ -19807,9 +19815,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/limit_init.h linux-3.9.4-vs2.3. + } +} + -diff -NurpP --minimal linux-3.9.4/kernel/vserver/limit_proc.h linux-3.9.4-vs2.3.6.2/kernel/vserver/limit_proc.h +diff -NurpP --minimal linux-3.9.4/kernel/vserver/limit_proc.h linux-3.9.4-vs2.3.6.3/kernel/vserver/limit_proc.h --- linux-3.9.4/kernel/vserver/limit_proc.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/vserver/limit_proc.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/vserver/limit_proc.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,57 @@ +#ifndef _VX_LIMIT_PROC_H +#define _VX_LIMIT_PROC_H @@ -19868,9 +19876,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/limit_proc.h linux-3.9.4-vs2.3. +#endif /* _VX_LIMIT_PROC_H */ + + -diff -NurpP --minimal linux-3.9.4/kernel/vserver/network.c linux-3.9.4-vs2.3.6.2/kernel/vserver/network.c +diff -NurpP --minimal linux-3.9.4/kernel/vserver/network.c linux-3.9.4-vs2.3.6.3/kernel/vserver/network.c --- linux-3.9.4/kernel/vserver/network.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/vserver/network.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/vserver/network.c 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,1053 @@ +/* + * linux/kernel/vserver/network.c @@ -20925,9 +20933,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/network.c linux-3.9.4-vs2.3.6.2 +EXPORT_SYMBOL_GPL(free_nx_info); +EXPORT_SYMBOL_GPL(unhash_nx_info); + -diff -NurpP --minimal linux-3.9.4/kernel/vserver/proc.c linux-3.9.4-vs2.3.6.2/kernel/vserver/proc.c +diff -NurpP --minimal linux-3.9.4/kernel/vserver/proc.c linux-3.9.4-vs2.3.6.3/kernel/vserver/proc.c --- linux-3.9.4/kernel/vserver/proc.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/vserver/proc.c 2013-06-01 08:30:38.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/vserver/proc.c 2013-06-01 08:30:38.000000000 +0000 @@ -0,0 +1,1110 @@ +/* + * linux/kernel/vserver/proc.c @@ -22039,9 +22047,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/proc.c linux-3.9.4-vs2.3.6.2/ke + return buffer - orig; +} + -diff -NurpP --minimal linux-3.9.4/kernel/vserver/sched.c linux-3.9.4-vs2.3.6.2/kernel/vserver/sched.c +diff -NurpP --minimal linux-3.9.4/kernel/vserver/sched.c linux-3.9.4-vs2.3.6.3/kernel/vserver/sched.c --- linux-3.9.4/kernel/vserver/sched.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/vserver/sched.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/vserver/sched.c 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,83 @@ +/* + * linux/kernel/vserver/sched.c @@ -22126,9 +22134,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/sched.c linux-3.9.4-vs2.3.6.2/k + return 0; +} + -diff -NurpP --minimal linux-3.9.4/kernel/vserver/sched_init.h linux-3.9.4-vs2.3.6.2/kernel/vserver/sched_init.h +diff -NurpP --minimal linux-3.9.4/kernel/vserver/sched_init.h linux-3.9.4-vs2.3.6.3/kernel/vserver/sched_init.h --- linux-3.9.4/kernel/vserver/sched_init.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/vserver/sched_init.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/vserver/sched_init.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,27 @@ + +static inline void vx_info_init_sched(struct _vx_sched *sched) @@ -22157,9 +22165,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/sched_init.h linux-3.9.4-vs2.3. +{ + return; +} -diff -NurpP --minimal linux-3.9.4/kernel/vserver/sched_proc.h linux-3.9.4-vs2.3.6.2/kernel/vserver/sched_proc.h +diff -NurpP --minimal linux-3.9.4/kernel/vserver/sched_proc.h linux-3.9.4-vs2.3.6.3/kernel/vserver/sched_proc.h --- linux-3.9.4/kernel/vserver/sched_proc.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/vserver/sched_proc.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/vserver/sched_proc.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,32 @@ +#ifndef _VX_SCHED_PROC_H +#define _VX_SCHED_PROC_H @@ -22193,9 +22201,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/sched_proc.h linux-3.9.4-vs2.3. +} + +#endif /* _VX_SCHED_PROC_H */ -diff -NurpP --minimal linux-3.9.4/kernel/vserver/signal.c linux-3.9.4-vs2.3.6.2/kernel/vserver/signal.c +diff -NurpP --minimal linux-3.9.4/kernel/vserver/signal.c linux-3.9.4-vs2.3.6.3/kernel/vserver/signal.c --- linux-3.9.4/kernel/vserver/signal.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/vserver/signal.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/vserver/signal.c 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,134 @@ +/* + * linux/kernel/vserver/signal.c @@ -22331,9 +22339,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/signal.c linux-3.9.4-vs2.3.6.2/ + return ret; +} + -diff -NurpP --minimal linux-3.9.4/kernel/vserver/space.c linux-3.9.4-vs2.3.6.2/kernel/vserver/space.c +diff -NurpP --minimal linux-3.9.4/kernel/vserver/space.c linux-3.9.4-vs2.3.6.3/kernel/vserver/space.c --- linux-3.9.4/kernel/vserver/space.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/vserver/space.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/vserver/space.c 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,436 @@ +/* + * linux/kernel/vserver/space.c @@ -22771,9 +22779,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/space.c linux-3.9.4-vs2.3.6.2/k + return 0; +} + -diff -NurpP --minimal linux-3.9.4/kernel/vserver/switch.c linux-3.9.4-vs2.3.6.2/kernel/vserver/switch.c +diff -NurpP --minimal linux-3.9.4/kernel/vserver/switch.c linux-3.9.4-vs2.3.6.3/kernel/vserver/switch.c --- linux-3.9.4/kernel/vserver/switch.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/vserver/switch.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/vserver/switch.c 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,556 @@ +/* + * linux/kernel/vserver/switch.c @@ -23331,9 +23339,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/switch.c linux-3.9.4-vs2.3.6.2/ +} + +#endif /* CONFIG_COMPAT */ -diff -NurpP --minimal linux-3.9.4/kernel/vserver/sysctl.c linux-3.9.4-vs2.3.6.2/kernel/vserver/sysctl.c +diff -NurpP --minimal linux-3.9.4/kernel/vserver/sysctl.c linux-3.9.4-vs2.3.6.3/kernel/vserver/sysctl.c --- linux-3.9.4/kernel/vserver/sysctl.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/vserver/sysctl.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/vserver/sysctl.c 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,247 @@ +/* + * kernel/vserver/sysctl.c @@ -23582,9 +23590,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/sysctl.c linux-3.9.4-vs2.3.6.2/ +EXPORT_SYMBOL_GPL(vs_debug_perm); +EXPORT_SYMBOL_GPL(vs_debug_misc); + -diff -NurpP --minimal linux-3.9.4/kernel/vserver/tag.c linux-3.9.4-vs2.3.6.2/kernel/vserver/tag.c +diff -NurpP --minimal linux-3.9.4/kernel/vserver/tag.c linux-3.9.4-vs2.3.6.3/kernel/vserver/tag.c --- linux-3.9.4/kernel/vserver/tag.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/vserver/tag.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/vserver/tag.c 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,63 @@ +/* + * linux/kernel/vserver/tag.c @@ -23649,9 +23657,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/tag.c linux-3.9.4-vs2.3.6.2/ker +} + + -diff -NurpP --minimal linux-3.9.4/kernel/vserver/vci_config.h linux-3.9.4-vs2.3.6.2/kernel/vserver/vci_config.h +diff -NurpP --minimal linux-3.9.4/kernel/vserver/vci_config.h linux-3.9.4-vs2.3.6.3/kernel/vserver/vci_config.h --- linux-3.9.4/kernel/vserver/vci_config.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/kernel/vserver/vci_config.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/kernel/vserver/vci_config.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,80 @@ + +/* interface version */ @@ -23733,9 +23741,9 @@ diff -NurpP --minimal linux-3.9.4/kernel/vserver/vci_config.h linux-3.9.4-vs2.3. + 0; +} + -diff -NurpP --minimal linux-3.9.4/mm/memcontrol.c linux-3.9.4-vs2.3.6.2/mm/memcontrol.c +diff -NurpP --minimal linux-3.9.4/mm/memcontrol.c linux-3.9.4-vs2.3.6.3/mm/memcontrol.c --- linux-3.9.4/mm/memcontrol.c 2013-05-31 13:45:31.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/mm/memcontrol.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/mm/memcontrol.c 2013-05-31 14:47:11.000000000 +0000 @@ -1046,6 +1046,31 @@ struct mem_cgroup *mem_cgroup_from_task( return mem_cgroup_from_css(task_subsys_state(p, mem_cgroup_subsys_id)); } @@ -23768,9 +23776,9 @@ diff -NurpP --minimal linux-3.9.4/mm/memcontrol.c linux-3.9.4-vs2.3.6.2/mm/memco struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm) { struct mem_cgroup *memcg = NULL; -diff -NurpP --minimal linux-3.9.4/mm/oom_kill.c linux-3.9.4-vs2.3.6.2/mm/oom_kill.c +diff -NurpP --minimal linux-3.9.4/mm/oom_kill.c linux-3.9.4-vs2.3.6.3/mm/oom_kill.c --- linux-3.9.4/mm/oom_kill.c 2013-05-31 13:45:31.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/mm/oom_kill.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/mm/oom_kill.c 2013-05-31 14:47:11.000000000 +0000 @@ -35,6 +35,8 @@ #include #include @@ -23845,9 +23853,9 @@ diff -NurpP --minimal linux-3.9.4/mm/oom_kill.c linux-3.9.4-vs2.3.6.2/mm/oom_kil } if (PTR_ERR(p) != -1UL) { oom_kill_process(p, gfp_mask, order, points, totalpages, NULL, -diff -NurpP --minimal linux-3.9.4/mm/page_alloc.c linux-3.9.4-vs2.3.6.2/mm/page_alloc.c +diff -NurpP --minimal linux-3.9.4/mm/page_alloc.c linux-3.9.4-vs2.3.6.3/mm/page_alloc.c --- linux-3.9.4/mm/page_alloc.c 2013-05-31 13:45:31.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/mm/page_alloc.c 2013-05-31 15:08:50.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/mm/page_alloc.c 2013-05-31 15:08:50.000000000 +0000 @@ -59,6 +59,8 @@ #include #include @@ -23877,9 +23885,9 @@ diff -NurpP --minimal linux-3.9.4/mm/page_alloc.c linux-3.9.4-vs2.3.6.2/mm/page_ } #endif -diff -NurpP --minimal linux-3.9.4/mm/pgtable-generic.c linux-3.9.4-vs2.3.6.2/mm/pgtable-generic.c +diff -NurpP --minimal linux-3.9.4/mm/pgtable-generic.c linux-3.9.4-vs2.3.6.3/mm/pgtable-generic.c --- linux-3.9.4/mm/pgtable-generic.c 2013-02-19 13:58:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/mm/pgtable-generic.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/mm/pgtable-generic.c 2013-05-31 14:47:11.000000000 +0000 @@ -6,6 +6,8 @@ * Copyright (C) 2010 Linus Torvalds */ @@ -23889,9 +23897,9 @@ diff -NurpP --minimal linux-3.9.4/mm/pgtable-generic.c linux-3.9.4-vs2.3.6.2/mm/ #include #include #include -diff -NurpP --minimal linux-3.9.4/mm/shmem.c linux-3.9.4-vs2.3.6.2/mm/shmem.c +diff -NurpP --minimal linux-3.9.4/mm/shmem.c linux-3.9.4-vs2.3.6.3/mm/shmem.c --- linux-3.9.4/mm/shmem.c 2013-05-31 13:45:31.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/mm/shmem.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/mm/shmem.c 2013-05-31 14:47:11.000000000 +0000 @@ -1909,7 +1909,7 @@ static int shmem_statfs(struct dentry *d { struct shmem_sb_info *sbinfo = SHMEM_SB(dentry->d_sb); @@ -23910,9 +23918,9 @@ diff -NurpP --minimal linux-3.9.4/mm/shmem.c linux-3.9.4-vs2.3.6.2/mm/shmem.c sb->s_op = &shmem_ops; sb->s_time_gran = 1; #ifdef CONFIG_TMPFS_XATTR -diff -NurpP --minimal linux-3.9.4/mm/slab.c linux-3.9.4-vs2.3.6.2/mm/slab.c +diff -NurpP --minimal linux-3.9.4/mm/slab.c linux-3.9.4-vs2.3.6.3/mm/slab.c --- linux-3.9.4/mm/slab.c 2013-05-31 13:45:31.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/mm/slab.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/mm/slab.c 2013-05-31 14:47:11.000000000 +0000 @@ -429,6 +429,8 @@ static void kmem_list3_init(struct kmem_ #define STATS_INC_FREEMISS(x) do { } while (0) #endif @@ -23946,9 +23954,9 @@ diff -NurpP --minimal linux-3.9.4/mm/slab.c linux-3.9.4-vs2.3.6.2/mm/slab.c kmemcheck_slab_free(cachep, objp, cachep->object_size); -diff -NurpP --minimal linux-3.9.4/mm/slab_vs.h linux-3.9.4-vs2.3.6.2/mm/slab_vs.h +diff -NurpP --minimal linux-3.9.4/mm/slab_vs.h linux-3.9.4-vs2.3.6.3/mm/slab_vs.h --- linux-3.9.4/mm/slab_vs.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/mm/slab_vs.h 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/mm/slab_vs.h 2013-05-31 14:47:11.000000000 +0000 @@ -0,0 +1,29 @@ + +#include @@ -23979,9 +23987,9 @@ diff -NurpP --minimal linux-3.9.4/mm/slab_vs.h linux-3.9.4-vs2.3.6.2/mm/slab_vs. + atomic_sub(cachep->size, &vxi->cacct.slab[what]); +} + -diff -NurpP --minimal linux-3.9.4/mm/swapfile.c linux-3.9.4-vs2.3.6.2/mm/swapfile.c +diff -NurpP --minimal linux-3.9.4/mm/swapfile.c linux-3.9.4-vs2.3.6.3/mm/swapfile.c --- linux-3.9.4/mm/swapfile.c 2013-05-31 13:45:31.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/mm/swapfile.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/mm/swapfile.c 2013-05-31 14:47:11.000000000 +0000 @@ -39,6 +39,7 @@ #include #include @@ -24016,9 +24024,9 @@ diff -NurpP --minimal linux-3.9.4/mm/swapfile.c linux-3.9.4-vs2.3.6.2/mm/swapfil } /* -diff -NurpP --minimal linux-3.9.4/net/bridge/br_multicast.c linux-3.9.4-vs2.3.6.2/net/bridge/br_multicast.c +diff -NurpP --minimal linux-3.9.4/net/bridge/br_multicast.c linux-3.9.4-vs2.3.6.3/net/bridge/br_multicast.c --- linux-3.9.4/net/bridge/br_multicast.c 2013-05-31 13:45:31.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/net/bridge/br_multicast.c 2013-05-31 17:17:53.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/net/bridge/br_multicast.c 2013-05-31 17:17:53.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)); @@ -24028,9 +24036,9 @@ diff -NurpP --minimal linux-3.9.4/net/bridge/br_multicast.c linux-3.9.4-vs2.3.6. kfree_skb(skb); return NULL; } -diff -NurpP --minimal linux-3.9.4/net/core/dev.c linux-3.9.4-vs2.3.6.2/net/core/dev.c +diff -NurpP --minimal linux-3.9.4/net/core/dev.c linux-3.9.4-vs2.3.6.3/net/core/dev.c --- linux-3.9.4/net/core/dev.c 2013-05-31 14:22:27.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/net/core/dev.c 2013-05-31 18:37:38.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/net/core/dev.c 2013-05-31 18:37:38.000000000 +0000 @@ -122,6 +122,7 @@ #include #include @@ -24148,9 +24156,9 @@ diff -NurpP --minimal linux-3.9.4/net/core/dev.c linux-3.9.4-vs2.3.6.2/net/core/ /* avoid cases where sscanf is not exact inverse of printf */ snprintf(buf, IFNAMSIZ, name, i); -diff -NurpP --minimal linux-3.9.4/net/core/net-procfs.c linux-3.9.4-vs2.3.6.2/net/core/net-procfs.c +diff -NurpP --minimal linux-3.9.4/net/core/net-procfs.c linux-3.9.4-vs2.3.6.3/net/core/net-procfs.c --- linux-3.9.4/net/core/net-procfs.c 2013-05-31 13:45:32.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/net/core/net-procfs.c 2013-06-01 10:40:52.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/net/core/net-procfs.c 2013-06-01 10:40:52.000000000 +0000 @@ -1,6 +1,7 @@ #include #include @@ -24174,9 +24182,9 @@ diff -NurpP --minimal linux-3.9.4/net/core/net-procfs.c linux-3.9.4-vs2.3.6.2/ne 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.9.4/net/core/rtnetlink.c linux-3.9.4-vs2.3.6.2/net/core/rtnetlink.c +diff -NurpP --minimal linux-3.9.4/net/core/rtnetlink.c linux-3.9.4-vs2.3.6.3/net/core/rtnetlink.c --- linux-3.9.4/net/core/rtnetlink.c 2013-05-31 13:45:32.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/net/core/rtnetlink.c 2013-05-31 17:17:54.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/net/core/rtnetlink.c 2013-05-31 17:17:54.000000000 +0000 @@ -1085,6 +1085,8 @@ static int rtnl_dump_ifinfo(struct sk_bu hlist_for_each_entry_rcu(dev, head, index_hlist) { if (idx < s_idx) @@ -24196,9 +24204,9 @@ diff -NurpP --minimal linux-3.9.4/net/core/rtnetlink.c linux-3.9.4-vs2.3.6.2/net skb = nlmsg_new((if_info_size = if_nlmsg_size(dev, 0)), GFP_KERNEL); if (skb == NULL) goto errout; -diff -NurpP --minimal linux-3.9.4/net/core/sock.c linux-3.9.4-vs2.3.6.2/net/core/sock.c +diff -NurpP --minimal linux-3.9.4/net/core/sock.c linux-3.9.4-vs2.3.6.3/net/core/sock.c --- linux-3.9.4/net/core/sock.c 2013-05-31 14:22:27.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/net/core/sock.c 2013-05-31 17:17:54.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/net/core/sock.c 2013-05-31 17:17:54.000000000 +0000 @@ -132,6 +132,10 @@ #include @@ -24266,9 +24274,9 @@ diff -NurpP --minimal linux-3.9.4/net/core/sock.c linux-3.9.4-vs2.3.6.2/net/core /* * Before updating sk_refcnt, we must commit prior changes to memory * (Documentation/RCU/rculist_nulls.txt for details) -diff -NurpP --minimal linux-3.9.4/net/ipv4/af_inet.c linux-3.9.4-vs2.3.6.2/net/ipv4/af_inet.c +diff -NurpP --minimal linux-3.9.4/net/ipv4/af_inet.c linux-3.9.4-vs2.3.6.3/net/ipv4/af_inet.c --- linux-3.9.4/net/ipv4/af_inet.c 2013-05-31 13:45:32.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/net/ipv4/af_inet.c 2013-05-31 18:24:05.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/net/ipv4/af_inet.c 2013-06-03 17:22:33.000000000 +0000 @@ -118,6 +118,7 @@ #ifdef CONFIG_IP_MROUTE #include @@ -24277,18 +24285,22 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/af_inet.c linux-3.9.4-vs2.3.6.2/net/i /* The inetsw table contains everything that inet_create needs to -@@ -336,6 +337,10 @@ lookup_protocol: +@@ -336,10 +337,13 @@ lookup_protocol: } err = -EPERM; + if ((protocol == IPPROTO_ICMP) && + nx_capable(CAP_NET_RAW, NXC_RAW_ICMP)) + goto override; -+override: if (sock->type == SOCK_RAW && !kern && !ns_capable(net->user_ns, CAP_NET_RAW)) goto out_rcu_unlock; -@@ -460,6 +465,7 @@ int inet_bind(struct socket *sock, struc +- ++override: + sock->ops = answer->ops; + answer_prot = answer->prot; + answer_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); @@ -24296,7 +24308,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/af_inet.c linux-3.9.4-vs2.3.6.2/net/i struct net *net = sock_net(sk); unsigned short snum; int chk_addr_ret; -@@ -484,7 +490,11 @@ int inet_bind(struct socket *sock, struc +@@ -484,7 +489,11 @@ int inet_bind(struct socket *sock, struc goto out; } @@ -24309,7 +24321,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/af_inet.c linux-3.9.4-vs2.3.6.2/net/i /* Not specified by any standard per-se, however it breaks too * many applications when removed. It is unfortunate since -@@ -496,7 +506,7 @@ int inet_bind(struct socket *sock, struc +@@ -496,7 +505,7 @@ int inet_bind(struct socket *sock, struc err = -EADDRNOTAVAIL; if (!sysctl_ip_nonlocal_bind && !(inet->freebind || inet->transparent) && @@ -24318,7 +24330,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/af_inet.c linux-3.9.4-vs2.3.6.2/net/i chk_addr_ret != RTN_LOCAL && chk_addr_ret != RTN_MULTICAST && chk_addr_ret != RTN_BROADCAST) -@@ -522,7 +532,7 @@ int inet_bind(struct socket *sock, struc +@@ -522,7 +531,7 @@ int inet_bind(struct socket *sock, struc if (sk->sk_state != TCP_CLOSE || inet->inet_num) goto out_release_sock; @@ -24327,7 +24339,7 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/af_inet.c linux-3.9.4-vs2.3.6.2/net/i if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST) inet->inet_saddr = 0; /* Use device */ -@@ -741,11 +751,13 @@ int inet_getname(struct socket *sock, st +@@ -741,11 +750,13 @@ int inet_getname(struct socket *sock, st peer == 1)) return -ENOTCONN; sin->sin_port = inet->inet_dport; @@ -24342,9 +24354,9 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/af_inet.c linux-3.9.4-vs2.3.6.2/net/i sin->sin_port = inet->inet_sport; sin->sin_addr.s_addr = addr; } -diff -NurpP --minimal linux-3.9.4/net/ipv4/arp.c linux-3.9.4-vs2.3.6.2/net/ipv4/arp.c +diff -NurpP --minimal linux-3.9.4/net/ipv4/arp.c linux-3.9.4-vs2.3.6.3/net/ipv4/arp.c --- linux-3.9.4/net/ipv4/arp.c 2013-05-31 13:45:32.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/net/ipv4/arp.c 2013-05-31 17:17:54.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/net/ipv4/arp.c 2013-05-31 17:17:54.000000000 +0000 @@ -1317,6 +1317,7 @@ static void arp_format_neigh_entry(struc struct net_device *dev = n->dev; int hatype = dev->type; @@ -24361,9 +24373,9 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/arp.c linux-3.9.4-vs2.3.6.2/net/ipv4/ sprintf(tbuf, "%pI4", n->key); seq_printf(seq, "%-16s 0x%-10x0x%-10x%s * %s\n", tbuf, hatype, ATF_PUBL | ATF_PERM, "00:00:00:00:00:00", -diff -NurpP --minimal linux-3.9.4/net/ipv4/devinet.c linux-3.9.4-vs2.3.6.2/net/ipv4/devinet.c +diff -NurpP --minimal linux-3.9.4/net/ipv4/devinet.c linux-3.9.4-vs2.3.6.3/net/ipv4/devinet.c --- linux-3.9.4/net/ipv4/devinet.c 2013-05-31 13:45:32.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/net/ipv4/devinet.c 2013-05-31 17:17:54.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/net/ipv4/devinet.c 2013-05-31 17:17:54.000000000 +0000 @@ -522,6 +522,7 @@ struct in_device *inetdev_by_index(struc } EXPORT_SYMBOL(inetdev_by_index); @@ -24430,9 +24442,9 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/devinet.c linux-3.9.4-vs2.3.6.2/net/i if (ip_idx < s_ip_idx) continue; if (inet_fill_ifaddr(skb, ifa, -diff -NurpP --minimal linux-3.9.4/net/ipv4/fib_trie.c linux-3.9.4-vs2.3.6.2/net/ipv4/fib_trie.c +diff -NurpP --minimal linux-3.9.4/net/ipv4/fib_trie.c linux-3.9.4-vs2.3.6.3/net/ipv4/fib_trie.c --- linux-3.9.4/net/ipv4/fib_trie.c 2013-05-31 13:45:32.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/net/ipv4/fib_trie.c 2013-05-31 17:17:54.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/net/ipv4/fib_trie.c 2013-05-31 17:17:54.000000000 +0000 @@ -2548,6 +2548,7 @@ static int fib_route_seq_show(struct seq || fa->fa_type == RTN_MULTICAST) continue; @@ -24441,9 +24453,9 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/fib_trie.c linux-3.9.4-vs2.3.6.2/net/ if (fi) seq_printf(seq, "%s\t%08X\t%08X\t%04X\t%d\t%u\t" -diff -NurpP --minimal linux-3.9.4/net/ipv4/inet_connection_sock.c linux-3.9.4-vs2.3.6.2/net/ipv4/inet_connection_sock.c +diff -NurpP --minimal linux-3.9.4/net/ipv4/inet_connection_sock.c linux-3.9.4-vs2.3.6.3/net/ipv4/inet_connection_sock.c --- linux-3.9.4/net/ipv4/inet_connection_sock.c 2013-05-31 13:45:32.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/net/ipv4/inet_connection_sock.c 2013-05-31 18:29:56.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/net/ipv4/inet_connection_sock.c 2013-05-31 18:29:56.000000000 +0000 @@ -53,6 +53,37 @@ void inet_get_local_port_range(int *low, } EXPORT_SYMBOL(inet_get_local_port_range); @@ -24502,9 +24514,9 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/inet_connection_sock.c linux-3.9.4-vs break; } } -diff -NurpP --minimal linux-3.9.4/net/ipv4/inet_diag.c linux-3.9.4-vs2.3.6.2/net/ipv4/inet_diag.c +diff -NurpP --minimal linux-3.9.4/net/ipv4/inet_diag.c linux-3.9.4-vs2.3.6.3/net/ipv4/inet_diag.c --- linux-3.9.4/net/ipv4/inet_diag.c 2013-02-19 13:58:58.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/net/ipv4/inet_diag.c 2013-05-31 17:17:54.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/net/ipv4/inet_diag.c 2013-05-31 17:17:54.000000000 +0000 @@ -31,6 +31,8 @@ #include @@ -24616,9 +24628,9 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/inet_diag.c linux-3.9.4-vs2.3.6.2/net if (num < s_num) goto next_dying; if (r->sdiag_family != AF_UNSPEC && -diff -NurpP --minimal linux-3.9.4/net/ipv4/inet_hashtables.c linux-3.9.4-vs2.3.6.2/net/ipv4/inet_hashtables.c +diff -NurpP --minimal linux-3.9.4/net/ipv4/inet_hashtables.c linux-3.9.4-vs2.3.6.3/net/ipv4/inet_hashtables.c --- linux-3.9.4/net/ipv4/inet_hashtables.c 2013-05-31 13:45:32.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/net/ipv4/inet_hashtables.c 2013-05-31 18:20:50.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/net/ipv4/inet_hashtables.c 2013-05-31 18:20:50.000000000 +0000 @@ -22,6 +22,7 @@ #include #include @@ -24655,9 +24667,9 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/inet_hashtables.c linux-3.9.4-vs2.3.6 /* * if the nulls value we got at the end of this lookup is * not the expected one, we must restart lookup. -diff -NurpP --minimal linux-3.9.4/net/ipv4/netfilter.c linux-3.9.4-vs2.3.6.2/net/ipv4/netfilter.c +diff -NurpP --minimal linux-3.9.4/net/ipv4/netfilter.c linux-3.9.4-vs2.3.6.3/net/ipv4/netfilter.c --- linux-3.9.4/net/ipv4/netfilter.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/net/ipv4/netfilter.c 2013-05-31 17:17:54.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/net/ipv4/netfilter.c 2013-05-31 17:17:54.000000000 +0000 @@ -6,7 +6,7 @@ #include #include @@ -24667,9 +24679,9 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/netfilter.c linux-3.9.4-vs2.3.6.2/net #include #include #include -diff -NurpP --minimal linux-3.9.4/net/ipv4/raw.c linux-3.9.4-vs2.3.6.2/net/ipv4/raw.c +diff -NurpP --minimal linux-3.9.4/net/ipv4/raw.c linux-3.9.4-vs2.3.6.3/net/ipv4/raw.c --- linux-3.9.4/net/ipv4/raw.c 2013-05-31 13:45:32.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/net/ipv4/raw.c 2013-05-31 18:19:38.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/net/ipv4/raw.c 2013-05-31 18:19:38.000000000 +0000 @@ -116,7 +116,7 @@ static struct sock *__raw_v4_lookup(stru if (net_eq(sock_net(sk), net) && inet->inet_num == num && @@ -24762,9 +24774,9 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/raw.c linux-3.9.4-vs2.3.6.2/net/ipv4/ if (!sk && ++state->bucket < RAW_HTABLE_SIZE) { sk = sk_head(&state->h->ht[state->bucket]); -diff -NurpP --minimal linux-3.9.4/net/ipv4/route.c linux-3.9.4-vs2.3.6.2/net/ipv4/route.c +diff -NurpP --minimal linux-3.9.4/net/ipv4/route.c linux-3.9.4-vs2.3.6.3/net/ipv4/route.c --- linux-3.9.4/net/ipv4/route.c 2013-05-31 13:45:32.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/net/ipv4/route.c 2013-05-31 17:17:54.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/net/ipv4/route.c 2013-05-31 17:17:54.000000000 +0000 @@ -1998,7 +1998,7 @@ struct rtable *__ip_route_output_key(str @@ -24774,9 +24786,9 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/route.c linux-3.9.4-vs2.3.6.2/net/ipv rth = ERR_PTR(-ENODEV); if (dev_out == NULL) goto out; -diff -NurpP --minimal linux-3.9.4/net/ipv4/tcp.c linux-3.9.4-vs2.3.6.2/net/ipv4/tcp.c +diff -NurpP --minimal linux-3.9.4/net/ipv4/tcp.c linux-3.9.4-vs2.3.6.3/net/ipv4/tcp.c --- linux-3.9.4/net/ipv4/tcp.c 2013-05-31 13:45:32.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/net/ipv4/tcp.c 2013-05-31 17:17:54.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/net/ipv4/tcp.c 2013-05-31 17:17:54.000000000 +0000 @@ -268,6 +268,7 @@ #include #include @@ -24785,9 +24797,9 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/tcp.c linux-3.9.4-vs2.3.6.2/net/ipv4/ #include #include -diff -NurpP --minimal linux-3.9.4/net/ipv4/tcp_ipv4.c linux-3.9.4-vs2.3.6.2/net/ipv4/tcp_ipv4.c +diff -NurpP --minimal linux-3.9.4/net/ipv4/tcp_ipv4.c linux-3.9.4-vs2.3.6.3/net/ipv4/tcp_ipv4.c --- linux-3.9.4/net/ipv4/tcp_ipv4.c 2013-05-31 13:45:32.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/net/ipv4/tcp_ipv4.c 2013-05-31 17:17:54.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/net/ipv4/tcp_ipv4.c 2013-05-31 17:17:54.000000000 +0000 @@ -2260,6 +2260,12 @@ static void *listening_get_next(struct s req = req->dl_next; while (1) { @@ -24893,9 +24905,9 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/tcp_ipv4.c linux-3.9.4-vs2.3.6.2/net/ destp = ntohs(tw->tw_dport); srcp = ntohs(tw->tw_sport); -diff -NurpP --minimal linux-3.9.4/net/ipv4/tcp_minisocks.c linux-3.9.4-vs2.3.6.2/net/ipv4/tcp_minisocks.c +diff -NurpP --minimal linux-3.9.4/net/ipv4/tcp_minisocks.c linux-3.9.4-vs2.3.6.3/net/ipv4/tcp_minisocks.c --- linux-3.9.4/net/ipv4/tcp_minisocks.c 2013-05-31 14:22:27.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/net/ipv4/tcp_minisocks.c 2013-05-31 17:17:54.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/net/ipv4/tcp_minisocks.c 2013-05-31 17:17:54.000000000 +0000 @@ -23,6 +23,9 @@ #include #include @@ -24918,9 +24930,9 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/tcp_minisocks.c linux-3.9.4-vs2.3.6.2 #if IS_ENABLED(CONFIG_IPV6) if (tw->tw_family == PF_INET6) { struct ipv6_pinfo *np = inet6_sk(sk); -diff -NurpP --minimal linux-3.9.4/net/ipv4/udp.c linux-3.9.4-vs2.3.6.2/net/ipv4/udp.c +diff -NurpP --minimal linux-3.9.4/net/ipv4/udp.c linux-3.9.4-vs2.3.6.3/net/ipv4/udp.c --- linux-3.9.4/net/ipv4/udp.c 2013-05-31 13:45:32.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/net/ipv4/udp.c 2013-05-31 18:26:00.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/net/ipv4/udp.c 2013-05-31 18:26:00.000000000 +0000 @@ -306,14 +306,7 @@ fail: } EXPORT_SYMBOL(udp_lib_get_port); @@ -25053,9 +25065,9 @@ diff -NurpP --minimal linux-3.9.4/net/ipv4/udp.c linux-3.9.4-vs2.3.6.2/net/ipv4/ __u16 destp = ntohs(inet->inet_dport); __u16 srcp = ntohs(inet->inet_sport); -diff -NurpP --minimal linux-3.9.4/net/ipv6/Kconfig linux-3.9.4-vs2.3.6.2/net/ipv6/Kconfig +diff -NurpP --minimal linux-3.9.4/net/ipv6/Kconfig linux-3.9.4-vs2.3.6.3/net/ipv6/Kconfig --- linux-3.9.4/net/ipv6/Kconfig 2013-05-31 13:45:32.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/net/ipv6/Kconfig 2013-05-31 17:17:54.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/net/ipv6/Kconfig 2013-05-31 17:17:54.000000000 +0000 @@ -4,8 +4,8 @@ # IPv6 as module will cause a CRASH if you try to unload it @@ -25067,9 +25079,9 @@ diff -NurpP --minimal linux-3.9.4/net/ipv6/Kconfig linux-3.9.4-vs2.3.6.2/net/ipv ---help--- This is complemental support for the IP version 6. You will still be able to do traditional IPv4 networking as well. -diff -NurpP --minimal linux-3.9.4/net/ipv6/addrconf.c linux-3.9.4-vs2.3.6.2/net/ipv6/addrconf.c +diff -NurpP --minimal linux-3.9.4/net/ipv6/addrconf.c linux-3.9.4-vs2.3.6.3/net/ipv6/addrconf.c --- linux-3.9.4/net/ipv6/addrconf.c 2013-05-31 13:45:32.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/net/ipv6/addrconf.c 2013-05-31 20:07:39.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/net/ipv6/addrconf.c 2013-05-31 20:07:39.000000000 +0000 @@ -93,6 +93,8 @@ #include #include @@ -25176,9 +25188,9 @@ diff -NurpP --minimal linux-3.9.4/net/ipv6/addrconf.c linux-3.9.4-vs2.3.6.2/net/ idev = __in6_dev_get(dev); if (!idev) goto cont; -diff -NurpP --minimal linux-3.9.4/net/ipv6/af_inet6.c linux-3.9.4-vs2.3.6.2/net/ipv6/af_inet6.c +diff -NurpP --minimal linux-3.9.4/net/ipv6/af_inet6.c linux-3.9.4-vs2.3.6.3/net/ipv6/af_inet6.c --- linux-3.9.4/net/ipv6/af_inet6.c 2013-05-31 13:45:32.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/net/ipv6/af_inet6.c 2013-05-31 20:04:41.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/net/ipv6/af_inet6.c 2013-05-31 20:04:41.000000000 +0000 @@ -43,6 +43,8 @@ #include #include @@ -25275,9 +25287,9 @@ diff -NurpP --minimal linux-3.9.4/net/ipv6/af_inet6.c linux-3.9.4-vs2.3.6.2/net/ if (ipv6_addr_any(&np->rcv_saddr)) sin->sin6_addr = np->saddr; else -diff -NurpP --minimal linux-3.9.4/net/ipv6/datagram.c linux-3.9.4-vs2.3.6.2/net/ipv6/datagram.c +diff -NurpP --minimal linux-3.9.4/net/ipv6/datagram.c linux-3.9.4-vs2.3.6.3/net/ipv6/datagram.c --- linux-3.9.4/net/ipv6/datagram.c 2013-05-31 13:45:32.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/net/ipv6/datagram.c 2013-05-31 17:17:54.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/net/ipv6/datagram.c 2013-05-31 17:17:54.000000000 +0000 @@ -648,7 +648,7 @@ int ip6_datagram_send_ctl(struct net *ne rcu_read_lock(); @@ -25287,9 +25299,9 @@ diff -NurpP --minimal linux-3.9.4/net/ipv6/datagram.c linux-3.9.4-vs2.3.6.2/net/ if (!dev) { rcu_read_unlock(); return -ENODEV; -diff -NurpP --minimal linux-3.9.4/net/ipv6/fib6_rules.c linux-3.9.4-vs2.3.6.2/net/ipv6/fib6_rules.c +diff -NurpP --minimal linux-3.9.4/net/ipv6/fib6_rules.c linux-3.9.4-vs2.3.6.3/net/ipv6/fib6_rules.c --- linux-3.9.4/net/ipv6/fib6_rules.c 2013-02-19 13:58:58.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/net/ipv6/fib6_rules.c 2013-05-31 17:17:54.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/net/ipv6/fib6_rules.c 2013-05-31 17:17:54.000000000 +0000 @@ -90,7 +90,7 @@ static int fib6_rule_action(struct fib_r ip6_dst_idev(&rt->dst)->dev, &flp6->daddr, @@ -25299,9 +25311,9 @@ diff -NurpP --minimal linux-3.9.4/net/ipv6/fib6_rules.c linux-3.9.4-vs2.3.6.2/ne goto again; if (!ipv6_prefix_equal(&saddr, &r->src.addr, r->src.plen)) -diff -NurpP --minimal linux-3.9.4/net/ipv6/inet6_hashtables.c linux-3.9.4-vs2.3.6.2/net/ipv6/inet6_hashtables.c +diff -NurpP --minimal linux-3.9.4/net/ipv6/inet6_hashtables.c linux-3.9.4-vs2.3.6.3/net/ipv6/inet6_hashtables.c --- linux-3.9.4/net/ipv6/inet6_hashtables.c 2013-05-31 13:45:32.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/net/ipv6/inet6_hashtables.c 2013-05-31 17:17:54.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/net/ipv6/inet6_hashtables.c 2013-05-31 17:17:54.000000000 +0000 @@ -16,6 +16,7 @@ #include @@ -25337,9 +25349,9 @@ diff -NurpP --minimal linux-3.9.4/net/ipv6/inet6_hashtables.c linux-3.9.4-vs2.3. } if (sk->sk_bound_dev_if) { if (sk->sk_bound_dev_if != dif) -diff -NurpP --minimal linux-3.9.4/net/ipv6/ip6_output.c linux-3.9.4-vs2.3.6.2/net/ipv6/ip6_output.c +diff -NurpP --minimal linux-3.9.4/net/ipv6/ip6_output.c linux-3.9.4-vs2.3.6.3/net/ipv6/ip6_output.c --- linux-3.9.4/net/ipv6/ip6_output.c 2013-05-31 13:45:32.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/net/ipv6/ip6_output.c 2013-05-31 17:17:54.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/net/ipv6/ip6_output.c 2013-05-31 17:17:54.000000000 +0000 @@ -877,7 +877,8 @@ static int ip6_dst_lookup_tail(struct so struct rt6_info *rt = (struct rt6_info *) *dst; err = ip6_route_get_saddr(net, rt, &fl6->daddr, @@ -25350,9 +25362,9 @@ diff -NurpP --minimal linux-3.9.4/net/ipv6/ip6_output.c linux-3.9.4-vs2.3.6.2/ne if (err) goto out_err_release; } -diff -NurpP --minimal linux-3.9.4/net/ipv6/ndisc.c linux-3.9.4-vs2.3.6.2/net/ipv6/ndisc.c +diff -NurpP --minimal linux-3.9.4/net/ipv6/ndisc.c linux-3.9.4-vs2.3.6.3/net/ipv6/ndisc.c --- linux-3.9.4/net/ipv6/ndisc.c 2013-05-31 13:45:32.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/net/ipv6/ndisc.c 2013-05-31 17:17:54.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/net/ipv6/ndisc.c 2013-05-31 17:17:54.000000000 +0000 @@ -485,7 +485,7 @@ static void ndisc_send_na(struct net_dev } else { if (ipv6_dev_get_saddr(dev_net(dev), dev, daddr, @@ -25362,9 +25374,9 @@ diff -NurpP --minimal linux-3.9.4/net/ipv6/ndisc.c linux-3.9.4-vs2.3.6.2/net/ipv return; src_addr = &tmpaddr; } -diff -NurpP --minimal linux-3.9.4/net/ipv6/netfilter/ip6t_MASQUERADE.c linux-3.9.4-vs2.3.6.2/net/ipv6/netfilter/ip6t_MASQUERADE.c +diff -NurpP --minimal linux-3.9.4/net/ipv6/netfilter/ip6t_MASQUERADE.c linux-3.9.4-vs2.3.6.3/net/ipv6/netfilter/ip6t_MASQUERADE.c --- linux-3.9.4/net/ipv6/netfilter/ip6t_MASQUERADE.c 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/net/ipv6/netfilter/ip6t_MASQUERADE.c 2013-05-31 17:17:54.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/net/ipv6/netfilter/ip6t_MASQUERADE.c 2013-05-31 17:17:54.000000000 +0000 @@ -34,7 +34,7 @@ masquerade_tg6(struct sk_buff *skb, cons ctinfo == IP_CT_RELATED_REPLY)); @@ -25374,9 +25386,9 @@ diff -NurpP --minimal linux-3.9.4/net/ipv6/netfilter/ip6t_MASQUERADE.c linux-3.9 return NF_DROP; nfct_nat(ct)->masq_index = par->out->ifindex; -diff -NurpP --minimal linux-3.9.4/net/ipv6/raw.c linux-3.9.4-vs2.3.6.2/net/ipv6/raw.c +diff -NurpP --minimal linux-3.9.4/net/ipv6/raw.c linux-3.9.4-vs2.3.6.3/net/ipv6/raw.c --- linux-3.9.4/net/ipv6/raw.c 2013-05-31 13:45:32.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/net/ipv6/raw.c 2013-05-31 17:17:54.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/net/ipv6/raw.c 2013-05-31 17:17:54.000000000 +0000 @@ -30,6 +30,7 @@ #include #include @@ -25399,9 +25411,9 @@ diff -NurpP --minimal linux-3.9.4/net/ipv6/raw.c linux-3.9.4-vs2.3.6.2/net/ipv6/ /* ipv4 addr of the socket is invalid. Only the * unspecified and mapped address have a v4 equivalent. */ -diff -NurpP --minimal linux-3.9.4/net/ipv6/route.c linux-3.9.4-vs2.3.6.2/net/ipv6/route.c +diff -NurpP --minimal linux-3.9.4/net/ipv6/route.c linux-3.9.4-vs2.3.6.3/net/ipv6/route.c --- linux-3.9.4/net/ipv6/route.c 2013-05-31 13:45:32.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/net/ipv6/route.c 2013-05-31 18:10:38.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/net/ipv6/route.c 2013-05-31 18:10:38.000000000 +0000 @@ -58,6 +58,7 @@ #include #include @@ -25449,9 +25461,9 @@ diff -NurpP --minimal linux-3.9.4/net/ipv6/route.c linux-3.9.4-vs2.3.6.2/net/ipv seq_printf(m, "%pi6 %02x ", &rt->rt6i_dst.addr, rt->rt6i_dst.plen); #ifdef CONFIG_IPV6_SUBTREES -diff -NurpP --minimal linux-3.9.4/net/ipv6/tcp_ipv6.c linux-3.9.4-vs2.3.6.2/net/ipv6/tcp_ipv6.c +diff -NurpP --minimal linux-3.9.4/net/ipv6/tcp_ipv6.c linux-3.9.4-vs2.3.6.3/net/ipv6/tcp_ipv6.c --- linux-3.9.4/net/ipv6/tcp_ipv6.c 2013-05-31 14:22:27.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/net/ipv6/tcp_ipv6.c 2013-05-31 17:17:54.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/net/ipv6/tcp_ipv6.c 2013-05-31 17:17:54.000000000 +0000 @@ -71,6 +71,7 @@ #include @@ -25478,9 +25490,9 @@ diff -NurpP --minimal linux-3.9.4/net/ipv6/tcp_ipv6.c linux-3.9.4-vs2.3.6.2/net/ addr_type = ipv6_addr_type(&usin->sin6_addr); -diff -NurpP --minimal linux-3.9.4/net/ipv6/udp.c linux-3.9.4-vs2.3.6.2/net/ipv6/udp.c +diff -NurpP --minimal linux-3.9.4/net/ipv6/udp.c linux-3.9.4-vs2.3.6.3/net/ipv6/udp.c --- linux-3.9.4/net/ipv6/udp.c 2013-05-31 14:22:27.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/net/ipv6/udp.c 2013-05-31 18:16:01.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/net/ipv6/udp.c 2013-05-31 18:16:01.000000000 +0000 @@ -46,42 +46,68 @@ #include #include @@ -25574,9 +25586,9 @@ diff -NurpP --minimal linux-3.9.4/net/ipv6/udp.c linux-3.9.4-vs2.3.6.2/net/ipv6/ } if (!ipv6_addr_any(&np->daddr)) { if (!ipv6_addr_equal(&np->daddr, saddr)) -diff -NurpP --minimal linux-3.9.4/net/ipv6/xfrm6_policy.c linux-3.9.4-vs2.3.6.2/net/ipv6/xfrm6_policy.c +diff -NurpP --minimal linux-3.9.4/net/ipv6/xfrm6_policy.c linux-3.9.4-vs2.3.6.3/net/ipv6/xfrm6_policy.c --- linux-3.9.4/net/ipv6/xfrm6_policy.c 2013-05-31 14:22:27.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/net/ipv6/xfrm6_policy.c 2013-05-31 17:17:54.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/net/ipv6/xfrm6_policy.c 2013-05-31 17:17:54.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, @@ -25586,9 +25598,9 @@ diff -NurpP --minimal linux-3.9.4/net/ipv6/xfrm6_policy.c linux-3.9.4-vs2.3.6.2/ dst_release(dst); return 0; } -diff -NurpP --minimal linux-3.9.4/net/netfilter/ipvs/ip_vs_xmit.c linux-3.9.4-vs2.3.6.2/net/netfilter/ipvs/ip_vs_xmit.c +diff -NurpP --minimal linux-3.9.4/net/netfilter/ipvs/ip_vs_xmit.c linux-3.9.4-vs2.3.6.3/net/netfilter/ipvs/ip_vs_xmit.c --- linux-3.9.4/net/netfilter/ipvs/ip_vs_xmit.c 2013-02-19 13:58:59.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/net/netfilter/ipvs/ip_vs_xmit.c 2013-05-31 17:17:54.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/net/netfilter/ipvs/ip_vs_xmit.c 2013-05-31 17:17:54.000000000 +0000 @@ -273,7 +273,7 @@ __ip_vs_route_output_v6(struct net *net, return dst; if (ipv6_addr_any(&fl6.saddr) && @@ -25598,9 +25610,9 @@ diff -NurpP --minimal linux-3.9.4/net/netfilter/ipvs/ip_vs_xmit.c linux-3.9.4-vs goto out_err; if (do_xfrm) { dst = xfrm_lookup(net, dst, flowi6_to_flowi(&fl6), NULL, 0); -diff -NurpP --minimal linux-3.9.4/net/netlink/af_netlink.c linux-3.9.4-vs2.3.6.2/net/netlink/af_netlink.c +diff -NurpP --minimal linux-3.9.4/net/netlink/af_netlink.c linux-3.9.4-vs2.3.6.3/net/netlink/af_netlink.c --- linux-3.9.4/net/netlink/af_netlink.c 2013-05-31 13:45:33.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/net/netlink/af_netlink.c 2013-05-31 17:17:54.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/net/netlink/af_netlink.c 2013-05-31 17:17:54.000000000 +0000 @@ -55,6 +55,9 @@ #include #include @@ -25640,9 +25652,9 @@ diff -NurpP --minimal linux-3.9.4/net/netlink/af_netlink.c linux-3.9.4-vs2.3.6.2 s = sk_next(s); if (s) { iter->link = i; -diff -NurpP --minimal linux-3.9.4/net/socket.c linux-3.9.4-vs2.3.6.2/net/socket.c +diff -NurpP --minimal linux-3.9.4/net/socket.c linux-3.9.4-vs2.3.6.3/net/socket.c --- linux-3.9.4/net/socket.c 2013-05-31 13:45:33.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/net/socket.c 2013-05-31 17:17:54.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/net/socket.c 2013-05-31 17:17:54.000000000 +0000 @@ -98,6 +98,10 @@ #include @@ -25748,9 +25760,9 @@ diff -NurpP --minimal linux-3.9.4/net/socket.c linux-3.9.4-vs2.3.6.2/net/socket. err = sock1->ops->socketpair(sock1, sock2); if (err < 0) -diff -NurpP --minimal linux-3.9.4/net/sunrpc/auth.c linux-3.9.4-vs2.3.6.2/net/sunrpc/auth.c +diff -NurpP --minimal linux-3.9.4/net/sunrpc/auth.c linux-3.9.4-vs2.3.6.3/net/sunrpc/auth.c --- linux-3.9.4/net/sunrpc/auth.c 2013-05-31 13:45:33.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/net/sunrpc/auth.c 2013-05-31 18:01:00.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/net/sunrpc/auth.c 2013-06-03 20:11:37.000000000 +0000 @@ -15,6 +15,7 @@ #include #include @@ -25763,7 +25775,7 @@ diff -NurpP --minimal linux-3.9.4/net/sunrpc/auth.c linux-3.9.4-vs2.3.6.2/net/su 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); @@ -25771,13 +25783,13 @@ diff -NurpP --minimal linux-3.9.4/net/sunrpc/auth.c linux-3.9.4-vs2.3.6.2/net/su struct auth_cred acred = { .uid = GLOBAL_ROOT_UID, .gid = GLOBAL_ROOT_GID, -+ .tag = dx_current_tag(), ++ .tag = KTAGT_INIT(dx_current_tag()), }; dprintk("RPC: %5u looking up %s cred\n", -diff -NurpP --minimal linux-3.9.4/net/sunrpc/auth_unix.c linux-3.9.4-vs2.3.6.2/net/sunrpc/auth_unix.c +diff -NurpP --minimal linux-3.9.4/net/sunrpc/auth_unix.c linux-3.9.4-vs2.3.6.3/net/sunrpc/auth_unix.c --- linux-3.9.4/net/sunrpc/auth_unix.c 2013-05-31 13:45:33.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/net/sunrpc/auth_unix.c 2013-05-31 18:05:54.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/net/sunrpc/auth_unix.c 2013-06-03 19:35:29.000000000 +0000 @@ -13,11 +13,13 @@ #include #include @@ -25820,25 +25832,23 @@ diff -NurpP --minimal linux-3.9.4/net/sunrpc/auth_unix.c linux-3.9.4-vs2.3.6.2/n *p++ = htonl(RPC_AUTH_UNIX); base = p++; -@@ -157,8 +162,13 @@ unx_marshal(struct rpc_task *task, __be3 +@@ -157,8 +162,11 @@ unx_marshal(struct rpc_task *task, __be3 */ p = xdr_encode_array(p, clnt->cl_nodename, clnt->cl_nodelen); - *p++ = htonl((u32) from_kuid(&init_user_ns, cred->uc_uid)); - *p++ = htonl((u32) from_kgid(&init_user_ns, cred->uc_gid)); + tag = task->tk_client->cl_tag; -+ *p++ = htonl((u32) TAGINO_UID(tag, -+ from_kuid(&init_user_ns, cred->uc_uid), -+ from_ktag(&init_user_ns, cred->uc_tag))); -+ *p++ = htonl((u32) TAGINO_GID(tag, -+ from_kgid(&init_user_ns, cred->uc_gid), -+ from_ktag(&init_user_ns, cred->uc_tag))); ++ *p++ = htonl((u32) from_kuid(&init_user_ns, ++ TAGINO_KUID(tag, cred->uc_uid, cred->uc_tag))); ++ *p++ = htonl((u32) from_kgid(&init_user_ns, ++ TAGINO_KGID(tag, cred->uc_gid, cred->uc_tag))); hold = p++; for (i = 0; i < 16 && gid_valid(cred->uc_gids[i]); i++) *p++ = htonl((u32) from_kgid(&init_user_ns, cred->uc_gids[i])); -diff -NurpP --minimal linux-3.9.4/net/sunrpc/clnt.c linux-3.9.4-vs2.3.6.2/net/sunrpc/clnt.c +diff -NurpP --minimal linux-3.9.4/net/sunrpc/clnt.c linux-3.9.4-vs2.3.6.3/net/sunrpc/clnt.c --- linux-3.9.4/net/sunrpc/clnt.c 2013-05-31 13:45:33.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/net/sunrpc/clnt.c 2013-05-31 17:17:54.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/net/sunrpc/clnt.c 2013-05-31 17:17:54.000000000 +0000 @@ -31,6 +31,7 @@ #include #include @@ -25857,9 +25867,9 @@ diff -NurpP --minimal linux-3.9.4/net/sunrpc/clnt.c linux-3.9.4-vs2.3.6.2/net/su return clnt; } EXPORT_SYMBOL_GPL(rpc_create); -diff -NurpP --minimal linux-3.9.4/net/unix/af_unix.c linux-3.9.4-vs2.3.6.2/net/unix/af_unix.c +diff -NurpP --minimal linux-3.9.4/net/unix/af_unix.c linux-3.9.4-vs2.3.6.3/net/unix/af_unix.c --- linux-3.9.4/net/unix/af_unix.c 2013-05-31 13:45:33.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/net/unix/af_unix.c 2013-05-31 17:17:54.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/net/unix/af_unix.c 2013-05-31 17:17:54.000000000 +0000 @@ -114,6 +114,8 @@ #include #include @@ -25896,9 +25906,9 @@ diff -NurpP --minimal linux-3.9.4/net/unix/af_unix.c linux-3.9.4-vs2.3.6.2/net/u if (sock_net(sk) == seq_file_net(seq)) return sk; } -diff -NurpP --minimal linux-3.9.4/scripts/checksyscalls.sh linux-3.9.4-vs2.3.6.2/scripts/checksyscalls.sh +diff -NurpP --minimal linux-3.9.4/scripts/checksyscalls.sh linux-3.9.4-vs2.3.6.3/scripts/checksyscalls.sh --- linux-3.9.4/scripts/checksyscalls.sh 2012-12-11 03:30:57.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/scripts/checksyscalls.sh 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/scripts/checksyscalls.sh 2013-05-31 14:47:11.000000000 +0000 @@ -193,7 +193,6 @@ cat << EOF #define __IGNORE_afs_syscall #define __IGNORE_getpmsg @@ -25907,9 +25917,9 @@ diff -NurpP --minimal linux-3.9.4/scripts/checksyscalls.sh linux-3.9.4-vs2.3.6.2 EOF } -diff -NurpP --minimal linux-3.9.4/security/commoncap.c linux-3.9.4-vs2.3.6.2/security/commoncap.c +diff -NurpP --minimal linux-3.9.4/security/commoncap.c linux-3.9.4-vs2.3.6.3/security/commoncap.c --- linux-3.9.4/security/commoncap.c 2013-05-31 13:45:34.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/security/commoncap.c 2013-05-31 15:07:02.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/security/commoncap.c 2013-05-31 15:07:02.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) @@ -25951,9 +25961,9 @@ diff -NurpP --minimal linux-3.9.4/security/commoncap.c linux-3.9.4-vs2.3.6.2/sec return -EPERM; return 0; } -diff -NurpP --minimal linux-3.9.4/security/selinux/hooks.c linux-3.9.4-vs2.3.6.2/security/selinux/hooks.c +diff -NurpP --minimal linux-3.9.4/security/selinux/hooks.c linux-3.9.4-vs2.3.6.3/security/selinux/hooks.c --- linux-3.9.4/security/selinux/hooks.c 2013-05-31 13:45:34.000000000 +0000 -+++ linux-3.9.4-vs2.3.6.2/security/selinux/hooks.c 2013-05-31 14:47:11.000000000 +0000 ++++ linux-3.9.4-vs2.3.6.3/security/selinux/hooks.c 2013-05-31 14:47:11.000000000 +0000 @@ -67,7 +67,6 @@ #include #include diff --git a/kernel.spec b/kernel.spec index 15a4087b..ba73b313 100644 --- a/kernel.spec +++ b/kernel.spec @@ -66,7 +66,7 @@ %define have_pcmcia 0 %endif -%define rel 2 +%define rel 3 %define basever 3.9 %define postver .4 @@ -184,7 +184,7 @@ Patch59: kernel-rndis_host-wm5.patch # http://patches.aircrack-ng.org/hostap-kernel-2.6.18.patch Patch85: kernel-hostap.patch -# http://vserver.13thfloor.at/Experimental/patch-3.9.4-vs2.3.6.2.diff +# http://vserver.13thfloor.at/Experimental/patch-3.9.4-vs2.3.6.3.diff # note there are additional patches from above url: # - *fix* are real fixes (we want these) # - *feat* are new features/tests (we don't want these)