-diff -NurpP --minimal linux-2.6.38-rc8/Documentation/vserver/debug.txt linux-2.6.38-rc8-vs2.3.0.37-rc6/Documentation/vserver/debug.txt
---- linux-2.6.38-rc8/Documentation/vserver/debug.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/Documentation/vserver/debug.txt 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/Documentation/vserver/debug.txt linux-2.6.38.1-vs2.3.0.37-rc9/Documentation/vserver/debug.txt
+--- linux-2.6.38.1/Documentation/vserver/debug.txt 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/Documentation/vserver/debug.txt 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/arch/alpha/Kconfig linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/alpha/Kconfig
---- linux-2.6.38-rc8/arch/alpha/Kconfig 2011-03-10 17:08:30.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/alpha/Kconfig 2011-03-10 17:21:19.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/alpha/Kconfig linux-2.6.38.1-vs2.3.0.37-rc9/arch/alpha/Kconfig
+--- linux-2.6.38.1/arch/alpha/Kconfig 2011-03-15 18:06:23.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/alpha/Kconfig 2011-03-10 17:21:19.000000000 +0100
@@ -668,6 +668,8 @@ config DUMMY_CONSOLE
depends on VGA_HOSE
default y
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.38-rc8/arch/alpha/kernel/entry.S linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/alpha/kernel/entry.S
---- linux-2.6.38-rc8/arch/alpha/kernel/entry.S 2010-10-21 13:06:45.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/alpha/kernel/entry.S 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/alpha/kernel/entry.S linux-2.6.38.1-vs2.3.0.37-rc9/arch/alpha/kernel/entry.S
+--- linux-2.6.38.1/arch/alpha/kernel/entry.S 2010-10-21 13:06:45.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/alpha/kernel/entry.S 2011-01-29 02:01:07.000000000 +0100
@@ -860,24 +860,15 @@ sys_getxgid:
.globl sys_getxpid
.ent sys_getxpid
ret
.end sys_getxpid
-diff -NurpP --minimal linux-2.6.38-rc8/arch/alpha/kernel/ptrace.c linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/alpha/kernel/ptrace.c
---- linux-2.6.38-rc8/arch/alpha/kernel/ptrace.c 2011-01-05 21:48:40.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/alpha/kernel/ptrace.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/alpha/kernel/ptrace.c linux-2.6.38.1-vs2.3.0.37-rc9/arch/alpha/kernel/ptrace.c
+--- linux-2.6.38.1/arch/alpha/kernel/ptrace.c 2011-01-05 21:48:40.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/alpha/kernel/ptrace.c 2011-01-29 02:01:07.000000000 +0100
@@ -13,6 +13,7 @@
#include <linux/user.h>
#include <linux/security.h>
#include <asm/uaccess.h>
#include <asm/pgtable.h>
-diff -NurpP --minimal linux-2.6.38-rc8/arch/alpha/kernel/systbls.S linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/alpha/kernel/systbls.S
---- linux-2.6.38-rc8/arch/alpha/kernel/systbls.S 2010-10-21 13:06:46.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/alpha/kernel/systbls.S 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/alpha/kernel/systbls.S linux-2.6.38.1-vs2.3.0.37-rc9/arch/alpha/kernel/systbls.S
+--- linux-2.6.38.1/arch/alpha/kernel/systbls.S 2010-10-21 13:06:46.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/alpha/kernel/systbls.S 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/arch/alpha/kernel/traps.c linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/alpha/kernel/traps.c
---- linux-2.6.38-rc8/arch/alpha/kernel/traps.c 2010-10-21 13:06:46.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/alpha/kernel/traps.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/alpha/kernel/traps.c linux-2.6.38.1-vs2.3.0.37-rc9/arch/alpha/kernel/traps.c
+--- linux-2.6.38.1/arch/alpha/kernel/traps.c 2010-10-21 13:06:46.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/alpha/kernel/traps.c 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/arch/arm/Kconfig linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/arm/Kconfig
---- linux-2.6.38-rc8/arch/arm/Kconfig 2011-03-10 17:08:30.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/arm/Kconfig 2011-03-07 16:53:25.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/arm/Kconfig linux-2.6.38.1-vs2.3.0.37-rc9/arch/arm/Kconfig
+--- linux-2.6.38.1/arch/arm/Kconfig 2011-03-15 18:06:23.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/arm/Kconfig 2011-03-07 16:53:25.000000000 +0100
@@ -1934,6 +1934,8 @@ source "fs/Kconfig"
source "arch/arm/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.38-rc8/arch/arm/kernel/calls.S linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/arm/kernel/calls.S
---- linux-2.6.38-rc8/arch/arm/kernel/calls.S 2010-10-21 13:06:46.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/arm/kernel/calls.S 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/arm/kernel/calls.S linux-2.6.38.1-vs2.3.0.37-rc9/arch/arm/kernel/calls.S
+--- linux-2.6.38.1/arch/arm/kernel/calls.S 2010-10-21 13:06:46.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/arm/kernel/calls.S 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/arch/arm/kernel/process.c linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/arm/kernel/process.c
---- linux-2.6.38-rc8/arch/arm/kernel/process.c 2011-03-10 17:08:31.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/arm/kernel/process.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/arm/kernel/process.c linux-2.6.38.1-vs2.3.0.37-rc9/arch/arm/kernel/process.c
+--- linux-2.6.38.1/arch/arm/kernel/process.c 2011-03-15 18:06:25.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/arm/kernel/process.c 2011-01-29 02:01:07.000000000 +0100
@@ -315,7 +315,8 @@ void __show_regs(struct pt_regs *regs)
void show_regs(struct pt_regs * regs)
{
__show_regs(regs);
__backtrace();
}
-diff -NurpP --minimal linux-2.6.38-rc8/arch/arm/kernel/traps.c linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/arm/kernel/traps.c
---- linux-2.6.38-rc8/arch/arm/kernel/traps.c 2011-03-10 17:08:31.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/arm/kernel/traps.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/arm/kernel/traps.c linux-2.6.38.1-vs2.3.0.37-rc9/arch/arm/kernel/traps.c
+--- linux-2.6.38.1/arch/arm/kernel/traps.c 2011-03-15 18:06:25.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/arm/kernel/traps.c 2011-01-29 02:01:07.000000000 +0100
@@ -243,8 +243,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-2.6.38-rc8/arch/cris/Kconfig linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/cris/Kconfig
---- linux-2.6.38-rc8/arch/cris/Kconfig 2011-03-10 17:08:41.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/cris/Kconfig 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/cris/Kconfig linux-2.6.38.1-vs2.3.0.37-rc9/arch/cris/Kconfig
+--- linux-2.6.38.1/arch/cris/Kconfig 2011-03-15 18:06:38.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/cris/Kconfig 2011-01-29 02:01:07.000000000 +0100
@@ -685,6 +685,8 @@ source "drivers/staging/Kconfig"
source "arch/cris/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.38-rc8/arch/frv/kernel/kernel_thread.S linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/frv/kernel/kernel_thread.S
---- linux-2.6.38-rc8/arch/frv/kernel/kernel_thread.S 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/frv/kernel/kernel_thread.S 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/frv/kernel/kernel_thread.S linux-2.6.38.1-vs2.3.0.37-rc9/arch/frv/kernel/kernel_thread.S
+--- linux-2.6.38.1/arch/frv/kernel/kernel_thread.S 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/frv/kernel/kernel_thread.S 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/arch/h8300/Kconfig linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/h8300/Kconfig
---- linux-2.6.38-rc8/arch/h8300/Kconfig 2011-03-10 17:08:41.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/h8300/Kconfig 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/h8300/Kconfig linux-2.6.38.1-vs2.3.0.37-rc9/arch/h8300/Kconfig
+--- linux-2.6.38.1/arch/h8300/Kconfig 2011-03-15 18:06:38.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/h8300/Kconfig 2011-01-29 02:01:07.000000000 +0100
@@ -217,6 +217,8 @@ source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.38-rc8/arch/ia64/Kconfig linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/ia64/Kconfig
---- linux-2.6.38-rc8/arch/ia64/Kconfig 2011-03-10 17:08:41.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/ia64/Kconfig 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/ia64/Kconfig linux-2.6.38.1-vs2.3.0.37-rc9/arch/ia64/Kconfig
+--- linux-2.6.38.1/arch/ia64/Kconfig 2011-03-15 18:06:38.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/ia64/Kconfig 2011-01-29 02:01:07.000000000 +0100
@@ -674,6 +674,8 @@ source "fs/Kconfig"
source "arch/ia64/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.38-rc8/arch/ia64/include/asm/tlb.h linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/ia64/include/asm/tlb.h
---- linux-2.6.38-rc8/arch/ia64/include/asm/tlb.h 2010-02-25 11:51:26.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/ia64/include/asm/tlb.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/ia64/include/asm/tlb.h linux-2.6.38.1-vs2.3.0.37-rc9/arch/ia64/include/asm/tlb.h
+--- linux-2.6.38.1/arch/ia64/include/asm/tlb.h 2010-02-25 11:51:26.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/ia64/include/asm/tlb.h 2011-01-29 02:01:07.000000000 +0100
@@ -40,6 +40,7 @@
#include <linux/mm.h>
#include <linux/pagemap.h>
#include <asm/pgalloc.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.38-rc8/arch/ia64/kernel/entry.S linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/ia64/kernel/entry.S
---- linux-2.6.38-rc8/arch/ia64/kernel/entry.S 2010-10-21 13:06:52.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/ia64/kernel/entry.S 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/ia64/kernel/entry.S linux-2.6.38.1-vs2.3.0.37-rc9/arch/ia64/kernel/entry.S
+--- linux-2.6.38.1/arch/ia64/kernel/entry.S 2010-10-21 13:06:52.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/ia64/kernel/entry.S 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/arch/ia64/kernel/perfmon.c linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/ia64/kernel/perfmon.c
---- linux-2.6.38-rc8/arch/ia64/kernel/perfmon.c 2011-03-10 17:08:41.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/ia64/kernel/perfmon.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/ia64/kernel/perfmon.c linux-2.6.38.1-vs2.3.0.37-rc9/arch/ia64/kernel/perfmon.c
+--- linux-2.6.38.1/arch/ia64/kernel/perfmon.c 2011-03-15 18:06:39.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/ia64/kernel/perfmon.c 2011-01-29 02:01:07.000000000 +0100
@@ -42,6 +42,7 @@
#include <linux/completion.h>
#include <linux/tracehook.h>
#include <asm/errno.h>
#include <asm/intrinsics.h>
-diff -NurpP --minimal linux-2.6.38-rc8/arch/ia64/kernel/process.c linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/ia64/kernel/process.c
---- linux-2.6.38-rc8/arch/ia64/kernel/process.c 2011-03-10 17:08:41.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/ia64/kernel/process.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/ia64/kernel/process.c linux-2.6.38.1-vs2.3.0.37-rc9/arch/ia64/kernel/process.c
+--- linux-2.6.38.1/arch/ia64/kernel/process.c 2011-03-15 18:06:39.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/ia64/kernel/process.c 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/arch/ia64/kernel/ptrace.c linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/ia64/kernel/ptrace.c
---- linux-2.6.38-rc8/arch/ia64/kernel/ptrace.c 2011-01-05 21:48:59.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/ia64/kernel/ptrace.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/ia64/kernel/ptrace.c linux-2.6.38.1-vs2.3.0.37-rc9/arch/ia64/kernel/ptrace.c
+--- linux-2.6.38.1/arch/ia64/kernel/ptrace.c 2011-01-05 21:48:59.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/ia64/kernel/ptrace.c 2011-01-29 02:01:07.000000000 +0100
@@ -21,6 +21,7 @@
#include <linux/regset.h>
#include <linux/elf.h>
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.38-rc8/arch/ia64/kernel/traps.c linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/ia64/kernel/traps.c
---- linux-2.6.38-rc8/arch/ia64/kernel/traps.c 2010-07-07 18:31:01.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/ia64/kernel/traps.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/ia64/kernel/traps.c linux-2.6.38.1-vs2.3.0.37-rc9/arch/ia64/kernel/traps.c
+--- linux-2.6.38.1/arch/ia64/kernel/traps.c 2010-07-07 18:31:01.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/ia64/kernel/traps.c 2011-01-29 02:01:07.000000000 +0100
@@ -59,8 +59,9 @@ die (const char *str, struct pt_regs *re
put_cpu();
}
}
}
-diff -NurpP --minimal linux-2.6.38-rc8/arch/ia64/mm/fault.c linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/ia64/mm/fault.c
---- linux-2.6.38-rc8/arch/ia64/mm/fault.c 2010-08-02 16:52:04.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/ia64/mm/fault.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/ia64/mm/fault.c linux-2.6.38.1-vs2.3.0.37-rc9/arch/ia64/mm/fault.c
+--- linux-2.6.38.1/arch/ia64/mm/fault.c 2010-08-02 16:52:04.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/ia64/mm/fault.c 2011-01-29 02:01:07.000000000 +0100
@@ -10,6 +10,7 @@
#include <linux/interrupt.h>
#include <linux/kprobes.h>
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.38-rc8/arch/m32r/kernel/traps.c linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/m32r/kernel/traps.c
---- linux-2.6.38-rc8/arch/m32r/kernel/traps.c 2009-12-03 20:01:57.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/m32r/kernel/traps.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/m32r/kernel/traps.c linux-2.6.38.1-vs2.3.0.37-rc9/arch/m32r/kernel/traps.c
+--- linux-2.6.38.1/arch/m32r/kernel/traps.c 2009-12-03 20:01:57.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/m32r/kernel/traps.c 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/arch/m68k/Kconfig linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/m68k/Kconfig
---- linux-2.6.38-rc8/arch/m68k/Kconfig 2011-01-05 21:49:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/m68k/Kconfig 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/m68k/Kconfig linux-2.6.38.1-vs2.3.0.37-rc9/arch/m68k/Kconfig
+--- linux-2.6.38.1/arch/m68k/Kconfig 2011-01-05 21:49:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/m68k/Kconfig 2011-01-29 02:01:07.000000000 +0100
@@ -610,6 +610,8 @@ source "fs/Kconfig"
source "arch/m68k/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.38-rc8/arch/m68k/kernel/ptrace.c linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/m68k/kernel/ptrace.c
---- linux-2.6.38-rc8/arch/m68k/kernel/ptrace.c 2011-01-05 21:49:01.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/m68k/kernel/ptrace.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/m68k/kernel/ptrace.c linux-2.6.38.1-vs2.3.0.37-rc9/arch/m68k/kernel/ptrace.c
+--- linux-2.6.38.1/arch/m68k/kernel/ptrace.c 2011-01-05 21:49:01.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/m68k/kernel/ptrace.c 2011-01-29 02:01:07.000000000 +0100
@@ -18,6 +18,7 @@
#include <linux/ptrace.h>
#include <linux/user.h>
return ret;
out_eio:
-diff -NurpP --minimal linux-2.6.38-rc8/arch/m68k/kernel/traps.c linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/m68k/kernel/traps.c
---- linux-2.6.38-rc8/arch/m68k/kernel/traps.c 2010-08-02 16:52:04.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/m68k/kernel/traps.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/m68k/kernel/traps.c linux-2.6.38.1-vs2.3.0.37-rc9/arch/m68k/kernel/traps.c
+--- linux-2.6.38.1/arch/m68k/kernel/traps.c 2010-08-02 16:52:04.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/m68k/kernel/traps.c 2011-01-29 02:01:07.000000000 +0100
@@ -906,8 +906,8 @@ void show_registers(struct pt_regs *regs
printk("d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n",
regs->d4, regs->d5, regs->a0, regs->a1);
addr = (unsigned long)&fp->un;
printk("Frame format=%X ", regs->format);
switch (regs->format) {
-diff -NurpP --minimal linux-2.6.38-rc8/arch/m68knommu/Kconfig linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/m68knommu/Kconfig
---- linux-2.6.38-rc8/arch/m68knommu/Kconfig 2011-03-10 17:08:42.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/m68knommu/Kconfig 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/m68knommu/Kconfig linux-2.6.38.1-vs2.3.0.37-rc9/arch/m68knommu/Kconfig
+--- linux-2.6.38.1/arch/m68knommu/Kconfig 2011-03-15 18:06:41.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/m68knommu/Kconfig 2011-01-29 02:01:07.000000000 +0100
@@ -801,6 +801,8 @@ source "fs/Kconfig"
source "arch/m68knommu/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.38-rc8/arch/m68knommu/kernel/traps.c linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/m68knommu/kernel/traps.c
---- linux-2.6.38-rc8/arch/m68knommu/kernel/traps.c 2011-01-05 21:49:01.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/m68knommu/kernel/traps.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/m68knommu/kernel/traps.c linux-2.6.38.1-vs2.3.0.37-rc9/arch/m68knommu/kernel/traps.c
+--- linux-2.6.38.1/arch/m68knommu/kernel/traps.c 2011-01-05 21:49:01.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/m68knommu/kernel/traps.c 2011-01-29 02:01:07.000000000 +0100
@@ -78,8 +78,9 @@ void die_if_kernel(char *str, struct pt_
printk(KERN_EMERG "d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n",
fp->d4, fp->d5, fp->a0, fp->a1);
show_stack(NULL, (unsigned long *)(fp + 1));
add_taint(TAINT_DIE);
do_exit(SIGSEGV);
-diff -NurpP --minimal linux-2.6.38-rc8/arch/mips/Kconfig linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/mips/Kconfig
---- linux-2.6.38-rc8/arch/mips/Kconfig 2011-03-10 17:08:43.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/mips/Kconfig 2011-01-29 02:01:07.000000000 +0100
-@@ -2414,6 +2414,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-2.6.38.1/arch/mips/Kconfig linux-2.6.38.1-vs2.3.0.37-rc9/arch/mips/Kconfig
+--- linux-2.6.38.1/arch/mips/Kconfig 2011-03-15 18:06:42.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/mips/Kconfig 2011-03-15 18:15:06.000000000 +0100
+@@ -2418,6 +2418,8 @@ source "fs/Kconfig"
source "arch/mips/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.38-rc8/arch/mips/kernel/ptrace.c linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/mips/kernel/ptrace.c
---- linux-2.6.38-rc8/arch/mips/kernel/ptrace.c 2011-01-05 21:49:06.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/mips/kernel/ptrace.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/mips/kernel/ptrace.c linux-2.6.38.1-vs2.3.0.37-rc9/arch/mips/kernel/ptrace.c
+--- linux-2.6.38.1/arch/mips/kernel/ptrace.c 2011-01-05 21:49:06.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/mips/kernel/ptrace.c 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/arch/mips/kernel/scall32-o32.S linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/mips/kernel/scall32-o32.S
---- linux-2.6.38-rc8/arch/mips/kernel/scall32-o32.S 2010-10-21 13:06:54.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/mips/kernel/scall32-o32.S 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/mips/kernel/scall32-o32.S linux-2.6.38.1-vs2.3.0.37-rc9/arch/mips/kernel/scall32-o32.S
+--- linux-2.6.38.1/arch/mips/kernel/scall32-o32.S 2010-10-21 13:06:54.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/mips/kernel/scall32-o32.S 2011-01-29 02:01:07.000000000 +0100
@@ -524,7 +524,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-2.6.38-rc8/arch/mips/kernel/scall64-64.S linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/mips/kernel/scall64-64.S
---- linux-2.6.38-rc8/arch/mips/kernel/scall64-64.S 2010-10-21 13:06:54.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/mips/kernel/scall64-64.S 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/mips/kernel/scall64-64.S linux-2.6.38.1-vs2.3.0.37-rc9/arch/mips/kernel/scall64-64.S
+--- linux-2.6.38.1/arch/mips/kernel/scall64-64.S 2010-10-21 13:06:54.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/mips/kernel/scall64-64.S 2011-01-29 02:01:07.000000000 +0100
@@ -363,7 +363,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-2.6.38-rc8/arch/mips/kernel/scall64-n32.S linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/mips/kernel/scall64-n32.S
---- linux-2.6.38-rc8/arch/mips/kernel/scall64-n32.S 2010-10-21 13:06:54.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/mips/kernel/scall64-n32.S 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/mips/kernel/scall64-n32.S linux-2.6.38.1-vs2.3.0.37-rc9/arch/mips/kernel/scall64-n32.S
+--- linux-2.6.38.1/arch/mips/kernel/scall64-n32.S 2010-10-21 13:06:54.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/mips/kernel/scall64-n32.S 2011-01-29 02:01:07.000000000 +0100
@@ -362,7 +362,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-2.6.38-rc8/arch/mips/kernel/scall64-o32.S linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/mips/kernel/scall64-o32.S
---- linux-2.6.38-rc8/arch/mips/kernel/scall64-o32.S 2010-10-21 13:06:54.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/mips/kernel/scall64-o32.S 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/mips/kernel/scall64-o32.S linux-2.6.38.1-vs2.3.0.37-rc9/arch/mips/kernel/scall64-o32.S
+--- linux-2.6.38.1/arch/mips/kernel/scall64-o32.S 2010-10-21 13:06:54.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/mips/kernel/scall64-o32.S 2011-01-29 02:01:07.000000000 +0100
@@ -481,7 +481,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-2.6.38-rc8/arch/mips/kernel/traps.c linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/mips/kernel/traps.c
---- linux-2.6.38-rc8/arch/mips/kernel/traps.c 2011-03-10 17:08:44.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/mips/kernel/traps.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/mips/kernel/traps.c linux-2.6.38.1-vs2.3.0.37-rc9/arch/mips/kernel/traps.c
+--- linux-2.6.38.1/arch/mips/kernel/traps.c 2011-03-15 18:06:42.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/mips/kernel/traps.c 2011-01-29 02:01:07.000000000 +0100
@@ -343,9 +343,10 @@ void show_registers(struct pt_regs *regs
__show_regs(regs);
if (cpu_has_userlocal) {
unsigned long tls;
-diff -NurpP --minimal linux-2.6.38-rc8/arch/parisc/Kconfig linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/parisc/Kconfig
---- linux-2.6.38-rc8/arch/parisc/Kconfig 2011-03-10 17:08:44.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/parisc/Kconfig 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/parisc/Kconfig linux-2.6.38.1-vs2.3.0.37-rc9/arch/parisc/Kconfig
+--- linux-2.6.38.1/arch/parisc/Kconfig 2011-03-15 18:06:43.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/parisc/Kconfig 2011-01-29 02:01:07.000000000 +0100
@@ -283,6 +283,8 @@ source "fs/Kconfig"
source "arch/parisc/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.38-rc8/arch/parisc/kernel/syscall_table.S linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/parisc/kernel/syscall_table.S
---- linux-2.6.38-rc8/arch/parisc/kernel/syscall_table.S 2011-01-05 21:49:09.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/parisc/kernel/syscall_table.S 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/parisc/kernel/syscall_table.S linux-2.6.38.1-vs2.3.0.37-rc9/arch/parisc/kernel/syscall_table.S
+--- linux-2.6.38.1/arch/parisc/kernel/syscall_table.S 2011-01-05 21:49:09.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/parisc/kernel/syscall_table.S 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/arch/parisc/kernel/traps.c linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/parisc/kernel/traps.c
---- linux-2.6.38-rc8/arch/parisc/kernel/traps.c 2009-09-10 15:25:40.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/parisc/kernel/traps.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/parisc/kernel/traps.c linux-2.6.38.1-vs2.3.0.37-rc9/arch/parisc/kernel/traps.c
+--- linux-2.6.38.1/arch/parisc/kernel/traps.c 2009-09-10 15:25:40.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/parisc/kernel/traps.c 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/arch/parisc/mm/fault.c linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/parisc/mm/fault.c
---- linux-2.6.38-rc8/arch/parisc/mm/fault.c 2010-08-02 16:52:06.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/parisc/mm/fault.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/parisc/mm/fault.c linux-2.6.38.1-vs2.3.0.37-rc9/arch/parisc/mm/fault.c
+--- linux-2.6.38.1/arch/parisc/mm/fault.c 2010-08-02 16:52:06.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/parisc/mm/fault.c 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/arch/powerpc/Kconfig linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/powerpc/Kconfig
---- linux-2.6.38-rc8/arch/powerpc/Kconfig 2011-03-10 17:08:44.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/powerpc/Kconfig 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/powerpc/Kconfig linux-2.6.38.1-vs2.3.0.37-rc9/arch/powerpc/Kconfig
+--- linux-2.6.38.1/arch/powerpc/Kconfig 2011-03-15 18:06:43.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/powerpc/Kconfig 2011-01-29 02:01:07.000000000 +0100
@@ -964,6 +964,8 @@ source "lib/Kconfig"
source "arch/powerpc/Kconfig.debug"
source "security/Kconfig"
config KEYS_COMPAT
-diff -NurpP --minimal linux-2.6.38-rc8/arch/powerpc/include/asm/unistd.h linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/powerpc/include/asm/unistd.h
---- linux-2.6.38-rc8/arch/powerpc/include/asm/unistd.h 2011-01-05 21:49:10.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/powerpc/include/asm/unistd.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/powerpc/include/asm/unistd.h linux-2.6.38.1-vs2.3.0.37-rc9/arch/powerpc/include/asm/unistd.h
+--- linux-2.6.38.1/arch/powerpc/include/asm/unistd.h 2011-01-05 21:49:10.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/powerpc/include/asm/unistd.h 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/arch/powerpc/kernel/process.c linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/powerpc/kernel/process.c
---- linux-2.6.38-rc8/arch/powerpc/kernel/process.c 2011-03-10 17:08:44.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/powerpc/kernel/process.c 2011-03-10 17:21:19.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/powerpc/kernel/process.c linux-2.6.38.1-vs2.3.0.37-rc9/arch/powerpc/kernel/process.c
+--- linux-2.6.38.1/arch/powerpc/kernel/process.c 2011-03-15 18:06:44.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/powerpc/kernel/process.c 2011-03-10 17:21:19.000000000 +0100
@@ -635,8 +635,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-2.6.38-rc8/arch/powerpc/kernel/traps.c linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/powerpc/kernel/traps.c
---- linux-2.6.38-rc8/arch/powerpc/kernel/traps.c 2011-03-10 17:08:44.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/powerpc/kernel/traps.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/powerpc/kernel/traps.c linux-2.6.38.1-vs2.3.0.37-rc9/arch/powerpc/kernel/traps.c
+--- linux-2.6.38.1/arch/powerpc/kernel/traps.c 2011-03-15 18:06:44.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/powerpc/kernel/traps.c 2011-01-29 02:01:07.000000000 +0100
@@ -1043,8 +1043,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-2.6.38-rc8/arch/powerpc/kernel/vdso.c linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/powerpc/kernel/vdso.c
---- linux-2.6.38-rc8/arch/powerpc/kernel/vdso.c 2011-01-05 21:49:11.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/powerpc/kernel/vdso.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/powerpc/kernel/vdso.c linux-2.6.38.1-vs2.3.0.37-rc9/arch/powerpc/kernel/vdso.c
+--- linux-2.6.38.1/arch/powerpc/kernel/vdso.c 2011-01-05 21:49:11.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/powerpc/kernel/vdso.c 2011-01-29 02:01:07.000000000 +0100
@@ -23,6 +23,7 @@
#include <linux/security.h>
#include <linux/bootmem.h>
#include <asm/pgtable.h>
#include <asm/system.h>
-diff -NurpP --minimal linux-2.6.38-rc8/arch/s390/Kconfig linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/s390/Kconfig
---- linux-2.6.38-rc8/arch/s390/Kconfig 2011-03-10 17:08:45.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/s390/Kconfig 2011-02-17 02:17:45.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/s390/Kconfig linux-2.6.38.1-vs2.3.0.37-rc9/arch/s390/Kconfig
+--- linux-2.6.38.1/arch/s390/Kconfig 2011-03-15 18:06:45.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/s390/Kconfig 2011-02-17 02:17:45.000000000 +0100
@@ -645,6 +645,8 @@ source "fs/Kconfig"
source "arch/s390/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.38-rc8/arch/s390/include/asm/tlb.h linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/s390/include/asm/tlb.h
---- linux-2.6.38-rc8/arch/s390/include/asm/tlb.h 2011-03-10 17:08:45.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/s390/include/asm/tlb.h 2011-02-17 02:17:45.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/s390/include/asm/tlb.h linux-2.6.38.1-vs2.3.0.37-rc9/arch/s390/include/asm/tlb.h
+--- linux-2.6.38.1/arch/s390/include/asm/tlb.h 2011-03-15 18:06:45.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/s390/include/asm/tlb.h 2011-02-17 02:17:45.000000000 +0100
@@ -24,6 +24,8 @@
#include <linux/mm.h>
#include <linux/pagemap.h>
#include <asm/processor.h>
#include <asm/pgalloc.h>
#include <asm/smp.h>
-diff -NurpP --minimal linux-2.6.38-rc8/arch/s390/include/asm/unistd.h linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/s390/include/asm/unistd.h
---- linux-2.6.38-rc8/arch/s390/include/asm/unistd.h 2010-10-21 13:06:58.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/s390/include/asm/unistd.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/s390/include/asm/unistd.h linux-2.6.38.1-vs2.3.0.37-rc9/arch/s390/include/asm/unistd.h
+--- linux-2.6.38.1/arch/s390/include/asm/unistd.h 2010-10-21 13:06:58.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/s390/include/asm/unistd.h 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/arch/s390/kernel/ptrace.c linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/s390/kernel/ptrace.c
---- linux-2.6.38-rc8/arch/s390/kernel/ptrace.c 2011-03-10 17:08:45.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/s390/kernel/ptrace.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/s390/kernel/ptrace.c linux-2.6.38.1-vs2.3.0.37-rc9/arch/s390/kernel/ptrace.c
+--- linux-2.6.38.1/arch/s390/kernel/ptrace.c 2011-03-15 18:06:45.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/s390/kernel/ptrace.c 2011-01-29 02:01:07.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-2.6.38-rc8/arch/s390/kernel/syscalls.S linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/s390/kernel/syscalls.S
---- linux-2.6.38-rc8/arch/s390/kernel/syscalls.S 2010-10-21 13:06:58.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/s390/kernel/syscalls.S 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/s390/kernel/syscalls.S linux-2.6.38.1-vs2.3.0.37-rc9/arch/s390/kernel/syscalls.S
+--- linux-2.6.38.1/arch/s390/kernel/syscalls.S 2010-10-21 13:06:58.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/s390/kernel/syscalls.S 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/arch/sh/Kconfig linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/sh/Kconfig
---- linux-2.6.38-rc8/arch/sh/Kconfig 2011-03-10 17:08:45.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/sh/Kconfig 2011-02-02 22:20:22.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/sh/Kconfig linux-2.6.38.1-vs2.3.0.37-rc9/arch/sh/Kconfig
+--- linux-2.6.38.1/arch/sh/Kconfig 2011-03-15 18:06:46.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/sh/Kconfig 2011-02-02 22:20:22.000000000 +0100
@@ -889,6 +889,8 @@ source "fs/Kconfig"
source "arch/sh/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.38-rc8/arch/sh/kernel/irq.c linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/sh/kernel/irq.c
---- linux-2.6.38-rc8/arch/sh/kernel/irq.c 2011-01-05 21:49:16.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/sh/kernel/irq.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/sh/kernel/irq.c linux-2.6.38.1-vs2.3.0.37-rc9/arch/sh/kernel/irq.c
+--- linux-2.6.38.1/arch/sh/kernel/irq.c 2011-01-05 21:49:16.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/sh/kernel/irq.c 2011-01-29 02:01:07.000000000 +0100
@@ -13,6 +13,7 @@
#include <linux/seq_file.h>
#include <linux/ftrace.h>
#include <asm/processor.h>
#include <asm/machvec.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.38-rc8/arch/sh/kernel/vsyscall/vsyscall.c linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/sh/kernel/vsyscall/vsyscall.c
---- linux-2.6.38-rc8/arch/sh/kernel/vsyscall/vsyscall.c 2010-07-07 18:31:10.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/sh/kernel/vsyscall/vsyscall.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/sh/kernel/vsyscall/vsyscall.c linux-2.6.38.1-vs2.3.0.37-rc9/arch/sh/kernel/vsyscall/vsyscall.c
+--- linux-2.6.38.1/arch/sh/kernel/vsyscall/vsyscall.c 2010-07-07 18:31:10.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/sh/kernel/vsyscall/vsyscall.c 2011-01-29 02:01:07.000000000 +0100
@@ -18,6 +18,7 @@
#include <linux/elf.h>
#include <linux/sched.h>
/*
* Should the kernel map a VDSO page into processes and pass its
-diff -NurpP --minimal linux-2.6.38-rc8/arch/sparc/Kconfig linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/sparc/Kconfig
---- linux-2.6.38-rc8/arch/sparc/Kconfig 2011-03-10 17:08:47.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/sparc/Kconfig 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/sparc/Kconfig linux-2.6.38.1-vs2.3.0.37-rc9/arch/sparc/Kconfig
+--- linux-2.6.38.1/arch/sparc/Kconfig 2011-03-15 18:06:47.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/sparc/Kconfig 2011-01-29 02:01:07.000000000 +0100
@@ -553,6 +553,8 @@ source "fs/Kconfig"
source "arch/sparc/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.38-rc8/arch/sparc/include/asm/tlb_64.h linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/sparc/include/asm/tlb_64.h
---- linux-2.6.38-rc8/arch/sparc/include/asm/tlb_64.h 2009-09-10 15:25:45.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/sparc/include/asm/tlb_64.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/sparc/include/asm/tlb_64.h linux-2.6.38.1-vs2.3.0.37-rc9/arch/sparc/include/asm/tlb_64.h
+--- linux-2.6.38.1/arch/sparc/include/asm/tlb_64.h 2009-09-10 15:25:45.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/sparc/include/asm/tlb_64.h 2011-01-29 02:01:07.000000000 +0100
@@ -3,6 +3,7 @@
#include <linux/swap.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
#include <asm/mmu_context.h>
-diff -NurpP --minimal linux-2.6.38-rc8/arch/sparc/include/asm/unistd.h linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/sparc/include/asm/unistd.h
---- linux-2.6.38-rc8/arch/sparc/include/asm/unistd.h 2010-10-21 13:06:58.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/sparc/include/asm/unistd.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/sparc/include/asm/unistd.h linux-2.6.38.1-vs2.3.0.37-rc9/arch/sparc/include/asm/unistd.h
+--- linux-2.6.38.1/arch/sparc/include/asm/unistd.h 2010-10-21 13:06:58.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/sparc/include/asm/unistd.h 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/arch/sparc/kernel/systbls_32.S linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/sparc/kernel/systbls_32.S
---- linux-2.6.38-rc8/arch/sparc/kernel/systbls_32.S 2010-10-21 13:06:59.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/sparc/kernel/systbls_32.S 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/sparc/kernel/systbls_32.S linux-2.6.38.1-vs2.3.0.37-rc9/arch/sparc/kernel/systbls_32.S
+--- linux-2.6.38.1/arch/sparc/kernel/systbls_32.S 2010-10-21 13:06:59.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/sparc/kernel/systbls_32.S 2011-01-29 02:01:07.000000000 +0100
@@ -70,7 +70,7 @@ sys_call_table:
/*250*/ .long sys_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nfsservctl
/*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-2.6.38-rc8/arch/sparc/kernel/systbls_64.S linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/sparc/kernel/systbls_64.S
---- linux-2.6.38-rc8/arch/sparc/kernel/systbls_64.S 2010-10-21 13:06:59.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/sparc/kernel/systbls_64.S 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/sparc/kernel/systbls_64.S linux-2.6.38.1-vs2.3.0.37-rc9/arch/sparc/kernel/systbls_64.S
+--- linux-2.6.38.1/arch/sparc/kernel/systbls_64.S 2010-10-21 13:06:59.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/sparc/kernel/systbls_64.S 2011-01-29 02:01:07.000000000 +0100
@@ -71,7 +71,7 @@ sys_call_table32:
/*250*/ .word sys_mremap, compat_sys_sysctl, sys32_getsid, sys_fdatasync, sys32_nfsservctl
.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-2.6.38-rc8/arch/um/Kconfig.rest linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/um/Kconfig.rest
---- linux-2.6.38-rc8/arch/um/Kconfig.rest 2009-06-11 17:12:19.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/um/Kconfig.rest 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/um/Kconfig.rest linux-2.6.38.1-vs2.3.0.37-rc9/arch/um/Kconfig.rest
+--- linux-2.6.38.1/arch/um/Kconfig.rest 2009-06-11 17:12:19.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/um/Kconfig.rest 2011-01-29 02:01:07.000000000 +0100
@@ -18,6 +18,8 @@ source "drivers/connector/Kconfig"
source "fs/Kconfig"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.38-rc8/arch/um/include/asm/tlb.h linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/um/include/asm/tlb.h
---- linux-2.6.38-rc8/arch/um/include/asm/tlb.h 2009-09-10 15:25:46.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/um/include/asm/tlb.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/um/include/asm/tlb.h linux-2.6.38.1-vs2.3.0.37-rc9/arch/um/include/asm/tlb.h
+--- linux-2.6.38.1/arch/um/include/asm/tlb.h 2009-09-10 15:25:46.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/um/include/asm/tlb.h 2011-01-29 02:01:07.000000000 +0100
@@ -3,6 +3,7 @@
#include <linux/pagemap.h>
#include <asm/percpu.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-2.6.38-rc8/arch/um/include/shared/kern_constants.h linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/um/include/shared/kern_constants.h
---- linux-2.6.38-rc8/arch/um/include/shared/kern_constants.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/um/include/shared/kern_constants.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/um/include/shared/kern_constants.h linux-2.6.38.1-vs2.3.0.37-rc9/arch/um/include/shared/kern_constants.h
+--- linux-2.6.38.1/arch/um/include/shared/kern_constants.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/um/include/shared/kern_constants.h 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../include/generated/asm-offsets.h"
-diff -NurpP --minimal linux-2.6.38-rc8/arch/um/include/shared/user_constants.h linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/um/include/shared/user_constants.h
---- linux-2.6.38-rc8/arch/um/include/shared/user_constants.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/um/include/shared/user_constants.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/um/include/shared/user_constants.h linux-2.6.38.1-vs2.3.0.37-rc9/arch/um/include/shared/user_constants.h
+--- linux-2.6.38.1/arch/um/include/shared/user_constants.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/um/include/shared/user_constants.h 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/arch/x86/Kconfig linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/x86/Kconfig
---- linux-2.6.38-rc8/arch/x86/Kconfig 2011-03-10 17:08:47.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/x86/Kconfig 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/x86/Kconfig linux-2.6.38.1-vs2.3.0.37-rc9/arch/x86/Kconfig
+--- linux-2.6.38.1/arch/x86/Kconfig 2011-03-15 18:06:48.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/x86/Kconfig 2011-01-29 02:01:07.000000000 +0100
@@ -2159,6 +2159,8 @@ source "fs/Kconfig"
source "arch/x86/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.38-rc8/arch/x86/ia32/ia32entry.S linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/x86/ia32/ia32entry.S
---- linux-2.6.38-rc8/arch/x86/ia32/ia32entry.S 2010-10-21 13:06:59.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/x86/ia32/ia32entry.S 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/x86/ia32/ia32entry.S linux-2.6.38.1-vs2.3.0.37-rc9/arch/x86/ia32/ia32entry.S
+--- linux-2.6.38.1/arch/x86/ia32/ia32entry.S 2010-10-21 13:06:59.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/x86/ia32/ia32entry.S 2011-01-29 02:01:07.000000000 +0100
@@ -783,7 +783,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-2.6.38-rc8/arch/x86/include/asm/unistd_64.h linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/x86/include/asm/unistd_64.h
---- linux-2.6.38-rc8/arch/x86/include/asm/unistd_64.h 2010-10-21 13:06:59.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/x86/include/asm/unistd_64.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/x86/include/asm/unistd_64.h linux-2.6.38.1-vs2.3.0.37-rc9/arch/x86/include/asm/unistd_64.h
+--- linux-2.6.38.1/arch/x86/include/asm/unistd_64.h 2010-10-21 13:06:59.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/x86/include/asm/unistd_64.h 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/arch/x86/kernel/syscall_table_32.S linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/x86/kernel/syscall_table_32.S
---- linux-2.6.38-rc8/arch/x86/kernel/syscall_table_32.S 2010-10-21 13:07:00.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/arch/x86/kernel/syscall_table_32.S 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/arch/x86/kernel/syscall_table_32.S linux-2.6.38.1-vs2.3.0.37-rc9/arch/x86/kernel/syscall_table_32.S
+--- linux-2.6.38.1/arch/x86/kernel/syscall_table_32.S 2010-10-21 13:07:00.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/arch/x86/kernel/syscall_table_32.S 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/drivers/block/Kconfig linux-2.6.38-rc8-vs2.3.0.37-rc6/drivers/block/Kconfig
---- linux-2.6.38-rc8/drivers/block/Kconfig 2011-03-10 17:08:52.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/drivers/block/Kconfig 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/drivers/block/Kconfig linux-2.6.38.1-vs2.3.0.37-rc9/drivers/block/Kconfig
+--- linux-2.6.38.1/drivers/block/Kconfig 2011-03-15 18:06:54.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/drivers/block/Kconfig 2011-01-29 02:01:07.000000000 +0100
@@ -273,6 +273,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-2.6.38-rc8/drivers/block/Makefile linux-2.6.38-rc8-vs2.3.0.37-rc6/drivers/block/Makefile
---- linux-2.6.38-rc8/drivers/block/Makefile 2011-03-10 17:08:52.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/drivers/block/Makefile 2011-02-17 02:17:45.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/drivers/block/Makefile linux-2.6.38.1-vs2.3.0.37-rc9/drivers/block/Makefile
+--- linux-2.6.38.1/drivers/block/Makefile 2011-03-15 18:06:54.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/drivers/block/Makefile 2011-02-17 02:17:45.000000000 +0100
@@ -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_BLK_DEV_DRBD) += drbd/
-diff -NurpP --minimal linux-2.6.38-rc8/drivers/block/loop.c linux-2.6.38-rc8-vs2.3.0.37-rc6/drivers/block/loop.c
---- linux-2.6.38-rc8/drivers/block/loop.c 2011-03-10 17:08:52.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/drivers/block/loop.c 2011-03-10 17:21:19.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/drivers/block/loop.c linux-2.6.38.1-vs2.3.0.37-rc9/drivers/block/loop.c
+--- linux-2.6.38.1/drivers/block/loop.c 2011-03-15 18:06:54.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/drivers/block/loop.c 2011-03-10 17:21:19.000000000 +0100
@@ -75,6 +75,7 @@
#include <linux/kthread.h>
#include <linux/splice.h>
mutex_lock(&lo->lo_ctl_mutex);
lo->lo_refcnt++;
mutex_unlock(&lo->lo_ctl_mutex);
-diff -NurpP --minimal linux-2.6.38-rc8/drivers/block/vroot.c linux-2.6.38-rc8-vs2.3.0.37-rc6/drivers/block/vroot.c
---- linux-2.6.38-rc8/drivers/block/vroot.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/drivers/block/vroot.c 2011-01-29 02:01:07.000000000 +0100
-@@ -0,0 +1,282 @@
+diff -NurpP --minimal linux-2.6.38.1/drivers/block/vroot.c linux-2.6.38.1-vs2.3.0.37-rc9/drivers/block/vroot.c
+--- linux-2.6.38.1/drivers/block/vroot.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/drivers/block/vroot.c 2011-03-17 18:14:05.000000000 +0100
+@@ -0,0 +1,292 @@
+/*
+ * linux/drivers/block/vroot.c
+ *
+ .ioctl = vr_ioctl,
+};
+
++static int vroot_make_request(struct request_queue *q, struct bio *bio)
++{
++ printk("vroot_make_request %p, %p\n", q, bio);
++ bio_io_error(bio);
++ return 0;
++}
++
+struct block_device *__vroot_get_real_bdev(struct block_device *bdev)
+{
+ struct inode *inode = bdev->bd_inode;
+ return real_bdev;
+}
+
++
++
+/*
+ * And now the modules code and kernel interface.
+ */
+ disks[i]->queue = blk_alloc_queue(GFP_KERNEL);
+ if (!disks[i]->queue)
+ goto out_mem3;
++ blk_queue_make_request(disks[i]->queue, vroot_make_request);
+ }
+
+ for (i = 0; i < max_vroot; i++) {
+
+#endif
+
-diff -NurpP --minimal linux-2.6.38-rc8/drivers/gpu/drm/radeon/r100_reg_safe.h linux-2.6.38-rc8-vs2.3.0.37-rc6/drivers/gpu/drm/radeon/r100_reg_safe.h
---- linux-2.6.38-rc8/drivers/gpu/drm/radeon/r100_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/drivers/gpu/drm/radeon/r100_reg_safe.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/drivers/gpu/drm/radeon/r100_reg_safe.h linux-2.6.38.1-vs2.3.0.37-rc9/drivers/gpu/drm/radeon/r100_reg_safe.h
+--- linux-2.6.38.1/drivers/gpu/drm/radeon/r100_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/drivers/gpu/drm/radeon/r100_reg_safe.h 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,28 @@
+static const unsigned r100_reg_safe_bm[102] = {
+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+ 0xFFFFFFFF, 0xFFFFFFEF,
+};
-diff -NurpP --minimal linux-2.6.38-rc8/drivers/gpu/drm/radeon/r200_reg_safe.h linux-2.6.38-rc8-vs2.3.0.37-rc6/drivers/gpu/drm/radeon/r200_reg_safe.h
---- linux-2.6.38-rc8/drivers/gpu/drm/radeon/r200_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/drivers/gpu/drm/radeon/r200_reg_safe.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/drivers/gpu/drm/radeon/r200_reg_safe.h linux-2.6.38.1-vs2.3.0.37-rc9/drivers/gpu/drm/radeon/r200_reg_safe.h
+--- linux-2.6.38.1/drivers/gpu/drm/radeon/r200_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/drivers/gpu/drm/radeon/r200_reg_safe.h 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,28 @@
+static const unsigned r200_reg_safe_bm[102] = {
+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+ 0xFFFFFE3F, 0xFFFFFFEF,
+};
-diff -NurpP --minimal linux-2.6.38-rc8/drivers/gpu/drm/radeon/r300_reg_safe.h linux-2.6.38-rc8-vs2.3.0.37-rc6/drivers/gpu/drm/radeon/r300_reg_safe.h
---- linux-2.6.38-rc8/drivers/gpu/drm/radeon/r300_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/drivers/gpu/drm/radeon/r300_reg_safe.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/drivers/gpu/drm/radeon/r300_reg_safe.h linux-2.6.38.1-vs2.3.0.37-rc9/drivers/gpu/drm/radeon/r300_reg_safe.h
+--- linux-2.6.38.1/drivers/gpu/drm/radeon/r300_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/drivers/gpu/drm/radeon/r300_reg_safe.h 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,42 @@
+static const unsigned r300_reg_safe_bm[159] = {
+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+ 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+ 0x0003FC01, 0xFFFFFCF8, 0xFF800B19,
+};
-diff -NurpP --minimal linux-2.6.38-rc8/drivers/gpu/drm/radeon/r420_reg_safe.h linux-2.6.38-rc8-vs2.3.0.37-rc6/drivers/gpu/drm/radeon/r420_reg_safe.h
---- linux-2.6.38-rc8/drivers/gpu/drm/radeon/r420_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/drivers/gpu/drm/radeon/r420_reg_safe.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/drivers/gpu/drm/radeon/r420_reg_safe.h linux-2.6.38.1-vs2.3.0.37-rc9/drivers/gpu/drm/radeon/r420_reg_safe.h
+--- linux-2.6.38.1/drivers/gpu/drm/radeon/r420_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/drivers/gpu/drm/radeon/r420_reg_safe.h 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,42 @@
+static const unsigned r420_reg_safe_bm[159] = {
+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+ 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+ 0x0003FC01, 0xFFFFFCF8, 0xFF800B19,
+};
-diff -NurpP --minimal linux-2.6.38-rc8/drivers/gpu/drm/radeon/rn50_reg_safe.h linux-2.6.38-rc8-vs2.3.0.37-rc6/drivers/gpu/drm/radeon/rn50_reg_safe.h
---- linux-2.6.38-rc8/drivers/gpu/drm/radeon/rn50_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/drivers/gpu/drm/radeon/rn50_reg_safe.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/drivers/gpu/drm/radeon/rn50_reg_safe.h linux-2.6.38.1-vs2.3.0.37-rc9/drivers/gpu/drm/radeon/rn50_reg_safe.h
+--- linux-2.6.38.1/drivers/gpu/drm/radeon/rn50_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/drivers/gpu/drm/radeon/rn50_reg_safe.h 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,28 @@
+static const unsigned rn50_reg_safe_bm[102] = {
+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+ 0xFFFFFFFF, 0xFFFFFFFF,
+};
-diff -NurpP --minimal linux-2.6.38-rc8/drivers/gpu/drm/radeon/rs600_reg_safe.h linux-2.6.38-rc8-vs2.3.0.37-rc6/drivers/gpu/drm/radeon/rs600_reg_safe.h
---- linux-2.6.38-rc8/drivers/gpu/drm/radeon/rs600_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/drivers/gpu/drm/radeon/rs600_reg_safe.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/drivers/gpu/drm/radeon/rs600_reg_safe.h linux-2.6.38.1-vs2.3.0.37-rc9/drivers/gpu/drm/radeon/rs600_reg_safe.h
+--- linux-2.6.38.1/drivers/gpu/drm/radeon/rs600_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/drivers/gpu/drm/radeon/rs600_reg_safe.h 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,57 @@
+static const unsigned rs600_reg_safe_bm[219] = {
+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+};
-diff -NurpP --minimal linux-2.6.38-rc8/drivers/gpu/drm/radeon/rv515_reg_safe.h linux-2.6.38-rc8-vs2.3.0.37-rc6/drivers/gpu/drm/radeon/rv515_reg_safe.h
---- linux-2.6.38-rc8/drivers/gpu/drm/radeon/rv515_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/drivers/gpu/drm/radeon/rv515_reg_safe.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/drivers/gpu/drm/radeon/rv515_reg_safe.h linux-2.6.38.1-vs2.3.0.37-rc9/drivers/gpu/drm/radeon/rv515_reg_safe.h
+--- linux-2.6.38.1/drivers/gpu/drm/radeon/rv515_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/drivers/gpu/drm/radeon/rv515_reg_safe.h 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,57 @@
+static const unsigned rv515_reg_safe_bm[219] = {
+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+};
-diff -NurpP --minimal linux-2.6.38-rc8/drivers/infiniband/core/addr.c linux-2.6.38-rc8-vs2.3.0.37-rc6/drivers/infiniband/core/addr.c
---- linux-2.6.38-rc8/drivers/infiniband/core/addr.c 2011-03-10 17:08:55.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/drivers/infiniband/core/addr.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/drivers/infiniband/core/addr.c linux-2.6.38.1-vs2.3.0.37-rc9/drivers/infiniband/core/addr.c
+--- linux-2.6.38.1/drivers/infiniband/core/addr.c 2011-03-15 18:06:57.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/drivers/infiniband/core/addr.c 2011-01-29 02:01:07.000000000 +0100
@@ -252,7 +252,7 @@ static int addr6_resolve(struct sockaddr
if (ipv6_addr_any(&fl.fl6_src)) {
if (ret)
goto put;
-diff -NurpP --minimal linux-2.6.38-rc8/drivers/infiniband/hw/ipath/ipath_user_pages.c linux-2.6.38-rc8-vs2.3.0.37-rc6/drivers/infiniband/hw/ipath/ipath_user_pages.c
---- linux-2.6.38-rc8/drivers/infiniband/hw/ipath/ipath_user_pages.c 2011-03-10 17:08:55.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/drivers/infiniband/hw/ipath/ipath_user_pages.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/drivers/infiniband/hw/ipath/ipath_user_pages.c linux-2.6.38.1-vs2.3.0.37-rc9/drivers/infiniband/hw/ipath/ipath_user_pages.c
+--- linux-2.6.38.1/drivers/infiniband/hw/ipath/ipath_user_pages.c 2011-03-15 18:06:58.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/drivers/infiniband/hw/ipath/ipath_user_pages.c 2011-01-29 02:01:07.000000000 +0100
@@ -35,6 +35,7 @@
#include <linux/device.h>
#include <linux/slab.h>
#include "ipath_kernel.h"
-diff -NurpP --minimal linux-2.6.38-rc8/drivers/md/dm-ioctl.c linux-2.6.38-rc8-vs2.3.0.37-rc6/drivers/md/dm-ioctl.c
---- linux-2.6.38-rc8/drivers/md/dm-ioctl.c 2011-03-10 17:08:57.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/drivers/md/dm-ioctl.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/drivers/md/dm-ioctl.c linux-2.6.38.1-vs2.3.0.37-rc9/drivers/md/dm-ioctl.c
+--- linux-2.6.38.1/drivers/md/dm-ioctl.c 2011-03-15 18:07:02.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/drivers/md/dm-ioctl.c 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/drivers/md/dm.c linux-2.6.38-rc8-vs2.3.0.37-rc6/drivers/md/dm.c
---- linux-2.6.38-rc8/drivers/md/dm.c 2011-03-10 17:08:57.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/drivers/md/dm.c 2011-01-29 03:26:19.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/drivers/md/dm.c linux-2.6.38.1-vs2.3.0.37-rc9/drivers/md/dm.c
+--- linux-2.6.38.1/drivers/md/dm.c 2011-03-15 18:07:02.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/drivers/md/dm.c 2011-01-29 03:26:19.000000000 +0100
@@ -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-2.6.38-rc8/drivers/md/dm.h linux-2.6.38-rc8-vs2.3.0.37-rc6/drivers/md/dm.h
---- linux-2.6.38-rc8/drivers/md/dm.h 2010-10-21 13:07:07.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/drivers/md/dm.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/drivers/md/dm.h linux-2.6.38.1-vs2.3.0.37-rc9/drivers/md/dm.h
+--- linux-2.6.38.1/drivers/md/dm.h 2010-10-21 13:07:07.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/drivers/md/dm.h 2011-01-29 02:01:07.000000000 +0100
@@ -41,6 +41,8 @@ struct dm_dev_internal {
struct dm_table;
struct dm_md_mempools;
/*-----------------------------------------------------------------
* Internal table functions.
*---------------------------------------------------------------*/
-diff -NurpP --minimal linux-2.6.38-rc8/drivers/net/tun.c linux-2.6.38-rc8-vs2.3.0.37-rc6/drivers/net/tun.c
---- linux-2.6.38-rc8/drivers/net/tun.c 2011-03-10 17:09:05.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/drivers/net/tun.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/drivers/net/tun.c linux-2.6.38.1-vs2.3.0.37-rc9/drivers/net/tun.c
+--- linux-2.6.38.1/drivers/net/tun.c 2011-03-15 18:07:12.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/drivers/net/tun.c 2011-01-29 02:01:07.000000000 +0100
@@ -62,6 +62,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-2.6.38-rc8/drivers/tty/sysrq.c linux-2.6.38-rc8-vs2.3.0.37-rc6/drivers/tty/sysrq.c
---- linux-2.6.38-rc8/drivers/tty/sysrq.c 2011-03-10 17:09:16.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/drivers/tty/sysrq.c 2011-02-17 02:17:49.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/drivers/tty/sysrq.c linux-2.6.38.1-vs2.3.0.37-rc9/drivers/tty/sysrq.c
+--- linux-2.6.38.1/drivers/tty/sysrq.c 2011-03-15 18:07:26.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/drivers/tty/sysrq.c 2011-02-17 02:17:49.000000000 +0100
@@ -41,6 +41,7 @@
#include <linux/oom.h>
#include <linux/slab.h>
else
retval = -1;
return retval;
-diff -NurpP --minimal linux-2.6.38-rc8/drivers/tty/tty_io.c linux-2.6.38-rc8-vs2.3.0.37-rc6/drivers/tty/tty_io.c
---- linux-2.6.38-rc8/drivers/tty/tty_io.c 2011-03-10 17:09:16.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/drivers/tty/tty_io.c 2011-02-02 22:20:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/drivers/tty/tty_io.c linux-2.6.38.1-vs2.3.0.37-rc9/drivers/tty/tty_io.c
+--- linux-2.6.38.1/drivers/tty/tty_io.c 2011-03-15 18:07:26.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/drivers/tty/tty_io.c 2011-02-02 22:20:24.000000000 +0100
@@ -107,6 +107,7 @@
#include <linux/kmod.h>
if (pgrp_nr < 0)
return -EINVAL;
rcu_read_lock();
-diff -NurpP --minimal linux-2.6.38-rc8/fs/attr.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/attr.c
---- linux-2.6.38-rc8/fs/attr.c 2010-10-21 13:07:47.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/attr.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/attr.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/attr.c
+--- linux-2.6.38.1/fs/attr.c 2010-10-21 13:07:47.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/attr.c 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/fs/binfmt_aout.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/binfmt_aout.c
---- linux-2.6.38-rc8/fs/binfmt_aout.c 2010-10-21 13:07:47.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/binfmt_aout.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/binfmt_aout.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/binfmt_aout.c
+--- linux-2.6.38.1/fs/binfmt_aout.c 2010-10-21 13:07:47.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/binfmt_aout.c 2011-01-29 02:01:07.000000000 +0100
@@ -25,6 +25,7 @@
#include <linux/init.h>
#include <linux/coredump.h>
#include <asm/system.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.38-rc8/fs/binfmt_elf.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/binfmt_elf.c
---- linux-2.6.38-rc8/fs/binfmt_elf.c 2011-03-10 17:09:21.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/binfmt_elf.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/binfmt_elf.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/binfmt_elf.c
+--- linux-2.6.38.1/fs/binfmt_elf.c 2011-03-15 18:07:31.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/binfmt_elf.c 2011-01-29 02:01:07.000000000 +0100
@@ -32,6 +32,7 @@
#include <linux/elf.h>
#include <linux/utsname.h>
#include <asm/uaccess.h>
#include <asm/param.h>
#include <asm/page.h>
-diff -NurpP --minimal linux-2.6.38-rc8/fs/binfmt_flat.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/binfmt_flat.c
---- linux-2.6.38-rc8/fs/binfmt_flat.c 2010-08-02 16:52:47.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/binfmt_flat.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/binfmt_flat.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/binfmt_flat.c
+--- linux-2.6.38.1/fs/binfmt_flat.c 2010-08-02 16:52:47.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/binfmt_flat.c 2011-01-29 02:01:07.000000000 +0100
@@ -35,6 +35,7 @@
#include <linux/init.h>
#include <linux/flat.h>
#include <asm/byteorder.h>
#include <asm/system.h>
-diff -NurpP --minimal linux-2.6.38-rc8/fs/binfmt_som.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/binfmt_som.c
---- linux-2.6.38-rc8/fs/binfmt_som.c 2010-02-25 11:52:04.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/binfmt_som.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/binfmt_som.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/binfmt_som.c
+--- linux-2.6.38.1/fs/binfmt_som.c 2010-02-25 11:52:04.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/binfmt_som.c 2011-01-29 02:01:07.000000000 +0100
@@ -28,6 +28,7 @@
#include <linux/shm.h>
#include <linux/personality.h>
#include <asm/uaccess.h>
#include <asm/pgtable.h>
-diff -NurpP --minimal linux-2.6.38-rc8/fs/block_dev.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/block_dev.c
---- linux-2.6.38-rc8/fs/block_dev.c 2011-03-10 17:09:22.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/block_dev.c 2011-03-07 16:53:27.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/block_dev.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/block_dev.c
+--- linux-2.6.38.1/fs/block_dev.c 2011-03-15 18:07:31.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/block_dev.c 2011-03-07 16:53:27.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-2.6.38-rc8/fs/btrfs/ctree.h linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/btrfs/ctree.h
---- linux-2.6.38-rc8/fs/btrfs/ctree.h 2011-03-10 17:09:22.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/btrfs/ctree.h 2011-03-07 16:53:27.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/btrfs/ctree.h linux-2.6.38.1-vs2.3.0.37-rc9/fs/btrfs/ctree.h
+--- linux-2.6.38.1/fs/btrfs/ctree.h 2011-03-15 18:07:31.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/btrfs/ctree.h 2011-03-15 18:15:06.000000000 +0100
@@ -587,11 +587,14 @@ struct btrfs_inode_item {
/* modification sequence number for NFS */
__le64 sequence;
struct btrfs_timespec atime;
struct btrfs_timespec ctime;
struct btrfs_timespec mtime;
-@@ -1256,6 +1259,8 @@ struct btrfs_root {
+@@ -1265,6 +1268,8 @@ struct btrfs_root {
#define BTRFS_MOUNT_USER_SUBVOL_RM_ALLOWED (1 << 14)
#define BTRFS_MOUNT_ENOSPC_DEBUG (1 << 15)
#define btrfs_clear_opt(o, opt) ((o) &= ~BTRFS_MOUNT_##opt)
#define btrfs_set_opt(o, opt) ((o) |= BTRFS_MOUNT_##opt)
#define btrfs_test_opt(root, opt) ((root)->fs_info->mount_opt & \
-@@ -1476,6 +1481,7 @@ BTRFS_SETGET_FUNCS(inode_block_group, st
+@@ -1485,6 +1490,7 @@ BTRFS_SETGET_FUNCS(inode_block_group, st
BTRFS_SETGET_FUNCS(inode_nlink, struct btrfs_inode_item, nlink, 32);
BTRFS_SETGET_FUNCS(inode_uid, struct btrfs_inode_item, uid, 32);
BTRFS_SETGET_FUNCS(inode_gid, struct btrfs_inode_item, gid, 32);
BTRFS_SETGET_FUNCS(inode_mode, struct btrfs_inode_item, mode, 32);
BTRFS_SETGET_FUNCS(inode_rdev, struct btrfs_inode_item, rdev, 64);
BTRFS_SETGET_FUNCS(inode_flags, struct btrfs_inode_item, flags, 64);
-@@ -1537,6 +1543,10 @@ BTRFS_SETGET_FUNCS(extent_flags, struct
+@@ -1546,6 +1552,10 @@ BTRFS_SETGET_FUNCS(extent_flags, struct
BTRFS_SETGET_FUNCS(extent_refs_v0, struct btrfs_extent_item_v0, refs, 32);
BTRFS_SETGET_FUNCS(tree_block_level, struct btrfs_tree_block_info, level, 8);
-@@ -2544,6 +2554,7 @@ extern const struct dentry_operations bt
+@@ -2553,6 +2563,7 @@ extern const struct dentry_operations bt
long btrfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
void btrfs_update_iflags(struct inode *inode);
void btrfs_inherit_iflags(struct inode *inode, struct inode *dir);
/* file.c */
int btrfs_sync_file(struct file *file, int datasync);
-diff -NurpP --minimal linux-2.6.38-rc8/fs/btrfs/disk-io.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/btrfs/disk-io.c
---- linux-2.6.38-rc8/fs/btrfs/disk-io.c 2011-03-10 17:09:22.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/btrfs/disk-io.c 2011-02-17 02:17:50.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/btrfs/disk-io.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/btrfs/disk-io.c
+--- linux-2.6.38.1/fs/btrfs/disk-io.c 2011-03-15 18:07:31.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/btrfs/disk-io.c 2011-02-17 02:17:50.000000000 +0100
@@ -1768,6 +1768,9 @@ struct btrfs_root *open_ctree(struct sup
goto fail_iput;
}
features = btrfs_super_incompat_flags(disk_super) &
~BTRFS_FEATURE_INCOMPAT_SUPP;
if (features) {
-diff -NurpP --minimal linux-2.6.38-rc8/fs/btrfs/inode.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/btrfs/inode.c
---- linux-2.6.38-rc8/fs/btrfs/inode.c 2011-03-10 17:09:22.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/btrfs/inode.c 2011-03-07 16:53:27.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/btrfs/inode.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/btrfs/inode.c
+--- linux-2.6.38.1/fs/btrfs/inode.c 2011-03-15 18:07:31.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/btrfs/inode.c 2011-03-15 18:15:06.000000000 +0100
@@ -37,6 +37,8 @@
#include <linux/posix_acl.h>
#include <linux/falloc.h>
btrfs_set_inode_size(leaf, item, BTRFS_I(inode)->disk_i_size);
btrfs_set_inode_mode(leaf, item, inode->i_mode);
btrfs_set_inode_nlink(leaf, item, inode->i_nlink);
-@@ -7291,6 +7307,7 @@ static const struct inode_operations btr
+@@ -7293,6 +7309,7 @@ static const struct inode_operations btr
.listxattr = btrfs_listxattr,
.removexattr = btrfs_removexattr,
.permission = btrfs_permission,
};
static const struct inode_operations btrfs_dir_ro_inode_operations = {
.lookup = btrfs_lookup,
-@@ -7365,6 +7382,7 @@ static const struct inode_operations btr
+@@ -7367,6 +7384,7 @@ static const struct inode_operations btr
.removexattr = btrfs_removexattr,
.permission = btrfs_permission,
.fiemap = btrfs_fiemap,
};
static const struct inode_operations btrfs_special_inode_operations = {
.getattr = btrfs_getattr,
-diff -NurpP --minimal linux-2.6.38-rc8/fs/btrfs/ioctl.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/btrfs/ioctl.c
---- linux-2.6.38-rc8/fs/btrfs/ioctl.c 2011-03-10 17:09:22.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/btrfs/ioctl.c 2011-03-07 16:53:27.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/btrfs/ioctl.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/btrfs/ioctl.c
+--- linux-2.6.38.1/fs/btrfs/ioctl.c 2011-03-15 18:07:31.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/btrfs/ioctl.c 2011-03-07 16:53:27.000000000 +0100
@@ -68,10 +68,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-2.6.38-rc8/fs/btrfs/super.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/btrfs/super.c
---- linux-2.6.38-rc8/fs/btrfs/super.c 2011-03-10 17:09:22.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/btrfs/super.c 2011-03-07 17:04:18.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/btrfs/super.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/btrfs/super.c
+--- linux-2.6.38.1/fs/btrfs/super.c 2011-03-15 18:07:31.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/btrfs/super.c 2011-03-07 17:04:18.000000000 +0100
@@ -155,8 +155,8 @@ enum {
Opt_nossd, Opt_ssd_spread, Opt_thread_pool, Opt_noacl, Opt_compress,
Opt_compress_type, Opt_compress_force, Opt_compress_force_type,
if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
return 0;
-diff -NurpP --minimal linux-2.6.38-rc8/fs/char_dev.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/char_dev.c
---- linux-2.6.38-rc8/fs/char_dev.c 2011-03-10 17:09:22.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/char_dev.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/char_dev.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/char_dev.c
+--- linux-2.6.38.1/fs/char_dev.c 2011-03-15 18:07:31.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/char_dev.c 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/fs/dcache.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/dcache.c
---- linux-2.6.38-rc8/fs/dcache.c 2011-03-10 17:09:22.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/dcache.c 2011-02-02 22:20:25.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/dcache.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/dcache.c
+--- linux-2.6.38.1/fs/dcache.c 2011-03-26 01:10:17.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/dcache.c 2011-03-25 22:52:15.000000000 +0100
@@ -35,6 +35,7 @@
#include <linux/hardirq.h>
#include <linux/bit_spinlock.h>
#include "internal.h"
/*
-@@ -496,6 +497,8 @@ int d_invalidate(struct dentry * dentry)
+@@ -500,6 +501,8 @@ int d_invalidate(struct dentry * dentry)
spin_lock(&dentry->d_lock);
}
/*
* Somebody else still using it?
*
-@@ -523,6 +526,7 @@ EXPORT_SYMBOL(d_invalidate);
+@@ -527,6 +530,7 @@ EXPORT_SYMBOL(d_invalidate);
static inline void __dget_dlock(struct dentry *dentry)
{
dentry->d_count++;
}
static inline void __dget(struct dentry *dentry)
-@@ -1278,6 +1282,9 @@ struct dentry *d_alloc(struct dentry * p
+@@ -1283,6 +1287,9 @@ struct dentry *d_alloc(struct dentry * p
struct dentry *dentry;
char *dname;
dentry = kmem_cache_alloc(dentry_cache, GFP_KERNEL);
if (!dentry)
return NULL;
-@@ -1299,6 +1306,7 @@ struct dentry *d_alloc(struct dentry * p
+@@ -1304,6 +1311,7 @@ struct dentry *d_alloc(struct dentry * p
dname[name->len] = 0;
dentry->d_count = 1;
dentry->d_flags = DCACHE_UNHASHED;
spin_lock_init(&dentry->d_lock);
seqcount_init(&dentry->d_seq);
-@@ -1935,6 +1943,7 @@ struct dentry *__d_lookup(struct dentry
+@@ -1962,6 +1970,7 @@ struct dentry *__d_lookup(struct dentry
}
dentry->d_count++;
found = dentry;
spin_unlock(&dentry->d_lock);
break;
-diff -NurpP --minimal linux-2.6.38-rc8/fs/devpts/inode.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/devpts/inode.c
---- linux-2.6.38-rc8/fs/devpts/inode.c 2011-01-05 21:50:22.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/devpts/inode.c 2011-01-29 05:09:48.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/devpts/inode.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/devpts/inode.c
+--- linux-2.6.38.1/fs/devpts/inode.c 2011-01-05 21:50:22.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/devpts/inode.c 2011-03-17 02:17:19.000000000 +0100
@@ -25,6 +25,7 @@
#include <linux/parser.h>
#include <linux/fsnotify.h>
extern int pty_limit; /* Config limit on Unix98 ptys */
static DEFINE_MUTEX(allocated_ptys_lock);
-@@ -263,6 +278,25 @@ static int devpts_show_options(struct se
+@@ -263,6 +278,34 @@ static int devpts_show_options(struct se
return 0;
}
+static int devpts_filter(struct dentry *de)
+{
++ xid_t xid = 0;
++
+ /* devpts is xid tagged */
-+ return vx_check((xid_t)de->d_inode->i_tag, VS_WATCH_P | VS_IDENT);
++ if (de && de->d_inode)
++ xid = (xid_t)de->d_inode->i_tag;
++#ifdef CONFIG_VSERVER_WARN_DEVPTS
++ else
++ vxwprintk_task(1, "devpts " VS_Q("%.*s") " without inode.",
++ de->d_name.len, de->d_name.name);
++#endif
++ return vx_check(xid, VS_WATCH_P | VS_IDENT);
+}
+
+static int devpts_readdir(struct file * filp, void * dirent, filldir_t filldir)
static const struct super_operations devpts_sops = {
.statfs = simple_statfs,
.remount_fs = devpts_remount,
-@@ -302,12 +336,15 @@ devpts_fill_super(struct super_block *s,
+@@ -302,12 +345,15 @@ devpts_fill_super(struct super_block *s,
inode = new_inode(s);
if (!inode)
goto free_fsi;
s->s_root = d_alloc_root(inode);
if (s->s_root)
-@@ -493,6 +530,9 @@ int devpts_pty_new(struct inode *ptmx_in
+@@ -493,6 +539,9 @@ int devpts_pty_new(struct inode *ptmx_in
inode->i_gid = opts->setgid ? opts->gid : current_fsgid();
inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
init_special_inode(inode, S_IFCHR|opts->mode, device);
inode->i_private = tty;
tty->driver_data = inode;
-diff -NurpP --minimal linux-2.6.38-rc8/fs/ext2/balloc.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ext2/balloc.c
---- linux-2.6.38-rc8/fs/ext2/balloc.c 2011-01-05 21:50:22.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ext2/balloc.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/ext2/balloc.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/ext2/balloc.c
+--- linux-2.6.38.1/fs/ext2/balloc.c 2011-01-05 21:50:22.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/ext2/balloc.c 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/fs/ext2/ext2.h linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ext2/ext2.h
---- linux-2.6.38-rc8/fs/ext2/ext2.h 2011-01-05 21:50:22.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ext2/ext2.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/ext2/ext2.h linux-2.6.38.1-vs2.3.0.37-rc9/fs/ext2/ext2.h
+--- linux-2.6.38.1/fs/ext2/ext2.h 2011-01-05 21:50:22.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/ext2/ext2.h 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/fs/ext2/file.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ext2/file.c
---- linux-2.6.38-rc8/fs/ext2/file.c 2010-08-02 16:52:48.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ext2/file.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/ext2/file.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/ext2/file.c
+--- linux-2.6.38.1/fs/ext2/file.c 2010-08-02 16:52:48.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/ext2/file.c 2011-01-29 02:01:07.000000000 +0100
@@ -104,4 +104,5 @@ const struct inode_operations ext2_file_
.setattr = ext2_setattr,
.check_acl = ext2_check_acl,
.fiemap = ext2_fiemap,
+ .sync_flags = ext2_sync_flags,
};
-diff -NurpP --minimal linux-2.6.38-rc8/fs/ext2/ialloc.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ext2/ialloc.c
---- linux-2.6.38-rc8/fs/ext2/ialloc.c 2010-10-21 13:07:48.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ext2/ialloc.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/ext2/ialloc.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/ext2/ialloc.c
+--- linux-2.6.38.1/fs/ext2/ialloc.c 2010-10-21 13:07:48.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/ext2/ialloc.c 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/fs/ext2/inode.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ext2/inode.c
---- linux-2.6.38-rc8/fs/ext2/inode.c 2011-01-05 21:50:22.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ext2/inode.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/ext2/inode.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/ext2/inode.c
+--- linux-2.6.38.1/fs/ext2/inode.c 2011-01-05 21:50:22.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/ext2/inode.c 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/fs/ext2/ioctl.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ext2/ioctl.c
---- linux-2.6.38-rc8/fs/ext2/ioctl.c 2009-09-10 15:26:21.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ext2/ioctl.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/ext2/ioctl.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/ext2/ioctl.c
+--- linux-2.6.38.1/fs/ext2/ioctl.c 2009-09-10 15:26:21.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/ext2/ioctl.c 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/fs/ext2/namei.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ext2/namei.c
---- linux-2.6.38-rc8/fs/ext2/namei.c 2011-03-10 17:09:22.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ext2/namei.c 2011-03-10 17:21:19.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/ext2/namei.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/ext2/namei.c
+--- linux-2.6.38.1/fs/ext2/namei.c 2011-03-15 18:07:31.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/ext2/namei.c 2011-03-10 17:21:19.000000000 +0100
@@ -32,6 +32,7 @@
#include <linux/pagemap.h>
};
const struct inode_operations ext2_special_inode_operations = {
-diff -NurpP --minimal linux-2.6.38-rc8/fs/ext2/super.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ext2/super.c
---- linux-2.6.38-rc8/fs/ext2/super.c 2011-03-10 17:09:22.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ext2/super.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/ext2/super.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/ext2/super.c
+--- linux-2.6.38.1/fs/ext2/super.c 2011-03-15 18:07:31.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/ext2/super.c 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/fs/ext3/file.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ext3/file.c
---- linux-2.6.38-rc8/fs/ext3/file.c 2010-07-07 18:31:51.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ext3/file.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/ext3/file.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/ext3/file.c
+--- linux-2.6.38.1/fs/ext3/file.c 2010-07-07 18:31:51.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/ext3/file.c 2011-01-29 02:01:07.000000000 +0100
@@ -81,5 +81,6 @@ const struct inode_operations ext3_file_
#endif
.check_acl = ext3_check_acl,
+ .sync_flags = ext3_sync_flags,
};
-diff -NurpP --minimal linux-2.6.38-rc8/fs/ext3/ialloc.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ext3/ialloc.c
---- linux-2.6.38-rc8/fs/ext3/ialloc.c 2011-01-05 21:50:22.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ext3/ialloc.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/ext3/ialloc.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/ext3/ialloc.c
+--- linux-2.6.38.1/fs/ext3/ialloc.c 2011-01-05 21:50:22.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/ext3/ialloc.c 2011-01-29 02:01:07.000000000 +0100
@@ -23,6 +23,7 @@
#include <linux/buffer_head.h>
#include <linux/random.h>
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-2.6.38-rc8/fs/ext3/inode.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ext3/inode.c
---- linux-2.6.38-rc8/fs/ext3/inode.c 2011-03-10 17:09:22.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ext3/inode.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/ext3/inode.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/ext3/inode.c
+--- linux-2.6.38.1/fs/ext3/inode.c 2011-03-15 18:07:31.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/ext3/inode.c 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/fs/ext3/ioctl.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ext3/ioctl.c
---- linux-2.6.38-rc8/fs/ext3/ioctl.c 2011-03-10 17:09:22.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ext3/ioctl.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/ext3/ioctl.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/ext3/ioctl.c
+--- linux-2.6.38.1/fs/ext3/ioctl.c 2011-03-15 18:07:31.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/ext3/ioctl.c 2011-01-29 02:01:07.000000000 +0100
@@ -8,6 +8,7 @@
*/
flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE;
ei->i_flags = flags;
-diff -NurpP --minimal linux-2.6.38-rc8/fs/ext3/namei.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ext3/namei.c
---- linux-2.6.38-rc8/fs/ext3/namei.c 2011-03-10 17:09:22.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ext3/namei.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/ext3/namei.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/ext3/namei.c
+--- linux-2.6.38.1/fs/ext3/namei.c 2011-03-26 01:10:17.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/ext3/namei.c 2011-03-25 22:52:15.000000000 +0100
@@ -36,6 +36,7 @@
#include <linux/quotaops.h>
#include <linux/buffer_head.h>
};
const struct inode_operations ext3_special_inode_operations = {
-diff -NurpP --minimal linux-2.6.38-rc8/fs/ext3/super.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ext3/super.c
---- linux-2.6.38-rc8/fs/ext3/super.c 2011-03-10 17:09:22.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ext3/super.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/ext3/super.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/ext3/super.c
+--- linux-2.6.38.1/fs/ext3/super.c 2011-03-15 18:07:31.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/ext3/super.c 2011-01-29 02:01:07.000000000 +0100
@@ -820,7 +820,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-2.6.38-rc8/fs/ext4/ext4.h linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ext4/ext4.h
---- linux-2.6.38-rc8/fs/ext4/ext4.h 2011-03-10 17:09:22.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ext4/ext4.h 2011-02-17 02:17:50.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/ext4/ext4.h linux-2.6.38.1-vs2.3.0.37-rc9/fs/ext4/ext4.h
+--- linux-2.6.38.1/fs/ext4/ext4.h 2011-03-15 18:07:31.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/ext4/ext4.h 2011-02-17 02:17:50.000000000 +0100
@@ -347,8 +347,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-2.6.38-rc8/fs/ext4/file.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ext4/file.c
---- linux-2.6.38-rc8/fs/ext4/file.c 2011-03-10 17:09:23.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ext4/file.c 2011-02-17 02:17:50.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/ext4/file.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/ext4/file.c
+--- linux-2.6.38.1/fs/ext4/file.c 2011-03-15 18:07:31.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/ext4/file.c 2011-02-17 02:17:50.000000000 +0100
@@ -283,5 +283,6 @@ const struct inode_operations ext4_file_
#endif
.check_acl = ext4_check_acl,
+ .sync_flags = ext4_sync_flags,
};
-diff -NurpP --minimal linux-2.6.38-rc8/fs/ext4/ialloc.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ext4/ialloc.c
---- linux-2.6.38-rc8/fs/ext4/ialloc.c 2011-03-10 17:09:23.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ext4/ialloc.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/ext4/ialloc.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/ext4/ialloc.c
+--- linux-2.6.38.1/fs/ext4/ialloc.c 2011-03-15 18:07:31.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/ext4/ialloc.c 2011-01-29 02:01:07.000000000 +0100
@@ -22,6 +22,7 @@
#include <linux/random.h>
#include <linux/bitops.h>
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-2.6.38-rc8/fs/ext4/inode.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ext4/inode.c
---- linux-2.6.38-rc8/fs/ext4/inode.c 2011-03-10 17:09:23.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ext4/inode.c 2011-01-29 02:27:03.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/ext4/inode.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/ext4/inode.c
+--- linux-2.6.38.1/fs/ext4/inode.c 2011-03-15 18:07:31.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/ext4/inode.c 2011-01-29 02:27:03.000000000 +0100
@@ -42,6 +42,7 @@
#include <linux/printk.h>
#include <linux/slab.h>
error = ext4_mark_inode_dirty(handle, inode);
ext4_journal_stop(handle);
}
-diff -NurpP --minimal linux-2.6.38-rc8/fs/ext4/ioctl.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ext4/ioctl.c
---- linux-2.6.38-rc8/fs/ext4/ioctl.c 2011-01-05 21:50:23.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ext4/ioctl.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/ext4/ioctl.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/ext4/ioctl.c
+--- linux-2.6.38.1/fs/ext4/ioctl.c 2011-01-05 21:50:23.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/ext4/ioctl.c 2011-01-29 02:01:07.000000000 +0100
@@ -14,10 +14,39 @@
#include <linux/compat.h>
#include <linux/mount.h>
if (!capable(CAP_LINUX_IMMUTABLE))
goto flags_out;
}
-diff -NurpP --minimal linux-2.6.38-rc8/fs/ext4/namei.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ext4/namei.c
---- linux-2.6.38-rc8/fs/ext4/namei.c 2011-03-10 17:09:23.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ext4/namei.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/ext4/namei.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/ext4/namei.c
+--- linux-2.6.38.1/fs/ext4/namei.c 2011-03-15 18:07:31.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/ext4/namei.c 2011-01-29 02:01:07.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-2.6.38-rc8/fs/ext4/super.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ext4/super.c
---- linux-2.6.38-rc8/fs/ext4/super.c 2011-03-10 17:09:23.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ext4/super.c 2011-02-17 02:17:50.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/ext4/super.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/ext4/super.c
+--- linux-2.6.38.1/fs/ext4/super.c 2011-03-15 18:07:31.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/ext4/super.c 2011-02-17 02:17:50.000000000 +0100
@@ -1262,6 +1262,7 @@ enum {
Opt_dioread_nolock, Opt_dioread_lock,
Opt_discard, Opt_nodiscard,
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-2.6.38-rc8/fs/fcntl.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/fcntl.c
---- linux-2.6.38-rc8/fs/fcntl.c 2011-03-10 17:09:23.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/fcntl.c 2011-02-17 02:17:50.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/fcntl.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/fcntl.c
+--- linux-2.6.38.1/fs/fcntl.c 2011-03-15 18:07:31.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/fcntl.c 2011-02-17 02:17:50.000000000 +0100
@@ -20,6 +20,7 @@
#include <linux/signal.h>
#include <linux/rcupdate.h>
err = security_file_fcntl(filp, cmd, arg);
if (err) {
-diff -NurpP --minimal linux-2.6.38-rc8/fs/file.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/file.c
---- linux-2.6.38-rc8/fs/file.c 2010-10-21 13:07:48.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/file.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/file.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/file.c
+--- linux-2.6.38.1/fs/file.c 2010-10-21 13:07:48.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/file.c 2011-01-29 02:01:07.000000000 +0100
@@ -20,6 +20,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-2.6.38-rc8/fs/file_table.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/file_table.c
---- linux-2.6.38-rc8/fs/file_table.c 2011-03-10 17:09:23.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/file_table.c 2011-02-17 02:17:50.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/file_table.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/file_table.c
+--- linux-2.6.38.1/fs/file_table.c 2011-03-15 18:07:31.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/file_table.c 2011-02-17 02:17:50.000000000 +0100
@@ -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-2.6.38-rc8/fs/fs_struct.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/fs_struct.c
---- linux-2.6.38-rc8/fs/fs_struct.c 2011-03-10 17:09:23.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/fs_struct.c 2011-01-29 02:35:02.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/fs_struct.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/fs_struct.c
+--- linux-2.6.38.1/fs/fs_struct.c 2011-03-15 18:07:31.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/fs_struct.c 2011-01-29 02:35:02.000000000 +0100
@@ -4,6 +4,7 @@
#include <linux/path.h>
#include <linux/slab.h>
}
return fs;
}
-diff -NurpP --minimal linux-2.6.38-rc8/fs/gfs2/file.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/gfs2/file.c
---- linux-2.6.38-rc8/fs/gfs2/file.c 2011-03-10 17:09:23.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/gfs2/file.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/gfs2/file.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/gfs2/file.c
+--- linux-2.6.38.1/fs/gfs2/file.c 2011-03-15 18:07:32.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/gfs2/file.c 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/fs/gfs2/inode.h linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/gfs2/inode.h
---- linux-2.6.38-rc8/fs/gfs2/inode.h 2011-03-10 17:09:23.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/gfs2/inode.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/gfs2/inode.h linux-2.6.38.1-vs2.3.0.37-rc9/fs/gfs2/inode.h
+--- linux-2.6.38.1/fs/gfs2/inode.h 2011-03-15 18:07:32.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/gfs2/inode.h 2011-01-29 02:01:07.000000000 +0100
@@ -125,6 +125,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-2.6.38-rc8/fs/gfs2/ops_inode.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/gfs2/ops_inode.c
---- linux-2.6.38-rc8/fs/gfs2/ops_inode.c 2011-03-10 17:09:23.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/gfs2/ops_inode.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/gfs2/ops_inode.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/gfs2/ops_inode.c
+--- linux-2.6.38.1/fs/gfs2/ops_inode.c 2011-03-15 18:07:32.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/gfs2/ops_inode.c 2011-01-29 02:01:07.000000000 +0100
@@ -1326,6 +1326,8 @@ const struct inode_operations gfs2_dir_i
.listxattr = gfs2_listxattr,
.removexattr = gfs2_removexattr,
};
const struct inode_operations gfs2_symlink_iops = {
-diff -NurpP --minimal linux-2.6.38-rc8/fs/inode.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/inode.c
---- linux-2.6.38-rc8/fs/inode.c 2011-03-10 17:09:23.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/inode.c 2011-03-07 16:53:27.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/inode.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/inode.c
+--- linux-2.6.38.1/fs/inode.c 2011-03-15 18:07:32.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/inode.c 2011-03-07 16:53:27.000000000 +0100
@@ -25,6 +25,7 @@
#include <linux/async.h>
#include <linux/posix_acl.h>
+ inode->i_tag = dx_current_fstag(inode->i_sb);
}
EXPORT_SYMBOL(inode_init_owner);
-diff -NurpP --minimal linux-2.6.38-rc8/fs/ioctl.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ioctl.c
---- linux-2.6.38-rc8/fs/ioctl.c 2011-03-10 17:09:23.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ioctl.c 2011-02-17 02:17:50.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/ioctl.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/ioctl.c
+--- linux-2.6.38.1/fs/ioctl.c 2011-03-15 18:07:32.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/ioctl.c 2011-02-17 02:17:50.000000000 +0100
@@ -15,6 +15,9 @@
#include <linux/writeback.h>
#include <linux/buffer_head.h>
#include <asm/ioctls.h>
-diff -NurpP --minimal linux-2.6.38-rc8/fs/ioprio.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ioprio.c
---- linux-2.6.38-rc8/fs/ioprio.c 2011-01-05 21:50:24.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ioprio.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/ioprio.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/ioprio.c
+--- linux-2.6.38.1/fs/ioprio.c 2011-01-05 21:50:24.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/ioprio.c 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/fs/jfs/file.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/jfs/file.c
---- linux-2.6.38-rc8/fs/jfs/file.c 2010-10-21 13:07:50.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/jfs/file.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/jfs/file.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/jfs/file.c
+--- linux-2.6.38.1/fs/jfs/file.c 2010-10-21 13:07:50.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/jfs/file.c 2011-01-29 02:01:07.000000000 +0100
@@ -102,7 +102,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-2.6.38-rc8/fs/jfs/ioctl.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/jfs/ioctl.c
---- linux-2.6.38-rc8/fs/jfs/ioctl.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/jfs/ioctl.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/jfs/ioctl.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/jfs/ioctl.c
+--- linux-2.6.38.1/fs/jfs/ioctl.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/jfs/ioctl.c 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/fs/jfs/jfs_dinode.h linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/jfs/jfs_dinode.h
---- linux-2.6.38-rc8/fs/jfs/jfs_dinode.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/jfs/jfs_dinode.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/jfs/jfs_dinode.h linux-2.6.38.1-vs2.3.0.37-rc9/fs/jfs/jfs_dinode.h
+--- linux-2.6.38.1/fs/jfs/jfs_dinode.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/jfs/jfs_dinode.h 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/fs/jfs/jfs_filsys.h linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/jfs/jfs_filsys.h
---- linux-2.6.38-rc8/fs/jfs/jfs_filsys.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/jfs/jfs_filsys.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/jfs/jfs_filsys.h linux-2.6.38.1-vs2.3.0.37-rc9/fs/jfs/jfs_filsys.h
+--- linux-2.6.38.1/fs/jfs/jfs_filsys.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/jfs/jfs_filsys.h 2011-01-29 02:01:07.000000000 +0100
@@ -263,6 +263,7 @@
#define JFS_NAME_MAX 255
#define JFS_PATH_MAX BPSIZE
/*
* file system state (superblock state)
-diff -NurpP --minimal linux-2.6.38-rc8/fs/jfs/jfs_imap.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/jfs/jfs_imap.c
---- linux-2.6.38-rc8/fs/jfs/jfs_imap.c 2011-01-05 21:50:24.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/jfs/jfs_imap.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/jfs/jfs_imap.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/jfs/jfs_imap.c
+--- linux-2.6.38.1/fs/jfs/jfs_imap.c 2011-01-05 21:50:24.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/jfs/jfs_imap.c 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/fs/jfs/jfs_inode.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/jfs/jfs_inode.c
---- linux-2.6.38-rc8/fs/jfs/jfs_inode.c 2010-08-02 16:52:49.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/jfs/jfs_inode.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/jfs/jfs_inode.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/jfs/jfs_inode.c
+--- linux-2.6.38.1/fs/jfs/jfs_inode.c 2010-08-02 16:52:49.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/jfs/jfs_inode.c 2011-01-29 02:01:07.000000000 +0100
@@ -18,6 +18,7 @@
#include <linux/fs.h>
}
/*
-diff -NurpP --minimal linux-2.6.38-rc8/fs/jfs/jfs_inode.h linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/jfs/jfs_inode.h
---- linux-2.6.38-rc8/fs/jfs/jfs_inode.h 2010-10-21 13:07:50.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/jfs/jfs_inode.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/jfs/jfs_inode.h linux-2.6.38.1-vs2.3.0.37-rc9/fs/jfs/jfs_inode.h
+--- linux-2.6.38.1/fs/jfs/jfs_inode.h 2010-10-21 13:07:50.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/jfs/jfs_inode.h 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/fs/jfs/namei.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/jfs/namei.c
---- linux-2.6.38-rc8/fs/jfs/namei.c 2011-03-10 17:09:23.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/jfs/namei.c 2011-01-29 02:49:04.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/jfs/namei.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/jfs/namei.c
+--- linux-2.6.38.1/fs/jfs/namei.c 2011-03-15 18:07:32.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/jfs/namei.c 2011-03-15 18:15:06.000000000 +0100
@@ -22,6 +22,7 @@
#include <linux/ctype.h>
#include <linux/quotaops.h>
};
const struct file_operations jfs_dir_operations = {
-diff -NurpP --minimal linux-2.6.38-rc8/fs/jfs/super.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/jfs/super.c
---- linux-2.6.38-rc8/fs/jfs/super.c 2011-03-10 17:09:23.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/jfs/super.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/jfs/super.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/jfs/super.c
+--- linux-2.6.38.1/fs/jfs/super.c 2011-03-15 18:07:32.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/jfs/super.c 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/fs/libfs.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/libfs.c
---- linux-2.6.38-rc8/fs/libfs.c 2011-03-10 17:09:23.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/libfs.c 2011-01-29 05:03:51.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/libfs.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/libfs.c
+--- linux-2.6.38.1/fs/libfs.c 2011-03-15 18:07:32.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/libfs.c 2011-01-29 05:03:51.000000000 +0100
@@ -133,7 +133,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-2.6.38-rc8/fs/locks.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/locks.c
---- linux-2.6.38-rc8/fs/locks.c 2011-03-10 17:09:23.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/locks.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/locks.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/locks.c
+--- linux-2.6.38.1/fs/locks.c 2011-03-15 18:07:32.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/locks.c 2011-01-29 02:01:07.000000000 +0100
@@ -126,6 +126,8 @@
#include <linux/time.h>
#include <linux/rcupdate.h>
return 0;
}
-diff -NurpP --minimal linux-2.6.38-rc8/fs/namei.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/namei.c
---- linux-2.6.38-rc8/fs/namei.c 2011-03-10 17:09:23.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/namei.c 2011-03-07 16:53:27.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/namei.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/namei.c
+--- linux-2.6.38.1/fs/namei.c 2011-03-15 18:07:32.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/namei.c 2011-03-15 18:17:37.000000000 +0100
@@ -32,6 +32,14 @@
#include <linux/fcntl.h>
#include <linux/device_cgroup.h>
need_lookup:
dir = parent->d_inode;
BUG_ON(nd->inode != dir);
-@@ -1981,7 +2094,7 @@ static int may_delete(struct inode *dir,
+@@ -1982,7 +2095,7 @@ static int may_delete(struct inode *dir,
if (IS_APPEND(dir))
return -EPERM;
if (check_sticky(dir, victim->d_inode)||IS_APPEND(victim->d_inode)||
return -EPERM;
if (isdir) {
if (!S_ISDIR(victim->d_inode->i_mode))
-@@ -2104,6 +2217,14 @@ int may_open(struct path *path, int acc_
+@@ -2105,6 +2218,14 @@ int may_open(struct path *path, int acc_
break;
}
error = inode_permission(inode, acc_mode);
if (error)
return error;
-@@ -2214,7 +2335,8 @@ static int open_will_truncate(int flag,
+@@ -2215,7 +2336,8 @@ static int open_will_truncate(int flag,
}
static struct file *finish_open(struct nameidata *nd,
{
struct file *filp;
int will_truncate;
-@@ -2227,6 +2349,23 @@ static struct file *finish_open(struct n
+@@ -2228,6 +2350,23 @@ static struct file *finish_open(struct n
goto exit;
}
error = may_open(&nd->path, acc_mode, open_flag);
if (error) {
if (will_truncate)
mnt_drop_write(nd->path.mnt);
-@@ -2374,7 +2513,7 @@ static struct file *do_last(struct namei
+@@ -2375,7 +2514,7 @@ static struct file *do_last(struct namei
if (S_ISDIR(nd->inode->i_mode))
goto exit;
ok:
return filp;
exit_mutex_unlock:
-@@ -2401,7 +2540,12 @@ struct file *do_filp_open(int dfd, const
+@@ -2402,7 +2541,12 @@ struct file *do_filp_open(int dfd, const
int count = 0;
int flag = open_to_namei_flags(open_flag);
int flags;
+#endif
if (!(open_flag & O_CREAT))
mode = 0;
-
-@@ -2612,7 +2612,7 @@
+
+@@ -2468,7 +2612,7 @@ struct file *do_filp_open(int dfd, const
goto out_path2;
}
audit_inode(pathname, nd.path.dentry);
out2:
release_open_intent(&nd);
return filp;
-@@ -2502,6 +2646,13 @@ reval:
+@@ -2510,6 +2654,13 @@ reval:
*/
nd.flags = flags;
filp = do_last(&nd, &path, open_flag, acc_mode, mode, pathname);
while (unlikely(!filp)) { /* trailing symlink */
struct path link = path;
struct inode *linki = link.dentry->d_inode;
-@@ -2536,6 +2687,13 @@ reval:
+@@ -2544,6 +2695,13 @@ reval:
}
nd.flags &= ~LOOKUP_PARENT;
filp = do_last(&nd, &path, open_flag, acc_mode, mode, pathname);
if (linki->i_op->put_link)
linki->i_op->put_link(link.dentry, &nd, cookie);
path_put(&link);
-@@ -2634,9 +2792,17 @@ int vfs_mknod(struct inode *dir, struct
+@@ -2642,9 +2800,17 @@ int vfs_mknod(struct inode *dir, struct
if (error)
return error;
if (!dir->i_op->mknod)
return -EPERM;
-@@ -3099,7 +3265,7 @@ int vfs_link(struct dentry *old_dentry,
+@@ -3107,7 +3273,7 @@ int vfs_link(struct dentry *old_dentry,
/*
* A link to an append-only or immutable file cannot be created.
*/
return -EPERM;
if (!dir->i_op->link)
return -EPERM;
-@@ -3471,6 +3637,222 @@ int vfs_follow_link(struct nameidata *nd
+@@ -3479,6 +3645,222 @@ int vfs_follow_link(struct nameidata *nd
return __vfs_follow_link(nd, link);
}
/* get the link contents into pagecache */
static char *page_getlink(struct dentry * dentry, struct page **ppage)
{
-diff -NurpP --minimal linux-2.6.38-rc8/fs/namespace.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/namespace.c
---- linux-2.6.38-rc8/fs/namespace.c 2011-03-10 17:09:23.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/namespace.c 2011-03-07 16:53:27.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/namespace.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/namespace.c
+--- linux-2.6.38.1/fs/namespace.c 2011-03-15 18:07:32.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/namespace.c 2011-03-07 16:53:27.000000000 +0100
@@ -31,6 +31,11 @@
#include <linux/idr.h>
#include <linux/fs_struct.h>
kfree(ns);
}
EXPORT_SYMBOL(put_mnt_ns);
-diff -NurpP --minimal linux-2.6.38-rc8/fs/nfs/client.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/nfs/client.c
---- linux-2.6.38-rc8/fs/nfs/client.c 2011-03-10 17:09:23.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/nfs/client.c 2011-02-02 22:20:25.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/nfs/client.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/nfs/client.c
+--- linux-2.6.38.1/fs/nfs/client.c 2011-03-15 18:07:32.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/nfs/client.c 2011-02-02 22:20:25.000000000 +0100
@@ -761,6 +761,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-2.6.38-rc8/fs/nfs/dir.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/nfs/dir.c
---- linux-2.6.38-rc8/fs/nfs/dir.c 2011-03-10 17:09:23.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/nfs/dir.c 2011-01-29 02:49:21.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/nfs/dir.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/nfs/dir.c
+--- linux-2.6.38.1/fs/nfs/dir.c 2011-03-15 18:07:32.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/nfs/dir.c 2011-01-29 02:49:21.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-2.6.38-rc8/fs/nfs/inode.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/nfs/inode.c
---- linux-2.6.38-rc8/fs/nfs/inode.c 2011-03-10 17:09:23.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/nfs/inode.c 2011-02-02 22:20:25.000000000 +0100
-@@ -37,6 +37,7 @@
+diff -NurpP --minimal linux-2.6.38.1/fs/nfs/inode.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/nfs/inode.c
+--- linux-2.6.38.1/fs/nfs/inode.c 2011-03-15 18:07:32.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/nfs/inode.c 2011-03-15 18:17:58.000000000 +0100
+@@ -38,6 +38,7 @@
#include <linux/nfs_xdr.h>
#include <linux/slab.h>
#include <linux/compat.h>
#include <asm/system.h>
#include <asm/uaccess.h>
-@@ -265,6 +266,8 @@ nfs_fhget(struct super_block *sb, struct
+@@ -270,6 +271,8 @@ nfs_fhget(struct super_block *sb, struct
if (inode->i_state & I_NEW) {
struct nfs_inode *nfsi = NFS_I(inode);
unsigned long now = jiffies;
/* We set i_ino for the few things that still rely on it,
* such as stat(2) */
-@@ -313,8 +316,8 @@ nfs_fhget(struct super_block *sb, struct
+@@ -318,8 +321,8 @@ nfs_fhget(struct super_block *sb, struct
nfsi->change_attr = 0;
inode->i_size = 0;
inode->i_nlink = 0;
inode->i_blocks = 0;
memset(nfsi->cookieverf, 0, sizeof(nfsi->cookieverf));
-@@ -351,13 +354,13 @@ nfs_fhget(struct super_block *sb, struct
+@@ -356,13 +359,13 @@ nfs_fhget(struct super_block *sb, struct
else if (nfs_server_capable(inode, NFS_CAP_NLINK))
nfsi->cache_validity |= NFS_INO_INVALID_ATTR;
if (fattr->valid & NFS_ATTR_FATTR_OWNER)
else if (nfs_server_capable(inode, NFS_CAP_OWNER_GROUP))
nfsi->cache_validity |= NFS_INO_INVALID_ATTR
| NFS_INO_INVALID_ACCESS
-@@ -370,6 +373,11 @@ nfs_fhget(struct super_block *sb, struct
+@@ -375,6 +378,11 @@ nfs_fhget(struct super_block *sb, struct
*/
inode->i_blocks = nfs_calc_block_size(fattr->du.nfs3.used);
}
nfsi->attrtimeo = NFS_MINATTRTIMEO(inode);
nfsi->attrtimeo_timestamp = now;
nfsi->access_cache = RB_ROOT;
-@@ -486,6 +494,8 @@ void nfs_setattr_update_inode(struct ino
+@@ -491,6 +499,8 @@ void nfs_setattr_update_inode(struct ino
inode->i_uid = attr->ia_uid;
if ((attr->ia_valid & ATTR_GID) != 0)
inode->i_gid = attr->ia_gid;
NFS_I(inode)->cache_validity |= NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL;
spin_unlock(&inode->i_lock);
}
-@@ -934,6 +944,9 @@ static int nfs_check_inode_attributes(st
+@@ -939,6 +949,9 @@ static int nfs_check_inode_attributes(st
struct nfs_inode *nfsi = NFS_I(inode);
loff_t cur_size, new_isize;
unsigned long invalid = 0;
/* Has the inode gone and changed behind our back? */
-@@ -957,13 +970,18 @@ static int nfs_check_inode_attributes(st
+@@ -962,13 +975,18 @@ static int nfs_check_inode_attributes(st
invalid |= NFS_INO_INVALID_ATTR|NFS_INO_REVAL_PAGECACHE;
}
/* Has the link count changed? */
if ((fattr->valid & NFS_ATTR_FATTR_NLINK) && inode->i_nlink != fattr->nlink)
-@@ -1198,6 +1216,9 @@ static int nfs_update_inode(struct inode
+@@ -1203,6 +1221,9 @@ static int nfs_update_inode(struct inode
unsigned long invalid = 0;
unsigned long now = jiffies;
unsigned long save_cache_validity;
dfprintk(VFS, "NFS: %s(%s/%ld ct=%d info=0x%x)\n",
__func__, inode->i_sb->s_id, inode->i_ino,
-@@ -1300,6 +1321,9 @@ static int nfs_update_inode(struct inode
+@@ -1305,6 +1326,9 @@ static int nfs_update_inode(struct inode
| NFS_INO_REVAL_PAGECACHE
| NFS_INO_REVAL_FORCED);
if (fattr->valid & NFS_ATTR_FATTR_ATIME)
memcpy(&inode->i_atime, &fattr->atime, sizeof(inode->i_atime));
-@@ -1321,9 +1345,9 @@ static int nfs_update_inode(struct inode
+@@ -1326,9 +1350,9 @@ static int nfs_update_inode(struct inode
| NFS_INO_REVAL_FORCED);
if (fattr->valid & NFS_ATTR_FATTR_OWNER) {
}
} else if (server->caps & NFS_CAP_OWNER)
invalid |= save_cache_validity & (NFS_INO_INVALID_ATTR
-@@ -1332,9 +1356,9 @@ static int nfs_update_inode(struct inode
+@@ -1337,9 +1361,9 @@ static int nfs_update_inode(struct inode
| NFS_INO_REVAL_FORCED);
if (fattr->valid & NFS_ATTR_FATTR_GROUP) {
}
} else if (server->caps & NFS_CAP_OWNER_GROUP)
invalid |= save_cache_validity & (NFS_INO_INVALID_ATTR
-@@ -1342,6 +1366,10 @@ static int nfs_update_inode(struct inode
+@@ -1347,6 +1371,10 @@ static int nfs_update_inode(struct inode
| NFS_INO_INVALID_ACL
| NFS_INO_REVAL_FORCED);
if (fattr->valid & NFS_ATTR_FATTR_NLINK) {
if (inode->i_nlink != fattr->nlink) {
invalid |= NFS_INO_INVALID_ATTR;
-diff -NurpP --minimal linux-2.6.38-rc8/fs/nfs/nfs3xdr.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/nfs/nfs3xdr.c
---- linux-2.6.38-rc8/fs/nfs/nfs3xdr.c 2011-03-10 17:09:23.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/nfs/nfs3xdr.c 2011-02-02 22:20:25.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/nfs/nfs3xdr.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/nfs/nfs3xdr.c
+--- linux-2.6.38.1/fs/nfs/nfs3xdr.c 2011-03-15 18:07:32.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/nfs/nfs3xdr.c 2011-02-02 22:20:25.000000000 +0100
@@ -20,6 +20,7 @@
#include <linux/nfs3.h>
#include <linux/nfs_fs.h>
}
/*
-diff -NurpP --minimal linux-2.6.38-rc8/fs/nfs/super.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/nfs/super.c
---- linux-2.6.38-rc8/fs/nfs/super.c 2011-03-10 17:09:23.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/nfs/super.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/nfs/super.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/nfs/super.c
+--- linux-2.6.38.1/fs/nfs/super.c 2011-03-15 18:07:32.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/nfs/super.c 2011-01-29 02:01:07.000000000 +0100
@@ -53,6 +53,7 @@
#include <linux/nfs_xdr.h>
#include <linux/magic.h>
/*
* options that take text values
-diff -NurpP --minimal linux-2.6.38-rc8/fs/nfsd/auth.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/nfsd/auth.c
---- linux-2.6.38-rc8/fs/nfsd/auth.c 2010-02-25 11:52:05.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/nfsd/auth.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/nfsd/auth.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/nfsd/auth.c
+--- linux-2.6.38.1/fs/nfsd/auth.c 2010-02-25 11:52:05.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/nfsd/auth.c 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/fs/nfsd/nfs3xdr.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/nfsd/nfs3xdr.c
---- linux-2.6.38-rc8/fs/nfsd/nfs3xdr.c 2011-01-05 21:50:25.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/nfsd/nfs3xdr.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/nfsd/nfs3xdr.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/nfsd/nfs3xdr.c
+--- linux-2.6.38.1/fs/nfsd/nfs3xdr.c 2011-01-05 21:50:25.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/nfsd/nfs3xdr.c 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/fs/nfsd/nfs4xdr.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/nfsd/nfs4xdr.c
---- linux-2.6.38-rc8/fs/nfsd/nfs4xdr.c 2011-03-10 17:09:23.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/nfsd/nfs4xdr.c 2011-03-07 16:53:27.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/nfsd/nfs4xdr.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/nfsd/nfs4xdr.c
+--- linux-2.6.38.1/fs/nfsd/nfs4xdr.c 2011-03-15 18:07:32.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/nfsd/nfs4xdr.c 2011-03-15 18:15:06.000000000 +0100
@@ -45,6 +45,7 @@
#include <linux/statfs.h>
#include <linux/utsname.h>
if (status == nfserr_resource)
goto out_resource;
if (status)
-diff -NurpP --minimal linux-2.6.38-rc8/fs/nfsd/nfsxdr.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/nfsd/nfsxdr.c
---- linux-2.6.38-rc8/fs/nfsd/nfsxdr.c 2010-02-25 11:52:05.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/nfsd/nfsxdr.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/nfsd/nfsxdr.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/nfsd/nfsxdr.c
+--- linux-2.6.38.1/fs/nfsd/nfsxdr.c 2010-02-25 11:52:05.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/nfsd/nfsxdr.c 2011-01-29 02:01:07.000000000 +0100
@@ -6,6 +6,7 @@
#include "xdr.h"
if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
*p++ = htonl(NFS_MAXPATHLEN);
-diff -NurpP --minimal linux-2.6.38-rc8/fs/ocfs2/dlmglue.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ocfs2/dlmglue.c
---- linux-2.6.38-rc8/fs/ocfs2/dlmglue.c 2011-01-05 21:50:26.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ocfs2/dlmglue.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/ocfs2/dlmglue.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/ocfs2/dlmglue.c
+--- linux-2.6.38.1/fs/ocfs2/dlmglue.c 2011-01-05 21:50:26.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/ocfs2/dlmglue.c 2011-01-29 02:01:07.000000000 +0100
@@ -2114,6 +2114,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-2.6.38-rc8/fs/ocfs2/dlmglue.h linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ocfs2/dlmglue.h
---- linux-2.6.38-rc8/fs/ocfs2/dlmglue.h 2010-10-21 13:07:50.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ocfs2/dlmglue.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/ocfs2/dlmglue.h linux-2.6.38.1-vs2.3.0.37-rc9/fs/ocfs2/dlmglue.h
+--- linux-2.6.38.1/fs/ocfs2/dlmglue.h 2010-10-21 13:07:50.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/ocfs2/dlmglue.h 2011-01-29 02:01:07.000000000 +0100
@@ -46,7 +46,8 @@ struct ocfs2_meta_lvb {
__be16 lvb_inlink;
__be32 lvb_iattr;
};
#define OCFS2_QINFO_LVB_VERSION 1
-diff -NurpP --minimal linux-2.6.38-rc8/fs/ocfs2/file.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ocfs2/file.c
---- linux-2.6.38-rc8/fs/ocfs2/file.c 2011-03-10 17:09:24.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ocfs2/file.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/ocfs2/file.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/ocfs2/file.c
+--- linux-2.6.38.1/fs/ocfs2/file.c 2011-03-15 18:07:33.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/ocfs2/file.c 2011-01-29 02:01:07.000000000 +0100
@@ -1126,13 +1126,15 @@ int ocfs2_setattr(struct dentry *dentry,
mlog(0, "uid change: %d\n", attr->ia_uid);
if (attr->ia_valid & ATTR_GID)
if (!(attr->ia_valid & OCFS2_VALID_ATTRS)) {
mlog(0, "can't handle attrs: 0x%x\n", attr->ia_valid);
return 0;
-diff -NurpP --minimal linux-2.6.38-rc8/fs/ocfs2/inode.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ocfs2/inode.c
---- linux-2.6.38-rc8/fs/ocfs2/inode.c 2011-03-10 17:09:24.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ocfs2/inode.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/ocfs2/inode.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/ocfs2/inode.c
+--- linux-2.6.38.1/fs/ocfs2/inode.c 2011-03-15 18:07:33.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/ocfs2/inode.c 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/fs/ocfs2/inode.h linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ocfs2/inode.h
---- linux-2.6.38-rc8/fs/ocfs2/inode.h 2011-01-05 21:50:26.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ocfs2/inode.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/ocfs2/inode.h linux-2.6.38.1-vs2.3.0.37-rc9/fs/ocfs2/inode.h
+--- linux-2.6.38.1/fs/ocfs2/inode.h 2011-01-05 21:50:26.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/ocfs2/inode.h 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/fs/ocfs2/ioctl.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ocfs2/ioctl.c
---- linux-2.6.38-rc8/fs/ocfs2/ioctl.c 2011-01-05 21:50:26.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ocfs2/ioctl.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/ocfs2/ioctl.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/ocfs2/ioctl.c
+--- linux-2.6.38.1/fs/ocfs2/ioctl.c 2011-01-05 21:50:26.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/ocfs2/ioctl.c 2011-01-29 02:01:07.000000000 +0100
@@ -63,7 +63,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-2.6.38-rc8/fs/ocfs2/namei.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ocfs2/namei.c
---- linux-2.6.38-rc8/fs/ocfs2/namei.c 2011-03-10 17:09:24.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ocfs2/namei.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/ocfs2/namei.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/ocfs2/namei.c
+--- linux-2.6.38.1/fs/ocfs2/namei.c 2011-03-15 18:07:33.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/ocfs2/namei.c 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/fs/ocfs2/ocfs2.h linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ocfs2/ocfs2.h
---- linux-2.6.38-rc8/fs/ocfs2/ocfs2.h 2011-03-10 17:09:24.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ocfs2/ocfs2.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/ocfs2/ocfs2.h linux-2.6.38.1-vs2.3.0.37-rc9/fs/ocfs2/ocfs2.h
+--- linux-2.6.38.1/fs/ocfs2/ocfs2.h 2011-03-15 18:07:33.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/ocfs2/ocfs2.h 2011-01-29 02:01:07.000000000 +0100
@@ -267,6 +267,7 @@ enum ocfs2_mount_options
writes */
OCFS2_MOUNT_HB_NONE = 1 << 13, /* No heartbeat */
};
#define OCFS2_OSB_SOFT_RO 0x0001
-diff -NurpP --minimal linux-2.6.38-rc8/fs/ocfs2/ocfs2_fs.h linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ocfs2/ocfs2_fs.h
---- linux-2.6.38-rc8/fs/ocfs2/ocfs2_fs.h 2011-01-05 21:50:26.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ocfs2/ocfs2_fs.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/ocfs2/ocfs2_fs.h linux-2.6.38.1-vs2.3.0.37-rc9/fs/ocfs2/ocfs2_fs.h
+--- linux-2.6.38.1/fs/ocfs2/ocfs2_fs.h 2011-01-05 21:50:26.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/ocfs2/ocfs2_fs.h 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/fs/ocfs2/super.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ocfs2/super.c
---- linux-2.6.38-rc8/fs/ocfs2/super.c 2011-03-10 17:09:24.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/ocfs2/super.c 2011-03-07 16:53:27.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/ocfs2/super.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/ocfs2/super.c
+--- linux-2.6.38.1/fs/ocfs2/super.c 2011-03-15 18:07:33.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/ocfs2/super.c 2011-03-07 16:53:27.000000000 +0100
@@ -181,6 +181,7 @@ enum {
Opt_coherency_full,
Opt_resv_level,
default:
mlog(ML_ERROR,
"Unrecognized mount option \"%s\" "
-diff -NurpP --minimal linux-2.6.38-rc8/fs/open.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/open.c
---- linux-2.6.38-rc8/fs/open.c 2011-03-10 17:09:24.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/open.c 2011-02-17 02:17:50.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/open.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/open.c
+--- linux-2.6.38.1/fs/open.c 2011-03-15 18:07:33.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/open.c 2011-03-15 18:15:06.000000000 +0100
@@ -30,6 +30,11 @@
#include <linux/fs_struct.h>
#include <linux/ima.h>
#include "internal.h"
-@@ -486,6 +491,12 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, cons
+@@ -494,6 +499,12 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, cons
error = user_path_at(dfd, filename, LOOKUP_FOLLOW, &path);
if (error)
goto out;
inode = path.dentry->d_inode;
error = mnt_want_write(path.mnt);
-@@ -523,11 +534,11 @@ static int chown_common(struct path *pat
+@@ -531,11 +542,11 @@ static int chown_common(struct path *pat
newattrs.ia_valid = ATTR_CTIME;
if (user != (uid_t) -1) {
newattrs.ia_valid |= ATTR_UID;
}
if (!S_ISDIR(inode->i_mode))
newattrs.ia_valid |=
-@@ -552,6 +563,10 @@ SYSCALL_DEFINE3(chown, const char __user
+@@ -560,6 +571,10 @@ SYSCALL_DEFINE3(chown, const char __user
error = mnt_want_write(path.mnt);
if (error)
goto out_release;
error = chown_common(&path, user, group);
mnt_drop_write(path.mnt);
out_release:
-@@ -577,6 +592,10 @@ SYSCALL_DEFINE5(fchownat, int, dfd, cons
+@@ -585,6 +600,10 @@ SYSCALL_DEFINE5(fchownat, int, dfd, cons
error = mnt_want_write(path.mnt);
if (error)
goto out_release;
error = chown_common(&path, user, group);
mnt_drop_write(path.mnt);
out_release:
-@@ -596,6 +615,10 @@ SYSCALL_DEFINE3(lchown, const char __use
+@@ -604,6 +623,10 @@ SYSCALL_DEFINE3(lchown, const char __use
error = mnt_want_write(path.mnt);
if (error)
goto out_release;
error = chown_common(&path, user, group);
mnt_drop_write(path.mnt);
out_release:
-@@ -844,6 +867,7 @@ static void __put_unused_fd(struct files
+@@ -852,6 +875,7 @@ static void __put_unused_fd(struct files
__FD_CLR(fd, fdt->open_fds);
if (fd < files->next_fd)
files->next_fd = fd;
}
void put_unused_fd(unsigned int fd)
-diff -NurpP --minimal linux-2.6.38-rc8/fs/proc/array.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/proc/array.c
---- linux-2.6.38-rc8/fs/proc/array.c 2011-03-10 17:09:24.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/proc/array.c 2011-02-17 02:23:41.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/proc/array.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/proc/array.c
+--- linux-2.6.38.1/fs/proc/array.c 2011-03-15 18:07:33.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/proc/array.c 2011-02-17 02:23:41.000000000 +0100
@@ -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-2.6.38-rc8/fs/proc/base.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/proc/base.c
---- linux-2.6.38-rc8/fs/proc/base.c 2011-03-10 17:09:24.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/proc/base.c 2011-03-07 19:16:17.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/proc/base.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/proc/base.c
+--- linux-2.6.38.1/fs/proc/base.c 2011-03-15 18:07:33.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/proc/base.c 2011-03-15 18:15:06.000000000 +0100
@@ -83,6 +83,8 @@
#include <linux/pid_namespace.h>
#include <linux/fs_struct.h>
/*
* Yes, it does not scale. And it should not. Don't add
* new entries into /proc/<tgid>/ without very good reasons.
-@@ -2698,7 +2723,7 @@ out_iput:
+@@ -2668,7 +2693,7 @@ out_iput:
static struct dentry *proc_base_lookup(struct inode *dir, struct dentry *dentry)
{
struct dentry *error;
const struct pid_entry *p, *last;
error = ERR_PTR(-ENOENT);
-@@ -2788,6 +2813,9 @@ static int proc_pid_personality(struct s
+@@ -2758,6 +2783,9 @@ static int proc_pid_personality(struct s
static const struct file_operations proc_task_operations;
static const struct inode_operations proc_task_inode_operations;
static const struct pid_entry tgid_base_stuff[] = {
DIR("task", S_IRUGO|S_IXUGO, proc_task_inode_operations, proc_task_operations),
DIR("fd", S_IRUSR|S_IXUSR, proc_fd_inode_operations, proc_fd_operations),
-@@ -2850,6 +2878,8 @@ static const struct pid_entry tgid_base_
+@@ -2820,6 +2848,8 @@ static const struct pid_entry tgid_base_
#ifdef CONFIG_CGROUPS
REG("cgroup", S_IRUGO, proc_cgroup_operations),
#endif
INF("oom_score", S_IRUGO, proc_oom_score),
REG("oom_adj", S_IRUGO|S_IWUSR, proc_oom_adjust_operations),
REG("oom_score_adj", S_IRUGO|S_IWUSR, proc_oom_score_adj_operations),
-@@ -2866,6 +2896,7 @@ static const struct pid_entry tgid_base_
+@@ -2836,6 +2866,7 @@ static const struct pid_entry tgid_base_
#ifdef CONFIG_TASK_IO_ACCOUNTING
INF("io", S_IRUGO, proc_tgid_io_accounting),
#endif
};
static int proc_tgid_base_readdir(struct file * filp,
-@@ -3058,7 +3089,7 @@ retry:
+@@ -3028,7 +3059,7 @@ retry:
iter.task = NULL;
pid = find_ge_pid(iter.tgid, ns);
if (pid) {
iter.task = pid_task(pid, PIDTYPE_PID);
/* What we to know is if the pid we have find is the
* pid of a thread_group_leader. Testing for task
-@@ -3088,7 +3119,7 @@ static int proc_pid_fill_cache(struct fi
+@@ -3058,7 +3089,7 @@ static int proc_pid_fill_cache(struct fi
struct tgid_iter iter)
{
char name[PROC_NUMBUF];
return proc_fill_cache(filp, dirent, filldir, name, len,
proc_pid_instantiate, iter.task, NULL);
}
-@@ -3097,7 +3128,7 @@ static int proc_pid_fill_cache(struct fi
+@@ -3067,7 +3098,7 @@ static int proc_pid_fill_cache(struct fi
int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filldir)
{
unsigned int nr = filp->f_pos - FIRST_PROCESS_ENTRY;
struct tgid_iter iter;
struct pid_namespace *ns;
-@@ -3117,6 +3148,8 @@ int proc_pid_readdir(struct file * filp,
+@@ -3087,6 +3118,8 @@ int proc_pid_readdir(struct file * filp,
iter.task;
iter.tgid += 1, iter = next_tgid(ns, iter)) {
filp->f_pos = iter.tgid + TGID_OFFSET;
if (proc_pid_fill_cache(filp, dirent, filldir, iter) < 0) {
put_task_struct(iter.task);
goto out;
-@@ -3266,6 +3299,8 @@ static struct dentry *proc_task_lookup(s
+@@ -3236,6 +3269,8 @@ static struct dentry *proc_task_lookup(s
tid = name_to_int(dentry);
if (tid == ~0U)
goto out;
ns = dentry->d_sb->s_fs_info;
rcu_read_lock();
-diff -NurpP --minimal linux-2.6.38-rc8/fs/proc/generic.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/proc/generic.c
---- linux-2.6.38-rc8/fs/proc/generic.c 2011-03-10 17:09:24.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/proc/generic.c 2011-01-29 02:29:09.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/proc/generic.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/proc/generic.c
+--- linux-2.6.38.1/fs/proc/generic.c 2011-03-15 18:07:33.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/proc/generic.c 2011-01-29 02:29:09.000000000 +0100
@@ -22,6 +22,7 @@
#include <linux/bitops.h>
#include <linux/spinlock.h>
} else {
kfree(ent);
ent = NULL;
-diff -NurpP --minimal linux-2.6.38-rc8/fs/proc/inode.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/proc/inode.c
---- linux-2.6.38-rc8/fs/proc/inode.c 2011-03-10 17:09:24.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/proc/inode.c 2011-01-29 02:01:07.000000000 +0100
-@@ -433,6 +433,8 @@ struct inode *proc_get_inode(struct supe
+diff -NurpP --minimal linux-2.6.38.1/fs/proc/inode.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/proc/inode.c
+--- linux-2.6.38.1/fs/proc/inode.c 2011-03-15 18:07:33.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/proc/inode.c 2011-03-15 18:15:06.000000000 +0100
+@@ -437,6 +437,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-2.6.38-rc8/fs/proc/internal.h linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/proc/internal.h
---- linux-2.6.38-rc8/fs/proc/internal.h 2011-03-10 17:09:24.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/proc/internal.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/proc/internal.h linux-2.6.38.1-vs2.3.0.37-rc9/fs/proc/internal.h
+--- linux-2.6.38.1/fs/proc/internal.h 2011-03-15 18:07:33.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/proc/internal.h 2011-01-29 02:01:07.000000000 +0100
@@ -10,6 +10,7 @@
*/
static inline int proc_fd(struct inode *inode)
{
return PROC_I(inode)->fd;
-diff -NurpP --minimal linux-2.6.38-rc8/fs/proc/loadavg.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/proc/loadavg.c
---- linux-2.6.38-rc8/fs/proc/loadavg.c 2009-09-10 15:26:23.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/proc/loadavg.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/proc/loadavg.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/proc/loadavg.c
+--- linux-2.6.38.1/fs/proc/loadavg.c 2009-09-10 15:26:23.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/proc/loadavg.c 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/fs/proc/meminfo.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/proc/meminfo.c
---- linux-2.6.38-rc8/fs/proc/meminfo.c 2011-03-10 17:09:24.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/proc/meminfo.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/proc/meminfo.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/proc/meminfo.c
+--- linux-2.6.38.1/fs/proc/meminfo.c 2011-03-15 18:07:33.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/proc/meminfo.c 2011-01-29 02:01:07.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-2.6.38-rc8/fs/proc/root.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/proc/root.c
---- linux-2.6.38-rc8/fs/proc/root.c 2011-01-05 21:50:26.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/proc/root.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/proc/root.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/proc/root.c
+--- linux-2.6.38.1/fs/proc/root.c 2011-01-05 21:50:26.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/proc/root.c 2011-01-29 02:01:07.000000000 +0100
@@ -18,9 +18,14 @@
#include <linux/bitops.h>
#include <linux/mount.h>
};
int pid_ns_prepare_proc(struct pid_namespace *ns)
-diff -NurpP --minimal linux-2.6.38-rc8/fs/proc/uptime.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/proc/uptime.c
---- linux-2.6.38-rc8/fs/proc/uptime.c 2009-12-03 20:02:53.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/proc/uptime.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/proc/uptime.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/proc/uptime.c
+--- linux-2.6.38.1/fs/proc/uptime.c 2009-12-03 20:02:53.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/proc/uptime.c 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/fs/quota/dquot.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/quota/dquot.c
---- linux-2.6.38-rc8/fs/quota/dquot.c 2011-03-10 17:09:24.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/quota/dquot.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/quota/dquot.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/quota/dquot.c
+--- linux-2.6.38.1/fs/quota/dquot.c 2011-03-15 18:07:33.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/quota/dquot.c 2011-01-29 02:01:07.000000000 +0100
@@ -1545,6 +1545,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-2.6.38-rc8/fs/quota/quota.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/quota/quota.c
---- linux-2.6.38-rc8/fs/quota/quota.c 2011-03-10 17:09:24.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/quota/quota.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/quota/quota.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/quota/quota.c
+--- linux-2.6.38.1/fs/quota/quota.c 2011-03-15 18:07:34.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/quota/quota.c 2011-01-29 02:01:07.000000000 +0100
@@ -8,6 +8,7 @@
#include <linux/fs.h>
#include <linux/namei.h>
sb = get_super(bdev);
bdput(bdev);
if (!sb)
-diff -NurpP --minimal linux-2.6.38-rc8/fs/reiserfs/file.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/reiserfs/file.c
---- linux-2.6.38-rc8/fs/reiserfs/file.c 2011-01-05 21:50:26.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/reiserfs/file.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/reiserfs/file.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/reiserfs/file.c
+--- linux-2.6.38.1/fs/reiserfs/file.c 2011-01-05 21:50:26.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/reiserfs/file.c 2011-01-29 02:01:07.000000000 +0100
@@ -312,4 +312,5 @@ const struct inode_operations reiserfs_f
.listxattr = reiserfs_listxattr,
.removexattr = reiserfs_removexattr,
.permission = reiserfs_permission,
+ .sync_flags = reiserfs_sync_flags,
};
-diff -NurpP --minimal linux-2.6.38-rc8/fs/reiserfs/inode.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/reiserfs/inode.c
---- linux-2.6.38-rc8/fs/reiserfs/inode.c 2011-01-05 21:50:26.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/reiserfs/inode.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/reiserfs/inode.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/reiserfs/inode.c
+--- linux-2.6.38.1/fs/reiserfs/inode.c 2011-01-05 21:50:26.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/reiserfs/inode.c 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/fs/reiserfs/ioctl.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/reiserfs/ioctl.c
---- linux-2.6.38-rc8/fs/reiserfs/ioctl.c 2011-01-05 21:50:26.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/reiserfs/ioctl.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/reiserfs/ioctl.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/reiserfs/ioctl.c
+--- linux-2.6.38.1/fs/reiserfs/ioctl.c 2011-01-05 21:50:26.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/reiserfs/ioctl.c 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/fs/reiserfs/namei.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/reiserfs/namei.c
---- linux-2.6.38-rc8/fs/reiserfs/namei.c 2011-03-10 17:09:24.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/reiserfs/namei.c 2011-03-10 17:21:19.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/reiserfs/namei.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/reiserfs/namei.c
+--- linux-2.6.38.1/fs/reiserfs/namei.c 2011-03-15 18:07:34.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/reiserfs/namei.c 2011-03-10 17:21:19.000000000 +0100
@@ -18,6 +18,7 @@
#include <linux/reiserfs_acl.h>
#include <linux/reiserfs_xattr.h>
};
/*
-diff -NurpP --minimal linux-2.6.38-rc8/fs/reiserfs/super.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/reiserfs/super.c
---- linux-2.6.38-rc8/fs/reiserfs/super.c 2011-03-10 17:09:24.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/reiserfs/super.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/reiserfs/super.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/reiserfs/super.c
+--- linux-2.6.38.1/fs/reiserfs/super.c 2011-03-15 18:07:34.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/reiserfs/super.c 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/fs/reiserfs/xattr.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/reiserfs/xattr.c
---- linux-2.6.38-rc8/fs/reiserfs/xattr.c 2011-03-10 17:09:24.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/reiserfs/xattr.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/reiserfs/xattr.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/reiserfs/xattr.c
+--- linux-2.6.38.1/fs/reiserfs/xattr.c 2011-03-15 18:07:34.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/reiserfs/xattr.c 2011-03-15 18:15:06.000000000 +0100
@@ -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-2.6.38-rc8/fs/stat.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/stat.c
---- linux-2.6.38-rc8/fs/stat.c 2011-03-10 17:09:24.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/stat.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/stat.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/stat.c
+--- linux-2.6.38.1/fs/stat.c 2011-03-15 18:07:34.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/stat.c 2011-01-29 02:01:07.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->atime = inode->i_atime;
stat->mtime = inode->i_mtime;
-diff -NurpP --minimal linux-2.6.38-rc8/fs/statfs.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/statfs.c
---- linux-2.6.38-rc8/fs/statfs.c 2010-10-21 13:07:51.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/statfs.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/statfs.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/statfs.c
+--- linux-2.6.38.1/fs/statfs.c 2010-10-21 13:07:51.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/statfs.c 2011-01-29 02:01:07.000000000 +0100
@@ -7,6 +7,8 @@
#include <linux/statfs.h>
#include <linux/security.h>
return retval;
}
-diff -NurpP --minimal linux-2.6.38-rc8/fs/super.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/super.c
---- linux-2.6.38-rc8/fs/super.c 2011-03-10 17:09:24.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/super.c 2011-02-17 02:17:50.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/super.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/super.c
+--- linux-2.6.38.1/fs/super.c 2011-03-15 18:07:34.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/super.c 2011-02-17 02:17:50.000000000 +0100
@@ -31,6 +31,9 @@
#include <linux/mutex.h>
#include <linux/backing-dev.h>
if (error)
goto out_sb;
-diff -NurpP --minimal linux-2.6.38-rc8/fs/sysfs/mount.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/sysfs/mount.c
---- linux-2.6.38-rc8/fs/sysfs/mount.c 2011-01-05 21:50:27.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/sysfs/mount.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/sysfs/mount.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/sysfs/mount.c
+--- linux-2.6.38.1/fs/sysfs/mount.c 2011-01-05 21:50:27.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/sysfs/mount.c 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/fs/utimes.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/utimes.c
---- linux-2.6.38-rc8/fs/utimes.c 2010-10-21 13:07:51.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/utimes.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/utimes.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/utimes.c
+--- linux-2.6.38.1/fs/utimes.c 2010-10-21 13:07:51.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/utimes.c 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/fs/xattr.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/xattr.c
---- linux-2.6.38-rc8/fs/xattr.c 2010-08-02 16:52:52.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/xattr.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/xattr.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/xattr.c
+--- linux-2.6.38.1/fs/xattr.c 2010-08-02 16:52:52.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/xattr.c 2011-01-29 02:01:07.000000000 +0100
@@ -18,6 +18,7 @@
#include <linux/module.h>
#include <linux/fsnotify.h>
/* In user.* namespace, only regular files and directories can have
* extended attributes. For sticky directories, only the owner and
-diff -NurpP --minimal linux-2.6.38-rc8/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/xfs/linux-2.6/xfs_ioctl.c
---- linux-2.6.38-rc8/fs/xfs/linux-2.6/xfs_ioctl.c 2011-03-10 17:09:24.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/xfs/linux-2.6/xfs_ioctl.c 2011-03-10 17:21:19.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/xfs/linux-2.6/xfs_ioctl.c
+--- linux-2.6.38.1/fs/xfs/linux-2.6/xfs_ioctl.c 2011-03-15 18:07:34.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/xfs/linux-2.6/xfs_ioctl.c 2011-03-10 17:21:19.000000000 +0100
@@ -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-2.6.38-rc8/fs/xfs/linux-2.6/xfs_ioctl.h linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/xfs/linux-2.6/xfs_ioctl.h
---- linux-2.6.38-rc8/fs/xfs/linux-2.6/xfs_ioctl.h 2010-07-07 18:31:54.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/xfs/linux-2.6/xfs_ioctl.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/xfs/linux-2.6/xfs_ioctl.h linux-2.6.38.1-vs2.3.0.37-rc9/fs/xfs/linux-2.6/xfs_ioctl.h
+--- linux-2.6.38.1/fs/xfs/linux-2.6/xfs_ioctl.h 2010-07-07 18:31:54.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/xfs/linux-2.6/xfs_ioctl.h 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/xfs/linux-2.6/xfs_iops.c
---- linux-2.6.38-rc8/fs/xfs/linux-2.6/xfs_iops.c 2011-03-10 17:09:24.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/xfs/linux-2.6/xfs_iops.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/xfs/linux-2.6/xfs_iops.c
+--- linux-2.6.38.1/fs/xfs/linux-2.6/xfs_iops.c 2011-03-15 18:07:34.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/xfs/linux-2.6/xfs_iops.c 2011-01-29 02:01:07.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-2.6.38-rc8/fs/xfs/linux-2.6/xfs_linux.h linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/xfs/linux-2.6/xfs_linux.h
---- linux-2.6.38-rc8/fs/xfs/linux-2.6/xfs_linux.h 2011-03-10 17:09:24.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/xfs/linux-2.6/xfs_linux.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/xfs/linux-2.6/xfs_linux.h linux-2.6.38.1-vs2.3.0.37-rc9/fs/xfs/linux-2.6/xfs_linux.h
+--- linux-2.6.38.1/fs/xfs/linux-2.6/xfs_linux.h 2011-03-15 18:07:34.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/xfs/linux-2.6/xfs_linux.h 2011-01-29 02:01:07.000000000 +0100
@@ -114,6 +114,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-2.6.38-rc8/fs/xfs/linux-2.6/xfs_super.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/xfs/linux-2.6/xfs_super.c
---- linux-2.6.38-rc8/fs/xfs/linux-2.6/xfs_super.c 2011-03-10 17:09:24.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/xfs/linux-2.6/xfs_super.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/xfs/linux-2.6/xfs_super.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/xfs/linux-2.6/xfs_super.c
+--- linux-2.6.38.1/fs/xfs/linux-2.6/xfs_super.c 2011-03-15 18:07:34.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/xfs/linux-2.6/xfs_super.c 2011-01-29 02:01:07.000000000 +0100
@@ -112,6 +112,9 @@ mempool_t *xfs_ioend_pool;
#define MNTOPT_QUOTANOENF "qnoenforce" /* same as uqnoenforce */
#define MNTOPT_DELAYLOG "delaylog" /* Delayed loging enabled */
sb->s_magic = XFS_SB_MAGIC;
sb->s_blocksize = mp->m_sb.sb_blocksize;
sb->s_blocksize_bits = ffs(sb->s_blocksize) - 1;
-diff -NurpP --minimal linux-2.6.38-rc8/fs/xfs/xfs_dinode.h linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/xfs/xfs_dinode.h
---- linux-2.6.38-rc8/fs/xfs/xfs_dinode.h 2011-01-05 21:50:28.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/xfs/xfs_dinode.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/xfs/xfs_dinode.h linux-2.6.38.1-vs2.3.0.37-rc9/fs/xfs/xfs_dinode.h
+--- linux-2.6.38.1/fs/xfs/xfs_dinode.h 2011-01-05 21:50:28.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/xfs/xfs_dinode.h 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/fs/xfs/xfs_fs.h linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/xfs/xfs_fs.h
---- linux-2.6.38-rc8/fs/xfs/xfs_fs.h 2011-01-05 21:50:28.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/xfs/xfs_fs.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/xfs/xfs_fs.h linux-2.6.38.1-vs2.3.0.37-rc9/fs/xfs/xfs_fs.h
+--- linux-2.6.38.1/fs/xfs/xfs_fs.h 2011-01-05 21:50:28.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/xfs/xfs_fs.h 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/fs/xfs/xfs_ialloc.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/xfs/xfs_ialloc.c
---- linux-2.6.38-rc8/fs/xfs/xfs_ialloc.c 2011-01-05 21:50:28.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/xfs/xfs_ialloc.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/xfs/xfs_ialloc.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/xfs/xfs_ialloc.c
+--- linux-2.6.38.1/fs/xfs/xfs_ialloc.c 2011-01-05 21:50:28.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/xfs/xfs_ialloc.c 2011-01-29 02:01:07.000000000 +0100
@@ -37,7 +37,6 @@
#include "xfs_error.h"
#include "xfs_bmap.h"
/*
* Allocation group level functions.
*/
-diff -NurpP --minimal linux-2.6.38-rc8/fs/xfs/xfs_inode.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/xfs/xfs_inode.c
---- linux-2.6.38-rc8/fs/xfs/xfs_inode.c 2011-03-10 17:09:24.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/xfs/xfs_inode.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/xfs/xfs_inode.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/xfs/xfs_inode.c
+--- linux-2.6.38.1/fs/xfs/xfs_inode.c 2011-03-15 18:07:34.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/xfs/xfs_inode.c 2011-01-29 02:01:07.000000000 +0100
@@ -245,6 +245,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-2.6.38-rc8/fs/xfs/xfs_inode.h linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/xfs/xfs_inode.h
---- linux-2.6.38-rc8/fs/xfs/xfs_inode.h 2011-03-10 17:09:24.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/xfs/xfs_inode.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/xfs/xfs_inode.h linux-2.6.38.1-vs2.3.0.37-rc9/fs/xfs/xfs_inode.h
+--- linux-2.6.38.1/fs/xfs/xfs_inode.h 2011-03-15 18:07:34.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/xfs/xfs_inode.h 2011-01-29 02:01:07.000000000 +0100
@@ -136,7 +136,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-2.6.38-rc8/fs/xfs/xfs_itable.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/xfs/xfs_itable.c
---- linux-2.6.38-rc8/fs/xfs/xfs_itable.c 2011-01-05 21:50:28.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/xfs/xfs_itable.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/xfs/xfs_itable.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/xfs/xfs_itable.c
+--- linux-2.6.38.1/fs/xfs/xfs_itable.c 2011-01-05 21:50:28.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/xfs/xfs_itable.c 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/fs/xfs/xfs_log_recover.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/xfs/xfs_log_recover.c
---- linux-2.6.38-rc8/fs/xfs/xfs_log_recover.c 2011-03-10 17:09:24.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/xfs/xfs_log_recover.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/xfs/xfs_log_recover.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/xfs/xfs_log_recover.c
+--- linux-2.6.38.1/fs/xfs/xfs_log_recover.c 2011-03-15 18:07:34.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/xfs/xfs_log_recover.c 2011-01-29 02:01:07.000000000 +0100
@@ -2317,7 +2317,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-2.6.38-rc8/fs/xfs/xfs_mount.h linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/xfs/xfs_mount.h
---- linux-2.6.38-rc8/fs/xfs/xfs_mount.h 2011-03-10 17:09:24.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/xfs/xfs_mount.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/xfs/xfs_mount.h linux-2.6.38.1-vs2.3.0.37-rc9/fs/xfs/xfs_mount.h
+--- linux-2.6.38.1/fs/xfs/xfs_mount.h 2011-03-15 18:07:34.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/xfs/xfs_mount.h 2011-01-29 02:01:07.000000000 +0100
@@ -251,6 +251,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-2.6.38-rc8/fs/xfs/xfs_vnodeops.c linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/xfs/xfs_vnodeops.c
---- linux-2.6.38-rc8/fs/xfs/xfs_vnodeops.c 2011-03-10 17:09:24.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/xfs/xfs_vnodeops.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/xfs/xfs_vnodeops.c linux-2.6.38.1-vs2.3.0.37-rc9/fs/xfs/xfs_vnodeops.c
+--- linux-2.6.38.1/fs/xfs/xfs_vnodeops.c 2011-03-15 18:07:34.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/xfs/xfs_vnodeops.c 2011-01-29 02:01:07.000000000 +0100
@@ -50,6 +50,78 @@
#include "xfs_vnodeops.h"
#include "xfs_trace.h"
if (iuid != uid) {
if (XFS_IS_QUOTA_RUNNING(mp) && XFS_IS_UQUOTA_ON(mp)) {
ASSERT(mask & ATTR_UID);
-diff -NurpP --minimal linux-2.6.38-rc8/fs/xfs/xfs_vnodeops.h linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/xfs/xfs_vnodeops.h
---- linux-2.6.38-rc8/fs/xfs/xfs_vnodeops.h 2011-01-05 21:50:28.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/fs/xfs/xfs_vnodeops.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/fs/xfs/xfs_vnodeops.h linux-2.6.38.1-vs2.3.0.37-rc9/fs/xfs/xfs_vnodeops.h
+--- linux-2.6.38.1/fs/xfs/xfs_vnodeops.h 2011-01-05 21:50:28.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/fs/xfs/xfs_vnodeops.h 2011-01-29 02:01:07.000000000 +0100
@@ -13,6 +13,7 @@ struct xfs_inode;
struct xfs_iomap;
int xfs_setattr(struct xfs_inode *ip, struct iattr *vap, int flags);
#define XFS_ATTR_DMI 0x01 /* invocation from a DMI function */
#define XFS_ATTR_NONBLOCK 0x02 /* return EAGAIN if operation would block */
-diff -NurpP --minimal linux-2.6.38-rc8/include/asm-generic/tlb.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/asm-generic/tlb.h
---- linux-2.6.38-rc8/include/asm-generic/tlb.h 2009-09-10 15:26:24.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/asm-generic/tlb.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/asm-generic/tlb.h linux-2.6.38.1-vs2.3.0.37-rc9/include/asm-generic/tlb.h
+--- linux-2.6.38.1/include/asm-generic/tlb.h 2009-09-10 15:26:24.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/asm-generic/tlb.h 2011-01-29 02:01:07.000000000 +0100
@@ -14,6 +14,7 @@
#define _ASM_GENERIC__TLB_H
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/Kbuild linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/Kbuild
---- linux-2.6.38-rc8/include/linux/Kbuild 2011-03-10 17:09:25.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/Kbuild 2011-02-17 02:17:51.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/Kbuild linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/Kbuild
+--- linux-2.6.38.1/include/linux/Kbuild 2011-03-15 18:07:37.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/Kbuild 2011-02-17 02:17:51.000000000 +0100
@@ -16,6 +16,7 @@ header-y += netfilter_bridge/
header-y += netfilter_ipv4/
header-y += netfilter_ipv6/
header-y += wimax/
objhdr-y += version.h
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/capability.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/capability.h
---- linux-2.6.38-rc8/include/linux/capability.h 2011-03-10 17:09:25.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/capability.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/capability.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/capability.h
+--- linux-2.6.38.1/include/linux/capability.h 2011-03-15 18:07:37.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/capability.h 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/include/linux/cred.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/cred.h
---- linux-2.6.38-rc8/include/linux/cred.h 2011-01-05 21:50:29.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/cred.h 2011-01-31 12:03:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/cred.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/cred.h
+--- linux-2.6.38.1/include/linux/cred.h 2011-01-05 21:50:29.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/cred.h 2011-01-31 12:03:07.000000000 +0100
@@ -155,6 +155,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-2.6.38-rc8/include/linux/devpts_fs.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/devpts_fs.h
---- linux-2.6.38-rc8/include/linux/devpts_fs.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/devpts_fs.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/devpts_fs.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/devpts_fs.h
+--- linux-2.6.38.1/include/linux/devpts_fs.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/devpts_fs.h 2011-01-29 02:01:07.000000000 +0100
@@ -45,5 +45,4 @@ static inline void devpts_pty_kill(struc
#endif
-
#endif /* _LINUX_DEVPTS_FS_H */
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/ext2_fs.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/ext2_fs.h
---- linux-2.6.38-rc8/include/linux/ext2_fs.h 2010-02-25 11:52:07.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/ext2_fs.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/ext2_fs.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/ext2_fs.h
+--- linux-2.6.38.1/include/linux/ext2_fs.h 2010-02-25 11:52:07.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/ext2_fs.h 2011-01-29 02:01:07.000000000 +0100
@@ -189,8 +189,12 @@ struct ext2_group_desc
#define EXT2_NOTAIL_FL FS_NOTAIL_FL /* file tail should not be merged */
#define EXT2_DIRSYNC_FL FS_DIRSYNC_FL /* dirsync behaviour (directories only) */
#define clear_opt(o, opt) o &= ~EXT2_MOUNT_##opt
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/ext3_fs.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/ext3_fs.h
---- linux-2.6.38-rc8/include/linux/ext3_fs.h 2011-03-10 17:09:25.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/ext3_fs.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/ext3_fs.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/ext3_fs.h
+--- linux-2.6.38.1/include/linux/ext3_fs.h 2011-03-15 18:07:38.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/ext3_fs.h 2011-01-29 02:01:07.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-2.6.38-rc8/include/linux/fs.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/fs.h
---- linux-2.6.38-rc8/include/linux/fs.h 2011-03-10 17:09:25.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/fs.h 2011-03-07 16:53:28.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/fs.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/fs.h
+--- linux-2.6.38.1/include/linux/fs.h 2011-03-15 18:07:38.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/fs.h 2011-03-07 16:53:28.000000000 +0100
@@ -214,6 +214,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 */
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-2.6.38-rc8/include/linux/gfs2_ondisk.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/gfs2_ondisk.h
---- linux-2.6.38-rc8/include/linux/gfs2_ondisk.h 2010-07-07 18:31:55.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/gfs2_ondisk.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/gfs2_ondisk.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/gfs2_ondisk.h
+--- linux-2.6.38.1/include/linux/gfs2_ondisk.h 2010-07-07 18:31:55.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/gfs2_ondisk.h 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/include/linux/if_tun.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/if_tun.h
---- linux-2.6.38-rc8/include/linux/if_tun.h 2010-08-02 16:52:54.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/if_tun.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/if_tun.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/if_tun.h
+--- linux-2.6.38.1/include/linux/if_tun.h 2010-08-02 16:52:54.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/if_tun.h 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/include/linux/init_task.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/init_task.h
---- linux-2.6.38-rc8/include/linux/init_task.h 2011-03-10 17:09:25.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/init_task.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/init_task.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/init_task.h
+--- linux-2.6.38.1/include/linux/init_task.h 2011-03-15 18:07:38.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/init_task.h 2011-01-29 02:01:07.000000000 +0100
@@ -192,6 +192,10 @@ extern struct cred init_cred;
INIT_FTRACE_GRAPH \
INIT_TRACE_RECURSION \
}
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/ipc.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/ipc.h
---- linux-2.6.38-rc8/include/linux/ipc.h 2009-12-03 20:02:55.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/ipc.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/ipc.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/ipc.h
+--- linux-2.6.38.1/include/linux/ipc.h 2009-12-03 20:02:55.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/ipc.h 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/include/linux/loop.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/loop.h
---- linux-2.6.38-rc8/include/linux/loop.h 2009-09-10 15:26:25.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/loop.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/loop.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/loop.h
+--- linux-2.6.38.1/include/linux/loop.h 2009-09-10 15:26:25.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/loop.h 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/include/linux/magic.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/magic.h
---- linux-2.6.38-rc8/include/linux/magic.h 2011-03-10 17:09:25.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/magic.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/magic.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/magic.h
+--- linux-2.6.38.1/include/linux/magic.h 2011-03-15 18:07:39.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/magic.h 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/include/linux/major.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/major.h
---- linux-2.6.38-rc8/include/linux/major.h 2009-09-10 15:26:25.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/major.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/major.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/major.h
+--- linux-2.6.38.1/include/linux/major.h 2009-09-10 15:26:25.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/major.h 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/include/linux/memcontrol.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/memcontrol.h
---- linux-2.6.38-rc8/include/linux/memcontrol.h 2011-03-10 17:09:25.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/memcontrol.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/memcontrol.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/memcontrol.h
+--- linux-2.6.38.1/include/linux/memcontrol.h 2011-03-15 18:07:39.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/memcontrol.h 2011-01-29 02:01:07.000000000 +0100
@@ -82,6 +82,13 @@ int task_in_mem_cgroup(struct task_struc
extern struct mem_cgroup *try_get_mem_cgroup_from_page(struct page *page);
extern struct mem_cgroup *mem_cgroup_from_task(struct task_struct *p);
static inline
int mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *cgroup)
{
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/mm_types.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/mm_types.h
---- linux-2.6.38-rc8/include/linux/mm_types.h 2011-03-10 17:09:25.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/mm_types.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/mm_types.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/mm_types.h
+--- linux-2.6.38.1/include/linux/mm_types.h 2011-03-15 18:07:39.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/mm_types.h 2011-01-29 02:01:07.000000000 +0100
@@ -269,6 +269,7 @@ struct mm_struct {
/* Architecture-specific MM context */
/* Swap token stuff */
/*
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/mount.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/mount.h
---- linux-2.6.38-rc8/include/linux/mount.h 2011-03-10 17:09:25.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/mount.h 2011-01-29 03:11:27.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/mount.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/mount.h
+--- linux-2.6.38.1/include/linux/mount.h 2011-03-15 18:07:39.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/mount.h 2011-01-29 03:11:27.000000000 +0100
@@ -52,6 +52,9 @@ struct mnt_pcp {
int mnt_writers;
};
};
struct file; /* forward dec */
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/net.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/net.h
---- linux-2.6.38-rc8/include/linux/net.h 2011-01-05 21:50:31.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/net.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/net.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/net.h
+--- linux-2.6.38.1/include/linux/net.h 2011-01-05 21:50:31.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/net.h 2011-01-29 02:01:07.000000000 +0100
@@ -71,6 +71,7 @@ struct net;
#define SOCK_NOSPACE 2
#define SOCK_PASSCRED 3
#ifndef ARCH_HAS_SOCKET_TYPES
/**
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/nfs_mount.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/nfs_mount.h
---- linux-2.6.38-rc8/include/linux/nfs_mount.h 2011-01-05 21:50:31.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/nfs_mount.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/nfs_mount.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/nfs_mount.h
+--- linux-2.6.38.1/include/linux/nfs_mount.h 2011-01-05 21:50:31.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/nfs_mount.h 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/include/linux/nsproxy.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/nsproxy.h
---- linux-2.6.38-rc8/include/linux/nsproxy.h 2009-06-11 17:13:17.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/nsproxy.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/nsproxy.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/nsproxy.h
+--- linux-2.6.38.1/include/linux/nsproxy.h 2009-06-11 17:13:17.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/nsproxy.h 2011-01-29 02:01:07.000000000 +0100
@@ -3,6 +3,7 @@
#include <linux/spinlock.h>
}
#ifdef CONFIG_CGROUP_NS
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/pid.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/pid.h
---- linux-2.6.38-rc8/include/linux/pid.h 2009-03-24 14:22:43.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/pid.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/pid.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/pid.h
+--- linux-2.6.38.1/include/linux/pid.h 2009-03-24 14:22:43.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/pid.h 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/include/linux/proc_fs.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/proc_fs.h
---- linux-2.6.38-rc8/include/linux/proc_fs.h 2009-12-03 20:02:56.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/proc_fs.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/proc_fs.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/proc_fs.h
+--- linux-2.6.38.1/include/linux/proc_fs.h 2009-12-03 20:02:56.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/proc_fs.h 2011-01-29 02:01:07.000000000 +0100
@@ -56,6 +56,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-2.6.38-rc8/include/linux/quotaops.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/quotaops.h
---- linux-2.6.38-rc8/include/linux/quotaops.h 2011-03-10 17:09:25.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/quotaops.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/quotaops.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/quotaops.h
+--- linux-2.6.38.1/include/linux/quotaops.h 2011-03-15 18:07:39.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/quotaops.h 2011-01-29 02:01:07.000000000 +0100
@@ -8,6 +8,7 @@
#define _LINUX_QUOTAOPS_
}
static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/reboot.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/reboot.h
---- linux-2.6.38-rc8/include/linux/reboot.h 2010-07-07 18:31:56.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/reboot.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/reboot.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/reboot.h
+--- linux-2.6.38.1/include/linux/reboot.h 2010-07-07 18:31:56.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/reboot.h 2011-01-29 02:01:07.000000000 +0100
@@ -33,6 +33,7 @@
#define LINUX_REBOOT_CMD_RESTART2 0xA1B2C3D4
#define LINUX_REBOOT_CMD_SW_SUSPEND 0xD000FCE2
#ifdef __KERNEL__
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/reiserfs_fs.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/reiserfs_fs.h
---- linux-2.6.38-rc8/include/linux/reiserfs_fs.h 2011-01-05 21:50:32.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/reiserfs_fs.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/reiserfs_fs.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/reiserfs_fs.h
+--- linux-2.6.38.1/include/linux/reiserfs_fs.h 2011-01-05 21:50:32.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/reiserfs_fs.h 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/include/linux/reiserfs_fs_sb.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/reiserfs_fs_sb.h
---- linux-2.6.38-rc8/include/linux/reiserfs_fs_sb.h 2010-02-25 11:52:07.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/reiserfs_fs_sb.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/reiserfs_fs_sb.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/reiserfs_fs_sb.h
+--- linux-2.6.38.1/include/linux/reiserfs_fs_sb.h 2010-02-25 11:52:07.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/reiserfs_fs_sb.h 2011-01-29 02:01:07.000000000 +0100
@@ -476,6 +476,7 @@ enum reiserfs_mount_options {
REISERFS_EXPOSE_PRIVROOT,
REISERFS_BARRIER_NONE,
/* Actions on error */
REISERFS_ERROR_PANIC,
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/sched.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/sched.h
---- linux-2.6.38-rc8/include/linux/sched.h 2011-03-10 17:09:25.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/sched.h 2011-03-07 16:53:28.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/sched.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/sched.h
+--- linux-2.6.38.1/include/linux/sched.h 2011-03-15 18:07:39.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/sched.h 2011-03-07 16:53:28.000000000 +0100
@@ -1373,6 +1373,14 @@ struct task_struct {
#endif
seccomp_t seccomp;
}
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/shmem_fs.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/shmem_fs.h
---- linux-2.6.38-rc8/include/linux/shmem_fs.h 2010-10-21 13:07:55.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/shmem_fs.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/shmem_fs.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/shmem_fs.h
+--- linux-2.6.38.1/include/linux/shmem_fs.h 2010-10-21 13:07:55.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/shmem_fs.h 2011-01-29 02:01:07.000000000 +0100
@@ -9,6 +9,9 @@
#define SHMEM_NR_DIRECT 16
struct shmem_inode_info {
spinlock_t lock;
unsigned long flags;
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/stat.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/stat.h
---- linux-2.6.38-rc8/include/linux/stat.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/stat.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/stat.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/stat.h
+--- linux-2.6.38.1/include/linux/stat.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/stat.h 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/include/linux/sunrpc/auth.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/sunrpc/auth.h
---- linux-2.6.38-rc8/include/linux/sunrpc/auth.h 2011-03-10 17:09:26.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/sunrpc/auth.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/sunrpc/auth.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/sunrpc/auth.h
+--- linux-2.6.38.1/include/linux/sunrpc/auth.h 2011-03-15 18:07:39.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/sunrpc/auth.h 2011-01-29 02:01:07.000000000 +0100
@@ -25,6 +25,7 @@
struct auth_cred {
uid_t uid;
struct group_info *group_info;
unsigned char machine_cred : 1;
};
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/sunrpc/clnt.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/sunrpc/clnt.h
---- linux-2.6.38-rc8/include/linux/sunrpc/clnt.h 2011-03-10 17:09:26.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/sunrpc/clnt.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/sunrpc/clnt.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/sunrpc/clnt.h
+--- linux-2.6.38.1/include/linux/sunrpc/clnt.h 2011-03-15 18:07:39.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/sunrpc/clnt.h 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/include/linux/syscalls.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/syscalls.h
---- linux-2.6.38-rc8/include/linux/syscalls.h 2011-03-10 17:09:26.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/syscalls.h 2011-02-17 02:17:51.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/syscalls.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/syscalls.h
+--- linux-2.6.38.1/include/linux/syscalls.h 2011-03-15 18:07:39.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/syscalls.h 2011-02-17 02:17:51.000000000 +0100
@@ -478,6 +478,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-2.6.38-rc8/include/linux/sysctl.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/sysctl.h
---- linux-2.6.38-rc8/include/linux/sysctl.h 2010-08-02 16:52:56.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/sysctl.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/sysctl.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/sysctl.h
+--- linux-2.6.38.1/include/linux/sysctl.h 2011-03-15 18:07:40.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/sysctl.h 2011-03-15 18:15:06.000000000 +0100
@@ -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-2.6.38-rc8/include/linux/sysfs.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/sysfs.h
---- linux-2.6.38-rc8/include/linux/sysfs.h 2011-01-05 21:50:34.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/sysfs.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/sysfs.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/sysfs.h
+--- linux-2.6.38.1/include/linux/sysfs.h 2011-01-05 21:50:34.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/sysfs.h 2011-01-29 02:01:07.000000000 +0100
@@ -19,6 +19,8 @@
#include <linux/kobject_ns.h>
#include <asm/atomic.h>
struct kobject;
struct module;
enum kobj_ns_type;
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/time.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/time.h
---- linux-2.6.38-rc8/include/linux/time.h 2011-03-10 17:09:26.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/time.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/time.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/time.h
+--- linux-2.6.38.1/include/linux/time.h 2011-03-15 18:07:40.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/time.h 2011-01-29 02:01:07.000000000 +0100
@@ -254,6 +254,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-2.6.38-rc8/include/linux/types.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/types.h
---- linux-2.6.38-rc8/include/linux/types.h 2011-01-05 21:50:34.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/types.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/types.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/types.h
+--- linux-2.6.38.1/include/linux/types.h 2011-01-05 21:50:34.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/types.h 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/include/linux/vroot.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vroot.h
---- linux-2.6.38-rc8/include/linux/vroot.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vroot.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vroot.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vroot.h
+--- linux-2.6.38.1/include/linux/vroot.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vroot.h 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,51 @@
+
+/*
+#define VROOT_CLR_DEV 0x5601
+
+#endif /* _LINUX_VROOT_H */
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/vs_base.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vs_base.h
---- linux-2.6.38-rc8/include/linux/vs_base.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vs_base.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vs_base.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vs_base.h
+--- linux-2.6.38.1/include/linux/vs_base.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vs_base.h 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,10 @@
+#ifndef _VS_BASE_H
+#define _VS_BASE_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/vs_context.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vs_context.h
---- linux-2.6.38-rc8/include/linux/vs_context.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vs_context.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vs_context.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vs_context.h
+--- linux-2.6.38.1/include/linux/vs_context.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vs_context.h 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,242 @@
+#ifndef _VS_CONTEXT_H
+#define _VS_CONTEXT_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/vs_cowbl.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vs_cowbl.h
---- linux-2.6.38-rc8/include/linux/vs_cowbl.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vs_cowbl.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vs_cowbl.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vs_cowbl.h
+--- linux-2.6.38.1/include/linux/vs_cowbl.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vs_cowbl.h 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,48 @@
+#ifndef _VS_COWBL_H
+#define _VS_COWBL_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/vs_cvirt.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vs_cvirt.h
---- linux-2.6.38-rc8/include/linux/vs_cvirt.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vs_cvirt.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vs_cvirt.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vs_cvirt.h
+--- linux-2.6.38.1/include/linux/vs_cvirt.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vs_cvirt.h 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,50 @@
+#ifndef _VS_CVIRT_H
+#define _VS_CVIRT_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/vs_device.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vs_device.h
---- linux-2.6.38-rc8/include/linux/vs_device.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vs_device.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vs_device.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vs_device.h
+--- linux-2.6.38.1/include/linux/vs_device.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vs_device.h 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,45 @@
+#ifndef _VS_DEVICE_H
+#define _VS_DEVICE_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/vs_dlimit.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vs_dlimit.h
---- linux-2.6.38-rc8/include/linux/vs_dlimit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vs_dlimit.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vs_dlimit.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vs_dlimit.h
+--- linux-2.6.38.1/include/linux/vs_dlimit.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vs_dlimit.h 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,215 @@
+#ifndef _VS_DLIMIT_H
+#define _VS_DLIMIT_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/vs_inet.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vs_inet.h
---- linux-2.6.38-rc8/include/linux/vs_inet.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vs_inet.h 2011-01-29 04:45:50.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vs_inet.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vs_inet.h
+--- linux-2.6.38.1/include/linux/vs_inet.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vs_inet.h 2011-01-29 04:45:50.000000000 +0100
@@ -0,0 +1,351 @@
+#ifndef _VS_INET_H
+#define _VS_INET_H
+#else
+// #warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/vs_inet6.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vs_inet6.h
---- linux-2.6.38-rc8/include/linux/vs_inet6.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vs_inet6.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vs_inet6.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vs_inet6.h
+--- linux-2.6.38.1/include/linux/vs_inet6.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vs_inet6.h 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,246 @@
+#ifndef _VS_INET6_H
+#define _VS_INET6_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/vs_limit.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vs_limit.h
---- linux-2.6.38-rc8/include/linux/vs_limit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vs_limit.h 2011-01-29 04:59:22.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vs_limit.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vs_limit.h
+--- linux-2.6.38.1/include/linux/vs_limit.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vs_limit.h 2011-01-29 04:59:22.000000000 +0100
@@ -0,0 +1,140 @@
+#ifndef _VS_LIMIT_H
+#define _VS_LIMIT_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/vs_memory.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vs_memory.h
---- linux-2.6.38-rc8/include/linux/vs_memory.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vs_memory.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vs_memory.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vs_memory.h
+--- linux-2.6.38.1/include/linux/vs_memory.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vs_memory.h 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,58 @@
+#ifndef _VS_MEMORY_H
+#define _VS_MEMORY_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/vs_network.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vs_network.h
---- linux-2.6.38-rc8/include/linux/vs_network.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vs_network.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vs_network.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vs_network.h
+--- linux-2.6.38.1/include/linux/vs_network.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vs_network.h 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,169 @@
+#ifndef _NX_VS_NETWORK_H
+#define _NX_VS_NETWORK_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/vs_pid.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vs_pid.h
---- linux-2.6.38-rc8/include/linux/vs_pid.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vs_pid.h 2011-01-29 02:01:07.000000000 +0100
-@@ -0,0 +1,95 @@
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vs_pid.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vs_pid.h
+--- linux-2.6.38.1/include/linux/vs_pid.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vs_pid.h 2011-03-22 17:43:53.000000000 +0100
+@@ -0,0 +1,50 @@
+#ifndef _VS_PID_H
+#define _VS_PID_H
+
+
+#define find_task_by_real_pid(pid) find_task_by_pid_ns(pid, &init_pid_ns)
+
-+#if 0
-+
-+static inline
-+struct task_struct *vx_find_proc_task_by_pid(int pid)
-+{
-+ struct task_struct *task = find_task_by_real_pid(pid);
-+
-+ if (task && !vx_proc_task_visible(task)) {
-+ vxdprintk(VXD_CBIT(misc, 6),
-+ "dropping task (find) %p[#%u,%u] for %p[#%u,%u]",
-+ task, task->xid, task->pid,
-+ current, current->xid, current->pid);
-+ task = NULL;
-+ }
-+ return task;
-+}
-+
-+#endif
+
+static inline
+struct task_struct *vx_get_proc_task(struct inode *inode, struct pid *pid)
+ return task;
+}
+
-+#if 0
-+
-+static inline
-+struct task_struct *vx_child_reaper(struct task_struct *p)
-+{
-+ struct vx_info *vxi = p->vx_info;
-+ struct task_struct *reaper = child_reaper(p);
-+
-+ if (!vxi)
-+ goto out;
-+
-+ BUG_ON(!p->vx_info->vx_reaper);
-+
-+ /* child reaper for the guest reaper */
-+ if (vxi->vx_reaper == p)
-+ goto out;
-+
-+ reaper = vxi->vx_reaper;
-+out:
-+ vxdprintk(VXD_CBIT(xid, 7),
-+ "vx_child_reaper(%p[#%u,%u]) = %p[#%u,%u]",
-+ p, p->xid, p->pid, reaper, reaper->xid, reaper->pid);
-+ return reaper;
-+}
-+
-+#endif
-+
+
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/vs_sched.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vs_sched.h
---- linux-2.6.38-rc8/include/linux/vs_sched.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vs_sched.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vs_sched.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vs_sched.h
+--- linux-2.6.38.1/include/linux/vs_sched.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vs_sched.h 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,40 @@
+#ifndef _VS_SCHED_H
+#define _VS_SCHED_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/vs_socket.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vs_socket.h
---- linux-2.6.38-rc8/include/linux/vs_socket.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vs_socket.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vs_socket.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vs_socket.h
+--- linux-2.6.38.1/include/linux/vs_socket.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vs_socket.h 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,67 @@
+#ifndef _VS_SOCKET_H
+#define _VS_SOCKET_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/vs_tag.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vs_tag.h
---- linux-2.6.38-rc8/include/linux/vs_tag.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vs_tag.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vs_tag.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vs_tag.h
+--- linux-2.6.38.1/include/linux/vs_tag.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vs_tag.h 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,47 @@
+#ifndef _VS_TAG_H
+#define _VS_TAG_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/vs_time.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vs_time.h
---- linux-2.6.38-rc8/include/linux/vs_time.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vs_time.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vs_time.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vs_time.h
+--- linux-2.6.38.1/include/linux/vs_time.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vs_time.h 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,19 @@
+#ifndef _VS_TIME_H
+#define _VS_TIME_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/vserver/Kbuild linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/Kbuild
---- linux-2.6.38-rc8/include/linux/vserver/Kbuild 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/Kbuild 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vserver/Kbuild linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/Kbuild
+--- linux-2.6.38.1/include/linux/vserver/Kbuild 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/Kbuild 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,8 @@
+
+unifdef-y += context_cmd.h network_cmd.h space_cmd.h \
+
+unifdef-y += switch.h network.h monitor.h inode.h device.h
+
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/vserver/base.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/base.h
---- linux-2.6.38-rc8/include/linux/vserver/base.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/base.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vserver/base.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/base.h
+--- linux-2.6.38.1/include/linux/vserver/base.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/base.h 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,170 @@
+#ifndef _VX_BASE_H
+#define _VX_BASE_H
+#define nx_info_state(n, m) (__nx_state(n) & (m))
+
+#endif
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/vserver/cacct.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/cacct.h
---- linux-2.6.38-rc8/include/linux/vserver/cacct.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/cacct.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vserver/cacct.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/cacct.h
+--- linux-2.6.38.1/include/linux/vserver/cacct.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/cacct.h 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,15 @@
+#ifndef _VX_CACCT_H
+#define _VX_CACCT_H
+};
+
+#endif /* _VX_CACCT_H */
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/vserver/cacct_cmd.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/cacct_cmd.h
---- linux-2.6.38-rc8/include/linux/vserver/cacct_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/cacct_cmd.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vserver/cacct_cmd.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/cacct_cmd.h
+--- linux-2.6.38.1/include/linux/vserver/cacct_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/cacct_cmd.h 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/include/linux/vserver/cacct_def.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/cacct_def.h
---- linux-2.6.38-rc8/include/linux/vserver/cacct_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/cacct_def.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vserver/cacct_def.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/cacct_def.h
+--- linux-2.6.38.1/include/linux/vserver/cacct_def.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/cacct_def.h 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,43 @@
+#ifndef _VX_CACCT_DEF_H
+#define _VX_CACCT_DEF_H
+#endif
+
+#endif /* _VX_CACCT_DEF_H */
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/vserver/cacct_int.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/cacct_int.h
---- linux-2.6.38-rc8/include/linux/vserver/cacct_int.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/cacct_int.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vserver/cacct_int.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/cacct_int.h
+--- linux-2.6.38.1/include/linux/vserver/cacct_int.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/cacct_int.h 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/include/linux/vserver/check.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/check.h
---- linux-2.6.38-rc8/include/linux/vserver/check.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/check.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vserver/check.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/check.h
+--- linux-2.6.38.1/include/linux/vserver/check.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/check.h 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/include/linux/vserver/context.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/context.h
---- linux-2.6.38-rc8/include/linux/vserver/context.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/context.h 2011-01-31 22:46:21.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vserver/context.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/context.h
+--- linux-2.6.38.1/include/linux/vserver/context.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/context.h 2011-01-31 22:46:21.000000000 +0100
@@ -0,0 +1,189 @@
+#ifndef _VX_CONTEXT_H
+#define _VX_CONTEXT_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_H */
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/vserver/context_cmd.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/context_cmd.h
---- linux-2.6.38-rc8/include/linux/vserver/context_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/context_cmd.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vserver/context_cmd.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/context_cmd.h
+--- linux-2.6.38.1/include/linux/vserver/context_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/context_cmd.h 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,145 @@
+#ifndef _VX_CONTEXT_CMD_H
+#define _VX_CONTEXT_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/vserver/cvirt.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/cvirt.h
---- linux-2.6.38-rc8/include/linux/vserver/cvirt.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/cvirt.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vserver/cvirt.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/cvirt.h
+--- linux-2.6.38.1/include/linux/vserver/cvirt.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/cvirt.h 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,20 @@
+#ifndef _VX_CVIRT_H
+#define _VX_CVIRT_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CVIRT_H */
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/vserver/cvirt_cmd.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/cvirt_cmd.h
---- linux-2.6.38-rc8/include/linux/vserver/cvirt_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/cvirt_cmd.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vserver/cvirt_cmd.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/cvirt_cmd.h
+--- linux-2.6.38.1/include/linux/vserver/cvirt_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/cvirt_cmd.h 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/include/linux/vserver/cvirt_def.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/cvirt_def.h
---- linux-2.6.38-rc8/include/linux/vserver/cvirt_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/cvirt_def.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vserver/cvirt_def.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/cvirt_def.h
+--- linux-2.6.38.1/include/linux/vserver/cvirt_def.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/cvirt_def.h 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,80 @@
+#ifndef _VX_CVIRT_DEF_H
+#define _VX_CVIRT_DEF_H
+#endif
+
+#endif /* _VX_CVIRT_DEF_H */
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/vserver/debug.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/debug.h
---- linux-2.6.38-rc8/include/linux/vserver/debug.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/debug.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vserver/debug.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/debug.h
+--- linux-2.6.38.1/include/linux/vserver/debug.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/debug.h 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,140 @@
+#ifndef _VX_DEBUG_H
+#define _VX_DEBUG_H
+
+
+#endif /* _VX_DEBUG_H */
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/vserver/debug_cmd.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/debug_cmd.h
---- linux-2.6.38-rc8/include/linux/vserver/debug_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/debug_cmd.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vserver/debug_cmd.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/debug_cmd.h
+--- linux-2.6.38.1/include/linux/vserver/debug_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/debug_cmd.h 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/include/linux/vserver/device.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/device.h
---- linux-2.6.38-rc8/include/linux/vserver/device.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/device.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vserver/device.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/device.h
+--- linux-2.6.38.1/include/linux/vserver/device.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/device.h 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/include/linux/vserver/device_cmd.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/device_cmd.h
---- linux-2.6.38-rc8/include/linux/vserver/device_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/device_cmd.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vserver/device_cmd.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/device_cmd.h
+--- linux-2.6.38.1/include/linux/vserver/device_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/device_cmd.h 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/include/linux/vserver/device_def.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/device_def.h
---- linux-2.6.38-rc8/include/linux/vserver/device_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/device_def.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vserver/device_def.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/device_def.h
+--- linux-2.6.38.1/include/linux/vserver/device_def.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/device_def.h 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,17 @@
+#ifndef _VX_DEVICE_DEF_H
+#define _VX_DEVICE_DEF_H
+};
+
+#endif /* _VX_DEVICE_DEF_H */
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/vserver/dlimit.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/dlimit.h
---- linux-2.6.38-rc8/include/linux/vserver/dlimit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/dlimit.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vserver/dlimit.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/dlimit.h
+--- linux-2.6.38.1/include/linux/vserver/dlimit.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/dlimit.h 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/include/linux/vserver/dlimit_cmd.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/dlimit_cmd.h
---- linux-2.6.38-rc8/include/linux/vserver/dlimit_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/dlimit_cmd.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vserver/dlimit_cmd.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/dlimit_cmd.h
+--- linux-2.6.38.1/include/linux/vserver/dlimit_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/dlimit_cmd.h 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/include/linux/vserver/global.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/global.h
---- linux-2.6.38-rc8/include/linux/vserver/global.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/global.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vserver/global.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/global.h
+--- linux-2.6.38.1/include/linux/vserver/global.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/global.h 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,19 @@
+#ifndef _VX_GLOBAL_H
+#define _VX_GLOBAL_H
+
+
+#endif /* _VX_GLOBAL_H */
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/vserver/history.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/history.h
---- linux-2.6.38-rc8/include/linux/vserver/history.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/history.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vserver/history.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/history.h
+--- linux-2.6.38.1/include/linux/vserver/history.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/history.h 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,197 @@
+#ifndef _VX_HISTORY_H
+#define _VX_HISTORY_H
+#endif /* CONFIG_VSERVER_HISTORY */
+
+#endif /* _VX_HISTORY_H */
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/vserver/inode.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/inode.h
---- linux-2.6.38-rc8/include/linux/vserver/inode.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/inode.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vserver/inode.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/inode.h
+--- linux-2.6.38.1/include/linux/vserver/inode.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/inode.h 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/include/linux/vserver/inode_cmd.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/inode_cmd.h
---- linux-2.6.38-rc8/include/linux/vserver/inode_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/inode_cmd.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vserver/inode_cmd.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/inode_cmd.h
+--- linux-2.6.38.1/include/linux/vserver/inode_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/inode_cmd.h 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/include/linux/vserver/limit.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/limit.h
---- linux-2.6.38-rc8/include/linux/vserver/limit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/limit.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vserver/limit.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/limit.h
+--- linux-2.6.38.1/include/linux/vserver/limit.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/limit.h 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,71 @@
+#ifndef _VX_LIMIT_H
+#define _VX_LIMIT_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_H */
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/vserver/limit_cmd.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/limit_cmd.h
---- linux-2.6.38-rc8/include/linux/vserver/limit_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/limit_cmd.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vserver/limit_cmd.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/limit_cmd.h
+--- linux-2.6.38.1/include/linux/vserver/limit_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/limit_cmd.h 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/include/linux/vserver/limit_def.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/limit_def.h
---- linux-2.6.38-rc8/include/linux/vserver/limit_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/limit_def.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vserver/limit_def.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/limit_def.h
+--- linux-2.6.38.1/include/linux/vserver/limit_def.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/limit_def.h 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,47 @@
+#ifndef _VX_LIMIT_DEF_H
+#define _VX_LIMIT_DEF_H
+#endif
+
+#endif /* _VX_LIMIT_DEF_H */
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/vserver/limit_int.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/limit_int.h
---- linux-2.6.38-rc8/include/linux/vserver/limit_int.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/limit_int.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vserver/limit_int.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/limit_int.h
+--- linux-2.6.38.1/include/linux/vserver/limit_int.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/limit_int.h 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/include/linux/vserver/monitor.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/monitor.h
---- linux-2.6.38-rc8/include/linux/vserver/monitor.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/monitor.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vserver/monitor.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/monitor.h
+--- linux-2.6.38.1/include/linux/vserver/monitor.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/monitor.h 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,96 @@
+#ifndef _VX_MONITOR_H
+#define _VX_MONITOR_H
+
+
+#endif /* _VX_MONITOR_H */
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/vserver/network.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/network.h
---- linux-2.6.38-rc8/include/linux/vserver/network.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/network.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vserver/network.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/network.h
+--- linux-2.6.38.1/include/linux/vserver/network.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/network.h 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,146 @@
+#ifndef _VX_NETWORK_H
+#define _VX_NETWORK_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_NETWORK_H */
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/vserver/network_cmd.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/network_cmd.h
---- linux-2.6.38-rc8/include/linux/vserver/network_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/network_cmd.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vserver/network_cmd.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/network_cmd.h
+--- linux-2.6.38.1/include/linux/vserver/network_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/network_cmd.h 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,150 @@
+#ifndef _VX_NETWORK_CMD_H
+#define _VX_NETWORK_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/vserver/percpu.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/percpu.h
---- linux-2.6.38-rc8/include/linux/vserver/percpu.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/percpu.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vserver/percpu.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/percpu.h
+--- linux-2.6.38.1/include/linux/vserver/percpu.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/percpu.h 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/include/linux/vserver/pid.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/pid.h
---- linux-2.6.38-rc8/include/linux/vserver/pid.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/pid.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vserver/pid.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/pid.h
+--- linux-2.6.38.1/include/linux/vserver/pid.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/pid.h 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,51 @@
+#ifndef _VSERVER_PID_H
+#define _VSERVER_PID_H
+}
+
+#endif
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/vserver/sched.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/sched.h
---- linux-2.6.38-rc8/include/linux/vserver/sched.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/sched.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vserver/sched.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/sched.h
+--- linux-2.6.38.1/include/linux/vserver/sched.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/sched.h 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/include/linux/vserver/sched_cmd.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/sched_cmd.h
---- linux-2.6.38-rc8/include/linux/vserver/sched_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/sched_cmd.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vserver/sched_cmd.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/sched_cmd.h
+--- linux-2.6.38.1/include/linux/vserver/sched_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/sched_cmd.h 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/include/linux/vserver/sched_def.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/sched_def.h
---- linux-2.6.38-rc8/include/linux/vserver/sched_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/sched_def.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vserver/sched_def.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/sched_def.h
+--- linux-2.6.38.1/include/linux/vserver/sched_def.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/sched_def.h 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,38 @@
+#ifndef _VX_SCHED_DEF_H
+#define _VX_SCHED_DEF_H
+#endif
+
+#endif /* _VX_SCHED_DEF_H */
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/vserver/signal.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/signal.h
---- linux-2.6.38-rc8/include/linux/vserver/signal.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/signal.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vserver/signal.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/signal.h
+--- linux-2.6.38.1/include/linux/vserver/signal.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/signal.h 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/include/linux/vserver/signal_cmd.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/signal_cmd.h
---- linux-2.6.38-rc8/include/linux/vserver/signal_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/signal_cmd.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vserver/signal_cmd.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/signal_cmd.h
+--- linux-2.6.38.1/include/linux/vserver/signal_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/signal_cmd.h 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/include/linux/vserver/space.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/space.h
---- linux-2.6.38-rc8/include/linux/vserver/space.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/space.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vserver/space.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/space.h
+--- linux-2.6.38.1/include/linux/vserver/space.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/space.h 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/include/linux/vserver/space_cmd.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/space_cmd.h
---- linux-2.6.38-rc8/include/linux/vserver/space_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/space_cmd.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vserver/space_cmd.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/space_cmd.h
+--- linux-2.6.38.1/include/linux/vserver/space_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/space_cmd.h 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/include/linux/vserver/switch.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/switch.h
---- linux-2.6.38-rc8/include/linux/vserver/switch.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/switch.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vserver/switch.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/switch.h
+--- linux-2.6.38.1/include/linux/vserver/switch.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/switch.h 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,98 @@
+#ifndef _VX_SWITCH_H
+#define _VX_SWITCH_H
+
+#endif /* _VX_SWITCH_H */
+
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/vserver/tag.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/tag.h
---- linux-2.6.38-rc8/include/linux/vserver/tag.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/tag.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vserver/tag.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/tag.h
+--- linux-2.6.38.1/include/linux/vserver/tag.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/tag.h 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,143 @@
+#ifndef _DX_TAG_H
+#define _DX_TAG_H
+#endif
+
+#endif /* _DX_TAG_H */
-diff -NurpP --minimal linux-2.6.38-rc8/include/linux/vserver/tag_cmd.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/tag_cmd.h
---- linux-2.6.38-rc8/include/linux/vserver/tag_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/linux/vserver/tag_cmd.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/linux/vserver/tag_cmd.h linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/tag_cmd.h
+--- linux-2.6.38.1/include/linux/vserver/tag_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/linux/vserver/tag_cmd.h 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/include/net/addrconf.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/net/addrconf.h
---- linux-2.6.38-rc8/include/net/addrconf.h 2011-03-10 17:09:26.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/net/addrconf.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/net/addrconf.h linux-2.6.38.1-vs2.3.0.37-rc9/include/net/addrconf.h
+--- linux-2.6.38.1/include/net/addrconf.h 2011-03-15 18:07:40.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/net/addrconf.h 2011-01-29 02:01:07.000000000 +0100
@@ -82,7 +82,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-2.6.38-rc8/include/net/af_unix.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/net/af_unix.h
---- linux-2.6.38-rc8/include/net/af_unix.h 2011-01-05 21:50:35.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/net/af_unix.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/net/af_unix.h linux-2.6.38.1-vs2.3.0.37-rc9/include/net/af_unix.h
+--- linux-2.6.38.1/include/net/af_unix.h 2011-01-05 21:50:35.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/net/af_unix.h 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/include/net/inet_timewait_sock.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/net/inet_timewait_sock.h
---- linux-2.6.38-rc8/include/net/inet_timewait_sock.h 2011-03-10 17:09:26.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/net/inet_timewait_sock.h 2011-01-29 03:12:58.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/net/inet_timewait_sock.h linux-2.6.38.1-vs2.3.0.37-rc9/include/net/inet_timewait_sock.h
+--- linux-2.6.38.1/include/net/inet_timewait_sock.h 2011-03-15 18:07:40.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/net/inet_timewait_sock.h 2011-01-29 03:12:58.000000000 +0100
@@ -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-2.6.38-rc8/include/net/route.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/net/route.h
---- linux-2.6.38-rc8/include/net/route.h 2011-03-10 17:09:26.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/net/route.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/net/route.h linux-2.6.38.1-vs2.3.0.37-rc9/include/net/route.h
+--- linux-2.6.38.1/include/net/route.h 2011-03-15 18:07:40.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/net/route.h 2011-01-29 02:01:07.000000000 +0100
@@ -153,6 +153,9 @@ static inline void ip_rt_put(struct rtab
dst_release(&rt->dst);
}
err = __ip_route_output_key(net, rp, &fl);
if (err)
return err;
-diff -NurpP --minimal linux-2.6.38-rc8/include/net/sock.h linux-2.6.38-rc8-vs2.3.0.37-rc6/include/net/sock.h
---- linux-2.6.38-rc8/include/net/sock.h 2011-03-10 17:09:26.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/include/net/sock.h 2011-02-17 02:17:51.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/include/net/sock.h linux-2.6.38.1-vs2.3.0.37-rc9/include/net/sock.h
+--- linux-2.6.38.1/include/net/sock.h 2011-03-15 18:07:41.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/include/net/sock.h 2011-02-17 02:17:51.000000000 +0100
@@ -148,6 +148,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-2.6.38-rc8/init/Kconfig linux-2.6.38-rc8-vs2.3.0.37-rc6/init/Kconfig
---- linux-2.6.38-rc8/init/Kconfig 2011-03-10 17:09:27.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/init/Kconfig 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/init/Kconfig linux-2.6.38.1-vs2.3.0.37-rc9/init/Kconfig
+--- linux-2.6.38.1/init/Kconfig 2011-03-15 18:07:41.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/init/Kconfig 2011-01-29 02:01:07.000000000 +0100
@@ -559,6 +559,7 @@ config HAVE_UNSTABLE_SCHED_CLOCK
menuconfig CGROUPS
boolean "Control Group support"
help
Provides a simple namespace cgroup subsystem to
provide hierarchical naming of sets of namespaces,
-diff -NurpP --minimal linux-2.6.38-rc8/init/main.c linux-2.6.38-rc8-vs2.3.0.37-rc6/init/main.c
---- linux-2.6.38-rc8/init/main.c 2011-03-10 17:09:27.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/init/main.c 2011-01-29 02:21:25.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/init/main.c linux-2.6.38.1-vs2.3.0.37-rc9/init/main.c
+--- linux-2.6.38.1/init/main.c 2011-03-15 18:07:41.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/init/main.c 2011-01-29 02:21:25.000000000 +0100
@@ -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-2.6.38-rc8/ipc/mqueue.c linux-2.6.38-rc8-vs2.3.0.37-rc6/ipc/mqueue.c
---- linux-2.6.38-rc8/ipc/mqueue.c 2011-03-10 17:09:27.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/ipc/mqueue.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/ipc/mqueue.c linux-2.6.38.1-vs2.3.0.37-rc9/ipc/mqueue.c
+--- linux-2.6.38.1/ipc/mqueue.c 2011-03-15 18:07:41.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/ipc/mqueue.c 2011-01-29 02:01:07.000000000 +0100
@@ -33,6 +33,8 @@
#include <linux/pid.h>
#include <linux/ipc_namespace.h>
free_uid(user);
}
if (ipc_ns)
-diff -NurpP --minimal linux-2.6.38-rc8/ipc/msg.c linux-2.6.38-rc8-vs2.3.0.37-rc6/ipc/msg.c
---- linux-2.6.38-rc8/ipc/msg.c 2010-08-02 16:52:57.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/ipc/msg.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/ipc/msg.c linux-2.6.38.1-vs2.3.0.37-rc9/ipc/msg.c
+--- linux-2.6.38.1/ipc/msg.c 2010-08-02 16:52:57.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/ipc/msg.c 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/ipc/namespace.c linux-2.6.38-rc8-vs2.3.0.37-rc6/ipc/namespace.c
---- linux-2.6.38-rc8/ipc/namespace.c 2009-09-10 15:26:27.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/ipc/namespace.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/ipc/namespace.c linux-2.6.38.1-vs2.3.0.37-rc9/ipc/namespace.c
+--- linux-2.6.38.1/ipc/namespace.c 2009-09-10 15:26:27.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/ipc/namespace.c 2011-01-29 02:01:07.000000000 +0100
@@ -11,6 +11,8 @@
#include <linux/slab.h>
#include <linux/fs.h>
#include "util.h"
-diff -NurpP --minimal linux-2.6.38-rc8/ipc/sem.c linux-2.6.38-rc8-vs2.3.0.37-rc6/ipc/sem.c
---- linux-2.6.38-rc8/ipc/sem.c 2010-10-21 13:07:56.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/ipc/sem.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/ipc/sem.c linux-2.6.38.1-vs2.3.0.37-rc9/ipc/sem.c
+--- linux-2.6.38.1/ipc/sem.c 2010-10-21 13:07:56.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/ipc/sem.c 2011-01-29 02:01:07.000000000 +0100
@@ -86,6 +86,8 @@
#include <linux/rwsem.h>
#include <linux/nsproxy.h>
security_sem_free(sma);
ipc_rcu_putref(sma);
}
-diff -NurpP --minimal linux-2.6.38-rc8/ipc/shm.c linux-2.6.38-rc8-vs2.3.0.37-rc6/ipc/shm.c
---- linux-2.6.38-rc8/ipc/shm.c 2011-01-05 21:50:37.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/ipc/shm.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/ipc/shm.c linux-2.6.38.1-vs2.3.0.37-rc9/ipc/shm.c
+--- linux-2.6.38.1/ipc/shm.c 2011-01-05 21:50:37.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/ipc/shm.c 2011-01-29 02:01:07.000000000 +0100
@@ -39,6 +39,8 @@
#include <linux/nsproxy.h>
#include <linux/mount.h>
return error;
no_id:
-diff -NurpP --minimal linux-2.6.38-rc8/kernel/Makefile linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/Makefile
---- linux-2.6.38-rc8/kernel/Makefile 2011-03-10 17:09:27.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/Makefile 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/kernel/Makefile linux-2.6.38.1-vs2.3.0.37-rc9/kernel/Makefile
+--- linux-2.6.38.1/kernel/Makefile 2011-03-15 18:07:41.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/Makefile 2011-01-29 02:01:07.000000000 +0100
@@ -25,6 +25,7 @@ CFLAGS_REMOVE_perf_event.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-2.6.38-rc8/kernel/capability.c linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/capability.c
---- linux-2.6.38-rc8/kernel/capability.c 2011-03-10 17:09:27.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/capability.c 2011-02-17 02:17:51.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/kernel/capability.c linux-2.6.38.1-vs2.3.0.37-rc9/kernel/capability.c
+--- linux-2.6.38.1/kernel/capability.c 2011-03-15 18:07:41.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/capability.c 2011-02-17 02:17:51.000000000 +0100
@@ -14,6 +14,7 @@
#include <linux/security.h>
#include <linux/syscalls.h>
if (unlikely(!cap_valid(cap))) {
printk(KERN_CRIT "capable() called with invalid cap=%u\n", cap);
BUG();
-diff -NurpP --minimal linux-2.6.38-rc8/kernel/compat.c linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/compat.c
---- linux-2.6.38-rc8/kernel/compat.c 2010-10-21 13:07:56.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/compat.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/kernel/compat.c linux-2.6.38.1-vs2.3.0.37-rc9/kernel/compat.c
+--- linux-2.6.38.1/kernel/compat.c 2010-10-21 13:07:56.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/compat.c 2011-01-29 02:01:07.000000000 +0100
@@ -914,7 +914,7 @@ asmlinkage long compat_sys_stime(compat_
if (err)
return err;
return 0;
}
-diff -NurpP --minimal linux-2.6.38-rc8/kernel/cred.c linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/cred.c
---- linux-2.6.38-rc8/kernel/cred.c 2011-03-10 17:09:27.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/cred.c 2011-02-17 02:17:51.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/kernel/cred.c linux-2.6.38.1-vs2.3.0.37-rc9/kernel/cred.c
+--- linux-2.6.38.1/kernel/cred.c 2011-03-15 18:07:41.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/cred.c 2011-02-17 02:17:51.000000000 +0100
@@ -60,31 +60,6 @@ struct cred init_cred = {
#endif
};
EXPORT_SYMBOL(prepare_creds);
/*
-diff -NurpP --minimal linux-2.6.38-rc8/kernel/exit.c linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/exit.c
---- linux-2.6.38-rc8/kernel/exit.c 2011-03-10 17:09:27.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/exit.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/kernel/exit.c linux-2.6.38.1-vs2.3.0.37-rc9/kernel/exit.c
+--- linux-2.6.38.1/kernel/exit.c 2011-03-15 18:07:41.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/exit.c 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/kernel/fork.c linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/fork.c
---- linux-2.6.38-rc8/kernel/fork.c 2011-03-10 17:09:27.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/fork.c 2011-01-29 03:19:29.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/kernel/fork.c linux-2.6.38.1-vs2.3.0.37-rc9/kernel/fork.c
+--- linux-2.6.38.1/kernel/fork.c 2011-03-15 18:07:41.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/fork.c 2011-01-29 03:19:29.000000000 +0100
@@ -67,6 +67,10 @@
#include <linux/user-return-notifier.h>
#include <linux/oom.h>
write_unlock_irq(&tasklist_lock);
proc_fork_connector(p);
cgroup_post_fork(p);
-diff -NurpP --minimal linux-2.6.38-rc8/kernel/kthread.c linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/kthread.c
---- linux-2.6.38-rc8/kernel/kthread.c 2011-03-10 17:09:27.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/kthread.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/kernel/kthread.c linux-2.6.38.1-vs2.3.0.37-rc9/kernel/kthread.c
+--- linux-2.6.38.1/kernel/kthread.c 2011-03-15 18:07:41.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/kthread.c 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/kernel/nsproxy.c linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/nsproxy.c
---- linux-2.6.38-rc8/kernel/nsproxy.c 2010-07-07 18:31:57.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/nsproxy.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/kernel/nsproxy.c linux-2.6.38.1-vs2.3.0.37-rc9/kernel/nsproxy.c
+--- linux-2.6.38.1/kernel/nsproxy.c 2010-07-07 18:31:57.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/nsproxy.c 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/kernel/pid.c linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/pid.c
---- linux-2.6.38-rc8/kernel/pid.c 2011-01-05 21:50:38.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/pid.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/kernel/pid.c linux-2.6.38.1-vs2.3.0.37-rc9/kernel/pid.c
+--- linux-2.6.38.1/kernel/pid.c 2011-01-05 21:50:38.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/pid.c 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/kernel/pid_namespace.c linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/pid_namespace.c
---- linux-2.6.38-rc8/kernel/pid_namespace.c 2010-07-07 18:31:57.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/pid_namespace.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/kernel/pid_namespace.c linux-2.6.38.1-vs2.3.0.37-rc9/kernel/pid_namespace.c
+--- linux-2.6.38.1/kernel/pid_namespace.c 2010-07-07 18:31:57.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/pid_namespace.c 2011-01-29 02:01:07.000000000 +0100
@@ -14,6 +14,7 @@
#include <linux/err.h>
#include <linux/acct.h>
kmem_cache_free(pid_ns_cachep, ns);
}
-diff -NurpP --minimal linux-2.6.38-rc8/kernel/posix-timers.c linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/posix-timers.c
---- linux-2.6.38-rc8/kernel/posix-timers.c 2011-03-10 17:09:27.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/posix-timers.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/kernel/posix-timers.c linux-2.6.38.1-vs2.3.0.37-rc9/kernel/posix-timers.c
+--- linux-2.6.38.1/kernel/posix-timers.c 2011-03-15 18:07:42.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/posix-timers.c 2011-01-29 02:01:07.000000000 +0100
@@ -46,6 +46,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-2.6.38-rc8/kernel/printk.c linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/printk.c
---- linux-2.6.38-rc8/kernel/printk.c 2011-03-10 17:09:28.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/printk.c 2011-02-17 02:34:59.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/kernel/printk.c linux-2.6.38.1-vs2.3.0.37-rc9/kernel/printk.c
+--- linux-2.6.38.1/kernel/printk.c 2011-03-15 18:07:42.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/printk.c 2011-02-17 02:34:59.000000000 +0100
@@ -40,6 +40,7 @@
#include <linux/cpu.h>
#include <linux/notifier.h>
count = len;
if (count > log_buf_len)
count = log_buf_len;
-diff -NurpP --minimal linux-2.6.38-rc8/kernel/ptrace.c linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/ptrace.c
---- linux-2.6.38-rc8/kernel/ptrace.c 2011-03-10 17:09:28.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/ptrace.c 2011-03-10 17:21:19.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/kernel/ptrace.c linux-2.6.38.1-vs2.3.0.37-rc9/kernel/ptrace.c
+--- linux-2.6.38.1/kernel/ptrace.c 2011-03-15 18:07:42.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/ptrace.c 2011-03-10 17:21:19.000000000 +0100
@@ -22,6 +22,7 @@
#include <linux/syscalls.h>
#include <linux/uaccess.h>
if (request == PTRACE_ATTACH) {
ret = ptrace_attach(child);
/*
-diff -NurpP --minimal linux-2.6.38-rc8/kernel/sched.c linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/sched.c
---- linux-2.6.38-rc8/kernel/sched.c 2011-03-10 17:09:28.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/sched.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/kernel/sched.c linux-2.6.38.1-vs2.3.0.37-rc9/kernel/sched.c
+--- linux-2.6.38.1/kernel/sched.c 2011-03-26 01:10:17.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/sched.c 2011-03-25 22:52:15.000000000 +0100
@@ -72,6 +72,8 @@
#include <linux/ctype.h>
#include <linux/ftrace.h>
account_group_system_time(p, cputime);
/* Add system time to cpustat. */
-@@ -4671,7 +4686,7 @@ SYSCALL_DEFINE1(nice, int, increment)
+@@ -4672,7 +4687,7 @@ SYSCALL_DEFINE1(nice, int, increment)
nice = 19;
if (increment < 0 && !can_nice(current, nice))
retval = security_task_setnice(current, nice);
if (retval)
-diff -NurpP --minimal linux-2.6.38-rc8/kernel/sched_fair.c linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/sched_fair.c
---- linux-2.6.38-rc8/kernel/sched_fair.c 2011-03-10 17:09:28.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/sched_fair.c 2011-02-02 22:20:27.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/kernel/sched_fair.c linux-2.6.38.1-vs2.3.0.37-rc9/kernel/sched_fair.c
+--- linux-2.6.38.1/kernel/sched_fair.c 2011-03-15 18:07:42.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/sched_fair.c 2011-02-02 22:20:27.000000000 +0100
@@ -992,6 +992,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);
update_min_vruntime(cfs_rq);
-diff -NurpP --minimal linux-2.6.38-rc8/kernel/signal.c linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/signal.c
---- linux-2.6.38-rc8/kernel/signal.c 2011-01-05 21:50:38.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/signal.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/kernel/signal.c linux-2.6.38.1-vs2.3.0.37-rc9/kernel/signal.c
+--- linux-2.6.38.1/kernel/signal.c 2011-01-05 21:50:38.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/signal.c 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/kernel/softirq.c linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/softirq.c
---- linux-2.6.38-rc8/kernel/softirq.c 2011-03-10 17:09:28.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/softirq.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/kernel/softirq.c linux-2.6.38.1-vs2.3.0.37-rc9/kernel/softirq.c
+--- linux-2.6.38.1/kernel/softirq.c 2011-03-15 18:07:42.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/softirq.c 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/kernel/sys.c linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/sys.c
---- linux-2.6.38-rc8/kernel/sys.c 2011-03-10 17:09:28.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/sys.c 2011-02-02 22:20:27.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/kernel/sys.c linux-2.6.38.1-vs2.3.0.37-rc9/kernel/sys.c
+--- linux-2.6.38.1/kernel/sys.c 2011-03-15 18:07:42.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/sys.c 2011-02-02 22:20:27.000000000 +0100
@@ -42,6 +42,7 @@
#include <linux/syscalls.h>
#include <linux/kprobes.h>
return -EPERM;
}
-diff -NurpP --minimal linux-2.6.38-rc8/kernel/sysctl.c linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/sysctl.c
---- linux-2.6.38-rc8/kernel/sysctl.c 2011-03-10 17:09:28.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/sysctl.c 2011-02-02 22:20:27.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/kernel/sysctl.c linux-2.6.38.1-vs2.3.0.37-rc9/kernel/sysctl.c
+--- linux-2.6.38.1/kernel/sysctl.c 2011-03-15 18:07:42.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/sysctl.c 2011-03-15 18:15:06.000000000 +0100
@@ -74,6 +74,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-2.6.38-rc8/kernel/sysctl_binary.c linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/sysctl_binary.c
---- linux-2.6.38-rc8/kernel/sysctl_binary.c 2011-03-10 17:09:29.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/sysctl_binary.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/kernel/sysctl_binary.c linux-2.6.38.1-vs2.3.0.37-rc9/kernel/sysctl_binary.c
+--- linux-2.6.38.1/kernel/sysctl_binary.c 2011-03-15 18:07:42.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/sysctl_binary.c 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/kernel/time/timekeeping.c linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/time/timekeeping.c
---- linux-2.6.38-rc8/kernel/time/timekeeping.c 2011-03-10 17:09:29.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/time/timekeeping.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/kernel/time/timekeeping.c linux-2.6.38.1-vs2.3.0.37-rc9/kernel/time/timekeeping.c
+--- linux-2.6.38.1/kernel/time/timekeeping.c 2011-03-15 18:07:42.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/time/timekeeping.c 2011-01-29 02:01:07.000000000 +0100
@@ -233,6 +233,7 @@ void getnstimeofday(struct timespec *ts)
} while (read_seqretry(&xtime_lock, seq));
}
EXPORT_SYMBOL(getnstimeofday);
-diff -NurpP --minimal linux-2.6.38-rc8/kernel/time.c linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/time.c
---- linux-2.6.38-rc8/kernel/time.c 2011-03-10 17:09:29.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/time.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/kernel/time.c linux-2.6.38.1-vs2.3.0.37-rc9/kernel/time.c
+--- linux-2.6.38.1/kernel/time.c 2011-03-15 18:07:42.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/time.c 2011-01-29 02:01:07.000000000 +0100
@@ -92,7 +92,7 @@ SYSCALL_DEFINE1(stime, time_t __user *,
if (err)
return err;
}
return 0;
}
-diff -NurpP --minimal linux-2.6.38-rc8/kernel/timer.c linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/timer.c
---- linux-2.6.38-rc8/kernel/timer.c 2011-03-10 17:09:29.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/timer.c 2011-02-17 02:17:51.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/kernel/timer.c linux-2.6.38.1-vs2.3.0.37-rc9/kernel/timer.c
+--- linux-2.6.38.1/kernel/timer.c 2011-03-15 18:07:42.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/timer.c 2011-02-17 02:17:51.000000000 +0100
@@ -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-2.6.38-rc8/kernel/user_namespace.c linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/user_namespace.c
---- linux-2.6.38-rc8/kernel/user_namespace.c 2011-03-10 17:09:29.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/user_namespace.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/kernel/user_namespace.c linux-2.6.38.1-vs2.3.0.37-rc9/kernel/user_namespace.c
+--- linux-2.6.38.1/kernel/user_namespace.c 2011-03-15 18:07:42.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/user_namespace.c 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/kernel/utsname.c linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/utsname.c
---- linux-2.6.38-rc8/kernel/utsname.c 2009-09-10 15:26:28.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/utsname.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/kernel/utsname.c linux-2.6.38.1-vs2.3.0.37-rc9/kernel/utsname.c
+--- linux-2.6.38.1/kernel/utsname.c 2009-09-10 15:26:28.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/utsname.c 2011-01-29 02:01:07.000000000 +0100
@@ -14,14 +14,17 @@
#include <linux/utsname.h>
#include <linux/err.h>
+ atomic_dec(&vs_global_uts_ns);
kfree(ns);
}
-diff -NurpP --minimal linux-2.6.38-rc8/kernel/vserver/Kconfig linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/Kconfig
---- linux-2.6.38-rc8/kernel/vserver/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/Kconfig 2011-01-29 02:01:07.000000000 +0100
-@@ -0,0 +1,265 @@
+diff -NurpP --minimal linux-2.6.38.1/kernel/vserver/Kconfig linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/Kconfig
+--- linux-2.6.38.1/kernel/vserver/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/Kconfig 2011-03-15 21:32:33.000000000 +0100
+@@ -0,0 +1,228 @@
+#
+# Linux VServer configuration
+#
+
+ (note: on 1.2x the entries were visible by default)
+
-+config VSERVER_HARDCPU
-+ bool "Enable Hard CPU Limits"
-+ default y
-+ help
-+ Activate the Hard CPU Limits
-+
-+ This will compile in code that allows the Token Bucket
-+ Scheduler to put processes on hold when a context's
-+ tokens are depleted (provided that its per-context
-+ sched_hard flag is set).
-+
-+ Processes belonging to that context will not be able
-+ to consume CPU resources again until a per-context
-+ configured minimum of tokens has been reached.
-+
-+config VSERVER_IDLETIME
-+ bool "Avoid idle CPUs by skipping Time"
-+ depends on VSERVER_HARDCPU
-+ default y
-+ help
-+ This option allows the scheduler to artificially
-+ advance time (per cpu) when otherwise the idle
-+ task would be scheduled, thus keeping the cpu
-+ busy and sharing the available resources among
-+ certain contexts.
-+
-+config VSERVER_IDLELIMIT
-+ bool "Limit the IDLE task"
-+ depends on VSERVER_HARDCPU
-+ default n
-+ help
-+ Limit the idle slices, so the the next context
-+ will be scheduled as soon as possible.
-+
-+ This might improve interactivity and latency, but
-+ will also marginally increase scheduling overhead.
-+
+choice
+ prompt "Persistent Inode Tagging"
+ default TAGGING_ID24
+ default y
+ select SECURITY_CAPABILITIES
+
-diff -NurpP --minimal linux-2.6.38-rc8/kernel/vserver/Makefile linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/Makefile
---- linux-2.6.38-rc8/kernel/vserver/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/Makefile 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/kernel/vserver/Makefile linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/Makefile
+--- linux-2.6.38.1/kernel/vserver/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/Makefile 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/kernel/vserver/cacct.c linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/cacct.c
---- linux-2.6.38-rc8/kernel/vserver/cacct.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/cacct.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/kernel/vserver/cacct.c linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/cacct.c
+--- linux-2.6.38.1/kernel/vserver/cacct.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/cacct.c 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,42 @@
+/*
+ * linux/kernel/vserver/cacct.c
+ return 0;
+}
+
-diff -NurpP --minimal linux-2.6.38-rc8/kernel/vserver/cacct_init.h linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/cacct_init.h
---- linux-2.6.38-rc8/kernel/vserver/cacct_init.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/cacct_init.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/kernel/vserver/cacct_init.h linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/cacct_init.h
+--- linux-2.6.38.1/kernel/vserver/cacct_init.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/cacct_init.h 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,25 @@
+
+
+ return;
+}
+
-diff -NurpP --minimal linux-2.6.38-rc8/kernel/vserver/cacct_proc.h linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/cacct_proc.h
---- linux-2.6.38-rc8/kernel/vserver/cacct_proc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/cacct_proc.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/kernel/vserver/cacct_proc.h linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/cacct_proc.h
+--- linux-2.6.38.1/kernel/vserver/cacct_proc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/cacct_proc.h 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,53 @@
+#ifndef _VX_CACCT_PROC_H
+#define _VX_CACCT_PROC_H
+}
+
+#endif /* _VX_CACCT_PROC_H */
-diff -NurpP --minimal linux-2.6.38-rc8/kernel/vserver/context.c linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/context.c
---- linux-2.6.38-rc8/kernel/vserver/context.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/context.c 2011-01-31 22:46:59.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/kernel/vserver/context.c linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/context.c
+--- linux-2.6.38.1/kernel/vserver/context.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/context.c 2011-03-22 17:35:46.000000000 +0100
@@ -0,0 +1,1079 @@
+/*
+ * linux/kernel/vserver/context.c
+ if (id) {
+ struct task_struct *tsk;
+
-+ read_lock(&tasklist_lock);
++ rcu_read_lock();
+ tsk = find_task_by_real_pid(id);
+ xid = (tsk) ? tsk->xid : -ESRCH;
-+ read_unlock(&tasklist_lock);
++ rcu_read_unlock();
+ } else
+ xid = vx_current_xid();
+ return xid;
+
+EXPORT_SYMBOL_GPL(free_vx_info);
+
-diff -NurpP --minimal linux-2.6.38-rc8/kernel/vserver/cvirt.c linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/cvirt.c
---- linux-2.6.38-rc8/kernel/vserver/cvirt.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/cvirt.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/kernel/vserver/cvirt.c linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/cvirt.c
+--- linux-2.6.38.1/kernel/vserver/cvirt.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/cvirt.c 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,303 @@
+/*
+ * linux/kernel/vserver/cvirt.c
+
+#endif
+
-diff -NurpP --minimal linux-2.6.38-rc8/kernel/vserver/cvirt_init.h linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/cvirt_init.h
---- linux-2.6.38-rc8/kernel/vserver/cvirt_init.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/cvirt_init.h 2011-01-29 02:01:07.000000000 +0100
-@@ -0,0 +1,69 @@
+diff -NurpP --minimal linux-2.6.38.1/kernel/vserver/cvirt_init.h linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/cvirt_init.h
+--- linux-2.6.38.1/kernel/vserver/cvirt_init.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/cvirt_init.h 2011-03-21 07:21:38.000000000 +0100
+@@ -0,0 +1,70 @@
+
+
+extern uint64_t vx_idle_jiffies(void);
+
+static inline void vx_info_exit_cvirt(struct _vx_cvirt *cvirt)
+{
++#ifdef CONFIG_VSERVER_WARN
+ int value;
-+
++#endif
+ vxwprintk_xid((value = atomic_read(&cvirt->nr_threads)),
+ "!!! cvirt: %p[nr_threads] = %d on exit.",
+ cvirt, value);
+ return;
+}
+
-diff -NurpP --minimal linux-2.6.38-rc8/kernel/vserver/cvirt_proc.h linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/cvirt_proc.h
---- linux-2.6.38-rc8/kernel/vserver/cvirt_proc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/cvirt_proc.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/kernel/vserver/cvirt_proc.h linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/cvirt_proc.h
+--- linux-2.6.38.1/kernel/vserver/cvirt_proc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/cvirt_proc.h 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,135 @@
+#ifndef _VX_CVIRT_PROC_H
+#define _VX_CVIRT_PROC_H
+}
+
+#endif /* _VX_CVIRT_PROC_H */
-diff -NurpP --minimal linux-2.6.38-rc8/kernel/vserver/debug.c linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/debug.c
---- linux-2.6.38-rc8/kernel/vserver/debug.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/debug.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/kernel/vserver/debug.c linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/debug.c
+--- linux-2.6.38.1/kernel/vserver/debug.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/debug.c 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,32 @@
+/*
+ * kernel/vserver/debug.c
+
+EXPORT_SYMBOL_GPL(dump_vx_info);
+
-diff -NurpP --minimal linux-2.6.38-rc8/kernel/vserver/device.c linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/device.c
---- linux-2.6.38-rc8/kernel/vserver/device.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/device.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/kernel/vserver/device.c linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/device.c
+--- linux-2.6.38.1/kernel/vserver/device.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/device.c 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,443 @@
+/*
+ * linux/kernel/vserver/device.c
+#endif /* CONFIG_COMPAT */
+
+
-diff -NurpP --minimal linux-2.6.38-rc8/kernel/vserver/dlimit.c linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/dlimit.c
---- linux-2.6.38-rc8/kernel/vserver/dlimit.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/dlimit.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/kernel/vserver/dlimit.c linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/dlimit.c
+--- linux-2.6.38.1/kernel/vserver/dlimit.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/dlimit.c 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/kernel/vserver/helper.c linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/helper.c
---- linux-2.6.38-rc8/kernel/vserver/helper.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/helper.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/kernel/vserver/helper.c linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/helper.c
+--- linux-2.6.38.1/kernel/vserver/helper.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/helper.c 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,223 @@
+/*
+ * linux/kernel/vserver/helper.c
+ return do_vshelper(vshelper_path, argv, envp, 1);
+}
+
-diff -NurpP --minimal linux-2.6.38-rc8/kernel/vserver/history.c linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/history.c
---- linux-2.6.38-rc8/kernel/vserver/history.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/history.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/kernel/vserver/history.c linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/history.c
+--- linux-2.6.38.1/kernel/vserver/history.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/history.c 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,258 @@
+/*
+ * kernel/vserver/history.c
+
+#endif /* CONFIG_COMPAT */
+
-diff -NurpP --minimal linux-2.6.38-rc8/kernel/vserver/inet.c linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/inet.c
---- linux-2.6.38-rc8/kernel/vserver/inet.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/inet.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/kernel/vserver/inet.c linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/inet.c
+--- linux-2.6.38.1/kernel/vserver/inet.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/inet.c 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,224 @@
+
+#include <linux/in.h>
+
+EXPORT_SYMBOL_GPL(ip_v4_find_src);
+
-diff -NurpP --minimal linux-2.6.38-rc8/kernel/vserver/init.c linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/init.c
---- linux-2.6.38-rc8/kernel/vserver/init.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/init.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/kernel/vserver/init.c linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/init.c
+--- linux-2.6.38.1/kernel/vserver/init.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/init.c 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,45 @@
+/*
+ * linux/kernel/init.c
+module_init(init_vserver);
+module_exit(exit_vserver);
+
-diff -NurpP --minimal linux-2.6.38-rc8/kernel/vserver/inode.c linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/inode.c
---- linux-2.6.38-rc8/kernel/vserver/inode.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/inode.c 2011-01-29 02:01:07.000000000 +0100
-@@ -0,0 +1,435 @@
+diff -NurpP --minimal linux-2.6.38.1/kernel/vserver/inode.c linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/inode.c
+--- linux-2.6.38.1/kernel/vserver/inode.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/inode.c 2011-03-21 07:25:53.000000000 +0100
+@@ -0,0 +1,437 @@
+/*
+ * linux/kernel/vserver/inode.c
+ *
+{
+ int set = 0;
+ substring_t args[MAX_OPT_ARGS];
-+ int token, option = 0;
++ int token;
+ char *s, *p, *opts;
++#if defined(CONFIG_PROPAGATE) || defined(CONFIG_VSERVER_WARN)
++ int option = 0;
++#endif
+
+ if (!string)
+ return 0;
+ while ((p = strsep(&opts, ",")) != NULL) {
+ token = match_token(p, tokens, args);
+
-+ vxdprintk(VXD_CBIT(tag, 7),
-+ "dx_parse_tag(" VS_Q("%s") "): %d:#%d",
-+ p, token, option);
-+
+ switch (token) {
+#ifdef CONFIG_PROPAGATE
+ case Opt_tag:
+ set |= MS_NOTAGCHECK;
+ break;
+ }
++ vxdprintk(VXD_CBIT(tag, 7),
++ "dx_parse_tag(" VS_Q("%s") "): %d:#%d",
++ p, token, option);
+ }
+ if (set)
+ strcpy(string, s);
+
+#endif /* CONFIG_PROPAGATE */
+
-diff -NurpP --minimal linux-2.6.38-rc8/kernel/vserver/limit.c linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/limit.c
---- linux-2.6.38-rc8/kernel/vserver/limit.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/limit.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/kernel/vserver/limit.c linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/limit.c
+--- linux-2.6.38.1/kernel/vserver/limit.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/limit.c 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,354 @@
+/*
+ * linux/kernel/vserver/limit.c
+ return points;
+}
+
-diff -NurpP --minimal linux-2.6.38-rc8/kernel/vserver/limit_init.h linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/limit_init.h
---- linux-2.6.38-rc8/kernel/vserver/limit_init.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/limit_init.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/kernel/vserver/limit_init.h linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/limit_init.h
+--- linux-2.6.38.1/kernel/vserver/limit_init.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/limit_init.h 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,31 @@
+
+
+ }
+}
+
-diff -NurpP --minimal linux-2.6.38-rc8/kernel/vserver/limit_proc.h linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/limit_proc.h
---- linux-2.6.38-rc8/kernel/vserver/limit_proc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/limit_proc.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/kernel/vserver/limit_proc.h linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/limit_proc.h
+--- linux-2.6.38.1/kernel/vserver/limit_proc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/limit_proc.h 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,57 @@
+#ifndef _VX_LIMIT_PROC_H
+#define _VX_LIMIT_PROC_H
+#endif /* _VX_LIMIT_PROC_H */
+
+
-diff -NurpP --minimal linux-2.6.38-rc8/kernel/vserver/network.c linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/network.c
---- linux-2.6.38-rc8/kernel/vserver/network.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/network.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/kernel/vserver/network.c linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/network.c
+--- linux-2.6.38.1/kernel/vserver/network.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/network.c 2011-03-22 17:36:23.000000000 +0100
@@ -0,0 +1,864 @@
+/*
+ * linux/kernel/vserver/network.c
+ if (id) {
+ struct task_struct *tsk;
+
-+ read_lock(&tasklist_lock);
++ rcu_read_lock();
+ tsk = find_task_by_real_pid(id);
+ nid = (tsk) ? tsk->nid : -ESRCH;
-+ read_unlock(&tasklist_lock);
++ rcu_read_unlock();
+ } else
+ nid = nx_current_nid();
+ return nid;
+EXPORT_SYMBOL_GPL(free_nx_info);
+EXPORT_SYMBOL_GPL(unhash_nx_info);
+
-diff -NurpP --minimal linux-2.6.38-rc8/kernel/vserver/proc.c linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/proc.c
---- linux-2.6.38-rc8/kernel/vserver/proc.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/proc.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/kernel/vserver/proc.c linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/proc.c
+--- linux-2.6.38.1/kernel/vserver/proc.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/proc.c 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,1098 @@
+/*
+ * linux/kernel/vserver/proc.c
+ return buffer - orig;
+}
+
-diff -NurpP --minimal linux-2.6.38-rc8/kernel/vserver/sched.c linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/sched.c
---- linux-2.6.38-rc8/kernel/vserver/sched.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/sched.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/kernel/vserver/sched.c linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/sched.c
+--- linux-2.6.38.1/kernel/vserver/sched.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/sched.c 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,82 @@
+/*
+ * linux/kernel/vserver/sched.c
+ return 0;
+}
+
-diff -NurpP --minimal linux-2.6.38-rc8/kernel/vserver/sched_init.h linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/sched_init.h
---- linux-2.6.38-rc8/kernel/vserver/sched_init.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/sched_init.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/kernel/vserver/sched_init.h linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/sched_init.h
+--- linux-2.6.38.1/kernel/vserver/sched_init.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/sched_init.h 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,27 @@
+
+static inline void vx_info_init_sched(struct _vx_sched *sched)
+{
+ return;
+}
-diff -NurpP --minimal linux-2.6.38-rc8/kernel/vserver/sched_proc.h linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/sched_proc.h
---- linux-2.6.38-rc8/kernel/vserver/sched_proc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/sched_proc.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/kernel/vserver/sched_proc.h linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/sched_proc.h
+--- linux-2.6.38.1/kernel/vserver/sched_proc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/sched_proc.h 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,32 @@
+#ifndef _VX_SCHED_PROC_H
+#define _VX_SCHED_PROC_H
+}
+
+#endif /* _VX_SCHED_PROC_H */
-diff -NurpP --minimal linux-2.6.38-rc8/kernel/vserver/signal.c linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/signal.c
---- linux-2.6.38-rc8/kernel/vserver/signal.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/signal.c 2011-01-29 02:01:07.000000000 +0100
-@@ -0,0 +1,132 @@
+diff -NurpP --minimal linux-2.6.38.1/kernel/vserver/signal.c linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/signal.c
+--- linux-2.6.38.1/kernel/vserver/signal.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/signal.c 2011-03-22 17:37:59.000000000 +0100
+@@ -0,0 +1,134 @@
+/*
+ * linux/kernel/vserver/signal.c
+ *
+ }
+ /* fallthrough */
+ default:
++ rcu_read_lock();
+ p = find_task_by_real_pid(pid);
++ rcu_read_unlock();
+ if (p) {
+ if (vx_task_xid(p) == vxi->vx_id)
+ retval = group_send_sig_info(sig, sip, p);
+ return ret;
+}
+
-diff -NurpP --minimal linux-2.6.38-rc8/kernel/vserver/space.c linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/space.c
---- linux-2.6.38-rc8/kernel/vserver/space.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/space.c 2011-02-01 03:30:46.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/kernel/vserver/space.c linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/space.c
+--- linux-2.6.38.1/kernel/vserver/space.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/space.c 2011-02-01 03:30:46.000000000 +0100
@@ -0,0 +1,417 @@
+/*
+ * linux/kernel/vserver/space.c
+ return 0;
+}
+
-diff -NurpP --minimal linux-2.6.38-rc8/kernel/vserver/switch.c linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/switch.c
---- linux-2.6.38-rc8/kernel/vserver/switch.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/switch.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/kernel/vserver/switch.c linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/switch.c
+--- linux-2.6.38.1/kernel/vserver/switch.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/switch.c 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,531 @@
+/*
+ * linux/kernel/vserver/switch.c
+}
+
+#endif /* CONFIG_COMPAT */
-diff -NurpP --minimal linux-2.6.38-rc8/kernel/vserver/sysctl.c linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/sysctl.c
---- linux-2.6.38-rc8/kernel/vserver/sysctl.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/sysctl.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/kernel/vserver/sysctl.c linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/sysctl.c
+--- linux-2.6.38.1/kernel/vserver/sysctl.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/sysctl.c 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,241 @@
+/*
+ * kernel/vserver/sysctl.c
+EXPORT_SYMBOL_GPL(vx_debug_space);
+EXPORT_SYMBOL_GPL(vx_debug_misc);
+
-diff -NurpP --minimal linux-2.6.38-rc8/kernel/vserver/tag.c linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/tag.c
---- linux-2.6.38-rc8/kernel/vserver/tag.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/tag.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/kernel/vserver/tag.c linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/tag.c
+--- linux-2.6.38.1/kernel/vserver/tag.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/tag.c 2011-03-22 17:43:07.000000000 +0100
@@ -0,0 +1,63 @@
+/*
+ * linux/kernel/vserver/tag.c
+
+ if (id) {
+ struct task_struct *tsk;
-+ read_lock(&tasklist_lock);
++ rcu_read_lock();
+ tsk = find_task_by_real_pid(id);
+ tag = (tsk) ? tsk->tag : -ESRCH;
-+ read_unlock(&tasklist_lock);
++ rcu_read_unlock();
+ } else
+ tag = dx_current_tag();
+ return tag;
+}
+
+
-diff -NurpP --minimal linux-2.6.38-rc8/kernel/vserver/vci_config.h linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/vci_config.h
---- linux-2.6.38-rc8/kernel/vserver/vci_config.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/kernel/vserver/vci_config.h 2011-01-29 02:01:07.000000000 +0100
-@@ -0,0 +1,82 @@
+diff -NurpP --minimal linux-2.6.38.1/kernel/vserver/vci_config.h linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/vci_config.h
+--- linux-2.6.38.1/kernel/vserver/vci_config.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/kernel/vserver/vci_config.h 2011-03-15 21:34:31.000000000 +0100
+@@ -0,0 +1,76 @@
+
+/* interface version */
+
+ VCI_KCBIT_NO_DYNAMIC = 0,
+
+ VCI_KCBIT_PROC_SECURE = 4,
-+ VCI_KCBIT_HARDCPU = 5,
-+ VCI_KCBIT_IDLELIMIT = 6,
-+ VCI_KCBIT_IDLETIME = 7,
++ /* VCI_KCBIT_HARDCPU = 5, */
++ /* VCI_KCBIT_IDLELIMIT = 6, */
++ /* VCI_KCBIT_IDLETIME = 7, */
+
+ VCI_KCBIT_COWBL = 8,
+ VCI_KCBIT_FULLCOWBL = 9,
+#ifdef CONFIG_VSERVER_PROC_SECURE
+ (1 << VCI_KCBIT_PROC_SECURE) |
+#endif
-+#ifdef CONFIG_VSERVER_IDLELIMIT
-+ (1 << VCI_KCBIT_IDLELIMIT) |
-+#endif
-+#ifdef CONFIG_VSERVER_IDLETIME
-+ (1 << VCI_KCBIT_IDLETIME) |
-+#endif
+#ifdef CONFIG_VSERVER_COWBL
+ (1 << VCI_KCBIT_COWBL) |
+ (1 << VCI_KCBIT_FULLCOWBL) |
+ 0;
+}
+
-diff -NurpP --minimal linux-2.6.38-rc8/mm/filemap_xip.c linux-2.6.38-rc8-vs2.3.0.37-rc6/mm/filemap_xip.c
---- linux-2.6.38-rc8/mm/filemap_xip.c 2010-07-07 18:31:58.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/mm/filemap_xip.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/mm/filemap_xip.c linux-2.6.38.1-vs2.3.0.37-rc9/mm/filemap_xip.c
+--- linux-2.6.38.1/mm/filemap_xip.c 2010-07-07 18:31:58.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/mm/filemap_xip.c 2011-01-29 02:01:07.000000000 +0100
@@ -18,6 +18,7 @@
#include <linux/seqlock.h>
#include <linux/mutex.h>
#include <asm/tlbflush.h>
#include <asm/io.h>
-diff -NurpP --minimal linux-2.6.38-rc8/mm/fremap.c linux-2.6.38-rc8-vs2.3.0.37-rc6/mm/fremap.c
---- linux-2.6.38-rc8/mm/fremap.c 2010-10-21 13:07:57.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/mm/fremap.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/mm/fremap.c linux-2.6.38.1-vs2.3.0.37-rc9/mm/fremap.c
+--- linux-2.6.38.1/mm/fremap.c 2010-10-21 13:07:57.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/mm/fremap.c 2011-01-29 02:01:07.000000000 +0100
@@ -16,6 +16,7 @@
#include <linux/module.h>
#include <linux/syscalls.h>
#include <asm/mmu_context.h>
#include <asm/cacheflush.h>
-diff -NurpP --minimal linux-2.6.38-rc8/mm/hugetlb.c linux-2.6.38-rc8-vs2.3.0.37-rc6/mm/hugetlb.c
---- linux-2.6.38-rc8/mm/hugetlb.c 2011-03-10 17:09:29.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/mm/hugetlb.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/mm/hugetlb.c linux-2.6.38.1-vs2.3.0.37-rc9/mm/hugetlb.c
+--- linux-2.6.38.1/mm/hugetlb.c 2011-03-15 18:07:42.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/mm/hugetlb.c 2011-01-29 02:01:07.000000000 +0100
@@ -28,6 +28,7 @@
#include <linux/hugetlb.h>
#include "internal.h"
const unsigned long hugetlb_zero = 0, hugetlb_infinity = ~0UL;
-diff -NurpP --minimal linux-2.6.38-rc8/mm/memcontrol.c linux-2.6.38-rc8-vs2.3.0.37-rc6/mm/memcontrol.c
---- linux-2.6.38-rc8/mm/memcontrol.c 2011-03-10 17:09:29.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/mm/memcontrol.c 2011-02-17 02:17:51.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/mm/memcontrol.c linux-2.6.38.1-vs2.3.0.37-rc9/mm/memcontrol.c
+--- linux-2.6.38.1/mm/memcontrol.c 2011-03-15 18:07:42.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/mm/memcontrol.c 2011-02-17 02:17:51.000000000 +0100
@@ -681,6 +681,31 @@ struct mem_cgroup *mem_cgroup_from_task(
struct mem_cgroup, css);
}
static struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm)
{
struct mem_cgroup *mem = NULL;
-diff -NurpP --minimal linux-2.6.38-rc8/mm/memory.c linux-2.6.38-rc8-vs2.3.0.37-rc6/mm/memory.c
---- linux-2.6.38-rc8/mm/memory.c 2011-03-10 17:09:29.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/mm/memory.c 2011-03-07 16:53:28.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/mm/memory.c linux-2.6.38.1-vs2.3.0.37-rc9/mm/memory.c
+--- linux-2.6.38.1/mm/memory.c 2011-03-15 18:07:42.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/mm/memory.c 2011-03-07 16:53:28.000000000 +0100
@@ -3225,6 +3225,7 @@ int handle_pte_fault(struct mm_struct *m
{
pte_t entry;
}
/*
-diff -NurpP --minimal linux-2.6.38-rc8/mm/mremap.c linux-2.6.38-rc8-vs2.3.0.37-rc6/mm/mremap.c
---- linux-2.6.38-rc8/mm/mremap.c 2011-03-10 17:09:29.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/mm/mremap.c 2011-03-07 16:53:28.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/mm/mremap.c linux-2.6.38.1-vs2.3.0.37-rc9/mm/mremap.c
+--- linux-2.6.38.1/mm/mremap.c 2011-03-15 18:07:42.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/mm/mremap.c 2011-03-07 16:53:28.000000000 +0100
@@ -19,6 +19,7 @@
#include <linux/security.h>
#include <linux/syscalls.h>
#include <asm/uaccess.h>
#include <asm/cacheflush.h>
-diff -NurpP --minimal linux-2.6.38-rc8/mm/oom_kill.c linux-2.6.38-rc8-vs2.3.0.37-rc6/mm/oom_kill.c
---- linux-2.6.38-rc8/mm/oom_kill.c 2011-01-05 21:50:40.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/mm/oom_kill.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/mm/oom_kill.c linux-2.6.38.1-vs2.3.0.37-rc9/mm/oom_kill.c
+--- linux-2.6.38.1/mm/oom_kill.c 2011-01-05 21:50:40.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/mm/oom_kill.c 2011-01-29 02:01:07.000000000 +0100
@@ -31,6 +31,9 @@
#include <linux/memcontrol.h>
#include <linux/mempolicy.h>
}
if (oom_kill_process(p, gfp_mask, order, points, totalpages, NULL,
-diff -NurpP --minimal linux-2.6.38-rc8/mm/page_alloc.c linux-2.6.38-rc8-vs2.3.0.37-rc6/mm/page_alloc.c
---- linux-2.6.38-rc8/mm/page_alloc.c 2011-03-10 17:09:30.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/mm/page_alloc.c 2011-03-07 16:53:28.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/mm/page_alloc.c linux-2.6.38.1-vs2.3.0.37-rc9/mm/page_alloc.c
+--- linux-2.6.38.1/mm/page_alloc.c 2011-03-15 18:07:42.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/mm/page_alloc.c 2011-03-07 16:53:28.000000000 +0100
@@ -53,6 +53,8 @@
#include <linux/compaction.h>
#include <trace/events/kmem.h>
}
#endif
-diff -NurpP --minimal linux-2.6.38-rc8/mm/pgtable-generic.c linux-2.6.38-rc8-vs2.3.0.37-rc6/mm/pgtable-generic.c
---- linux-2.6.38-rc8/mm/pgtable-generic.c 2011-03-10 17:09:30.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/mm/pgtable-generic.c 2011-02-02 22:20:27.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/mm/pgtable-generic.c linux-2.6.38.1-vs2.3.0.37-rc9/mm/pgtable-generic.c
+--- linux-2.6.38.1/mm/pgtable-generic.c 2011-03-15 18:07:42.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/mm/pgtable-generic.c 2011-02-02 22:20:27.000000000 +0100
@@ -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-2.6.38-rc8/mm/rmap.c linux-2.6.38-rc8-vs2.3.0.37-rc6/mm/rmap.c
---- linux-2.6.38-rc8/mm/rmap.c 2011-03-10 17:09:30.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/mm/rmap.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/mm/rmap.c linux-2.6.38.1-vs2.3.0.37-rc9/mm/rmap.c
+--- linux-2.6.38.1/mm/rmap.c 2011-03-15 18:07:42.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/mm/rmap.c 2011-03-15 18:15:06.000000000 +0100
@@ -57,6 +57,7 @@
#include <linux/mmu_notifier.h>
#include <linux/migrate.h>
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-2.6.38-rc8/mm/shmem.c linux-2.6.38-rc8-vs2.3.0.37-rc6/mm/shmem.c
---- linux-2.6.38-rc8/mm/shmem.c 2011-03-10 17:09:30.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/mm/shmem.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/mm/shmem.c linux-2.6.38.1-vs2.3.0.37-rc9/mm/shmem.c
+--- linux-2.6.38.1/mm/shmem.c 2011-03-15 18:07:42.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/mm/shmem.c 2011-01-29 02:01:07.000000000 +0100
@@ -1816,7 +1816,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_POSIX_ACL
-diff -NurpP --minimal linux-2.6.38-rc8/mm/slab.c linux-2.6.38-rc8-vs2.3.0.37-rc6/mm/slab.c
---- linux-2.6.38-rc8/mm/slab.c 2011-03-10 17:09:30.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/mm/slab.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/mm/slab.c linux-2.6.38.1-vs2.3.0.37-rc9/mm/slab.c
+--- linux-2.6.38.1/mm/slab.c 2011-03-15 18:07:42.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/mm/slab.c 2011-01-29 02:01:07.000000000 +0100
@@ -407,6 +407,8 @@ static void kmem_list3_init(struct kmem_
#define STATS_INC_FREEMISS(x) do { } while (0)
#endif
kmemcheck_slab_free(cachep, objp, obj_size(cachep));
-diff -NurpP --minimal linux-2.6.38-rc8/mm/slab_vs.h linux-2.6.38-rc8-vs2.3.0.37-rc6/mm/slab_vs.h
---- linux-2.6.38-rc8/mm/slab_vs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/mm/slab_vs.h 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/mm/slab_vs.h linux-2.6.38.1-vs2.3.0.37-rc9/mm/slab_vs.h
+--- linux-2.6.38.1/mm/slab_vs.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/mm/slab_vs.h 2011-01-29 02:01:07.000000000 +0100
@@ -0,0 +1,29 @@
+
+#include <linux/vserver/context.h>
+ atomic_sub(cachep->buffer_size, &vxi->cacct.slab[what]);
+}
+
-diff -NurpP --minimal linux-2.6.38-rc8/mm/swapfile.c linux-2.6.38-rc8-vs2.3.0.37-rc6/mm/swapfile.c
---- linux-2.6.38-rc8/mm/swapfile.c 2011-03-10 17:09:30.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/mm/swapfile.c 2011-03-07 16:53:28.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/mm/swapfile.c linux-2.6.38.1-vs2.3.0.37-rc9/mm/swapfile.c
+--- linux-2.6.38.1/mm/swapfile.c 2011-03-15 18:07:42.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/mm/swapfile.c 2011-03-07 16:53:28.000000000 +0100
@@ -36,6 +36,8 @@
#include <asm/tlbflush.h>
#include <linux/swapops.h>
}
/*
-diff -NurpP --minimal linux-2.6.38-rc8/net/bridge/br_multicast.c linux-2.6.38-rc8-vs2.3.0.37-rc6/net/bridge/br_multicast.c
---- linux-2.6.38-rc8/net/bridge/br_multicast.c 2011-03-10 17:09:30.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/net/bridge/br_multicast.c 2011-03-10 16:51:08.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/net/bridge/br_multicast.c linux-2.6.38.1-vs2.3.0.37-rc9/net/bridge/br_multicast.c
+--- linux-2.6.38.1/net/bridge/br_multicast.c 2011-03-15 18:07:44.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/net/bridge/br_multicast.c 2011-03-10 16:51:08.000000000 +0100
@@ -446,7 +446,7 @@ static struct sk_buff *br_ip6_multicast_
ip6h->nexthdr = IPPROTO_HOPOPTS;
ip6h->hop_limit = 1;
ipv6_addr_set(&ip6h->daddr, htonl(0xff020000), 0, 0, htonl(1));
ipv6_eth_mc_map(&ip6h->daddr, eth->h_dest);
-diff -NurpP --minimal linux-2.6.38-rc8/net/core/dev.c linux-2.6.38-rc8-vs2.3.0.37-rc6/net/core/dev.c
---- linux-2.6.38-rc8/net/core/dev.c 2011-03-10 17:09:30.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/net/core/dev.c 2011-03-07 16:53:28.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/net/core/dev.c linux-2.6.38.1-vs2.3.0.37-rc9/net/core/dev.c
+--- linux-2.6.38.1/net/core/dev.c 2011-03-15 18:07:44.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/net/core/dev.c 2011-03-15 18:15:06.000000000 +0100
@@ -127,6 +127,7 @@
#include <linux/in.h>
#include <linux/jhash.h>
/* avoid cases where sscanf is not exact inverse of printf */
snprintf(buf, IFNAMSIZ, name, i);
-@@ -3865,6 +3875,8 @@ static int dev_ifconf(struct net *net, c
+@@ -3873,6 +3883,8 @@ static int dev_ifconf(struct net *net, c
total = 0;
for_each_netdev(net, dev) {
for (i = 0; i < NPROTO; i++) {
if (gifconf_list[i]) {
int done;
-@@ -3936,6 +3948,10 @@ static void dev_seq_printf_stats(struct
+@@ -3944,6 +3956,10 @@ static void dev_seq_printf_stats(struct
struct rtnl_link_stats64 temp;
const struct rtnl_link_stats64 *stats = dev_get_stats(dev, &temp);
seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
"%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
dev->name, stats->rx_bytes, stats->rx_packets,
-diff -NurpP --minimal linux-2.6.38-rc8/net/core/rtnetlink.c linux-2.6.38-rc8-vs2.3.0.37-rc6/net/core/rtnetlink.c
---- linux-2.6.38-rc8/net/core/rtnetlink.c 2011-03-10 17:09:30.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/net/core/rtnetlink.c 2011-02-17 02:17:52.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/net/core/rtnetlink.c linux-2.6.38.1-vs2.3.0.37-rc9/net/core/rtnetlink.c
+--- linux-2.6.38.1/net/core/rtnetlink.c 2011-03-15 18:07:44.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/net/core/rtnetlink.c 2011-02-17 02:17:52.000000000 +0100
@@ -1012,6 +1012,8 @@ static int rtnl_dump_ifinfo(struct sk_bu
hlist_for_each_entry(dev, node, head, index_hlist) {
if (idx < s_idx)
skb = nlmsg_new(if_nlmsg_size(dev), GFP_KERNEL);
if (skb == NULL)
goto errout;
-diff -NurpP --minimal linux-2.6.38-rc8/net/core/sock.c linux-2.6.38-rc8-vs2.3.0.37-rc6/net/core/sock.c
---- linux-2.6.38-rc8/net/core/sock.c 2011-03-10 17:09:30.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/net/core/sock.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/net/core/sock.c linux-2.6.38.1-vs2.3.0.37-rc9/net/core/sock.c
+--- linux-2.6.38.1/net/core/sock.c 2011-03-15 18:07:44.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/net/core/sock.c 2011-01-29 02:01:07.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-2.6.38-rc8/net/ipv4/af_inet.c linux-2.6.38-rc8-vs2.3.0.37-rc6/net/ipv4/af_inet.c
---- linux-2.6.38-rc8/net/ipv4/af_inet.c 2011-03-10 17:09:30.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/net/ipv4/af_inet.c 2011-02-17 02:17:52.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/net/ipv4/af_inet.c linux-2.6.38.1-vs2.3.0.37-rc9/net/ipv4/af_inet.c
+--- linux-2.6.38.1/net/ipv4/af_inet.c 2011-03-15 18:07:45.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/net/ipv4/af_inet.c 2011-02-17 02:17:52.000000000 +0100
@@ -116,6 +116,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-2.6.38-rc8/net/ipv4/devinet.c linux-2.6.38-rc8-vs2.3.0.37-rc6/net/ipv4/devinet.c
---- linux-2.6.38-rc8/net/ipv4/devinet.c 2011-03-10 17:09:30.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/net/ipv4/devinet.c 2011-03-07 16:53:28.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/net/ipv4/devinet.c linux-2.6.38.1-vs2.3.0.37-rc9/net/ipv4/devinet.c
+--- linux-2.6.38.1/net/ipv4/devinet.c 2011-03-15 18:07:45.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/net/ipv4/devinet.c 2011-03-15 18:15:06.000000000 +0100
@@ -420,6 +420,7 @@ struct in_device *inetdev_by_index(struc
}
EXPORT_SYMBOL(inetdev_by_index);
+ continue;
if (!strcmp(ifr.ifr_name, ifa->ifa_label) &&
sin_orig.sin_addr.s_addr ==
- ifa->ifa_address) {
+ ifa->ifa_local) {
@@ -680,9 +685,12 @@ int devinet_ioctl(struct net *net, unsig
comparing just the label */
if (!ifa) {
if (ip_idx < s_ip_idx)
continue;
if (inet_fill_ifaddr(skb, ifa,
-diff -NurpP --minimal linux-2.6.38-rc8/net/ipv4/fib_hash.c linux-2.6.38-rc8-vs2.3.0.37-rc6/net/ipv4/fib_hash.c
---- linux-2.6.38-rc8/net/ipv4/fib_hash.c 2011-01-05 21:50:41.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/net/ipv4/fib_hash.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/net/ipv4/fib_hash.c linux-2.6.38.1-vs2.3.0.37-rc9/net/ipv4/fib_hash.c
+--- linux-2.6.38.1/net/ipv4/fib_hash.c 2011-01-05 21:50:41.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/net/ipv4/fib_hash.c 2011-01-29 02:01:07.000000000 +0100
@@ -1080,7 +1080,7 @@ static int fib_seq_show(struct seq_file
prefix = f->fn_key;
mask = FZ_MASK(iter->zone);
seq_printf(seq,
"%s\t%08X\t%08X\t%04X\t%d\t%u\t%d\t%08X\t%d\t%u\t%u%n",
fi->fib_dev ? fi->fib_dev->name : "*", prefix,
-diff -NurpP --minimal linux-2.6.38-rc8/net/ipv4/inet_connection_sock.c linux-2.6.38-rc8-vs2.3.0.37-rc6/net/ipv4/inet_connection_sock.c
---- linux-2.6.38-rc8/net/ipv4/inet_connection_sock.c 2011-03-10 17:09:30.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/net/ipv4/inet_connection_sock.c 2011-01-29 05:17:31.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/net/ipv4/inet_connection_sock.c linux-2.6.38.1-vs2.3.0.37-rc9/net/ipv4/inet_connection_sock.c
+--- linux-2.6.38.1/net/ipv4/inet_connection_sock.c 2011-03-15 18:07:45.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/net/ipv4/inet_connection_sock.c 2011-01-29 05:17:31.000000000 +0100
@@ -52,6 +52,37 @@ void inet_get_local_port_range(int *low,
}
EXPORT_SYMBOL(inet_get_local_port_range);
break;
}
}
-diff -NurpP --minimal linux-2.6.38-rc8/net/ipv4/inet_diag.c linux-2.6.38-rc8-vs2.3.0.37-rc6/net/ipv4/inet_diag.c
---- linux-2.6.38-rc8/net/ipv4/inet_diag.c 2011-01-05 21:50:42.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/net/ipv4/inet_diag.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/net/ipv4/inet_diag.c linux-2.6.38.1-vs2.3.0.37-rc9/net/ipv4/inet_diag.c
+--- linux-2.6.38.1/net/ipv4/inet_diag.c 2011-01-05 21:50:42.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/net/ipv4/inet_diag.c 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/net/ipv4/inet_hashtables.c linux-2.6.38-rc8-vs2.3.0.37-rc6/net/ipv4/inet_hashtables.c
---- linux-2.6.38-rc8/net/ipv4/inet_hashtables.c 2011-01-05 21:50:42.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/net/ipv4/inet_hashtables.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/net/ipv4/inet_hashtables.c linux-2.6.38.1-vs2.3.0.37-rc9/net/ipv4/inet_hashtables.c
+--- linux-2.6.38.1/net/ipv4/inet_hashtables.c 2011-01-05 21:50:42.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/net/ipv4/inet_hashtables.c 2011-01-29 02:01:07.000000000 +0100
@@ -21,6 +21,7 @@
#include <net/inet_connection_sock.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-2.6.38-rc8/net/ipv4/netfilter/nf_nat_helper.c linux-2.6.38-rc8-vs2.3.0.37-rc6/net/ipv4/netfilter/nf_nat_helper.c
---- linux-2.6.38-rc8/net/ipv4/netfilter/nf_nat_helper.c 2011-01-05 21:50:42.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/net/ipv4/netfilter/nf_nat_helper.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/net/ipv4/netfilter/nf_nat_helper.c linux-2.6.38.1-vs2.3.0.37-rc9/net/ipv4/netfilter/nf_nat_helper.c
+--- linux-2.6.38.1/net/ipv4/netfilter/nf_nat_helper.c 2011-01-05 21:50:42.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/net/ipv4/netfilter/nf_nat_helper.c 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/net/ipv4/netfilter.c linux-2.6.38-rc8-vs2.3.0.37-rc6/net/ipv4/netfilter.c
---- linux-2.6.38-rc8/net/ipv4/netfilter.c 2011-03-10 17:09:30.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/net/ipv4/netfilter.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/net/ipv4/netfilter.c linux-2.6.38.1-vs2.3.0.37-rc9/net/ipv4/netfilter.c
+--- linux-2.6.38.1/net/ipv4/netfilter.c 2011-03-15 18:07:45.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/net/ipv4/netfilter.c 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/net/ipv4/raw.c linux-2.6.38-rc8-vs2.3.0.37-rc6/net/ipv4/raw.c
---- linux-2.6.38-rc8/net/ipv4/raw.c 2011-03-10 17:09:30.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/net/ipv4/raw.c 2011-02-17 02:17:52.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/net/ipv4/raw.c linux-2.6.38.1-vs2.3.0.37-rc9/net/ipv4/raw.c
+--- linux-2.6.38.1/net/ipv4/raw.c 2011-03-15 18:07:45.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/net/ipv4/raw.c 2011-02-17 02:17:52.000000000 +0100
@@ -117,7 +117,7 @@ static struct sock *__raw_v4_lookup(stru
if (net_eq(sock_net(sk), net) && inet->inet_num == num &&
sk_wmem_alloc_get(sp),
sk_rmem_alloc_get(sp),
0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
-diff -NurpP --minimal linux-2.6.38-rc8/net/ipv4/tcp.c linux-2.6.38-rc8-vs2.3.0.37-rc6/net/ipv4/tcp.c
---- linux-2.6.38-rc8/net/ipv4/tcp.c 2011-03-10 17:09:30.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/net/ipv4/tcp.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/net/ipv4/tcp.c linux-2.6.38.1-vs2.3.0.37-rc9/net/ipv4/tcp.c
+--- linux-2.6.38.1/net/ipv4/tcp.c 2011-03-15 18:07:45.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/net/ipv4/tcp.c 2011-01-29 02:01:07.000000000 +0100
@@ -266,6 +266,7 @@
#include <linux/crypto.h>
#include <linux/time.h>
#include <net/icmp.h>
#include <net/tcp.h>
-diff -NurpP --minimal linux-2.6.38-rc8/net/ipv4/tcp_ipv4.c linux-2.6.38-rc8-vs2.3.0.37-rc6/net/ipv4/tcp_ipv4.c
---- linux-2.6.38-rc8/net/ipv4/tcp_ipv4.c 2011-03-10 17:09:30.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/net/ipv4/tcp_ipv4.c 2011-02-02 22:20:27.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/net/ipv4/tcp_ipv4.c linux-2.6.38.1-vs2.3.0.37-rc9/net/ipv4/tcp_ipv4.c
+--- linux-2.6.38.1/net/ipv4/tcp_ipv4.c 2011-03-15 18:07:45.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/net/ipv4/tcp_ipv4.c 2011-02-02 22:20:27.000000000 +0100
@@ -1988,6 +1988,12 @@ static void *listening_get_next(struct s
req = req->dl_next;
while (1) {
3, jiffies_to_clock_t(ttd), 0, 0, 0, 0,
atomic_read(&tw->tw_refcnt), tw, len);
}
-diff -NurpP --minimal linux-2.6.38-rc8/net/ipv4/tcp_minisocks.c linux-2.6.38-rc8-vs2.3.0.37-rc6/net/ipv4/tcp_minisocks.c
---- linux-2.6.38-rc8/net/ipv4/tcp_minisocks.c 2011-03-10 17:09:30.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/net/ipv4/tcp_minisocks.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/net/ipv4/tcp_minisocks.c linux-2.6.38.1-vs2.3.0.37-rc9/net/ipv4/tcp_minisocks.c
+--- linux-2.6.38.1/net/ipv4/tcp_minisocks.c 2011-03-15 18:07:45.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/net/ipv4/tcp_minisocks.c 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/net/ipv4/udp.c linux-2.6.38-rc8-vs2.3.0.37-rc6/net/ipv4/udp.c
---- linux-2.6.38-rc8/net/ipv4/udp.c 2011-03-10 17:09:30.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/net/ipv4/udp.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/net/ipv4/udp.c linux-2.6.38.1-vs2.3.0.37-rc9/net/ipv4/udp.c
+--- linux-2.6.38.1/net/ipv4/udp.c 2011-03-15 18:07:45.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/net/ipv4/udp.c 2011-01-29 02:01:07.000000000 +0100
@@ -296,14 +296,7 @@ fail:
}
EXPORT_SYMBOL(udp_lib_get_port);
sk_wmem_alloc_get(sp),
sk_rmem_alloc_get(sp),
0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
-diff -NurpP --minimal linux-2.6.38-rc8/net/ipv6/Kconfig linux-2.6.38-rc8-vs2.3.0.37-rc6/net/ipv6/Kconfig
---- linux-2.6.38-rc8/net/ipv6/Kconfig 2010-08-02 16:52:59.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/net/ipv6/Kconfig 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/net/ipv6/Kconfig linux-2.6.38.1-vs2.3.0.37-rc9/net/ipv6/Kconfig
+--- linux-2.6.38.1/net/ipv6/Kconfig 2010-08-02 16:52:59.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/net/ipv6/Kconfig 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/net/ipv6/addrconf.c linux-2.6.38-rc8-vs2.3.0.37-rc6/net/ipv6/addrconf.c
---- linux-2.6.38-rc8/net/ipv6/addrconf.c 2011-03-10 17:09:30.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/net/ipv6/addrconf.c 2011-02-02 22:20:27.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/net/ipv6/addrconf.c linux-2.6.38.1-vs2.3.0.37-rc9/net/ipv6/addrconf.c
+--- linux-2.6.38.1/net/ipv6/addrconf.c 2011-03-15 18:07:45.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/net/ipv6/addrconf.c 2011-02-02 22:20:27.000000000 +0100
@@ -87,6 +87,8 @@
#include <linux/proc_fs.h>
idev = __in6_dev_get(dev);
if (!idev)
goto cont;
-diff -NurpP --minimal linux-2.6.38-rc8/net/ipv6/af_inet6.c linux-2.6.38-rc8-vs2.3.0.37-rc6/net/ipv6/af_inet6.c
---- linux-2.6.38-rc8/net/ipv6/af_inet6.c 2011-03-10 17:09:30.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/net/ipv6/af_inet6.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/net/ipv6/af_inet6.c linux-2.6.38.1-vs2.3.0.37-rc9/net/ipv6/af_inet6.c
+--- linux-2.6.38.1/net/ipv6/af_inet6.c 2011-03-15 18:07:45.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/net/ipv6/af_inet6.c 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/net/ipv6/fib6_rules.c linux-2.6.38-rc8-vs2.3.0.37-rc6/net/ipv6/fib6_rules.c
---- linux-2.6.38-rc8/net/ipv6/fib6_rules.c 2011-01-05 21:50:42.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/net/ipv6/fib6_rules.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/net/ipv6/fib6_rules.c linux-2.6.38.1-vs2.3.0.37-rc9/net/ipv6/fib6_rules.c
+--- linux-2.6.38.1/net/ipv6/fib6_rules.c 2011-01-05 21:50:42.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/net/ipv6/fib6_rules.c 2011-01-29 02:01:07.000000000 +0100
@@ -88,7 +88,7 @@ static int fib6_rule_action(struct fib_r
ip6_dst_idev(&rt->dst)->dev,
&flp->fl6_dst,
goto again;
if (!ipv6_prefix_equal(&saddr, &r->src.addr,
r->src.plen))
-diff -NurpP --minimal linux-2.6.38-rc8/net/ipv6/inet6_hashtables.c linux-2.6.38-rc8-vs2.3.0.37-rc6/net/ipv6/inet6_hashtables.c
---- linux-2.6.38-rc8/net/ipv6/inet6_hashtables.c 2010-02-25 11:52:10.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/net/ipv6/inet6_hashtables.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/net/ipv6/inet6_hashtables.c linux-2.6.38.1-vs2.3.0.37-rc9/net/ipv6/inet6_hashtables.c
+--- linux-2.6.38.1/net/ipv6/inet6_hashtables.c 2010-02-25 11:52:10.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/net/ipv6/inet6_hashtables.c 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/net/ipv6/ip6_output.c linux-2.6.38-rc8-vs2.3.0.37-rc6/net/ipv6/ip6_output.c
---- linux-2.6.38-rc8/net/ipv6/ip6_output.c 2011-03-10 17:09:30.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/net/ipv6/ip6_output.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/net/ipv6/ip6_output.c linux-2.6.38.1-vs2.3.0.37-rc9/net/ipv6/ip6_output.c
+--- linux-2.6.38.1/net/ipv6/ip6_output.c 2011-03-15 18:07:45.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/net/ipv6/ip6_output.c 2011-01-29 02:01:07.000000000 +0100
@@ -933,7 +933,7 @@ static int ip6_dst_lookup_tail(struct so
err = ipv6_dev_get_saddr(net, ip6_dst_idev(*dst)->dev,
&fl->fl6_dst,
if (err)
goto out_err_release;
}
-diff -NurpP --minimal linux-2.6.38-rc8/net/ipv6/ndisc.c linux-2.6.38-rc8-vs2.3.0.37-rc6/net/ipv6/ndisc.c
---- linux-2.6.38-rc8/net/ipv6/ndisc.c 2011-03-10 17:09:30.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/net/ipv6/ndisc.c 2011-03-10 16:52:54.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/net/ipv6/ndisc.c linux-2.6.38.1-vs2.3.0.37-rc9/net/ipv6/ndisc.c
+--- linux-2.6.38.1/net/ipv6/ndisc.c 2011-03-15 18:07:45.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/net/ipv6/ndisc.c 2011-03-10 16:52:54.000000000 +0100
@@ -595,7 +595,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-2.6.38-rc8/net/ipv6/raw.c linux-2.6.38-rc8-vs2.3.0.37-rc6/net/ipv6/raw.c
---- linux-2.6.38-rc8/net/ipv6/raw.c 2011-03-10 17:09:30.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/net/ipv6/raw.c 2011-02-17 02:17:52.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/net/ipv6/raw.c linux-2.6.38.1-vs2.3.0.37-rc9/net/ipv6/raw.c
+--- linux-2.6.38.1/net/ipv6/raw.c 2011-03-15 18:07:45.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/net/ipv6/raw.c 2011-02-17 02:17:52.000000000 +0100
@@ -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-2.6.38-rc8/net/ipv6/route.c linux-2.6.38-rc8-vs2.3.0.37-rc6/net/ipv6/route.c
---- linux-2.6.38-rc8/net/ipv6/route.c 2011-03-10 17:09:30.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/net/ipv6/route.c 2011-03-10 17:21:19.000000000 +0100
-@@ -2289,7 +2289,8 @@ static int rt6_fill_node(struct net *net
+diff -NurpP --minimal linux-2.6.38.1/net/ipv6/route.c linux-2.6.38.1-vs2.3.0.37-rc9/net/ipv6/route.c
+--- linux-2.6.38.1/net/ipv6/route.c 2011-03-15 18:07:45.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/net/ipv6/route.c 2011-03-15 18:15:06.000000000 +0100
+@@ -2291,7 +2291,8 @@ static int rt6_fill_node(struct net *net
struct inet6_dev *idev = ip6_dst_idev(&rt->dst);
struct in6_addr saddr_buf;
if (ipv6_dev_get_saddr(net, idev ? idev->dev : NULL,
NLA_PUT(skb, RTA_PREFSRC, 16, &saddr_buf);
}
-diff -NurpP --minimal linux-2.6.38-rc8/net/ipv6/tcp_ipv6.c linux-2.6.38-rc8-vs2.3.0.37-rc6/net/ipv6/tcp_ipv6.c
---- linux-2.6.38-rc8/net/ipv6/tcp_ipv6.c 2011-03-10 17:09:30.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/net/ipv6/tcp_ipv6.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/net/ipv6/tcp_ipv6.c linux-2.6.38.1-vs2.3.0.37-rc9/net/ipv6/tcp_ipv6.c
+--- linux-2.6.38.1/net/ipv6/tcp_ipv6.c 2011-03-15 18:07:45.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/net/ipv6/tcp_ipv6.c 2011-01-29 02:01:07.000000000 +0100
@@ -69,6 +69,7 @@
#include <linux/crypto.h>
addr_type = ipv6_addr_type(&usin->sin6_addr);
-diff -NurpP --minimal linux-2.6.38-rc8/net/ipv6/udp.c linux-2.6.38-rc8-vs2.3.0.37-rc6/net/ipv6/udp.c
---- linux-2.6.38-rc8/net/ipv6/udp.c 2011-03-10 17:09:30.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/net/ipv6/udp.c 2011-01-29 05:23:17.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/net/ipv6/udp.c linux-2.6.38.1-vs2.3.0.37-rc9/net/ipv6/udp.c
+--- linux-2.6.38.1/net/ipv6/udp.c 2011-03-15 18:07:45.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/net/ipv6/udp.c 2011-01-29 05:23:17.000000000 +0100
@@ -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-2.6.38-rc8/net/ipv6/xfrm6_policy.c linux-2.6.38-rc8-vs2.3.0.37-rc6/net/ipv6/xfrm6_policy.c
---- linux-2.6.38-rc8/net/ipv6/xfrm6_policy.c 2011-03-10 17:09:30.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/net/ipv6/xfrm6_policy.c 2011-02-02 22:20:27.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/net/ipv6/xfrm6_policy.c linux-2.6.38.1-vs2.3.0.37-rc9/net/ipv6/xfrm6_policy.c
+--- linux-2.6.38.1/net/ipv6/xfrm6_policy.c 2011-03-15 18:07:45.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/net/ipv6/xfrm6_policy.c 2011-02-02 22:20:27.000000000 +0100
@@ -62,7 +62,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-2.6.38-rc8/net/netfilter/ipvs/ip_vs_xmit.c linux-2.6.38-rc8-vs2.3.0.37-rc6/net/netfilter/ipvs/ip_vs_xmit.c
---- linux-2.6.38-rc8/net/netfilter/ipvs/ip_vs_xmit.c 2011-03-10 17:09:31.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/net/netfilter/ipvs/ip_vs_xmit.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/net/netfilter/ipvs/ip_vs_xmit.c linux-2.6.38.1-vs2.3.0.37-rc9/net/netfilter/ipvs/ip_vs_xmit.c
+--- linux-2.6.38.1/net/netfilter/ipvs/ip_vs_xmit.c 2011-03-15 18:07:46.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/net/netfilter/ipvs/ip_vs_xmit.c 2011-01-29 02:01:07.000000000 +0100
@@ -213,7 +213,7 @@ __ip_vs_route_output_v6(struct net *net,
return dst;
if (ipv6_addr_any(&fl.fl6_src) &&
goto out_err;
if (do_xfrm && xfrm_lookup(net, &dst, &fl, NULL, 0) < 0)
goto out_err;
-diff -NurpP --minimal linux-2.6.38-rc8/net/netlink/af_netlink.c linux-2.6.38-rc8-vs2.3.0.37-rc6/net/netlink/af_netlink.c
---- linux-2.6.38-rc8/net/netlink/af_netlink.c 2011-03-10 17:09:31.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/net/netlink/af_netlink.c 2011-03-10 17:21:19.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/net/netlink/af_netlink.c linux-2.6.38.1-vs2.3.0.37-rc9/net/netlink/af_netlink.c
+--- linux-2.6.38.1/net/netlink/af_netlink.c 2011-03-15 18:07:46.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/net/netlink/af_netlink.c 2011-03-10 17:21:19.000000000 +0100
@@ -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-2.6.38-rc8/net/sctp/ipv6.c linux-2.6.38-rc8-vs2.3.0.37-rc6/net/sctp/ipv6.c
---- linux-2.6.38-rc8/net/sctp/ipv6.c 2011-01-05 21:50:45.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/net/sctp/ipv6.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/net/sctp/ipv6.c linux-2.6.38.1-vs2.3.0.37-rc9/net/sctp/ipv6.c
+--- linux-2.6.38.1/net/sctp/ipv6.c 2011-01-05 21:50:45.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/net/sctp/ipv6.c 2011-01-29 02:01:07.000000000 +0100
@@ -306,7 +306,8 @@ static void sctp_v6_get_saddr(struct sct
dst ? ip6_dst_idev(dst)->dev : NULL,
&daddr->v6.sin6_addr,
SCTP_DEBUG_PRINTK("saddr from ipv6_get_saddr: %pI6\n",
&saddr->v6.sin6_addr);
return;
-diff -NurpP --minimal linux-2.6.38-rc8/net/socket.c linux-2.6.38-rc8-vs2.3.0.37-rc6/net/socket.c
---- linux-2.6.38-rc8/net/socket.c 2011-03-10 17:09:31.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/net/socket.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/net/socket.c linux-2.6.38.1-vs2.3.0.37-rc9/net/socket.c
+--- linux-2.6.38.1/net/socket.c 2011-03-15 18:07:46.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/net/socket.c 2011-01-29 02:01:07.000000000 +0100
@@ -98,6 +98,10 @@
#include <net/sock.h>
err = sock1->ops->socketpair(sock1, sock2);
if (err < 0)
-diff -NurpP --minimal linux-2.6.38-rc8/net/sunrpc/auth.c linux-2.6.38-rc8-vs2.3.0.37-rc6/net/sunrpc/auth.c
---- linux-2.6.38-rc8/net/sunrpc/auth.c 2011-03-10 17:09:31.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/net/sunrpc/auth.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/net/sunrpc/auth.c linux-2.6.38.1-vs2.3.0.37-rc9/net/sunrpc/auth.c
+--- linux-2.6.38.1/net/sunrpc/auth.c 2011-03-15 18:07:46.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/net/sunrpc/auth.c 2011-01-29 02:01:07.000000000 +0100
@@ -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-2.6.38-rc8/net/sunrpc/auth_unix.c linux-2.6.38-rc8-vs2.3.0.37-rc6/net/sunrpc/auth_unix.c
---- linux-2.6.38-rc8/net/sunrpc/auth_unix.c 2010-10-21 13:08:01.000000000 +0200
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/net/sunrpc/auth_unix.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/net/sunrpc/auth_unix.c linux-2.6.38.1-vs2.3.0.37-rc9/net/sunrpc/auth_unix.c
+--- linux-2.6.38.1/net/sunrpc/auth_unix.c 2010-10-21 13:08:01.000000000 +0200
++++ linux-2.6.38.1-vs2.3.0.37-rc9/net/sunrpc/auth_unix.c 2011-01-29 02:01:07.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-2.6.38-rc8/net/sunrpc/clnt.c linux-2.6.38-rc8-vs2.3.0.37-rc6/net/sunrpc/clnt.c
---- linux-2.6.38-rc8/net/sunrpc/clnt.c 2011-03-10 17:09:31.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/net/sunrpc/clnt.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/net/sunrpc/clnt.c linux-2.6.38.1-vs2.3.0.37-rc9/net/sunrpc/clnt.c
+--- linux-2.6.38.1/net/sunrpc/clnt.c 2011-03-26 01:10:17.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/net/sunrpc/clnt.c 2011-03-25 22:52:15.000000000 +0100
@@ -33,6 +33,7 @@
#include <linux/utsname.h>
#include <linux/workqueue.h>
return clnt;
}
EXPORT_SYMBOL_GPL(rpc_create);
-diff -NurpP --minimal linux-2.6.38-rc8/net/unix/af_unix.c linux-2.6.38-rc8-vs2.3.0.37-rc6/net/unix/af_unix.c
---- linux-2.6.38-rc8/net/unix/af_unix.c 2011-03-10 17:09:31.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/net/unix/af_unix.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/net/unix/af_unix.c linux-2.6.38.1-vs2.3.0.37-rc9/net/unix/af_unix.c
+--- linux-2.6.38.1/net/unix/af_unix.c 2011-03-15 18:07:46.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/net/unix/af_unix.c 2011-03-15 18:15:06.000000000 +0100
@@ -114,6 +114,8 @@
#include <linux/mount.h>
#include <net/checksum.h>
if (u->addr->len == len &&
!memcmp(u->addr->name, sunname, len))
goto found;
-@@ -2179,6 +2183,8 @@ static struct sock *unix_seq_idx(struct
+@@ -2188,6 +2192,8 @@ static struct sock *unix_seq_idx(struct
for (s = first_unix_socket(&iter->i); s; s = next_unix_socket(&iter->i, s)) {
if (sock_net(s) != seq_file_net(seq))
continue;
if (off == pos)
return s;
++off;
-@@ -2203,7 +2209,8 @@ static void *unix_seq_next(struct seq_fi
+@@ -2212,7 +2218,8 @@ static void *unix_seq_next(struct seq_fi
sk = first_unix_socket(&iter->i);
else
sk = next_unix_socket(&iter->i, sk);
sk = next_unix_socket(&iter->i, sk);
return sk;
}
-diff -NurpP --minimal linux-2.6.38-rc8/scripts/checksyscalls.sh linux-2.6.38-rc8-vs2.3.0.37-rc6/scripts/checksyscalls.sh
---- linux-2.6.38-rc8/scripts/checksyscalls.sh 2011-03-10 17:09:31.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/scripts/checksyscalls.sh 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/scripts/checksyscalls.sh linux-2.6.38.1-vs2.3.0.37-rc9/scripts/checksyscalls.sh
+--- linux-2.6.38.1/scripts/checksyscalls.sh 2011-03-15 18:07:46.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/scripts/checksyscalls.sh 2011-01-29 02:01:07.000000000 +0100
@@ -193,7 +193,6 @@ cat << EOF
#define __IGNORE_afs_syscall
#define __IGNORE_getpmsg
EOF
}
-diff -NurpP --minimal linux-2.6.38-rc8/security/commoncap.c linux-2.6.38-rc8-vs2.3.0.37-rc6/security/commoncap.c
---- linux-2.6.38-rc8/security/commoncap.c 2011-01-05 21:50:47.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/security/commoncap.c 2011-01-29 02:01:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/security/commoncap.c linux-2.6.38.1-vs2.3.0.37-rc9/security/commoncap.c
+--- linux-2.6.38.1/security/commoncap.c 2011-01-05 21:50:47.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/security/commoncap.c 2011-01-29 02:01:07.000000000 +0100
@@ -27,6 +27,7 @@
#include <linux/sched.h>
#include <linux/prctl.h>
return ret;
}
+
-diff -NurpP --minimal linux-2.6.38-rc8/security/selinux/hooks.c linux-2.6.38-rc8-vs2.3.0.37-rc6/security/selinux/hooks.c
---- linux-2.6.38-rc8/security/selinux/hooks.c 2011-03-10 17:09:32.000000000 +0100
-+++ linux-2.6.38-rc8-vs2.3.0.37-rc6/security/selinux/hooks.c 2011-02-17 02:17:52.000000000 +0100
+diff -NurpP --minimal linux-2.6.38.1/security/selinux/hooks.c linux-2.6.38.1-vs2.3.0.37-rc9/security/selinux/hooks.c
+--- linux-2.6.38.1/security/selinux/hooks.c 2011-03-15 18:07:47.000000000 +0100
++++ linux-2.6.38.1-vs2.3.0.37-rc9/security/selinux/hooks.c 2011-02-17 02:17:52.000000000 +0100
@@ -64,7 +64,6 @@
#include <linux/dccp.h>
#include <linux/quota.h>
projects / packages / kernel.git / blobdiff