-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.3/Documentation/vserver/debug.txt 2013-05-31 14:47:10.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/Documentation/vserver/debug.txt linux-3.9.5-vs2.3.6.5/Documentation/vserver/debug.txt
+--- linux-3.9.5/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/Documentation/vserver/debug.txt 2013-05-31 14:47:10.000000000 +0000
@@ -0,0 +1,154 @@
+
+debug_cvirt:
+ m 2^m "vx_acc_page[%5d,%s,%2d]: %5d%s"
+ "vx_acc_pages[%5d,%s,%2d]: %5d += %5d"
+ "vx_pages_avail[%5d,%s,%2d]: %5ld > %5d + %5d"
-diff -NurpP --minimal linux-3.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.3/arch/alpha/Kconfig 2013-05-31 14:47:10.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/arch/alpha/Kconfig linux-3.9.5-vs2.3.6.5/arch/alpha/Kconfig
+--- linux-3.9.5/arch/alpha/Kconfig 2013-05-31 13:44:28.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/arch/alpha/Kconfig 2013-05-31 14:47:10.000000000 +0000
@@ -669,6 +669,8 @@ config DUMMY_CONSOLE
depends on VGA_HOSE
default y
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.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.3/arch/alpha/kernel/systbls.S 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/arch/alpha/kernel/systbls.S linux-3.9.5-vs2.3.6.5/arch/alpha/kernel/systbls.S
+--- linux-3.9.5/arch/alpha/kernel/systbls.S 2013-02-19 13:56:11.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
.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.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.3/arch/alpha/kernel/traps.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/arch/alpha/kernel/traps.c linux-3.9.5-vs2.3.6.5/arch/alpha/kernel/traps.c
+--- linux-3.9.5/arch/alpha/kernel/traps.c 2013-05-31 13:44:28.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/arch/alpha/kernel/traps.c 2013-06-12 09:32:34.000000000 +0000
@@ -184,7 +184,8 @@ die_if_kernel(char * str, struct pt_regs
#ifdef CONFIG_SMP
printk("CPU %d ", hard_smp_processor_id());
#endif
- printk("%s(%d): %s %ld\n", current->comm, task_pid_nr(current), str, err);
-+ printk("%s(%d[#%u]): %s %ld\n", current->comm,
++ printk("%s(%d:#%u): %s %ld\n", current->comm,
+ task_pid_nr(current), current->xid, str, err);
dik_show_regs(regs, r9_15);
add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE);
dik_show_trace((unsigned long *)(regs+1));
-diff -NurpP --minimal linux-3.9.4/arch/arm/Kconfig linux-3.9.4-vs2.3.6.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.3/arch/arm/Kconfig 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/arch/arm/Kconfig linux-3.9.5-vs2.3.6.5/arch/arm/Kconfig
+--- linux-3.9.5/arch/arm/Kconfig 2013-05-31 13:44:29.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/arch/arm/Kconfig 2013-05-31 14:47:11.000000000 +0000
@@ -2353,6 +2353,8 @@ source "fs/Kconfig"
source "arch/arm/Kconfig.debug"
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.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.3/arch/arm/kernel/calls.S 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/arch/arm/kernel/calls.S linux-3.9.5-vs2.3.6.5/arch/arm/kernel/calls.S
+--- linux-3.9.5/arch/arm/kernel/calls.S 2013-05-31 13:44:29.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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)
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.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.3/arch/arm/kernel/process.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/arch/arm/kernel/process.c linux-3.9.5-vs2.3.6.5/arch/arm/kernel/process.c
+--- linux-3.9.5/arch/arm/kernel/process.c 2013-05-31 13:44:29.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/arch/arm/kernel/process.c 2013-06-12 09:33:04.000000000 +0000
@@ -332,7 +332,8 @@ void __show_regs(struct pt_regs *regs)
void show_regs(struct pt_regs * regs)
{
printk("\n");
- printk("Pid: %d, comm: %20s\n", task_pid_nr(current), current->comm);
-+ printk("Pid: %d[#%u], comm: %20s\n",
++ printk("Pid: %d:#%u, comm: %20s\n",
+ task_pid_nr(current), current->xid, current->comm);
__show_regs(regs);
dump_stack();
}
-diff -NurpP --minimal linux-3.9.4/arch/arm/kernel/traps.c linux-3.9.4-vs2.3.6.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.3/arch/arm/kernel/traps.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/arch/arm/kernel/traps.c linux-3.9.5-vs2.3.6.5/arch/arm/kernel/traps.c
+--- linux-3.9.5/arch/arm/kernel/traps.c 2013-05-31 13:44:29.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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();
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.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.3/arch/cris/Kconfig 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/arch/cris/Kconfig linux-3.9.5-vs2.3.6.5/arch/cris/Kconfig
+--- linux-3.9.5/arch/cris/Kconfig 2013-05-31 13:44:37.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/arch/cris/Kconfig 2013-05-31 14:47:11.000000000 +0000
@@ -674,6 +674,8 @@ source "drivers/staging/Kconfig"
source "arch/cris/Kconfig.debug"
source "security/Kconfig"
source "crypto/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.3/arch/h8300/Kconfig 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/arch/h8300/Kconfig linux-3.9.5-vs2.3.6.5/arch/h8300/Kconfig
+--- linux-3.9.5/arch/h8300/Kconfig 2013-05-31 13:44:38.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/arch/h8300/Kconfig 2013-05-31 14:47:11.000000000 +0000
@@ -221,6 +221,8 @@ source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"
source "security/Kconfig"
source "crypto/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.3/arch/ia64/Kconfig 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/arch/ia64/Kconfig linux-3.9.5-vs2.3.6.5/arch/ia64/Kconfig
+--- linux-3.9.5/arch/ia64/Kconfig 2013-05-31 13:44:38.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/arch/ia64/Kconfig 2013-05-31 14:47:11.000000000 +0000
@@ -645,6 +645,8 @@ source "fs/Kconfig"
source "arch/ia64/Kconfig.debug"
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.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.3/arch/ia64/kernel/entry.S 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/arch/ia64/kernel/entry.S linux-3.9.5-vs2.3.6.5/arch/ia64/kernel/entry.S
+--- linux-3.9.5/arch/ia64/kernel/entry.S 2013-05-31 13:44:38.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
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.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.3/arch/ia64/kernel/process.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/arch/ia64/kernel/process.c linux-3.9.5-vs2.3.6.5/arch/ia64/kernel/process.c
+--- linux-3.9.5/arch/ia64/kernel/process.c 2013-05-31 13:44:38.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/arch/ia64/kernel/process.c 2013-06-12 09:33:32.000000000 +0000
@@ -109,8 +109,8 @@ show_regs (struct pt_regs *regs)
unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri;
print_modules();
- printk("\nPid: %d, CPU %d, comm: %20s\n", task_pid_nr(current),
- smp_processor_id(), current->comm);
-+ printk("\nPid: %d[#%u], CPU %d, comm: %20s\n", task_pid_nr(current),
++ printk("\nPid: %d:#%u, CPU %d, comm: %20s\n", task_pid_nr(current),
+ current->xid, smp_processor_id(), current->comm);
printk("psr : %016lx ifs : %016lx ip : [<%016lx>] %s (%s)\n",
regs->cr_ipsr, regs->cr_ifs, ip, print_tainted(),
init_utsname()->release);
-diff -NurpP --minimal linux-3.9.4/arch/ia64/kernel/ptrace.c linux-3.9.4-vs2.3.6.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.3/arch/ia64/kernel/ptrace.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/arch/ia64/kernel/ptrace.c linux-3.9.5-vs2.3.6.5/arch/ia64/kernel/ptrace.c
+--- linux-3.9.5/arch/ia64/kernel/ptrace.c 2013-02-19 13:56:51.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/arch/ia64/kernel/ptrace.c 2013-05-31 14:47:11.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/regset.h>
#include <linux/elf.h>
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-3.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.3/arch/ia64/kernel/traps.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/arch/ia64/kernel/traps.c linux-3.9.5-vs2.3.6.5/arch/ia64/kernel/traps.c
+--- linux-3.9.5/arch/ia64/kernel/traps.c 2013-05-31 13:44:38.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/arch/ia64/kernel/traps.c 2013-06-12 09:33:50.000000000 +0000
@@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re
put_cpu();
if (++die.lock_owner_depth < 3) {
- printk("%s[%d]: %s %ld [%d]\n",
- current->comm, task_pid_nr(current), str, err, ++die_counter);
-+ printk("%s[%d[#%u]]: %s %ld [%d]\n",
++ printk("%s[%d:#%u]: %s %ld [%d]\n",
+ current->comm, task_pid_nr(current), current->xid,
+ str, err, ++die_counter);
if (notify_die(DIE_OOPS, str, regs, err, 255, SIGSEGV)
printk(KERN_WARNING
- "%s(%d): floating-point assist fault at ip %016lx, isr %016lx\n",
- current->comm, task_pid_nr(current), regs->cr_iip + ia64_psr(regs)->ri, isr);
-+ "%s(%d[#%u]): floating-point assist fault at ip %016lx, isr %016lx\n",
++ "%s(%d:#%u): floating-point assist fault at ip %016lx, isr %016lx\n",
+ current->comm, task_pid_nr(current), current->xid,
+ regs->cr_iip + ia64_psr(regs)->ri, isr);
}
}
}
-diff -NurpP --minimal linux-3.9.4/arch/m32r/kernel/traps.c linux-3.9.4-vs2.3.6.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.3/arch/m32r/kernel/traps.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/arch/m32r/kernel/traps.c linux-3.9.5-vs2.3.6.5/arch/m32r/kernel/traps.c
+--- linux-3.9.5/arch/m32r/kernel/traps.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/arch/m32r/kernel/traps.c 2013-06-12 09:33:58.000000000 +0000
@@ -195,8 +195,9 @@ static void show_registers(struct pt_reg
} else {
printk("SPI: %08lx\n", sp);
}
- printk("Process %s (pid: %d, process nr: %d, stackpage=%08lx)",
- current->comm, task_pid_nr(current), 0xffff & i, 4096+(unsigned long)current);
-+ printk("Process %s (pid: %d[#%u], process nr: %d, stackpage=%08lx)",
++ printk("Process %s (pid: %d:#%u, process nr: %d, stackpage=%08lx)",
+ current->comm, task_pid_nr(current), current->xid,
+ 0xffff & i, 4096+(unsigned long)current);
/*
* When in-kernel, we also print out the stack and code at the
-diff -NurpP --minimal linux-3.9.4/arch/m68k/Kconfig linux-3.9.4-vs2.3.6.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.3/arch/m68k/Kconfig 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/arch/m68k/Kconfig linux-3.9.5-vs2.3.6.5/arch/m68k/Kconfig
+--- linux-3.9.5/arch/m68k/Kconfig 2013-05-31 13:44:38.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/arch/m68k/Kconfig 2013-05-31 14:47:11.000000000 +0000
@@ -137,6 +137,8 @@ source "fs/Kconfig"
source "arch/m68k/Kconfig.debug"
source "security/Kconfig"
source "crypto/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.3/arch/mips/Kconfig 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/arch/mips/Kconfig linux-3.9.5-vs2.3.6.5/arch/mips/Kconfig
+--- linux-3.9.5/arch/mips/Kconfig 2013-05-31 13:44:39.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/arch/mips/Kconfig 2013-05-31 14:47:11.000000000 +0000
@@ -2550,6 +2550,8 @@ source "fs/Kconfig"
source "arch/mips/Kconfig.debug"
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.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.3/arch/mips/kernel/ptrace.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/arch/mips/kernel/ptrace.c linux-3.9.5-vs2.3.6.5/arch/mips/kernel/ptrace.c
+--- linux-3.9.5/arch/mips/kernel/ptrace.c 2013-05-31 13:44:42.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/arch/mips/kernel/ptrace.c 2013-05-31 14:47:11.000000000 +0000
@@ -25,6 +25,7 @@
#include <linux/security.h>
#include <linux/audit.h>
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.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.3/arch/mips/kernel/scall32-o32.S 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/arch/mips/kernel/scall32-o32.S linux-3.9.5-vs2.3.6.5/arch/mips/kernel/scall32-o32.S
+--- linux-3.9.5/arch/mips/kernel/scall32-o32.S 2013-05-31 13:44:42.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/arch/mips/kernel/scall32-o32.S 2013-05-31 14:47:11.000000000 +0000
@@ -512,7 +512,7 @@ einval: li v0, -ENOSYS
sys sys_mq_timedreceive 5
sys sys_mq_notify 2 /* 4275 */
sys sys_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.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.3/arch/mips/kernel/scall64-64.S 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/arch/mips/kernel/scall64-64.S linux-3.9.5-vs2.3.6.5/arch/mips/kernel/scall64-64.S
+--- linux-3.9.5/arch/mips/kernel/scall64-64.S 2013-05-31 13:44:42.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
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.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.3/arch/mips/kernel/scall64-n32.S 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/arch/mips/kernel/scall64-n32.S linux-3.9.5-vs2.3.6.5/arch/mips/kernel/scall64-n32.S
+--- linux-3.9.5/arch/mips/kernel/scall64-n32.S 2013-05-31 13:44:42.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
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.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.3/arch/mips/kernel/scall64-o32.S 2013-05-31 15:07:53.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/arch/mips/kernel/scall64-o32.S linux-3.9.5-vs2.3.6.5/arch/mips/kernel/scall64-o32.S
+--- linux-3.9.5/arch/mips/kernel/scall64-o32.S 2013-05-31 13:44:42.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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 */
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.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.3/arch/mips/kernel/traps.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/arch/mips/kernel/traps.c linux-3.9.5-vs2.3.6.5/arch/mips/kernel/traps.c
+--- linux-3.9.5/arch/mips/kernel/traps.c 2013-05-31 13:44:42.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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);
if (cpu_has_userlocal) {
unsigned long tls;
-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.3/arch/parisc/Kconfig 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/arch/parisc/Kconfig linux-3.9.5-vs2.3.6.5/arch/parisc/Kconfig
+--- linux-3.9.5/arch/parisc/Kconfig 2013-05-31 13:44:44.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/arch/parisc/Kconfig 2013-05-31 14:47:11.000000000 +0000
@@ -308,6 +308,8 @@ source "fs/Kconfig"
source "arch/parisc/Kconfig.debug"
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.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.3/arch/parisc/kernel/syscall_table.S 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/arch/parisc/kernel/syscall_table.S linux-3.9.5-vs2.3.6.5/arch/parisc/kernel/syscall_table.S
+--- linux-3.9.5/arch/parisc/kernel/syscall_table.S 2013-05-31 13:44:44.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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)
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.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.3/arch/parisc/kernel/traps.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/arch/parisc/kernel/traps.c linux-3.9.5-vs2.3.6.5/arch/parisc/kernel/traps.c
+--- linux-3.9.5/arch/parisc/kernel/traps.c 2013-05-31 13:44:44.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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 */
/* 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.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.3/arch/parisc/mm/fault.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/arch/parisc/mm/fault.c linux-3.9.5-vs2.3.6.5/arch/parisc/mm/fault.c
+--- linux-3.9.5/arch/parisc/mm/fault.c 2013-05-31 13:44:44.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/arch/parisc/mm/fault.c 2013-05-31 14:47:11.000000000 +0000
@@ -257,8 +257,9 @@ bad_area:
#ifdef PRINT_USER_FAULTS
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.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.3/arch/powerpc/Kconfig 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/arch/powerpc/Kconfig linux-3.9.5-vs2.3.6.5/arch/powerpc/Kconfig
+--- linux-3.9.5/arch/powerpc/Kconfig 2013-05-31 13:44:44.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/arch/powerpc/Kconfig 2013-05-31 14:47:11.000000000 +0000
@@ -1027,6 +1027,8 @@ source "lib/Kconfig"
source "arch/powerpc/Kconfig.debug"
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.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.3/arch/powerpc/include/uapi/asm/unistd.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/arch/powerpc/include/uapi/asm/unistd.h linux-3.9.5-vs2.3.6.5/arch/powerpc/include/uapi/asm/unistd.h
+--- linux-3.9.5/arch/powerpc/include/uapi/asm/unistd.h 2013-05-31 13:44:44.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/arch/powerpc/include/uapi/asm/unistd.h 2013-05-31 14:47:11.000000000 +0000
@@ -275,7 +275,7 @@
#endif
#define __NR_rtas 255
#define __NR_migrate_pages 258
#define __NR_mbind 259
#define __NR_get_mempolicy 260
-diff -NurpP --minimal linux-3.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.3/arch/powerpc/kernel/process.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/arch/powerpc/kernel/process.c linux-3.9.5-vs2.3.6.5/arch/powerpc/kernel/process.c
+--- linux-3.9.5/arch/powerpc/kernel/process.c 2013-05-31 13:44:44.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/arch/powerpc/kernel/process.c 2013-06-12 09:34:39.000000000 +0000
@@ -850,8 +850,9 @@ void show_regs(struct pt_regs * regs)
#else
printk("DAR: "REG", DSISR: %08lx\n", regs->dar, regs->dsisr);
#endif
- printk("TASK = %p[%d] '%s' THREAD: %p",
- current, task_pid_nr(current), current->comm, task_thread_info(current));
-+ printk("TASK = %p[%d,#%u] '%s' THREAD: %p",
++ printk("TASK = %p[%d:#%u] '%s' THREAD: %p",
+ current, task_pid_nr(current), current->xid,
+ current->comm, task_thread_info(current));
#ifdef CONFIG_SMP
printk(" CPU: %d", raw_smp_processor_id());
-diff -NurpP --minimal linux-3.9.4/arch/powerpc/kernel/traps.c linux-3.9.4-vs2.3.6.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.3/arch/powerpc/kernel/traps.c 2013-05-31 14:47:11.000000000 +0000
-@@ -1167,8 +1167,9 @@ void nonrecoverable_exception(struct pt_
+diff -NurpP --minimal linux-3.9.5/arch/powerpc/kernel/traps.c linux-3.9.5-vs2.3.6.5/arch/powerpc/kernel/traps.c
+--- linux-3.9.5/arch/powerpc/kernel/traps.c 2013-06-11 12:22:35.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/arch/powerpc/kernel/traps.c 2013-06-13 00:14:31.000000000 +0000
+@@ -1196,8 +1196,9 @@ void nonrecoverable_exception(struct pt_
void trace_syscall(struct pt_regs *regs)
{
- printk("Task: %p(%d), PC: %08lX/%08lX, Syscall: %3ld, Result: %s%ld %s\n",
- current, task_pid_nr(current), regs->nip, regs->link, regs->gpr[0],
-+ printk("Task: %p(%d[#%u]), PC: %08lX/%08lX, Syscall: %3ld, Result: %s%ld %s\n",
++ printk("Task: %p(%d:#%u), PC: %08lX/%08lX, Syscall: %3ld, Result: %s%ld %s\n",
+ current, task_pid_nr(current), current->xid,
+ regs->nip, regs->link, regs->gpr[0],
regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted());
}
-diff -NurpP --minimal linux-3.9.4/arch/s390/Kconfig linux-3.9.4-vs2.3.6.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.3/arch/s390/Kconfig 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/arch/s390/Kconfig linux-3.9.5-vs2.3.6.5/arch/s390/Kconfig
+--- linux-3.9.5/arch/s390/Kconfig 2013-05-31 13:44:45.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/arch/s390/Kconfig 2013-05-31 14:47:11.000000000 +0000
@@ -592,6 +592,8 @@ source "fs/Kconfig"
source "arch/s390/Kconfig.debug"
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.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.3/arch/s390/include/asm/tlb.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/arch/s390/include/asm/tlb.h linux-3.9.5-vs2.3.6.5/arch/s390/include/asm/tlb.h
+--- linux-3.9.5/arch/s390/include/asm/tlb.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/arch/s390/include/asm/tlb.h 2013-05-31 14:47:11.000000000 +0000
@@ -24,6 +24,7 @@
#include <linux/mm.h>
#include <linux/pagemap.h>
#include <asm/processor.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-3.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.3/arch/s390/include/uapi/asm/unistd.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/arch/s390/include/uapi/asm/unistd.h linux-3.9.5-vs2.3.6.5/arch/s390/include/uapi/asm/unistd.h
+--- linux-3.9.5/arch/s390/include/uapi/asm/unistd.h 2013-02-19 13:57:16.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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)
#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.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.3/arch/s390/kernel/ptrace.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/arch/s390/kernel/ptrace.c linux-3.9.5-vs2.3.6.5/arch/s390/kernel/ptrace.c
+--- linux-3.9.5/arch/s390/kernel/ptrace.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/arch/s390/kernel/ptrace.c 2013-05-31 14:47:11.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/tracehook.h>
#include <linux/seccomp.h>
#include <trace/syscall.h>
#include <asm/segment.h>
#include <asm/page.h>
-diff -NurpP --minimal linux-3.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.3/arch/s390/kernel/syscalls.S 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/arch/s390/kernel/syscalls.S linux-3.9.5-vs2.3.6.5/arch/s390/kernel/syscalls.S
+--- linux-3.9.5/arch/s390/kernel/syscalls.S 2013-05-31 13:44:45.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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)
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.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.3/arch/sh/Kconfig 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/arch/sh/Kconfig linux-3.9.5-vs2.3.6.5/arch/sh/Kconfig
+--- linux-3.9.5/arch/sh/Kconfig 2013-05-31 13:44:45.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/arch/sh/Kconfig 2013-05-31 14:47:11.000000000 +0000
@@ -951,6 +951,8 @@ source "fs/Kconfig"
source "arch/sh/Kconfig.debug"
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.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.3/arch/sh/kernel/irq.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/arch/sh/kernel/irq.c linux-3.9.5-vs2.3.6.5/arch/sh/kernel/irq.c
+--- linux-3.9.5/arch/sh/kernel/irq.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/arch/sh/kernel/irq.c 2013-05-31 14:47:11.000000000 +0000
@@ -14,6 +14,7 @@
#include <linux/ftrace.h>
#include <linux/delay.h>
#include <asm/processor.h>
#include <asm/machvec.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-3.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.3/arch/sparc/Kconfig 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/arch/sparc/Kconfig linux-3.9.5-vs2.3.6.5/arch/sparc/Kconfig
+--- linux-3.9.5/arch/sparc/Kconfig 2013-05-31 13:44:47.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/arch/sparc/Kconfig 2013-05-31 14:47:11.000000000 +0000
@@ -559,6 +559,8 @@ source "fs/Kconfig"
source "arch/sparc/Kconfig.debug"
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.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.3/arch/sparc/include/uapi/asm/unistd.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/arch/sparc/include/uapi/asm/unistd.h linux-3.9.5-vs2.3.6.5/arch/sparc/include/uapi/asm/unistd.h
+--- linux-3.9.5/arch/sparc/include/uapi/asm/unistd.h 2013-02-19 13:57:17.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
#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.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.3/arch/sparc/kernel/systbls_32.S 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/arch/sparc/kernel/systbls_32.S linux-3.9.5-vs2.3.6.5/arch/sparc/kernel/systbls_32.S
+--- linux-3.9.5/arch/sparc/kernel/systbls_32.S 2013-05-31 13:44:48.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
/*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.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.3/arch/sparc/kernel/systbls_64.S 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/arch/sparc/kernel/systbls_64.S linux-3.9.5-vs2.3.6.5/arch/sparc/kernel/systbls_64.S
+--- linux-3.9.5/arch/sparc/kernel/systbls_64.S 2013-05-31 13:44:48.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
/*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.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.3/arch/um/Kconfig.rest 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/arch/um/Kconfig.rest linux-3.9.5-vs2.3.6.5/arch/um/Kconfig.rest
+--- linux-3.9.5/arch/um/Kconfig.rest 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/arch/um/Kconfig.rest 2013-05-31 14:47:11.000000000 +0000
@@ -12,6 +12,8 @@ source "arch/um/Kconfig.net"
source "fs/Kconfig"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.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.3/arch/x86/Kconfig 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/arch/x86/Kconfig linux-3.9.5-vs2.3.6.5/arch/x86/Kconfig
+--- linux-3.9.5/arch/x86/Kconfig 2013-06-11 12:22:36.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/arch/x86/Kconfig 2013-05-31 14:47:11.000000000 +0000
@@ -2341,6 +2341,8 @@ source "fs/Kconfig"
source "arch/x86/Kconfig.debug"
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.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.3/arch/x86/syscalls/syscall_32.tbl 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/arch/x86/kernel/dumpstack.c linux-3.9.5-vs2.3.6.5/arch/x86/kernel/dumpstack.c
+--- linux-3.9.5/arch/x86/kernel/dumpstack.c 2013-05-31 13:44:49.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/arch/x86/kernel/dumpstack.c 2013-06-12 11:03:19.000000000 +0000
+@@ -188,8 +188,8 @@ void dump_stack(void)
+ unsigned long stack;
+
+ bp = stack_frame(current, NULL);
+- printk("Pid: %d, comm: %.20s %s %s %.*s\n",
+- current->pid, current->comm, print_tainted(),
++ printk("Pid: %d:#%u, comm: %.20s %s %s %.*s\n",
++ current->pid, current->xid, current->comm, print_tainted(),
+ init_utsname()->release,
+ (int)strcspn(init_utsname()->version, " "),
+ init_utsname()->version);
+diff -NurpP --minimal linux-3.9.5/arch/x86/kernel/process.c linux-3.9.5-vs2.3.6.5/arch/x86/kernel/process.c
+--- linux-3.9.5/arch/x86/kernel/process.c 2013-05-31 13:44:49.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/arch/x86/kernel/process.c 2013-06-12 11:02:45.000000000 +0000
+@@ -135,8 +135,8 @@ void show_regs_common(void)
+ /* Board Name is optional */
+ board = dmi_get_system_info(DMI_BOARD_NAME);
+
+- printk(KERN_DEFAULT "Pid: %d, comm: %.20s %s %s %.*s %s %s%s%s\n",
+- current->pid, current->comm, print_tainted(),
++ printk(KERN_DEFAULT "Pid: %d:#%u, comm: %.20s %s %s %.*s %s %s%s%s\n",
++ current->pid, current->xid, current->comm, print_tainted(),
+ init_utsname()->release,
+ (int)strcspn(init_utsname()->version, " "),
+ init_utsname()->version,
+diff -NurpP --minimal linux-3.9.5/arch/x86/syscalls/syscall_32.tbl linux-3.9.5-vs2.3.6.5/arch/x86/syscalls/syscall_32.tbl
+--- linux-3.9.5/arch/x86/syscalls/syscall_32.tbl 2013-05-31 13:44:50.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
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.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.3/arch/x86/syscalls/syscall_64.tbl 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/arch/x86/syscalls/syscall_64.tbl linux-3.9.5-vs2.3.6.5/arch/x86/syscalls/syscall_64.tbl
+--- linux-3.9.5/arch/x86/syscalls/syscall_64.tbl 2013-05-31 13:44:50.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
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.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.3/drivers/block/Kconfig 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/drivers/block/Kconfig linux-3.9.5-vs2.3.6.5/drivers/block/Kconfig
+--- linux-3.9.5/drivers/block/Kconfig 2013-05-31 13:44:51.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/drivers/block/Kconfig 2013-05-31 14:47:11.000000000 +0000
@@ -278,6 +278,13 @@ config BLK_DEV_CRYPTOLOOP
source "drivers/block/drbd/Kconfig"
config BLK_DEV_NBD
tristate "Network block device support"
depends on NET
-diff -NurpP --minimal linux-3.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.3/drivers/block/Makefile 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/drivers/block/Makefile linux-3.9.5-vs2.3.6.5/drivers/block/Makefile
+--- linux-3.9.5/drivers/block/Makefile 2013-05-31 13:44:51.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
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.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.3/drivers/block/loop.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/drivers/block/loop.c linux-3.9.5-vs2.3.6.5/drivers/block/loop.c
+--- linux-3.9.5/drivers/block/loop.c 2013-05-31 13:44:51.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/drivers/block/loop.c 2013-05-31 14:47:11.000000000 +0000
@@ -76,6 +76,7 @@
#include <linux/sysfs.h>
#include <linux/miscdevice.h>
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.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.3/drivers/block/vroot.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/drivers/block/vroot.c linux-3.9.5-vs2.3.6.5/drivers/block/vroot.c
+--- linux-3.9.5/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/drivers/block/vroot.c 2013-05-31 14:47:11.000000000 +0000
@@ -0,0 +1,291 @@
+/*
+ * linux/drivers/block/vroot.c
+
+#endif
+
-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.3/drivers/infiniband/Kconfig 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/drivers/infiniband/Kconfig linux-3.9.5-vs2.3.6.5/drivers/infiniband/Kconfig
+--- linux-3.9.5/drivers/infiniband/Kconfig 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/drivers/infiniband/Kconfig 2013-05-31 14:47:11.000000000 +0000
@@ -39,7 +39,7 @@ config INFINIBAND_USER_MEM
config INFINIBAND_ADDR_TRANS
bool
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.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.3/drivers/infiniband/core/addr.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/drivers/infiniband/core/addr.c linux-3.9.5-vs2.3.6.5/drivers/infiniband/core/addr.c
+--- linux-3.9.5/drivers/infiniband/core/addr.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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)) {
if (ret)
goto put;
-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.3/drivers/md/dm-ioctl.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/drivers/md/dm-ioctl.c linux-3.9.5-vs2.3.6.5/drivers/md/dm-ioctl.c
+--- linux-3.9.5/drivers/md/dm-ioctl.c 2013-05-31 13:44:59.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/drivers/md/dm-ioctl.c 2013-05-31 14:47:11.000000000 +0000
@@ -16,6 +16,7 @@
#include <linux/dm-ioctl.h>
#include <linux/hdreg.h>
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.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.3/drivers/md/dm.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/drivers/md/dm.c linux-3.9.5-vs2.3.6.5/drivers/md/dm.c
+--- linux-3.9.5/drivers/md/dm.c 2013-05-31 13:44:59.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/drivers/md/dm.c 2013-06-12 23:49:08.000000000 +0000
@@ -19,6 +19,7 @@
#include <linux/idr.h>
#include <linux/hdreg.h>
rwlock_t map_lock;
atomic_t holders;
atomic_t open_count;
-+ xid_t xid;
++ vxid_t xid;
unsigned long flags;
+/*
+ * Get the xid associated with a dm device
+ */
-+xid_t dm_get_xid(struct mapped_device *md)
++vxid_t dm_get_xid(struct mapped_device *md)
+{
+ return md->xid;
+}
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.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.3/drivers/md/dm.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/drivers/md/dm.h linux-3.9.5-vs2.3.6.5/drivers/md/dm.h
+--- linux-3.9.5/drivers/md/dm.h 2013-02-19 13:57:51.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/drivers/md/dm.h 2013-06-12 23:49:08.000000000 +0000
@@ -46,6 +46,8 @@ struct dm_dev_internal {
struct dm_table;
struct dm_md_mempools;
-+xid_t dm_get_xid(struct mapped_device *md);
++vxid_t dm_get_xid(struct mapped_device *md);
+
/*-----------------------------------------------------------------
* Internal table functions.
*---------------------------------------------------------------*/
-diff -NurpP --minimal linux-3.9.4/drivers/net/tun.c linux-3.9.4-vs2.3.6.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.3/drivers/net/tun.c 2013-05-31 20:01:45.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/drivers/net/tun.c linux-3.9.5-vs2.3.6.5/drivers/net/tun.c
+--- linux-3.9.5/drivers/net/tun.c 2013-06-11 12:22:38.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/drivers/net/tun.c 2013-06-12 23:49:08.000000000 +0000
@@ -64,6 +64,7 @@
#include <linux/nsproxy.h>
#include <linux/virtio_net.h>
unsigned int flags;
kuid_t owner;
kgid_t group;
-+ nid_t nid;
++ vnid_t nid;
struct net_device *dev;
netdev_features_t set_features;
+ return -EPERM;
+
+ /* Set nid owner of the device */
-+ tun->nid = (nid_t) arg;
++ tun->nid = (vnid_t) arg;
+
+ tun_debug(KERN_INFO, tun, "nid owner set to %u\n", tun->nid);
+ break;
case TUNSETLINK:
/* Only allow setting the type when the interface is down */
if (tun->dev->flags & IFF_UP) {
-diff -NurpP --minimal linux-3.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.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];
- u32 t_len;
--} tag_t;
-+} ctag_t;
-
-
- #define TAG_EQ(i, v) (((i)[0] == (v)[0]) && \
-@@ -90,7 +90,7 @@ typedef struct
- u32 ptr;
- } xbv_stack_t;
-
--static s32 read_tag(card_t *card, ct_t *ct, tag_t *tag);
-+static s32 read_tag(card_t *card, ct_t *ct, ctag_t *tag);
- static s32 read_bytes(card_t *card, ct_t *ct, void *buf, u32 len);
- static s32 read_uint(card_t *card, ct_t *ct, u32 *u, u32 len);
- static s32 xbv_check(xbv1_t *fwinfo, const xbv_stack_t *stack,
-@@ -160,7 +160,7 @@ static u32 write_fwdl_to_ptdl(void *buf,
- CsrResult xbv1_parse(card_t *card, fwreadfn_t readfn, void *dlpriv, xbv1_t *fwinfo)
- {
- ct_t ct;
-- tag_t tag;
-+ ctag_t tag;
- xbv_stack_t stack;
-
- ct.dlpriv = dlpriv;
-@@ -505,7 +505,7 @@ static u32 xbv2uint(u8 *ptr, s32 len)
- }
-
-
--static s32 read_tag(card_t *card, ct_t *ct, tag_t *tag)
-+static s32 read_tag(card_t *card, ct_t *ct, ctag_t *tag)
- {
- u8 buf[8];
- s32 n;
-diff -NurpP --minimal linux-3.9.4/drivers/tty/sysrq.c linux-3.9.4-vs2.3.6.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.3/drivers/tty/sysrq.c 2013-05-31 15:08:19.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/drivers/tty/sysrq.c linux-3.9.5-vs2.3.6.5/drivers/tty/sysrq.c
+--- linux-3.9.5/drivers/tty/sysrq.c 2013-05-31 13:45:19.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/drivers/tty/sysrq.c 2013-05-31 15:08:19.000000000 +0000
@@ -43,6 +43,7 @@
#include <linux/input.h>
#include <linux/uaccess.h>
else
retval = -1;
return retval;
-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.3/drivers/tty/tty_io.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/drivers/tty/tty_io.c linux-3.9.5-vs2.3.6.5/drivers/tty/tty_io.c
+--- linux-3.9.5/drivers/tty/tty_io.c 2013-06-11 12:22:39.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/drivers/tty/tty_io.c 2013-05-31 14:47:11.000000000 +0000
@@ -104,6 +104,7 @@
#include <linux/kmod.h>
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.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.3/fs/attr.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/attr.c linux-3.9.5-vs2.3.6.5/fs/attr.c
+--- linux-3.9.5/fs/attr.c 2013-02-19 13:58:46.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/attr.c 2013-05-31 14:47:11.000000000 +0000
@@ -15,6 +15,9 @@
#include <linux/security.h>
#include <linux/evm.h>
if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
return -EPERM;
}
-diff -NurpP --minimal linux-3.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.3/fs/block_dev.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/block_dev.c linux-3.9.5-vs2.3.6.5/fs/block_dev.c
+--- linux-3.9.5/fs/block_dev.c 2013-05-31 13:45:22.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/block_dev.c 2013-05-31 14:47:11.000000000 +0000
@@ -27,6 +27,7 @@
#include <linux/namei.h>
#include <linux/log2.h>
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.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.3/fs/btrfs/ctree.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/btrfs/ctree.h linux-3.9.5-vs2.3.6.5/fs/btrfs/ctree.h
+--- linux-3.9.5/fs/btrfs/ctree.h 2013-05-31 13:45:22.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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;
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.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.3/fs/btrfs/disk-io.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/btrfs/disk-io.c linux-3.9.5-vs2.3.6.5/fs/btrfs/disk-io.c
+--- linux-3.9.5/fs/btrfs/disk-io.c 2013-05-31 13:45:22.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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;
}
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.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.3/fs/btrfs/inode.c 2013-06-03 19:37:03.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/btrfs/inode.c linux-3.9.5-vs2.3.6.5/fs/btrfs/inode.c
+--- linux-3.9.5/fs/btrfs/inode.c 2013-06-11 12:22:39.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/btrfs/inode.c 2013-06-03 19:37:03.000000000 +0000
@@ -41,6 +41,7 @@
#include <linux/mount.h>
#include <linux/btrfs.h>
.get_acl = btrfs_get_acl,
};
-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.3/fs/btrfs/ioctl.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/btrfs/ioctl.c linux-3.9.5-vs2.3.6.5/fs/btrfs/ioctl.c
+--- linux-3.9.5/fs/btrfs/ioctl.c 2013-06-11 12:22:39.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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;
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.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.3/fs/btrfs/super.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/btrfs/super.c linux-3.9.5-vs2.3.6.5/fs/btrfs/super.c
+--- linux-3.9.5/fs/btrfs/super.c 2013-05-31 13:45:22.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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,
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.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.3/fs/char_dev.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/char_dev.c linux-3.9.5-vs2.3.6.5/fs/char_dev.c
+--- linux-3.9.5/fs/char_dev.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/char_dev.c 2013-05-31 14:47:11.000000000 +0000
@@ -21,6 +21,8 @@
#include <linux/mutex.h>
#include <linux/backing-dev.h>
if (!kobj)
return -ENXIO;
new = container_of(kobj, struct cdev, kobj);
-diff -NurpP --minimal linux-3.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.3/fs/dcache.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/dcache.c linux-3.9.5-vs2.3.6.5/fs/dcache.c
+--- linux-3.9.5/fs/dcache.c 2013-06-11 12:22:39.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/dcache.c 2013-05-31 14:47:11.000000000 +0000
@@ -37,6 +37,7 @@
#include <linux/rculist_bl.h>
#include <linux/prefetch.h>
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.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.3/fs/devpts/inode.c 2013-05-31 15:42:25.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/devpts/inode.c linux-3.9.5-vs2.3.6.5/fs/devpts/inode.c
+--- linux-3.9.5/fs/devpts/inode.c 2013-05-31 13:45:23.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/devpts/inode.c 2013-06-12 23:49:08.000000000 +0000
@@ -25,6 +25,7 @@
#include <linux/parser.h>
#include <linux/fsnotify.h>
+ int ret = -EACCES;
+
+ /* devpts is xid tagged */
-+ if (vx_check((xid_t)i_tag_read(inode), VS_WATCH_P | VS_IDENT))
++ if (vx_check((vxid_t)i_tag_read(inode), VS_WATCH_P | VS_IDENT))
+ ret = generic_permission(inode, mask);
+ return ret;
+}
+static int devpts_filter(struct dentry *de)
+{
-+ xid_t xid = 0;
++ vxid_t xid = 0;
+
+ /* devpts is xid tagged */
+ if (de && de->d_inode)
-+ xid = (xid_t)i_tag_read(de->d_inode);
++ xid = (vxid_t)i_tag_read(de->d_inode);
+#ifdef CONFIG_VSERVER_WARN_DEVPTS
+ else
+ vxwprintk_task(1, "devpts " VS_Q("%.*s") " without inode.",
+ inode->i_fop = &devpts_dir_operations;
set_nlink(inode, 2);
+ /* devpts is xid tagged */
-+ i_tag_write(inode, (tag_t)vx_current_xid());
++ i_tag_write(inode, (vtag_t)vx_current_xid());
s->s_root = d_make_root(inode);
if (s->s_root)
inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
init_special_inode(inode, S_IFCHR|opts->mode, device);
+ /* devpts is xid tagged */
-+ i_tag_write(inode, (tag_t)vx_current_xid());
++ i_tag_write(inode, (vtag_t)vx_current_xid());
+ inode->i_op = &devpts_file_inode_operations;
inode->i_private = priv;
sprintf(s, "%d", index);
-diff -NurpP --minimal linux-3.9.4/fs/ext2/balloc.c linux-3.9.4-vs2.3.6.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.3/fs/ext2/balloc.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/ext2/balloc.c linux-3.9.5-vs2.3.6.5/fs/ext2/balloc.c
+--- linux-3.9.5/fs/ext2/balloc.c 2013-05-31 13:45:23.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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);
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.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.3/fs/ext2/ext2.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/ext2/ext2.h linux-3.9.5-vs2.3.6.5/fs/ext2/ext2.h
+--- linux-3.9.5/fs/ext2/ext2.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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) */
/* 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.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.3/fs/ext2/file.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/ext2/file.c linux-3.9.5-vs2.3.6.5/fs/ext2/file.c
+--- linux-3.9.5/fs/ext2/file.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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.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.3/fs/ext2/ialloc.c 2013-06-03 18:58:16.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/ext2/ialloc.c linux-3.9.5-vs2.3.6.5/fs/ext2/ialloc.c
+--- linux-3.9.5/fs/ext2/ialloc.c 2013-05-31 13:45:23.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/ext2/ialloc.c 2013-06-03 18:58:16.000000000 +0000
@@ -17,6 +17,7 @@
#include <linux/backing-dev.h>
#include <linux/buffer_head.h>
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-3.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.3/fs/ext2/inode.c 2013-06-03 19:42:51.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/ext2/inode.c linux-3.9.5-vs2.3.6.5/fs/ext2/inode.c
+--- linux-3.9.5/fs/ext2/inode.c 2013-05-31 13:45:23.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/ext2/inode.c 2013-06-03 19:42:51.000000000 +0000
@@ -31,6 +31,7 @@
#include <linux/mpage.h>
#include <linux/fiemap.h>
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.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.3/fs/ext2/ioctl.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/ext2/ioctl.c linux-3.9.5-vs2.3.6.5/fs/ext2/ioctl.c
+--- linux-3.9.5/fs/ext2/ioctl.c 2013-05-31 13:45:23.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/ext2/ioctl.c 2013-05-31 14:47:11.000000000 +0000
@@ -17,6 +17,16 @@
#include <asm/uaccess.h>
flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE;
ei->i_flags = flags;
-diff -NurpP --minimal linux-3.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.3/fs/ext2/namei.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/ext2/namei.c linux-3.9.5-vs2.3.6.5/fs/ext2/namei.c
+--- linux-3.9.5/fs/ext2/namei.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/ext2/namei.c 2013-05-31 14:47:11.000000000 +0000
@@ -32,6 +32,7 @@
#include <linux/pagemap.h>
.get_acl = ext2_get_acl,
};
-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.3/fs/ext2/super.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/ext2/super.c linux-3.9.5-vs2.3.6.5/fs/ext2/super.c
+--- linux-3.9.5/fs/ext2/super.c 2013-05-31 13:45:23.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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,
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.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.3/fs/ext3/ext3.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/ext3/ext3.h linux-3.9.5-vs2.3.6.5/fs/ext3/ext3.h
+--- linux-3.9.5/fs/ext3/ext3.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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) */
/* 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.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.3/fs/ext3/file.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/ext3/file.c linux-3.9.5-vs2.3.6.5/fs/ext3/file.c
+--- linux-3.9.5/fs/ext3/file.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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,
+ .sync_flags = ext3_sync_flags,
};
-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.3/fs/ext3/ialloc.c 2013-06-03 19:43:33.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/ext3/ialloc.c linux-3.9.5-vs2.3.6.5/fs/ext3/ialloc.c
+--- linux-3.9.5/fs/ext3/ialloc.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/ext3/ialloc.c 2013-06-03 19:43:33.000000000 +0000
@@ -14,6 +14,7 @@
#include <linux/quotaops.h>
} 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.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.3/fs/ext3/inode.c 2013-06-03 19:44:35.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/ext3/inode.c linux-3.9.5-vs2.3.6.5/fs/ext3/inode.c
+--- linux-3.9.5/fs/ext3/inode.c 2013-05-31 13:45:23.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/ext3/inode.c 2013-06-03 19:44:35.000000000 +0000
@@ -27,6 +27,8 @@
#include <linux/writeback.h>
#include <linux/mpage.h>
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.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.3/fs/ext3/ioctl.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/ext3/ioctl.c linux-3.9.5-vs2.3.6.5/fs/ext3/ioctl.c
+--- linux-3.9.5/fs/ext3/ioctl.c 2013-05-31 13:45:23.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/ext3/ioctl.c 2013-05-31 14:47:11.000000000 +0000
@@ -12,6 +12,34 @@
#include <asm/uaccess.h>
#include "ext3.h"
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.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.3/fs/ext3/namei.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/ext3/namei.c linux-3.9.5-vs2.3.6.5/fs/ext3/namei.c
+--- linux-3.9.5/fs/ext3/namei.c 2013-05-31 13:45:23.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/ext3/namei.c 2013-05-31 14:47:11.000000000 +0000
@@ -25,6 +25,8 @@
*/
.get_acl = ext3_get_acl,
};
-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.3/fs/ext3/super.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/ext3/super.c linux-3.9.5-vs2.3.6.5/fs/ext3/super.c
+--- linux-3.9.5/fs/ext3/super.c 2013-05-31 13:45:23.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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,
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.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.3/fs/ext4/ext4.h 2013-05-31 16:22:49.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/ext4/ext4.h linux-3.9.5-vs2.3.6.5/fs/ext4/ext4.h
+--- linux-3.9.5/fs/ext4/ext4.h 2013-05-31 13:45:23.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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 */
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.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.3/fs/ext4/file.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/ext4/file.c linux-3.9.5-vs2.3.6.5/fs/ext4/file.c
+--- linux-3.9.5/fs/ext4/file.c 2013-05-31 13:45:23.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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,
+ .sync_flags = ext4_sync_flags,
};
-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.3/fs/ext4/ialloc.c 2013-06-03 19:45:15.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/ext4/ialloc.c linux-3.9.5-vs2.3.6.5/fs/ext4/ialloc.c
+--- linux-3.9.5/fs/ext4/ialloc.c 2013-05-31 13:45:23.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/ext4/ialloc.c 2013-06-03 19:45:15.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/random.h>
#include <linux/bitops.h>
} 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.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.3/fs/ext4/inode.c 2013-06-03 19:45:35.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/ext4/inode.c linux-3.9.5-vs2.3.6.5/fs/ext4/inode.c
+--- linux-3.9.5/fs/ext4/inode.c 2013-06-11 12:22:39.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/ext4/inode.c 2013-06-03 19:45:35.000000000 +0000
@@ -37,6 +37,7 @@
#include <linux/printk.h>
#include <linux/slab.h>
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.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.3/fs/ext4/ioctl.c 2013-05-31 19:50:08.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/ext4/ioctl.c linux-3.9.5-vs2.3.6.5/fs/ext4/ioctl.c
+--- linux-3.9.5/fs/ext4/ioctl.c 2013-05-31 13:45:23.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/ext4/ioctl.c 2013-05-31 19:50:08.000000000 +0000
@@ -14,12 +14,40 @@
#include <linux/compat.h>
#include <linux/mount.h>
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.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.3/fs/ext4/namei.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/ext4/namei.c linux-3.9.5-vs2.3.6.5/fs/ext4/namei.c
+--- linux-3.9.5/fs/ext4/namei.c 2013-05-31 13:45:23.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/ext4/namei.c 2013-05-31 14:47:11.000000000 +0000
@@ -34,6 +34,7 @@
#include <linux/quotaops.h>
#include <linux/buffer_head.h>
};
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.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.3/fs/ext4/super.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/ext4/super.c linux-3.9.5-vs2.3.6.5/fs/ext4/super.c
+--- linux-3.9.5/fs/ext4/super.c 2013-06-11 12:22:39.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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,
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.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.3/fs/fcntl.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/fcntl.c linux-3.9.5-vs2.3.6.5/fs/fcntl.c
+--- linux-3.9.5/fs/fcntl.c 2013-05-31 13:45:23.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/fcntl.c 2013-05-31 14:47:11.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/rcupdate.h>
#include <linux/pid_namespace.h>
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.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.3/fs/file.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/file.c linux-3.9.5-vs2.3.6.5/fs/file.c
+--- linux-3.9.5/fs/file.c 2013-05-31 13:45:23.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/file.c 2013-05-31 14:47:11.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/spinlock.h>
#include <linux/rcupdate.h>
return fd;
-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.3/fs/file_table.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/file_table.c linux-3.9.5-vs2.3.6.5/fs/file_table.c
+--- linux-3.9.5/fs/file_table.c 2013-05-31 13:45:23.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/file_table.c 2013-05-31 14:47:11.000000000 +0000
@@ -26,6 +26,8 @@
#include <linux/hardirq.h>
#include <linux/task_work.h>
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.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.3/fs/fs_struct.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/fs_struct.c linux-3.9.5-vs2.3.6.5/fs/fs_struct.c
+--- linux-3.9.5/fs/fs_struct.c 2013-05-31 13:45:23.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/fs_struct.c 2013-05-31 14:47:11.000000000 +0000
@@ -4,6 +4,7 @@
#include <linux/path.h>
#include <linux/slab.h>
}
return fs;
}
-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.3/fs/gfs2/file.c 2013-05-31 19:54:27.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/gfs2/file.c linux-3.9.5-vs2.3.6.5/fs/gfs2/file.c
+--- linux-3.9.5/fs/gfs2/file.c 2013-05-31 13:45:23.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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,
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.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.3/fs/gfs2/inode.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/gfs2/inode.h linux-3.9.5-vs2.3.6.5/fs/gfs2/inode.h
+--- linux-3.9.5/fs/gfs2/inode.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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;
#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.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.3/fs/hostfs/hostfs.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/hostfs/hostfs.h linux-3.9.5-vs2.3.6.5/fs/hostfs/hostfs.h
+--- linux-3.9.5/fs/hostfs/hostfs.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/hostfs/hostfs.h 2013-06-12 23:49:08.000000000 +0000
@@ -42,6 +42,7 @@ struct hostfs_iattr {
unsigned short ia_mode;
uid_t ia_uid;
gid_t ia_gid;
-+ tag_t ia_tag;
++ vtag_t ia_tag;
loff_t ia_size;
struct timespec ia_atime;
struct timespec ia_mtime;
-diff -NurpP --minimal linux-3.9.4/fs/inode.c linux-3.9.4-vs2.3.6.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.3/fs/inode.c 2013-06-03 18:32:17.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/inode.c linux-3.9.5-vs2.3.6.5/fs/inode.c
+--- linux-3.9.5/fs/inode.c 2013-05-31 13:45:24.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/inode.c 2013-06-03 18:32:17.000000000 +0000
@@ -17,6 +17,7 @@
#include <linux/prefetch.h>
#include <linux/buffer_head.h> /* for inode_has_buffers */
}
EXPORT_SYMBOL(inode_init_owner);
-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.3/fs/ioctl.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/ioctl.c linux-3.9.5-vs2.3.6.5/fs/ioctl.c
+--- linux-3.9.5/fs/ioctl.c 2013-05-31 13:45:24.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/ioctl.c 2013-05-31 14:47:11.000000000 +0000
@@ -15,6 +15,9 @@
#include <linux/writeback.h>
#include <linux/buffer_head.h>
#include <asm/ioctls.h>
-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.3/fs/ioprio.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/ioprio.c linux-3.9.5-vs2.3.6.5/fs/ioprio.c
+--- linux-3.9.5/fs/ioprio.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/ioprio.c 2013-05-31 14:47:11.000000000 +0000
@@ -28,6 +28,7 @@
#include <linux/syscalls.h>
#include <linux/security.h>
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.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.3/fs/jfs/file.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/jfs/file.c linux-3.9.5-vs2.3.6.5/fs/jfs/file.c
+--- linux-3.9.5/fs/jfs/file.c 2013-02-19 13:58:48.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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);
};
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.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.3/fs/jfs/ioctl.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/jfs/ioctl.c linux-3.9.5-vs2.3.6.5/fs/jfs/ioctl.c
+--- linux-3.9.5/fs/jfs/ioctl.c 2013-05-31 13:45:24.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/jfs/ioctl.c 2013-05-31 14:47:11.000000000 +0000
@@ -12,6 +12,7 @@
#include <linux/time.h>
#include <linux/sched.h>
flags |= oldflags & ~JFS_FL_USER_MODIFIABLE;
jfs_inode->mode2 = flags;
-diff -NurpP --minimal linux-3.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.3/fs/jfs/jfs_dinode.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/jfs/jfs_dinode.h linux-3.9.5-vs2.3.6.5/fs/jfs/jfs_dinode.h
+--- linux-3.9.5/fs/jfs/jfs_dinode.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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 */
#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.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.3/fs/jfs/jfs_filsys.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/jfs/jfs_filsys.h linux-3.9.5-vs2.3.6.5/fs/jfs/jfs_filsys.h
+--- linux-3.9.5/fs/jfs/jfs_filsys.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
/*
* file system state (superblock state)
-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.3/fs/jfs/jfs_imap.c 2013-06-03 19:53:45.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/jfs/jfs_imap.c linux-3.9.5-vs2.3.6.5/fs/jfs/jfs_imap.c
+--- linux-3.9.5/fs/jfs/jfs_imap.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/jfs/jfs_imap.c 2013-06-03 19:53:45.000000000 +0000
@@ -46,6 +46,7 @@
#include <linux/pagemap.h>
#include <linux/quotaops.h>
jfs_get_inode_flags(jfs_ip);
/*
* mode2 is only needed for storing the higher order bits.
-diff -NurpP --minimal linux-3.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.3/fs/jfs/jfs_inode.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/jfs/jfs_inode.c linux-3.9.5-vs2.3.6.5/fs/jfs/jfs_inode.c
+--- linux-3.9.5/fs/jfs/jfs_inode.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/jfs/jfs_inode.c 2013-05-31 14:47:11.000000000 +0000
@@ -18,6 +18,7 @@
#include <linux/fs.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.3/fs/jfs/jfs_inode.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/jfs/jfs_inode.h linux-3.9.5-vs2.3.6.5/fs/jfs/jfs_inode.h
+--- linux-3.9.5/fs/jfs/jfs_inode.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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);
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.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.3/fs/jfs/namei.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/jfs/namei.c linux-3.9.5-vs2.3.6.5/fs/jfs/namei.c
+--- linux-3.9.5/fs/jfs/namei.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/jfs/namei.c 2013-05-31 14:47:11.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/ctype.h>
#include <linux/quotaops.h>
};
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.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.3/fs/jfs/super.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/jfs/super.c linux-3.9.5-vs2.3.6.5/fs/jfs/super.c
+--- linux-3.9.5/fs/jfs/super.c 2013-05-31 13:45:24.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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,
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.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.3/fs/libfs.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/libfs.c linux-3.9.5-vs2.3.6.5/fs/libfs.c
+--- linux-3.9.5/fs/libfs.c 2013-02-19 13:58:48.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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.
*/
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.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.3/fs/locks.c 2013-05-31 15:53:57.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/locks.c linux-3.9.5-vs2.3.6.5/fs/locks.c
+--- linux-3.9.5/fs/locks.c 2013-05-31 13:45:24.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/locks.c 2013-06-12 23:49:08.000000000 +0000
@@ -126,6 +126,8 @@
#include <linux/time.h>
#include <linux/rcupdate.h>
-static int __posix_lock_file(struct inode *inode, struct file_lock *request, struct file_lock *conflock)
+static int __posix_lock_file(struct inode *inode, struct file_lock *request,
-+ struct file_lock *conflock, xid_t xid)
++ struct file_lock *conflock, vxid_t xid)
{
struct file_lock *fl;
struct file_lock *new_fl = NULL;
return 0;
}
-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.3/fs/mount.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/mount.h linux-3.9.5-vs2.3.6.5/fs/mount.h
+--- linux-3.9.5/fs/mount.h 2013-02-19 13:58:48.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/mount.h 2013-06-12 23:49:08.000000000 +0000
@@ -49,6 +49,7 @@ struct mount {
int mnt_expiry_mark; /* true if marked for expiry */
int mnt_pinned;
int mnt_ghosts;
-+ tag_t mnt_tag; /* tagging used for vfsmount */
++ vtag_t mnt_tag; /* tagging used for vfsmount */
};
#define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */
-diff -NurpP --minimal linux-3.9.4/fs/namei.c linux-3.9.4-vs2.3.6.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.3/fs/namei.c 2013-06-01 09:00:16.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/namei.c linux-3.9.5-vs2.3.6.5/fs/namei.c
+--- linux-3.9.5/fs/namei.c 2013-06-11 12:22:39.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/namei.c 2013-06-12 23:49:08.000000000 +0000
@@ -34,6 +34,14 @@
#include <linux/device_cgroup.h>
#include <linux/fs_struct.h>
+ if (inode->i_sb->s_magic == DEVPTS_SUPER_MAGIC) {
+ /* devpts is xid tagged */
+ if (S_ISDIR(inode->i_mode) ||
-+ vx_check((xid_t)i_tag_read(inode), VS_IDENT | VS_WATCH_P))
++ vx_check((vxid_t)i_tag_read(inode), VS_IDENT | VS_WATCH_P))
+ return 0;
+
+ /* just pretend we didn't find anything */
+ }
+ else {
+ if (dx_notagcheck(inode->i_sb) ||
-+ dx_check((xid_t)i_tag_read(inode),
++ dx_check((vxid_t)i_tag_read(inode),
+ DX_HOSTID | DX_ADMIN | DX_WATCH | DX_IDENT))
+ return 0;
+ }
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.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.3/fs/namespace.c 2013-05-31 18:47:18.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/namespace.c linux-3.9.5-vs2.3.6.5/fs/namespace.c
+--- linux-3.9.5/fs/namespace.c 2013-06-11 12:22:39.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/namespace.c 2013-06-12 23:49:08.000000000 +0000
@@ -22,6 +22,11 @@
#include <linux/fsnotify.h> /* fsnotify_vfsmount_delete */
#include <linux/uaccess.h>
*/
static int do_loopback(struct path *path, const char *old_name,
- int recurse)
-+ tag_t tag, unsigned long flags, int mnt_flags)
++ vtag_t tag, unsigned long flags, int mnt_flags)
{
LIST_HEAD(umount_list);
struct path old_path;
*/
static int do_remount(struct path *path, int flags, int mnt_flags,
- void *data)
-+ void *data, xid_t xid)
++ void *data, vxid_t xid)
{
int err;
struct super_block *sb = path->mnt->mnt_sb;
struct path path;
int retval = 0;
int mnt_flags = 0;
-+ tag_t tag = 0;
++ vtag_t tag = 0;
/* Discard magic */
if ((flags & MS_MGC_MSK) == MS_MGC_VAL)
free_mnt_ns(ns);
}
-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.3/fs/nfs/client.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/nfs/client.c linux-3.9.5-vs2.3.6.5/fs/nfs/client.c
+--- linux-3.9.5/fs/nfs/client.c 2013-05-31 13:45:24.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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;
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.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.3/fs/nfs/dir.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/nfs/dir.c linux-3.9.5-vs2.3.6.5/fs/nfs/dir.c
+--- linux-3.9.5/fs/nfs/dir.c 2013-05-31 13:45:24.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/nfs/dir.c 2013-05-31 14:47:11.000000000 +0000
@@ -36,6 +36,7 @@
#include <linux/sched.h>
#include <linux/kmemleak.h>
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.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.3/fs/nfs/inode.c 2013-06-03 19:32:53.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/nfs/inode.c linux-3.9.5-vs2.3.6.5/fs/nfs/inode.c
+--- linux-3.9.5/fs/nfs/inode.c 2013-05-31 13:45:24.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/nfs/inode.c 2013-06-03 19:32:53.000000000 +0000
@@ -39,6 +39,7 @@
#include <linux/compat.h>
#include <linux/freezer.h>
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.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.3/fs/nfs/nfs3xdr.c 2013-06-03 19:33:10.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/nfs/nfs3xdr.c linux-3.9.5-vs2.3.6.5/fs/nfs/nfs3xdr.c
+--- linux-3.9.5/fs/nfs/nfs3xdr.c 2013-05-31 13:45:24.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/nfs/nfs3xdr.c 2013-06-03 19:33:10.000000000 +0000
@@ -20,6 +20,7 @@
#include <linux/nfs3.h>
#include <linux/nfs_fs.h>
}
/*
-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.3/fs/nfs/super.c 2013-05-31 15:41:34.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/nfs/super.c linux-3.9.5-vs2.3.6.5/fs/nfs/super.c
+--- linux-3.9.5/fs/nfs/super.c 2013-05-31 13:45:24.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/nfs/super.c 2013-05-31 15:41:34.000000000 +0000
@@ -55,6 +55,7 @@
#include <linux/parser.h>
#include <linux/nsproxy.h>
/*
* options that take text values
-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.3/fs/nfsd/auth.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/nfsd/auth.c linux-3.9.5-vs2.3.6.5/fs/nfsd/auth.c
+--- linux-3.9.5/fs/nfsd/auth.c 2013-05-31 13:45:24.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/nfsd/auth.c 2013-06-12 23:49:08.000000000 +0000
@@ -2,6 +2,7 @@
#include <linux/sched.h>
new->fsuid = rqstp->rq_cred.cr_uid;
new->fsgid = rqstp->rq_cred.cr_gid;
+ /* FIXME: this desperately needs a tag :)
-+ new->xid = (xid_t)INOTAG_TAG(DX_TAG_NFSD, cred.cr_uid, cred.cr_gid, 0);
++ new->xid = (vxid_t)INOTAG_TAG(DX_TAG_NFSD, cred.cr_uid, cred.cr_gid, 0);
+ */
rqgi = rqstp->rq_cred.cr_group_info;
-diff -NurpP --minimal linux-3.9.4/fs/nfsd/nfs3xdr.c linux-3.9.4-vs2.3.6.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.3/fs/nfsd/nfs3xdr.c 2013-06-03 19:57:43.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/nfsd/nfs3xdr.c linux-3.9.5-vs2.3.6.5/fs/nfsd/nfs3xdr.c
+--- linux-3.9.5/fs/nfsd/nfs3xdr.c 2013-05-31 13:45:24.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/nfsd/nfs3xdr.c 2013-06-03 19:57:43.000000000 +0000
@@ -8,6 +8,7 @@
#include <linux/namei.h>
if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) {
p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN);
} else {
-diff -NurpP --minimal linux-3.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.3/fs/nfsd/nfs4xdr.c 2013-06-03 19:33:44.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/nfsd/nfs4xdr.c linux-3.9.5-vs2.3.6.5/fs/nfsd/nfs4xdr.c
+--- linux-3.9.5/fs/nfsd/nfs4xdr.c 2013-06-11 12:22:39.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/nfsd/nfs4xdr.c 2013-06-03 19:33:44.000000000 +0000
@@ -46,6 +46,7 @@
#include <linux/utsname.h>
#include <linux/pagemap.h>
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.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.3/fs/nfsd/nfsxdr.c 2013-06-03 19:56:35.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/nfsd/nfsxdr.c linux-3.9.5-vs2.3.6.5/fs/nfsd/nfsxdr.c
+--- linux-3.9.5/fs/nfsd/nfsxdr.c 2013-05-31 13:45:24.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/nfsd/nfsxdr.c 2013-06-03 19:56:35.000000000 +0000
@@ -7,6 +7,7 @@
#include "vfs.h"
#include "xdr.h"
if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
*p++ = htonl(NFS_MAXPATHLEN);
-diff -NurpP --minimal linux-3.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.3/fs/ocfs2/dlmglue.c 2013-06-03 19:59:20.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/ocfs2/dlmglue.c linux-3.9.5-vs2.3.6.5/fs/ocfs2/dlmglue.c
+--- linux-3.9.5/fs/ocfs2/dlmglue.c 2013-05-31 13:45:24.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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));
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.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.3/fs/ocfs2/dlmglue.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/ocfs2/dlmglue.h linux-3.9.5-vs2.3.6.5/fs/ocfs2/dlmglue.h
+--- linux-3.9.5/fs/ocfs2/dlmglue.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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;
};
#define OCFS2_QINFO_LVB_VERSION 1
-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.3/fs/ocfs2/file.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/ocfs2/file.c linux-3.9.5-vs2.3.6.5/fs/ocfs2/file.c
+--- linux-3.9.5/fs/ocfs2/file.c 2013-05-31 13:45:24.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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;
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.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.3/fs/ocfs2/inode.c 2013-05-31 20:39:47.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/ocfs2/inode.c linux-3.9.5-vs2.3.6.5/fs/ocfs2/inode.c
+--- linux-3.9.5/fs/ocfs2/inode.c 2013-05-31 13:45:24.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/ocfs2/inode.c 2013-05-31 20:39:47.000000000 +0000
@@ -28,6 +28,7 @@
#include <linux/highmem.h>
#include <linux/pagemap.h>
/* Fast symlinks will have i_size but no allocated clusters. */
if (S_ISLNK(inode->i_mode) && !fe->i_clusters) {
-diff -NurpP --minimal linux-3.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.3/fs/ocfs2/inode.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/ocfs2/inode.h linux-3.9.5-vs2.3.6.5/fs/ocfs2/inode.h
+--- linux-3.9.5/fs/ocfs2/inode.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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);
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.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.3/fs/ocfs2/ioctl.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/ocfs2/ioctl.c linux-3.9.5-vs2.3.6.5/fs/ocfs2/ioctl.c
+--- linux-3.9.5/fs/ocfs2/ioctl.c 2013-05-31 13:45:24.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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;
}
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.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.3/fs/ocfs2/namei.c 2013-06-03 20:00:35.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/ocfs2/namei.c linux-3.9.5-vs2.3.6.5/fs/ocfs2/namei.c
+--- linux-3.9.5/fs/ocfs2/namei.c 2013-05-31 13:45:24.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/ocfs2/namei.c 2013-06-03 20:00:35.000000000 +0000
@@ -41,6 +41,7 @@
#include <linux/slab.h>
#include <linux/highmem.h>
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.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.3/fs/ocfs2/ocfs2.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/ocfs2/ocfs2.h linux-3.9.5-vs2.3.6.5/fs/ocfs2/ocfs2.h
+--- linux-3.9.5/fs/ocfs2/ocfs2.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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 */
};
#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.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.3/fs/ocfs2/ocfs2_fs.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/ocfs2/ocfs2_fs.h linux-3.9.5-vs2.3.6.5/fs/ocfs2/ocfs2_fs.h
+--- linux-3.9.5/fs/ocfs2/ocfs2_fs.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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 */
#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.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.3/fs/ocfs2/super.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/ocfs2/super.c linux-3.9.5-vs2.3.6.5/fs/ocfs2/super.c
+--- linux-3.9.5/fs/ocfs2/super.c 2013-05-31 13:45:25.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/ocfs2/super.c 2013-05-31 14:47:11.000000000 +0000
@@ -185,6 +185,7 @@ enum {
Opt_coherency_full,
Opt_resv_level,
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.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.3/fs/open.c 2013-06-01 08:41:29.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/open.c linux-3.9.5-vs2.3.6.5/fs/open.c
+--- linux-3.9.5/fs/open.c 2013-05-31 13:45:25.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/open.c 2013-06-01 08:41:29.000000000 +0000
@@ -31,6 +31,11 @@
#include <linux/ima.h>
#include <linux/dnotify.h>
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.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.3/fs/proc/array.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/proc/array.c linux-3.9.5-vs2.3.6.5/fs/proc/array.c
+--- linux-3.9.5/fs/proc/array.c 2013-05-31 13:45:25.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/proc/array.c 2013-05-31 14:47:11.000000000 +0000
@@ -82,6 +82,8 @@
#include <linux/ptrace.h>
#include <linux/tracehook.h>
seq_printf(m, "%d (%s) %c", pid_nr_ns(pid, ns), tcomm, state);
seq_put_decimal_ll(m, ' ', ppid);
seq_put_decimal_ll(m, ' ', pgid);
-diff -NurpP --minimal linux-3.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.3/fs/proc/base.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/proc/base.c linux-3.9.5-vs2.3.6.5/fs/proc/base.c
+--- linux-3.9.5/fs/proc/base.c 2013-05-31 13:45:25.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/proc/base.c 2013-06-12 23:49:08.000000000 +0000
@@ -86,6 +86,8 @@
#include <linux/fs_struct.h>
#include <linux/slab.h>
rcu_read_unlock();
}
+ /* procfs is xid tagged */
-+ i_tag_write(inode, (tag_t)vx_task_xid(task));
++ i_tag_write(inode, (vtag_t)vx_task_xid(task));
security_task_to_inode(task, inode);
out:
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.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.3/fs/proc/generic.c 2013-05-31 16:13:42.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/proc/generic.c linux-3.9.5-vs2.3.6.5/fs/proc/generic.c
+--- linux-3.9.5/fs/proc/generic.c 2013-05-31 13:45:25.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/proc/generic.c 2013-05-31 16:13:42.000000000 +0000
@@ -23,6 +23,7 @@
#include <linux/bitops.h>
#include <linux/spinlock.h>
} else {
kfree(ent);
ent = NULL;
-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.3/fs/proc/inode.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/proc/inode.c linux-3.9.5-vs2.3.6.5/fs/proc/inode.c
+--- linux-3.9.5/fs/proc/inode.c 2013-05-31 13:45:25.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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;
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.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.3/fs/proc/internal.h 2013-05-31 16:04:34.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/proc/internal.h linux-3.9.5-vs2.3.6.5/fs/proc/internal.h
+--- linux-3.9.5/fs/proc/internal.h 2013-05-31 13:45:25.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/proc/internal.h 2013-05-31 16:04:34.000000000 +0000
@@ -12,6 +12,8 @@
#include <linux/sched.h>
#include <linux/proc_fs.h>
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.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.3/fs/proc/loadavg.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/proc/loadavg.c linux-3.9.5-vs2.3.6.5/fs/proc/loadavg.c
+--- linux-3.9.5/fs/proc/loadavg.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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)
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.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.3/fs/proc/meminfo.c 2013-05-31 16:05:39.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/proc/meminfo.c linux-3.9.5-vs2.3.6.5/fs/proc/meminfo.c
+--- linux-3.9.5/fs/proc/meminfo.c 2013-05-31 13:45:25.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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;
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.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.3/fs/proc/root.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/proc/root.c linux-3.9.5-vs2.3.6.5/fs/proc/root.c
+--- linux-3.9.5/fs/proc/root.c 2013-05-31 13:45:25.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/proc/root.c 2013-05-31 14:47:11.000000000 +0000
@@ -20,9 +20,14 @@
#include <linux/mount.h>
#include <linux/pid_namespace.h>
.name = "/proc",
};
-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.3/fs/proc/self.c 2013-05-31 20:57:54.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/proc/self.c linux-3.9.5-vs2.3.6.5/fs/proc/self.c
+--- linux-3.9.5/fs/proc/self.c 2013-02-19 13:58:49.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/proc/self.c 2013-05-31 20:57:54.000000000 +0000
@@ -1,6 +1,7 @@
#include <linux/proc_fs.h>
#include <linux/sched.h>
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.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.3/fs/proc/stat.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/proc/stat.c linux-3.9.5-vs2.3.6.5/fs/proc/stat.c
+--- linux-3.9.5/fs/proc/stat.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/proc/stat.c 2013-05-31 14:47:11.000000000 +0000
@@ -9,8 +9,10 @@
#include <linux/slab.h>
#include <linux/time.h>
/* Copy values here to work around gcc-2.95.3, gcc-2.96 */
user = kcpustat_cpu(i).cpustat[CPUTIME_USER];
nice = kcpustat_cpu(i).cpustat[CPUTIME_NICE];
-diff -NurpP --minimal linux-3.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.3/fs/proc/uptime.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/proc/uptime.c linux-3.9.5-vs2.3.6.5/fs/proc/uptime.c
+--- linux-3.9.5/fs/proc/uptime.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/proc/uptime.c 2013-05-31 14:47:11.000000000 +0000
@@ -5,6 +5,7 @@
#include <linux/seq_file.h>
#include <linux/time.h>
seq_printf(m, "%lu.%02lu %lu.%02lu\n",
(unsigned long) uptime.tv_sec,
(uptime.tv_nsec / (NSEC_PER_SEC / 100)),
-diff -NurpP --minimal linux-3.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.3/fs/proc_namespace.c 2013-05-31 17:17:53.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/proc_namespace.c linux-3.9.5-vs2.3.6.5/fs/proc_namespace.c
+--- linux-3.9.5/fs/proc_namespace.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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" },
/* 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.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.3/fs/quota/dquot.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/quota/dquot.c linux-3.9.5-vs2.3.6.5/fs/quota/dquot.c
+--- linux-3.9.5/fs/quota/dquot.c 2013-05-31 13:45:25.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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;
/* 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.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.3/fs/quota/quota.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/quota/quota.c linux-3.9.5-vs2.3.6.5/fs/quota/quota.c
+--- linux-3.9.5/fs/quota/quota.c 2013-02-19 13:58:49.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/quota/quota.c 2013-05-31 14:47:11.000000000 +0000
@@ -8,6 +8,7 @@
#include <linux/fs.h>
#include <linux/namei.h>
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.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.3/fs/stat.c 2013-06-01 08:53:01.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/stat.c linux-3.9.5-vs2.3.6.5/fs/stat.c
+--- linux-3.9.5/fs/stat.c 2013-05-31 13:45:25.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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;
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.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.3/fs/statfs.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/statfs.c linux-3.9.5-vs2.3.6.5/fs/statfs.c
+--- linux-3.9.5/fs/statfs.c 2013-02-19 13:58:49.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/statfs.c 2013-05-31 14:47:11.000000000 +0000
@@ -7,6 +7,8 @@
#include <linux/statfs.h>
#include <linux/security.h>
return retval;
}
-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.3/fs/super.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/super.c linux-3.9.5-vs2.3.6.5/fs/super.c
+--- linux-3.9.5/fs/super.c 2013-05-31 13:45:25.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/super.c 2013-05-31 14:47:11.000000000 +0000
@@ -34,6 +34,8 @@
#include <linux/cleancache.h>
#include <linux/fsnotify.h>
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.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.3/fs/sysfs/mount.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/sysfs/mount.c linux-3.9.5-vs2.3.6.5/fs/sysfs/mount.c
+--- linux-3.9.5/fs/sysfs/mount.c 2013-05-31 13:45:25.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/sysfs/mount.c 2013-05-31 14:47:11.000000000 +0000
@@ -48,7 +48,7 @@ static int sysfs_fill_super(struct super
sb->s_blocksize = PAGE_CACHE_SIZE;
sb->s_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.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.3/fs/utimes.c 2013-05-31 22:40:16.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/utimes.c linux-3.9.5-vs2.3.6.5/fs/utimes.c
+--- linux-3.9.5/fs/utimes.c 2013-02-19 13:58:49.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/utimes.c 2013-05-31 22:40:16.000000000 +0000
@@ -8,6 +8,8 @@
#include <linux/stat.h>
#include <linux/utime.h>
if (times && times[0].tv_nsec == UTIME_NOW &&
times[1].tv_nsec == UTIME_NOW)
times = NULL;
-diff -NurpP --minimal linux-3.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.3/fs/xattr.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/xattr.c linux-3.9.5-vs2.3.6.5/fs/xattr.c
+--- linux-3.9.5/fs/xattr.c 2013-02-19 13:58:49.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/xattr.c 2013-05-31 14:47:11.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/audit.h>
#include <linux/vmalloc.h>
return (mask & MAY_WRITE) ? -EPERM : -ENODATA;
return 0;
}
-diff -NurpP --minimal linux-3.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.3/fs/xfs/xfs_dinode.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/xfs/xfs_dinode.h linux-3.9.5-vs2.3.6.5/fs/xfs/xfs_dinode.h
+--- linux-3.9.5/fs/xfs/xfs_dinode.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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 */
+#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.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.3/fs/xfs/xfs_fs.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/xfs/xfs_fs.h linux-3.9.5-vs2.3.6.5/fs/xfs/xfs_fs.h
+--- linux-3.9.5/fs/xfs/xfs_fs.h 2013-02-19 13:58:49.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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 */
__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.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.3/fs/xfs/xfs_ialloc.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/xfs/xfs_ialloc.c linux-3.9.5-vs2.3.6.5/fs/xfs/xfs_ialloc.c
+--- linux-3.9.5/fs/xfs/xfs_ialloc.c 2013-05-31 13:45:25.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/xfs/xfs_ialloc.c 2013-05-31 14:47:11.000000000 +0000
@@ -37,7 +37,6 @@
#include "xfs_error.h"
#include "xfs_bmap.h"
/*
* Allocation group level functions.
*/
-diff -NurpP --minimal linux-3.9.4/fs/xfs/xfs_inode.c linux-3.9.4-vs2.3.6.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.3/fs/xfs/xfs_inode.c 2013-06-03 19:35:13.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/xfs/xfs_inode.c linux-3.9.5-vs2.3.6.5/fs/xfs/xfs_inode.c
+--- linux-3.9.5/fs/xfs/xfs_inode.c 2013-05-31 13:45:25.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
*/
/* 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.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.3/fs/xfs/xfs_inode.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/xfs/xfs_inode.h linux-3.9.5-vs2.3.6.5/fs/xfs/xfs_inode.h
+--- linux-3.9.5/fs/xfs/xfs_inode.h 2013-05-31 13:45:25.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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 */
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.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.3/fs/xfs/xfs_ioctl.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/xfs/xfs_ioctl.c linux-3.9.5-vs2.3.6.5/fs/xfs/xfs_ioctl.c
+--- linux-3.9.5/fs/xfs/xfs_ioctl.c 2013-05-31 13:45:25.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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"
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.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.3/fs/xfs/xfs_ioctl.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/xfs/xfs_ioctl.h linux-3.9.5-vs2.3.6.5/fs/xfs/xfs_ioctl.h
+--- linux-3.9.5/fs/xfs/xfs_ioctl.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/xfs/xfs_ioctl.h 2013-05-31 14:47:11.000000000 +0000
@@ -70,6 +70,12 @@ xfs_handle_to_dentry(
void __user *uhandle,
u32 hlen);
extern 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.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.3/fs/xfs/xfs_iops.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/xfs/xfs_iops.c linux-3.9.5-vs2.3.6.5/fs/xfs/xfs_iops.c
+--- linux-3.9.5/fs/xfs/xfs_iops.c 2013-06-11 12:22:40.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/xfs/xfs_iops.c 2013-06-13 00:14:32.000000000 +0000
@@ -28,6 +28,7 @@
#include "xfs_bmap_btree.h"
#include "xfs_dinode.h"
stat->ino = ip->i_ino;
stat->atime = inode->i_atime;
stat->mtime = inode->i_mtime;
-@@ -1037,6 +1040,7 @@ static const struct inode_operations xfs
+@@ -1054,6 +1057,7 @@ static const struct inode_operations xfs
.listxattr = xfs_vn_listxattr,
.fiemap = xfs_vn_fiemap,
.update_time = xfs_vn_update_time,
};
static const struct inode_operations xfs_dir_inode_operations = {
-@@ -1063,6 +1067,7 @@ static const struct inode_operations xfs
+@@ -1080,6 +1084,7 @@ static const struct inode_operations xfs
.removexattr = generic_removexattr,
.listxattr = xfs_vn_listxattr,
.update_time = xfs_vn_update_time,
};
static const struct inode_operations xfs_dir_ci_inode_operations = {
-@@ -1114,6 +1119,10 @@ xfs_diflags_to_iflags(
+@@ -1131,6 +1136,10 @@ xfs_diflags_to_iflags(
inode->i_flags |= S_IMMUTABLE;
else
inode->i_flags &= ~S_IMMUTABLE;
if (ip->i_d.di_flags & XFS_DIFLAG_APPEND)
inode->i_flags |= S_APPEND;
else
-@@ -1126,6 +1135,15 @@ xfs_diflags_to_iflags(
+@@ -1143,6 +1152,15 @@ xfs_diflags_to_iflags(
inode->i_flags |= S_NOATIME;
else
inode->i_flags &= ~S_NOATIME;
}
/*
-@@ -1157,6 +1175,7 @@ xfs_setup_inode(
+@@ -1174,6 +1192,7 @@ xfs_setup_inode(
set_nlink(inode, ip->i_d.di_nlink);
inode->i_uid = ip->i_d.di_uid;
inode->i_gid = ip->i_d.di_gid;
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.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.3/fs/xfs/xfs_itable.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/xfs/xfs_itable.c linux-3.9.5-vs2.3.6.5/fs/xfs/xfs_itable.c
+--- linux-3.9.5/fs/xfs/xfs_itable.c 2013-02-19 13:58:49.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/xfs/xfs_itable.c 2013-05-31 14:47:11.000000000 +0000
@@ -97,6 +97,7 @@ xfs_bulkstat_one_int(
buf->bs_mode = dic->di_mode;
buf->bs_uid = dic->di_uid;
buf->bs_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.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.3/fs/xfs/xfs_linux.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/xfs/xfs_linux.h linux-3.9.5-vs2.3.6.5/fs/xfs/xfs_linux.h
+--- linux-3.9.5/fs/xfs/xfs_linux.h 2013-02-19 13:58:49.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/xfs/xfs_linux.h 2013-05-31 14:47:11.000000000 +0000
@@ -123,6 +123,7 @@
#define current_cpu() (raw_smp_processor_id())
#define current_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.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.3/fs/xfs/xfs_log_recover.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/xfs/xfs_log_recover.c linux-3.9.5-vs2.3.6.5/fs/xfs/xfs_log_recover.c
+--- linux-3.9.5/fs/xfs/xfs_log_recover.c 2013-05-31 13:45:25.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/xfs/xfs_log_recover.c 2013-05-31 14:47:11.000000000 +0000
@@ -2361,7 +2361,8 @@ xlog_recover_inode_pass2(
}
/* 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.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.3/fs/xfs/xfs_mount.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/xfs/xfs_mount.h linux-3.9.5-vs2.3.6.5/fs/xfs/xfs_mount.h
+--- linux-3.9.5/fs/xfs/xfs_mount.h 2013-05-31 13:45:25.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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 */
/*
* 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.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.3/fs/xfs/xfs_super.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/xfs/xfs_super.c linux-3.9.5-vs2.3.6.5/fs/xfs/xfs_super.c
+--- linux-3.9.5/fs/xfs/xfs_super.c 2013-05-31 13:45:25.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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 */
/*
* 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.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.3/fs/xfs/xfs_vnodeops.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/fs/xfs/xfs_vnodeops.c linux-3.9.5-vs2.3.6.5/fs/xfs/xfs_vnodeops.c
+--- linux-3.9.5/fs/xfs/xfs_vnodeops.c 2013-05-31 13:45:25.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/fs/xfs/xfs_vnodeops.c 2013-05-31 14:47:11.000000000 +0000
@@ -104,6 +104,77 @@ xfs_readlink_bmap(
return error;
}
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.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.3/include/linux/cred.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/cred.h linux-3.9.5-vs2.3.6.5/include/linux/cred.h
+--- linux-3.9.5/include/linux/cred.h 2013-02-19 13:58:50.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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 *);
/**
* 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.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.3/include/linux/devpts_fs.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/devpts_fs.h linux-3.9.5-vs2.3.6.5/include/linux/devpts_fs.h
+--- linux-3.9.5/include/linux/devpts_fs.h 2013-02-19 13:58:50.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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.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.3/include/linux/fs.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/fs.h linux-3.9.5-vs2.3.6.5/include/linux/fs.h
+--- linux-3.9.5/include/linux/fs.h 2013-05-31 13:45:27.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/include/linux/fs.h 2013-06-12 23:49:08.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) */
return from_kgid(&init_user_ns, inode->i_gid);
}
-+static inline tag_t i_tag_read(const struct inode *inode)
++static inline vtag_t i_tag_read(const struct inode *inode)
+{
+ return from_ktag(&init_user_ns, inode->i_tag);
+}
inode->i_gid = make_kgid(&init_user_ns, gid);
}
-+static inline void i_tag_write(struct inode *inode, tag_t tag)
++static inline void i_tag_write(struct inode *inode, vtag_t tag)
+{
+ inode->i_tag = make_ktag(&init_user_ns, tag);
+}
loff_t f_pos;
struct fown_struct f_owner;
const struct cred *f_cred;
-+ xid_t f_xid;
++ vxid_t f_xid;
struct file_ra_state f_ra;
u64 f_version;
struct file *fl_file;
loff_t fl_start;
loff_t fl_end;
-+ xid_t fl_xid;
++ vxid_t fl_xid;
struct fasync_struct * fl_fasync; /* for lease break notifications */
/* for lease breaks: */
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.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.3/include/linux/init_task.h 2013-05-31 14:53:41.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/init_task.h linux-3.9.5-vs2.3.6.5/include/linux/init_task.h
+--- linux-3.9.5/include/linux/init_task.h 2013-05-31 13:45:27.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/include/linux/init_task.h 2013-05-31 14:53:41.000000000 +0000
@@ -222,6 +222,10 @@ extern struct task_group root_task_group
INIT_TASK_RCU_PREEMPT(tsk) \
INIT_CPUSET_SEQ \
}
-diff -NurpP --minimal linux-3.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.3/include/linux/ipc.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/ipc.h linux-3.9.5-vs2.3.6.5/include/linux/ipc.h
+--- linux-3.9.5/include/linux/ipc.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/include/linux/ipc.h 2013-06-12 23:49:08.000000000 +0000
@@ -16,6 +16,7 @@ struct kern_ipc_perm
key_t key;
kuid_t uid;
kgid_t gid;
-+ xid_t xid;
++ vxid_t xid;
kuid_t cuid;
kgid_t cgid;
umode_t mode;
-diff -NurpP --minimal linux-3.9.4/include/linux/loop.h linux-3.9.4-vs2.3.6.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.3/include/linux/loop.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/loop.h linux-3.9.5-vs2.3.6.5/include/linux/loop.h
+--- linux-3.9.5/include/linux/loop.h 2013-02-19 13:58:51.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/include/linux/loop.h 2013-06-12 23:49:08.000000000 +0000
@@ -41,6 +41,7 @@ struct loop_device {
struct loop_func_table *lo_encryption;
__u32 lo_init[2];
kuid_t lo_key_owner; /* Who set the key */
-+ xid_t lo_xid;
++ vxid_t lo_xid;
int (*ioctl)(struct loop_device *, int cmd,
unsigned long arg);
-diff -NurpP --minimal linux-3.9.4/include/linux/memcontrol.h linux-3.9.4-vs2.3.6.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.3/include/linux/memcontrol.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/memcontrol.h linux-3.9.5-vs2.3.6.5/include/linux/memcontrol.h
+--- linux-3.9.5/include/linux/memcontrol.h 2013-05-31 13:45:28.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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);
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.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.3/include/linux/mm_types.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/mm_types.h linux-3.9.5-vs2.3.6.5/include/linux/mm_types.h
+--- linux-3.9.5/include/linux/mm_types.h 2013-05-31 13:45:28.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/include/linux/mm_types.h 2013-05-31 14:47:11.000000000 +0000
@@ -380,6 +380,7 @@ struct mm_struct {
/* Architecture-specific MM context */
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.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.3/include/linux/mount.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/mount.h linux-3.9.5-vs2.3.6.5/include/linux/mount.h
+--- linux-3.9.5/include/linux/mount.h 2013-05-31 13:45:28.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/include/linux/mount.h 2013-05-31 14:47:11.000000000 +0000
@@ -49,6 +49,9 @@ struct mnt_namespace;
#define MNT_LOCK_READONLY 0x400000
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.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.3/include/linux/net.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/net.h linux-3.9.5-vs2.3.6.5/include/linux/net.h
+--- linux-3.9.5/include/linux/net.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
#ifndef ARCH_HAS_SOCKET_TYPES
/**
-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.3/include/linux/netdevice.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/netdevice.h linux-3.9.5-vs2.3.6.5/include/linux/netdevice.h
+--- linux-3.9.5/include/linux/netdevice.h 2013-05-31 13:45:28.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/include/linux/netdevice.h 2013-05-31 14:47:11.000000000 +0000
@@ -1688,6 +1688,7 @@ extern void netdev_resync_ops(struct ne
extern struct net_device *dev_get_by_index(struct net *net, int ifindex);
extern struct net_device *dev_get_by_index_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.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.3/include/linux/nsproxy.h 2013-05-31 17:17:53.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/nsproxy.h linux-3.9.5-vs2.3.6.5/include/linux/nsproxy.h
+--- linux-3.9.5/include/linux/nsproxy.h 2013-02-19 13:58:51.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/include/linux/nsproxy.h 2013-05-31 17:17:53.000000000 +0000
@@ -3,6 +3,7 @@
#include <linux/spinlock.h>
}
#endif
-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.3/include/linux/pid.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/pid.h linux-3.9.5-vs2.3.6.5/include/linux/pid.h
+--- linux-3.9.5/include/linux/pid.h 2013-05-31 13:45:28.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/include/linux/pid.h 2013-05-31 14:47:11.000000000 +0000
@@ -8,7 +8,8 @@ enum pid_type
PIDTYPE_PID,
PIDTYPE_PGID,
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.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.3/include/linux/proc_fs.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/proc_fs.h linux-3.9.5-vs2.3.6.5/include/linux/proc_fs.h
+--- linux-3.9.5/include/linux/proc_fs.h 2013-05-31 13:45:28.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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;
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.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.3/include/linux/quotaops.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/quotaops.h linux-3.9.5-vs2.3.6.5/include/linux/quotaops.h
+--- linux-3.9.5/include/linux/quotaops.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/include/linux/quotaops.h 2013-05-31 14:47:11.000000000 +0000
@@ -8,6 +8,7 @@
#define _LINUX_QUOTAOPS_
}
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.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.3/include/linux/sched.h 2013-06-03 17:32:54.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/sched.h linux-3.9.5-vs2.3.6.5/include/linux/sched.h
+--- linux-3.9.5/include/linux/sched.h 2013-06-11 12:22:40.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/include/linux/sched.h 2013-06-12 23:49:08.000000000 +0000
@@ -1398,6 +1398,14 @@ struct task_struct {
#endif
struct seccomp seccomp;
+ struct vx_info *vx_info;
+ struct nx_info *nx_info;
+
-+ xid_t xid;
-+ nid_t nid;
-+ tag_t tag;
++ vxid_t xid;
++ vnid_t nid;
++ vtag_t tag;
+
/* Thread group tracking */
u32 parent_exec_id;
}
-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.3/include/linux/shmem_fs.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/shmem_fs.h linux-3.9.5-vs2.3.6.5/include/linux/shmem_fs.h
+--- linux-3.9.5/include/linux/shmem_fs.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/include/linux/shmem_fs.h 2013-05-31 14:47:11.000000000 +0000
@@ -9,6 +9,9 @@
/* inode in-kernel data */
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.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.3/include/linux/stat.h 2013-06-01 08:53:13.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/stat.h linux-3.9.5-vs2.3.6.5/include/linux/stat.h
+--- linux-3.9.5/include/linux/stat.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/include/linux/stat.h 2013-06-01 08:53:13.000000000 +0000
@@ -25,6 +25,7 @@ struct kstat {
unsigned int nlink;
kuid_t uid;
dev_t rdev;
loff_t size;
struct timespec atime;
-diff -NurpP --minimal linux-3.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.3/include/linux/sunrpc/auth.h 2013-05-31 14:52:57.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/sunrpc/auth.h linux-3.9.5-vs2.3.6.5/include/linux/sunrpc/auth.h
+--- linux-3.9.5/include/linux/sunrpc/auth.h 2013-05-31 13:45:28.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/include/linux/sunrpc/auth.h 2013-05-31 14:52:57.000000000 +0000
@@ -26,6 +26,7 @@
struct auth_cred {
kuid_t uid;
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.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.3/include/linux/sunrpc/clnt.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/sunrpc/clnt.h linux-3.9.5-vs2.3.6.5/include/linux/sunrpc/clnt.h
+--- linux-3.9.5/include/linux/sunrpc/clnt.h 2013-05-31 13:45:28.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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 */
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.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.3/include/linux/sysfs.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/sysfs.h linux-3.9.5-vs2.3.6.5/include/linux/sysfs.h
+--- linux-3.9.5/include/linux/sysfs.h 2013-05-31 13:45:28.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/include/linux/sysfs.h 2013-05-31 14:47:11.000000000 +0000
@@ -19,6 +19,8 @@
#include <linux/kobject_ns.h>
#include <linux/atomic.h>
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.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.3/include/linux/types.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/types.h linux-3.9.5-vs2.3.6.5/include/linux/types.h
+--- linux-3.9.5/include/linux/types.h 2013-02-19 13:58:52.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/include/linux/types.h 2013-06-12 23:49:08.000000000 +0000
@@ -32,6 +32,9 @@ typedef __kernel_uid32_t uid_t;
typedef __kernel_gid32_t gid_t;
typedef __kernel_uid16_t uid16_t;
typedef __kernel_gid16_t gid16_t;
-+typedef unsigned int xid_t;
-+typedef unsigned int nid_t;
-+typedef unsigned int tag_t;
++typedef unsigned int vxid_t;
++typedef unsigned int vnid_t;
++typedef unsigned int vtag_t;
typedef unsigned long uintptr_t;
-diff -NurpP --minimal linux-3.9.4/include/linux/uidgid.h linux-3.9.4-vs2.3.6.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.3/include/linux/uidgid.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/uidgid.h linux-3.9.5-vs2.3.6.5/include/linux/uidgid.h
+--- linux-3.9.5/include/linux/uidgid.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/include/linux/uidgid.h 2013-06-12 23:49:08.000000000 +0000
@@ -23,13 +23,17 @@ typedef struct {
uid_t val;
} kuid_t;
} kgid_t;
+typedef struct {
-+ tag_t val;
++ vtag_t val;
+} ktag_t;
+
#define KUIDT_INIT(value) (kuid_t){ value }
return gid.val;
}
-+static inline tag_t __ktag_val(ktag_t tag)
++static inline vtag_t __ktag_val(ktag_t tag)
+{
+ return tag.val;
+}
typedef uid_t kuid_t;
typedef gid_t kgid_t;
-+typedef tag_t ktag_t;
++typedef vtag_t ktag_t;
static inline uid_t __kuid_val(kuid_t uid)
{
return gid;
}
-+static inline tag_t __ktag_val(ktag_t tag)
++static inline vtag_t __ktag_val(ktag_t tag)
+{
+ return tag;
+}
extern uid_t from_kuid(struct user_namespace *to, kuid_t uid);
extern gid_t from_kgid(struct user_namespace *to, kgid_t gid);
-+extern tag_t from_ktag(struct user_namespace *to, ktag_t tag);
++extern vtag_t from_ktag(struct user_namespace *to, ktag_t tag);
+
extern uid_t from_kuid_munged(struct user_namespace *to, kuid_t uid);
extern gid_t from_kgid_munged(struct user_namespace *to, kgid_t gid);
return KGIDT_INIT(gid);
}
-+static inline ktag_t make_ktag(struct user_namespace *from, tag_t tag)
++static inline ktag_t make_ktag(struct user_namespace *from, vtag_t tag)
+{
+ return KTAGT_INIT(tag);
+}
return __kgid_val(kgid);
}
-+static inline tag_t from_ktag(struct user_namespace *to, ktag_t ktag)
++static inline vtag_t from_ktag(struct user_namespace *to, ktag_t ktag)
+{
+ return __ktag_val(ktag);
+}
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.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.3/include/linux/vroot.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vroot.h linux-3.9.5-vs2.3.6.5/include/linux/vroot.h
+--- linux-3.9.5/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/include/linux/vroot.h 2013-05-31 14:47:11.000000000 +0000
@@ -0,0 +1,51 @@
+
+/*
+#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.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.3/include/linux/vs_base.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vs_base.h linux-3.9.5-vs2.3.6.5/include/linux/vs_base.h
+--- linux-3.9.5/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+#else
+#warning duplicate inclusion
+#endif
-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.3/include/linux/vs_context.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vs_context.h linux-3.9.5-vs2.3.6.5/include/linux/vs_context.h
+--- linux-3.9.5/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/include/linux/vs_context.h 2013-06-12 23:49:08.000000000 +0000
@@ -0,0 +1,242 @@
+#ifndef _VS_CONTEXT_H
+#define _VS_CONTEXT_H
+static inline void __enter_vx_admin(struct vx_info_save *vxis)
+{
+ vxis->vxi = xchg(¤t->vx_info, NULL);
-+ vxis->xid = xchg(¤t->xid, (xid_t)0);
++ vxis->xid = xchg(¤t->xid, (vxid_t)0);
+}
+
+static inline void __leave_vx_admin(struct vx_info_save *vxis)
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.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.3/include/linux/vs_cowbl.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vs_cowbl.h linux-3.9.5-vs2.3.6.5/include/linux/vs_cowbl.h
+--- linux-3.9.5/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+#else
+#warning duplicate inclusion
+#endif
-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.3/include/linux/vs_cvirt.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vs_cvirt.h linux-3.9.5-vs2.3.6.5/include/linux/vs_cvirt.h
+--- linux-3.9.5/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+#else
+#warning duplicate inclusion
+#endif
-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.3/include/linux/vs_device.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vs_device.h linux-3.9.5-vs2.3.6.5/include/linux/vs_device.h
+--- linux-3.9.5/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+#else
+#warning duplicate inclusion
+#endif
-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.3/include/linux/vs_dlimit.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vs_dlimit.h linux-3.9.5-vs2.3.6.5/include/linux/vs_dlimit.h
+--- linux-3.9.5/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/include/linux/vs_dlimit.h 2013-06-12 23:49:08.000000000 +0000
@@ -0,0 +1,215 @@
+#ifndef _VS_DLIMIT_H
+#define _VS_DLIMIT_H
+#define __dlimit_char(d) ((d) ? '*' : ' ')
+
+static inline int __dl_alloc_space(struct super_block *sb,
-+ tag_t tag, dlsize_t nr, const char *file, int line)
++ vtag_t tag, dlsize_t nr, const char *file, int line)
+{
+ struct dl_info *dli = NULL;
+ int ret = 0;
+}
+
+static inline void __dl_free_space(struct super_block *sb,
-+ tag_t tag, dlsize_t nr, const char *_file, int _line)
++ vtag_t tag, dlsize_t nr, const char *_file, int _line)
+{
+ struct dl_info *dli = NULL;
+
+}
+
+static inline int __dl_alloc_inode(struct super_block *sb,
-+ tag_t tag, const char *_file, int _line)
++ vtag_t tag, const char *_file, int _line)
+{
+ struct dl_info *dli;
+ int ret = 0;
+}
+
+static inline void __dl_free_inode(struct super_block *sb,
-+ tag_t tag, const char *_file, int _line)
++ vtag_t tag, const char *_file, int _line)
+{
+ struct dl_info *dli;
+
+ sb, tag, __dlimit_char(dli), _file, _line);
+}
+
-+static inline void __dl_adjust_block(struct super_block *sb, tag_t tag,
++static inline void __dl_adjust_block(struct super_block *sb, vtag_t tag,
+ unsigned long long *free_blocks, unsigned long long *root_blocks,
+ const char *_file, int _line)
+{
+#else
+#warning duplicate inclusion
+#endif
-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.3/include/linux/vs_inet.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vs_inet.h linux-3.9.5-vs2.3.6.5/include/linux/vs_inet.h
+--- linux-3.9.5/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+#else
+// #warning duplicate inclusion
+#endif
-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.3/include/linux/vs_inet6.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vs_inet6.h linux-3.9.5-vs2.3.6.5/include/linux/vs_inet6.h
+--- linux-3.9.5/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+#else
+#warning duplicate inclusion
+#endif
-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.3/include/linux/vs_limit.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vs_limit.h linux-3.9.5-vs2.3.6.5/include/linux/vs_limit.h
+--- linux-3.9.5/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+#else
+#warning duplicate inclusion
+#endif
-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.3/include/linux/vs_network.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vs_network.h linux-3.9.5-vs2.3.6.5/include/linux/vs_network.h
+--- linux-3.9.5/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+#else
+#warning duplicate inclusion
+#endif
-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.3/include/linux/vs_pid.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vs_pid.h linux-3.9.5-vs2.3.6.5/include/linux/vs_pid.h
+--- linux-3.9.5/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+#else
+#warning duplicate inclusion
+#endif
-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.3/include/linux/vs_sched.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vs_sched.h linux-3.9.5-vs2.3.6.5/include/linux/vs_sched.h
+--- linux-3.9.5/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+#else
+#warning duplicate inclusion
+#endif
-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.3/include/linux/vs_socket.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vs_socket.h linux-3.9.5-vs2.3.6.5/include/linux/vs_socket.h
+--- linux-3.9.5/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+#else
+#warning duplicate inclusion
+#endif
-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.3/include/linux/vs_tag.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vs_tag.h linux-3.9.5-vs2.3.6.5/include/linux/vs_tag.h
+--- linux-3.9.5/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/include/linux/vs_tag.h 2013-06-12 23:49:08.000000000 +0000
@@ -0,0 +1,47 @@
+#ifndef _VS_TAG_H
+#define _VS_TAG_H
+ * check current context for ADMIN/WATCH and
+ * optionally against supplied argument
+ */
-+static inline int __dx_check(tag_t cid, tag_t id, unsigned int mode)
++static inline int __dx_check(vtag_t cid, vtag_t id, unsigned int mode)
+{
+ if (mode & DX_ARG_MASK) {
+ if ((mode & DX_IDENT) && (id == cid))
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.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.3/include/linux/vs_time.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vs_time.h linux-3.9.5-vs2.3.6.5/include/linux/vs_time.h
+--- linux-3.9.5/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+#else
+#warning duplicate inclusion
+#endif
-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.3/include/linux/vserver/base.h 2013-05-31 17:55:09.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vserver/base.h linux-3.9.5-vs2.3.6.5/include/linux/vserver/base.h
+--- linux-3.9.5/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+#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.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.3/include/linux/vserver/cacct.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vserver/cacct.h linux-3.9.5-vs2.3.6.5/include/linux/vserver/cacct.h
+--- linux-3.9.5/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+};
+
+#endif /* _VSERVER_CACCT_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.3/include/linux/vserver/cacct_cmd.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vserver/cacct_cmd.h linux-3.9.5-vs2.3.6.5/include/linux/vserver/cacct_cmd.h
+--- linux-3.9.5/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+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.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.3/include/linux/vserver/cacct_def.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vserver/cacct_def.h linux-3.9.5-vs2.3.6.5/include/linux/vserver/cacct_def.h
+--- linux-3.9.5/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+#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.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.3/include/linux/vserver/cacct_int.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vserver/cacct_int.h linux-3.9.5-vs2.3.6.5/include/linux/vserver/cacct_int.h
+--- linux-3.9.5/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+}
+
+#endif /* _VSERVER_CACCT_INT_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.3/include/linux/vserver/check.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vserver/check.h linux-3.9.5-vs2.3.6.5/include/linux/vserver/check.h
+--- linux-3.9.5/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+#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.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.3/include/linux/vserver/context.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vserver/context.h linux-3.9.5-vs2.3.6.5/include/linux/vserver/context.h
+--- linux-3.9.5/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/include/linux/vserver/context.h 2013-06-12 23:49:08.000000000 +0000
@@ -0,0 +1,110 @@
+#ifndef _VSERVER_CONTEXT_H
+#define _VSERVER_CONTEXT_H
+
+struct vx_info {
+ struct hlist_node vx_hlist; /* linked list of contexts */
-+ xid_t vx_id; /* context id */
++ vxid_t vx_id; /* context id */
+ atomic_t vx_usecnt; /* usage count */
+ atomic_t vx_tasks; /* tasks count */
+ struct vx_info *vx_parent; /* parent context */
+
+struct vx_info_save {
+ struct vx_info *vxi;
-+ xid_t xid;
++ vxid_t xid;
+};
+
+
+extern struct vx_info *lookup_or_create_vx_info(int);
+
+extern int get_xid_list(int, unsigned int *, int);
-+extern int xid_is_hashed(xid_t);
++extern int xid_is_hashed(vxid_t);
+
+extern int vx_migrate_task(struct task_struct *, struct vx_info *, int);
+
+
+
+#endif /* _VSERVER_CONTEXT_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.3/include/linux/vserver/context_cmd.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vserver/context_cmd.h linux-3.9.5-vs2.3.6.5/include/linux/vserver/context_cmd.h
+--- linux-3.9.5/include/linux/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+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.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.3/include/linux/vserver/cvirt.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vserver/cvirt.h linux-3.9.5-vs2.3.6.5/include/linux/vserver/cvirt.h
+--- linux-3.9.5/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+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.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.3/include/linux/vserver/cvirt_cmd.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vserver/cvirt_cmd.h linux-3.9.5-vs2.3.6.5/include/linux/vserver/cvirt_cmd.h
+--- linux-3.9.5/include/linux/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+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.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.3/include/linux/vserver/cvirt_def.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vserver/cvirt_def.h linux-3.9.5-vs2.3.6.5/include/linux/vserver/cvirt_def.h
+--- linux-3.9.5/include/linux/vserver/cvirt_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+#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.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.3/include/linux/vserver/debug.h 2013-06-03 18:27:34.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vserver/debug.h linux-3.9.5-vs2.3.6.5/include/linux/vserver/debug.h
+--- linux-3.9.5/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+
+
+#endif /* _VSERVER_DEBUG_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.3/include/linux/vserver/debug_cmd.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vserver/debug_cmd.h linux-3.9.5-vs2.3.6.5/include/linux/vserver/debug_cmd.h
+--- linux-3.9.5/include/linux/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+#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.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.3/include/linux/vserver/device.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vserver/device.h linux-3.9.5-vs2.3.6.5/include/linux/vserver/device.h
+--- linux-3.9.5/include/linux/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+#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.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.3/include/linux/vserver/device_cmd.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vserver/device_cmd.h linux-3.9.5-vs2.3.6.5/include/linux/vserver/device_cmd.h
+--- linux-3.9.5/include/linux/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+#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.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.3/include/linux/vserver/device_def.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vserver/device_def.h linux-3.9.5-vs2.3.6.5/include/linux/vserver/device_def.h
+--- linux-3.9.5/include/linux/vserver/device_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+};
+
+#endif /* _VSERVER_DEVICE_DEF_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.3/include/linux/vserver/dlimit.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vserver/dlimit.h linux-3.9.5-vs2.3.6.5/include/linux/vserver/dlimit.h
+--- linux-3.9.5/include/linux/vserver/dlimit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/include/linux/vserver/dlimit.h 2013-06-12 23:49:09.000000000 +0000
@@ -0,0 +1,54 @@
+#ifndef _VSERVER_DLIMIT_H
+#define _VSERVER_DLIMIT_H
+struct dl_info {
+ struct hlist_node dl_hlist; /* linked list of contexts */
+ struct rcu_head dl_rcu; /* the rcu head */
-+ tag_t dl_tag; /* context tag */
++ vtag_t dl_tag; /* context tag */
+ atomic_t dl_usecnt; /* usage count */
+ atomic_t dl_refcnt; /* reference count */
+
+extern void rcu_free_dl_info(struct rcu_head *);
+extern void unhash_dl_info(struct dl_info *);
+
-+extern struct dl_info *locate_dl_info(struct super_block *, tag_t);
++extern struct dl_info *locate_dl_info(struct super_block *, vtag_t);
+
+
+struct kstatfs;
+#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.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.3/include/linux/vserver/dlimit_cmd.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vserver/dlimit_cmd.h linux-3.9.5-vs2.3.6.5/include/linux/vserver/dlimit_cmd.h
+--- linux-3.9.5/include/linux/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+#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.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.3/include/linux/vserver/global.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vserver/global.h linux-3.9.5-vs2.3.6.5/include/linux/vserver/global.h
+--- linux-3.9.5/include/linux/vserver/global.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+
+
+#endif /* _VSERVER_GLOBAL_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.3/include/linux/vserver/history.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vserver/history.h linux-3.9.5-vs2.3.6.5/include/linux/vserver/history.h
+--- linux-3.9.5/include/linux/vserver/history.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+#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.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.3/include/linux/vserver/inode.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vserver/inode.h linux-3.9.5-vs2.3.6.5/include/linux/vserver/inode.h
+--- linux-3.9.5/include/linux/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+#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.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.3/include/linux/vserver/inode_cmd.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vserver/inode_cmd.h linux-3.9.5-vs2.3.6.5/include/linux/vserver/inode_cmd.h
+--- linux-3.9.5/include/linux/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+#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.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.3/include/linux/vserver/limit.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vserver/limit.h linux-3.9.5-vs2.3.6.5/include/linux/vserver/limit.h
+--- linux-3.9.5/include/linux/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+#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.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.3/include/linux/vserver/limit_cmd.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vserver/limit_cmd.h linux-3.9.5-vs2.3.6.5/include/linux/vserver/limit_cmd.h
+--- linux-3.9.5/include/linux/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+#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.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.3/include/linux/vserver/limit_def.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vserver/limit_def.h linux-3.9.5-vs2.3.6.5/include/linux/vserver/limit_def.h
+--- linux-3.9.5/include/linux/vserver/limit_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+#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.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.3/include/linux/vserver/limit_int.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vserver/limit_int.h linux-3.9.5-vs2.3.6.5/include/linux/vserver/limit_int.h
+--- linux-3.9.5/include/linux/vserver/limit_int.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+
+
+#endif /* _VSERVER_LIMIT_INT_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.3/include/linux/vserver/monitor.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vserver/monitor.h linux-3.9.5-vs2.3.6.5/include/linux/vserver/monitor.h
+--- linux-3.9.5/include/linux/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+#include <uapi/vserver/monitor.h>
+
+#endif /* _VSERVER_MONITOR_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.3/include/linux/vserver/network.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vserver/network.h linux-3.9.5-vs2.3.6.5/include/linux/vserver/network.h
+--- linux-3.9.5/include/linux/vserver/network.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/include/linux/vserver/network.h 2013-06-12 23:49:09.000000000 +0000
@@ -0,0 +1,76 @@
+#ifndef _VSERVER_NETWORK_H
+#define _VSERVER_NETWORK_H
+
+struct nx_info {
+ struct hlist_node nx_hlist; /* linked list of nxinfos */
-+ nid_t nx_id; /* vnet id */
++ vnid_t nx_id; /* vnet id */
+ atomic_t nx_usecnt; /* usage count */
+ atomic_t nx_tasks; /* tasks count */
+ int nx_state; /* context state */
+extern struct nx_info *lookup_nx_info(int);
+
+extern int get_nid_list(int, unsigned int *, int);
-+extern int nid_is_hashed(nid_t);
++extern int nid_is_hashed(vnid_t);
+
+extern int nx_migrate_task(struct task_struct *, struct nx_info *);
+
+#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.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.3/include/linux/vserver/network_cmd.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vserver/network_cmd.h linux-3.9.5-vs2.3.6.5/include/linux/vserver/network_cmd.h
+--- linux-3.9.5/include/linux/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+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.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.3/include/linux/vserver/percpu.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vserver/percpu.h linux-3.9.5-vs2.3.6.5/include/linux/vserver/percpu.h
+--- linux-3.9.5/include/linux/vserver/percpu.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+#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.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.3/include/linux/vserver/pid.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vserver/pid.h linux-3.9.5-vs2.3.6.5/include/linux/vserver/pid.h
+--- linux-3.9.5/include/linux/vserver/pid.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+}
+
+#endif
-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.3/include/linux/vserver/sched.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vserver/sched.h linux-3.9.5-vs2.3.6.5/include/linux/vserver/sched.h
+--- linux-3.9.5/include/linux/vserver/sched.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+#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.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.3/include/linux/vserver/sched_cmd.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vserver/sched_cmd.h linux-3.9.5-vs2.3.6.5/include/linux/vserver/sched_cmd.h
+--- linux-3.9.5/include/linux/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+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.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.3/include/linux/vserver/sched_def.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vserver/sched_def.h linux-3.9.5-vs2.3.6.5/include/linux/vserver/sched_def.h
+--- linux-3.9.5/include/linux/vserver/sched_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+#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.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.3/include/linux/vserver/signal.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vserver/signal.h linux-3.9.5-vs2.3.6.5/include/linux/vserver/signal.h
+--- linux-3.9.5/include/linux/vserver/signal.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+#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.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.3/include/linux/vserver/signal_cmd.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vserver/signal_cmd.h linux-3.9.5-vs2.3.6.5/include/linux/vserver/signal_cmd.h
+--- linux-3.9.5/include/linux/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+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.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.3/include/linux/vserver/space.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vserver/space.h linux-3.9.5-vs2.3.6.5/include/linux/vserver/space.h
+--- linux-3.9.5/include/linux/vserver/space.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+#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.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.3/include/linux/vserver/space_cmd.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vserver/space_cmd.h linux-3.9.5-vs2.3.6.5/include/linux/vserver/space_cmd.h
+--- linux-3.9.5/include/linux/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+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.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.3/include/linux/vserver/switch.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vserver/switch.h linux-3.9.5-vs2.3.6.5/include/linux/vserver/switch.h
+--- linux-3.9.5/include/linux/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+#include <uapi/vserver/switch.h>
+
+#endif /* _VSERVER_SWITCH_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.3/include/linux/vserver/tag.h 2013-06-03 20:23:02.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vserver/tag.h linux-3.9.5-vs2.3.6.5/include/linux/vserver/tag.h
+--- linux-3.9.5/include/linux/vserver/tag.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/include/linux/vserver/tag.h 2013-06-12 23:49:09.000000000 +0000
@@ -0,0 +1,160 @@
+#ifndef _DX_TAG_H
+#define _DX_TAG_H
+
+#define dx_notagcheck(sb) ((sb) && ((sb)->s_flags & MS_NOTAGCHECK))
+
-+int dx_parse_tag(char *string, tag_t *tag, int remove, int *mnt_flags,
++int dx_parse_tag(char *string, vtag_t *tag, int remove, int *mnt_flags,
+ unsigned long *flags);
+
+#ifdef CONFIG_PROPAGATE
+#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.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.3/include/linux/vserver/tag_cmd.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/linux/vserver/tag_cmd.h linux-3.9.5-vs2.3.6.5/include/linux/vserver/tag_cmd.h
+--- linux-3.9.5/include/linux/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+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.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.3/include/net/addrconf.h 2013-05-31 17:17:53.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/net/addrconf.h linux-3.9.5-vs2.3.6.5/include/net/addrconf.h
+--- linux-3.9.5/include/net/addrconf.h 2013-05-31 13:45:28.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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,
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.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.3/include/net/af_unix.h 2013-05-31 17:17:53.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/net/af_unix.h linux-3.9.5-vs2.3.6.5/include/net/af_unix.h
+--- linux-3.9.5/include/net/af_unix.h 2013-02-19 13:58:52.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/include/net/af_unix.h 2013-05-31 17:17:53.000000000 +0000
@@ -4,6 +4,7 @@
#include <linux/socket.h>
#include <linux/un.h>
#include <net/sock.h>
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.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.3/include/net/inet_timewait_sock.h 2013-05-31 17:18:34.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/net/inet_timewait_sock.h linux-3.9.5-vs2.3.6.5/include/net/inet_timewait_sock.h
+--- linux-3.9.5/include/net/inet_timewait_sock.h 2013-05-31 13:45:28.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
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.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.3/include/net/ip6_route.h 2013-05-31 17:17:53.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/net/ip6_route.h linux-3.9.5-vs2.3.6.5/include/net/ip6_route.h
+--- linux-3.9.5/include/net/ip6_route.h 2013-05-31 13:45:28.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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,
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.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.3/include/net/route.h 2013-05-31 17:17:53.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/net/route.h linux-3.9.5-vs2.3.6.5/include/net/route.h
+--- linux-3.9.5/include/net/route.h 2013-02-19 13:58:52.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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);
}
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.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.3/include/net/sock.h 2013-05-31 17:17:53.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/net/sock.h linux-3.9.5-vs2.3.6.5/include/net/sock.h
+--- linux-3.9.5/include/net/sock.h 2013-06-11 12:22:40.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/include/net/sock.h 2013-06-12 23:49:09.000000000 +0000
@@ -191,6 +191,10 @@ struct sock_common {
#ifdef CONFIG_NET_NS
struct net *skc_net;
#endif
-+ xid_t skc_xid;
++ vxid_t skc_xid;
+ struct vx_info *skc_vx_info;
-+ nid_t skc_nid;
++ vnid_t skc_nid;
+ struct nx_info *skc_nx_info;
/*
* fields between dontcopy_begin/dontcopy_end
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.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.3/include/uapi/Kbuild 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/uapi/Kbuild linux-3.9.5-vs2.3.6.5/include/uapi/Kbuild
+--- linux-3.9.5/include/uapi/Kbuild 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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.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.3/include/uapi/linux/capability.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/uapi/linux/capability.h linux-3.9.5-vs2.3.6.5/include/uapi/linux/capability.h
+--- linux-3.9.5/include/uapi/linux/capability.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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 */
/*
* 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.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.3/include/uapi/linux/fs.h 2013-05-31 23:07:43.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/uapi/linux/fs.h linux-3.9.5-vs2.3.6.5/include/uapi/linux/fs.h
+--- linux-3.9.5/include/uapi/linux/fs.h 2013-05-31 13:45:29.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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 */
#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.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.3/include/uapi/linux/gfs2_ondisk.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/uapi/linux/gfs2_ondisk.h linux-3.9.5-vs2.3.6.5/include/uapi/linux/gfs2_ondisk.h
+--- linux-3.9.5/include/uapi/linux/gfs2_ondisk.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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,
#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.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.3/include/uapi/linux/if_tun.h 2013-05-31 15:00:16.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/uapi/linux/if_tun.h linux-3.9.5-vs2.3.6.5/include/uapi/linux/if_tun.h
+--- linux-3.9.5/include/uapi/linux/if_tun.h 2013-02-19 13:58:55.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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)
/* 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.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.3/include/uapi/linux/major.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/uapi/linux/major.h linux-3.9.5-vs2.3.6.5/include/uapi/linux/major.h
+--- linux-3.9.5/include/uapi/linux/major.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
#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.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.3/include/uapi/linux/nfs_mount.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/uapi/linux/nfs_mount.h linux-3.9.5-vs2.3.6.5/include/uapi/linux/nfs_mount.h
+--- linux-3.9.5/include/uapi/linux/nfs_mount.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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 */
/* 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.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.3/include/uapi/linux/reboot.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/uapi/linux/reboot.h linux-3.9.5-vs2.3.6.5/include/uapi/linux/reboot.h
+--- linux-3.9.5/include/uapi/linux/reboot.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
#endif /* _UAPI_LINUX_REBOOT_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.3/include/uapi/linux/sysctl.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/uapi/linux/sysctl.h linux-3.9.5-vs2.3.6.5/include/uapi/linux/sysctl.h
+--- linux-3.9.5/include/uapi/linux/sysctl.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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) */
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.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.3/include/uapi/vserver/Kbuild 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/uapi/vserver/Kbuild linux-3.9.5-vs2.3.6.5/include/uapi/vserver/Kbuild
+--- linux-3.9.5/include/uapi/vserver/Kbuild 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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 \
+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.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.3/include/uapi/vserver/cacct_cmd.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/uapi/vserver/cacct_cmd.h linux-3.9.5-vs2.3.6.5/include/uapi/vserver/cacct_cmd.h
+--- linux-3.9.5/include/uapi/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+};
+
+#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.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.3/include/uapi/vserver/context.h 2013-05-31 19:44:13.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/uapi/vserver/context.h linux-3.9.5-vs2.3.6.5/include/uapi/vserver/context.h
+--- linux-3.9.5/include/uapi/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+#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.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.3/include/uapi/vserver/context_cmd.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/uapi/vserver/context_cmd.h linux-3.9.5-vs2.3.6.5/include/uapi/vserver/context_cmd.h
+--- linux-3.9.5/include/uapi/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+};
+
+#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.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.3/include/uapi/vserver/cvirt_cmd.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/uapi/vserver/cvirt_cmd.h linux-3.9.5-vs2.3.6.5/include/uapi/vserver/cvirt_cmd.h
+--- linux-3.9.5/include/uapi/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+};
+
+#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.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.3/include/uapi/vserver/debug_cmd.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/uapi/vserver/debug_cmd.h linux-3.9.5-vs2.3.6.5/include/uapi/vserver/debug_cmd.h
+--- linux-3.9.5/include/uapi/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+};
+
+#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.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.3/include/uapi/vserver/device.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/uapi/vserver/device.h linux-3.9.5-vs2.3.6.5/include/uapi/vserver/device.h
+--- linux-3.9.5/include/uapi/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+#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.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.3/include/uapi/vserver/device_cmd.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/uapi/vserver/device_cmd.h linux-3.9.5-vs2.3.6.5/include/uapi/vserver/device_cmd.h
+--- linux-3.9.5/include/uapi/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+};
+
+#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.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.3/include/uapi/vserver/dlimit_cmd.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/uapi/vserver/dlimit_cmd.h linux-3.9.5-vs2.3.6.5/include/uapi/vserver/dlimit_cmd.h
+--- linux-3.9.5/include/uapi/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+}
+
+#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.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.3/include/uapi/vserver/inode.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/uapi/vserver/inode.h linux-3.9.5-vs2.3.6.5/include/uapi/vserver/inode.h
+--- linux-3.9.5/include/uapi/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+#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.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.3/include/uapi/vserver/inode_cmd.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/uapi/vserver/inode_cmd.h linux-3.9.5-vs2.3.6.5/include/uapi/vserver/inode_cmd.h
+--- linux-3.9.5/include/uapi/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+};
+
+#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.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.3/include/uapi/vserver/limit.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/uapi/vserver/limit.h linux-3.9.5-vs2.3.6.5/include/uapi/vserver/limit.h
+--- linux-3.9.5/include/uapi/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+#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.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.3/include/uapi/vserver/limit_cmd.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/uapi/vserver/limit_cmd.h linux-3.9.5-vs2.3.6.5/include/uapi/vserver/limit_cmd.h
+--- linux-3.9.5/include/uapi/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+#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.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.3/include/uapi/vserver/monitor.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/uapi/vserver/monitor.h linux-3.9.5-vs2.3.6.5/include/uapi/vserver/monitor.h
+--- linux-3.9.5/include/uapi/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+};
+
+#endif /* _UAPI_VS_MONITOR_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.3/include/uapi/vserver/network.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/uapi/vserver/network.h linux-3.9.5-vs2.3.6.5/include/uapi/vserver/network.h
+--- linux-3.9.5/include/uapi/vserver/network.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+#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.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.3/include/uapi/vserver/network_cmd.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/uapi/vserver/network_cmd.h linux-3.9.5-vs2.3.6.5/include/uapi/vserver/network_cmd.h
+--- linux-3.9.5/include/uapi/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+};
+
+#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.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.3/include/uapi/vserver/sched_cmd.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/uapi/vserver/sched_cmd.h linux-3.9.5-vs2.3.6.5/include/uapi/vserver/sched_cmd.h
+--- linux-3.9.5/include/uapi/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+#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.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.3/include/uapi/vserver/signal_cmd.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/uapi/vserver/signal_cmd.h linux-3.9.5-vs2.3.6.5/include/uapi/vserver/signal_cmd.h
+--- linux-3.9.5/include/uapi/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+};
+
+#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.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.3/include/uapi/vserver/space_cmd.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/uapi/vserver/space_cmd.h linux-3.9.5-vs2.3.6.5/include/uapi/vserver/space_cmd.h
+--- linux-3.9.5/include/uapi/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+};
+
+#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.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.3/include/uapi/vserver/switch.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/uapi/vserver/switch.h linux-3.9.5-vs2.3.6.5/include/uapi/vserver/switch.h
+--- linux-3.9.5/include/uapi/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+#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.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.3/include/uapi/vserver/tag_cmd.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/include/uapi/vserver/tag_cmd.h linux-3.9.5-vs2.3.6.5/include/uapi/vserver/tag_cmd.h
+--- linux-3.9.5/include/uapi/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+#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.3/init/Kconfig
---- linux-3.9.4/init/Kconfig 2013-05-31 13:45:29.000000000 +0000
-+++ linux-3.9.4-vs2.3.6.3/init/Kconfig 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/init/Kconfig linux-3.9.5-vs2.3.6.5/init/Kconfig
+--- linux-3.9.5/init/Kconfig 2013-05-31 13:45:29.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/init/Kconfig 2013-05-31 14:47:11.000000000 +0000
@@ -760,6 +760,7 @@ config NUMA_BALANCING
menuconfig CGROUPS
boolean "Control Group support"
select UIDGID_STRICT_TYPE_CHECKS
default n
-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.3/init/main.c 2013-05-31 15:09:17.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/init/main.c linux-3.9.5-vs2.3.6.5/init/main.c
+--- linux-3.9.5/init/main.c 2013-05-31 13:45:29.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/init/main.c 2013-05-31 15:09:17.000000000 +0000
@@ -72,6 +72,7 @@
#include <linux/ptrace.h>
#include <linux/blkdev.h>
#include <asm/io.h>
#include <asm/bugs.h>
-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.3/ipc/mqueue.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/ipc/mqueue.c linux-3.9.5-vs2.3.6.5/ipc/mqueue.c
+--- linux-3.9.5/ipc/mqueue.c 2013-05-31 13:45:29.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/ipc/mqueue.c 2013-05-31 14:47:11.000000000 +0000
@@ -35,6 +35,8 @@
#include <linux/ipc_namespace.h>
#include <linux/user_namespace.h>
free_uid(user);
}
if (ipc_ns)
-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.3/ipc/msg.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/ipc/msg.c linux-3.9.5-vs2.3.6.5/ipc/msg.c
+--- linux-3.9.5/ipc/msg.c 2013-05-31 13:45:29.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/ipc/msg.c 2013-05-31 14:47:11.000000000 +0000
@@ -37,6 +37,7 @@
#include <linux/rwsem.h>
#include <linux/nsproxy.h>
msq->q_perm.security = NULL;
retval = security_msg_queue_alloc(msq);
-diff -NurpP --minimal linux-3.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.3/ipc/sem.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/ipc/sem.c linux-3.9.5-vs2.3.6.5/ipc/sem.c
+--- linux-3.9.5/ipc/sem.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/ipc/sem.c 2013-05-31 14:47:11.000000000 +0000
@@ -86,6 +86,8 @@
#include <linux/rwsem.h>
#include <linux/nsproxy.h>
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.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.3/ipc/shm.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/ipc/shm.c linux-3.9.5-vs2.3.6.5/ipc/shm.c
+--- linux-3.9.5/ipc/shm.c 2013-06-11 12:22:40.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/ipc/shm.c 2013-05-31 14:47:11.000000000 +0000
@@ -39,6 +39,8 @@
#include <linux/nsproxy.h>
#include <linux/mount.h>
return error;
no_id:
-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.3/kernel/Makefile 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/Makefile linux-3.9.5-vs2.3.6.5/kernel/Makefile
+--- linux-3.9.5/kernel/Makefile 2013-06-11 12:22:40.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/kernel/Makefile 2013-05-31 14:47:11.000000000 +0000
@@ -24,6 +24,7 @@ endif
obj-y += sched/
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.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.3/kernel/auditsc.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/auditsc.c linux-3.9.5-vs2.3.6.5/kernel/auditsc.c
+--- linux-3.9.5/kernel/auditsc.c 2013-06-11 12:22:40.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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;
return -EPERM;
#endif /* CONFIG_AUDIT_LOGINUID_IMMUTABLE */
-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.3/kernel/capability.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/capability.c linux-3.9.5-vs2.3.6.5/kernel/capability.c
+--- linux-3.9.5/kernel/capability.c 2013-05-31 13:45:29.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/kernel/capability.c 2013-05-31 14:47:11.000000000 +0000
@@ -15,6 +15,7 @@
#include <linux/syscalls.h>
#include <linux/pid_namespace.h>
/**
* 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.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.3/kernel/compat.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/compat.c linux-3.9.5-vs2.3.6.5/kernel/compat.c
+--- linux-3.9.5/kernel/compat.c 2013-05-31 13:45:29.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/kernel/compat.c 2013-05-31 14:47:11.000000000 +0000
@@ -27,6 +27,7 @@
#include <linux/times.h>
#include <linux/ptrace.h>
return 0;
}
-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.3/kernel/cred.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/cred.c linux-3.9.5-vs2.3.6.5/kernel/cred.c
+--- linux-3.9.5/kernel/cred.c 2013-02-19 13:58:56.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/kernel/cred.c 2013-05-31 14:47:11.000000000 +0000
@@ -56,31 +56,6 @@ struct cred init_cred = {
.group_info = &init_groups,
};
EXPORT_SYMBOL(prepare_creds);
/*
-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.3/kernel/exit.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/exit.c linux-3.9.5-vs2.3.6.5/kernel/exit.c
+--- linux-3.9.5/kernel/exit.c 2013-05-31 13:45:29.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/kernel/exit.c 2013-05-31 14:47:11.000000000 +0000
@@ -48,6 +48,10 @@
#include <linux/fs_struct.h>
#include <linux/init_task.h>
BUG();
/* Avoid "noreturn function does return". */
for (;;)
-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.3/kernel/fork.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/fork.c linux-3.9.5-vs2.3.6.5/kernel/fork.c
+--- linux-3.9.5/kernel/fork.c 2013-05-31 13:45:29.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/kernel/fork.c 2013-05-31 14:47:11.000000000 +0000
@@ -70,6 +70,9 @@
#include <linux/khugepaged.h>
#include <linux/signalfd.h>
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.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.3/kernel/kthread.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/kthread.c linux-3.9.5-vs2.3.6.5/kernel/kthread.c
+--- linux-3.9.5/kernel/kthread.c 2013-05-31 13:45:30.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/kernel/kthread.c 2013-05-31 14:47:11.000000000 +0000
@@ -17,6 +17,7 @@
#include <linux/slab.h>
#include <linux/freezer.h>
#include <trace/events/sched.h>
static DEFINE_SPINLOCK(kthread_create_lock);
-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.3/kernel/nsproxy.c 2013-05-31 19:28:43.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/nsproxy.c linux-3.9.5-vs2.3.6.5/kernel/nsproxy.c
+--- linux-3.9.5/kernel/nsproxy.c 2013-05-31 13:45:30.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/kernel/nsproxy.c 2013-05-31 19:28:43.000000000 +0000
@@ -20,11 +20,14 @@
#include <linux/mnt_namespace.h>
#include <linux/utsname.h>
return -EPERM;
*new_nsp = create_new_namespaces(unshare_flags, current, user_ns,
-diff -NurpP --minimal linux-3.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.3/kernel/pid.c 2013-05-31 15:24:34.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/pid.c linux-3.9.5-vs2.3.6.5/kernel/pid.c
+--- linux-3.9.5/kernel/pid.c 2013-05-31 13:45:30.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/kernel/pid.c 2013-05-31 15:24:34.000000000 +0000
@@ -37,6 +37,7 @@
#include <linux/init_task.h>
#include <linux/syscalls.h>
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.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.3/kernel/pid_namespace.c 2013-05-31 17:59:48.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/pid_namespace.c linux-3.9.5-vs2.3.6.5/kernel/pid_namespace.c
+--- linux-3.9.5/kernel/pid_namespace.c 2013-05-31 13:45:30.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/kernel/pid_namespace.c 2013-05-31 17:59:48.000000000 +0000
@@ -18,6 +18,7 @@
#include <linux/proc_fs.h>
#include <linux/reboot.h>
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.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.3/kernel/posix-timers.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/posix-timers.c linux-3.9.5-vs2.3.6.5/kernel/posix-timers.c
+--- linux-3.9.5/kernel/posix-timers.c 2013-05-31 13:45:30.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/kernel/posix-timers.c 2013-05-31 14:47:11.000000000 +0000
@@ -47,6 +47,7 @@
#include <linux/wait.h>
#include <linux/workqueue.h>
/* 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.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.3/kernel/printk.c 2013-05-31 15:23:35.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/printk.c linux-3.9.5-vs2.3.6.5/kernel/printk.c
+--- linux-3.9.5/kernel/printk.c 2013-05-31 13:45:30.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/kernel/printk.c 2013-05-31 15:23:35.000000000 +0000
@@ -43,6 +43,7 @@
#include <linux/rculist.h>
#include <linux/poll.h>
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.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.3/kernel/ptrace.c 2013-05-31 15:22:34.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/ptrace.c linux-3.9.5-vs2.3.6.5/kernel/ptrace.c
+--- linux-3.9.5/kernel/ptrace.c 2013-05-31 13:45:30.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/kernel/ptrace.c 2013-05-31 15:22:34.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/syscalls.h>
#include <linux/uaccess.h>
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.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.3/kernel/sched/core.c 2013-05-31 15:17:22.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/sched/core.c linux-3.9.5-vs2.3.6.5/kernel/sched/core.c
+--- linux-3.9.5/kernel/sched/core.c 2013-05-31 13:45:30.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/kernel/sched/core.c 2013-05-31 15:17:22.000000000 +0000
@@ -73,6 +73,8 @@
#include <linux/init_task.h>
#include <linux/binfmts.h>
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.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.3/kernel/sched/cputime.c 2013-05-31 15:17:55.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/sched/cputime.c linux-3.9.5-vs2.3.6.5/kernel/sched/cputime.c
+--- linux-3.9.5/kernel/sched/cputime.c 2013-06-11 12:22:40.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/kernel/sched/cputime.c 2013-05-31 15:17:55.000000000 +0000
@@ -4,6 +4,7 @@
#include <linux/kernel_stat.h>
#include <linux/static_key.h>
account_group_system_time(p, cputime);
/* Add system time to cpustat. */
-diff -NurpP --minimal linux-3.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.3/kernel/sched/fair.c 2013-05-31 15:19:37.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/sched/fair.c linux-3.9.5-vs2.3.6.5/kernel/sched/fair.c
+--- linux-3.9.5/kernel/sched/fair.c 2013-05-31 13:45:30.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/kernel/sched/fair.c 2013-05-31 15:19:37.000000000 +0000
@@ -29,6 +29,7 @@
#include <linux/mempolicy.h>
#include <linux/migrate.h>
account_entity_dequeue(cfs_rq, se);
/*
-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.3/kernel/signal.c 2013-05-31 15:20:05.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/signal.c linux-3.9.5-vs2.3.6.5/kernel/signal.c
+--- linux-3.9.5/kernel/signal.c 2013-05-31 13:45:30.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/kernel/signal.c 2013-05-31 15:20:05.000000000 +0000
@@ -32,6 +32,8 @@
#include <linux/user_namespace.h>
#include <linux/uprobes.h>
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.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.3/kernel/softirq.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/softirq.c linux-3.9.5-vs2.3.6.5/kernel/softirq.c
+--- linux-3.9.5/kernel/softirq.c 2013-05-31 13:45:30.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/kernel/softirq.c 2013-05-31 14:47:11.000000000 +0000
@@ -25,6 +25,7 @@
#include <linux/smp.h>
#include <linux/smpboot.h>
#define CREATE_TRACE_POINTS
#include <trace/events/irq.h>
-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.3/kernel/sys.c 2013-05-31 15:23:14.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/sys.c linux-3.9.5-vs2.3.6.5/kernel/sys.c
+--- linux-3.9.5/kernel/sys.c 2013-05-31 13:45:30.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/kernel/sys.c 2013-05-31 15:23:14.000000000 +0000
@@ -50,6 +50,7 @@
#include <linux/binfmts.h>
return 0;
return -EPERM;
-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.3/kernel/sysctl.c 2013-05-31 15:28:39.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/sysctl.c linux-3.9.5-vs2.3.6.5/kernel/sysctl.c
+--- linux-3.9.5/kernel/sysctl.c 2013-05-31 13:45:30.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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 <linux/lockdep.h>
#ifdef CONFIG_CHR_DEV_SG
{
-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.3/kernel/sysctl_binary.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/sysctl_binary.c linux-3.9.5-vs2.3.6.5/kernel/sysctl_binary.c
+--- linux-3.9.5/kernel/sysctl_binary.c 2013-05-31 13:45:30.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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" },
{ 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.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.3/kernel/time/timekeeping.c 2013-05-31 15:24:55.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/time/timekeeping.c linux-3.9.5-vs2.3.6.5/kernel/time/timekeeping.c
+--- linux-3.9.5/kernel/time/timekeeping.c 2013-05-31 13:45:30.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/kernel/time/timekeeping.c 2013-05-31 15:24:55.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/tick.h>
#include <linux/stop_machine.h>
}
EXPORT_SYMBOL(getrawmonotonic);
-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.3/kernel/time.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/time.c linux-3.9.5-vs2.3.6.5/kernel/time.c
+--- linux-3.9.5/kernel/time.c 2013-05-31 13:45:30.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/kernel/time.c 2013-05-31 14:47:11.000000000 +0000
@@ -37,6 +37,7 @@
#include <linux/fs.h>
#include <linux/math64.h>
return 0;
}
-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.3/kernel/timer.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/timer.c linux-3.9.5-vs2.3.6.5/kernel/timer.c
+--- linux-3.9.5/kernel/timer.c 2013-06-11 12:22:40.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/kernel/timer.c 2013-05-31 14:47:11.000000000 +0000
@@ -41,6 +41,10 @@
#include <linux/sched.h>
#include <linux/sched/sysctl.h>
#include <asm/uaccess.h>
#include <asm/unistd.h>
-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.3/kernel/user_namespace.c 2013-05-31 17:44:56.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/user_namespace.c linux-3.9.5-vs2.3.6.5/kernel/user_namespace.c
+--- linux-3.9.5/kernel/user_namespace.c 2013-05-31 13:45:30.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/kernel/user_namespace.c 2013-05-31 17:44:56.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/ctype.h>
#include <linux/projid.h>
put_user_ns(ns);
}
-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.3/kernel/utsname.c 2013-05-31 15:15:55.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/utsname.c linux-3.9.5-vs2.3.6.5/kernel/utsname.c
+--- linux-3.9.5/kernel/utsname.c 2013-05-31 13:45:30.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/kernel/utsname.c 2013-05-31 15:15:55.000000000 +0000
@@ -16,14 +16,17 @@
#include <linux/slab.h>
#include <linux/user_namespace.h>
kfree(ns);
}
-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.3/kernel/vserver/Kconfig 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/vserver/Kconfig linux-3.9.5-vs2.3.6.5/kernel/vserver/Kconfig
+--- linux-3.9.5/kernel/vserver/Kconfig 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/kernel/vserver/Kconfig 2013-05-31 14:47:11.000000000 +0000
@@ -0,0 +1,233 @@
+#
+# Linux VServer configuration
+ bool
+ default n
+
-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.3/kernel/vserver/Makefile 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/vserver/Makefile linux-3.9.5-vs2.3.6.5/kernel/vserver/Makefile
+--- linux-3.9.5/kernel/vserver/Makefile 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/kernel/vserver/Makefile 2013-05-31 14:47:11.000000000 +0000
@@ -0,0 +1,18 @@
+#
+# Makefile for the Linux vserver routines.
+vserver-$(CONFIG_VSERVER_MONITOR) += monitor.o
+vserver-$(CONFIG_VSERVER_DEVICE) += device.o
+
-diff -NurpP --minimal linux-3.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.3/kernel/vserver/cacct.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/vserver/cacct.c linux-3.9.5-vs2.3.6.5/kernel/vserver/cacct.c
+--- linux-3.9.5/kernel/vserver/cacct.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/kernel/vserver/cacct.c 2013-05-31 14:47:11.000000000 +0000
@@ -0,0 +1,42 @@
+/*
+ * linux/kernel/vserver/cacct.c
+ return 0;
+}
+
-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.3/kernel/vserver/cacct_init.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/vserver/cacct_init.h linux-3.9.5-vs2.3.6.5/kernel/vserver/cacct_init.h
+--- linux-3.9.5/kernel/vserver/cacct_init.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/kernel/vserver/cacct_init.h 2013-05-31 14:47:11.000000000 +0000
@@ -0,0 +1,25 @@
+
+
+ return;
+}
+
-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.3/kernel/vserver/cacct_proc.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/vserver/cacct_proc.h linux-3.9.5-vs2.3.6.5/kernel/vserver/cacct_proc.h
+--- linux-3.9.5/kernel/vserver/cacct_proc.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+}
+
+#endif /* _VX_CACCT_PROC_H */
-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.3/kernel/vserver/context.c 2013-05-31 19:34:32.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/vserver/context.c linux-3.9.5-vs2.3.6.5/kernel/vserver/context.c
+--- linux-3.9.5/kernel/vserver/context.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/kernel/vserver/context.c 2013-06-12 23:49:09.000000000 +0000
@@ -0,0 +1,1119 @@
+/*
+ * linux/kernel/vserver/context.c
+ * allocate an initialized vx_info struct
+ * doesn't make it visible (hash) */
+
-+static struct vx_info *__alloc_vx_info(xid_t xid)
++static struct vx_info *__alloc_vx_info(vxid_t xid)
+{
+ struct vx_info *new = NULL;
+ int cpu, index;
+static DEFINE_SPINLOCK(vx_info_hash_lock);
+
+
-+static inline unsigned int __hashval(xid_t xid)
++static inline unsigned int __hashval(vxid_t xid)
+{
+ return (xid % VX_HASH_SIZE);
+}
+ * requires the hash_lock to be held
+ * doesn't increment the vx_refcnt */
+
-+static inline struct vx_info *__lookup_vx_info(xid_t xid)
++static inline struct vx_info *__lookup_vx_info(vxid_t xid)
+{
+ struct hlist_head *head = &vx_info_hash[__hashval(xid)];
+ struct hlist_node *pos;
+
+ * verify that xid is still hashed */
+
-+int xid_is_hashed(xid_t xid)
++int xid_is_hashed(vxid_t xid)
+{
+ int hashed;
+
+
+int vc_task_xid(uint32_t id)
+{
-+ xid_t xid;
++ vxid_t xid;
+
+ if (id) {
+ struct task_struct *tsk;
+
+EXPORT_SYMBOL_GPL(free_vx_info);
+
-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.3/kernel/vserver/cvirt.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/vserver/cvirt.c linux-3.9.5-vs2.3.6.5/kernel/vserver/cvirt.c
+--- linux-3.9.5/kernel/vserver/cvirt.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/kernel/vserver/cvirt.c 2013-05-31 14:47:11.000000000 +0000
@@ -0,0 +1,313 @@
+/*
+ * linux/kernel/vserver/cvirt.c
+
+#endif
+
-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.3/kernel/vserver/cvirt_init.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/vserver/cvirt_init.h linux-3.9.5-vs2.3.6.5/kernel/vserver/cvirt_init.h
+--- linux-3.9.5/kernel/vserver/cvirt_init.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/kernel/vserver/cvirt_init.h 2013-05-31 14:47:11.000000000 +0000
@@ -0,0 +1,70 @@
+
+
+ return;
+}
+
-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.3/kernel/vserver/cvirt_proc.h 2013-05-31 19:38:26.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/vserver/cvirt_proc.h linux-3.9.5-vs2.3.6.5/kernel/vserver/cvirt_proc.h
+--- linux-3.9.5/kernel/vserver/cvirt_proc.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+}
+
+#endif /* _VX_CVIRT_PROC_H */
-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.3/kernel/vserver/debug.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/vserver/debug.c linux-3.9.5-vs2.3.6.5/kernel/vserver/debug.c
+--- linux-3.9.5/kernel/vserver/debug.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/kernel/vserver/debug.c 2013-05-31 14:47:11.000000000 +0000
@@ -0,0 +1,32 @@
+/*
+ * kernel/vserver/debug.c
+
+EXPORT_SYMBOL_GPL(dump_vx_info);
+
-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.3/kernel/vserver/device.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/vserver/device.c linux-3.9.5-vs2.3.6.5/kernel/vserver/device.c
+--- linux-3.9.5/kernel/vserver/device.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/kernel/vserver/device.c 2013-06-12 23:49:09.000000000 +0000
@@ -0,0 +1,443 @@
+/*
+ * linux/kernel/vserver/device.c
+ } u;
+#define dm_hlist u.hlist
+#define dm_list u.list
-+ xid_t xid;
++ vxid_t xid;
+ dev_t device;
+ struct vx_dmap_target target;
+};
+ *
+ * caller must hold hash_lock
+ */
-+static inline int __find_mapping(xid_t xid, dev_t device, umode_t mode,
++static inline int __find_mapping(vxid_t xid, dev_t device, umode_t mode,
+ struct vs_mapping **local, struct vs_mapping **global)
+{
+ struct hlist_head *hash = dmap_main_hash;
+ struct vs_mapping *vdm, *global;
+ struct vx_dmap_target *vdmt;
+ int ret = 0;
-+ xid_t xid = vxi->vx_id;
++ vxid_t xid = vxi->vx_id;
+ int index;
+
+ spin_lock(hash_lock);
+#endif /* CONFIG_COMPAT */
+
+
-diff -NurpP --minimal linux-3.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.3/kernel/vserver/dlimit.c 2013-05-31 19:37:39.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/vserver/dlimit.c linux-3.9.5-vs2.3.6.5/kernel/vserver/dlimit.c
+--- linux-3.9.5/kernel/vserver/dlimit.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/kernel/vserver/dlimit.c 2013-06-12 23:49:09.000000000 +0000
@@ -0,0 +1,528 @@
+/*
+ * linux/kernel/vserver/dlimit.c
+ * allocate an initialized dl_info struct
+ * doesn't make it visible (hash) */
+
-+static struct dl_info *__alloc_dl_info(struct super_block *sb, tag_t tag)
++static struct dl_info *__alloc_dl_info(struct super_block *sb, vtag_t tag)
+{
+ struct dl_info *new = NULL;
+
+static DEFINE_SPINLOCK(dl_info_hash_lock);
+
+
-+static inline unsigned int __hashval(struct super_block *sb, tag_t tag)
++static inline unsigned int __hashval(struct super_block *sb, vtag_t tag)
+{
+ return ((tag ^ (unsigned long)sb) % DL_HASH_SIZE);
+}
+ * requires the rcu_read_lock()
+ * doesn't increment the dl_refcnt */
+
-+static inline struct dl_info *__lookup_dl_info(struct super_block *sb, tag_t tag)
++static inline struct dl_info *__lookup_dl_info(struct super_block *sb, vtag_t tag)
+{
+ struct hlist_head *head = &dl_info_hash[__hashval(sb, tag)];
+ struct dl_info *dli;
+}
+
+
-+struct dl_info *locate_dl_info(struct super_block *sb, tag_t tag)
++struct dl_info *locate_dl_info(struct super_block *sb, vtag_t tag)
+{
+ struct dl_info *dli;
+
+EXPORT_SYMBOL_GPL(locate_dl_info);
+EXPORT_SYMBOL_GPL(rcu_free_dl_info);
+
-diff -NurpP --minimal linux-3.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.3/kernel/vserver/helper.c 2013-06-01 08:27:59.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/vserver/helper.c linux-3.9.5-vs2.3.6.5/kernel/vserver/helper.c
+--- linux-3.9.5/kernel/vserver/helper.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/kernel/vserver/helper.c 2013-06-01 08:27:59.000000000 +0000
@@ -0,0 +1,230 @@
+/*
+ * linux/kernel/vserver/helper.c
+ 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.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.3/kernel/vserver/history.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/vserver/history.c linux-3.9.5-vs2.3.6.5/kernel/vserver/history.c
+--- linux-3.9.5/kernel/vserver/history.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/kernel/vserver/history.c 2013-05-31 14:47:11.000000000 +0000
@@ -0,0 +1,258 @@
+/*
+ * kernel/vserver/history.c
+
+#endif /* CONFIG_COMPAT */
+
-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.3/kernel/vserver/inet.c 2013-05-31 22:43:05.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/vserver/inet.c linux-3.9.5-vs2.3.6.5/kernel/vserver/inet.c
+--- linux-3.9.5/kernel/vserver/inet.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/kernel/vserver/inet.c 2013-05-31 22:43:05.000000000 +0000
@@ -0,0 +1,236 @@
+
+#include <linux/in.h>
+
+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.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.3/kernel/vserver/init.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/vserver/init.c linux-3.9.5-vs2.3.6.5/kernel/vserver/init.c
+--- linux-3.9.5/kernel/vserver/init.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/kernel/vserver/init.c 2013-05-31 14:47:11.000000000 +0000
@@ -0,0 +1,45 @@
+/*
+ * linux/kernel/init.c
+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.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.3/kernel/vserver/inode.c 2013-06-01 08:26:06.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/vserver/inode.c linux-3.9.5-vs2.3.6.5/kernel/vserver/inode.c
+--- linux-3.9.5/kernel/vserver/inode.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/kernel/vserver/inode.c 2013-06-12 23:49:09.000000000 +0000
@@ -0,0 +1,437 @@
+/*
+ * linux/kernel/vserver/inode.c
+ }
+}
+
-+int dx_parse_tag(char *string, tag_t *tag, int remove, int *mnt_flags,
++int dx_parse_tag(char *string, vtag_t *tag, int remove, int *mnt_flags,
+ unsigned long *flags)
+{
+ int set = 0;
+
+void __dx_propagate_tag(struct nameidata *nd, struct inode *inode)
+{
-+ tag_t new_tag = 0;
++ vtag_t new_tag = 0;
+ struct vfsmount *mnt;
+ int propagate;
+
+
+#endif /* CONFIG_PROPAGATE */
+
-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.3/kernel/vserver/limit.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/vserver/limit.c linux-3.9.5-vs2.3.6.5/kernel/vserver/limit.c
+--- linux-3.9.5/kernel/vserver/limit.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/kernel/vserver/limit.c 2013-05-31 14:47:11.000000000 +0000
@@ -0,0 +1,345 @@
+/*
+ * linux/kernel/vserver/limit.c
+ return cache;
+}
+
-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.3/kernel/vserver/limit_init.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/vserver/limit_init.h linux-3.9.5-vs2.3.6.5/kernel/vserver/limit_init.h
+--- linux-3.9.5/kernel/vserver/limit_init.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/kernel/vserver/limit_init.h 2013-05-31 14:47:11.000000000 +0000
@@ -0,0 +1,31 @@
+
+
+ }
+}
+
-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.3/kernel/vserver/limit_proc.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/vserver/limit_proc.h linux-3.9.5-vs2.3.6.5/kernel/vserver/limit_proc.h
+--- linux-3.9.5/kernel/vserver/limit_proc.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+#endif /* _VX_LIMIT_PROC_H */
+
+
-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.3/kernel/vserver/network.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/vserver/network.c linux-3.9.5-vs2.3.6.5/kernel/vserver/network.c
+--- linux-3.9.5/kernel/vserver/network.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/kernel/vserver/network.c 2013-06-12 23:49:09.000000000 +0000
@@ -0,0 +1,1053 @@
+/*
+ * linux/kernel/vserver/network.c
+ * allocate an initialized nx_info struct
+ * doesn't make it visible (hash) */
+
-+static struct nx_info *__alloc_nx_info(nid_t nid)
++static struct nx_info *__alloc_nx_info(vnid_t nid)
+{
+ struct nx_info *new = NULL;
+
+static DEFINE_SPINLOCK(nx_info_hash_lock);
+
+
-+static inline unsigned int __hashval(nid_t nid)
++static inline unsigned int __hashval(vnid_t nid)
+{
+ return (nid % NX_HASH_SIZE);
+}
+ * requires the hash_lock to be held
+ * doesn't increment the nx_refcnt */
+
-+static inline struct nx_info *__lookup_nx_info(nid_t nid)
++static inline struct nx_info *__lookup_nx_info(vnid_t nid)
+{
+ struct hlist_head *head = &nx_info_hash[__hashval(nid)];
+ struct hlist_node *pos;
+
+ * verify that nid is still hashed */
+
-+int nid_is_hashed(nid_t nid)
++int nid_is_hashed(vnid_t nid)
+{
+ int hashed;
+
+
+int vc_task_nid(uint32_t id)
+{
-+ nid_t nid;
++ vnid_t nid;
+
+ if (id) {
+ struct task_struct *tsk;
+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.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.3/kernel/vserver/proc.c 2013-06-01 08:30:38.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/vserver/proc.c linux-3.9.5-vs2.3.6.5/kernel/vserver/proc.c
+--- linux-3.9.5/kernel/vserver/proc.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/kernel/vserver/proc.c 2013-06-12 23:49:09.000000000 +0000
@@ -0,0 +1,1110 @@
+/*
+ * linux/kernel/vserver/proc.c
+static int proc_xid_revalidate(struct dentry *dentry, unsigned int flags)
+{
+ struct inode *inode = dentry->d_inode;
-+ xid_t xid = PROC_I(inode)->fd;
++ vxid_t xid = PROC_I(inode)->fd;
+
+ if (flags & LOOKUP_RCU) /* FIXME: can be dropped? */
+ return -ECHILD;
+static int proc_nid_revalidate(struct dentry *dentry, unsigned int flags)
+{
+ struct inode *inode = dentry->d_inode;
-+ nid_t nid = PROC_I(inode)->fd;
++ vnid_t nid = PROC_I(inode)->fd;
+
+ if (flags & LOOKUP_RCU) /* FIXME: can be dropped? */
+ return -ECHILD;
+{
+ struct inode *inode = file->f_dentry->d_inode;
+ struct vx_info *vxi = NULL;
-+ xid_t xid = PROC_I(inode)->fd;
++ vxid_t xid = PROC_I(inode)->fd;
+ unsigned long page;
+ ssize_t length = 0;
+
+{
+ struct inode *inode = file->f_dentry->d_inode;
+ struct nx_info *nxi = NULL;
-+ nid_t nid = PROC_I(inode)->fd;
++ vnid_t nid = PROC_I(inode)->fd;
+ unsigned long page;
+ ssize_t length = 0;
+
+ return buffer - orig;
+}
+
-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.3/kernel/vserver/sched.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/vserver/sched.c linux-3.9.5-vs2.3.6.5/kernel/vserver/sched.c
+--- linux-3.9.5/kernel/vserver/sched.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/kernel/vserver/sched.c 2013-05-31 14:47:11.000000000 +0000
@@ -0,0 +1,83 @@
+/*
+ * linux/kernel/vserver/sched.c
+ return 0;
+}
+
-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.3/kernel/vserver/sched_init.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/vserver/sched_init.h linux-3.9.5-vs2.3.6.5/kernel/vserver/sched_init.h
+--- linux-3.9.5/kernel/vserver/sched_init.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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)
+{
+ return;
+}
-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.3/kernel/vserver/sched_proc.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/vserver/sched_proc.h linux-3.9.5-vs2.3.6.5/kernel/vserver/sched_proc.h
+--- linux-3.9.5/kernel/vserver/sched_proc.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
+}
+
+#endif /* _VX_SCHED_PROC_H */
-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.3/kernel/vserver/signal.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/vserver/signal.c linux-3.9.5-vs2.3.6.5/kernel/vserver/signal.c
+--- linux-3.9.5/kernel/vserver/signal.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/kernel/vserver/signal.c 2013-05-31 14:47:11.000000000 +0000
@@ -0,0 +1,134 @@
+/*
+ * linux/kernel/vserver/signal.c
+ return ret;
+}
+
-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.3/kernel/vserver/space.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/vserver/space.c linux-3.9.5-vs2.3.6.5/kernel/vserver/space.c
+--- linux-3.9.5/kernel/vserver/space.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/kernel/vserver/space.c 2013-05-31 14:47:11.000000000 +0000
@@ -0,0 +1,436 @@
+/*
+ * linux/kernel/vserver/space.c
+ return 0;
+}
+
-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.3/kernel/vserver/switch.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/vserver/switch.c linux-3.9.5-vs2.3.6.5/kernel/vserver/switch.c
+--- linux-3.9.5/kernel/vserver/switch.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/kernel/vserver/switch.c 2013-05-31 14:47:11.000000000 +0000
@@ -0,0 +1,556 @@
+/*
+ * linux/kernel/vserver/switch.c
+}
+
+#endif /* CONFIG_COMPAT */
-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.3/kernel/vserver/sysctl.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/vserver/sysctl.c linux-3.9.5-vs2.3.6.5/kernel/vserver/sysctl.c
+--- linux-3.9.5/kernel/vserver/sysctl.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/kernel/vserver/sysctl.c 2013-05-31 14:47:11.000000000 +0000
@@ -0,0 +1,247 @@
+/*
+ * kernel/vserver/sysctl.c
+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.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.3/kernel/vserver/tag.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/vserver/tag.c linux-3.9.5-vs2.3.6.5/kernel/vserver/tag.c
+--- linux-3.9.5/kernel/vserver/tag.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/kernel/vserver/tag.c 2013-06-12 23:49:09.000000000 +0000
@@ -0,0 +1,63 @@
+/*
+ * linux/kernel/vserver/tag.c
+#include <linux/vserver/tag_cmd.h>
+
+
-+int dx_migrate_task(struct task_struct *p, tag_t tag)
++int dx_migrate_task(struct task_struct *p, vtag_t tag)
+{
+ if (!p)
+ BUG();
+
+int vc_task_tag(uint32_t id)
+{
-+ tag_t tag;
++ vtag_t tag;
+
+ if (id) {
+ struct task_struct *tsk;
+}
+
+
-diff -NurpP --minimal linux-3.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.3/kernel/vserver/vci_config.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/kernel/vserver/vci_config.h linux-3.9.5-vs2.3.6.5/kernel/vserver/vci_config.h
+--- linux-3.9.5/kernel/vserver/vci_config.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/kernel/vserver/vci_config.h 2013-05-31 14:47:11.000000000 +0000
@@ -0,0 +1,80 @@
+
+/* interface version */
+ 0;
+}
+
-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.3/mm/memcontrol.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/mm/memcontrol.c linux-3.9.5-vs2.3.6.5/mm/memcontrol.c
+--- linux-3.9.5/mm/memcontrol.c 2013-06-11 12:22:40.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/mm/memcontrol.c 2013-06-13 00:14:32.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));
}
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.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.3/mm/oom_kill.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/mm/oom_kill.c linux-3.9.5-vs2.3.6.5/mm/oom_kill.c
+--- linux-3.9.5/mm/oom_kill.c 2013-05-31 13:45:31.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/mm/oom_kill.c 2013-05-31 14:47:11.000000000 +0000
@@ -35,6 +35,8 @@
#include <linux/freezer.h>
#include <linux/ftrace.h>
}
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.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.3/mm/page_alloc.c 2013-05-31 15:08:50.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/mm/page_alloc.c linux-3.9.5-vs2.3.6.5/mm/page_alloc.c
+--- linux-3.9.5/mm/page_alloc.c 2013-05-31 13:45:31.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/mm/page_alloc.c 2013-05-31 15:08:50.000000000 +0000
@@ -59,6 +59,8 @@
#include <linux/migrate.h>
#include <linux/page-debug-flags.h>
}
#endif
-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.3/mm/pgtable-generic.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/mm/pgtable-generic.c linux-3.9.5-vs2.3.6.5/mm/pgtable-generic.c
+--- linux-3.9.5/mm/pgtable-generic.c 2013-02-19 13:58:57.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/mm/pgtable-generic.c 2013-05-31 14:47:11.000000000 +0000
@@ -6,6 +6,8 @@
* Copyright (C) 2010 Linus Torvalds
*/
#include <linux/pagemap.h>
#include <asm/tlb.h>
#include <asm-generic/pgtable.h>
-diff -NurpP --minimal linux-3.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.3/mm/shmem.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/mm/shmem.c linux-3.9.5-vs2.3.6.5/mm/shmem.c
+--- linux-3.9.5/mm/shmem.c 2013-05-31 13:45:31.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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);
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.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.3/mm/slab.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/mm/slab.c linux-3.9.5-vs2.3.6.5/mm/slab.c
+--- linux-3.9.5/mm/slab.c 2013-05-31 13:45:31.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
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.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.3/mm/slab_vs.h 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/mm/slab_vs.h linux-3.9.5-vs2.3.6.5/mm/slab_vs.h
+--- linux-3.9.5/mm/slab_vs.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/mm/slab_vs.h 2013-05-31 14:47:11.000000000 +0000
@@ -0,0 +1,29 @@
+
+#include <linux/vserver/context.h>
+ 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.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.3/mm/swapfile.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/mm/swapfile.c linux-3.9.5-vs2.3.6.5/mm/swapfile.c
+--- linux-3.9.5/mm/swapfile.c 2013-05-31 13:45:31.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/mm/swapfile.c 2013-05-31 14:47:11.000000000 +0000
@@ -39,6 +39,7 @@
#include <asm/tlbflush.h>
#include <linux/swapops.h>
}
/*
-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.3/net/bridge/br_multicast.c 2013-05-31 17:17:53.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/net/bridge/br_multicast.c linux-3.9.5-vs2.3.6.5/net/bridge/br_multicast.c
+--- linux-3.9.5/net/bridge/br_multicast.c 2013-05-31 13:45:31.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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));
kfree_skb(skb);
return NULL;
}
-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.3/net/core/dev.c 2013-05-31 18:37:38.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/net/core/dev.c linux-3.9.5-vs2.3.6.5/net/core/dev.c
+--- linux-3.9.5/net/core/dev.c 2013-06-11 12:22:40.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/net/core/dev.c 2013-05-31 18:37:38.000000000 +0000
@@ -122,6 +122,7 @@
#include <linux/in.h>
#include <linux/jhash.h>
/* 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.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.3/net/core/net-procfs.c 2013-06-01 10:40:52.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/net/core/net-procfs.c linux-3.9.5-vs2.3.6.5/net/core/net-procfs.c
+--- linux-3.9.5/net/core/net-procfs.c 2013-05-31 13:45:32.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/net/core/net-procfs.c 2013-06-01 10:40:52.000000000 +0000
@@ -1,6 +1,7 @@
#include <linux/netdevice.h>
#include <linux/proc_fs.h>
seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
"%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
dev->name, stats->rx_bytes, stats->rx_packets,
-diff -NurpP --minimal linux-3.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.3/net/core/rtnetlink.c 2013-05-31 17:17:54.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/net/core/rtnetlink.c linux-3.9.5-vs2.3.6.5/net/core/rtnetlink.c
+--- linux-3.9.5/net/core/rtnetlink.c 2013-05-31 13:45:32.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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)
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.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.3/net/core/sock.c 2013-05-31 17:17:54.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/net/core/sock.c linux-3.9.5-vs2.3.6.5/net/core/sock.c
+--- linux-3.9.5/net/core/sock.c 2013-06-11 12:22:40.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/net/core/sock.c 2013-05-31 17:17:54.000000000 +0000
@@ -132,6 +132,10 @@
#include <net/netprio_cgroup.h>
/*
* 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.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.3/net/ipv4/af_inet.c 2013-06-03 17:22:33.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/net/ipv4/af_inet.c linux-3.9.5-vs2.3.6.5/net/ipv4/af_inet.c
+--- linux-3.9.5/net/ipv4/af_inet.c 2013-05-31 13:45:32.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/net/ipv4/af_inet.c 2013-06-03 17:22:33.000000000 +0000
@@ -118,6 +118,7 @@
#ifdef CONFIG_IP_MROUTE
#include <linux/mroute.h>
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.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.3/net/ipv4/arp.c 2013-05-31 17:17:54.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/net/ipv4/arp.c linux-3.9.5-vs2.3.6.5/net/ipv4/arp.c
+--- linux-3.9.5/net/ipv4/arp.c 2013-05-31 13:45:32.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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;
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.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.3/net/ipv4/devinet.c 2013-05-31 17:17:54.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/net/ipv4/devinet.c linux-3.9.5-vs2.3.6.5/net/ipv4/devinet.c
+--- linux-3.9.5/net/ipv4/devinet.c 2013-05-31 13:45:32.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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);
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.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.3/net/ipv4/fib_trie.c 2013-05-31 17:17:54.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/net/ipv4/fib_trie.c linux-3.9.5-vs2.3.6.5/net/ipv4/fib_trie.c
+--- linux-3.9.5/net/ipv4/fib_trie.c 2013-05-31 13:45:32.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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;
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.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.3/net/ipv4/inet_connection_sock.c 2013-05-31 18:29:56.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/net/ipv4/inet_connection_sock.c linux-3.9.5-vs2.3.6.5/net/ipv4/inet_connection_sock.c
+--- linux-3.9.5/net/ipv4/inet_connection_sock.c 2013-05-31 13:45:32.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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);
break;
}
}
-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.3/net/ipv4/inet_diag.c 2013-05-31 17:17:54.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/net/ipv4/inet_diag.c linux-3.9.5-vs2.3.6.5/net/ipv4/inet_diag.c
+--- linux-3.9.5/net/ipv4/inet_diag.c 2013-02-19 13:58:58.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/net/ipv4/inet_diag.c 2013-05-31 17:17:54.000000000 +0000
@@ -31,6 +31,8 @@
#include <linux/inet.h>
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.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.3/net/ipv4/inet_hashtables.c 2013-05-31 18:20:50.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/net/ipv4/inet_hashtables.c linux-3.9.5-vs2.3.6.5/net/ipv4/inet_hashtables.c
+--- linux-3.9.5/net/ipv4/inet_hashtables.c 2013-05-31 13:45:32.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/net/ipv4/inet_hashtables.c 2013-05-31 18:20:50.000000000 +0000
@@ -22,6 +22,7 @@
#include <net/inet_connection_sock.h>
#include <net/inet_hashtables.h>
/*
* 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.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.3/net/ipv4/netfilter.c 2013-05-31 17:17:54.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/net/ipv4/netfilter.c linux-3.9.5-vs2.3.6.5/net/ipv4/netfilter.c
+--- linux-3.9.5/net/ipv4/netfilter.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/net/ipv4/netfilter.c 2013-05-31 17:17:54.000000000 +0000
@@ -6,7 +6,7 @@
#include <linux/skbuff.h>
#include <linux/gfp.h>
#include <net/xfrm.h>
#include <net/ip.h>
#include <net/netfilter/nf_queue.h>
-diff -NurpP --minimal linux-3.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.3/net/ipv4/raw.c 2013-05-31 18:19:38.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/net/ipv4/raw.c linux-3.9.5-vs2.3.6.5/net/ipv4/raw.c
+--- linux-3.9.5/net/ipv4/raw.c 2013-05-31 13:45:32.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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 &&
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.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.3/net/ipv4/route.c 2013-05-31 17:17:54.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/net/ipv4/route.c linux-3.9.5-vs2.3.6.5/net/ipv4/route.c
+--- linux-3.9.5/net/ipv4/route.c 2013-05-31 13:45:32.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/net/ipv4/route.c 2013-05-31 17:17:54.000000000 +0000
@@ -1998,7 +1998,7 @@ struct rtable *__ip_route_output_key(str
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.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.3/net/ipv4/tcp.c 2013-05-31 17:17:54.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/net/ipv4/tcp.c linux-3.9.5-vs2.3.6.5/net/ipv4/tcp.c
+--- linux-3.9.5/net/ipv4/tcp.c 2013-05-31 13:45:32.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/net/ipv4/tcp.c 2013-05-31 17:17:54.000000000 +0000
@@ -268,6 +268,7 @@
#include <linux/crypto.h>
#include <linux/time.h>
#include <net/icmp.h>
#include <net/inet_common.h>
-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.3/net/ipv4/tcp_ipv4.c 2013-05-31 17:17:54.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/net/ipv4/tcp_ipv4.c linux-3.9.5-vs2.3.6.5/net/ipv4/tcp_ipv4.c
+--- linux-3.9.5/net/ipv4/tcp_ipv4.c 2013-05-31 13:45:32.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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) {
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.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.3/net/ipv4/tcp_minisocks.c 2013-05-31 17:17:54.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/net/ipv4/tcp_minisocks.c linux-3.9.5-vs2.3.6.5/net/ipv4/tcp_minisocks.c
+--- linux-3.9.5/net/ipv4/tcp_minisocks.c 2013-06-11 12:22:40.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/net/ipv4/tcp_minisocks.c 2013-05-31 17:17:54.000000000 +0000
@@ -23,6 +23,9 @@
#include <linux/slab.h>
#include <linux/sysctl.h>
#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.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.3/net/ipv4/udp.c 2013-05-31 18:26:00.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/net/ipv4/udp.c linux-3.9.5-vs2.3.6.5/net/ipv4/udp.c
+--- linux-3.9.5/net/ipv4/udp.c 2013-05-31 13:45:32.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/net/ipv4/udp.c 2013-05-31 18:26:00.000000000 +0000
@@ -306,14 +306,7 @@ fail:
}
EXPORT_SYMBOL(udp_lib_get_port);
__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.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.3/net/ipv6/Kconfig 2013-05-31 17:17:54.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/net/ipv6/Kconfig linux-3.9.5-vs2.3.6.5/net/ipv6/Kconfig
+--- linux-3.9.5/net/ipv6/Kconfig 2013-05-31 13:45:32.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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
---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.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.3/net/ipv6/addrconf.c 2013-05-31 20:07:39.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/net/ipv6/addrconf.c linux-3.9.5-vs2.3.6.5/net/ipv6/addrconf.c
+--- linux-3.9.5/net/ipv6/addrconf.c 2013-05-31 13:45:32.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/net/ipv6/addrconf.c 2013-05-31 20:07:39.000000000 +0000
@@ -93,6 +93,8 @@
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
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.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.3/net/ipv6/af_inet6.c 2013-05-31 20:04:41.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/net/ipv6/af_inet6.c linux-3.9.5-vs2.3.6.5/net/ipv6/af_inet6.c
+--- linux-3.9.5/net/ipv6/af_inet6.c 2013-05-31 13:45:32.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/net/ipv6/af_inet6.c 2013-05-31 20:04:41.000000000 +0000
@@ -43,6 +43,8 @@
#include <linux/netdevice.h>
#include <linux/icmpv6.h>
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.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.3/net/ipv6/datagram.c 2013-05-31 17:17:54.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/net/ipv6/datagram.c linux-3.9.5-vs2.3.6.5/net/ipv6/datagram.c
+--- linux-3.9.5/net/ipv6/datagram.c 2013-05-31 13:45:32.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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();
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.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.3/net/ipv6/fib6_rules.c 2013-05-31 17:17:54.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/net/ipv6/fib6_rules.c linux-3.9.5-vs2.3.6.5/net/ipv6/fib6_rules.c
+--- linux-3.9.5/net/ipv6/fib6_rules.c 2013-02-19 13:58:58.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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,
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.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.3/net/ipv6/inet6_hashtables.c 2013-05-31 17:17:54.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/net/ipv6/inet6_hashtables.c linux-3.9.5-vs2.3.6.5/net/ipv6/inet6_hashtables.c
+--- linux-3.9.5/net/ipv6/inet6_hashtables.c 2013-05-31 13:45:32.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/net/ipv6/inet6_hashtables.c 2013-05-31 17:17:54.000000000 +0000
@@ -16,6 +16,7 @@
#include <linux/module.h>
}
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.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.3/net/ipv6/ip6_output.c 2013-05-31 17:17:54.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/net/ipv6/ip6_output.c linux-3.9.5-vs2.3.6.5/net/ipv6/ip6_output.c
+--- linux-3.9.5/net/ipv6/ip6_output.c 2013-05-31 13:45:32.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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,
if (err)
goto out_err_release;
}
-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.3/net/ipv6/ndisc.c 2013-05-31 17:17:54.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/net/ipv6/ndisc.c linux-3.9.5-vs2.3.6.5/net/ipv6/ndisc.c
+--- linux-3.9.5/net/ipv6/ndisc.c 2013-05-31 13:45:32.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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,
return;
src_addr = &tmpaddr;
}
-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.3/net/ipv6/netfilter/ip6t_MASQUERADE.c 2013-05-31 17:17:54.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/net/ipv6/netfilter/ip6t_MASQUERADE.c linux-3.9.5-vs2.3.6.5/net/ipv6/netfilter/ip6t_MASQUERADE.c
+--- linux-3.9.5/net/ipv6/netfilter/ip6t_MASQUERADE.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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));
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.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.3/net/ipv6/raw.c 2013-05-31 17:17:54.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/net/ipv6/raw.c linux-3.9.5-vs2.3.6.5/net/ipv6/raw.c
+--- linux-3.9.5/net/ipv6/raw.c 2013-05-31 13:45:32.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/net/ipv6/raw.c 2013-05-31 17:17:54.000000000 +0000
@@ -30,6 +30,7 @@
#include <linux/icmpv6.h>
#include <linux/netfilter.h>
/* 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.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.3/net/ipv6/route.c 2013-05-31 18:10:38.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/net/ipv6/route.c linux-3.9.5-vs2.3.6.5/net/ipv6/route.c
+--- linux-3.9.5/net/ipv6/route.c 2013-05-31 13:45:32.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/net/ipv6/route.c 2013-05-31 18:10:38.000000000 +0000
@@ -58,6 +58,7 @@
#include <net/netevent.h>
#include <net/netlink.h>
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.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.3/net/ipv6/tcp_ipv6.c 2013-05-31 17:17:54.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/net/ipv6/tcp_ipv6.c linux-3.9.5-vs2.3.6.5/net/ipv6/tcp_ipv6.c
+--- linux-3.9.5/net/ipv6/tcp_ipv6.c 2013-06-11 12:22:40.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/net/ipv6/tcp_ipv6.c 2013-05-31 17:17:54.000000000 +0000
@@ -71,6 +71,7 @@
#include <linux/crypto.h>
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.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.3/net/ipv6/udp.c 2013-05-31 18:16:01.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/net/ipv6/udp.c linux-3.9.5-vs2.3.6.5/net/ipv6/udp.c
+--- linux-3.9.5/net/ipv6/udp.c 2013-06-11 12:22:40.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/net/ipv6/udp.c 2013-05-31 18:16:01.000000000 +0000
@@ -46,42 +46,68 @@
#include <net/ip6_checksum.h>
#include <net/xfrm.h>
}
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.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.3/net/ipv6/xfrm6_policy.c 2013-05-31 17:17:54.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/net/ipv6/xfrm6_policy.c linux-3.9.5-vs2.3.6.5/net/ipv6/xfrm6_policy.c
+--- linux-3.9.5/net/ipv6/xfrm6_policy.c 2013-06-11 12:22:40.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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,
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.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.3/net/netfilter/ipvs/ip_vs_xmit.c 2013-05-31 17:17:54.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/net/netfilter/ipvs/ip_vs_xmit.c linux-3.9.5-vs2.3.6.5/net/netfilter/ipvs/ip_vs_xmit.c
+--- linux-3.9.5/net/netfilter/ipvs/ip_vs_xmit.c 2013-02-19 13:58:59.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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) &&
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.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.3/net/netlink/af_netlink.c 2013-05-31 17:17:54.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/net/netlink/af_netlink.c linux-3.9.5-vs2.3.6.5/net/netlink/af_netlink.c
+--- linux-3.9.5/net/netlink/af_netlink.c 2013-05-31 13:45:33.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/net/netlink/af_netlink.c 2013-05-31 17:17:54.000000000 +0000
@@ -55,6 +55,9 @@
#include <linux/types.h>
#include <linux/audit.h>
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.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.3/net/socket.c 2013-05-31 17:17:54.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/net/socket.c linux-3.9.5-vs2.3.6.5/net/socket.c
+--- linux-3.9.5/net/socket.c 2013-05-31 13:45:33.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/net/socket.c 2013-05-31 17:17:54.000000000 +0000
@@ -98,6 +98,10 @@
#include <net/sock.h>
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.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.3/net/sunrpc/auth.c 2013-06-03 20:11:37.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/net/sunrpc/auth.c linux-3.9.5-vs2.3.6.5/net/sunrpc/auth.c
+--- linux-3.9.5/net/sunrpc/auth.c 2013-05-31 13:45:33.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/net/sunrpc/auth.c 2013-06-03 20:11:37.000000000 +0000
@@ -15,6 +15,7 @@
#include <linux/sunrpc/clnt.h>
#include <linux/sunrpc/gss_api.h>
};
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.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.3/net/sunrpc/auth_unix.c 2013-06-03 19:35:29.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/net/sunrpc/auth_unix.c linux-3.9.5-vs2.3.6.5/net/sunrpc/auth_unix.c
+--- linux-3.9.5/net/sunrpc/auth_unix.c 2013-05-31 13:45:33.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/net/sunrpc/auth_unix.c 2013-06-03 19:35:29.000000000 +0000
@@ -13,11 +13,13 @@
#include <linux/sunrpc/clnt.h>
#include <linux/sunrpc/auth.h>
hold = p++;
for (i = 0; i < 16 && gid_valid(cred->uc_gids[i]); i++)
*p++ = htonl((u32) from_kgid(&init_user_ns, cred->uc_gids[i]));
-diff -NurpP --minimal linux-3.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.3/net/sunrpc/clnt.c 2013-05-31 17:17:54.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/net/sunrpc/clnt.c linux-3.9.5-vs2.3.6.5/net/sunrpc/clnt.c
+--- linux-3.9.5/net/sunrpc/clnt.c 2013-05-31 13:45:33.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/net/sunrpc/clnt.c 2013-05-31 17:17:54.000000000 +0000
@@ -31,6 +31,7 @@
#include <linux/in6.h>
#include <linux/un.h>
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.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.3/net/unix/af_unix.c 2013-05-31 17:17:54.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/net/unix/af_unix.c linux-3.9.5-vs2.3.6.5/net/unix/af_unix.c
+--- linux-3.9.5/net/unix/af_unix.c 2013-05-31 13:45:33.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/net/unix/af_unix.c 2013-05-31 17:17:54.000000000 +0000
@@ -114,6 +114,8 @@
#include <linux/mount.h>
#include <net/checksum.h>
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.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.3/scripts/checksyscalls.sh 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/scripts/checksyscalls.sh linux-3.9.5-vs2.3.6.5/scripts/checksyscalls.sh
+--- linux-3.9.5/scripts/checksyscalls.sh 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/scripts/checksyscalls.sh 2013-05-31 14:47:11.000000000 +0000
@@ -193,7 +193,6 @@ cat << EOF
#define __IGNORE_afs_syscall
#define __IGNORE_getpmsg
EOF
}
-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.3/security/commoncap.c 2013-05-31 15:07:02.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/security/commoncap.c linux-3.9.5-vs2.3.6.5/security/commoncap.c
+--- linux-3.9.5/security/commoncap.c 2013-05-31 13:45:34.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/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)
return -EPERM;
return 0;
}
-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.3/security/selinux/hooks.c 2013-05-31 14:47:11.000000000 +0000
+diff -NurpP --minimal linux-3.9.5/security/selinux/hooks.c linux-3.9.5-vs2.3.6.5/security/selinux/hooks.c
+--- linux-3.9.5/security/selinux/hooks.c 2013-05-31 13:45:34.000000000 +0000
++++ linux-3.9.5-vs2.3.6.5/security/selinux/hooks.c 2013-05-31 14:47:11.000000000 +0000
@@ -67,7 +67,6 @@
#include <linux/dccp.h>
#include <linux/quota.h>
projects / packages / kernel.git / commitdiff