-diff -NurpP --minimal linux-2.6.29.2/arch/alpha/Kconfig linux-2.6.29.2-vs2.3.0.36.12/arch/alpha/Kconfig
---- linux-2.6.29.2/arch/alpha/Kconfig 2009-03-24 14:18:07.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/alpha/Kconfig 2009-03-24 14:48:16.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/alpha/Kconfig linux-2.6.29.4-vs2.3.0.36.14/arch/alpha/Kconfig
+--- linux-2.6.29.4/arch/alpha/Kconfig 2009-03-24 14:18:07.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/alpha/Kconfig 2009-03-24 14:48:16.000000000 +0100
@@ -666,6 +666,8 @@ config DUMMY_CONSOLE
depends on VGA_HOSE
default y
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.29.2/arch/alpha/kernel/entry.S linux-2.6.29.2-vs2.3.0.36.12/arch/alpha/kernel/entry.S
---- linux-2.6.29.2/arch/alpha/kernel/entry.S 2009-03-24 14:18:07.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/alpha/kernel/entry.S 2009-03-24 14:48:16.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/alpha/kernel/entry.S linux-2.6.29.4-vs2.3.0.36.14/arch/alpha/kernel/entry.S
+--- linux-2.6.29.4/arch/alpha/kernel/entry.S 2009-03-24 14:18:07.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/alpha/kernel/entry.S 2009-03-24 14:48:16.000000000 +0100
@@ -874,24 +874,15 @@ sys_getxgid:
.globl sys_getxpid
.ent sys_getxpid
ret
.end sys_getxpid
-diff -NurpP --minimal linux-2.6.29.2/arch/alpha/kernel/osf_sys.c linux-2.6.29.2-vs2.3.0.36.12/arch/alpha/kernel/osf_sys.c
---- linux-2.6.29.2/arch/alpha/kernel/osf_sys.c 2009-03-24 14:18:07.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/alpha/kernel/osf_sys.c 2009-03-24 14:48:16.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/alpha/kernel/osf_sys.c linux-2.6.29.4-vs2.3.0.36.14/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.29.4/arch/alpha/kernel/osf_sys.c 2009-03-24 14:18:07.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/alpha/kernel/osf_sys.c 2009-03-24 14:48:16.000000000 +0100
@@ -877,7 +877,7 @@ SYSCALL_DEFINE2(osf_gettimeofday, struct
{
if (tv) {
if (put_tv32(tv, &ktv))
return -EFAULT;
}
-diff -NurpP --minimal linux-2.6.29.2/arch/alpha/kernel/ptrace.c linux-2.6.29.2-vs2.3.0.36.12/arch/alpha/kernel/ptrace.c
---- linux-2.6.29.2/arch/alpha/kernel/ptrace.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/alpha/kernel/ptrace.c 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/alpha/kernel/ptrace.c linux-2.6.29.4-vs2.3.0.36.14/arch/alpha/kernel/ptrace.c
+--- linux-2.6.29.4/arch/alpha/kernel/ptrace.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/alpha/kernel/ptrace.c 2009-02-22 22:54:24.000000000 +0100
@@ -15,6 +15,7 @@
#include <linux/slab.h>
#include <linux/security.h>
#include <asm/uaccess.h>
#include <asm/pgtable.h>
-diff -NurpP --minimal linux-2.6.29.2/arch/alpha/kernel/systbls.S linux-2.6.29.2-vs2.3.0.36.12/arch/alpha/kernel/systbls.S
---- linux-2.6.29.2/arch/alpha/kernel/systbls.S 2009-03-24 14:18:08.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/alpha/kernel/systbls.S 2009-03-24 14:48:16.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/alpha/kernel/systbls.S linux-2.6.29.4-vs2.3.0.36.14/arch/alpha/kernel/systbls.S
+--- linux-2.6.29.4/arch/alpha/kernel/systbls.S 2009-03-24 14:18:08.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/alpha/kernel/systbls.S 2009-03-24 14:48:16.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.29.2/arch/alpha/kernel/traps.c linux-2.6.29.2-vs2.3.0.36.12/arch/alpha/kernel/traps.c
---- linux-2.6.29.2/arch/alpha/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/alpha/kernel/traps.c 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/alpha/kernel/traps.c linux-2.6.29.4-vs2.3.0.36.14/arch/alpha/kernel/traps.c
+--- linux-2.6.29.4/arch/alpha/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/alpha/kernel/traps.c 2009-02-22 22:54:24.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.29.2/arch/alpha/mm/fault.c linux-2.6.29.2-vs2.3.0.36.12/arch/alpha/mm/fault.c
---- linux-2.6.29.2/arch/alpha/mm/fault.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/alpha/mm/fault.c 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/alpha/mm/fault.c linux-2.6.29.4-vs2.3.0.36.14/arch/alpha/mm/fault.c
+--- linux-2.6.29.4/arch/alpha/mm/fault.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/alpha/mm/fault.c 2009-02-22 22:54:24.000000000 +0100
@@ -193,8 +193,8 @@ do_page_fault(unsigned long address, uns
down_read(&mm->mmap_sem);
goto survive;
if (!user_mode(regs))
goto no_context;
do_group_exit(SIGKILL);
-diff -NurpP --minimal linux-2.6.29.2/arch/arm/Kconfig linux-2.6.29.2-vs2.3.0.36.12/arch/arm/Kconfig
---- linux-2.6.29.2/arch/arm/Kconfig 2009-03-24 14:18:08.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/arm/Kconfig 2009-03-24 14:48:16.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/arm/Kconfig linux-2.6.29.4-vs2.3.0.36.14/arch/arm/Kconfig
+--- linux-2.6.29.4/arch/arm/Kconfig 2009-03-24 14:18:08.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/arm/Kconfig 2009-03-24 14:48:16.000000000 +0100
@@ -1333,6 +1333,8 @@ source "fs/Kconfig"
source "arch/arm/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.29.2/arch/arm/kernel/calls.S linux-2.6.29.2-vs2.3.0.36.12/arch/arm/kernel/calls.S
---- linux-2.6.29.2/arch/arm/kernel/calls.S 2009-03-24 14:18:09.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/arm/kernel/calls.S 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/arm/kernel/calls.S linux-2.6.29.4-vs2.3.0.36.14/arch/arm/kernel/calls.S
+--- linux-2.6.29.4/arch/arm/kernel/calls.S 2009-03-24 14:18:09.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/arm/kernel/calls.S 2009-02-22 22:54:24.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.29.2/arch/arm/kernel/process.c linux-2.6.29.2-vs2.3.0.36.12/arch/arm/kernel/process.c
---- linux-2.6.29.2/arch/arm/kernel/process.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/arm/kernel/process.c 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/arm/kernel/process.c linux-2.6.29.4-vs2.3.0.36.14/arch/arm/kernel/process.c
+--- linux-2.6.29.4/arch/arm/kernel/process.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/arm/kernel/process.c 2009-02-22 22:54:24.000000000 +0100
@@ -262,7 +262,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.29.2/arch/arm/kernel/traps.c linux-2.6.29.2-vs2.3.0.36.12/arch/arm/kernel/traps.c
---- linux-2.6.29.2/arch/arm/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/arm/kernel/traps.c 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/arm/kernel/traps.c linux-2.6.29.4-vs2.3.0.36.14/arch/arm/kernel/traps.c
+--- linux-2.6.29.4/arch/arm/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/arm/kernel/traps.c 2009-02-22 22:54:24.000000000 +0100
@@ -214,8 +214,8 @@ static void __die(const char *str, int e
str, err, ++die_counter);
print_modules();
if (!user_mode(regs) || in_interrupt()) {
dump_mem("Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-2.6.29.2/arch/arm/mm/fault.c linux-2.6.29.2-vs2.3.0.36.12/arch/arm/mm/fault.c
---- linux-2.6.29.2/arch/arm/mm/fault.c 2009-03-24 14:18:17.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/arm/mm/fault.c 2009-03-24 14:48:17.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/arm/mm/fault.c linux-2.6.29.4-vs2.3.0.36.14/arch/arm/mm/fault.c
+--- linux-2.6.29.4/arch/arm/mm/fault.c 2009-03-24 14:18:17.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/arm/mm/fault.c 2009-03-24 14:48:17.000000000 +0100
@@ -294,7 +294,8 @@ do_page_fault(unsigned long addr, unsign
* happened to us that made us unable to handle
* the page fault gracefully.
do_group_exit(SIGKILL);
return 0;
}
-diff -NurpP --minimal linux-2.6.29.2/arch/cris/Kconfig linux-2.6.29.2-vs2.3.0.36.12/arch/cris/Kconfig
---- linux-2.6.29.2/arch/cris/Kconfig 2009-03-24 14:18:23.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/cris/Kconfig 2009-03-24 14:48:19.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/cris/Kconfig linux-2.6.29.4-vs2.3.0.36.14/arch/cris/Kconfig
+--- linux-2.6.29.4/arch/cris/Kconfig 2009-03-24 14:18:23.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/cris/Kconfig 2009-03-24 14:48:19.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.29.2/arch/frv/kernel/kernel_thread.S linux-2.6.29.2-vs2.3.0.36.12/arch/frv/kernel/kernel_thread.S
---- linux-2.6.29.2/arch/frv/kernel/kernel_thread.S 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/frv/kernel/kernel_thread.S 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/frv/kernel/kernel_thread.S linux-2.6.29.4-vs2.3.0.36.14/arch/frv/kernel/kernel_thread.S
+--- linux-2.6.29.4/arch/frv/kernel/kernel_thread.S 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/frv/kernel/kernel_thread.S 2009-02-22 22:54:24.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.29.2/arch/h8300/Kconfig linux-2.6.29.2-vs2.3.0.36.12/arch/h8300/Kconfig
---- linux-2.6.29.2/arch/h8300/Kconfig 2009-03-24 14:18:24.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/h8300/Kconfig 2009-03-24 14:48:19.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/h8300/Kconfig linux-2.6.29.4-vs2.3.0.36.14/arch/h8300/Kconfig
+--- linux-2.6.29.4/arch/h8300/Kconfig 2009-03-24 14:18:24.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/h8300/Kconfig 2009-03-24 14:48:19.000000000 +0100
@@ -226,6 +226,8 @@ source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.29.2/arch/ia64/ia32/ia32_entry.S linux-2.6.29.2-vs2.3.0.36.12/arch/ia64/ia32/ia32_entry.S
---- linux-2.6.29.2/arch/ia64/ia32/ia32_entry.S 2009-03-24 14:18:24.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/ia64/ia32/ia32_entry.S 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/ia64/ia32/ia32_entry.S linux-2.6.29.4-vs2.3.0.36.14/arch/ia64/ia32/ia32_entry.S
+--- linux-2.6.29.4/arch/ia64/ia32/ia32_entry.S 2009-03-24 14:18:24.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/ia64/ia32/ia32_entry.S 2009-02-22 22:54:24.000000000 +0100
@@ -451,7 +451,7 @@ ia32_syscall_table:
data8 sys_tgkill /* 270 */
data8 compat_sys_utimes
data8 sys_ni_syscall
data8 sys_ni_syscall /* 275 */
data8 sys_ni_syscall
-diff -NurpP --minimal linux-2.6.29.2/arch/ia64/Kconfig linux-2.6.29.2-vs2.3.0.36.12/arch/ia64/Kconfig
---- linux-2.6.29.2/arch/ia64/Kconfig 2009-03-24 14:18:24.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/ia64/Kconfig 2009-03-24 14:48:19.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/ia64/Kconfig linux-2.6.29.4-vs2.3.0.36.14/arch/ia64/Kconfig
+--- linux-2.6.29.4/arch/ia64/Kconfig 2009-03-24 14:18:24.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/ia64/Kconfig 2009-03-24 14:48:19.000000000 +0100
@@ -672,6 +672,8 @@ source "fs/Kconfig"
source "arch/ia64/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.29.2/arch/ia64/kernel/entry.S linux-2.6.29.2-vs2.3.0.36.12/arch/ia64/kernel/entry.S
---- linux-2.6.29.2/arch/ia64/kernel/entry.S 2009-03-24 14:18:25.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/ia64/kernel/entry.S 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/ia64/kernel/entry.S linux-2.6.29.4-vs2.3.0.36.14/arch/ia64/kernel/entry.S
+--- linux-2.6.29.4/arch/ia64/kernel/entry.S 2009-03-24 14:18:25.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/ia64/kernel/entry.S 2009-02-22 22:54:24.000000000 +0100
@@ -1653,7 +1653,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.29.2/arch/ia64/kernel/perfmon.c linux-2.6.29.2-vs2.3.0.36.12/arch/ia64/kernel/perfmon.c
---- linux-2.6.29.2/arch/ia64/kernel/perfmon.c 2009-03-24 14:18:25.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/ia64/kernel/perfmon.c 2009-03-24 14:48:19.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/ia64/kernel/perfmon.c linux-2.6.29.4-vs2.3.0.36.14/arch/ia64/kernel/perfmon.c
+--- linux-2.6.29.4/arch/ia64/kernel/perfmon.c 2009-03-24 14:18:25.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/ia64/kernel/perfmon.c 2009-03-24 14:48:19.000000000 +0100
@@ -41,6 +41,7 @@
#include <linux/rcupdate.h>
#include <linux/completion.h>
vm_stat_account(vma->vm_mm, vma->vm_flags, vma->vm_file,
vma_pages(vma));
up_write(&task->mm->mmap_sem);
-diff -NurpP --minimal linux-2.6.29.2/arch/ia64/kernel/process.c linux-2.6.29.2-vs2.3.0.36.12/arch/ia64/kernel/process.c
---- linux-2.6.29.2/arch/ia64/kernel/process.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/ia64/kernel/process.c 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/ia64/kernel/process.c linux-2.6.29.4-vs2.3.0.36.14/arch/ia64/kernel/process.c
+--- linux-2.6.29.4/arch/ia64/kernel/process.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/ia64/kernel/process.c 2009-02-22 22:54:24.000000000 +0100
@@ -110,8 +110,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.29.2/arch/ia64/kernel/ptrace.c linux-2.6.29.2-vs2.3.0.36.12/arch/ia64/kernel/ptrace.c
---- linux-2.6.29.2/arch/ia64/kernel/ptrace.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/ia64/kernel/ptrace.c 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/ia64/kernel/ptrace.c linux-2.6.29.4-vs2.3.0.36.14/arch/ia64/kernel/ptrace.c
+--- linux-2.6.29.4/arch/ia64/kernel/ptrace.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/ia64/kernel/ptrace.c 2009-02-22 22:54:24.000000000 +0100
@@ -23,6 +23,7 @@
#include <linux/regset.h>
#include <linux/elf.h>
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.29.2/arch/ia64/kernel/traps.c linux-2.6.29.2-vs2.3.0.36.12/arch/ia64/kernel/traps.c
---- linux-2.6.29.2/arch/ia64/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/ia64/kernel/traps.c 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/ia64/kernel/traps.c linux-2.6.29.4-vs2.3.0.36.14/arch/ia64/kernel/traps.c
+--- linux-2.6.29.4/arch/ia64/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/ia64/kernel/traps.c 2009-02-22 22:54:24.000000000 +0100
@@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re
put_cpu();
}
}
}
-diff -NurpP --minimal linux-2.6.29.2/arch/ia64/mm/fault.c linux-2.6.29.2-vs2.3.0.36.12/arch/ia64/mm/fault.c
---- linux-2.6.29.2/arch/ia64/mm/fault.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/ia64/mm/fault.c 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/ia64/mm/fault.c linux-2.6.29.4-vs2.3.0.36.14/arch/ia64/mm/fault.c
+--- linux-2.6.29.4/arch/ia64/mm/fault.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/ia64/mm/fault.c 2009-02-22 22:54:24.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.29.2/arch/m32r/kernel/traps.c linux-2.6.29.2-vs2.3.0.36.12/arch/m32r/kernel/traps.c
---- linux-2.6.29.2/arch/m32r/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/m32r/kernel/traps.c 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/m32r/kernel/traps.c linux-2.6.29.4-vs2.3.0.36.14/arch/m32r/kernel/traps.c
+--- linux-2.6.29.4/arch/m32r/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/m32r/kernel/traps.c 2009-02-22 22:54:24.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.29.2/arch/m68k/Kconfig linux-2.6.29.2-vs2.3.0.36.12/arch/m68k/Kconfig
---- linux-2.6.29.2/arch/m68k/Kconfig 2009-03-24 14:18:26.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/m68k/Kconfig 2009-03-24 14:48:20.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/m68k/Kconfig linux-2.6.29.4-vs2.3.0.36.14/arch/m68k/Kconfig
+--- linux-2.6.29.4/arch/m68k/Kconfig 2009-03-24 14:18:26.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/m68k/Kconfig 2009-03-24 14:48:20.000000000 +0100
@@ -616,6 +616,8 @@ source "fs/Kconfig"
source "arch/m68k/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.29.2/arch/m68k/kernel/ptrace.c linux-2.6.29.2-vs2.3.0.36.12/arch/m68k/kernel/ptrace.c
---- linux-2.6.29.2/arch/m68k/kernel/ptrace.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/m68k/kernel/ptrace.c 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/m68k/kernel/ptrace.c linux-2.6.29.4-vs2.3.0.36.14/arch/m68k/kernel/ptrace.c
+--- linux-2.6.29.4/arch/m68k/kernel/ptrace.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/m68k/kernel/ptrace.c 2009-02-22 22:54:24.000000000 +0100
@@ -18,6 +18,7 @@
#include <linux/ptrace.h>
#include <linux/user.h>
return ret;
out_eio:
-diff -NurpP --minimal linux-2.6.29.2/arch/m68k/kernel/traps.c linux-2.6.29.2-vs2.3.0.36.12/arch/m68k/kernel/traps.c
---- linux-2.6.29.2/arch/m68k/kernel/traps.c 2009-03-24 14:18:26.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/m68k/kernel/traps.c 2009-03-24 14:48:20.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/m68k/kernel/traps.c linux-2.6.29.4-vs2.3.0.36.14/arch/m68k/kernel/traps.c
+--- linux-2.6.29.4/arch/m68k/kernel/traps.c 2009-03-24 14:18:26.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/m68k/kernel/traps.c 2009-03-24 14:48:20.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.29.2/arch/m68knommu/Kconfig linux-2.6.29.2-vs2.3.0.36.12/arch/m68knommu/Kconfig
---- linux-2.6.29.2/arch/m68knommu/Kconfig 2009-03-24 14:18:27.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/m68knommu/Kconfig 2009-03-24 14:48:20.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/m68knommu/Kconfig linux-2.6.29.4-vs2.3.0.36.14/arch/m68knommu/Kconfig
+--- linux-2.6.29.4/arch/m68knommu/Kconfig 2009-03-24 14:18:27.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/m68knommu/Kconfig 2009-03-24 14:48:20.000000000 +0100
@@ -720,6 +720,8 @@ source "fs/Kconfig"
source "arch/m68knommu/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.29.2/arch/m68knommu/kernel/traps.c linux-2.6.29.2-vs2.3.0.36.12/arch/m68knommu/kernel/traps.c
---- linux-2.6.29.2/arch/m68knommu/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/m68knommu/kernel/traps.c 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/m68knommu/kernel/traps.c linux-2.6.29.4-vs2.3.0.36.14/arch/m68knommu/kernel/traps.c
+--- linux-2.6.29.4/arch/m68knommu/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/m68knommu/kernel/traps.c 2009-02-22 22:54:24.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.29.2/arch/mips/Kconfig linux-2.6.29.2-vs2.3.0.36.12/arch/mips/Kconfig
---- linux-2.6.29.2/arch/mips/Kconfig 2009-03-24 14:18:29.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/mips/Kconfig 2009-03-24 14:48:21.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/mips/Kconfig linux-2.6.29.4-vs2.3.0.36.14/arch/mips/Kconfig
+--- linux-2.6.29.4/arch/mips/Kconfig 2009-03-24 14:18:29.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/mips/Kconfig 2009-03-24 14:48:21.000000000 +0100
@@ -2142,6 +2142,8 @@ source "fs/Kconfig"
source "arch/mips/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.29.2/arch/mips/kernel/ptrace.c linux-2.6.29.2-vs2.3.0.36.12/arch/mips/kernel/ptrace.c
---- linux-2.6.29.2/arch/mips/kernel/ptrace.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/mips/kernel/ptrace.c 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/mips/kernel/ptrace.c linux-2.6.29.4-vs2.3.0.36.14/arch/mips/kernel/ptrace.c
+--- linux-2.6.29.4/arch/mips/kernel/ptrace.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/mips/kernel/ptrace.c 2009-02-22 22:54:24.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.29.2/arch/mips/kernel/scall32-o32.S linux-2.6.29.2-vs2.3.0.36.12/arch/mips/kernel/scall32-o32.S
---- linux-2.6.29.2/arch/mips/kernel/scall32-o32.S 2009-03-24 14:18:31.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/mips/kernel/scall32-o32.S 2009-03-24 14:48:21.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/mips/kernel/scall32-o32.S linux-2.6.29.4-vs2.3.0.36.14/arch/mips/kernel/scall32-o32.S
+--- linux-2.6.29.4/arch/mips/kernel/scall32-o32.S 2009-03-24 14:18:31.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/mips/kernel/scall32-o32.S 2009-03-24 14:48:21.000000000 +0100
@@ -597,7 +597,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.29.2/arch/mips/kernel/scall64-64.S linux-2.6.29.2-vs2.3.0.36.12/arch/mips/kernel/scall64-64.S
---- linux-2.6.29.2/arch/mips/kernel/scall64-64.S 2009-03-24 14:18:31.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/mips/kernel/scall64-64.S 2009-03-24 14:48:21.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/mips/kernel/scall64-64.S linux-2.6.29.4-vs2.3.0.36.14/arch/mips/kernel/scall64-64.S
+--- linux-2.6.29.4/arch/mips/kernel/scall64-64.S 2009-03-24 14:18:31.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/mips/kernel/scall64-64.S 2009-03-24 14:48:21.000000000 +0100
@@ -434,7 +434,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.29.2/arch/mips/kernel/scall64-n32.S linux-2.6.29.2-vs2.3.0.36.12/arch/mips/kernel/scall64-n32.S
---- linux-2.6.29.2/arch/mips/kernel/scall64-n32.S 2009-03-24 14:18:31.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/mips/kernel/scall64-n32.S 2009-03-24 14:48:21.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/mips/kernel/scall64-n32.S linux-2.6.29.4-vs2.3.0.36.14/arch/mips/kernel/scall64-n32.S
+--- linux-2.6.29.4/arch/mips/kernel/scall64-n32.S 2009-03-24 14:18:31.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/mips/kernel/scall64-n32.S 2009-03-24 14:48:21.000000000 +0100
@@ -360,7 +360,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.29.2/arch/mips/kernel/scall64-o32.S linux-2.6.29.2-vs2.3.0.36.12/arch/mips/kernel/scall64-o32.S
---- linux-2.6.29.2/arch/mips/kernel/scall64-o32.S 2009-03-24 14:18:31.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/mips/kernel/scall64-o32.S 2009-03-24 14:59:48.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/mips/kernel/scall64-o32.S linux-2.6.29.4-vs2.3.0.36.14/arch/mips/kernel/scall64-o32.S
+--- linux-2.6.29.4/arch/mips/kernel/scall64-o32.S 2009-03-24 14:18:31.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/mips/kernel/scall64-o32.S 2009-03-24 14:59:48.000000000 +0100
@@ -480,7 +480,7 @@ sys_call_table:
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify /* 4275 */
PTR sys_32_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-diff -NurpP --minimal linux-2.6.29.2/arch/mips/kernel/traps.c linux-2.6.29.2-vs2.3.0.36.12/arch/mips/kernel/traps.c
---- linux-2.6.29.2/arch/mips/kernel/traps.c 2009-03-24 14:18:31.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/mips/kernel/traps.c 2009-03-24 14:48:21.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/mips/kernel/traps.c linux-2.6.29.4-vs2.3.0.36.14/arch/mips/kernel/traps.c
+--- linux-2.6.29.4/arch/mips/kernel/traps.c 2009-03-24 14:18:31.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/mips/kernel/traps.c 2009-03-24 14:48:21.000000000 +0100
@@ -335,9 +335,10 @@ void show_registers(const struct pt_regs
__show_regs(regs);
if (cpu_has_userlocal) {
unsigned long tls;
-diff -NurpP --minimal linux-2.6.29.2/arch/parisc/Kconfig linux-2.6.29.2-vs2.3.0.36.12/arch/parisc/Kconfig
---- linux-2.6.29.2/arch/parisc/Kconfig 2009-03-24 14:18:32.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/parisc/Kconfig 2009-03-24 14:48:21.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/parisc/Kconfig linux-2.6.29.4-vs2.3.0.36.14/arch/parisc/Kconfig
+--- linux-2.6.29.4/arch/parisc/Kconfig 2009-03-24 14:18:32.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/parisc/Kconfig 2009-03-24 14:48:21.000000000 +0100
@@ -281,6 +281,8 @@ source "fs/Kconfig"
source "arch/parisc/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.29.2/arch/parisc/kernel/syscall_table.S linux-2.6.29.2-vs2.3.0.36.12/arch/parisc/kernel/syscall_table.S
---- linux-2.6.29.2/arch/parisc/kernel/syscall_table.S 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/parisc/kernel/syscall_table.S 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/parisc/kernel/syscall_table.S linux-2.6.29.4-vs2.3.0.36.14/arch/parisc/kernel/syscall_table.S
+--- linux-2.6.29.4/arch/parisc/kernel/syscall_table.S 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/parisc/kernel/syscall_table.S 2009-02-22 22:54:24.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.29.2/arch/parisc/kernel/traps.c linux-2.6.29.2-vs2.3.0.36.12/arch/parisc/kernel/traps.c
---- linux-2.6.29.2/arch/parisc/kernel/traps.c 2009-03-24 14:18:32.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/parisc/kernel/traps.c 2009-03-24 14:48:21.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/parisc/kernel/traps.c linux-2.6.29.4-vs2.3.0.36.14/arch/parisc/kernel/traps.c
+--- linux-2.6.29.4/arch/parisc/kernel/traps.c 2009-03-24 14:18:32.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/parisc/kernel/traps.c 2009-03-24 14:48:21.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.29.2/arch/parisc/mm/fault.c linux-2.6.29.2-vs2.3.0.36.12/arch/parisc/mm/fault.c
---- linux-2.6.29.2/arch/parisc/mm/fault.c 2009-03-24 14:18:33.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/parisc/mm/fault.c 2009-03-24 14:48:21.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/parisc/mm/fault.c linux-2.6.29.4-vs2.3.0.36.14/arch/parisc/mm/fault.c
+--- linux-2.6.29.4/arch/parisc/mm/fault.c 2009-03-24 14:18:33.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/parisc/mm/fault.c 2009-03-24 14:48:21.000000000 +0100
@@ -238,8 +238,9 @@ bad_area:
#ifdef PRINT_USER_FAULTS
if (user_mode(regs))
do_group_exit(SIGKILL);
goto no_context;
-diff -NurpP --minimal linux-2.6.29.2/arch/powerpc/Kconfig linux-2.6.29.2-vs2.3.0.36.12/arch/powerpc/Kconfig
---- linux-2.6.29.2/arch/powerpc/Kconfig 2009-03-24 14:18:33.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/powerpc/Kconfig 2009-03-24 14:48:22.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/powerpc/Kconfig linux-2.6.29.4-vs2.3.0.36.14/arch/powerpc/Kconfig
+--- linux-2.6.29.4/arch/powerpc/Kconfig 2009-03-24 14:18:33.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/powerpc/Kconfig 2009-03-24 14:48:22.000000000 +0100
@@ -882,6 +882,8 @@ source "lib/Kconfig"
source "arch/powerpc/Kconfig.debug"
source "security/Kconfig"
config KEYS_COMPAT
-diff -NurpP --minimal linux-2.6.29.2/arch/powerpc/kernel/irq.c linux-2.6.29.2-vs2.3.0.36.12/arch/powerpc/kernel/irq.c
---- linux-2.6.29.2/arch/powerpc/kernel/irq.c 2009-03-24 14:18:35.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/powerpc/kernel/irq.c 2009-03-24 14:48:22.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/powerpc/kernel/irq.c linux-2.6.29.4-vs2.3.0.36.14/arch/powerpc/kernel/irq.c
+--- linux-2.6.29.4/arch/powerpc/kernel/irq.c 2009-03-24 14:18:35.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/powerpc/kernel/irq.c 2009-03-24 14:48:22.000000000 +0100
@@ -53,6 +53,7 @@
#include <linux/bootmem.h>
#include <linux/pci.h>
#include <asm/uaccess.h>
#include <asm/system.h>
-diff -NurpP --minimal linux-2.6.29.2/arch/powerpc/kernel/process.c linux-2.6.29.2-vs2.3.0.36.12/arch/powerpc/kernel/process.c
---- linux-2.6.29.2/arch/powerpc/kernel/process.c 2009-03-24 14:18:35.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/powerpc/kernel/process.c 2009-03-24 14:48:22.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/powerpc/kernel/process.c linux-2.6.29.4-vs2.3.0.36.14/arch/powerpc/kernel/process.c
+--- linux-2.6.29.4/arch/powerpc/kernel/process.c 2009-03-24 14:18:35.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/powerpc/kernel/process.c 2009-03-24 14:48:22.000000000 +0100
@@ -516,8 +516,9 @@ void show_regs(struct pt_regs * regs)
#else
printk("DAR: "REG", DSISR: "REG"\n", regs->dar, regs->dsisr);
#ifdef CONFIG_SMP
printk(" CPU: %d", raw_smp_processor_id());
-diff -NurpP --minimal linux-2.6.29.2/arch/powerpc/kernel/traps.c linux-2.6.29.2-vs2.3.0.36.12/arch/powerpc/kernel/traps.c
---- linux-2.6.29.2/arch/powerpc/kernel/traps.c 2009-03-24 14:18:35.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/powerpc/kernel/traps.c 2009-03-24 14:48:22.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/powerpc/kernel/traps.c linux-2.6.29.4-vs2.3.0.36.14/arch/powerpc/kernel/traps.c
+--- linux-2.6.29.4/arch/powerpc/kernel/traps.c 2009-03-24 14:18:35.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/powerpc/kernel/traps.c 2009-03-24 14:48:22.000000000 +0100
@@ -940,8 +940,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.29.2/arch/powerpc/kernel/vdso.c linux-2.6.29.2-vs2.3.0.36.12/arch/powerpc/kernel/vdso.c
---- linux-2.6.29.2/arch/powerpc/kernel/vdso.c 2009-03-24 14:18:35.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/powerpc/kernel/vdso.c 2009-03-24 14:48:22.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/powerpc/kernel/vdso.c linux-2.6.29.4-vs2.3.0.36.14/arch/powerpc/kernel/vdso.c
+--- linux-2.6.29.4/arch/powerpc/kernel/vdso.c 2009-03-24 14:18:35.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/powerpc/kernel/vdso.c 2009-03-24 14:48:22.000000000 +0100
@@ -22,6 +22,7 @@
#include <linux/security.h>
#include <linux/bootmem.h>
#include <asm/pgtable.h>
#include <asm/system.h>
-diff -NurpP --minimal linux-2.6.29.2/arch/powerpc/mm/fault.c linux-2.6.29.2-vs2.3.0.36.12/arch/powerpc/mm/fault.c
---- linux-2.6.29.2/arch/powerpc/mm/fault.c 2009-03-24 14:18:36.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/powerpc/mm/fault.c 2009-03-24 14:48:22.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/powerpc/mm/fault.c linux-2.6.29.4-vs2.3.0.36.14/arch/powerpc/mm/fault.c
+--- linux-2.6.29.4/arch/powerpc/mm/fault.c 2009-03-24 14:18:36.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/powerpc/mm/fault.c 2009-03-24 14:48:22.000000000 +0100
@@ -362,7 +362,8 @@ out_of_memory:
down_read(&mm->mmap_sem);
goto survive;
if (user_mode(regs))
do_group_exit(SIGKILL);
return SIGKILL;
-diff -NurpP --minimal linux-2.6.29.2/arch/s390/Kconfig linux-2.6.29.2-vs2.3.0.36.12/arch/s390/Kconfig
---- linux-2.6.29.2/arch/s390/Kconfig 2009-03-24 14:18:38.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/s390/Kconfig 2009-03-24 14:48:22.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/s390/Kconfig linux-2.6.29.4-vs2.3.0.36.14/arch/s390/Kconfig
+--- linux-2.6.29.4/arch/s390/Kconfig 2009-03-24 14:18:38.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/s390/Kconfig 2009-03-24 14:48:22.000000000 +0100
@@ -586,6 +586,8 @@ source "fs/Kconfig"
source "arch/s390/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.29.2/arch/s390/kernel/ptrace.c linux-2.6.29.2-vs2.3.0.36.12/arch/s390/kernel/ptrace.c
---- linux-2.6.29.2/arch/s390/kernel/ptrace.c 2009-03-24 14:18:40.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/s390/kernel/ptrace.c 2009-03-24 14:48:22.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/s390/kernel/ptrace.c linux-2.6.29.4-vs2.3.0.36.14/arch/s390/kernel/ptrace.c
+--- linux-2.6.29.4/arch/s390/kernel/ptrace.c 2009-03-24 14:18:40.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/s390/kernel/ptrace.c 2009-03-24 14:48:22.000000000 +0100
@@ -36,6 +36,7 @@
#include <linux/elf.h>
#include <linux/regset.h>
#include <asm/segment.h>
#include <asm/page.h>
-diff -NurpP --minimal linux-2.6.29.2/arch/s390/kernel/syscalls.S linux-2.6.29.2-vs2.3.0.36.12/arch/s390/kernel/syscalls.S
---- linux-2.6.29.2/arch/s390/kernel/syscalls.S 2009-03-24 14:18:40.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/s390/kernel/syscalls.S 2009-03-24 14:48:22.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/s390/kernel/syscalls.S linux-2.6.29.4-vs2.3.0.36.14/arch/s390/kernel/syscalls.S
+--- linux-2.6.29.4/arch/s390/kernel/syscalls.S 2009-03-24 14:18:40.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/s390/kernel/syscalls.S 2009-03-24 14:48:22.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.29.2/arch/s390/mm/fault.c linux-2.6.29.2-vs2.3.0.36.12/arch/s390/mm/fault.c
---- linux-2.6.29.2/arch/s390/mm/fault.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/s390/mm/fault.c 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/s390/mm/fault.c linux-2.6.29.4-vs2.3.0.36.14/arch/s390/mm/fault.c
+--- linux-2.6.29.4/arch/s390/mm/fault.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/s390/mm/fault.c 2009-02-22 22:54:24.000000000 +0100
@@ -216,7 +216,8 @@ static int do_out_of_memory(struct pt_re
down_read(&mm->mmap_sem);
return 1;
if (regs->psw.mask & PSW_MASK_PSTATE)
do_group_exit(SIGKILL);
do_no_context(regs, error_code, address);
-diff -NurpP --minimal linux-2.6.29.2/arch/sh/Kconfig linux-2.6.29.2-vs2.3.0.36.12/arch/sh/Kconfig
---- linux-2.6.29.2/arch/sh/Kconfig 2009-03-24 14:18:40.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/sh/Kconfig 2009-03-24 14:48:22.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/sh/Kconfig linux-2.6.29.4-vs2.3.0.36.14/arch/sh/Kconfig
+--- linux-2.6.29.4/arch/sh/Kconfig 2009-03-24 14:18:40.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/sh/Kconfig 2009-03-24 14:48:22.000000000 +0100
@@ -694,6 +694,8 @@ source "fs/Kconfig"
source "arch/sh/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.29.2/arch/sh/kernel/irq.c linux-2.6.29.2-vs2.3.0.36.12/arch/sh/kernel/irq.c
---- linux-2.6.29.2/arch/sh/kernel/irq.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/sh/kernel/irq.c 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/sh/kernel/irq.c linux-2.6.29.4-vs2.3.0.36.14/arch/sh/kernel/irq.c
+--- linux-2.6.29.4/arch/sh/kernel/irq.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/sh/kernel/irq.c 2009-02-22 22:54:24.000000000 +0100
@@ -11,6 +11,7 @@
#include <linux/module.h>
#include <linux/kernel_stat.h>
#include <asm/processor.h>
#include <asm/machvec.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.29.2/arch/sh/kernel/vsyscall/vsyscall.c linux-2.6.29.2-vs2.3.0.36.12/arch/sh/kernel/vsyscall/vsyscall.c
---- linux-2.6.29.2/arch/sh/kernel/vsyscall/vsyscall.c 2009-03-24 14:18:42.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/sh/kernel/vsyscall/vsyscall.c 2009-03-24 14:48:22.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/sh/kernel/vsyscall/vsyscall.c linux-2.6.29.4-vs2.3.0.36.14/arch/sh/kernel/vsyscall/vsyscall.c
+--- linux-2.6.29.4/arch/sh/kernel/vsyscall/vsyscall.c 2009-03-24 14:18:42.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/sh/kernel/vsyscall/vsyscall.c 2009-03-24 14:48:22.000000000 +0100
@@ -19,6 +19,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.29.2/arch/sparc/include/asm/tlb_64.h linux-2.6.29.2-vs2.3.0.36.12/arch/sparc/include/asm/tlb_64.h
---- linux-2.6.29.2/arch/sparc/include/asm/tlb_64.h 2009-04-30 10:50:33.000000000 +0200
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/sparc/include/asm/tlb_64.h 2009-04-30 12:14:53.000000000 +0200
+diff -NurpP --minimal linux-2.6.29.4/arch/sparc/include/asm/tlb_64.h linux-2.6.29.4-vs2.3.0.36.14/arch/sparc/include/asm/tlb_64.h
+--- linux-2.6.29.4/arch/sparc/include/asm/tlb_64.h 2009-05-23 23:16:50.000000000 +0200
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/sparc/include/asm/tlb_64.h 2009-04-30 12:14:53.000000000 +0200
@@ -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.29.2/arch/sparc/include/asm/unistd.h linux-2.6.29.2-vs2.3.0.36.12/arch/sparc/include/asm/unistd.h
---- linux-2.6.29.2/arch/sparc/include/asm/unistd.h 2009-03-24 14:18:44.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/sparc/include/asm/unistd.h 2009-04-08 15:52:53.000000000 +0200
+diff -NurpP --minimal linux-2.6.29.4/arch/sparc/include/asm/unistd.h linux-2.6.29.4-vs2.3.0.36.14/arch/sparc/include/asm/unistd.h
+--- linux-2.6.29.4/arch/sparc/include/asm/unistd.h 2009-03-24 14:18:44.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/sparc/include/asm/unistd.h 2009-04-08 15:52:53.000000000 +0200
@@ -335,7 +335,7 @@
#define __NR_timer_getoverrun 264
#define __NR_timer_delete 265
#define __NR_io_setup 268
#define __NR_io_destroy 269
#define __NR_io_submit 270
-diff -NurpP --minimal linux-2.6.29.2/arch/sparc/Kconfig linux-2.6.29.2-vs2.3.0.36.12/arch/sparc/Kconfig
---- linux-2.6.29.2/arch/sparc/Kconfig 2009-03-24 14:18:43.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/sparc/Kconfig 2009-03-24 14:48:22.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/sparc/Kconfig linux-2.6.29.4-vs2.3.0.36.14/arch/sparc/Kconfig
+--- linux-2.6.29.4/arch/sparc/Kconfig 2009-03-24 14:18:43.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/sparc/Kconfig 2009-03-24 14:48:22.000000000 +0100
@@ -522,6 +522,8 @@ source "fs/Kconfig"
source "arch/sparc/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.29.2/arch/sparc/kernel/systbls_32.S linux-2.6.29.2-vs2.3.0.36.12/arch/sparc/kernel/systbls_32.S
---- linux-2.6.29.2/arch/sparc/kernel/systbls_32.S 2009-03-24 14:18:45.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/sparc/kernel/systbls_32.S 2009-04-08 15:57:59.000000000 +0200
+diff -NurpP --minimal linux-2.6.29.4/arch/sparc/kernel/systbls_32.S linux-2.6.29.4-vs2.3.0.36.14/arch/sparc/kernel/systbls_32.S
+--- linux-2.6.29.4/arch/sparc/kernel/systbls_32.S 2009-03-24 14:18:45.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/sparc/kernel/systbls_32.S 2009-04-08 15:57:59.000000000 +0200
@@ -70,7 +70,7 @@ sys_call_table:
/*250*/ .long sparc_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.29.2/arch/sparc/kernel/systbls_64.S linux-2.6.29.2-vs2.3.0.36.12/arch/sparc/kernel/systbls_64.S
---- linux-2.6.29.2/arch/sparc/kernel/systbls_64.S 2009-03-24 14:18:45.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/sparc/kernel/systbls_64.S 2009-04-08 15:56:23.000000000 +0200
+diff -NurpP --minimal linux-2.6.29.4/arch/sparc/kernel/systbls_64.S linux-2.6.29.4-vs2.3.0.36.14/arch/sparc/kernel/systbls_64.S
+--- linux-2.6.29.4/arch/sparc/kernel/systbls_64.S 2009-03-24 14:18:45.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/sparc/kernel/systbls_64.S 2009-04-08 15:56:23.000000000 +0200
@@ -71,7 +71,7 @@ sys_call_table32:
/*250*/ .word sys32_mremap, sys32_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.29.2/arch/x86/ia32/ia32entry.S linux-2.6.29.2-vs2.3.0.36.12/arch/x86/ia32/ia32entry.S
---- linux-2.6.29.2/arch/x86/ia32/ia32entry.S 2009-03-24 14:18:48.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/x86/ia32/ia32entry.S 2009-03-22 23:29:11.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/x86/ia32/ia32entry.S linux-2.6.29.4-vs2.3.0.36.14/arch/x86/ia32/ia32entry.S
+--- linux-2.6.29.4/arch/x86/ia32/ia32entry.S 2009-03-24 14:18:48.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/x86/ia32/ia32entry.S 2009-03-22 23:29:11.000000000 +0100
@@ -768,7 +768,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.29.2/arch/x86/include/asm/unistd_64.h linux-2.6.29.2-vs2.3.0.36.12/arch/x86/include/asm/unistd_64.h
---- linux-2.6.29.2/arch/x86/include/asm/unistd_64.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/x86/include/asm/unistd_64.h 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/x86/include/asm/unistd_64.h linux-2.6.29.4-vs2.3.0.36.14/arch/x86/include/asm/unistd_64.h
+--- linux-2.6.29.4/arch/x86/include/asm/unistd_64.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/x86/include/asm/unistd_64.h 2009-02-22 22:54:24.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.29.2/arch/x86/Kconfig linux-2.6.29.2-vs2.3.0.36.12/arch/x86/Kconfig
---- linux-2.6.29.2/arch/x86/Kconfig 2009-03-24 14:18:47.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/x86/Kconfig 2009-03-24 14:48:23.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/x86/Kconfig linux-2.6.29.4-vs2.3.0.36.14/arch/x86/Kconfig
+--- linux-2.6.29.4/arch/x86/Kconfig 2009-03-24 14:18:47.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/x86/Kconfig 2009-03-24 14:48:23.000000000 +0100
@@ -1990,6 +1990,8 @@ source "fs/Kconfig"
source "arch/x86/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.29.2/arch/x86/kernel/syscall_table_32.S linux-2.6.29.2-vs2.3.0.36.12/arch/x86/kernel/syscall_table_32.S
---- linux-2.6.29.2/arch/x86/kernel/syscall_table_32.S 2009-03-24 14:18:51.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/arch/x86/kernel/syscall_table_32.S 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/arch/x86/kernel/syscall_table_32.S linux-2.6.29.4-vs2.3.0.36.14/arch/x86/kernel/syscall_table_32.S
+--- linux-2.6.29.4/arch/x86/kernel/syscall_table_32.S 2009-03-24 14:18:51.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/arch/x86/kernel/syscall_table_32.S 2009-02-22 22:54:24.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.29.2/Documentation/vserver/debug.txt linux-2.6.29.2-vs2.3.0.36.12/Documentation/vserver/debug.txt
---- linux-2.6.29.2/Documentation/vserver/debug.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/Documentation/vserver/debug.txt 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/Documentation/vserver/debug.txt linux-2.6.29.4-vs2.3.0.36.14/Documentation/vserver/debug.txt
+--- linux-2.6.29.4/Documentation/vserver/debug.txt 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/Documentation/vserver/debug.txt 2009-02-22 22:54:24.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.29.2/drivers/block/Kconfig linux-2.6.29.2-vs2.3.0.36.12/drivers/block/Kconfig
---- linux-2.6.29.2/drivers/block/Kconfig 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/drivers/block/Kconfig 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/drivers/block/Kconfig linux-2.6.29.4-vs2.3.0.36.14/drivers/block/Kconfig
+--- linux-2.6.29.4/drivers/block/Kconfig 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/drivers/block/Kconfig 2009-02-22 22:54:24.000000000 +0100
@@ -264,6 +264,13 @@ config BLK_DEV_CRYPTOLOOP
instead, which can be configured to be on-disk compatible with the
cryptoloop device.
config BLK_DEV_NBD
tristate "Network block device support"
depends on NET
-diff -NurpP --minimal linux-2.6.29.2/drivers/block/loop.c linux-2.6.29.2-vs2.3.0.36.12/drivers/block/loop.c
---- linux-2.6.29.2/drivers/block/loop.c 2009-03-24 14:18:56.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/drivers/block/loop.c 2009-03-24 15:09:29.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/drivers/block/loop.c linux-2.6.29.4-vs2.3.0.36.14/drivers/block/loop.c
+--- linux-2.6.29.4/drivers/block/loop.c 2009-03-24 14:18:56.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/drivers/block/loop.c 2009-03-24 15:09:29.000000000 +0100
@@ -75,6 +75,7 @@
#include <linux/gfp.h>
#include <linux/kthread.h>
mutex_lock(&lo->lo_ctl_mutex);
lo->lo_refcnt++;
mutex_unlock(&lo->lo_ctl_mutex);
-diff -NurpP --minimal linux-2.6.29.2/drivers/block/Makefile linux-2.6.29.2-vs2.3.0.36.12/drivers/block/Makefile
---- linux-2.6.29.2/drivers/block/Makefile 2009-03-24 14:18:55.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/drivers/block/Makefile 2009-03-24 14:48:25.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/drivers/block/Makefile linux-2.6.29.4-vs2.3.0.36.14/drivers/block/Makefile
+--- linux-2.6.29.4/drivers/block/Makefile 2009-03-24 14:18:55.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/drivers/block/Makefile 2009-03-24 14:48:25.000000000 +0100
@@ -31,5 +31,6 @@ obj-$(CONFIG_VIODASD) += viodasd.o
obj-$(CONFIG_BLK_DEV_SX8) += sx8.o
obj-$(CONFIG_BLK_DEV_UB) += ub.o
+obj-$(CONFIG_BLK_DEV_VROOT) += vroot.o
obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o
-diff -NurpP --minimal linux-2.6.29.2/drivers/block/vroot.c linux-2.6.29.2-vs2.3.0.36.12/drivers/block/vroot.c
---- linux-2.6.29.2/drivers/block/vroot.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/drivers/block/vroot.c 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/drivers/block/vroot.c linux-2.6.29.4-vs2.3.0.36.14/drivers/block/vroot.c
+--- linux-2.6.29.4/drivers/block/vroot.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/drivers/block/vroot.c 2009-02-22 22:54:24.000000000 +0100
@@ -0,0 +1,281 @@
+/*
+ * linux/drivers/block/vroot.c
+
+#endif
+
-diff -NurpP --minimal linux-2.6.29.2/drivers/char/sysrq.c linux-2.6.29.2-vs2.3.0.36.12/drivers/char/sysrq.c
---- linux-2.6.29.2/drivers/char/sysrq.c 2009-03-24 14:18:57.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/drivers/char/sysrq.c 2009-03-24 15:15:27.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/drivers/char/sysrq.c linux-2.6.29.4-vs2.3.0.36.14/drivers/char/sysrq.c
+--- linux-2.6.29.4/drivers/char/sysrq.c 2009-03-24 14:18:57.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/drivers/char/sysrq.c 2009-03-24 15:15:27.000000000 +0100
@@ -38,6 +38,7 @@
#include <linux/irq.h>
#include <linux/hrtimer.h>
else
retval = -1;
return retval;
-diff -NurpP --minimal linux-2.6.29.2/drivers/char/tty_io.c linux-2.6.29.2-vs2.3.0.36.12/drivers/char/tty_io.c
---- linux-2.6.29.2/drivers/char/tty_io.c 2009-03-24 14:18:57.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/drivers/char/tty_io.c 2009-03-24 14:48:25.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/drivers/char/tty_io.c linux-2.6.29.4-vs2.3.0.36.14/drivers/char/tty_io.c
+--- linux-2.6.29.4/drivers/char/tty_io.c 2009-03-24 14:18:57.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/drivers/char/tty_io.c 2009-03-24 14:48:25.000000000 +0100
@@ -106,6 +106,7 @@
#include <linux/kmod.h>
if (pgrp_nr < 0)
return -EINVAL;
rcu_read_lock();
-diff -NurpP --minimal linux-2.6.29.2/drivers/infiniband/hw/ipath/ipath_user_pages.c linux-2.6.29.2-vs2.3.0.36.12/drivers/infiniband/hw/ipath/ipath_user_pages.c
---- linux-2.6.29.2/drivers/infiniband/hw/ipath/ipath_user_pages.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/drivers/infiniband/hw/ipath/ipath_user_pages.c 2009-02-22 22:54:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/drivers/infiniband/hw/ipath/ipath_user_pages.c linux-2.6.29.4-vs2.3.0.36.14/drivers/infiniband/hw/ipath/ipath_user_pages.c
+--- linux-2.6.29.4/drivers/infiniband/hw/ipath/ipath_user_pages.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/drivers/infiniband/hw/ipath/ipath_user_pages.c 2009-02-22 22:54:24.000000000 +0100
@@ -33,6 +33,7 @@
#include <linux/mm.h>
up_write(&work->mm->mmap_sem);
mmput(work->mm);
kfree(work);
-diff -NurpP --minimal linux-2.6.29.2/drivers/md/dm.c linux-2.6.29.2-vs2.3.0.36.12/drivers/md/dm.c
---- linux-2.6.29.2/drivers/md/dm.c 2009-03-24 14:19:05.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/drivers/md/dm.c 2009-03-24 15:15:57.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/drivers/md/dm.c linux-2.6.29.4-vs2.3.0.36.14/drivers/md/dm.c
+--- linux-2.6.29.4/drivers/md/dm.c 2009-03-24 14:19:05.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/drivers/md/dm.c 2009-03-24 15:15:57.000000000 +0100
@@ -22,6 +22,7 @@
#include <linux/hdreg.h>
#include <linux/blktrace_api.h>
md->queue = blk_alloc_queue(GFP_KERNEL);
if (!md->queue)
goto bad_queue;
-diff -NurpP --minimal linux-2.6.29.2/drivers/md/dm.h linux-2.6.29.2-vs2.3.0.36.12/drivers/md/dm.h
---- linux-2.6.29.2/drivers/md/dm.h 2009-03-24 14:19:05.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/drivers/md/dm.h 2009-03-24 14:48:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/drivers/md/dm.h linux-2.6.29.4-vs2.3.0.36.14/drivers/md/dm.h
+--- linux-2.6.29.4/drivers/md/dm.h 2009-03-24 14:19:05.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/drivers/md/dm.h 2009-03-24 14:48:26.000000000 +0100
@@ -54,6 +54,8 @@ int dm_table_any_congested(struct dm_tab
#define dm_target_is_valid(t) ((t)->table)
int dm_table_barrier_ok(struct dm_table *t);
/*-----------------------------------------------------------------
* A registry of target types.
*---------------------------------------------------------------*/
-diff -NurpP --minimal linux-2.6.29.2/drivers/md/dm-ioctl.c linux-2.6.29.2-vs2.3.0.36.12/drivers/md/dm-ioctl.c
---- linux-2.6.29.2/drivers/md/dm-ioctl.c 2009-03-24 14:19:05.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/drivers/md/dm-ioctl.c 2009-03-24 14:48:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/drivers/md/dm-ioctl.c linux-2.6.29.4-vs2.3.0.36.14/drivers/md/dm-ioctl.c
+--- linux-2.6.29.4/drivers/md/dm-ioctl.c 2009-03-24 14:19:05.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/drivers/md/dm-ioctl.c 2009-03-24 14:48:26.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.29.2/drivers/net/tun.c linux-2.6.29.2-vs2.3.0.36.12/drivers/net/tun.c
---- linux-2.6.29.2/drivers/net/tun.c 2009-03-24 14:19:23.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/drivers/net/tun.c 2009-03-25 01:51:59.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/drivers/net/tun.c linux-2.6.29.4-vs2.3.0.36.14/drivers/net/tun.c
+--- linux-2.6.29.4/drivers/net/tun.c 2009-03-24 14:19:23.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/drivers/net/tun.c 2009-03-25 01:51:59.000000000 +0100
@@ -61,6 +61,7 @@
#include <linux/crc32.h>
#include <linux/nsproxy.h>
case TUNSETLINK:
/* Only allow setting the type when the interface is down */
rtnl_lock();
-diff -NurpP --minimal linux-2.6.29.2/fs/attr.c linux-2.6.29.2-vs2.3.0.36.12/fs/attr.c
---- linux-2.6.29.2/fs/attr.c 2009-03-24 14:22:24.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/attr.c 2009-03-24 14:48:34.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/attr.c linux-2.6.29.4-vs2.3.0.36.14/fs/attr.c
+--- linux-2.6.29.4/fs/attr.c 2009-03-24 14:22:24.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/attr.c 2009-03-24 14:48:34.000000000 +0100
@@ -14,6 +14,9 @@
#include <linux/fcntl.h>
#include <linux/quotaops.h>
error = DQUOT_TRANSFER(inode, attr) ? -EDQUOT : 0;
if (!error)
error = inode_setattr(inode, attr);
-diff -NurpP --minimal linux-2.6.29.2/fs/binfmt_aout.c linux-2.6.29.2-vs2.3.0.36.12/fs/binfmt_aout.c
---- linux-2.6.29.2/fs/binfmt_aout.c 2009-03-24 14:22:24.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/binfmt_aout.c 2009-03-24 14:48:34.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/binfmt_aout.c linux-2.6.29.4-vs2.3.0.36.14/fs/binfmt_aout.c
+--- linux-2.6.29.4/fs/binfmt_aout.c 2009-03-24 14:22:24.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/binfmt_aout.c 2009-03-24 14:48:34.000000000 +0100
@@ -24,6 +24,7 @@
#include <linux/binfmts.h>
#include <linux/personality.h>
#include <asm/system.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.29.2/fs/binfmt_elf.c linux-2.6.29.2-vs2.3.0.36.12/fs/binfmt_elf.c
---- linux-2.6.29.2/fs/binfmt_elf.c 2009-03-24 14:22:24.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/binfmt_elf.c 2009-03-24 14:48:34.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/binfmt_elf.c linux-2.6.29.4-vs2.3.0.36.14/fs/binfmt_elf.c
+--- linux-2.6.29.4/fs/binfmt_elf.c 2009-03-24 14:22:24.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/binfmt_elf.c 2009-03-24 14:48:34.000000000 +0100
@@ -38,6 +38,7 @@
#include <linux/random.h>
#include <linux/elf.h>
#include <asm/uaccess.h>
#include <asm/param.h>
#include <asm/page.h>
-diff -NurpP --minimal linux-2.6.29.2/fs/binfmt_flat.c linux-2.6.29.2-vs2.3.0.36.12/fs/binfmt_flat.c
---- linux-2.6.29.2/fs/binfmt_flat.c 2009-03-24 14:22:24.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/binfmt_flat.c 2009-03-24 14:48:34.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/binfmt_flat.c linux-2.6.29.4-vs2.3.0.36.14/fs/binfmt_flat.c
+--- linux-2.6.29.4/fs/binfmt_flat.c 2009-03-24 14:22:24.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/binfmt_flat.c 2009-03-24 14:48:34.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.29.2/fs/binfmt_som.c linux-2.6.29.2-vs2.3.0.36.12/fs/binfmt_som.c
---- linux-2.6.29.2/fs/binfmt_som.c 2009-03-24 14:22:24.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/binfmt_som.c 2009-03-24 14:48:34.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/binfmt_som.c linux-2.6.29.4-vs2.3.0.36.14/fs/binfmt_som.c
+--- linux-2.6.29.4/fs/binfmt_som.c 2009-03-24 14:22:24.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/binfmt_som.c 2009-03-24 14:48:34.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.29.2/fs/block_dev.c linux-2.6.29.2-vs2.3.0.36.12/fs/block_dev.c
---- linux-2.6.29.2/fs/block_dev.c 2009-03-24 14:22:24.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/block_dev.c 2009-03-24 14:48:34.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/block_dev.c linux-2.6.29.4-vs2.3.0.36.14/fs/block_dev.c
+--- linux-2.6.29.4/fs/block_dev.c 2009-03-24 14:22:24.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/block_dev.c 2009-03-24 14:48:34.000000000 +0100
@@ -24,6 +24,7 @@
#include <linux/uio.h>
#include <linux/namei.h>
if (bdev) {
spin_lock(&bdev_lock);
if (!inode->i_bdev) {
-diff -NurpP --minimal linux-2.6.29.2/fs/char_dev.c linux-2.6.29.2-vs2.3.0.36.12/fs/char_dev.c
---- linux-2.6.29.2/fs/char_dev.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/char_dev.c 2009-03-24 14:48:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/char_dev.c linux-2.6.29.4-vs2.3.0.36.14/fs/char_dev.c
+--- linux-2.6.29.4/fs/char_dev.c 2009-03-24 14:22:25.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/char_dev.c 2009-03-24 14:48:35.000000000 +0100
@@ -21,6 +21,8 @@
#include <linux/cdev.h>
#include <linux/mutex.h>
if (!kobj)
return -ENXIO;
new = container_of(kobj, struct cdev, kobj);
-diff -NurpP --minimal linux-2.6.29.2/fs/dcache.c linux-2.6.29.2-vs2.3.0.36.12/fs/dcache.c
---- linux-2.6.29.2/fs/dcache.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/dcache.c 2009-03-24 14:48:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/dcache.c linux-2.6.29.4-vs2.3.0.36.14/fs/dcache.c
+--- linux-2.6.29.4/fs/dcache.c 2009-03-24 14:22:25.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/dcache.c 2009-03-24 14:48:35.000000000 +0100
@@ -32,6 +32,7 @@
#include <linux/seqlock.h>
#include <linux/swap.h>
found = dentry;
spin_unlock(&dentry->d_lock);
break;
-diff -NurpP --minimal linux-2.6.29.2/fs/devpts/inode.c linux-2.6.29.2-vs2.3.0.36.12/fs/devpts/inode.c
---- linux-2.6.29.2/fs/devpts/inode.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/devpts/inode.c 2009-03-24 15:32:47.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/devpts/inode.c linux-2.6.29.4-vs2.3.0.36.14/fs/devpts/inode.c
+--- linux-2.6.29.4/fs/devpts/inode.c 2009-03-24 14:22:25.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/devpts/inode.c 2009-03-24 15:32:47.000000000 +0100
@@ -19,12 +19,12 @@
#include <linux/tty.h>
#include <linux/mutex.h>
inode->i_private = tty;
tty->driver_data = inode;
-diff -NurpP --minimal linux-2.6.29.2/fs/exec.c linux-2.6.29.2-vs2.3.0.36.12/fs/exec.c
---- linux-2.6.29.2/fs/exec.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/exec.c 2009-03-24 15:34:21.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/exec.c linux-2.6.29.4-vs2.3.0.36.14/fs/exec.c
+--- linux-2.6.29.4/fs/exec.c 2009-05-23 23:16:52.000000000 +0200
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/exec.c 2009-05-10 23:42:01.000000000 +0200
@@ -257,7 +257,9 @@ static int __bprm_mm_init(struct linux_b
if (err)
goto err;
up_write(&mm->mmap_sem);
bprm->p = vma->vm_end - sizeof(void *);
return 0;
-@@ -1450,7 +1452,7 @@ static int format_corename(char *corenam
+@@ -1463,7 +1465,7 @@ static int format_corename(char *corenam
/* UNIX time of coredump */
case 't': {
struct timeval tv;
rc = snprintf(out_ptr, out_end - out_ptr,
"%lu", tv.tv_sec);
if (rc > out_end - out_ptr)
-diff -NurpP --minimal linux-2.6.29.2/fs/ext2/balloc.c linux-2.6.29.2-vs2.3.0.36.12/fs/ext2/balloc.c
---- linux-2.6.29.2/fs/ext2/balloc.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/ext2/balloc.c 2009-03-24 14:48:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/ext2/balloc.c linux-2.6.29.4-vs2.3.0.36.14/fs/ext2/balloc.c
+--- linux-2.6.29.4/fs/ext2/balloc.c 2009-03-24 14:22:25.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/ext2/balloc.c 2009-03-24 14:48:35.000000000 +0100
@@ -16,6 +16,8 @@
#include <linux/sched.h>
#include <linux/buffer_head.h>
brelse(bitmap_bh);
return 0;
}
-diff -NurpP --minimal linux-2.6.29.2/fs/ext2/ext2.h linux-2.6.29.2-vs2.3.0.36.12/fs/ext2/ext2.h
---- linux-2.6.29.2/fs/ext2/ext2.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/ext2/ext2.h 2009-02-22 22:54:25.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/ext2/ext2.h linux-2.6.29.4-vs2.3.0.36.14/fs/ext2/ext2.h
+--- linux-2.6.29.4/fs/ext2/ext2.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/ext2/ext2.h 2009-02-22 22:54:25.000000000 +0100
@@ -170,6 +170,7 @@ extern const struct file_operations ext2
extern const struct address_space_operations ext2_aops;
extern const struct address_space_operations ext2_aops_xip;
/* namei.c */
extern const struct inode_operations ext2_dir_inode_operations;
-diff -NurpP --minimal linux-2.6.29.2/fs/ext2/file.c linux-2.6.29.2-vs2.3.0.36.12/fs/ext2/file.c
---- linux-2.6.29.2/fs/ext2/file.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/ext2/file.c 2009-02-22 22:54:25.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/ext2/file.c linux-2.6.29.4-vs2.3.0.36.14/fs/ext2/file.c
+--- linux-2.6.29.4/fs/ext2/file.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/ext2/file.c 2009-02-22 22:54:25.000000000 +0100
@@ -87,4 +87,5 @@ const struct inode_operations ext2_file_
.setattr = ext2_setattr,
.permission = ext2_permission,
.fiemap = ext2_fiemap,
+ .sync_flags = ext2_sync_flags,
};
-diff -NurpP --minimal linux-2.6.29.2/fs/ext2/ialloc.c linux-2.6.29.2-vs2.3.0.36.12/fs/ext2/ialloc.c
---- linux-2.6.29.2/fs/ext2/ialloc.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/ext2/ialloc.c 2009-03-24 15:36:12.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/ext2/ialloc.c linux-2.6.29.4-vs2.3.0.36.14/fs/ext2/ialloc.c
+--- linux-2.6.29.4/fs/ext2/ialloc.c 2009-03-24 14:22:25.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/ext2/ialloc.c 2009-03-24 15:36:12.000000000 +0100
@@ -17,6 +17,8 @@
#include <linux/backing-dev.h>
#include <linux/buffer_head.h>
make_bad_inode(inode);
iput(inode);
return ERR_PTR(err);
-diff -NurpP --minimal linux-2.6.29.2/fs/ext2/inode.c linux-2.6.29.2-vs2.3.0.36.12/fs/ext2/inode.c
---- linux-2.6.29.2/fs/ext2/inode.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/ext2/inode.c 2009-03-24 15:41:38.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/ext2/inode.c linux-2.6.29.4-vs2.3.0.36.14/fs/ext2/inode.c
+--- linux-2.6.29.4/fs/ext2/inode.c 2009-03-24 14:22:25.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/ext2/inode.c 2009-03-24 15:41:38.000000000 +0100
@@ -33,6 +33,7 @@
#include <linux/mpage.h>
#include <linux/fiemap.h>
error = DQUOT_TRANSFER(inode, iattr) ? -EDQUOT : 0;
if (error)
return error;
-diff -NurpP --minimal linux-2.6.29.2/fs/ext2/ioctl.c linux-2.6.29.2-vs2.3.0.36.12/fs/ext2/ioctl.c
---- linux-2.6.29.2/fs/ext2/ioctl.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/ext2/ioctl.c 2009-03-24 14:48:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/ext2/ioctl.c linux-2.6.29.4-vs2.3.0.36.14/fs/ext2/ioctl.c
+--- linux-2.6.29.4/fs/ext2/ioctl.c 2009-03-24 14:22:25.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/ext2/ioctl.c 2009-03-24 14:48:35.000000000 +0100
@@ -14,6 +14,7 @@
#include <linux/compat.h>
#include <linux/mount.h>
if (!capable(CAP_LINUX_IMMUTABLE)) {
mutex_unlock(&inode->i_mutex);
ret = -EPERM;
-diff -NurpP --minimal linux-2.6.29.2/fs/ext2/namei.c linux-2.6.29.2-vs2.3.0.36.12/fs/ext2/namei.c
---- linux-2.6.29.2/fs/ext2/namei.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/ext2/namei.c 2009-03-24 14:48:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/ext2/namei.c linux-2.6.29.4-vs2.3.0.36.14/fs/ext2/namei.c
+--- linux-2.6.29.4/fs/ext2/namei.c 2009-03-24 14:22:25.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/ext2/namei.c 2009-03-24 14:48:35.000000000 +0100
@@ -31,6 +31,7 @@
*/
.permission = ext2_permission,
+ .sync_flags = ext2_sync_flags,
};
-diff -NurpP --minimal linux-2.6.29.2/fs/ext2/super.c linux-2.6.29.2-vs2.3.0.36.12/fs/ext2/super.c
---- linux-2.6.29.2/fs/ext2/super.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/ext2/super.c 2009-03-24 14:48:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/ext2/super.c linux-2.6.29.4-vs2.3.0.36.14/fs/ext2/super.c
+--- linux-2.6.29.4/fs/ext2/super.c 2009-03-24 14:22:25.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/ext2/super.c 2009-03-24 14:48:35.000000000 +0100
@@ -391,7 +391,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.29.2/fs/ext2/symlink.c linux-2.6.29.2-vs2.3.0.36.12/fs/ext2/symlink.c
---- linux-2.6.29.2/fs/ext2/symlink.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/ext2/symlink.c 2009-02-22 22:54:25.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/ext2/symlink.c linux-2.6.29.4-vs2.3.0.36.14/fs/ext2/symlink.c
+--- linux-2.6.29.4/fs/ext2/symlink.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/ext2/symlink.c 2009-02-22 22:54:25.000000000 +0100
@@ -38,6 +38,7 @@ const struct inode_operations ext2_symli
.listxattr = ext2_listxattr,
.removexattr = generic_removexattr,
#endif
+ .sync_flags = ext2_sync_flags,
};
-diff -NurpP --minimal linux-2.6.29.2/fs/ext2/xattr.c linux-2.6.29.2-vs2.3.0.36.12/fs/ext2/xattr.c
---- linux-2.6.29.2/fs/ext2/xattr.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/ext2/xattr.c 2009-02-22 22:54:25.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/ext2/xattr.c linux-2.6.29.4-vs2.3.0.36.14/fs/ext2/xattr.c
+--- linux-2.6.29.4/fs/ext2/xattr.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/ext2/xattr.c 2009-02-22 22:54:25.000000000 +0100
@@ -60,6 +60,7 @@
#include <linux/mbcache.h>
#include <linux/quotaops.h>
DQUOT_FREE_BLOCK(inode, 1);
}
EXT2_I(inode)->i_file_acl = 0;
-diff -NurpP --minimal linux-2.6.29.2/fs/ext3/balloc.c linux-2.6.29.2-vs2.3.0.36.12/fs/ext3/balloc.c
---- linux-2.6.29.2/fs/ext3/balloc.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/ext3/balloc.c 2009-03-25 00:53:20.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/ext3/balloc.c linux-2.6.29.4-vs2.3.0.36.14/fs/ext3/balloc.c
+--- linux-2.6.29.4/fs/ext3/balloc.c 2009-03-24 14:22:25.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/ext3/balloc.c 2009-03-25 00:53:20.000000000 +0100
@@ -19,6 +19,8 @@
#include <linux/ext3_jbd.h>
#include <linux/quotaops.h>
if (fatal) {
*errp = fatal;
ext3_std_error(sb, fatal);
-diff -NurpP --minimal linux-2.6.29.2/fs/ext3/file.c linux-2.6.29.2-vs2.3.0.36.12/fs/ext3/file.c
---- linux-2.6.29.2/fs/ext3/file.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/ext3/file.c 2009-02-22 22:54:25.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/ext3/file.c linux-2.6.29.4-vs2.3.0.36.14/fs/ext3/file.c
+--- linux-2.6.29.4/fs/ext3/file.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/ext3/file.c 2009-02-22 22:54:25.000000000 +0100
@@ -135,5 +135,6 @@ const struct inode_operations ext3_file_
#endif
.permission = ext3_permission,
+ .sync_flags = ext3_sync_flags,
};
-diff -NurpP --minimal linux-2.6.29.2/fs/ext3/ialloc.c linux-2.6.29.2-vs2.3.0.36.12/fs/ext3/ialloc.c
---- linux-2.6.29.2/fs/ext3/ialloc.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/ext3/ialloc.c 2009-03-24 15:44:06.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/ext3/ialloc.c linux-2.6.29.4-vs2.3.0.36.14/fs/ext3/ialloc.c
+--- linux-2.6.29.4/fs/ext3/ialloc.c 2009-03-24 14:22:25.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/ext3/ialloc.c 2009-03-24 15:44:06.000000000 +0100
@@ -23,6 +23,8 @@
#include <linux/buffer_head.h>
#include <linux/random.h>
inode->i_flags |= S_NOQUOTA;
inode->i_nlink = 0;
unlock_new_inode(inode);
-diff -NurpP --minimal linux-2.6.29.2/fs/ext3/inode.c linux-2.6.29.2-vs2.3.0.36.12/fs/ext3/inode.c
---- linux-2.6.29.2/fs/ext3/inode.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/ext3/inode.c 2009-03-24 15:44:29.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/ext3/inode.c linux-2.6.29.4-vs2.3.0.36.14/fs/ext3/inode.c
+--- linux-2.6.29.4/fs/ext3/inode.c 2009-03-24 14:22:25.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/ext3/inode.c 2009-03-24 15:44:29.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.29.2/fs/ext3/ioctl.c linux-2.6.29.2-vs2.3.0.36.12/fs/ext3/ioctl.c
---- linux-2.6.29.2/fs/ext3/ioctl.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/ext3/ioctl.c 2009-03-24 14:48:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/ext3/ioctl.c linux-2.6.29.4-vs2.3.0.36.14/fs/ext3/ioctl.c
+--- linux-2.6.29.4/fs/ext3/ioctl.c 2009-03-24 14:22:25.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/ext3/ioctl.c 2009-03-24 14:48:35.000000000 +0100
@@ -8,6 +8,7 @@
*/
if (!capable(CAP_LINUX_IMMUTABLE)) {
mutex_unlock(&inode->i_mutex);
err = -EPERM;
-diff -NurpP --minimal linux-2.6.29.2/fs/ext3/namei.c linux-2.6.29.2-vs2.3.0.36.12/fs/ext3/namei.c
---- linux-2.6.29.2/fs/ext3/namei.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/ext3/namei.c 2009-03-24 14:48:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/ext3/namei.c linux-2.6.29.4-vs2.3.0.36.14/fs/ext3/namei.c
+--- linux-2.6.29.4/fs/ext3/namei.c 2009-03-24 14:22:25.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/ext3/namei.c 2009-03-24 14:48:35.000000000 +0100
@@ -36,6 +36,7 @@
#include <linux/quotaops.h>
#include <linux/buffer_head.h>
.permission = ext3_permission,
+ .sync_flags = ext3_sync_flags,
};
-diff -NurpP --minimal linux-2.6.29.2/fs/ext3/super.c linux-2.6.29.2-vs2.3.0.36.12/fs/ext3/super.c
---- linux-2.6.29.2/fs/ext3/super.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/ext3/super.c 2009-03-24 14:48:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/ext3/super.c linux-2.6.29.4-vs2.3.0.36.14/fs/ext3/super.c
+--- linux-2.6.29.4/fs/ext3/super.c 2009-03-24 14:22:25.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/ext3/super.c 2009-03-24 14:48:35.000000000 +0100
@@ -790,7 +790,7 @@ enum {
Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_quota, Opt_noquota,
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
((sbi->s_mount_opt & EXT3_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-2.6.29.2/fs/ext3/symlink.c linux-2.6.29.2-vs2.3.0.36.12/fs/ext3/symlink.c
---- linux-2.6.29.2/fs/ext3/symlink.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/ext3/symlink.c 2009-02-22 22:54:25.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/ext3/symlink.c linux-2.6.29.4-vs2.3.0.36.14/fs/ext3/symlink.c
+--- linux-2.6.29.4/fs/ext3/symlink.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/ext3/symlink.c 2009-02-22 22:54:25.000000000 +0100
@@ -40,6 +40,7 @@ const struct inode_operations ext3_symli
.listxattr = ext3_listxattr,
.removexattr = generic_removexattr,
#endif
+ .sync_flags = ext3_sync_flags,
};
-diff -NurpP --minimal linux-2.6.29.2/fs/ext3/xattr.c linux-2.6.29.2-vs2.3.0.36.12/fs/ext3/xattr.c
---- linux-2.6.29.2/fs/ext3/xattr.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/ext3/xattr.c 2009-02-22 22:54:25.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/ext3/xattr.c linux-2.6.29.4-vs2.3.0.36.14/fs/ext3/xattr.c
+--- linux-2.6.29.4/fs/ext3/xattr.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/ext3/xattr.c 2009-02-22 22:54:25.000000000 +0100
@@ -58,6 +58,7 @@
#include <linux/mbcache.h>
#include <linux/quotaops.h>
goto cleanup;
bad_block:
-diff -NurpP --minimal linux-2.6.29.2/fs/ext4/balloc.c linux-2.6.29.2-vs2.3.0.36.12/fs/ext4/balloc.c
---- linux-2.6.29.2/fs/ext4/balloc.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/ext4/balloc.c 2009-03-24 14:48:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/ext4/balloc.c linux-2.6.29.4-vs2.3.0.36.14/fs/ext4/balloc.c
+--- linux-2.6.29.4/fs/ext4/balloc.c 2009-03-24 14:22:25.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/ext4/balloc.c 2009-03-24 14:48:35.000000000 +0100
@@ -17,6 +17,8 @@
#include <linux/jbd2.h>
#include <linux/quotaops.h>
return;
}
-diff -NurpP --minimal linux-2.6.29.2/fs/ext4/ext4.h linux-2.6.29.2-vs2.3.0.36.12/fs/ext4/ext4.h
---- linux-2.6.29.2/fs/ext4/ext4.h 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/ext4/ext4.h 2009-03-24 15:44:56.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/ext4/ext4.h linux-2.6.29.4-vs2.3.0.36.14/fs/ext4/ext4.h
+--- linux-2.6.29.4/fs/ext4/ext4.h 2009-05-23 23:16:52.000000000 +0200
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/ext4/ext4.h 2009-05-23 23:19:11.000000000 +0200
@@ -243,8 +243,12 @@ struct flex_groups {
#define EXT4_HUGE_FILE_FL 0x00040000 /* Set to each huge file */
#define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */
extern struct inode *ext4_iget(struct super_block *, unsigned long);
extern int ext4_write_inode(struct inode *, int);
-diff -NurpP --minimal linux-2.6.29.2/fs/ext4/file.c linux-2.6.29.2-vs2.3.0.36.12/fs/ext4/file.c
---- linux-2.6.29.2/fs/ext4/file.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/ext4/file.c 2009-03-24 14:48:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/ext4/file.c linux-2.6.29.4-vs2.3.0.36.14/fs/ext4/file.c
+--- linux-2.6.29.4/fs/ext4/file.c 2009-03-24 14:22:25.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/ext4/file.c 2009-03-24 14:48:35.000000000 +0100
@@ -171,5 +171,6 @@ const struct inode_operations ext4_file_
.permission = ext4_permission,
.fallocate = ext4_fallocate,
+ .sync_flags = ext4_sync_flags,
};
-diff -NurpP --minimal linux-2.6.29.2/fs/ext4/ialloc.c linux-2.6.29.2-vs2.3.0.36.12/fs/ext4/ialloc.c
---- linux-2.6.29.2/fs/ext4/ialloc.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/ext4/ialloc.c 2009-03-24 14:48:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/ext4/ialloc.c linux-2.6.29.4-vs2.3.0.36.14/fs/ext4/ialloc.c
+--- linux-2.6.29.4/fs/ext4/ialloc.c 2009-03-24 14:22:25.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/ext4/ialloc.c 2009-03-24 14:48:35.000000000 +0100
@@ -22,6 +22,8 @@
#include <linux/random.h>
#include <linux/bitops.h>
inode->i_flags |= S_NOQUOTA;
inode->i_nlink = 0;
unlock_new_inode(inode);
-diff -NurpP --minimal linux-2.6.29.2/fs/ext4/inode.c linux-2.6.29.2-vs2.3.0.36.12/fs/ext4/inode.c
---- linux-2.6.29.2/fs/ext4/inode.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/ext4/inode.c 2009-03-24 14:48:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/ext4/inode.c linux-2.6.29.4-vs2.3.0.36.14/fs/ext4/inode.c
+--- linux-2.6.29.4/fs/ext4/inode.c 2009-05-23 23:16:52.000000000 +0200
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/ext4/inode.c 2009-05-23 23:19:11.000000000 +0200
@@ -37,6 +37,7 @@
#include <linux/namei.h>
#include <linux/uio.h>
error = ext4_mark_inode_dirty(handle, inode);
ext4_journal_stop(handle);
}
-diff -NurpP --minimal linux-2.6.29.2/fs/ext4/ioctl.c linux-2.6.29.2-vs2.3.0.36.12/fs/ext4/ioctl.c
---- linux-2.6.29.2/fs/ext4/ioctl.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/ext4/ioctl.c 2009-03-24 14:48:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/ext4/ioctl.c linux-2.6.29.4-vs2.3.0.36.14/fs/ext4/ioctl.c
+--- linux-2.6.29.4/fs/ext4/ioctl.c 2009-03-24 14:22:25.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/ext4/ioctl.c 2009-03-24 14:48:35.000000000 +0100
@@ -8,12 +8,14 @@
*/
if (!capable(CAP_LINUX_IMMUTABLE))
goto flags_out;
}
-diff -NurpP --minimal linux-2.6.29.2/fs/ext4/namei.c linux-2.6.29.2-vs2.3.0.36.12/fs/ext4/namei.c
---- linux-2.6.29.2/fs/ext4/namei.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/ext4/namei.c 2009-03-24 14:48:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/ext4/namei.c linux-2.6.29.4-vs2.3.0.36.14/fs/ext4/namei.c
+--- linux-2.6.29.4/fs/ext4/namei.c 2009-03-24 14:22:25.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/ext4/namei.c 2009-03-24 14:48:35.000000000 +0100
@@ -34,6 +34,7 @@
#include <linux/quotaops.h>
#include <linux/buffer_head.h>
.permission = ext4_permission,
+ .sync_flags = ext4_sync_flags,
};
-diff -NurpP --minimal linux-2.6.29.2/fs/ext4/super.c linux-2.6.29.2-vs2.3.0.36.12/fs/ext4/super.c
---- linux-2.6.29.2/fs/ext4/super.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/ext4/super.c 2009-03-24 15:46:48.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/ext4/super.c linux-2.6.29.4-vs2.3.0.36.14/fs/ext4/super.c
+--- linux-2.6.29.4/fs/ext4/super.c 2009-03-24 14:22:25.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/ext4/super.c 2009-03-24 15:46:48.000000000 +0100
@@ -1013,7 +1013,8 @@ enum {
Opt_ignore, Opt_barrier, Opt_err, Opt_resize, Opt_usrquota,
Opt_grpquota, Opt_i_version,
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
((sbi->s_mount_opt & EXT4_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-2.6.29.2/fs/ext4/symlink.c linux-2.6.29.2-vs2.3.0.36.12/fs/ext4/symlink.c
---- linux-2.6.29.2/fs/ext4/symlink.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/ext4/symlink.c 2009-02-22 22:54:25.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/ext4/symlink.c linux-2.6.29.4-vs2.3.0.36.14/fs/ext4/symlink.c
+--- linux-2.6.29.4/fs/ext4/symlink.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/ext4/symlink.c 2009-02-22 22:54:25.000000000 +0100
@@ -40,6 +40,7 @@ const struct inode_operations ext4_symli
.listxattr = ext4_listxattr,
.removexattr = generic_removexattr,
#endif
+ .sync_flags = ext4_sync_flags,
};
-diff -NurpP --minimal linux-2.6.29.2/fs/ext4/xattr.c linux-2.6.29.2-vs2.3.0.36.12/fs/ext4/xattr.c
---- linux-2.6.29.2/fs/ext4/xattr.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/ext4/xattr.c 2009-03-24 15:47:44.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/ext4/xattr.c linux-2.6.29.4-vs2.3.0.36.14/fs/ext4/xattr.c
+--- linux-2.6.29.4/fs/ext4/xattr.c 2009-03-24 14:22:25.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/ext4/xattr.c 2009-03-24 15:47:44.000000000 +0100
@@ -56,6 +56,7 @@
#include <linux/mbcache.h>
#include <linux/quotaops.h>
goto cleanup;
bad_block:
-diff -NurpP --minimal linux-2.6.29.2/fs/fcntl.c linux-2.6.29.2-vs2.3.0.36.12/fs/fcntl.c
---- linux-2.6.29.2/fs/fcntl.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/fcntl.c 2009-03-24 14:48:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/fcntl.c linux-2.6.29.4-vs2.3.0.36.14/fs/fcntl.c
+--- linux-2.6.29.4/fs/fcntl.c 2009-05-23 23:16:52.000000000 +0200
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/fcntl.c 2009-05-23 23:19:11.000000000 +0200
@@ -20,6 +20,7 @@
#include <linux/rcupdate.h>
#include <linux/pid_namespace.h>
return newfd;
-@@ -343,6 +346,8 @@ SYSCALL_DEFINE3(fcntl, unsigned int, fd,
+@@ -345,6 +348,8 @@ SYSCALL_DEFINE3(fcntl, unsigned int, fd,
filp = fget(fd);
if (!filp)
goto out;
err = security_file_fcntl(filp, cmd, arg);
if (err) {
-diff -NurpP --minimal linux-2.6.29.2/fs/file.c linux-2.6.29.2-vs2.3.0.36.12/fs/file.c
---- linux-2.6.29.2/fs/file.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/file.c 2009-02-22 22:54:25.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/file.c linux-2.6.29.4-vs2.3.0.36.14/fs/file.c
+--- linux-2.6.29.4/fs/file.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/file.c 2009-02-22 22:54:25.000000000 +0100
@@ -19,6 +19,7 @@
#include <linux/spinlock.h>
#include <linux/rcupdate.h>
#if 1
/* Sanity check */
if (rcu_dereference(fdt->fd[fd]) != NULL) {
-diff -NurpP --minimal linux-2.6.29.2/fs/file_table.c linux-2.6.29.2-vs2.3.0.36.12/fs/file_table.c
---- linux-2.6.29.2/fs/file_table.c 2009-03-24 14:22:25.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/file_table.c 2009-03-24 14:48:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/file_table.c linux-2.6.29.4-vs2.3.0.36.14/fs/file_table.c
+--- linux-2.6.29.4/fs/file_table.c 2009-03-24 14:22:25.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/file_table.c 2009-03-24 14:48:35.000000000 +0100
@@ -21,6 +21,8 @@
#include <linux/fsnotify.h>
#include <linux/sysctl.h>
file_kill(file);
file_free(file);
}
-diff -NurpP --minimal linux-2.6.29.2/fs/hfsplus/ioctl.c linux-2.6.29.2-vs2.3.0.36.12/fs/hfsplus/ioctl.c
---- linux-2.6.29.2/fs/hfsplus/ioctl.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/hfsplus/ioctl.c 2009-02-22 22:54:25.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/fs_struct.c linux-2.6.29.4-vs2.3.0.36.14/fs/fs_struct.c
+--- linux-2.6.29.4/fs/fs_struct.c 2009-05-23 23:16:52.000000000 +0200
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/fs_struct.c 2009-05-20 01:29:56.000000000 +0200
+@@ -3,6 +3,7 @@
+ #include <linux/fs.h>
+ #include <linux/path.h>
+ #include <linux/slab.h>
++#include <linux/vserver/global.h>
+
+ /*
+ * Replace the fs->{rootmnt,root} with {mnt,dentry}. Put the old values.
+@@ -76,6 +77,7 @@ void free_fs_struct(struct fs_struct *fs
+ {
+ path_put(&fs->root);
+ path_put(&fs->pwd);
++ atomic_dec(&vs_global_fs);
+ kmem_cache_free(fs_cachep, fs);
+ }
+
+@@ -111,6 +113,7 @@ struct fs_struct *copy_fs_struct(struct
+ fs->pwd = old->pwd;
+ path_get(&old->pwd);
+ read_unlock(&old->lock);
++ atomic_inc(&vs_global_fs);
+ }
+ return fs;
+ }
+diff -NurpP --minimal linux-2.6.29.4/fs/hfsplus/ioctl.c linux-2.6.29.4-vs2.3.0.36.14/fs/hfsplus/ioctl.c
+--- linux-2.6.29.4/fs/hfsplus/ioctl.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/hfsplus/ioctl.c 2009-02-22 22:54:25.000000000 +0100
@@ -17,6 +17,7 @@
#include <linux/mount.h>
#include <linux/sched.h>
#include <asm/uaccess.h>
#include "hfsplus_fs.h"
-diff -NurpP --minimal linux-2.6.29.2/fs/inode.c linux-2.6.29.2-vs2.3.0.36.12/fs/inode.c
---- linux-2.6.29.2/fs/inode.c 2009-03-24 14:22:26.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/inode.c 2009-03-25 00:51:55.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/inode.c linux-2.6.29.4-vs2.3.0.36.14/fs/inode.c
+--- linux-2.6.29.4/fs/inode.c 2009-03-24 14:22:26.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/inode.c 2009-03-25 00:51:55.000000000 +0100
@@ -126,6 +126,9 @@ struct inode *inode_init_always(struct s
struct address_space * const mapping = &inode->i_data;
} else if (S_ISFIFO(mode))
inode->i_fop = &def_fifo_fops;
else if (S_ISSOCK(mode))
-diff -NurpP --minimal linux-2.6.29.2/fs/ioctl.c linux-2.6.29.2-vs2.3.0.36.12/fs/ioctl.c
---- linux-2.6.29.2/fs/ioctl.c 2009-03-24 14:22:26.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/ioctl.c 2009-03-24 14:48:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/ioctl.c linux-2.6.29.4-vs2.3.0.36.14/fs/ioctl.c
+--- linux-2.6.29.4/fs/ioctl.c 2009-05-23 23:16:52.000000000 +0200
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/ioctl.c 2009-05-23 23:19:11.000000000 +0200
@@ -15,6 +15,9 @@
#include <linux/uaccess.h>
#include <linux/writeback.h>
#include <asm/ioctls.h>
-diff -NurpP --minimal linux-2.6.29.2/fs/ioprio.c linux-2.6.29.2-vs2.3.0.36.12/fs/ioprio.c
---- linux-2.6.29.2/fs/ioprio.c 2009-03-24 14:22:26.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/ioprio.c 2009-03-24 14:48:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/ioprio.c linux-2.6.29.4-vs2.3.0.36.14/fs/ioprio.c
+--- linux-2.6.29.4/fs/ioprio.c 2009-03-24 14:22:26.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/ioprio.c 2009-03-24 14:48:35.000000000 +0100
@@ -26,6 +26,7 @@
#include <linux/syscalls.h>
#include <linux/security.h>
tmpio = get_task_ioprio(p);
if (tmpio < 0)
continue;
-diff -NurpP --minimal linux-2.6.29.2/fs/jfs/acl.c linux-2.6.29.2-vs2.3.0.36.12/fs/jfs/acl.c
---- linux-2.6.29.2/fs/jfs/acl.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/jfs/acl.c 2009-02-22 22:54:25.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/jfs/acl.c linux-2.6.29.4-vs2.3.0.36.14/fs/jfs/acl.c
+--- linux-2.6.29.4/fs/jfs/acl.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/jfs/acl.c 2009-02-22 22:54:25.000000000 +0100
@@ -232,7 +232,8 @@ int jfs_setattr(struct dentry *dentry, s
return rc;
if (DQUOT_TRANSFER(inode, iattr))
return -EDQUOT;
}
-diff -NurpP --minimal linux-2.6.29.2/fs/jfs/file.c linux-2.6.29.2-vs2.3.0.36.12/fs/jfs/file.c
---- linux-2.6.29.2/fs/jfs/file.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/jfs/file.c 2009-02-22 22:54:25.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/jfs/file.c linux-2.6.29.4-vs2.3.0.36.14/fs/jfs/file.c
+--- linux-2.6.29.4/fs/jfs/file.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/jfs/file.c 2009-02-22 22:54:25.000000000 +0100
@@ -98,6 +98,7 @@ const struct inode_operations jfs_file_i
.setattr = jfs_setattr,
.permission = jfs_permission,
};
const struct file_operations jfs_file_operations = {
-diff -NurpP --minimal linux-2.6.29.2/fs/jfs/inode.c linux-2.6.29.2-vs2.3.0.36.12/fs/jfs/inode.c
---- linux-2.6.29.2/fs/jfs/inode.c 2009-03-24 14:22:26.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/jfs/inode.c 2009-03-24 14:48:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/jfs/inode.c linux-2.6.29.4-vs2.3.0.36.14/fs/jfs/inode.c
+--- linux-2.6.29.4/fs/jfs/inode.c 2009-03-24 14:22:26.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/jfs/inode.c 2009-03-24 14:48:35.000000000 +0100
@@ -22,6 +22,7 @@
#include <linux/buffer_head.h>
#include <linux/pagemap.h>
}
clear_inode(inode);
-diff -NurpP --minimal linux-2.6.29.2/fs/jfs/ioctl.c linux-2.6.29.2-vs2.3.0.36.12/fs/jfs/ioctl.c
---- linux-2.6.29.2/fs/jfs/ioctl.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/jfs/ioctl.c 2009-02-22 22:54:25.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/jfs/ioctl.c linux-2.6.29.4-vs2.3.0.36.14/fs/jfs/ioctl.c
+--- linux-2.6.29.4/fs/jfs/ioctl.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/jfs/ioctl.c 2009-02-22 22:54:25.000000000 +0100
@@ -11,6 +11,7 @@
#include <linux/mount.h>
#include <linux/time.h>
if (!capable(CAP_LINUX_IMMUTABLE)) {
mutex_unlock(&inode->i_mutex);
err = -EPERM;
-diff -NurpP --minimal linux-2.6.29.2/fs/jfs/jfs_dinode.h linux-2.6.29.2-vs2.3.0.36.12/fs/jfs/jfs_dinode.h
---- linux-2.6.29.2/fs/jfs/jfs_dinode.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/jfs/jfs_dinode.h 2009-02-22 22:54:25.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/jfs/jfs_dinode.h linux-2.6.29.4-vs2.3.0.36.14/fs/jfs/jfs_dinode.h
+--- linux-2.6.29.4/fs/jfs/jfs_dinode.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/jfs/jfs_dinode.h 2009-02-22 22:54:25.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.29.2/fs/jfs/jfs_dtree.c linux-2.6.29.2-vs2.3.0.36.12/fs/jfs/jfs_dtree.c
---- linux-2.6.29.2/fs/jfs/jfs_dtree.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/jfs/jfs_dtree.c 2009-02-22 22:54:25.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/jfs/jfs_dtree.c linux-2.6.29.4-vs2.3.0.36.14/fs/jfs/jfs_dtree.c
+--- linux-2.6.29.4/fs/jfs/jfs_dtree.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/jfs/jfs_dtree.c 2009-02-22 22:54:25.000000000 +0100
@@ -102,6 +102,7 @@
#include <linux/fs.h>
/* Free quota allocation */
DQUOT_FREE_BLOCK(ip, xlen);
-diff -NurpP --minimal linux-2.6.29.2/fs/jfs/jfs_extent.c linux-2.6.29.2-vs2.3.0.36.12/fs/jfs/jfs_extent.c
---- linux-2.6.29.2/fs/jfs/jfs_extent.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/jfs/jfs_extent.c 2009-02-22 22:54:25.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/jfs/jfs_extent.c linux-2.6.29.4-vs2.3.0.36.14/fs/jfs/jfs_extent.c
+--- linux-2.6.29.4/fs/jfs/jfs_extent.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/jfs/jfs_extent.c 2009-02-22 22:54:25.000000000 +0100
@@ -18,6 +18,7 @@
#include <linux/fs.h>
DQUOT_FREE_BLOCK(ip, nxlen);
goto exit;
}
-diff -NurpP --minimal linux-2.6.29.2/fs/jfs/jfs_filsys.h linux-2.6.29.2-vs2.3.0.36.12/fs/jfs/jfs_filsys.h
---- linux-2.6.29.2/fs/jfs/jfs_filsys.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/jfs/jfs_filsys.h 2009-02-22 22:54:25.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/jfs/jfs_filsys.h linux-2.6.29.4-vs2.3.0.36.14/fs/jfs/jfs_filsys.h
+--- linux-2.6.29.4/fs/jfs/jfs_filsys.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/jfs/jfs_filsys.h 2009-02-22 22:54:25.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.29.2/fs/jfs/jfs_imap.c linux-2.6.29.2-vs2.3.0.36.12/fs/jfs/jfs_imap.c
---- linux-2.6.29.2/fs/jfs/jfs_imap.c 2009-03-24 14:22:26.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/jfs/jfs_imap.c 2009-03-24 14:48:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/jfs/jfs_imap.c linux-2.6.29.4-vs2.3.0.36.14/fs/jfs/jfs_imap.c
+--- linux-2.6.29.4/fs/jfs/jfs_imap.c 2009-03-24 14:22:26.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/jfs/jfs_imap.c 2009-03-24 14:48:35.000000000 +0100
@@ -45,6 +45,7 @@
#include <linux/buffer_head.h>
#include <linux/pagemap.h>
jfs_get_inode_flags(jfs_ip);
/*
* mode2 is only needed for storing the higher order bits.
-diff -NurpP --minimal linux-2.6.29.2/fs/jfs/jfs_inode.c linux-2.6.29.2-vs2.3.0.36.12/fs/jfs/jfs_inode.c
---- linux-2.6.29.2/fs/jfs/jfs_inode.c 2009-03-24 14:22:26.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/jfs/jfs_inode.c 2009-03-24 15:58:01.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/jfs/jfs_inode.c linux-2.6.29.4-vs2.3.0.36.14/fs/jfs/jfs_inode.c
+--- linux-2.6.29.4/fs/jfs/jfs_inode.c 2009-03-24 14:22:26.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/jfs/jfs_inode.c 2009-03-24 15:58:01.000000000 +0100
@@ -18,6 +18,8 @@
#include <linux/fs.h>
DQUOT_DROP(inode);
inode->i_flags |= S_NOQUOTA;
fail_unlock:
-diff -NurpP --minimal linux-2.6.29.2/fs/jfs/jfs_inode.h linux-2.6.29.2-vs2.3.0.36.12/fs/jfs/jfs_inode.h
---- linux-2.6.29.2/fs/jfs/jfs_inode.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/jfs/jfs_inode.h 2009-02-22 22:54:25.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/jfs/jfs_inode.h linux-2.6.29.4-vs2.3.0.36.14/fs/jfs/jfs_inode.h
+--- linux-2.6.29.4/fs/jfs/jfs_inode.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/jfs/jfs_inode.h 2009-02-22 22:54:25.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 const struct address_space_operations jfs_aops;
-diff -NurpP --minimal linux-2.6.29.2/fs/jfs/jfs_xtree.c linux-2.6.29.2-vs2.3.0.36.12/fs/jfs/jfs_xtree.c
---- linux-2.6.29.2/fs/jfs/jfs_xtree.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/jfs/jfs_xtree.c 2009-02-22 22:54:25.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/jfs/jfs_xtree.c linux-2.6.29.4-vs2.3.0.36.14/fs/jfs/jfs_xtree.c
+--- linux-2.6.29.4/fs/jfs/jfs_xtree.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/jfs/jfs_xtree.c 2009-02-22 22:54:25.000000000 +0100
@@ -23,6 +23,7 @@
#include <linux/module.h>
#include <linux/quotaops.h>
/* update quota allocation to reflect freed blocks */
DQUOT_FREE_BLOCK(ip, nfreed);
-diff -NurpP --minimal linux-2.6.29.2/fs/jfs/namei.c linux-2.6.29.2-vs2.3.0.36.12/fs/jfs/namei.c
---- linux-2.6.29.2/fs/jfs/namei.c 2009-03-24 14:22:26.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/jfs/namei.c 2009-03-24 14:48:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/jfs/namei.c linux-2.6.29.4-vs2.3.0.36.14/fs/jfs/namei.c
+--- linux-2.6.29.4/fs/jfs/namei.c 2009-03-24 14:22:26.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/jfs/namei.c 2009-03-24 14:48:35.000000000 +0100
@@ -21,6 +21,7 @@
#include <linux/ctype.h>
#include <linux/quotaops.h>
};
const struct file_operations jfs_dir_operations = {
-diff -NurpP --minimal linux-2.6.29.2/fs/jfs/super.c linux-2.6.29.2-vs2.3.0.36.12/fs/jfs/super.c
---- linux-2.6.29.2/fs/jfs/super.c 2009-03-24 14:22:26.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/jfs/super.c 2009-03-24 14:48:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/jfs/super.c linux-2.6.29.4-vs2.3.0.36.14/fs/jfs/super.c
+--- linux-2.6.29.4/fs/jfs/super.c 2009-03-24 14:22:26.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/jfs/super.c 2009-03-24 14:48:35.000000000 +0100
@@ -196,7 +196,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.29.2/fs/jfs/xattr.c linux-2.6.29.2-vs2.3.0.36.12/fs/jfs/xattr.c
---- linux-2.6.29.2/fs/jfs/xattr.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/jfs/xattr.c 2009-02-22 22:54:25.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/jfs/xattr.c linux-2.6.29.4-vs2.3.0.36.14/fs/jfs/xattr.c
+--- linux-2.6.29.4/fs/jfs/xattr.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/jfs/xattr.c 2009-02-22 22:54:25.000000000 +0100
@@ -23,6 +23,7 @@
#include <linux/posix_acl_xattr.h>
#include <linux/quotaops.h>
inode->i_ctime = CURRENT_TIME;
-diff -NurpP --minimal linux-2.6.29.2/fs/libfs.c linux-2.6.29.2-vs2.3.0.36.12/fs/libfs.c
---- linux-2.6.29.2/fs/libfs.c 2009-03-24 14:22:26.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/libfs.c 2009-03-24 14:48:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/libfs.c linux-2.6.29.4-vs2.3.0.36.14/fs/libfs.c
+--- linux-2.6.29.4/fs/libfs.c 2009-03-24 14:22:26.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/libfs.c 2009-03-24 14:48:35.000000000 +0100
@@ -125,7 +125,8 @@ static inline unsigned char dt_type(stru
* both impossible due to the lock on directory.
*/
EXPORT_SYMBOL(generic_read_dir);
EXPORT_SYMBOL(get_sb_pseudo);
EXPORT_SYMBOL(simple_write_begin);
-diff -NurpP --minimal linux-2.6.29.2/fs/locks.c linux-2.6.29.2-vs2.3.0.36.12/fs/locks.c
---- linux-2.6.29.2/fs/locks.c 2009-03-24 14:22:26.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/locks.c 2009-03-24 14:48:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/locks.c linux-2.6.29.4-vs2.3.0.36.14/fs/locks.c
+--- linux-2.6.29.4/fs/locks.c 2009-03-24 14:22:26.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/locks.c 2009-03-24 14:48:35.000000000 +0100
@@ -127,6 +127,8 @@
#include <linux/time.h>
#include <linux/rcupdate.h>
f->private++;
return 0;
-diff -NurpP --minimal linux-2.6.29.2/fs/namei.c linux-2.6.29.2-vs2.3.0.36.12/fs/namei.c
---- linux-2.6.29.2/fs/namei.c 2009-03-24 14:22:26.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/namei.c 2009-03-25 00:50:11.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/namei.c linux-2.6.29.4-vs2.3.0.36.14/fs/namei.c
+--- linux-2.6.29.4/fs/namei.c 2009-05-23 23:16:52.000000000 +0200
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/namei.c 2009-05-23 22:57:27.000000000 +0200
@@ -31,6 +31,14 @@
#include <linux/file.h>
#include <linux/fcntl.h>
__follow_mount(path);
return 0;
+hidden:
-+ vxwprintk_task(1, "did lookup hidden %s:%p[#%d,%lu] »%s«.",
++ vxwprintk_task(1, "did lookup hidden %s:%p[#%d,%lu] »%s/%.*s«.",
+ inode->i_sb->s_id, inode, inode->i_tag, inode->i_ino,
-+ vxd_path(&nd->path));
++ vxd_path(&nd->path), name->len, name->name);
+ dput(dentry);
+ return -ENOENT;
/* get the link contents into pagecache */
static char *page_getlink(struct dentry * dentry, struct page **ppage)
{
-diff -NurpP --minimal linux-2.6.29.2/fs/namespace.c linux-2.6.29.2-vs2.3.0.36.12/fs/namespace.c
---- linux-2.6.29.2/fs/namespace.c 2009-03-24 14:22:26.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/namespace.c 2009-04-10 23:15:11.000000000 +0200
+diff -NurpP --minimal linux-2.6.29.4/fs/namespace.c linux-2.6.29.4-vs2.3.0.36.14/fs/namespace.c
+--- linux-2.6.29.4/fs/namespace.c 2009-05-23 23:16:52.000000000 +0200
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/namespace.c 2009-05-10 23:42:01.000000000 +0200
@@ -27,6 +27,11 @@
#include <linux/ramfs.h>
#include <linux/log2.h>
if (rootmnt)
mntput(rootmnt);
-@@ -2207,9 +2278,10 @@ SYSCALL_DEFINE2(pivot_root, const char _
+@@ -2147,9 +2218,10 @@ SYSCALL_DEFINE2(pivot_root, const char _
down_write(&namespace_sem);
mutex_lock(&old.dentry->d_inode->i_mutex);
error = -EINVAL;
goto out2;
if (!check_mnt(root.mnt))
goto out2;
-@@ -2348,5 +2420,6 @@ void __put_mnt_ns(struct mnt_namespace *
+@@ -2288,5 +2360,6 @@ void __put_mnt_ns(struct mnt_namespace *
spin_unlock(&vfsmount_lock);
up_write(&namespace_sem);
release_mounts(&umount_list);
+ atomic_dec(&vs_global_mnt_ns);
kfree(ns);
}
-diff -NurpP --minimal linux-2.6.29.2/fs/nfs/client.c linux-2.6.29.2-vs2.3.0.36.12/fs/nfs/client.c
---- linux-2.6.29.2/fs/nfs/client.c 2009-03-24 14:22:26.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/nfs/client.c 2009-03-24 14:48:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/nfs/client.c linux-2.6.29.4-vs2.3.0.36.14/fs/nfs/client.c
+--- linux-2.6.29.4/fs/nfs/client.c 2009-03-24 14:22:26.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/nfs/client.c 2009-03-24 14:48:35.000000000 +0100
@@ -696,6 +696,9 @@ static int nfs_init_server_rpcclient(str
if (server->flags & NFS_MOUNT_SOFT)
server->client->cl_softrtry = 1;
server->maxfilesize = fsinfo->maxfilesize;
/* We're airborne Set socket buffersize */
-diff -NurpP --minimal linux-2.6.29.2/fs/nfs/dir.c linux-2.6.29.2-vs2.3.0.36.12/fs/nfs/dir.c
---- linux-2.6.29.2/fs/nfs/dir.c 2009-03-24 14:22:26.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/nfs/dir.c 2009-03-24 14:48:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/nfs/dir.c linux-2.6.29.4-vs2.3.0.36.14/fs/nfs/dir.c
+--- linux-2.6.29.4/fs/nfs/dir.c 2009-05-23 23:16:52.000000000 +0200
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/nfs/dir.c 2009-05-23 23:19:11.000000000 +0200
@@ -34,6 +34,7 @@
#include <linux/namei.h>
#include <linux/mount.h>
no_entry:
res = d_materialise_unique(dentry, inode);
if (res != NULL) {
-diff -NurpP --minimal linux-2.6.29.2/fs/nfs/inode.c linux-2.6.29.2-vs2.3.0.36.12/fs/nfs/inode.c
---- linux-2.6.29.2/fs/nfs/inode.c 2009-03-24 14:22:26.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/nfs/inode.c 2009-03-24 14:48:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/nfs/inode.c linux-2.6.29.4-vs2.3.0.36.14/fs/nfs/inode.c
+--- linux-2.6.29.4/fs/nfs/inode.c 2009-03-24 14:22:26.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/nfs/inode.c 2009-03-24 14:48:35.000000000 +0100
@@ -37,6 +37,7 @@
#include <linux/vfs.h>
#include <linux/inet.h>
if (fattr->valid & (NFS_ATTR_FATTR_V3 | NFS_ATTR_FATTR_V4)) {
/*
-diff -NurpP --minimal linux-2.6.29.2/fs/nfs/nfs3xdr.c linux-2.6.29.2-vs2.3.0.36.12/fs/nfs/nfs3xdr.c
---- linux-2.6.29.2/fs/nfs/nfs3xdr.c 2009-04-30 10:50:35.000000000 +0200
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/nfs/nfs3xdr.c 2009-04-30 12:14:53.000000000 +0200
+diff -NurpP --minimal linux-2.6.29.4/fs/nfs/nfs3xdr.c linux-2.6.29.4-vs2.3.0.36.14/fs/nfs/nfs3xdr.c
+--- linux-2.6.29.4/fs/nfs/nfs3xdr.c 2009-05-23 23:16:53.000000000 +0200
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/nfs/nfs3xdr.c 2009-04-30 12:14:53.000000000 +0200
@@ -22,6 +22,7 @@
#include <linux/nfs3.h>
#include <linux/nfs_fs.h>
if (args->type == NF3CHR || args->type == NF3BLK) {
*p++ = htonl(MAJOR(args->rdev));
*p++ = htonl(MINOR(args->rdev));
-diff -NurpP --minimal linux-2.6.29.2/fs/nfs/nfsroot.c linux-2.6.29.2-vs2.3.0.36.12/fs/nfs/nfsroot.c
---- linux-2.6.29.2/fs/nfs/nfsroot.c 2009-03-24 14:22:26.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/nfs/nfsroot.c 2009-03-24 14:48:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/nfs/nfsroot.c linux-2.6.29.4-vs2.3.0.36.14/fs/nfs/nfsroot.c
+--- linux-2.6.29.4/fs/nfs/nfsroot.c 2009-03-24 14:22:26.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/nfs/nfsroot.c 2009-03-24 14:48:35.000000000 +0100
@@ -119,12 +119,12 @@ static int mount_port __initdata = 0; /
enum {
/* Options that take integer arguments */
default:
printk(KERN_WARNING "Root-NFS: unknown "
"option: %s\n", p);
-diff -NurpP --minimal linux-2.6.29.2/fs/nfs/super.c linux-2.6.29.2-vs2.3.0.36.12/fs/nfs/super.c
---- linux-2.6.29.2/fs/nfs/super.c 2009-03-24 14:22:26.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/nfs/super.c 2009-03-24 16:02:06.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/nfs/super.c linux-2.6.29.4-vs2.3.0.36.14/fs/nfs/super.c
+--- linux-2.6.29.4/fs/nfs/super.c 2009-03-24 14:22:26.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/nfs/super.c 2009-03-24 16:02:06.000000000 +0100
@@ -51,6 +51,7 @@
#include <linux/nfs_xdr.h>
#include <linux/magic.h>
{ 0, NULL, NULL }
};
const struct proc_nfs_info *nfs_infop;
-diff -NurpP --minimal linux-2.6.29.2/fs/nfsd/auth.c linux-2.6.29.2-vs2.3.0.36.12/fs/nfsd/auth.c
---- linux-2.6.29.2/fs/nfsd/auth.c 2009-03-24 14:22:26.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/nfsd/auth.c 2009-03-24 16:09:39.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/nfsd/auth.c linux-2.6.29.4-vs2.3.0.36.14/fs/nfsd/auth.c
+--- linux-2.6.29.4/fs/nfsd/auth.c 2009-03-24 14:22:26.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/nfsd/auth.c 2009-03-24 16:09:39.000000000 +0100
@@ -10,6 +10,7 @@
#include <linux/sunrpc/svcauth.h>
#include <linux/nfsd/nfsd.h>
+ return ret;
}
-diff -NurpP --minimal linux-2.6.29.2/fs/nfsd/nfs3xdr.c linux-2.6.29.2-vs2.3.0.36.12/fs/nfsd/nfs3xdr.c
---- linux-2.6.29.2/fs/nfsd/nfs3xdr.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/nfsd/nfs3xdr.c 2009-02-22 22:54:25.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/nfsd/nfs3xdr.c linux-2.6.29.4-vs2.3.0.36.14/fs/nfsd/nfs3xdr.c
+--- linux-2.6.29.4/fs/nfsd/nfs3xdr.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/nfsd/nfs3xdr.c 2009-02-22 22:54:25.000000000 +0100
@@ -21,6 +21,7 @@
#include <linux/sunrpc/svc.h>
#include <linux/nfsd/nfsd.h>
if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) {
p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN);
} else {
-diff -NurpP --minimal linux-2.6.29.2/fs/nfsd/nfs4xdr.c linux-2.6.29.2-vs2.3.0.36.12/fs/nfsd/nfs4xdr.c
---- linux-2.6.29.2/fs/nfsd/nfs4xdr.c 2009-03-24 14:22:26.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/nfsd/nfs4xdr.c 2009-03-24 14:48:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/nfsd/nfs4xdr.c linux-2.6.29.4-vs2.3.0.36.14/fs/nfsd/nfs4xdr.c
+--- linux-2.6.29.4/fs/nfsd/nfs4xdr.c 2009-05-23 23:16:53.000000000 +0200
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/nfsd/nfs4xdr.c 2009-05-23 23:19:11.000000000 +0200
@@ -56,6 +56,7 @@
#include <linux/nfs4_acl.h>
#include <linux/sunrpc/gss_api.h>
if (status == nfserr_resource)
goto out_resource;
if (status)
-diff -NurpP --minimal linux-2.6.29.2/fs/nfsd/nfsxdr.c linux-2.6.29.2-vs2.3.0.36.12/fs/nfsd/nfsxdr.c
---- linux-2.6.29.2/fs/nfsd/nfsxdr.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/nfsd/nfsxdr.c 2009-02-22 22:54:25.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/nfsd/nfsxdr.c linux-2.6.29.4-vs2.3.0.36.14/fs/nfsd/nfsxdr.c
+--- linux-2.6.29.4/fs/nfsd/nfsxdr.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/nfsd/nfsxdr.c 2009-02-22 22:54:25.000000000 +0100
@@ -15,6 +15,7 @@
#include <linux/nfsd/nfsd.h>
#include <linux/nfsd/xdr.h>
if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
*p++ = htonl(NFS_MAXPATHLEN);
-diff -NurpP --minimal linux-2.6.29.2/fs/ocfs2/dlm/dlmfs.c linux-2.6.29.2-vs2.3.0.36.12/fs/ocfs2/dlm/dlmfs.c
---- linux-2.6.29.2/fs/ocfs2/dlm/dlmfs.c 2009-03-24 14:22:27.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/ocfs2/dlm/dlmfs.c 2009-03-24 16:10:48.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/ocfs2/dlm/dlmfs.c linux-2.6.29.4-vs2.3.0.36.14/fs/ocfs2/dlm/dlmfs.c
+--- linux-2.6.29.4/fs/ocfs2/dlm/dlmfs.c 2009-03-24 14:22:27.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/ocfs2/dlm/dlmfs.c 2009-03-24 16:10:48.000000000 +0100
@@ -43,6 +43,7 @@
#include <linux/init.h>
#include <linux/string.h>
inode->i_mapping->backing_dev_info = &dlmfs_backing_dev_info;
inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
-diff -NurpP --minimal linux-2.6.29.2/fs/ocfs2/dlmglue.c linux-2.6.29.2-vs2.3.0.36.12/fs/ocfs2/dlmglue.c
---- linux-2.6.29.2/fs/ocfs2/dlmglue.c 2009-03-24 14:22:27.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/ocfs2/dlmglue.c 2009-03-24 14:48:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/ocfs2/dlmglue.c linux-2.6.29.4-vs2.3.0.36.14/fs/ocfs2/dlmglue.c
+--- linux-2.6.29.4/fs/ocfs2/dlmglue.c 2009-03-24 14:22:27.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/ocfs2/dlmglue.c 2009-03-24 14:48:35.000000000 +0100
@@ -1885,6 +1885,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.29.2/fs/ocfs2/dlmglue.h linux-2.6.29.2-vs2.3.0.36.12/fs/ocfs2/dlmglue.h
---- linux-2.6.29.2/fs/ocfs2/dlmglue.h 2009-03-24 14:22:27.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/ocfs2/dlmglue.h 2009-03-24 14:48:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/ocfs2/dlmglue.h linux-2.6.29.4-vs2.3.0.36.14/fs/ocfs2/dlmglue.h
+--- linux-2.6.29.4/fs/ocfs2/dlmglue.h 2009-03-24 14:22:27.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/ocfs2/dlmglue.h 2009-03-24 14:48:35.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.29.2/fs/ocfs2/file.c linux-2.6.29.2-vs2.3.0.36.12/fs/ocfs2/file.c
---- linux-2.6.29.2/fs/ocfs2/file.c 2009-04-30 10:50:35.000000000 +0200
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/ocfs2/file.c 2009-04-30 12:14:53.000000000 +0200
+diff -NurpP --minimal linux-2.6.29.4/fs/ocfs2/file.c linux-2.6.29.4-vs2.3.0.36.14/fs/ocfs2/file.c
+--- linux-2.6.29.4/fs/ocfs2/file.c 2009-05-23 23:16:53.000000000 +0200
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/ocfs2/file.c 2009-05-23 23:19:11.000000000 +0200
@@ -911,13 +911,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;
-@@ -2074,6 +2076,7 @@ const struct inode_operations ocfs2_file
+@@ -2128,6 +2130,7 @@ const struct inode_operations ocfs2_file
.removexattr = generic_removexattr,
.fallocate = ocfs2_fallocate,
.fiemap = ocfs2_fiemap,
};
const struct inode_operations ocfs2_special_file_iops = {
-diff -NurpP --minimal linux-2.6.29.2/fs/ocfs2/inode.c linux-2.6.29.2-vs2.3.0.36.12/fs/ocfs2/inode.c
---- linux-2.6.29.2/fs/ocfs2/inode.c 2009-03-24 14:22:27.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/ocfs2/inode.c 2009-03-24 16:11:11.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/ocfs2/inode.c linux-2.6.29.4-vs2.3.0.36.14/fs/ocfs2/inode.c
+--- linux-2.6.29.4/fs/ocfs2/inode.c 2009-03-24 14:22:27.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/ocfs2/inode.c 2009-03-24 16:11:11.000000000 +0100
@@ -29,6 +29,7 @@
#include <linux/highmem.h>
#include <linux/pagemap.h>
inode->i_mode = le16_to_cpu(fe->i_mode);
if (S_ISLNK(inode->i_mode) && le32_to_cpu(fe->i_clusters) == 0)
inode->i_blocks = 0;
-diff -NurpP --minimal linux-2.6.29.2/fs/ocfs2/inode.h linux-2.6.29.2-vs2.3.0.36.12/fs/ocfs2/inode.h
---- linux-2.6.29.2/fs/ocfs2/inode.h 2009-03-24 14:22:27.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/ocfs2/inode.h 2009-03-24 14:48:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/ocfs2/inode.h linux-2.6.29.4-vs2.3.0.36.14/fs/ocfs2/inode.h
+--- linux-2.6.29.4/fs/ocfs2/inode.h 2009-03-24 14:22:27.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/ocfs2/inode.h 2009-03-24 14:48:35.000000000 +0100
@@ -147,6 +147,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.29.2/fs/ocfs2/ioctl.c linux-2.6.29.2-vs2.3.0.36.12/fs/ocfs2/ioctl.c
---- linux-2.6.29.2/fs/ocfs2/ioctl.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/ocfs2/ioctl.c 2009-02-22 22:54:25.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/ocfs2/ioctl.c linux-2.6.29.4-vs2.3.0.36.14/fs/ocfs2/ioctl.c
+--- linux-2.6.29.4/fs/ocfs2/ioctl.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/ocfs2/ioctl.c 2009-02-22 22:54:25.000000000 +0100
@@ -42,7 +42,7 @@ static int ocfs2_get_inode_attr(struct i
return status;
}
handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS);
if (IS_ERR(handle)) {
status = PTR_ERR(handle);
-diff -NurpP --minimal linux-2.6.29.2/fs/ocfs2/ioctl.h linux-2.6.29.2-vs2.3.0.36.12/fs/ocfs2/ioctl.h
---- linux-2.6.29.2/fs/ocfs2/ioctl.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/ocfs2/ioctl.h 2009-02-22 22:54:25.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/ocfs2/ioctl.h linux-2.6.29.4-vs2.3.0.36.14/fs/ocfs2/ioctl.h
+--- linux-2.6.29.4/fs/ocfs2/ioctl.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/ocfs2/ioctl.h 2009-02-22 22:54:25.000000000 +0100
@@ -10,6 +10,9 @@
#ifndef OCFS2_IOCTL_H
#define OCFS2_IOCTL_H
long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg);
long ocfs2_compat_ioctl(struct file *file, unsigned cmd, unsigned long arg);
-diff -NurpP --minimal linux-2.6.29.2/fs/ocfs2/namei.c linux-2.6.29.2-vs2.3.0.36.12/fs/ocfs2/namei.c
---- linux-2.6.29.2/fs/ocfs2/namei.c 2009-03-24 14:22:27.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/ocfs2/namei.c 2009-03-25 01:04:31.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/ocfs2/namei.c linux-2.6.29.4-vs2.3.0.36.14/fs/ocfs2/namei.c
+--- linux-2.6.29.4/fs/ocfs2/namei.c 2009-03-24 14:22:27.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/ocfs2/namei.c 2009-03-25 01:04:31.000000000 +0100
@@ -41,6 +41,7 @@
#include <linux/slab.h>
#include <linux/highmem.h>
.permission = ocfs2_permission,
.setxattr = generic_setxattr,
.getxattr = generic_getxattr,
-diff -NurpP --minimal linux-2.6.29.2/fs/ocfs2/ocfs2_fs.h linux-2.6.29.2-vs2.3.0.36.12/fs/ocfs2/ocfs2_fs.h
---- linux-2.6.29.2/fs/ocfs2/ocfs2_fs.h 2009-03-24 14:22:27.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/ocfs2/ocfs2_fs.h 2009-03-24 14:48:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/ocfs2/ocfs2_fs.h linux-2.6.29.4-vs2.3.0.36.14/fs/ocfs2/ocfs2_fs.h
+--- linux-2.6.29.4/fs/ocfs2/ocfs2_fs.h 2009-03-24 14:22:27.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/ocfs2/ocfs2_fs.h 2009-03-24 14:48:35.000000000 +0100
@@ -219,18 +219,23 @@
#define OCFS2_INDEXED_DIR_FL (0x0008)
/*
* Extent record flags (e_node.leaf.flags)
-diff -NurpP --minimal linux-2.6.29.2/fs/ocfs2/ocfs2.h linux-2.6.29.2-vs2.3.0.36.12/fs/ocfs2/ocfs2.h
---- linux-2.6.29.2/fs/ocfs2/ocfs2.h 2009-03-24 14:22:27.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/ocfs2/ocfs2.h 2009-03-24 16:18:22.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/ocfs2/ocfs2.h linux-2.6.29.4-vs2.3.0.36.14/fs/ocfs2/ocfs2.h
+--- linux-2.6.29.4/fs/ocfs2/ocfs2.h 2009-03-24 14:22:27.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/ocfs2/ocfs2.h 2009-03-24 16:18:22.000000000 +0100
@@ -199,6 +199,7 @@ enum ocfs2_mount_options
OCFS2_MOUNT_POSIX_ACL = 1 << 8, /* POSIX access control lists */
OCFS2_MOUNT_USRQUOTA = 1 << 9, /* We support user quotas */
};
#define OCFS2_OSB_SOFT_RO 0x0001
-diff -NurpP --minimal linux-2.6.29.2/fs/ocfs2/super.c linux-2.6.29.2-vs2.3.0.36.12/fs/ocfs2/super.c
---- linux-2.6.29.2/fs/ocfs2/super.c 2009-03-24 14:22:27.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/ocfs2/super.c 2009-03-24 16:19:44.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/ocfs2/super.c linux-2.6.29.4-vs2.3.0.36.14/fs/ocfs2/super.c
+--- linux-2.6.29.4/fs/ocfs2/super.c 2009-03-24 14:22:27.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/ocfs2/super.c 2009-03-24 16:19:44.000000000 +0100
@@ -172,6 +172,7 @@ enum {
Opt_noacl,
Opt_usrquota,
default:
mlog(ML_ERROR,
"Unrecognized mount option \"%s\" "
-diff -NurpP --minimal linux-2.6.29.2/fs/open.c linux-2.6.29.2-vs2.3.0.36.12/fs/open.c
---- linux-2.6.29.2/fs/open.c 2009-03-24 14:22:27.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/open.c 2009-03-24 14:48:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/open.c linux-2.6.29.4-vs2.3.0.36.14/fs/open.c
+--- linux-2.6.29.4/fs/open.c 2009-03-24 14:22:27.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/open.c 2009-03-24 14:48:35.000000000 +0100
@@ -29,22 +29,31 @@
#include <linux/rcupdate.h>
#include <linux/audit.h>
}
void put_unused_fd(unsigned int fd)
-diff -NurpP --minimal linux-2.6.29.2/fs/proc/array.c linux-2.6.29.2-vs2.3.0.36.12/fs/proc/array.c
---- linux-2.6.29.2/fs/proc/array.c 2009-03-24 14:22:27.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/proc/array.c 2009-03-25 01:07:51.000000000 +0100
-@@ -81,6 +81,8 @@
- #include <linux/seq_file.h>
+diff -NurpP --minimal linux-2.6.29.4/fs/proc/array.c linux-2.6.29.4-vs2.3.0.36.14/fs/proc/array.c
+--- linux-2.6.29.4/fs/proc/array.c 2009-05-23 23:16:53.000000000 +0200
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/proc/array.c 2009-05-10 23:42:01.000000000 +0200
+@@ -82,6 +82,8 @@
#include <linux/pid_namespace.h>
+ #include <linux/ptrace.h>
#include <linux/tracehook.h>
+#include <linux/vs_context.h>
+#include <linux/vs_network.h>
#include <asm/pgtable.h>
#include <asm/processor.h>
-@@ -137,8 +139,9 @@ static const char *task_state_array[] =
+@@ -138,8 +140,9 @@ static const char *task_state_array[] =
"D (disk sleep)", /* 2 */
"T (stopped)", /* 4 */
"T (tracing stop)", /* 8 */
};
static inline const char *get_task_state(struct task_struct *tsk)
-@@ -165,6 +168,9 @@ static inline void task_state(struct seq
+@@ -166,6 +169,9 @@ static inline void task_state(struct seq
rcu_read_lock();
ppid = pid_alive(p) ?
task_tgid_nr_ns(rcu_dereference(p->real_parent), ns) : 0;
tpid = 0;
if (pid_alive(p)) {
struct task_struct *tracer = tracehook_tracer_task(p);
-@@ -280,7 +286,7 @@ static inline void task_sig(struct seq_f
+@@ -281,7 +287,7 @@ static inline void task_sig(struct seq_f
}
static void render_cap_t(struct seq_file *m, const char *header,
{
unsigned __capi;
-@@ -305,10 +311,11 @@ static inline void task_cap(struct seq_f
+@@ -306,10 +312,11 @@ static inline void task_cap(struct seq_f
cap_bset = cred->cap_bset;
rcu_read_unlock();
}
static inline void task_context_switch_counts(struct seq_file *m,
-@@ -320,6 +327,42 @@ static inline void task_context_switch_c
+@@ -321,6 +328,42 @@ static inline void task_context_switch_c
p->nivcsw);
}
int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
struct pid *pid, struct task_struct *task)
{
-@@ -335,6 +378,7 @@ int proc_pid_status(struct seq_file *m,
+@@ -336,6 +379,7 @@ int proc_pid_status(struct seq_file *m,
task_sig(m, task);
task_cap(m, task);
cpuset_task_status_allowed(m, task);
#if defined(CONFIG_S390)
task_show_regs(m, task);
#endif
-@@ -447,6 +491,17 @@ static int do_task_stat(struct seq_file
+@@ -452,6 +496,17 @@ static int do_task_stat(struct seq_file
/* convert nsec -> ticks */
start_time = nsec_to_clock_t(start_time);
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.29.2/fs/proc/base.c linux-2.6.29.2-vs2.3.0.36.12/fs/proc/base.c
---- linux-2.6.29.2/fs/proc/base.c 2009-03-24 14:22:27.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/proc/base.c 2009-03-24 16:29:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/proc/base.c linux-2.6.29.4-vs2.3.0.36.14/fs/proc/base.c
+--- linux-2.6.29.4/fs/proc/base.c 2009-05-23 23:16:53.000000000 +0200
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/proc/base.c 2009-05-10 23:42:01.000000000 +0200
@@ -80,6 +80,8 @@
#include <linux/oom.h>
#include <linux/elf.h>
#include "internal.h"
/* NOTE:
-@@ -1458,6 +1460,8 @@ static struct inode *proc_pid_make_inode
+@@ -1443,6 +1445,8 @@ static struct inode *proc_pid_make_inode
inode->i_gid = cred->egid;
rcu_read_unlock();
}
security_task_to_inode(task, inode);
out:
-@@ -2008,6 +2012,13 @@ static struct dentry *proc_pident_lookup
+@@ -1993,6 +1997,13 @@ static struct dentry *proc_pident_lookup
if (!task)
goto out_no_task;
/*
* Yes, it does not scale. And it should not. Don't add
* new entries into /proc/<tgid>/ without very good reasons.
-@@ -2393,7 +2404,7 @@ out_iput:
+@@ -2378,7 +2389,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);
-@@ -2483,6 +2494,9 @@ static int proc_pid_personality(struct s
+@@ -2468,6 +2479,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),
-@@ -2541,6 +2555,8 @@ static const struct pid_entry tgid_base_
+@@ -2526,6 +2540,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),
#ifdef CONFIG_AUDITSYSCALL
-@@ -2556,6 +2572,7 @@ static const struct pid_entry tgid_base_
+@@ -2541,6 +2557,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,
-@@ -2752,7 +2769,7 @@ retry:
+@@ -2737,7 +2754,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
-@@ -2782,7 +2799,7 @@ static int proc_pid_fill_cache(struct fi
+@@ -2767,7 +2784,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);
}
-@@ -2791,7 +2808,7 @@ static int proc_pid_fill_cache(struct fi
+@@ -2776,7 +2793,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;
-@@ -2811,6 +2828,8 @@ int proc_pid_readdir(struct file * filp,
+@@ -2796,6 +2813,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;
-@@ -2957,6 +2976,8 @@ static struct dentry *proc_task_lookup(s
+@@ -2942,6 +2961,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.29.2/fs/proc/generic.c linux-2.6.29.2-vs2.3.0.36.12/fs/proc/generic.c
---- linux-2.6.29.2/fs/proc/generic.c 2009-03-24 14:22:27.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/proc/generic.c 2009-03-24 14:48:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/proc/generic.c linux-2.6.29.4-vs2.3.0.36.14/fs/proc/generic.c
+--- linux-2.6.29.4/fs/proc/generic.c 2009-03-24 14:22:27.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/proc/generic.c 2009-03-24 14:48:35.000000000 +0100
@@ -20,6 +20,7 @@
#include <linux/bitops.h>
#include <linux/spinlock.h>
} else {
kfree(ent);
ent = NULL;
-diff -NurpP --minimal linux-2.6.29.2/fs/proc/inode.c linux-2.6.29.2-vs2.3.0.36.12/fs/proc/inode.c
---- linux-2.6.29.2/fs/proc/inode.c 2009-03-24 14:22:27.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/proc/inode.c 2009-03-24 14:48:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/proc/inode.c linux-2.6.29.4-vs2.3.0.36.14/fs/proc/inode.c
+--- linux-2.6.29.4/fs/proc/inode.c 2009-03-24 14:22:27.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/proc/inode.c 2009-03-24 14:48:35.000000000 +0100
@@ -465,6 +465,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.29.2/fs/proc/internal.h linux-2.6.29.2-vs2.3.0.36.12/fs/proc/internal.h
---- linux-2.6.29.2/fs/proc/internal.h 2009-03-24 14:22:27.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/proc/internal.h 2009-03-24 14:48:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/proc/internal.h linux-2.6.29.4-vs2.3.0.36.14/fs/proc/internal.h
+--- linux-2.6.29.4/fs/proc/internal.h 2009-03-24 14:22:27.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/proc/internal.h 2009-03-24 14:48:35.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.29.2/fs/proc/meminfo.c linux-2.6.29.2-vs2.3.0.36.12/fs/proc/meminfo.c
---- linux-2.6.29.2/fs/proc/meminfo.c 2009-03-24 14:22:27.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/proc/meminfo.c 2009-03-24 14:48:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/proc/loadavg.c linux-2.6.29.4-vs2.3.0.36.14/fs/proc/loadavg.c
+--- linux-2.6.29.4/fs/proc/loadavg.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/proc/loadavg.c 2009-05-20 00:24:34.000000000 +0200
+@@ -12,21 +12,37 @@
+
+ static int loadavg_proc_show(struct seq_file *m, void *v)
+ {
++ unsigned long running;
++ unsigned int threads;
+ int a, b, c;
+ unsigned long seq;
+
+ do {
+ seq = read_seqbegin(&xtime_lock);
+- a = avenrun[0] + (FIXED_1/200);
+- b = avenrun[1] + (FIXED_1/200);
+- c = avenrun[2] + (FIXED_1/200);
++ if (vx_flags(VXF_VIRT_LOAD, 0)) {
++ struct vx_info *vxi = current->vx_info;
++
++ a = vxi->cvirt.load[0] + (FIXED_1/200);
++ b = vxi->cvirt.load[1] + (FIXED_1/200);
++ c = vxi->cvirt.load[2] + (FIXED_1/200);
++
++ running = atomic_read(&vxi->cvirt.nr_running);
++ threads = atomic_read(&vxi->cvirt.nr_threads);
++ } else {
++ a = avenrun[0] + (FIXED_1/200);
++ b = avenrun[1] + (FIXED_1/200);
++ c = avenrun[2] + (FIXED_1/200);
++
++ running = nr_running();
++ threads = nr_threads;
++ }
+ } while (read_seqretry(&xtime_lock, seq));
+
+ seq_printf(m, "%d.%02d %d.%02d %d.%02d %ld/%d %d\n",
+ LOAD_INT(a), LOAD_FRAC(a),
+ LOAD_INT(b), LOAD_FRAC(b),
+ LOAD_INT(c), LOAD_FRAC(c),
+- nr_running(), nr_threads,
++ running, threads,
+ task_active_pid_ns(current)->last_pid);
+ return 0;
+ }
+diff -NurpP --minimal linux-2.6.29.4/fs/proc/meminfo.c linux-2.6.29.4-vs2.3.0.36.14/fs/proc/meminfo.c
+--- linux-2.6.29.4/fs/proc/meminfo.c 2009-05-23 23:16:53.000000000 +0200
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/proc/meminfo.c 2009-05-10 23:42:01.000000000 +0200
@@ -41,7 +41,7 @@ static int meminfo_proc_show(struct seq_
cached = global_page_state(NR_FILE_PAGES) -
cached = 0;
get_vmalloc_info(&vmi);
-diff -NurpP --minimal linux-2.6.29.2/fs/proc/root.c linux-2.6.29.2-vs2.3.0.36.12/fs/proc/root.c
---- linux-2.6.29.2/fs/proc/root.c 2009-03-24 14:22:27.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/proc/root.c 2009-03-24 14:48:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/proc/root.c linux-2.6.29.4-vs2.3.0.36.14/fs/proc/root.c
+--- linux-2.6.29.4/fs/proc/root.c 2009-03-24 14:22:27.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/proc/root.c 2009-03-24 14:48:35.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.29.2/fs/proc/uptime.c linux-2.6.29.2-vs2.3.0.36.12/fs/proc/uptime.c
---- linux-2.6.29.2/fs/proc/uptime.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/proc/uptime.c 2009-02-22 22:54:25.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/proc/uptime.c linux-2.6.29.4-vs2.3.0.36.14/fs/proc/uptime.c
+--- linux-2.6.29.4/fs/proc/uptime.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/proc/uptime.c 2009-02-22 22:54:25.000000000 +0100
@@ -2,6 +2,7 @@
#include <linux/proc_fs.h>
#include <linux/sched.h>
len = sprintf(page, "%lu.%02lu %lu.%02lu\n",
(unsigned long) uptime.tv_sec,
(uptime.tv_nsec / (NSEC_PER_SEC / 100)),
-diff -NurpP --minimal linux-2.6.29.2/fs/quota.c linux-2.6.29.2-vs2.3.0.36.12/fs/quota.c
---- linux-2.6.29.2/fs/quota.c 2009-03-24 14:22:27.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/quota.c 2009-03-24 14:48:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/quota.c linux-2.6.29.4-vs2.3.0.36.14/fs/quota.c
+--- linux-2.6.29.4/fs/quota.c 2009-03-24 14:22:27.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/quota.c 2009-03-24 14:48:35.000000000 +0100
@@ -18,6 +18,7 @@
#include <linux/capability.h>
#include <linux/quotaops.h>
sb = get_super(bdev);
bdput(bdev);
if (!sb)
-diff -NurpP --minimal linux-2.6.29.2/fs/reiserfs/bitmap.c linux-2.6.29.2-vs2.3.0.36.12/fs/reiserfs/bitmap.c
---- linux-2.6.29.2/fs/reiserfs/bitmap.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/reiserfs/bitmap.c 2009-02-22 22:54:25.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/reiserfs/bitmap.c linux-2.6.29.4-vs2.3.0.36.14/fs/reiserfs/bitmap.c
+--- linux-2.6.29.4/fs/reiserfs/bitmap.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/reiserfs/bitmap.c 2009-02-22 22:54:25.000000000 +0100
@@ -13,6 +13,7 @@
#include <linux/reiserfs_fs_sb.h>
#include <linux/reiserfs_fs_i.h>
}
return CARRY_ON;
-diff -NurpP --minimal linux-2.6.29.2/fs/reiserfs/file.c linux-2.6.29.2-vs2.3.0.36.12/fs/reiserfs/file.c
---- linux-2.6.29.2/fs/reiserfs/file.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/reiserfs/file.c 2009-02-22 22:54:25.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/reiserfs/file.c linux-2.6.29.4-vs2.3.0.36.14/fs/reiserfs/file.c
+--- linux-2.6.29.4/fs/reiserfs/file.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/reiserfs/file.c 2009-02-22 22:54:25.000000000 +0100
@@ -307,4 +307,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.29.2/fs/reiserfs/inode.c linux-2.6.29.2-vs2.3.0.36.12/fs/reiserfs/inode.c
---- linux-2.6.29.2/fs/reiserfs/inode.c 2009-03-24 14:22:27.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/reiserfs/inode.c 2009-03-24 14:48:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/reiserfs/inode.c linux-2.6.29.4-vs2.3.0.36.14/fs/reiserfs/inode.c
+--- linux-2.6.29.4/fs/reiserfs/inode.c 2009-03-24 14:22:27.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/reiserfs/inode.c 2009-03-24 14:48:35.000000000 +0100
@@ -18,6 +18,8 @@
#include <linux/writeback.h>
#include <linux/quotaops.h>
mark_inode_dirty(inode);
error =
journal_end(&th, inode->i_sb, jbegin_count);
-diff -NurpP --minimal linux-2.6.29.2/fs/reiserfs/ioctl.c linux-2.6.29.2-vs2.3.0.36.12/fs/reiserfs/ioctl.c
---- linux-2.6.29.2/fs/reiserfs/ioctl.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/reiserfs/ioctl.c 2009-02-22 22:54:25.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/reiserfs/ioctl.c linux-2.6.29.4-vs2.3.0.36.14/fs/reiserfs/ioctl.c
+--- linux-2.6.29.4/fs/reiserfs/ioctl.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/reiserfs/ioctl.c 2009-02-22 22:54:25.000000000 +0100
@@ -7,6 +7,7 @@
#include <linux/mount.h>
#include <linux/reiserfs_fs.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.29.2/fs/reiserfs/namei.c linux-2.6.29.2-vs2.3.0.36.12/fs/reiserfs/namei.c
---- linux-2.6.29.2/fs/reiserfs/namei.c 2009-03-24 14:22:27.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/reiserfs/namei.c 2009-03-24 14:48:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/reiserfs/namei.c linux-2.6.29.4-vs2.3.0.36.14/fs/reiserfs/namei.c
+--- linux-2.6.29.4/fs/reiserfs/namei.c 2009-03-24 14:22:27.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/reiserfs/namei.c 2009-03-24 14:48:35.000000000 +0100
@@ -17,6 +17,7 @@
#include <linux/reiserfs_acl.h>
#include <linux/reiserfs_xattr.h>
+ .sync_flags = reiserfs_sync_flags,
};
-diff -NurpP --minimal linux-2.6.29.2/fs/reiserfs/stree.c linux-2.6.29.2-vs2.3.0.36.12/fs/reiserfs/stree.c
---- linux-2.6.29.2/fs/reiserfs/stree.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/reiserfs/stree.c 2009-02-22 22:54:25.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/reiserfs/stree.c linux-2.6.29.4-vs2.3.0.36.14/fs/reiserfs/stree.c
+--- linux-2.6.29.4/fs/reiserfs/stree.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/reiserfs/stree.c 2009-02-22 22:54:25.000000000 +0100
@@ -55,6 +55,7 @@
#include <linux/reiserfs_fs.h>
#include <linux/buffer_head.h>
+ }
return retval;
}
-diff -NurpP --minimal linux-2.6.29.2/fs/reiserfs/super.c linux-2.6.29.2-vs2.3.0.36.12/fs/reiserfs/super.c
---- linux-2.6.29.2/fs/reiserfs/super.c 2009-03-24 14:22:27.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/reiserfs/super.c 2009-03-24 14:48:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/reiserfs/super.c linux-2.6.29.4-vs2.3.0.36.14/fs/reiserfs/super.c
+--- linux-2.6.29.4/fs/reiserfs/super.c 2009-03-24 14:22:27.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/reiserfs/super.c 2009-03-24 14:48:35.000000000 +0100
@@ -902,6 +902,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.29.2/fs/reiserfs/xattr.c linux-2.6.29.2-vs2.3.0.36.12/fs/reiserfs/xattr.c
---- linux-2.6.29.2/fs/reiserfs/xattr.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/reiserfs/xattr.c 2009-02-22 22:54:25.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/reiserfs/xattr.c linux-2.6.29.4-vs2.3.0.36.14/fs/reiserfs/xattr.c
+--- linux-2.6.29.4/fs/reiserfs/xattr.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/reiserfs/xattr.c 2009-02-22 22:54:25.000000000 +0100
@@ -35,6 +35,7 @@
#include <linux/namei.h>
#include <linux/errno.h>
#include <linux/file.h>
#include <linux/pagemap.h>
#include <linux/xattr.h>
-diff -NurpP --minimal linux-2.6.29.2/fs/stat.c linux-2.6.29.2-vs2.3.0.36.12/fs/stat.c
---- linux-2.6.29.2/fs/stat.c 2009-03-24 14:22:36.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/stat.c 2009-03-24 14:48:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/stat.c linux-2.6.29.4-vs2.3.0.36.14/fs/stat.c
+--- linux-2.6.29.4/fs/stat.c 2009-03-24 14:22:36.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/stat.c 2009-03-24 14:48:35.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.29.2/fs/super.c linux-2.6.29.2-vs2.3.0.36.12/fs/super.c
---- linux-2.6.29.2/fs/super.c 2009-03-24 14:22:36.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/super.c 2009-03-24 16:32:06.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/super.c linux-2.6.29.4-vs2.3.0.36.14/fs/super.c
+--- linux-2.6.29.4/fs/super.c 2009-03-24 14:22:36.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/super.c 2009-03-24 16:32:06.000000000 +0100
@@ -39,6 +39,9 @@
#include <linux/mutex.h>
#include <linux/file.h>
if (error)
goto out_sb;
-diff -NurpP --minimal linux-2.6.29.2/fs/sysfs/mount.c linux-2.6.29.2-vs2.3.0.36.12/fs/sysfs/mount.c
---- linux-2.6.29.2/fs/sysfs/mount.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/sysfs/mount.c 2009-02-22 22:54:25.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/sysfs/mount.c linux-2.6.29.4-vs2.3.0.36.14/fs/sysfs/mount.c
+--- linux-2.6.29.4/fs/sysfs/mount.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/sysfs/mount.c 2009-02-22 22:54:25.000000000 +0100
@@ -20,8 +20,6 @@
#include "sysfs.h"
sb->s_op = &sysfs_ops;
sb->s_time_gran = 1;
sysfs_sb = sb;
-diff -NurpP --minimal linux-2.6.29.2/fs/utimes.c linux-2.6.29.2-vs2.3.0.36.12/fs/utimes.c
---- linux-2.6.29.2/fs/utimes.c 2009-03-24 14:22:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/utimes.c 2009-02-22 22:54:25.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/utimes.c linux-2.6.29.4-vs2.3.0.36.14/fs/utimes.c
+--- linux-2.6.29.4/fs/utimes.c 2009-03-24 14:22:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/utimes.c 2009-02-22 22:54:25.000000000 +0100
@@ -8,6 +8,8 @@
#include <linux/stat.h>
#include <linux/utime.h>
#include <asm/uaccess.h>
#include <asm/unistd.h>
-diff -NurpP --minimal linux-2.6.29.2/fs/xattr.c linux-2.6.29.2-vs2.3.0.36.12/fs/xattr.c
---- linux-2.6.29.2/fs/xattr.c 2009-03-24 14:22:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/xattr.c 2009-03-24 14:48:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/xattr.c linux-2.6.29.4-vs2.3.0.36.14/fs/xattr.c
+--- linux-2.6.29.4/fs/xattr.c 2009-03-24 14:22:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/xattr.c 2009-03-24 14:48:35.000000000 +0100
@@ -18,6 +18,7 @@
#include <linux/module.h>
#include <linux/fsnotify.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.29.2/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.29.2-vs2.3.0.36.12/fs/xfs/linux-2.6/xfs_ioctl.c
---- linux-2.6.29.2/fs/xfs/linux-2.6/xfs_ioctl.c 2009-03-24 14:22:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/xfs/linux-2.6/xfs_ioctl.c 2009-03-24 14:48:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.29.4-vs2.3.0.36.14/fs/xfs/linux-2.6/xfs_ioctl.c
+--- linux-2.6.29.4/fs/xfs/linux-2.6/xfs_ioctl.c 2009-03-24 14:22:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/xfs/linux-2.6/xfs_ioctl.c 2009-03-24 14:48:35.000000000 +0100
@@ -769,6 +769,10 @@ xfs_merge_ioc_xflags(
xflags |= XFS_XFLAG_IMMUTABLE;
else
return xfs_ioc_setxflags(ip, filp, arg);
case XFS_IOC_FSSETDM: {
-diff -NurpP --minimal linux-2.6.29.2/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.29.2-vs2.3.0.36.12/fs/xfs/linux-2.6/xfs_iops.c
---- linux-2.6.29.2/fs/xfs/linux-2.6/xfs_iops.c 2009-03-24 14:22:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/xfs/linux-2.6/xfs_iops.c 2009-03-24 16:33:10.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.29.4-vs2.3.0.36.14/fs/xfs/linux-2.6/xfs_iops.c
+--- linux-2.6.29.4/fs/xfs/linux-2.6/xfs_iops.c 2009-03-24 14:22:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/xfs/linux-2.6/xfs_iops.c 2009-03-24 16:33:10.000000000 +0100
@@ -54,6 +54,7 @@
#include <linux/security.h>
#include <linux/falloc.h>
switch (inode->i_mode & S_IFMT) {
case S_IFBLK:
-diff -NurpP --minimal linux-2.6.29.2/fs/xfs/linux-2.6/xfs_linux.h linux-2.6.29.2-vs2.3.0.36.12/fs/xfs/linux-2.6/xfs_linux.h
---- linux-2.6.29.2/fs/xfs/linux-2.6/xfs_linux.h 2009-03-24 14:22:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/xfs/linux-2.6/xfs_linux.h 2009-03-25 01:26:04.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/xfs/linux-2.6/xfs_linux.h linux-2.6.29.4-vs2.3.0.36.14/fs/xfs/linux-2.6/xfs_linux.h
+--- linux-2.6.29.4/fs/xfs/linux-2.6/xfs_linux.h 2009-03-24 14:22:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/xfs/linux-2.6/xfs_linux.h 2009-03-25 01:26:04.000000000 +0100
@@ -119,6 +119,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.29.2/fs/xfs/linux-2.6/xfs_super.c linux-2.6.29.2-vs2.3.0.36.12/fs/xfs/linux-2.6/xfs_super.c
---- linux-2.6.29.2/fs/xfs/linux-2.6/xfs_super.c 2009-03-24 14:22:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/xfs/linux-2.6/xfs_super.c 2009-03-25 01:48:51.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/xfs/linux-2.6/xfs_super.c linux-2.6.29.4-vs2.3.0.36.14/fs/xfs/linux-2.6/xfs_super.c
+--- linux-2.6.29.4/fs/xfs/linux-2.6/xfs_super.c 2009-03-24 14:22:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/xfs/linux-2.6/xfs_super.c 2009-03-25 01:48:51.000000000 +0100
@@ -120,6 +120,9 @@ mempool_t *xfs_ioend_pool;
#define MNTOPT_DMAPI "dmapi" /* DMI enabled (DMAPI / XDSM) */
#define MNTOPT_XDSM "xdsm" /* DMI enabled (DMAPI / XDSM) */
sb->s_dirt = 1;
sb->s_magic = XFS_SB_MAGIC;
sb->s_blocksize = mp->m_sb.sb_blocksize;
-diff -NurpP --minimal linux-2.6.29.2/fs/xfs/quota/xfs_qm_syscalls.c linux-2.6.29.2-vs2.3.0.36.12/fs/xfs/quota/xfs_qm_syscalls.c
---- linux-2.6.29.2/fs/xfs/quota/xfs_qm_syscalls.c 2009-03-24 14:22:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/xfs/quota/xfs_qm_syscalls.c 2009-03-24 14:48:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/xfs/quota/xfs_qm_syscalls.c linux-2.6.29.4-vs2.3.0.36.14/fs/xfs/quota/xfs_qm_syscalls.c
+--- linux-2.6.29.4/fs/xfs/quota/xfs_qm_syscalls.c 2009-03-24 14:22:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/xfs/quota/xfs_qm_syscalls.c 2009-03-24 14:48:35.000000000 +0100
@@ -426,7 +426,7 @@ xfs_qm_scall_quotaon(
uint accflags;
__int64_t sbflags;
return XFS_ERROR(EPERM);
flags &= (XFS_ALL_QUOTA_ACCT | XFS_ALL_QUOTA_ENFD);
-diff -NurpP --minimal linux-2.6.29.2/fs/xfs/xfs_dinode.h linux-2.6.29.2-vs2.3.0.36.12/fs/xfs/xfs_dinode.h
---- linux-2.6.29.2/fs/xfs/xfs_dinode.h 2009-03-24 14:22:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/xfs/xfs_dinode.h 2009-03-24 16:38:27.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/xfs/xfs_dinode.h linux-2.6.29.4-vs2.3.0.36.14/fs/xfs/xfs_dinode.h
+--- linux-2.6.29.4/fs/xfs/xfs_dinode.h 2009-03-24 14:22:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/xfs/xfs_dinode.h 2009-03-24 16:38:27.000000000 +0100
@@ -50,7 +50,9 @@ typedef struct xfs_dinode {
__be32 di_gid; /* owner's group id */
__be32 di_nlink; /* number of links to file */
+#define XFS_DIVFLAG_COW 0x02
#endif /* __XFS_DINODE_H__ */
-diff -NurpP --minimal linux-2.6.29.2/fs/xfs/xfs_fs.h linux-2.6.29.2-vs2.3.0.36.12/fs/xfs/xfs_fs.h
---- linux-2.6.29.2/fs/xfs/xfs_fs.h 2009-03-24 14:22:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/xfs/xfs_fs.h 2009-03-24 14:48:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/xfs/xfs_fs.h linux-2.6.29.4-vs2.3.0.36.14/fs/xfs/xfs_fs.h
+--- linux-2.6.29.4/fs/xfs/xfs_fs.h 2009-03-24 14:22:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/xfs/xfs_fs.h 2009-03-24 14:48:35.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.29.2/fs/xfs/xfs_ialloc.c linux-2.6.29.2-vs2.3.0.36.12/fs/xfs/xfs_ialloc.c
---- linux-2.6.29.2/fs/xfs/xfs_ialloc.c 2009-03-24 14:22:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/xfs/xfs_ialloc.c 2009-03-24 17:03:17.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/xfs/xfs_ialloc.c linux-2.6.29.4-vs2.3.0.36.14/fs/xfs/xfs_ialloc.c
+--- linux-2.6.29.4/fs/xfs/xfs_ialloc.c 2009-03-24 14:22:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/xfs/xfs_ialloc.c 2009-03-24 17:03:17.000000000 +0100
@@ -41,7 +41,6 @@
#include "xfs_error.h"
#include "xfs_bmap.h"
/*
* Allocation group level functions.
*/
-diff -NurpP --minimal linux-2.6.29.2/fs/xfs/xfs_inode.c linux-2.6.29.2-vs2.3.0.36.12/fs/xfs/xfs_inode.c
---- linux-2.6.29.2/fs/xfs/xfs_inode.c 2009-03-24 14:22:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/xfs/xfs_inode.c 2009-03-25 01:42:50.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/xfs/xfs_inode.c linux-2.6.29.4-vs2.3.0.36.14/fs/xfs/xfs_inode.c
+--- linux-2.6.29.4/fs/xfs/xfs_inode.c 2009-03-24 14:22:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/xfs/xfs_inode.c 2009-03-25 01:42:50.000000000 +0100
@@ -250,6 +250,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.29.2/fs/xfs/xfs_inode.h linux-2.6.29.2-vs2.3.0.36.12/fs/xfs/xfs_inode.h
---- linux-2.6.29.2/fs/xfs/xfs_inode.h 2009-03-24 14:22:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/xfs/xfs_inode.h 2009-03-25 01:10:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/xfs/xfs_inode.h linux-2.6.29.4-vs2.3.0.36.14/fs/xfs/xfs_inode.h
+--- linux-2.6.29.4/fs/xfs/xfs_inode.h 2009-03-24 14:22:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/xfs/xfs_inode.h 2009-03-25 01:10:35.000000000 +0100
@@ -134,7 +134,9 @@ typedef struct xfs_icdinode {
__uint32_t di_gid; /* owner's group id */
__uint32_t di_nlink; /* number of links to file */
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.29.2/fs/xfs/xfs_itable.c linux-2.6.29.2-vs2.3.0.36.12/fs/xfs/xfs_itable.c
---- linux-2.6.29.2/fs/xfs/xfs_itable.c 2009-03-24 14:22:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/xfs/xfs_itable.c 2009-03-24 14:48:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/xfs/xfs_itable.c linux-2.6.29.4-vs2.3.0.36.14/fs/xfs/xfs_itable.c
+--- linux-2.6.29.4/fs/xfs/xfs_itable.c 2009-03-24 14:22:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/xfs/xfs_itable.c 2009-03-24 14:48:35.000000000 +0100
@@ -82,6 +82,7 @@ xfs_bulkstat_one_iget(
buf->bs_mode = dic->di_mode;
buf->bs_uid = dic->di_uid;
buf->bs_size = dic->di_size;
vn_atime_to_bstime(VFS_I(ip), &buf->bs_atime);
buf->bs_mtime.tv_sec = dic->di_mtime.t_sec;
-diff -NurpP --minimal linux-2.6.29.2/fs/xfs/xfs_log_recover.c linux-2.6.29.2-vs2.3.0.36.12/fs/xfs/xfs_log_recover.c
---- linux-2.6.29.2/fs/xfs/xfs_log_recover.c 2009-03-24 14:22:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/xfs/xfs_log_recover.c 2009-03-24 17:17:15.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/xfs/xfs_log_recover.c linux-2.6.29.4-vs2.3.0.36.14/fs/xfs/xfs_log_recover.c
+--- linux-2.6.29.4/fs/xfs/xfs_log_recover.c 2009-03-24 14:22:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/xfs/xfs_log_recover.c 2009-03-24 17:17:15.000000000 +0100
@@ -2421,7 +2421,8 @@ xlog_recover_do_inode_trans(
}
/* the rest is in on-disk format */
if (item->ri_buf[1].i_len > sizeof(struct xfs_icdinode)) {
-diff -NurpP --minimal linux-2.6.29.2/fs/xfs/xfs_mount.h linux-2.6.29.2-vs2.3.0.36.12/fs/xfs/xfs_mount.h
---- linux-2.6.29.2/fs/xfs/xfs_mount.h 2009-03-24 14:22:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/xfs/xfs_mount.h 2009-03-24 14:48:35.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/xfs/xfs_mount.h linux-2.6.29.4-vs2.3.0.36.14/fs/xfs/xfs_mount.h
+--- linux-2.6.29.4/fs/xfs/xfs_mount.h 2009-03-24 14:22:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/xfs/xfs_mount.h 2009-03-24 14:48:35.000000000 +0100
@@ -371,6 +371,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.29.2/fs/xfs/xfs_vnodeops.c linux-2.6.29.2-vs2.3.0.36.12/fs/xfs/xfs_vnodeops.c
---- linux-2.6.29.2/fs/xfs/xfs_vnodeops.c 2009-03-24 14:22:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/xfs/xfs_vnodeops.c 2009-03-24 17:18:40.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/xfs/xfs_vnodeops.c linux-2.6.29.4-vs2.3.0.36.14/fs/xfs/xfs_vnodeops.c
+--- linux-2.6.29.4/fs/xfs/xfs_vnodeops.c 2009-03-24 14:22:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/xfs/xfs_vnodeops.c 2009-03-24 17:18:40.000000000 +0100
@@ -53,6 +53,90 @@
#include "xfs_filestream.h"
#include "xfs_vnodeops.h"
if (iuid != uid) {
if (XFS_IS_UQUOTA_ON(mp)) {
ASSERT(mask & ATTR_UID);
-diff -NurpP --minimal linux-2.6.29.2/fs/xfs/xfs_vnodeops.h linux-2.6.29.2-vs2.3.0.36.12/fs/xfs/xfs_vnodeops.h
---- linux-2.6.29.2/fs/xfs/xfs_vnodeops.h 2009-03-24 14:22:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/fs/xfs/xfs_vnodeops.h 2009-03-24 17:19:30.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/fs/xfs/xfs_vnodeops.h linux-2.6.29.4-vs2.3.0.36.14/fs/xfs/xfs_vnodeops.h
+--- linux-2.6.29.4/fs/xfs/xfs_vnodeops.h 2009-03-24 14:22:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/fs/xfs/xfs_vnodeops.h 2009-03-24 17:19:30.000000000 +0100
@@ -14,6 +14,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.29.2/include/asm-generic/tlb.h linux-2.6.29.2-vs2.3.0.36.12/include/asm-generic/tlb.h
---- linux-2.6.29.2/include/asm-generic/tlb.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/asm-generic/tlb.h 2009-04-08 15:50:06.000000000 +0200
+diff -NurpP --minimal linux-2.6.29.4/include/asm-generic/tlb.h linux-2.6.29.4-vs2.3.0.36.14/include/asm-generic/tlb.h
+--- linux-2.6.29.4/include/asm-generic/tlb.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/asm-generic/tlb.h 2009-04-08 15:50:06.000000000 +0200
@@ -14,6 +14,7 @@
#define _ASM_GENERIC__TLB_H
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-2.6.29.2/include/linux/capability.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/capability.h
---- linux-2.6.29.2/include/linux/capability.h 2009-04-30 10:50:35.000000000 +0200
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/capability.h 2009-04-30 12:14:53.000000000 +0200
+diff -NurpP --minimal linux-2.6.29.4/include/linux/capability.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/capability.h
+--- linux-2.6.29.4/include/linux/capability.h 2009-05-23 23:16:53.000000000 +0200
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/capability.h 2009-04-30 12:14:53.000000000 +0200
@@ -285,6 +285,7 @@ struct cpu_vfs_cap_data {
arbitrary SCSI commands */
/* Allow setting encryption key on loopback filesystem */
#define cap_valid(x) ((x) >= 0 && (x) <= CAP_LAST_CAP)
-diff -NurpP --minimal linux-2.6.29.2/include/linux/devpts_fs.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/devpts_fs.h
---- linux-2.6.29.2/include/linux/devpts_fs.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/devpts_fs.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/devpts_fs.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/devpts_fs.h
+--- linux-2.6.29.4/include/linux/devpts_fs.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/devpts_fs.h 2009-02-22 22:54:26.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.29.2/include/linux/ext2_fs.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/ext2_fs.h
---- linux-2.6.29.2/include/linux/ext2_fs.h 2009-03-24 14:22:41.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/ext2_fs.h 2009-03-24 15:39:54.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/ext2_fs.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/ext2_fs.h
+--- linux-2.6.29.4/include/linux/ext2_fs.h 2009-03-24 14:22:41.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/ext2_fs.h 2009-03-24 15:39:54.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.29.2/include/linux/ext3_fs.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/ext3_fs.h
---- linux-2.6.29.2/include/linux/ext3_fs.h 2009-03-24 14:22:41.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/ext3_fs.h 2009-03-24 14:48:36.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/ext3_fs.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/ext3_fs.h
+--- linux-2.6.29.4/include/linux/ext3_fs.h 2009-03-24 14:22:41.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/ext3_fs.h 2009-03-24 14:48:36.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) */
extern struct inode *ext3_iget(struct super_block *, unsigned long);
extern int ext3_write_inode (struct inode *, int);
-diff -NurpP --minimal linux-2.6.29.2/include/linux/fs.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/fs.h
---- linux-2.6.29.2/include/linux/fs.h 2009-03-24 14:22:41.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/fs.h 2009-03-24 17:21:20.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/fs.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/fs.h
+--- linux-2.6.29.4/include/linux/fs.h 2009-03-24 14:22:41.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/fs.h 2009-03-24 17:21:20.000000000 +0100
@@ -141,6 +141,9 @@ struct inodes_stat_t {
#define MS_RELATIME (1<<21) /* Update atime relative to mtime/ctime. */
#define MS_KERNMOUNT (1<<22) /* this is a kern_mount call */
#define MS_NOUSER (1<<31)
@@ -167,6 +170,14 @@ struct inodes_stat_t {
+ #define S_NOCMTIME 128 /* Do not update file c/mtime */
+ #define S_SWAPFILE 256 /* Do not truncate: swapon got its bmaps */
#define S_PRIVATE 512 /* Inode is fs-internal */
- #define S_ATOMIC_COPY 1024 /* Pages mapped with this inode need to be
- atomically copied (gem) */
-+#define S_IXUNLINK 2048 /* Immutable Invert on unlink */
++#define S_IXUNLINK 1024 /* Immutable Invert on unlink */
+
+/* Linux-VServer related Inode flags */
+
extern int simple_getattr(struct vfsmount *, struct dentry *, struct kstat *);
extern int simple_statfs(struct dentry *, struct kstatfs *);
extern int simple_link(struct dentry *, struct inode *, struct dentry *);
-diff -NurpP --minimal linux-2.6.29.2/include/linux/if_tun.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/if_tun.h
---- linux-2.6.29.2/include/linux/if_tun.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/if_tun.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/if_tun.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/if_tun.h
+--- linux-2.6.29.4/include/linux/if_tun.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/if_tun.h 2009-02-22 22:54:26.000000000 +0100
@@ -46,6 +46,7 @@
#define TUNSETOFFLOAD _IOW('T', 208, unsigned int)
#define TUNSETTXFILTER _IOW('T', 209, unsigned int)
/* TUNSETIFF ifr flags */
#define IFF_TUN 0x0001
-diff -NurpP --minimal linux-2.6.29.2/include/linux/init_task.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/init_task.h
---- linux-2.6.29.2/include/linux/init_task.h 2009-03-24 14:22:41.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/init_task.h 2009-03-24 14:48:36.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/init_task.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/init_task.h
+--- linux-2.6.29.4/include/linux/init_task.h 2009-03-24 14:22:41.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/init_task.h 2009-03-24 14:48:36.000000000 +0100
@@ -184,6 +184,10 @@ extern struct cred init_cred;
INIT_IDS \
INIT_TRACE_IRQFLAGS \
}
-diff -NurpP --minimal linux-2.6.29.2/include/linux/interrupt.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/interrupt.h
---- linux-2.6.29.2/include/linux/interrupt.h 2009-04-30 10:50:35.000000000 +0200
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/interrupt.h 2009-04-30 12:14:53.000000000 +0200
+diff -NurpP --minimal linux-2.6.29.4/include/linux/interrupt.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/interrupt.h
+--- linux-2.6.29.4/include/linux/interrupt.h 2009-05-23 23:16:53.000000000 +0200
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/interrupt.h 2009-04-30 12:14:53.000000000 +0200
@@ -9,8 +9,8 @@
#include <linux/cpumask.h>
#include <linux/irqreturn.h>
#include <linux/irqflags.h>
#include <linux/smp.h>
#include <linux/percpu.h>
-diff -NurpP --minimal linux-2.6.29.2/include/linux/ipc.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/ipc.h
---- linux-2.6.29.2/include/linux/ipc.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/ipc.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/ipc.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/ipc.h
+--- linux-2.6.29.4/include/linux/ipc.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/ipc.h 2009-02-22 22:54:26.000000000 +0100
@@ -93,6 +93,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.29.2/include/linux/Kbuild linux-2.6.29.2-vs2.3.0.36.12/include/linux/Kbuild
---- linux-2.6.29.2/include/linux/Kbuild 2009-03-24 14:22:40.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/Kbuild 2009-03-24 17:22:07.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/Kbuild linux-2.6.29.4-vs2.3.0.36.14/include/linux/Kbuild
+--- linux-2.6.29.4/include/linux/Kbuild 2009-03-24 14:22:40.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/Kbuild 2009-03-24 17:22:07.000000000 +0100
@@ -373,5 +373,8 @@ unifdef-y += xattr.h
unifdef-y += xfrm.h
header-y += wimax.h
header-y += wimax/
+
-diff -NurpP --minimal linux-2.6.29.2/include/linux/loop.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/loop.h
---- linux-2.6.29.2/include/linux/loop.h 2009-03-24 14:22:42.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/loop.h 2009-03-24 14:48:36.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/loop.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/loop.h
+--- linux-2.6.29.4/include/linux/loop.h 2009-03-24 14:22:42.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/loop.h 2009-03-24 14:48:36.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.29.2/include/linux/magic.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/magic.h
---- linux-2.6.29.2/include/linux/magic.h 2009-03-24 14:22:42.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/magic.h 2009-03-24 14:48:36.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/magic.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/magic.h
+--- linux-2.6.29.4/include/linux/magic.h 2009-03-24 14:22:42.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/magic.h 2009-03-24 14:48:36.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.29.2/include/linux/major.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/major.h
---- linux-2.6.29.2/include/linux/major.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/major.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/major.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/major.h
+--- linux-2.6.29.4/include/linux/major.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/major.h 2009-02-22 22:54:26.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.29.2/include/linux/mm_types.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/mm_types.h
---- linux-2.6.29.2/include/linux/mm_types.h 2009-03-24 14:22:42.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/mm_types.h 2009-03-24 14:48:36.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/mm_types.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/mm_types.h
+--- linux-2.6.29.4/include/linux/mm_types.h 2009-03-24 14:22:42.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/mm_types.h 2009-03-24 14:48:36.000000000 +0100
@@ -232,6 +232,7 @@ struct mm_struct {
/* Architecture-specific MM context */
/* Swap token stuff */
/*
-diff -NurpP --minimal linux-2.6.29.2/include/linux/mount.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/mount.h
---- linux-2.6.29.2/include/linux/mount.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/mount.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/mount.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/mount.h
+--- linux-2.6.29.4/include/linux/mount.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/mount.h 2009-02-22 22:54:26.000000000 +0100
@@ -35,6 +35,9 @@ struct mnt_namespace;
#define MNT_UNBINDABLE 0x2000 /* if the vfsmount is a unbindable mount */
#define MNT_PNODE_MASK 0x3000 /* propagation flag mask */
};
static inline struct vfsmount *mntget(struct vfsmount *mnt)
-diff -NurpP --minimal linux-2.6.29.2/include/linux/net.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/net.h
---- linux-2.6.29.2/include/linux/net.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/net.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/net.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/net.h
+--- linux-2.6.29.4/include/linux/net.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/net.h 2009-02-22 22:54:26.000000000 +0100
@@ -68,6 +68,7 @@ struct net;
#define SOCK_NOSPACE 2
#define SOCK_PASSCRED 3
#ifndef ARCH_HAS_SOCKET_TYPES
/**
-diff -NurpP --minimal linux-2.6.29.2/include/linux/nfs_mount.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/nfs_mount.h
---- linux-2.6.29.2/include/linux/nfs_mount.h 2009-03-24 14:22:43.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/nfs_mount.h 2009-03-24 14:48:36.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/nfs_mount.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/nfs_mount.h
+--- linux-2.6.29.4/include/linux/nfs_mount.h 2009-03-24 14:22:43.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/nfs_mount.h 2009-03-24 14:48:36.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.29.2/include/linux/nsproxy.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/nsproxy.h
---- linux-2.6.29.2/include/linux/nsproxy.h 2009-03-24 14:22:43.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/nsproxy.h 2009-03-24 14:48:36.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/nsproxy.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/nsproxy.h
+--- linux-2.6.29.4/include/linux/nsproxy.h 2009-03-24 14:22:43.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/nsproxy.h 2009-03-24 14:48:36.000000000 +0100
@@ -3,6 +3,7 @@
#include <linux/spinlock.h>
}
#ifdef CONFIG_CGROUP_NS
-diff -NurpP --minimal linux-2.6.29.2/include/linux/pid.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/pid.h
---- linux-2.6.29.2/include/linux/pid.h 2009-03-24 14:22:43.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/pid.h 2009-03-24 14:48:36.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/pid.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/pid.h
+--- linux-2.6.29.4/include/linux/pid.h 2009-03-24 14:22:43.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/pid.h 2009-03-24 14:48:36.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.29.2/include/linux/proc_fs.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/proc_fs.h
---- linux-2.6.29.2/include/linux/proc_fs.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/proc_fs.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/proc_fs.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/proc_fs.h
+--- linux-2.6.29.4/include/linux/proc_fs.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/proc_fs.h 2009-02-22 22:54:26.000000000 +0100
@@ -59,6 +59,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.29.2/include/linux/reiserfs_fs.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/reiserfs_fs.h
---- linux-2.6.29.2/include/linux/reiserfs_fs.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/reiserfs_fs.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/reiserfs_fs.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/reiserfs_fs.h
+--- linux-2.6.29.4/include/linux/reiserfs_fs.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/reiserfs_fs.h 2009-02-22 22:54:26.000000000 +0100
@@ -837,6 +837,11 @@ struct stat_data_v1 {
#define REISERFS_COMPR_FL FS_COMPR_FL
#define REISERFS_NOTAIL_FL FS_NOTAIL_FL
/* namei.c */
void set_de_name_and_namelen(struct reiserfs_dir_entry *de);
-diff -NurpP --minimal linux-2.6.29.2/include/linux/reiserfs_fs_sb.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/reiserfs_fs_sb.h
---- linux-2.6.29.2/include/linux/reiserfs_fs_sb.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/reiserfs_fs_sb.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/reiserfs_fs_sb.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/reiserfs_fs_sb.h
+--- linux-2.6.29.4/include/linux/reiserfs_fs_sb.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/reiserfs_fs_sb.h 2009-02-22 22:54:26.000000000 +0100
@@ -456,6 +456,7 @@ enum reiserfs_mount_options {
REISERFS_POSIXACL,
REISERFS_BARRIER_NONE,
/* Actions on error */
REISERFS_ERROR_PANIC,
-diff -NurpP --minimal linux-2.6.29.2/include/linux/sched.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/sched.h
---- linux-2.6.29.2/include/linux/sched.h 2009-04-30 10:50:35.000000000 +0200
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/sched.h 2009-04-30 12:14:53.000000000 +0200
+diff -NurpP --minimal linux-2.6.29.4/include/linux/sched.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/sched.h
+--- linux-2.6.29.4/include/linux/sched.h 2009-05-23 23:16:53.000000000 +0200
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/sched.h 2009-04-30 12:14:53.000000000 +0200
@@ -71,7 +71,6 @@ struct sched_param {
#include <linux/fs_struct.h>
#include <linux/compiler.h>
}
-diff -NurpP --minimal linux-2.6.29.2/include/linux/shmem_fs.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/shmem_fs.h
---- linux-2.6.29.2/include/linux/shmem_fs.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/shmem_fs.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/shmem_fs.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/shmem_fs.h
+--- linux-2.6.29.4/include/linux/shmem_fs.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/shmem_fs.h 2009-02-22 22:54:26.000000000 +0100
@@ -8,6 +8,9 @@
#define SHMEM_NR_DIRECT 16
struct shmem_inode_info {
spinlock_t lock;
unsigned long flags;
-diff -NurpP --minimal linux-2.6.29.2/include/linux/stat.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/stat.h
---- linux-2.6.29.2/include/linux/stat.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/stat.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/stat.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/stat.h
+--- linux-2.6.29.4/include/linux/stat.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/stat.h 2009-02-22 22:54:26.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.29.2/include/linux/sunrpc/auth.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/sunrpc/auth.h
---- linux-2.6.29.2/include/linux/sunrpc/auth.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/sunrpc/auth.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/sunrpc/auth.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/sunrpc/auth.h
+--- linux-2.6.29.4/include/linux/sunrpc/auth.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/sunrpc/auth.h 2009-02-22 22:54:26.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.29.2/include/linux/sunrpc/clnt.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/sunrpc/clnt.h
---- linux-2.6.29.2/include/linux/sunrpc/clnt.h 2009-03-24 14:22:43.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/sunrpc/clnt.h 2009-03-24 14:48:36.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/sunrpc/clnt.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/sunrpc/clnt.h
+--- linux-2.6.29.4/include/linux/sunrpc/clnt.h 2009-03-24 14:22:43.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/sunrpc/clnt.h 2009-03-24 14:48:36.000000000 +0100
@@ -43,7 +43,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.29.2/include/linux/syscalls.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/syscalls.h
---- linux-2.6.29.2/include/linux/syscalls.h 2009-03-24 14:22:43.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/syscalls.h 2009-03-24 14:48:36.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/syscalls.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/syscalls.h
+--- linux-2.6.29.4/include/linux/syscalls.h 2009-03-24 14:22:43.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/syscalls.h 2009-03-24 14:48:36.000000000 +0100
@@ -369,6 +369,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.29.2/include/linux/sysctl.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/sysctl.h
---- linux-2.6.29.2/include/linux/sysctl.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/sysctl.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/sysctl.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/sysctl.h
+--- linux-2.6.29.4/include/linux/sysctl.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/sysctl.h 2009-02-22 22:54:26.000000000 +0100
@@ -70,6 +70,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.29.2/include/linux/sysfs.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/sysfs.h
---- linux-2.6.29.2/include/linux/sysfs.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/sysfs.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/sysfs.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/sysfs.h
+--- linux-2.6.29.4/include/linux/sysfs.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/sysfs.h 2009-02-22 22:54:26.000000000 +0100
@@ -17,6 +17,8 @@
#include <linux/list.h>
#include <asm/atomic.h>
struct kobject;
struct module;
-diff -NurpP --minimal linux-2.6.29.2/include/linux/time.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/time.h
---- linux-2.6.29.2/include/linux/time.h 2009-03-24 14:22:43.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/time.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/time.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/time.h
+--- linux-2.6.29.4/include/linux/time.h 2009-03-24 14:22:43.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/time.h 2009-02-22 22:54:26.000000000 +0100
@@ -190,6 +190,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.29.2/include/linux/types.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/types.h
---- linux-2.6.29.2/include/linux/types.h 2009-03-24 14:22:43.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/types.h 2009-03-24 14:48:36.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/types.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/types.h
+--- linux-2.6.29.4/include/linux/types.h 2009-03-24 14:22:43.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/types.h 2009-03-24 14:48:36.000000000 +0100
@@ -36,6 +36,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.29.2/include/linux/vroot.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vroot.h
---- linux-2.6.29.2/include/linux/vroot.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vroot.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vroot.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vroot.h
+--- linux-2.6.29.4/include/linux/vroot.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vroot.h 2009-02-22 22:54:26.000000000 +0100
@@ -0,0 +1,51 @@
+
+/*
+#define VROOT_CLR_DEV 0x5601
+
+#endif /* _LINUX_VROOT_H */
-diff -NurpP --minimal linux-2.6.29.2/include/linux/vs_base.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vs_base.h
---- linux-2.6.29.2/include/linux/vs_base.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vs_base.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vs_base.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vs_base.h
+--- linux-2.6.29.4/include/linux/vs_base.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vs_base.h 2009-02-22 22:54:26.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.29.2/include/linux/vs_context.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vs_context.h
---- linux-2.6.29.2/include/linux/vs_context.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vs_context.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vs_context.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vs_context.h
+--- linux-2.6.29.4/include/linux/vs_context.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vs_context.h 2009-02-22 22:54:26.000000000 +0100
@@ -0,0 +1,227 @@
+#ifndef _VS_CONTEXT_H
+#define _VS_CONTEXT_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.29.2/include/linux/vs_cowbl.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vs_cowbl.h
---- linux-2.6.29.2/include/linux/vs_cowbl.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vs_cowbl.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vs_cowbl.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vs_cowbl.h
+--- linux-2.6.29.4/include/linux/vs_cowbl.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vs_cowbl.h 2009-02-22 22:54:26.000000000 +0100
@@ -0,0 +1,47 @@
+#ifndef _VS_COWBL_H
+#define _VS_COWBL_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.29.2/include/linux/vs_cvirt.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vs_cvirt.h
---- linux-2.6.29.2/include/linux/vs_cvirt.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vs_cvirt.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vs_cvirt.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vs_cvirt.h
+--- linux-2.6.29.4/include/linux/vs_cvirt.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vs_cvirt.h 2009-02-22 22:54:26.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.29.2/include/linux/vs_device.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vs_device.h
---- linux-2.6.29.2/include/linux/vs_device.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vs_device.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vs_device.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vs_device.h
+--- linux-2.6.29.4/include/linux/vs_device.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vs_device.h 2009-02-22 22:54:26.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.29.2/include/linux/vs_dlimit.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vs_dlimit.h
---- linux-2.6.29.2/include/linux/vs_dlimit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vs_dlimit.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vs_dlimit.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vs_dlimit.h
+--- linux-2.6.29.4/include/linux/vs_dlimit.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vs_dlimit.h 2009-02-22 22:54:26.000000000 +0100
@@ -0,0 +1,211 @@
+#ifndef _VS_DLIMIT_H
+#define _VS_DLIMIT_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.29.2/include/linux/vserver/base.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/base.h
---- linux-2.6.29.2/include/linux/vserver/base.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/base.h 2009-03-25 00:36:15.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vserver/base.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/base.h
+--- linux-2.6.29.4/include/linux/vserver/base.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/base.h 2009-03-25 00:36:15.000000000 +0100
@@ -0,0 +1,157 @@
+#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.29.2/include/linux/vserver/cacct_cmd.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/cacct_cmd.h
---- linux-2.6.29.2/include/linux/vserver/cacct_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/cacct_cmd.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vserver/cacct_cmd.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/cacct_cmd.h
+--- linux-2.6.29.4/include/linux/vserver/cacct_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/cacct_cmd.h 2009-02-22 22:54:26.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.29.2/include/linux/vserver/cacct_def.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/cacct_def.h
---- linux-2.6.29.2/include/linux/vserver/cacct_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/cacct_def.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vserver/cacct_def.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/cacct_def.h
+--- linux-2.6.29.4/include/linux/vserver/cacct_def.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/cacct_def.h 2009-02-22 22:54:26.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.29.2/include/linux/vserver/cacct.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/cacct.h
---- linux-2.6.29.2/include/linux/vserver/cacct.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/cacct.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vserver/cacct.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/cacct.h
+--- linux-2.6.29.4/include/linux/vserver/cacct.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/cacct.h 2009-02-22 22:54:26.000000000 +0100
@@ -0,0 +1,15 @@
+#ifndef _VX_CACCT_H
+#define _VX_CACCT_H
+};
+
+#endif /* _VX_CACCT_H */
-diff -NurpP --minimal linux-2.6.29.2/include/linux/vserver/cacct_int.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/cacct_int.h
---- linux-2.6.29.2/include/linux/vserver/cacct_int.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/cacct_int.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vserver/cacct_int.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/cacct_int.h
+--- linux-2.6.29.4/include/linux/vserver/cacct_int.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/cacct_int.h 2009-02-22 22:54:26.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.29.2/include/linux/vserver/check.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/check.h
---- linux-2.6.29.2/include/linux/vserver/check.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/check.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vserver/check.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/check.h
+--- linux-2.6.29.4/include/linux/vserver/check.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/check.h 2009-02-22 22:54:26.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.29.2/include/linux/vserver/context_cmd.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/context_cmd.h
---- linux-2.6.29.2/include/linux/vserver/context_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/context_cmd.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vserver/context_cmd.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/context_cmd.h
+--- linux-2.6.29.4/include/linux/vserver/context_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/context_cmd.h 2009-02-22 22:54:26.000000000 +0100
@@ -0,0 +1,128 @@
+#ifndef _VX_CONTEXT_CMD_H
+#define _VX_CONTEXT_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-2.6.29.2/include/linux/vserver/context.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/context.h
---- linux-2.6.29.2/include/linux/vserver/context.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/context.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vserver/context.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/context.h
+--- linux-2.6.29.4/include/linux/vserver/context.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/context.h 2009-02-22 22:54:26.000000000 +0100
@@ -0,0 +1,179 @@
+#ifndef _VX_CONTEXT_H
+#define _VX_CONTEXT_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_H */
-diff -NurpP --minimal linux-2.6.29.2/include/linux/vserver/cvirt_cmd.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/cvirt_cmd.h
---- linux-2.6.29.2/include/linux/vserver/cvirt_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/cvirt_cmd.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vserver/cvirt_cmd.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/cvirt_cmd.h
+--- linux-2.6.29.4/include/linux/vserver/cvirt_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/cvirt_cmd.h 2009-02-22 22:54:26.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.29.2/include/linux/vserver/cvirt_def.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/cvirt_def.h
---- linux-2.6.29.2/include/linux/vserver/cvirt_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/cvirt_def.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vserver/cvirt_def.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/cvirt_def.h
+--- linux-2.6.29.4/include/linux/vserver/cvirt_def.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/cvirt_def.h 2009-02-22 22:54:26.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.29.2/include/linux/vserver/cvirt.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/cvirt.h
---- linux-2.6.29.2/include/linux/vserver/cvirt.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/cvirt.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vserver/cvirt.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/cvirt.h
+--- linux-2.6.29.4/include/linux/vserver/cvirt.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/cvirt.h 2009-02-22 22:54:26.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.29.2/include/linux/vserver/debug_cmd.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/debug_cmd.h
---- linux-2.6.29.2/include/linux/vserver/debug_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/debug_cmd.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vserver/debug_cmd.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/debug_cmd.h
+--- linux-2.6.29.4/include/linux/vserver/debug_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/debug_cmd.h 2009-02-22 22:54:26.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.29.2/include/linux/vserver/debug.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/debug.h
---- linux-2.6.29.2/include/linux/vserver/debug.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/debug.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vserver/debug.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/debug.h
+--- linux-2.6.29.4/include/linux/vserver/debug.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/debug.h 2009-02-22 22:54:26.000000000 +0100
@@ -0,0 +1,127 @@
+#ifndef _VX_DEBUG_H
+#define _VX_DEBUG_H
+
+
+#endif /* _VX_DEBUG_H */
-diff -NurpP --minimal linux-2.6.29.2/include/linux/vserver/device_cmd.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/device_cmd.h
---- linux-2.6.29.2/include/linux/vserver/device_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/device_cmd.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vserver/device_cmd.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/device_cmd.h
+--- linux-2.6.29.4/include/linux/vserver/device_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/device_cmd.h 2009-02-22 22:54:26.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.29.2/include/linux/vserver/device_def.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/device_def.h
---- linux-2.6.29.2/include/linux/vserver/device_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/device_def.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vserver/device_def.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/device_def.h
+--- linux-2.6.29.4/include/linux/vserver/device_def.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/device_def.h 2009-02-22 22:54:26.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.29.2/include/linux/vserver/device.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/device.h
---- linux-2.6.29.2/include/linux/vserver/device.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/device.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vserver/device.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/device.h
+--- linux-2.6.29.4/include/linux/vserver/device.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/device.h 2009-02-22 22:54:26.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.29.2/include/linux/vserver/dlimit_cmd.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/dlimit_cmd.h
---- linux-2.6.29.2/include/linux/vserver/dlimit_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/dlimit_cmd.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vserver/dlimit_cmd.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/dlimit_cmd.h
+--- linux-2.6.29.4/include/linux/vserver/dlimit_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/dlimit_cmd.h 2009-02-22 22:54:26.000000000 +0100
@@ -0,0 +1,74 @@
+#ifndef _VX_DLIMIT_CMD_H
+#define _VX_DLIMIT_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_DLIMIT_CMD_H */
-diff -NurpP --minimal linux-2.6.29.2/include/linux/vserver/dlimit.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/dlimit.h
---- linux-2.6.29.2/include/linux/vserver/dlimit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/dlimit.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vserver/dlimit.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/dlimit.h
+--- linux-2.6.29.4/include/linux/vserver/dlimit.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/dlimit.h 2009-02-22 22:54:26.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.29.2/include/linux/vserver/global.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/global.h
---- linux-2.6.29.2/include/linux/vserver/global.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/global.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vserver/global.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/global.h
+--- linux-2.6.29.4/include/linux/vserver/global.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/global.h 2009-02-22 22:54:26.000000000 +0100
@@ -0,0 +1,20 @@
+#ifndef _VX_GLOBAL_H
+#define _VX_GLOBAL_H
+
+
+#endif /* _VX_GLOBAL_H */
-diff -NurpP --minimal linux-2.6.29.2/include/linux/vserver/history.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/history.h
---- linux-2.6.29.2/include/linux/vserver/history.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/history.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vserver/history.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/history.h
+--- linux-2.6.29.4/include/linux/vserver/history.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/history.h 2009-02-22 22:54:26.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.29.2/include/linux/vserver/inode_cmd.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/inode_cmd.h
---- linux-2.6.29.2/include/linux/vserver/inode_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/inode_cmd.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vserver/inode_cmd.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/inode_cmd.h
+--- linux-2.6.29.4/include/linux/vserver/inode_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/inode_cmd.h 2009-02-22 22:54:26.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.29.2/include/linux/vserver/inode.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/inode.h
---- linux-2.6.29.2/include/linux/vserver/inode.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/inode.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vserver/inode.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/inode.h
+--- linux-2.6.29.4/include/linux/vserver/inode.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/inode.h 2009-02-22 22:54:26.000000000 +0100
@@ -0,0 +1,38 @@
+#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.29.2/include/linux/vserver/Kbuild linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/Kbuild
---- linux-2.6.29.2/include/linux/vserver/Kbuild 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/Kbuild 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vserver/Kbuild linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/Kbuild
+--- linux-2.6.29.4/include/linux/vserver/Kbuild 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/Kbuild 2009-02-22 22:54:26.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.29.2/include/linux/vserver/limit_cmd.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/limit_cmd.h
---- linux-2.6.29.2/include/linux/vserver/limit_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/limit_cmd.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vserver/limit_cmd.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/limit_cmd.h
+--- linux-2.6.29.4/include/linux/vserver/limit_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/limit_cmd.h 2009-02-22 22:54:26.000000000 +0100
@@ -0,0 +1,69 @@
+#ifndef _VX_LIMIT_CMD_H
+#define _VX_LIMIT_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_CMD_H */
-diff -NurpP --minimal linux-2.6.29.2/include/linux/vserver/limit_def.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/limit_def.h
---- linux-2.6.29.2/include/linux/vserver/limit_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/limit_def.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vserver/limit_def.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/limit_def.h
+--- linux-2.6.29.4/include/linux/vserver/limit_def.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/limit_def.h 2009-02-22 22:54:26.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.29.2/include/linux/vserver/limit.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/limit.h
---- linux-2.6.29.2/include/linux/vserver/limit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/limit.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vserver/limit.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/limit.h
+--- linux-2.6.29.4/include/linux/vserver/limit.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/limit.h 2009-02-22 22:54:26.000000000 +0100
@@ -0,0 +1,70 @@
+#ifndef _VX_LIMIT_H
+#define _VX_LIMIT_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_H */
-diff -NurpP --minimal linux-2.6.29.2/include/linux/vserver/limit_int.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/limit_int.h
---- linux-2.6.29.2/include/linux/vserver/limit_int.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/limit_int.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vserver/limit_int.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/limit_int.h
+--- linux-2.6.29.4/include/linux/vserver/limit_int.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/limit_int.h 2009-02-22 22:54:26.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.29.2/include/linux/vserver/monitor.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/monitor.h
---- linux-2.6.29.2/include/linux/vserver/monitor.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/monitor.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vserver/monitor.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/monitor.h
+--- linux-2.6.29.4/include/linux/vserver/monitor.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/monitor.h 2009-02-22 22:54:26.000000000 +0100
@@ -0,0 +1,96 @@
+#ifndef _VX_MONITOR_H
+#define _VX_MONITOR_H
+
+
+#endif /* _VX_MONITOR_H */
-diff -NurpP --minimal linux-2.6.29.2/include/linux/vserver/network_cmd.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/network_cmd.h
---- linux-2.6.29.2/include/linux/vserver/network_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/network_cmd.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vserver/network_cmd.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/network_cmd.h
+--- linux-2.6.29.4/include/linux/vserver/network_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/network_cmd.h 2009-02-22 22:54:26.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.29.2/include/linux/vserver/network.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/network.h
---- linux-2.6.29.2/include/linux/vserver/network.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/network.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vserver/network.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/network.h
+--- linux-2.6.29.4/include/linux/vserver/network.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/network.h 2009-02-22 22:54:26.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.29.2/include/linux/vserver/percpu.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/percpu.h
---- linux-2.6.29.2/include/linux/vserver/percpu.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/percpu.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vserver/percpu.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/percpu.h
+--- linux-2.6.29.4/include/linux/vserver/percpu.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/percpu.h 2009-02-22 22:54:26.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.29.2/include/linux/vserver/pid.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/pid.h
---- linux-2.6.29.2/include/linux/vserver/pid.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/pid.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vserver/pid.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/pid.h
+--- linux-2.6.29.4/include/linux/vserver/pid.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/pid.h 2009-02-22 22:54:26.000000000 +0100
@@ -0,0 +1,51 @@
+#ifndef _VSERVER_PID_H
+#define _VSERVER_PID_H
+}
+
+#endif
-diff -NurpP --minimal linux-2.6.29.2/include/linux/vserver/sched_cmd.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/sched_cmd.h
---- linux-2.6.29.2/include/linux/vserver/sched_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/sched_cmd.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vserver/sched_cmd.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/sched_cmd.h
+--- linux-2.6.29.4/include/linux/vserver/sched_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/sched_cmd.h 2009-02-22 22:54:26.000000000 +0100
@@ -0,0 +1,108 @@
+#ifndef _VX_SCHED_CMD_H
+#define _VX_SCHED_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_SCHED_CMD_H */
-diff -NurpP --minimal linux-2.6.29.2/include/linux/vserver/sched_def.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/sched_def.h
---- linux-2.6.29.2/include/linux/vserver/sched_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/sched_def.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vserver/sched_def.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/sched_def.h
+--- linux-2.6.29.4/include/linux/vserver/sched_def.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/sched_def.h 2009-02-22 22:54:26.000000000 +0100
@@ -0,0 +1,68 @@
+#ifndef _VX_SCHED_DEF_H
+#define _VX_SCHED_DEF_H
+#endif
+
+#endif /* _VX_SCHED_DEF_H */
-diff -NurpP --minimal linux-2.6.29.2/include/linux/vserver/sched.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/sched.h
---- linux-2.6.29.2/include/linux/vserver/sched.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/sched.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vserver/sched.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/sched.h
+--- linux-2.6.29.4/include/linux/vserver/sched.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/sched.h 2009-02-22 22:54:26.000000000 +0100
@@ -0,0 +1,26 @@
+#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.29.2/include/linux/vserver/signal_cmd.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/signal_cmd.h
---- linux-2.6.29.2/include/linux/vserver/signal_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/signal_cmd.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vserver/signal_cmd.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/signal_cmd.h
+--- linux-2.6.29.4/include/linux/vserver/signal_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/signal_cmd.h 2009-02-22 22:54:26.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.29.2/include/linux/vserver/signal.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/signal.h
---- linux-2.6.29.2/include/linux/vserver/signal.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/signal.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vserver/signal.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/signal.h
+--- linux-2.6.29.4/include/linux/vserver/signal.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/signal.h 2009-02-22 22:54:26.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.29.2/include/linux/vserver/space_cmd.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/space_cmd.h
---- linux-2.6.29.2/include/linux/vserver/space_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/space_cmd.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vserver/space_cmd.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/space_cmd.h
+--- linux-2.6.29.4/include/linux/vserver/space_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/space_cmd.h 2009-02-22 22:54:26.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.29.2/include/linux/vserver/space.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/space.h
---- linux-2.6.29.2/include/linux/vserver/space.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/space.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vserver/space.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/space.h
+--- linux-2.6.29.4/include/linux/vserver/space.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/space.h 2009-02-22 22:54:26.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.29.2/include/linux/vserver/switch.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/switch.h
---- linux-2.6.29.2/include/linux/vserver/switch.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/switch.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vserver/switch.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/switch.h
+--- linux-2.6.29.4/include/linux/vserver/switch.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/switch.h 2009-02-22 22:54:26.000000000 +0100
@@ -0,0 +1,98 @@
+#ifndef _VX_SWITCH_H
+#define _VX_SWITCH_H
+
+#endif /* _VX_SWITCH_H */
+
-diff -NurpP --minimal linux-2.6.29.2/include/linux/vserver/tag_cmd.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/tag_cmd.h
---- linux-2.6.29.2/include/linux/vserver/tag_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/tag_cmd.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vserver/tag_cmd.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/tag_cmd.h
+--- linux-2.6.29.4/include/linux/vserver/tag_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/tag_cmd.h 2009-02-22 22:54:26.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.29.2/include/linux/vserver/tag.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/tag.h
---- linux-2.6.29.2/include/linux/vserver/tag.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vserver/tag.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vserver/tag.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/tag.h
+--- linux-2.6.29.4/include/linux/vserver/tag.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vserver/tag.h 2009-02-22 22:54:26.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.29.2/include/linux/vs_inet6.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vs_inet6.h
---- linux-2.6.29.2/include/linux/vs_inet6.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vs_inet6.h 2009-03-25 00:46:50.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vs_inet6.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vs_inet6.h
+--- linux-2.6.29.4/include/linux/vs_inet6.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vs_inet6.h 2009-03-25 00:46:50.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.29.2/include/linux/vs_inet.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vs_inet.h
---- linux-2.6.29.2/include/linux/vs_inet.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vs_inet.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vs_inet.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vs_inet.h
+--- linux-2.6.29.4/include/linux/vs_inet.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vs_inet.h 2009-02-22 22:54:26.000000000 +0100
@@ -0,0 +1,342 @@
+#ifndef _VS_INET_H
+#define _VS_INET_H
+#else
+// #warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.29.2/include/linux/vs_limit.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vs_limit.h
---- linux-2.6.29.2/include/linux/vs_limit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vs_limit.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vs_limit.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vs_limit.h
+--- linux-2.6.29.4/include/linux/vs_limit.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vs_limit.h 2009-02-22 22:54:26.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.29.2/include/linux/vs_memory.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vs_memory.h
---- linux-2.6.29.2/include/linux/vs_memory.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vs_memory.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vs_memory.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vs_memory.h
+--- linux-2.6.29.4/include/linux/vs_memory.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vs_memory.h 2009-02-22 22:54:26.000000000 +0100
@@ -0,0 +1,159 @@
+#ifndef _VS_MEMORY_H
+#define _VS_MEMORY_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.29.2/include/linux/vs_network.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vs_network.h
---- linux-2.6.29.2/include/linux/vs_network.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vs_network.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vs_network.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vs_network.h
+--- linux-2.6.29.4/include/linux/vs_network.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vs_network.h 2009-02-22 22:54:26.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.29.2/include/linux/vs_pid.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vs_pid.h
---- linux-2.6.29.2/include/linux/vs_pid.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vs_pid.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vs_pid.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vs_pid.h
+--- linux-2.6.29.4/include/linux/vs_pid.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vs_pid.h 2009-02-22 22:54:26.000000000 +0100
@@ -0,0 +1,95 @@
+#ifndef _VS_PID_H
+#define _VS_PID_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.29.2/include/linux/vs_sched.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vs_sched.h
---- linux-2.6.29.2/include/linux/vs_sched.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vs_sched.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vs_sched.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vs_sched.h
+--- linux-2.6.29.4/include/linux/vs_sched.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vs_sched.h 2009-02-22 22:54:26.000000000 +0100
@@ -0,0 +1,110 @@
+#ifndef _VS_SCHED_H
+#define _VS_SCHED_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.29.2/include/linux/vs_socket.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vs_socket.h
---- linux-2.6.29.2/include/linux/vs_socket.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vs_socket.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vs_socket.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vs_socket.h
+--- linux-2.6.29.4/include/linux/vs_socket.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vs_socket.h 2009-02-22 22:54:26.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.29.2/include/linux/vs_tag.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vs_tag.h
---- linux-2.6.29.2/include/linux/vs_tag.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vs_tag.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vs_tag.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vs_tag.h
+--- linux-2.6.29.4/include/linux/vs_tag.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vs_tag.h 2009-02-22 22:54:26.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.29.2/include/linux/vs_time.h linux-2.6.29.2-vs2.3.0.36.12/include/linux/vs_time.h
---- linux-2.6.29.2/include/linux/vs_time.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/linux/vs_time.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/linux/vs_time.h linux-2.6.29.4-vs2.3.0.36.14/include/linux/vs_time.h
+--- linux-2.6.29.4/include/linux/vs_time.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/linux/vs_time.h 2009-02-22 22:54:26.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.29.2/include/net/addrconf.h linux-2.6.29.2-vs2.3.0.36.12/include/net/addrconf.h
---- linux-2.6.29.2/include/net/addrconf.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/net/addrconf.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/net/addrconf.h linux-2.6.29.4-vs2.3.0.36.14/include/net/addrconf.h
+--- linux-2.6.29.4/include/net/addrconf.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/net/addrconf.h 2009-02-22 22:54:26.000000000 +0100
@@ -84,7 +84,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.29.2/include/net/af_unix.h linux-2.6.29.2-vs2.3.0.36.12/include/net/af_unix.h
---- linux-2.6.29.2/include/net/af_unix.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/net/af_unix.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/net/af_unix.h linux-2.6.29.4-vs2.3.0.36.14/include/net/af_unix.h
+--- linux-2.6.29.4/include/net/af_unix.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/net/af_unix.h 2009-02-22 22:54:26.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.29.2/include/net/inet_timewait_sock.h linux-2.6.29.2-vs2.3.0.36.12/include/net/inet_timewait_sock.h
---- linux-2.6.29.2/include/net/inet_timewait_sock.h 2009-03-24 14:22:44.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/net/inet_timewait_sock.h 2009-03-24 14:48:36.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/net/inet_timewait_sock.h linux-2.6.29.4-vs2.3.0.36.14/include/net/inet_timewait_sock.h
+--- linux-2.6.29.4/include/net/inet_timewait_sock.h 2009-03-24 14:22:44.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/net/inet_timewait_sock.h 2009-03-24 14:48:36.000000000 +0100
@@ -15,15 +15,14 @@
#ifndef _INET_TIMEWAIT_SOCK_
#define _INET_TIMEWAIT_SOCK_
int tw_timeout;
volatile unsigned char tw_substate;
/* 3 bits hole, try to pack */
-diff -NurpP --minimal linux-2.6.29.2/include/net/route.h linux-2.6.29.2-vs2.3.0.36.12/include/net/route.h
---- linux-2.6.29.2/include/net/route.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/net/route.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/net/route.h linux-2.6.29.4-vs2.3.0.36.14/include/net/route.h
+--- linux-2.6.29.4/include/net/route.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/net/route.h 2009-02-22 22:54:26.000000000 +0100
@@ -135,6 +135,9 @@ static inline void ip_rt_put(struct rtab
dst_release(&rt->u.dst);
}
err = __ip_route_output_key(net, rp, &fl);
if (err)
return err;
-diff -NurpP --minimal linux-2.6.29.2/include/net/sock.h linux-2.6.29.2-vs2.3.0.36.12/include/net/sock.h
---- linux-2.6.29.2/include/net/sock.h 2009-03-24 14:22:44.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/include/net/sock.h 2009-03-24 14:48:36.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/include/net/sock.h linux-2.6.29.4-vs2.3.0.36.14/include/net/sock.h
+--- linux-2.6.29.4/include/net/sock.h 2009-03-24 14:22:44.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/include/net/sock.h 2009-03-24 14:48:36.000000000 +0100
@@ -134,6 +134,10 @@ struct sock_common {
#ifdef CONFIG_NET_NS
struct net *skc_net;
unsigned char sk_shutdown : 2,
sk_no_check : 2,
sk_userlocks : 4;
-diff -NurpP --minimal linux-2.6.29.2/init/main.c linux-2.6.29.2-vs2.3.0.36.12/init/main.c
---- linux-2.6.29.2/init/main.c 2009-03-24 14:22:44.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/init/main.c 2009-03-24 17:22:37.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/init/main.c linux-2.6.29.4-vs2.3.0.36.14/init/main.c
+--- linux-2.6.29.4/init/main.c 2009-03-24 14:22:44.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/init/main.c 2009-03-24 17:22:37.000000000 +0100
@@ -64,6 +64,7 @@
#include <linux/ftrace.h>
#include <linux/async.h>
ptr = alloc_bootmem_pages(size * nr_possible_cpus);
for_each_possible_cpu(i) {
-diff -NurpP --minimal linux-2.6.29.2/ipc/mqueue.c linux-2.6.29.2-vs2.3.0.36.12/ipc/mqueue.c
---- linux-2.6.29.2/ipc/mqueue.c 2009-03-24 14:22:44.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/ipc/mqueue.c 2009-03-24 17:24:19.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/ipc/mqueue.c linux-2.6.29.4-vs2.3.0.36.14/ipc/mqueue.c
+--- linux-2.6.29.4/ipc/mqueue.c 2009-03-24 14:22:44.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/ipc/mqueue.c 2009-03-24 17:24:19.000000000 +0100
@@ -31,6 +31,8 @@
#include <linux/mutex.h>
#include <linux/nsproxy.h>
free_uid(user);
}
}
-diff -NurpP --minimal linux-2.6.29.2/ipc/msg.c linux-2.6.29.2-vs2.3.0.36.12/ipc/msg.c
---- linux-2.6.29.2/ipc/msg.c 2009-03-24 14:22:44.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/ipc/msg.c 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/ipc/msg.c linux-2.6.29.4-vs2.3.0.36.14/ipc/msg.c
+--- linux-2.6.29.4/ipc/msg.c 2009-03-24 14:22:44.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/ipc/msg.c 2009-02-22 22:54:26.000000000 +0100
@@ -38,6 +38,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.29.2/ipc/namespace.c linux-2.6.29.2-vs2.3.0.36.12/ipc/namespace.c
---- linux-2.6.29.2/ipc/namespace.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/ipc/namespace.c 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/ipc/namespace.c linux-2.6.29.4-vs2.3.0.36.14/ipc/namespace.c
+--- linux-2.6.29.4/ipc/namespace.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/ipc/namespace.c 2009-02-22 22:54:26.000000000 +0100
@@ -9,6 +9,8 @@
#include <linux/rcupdate.h>
#include <linux/nsproxy.h>
kfree(ns);
atomic_dec(&nr_ipc_ns);
-diff -NurpP --minimal linux-2.6.29.2/ipc/sem.c linux-2.6.29.2-vs2.3.0.36.12/ipc/sem.c
---- linux-2.6.29.2/ipc/sem.c 2009-03-24 14:22:44.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/ipc/sem.c 2009-03-31 23:31:33.000000000 +0200
+diff -NurpP --minimal linux-2.6.29.4/ipc/sem.c linux-2.6.29.4-vs2.3.0.36.14/ipc/sem.c
+--- linux-2.6.29.4/ipc/sem.c 2009-03-24 14:22:44.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/ipc/sem.c 2009-03-31 23:31:33.000000000 +0200
@@ -83,6 +83,8 @@
#include <linux/rwsem.h>
#include <linux/nsproxy.h>
security_sem_free(sma);
ipc_rcu_putref(sma);
}
-diff -NurpP --minimal linux-2.6.29.2/ipc/shm.c linux-2.6.29.2-vs2.3.0.36.12/ipc/shm.c
---- linux-2.6.29.2/ipc/shm.c 2009-03-24 14:22:44.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/ipc/shm.c 2009-03-24 14:48:36.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/ipc/shm.c linux-2.6.29.4-vs2.3.0.36.14/ipc/shm.c
+--- linux-2.6.29.4/ipc/shm.c 2009-03-24 14:22:44.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/ipc/shm.c 2009-03-24 14:48:36.000000000 +0100
@@ -39,6 +39,8 @@
#include <linux/nsproxy.h>
#include <linux/mount.h>
return error;
no_id:
-diff -NurpP --minimal linux-2.6.29.2/kernel/capability.c linux-2.6.29.2-vs2.3.0.36.12/kernel/capability.c
---- linux-2.6.29.2/kernel/capability.c 2009-03-24 14:22:44.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/capability.c 2009-03-24 17:27:28.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/kernel/capability.c linux-2.6.29.4-vs2.3.0.36.14/kernel/capability.c
+--- linux-2.6.29.4/kernel/capability.c 2009-03-24 14:22:44.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/capability.c 2009-03-24 17:27:28.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.29.2/kernel/compat.c linux-2.6.29.2-vs2.3.0.36.12/kernel/compat.c
---- linux-2.6.29.2/kernel/compat.c 2009-03-24 14:22:44.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/compat.c 2009-03-24 14:48:36.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/kernel/compat.c linux-2.6.29.4-vs2.3.0.36.14/kernel/compat.c
+--- linux-2.6.29.4/kernel/compat.c 2009-03-24 14:22:44.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/compat.c 2009-03-24 14:48:36.000000000 +0100
@@ -891,7 +891,7 @@ asmlinkage long compat_sys_time(compat_t
compat_time_t i;
struct timeval tv;
return 0;
}
-diff -NurpP --minimal linux-2.6.29.2/kernel/exit.c linux-2.6.29.2-vs2.3.0.36.12/kernel/exit.c
---- linux-2.6.29.2/kernel/exit.c 2009-03-24 14:22:44.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/exit.c 2009-03-24 17:28:40.000000000 +0100
-@@ -47,6 +47,11 @@
+diff -NurpP --minimal linux-2.6.29.4/kernel/exit.c linux-2.6.29.4-vs2.3.0.36.14/kernel/exit.c
+--- linux-2.6.29.4/kernel/exit.c 2009-05-23 23:16:53.000000000 +0200
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/exit.c 2009-05-10 23:58:02.000000000 +0200
+@@ -47,6 +47,10 @@
#include <linux/task_io_accounting_ops.h>
#include <linux/tracehook.h>
#include <linux/init_task.h>
+#include <linux/vs_context.h>
+#include <linux/vs_network.h>
+#include <linux/vs_pid.h>
-+#include <linux/vserver/global.h>
#include <trace/sched.h>
#include <asm/uaccess.h>
-@@ -502,9 +507,11 @@ static void close_files(struct files_str
+@@ -497,9 +501,11 @@ static void close_files(struct files_str
filp_close(file, files);
cond_resched();
}
}
}
}
-@@ -1122,10 +1130,15 @@ NORET_TYPE void do_exit(long code)
+@@ -1092,10 +1098,15 @@ NORET_TYPE void do_exit(long code)
if (tsk->splice_pipe)
__free_pipe_info(tsk->splice_pipe);
BUG();
/* Avoid "noreturn function does return". */
for (;;)
-diff -NurpP --minimal linux-2.6.29.2/kernel/fork.c linux-2.6.29.2-vs2.3.0.36.12/kernel/fork.c
---- linux-2.6.29.2/kernel/fork.c 2009-04-30 10:50:35.000000000 +0200
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/fork.c 2009-04-30 12:14:53.000000000 +0200
-@@ -60,6 +60,11 @@
+diff -NurpP --minimal linux-2.6.29.4/kernel/fork.c linux-2.6.29.4-vs2.3.0.36.14/kernel/fork.c
+--- linux-2.6.29.4/kernel/fork.c 2009-05-23 23:16:53.000000000 +0200
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/fork.c 2009-05-10 23:58:22.000000000 +0200
+@@ -60,6 +60,10 @@
#include <linux/tty.h>
#include <linux/proc_fs.h>
#include <linux/blkdev.h>
+#include <linux/vs_network.h>
+#include <linux/vs_limit.h>
+#include <linux/vs_memory.h>
-+#include <linux/vserver/global.h>
#include <trace/sched.h>
#include <asm/pgtable.h>
-@@ -140,6 +145,8 @@ void free_task(struct task_struct *tsk)
+@@ -140,6 +144,8 @@ void free_task(struct task_struct *tsk)
prop_local_destroy_single(&tsk->dirties);
free_thread_info(tsk->stack);
rt_mutex_debug_task_free(tsk);
ftrace_graph_exit_task(tsk);
free_task_struct(tsk);
}
-@@ -279,6 +286,8 @@ static int dup_mmap(struct mm_struct *mm
+@@ -279,6 +285,8 @@ static int dup_mmap(struct mm_struct *mm
mm->free_area_cache = oldmm->mmap_base;
mm->cached_hole_size = ~0UL;
mm->map_count = 0;
cpus_clear(mm->cpu_vm_mask);
mm->mm_rb = RB_ROOT;
rb_link = &mm->mm_rb.rb_node;
-@@ -290,7 +299,7 @@ static int dup_mmap(struct mm_struct *mm
+@@ -290,7 +298,7 @@ static int dup_mmap(struct mm_struct *mm
if (mpnt->vm_flags & VM_DONTCOPY) {
long pages = vma_pages(mpnt);
vm_stat_account(mm, mpnt->vm_flags, mpnt->vm_file,
-pages);
continue;
-@@ -423,8 +432,8 @@ static struct mm_struct * mm_init(struct
+@@ -423,8 +431,8 @@ static struct mm_struct * mm_init(struct
mm->flags = (current->mm) ? current->mm->flags : default_dump_filter;
mm->core_state = NULL;
mm->nr_ptes = 0;
spin_lock_init(&mm->page_table_lock);
spin_lock_init(&mm->ioctx_lock);
INIT_HLIST_HEAD(&mm->ioctx_list);
-@@ -435,6 +444,7 @@ static struct mm_struct * mm_init(struct
+@@ -435,6 +443,7 @@ static struct mm_struct * mm_init(struct
if (likely(!mm_alloc_pgd(mm))) {
mm->def_flags = 0;
mmu_notifier_mm_init(mm);
return mm;
}
-@@ -468,6 +478,7 @@ void __mmdrop(struct mm_struct *mm)
+@@ -468,6 +477,7 @@ void __mmdrop(struct mm_struct *mm)
mm_free_pgd(mm);
destroy_context(mm);
mmu_notifier_mm_destroy(mm);
free_mm(mm);
}
EXPORT_SYMBOL_GPL(__mmdrop);
-@@ -594,6 +605,7 @@ struct mm_struct *dup_mm(struct task_str
+@@ -594,6 +604,7 @@ struct mm_struct *dup_mm(struct task_str
goto fail_nomem;
memcpy(mm, oldmm, sizeof(*mm));
/* Initializing for Swap token stuff */
mm->token_priority = 0;
-@@ -627,6 +639,7 @@ fail_nocontext:
+@@ -627,6 +638,7 @@ fail_nocontext:
* If init_new_context() failed, we cannot use mmput() to free the mm
* because it calls destroy_context()
*/
mm_free_pgd(mm);
free_mm(mm);
return NULL;
-@@ -960,6 +974,8 @@ static struct task_struct *copy_process(
+@@ -943,6 +955,8 @@ static struct task_struct *copy_process(
int retval;
struct task_struct *p;
int cgroup_callbacks_done = 0;
if ((clone_flags & (CLONE_NEWNS|CLONE_FS)) == (CLONE_NEWNS|CLONE_FS))
return ERR_PTR(-EINVAL);
-@@ -994,12 +1010,28 @@ static struct task_struct *copy_process(
+@@ -977,12 +991,28 @@ static struct task_struct *copy_process(
DEBUG_LOCKS_WARN_ON(!p->hardirqs_enabled);
DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
#endif
}
retval = copy_creds(p, clone_flags);
-@@ -1276,6 +1308,18 @@ static struct task_struct *copy_process(
+@@ -1259,6 +1289,18 @@ static struct task_struct *copy_process(
total_forks++;
spin_unlock(¤t->sighand->siglock);
write_unlock_irq(&tasklist_lock);
proc_fork_connector(p);
cgroup_post_fork(p);
-@@ -1320,6 +1364,9 @@ bad_fork_cleanup_count:
+@@ -1303,6 +1345,9 @@ bad_fork_cleanup_count:
atomic_dec(&p->cred->user->processes);
put_cred(p->real_cred);
put_cred(p->cred);
bad_fork_free:
free_task(p);
fork_out:
-diff -NurpP --minimal linux-2.6.29.2/kernel/kthread.c linux-2.6.29.2-vs2.3.0.36.12/kernel/kthread.c
---- linux-2.6.29.2/kernel/kthread.c 2009-03-24 14:22:44.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/kthread.c 2009-03-24 14:48:36.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/kernel/kthread.c linux-2.6.29.4-vs2.3.0.36.14/kernel/kthread.c
+--- linux-2.6.29.4/kernel/kthread.c 2009-03-24 14:22:44.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/kthread.c 2009-03-24 14:48:36.000000000 +0100
@@ -13,6 +13,7 @@
#include <linux/file.h>
#include <linux/module.h>
read_unlock(&tasklist_lock);
/*
* root may have changed our (kthreadd's) priority or CPU mask.
-diff -NurpP --minimal linux-2.6.29.2/kernel/Makefile linux-2.6.29.2-vs2.3.0.36.12/kernel/Makefile
---- linux-2.6.29.2/kernel/Makefile 2009-03-24 14:22:44.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/Makefile 2009-03-24 14:48:36.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/kernel/Makefile linux-2.6.29.4-vs2.3.0.36.14/kernel/Makefile
+--- linux-2.6.29.4/kernel/Makefile 2009-03-24 14:22:44.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/Makefile 2009-03-24 14:48:36.000000000 +0100
@@ -22,6 +22,7 @@ CFLAGS_REMOVE_cgroup-debug.o = -pg
CFLAGS_REMOVE_sched_clock.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.29.2/kernel/nsproxy.c linux-2.6.29.2-vs2.3.0.36.12/kernel/nsproxy.c
---- linux-2.6.29.2/kernel/nsproxy.c 2009-03-24 14:22:44.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/nsproxy.c 2009-03-25 00:39:02.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/kernel/nsproxy.c linux-2.6.29.4-vs2.3.0.36.14/kernel/nsproxy.c
+--- linux-2.6.29.4/kernel/nsproxy.c 2009-03-24 14:22:44.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/nsproxy.c 2009-03-25 00:39:02.000000000 +0100
@@ -19,6 +19,8 @@
#include <linux/mnt_namespace.h>
#include <linux/utsname.h>
if (!(unshare_flags & (CLONE_NEWNS | CLONE_NEWUTS | CLONE_NEWIPC |
CLONE_NEWNET)))
return 0;
-diff -NurpP --minimal linux-2.6.29.2/kernel/pid.c linux-2.6.29.2-vs2.3.0.36.12/kernel/pid.c
---- linux-2.6.29.2/kernel/pid.c 2009-03-24 14:22:44.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/pid.c 2009-03-24 14:48:36.000000000 +0100
-@@ -36,6 +36,8 @@
+diff -NurpP --minimal linux-2.6.29.4/kernel/pid.c linux-2.6.29.4-vs2.3.0.36.14/kernel/pid.c
+--- linux-2.6.29.4/kernel/pid.c 2009-03-24 14:22:44.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/pid.c 2009-05-10 23:59:04.000000000 +0200
+@@ -36,6 +36,7 @@
#include <linux/pid_namespace.h>
#include <linux/init_task.h>
#include <linux/syscalls.h>
+#include <linux/vs_pid.h>
-+#include <linux/vserver/global.h>
#define pid_hashfn(nr, ns) \
hash_long((unsigned long)nr + (unsigned long)ns, pidhash_shift)
-@@ -305,7 +307,7 @@ EXPORT_SYMBOL_GPL(find_pid_ns);
+@@ -305,7 +306,7 @@ EXPORT_SYMBOL_GPL(find_pid_ns);
struct pid *find_vpid(int nr)
{
}
EXPORT_SYMBOL_GPL(find_vpid);
-@@ -365,6 +367,9 @@ void transfer_pid(struct task_struct *ol
+@@ -365,6 +366,9 @@ void transfer_pid(struct task_struct *ol
struct task_struct *pid_task(struct pid *pid, enum pid_type type)
{
struct task_struct *result = NULL;
if (pid) {
struct hlist_node *first;
first = rcu_dereference(pid->tasks[type].first);
-@@ -388,14 +393,14 @@ EXPORT_SYMBOL(find_task_by_pid_type_ns);
+@@ -388,14 +392,14 @@ EXPORT_SYMBOL(find_task_by_pid_type_ns);
struct task_struct *find_task_by_vpid(pid_t vnr)
{
}
EXPORT_SYMBOL(find_task_by_pid_ns);
-@@ -431,7 +436,7 @@ struct pid *find_get_pid(pid_t nr)
+@@ -431,7 +435,7 @@ struct pid *find_get_pid(pid_t nr)
}
EXPORT_SYMBOL_GPL(find_get_pid);
{
struct upid *upid;
pid_t nr = 0;
-@@ -444,6 +449,11 @@ pid_t pid_nr_ns(struct pid *pid, struct
+@@ -444,6 +448,11 @@ pid_t pid_nr_ns(struct pid *pid, struct
return nr;
}
pid_t pid_vnr(struct pid *pid)
{
return pid_nr_ns(pid, current->nsproxy->pid_ns);
-diff -NurpP --minimal linux-2.6.29.2/kernel/pid_namespace.c linux-2.6.29.2-vs2.3.0.36.12/kernel/pid_namespace.c
---- linux-2.6.29.2/kernel/pid_namespace.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/pid_namespace.c 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/kernel/pid_namespace.c linux-2.6.29.4-vs2.3.0.36.14/kernel/pid_namespace.c
+--- linux-2.6.29.4/kernel/pid_namespace.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/pid_namespace.c 2009-02-22 22:54:26.000000000 +0100
@@ -13,6 +13,7 @@
#include <linux/syscalls.h>
#include <linux/err.h>
kmem_cache_free(pid_ns_cachep, ns);
}
-diff -NurpP --minimal linux-2.6.29.2/kernel/posix-timers.c linux-2.6.29.2-vs2.3.0.36.12/kernel/posix-timers.c
---- linux-2.6.29.2/kernel/posix-timers.c 2009-03-24 14:22:44.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/posix-timers.c 2009-05-06 21:28:16.000000000 +0200
+diff -NurpP --minimal linux-2.6.29.4/kernel/posix-timers.c linux-2.6.29.4-vs2.3.0.36.14/kernel/posix-timers.c
+--- linux-2.6.29.4/kernel/posix-timers.c 2009-03-24 14:22:44.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/posix-timers.c 2009-05-06 21:28:16.000000000 +0200
@@ -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.29.2/kernel/printk.c linux-2.6.29.2-vs2.3.0.36.12/kernel/printk.c
---- linux-2.6.29.2/kernel/printk.c 2009-03-24 14:22:44.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/printk.c 2009-03-24 14:48:36.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/kernel/printk.c linux-2.6.29.4-vs2.3.0.36.14/kernel/printk.c
+--- linux-2.6.29.4/kernel/printk.c 2009-03-24 14:22:44.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/printk.c 2009-03-24 14:48:36.000000000 +0100
@@ -32,6 +32,7 @@
#include <linux/security.h>
#include <linux/bootmem.h>
count = len;
if (count > log_buf_len)
count = log_buf_len;
-diff -NurpP --minimal linux-2.6.29.2/kernel/ptrace.c linux-2.6.29.2-vs2.3.0.36.12/kernel/ptrace.c
---- linux-2.6.29.2/kernel/ptrace.c 2009-03-24 14:22:44.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/ptrace.c 2009-03-24 14:48:36.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/kernel/ptrace.c linux-2.6.29.4-vs2.3.0.36.14/kernel/ptrace.c
+--- linux-2.6.29.4/kernel/ptrace.c 2009-05-23 23:16:53.000000000 +0200
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/ptrace.c 2009-05-10 23:42:01.000000000 +0200
@@ -21,6 +21,7 @@
#include <linux/audit.h>
#include <linux/pid_namespace.h>
if (request == PTRACE_ATTACH) {
ret = ptrace_attach(child);
/*
-diff -NurpP --minimal linux-2.6.29.2/kernel/sched.c linux-2.6.29.2-vs2.3.0.36.12/kernel/sched.c
---- linux-2.6.29.2/kernel/sched.c 2009-04-30 10:50:35.000000000 +0200
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/sched.c 2009-04-30 12:14:53.000000000 +0200
+diff -NurpP --minimal linux-2.6.29.4/kernel/sched.c linux-2.6.29.4-vs2.3.0.36.14/kernel/sched.c
+--- linux-2.6.29.4/kernel/sched.c 2009-05-23 23:16:53.000000000 +0200
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/sched.c 2009-05-10 23:42:01.000000000 +0200
@@ -72,6 +72,8 @@
#include <linux/debugfs.h>
#include <linux/ctype.h>
rq->rt.rt_runtime = def_rt_bandwidth.rt_runtime;
#ifdef CONFIG_RT_GROUP_SCHED
INIT_LIST_HEAD(&rq->leaf_rt_rq_list);
-diff -NurpP --minimal linux-2.6.29.2/kernel/sched_fair.c linux-2.6.29.2-vs2.3.0.36.12/kernel/sched_fair.c
---- linux-2.6.29.2/kernel/sched_fair.c 2009-03-24 14:22:45.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/sched_fair.c 2009-03-24 14:48:36.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/kernel/sched_fair.c linux-2.6.29.4-vs2.3.0.36.14/kernel/sched_fair.c
+--- linux-2.6.29.4/kernel/sched_fair.c 2009-03-24 14:22:45.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/sched_fair.c 2009-03-24 14:48:36.000000000 +0100
@@ -717,6 +717,9 @@ enqueue_entity(struct cfs_rq *cfs_rq, st
check_spread(cfs_rq, se);
if (se != cfs_rq->curr)
account_entity_dequeue(cfs_rq, se);
update_min_vruntime(cfs_rq);
}
-diff -NurpP --minimal linux-2.6.29.2/kernel/sched_hard.h linux-2.6.29.2-vs2.3.0.36.12/kernel/sched_hard.h
---- linux-2.6.29.2/kernel/sched_hard.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/sched_hard.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/kernel/sched_hard.h linux-2.6.29.4-vs2.3.0.36.14/kernel/sched_hard.h
+--- linux-2.6.29.4/kernel/sched_hard.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/sched_hard.h 2009-02-22 22:54:26.000000000 +0100
@@ -0,0 +1,353 @@
+
+#ifdef CONFIG_VSERVER_IDLELIMIT
+
+#endif /* CONFIG_VSERVER_HARDCPU */
+
-diff -NurpP --minimal linux-2.6.29.2/kernel/sched_mon.h linux-2.6.29.2-vs2.3.0.36.12/kernel/sched_mon.h
---- linux-2.6.29.2/kernel/sched_mon.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/sched_mon.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/kernel/sched_mon.h linux-2.6.29.4-vs2.3.0.36.14/kernel/sched_mon.h
+--- linux-2.6.29.4/kernel/sched_mon.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/sched_mon.h 2009-02-22 22:54:26.000000000 +0100
@@ -0,0 +1,200 @@
+
+#include <linux/vserver/monitor.h>
+
+#endif /* CONFIG_VSERVER_MONITOR */
+
-diff -NurpP --minimal linux-2.6.29.2/kernel/signal.c linux-2.6.29.2-vs2.3.0.36.12/kernel/signal.c
---- linux-2.6.29.2/kernel/signal.c 2009-03-24 14:22:45.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/signal.c 2009-04-20 23:37:12.000000000 +0200
+diff -NurpP --minimal linux-2.6.29.4/kernel/signal.c linux-2.6.29.4-vs2.3.0.36.14/kernel/signal.c
+--- linux-2.6.29.4/kernel/signal.c 2009-03-24 14:22:45.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/signal.c 2009-04-20 23:37:12.000000000 +0200
@@ -27,6 +27,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.29.2/kernel/softirq.c linux-2.6.29.2-vs2.3.0.36.12/kernel/softirq.c
---- linux-2.6.29.2/kernel/softirq.c 2009-04-30 10:50:35.000000000 +0200
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/softirq.c 2009-04-30 12:14:53.000000000 +0200
+diff -NurpP --minimal linux-2.6.29.4/kernel/softirq.c linux-2.6.29.4-vs2.3.0.36.14/kernel/softirq.c
+--- linux-2.6.29.4/kernel/softirq.c 2009-05-23 23:16:53.000000000 +0200
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/softirq.c 2009-04-30 12:14:53.000000000 +0200
@@ -23,6 +23,7 @@
#include <linux/rcupdate.h>
#include <linux/smp.h>
#include <asm/irq.h>
/*
-diff -NurpP --minimal linux-2.6.29.2/kernel/sys.c linux-2.6.29.2-vs2.3.0.36.12/kernel/sys.c
---- linux-2.6.29.2/kernel/sys.c 2009-03-24 14:22:45.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/sys.c 2009-03-24 14:48:36.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/kernel/sys.c linux-2.6.29.4-vs2.3.0.36.14/kernel/sys.c
+--- linux-2.6.29.4/kernel/sys.c 2009-03-24 14:22:45.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/sys.c 2009-03-24 14:48:36.000000000 +0100
@@ -39,6 +39,7 @@
#include <linux/syscalls.h>
#include <linux/kprobes.h>
return -EPERM;
if (resource == RLIMIT_NOFILE && new_rlim.rlim_max > sysctl_nr_open)
return -EPERM;
-diff -NurpP --minimal linux-2.6.29.2/kernel/sysctl.c linux-2.6.29.2-vs2.3.0.36.12/kernel/sysctl.c
---- linux-2.6.29.2/kernel/sysctl.c 2009-04-30 10:50:35.000000000 +0200
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/sysctl.c 2009-04-30 12:14:53.000000000 +0200
+diff -NurpP --minimal linux-2.6.29.4/kernel/sysctl.c linux-2.6.29.4-vs2.3.0.36.14/kernel/sysctl.c
+--- linux-2.6.29.4/kernel/sysctl.c 2009-05-23 23:16:53.000000000 +0200
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/sysctl.c 2009-04-30 12:14:53.000000000 +0200
@@ -111,6 +111,7 @@ static int ngroups_max = NGROUPS_MAX;
#ifdef CONFIG_MODULES
extern char modprobe_path[];
#ifdef CONFIG_CHR_DEV_SG
{
.ctl_name = KERN_SG_BIG_BUFF,
-diff -NurpP --minimal linux-2.6.29.2/kernel/sysctl_check.c linux-2.6.29.2-vs2.3.0.36.12/kernel/sysctl_check.c
---- linux-2.6.29.2/kernel/sysctl_check.c 2009-03-24 14:22:45.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/sysctl_check.c 2009-03-24 14:48:36.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/kernel/sysctl_check.c linux-2.6.29.4-vs2.3.0.36.14/kernel/sysctl_check.c
+--- linux-2.6.29.4/kernel/sysctl_check.c 2009-03-24 14:22:45.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/sysctl_check.c 2009-03-24 14:48:36.000000000 +0100
@@ -39,6 +39,7 @@ static const struct trans_ctl_table tran
{ KERN_PANIC, "panic" },
{}
};
-diff -NurpP --minimal linux-2.6.29.2/kernel/time.c linux-2.6.29.2-vs2.3.0.36.12/kernel/time.c
---- linux-2.6.29.2/kernel/time.c 2009-03-24 14:22:45.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/time.c 2009-03-24 14:48:36.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/kernel/time.c linux-2.6.29.4-vs2.3.0.36.14/kernel/time.c
+--- linux-2.6.29.4/kernel/time.c 2009-03-24 14:22:45.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/time.c 2009-03-24 14:48:36.000000000 +0100
@@ -63,6 +63,7 @@ EXPORT_SYMBOL(sys_tz);
SYSCALL_DEFINE1(time, time_t __user *, tloc)
{
tv->tv_sec = x.tv_sec;
tv->tv_nsec = x.tv_usec * NSEC_PER_USEC;
}
-diff -NurpP --minimal linux-2.6.29.2/kernel/timer.c linux-2.6.29.2-vs2.3.0.36.12/kernel/timer.c
---- linux-2.6.29.2/kernel/timer.c 2009-03-24 14:22:45.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/timer.c 2009-03-24 17:41:02.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/kernel/timer.c linux-2.6.29.4-vs2.3.0.36.14/kernel/timer.c
+--- linux-2.6.29.4/kernel/timer.c 2009-03-24 14:22:45.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/timer.c 2009-03-24 17:41:02.000000000 +0100
@@ -37,6 +37,10 @@
#include <linux/delay.h>
#include <linux/tick.h>
info->uptime = tp.tv_sec + (tp.tv_nsec ? 1 : 0);
info->loads[0] = avenrun[0] << (SI_LOAD_SHIFT - FSHIFT);
-diff -NurpP --minimal linux-2.6.29.2/kernel/user.c linux-2.6.29.2-vs2.3.0.36.12/kernel/user.c
---- linux-2.6.29.2/kernel/user.c 2009-03-24 14:22:45.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/user.c 2009-03-24 17:47:32.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/kernel/user.c linux-2.6.29.4-vs2.3.0.36.14/kernel/user.c
+--- linux-2.6.29.4/kernel/user.c 2009-03-24 14:22:45.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/user.c 2009-03-24 17:47:32.000000000 +0100
@@ -249,10 +249,10 @@ static struct kobj_type uids_ktype = {
*
* See Documentation/scheduler/sched-design-CFS.txt for ramifications.
goto out_destoy_sched;
/*
-diff -NurpP --minimal linux-2.6.29.2/kernel/user_namespace.c linux-2.6.29.2-vs2.3.0.36.12/kernel/user_namespace.c
---- linux-2.6.29.2/kernel/user_namespace.c 2009-03-24 14:22:45.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/user_namespace.c 2009-03-24 18:05:19.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/kernel/user_namespace.c linux-2.6.29.4-vs2.3.0.36.14/kernel/user_namespace.c
+--- linux-2.6.29.4/kernel/user_namespace.c 2009-03-24 14:22:45.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/user_namespace.c 2009-03-24 18:05:19.000000000 +0100
@@ -10,6 +10,7 @@
#include <linux/slab.h>
#include <linux/user_namespace.h>
INIT_WORK(&ns->destroyer, free_user_ns_work);
schedule_work(&ns->destroyer);
}
-diff -NurpP --minimal linux-2.6.29.2/kernel/utsname.c linux-2.6.29.2-vs2.3.0.36.12/kernel/utsname.c
---- linux-2.6.29.2/kernel/utsname.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/utsname.c 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/kernel/utsname.c linux-2.6.29.4-vs2.3.0.36.14/kernel/utsname.c
+--- linux-2.6.29.4/kernel/utsname.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/utsname.c 2009-02-22 22:54:26.000000000 +0100
@@ -14,6 +14,7 @@
#include <linux/utsname.h>
#include <linux/err.h>
+ atomic_dec(&vs_global_uts_ns);
kfree(ns);
}
-diff -NurpP --minimal linux-2.6.29.2/kernel/vserver/cacct.c linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/cacct.c
---- linux-2.6.29.2/kernel/vserver/cacct.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/cacct.c 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/kernel/vserver/cacct.c linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/cacct.c
+--- linux-2.6.29.4/kernel/vserver/cacct.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/cacct.c 2009-02-22 22:54:26.000000000 +0100
@@ -0,0 +1,42 @@
+/*
+ * linux/kernel/vserver/cacct.c
+ return 0;
+}
+
-diff -NurpP --minimal linux-2.6.29.2/kernel/vserver/cacct_init.h linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/cacct_init.h
---- linux-2.6.29.2/kernel/vserver/cacct_init.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/cacct_init.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/kernel/vserver/cacct_init.h linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/cacct_init.h
+--- linux-2.6.29.4/kernel/vserver/cacct_init.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/cacct_init.h 2009-02-22 22:54:26.000000000 +0100
@@ -0,0 +1,25 @@
+
+
+ return;
+}
+
-diff -NurpP --minimal linux-2.6.29.2/kernel/vserver/cacct_proc.h linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/cacct_proc.h
---- linux-2.6.29.2/kernel/vserver/cacct_proc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/cacct_proc.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/kernel/vserver/cacct_proc.h linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/cacct_proc.h
+--- linux-2.6.29.4/kernel/vserver/cacct_proc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/cacct_proc.h 2009-02-22 22:54:26.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.29.2/kernel/vserver/context.c linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/context.c
---- linux-2.6.29.2/kernel/vserver/context.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/context.c 2009-04-03 21:25:31.000000000 +0200
-@@ -0,0 +1,1018 @@
+diff -NurpP --minimal linux-2.6.29.4/kernel/vserver/context.c linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/context.c
+--- linux-2.6.29.4/kernel/vserver/context.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/context.c 2009-05-23 22:56:58.000000000 +0200
+@@ -0,0 +1,1030 @@
+/*
+ * linux/kernel/vserver/context.c
+ *
+#include <linux/vserver/limit.h>
+#include <linux/vserver/limit_int.h>
+#include <linux/vserver/space.h>
++#include <linux/init_task.h>
+
+#include <linux/vs_context.h>
+#include <linux/vs_limit.h>
+static struct vx_info *__alloc_vx_info(xid_t xid)
+{
+ struct vx_info *new = NULL;
-+ int cpu;
++ int cpu, index;
+
+ vxdprintk(VXD_CBIT(xid, 0), "alloc_vx_info(%d)*", xid);
+
+ new->reboot_cmd = 0;
+ new->exit_code = 0;
+
++ // preconfig fs entries
++ for (index = 0; index < VX_SPACES; index++) {
++ write_lock(&init_fs.lock);
++ init_fs.users++;
++ write_unlock(&init_fs.lock);
++ new->vx_fs[index] = &init_fs;
++ }
++
+ vxdprintk(VXD_CBIT(xid, 0),
+ "alloc_vx_info(%d) = %p", xid, new);
+ vxh_alloc_vx_info(new);
+{
+ struct nsproxy *nsproxy;
+ struct fs_struct *fs;
-+ int index;
++ int index, kill;
+
+ might_sleep();
+
+ put_nsproxy(nsproxy);
+
+ fs = xchg(&vxi->vx_fs[index], NULL);
-+ if (fs)
-+ put_fs_struct(fs);
++ write_lock(&fs->lock);
++ kill = !--fs->users;
++ write_unlock(&fs->lock);
++ if (kill)
++ free_fs_struct(fs);
+ }
+}
+
+
+EXPORT_SYMBOL_GPL(free_vx_info);
+
-diff -NurpP --minimal linux-2.6.29.2/kernel/vserver/cvirt.c linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/cvirt.c
---- linux-2.6.29.2/kernel/vserver/cvirt.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/cvirt.c 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/kernel/vserver/cvirt.c linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/cvirt.c
+--- linux-2.6.29.4/kernel/vserver/cvirt.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/cvirt.c 2009-02-22 22:54:26.000000000 +0100
@@ -0,0 +1,300 @@
+/*
+ * linux/kernel/vserver/cvirt.c
+
+#endif
+
-diff -NurpP --minimal linux-2.6.29.2/kernel/vserver/cvirt_init.h linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/cvirt_init.h
---- linux-2.6.29.2/kernel/vserver/cvirt_init.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/cvirt_init.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/kernel/vserver/cvirt_init.h linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/cvirt_init.h
+--- linux-2.6.29.4/kernel/vserver/cvirt_init.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/cvirt_init.h 2009-02-22 22:54:26.000000000 +0100
@@ -0,0 +1,69 @@
+
+
+ return;
+}
+
-diff -NurpP --minimal linux-2.6.29.2/kernel/vserver/cvirt_proc.h linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/cvirt_proc.h
---- linux-2.6.29.2/kernel/vserver/cvirt_proc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/cvirt_proc.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/kernel/vserver/cvirt_proc.h linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/cvirt_proc.h
+--- linux-2.6.29.4/kernel/vserver/cvirt_proc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/cvirt_proc.h 2009-02-22 22:54:26.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.29.2/kernel/vserver/debug.c linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/debug.c
---- linux-2.6.29.2/kernel/vserver/debug.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/debug.c 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/kernel/vserver/debug.c linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/debug.c
+--- linux-2.6.29.4/kernel/vserver/debug.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/debug.c 2009-02-22 22:54:26.000000000 +0100
@@ -0,0 +1,32 @@
+/*
+ * kernel/vserver/debug.c
+
+EXPORT_SYMBOL_GPL(dump_vx_info);
+
-diff -NurpP --minimal linux-2.6.29.2/kernel/vserver/device.c linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/device.c
---- linux-2.6.29.2/kernel/vserver/device.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/device.c 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/kernel/vserver/device.c linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/device.c
+--- linux-2.6.29.4/kernel/vserver/device.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/device.c 2009-02-22 22:54:26.000000000 +0100
@@ -0,0 +1,443 @@
+/*
+ * linux/kernel/vserver/device.c
+#endif /* CONFIG_COMPAT */
+
+
-diff -NurpP --minimal linux-2.6.29.2/kernel/vserver/dlimit.c linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/dlimit.c
---- linux-2.6.29.2/kernel/vserver/dlimit.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/dlimit.c 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/kernel/vserver/dlimit.c linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/dlimit.c
+--- linux-2.6.29.4/kernel/vserver/dlimit.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/dlimit.c 2009-02-22 22:54:26.000000000 +0100
@@ -0,0 +1,522 @@
+/*
+ * linux/kernel/vserver/dlimit.c
+EXPORT_SYMBOL_GPL(locate_dl_info);
+EXPORT_SYMBOL_GPL(rcu_free_dl_info);
+
-diff -NurpP --minimal linux-2.6.29.2/kernel/vserver/helper.c linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/helper.c
---- linux-2.6.29.2/kernel/vserver/helper.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/helper.c 2009-03-25 00:40:43.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/kernel/vserver/helper.c linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/helper.c
+--- linux-2.6.29.4/kernel/vserver/helper.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/helper.c 2009-03-25 00:40:43.000000000 +0100
@@ -0,0 +1,199 @@
+/*
+ * linux/kernel/vserver/helper.c
+ return do_vshelper(vshelper_path, argv, envp, 1);
+}
+
-diff -NurpP --minimal linux-2.6.29.2/kernel/vserver/history.c linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/history.c
---- linux-2.6.29.2/kernel/vserver/history.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/history.c 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/kernel/vserver/history.c linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/history.c
+--- linux-2.6.29.4/kernel/vserver/history.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/history.c 2009-02-22 22:54:26.000000000 +0100
@@ -0,0 +1,258 @@
+/*
+ * kernel/vserver/history.c
+
+#endif /* CONFIG_COMPAT */
+
-diff -NurpP --minimal linux-2.6.29.2/kernel/vserver/inet.c linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/inet.c
---- linux-2.6.29.2/kernel/vserver/inet.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/inet.c 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/kernel/vserver/inet.c linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/inet.c
+--- linux-2.6.29.4/kernel/vserver/inet.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/inet.c 2009-02-22 22:54:26.000000000 +0100
@@ -0,0 +1,225 @@
+
+#include <linux/in.h>
+
+EXPORT_SYMBOL_GPL(ip_v4_find_src);
+
-diff -NurpP --minimal linux-2.6.29.2/kernel/vserver/init.c linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/init.c
---- linux-2.6.29.2/kernel/vserver/init.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/init.c 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/kernel/vserver/init.c linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/init.c
+--- linux-2.6.29.4/kernel/vserver/init.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/init.c 2009-02-22 22:54:26.000000000 +0100
@@ -0,0 +1,45 @@
+/*
+ * linux/kernel/init.c
+module_init(init_vserver);
+module_exit(exit_vserver);
+
-diff -NurpP --minimal linux-2.6.29.2/kernel/vserver/inode.c linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/inode.c
---- linux-2.6.29.2/kernel/vserver/inode.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/inode.c 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/kernel/vserver/inode.c linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/inode.c
+--- linux-2.6.29.4/kernel/vserver/inode.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/inode.c 2009-02-22 22:54:26.000000000 +0100
@@ -0,0 +1,422 @@
+/*
+ * linux/kernel/vserver/inode.c
+
+#endif /* CONFIG_PROPAGATE */
+
-diff -NurpP --minimal linux-2.6.29.2/kernel/vserver/Kconfig linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/Kconfig
---- linux-2.6.29.2/kernel/vserver/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/Kconfig 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/kernel/vserver/Kconfig linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/Kconfig
+--- linux-2.6.29.4/kernel/vserver/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/Kconfig 2009-02-22 22:54:26.000000000 +0100
@@ -0,0 +1,251 @@
+#
+# Linux VServer configuration
+ default y
+ select SECURITY_CAPABILITIES
+
-diff -NurpP --minimal linux-2.6.29.2/kernel/vserver/limit.c linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/limit.c
---- linux-2.6.29.2/kernel/vserver/limit.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/limit.c 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/kernel/vserver/limit.c linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/limit.c
+--- linux-2.6.29.4/kernel/vserver/limit.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/limit.c 2009-02-22 22:54:26.000000000 +0100
@@ -0,0 +1,319 @@
+/*
+ * linux/kernel/vserver/limit.c
+ return points;
+}
+
-diff -NurpP --minimal linux-2.6.29.2/kernel/vserver/limit_init.h linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/limit_init.h
---- linux-2.6.29.2/kernel/vserver/limit_init.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/limit_init.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/kernel/vserver/limit_init.h linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/limit_init.h
+--- linux-2.6.29.4/kernel/vserver/limit_init.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/limit_init.h 2009-02-22 22:54:26.000000000 +0100
@@ -0,0 +1,31 @@
+
+
+ }
+}
+
-diff -NurpP --minimal linux-2.6.29.2/kernel/vserver/limit_proc.h linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/limit_proc.h
---- linux-2.6.29.2/kernel/vserver/limit_proc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/limit_proc.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/kernel/vserver/limit_proc.h linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/limit_proc.h
+--- linux-2.6.29.4/kernel/vserver/limit_proc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/limit_proc.h 2009-02-22 22:54:26.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.29.2/kernel/vserver/Makefile linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/Makefile
---- linux-2.6.29.2/kernel/vserver/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/Makefile 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/kernel/vserver/Makefile linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/Makefile
+--- linux-2.6.29.4/kernel/vserver/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/Makefile 2009-02-22 22:54:26.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.29.2/kernel/vserver/monitor.c linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/monitor.c
---- linux-2.6.29.2/kernel/vserver/monitor.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/monitor.c 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/kernel/vserver/monitor.c linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/monitor.c
+--- linux-2.6.29.4/kernel/vserver/monitor.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/monitor.c 2009-02-22 22:54:26.000000000 +0100
@@ -0,0 +1,138 @@
+/*
+ * kernel/vserver/monitor.c
+
+#endif /* CONFIG_COMPAT */
+
-diff -NurpP --minimal linux-2.6.29.2/kernel/vserver/network.c linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/network.c
---- linux-2.6.29.2/kernel/vserver/network.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/network.c 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/kernel/vserver/network.c linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/network.c
+--- linux-2.6.29.4/kernel/vserver/network.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/network.c 2009-02-22 22:54:26.000000000 +0100
@@ -0,0 +1,864 @@
+/*
+ * linux/kernel/vserver/network.c
+EXPORT_SYMBOL_GPL(free_nx_info);
+EXPORT_SYMBOL_GPL(unhash_nx_info);
+
-diff -NurpP --minimal linux-2.6.29.2/kernel/vserver/proc.c linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/proc.c
---- linux-2.6.29.2/kernel/vserver/proc.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/proc.c 2009-02-22 22:54:26.000000000 +0100
-@@ -0,0 +1,1092 @@
+diff -NurpP --minimal linux-2.6.29.4/kernel/vserver/proc.c linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/proc.c
+--- linux-2.6.29.4/kernel/vserver/proc.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/proc.c 2009-05-23 22:57:16.000000000 +0200
+@@ -0,0 +1,1096 @@
+/*
+ * linux/kernel/vserver/proc.c
+ *
+ return sprintf(buffer,
+ "#CTotal:\t%d\n"
+ "#CActive:\t%d\n"
-+ "#NSProxy:\t%d\t%d %d %d %d %d %d\n",
++ "#NSProxy:\t%d\t%d %d %d %d %d %d\n"
++ "#InitTask:\t%d\t%d %d\n",
+ atomic_read(&vx_global_ctotal),
+ atomic_read(&vx_global_cactive),
+ atomic_read(&vs_global_nsproxy),
+ atomic_read(&vs_global_uts_ns),
+ atomic_read(&vs_global_ipc_ns),
+ atomic_read(&vs_global_user_ns),
-+ atomic_read(&vs_global_pid_ns));
++ atomic_read(&vs_global_pid_ns),
++ atomic_read(&init_task.usage),
++ atomic_read(&init_task.nsproxy->count),
++ init_task.fs->users);
+}
+
+
+ return buffer - orig;
+}
+
-diff -NurpP --minimal linux-2.6.29.2/kernel/vserver/sched.c linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/sched.c
---- linux-2.6.29.2/kernel/vserver/sched.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/sched.c 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/kernel/vserver/sched.c linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/sched.c
+--- linux-2.6.29.4/kernel/vserver/sched.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/sched.c 2009-02-22 22:54:26.000000000 +0100
@@ -0,0 +1,414 @@
+/*
+ * linux/kernel/vserver/sched.c
+ return 0;
+}
+
-diff -NurpP --minimal linux-2.6.29.2/kernel/vserver/sched_init.h linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/sched_init.h
---- linux-2.6.29.2/kernel/vserver/sched_init.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/sched_init.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/kernel/vserver/sched_init.h linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/sched_init.h
+--- linux-2.6.29.4/kernel/vserver/sched_init.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/sched_init.h 2009-02-22 22:54:26.000000000 +0100
@@ -0,0 +1,50 @@
+
+static inline void vx_info_init_sched(struct _vx_sched *sched)
+{
+ return;
+}
-diff -NurpP --minimal linux-2.6.29.2/kernel/vserver/sched_proc.h linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/sched_proc.h
---- linux-2.6.29.2/kernel/vserver/sched_proc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/sched_proc.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/kernel/vserver/sched_proc.h linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/sched_proc.h
+--- linux-2.6.29.4/kernel/vserver/sched_proc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/sched_proc.h 2009-02-22 22:54:26.000000000 +0100
@@ -0,0 +1,57 @@
+#ifndef _VX_SCHED_PROC_H
+#define _VX_SCHED_PROC_H
+}
+
+#endif /* _VX_SCHED_PROC_H */
-diff -NurpP --minimal linux-2.6.29.2/kernel/vserver/signal.c linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/signal.c
---- linux-2.6.29.2/kernel/vserver/signal.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/signal.c 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/kernel/vserver/signal.c linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/signal.c
+--- linux-2.6.29.4/kernel/vserver/signal.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/signal.c 2009-02-22 22:54:26.000000000 +0100
@@ -0,0 +1,132 @@
+/*
+ * linux/kernel/vserver/signal.c
+ return ret;
+}
+
-diff -NurpP --minimal linux-2.6.29.2/kernel/vserver/space.c linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/space.c
---- linux-2.6.29.2/kernel/vserver/space.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/space.c 2009-04-03 21:25:31.000000000 +0200
-@@ -0,0 +1,387 @@
+diff -NurpP --minimal linux-2.6.29.4/kernel/vserver/space.c linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/space.c
+--- linux-2.6.29.4/kernel/vserver/space.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/space.c 2009-05-29 18:59:49.000000000 +0200
+@@ -0,0 +1,375 @@
+/*
+ * linux/kernel/vserver/space.c
+ *
+ return proxy;
+}
+
-+/*
-+ * merge two fs structs into a new one.
-+ * will take a reference on the result.
-+ */
-+
-+static inline
-+struct fs_struct *__vs_merge_fs(struct fs_struct *old,
-+ struct fs_struct *fs, unsigned long mask)
-+{
-+ if (!(mask & CLONE_FS)) {
-+ if (old)
-+ atomic_inc(&old->count);
-+ return old;
-+ }
-+
-+ if (!fs)
-+ return NULL;
-+
-+ return copy_fs_struct(fs);
-+}
-+
+
+int vx_enter_space(struct vx_info *vxi, unsigned long mask, unsigned index)
+{
+ struct nsproxy *proxy, *proxy_cur, *proxy_new;
-+ struct fs_struct *fs, *fs_cur, *fs_new;
-+ int ret;
++ struct fs_struct *fs_cur, *fs = NULL;
++ int ret, kill = 0;
+
+ vxdprintk(VXD_CBIT(space, 8), "vx_enter_space(%p[#%u],0x%08lx,%d)",
+ vxi, vxi->vx_id, mask, index);
+ if ((mask & vxi->vx_nsmask[index]) != mask)
+ return -EINVAL;
+
++ if (mask & CLONE_FS) {
++ fs = copy_fs_struct(vxi->vx_fs[index]);
++ if (!fs)
++ return -ENOMEM;
++ }
+ proxy = vxi->vx_nsproxy[index];
-+ fs = vxi->vx_fs[index];
++
++ vxdprintk(VXD_CBIT(space, 9),
++ "vx_enter_space(%p[#%u],0x%08lx,%d) -> (%p,%p)",
++ vxi, vxi->vx_id, mask, index, proxy, fs);
+
+ task_lock(current);
+ fs_cur = current->fs;
-+ atomic_inc(&fs_cur->count);
++
++ if (mask & CLONE_FS) {
++ write_lock(&fs_cur->lock);
++ current->fs = fs;
++ kill = !--fs_cur->users;
++ write_unlock(&fs_cur->lock);
++ }
++
+ proxy_cur = current->nsproxy;
+ get_nsproxy(proxy_cur);
+ task_unlock(current);
+
-+ fs_new = __vs_merge_fs(fs_cur, fs, mask);
-+ if (IS_ERR(fs_new)) {
-+ ret = PTR_ERR(fs_new);
-+ goto out_put;
-+ }
++ if (kill)
++ free_fs_struct(fs_cur);
+
+ proxy_new = __vs_merge_nsproxy(proxy_cur, proxy, mask);
+ if (IS_ERR(proxy_new)) {
+ ret = PTR_ERR(proxy_new);
-+ goto out_put_fs;
++ goto out_put;
+ }
+
-+ fs_new = xchg(¤t->fs, fs_new);
+ proxy_new = xchg(¤t->nsproxy, proxy_new);
+ ret = 0;
+
+ if (proxy_new)
+ put_nsproxy(proxy_new);
-+out_put_fs:
-+ if (fs_new)
-+ put_fs_struct(fs_new);
+out_put:
+ if (proxy_cur)
+ put_nsproxy(proxy_cur);
-+ if (fs_cur)
-+ put_fs_struct(fs_cur);
+ return ret;
+}
+
+int vx_set_space(struct vx_info *vxi, unsigned long mask, unsigned index)
+{
+ struct nsproxy *proxy_vxi, *proxy_cur, *proxy_new;
-+ struct fs_struct *fs_vxi, *fs_cur, *fs_new;
-+ int ret;
++ struct fs_struct *fs_vxi, *fs;
++ int ret, kill = 0;
+
+ vxdprintk(VXD_CBIT(space, 8), "vx_set_space(%p[#%u],0x%08lx,%d)",
+ vxi, vxi->vx_id, mask, index);
+ proxy_vxi = vxi->vx_nsproxy[index];
+ fs_vxi = vxi->vx_fs[index];
+
++ if (mask & CLONE_FS) {
++ fs = copy_fs_struct(current->fs);
++ if (!fs)
++ return -ENOMEM;
++ }
++
+ task_lock(current);
-+ fs_cur = current->fs;
-+ atomic_inc(&fs_cur->count);
++
++ if (mask & CLONE_FS) {
++ write_lock(&fs_vxi->lock);
++ vxi->vx_fs[index] = fs;
++ kill = !--fs_vxi->users;
++ write_unlock(&fs_vxi->lock);
++ }
++
+ proxy_cur = current->nsproxy;
+ get_nsproxy(proxy_cur);
+ task_unlock(current);
+
-+ fs_new = __vs_merge_fs(fs_vxi, fs_cur, mask);
-+ if (IS_ERR(fs_new)) {
-+ ret = PTR_ERR(fs_new);
-+ goto out_put;
-+ }
++ if (kill)
++ free_fs_struct(fs_vxi);
+
+ proxy_new = __vs_merge_nsproxy(proxy_vxi, proxy_cur, mask);
+ if (IS_ERR(proxy_new)) {
+ ret = PTR_ERR(proxy_new);
-+ goto out_put_fs;
++ goto out_put;
+ }
+
-+ fs_new = xchg(&vxi->vx_fs[index], fs_new);
+ proxy_new = xchg(&vxi->vx_nsproxy[index], proxy_new);
+ vxi->vx_nsmask[index] |= mask;
+ ret = 0;
+
+ if (proxy_new)
+ put_nsproxy(proxy_new);
-+out_put_fs:
-+ if (fs_new)
-+ put_fs_struct(fs_new);
+out_put:
+ if (proxy_cur)
+ put_nsproxy(proxy_cur);
-+ if (fs_cur)
-+ put_fs_struct(fs_cur);
+ return ret;
+}
+
+ return 0;
+}
+
-diff -NurpP --minimal linux-2.6.29.2/kernel/vserver/switch.c linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/switch.c
---- linux-2.6.29.2/kernel/vserver/switch.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/switch.c 2009-03-24 14:59:18.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/kernel/vserver/switch.c linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/switch.c
+--- linux-2.6.29.4/kernel/vserver/switch.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/switch.c 2009-03-24 14:59:18.000000000 +0100
@@ -0,0 +1,543 @@
+/*
+ * linux/kernel/vserver/switch.c
+}
+
+#endif /* CONFIG_COMPAT */
-diff -NurpP --minimal linux-2.6.29.2/kernel/vserver/sysctl.c linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/sysctl.c
---- linux-2.6.29.2/kernel/vserver/sysctl.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/sysctl.c 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/kernel/vserver/sysctl.c linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/sysctl.c
+--- linux-2.6.29.4/kernel/vserver/sysctl.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/sysctl.c 2009-02-22 22:54:26.000000000 +0100
@@ -0,0 +1,244 @@
+/*
+ * kernel/vserver/sysctl.c
+EXPORT_SYMBOL_GPL(vx_debug_space);
+EXPORT_SYMBOL_GPL(vx_debug_misc);
+
-diff -NurpP --minimal linux-2.6.29.2/kernel/vserver/tag.c linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/tag.c
---- linux-2.6.29.2/kernel/vserver/tag.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/tag.c 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/kernel/vserver/tag.c linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/tag.c
+--- linux-2.6.29.4/kernel/vserver/tag.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/tag.c 2009-02-22 22:54:26.000000000 +0100
@@ -0,0 +1,63 @@
+/*
+ * linux/kernel/vserver/tag.c
+}
+
+
-diff -NurpP --minimal linux-2.6.29.2/kernel/vserver/vci_config.h linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/vci_config.h
---- linux-2.6.29.2/kernel/vserver/vci_config.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/kernel/vserver/vci_config.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/kernel/vserver/vci_config.h linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/vci_config.h
+--- linux-2.6.29.4/kernel/vserver/vci_config.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/kernel/vserver/vci_config.h 2009-02-22 22:54:26.000000000 +0100
@@ -0,0 +1,81 @@
+
+/* interface version */
+ 0;
+}
+
-diff -NurpP --minimal linux-2.6.29.2/mm/filemap_xip.c linux-2.6.29.2-vs2.3.0.36.12/mm/filemap_xip.c
---- linux-2.6.29.2/mm/filemap_xip.c 2009-04-30 10:50:35.000000000 +0200
-+++ linux-2.6.29.2-vs2.3.0.36.12/mm/filemap_xip.c 2009-04-30 12:14:53.000000000 +0200
+diff -NurpP --minimal linux-2.6.29.4/mm/filemap_xip.c linux-2.6.29.4-vs2.3.0.36.14/mm/filemap_xip.c
+--- linux-2.6.29.4/mm/filemap_xip.c 2009-05-23 23:16:53.000000000 +0200
++++ linux-2.6.29.4-vs2.3.0.36.14/mm/filemap_xip.c 2009-04-30 12:14:53.000000000 +0200
@@ -17,6 +17,7 @@
#include <linux/sched.h>
#include <linux/seqlock.h>
#include <asm/tlbflush.h>
#include <asm/io.h>
-diff -NurpP --minimal linux-2.6.29.2/mm/fremap.c linux-2.6.29.2-vs2.3.0.36.12/mm/fremap.c
---- linux-2.6.29.2/mm/fremap.c 2009-03-24 14:22:45.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/mm/fremap.c 2009-03-24 14:48:36.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/mm/fremap.c linux-2.6.29.4-vs2.3.0.36.14/mm/fremap.c
+--- linux-2.6.29.4/mm/fremap.c 2009-03-24 14:22:45.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/mm/fremap.c 2009-03-24 14:48:36.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.29.2/mm/hugetlb.c linux-2.6.29.2-vs2.3.0.36.12/mm/hugetlb.c
---- linux-2.6.29.2/mm/hugetlb.c 2009-03-24 14:22:45.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/mm/hugetlb.c 2009-03-24 14:48:36.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/mm/hugetlb.c linux-2.6.29.4-vs2.3.0.36.14/mm/hugetlb.c
+--- linux-2.6.29.4/mm/hugetlb.c 2009-03-24 14:22:45.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/mm/hugetlb.c 2009-03-24 14:48:36.000000000 +0100
@@ -24,6 +24,7 @@
#include <asm/io.h>
#include "internal.h"
const unsigned long hugetlb_zero = 0, hugetlb_infinity = ~0UL;
-diff -NurpP --minimal linux-2.6.29.2/mm/memory.c linux-2.6.29.2-vs2.3.0.36.12/mm/memory.c
---- linux-2.6.29.2/mm/memory.c 2009-04-30 10:50:35.000000000 +0200
-+++ linux-2.6.29.2-vs2.3.0.36.12/mm/memory.c 2009-04-15 22:58:30.000000000 +0200
+diff -NurpP --minimal linux-2.6.29.4/mm/memory.c linux-2.6.29.4-vs2.3.0.36.14/mm/memory.c
+--- linux-2.6.29.4/mm/memory.c 2009-05-23 23:16:53.000000000 +0200
++++ linux-2.6.29.4-vs2.3.0.36.14/mm/memory.c 2009-05-23 23:19:11.000000000 +0200
@@ -55,6 +55,7 @@
#include <linux/kallsyms.h>
#include <linux/swapops.h>
again:
rss[1] = rss[0] = 0;
dst_pte = pte_alloc_map_lock(dst_mm, dst_pmd, addr, &dst_ptl);
-@@ -2435,6 +2439,11 @@ static int do_swap_page(struct mm_struct
+@@ -2481,6 +2485,11 @@ static int do_swap_page(struct mm_struct
count_vm_event(PGMAJFAULT);
}
mark_page_accessed(page);
lock_page(page);
-@@ -2526,6 +2535,8 @@ static int do_anonymous_page(struct mm_s
+@@ -2572,6 +2581,8 @@ static int do_anonymous_page(struct mm_s
/* Allocate our own private page. */
pte_unmap(page_table);
if (unlikely(anon_vma_prepare(vma)))
goto oom;
page = alloc_zeroed_user_highpage_movable(vma, address);
-@@ -2793,6 +2804,7 @@ static inline int handle_pte_fault(struc
+@@ -2855,6 +2866,7 @@ static inline int handle_pte_fault(struc
{
pte_t entry;
spinlock_t *ptl;
entry = *pte;
if (!pte_present(entry)) {
-@@ -2817,9 +2829,12 @@ static inline int handle_pte_fault(struc
+@@ -2879,9 +2891,12 @@ static inline int handle_pte_fault(struc
if (unlikely(!pte_same(*pte, entry)))
goto unlock;
if (write_access) {
entry = pte_mkdirty(entry);
}
entry = pte_mkyoung(entry);
-@@ -2837,7 +2852,10 @@ static inline int handle_pte_fault(struc
+@@ -2899,7 +2914,10 @@ static inline int handle_pte_fault(struc
}
unlock:
pte_unmap_unlock(pte, ptl);
}
/*
-diff -NurpP --minimal linux-2.6.29.2/mm/mlock.c linux-2.6.29.2-vs2.3.0.36.12/mm/mlock.c
---- linux-2.6.29.2/mm/mlock.c 2009-03-24 14:22:45.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/mm/mlock.c 2009-03-28 05:08:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/mm/mlock.c linux-2.6.29.4-vs2.3.0.36.14/mm/mlock.c
+--- linux-2.6.29.4/mm/mlock.c 2009-03-24 14:22:45.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/mm/mlock.c 2009-03-28 05:08:26.000000000 +0100
@@ -18,6 +18,7 @@
#include <linux/rmap.h>
#include <linux/mmzone.h>
up_write(¤t->mm->mmap_sem);
}
-diff -NurpP --minimal linux-2.6.29.2/mm/mmap.c linux-2.6.29.2-vs2.3.0.36.12/mm/mmap.c
---- linux-2.6.29.2/mm/mmap.c 2009-04-30 10:50:35.000000000 +0200
-+++ linux-2.6.29.2-vs2.3.0.36.12/mm/mmap.c 2009-04-30 12:14:53.000000000 +0200
-@@ -1219,7 +1219,8 @@ munmap_back:
+diff -NurpP --minimal linux-2.6.29.4/mm/mmap.c linux-2.6.29.4-vs2.3.0.36.14/mm/mmap.c
+--- linux-2.6.29.4/mm/mmap.c 2009-05-23 23:16:53.000000000 +0200
++++ linux-2.6.29.4-vs2.3.0.36.14/mm/mmap.c 2009-05-10 23:42:01.000000000 +0200
+@@ -1215,7 +1215,8 @@ munmap_back:
if (correct_wcount)
atomic_inc(&inode->i_writecount);
out:
vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
if (vm_flags & VM_LOCKED) {
/*
-@@ -1228,7 +1229,8 @@ out:
+@@ -1224,7 +1225,8 @@ out:
long nr_pages = mlock_vma_pages_range(vma, addr, addr + len);
if (nr_pages < 0)
return nr_pages; /* vma gone! */
} else if ((flags & MAP_POPULATE) && !(flags & MAP_NONBLOCK))
make_pages_present(addr, addr + len);
return addr;
-@@ -1575,9 +1577,9 @@ static int acct_stack_growth(struct vm_a
+@@ -1571,9 +1573,9 @@ static int acct_stack_growth(struct vm_a
return -ENOMEM;
/* Ok, everything looks good - let it rip */
vm_stat_account(mm, vma->vm_flags, vma->vm_file, grow);
return 0;
}
-@@ -1752,7 +1754,8 @@ static void remove_vma_list(struct mm_st
+@@ -1748,7 +1750,8 @@ static void remove_vma_list(struct mm_st
do {
long nrpages = vma_pages(vma);
vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
vma = remove_vma(vma);
} while (vma);
-@@ -1924,7 +1927,8 @@ int do_munmap(struct mm_struct *mm, unsi
+@@ -1920,7 +1923,8 @@ int do_munmap(struct mm_struct *mm, unsi
struct vm_area_struct *tmp = vma;
while (tmp && tmp->vm_start < end) {
if (tmp->vm_flags & VM_LOCKED) {
munlock_vma_pages_all(tmp);
}
tmp = tmp->vm_next;
-@@ -2013,6 +2017,8 @@ unsigned long do_brk(unsigned long addr,
+@@ -2009,6 +2013,8 @@ unsigned long do_brk(unsigned long addr,
lock_limit >>= PAGE_SHIFT;
if (locked > lock_limit && !capable(CAP_IPC_LOCK))
return -EAGAIN;
}
/*
-@@ -2039,7 +2045,8 @@ unsigned long do_brk(unsigned long addr,
+@@ -2035,7 +2041,8 @@ unsigned long do_brk(unsigned long addr,
if (mm->map_count > sysctl_max_map_count)
return -ENOMEM;
return -ENOMEM;
/* Can we just expand an old private anonymous mapping? */
-@@ -2065,10 +2072,13 @@ unsigned long do_brk(unsigned long addr,
+@@ -2061,10 +2068,13 @@ unsigned long do_brk(unsigned long addr,
vma->vm_page_prot = vm_get_page_prot(flags);
vma_link(mm, vma, prev, rb_link, rb_parent);
out:
}
return addr;
}
-@@ -2111,6 +2121,11 @@ void exit_mmap(struct mm_struct *mm)
+@@ -2107,6 +2117,11 @@ void exit_mmap(struct mm_struct *mm)
free_pgtables(tlb, vma, FIRST_USER_ADDRESS, 0);
tlb_finish_mmu(tlb, 0, end);
/*
* Walk the list again, actually closing and freeing it,
* with preemption enabled, without holding any MM locks.
-@@ -2150,7 +2165,8 @@ int insert_vm_struct(struct mm_struct *
+@@ -2146,7 +2161,8 @@ int insert_vm_struct(struct mm_struct *
if (__vma && __vma->vm_start < vma->vm_end)
return -ENOMEM;
if ((vma->vm_flags & VM_ACCOUNT) &&
return -ENOMEM;
vma_link(mm, vma, prev, rb_link, rb_parent);
return 0;
-@@ -2226,6 +2242,8 @@ int may_expand_vm(struct mm_struct *mm,
+@@ -2222,6 +2238,8 @@ int may_expand_vm(struct mm_struct *mm,
if (cur + npages > lim)
return 0;
return 1;
}
-@@ -2303,8 +2321,7 @@ int install_special_mapping(struct mm_st
+@@ -2299,8 +2317,7 @@ int install_special_mapping(struct mm_st
return -ENOMEM;
}
return 0;
}
-diff -NurpP --minimal linux-2.6.29.2/mm/mremap.c linux-2.6.29.2-vs2.3.0.36.12/mm/mremap.c
---- linux-2.6.29.2/mm/mremap.c 2009-03-24 14:22:45.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/mm/mremap.c 2009-03-24 14:48:36.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/mm/mremap.c linux-2.6.29.4-vs2.3.0.36.14/mm/mremap.c
+--- linux-2.6.29.4/mm/mremap.c 2009-03-24 14:22:45.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/mm/mremap.c 2009-03-24 14:48:36.000000000 +0100
@@ -19,6 +19,7 @@
#include <linux/security.h>
#include <linux/syscalls.h>
mlock_vma_pages_range(vma, addr + old_len,
addr + new_len);
}
-diff -NurpP --minimal linux-2.6.29.2/mm/nommu.c linux-2.6.29.2-vs2.3.0.36.12/mm/nommu.c
---- linux-2.6.29.2/mm/nommu.c 2009-03-24 14:22:45.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/mm/nommu.c 2009-03-24 18:25:55.000000000 +0100
-@@ -1348,7 +1348,7 @@ unsigned long do_mmap_pgoff(struct file
+diff -NurpP --minimal linux-2.6.29.4/mm/nommu.c linux-2.6.29.4-vs2.3.0.36.14/mm/nommu.c
+--- linux-2.6.29.4/mm/nommu.c 2009-05-23 23:16:53.000000000 +0200
++++ linux-2.6.29.4-vs2.3.0.36.14/mm/nommu.c 2009-05-10 23:42:01.000000000 +0200
+@@ -1352,7 +1352,7 @@ unsigned long do_mmap_pgoff(struct file
/* okay... we have a mapping; now we have to register it */
result = vma->vm_start;
share:
add_vma_to_mm(current->mm, vma);
-@@ -1614,7 +1614,7 @@ void exit_mmap(struct mm_struct *mm)
+@@ -1618,7 +1618,7 @@ void exit_mmap(struct mm_struct *mm)
kenter("");
while ((vma = mm->mmap)) {
mm->mmap = vma->vm_next;
-diff -NurpP --minimal linux-2.6.29.2/mm/oom_kill.c linux-2.6.29.2-vs2.3.0.36.12/mm/oom_kill.c
---- linux-2.6.29.2/mm/oom_kill.c 2009-03-24 14:22:45.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/mm/oom_kill.c 2009-03-24 14:48:36.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/mm/oom_kill.c linux-2.6.29.4-vs2.3.0.36.14/mm/oom_kill.c
+--- linux-2.6.29.4/mm/oom_kill.c 2009-03-24 14:22:45.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/mm/oom_kill.c 2009-03-24 14:48:36.000000000 +0100
@@ -27,6 +27,7 @@
#include <linux/notifier.h>
#include <linux/memcontrol.h>
/* Try to kill a child first */
list_for_each_entry(c, &p->children, sibling) {
-diff -NurpP --minimal linux-2.6.29.2/mm/page_alloc.c linux-2.6.29.2-vs2.3.0.36.12/mm/page_alloc.c
---- linux-2.6.29.2/mm/page_alloc.c 2009-03-24 14:22:45.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/mm/page_alloc.c 2009-03-24 14:48:36.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/mm/page_alloc.c linux-2.6.29.4-vs2.3.0.36.14/mm/page_alloc.c
+--- linux-2.6.29.4/mm/page_alloc.c 2009-03-24 14:22:45.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/mm/page_alloc.c 2009-03-24 14:48:36.000000000 +0100
@@ -46,6 +46,8 @@
#include <linux/page-isolation.h>
#include <linux/page_cgroup.h>
}
#endif
-diff -NurpP --minimal linux-2.6.29.2/mm/rmap.c linux-2.6.29.2-vs2.3.0.36.12/mm/rmap.c
---- linux-2.6.29.2/mm/rmap.c 2009-03-24 14:22:45.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/mm/rmap.c 2009-03-24 18:26:27.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/mm/rmap.c linux-2.6.29.4-vs2.3.0.36.14/mm/rmap.c
+--- linux-2.6.29.4/mm/rmap.c 2009-03-24 14:22:45.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/mm/rmap.c 2009-03-24 18:26:27.000000000 +0100
@@ -50,6 +50,7 @@
#include <linux/memcontrol.h>
#include <linux/mmu_notifier.h>
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-2.6.29.2/mm/shmem.c linux-2.6.29.2-vs2.3.0.36.12/mm/shmem.c
---- linux-2.6.29.2/mm/shmem.c 2009-03-24 14:22:45.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/mm/shmem.c 2009-03-24 14:48:36.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/mm/shmem.c linux-2.6.29.4-vs2.3.0.36.14/mm/shmem.c
+--- linux-2.6.29.4/mm/shmem.c 2009-03-24 14:22:45.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/mm/shmem.c 2009-03-24 14:48:36.000000000 +0100
@@ -1757,7 +1757,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.29.2/mm/slab.c linux-2.6.29.2-vs2.3.0.36.12/mm/slab.c
---- linux-2.6.29.2/mm/slab.c 2009-03-24 14:22:45.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/mm/slab.c 2009-03-24 14:48:36.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/mm/slab.c linux-2.6.29.4-vs2.3.0.36.14/mm/slab.c
+--- linux-2.6.29.4/mm/slab.c 2009-03-24 14:22:45.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/mm/slab.c 2009-03-24 14:48:36.000000000 +0100
@@ -509,6 +509,8 @@ struct kmem_cache {
#define STATS_INC_FREEMISS(x) do { } while (0)
#endif
/*
* Skip calling cache_free_alien() when the platform is not numa.
-diff -NurpP --minimal linux-2.6.29.2/mm/slab_vs.h linux-2.6.29.2-vs2.3.0.36.12/mm/slab_vs.h
---- linux-2.6.29.2/mm/slab_vs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/mm/slab_vs.h 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/mm/slab_vs.h linux-2.6.29.4-vs2.3.0.36.14/mm/slab_vs.h
+--- linux-2.6.29.4/mm/slab_vs.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/mm/slab_vs.h 2009-02-22 22:54:26.000000000 +0100
@@ -0,0 +1,27 @@
+
+#include <linux/vserver/context.h>
+ atomic_sub(cachep->buffer_size, ¤t->vx_info->cacct.slab[what]);
+}
+
-diff -NurpP --minimal linux-2.6.29.2/mm/swapfile.c linux-2.6.29.2-vs2.3.0.36.12/mm/swapfile.c
---- linux-2.6.29.2/mm/swapfile.c 2009-03-24 14:22:45.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/mm/swapfile.c 2009-03-24 18:27:15.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/mm/swapfile.c linux-2.6.29.4-vs2.3.0.36.14/mm/swapfile.c
+--- linux-2.6.29.4/mm/swapfile.c 2009-03-24 14:22:45.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/mm/swapfile.c 2009-03-24 18:27:15.000000000 +0100
@@ -34,6 +34,8 @@
#include <asm/tlbflush.h>
#include <linux/swapops.h>
}
/*
-diff -NurpP --minimal linux-2.6.29.2/net/core/dev.c linux-2.6.29.2-vs2.3.0.36.12/net/core/dev.c
---- linux-2.6.29.2/net/core/dev.c 2009-04-30 10:50:35.000000000 +0200
-+++ linux-2.6.29.2-vs2.3.0.36.12/net/core/dev.c 2009-04-15 22:58:30.000000000 +0200
+diff -NurpP --minimal linux-2.6.29.4/net/core/dev.c linux-2.6.29.4-vs2.3.0.36.14/net/core/dev.c
+--- linux-2.6.29.4/net/core/dev.c 2009-05-23 23:16:53.000000000 +0200
++++ linux-2.6.29.4-vs2.3.0.36.14/net/core/dev.c 2009-04-15 22:58:30.000000000 +0200
@@ -126,6 +126,7 @@
#include <linux/in.h>
#include <linux/jhash.h>
/* Actually switch the network namespace */
dev_net_set(dev, net);
-diff -NurpP --minimal linux-2.6.29.2/net/core/net-sysfs.c linux-2.6.29.2-vs2.3.0.36.12/net/core/net-sysfs.c
---- linux-2.6.29.2/net/core/net-sysfs.c 2009-03-24 14:22:46.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/net/core/net-sysfs.c 2009-03-24 18:30:01.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/net/core/net-sysfs.c linux-2.6.29.4-vs2.3.0.36.14/net/core/net-sysfs.c
+--- linux-2.6.29.4/net/core/net-sysfs.c 2009-03-24 14:22:46.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/net/core/net-sysfs.c 2009-03-24 18:30:01.000000000 +0100
@@ -512,6 +512,9 @@ int netdev_register_kobject(struct net_d
if (dev_net(net) != &init_net)
return 0;
return device_add(dev);
}
-diff -NurpP --minimal linux-2.6.29.2/net/core/rtnetlink.c linux-2.6.29.2-vs2.3.0.36.12/net/core/rtnetlink.c
---- linux-2.6.29.2/net/core/rtnetlink.c 2009-03-24 14:22:46.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/net/core/rtnetlink.c 2009-03-24 14:48:36.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/net/core/rtnetlink.c linux-2.6.29.4-vs2.3.0.36.14/net/core/rtnetlink.c
+--- linux-2.6.29.4/net/core/rtnetlink.c 2009-03-24 14:22:46.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/net/core/rtnetlink.c 2009-03-24 14:48:36.000000000 +0100
@@ -690,6 +690,8 @@ static int rtnl_dump_ifinfo(struct sk_bu
idx = 0;
skb = nlmsg_new(if_nlmsg_size(dev), GFP_KERNEL);
if (skb == NULL)
goto errout;
-diff -NurpP --minimal linux-2.6.29.2/net/core/sock.c linux-2.6.29.2-vs2.3.0.36.12/net/core/sock.c
---- linux-2.6.29.2/net/core/sock.c 2009-03-24 14:22:46.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/net/core/sock.c 2009-03-24 14:48:36.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/net/core/sock.c linux-2.6.29.4-vs2.3.0.36.14/net/core/sock.c
+--- linux-2.6.29.4/net/core/sock.c 2009-03-24 14:22:46.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/net/core/sock.c 2009-03-24 14:48:36.000000000 +0100
@@ -124,6 +124,10 @@
#include <linux/ipsec.h>
atomic_set(&sk->sk_refcnt, 1);
atomic_set(&sk->sk_drops, 0);
}
-diff -NurpP --minimal linux-2.6.29.2/net/ipv4/af_inet.c linux-2.6.29.2-vs2.3.0.36.12/net/ipv4/af_inet.c
---- linux-2.6.29.2/net/ipv4/af_inet.c 2009-03-24 14:22:46.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/net/ipv4/af_inet.c 2009-03-24 14:48:37.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/net/ipv4/af_inet.c linux-2.6.29.4-vs2.3.0.36.14/net/ipv4/af_inet.c
+--- linux-2.6.29.4/net/ipv4/af_inet.c 2009-03-24 14:22:46.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/net/ipv4/af_inet.c 2009-03-24 14:48:37.000000000 +0100
@@ -115,6 +115,7 @@
#ifdef CONFIG_IP_MROUTE
#include <linux/mroute.h>
sin->sin_port = inet->sport;
sin->sin_addr.s_addr = addr;
}
-diff -NurpP --minimal linux-2.6.29.2/net/ipv4/devinet.c linux-2.6.29.2-vs2.3.0.36.12/net/ipv4/devinet.c
---- linux-2.6.29.2/net/ipv4/devinet.c 2009-03-24 14:22:46.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/net/ipv4/devinet.c 2009-03-24 14:48:37.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/net/ipv4/devinet.c linux-2.6.29.4-vs2.3.0.36.14/net/ipv4/devinet.c
+--- linux-2.6.29.4/net/ipv4/devinet.c 2009-03-24 14:22:46.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/net/ipv4/devinet.c 2009-03-24 14:48:37.000000000 +0100
@@ -413,6 +413,7 @@ struct in_device *inetdev_by_index(struc
return in_dev;
}
if (ip_idx < s_ip_idx)
continue;
if (inet_fill_ifaddr(skb, ifa, NETLINK_CB(cb->skb).pid,
-diff -NurpP --minimal linux-2.6.29.2/net/ipv4/fib_hash.c linux-2.6.29.2-vs2.3.0.36.12/net/ipv4/fib_hash.c
---- linux-2.6.29.2/net/ipv4/fib_hash.c 2009-03-24 14:22:46.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/net/ipv4/fib_hash.c 2009-03-24 14:48:37.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/net/ipv4/fib_hash.c linux-2.6.29.4-vs2.3.0.36.14/net/ipv4/fib_hash.c
+--- linux-2.6.29.4/net/ipv4/fib_hash.c 2009-03-24 14:22:46.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/net/ipv4/fib_hash.c 2009-03-24 14:48:37.000000000 +0100
@@ -1022,7 +1022,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.29.2/net/ipv4/inet_connection_sock.c linux-2.6.29.2-vs2.3.0.36.12/net/ipv4/inet_connection_sock.c
---- linux-2.6.29.2/net/ipv4/inet_connection_sock.c 2009-03-24 14:22:46.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/net/ipv4/inet_connection_sock.c 2009-03-24 14:48:37.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/net/ipv4/inet_connection_sock.c linux-2.6.29.4-vs2.3.0.36.14/net/ipv4/inet_connection_sock.c
+--- linux-2.6.29.4/net/ipv4/inet_connection_sock.c 2009-03-24 14:22:46.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/net/ipv4/inet_connection_sock.c 2009-03-24 14:48:37.000000000 +0100
@@ -49,10 +49,40 @@ void inet_get_local_port_range(int *low,
}
EXPORT_SYMBOL(inet_get_local_port_range);
break;
}
}
-diff -NurpP --minimal linux-2.6.29.2/net/ipv4/inet_diag.c linux-2.6.29.2-vs2.3.0.36.12/net/ipv4/inet_diag.c
---- linux-2.6.29.2/net/ipv4/inet_diag.c 2009-03-24 14:22:46.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/net/ipv4/inet_diag.c 2009-03-24 14:48:37.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/net/ipv4/inet_diag.c linux-2.6.29.4-vs2.3.0.36.14/net/ipv4/inet_diag.c
+--- linux-2.6.29.4/net/ipv4/inet_diag.c 2009-03-24 14:22:46.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/net/ipv4/inet_diag.c 2009-03-24 14:48:37.000000000 +0100
@@ -32,6 +32,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.29.2/net/ipv4/inet_hashtables.c linux-2.6.29.2-vs2.3.0.36.12/net/ipv4/inet_hashtables.c
---- linux-2.6.29.2/net/ipv4/inet_hashtables.c 2009-03-24 14:22:46.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/net/ipv4/inet_hashtables.c 2009-04-17 15:35:48.000000000 +0200
+diff -NurpP --minimal linux-2.6.29.4/net/ipv4/inet_hashtables.c linux-2.6.29.4-vs2.3.0.36.14/net/ipv4/inet_hashtables.c
+--- linux-2.6.29.4/net/ipv4/inet_hashtables.c 2009-03-24 14:22:46.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/net/ipv4/inet_hashtables.c 2009-04-17 15:35:48.000000000 +0200
@@ -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.29.2/net/ipv4/netfilter/nf_nat_helper.c linux-2.6.29.2-vs2.3.0.36.12/net/ipv4/netfilter/nf_nat_helper.c
---- linux-2.6.29.2/net/ipv4/netfilter/nf_nat_helper.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/net/ipv4/netfilter/nf_nat_helper.c 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/net/ipv4/netfilter/nf_nat_helper.c linux-2.6.29.4-vs2.3.0.36.14/net/ipv4/netfilter/nf_nat_helper.c
+--- linux-2.6.29.4/net/ipv4/netfilter/nf_nat_helper.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/net/ipv4/netfilter/nf_nat_helper.c 2009-02-22 22:54:26.000000000 +0100
@@ -19,6 +19,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.29.2/net/ipv4/netfilter.c linux-2.6.29.2-vs2.3.0.36.12/net/ipv4/netfilter.c
---- linux-2.6.29.2/net/ipv4/netfilter.c 2009-03-24 14:22:46.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/net/ipv4/netfilter.c 2009-03-24 14:48:37.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/net/ipv4/netfilter.c linux-2.6.29.4-vs2.3.0.36.14/net/ipv4/netfilter.c
+--- linux-2.6.29.4/net/ipv4/netfilter.c 2009-03-24 14:22:46.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/net/ipv4/netfilter.c 2009-03-24 14:48:37.000000000 +0100
@@ -4,7 +4,7 @@
#include <linux/netfilter_ipv4.h>
#include <linux/ip.h>
#include <net/xfrm.h>
#include <net/ip.h>
#include <net/netfilter/nf_queue.h>
-diff -NurpP --minimal linux-2.6.29.2/net/ipv4/raw.c linux-2.6.29.2-vs2.3.0.36.12/net/ipv4/raw.c
---- linux-2.6.29.2/net/ipv4/raw.c 2009-03-24 14:22:46.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/net/ipv4/raw.c 2009-03-24 14:48:37.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/net/ipv4/raw.c linux-2.6.29.4-vs2.3.0.36.14/net/ipv4/raw.c
+--- linux-2.6.29.4/net/ipv4/raw.c 2009-03-24 14:22:46.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/net/ipv4/raw.c 2009-03-24 14:48:37.000000000 +0100
@@ -117,7 +117,7 @@ static struct sock *__raw_v4_lookup(stru
if (net_eq(sock_net(sk), net) && inet->num == num &&
atomic_read(&sp->sk_wmem_alloc),
atomic_read(&sp->sk_rmem_alloc),
0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
-diff -NurpP --minimal linux-2.6.29.2/net/ipv4/tcp.c linux-2.6.29.2-vs2.3.0.36.12/net/ipv4/tcp.c
---- linux-2.6.29.2/net/ipv4/tcp.c 2009-03-24 14:22:46.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/net/ipv4/tcp.c 2009-03-24 14:48:37.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/net/ipv4/tcp.c linux-2.6.29.4-vs2.3.0.36.14/net/ipv4/tcp.c
+--- linux-2.6.29.4/net/ipv4/tcp.c 2009-03-24 14:22:46.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/net/ipv4/tcp.c 2009-03-24 14:48:37.000000000 +0100
@@ -264,6 +264,7 @@
#include <linux/cache.h>
#include <linux/err.h>
#include <net/icmp.h>
#include <net/tcp.h>
-diff -NurpP --minimal linux-2.6.29.2/net/ipv4/tcp_ipv4.c linux-2.6.29.2-vs2.3.0.36.12/net/ipv4/tcp_ipv4.c
---- linux-2.6.29.2/net/ipv4/tcp_ipv4.c 2009-03-24 14:22:46.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/net/ipv4/tcp_ipv4.c 2009-03-24 19:51:34.000000000 +0100
-@@ -1894,6 +1894,12 @@ static void *listening_get_next(struct s
+diff -NurpP --minimal linux-2.6.29.4/net/ipv4/tcp_ipv4.c linux-2.6.29.4-vs2.3.0.36.14/net/ipv4/tcp_ipv4.c
+--- linux-2.6.29.4/net/ipv4/tcp_ipv4.c 2009-05-23 23:16:53.000000000 +0200
++++ linux-2.6.29.4-vs2.3.0.36.14/net/ipv4/tcp_ipv4.c 2009-05-23 23:19:11.000000000 +0200
+@@ -1895,6 +1895,12 @@ static void *listening_get_next(struct s
req = req->dl_next;
while (1) {
while (req) {
if (req->rsk_ops->family == st->family) {
cur = req;
goto out;
-@@ -1918,6 +1924,10 @@ get_req:
+@@ -1919,6 +1925,10 @@ get_req:
}
get_sk:
sk_nulls_for_each_from(sk, node) {
if (sk->sk_family == st->family && net_eq(sock_net(sk), net)) {
cur = sk;
goto out;
-@@ -1981,6 +1991,11 @@ static void *established_get_first(struc
+@@ -1982,6 +1992,11 @@ static void *established_get_first(struc
spin_lock_bh(lock);
sk_nulls_for_each(sk, node, &tcp_hashinfo.ehash[st->bucket].chain) {
if (sk->sk_family != st->family ||
!net_eq(sock_net(sk), net)) {
continue;
-@@ -1991,6 +2006,11 @@ static void *established_get_first(struc
+@@ -1992,6 +2007,11 @@ static void *established_get_first(struc
st->state = TCP_SEQ_STATE_TIME_WAIT;
inet_twsk_for_each(tw, node,
&tcp_hashinfo.ehash[st->bucket].twchain) {
if (tw->tw_family != st->family ||
!net_eq(twsk_net(tw), net)) {
continue;
-@@ -2019,7 +2039,9 @@ static void *established_get_next(struct
+@@ -2020,7 +2040,9 @@ static void *established_get_next(struct
tw = cur;
tw = tw_next(tw);
get_tw:
tw = tw_next(tw);
}
if (tw) {
-@@ -2042,6 +2064,11 @@ get_tw:
+@@ -2043,6 +2065,11 @@ get_tw:
sk = sk_nulls_next(sk);
sk_nulls_for_each_from(sk, node) {
if (sk->sk_family == st->family && net_eq(sock_net(sk), net))
goto found;
}
-@@ -2193,9 +2220,9 @@ static void get_openreq4(struct sock *sk
+@@ -2194,9 +2221,9 @@ static void get_openreq4(struct sock *sk
seq_printf(f, "%4d: %08X:%04X %08X:%04X"
" %02X %08X:%08X %02X:%08lX %08X %5d %8d %u %d %p%n",
i,
ntohs(ireq->rmt_port),
TCP_SYN_RECV,
0, 0, /* could print option size, but that is af dependent. */
-@@ -2238,7 +2265,10 @@ static void get_tcp4_sock(struct sock *s
+@@ -2239,7 +2266,10 @@ static void get_tcp4_sock(struct sock *s
seq_printf(f, "%4d: %08X:%04X %08X:%04X %02X %08X:%08X %02X:%08lX "
"%08X %5d %8d %lu %d %p %lu %lu %u %u %d%n",
tp->write_seq - tp->snd_una,
sk->sk_state == TCP_LISTEN ? sk->sk_ack_backlog :
(tp->rcv_nxt - tp->copied_seq),
-@@ -2274,7 +2304,10 @@ static void get_timewait4_sock(struct in
+@@ -2275,7 +2305,10 @@ static void get_timewait4_sock(struct in
seq_printf(f, "%4d: %08X:%04X %08X:%04X"
" %02X %08X:%08X %02X:%08lX %08X %5d %8d %d %d %p%n",
3, jiffies_to_clock_t(ttd), 0, 0, 0, 0,
atomic_read(&tw->tw_refcnt), tw, len);
}
-diff -NurpP --minimal linux-2.6.29.2/net/ipv4/tcp_minisocks.c linux-2.6.29.2-vs2.3.0.36.12/net/ipv4/tcp_minisocks.c
---- linux-2.6.29.2/net/ipv4/tcp_minisocks.c 2009-03-24 14:22:46.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/net/ipv4/tcp_minisocks.c 2009-03-24 14:48:37.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/net/ipv4/tcp_minisocks.c linux-2.6.29.4-vs2.3.0.36.14/net/ipv4/tcp_minisocks.c
+--- linux-2.6.29.4/net/ipv4/tcp_minisocks.c 2009-03-24 14:22:46.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/net/ipv4/tcp_minisocks.c 2009-03-24 14:48:37.000000000 +0100
@@ -26,6 +26,10 @@
#include <net/inet_common.h>
#include <net/xfrm.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.29.2/net/ipv4/udp.c linux-2.6.29.2-vs2.3.0.36.12/net/ipv4/udp.c
---- linux-2.6.29.2/net/ipv4/udp.c 2009-04-30 10:50:35.000000000 +0200
-+++ linux-2.6.29.2-vs2.3.0.36.12/net/ipv4/udp.c 2009-04-15 22:58:30.000000000 +0200
+diff -NurpP --minimal linux-2.6.29.4/net/ipv4/udp.c linux-2.6.29.4-vs2.3.0.36.14/net/ipv4/udp.c
+--- linux-2.6.29.4/net/ipv4/udp.c 2009-05-23 23:16:53.000000000 +0200
++++ linux-2.6.29.4-vs2.3.0.36.14/net/ipv4/udp.c 2009-04-15 22:58:30.000000000 +0200
@@ -222,14 +222,7 @@ fail:
return error;
}
atomic_read(&sp->sk_wmem_alloc),
atomic_read(&sp->sk_rmem_alloc),
0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
-diff -NurpP --minimal linux-2.6.29.2/net/ipv6/addrconf.c linux-2.6.29.2-vs2.3.0.36.12/net/ipv6/addrconf.c
---- linux-2.6.29.2/net/ipv6/addrconf.c 2009-03-24 14:22:46.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/net/ipv6/addrconf.c 2009-03-24 20:39:23.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/net/ipv6/addrconf.c linux-2.6.29.4-vs2.3.0.36.14/net/ipv6/addrconf.c
+--- linux-2.6.29.4/net/ipv6/addrconf.c 2009-03-24 14:22:46.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/net/ipv6/addrconf.c 2009-03-24 20:39:23.000000000 +0100
@@ -85,6 +85,8 @@
#include <linux/proc_fs.h>
if ((idev = in6_dev_get(dev)) == NULL)
goto cont;
err = inet6_fill_ifinfo(skb, idev, NETLINK_CB(cb->skb).pid,
-diff -NurpP --minimal linux-2.6.29.2/net/ipv6/af_inet6.c linux-2.6.29.2-vs2.3.0.36.12/net/ipv6/af_inet6.c
---- linux-2.6.29.2/net/ipv6/af_inet6.c 2009-03-24 14:22:46.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/net/ipv6/af_inet6.c 2009-03-24 14:48:37.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/net/ipv6/af_inet6.c linux-2.6.29.4-vs2.3.0.36.14/net/ipv6/af_inet6.c
+--- linux-2.6.29.4/net/ipv6/af_inet6.c 2009-03-24 14:22:46.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/net/ipv6/af_inet6.c 2009-03-24 14:48:37.000000000 +0100
@@ -41,6 +41,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.29.2/net/ipv6/fib6_rules.c linux-2.6.29.2-vs2.3.0.36.12/net/ipv6/fib6_rules.c
---- linux-2.6.29.2/net/ipv6/fib6_rules.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/net/ipv6/fib6_rules.c 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/net/ipv6/fib6_rules.c linux-2.6.29.4-vs2.3.0.36.14/net/ipv6/fib6_rules.c
+--- linux-2.6.29.4/net/ipv6/fib6_rules.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/net/ipv6/fib6_rules.c 2009-02-22 22:54:26.000000000 +0100
@@ -96,7 +96,7 @@ static int fib6_rule_action(struct fib_r
if (ipv6_dev_get_saddr(net,
ip6_dst_idev(&rt->u.dst)->dev,
goto again;
if (!ipv6_prefix_equal(&saddr, &r->src.addr,
r->src.plen))
-diff -NurpP --minimal linux-2.6.29.2/net/ipv6/inet6_hashtables.c linux-2.6.29.2-vs2.3.0.36.12/net/ipv6/inet6_hashtables.c
---- linux-2.6.29.2/net/ipv6/inet6_hashtables.c 2009-03-24 14:22:46.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/net/ipv6/inet6_hashtables.c 2009-03-24 20:50:24.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/net/ipv6/inet6_hashtables.c linux-2.6.29.4-vs2.3.0.36.14/net/ipv6/inet6_hashtables.c
+--- linux-2.6.29.4/net/ipv6/inet6_hashtables.c 2009-03-24 14:22:46.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/net/ipv6/inet6_hashtables.c 2009-03-24 20:50:24.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.29.2/net/ipv6/ip6_output.c linux-2.6.29.2-vs2.3.0.36.12/net/ipv6/ip6_output.c
---- linux-2.6.29.2/net/ipv6/ip6_output.c 2009-03-24 14:22:47.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/net/ipv6/ip6_output.c 2009-03-24 14:48:37.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/net/ipv6/ip6_output.c linux-2.6.29.4-vs2.3.0.36.14/net/ipv6/ip6_output.c
+--- linux-2.6.29.4/net/ipv6/ip6_output.c 2009-03-24 14:22:47.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/net/ipv6/ip6_output.c 2009-03-24 14:48:37.000000000 +0100
@@ -951,7 +951,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.29.2/net/ipv6/Kconfig linux-2.6.29.2-vs2.3.0.36.12/net/ipv6/Kconfig
---- linux-2.6.29.2/net/ipv6/Kconfig 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/net/ipv6/Kconfig 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/net/ipv6/Kconfig linux-2.6.29.4-vs2.3.0.36.14/net/ipv6/Kconfig
+--- linux-2.6.29.4/net/ipv6/Kconfig 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/net/ipv6/Kconfig 2009-02-22 22:54:26.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.29.2/net/ipv6/ndisc.c linux-2.6.29.2-vs2.3.0.36.12/net/ipv6/ndisc.c
---- linux-2.6.29.2/net/ipv6/ndisc.c 2009-03-24 14:22:47.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/net/ipv6/ndisc.c 2009-03-24 14:48:37.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/net/ipv6/ndisc.c linux-2.6.29.4-vs2.3.0.36.14/net/ipv6/ndisc.c
+--- linux-2.6.29.4/net/ipv6/ndisc.c 2009-03-24 14:22:47.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/net/ipv6/ndisc.c 2009-03-24 14:48:37.000000000 +0100
@@ -589,7 +589,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.29.2/net/ipv6/raw.c linux-2.6.29.2-vs2.3.0.36.12/net/ipv6/raw.c
---- linux-2.6.29.2/net/ipv6/raw.c 2009-03-24 14:22:47.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/net/ipv6/raw.c 2009-03-24 14:48:37.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/net/ipv6/raw.c linux-2.6.29.4-vs2.3.0.36.14/net/ipv6/raw.c
+--- linux-2.6.29.4/net/ipv6/raw.c 2009-03-24 14:22:47.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/net/ipv6/raw.c 2009-03-24 14:48:37.000000000 +0100
@@ -29,6 +29,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.29.2/net/ipv6/route.c linux-2.6.29.2-vs2.3.0.36.12/net/ipv6/route.c
---- linux-2.6.29.2/net/ipv6/route.c 2009-03-24 14:22:47.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/net/ipv6/route.c 2009-03-24 14:48:37.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/net/ipv6/route.c linux-2.6.29.4-vs2.3.0.36.14/net/ipv6/route.c
+--- linux-2.6.29.4/net/ipv6/route.c 2009-03-24 14:22:47.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/net/ipv6/route.c 2009-03-24 14:48:37.000000000 +0100
@@ -2254,7 +2254,8 @@ static int rt6_fill_node(struct net *net
struct inet6_dev *idev = ip6_dst_idev(&rt->u.dst);
struct in6_addr saddr_buf;
NLA_PUT(skb, RTA_PREFSRC, 16, &saddr_buf);
}
-diff -NurpP --minimal linux-2.6.29.2/net/ipv6/tcp_ipv6.c linux-2.6.29.2-vs2.3.0.36.12/net/ipv6/tcp_ipv6.c
---- linux-2.6.29.2/net/ipv6/tcp_ipv6.c 2009-03-24 14:22:47.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/net/ipv6/tcp_ipv6.c 2009-03-24 14:48:37.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/net/ipv6/tcp_ipv6.c linux-2.6.29.4-vs2.3.0.36.14/net/ipv6/tcp_ipv6.c
+--- linux-2.6.29.4/net/ipv6/tcp_ipv6.c 2009-03-24 14:22:47.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/net/ipv6/tcp_ipv6.c 2009-03-24 14:48:37.000000000 +0100
@@ -68,6 +68,7 @@
#include <linux/crypto.h>
addr_type = ipv6_addr_type(&usin->sin6_addr);
-diff -NurpP --minimal linux-2.6.29.2/net/ipv6/udp.c linux-2.6.29.2-vs2.3.0.36.12/net/ipv6/udp.c
---- linux-2.6.29.2/net/ipv6/udp.c 2009-03-24 14:22:47.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/net/ipv6/udp.c 2009-03-24 20:56:49.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/net/ipv6/udp.c linux-2.6.29.4-vs2.3.0.36.14/net/ipv6/udp.c
+--- linux-2.6.29.4/net/ipv6/udp.c 2009-03-24 14:22:47.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/net/ipv6/udp.c 2009-03-24 20:56:49.000000000 +0100
@@ -47,6 +47,7 @@
#include <linux/proc_fs.h>
}
if (!ipv6_addr_any(&np->daddr)) {
if (!ipv6_addr_equal(&np->daddr, saddr))
-diff -NurpP --minimal linux-2.6.29.2/net/ipv6/xfrm6_policy.c linux-2.6.29.2-vs2.3.0.36.12/net/ipv6/xfrm6_policy.c
---- linux-2.6.29.2/net/ipv6/xfrm6_policy.c 2009-03-24 14:22:47.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/net/ipv6/xfrm6_policy.c 2009-03-24 14:48:37.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/net/ipv6/xfrm6_policy.c linux-2.6.29.4-vs2.3.0.36.14/net/ipv6/xfrm6_policy.c
+--- linux-2.6.29.4/net/ipv6/xfrm6_policy.c 2009-03-24 14:22:47.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/net/ipv6/xfrm6_policy.c 2009-03-24 14:48:37.000000000 +0100
@@ -63,7 +63,7 @@ static int xfrm6_get_saddr(struct net *n
dev = ip6_dst_idev(dst)->dev;
ipv6_dev_get_saddr(dev_net(dev), dev,
dst_release(dst);
return 0;
}
-diff -NurpP --minimal linux-2.6.29.2/net/netlink/af_netlink.c linux-2.6.29.2-vs2.3.0.36.12/net/netlink/af_netlink.c
---- linux-2.6.29.2/net/netlink/af_netlink.c 2009-03-24 14:22:47.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/net/netlink/af_netlink.c 2009-03-24 14:48:37.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/net/netlink/af_netlink.c linux-2.6.29.4-vs2.3.0.36.14/net/netlink/af_netlink.c
+--- linux-2.6.29.4/net/netlink/af_netlink.c 2009-03-24 14:22:47.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/net/netlink/af_netlink.c 2009-03-24 14:48:37.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.29.2/net/sctp/ipv6.c linux-2.6.29.2-vs2.3.0.36.12/net/sctp/ipv6.c
---- linux-2.6.29.2/net/sctp/ipv6.c 2009-03-24 14:22:48.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/net/sctp/ipv6.c 2009-03-24 20:58:14.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/net/sctp/ipv6.c linux-2.6.29.4-vs2.3.0.36.14/net/sctp/ipv6.c
+--- linux-2.6.29.4/net/sctp/ipv6.c 2009-03-24 14:22:48.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/net/sctp/ipv6.c 2009-03-24 20:58:14.000000000 +0100
@@ -317,7 +317,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.29.2/net/socket.c linux-2.6.29.2-vs2.3.0.36.12/net/socket.c
---- linux-2.6.29.2/net/socket.c 2009-03-24 14:22:48.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/net/socket.c 2009-03-24 14:48:37.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/net/socket.c linux-2.6.29.4-vs2.3.0.36.14/net/socket.c
+--- linux-2.6.29.4/net/socket.c 2009-03-24 14:22:48.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/net/socket.c 2009-03-24 14:48:37.000000000 +0100
@@ -95,6 +95,10 @@
#include <net/sock.h>
err = sock1->ops->socketpair(sock1, sock2);
if (err < 0)
-diff -NurpP --minimal linux-2.6.29.2/net/sunrpc/auth.c linux-2.6.29.2-vs2.3.0.36.12/net/sunrpc/auth.c
---- linux-2.6.29.2/net/sunrpc/auth.c 2009-03-24 14:22:48.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/net/sunrpc/auth.c 2009-03-24 21:00:49.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/net/sunrpc/auth.c linux-2.6.29.4-vs2.3.0.36.14/net/sunrpc/auth.c
+--- linux-2.6.29.4/net/sunrpc/auth.c 2009-03-24 14:22:48.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/net/sunrpc/auth.c 2009-03-24 21:00:49.000000000 +0100
@@ -14,6 +14,7 @@
#include <linux/hash.h>
#include <linux/sunrpc/clnt.h>
};
struct rpc_cred *ret;
-diff -NurpP --minimal linux-2.6.29.2/net/sunrpc/auth_unix.c linux-2.6.29.2-vs2.3.0.36.12/net/sunrpc/auth_unix.c
---- linux-2.6.29.2/net/sunrpc/auth_unix.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/net/sunrpc/auth_unix.c 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/net/sunrpc/auth_unix.c linux-2.6.29.4-vs2.3.0.36.14/net/sunrpc/auth_unix.c
+--- linux-2.6.29.4/net/sunrpc/auth_unix.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/net/sunrpc/auth_unix.c 2009-02-22 22:54:26.000000000 +0100
@@ -11,12 +11,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.29.2/net/sunrpc/clnt.c linux-2.6.29.2-vs2.3.0.36.12/net/sunrpc/clnt.c
---- linux-2.6.29.2/net/sunrpc/clnt.c 2009-03-24 14:22:48.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/net/sunrpc/clnt.c 2009-03-24 14:48:37.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/net/sunrpc/clnt.c linux-2.6.29.4-vs2.3.0.36.14/net/sunrpc/clnt.c
+--- linux-2.6.29.4/net/sunrpc/clnt.c 2009-03-24 14:22:48.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/net/sunrpc/clnt.c 2009-03-24 14:48:37.000000000 +0100
@@ -32,6 +32,7 @@
#include <linux/utsname.h>
#include <linux/workqueue.h>
return clnt;
}
EXPORT_SYMBOL_GPL(rpc_create);
-diff -NurpP --minimal linux-2.6.29.2/net/unix/af_unix.c linux-2.6.29.2-vs2.3.0.36.12/net/unix/af_unix.c
---- linux-2.6.29.2/net/unix/af_unix.c 2009-03-24 14:22:48.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/net/unix/af_unix.c 2009-03-24 14:48:37.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/net/unix/af_unix.c linux-2.6.29.4-vs2.3.0.36.14/net/unix/af_unix.c
+--- linux-2.6.29.4/net/unix/af_unix.c 2009-03-24 14:22:48.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/net/unix/af_unix.c 2009-03-24 14:48:37.000000000 +0100
@@ -114,6 +114,8 @@
#include <linux/mount.h>
#include <net/checksum.h>
sk = next_unix_socket(&iter->i, sk);
return sk;
}
-diff -NurpP --minimal linux-2.6.29.2/net/x25/af_x25.c linux-2.6.29.2-vs2.3.0.36.12/net/x25/af_x25.c
---- linux-2.6.29.2/net/x25/af_x25.c 2009-04-30 10:50:35.000000000 +0200
-+++ linux-2.6.29.2-vs2.3.0.36.12/net/x25/af_x25.c 2009-04-30 12:14:53.000000000 +0200
+diff -NurpP --minimal linux-2.6.29.4/net/x25/af_x25.c linux-2.6.29.4-vs2.3.0.36.14/net/x25/af_x25.c
+--- linux-2.6.29.4/net/x25/af_x25.c 2009-05-23 23:16:53.000000000 +0200
++++ linux-2.6.29.4-vs2.3.0.36.14/net/x25/af_x25.c 2009-04-30 12:14:53.000000000 +0200
@@ -506,7 +506,10 @@ static int x25_create(struct net *net, s
x25 = x25_sk(sk);
x25_init_timers(sk);
-diff -NurpP --minimal linux-2.6.29.2/scripts/checksyscalls.sh linux-2.6.29.2-vs2.3.0.36.12/scripts/checksyscalls.sh
---- linux-2.6.29.2/scripts/checksyscalls.sh 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/scripts/checksyscalls.sh 2009-02-22 22:54:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/scripts/checksyscalls.sh linux-2.6.29.4-vs2.3.0.36.14/scripts/checksyscalls.sh
+--- linux-2.6.29.4/scripts/checksyscalls.sh 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.29.4-vs2.3.0.36.14/scripts/checksyscalls.sh 2009-02-22 22:54:26.000000000 +0100
@@ -108,7 +108,6 @@ cat << EOF
#define __IGNORE_afs_syscall
#define __IGNORE_getpmsg
EOF
}
-diff -NurpP --minimal linux-2.6.29.2/security/commoncap.c linux-2.6.29.2-vs2.3.0.36.12/security/commoncap.c
---- linux-2.6.29.2/security/commoncap.c 2009-04-30 10:50:35.000000000 +0200
-+++ linux-2.6.29.2-vs2.3.0.36.12/security/commoncap.c 2009-04-30 12:14:53.000000000 +0200
+diff -NurpP --minimal linux-2.6.29.4/security/commoncap.c linux-2.6.29.4-vs2.3.0.36.14/security/commoncap.c
+--- linux-2.6.29.4/security/commoncap.c 2009-05-23 23:16:53.000000000 +0200
++++ linux-2.6.29.4-vs2.3.0.36.14/security/commoncap.c 2009-04-30 12:14:53.000000000 +0200
@@ -27,10 +27,11 @@
#include <linux/sched.h>
#include <linux/prctl.h>
return __vm_enough_memory(mm, pages, cap_sys_admin);
}
+
-diff -NurpP --minimal linux-2.6.29.2/security/selinux/hooks.c linux-2.6.29.2-vs2.3.0.36.12/security/selinux/hooks.c
---- linux-2.6.29.2/security/selinux/hooks.c 2009-03-24 14:23:21.000000000 +0100
-+++ linux-2.6.29.2-vs2.3.0.36.12/security/selinux/hooks.c 2009-03-24 14:48:37.000000000 +0100
+diff -NurpP --minimal linux-2.6.29.4/security/selinux/hooks.c linux-2.6.29.4-vs2.3.0.36.14/security/selinux/hooks.c
+--- linux-2.6.29.4/security/selinux/hooks.c 2009-05-23 23:16:53.000000000 +0200
++++ linux-2.6.29.4-vs2.3.0.36.14/security/selinux/hooks.c 2009-05-23 23:19:11.000000000 +0200
@@ -64,7 +64,6 @@
#include <linux/dccp.h>
#include <linux/quota.h>
#include <linux/parser.h>
#include <linux/nfs_mount.h>
#include <net/ipv6.h>
---- linux-2.6.29/fs/fs_struct.c~ 2009-05-19 17:03:43.300249930 +0200
-+++ linux-2.6.29/fs/fs_struct.c 2009-05-19 17:20:58.300250042 +0200
-@@ -76,6 +76,7 @@
- {
- path_put(&fs->root);
- path_put(&fs->pwd);
-+ atomic_dec(&vs_global_fs);
- kmem_cache_free(fs_cachep, fs);
- }
-
-@@ -111,6 +112,7 @@
- fs->pwd = old->pwd;
- path_get(&old->pwd);
- read_unlock(&old->lock);
-+ atomic_inc(&vs_global_fs);
- }
- return fs;
- }
projects / packages / kernel.git / commitdiff