-diff -NurpP --minimal linux-3.1.1/Documentation/vserver/debug.txt linux-3.1.1-vs2.3.2/Documentation/vserver/debug.txt
---- linux-3.1.1/Documentation/vserver/debug.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/Documentation/vserver/debug.txt 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/Documentation/vserver/debug.txt linux-3.1.6-vs2.3.2.5/Documentation/vserver/debug.txt
+--- linux-3.1.6/Documentation/vserver/debug.txt 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/Documentation/vserver/debug.txt 2011-10-24 18:53:33.000000000 +0200
@@ -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.1.1/arch/alpha/Kconfig linux-3.1.1-vs2.3.2/arch/alpha/Kconfig
---- linux-3.1.1/arch/alpha/Kconfig 2011-10-24 18:44:54.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/arch/alpha/Kconfig 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/arch/alpha/Kconfig linux-3.1.6-vs2.3.2.5/arch/alpha/Kconfig
+--- linux-3.1.6/arch/alpha/Kconfig 2011-10-24 18:44:54.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/arch/alpha/Kconfig 2011-10-24 18:53:33.000000000 +0200
@@ -670,6 +670,8 @@ config DUMMY_CONSOLE
depends on VGA_HOSE
default y
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.1.1/arch/alpha/kernel/entry.S linux-3.1.1-vs2.3.2/arch/alpha/kernel/entry.S
---- linux-3.1.1/arch/alpha/kernel/entry.S 2010-10-21 13:06:45.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/arch/alpha/kernel/entry.S 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/arch/alpha/kernel/entry.S linux-3.1.6-vs2.3.2.5/arch/alpha/kernel/entry.S
+--- linux-3.1.6/arch/alpha/kernel/entry.S 2010-10-21 13:06:45.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/arch/alpha/kernel/entry.S 2011-10-24 18:53:33.000000000 +0200
@@ -860,24 +860,15 @@ sys_getxgid:
.globl sys_getxpid
.ent sys_getxpid
ret
.end sys_getxpid
-diff -NurpP --minimal linux-3.1.1/arch/alpha/kernel/ptrace.c linux-3.1.1-vs2.3.2/arch/alpha/kernel/ptrace.c
---- linux-3.1.1/arch/alpha/kernel/ptrace.c 2011-01-05 21:48:40.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/arch/alpha/kernel/ptrace.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/arch/alpha/kernel/ptrace.c linux-3.1.6-vs2.3.2.5/arch/alpha/kernel/ptrace.c
+--- linux-3.1.6/arch/alpha/kernel/ptrace.c 2011-01-05 21:48:40.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/arch/alpha/kernel/ptrace.c 2011-10-24 18:53:33.000000000 +0200
@@ -13,6 +13,7 @@
#include <linux/user.h>
#include <linux/security.h>
#include <asm/uaccess.h>
#include <asm/pgtable.h>
-diff -NurpP --minimal linux-3.1.1/arch/alpha/kernel/systbls.S linux-3.1.1-vs2.3.2/arch/alpha/kernel/systbls.S
---- linux-3.1.1/arch/alpha/kernel/systbls.S 2011-10-24 18:44:54.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/arch/alpha/kernel/systbls.S 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/arch/alpha/kernel/systbls.S linux-3.1.6-vs2.3.2.5/arch/alpha/kernel/systbls.S
+--- linux-3.1.6/arch/alpha/kernel/systbls.S 2011-10-24 18:44:54.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/arch/alpha/kernel/systbls.S 2011-10-24 18:53:33.000000000 +0200
@@ -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.1.1/arch/alpha/kernel/traps.c linux-3.1.1-vs2.3.2/arch/alpha/kernel/traps.c
---- linux-3.1.1/arch/alpha/kernel/traps.c 2010-10-21 13:06:46.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/arch/alpha/kernel/traps.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/arch/alpha/kernel/traps.c linux-3.1.6-vs2.3.2.5/arch/alpha/kernel/traps.c
+--- linux-3.1.6/arch/alpha/kernel/traps.c 2010-10-21 13:06:46.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/arch/alpha/kernel/traps.c 2011-10-24 18:53:33.000000000 +0200
@@ -183,7 +183,8 @@ die_if_kernel(char * str, struct pt_regs
#ifdef CONFIG_SMP
printk("CPU %d ", hard_smp_processor_id());
dik_show_regs(regs, r9_15);
add_taint(TAINT_DIE);
dik_show_trace((unsigned long *)(regs+1));
-diff -NurpP --minimal linux-3.1.1/arch/arm/Kconfig linux-3.1.1-vs2.3.2/arch/arm/Kconfig
---- linux-3.1.1/arch/arm/Kconfig 2011-10-24 18:44:54.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/arch/arm/Kconfig 2011-10-24 18:53:33.000000000 +0200
-@@ -2111,6 +2111,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.1.6/arch/arm/Kconfig linux-3.1.6-vs2.3.2.5/arch/arm/Kconfig
+--- linux-3.1.6/arch/arm/Kconfig 2011-12-23 16:04:05.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/arch/arm/Kconfig 2011-12-15 01:07:58.000000000 +0100
+@@ -2123,6 +2123,8 @@ source "fs/Kconfig"
source "arch/arm/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.1.1/arch/arm/kernel/calls.S linux-3.1.1-vs2.3.2/arch/arm/kernel/calls.S
---- linux-3.1.1/arch/arm/kernel/calls.S 2011-10-24 18:44:54.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/arch/arm/kernel/calls.S 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/arch/arm/kernel/calls.S linux-3.1.6-vs2.3.2.5/arch/arm/kernel/calls.S
+--- linux-3.1.6/arch/arm/kernel/calls.S 2011-10-24 18:44:54.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/arch/arm/kernel/calls.S 2011-10-24 18:53:33.000000000 +0200
@@ -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.1.1/arch/arm/kernel/process.c linux-3.1.1-vs2.3.2/arch/arm/kernel/process.c
---- linux-3.1.1/arch/arm/kernel/process.c 2011-10-24 18:44:54.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/arch/arm/kernel/process.c 2011-10-24 18:53:33.000000000 +0200
-@@ -317,7 +317,8 @@ void __show_regs(struct pt_regs *regs)
+diff -NurpP --minimal linux-3.1.6/arch/arm/kernel/process.c linux-3.1.6-vs2.3.2.5/arch/arm/kernel/process.c
+--- linux-3.1.6/arch/arm/kernel/process.c 2011-12-23 16:04:05.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/arch/arm/kernel/process.c 2011-12-15 01:07:58.000000000 +0100
+@@ -320,7 +320,8 @@ void __show_regs(struct pt_regs *regs)
void show_regs(struct pt_regs * regs)
{
printk("\n");
__show_regs(regs);
__backtrace();
}
-diff -NurpP --minimal linux-3.1.1/arch/arm/kernel/traps.c linux-3.1.1-vs2.3.2/arch/arm/kernel/traps.c
---- linux-3.1.1/arch/arm/kernel/traps.c 2011-10-24 18:44:54.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/arch/arm/kernel/traps.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/arch/arm/kernel/traps.c linux-3.1.6-vs2.3.2.5/arch/arm/kernel/traps.c
+--- linux-3.1.6/arch/arm/kernel/traps.c 2011-10-24 18:44:54.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/arch/arm/kernel/traps.c 2011-10-24 18:53:33.000000000 +0200
@@ -242,8 +242,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.1.1/arch/cris/Kconfig linux-3.1.1-vs2.3.2/arch/cris/Kconfig
---- linux-3.1.1/arch/cris/Kconfig 2011-07-22 11:17:35.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/arch/cris/Kconfig 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/arch/cris/Kconfig linux-3.1.6-vs2.3.2.5/arch/cris/Kconfig
+--- linux-3.1.6/arch/cris/Kconfig 2011-07-22 11:17:35.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/arch/cris/Kconfig 2011-10-24 18:53:33.000000000 +0200
@@ -678,6 +678,8 @@ source "drivers/staging/Kconfig"
source "arch/cris/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.1.1/arch/frv/kernel/kernel_thread.S linux-3.1.1-vs2.3.2/arch/frv/kernel/kernel_thread.S
---- linux-3.1.1/arch/frv/kernel/kernel_thread.S 2008-12-25 00:26:37.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/arch/frv/kernel/kernel_thread.S 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/arch/frv/kernel/kernel_thread.S linux-3.1.6-vs2.3.2.5/arch/frv/kernel/kernel_thread.S
+--- linux-3.1.6/arch/frv/kernel/kernel_thread.S 2008-12-25 00:26:37.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/arch/frv/kernel/kernel_thread.S 2011-10-24 18:53:33.000000000 +0200
@@ -37,7 +37,7 @@ kernel_thread:
# start by forking the current process, but with shared VM
sethi.p #0xe4e4,gr9 ; second syscall arg [newsp]
setlo #0xe4e4,gr9
setlos.p #0,gr10 ; third syscall arg [parent_tidptr]
-diff -NurpP --minimal linux-3.1.1/arch/h8300/Kconfig linux-3.1.1-vs2.3.2/arch/h8300/Kconfig
---- linux-3.1.1/arch/h8300/Kconfig 2011-07-22 11:17:35.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/arch/h8300/Kconfig 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/arch/h8300/Kconfig linux-3.1.6-vs2.3.2.5/arch/h8300/Kconfig
+--- linux-3.1.6/arch/h8300/Kconfig 2011-07-22 11:17:35.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/arch/h8300/Kconfig 2011-10-24 18:53:33.000000000 +0200
@@ -213,6 +213,8 @@ source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.1.1/arch/ia64/Kconfig linux-3.1.1-vs2.3.2/arch/ia64/Kconfig
---- linux-3.1.1/arch/ia64/Kconfig 2011-10-24 18:44:58.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/arch/ia64/Kconfig 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/arch/ia64/Kconfig linux-3.1.6-vs2.3.2.5/arch/ia64/Kconfig
+--- linux-3.1.6/arch/ia64/Kconfig 2011-10-24 18:44:58.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/arch/ia64/Kconfig 2011-10-24 18:53:33.000000000 +0200
@@ -657,6 +657,8 @@ source "fs/Kconfig"
source "arch/ia64/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.1.1/arch/ia64/include/asm/tlb.h linux-3.1.1-vs2.3.2/arch/ia64/include/asm/tlb.h
---- linux-3.1.1/arch/ia64/include/asm/tlb.h 2011-07-22 11:17:35.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/arch/ia64/include/asm/tlb.h 2011-10-24 18:53:33.000000000 +0200
-@@ -40,6 +40,7 @@
- #include <linux/mm.h>
- #include <linux/pagemap.h>
- #include <linux/swap.h>
-+#include <linux/vs_memory.h>
-
- #include <asm/pgalloc.h>
- #include <asm/processor.h>
-diff -NurpP --minimal linux-3.1.1/arch/ia64/kernel/entry.S linux-3.1.1-vs2.3.2/arch/ia64/kernel/entry.S
---- linux-3.1.1/arch/ia64/kernel/entry.S 2011-10-24 18:44:58.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/arch/ia64/kernel/entry.S 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/arch/ia64/kernel/entry.S linux-3.1.6-vs2.3.2.5/arch/ia64/kernel/entry.S
+--- linux-3.1.6/arch/ia64/kernel/entry.S 2011-10-24 18:44:58.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/arch/ia64/kernel/entry.S 2011-10-24 18:53:33.000000000 +0200
@@ -1714,7 +1714,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.1.1/arch/ia64/kernel/perfmon.c linux-3.1.1-vs2.3.2/arch/ia64/kernel/perfmon.c
---- linux-3.1.1/arch/ia64/kernel/perfmon.c 2011-03-15 18:06:39.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/arch/ia64/kernel/perfmon.c 2011-10-24 18:53:33.000000000 +0200
-@@ -42,6 +42,7 @@
- #include <linux/completion.h>
- #include <linux/tracehook.h>
- #include <linux/slab.h>
-+#include <linux/vs_memory.h>
-
- #include <asm/errno.h>
- #include <asm/intrinsics.h>
-diff -NurpP --minimal linux-3.1.1/arch/ia64/kernel/process.c linux-3.1.1-vs2.3.2/arch/ia64/kernel/process.c
---- linux-3.1.1/arch/ia64/kernel/process.c 2011-03-15 18:06:39.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/arch/ia64/kernel/process.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/arch/ia64/kernel/process.c linux-3.1.6-vs2.3.2.5/arch/ia64/kernel/process.c
+--- linux-3.1.6/arch/ia64/kernel/process.c 2011-03-15 18:06:39.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/arch/ia64/kernel/process.c 2011-10-24 18:53:33.000000000 +0200
@@ -109,8 +109,8 @@ show_regs (struct pt_regs *regs)
unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri;
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.1.1/arch/ia64/kernel/ptrace.c linux-3.1.1-vs2.3.2/arch/ia64/kernel/ptrace.c
---- linux-3.1.1/arch/ia64/kernel/ptrace.c 2011-01-05 21:48:59.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/arch/ia64/kernel/ptrace.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/arch/ia64/kernel/ptrace.c linux-3.1.6-vs2.3.2.5/arch/ia64/kernel/ptrace.c
+--- linux-3.1.6/arch/ia64/kernel/ptrace.c 2011-01-05 21:48:59.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/arch/ia64/kernel/ptrace.c 2011-10-24 18:53:33.000000000 +0200
@@ -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.1.1/arch/ia64/kernel/traps.c linux-3.1.1-vs2.3.2/arch/ia64/kernel/traps.c
---- linux-3.1.1/arch/ia64/kernel/traps.c 2010-07-07 18:31:01.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/arch/ia64/kernel/traps.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/arch/ia64/kernel/traps.c linux-3.1.6-vs2.3.2.5/arch/ia64/kernel/traps.c
+--- linux-3.1.6/arch/ia64/kernel/traps.c 2010-07-07 18:31:01.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/arch/ia64/kernel/traps.c 2011-10-24 18:53:33.000000000 +0200
@@ -59,8 +59,9 @@ die (const char *str, struct pt_regs *re
put_cpu();
}
}
}
-diff -NurpP --minimal linux-3.1.1/arch/ia64/mm/fault.c linux-3.1.1-vs2.3.2/arch/ia64/mm/fault.c
---- linux-3.1.1/arch/ia64/mm/fault.c 2011-07-22 11:17:35.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/arch/ia64/mm/fault.c 2011-10-24 18:53:33.000000000 +0200
-@@ -11,6 +11,7 @@
- #include <linux/kprobes.h>
- #include <linux/kdebug.h>
- #include <linux/prefetch.h>
-+#include <linux/vs_memory.h>
-
- #include <asm/pgtable.h>
- #include <asm/processor.h>
-diff -NurpP --minimal linux-3.1.1/arch/m32r/kernel/traps.c linux-3.1.1-vs2.3.2/arch/m32r/kernel/traps.c
---- linux-3.1.1/arch/m32r/kernel/traps.c 2011-10-24 18:44:58.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/arch/m32r/kernel/traps.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/arch/m32r/kernel/traps.c linux-3.1.6-vs2.3.2.5/arch/m32r/kernel/traps.c
+--- linux-3.1.6/arch/m32r/kernel/traps.c 2011-10-24 18:44:58.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/arch/m32r/kernel/traps.c 2011-10-24 18:53:33.000000000 +0200
@@ -196,8 +196,9 @@ static void show_registers(struct pt_reg
} else {
printk("SPI: %08lx\n", sp);
/*
* When in-kernel, we also print out the stack and code at the
-diff -NurpP --minimal linux-3.1.1/arch/m68k/Kconfig linux-3.1.1-vs2.3.2/arch/m68k/Kconfig
---- linux-3.1.1/arch/m68k/Kconfig 2011-10-24 18:44:58.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/arch/m68k/Kconfig 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/arch/m68k/Kconfig linux-3.1.6-vs2.3.2.5/arch/m68k/Kconfig
+--- linux-3.1.6/arch/m68k/Kconfig 2011-10-24 18:44:58.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/arch/m68k/Kconfig 2011-10-24 18:53:33.000000000 +0200
@@ -246,6 +246,8 @@ source "fs/Kconfig"
source "arch/m68k/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.1.1/arch/mips/Kconfig linux-3.1.1-vs2.3.2/arch/mips/Kconfig
---- linux-3.1.1/arch/mips/Kconfig 2011-10-24 18:44:59.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/arch/mips/Kconfig 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/arch/mips/Kconfig linux-3.1.6-vs2.3.2.5/arch/mips/Kconfig
+--- linux-3.1.6/arch/mips/Kconfig 2011-10-24 18:44:59.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/arch/mips/Kconfig 2011-10-24 18:53:33.000000000 +0200
@@ -2495,6 +2495,8 @@ source "fs/Kconfig"
source "arch/mips/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.1.1/arch/mips/kernel/ptrace.c linux-3.1.1-vs2.3.2/arch/mips/kernel/ptrace.c
---- linux-3.1.1/arch/mips/kernel/ptrace.c 2011-07-22 11:17:36.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/arch/mips/kernel/ptrace.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/arch/mips/kernel/ptrace.c linux-3.1.6-vs2.3.2.5/arch/mips/kernel/ptrace.c
+--- linux-3.1.6/arch/mips/kernel/ptrace.c 2011-07-22 11:17:36.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/arch/mips/kernel/ptrace.c 2011-10-24 18:53:33.000000000 +0200
@@ -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.1.1/arch/mips/kernel/scall32-o32.S linux-3.1.1-vs2.3.2/arch/mips/kernel/scall32-o32.S
---- linux-3.1.1/arch/mips/kernel/scall32-o32.S 2011-10-24 18:44:59.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/arch/mips/kernel/scall32-o32.S 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/arch/mips/kernel/scall32-o32.S linux-3.1.6-vs2.3.2.5/arch/mips/kernel/scall32-o32.S
+--- linux-3.1.6/arch/mips/kernel/scall32-o32.S 2011-10-24 18:44:59.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/arch/mips/kernel/scall32-o32.S 2011-10-24 18:53:33.000000000 +0200
@@ -523,7 +523,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.1.1/arch/mips/kernel/scall64-64.S linux-3.1.1-vs2.3.2/arch/mips/kernel/scall64-64.S
---- linux-3.1.1/arch/mips/kernel/scall64-64.S 2011-10-24 18:44:59.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/arch/mips/kernel/scall64-64.S 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/arch/mips/kernel/scall64-64.S linux-3.1.6-vs2.3.2.5/arch/mips/kernel/scall64-64.S
+--- linux-3.1.6/arch/mips/kernel/scall64-64.S 2011-10-24 18:44:59.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/arch/mips/kernel/scall64-64.S 2011-10-24 18:53:33.000000000 +0200
@@ -362,7 +362,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.1.1/arch/mips/kernel/scall64-n32.S linux-3.1.1-vs2.3.2/arch/mips/kernel/scall64-n32.S
---- linux-3.1.1/arch/mips/kernel/scall64-n32.S 2011-10-24 18:44:59.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/arch/mips/kernel/scall64-n32.S 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/arch/mips/kernel/scall64-n32.S linux-3.1.6-vs2.3.2.5/arch/mips/kernel/scall64-n32.S
+--- linux-3.1.6/arch/mips/kernel/scall64-n32.S 2011-10-24 18:44:59.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/arch/mips/kernel/scall64-n32.S 2011-10-24 18:53:33.000000000 +0200
@@ -361,7 +361,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.1.1/arch/mips/kernel/scall64-o32.S linux-3.1.1-vs2.3.2/arch/mips/kernel/scall64-o32.S
---- linux-3.1.1/arch/mips/kernel/scall64-o32.S 2011-10-24 18:44:59.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/arch/mips/kernel/scall64-o32.S 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/arch/mips/kernel/scall64-o32.S linux-3.1.6-vs2.3.2.5/arch/mips/kernel/scall64-o32.S
+--- linux-3.1.6/arch/mips/kernel/scall64-o32.S 2011-10-24 18:44:59.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/arch/mips/kernel/scall64-o32.S 2011-10-24 18:53:33.000000000 +0200
@@ -480,7 +480,7 @@ sys_call_table:
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify /* 4275 */
PTR sys_32_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-diff -NurpP --minimal linux-3.1.1/arch/mips/kernel/traps.c linux-3.1.1-vs2.3.2/arch/mips/kernel/traps.c
---- linux-3.1.1/arch/mips/kernel/traps.c 2011-10-24 18:44:59.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/arch/mips/kernel/traps.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/arch/mips/kernel/traps.c linux-3.1.6-vs2.3.2.5/arch/mips/kernel/traps.c
+--- linux-3.1.6/arch/mips/kernel/traps.c 2011-10-24 18:44:59.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/arch/mips/kernel/traps.c 2011-10-24 18:53:33.000000000 +0200
@@ -344,9 +344,10 @@ void show_registers(struct pt_regs *regs
__show_regs(regs);
if (cpu_has_userlocal) {
unsigned long tls;
-diff -NurpP --minimal linux-3.1.1/arch/parisc/Kconfig linux-3.1.1-vs2.3.2/arch/parisc/Kconfig
---- linux-3.1.1/arch/parisc/Kconfig 2011-10-24 18:44:59.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/arch/parisc/Kconfig 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/arch/parisc/Kconfig linux-3.1.6-vs2.3.2.5/arch/parisc/Kconfig
+--- linux-3.1.6/arch/parisc/Kconfig 2011-10-24 18:44:59.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/arch/parisc/Kconfig 2011-10-24 18:53:33.000000000 +0200
@@ -280,6 +280,8 @@ source "fs/Kconfig"
source "arch/parisc/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.1.1/arch/parisc/kernel/syscall_table.S linux-3.1.1-vs2.3.2/arch/parisc/kernel/syscall_table.S
---- linux-3.1.1/arch/parisc/kernel/syscall_table.S 2011-10-24 18:45:00.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/arch/parisc/kernel/syscall_table.S 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/arch/parisc/kernel/syscall_table.S linux-3.1.6-vs2.3.2.5/arch/parisc/kernel/syscall_table.S
+--- linux-3.1.6/arch/parisc/kernel/syscall_table.S 2011-10-24 18:45:00.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/arch/parisc/kernel/syscall_table.S 2011-10-24 18:53:33.000000000 +0200
@@ -361,7 +361,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.1.1/arch/parisc/kernel/traps.c linux-3.1.1-vs2.3.2/arch/parisc/kernel/traps.c
---- linux-3.1.1/arch/parisc/kernel/traps.c 2011-10-24 18:45:00.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/arch/parisc/kernel/traps.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/arch/parisc/kernel/traps.c linux-3.1.6-vs2.3.2.5/arch/parisc/kernel/traps.c
+--- linux-3.1.6/arch/parisc/kernel/traps.c 2011-10-24 18:45:00.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/arch/parisc/kernel/traps.c 2011-10-24 18:53:33.000000000 +0200
@@ -236,8 +236,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.1.1/arch/parisc/mm/fault.c linux-3.1.1-vs2.3.2/arch/parisc/mm/fault.c
---- linux-3.1.1/arch/parisc/mm/fault.c 2010-08-02 16:52:06.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/arch/parisc/mm/fault.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/arch/parisc/mm/fault.c linux-3.1.6-vs2.3.2.5/arch/parisc/mm/fault.c
+--- linux-3.1.6/arch/parisc/mm/fault.c 2010-08-02 16:52:06.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/arch/parisc/mm/fault.c 2011-10-24 18:53:33.000000000 +0200
@@ -237,8 +237,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.1.1/arch/powerpc/Kconfig linux-3.1.1-vs2.3.2/arch/powerpc/Kconfig
---- linux-3.1.1/arch/powerpc/Kconfig 2011-10-24 18:45:00.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/arch/powerpc/Kconfig 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/arch/powerpc/Kconfig linux-3.1.6-vs2.3.2.5/arch/powerpc/Kconfig
+--- linux-3.1.6/arch/powerpc/Kconfig 2011-10-24 18:45:00.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/arch/powerpc/Kconfig 2011-10-24 18:53:33.000000000 +0200
@@ -981,6 +981,8 @@ source "lib/Kconfig"
source "arch/powerpc/Kconfig.debug"
source "security/Kconfig"
config KEYS_COMPAT
-diff -NurpP --minimal linux-3.1.1/arch/powerpc/include/asm/unistd.h linux-3.1.1-vs2.3.2/arch/powerpc/include/asm/unistd.h
---- linux-3.1.1/arch/powerpc/include/asm/unistd.h 2011-07-22 11:17:40.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/arch/powerpc/include/asm/unistd.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/arch/powerpc/include/asm/unistd.h linux-3.1.6-vs2.3.2.5/arch/powerpc/include/asm/unistd.h
+--- linux-3.1.6/arch/powerpc/include/asm/unistd.h 2011-07-22 11:17:40.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/arch/powerpc/include/asm/unistd.h 2011-10-24 18:53:33.000000000 +0200
@@ -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.1.1/arch/powerpc/kernel/process.c linux-3.1.1-vs2.3.2/arch/powerpc/kernel/process.c
---- linux-3.1.1/arch/powerpc/kernel/process.c 2011-10-24 18:45:00.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/arch/powerpc/kernel/process.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/arch/powerpc/kernel/process.c linux-3.1.6-vs2.3.2.5/arch/powerpc/kernel/process.c
+--- linux-3.1.6/arch/powerpc/kernel/process.c 2011-10-24 18:45:00.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/arch/powerpc/kernel/process.c 2011-10-24 18:53:33.000000000 +0200
@@ -662,8 +662,9 @@ void show_regs(struct pt_regs * regs)
#else
printk("DAR: "REG", DSISR: %08lx\n", regs->dar, regs->dsisr);
#ifdef CONFIG_SMP
printk(" CPU: %d", raw_smp_processor_id());
-diff -NurpP --minimal linux-3.1.1/arch/powerpc/kernel/traps.c linux-3.1.1-vs2.3.2/arch/powerpc/kernel/traps.c
---- linux-3.1.1/arch/powerpc/kernel/traps.c 2011-10-24 18:45:00.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/arch/powerpc/kernel/traps.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/arch/powerpc/kernel/traps.c linux-3.1.6-vs2.3.2.5/arch/powerpc/kernel/traps.c
+--- linux-3.1.6/arch/powerpc/kernel/traps.c 2011-10-24 18:45:00.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/arch/powerpc/kernel/traps.c 2011-10-24 18:53:33.000000000 +0200
@@ -1075,8 +1075,9 @@ void nonrecoverable_exception(struct pt_
void trace_syscall(struct pt_regs *regs)
regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted());
}
-diff -NurpP --minimal linux-3.1.1/arch/powerpc/kernel/vdso.c linux-3.1.1-vs2.3.2/arch/powerpc/kernel/vdso.c
---- linux-3.1.1/arch/powerpc/kernel/vdso.c 2011-05-22 16:17:02.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/arch/powerpc/kernel/vdso.c 2011-10-24 18:53:33.000000000 +0200
-@@ -23,6 +23,7 @@
- #include <linux/security.h>
- #include <linux/bootmem.h>
- #include <linux/memblock.h>
-+#include <linux/vs_memory.h>
-
- #include <asm/pgtable.h>
- #include <asm/system.h>
-diff -NurpP --minimal linux-3.1.1/arch/s390/Kconfig linux-3.1.1-vs2.3.2/arch/s390/Kconfig
---- linux-3.1.1/arch/s390/Kconfig 2011-10-24 18:45:01.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/arch/s390/Kconfig 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/arch/s390/Kconfig linux-3.1.6-vs2.3.2.5/arch/s390/Kconfig
+--- linux-3.1.6/arch/s390/Kconfig 2011-10-24 18:45:01.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/arch/s390/Kconfig 2011-10-24 18:53:33.000000000 +0200
@@ -629,6 +629,8 @@ source "fs/Kconfig"
source "arch/s390/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.1.1/arch/s390/include/asm/tlb.h linux-3.1.1-vs2.3.2/arch/s390/include/asm/tlb.h
---- linux-3.1.1/arch/s390/include/asm/tlb.h 2011-07-22 11:17:41.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/arch/s390/include/asm/tlb.h 2011-10-24 18:53:33.000000000 +0200
-@@ -24,6 +24,8 @@
+diff -NurpP --minimal linux-3.1.6/arch/s390/include/asm/tlb.h linux-3.1.6-vs2.3.2.5/arch/s390/include/asm/tlb.h
+--- linux-3.1.6/arch/s390/include/asm/tlb.h 2011-07-22 11:17:41.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/arch/s390/include/asm/tlb.h 2011-12-07 04:18:50.000000000 +0100
+@@ -24,6 +24,7 @@
#include <linux/mm.h>
#include <linux/pagemap.h>
#include <linux/swap.h>
-+#include <linux/vs_memory.h>
+
#include <asm/processor.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-3.1.1/arch/s390/include/asm/unistd.h linux-3.1.1-vs2.3.2/arch/s390/include/asm/unistd.h
---- linux-3.1.1/arch/s390/include/asm/unistd.h 2011-07-22 11:17:41.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/arch/s390/include/asm/unistd.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/arch/s390/include/asm/unistd.h linux-3.1.6-vs2.3.2.5/arch/s390/include/asm/unistd.h
+--- linux-3.1.6/arch/s390/include/asm/unistd.h 2011-07-22 11:17:41.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/arch/s390/include/asm/unistd.h 2011-10-24 18:53:33.000000000 +0200
@@ -202,7 +202,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.1.1/arch/s390/kernel/ptrace.c linux-3.1.1-vs2.3.2/arch/s390/kernel/ptrace.c
---- linux-3.1.1/arch/s390/kernel/ptrace.c 2011-11-15 16:44:51.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/arch/s390/kernel/ptrace.c 2011-11-15 17:08:44.000000000 +0100
+diff -NurpP --minimal linux-3.1.6/arch/s390/kernel/ptrace.c linux-3.1.6-vs2.3.2.5/arch/s390/kernel/ptrace.c
+--- linux-3.1.6/arch/s390/kernel/ptrace.c 2011-12-23 16:04:05.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/arch/s390/kernel/ptrace.c 2011-12-15 01:07:58.000000000 +0100
@@ -20,6 +20,7 @@
#include <linux/regset.h>
#include <linux/tracehook.h>
#include <trace/syscall.h>
#include <asm/compat.h>
#include <asm/segment.h>
-diff -NurpP --minimal linux-3.1.1/arch/s390/kernel/syscalls.S linux-3.1.1-vs2.3.2/arch/s390/kernel/syscalls.S
---- linux-3.1.1/arch/s390/kernel/syscalls.S 2011-10-24 18:45:01.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/arch/s390/kernel/syscalls.S 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/arch/s390/kernel/syscalls.S linux-3.1.6-vs2.3.2.5/arch/s390/kernel/syscalls.S
+--- linux-3.1.6/arch/s390/kernel/syscalls.S 2011-10-24 18:45:01.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/arch/s390/kernel/syscalls.S 2011-10-24 18:53:33.000000000 +0200
@@ -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.1.1/arch/sh/Kconfig linux-3.1.1-vs2.3.2/arch/sh/Kconfig
---- linux-3.1.1/arch/sh/Kconfig 2011-10-24 18:45:01.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/arch/sh/Kconfig 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/arch/sh/Kconfig linux-3.1.6-vs2.3.2.5/arch/sh/Kconfig
+--- linux-3.1.6/arch/sh/Kconfig 2011-10-24 18:45:01.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/arch/sh/Kconfig 2011-10-24 18:53:33.000000000 +0200
@@ -894,6 +894,8 @@ source "fs/Kconfig"
source "arch/sh/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.1.1/arch/sh/kernel/irq.c linux-3.1.1-vs2.3.2/arch/sh/kernel/irq.c
---- linux-3.1.1/arch/sh/kernel/irq.c 2011-07-22 11:17:41.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/arch/sh/kernel/irq.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/arch/sh/kernel/irq.c linux-3.1.6-vs2.3.2.5/arch/sh/kernel/irq.c
+--- linux-3.1.6/arch/sh/kernel/irq.c 2011-07-22 11:17:41.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/arch/sh/kernel/irq.c 2011-10-24 18:53:33.000000000 +0200
@@ -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.1.1/arch/sh/kernel/vsyscall/vsyscall.c linux-3.1.1-vs2.3.2/arch/sh/kernel/vsyscall/vsyscall.c
---- linux-3.1.1/arch/sh/kernel/vsyscall/vsyscall.c 2011-05-22 16:17:07.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/arch/sh/kernel/vsyscall/vsyscall.c 2011-10-24 18:53:33.000000000 +0200
-@@ -18,6 +18,7 @@
- #include <linux/elf.h>
- #include <linux/sched.h>
- #include <linux/err.h>
-+#include <linux/vs_memory.h>
-
- /*
- * Should the kernel map a VDSO page into processes and pass its
-diff -NurpP --minimal linux-3.1.1/arch/sparc/Kconfig linux-3.1.1-vs2.3.2/arch/sparc/Kconfig
---- linux-3.1.1/arch/sparc/Kconfig 2011-10-24 18:45:02.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/arch/sparc/Kconfig 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/arch/sparc/Kconfig linux-3.1.6-vs2.3.2.5/arch/sparc/Kconfig
+--- linux-3.1.6/arch/sparc/Kconfig 2011-10-24 18:45:02.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/arch/sparc/Kconfig 2011-10-24 18:53:33.000000000 +0200
@@ -600,6 +600,8 @@ source "fs/Kconfig"
source "arch/sparc/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.1.1/arch/sparc/include/asm/tlb_64.h linux-3.1.1-vs2.3.2/arch/sparc/include/asm/tlb_64.h
---- linux-3.1.1/arch/sparc/include/asm/tlb_64.h 2011-07-22 11:17:42.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/arch/sparc/include/asm/tlb_64.h 2011-10-24 18:53:33.000000000 +0200
-@@ -3,6 +3,7 @@
-
- #include <linux/swap.h>
- #include <linux/pagemap.h>
-+#include <linux/vs_memory.h>
- #include <asm/pgalloc.h>
- #include <asm/tlbflush.h>
- #include <asm/mmu_context.h>
-diff -NurpP --minimal linux-3.1.1/arch/sparc/include/asm/unistd.h linux-3.1.1-vs2.3.2/arch/sparc/include/asm/unistd.h
---- linux-3.1.1/arch/sparc/include/asm/unistd.h 2011-07-22 11:17:42.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/arch/sparc/include/asm/unistd.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/arch/sparc/include/asm/unistd.h linux-3.1.6-vs2.3.2.5/arch/sparc/include/asm/unistd.h
+--- linux-3.1.6/arch/sparc/include/asm/unistd.h 2011-07-22 11:17:42.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/arch/sparc/include/asm/unistd.h 2011-10-24 18:53:33.000000000 +0200
@@ -335,7 +335,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.1.1/arch/sparc/kernel/systbls_32.S linux-3.1.1-vs2.3.2/arch/sparc/kernel/systbls_32.S
---- linux-3.1.1/arch/sparc/kernel/systbls_32.S 2011-10-24 18:45:02.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/arch/sparc/kernel/systbls_32.S 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/arch/sparc/kernel/systbls_32.S linux-3.1.6-vs2.3.2.5/arch/sparc/kernel/systbls_32.S
+--- linux-3.1.6/arch/sparc/kernel/systbls_32.S 2011-10-24 18:45:02.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/arch/sparc/kernel/systbls_32.S 2011-10-24 18:53:33.000000000 +0200
@@ -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.1.1/arch/sparc/kernel/systbls_64.S linux-3.1.1-vs2.3.2/arch/sparc/kernel/systbls_64.S
---- linux-3.1.1/arch/sparc/kernel/systbls_64.S 2011-10-24 18:45:02.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/arch/sparc/kernel/systbls_64.S 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/arch/sparc/kernel/systbls_64.S linux-3.1.6-vs2.3.2.5/arch/sparc/kernel/systbls_64.S
+--- linux-3.1.6/arch/sparc/kernel/systbls_64.S 2011-10-24 18:45:02.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/arch/sparc/kernel/systbls_64.S 2011-10-24 18:53:33.000000000 +0200
@@ -71,7 +71,7 @@ sys_call_table32:
/*250*/ .word sys_mremap, compat_sys_sysctl, sys32_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.1.1/arch/um/Kconfig.rest linux-3.1.1-vs2.3.2/arch/um/Kconfig.rest
---- linux-3.1.1/arch/um/Kconfig.rest 2009-06-11 17:12:19.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/arch/um/Kconfig.rest 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/arch/um/Kconfig.rest linux-3.1.6-vs2.3.2.5/arch/um/Kconfig.rest
+--- linux-3.1.6/arch/um/Kconfig.rest 2009-06-11 17:12:19.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/arch/um/Kconfig.rest 2011-10-24 18:53:33.000000000 +0200
@@ -18,6 +18,8 @@ source "drivers/connector/Kconfig"
source "fs/Kconfig"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.1.1/arch/um/include/asm/tlb.h linux-3.1.1-vs2.3.2/arch/um/include/asm/tlb.h
---- linux-3.1.1/arch/um/include/asm/tlb.h 2011-07-22 11:17:42.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/arch/um/include/asm/tlb.h 2011-10-24 18:53:33.000000000 +0200
-@@ -3,6 +3,7 @@
-
- #include <linux/pagemap.h>
- #include <linux/swap.h>
-+#include <linux/vs_memory.h>
- #include <asm/percpu.h>
- #include <asm/pgalloc.h>
- #include <asm/tlbflush.h>
-diff -NurpP --minimal linux-3.1.1/arch/um/include/shared/kern_constants.h linux-3.1.1-vs2.3.2/arch/um/include/shared/kern_constants.h
---- linux-3.1.1/arch/um/include/shared/kern_constants.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/arch/um/include/shared/kern_constants.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/arch/um/include/shared/kern_constants.h linux-3.1.6-vs2.3.2.5/arch/um/include/shared/kern_constants.h
+--- linux-3.1.6/arch/um/include/shared/kern_constants.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/arch/um/include/shared/kern_constants.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../include/generated/asm-offsets.h"
-diff -NurpP --minimal linux-3.1.1/arch/um/include/shared/user_constants.h linux-3.1.1-vs2.3.2/arch/um/include/shared/user_constants.h
---- linux-3.1.1/arch/um/include/shared/user_constants.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/arch/um/include/shared/user_constants.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/arch/um/include/shared/user_constants.h linux-3.1.6-vs2.3.2.5/arch/um/include/shared/user_constants.h
+--- linux-3.1.6/arch/um/include/shared/user_constants.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/arch/um/include/shared/user_constants.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,40 @@
+/*
+ * DO NOT MODIFY.
+#define UM_PROT_WRITE 2 /* PROT_WRITE # */
+#define UM_PROT_EXEC 4 /* PROT_EXEC # */
+
-diff -NurpP --minimal linux-3.1.1/arch/x86/Kconfig linux-3.1.1-vs2.3.2/arch/x86/Kconfig
---- linux-3.1.1/arch/x86/Kconfig 2011-10-24 18:45:06.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/arch/x86/Kconfig 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/arch/x86/Kconfig linux-3.1.6-vs2.3.2.5/arch/x86/Kconfig
+--- linux-3.1.6/arch/x86/Kconfig 2011-10-24 18:45:06.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/arch/x86/Kconfig 2011-10-24 18:53:33.000000000 +0200
@@ -2144,6 +2144,8 @@ source "fs/Kconfig"
source "arch/x86/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.1.1/arch/x86/ia32/ia32entry.S linux-3.1.1-vs2.3.2/arch/x86/ia32/ia32entry.S
---- linux-3.1.1/arch/x86/ia32/ia32entry.S 2011-10-24 18:45:06.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/arch/x86/ia32/ia32entry.S 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/arch/x86/ia32/ia32entry.S linux-3.1.6-vs2.3.2.5/arch/x86/ia32/ia32entry.S
+--- linux-3.1.6/arch/x86/ia32/ia32entry.S 2011-10-24 18:45:06.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/arch/x86/ia32/ia32entry.S 2011-10-24 18:53:33.000000000 +0200
@@ -776,7 +776,7 @@ ia32_sys_call_table:
.quad sys_tgkill /* 270 */
.quad compat_sys_utimes
.quad sys_mbind
.quad compat_sys_get_mempolicy /* 275 */
.quad sys_set_mempolicy
-diff -NurpP --minimal linux-3.1.1/arch/x86/include/asm/unistd_64.h linux-3.1.1-vs2.3.2/arch/x86/include/asm/unistd_64.h
---- linux-3.1.1/arch/x86/include/asm/unistd_64.h 2011-10-24 18:45:07.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/arch/x86/include/asm/unistd_64.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/arch/x86/include/asm/unistd_64.h linux-3.1.6-vs2.3.2.5/arch/x86/include/asm/unistd_64.h
+--- linux-3.1.6/arch/x86/include/asm/unistd_64.h 2011-10-24 18:45:07.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/arch/x86/include/asm/unistd_64.h 2011-10-24 18:53:33.000000000 +0200
@@ -535,7 +535,7 @@ __SYSCALL(__NR_tgkill, sys_tgkill)
#define __NR_utimes 235
__SYSCALL(__NR_utimes, sys_utimes)
#define __NR_mbind 237
__SYSCALL(__NR_mbind, sys_mbind)
#define __NR_set_mempolicy 238
-diff -NurpP --minimal linux-3.1.1/arch/x86/kernel/syscall_table_32.S linux-3.1.1-vs2.3.2/arch/x86/kernel/syscall_table_32.S
---- linux-3.1.1/arch/x86/kernel/syscall_table_32.S 2011-10-24 18:45:07.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/arch/x86/kernel/syscall_table_32.S 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/arch/x86/kernel/syscall_table_32.S linux-3.1.6-vs2.3.2.5/arch/x86/kernel/syscall_table_32.S
+--- linux-3.1.6/arch/x86/kernel/syscall_table_32.S 2011-10-24 18:45:07.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/arch/x86/kernel/syscall_table_32.S 2011-10-24 18:53:33.000000000 +0200
@@ -272,7 +272,7 @@ ENTRY(sys_call_table)
.long sys_tgkill /* 270 */
.long sys_utimes
.long sys_mbind
.long sys_get_mempolicy
.long sys_set_mempolicy
-diff -NurpP --minimal linux-3.1.1/drivers/block/Kconfig linux-3.1.1-vs2.3.2/drivers/block/Kconfig
---- linux-3.1.1/drivers/block/Kconfig 2011-10-24 18:45:08.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/drivers/block/Kconfig 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/drivers/block/Kconfig linux-3.1.6-vs2.3.2.5/drivers/block/Kconfig
+--- linux-3.1.6/drivers/block/Kconfig 2011-10-24 18:45:08.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/drivers/block/Kconfig 2011-10-24 18:53:33.000000000 +0200
@@ -288,6 +288,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.1.1/drivers/block/Makefile linux-3.1.1-vs2.3.2/drivers/block/Makefile
---- linux-3.1.1/drivers/block/Makefile 2011-07-22 11:17:44.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/drivers/block/Makefile 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/drivers/block/Makefile linux-3.1.6-vs2.3.2.5/drivers/block/Makefile
+--- linux-3.1.6/drivers/block/Makefile 2011-07-22 11:17:44.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/drivers/block/Makefile 2011-10-24 18:53:33.000000000 +0200
@@ -34,6 +34,7 @@ obj-$(CONFIG_VIODASD) += viodasd.o
obj-$(CONFIG_BLK_DEV_SX8) += sx8.o
obj-$(CONFIG_BLK_DEV_UB) += ub.o
obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o
obj-$(CONFIG_XEN_BLKDEV_BACKEND) += xen-blkback/
-diff -NurpP --minimal linux-3.1.1/drivers/block/loop.c linux-3.1.1-vs2.3.2/drivers/block/loop.c
---- linux-3.1.1/drivers/block/loop.c 2011-10-24 18:45:08.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/drivers/block/loop.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/drivers/block/loop.c linux-3.1.6-vs2.3.2.5/drivers/block/loop.c
+--- linux-3.1.6/drivers/block/loop.c 2011-10-24 18:45:08.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/drivers/block/loop.c 2011-12-17 20:00:17.000000000 +0100
@@ -76,6 +76,7 @@
#include <linux/splice.h>
#include <linux/sysfs.h>
info->lo_encrypt_key_size = lo->lo_encrypt_key_size;
memcpy(info->lo_encrypt_key, lo->lo_encrypt_key,
lo->lo_encrypt_key_size);
-@@ -1490,6 +1494,9 @@ static int lo_open(struct block_device *
+@@ -1490,6 +1494,11 @@ static int lo_open(struct block_device *
goto out;
}
-+ if (!vx_check(lo->lo_xid, VS_IDENT|VS_HOSTID|VS_ADMIN_P))
-+ return -EACCES;
++ if (!vx_check(lo->lo_xid, VS_IDENT|VS_HOSTID|VS_ADMIN_P)) {
++ err = -EACCES;
++ goto out;
++ }
+
mutex_lock(&lo->lo_ctl_mutex);
lo->lo_refcnt++;
mutex_unlock(&lo->lo_ctl_mutex);
-diff -NurpP --minimal linux-3.1.1/drivers/block/vroot.c linux-3.1.1-vs2.3.2/drivers/block/vroot.c
---- linux-3.1.1/drivers/block/vroot.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/drivers/block/vroot.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/drivers/block/vroot.c linux-3.1.6-vs2.3.2.5/drivers/block/vroot.c
+--- linux-3.1.6/drivers/block/vroot.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/drivers/block/vroot.c 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,292 @@
+/*
+ * linux/drivers/block/vroot.c
+
+#endif
+
-diff -NurpP --minimal linux-3.1.1/drivers/infiniband/core/addr.c linux-3.1.1-vs2.3.2/drivers/infiniband/core/addr.c
---- linux-3.1.1/drivers/infiniband/core/addr.c 2011-10-24 18:45:09.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/drivers/infiniband/core/addr.c 2011-10-24 18:53:33.000000000 +0200
-@@ -252,7 +252,7 @@ static int addr6_resolve(struct sockaddr
+diff -NurpP --minimal linux-3.1.6/drivers/infiniband/core/addr.c linux-3.1.6-vs2.3.2.5/drivers/infiniband/core/addr.c
+--- linux-3.1.6/drivers/infiniband/core/addr.c 2011-12-23 16:04:05.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/drivers/infiniband/core/addr.c 2011-12-15 01:07:58.000000000 +0100
+@@ -254,7 +254,7 @@ static int addr6_resolve(struct sockaddr
if (ipv6_addr_any(&fl6.saddr)) {
ret = ipv6_dev_get_saddr(&init_net, ip6_dst_idev(dst)->dev,
if (ret)
goto put;
-diff -NurpP --minimal linux-3.1.1/drivers/infiniband/hw/ipath/ipath_user_pages.c linux-3.1.1-vs2.3.2/drivers/infiniband/hw/ipath/ipath_user_pages.c
---- linux-3.1.1/drivers/infiniband/hw/ipath/ipath_user_pages.c 2011-05-22 16:17:16.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/drivers/infiniband/hw/ipath/ipath_user_pages.c 2011-10-24 18:53:33.000000000 +0200
-@@ -35,6 +35,7 @@
- #include <linux/device.h>
- #include <linux/slab.h>
- #include <linux/sched.h>
-+#include <linux/vs_memory.h>
-
- #include "ipath_kernel.h"
-
-diff -NurpP --minimal linux-3.1.1/drivers/md/dm-ioctl.c linux-3.1.1-vs2.3.2/drivers/md/dm-ioctl.c
---- linux-3.1.1/drivers/md/dm-ioctl.c 2011-10-24 18:45:10.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/drivers/md/dm-ioctl.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/drivers/md/dm-ioctl.c linux-3.1.6-vs2.3.2.5/drivers/md/dm-ioctl.c
+--- linux-3.1.6/drivers/md/dm-ioctl.c 2011-10-24 18:45:10.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/drivers/md/dm-ioctl.c 2011-10-24 18:53:33.000000000 +0200
@@ -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.1.1/drivers/md/dm.c linux-3.1.1-vs2.3.2/drivers/md/dm.c
---- linux-3.1.1/drivers/md/dm.c 2011-10-24 18:45:10.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/drivers/md/dm.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/drivers/md/dm.c linux-3.1.6-vs2.3.2.5/drivers/md/dm.c
+--- linux-3.1.6/drivers/md/dm.c 2011-10-24 18:45:10.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/drivers/md/dm.c 2011-10-24 18:53:33.000000000 +0200
@@ -20,6 +20,7 @@
#include <linux/idr.h>
#include <linux/hdreg.h>
md->queue = blk_alloc_queue(GFP_KERNEL);
if (!md->queue)
goto bad_queue;
-diff -NurpP --minimal linux-3.1.1/drivers/md/dm.h linux-3.1.1-vs2.3.2/drivers/md/dm.h
---- linux-3.1.1/drivers/md/dm.h 2011-10-24 18:45:10.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/drivers/md/dm.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/drivers/md/dm.h linux-3.1.6-vs2.3.2.5/drivers/md/dm.h
+--- linux-3.1.6/drivers/md/dm.h 2011-10-24 18:45:10.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/drivers/md/dm.h 2011-10-24 18:53:33.000000000 +0200
@@ -41,6 +41,8 @@ struct dm_dev_internal {
struct dm_table;
struct dm_md_mempools;
/*-----------------------------------------------------------------
* Internal table functions.
*---------------------------------------------------------------*/
-diff -NurpP --minimal linux-3.1.1/drivers/net/tun.c linux-3.1.1-vs2.3.2/drivers/net/tun.c
---- linux-3.1.1/drivers/net/tun.c 2011-10-24 18:45:17.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/drivers/net/tun.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/drivers/net/tun.c linux-3.1.6-vs2.3.2.5/drivers/net/tun.c
+--- linux-3.1.6/drivers/net/tun.c 2011-10-24 18:45:17.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/drivers/net/tun.c 2011-10-24 18:53:33.000000000 +0200
@@ -64,6 +64,7 @@
#include <linux/nsproxy.h>
#include <linux/virtio_net.h>
case TUNSETLINK:
/* Only allow setting the type when the interface is down */
if (tun->dev->flags & IFF_UP) {
-diff -NurpP --minimal linux-3.1.1/drivers/tty/sysrq.c linux-3.1.1-vs2.3.2/drivers/tty/sysrq.c
---- linux-3.1.1/drivers/tty/sysrq.c 2011-05-22 16:17:44.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/drivers/tty/sysrq.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/drivers/tty/sysrq.c linux-3.1.6-vs2.3.2.5/drivers/tty/sysrq.c
+--- linux-3.1.6/drivers/tty/sysrq.c 2011-05-22 16:17:44.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/drivers/tty/sysrq.c 2011-10-24 18:53:33.000000000 +0200
@@ -41,6 +41,7 @@
#include <linux/oom.h>
#include <linux/slab.h>
else
retval = -1;
return retval;
-diff -NurpP --minimal linux-3.1.1/drivers/tty/tty_io.c linux-3.1.1-vs2.3.2/drivers/tty/tty_io.c
---- linux-3.1.1/drivers/tty/tty_io.c 2011-11-15 16:44:51.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/drivers/tty/tty_io.c 2011-11-15 17:08:44.000000000 +0100
+diff -NurpP --minimal linux-3.1.6/drivers/tty/tty_io.c linux-3.1.6-vs2.3.2.5/drivers/tty/tty_io.c
+--- linux-3.1.6/drivers/tty/tty_io.c 2011-12-23 16:04:06.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/drivers/tty/tty_io.c 2011-11-15 17:08:44.000000000 +0100
@@ -105,6 +105,7 @@
#include <linux/kmod.h>
if (pgrp_nr < 0)
return -EINVAL;
rcu_read_lock();
-diff -NurpP --minimal linux-3.1.1/fs/attr.c linux-3.1.1-vs2.3.2/fs/attr.c
---- linux-3.1.1/fs/attr.c 2011-10-24 18:45:26.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/attr.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/attr.c linux-3.1.6-vs2.3.2.5/fs/attr.c
+--- linux-3.1.6/fs/attr.c 2011-10-24 18:45:26.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/attr.c 2011-10-24 18:53:33.000000000 +0200
@@ -13,6 +13,9 @@
#include <linux/fsnotify.h>
#include <linux/fcntl.h>
if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
return -EPERM;
}
-diff -NurpP --minimal linux-3.1.1/fs/binfmt_aout.c linux-3.1.1-vs2.3.2/fs/binfmt_aout.c
---- linux-3.1.1/fs/binfmt_aout.c 2010-10-21 13:07:47.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/binfmt_aout.c 2011-10-24 18:53:33.000000000 +0200
-@@ -25,6 +25,7 @@
- #include <linux/init.h>
- #include <linux/coredump.h>
- #include <linux/slab.h>
-+#include <linux/vs_memory.h>
-
- #include <asm/system.h>
- #include <asm/uaccess.h>
-diff -NurpP --minimal linux-3.1.1/fs/binfmt_elf.c linux-3.1.1-vs2.3.2/fs/binfmt_elf.c
---- linux-3.1.1/fs/binfmt_elf.c 2011-11-15 16:44:51.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/fs/binfmt_elf.c 2011-11-15 17:08:44.000000000 +0100
-@@ -32,6 +32,7 @@
- #include <linux/elf.h>
- #include <linux/utsname.h>
- #include <linux/coredump.h>
-+#include <linux/vs_memory.h>
- #include <asm/uaccess.h>
- #include <asm/param.h>
- #include <asm/page.h>
-diff -NurpP --minimal linux-3.1.1/fs/binfmt_flat.c linux-3.1.1-vs2.3.2/fs/binfmt_flat.c
---- linux-3.1.1/fs/binfmt_flat.c 2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/binfmt_flat.c 2011-10-24 18:53:33.000000000 +0200
-@@ -35,6 +35,7 @@
- #include <linux/init.h>
- #include <linux/flat.h>
- #include <linux/syscalls.h>
-+#include <linux/vs_memory.h>
-
- #include <asm/byteorder.h>
- #include <asm/system.h>
-diff -NurpP --minimal linux-3.1.1/fs/binfmt_som.c linux-3.1.1-vs2.3.2/fs/binfmt_som.c
---- linux-3.1.1/fs/binfmt_som.c 2010-02-25 11:52:04.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/fs/binfmt_som.c 2011-10-24 18:53:33.000000000 +0200
-@@ -28,6 +28,7 @@
- #include <linux/shm.h>
- #include <linux/personality.h>
- #include <linux/init.h>
-+#include <linux/vs_memory.h>
-
- #include <asm/uaccess.h>
- #include <asm/pgtable.h>
-diff -NurpP --minimal linux-3.1.1/fs/block_dev.c linux-3.1.1-vs2.3.2/fs/block_dev.c
---- linux-3.1.1/fs/block_dev.c 2011-11-15 16:44:51.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/fs/block_dev.c 2011-11-15 17:08:44.000000000 +0100
+diff -NurpP --minimal linux-3.1.6/fs/block_dev.c linux-3.1.6-vs2.3.2.5/fs/block_dev.c
+--- linux-3.1.6/fs/block_dev.c 2011-12-23 16:04:06.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/fs/block_dev.c 2011-11-15 17:08:44.000000000 +0100
@@ -25,6 +25,7 @@
#include <linux/namei.h>
#include <linux/log2.h>
if (bdev) {
spin_lock(&bdev_lock);
if (!inode->i_bdev) {
-diff -NurpP --minimal linux-3.1.1/fs/btrfs/ctree.h linux-3.1.1-vs2.3.2/fs/btrfs/ctree.h
---- linux-3.1.1/fs/btrfs/ctree.h 2011-10-24 18:45:26.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/btrfs/ctree.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/btrfs/ctree.h linux-3.1.6-vs2.3.2.5/fs/btrfs/ctree.h
+--- linux-3.1.6/fs/btrfs/ctree.h 2011-10-24 18:45:26.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/btrfs/ctree.h 2011-10-24 18:53:33.000000000 +0200
@@ -600,11 +600,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.1.1/fs/btrfs/disk-io.c linux-3.1.1-vs2.3.2/fs/btrfs/disk-io.c
---- linux-3.1.1/fs/btrfs/disk-io.c 2011-10-24 18:45:26.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/btrfs/disk-io.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/btrfs/disk-io.c linux-3.1.6-vs2.3.2.5/fs/btrfs/disk-io.c
+--- linux-3.1.6/fs/btrfs/disk-io.c 2011-10-24 18:45:26.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/btrfs/disk-io.c 2011-10-24 18:53:33.000000000 +0200
@@ -1794,6 +1794,9 @@ struct btrfs_root *open_ctree(struct sup
goto fail_alloc;
}
features = btrfs_super_incompat_flags(disk_super) &
~BTRFS_FEATURE_INCOMPAT_SUPP;
if (features) {
-diff -NurpP --minimal linux-3.1.1/fs/btrfs/inode.c linux-3.1.1-vs2.3.2/fs/btrfs/inode.c
---- linux-3.1.1/fs/btrfs/inode.c 2011-10-24 18:45:26.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/btrfs/inode.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/btrfs/inode.c linux-3.1.6-vs2.3.2.5/fs/btrfs/inode.c
+--- linux-3.1.6/fs/btrfs/inode.c 2011-10-24 18:45:26.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/btrfs/inode.c 2011-10-24 18:53:33.000000000 +0200
@@ -38,6 +38,7 @@
#include <linux/falloc.h>
#include <linux/slab.h>
.get_acl = btrfs_get_acl,
};
-diff -NurpP --minimal linux-3.1.1/fs/btrfs/ioctl.c linux-3.1.1-vs2.3.2/fs/btrfs/ioctl.c
---- linux-3.1.1/fs/btrfs/ioctl.c 2011-10-24 18:45:26.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/btrfs/ioctl.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/btrfs/ioctl.c linux-3.1.6-vs2.3.2.5/fs/btrfs/ioctl.c
+--- linux-3.1.6/fs/btrfs/ioctl.c 2011-10-24 18:45:26.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/btrfs/ioctl.c 2011-10-24 18:53:33.000000000 +0200
@@ -70,10 +70,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.1.1/fs/btrfs/super.c linux-3.1.1-vs2.3.2/fs/btrfs/super.c
---- linux-3.1.1/fs/btrfs/super.c 2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/btrfs/super.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/btrfs/super.c linux-3.1.6-vs2.3.2.5/fs/btrfs/super.c
+--- linux-3.1.6/fs/btrfs/super.c 2011-07-22 11:18:05.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/btrfs/super.c 2011-10-24 18:53:33.000000000 +0200
@@ -162,7 +162,7 @@ enum {
Opt_notreelog, Opt_ratio, Opt_flushoncommit, Opt_discard,
Opt_space_cache, Opt_clear_cache, Opt_user_subvol_rm_allowed,
if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
return 0;
-diff -NurpP --minimal linux-3.1.1/fs/char_dev.c linux-3.1.1-vs2.3.2/fs/char_dev.c
---- linux-3.1.1/fs/char_dev.c 2011-03-15 18:07:31.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/fs/char_dev.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/char_dev.c linux-3.1.6-vs2.3.2.5/fs/char_dev.c
+--- linux-3.1.6/fs/char_dev.c 2011-03-15 18:07:31.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/fs/char_dev.c 2011-10-24 18:53:33.000000000 +0200
@@ -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.1.1/fs/dcache.c linux-3.1.1-vs2.3.2/fs/dcache.c
---- linux-3.1.1/fs/dcache.c 2011-10-24 18:45:26.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/dcache.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/dcache.c linux-3.1.6-vs2.3.2.5/fs/dcache.c
+--- linux-3.1.6/fs/dcache.c 2011-12-23 16:04:06.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/fs/dcache.c 2011-12-23 16:11:57.000000000 +0100
@@ -36,6 +36,7 @@
#include <linux/bit_spinlock.h>
#include <linux/rculist_bl.h>
found = dentry;
spin_unlock(&dentry->d_lock);
break;
-diff -NurpP --minimal linux-3.1.1/fs/devpts/inode.c linux-3.1.1-vs2.3.2/fs/devpts/inode.c
---- linux-3.1.1/fs/devpts/inode.c 2011-05-22 16:17:50.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/devpts/inode.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/devpts/inode.c linux-3.1.6-vs2.3.2.5/fs/devpts/inode.c
+--- linux-3.1.6/fs/devpts/inode.c 2011-05-22 16:17:50.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/devpts/inode.c 2011-10-24 18:53:33.000000000 +0200
@@ -25,6 +25,7 @@
#include <linux/parser.h>
#include <linux/fsnotify.h>
inode->i_private = tty;
tty->driver_data = inode;
-diff -NurpP --minimal linux-3.1.1/fs/ext2/balloc.c linux-3.1.1-vs2.3.2/fs/ext2/balloc.c
---- linux-3.1.1/fs/ext2/balloc.c 2011-05-22 16:17:51.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/ext2/balloc.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/ext2/balloc.c linux-3.1.6-vs2.3.2.5/fs/ext2/balloc.c
+--- linux-3.1.6/fs/ext2/balloc.c 2011-05-22 16:17:51.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/ext2/balloc.c 2011-10-24 18:53:33.000000000 +0200
@@ -701,7 +701,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.1.1/fs/ext2/ext2.h linux-3.1.1-vs2.3.2/fs/ext2/ext2.h
---- linux-3.1.1/fs/ext2/ext2.h 2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/ext2/ext2.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/ext2/ext2.h linux-3.1.6-vs2.3.2.5/fs/ext2/ext2.h
+--- linux-3.1.6/fs/ext2/ext2.h 2011-10-24 18:45:27.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/ext2/ext2.h 2011-10-24 18:53:33.000000000 +0200
@@ -126,6 +126,7 @@ extern void ext2_set_inode_flags(struct
extern void ext2_get_inode_flags(struct ext2_inode_info *);
extern int ext2_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
/* ioctl.c */
extern long ext2_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-3.1.1/fs/ext2/file.c linux-3.1.1-vs2.3.2/fs/ext2/file.c
---- linux-3.1.1/fs/ext2/file.c 2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/ext2/file.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/ext2/file.c linux-3.1.6-vs2.3.2.5/fs/ext2/file.c
+--- linux-3.1.6/fs/ext2/file.c 2011-10-24 18:45:27.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/ext2/file.c 2011-10-24 18:53:33.000000000 +0200
@@ -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.1.1/fs/ext2/ialloc.c linux-3.1.1-vs2.3.2/fs/ext2/ialloc.c
---- linux-3.1.1/fs/ext2/ialloc.c 2011-05-22 16:17:51.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/ext2/ialloc.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/ext2/ialloc.c linux-3.1.6-vs2.3.2.5/fs/ext2/ialloc.c
+--- linux-3.1.6/fs/ext2/ialloc.c 2011-05-22 16:17:51.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/ext2/ialloc.c 2011-10-24 18:53:33.000000000 +0200
@@ -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.1.1/fs/ext2/inode.c linux-3.1.1-vs2.3.2/fs/ext2/inode.c
---- linux-3.1.1/fs/ext2/inode.c 2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/ext2/inode.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/ext2/inode.c linux-3.1.6-vs2.3.2.5/fs/ext2/inode.c
+--- linux-3.1.6/fs/ext2/inode.c 2011-10-24 18:45:27.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/ext2/inode.c 2011-10-24 18:53:33.000000000 +0200
@@ -32,6 +32,7 @@
#include <linux/mpage.h>
#include <linux/fiemap.h>
error = dquot_transfer(inode, iattr);
if (error)
return error;
-diff -NurpP --minimal linux-3.1.1/fs/ext2/ioctl.c linux-3.1.1-vs2.3.2/fs/ext2/ioctl.c
---- linux-3.1.1/fs/ext2/ioctl.c 2011-05-22 16:17:51.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/ext2/ioctl.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/ext2/ioctl.c linux-3.1.6-vs2.3.2.5/fs/ext2/ioctl.c
+--- linux-3.1.6/fs/ext2/ioctl.c 2011-05-22 16:17:51.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/ext2/ioctl.c 2011-10-24 18:53:33.000000000 +0200
@@ -17,6 +17,16 @@
#include <asm/uaccess.h>
flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE;
ei->i_flags = flags;
mutex_unlock(&inode->i_mutex);
-diff -NurpP --minimal linux-3.1.1/fs/ext2/namei.c linux-3.1.1-vs2.3.2/fs/ext2/namei.c
---- linux-3.1.1/fs/ext2/namei.c 2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/ext2/namei.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/ext2/namei.c linux-3.1.6-vs2.3.2.5/fs/ext2/namei.c
+--- linux-3.1.6/fs/ext2/namei.c 2011-10-24 18:45:27.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/ext2/namei.c 2011-10-24 18:53:33.000000000 +0200
@@ -32,6 +32,7 @@
#include <linux/pagemap.h>
.get_acl = ext2_get_acl,
};
-diff -NurpP --minimal linux-3.1.1/fs/ext2/super.c linux-3.1.1-vs2.3.2/fs/ext2/super.c
---- linux-3.1.1/fs/ext2/super.c 2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/ext2/super.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/ext2/super.c linux-3.1.6-vs2.3.2.5/fs/ext2/super.c
+--- linux-3.1.6/fs/ext2/super.c 2011-07-22 11:18:05.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/ext2/super.c 2011-10-24 18:53:33.000000000 +0200
@@ -394,7 +394,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.1.1/fs/ext3/file.c linux-3.1.1-vs2.3.2/fs/ext3/file.c
---- linux-3.1.1/fs/ext3/file.c 2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/ext3/file.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/ext3/file.c linux-3.1.6-vs2.3.2.5/fs/ext3/file.c
+--- linux-3.1.6/fs/ext3/file.c 2011-10-24 18:45:27.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/ext3/file.c 2011-10-24 18:53:33.000000000 +0200
@@ -80,5 +80,6 @@ const struct inode_operations ext3_file_
#endif
.get_acl = ext3_get_acl,
+ .sync_flags = ext3_sync_flags,
};
-diff -NurpP --minimal linux-3.1.1/fs/ext3/ialloc.c linux-3.1.1-vs2.3.2/fs/ext3/ialloc.c
---- linux-3.1.1/fs/ext3/ialloc.c 2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/ext3/ialloc.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/ext3/ialloc.c linux-3.1.6-vs2.3.2.5/fs/ext3/ialloc.c
+--- linux-3.1.6/fs/ext3/ialloc.c 2011-10-24 18:45:27.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/ext3/ialloc.c 2011-10-24 18:53:33.000000000 +0200
@@ -23,6 +23,7 @@
#include <linux/buffer_head.h>
#include <linux/random.h>
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-3.1.1/fs/ext3/inode.c linux-3.1.1-vs2.3.2/fs/ext3/inode.c
---- linux-3.1.1/fs/ext3/inode.c 2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/ext3/inode.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/ext3/inode.c linux-3.1.6-vs2.3.2.5/fs/ext3/inode.c
+--- linux-3.1.6/fs/ext3/inode.c 2011-10-24 18:45:27.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/ext3/inode.c 2011-10-24 18:53:33.000000000 +0200
@@ -38,6 +38,7 @@
#include <linux/bio.h>
#include <linux/fiemap.h>
error = ext3_mark_inode_dirty(handle, inode);
ext3_journal_stop(handle);
}
-diff -NurpP --minimal linux-3.1.1/fs/ext3/ioctl.c linux-3.1.1-vs2.3.2/fs/ext3/ioctl.c
---- linux-3.1.1/fs/ext3/ioctl.c 2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/ext3/ioctl.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/ext3/ioctl.c linux-3.1.6-vs2.3.2.5/fs/ext3/ioctl.c
+--- linux-3.1.6/fs/ext3/ioctl.c 2011-10-24 18:45:27.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/ext3/ioctl.c 2011-10-24 18:53:33.000000000 +0200
@@ -8,6 +8,7 @@
*/
flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE;
ei->i_flags = flags;
-diff -NurpP --minimal linux-3.1.1/fs/ext3/namei.c linux-3.1.1-vs2.3.2/fs/ext3/namei.c
---- linux-3.1.1/fs/ext3/namei.c 2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/ext3/namei.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/ext3/namei.c linux-3.1.6-vs2.3.2.5/fs/ext3/namei.c
+--- linux-3.1.6/fs/ext3/namei.c 2011-10-24 18:45:27.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/ext3/namei.c 2011-10-24 18:53:33.000000000 +0200
@@ -36,6 +36,7 @@
#include <linux/quotaops.h>
#include <linux/buffer_head.h>
.get_acl = ext3_get_acl,
};
-diff -NurpP --minimal linux-3.1.1/fs/ext3/super.c linux-3.1.1-vs2.3.2/fs/ext3/super.c
---- linux-3.1.1/fs/ext3/super.c 2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/ext3/super.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/ext3/super.c linux-3.1.6-vs2.3.2.5/fs/ext3/super.c
+--- linux-3.1.6/fs/ext3/super.c 2011-10-24 18:45:27.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/ext3/super.c 2011-10-24 18:53:33.000000000 +0200
@@ -833,7 +833,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.1.1/fs/ext4/ext4.h linux-3.1.1-vs2.3.2/fs/ext4/ext4.h
---- linux-3.1.1/fs/ext4/ext4.h 2011-11-15 16:44:52.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/fs/ext4/ext4.h 2011-11-15 17:08:44.000000000 +0100
+diff -NurpP --minimal linux-3.1.6/fs/ext4/ext4.h linux-3.1.6-vs2.3.2.5/fs/ext4/ext4.h
+--- linux-3.1.6/fs/ext4/ext4.h 2011-12-23 16:04:07.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/fs/ext4/ext4.h 2011-11-15 17:08:44.000000000 +0100
@@ -351,8 +351,12 @@ struct flex_groups {
#define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */
#define EXT4_EA_INODE_FL 0x00200000 /* Inode used for large EA */
/* move_extent.c */
extern int ext4_move_extents(struct file *o_filp, struct file *d_filp,
__u64 start_orig, __u64 start_donor,
-diff -NurpP --minimal linux-3.1.1/fs/ext4/file.c linux-3.1.1-vs2.3.2/fs/ext4/file.c
---- linux-3.1.1/fs/ext4/file.c 2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/ext4/file.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/ext4/file.c linux-3.1.6-vs2.3.2.5/fs/ext4/file.c
+--- linux-3.1.6/fs/ext4/file.c 2011-10-24 18:45:27.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/ext4/file.c 2011-10-24 18:53:33.000000000 +0200
@@ -303,5 +303,6 @@ const struct inode_operations ext4_file_
#endif
.get_acl = ext4_get_acl,
+ .sync_flags = ext4_sync_flags,
};
-diff -NurpP --minimal linux-3.1.1/fs/ext4/ialloc.c linux-3.1.1-vs2.3.2/fs/ext4/ialloc.c
---- linux-3.1.1/fs/ext4/ialloc.c 2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/ext4/ialloc.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/ext4/ialloc.c linux-3.1.6-vs2.3.2.5/fs/ext4/ialloc.c
+--- linux-3.1.6/fs/ext4/ialloc.c 2011-10-24 18:45:27.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/ext4/ialloc.c 2011-10-24 18:53:33.000000000 +0200
@@ -22,6 +22,7 @@
#include <linux/random.h>
#include <linux/bitops.h>
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-3.1.1/fs/ext4/inode.c linux-3.1.1-vs2.3.2/fs/ext4/inode.c
---- linux-3.1.1/fs/ext4/inode.c 2011-11-15 16:44:52.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/fs/ext4/inode.c 2011-11-15 17:08:44.000000000 +0100
+diff -NurpP --minimal linux-3.1.6/fs/ext4/inode.c linux-3.1.6-vs2.3.2.5/fs/ext4/inode.c
+--- linux-3.1.6/fs/ext4/inode.c 2011-12-23 16:04:07.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/fs/ext4/inode.c 2011-12-23 16:11:57.000000000 +0100
@@ -38,6 +38,7 @@
#include <linux/printk.h>
#include <linux/slab.h>
#include "ext4_jbd2.h"
#include "xattr.h"
-@@ -3323,41 +3324,64 @@ void ext4_set_inode_flags(struct inode *
+@@ -3326,41 +3327,64 @@ void ext4_set_inode_flags(struct inode *
{
unsigned int flags = EXT4_I(inode)->i_flags;
} while (cmpxchg(&ei->i_flags, old_fl, new_fl) != old_fl);
}
-@@ -3393,6 +3417,8 @@ struct inode *ext4_iget(struct super_blo
+@@ -3396,6 +3420,8 @@ struct inode *ext4_iget(struct super_blo
journal_t *journal = EXT4_SB(sb)->s_journal;
long ret;
int block;
inode = iget_locked(sb, ino);
if (!inode)
-@@ -3408,12 +3434,16 @@ struct inode *ext4_iget(struct super_blo
+@@ -3411,12 +3437,16 @@ struct inode *ext4_iget(struct super_blo
goto bad_inode;
raw_inode = ext4_raw_inode(&iloc);
inode->i_mode = le16_to_cpu(raw_inode->i_mode);
inode->i_nlink = le16_to_cpu(raw_inode->i_links_count);
ext4_clear_state_flags(ei); /* Only relevant on 32-bit archs */
-@@ -3632,6 +3662,8 @@ static int ext4_do_update_inode(handle_t
+@@ -3635,6 +3665,8 @@ static int ext4_do_update_inode(handle_t
struct ext4_inode *raw_inode = ext4_raw_inode(iloc);
struct ext4_inode_info *ei = EXT4_I(inode);
struct buffer_head *bh = iloc->bh;
int err = 0, rc, block;
/* For fields not not tracking in the in-memory inode,
-@@ -3642,29 +3674,32 @@ static int ext4_do_update_inode(handle_t
+@@ -3645,29 +3677,32 @@ static int ext4_do_update_inode(handle_t
ext4_get_inode_flags(ei);
raw_inode->i_mode = cpu_to_le16(inode->i_mode);
if (!(test_opt(inode->i_sb, NO_UID32))) {
raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
EXT4_INODE_SET_XTIME(i_ctime, inode, raw_inode);
-@@ -3850,7 +3885,8 @@ int ext4_setattr(struct dentry *dentry,
+@@ -3853,7 +3888,8 @@ int ext4_setattr(struct dentry *dentry,
if (is_quota_modification(inode, attr))
dquot_initialize(inode);
if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
handle_t *handle;
/* (user+group)*(old+new) structure, inode write (sb,
-@@ -3872,6 +3908,8 @@ int ext4_setattr(struct dentry *dentry,
+@@ -3875,6 +3911,8 @@ int ext4_setattr(struct dentry *dentry,
inode->i_uid = attr->ia_uid;
if (attr->ia_valid & ATTR_GID)
inode->i_gid = attr->ia_gid;
error = ext4_mark_inode_dirty(handle, inode);
ext4_journal_stop(handle);
}
-diff -NurpP --minimal linux-3.1.1/fs/ext4/ioctl.c linux-3.1.1-vs2.3.2/fs/ext4/ioctl.c
---- linux-3.1.1/fs/ext4/ioctl.c 2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/ext4/ioctl.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/ext4/ioctl.c linux-3.1.6-vs2.3.2.5/fs/ext4/ioctl.c
+--- linux-3.1.6/fs/ext4/ioctl.c 2011-10-24 18:45:27.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/ext4/ioctl.c 2011-10-24 18:53:33.000000000 +0200
@@ -14,10 +14,39 @@
#include <linux/compat.h>
#include <linux/mount.h>
if (!capable(CAP_LINUX_IMMUTABLE))
goto flags_out;
}
-diff -NurpP --minimal linux-3.1.1/fs/ext4/namei.c linux-3.1.1-vs2.3.2/fs/ext4/namei.c
---- linux-3.1.1/fs/ext4/namei.c 2011-11-15 16:44:52.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/fs/ext4/namei.c 2011-11-15 17:08:44.000000000 +0100
+diff -NurpP --minimal linux-3.1.6/fs/ext4/namei.c linux-3.1.6-vs2.3.2.5/fs/ext4/namei.c
+--- linux-3.1.6/fs/ext4/namei.c 2011-12-23 16:04:07.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/fs/ext4/namei.c 2011-11-15 17:08:44.000000000 +0100
@@ -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.1.1/fs/ext4/super.c linux-3.1.1-vs2.3.2/fs/ext4/super.c
---- linux-3.1.1/fs/ext4/super.c 2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/ext4/super.c 2011-10-24 18:53:33.000000000 +0200
-@@ -1320,6 +1320,7 @@ enum {
+diff -NurpP --minimal linux-3.1.6/fs/ext4/super.c linux-3.1.6-vs2.3.2.5/fs/ext4/super.c
+--- linux-3.1.6/fs/ext4/super.c 2011-12-23 16:04:07.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/fs/ext4/super.c 2011-12-23 16:13:10.000000000 +0100
+@@ -1319,6 +1319,7 @@ enum {
+ Opt_inode_readahead_blks, Opt_journal_ioprio,
Opt_dioread_nolock, Opt_dioread_lock,
- Opt_discard, Opt_nodiscard,
- Opt_init_inode_table, Opt_noinit_inode_table,
+ Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable,
+ Opt_tag, Opt_notag, Opt_tagid
};
static const match_table_t tokens = {
-@@ -1395,6 +1396,9 @@ static const match_table_t tokens = {
- {Opt_init_inode_table, "init_itable=%u"},
- {Opt_init_inode_table, "init_itable"},
- {Opt_noinit_inode_table, "noinit_itable"},
+@@ -1394,6 +1395,9 @@ static const match_table_t tokens = {
+ {Opt_init_itable, "init_itable=%u"},
+ {Opt_init_itable, "init_itable"},
+ {Opt_noinit_itable, "noinit_itable"},
+ {Opt_tag, "tag"},
+ {Opt_notag, "notag"},
+ {Opt_tagid, "tagid=%u"},
{Opt_err, NULL},
};
-@@ -1563,6 +1567,20 @@ static int parse_options(char *options,
+@@ -1562,6 +1566,20 @@ static int parse_options(char *options,
case Opt_nouid32:
set_opt(sb, NO_UID32);
break;
case Opt_debug:
set_opt(sb, DEBUG);
break;
-@@ -3224,6 +3242,9 @@ static int ext4_fill_super(struct super_
+@@ -3223,6 +3241,9 @@ static int ext4_fill_super(struct super_
&journal_ioprio, NULL, 0))
goto failed_mount;
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-@@ -4351,6 +4372,14 @@ static int ext4_remount(struct super_blo
+@@ -4350,6 +4371,14 @@ static int ext4_remount(struct super_blo
if (sbi->s_mount_flags & EXT4_MF_FS_ABORTED)
ext4_abort(sb, "Abort forced by user");
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-3.1.1/fs/fcntl.c linux-3.1.1-vs2.3.2/fs/fcntl.c
---- linux-3.1.1/fs/fcntl.c 2011-05-22 16:17:52.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/fcntl.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/fcntl.c linux-3.1.6-vs2.3.2.5/fs/fcntl.c
+--- linux-3.1.6/fs/fcntl.c 2011-05-22 16:17:52.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/fcntl.c 2011-10-24 18:53:33.000000000 +0200
@@ -20,6 +20,7 @@
#include <linux/signal.h>
#include <linux/rcupdate.h>
if (unlikely(filp->f_mode & FMODE_PATH)) {
if (!check_fcntl_cmd(cmd)) {
-diff -NurpP --minimal linux-3.1.1/fs/file.c linux-3.1.1-vs2.3.2/fs/file.c
---- linux-3.1.1/fs/file.c 2011-05-22 16:17:52.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/file.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/file.c linux-3.1.6-vs2.3.2.5/fs/file.c
+--- linux-3.1.6/fs/file.c 2011-05-22 16:17:52.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/file.c 2011-10-24 18:53:33.000000000 +0200
@@ -21,6 +21,7 @@
#include <linux/spinlock.h>
#include <linux/rcupdate.h>
#if 1
/* Sanity check */
if (rcu_dereference_raw(fdt->fd[fd]) != NULL) {
-diff -NurpP --minimal linux-3.1.1/fs/file_table.c linux-3.1.1-vs2.3.2/fs/file_table.c
---- linux-3.1.1/fs/file_table.c 2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/file_table.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/file_table.c linux-3.1.6-vs2.3.2.5/fs/file_table.c
+--- linux-3.1.6/fs/file_table.c 2011-10-24 18:45:27.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/file_table.c 2011-10-24 18:53:33.000000000 +0200
@@ -24,6 +24,8 @@
#include <linux/percpu_counter.h>
#include <linux/percpu.h>
file_sb_list_del(file);
file_free(file);
}
-diff -NurpP --minimal linux-3.1.1/fs/fs_struct.c linux-3.1.1-vs2.3.2/fs/fs_struct.c
---- linux-3.1.1/fs/fs_struct.c 2011-03-15 18:07:31.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/fs/fs_struct.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/fs_struct.c linux-3.1.6-vs2.3.2.5/fs/fs_struct.c
+--- linux-3.1.6/fs/fs_struct.c 2011-03-15 18:07:31.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/fs/fs_struct.c 2011-10-24 18:53:33.000000000 +0200
@@ -4,6 +4,7 @@
#include <linux/path.h>
#include <linux/slab.h>
}
return fs;
}
-diff -NurpP --minimal linux-3.1.1/fs/gfs2/file.c linux-3.1.1-vs2.3.2/fs/gfs2/file.c
---- linux-3.1.1/fs/gfs2/file.c 2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/gfs2/file.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/gfs2/file.c linux-3.1.6-vs2.3.2.5/fs/gfs2/file.c
+--- linux-3.1.6/fs/gfs2/file.c 2011-10-24 18:45:27.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/gfs2/file.c 2011-10-24 18:53:33.000000000 +0200
@@ -134,6 +134,9 @@ static const u32 fsflags_to_gfs2[32] = {
[7] = GFS2_DIF_NOATIME,
[12] = GFS2_DIF_EXHASH,
static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
switch(cmd) {
-diff -NurpP --minimal linux-3.1.1/fs/gfs2/inode.h linux-3.1.1-vs2.3.2/fs/gfs2/inode.h
---- linux-3.1.1/fs/gfs2/inode.h 2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/gfs2/inode.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/gfs2/inode.h linux-3.1.6-vs2.3.2.5/fs/gfs2/inode.h
+--- linux-3.1.6/fs/gfs2/inode.h 2011-10-24 18:45:27.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/gfs2/inode.h 2011-10-24 18:53:33.000000000 +0200
@@ -120,6 +120,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.1.1/fs/inode.c linux-3.1.1-vs2.3.2/fs/inode.c
---- linux-3.1.1/fs/inode.c 2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/inode.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/inode.c linux-3.1.6-vs2.3.2.5/fs/inode.c
+--- linux-3.1.6/fs/inode.c 2011-10-24 18:45:27.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/inode.c 2011-10-24 18:53:33.000000000 +0200
@@ -26,6 +26,7 @@
#include <linux/ima.h>
#include <linux/cred.h>
}
EXPORT_SYMBOL(inode_init_owner);
-diff -NurpP --minimal linux-3.1.1/fs/ioctl.c linux-3.1.1-vs2.3.2/fs/ioctl.c
---- linux-3.1.1/fs/ioctl.c 2011-05-22 16:17:52.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/ioctl.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/ioctl.c linux-3.1.6-vs2.3.2.5/fs/ioctl.c
+--- linux-3.1.6/fs/ioctl.c 2011-05-22 16:17:52.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/ioctl.c 2011-10-24 18:53:33.000000000 +0200
@@ -15,6 +15,9 @@
#include <linux/writeback.h>
#include <linux/buffer_head.h>
#include <asm/ioctls.h>
-diff -NurpP --minimal linux-3.1.1/fs/ioprio.c linux-3.1.1-vs2.3.2/fs/ioprio.c
---- linux-3.1.1/fs/ioprio.c 2011-01-05 21:50:24.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/fs/ioprio.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/ioprio.c linux-3.1.6-vs2.3.2.5/fs/ioprio.c
+--- linux-3.1.6/fs/ioprio.c 2011-01-05 21:50:24.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/fs/ioprio.c 2011-10-24 18:53:33.000000000 +0200
@@ -27,6 +27,7 @@
#include <linux/syscalls.h>
#include <linux/security.h>
tmpio = get_task_ioprio(p);
if (tmpio < 0)
continue;
-diff -NurpP --minimal linux-3.1.1/fs/jfs/file.c linux-3.1.1-vs2.3.2/fs/jfs/file.c
---- linux-3.1.1/fs/jfs/file.c 2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/jfs/file.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/jfs/file.c linux-3.1.6-vs2.3.2.5/fs/jfs/file.c
+--- linux-3.1.6/fs/jfs/file.c 2011-10-24 18:45:27.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/jfs/file.c 2011-10-24 18:53:33.000000000 +0200
@@ -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.1.1/fs/jfs/ioctl.c linux-3.1.1-vs2.3.2/fs/jfs/ioctl.c
---- linux-3.1.1/fs/jfs/ioctl.c 2011-05-22 16:17:52.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/jfs/ioctl.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/jfs/ioctl.c linux-3.1.6-vs2.3.2.5/fs/jfs/ioctl.c
+--- linux-3.1.6/fs/jfs/ioctl.c 2011-05-22 16:17:52.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/jfs/ioctl.c 2011-10-24 18:53:33.000000000 +0200
@@ -11,6 +11,7 @@
#include <linux/mount.h>
#include <linux/time.h>
flags |= oldflags & ~JFS_FL_USER_MODIFIABLE;
jfs_inode->mode2 = flags;
-diff -NurpP --minimal linux-3.1.1/fs/jfs/jfs_dinode.h linux-3.1.1-vs2.3.2/fs/jfs/jfs_dinode.h
---- linux-3.1.1/fs/jfs/jfs_dinode.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/fs/jfs/jfs_dinode.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/jfs/jfs_dinode.h linux-3.1.6-vs2.3.2.5/fs/jfs/jfs_dinode.h
+--- linux-3.1.6/fs/jfs/jfs_dinode.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/fs/jfs/jfs_dinode.h 2011-10-24 18:53:33.000000000 +0200
@@ -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.1.1/fs/jfs/jfs_filsys.h linux-3.1.1-vs2.3.2/fs/jfs/jfs_filsys.h
---- linux-3.1.1/fs/jfs/jfs_filsys.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/fs/jfs/jfs_filsys.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/jfs/jfs_filsys.h linux-3.1.6-vs2.3.2.5/fs/jfs/jfs_filsys.h
+--- linux-3.1.6/fs/jfs/jfs_filsys.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/fs/jfs/jfs_filsys.h 2011-10-24 18:53:33.000000000 +0200
@@ -263,6 +263,7 @@
#define JFS_NAME_MAX 255
#define JFS_PATH_MAX BPSIZE
/*
* file system state (superblock state)
-diff -NurpP --minimal linux-3.1.1/fs/jfs/jfs_imap.c linux-3.1.1-vs2.3.2/fs/jfs/jfs_imap.c
---- linux-3.1.1/fs/jfs/jfs_imap.c 2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/jfs/jfs_imap.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/jfs/jfs_imap.c linux-3.1.6-vs2.3.2.5/fs/jfs/jfs_imap.c
+--- linux-3.1.6/fs/jfs/jfs_imap.c 2011-07-22 11:18:05.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/jfs/jfs_imap.c 2011-10-24 18:53:33.000000000 +0200
@@ -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.1.1/fs/jfs/jfs_inode.c linux-3.1.1-vs2.3.2/fs/jfs/jfs_inode.c
---- linux-3.1.1/fs/jfs/jfs_inode.c 2010-08-02 16:52:49.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/jfs/jfs_inode.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/jfs/jfs_inode.c linux-3.1.6-vs2.3.2.5/fs/jfs/jfs_inode.c
+--- linux-3.1.6/fs/jfs/jfs_inode.c 2010-08-02 16:52:49.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/jfs/jfs_inode.c 2011-10-24 18:53:33.000000000 +0200
@@ -18,6 +18,7 @@
#include <linux/fs.h>
}
/*
-diff -NurpP --minimal linux-3.1.1/fs/jfs/jfs_inode.h linux-3.1.1-vs2.3.2/fs/jfs/jfs_inode.h
---- linux-3.1.1/fs/jfs/jfs_inode.h 2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/jfs/jfs_inode.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/jfs/jfs_inode.h linux-3.1.6-vs2.3.2.5/fs/jfs/jfs_inode.h
+--- linux-3.1.6/fs/jfs/jfs_inode.h 2011-10-24 18:45:27.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/jfs/jfs_inode.h 2011-10-24 18:53:33.000000000 +0200
@@ -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.1.1/fs/jfs/namei.c linux-3.1.1-vs2.3.2/fs/jfs/namei.c
---- linux-3.1.1/fs/jfs/namei.c 2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/jfs/namei.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/jfs/namei.c linux-3.1.6-vs2.3.2.5/fs/jfs/namei.c
+--- linux-3.1.6/fs/jfs/namei.c 2011-10-24 18:45:27.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/jfs/namei.c 2011-10-24 18:53:33.000000000 +0200
@@ -22,6 +22,7 @@
#include <linux/ctype.h>
#include <linux/quotaops.h>
};
const struct file_operations jfs_dir_operations = {
-diff -NurpP --minimal linux-3.1.1/fs/jfs/super.c linux-3.1.1-vs2.3.2/fs/jfs/super.c
---- linux-3.1.1/fs/jfs/super.c 2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/jfs/super.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/jfs/super.c linux-3.1.6-vs2.3.2.5/fs/jfs/super.c
+--- linux-3.1.6/fs/jfs/super.c 2011-05-22 16:17:53.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/jfs/super.c 2011-10-24 18:53:33.000000000 +0200
@@ -198,7 +198,8 @@ static void jfs_put_super(struct super_b
enum {
Opt_integrity, Opt_nointegrity, Opt_iocharset, Opt_resize,
if (newLVSize) {
printk(KERN_ERR "resize option for remount only\n");
-diff -NurpP --minimal linux-3.1.1/fs/libfs.c linux-3.1.1-vs2.3.2/fs/libfs.c
---- linux-3.1.1/fs/libfs.c 2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/libfs.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/libfs.c linux-3.1.6-vs2.3.2.5/fs/libfs.c
+--- linux-3.1.6/fs/libfs.c 2011-10-24 18:45:27.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/libfs.c 2011-10-24 18:53:33.000000000 +0200
@@ -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.1.1/fs/locks.c linux-3.1.1-vs2.3.2/fs/locks.c
---- linux-3.1.1/fs/locks.c 2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/locks.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/locks.c linux-3.1.6-vs2.3.2.5/fs/locks.c
+--- linux-3.1.6/fs/locks.c 2011-10-24 18:45:27.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/locks.c 2011-10-24 18:53:33.000000000 +0200
@@ -126,6 +126,8 @@
#include <linux/time.h>
#include <linux/rcupdate.h>
return 0;
}
-diff -NurpP --minimal linux-3.1.1/fs/namei.c linux-3.1.1-vs2.3.2/fs/namei.c
---- linux-3.1.1/fs/namei.c 2011-11-15 16:44:52.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/fs/namei.c 2011-11-16 14:28:54.000000000 +0100
+diff -NurpP --minimal linux-3.1.6/fs/namei.c linux-3.1.6-vs2.3.2.5/fs/namei.c
+--- linux-3.1.6/fs/namei.c 2011-12-23 16:04:07.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/fs/namei.c 2011-11-16 14:28:54.000000000 +0100
@@ -33,6 +33,14 @@
#include <linux/device_cgroup.h>
#include <linux/fs_struct.h>
/* get the link contents into pagecache */
static char *page_getlink(struct dentry * dentry, struct page **ppage)
{
-diff -NurpP --minimal linux-3.1.1/fs/namespace.c linux-3.1.1-vs2.3.2/fs/namespace.c
---- linux-3.1.1/fs/namespace.c 2011-11-15 16:44:52.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/fs/namespace.c 2011-11-15 17:13:06.000000000 +0100
+diff -NurpP --minimal linux-3.1.6/fs/namespace.c linux-3.1.6-vs2.3.2.5/fs/namespace.c
+--- linux-3.1.6/fs/namespace.c 2011-12-23 16:04:07.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/fs/namespace.c 2011-12-23 16:11:57.000000000 +0100
@@ -31,6 +31,11 @@
#include <linux/idr.h>
#include <linux/fs_struct.h>
seq_printf(m, "%i %i %u:%u ", mnt->mnt_id, mnt->mnt_parent->mnt_id,
MAJOR(sb->s_dev), MINOR(sb->s_dev));
if (sb->s_op->show_path)
-@@ -1107,22 +1159,32 @@ static int show_vfsstat(struct seq_file
+@@ -1104,22 +1156,32 @@ static int show_vfsstat(struct seq_file
struct path mnt_path = { .dentry = mnt->mnt_root, .mnt = mnt };
int err = 0;
/* file system type */
seq_puts(m, "with fstype ");
-@@ -1381,7 +1443,7 @@ SYSCALL_DEFINE2(umount, char __user *, n
+@@ -1378,7 +1440,7 @@ SYSCALL_DEFINE2(umount, char __user *, n
goto dput_and_out;
retval = -EPERM;
goto dput_and_out;
retval = do_umount(path.mnt, flags);
-@@ -1407,7 +1469,7 @@ SYSCALL_DEFINE1(oldumount, char __user *
+@@ -1404,7 +1466,7 @@ SYSCALL_DEFINE1(oldumount, char __user *
static int mount_is_safe(struct path *path)
{
return 0;
return -EPERM;
#ifdef notyet
-@@ -1717,7 +1779,7 @@ static int do_change_type(struct path *p
+@@ -1714,7 +1776,7 @@ static int do_change_type(struct path *p
int type;
int err = 0;
return -EPERM;
if (path->dentry != path->mnt->mnt_root)
-@@ -1733,6 +1795,7 @@ static int do_change_type(struct path *p
+@@ -1730,6 +1792,7 @@ static int do_change_type(struct path *p
if (err)
goto out_unlock;
}
br_write_lock(vfsmount_lock);
for (m = mnt; m; m = (recurse ? next_mnt(m, mnt) : NULL))
-@@ -1748,12 +1811,14 @@ static int do_change_type(struct path *p
+@@ -1745,12 +1808,14 @@ static int do_change_type(struct path *p
* do loopback mount.
*/
static int do_loopback(struct path *path, char *old_name,
if (err)
return err;
if (!old_name || !*old_name)
-@@ -1819,12 +1884,12 @@ static int change_mount_flags(struct vfs
+@@ -1816,12 +1881,12 @@ static int change_mount_flags(struct vfs
* on it - tough luck.
*/
static int do_remount(struct path *path, int flags, int mnt_flags,
return -EPERM;
if (!check_mnt(path->mnt))
-@@ -1872,7 +1937,7 @@ static int do_move_mount(struct path *pa
+@@ -1869,7 +1934,7 @@ static int do_move_mount(struct path *pa
struct path old_path, parent_path;
struct vfsmount *p;
int err = 0;
return -EPERM;
if (!old_name || !*old_name)
return -EINVAL;
-@@ -2023,7 +2088,7 @@ static int do_new_mount(struct path *pat
+@@ -2020,7 +2085,7 @@ static int do_new_mount(struct path *pat
return -EINVAL;
/* we need capabilities... */
return -EPERM;
mnt = do_kern_mount(type, flags, name, data);
-@@ -2292,6 +2357,7 @@ long do_mount(char *dev_name, char *dir_
+@@ -2289,6 +2354,7 @@ long do_mount(char *dev_name, char *dir_
struct path path;
int retval = 0;
int mnt_flags = 0;
/* Discard magic */
if ((flags & MS_MGC_MSK) == MS_MGC_VAL)
-@@ -2319,6 +2385,12 @@ long do_mount(char *dev_name, char *dir_
+@@ -2316,6 +2382,12 @@ long do_mount(char *dev_name, char *dir_
if (!(flags & MS_NOATIME))
mnt_flags |= MNT_RELATIME;
/* Separate the per-mountpoint flags */
if (flags & MS_NOSUID)
mnt_flags |= MNT_NOSUID;
-@@ -2335,15 +2407,17 @@ long do_mount(char *dev_name, char *dir_
+@@ -2332,15 +2404,17 @@ long do_mount(char *dev_name, char *dir_
if (flags & MS_RDONLY)
mnt_flags |= MNT_READONLY;
else if (flags & (MS_SHARED | MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE))
retval = do_change_type(&path, flags);
else if (flags & MS_MOVE)
-@@ -2443,6 +2517,7 @@ static struct mnt_namespace *dup_mnt_ns(
+@@ -2440,6 +2514,7 @@ static struct mnt_namespace *dup_mnt_ns(
q = next_mnt(q, new_ns->root);
}
up_write(&namespace_sem);
if (rootmnt)
mntput(rootmnt);
-@@ -2582,9 +2657,10 @@ SYSCALL_DEFINE2(pivot_root, const char _
+@@ -2579,9 +2654,10 @@ SYSCALL_DEFINE2(pivot_root, const char _
goto out3;
error = -EINVAL;
goto out4;
if (!check_mnt(root.mnt) || !check_mnt(new.mnt))
goto out4;
-@@ -2716,6 +2792,7 @@ void put_mnt_ns(struct mnt_namespace *ns
+@@ -2713,6 +2789,7 @@ void put_mnt_ns(struct mnt_namespace *ns
br_write_unlock(vfsmount_lock);
up_write(&namespace_sem);
release_mounts(&umount_list);
kfree(ns);
}
EXPORT_SYMBOL(put_mnt_ns);
-diff -NurpP --minimal linux-3.1.1/fs/nfs/client.c linux-3.1.1-vs2.3.2/fs/nfs/client.c
---- linux-3.1.1/fs/nfs/client.c 2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/nfs/client.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/nfs/client.c linux-3.1.6-vs2.3.2.5/fs/nfs/client.c
+--- linux-3.1.6/fs/nfs/client.c 2011-10-24 18:45:27.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/nfs/client.c 2011-10-24 18:53:33.000000000 +0200
@@ -778,6 +778,9 @@ static int nfs_init_server_rpcclient(str
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.1.1/fs/nfs/dir.c linux-3.1.1-vs2.3.2/fs/nfs/dir.c
---- linux-3.1.1/fs/nfs/dir.c 2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/nfs/dir.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/nfs/dir.c linux-3.1.6-vs2.3.2.5/fs/nfs/dir.c
+--- linux-3.1.6/fs/nfs/dir.c 2011-12-23 16:04:07.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/fs/nfs/dir.c 2011-11-29 12:53:17.000000000 +0100
@@ -35,6 +35,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.1.1/fs/nfs/inode.c linux-3.1.1-vs2.3.2/fs/nfs/inode.c
---- linux-3.1.1/fs/nfs/inode.c 2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/nfs/inode.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/nfs/inode.c linux-3.1.6-vs2.3.2.5/fs/nfs/inode.c
+--- linux-3.1.6/fs/nfs/inode.c 2011-12-23 16:04:07.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/fs/nfs/inode.c 2011-11-29 12:53:17.000000000 +0100
@@ -38,6 +38,7 @@
#include <linux/nfs_xdr.h>
#include <linux/slab.h>
if (fattr->valid & NFS_ATTR_FATTR_NLINK) {
if (inode->i_nlink != fattr->nlink) {
invalid |= NFS_INO_INVALID_ATTR;
-diff -NurpP --minimal linux-3.1.1/fs/nfs/nfs3xdr.c linux-3.1.1-vs2.3.2/fs/nfs/nfs3xdr.c
---- linux-3.1.1/fs/nfs/nfs3xdr.c 2011-03-15 18:07:32.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/fs/nfs/nfs3xdr.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/nfs/nfs3xdr.c linux-3.1.6-vs2.3.2.5/fs/nfs/nfs3xdr.c
+--- linux-3.1.6/fs/nfs/nfs3xdr.c 2011-03-15 18:07:32.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/fs/nfs/nfs3xdr.c 2011-10-24 18:53:33.000000000 +0200
@@ -20,6 +20,7 @@
#include <linux/nfs3.h>
#include <linux/nfs_fs.h>
}
/*
-diff -NurpP --minimal linux-3.1.1/fs/nfs/super.c linux-3.1.1-vs2.3.2/fs/nfs/super.c
---- linux-3.1.1/fs/nfs/super.c 2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/nfs/super.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/nfs/super.c linux-3.1.6-vs2.3.2.5/fs/nfs/super.c
+--- linux-3.1.6/fs/nfs/super.c 2011-10-24 18:45:27.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/nfs/super.c 2011-10-24 18:53:33.000000000 +0200
@@ -53,6 +53,7 @@
#include <linux/nfs_xdr.h>
#include <linux/magic.h>
/*
* options that take text values
-diff -NurpP --minimal linux-3.1.1/fs/nfsd/auth.c linux-3.1.1-vs2.3.2/fs/nfsd/auth.c
---- linux-3.1.1/fs/nfsd/auth.c 2010-02-25 11:52:05.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/fs/nfsd/auth.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/nfsd/auth.c linux-3.1.6-vs2.3.2.5/fs/nfsd/auth.c
+--- linux-3.1.6/fs/nfsd/auth.c 2010-02-25 11:52:05.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/fs/nfsd/auth.c 2011-10-24 18:53:33.000000000 +0200
@@ -1,6 +1,7 @@
/* Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de> */
rqgi = rqstp->rq_cred.cr_group_info;
-diff -NurpP --minimal linux-3.1.1/fs/nfsd/nfs3xdr.c linux-3.1.1-vs2.3.2/fs/nfsd/nfs3xdr.c
---- linux-3.1.1/fs/nfsd/nfs3xdr.c 2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/nfsd/nfs3xdr.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/nfsd/nfs3xdr.c linux-3.1.6-vs2.3.2.5/fs/nfsd/nfs3xdr.c
+--- linux-3.1.6/fs/nfsd/nfs3xdr.c 2011-07-22 11:18:05.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/nfsd/nfs3xdr.c 2011-10-24 18:53:33.000000000 +0200
@@ -7,6 +7,7 @@
*/
if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) {
p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN);
} else {
-diff -NurpP --minimal linux-3.1.1/fs/nfsd/nfs4xdr.c linux-3.1.1-vs2.3.2/fs/nfsd/nfs4xdr.c
---- linux-3.1.1/fs/nfsd/nfs4xdr.c 2011-11-15 16:44:52.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/fs/nfsd/nfs4xdr.c 2011-11-15 17:08:44.000000000 +0100
+diff -NurpP --minimal linux-3.1.6/fs/nfsd/nfs4xdr.c linux-3.1.6-vs2.3.2.5/fs/nfsd/nfs4xdr.c
+--- linux-3.1.6/fs/nfsd/nfs4xdr.c 2011-12-23 16:04:07.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/fs/nfsd/nfs4xdr.c 2011-11-15 17:08:44.000000000 +0100
@@ -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.1.1/fs/nfsd/nfsxdr.c linux-3.1.1-vs2.3.2/fs/nfsd/nfsxdr.c
---- linux-3.1.1/fs/nfsd/nfsxdr.c 2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/nfsd/nfsxdr.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/nfsd/nfsxdr.c linux-3.1.6-vs2.3.2.5/fs/nfsd/nfsxdr.c
+--- linux-3.1.6/fs/nfsd/nfsxdr.c 2011-05-22 16:17:53.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/nfsd/nfsxdr.c 2011-10-24 18:53:33.000000000 +0200
@@ -6,6 +6,7 @@
#include "xdr.h"
if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
*p++ = htonl(NFS_MAXPATHLEN);
-diff -NurpP --minimal linux-3.1.1/fs/ocfs2/dlmglue.c linux-3.1.1-vs2.3.2/fs/ocfs2/dlmglue.c
---- linux-3.1.1/fs/ocfs2/dlmglue.c 2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/ocfs2/dlmglue.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/ocfs2/dlmglue.c linux-3.1.6-vs2.3.2.5/fs/ocfs2/dlmglue.c
+--- linux-3.1.6/fs/ocfs2/dlmglue.c 2011-05-22 16:17:53.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/ocfs2/dlmglue.c 2011-10-24 18:53:33.000000000 +0200
@@ -2041,6 +2041,7 @@ static void __ocfs2_stuff_meta_lvb(struc
lvb->lvb_iclusters = cpu_to_be32(oi->ip_clusters);
lvb->lvb_iuid = cpu_to_be32(inode->i_uid);
inode->i_mode = be16_to_cpu(lvb->lvb_imode);
inode->i_nlink = be16_to_cpu(lvb->lvb_inlink);
ocfs2_unpack_timespec(&inode->i_atime,
-diff -NurpP --minimal linux-3.1.1/fs/ocfs2/dlmglue.h linux-3.1.1-vs2.3.2/fs/ocfs2/dlmglue.h
---- linux-3.1.1/fs/ocfs2/dlmglue.h 2010-10-21 13:07:50.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/ocfs2/dlmglue.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/ocfs2/dlmglue.h linux-3.1.6-vs2.3.2.5/fs/ocfs2/dlmglue.h
+--- linux-3.1.6/fs/ocfs2/dlmglue.h 2010-10-21 13:07:50.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/ocfs2/dlmglue.h 2011-10-24 18:53:33.000000000 +0200
@@ -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.1.1/fs/ocfs2/file.c linux-3.1.1-vs2.3.2/fs/ocfs2/file.c
---- linux-3.1.1/fs/ocfs2/file.c 2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/ocfs2/file.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/ocfs2/file.c linux-3.1.6-vs2.3.2.5/fs/ocfs2/file.c
+--- linux-3.1.6/fs/ocfs2/file.c 2011-10-24 18:45:27.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/ocfs2/file.c 2011-10-24 18:53:33.000000000 +0200
@@ -1123,7 +1123,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.1.1/fs/ocfs2/inode.c linux-3.1.1-vs2.3.2/fs/ocfs2/inode.c
---- linux-3.1.1/fs/ocfs2/inode.c 2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/ocfs2/inode.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/ocfs2/inode.c linux-3.1.6-vs2.3.2.5/fs/ocfs2/inode.c
+--- linux-3.1.6/fs/ocfs2/inode.c 2011-05-22 16:17:53.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/ocfs2/inode.c 2011-10-24 18:53:33.000000000 +0200
@@ -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.1.1/fs/ocfs2/inode.h linux-3.1.1-vs2.3.2/fs/ocfs2/inode.h
---- linux-3.1.1/fs/ocfs2/inode.h 2011-01-05 21:50:26.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/fs/ocfs2/inode.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/ocfs2/inode.h linux-3.1.6-vs2.3.2.5/fs/ocfs2/inode.h
+--- linux-3.1.6/fs/ocfs2/inode.h 2011-01-05 21:50:26.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/fs/ocfs2/inode.h 2011-10-24 18:53:33.000000000 +0200
@@ -151,6 +151,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.1.1/fs/ocfs2/ioctl.c linux-3.1.1-vs2.3.2/fs/ocfs2/ioctl.c
---- linux-3.1.1/fs/ocfs2/ioctl.c 2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/ocfs2/ioctl.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/ocfs2/ioctl.c linux-3.1.6-vs2.3.2.5/fs/ocfs2/ioctl.c
+--- linux-3.1.6/fs/ocfs2/ioctl.c 2011-07-22 11:18:06.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/ocfs2/ioctl.c 2011-10-24 18:53:33.000000000 +0200
@@ -78,7 +78,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 = filp->f_path.dentry->d_inode;
-diff -NurpP --minimal linux-3.1.1/fs/ocfs2/namei.c linux-3.1.1-vs2.3.2/fs/ocfs2/namei.c
---- linux-3.1.1/fs/ocfs2/namei.c 2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/ocfs2/namei.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/ocfs2/namei.c linux-3.1.6-vs2.3.2.5/fs/ocfs2/namei.c
+--- linux-3.1.6/fs/ocfs2/namei.c 2011-10-24 18:45:27.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/ocfs2/namei.c 2011-10-24 18:53:33.000000000 +0200
@@ -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.1.1/fs/ocfs2/ocfs2.h linux-3.1.1-vs2.3.2/fs/ocfs2/ocfs2.h
---- linux-3.1.1/fs/ocfs2/ocfs2.h 2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/ocfs2/ocfs2.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/ocfs2/ocfs2.h linux-3.1.6-vs2.3.2.5/fs/ocfs2/ocfs2.h
+--- linux-3.1.6/fs/ocfs2/ocfs2.h 2011-05-22 16:17:53.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/ocfs2/ocfs2.h 2011-10-24 18:53:33.000000000 +0200
@@ -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.1.1/fs/ocfs2/ocfs2_fs.h linux-3.1.1-vs2.3.2/fs/ocfs2/ocfs2_fs.h
---- linux-3.1.1/fs/ocfs2/ocfs2_fs.h 2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/ocfs2/ocfs2_fs.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/ocfs2/ocfs2_fs.h linux-3.1.6-vs2.3.2.5/fs/ocfs2/ocfs2_fs.h
+--- linux-3.1.6/fs/ocfs2/ocfs2_fs.h 2011-05-22 16:17:53.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/ocfs2/ocfs2_fs.h 2011-10-24 18:53:33.000000000 +0200
@@ -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.1.1/fs/ocfs2/super.c linux-3.1.1-vs2.3.2/fs/ocfs2/super.c
---- linux-3.1.1/fs/ocfs2/super.c 2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/ocfs2/super.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/ocfs2/super.c linux-3.1.6-vs2.3.2.5/fs/ocfs2/super.c
+--- linux-3.1.6/fs/ocfs2/super.c 2011-07-22 11:18:06.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/ocfs2/super.c 2011-10-24 18:53:33.000000000 +0200
@@ -184,6 +184,7 @@ enum {
Opt_coherency_full,
Opt_resv_level,
default:
mlog(ML_ERROR,
"Unrecognized mount option \"%s\" "
-diff -NurpP --minimal linux-3.1.1/fs/open.c linux-3.1.1-vs2.3.2/fs/open.c
---- linux-3.1.1/fs/open.c 2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/open.c 2011-10-30 02:06:37.000000000 +0100
+diff -NurpP --minimal linux-3.1.6/fs/open.c linux-3.1.6-vs2.3.2.5/fs/open.c
+--- linux-3.1.6/fs/open.c 2011-10-24 18:45:27.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/open.c 2011-10-30 02:06:37.000000000 +0100
@@ -30,6 +30,11 @@
#include <linux/fs_struct.h>
#include <linux/ima.h>
}
void put_unused_fd(unsigned int fd)
-diff -NurpP --minimal linux-3.1.1/fs/proc/array.c linux-3.1.1-vs2.3.2/fs/proc/array.c
---- linux-3.1.1/fs/proc/array.c 2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/proc/array.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/proc/array.c linux-3.1.6-vs2.3.2.5/fs/proc/array.c
+--- linux-3.1.6/fs/proc/array.c 2011-10-24 18:45:27.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/proc/array.c 2011-10-24 18:53:33.000000000 +0200
@@ -81,6 +81,8 @@
#include <linux/pid_namespace.h>
#include <linux/ptrace.h>
seq_printf(m, "%d (%s) %c %d %d %d %d %d %u %lu \
%lu %lu %lu %lu %lu %ld %ld %ld %ld %d 0 %llu %lu %ld %lu %lu %lu %lu %lu \
%lu %lu %lu %lu %lu %lu %lu %lu %d %d %u %u %llu %lu %ld\n",
-diff -NurpP --minimal linux-3.1.1/fs/proc/base.c linux-3.1.1-vs2.3.2/fs/proc/base.c
---- linux-3.1.1/fs/proc/base.c 2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/proc/base.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/proc/base.c linux-3.1.6-vs2.3.2.5/fs/proc/base.c
+--- linux-3.1.6/fs/proc/base.c 2011-10-24 18:45:27.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/proc/base.c 2011-10-24 18:53:33.000000000 +0200
@@ -83,6 +83,8 @@
#include <linux/pid_namespace.h>
#include <linux/fs_struct.h>
ns = dentry->d_sb->s_fs_info;
rcu_read_lock();
-diff -NurpP --minimal linux-3.1.1/fs/proc/generic.c linux-3.1.1-vs2.3.2/fs/proc/generic.c
---- linux-3.1.1/fs/proc/generic.c 2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/proc/generic.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/proc/generic.c linux-3.1.6-vs2.3.2.5/fs/proc/generic.c
+--- linux-3.1.6/fs/proc/generic.c 2011-10-24 18:45:27.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/proc/generic.c 2011-10-24 18:53:33.000000000 +0200
@@ -22,6 +22,7 @@
#include <linux/bitops.h>
#include <linux/spinlock.h>
} else {
kfree(ent);
ent = NULL;
-diff -NurpP --minimal linux-3.1.1/fs/proc/inode.c linux-3.1.1-vs2.3.2/fs/proc/inode.c
---- linux-3.1.1/fs/proc/inode.c 2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/proc/inode.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/proc/inode.c linux-3.1.6-vs2.3.2.5/fs/proc/inode.c
+--- linux-3.1.6/fs/proc/inode.c 2011-10-24 18:45:27.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/proc/inode.c 2011-10-24 18:53:33.000000000 +0200
@@ -442,6 +442,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.1.1/fs/proc/internal.h linux-3.1.1-vs2.3.2/fs/proc/internal.h
---- linux-3.1.1/fs/proc/internal.h 2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/proc/internal.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/proc/internal.h linux-3.1.6-vs2.3.2.5/fs/proc/internal.h
+--- linux-3.1.6/fs/proc/internal.h 2011-07-22 11:18:06.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/proc/internal.h 2011-10-24 18:53:33.000000000 +0200
@@ -10,6 +10,7 @@
*/
static inline int proc_fd(struct inode *inode)
{
return PROC_I(inode)->fd;
-diff -NurpP --minimal linux-3.1.1/fs/proc/loadavg.c linux-3.1.1-vs2.3.2/fs/proc/loadavg.c
---- linux-3.1.1/fs/proc/loadavg.c 2009-09-10 15:26:23.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/proc/loadavg.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/proc/loadavg.c linux-3.1.6-vs2.3.2.5/fs/proc/loadavg.c
+--- linux-3.1.6/fs/proc/loadavg.c 2009-09-10 15:26:23.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/proc/loadavg.c 2011-10-24 18:53:33.000000000 +0200
@@ -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.1.1/fs/proc/meminfo.c linux-3.1.1-vs2.3.2/fs/proc/meminfo.c
---- linux-3.1.1/fs/proc/meminfo.c 2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/proc/meminfo.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/proc/meminfo.c linux-3.1.6-vs2.3.2.5/fs/proc/meminfo.c
+--- linux-3.1.6/fs/proc/meminfo.c 2011-12-23 16:04:07.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/fs/proc/meminfo.c 2011-12-23 16:11:57.000000000 +0100
@@ -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.1.1/fs/proc/root.c linux-3.1.1-vs2.3.2/fs/proc/root.c
---- linux-3.1.1/fs/proc/root.c 2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/proc/root.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/proc/root.c linux-3.1.6-vs2.3.2.5/fs/proc/root.c
+--- linux-3.1.6/fs/proc/root.c 2011-10-24 18:45:27.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/proc/root.c 2011-10-24 18:53:33.000000000 +0200
@@ -18,9 +18,14 @@
#include <linux/bitops.h>
#include <linux/mount.h>
.name = "/proc",
};
-diff -NurpP --minimal linux-3.1.1/fs/proc/uptime.c linux-3.1.1-vs2.3.2/fs/proc/uptime.c
---- linux-3.1.1/fs/proc/uptime.c 2009-12-03 20:02:53.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/fs/proc/uptime.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/proc/uptime.c linux-3.1.6-vs2.3.2.5/fs/proc/uptime.c
+--- linux-3.1.6/fs/proc/uptime.c 2009-12-03 20:02:53.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/fs/proc/uptime.c 2011-10-24 18:53:33.000000000 +0200
@@ -4,22 +4,22 @@
#include <linux/sched.h>
#include <linux/seq_file.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.1.1/fs/quota/dquot.c linux-3.1.1-vs2.3.2/fs/quota/dquot.c
---- linux-3.1.1/fs/quota/dquot.c 2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/quota/dquot.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/quota/dquot.c linux-3.1.6-vs2.3.2.5/fs/quota/dquot.c
+--- linux-3.1.6/fs/quota/dquot.c 2011-07-22 11:18:06.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/quota/dquot.c 2011-10-24 18:53:33.000000000 +0200
@@ -1548,6 +1548,9 @@ int __dquot_alloc_space(struct inode *in
int reserve = flags & DQUOT_SPACE_RESERVE;
int nofail = flags & DQUOT_SPACE_NOFAIL;
/* 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.1.1/fs/quota/quota.c linux-3.1.1-vs2.3.2/fs/quota/quota.c
---- linux-3.1.1/fs/quota/quota.c 2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/quota/quota.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/quota/quota.c linux-3.1.6-vs2.3.2.5/fs/quota/quota.c
+--- linux-3.1.6/fs/quota/quota.c 2011-10-24 18:45:27.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/quota/quota.c 2011-10-24 18:53:33.000000000 +0200
@@ -8,6 +8,7 @@
#include <linux/fs.h>
#include <linux/namei.h>
sb = get_super(bdev);
bdput(bdev);
if (!sb)
-diff -NurpP --minimal linux-3.1.1/fs/reiserfs/file.c linux-3.1.1-vs2.3.2/fs/reiserfs/file.c
---- linux-3.1.1/fs/reiserfs/file.c 2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/reiserfs/file.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/reiserfs/file.c linux-3.1.6-vs2.3.2.5/fs/reiserfs/file.c
+--- linux-3.1.6/fs/reiserfs/file.c 2011-10-24 18:45:27.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/reiserfs/file.c 2011-10-24 18:53:33.000000000 +0200
@@ -319,5 +319,6 @@ const struct inode_operations reiserfs_f
.listxattr = reiserfs_listxattr,
.removexattr = reiserfs_removexattr,
+ .sync_flags = reiserfs_sync_flags,
.get_acl = reiserfs_get_acl,
};
-diff -NurpP --minimal linux-3.1.1/fs/reiserfs/inode.c linux-3.1.1-vs2.3.2/fs/reiserfs/inode.c
---- linux-3.1.1/fs/reiserfs/inode.c 2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/reiserfs/inode.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/reiserfs/inode.c linux-3.1.6-vs2.3.2.5/fs/reiserfs/inode.c
+--- linux-3.1.6/fs/reiserfs/inode.c 2011-10-24 18:45:27.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/reiserfs/inode.c 2011-10-24 18:53:33.000000000 +0200
@@ -18,6 +18,7 @@
#include <linux/writeback.h>
#include <linux/quotaops.h>
mark_inode_dirty(inode);
error = journal_end(&th, inode->i_sb, jbegin_count);
if (error)
-diff -NurpP --minimal linux-3.1.1/fs/reiserfs/ioctl.c linux-3.1.1-vs2.3.2/fs/reiserfs/ioctl.c
---- linux-3.1.1/fs/reiserfs/ioctl.c 2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/reiserfs/ioctl.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/reiserfs/ioctl.c linux-3.1.6-vs2.3.2.5/fs/reiserfs/ioctl.c
+--- linux-3.1.6/fs/reiserfs/ioctl.c 2011-05-22 16:17:53.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/reiserfs/ioctl.c 2011-10-24 18:53:33.000000000 +0200
@@ -11,6 +11,21 @@
#include <linux/pagemap.h>
#include <linux/compat.h>
sd_attrs_to_i_attrs(flags, inode);
REISERFS_I(inode)->i_attrs = flags;
inode->i_ctime = CURRENT_TIME_SEC;
-diff -NurpP --minimal linux-3.1.1/fs/reiserfs/namei.c linux-3.1.1-vs2.3.2/fs/reiserfs/namei.c
---- linux-3.1.1/fs/reiserfs/namei.c 2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/reiserfs/namei.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/reiserfs/namei.c linux-3.1.6-vs2.3.2.5/fs/reiserfs/namei.c
+--- linux-3.1.6/fs/reiserfs/namei.c 2011-10-24 18:45:27.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/reiserfs/namei.c 2011-10-24 18:53:33.000000000 +0200
@@ -18,6 +18,7 @@
#include <linux/reiserfs_acl.h>
#include <linux/reiserfs_xattr.h>
return d_splice_alias(inode, dentry);
}
-diff -NurpP --minimal linux-3.1.1/fs/reiserfs/super.c linux-3.1.1-vs2.3.2/fs/reiserfs/super.c
---- linux-3.1.1/fs/reiserfs/super.c 2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/reiserfs/super.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/reiserfs/super.c linux-3.1.6-vs2.3.2.5/fs/reiserfs/super.c
+--- linux-3.1.6/fs/reiserfs/super.c 2011-10-24 18:45:27.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/reiserfs/super.c 2011-10-24 18:53:33.000000000 +0200
@@ -899,6 +899,14 @@ static int reiserfs_parse_options(struct
{"user_xattr",.setmask = 1 << REISERFS_UNSUPPORTED_OPT},
{"nouser_xattr",.clrmask = 1 << REISERFS_UNSUPPORTED_OPT},
rs = SB_DISK_SUPER_BLOCK(s);
/* Let's do basic sanity check to verify that underlying device is not
smaller than the filesystem. If the check fails then abort and scream,
-diff -NurpP --minimal linux-3.1.1/fs/reiserfs/xattr.c linux-3.1.1-vs2.3.2/fs/reiserfs/xattr.c
---- linux-3.1.1/fs/reiserfs/xattr.c 2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/reiserfs/xattr.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/reiserfs/xattr.c linux-3.1.6-vs2.3.2.5/fs/reiserfs/xattr.c
+--- linux-3.1.6/fs/reiserfs/xattr.c 2011-10-24 18:45:27.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/reiserfs/xattr.c 2011-10-24 18:53:33.000000000 +0200
@@ -40,6 +40,7 @@
#include <linux/errno.h>
#include <linux/gfp.h>
#include <linux/file.h>
#include <linux/pagemap.h>
#include <linux/xattr.h>
-diff -NurpP --minimal linux-3.1.1/fs/stat.c linux-3.1.1-vs2.3.2/fs/stat.c
---- linux-3.1.1/fs/stat.c 2011-11-15 16:44:52.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/fs/stat.c 2011-11-15 17:08:44.000000000 +0100
+diff -NurpP --minimal linux-3.1.6/fs/stat.c linux-3.1.6-vs2.3.2.5/fs/stat.c
+--- linux-3.1.6/fs/stat.c 2011-12-23 16:04:07.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/fs/stat.c 2011-11-15 17:08:44.000000000 +0100
@@ -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.1.1/fs/statfs.c linux-3.1.1-vs2.3.2/fs/statfs.c
---- linux-3.1.1/fs/statfs.c 2011-11-15 16:44:52.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/fs/statfs.c 2011-11-15 17:08:44.000000000 +0100
+diff -NurpP --minimal linux-3.1.6/fs/statfs.c linux-3.1.6-vs2.3.2.5/fs/statfs.c
+--- linux-3.1.6/fs/statfs.c 2011-12-23 16:04:07.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/fs/statfs.c 2011-11-15 17:08:44.000000000 +0100
@@ -7,6 +7,8 @@
#include <linux/statfs.h>
#include <linux/security.h>
return retval;
}
-diff -NurpP --minimal linux-3.1.1/fs/super.c linux-3.1.1-vs2.3.2/fs/super.c
---- linux-3.1.1/fs/super.c 2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/super.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/super.c linux-3.1.6-vs2.3.2.5/fs/super.c
+--- linux-3.1.6/fs/super.c 2011-12-23 16:04:07.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/fs/super.c 2011-11-29 12:53:17.000000000 +0100
@@ -32,6 +32,9 @@
#include <linux/backing-dev.h>
#include <linux/rculist_bl.h>
error = security_sb_kern_mount(sb, flags, secdata);
if (error)
goto out_sb;
-diff -NurpP --minimal linux-3.1.1/fs/sysfs/mount.c linux-3.1.1-vs2.3.2/fs/sysfs/mount.c
---- linux-3.1.1/fs/sysfs/mount.c 2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/sysfs/mount.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/sysfs/mount.c linux-3.1.6-vs2.3.2.5/fs/sysfs/mount.c
+--- linux-3.1.6/fs/sysfs/mount.c 2011-07-22 11:18:06.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/sysfs/mount.c 2011-10-24 18:53:33.000000000 +0200
@@ -47,7 +47,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.1.1/fs/utimes.c linux-3.1.1-vs2.3.2/fs/utimes.c
---- linux-3.1.1/fs/utimes.c 2011-05-22 16:17:54.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/utimes.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/utimes.c linux-3.1.6-vs2.3.2.5/fs/utimes.c
+--- linux-3.1.6/fs/utimes.c 2011-05-22 16:17:54.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/utimes.c 2011-10-24 18:53:33.000000000 +0200
@@ -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.1.1/fs/xattr.c linux-3.1.1-vs2.3.2/fs/xattr.c
---- linux-3.1.1/fs/xattr.c 2011-07-22 11:18:09.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/xattr.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/xattr.c linux-3.1.6-vs2.3.2.5/fs/xattr.c
+--- linux-3.1.6/fs/xattr.c 2011-07-22 11:18:09.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/xattr.c 2011-10-24 18:53:33.000000000 +0200
@@ -18,6 +18,7 @@
#include <linux/module.h>
#include <linux/fsnotify.h>
return (mask & MAY_WRITE) ? -EPERM : -ENODATA;
return 0;
}
-diff -NurpP --minimal linux-3.1.1/fs/xfs/xfs_dinode.h linux-3.1.1-vs2.3.2/fs/xfs/xfs_dinode.h
---- linux-3.1.1/fs/xfs/xfs_dinode.h 2011-10-24 18:45:31.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/xfs/xfs_dinode.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/xfs/xfs_dinode.h linux-3.1.6-vs2.3.2.5/fs/xfs/xfs_dinode.h
+--- linux-3.1.6/fs/xfs/xfs_dinode.h 2011-10-24 18:45:31.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/xfs/xfs_dinode.h 2011-10-24 18:53:33.000000000 +0200
@@ -51,7 +51,9 @@ typedef struct xfs_dinode {
__be32 di_nlink; /* number of links to file */
__be16 di_projid_lo; /* lower part of owner's project id */
+#define XFS_DIVFLAG_COW 0x02
#endif /* __XFS_DINODE_H__ */
-diff -NurpP --minimal linux-3.1.1/fs/xfs/xfs_fs.h linux-3.1.1-vs2.3.2/fs/xfs/xfs_fs.h
---- linux-3.1.1/fs/xfs/xfs_fs.h 2011-10-24 18:45:31.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/xfs/xfs_fs.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/xfs/xfs_fs.h linux-3.1.6-vs2.3.2.5/fs/xfs/xfs_fs.h
+--- linux-3.1.6/fs/xfs/xfs_fs.h 2011-10-24 18:45:31.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/xfs/xfs_fs.h 2011-10-24 18:53:33.000000000 +0200
@@ -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.1.1/fs/xfs/xfs_ialloc.c linux-3.1.1-vs2.3.2/fs/xfs/xfs_ialloc.c
---- linux-3.1.1/fs/xfs/xfs_ialloc.c 2011-10-24 18:45:31.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/xfs/xfs_ialloc.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/xfs/xfs_ialloc.c linux-3.1.6-vs2.3.2.5/fs/xfs/xfs_ialloc.c
+--- linux-3.1.6/fs/xfs/xfs_ialloc.c 2011-10-24 18:45:31.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/xfs/xfs_ialloc.c 2011-10-24 18:53:33.000000000 +0200
@@ -37,7 +37,6 @@
#include "xfs_error.h"
#include "xfs_bmap.h"
/*
* Allocation group level functions.
*/
-diff -NurpP --minimal linux-3.1.1/fs/xfs/xfs_inode.c linux-3.1.1-vs2.3.2/fs/xfs/xfs_inode.c
---- linux-3.1.1/fs/xfs/xfs_inode.c 2011-10-24 18:45:31.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/xfs/xfs_inode.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/xfs/xfs_inode.c linux-3.1.6-vs2.3.2.5/fs/xfs/xfs_inode.c
+--- linux-3.1.6/fs/xfs/xfs_inode.c 2011-10-24 18:45:31.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/xfs/xfs_inode.c 2011-10-24 18:53:33.000000000 +0200
@@ -242,6 +242,7 @@ xfs_inotobp(
return 0;
}
/* 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.1.1/fs/xfs/xfs_inode.h linux-3.1.1-vs2.3.2/fs/xfs/xfs_inode.h
---- linux-3.1.1/fs/xfs/xfs_inode.h 2011-10-24 18:45:31.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/xfs/xfs_inode.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/xfs/xfs_inode.h linux-3.1.6-vs2.3.2.5/fs/xfs/xfs_inode.h
+--- linux-3.1.6/fs/xfs/xfs_inode.h 2011-10-24 18:45:31.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/xfs/xfs_inode.h 2011-10-24 18:53:33.000000000 +0200
@@ -135,7 +135,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.1.1/fs/xfs/xfs_ioctl.c linux-3.1.1-vs2.3.2/fs/xfs/xfs_ioctl.c
---- linux-3.1.1/fs/xfs/xfs_ioctl.c 2011-10-24 18:45:31.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/xfs/xfs_ioctl.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/xfs/xfs_ioctl.c linux-3.1.6-vs2.3.2.5/fs/xfs/xfs_ioctl.c
+--- linux-3.1.6/fs/xfs/xfs_ioctl.c 2011-10-24 18:45:31.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/xfs/xfs_ioctl.c 2011-10-24 18:53:33.000000000 +0200
@@ -28,7 +28,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.1.1/fs/xfs/xfs_ioctl.h linux-3.1.1-vs2.3.2/fs/xfs/xfs_ioctl.h
---- linux-3.1.1/fs/xfs/xfs_ioctl.h 2011-10-24 18:45:31.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/xfs/xfs_ioctl.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/xfs/xfs_ioctl.h linux-3.1.6-vs2.3.2.5/fs/xfs/xfs_ioctl.h
+--- linux-3.1.6/fs/xfs/xfs_ioctl.h 2011-10-24 18:45:31.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/xfs/xfs_ioctl.h 2011-10-24 18:53:33.000000000 +0200
@@ -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.1.1/fs/xfs/xfs_iops.c linux-3.1.1-vs2.3.2/fs/xfs/xfs_iops.c
---- linux-3.1.1/fs/xfs/xfs_iops.c 2011-10-24 18:45:31.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/xfs/xfs_iops.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/xfs/xfs_iops.c linux-3.1.6-vs2.3.2.5/fs/xfs/xfs_iops.c
+--- linux-3.1.6/fs/xfs/xfs_iops.c 2011-12-23 16:04:07.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/fs/xfs/xfs_iops.c 2011-12-15 01:07:58.000000000 +0100
@@ -30,6 +30,7 @@
#include "xfs_bmap_btree.h"
#include "xfs_dinode.h"
switch (inode->i_mode & S_IFMT) {
case S_IFBLK:
-diff -NurpP --minimal linux-3.1.1/fs/xfs/xfs_itable.c linux-3.1.1-vs2.3.2/fs/xfs/xfs_itable.c
---- linux-3.1.1/fs/xfs/xfs_itable.c 2011-05-22 16:17:54.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/xfs/xfs_itable.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/xfs/xfs_itable.c linux-3.1.6-vs2.3.2.5/fs/xfs/xfs_itable.c
+--- linux-3.1.6/fs/xfs/xfs_itable.c 2011-05-22 16:17:54.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/xfs/xfs_itable.c 2011-10-24 18:53:33.000000000 +0200
@@ -98,6 +98,7 @@ xfs_bulkstat_one_int(
buf->bs_mode = dic->di_mode;
buf->bs_uid = dic->di_uid;
buf->bs_size = dic->di_size;
/*
-diff -NurpP --minimal linux-3.1.1/fs/xfs/xfs_linux.h linux-3.1.1-vs2.3.2/fs/xfs/xfs_linux.h
---- linux-3.1.1/fs/xfs/xfs_linux.h 2011-10-24 18:45:31.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/xfs/xfs_linux.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/xfs/xfs_linux.h linux-3.1.6-vs2.3.2.5/fs/xfs/xfs_linux.h
+--- linux-3.1.6/fs/xfs/xfs_linux.h 2011-10-24 18:45:31.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/xfs/xfs_linux.h 2011-10-24 18:53:33.000000000 +0200
@@ -121,6 +121,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.1.1/fs/xfs/xfs_log_recover.c linux-3.1.1-vs2.3.2/fs/xfs/xfs_log_recover.c
---- linux-3.1.1/fs/xfs/xfs_log_recover.c 2011-10-24 18:45:31.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/xfs/xfs_log_recover.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/xfs/xfs_log_recover.c linux-3.1.6-vs2.3.2.5/fs/xfs/xfs_log_recover.c
+--- linux-3.1.6/fs/xfs/xfs_log_recover.c 2011-10-24 18:45:31.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/xfs/xfs_log_recover.c 2011-10-24 18:53:33.000000000 +0200
@@ -2347,7 +2347,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.1.1/fs/xfs/xfs_mount.h linux-3.1.1-vs2.3.2/fs/xfs/xfs_mount.h
---- linux-3.1.1/fs/xfs/xfs_mount.h 2011-10-24 18:45:31.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/xfs/xfs_mount.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/xfs/xfs_mount.h linux-3.1.6-vs2.3.2.5/fs/xfs/xfs_mount.h
+--- linux-3.1.6/fs/xfs/xfs_mount.h 2011-10-24 18:45:31.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/xfs/xfs_mount.h 2011-10-24 18:53:33.000000000 +0200
@@ -249,6 +249,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.1.1/fs/xfs/xfs_super.c linux-3.1.1-vs2.3.2/fs/xfs/xfs_super.c
---- linux-3.1.1/fs/xfs/xfs_super.c 2011-10-24 18:45:31.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/xfs/xfs_super.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/xfs/xfs_super.c linux-3.1.6-vs2.3.2.5/fs/xfs/xfs_super.c
+--- linux-3.1.6/fs/xfs/xfs_super.c 2011-10-24 18:45:31.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/fs/xfs/xfs_super.c 2011-10-24 18:53:33.000000000 +0200
@@ -113,6 +113,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.1.1/fs/xfs/xfs_vnodeops.c linux-3.1.1-vs2.3.2/fs/xfs/xfs_vnodeops.c
---- linux-3.1.1/fs/xfs/xfs_vnodeops.c 2011-10-24 18:45:31.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/fs/xfs/xfs_vnodeops.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/fs/xfs/xfs_vnodeops.c linux-3.1.6-vs2.3.2.5/fs/xfs/xfs_vnodeops.c
+--- linux-3.1.6/fs/xfs/xfs_vnodeops.c 2011-12-23 16:04:07.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/fs/xfs/xfs_vnodeops.c 2011-12-15 01:07:58.000000000 +0100
@@ -107,6 +107,78 @@ xfs_readlink_bmap(
return error;
}
int
xfs_readlink(
xfs_inode_t *ip,
-diff -NurpP --minimal linux-3.1.1/include/asm-generic/tlb.h linux-3.1.1-vs2.3.2/include/asm-generic/tlb.h
---- linux-3.1.1/include/asm-generic/tlb.h 2011-07-22 11:18:10.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/include/asm-generic/tlb.h 2011-10-24 18:53:33.000000000 +0200
-@@ -16,6 +16,7 @@
- #define _ASM_GENERIC__TLB_H
-
- #include <linux/swap.h>
-+#include <linux/vs_memory.h>
- #include <asm/pgalloc.h>
- #include <asm/tlbflush.h>
-
-diff -NurpP --minimal linux-3.1.1/include/linux/Kbuild linux-3.1.1-vs2.3.2/include/linux/Kbuild
---- linux-3.1.1/include/linux/Kbuild 2011-10-24 18:45:31.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/include/linux/Kbuild 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/Kbuild linux-3.1.6-vs2.3.2.5/include/linux/Kbuild
+--- linux-3.1.6/include/linux/Kbuild 2011-10-24 18:45:31.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/include/linux/Kbuild 2011-10-24 18:53:33.000000000 +0200
@@ -17,6 +17,7 @@ header-y += netfilter_bridge/
header-y += netfilter_ipv4/
header-y += netfilter_ipv6/
header-y += wimax/
objhdr-y += version.h
-diff -NurpP --minimal linux-3.1.1/include/linux/capability.h linux-3.1.1-vs2.3.2/include/linux/capability.h
---- linux-3.1.1/include/linux/capability.h 2011-07-22 11:18:10.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/include/linux/capability.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/capability.h linux-3.1.6-vs2.3.2.5/include/linux/capability.h
+--- linux-3.1.6/include/linux/capability.h 2011-07-22 11:18:10.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/include/linux/capability.h 2011-10-24 18:53:33.000000000 +0200
@@ -279,6 +279,7 @@ struct cpu_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.1.1/include/linux/cred.h linux-3.1.1-vs2.3.2/include/linux/cred.h
---- linux-3.1.1/include/linux/cred.h 2011-10-24 18:45:31.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/include/linux/cred.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/cred.h linux-3.1.6-vs2.3.2.5/include/linux/cred.h
+--- linux-3.1.6/include/linux/cred.h 2011-10-24 18:45:31.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/include/linux/cred.h 2011-10-24 18:53:33.000000000 +0200
@@ -156,6 +156,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.1.1/include/linux/devpts_fs.h linux-3.1.1-vs2.3.2/include/linux/devpts_fs.h
---- linux-3.1.1/include/linux/devpts_fs.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/devpts_fs.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/devpts_fs.h linux-3.1.6-vs2.3.2.5/include/linux/devpts_fs.h
+--- linux-3.1.6/include/linux/devpts_fs.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/devpts_fs.h 2011-10-24 18:53:33.000000000 +0200
@@ -45,5 +45,4 @@ static inline void devpts_pty_kill(struc
#endif
-
#endif /* _LINUX_DEVPTS_FS_H */
-diff -NurpP --minimal linux-3.1.1/include/linux/ext2_fs.h linux-3.1.1-vs2.3.2/include/linux/ext2_fs.h
---- linux-3.1.1/include/linux/ext2_fs.h 2011-11-15 16:44:52.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/ext2_fs.h 2011-11-15 17:08:44.000000000 +0100
+diff -NurpP --minimal linux-3.1.6/include/linux/ext2_fs.h linux-3.1.6-vs2.3.2.5/include/linux/ext2_fs.h
+--- linux-3.1.6/include/linux/ext2_fs.h 2011-12-23 16:04:07.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/ext2_fs.h 2011-11-15 17:08:44.000000000 +0100
@@ -190,8 +190,12 @@ struct ext2_group_desc
#define EXT2_NOTAIL_FL FS_NOTAIL_FL /* file tail should not be merged */
#define EXT2_DIRSYNC_FL FS_DIRSYNC_FL /* dirsync behaviour (directories only) */
#define clear_opt(o, opt) o &= ~EXT2_MOUNT_##opt
-diff -NurpP --minimal linux-3.1.1/include/linux/ext3_fs.h linux-3.1.1-vs2.3.2/include/linux/ext3_fs.h
---- linux-3.1.1/include/linux/ext3_fs.h 2011-11-15 16:44:52.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/ext3_fs.h 2011-11-15 17:08:44.000000000 +0100
+diff -NurpP --minimal linux-3.1.6/include/linux/ext3_fs.h linux-3.1.6-vs2.3.2.5/include/linux/ext3_fs.h
+--- linux-3.1.6/include/linux/ext3_fs.h 2011-12-23 16:04:07.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/ext3_fs.h 2011-11-15 17:08:44.000000000 +0100
@@ -173,10 +173,14 @@ struct ext3_group_desc
#define EXT3_NOTAIL_FL 0x00008000 /* file tail should not be merged */
#define EXT3_DIRSYNC_FL 0x00010000 /* dirsync behaviour (directories only) */
/* ioctl.c */
extern long ext3_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-3.1.1/include/linux/fs.h linux-3.1.1-vs2.3.2/include/linux/fs.h
---- linux-3.1.1/include/linux/fs.h 2011-10-24 18:45:32.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/include/linux/fs.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/fs.h linux-3.1.6-vs2.3.2.5/include/linux/fs.h
+--- linux-3.1.6/include/linux/fs.h 2011-12-23 16:04:07.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/fs.h 2011-12-23 16:11:57.000000000 +0100
@@ -209,6 +209,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 */
struct super_operations {
struct inode *(*alloc_inode)(struct super_block *sb);
-@@ -2505,6 +2544,7 @@ extern int dcache_dir_open(struct inode
+@@ -2506,6 +2545,7 @@ extern int dcache_dir_open(struct inode
extern int dcache_dir_close(struct inode *, struct file *);
extern loff_t dcache_dir_lseek(struct file *, loff_t, int);
extern int dcache_readdir(struct file *, void *, filldir_t);
extern int simple_setattr(struct dentry *, struct iattr *);
extern int simple_getattr(struct vfsmount *, struct dentry *, struct kstat *);
extern int simple_statfs(struct dentry *, struct kstatfs *);
-diff -NurpP --minimal linux-3.1.1/include/linux/gfs2_ondisk.h linux-3.1.1-vs2.3.2/include/linux/gfs2_ondisk.h
---- linux-3.1.1/include/linux/gfs2_ondisk.h 2010-07-07 18:31:55.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/include/linux/gfs2_ondisk.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/gfs2_ondisk.h linux-3.1.6-vs2.3.2.5/include/linux/gfs2_ondisk.h
+--- linux-3.1.6/include/linux/gfs2_ondisk.h 2010-07-07 18:31:55.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/include/linux/gfs2_ondisk.h 2011-10-24 18:53:33.000000000 +0200
@@ -211,6 +211,9 @@ enum {
gfs2fl_NoAtime = 7,
gfs2fl_Sync = 8,
#define GFS2_DIF_TRUNC_IN_PROG 0x20000000 /* New in gfs2 */
#define GFS2_DIF_INHERIT_DIRECTIO 0x40000000
#define GFS2_DIF_INHERIT_JDATA 0x80000000
-diff -NurpP --minimal linux-3.1.1/include/linux/if_tun.h linux-3.1.1-vs2.3.2/include/linux/if_tun.h
---- linux-3.1.1/include/linux/if_tun.h 2010-08-02 16:52:54.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/include/linux/if_tun.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/if_tun.h linux-3.1.6-vs2.3.2.5/include/linux/if_tun.h
+--- linux-3.1.6/include/linux/if_tun.h 2010-08-02 16:52:54.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/include/linux/if_tun.h 2011-10-24 18:53:33.000000000 +0200
@@ -53,6 +53,7 @@
#define TUNDETACHFILTER _IOW('T', 214, struct sock_fprog)
#define TUNGETVNETHDRSZ _IOR('T', 215, int)
/* TUNSETIFF ifr flags */
#define IFF_TUN 0x0001
-diff -NurpP --minimal linux-3.1.1/include/linux/init_task.h linux-3.1.1-vs2.3.2/include/linux/init_task.h
---- linux-3.1.1/include/linux/init_task.h 2011-10-24 18:45:32.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/include/linux/init_task.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/init_task.h linux-3.1.6-vs2.3.2.5/include/linux/init_task.h
+--- linux-3.1.6/include/linux/init_task.h 2011-10-24 18:45:32.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/include/linux/init_task.h 2011-10-24 18:53:33.000000000 +0200
@@ -192,6 +192,10 @@ extern struct cred init_cred;
INIT_FTRACE_GRAPH \
INIT_TRACE_RECURSION \
}
-diff -NurpP --minimal linux-3.1.1/include/linux/ipc.h linux-3.1.1-vs2.3.2/include/linux/ipc.h
---- linux-3.1.1/include/linux/ipc.h 2009-12-03 20:02:55.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/ipc.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/ipc.h linux-3.1.6-vs2.3.2.5/include/linux/ipc.h
+--- linux-3.1.6/include/linux/ipc.h 2009-12-03 20:02:55.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/ipc.h 2011-10-24 18:53:33.000000000 +0200
@@ -91,6 +91,7 @@ struct kern_ipc_perm
key_t key;
uid_t uid;
uid_t cuid;
gid_t cgid;
mode_t mode;
-diff -NurpP --minimal linux-3.1.1/include/linux/ipc_namespace.h linux-3.1.1-vs2.3.2/include/linux/ipc_namespace.h
---- linux-3.1.1/include/linux/ipc_namespace.h 2011-10-24 18:45:32.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/include/linux/ipc_namespace.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/ipc_namespace.h linux-3.1.6-vs2.3.2.5/include/linux/ipc_namespace.h
+--- linux-3.1.6/include/linux/ipc_namespace.h 2011-10-24 18:45:32.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/include/linux/ipc_namespace.h 2011-10-24 18:53:33.000000000 +0200
@@ -101,7 +101,8 @@ static inline int mq_init_ns(struct ipc_
#if defined(CONFIG_IPC_NS)
}
static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns)
-diff -NurpP --minimal linux-3.1.1/include/linux/loop.h linux-3.1.1-vs2.3.2/include/linux/loop.h
---- linux-3.1.1/include/linux/loop.h 2011-10-24 18:45:32.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/include/linux/loop.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/loop.h linux-3.1.6-vs2.3.2.5/include/linux/loop.h
+--- linux-3.1.6/include/linux/loop.h 2011-10-24 18:45:32.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/include/linux/loop.h 2011-10-24 18:53:33.000000000 +0200
@@ -45,6 +45,7 @@ struct loop_device {
struct loop_func_table *lo_encryption;
__u32 lo_init[2];
int (*ioctl)(struct loop_device *, int cmd,
unsigned long arg);
-diff -NurpP --minimal linux-3.1.1/include/linux/magic.h linux-3.1.1-vs2.3.2/include/linux/magic.h
---- linux-3.1.1/include/linux/magic.h 2011-05-22 16:17:55.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/include/linux/magic.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/magic.h linux-3.1.6-vs2.3.2.5/include/linux/magic.h
+--- linux-3.1.6/include/linux/magic.h 2011-05-22 16:17:55.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/include/linux/magic.h 2011-10-24 18:53:33.000000000 +0200
@@ -3,7 +3,7 @@
#define ADFS_SUPER_MAGIC 0xadf5
#define QNX4_SUPER_MAGIC 0x002f /* qnx4 fs detection */
#define REISERFS_SUPER_MAGIC 0x52654973 /* used by gcc */
-diff -NurpP --minimal linux-3.1.1/include/linux/major.h linux-3.1.1-vs2.3.2/include/linux/major.h
---- linux-3.1.1/include/linux/major.h 2009-09-10 15:26:25.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/include/linux/major.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/major.h linux-3.1.6-vs2.3.2.5/include/linux/major.h
+--- linux-3.1.6/include/linux/major.h 2009-09-10 15:26:25.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/include/linux/major.h 2011-10-24 18:53:33.000000000 +0200
@@ -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.1.1/include/linux/memcontrol.h linux-3.1.1-vs2.3.2/include/linux/memcontrol.h
---- linux-3.1.1/include/linux/memcontrol.h 2011-10-24 18:45:32.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/include/linux/memcontrol.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/memcontrol.h linux-3.1.6-vs2.3.2.5/include/linux/memcontrol.h
+--- linux-3.1.6/include/linux/memcontrol.h 2011-10-24 18:45:32.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/include/linux/memcontrol.h 2011-10-24 18:53:33.000000000 +0200
@@ -84,6 +84,13 @@ extern struct mem_cgroup *try_get_mem_cg
extern struct mem_cgroup *mem_cgroup_from_task(struct task_struct *p);
extern struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm);
static inline
int mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *cgroup)
{
-diff -NurpP --minimal linux-3.1.1/include/linux/mm_types.h linux-3.1.1-vs2.3.2/include/linux/mm_types.h
---- linux-3.1.1/include/linux/mm_types.h 2011-11-15 16:44:52.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/mm_types.h 2011-11-15 17:08:44.000000000 +0100
+diff -NurpP --minimal linux-3.1.6/include/linux/mm_types.h linux-3.1.6-vs2.3.2.5/include/linux/mm_types.h
+--- linux-3.1.6/include/linux/mm_types.h 2011-12-23 16:04:07.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/mm_types.h 2011-11-15 17:08:44.000000000 +0100
@@ -314,6 +314,7 @@ struct mm_struct {
/* Architecture-specific MM context */
/* Swap token stuff */
/*
-diff -NurpP --minimal linux-3.1.1/include/linux/mmzone.h linux-3.1.1-vs2.3.2/include/linux/mmzone.h
---- linux-3.1.1/include/linux/mmzone.h 2011-10-24 18:45:32.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/include/linux/mmzone.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/mmzone.h linux-3.1.6-vs2.3.2.5/include/linux/mmzone.h
+--- linux-3.1.6/include/linux/mmzone.h 2011-10-24 18:45:32.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/include/linux/mmzone.h 2011-10-24 18:53:33.000000000 +0200
@@ -660,6 +660,13 @@ typedef struct pglist_data {
__pgdat->node_start_pfn + __pgdat->node_spanned_pages;\
})
#include <linux/memory_hotplug.h>
extern struct mutex zonelists_mutex;
-diff -NurpP --minimal linux-3.1.1/include/linux/mount.h linux-3.1.1-vs2.3.2/include/linux/mount.h
---- linux-3.1.1/include/linux/mount.h 2011-10-24 18:45:32.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/include/linux/mount.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/mount.h linux-3.1.6-vs2.3.2.5/include/linux/mount.h
+--- linux-3.1.6/include/linux/mount.h 2011-10-24 18:45:32.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/include/linux/mount.h 2011-10-24 18:53:33.000000000 +0200
@@ -52,6 +52,9 @@ struct mnt_pcp {
int mnt_writers;
};
};
struct file; /* forward dec */
-diff -NurpP --minimal linux-3.1.1/include/linux/net.h linux-3.1.1-vs2.3.2/include/linux/net.h
---- linux-3.1.1/include/linux/net.h 2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/include/linux/net.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/net.h linux-3.1.6-vs2.3.2.5/include/linux/net.h
+--- linux-3.1.6/include/linux/net.h 2011-07-22 11:18:11.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/include/linux/net.h 2011-10-24 18:53:33.000000000 +0200
@@ -72,6 +72,7 @@ struct net;
#define SOCK_NOSPACE 2
#define SOCK_PASSCRED 3
#ifndef ARCH_HAS_SOCKET_TYPES
/**
-diff -NurpP --minimal linux-3.1.1/include/linux/netdevice.h linux-3.1.1-vs2.3.2/include/linux/netdevice.h
---- linux-3.1.1/include/linux/netdevice.h 2011-10-24 18:45:32.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/include/linux/netdevice.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/netdevice.h linux-3.1.6-vs2.3.2.5/include/linux/netdevice.h
+--- linux-3.1.6/include/linux/netdevice.h 2011-10-24 18:45:32.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/include/linux/netdevice.h 2011-10-24 18:53:33.000000000 +0200
@@ -1641,6 +1641,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.1.1/include/linux/nfs_mount.h linux-3.1.1-vs2.3.2/include/linux/nfs_mount.h
---- linux-3.1.1/include/linux/nfs_mount.h 2011-01-05 21:50:31.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/nfs_mount.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/nfs_mount.h linux-3.1.6-vs2.3.2.5/include/linux/nfs_mount.h
+--- linux-3.1.6/include/linux/nfs_mount.h 2011-01-05 21:50:31.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/nfs_mount.h 2011-10-24 18:53:33.000000000 +0200
@@ -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.1.1/include/linux/nsproxy.h linux-3.1.1-vs2.3.2/include/linux/nsproxy.h
---- linux-3.1.1/include/linux/nsproxy.h 2011-10-24 18:45:32.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/include/linux/nsproxy.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/nsproxy.h linux-3.1.6-vs2.3.2.5/include/linux/nsproxy.h
+--- linux-3.1.6/include/linux/nsproxy.h 2011-10-24 18:45:32.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/include/linux/nsproxy.h 2011-10-24 18:53:33.000000000 +0200
@@ -3,6 +3,7 @@
#include <linux/spinlock.h>
}
#endif
-diff -NurpP --minimal linux-3.1.1/include/linux/pid.h linux-3.1.1-vs2.3.2/include/linux/pid.h
---- linux-3.1.1/include/linux/pid.h 2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/include/linux/pid.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/pid.h linux-3.1.6-vs2.3.2.5/include/linux/pid.h
+--- linux-3.1.6/include/linux/pid.h 2011-07-22 11:18:11.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/include/linux/pid.h 2011-10-24 18:53:33.000000000 +0200
@@ -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.1.1/include/linux/proc_fs.h linux-3.1.1-vs2.3.2/include/linux/proc_fs.h
---- linux-3.1.1/include/linux/proc_fs.h 2011-10-24 18:45:32.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/include/linux/proc_fs.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/proc_fs.h linux-3.1.6-vs2.3.2.5/include/linux/proc_fs.h
+--- linux-3.1.6/include/linux/proc_fs.h 2011-10-24 18:45:32.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/include/linux/proc_fs.h 2011-10-24 18:53:33.000000000 +0200
@@ -54,6 +54,7 @@ struct proc_dir_entry {
nlink_t nlink;
uid_t uid;
int fd;
union proc_op op;
struct proc_dir_entry *pde;
-diff -NurpP --minimal linux-3.1.1/include/linux/quotaops.h linux-3.1.1-vs2.3.2/include/linux/quotaops.h
---- linux-3.1.1/include/linux/quotaops.h 2011-05-22 16:17:57.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/include/linux/quotaops.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/quotaops.h linux-3.1.6-vs2.3.2.5/include/linux/quotaops.h
+--- linux-3.1.6/include/linux/quotaops.h 2011-05-22 16:17:57.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/include/linux/quotaops.h 2011-10-24 18:53:33.000000000 +0200
@@ -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.1.1/include/linux/reboot.h linux-3.1.1-vs2.3.2/include/linux/reboot.h
---- linux-3.1.1/include/linux/reboot.h 2011-10-24 18:45:32.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/include/linux/reboot.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/reboot.h linux-3.1.6-vs2.3.2.5/include/linux/reboot.h
+--- linux-3.1.6/include/linux/reboot.h 2011-10-24 18:45:32.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/include/linux/reboot.h 2011-10-24 18:53:33.000000000 +0200
@@ -33,6 +33,7 @@
#define LINUX_REBOOT_CMD_RESTART2 0xA1B2C3D4
#define LINUX_REBOOT_CMD_SW_SUSPEND 0xD000FCE2
#ifdef __KERNEL__
-diff -NurpP --minimal linux-3.1.1/include/linux/reiserfs_fs.h linux-3.1.1-vs2.3.2/include/linux/reiserfs_fs.h
---- linux-3.1.1/include/linux/reiserfs_fs.h 2011-10-24 18:45:32.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/include/linux/reiserfs_fs.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/reiserfs_fs.h linux-3.1.6-vs2.3.2.5/include/linux/reiserfs_fs.h
+--- linux-3.1.6/include/linux/reiserfs_fs.h 2011-10-24 18:45:32.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/include/linux/reiserfs_fs.h 2011-10-24 18:53:33.000000000 +0200
@@ -976,6 +976,11 @@ struct stat_data_v1 {
#define REISERFS_COMPR_FL FS_COMPR_FL
#define REISERFS_NOTAIL_FL FS_NOTAIL_FL
int __reiserfs_write_begin(struct page *page, unsigned from, unsigned len);
-diff -NurpP --minimal linux-3.1.1/include/linux/reiserfs_fs_sb.h linux-3.1.1-vs2.3.2/include/linux/reiserfs_fs_sb.h
---- linux-3.1.1/include/linux/reiserfs_fs_sb.h 2010-02-25 11:52:07.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/reiserfs_fs_sb.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/reiserfs_fs_sb.h linux-3.1.6-vs2.3.2.5/include/linux/reiserfs_fs_sb.h
+--- linux-3.1.6/include/linux/reiserfs_fs_sb.h 2010-02-25 11:52:07.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/reiserfs_fs_sb.h 2011-10-24 18:53:33.000000000 +0200
@@ -476,6 +476,7 @@ enum reiserfs_mount_options {
REISERFS_EXPOSE_PRIVROOT,
REISERFS_BARRIER_NONE,
/* Actions on error */
REISERFS_ERROR_PANIC,
-diff -NurpP --minimal linux-3.1.1/include/linux/sched.h linux-3.1.1-vs2.3.2/include/linux/sched.h
---- linux-3.1.1/include/linux/sched.h 2011-10-24 18:45:32.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/include/linux/sched.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/sched.h linux-3.1.6-vs2.3.2.5/include/linux/sched.h
+--- linux-3.1.6/include/linux/sched.h 2011-10-24 18:45:32.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/include/linux/sched.h 2011-10-24 18:53:33.000000000 +0200
@@ -1406,6 +1406,14 @@ struct task_struct {
#endif
seccomp_t seccomp;
}
-diff -NurpP --minimal linux-3.1.1/include/linux/shmem_fs.h linux-3.1.1-vs2.3.2/include/linux/shmem_fs.h
---- linux-3.1.1/include/linux/shmem_fs.h 2011-10-24 18:45:32.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/include/linux/shmem_fs.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/shmem_fs.h linux-3.1.6-vs2.3.2.5/include/linux/shmem_fs.h
+--- linux-3.1.6/include/linux/shmem_fs.h 2011-10-24 18:45:32.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/include/linux/shmem_fs.h 2011-10-24 18:53:33.000000000 +0200
@@ -8,6 +8,9 @@
/* inode in-kernel data */
struct shmem_inode_info {
spinlock_t lock;
unsigned long flags;
-diff -NurpP --minimal linux-3.1.1/include/linux/stat.h linux-3.1.1-vs2.3.2/include/linux/stat.h
---- linux-3.1.1/include/linux/stat.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/stat.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/stat.h linux-3.1.6-vs2.3.2.5/include/linux/stat.h
+--- linux-3.1.6/include/linux/stat.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/stat.h 2011-10-24 18:53:33.000000000 +0200
@@ -66,6 +66,7 @@ struct kstat {
unsigned int nlink;
uid_t uid;
dev_t rdev;
loff_t size;
struct timespec atime;
-diff -NurpP --minimal linux-3.1.1/include/linux/sunrpc/auth.h linux-3.1.1-vs2.3.2/include/linux/sunrpc/auth.h
---- linux-3.1.1/include/linux/sunrpc/auth.h 2011-10-24 18:45:32.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/include/linux/sunrpc/auth.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/sunrpc/auth.h linux-3.1.6-vs2.3.2.5/include/linux/sunrpc/auth.h
+--- linux-3.1.6/include/linux/sunrpc/auth.h 2011-10-24 18:45:32.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/include/linux/sunrpc/auth.h 2011-10-24 18:53:33.000000000 +0200
@@ -25,6 +25,7 @@
struct auth_cred {
uid_t uid;
struct group_info *group_info;
unsigned char machine_cred : 1;
};
-diff -NurpP --minimal linux-3.1.1/include/linux/sunrpc/clnt.h linux-3.1.1-vs2.3.2/include/linux/sunrpc/clnt.h
---- linux-3.1.1/include/linux/sunrpc/clnt.h 2011-05-22 16:17:58.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/include/linux/sunrpc/clnt.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/sunrpc/clnt.h linux-3.1.6-vs2.3.2.5/include/linux/sunrpc/clnt.h
+--- linux-3.1.6/include/linux/sunrpc/clnt.h 2011-05-22 16:17:58.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/include/linux/sunrpc/clnt.h 2011-10-24 18:53:33.000000000 +0200
@@ -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.1.1/include/linux/syscalls.h linux-3.1.1-vs2.3.2/include/linux/syscalls.h
---- linux-3.1.1/include/linux/syscalls.h 2011-10-24 18:45:32.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/include/linux/syscalls.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/syscalls.h linux-3.1.6-vs2.3.2.5/include/linux/syscalls.h
+--- linux-3.1.6/include/linux/syscalls.h 2011-10-24 18:45:32.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/include/linux/syscalls.h 2011-10-24 18:53:33.000000000 +0200
@@ -483,6 +483,8 @@ asmlinkage long sys_symlink(const char _
asmlinkage long sys_unlink(const char __user *pathname);
asmlinkage long sys_rename(const char __user *oldname,
asmlinkage long sys_chmod(const char __user *filename, mode_t mode);
asmlinkage long sys_fchmod(unsigned int fd, mode_t mode);
-diff -NurpP --minimal linux-3.1.1/include/linux/sysctl.h linux-3.1.1-vs2.3.2/include/linux/sysctl.h
---- linux-3.1.1/include/linux/sysctl.h 2011-03-15 18:07:40.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/sysctl.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/sysctl.h linux-3.1.6-vs2.3.2.5/include/linux/sysctl.h
+--- linux-3.1.6/include/linux/sysctl.h 2011-03-15 18:07:40.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/sysctl.h 2011-10-24 18:53:33.000000000 +0200
@@ -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.1.1/include/linux/sysfs.h linux-3.1.1-vs2.3.2/include/linux/sysfs.h
---- linux-3.1.1/include/linux/sysfs.h 2011-10-24 18:45:32.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/include/linux/sysfs.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/sysfs.h linux-3.1.6-vs2.3.2.5/include/linux/sysfs.h
+--- linux-3.1.6/include/linux/sysfs.h 2011-10-24 18:45:32.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/include/linux/sysfs.h 2011-10-24 18:53:33.000000000 +0200
@@ -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.1.1/include/linux/time.h linux-3.1.1-vs2.3.2/include/linux/time.h
---- linux-3.1.1/include/linux/time.h 2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/include/linux/time.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/time.h linux-3.1.6-vs2.3.2.5/include/linux/time.h
+--- linux-3.1.6/include/linux/time.h 2011-07-22 11:18:11.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/include/linux/time.h 2011-10-24 18:53:33.000000000 +0200
@@ -256,6 +256,9 @@ static __always_inline void timespec_add
a->tv_sec += __iter_div_u64_rem(a->tv_nsec + ns, NSEC_PER_SEC, &ns);
a->tv_nsec = ns;
#endif /* __KERNEL__ */
#define NFDBITS __NFDBITS
-diff -NurpP --minimal linux-3.1.1/include/linux/types.h linux-3.1.1-vs2.3.2/include/linux/types.h
---- linux-3.1.1/include/linux/types.h 2011-05-22 16:17:58.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/include/linux/types.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/types.h linux-3.1.6-vs2.3.2.5/include/linux/types.h
+--- linux-3.1.6/include/linux/types.h 2011-05-22 16:17:58.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/include/linux/types.h 2011-10-24 18:53:33.000000000 +0200
@@ -40,6 +40,9 @@ typedef __kernel_uid32_t uid_t;
typedef __kernel_gid32_t gid_t;
typedef __kernel_uid16_t uid16_t;
typedef unsigned long uintptr_t;
-diff -NurpP --minimal linux-3.1.1/include/linux/utsname.h linux-3.1.1-vs2.3.2/include/linux/utsname.h
---- linux-3.1.1/include/linux/utsname.h 2011-05-22 16:17:58.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/include/linux/utsname.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/utsname.h linux-3.1.6-vs2.3.2.5/include/linux/utsname.h
+--- linux-3.1.6/include/linux/utsname.h 2011-05-22 16:17:58.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/include/linux/utsname.h 2011-10-24 18:53:33.000000000 +0200
@@ -54,7 +54,8 @@ static inline void get_uts_ns(struct uts
}
}
#endif
-diff -NurpP --minimal linux-3.1.1/include/linux/vroot.h linux-3.1.1-vs2.3.2/include/linux/vroot.h
---- linux-3.1.1/include/linux/vroot.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vroot.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vroot.h linux-3.1.6-vs2.3.2.5/include/linux/vroot.h
+--- linux-3.1.6/include/linux/vroot.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vroot.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,51 @@
+
+/*
+#define VROOT_CLR_DEV 0x5601
+
+#endif /* _LINUX_VROOT_H */
-diff -NurpP --minimal linux-3.1.1/include/linux/vs_base.h linux-3.1.1-vs2.3.2/include/linux/vs_base.h
---- linux-3.1.1/include/linux/vs_base.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vs_base.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vs_base.h linux-3.1.6-vs2.3.2.5/include/linux/vs_base.h
+--- linux-3.1.6/include/linux/vs_base.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vs_base.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,10 @@
+#ifndef _VS_BASE_H
+#define _VS_BASE_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.1.1/include/linux/vs_context.h linux-3.1.1-vs2.3.2/include/linux/vs_context.h
---- linux-3.1.1/include/linux/vs_context.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vs_context.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vs_context.h linux-3.1.6-vs2.3.2.5/include/linux/vs_context.h
+--- linux-3.1.6/include/linux/vs_context.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vs_context.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,242 @@
+#ifndef _VS_CONTEXT_H
+#define _VS_CONTEXT_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.1.1/include/linux/vs_cowbl.h linux-3.1.1-vs2.3.2/include/linux/vs_cowbl.h
---- linux-3.1.1/include/linux/vs_cowbl.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vs_cowbl.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vs_cowbl.h linux-3.1.6-vs2.3.2.5/include/linux/vs_cowbl.h
+--- linux-3.1.6/include/linux/vs_cowbl.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vs_cowbl.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,48 @@
+#ifndef _VS_COWBL_H
+#define _VS_COWBL_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.1.1/include/linux/vs_cvirt.h linux-3.1.1-vs2.3.2/include/linux/vs_cvirt.h
---- linux-3.1.1/include/linux/vs_cvirt.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vs_cvirt.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vs_cvirt.h linux-3.1.6-vs2.3.2.5/include/linux/vs_cvirt.h
+--- linux-3.1.6/include/linux/vs_cvirt.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vs_cvirt.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,50 @@
+#ifndef _VS_CVIRT_H
+#define _VS_CVIRT_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.1.1/include/linux/vs_device.h linux-3.1.1-vs2.3.2/include/linux/vs_device.h
---- linux-3.1.1/include/linux/vs_device.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vs_device.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vs_device.h linux-3.1.6-vs2.3.2.5/include/linux/vs_device.h
+--- linux-3.1.6/include/linux/vs_device.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vs_device.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,45 @@
+#ifndef _VS_DEVICE_H
+#define _VS_DEVICE_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.1.1/include/linux/vs_dlimit.h linux-3.1.1-vs2.3.2/include/linux/vs_dlimit.h
---- linux-3.1.1/include/linux/vs_dlimit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vs_dlimit.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vs_dlimit.h linux-3.1.6-vs2.3.2.5/include/linux/vs_dlimit.h
+--- linux-3.1.6/include/linux/vs_dlimit.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vs_dlimit.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,215 @@
+#ifndef _VS_DLIMIT_H
+#define _VS_DLIMIT_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.1.1/include/linux/vs_inet.h linux-3.1.1-vs2.3.2/include/linux/vs_inet.h
---- linux-3.1.1/include/linux/vs_inet.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vs_inet.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vs_inet.h linux-3.1.6-vs2.3.2.5/include/linux/vs_inet.h
+--- linux-3.1.6/include/linux/vs_inet.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vs_inet.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,353 @@
+#ifndef _VS_INET_H
+#define _VS_INET_H
+#else
+// #warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.1.1/include/linux/vs_inet6.h linux-3.1.1-vs2.3.2/include/linux/vs_inet6.h
---- linux-3.1.1/include/linux/vs_inet6.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vs_inet6.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vs_inet6.h linux-3.1.6-vs2.3.2.5/include/linux/vs_inet6.h
+--- linux-3.1.6/include/linux/vs_inet6.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vs_inet6.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,246 @@
+#ifndef _VS_INET6_H
+#define _VS_INET6_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.1.1/include/linux/vs_limit.h linux-3.1.1-vs2.3.2/include/linux/vs_limit.h
---- linux-3.1.1/include/linux/vs_limit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vs_limit.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vs_limit.h linux-3.1.6-vs2.3.2.5/include/linux/vs_limit.h
+--- linux-3.1.6/include/linux/vs_limit.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vs_limit.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,140 @@
+#ifndef _VS_LIMIT_H
+#define _VS_LIMIT_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.1.1/include/linux/vs_memory.h linux-3.1.1-vs2.3.2/include/linux/vs_memory.h
---- linux-3.1.1/include/linux/vs_memory.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vs_memory.h 2011-10-24 18:53:33.000000000 +0200
-@@ -0,0 +1,58 @@
-+#ifndef _VS_MEMORY_H
-+#define _VS_MEMORY_H
-+
-+#include "vserver/limit.h"
-+#include "vserver/base.h"
-+#include "vserver/context.h"
-+#include "vserver/debug.h"
-+#include "vserver/context.h"
-+#include "vserver/limit_int.h"
-+
-+enum {
-+ VXPT_UNKNOWN = 0,
-+ VXPT_ANON,
-+ VXPT_NONE,
-+ VXPT_FILE,
-+ VXPT_SWAP,
-+ VXPT_WRITE
-+};
-+
-+#if 0
-+#define vx_page_fault(mm, vma, type, ret)
-+#else
-+
-+static inline
-+void __vx_page_fault(struct mm_struct *mm,
-+ struct vm_area_struct *vma, int type, int ret)
-+{
-+ struct vx_info *vxi = mm->mm_vx_info;
-+ int what;
-+/*
-+ static char *page_type[6] =
-+ { "UNKNOWN", "ANON", "NONE", "FILE", "SWAP", "WRITE" };
-+ static char *page_what[4] =
-+ { "FAULT_OOM", "FAULT_SIGBUS", "FAULT_MINOR", "FAULT_MAJOR" };
-+*/
-+
-+ if (!vxi)
-+ return;
-+
-+ what = (ret & 0x3);
-+
-+/* printk("[%d] page[%d][%d] %2x %s %s\n", vxi->vx_id,
-+ type, what, ret, page_type[type], page_what[what]);
-+*/
-+ if (ret & VM_FAULT_WRITE)
-+ what |= 0x4;
-+ atomic_inc(&vxi->cacct.page[type][what]);
-+}
-+
-+#define vx_page_fault(mm, vma, type, ret) __vx_page_fault(mm, vma, type, ret)
-+#endif
-+
-+
-+extern unsigned long vx_badness(struct task_struct *task, struct mm_struct *mm);
-+
-+#else
-+#warning duplicate inclusion
-+#endif
-diff -NurpP --minimal linux-3.1.1/include/linux/vs_network.h linux-3.1.1-vs2.3.2/include/linux/vs_network.h
---- linux-3.1.1/include/linux/vs_network.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vs_network.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vs_network.h linux-3.1.6-vs2.3.2.5/include/linux/vs_network.h
+--- linux-3.1.6/include/linux/vs_network.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vs_network.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,169 @@
+#ifndef _NX_VS_NETWORK_H
+#define _NX_VS_NETWORK_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.1.1/include/linux/vs_pid.h linux-3.1.1-vs2.3.2/include/linux/vs_pid.h
---- linux-3.1.1/include/linux/vs_pid.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vs_pid.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vs_pid.h linux-3.1.6-vs2.3.2.5/include/linux/vs_pid.h
+--- linux-3.1.6/include/linux/vs_pid.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vs_pid.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,50 @@
+#ifndef _VS_PID_H
+#define _VS_PID_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.1.1/include/linux/vs_sched.h linux-3.1.1-vs2.3.2/include/linux/vs_sched.h
---- linux-3.1.1/include/linux/vs_sched.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vs_sched.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vs_sched.h linux-3.1.6-vs2.3.2.5/include/linux/vs_sched.h
+--- linux-3.1.6/include/linux/vs_sched.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vs_sched.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,40 @@
+#ifndef _VS_SCHED_H
+#define _VS_SCHED_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.1.1/include/linux/vs_socket.h linux-3.1.1-vs2.3.2/include/linux/vs_socket.h
---- linux-3.1.1/include/linux/vs_socket.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vs_socket.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vs_socket.h linux-3.1.6-vs2.3.2.5/include/linux/vs_socket.h
+--- linux-3.1.6/include/linux/vs_socket.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vs_socket.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,67 @@
+#ifndef _VS_SOCKET_H
+#define _VS_SOCKET_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.1.1/include/linux/vs_tag.h linux-3.1.1-vs2.3.2/include/linux/vs_tag.h
---- linux-3.1.1/include/linux/vs_tag.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vs_tag.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vs_tag.h linux-3.1.6-vs2.3.2.5/include/linux/vs_tag.h
+--- linux-3.1.6/include/linux/vs_tag.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vs_tag.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,47 @@
+#ifndef _VS_TAG_H
+#define _VS_TAG_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.1.1/include/linux/vs_time.h linux-3.1.1-vs2.3.2/include/linux/vs_time.h
---- linux-3.1.1/include/linux/vs_time.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vs_time.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vs_time.h linux-3.1.6-vs2.3.2.5/include/linux/vs_time.h
+--- linux-3.1.6/include/linux/vs_time.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vs_time.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,19 @@
+#ifndef _VS_TIME_H
+#define _VS_TIME_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.1.1/include/linux/vserver/Kbuild linux-3.1.1-vs2.3.2/include/linux/vserver/Kbuild
---- linux-3.1.1/include/linux/vserver/Kbuild 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vserver/Kbuild 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vserver/Kbuild linux-3.1.6-vs2.3.2.5/include/linux/vserver/Kbuild
+--- linux-3.1.6/include/linux/vserver/Kbuild 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vserver/Kbuild 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,8 @@
+
+header-y += context_cmd.h network_cmd.h space_cmd.h \
+
+header-y += switch.h network.h monitor.h inode.h device.h
+
-diff -NurpP --minimal linux-3.1.1/include/linux/vserver/base.h linux-3.1.1-vs2.3.2/include/linux/vserver/base.h
---- linux-3.1.1/include/linux/vserver/base.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vserver/base.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vserver/base.h linux-3.1.6-vs2.3.2.5/include/linux/vserver/base.h
+--- linux-3.1.6/include/linux/vserver/base.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vserver/base.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,178 @@
+#ifndef _VX_BASE_H
+#define _VX_BASE_H
+#define nx_info_state(n, m) (__nx_state(n) & (m))
+
+#endif
-diff -NurpP --minimal linux-3.1.1/include/linux/vserver/cacct.h linux-3.1.1-vs2.3.2/include/linux/vserver/cacct.h
---- linux-3.1.1/include/linux/vserver/cacct.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vserver/cacct.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vserver/cacct.h linux-3.1.6-vs2.3.2.5/include/linux/vserver/cacct.h
+--- linux-3.1.6/include/linux/vserver/cacct.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vserver/cacct.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,15 @@
+#ifndef _VX_CACCT_H
+#define _VX_CACCT_H
+};
+
+#endif /* _VX_CACCT_H */
-diff -NurpP --minimal linux-3.1.1/include/linux/vserver/cacct_cmd.h linux-3.1.1-vs2.3.2/include/linux/vserver/cacct_cmd.h
---- linux-3.1.1/include/linux/vserver/cacct_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vserver/cacct_cmd.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vserver/cacct_cmd.h linux-3.1.6-vs2.3.2.5/include/linux/vserver/cacct_cmd.h
+--- linux-3.1.6/include/linux/vserver/cacct_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vserver/cacct_cmd.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,23 @@
+#ifndef _VX_CACCT_CMD_H
+#define _VX_CACCT_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CACCT_CMD_H */
-diff -NurpP --minimal linux-3.1.1/include/linux/vserver/cacct_def.h linux-3.1.1-vs2.3.2/include/linux/vserver/cacct_def.h
---- linux-3.1.1/include/linux/vserver/cacct_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vserver/cacct_def.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vserver/cacct_def.h linux-3.1.6-vs2.3.2.5/include/linux/vserver/cacct_def.h
+--- linux-3.1.6/include/linux/vserver/cacct_def.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vserver/cacct_def.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,43 @@
+#ifndef _VX_CACCT_DEF_H
+#define _VX_CACCT_DEF_H
+#endif
+
+#endif /* _VX_CACCT_DEF_H */
-diff -NurpP --minimal linux-3.1.1/include/linux/vserver/cacct_int.h linux-3.1.1-vs2.3.2/include/linux/vserver/cacct_int.h
---- linux-3.1.1/include/linux/vserver/cacct_int.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vserver/cacct_int.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vserver/cacct_int.h linux-3.1.6-vs2.3.2.5/include/linux/vserver/cacct_int.h
+--- linux-3.1.6/include/linux/vserver/cacct_int.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vserver/cacct_int.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,21 @@
+#ifndef _VX_CACCT_INT_H
+#define _VX_CACCT_INT_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CACCT_INT_H */
-diff -NurpP --minimal linux-3.1.1/include/linux/vserver/check.h linux-3.1.1-vs2.3.2/include/linux/vserver/check.h
---- linux-3.1.1/include/linux/vserver/check.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vserver/check.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vserver/check.h linux-3.1.6-vs2.3.2.5/include/linux/vserver/check.h
+--- linux-3.1.6/include/linux/vserver/check.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vserver/check.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,89 @@
+#ifndef _VS_CHECK_H
+#define _VS_CHECK_H
+#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1)
+
+#endif
-diff -NurpP --minimal linux-3.1.1/include/linux/vserver/context.h linux-3.1.1-vs2.3.2/include/linux/vserver/context.h
---- linux-3.1.1/include/linux/vserver/context.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vserver/context.h 2011-10-24 18:53:33.000000000 +0200
-@@ -0,0 +1,190 @@
+diff -NurpP --minimal linux-3.1.6/include/linux/vserver/context.h linux-3.1.6-vs2.3.2.5/include/linux/vserver/context.h
+--- linux-3.1.6/include/linux/vserver/context.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vserver/context.h 2011-11-18 00:40:25.000000000 +0100
+@@ -0,0 +1,188 @@
+#ifndef _VX_CONTEXT_H
+#define _VX_CONTEXT_H
+
+
+/* context caps */
+
-+#define VXC_CAP_MASK 0x00000000
-+
+#define VXC_SET_UTSNAME 0x00000001
+#define VXC_SET_RLIMIT 0x00000002
+#define VXC_FS_SECURITY 0x00000004
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_H */
-diff -NurpP --minimal linux-3.1.1/include/linux/vserver/context_cmd.h linux-3.1.1-vs2.3.2/include/linux/vserver/context_cmd.h
---- linux-3.1.1/include/linux/vserver/context_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vserver/context_cmd.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vserver/context_cmd.h linux-3.1.6-vs2.3.2.5/include/linux/vserver/context_cmd.h
+--- linux-3.1.6/include/linux/vserver/context_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vserver/context_cmd.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,162 @@
+#ifndef _VX_CONTEXT_CMD_H
+#define _VX_CONTEXT_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-3.1.1/include/linux/vserver/cvirt.h linux-3.1.1-vs2.3.2/include/linux/vserver/cvirt.h
---- linux-3.1.1/include/linux/vserver/cvirt.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vserver/cvirt.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vserver/cvirt.h linux-3.1.6-vs2.3.2.5/include/linux/vserver/cvirt.h
+--- linux-3.1.6/include/linux/vserver/cvirt.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vserver/cvirt.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,20 @@
+#ifndef _VX_CVIRT_H
+#define _VX_CVIRT_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CVIRT_H */
-diff -NurpP --minimal linux-3.1.1/include/linux/vserver/cvirt_cmd.h linux-3.1.1-vs2.3.2/include/linux/vserver/cvirt_cmd.h
---- linux-3.1.1/include/linux/vserver/cvirt_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vserver/cvirt_cmd.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vserver/cvirt_cmd.h linux-3.1.6-vs2.3.2.5/include/linux/vserver/cvirt_cmd.h
+--- linux-3.1.6/include/linux/vserver/cvirt_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vserver/cvirt_cmd.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,53 @@
+#ifndef _VX_CVIRT_CMD_H
+#define _VX_CVIRT_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CVIRT_CMD_H */
-diff -NurpP --minimal linux-3.1.1/include/linux/vserver/cvirt_def.h linux-3.1.1-vs2.3.2/include/linux/vserver/cvirt_def.h
---- linux-3.1.1/include/linux/vserver/cvirt_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vserver/cvirt_def.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vserver/cvirt_def.h linux-3.1.6-vs2.3.2.5/include/linux/vserver/cvirt_def.h
+--- linux-3.1.6/include/linux/vserver/cvirt_def.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vserver/cvirt_def.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,80 @@
+#ifndef _VX_CVIRT_DEF_H
+#define _VX_CVIRT_DEF_H
+#endif
+
+#endif /* _VX_CVIRT_DEF_H */
-diff -NurpP --minimal linux-3.1.1/include/linux/vserver/debug.h linux-3.1.1-vs2.3.2/include/linux/vserver/debug.h
---- linux-3.1.1/include/linux/vserver/debug.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vserver/debug.h 2011-10-24 18:53:33.000000000 +0200
-@@ -0,0 +1,140 @@
+diff -NurpP --minimal linux-3.1.6/include/linux/vserver/debug.h linux-3.1.6-vs2.3.2.5/include/linux/vserver/debug.h
+--- linux-3.1.6/include/linux/vserver/debug.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vserver/debug.h 2011-11-18 12:56:11.000000000 +0100
+@@ -0,0 +1,145 @@
+#ifndef _VX_DEBUG_H
+#define _VX_DEBUG_H
+
+
-+#define VXD_CBIT(n, m) (vx_debug_ ## n & (1 << (m)))
-+#define VXD_CMIN(n, m) (vx_debug_ ## n > (m))
-+#define VXD_MASK(n, m) (vx_debug_ ## n & (m))
++#define VXD_CBIT(n, m) (vs_debug_ ## n & (1 << (m)))
++#define VXD_CMIN(n, m) (vs_debug_ ## n > (m))
++#define VXD_MASK(n, m) (vs_debug_ ## n & (m))
+
+#define VXD_DEV(d) (d), (d)->bd_inode->i_ino, \
+ imajor((d)->bd_inode), iminor((d)->bd_inode)
+
+#ifdef CONFIG_VSERVER_DEBUG
+
-+extern unsigned int vx_debug_switch;
-+extern unsigned int vx_debug_xid;
-+extern unsigned int vx_debug_nid;
-+extern unsigned int vx_debug_tag;
-+extern unsigned int vx_debug_net;
-+extern unsigned int vx_debug_limit;
-+extern unsigned int vx_debug_cres;
-+extern unsigned int vx_debug_dlim;
-+extern unsigned int vx_debug_quota;
-+extern unsigned int vx_debug_cvirt;
-+extern unsigned int vx_debug_space;
-+extern unsigned int vx_debug_misc;
++extern unsigned int vs_debug_switch;
++extern unsigned int vs_debug_xid;
++extern unsigned int vs_debug_nid;
++extern unsigned int vs_debug_tag;
++extern unsigned int vs_debug_net;
++extern unsigned int vs_debug_limit;
++extern unsigned int vs_debug_cres;
++extern unsigned int vs_debug_dlim;
++extern unsigned int vs_debug_quota;
++extern unsigned int vs_debug_cvirt;
++extern unsigned int vs_debug_space;
++extern unsigned int vs_debug_perm;
++extern unsigned int vs_debug_misc;
+
+
+#define VX_LOGLEVEL "vxD: "
+
+#else /* CONFIG_VSERVER_DEBUG */
+
-+#define vx_debug_switch 0
-+#define vx_debug_xid 0
-+#define vx_debug_nid 0
-+#define vx_debug_tag 0
-+#define vx_debug_net 0
-+#define vx_debug_limit 0
-+#define vx_debug_cres 0
-+#define vx_debug_dlim 0
-+#define vx_debug_cvirt 0
++#define vs_debug_switch 0
++#define vs_debug_xid 0
++#define vs_debug_nid 0
++#define vs_debug_tag 0
++#define vs_debug_net 0
++#define vs_debug_limit 0
++#define vs_debug_cres 0
++#define vs_debug_dlim 0
++#define vs_debug_quota 0
++#define vs_debug_cvirt 0
++#define vs_debug_space 0
++#define vs_debug_perm 0
++#define vs_debug_misc 0
+
+#define vxdprintk(x...) do { } while (0)
+#define vxlprintk(x...) do { } while (0)
+
+
+#endif /* _VX_DEBUG_H */
-diff -NurpP --minimal linux-3.1.1/include/linux/vserver/debug_cmd.h linux-3.1.1-vs2.3.2/include/linux/vserver/debug_cmd.h
---- linux-3.1.1/include/linux/vserver/debug_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vserver/debug_cmd.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vserver/debug_cmd.h linux-3.1.6-vs2.3.2.5/include/linux/vserver/debug_cmd.h
+--- linux-3.1.6/include/linux/vserver/debug_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vserver/debug_cmd.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,58 @@
+#ifndef _VX_DEBUG_CMD_H
+#define _VX_DEBUG_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_DEBUG_CMD_H */
-diff -NurpP --minimal linux-3.1.1/include/linux/vserver/device.h linux-3.1.1-vs2.3.2/include/linux/vserver/device.h
---- linux-3.1.1/include/linux/vserver/device.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vserver/device.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vserver/device.h linux-3.1.6-vs2.3.2.5/include/linux/vserver/device.h
+--- linux-3.1.6/include/linux/vserver/device.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vserver/device.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,15 @@
+#ifndef _VX_DEVICE_H
+#define _VX_DEVICE_H
+#else /* _VX_DEVICE_H */
+#warning duplicate inclusion
+#endif /* _VX_DEVICE_H */
-diff -NurpP --minimal linux-3.1.1/include/linux/vserver/device_cmd.h linux-3.1.1-vs2.3.2/include/linux/vserver/device_cmd.h
---- linux-3.1.1/include/linux/vserver/device_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vserver/device_cmd.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vserver/device_cmd.h linux-3.1.6-vs2.3.2.5/include/linux/vserver/device_cmd.h
+--- linux-3.1.6/include/linux/vserver/device_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vserver/device_cmd.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,44 @@
+#ifndef _VX_DEVICE_CMD_H
+#define _VX_DEVICE_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_DEVICE_CMD_H */
-diff -NurpP --minimal linux-3.1.1/include/linux/vserver/device_def.h linux-3.1.1-vs2.3.2/include/linux/vserver/device_def.h
---- linux-3.1.1/include/linux/vserver/device_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vserver/device_def.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vserver/device_def.h linux-3.1.6-vs2.3.2.5/include/linux/vserver/device_def.h
+--- linux-3.1.6/include/linux/vserver/device_def.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vserver/device_def.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,17 @@
+#ifndef _VX_DEVICE_DEF_H
+#define _VX_DEVICE_DEF_H
+};
+
+#endif /* _VX_DEVICE_DEF_H */
-diff -NurpP --minimal linux-3.1.1/include/linux/vserver/dlimit.h linux-3.1.1-vs2.3.2/include/linux/vserver/dlimit.h
---- linux-3.1.1/include/linux/vserver/dlimit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vserver/dlimit.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vserver/dlimit.h linux-3.1.6-vs2.3.2.5/include/linux/vserver/dlimit.h
+--- linux-3.1.6/include/linux/vserver/dlimit.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vserver/dlimit.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,54 @@
+#ifndef _VX_DLIMIT_H
+#define _VX_DLIMIT_H
+#else /* _VX_DLIMIT_H */
+#warning duplicate inclusion
+#endif /* _VX_DLIMIT_H */
-diff -NurpP --minimal linux-3.1.1/include/linux/vserver/dlimit_cmd.h linux-3.1.1-vs2.3.2/include/linux/vserver/dlimit_cmd.h
---- linux-3.1.1/include/linux/vserver/dlimit_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vserver/dlimit_cmd.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vserver/dlimit_cmd.h linux-3.1.6-vs2.3.2.5/include/linux/vserver/dlimit_cmd.h
+--- linux-3.1.6/include/linux/vserver/dlimit_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vserver/dlimit_cmd.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,109 @@
+#ifndef _VX_DLIMIT_CMD_H
+#define _VX_DLIMIT_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_DLIMIT_CMD_H */
-diff -NurpP --minimal linux-3.1.1/include/linux/vserver/global.h linux-3.1.1-vs2.3.2/include/linux/vserver/global.h
---- linux-3.1.1/include/linux/vserver/global.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vserver/global.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vserver/global.h linux-3.1.6-vs2.3.2.5/include/linux/vserver/global.h
+--- linux-3.1.6/include/linux/vserver/global.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vserver/global.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,19 @@
+#ifndef _VX_GLOBAL_H
+#define _VX_GLOBAL_H
+
+
+#endif /* _VX_GLOBAL_H */
-diff -NurpP --minimal linux-3.1.1/include/linux/vserver/history.h linux-3.1.1-vs2.3.2/include/linux/vserver/history.h
---- linux-3.1.1/include/linux/vserver/history.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vserver/history.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vserver/history.h linux-3.1.6-vs2.3.2.5/include/linux/vserver/history.h
+--- linux-3.1.6/include/linux/vserver/history.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vserver/history.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,197 @@
+#ifndef _VX_HISTORY_H
+#define _VX_HISTORY_H
+#endif /* CONFIG_VSERVER_HISTORY */
+
+#endif /* _VX_HISTORY_H */
-diff -NurpP --minimal linux-3.1.1/include/linux/vserver/inode.h linux-3.1.1-vs2.3.2/include/linux/vserver/inode.h
---- linux-3.1.1/include/linux/vserver/inode.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vserver/inode.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vserver/inode.h linux-3.1.6-vs2.3.2.5/include/linux/vserver/inode.h
+--- linux-3.1.6/include/linux/vserver/inode.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vserver/inode.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,39 @@
+#ifndef _VX_INODE_H
+#define _VX_INODE_H
+#else /* _VX_INODE_H */
+#warning duplicate inclusion
+#endif /* _VX_INODE_H */
-diff -NurpP --minimal linux-3.1.1/include/linux/vserver/inode_cmd.h linux-3.1.1-vs2.3.2/include/linux/vserver/inode_cmd.h
---- linux-3.1.1/include/linux/vserver/inode_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vserver/inode_cmd.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vserver/inode_cmd.h linux-3.1.6-vs2.3.2.5/include/linux/vserver/inode_cmd.h
+--- linux-3.1.6/include/linux/vserver/inode_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vserver/inode_cmd.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,59 @@
+#ifndef _VX_INODE_CMD_H
+#define _VX_INODE_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_INODE_CMD_H */
-diff -NurpP --minimal linux-3.1.1/include/linux/vserver/limit.h linux-3.1.1-vs2.3.2/include/linux/vserver/limit.h
---- linux-3.1.1/include/linux/vserver/limit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vserver/limit.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vserver/limit.h linux-3.1.6-vs2.3.2.5/include/linux/vserver/limit.h
+--- linux-3.1.6/include/linux/vserver/limit.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vserver/limit.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,71 @@
+#ifndef _VX_LIMIT_H
+#define _VX_LIMIT_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_H */
-diff -NurpP --minimal linux-3.1.1/include/linux/vserver/limit_cmd.h linux-3.1.1-vs2.3.2/include/linux/vserver/limit_cmd.h
---- linux-3.1.1/include/linux/vserver/limit_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vserver/limit_cmd.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vserver/limit_cmd.h linux-3.1.6-vs2.3.2.5/include/linux/vserver/limit_cmd.h
+--- linux-3.1.6/include/linux/vserver/limit_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vserver/limit_cmd.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,71 @@
+#ifndef _VX_LIMIT_CMD_H
+#define _VX_LIMIT_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_CMD_H */
-diff -NurpP --minimal linux-3.1.1/include/linux/vserver/limit_def.h linux-3.1.1-vs2.3.2/include/linux/vserver/limit_def.h
---- linux-3.1.1/include/linux/vserver/limit_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vserver/limit_def.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vserver/limit_def.h linux-3.1.6-vs2.3.2.5/include/linux/vserver/limit_def.h
+--- linux-3.1.6/include/linux/vserver/limit_def.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vserver/limit_def.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,47 @@
+#ifndef _VX_LIMIT_DEF_H
+#define _VX_LIMIT_DEF_H
+#endif
+
+#endif /* _VX_LIMIT_DEF_H */
-diff -NurpP --minimal linux-3.1.1/include/linux/vserver/limit_int.h linux-3.1.1-vs2.3.2/include/linux/vserver/limit_int.h
---- linux-3.1.1/include/linux/vserver/limit_int.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vserver/limit_int.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vserver/limit_int.h linux-3.1.6-vs2.3.2.5/include/linux/vserver/limit_int.h
+--- linux-3.1.6/include/linux/vserver/limit_int.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vserver/limit_int.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,198 @@
+#ifndef _VX_LIMIT_INT_H
+#define _VX_LIMIT_INT_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_INT_H */
-diff -NurpP --minimal linux-3.1.1/include/linux/vserver/monitor.h linux-3.1.1-vs2.3.2/include/linux/vserver/monitor.h
---- linux-3.1.1/include/linux/vserver/monitor.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vserver/monitor.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vserver/monitor.h linux-3.1.6-vs2.3.2.5/include/linux/vserver/monitor.h
+--- linux-3.1.6/include/linux/vserver/monitor.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vserver/monitor.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,96 @@
+#ifndef _VX_MONITOR_H
+#define _VX_MONITOR_H
+
+
+#endif /* _VX_MONITOR_H */
-diff -NurpP --minimal linux-3.1.1/include/linux/vserver/network.h linux-3.1.1-vs2.3.2/include/linux/vserver/network.h
---- linux-3.1.1/include/linux/vserver/network.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vserver/network.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vserver/network.h linux-3.1.6-vs2.3.2.5/include/linux/vserver/network.h
+--- linux-3.1.6/include/linux/vserver/network.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vserver/network.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,148 @@
+#ifndef _VX_NETWORK_H
+#define _VX_NETWORK_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_NETWORK_H */
-diff -NurpP --minimal linux-3.1.1/include/linux/vserver/network_cmd.h linux-3.1.1-vs2.3.2/include/linux/vserver/network_cmd.h
---- linux-3.1.1/include/linux/vserver/network_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vserver/network_cmd.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vserver/network_cmd.h linux-3.1.6-vs2.3.2.5/include/linux/vserver/network_cmd.h
+--- linux-3.1.6/include/linux/vserver/network_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vserver/network_cmd.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,164 @@
+#ifndef _VX_NETWORK_CMD_H
+#define _VX_NETWORK_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-3.1.1/include/linux/vserver/percpu.h linux-3.1.1-vs2.3.2/include/linux/vserver/percpu.h
---- linux-3.1.1/include/linux/vserver/percpu.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vserver/percpu.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vserver/percpu.h linux-3.1.6-vs2.3.2.5/include/linux/vserver/percpu.h
+--- linux-3.1.6/include/linux/vserver/percpu.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vserver/percpu.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,14 @@
+#ifndef _VX_PERCPU_H
+#define _VX_PERCPU_H
+#define PERCPU_PERCTX (sizeof(struct _vx_percpu))
+
+#endif /* _VX_PERCPU_H */
-diff -NurpP --minimal linux-3.1.1/include/linux/vserver/pid.h linux-3.1.1-vs2.3.2/include/linux/vserver/pid.h
---- linux-3.1.1/include/linux/vserver/pid.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vserver/pid.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vserver/pid.h linux-3.1.6-vs2.3.2.5/include/linux/vserver/pid.h
+--- linux-3.1.6/include/linux/vserver/pid.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vserver/pid.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,51 @@
+#ifndef _VSERVER_PID_H
+#define _VSERVER_PID_H
+}
+
+#endif
-diff -NurpP --minimal linux-3.1.1/include/linux/vserver/sched.h linux-3.1.1-vs2.3.2/include/linux/vserver/sched.h
---- linux-3.1.1/include/linux/vserver/sched.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vserver/sched.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vserver/sched.h linux-3.1.6-vs2.3.2.5/include/linux/vserver/sched.h
+--- linux-3.1.6/include/linux/vserver/sched.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vserver/sched.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,23 @@
+#ifndef _VX_SCHED_H
+#define _VX_SCHED_H
+#else /* _VX_SCHED_H */
+#warning duplicate inclusion
+#endif /* _VX_SCHED_H */
-diff -NurpP --minimal linux-3.1.1/include/linux/vserver/sched_cmd.h linux-3.1.1-vs2.3.2/include/linux/vserver/sched_cmd.h
---- linux-3.1.1/include/linux/vserver/sched_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vserver/sched_cmd.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vserver/sched_cmd.h linux-3.1.6-vs2.3.2.5/include/linux/vserver/sched_cmd.h
+--- linux-3.1.6/include/linux/vserver/sched_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vserver/sched_cmd.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,21 @@
+#ifndef _VX_SCHED_CMD_H
+#define _VX_SCHED_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_SCHED_CMD_H */
-diff -NurpP --minimal linux-3.1.1/include/linux/vserver/sched_def.h linux-3.1.1-vs2.3.2/include/linux/vserver/sched_def.h
---- linux-3.1.1/include/linux/vserver/sched_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vserver/sched_def.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vserver/sched_def.h linux-3.1.6-vs2.3.2.5/include/linux/vserver/sched_def.h
+--- linux-3.1.6/include/linux/vserver/sched_def.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vserver/sched_def.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,38 @@
+#ifndef _VX_SCHED_DEF_H
+#define _VX_SCHED_DEF_H
+#endif
+
+#endif /* _VX_SCHED_DEF_H */
-diff -NurpP --minimal linux-3.1.1/include/linux/vserver/signal.h linux-3.1.1-vs2.3.2/include/linux/vserver/signal.h
---- linux-3.1.1/include/linux/vserver/signal.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vserver/signal.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vserver/signal.h linux-3.1.6-vs2.3.2.5/include/linux/vserver/signal.h
+--- linux-3.1.6/include/linux/vserver/signal.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vserver/signal.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,14 @@
+#ifndef _VX_SIGNAL_H
+#define _VX_SIGNAL_H
+#else /* _VX_SIGNAL_H */
+#warning duplicate inclusion
+#endif /* _VX_SIGNAL_H */
-diff -NurpP --minimal linux-3.1.1/include/linux/vserver/signal_cmd.h linux-3.1.1-vs2.3.2/include/linux/vserver/signal_cmd.h
---- linux-3.1.1/include/linux/vserver/signal_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vserver/signal_cmd.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vserver/signal_cmd.h linux-3.1.6-vs2.3.2.5/include/linux/vserver/signal_cmd.h
+--- linux-3.1.6/include/linux/vserver/signal_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vserver/signal_cmd.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,43 @@
+#ifndef _VX_SIGNAL_CMD_H
+#define _VX_SIGNAL_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_SIGNAL_CMD_H */
-diff -NurpP --minimal linux-3.1.1/include/linux/vserver/space.h linux-3.1.1-vs2.3.2/include/linux/vserver/space.h
---- linux-3.1.1/include/linux/vserver/space.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vserver/space.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vserver/space.h linux-3.1.6-vs2.3.2.5/include/linux/vserver/space.h
+--- linux-3.1.6/include/linux/vserver/space.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vserver/space.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,12 @@
+#ifndef _VX_SPACE_H
+#define _VX_SPACE_H
+#else /* _VX_SPACE_H */
+#warning duplicate inclusion
+#endif /* _VX_SPACE_H */
-diff -NurpP --minimal linux-3.1.1/include/linux/vserver/space_cmd.h linux-3.1.1-vs2.3.2/include/linux/vserver/space_cmd.h
---- linux-3.1.1/include/linux/vserver/space_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vserver/space_cmd.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vserver/space_cmd.h linux-3.1.6-vs2.3.2.5/include/linux/vserver/space_cmd.h
+--- linux-3.1.6/include/linux/vserver/space_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vserver/space_cmd.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,38 @@
+#ifndef _VX_SPACE_CMD_H
+#define _VX_SPACE_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_SPACE_CMD_H */
-diff -NurpP --minimal linux-3.1.1/include/linux/vserver/switch.h linux-3.1.1-vs2.3.2/include/linux/vserver/switch.h
---- linux-3.1.1/include/linux/vserver/switch.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vserver/switch.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vserver/switch.h linux-3.1.6-vs2.3.2.5/include/linux/vserver/switch.h
+--- linux-3.1.6/include/linux/vserver/switch.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vserver/switch.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,98 @@
+#ifndef _VX_SWITCH_H
+#define _VX_SWITCH_H
+
+#endif /* _VX_SWITCH_H */
+
-diff -NurpP --minimal linux-3.1.1/include/linux/vserver/tag.h linux-3.1.1-vs2.3.2/include/linux/vserver/tag.h
---- linux-3.1.1/include/linux/vserver/tag.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vserver/tag.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vserver/tag.h linux-3.1.6-vs2.3.2.5/include/linux/vserver/tag.h
+--- linux-3.1.6/include/linux/vserver/tag.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vserver/tag.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,143 @@
+#ifndef _DX_TAG_H
+#define _DX_TAG_H
+#endif
+
+#endif /* _DX_TAG_H */
-diff -NurpP --minimal linux-3.1.1/include/linux/vserver/tag_cmd.h linux-3.1.1-vs2.3.2/include/linux/vserver/tag_cmd.h
---- linux-3.1.1/include/linux/vserver/tag_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/include/linux/vserver/tag_cmd.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/linux/vserver/tag_cmd.h linux-3.1.6-vs2.3.2.5/include/linux/vserver/tag_cmd.h
+--- linux-3.1.6/include/linux/vserver/tag_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/include/linux/vserver/tag_cmd.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,22 @@
+#ifndef _VX_TAG_CMD_H
+#define _VX_TAG_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_TAG_CMD_H */
-diff -NurpP --minimal linux-3.1.1/include/net/addrconf.h linux-3.1.1-vs2.3.2/include/net/addrconf.h
---- linux-3.1.1/include/net/addrconf.h 2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/include/net/addrconf.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/net/addrconf.h linux-3.1.6-vs2.3.2.5/include/net/addrconf.h
+--- linux-3.1.6/include/net/addrconf.h 2011-07-22 11:18:11.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/include/net/addrconf.h 2011-10-24 18:53:33.000000000 +0200
@@ -80,7 +80,8 @@ extern int ipv6_dev_get_saddr(struct n
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.1.1/include/net/af_unix.h linux-3.1.1-vs2.3.2/include/net/af_unix.h
---- linux-3.1.1/include/net/af_unix.h 2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/include/net/af_unix.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/net/af_unix.h linux-3.1.6-vs2.3.2.5/include/net/af_unix.h
+--- linux-3.1.6/include/net/af_unix.h 2011-07-22 11:18:11.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/include/net/af_unix.h 2011-10-24 18:53:33.000000000 +0200
@@ -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.1.1/include/net/inet_timewait_sock.h linux-3.1.1-vs2.3.2/include/net/inet_timewait_sock.h
---- linux-3.1.1/include/net/inet_timewait_sock.h 2011-10-24 18:45:32.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/include/net/inet_timewait_sock.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/net/inet_timewait_sock.h linux-3.1.6-vs2.3.2.5/include/net/inet_timewait_sock.h
+--- linux-3.1.6/include/net/inet_timewait_sock.h 2011-10-24 18:45:32.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/include/net/inet_timewait_sock.h 2011-10-24 18:53:33.000000000 +0200
@@ -113,6 +113,10 @@ struct inet_timewait_sock {
#define tw_net __tw_common.skc_net
#define tw_daddr __tw_common.skc_daddr
int tw_timeout;
volatile unsigned char tw_substate;
unsigned char tw_rcv_wscale;
-diff -NurpP --minimal linux-3.1.1/include/net/ip6_route.h linux-3.1.1-vs2.3.2/include/net/ip6_route.h
---- linux-3.1.1/include/net/ip6_route.h 2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/include/net/ip6_route.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/net/ip6_route.h linux-3.1.6-vs2.3.2.5/include/net/ip6_route.h
+--- linux-3.1.6/include/net/ip6_route.h 2011-07-22 11:18:11.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/include/net/ip6_route.h 2011-10-24 18:53:33.000000000 +0200
@@ -86,7 +86,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.1.1/include/net/route.h linux-3.1.1-vs2.3.2/include/net/route.h
---- linux-3.1.1/include/net/route.h 2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/include/net/route.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/net/route.h linux-3.1.6-vs2.3.2.5/include/net/route.h
+--- linux-3.1.6/include/net/route.h 2011-07-22 11:18:11.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/include/net/route.h 2011-10-24 18:53:33.000000000 +0200
@@ -202,6 +202,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.1.1/include/net/sock.h linux-3.1.1-vs2.3.2/include/net/sock.h
---- linux-3.1.1/include/net/sock.h 2011-10-24 18:45:32.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/include/net/sock.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/include/net/sock.h linux-3.1.6-vs2.3.2.5/include/net/sock.h
+--- linux-3.1.6/include/net/sock.h 2011-10-24 18:45:32.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/include/net/sock.h 2011-10-24 18:53:33.000000000 +0200
@@ -150,6 +150,10 @@ struct sock_common {
#ifdef CONFIG_NET_NS
struct net *skc_net;
socket_lock_t sk_lock;
struct sk_buff_head sk_receive_queue;
/*
-diff -NurpP --minimal linux-3.1.1/init/Kconfig linux-3.1.1-vs2.3.2/init/Kconfig
---- linux-3.1.1/init/Kconfig 2011-10-24 18:45:33.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/init/Kconfig 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/init/Kconfig linux-3.1.6-vs2.3.2.5/init/Kconfig
+--- linux-3.1.6/init/Kconfig 2011-10-24 18:45:33.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/init/Kconfig 2011-10-24 18:53:33.000000000 +0200
@@ -574,6 +574,7 @@ config HAVE_UNSTABLE_SCHED_CLOCK
menuconfig CGROUPS
boolean "Control Group support"
default y
help
This allows containers, i.e. vservers, to use user namespaces
-diff -NurpP --minimal linux-3.1.1/init/main.c linux-3.1.1-vs2.3.2/init/main.c
---- linux-3.1.1/init/main.c 2011-10-24 18:45:33.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/init/main.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/init/main.c linux-3.1.6-vs2.3.2.5/init/main.c
+--- linux-3.1.6/init/main.c 2011-10-24 18:45:33.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/init/main.c 2011-10-24 18:53:33.000000000 +0200
@@ -68,6 +68,7 @@
#include <linux/shmem_fs.h>
#include <linux/slab.h>
#include <asm/io.h>
#include <asm/bugs.h>
-diff -NurpP --minimal linux-3.1.1/ipc/mqueue.c linux-3.1.1-vs2.3.2/ipc/mqueue.c
---- linux-3.1.1/ipc/mqueue.c 2011-10-24 18:45:33.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/ipc/mqueue.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/ipc/mqueue.c linux-3.1.6-vs2.3.2.5/ipc/mqueue.c
+--- linux-3.1.6/ipc/mqueue.c 2011-10-24 18:45:33.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/ipc/mqueue.c 2011-10-24 18:53:33.000000000 +0200
@@ -33,6 +33,8 @@
#include <linux/pid.h>
#include <linux/ipc_namespace.h>
free_uid(user);
}
if (ipc_ns)
-diff -NurpP --minimal linux-3.1.1/ipc/msg.c linux-3.1.1-vs2.3.2/ipc/msg.c
---- linux-3.1.1/ipc/msg.c 2011-05-22 16:17:59.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/ipc/msg.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/ipc/msg.c linux-3.1.6-vs2.3.2.5/ipc/msg.c
+--- linux-3.1.6/ipc/msg.c 2011-05-22 16:17:59.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/ipc/msg.c 2011-10-24 18:53:33.000000000 +0200
@@ -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.1.1/ipc/namespace.c linux-3.1.1-vs2.3.2/ipc/namespace.c
---- linux-3.1.1/ipc/namespace.c 2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/ipc/namespace.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/ipc/namespace.c linux-3.1.6-vs2.3.2.5/ipc/namespace.c
+--- linux-3.1.6/ipc/namespace.c 2011-07-22 11:18:12.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/ipc/namespace.c 2011-10-24 18:53:33.000000000 +0200
@@ -13,11 +13,12 @@
#include <linux/mount.h>
#include <linux/user_namespace.h>
}
/*
-diff -NurpP --minimal linux-3.1.1/ipc/sem.c linux-3.1.1-vs2.3.2/ipc/sem.c
---- linux-3.1.1/ipc/sem.c 2011-10-24 18:45:33.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/ipc/sem.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/ipc/sem.c linux-3.1.6-vs2.3.2.5/ipc/sem.c
+--- linux-3.1.6/ipc/sem.c 2011-10-24 18:45:33.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/ipc/sem.c 2011-10-24 18:53:33.000000000 +0200
@@ -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.1.1/ipc/shm.c linux-3.1.1-vs2.3.2/ipc/shm.c
---- linux-3.1.1/ipc/shm.c 2011-10-24 18:45:33.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/ipc/shm.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/ipc/shm.c linux-3.1.6-vs2.3.2.5/ipc/shm.c
+--- linux-3.1.6/ipc/shm.c 2011-10-24 18:45:33.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/ipc/shm.c 2011-10-24 18:53:33.000000000 +0200
@@ -39,6 +39,8 @@
#include <linux/nsproxy.h>
#include <linux/mount.h>
return error;
no_id:
-diff -NurpP --minimal linux-3.1.1/kernel/Makefile linux-3.1.1-vs2.3.2/kernel/Makefile
---- linux-3.1.1/kernel/Makefile 2011-10-24 18:45:33.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/kernel/Makefile 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/kernel/Makefile linux-3.1.6-vs2.3.2.5/kernel/Makefile
+--- linux-3.1.6/kernel/Makefile 2011-10-24 18:45:33.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/kernel/Makefile 2011-10-24 18:53:33.000000000 +0200
@@ -24,6 +24,7 @@ CFLAGS_REMOVE_sched_clock.o = -pg
CFLAGS_REMOVE_irq_work.o = -pg
endif
obj-$(CONFIG_FREEZER) += freezer.o
obj-$(CONFIG_PROFILING) += profile.o
obj-$(CONFIG_SYSCTL_SYSCALL_CHECK) += sysctl_check.o
-diff -NurpP --minimal linux-3.1.1/kernel/capability.c linux-3.1.1-vs2.3.2/kernel/capability.c
---- linux-3.1.1/kernel/capability.c 2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/kernel/capability.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/kernel/capability.c linux-3.1.6-vs2.3.2.5/kernel/capability.c
+--- linux-3.1.6/kernel/capability.c 2011-07-22 11:18:12.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/kernel/capability.c 2011-11-18 00:38:57.000000000 +0100
@@ -15,6 +15,7 @@
#include <linux/syscalls.h>
#include <linux/pid_namespace.h>
/**
* capable - Determine if the current task has a superior capability in effect
* @cap: The capability to be tested for
-@@ -374,6 +378,9 @@ bool ns_capable(struct user_namespace *n
- BUG();
- }
-
-+ if (vs_check_bit(VXC_CAP_MASK, cap) && !vx_mcaps(1L << cap))
-+ return true;
-+
- if (security_capable(ns, current_cred(), cap) == 0) {
- current->flags |= PF_SUPERPRIV;
- return true;
-diff -NurpP --minimal linux-3.1.1/kernel/compat.c linux-3.1.1-vs2.3.2/kernel/compat.c
---- linux-3.1.1/kernel/compat.c 2011-10-24 18:45:33.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/kernel/compat.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/kernel/compat.c linux-3.1.6-vs2.3.2.5/kernel/compat.c
+--- linux-3.1.6/kernel/compat.c 2011-10-24 18:45:33.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/kernel/compat.c 2011-10-24 18:53:33.000000000 +0200
@@ -972,7 +972,7 @@ asmlinkage long compat_sys_stime(compat_
if (err)
return err;
return 0;
}
-diff -NurpP --minimal linux-3.1.1/kernel/cred.c linux-3.1.1-vs2.3.2/kernel/cred.c
---- linux-3.1.1/kernel/cred.c 2011-10-24 18:45:33.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/kernel/cred.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/kernel/cred.c linux-3.1.6-vs2.3.2.5/kernel/cred.c
+--- linux-3.1.6/kernel/cred.c 2011-10-24 18:45:33.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/kernel/cred.c 2011-10-24 18:53:33.000000000 +0200
@@ -61,31 +61,6 @@ struct cred init_cred = {
#endif
};
EXPORT_SYMBOL(prepare_creds);
/*
-diff -NurpP --minimal linux-3.1.1/kernel/exit.c linux-3.1.1-vs2.3.2/kernel/exit.c
---- linux-3.1.1/kernel/exit.c 2011-10-24 18:45:33.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/kernel/exit.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/kernel/exit.c linux-3.1.6-vs2.3.2.5/kernel/exit.c
+--- linux-3.1.6/kernel/exit.c 2011-10-24 18:45:33.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/kernel/exit.c 2011-10-24 18:53:33.000000000 +0200
@@ -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.1.1/kernel/fork.c linux-3.1.1-vs2.3.2/kernel/fork.c
---- linux-3.1.1/kernel/fork.c 2011-10-24 18:45:33.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/kernel/fork.c 2011-10-24 18:53:33.000000000 +0200
-@@ -66,6 +66,10 @@
+diff -NurpP --minimal linux-3.1.6/kernel/fork.c linux-3.1.6-vs2.3.2.5/kernel/fork.c
+--- linux-3.1.6/kernel/fork.c 2011-10-24 18:45:33.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/kernel/fork.c 2011-12-07 04:19:36.000000000 +0100
+@@ -66,6 +66,9 @@
#include <linux/user-return-notifier.h>
#include <linux/oom.h>
#include <linux/khugepaged.h>
+#include <linux/vs_context.h>
+#include <linux/vs_network.h>
+#include <linux/vs_limit.h>
-+#include <linux/vs_memory.h>
#include <asm/pgtable.h>
#include <asm/pgalloc.h>
-@@ -166,6 +170,8 @@ void free_task(struct task_struct *tsk)
+@@ -166,6 +169,8 @@ void free_task(struct task_struct *tsk)
account_kernel_stack(tsk->stack, -1);
free_thread_info(tsk->stack);
rt_mutex_debug_task_free(tsk);
ftrace_graph_exit_task(tsk);
free_task_struct(tsk);
}
-@@ -506,6 +512,7 @@ static struct mm_struct *mm_init(struct
+@@ -506,6 +511,7 @@ static struct mm_struct *mm_init(struct
if (likely(!mm_alloc_pgd(mm))) {
mm->def_flags = 0;
mmu_notifier_mm_init(mm);
return mm;
}
-@@ -543,6 +550,7 @@ void __mmdrop(struct mm_struct *mm)
+@@ -543,6 +549,7 @@ void __mmdrop(struct mm_struct *mm)
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
VM_BUG_ON(mm->pmd_huge_pte);
#endif
free_mm(mm);
}
EXPORT_SYMBOL_GPL(__mmdrop);
-@@ -730,6 +738,7 @@ struct mm_struct *dup_mm(struct task_str
+@@ -730,6 +737,7 @@ struct mm_struct *dup_mm(struct task_str
goto fail_nomem;
memcpy(mm, oldmm, sizeof(*mm));
mm_init_cpumask(mm);
/* Initializing for Swap token stuff */
-@@ -773,6 +782,7 @@ fail_nocontext:
+@@ -773,6 +781,7 @@ fail_nocontext:
* If init_new_context() failed, we cannot use mmput() to free the mm
* because it calls destroy_context()
*/
mm_free_pgd(mm);
free_mm(mm);
return NULL;
-@@ -1058,6 +1068,8 @@ static struct task_struct *copy_process(
+@@ -1058,6 +1067,8 @@ static struct task_struct *copy_process(
int retval;
struct task_struct *p;
int cgroup_callbacks_done = 0;
if ((clone_flags & (CLONE_NEWNS|CLONE_FS)) == (CLONE_NEWNS|CLONE_FS))
return ERR_PTR(-EINVAL);
-@@ -1104,7 +1116,12 @@ static struct task_struct *copy_process(
+@@ -1104,7 +1115,12 @@ static struct task_struct *copy_process(
DEBUG_LOCKS_WARN_ON(!p->hardirqs_enabled);
DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
#endif
if (atomic_read(&p->real_cred->user->processes) >=
task_rlimit(p, RLIMIT_NPROC)) {
if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE) &&
-@@ -1374,6 +1391,18 @@ static struct task_struct *copy_process(
+@@ -1374,6 +1390,18 @@ static struct task_struct *copy_process(
total_forks++;
spin_unlock(¤t->sighand->siglock);
write_unlock_irq(&tasklist_lock);
proc_fork_connector(p);
cgroup_post_fork(p);
-diff -NurpP --minimal linux-3.1.1/kernel/kthread.c linux-3.1.1-vs2.3.2/kernel/kthread.c
---- linux-3.1.1/kernel/kthread.c 2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/kernel/kthread.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/kernel/kthread.c linux-3.1.6-vs2.3.2.5/kernel/kthread.c
+--- linux-3.1.6/kernel/kthread.c 2011-07-22 11:18:12.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/kernel/kthread.c 2011-10-24 18:53:33.000000000 +0200
@@ -16,6 +16,7 @@
#include <linux/mutex.h>
#include <linux/slab.h>
#include <trace/events/sched.h>
static DEFINE_SPINLOCK(kthread_create_lock);
-diff -NurpP --minimal linux-3.1.1/kernel/nsproxy.c linux-3.1.1-vs2.3.2/kernel/nsproxy.c
---- linux-3.1.1/kernel/nsproxy.c 2011-10-24 18:45:33.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/kernel/nsproxy.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/kernel/nsproxy.c linux-3.1.6-vs2.3.2.5/kernel/nsproxy.c
+--- linux-3.1.6/kernel/nsproxy.c 2011-10-24 18:45:33.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/kernel/nsproxy.c 2011-10-24 18:53:33.000000000 +0200
@@ -20,6 +20,8 @@
#include <linux/mnt_namespace.h>
#include <linux/utsname.h>
return -EPERM;
*new_nsp = create_new_namespaces(unshare_flags, current,
-diff -NurpP --minimal linux-3.1.1/kernel/pid.c linux-3.1.1-vs2.3.2/kernel/pid.c
---- linux-3.1.1/kernel/pid.c 2011-10-24 18:45:33.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/kernel/pid.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/kernel/pid.c linux-3.1.6-vs2.3.2.5/kernel/pid.c
+--- linux-3.1.6/kernel/pid.c 2011-10-24 18:45:33.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/kernel/pid.c 2011-10-24 18:53:33.000000000 +0200
@@ -36,6 +36,7 @@
#include <linux/pid_namespace.h>
#include <linux/init_task.h>
pid_t pid_vnr(struct pid *pid)
{
return pid_nr_ns(pid, current->nsproxy->pid_ns);
-diff -NurpP --minimal linux-3.1.1/kernel/pid_namespace.c linux-3.1.1-vs2.3.2/kernel/pid_namespace.c
---- linux-3.1.1/kernel/pid_namespace.c 2011-05-22 16:17:59.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/kernel/pid_namespace.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/kernel/pid_namespace.c linux-3.1.6-vs2.3.2.5/kernel/pid_namespace.c
+--- linux-3.1.6/kernel/pid_namespace.c 2011-05-22 16:17:59.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/kernel/pid_namespace.c 2011-10-24 18:53:33.000000000 +0200
@@ -15,6 +15,7 @@
#include <linux/acct.h>
#include <linux/slab.h>
kmem_cache_free(pid_ns_cachep, ns);
}
-diff -NurpP --minimal linux-3.1.1/kernel/posix-timers.c linux-3.1.1-vs2.3.2/kernel/posix-timers.c
---- linux-3.1.1/kernel/posix-timers.c 2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/kernel/posix-timers.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/kernel/posix-timers.c linux-3.1.6-vs2.3.2.5/kernel/posix-timers.c
+--- linux-3.1.6/kernel/posix-timers.c 2011-07-22 11:18:12.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/kernel/posix-timers.c 2011-10-24 18:53:33.000000000 +0200
@@ -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.1.1/kernel/printk.c linux-3.1.1-vs2.3.2/kernel/printk.c
---- linux-3.1.1/kernel/printk.c 2011-10-24 18:45:33.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/kernel/printk.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/kernel/printk.c linux-3.1.6-vs2.3.2.5/kernel/printk.c
+--- linux-3.1.6/kernel/printk.c 2011-10-24 18:45:33.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/kernel/printk.c 2011-10-24 18:53:33.000000000 +0200
@@ -41,6 +41,7 @@
#include <linux/cpu.h>
#include <linux/notifier.h>
count = len;
if (count > log_buf_len)
count = log_buf_len;
-diff -NurpP --minimal linux-3.1.1/kernel/ptrace.c linux-3.1.1-vs2.3.2/kernel/ptrace.c
---- linux-3.1.1/kernel/ptrace.c 2011-10-24 18:45:33.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/kernel/ptrace.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/kernel/ptrace.c linux-3.1.6-vs2.3.2.5/kernel/ptrace.c
+--- linux-3.1.6/kernel/ptrace.c 2011-10-24 18:45:33.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/kernel/ptrace.c 2011-10-24 18:53:33.000000000 +0200
@@ -22,6 +22,7 @@
#include <linux/syscalls.h>
#include <linux/uaccess.h>
return security_ptrace_access_check(task, mode);
}
-diff -NurpP --minimal linux-3.1.1/kernel/sched.c linux-3.1.1-vs2.3.2/kernel/sched.c
---- linux-3.1.1/kernel/sched.c 2011-10-24 18:45:33.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/kernel/sched.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/kernel/sched.c linux-3.1.6-vs2.3.2.5/kernel/sched.c
+--- linux-3.1.6/kernel/sched.c 2011-10-24 18:45:33.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/kernel/sched.c 2011-10-24 18:53:33.000000000 +0200
@@ -71,6 +71,8 @@
#include <linux/ctype.h>
#include <linux/ftrace.h>
retval = security_task_setnice(current, nice);
if (retval)
-diff -NurpP --minimal linux-3.1.1/kernel/sched_fair.c linux-3.1.1-vs2.3.2/kernel/sched_fair.c
---- linux-3.1.1/kernel/sched_fair.c 2011-10-24 18:45:33.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/kernel/sched_fair.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/kernel/sched_fair.c linux-3.1.6-vs2.3.2.5/kernel/sched_fair.c
+--- linux-3.1.6/kernel/sched_fair.c 2011-10-24 18:45:33.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/kernel/sched_fair.c 2011-10-24 18:53:33.000000000 +0200
@@ -979,6 +979,8 @@ enqueue_entity(struct cfs_rq *cfs_rq, st
__enqueue_entity(cfs_rq, se);
se->on_rq = 1;
update_cfs_load(cfs_rq, 0);
account_entity_dequeue(cfs_rq, se);
-diff -NurpP --minimal linux-3.1.1/kernel/signal.c linux-3.1.1-vs2.3.2/kernel/signal.c
---- linux-3.1.1/kernel/signal.c 2011-10-24 18:45:33.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/kernel/signal.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/kernel/signal.c linux-3.1.6-vs2.3.2.5/kernel/signal.c
+--- linux-3.1.6/kernel/signal.c 2011-10-24 18:45:33.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/kernel/signal.c 2011-10-24 18:53:33.000000000 +0200
@@ -28,6 +28,8 @@
#include <linux/freezer.h>
#include <linux/pid_namespace.h>
if (sig_kernel_stop(signr)) {
/*
* The default action is to stop all threads in
-diff -NurpP --minimal linux-3.1.1/kernel/softirq.c linux-3.1.1-vs2.3.2/kernel/softirq.c
---- linux-3.1.1/kernel/softirq.c 2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/kernel/softirq.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/kernel/softirq.c linux-3.1.6-vs2.3.2.5/kernel/softirq.c
+--- linux-3.1.6/kernel/softirq.c 2011-07-22 11:18:12.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/kernel/softirq.c 2011-10-24 18:53:33.000000000 +0200
@@ -24,6 +24,7 @@
#include <linux/ftrace.h>
#include <linux/smp.h>
#define CREATE_TRACE_POINTS
#include <trace/events/irq.h>
-diff -NurpP --minimal linux-3.1.1/kernel/sys.c linux-3.1.1-vs2.3.2/kernel/sys.c
---- linux-3.1.1/kernel/sys.c 2011-10-24 18:45:33.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/kernel/sys.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/kernel/sys.c linux-3.1.6-vs2.3.2.5/kernel/sys.c
+--- linux-3.1.6/kernel/sys.c 2011-10-24 18:45:33.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/kernel/sys.c 2011-10-24 18:53:33.000000000 +0200
@@ -44,6 +44,7 @@
#include <linux/syscalls.h>
#include <linux/kprobes.h>
return 0;
return -EPERM;
-diff -NurpP --minimal linux-3.1.1/kernel/sysctl.c linux-3.1.1-vs2.3.2/kernel/sysctl.c
---- linux-3.1.1/kernel/sysctl.c 2011-10-24 18:45:33.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/kernel/sysctl.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/kernel/sysctl.c linux-3.1.6-vs2.3.2.5/kernel/sysctl.c
+--- linux-3.1.6/kernel/sysctl.c 2011-10-24 18:45:33.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/kernel/sysctl.c 2011-10-24 18:53:33.000000000 +0200
@@ -75,6 +75,7 @@
#if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_LOCK_STAT)
#include <linux/lockdep.h>
#ifdef CONFIG_CHR_DEV_SG
{
.procname = "sg-big-buff",
-diff -NurpP --minimal linux-3.1.1/kernel/sysctl_binary.c linux-3.1.1-vs2.3.2/kernel/sysctl_binary.c
---- linux-3.1.1/kernel/sysctl_binary.c 2011-10-24 18:45:33.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/kernel/sysctl_binary.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/kernel/sysctl_binary.c linux-3.1.6-vs2.3.2.5/kernel/sysctl_binary.c
+--- linux-3.1.6/kernel/sysctl_binary.c 2011-10-24 18:45:33.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/kernel/sysctl_binary.c 2011-10-24 18:53:33.000000000 +0200
@@ -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.1.1/kernel/time/timekeeping.c linux-3.1.1-vs2.3.2/kernel/time/timekeeping.c
---- linux-3.1.1/kernel/time/timekeeping.c 2011-10-24 18:45:33.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/kernel/time/timekeeping.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/kernel/time/timekeeping.c linux-3.1.6-vs2.3.2.5/kernel/time/timekeeping.c
+--- linux-3.1.6/kernel/time/timekeeping.c 2011-12-23 16:04:07.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/kernel/time/timekeeping.c 2011-12-15 01:07:58.000000000 +0100
@@ -233,6 +233,7 @@ void getnstimeofday(struct timespec *ts)
} while (read_seqretry(&xtime_lock, seq));
}
EXPORT_SYMBOL(getnstimeofday);
-diff -NurpP --minimal linux-3.1.1/kernel/time.c linux-3.1.1-vs2.3.2/kernel/time.c
---- linux-3.1.1/kernel/time.c 2011-11-15 16:44:52.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/kernel/time.c 2011-11-15 17:08:44.000000000 +0100
+diff -NurpP --minimal linux-3.1.6/kernel/time.c linux-3.1.6-vs2.3.2.5/kernel/time.c
+--- linux-3.1.6/kernel/time.c 2011-12-23 16:04:07.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/kernel/time.c 2011-11-15 17:08:44.000000000 +0100
@@ -92,7 +92,7 @@ SYSCALL_DEFINE1(stime, time_t __user *,
if (err)
return err;
}
return 0;
}
-diff -NurpP --minimal linux-3.1.1/kernel/timer.c linux-3.1.1-vs2.3.2/kernel/timer.c
---- linux-3.1.1/kernel/timer.c 2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/kernel/timer.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/kernel/timer.c linux-3.1.6-vs2.3.2.5/kernel/timer.c
+--- linux-3.1.6/kernel/timer.c 2011-07-22 11:18:12.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/kernel/timer.c 2011-10-24 18:53:33.000000000 +0200
@@ -40,6 +40,10 @@
#include <linux/irq_work.h>
#include <linux/sched.h>
SYSCALL_DEFINE0(getuid)
{
/* Only we change this so SMP safe */
-diff -NurpP --minimal linux-3.1.1/kernel/user_namespace.c linux-3.1.1-vs2.3.2/kernel/user_namespace.c
---- linux-3.1.1/kernel/user_namespace.c 2011-03-15 18:07:42.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/kernel/user_namespace.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/kernel/user_namespace.c linux-3.1.6-vs2.3.2.5/kernel/user_namespace.c
+--- linux-3.1.6/kernel/user_namespace.c 2011-03-15 18:07:42.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/kernel/user_namespace.c 2011-10-24 18:53:33.000000000 +0200
@@ -11,6 +11,7 @@
#include <linux/user_namespace.h>
#include <linux/highuid.h>
INIT_WORK(&ns->destroyer, free_user_ns_work);
schedule_work(&ns->destroyer);
}
-diff -NurpP --minimal linux-3.1.1/kernel/utsname.c linux-3.1.1-vs2.3.2/kernel/utsname.c
---- linux-3.1.1/kernel/utsname.c 2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/kernel/utsname.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/kernel/utsname.c linux-3.1.6-vs2.3.2.5/kernel/utsname.c
+--- linux-3.1.6/kernel/utsname.c 2011-07-22 11:18:12.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/kernel/utsname.c 2011-10-24 18:53:33.000000000 +0200
@@ -16,14 +16,17 @@
#include <linux/slab.h>
#include <linux/user_namespace.h>
kfree(ns);
}
-diff -NurpP --minimal linux-3.1.1/kernel/vserver/Kconfig linux-3.1.1-vs2.3.2/kernel/vserver/Kconfig
---- linux-3.1.1/kernel/vserver/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/kernel/vserver/Kconfig 2011-10-24 18:53:33.000000000 +0200
-@@ -0,0 +1,232 @@
+diff -NurpP --minimal linux-3.1.6/kernel/vserver/Kconfig linux-3.1.6-vs2.3.2.5/kernel/vserver/Kconfig
+--- linux-3.1.6/kernel/vserver/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/kernel/vserver/Kconfig 2011-12-07 05:08:42.000000000 +0100
+@@ -0,0 +1,224 @@
+#
+# Linux VServer configuration
+#
+ This allows you to specify the number of entries in
+ the per-CPU history buffer.
+
-+config VSERVER_LEGACY_MEM
-+ bool "Legacy Memory Limits"
-+ default n
-+ help
-+ This provides fake memory limits to keep
-+ older tools happy in the face of memory
-+ cgroups
-+
+choice
+ prompt "Quotes used in debug and warn messages"
+ default QUOTES_ISO8859
+ bool
+ default n
+
-diff -NurpP --minimal linux-3.1.1/kernel/vserver/Makefile linux-3.1.1-vs2.3.2/kernel/vserver/Makefile
---- linux-3.1.1/kernel/vserver/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/kernel/vserver/Makefile 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/kernel/vserver/Makefile linux-3.1.6-vs2.3.2.5/kernel/vserver/Makefile
+--- linux-3.1.6/kernel/vserver/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/kernel/vserver/Makefile 2011-10-24 18:53:33.000000000 +0200
@@ -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.1.1/kernel/vserver/cacct.c linux-3.1.1-vs2.3.2/kernel/vserver/cacct.c
---- linux-3.1.1/kernel/vserver/cacct.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/kernel/vserver/cacct.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/kernel/vserver/cacct.c linux-3.1.6-vs2.3.2.5/kernel/vserver/cacct.c
+--- linux-3.1.6/kernel/vserver/cacct.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/kernel/vserver/cacct.c 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,42 @@
+/*
+ * linux/kernel/vserver/cacct.c
+ return 0;
+}
+
-diff -NurpP --minimal linux-3.1.1/kernel/vserver/cacct_init.h linux-3.1.1-vs2.3.2/kernel/vserver/cacct_init.h
---- linux-3.1.1/kernel/vserver/cacct_init.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/kernel/vserver/cacct_init.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/kernel/vserver/cacct_init.h linux-3.1.6-vs2.3.2.5/kernel/vserver/cacct_init.h
+--- linux-3.1.6/kernel/vserver/cacct_init.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/kernel/vserver/cacct_init.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,25 @@
+
+
+ return;
+}
+
-diff -NurpP --minimal linux-3.1.1/kernel/vserver/cacct_proc.h linux-3.1.1-vs2.3.2/kernel/vserver/cacct_proc.h
---- linux-3.1.1/kernel/vserver/cacct_proc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/kernel/vserver/cacct_proc.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/kernel/vserver/cacct_proc.h linux-3.1.6-vs2.3.2.5/kernel/vserver/cacct_proc.h
+--- linux-3.1.6/kernel/vserver/cacct_proc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/kernel/vserver/cacct_proc.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,53 @@
+#ifndef _VX_CACCT_PROC_H
+#define _VX_CACCT_PROC_H
+}
+
+#endif /* _VX_CACCT_PROC_H */
-diff -NurpP --minimal linux-3.1.1/kernel/vserver/context.c linux-3.1.1-vs2.3.2/kernel/vserver/context.c
---- linux-3.1.1/kernel/vserver/context.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/kernel/vserver/context.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/kernel/vserver/context.c linux-3.1.6-vs2.3.2.5/kernel/vserver/context.c
+--- linux-3.1.6/kernel/vserver/context.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/kernel/vserver/context.c 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,1107 @@
+/*
+ * linux/kernel/vserver/context.c
+
+EXPORT_SYMBOL_GPL(free_vx_info);
+
-diff -NurpP --minimal linux-3.1.1/kernel/vserver/cvirt.c linux-3.1.1-vs2.3.2/kernel/vserver/cvirt.c
---- linux-3.1.1/kernel/vserver/cvirt.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/kernel/vserver/cvirt.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/kernel/vserver/cvirt.c linux-3.1.6-vs2.3.2.5/kernel/vserver/cvirt.c
+--- linux-3.1.6/kernel/vserver/cvirt.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/kernel/vserver/cvirt.c 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,303 @@
+/*
+ * linux/kernel/vserver/cvirt.c
+
+#endif
+
-diff -NurpP --minimal linux-3.1.1/kernel/vserver/cvirt_init.h linux-3.1.1-vs2.3.2/kernel/vserver/cvirt_init.h
---- linux-3.1.1/kernel/vserver/cvirt_init.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/kernel/vserver/cvirt_init.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/kernel/vserver/cvirt_init.h linux-3.1.6-vs2.3.2.5/kernel/vserver/cvirt_init.h
+--- linux-3.1.6/kernel/vserver/cvirt_init.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/kernel/vserver/cvirt_init.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,70 @@
+
+
+ return;
+}
+
-diff -NurpP --minimal linux-3.1.1/kernel/vserver/cvirt_proc.h linux-3.1.1-vs2.3.2/kernel/vserver/cvirt_proc.h
---- linux-3.1.1/kernel/vserver/cvirt_proc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/kernel/vserver/cvirt_proc.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/kernel/vserver/cvirt_proc.h linux-3.1.6-vs2.3.2.5/kernel/vserver/cvirt_proc.h
+--- linux-3.1.6/kernel/vserver/cvirt_proc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/kernel/vserver/cvirt_proc.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,135 @@
+#ifndef _VX_CVIRT_PROC_H
+#define _VX_CVIRT_PROC_H
+}
+
+#endif /* _VX_CVIRT_PROC_H */
-diff -NurpP --minimal linux-3.1.1/kernel/vserver/debug.c linux-3.1.1-vs2.3.2/kernel/vserver/debug.c
---- linux-3.1.1/kernel/vserver/debug.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/kernel/vserver/debug.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/kernel/vserver/debug.c linux-3.1.6-vs2.3.2.5/kernel/vserver/debug.c
+--- linux-3.1.6/kernel/vserver/debug.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/kernel/vserver/debug.c 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,32 @@
+/*
+ * kernel/vserver/debug.c
+
+EXPORT_SYMBOL_GPL(dump_vx_info);
+
-diff -NurpP --minimal linux-3.1.1/kernel/vserver/device.c linux-3.1.1-vs2.3.2/kernel/vserver/device.c
---- linux-3.1.1/kernel/vserver/device.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/kernel/vserver/device.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/kernel/vserver/device.c linux-3.1.6-vs2.3.2.5/kernel/vserver/device.c
+--- linux-3.1.6/kernel/vserver/device.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/kernel/vserver/device.c 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,443 @@
+/*
+ * linux/kernel/vserver/device.c
+#endif /* CONFIG_COMPAT */
+
+
-diff -NurpP --minimal linux-3.1.1/kernel/vserver/dlimit.c linux-3.1.1-vs2.3.2/kernel/vserver/dlimit.c
---- linux-3.1.1/kernel/vserver/dlimit.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/kernel/vserver/dlimit.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/kernel/vserver/dlimit.c linux-3.1.6-vs2.3.2.5/kernel/vserver/dlimit.c
+--- linux-3.1.6/kernel/vserver/dlimit.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/kernel/vserver/dlimit.c 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,531 @@
+/*
+ * linux/kernel/vserver/dlimit.c
+EXPORT_SYMBOL_GPL(locate_dl_info);
+EXPORT_SYMBOL_GPL(rcu_free_dl_info);
+
-diff -NurpP --minimal linux-3.1.1/kernel/vserver/helper.c linux-3.1.1-vs2.3.2/kernel/vserver/helper.c
---- linux-3.1.1/kernel/vserver/helper.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/kernel/vserver/helper.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/kernel/vserver/helper.c linux-3.1.6-vs2.3.2.5/kernel/vserver/helper.c
+--- linux-3.1.6/kernel/vserver/helper.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/kernel/vserver/helper.c 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,223 @@
+/*
+ * linux/kernel/vserver/helper.c
+ return do_vshelper(vshelper_path, argv, envp, 1);
+}
+
-diff -NurpP --minimal linux-3.1.1/kernel/vserver/history.c linux-3.1.1-vs2.3.2/kernel/vserver/history.c
---- linux-3.1.1/kernel/vserver/history.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/kernel/vserver/history.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/kernel/vserver/history.c linux-3.1.6-vs2.3.2.5/kernel/vserver/history.c
+--- linux-3.1.6/kernel/vserver/history.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/kernel/vserver/history.c 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,258 @@
+/*
+ * kernel/vserver/history.c
+
+#endif /* CONFIG_COMPAT */
+
-diff -NurpP --minimal linux-3.1.1/kernel/vserver/inet.c linux-3.1.1-vs2.3.2/kernel/vserver/inet.c
---- linux-3.1.1/kernel/vserver/inet.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/kernel/vserver/inet.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/kernel/vserver/inet.c linux-3.1.6-vs2.3.2.5/kernel/vserver/inet.c
+--- linux-3.1.6/kernel/vserver/inet.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/kernel/vserver/inet.c 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,225 @@
+
+#include <linux/in.h>
+
+EXPORT_SYMBOL_GPL(ip_v4_find_src);
+
-diff -NurpP --minimal linux-3.1.1/kernel/vserver/init.c linux-3.1.1-vs2.3.2/kernel/vserver/init.c
---- linux-3.1.1/kernel/vserver/init.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/kernel/vserver/init.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/kernel/vserver/init.c linux-3.1.6-vs2.3.2.5/kernel/vserver/init.c
+--- linux-3.1.6/kernel/vserver/init.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/kernel/vserver/init.c 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,45 @@
+/*
+ * linux/kernel/init.c
+module_init(init_vserver);
+module_exit(exit_vserver);
+
-diff -NurpP --minimal linux-3.1.1/kernel/vserver/inode.c linux-3.1.1-vs2.3.2/kernel/vserver/inode.c
---- linux-3.1.1/kernel/vserver/inode.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/kernel/vserver/inode.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/kernel/vserver/inode.c linux-3.1.6-vs2.3.2.5/kernel/vserver/inode.c
+--- linux-3.1.6/kernel/vserver/inode.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/kernel/vserver/inode.c 2011-12-06 23:58:02.000000000 +0100
@@ -0,0 +1,437 @@
+/*
+ * linux/kernel/vserver/inode.c
+ substring_t args[MAX_OPT_ARGS];
+ int token;
+ char *s, *p, *opts;
-+#if defined(CONFIG_PROPAGATE) || defined(CONFIG_VSERVER_WARN)
++#if defined(CONFIG_PROPAGATE) || defined(CONFIG_VSERVER_DEBUG)
+ int option = 0;
+#endif
+
+ *mnt_flags |= MNT_TAGID;
+ set |= MNT_TAGID;
+ break;
-+#endif
++#endif /* CONFIG_PROPAGATE */
+ case Opt_notagcheck:
+ if (remove)
+ __dx_parse_remove(s, "notagcheck");
+
+#endif /* CONFIG_PROPAGATE */
+
-diff -NurpP --minimal linux-3.1.1/kernel/vserver/limit.c linux-3.1.1-vs2.3.2/kernel/vserver/limit.c
---- linux-3.1.1/kernel/vserver/limit.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/kernel/vserver/limit.c 2011-10-24 18:53:33.000000000 +0200
-@@ -0,0 +1,360 @@
+diff -NurpP --minimal linux-3.1.6/kernel/vserver/limit.c linux-3.1.6-vs2.3.2.5/kernel/vserver/limit.c
+--- linux-3.1.6/kernel/vserver/limit.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/kernel/vserver/limit.c 2011-12-07 05:08:10.000000000 +0100
+@@ -0,0 +1,330 @@
+/*
+ * linux/kernel/vserver/limit.c
+ *
+
+
+const char *vlimit_name[NUM_LIMITS] = {
-+#ifdef CONFIG_VSERVER_LEGACY_MEM
-+ [RLIMIT_RSS] = "RSS",
-+ [RLIMIT_AS] = "VM",
-+#endif /* CONFIG_VSERVER_LEGACY_MEM */
+ [RLIMIT_CPU] = "CPU",
+ [RLIMIT_NPROC] = "NPROC",
+ [RLIMIT_NOFILE] = "NOFILE",
+ /* minimum */
+ 0
+ , /* softlimit */
-+#ifdef CONFIG_VSERVER_LEGACY_MEM
-+ MASK_ENTRY( RLIMIT_RSS ) |
-+#endif /* CONFIG_VSERVER_LEGACY_MEM */
+ 0
+ , /* maximum */
-+#ifdef CONFIG_VSERVER_LEGACY_MEM
-+ MASK_ENTRY( RLIMIT_RSS ) |
-+ MASK_ENTRY( RLIMIT_AS ) |
-+#endif /* CONFIG_VSERVER_LEGACY_MEM */
+ MASK_ENTRY( RLIMIT_NPROC ) |
+ MASK_ENTRY( RLIMIT_NOFILE ) |
+ MASK_ENTRY( RLIMIT_LOCKS ) |
+#endif
+}
+
-+
-+unsigned long vx_badness(struct task_struct *task, struct mm_struct *mm)
-+{
-+ struct vx_info *vxi = mm->mm_vx_info;
-+ unsigned long points;
-+ rlim_t v, w;
-+
-+ if (!vxi)
-+ return 0;
-+
-+ points = vxi->vx_badness_bias;
-+
-+ v = __vx_cres_array_fixup(&vxi->limit, VLA_RSS);
-+ w = __rlim_soft(&vxi->limit, RLIMIT_RSS);
-+ points += (v > w) ? (v - w) : 0;
-+
-+ return points;
-+}
-+
-diff -NurpP --minimal linux-3.1.1/kernel/vserver/limit_init.h linux-3.1.1-vs2.3.2/kernel/vserver/limit_init.h
---- linux-3.1.1/kernel/vserver/limit_init.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/kernel/vserver/limit_init.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/kernel/vserver/limit_init.h linux-3.1.6-vs2.3.2.5/kernel/vserver/limit_init.h
+--- linux-3.1.6/kernel/vserver/limit_init.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/kernel/vserver/limit_init.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,31 @@
+
+
+ }
+}
+
-diff -NurpP --minimal linux-3.1.1/kernel/vserver/limit_proc.h linux-3.1.1-vs2.3.2/kernel/vserver/limit_proc.h
---- linux-3.1.1/kernel/vserver/limit_proc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/kernel/vserver/limit_proc.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/kernel/vserver/limit_proc.h linux-3.1.6-vs2.3.2.5/kernel/vserver/limit_proc.h
+--- linux-3.1.6/kernel/vserver/limit_proc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/kernel/vserver/limit_proc.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,57 @@
+#ifndef _VX_LIMIT_PROC_H
+#define _VX_LIMIT_PROC_H
+#endif /* _VX_LIMIT_PROC_H */
+
+
-diff -NurpP --minimal linux-3.1.1/kernel/vserver/network.c linux-3.1.1-vs2.3.2/kernel/vserver/network.c
---- linux-3.1.1/kernel/vserver/network.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/kernel/vserver/network.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/kernel/vserver/network.c linux-3.1.6-vs2.3.2.5/kernel/vserver/network.c
+--- linux-3.1.6/kernel/vserver/network.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/kernel/vserver/network.c 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,912 @@
+/*
+ * linux/kernel/vserver/network.c
+EXPORT_SYMBOL_GPL(free_nx_info);
+EXPORT_SYMBOL_GPL(unhash_nx_info);
+
-diff -NurpP --minimal linux-3.1.1/kernel/vserver/proc.c linux-3.1.1-vs2.3.2/kernel/vserver/proc.c
---- linux-3.1.1/kernel/vserver/proc.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/kernel/vserver/proc.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/kernel/vserver/proc.c linux-3.1.6-vs2.3.2.5/kernel/vserver/proc.c
+--- linux-3.1.6/kernel/vserver/proc.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/kernel/vserver/proc.c 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,1103 @@
+/*
+ * linux/kernel/vserver/proc.c
+ return buffer - orig;
+}
+
-diff -NurpP --minimal linux-3.1.1/kernel/vserver/sched.c linux-3.1.1-vs2.3.2/kernel/vserver/sched.c
---- linux-3.1.1/kernel/vserver/sched.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/kernel/vserver/sched.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/kernel/vserver/sched.c linux-3.1.6-vs2.3.2.5/kernel/vserver/sched.c
+--- linux-3.1.6/kernel/vserver/sched.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/kernel/vserver/sched.c 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,82 @@
+/*
+ * linux/kernel/vserver/sched.c
+ return 0;
+}
+
-diff -NurpP --minimal linux-3.1.1/kernel/vserver/sched_init.h linux-3.1.1-vs2.3.2/kernel/vserver/sched_init.h
---- linux-3.1.1/kernel/vserver/sched_init.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/kernel/vserver/sched_init.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/kernel/vserver/sched_init.h linux-3.1.6-vs2.3.2.5/kernel/vserver/sched_init.h
+--- linux-3.1.6/kernel/vserver/sched_init.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/kernel/vserver/sched_init.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,27 @@
+
+static inline void vx_info_init_sched(struct _vx_sched *sched)
+{
+ return;
+}
-diff -NurpP --minimal linux-3.1.1/kernel/vserver/sched_proc.h linux-3.1.1-vs2.3.2/kernel/vserver/sched_proc.h
---- linux-3.1.1/kernel/vserver/sched_proc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/kernel/vserver/sched_proc.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/kernel/vserver/sched_proc.h linux-3.1.6-vs2.3.2.5/kernel/vserver/sched_proc.h
+--- linux-3.1.6/kernel/vserver/sched_proc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/kernel/vserver/sched_proc.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,32 @@
+#ifndef _VX_SCHED_PROC_H
+#define _VX_SCHED_PROC_H
+}
+
+#endif /* _VX_SCHED_PROC_H */
-diff -NurpP --minimal linux-3.1.1/kernel/vserver/signal.c linux-3.1.1-vs2.3.2/kernel/vserver/signal.c
---- linux-3.1.1/kernel/vserver/signal.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/kernel/vserver/signal.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/kernel/vserver/signal.c linux-3.1.6-vs2.3.2.5/kernel/vserver/signal.c
+--- linux-3.1.6/kernel/vserver/signal.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/kernel/vserver/signal.c 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,134 @@
+/*
+ * linux/kernel/vserver/signal.c
+ return ret;
+}
+
-diff -NurpP --minimal linux-3.1.1/kernel/vserver/space.c linux-3.1.1-vs2.3.2/kernel/vserver/space.c
---- linux-3.1.1/kernel/vserver/space.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/kernel/vserver/space.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/kernel/vserver/space.c linux-3.1.6-vs2.3.2.5/kernel/vserver/space.c
+--- linux-3.1.6/kernel/vserver/space.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/kernel/vserver/space.c 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,435 @@
+/*
+ * linux/kernel/vserver/space.c
+ return 0;
+}
+
-diff -NurpP --minimal linux-3.1.1/kernel/vserver/switch.c linux-3.1.1-vs2.3.2/kernel/vserver/switch.c
---- linux-3.1.1/kernel/vserver/switch.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/kernel/vserver/switch.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/kernel/vserver/switch.c linux-3.1.6-vs2.3.2.5/kernel/vserver/switch.c
+--- linux-3.1.6/kernel/vserver/switch.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/kernel/vserver/switch.c 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,556 @@
+/*
+ * linux/kernel/vserver/switch.c
+}
+
+#endif /* CONFIG_COMPAT */
-diff -NurpP --minimal linux-3.1.1/kernel/vserver/sysctl.c linux-3.1.1-vs2.3.2/kernel/vserver/sysctl.c
---- linux-3.1.1/kernel/vserver/sysctl.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/kernel/vserver/sysctl.c 2011-10-24 18:53:33.000000000 +0200
-@@ -0,0 +1,241 @@
+diff -NurpP --minimal linux-3.1.6/kernel/vserver/sysctl.c linux-3.1.6-vs2.3.2.5/kernel/vserver/sysctl.c
+--- linux-3.1.6/kernel/vserver/sysctl.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/kernel/vserver/sysctl.c 2011-11-18 00:40:25.000000000 +0100
+@@ -0,0 +1,247 @@
+/*
+ * kernel/vserver/sysctl.c
+ *
+ CTL_DEBUG_QUOTA,
+ CTL_DEBUG_CVIRT,
+ CTL_DEBUG_SPACE,
++ CTL_DEBUG_PERM,
+ CTL_DEBUG_MISC,
+};
+
+
-+unsigned int vx_debug_switch = 0;
-+unsigned int vx_debug_xid = 0;
-+unsigned int vx_debug_nid = 0;
-+unsigned int vx_debug_tag = 0;
-+unsigned int vx_debug_net = 0;
-+unsigned int vx_debug_limit = 0;
-+unsigned int vx_debug_cres = 0;
-+unsigned int vx_debug_dlim = 0;
-+unsigned int vx_debug_quota = 0;
-+unsigned int vx_debug_cvirt = 0;
-+unsigned int vx_debug_space = 0;
-+unsigned int vx_debug_misc = 0;
++unsigned int vs_debug_switch = 0;
++unsigned int vs_debug_xid = 0;
++unsigned int vs_debug_nid = 0;
++unsigned int vs_debug_tag = 0;
++unsigned int vs_debug_net = 0;
++unsigned int vs_debug_limit = 0;
++unsigned int vs_debug_cres = 0;
++unsigned int vs_debug_dlim = 0;
++unsigned int vs_debug_quota = 0;
++unsigned int vs_debug_cvirt = 0;
++unsigned int vs_debug_space = 0;
++unsigned int vs_debug_perm = 0;
++unsigned int vs_debug_misc = 0;
+
+
+static struct ctl_table_header *vserver_table_header;
+#define CTL_ENTRY(ctl, name) \
+ { \
+ .procname = #name, \
-+ .data = &vx_ ## name, \
++ .data = &vs_ ## name, \
+ .maxlen = sizeof(int), \
+ .mode = 0644, \
+ .proc_handler = &proc_dodebug, \
+ CTL_ENTRY(CTL_DEBUG_QUOTA, debug_quota),
+ CTL_ENTRY(CTL_DEBUG_CVIRT, debug_cvirt),
+ CTL_ENTRY(CTL_DEBUG_SPACE, debug_space),
++ CTL_ENTRY(CTL_DEBUG_PERM, debug_perm),
+ CTL_ENTRY(CTL_DEBUG_MISC, debug_misc),
+ { 0 }
+};
+ { CTL_DEBUG_QUOTA, "quota=%x" },
+ { CTL_DEBUG_CVIRT, "cvirt=%x" },
+ { CTL_DEBUG_SPACE, "space=%x" },
++ { CTL_DEBUG_PERM, "perm=%x" },
+ { CTL_DEBUG_MISC, "misc=%x" },
+ { CTL_DEBUG_ERROR, NULL }
+};
+
+#define HANDLE_CASE(id, name, val) \
+ case CTL_DEBUG_ ## id: \
-+ vx_debug_ ## name = val; \
++ vs_debug_ ## name = val; \
+ printk("vs_debug_" #name "=0x%x\n", val); \
+ break
+
+ HANDLE_CASE(QUOTA, quota, value);
+ HANDLE_CASE(CVIRT, cvirt, value);
+ HANDLE_CASE(SPACE, space, value);
++ HANDLE_CASE(PERM, perm, value);
+ HANDLE_CASE(MISC, misc, value);
+ default:
+ return -EINVAL;
+
+
+
-+EXPORT_SYMBOL_GPL(vx_debug_switch);
-+EXPORT_SYMBOL_GPL(vx_debug_xid);
-+EXPORT_SYMBOL_GPL(vx_debug_nid);
-+EXPORT_SYMBOL_GPL(vx_debug_net);
-+EXPORT_SYMBOL_GPL(vx_debug_limit);
-+EXPORT_SYMBOL_GPL(vx_debug_cres);
-+EXPORT_SYMBOL_GPL(vx_debug_dlim);
-+EXPORT_SYMBOL_GPL(vx_debug_quota);
-+EXPORT_SYMBOL_GPL(vx_debug_cvirt);
-+EXPORT_SYMBOL_GPL(vx_debug_space);
-+EXPORT_SYMBOL_GPL(vx_debug_misc);
++EXPORT_SYMBOL_GPL(vs_debug_switch);
++EXPORT_SYMBOL_GPL(vs_debug_xid);
++EXPORT_SYMBOL_GPL(vs_debug_nid);
++EXPORT_SYMBOL_GPL(vs_debug_net);
++EXPORT_SYMBOL_GPL(vs_debug_limit);
++EXPORT_SYMBOL_GPL(vs_debug_cres);
++EXPORT_SYMBOL_GPL(vs_debug_dlim);
++EXPORT_SYMBOL_GPL(vs_debug_quota);
++EXPORT_SYMBOL_GPL(vs_debug_cvirt);
++EXPORT_SYMBOL_GPL(vs_debug_space);
++EXPORT_SYMBOL_GPL(vs_debug_perm);
++EXPORT_SYMBOL_GPL(vs_debug_misc);
+
-diff -NurpP --minimal linux-3.1.1/kernel/vserver/tag.c linux-3.1.1-vs2.3.2/kernel/vserver/tag.c
---- linux-3.1.1/kernel/vserver/tag.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/kernel/vserver/tag.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/kernel/vserver/tag.c linux-3.1.6-vs2.3.2.5/kernel/vserver/tag.c
+--- linux-3.1.6/kernel/vserver/tag.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/kernel/vserver/tag.c 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,63 @@
+/*
+ * linux/kernel/vserver/tag.c
+}
+
+
-diff -NurpP --minimal linux-3.1.1/kernel/vserver/vci_config.h linux-3.1.1-vs2.3.2/kernel/vserver/vci_config.h
---- linux-3.1.1/kernel/vserver/vci_config.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/kernel/vserver/vci_config.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/kernel/vserver/vci_config.h linux-3.1.6-vs2.3.2.5/kernel/vserver/vci_config.h
+--- linux-3.1.6/kernel/vserver/vci_config.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/kernel/vserver/vci_config.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,76 @@
+
+/* interface version */
+ 0;
+}
+
-diff -NurpP --minimal linux-3.1.1/mm/filemap_xip.c linux-3.1.1-vs2.3.2/mm/filemap_xip.c
---- linux-3.1.1/mm/filemap_xip.c 2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/mm/filemap_xip.c 2011-10-24 18:53:33.000000000 +0200
-@@ -18,6 +18,7 @@
- #include <linux/seqlock.h>
- #include <linux/mutex.h>
- #include <linux/gfp.h>
-+#include <linux/vs_memory.h>
- #include <asm/tlbflush.h>
- #include <asm/io.h>
-
-diff -NurpP --minimal linux-3.1.1/mm/fremap.c linux-3.1.1-vs2.3.2/mm/fremap.c
---- linux-3.1.1/mm/fremap.c 2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/mm/fremap.c 2011-10-24 18:53:33.000000000 +0200
-@@ -16,6 +16,7 @@
- #include <linux/module.h>
- #include <linux/syscalls.h>
- #include <linux/mmu_notifier.h>
-+#include <linux/vs_memory.h>
-
- #include <asm/mmu_context.h>
- #include <asm/cacheflush.h>
-diff -NurpP --minimal linux-3.1.1/mm/hugetlb.c linux-3.1.1-vs2.3.2/mm/hugetlb.c
---- linux-3.1.1/mm/hugetlb.c 2011-10-24 18:45:33.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/mm/hugetlb.c 2011-10-24 18:53:33.000000000 +0200
-@@ -28,6 +28,7 @@
-
- #include <linux/hugetlb.h>
- #include <linux/node.h>
-+#include <linux/vs_memory.h>
- #include "internal.h"
-
- const unsigned long hugetlb_zero = 0, hugetlb_infinity = ~0UL;
-diff -NurpP --minimal linux-3.1.1/mm/memcontrol.c linux-3.1.1-vs2.3.2/mm/memcontrol.c
---- linux-3.1.1/mm/memcontrol.c 2011-10-24 18:45:33.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/mm/memcontrol.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/mm/memcontrol.c linux-3.1.6-vs2.3.2.5/mm/memcontrol.c
+--- linux-3.1.6/mm/memcontrol.c 2011-10-24 18:45:33.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/mm/memcontrol.c 2011-10-24 18:53:33.000000000 +0200
@@ -760,6 +760,31 @@ struct mem_cgroup *mem_cgroup_from_task(
struct mem_cgroup, css);
}
struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm)
{
struct mem_cgroup *mem = NULL;
-diff -NurpP --minimal linux-3.1.1/mm/memory.c linux-3.1.1-vs2.3.2/mm/memory.c
---- linux-3.1.1/mm/memory.c 2011-11-15 16:44:52.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/mm/memory.c 2011-11-15 17:08:44.000000000 +0100
-@@ -3389,6 +3389,7 @@ int handle_pte_fault(struct mm_struct *m
- {
- pte_t entry;
- spinlock_t *ptl;
-+ int ret = 0, type = VXPT_UNKNOWN;
-
- entry = *pte;
- if (!pte_present(entry)) {
-@@ -3413,9 +3414,12 @@ int handle_pte_fault(struct mm_struct *m
- if (unlikely(!pte_same(*pte, entry)))
- goto unlock;
- if (flags & FAULT_FLAG_WRITE) {
-- if (!pte_write(entry))
-- return do_wp_page(mm, vma, address,
-+ if (!pte_write(entry)) {
-+ ret = do_wp_page(mm, vma, address,
- pte, pmd, ptl, entry);
-+ type = VXPT_WRITE;
-+ goto out;
-+ }
- entry = pte_mkdirty(entry);
- }
- entry = pte_mkyoung(entry);
-@@ -3433,7 +3437,10 @@ int handle_pte_fault(struct mm_struct *m
- }
- unlock:
- pte_unmap_unlock(pte, ptl);
-- return 0;
-+ ret = 0;
-+out:
-+ vx_page_fault(mm, vma, type, ret);
-+ return ret;
- }
-
- /*
-diff -NurpP --minimal linux-3.1.1/mm/mremap.c linux-3.1.1-vs2.3.2/mm/mremap.c
---- linux-3.1.1/mm/mremap.c 2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/mm/mremap.c 2011-10-24 18:53:33.000000000 +0200
-@@ -19,6 +19,7 @@
- #include <linux/security.h>
- #include <linux/syscalls.h>
- #include <linux/mmu_notifier.h>
-+#include <linux/vs_memory.h>
-
- #include <asm/uaccess.h>
- #include <asm/cacheflush.h>
-diff -NurpP --minimal linux-3.1.1/mm/oom_kill.c linux-3.1.1-vs2.3.2/mm/oom_kill.c
---- linux-3.1.1/mm/oom_kill.c 2011-10-24 18:45:33.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/mm/oom_kill.c 2011-10-24 18:53:33.000000000 +0200
-@@ -32,6 +32,9 @@
+diff -NurpP --minimal linux-3.1.6/mm/oom_kill.c linux-3.1.6-vs2.3.2.5/mm/oom_kill.c
+--- linux-3.1.6/mm/oom_kill.c 2011-10-24 18:45:33.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/mm/oom_kill.c 2011-12-07 04:20:11.000000000 +0100
+@@ -32,6 +32,8 @@
#include <linux/mempolicy.h>
#include <linux/security.h>
#include <linux/ptrace.h>
+#include <linux/reboot.h>
-+#include <linux/vs_memory.h>
+#include <linux/vs_context.h>
int sysctl_panic_on_oom;
int sysctl_oom_kill_allocating_task;
-@@ -134,11 +137,18 @@ struct task_struct *find_lock_task_mm(st
+@@ -134,11 +136,18 @@ struct task_struct *find_lock_task_mm(st
static bool oom_unkillable_task(struct task_struct *p,
const struct mem_cgroup *mem, const nodemask_t *nodemask)
{
/* When mem_cgroup_out_of_memory() and p is not member of the group */
if (mem && !task_in_mem_cgroup(p, mem))
return true;
-@@ -214,6 +224,18 @@ unsigned int oom_badness(struct task_str
- points += p->signal->oom_score_adj;
-
- /*
-+ * add points for context badness and
-+ * reduce badness for processes belonging to
-+ * a different context
-+ */
-+
-+ points += vx_badness(p, p->mm);
-+
-+ if ((vx_current_xid() > 1) &&
-+ vx_current_xid() != vx_task_xid(p))
-+ points /= 16;
-+
-+ /*
- * Never return 0 for an eligible task that may be killed since it's
- * possible that no single user task uses more than 0.1% of memory and
- * no single admin tasks uses more than 3.0%.
-@@ -428,8 +450,8 @@ static int oom_kill_task(struct task_str
+@@ -428,8 +437,8 @@ static int oom_kill_task(struct task_str
/* mm cannot be safely dereferenced after task_unlock(p) */
mm = p->mm;
K(get_mm_counter(p->mm, MM_ANONPAGES)),
K(get_mm_counter(p->mm, MM_FILEPAGES)));
task_unlock(p);
-@@ -483,8 +505,8 @@ static int oom_kill_process(struct task_
+@@ -483,8 +492,8 @@ static int oom_kill_process(struct task_
}
task_lock(p);
task_unlock(p);
/*
-@@ -585,6 +607,8 @@ int unregister_oom_notifier(struct notif
+@@ -585,6 +594,8 @@ int unregister_oom_notifier(struct notif
}
EXPORT_SYMBOL_GPL(unregister_oom_notifier);
/*
* Try to acquire the OOM killer lock for the zones in zonelist. Returns zero
* if a parallel OOM killing is already taking place that includes a zone in
-@@ -743,7 +767,12 @@ retry:
+@@ -743,7 +754,12 @@ retry:
if (!p) {
dump_header(NULL, gfp_mask, order, NULL, mpol_mask);
read_unlock(&tasklist_lock);
}
if (oom_kill_process(p, gfp_mask, order, points, totalpages, NULL,
-diff -NurpP --minimal linux-3.1.1/mm/page_alloc.c linux-3.1.1-vs2.3.2/mm/page_alloc.c
---- linux-3.1.1/mm/page_alloc.c 2011-10-24 18:45:33.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/mm/page_alloc.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/mm/page_alloc.c linux-3.1.6-vs2.3.2.5/mm/page_alloc.c
+--- linux-3.1.6/mm/page_alloc.c 2011-12-23 16:04:07.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/mm/page_alloc.c 2011-12-23 16:11:57.000000000 +0100
@@ -57,6 +57,8 @@
#include <linux/ftrace_event.h>
#include <linux/memcontrol.h>
}
#endif
-diff -NurpP --minimal linux-3.1.1/mm/pgtable-generic.c linux-3.1.1-vs2.3.2/mm/pgtable-generic.c
---- linux-3.1.1/mm/pgtable-generic.c 2011-03-15 18:07:42.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/mm/pgtable-generic.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/mm/pgtable-generic.c linux-3.1.6-vs2.3.2.5/mm/pgtable-generic.c
+--- linux-3.1.6/mm/pgtable-generic.c 2011-03-15 18:07:42.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/mm/pgtable-generic.c 2011-10-24 18:53:33.000000000 +0200
@@ -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.1.1/mm/rmap.c linux-3.1.1-vs2.3.2/mm/rmap.c
---- linux-3.1.1/mm/rmap.c 2011-10-24 18:45:33.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/mm/rmap.c 2011-10-24 18:53:33.000000000 +0200
-@@ -56,6 +56,7 @@
- #include <linux/mmu_notifier.h>
- #include <linux/migrate.h>
- #include <linux/hugetlb.h>
-+#include <linux/vs_memory.h>
-
- #include <asm/tlbflush.h>
-
-diff -NurpP --minimal linux-3.1.1/mm/shmem.c linux-3.1.1-vs2.3.2/mm/shmem.c
---- linux-3.1.1/mm/shmem.c 2011-10-24 18:45:33.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/mm/shmem.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/mm/shmem.c linux-3.1.6-vs2.3.2.5/mm/shmem.c
+--- linux-3.1.6/mm/shmem.c 2011-10-24 18:45:33.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/mm/shmem.c 2011-10-24 18:53:33.000000000 +0200
@@ -1429,7 +1429,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.1.1/mm/slab.c linux-3.1.1-vs2.3.2/mm/slab.c
---- linux-3.1.1/mm/slab.c 2011-10-24 18:45:33.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/mm/slab.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/mm/slab.c linux-3.1.6-vs2.3.2.5/mm/slab.c
+--- linux-3.1.6/mm/slab.c 2011-12-23 16:04:07.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/mm/slab.c 2011-12-15 01:07:58.000000000 +0100
@@ -411,6 +411,8 @@ static void kmem_list3_init(struct kmem_
#define STATS_INC_FREEMISS(x) do { } while (0)
#endif
#if DEBUG
/*
-@@ -3399,6 +3401,7 @@ retry:
+@@ -3402,6 +3404,7 @@ retry:
obj = slab_get_obj(cachep, slabp, nodeid);
check_slabp(cachep, slabp);
l3->free_objects--;
/* move slabp to correct slabp list: */
list_del(&slabp->list);
-@@ -3476,6 +3479,7 @@ __cache_alloc_node(struct kmem_cache *ca
+@@ -3479,6 +3482,7 @@ __cache_alloc_node(struct kmem_cache *ca
/* ___cache_alloc_node can fall back to other nodes */
ptr = ____cache_alloc_node(cachep, flags, nodeid);
out:
local_irq_restore(save_flags);
ptr = cache_alloc_debugcheck_after(cachep, flags, ptr, caller);
kmemleak_alloc_recursive(ptr, obj_size(cachep), 1, cachep->flags,
-@@ -3663,6 +3667,7 @@ static inline void __cache_free(struct k
+@@ -3666,6 +3670,7 @@ static inline void __cache_free(struct k
check_irq_off();
kmemleak_free_recursive(objp, cachep->flags);
objp = cache_free_debugcheck(cachep, objp, caller);
kmemcheck_slab_free(cachep, objp, obj_size(cachep));
-diff -NurpP --minimal linux-3.1.1/mm/slab_vs.h linux-3.1.1-vs2.3.2/mm/slab_vs.h
---- linux-3.1.1/mm/slab_vs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/mm/slab_vs.h 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/mm/slab_vs.h linux-3.1.6-vs2.3.2.5/mm/slab_vs.h
+--- linux-3.1.6/mm/slab_vs.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/mm/slab_vs.h 2011-10-24 18:53:33.000000000 +0200
@@ -0,0 +1,29 @@
+
+#include <linux/vserver/context.h>
+ atomic_sub(cachep->buffer_size, &vxi->cacct.slab[what]);
+}
+
-diff -NurpP --minimal linux-3.1.1/mm/swapfile.c linux-3.1.1-vs2.3.2/mm/swapfile.c
---- linux-3.1.1/mm/swapfile.c 2011-10-24 18:45:33.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/mm/swapfile.c 2011-10-24 18:53:33.000000000 +0200
-@@ -37,6 +37,8 @@
+diff -NurpP --minimal linux-3.1.6/mm/swapfile.c linux-3.1.6-vs2.3.2.5/mm/swapfile.c
+--- linux-3.1.6/mm/swapfile.c 2011-10-24 18:45:33.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/mm/swapfile.c 2011-12-07 04:20:21.000000000 +0100
+@@ -37,6 +37,7 @@
#include <asm/tlbflush.h>
#include <linux/swapops.h>
#include <linux/page_cgroup.h>
+#include <linux/vs_base.h>
-+#include <linux/vs_memory.h>
static bool swap_count_continued(struct swap_info_struct *, pgoff_t,
unsigned char);
-@@ -1754,6 +1756,16 @@ static int swap_show(struct seq_file *sw
+@@ -1754,6 +1755,16 @@ static int swap_show(struct seq_file *sw
if (si == SEQ_START_TOKEN) {
seq_puts(swap,"Filename\t\t\t\tType\t\tSize\tUsed\tPriority\n");
return 0;
}
-@@ -2177,6 +2189,8 @@ void si_swapinfo(struct sysinfo *val)
+@@ -2177,6 +2188,8 @@ void si_swapinfo(struct sysinfo *val)
val->freeswap = nr_swap_pages + nr_to_be_unused;
val->totalswap = total_swap_pages + nr_to_be_unused;
spin_unlock(&swap_lock);
}
/*
-diff -NurpP --minimal linux-3.1.1/net/bridge/br_multicast.c linux-3.1.1-vs2.3.2/net/bridge/br_multicast.c
---- linux-3.1.1/net/bridge/br_multicast.c 2011-10-24 18:45:34.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/net/bridge/br_multicast.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/net/bridge/br_multicast.c linux-3.1.6-vs2.3.2.5/net/bridge/br_multicast.c
+--- linux-3.1.6/net/bridge/br_multicast.c 2011-12-23 16:04:07.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/net/bridge/br_multicast.c 2011-12-15 01:07:58.000000000 +0100
@@ -447,7 +447,7 @@ static struct sk_buff *br_ip6_multicast_
ip6h->hop_limit = 1;
ipv6_addr_set(&ip6h->daddr, htonl(0xff020000), 0, 0, htonl(1));
ipv6_eth_mc_map(&ip6h->daddr, eth->h_dest);
hopopt = (u8 *)(ip6h + 1);
-diff -NurpP --minimal linux-3.1.1/net/core/dev.c linux-3.1.1-vs2.3.2/net/core/dev.c
---- linux-3.1.1/net/core/dev.c 2011-11-15 16:44:52.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/net/core/dev.c 2011-11-15 17:08:44.000000000 +0100
+diff -NurpP --minimal linux-3.1.6/net/core/dev.c linux-3.1.6-vs2.3.2.5/net/core/dev.c
+--- linux-3.1.6/net/core/dev.c 2011-12-23 16:04:07.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/net/core/dev.c 2011-11-15 17:08:44.000000000 +0100
@@ -127,6 +127,7 @@
#include <linux/in.h>
#include <linux/jhash.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.1.1/net/core/rtnetlink.c linux-3.1.1-vs2.3.2/net/core/rtnetlink.c
---- linux-3.1.1/net/core/rtnetlink.c 2011-10-24 18:45:34.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/net/core/rtnetlink.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/net/core/rtnetlink.c linux-3.1.6-vs2.3.2.5/net/core/rtnetlink.c
+--- linux-3.1.6/net/core/rtnetlink.c 2011-10-24 18:45:34.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/net/core/rtnetlink.c 2011-10-24 18:53:33.000000000 +0200
@@ -1040,6 +1040,8 @@ static int rtnl_dump_ifinfo(struct sk_bu
hlist_for_each_entry_rcu(dev, node, head, index_hlist) {
if (idx < s_idx)
skb = nlmsg_new((if_info_size = if_nlmsg_size(dev)), GFP_KERNEL);
if (skb == NULL)
goto errout;
-diff -NurpP --minimal linux-3.1.1/net/core/sock.c linux-3.1.1-vs2.3.2/net/core/sock.c
---- linux-3.1.1/net/core/sock.c 2011-11-15 16:44:52.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/net/core/sock.c 2011-11-15 17:08:44.000000000 +0100
+diff -NurpP --minimal linux-3.1.6/net/core/sock.c linux-3.1.6-vs2.3.2.5/net/core/sock.c
+--- linux-3.1.6/net/core/sock.c 2011-12-23 16:04:07.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/net/core/sock.c 2011-11-15 17:08:44.000000000 +0100
@@ -127,6 +127,10 @@
#include <net/cls_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.1.1/net/ipv4/af_inet.c linux-3.1.1-vs2.3.2/net/ipv4/af_inet.c
---- linux-3.1.1/net/ipv4/af_inet.c 2011-10-24 18:45:34.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/net/ipv4/af_inet.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/net/ipv4/af_inet.c linux-3.1.6-vs2.3.2.5/net/ipv4/af_inet.c
+--- linux-3.1.6/net/ipv4/af_inet.c 2011-10-24 18:45:34.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/net/ipv4/af_inet.c 2011-10-24 18:53:33.000000000 +0200
@@ -117,6 +117,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.1.1/net/ipv4/arp.c linux-3.1.1-vs2.3.2/net/ipv4/arp.c
---- linux-3.1.1/net/ipv4/arp.c 2011-10-24 18:45:34.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/net/ipv4/arp.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/net/ipv4/arp.c linux-3.1.6-vs2.3.2.5/net/ipv4/arp.c
+--- linux-3.1.6/net/ipv4/arp.c 2011-10-24 18:45:34.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/net/ipv4/arp.c 2011-10-24 18:53:33.000000000 +0200
@@ -1332,6 +1332,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.1.1/net/ipv4/devinet.c linux-3.1.1-vs2.3.2/net/ipv4/devinet.c
---- linux-3.1.1/net/ipv4/devinet.c 2011-10-24 18:45:34.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/net/ipv4/devinet.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/net/ipv4/devinet.c linux-3.1.6-vs2.3.2.5/net/ipv4/devinet.c
+--- linux-3.1.6/net/ipv4/devinet.c 2011-10-24 18:45:34.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/net/ipv4/devinet.c 2011-10-24 18:53:33.000000000 +0200
@@ -518,6 +518,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.1.1/net/ipv4/fib_trie.c linux-3.1.1-vs2.3.2/net/ipv4/fib_trie.c
---- linux-3.1.1/net/ipv4/fib_trie.c 2011-10-24 18:45:34.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/net/ipv4/fib_trie.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/net/ipv4/fib_trie.c linux-3.1.6-vs2.3.2.5/net/ipv4/fib_trie.c
+--- linux-3.1.6/net/ipv4/fib_trie.c 2011-10-24 18:45:34.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/net/ipv4/fib_trie.c 2011-10-24 18:53:33.000000000 +0200
@@ -2554,6 +2554,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.1.1/net/ipv4/inet_connection_sock.c linux-3.1.1-vs2.3.2/net/ipv4/inet_connection_sock.c
---- linux-3.1.1/net/ipv4/inet_connection_sock.c 2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/net/ipv4/inet_connection_sock.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/net/ipv4/inet_connection_sock.c linux-3.1.6-vs2.3.2.5/net/ipv4/inet_connection_sock.c
+--- linux-3.1.6/net/ipv4/inet_connection_sock.c 2011-07-22 11:18:13.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/net/ipv4/inet_connection_sock.c 2011-10-24 18:53:33.000000000 +0200
@@ -52,6 +52,37 @@ void inet_get_local_port_range(int *low,
}
EXPORT_SYMBOL(inet_get_local_port_range);
break;
}
}
-diff -NurpP --minimal linux-3.1.1/net/ipv4/inet_diag.c linux-3.1.1-vs2.3.2/net/ipv4/inet_diag.c
---- linux-3.1.1/net/ipv4/inet_diag.c 2011-10-24 18:45:34.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/net/ipv4/inet_diag.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/net/ipv4/inet_diag.c linux-3.1.6-vs2.3.2.5/net/ipv4/inet_diag.c
+--- linux-3.1.6/net/ipv4/inet_diag.c 2011-10-24 18:45:34.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/net/ipv4/inet_diag.c 2011-10-24 18:53:33.000000000 +0200
@@ -33,6 +33,8 @@
#include <linux/stddef.h>
if (num < s_num)
goto next_dying;
if (r->id.idiag_sport != tw->tw_sport &&
-diff -NurpP --minimal linux-3.1.1/net/ipv4/inet_hashtables.c linux-3.1.1-vs2.3.2/net/ipv4/inet_hashtables.c
---- linux-3.1.1/net/ipv4/inet_hashtables.c 2011-10-24 18:45:34.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/net/ipv4/inet_hashtables.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/net/ipv4/inet_hashtables.c linux-3.1.6-vs2.3.2.5/net/ipv4/inet_hashtables.c
+--- linux-3.1.6/net/ipv4/inet_hashtables.c 2011-10-24 18:45:34.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/net/ipv4/inet_hashtables.c 2011-10-24 18:53:33.000000000 +0200
@@ -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.1.1/net/ipv4/netfilter/nf_nat_helper.c linux-3.1.1-vs2.3.2/net/ipv4/netfilter/nf_nat_helper.c
---- linux-3.1.1/net/ipv4/netfilter/nf_nat_helper.c 2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/net/ipv4/netfilter/nf_nat_helper.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/net/ipv4/netfilter/nf_nat_helper.c linux-3.1.6-vs2.3.2.5/net/ipv4/netfilter/nf_nat_helper.c
+--- linux-3.1.6/net/ipv4/netfilter/nf_nat_helper.c 2011-07-22 11:18:13.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/net/ipv4/netfilter/nf_nat_helper.c 2011-10-24 18:53:33.000000000 +0200
@@ -20,6 +20,7 @@
#include <net/route.h>
#include <net/netfilter/nf_conntrack.h>
#include <net/netfilter/nf_conntrack_helper.h>
#include <net/netfilter/nf_conntrack_ecache.h>
-diff -NurpP --minimal linux-3.1.1/net/ipv4/netfilter.c linux-3.1.1-vs2.3.2/net/ipv4/netfilter.c
---- linux-3.1.1/net/ipv4/netfilter.c 2011-10-24 18:45:34.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/net/ipv4/netfilter.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/net/ipv4/netfilter.c linux-3.1.6-vs2.3.2.5/net/ipv4/netfilter.c
+--- linux-3.1.6/net/ipv4/netfilter.c 2011-10-24 18:45:34.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/net/ipv4/netfilter.c 2011-10-24 18:53:33.000000000 +0200
@@ -5,7 +5,7 @@
#include <linux/ip.h>
#include <linux/skbuff.h>
#include <net/xfrm.h>
#include <net/ip.h>
#include <net/netfilter/nf_queue.h>
-diff -NurpP --minimal linux-3.1.1/net/ipv4/raw.c linux-3.1.1-vs2.3.2/net/ipv4/raw.c
---- linux-3.1.1/net/ipv4/raw.c 2011-10-24 18:45:34.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/net/ipv4/raw.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/net/ipv4/raw.c linux-3.1.6-vs2.3.2.5/net/ipv4/raw.c
+--- linux-3.1.6/net/ipv4/raw.c 2011-10-24 18:45:34.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/net/ipv4/raw.c 2011-10-24 18:53:33.000000000 +0200
@@ -117,7 +117,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.1.1/net/ipv4/route.c linux-3.1.1-vs2.3.2/net/ipv4/route.c
---- linux-3.1.1/net/ipv4/route.c 2011-10-24 18:45:34.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/net/ipv4/route.c 2011-10-24 18:53:33.000000000 +0200
-@@ -2562,7 +2562,7 @@ static struct rtable *ip_route_output_sl
+diff -NurpP --minimal linux-3.1.6/net/ipv4/route.c linux-3.1.6-vs2.3.2.5/net/ipv4/route.c
+--- linux-3.1.6/net/ipv4/route.c 2011-12-23 16:04:07.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/net/ipv4/route.c 2011-12-15 01:07:58.000000000 +0100
+@@ -2609,7 +2609,7 @@ static struct rtable *ip_route_output_sl
if (fl4->flowi4_oif) {
rth = ERR_PTR(-ENODEV);
if (dev_out == NULL)
goto out;
-diff -NurpP --minimal linux-3.1.1/net/ipv4/tcp.c linux-3.1.1-vs2.3.2/net/ipv4/tcp.c
---- linux-3.1.1/net/ipv4/tcp.c 2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/net/ipv4/tcp.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/net/ipv4/tcp.c linux-3.1.6-vs2.3.2.5/net/ipv4/tcp.c
+--- linux-3.1.6/net/ipv4/tcp.c 2011-07-22 11:18:13.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/net/ipv4/tcp.c 2011-10-24 18:53:33.000000000 +0200
@@ -266,6 +266,7 @@
#include <linux/crypto.h>
#include <linux/time.h>
#include <net/icmp.h>
#include <net/tcp.h>
-diff -NurpP --minimal linux-3.1.1/net/ipv4/tcp_ipv4.c linux-3.1.1-vs2.3.2/net/ipv4/tcp_ipv4.c
---- linux-3.1.1/net/ipv4/tcp_ipv4.c 2011-10-24 18:45:34.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/net/ipv4/tcp_ipv4.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/net/ipv4/tcp_ipv4.c linux-3.1.6-vs2.3.2.5/net/ipv4/tcp_ipv4.c
+--- linux-3.1.6/net/ipv4/tcp_ipv4.c 2011-10-24 18:45:34.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/net/ipv4/tcp_ipv4.c 2011-10-24 18:53:33.000000000 +0200
@@ -2018,6 +2018,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.1.1/net/ipv4/tcp_minisocks.c linux-3.1.1-vs2.3.2/net/ipv4/tcp_minisocks.c
---- linux-3.1.1/net/ipv4/tcp_minisocks.c 2011-10-24 18:45:34.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/net/ipv4/tcp_minisocks.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/net/ipv4/tcp_minisocks.c linux-3.1.6-vs2.3.2.5/net/ipv4/tcp_minisocks.c
+--- linux-3.1.6/net/ipv4/tcp_minisocks.c 2011-10-24 18:45:34.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/net/ipv4/tcp_minisocks.c 2011-10-24 18:53:33.000000000 +0200
@@ -23,6 +23,9 @@
#include <linux/slab.h>
#include <linux/sysctl.h>
#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
if (tw->tw_family == PF_INET6) {
struct ipv6_pinfo *np = inet6_sk(sk);
-diff -NurpP --minimal linux-3.1.1/net/ipv4/udp.c linux-3.1.1-vs2.3.2/net/ipv4/udp.c
---- linux-3.1.1/net/ipv4/udp.c 2011-10-24 18:45:34.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/net/ipv4/udp.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/net/ipv4/udp.c linux-3.1.6-vs2.3.2.5/net/ipv4/udp.c
+--- linux-3.1.6/net/ipv4/udp.c 2011-10-24 18:45:34.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/net/ipv4/udp.c 2011-10-24 18:53:33.000000000 +0200
@@ -297,14 +297,7 @@ fail:
}
EXPORT_SYMBOL(udp_lib_get_port);
if (!sk) {
if (state->bucket <= state->udp_table->mask)
-diff -NurpP --minimal linux-3.1.1/net/ipv6/Kconfig linux-3.1.1-vs2.3.2/net/ipv6/Kconfig
---- linux-3.1.1/net/ipv6/Kconfig 2010-08-02 16:52:59.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/net/ipv6/Kconfig 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/net/ipv6/Kconfig linux-3.1.6-vs2.3.2.5/net/ipv6/Kconfig
+--- linux-3.1.6/net/ipv6/Kconfig 2010-08-02 16:52:59.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/net/ipv6/Kconfig 2011-10-24 18:53:33.000000000 +0200
@@ -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.1.1/net/ipv6/addrconf.c linux-3.1.1-vs2.3.2/net/ipv6/addrconf.c
---- linux-3.1.1/net/ipv6/addrconf.c 2011-10-24 18:45:34.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/net/ipv6/addrconf.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/net/ipv6/addrconf.c linux-3.1.6-vs2.3.2.5/net/ipv6/addrconf.c
+--- linux-3.1.6/net/ipv6/addrconf.c 2011-10-24 18:45:34.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/net/ipv6/addrconf.c 2011-10-24 18:53:33.000000000 +0200
@@ -87,6 +87,8 @@
#include <linux/proc_fs.h>
idev = __in6_dev_get(dev);
if (!idev)
goto cont;
-diff -NurpP --minimal linux-3.1.1/net/ipv6/af_inet6.c linux-3.1.1-vs2.3.2/net/ipv6/af_inet6.c
---- linux-3.1.1/net/ipv6/af_inet6.c 2011-10-24 18:45:34.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/net/ipv6/af_inet6.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/net/ipv6/af_inet6.c linux-3.1.6-vs2.3.2.5/net/ipv6/af_inet6.c
+--- linux-3.1.6/net/ipv6/af_inet6.c 2011-10-24 18:45:34.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/net/ipv6/af_inet6.c 2011-10-24 18:53:33.000000000 +0200
@@ -42,6 +42,8 @@
#include <linux/netdevice.h>
#include <linux/icmpv6.h>
if (ipv6_addr_any(&np->rcv_saddr))
ipv6_addr_copy(&sin->sin6_addr, &np->saddr);
else
-diff -NurpP --minimal linux-3.1.1/net/ipv6/datagram.c linux-3.1.1-vs2.3.2/net/ipv6/datagram.c
---- linux-3.1.1/net/ipv6/datagram.c 2011-10-24 18:45:34.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/net/ipv6/datagram.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/net/ipv6/datagram.c linux-3.1.6-vs2.3.2.5/net/ipv6/datagram.c
+--- linux-3.1.6/net/ipv6/datagram.c 2011-10-24 18:45:34.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/net/ipv6/datagram.c 2011-10-24 18:53:33.000000000 +0200
@@ -646,7 +646,7 @@ int datagram_send_ctl(struct net *net, s
rcu_read_lock();
if (!dev) {
rcu_read_unlock();
return -ENODEV;
-diff -NurpP --minimal linux-3.1.1/net/ipv6/fib6_rules.c linux-3.1.1-vs2.3.2/net/ipv6/fib6_rules.c
---- linux-3.1.1/net/ipv6/fib6_rules.c 2011-05-22 16:18:00.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/net/ipv6/fib6_rules.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/net/ipv6/fib6_rules.c linux-3.1.6-vs2.3.2.5/net/ipv6/fib6_rules.c
+--- linux-3.1.6/net/ipv6/fib6_rules.c 2011-05-22 16:18:00.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/net/ipv6/fib6_rules.c 2011-10-24 18:53:33.000000000 +0200
@@ -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.1.1/net/ipv6/inet6_hashtables.c linux-3.1.1-vs2.3.2/net/ipv6/inet6_hashtables.c
---- linux-3.1.1/net/ipv6/inet6_hashtables.c 2011-10-24 18:45:34.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/net/ipv6/inet6_hashtables.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/net/ipv6/inet6_hashtables.c linux-3.1.6-vs2.3.2.5/net/ipv6/inet6_hashtables.c
+--- linux-3.1.6/net/ipv6/inet6_hashtables.c 2011-10-24 18:45:34.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/net/ipv6/inet6_hashtables.c 2011-10-24 18:53:33.000000000 +0200
@@ -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.1.1/net/ipv6/ip6_output.c linux-3.1.1-vs2.3.2/net/ipv6/ip6_output.c
---- linux-3.1.1/net/ipv6/ip6_output.c 2011-10-24 18:45:34.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/net/ipv6/ip6_output.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/net/ipv6/ip6_output.c linux-3.1.6-vs2.3.2.5/net/ipv6/ip6_output.c
+--- linux-3.1.6/net/ipv6/ip6_output.c 2011-10-24 18:45:34.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/net/ipv6/ip6_output.c 2011-10-24 18:53:33.000000000 +0200
@@ -966,7 +966,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.1.1/net/ipv6/ndisc.c linux-3.1.1-vs2.3.2/net/ipv6/ndisc.c
---- linux-3.1.1/net/ipv6/ndisc.c 2011-10-24 18:45:34.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/net/ipv6/ndisc.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/net/ipv6/ndisc.c linux-3.1.6-vs2.3.2.5/net/ipv6/ndisc.c
+--- linux-3.1.6/net/ipv6/ndisc.c 2011-10-24 18:45:34.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/net/ipv6/ndisc.c 2011-10-24 18:53:33.000000000 +0200
@@ -591,7 +591,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.1.1/net/ipv6/raw.c linux-3.1.1-vs2.3.2/net/ipv6/raw.c
---- linux-3.1.1/net/ipv6/raw.c 2011-10-24 18:45:34.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/net/ipv6/raw.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/net/ipv6/raw.c linux-3.1.6-vs2.3.2.5/net/ipv6/raw.c
+--- linux-3.1.6/net/ipv6/raw.c 2011-10-24 18:45:34.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/net/ipv6/raw.c 2011-10-24 18:53:33.000000000 +0200
@@ -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.1.1/net/ipv6/route.c linux-3.1.1-vs2.3.2/net/ipv6/route.c
---- linux-3.1.1/net/ipv6/route.c 2011-11-15 16:44:52.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/net/ipv6/route.c 2011-11-15 17:08:44.000000000 +0100
+diff -NurpP --minimal linux-3.1.6/net/ipv6/route.c linux-3.1.6-vs2.3.2.5/net/ipv6/route.c
+--- linux-3.1.6/net/ipv6/route.c 2011-12-23 16:04:07.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/net/ipv6/route.c 2011-11-15 17:08:44.000000000 +0100
@@ -54,6 +54,7 @@
#include <net/xfrm.h>
#include <net/netevent.h>
seq_printf(m, "%pi6 %02x ", &rt->rt6i_dst.addr, rt->rt6i_dst.plen);
#ifdef CONFIG_IPV6_SUBTREES
-diff -NurpP --minimal linux-3.1.1/net/ipv6/tcp_ipv6.c linux-3.1.1-vs2.3.2/net/ipv6/tcp_ipv6.c
---- linux-3.1.1/net/ipv6/tcp_ipv6.c 2011-10-24 18:45:34.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/net/ipv6/tcp_ipv6.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/net/ipv6/tcp_ipv6.c linux-3.1.6-vs2.3.2.5/net/ipv6/tcp_ipv6.c
+--- linux-3.1.6/net/ipv6/tcp_ipv6.c 2011-10-24 18:45:34.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/net/ipv6/tcp_ipv6.c 2011-10-24 18:53:33.000000000 +0200
@@ -70,6 +70,7 @@
#include <linux/crypto.h>
addr_type = ipv6_addr_type(&usin->sin6_addr);
-diff -NurpP --minimal linux-3.1.1/net/ipv6/udp.c linux-3.1.1-vs2.3.2/net/ipv6/udp.c
---- linux-3.1.1/net/ipv6/udp.c 2011-10-24 18:45:34.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/net/ipv6/udp.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/net/ipv6/udp.c linux-3.1.6-vs2.3.2.5/net/ipv6/udp.c
+--- linux-3.1.6/net/ipv6/udp.c 2011-10-24 18:45:34.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/net/ipv6/udp.c 2011-10-24 18:53:33.000000000 +0200
@@ -45,41 +45,67 @@
#include <net/tcp_states.h>
#include <net/ip6_checksum.h>
}
if (!ipv6_addr_any(&np->daddr)) {
if (!ipv6_addr_equal(&np->daddr, saddr))
-diff -NurpP --minimal linux-3.1.1/net/ipv6/xfrm6_policy.c linux-3.1.1-vs2.3.2/net/ipv6/xfrm6_policy.c
---- linux-3.1.1/net/ipv6/xfrm6_policy.c 2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/net/ipv6/xfrm6_policy.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/net/ipv6/xfrm6_policy.c linux-3.1.6-vs2.3.2.5/net/ipv6/xfrm6_policy.c
+--- linux-3.1.6/net/ipv6/xfrm6_policy.c 2011-07-22 11:18:13.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/net/ipv6/xfrm6_policy.c 2011-10-24 18:53:33.000000000 +0200
@@ -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.1.1/net/netfilter/ipvs/ip_vs_xmit.c linux-3.1.1-vs2.3.2/net/netfilter/ipvs/ip_vs_xmit.c
---- linux-3.1.1/net/netfilter/ipvs/ip_vs_xmit.c 2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/net/netfilter/ipvs/ip_vs_xmit.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/net/netfilter/ipvs/ip_vs_xmit.c linux-3.1.6-vs2.3.2.5/net/netfilter/ipvs/ip_vs_xmit.c
+--- linux-3.1.6/net/netfilter/ipvs/ip_vs_xmit.c 2011-07-22 11:18:13.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/net/netfilter/ipvs/ip_vs_xmit.c 2011-10-24 18:53:33.000000000 +0200
@@ -226,7 +226,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.1.1/net/netlink/af_netlink.c linux-3.1.1-vs2.3.2/net/netlink/af_netlink.c
---- linux-3.1.1/net/netlink/af_netlink.c 2011-10-24 18:45:34.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/net/netlink/af_netlink.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/net/netlink/af_netlink.c linux-3.1.6-vs2.3.2.5/net/netlink/af_netlink.c
+--- linux-3.1.6/net/netlink/af_netlink.c 2011-10-24 18:45:34.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/net/netlink/af_netlink.c 2011-10-24 18:53:33.000000000 +0200
@@ -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.1.1/net/socket.c linux-3.1.1-vs2.3.2/net/socket.c
---- linux-3.1.1/net/socket.c 2011-10-24 18:45:34.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/net/socket.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/net/socket.c linux-3.1.6-vs2.3.2.5/net/socket.c
+--- linux-3.1.6/net/socket.c 2011-10-24 18:45:34.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/net/socket.c 2011-10-24 18:53:33.000000000 +0200
@@ -98,6 +98,10 @@
#include <net/sock.h>
err = sock1->ops->socketpair(sock1, sock2);
if (err < 0)
-diff -NurpP --minimal linux-3.1.1/net/sunrpc/auth.c linux-3.1.1-vs2.3.2/net/sunrpc/auth.c
---- linux-3.1.1/net/sunrpc/auth.c 2011-10-24 18:45:34.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/net/sunrpc/auth.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/net/sunrpc/auth.c linux-3.1.6-vs2.3.2.5/net/sunrpc/auth.c
+--- linux-3.1.6/net/sunrpc/auth.c 2011-10-24 18:45:34.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/net/sunrpc/auth.c 2011-10-24 18:53:33.000000000 +0200
@@ -14,6 +14,7 @@
#include <linux/hash.h>
#include <linux/sunrpc/clnt.h>
};
dprintk("RPC: %5u looking up %s cred\n",
-diff -NurpP --minimal linux-3.1.1/net/sunrpc/auth_unix.c linux-3.1.1-vs2.3.2/net/sunrpc/auth_unix.c
---- linux-3.1.1/net/sunrpc/auth_unix.c 2011-11-15 16:44:52.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/net/sunrpc/auth_unix.c 2011-11-15 17:08:44.000000000 +0100
+diff -NurpP --minimal linux-3.1.6/net/sunrpc/auth_unix.c linux-3.1.6-vs2.3.2.5/net/sunrpc/auth_unix.c
+--- linux-3.1.6/net/sunrpc/auth_unix.c 2011-12-23 16:04:07.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/net/sunrpc/auth_unix.c 2011-11-15 17:08:44.000000000 +0100
@@ -12,12 +12,14 @@
#include <linux/module.h>
#include <linux/sunrpc/clnt.h>
hold = p++;
for (i = 0; i < 16 && cred->uc_gids[i] != (gid_t) NOGROUP; i++)
*p++ = htonl((u32) cred->uc_gids[i]);
-diff -NurpP --minimal linux-3.1.1/net/sunrpc/clnt.c linux-3.1.1-vs2.3.2/net/sunrpc/clnt.c
---- linux-3.1.1/net/sunrpc/clnt.c 2011-10-24 18:45:34.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/net/sunrpc/clnt.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/net/sunrpc/clnt.c linux-3.1.6-vs2.3.2.5/net/sunrpc/clnt.c
+--- linux-3.1.6/net/sunrpc/clnt.c 2011-10-24 18:45:34.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/net/sunrpc/clnt.c 2011-10-24 18:53:33.000000000 +0200
@@ -31,6 +31,7 @@
#include <linux/in.h>
#include <linux/in6.h>
return clnt;
}
EXPORT_SYMBOL_GPL(rpc_create);
-diff -NurpP --minimal linux-3.1.1/net/unix/af_unix.c linux-3.1.1-vs2.3.2/net/unix/af_unix.c
---- linux-3.1.1/net/unix/af_unix.c 2011-10-24 18:45:34.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/net/unix/af_unix.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/net/unix/af_unix.c linux-3.1.6-vs2.3.2.5/net/unix/af_unix.c
+--- linux-3.1.6/net/unix/af_unix.c 2011-10-24 18:45:34.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/net/unix/af_unix.c 2011-10-24 18:53:33.000000000 +0200
@@ -114,6 +114,8 @@
#include <linux/mount.h>
#include <net/checksum.h>
sk = next_unix_socket(&iter->i, sk);
return sk;
}
-diff -NurpP --minimal linux-3.1.1/scripts/checksyscalls.sh linux-3.1.1-vs2.3.2/scripts/checksyscalls.sh
---- linux-3.1.1/scripts/checksyscalls.sh 2011-03-15 18:07:46.000000000 +0100
-+++ linux-3.1.1-vs2.3.2/scripts/checksyscalls.sh 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/scripts/checksyscalls.sh linux-3.1.6-vs2.3.2.5/scripts/checksyscalls.sh
+--- linux-3.1.6/scripts/checksyscalls.sh 2011-03-15 18:07:46.000000000 +0100
++++ linux-3.1.6-vs2.3.2.5/scripts/checksyscalls.sh 2011-10-24 18:53:33.000000000 +0200
@@ -193,7 +193,6 @@ cat << EOF
#define __IGNORE_afs_syscall
#define __IGNORE_getpmsg
EOF
}
-diff -NurpP --minimal linux-3.1.1/security/commoncap.c linux-3.1.1-vs2.3.2/security/commoncap.c
---- linux-3.1.1/security/commoncap.c 2011-07-22 11:18:14.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/security/commoncap.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/security/commoncap.c linux-3.1.6-vs2.3.2.5/security/commoncap.c
+--- linux-3.1.6/security/commoncap.c 2011-07-22 11:18:14.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/security/commoncap.c 2011-10-24 18:53:33.000000000 +0200
@@ -62,6 +62,7 @@ int cap_netlink_recv(struct sk_buff *skb
return -EPERM;
return 0;
return -EPERM;
return 0;
}
-diff -NurpP --minimal linux-3.1.1/security/selinux/hooks.c linux-3.1.1-vs2.3.2/security/selinux/hooks.c
---- linux-3.1.1/security/selinux/hooks.c 2011-10-24 18:45:35.000000000 +0200
-+++ linux-3.1.1-vs2.3.2/security/selinux/hooks.c 2011-10-24 18:53:33.000000000 +0200
+diff -NurpP --minimal linux-3.1.6/security/selinux/hooks.c linux-3.1.6-vs2.3.2.5/security/selinux/hooks.c
+--- linux-3.1.6/security/selinux/hooks.c 2011-10-24 18:45:35.000000000 +0200
++++ linux-3.1.6-vs2.3.2.5/security/selinux/hooks.c 2011-10-24 18:53:33.000000000 +0200
@@ -67,7 +67,6 @@
#include <linux/dccp.h>
#include <linux/quota.h>
projects / packages / kernel.git / commitdiff