From 265d6dccc90d87ff3fbb1e485eb0d2aaebf30ba9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Tue, 16 Aug 2011 08:12:23 +0000 Subject: [PATCH] - http://vserver.13thfloor.at/Experimental/patch-3.0.1-vs2.3.1-pre9.diff Changed files: kernel-vserver-2.3.patch -> 1.76 --- kernel-vserver-2.3.patch | 2644 +++++++++++++++++++------------------- 1 file changed, 1354 insertions(+), 1290 deletions(-) diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch index 363e1182..815f18e2 100644 --- a/kernel-vserver-2.3.patch +++ b/kernel-vserver-2.3.patch @@ -1,6 +1,6 @@ -diff -NurpP --minimal linux-3.0/.config.inet linux-3.0-vs2.3.1-pre8/.config.inet ---- linux-3.0/.config.inet 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/.config.inet 2011-06-13 14:55:18.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/.config.inet linux-3.0.1-vs2.3.1-pre9/.config.inet +--- linux-3.0.1/.config.inet 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/.config.inet 2011-06-13 14:55:18.000000000 +0200 @@ -0,0 +1,1620 @@ +# +# Automatically generated make config: don't edit @@ -1622,9 +1622,9 @@ diff -NurpP --minimal linux-3.0/.config.inet linux-3.0-vs2.3.1-pre8/.config.inet +CONFIG_CPU_RMAP=y +CONFIG_NLATTR=y +# CONFIG_AVERAGE is not set -diff -NurpP --minimal linux-3.0/Documentation/vserver/debug.txt linux-3.0-vs2.3.1-pre8/Documentation/vserver/debug.txt ---- linux-3.0/Documentation/vserver/debug.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/Documentation/vserver/debug.txt 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/Documentation/vserver/debug.txt linux-3.0.1-vs2.3.1-pre9/Documentation/vserver/debug.txt +--- linux-3.0.1/Documentation/vserver/debug.txt 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/Documentation/vserver/debug.txt 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,154 @@ + +debug_cvirt: @@ -1780,9 +1780,9 @@ diff -NurpP --minimal linux-3.0/Documentation/vserver/debug.txt linux-3.0-vs2.3. + m 2^m "vx_acc_page[%5d,%s,%2d]: %5d%s" + "vx_acc_pages[%5d,%s,%2d]: %5d += %5d" + "vx_pages_avail[%5d,%s,%2d]: %5ld > %5d + %5d" -diff -NurpP --minimal linux-3.0/arch/alpha/Kconfig linux-3.0-vs2.3.1-pre8/arch/alpha/Kconfig ---- linux-3.0/arch/alpha/Kconfig 2011-07-22 11:17:32.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/arch/alpha/Kconfig 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/alpha/Kconfig linux-3.0.1-vs2.3.1-pre9/arch/alpha/Kconfig +--- linux-3.0.1/arch/alpha/Kconfig 2011-07-22 11:17:32.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/arch/alpha/Kconfig 2011-06-10 22:11:24.000000000 +0200 @@ -668,6 +668,8 @@ config DUMMY_CONSOLE depends on VGA_HOSE default y @@ -1792,9 +1792,9 @@ diff -NurpP --minimal linux-3.0/arch/alpha/Kconfig linux-3.0-vs2.3.1-pre8/arch/a source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.0/arch/alpha/kernel/entry.S linux-3.0-vs2.3.1-pre8/arch/alpha/kernel/entry.S ---- linux-3.0/arch/alpha/kernel/entry.S 2010-10-21 13:06:45.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/arch/alpha/kernel/entry.S 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/alpha/kernel/entry.S linux-3.0.1-vs2.3.1-pre9/arch/alpha/kernel/entry.S +--- linux-3.0.1/arch/alpha/kernel/entry.S 2010-10-21 13:06:45.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/arch/alpha/kernel/entry.S 2011-06-10 22:11:24.000000000 +0200 @@ -860,24 +860,15 @@ sys_getxgid: .globl sys_getxpid .ent sys_getxpid @@ -1827,9 +1827,9 @@ diff -NurpP --minimal linux-3.0/arch/alpha/kernel/entry.S linux-3.0-vs2.3.1-pre8 ret .end sys_getxpid -diff -NurpP --minimal linux-3.0/arch/alpha/kernel/ptrace.c linux-3.0-vs2.3.1-pre8/arch/alpha/kernel/ptrace.c ---- linux-3.0/arch/alpha/kernel/ptrace.c 2011-01-05 21:48:40.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/arch/alpha/kernel/ptrace.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/alpha/kernel/ptrace.c linux-3.0.1-vs2.3.1-pre9/arch/alpha/kernel/ptrace.c +--- linux-3.0.1/arch/alpha/kernel/ptrace.c 2011-01-05 21:48:40.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/arch/alpha/kernel/ptrace.c 2011-06-10 22:11:24.000000000 +0200 @@ -13,6 +13,7 @@ #include #include @@ -1838,9 +1838,9 @@ diff -NurpP --minimal linux-3.0/arch/alpha/kernel/ptrace.c linux-3.0-vs2.3.1-pre #include #include -diff -NurpP --minimal linux-3.0/arch/alpha/kernel/systbls.S linux-3.0-vs2.3.1-pre8/arch/alpha/kernel/systbls.S ---- linux-3.0/arch/alpha/kernel/systbls.S 2011-07-22 11:17:32.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/arch/alpha/kernel/systbls.S 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/alpha/kernel/systbls.S linux-3.0.1-vs2.3.1-pre9/arch/alpha/kernel/systbls.S +--- linux-3.0.1/arch/alpha/kernel/systbls.S 2011-07-22 11:17:32.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/arch/alpha/kernel/systbls.S 2011-06-10 22:11:24.000000000 +0200 @@ -446,7 +446,7 @@ sys_call_table: .quad sys_stat64 /* 425 */ .quad sys_lstat64 @@ -1850,9 +1850,9 @@ diff -NurpP --minimal linux-3.0/arch/alpha/kernel/systbls.S linux-3.0-vs2.3.1-pr .quad sys_ni_syscall /* sys_mbind */ .quad sys_ni_syscall /* sys_get_mempolicy */ .quad sys_ni_syscall /* sys_set_mempolicy */ -diff -NurpP --minimal linux-3.0/arch/alpha/kernel/traps.c linux-3.0-vs2.3.1-pre8/arch/alpha/kernel/traps.c ---- linux-3.0/arch/alpha/kernel/traps.c 2010-10-21 13:06:46.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/arch/alpha/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/alpha/kernel/traps.c linux-3.0.1-vs2.3.1-pre9/arch/alpha/kernel/traps.c +--- linux-3.0.1/arch/alpha/kernel/traps.c 2010-10-21 13:06:46.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/arch/alpha/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200 @@ -183,7 +183,8 @@ die_if_kernel(char * str, struct pt_regs #ifdef CONFIG_SMP printk("CPU %d ", hard_smp_processor_id()); @@ -1863,9 +1863,9 @@ diff -NurpP --minimal linux-3.0/arch/alpha/kernel/traps.c linux-3.0-vs2.3.1-pre8 dik_show_regs(regs, r9_15); add_taint(TAINT_DIE); dik_show_trace((unsigned long *)(regs+1)); -diff -NurpP --minimal linux-3.0/arch/arm/Kconfig linux-3.0-vs2.3.1-pre8/arch/arm/Kconfig ---- linux-3.0/arch/arm/Kconfig 2011-07-22 11:17:32.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/arch/arm/Kconfig 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/arm/Kconfig linux-3.0.1-vs2.3.1-pre9/arch/arm/Kconfig +--- linux-3.0.1/arch/arm/Kconfig 2011-07-22 11:17:32.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/arch/arm/Kconfig 2011-06-10 22:11:24.000000000 +0200 @@ -2035,6 +2035,8 @@ source "fs/Kconfig" source "arch/arm/Kconfig.debug" @@ -1875,9 +1875,9 @@ diff -NurpP --minimal linux-3.0/arch/arm/Kconfig linux-3.0-vs2.3.1-pre8/arch/arm source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.0/arch/arm/kernel/calls.S linux-3.0-vs2.3.1-pre8/arch/arm/kernel/calls.S ---- linux-3.0/arch/arm/kernel/calls.S 2011-07-22 11:17:32.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/arch/arm/kernel/calls.S 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/arm/kernel/calls.S linux-3.0.1-vs2.3.1-pre9/arch/arm/kernel/calls.S +--- linux-3.0.1/arch/arm/kernel/calls.S 2011-07-22 11:17:32.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/arch/arm/kernel/calls.S 2011-06-10 22:11:24.000000000 +0200 @@ -322,7 +322,7 @@ /* 310 */ CALL(sys_request_key) CALL(sys_keyctl) @@ -1887,9 +1887,9 @@ diff -NurpP --minimal linux-3.0/arch/arm/kernel/calls.S linux-3.0-vs2.3.1-pre8/a CALL(sys_ioprio_set) /* 315 */ CALL(sys_ioprio_get) CALL(sys_inotify_init) -diff -NurpP --minimal linux-3.0/arch/arm/kernel/process.c linux-3.0-vs2.3.1-pre8/arch/arm/kernel/process.c ---- linux-3.0/arch/arm/kernel/process.c 2011-05-22 16:16:47.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/arch/arm/kernel/process.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/arm/kernel/process.c linux-3.0.1-vs2.3.1-pre9/arch/arm/kernel/process.c +--- linux-3.0.1/arch/arm/kernel/process.c 2011-05-22 16:16:47.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/arch/arm/kernel/process.c 2011-06-10 22:11:24.000000000 +0200 @@ -315,7 +315,8 @@ void __show_regs(struct pt_regs *regs) void show_regs(struct pt_regs * regs) { @@ -1900,9 +1900,9 @@ diff -NurpP --minimal linux-3.0/arch/arm/kernel/process.c linux-3.0-vs2.3.1-pre8 __show_regs(regs); __backtrace(); } -diff -NurpP --minimal linux-3.0/arch/arm/kernel/traps.c linux-3.0-vs2.3.1-pre8/arch/arm/kernel/traps.c ---- linux-3.0/arch/arm/kernel/traps.c 2011-07-22 11:17:32.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/arch/arm/kernel/traps.c 2011-06-22 12:39:12.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/arm/kernel/traps.c linux-3.0.1-vs2.3.1-pre9/arch/arm/kernel/traps.c +--- linux-3.0.1/arch/arm/kernel/traps.c 2011-07-22 11:17:32.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/arch/arm/kernel/traps.c 2011-06-22 12:39:12.000000000 +0200 @@ -242,8 +242,8 @@ static int __die(const char *str, int er print_modules(); @@ -1914,9 +1914,9 @@ diff -NurpP --minimal linux-3.0/arch/arm/kernel/traps.c linux-3.0-vs2.3.1-pre8/a if (!user_mode(regs) || in_interrupt()) { dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp, -diff -NurpP --minimal linux-3.0/arch/cris/Kconfig linux-3.0-vs2.3.1-pre8/arch/cris/Kconfig ---- linux-3.0/arch/cris/Kconfig 2011-07-22 11:17:35.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/arch/cris/Kconfig 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/cris/Kconfig linux-3.0.1-vs2.3.1-pre9/arch/cris/Kconfig +--- linux-3.0.1/arch/cris/Kconfig 2011-07-22 11:17:35.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/arch/cris/Kconfig 2011-06-10 22:11:24.000000000 +0200 @@ -678,6 +678,8 @@ source "drivers/staging/Kconfig" source "arch/cris/Kconfig.debug" @@ -1926,9 +1926,9 @@ diff -NurpP --minimal linux-3.0/arch/cris/Kconfig linux-3.0-vs2.3.1-pre8/arch/cr source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.0/arch/frv/kernel/kernel_thread.S linux-3.0-vs2.3.1-pre8/arch/frv/kernel/kernel_thread.S ---- linux-3.0/arch/frv/kernel/kernel_thread.S 2008-12-25 00:26:37.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/arch/frv/kernel/kernel_thread.S 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/frv/kernel/kernel_thread.S linux-3.0.1-vs2.3.1-pre9/arch/frv/kernel/kernel_thread.S +--- linux-3.0.1/arch/frv/kernel/kernel_thread.S 2008-12-25 00:26:37.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/arch/frv/kernel/kernel_thread.S 2011-06-10 22:11:24.000000000 +0200 @@ -37,7 +37,7 @@ kernel_thread: # start by forking the current process, but with shared VM @@ -1938,9 +1938,9 @@ diff -NurpP --minimal linux-3.0/arch/frv/kernel/kernel_thread.S linux-3.0-vs2.3. sethi.p #0xe4e4,gr9 ; second syscall arg [newsp] setlo #0xe4e4,gr9 setlos.p #0,gr10 ; third syscall arg [parent_tidptr] -diff -NurpP --minimal linux-3.0/arch/h8300/Kconfig linux-3.0-vs2.3.1-pre8/arch/h8300/Kconfig ---- linux-3.0/arch/h8300/Kconfig 2011-07-22 11:17:35.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/arch/h8300/Kconfig 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/h8300/Kconfig linux-3.0.1-vs2.3.1-pre9/arch/h8300/Kconfig +--- linux-3.0.1/arch/h8300/Kconfig 2011-07-22 11:17:35.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/arch/h8300/Kconfig 2011-06-10 22:11:24.000000000 +0200 @@ -213,6 +213,8 @@ source "fs/Kconfig" source "arch/h8300/Kconfig.debug" @@ -1950,9 +1950,9 @@ diff -NurpP --minimal linux-3.0/arch/h8300/Kconfig linux-3.0-vs2.3.1-pre8/arch/h source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.0/arch/ia64/Kconfig linux-3.0-vs2.3.1-pre8/arch/ia64/Kconfig ---- linux-3.0/arch/ia64/Kconfig 2011-07-22 11:17:35.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/arch/ia64/Kconfig 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/ia64/Kconfig linux-3.0.1-vs2.3.1-pre9/arch/ia64/Kconfig +--- linux-3.0.1/arch/ia64/Kconfig 2011-07-22 11:17:35.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/arch/ia64/Kconfig 2011-06-10 22:11:24.000000000 +0200 @@ -671,6 +671,8 @@ source "fs/Kconfig" source "arch/ia64/Kconfig.debug" @@ -1962,9 +1962,9 @@ diff -NurpP --minimal linux-3.0/arch/ia64/Kconfig linux-3.0-vs2.3.1-pre8/arch/ia source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.0/arch/ia64/include/asm/tlb.h linux-3.0-vs2.3.1-pre8/arch/ia64/include/asm/tlb.h ---- linux-3.0/arch/ia64/include/asm/tlb.h 2011-07-22 11:17:35.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/arch/ia64/include/asm/tlb.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/ia64/include/asm/tlb.h linux-3.0.1-vs2.3.1-pre9/arch/ia64/include/asm/tlb.h +--- linux-3.0.1/arch/ia64/include/asm/tlb.h 2011-07-22 11:17:35.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/arch/ia64/include/asm/tlb.h 2011-06-10 22:11:24.000000000 +0200 @@ -40,6 +40,7 @@ #include #include @@ -1973,9 +1973,9 @@ diff -NurpP --minimal linux-3.0/arch/ia64/include/asm/tlb.h linux-3.0-vs2.3.1-pr #include #include -diff -NurpP --minimal linux-3.0/arch/ia64/kernel/entry.S linux-3.0-vs2.3.1-pre8/arch/ia64/kernel/entry.S ---- linux-3.0/arch/ia64/kernel/entry.S 2011-07-22 11:17:35.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/arch/ia64/kernel/entry.S 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/ia64/kernel/entry.S linux-3.0.1-vs2.3.1-pre9/arch/ia64/kernel/entry.S +--- linux-3.0.1/arch/ia64/kernel/entry.S 2011-07-22 11:17:35.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/arch/ia64/kernel/entry.S 2011-06-10 22:11:24.000000000 +0200 @@ -1714,7 +1714,7 @@ sys_call_table: data8 sys_mq_notify data8 sys_mq_getsetattr @@ -1985,9 +1985,9 @@ diff -NurpP --minimal linux-3.0/arch/ia64/kernel/entry.S linux-3.0-vs2.3.1-pre8/ data8 sys_waitid // 1270 data8 sys_add_key data8 sys_request_key -diff -NurpP --minimal linux-3.0/arch/ia64/kernel/perfmon.c linux-3.0-vs2.3.1-pre8/arch/ia64/kernel/perfmon.c ---- linux-3.0/arch/ia64/kernel/perfmon.c 2011-03-15 18:06:39.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/arch/ia64/kernel/perfmon.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/ia64/kernel/perfmon.c linux-3.0.1-vs2.3.1-pre9/arch/ia64/kernel/perfmon.c +--- linux-3.0.1/arch/ia64/kernel/perfmon.c 2011-03-15 18:06:39.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/arch/ia64/kernel/perfmon.c 2011-06-10 22:11:24.000000000 +0200 @@ -42,6 +42,7 @@ #include #include @@ -1996,9 +1996,9 @@ diff -NurpP --minimal linux-3.0/arch/ia64/kernel/perfmon.c linux-3.0-vs2.3.1-pre #include #include -diff -NurpP --minimal linux-3.0/arch/ia64/kernel/process.c linux-3.0-vs2.3.1-pre8/arch/ia64/kernel/process.c ---- linux-3.0/arch/ia64/kernel/process.c 2011-03-15 18:06:39.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/arch/ia64/kernel/process.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/ia64/kernel/process.c linux-3.0.1-vs2.3.1-pre9/arch/ia64/kernel/process.c +--- linux-3.0.1/arch/ia64/kernel/process.c 2011-03-15 18:06:39.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/arch/ia64/kernel/process.c 2011-06-10 22:11:24.000000000 +0200 @@ -109,8 +109,8 @@ show_regs (struct pt_regs *regs) unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri; @@ -2010,9 +2010,9 @@ diff -NurpP --minimal linux-3.0/arch/ia64/kernel/process.c linux-3.0-vs2.3.1-pre printk("psr : %016lx ifs : %016lx ip : [<%016lx>] %s (%s)\n", regs->cr_ipsr, regs->cr_ifs, ip, print_tainted(), init_utsname()->release); -diff -NurpP --minimal linux-3.0/arch/ia64/kernel/ptrace.c linux-3.0-vs2.3.1-pre8/arch/ia64/kernel/ptrace.c ---- linux-3.0/arch/ia64/kernel/ptrace.c 2011-01-05 21:48:59.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/arch/ia64/kernel/ptrace.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/ia64/kernel/ptrace.c linux-3.0.1-vs2.3.1-pre9/arch/ia64/kernel/ptrace.c +--- linux-3.0.1/arch/ia64/kernel/ptrace.c 2011-01-05 21:48:59.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/arch/ia64/kernel/ptrace.c 2011-06-10 22:11:24.000000000 +0200 @@ -21,6 +21,7 @@ #include #include @@ -2021,9 +2021,9 @@ diff -NurpP --minimal linux-3.0/arch/ia64/kernel/ptrace.c linux-3.0-vs2.3.1-pre8 #include #include -diff -NurpP --minimal linux-3.0/arch/ia64/kernel/traps.c linux-3.0-vs2.3.1-pre8/arch/ia64/kernel/traps.c ---- linux-3.0/arch/ia64/kernel/traps.c 2010-07-07 18:31:01.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/arch/ia64/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/ia64/kernel/traps.c linux-3.0.1-vs2.3.1-pre9/arch/ia64/kernel/traps.c +--- linux-3.0.1/arch/ia64/kernel/traps.c 2010-07-07 18:31:01.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/arch/ia64/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200 @@ -59,8 +59,9 @@ die (const char *str, struct pt_regs *re put_cpu(); @@ -2048,9 +2048,9 @@ diff -NurpP --minimal linux-3.0/arch/ia64/kernel/traps.c linux-3.0-vs2.3.1-pre8/ } } } -diff -NurpP --minimal linux-3.0/arch/ia64/mm/fault.c linux-3.0-vs2.3.1-pre8/arch/ia64/mm/fault.c ---- linux-3.0/arch/ia64/mm/fault.c 2011-07-22 11:17:35.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/arch/ia64/mm/fault.c 2011-06-10 22:28:23.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/ia64/mm/fault.c linux-3.0.1-vs2.3.1-pre9/arch/ia64/mm/fault.c +--- linux-3.0.1/arch/ia64/mm/fault.c 2011-07-22 11:17:35.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/arch/ia64/mm/fault.c 2011-06-10 22:28:23.000000000 +0200 @@ -11,6 +11,7 @@ #include #include @@ -2059,9 +2059,9 @@ diff -NurpP --minimal linux-3.0/arch/ia64/mm/fault.c linux-3.0-vs2.3.1-pre8/arch #include #include -diff -NurpP --minimal linux-3.0/arch/m32r/kernel/traps.c linux-3.0-vs2.3.1-pre8/arch/m32r/kernel/traps.c ---- linux-3.0/arch/m32r/kernel/traps.c 2009-12-03 20:01:57.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/arch/m32r/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/m32r/kernel/traps.c linux-3.0.1-vs2.3.1-pre9/arch/m32r/kernel/traps.c +--- linux-3.0.1/arch/m32r/kernel/traps.c 2009-12-03 20:01:57.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/arch/m32r/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200 @@ -196,8 +196,9 @@ static void show_registers(struct pt_reg } else { printk("SPI: %08lx\n", sp); @@ -2074,9 +2074,9 @@ diff -NurpP --minimal linux-3.0/arch/m32r/kernel/traps.c linux-3.0-vs2.3.1-pre8/ /* * When in-kernel, we also print out the stack and code at the -diff -NurpP --minimal linux-3.0/arch/m68k/Kconfig linux-3.0-vs2.3.1-pre8/arch/m68k/Kconfig ---- linux-3.0/arch/m68k/Kconfig 2011-07-22 11:17:35.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/arch/m68k/Kconfig 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/m68k/Kconfig linux-3.0.1-vs2.3.1-pre9/arch/m68k/Kconfig +--- linux-3.0.1/arch/m68k/Kconfig 2011-07-22 11:17:35.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/arch/m68k/Kconfig 2011-06-10 22:11:24.000000000 +0200 @@ -241,6 +241,8 @@ source "fs/Kconfig" source "arch/m68k/Kconfig.debug" @@ -2086,9 +2086,9 @@ diff -NurpP --minimal linux-3.0/arch/m68k/Kconfig linux-3.0-vs2.3.1-pre8/arch/m6 source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.0/arch/mips/Kconfig linux-3.0-vs2.3.1-pre8/arch/mips/Kconfig ---- linux-3.0/arch/mips/Kconfig 2011-07-22 11:17:35.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/arch/mips/Kconfig 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/mips/Kconfig linux-3.0.1-vs2.3.1-pre9/arch/mips/Kconfig +--- linux-3.0.1/arch/mips/Kconfig 2011-07-22 11:17:35.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/arch/mips/Kconfig 2011-06-10 22:11:24.000000000 +0200 @@ -2485,6 +2485,8 @@ source "fs/Kconfig" source "arch/mips/Kconfig.debug" @@ -2098,9 +2098,9 @@ diff -NurpP --minimal linux-3.0/arch/mips/Kconfig linux-3.0-vs2.3.1-pre8/arch/mi source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.0/arch/mips/kernel/ptrace.c linux-3.0-vs2.3.1-pre8/arch/mips/kernel/ptrace.c ---- linux-3.0/arch/mips/kernel/ptrace.c 2011-07-22 11:17:36.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/arch/mips/kernel/ptrace.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/mips/kernel/ptrace.c linux-3.0.1-vs2.3.1-pre9/arch/mips/kernel/ptrace.c +--- linux-3.0.1/arch/mips/kernel/ptrace.c 2011-07-22 11:17:36.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/arch/mips/kernel/ptrace.c 2011-06-10 22:11:24.000000000 +0200 @@ -25,6 +25,7 @@ #include #include @@ -2119,9 +2119,9 @@ diff -NurpP --minimal linux-3.0/arch/mips/kernel/ptrace.c linux-3.0-vs2.3.1-pre8 switch (request) { /* when I and D space are separate, these will need to be fixed. */ case PTRACE_PEEKTEXT: /* read word at location addr. */ -diff -NurpP --minimal linux-3.0/arch/mips/kernel/scall32-o32.S linux-3.0-vs2.3.1-pre8/arch/mips/kernel/scall32-o32.S ---- linux-3.0/arch/mips/kernel/scall32-o32.S 2011-07-22 11:17:36.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/arch/mips/kernel/scall32-o32.S 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/mips/kernel/scall32-o32.S linux-3.0.1-vs2.3.1-pre9/arch/mips/kernel/scall32-o32.S +--- linux-3.0.1/arch/mips/kernel/scall32-o32.S 2011-07-22 11:17:36.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/arch/mips/kernel/scall32-o32.S 2011-06-10 22:11:24.000000000 +0200 @@ -523,7 +523,7 @@ einval: li v0, -ENOSYS sys sys_mq_timedreceive 5 sys sys_mq_notify 2 /* 4275 */ @@ -2131,9 +2131,9 @@ diff -NurpP --minimal linux-3.0/arch/mips/kernel/scall32-o32.S linux-3.0-vs2.3.1 sys sys_waitid 5 sys sys_ni_syscall 0 /* available, was setaltroot */ sys sys_add_key 5 /* 4280 */ -diff -NurpP --minimal linux-3.0/arch/mips/kernel/scall64-64.S linux-3.0-vs2.3.1-pre8/arch/mips/kernel/scall64-64.S ---- linux-3.0/arch/mips/kernel/scall64-64.S 2011-07-22 11:17:36.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/arch/mips/kernel/scall64-64.S 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/mips/kernel/scall64-64.S linux-3.0.1-vs2.3.1-pre9/arch/mips/kernel/scall64-64.S +--- linux-3.0.1/arch/mips/kernel/scall64-64.S 2011-07-22 11:17:36.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/arch/mips/kernel/scall64-64.S 2011-06-10 22:11:24.000000000 +0200 @@ -362,7 +362,7 @@ sys_call_table: PTR sys_mq_timedreceive PTR sys_mq_notify @@ -2143,9 +2143,9 @@ diff -NurpP --minimal linux-3.0/arch/mips/kernel/scall64-64.S linux-3.0-vs2.3.1- PTR sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key -diff -NurpP --minimal linux-3.0/arch/mips/kernel/scall64-n32.S linux-3.0-vs2.3.1-pre8/arch/mips/kernel/scall64-n32.S ---- linux-3.0/arch/mips/kernel/scall64-n32.S 2011-07-22 11:17:36.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/arch/mips/kernel/scall64-n32.S 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/mips/kernel/scall64-n32.S linux-3.0.1-vs2.3.1-pre9/arch/mips/kernel/scall64-n32.S +--- linux-3.0.1/arch/mips/kernel/scall64-n32.S 2011-07-22 11:17:36.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/arch/mips/kernel/scall64-n32.S 2011-06-10 22:11:24.000000000 +0200 @@ -361,7 +361,7 @@ EXPORT(sysn32_call_table) PTR compat_sys_mq_timedreceive PTR compat_sys_mq_notify @@ -2155,9 +2155,9 @@ diff -NurpP --minimal linux-3.0/arch/mips/kernel/scall64-n32.S linux-3.0-vs2.3.1 PTR compat_sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key -diff -NurpP --minimal linux-3.0/arch/mips/kernel/scall64-o32.S linux-3.0-vs2.3.1-pre8/arch/mips/kernel/scall64-o32.S ---- linux-3.0/arch/mips/kernel/scall64-o32.S 2011-07-22 11:17:36.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/arch/mips/kernel/scall64-o32.S 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/mips/kernel/scall64-o32.S linux-3.0.1-vs2.3.1-pre9/arch/mips/kernel/scall64-o32.S +--- linux-3.0.1/arch/mips/kernel/scall64-o32.S 2011-07-22 11:17:36.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/arch/mips/kernel/scall64-o32.S 2011-06-10 22:11:24.000000000 +0200 @@ -480,7 +480,7 @@ sys_call_table: PTR compat_sys_mq_timedreceive PTR compat_sys_mq_notify /* 4275 */ @@ -2167,9 +2167,9 @@ diff -NurpP --minimal linux-3.0/arch/mips/kernel/scall64-o32.S linux-3.0-vs2.3.1 PTR sys_32_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key /* 4280 */ -diff -NurpP --minimal linux-3.0/arch/mips/kernel/traps.c linux-3.0-vs2.3.1-pre8/arch/mips/kernel/traps.c ---- linux-3.0/arch/mips/kernel/traps.c 2011-05-22 16:17:00.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/arch/mips/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/mips/kernel/traps.c linux-3.0.1-vs2.3.1-pre9/arch/mips/kernel/traps.c +--- linux-3.0.1/arch/mips/kernel/traps.c 2011-05-22 16:17:00.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/arch/mips/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200 @@ -343,9 +343,10 @@ void show_registers(struct pt_regs *regs __show_regs(regs); @@ -2184,9 +2184,9 @@ diff -NurpP --minimal linux-3.0/arch/mips/kernel/traps.c linux-3.0-vs2.3.1-pre8/ if (cpu_has_userlocal) { unsigned long tls; -diff -NurpP --minimal linux-3.0/arch/parisc/Kconfig linux-3.0-vs2.3.1-pre8/arch/parisc/Kconfig ---- linux-3.0/arch/parisc/Kconfig 2011-07-22 11:17:36.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/arch/parisc/Kconfig 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/parisc/Kconfig linux-3.0.1-vs2.3.1-pre9/arch/parisc/Kconfig +--- linux-3.0.1/arch/parisc/Kconfig 2011-07-22 11:17:36.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/arch/parisc/Kconfig 2011-06-10 22:11:24.000000000 +0200 @@ -279,6 +279,8 @@ source "fs/Kconfig" source "arch/parisc/Kconfig.debug" @@ -2196,9 +2196,9 @@ diff -NurpP --minimal linux-3.0/arch/parisc/Kconfig linux-3.0-vs2.3.1-pre8/arch/ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.0/arch/parisc/kernel/syscall_table.S linux-3.0-vs2.3.1-pre8/arch/parisc/kernel/syscall_table.S ---- linux-3.0/arch/parisc/kernel/syscall_table.S 2011-07-22 11:17:36.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/arch/parisc/kernel/syscall_table.S 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/parisc/kernel/syscall_table.S linux-3.0.1-vs2.3.1-pre9/arch/parisc/kernel/syscall_table.S +--- linux-3.0.1/arch/parisc/kernel/syscall_table.S 2011-07-22 11:17:36.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/arch/parisc/kernel/syscall_table.S 2011-06-10 22:11:24.000000000 +0200 @@ -361,7 +361,7 @@ ENTRY_COMP(mbind) /* 260 */ ENTRY_COMP(get_mempolicy) @@ -2208,9 +2208,9 @@ diff -NurpP --minimal linux-3.0/arch/parisc/kernel/syscall_table.S linux-3.0-vs2 ENTRY_SAME(add_key) ENTRY_SAME(request_key) /* 265 */ ENTRY_SAME(keyctl) -diff -NurpP --minimal linux-3.0/arch/parisc/kernel/traps.c linux-3.0-vs2.3.1-pre8/arch/parisc/kernel/traps.c ---- linux-3.0/arch/parisc/kernel/traps.c 2009-09-10 15:25:40.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/arch/parisc/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/parisc/kernel/traps.c linux-3.0.1-vs2.3.1-pre9/arch/parisc/kernel/traps.c +--- linux-3.0.1/arch/parisc/kernel/traps.c 2009-09-10 15:25:40.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/arch/parisc/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200 @@ -236,8 +236,9 @@ void die_if_kernel(char *str, struct pt_ if (err == 0) return; /* STFU */ @@ -2234,9 +2234,9 @@ diff -NurpP --minimal linux-3.0/arch/parisc/kernel/traps.c linux-3.0-vs2.3.1-pre /* Wot's wrong wif bein' racy? */ if (current->thread.flags & PARISC_KERNEL_DEATH) { -diff -NurpP --minimal linux-3.0/arch/parisc/mm/fault.c linux-3.0-vs2.3.1-pre8/arch/parisc/mm/fault.c ---- linux-3.0/arch/parisc/mm/fault.c 2010-08-02 16:52:06.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/arch/parisc/mm/fault.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/parisc/mm/fault.c linux-3.0.1-vs2.3.1-pre9/arch/parisc/mm/fault.c +--- linux-3.0.1/arch/parisc/mm/fault.c 2010-08-02 16:52:06.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/arch/parisc/mm/fault.c 2011-06-10 22:11:24.000000000 +0200 @@ -237,8 +237,9 @@ bad_area: #ifdef PRINT_USER_FAULTS @@ -2249,9 +2249,9 @@ diff -NurpP --minimal linux-3.0/arch/parisc/mm/fault.c linux-3.0-vs2.3.1-pre8/ar if (vma) { printk(KERN_DEBUG "vm_start = 0x%08lx, vm_end = 0x%08lx\n", vma->vm_start, vma->vm_end); -diff -NurpP --minimal linux-3.0/arch/powerpc/Kconfig linux-3.0-vs2.3.1-pre8/arch/powerpc/Kconfig ---- linux-3.0/arch/powerpc/Kconfig 2011-07-22 11:17:36.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/arch/powerpc/Kconfig 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/powerpc/Kconfig linux-3.0.1-vs2.3.1-pre9/arch/powerpc/Kconfig +--- linux-3.0.1/arch/powerpc/Kconfig 2011-07-22 11:17:36.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/arch/powerpc/Kconfig 2011-06-10 22:11:24.000000000 +0200 @@ -978,6 +978,8 @@ source "lib/Kconfig" source "arch/powerpc/Kconfig.debug" @@ -2261,9 +2261,9 @@ diff -NurpP --minimal linux-3.0/arch/powerpc/Kconfig linux-3.0-vs2.3.1-pre8/arch source "security/Kconfig" config KEYS_COMPAT -diff -NurpP --minimal linux-3.0/arch/powerpc/include/asm/unistd.h linux-3.0-vs2.3.1-pre8/arch/powerpc/include/asm/unistd.h ---- linux-3.0/arch/powerpc/include/asm/unistd.h 2011-07-22 11:17:40.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/arch/powerpc/include/asm/unistd.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/powerpc/include/asm/unistd.h linux-3.0.1-vs2.3.1-pre9/arch/powerpc/include/asm/unistd.h +--- linux-3.0.1/arch/powerpc/include/asm/unistd.h 2011-07-22 11:17:40.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/arch/powerpc/include/asm/unistd.h 2011-06-10 22:11:24.000000000 +0200 @@ -275,7 +275,7 @@ #endif #define __NR_rtas 255 @@ -2273,9 +2273,9 @@ diff -NurpP --minimal linux-3.0/arch/powerpc/include/asm/unistd.h linux-3.0-vs2. #define __NR_migrate_pages 258 #define __NR_mbind 259 #define __NR_get_mempolicy 260 -diff -NurpP --minimal linux-3.0/arch/powerpc/kernel/process.c linux-3.0-vs2.3.1-pre8/arch/powerpc/kernel/process.c ---- linux-3.0/arch/powerpc/kernel/process.c 2011-07-22 11:17:40.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/arch/powerpc/kernel/process.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/powerpc/kernel/process.c linux-3.0.1-vs2.3.1-pre9/arch/powerpc/kernel/process.c +--- linux-3.0.1/arch/powerpc/kernel/process.c 2011-07-22 11:17:40.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/arch/powerpc/kernel/process.c 2011-06-10 22:11:24.000000000 +0200 @@ -656,8 +656,9 @@ void show_regs(struct pt_regs * regs) #else printk("DAR: "REG", DSISR: %08lx\n", regs->dar, regs->dsisr); @@ -2288,9 +2288,9 @@ diff -NurpP --minimal linux-3.0/arch/powerpc/kernel/process.c linux-3.0-vs2.3.1- #ifdef CONFIG_SMP printk(" CPU: %d", raw_smp_processor_id()); -diff -NurpP --minimal linux-3.0/arch/powerpc/kernel/traps.c linux-3.0-vs2.3.1-pre8/arch/powerpc/kernel/traps.c ---- linux-3.0/arch/powerpc/kernel/traps.c 2011-07-22 11:17:40.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/arch/powerpc/kernel/traps.c 2011-07-19 00:44:39.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/powerpc/kernel/traps.c linux-3.0.1-vs2.3.1-pre9/arch/powerpc/kernel/traps.c +--- linux-3.0.1/arch/powerpc/kernel/traps.c 2011-07-22 11:17:40.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/arch/powerpc/kernel/traps.c 2011-07-19 00:44:39.000000000 +0200 @@ -1075,8 +1075,9 @@ void nonrecoverable_exception(struct pt_ void trace_syscall(struct pt_regs *regs) @@ -2303,9 +2303,9 @@ diff -NurpP --minimal linux-3.0/arch/powerpc/kernel/traps.c linux-3.0-vs2.3.1-pr regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted()); } -diff -NurpP --minimal linux-3.0/arch/powerpc/kernel/vdso.c linux-3.0-vs2.3.1-pre8/arch/powerpc/kernel/vdso.c ---- linux-3.0/arch/powerpc/kernel/vdso.c 2011-05-22 16:17:02.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/arch/powerpc/kernel/vdso.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/powerpc/kernel/vdso.c linux-3.0.1-vs2.3.1-pre9/arch/powerpc/kernel/vdso.c +--- linux-3.0.1/arch/powerpc/kernel/vdso.c 2011-05-22 16:17:02.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/arch/powerpc/kernel/vdso.c 2011-06-10 22:11:24.000000000 +0200 @@ -23,6 +23,7 @@ #include #include @@ -2314,9 +2314,9 @@ diff -NurpP --minimal linux-3.0/arch/powerpc/kernel/vdso.c linux-3.0-vs2.3.1-pre #include #include -diff -NurpP --minimal linux-3.0/arch/s390/Kconfig linux-3.0-vs2.3.1-pre8/arch/s390/Kconfig ---- linux-3.0/arch/s390/Kconfig 2011-07-22 11:17:41.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/arch/s390/Kconfig 2011-07-01 11:35:34.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/s390/Kconfig linux-3.0.1-vs2.3.1-pre9/arch/s390/Kconfig +--- linux-3.0.1/arch/s390/Kconfig 2011-07-22 11:17:41.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/arch/s390/Kconfig 2011-07-01 11:35:34.000000000 +0200 @@ -628,6 +628,8 @@ source "fs/Kconfig" source "arch/s390/Kconfig.debug" @@ -2326,9 +2326,9 @@ diff -NurpP --minimal linux-3.0/arch/s390/Kconfig linux-3.0-vs2.3.1-pre8/arch/s3 source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.0/arch/s390/include/asm/tlb.h linux-3.0-vs2.3.1-pre8/arch/s390/include/asm/tlb.h ---- linux-3.0/arch/s390/include/asm/tlb.h 2011-07-22 11:17:41.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/arch/s390/include/asm/tlb.h 2011-06-15 02:40:14.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/s390/include/asm/tlb.h linux-3.0.1-vs2.3.1-pre9/arch/s390/include/asm/tlb.h +--- linux-3.0.1/arch/s390/include/asm/tlb.h 2011-07-22 11:17:41.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/arch/s390/include/asm/tlb.h 2011-06-15 02:40:14.000000000 +0200 @@ -24,6 +24,8 @@ #include #include @@ -2338,9 +2338,9 @@ diff -NurpP --minimal linux-3.0/arch/s390/include/asm/tlb.h linux-3.0-vs2.3.1-pr #include #include #include -diff -NurpP --minimal linux-3.0/arch/s390/include/asm/unistd.h linux-3.0-vs2.3.1-pre8/arch/s390/include/asm/unistd.h ---- linux-3.0/arch/s390/include/asm/unistd.h 2011-07-22 11:17:41.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/arch/s390/include/asm/unistd.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/s390/include/asm/unistd.h linux-3.0.1-vs2.3.1-pre9/arch/s390/include/asm/unistd.h +--- linux-3.0.1/arch/s390/include/asm/unistd.h 2011-07-22 11:17:41.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/arch/s390/include/asm/unistd.h 2011-06-10 22:11:24.000000000 +0200 @@ -202,7 +202,7 @@ #define __NR_clock_gettime (__NR_timer_create+6) #define __NR_clock_getres (__NR_timer_create+7) @@ -2350,9 +2350,9 @@ diff -NurpP --minimal linux-3.0/arch/s390/include/asm/unistd.h linux-3.0-vs2.3.1 #define __NR_statfs64 265 #define __NR_fstatfs64 266 #define __NR_remap_file_pages 267 -diff -NurpP --minimal linux-3.0/arch/s390/kernel/ptrace.c linux-3.0-vs2.3.1-pre8/arch/s390/kernel/ptrace.c ---- linux-3.0/arch/s390/kernel/ptrace.c 2011-03-15 18:06:45.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/arch/s390/kernel/ptrace.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/s390/kernel/ptrace.c linux-3.0.1-vs2.3.1-pre9/arch/s390/kernel/ptrace.c +--- linux-3.0.1/arch/s390/kernel/ptrace.c 2011-03-15 18:06:45.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/arch/s390/kernel/ptrace.c 2011-06-10 22:11:24.000000000 +0200 @@ -20,6 +20,7 @@ #include #include @@ -2361,9 +2361,9 @@ diff -NurpP --minimal linux-3.0/arch/s390/kernel/ptrace.c linux-3.0-vs2.3.1-pre8 #include #include #include -diff -NurpP --minimal linux-3.0/arch/s390/kernel/syscalls.S linux-3.0-vs2.3.1-pre8/arch/s390/kernel/syscalls.S ---- linux-3.0/arch/s390/kernel/syscalls.S 2011-07-22 11:17:41.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/arch/s390/kernel/syscalls.S 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/s390/kernel/syscalls.S linux-3.0.1-vs2.3.1-pre9/arch/s390/kernel/syscalls.S +--- linux-3.0.1/arch/s390/kernel/syscalls.S 2011-07-22 11:17:41.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/arch/s390/kernel/syscalls.S 2011-06-10 22:11:24.000000000 +0200 @@ -271,7 +271,7 @@ SYSCALL(sys_clock_settime,sys_clock_sett SYSCALL(sys_clock_gettime,sys_clock_gettime,sys32_clock_gettime_wrapper) /* 260 */ SYSCALL(sys_clock_getres,sys_clock_getres,sys32_clock_getres_wrapper) @@ -2373,9 +2373,9 @@ diff -NurpP --minimal linux-3.0/arch/s390/kernel/syscalls.S linux-3.0-vs2.3.1-pr SYSCALL(sys_s390_fadvise64_64,sys_ni_syscall,sys32_fadvise64_64_wrapper) SYSCALL(sys_statfs64,sys_statfs64,compat_sys_statfs64_wrapper) SYSCALL(sys_fstatfs64,sys_fstatfs64,compat_sys_fstatfs64_wrapper) -diff -NurpP --minimal linux-3.0/arch/sh/Kconfig linux-3.0-vs2.3.1-pre8/arch/sh/Kconfig ---- linux-3.0/arch/sh/Kconfig 2011-07-22 11:17:41.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/arch/sh/Kconfig 2011-07-19 00:44:39.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/sh/Kconfig linux-3.0.1-vs2.3.1-pre9/arch/sh/Kconfig +--- linux-3.0.1/arch/sh/Kconfig 2011-07-22 11:17:41.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/arch/sh/Kconfig 2011-07-19 00:44:39.000000000 +0200 @@ -893,6 +893,8 @@ source "fs/Kconfig" source "arch/sh/Kconfig.debug" @@ -2385,9 +2385,9 @@ diff -NurpP --minimal linux-3.0/arch/sh/Kconfig linux-3.0-vs2.3.1-pre8/arch/sh/K source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.0/arch/sh/kernel/irq.c linux-3.0-vs2.3.1-pre8/arch/sh/kernel/irq.c ---- linux-3.0/arch/sh/kernel/irq.c 2011-07-22 11:17:41.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/arch/sh/kernel/irq.c 2011-07-19 00:45:06.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/sh/kernel/irq.c linux-3.0.1-vs2.3.1-pre9/arch/sh/kernel/irq.c +--- linux-3.0.1/arch/sh/kernel/irq.c 2011-07-22 11:17:41.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/arch/sh/kernel/irq.c 2011-07-19 00:45:06.000000000 +0200 @@ -14,6 +14,7 @@ #include #include @@ -2396,9 +2396,9 @@ diff -NurpP --minimal linux-3.0/arch/sh/kernel/irq.c linux-3.0-vs2.3.1-pre8/arch #include #include #include -diff -NurpP --minimal linux-3.0/arch/sh/kernel/vsyscall/vsyscall.c linux-3.0-vs2.3.1-pre8/arch/sh/kernel/vsyscall/vsyscall.c ---- linux-3.0/arch/sh/kernel/vsyscall/vsyscall.c 2011-05-22 16:17:07.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/arch/sh/kernel/vsyscall/vsyscall.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/sh/kernel/vsyscall/vsyscall.c linux-3.0.1-vs2.3.1-pre9/arch/sh/kernel/vsyscall/vsyscall.c +--- linux-3.0.1/arch/sh/kernel/vsyscall/vsyscall.c 2011-05-22 16:17:07.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/arch/sh/kernel/vsyscall/vsyscall.c 2011-06-10 22:11:24.000000000 +0200 @@ -18,6 +18,7 @@ #include #include @@ -2407,9 +2407,9 @@ diff -NurpP --minimal linux-3.0/arch/sh/kernel/vsyscall/vsyscall.c linux-3.0-vs2 /* * Should the kernel map a VDSO page into processes and pass its -diff -NurpP --minimal linux-3.0/arch/sparc/Kconfig linux-3.0-vs2.3.1-pre8/arch/sparc/Kconfig ---- linux-3.0/arch/sparc/Kconfig 2011-07-22 11:17:41.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/arch/sparc/Kconfig 2011-06-15 02:40:14.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/sparc/Kconfig linux-3.0.1-vs2.3.1-pre9/arch/sparc/Kconfig +--- linux-3.0.1/arch/sparc/Kconfig 2011-07-22 11:17:41.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/arch/sparc/Kconfig 2011-06-15 02:40:14.000000000 +0200 @@ -601,6 +601,8 @@ source "fs/Kconfig" source "arch/sparc/Kconfig.debug" @@ -2419,9 +2419,9 @@ diff -NurpP --minimal linux-3.0/arch/sparc/Kconfig linux-3.0-vs2.3.1-pre8/arch/s source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.0/arch/sparc/include/asm/tlb_64.h linux-3.0-vs2.3.1-pre8/arch/sparc/include/asm/tlb_64.h ---- linux-3.0/arch/sparc/include/asm/tlb_64.h 2011-07-22 11:17:42.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/arch/sparc/include/asm/tlb_64.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/sparc/include/asm/tlb_64.h linux-3.0.1-vs2.3.1-pre9/arch/sparc/include/asm/tlb_64.h +--- linux-3.0.1/arch/sparc/include/asm/tlb_64.h 2011-07-22 11:17:42.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/arch/sparc/include/asm/tlb_64.h 2011-06-10 22:11:24.000000000 +0200 @@ -3,6 +3,7 @@ #include @@ -2430,9 +2430,9 @@ diff -NurpP --minimal linux-3.0/arch/sparc/include/asm/tlb_64.h linux-3.0-vs2.3. #include #include #include -diff -NurpP --minimal linux-3.0/arch/sparc/include/asm/unistd.h linux-3.0-vs2.3.1-pre8/arch/sparc/include/asm/unistd.h ---- linux-3.0/arch/sparc/include/asm/unistd.h 2011-07-22 11:17:42.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/arch/sparc/include/asm/unistd.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/sparc/include/asm/unistd.h linux-3.0.1-vs2.3.1-pre9/arch/sparc/include/asm/unistd.h +--- linux-3.0.1/arch/sparc/include/asm/unistd.h 2011-07-22 11:17:42.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/arch/sparc/include/asm/unistd.h 2011-06-10 22:11:24.000000000 +0200 @@ -335,7 +335,7 @@ #define __NR_timer_getoverrun 264 #define __NR_timer_delete 265 @@ -2442,9 +2442,9 @@ diff -NurpP --minimal linux-3.0/arch/sparc/include/asm/unistd.h linux-3.0-vs2.3. #define __NR_io_setup 268 #define __NR_io_destroy 269 #define __NR_io_submit 270 -diff -NurpP --minimal linux-3.0/arch/sparc/kernel/systbls_32.S linux-3.0-vs2.3.1-pre8/arch/sparc/kernel/systbls_32.S ---- linux-3.0/arch/sparc/kernel/systbls_32.S 2011-07-22 11:17:42.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/arch/sparc/kernel/systbls_32.S 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/sparc/kernel/systbls_32.S linux-3.0.1-vs2.3.1-pre9/arch/sparc/kernel/systbls_32.S +--- linux-3.0.1/arch/sparc/kernel/systbls_32.S 2011-07-22 11:17:42.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/arch/sparc/kernel/systbls_32.S 2011-06-10 22:11:24.000000000 +0200 @@ -70,7 +70,7 @@ sys_call_table: /*250*/ .long sys_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nfsservctl /*255*/ .long sys_sync_file_range, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep @@ -2454,9 +2454,9 @@ diff -NurpP --minimal linux-3.0/arch/sparc/kernel/systbls_32.S linux-3.0-vs2.3.1 /*270*/ .long sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink /*275*/ .long sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid /*280*/ .long sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat -diff -NurpP --minimal linux-3.0/arch/sparc/kernel/systbls_64.S linux-3.0-vs2.3.1-pre8/arch/sparc/kernel/systbls_64.S ---- linux-3.0/arch/sparc/kernel/systbls_64.S 2011-07-22 11:17:42.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/arch/sparc/kernel/systbls_64.S 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/sparc/kernel/systbls_64.S linux-3.0.1-vs2.3.1-pre9/arch/sparc/kernel/systbls_64.S +--- linux-3.0.1/arch/sparc/kernel/systbls_64.S 2011-07-22 11:17:42.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/arch/sparc/kernel/systbls_64.S 2011-06-10 22:11:24.000000000 +0200 @@ -71,7 +71,7 @@ sys_call_table32: /*250*/ .word sys_mremap, compat_sys_sysctl, sys32_getsid, sys_fdatasync, sys32_nfsservctl .word sys32_sync_file_range, compat_sys_clock_settime, compat_sys_clock_gettime, compat_sys_clock_getres, sys32_clock_nanosleep @@ -2475,9 +2475,9 @@ diff -NurpP --minimal linux-3.0/arch/sparc/kernel/systbls_64.S linux-3.0-vs2.3.1 /*270*/ .word sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink .word sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid /*280*/ .word sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat -diff -NurpP --minimal linux-3.0/arch/um/Kconfig.rest linux-3.0-vs2.3.1-pre8/arch/um/Kconfig.rest ---- linux-3.0/arch/um/Kconfig.rest 2009-06-11 17:12:19.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/arch/um/Kconfig.rest 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/um/Kconfig.rest linux-3.0.1-vs2.3.1-pre9/arch/um/Kconfig.rest +--- linux-3.0.1/arch/um/Kconfig.rest 2009-06-11 17:12:19.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/arch/um/Kconfig.rest 2011-06-10 22:11:24.000000000 +0200 @@ -18,6 +18,8 @@ source "drivers/connector/Kconfig" source "fs/Kconfig" @@ -2487,9 +2487,9 @@ diff -NurpP --minimal linux-3.0/arch/um/Kconfig.rest linux-3.0-vs2.3.1-pre8/arch source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.0/arch/um/include/asm/tlb.h linux-3.0-vs2.3.1-pre8/arch/um/include/asm/tlb.h ---- linux-3.0/arch/um/include/asm/tlb.h 2011-07-22 11:17:42.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/arch/um/include/asm/tlb.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/um/include/asm/tlb.h linux-3.0.1-vs2.3.1-pre9/arch/um/include/asm/tlb.h +--- linux-3.0.1/arch/um/include/asm/tlb.h 2011-07-22 11:17:42.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/arch/um/include/asm/tlb.h 2011-06-10 22:11:24.000000000 +0200 @@ -3,6 +3,7 @@ #include @@ -2498,14 +2498,14 @@ diff -NurpP --minimal linux-3.0/arch/um/include/asm/tlb.h linux-3.0-vs2.3.1-pre8 #include #include #include -diff -NurpP --minimal linux-3.0/arch/um/include/shared/kern_constants.h linux-3.0-vs2.3.1-pre8/arch/um/include/shared/kern_constants.h ---- linux-3.0/arch/um/include/shared/kern_constants.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/arch/um/include/shared/kern_constants.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/um/include/shared/kern_constants.h linux-3.0.1-vs2.3.1-pre9/arch/um/include/shared/kern_constants.h +--- linux-3.0.1/arch/um/include/shared/kern_constants.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/arch/um/include/shared/kern_constants.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../include/generated/asm-offsets.h" -diff -NurpP --minimal linux-3.0/arch/um/include/shared/user_constants.h linux-3.0-vs2.3.1-pre8/arch/um/include/shared/user_constants.h ---- linux-3.0/arch/um/include/shared/user_constants.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/arch/um/include/shared/user_constants.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/um/include/shared/user_constants.h linux-3.0.1-vs2.3.1-pre9/arch/um/include/shared/user_constants.h +--- linux-3.0.1/arch/um/include/shared/user_constants.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/arch/um/include/shared/user_constants.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,40 @@ +/* + * DO NOT MODIFY. @@ -2547,9 +2547,9 @@ diff -NurpP --minimal linux-3.0/arch/um/include/shared/user_constants.h linux-3. +#define UM_PROT_WRITE 2 /* PROT_WRITE # */ +#define UM_PROT_EXEC 4 /* PROT_EXEC # */ + -diff -NurpP --minimal linux-3.0/arch/x86/Kconfig linux-3.0-vs2.3.1-pre8/arch/x86/Kconfig ---- linux-3.0/arch/x86/Kconfig 2011-07-22 11:17:42.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/arch/x86/Kconfig 2011-07-22 11:20:39.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/x86/Kconfig linux-3.0.1-vs2.3.1-pre9/arch/x86/Kconfig +--- linux-3.0.1/arch/x86/Kconfig 2011-07-22 11:17:42.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/arch/x86/Kconfig 2011-07-22 11:20:39.000000000 +0200 @@ -2159,6 +2159,8 @@ source "fs/Kconfig" source "arch/x86/Kconfig.debug" @@ -2559,9 +2559,9 @@ diff -NurpP --minimal linux-3.0/arch/x86/Kconfig linux-3.0-vs2.3.1-pre8/arch/x86 source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.0/arch/x86/ia32/ia32entry.S linux-3.0-vs2.3.1-pre8/arch/x86/ia32/ia32entry.S ---- linux-3.0/arch/x86/ia32/ia32entry.S 2011-07-22 11:17:42.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/arch/x86/ia32/ia32entry.S 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/x86/ia32/ia32entry.S linux-3.0.1-vs2.3.1-pre9/arch/x86/ia32/ia32entry.S +--- linux-3.0.1/arch/x86/ia32/ia32entry.S 2011-07-22 11:17:42.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/arch/x86/ia32/ia32entry.S 2011-06-10 22:11:24.000000000 +0200 @@ -776,7 +776,7 @@ ia32_sys_call_table: .quad sys_tgkill /* 270 */ .quad compat_sys_utimes @@ -2571,9 +2571,9 @@ diff -NurpP --minimal linux-3.0/arch/x86/ia32/ia32entry.S linux-3.0-vs2.3.1-pre8 .quad sys_mbind .quad compat_sys_get_mempolicy /* 275 */ .quad sys_set_mempolicy -diff -NurpP --minimal linux-3.0/arch/x86/include/asm/unistd_64.h linux-3.0-vs2.3.1-pre8/arch/x86/include/asm/unistd_64.h ---- linux-3.0/arch/x86/include/asm/unistd_64.h 2011-07-22 11:17:43.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/arch/x86/include/asm/unistd_64.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/x86/include/asm/unistd_64.h linux-3.0.1-vs2.3.1-pre9/arch/x86/include/asm/unistd_64.h +--- linux-3.0.1/arch/x86/include/asm/unistd_64.h 2011-07-22 11:17:43.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/arch/x86/include/asm/unistd_64.h 2011-06-10 22:11:24.000000000 +0200 @@ -535,7 +535,7 @@ __SYSCALL(__NR_tgkill, sys_tgkill) #define __NR_utimes 235 __SYSCALL(__NR_utimes, sys_utimes) @@ -2583,9 +2583,9 @@ diff -NurpP --minimal linux-3.0/arch/x86/include/asm/unistd_64.h linux-3.0-vs2.3 #define __NR_mbind 237 __SYSCALL(__NR_mbind, sys_mbind) #define __NR_set_mempolicy 238 -diff -NurpP --minimal linux-3.0/arch/x86/kernel/syscall_table_32.S linux-3.0-vs2.3.1-pre8/arch/x86/kernel/syscall_table_32.S ---- linux-3.0/arch/x86/kernel/syscall_table_32.S 2011-07-22 11:17:43.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/arch/x86/kernel/syscall_table_32.S 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/arch/x86/kernel/syscall_table_32.S linux-3.0.1-vs2.3.1-pre9/arch/x86/kernel/syscall_table_32.S +--- linux-3.0.1/arch/x86/kernel/syscall_table_32.S 2011-07-22 11:17:43.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/arch/x86/kernel/syscall_table_32.S 2011-06-10 22:11:24.000000000 +0200 @@ -272,7 +272,7 @@ ENTRY(sys_call_table) .long sys_tgkill /* 270 */ .long sys_utimes @@ -2595,9 +2595,9 @@ diff -NurpP --minimal linux-3.0/arch/x86/kernel/syscall_table_32.S linux-3.0-vs2 .long sys_mbind .long sys_get_mempolicy .long sys_set_mempolicy -diff -NurpP --minimal linux-3.0/block/genhd.c linux-3.0-vs2.3.1-pre8/block/genhd.c ---- linux-3.0/block/genhd.c 2011-07-22 11:17:43.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/block/genhd.c 2011-07-01 11:35:34.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/block/genhd.c linux-3.0.1-vs2.3.1-pre9/block/genhd.c +--- linux-3.0.1/block/genhd.c 2011-07-22 11:17:43.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/block/genhd.c 2011-07-01 11:35:34.000000000 +0200 @@ -1154,17 +1154,17 @@ static int diskstats_show(struct seq_fil cpu = part_stat_lock(); part_round_stats(cpu, hd); @@ -2620,9 +2620,9 @@ diff -NurpP --minimal linux-3.0/block/genhd.c linux-3.0-vs2.3.1-pre8/block/genhd jiffies_to_msecs(part_stat_read(hd, ticks[WRITE])), part_in_flight(hd), jiffies_to_msecs(part_stat_read(hd, io_ticks)), -diff -NurpP --minimal linux-3.0/drivers/block/Kconfig linux-3.0-vs2.3.1-pre8/drivers/block/Kconfig ---- linux-3.0/drivers/block/Kconfig 2011-07-22 11:17:44.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/drivers/block/Kconfig 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/drivers/block/Kconfig linux-3.0.1-vs2.3.1-pre9/drivers/block/Kconfig +--- linux-3.0.1/drivers/block/Kconfig 2011-07-22 11:17:44.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/drivers/block/Kconfig 2011-06-10 22:11:24.000000000 +0200 @@ -273,6 +273,13 @@ config BLK_DEV_CRYPTOLOOP source "drivers/block/drbd/Kconfig" @@ -2637,9 +2637,9 @@ diff -NurpP --minimal linux-3.0/drivers/block/Kconfig linux-3.0-vs2.3.1-pre8/dri config BLK_DEV_NBD tristate "Network block device support" depends on NET -diff -NurpP --minimal linux-3.0/drivers/block/Makefile linux-3.0-vs2.3.1-pre8/drivers/block/Makefile ---- linux-3.0/drivers/block/Makefile 2011-07-22 11:17:44.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/drivers/block/Makefile 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/drivers/block/Makefile linux-3.0.1-vs2.3.1-pre9/drivers/block/Makefile +--- linux-3.0.1/drivers/block/Makefile 2011-07-22 11:17:44.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/drivers/block/Makefile 2011-06-10 22:11:24.000000000 +0200 @@ -34,6 +34,7 @@ obj-$(CONFIG_VIODASD) += viodasd.o obj-$(CONFIG_BLK_DEV_SX8) += sx8.o obj-$(CONFIG_BLK_DEV_UB) += ub.o @@ -2648,9 +2648,9 @@ diff -NurpP --minimal linux-3.0/drivers/block/Makefile linux-3.0-vs2.3.1-pre8/dr obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o obj-$(CONFIG_XEN_BLKDEV_BACKEND) += xen-blkback/ -diff -NurpP --minimal linux-3.0/drivers/block/loop.c linux-3.0-vs2.3.1-pre8/drivers/block/loop.c ---- linux-3.0/drivers/block/loop.c 2011-07-22 11:17:44.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/drivers/block/loop.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/drivers/block/loop.c linux-3.0.1-vs2.3.1-pre9/drivers/block/loop.c +--- linux-3.0.1/drivers/block/loop.c 2011-07-22 11:17:44.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/drivers/block/loop.c 2011-06-10 22:11:24.000000000 +0200 @@ -75,6 +75,7 @@ #include #include @@ -2704,9 +2704,9 @@ diff -NurpP --minimal linux-3.0/drivers/block/loop.c linux-3.0-vs2.3.1-pre8/driv mutex_lock(&lo->lo_ctl_mutex); lo->lo_refcnt++; mutex_unlock(&lo->lo_ctl_mutex); -diff -NurpP --minimal linux-3.0/drivers/block/vroot.c linux-3.0-vs2.3.1-pre8/drivers/block/vroot.c ---- linux-3.0/drivers/block/vroot.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/drivers/block/vroot.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/drivers/block/vroot.c linux-3.0.1-vs2.3.1-pre9/drivers/block/vroot.c +--- linux-3.0.1/drivers/block/vroot.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/drivers/block/vroot.c 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,292 @@ +/* + * linux/drivers/block/vroot.c @@ -3000,9 +3000,9 @@ diff -NurpP --minimal linux-3.0/drivers/block/vroot.c linux-3.0-vs2.3.1-pre8/dri + +#endif + -diff -NurpP --minimal linux-3.0/drivers/gpu/drm/radeon/r100_reg_safe.h linux-3.0-vs2.3.1-pre8/drivers/gpu/drm/radeon/r100_reg_safe.h ---- linux-3.0/drivers/gpu/drm/radeon/r100_reg_safe.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/drivers/gpu/drm/radeon/r100_reg_safe.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/drivers/gpu/drm/radeon/r100_reg_safe.h linux-3.0.1-vs2.3.1-pre9/drivers/gpu/drm/radeon/r100_reg_safe.h +--- linux-3.0.1/drivers/gpu/drm/radeon/r100_reg_safe.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/drivers/gpu/drm/radeon/r100_reg_safe.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,28 @@ +static const unsigned r100_reg_safe_bm[102] = { + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, @@ -3032,9 +3032,9 @@ diff -NurpP --minimal linux-3.0/drivers/gpu/drm/radeon/r100_reg_safe.h linux-3.0 + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFEF, +}; -diff -NurpP --minimal linux-3.0/drivers/gpu/drm/radeon/r200_reg_safe.h linux-3.0-vs2.3.1-pre8/drivers/gpu/drm/radeon/r200_reg_safe.h ---- linux-3.0/drivers/gpu/drm/radeon/r200_reg_safe.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/drivers/gpu/drm/radeon/r200_reg_safe.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/drivers/gpu/drm/radeon/r200_reg_safe.h linux-3.0.1-vs2.3.1-pre9/drivers/gpu/drm/radeon/r200_reg_safe.h +--- linux-3.0.1/drivers/gpu/drm/radeon/r200_reg_safe.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/drivers/gpu/drm/radeon/r200_reg_safe.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,28 @@ +static const unsigned r200_reg_safe_bm[102] = { + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, @@ -3064,9 +3064,9 @@ diff -NurpP --minimal linux-3.0/drivers/gpu/drm/radeon/r200_reg_safe.h linux-3.0 + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFE3F, 0xFFFFFFEF, +}; -diff -NurpP --minimal linux-3.0/drivers/gpu/drm/radeon/r300_reg_safe.h linux-3.0-vs2.3.1-pre8/drivers/gpu/drm/radeon/r300_reg_safe.h ---- linux-3.0/drivers/gpu/drm/radeon/r300_reg_safe.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/drivers/gpu/drm/radeon/r300_reg_safe.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/drivers/gpu/drm/radeon/r300_reg_safe.h linux-3.0.1-vs2.3.1-pre9/drivers/gpu/drm/radeon/r300_reg_safe.h +--- linux-3.0.1/drivers/gpu/drm/radeon/r300_reg_safe.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/drivers/gpu/drm/radeon/r300_reg_safe.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,42 @@ +static const unsigned r300_reg_safe_bm[159] = { + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, @@ -3110,9 +3110,9 @@ diff -NurpP --minimal linux-3.0/drivers/gpu/drm/radeon/r300_reg_safe.h linux-3.0 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x0003FC01, 0xFFFFFCF8, 0xFF800B19, +}; -diff -NurpP --minimal linux-3.0/drivers/gpu/drm/radeon/r420_reg_safe.h linux-3.0-vs2.3.1-pre8/drivers/gpu/drm/radeon/r420_reg_safe.h ---- linux-3.0/drivers/gpu/drm/radeon/r420_reg_safe.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/drivers/gpu/drm/radeon/r420_reg_safe.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/drivers/gpu/drm/radeon/r420_reg_safe.h linux-3.0.1-vs2.3.1-pre9/drivers/gpu/drm/radeon/r420_reg_safe.h +--- linux-3.0.1/drivers/gpu/drm/radeon/r420_reg_safe.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/drivers/gpu/drm/radeon/r420_reg_safe.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,42 @@ +static const unsigned r420_reg_safe_bm[159] = { + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, @@ -3156,9 +3156,9 @@ diff -NurpP --minimal linux-3.0/drivers/gpu/drm/radeon/r420_reg_safe.h linux-3.0 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x0003FC01, 0xFFFFFCF8, 0xFF800B19, +}; -diff -NurpP --minimal linux-3.0/drivers/gpu/drm/radeon/rn50_reg_safe.h linux-3.0-vs2.3.1-pre8/drivers/gpu/drm/radeon/rn50_reg_safe.h ---- linux-3.0/drivers/gpu/drm/radeon/rn50_reg_safe.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/drivers/gpu/drm/radeon/rn50_reg_safe.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/drivers/gpu/drm/radeon/rn50_reg_safe.h linux-3.0.1-vs2.3.1-pre9/drivers/gpu/drm/radeon/rn50_reg_safe.h +--- linux-3.0.1/drivers/gpu/drm/radeon/rn50_reg_safe.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/drivers/gpu/drm/radeon/rn50_reg_safe.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,28 @@ +static const unsigned rn50_reg_safe_bm[102] = { + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, @@ -3188,9 +3188,9 @@ diff -NurpP --minimal linux-3.0/drivers/gpu/drm/radeon/rn50_reg_safe.h linux-3.0 + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, +}; -diff -NurpP --minimal linux-3.0/drivers/gpu/drm/radeon/rs600_reg_safe.h linux-3.0-vs2.3.1-pre8/drivers/gpu/drm/radeon/rs600_reg_safe.h ---- linux-3.0/drivers/gpu/drm/radeon/rs600_reg_safe.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/drivers/gpu/drm/radeon/rs600_reg_safe.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/drivers/gpu/drm/radeon/rs600_reg_safe.h linux-3.0.1-vs2.3.1-pre9/drivers/gpu/drm/radeon/rs600_reg_safe.h +--- linux-3.0.1/drivers/gpu/drm/radeon/rs600_reg_safe.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/drivers/gpu/drm/radeon/rs600_reg_safe.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,57 @@ +static const unsigned rs600_reg_safe_bm[219] = { + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, @@ -3249,9 +3249,9 @@ diff -NurpP --minimal linux-3.0/drivers/gpu/drm/radeon/rs600_reg_safe.h linux-3. + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, +}; -diff -NurpP --minimal linux-3.0/drivers/gpu/drm/radeon/rv515_reg_safe.h linux-3.0-vs2.3.1-pre8/drivers/gpu/drm/radeon/rv515_reg_safe.h ---- linux-3.0/drivers/gpu/drm/radeon/rv515_reg_safe.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/drivers/gpu/drm/radeon/rv515_reg_safe.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/drivers/gpu/drm/radeon/rv515_reg_safe.h linux-3.0.1-vs2.3.1-pre9/drivers/gpu/drm/radeon/rv515_reg_safe.h +--- linux-3.0.1/drivers/gpu/drm/radeon/rv515_reg_safe.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/drivers/gpu/drm/radeon/rv515_reg_safe.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,57 @@ +static const unsigned rv515_reg_safe_bm[219] = { + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, @@ -3310,9 +3310,9 @@ diff -NurpP --minimal linux-3.0/drivers/gpu/drm/radeon/rv515_reg_safe.h linux-3. + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, +}; -diff -NurpP --minimal linux-3.0/drivers/infiniband/core/addr.c linux-3.0-vs2.3.1-pre8/drivers/infiniband/core/addr.c ---- linux-3.0/drivers/infiniband/core/addr.c 2011-07-22 11:17:45.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/drivers/infiniband/core/addr.c 2011-06-16 14:16:51.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/drivers/infiniband/core/addr.c linux-3.0.1-vs2.3.1-pre9/drivers/infiniband/core/addr.c +--- linux-3.0.1/drivers/infiniband/core/addr.c 2011-07-22 11:17:45.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/drivers/infiniband/core/addr.c 2011-06-16 14:16:51.000000000 +0200 @@ -252,7 +252,7 @@ static int addr6_resolve(struct sockaddr if (ipv6_addr_any(&fl6.saddr)) { @@ -3322,9 +3322,9 @@ diff -NurpP --minimal linux-3.0/drivers/infiniband/core/addr.c linux-3.0-vs2.3.1 if (ret) goto put; -diff -NurpP --minimal linux-3.0/drivers/infiniband/hw/ipath/ipath_user_pages.c linux-3.0-vs2.3.1-pre8/drivers/infiniband/hw/ipath/ipath_user_pages.c ---- linux-3.0/drivers/infiniband/hw/ipath/ipath_user_pages.c 2011-05-22 16:17:16.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/drivers/infiniband/hw/ipath/ipath_user_pages.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/drivers/infiniband/hw/ipath/ipath_user_pages.c linux-3.0.1-vs2.3.1-pre9/drivers/infiniband/hw/ipath/ipath_user_pages.c +--- linux-3.0.1/drivers/infiniband/hw/ipath/ipath_user_pages.c 2011-05-22 16:17:16.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/drivers/infiniband/hw/ipath/ipath_user_pages.c 2011-06-10 22:11:24.000000000 +0200 @@ -35,6 +35,7 @@ #include #include @@ -3333,9 +3333,9 @@ diff -NurpP --minimal linux-3.0/drivers/infiniband/hw/ipath/ipath_user_pages.c l #include "ipath_kernel.h" -diff -NurpP --minimal linux-3.0/drivers/md/dm-ioctl.c linux-3.0-vs2.3.1-pre8/drivers/md/dm-ioctl.c ---- linux-3.0/drivers/md/dm-ioctl.c 2011-05-22 16:17:18.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/drivers/md/dm-ioctl.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/drivers/md/dm-ioctl.c linux-3.0.1-vs2.3.1-pre9/drivers/md/dm-ioctl.c +--- linux-3.0.1/drivers/md/dm-ioctl.c 2011-05-22 16:17:18.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/drivers/md/dm-ioctl.c 2011-06-10 22:11:24.000000000 +0200 @@ -16,6 +16,7 @@ #include #include @@ -3417,9 +3417,9 @@ diff -NurpP --minimal linux-3.0/drivers/md/dm-ioctl.c linux-3.0-vs2.3.1-pre8/dri return -EACCES; if (_IOC_TYPE(command) != DM_IOCTL) -diff -NurpP --minimal linux-3.0/drivers/md/dm.c linux-3.0-vs2.3.1-pre8/drivers/md/dm.c ---- linux-3.0/drivers/md/dm.c 2011-05-22 16:17:18.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/drivers/md/dm.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/drivers/md/dm.c linux-3.0.1-vs2.3.1-pre9/drivers/md/dm.c +--- linux-3.0.1/drivers/md/dm.c 2011-08-08 22:31:58.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/drivers/md/dm.c 2011-08-08 23:04:47.000000000 +0200 @@ -20,6 +20,7 @@ #include #include @@ -3428,7 +3428,7 @@ diff -NurpP --minimal linux-3.0/drivers/md/dm.c linux-3.0-vs2.3.1-pre8/drivers/m #include -@@ -119,6 +120,7 @@ struct mapped_device { +@@ -121,6 +122,7 @@ struct mapped_device { rwlock_t map_lock; atomic_t holders; atomic_t open_count; @@ -3436,7 +3436,7 @@ diff -NurpP --minimal linux-3.0/drivers/md/dm.c linux-3.0-vs2.3.1-pre8/drivers/m unsigned long flags; -@@ -326,6 +328,7 @@ int dm_deleting_md(struct mapped_device +@@ -334,6 +336,7 @@ int dm_deleting_md(struct mapped_device static int dm_blk_open(struct block_device *bdev, fmode_t mode) { struct mapped_device *md; @@ -3444,7 +3444,7 @@ diff -NurpP --minimal linux-3.0/drivers/md/dm.c linux-3.0-vs2.3.1-pre8/drivers/m spin_lock(&_minor_lock); -@@ -334,18 +337,19 @@ static int dm_blk_open(struct block_devi +@@ -342,18 +345,19 @@ static int dm_blk_open(struct block_devi goto out; if (test_bit(DMF_FREEING, &md->flags) || @@ -3470,7 +3470,7 @@ diff -NurpP --minimal linux-3.0/drivers/md/dm.c linux-3.0-vs2.3.1-pre8/drivers/m } static int dm_blk_close(struct gendisk *disk, fmode_t mode) -@@ -566,6 +570,14 @@ int dm_set_geometry(struct mapped_device +@@ -574,6 +578,14 @@ int dm_set_geometry(struct mapped_device return 0; } @@ -3485,7 +3485,7 @@ diff -NurpP --minimal linux-3.0/drivers/md/dm.c linux-3.0-vs2.3.1-pre8/drivers/m /*----------------------------------------------------------------- * CRUD START: * A more elegant soln is in the works that uses the queue -@@ -1841,6 +1853,7 @@ static struct mapped_device *alloc_dev(i +@@ -1847,6 +1859,7 @@ static struct mapped_device *alloc_dev(i INIT_LIST_HEAD(&md->uevent_list); spin_lock_init(&md->uevent_lock); @@ -3493,9 +3493,9 @@ diff -NurpP --minimal linux-3.0/drivers/md/dm.c linux-3.0-vs2.3.1-pre8/drivers/m md->queue = blk_alloc_queue(GFP_KERNEL); if (!md->queue) goto bad_queue; -diff -NurpP --minimal linux-3.0/drivers/md/dm.h linux-3.0-vs2.3.1-pre8/drivers/md/dm.h ---- linux-3.0/drivers/md/dm.h 2011-05-22 16:17:18.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/drivers/md/dm.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/drivers/md/dm.h linux-3.0.1-vs2.3.1-pre9/drivers/md/dm.h +--- linux-3.0.1/drivers/md/dm.h 2011-05-22 16:17:18.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/drivers/md/dm.h 2011-06-10 22:11:24.000000000 +0200 @@ -41,6 +41,8 @@ struct dm_dev_internal { struct dm_table; struct dm_md_mempools; @@ -3505,9 +3505,9 @@ diff -NurpP --minimal linux-3.0/drivers/md/dm.h linux-3.0-vs2.3.1-pre8/drivers/m /*----------------------------------------------------------------- * Internal table functions. *---------------------------------------------------------------*/ -diff -NurpP --minimal linux-3.0/drivers/net/tun.c linux-3.0-vs2.3.1-pre8/drivers/net/tun.c ---- linux-3.0/drivers/net/tun.c 2011-07-22 11:17:54.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/drivers/net/tun.c 2011-06-22 12:39:14.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/drivers/net/tun.c linux-3.0.1-vs2.3.1-pre9/drivers/net/tun.c +--- linux-3.0.1/drivers/net/tun.c 2011-07-22 11:17:54.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/drivers/net/tun.c 2011-06-22 12:39:14.000000000 +0200 @@ -64,6 +64,7 @@ #include #include @@ -3577,9 +3577,9 @@ diff -NurpP --minimal linux-3.0/drivers/net/tun.c linux-3.0-vs2.3.1-pre8/drivers case TUNSETLINK: /* Only allow setting the type when the interface is down */ if (tun->dev->flags & IFF_UP) { -diff -NurpP --minimal linux-3.0/drivers/tty/sysrq.c linux-3.0-vs2.3.1-pre8/drivers/tty/sysrq.c ---- linux-3.0/drivers/tty/sysrq.c 2011-05-22 16:17:44.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/drivers/tty/sysrq.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/drivers/tty/sysrq.c linux-3.0.1-vs2.3.1-pre9/drivers/tty/sysrq.c +--- linux-3.0.1/drivers/tty/sysrq.c 2011-05-22 16:17:44.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/drivers/tty/sysrq.c 2011-06-10 22:11:24.000000000 +0200 @@ -41,6 +41,7 @@ #include #include @@ -3631,9 +3631,9 @@ diff -NurpP --minimal linux-3.0/drivers/tty/sysrq.c linux-3.0-vs2.3.1-pre8/drive else retval = -1; return retval; -diff -NurpP --minimal linux-3.0/drivers/tty/tty_io.c linux-3.0-vs2.3.1-pre8/drivers/tty/tty_io.c ---- linux-3.0/drivers/tty/tty_io.c 2011-07-22 11:18:03.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/drivers/tty/tty_io.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/drivers/tty/tty_io.c linux-3.0.1-vs2.3.1-pre9/drivers/tty/tty_io.c +--- linux-3.0.1/drivers/tty/tty_io.c 2011-07-22 11:18:03.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/drivers/tty/tty_io.c 2011-06-10 22:11:24.000000000 +0200 @@ -104,6 +104,7 @@ #include @@ -3660,9 +3660,9 @@ diff -NurpP --minimal linux-3.0/drivers/tty/tty_io.c linux-3.0-vs2.3.1-pre8/driv if (pgrp_nr < 0) return -EINVAL; rcu_read_lock(); -diff -NurpP --minimal linux-3.0/fs/attr.c linux-3.0-vs2.3.1-pre8/fs/attr.c ---- linux-3.0/fs/attr.c 2011-07-22 11:18:05.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/attr.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/attr.c linux-3.0.1-vs2.3.1-pre9/fs/attr.c +--- linux-3.0.1/fs/attr.c 2011-07-22 11:18:05.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/attr.c 2011-06-10 22:11:24.000000000 +0200 @@ -13,6 +13,9 @@ #include #include @@ -3703,9 +3703,9 @@ diff -NurpP --minimal linux-3.0/fs/attr.c linux-3.0-vs2.3.1-pre8/fs/attr.c if (IS_IMMUTABLE(inode) || IS_APPEND(inode)) return -EPERM; } -diff -NurpP --minimal linux-3.0/fs/binfmt_aout.c linux-3.0-vs2.3.1-pre8/fs/binfmt_aout.c ---- linux-3.0/fs/binfmt_aout.c 2010-10-21 13:07:47.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/binfmt_aout.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/binfmt_aout.c linux-3.0.1-vs2.3.1-pre9/fs/binfmt_aout.c +--- linux-3.0.1/fs/binfmt_aout.c 2010-10-21 13:07:47.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/binfmt_aout.c 2011-06-10 22:11:24.000000000 +0200 @@ -25,6 +25,7 @@ #include #include @@ -3714,9 +3714,9 @@ diff -NurpP --minimal linux-3.0/fs/binfmt_aout.c linux-3.0-vs2.3.1-pre8/fs/binfm #include #include -diff -NurpP --minimal linux-3.0/fs/binfmt_elf.c linux-3.0-vs2.3.1-pre8/fs/binfmt_elf.c ---- linux-3.0/fs/binfmt_elf.c 2011-05-22 16:17:48.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/binfmt_elf.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/binfmt_elf.c linux-3.0.1-vs2.3.1-pre9/fs/binfmt_elf.c +--- linux-3.0.1/fs/binfmt_elf.c 2011-05-22 16:17:48.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/binfmt_elf.c 2011-06-10 22:11:24.000000000 +0200 @@ -32,6 +32,7 @@ #include #include @@ -3725,9 +3725,9 @@ diff -NurpP --minimal linux-3.0/fs/binfmt_elf.c linux-3.0-vs2.3.1-pre8/fs/binfmt #include #include #include -diff -NurpP --minimal linux-3.0/fs/binfmt_flat.c linux-3.0-vs2.3.1-pre8/fs/binfmt_flat.c ---- linux-3.0/fs/binfmt_flat.c 2011-07-22 11:18:05.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/binfmt_flat.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/binfmt_flat.c linux-3.0.1-vs2.3.1-pre9/fs/binfmt_flat.c +--- linux-3.0.1/fs/binfmt_flat.c 2011-07-22 11:18:05.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/binfmt_flat.c 2011-06-10 22:11:24.000000000 +0200 @@ -35,6 +35,7 @@ #include #include @@ -3736,9 +3736,9 @@ diff -NurpP --minimal linux-3.0/fs/binfmt_flat.c linux-3.0-vs2.3.1-pre8/fs/binfm #include #include -diff -NurpP --minimal linux-3.0/fs/binfmt_som.c linux-3.0-vs2.3.1-pre8/fs/binfmt_som.c ---- linux-3.0/fs/binfmt_som.c 2010-02-25 11:52:04.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/fs/binfmt_som.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/binfmt_som.c linux-3.0.1-vs2.3.1-pre9/fs/binfmt_som.c +--- linux-3.0.1/fs/binfmt_som.c 2010-02-25 11:52:04.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/fs/binfmt_som.c 2011-06-10 22:11:24.000000000 +0200 @@ -28,6 +28,7 @@ #include #include @@ -3747,9 +3747,9 @@ diff -NurpP --minimal linux-3.0/fs/binfmt_som.c linux-3.0-vs2.3.1-pre8/fs/binfmt #include #include -diff -NurpP --minimal linux-3.0/fs/block_dev.c linux-3.0-vs2.3.1-pre8/fs/block_dev.c ---- linux-3.0/fs/block_dev.c 2011-07-22 11:18:05.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/block_dev.c 2011-07-01 11:35:34.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/block_dev.c linux-3.0.1-vs2.3.1-pre9/fs/block_dev.c +--- linux-3.0.1/fs/block_dev.c 2011-07-22 11:18:05.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/block_dev.c 2011-07-01 11:35:34.000000000 +0200 @@ -25,6 +25,7 @@ #include #include @@ -3787,9 +3787,9 @@ diff -NurpP --minimal linux-3.0/fs/block_dev.c linux-3.0-vs2.3.1-pre8/fs/block_d if (bdev) { spin_lock(&bdev_lock); if (!inode->i_bdev) { -diff -NurpP --minimal linux-3.0/fs/btrfs/ctree.h linux-3.0-vs2.3.1-pre8/fs/btrfs/ctree.h ---- linux-3.0/fs/btrfs/ctree.h 2011-07-22 11:18:05.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/btrfs/ctree.h 2011-07-19 00:44:39.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/btrfs/ctree.h linux-3.0.1-vs2.3.1-pre9/fs/btrfs/ctree.h +--- linux-3.0.1/fs/btrfs/ctree.h 2011-07-22 11:18:05.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/btrfs/ctree.h 2011-07-19 00:44:39.000000000 +0200 @@ -600,11 +600,14 @@ struct btrfs_inode_item { /* modification sequence number for NFS */ __le64 sequence; @@ -3842,9 +3842,9 @@ diff -NurpP --minimal linux-3.0/fs/btrfs/ctree.h linux-3.0-vs2.3.1-pre8/fs/btrfs int btrfs_defrag_file(struct inode *inode, struct file *file, struct btrfs_ioctl_defrag_range_args *range, u64 newer_than, unsigned long max_pages); -diff -NurpP --minimal linux-3.0/fs/btrfs/disk-io.c linux-3.0-vs2.3.1-pre8/fs/btrfs/disk-io.c ---- linux-3.0/fs/btrfs/disk-io.c 2011-07-22 11:18:05.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/btrfs/disk-io.c 2011-06-22 12:39:15.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/btrfs/disk-io.c linux-3.0.1-vs2.3.1-pre9/fs/btrfs/disk-io.c +--- linux-3.0.1/fs/btrfs/disk-io.c 2011-07-22 11:18:05.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/btrfs/disk-io.c 2011-06-22 12:39:15.000000000 +0200 @@ -1765,6 +1765,9 @@ struct btrfs_root *open_ctree(struct sup goto fail_alloc; } @@ -3855,9 +3855,9 @@ diff -NurpP --minimal linux-3.0/fs/btrfs/disk-io.c linux-3.0-vs2.3.1-pre8/fs/btr features = btrfs_super_incompat_flags(disk_super) & ~BTRFS_FEATURE_INCOMPAT_SUPP; if (features) { -diff -NurpP --minimal linux-3.0/fs/btrfs/inode.c linux-3.0-vs2.3.1-pre8/fs/btrfs/inode.c ---- linux-3.0/fs/btrfs/inode.c 2011-07-22 11:18:05.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/btrfs/inode.c 2011-07-19 00:44:39.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/btrfs/inode.c linux-3.0.1-vs2.3.1-pre9/fs/btrfs/inode.c +--- linux-3.0.1/fs/btrfs/inode.c 2011-07-22 11:18:05.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/btrfs/inode.c 2011-07-19 00:44:39.000000000 +0200 @@ -38,6 +38,7 @@ #include #include @@ -3931,9 +3931,9 @@ diff -NurpP --minimal linux-3.0/fs/btrfs/inode.c linux-3.0-vs2.3.1-pre8/fs/btrfs }; static const struct inode_operations btrfs_special_inode_operations = { .getattr = btrfs_getattr, -diff -NurpP --minimal linux-3.0/fs/btrfs/ioctl.c linux-3.0-vs2.3.1-pre8/fs/btrfs/ioctl.c ---- linux-3.0/fs/btrfs/ioctl.c 2011-07-22 11:18:05.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/btrfs/ioctl.c 2011-06-22 12:39:15.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/btrfs/ioctl.c linux-3.0.1-vs2.3.1-pre9/fs/btrfs/ioctl.c +--- linux-3.0.1/fs/btrfs/ioctl.c 2011-07-22 11:18:05.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/btrfs/ioctl.c 2011-06-22 12:39:15.000000000 +0200 @@ -70,10 +70,13 @@ static unsigned int btrfs_flags_to_ioctl { unsigned int iflags = 0; @@ -4107,9 +4107,9 @@ diff -NurpP --minimal linux-3.0/fs/btrfs/ioctl.c linux-3.0-vs2.3.1-pre8/fs/btrfs if (flags & FS_APPEND_FL) ip->flags |= BTRFS_INODE_APPEND; else -diff -NurpP --minimal linux-3.0/fs/btrfs/super.c linux-3.0-vs2.3.1-pre8/fs/btrfs/super.c ---- linux-3.0/fs/btrfs/super.c 2011-07-22 11:18:05.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/btrfs/super.c 2011-07-19 00:44:39.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/btrfs/super.c linux-3.0.1-vs2.3.1-pre9/fs/btrfs/super.c +--- linux-3.0.1/fs/btrfs/super.c 2011-07-22 11:18:05.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/btrfs/super.c 2011-07-19 00:44:39.000000000 +0200 @@ -162,7 +162,7 @@ enum { Opt_notreelog, Opt_ratio, Opt_flushoncommit, Opt_discard, Opt_space_cache, Opt_clear_cache, Opt_user_subvol_rm_allowed, @@ -4165,9 +4165,9 @@ diff -NurpP --minimal linux-3.0/fs/btrfs/super.c linux-3.0-vs2.3.1-pre8/fs/btrfs if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY)) return 0; -diff -NurpP --minimal linux-3.0/fs/char_dev.c linux-3.0-vs2.3.1-pre8/fs/char_dev.c ---- linux-3.0/fs/char_dev.c 2011-03-15 18:07:31.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/fs/char_dev.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/char_dev.c linux-3.0.1-vs2.3.1-pre9/fs/char_dev.c +--- linux-3.0.1/fs/char_dev.c 2011-03-15 18:07:31.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/fs/char_dev.c 2011-06-10 22:11:24.000000000 +0200 @@ -21,6 +21,8 @@ #include #include @@ -4200,9 +4200,9 @@ diff -NurpP --minimal linux-3.0/fs/char_dev.c linux-3.0-vs2.3.1-pre8/fs/char_dev if (!kobj) return -ENXIO; new = container_of(kobj, struct cdev, kobj); -diff -NurpP --minimal linux-3.0/fs/dcache.c linux-3.0-vs2.3.1-pre8/fs/dcache.c ---- linux-3.0/fs/dcache.c 2011-07-22 11:18:05.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/dcache.c 2011-07-22 11:20:39.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/dcache.c linux-3.0.1-vs2.3.1-pre9/fs/dcache.c +--- linux-3.0.1/fs/dcache.c 2011-07-22 11:18:05.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/dcache.c 2011-07-22 11:20:39.000000000 +0200 @@ -36,6 +36,7 @@ #include #include @@ -4254,9 +4254,9 @@ diff -NurpP --minimal linux-3.0/fs/dcache.c linux-3.0-vs2.3.1-pre8/fs/dcache.c found = dentry; spin_unlock(&dentry->d_lock); break; -diff -NurpP --minimal linux-3.0/fs/devpts/inode.c linux-3.0-vs2.3.1-pre8/fs/devpts/inode.c ---- linux-3.0/fs/devpts/inode.c 2011-05-22 16:17:50.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/devpts/inode.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/devpts/inode.c linux-3.0.1-vs2.3.1-pre9/fs/devpts/inode.c +--- linux-3.0.1/fs/devpts/inode.c 2011-05-22 16:17:50.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/devpts/inode.c 2011-06-10 22:11:24.000000000 +0200 @@ -25,6 +25,7 @@ #include #include @@ -4348,9 +4348,9 @@ diff -NurpP --minimal linux-3.0/fs/devpts/inode.c linux-3.0-vs2.3.1-pre8/fs/devp inode->i_private = tty; tty->driver_data = inode; -diff -NurpP --minimal linux-3.0/fs/ext2/balloc.c linux-3.0-vs2.3.1-pre8/fs/ext2/balloc.c ---- linux-3.0/fs/ext2/balloc.c 2011-05-22 16:17:51.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/ext2/balloc.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/ext2/balloc.c linux-3.0.1-vs2.3.1-pre9/fs/ext2/balloc.c +--- linux-3.0.1/fs/ext2/balloc.c 2011-05-22 16:17:51.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/ext2/balloc.c 2011-06-10 22:11:24.000000000 +0200 @@ -701,7 +701,6 @@ ext2_try_to_allocate(struct super_block start = 0; end = EXT2_BLOCKS_PER_GROUP(sb); @@ -4359,9 +4359,9 @@ diff -NurpP --minimal linux-3.0/fs/ext2/balloc.c linux-3.0-vs2.3.1-pre8/fs/ext2/ BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb)); repeat: -diff -NurpP --minimal linux-3.0/fs/ext2/ext2.h linux-3.0-vs2.3.1-pre8/fs/ext2/ext2.h ---- linux-3.0/fs/ext2/ext2.h 2011-05-22 16:17:51.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/ext2/ext2.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/ext2/ext2.h linux-3.0.1-vs2.3.1-pre9/fs/ext2/ext2.h +--- linux-3.0.1/fs/ext2/ext2.h 2011-05-22 16:17:51.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/ext2/ext2.h 2011-06-10 22:11:24.000000000 +0200 @@ -126,6 +126,7 @@ extern void ext2_set_inode_flags(struct extern void ext2_get_inode_flags(struct ext2_inode_info *); extern int ext2_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, @@ -4370,18 +4370,18 @@ diff -NurpP --minimal linux-3.0/fs/ext2/ext2.h linux-3.0-vs2.3.1-pre8/fs/ext2/ex /* ioctl.c */ extern long ext2_ioctl(struct file *, unsigned int, unsigned long); -diff -NurpP --minimal linux-3.0/fs/ext2/file.c linux-3.0-vs2.3.1-pre8/fs/ext2/file.c ---- linux-3.0/fs/ext2/file.c 2010-08-02 16:52:48.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/ext2/file.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/ext2/file.c linux-3.0.1-vs2.3.1-pre9/fs/ext2/file.c +--- linux-3.0.1/fs/ext2/file.c 2010-08-02 16:52:48.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/ext2/file.c 2011-06-10 22:11:24.000000000 +0200 @@ -104,4 +104,5 @@ const struct inode_operations ext2_file_ .setattr = ext2_setattr, .check_acl = ext2_check_acl, .fiemap = ext2_fiemap, + .sync_flags = ext2_sync_flags, }; -diff -NurpP --minimal linux-3.0/fs/ext2/ialloc.c linux-3.0-vs2.3.1-pre8/fs/ext2/ialloc.c ---- linux-3.0/fs/ext2/ialloc.c 2011-05-22 16:17:51.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/ext2/ialloc.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/ext2/ialloc.c linux-3.0.1-vs2.3.1-pre9/fs/ext2/ialloc.c +--- linux-3.0.1/fs/ext2/ialloc.c 2011-05-22 16:17:51.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/ext2/ialloc.c 2011-06-10 22:11:24.000000000 +0200 @@ -17,6 +17,7 @@ #include #include @@ -4398,9 +4398,9 @@ diff -NurpP --minimal linux-3.0/fs/ext2/ialloc.c linux-3.0-vs2.3.1-pre8/fs/ext2/ } else inode_init_owner(inode, dir, mode); -diff -NurpP --minimal linux-3.0/fs/ext2/inode.c linux-3.0-vs2.3.1-pre8/fs/ext2/inode.c ---- linux-3.0/fs/ext2/inode.c 2011-05-22 16:17:51.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/ext2/inode.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/ext2/inode.c linux-3.0.1-vs2.3.1-pre9/fs/ext2/inode.c +--- linux-3.0.1/fs/ext2/inode.c 2011-05-22 16:17:51.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/ext2/inode.c 2011-06-10 22:11:24.000000000 +0200 @@ -32,6 +32,7 @@ #include #include @@ -4549,9 +4549,9 @@ diff -NurpP --minimal linux-3.0/fs/ext2/inode.c linux-3.0-vs2.3.1-pre8/fs/ext2/i error = dquot_transfer(inode, iattr); if (error) return error; -diff -NurpP --minimal linux-3.0/fs/ext2/ioctl.c linux-3.0-vs2.3.1-pre8/fs/ext2/ioctl.c ---- linux-3.0/fs/ext2/ioctl.c 2011-05-22 16:17:51.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/ext2/ioctl.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/ext2/ioctl.c linux-3.0.1-vs2.3.1-pre9/fs/ext2/ioctl.c +--- linux-3.0.1/fs/ext2/ioctl.c 2011-05-22 16:17:51.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/ext2/ioctl.c 2011-06-10 22:11:24.000000000 +0200 @@ -17,6 +17,16 @@ #include @@ -4601,9 +4601,9 @@ diff -NurpP --minimal linux-3.0/fs/ext2/ioctl.c linux-3.0-vs2.3.1-pre8/fs/ext2/i flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE; ei->i_flags = flags; mutex_unlock(&inode->i_mutex); -diff -NurpP --minimal linux-3.0/fs/ext2/namei.c linux-3.0-vs2.3.1-pre8/fs/ext2/namei.c ---- linux-3.0/fs/ext2/namei.c 2011-05-22 16:17:51.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/ext2/namei.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/ext2/namei.c linux-3.0.1-vs2.3.1-pre9/fs/ext2/namei.c +--- linux-3.0.1/fs/ext2/namei.c 2011-05-22 16:17:51.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/ext2/namei.c 2011-06-10 22:11:24.000000000 +0200 @@ -32,6 +32,7 @@ #include @@ -4628,9 +4628,9 @@ diff -NurpP --minimal linux-3.0/fs/ext2/namei.c linux-3.0-vs2.3.1-pre8/fs/ext2/n }; const struct inode_operations ext2_special_inode_operations = { -diff -NurpP --minimal linux-3.0/fs/ext2/super.c linux-3.0-vs2.3.1-pre8/fs/ext2/super.c ---- linux-3.0/fs/ext2/super.c 2011-07-22 11:18:05.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/ext2/super.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/ext2/super.c linux-3.0.1-vs2.3.1-pre9/fs/ext2/super.c +--- linux-3.0.1/fs/ext2/super.c 2011-07-22 11:18:05.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/ext2/super.c 2011-06-10 22:11:24.000000000 +0200 @@ -394,7 +394,8 @@ enum { Opt_err_ro, Opt_nouid32, Opt_nocheck, Opt_debug, Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr, @@ -4696,9 +4696,9 @@ diff -NurpP --minimal linux-3.0/fs/ext2/super.c linux-3.0-vs2.3.1-pre8/fs/ext2/s sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | ((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0); -diff -NurpP --minimal linux-3.0/fs/ext3/file.c linux-3.0-vs2.3.1-pre8/fs/ext3/file.c ---- linux-3.0/fs/ext3/file.c 2010-07-07 18:31:51.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/ext3/file.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/ext3/file.c linux-3.0.1-vs2.3.1-pre9/fs/ext3/file.c +--- linux-3.0.1/fs/ext3/file.c 2010-07-07 18:31:51.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/ext3/file.c 2011-06-10 22:11:24.000000000 +0200 @@ -81,5 +81,6 @@ const struct inode_operations ext3_file_ #endif .check_acl = ext3_check_acl, @@ -4706,9 +4706,9 @@ diff -NurpP --minimal linux-3.0/fs/ext3/file.c linux-3.0-vs2.3.1-pre8/fs/ext3/fi + .sync_flags = ext3_sync_flags, }; -diff -NurpP --minimal linux-3.0/fs/ext3/ialloc.c linux-3.0-vs2.3.1-pre8/fs/ext3/ialloc.c ---- linux-3.0/fs/ext3/ialloc.c 2011-05-22 16:17:52.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/ext3/ialloc.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/ext3/ialloc.c linux-3.0.1-vs2.3.1-pre9/fs/ext3/ialloc.c +--- linux-3.0.1/fs/ext3/ialloc.c 2011-05-22 16:17:52.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/ext3/ialloc.c 2011-06-10 22:11:24.000000000 +0200 @@ -23,6 +23,7 @@ #include #include @@ -4725,9 +4725,9 @@ diff -NurpP --minimal linux-3.0/fs/ext3/ialloc.c linux-3.0-vs2.3.1-pre8/fs/ext3/ } else inode_init_owner(inode, dir, mode); -diff -NurpP --minimal linux-3.0/fs/ext3/inode.c linux-3.0-vs2.3.1-pre8/fs/ext3/inode.c ---- linux-3.0/fs/ext3/inode.c 2011-07-22 11:18:05.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/ext3/inode.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/ext3/inode.c linux-3.0.1-vs2.3.1-pre9/fs/ext3/inode.c +--- linux-3.0.1/fs/ext3/inode.c 2011-07-22 11:18:05.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/ext3/inode.c 2011-06-10 22:11:24.000000000 +0200 @@ -38,6 +38,7 @@ #include #include @@ -4911,9 +4911,9 @@ diff -NurpP --minimal linux-3.0/fs/ext3/inode.c linux-3.0-vs2.3.1-pre8/fs/ext3/i error = ext3_mark_inode_dirty(handle, inode); ext3_journal_stop(handle); } -diff -NurpP --minimal linux-3.0/fs/ext3/ioctl.c linux-3.0-vs2.3.1-pre8/fs/ext3/ioctl.c ---- linux-3.0/fs/ext3/ioctl.c 2011-05-22 16:17:52.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/ext3/ioctl.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/ext3/ioctl.c linux-3.0.1-vs2.3.1-pre9/fs/ext3/ioctl.c +--- linux-3.0.1/fs/ext3/ioctl.c 2011-05-22 16:17:52.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/ext3/ioctl.c 2011-06-10 22:11:24.000000000 +0200 @@ -8,6 +8,7 @@ */ @@ -4989,9 +4989,9 @@ diff -NurpP --minimal linux-3.0/fs/ext3/ioctl.c linux-3.0-vs2.3.1-pre8/fs/ext3/i flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE; ei->i_flags = flags; -diff -NurpP --minimal linux-3.0/fs/ext3/namei.c linux-3.0-vs2.3.1-pre8/fs/ext3/namei.c ---- linux-3.0/fs/ext3/namei.c 2011-07-22 11:18:05.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/ext3/namei.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/ext3/namei.c linux-3.0.1-vs2.3.1-pre9/fs/ext3/namei.c +--- linux-3.0.1/fs/ext3/namei.c 2011-07-22 11:18:05.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/ext3/namei.c 2011-06-10 22:11:24.000000000 +0200 @@ -36,6 +36,7 @@ #include #include @@ -5016,9 +5016,9 @@ diff -NurpP --minimal linux-3.0/fs/ext3/namei.c linux-3.0-vs2.3.1-pre8/fs/ext3/n }; const struct inode_operations ext3_special_inode_operations = { -diff -NurpP --minimal linux-3.0/fs/ext3/super.c linux-3.0-vs2.3.1-pre8/fs/ext3/super.c ---- linux-3.0/fs/ext3/super.c 2011-07-22 11:18:05.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/ext3/super.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/ext3/super.c linux-3.0.1-vs2.3.1-pre9/fs/ext3/super.c +--- linux-3.0.1/fs/ext3/super.c 2011-07-22 11:18:05.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/ext3/super.c 2011-06-10 22:11:24.000000000 +0200 @@ -821,7 +821,8 @@ enum { Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota, Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota, @@ -5085,9 +5085,9 @@ diff -NurpP --minimal linux-3.0/fs/ext3/super.c linux-3.0-vs2.3.1-pre8/fs/ext3/s sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); -diff -NurpP --minimal linux-3.0/fs/ext4/ext4.h linux-3.0-vs2.3.1-pre8/fs/ext4/ext4.h ---- linux-3.0/fs/ext4/ext4.h 2011-07-22 11:18:05.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/ext4/ext4.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/ext4/ext4.h linux-3.0.1-vs2.3.1-pre9/fs/ext4/ext4.h +--- linux-3.0.1/fs/ext4/ext4.h 2011-08-08 22:31:58.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/ext4/ext4.h 2011-08-08 23:04:47.000000000 +0200 @@ -350,8 +350,12 @@ struct flex_groups { #define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */ #define EXT4_EA_INODE_FL 0x00200000 /* Inode used for large EA */ @@ -5101,7 +5101,7 @@ diff -NurpP --minimal linux-3.0/fs/ext4/ext4.h linux-3.0-vs2.3.1-pre8/fs/ext4/ex #define EXT4_FL_USER_VISIBLE 0x004BDFFF /* User visible flags */ #define EXT4_FL_USER_MODIFIABLE 0x004B80FF /* User modifiable flags */ -@@ -608,7 +612,8 @@ struct ext4_inode { +@@ -609,7 +613,8 @@ struct ext4_inode { __le16 l_i_file_acl_high; __le16 l_i_uid_high; /* these 2 fields */ __le16 l_i_gid_high; /* were reserved2[0] */ @@ -5111,7 +5111,7 @@ diff -NurpP --minimal linux-3.0/fs/ext4/ext4.h linux-3.0-vs2.3.1-pre8/fs/ext4/ex } linux2; struct { __le16 h_i_reserved1; /* Obsoleted fragment number/size which are removed in ext4 */ -@@ -726,6 +731,7 @@ do { \ +@@ -727,6 +732,7 @@ do { \ #define i_gid_low i_gid #define i_uid_high osd2.linux2.l_i_uid_high #define i_gid_high osd2.linux2.l_i_gid_high @@ -5119,7 +5119,7 @@ diff -NurpP --minimal linux-3.0/fs/ext4/ext4.h linux-3.0-vs2.3.1-pre8/fs/ext4/ex #define i_reserved2 osd2.linux2.l_i_reserved2 #elif defined(__GNU__) -@@ -902,6 +908,7 @@ struct ext4_inode_info { +@@ -903,6 +909,7 @@ struct ext4_inode_info { #define EXT4_MOUNT_POSIX_ACL 0x08000 /* POSIX Access Control Lists */ #define EXT4_MOUNT_NO_AUTO_DA_ALLOC 0x10000 /* No auto delalloc mapping */ #define EXT4_MOUNT_BARRIER 0x20000 /* Use block barriers */ @@ -5127,7 +5127,7 @@ diff -NurpP --minimal linux-3.0/fs/ext4/ext4.h linux-3.0-vs2.3.1-pre8/fs/ext4/ex #define EXT4_MOUNT_QUOTA 0x80000 /* Some quota option set */ #define EXT4_MOUNT_USRQUOTA 0x100000 /* "old" user quota */ #define EXT4_MOUNT_GRPQUOTA 0x200000 /* "old" group quota */ -@@ -2172,6 +2179,7 @@ extern int ext4_map_blocks(handle_t *han +@@ -2173,6 +2180,7 @@ extern int ext4_map_blocks(handle_t *han struct ext4_map_blocks *map, int flags); extern int ext4_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, __u64 start, __u64 len); @@ -5135,9 +5135,9 @@ diff -NurpP --minimal linux-3.0/fs/ext4/ext4.h linux-3.0-vs2.3.1-pre8/fs/ext4/ex /* move_extent.c */ extern int ext4_move_extents(struct file *o_filp, struct file *d_filp, __u64 start_orig, __u64 start_donor, -diff -NurpP --minimal linux-3.0/fs/ext4/file.c linux-3.0-vs2.3.1-pre8/fs/ext4/file.c ---- linux-3.0/fs/ext4/file.c 2011-07-22 11:18:05.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/ext4/file.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/ext4/file.c linux-3.0.1-vs2.3.1-pre9/fs/ext4/file.c +--- linux-3.0.1/fs/ext4/file.c 2011-07-22 11:18:05.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/ext4/file.c 2011-06-10 22:11:24.000000000 +0200 @@ -282,5 +282,6 @@ const struct inode_operations ext4_file_ #endif .check_acl = ext4_check_acl, @@ -5145,9 +5145,9 @@ diff -NurpP --minimal linux-3.0/fs/ext4/file.c linux-3.0-vs2.3.1-pre8/fs/ext4/fi + .sync_flags = ext4_sync_flags, }; -diff -NurpP --minimal linux-3.0/fs/ext4/ialloc.c linux-3.0-vs2.3.1-pre8/fs/ext4/ialloc.c ---- linux-3.0/fs/ext4/ialloc.c 2011-05-22 16:17:52.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/ext4/ialloc.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/ext4/ialloc.c linux-3.0.1-vs2.3.1-pre9/fs/ext4/ialloc.c +--- linux-3.0.1/fs/ext4/ialloc.c 2011-05-22 16:17:52.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/ext4/ialloc.c 2011-06-10 22:11:24.000000000 +0200 @@ -22,6 +22,7 @@ #include #include @@ -5164,9 +5164,9 @@ diff -NurpP --minimal linux-3.0/fs/ext4/ialloc.c linux-3.0-vs2.3.1-pre8/fs/ext4/ } else inode_init_owner(inode, dir, mode); -diff -NurpP --minimal linux-3.0/fs/ext4/inode.c linux-3.0-vs2.3.1-pre8/fs/ext4/inode.c ---- linux-3.0/fs/ext4/inode.c 2011-07-22 11:18:05.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/ext4/inode.c 2011-07-01 11:35:34.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/ext4/inode.c linux-3.0.1-vs2.3.1-pre9/fs/ext4/inode.c +--- linux-3.0.1/fs/ext4/inode.c 2011-07-22 11:18:05.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/ext4/inode.c 2011-07-01 11:35:34.000000000 +0200 @@ -42,6 +42,7 @@ #include #include @@ -5344,9 +5344,9 @@ diff -NurpP --minimal linux-3.0/fs/ext4/inode.c linux-3.0-vs2.3.1-pre8/fs/ext4/i error = ext4_mark_inode_dirty(handle, inode); ext4_journal_stop(handle); } -diff -NurpP --minimal linux-3.0/fs/ext4/ioctl.c linux-3.0-vs2.3.1-pre8/fs/ext4/ioctl.c ---- linux-3.0/fs/ext4/ioctl.c 2011-05-22 16:17:52.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/ext4/ioctl.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/ext4/ioctl.c linux-3.0.1-vs2.3.1-pre9/fs/ext4/ioctl.c +--- linux-3.0.1/fs/ext4/ioctl.c 2011-05-22 16:17:52.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/ext4/ioctl.c 2011-06-10 22:11:24.000000000 +0200 @@ -14,10 +14,39 @@ #include #include @@ -5410,9 +5410,9 @@ diff -NurpP --minimal linux-3.0/fs/ext4/ioctl.c linux-3.0-vs2.3.1-pre8/fs/ext4/i if (!capable(CAP_LINUX_IMMUTABLE)) goto flags_out; } -diff -NurpP --minimal linux-3.0/fs/ext4/namei.c linux-3.0-vs2.3.1-pre8/fs/ext4/namei.c ---- linux-3.0/fs/ext4/namei.c 2011-07-22 11:18:05.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/ext4/namei.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/ext4/namei.c linux-3.0.1-vs2.3.1-pre9/fs/ext4/namei.c +--- linux-3.0.1/fs/ext4/namei.c 2011-07-22 11:18:05.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/ext4/namei.c 2011-06-10 22:11:24.000000000 +0200 @@ -34,6 +34,7 @@ #include #include @@ -5437,9 +5437,9 @@ diff -NurpP --minimal linux-3.0/fs/ext4/namei.c linux-3.0-vs2.3.1-pre8/fs/ext4/n }; const struct inode_operations ext4_special_inode_operations = { -diff -NurpP --minimal linux-3.0/fs/ext4/super.c linux-3.0-vs2.3.1-pre8/fs/ext4/super.c ---- linux-3.0/fs/ext4/super.c 2011-07-22 11:18:05.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/ext4/super.c 2011-07-01 11:35:34.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/ext4/super.c linux-3.0.1-vs2.3.1-pre9/fs/ext4/super.c +--- linux-3.0.1/fs/ext4/super.c 2011-07-22 11:18:05.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/ext4/super.c 2011-07-01 11:35:34.000000000 +0200 @@ -1294,6 +1294,7 @@ enum { Opt_dioread_nolock, Opt_dioread_lock, Opt_discard, Opt_nodiscard, @@ -5504,9 +5504,9 @@ diff -NurpP --minimal linux-3.0/fs/ext4/super.c linux-3.0-vs2.3.1-pre8/fs/ext4/s sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); -diff -NurpP --minimal linux-3.0/fs/fcntl.c linux-3.0-vs2.3.1-pre8/fs/fcntl.c ---- linux-3.0/fs/fcntl.c 2011-05-22 16:17:52.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/fcntl.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/fcntl.c linux-3.0.1-vs2.3.1-pre9/fs/fcntl.c +--- linux-3.0.1/fs/fcntl.c 2011-05-22 16:17:52.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/fcntl.c 2011-06-10 22:11:24.000000000 +0200 @@ -20,6 +20,7 @@ #include #include @@ -5533,9 +5533,9 @@ diff -NurpP --minimal linux-3.0/fs/fcntl.c linux-3.0-vs2.3.1-pre8/fs/fcntl.c if (unlikely(filp->f_mode & FMODE_PATH)) { if (!check_fcntl_cmd(cmd)) { -diff -NurpP --minimal linux-3.0/fs/file.c linux-3.0-vs2.3.1-pre8/fs/file.c ---- linux-3.0/fs/file.c 2011-05-22 16:17:52.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/file.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/file.c linux-3.0.1-vs2.3.1-pre9/fs/file.c +--- linux-3.0.1/fs/file.c 2011-05-22 16:17:52.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/file.c 2011-06-10 22:11:24.000000000 +0200 @@ -21,6 +21,7 @@ #include #include @@ -5561,9 +5561,9 @@ diff -NurpP --minimal linux-3.0/fs/file.c linux-3.0-vs2.3.1-pre8/fs/file.c #if 1 /* Sanity check */ if (rcu_dereference_raw(fdt->fd[fd]) != NULL) { -diff -NurpP --minimal linux-3.0/fs/file_table.c linux-3.0-vs2.3.1-pre8/fs/file_table.c ---- linux-3.0/fs/file_table.c 2011-05-22 16:17:52.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/file_table.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/file_table.c linux-3.0.1-vs2.3.1-pre9/fs/file_table.c +--- linux-3.0.1/fs/file_table.c 2011-05-22 16:17:52.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/file_table.c 2011-06-10 22:11:24.000000000 +0200 @@ -24,6 +24,8 @@ #include #include @@ -5600,9 +5600,9 @@ diff -NurpP --minimal linux-3.0/fs/file_table.c linux-3.0-vs2.3.1-pre8/fs/file_t file_sb_list_del(file); file_free(file); } -diff -NurpP --minimal linux-3.0/fs/fs_struct.c linux-3.0-vs2.3.1-pre8/fs/fs_struct.c ---- linux-3.0/fs/fs_struct.c 2011-03-15 18:07:31.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/fs/fs_struct.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/fs_struct.c linux-3.0.1-vs2.3.1-pre9/fs/fs_struct.c +--- linux-3.0.1/fs/fs_struct.c 2011-03-15 18:07:31.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/fs/fs_struct.c 2011-06-10 22:11:24.000000000 +0200 @@ -4,6 +4,7 @@ #include #include @@ -5627,9 +5627,9 @@ diff -NurpP --minimal linux-3.0/fs/fs_struct.c linux-3.0-vs2.3.1-pre8/fs/fs_stru } return fs; } -diff -NurpP --minimal linux-3.0/fs/gfs2/file.c linux-3.0-vs2.3.1-pre8/fs/gfs2/file.c ---- linux-3.0/fs/gfs2/file.c 2011-07-22 11:18:05.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/gfs2/file.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/gfs2/file.c linux-3.0.1-vs2.3.1-pre9/fs/gfs2/file.c +--- linux-3.0.1/fs/gfs2/file.c 2011-07-22 11:18:05.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/gfs2/file.c 2011-06-10 22:11:24.000000000 +0200 @@ -134,6 +134,9 @@ static const u32 fsflags_to_gfs2[32] = { [7] = GFS2_DIF_NOATIME, [12] = GFS2_DIF_EXHASH, @@ -5750,9 +5750,9 @@ diff -NurpP --minimal linux-3.0/fs/gfs2/file.c linux-3.0-vs2.3.1-pre8/fs/gfs2/fi static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { switch(cmd) { -diff -NurpP --minimal linux-3.0/fs/gfs2/inode.h linux-3.0-vs2.3.1-pre8/fs/gfs2/inode.h ---- linux-3.0/fs/gfs2/inode.h 2011-07-22 11:18:05.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/gfs2/inode.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/gfs2/inode.h linux-3.0.1-vs2.3.1-pre9/fs/gfs2/inode.h +--- linux-3.0.1/fs/gfs2/inode.h 2011-07-22 11:18:05.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/gfs2/inode.h 2011-06-10 22:11:24.000000000 +0200 @@ -120,6 +120,7 @@ extern const struct file_operations gfs2 extern const struct file_operations gfs2_dir_fops_nolock; @@ -5761,9 +5761,9 @@ diff -NurpP --minimal linux-3.0/fs/gfs2/inode.h linux-3.0-vs2.3.1-pre8/fs/gfs2/i #ifdef CONFIG_GFS2_FS_LOCKING_DLM extern const struct file_operations gfs2_file_fops; -diff -NurpP --minimal linux-3.0/fs/inode.c linux-3.0-vs2.3.1-pre8/fs/inode.c ---- linux-3.0/fs/inode.c 2011-07-22 11:18:05.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/inode.c 2011-07-01 11:35:34.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/inode.c linux-3.0.1-vs2.3.1-pre9/fs/inode.c +--- linux-3.0.1/fs/inode.c 2011-07-22 11:18:05.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/inode.c 2011-07-01 11:35:34.000000000 +0200 @@ -26,6 +26,7 @@ #include #include @@ -5819,9 +5819,9 @@ diff -NurpP --minimal linux-3.0/fs/inode.c linux-3.0-vs2.3.1-pre8/fs/inode.c } EXPORT_SYMBOL(inode_init_owner); -diff -NurpP --minimal linux-3.0/fs/ioctl.c linux-3.0-vs2.3.1-pre8/fs/ioctl.c ---- linux-3.0/fs/ioctl.c 2011-05-22 16:17:52.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/ioctl.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/ioctl.c linux-3.0.1-vs2.3.1-pre9/fs/ioctl.c +--- linux-3.0.1/fs/ioctl.c 2011-05-22 16:17:52.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/ioctl.c 2011-06-10 22:11:24.000000000 +0200 @@ -15,6 +15,9 @@ #include #include @@ -5832,9 +5832,9 @@ diff -NurpP --minimal linux-3.0/fs/ioctl.c linux-3.0-vs2.3.1-pre8/fs/ioctl.c #include -diff -NurpP --minimal linux-3.0/fs/ioprio.c linux-3.0-vs2.3.1-pre8/fs/ioprio.c ---- linux-3.0/fs/ioprio.c 2011-01-05 21:50:24.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/fs/ioprio.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/ioprio.c linux-3.0.1-vs2.3.1-pre9/fs/ioprio.c +--- linux-3.0.1/fs/ioprio.c 2011-01-05 21:50:24.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/fs/ioprio.c 2011-06-10 22:11:24.000000000 +0200 @@ -27,6 +27,7 @@ #include #include @@ -5861,9 +5861,9 @@ diff -NurpP --minimal linux-3.0/fs/ioprio.c linux-3.0-vs2.3.1-pre8/fs/ioprio.c tmpio = get_task_ioprio(p); if (tmpio < 0) continue; -diff -NurpP --minimal linux-3.0/fs/jfs/file.c linux-3.0-vs2.3.1-pre8/fs/jfs/file.c ---- linux-3.0/fs/jfs/file.c 2011-07-22 11:18:05.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/jfs/file.c 2011-07-01 11:35:34.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/jfs/file.c linux-3.0.1-vs2.3.1-pre9/fs/jfs/file.c +--- linux-3.0.1/fs/jfs/file.c 2011-07-22 11:18:05.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/jfs/file.c 2011-07-01 11:35:34.000000000 +0200 @@ -102,7 +102,8 @@ int jfs_setattr(struct dentry *dentry, s if (is_quota_modification(inode, iattr)) dquot_initialize(inode); @@ -5882,9 +5882,9 @@ diff -NurpP --minimal linux-3.0/fs/jfs/file.c linux-3.0-vs2.3.1-pre8/fs/jfs/file }; const struct file_operations jfs_file_operations = { -diff -NurpP --minimal linux-3.0/fs/jfs/ioctl.c linux-3.0-vs2.3.1-pre8/fs/jfs/ioctl.c ---- linux-3.0/fs/jfs/ioctl.c 2011-05-22 16:17:52.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/jfs/ioctl.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/jfs/ioctl.c linux-3.0.1-vs2.3.1-pre9/fs/jfs/ioctl.c +--- linux-3.0.1/fs/jfs/ioctl.c 2011-05-22 16:17:52.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/jfs/ioctl.c 2011-06-10 22:11:24.000000000 +0200 @@ -11,6 +11,7 @@ #include #include @@ -5942,9 +5942,9 @@ diff -NurpP --minimal linux-3.0/fs/jfs/ioctl.c linux-3.0-vs2.3.1-pre8/fs/jfs/ioc flags |= oldflags & ~JFS_FL_USER_MODIFIABLE; jfs_inode->mode2 = flags; -diff -NurpP --minimal linux-3.0/fs/jfs/jfs_dinode.h linux-3.0-vs2.3.1-pre8/fs/jfs/jfs_dinode.h ---- linux-3.0/fs/jfs/jfs_dinode.h 2008-12-25 00:26:37.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/fs/jfs/jfs_dinode.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/jfs/jfs_dinode.h linux-3.0.1-vs2.3.1-pre9/fs/jfs/jfs_dinode.h +--- linux-3.0.1/fs/jfs/jfs_dinode.h 2008-12-25 00:26:37.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/fs/jfs/jfs_dinode.h 2011-06-10 22:11:24.000000000 +0200 @@ -161,9 +161,13 @@ struct dinode { #define JFS_APPEND_FL 0x01000000 /* writes to file may only append */ @@ -5961,9 +5961,9 @@ diff -NurpP --minimal linux-3.0/fs/jfs/jfs_dinode.h linux-3.0-vs2.3.1-pre8/fs/jf #define JFS_FL_INHERIT 0x03C80000 /* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */ -diff -NurpP --minimal linux-3.0/fs/jfs/jfs_filsys.h linux-3.0-vs2.3.1-pre8/fs/jfs/jfs_filsys.h ---- linux-3.0/fs/jfs/jfs_filsys.h 2008-12-25 00:26:37.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/fs/jfs/jfs_filsys.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/jfs/jfs_filsys.h linux-3.0.1-vs2.3.1-pre9/fs/jfs/jfs_filsys.h +--- linux-3.0.1/fs/jfs/jfs_filsys.h 2008-12-25 00:26:37.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/fs/jfs/jfs_filsys.h 2011-06-10 22:11:24.000000000 +0200 @@ -263,6 +263,7 @@ #define JFS_NAME_MAX 255 #define JFS_PATH_MAX BPSIZE @@ -5972,9 +5972,9 @@ diff -NurpP --minimal linux-3.0/fs/jfs/jfs_filsys.h linux-3.0-vs2.3.1-pre8/fs/jf /* * file system state (superblock state) -diff -NurpP --minimal linux-3.0/fs/jfs/jfs_imap.c linux-3.0-vs2.3.1-pre8/fs/jfs/jfs_imap.c ---- linux-3.0/fs/jfs/jfs_imap.c 2011-07-22 11:18:05.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/jfs/jfs_imap.c 2011-07-01 11:35:34.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/jfs/jfs_imap.c linux-3.0.1-vs2.3.1-pre9/fs/jfs/jfs_imap.c +--- linux-3.0.1/fs/jfs/jfs_imap.c 2011-07-22 11:18:05.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/jfs/jfs_imap.c 2011-07-01 11:35:34.000000000 +0200 @@ -46,6 +46,7 @@ #include #include @@ -6034,9 +6034,9 @@ diff -NurpP --minimal linux-3.0/fs/jfs/jfs_imap.c linux-3.0-vs2.3.1-pre8/fs/jfs/ jfs_get_inode_flags(jfs_ip); /* * mode2 is only needed for storing the higher order bits. -diff -NurpP --minimal linux-3.0/fs/jfs/jfs_inode.c linux-3.0-vs2.3.1-pre8/fs/jfs/jfs_inode.c ---- linux-3.0/fs/jfs/jfs_inode.c 2010-08-02 16:52:49.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/jfs/jfs_inode.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/jfs/jfs_inode.c linux-3.0.1-vs2.3.1-pre9/fs/jfs/jfs_inode.c +--- linux-3.0.1/fs/jfs/jfs_inode.c 2010-08-02 16:52:49.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/jfs/jfs_inode.c 2011-06-10 22:11:24.000000000 +0200 @@ -18,6 +18,7 @@ #include @@ -6110,9 +6110,9 @@ diff -NurpP --minimal linux-3.0/fs/jfs/jfs_inode.c linux-3.0-vs2.3.1-pre8/fs/jfs } /* -diff -NurpP --minimal linux-3.0/fs/jfs/jfs_inode.h linux-3.0-vs2.3.1-pre8/fs/jfs/jfs_inode.h ---- linux-3.0/fs/jfs/jfs_inode.h 2011-07-22 11:18:05.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/jfs/jfs_inode.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/jfs/jfs_inode.h linux-3.0.1-vs2.3.1-pre9/fs/jfs/jfs_inode.h +--- linux-3.0.1/fs/jfs/jfs_inode.h 2011-07-22 11:18:05.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/jfs/jfs_inode.h 2011-06-10 22:11:24.000000000 +0200 @@ -39,6 +39,7 @@ extern struct dentry *jfs_fh_to_dentry(s extern struct dentry *jfs_fh_to_parent(struct super_block *sb, struct fid *fid, int fh_len, int fh_type); @@ -6121,9 +6121,9 @@ diff -NurpP --minimal linux-3.0/fs/jfs/jfs_inode.h linux-3.0-vs2.3.1-pre8/fs/jfs extern int jfs_get_block(struct inode *, sector_t, struct buffer_head *, int); extern int jfs_setattr(struct dentry *, struct iattr *); -diff -NurpP --minimal linux-3.0/fs/jfs/namei.c linux-3.0-vs2.3.1-pre8/fs/jfs/namei.c ---- linux-3.0/fs/jfs/namei.c 2011-05-22 16:17:53.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/jfs/namei.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/jfs/namei.c linux-3.0.1-vs2.3.1-pre9/fs/jfs/namei.c +--- linux-3.0.1/fs/jfs/namei.c 2011-05-22 16:17:53.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/jfs/namei.c 2011-06-10 22:11:24.000000000 +0200 @@ -22,6 +22,7 @@ #include #include @@ -6148,9 +6148,9 @@ diff -NurpP --minimal linux-3.0/fs/jfs/namei.c linux-3.0-vs2.3.1-pre8/fs/jfs/nam }; const struct file_operations jfs_dir_operations = { -diff -NurpP --minimal linux-3.0/fs/jfs/super.c linux-3.0-vs2.3.1-pre8/fs/jfs/super.c ---- linux-3.0/fs/jfs/super.c 2011-05-22 16:17:53.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/jfs/super.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/jfs/super.c linux-3.0.1-vs2.3.1-pre9/fs/jfs/super.c +--- linux-3.0.1/fs/jfs/super.c 2011-05-22 16:17:53.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/jfs/super.c 2011-06-10 22:11:24.000000000 +0200 @@ -198,7 +198,8 @@ static void jfs_put_super(struct super_b enum { Opt_integrity, Opt_nointegrity, Opt_iocharset, Opt_resize, @@ -6216,9 +6216,9 @@ diff -NurpP --minimal linux-3.0/fs/jfs/super.c linux-3.0-vs2.3.1-pre8/fs/jfs/sup if (newLVSize) { printk(KERN_ERR "resize option for remount only\n"); -diff -NurpP --minimal linux-3.0/fs/libfs.c linux-3.0-vs2.3.1-pre8/fs/libfs.c ---- linux-3.0/fs/libfs.c 2011-07-22 11:18:05.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/libfs.c 2011-07-22 11:20:39.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/libfs.c linux-3.0.1-vs2.3.1-pre9/fs/libfs.c +--- linux-3.0.1/fs/libfs.c 2011-07-22 11:18:05.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/libfs.c 2011-07-22 11:20:39.000000000 +0200 @@ -133,7 +133,8 @@ static inline unsigned char dt_type(stru * both impossible due to the lock on directory. */ @@ -6264,9 +6264,9 @@ diff -NurpP --minimal linux-3.0/fs/libfs.c linux-3.0-vs2.3.1-pre8/fs/libfs.c EXPORT_SYMBOL(generic_read_dir); EXPORT_SYMBOL(mount_pseudo); EXPORT_SYMBOL(simple_write_begin); -diff -NurpP --minimal linux-3.0/fs/locks.c linux-3.0-vs2.3.1-pre8/fs/locks.c ---- linux-3.0/fs/locks.c 2011-07-22 11:18:05.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/locks.c 2011-07-19 00:51:58.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/locks.c linux-3.0.1-vs2.3.1-pre9/fs/locks.c +--- linux-3.0.1/fs/locks.c 2011-07-22 11:18:05.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/locks.c 2011-07-19 00:51:58.000000000 +0200 @@ -126,6 +126,8 @@ #include #include @@ -6456,9 +6456,9 @@ diff -NurpP --minimal linux-3.0/fs/locks.c linux-3.0-vs2.3.1-pre8/fs/locks.c return 0; } -diff -NurpP --minimal linux-3.0/fs/namei.c linux-3.0-vs2.3.1-pre8/fs/namei.c ---- linux-3.0/fs/namei.c 2011-07-22 11:18:05.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/namei.c 2011-07-23 17:04:13.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/namei.c linux-3.0.1-vs2.3.1-pre9/fs/namei.c +--- linux-3.0.1/fs/namei.c 2011-07-22 11:18:05.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/namei.c 2011-08-01 18:18:05.000000000 +0200 @@ -32,6 +32,14 @@ #include #include @@ -6871,9 +6871,9 @@ diff -NurpP --minimal linux-3.0/fs/namei.c linux-3.0-vs2.3.1-pre8/fs/namei.c /* get the link contents into pagecache */ static char *page_getlink(struct dentry * dentry, struct page **ppage) { -diff -NurpP --minimal linux-3.0/fs/namespace.c linux-3.0-vs2.3.1-pre8/fs/namespace.c ---- linux-3.0/fs/namespace.c 2011-07-22 11:18:05.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/namespace.c 2011-07-23 16:43:31.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/namespace.c linux-3.0.1-vs2.3.1-pre9/fs/namespace.c +--- linux-3.0.1/fs/namespace.c 2011-07-22 11:18:05.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/namespace.c 2011-07-23 16:43:31.000000000 +0200 @@ -31,6 +31,11 @@ #include #include @@ -7193,9 +7193,9 @@ diff -NurpP --minimal linux-3.0/fs/namespace.c linux-3.0-vs2.3.1-pre8/fs/namespa kfree(ns); } EXPORT_SYMBOL(put_mnt_ns); -diff -NurpP --minimal linux-3.0/fs/nfs/client.c linux-3.0-vs2.3.1-pre8/fs/nfs/client.c ---- linux-3.0/fs/nfs/client.c 2011-07-22 11:18:05.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/nfs/client.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/nfs/client.c linux-3.0.1-vs2.3.1-pre9/fs/nfs/client.c +--- linux-3.0.1/fs/nfs/client.c 2011-07-22 11:18:05.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/nfs/client.c 2011-06-10 22:11:24.000000000 +0200 @@ -780,6 +780,9 @@ static int nfs_init_server_rpcclient(str if (server->flags & NFS_MOUNT_SOFT) server->client->cl_softrtry = 1; @@ -7217,9 +7217,9 @@ diff -NurpP --minimal linux-3.0/fs/nfs/client.c linux-3.0-vs2.3.1-pre8/fs/nfs/cl server->maxfilesize = fsinfo->maxfilesize; server->time_delta = fsinfo->time_delta; -diff -NurpP --minimal linux-3.0/fs/nfs/dir.c linux-3.0-vs2.3.1-pre8/fs/nfs/dir.c ---- linux-3.0/fs/nfs/dir.c 2011-07-22 11:18:05.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/nfs/dir.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/nfs/dir.c linux-3.0.1-vs2.3.1-pre9/fs/nfs/dir.c +--- linux-3.0.1/fs/nfs/dir.c 2011-08-08 22:31:58.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/nfs/dir.c 2011-08-08 23:04:47.000000000 +0200 @@ -35,6 +35,7 @@ #include #include @@ -7228,7 +7228,7 @@ diff -NurpP --minimal linux-3.0/fs/nfs/dir.c linux-3.0-vs2.3.1-pre8/fs/nfs/dir.c #include "delegation.h" #include "iostat.h" -@@ -1298,6 +1299,7 @@ static struct dentry *nfs_lookup(struct +@@ -1308,6 +1309,7 @@ static struct dentry *nfs_lookup(struct if (IS_ERR(res)) goto out_unblock_sillyrename; @@ -7236,9 +7236,9 @@ diff -NurpP --minimal linux-3.0/fs/nfs/dir.c linux-3.0-vs2.3.1-pre8/fs/nfs/dir.c no_entry: res = d_materialise_unique(dentry, inode); if (res != NULL) { -diff -NurpP --minimal linux-3.0/fs/nfs/inode.c linux-3.0-vs2.3.1-pre8/fs/nfs/inode.c ---- linux-3.0/fs/nfs/inode.c 2011-07-22 11:18:05.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/nfs/inode.c 2011-07-01 11:35:34.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/nfs/inode.c linux-3.0.1-vs2.3.1-pre9/fs/nfs/inode.c +--- linux-3.0.1/fs/nfs/inode.c 2011-07-22 11:18:05.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/nfs/inode.c 2011-07-01 11:35:34.000000000 +0200 @@ -38,6 +38,7 @@ #include #include @@ -7390,9 +7390,9 @@ diff -NurpP --minimal linux-3.0/fs/nfs/inode.c linux-3.0-vs2.3.1-pre8/fs/nfs/ino if (fattr->valid & NFS_ATTR_FATTR_NLINK) { if (inode->i_nlink != fattr->nlink) { invalid |= NFS_INO_INVALID_ATTR; -diff -NurpP --minimal linux-3.0/fs/nfs/nfs3xdr.c linux-3.0-vs2.3.1-pre8/fs/nfs/nfs3xdr.c ---- linux-3.0/fs/nfs/nfs3xdr.c 2011-03-15 18:07:32.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/fs/nfs/nfs3xdr.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/nfs/nfs3xdr.c linux-3.0.1-vs2.3.1-pre9/fs/nfs/nfs3xdr.c +--- linux-3.0.1/fs/nfs/nfs3xdr.c 2011-03-15 18:07:32.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/fs/nfs/nfs3xdr.c 2011-06-10 22:11:24.000000000 +0200 @@ -20,6 +20,7 @@ #include #include @@ -7538,9 +7538,9 @@ diff -NurpP --minimal linux-3.0/fs/nfs/nfs3xdr.c linux-3.0-vs2.3.1-pre8/fs/nfs/n } /* -diff -NurpP --minimal linux-3.0/fs/nfs/super.c linux-3.0-vs2.3.1-pre8/fs/nfs/super.c ---- linux-3.0/fs/nfs/super.c 2011-07-22 11:18:05.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/nfs/super.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/nfs/super.c linux-3.0.1-vs2.3.1-pre9/fs/nfs/super.c +--- linux-3.0.1/fs/nfs/super.c 2011-07-22 11:18:05.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/nfs/super.c 2011-06-10 22:11:24.000000000 +0200 @@ -53,6 +53,7 @@ #include #include @@ -7612,9 +7612,9 @@ diff -NurpP --minimal linux-3.0/fs/nfs/super.c linux-3.0-vs2.3.1-pre8/fs/nfs/sup /* * options that take text values -diff -NurpP --minimal linux-3.0/fs/nfsd/auth.c linux-3.0-vs2.3.1-pre8/fs/nfsd/auth.c ---- linux-3.0/fs/nfsd/auth.c 2010-02-25 11:52:05.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/fs/nfsd/auth.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/nfsd/auth.c linux-3.0.1-vs2.3.1-pre9/fs/nfsd/auth.c +--- linux-3.0.1/fs/nfsd/auth.c 2010-02-25 11:52:05.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/fs/nfsd/auth.c 2011-06-10 22:11:24.000000000 +0200 @@ -1,6 +1,7 @@ /* Copyright (C) 1995, 1996 Olaf Kirch */ @@ -7633,9 +7633,9 @@ diff -NurpP --minimal linux-3.0/fs/nfsd/auth.c linux-3.0-vs2.3.1-pre8/fs/nfsd/au rqgi = rqstp->rq_cred.cr_group_info; -diff -NurpP --minimal linux-3.0/fs/nfsd/nfs3xdr.c linux-3.0-vs2.3.1-pre8/fs/nfsd/nfs3xdr.c ---- linux-3.0/fs/nfsd/nfs3xdr.c 2011-07-22 11:18:05.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/nfsd/nfs3xdr.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/nfsd/nfs3xdr.c linux-3.0.1-vs2.3.1-pre9/fs/nfsd/nfs3xdr.c +--- linux-3.0.1/fs/nfsd/nfs3xdr.c 2011-07-22 11:18:05.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/nfsd/nfs3xdr.c 2011-06-10 22:11:24.000000000 +0200 @@ -7,6 +7,7 @@ */ @@ -7686,9 +7686,9 @@ diff -NurpP --minimal linux-3.0/fs/nfsd/nfs3xdr.c linux-3.0-vs2.3.1-pre8/fs/nfsd if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) { p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN); } else { -diff -NurpP --minimal linux-3.0/fs/nfsd/nfs4xdr.c linux-3.0-vs2.3.1-pre8/fs/nfsd/nfs4xdr.c ---- linux-3.0/fs/nfsd/nfs4xdr.c 2011-07-22 11:18:05.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/nfsd/nfs4xdr.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/nfsd/nfs4xdr.c linux-3.0.1-vs2.3.1-pre9/fs/nfsd/nfs4xdr.c +--- linux-3.0.1/fs/nfsd/nfs4xdr.c 2011-07-22 11:18:05.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/nfsd/nfs4xdr.c 2011-06-10 22:11:24.000000000 +0200 @@ -45,6 +45,7 @@ #include #include @@ -7718,9 +7718,9 @@ diff -NurpP --minimal linux-3.0/fs/nfsd/nfs4xdr.c linux-3.0-vs2.3.1-pre8/fs/nfsd if (status == nfserr_resource) goto out_resource; if (status) -diff -NurpP --minimal linux-3.0/fs/nfsd/nfsxdr.c linux-3.0-vs2.3.1-pre8/fs/nfsd/nfsxdr.c ---- linux-3.0/fs/nfsd/nfsxdr.c 2011-05-22 16:17:53.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/nfsd/nfsxdr.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/nfsd/nfsxdr.c linux-3.0.1-vs2.3.1-pre9/fs/nfsd/nfsxdr.c +--- linux-3.0.1/fs/nfsd/nfsxdr.c 2011-05-22 16:17:53.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/nfsd/nfsxdr.c 2011-06-10 22:11:24.000000000 +0200 @@ -6,6 +6,7 @@ #include "xdr.h" @@ -7769,9 +7769,9 @@ diff -NurpP --minimal linux-3.0/fs/nfsd/nfsxdr.c linux-3.0-vs2.3.1-pre8/fs/nfsd/ if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) { *p++ = htonl(NFS_MAXPATHLEN); -diff -NurpP --minimal linux-3.0/fs/ocfs2/dlmglue.c linux-3.0-vs2.3.1-pre8/fs/ocfs2/dlmglue.c ---- linux-3.0/fs/ocfs2/dlmglue.c 2011-05-22 16:17:53.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/ocfs2/dlmglue.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/ocfs2/dlmglue.c linux-3.0.1-vs2.3.1-pre9/fs/ocfs2/dlmglue.c +--- linux-3.0.1/fs/ocfs2/dlmglue.c 2011-05-22 16:17:53.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/ocfs2/dlmglue.c 2011-06-10 22:11:24.000000000 +0200 @@ -2041,6 +2041,7 @@ static void __ocfs2_stuff_meta_lvb(struc lvb->lvb_iclusters = cpu_to_be32(oi->ip_clusters); lvb->lvb_iuid = cpu_to_be32(inode->i_uid); @@ -7788,9 +7788,9 @@ diff -NurpP --minimal linux-3.0/fs/ocfs2/dlmglue.c linux-3.0-vs2.3.1-pre8/fs/ocf inode->i_mode = be16_to_cpu(lvb->lvb_imode); inode->i_nlink = be16_to_cpu(lvb->lvb_inlink); ocfs2_unpack_timespec(&inode->i_atime, -diff -NurpP --minimal linux-3.0/fs/ocfs2/dlmglue.h linux-3.0-vs2.3.1-pre8/fs/ocfs2/dlmglue.h ---- linux-3.0/fs/ocfs2/dlmglue.h 2010-10-21 13:07:50.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/ocfs2/dlmglue.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/ocfs2/dlmglue.h linux-3.0.1-vs2.3.1-pre9/fs/ocfs2/dlmglue.h +--- linux-3.0.1/fs/ocfs2/dlmglue.h 2010-10-21 13:07:50.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/ocfs2/dlmglue.h 2011-06-10 22:11:24.000000000 +0200 @@ -46,7 +46,8 @@ struct ocfs2_meta_lvb { __be16 lvb_inlink; __be32 lvb_iattr; @@ -7801,9 +7801,9 @@ diff -NurpP --minimal linux-3.0/fs/ocfs2/dlmglue.h linux-3.0-vs2.3.1-pre8/fs/ocf }; #define OCFS2_QINFO_LVB_VERSION 1 -diff -NurpP --minimal linux-3.0/fs/ocfs2/file.c linux-3.0-vs2.3.1-pre8/fs/ocfs2/file.c ---- linux-3.0/fs/ocfs2/file.c 2011-07-22 11:18:06.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/ocfs2/file.c 2011-06-10 22:43:33.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/ocfs2/file.c linux-3.0.1-vs2.3.1-pre9/fs/ocfs2/file.c +--- linux-3.0.1/fs/ocfs2/file.c 2011-07-22 11:18:06.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/ocfs2/file.c 2011-06-10 22:43:33.000000000 +0200 @@ -1111,7 +1111,7 @@ int ocfs2_setattr(struct dentry *dentry, attr->ia_valid &= ~ATTR_SIZE; @@ -7813,9 +7813,9 @@ diff -NurpP --minimal linux-3.0/fs/ocfs2/file.c linux-3.0-vs2.3.1-pre8/fs/ocfs2/ if (!(attr->ia_valid & OCFS2_VALID_ATTRS)) return 0; -diff -NurpP --minimal linux-3.0/fs/ocfs2/inode.c linux-3.0-vs2.3.1-pre8/fs/ocfs2/inode.c ---- linux-3.0/fs/ocfs2/inode.c 2011-05-22 16:17:53.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/ocfs2/inode.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/ocfs2/inode.c linux-3.0.1-vs2.3.1-pre9/fs/ocfs2/inode.c +--- linux-3.0.1/fs/ocfs2/inode.c 2011-05-22 16:17:53.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/ocfs2/inode.c 2011-06-10 22:11:24.000000000 +0200 @@ -28,6 +28,7 @@ #include #include @@ -7912,9 +7912,9 @@ diff -NurpP --minimal linux-3.0/fs/ocfs2/inode.c linux-3.0-vs2.3.1-pre8/fs/ocfs2 /* Fast symlinks will have i_size but no allocated clusters. */ if (S_ISLNK(inode->i_mode) && !fe->i_clusters) -diff -NurpP --minimal linux-3.0/fs/ocfs2/inode.h linux-3.0-vs2.3.1-pre8/fs/ocfs2/inode.h ---- linux-3.0/fs/ocfs2/inode.h 2011-01-05 21:50:26.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/fs/ocfs2/inode.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/ocfs2/inode.h linux-3.0.1-vs2.3.1-pre9/fs/ocfs2/inode.h +--- linux-3.0.1/fs/ocfs2/inode.h 2011-01-05 21:50:26.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/fs/ocfs2/inode.h 2011-06-10 22:11:24.000000000 +0200 @@ -151,6 +151,7 @@ struct buffer_head *ocfs2_bread(struct i void ocfs2_set_inode_flags(struct inode *inode); @@ -7923,9 +7923,9 @@ diff -NurpP --minimal linux-3.0/fs/ocfs2/inode.h linux-3.0-vs2.3.1-pre8/fs/ocfs2 static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode) { -diff -NurpP --minimal linux-3.0/fs/ocfs2/ioctl.c linux-3.0-vs2.3.1-pre8/fs/ocfs2/ioctl.c ---- linux-3.0/fs/ocfs2/ioctl.c 2011-07-22 11:18:06.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/ocfs2/ioctl.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/ocfs2/ioctl.c linux-3.0.1-vs2.3.1-pre9/fs/ocfs2/ioctl.c +--- linux-3.0.1/fs/ocfs2/ioctl.c 2011-07-22 11:18:06.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/ocfs2/ioctl.c 2011-06-10 22:11:24.000000000 +0200 @@ -78,7 +78,41 @@ static int ocfs2_get_inode_attr(struct i return status; } @@ -7989,9 +7989,9 @@ diff -NurpP --minimal linux-3.0/fs/ocfs2/ioctl.c linux-3.0-vs2.3.1-pre8/fs/ocfs2 long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { struct inode *inode = filp->f_path.dentry->d_inode; -diff -NurpP --minimal linux-3.0/fs/ocfs2/namei.c linux-3.0-vs2.3.1-pre8/fs/ocfs2/namei.c ---- linux-3.0/fs/ocfs2/namei.c 2011-05-22 16:17:53.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/ocfs2/namei.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/ocfs2/namei.c linux-3.0.1-vs2.3.1-pre9/fs/ocfs2/namei.c +--- linux-3.0.1/fs/ocfs2/namei.c 2011-05-22 16:17:53.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/ocfs2/namei.c 2011-06-10 22:11:24.000000000 +0200 @@ -41,6 +41,7 @@ #include #include @@ -8022,9 +8022,9 @@ diff -NurpP --minimal linux-3.0/fs/ocfs2/namei.c linux-3.0-vs2.3.1-pre8/fs/ocfs2 fe->i_mode = cpu_to_le16(inode->i_mode); if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode)) fe->id1.dev1.i_rdev = cpu_to_le64(huge_encode_dev(dev)); -diff -NurpP --minimal linux-3.0/fs/ocfs2/ocfs2.h linux-3.0-vs2.3.1-pre8/fs/ocfs2/ocfs2.h ---- linux-3.0/fs/ocfs2/ocfs2.h 2011-05-22 16:17:53.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/ocfs2/ocfs2.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/ocfs2/ocfs2.h linux-3.0.1-vs2.3.1-pre9/fs/ocfs2/ocfs2.h +--- linux-3.0.1/fs/ocfs2/ocfs2.h 2011-05-22 16:17:53.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/ocfs2/ocfs2.h 2011-06-10 22:11:24.000000000 +0200 @@ -272,6 +272,7 @@ enum ocfs2_mount_options writes */ OCFS2_MOUNT_HB_NONE = 1 << 13, /* No heartbeat */ @@ -8033,9 +8033,9 @@ diff -NurpP --minimal linux-3.0/fs/ocfs2/ocfs2.h linux-3.0-vs2.3.1-pre8/fs/ocfs2 }; #define OCFS2_OSB_SOFT_RO 0x0001 -diff -NurpP --minimal linux-3.0/fs/ocfs2/ocfs2_fs.h linux-3.0-vs2.3.1-pre8/fs/ocfs2/ocfs2_fs.h ---- linux-3.0/fs/ocfs2/ocfs2_fs.h 2011-05-22 16:17:53.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/ocfs2/ocfs2_fs.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/ocfs2/ocfs2_fs.h linux-3.0.1-vs2.3.1-pre9/fs/ocfs2/ocfs2_fs.h +--- linux-3.0.1/fs/ocfs2/ocfs2_fs.h 2011-05-22 16:17:53.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/ocfs2/ocfs2_fs.h 2011-06-10 22:11:24.000000000 +0200 @@ -266,6 +266,11 @@ #define OCFS2_TOPDIR_FL FS_TOPDIR_FL /* Top of directory hierarchies*/ #define OCFS2_RESERVED_FL FS_RESERVED_FL /* reserved for ext2 lib */ @@ -8048,9 +8048,9 @@ diff -NurpP --minimal linux-3.0/fs/ocfs2/ocfs2_fs.h linux-3.0-vs2.3.1-pre8/fs/oc #define OCFS2_FL_VISIBLE FS_FL_USER_VISIBLE /* User visible flags */ #define OCFS2_FL_MODIFIABLE FS_FL_USER_MODIFIABLE /* User modifiable flags */ -diff -NurpP --minimal linux-3.0/fs/ocfs2/super.c linux-3.0-vs2.3.1-pre8/fs/ocfs2/super.c ---- linux-3.0/fs/ocfs2/super.c 2011-07-22 11:18:06.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/ocfs2/super.c 2011-06-15 02:40:14.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/ocfs2/super.c linux-3.0.1-vs2.3.1-pre9/fs/ocfs2/super.c +--- linux-3.0.1/fs/ocfs2/super.c 2011-07-22 11:18:06.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/ocfs2/super.c 2011-06-15 02:40:14.000000000 +0200 @@ -184,6 +184,7 @@ enum { Opt_coherency_full, Opt_resv_level, @@ -8114,9 +8114,9 @@ diff -NurpP --minimal linux-3.0/fs/ocfs2/super.c linux-3.0-vs2.3.1-pre8/fs/ocfs2 default: mlog(ML_ERROR, "Unrecognized mount option \"%s\" " -diff -NurpP --minimal linux-3.0/fs/open.c linux-3.0-vs2.3.1-pre8/fs/open.c ---- linux-3.0/fs/open.c 2011-05-22 16:17:53.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/open.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/open.c linux-3.0.1-vs2.3.1-pre9/fs/open.c +--- linux-3.0.1/fs/open.c 2011-05-22 16:17:53.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/open.c 2011-06-10 22:11:24.000000000 +0200 @@ -30,6 +30,11 @@ #include #include @@ -8197,9 +8197,9 @@ diff -NurpP --minimal linux-3.0/fs/open.c linux-3.0-vs2.3.1-pre8/fs/open.c } void put_unused_fd(unsigned int fd) -diff -NurpP --minimal linux-3.0/fs/proc/array.c linux-3.0-vs2.3.1-pre8/fs/proc/array.c ---- linux-3.0/fs/proc/array.c 2011-07-22 11:18:06.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/proc/array.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/proc/array.c linux-3.0.1-vs2.3.1-pre9/fs/proc/array.c +--- linux-3.0.1/fs/proc/array.c 2011-07-22 11:18:06.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/proc/array.c 2011-06-10 22:11:24.000000000 +0200 @@ -81,6 +81,8 @@ #include #include @@ -8313,9 +8313,9 @@ diff -NurpP --minimal linux-3.0/fs/proc/array.c linux-3.0-vs2.3.1-pre8/fs/proc/a seq_printf(m, "%d (%s) %c %d %d %d %d %d %u %lu \ %lu %lu %lu %lu %lu %ld %ld %ld %ld %d 0 %llu %lu %ld %lu %lu %lu %lu %lu \ %lu %lu %lu %lu %lu %lu %lu %lu %d %d %u %u %llu %lu %ld\n", -diff -NurpP --minimal linux-3.0/fs/proc/base.c linux-3.0-vs2.3.1-pre8/fs/proc/base.c ---- linux-3.0/fs/proc/base.c 2011-07-22 11:18:06.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/proc/base.c 2011-07-19 00:44:39.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/proc/base.c linux-3.0.1-vs2.3.1-pre9/fs/proc/base.c +--- linux-3.0.1/fs/proc/base.c 2011-08-08 22:31:58.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/proc/base.c 2011-08-08 23:04:47.000000000 +0200 @@ -83,6 +83,8 @@ #include #include @@ -8414,7 +8414,7 @@ diff -NurpP --minimal linux-3.0/fs/proc/base.c linux-3.0-vs2.3.1-pre8/fs/proc/ba const struct pid_entry *p, *last; error = ERR_PTR(-ENOENT); -@@ -2765,6 +2790,9 @@ static int proc_pid_personality(struct s +@@ -2775,6 +2800,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; @@ -8424,7 +8424,7 @@ diff -NurpP --minimal linux-3.0/fs/proc/base.c linux-3.0-vs2.3.1-pre8/fs/proc/ba 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), -@@ -2828,6 +2856,8 @@ static const struct pid_entry tgid_base_ +@@ -2838,6 +2866,8 @@ static const struct pid_entry tgid_base_ #ifdef CONFIG_CGROUPS REG("cgroup", S_IRUGO, proc_cgroup_operations), #endif @@ -8433,7 +8433,7 @@ diff -NurpP --minimal linux-3.0/fs/proc/base.c linux-3.0-vs2.3.1-pre8/fs/proc/ba INF("oom_score", S_IRUGO, proc_oom_score), REG("oom_adj", S_IRUGO|S_IWUSR, proc_oom_adjust_operations), REG("oom_score_adj", S_IRUGO|S_IWUSR, proc_oom_score_adj_operations), -@@ -2847,6 +2877,7 @@ static const struct pid_entry tgid_base_ +@@ -2857,6 +2887,7 @@ static const struct pid_entry tgid_base_ #ifdef CONFIG_HARDWALL INF("hardwall", S_IRUGO, proc_pid_hardwall), #endif @@ -8441,7 +8441,7 @@ diff -NurpP --minimal linux-3.0/fs/proc/base.c linux-3.0-vs2.3.1-pre8/fs/proc/ba }; static int proc_tgid_base_readdir(struct file * filp, -@@ -3039,7 +3070,7 @@ retry: +@@ -3049,7 +3080,7 @@ retry: iter.task = NULL; pid = find_ge_pid(iter.tgid, ns); if (pid) { @@ -8450,7 +8450,7 @@ diff -NurpP --minimal linux-3.0/fs/proc/base.c linux-3.0-vs2.3.1-pre8/fs/proc/ba 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 -@@ -3069,7 +3100,7 @@ static int proc_pid_fill_cache(struct fi +@@ -3079,7 +3110,7 @@ static int proc_pid_fill_cache(struct fi struct tgid_iter iter) { char name[PROC_NUMBUF]; @@ -8459,7 +8459,7 @@ diff -NurpP --minimal linux-3.0/fs/proc/base.c linux-3.0-vs2.3.1-pre8/fs/proc/ba return proc_fill_cache(filp, dirent, filldir, name, len, proc_pid_instantiate, iter.task, NULL); } -@@ -3086,7 +3117,7 @@ int proc_pid_readdir(struct file * filp, +@@ -3096,7 +3127,7 @@ int proc_pid_readdir(struct file * filp, goto out_no_task; nr = filp->f_pos - FIRST_PROCESS_ENTRY; @@ -8468,7 +8468,7 @@ diff -NurpP --minimal linux-3.0/fs/proc/base.c linux-3.0-vs2.3.1-pre8/fs/proc/ba if (!reaper) goto out_no_task; -@@ -3103,6 +3134,8 @@ int proc_pid_readdir(struct file * filp, +@@ -3113,6 +3144,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; @@ -8477,7 +8477,7 @@ diff -NurpP --minimal linux-3.0/fs/proc/base.c linux-3.0-vs2.3.1-pre8/fs/proc/ba if (proc_pid_fill_cache(filp, dirent, filldir, iter) < 0) { put_task_struct(iter.task); goto out; -@@ -3256,6 +3289,8 @@ static struct dentry *proc_task_lookup(s +@@ -3266,6 +3299,8 @@ static struct dentry *proc_task_lookup(s tid = name_to_int(dentry); if (tid == ~0U) goto out; @@ -8486,9 +8486,9 @@ diff -NurpP --minimal linux-3.0/fs/proc/base.c linux-3.0-vs2.3.1-pre8/fs/proc/ba ns = dentry->d_sb->s_fs_info; rcu_read_lock(); -diff -NurpP --minimal linux-3.0/fs/proc/generic.c linux-3.0-vs2.3.1-pre8/fs/proc/generic.c ---- linux-3.0/fs/proc/generic.c 2011-07-22 11:18:06.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/proc/generic.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/proc/generic.c linux-3.0.1-vs2.3.1-pre9/fs/proc/generic.c +--- linux-3.0.1/fs/proc/generic.c 2011-07-22 11:18:06.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/proc/generic.c 2011-06-10 22:11:24.000000000 +0200 @@ -22,6 +22,7 @@ #include #include @@ -8548,9 +8548,9 @@ diff -NurpP --minimal linux-3.0/fs/proc/generic.c linux-3.0-vs2.3.1-pre8/fs/proc } else { kfree(ent); ent = NULL; -diff -NurpP --minimal linux-3.0/fs/proc/inode.c linux-3.0-vs2.3.1-pre8/fs/proc/inode.c ---- linux-3.0/fs/proc/inode.c 2011-07-22 11:18:06.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/proc/inode.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/proc/inode.c linux-3.0.1-vs2.3.1-pre9/fs/proc/inode.c +--- linux-3.0.1/fs/proc/inode.c 2011-07-22 11:18:06.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/proc/inode.c 2011-06-10 22:11:24.000000000 +0200 @@ -442,6 +442,8 @@ struct inode *proc_get_inode(struct supe inode->i_uid = de->uid; inode->i_gid = de->gid; @@ -8560,9 +8560,9 @@ diff -NurpP --minimal linux-3.0/fs/proc/inode.c linux-3.0-vs2.3.1-pre8/fs/proc/i if (de->size) inode->i_size = de->size; if (de->nlink) -diff -NurpP --minimal linux-3.0/fs/proc/internal.h linux-3.0-vs2.3.1-pre8/fs/proc/internal.h ---- linux-3.0/fs/proc/internal.h 2011-07-22 11:18:06.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/proc/internal.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/proc/internal.h linux-3.0.1-vs2.3.1-pre9/fs/proc/internal.h +--- linux-3.0.1/fs/proc/internal.h 2011-07-22 11:18:06.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/proc/internal.h 2011-06-10 22:11:24.000000000 +0200 @@ -10,6 +10,7 @@ */ @@ -8599,9 +8599,9 @@ diff -NurpP --minimal linux-3.0/fs/proc/internal.h linux-3.0-vs2.3.1-pre8/fs/pro static inline int proc_fd(struct inode *inode) { return PROC_I(inode)->fd; -diff -NurpP --minimal linux-3.0/fs/proc/loadavg.c linux-3.0-vs2.3.1-pre8/fs/proc/loadavg.c ---- linux-3.0/fs/proc/loadavg.c 2009-09-10 15:26:23.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/proc/loadavg.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/proc/loadavg.c linux-3.0.1-vs2.3.1-pre9/fs/proc/loadavg.c +--- linux-3.0.1/fs/proc/loadavg.c 2009-09-10 15:26:23.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/proc/loadavg.c 2011-06-10 22:11:24.000000000 +0200 @@ -12,15 +12,27 @@ static int loadavg_proc_show(struct seq_file *m, void *v) @@ -8631,9 +8631,9 @@ diff -NurpP --minimal linux-3.0/fs/proc/loadavg.c linux-3.0-vs2.3.1-pre8/fs/proc task_active_pid_ns(current)->last_pid); return 0; } -diff -NurpP --minimal linux-3.0/fs/proc/meminfo.c linux-3.0-vs2.3.1-pre8/fs/proc/meminfo.c ---- linux-3.0/fs/proc/meminfo.c 2011-03-15 18:07:33.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/fs/proc/meminfo.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/proc/meminfo.c linux-3.0.1-vs2.3.1-pre9/fs/proc/meminfo.c +--- linux-3.0.1/fs/proc/meminfo.c 2011-03-15 18:07:33.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/fs/proc/meminfo.c 2011-06-10 22:11:24.000000000 +0200 @@ -39,7 +39,8 @@ static int meminfo_proc_show(struct seq_ allowed = ((totalram_pages - hugetlb_total_pages()) * sysctl_overcommit_ratio / 100) + total_swap_pages; @@ -8644,9 +8644,9 @@ diff -NurpP --minimal linux-3.0/fs/proc/meminfo.c linux-3.0-vs2.3.1-pre8/fs/proc total_swapcache_pages - i.bufferram; if (cached < 0) cached = 0; -diff -NurpP --minimal linux-3.0/fs/proc/root.c linux-3.0-vs2.3.1-pre8/fs/proc/root.c ---- linux-3.0/fs/proc/root.c 2011-07-22 11:18:06.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/proc/root.c 2011-06-22 12:39:15.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/proc/root.c linux-3.0.1-vs2.3.1-pre9/fs/proc/root.c +--- linux-3.0.1/fs/proc/root.c 2011-07-22 11:18:06.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/proc/root.c 2011-06-22 12:39:15.000000000 +0200 @@ -18,9 +18,14 @@ #include #include @@ -8678,9 +8678,9 @@ diff -NurpP --minimal linux-3.0/fs/proc/root.c linux-3.0-vs2.3.1-pre8/fs/proc/ro }; int pid_ns_prepare_proc(struct pid_namespace *ns) -diff -NurpP --minimal linux-3.0/fs/proc/uptime.c linux-3.0-vs2.3.1-pre8/fs/proc/uptime.c ---- linux-3.0/fs/proc/uptime.c 2009-12-03 20:02:53.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/fs/proc/uptime.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/proc/uptime.c linux-3.0.1-vs2.3.1-pre9/fs/proc/uptime.c +--- linux-3.0.1/fs/proc/uptime.c 2009-12-03 20:02:53.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/fs/proc/uptime.c 2011-06-10 22:11:24.000000000 +0200 @@ -4,22 +4,22 @@ #include #include @@ -8710,9 +8710,9 @@ diff -NurpP --minimal linux-3.0/fs/proc/uptime.c linux-3.0-vs2.3.1-pre8/fs/proc/ seq_printf(m, "%lu.%02lu %lu.%02lu\n", (unsigned long) uptime.tv_sec, (uptime.tv_nsec / (NSEC_PER_SEC / 100)), -diff -NurpP --minimal linux-3.0/fs/quota/dquot.c linux-3.0-vs2.3.1-pre8/fs/quota/dquot.c ---- linux-3.0/fs/quota/dquot.c 2011-07-22 11:18:06.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/quota/dquot.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/quota/dquot.c linux-3.0.1-vs2.3.1-pre9/fs/quota/dquot.c +--- linux-3.0.1/fs/quota/dquot.c 2011-07-22 11:18:06.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/quota/dquot.c 2011-06-10 22:11:24.000000000 +0200 @@ -1548,6 +1548,9 @@ int __dquot_alloc_space(struct inode *in int reserve = flags & DQUOT_SPACE_RESERVE; int nofail = flags & DQUOT_SPACE_NOFAIL; @@ -8751,9 +8751,9 @@ diff -NurpP --minimal linux-3.0/fs/quota/dquot.c linux-3.0-vs2.3.1-pre8/fs/quota /* First test before acquiring mutex - solves deadlocks when we * re-enter the quota code and are already holding the mutex */ if (!dquot_active(inode)) -diff -NurpP --minimal linux-3.0/fs/quota/quota.c linux-3.0-vs2.3.1-pre8/fs/quota/quota.c ---- linux-3.0/fs/quota/quota.c 2011-03-15 18:07:34.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/fs/quota/quota.c 2011-06-13 18:19:47.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/quota/quota.c linux-3.0.1-vs2.3.1-pre9/fs/quota/quota.c +--- linux-3.0.1/fs/quota/quota.c 2011-03-15 18:07:34.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/fs/quota/quota.c 2011-06-13 18:19:47.000000000 +0200 @@ -8,6 +8,7 @@ #include #include @@ -8841,18 +8841,18 @@ diff -NurpP --minimal linux-3.0/fs/quota/quota.c linux-3.0-vs2.3.1-pre8/fs/quota sb = get_super(bdev); bdput(bdev); if (!sb) -diff -NurpP --minimal linux-3.0/fs/reiserfs/file.c linux-3.0-vs2.3.1-pre8/fs/reiserfs/file.c ---- linux-3.0/fs/reiserfs/file.c 2011-01-05 21:50:26.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/fs/reiserfs/file.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/reiserfs/file.c linux-3.0.1-vs2.3.1-pre9/fs/reiserfs/file.c +--- linux-3.0.1/fs/reiserfs/file.c 2011-01-05 21:50:26.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/fs/reiserfs/file.c 2011-06-10 22:11:24.000000000 +0200 @@ -312,4 +312,5 @@ const struct inode_operations reiserfs_f .listxattr = reiserfs_listxattr, .removexattr = reiserfs_removexattr, .permission = reiserfs_permission, + .sync_flags = reiserfs_sync_flags, }; -diff -NurpP --minimal linux-3.0/fs/reiserfs/inode.c linux-3.0-vs2.3.1-pre8/fs/reiserfs/inode.c ---- linux-3.0/fs/reiserfs/inode.c 2011-05-22 16:17:53.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/reiserfs/inode.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/reiserfs/inode.c linux-3.0.1-vs2.3.1-pre9/fs/reiserfs/inode.c +--- linux-3.0.1/fs/reiserfs/inode.c 2011-05-22 16:17:53.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/reiserfs/inode.c 2011-06-10 22:11:24.000000000 +0200 @@ -18,6 +18,7 @@ #include #include @@ -9018,9 +9018,9 @@ diff -NurpP --minimal linux-3.0/fs/reiserfs/inode.c linux-3.0-vs2.3.1-pre8/fs/re mark_inode_dirty(inode); error = journal_end(&th, inode->i_sb, jbegin_count); if (error) -diff -NurpP --minimal linux-3.0/fs/reiserfs/ioctl.c linux-3.0-vs2.3.1-pre8/fs/reiserfs/ioctl.c ---- linux-3.0/fs/reiserfs/ioctl.c 2011-05-22 16:17:53.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/reiserfs/ioctl.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/reiserfs/ioctl.c linux-3.0.1-vs2.3.1-pre9/fs/reiserfs/ioctl.c +--- linux-3.0.1/fs/reiserfs/ioctl.c 2011-05-22 16:17:53.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/reiserfs/ioctl.c 2011-06-10 22:11:24.000000000 +0200 @@ -11,6 +11,21 @@ #include #include @@ -9082,9 +9082,9 @@ diff -NurpP --minimal linux-3.0/fs/reiserfs/ioctl.c linux-3.0-vs2.3.1-pre8/fs/re sd_attrs_to_i_attrs(flags, inode); REISERFS_I(inode)->i_attrs = flags; inode->i_ctime = CURRENT_TIME_SEC; -diff -NurpP --minimal linux-3.0/fs/reiserfs/namei.c linux-3.0-vs2.3.1-pre8/fs/reiserfs/namei.c ---- linux-3.0/fs/reiserfs/namei.c 2011-05-22 16:17:53.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/reiserfs/namei.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/reiserfs/namei.c linux-3.0.1-vs2.3.1-pre9/fs/reiserfs/namei.c +--- linux-3.0.1/fs/reiserfs/namei.c 2011-05-22 16:17:53.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/reiserfs/namei.c 2011-06-10 22:11:24.000000000 +0200 @@ -18,6 +18,7 @@ #include #include @@ -9109,9 +9109,9 @@ diff -NurpP --minimal linux-3.0/fs/reiserfs/namei.c linux-3.0-vs2.3.1-pre8/fs/re }; /* -diff -NurpP --minimal linux-3.0/fs/reiserfs/super.c linux-3.0-vs2.3.1-pre8/fs/reiserfs/super.c ---- linux-3.0/fs/reiserfs/super.c 2011-07-22 11:18:06.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/reiserfs/super.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/reiserfs/super.c linux-3.0.1-vs2.3.1-pre9/fs/reiserfs/super.c +--- linux-3.0.1/fs/reiserfs/super.c 2011-07-22 11:18:06.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/reiserfs/super.c 2011-06-10 22:11:24.000000000 +0200 @@ -899,6 +899,14 @@ static int reiserfs_parse_options(struct {"user_xattr",.setmask = 1 << REISERFS_UNSUPPORTED_OPT}, {"nouser_xattr",.clrmask = 1 << REISERFS_UNSUPPORTED_OPT}, @@ -9153,9 +9153,9 @@ diff -NurpP --minimal linux-3.0/fs/reiserfs/super.c linux-3.0-vs2.3.1-pre8/fs/re rs = SB_DISK_SUPER_BLOCK(s); /* Let's do basic sanity check to verify that underlying device is not smaller than the filesystem. If the check fails then abort and scream, -diff -NurpP --minimal linux-3.0/fs/reiserfs/xattr.c linux-3.0-vs2.3.1-pre8/fs/reiserfs/xattr.c ---- linux-3.0/fs/reiserfs/xattr.c 2011-07-22 11:18:06.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/reiserfs/xattr.c 2011-06-22 12:39:15.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/reiserfs/xattr.c linux-3.0.1-vs2.3.1-pre9/fs/reiserfs/xattr.c +--- linux-3.0.1/fs/reiserfs/xattr.c 2011-07-22 11:18:06.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/reiserfs/xattr.c 2011-06-22 12:39:15.000000000 +0200 @@ -40,6 +40,7 @@ #include #include @@ -9164,9 +9164,9 @@ diff -NurpP --minimal linux-3.0/fs/reiserfs/xattr.c linux-3.0-vs2.3.1-pre8/fs/re #include #include #include -diff -NurpP --minimal linux-3.0/fs/stat.c linux-3.0-vs2.3.1-pre8/fs/stat.c ---- linux-3.0/fs/stat.c 2011-05-22 16:17:54.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/stat.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/stat.c linux-3.0.1-vs2.3.1-pre9/fs/stat.c +--- linux-3.0.1/fs/stat.c 2011-05-22 16:17:54.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/stat.c 2011-06-10 22:11:24.000000000 +0200 @@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod stat->nlink = inode->i_nlink; stat->uid = inode->i_uid; @@ -9175,9 +9175,9 @@ diff -NurpP --minimal linux-3.0/fs/stat.c linux-3.0-vs2.3.1-pre8/fs/stat.c stat->rdev = inode->i_rdev; stat->atime = inode->i_atime; stat->mtime = inode->i_mtime; -diff -NurpP --minimal linux-3.0/fs/statfs.c linux-3.0-vs2.3.1-pre8/fs/statfs.c ---- linux-3.0/fs/statfs.c 2011-05-22 16:17:54.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/statfs.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/statfs.c linux-3.0.1-vs2.3.1-pre9/fs/statfs.c +--- linux-3.0.1/fs/statfs.c 2011-05-22 16:17:54.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/statfs.c 2011-06-10 22:11:24.000000000 +0200 @@ -7,6 +7,8 @@ #include #include @@ -9196,9 +9196,9 @@ diff -NurpP --minimal linux-3.0/fs/statfs.c linux-3.0-vs2.3.1-pre8/fs/statfs.c return retval; } -diff -NurpP --minimal linux-3.0/fs/super.c linux-3.0-vs2.3.1-pre8/fs/super.c ---- linux-3.0/fs/super.c 2011-07-22 11:18:06.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/super.c 2011-07-23 16:49:09.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/super.c linux-3.0.1-vs2.3.1-pre9/fs/super.c +--- linux-3.0.1/fs/super.c 2011-07-22 11:18:06.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/super.c 2011-07-23 16:49:09.000000000 +0200 @@ -32,6 +32,9 @@ #include #include @@ -9223,9 +9223,9 @@ diff -NurpP --minimal linux-3.0/fs/super.c linux-3.0-vs2.3.1-pre8/fs/super.c error = security_sb_kern_mount(sb, flags, secdata); if (error) goto out_sb; -diff -NurpP --minimal linux-3.0/fs/sysfs/mount.c linux-3.0-vs2.3.1-pre8/fs/sysfs/mount.c ---- linux-3.0/fs/sysfs/mount.c 2011-07-22 11:18:06.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/sysfs/mount.c 2011-06-22 12:39:15.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/sysfs/mount.c linux-3.0.1-vs2.3.1-pre9/fs/sysfs/mount.c +--- linux-3.0.1/fs/sysfs/mount.c 2011-07-22 11:18:06.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/sysfs/mount.c 2011-06-22 12:39:15.000000000 +0200 @@ -47,7 +47,7 @@ static int sysfs_fill_super(struct super sb->s_blocksize = PAGE_CACHE_SIZE; @@ -9235,9 +9235,9 @@ diff -NurpP --minimal linux-3.0/fs/sysfs/mount.c linux-3.0-vs2.3.1-pre8/fs/sysfs sb->s_op = &sysfs_ops; sb->s_time_gran = 1; -diff -NurpP --minimal linux-3.0/fs/utimes.c linux-3.0-vs2.3.1-pre8/fs/utimes.c ---- linux-3.0/fs/utimes.c 2011-05-22 16:17:54.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/utimes.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/utimes.c linux-3.0.1-vs2.3.1-pre9/fs/utimes.c +--- linux-3.0.1/fs/utimes.c 2011-05-22 16:17:54.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/utimes.c 2011-06-10 22:11:24.000000000 +0200 @@ -8,6 +8,8 @@ #include #include @@ -9267,9 +9267,9 @@ diff -NurpP --minimal linux-3.0/fs/utimes.c linux-3.0-vs2.3.1-pre8/fs/utimes.c if (times && times[0].tv_nsec == UTIME_NOW && times[1].tv_nsec == UTIME_NOW) times = NULL; -diff -NurpP --minimal linux-3.0/fs/xattr.c linux-3.0-vs2.3.1-pre8/fs/xattr.c ---- linux-3.0/fs/xattr.c 2011-07-22 11:18:09.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/xattr.c 2011-06-10 23:10:19.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/xattr.c linux-3.0.1-vs2.3.1-pre9/fs/xattr.c +--- linux-3.0.1/fs/xattr.c 2011-07-22 11:18:09.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/xattr.c 2011-06-10 23:10:19.000000000 +0200 @@ -18,6 +18,7 @@ #include #include @@ -9287,9 +9287,9 @@ diff -NurpP --minimal linux-3.0/fs/xattr.c linux-3.0-vs2.3.1-pre8/fs/xattr.c return (mask & MAY_WRITE) ? -EPERM : -ENODATA; return 0; } -diff -NurpP --minimal linux-3.0/fs/xfs/linux-2.6/xfs_ioctl.c linux-3.0-vs2.3.1-pre8/fs/xfs/linux-2.6/xfs_ioctl.c ---- linux-3.0/fs/xfs/linux-2.6/xfs_ioctl.c 2011-05-22 16:17:54.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/xfs/linux-2.6/xfs_ioctl.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/xfs/linux-2.6/xfs_ioctl.c linux-3.0.1-vs2.3.1-pre9/fs/xfs/linux-2.6/xfs_ioctl.c +--- linux-3.0.1/fs/xfs/linux-2.6/xfs_ioctl.c 2011-05-22 16:17:54.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/xfs/linux-2.6/xfs_ioctl.c 2011-06-10 22:11:24.000000000 +0200 @@ -28,7 +28,7 @@ #include "xfs_bmap_btree.h" #include "xfs_dinode.h" @@ -9358,9 +9358,9 @@ diff -NurpP --minimal linux-3.0/fs/xfs/linux-2.6/xfs_ioctl.c linux-3.0-vs2.3.1-p return xfs_ioc_setxflags(ip, filp, arg); case XFS_IOC_FSSETDM: { -diff -NurpP --minimal linux-3.0/fs/xfs/linux-2.6/xfs_ioctl.h linux-3.0-vs2.3.1-pre8/fs/xfs/linux-2.6/xfs_ioctl.h ---- linux-3.0/fs/xfs/linux-2.6/xfs_ioctl.h 2010-07-07 18:31:54.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/xfs/linux-2.6/xfs_ioctl.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/xfs/linux-2.6/xfs_ioctl.h linux-3.0.1-vs2.3.1-pre9/fs/xfs/linux-2.6/xfs_ioctl.h +--- linux-3.0.1/fs/xfs/linux-2.6/xfs_ioctl.h 2010-07-07 18:31:54.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/xfs/linux-2.6/xfs_ioctl.h 2011-06-10 22:11:24.000000000 +0200 @@ -70,6 +70,12 @@ xfs_handle_to_dentry( void __user *uhandle, u32 hlen); @@ -9374,9 +9374,9 @@ diff -NurpP --minimal linux-3.0/fs/xfs/linux-2.6/xfs_ioctl.h linux-3.0-vs2.3.1-p extern long xfs_file_ioctl( struct file *filp, -diff -NurpP --minimal linux-3.0/fs/xfs/linux-2.6/xfs_iops.c linux-3.0-vs2.3.1-pre8/fs/xfs/linux-2.6/xfs_iops.c ---- linux-3.0/fs/xfs/linux-2.6/xfs_iops.c 2011-07-22 11:18:09.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/xfs/linux-2.6/xfs_iops.c 2011-06-22 12:39:15.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/xfs/linux-2.6/xfs_iops.c linux-3.0.1-vs2.3.1-pre9/fs/xfs/linux-2.6/xfs_iops.c +--- linux-3.0.1/fs/xfs/linux-2.6/xfs_iops.c 2011-07-22 11:18:09.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/xfs/linux-2.6/xfs_iops.c 2011-06-22 12:39:15.000000000 +0200 @@ -30,6 +30,7 @@ #include "xfs_bmap_btree.h" #include "xfs_dinode.h" @@ -9452,9 +9452,9 @@ diff -NurpP --minimal linux-3.0/fs/xfs/linux-2.6/xfs_iops.c linux-3.0-vs2.3.1-pr switch (inode->i_mode & S_IFMT) { case S_IFBLK: -diff -NurpP --minimal linux-3.0/fs/xfs/linux-2.6/xfs_linux.h linux-3.0-vs2.3.1-pre8/fs/xfs/linux-2.6/xfs_linux.h ---- linux-3.0/fs/xfs/linux-2.6/xfs_linux.h 2011-07-22 11:18:09.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/xfs/linux-2.6/xfs_linux.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/xfs/linux-2.6/xfs_linux.h linux-3.0.1-vs2.3.1-pre9/fs/xfs/linux-2.6/xfs_linux.h +--- linux-3.0.1/fs/xfs/linux-2.6/xfs_linux.h 2011-07-22 11:18:09.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/xfs/linux-2.6/xfs_linux.h 2011-06-10 22:11:24.000000000 +0200 @@ -115,6 +115,7 @@ #define current_cpu() (raw_smp_processor_id()) @@ -9463,9 +9463,9 @@ diff -NurpP --minimal linux-3.0/fs/xfs/linux-2.6/xfs_linux.h linux-3.0-vs2.3.1-p #define current_test_flags(f) (current->flags & (f)) #define current_set_flags_nested(sp, f) \ (*(sp) = current->flags, current->flags |= (f)) -diff -NurpP --minimal linux-3.0/fs/xfs/linux-2.6/xfs_super.c linux-3.0-vs2.3.1-pre8/fs/xfs/linux-2.6/xfs_super.c ---- linux-3.0/fs/xfs/linux-2.6/xfs_super.c 2011-07-22 11:18:09.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/xfs/linux-2.6/xfs_super.c 2011-06-22 12:39:15.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/xfs/linux-2.6/xfs_super.c linux-3.0.1-vs2.3.1-pre9/fs/xfs/linux-2.6/xfs_super.c +--- linux-3.0.1/fs/xfs/linux-2.6/xfs_super.c 2011-07-22 11:18:09.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/xfs/linux-2.6/xfs_super.c 2011-06-22 12:39:15.000000000 +0200 @@ -114,6 +114,9 @@ mempool_t *xfs_ioend_pool; #define MNTOPT_NODELAYLOG "nodelaylog" /* Delayed logging disabled */ #define MNTOPT_DISCARD "discard" /* Discard unused blocks */ @@ -9538,9 +9538,9 @@ diff -NurpP --minimal linux-3.0/fs/xfs/linux-2.6/xfs_super.c linux-3.0-vs2.3.1-p /* * we must configure the block size in the superblock before we run the * full mount process as the mount process can lookup and cache inodes. -diff -NurpP --minimal linux-3.0/fs/xfs/xfs_dinode.h linux-3.0-vs2.3.1-pre8/fs/xfs/xfs_dinode.h ---- linux-3.0/fs/xfs/xfs_dinode.h 2011-01-05 21:50:28.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/fs/xfs/xfs_dinode.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/xfs/xfs_dinode.h linux-3.0.1-vs2.3.1-pre9/fs/xfs/xfs_dinode.h +--- linux-3.0.1/fs/xfs/xfs_dinode.h 2011-01-05 21:50:28.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/fs/xfs/xfs_dinode.h 2011-06-10 22:11:24.000000000 +0200 @@ -51,7 +51,9 @@ typedef struct xfs_dinode { __be32 di_nlink; /* number of links to file */ __be16 di_projid_lo; /* lower part of owner's project id */ @@ -9581,9 +9581,9 @@ diff -NurpP --minimal linux-3.0/fs/xfs/xfs_dinode.h linux-3.0-vs2.3.1-pre8/fs/xf +#define XFS_DIVFLAG_COW 0x02 #endif /* __XFS_DINODE_H__ */ -diff -NurpP --minimal linux-3.0/fs/xfs/xfs_fs.h linux-3.0-vs2.3.1-pre8/fs/xfs/xfs_fs.h ---- linux-3.0/fs/xfs/xfs_fs.h 2011-01-05 21:50:28.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/fs/xfs/xfs_fs.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/xfs/xfs_fs.h linux-3.0.1-vs2.3.1-pre9/fs/xfs/xfs_fs.h +--- linux-3.0.1/fs/xfs/xfs_fs.h 2011-01-05 21:50:28.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/fs/xfs/xfs_fs.h 2011-06-10 22:11:24.000000000 +0200 @@ -67,6 +67,9 @@ struct fsxattr { #define XFS_XFLAG_EXTSZINHERIT 0x00001000 /* inherit inode extent size */ #define XFS_XFLAG_NODEFRAG 0x00002000 /* do not defragment */ @@ -9604,9 +9604,9 @@ diff -NurpP --minimal linux-3.0/fs/xfs/xfs_fs.h linux-3.0-vs2.3.1-pre8/fs/xfs/xf __u32 bs_dmevmask; /* DMIG event mask */ __u16 bs_dmstate; /* DMIG state info */ __u16 bs_aextents; /* attribute number of extents */ -diff -NurpP --minimal linux-3.0/fs/xfs/xfs_ialloc.c linux-3.0-vs2.3.1-pre8/fs/xfs/xfs_ialloc.c ---- linux-3.0/fs/xfs/xfs_ialloc.c 2011-05-22 16:17:54.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/xfs/xfs_ialloc.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/xfs/xfs_ialloc.c linux-3.0.1-vs2.3.1-pre9/fs/xfs/xfs_ialloc.c +--- linux-3.0.1/fs/xfs/xfs_ialloc.c 2011-05-22 16:17:54.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/xfs/xfs_ialloc.c 2011-06-10 22:11:24.000000000 +0200 @@ -37,7 +37,6 @@ #include "xfs_error.h" #include "xfs_bmap.h" @@ -9615,9 +9615,9 @@ diff -NurpP --minimal linux-3.0/fs/xfs/xfs_ialloc.c linux-3.0-vs2.3.1-pre8/fs/xf /* * Allocation group level functions. */ -diff -NurpP --minimal linux-3.0/fs/xfs/xfs_inode.c linux-3.0-vs2.3.1-pre8/fs/xfs/xfs_inode.c ---- linux-3.0/fs/xfs/xfs_inode.c 2011-07-22 11:18:10.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/xfs/xfs_inode.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/xfs/xfs_inode.c linux-3.0.1-vs2.3.1-pre9/fs/xfs/xfs_inode.c +--- linux-3.0.1/fs/xfs/xfs_inode.c 2011-07-22 11:18:10.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/xfs/xfs_inode.c 2011-06-10 22:11:24.000000000 +0200 @@ -243,6 +243,7 @@ xfs_inotobp( return 0; } @@ -9792,9 +9792,9 @@ diff -NurpP --minimal linux-3.0/fs/xfs/xfs_inode.c linux-3.0-vs2.3.1-pre8/fs/xfs /* Wrap, we never let the log put out DI_MAX_FLUSH */ if (ip->i_d.di_flushiter == DI_MAX_FLUSH) -diff -NurpP --minimal linux-3.0/fs/xfs/xfs_inode.h linux-3.0-vs2.3.1-pre8/fs/xfs/xfs_inode.h ---- linux-3.0/fs/xfs/xfs_inode.h 2011-07-22 11:18:10.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/xfs/xfs_inode.h 2011-07-01 11:35:35.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/xfs/xfs_inode.h linux-3.0.1-vs2.3.1-pre9/fs/xfs/xfs_inode.h +--- linux-3.0.1/fs/xfs/xfs_inode.h 2011-07-22 11:18:10.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/xfs/xfs_inode.h 2011-07-01 11:35:35.000000000 +0200 @@ -135,7 +135,9 @@ typedef struct xfs_icdinode { __uint32_t di_nlink; /* number of links to file */ __uint16_t di_projid_lo; /* lower part of owner's project id */ @@ -9815,9 +9815,9 @@ diff -NurpP --minimal linux-3.0/fs/xfs/xfs_inode.h linux-3.0-vs2.3.1-pre8/fs/xfs void xfs_idestroy_fork(struct xfs_inode *, int); void xfs_idata_realloc(struct xfs_inode *, int, int); void xfs_iroot_realloc(struct xfs_inode *, int, int); -diff -NurpP --minimal linux-3.0/fs/xfs/xfs_itable.c linux-3.0-vs2.3.1-pre8/fs/xfs/xfs_itable.c ---- linux-3.0/fs/xfs/xfs_itable.c 2011-05-22 16:17:54.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/xfs/xfs_itable.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/xfs/xfs_itable.c linux-3.0.1-vs2.3.1-pre9/fs/xfs/xfs_itable.c +--- linux-3.0.1/fs/xfs/xfs_itable.c 2011-05-22 16:17:54.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/xfs/xfs_itable.c 2011-06-10 22:11:24.000000000 +0200 @@ -98,6 +98,7 @@ xfs_bulkstat_one_int( buf->bs_mode = dic->di_mode; buf->bs_uid = dic->di_uid; @@ -9826,9 +9826,9 @@ diff -NurpP --minimal linux-3.0/fs/xfs/xfs_itable.c linux-3.0-vs2.3.1-pre8/fs/xf buf->bs_size = dic->di_size; /* -diff -NurpP --minimal linux-3.0/fs/xfs/xfs_log_recover.c linux-3.0-vs2.3.1-pre8/fs/xfs/xfs_log_recover.c ---- linux-3.0/fs/xfs/xfs_log_recover.c 2011-07-22 11:18:10.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/xfs/xfs_log_recover.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/xfs/xfs_log_recover.c linux-3.0.1-vs2.3.1-pre9/fs/xfs/xfs_log_recover.c +--- linux-3.0.1/fs/xfs/xfs_log_recover.c 2011-07-22 11:18:10.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/xfs/xfs_log_recover.c 2011-06-10 22:11:24.000000000 +0200 @@ -2343,7 +2343,8 @@ xlog_recover_inode_pass2( } @@ -9839,9 +9839,9 @@ diff -NurpP --minimal linux-3.0/fs/xfs/xfs_log_recover.c linux-3.0-vs2.3.1-pre8/ /* the rest is in on-disk format */ if (item->ri_buf[1].i_len > sizeof(struct xfs_icdinode)) { -diff -NurpP --minimal linux-3.0/fs/xfs/xfs_mount.h linux-3.0-vs2.3.1-pre8/fs/xfs/xfs_mount.h ---- linux-3.0/fs/xfs/xfs_mount.h 2011-07-22 11:18:10.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/xfs/xfs_mount.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/xfs/xfs_mount.h linux-3.0.1-vs2.3.1-pre9/fs/xfs/xfs_mount.h +--- linux-3.0.1/fs/xfs/xfs_mount.h 2011-07-22 11:18:10.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/xfs/xfs_mount.h 2011-06-10 22:11:24.000000000 +0200 @@ -249,6 +249,7 @@ typedef struct xfs_mount { allocator */ #define XFS_MOUNT_NOATTR2 (1ULL << 25) /* disable use of attr2 format */ @@ -9850,9 +9850,9 @@ diff -NurpP --minimal linux-3.0/fs/xfs/xfs_mount.h linux-3.0-vs2.3.1-pre8/fs/xfs /* * Default minimum read and write sizes. -diff -NurpP --minimal linux-3.0/fs/xfs/xfs_vnodeops.c linux-3.0-vs2.3.1-pre8/fs/xfs/xfs_vnodeops.c ---- linux-3.0/fs/xfs/xfs_vnodeops.c 2011-07-22 11:18:10.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/xfs/xfs_vnodeops.c 2011-07-01 11:35:35.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/xfs/xfs_vnodeops.c linux-3.0.1-vs2.3.1-pre9/fs/xfs/xfs_vnodeops.c +--- linux-3.0.1/fs/xfs/xfs_vnodeops.c 2011-07-22 11:18:10.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/xfs/xfs_vnodeops.c 2011-07-01 11:35:35.000000000 +0200 @@ -50,6 +50,78 @@ #include "xfs_vnodeops.h" #include "xfs_trace.h" @@ -9990,9 +9990,9 @@ diff -NurpP --minimal linux-3.0/fs/xfs/xfs_vnodeops.c linux-3.0-vs2.3.1-pre8/fs/ if (iuid != uid) { if (XFS_IS_QUOTA_RUNNING(mp) && XFS_IS_UQUOTA_ON(mp)) { ASSERT(mask & ATTR_UID); -diff -NurpP --minimal linux-3.0/fs/xfs/xfs_vnodeops.h linux-3.0-vs2.3.1-pre8/fs/xfs/xfs_vnodeops.h ---- linux-3.0/fs/xfs/xfs_vnodeops.h 2011-05-22 16:17:54.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/fs/xfs/xfs_vnodeops.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/fs/xfs/xfs_vnodeops.h linux-3.0.1-vs2.3.1-pre9/fs/xfs/xfs_vnodeops.h +--- linux-3.0.1/fs/xfs/xfs_vnodeops.h 2011-05-22 16:17:54.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/fs/xfs/xfs_vnodeops.h 2011-06-10 22:11:24.000000000 +0200 @@ -13,6 +13,7 @@ struct xfs_inode; struct xfs_iomap; @@ -10001,9 +10001,9 @@ diff -NurpP --minimal linux-3.0/fs/xfs/xfs_vnodeops.h linux-3.0-vs2.3.1-pre8/fs/ 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-3.0/include/asm-generic/tlb.h linux-3.0-vs2.3.1-pre8/include/asm-generic/tlb.h ---- linux-3.0/include/asm-generic/tlb.h 2011-07-22 11:18:10.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/include/asm-generic/tlb.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/asm-generic/tlb.h linux-3.0.1-vs2.3.1-pre9/include/asm-generic/tlb.h +--- linux-3.0.1/include/asm-generic/tlb.h 2011-07-22 11:18:10.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/include/asm-generic/tlb.h 2011-06-10 22:11:24.000000000 +0200 @@ -16,6 +16,7 @@ #define _ASM_GENERIC__TLB_H @@ -10012,9 +10012,9 @@ diff -NurpP --minimal linux-3.0/include/asm-generic/tlb.h linux-3.0-vs2.3.1-pre8 #include #include -diff -NurpP --minimal linux-3.0/include/linux/Kbuild linux-3.0-vs2.3.1-pre8/include/linux/Kbuild ---- linux-3.0/include/linux/Kbuild 2011-07-22 11:18:10.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/include/linux/Kbuild 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/Kbuild linux-3.0.1-vs2.3.1-pre9/include/linux/Kbuild +--- linux-3.0.1/include/linux/Kbuild 2011-07-22 11:18:10.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/Kbuild 2011-06-10 22:11:24.000000000 +0200 @@ -17,6 +17,7 @@ header-y += netfilter_bridge/ header-y += netfilter_ipv4/ header-y += netfilter_ipv6/ @@ -10023,9 +10023,9 @@ diff -NurpP --minimal linux-3.0/include/linux/Kbuild linux-3.0-vs2.3.1-pre8/incl header-y += wimax/ objhdr-y += version.h -diff -NurpP --minimal linux-3.0/include/linux/capability.h linux-3.0-vs2.3.1-pre8/include/linux/capability.h ---- linux-3.0/include/linux/capability.h 2011-07-22 11:18:10.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/include/linux/capability.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/capability.h linux-3.0.1-vs2.3.1-pre9/include/linux/capability.h +--- linux-3.0.1/include/linux/capability.h 2011-07-22 11:18:10.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/capability.h 2011-06-10 22:11:24.000000000 +0200 @@ -279,6 +279,7 @@ struct cpu_vfs_cap_data { arbitrary SCSI commands */ /* Allow setting encryption key on loopback filesystem */ @@ -10048,9 +10048,9 @@ diff -NurpP --minimal linux-3.0/include/linux/capability.h linux-3.0-vs2.3.1-pre /* * Bit location of each capability (used by user-space library and kernel) -diff -NurpP --minimal linux-3.0/include/linux/cred.h linux-3.0-vs2.3.1-pre8/include/linux/cred.h ---- linux-3.0/include/linux/cred.h 2011-07-22 11:18:10.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/include/linux/cred.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/cred.h linux-3.0.1-vs2.3.1-pre9/include/linux/cred.h +--- linux-3.0.1/include/linux/cred.h 2011-07-22 11:18:10.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/cred.h 2011-06-10 22:11:24.000000000 +0200 @@ -156,6 +156,7 @@ extern void exit_creds(struct task_struc extern int copy_creds(struct task_struct *, unsigned long); extern const struct cred *get_task_cred(struct task_struct *); @@ -10091,18 +10091,18 @@ diff -NurpP --minimal linux-3.0/include/linux/cred.h linux-3.0-vs2.3.1-pre8/incl /** * get_new_cred - Get a reference on a new set of credentials * @cred: The new credentials to reference -diff -NurpP --minimal linux-3.0/include/linux/devpts_fs.h linux-3.0-vs2.3.1-pre8/include/linux/devpts_fs.h ---- linux-3.0/include/linux/devpts_fs.h 2008-12-25 00:26:37.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/devpts_fs.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/devpts_fs.h linux-3.0.1-vs2.3.1-pre9/include/linux/devpts_fs.h +--- linux-3.0.1/include/linux/devpts_fs.h 2008-12-25 00:26:37.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/devpts_fs.h 2011-06-10 22:11:24.000000000 +0200 @@ -45,5 +45,4 @@ static inline void devpts_pty_kill(struc #endif - #endif /* _LINUX_DEVPTS_FS_H */ -diff -NurpP --minimal linux-3.0/include/linux/ext2_fs.h linux-3.0-vs2.3.1-pre8/include/linux/ext2_fs.h ---- linux-3.0/include/linux/ext2_fs.h 2010-02-25 11:52:07.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/ext2_fs.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/ext2_fs.h linux-3.0.1-vs2.3.1-pre9/include/linux/ext2_fs.h +--- linux-3.0.1/include/linux/ext2_fs.h 2010-02-25 11:52:07.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/ext2_fs.h 2011-06-10 22:11:24.000000000 +0200 @@ -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) */ @@ -10142,9 +10142,9 @@ diff -NurpP --minimal linux-3.0/include/linux/ext2_fs.h linux-3.0-vs2.3.1-pre8/i #define clear_opt(o, opt) o &= ~EXT2_MOUNT_##opt -diff -NurpP --minimal linux-3.0/include/linux/ext3_fs.h linux-3.0-vs2.3.1-pre8/include/linux/ext3_fs.h ---- linux-3.0/include/linux/ext3_fs.h 2011-07-22 11:18:10.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/include/linux/ext3_fs.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/ext3_fs.h linux-3.0.1-vs2.3.1-pre9/include/linux/ext3_fs.h +--- linux-3.0.1/include/linux/ext3_fs.h 2011-07-22 11:18:10.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/ext3_fs.h 2011-06-10 22:11:24.000000000 +0200 @@ -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) */ @@ -10196,9 +10196,9 @@ diff -NurpP --minimal linux-3.0/include/linux/ext3_fs.h linux-3.0-vs2.3.1-pre8/i /* ioctl.c */ extern long ext3_ioctl(struct file *, unsigned int, unsigned long); -diff -NurpP --minimal linux-3.0/include/linux/fs.h linux-3.0-vs2.3.1-pre8/include/linux/fs.h ---- linux-3.0/include/linux/fs.h 2011-07-22 11:18:10.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/include/linux/fs.h 2011-07-01 11:35:35.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/fs.h linux-3.0.1-vs2.3.1-pre9/include/linux/fs.h +--- linux-3.0.1/include/linux/fs.h 2011-07-22 11:18:10.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/fs.h 2011-07-01 11:35:35.000000000 +0200 @@ -208,6 +208,9 @@ struct inodes_stat_t { #define MS_KERNMOUNT (1<<22) /* this is a kern_mount call */ #define MS_I_VERSION (1<<23) /* Update inode I_version field */ @@ -10381,9 +10381,9 @@ diff -NurpP --minimal linux-3.0/include/linux/fs.h linux-3.0-vs2.3.1-pre8/includ extern int simple_setattr(struct dentry *, struct iattr *); extern int simple_getattr(struct vfsmount *, struct dentry *, struct kstat *); extern int simple_statfs(struct dentry *, struct kstatfs *); -diff -NurpP --minimal linux-3.0/include/linux/gfs2_ondisk.h linux-3.0-vs2.3.1-pre8/include/linux/gfs2_ondisk.h ---- linux-3.0/include/linux/gfs2_ondisk.h 2010-07-07 18:31:55.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/include/linux/gfs2_ondisk.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/gfs2_ondisk.h linux-3.0.1-vs2.3.1-pre9/include/linux/gfs2_ondisk.h +--- linux-3.0.1/include/linux/gfs2_ondisk.h 2010-07-07 18:31:55.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/gfs2_ondisk.h 2011-06-10 22:11:24.000000000 +0200 @@ -211,6 +211,9 @@ enum { gfs2fl_NoAtime = 7, gfs2fl_Sync = 8, @@ -10404,9 +10404,9 @@ diff -NurpP --minimal linux-3.0/include/linux/gfs2_ondisk.h linux-3.0-vs2.3.1-pr #define GFS2_DIF_TRUNC_IN_PROG 0x20000000 /* New in gfs2 */ #define GFS2_DIF_INHERIT_DIRECTIO 0x40000000 #define GFS2_DIF_INHERIT_JDATA 0x80000000 -diff -NurpP --minimal linux-3.0/include/linux/if_tun.h linux-3.0-vs2.3.1-pre8/include/linux/if_tun.h ---- linux-3.0/include/linux/if_tun.h 2010-08-02 16:52:54.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/include/linux/if_tun.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/if_tun.h linux-3.0.1-vs2.3.1-pre9/include/linux/if_tun.h +--- linux-3.0.1/include/linux/if_tun.h 2010-08-02 16:52:54.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/if_tun.h 2011-06-10 22:11:24.000000000 +0200 @@ -53,6 +53,7 @@ #define TUNDETACHFILTER _IOW('T', 214, struct sock_fprog) #define TUNGETVNETHDRSZ _IOR('T', 215, int) @@ -10415,9 +10415,9 @@ diff -NurpP --minimal linux-3.0/include/linux/if_tun.h linux-3.0-vs2.3.1-pre8/in /* TUNSETIFF ifr flags */ #define IFF_TUN 0x0001 -diff -NurpP --minimal linux-3.0/include/linux/init_task.h linux-3.0-vs2.3.1-pre8/include/linux/init_task.h ---- linux-3.0/include/linux/init_task.h 2011-07-22 11:18:10.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/include/linux/init_task.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/init_task.h linux-3.0.1-vs2.3.1-pre9/include/linux/init_task.h +--- linux-3.0.1/include/linux/init_task.h 2011-07-22 11:18:10.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/init_task.h 2011-06-10 22:11:24.000000000 +0200 @@ -193,6 +193,10 @@ extern struct cred init_cred; INIT_FTRACE_GRAPH \ INIT_TRACE_RECURSION \ @@ -10429,9 +10429,9 @@ diff -NurpP --minimal linux-3.0/include/linux/init_task.h linux-3.0-vs2.3.1-pre8 } -diff -NurpP --minimal linux-3.0/include/linux/ipc.h linux-3.0-vs2.3.1-pre8/include/linux/ipc.h ---- linux-3.0/include/linux/ipc.h 2009-12-03 20:02:55.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/ipc.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/ipc.h linux-3.0.1-vs2.3.1-pre9/include/linux/ipc.h +--- linux-3.0.1/include/linux/ipc.h 2009-12-03 20:02:55.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/ipc.h 2011-06-10 22:11:24.000000000 +0200 @@ -91,6 +91,7 @@ struct kern_ipc_perm key_t key; uid_t uid; @@ -10440,9 +10440,9 @@ diff -NurpP --minimal linux-3.0/include/linux/ipc.h linux-3.0-vs2.3.1-pre8/inclu uid_t cuid; gid_t cgid; mode_t mode; -diff -NurpP --minimal linux-3.0/include/linux/ipc_namespace.h linux-3.0-vs2.3.1-pre8/include/linux/ipc_namespace.h ---- linux-3.0/include/linux/ipc_namespace.h 2011-05-22 16:17:55.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/include/linux/ipc_namespace.h 2011-06-13 14:09:44.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/ipc_namespace.h linux-3.0.1-vs2.3.1-pre9/include/linux/ipc_namespace.h +--- linux-3.0.1/include/linux/ipc_namespace.h 2011-05-22 16:17:55.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/ipc_namespace.h 2011-06-13 14:09:44.000000000 +0200 @@ -94,7 +94,8 @@ static inline int mq_init_ns(struct ipc_ #if defined(CONFIG_IPC_NS) @@ -10469,9 +10469,9 @@ diff -NurpP --minimal linux-3.0/include/linux/ipc_namespace.h linux-3.0-vs2.3.1- } static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns) -diff -NurpP --minimal linux-3.0/include/linux/loop.h linux-3.0-vs2.3.1-pre8/include/linux/loop.h ---- linux-3.0/include/linux/loop.h 2009-09-10 15:26:25.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/include/linux/loop.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/loop.h linux-3.0.1-vs2.3.1-pre9/include/linux/loop.h +--- linux-3.0.1/include/linux/loop.h 2009-09-10 15:26:25.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/loop.h 2011-06-10 22:11:24.000000000 +0200 @@ -45,6 +45,7 @@ struct loop_device { struct loop_func_table *lo_encryption; __u32 lo_init[2]; @@ -10480,9 +10480,9 @@ diff -NurpP --minimal linux-3.0/include/linux/loop.h linux-3.0-vs2.3.1-pre8/incl int (*ioctl)(struct loop_device *, int cmd, unsigned long arg); -diff -NurpP --minimal linux-3.0/include/linux/magic.h linux-3.0-vs2.3.1-pre8/include/linux/magic.h ---- linux-3.0/include/linux/magic.h 2011-05-22 16:17:55.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/include/linux/magic.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/magic.h linux-3.0.1-vs2.3.1-pre9/include/linux/magic.h +--- linux-3.0.1/include/linux/magic.h 2011-05-22 16:17:55.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/magic.h 2011-06-10 22:11:24.000000000 +0200 @@ -3,7 +3,7 @@ #define ADFS_SUPER_MAGIC 0xadf5 @@ -10500,9 +10500,9 @@ diff -NurpP --minimal linux-3.0/include/linux/magic.h linux-3.0-vs2.3.1-pre8/inc #define QNX4_SUPER_MAGIC 0x002f /* qnx4 fs detection */ #define REISERFS_SUPER_MAGIC 0x52654973 /* used by gcc */ -diff -NurpP --minimal linux-3.0/include/linux/major.h linux-3.0-vs2.3.1-pre8/include/linux/major.h ---- linux-3.0/include/linux/major.h 2009-09-10 15:26:25.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/include/linux/major.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/major.h linux-3.0.1-vs2.3.1-pre9/include/linux/major.h +--- linux-3.0.1/include/linux/major.h 2009-09-10 15:26:25.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/major.h 2011-06-10 22:11:24.000000000 +0200 @@ -15,6 +15,7 @@ #define HD_MAJOR IDE0_MAJOR #define PTY_SLAVE_MAJOR 3 @@ -10511,9 +10511,9 @@ diff -NurpP --minimal linux-3.0/include/linux/major.h linux-3.0-vs2.3.1-pre8/inc #define TTYAUX_MAJOR 5 #define LP_MAJOR 6 #define VCS_MAJOR 7 -diff -NurpP --minimal linux-3.0/include/linux/memcontrol.h linux-3.0-vs2.3.1-pre8/include/linux/memcontrol.h ---- linux-3.0/include/linux/memcontrol.h 2011-07-22 11:18:10.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/include/linux/memcontrol.h 2011-06-22 12:39:15.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/memcontrol.h linux-3.0.1-vs2.3.1-pre9/include/linux/memcontrol.h +--- linux-3.0.1/include/linux/memcontrol.h 2011-07-22 11:18:10.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/memcontrol.h 2011-06-22 12:39:15.000000000 +0200 @@ -86,6 +86,13 @@ extern struct mem_cgroup *try_get_mem_cg extern struct mem_cgroup *mem_cgroup_from_task(struct task_struct *p); extern struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm); @@ -10528,9 +10528,9 @@ diff -NurpP --minimal linux-3.0/include/linux/memcontrol.h linux-3.0-vs2.3.1-pre static inline int mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *cgroup) { -diff -NurpP --minimal linux-3.0/include/linux/mm_types.h linux-3.0-vs2.3.1-pre8/include/linux/mm_types.h ---- linux-3.0/include/linux/mm_types.h 2011-07-22 11:18:11.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/include/linux/mm_types.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/mm_types.h linux-3.0.1-vs2.3.1-pre9/include/linux/mm_types.h +--- linux-3.0.1/include/linux/mm_types.h 2011-07-22 11:18:11.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/mm_types.h 2011-06-10 22:11:24.000000000 +0200 @@ -268,6 +268,7 @@ struct mm_struct { /* Architecture-specific MM context */ @@ -10539,9 +10539,9 @@ diff -NurpP --minimal linux-3.0/include/linux/mm_types.h linux-3.0-vs2.3.1-pre8/ /* Swap token stuff */ /* -diff -NurpP --minimal linux-3.0/include/linux/mmzone.h linux-3.0-vs2.3.1-pre8/include/linux/mmzone.h ---- linux-3.0/include/linux/mmzone.h 2011-07-22 11:18:11.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/include/linux/mmzone.h 2011-07-01 11:35:35.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/mmzone.h linux-3.0.1-vs2.3.1-pre9/include/linux/mmzone.h +--- linux-3.0.1/include/linux/mmzone.h 2011-07-22 11:18:11.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/mmzone.h 2011-07-01 11:35:35.000000000 +0200 @@ -654,6 +654,13 @@ typedef struct pglist_data { __pgdat->node_start_pfn + __pgdat->node_spanned_pages;\ }) @@ -10556,9 +10556,9 @@ diff -NurpP --minimal linux-3.0/include/linux/mmzone.h linux-3.0-vs2.3.1-pre8/in #include extern struct mutex zonelists_mutex; -diff -NurpP --minimal linux-3.0/include/linux/mount.h linux-3.0-vs2.3.1-pre8/include/linux/mount.h ---- linux-3.0/include/linux/mount.h 2011-03-15 18:07:39.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/mount.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/mount.h linux-3.0.1-vs2.3.1-pre9/include/linux/mount.h +--- linux-3.0.1/include/linux/mount.h 2011-03-15 18:07:39.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/mount.h 2011-06-10 22:11:24.000000000 +0200 @@ -52,6 +52,9 @@ struct mnt_pcp { int mnt_writers; }; @@ -10577,9 +10577,9 @@ diff -NurpP --minimal linux-3.0/include/linux/mount.h linux-3.0-vs2.3.1-pre8/inc }; struct file; /* forward dec */ -diff -NurpP --minimal linux-3.0/include/linux/net.h linux-3.0-vs2.3.1-pre8/include/linux/net.h ---- linux-3.0/include/linux/net.h 2011-07-22 11:18:11.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/include/linux/net.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/net.h linux-3.0.1-vs2.3.1-pre9/include/linux/net.h +--- linux-3.0.1/include/linux/net.h 2011-07-22 11:18:11.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/net.h 2011-06-10 22:11:24.000000000 +0200 @@ -72,6 +72,7 @@ struct net; #define SOCK_NOSPACE 2 #define SOCK_PASSCRED 3 @@ -10588,9 +10588,9 @@ diff -NurpP --minimal linux-3.0/include/linux/net.h linux-3.0-vs2.3.1-pre8/inclu #ifndef ARCH_HAS_SOCKET_TYPES /** -diff -NurpP --minimal linux-3.0/include/linux/nfs_mount.h linux-3.0-vs2.3.1-pre8/include/linux/nfs_mount.h ---- linux-3.0/include/linux/nfs_mount.h 2011-01-05 21:50:31.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/nfs_mount.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/nfs_mount.h linux-3.0.1-vs2.3.1-pre9/include/linux/nfs_mount.h +--- linux-3.0.1/include/linux/nfs_mount.h 2011-01-05 21:50:31.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/nfs_mount.h 2011-06-10 22:11:24.000000000 +0200 @@ -63,7 +63,8 @@ struct nfs_mount_data { #define NFS_MOUNT_SECFLAVOUR 0x2000 /* 5 */ #define NFS_MOUNT_NORDIRPLUS 0x4000 /* 5 */ @@ -10601,9 +10601,9 @@ diff -NurpP --minimal linux-3.0/include/linux/nfs_mount.h linux-3.0-vs2.3.1-pre8 /* The following are for internal use only */ #define NFS_MOUNT_LOOKUP_CACHE_NONEG 0x10000 -diff -NurpP --minimal linux-3.0/include/linux/nsproxy.h linux-3.0-vs2.3.1-pre8/include/linux/nsproxy.h ---- linux-3.0/include/linux/nsproxy.h 2011-07-22 11:18:11.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/include/linux/nsproxy.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/nsproxy.h linux-3.0.1-vs2.3.1-pre9/include/linux/nsproxy.h +--- linux-3.0.1/include/linux/nsproxy.h 2011-07-22 11:18:11.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/nsproxy.h 2011-06-10 22:11:24.000000000 +0200 @@ -3,6 +3,7 @@ #include @@ -10652,9 +10652,9 @@ diff -NurpP --minimal linux-3.0/include/linux/nsproxy.h linux-3.0-vs2.3.1-pre8/i } #endif -diff -NurpP --minimal linux-3.0/include/linux/pid.h linux-3.0-vs2.3.1-pre8/include/linux/pid.h ---- linux-3.0/include/linux/pid.h 2011-07-22 11:18:11.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/include/linux/pid.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/pid.h linux-3.0.1-vs2.3.1-pre9/include/linux/pid.h +--- linux-3.0.1/include/linux/pid.h 2011-07-22 11:18:11.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/pid.h 2011-06-10 22:11:24.000000000 +0200 @@ -8,7 +8,8 @@ enum pid_type PIDTYPE_PID, PIDTYPE_PGID, @@ -10673,9 +10673,9 @@ diff -NurpP --minimal linux-3.0/include/linux/pid.h linux-3.0-vs2.3.1-pre8/inclu pid_t pid_vnr(struct pid *pid); #define do_each_pid_task(pid, type, task) \ -diff -NurpP --minimal linux-3.0/include/linux/proc_fs.h linux-3.0-vs2.3.1-pre8/include/linux/proc_fs.h ---- linux-3.0/include/linux/proc_fs.h 2011-07-22 11:18:11.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/include/linux/proc_fs.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/proc_fs.h linux-3.0.1-vs2.3.1-pre9/include/linux/proc_fs.h +--- linux-3.0.1/include/linux/proc_fs.h 2011-07-22 11:18:11.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/proc_fs.h 2011-06-10 22:11:24.000000000 +0200 @@ -56,6 +56,7 @@ struct proc_dir_entry { nlink_t nlink; uid_t uid; @@ -10711,9 +10711,9 @@ diff -NurpP --minimal linux-3.0/include/linux/proc_fs.h linux-3.0-vs2.3.1-pre8/i int fd; union proc_op op; struct proc_dir_entry *pde; -diff -NurpP --minimal linux-3.0/include/linux/quotaops.h linux-3.0-vs2.3.1-pre8/include/linux/quotaops.h ---- linux-3.0/include/linux/quotaops.h 2011-05-22 16:17:57.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/include/linux/quotaops.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/quotaops.h linux-3.0.1-vs2.3.1-pre9/include/linux/quotaops.h +--- linux-3.0.1/include/linux/quotaops.h 2011-05-22 16:17:57.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/quotaops.h 2011-06-10 22:11:24.000000000 +0200 @@ -8,6 +8,7 @@ #define _LINUX_QUOTAOPS_ @@ -10755,9 +10755,9 @@ diff -NurpP --minimal linux-3.0/include/linux/quotaops.h linux-3.0-vs2.3.1-pre8/ } static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number) -diff -NurpP --minimal linux-3.0/include/linux/reboot.h linux-3.0-vs2.3.1-pre8/include/linux/reboot.h ---- linux-3.0/include/linux/reboot.h 2010-07-07 18:31:56.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/include/linux/reboot.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/reboot.h linux-3.0.1-vs2.3.1-pre9/include/linux/reboot.h +--- linux-3.0.1/include/linux/reboot.h 2010-07-07 18:31:56.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/reboot.h 2011-06-10 22:11:24.000000000 +0200 @@ -33,6 +33,7 @@ #define LINUX_REBOOT_CMD_RESTART2 0xA1B2C3D4 #define LINUX_REBOOT_CMD_SW_SUSPEND 0xD000FCE2 @@ -10766,9 +10766,9 @@ diff -NurpP --minimal linux-3.0/include/linux/reboot.h linux-3.0-vs2.3.1-pre8/in #ifdef __KERNEL__ -diff -NurpP --minimal linux-3.0/include/linux/reiserfs_fs.h linux-3.0-vs2.3.1-pre8/include/linux/reiserfs_fs.h ---- linux-3.0/include/linux/reiserfs_fs.h 2011-05-22 16:17:58.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/include/linux/reiserfs_fs.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/reiserfs_fs.h linux-3.0.1-vs2.3.1-pre9/include/linux/reiserfs_fs.h +--- linux-3.0.1/include/linux/reiserfs_fs.h 2011-05-22 16:17:58.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/reiserfs_fs.h 2011-06-10 22:11:24.000000000 +0200 @@ -976,6 +976,11 @@ struct stat_data_v1 { #define REISERFS_COMPR_FL FS_COMPR_FL #define REISERFS_NOTAIL_FL FS_NOTAIL_FL @@ -10799,9 +10799,9 @@ diff -NurpP --minimal linux-3.0/include/linux/reiserfs_fs.h linux-3.0-vs2.3.1-pr int __reiserfs_write_begin(struct page *page, unsigned from, unsigned len); -diff -NurpP --minimal linux-3.0/include/linux/reiserfs_fs_sb.h linux-3.0-vs2.3.1-pre8/include/linux/reiserfs_fs_sb.h ---- linux-3.0/include/linux/reiserfs_fs_sb.h 2010-02-25 11:52:07.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/reiserfs_fs_sb.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/reiserfs_fs_sb.h linux-3.0.1-vs2.3.1-pre9/include/linux/reiserfs_fs_sb.h +--- linux-3.0.1/include/linux/reiserfs_fs_sb.h 2010-02-25 11:52:07.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/reiserfs_fs_sb.h 2011-06-10 22:11:24.000000000 +0200 @@ -476,6 +476,7 @@ enum reiserfs_mount_options { REISERFS_EXPOSE_PRIVROOT, REISERFS_BARRIER_NONE, @@ -10810,9 +10810,9 @@ diff -NurpP --minimal linux-3.0/include/linux/reiserfs_fs_sb.h linux-3.0-vs2.3.1 /* Actions on error */ REISERFS_ERROR_PANIC, -diff -NurpP --minimal linux-3.0/include/linux/sched.h linux-3.0-vs2.3.1-pre8/include/linux/sched.h ---- linux-3.0/include/linux/sched.h 2011-07-22 11:18:11.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/include/linux/sched.h 2011-07-22 11:20:39.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/sched.h linux-3.0.1-vs2.3.1-pre9/include/linux/sched.h +--- linux-3.0.1/include/linux/sched.h 2011-07-22 11:18:11.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/sched.h 2011-07-22 11:20:39.000000000 +0200 @@ -1406,6 +1406,14 @@ struct task_struct { #endif seccomp_t seccomp; @@ -10859,9 +10859,9 @@ diff -NurpP --minimal linux-3.0/include/linux/sched.h linux-3.0-vs2.3.1-pre8/inc } -diff -NurpP --minimal linux-3.0/include/linux/shmem_fs.h linux-3.0-vs2.3.1-pre8/include/linux/shmem_fs.h ---- linux-3.0/include/linux/shmem_fs.h 2011-07-22 11:18:11.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/include/linux/shmem_fs.h 2011-07-01 11:35:35.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/shmem_fs.h linux-3.0.1-vs2.3.1-pre9/include/linux/shmem_fs.h +--- linux-3.0.1/include/linux/shmem_fs.h 2011-07-22 11:18:11.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/shmem_fs.h 2011-07-01 11:35:35.000000000 +0200 @@ -12,6 +12,9 @@ #define SHMEM_SYMLINK_INLINE_LEN (SHMEM_NR_DIRECT * sizeof(swp_entry_t)) @@ -10872,9 +10872,9 @@ diff -NurpP --minimal linux-3.0/include/linux/shmem_fs.h linux-3.0-vs2.3.1-pre8/ struct shmem_inode_info { spinlock_t lock; unsigned long flags; -diff -NurpP --minimal linux-3.0/include/linux/stat.h linux-3.0-vs2.3.1-pre8/include/linux/stat.h ---- linux-3.0/include/linux/stat.h 2008-12-25 00:26:37.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/stat.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/stat.h linux-3.0.1-vs2.3.1-pre9/include/linux/stat.h +--- linux-3.0.1/include/linux/stat.h 2008-12-25 00:26:37.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/stat.h 2011-06-10 22:11:24.000000000 +0200 @@ -66,6 +66,7 @@ struct kstat { unsigned int nlink; uid_t uid; @@ -10883,9 +10883,9 @@ diff -NurpP --minimal linux-3.0/include/linux/stat.h linux-3.0-vs2.3.1-pre8/incl dev_t rdev; loff_t size; struct timespec atime; -diff -NurpP --minimal linux-3.0/include/linux/sunrpc/auth.h linux-3.0-vs2.3.1-pre8/include/linux/sunrpc/auth.h ---- linux-3.0/include/linux/sunrpc/auth.h 2011-03-15 18:07:39.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/sunrpc/auth.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/sunrpc/auth.h linux-3.0.1-vs2.3.1-pre9/include/linux/sunrpc/auth.h +--- linux-3.0.1/include/linux/sunrpc/auth.h 2011-03-15 18:07:39.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/sunrpc/auth.h 2011-06-10 22:11:24.000000000 +0200 @@ -25,6 +25,7 @@ struct auth_cred { uid_t uid; @@ -10894,9 +10894,9 @@ diff -NurpP --minimal linux-3.0/include/linux/sunrpc/auth.h linux-3.0-vs2.3.1-pr struct group_info *group_info; unsigned char machine_cred : 1; }; -diff -NurpP --minimal linux-3.0/include/linux/sunrpc/clnt.h linux-3.0-vs2.3.1-pre8/include/linux/sunrpc/clnt.h ---- linux-3.0/include/linux/sunrpc/clnt.h 2011-05-22 16:17:58.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/include/linux/sunrpc/clnt.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/sunrpc/clnt.h linux-3.0.1-vs2.3.1-pre9/include/linux/sunrpc/clnt.h +--- linux-3.0.1/include/linux/sunrpc/clnt.h 2011-05-22 16:17:58.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/sunrpc/clnt.h 2011-06-10 22:11:24.000000000 +0200 @@ -49,7 +49,8 @@ struct rpc_clnt { unsigned int cl_softrtry : 1,/* soft timeouts */ cl_discrtry : 1,/* disconnect before retry */ @@ -10907,9 +10907,9 @@ diff -NurpP --minimal linux-3.0/include/linux/sunrpc/clnt.h linux-3.0-vs2.3.1-pr struct rpc_rtt * cl_rtt; /* RTO estimator data */ const struct rpc_timeout *cl_timeout; /* Timeout strategy */ -diff -NurpP --minimal linux-3.0/include/linux/syscalls.h linux-3.0-vs2.3.1-pre8/include/linux/syscalls.h ---- linux-3.0/include/linux/syscalls.h 2011-07-22 11:18:11.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/include/linux/syscalls.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/syscalls.h linux-3.0.1-vs2.3.1-pre9/include/linux/syscalls.h +--- linux-3.0.1/include/linux/syscalls.h 2011-07-22 11:18:11.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/syscalls.h 2011-06-10 22:11:24.000000000 +0200 @@ -483,6 +483,8 @@ asmlinkage long sys_symlink(const char _ asmlinkage long sys_unlink(const char __user *pathname); asmlinkage long sys_rename(const char __user *oldname, @@ -10919,9 +10919,9 @@ diff -NurpP --minimal linux-3.0/include/linux/syscalls.h linux-3.0-vs2.3.1-pre8/ asmlinkage long sys_chmod(const char __user *filename, mode_t mode); asmlinkage long sys_fchmod(unsigned int fd, mode_t mode); -diff -NurpP --minimal linux-3.0/include/linux/sysctl.h linux-3.0-vs2.3.1-pre8/include/linux/sysctl.h ---- linux-3.0/include/linux/sysctl.h 2011-03-15 18:07:40.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/sysctl.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/sysctl.h linux-3.0.1-vs2.3.1-pre9/include/linux/sysctl.h +--- linux-3.0.1/include/linux/sysctl.h 2011-03-15 18:07:40.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/sysctl.h 2011-06-10 22:11:24.000000000 +0200 @@ -60,6 +60,7 @@ enum CTL_ABI=9, /* Binary emulation */ CTL_CPU=10, /* CPU stuff (speed scaling, etc) */ @@ -10938,9 +10938,9 @@ diff -NurpP --minimal linux-3.0/include/linux/sysctl.h linux-3.0-vs2.3.1-pre8/in KERN_SPARC_REBOOT=21, /* reboot command on Sparc */ KERN_CTLALTDEL=22, /* int: allow ctl-alt-del to reboot */ -diff -NurpP --minimal linux-3.0/include/linux/sysfs.h linux-3.0-vs2.3.1-pre8/include/linux/sysfs.h ---- linux-3.0/include/linux/sysfs.h 2011-07-22 11:18:11.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/include/linux/sysfs.h 2011-06-22 12:39:15.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/sysfs.h linux-3.0.1-vs2.3.1-pre9/include/linux/sysfs.h +--- linux-3.0.1/include/linux/sysfs.h 2011-07-22 11:18:11.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/sysfs.h 2011-06-22 12:39:15.000000000 +0200 @@ -19,6 +19,8 @@ #include #include @@ -10950,9 +10950,9 @@ diff -NurpP --minimal linux-3.0/include/linux/sysfs.h linux-3.0-vs2.3.1-pre8/inc struct kobject; struct module; enum kobj_ns_type; -diff -NurpP --minimal linux-3.0/include/linux/time.h linux-3.0-vs2.3.1-pre8/include/linux/time.h ---- linux-3.0/include/linux/time.h 2011-07-22 11:18:11.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/include/linux/time.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/time.h linux-3.0.1-vs2.3.1-pre9/include/linux/time.h +--- linux-3.0.1/include/linux/time.h 2011-07-22 11:18:11.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/time.h 2011-06-10 22:11:24.000000000 +0200 @@ -256,6 +256,9 @@ static __always_inline void timespec_add a->tv_sec += __iter_div_u64_rem(a->tv_nsec + ns, NSEC_PER_SEC, &ns); a->tv_nsec = ns; @@ -10963,9 +10963,9 @@ diff -NurpP --minimal linux-3.0/include/linux/time.h linux-3.0-vs2.3.1-pre8/incl #endif /* __KERNEL__ */ #define NFDBITS __NFDBITS -diff -NurpP --minimal linux-3.0/include/linux/types.h linux-3.0-vs2.3.1-pre8/include/linux/types.h ---- linux-3.0/include/linux/types.h 2011-05-22 16:17:58.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/include/linux/types.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/types.h linux-3.0.1-vs2.3.1-pre9/include/linux/types.h +--- linux-3.0.1/include/linux/types.h 2011-05-22 16:17:58.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/types.h 2011-06-10 22:11:24.000000000 +0200 @@ -40,6 +40,9 @@ typedef __kernel_uid32_t uid_t; typedef __kernel_gid32_t gid_t; typedef __kernel_uid16_t uid16_t; @@ -10976,9 +10976,9 @@ diff -NurpP --minimal linux-3.0/include/linux/types.h linux-3.0-vs2.3.1-pre8/inc typedef unsigned long uintptr_t; -diff -NurpP --minimal linux-3.0/include/linux/utsname.h linux-3.0-vs2.3.1-pre8/include/linux/utsname.h ---- linux-3.0/include/linux/utsname.h 2011-05-22 16:17:58.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/include/linux/utsname.h 2011-06-13 14:36:48.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/utsname.h linux-3.0.1-vs2.3.1-pre9/include/linux/utsname.h +--- linux-3.0.1/include/linux/utsname.h 2011-05-22 16:17:58.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/utsname.h 2011-06-13 14:36:48.000000000 +0200 @@ -54,7 +54,8 @@ static inline void get_uts_ns(struct uts } @@ -11005,9 +11005,9 @@ diff -NurpP --minimal linux-3.0/include/linux/utsname.h linux-3.0-vs2.3.1-pre8/i } #endif -diff -NurpP --minimal linux-3.0/include/linux/vroot.h linux-3.0-vs2.3.1-pre8/include/linux/vroot.h ---- linux-3.0/include/linux/vroot.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vroot.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vroot.h linux-3.0.1-vs2.3.1-pre9/include/linux/vroot.h +--- linux-3.0.1/include/linux/vroot.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vroot.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,51 @@ + +/* @@ -11060,9 +11060,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vroot.h linux-3.0-vs2.3.1-pre8/inc +#define VROOT_CLR_DEV 0x5601 + +#endif /* _LINUX_VROOT_H */ -diff -NurpP --minimal linux-3.0/include/linux/vs_base.h linux-3.0-vs2.3.1-pre8/include/linux/vs_base.h ---- linux-3.0/include/linux/vs_base.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vs_base.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vs_base.h linux-3.0.1-vs2.3.1-pre9/include/linux/vs_base.h +--- linux-3.0.1/include/linux/vs_base.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vs_base.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,10 @@ +#ifndef _VS_BASE_H +#define _VS_BASE_H @@ -11074,9 +11074,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vs_base.h linux-3.0-vs2.3.1-pre8/i +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.0/include/linux/vs_context.h linux-3.0-vs2.3.1-pre8/include/linux/vs_context.h ---- linux-3.0/include/linux/vs_context.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vs_context.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vs_context.h linux-3.0.1-vs2.3.1-pre9/include/linux/vs_context.h +--- linux-3.0.1/include/linux/vs_context.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vs_context.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,242 @@ +#ifndef _VS_CONTEXT_H +#define _VS_CONTEXT_H @@ -11320,9 +11320,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vs_context.h linux-3.0-vs2.3.1-pre +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.0/include/linux/vs_cowbl.h linux-3.0-vs2.3.1-pre8/include/linux/vs_cowbl.h ---- linux-3.0/include/linux/vs_cowbl.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vs_cowbl.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vs_cowbl.h linux-3.0.1-vs2.3.1-pre9/include/linux/vs_cowbl.h +--- linux-3.0.1/include/linux/vs_cowbl.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vs_cowbl.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,48 @@ +#ifndef _VS_COWBL_H +#define _VS_COWBL_H @@ -11372,9 +11372,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vs_cowbl.h linux-3.0-vs2.3.1-pre8/ +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.0/include/linux/vs_cvirt.h linux-3.0-vs2.3.1-pre8/include/linux/vs_cvirt.h ---- linux-3.0/include/linux/vs_cvirt.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vs_cvirt.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vs_cvirt.h linux-3.0.1-vs2.3.1-pre9/include/linux/vs_cvirt.h +--- linux-3.0.1/include/linux/vs_cvirt.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vs_cvirt.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,50 @@ +#ifndef _VS_CVIRT_H +#define _VS_CVIRT_H @@ -11426,9 +11426,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vs_cvirt.h linux-3.0-vs2.3.1-pre8/ +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.0/include/linux/vs_device.h linux-3.0-vs2.3.1-pre8/include/linux/vs_device.h ---- linux-3.0/include/linux/vs_device.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vs_device.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vs_device.h linux-3.0.1-vs2.3.1-pre9/include/linux/vs_device.h +--- linux-3.0.1/include/linux/vs_device.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vs_device.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,45 @@ +#ifndef _VS_DEVICE_H +#define _VS_DEVICE_H @@ -11475,9 +11475,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vs_device.h linux-3.0-vs2.3.1-pre8 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.0/include/linux/vs_dlimit.h linux-3.0-vs2.3.1-pre8/include/linux/vs_dlimit.h ---- linux-3.0/include/linux/vs_dlimit.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vs_dlimit.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vs_dlimit.h linux-3.0.1-vs2.3.1-pre9/include/linux/vs_dlimit.h +--- linux-3.0.1/include/linux/vs_dlimit.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vs_dlimit.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,215 @@ +#ifndef _VS_DLIMIT_H +#define _VS_DLIMIT_H @@ -11694,9 +11694,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vs_dlimit.h linux-3.0-vs2.3.1-pre8 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.0/include/linux/vs_inet.h linux-3.0-vs2.3.1-pre8/include/linux/vs_inet.h ---- linux-3.0/include/linux/vs_inet.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vs_inet.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vs_inet.h linux-3.0.1-vs2.3.1-pre9/include/linux/vs_inet.h +--- linux-3.0.1/include/linux/vs_inet.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vs_inet.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,351 @@ +#ifndef _VS_INET_H +#define _VS_INET_H @@ -12049,9 +12049,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vs_inet.h linux-3.0-vs2.3.1-pre8/i +#else +// #warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.0/include/linux/vs_inet6.h linux-3.0-vs2.3.1-pre8/include/linux/vs_inet6.h ---- linux-3.0/include/linux/vs_inet6.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vs_inet6.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vs_inet6.h linux-3.0.1-vs2.3.1-pre9/include/linux/vs_inet6.h +--- linux-3.0.1/include/linux/vs_inet6.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vs_inet6.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,246 @@ +#ifndef _VS_INET6_H +#define _VS_INET6_H @@ -12299,9 +12299,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vs_inet6.h linux-3.0-vs2.3.1-pre8/ +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.0/include/linux/vs_limit.h linux-3.0-vs2.3.1-pre8/include/linux/vs_limit.h ---- linux-3.0/include/linux/vs_limit.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vs_limit.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vs_limit.h linux-3.0.1-vs2.3.1-pre9/include/linux/vs_limit.h +--- linux-3.0.1/include/linux/vs_limit.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vs_limit.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,140 @@ +#ifndef _VS_LIMIT_H +#define _VS_LIMIT_H @@ -12443,9 +12443,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vs_limit.h linux-3.0-vs2.3.1-pre8/ +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.0/include/linux/vs_memory.h linux-3.0-vs2.3.1-pre8/include/linux/vs_memory.h ---- linux-3.0/include/linux/vs_memory.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vs_memory.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vs_memory.h linux-3.0.1-vs2.3.1-pre9/include/linux/vs_memory.h +--- linux-3.0.1/include/linux/vs_memory.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vs_memory.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,58 @@ +#ifndef _VS_MEMORY_H +#define _VS_MEMORY_H @@ -12505,9 +12505,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vs_memory.h linux-3.0-vs2.3.1-pre8 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.0/include/linux/vs_network.h linux-3.0-vs2.3.1-pre8/include/linux/vs_network.h ---- linux-3.0/include/linux/vs_network.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vs_network.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vs_network.h linux-3.0.1-vs2.3.1-pre9/include/linux/vs_network.h +--- linux-3.0.1/include/linux/vs_network.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vs_network.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,169 @@ +#ifndef _NX_VS_NETWORK_H +#define _NX_VS_NETWORK_H @@ -12678,9 +12678,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vs_network.h linux-3.0-vs2.3.1-pre +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.0/include/linux/vs_pid.h linux-3.0-vs2.3.1-pre8/include/linux/vs_pid.h ---- linux-3.0/include/linux/vs_pid.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vs_pid.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vs_pid.h linux-3.0.1-vs2.3.1-pre9/include/linux/vs_pid.h +--- linux-3.0.1/include/linux/vs_pid.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vs_pid.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,50 @@ +#ifndef _VS_PID_H +#define _VS_PID_H @@ -12732,9 +12732,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vs_pid.h linux-3.0-vs2.3.1-pre8/in +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.0/include/linux/vs_sched.h linux-3.0-vs2.3.1-pre8/include/linux/vs_sched.h ---- linux-3.0/include/linux/vs_sched.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vs_sched.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vs_sched.h linux-3.0.1-vs2.3.1-pre9/include/linux/vs_sched.h +--- linux-3.0.1/include/linux/vs_sched.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vs_sched.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,40 @@ +#ifndef _VS_SCHED_H +#define _VS_SCHED_H @@ -12776,9 +12776,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vs_sched.h linux-3.0-vs2.3.1-pre8/ +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.0/include/linux/vs_socket.h linux-3.0-vs2.3.1-pre8/include/linux/vs_socket.h ---- linux-3.0/include/linux/vs_socket.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vs_socket.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vs_socket.h linux-3.0.1-vs2.3.1-pre9/include/linux/vs_socket.h +--- linux-3.0.1/include/linux/vs_socket.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vs_socket.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,67 @@ +#ifndef _VS_SOCKET_H +#define _VS_SOCKET_H @@ -12847,9 +12847,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vs_socket.h linux-3.0-vs2.3.1-pre8 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.0/include/linux/vs_tag.h linux-3.0-vs2.3.1-pre8/include/linux/vs_tag.h ---- linux-3.0/include/linux/vs_tag.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vs_tag.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vs_tag.h linux-3.0.1-vs2.3.1-pre9/include/linux/vs_tag.h +--- linux-3.0.1/include/linux/vs_tag.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vs_tag.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,47 @@ +#ifndef _VS_TAG_H +#define _VS_TAG_H @@ -12898,9 +12898,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vs_tag.h linux-3.0-vs2.3.1-pre8/in +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.0/include/linux/vs_time.h linux-3.0-vs2.3.1-pre8/include/linux/vs_time.h ---- linux-3.0/include/linux/vs_time.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vs_time.h 2011-06-13 14:57:45.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vs_time.h linux-3.0.1-vs2.3.1-pre9/include/linux/vs_time.h +--- linux-3.0.1/include/linux/vs_time.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vs_time.h 2011-06-13 14:57:45.000000000 +0200 @@ -0,0 +1,19 @@ +#ifndef _VS_TIME_H +#define _VS_TIME_H @@ -12921,22 +12921,22 @@ diff -NurpP --minimal linux-3.0/include/linux/vs_time.h linux-3.0-vs2.3.1-pre8/i +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.0/include/linux/vserver/Kbuild linux-3.0-vs2.3.1-pre8/include/linux/vserver/Kbuild ---- linux-3.0/include/linux/vserver/Kbuild 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vserver/Kbuild 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vserver/Kbuild linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/Kbuild +--- linux-3.0.1/include/linux/vserver/Kbuild 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/Kbuild 2011-08-08 18:02:46.000000000 +0200 @@ -0,0 +1,8 @@ + -+unifdef-y += context_cmd.h network_cmd.h space_cmd.h \ ++header-y += context_cmd.h network_cmd.h space_cmd.h \ + cacct_cmd.h cvirt_cmd.h limit_cmd.h dlimit_cmd.h \ + inode_cmd.h tag_cmd.h sched_cmd.h signal_cmd.h \ + debug_cmd.h device_cmd.h + -+unifdef-y += switch.h network.h monitor.h inode.h device.h ++header-y += switch.h network.h monitor.h inode.h device.h + -diff -NurpP --minimal linux-3.0/include/linux/vserver/base.h linux-3.0-vs2.3.1-pre8/include/linux/vserver/base.h ---- linux-3.0/include/linux/vserver/base.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vserver/base.h 2011-06-13 14:09:44.000000000 +0200 -@@ -0,0 +1,173 @@ +diff -NurpP --minimal linux-3.0.1/include/linux/vserver/base.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/base.h +--- linux-3.0.1/include/linux/vserver/base.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/base.h 2011-08-01 18:26:07.000000000 +0200 +@@ -0,0 +1,178 @@ +#ifndef _VX_BASE_H +#define _VX_BASE_H + @@ -13100,6 +13100,11 @@ diff -NurpP --minimal linux-3.0/include/linux/vserver/base.h linux-3.0-vs2.3.1-p + !((f) & ~vx_current_umask()))) + + ++#define __vx_wmask(v) ((v)->vx_wmask) ++ ++#define vx_current_wmask() __vx_wmask(current_vx_info()) ++ ++ +#define __vx_state(v) ((v) ? ((v)->vx_state) : 0) + +#define vx_info_state(v, m) (__vx_state(v) & (m)) @@ -13110,9 +13115,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vserver/base.h linux-3.0-vs2.3.1-p +#define nx_info_state(n, m) (__nx_state(n) & (m)) + +#endif -diff -NurpP --minimal linux-3.0/include/linux/vserver/cacct.h linux-3.0-vs2.3.1-pre8/include/linux/vserver/cacct.h ---- linux-3.0/include/linux/vserver/cacct.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vserver/cacct.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vserver/cacct.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/cacct.h +--- linux-3.0.1/include/linux/vserver/cacct.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/cacct.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,15 @@ +#ifndef _VX_CACCT_H +#define _VX_CACCT_H @@ -13129,9 +13134,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vserver/cacct.h linux-3.0-vs2.3.1- +}; + +#endif /* _VX_CACCT_H */ -diff -NurpP --minimal linux-3.0/include/linux/vserver/cacct_cmd.h linux-3.0-vs2.3.1-pre8/include/linux/vserver/cacct_cmd.h ---- linux-3.0/include/linux/vserver/cacct_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vserver/cacct_cmd.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vserver/cacct_cmd.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/cacct_cmd.h +--- linux-3.0.1/include/linux/vserver/cacct_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/cacct_cmd.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,23 @@ +#ifndef _VX_CACCT_CMD_H +#define _VX_CACCT_CMD_H @@ -13156,9 +13161,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vserver/cacct_cmd.h linux-3.0-vs2. + +#endif /* __KERNEL__ */ +#endif /* _VX_CACCT_CMD_H */ -diff -NurpP --minimal linux-3.0/include/linux/vserver/cacct_def.h linux-3.0-vs2.3.1-pre8/include/linux/vserver/cacct_def.h ---- linux-3.0/include/linux/vserver/cacct_def.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vserver/cacct_def.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vserver/cacct_def.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/cacct_def.h +--- linux-3.0.1/include/linux/vserver/cacct_def.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/cacct_def.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,43 @@ +#ifndef _VX_CACCT_DEF_H +#define _VX_CACCT_DEF_H @@ -13203,9 +13208,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vserver/cacct_def.h linux-3.0-vs2. +#endif + +#endif /* _VX_CACCT_DEF_H */ -diff -NurpP --minimal linux-3.0/include/linux/vserver/cacct_int.h linux-3.0-vs2.3.1-pre8/include/linux/vserver/cacct_int.h ---- linux-3.0/include/linux/vserver/cacct_int.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vserver/cacct_int.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vserver/cacct_int.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/cacct_int.h +--- linux-3.0.1/include/linux/vserver/cacct_int.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/cacct_int.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,21 @@ +#ifndef _VX_CACCT_INT_H +#define _VX_CACCT_INT_H @@ -13228,9 +13233,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vserver/cacct_int.h linux-3.0-vs2. + +#endif /* __KERNEL__ */ +#endif /* _VX_CACCT_INT_H */ -diff -NurpP --minimal linux-3.0/include/linux/vserver/check.h linux-3.0-vs2.3.1-pre8/include/linux/vserver/check.h ---- linux-3.0/include/linux/vserver/check.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vserver/check.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vserver/check.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/check.h +--- linux-3.0.1/include/linux/vserver/check.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/check.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,89 @@ +#ifndef _VS_CHECK_H +#define _VS_CHECK_H @@ -13321,10 +13326,10 @@ diff -NurpP --minimal linux-3.0/include/linux/vserver/check.h linux-3.0-vs2.3.1- +#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1) + +#endif -diff -NurpP --minimal linux-3.0/include/linux/vserver/context.h linux-3.0-vs2.3.1-pre8/include/linux/vserver/context.h ---- linux-3.0/include/linux/vserver/context.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vserver/context.h 2011-06-10 22:11:24.000000000 +0200 -@@ -0,0 +1,189 @@ +diff -NurpP --minimal linux-3.0.1/include/linux/vserver/context.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/context.h +--- linux-3.0.1/include/linux/vserver/context.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/context.h 2011-08-01 18:23:13.000000000 +0200 +@@ -0,0 +1,190 @@ +#ifndef _VX_CONTEXT_H +#define _VX_CONTEXT_H + @@ -13446,6 +13451,7 @@ diff -NurpP --minimal linux-3.0/include/linux/vserver/context.h linux-3.0-vs2.3. + uint64_t vx_flags; /* context flags */ + uint64_t vx_ccaps; /* context caps (vserver) */ + uint64_t vx_umask; /* unshare mask (guest) */ ++ uint64_t vx_wmask; /* warn mask (guest) */ + kernel_cap_t vx_bcaps; /* bounding caps (system) */ + + struct task_struct *vx_reaper; /* guest reaper process */ @@ -13514,10 +13520,10 @@ diff -NurpP --minimal linux-3.0/include/linux/vserver/context.h linux-3.0-vs2.3. + +#endif /* __KERNEL__ */ +#endif /* _VX_CONTEXT_H */ -diff -NurpP --minimal linux-3.0/include/linux/vserver/context_cmd.h linux-3.0-vs2.3.1-pre8/include/linux/vserver/context_cmd.h ---- linux-3.0/include/linux/vserver/context_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vserver/context_cmd.h 2011-06-10 22:11:24.000000000 +0200 -@@ -0,0 +1,145 @@ +diff -NurpP --minimal linux-3.0.1/include/linux/vserver/context_cmd.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/context_cmd.h +--- linux-3.0.1/include/linux/vserver/context_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/context_cmd.h 2011-08-01 18:25:07.000000000 +0200 +@@ -0,0 +1,162 @@ +#ifndef _VX_CONTEXT_CMD_H +#define _VX_CONTEXT_CMD_H + @@ -13648,6 +13654,23 @@ diff -NurpP --minimal linux-3.0/include/linux/vserver/context_cmd.h linux-3.0-vs +#endif /* __KERNEL__ */ + + ++/* wmask commands */ ++ ++#define VCMD_get_wmask VC_CMD(FLAGS, 15, 0) ++#define VCMD_set_wmask VC_CMD(FLAGS, 16, 0) ++ ++struct vcmd_wmask { ++ uint64_t wmask; ++ uint64_t mask; ++}; ++ ++#ifdef __KERNEL__ ++extern int vc_get_wmask(struct vx_info *, void __user *); ++extern int vc_set_wmask(struct vx_info *, void __user *); ++ ++#endif /* __KERNEL__ */ ++ ++ +/* OOM badness */ + +#define VCMD_get_badness VC_CMD(MEMCTRL, 5, 0) @@ -13663,9 +13686,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vserver/context_cmd.h linux-3.0-vs + +#endif /* __KERNEL__ */ +#endif /* _VX_CONTEXT_CMD_H */ -diff -NurpP --minimal linux-3.0/include/linux/vserver/cvirt.h linux-3.0-vs2.3.1-pre8/include/linux/vserver/cvirt.h ---- linux-3.0/include/linux/vserver/cvirt.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vserver/cvirt.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vserver/cvirt.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/cvirt.h +--- linux-3.0.1/include/linux/vserver/cvirt.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/cvirt.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,20 @@ +#ifndef _VX_CVIRT_H +#define _VX_CVIRT_H @@ -13687,9 +13710,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vserver/cvirt.h linux-3.0-vs2.3.1- + +#endif /* __KERNEL__ */ +#endif /* _VX_CVIRT_H */ -diff -NurpP --minimal linux-3.0/include/linux/vserver/cvirt_cmd.h linux-3.0-vs2.3.1-pre8/include/linux/vserver/cvirt_cmd.h ---- linux-3.0/include/linux/vserver/cvirt_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vserver/cvirt_cmd.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vserver/cvirt_cmd.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/cvirt_cmd.h +--- linux-3.0.1/include/linux/vserver/cvirt_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/cvirt_cmd.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,53 @@ +#ifndef _VX_CVIRT_CMD_H +#define _VX_CVIRT_CMD_H @@ -13744,9 +13767,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vserver/cvirt_cmd.h linux-3.0-vs2. + +#endif /* __KERNEL__ */ +#endif /* _VX_CVIRT_CMD_H */ -diff -NurpP --minimal linux-3.0/include/linux/vserver/cvirt_def.h linux-3.0-vs2.3.1-pre8/include/linux/vserver/cvirt_def.h ---- linux-3.0/include/linux/vserver/cvirt_def.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vserver/cvirt_def.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vserver/cvirt_def.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/cvirt_def.h +--- linux-3.0.1/include/linux/vserver/cvirt_def.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/cvirt_def.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,80 @@ +#ifndef _VX_CVIRT_DEF_H +#define _VX_CVIRT_DEF_H @@ -13828,9 +13851,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vserver/cvirt_def.h linux-3.0-vs2. +#endif + +#endif /* _VX_CVIRT_DEF_H */ -diff -NurpP --minimal linux-3.0/include/linux/vserver/debug.h linux-3.0-vs2.3.1-pre8/include/linux/vserver/debug.h ---- linux-3.0/include/linux/vserver/debug.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vserver/debug.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vserver/debug.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/debug.h +--- linux-3.0.1/include/linux/vserver/debug.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/debug.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,140 @@ +#ifndef _VX_DEBUG_H +#define _VX_DEBUG_H @@ -13972,9 +13995,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vserver/debug.h linux-3.0-vs2.3.1- + + +#endif /* _VX_DEBUG_H */ -diff -NurpP --minimal linux-3.0/include/linux/vserver/debug_cmd.h linux-3.0-vs2.3.1-pre8/include/linux/vserver/debug_cmd.h ---- linux-3.0/include/linux/vserver/debug_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vserver/debug_cmd.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vserver/debug_cmd.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/debug_cmd.h +--- linux-3.0.1/include/linux/vserver/debug_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/debug_cmd.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,58 @@ +#ifndef _VX_DEBUG_CMD_H +#define _VX_DEBUG_CMD_H @@ -14034,9 +14057,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vserver/debug_cmd.h linux-3.0-vs2. + +#endif /* __KERNEL__ */ +#endif /* _VX_DEBUG_CMD_H */ -diff -NurpP --minimal linux-3.0/include/linux/vserver/device.h linux-3.0-vs2.3.1-pre8/include/linux/vserver/device.h ---- linux-3.0/include/linux/vserver/device.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vserver/device.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vserver/device.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/device.h +--- linux-3.0.1/include/linux/vserver/device.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/device.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,15 @@ +#ifndef _VX_DEVICE_H +#define _VX_DEVICE_H @@ -14053,9 +14076,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vserver/device.h linux-3.0-vs2.3.1 +#else /* _VX_DEVICE_H */ +#warning duplicate inclusion +#endif /* _VX_DEVICE_H */ -diff -NurpP --minimal linux-3.0/include/linux/vserver/device_cmd.h linux-3.0-vs2.3.1-pre8/include/linux/vserver/device_cmd.h ---- linux-3.0/include/linux/vserver/device_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vserver/device_cmd.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vserver/device_cmd.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/device_cmd.h +--- linux-3.0.1/include/linux/vserver/device_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/device_cmd.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,44 @@ +#ifndef _VX_DEVICE_CMD_H +#define _VX_DEVICE_CMD_H @@ -14101,9 +14124,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vserver/device_cmd.h linux-3.0-vs2 + +#endif /* __KERNEL__ */ +#endif /* _VX_DEVICE_CMD_H */ -diff -NurpP --minimal linux-3.0/include/linux/vserver/device_def.h linux-3.0-vs2.3.1-pre8/include/linux/vserver/device_def.h ---- linux-3.0/include/linux/vserver/device_def.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vserver/device_def.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vserver/device_def.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/device_def.h +--- linux-3.0.1/include/linux/vserver/device_def.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/device_def.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,17 @@ +#ifndef _VX_DEVICE_DEF_H +#define _VX_DEVICE_DEF_H @@ -14122,9 +14145,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vserver/device_def.h linux-3.0-vs2 +}; + +#endif /* _VX_DEVICE_DEF_H */ -diff -NurpP --minimal linux-3.0/include/linux/vserver/dlimit.h linux-3.0-vs2.3.1-pre8/include/linux/vserver/dlimit.h ---- linux-3.0/include/linux/vserver/dlimit.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vserver/dlimit.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vserver/dlimit.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/dlimit.h +--- linux-3.0.1/include/linux/vserver/dlimit.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/dlimit.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,54 @@ +#ifndef _VX_DLIMIT_H +#define _VX_DLIMIT_H @@ -14180,9 +14203,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vserver/dlimit.h linux-3.0-vs2.3.1 +#else /* _VX_DLIMIT_H */ +#warning duplicate inclusion +#endif /* _VX_DLIMIT_H */ -diff -NurpP --minimal linux-3.0/include/linux/vserver/dlimit_cmd.h linux-3.0-vs2.3.1-pre8/include/linux/vserver/dlimit_cmd.h ---- linux-3.0/include/linux/vserver/dlimit_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vserver/dlimit_cmd.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vserver/dlimit_cmd.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/dlimit_cmd.h +--- linux-3.0.1/include/linux/vserver/dlimit_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/dlimit_cmd.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,109 @@ +#ifndef _VX_DLIMIT_CMD_H +#define _VX_DLIMIT_CMD_H @@ -14293,9 +14316,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vserver/dlimit_cmd.h linux-3.0-vs2 + +#endif /* __KERNEL__ */ +#endif /* _VX_DLIMIT_CMD_H */ -diff -NurpP --minimal linux-3.0/include/linux/vserver/global.h linux-3.0-vs2.3.1-pre8/include/linux/vserver/global.h ---- linux-3.0/include/linux/vserver/global.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vserver/global.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vserver/global.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/global.h +--- linux-3.0.1/include/linux/vserver/global.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/global.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,19 @@ +#ifndef _VX_GLOBAL_H +#define _VX_GLOBAL_H @@ -14316,9 +14339,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vserver/global.h linux-3.0-vs2.3.1 + + +#endif /* _VX_GLOBAL_H */ -diff -NurpP --minimal linux-3.0/include/linux/vserver/history.h linux-3.0-vs2.3.1-pre8/include/linux/vserver/history.h ---- linux-3.0/include/linux/vserver/history.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vserver/history.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vserver/history.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/history.h +--- linux-3.0.1/include/linux/vserver/history.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/history.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,197 @@ +#ifndef _VX_HISTORY_H +#define _VX_HISTORY_H @@ -14517,9 +14540,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vserver/history.h linux-3.0-vs2.3. +#endif /* CONFIG_VSERVER_HISTORY */ + +#endif /* _VX_HISTORY_H */ -diff -NurpP --minimal linux-3.0/include/linux/vserver/inode.h linux-3.0-vs2.3.1-pre8/include/linux/vserver/inode.h ---- linux-3.0/include/linux/vserver/inode.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vserver/inode.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vserver/inode.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/inode.h +--- linux-3.0.1/include/linux/vserver/inode.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/inode.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,39 @@ +#ifndef _VX_INODE_H +#define _VX_INODE_H @@ -14560,9 +14583,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vserver/inode.h linux-3.0-vs2.3.1- +#else /* _VX_INODE_H */ +#warning duplicate inclusion +#endif /* _VX_INODE_H */ -diff -NurpP --minimal linux-3.0/include/linux/vserver/inode_cmd.h linux-3.0-vs2.3.1-pre8/include/linux/vserver/inode_cmd.h ---- linux-3.0/include/linux/vserver/inode_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vserver/inode_cmd.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vserver/inode_cmd.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/inode_cmd.h +--- linux-3.0.1/include/linux/vserver/inode_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/inode_cmd.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,59 @@ +#ifndef _VX_INODE_CMD_H +#define _VX_INODE_CMD_H @@ -14623,9 +14646,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vserver/inode_cmd.h linux-3.0-vs2. + +#endif /* __KERNEL__ */ +#endif /* _VX_INODE_CMD_H */ -diff -NurpP --minimal linux-3.0/include/linux/vserver/limit.h linux-3.0-vs2.3.1-pre8/include/linux/vserver/limit.h ---- linux-3.0/include/linux/vserver/limit.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vserver/limit.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vserver/limit.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/limit.h +--- linux-3.0.1/include/linux/vserver/limit.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/limit.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,71 @@ +#ifndef _VX_LIMIT_H +#define _VX_LIMIT_H @@ -14698,9 +14721,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vserver/limit.h linux-3.0-vs2.3.1- + +#endif /* __KERNEL__ */ +#endif /* _VX_LIMIT_H */ -diff -NurpP --minimal linux-3.0/include/linux/vserver/limit_cmd.h linux-3.0-vs2.3.1-pre8/include/linux/vserver/limit_cmd.h ---- linux-3.0/include/linux/vserver/limit_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vserver/limit_cmd.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vserver/limit_cmd.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/limit_cmd.h +--- linux-3.0.1/include/linux/vserver/limit_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/limit_cmd.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,71 @@ +#ifndef _VX_LIMIT_CMD_H +#define _VX_LIMIT_CMD_H @@ -14773,9 +14796,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vserver/limit_cmd.h linux-3.0-vs2. + +#endif /* __KERNEL__ */ +#endif /* _VX_LIMIT_CMD_H */ -diff -NurpP --minimal linux-3.0/include/linux/vserver/limit_def.h linux-3.0-vs2.3.1-pre8/include/linux/vserver/limit_def.h ---- linux-3.0/include/linux/vserver/limit_def.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vserver/limit_def.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vserver/limit_def.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/limit_def.h +--- linux-3.0.1/include/linux/vserver/limit_def.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/limit_def.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,47 @@ +#ifndef _VX_LIMIT_DEF_H +#define _VX_LIMIT_DEF_H @@ -14824,9 +14847,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vserver/limit_def.h linux-3.0-vs2. +#endif + +#endif /* _VX_LIMIT_DEF_H */ -diff -NurpP --minimal linux-3.0/include/linux/vserver/limit_int.h linux-3.0-vs2.3.1-pre8/include/linux/vserver/limit_int.h ---- linux-3.0/include/linux/vserver/limit_int.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vserver/limit_int.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vserver/limit_int.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/limit_int.h +--- linux-3.0.1/include/linux/vserver/limit_int.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/limit_int.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,198 @@ +#ifndef _VX_LIMIT_INT_H +#define _VX_LIMIT_INT_H @@ -15026,9 +15049,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vserver/limit_int.h linux-3.0-vs2. + +#endif /* __KERNEL__ */ +#endif /* _VX_LIMIT_INT_H */ -diff -NurpP --minimal linux-3.0/include/linux/vserver/monitor.h linux-3.0-vs2.3.1-pre8/include/linux/vserver/monitor.h ---- linux-3.0/include/linux/vserver/monitor.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vserver/monitor.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vserver/monitor.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/monitor.h +--- linux-3.0.1/include/linux/vserver/monitor.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/monitor.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,96 @@ +#ifndef _VX_MONITOR_H +#define _VX_MONITOR_H @@ -15126,9 +15149,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vserver/monitor.h linux-3.0-vs2.3. + + +#endif /* _VX_MONITOR_H */ -diff -NurpP --minimal linux-3.0/include/linux/vserver/network.h linux-3.0-vs2.3.1-pre8/include/linux/vserver/network.h ---- linux-3.0/include/linux/vserver/network.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vserver/network.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vserver/network.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/network.h +--- linux-3.0.1/include/linux/vserver/network.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/network.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,146 @@ +#ifndef _VX_NETWORK_H +#define _VX_NETWORK_H @@ -15276,9 +15299,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vserver/network.h linux-3.0-vs2.3. + +#endif /* __KERNEL__ */ +#endif /* _VX_NETWORK_H */ -diff -NurpP --minimal linux-3.0/include/linux/vserver/network_cmd.h linux-3.0-vs2.3.1-pre8/include/linux/vserver/network_cmd.h ---- linux-3.0/include/linux/vserver/network_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vserver/network_cmd.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vserver/network_cmd.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/network_cmd.h +--- linux-3.0.1/include/linux/vserver/network_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/network_cmd.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,164 @@ +#ifndef _VX_NETWORK_CMD_H +#define _VX_NETWORK_CMD_H @@ -15444,9 +15467,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vserver/network_cmd.h linux-3.0-vs + +#endif /* __KERNEL__ */ +#endif /* _VX_CONTEXT_CMD_H */ -diff -NurpP --minimal linux-3.0/include/linux/vserver/percpu.h linux-3.0-vs2.3.1-pre8/include/linux/vserver/percpu.h ---- linux-3.0/include/linux/vserver/percpu.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vserver/percpu.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vserver/percpu.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/percpu.h +--- linux-3.0.1/include/linux/vserver/percpu.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/percpu.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,14 @@ +#ifndef _VX_PERCPU_H +#define _VX_PERCPU_H @@ -15462,9 +15485,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vserver/percpu.h linux-3.0-vs2.3.1 +#define PERCPU_PERCTX (sizeof(struct _vx_percpu)) + +#endif /* _VX_PERCPU_H */ -diff -NurpP --minimal linux-3.0/include/linux/vserver/pid.h linux-3.0-vs2.3.1-pre8/include/linux/vserver/pid.h ---- linux-3.0/include/linux/vserver/pid.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vserver/pid.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vserver/pid.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/pid.h +--- linux-3.0.1/include/linux/vserver/pid.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/pid.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,51 @@ +#ifndef _VSERVER_PID_H +#define _VSERVER_PID_H @@ -15517,9 +15540,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vserver/pid.h linux-3.0-vs2.3.1-pr +} + +#endif -diff -NurpP --minimal linux-3.0/include/linux/vserver/sched.h linux-3.0-vs2.3.1-pre8/include/linux/vserver/sched.h ---- linux-3.0/include/linux/vserver/sched.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vserver/sched.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vserver/sched.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/sched.h +--- linux-3.0.1/include/linux/vserver/sched.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/sched.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,23 @@ +#ifndef _VX_SCHED_H +#define _VX_SCHED_H @@ -15544,9 +15567,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vserver/sched.h linux-3.0-vs2.3.1- +#else /* _VX_SCHED_H */ +#warning duplicate inclusion +#endif /* _VX_SCHED_H */ -diff -NurpP --minimal linux-3.0/include/linux/vserver/sched_cmd.h linux-3.0-vs2.3.1-pre8/include/linux/vserver/sched_cmd.h ---- linux-3.0/include/linux/vserver/sched_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vserver/sched_cmd.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vserver/sched_cmd.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/sched_cmd.h +--- linux-3.0.1/include/linux/vserver/sched_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/sched_cmd.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,21 @@ +#ifndef _VX_SCHED_CMD_H +#define _VX_SCHED_CMD_H @@ -15569,9 +15592,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vserver/sched_cmd.h linux-3.0-vs2. + +#endif /* __KERNEL__ */ +#endif /* _VX_SCHED_CMD_H */ -diff -NurpP --minimal linux-3.0/include/linux/vserver/sched_def.h linux-3.0-vs2.3.1-pre8/include/linux/vserver/sched_def.h ---- linux-3.0/include/linux/vserver/sched_def.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vserver/sched_def.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vserver/sched_def.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/sched_def.h +--- linux-3.0.1/include/linux/vserver/sched_def.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/sched_def.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,38 @@ +#ifndef _VX_SCHED_DEF_H +#define _VX_SCHED_DEF_H @@ -15611,9 +15634,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vserver/sched_def.h linux-3.0-vs2. +#endif + +#endif /* _VX_SCHED_DEF_H */ -diff -NurpP --minimal linux-3.0/include/linux/vserver/signal.h linux-3.0-vs2.3.1-pre8/include/linux/vserver/signal.h ---- linux-3.0/include/linux/vserver/signal.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vserver/signal.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vserver/signal.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/signal.h +--- linux-3.0.1/include/linux/vserver/signal.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/signal.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,14 @@ +#ifndef _VX_SIGNAL_H +#define _VX_SIGNAL_H @@ -15629,9 +15652,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vserver/signal.h linux-3.0-vs2.3.1 +#else /* _VX_SIGNAL_H */ +#warning duplicate inclusion +#endif /* _VX_SIGNAL_H */ -diff -NurpP --minimal linux-3.0/include/linux/vserver/signal_cmd.h linux-3.0-vs2.3.1-pre8/include/linux/vserver/signal_cmd.h ---- linux-3.0/include/linux/vserver/signal_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vserver/signal_cmd.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vserver/signal_cmd.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/signal_cmd.h +--- linux-3.0.1/include/linux/vserver/signal_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/signal_cmd.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,43 @@ +#ifndef _VX_SIGNAL_CMD_H +#define _VX_SIGNAL_CMD_H @@ -15676,9 +15699,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vserver/signal_cmd.h linux-3.0-vs2 + +#endif /* __KERNEL__ */ +#endif /* _VX_SIGNAL_CMD_H */ -diff -NurpP --minimal linux-3.0/include/linux/vserver/space.h linux-3.0-vs2.3.1-pre8/include/linux/vserver/space.h ---- linux-3.0/include/linux/vserver/space.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vserver/space.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vserver/space.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/space.h +--- linux-3.0.1/include/linux/vserver/space.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/space.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,12 @@ +#ifndef _VX_SPACE_H +#define _VX_SPACE_H @@ -15692,9 +15715,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vserver/space.h linux-3.0-vs2.3.1- +#else /* _VX_SPACE_H */ +#warning duplicate inclusion +#endif /* _VX_SPACE_H */ -diff -NurpP --minimal linux-3.0/include/linux/vserver/space_cmd.h linux-3.0-vs2.3.1-pre8/include/linux/vserver/space_cmd.h ---- linux-3.0/include/linux/vserver/space_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vserver/space_cmd.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vserver/space_cmd.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/space_cmd.h +--- linux-3.0.1/include/linux/vserver/space_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/space_cmd.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,38 @@ +#ifndef _VX_SPACE_CMD_H +#define _VX_SPACE_CMD_H @@ -15734,9 +15757,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vserver/space_cmd.h linux-3.0-vs2. + +#endif /* __KERNEL__ */ +#endif /* _VX_SPACE_CMD_H */ -diff -NurpP --minimal linux-3.0/include/linux/vserver/switch.h linux-3.0-vs2.3.1-pre8/include/linux/vserver/switch.h ---- linux-3.0/include/linux/vserver/switch.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vserver/switch.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vserver/switch.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/switch.h +--- linux-3.0.1/include/linux/vserver/switch.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/switch.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,98 @@ +#ifndef _VX_SWITCH_H +#define _VX_SWITCH_H @@ -15836,9 +15859,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vserver/switch.h linux-3.0-vs2.3.1 + +#endif /* _VX_SWITCH_H */ + -diff -NurpP --minimal linux-3.0/include/linux/vserver/tag.h linux-3.0-vs2.3.1-pre8/include/linux/vserver/tag.h ---- linux-3.0/include/linux/vserver/tag.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vserver/tag.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vserver/tag.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/tag.h +--- linux-3.0.1/include/linux/vserver/tag.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/tag.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,143 @@ +#ifndef _DX_TAG_H +#define _DX_TAG_H @@ -15983,9 +16006,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vserver/tag.h linux-3.0-vs2.3.1-pr +#endif + +#endif /* _DX_TAG_H */ -diff -NurpP --minimal linux-3.0/include/linux/vserver/tag_cmd.h linux-3.0-vs2.3.1-pre8/include/linux/vserver/tag_cmd.h ---- linux-3.0/include/linux/vserver/tag_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/linux/vserver/tag_cmd.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/linux/vserver/tag_cmd.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/tag_cmd.h +--- linux-3.0.1/include/linux/vserver/tag_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/tag_cmd.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,22 @@ +#ifndef _VX_TAG_CMD_H +#define _VX_TAG_CMD_H @@ -16009,9 +16032,9 @@ diff -NurpP --minimal linux-3.0/include/linux/vserver/tag_cmd.h linux-3.0-vs2.3. + +#endif /* __KERNEL__ */ +#endif /* _VX_TAG_CMD_H */ -diff -NurpP --minimal linux-3.0/include/net/addrconf.h linux-3.0-vs2.3.1-pre8/include/net/addrconf.h ---- linux-3.0/include/net/addrconf.h 2011-07-22 11:18:11.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/include/net/addrconf.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/net/addrconf.h linux-3.0.1-vs2.3.1-pre9/include/net/addrconf.h +--- linux-3.0.1/include/net/addrconf.h 2011-07-22 11:18:11.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/include/net/addrconf.h 2011-06-10 22:11:24.000000000 +0200 @@ -80,7 +80,8 @@ extern int ipv6_dev_get_saddr(struct n struct net_device *dev, const struct in6_addr *daddr, @@ -16022,9 +16045,9 @@ diff -NurpP --minimal linux-3.0/include/net/addrconf.h linux-3.0-vs2.3.1-pre8/in extern int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr, unsigned char banned_flags); -diff -NurpP --minimal linux-3.0/include/net/af_unix.h linux-3.0-vs2.3.1-pre8/include/net/af_unix.h ---- linux-3.0/include/net/af_unix.h 2011-07-22 11:18:11.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/include/net/af_unix.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/net/af_unix.h linux-3.0.1-vs2.3.1-pre9/include/net/af_unix.h +--- linux-3.0.1/include/net/af_unix.h 2011-07-22 11:18:11.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/include/net/af_unix.h 2011-06-10 22:11:24.000000000 +0200 @@ -4,6 +4,7 @@ #include #include @@ -16033,9 +16056,9 @@ diff -NurpP --minimal linux-3.0/include/net/af_unix.h linux-3.0-vs2.3.1-pre8/inc #include extern void unix_inflight(struct file *fp); -diff -NurpP --minimal linux-3.0/include/net/inet_timewait_sock.h linux-3.0-vs2.3.1-pre8/include/net/inet_timewait_sock.h ---- linux-3.0/include/net/inet_timewait_sock.h 2011-03-15 18:07:40.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/include/net/inet_timewait_sock.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/net/inet_timewait_sock.h linux-3.0.1-vs2.3.1-pre9/include/net/inet_timewait_sock.h +--- linux-3.0.1/include/net/inet_timewait_sock.h 2011-03-15 18:07:40.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/include/net/inet_timewait_sock.h 2011-06-10 22:11:24.000000000 +0200 @@ -113,6 +113,10 @@ struct inet_timewait_sock { #define tw_net __tw_common.skc_net #define tw_daddr __tw_common.skc_daddr @@ -16047,9 +16070,9 @@ diff -NurpP --minimal linux-3.0/include/net/inet_timewait_sock.h linux-3.0-vs2.3 int tw_timeout; volatile unsigned char tw_substate; unsigned char tw_rcv_wscale; -diff -NurpP --minimal linux-3.0/include/net/ip6_route.h linux-3.0-vs2.3.1-pre8/include/net/ip6_route.h ---- linux-3.0/include/net/ip6_route.h 2011-07-22 11:18:11.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/include/net/ip6_route.h 2011-06-16 14:16:51.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/net/ip6_route.h linux-3.0.1-vs2.3.1-pre9/include/net/ip6_route.h +--- linux-3.0.1/include/net/ip6_route.h 2011-07-22 11:18:11.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/include/net/ip6_route.h 2011-06-16 14:16:51.000000000 +0200 @@ -86,7 +86,8 @@ extern int ip6_route_get_saddr(struct struct rt6_info *rt, const struct in6_addr *daddr, @@ -16060,9 +16083,9 @@ diff -NurpP --minimal linux-3.0/include/net/ip6_route.h linux-3.0-vs2.3.1-pre8/i extern struct rt6_info *rt6_lookup(struct net *net, const struct in6_addr *daddr, -diff -NurpP --minimal linux-3.0/include/net/route.h linux-3.0-vs2.3.1-pre8/include/net/route.h ---- linux-3.0/include/net/route.h 2011-07-22 11:18:11.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/include/net/route.h 2011-07-27 19:42:59.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/net/route.h linux-3.0.1-vs2.3.1-pre9/include/net/route.h +--- linux-3.0.1/include/net/route.h 2011-07-22 11:18:11.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/include/net/route.h 2011-07-27 19:42:59.000000000 +0200 @@ -202,6 +202,9 @@ static inline void ip_rt_put(struct rtab dst_release(&rt->dst); } @@ -16110,9 +16133,9 @@ diff -NurpP --minimal linux-3.0/include/net/route.h linux-3.0-vs2.3.1-pre8/inclu rt = __ip_route_output_key(net, fl4); if (IS_ERR(rt)) return rt; -diff -NurpP --minimal linux-3.0/include/net/sock.h linux-3.0-vs2.3.1-pre8/include/net/sock.h ---- linux-3.0/include/net/sock.h 2011-07-22 11:18:12.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/include/net/sock.h 2011-07-01 11:35:35.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/include/net/sock.h linux-3.0.1-vs2.3.1-pre9/include/net/sock.h +--- linux-3.0.1/include/net/sock.h 2011-07-22 11:18:12.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/include/net/sock.h 2011-07-01 11:35:35.000000000 +0200 @@ -149,6 +149,10 @@ struct sock_common { #ifdef CONFIG_NET_NS struct net *skc_net; @@ -16135,9 +16158,9 @@ diff -NurpP --minimal linux-3.0/include/net/sock.h linux-3.0-vs2.3.1-pre8/includ socket_lock_t sk_lock; struct sk_buff_head sk_receive_queue; /* -diff -NurpP --minimal linux-3.0/init/Kconfig linux-3.0-vs2.3.1-pre8/init/Kconfig ---- linux-3.0/init/Kconfig 2011-07-22 11:18:12.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/init/Kconfig 2011-07-20 02:16:43.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/init/Kconfig linux-3.0.1-vs2.3.1-pre9/init/Kconfig +--- linux-3.0.1/init/Kconfig 2011-07-22 11:18:12.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/init/Kconfig 2011-08-08 18:08:57.000000000 +0200 @@ -574,6 +574,7 @@ config HAVE_UNSTABLE_SCHED_CLOCK menuconfig CGROUPS boolean "Control Group support" @@ -16146,18 +16169,17 @@ diff -NurpP --minimal linux-3.0/init/Kconfig linux-3.0-vs2.3.1-pre8/init/Kconfig help This option adds support for grouping sets of processes together, for use with process control subsystems such as Cpusets, CFS, memory -@@ -790,7 +791,7 @@ config IPC_NS +@@ -790,6 +791,7 @@ config IPC_NS config USER_NS bool "User namespace (EXPERIMENTAL)" depends on EXPERIMENTAL -- default y -+ default n ++ depends on VSERVER_DISABLED + default y help This allows containers, i.e. vservers, to use user namespaces - to provide different user info for different servers. -diff -NurpP --minimal linux-3.0/init/main.c linux-3.0-vs2.3.1-pre8/init/main.c ---- linux-3.0/init/main.c 2011-07-22 11:18:12.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/init/main.c 2011-06-22 12:39:15.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/init/main.c linux-3.0.1-vs2.3.1-pre9/init/main.c +--- linux-3.0.1/init/main.c 2011-07-22 11:18:12.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/init/main.c 2011-06-22 12:39:15.000000000 +0200 @@ -68,6 +68,7 @@ #include #include @@ -16166,9 +16188,9 @@ diff -NurpP --minimal linux-3.0/init/main.c linux-3.0-vs2.3.1-pre8/init/main.c #include #include -diff -NurpP --minimal linux-3.0/ipc/mqueue.c linux-3.0-vs2.3.1-pre8/ipc/mqueue.c ---- linux-3.0/ipc/mqueue.c 2011-03-15 18:07:41.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/ipc/mqueue.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/ipc/mqueue.c linux-3.0.1-vs2.3.1-pre9/ipc/mqueue.c +--- linux-3.0.1/ipc/mqueue.c 2011-03-15 18:07:41.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/ipc/mqueue.c 2011-06-10 22:11:24.000000000 +0200 @@ -33,6 +33,8 @@ #include #include @@ -16243,9 +16265,9 @@ diff -NurpP --minimal linux-3.0/ipc/mqueue.c linux-3.0-vs2.3.1-pre8/ipc/mqueue.c free_uid(user); } if (ipc_ns) -diff -NurpP --minimal linux-3.0/ipc/msg.c linux-3.0-vs2.3.1-pre8/ipc/msg.c ---- linux-3.0/ipc/msg.c 2011-05-22 16:17:59.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/ipc/msg.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/ipc/msg.c linux-3.0.1-vs2.3.1-pre9/ipc/msg.c +--- linux-3.0.1/ipc/msg.c 2011-05-22 16:17:59.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/ipc/msg.c 2011-06-10 22:11:24.000000000 +0200 @@ -37,6 +37,7 @@ #include #include @@ -16262,9 +16284,9 @@ diff -NurpP --minimal linux-3.0/ipc/msg.c linux-3.0-vs2.3.1-pre8/ipc/msg.c msq->q_perm.security = NULL; retval = security_msg_queue_alloc(msq); -diff -NurpP --minimal linux-3.0/ipc/namespace.c linux-3.0-vs2.3.1-pre8/ipc/namespace.c ---- linux-3.0/ipc/namespace.c 2011-07-22 11:18:12.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/ipc/namespace.c 2011-06-13 14:09:44.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/ipc/namespace.c linux-3.0.1-vs2.3.1-pre9/ipc/namespace.c +--- linux-3.0.1/ipc/namespace.c 2011-07-22 11:18:12.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/ipc/namespace.c 2011-06-13 14:09:44.000000000 +0200 @@ -13,11 +13,12 @@ #include #include @@ -16305,9 +16327,9 @@ diff -NurpP --minimal linux-3.0/ipc/namespace.c linux-3.0-vs2.3.1-pre8/ipc/names } /* -diff -NurpP --minimal linux-3.0/ipc/sem.c linux-3.0-vs2.3.1-pre8/ipc/sem.c ---- linux-3.0/ipc/sem.c 2011-05-22 16:17:59.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/ipc/sem.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/ipc/sem.c linux-3.0.1-vs2.3.1-pre9/ipc/sem.c +--- linux-3.0.1/ipc/sem.c 2011-08-08 22:31:58.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/ipc/sem.c 2011-08-08 23:04:47.000000000 +0200 @@ -86,6 +86,8 @@ #include #include @@ -16345,9 +16367,9 @@ diff -NurpP --minimal linux-3.0/ipc/sem.c linux-3.0-vs2.3.1-pre8/ipc/sem.c security_sem_free(sma); ipc_rcu_putref(sma); } -diff -NurpP --minimal linux-3.0/ipc/shm.c linux-3.0-vs2.3.1-pre8/ipc/shm.c ---- linux-3.0/ipc/shm.c 2011-07-22 11:18:12.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/ipc/shm.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/ipc/shm.c linux-3.0.1-vs2.3.1-pre9/ipc/shm.c +--- linux-3.0.1/ipc/shm.c 2011-07-22 11:18:12.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/ipc/shm.c 2011-06-10 22:11:24.000000000 +0200 @@ -39,6 +39,8 @@ #include #include @@ -16403,9 +16425,9 @@ diff -NurpP --minimal linux-3.0/ipc/shm.c linux-3.0-vs2.3.1-pre8/ipc/shm.c return error; no_id: -diff -NurpP --minimal linux-3.0/kernel/Makefile linux-3.0-vs2.3.1-pre8/kernel/Makefile ---- linux-3.0/kernel/Makefile 2011-07-22 11:18:12.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/kernel/Makefile 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/kernel/Makefile linux-3.0.1-vs2.3.1-pre9/kernel/Makefile +--- linux-3.0.1/kernel/Makefile 2011-07-22 11:18:12.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/Makefile 2011-06-10 22:11:24.000000000 +0200 @@ -24,6 +24,7 @@ CFLAGS_REMOVE_sched_clock.o = -pg CFLAGS_REMOVE_irq_work.o = -pg endif @@ -16414,9 +16436,9 @@ diff -NurpP --minimal linux-3.0/kernel/Makefile linux-3.0-vs2.3.1-pre8/kernel/Ma obj-$(CONFIG_FREEZER) += freezer.o obj-$(CONFIG_PROFILING) += profile.o obj-$(CONFIG_SYSCTL_SYSCALL_CHECK) += sysctl_check.o -diff -NurpP --minimal linux-3.0/kernel/capability.c linux-3.0-vs2.3.1-pre8/kernel/capability.c ---- linux-3.0/kernel/capability.c 2011-07-22 11:18:12.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/kernel/capability.c 2011-07-19 19:27:53.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/kernel/capability.c linux-3.0.1-vs2.3.1-pre9/kernel/capability.c +--- linux-3.0.1/kernel/capability.c 2011-07-22 11:18:12.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/capability.c 2011-07-19 19:27:53.000000000 +0200 @@ -15,6 +15,7 @@ #include #include @@ -16452,9 +16474,9 @@ diff -NurpP --minimal linux-3.0/kernel/capability.c linux-3.0-vs2.3.1-pre8/kerne if (security_capable(ns, current_cred(), cap) == 0) { current->flags |= PF_SUPERPRIV; return true; -diff -NurpP --minimal linux-3.0/kernel/compat.c linux-3.0-vs2.3.1-pre8/kernel/compat.c ---- linux-3.0/kernel/compat.c 2011-07-22 11:18:12.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/kernel/compat.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/kernel/compat.c linux-3.0.1-vs2.3.1-pre9/kernel/compat.c +--- linux-3.0.1/kernel/compat.c 2011-07-22 11:18:12.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/compat.c 2011-06-10 22:11:24.000000000 +0200 @@ -970,7 +970,7 @@ asmlinkage long compat_sys_stime(compat_ if (err) return err; @@ -16464,9 +16486,9 @@ diff -NurpP --minimal linux-3.0/kernel/compat.c linux-3.0-vs2.3.1-pre8/kernel/co return 0; } -diff -NurpP --minimal linux-3.0/kernel/cred.c linux-3.0-vs2.3.1-pre8/kernel/cred.c ---- linux-3.0/kernel/cred.c 2011-07-22 11:18:12.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/kernel/cred.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/kernel/cred.c linux-3.0.1-vs2.3.1-pre9/kernel/cred.c +--- linux-3.0.1/kernel/cred.c 2011-07-22 11:18:12.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/cred.c 2011-06-10 22:11:24.000000000 +0200 @@ -61,31 +61,6 @@ struct cred init_cred = { #endif }; @@ -16536,9 +16558,9 @@ diff -NurpP --minimal linux-3.0/kernel/cred.c linux-3.0-vs2.3.1-pre8/kernel/cred EXPORT_SYMBOL(prepare_creds); /* -diff -NurpP --minimal linux-3.0/kernel/exit.c linux-3.0-vs2.3.1-pre8/kernel/exit.c ---- linux-3.0/kernel/exit.c 2011-07-22 11:18:12.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/kernel/exit.c 2011-06-22 12:39:15.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/kernel/exit.c linux-3.0.1-vs2.3.1-pre9/kernel/exit.c +--- linux-3.0.1/kernel/exit.c 2011-07-22 11:18:12.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/exit.c 2011-06-22 12:39:15.000000000 +0200 @@ -48,6 +48,10 @@ #include #include @@ -16579,9 +16601,9 @@ diff -NurpP --minimal linux-3.0/kernel/exit.c linux-3.0-vs2.3.1-pre8/kernel/exit BUG(); /* Avoid "noreturn function does return". */ for (;;) -diff -NurpP --minimal linux-3.0/kernel/fork.c linux-3.0-vs2.3.1-pre8/kernel/fork.c ---- linux-3.0/kernel/fork.c 2011-07-22 11:18:12.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/kernel/fork.c 2011-06-10 22:21:02.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/kernel/fork.c linux-3.0.1-vs2.3.1-pre9/kernel/fork.c +--- linux-3.0.1/kernel/fork.c 2011-07-22 11:18:12.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/fork.c 2011-06-10 22:21:02.000000000 +0200 @@ -67,6 +67,10 @@ #include #include @@ -16675,9 +16697,9 @@ diff -NurpP --minimal linux-3.0/kernel/fork.c linux-3.0-vs2.3.1-pre8/kernel/fork write_unlock_irq(&tasklist_lock); proc_fork_connector(p); cgroup_post_fork(p); -diff -NurpP --minimal linux-3.0/kernel/kthread.c linux-3.0-vs2.3.1-pre8/kernel/kthread.c ---- linux-3.0/kernel/kthread.c 2011-07-22 11:18:12.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/kernel/kthread.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/kernel/kthread.c linux-3.0.1-vs2.3.1-pre9/kernel/kthread.c +--- linux-3.0.1/kernel/kthread.c 2011-07-22 11:18:12.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/kthread.c 2011-06-10 22:11:24.000000000 +0200 @@ -16,6 +16,7 @@ #include #include @@ -16686,9 +16708,9 @@ diff -NurpP --minimal linux-3.0/kernel/kthread.c linux-3.0-vs2.3.1-pre8/kernel/k #include static DEFINE_SPINLOCK(kthread_create_lock); -diff -NurpP --minimal linux-3.0/kernel/nsproxy.c linux-3.0-vs2.3.1-pre8/kernel/nsproxy.c ---- linux-3.0/kernel/nsproxy.c 2011-07-22 11:18:12.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/kernel/nsproxy.c 2011-06-13 14:09:44.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/kernel/nsproxy.c linux-3.0.1-vs2.3.1-pre9/kernel/nsproxy.c +--- linux-3.0.1/kernel/nsproxy.c 2011-07-22 11:18:12.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/nsproxy.c 2011-06-13 14:09:44.000000000 +0200 @@ -20,6 +20,8 @@ #include #include @@ -16864,9 +16886,9 @@ diff -NurpP --minimal linux-3.0/kernel/nsproxy.c linux-3.0-vs2.3.1-pre8/kernel/n return -EPERM; *new_nsp = create_new_namespaces(unshare_flags, current, -diff -NurpP --minimal linux-3.0/kernel/pid.c linux-3.0-vs2.3.1-pre8/kernel/pid.c ---- linux-3.0/kernel/pid.c 2011-05-22 16:17:59.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/kernel/pid.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/kernel/pid.c linux-3.0.1-vs2.3.1-pre9/kernel/pid.c +--- linux-3.0.1/kernel/pid.c 2011-05-22 16:17:59.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/pid.c 2011-06-10 22:11:24.000000000 +0200 @@ -36,6 +36,7 @@ #include #include @@ -16924,9 +16946,9 @@ diff -NurpP --minimal linux-3.0/kernel/pid.c linux-3.0-vs2.3.1-pre8/kernel/pid.c pid_t pid_vnr(struct pid *pid) { return pid_nr_ns(pid, current->nsproxy->pid_ns); -diff -NurpP --minimal linux-3.0/kernel/pid_namespace.c linux-3.0-vs2.3.1-pre8/kernel/pid_namespace.c ---- linux-3.0/kernel/pid_namespace.c 2011-05-22 16:17:59.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/kernel/pid_namespace.c 2011-06-10 22:17:45.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/kernel/pid_namespace.c linux-3.0.1-vs2.3.1-pre9/kernel/pid_namespace.c +--- linux-3.0.1/kernel/pid_namespace.c 2011-05-22 16:17:59.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/pid_namespace.c 2011-06-10 22:17:45.000000000 +0200 @@ -15,6 +15,7 @@ #include #include @@ -16951,9 +16973,9 @@ diff -NurpP --minimal linux-3.0/kernel/pid_namespace.c linux-3.0-vs2.3.1-pre8/ke kmem_cache_free(pid_ns_cachep, ns); } -diff -NurpP --minimal linux-3.0/kernel/posix-timers.c linux-3.0-vs2.3.1-pre8/kernel/posix-timers.c ---- linux-3.0/kernel/posix-timers.c 2011-07-22 11:18:12.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/kernel/posix-timers.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/kernel/posix-timers.c linux-3.0.1-vs2.3.1-pre9/kernel/posix-timers.c +--- linux-3.0.1/kernel/posix-timers.c 2011-07-22 11:18:12.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/posix-timers.c 2011-06-10 22:11:24.000000000 +0200 @@ -47,6 +47,7 @@ #include #include @@ -16989,9 +17011,9 @@ diff -NurpP --minimal linux-3.0/kernel/posix-timers.c linux-3.0-vs2.3.1-pre8/ker /* If we failed to send the signal the timer stops. */ return ret > 0; } -diff -NurpP --minimal linux-3.0/kernel/printk.c linux-3.0-vs2.3.1-pre8/kernel/printk.c ---- linux-3.0/kernel/printk.c 2011-07-22 11:18:12.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/kernel/printk.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/kernel/printk.c linux-3.0.1-vs2.3.1-pre9/kernel/printk.c +--- linux-3.0.1/kernel/printk.c 2011-07-22 11:18:12.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/printk.c 2011-06-10 22:11:24.000000000 +0200 @@ -41,6 +41,7 @@ #include #include @@ -17059,9 +17081,9 @@ diff -NurpP --minimal linux-3.0/kernel/printk.c linux-3.0-vs2.3.1-pre8/kernel/pr count = len; if (count > log_buf_len) count = log_buf_len; -diff -NurpP --minimal linux-3.0/kernel/ptrace.c linux-3.0-vs2.3.1-pre8/kernel/ptrace.c ---- linux-3.0/kernel/ptrace.c 2011-07-22 11:18:12.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/kernel/ptrace.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/kernel/ptrace.c linux-3.0.1-vs2.3.1-pre9/kernel/ptrace.c +--- linux-3.0.1/kernel/ptrace.c 2011-07-22 11:18:12.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/ptrace.c 2011-06-10 22:11:24.000000000 +0200 @@ -22,6 +22,7 @@ #include #include @@ -17082,9 +17104,9 @@ diff -NurpP --minimal linux-3.0/kernel/ptrace.c linux-3.0-vs2.3.1-pre8/kernel/pt return security_ptrace_access_check(task, mode); } -diff -NurpP --minimal linux-3.0/kernel/sched.c linux-3.0-vs2.3.1-pre8/kernel/sched.c ---- linux-3.0/kernel/sched.c 2011-07-22 11:18:12.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/kernel/sched.c 2011-07-22 11:20:39.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/kernel/sched.c linux-3.0.1-vs2.3.1-pre9/kernel/sched.c +--- linux-3.0.1/kernel/sched.c 2011-07-22 11:18:12.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/sched.c 2011-07-22 11:20:39.000000000 +0200 @@ -71,6 +71,8 @@ #include #include @@ -17158,9 +17180,9 @@ diff -NurpP --minimal linux-3.0/kernel/sched.c linux-3.0-vs2.3.1-pre8/kernel/sch retval = security_task_setnice(current, nice); if (retval) -diff -NurpP --minimal linux-3.0/kernel/sched_fair.c linux-3.0-vs2.3.1-pre8/kernel/sched_fair.c ---- linux-3.0/kernel/sched_fair.c 2011-07-22 11:18:12.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/kernel/sched_fair.c 2011-07-22 11:20:39.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/kernel/sched_fair.c linux-3.0.1-vs2.3.1-pre9/kernel/sched_fair.c +--- linux-3.0.1/kernel/sched_fair.c 2011-07-22 11:18:12.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/sched_fair.c 2011-07-22 11:20:39.000000000 +0200 @@ -998,6 +998,8 @@ enqueue_entity(struct cfs_rq *cfs_rq, st __enqueue_entity(cfs_rq, se); se->on_rq = 1; @@ -17179,9 +17201,9 @@ diff -NurpP --minimal linux-3.0/kernel/sched_fair.c linux-3.0-vs2.3.1-pre8/kerne update_cfs_load(cfs_rq, 0); account_entity_dequeue(cfs_rq, se); -diff -NurpP --minimal linux-3.0/kernel/signal.c linux-3.0-vs2.3.1-pre8/kernel/signal.c ---- linux-3.0/kernel/signal.c 2011-07-22 11:18:12.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/kernel/signal.c 2011-07-22 11:20:39.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/kernel/signal.c linux-3.0.1-vs2.3.1-pre9/kernel/signal.c +--- linux-3.0.1/kernel/signal.c 2011-07-22 11:18:12.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/signal.c 2011-07-22 11:20:39.000000000 +0200 @@ -28,6 +28,8 @@ #include #include @@ -17274,9 +17296,9 @@ diff -NurpP --minimal linux-3.0/kernel/signal.c linux-3.0-vs2.3.1-pre8/kernel/si if (sig_kernel_stop(signr)) { /* * The default action is to stop all threads in -diff -NurpP --minimal linux-3.0/kernel/softirq.c linux-3.0-vs2.3.1-pre8/kernel/softirq.c ---- linux-3.0/kernel/softirq.c 2011-07-22 11:18:12.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/kernel/softirq.c 2011-07-22 11:20:39.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/kernel/softirq.c linux-3.0.1-vs2.3.1-pre9/kernel/softirq.c +--- linux-3.0.1/kernel/softirq.c 2011-07-22 11:18:12.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/softirq.c 2011-07-22 11:20:39.000000000 +0200 @@ -24,6 +24,7 @@ #include #include @@ -17285,9 +17307,9 @@ diff -NurpP --minimal linux-3.0/kernel/softirq.c linux-3.0-vs2.3.1-pre8/kernel/s #define CREATE_TRACE_POINTS #include -diff -NurpP --minimal linux-3.0/kernel/sys.c linux-3.0-vs2.3.1-pre8/kernel/sys.c ---- linux-3.0/kernel/sys.c 2011-07-22 11:18:12.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/kernel/sys.c 2011-07-23 15:55:50.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/kernel/sys.c linux-3.0.1-vs2.3.1-pre9/kernel/sys.c +--- linux-3.0.1/kernel/sys.c 2011-07-22 11:18:12.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/sys.c 2011-07-23 15:55:50.000000000 +0200 @@ -43,6 +43,7 @@ #include #include @@ -17384,9 +17406,9 @@ diff -NurpP --minimal linux-3.0/kernel/sys.c linux-3.0-vs2.3.1-pre8/kernel/sys.c return 0; return -EPERM; -diff -NurpP --minimal linux-3.0/kernel/sysctl.c linux-3.0-vs2.3.1-pre8/kernel/sysctl.c ---- linux-3.0/kernel/sysctl.c 2011-07-22 11:18:12.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/kernel/sysctl.c 2011-06-15 02:40:14.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/kernel/sysctl.c linux-3.0.1-vs2.3.1-pre9/kernel/sysctl.c +--- linux-3.0.1/kernel/sysctl.c 2011-07-22 11:18:12.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/sysctl.c 2011-06-15 02:40:14.000000000 +0200 @@ -75,6 +75,7 @@ #if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_LOCK_STAT) #include @@ -17409,9 +17431,9 @@ diff -NurpP --minimal linux-3.0/kernel/sysctl.c linux-3.0-vs2.3.1-pre8/kernel/sy #ifdef CONFIG_CHR_DEV_SG { .procname = "sg-big-buff", -diff -NurpP --minimal linux-3.0/kernel/sysctl_binary.c linux-3.0-vs2.3.1-pre8/kernel/sysctl_binary.c ---- linux-3.0/kernel/sysctl_binary.c 2011-05-22 16:17:59.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/kernel/sysctl_binary.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/kernel/sysctl_binary.c linux-3.0.1-vs2.3.1-pre9/kernel/sysctl_binary.c +--- linux-3.0.1/kernel/sysctl_binary.c 2011-05-22 16:17:59.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/sysctl_binary.c 2011-06-10 22:11:24.000000000 +0200 @@ -73,6 +73,7 @@ static const struct bin_table bin_kern_t { CTL_INT, KERN_PANIC, "panic" }, @@ -17420,9 +17442,9 @@ diff -NurpP --minimal linux-3.0/kernel/sysctl_binary.c linux-3.0-vs2.3.1-pre8/ke { CTL_STR, KERN_SPARC_REBOOT, "reboot-cmd" }, { CTL_INT, KERN_CTLALTDEL, "ctrl-alt-del" }, -diff -NurpP --minimal linux-3.0/kernel/time/timekeeping.c linux-3.0-vs2.3.1-pre8/kernel/time/timekeeping.c ---- linux-3.0/kernel/time/timekeeping.c 2011-07-22 11:18:12.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/kernel/time/timekeeping.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/kernel/time/timekeeping.c linux-3.0.1-vs2.3.1-pre9/kernel/time/timekeeping.c +--- linux-3.0.1/kernel/time/timekeeping.c 2011-07-22 11:18:12.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/time/timekeeping.c 2011-06-10 22:11:24.000000000 +0200 @@ -233,6 +233,7 @@ void getnstimeofday(struct timespec *ts) } while (read_seqretry(&xtime_lock, seq)); @@ -17431,9 +17453,9 @@ diff -NurpP --minimal linux-3.0/kernel/time/timekeeping.c linux-3.0-vs2.3.1-pre8 } EXPORT_SYMBOL(getnstimeofday); -diff -NurpP --minimal linux-3.0/kernel/time.c linux-3.0-vs2.3.1-pre8/kernel/time.c ---- linux-3.0/kernel/time.c 2011-05-22 16:17:59.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/kernel/time.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/kernel/time.c linux-3.0.1-vs2.3.1-pre9/kernel/time.c +--- linux-3.0.1/kernel/time.c 2011-05-22 16:17:59.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/time.c 2011-06-10 22:11:24.000000000 +0200 @@ -92,7 +92,7 @@ SYSCALL_DEFINE1(stime, time_t __user *, if (err) return err; @@ -17452,9 +17474,9 @@ diff -NurpP --minimal linux-3.0/kernel/time.c linux-3.0-vs2.3.1-pre8/kernel/time } return 0; } -diff -NurpP --minimal linux-3.0/kernel/timer.c linux-3.0-vs2.3.1-pre8/kernel/timer.c ---- linux-3.0/kernel/timer.c 2011-07-22 11:18:12.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/kernel/timer.c 2011-06-15 02:40:14.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/kernel/timer.c linux-3.0.1-vs2.3.1-pre9/kernel/timer.c +--- linux-3.0.1/kernel/timer.c 2011-07-22 11:18:12.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/timer.c 2011-06-15 02:40:14.000000000 +0200 @@ -40,6 +40,10 @@ #include #include @@ -17504,9 +17526,9 @@ diff -NurpP --minimal linux-3.0/kernel/timer.c linux-3.0-vs2.3.1-pre8/kernel/tim SYSCALL_DEFINE0(getuid) { /* Only we change this so SMP safe */ -diff -NurpP --minimal linux-3.0/kernel/user_namespace.c linux-3.0-vs2.3.1-pre8/kernel/user_namespace.c ---- linux-3.0/kernel/user_namespace.c 2011-03-15 18:07:42.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/kernel/user_namespace.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/kernel/user_namespace.c linux-3.0.1-vs2.3.1-pre9/kernel/user_namespace.c +--- linux-3.0.1/kernel/user_namespace.c 2011-03-15 18:07:42.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/user_namespace.c 2011-06-10 22:11:24.000000000 +0200 @@ -11,6 +11,7 @@ #include #include @@ -17532,9 +17554,9 @@ diff -NurpP --minimal linux-3.0/kernel/user_namespace.c linux-3.0-vs2.3.1-pre8/k INIT_WORK(&ns->destroyer, free_user_ns_work); schedule_work(&ns->destroyer); } -diff -NurpP --minimal linux-3.0/kernel/utsname.c linux-3.0-vs2.3.1-pre8/kernel/utsname.c ---- linux-3.0/kernel/utsname.c 2011-07-22 11:18:12.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/kernel/utsname.c 2011-06-13 14:09:44.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/kernel/utsname.c linux-3.0.1-vs2.3.1-pre9/kernel/utsname.c +--- linux-3.0.1/kernel/utsname.c 2011-07-22 11:18:12.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/utsname.c 2011-06-13 14:09:44.000000000 +0200 @@ -16,14 +16,17 @@ #include #include @@ -17603,10 +17625,10 @@ diff -NurpP --minimal linux-3.0/kernel/utsname.c linux-3.0-vs2.3.1-pre8/kernel/u kfree(ns); } -diff -NurpP --minimal linux-3.0/kernel/vserver/Kconfig linux-3.0-vs2.3.1-pre8/kernel/vserver/Kconfig ---- linux-3.0/kernel/vserver/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/kernel/vserver/Kconfig 2011-07-20 02:15:23.000000000 +0200 -@@ -0,0 +1,228 @@ +diff -NurpP --minimal linux-3.0.1/kernel/vserver/Kconfig linux-3.0.1-vs2.3.1-pre9/kernel/vserver/Kconfig +--- linux-3.0.1/kernel/vserver/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/Kconfig 2011-08-08 18:06:22.000000000 +0200 +@@ -0,0 +1,232 @@ +# +# Linux VServer configuration +# @@ -17835,9 +17857,13 @@ diff -NurpP --minimal linux-3.0/kernel/vserver/Kconfig linux-3.0-vs2.3.1-pre8/ke + default y + select SECURITY_CAPABILITIES + -diff -NurpP --minimal linux-3.0/kernel/vserver/Makefile linux-3.0-vs2.3.1-pre8/kernel/vserver/Makefile ---- linux-3.0/kernel/vserver/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/kernel/vserver/Makefile 2011-06-10 22:11:24.000000000 +0200 ++config VSERVER_DISABLED ++ bool ++ default n ++ +diff -NurpP --minimal linux-3.0.1/kernel/vserver/Makefile linux-3.0.1-vs2.3.1-pre9/kernel/vserver/Makefile +--- linux-3.0.1/kernel/vserver/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/Makefile 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,18 @@ +# +# Makefile for the Linux vserver routines. @@ -17857,9 +17883,9 @@ diff -NurpP --minimal linux-3.0/kernel/vserver/Makefile linux-3.0-vs2.3.1-pre8/k +vserver-$(CONFIG_VSERVER_MONITOR) += monitor.o +vserver-$(CONFIG_VSERVER_DEVICE) += device.o + -diff -NurpP --minimal linux-3.0/kernel/vserver/cacct.c linux-3.0-vs2.3.1-pre8/kernel/vserver/cacct.c ---- linux-3.0/kernel/vserver/cacct.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/kernel/vserver/cacct.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/kernel/vserver/cacct.c linux-3.0.1-vs2.3.1-pre9/kernel/vserver/cacct.c +--- linux-3.0.1/kernel/vserver/cacct.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/cacct.c 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,42 @@ +/* + * linux/kernel/vserver/cacct.c @@ -17903,9 +17929,9 @@ diff -NurpP --minimal linux-3.0/kernel/vserver/cacct.c linux-3.0-vs2.3.1-pre8/ke + return 0; +} + -diff -NurpP --minimal linux-3.0/kernel/vserver/cacct_init.h linux-3.0-vs2.3.1-pre8/kernel/vserver/cacct_init.h ---- linux-3.0/kernel/vserver/cacct_init.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/kernel/vserver/cacct_init.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/kernel/vserver/cacct_init.h linux-3.0.1-vs2.3.1-pre9/kernel/vserver/cacct_init.h +--- linux-3.0.1/kernel/vserver/cacct_init.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/cacct_init.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,25 @@ + + @@ -17932,9 +17958,9 @@ diff -NurpP --minimal linux-3.0/kernel/vserver/cacct_init.h linux-3.0-vs2.3.1-pr + return; +} + -diff -NurpP --minimal linux-3.0/kernel/vserver/cacct_proc.h linux-3.0-vs2.3.1-pre8/kernel/vserver/cacct_proc.h ---- linux-3.0/kernel/vserver/cacct_proc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/kernel/vserver/cacct_proc.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/kernel/vserver/cacct_proc.h linux-3.0.1-vs2.3.1-pre9/kernel/vserver/cacct_proc.h +--- linux-3.0.1/kernel/vserver/cacct_proc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/cacct_proc.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,53 @@ +#ifndef _VX_CACCT_PROC_H +#define _VX_CACCT_PROC_H @@ -17989,16 +18015,16 @@ diff -NurpP --minimal linux-3.0/kernel/vserver/cacct_proc.h linux-3.0-vs2.3.1-pr +} + +#endif /* _VX_CACCT_PROC_H */ -diff -NurpP --minimal linux-3.0/kernel/vserver/context.c linux-3.0-vs2.3.1-pre8/kernel/vserver/context.c ---- linux-3.0/kernel/vserver/context.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/kernel/vserver/context.c 2011-07-19 19:22:49.000000000 +0200 -@@ -0,0 +1,1080 @@ +diff -NurpP --minimal linux-3.0.1/kernel/vserver/context.c linux-3.0.1-vs2.3.1-pre9/kernel/vserver/context.c +--- linux-3.0.1/kernel/vserver/context.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/context.c 2011-08-01 18:28:12.000000000 +0200 +@@ -0,0 +1,1107 @@ +/* + * linux/kernel/vserver/context.c + * + * Virtual Server: Context Support + * -+ * Copyright (C) 2003-2010 Herbert Pötzl ++ * Copyright (C) 2003-2011 Herbert Pötzl + * + * V0.01 context helper + * V0.02 vx_ctx_kill syscall command @@ -18018,6 +18044,7 @@ diff -NurpP --minimal linux-3.0/kernel/vserver/context.c linux-3.0-vs2.3.1-pre8/ + * V0.16 have __create claim() the vxi + * V0.17 removed older and legacy stuff + * V0.18 added user credentials ++ * V0.19 added warn mask + * + */ + @@ -18113,6 +18140,7 @@ diff -NurpP --minimal linux-3.0/kernel/vserver/context.c linux-3.0-vs2.3.1-pre8/ + new->vx_bcaps = CAP_FULL_SET; // maybe ~CAP_SETPCAP + new->vx_ccaps = 0; + new->vx_umask = 0; ++ new->vx_wmask = 0; + + new->reboot_cmd = 0; + new->exit_code = 0; @@ -19047,6 +19075,31 @@ diff -NurpP --minimal linux-3.0/kernel/vserver/context.c linux-3.0-vs2.3.1-pre8/ +} + + ++int vc_get_wmask(struct vx_info *vxi, void __user *data) ++{ ++ struct vcmd_wmask vc_data; ++ ++ vc_data.wmask = vxi->vx_wmask; ++ vc_data.mask = ~0ULL; ++ ++ if (copy_to_user(data, &vc_data, sizeof(vc_data))) ++ return -EFAULT; ++ return 0; ++} ++ ++int vc_set_wmask(struct vx_info *vxi, void __user *data) ++{ ++ struct vcmd_wmask vc_data; ++ ++ if (copy_from_user(&vc_data, data, sizeof(vc_data))) ++ return -EFAULT; ++ ++ vxi->vx_wmask = vs_mask_flags(vxi->vx_wmask, ++ vc_data.wmask, vc_data.mask); ++ return 0; ++} ++ ++ +int vc_get_badness(struct vx_info *vxi, void __user *data) +{ + struct vcmd_badness_v0 vc_data; @@ -19073,9 +19126,9 @@ diff -NurpP --minimal linux-3.0/kernel/vserver/context.c linux-3.0-vs2.3.1-pre8/ + +EXPORT_SYMBOL_GPL(free_vx_info); + -diff -NurpP --minimal linux-3.0/kernel/vserver/cvirt.c linux-3.0-vs2.3.1-pre8/kernel/vserver/cvirt.c ---- linux-3.0/kernel/vserver/cvirt.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/kernel/vserver/cvirt.c 2011-06-13 14:57:26.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/kernel/vserver/cvirt.c linux-3.0.1-vs2.3.1-pre9/kernel/vserver/cvirt.c +--- linux-3.0.1/kernel/vserver/cvirt.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/cvirt.c 2011-06-13 14:57:26.000000000 +0200 @@ -0,0 +1,303 @@ +/* + * linux/kernel/vserver/cvirt.c @@ -19380,9 +19433,9 @@ diff -NurpP --minimal linux-3.0/kernel/vserver/cvirt.c linux-3.0-vs2.3.1-pre8/ke + +#endif + -diff -NurpP --minimal linux-3.0/kernel/vserver/cvirt_init.h linux-3.0-vs2.3.1-pre8/kernel/vserver/cvirt_init.h ---- linux-3.0/kernel/vserver/cvirt_init.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/kernel/vserver/cvirt_init.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/kernel/vserver/cvirt_init.h linux-3.0.1-vs2.3.1-pre9/kernel/vserver/cvirt_init.h +--- linux-3.0.1/kernel/vserver/cvirt_init.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/cvirt_init.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,70 @@ + + @@ -19454,9 +19507,9 @@ diff -NurpP --minimal linux-3.0/kernel/vserver/cvirt_init.h linux-3.0-vs2.3.1-pr + return; +} + -diff -NurpP --minimal linux-3.0/kernel/vserver/cvirt_proc.h linux-3.0-vs2.3.1-pre8/kernel/vserver/cvirt_proc.h ---- linux-3.0/kernel/vserver/cvirt_proc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/kernel/vserver/cvirt_proc.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/kernel/vserver/cvirt_proc.h linux-3.0.1-vs2.3.1-pre9/kernel/vserver/cvirt_proc.h +--- linux-3.0.1/kernel/vserver/cvirt_proc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/cvirt_proc.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,135 @@ +#ifndef _VX_CVIRT_PROC_H +#define _VX_CVIRT_PROC_H @@ -19593,9 +19646,9 @@ diff -NurpP --minimal linux-3.0/kernel/vserver/cvirt_proc.h linux-3.0-vs2.3.1-pr +} + +#endif /* _VX_CVIRT_PROC_H */ -diff -NurpP --minimal linux-3.0/kernel/vserver/debug.c linux-3.0-vs2.3.1-pre8/kernel/vserver/debug.c ---- linux-3.0/kernel/vserver/debug.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/kernel/vserver/debug.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/kernel/vserver/debug.c linux-3.0.1-vs2.3.1-pre9/kernel/vserver/debug.c +--- linux-3.0.1/kernel/vserver/debug.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/debug.c 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,32 @@ +/* + * kernel/vserver/debug.c @@ -19629,9 +19682,9 @@ diff -NurpP --minimal linux-3.0/kernel/vserver/debug.c linux-3.0-vs2.3.1-pre8/ke + +EXPORT_SYMBOL_GPL(dump_vx_info); + -diff -NurpP --minimal linux-3.0/kernel/vserver/device.c linux-3.0-vs2.3.1-pre8/kernel/vserver/device.c ---- linux-3.0/kernel/vserver/device.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/kernel/vserver/device.c 2011-06-10 23:20:56.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/kernel/vserver/device.c linux-3.0.1-vs2.3.1-pre9/kernel/vserver/device.c +--- linux-3.0.1/kernel/vserver/device.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/device.c 2011-06-10 23:20:56.000000000 +0200 @@ -0,0 +1,443 @@ +/* + * linux/kernel/vserver/device.c @@ -20076,9 +20129,9 @@ diff -NurpP --minimal linux-3.0/kernel/vserver/device.c linux-3.0-vs2.3.1-pre8/k +#endif /* CONFIG_COMPAT */ + + -diff -NurpP --minimal linux-3.0/kernel/vserver/dlimit.c linux-3.0-vs2.3.1-pre8/kernel/vserver/dlimit.c ---- linux-3.0/kernel/vserver/dlimit.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/kernel/vserver/dlimit.c 2011-06-10 23:20:56.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/kernel/vserver/dlimit.c linux-3.0.1-vs2.3.1-pre9/kernel/vserver/dlimit.c +--- linux-3.0.1/kernel/vserver/dlimit.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/dlimit.c 2011-06-10 23:20:56.000000000 +0200 @@ -0,0 +1,531 @@ +/* + * linux/kernel/vserver/dlimit.c @@ -20611,9 +20664,9 @@ diff -NurpP --minimal linux-3.0/kernel/vserver/dlimit.c linux-3.0-vs2.3.1-pre8/k +EXPORT_SYMBOL_GPL(locate_dl_info); +EXPORT_SYMBOL_GPL(rcu_free_dl_info); + -diff -NurpP --minimal linux-3.0/kernel/vserver/helper.c linux-3.0-vs2.3.1-pre8/kernel/vserver/helper.c ---- linux-3.0/kernel/vserver/helper.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/kernel/vserver/helper.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/kernel/vserver/helper.c linux-3.0.1-vs2.3.1-pre9/kernel/vserver/helper.c +--- linux-3.0.1/kernel/vserver/helper.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/helper.c 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,223 @@ +/* + * linux/kernel/vserver/helper.c @@ -20838,9 +20891,9 @@ diff -NurpP --minimal linux-3.0/kernel/vserver/helper.c linux-3.0-vs2.3.1-pre8/k + return do_vshelper(vshelper_path, argv, envp, 1); +} + -diff -NurpP --minimal linux-3.0/kernel/vserver/history.c linux-3.0-vs2.3.1-pre8/kernel/vserver/history.c ---- linux-3.0/kernel/vserver/history.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/kernel/vserver/history.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/kernel/vserver/history.c linux-3.0.1-vs2.3.1-pre9/kernel/vserver/history.c +--- linux-3.0.1/kernel/vserver/history.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/history.c 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,258 @@ +/* + * kernel/vserver/history.c @@ -21100,9 +21153,9 @@ diff -NurpP --minimal linux-3.0/kernel/vserver/history.c linux-3.0-vs2.3.1-pre8/ + +#endif /* CONFIG_COMPAT */ + -diff -NurpP --minimal linux-3.0/kernel/vserver/inet.c linux-3.0-vs2.3.1-pre8/kernel/vserver/inet.c ---- linux-3.0/kernel/vserver/inet.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/kernel/vserver/inet.c 2011-06-13 18:20:44.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/kernel/vserver/inet.c linux-3.0.1-vs2.3.1-pre9/kernel/vserver/inet.c +--- linux-3.0.1/kernel/vserver/inet.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/inet.c 2011-06-13 18:20:44.000000000 +0200 @@ -0,0 +1,225 @@ + +#include @@ -21329,9 +21382,9 @@ diff -NurpP --minimal linux-3.0/kernel/vserver/inet.c linux-3.0-vs2.3.1-pre8/ker + +EXPORT_SYMBOL_GPL(ip_v4_find_src); + -diff -NurpP --minimal linux-3.0/kernel/vserver/init.c linux-3.0-vs2.3.1-pre8/kernel/vserver/init.c ---- linux-3.0/kernel/vserver/init.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/kernel/vserver/init.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/kernel/vserver/init.c linux-3.0.1-vs2.3.1-pre9/kernel/vserver/init.c +--- linux-3.0.1/kernel/vserver/init.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/init.c 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,45 @@ +/* + * linux/kernel/init.c @@ -21378,9 +21431,9 @@ diff -NurpP --minimal linux-3.0/kernel/vserver/init.c linux-3.0-vs2.3.1-pre8/ker +module_init(init_vserver); +module_exit(exit_vserver); + -diff -NurpP --minimal linux-3.0/kernel/vserver/inode.c linux-3.0-vs2.3.1-pre8/kernel/vserver/inode.c ---- linux-3.0/kernel/vserver/inode.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/kernel/vserver/inode.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/kernel/vserver/inode.c linux-3.0.1-vs2.3.1-pre9/kernel/vserver/inode.c +--- linux-3.0.1/kernel/vserver/inode.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/inode.c 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,437 @@ +/* + * linux/kernel/vserver/inode.c @@ -21819,9 +21872,9 @@ diff -NurpP --minimal linux-3.0/kernel/vserver/inode.c linux-3.0-vs2.3.1-pre8/ke + +#endif /* CONFIG_PROPAGATE */ + -diff -NurpP --minimal linux-3.0/kernel/vserver/limit.c linux-3.0-vs2.3.1-pre8/kernel/vserver/limit.c ---- linux-3.0/kernel/vserver/limit.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/kernel/vserver/limit.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/kernel/vserver/limit.c linux-3.0.1-vs2.3.1-pre9/kernel/vserver/limit.c +--- linux-3.0.1/kernel/vserver/limit.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/limit.c 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,354 @@ +/* + * linux/kernel/vserver/limit.c @@ -22177,9 +22230,9 @@ diff -NurpP --minimal linux-3.0/kernel/vserver/limit.c linux-3.0-vs2.3.1-pre8/ke + return points; +} + -diff -NurpP --minimal linux-3.0/kernel/vserver/limit_init.h linux-3.0-vs2.3.1-pre8/kernel/vserver/limit_init.h ---- linux-3.0/kernel/vserver/limit_init.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/kernel/vserver/limit_init.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/kernel/vserver/limit_init.h linux-3.0.1-vs2.3.1-pre9/kernel/vserver/limit_init.h +--- linux-3.0.1/kernel/vserver/limit_init.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/limit_init.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,31 @@ + + @@ -22212,9 +22265,9 @@ diff -NurpP --minimal linux-3.0/kernel/vserver/limit_init.h linux-3.0-vs2.3.1-pr + } +} + -diff -NurpP --minimal linux-3.0/kernel/vserver/limit_proc.h linux-3.0-vs2.3.1-pre8/kernel/vserver/limit_proc.h ---- linux-3.0/kernel/vserver/limit_proc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/kernel/vserver/limit_proc.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/kernel/vserver/limit_proc.h linux-3.0.1-vs2.3.1-pre9/kernel/vserver/limit_proc.h +--- linux-3.0.1/kernel/vserver/limit_proc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/limit_proc.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,57 @@ +#ifndef _VX_LIMIT_PROC_H +#define _VX_LIMIT_PROC_H @@ -22273,9 +22326,9 @@ diff -NurpP --minimal linux-3.0/kernel/vserver/limit_proc.h linux-3.0-vs2.3.1-pr +#endif /* _VX_LIMIT_PROC_H */ + + -diff -NurpP --minimal linux-3.0/kernel/vserver/network.c linux-3.0-vs2.3.1-pre8/kernel/vserver/network.c ---- linux-3.0/kernel/vserver/network.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/kernel/vserver/network.c 2011-06-10 23:20:56.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/kernel/vserver/network.c linux-3.0.1-vs2.3.1-pre9/kernel/vserver/network.c +--- linux-3.0.1/kernel/vserver/network.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/network.c 2011-06-10 23:20:56.000000000 +0200 @@ -0,0 +1,912 @@ +/* + * linux/kernel/vserver/network.c @@ -23189,16 +23242,16 @@ diff -NurpP --minimal linux-3.0/kernel/vserver/network.c linux-3.0-vs2.3.1-pre8/ +EXPORT_SYMBOL_GPL(free_nx_info); +EXPORT_SYMBOL_GPL(unhash_nx_info); + -diff -NurpP --minimal linux-3.0/kernel/vserver/proc.c linux-3.0-vs2.3.1-pre8/kernel/vserver/proc.c ---- linux-3.0/kernel/vserver/proc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/kernel/vserver/proc.c 2011-06-10 22:11:24.000000000 +0200 -@@ -0,0 +1,1100 @@ +diff -NurpP --minimal linux-3.0.1/kernel/vserver/proc.c linux-3.0.1-vs2.3.1-pre9/kernel/vserver/proc.c +--- linux-3.0.1/kernel/vserver/proc.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/proc.c 2011-08-01 19:57:21.000000000 +0200 +@@ -0,0 +1,1103 @@ +/* + * linux/kernel/vserver/proc.c + * + * Virtual Context Support + * -+ * Copyright (C) 2003-2007 Herbert Pötzl ++ * Copyright (C) 2003-2011 Herbert Pötzl + * + * V0.01 basic structure + * V0.02 adaptation vs1.3.0 @@ -23208,6 +23261,7 @@ diff -NurpP --minimal linux-3.0/kernel/vserver/proc.c linux-3.0-vs2.3.1-pre8/ker + * V0.06 inode validation + * V0.07 generic rewrite vid + * V0.08 remove inode type ++ * V0.09 added u/wmask info + * + */ + @@ -23328,9 +23382,11 @@ diff -NurpP --minimal linux-3.0/kernel/vserver/proc.c linux-3.0-vs2.3.1-pre8/ker + buffer += sprintf(buffer, + "CCaps:\t%016llx\n" + "Umask:\t%16llx\n" ++ "Wmask:\t%16llx\n" + "Spaces:\t%08lx %08lx\n", + (unsigned long long)vxi->vx_ccaps, + (unsigned long long)vxi->vx_umask, ++ (unsigned long long)vxi->vx_wmask, + vxi->space[0].vx_nsmask, vxi->space[1].vx_nsmask); + return buffer - orig; +} @@ -24293,9 +24349,9 @@ diff -NurpP --minimal linux-3.0/kernel/vserver/proc.c linux-3.0-vs2.3.1-pre8/ker + return buffer - orig; +} + -diff -NurpP --minimal linux-3.0/kernel/vserver/sched.c linux-3.0-vs2.3.1-pre8/kernel/vserver/sched.c ---- linux-3.0/kernel/vserver/sched.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/kernel/vserver/sched.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/kernel/vserver/sched.c linux-3.0.1-vs2.3.1-pre9/kernel/vserver/sched.c +--- linux-3.0.1/kernel/vserver/sched.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/sched.c 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,82 @@ +/* + * linux/kernel/vserver/sched.c @@ -24379,9 +24435,9 @@ diff -NurpP --minimal linux-3.0/kernel/vserver/sched.c linux-3.0-vs2.3.1-pre8/ke + return 0; +} + -diff -NurpP --minimal linux-3.0/kernel/vserver/sched_init.h linux-3.0-vs2.3.1-pre8/kernel/vserver/sched_init.h ---- linux-3.0/kernel/vserver/sched_init.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/kernel/vserver/sched_init.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/kernel/vserver/sched_init.h linux-3.0.1-vs2.3.1-pre9/kernel/vserver/sched_init.h +--- linux-3.0.1/kernel/vserver/sched_init.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/sched_init.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,27 @@ + +static inline void vx_info_init_sched(struct _vx_sched *sched) @@ -24410,9 +24466,9 @@ diff -NurpP --minimal linux-3.0/kernel/vserver/sched_init.h linux-3.0-vs2.3.1-pr +{ + return; +} -diff -NurpP --minimal linux-3.0/kernel/vserver/sched_proc.h linux-3.0-vs2.3.1-pre8/kernel/vserver/sched_proc.h ---- linux-3.0/kernel/vserver/sched_proc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/kernel/vserver/sched_proc.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/kernel/vserver/sched_proc.h linux-3.0.1-vs2.3.1-pre9/kernel/vserver/sched_proc.h +--- linux-3.0.1/kernel/vserver/sched_proc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/sched_proc.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,32 @@ +#ifndef _VX_SCHED_PROC_H +#define _VX_SCHED_PROC_H @@ -24446,9 +24502,9 @@ diff -NurpP --minimal linux-3.0/kernel/vserver/sched_proc.h linux-3.0-vs2.3.1-pr +} + +#endif /* _VX_SCHED_PROC_H */ -diff -NurpP --minimal linux-3.0/kernel/vserver/signal.c linux-3.0-vs2.3.1-pre8/kernel/vserver/signal.c ---- linux-3.0/kernel/vserver/signal.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/kernel/vserver/signal.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/kernel/vserver/signal.c linux-3.0.1-vs2.3.1-pre9/kernel/vserver/signal.c +--- linux-3.0.1/kernel/vserver/signal.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/signal.c 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,134 @@ +/* + * linux/kernel/vserver/signal.c @@ -24584,9 +24640,9 @@ diff -NurpP --minimal linux-3.0/kernel/vserver/signal.c linux-3.0-vs2.3.1-pre8/k + return ret; +} + -diff -NurpP --minimal linux-3.0/kernel/vserver/space.c linux-3.0-vs2.3.1-pre8/kernel/vserver/space.c ---- linux-3.0/kernel/vserver/space.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/kernel/vserver/space.c 2011-07-20 02:11:49.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/kernel/vserver/space.c linux-3.0.1-vs2.3.1-pre9/kernel/vserver/space.c +--- linux-3.0.1/kernel/vserver/space.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/space.c 2011-07-20 02:11:49.000000000 +0200 @@ -0,0 +1,435 @@ +/* + * linux/kernel/vserver/space.c @@ -25023,16 +25079,16 @@ diff -NurpP --minimal linux-3.0/kernel/vserver/space.c linux-3.0-vs2.3.1-pre8/ke + return 0; +} + -diff -NurpP --minimal linux-3.0/kernel/vserver/switch.c linux-3.0-vs2.3.1-pre8/kernel/vserver/switch.c ---- linux-3.0/kernel/vserver/switch.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/kernel/vserver/switch.c 2011-07-20 02:40:51.000000000 +0200 -@@ -0,0 +1,548 @@ +diff -NurpP --minimal linux-3.0.1/kernel/vserver/switch.c linux-3.0.1-vs2.3.1-pre9/kernel/vserver/switch.c +--- linux-3.0.1/kernel/vserver/switch.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/switch.c 2011-08-01 18:28:26.000000000 +0200 +@@ -0,0 +1,556 @@ +/* + * linux/kernel/vserver/switch.c + * + * Virtual Server: Syscall Switch + * -+ * Copyright (C) 2003-2007 Herbert Pötzl ++ * Copyright (C) 2003-2011 Herbert Pötzl + * + * V0.01 syscall switch + * V0.02 added signal to context @@ -25045,6 +25101,7 @@ diff -NurpP --minimal linux-3.0/kernel/vserver/switch.c linux-3.0-vs2.3.1-pre8/k + * V0.09 added tag commands + * V0.10 added oom bias + * V0.11 added device commands ++ * V0.12 added warn mask + * + */ + @@ -25144,6 +25201,11 @@ diff -NurpP --minimal linux-3.0/kernel/vserver/switch.c linux-3.0-vs2.3.1-pre8/k + case VCMD_get_umask: + return vc_get_umask(vxi, data); + ++ case VCMD_set_wmask: ++ return vc_set_wmask(vxi, data); ++ ++ case VCMD_get_wmask: ++ return vc_get_wmask(vxi, data); +#ifdef CONFIG_IA32_EMULATION + case VCMD_get_rlimit: + return __COMPAT(vc_get_rlimit, vxi, data, compat); @@ -25361,6 +25423,7 @@ diff -NurpP --minimal linux-3.0/kernel/vserver/switch.c linux-3.0-vs2.3.1-pre8/k + __VCMD(get_ccaps, 3, VCA_VXI, VCF_INFO); + __VCMD(get_cflags, 3, VCA_VXI, VCF_INFO); + __VCMD(get_umask, 3, VCA_VXI, VCF_INFO); ++ __VCMD(get_wmask, 3, VCA_VXI, VCF_INFO); + __VCMD(get_badness, 3, VCA_VXI, VCF_INFO); + __VCMD(get_vhi_name, 3, VCA_VXI, VCF_INFO); + __VCMD(get_rlimit, 3, VCA_VXI, VCF_INFO); @@ -25407,6 +25470,7 @@ diff -NurpP --minimal linux-3.0/kernel/vserver/switch.c linux-3.0-vs2.3.1-pre8/k + __VCMD(set_bcaps, 7, VCA_VXI, VCF_ARES | VCF_SETUP); + __VCMD(set_cflags, 7, VCA_VXI, VCF_ARES | VCF_SETUP); + __VCMD(set_umask, 7, VCA_VXI, VCF_ARES | VCF_SETUP); ++ __VCMD(set_wmask, 7, VCA_VXI, VCF_ARES | VCF_SETUP); + __VCMD(set_badness, 7, VCA_VXI, VCF_ARES | VCF_SETUP); + + __VCMD(set_vhi_name, 7, VCA_VXI, VCF_ARES | VCF_SETUP); @@ -25575,9 +25639,9 @@ diff -NurpP --minimal linux-3.0/kernel/vserver/switch.c linux-3.0-vs2.3.1-pre8/k +} + +#endif /* CONFIG_COMPAT */ -diff -NurpP --minimal linux-3.0/kernel/vserver/sysctl.c linux-3.0-vs2.3.1-pre8/kernel/vserver/sysctl.c ---- linux-3.0/kernel/vserver/sysctl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/kernel/vserver/sysctl.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/kernel/vserver/sysctl.c linux-3.0.1-vs2.3.1-pre9/kernel/vserver/sysctl.c +--- linux-3.0.1/kernel/vserver/sysctl.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/sysctl.c 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,241 @@ +/* + * kernel/vserver/sysctl.c @@ -25820,9 +25884,9 @@ diff -NurpP --minimal linux-3.0/kernel/vserver/sysctl.c linux-3.0-vs2.3.1-pre8/k +EXPORT_SYMBOL_GPL(vx_debug_space); +EXPORT_SYMBOL_GPL(vx_debug_misc); + -diff -NurpP --minimal linux-3.0/kernel/vserver/tag.c linux-3.0-vs2.3.1-pre8/kernel/vserver/tag.c ---- linux-3.0/kernel/vserver/tag.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/kernel/vserver/tag.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/kernel/vserver/tag.c linux-3.0.1-vs2.3.1-pre9/kernel/vserver/tag.c +--- linux-3.0.1/kernel/vserver/tag.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/tag.c 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,63 @@ +/* + * linux/kernel/vserver/tag.c @@ -25887,9 +25951,9 @@ diff -NurpP --minimal linux-3.0/kernel/vserver/tag.c linux-3.0-vs2.3.1-pre8/kern +} + + -diff -NurpP --minimal linux-3.0/kernel/vserver/vci_config.h linux-3.0-vs2.3.1-pre8/kernel/vserver/vci_config.h ---- linux-3.0/kernel/vserver/vci_config.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/kernel/vserver/vci_config.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/kernel/vserver/vci_config.h linux-3.0.1-vs2.3.1-pre9/kernel/vserver/vci_config.h +--- linux-3.0.1/kernel/vserver/vci_config.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/vci_config.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,76 @@ + +/* interface version */ @@ -25967,9 +26031,9 @@ diff -NurpP --minimal linux-3.0/kernel/vserver/vci_config.h linux-3.0-vs2.3.1-pr + 0; +} + -diff -NurpP --minimal linux-3.0/mm/filemap_xip.c linux-3.0-vs2.3.1-pre8/mm/filemap_xip.c ---- linux-3.0/mm/filemap_xip.c 2011-07-22 11:18:12.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/mm/filemap_xip.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/mm/filemap_xip.c linux-3.0.1-vs2.3.1-pre9/mm/filemap_xip.c +--- linux-3.0.1/mm/filemap_xip.c 2011-07-22 11:18:12.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/mm/filemap_xip.c 2011-06-10 22:11:24.000000000 +0200 @@ -18,6 +18,7 @@ #include #include @@ -25978,9 +26042,9 @@ diff -NurpP --minimal linux-3.0/mm/filemap_xip.c linux-3.0-vs2.3.1-pre8/mm/filem #include #include -diff -NurpP --minimal linux-3.0/mm/fremap.c linux-3.0-vs2.3.1-pre8/mm/fremap.c ---- linux-3.0/mm/fremap.c 2011-07-22 11:18:12.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/mm/fremap.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/mm/fremap.c linux-3.0.1-vs2.3.1-pre9/mm/fremap.c +--- linux-3.0.1/mm/fremap.c 2011-07-22 11:18:12.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/mm/fremap.c 2011-06-10 22:11:24.000000000 +0200 @@ -16,6 +16,7 @@ #include #include @@ -25989,9 +26053,9 @@ diff -NurpP --minimal linux-3.0/mm/fremap.c linux-3.0-vs2.3.1-pre8/mm/fremap.c #include #include -diff -NurpP --minimal linux-3.0/mm/hugetlb.c linux-3.0-vs2.3.1-pre8/mm/hugetlb.c ---- linux-3.0/mm/hugetlb.c 2011-07-22 11:18:12.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/mm/hugetlb.c 2011-06-22 12:39:16.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/mm/hugetlb.c linux-3.0.1-vs2.3.1-pre9/mm/hugetlb.c +--- linux-3.0.1/mm/hugetlb.c 2011-07-22 11:18:12.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/mm/hugetlb.c 2011-06-22 12:39:16.000000000 +0200 @@ -28,6 +28,7 @@ #include @@ -26000,9 +26064,9 @@ diff -NurpP --minimal linux-3.0/mm/hugetlb.c linux-3.0-vs2.3.1-pre8/mm/hugetlb.c #include "internal.h" const unsigned long hugetlb_zero = 0, hugetlb_infinity = ~0UL; -diff -NurpP --minimal linux-3.0/mm/memcontrol.c linux-3.0-vs2.3.1-pre8/mm/memcontrol.c ---- linux-3.0/mm/memcontrol.c 2011-07-22 11:18:12.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/mm/memcontrol.c 2011-07-19 00:44:39.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/mm/memcontrol.c linux-3.0.1-vs2.3.1-pre9/mm/memcontrol.c +--- linux-3.0.1/mm/memcontrol.c 2011-08-08 22:31:58.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/mm/memcontrol.c 2011-08-08 23:04:47.000000000 +0200 @@ -741,6 +741,31 @@ struct mem_cgroup *mem_cgroup_from_task( struct mem_cgroup, css); } @@ -26035,10 +26099,10 @@ diff -NurpP --minimal linux-3.0/mm/memcontrol.c linux-3.0-vs2.3.1-pre8/mm/memcon struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm) { struct mem_cgroup *mem = NULL; -diff -NurpP --minimal linux-3.0/mm/memory.c linux-3.0-vs2.3.1-pre8/mm/memory.c ---- linux-3.0/mm/memory.c 2011-07-22 11:18:12.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/mm/memory.c 2011-07-19 00:44:39.000000000 +0200 -@@ -3332,6 +3332,7 @@ int handle_pte_fault(struct mm_struct *m +diff -NurpP --minimal linux-3.0.1/mm/memory.c linux-3.0.1-vs2.3.1-pre9/mm/memory.c +--- linux-3.0.1/mm/memory.c 2011-08-08 22:31:58.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/mm/memory.c 2011-08-08 23:04:47.000000000 +0200 +@@ -3388,6 +3388,7 @@ int handle_pte_fault(struct mm_struct *m { pte_t entry; spinlock_t *ptl; @@ -26046,7 +26110,7 @@ diff -NurpP --minimal linux-3.0/mm/memory.c linux-3.0-vs2.3.1-pre8/mm/memory.c entry = *pte; if (!pte_present(entry)) { -@@ -3356,9 +3357,12 @@ int handle_pte_fault(struct mm_struct *m +@@ -3412,9 +3413,12 @@ int handle_pte_fault(struct mm_struct *m if (unlikely(!pte_same(*pte, entry))) goto unlock; if (flags & FAULT_FLAG_WRITE) { @@ -26061,7 +26125,7 @@ diff -NurpP --minimal linux-3.0/mm/memory.c linux-3.0-vs2.3.1-pre8/mm/memory.c entry = pte_mkdirty(entry); } entry = pte_mkyoung(entry); -@@ -3376,7 +3380,10 @@ int handle_pte_fault(struct mm_struct *m +@@ -3432,7 +3436,10 @@ int handle_pte_fault(struct mm_struct *m } unlock: pte_unmap_unlock(pte, ptl); @@ -26073,9 +26137,9 @@ diff -NurpP --minimal linux-3.0/mm/memory.c linux-3.0-vs2.3.1-pre8/mm/memory.c } /* -diff -NurpP --minimal linux-3.0/mm/mremap.c linux-3.0-vs2.3.1-pre8/mm/mremap.c ---- linux-3.0/mm/mremap.c 2011-07-22 11:18:12.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/mm/mremap.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/mm/mremap.c linux-3.0.1-vs2.3.1-pre9/mm/mremap.c +--- linux-3.0.1/mm/mremap.c 2011-07-22 11:18:12.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/mm/mremap.c 2011-06-10 22:11:24.000000000 +0200 @@ -19,6 +19,7 @@ #include #include @@ -26084,9 +26148,9 @@ diff -NurpP --minimal linux-3.0/mm/mremap.c linux-3.0-vs2.3.1-pre8/mm/mremap.c #include #include -diff -NurpP --minimal linux-3.0/mm/oom_kill.c linux-3.0-vs2.3.1-pre8/mm/oom_kill.c ---- linux-3.0/mm/oom_kill.c 2011-07-22 11:18:12.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/mm/oom_kill.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/mm/oom_kill.c linux-3.0.1-vs2.3.1-pre9/mm/oom_kill.c +--- linux-3.0.1/mm/oom_kill.c 2011-08-08 22:31:58.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/mm/oom_kill.c 2011-08-08 23:04:47.000000000 +0200 @@ -32,6 +32,9 @@ #include #include @@ -26136,7 +26200,7 @@ diff -NurpP --minimal linux-3.0/mm/oom_kill.c linux-3.0-vs2.3.1-pre8/mm/oom_kill * Never return 0 for an eligible task that may be killed since it's * possible that no single user task uses more than 0.1% of memory and * no single admin tasks uses more than 3.0%. -@@ -427,8 +449,8 @@ static int oom_kill_task(struct task_str +@@ -429,8 +451,8 @@ static int oom_kill_task(struct task_str /* mm cannot be safely dereferenced after task_unlock(p) */ mm = p->mm; @@ -26147,7 +26211,7 @@ diff -NurpP --minimal linux-3.0/mm/oom_kill.c linux-3.0-vs2.3.1-pre8/mm/oom_kill K(get_mm_counter(p->mm, MM_ANONPAGES)), K(get_mm_counter(p->mm, MM_FILEPAGES))); task_unlock(p); -@@ -482,8 +504,8 @@ static int oom_kill_process(struct task_ +@@ -484,8 +506,8 @@ static int oom_kill_process(struct task_ } task_lock(p); @@ -26158,7 +26222,7 @@ diff -NurpP --minimal linux-3.0/mm/oom_kill.c linux-3.0-vs2.3.1-pre8/mm/oom_kill task_unlock(p); /* -@@ -584,6 +606,8 @@ int unregister_oom_notifier(struct notif +@@ -586,6 +608,8 @@ int unregister_oom_notifier(struct notif } EXPORT_SYMBOL_GPL(unregister_oom_notifier); @@ -26167,7 +26231,7 @@ diff -NurpP --minimal linux-3.0/mm/oom_kill.c linux-3.0-vs2.3.1-pre8/mm/oom_kill /* * Try to acquire the OOM killer lock for the zones in zonelist. Returns zero * if a parallel OOM killing is already taking place that includes a zone in -@@ -742,7 +766,12 @@ retry: +@@ -744,7 +768,12 @@ retry: if (!p) { dump_header(NULL, gfp_mask, order, NULL, mpol_mask); read_unlock(&tasklist_lock); @@ -26181,9 +26245,9 @@ diff -NurpP --minimal linux-3.0/mm/oom_kill.c linux-3.0-vs2.3.1-pre8/mm/oom_kill } if (oom_kill_process(p, gfp_mask, order, points, totalpages, NULL, -diff -NurpP --minimal linux-3.0/mm/page_alloc.c linux-3.0-vs2.3.1-pre8/mm/page_alloc.c ---- linux-3.0/mm/page_alloc.c 2011-07-22 11:18:12.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/mm/page_alloc.c 2011-06-10 22:24:12.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/mm/page_alloc.c linux-3.0.1-vs2.3.1-pre9/mm/page_alloc.c +--- linux-3.0.1/mm/page_alloc.c 2011-07-22 11:18:12.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/mm/page_alloc.c 2011-06-10 22:24:12.000000000 +0200 @@ -57,6 +57,8 @@ #include #include @@ -26213,9 +26277,9 @@ diff -NurpP --minimal linux-3.0/mm/page_alloc.c linux-3.0-vs2.3.1-pre8/mm/page_a } #endif -diff -NurpP --minimal linux-3.0/mm/pgtable-generic.c linux-3.0-vs2.3.1-pre8/mm/pgtable-generic.c ---- linux-3.0/mm/pgtable-generic.c 2011-03-15 18:07:42.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/mm/pgtable-generic.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/mm/pgtable-generic.c linux-3.0.1-vs2.3.1-pre9/mm/pgtable-generic.c +--- linux-3.0.1/mm/pgtable-generic.c 2011-03-15 18:07:42.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/mm/pgtable-generic.c 2011-06-10 22:11:24.000000000 +0200 @@ -6,6 +6,8 @@ * Copyright (C) 2010 Linus Torvalds */ @@ -26225,9 +26289,9 @@ diff -NurpP --minimal linux-3.0/mm/pgtable-generic.c linux-3.0-vs2.3.1-pre8/mm/p #include #include #include -diff -NurpP --minimal linux-3.0/mm/rmap.c linux-3.0-vs2.3.1-pre8/mm/rmap.c ---- linux-3.0/mm/rmap.c 2011-07-22 11:18:12.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/mm/rmap.c 2011-07-01 11:35:35.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/mm/rmap.c linux-3.0.1-vs2.3.1-pre9/mm/rmap.c +--- linux-3.0.1/mm/rmap.c 2011-07-22 11:18:12.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/mm/rmap.c 2011-07-01 11:35:35.000000000 +0200 @@ -57,6 +57,7 @@ #include #include @@ -26236,9 +26300,9 @@ diff -NurpP --minimal linux-3.0/mm/rmap.c linux-3.0-vs2.3.1-pre8/mm/rmap.c #include -diff -NurpP --minimal linux-3.0/mm/shmem.c linux-3.0-vs2.3.1-pre8/mm/shmem.c ---- linux-3.0/mm/shmem.c 2011-07-22 11:18:12.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/mm/shmem.c 2011-07-01 11:35:35.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/mm/shmem.c linux-3.0.1-vs2.3.1-pre9/mm/shmem.c +--- linux-3.0.1/mm/shmem.c 2011-07-22 11:18:12.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/mm/shmem.c 2011-07-01 11:35:35.000000000 +0200 @@ -1850,7 +1850,7 @@ static int shmem_statfs(struct dentry *d { struct shmem_sb_info *sbinfo = SHMEM_SB(dentry->d_sb); @@ -26257,9 +26321,9 @@ diff -NurpP --minimal linux-3.0/mm/shmem.c linux-3.0-vs2.3.1-pre8/mm/shmem.c sb->s_op = &shmem_ops; sb->s_time_gran = 1; #ifdef CONFIG_TMPFS_XATTR -diff -NurpP --minimal linux-3.0/mm/slab.c linux-3.0-vs2.3.1-pre8/mm/slab.c ---- linux-3.0/mm/slab.c 2011-07-22 11:18:12.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/mm/slab.c 2011-06-15 02:41:23.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/mm/slab.c linux-3.0.1-vs2.3.1-pre9/mm/slab.c +--- linux-3.0.1/mm/slab.c 2011-07-22 11:18:12.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/mm/slab.c 2011-06-15 02:41:23.000000000 +0200 @@ -411,6 +411,8 @@ static void kmem_list3_init(struct kmem_ #define STATS_INC_FREEMISS(x) do { } while (0) #endif @@ -26293,9 +26357,9 @@ diff -NurpP --minimal linux-3.0/mm/slab.c linux-3.0-vs2.3.1-pre8/mm/slab.c kmemcheck_slab_free(cachep, objp, obj_size(cachep)); -diff -NurpP --minimal linux-3.0/mm/slab_vs.h linux-3.0-vs2.3.1-pre8/mm/slab_vs.h ---- linux-3.0/mm/slab_vs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/mm/slab_vs.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/mm/slab_vs.h linux-3.0.1-vs2.3.1-pre9/mm/slab_vs.h +--- linux-3.0.1/mm/slab_vs.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/mm/slab_vs.h 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,29 @@ + +#include @@ -26326,9 +26390,9 @@ diff -NurpP --minimal linux-3.0/mm/slab_vs.h linux-3.0-vs2.3.1-pre8/mm/slab_vs.h + atomic_sub(cachep->buffer_size, &vxi->cacct.slab[what]); +} + -diff -NurpP --minimal linux-3.0/mm/swapfile.c linux-3.0-vs2.3.1-pre8/mm/swapfile.c ---- linux-3.0/mm/swapfile.c 2011-07-22 11:18:12.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/mm/swapfile.c 2011-07-01 11:35:35.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/mm/swapfile.c linux-3.0.1-vs2.3.1-pre9/mm/swapfile.c +--- linux-3.0.1/mm/swapfile.c 2011-07-22 11:18:12.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/mm/swapfile.c 2011-07-01 11:35:35.000000000 +0200 @@ -37,6 +37,8 @@ #include #include @@ -26364,9 +26428,9 @@ diff -NurpP --minimal linux-3.0/mm/swapfile.c linux-3.0-vs2.3.1-pre8/mm/swapfile } /* -diff -NurpP --minimal linux-3.0/net/bridge/br_multicast.c linux-3.0-vs2.3.1-pre8/net/bridge/br_multicast.c ---- linux-3.0/net/bridge/br_multicast.c 2011-07-22 11:18:12.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/net/bridge/br_multicast.c 2011-07-19 00:44:39.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/net/bridge/br_multicast.c linux-3.0.1-vs2.3.1-pre9/net/bridge/br_multicast.c +--- linux-3.0.1/net/bridge/br_multicast.c 2011-07-22 11:18:12.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/net/bridge/br_multicast.c 2011-07-19 00:44:39.000000000 +0200 @@ -447,7 +447,7 @@ static struct sk_buff *br_ip6_multicast_ ip6h->hop_limit = 1; ipv6_addr_set(&ip6h->daddr, htonl(0xff020000), 0, 0, htonl(1)); @@ -26376,9 +26440,9 @@ diff -NurpP --minimal linux-3.0/net/bridge/br_multicast.c linux-3.0-vs2.3.1-pre8 ipv6_eth_mc_map(&ip6h->daddr, eth->h_dest); hopopt = (u8 *)(ip6h + 1); -diff -NurpP --minimal linux-3.0/net/core/dev.c linux-3.0-vs2.3.1-pre8/net/core/dev.c ---- linux-3.0/net/core/dev.c 2011-07-22 11:18:13.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/net/core/dev.c 2011-06-15 02:40:14.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/net/core/dev.c linux-3.0.1-vs2.3.1-pre9/net/core/dev.c +--- linux-3.0.1/net/core/dev.c 2011-07-22 11:18:13.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/net/core/dev.c 2011-06-15 02:40:14.000000000 +0200 @@ -127,6 +127,7 @@ #include #include @@ -26480,9 +26544,9 @@ diff -NurpP --minimal linux-3.0/net/core/dev.c linux-3.0-vs2.3.1-pre8/net/core/d seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu " "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n", dev->name, stats->rx_bytes, stats->rx_packets, -diff -NurpP --minimal linux-3.0/net/core/rtnetlink.c linux-3.0-vs2.3.1-pre8/net/core/rtnetlink.c ---- linux-3.0/net/core/rtnetlink.c 2011-07-22 11:18:13.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/net/core/rtnetlink.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/net/core/rtnetlink.c linux-3.0.1-vs2.3.1-pre9/net/core/rtnetlink.c +--- linux-3.0.1/net/core/rtnetlink.c 2011-07-22 11:18:13.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/net/core/rtnetlink.c 2011-06-10 22:11:24.000000000 +0200 @@ -1015,6 +1015,8 @@ static int rtnl_dump_ifinfo(struct sk_bu hlist_for_each_entry_rcu(dev, node, head, index_hlist) { if (idx < s_idx) @@ -26502,9 +26566,9 @@ diff -NurpP --minimal linux-3.0/net/core/rtnetlink.c linux-3.0-vs2.3.1-pre8/net/ skb = nlmsg_new(if_nlmsg_size(dev), GFP_KERNEL); if (skb == NULL) goto errout; -diff -NurpP --minimal linux-3.0/net/core/sock.c linux-3.0-vs2.3.1-pre8/net/core/sock.c ---- linux-3.0/net/core/sock.c 2011-05-22 16:18:00.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/net/core/sock.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/net/core/sock.c linux-3.0.1-vs2.3.1-pre9/net/core/sock.c +--- linux-3.0.1/net/core/sock.c 2011-05-22 16:18:00.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/net/core/sock.c 2011-06-10 22:11:24.000000000 +0200 @@ -127,6 +127,10 @@ #include @@ -26572,9 +26636,9 @@ diff -NurpP --minimal linux-3.0/net/core/sock.c linux-3.0-vs2.3.1-pre8/net/core/ /* * Before updating sk_refcnt, we must commit prior changes to memory * (Documentation/RCU/rculist_nulls.txt for details) -diff -NurpP --minimal linux-3.0/net/ipv4/af_inet.c linux-3.0-vs2.3.1-pre8/net/ipv4/af_inet.c ---- linux-3.0/net/ipv4/af_inet.c 2011-07-22 11:18:13.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/net/ipv4/af_inet.c 2011-07-19 00:44:39.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/net/ipv4/af_inet.c linux-3.0.1-vs2.3.1-pre9/net/ipv4/af_inet.c +--- linux-3.0.1/net/ipv4/af_inet.c 2011-07-22 11:18:13.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/net/ipv4/af_inet.c 2011-07-19 00:44:39.000000000 +0200 @@ -117,6 +117,7 @@ #ifdef CONFIG_IP_MROUTE #include @@ -26652,9 +26716,9 @@ diff -NurpP --minimal linux-3.0/net/ipv4/af_inet.c linux-3.0-vs2.3.1-pre8/net/ip sin->sin_port = inet->inet_sport; sin->sin_addr.s_addr = addr; } -diff -NurpP --minimal linux-3.0/net/ipv4/devinet.c linux-3.0-vs2.3.1-pre8/net/ipv4/devinet.c ---- linux-3.0/net/ipv4/devinet.c 2011-07-22 11:18:13.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/net/ipv4/devinet.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/net/ipv4/devinet.c linux-3.0.1-vs2.3.1-pre9/net/ipv4/devinet.c +--- linux-3.0.1/net/ipv4/devinet.c 2011-07-22 11:18:13.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/net/ipv4/devinet.c 2011-06-10 22:11:24.000000000 +0200 @@ -518,6 +518,7 @@ struct in_device *inetdev_by_index(struc } EXPORT_SYMBOL(inetdev_by_index); @@ -26721,9 +26785,9 @@ diff -NurpP --minimal linux-3.0/net/ipv4/devinet.c linux-3.0-vs2.3.1-pre8/net/ip if (ip_idx < s_ip_idx) continue; if (inet_fill_ifaddr(skb, ifa, -diff -NurpP --minimal linux-3.0/net/ipv4/inet_connection_sock.c linux-3.0-vs2.3.1-pre8/net/ipv4/inet_connection_sock.c ---- linux-3.0/net/ipv4/inet_connection_sock.c 2011-07-22 11:18:13.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/net/ipv4/inet_connection_sock.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/net/ipv4/inet_connection_sock.c linux-3.0.1-vs2.3.1-pre9/net/ipv4/inet_connection_sock.c +--- linux-3.0.1/net/ipv4/inet_connection_sock.c 2011-07-22 11:18:13.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/net/ipv4/inet_connection_sock.c 2011-06-10 22:11:24.000000000 +0200 @@ -52,6 +52,37 @@ void inet_get_local_port_range(int *low, } EXPORT_SYMBOL(inet_get_local_port_range); @@ -26773,9 +26837,9 @@ diff -NurpP --minimal linux-3.0/net/ipv4/inet_connection_sock.c linux-3.0-vs2.3. break; } } -diff -NurpP --minimal linux-3.0/net/ipv4/inet_diag.c linux-3.0-vs2.3.1-pre8/net/ipv4/inet_diag.c ---- linux-3.0/net/ipv4/inet_diag.c 2011-07-22 11:18:13.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/net/ipv4/inet_diag.c 2011-06-22 12:39:16.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/net/ipv4/inet_diag.c linux-3.0.1-vs2.3.1-pre9/net/ipv4/inet_diag.c +--- linux-3.0.1/net/ipv4/inet_diag.c 2011-07-22 11:18:13.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/net/ipv4/inet_diag.c 2011-06-22 12:39:16.000000000 +0200 @@ -33,6 +33,8 @@ #include @@ -26879,9 +26943,9 @@ diff -NurpP --minimal linux-3.0/net/ipv4/inet_diag.c linux-3.0-vs2.3.1-pre8/net/ if (num < s_num) goto next_dying; if (r->id.idiag_sport != tw->tw_sport && -diff -NurpP --minimal linux-3.0/net/ipv4/inet_hashtables.c linux-3.0-vs2.3.1-pre8/net/ipv4/inet_hashtables.c ---- linux-3.0/net/ipv4/inet_hashtables.c 2011-01-05 21:50:42.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/net/ipv4/inet_hashtables.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/net/ipv4/inet_hashtables.c linux-3.0.1-vs2.3.1-pre9/net/ipv4/inet_hashtables.c +--- linux-3.0.1/net/ipv4/inet_hashtables.c 2011-01-05 21:50:42.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/net/ipv4/inet_hashtables.c 2011-06-10 22:11:24.000000000 +0200 @@ -21,6 +21,7 @@ #include @@ -26918,9 +26982,9 @@ diff -NurpP --minimal linux-3.0/net/ipv4/inet_hashtables.c linux-3.0-vs2.3.1-pre /* * if the nulls value we got at the end of this lookup is * not the expected one, we must restart lookup. -diff -NurpP --minimal linux-3.0/net/ipv4/netfilter/nf_nat_helper.c linux-3.0-vs2.3.1-pre8/net/ipv4/netfilter/nf_nat_helper.c ---- linux-3.0/net/ipv4/netfilter/nf_nat_helper.c 2011-07-22 11:18:13.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/net/ipv4/netfilter/nf_nat_helper.c 2011-06-15 02:40:14.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/net/ipv4/netfilter/nf_nat_helper.c linux-3.0.1-vs2.3.1-pre9/net/ipv4/netfilter/nf_nat_helper.c +--- linux-3.0.1/net/ipv4/netfilter/nf_nat_helper.c 2011-07-22 11:18:13.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/net/ipv4/netfilter/nf_nat_helper.c 2011-06-15 02:40:14.000000000 +0200 @@ -20,6 +20,7 @@ #include @@ -26929,9 +26993,9 @@ diff -NurpP --minimal linux-3.0/net/ipv4/netfilter/nf_nat_helper.c linux-3.0-vs2 #include #include #include -diff -NurpP --minimal linux-3.0/net/ipv4/netfilter.c linux-3.0-vs2.3.1-pre8/net/ipv4/netfilter.c ---- linux-3.0/net/ipv4/netfilter.c 2011-07-22 11:18:13.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/net/ipv4/netfilter.c 2011-07-19 00:44:39.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/net/ipv4/netfilter.c linux-3.0.1-vs2.3.1-pre9/net/ipv4/netfilter.c +--- linux-3.0.1/net/ipv4/netfilter.c 2011-07-22 11:18:13.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/net/ipv4/netfilter.c 2011-07-19 00:44:39.000000000 +0200 @@ -5,7 +5,7 @@ #include #include @@ -26941,9 +27005,9 @@ diff -NurpP --minimal linux-3.0/net/ipv4/netfilter.c linux-3.0-vs2.3.1-pre8/net/ #include #include #include -diff -NurpP --minimal linux-3.0/net/ipv4/raw.c linux-3.0-vs2.3.1-pre8/net/ipv4/raw.c ---- linux-3.0/net/ipv4/raw.c 2011-07-22 11:18:13.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/net/ipv4/raw.c 2011-07-27 20:26:04.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/net/ipv4/raw.c linux-3.0.1-vs2.3.1-pre9/net/ipv4/raw.c +--- linux-3.0.1/net/ipv4/raw.c 2011-07-22 11:18:13.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/net/ipv4/raw.c 2011-07-27 20:26:04.000000000 +0200 @@ -117,7 +117,7 @@ static struct sock *__raw_v4_lookup(stru if (net_eq(sock_net(sk), net) && inet->inet_num == num && @@ -27036,9 +27100,9 @@ diff -NurpP --minimal linux-3.0/net/ipv4/raw.c linux-3.0-vs2.3.1-pre8/net/ipv4/r if (!sk && ++state->bucket < RAW_HTABLE_SIZE) { sk = sk_head(&state->h->ht[state->bucket]); -diff -NurpP --minimal linux-3.0/net/ipv4/tcp.c linux-3.0-vs2.3.1-pre8/net/ipv4/tcp.c ---- linux-3.0/net/ipv4/tcp.c 2011-07-22 11:18:13.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/net/ipv4/tcp.c 2011-07-19 00:44:39.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/net/ipv4/tcp.c linux-3.0.1-vs2.3.1-pre9/net/ipv4/tcp.c +--- linux-3.0.1/net/ipv4/tcp.c 2011-07-22 11:18:13.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/net/ipv4/tcp.c 2011-07-19 00:44:39.000000000 +0200 @@ -266,6 +266,7 @@ #include #include @@ -27047,9 +27111,9 @@ diff -NurpP --minimal linux-3.0/net/ipv4/tcp.c linux-3.0-vs2.3.1-pre8/net/ipv4/t #include #include -diff -NurpP --minimal linux-3.0/net/ipv4/tcp_ipv4.c linux-3.0-vs2.3.1-pre8/net/ipv4/tcp_ipv4.c ---- linux-3.0/net/ipv4/tcp_ipv4.c 2011-07-22 11:18:13.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/net/ipv4/tcp_ipv4.c 2011-06-22 12:39:16.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/net/ipv4/tcp_ipv4.c linux-3.0.1-vs2.3.1-pre9/net/ipv4/tcp_ipv4.c +--- linux-3.0.1/net/ipv4/tcp_ipv4.c 2011-07-22 11:18:13.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/net/ipv4/tcp_ipv4.c 2011-06-22 12:39:16.000000000 +0200 @@ -2002,6 +2002,12 @@ static void *listening_get_next(struct s req = req->dl_next; while (1) { @@ -27133,9 +27197,9 @@ diff -NurpP --minimal linux-3.0/net/ipv4/tcp_ipv4.c linux-3.0-vs2.3.1-pre8/net/i ntohs(ireq->rmt_port), TCP_SYN_RECV, 0, 0, /* could print option size, but that is af dependent. */ -diff -NurpP --minimal linux-3.0/net/ipv4/tcp_minisocks.c linux-3.0-vs2.3.1-pre8/net/ipv4/tcp_minisocks.c ---- linux-3.0/net/ipv4/tcp_minisocks.c 2011-03-15 18:07:45.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/net/ipv4/tcp_minisocks.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/net/ipv4/tcp_minisocks.c linux-3.0.1-vs2.3.1-pre9/net/ipv4/tcp_minisocks.c +--- linux-3.0.1/net/ipv4/tcp_minisocks.c 2011-03-15 18:07:45.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/net/ipv4/tcp_minisocks.c 2011-06-10 22:11:24.000000000 +0200 @@ -23,6 +23,9 @@ #include #include @@ -27158,9 +27222,9 @@ diff -NurpP --minimal linux-3.0/net/ipv4/tcp_minisocks.c linux-3.0-vs2.3.1-pre8/ #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) if (tw->tw_family == PF_INET6) { struct ipv6_pinfo *np = inet6_sk(sk); -diff -NurpP --minimal linux-3.0/net/ipv4/udp.c linux-3.0-vs2.3.1-pre8/net/ipv4/udp.c ---- linux-3.0/net/ipv4/udp.c 2011-07-22 11:18:13.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/net/ipv4/udp.c 2011-07-27 20:26:14.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/net/ipv4/udp.c linux-3.0.1-vs2.3.1-pre9/net/ipv4/udp.c +--- linux-3.0.1/net/ipv4/udp.c 2011-07-22 11:18:13.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/net/ipv4/udp.c 2011-07-27 20:26:14.000000000 +0200 @@ -296,14 +296,7 @@ fail: } EXPORT_SYMBOL(udp_lib_get_port); @@ -27282,9 +27346,9 @@ diff -NurpP --minimal linux-3.0/net/ipv4/udp.c linux-3.0-vs2.3.1-pre8/net/ipv4/u if (!sk) { if (state->bucket <= state->udp_table->mask) -diff -NurpP --minimal linux-3.0/net/ipv6/Kconfig linux-3.0-vs2.3.1-pre8/net/ipv6/Kconfig ---- linux-3.0/net/ipv6/Kconfig 2010-08-02 16:52:59.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/net/ipv6/Kconfig 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/net/ipv6/Kconfig linux-3.0.1-vs2.3.1-pre9/net/ipv6/Kconfig +--- linux-3.0.1/net/ipv6/Kconfig 2010-08-02 16:52:59.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/net/ipv6/Kconfig 2011-06-10 22:11:24.000000000 +0200 @@ -4,8 +4,8 @@ # IPv6 as module will cause a CRASH if you try to unload it @@ -27296,9 +27360,9 @@ diff -NurpP --minimal linux-3.0/net/ipv6/Kconfig linux-3.0-vs2.3.1-pre8/net/ipv6 ---help--- This is complemental support for the IP version 6. You will still be able to do traditional IPv4 networking as well. -diff -NurpP --minimal linux-3.0/net/ipv6/addrconf.c linux-3.0-vs2.3.1-pre8/net/ipv6/addrconf.c ---- linux-3.0/net/ipv6/addrconf.c 2011-07-22 11:18:13.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/net/ipv6/addrconf.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/net/ipv6/addrconf.c linux-3.0.1-vs2.3.1-pre9/net/ipv6/addrconf.c +--- linux-3.0.1/net/ipv6/addrconf.c 2011-07-22 11:18:13.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/net/ipv6/addrconf.c 2011-06-10 22:11:24.000000000 +0200 @@ -87,6 +87,8 @@ #include @@ -27398,9 +27462,9 @@ diff -NurpP --minimal linux-3.0/net/ipv6/addrconf.c linux-3.0-vs2.3.1-pre8/net/i idev = __in6_dev_get(dev); if (!idev) goto cont; -diff -NurpP --minimal linux-3.0/net/ipv6/af_inet6.c linux-3.0-vs2.3.1-pre8/net/ipv6/af_inet6.c ---- linux-3.0/net/ipv6/af_inet6.c 2011-07-22 11:18:13.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/net/ipv6/af_inet6.c 2011-07-19 00:44:39.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/net/ipv6/af_inet6.c linux-3.0.1-vs2.3.1-pre9/net/ipv6/af_inet6.c +--- linux-3.0.1/net/ipv6/af_inet6.c 2011-07-22 11:18:13.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/net/ipv6/af_inet6.c 2011-07-19 00:44:39.000000000 +0200 @@ -42,6 +42,8 @@ #include #include @@ -27496,9 +27560,9 @@ diff -NurpP --minimal linux-3.0/net/ipv6/af_inet6.c linux-3.0-vs2.3.1-pre8/net/i if (ipv6_addr_any(&np->rcv_saddr)) ipv6_addr_copy(&sin->sin6_addr, &np->saddr); else -diff -NurpP --minimal linux-3.0/net/ipv6/fib6_rules.c linux-3.0-vs2.3.1-pre8/net/ipv6/fib6_rules.c ---- linux-3.0/net/ipv6/fib6_rules.c 2011-05-22 16:18:00.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/net/ipv6/fib6_rules.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/net/ipv6/fib6_rules.c linux-3.0.1-vs2.3.1-pre9/net/ipv6/fib6_rules.c +--- linux-3.0.1/net/ipv6/fib6_rules.c 2011-05-22 16:18:00.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/net/ipv6/fib6_rules.c 2011-06-10 22:11:24.000000000 +0200 @@ -90,7 +90,7 @@ static int fib6_rule_action(struct fib_r ip6_dst_idev(&rt->dst)->dev, &flp6->daddr, @@ -27508,9 +27572,9 @@ diff -NurpP --minimal linux-3.0/net/ipv6/fib6_rules.c linux-3.0-vs2.3.1-pre8/net goto again; if (!ipv6_prefix_equal(&saddr, &r->src.addr, r->src.plen)) -diff -NurpP --minimal linux-3.0/net/ipv6/inet6_hashtables.c linux-3.0-vs2.3.1-pre8/net/ipv6/inet6_hashtables.c ---- linux-3.0/net/ipv6/inet6_hashtables.c 2011-05-22 16:18:00.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/net/ipv6/inet6_hashtables.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/net/ipv6/inet6_hashtables.c linux-3.0.1-vs2.3.1-pre9/net/ipv6/inet6_hashtables.c +--- linux-3.0.1/net/ipv6/inet6_hashtables.c 2011-05-22 16:18:00.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/net/ipv6/inet6_hashtables.c 2011-06-10 22:11:24.000000000 +0200 @@ -16,6 +16,7 @@ #include @@ -27546,9 +27610,9 @@ diff -NurpP --minimal linux-3.0/net/ipv6/inet6_hashtables.c linux-3.0-vs2.3.1-pr } if (sk->sk_bound_dev_if) { if (sk->sk_bound_dev_if != dif) -diff -NurpP --minimal linux-3.0/net/ipv6/ip6_output.c linux-3.0-vs2.3.1-pre8/net/ipv6/ip6_output.c ---- linux-3.0/net/ipv6/ip6_output.c 2011-07-22 11:18:13.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/net/ipv6/ip6_output.c 2011-06-16 14:16:51.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/net/ipv6/ip6_output.c linux-3.0.1-vs2.3.1-pre9/net/ipv6/ip6_output.c +--- linux-3.0.1/net/ipv6/ip6_output.c 2011-07-22 11:18:13.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/net/ipv6/ip6_output.c 2011-06-16 14:16:51.000000000 +0200 @@ -933,7 +933,8 @@ static int ip6_dst_lookup_tail(struct so struct rt6_info *rt = (struct rt6_info *) *dst; err = ip6_route_get_saddr(net, rt, &fl6->daddr, @@ -27559,9 +27623,9 @@ diff -NurpP --minimal linux-3.0/net/ipv6/ip6_output.c linux-3.0-vs2.3.1-pre8/net if (err) goto out_err_release; } -diff -NurpP --minimal linux-3.0/net/ipv6/ndisc.c linux-3.0-vs2.3.1-pre8/net/ipv6/ndisc.c ---- linux-3.0/net/ipv6/ndisc.c 2011-07-22 11:18:13.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/net/ipv6/ndisc.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/net/ipv6/ndisc.c linux-3.0.1-vs2.3.1-pre9/net/ipv6/ndisc.c +--- linux-3.0.1/net/ipv6/ndisc.c 2011-07-22 11:18:13.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/net/ipv6/ndisc.c 2011-06-10 22:11:24.000000000 +0200 @@ -597,7 +597,7 @@ static void ndisc_send_na(struct net_dev } else { if (ipv6_dev_get_saddr(dev_net(dev), dev, daddr, @@ -27571,9 +27635,9 @@ diff -NurpP --minimal linux-3.0/net/ipv6/ndisc.c linux-3.0-vs2.3.1-pre8/net/ipv6 return; src_addr = &tmpaddr; } -diff -NurpP --minimal linux-3.0/net/ipv6/raw.c linux-3.0-vs2.3.1-pre8/net/ipv6/raw.c ---- linux-3.0/net/ipv6/raw.c 2011-07-22 11:18:13.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/net/ipv6/raw.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/net/ipv6/raw.c linux-3.0.1-vs2.3.1-pre9/net/ipv6/raw.c +--- linux-3.0.1/net/ipv6/raw.c 2011-07-22 11:18:13.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/net/ipv6/raw.c 2011-06-10 22:11:24.000000000 +0200 @@ -30,6 +30,7 @@ #include #include @@ -27596,9 +27660,9 @@ diff -NurpP --minimal linux-3.0/net/ipv6/raw.c linux-3.0-vs2.3.1-pre8/net/ipv6/r /* ipv4 addr of the socket is invalid. Only the * unspecified and mapped address have a v4 equivalent. */ -diff -NurpP --minimal linux-3.0/net/ipv6/route.c linux-3.0-vs2.3.1-pre8/net/ipv6/route.c ---- linux-3.0/net/ipv6/route.c 2011-07-22 11:18:13.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/net/ipv6/route.c 2011-07-19 00:44:39.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/net/ipv6/route.c linux-3.0.1-vs2.3.1-pre9/net/ipv6/route.c +--- linux-3.0.1/net/ipv6/route.c 2011-07-22 11:18:13.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/net/ipv6/route.c 2011-07-19 00:44:39.000000000 +0200 @@ -54,6 +54,7 @@ #include #include @@ -27638,9 +27702,9 @@ diff -NurpP --minimal linux-3.0/net/ipv6/route.c linux-3.0-vs2.3.1-pre8/net/ipv6 NLA_PUT(skb, RTA_PREFSRC, 16, &saddr_buf); } -diff -NurpP --minimal linux-3.0/net/ipv6/tcp_ipv6.c linux-3.0-vs2.3.1-pre8/net/ipv6/tcp_ipv6.c ---- linux-3.0/net/ipv6/tcp_ipv6.c 2011-07-22 11:18:13.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/net/ipv6/tcp_ipv6.c 2011-06-22 12:39:16.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/net/ipv6/tcp_ipv6.c linux-3.0.1-vs2.3.1-pre9/net/ipv6/tcp_ipv6.c +--- linux-3.0.1/net/ipv6/tcp_ipv6.c 2011-07-22 11:18:13.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/net/ipv6/tcp_ipv6.c 2011-06-22 12:39:16.000000000 +0200 @@ -69,6 +69,7 @@ #include @@ -27667,9 +27731,9 @@ diff -NurpP --minimal linux-3.0/net/ipv6/tcp_ipv6.c linux-3.0-vs2.3.1-pre8/net/i addr_type = ipv6_addr_type(&usin->sin6_addr); -diff -NurpP --minimal linux-3.0/net/ipv6/udp.c linux-3.0-vs2.3.1-pre8/net/ipv6/udp.c ---- linux-3.0/net/ipv6/udp.c 2011-07-22 11:18:13.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/net/ipv6/udp.c 2011-07-19 00:44:39.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/net/ipv6/udp.c linux-3.0.1-vs2.3.1-pre9/net/ipv6/udp.c +--- linux-3.0.1/net/ipv6/udp.c 2011-07-22 11:18:13.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/net/ipv6/udp.c 2011-07-19 00:44:39.000000000 +0200 @@ -45,41 +45,67 @@ #include #include @@ -27762,9 +27826,9 @@ diff -NurpP --minimal linux-3.0/net/ipv6/udp.c linux-3.0-vs2.3.1-pre8/net/ipv6/u } if (!ipv6_addr_any(&np->daddr)) { if (!ipv6_addr_equal(&np->daddr, saddr)) -diff -NurpP --minimal linux-3.0/net/ipv6/xfrm6_policy.c linux-3.0-vs2.3.1-pre8/net/ipv6/xfrm6_policy.c ---- linux-3.0/net/ipv6/xfrm6_policy.c 2011-07-22 11:18:13.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/net/ipv6/xfrm6_policy.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/net/ipv6/xfrm6_policy.c linux-3.0.1-vs2.3.1-pre9/net/ipv6/xfrm6_policy.c +--- linux-3.0.1/net/ipv6/xfrm6_policy.c 2011-07-22 11:18:13.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/net/ipv6/xfrm6_policy.c 2011-06-10 22:11:24.000000000 +0200 @@ -63,7 +63,7 @@ static int xfrm6_get_saddr(struct net *n dev = ip6_dst_idev(dst)->dev; ipv6_dev_get_saddr(dev_net(dev), dev, @@ -27774,9 +27838,9 @@ diff -NurpP --minimal linux-3.0/net/ipv6/xfrm6_policy.c linux-3.0-vs2.3.1-pre8/n dst_release(dst); return 0; } -diff -NurpP --minimal linux-3.0/net/netfilter/ipvs/ip_vs_xmit.c linux-3.0-vs2.3.1-pre8/net/netfilter/ipvs/ip_vs_xmit.c ---- linux-3.0/net/netfilter/ipvs/ip_vs_xmit.c 2011-07-22 11:18:13.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/net/netfilter/ipvs/ip_vs_xmit.c 2011-07-22 15:27:52.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/net/netfilter/ipvs/ip_vs_xmit.c linux-3.0.1-vs2.3.1-pre9/net/netfilter/ipvs/ip_vs_xmit.c +--- linux-3.0.1/net/netfilter/ipvs/ip_vs_xmit.c 2011-07-22 11:18:13.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/net/netfilter/ipvs/ip_vs_xmit.c 2011-07-22 15:27:52.000000000 +0200 @@ -226,7 +226,7 @@ __ip_vs_route_output_v6(struct net *net, return dst; if (ipv6_addr_any(&fl6.saddr) && @@ -27786,9 +27850,9 @@ diff -NurpP --minimal linux-3.0/net/netfilter/ipvs/ip_vs_xmit.c linux-3.0-vs2.3. goto out_err; if (do_xfrm) { dst = xfrm_lookup(net, dst, flowi6_to_flowi(&fl6), NULL, 0); -diff -NurpP --minimal linux-3.0/net/netlink/af_netlink.c linux-3.0-vs2.3.1-pre8/net/netlink/af_netlink.c ---- linux-3.0/net/netlink/af_netlink.c 2011-07-22 11:18:13.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/net/netlink/af_netlink.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/net/netlink/af_netlink.c linux-3.0.1-vs2.3.1-pre9/net/netlink/af_netlink.c +--- linux-3.0.1/net/netlink/af_netlink.c 2011-07-22 11:18:13.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/net/netlink/af_netlink.c 2011-06-10 22:11:24.000000000 +0200 @@ -55,6 +55,9 @@ #include #include @@ -27828,9 +27892,9 @@ diff -NurpP --minimal linux-3.0/net/netlink/af_netlink.c linux-3.0-vs2.3.1-pre8/ s = sk_next(s); if (s) { iter->link = i; -diff -NurpP --minimal linux-3.0/net/socket.c linux-3.0-vs2.3.1-pre8/net/socket.c ---- linux-3.0/net/socket.c 2011-07-22 11:18:13.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/net/socket.c 2011-06-16 14:16:51.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/net/socket.c linux-3.0.1-vs2.3.1-pre9/net/socket.c +--- linux-3.0.1/net/socket.c 2011-07-22 11:18:13.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/net/socket.c 2011-08-01 18:47:51.000000000 +0200 @@ -98,6 +98,10 @@ #include @@ -27863,7 +27927,7 @@ diff -NurpP --minimal linux-3.0/net/socket.c linux-3.0-vs2.3.1-pre8/net/socket.c + vx_sock_fail(sock->sk, size); + } + vxdprintk(VXD_CBIT(net, 7), -+ "__sock_sendmsg: %p[%p,%p,%p;%d/%d]:%d/%d", ++ "__sock_sendmsg: %p[%p,%p,%p;%d/%d]:%d/%zu", + sock, sock->sk, + (sock->sk)?sock->sk->sk_nx_info:0, + (sock->sk)?sock->sk->sk_vx_info:0, @@ -27937,9 +28001,9 @@ diff -NurpP --minimal linux-3.0/net/socket.c linux-3.0-vs2.3.1-pre8/net/socket.c err = sock1->ops->socketpair(sock1, sock2); if (err < 0) -diff -NurpP --minimal linux-3.0/net/sunrpc/auth.c linux-3.0-vs2.3.1-pre8/net/sunrpc/auth.c ---- linux-3.0/net/sunrpc/auth.c 2011-07-22 11:18:13.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/net/sunrpc/auth.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/net/sunrpc/auth.c linux-3.0.1-vs2.3.1-pre9/net/sunrpc/auth.c +--- linux-3.0.1/net/sunrpc/auth.c 2011-07-22 11:18:13.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/net/sunrpc/auth.c 2011-06-10 22:11:24.000000000 +0200 @@ -14,6 +14,7 @@ #include #include @@ -27964,9 +28028,9 @@ diff -NurpP --minimal linux-3.0/net/sunrpc/auth.c linux-3.0-vs2.3.1-pre8/net/sun }; dprintk("RPC: %5u looking up %s cred\n", -diff -NurpP --minimal linux-3.0/net/sunrpc/auth_unix.c linux-3.0-vs2.3.1-pre8/net/sunrpc/auth_unix.c ---- linux-3.0/net/sunrpc/auth_unix.c 2010-10-21 13:08:01.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/net/sunrpc/auth_unix.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/net/sunrpc/auth_unix.c linux-3.0.1-vs2.3.1-pre9/net/sunrpc/auth_unix.c +--- linux-3.0.1/net/sunrpc/auth_unix.c 2010-10-21 13:08:01.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/net/sunrpc/auth_unix.c 2011-06-10 22:11:24.000000000 +0200 @@ -12,12 +12,14 @@ #include #include @@ -28025,9 +28089,9 @@ diff -NurpP --minimal linux-3.0/net/sunrpc/auth_unix.c linux-3.0-vs2.3.1-pre8/ne hold = p++; for (i = 0; i < 16 && cred->uc_gids[i] != (gid_t) NOGROUP; i++) *p++ = htonl((u32) cred->uc_gids[i]); -diff -NurpP --minimal linux-3.0/net/sunrpc/clnt.c linux-3.0-vs2.3.1-pre8/net/sunrpc/clnt.c ---- linux-3.0/net/sunrpc/clnt.c 2011-07-22 11:18:13.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/net/sunrpc/clnt.c 2011-07-01 11:35:35.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/net/sunrpc/clnt.c linux-3.0.1-vs2.3.1-pre9/net/sunrpc/clnt.c +--- linux-3.0.1/net/sunrpc/clnt.c 2011-07-22 11:18:13.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/net/sunrpc/clnt.c 2011-07-01 11:35:35.000000000 +0200 @@ -31,6 +31,7 @@ #include #include @@ -28046,9 +28110,9 @@ diff -NurpP --minimal linux-3.0/net/sunrpc/clnt.c linux-3.0-vs2.3.1-pre8/net/sun return clnt; } EXPORT_SYMBOL_GPL(rpc_create); -diff -NurpP --minimal linux-3.0/net/unix/af_unix.c linux-3.0-vs2.3.1-pre8/net/unix/af_unix.c ---- linux-3.0/net/unix/af_unix.c 2011-07-22 11:18:13.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/net/unix/af_unix.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/net/unix/af_unix.c linux-3.0.1-vs2.3.1-pre9/net/unix/af_unix.c +--- linux-3.0.1/net/unix/af_unix.c 2011-07-22 11:18:13.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/net/unix/af_unix.c 2011-06-10 22:11:24.000000000 +0200 @@ -114,6 +114,8 @@ #include #include @@ -28086,9 +28150,9 @@ diff -NurpP --minimal linux-3.0/net/unix/af_unix.c linux-3.0-vs2.3.1-pre8/net/un sk = next_unix_socket(&iter->i, sk); return sk; } -diff -NurpP --minimal linux-3.0/scripts/checksyscalls.sh linux-3.0-vs2.3.1-pre8/scripts/checksyscalls.sh ---- linux-3.0/scripts/checksyscalls.sh 2011-03-15 18:07:46.000000000 +0100 -+++ linux-3.0-vs2.3.1-pre8/scripts/checksyscalls.sh 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/scripts/checksyscalls.sh linux-3.0.1-vs2.3.1-pre9/scripts/checksyscalls.sh +--- linux-3.0.1/scripts/checksyscalls.sh 2011-03-15 18:07:46.000000000 +0100 ++++ linux-3.0.1-vs2.3.1-pre9/scripts/checksyscalls.sh 2011-06-10 22:11:24.000000000 +0200 @@ -193,7 +193,6 @@ cat << EOF #define __IGNORE_afs_syscall #define __IGNORE_getpmsg @@ -28097,9 +28161,9 @@ diff -NurpP --minimal linux-3.0/scripts/checksyscalls.sh linux-3.0-vs2.3.1-pre8/ EOF } -diff -NurpP --minimal linux-3.0/security/commoncap.c linux-3.0-vs2.3.1-pre8/security/commoncap.c ---- linux-3.0/security/commoncap.c 2011-07-22 11:18:14.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/security/commoncap.c 2011-06-16 14:16:51.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/security/commoncap.c linux-3.0.1-vs2.3.1-pre9/security/commoncap.c +--- linux-3.0.1/security/commoncap.c 2011-07-22 11:18:14.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/security/commoncap.c 2011-06-16 14:16:51.000000000 +0200 @@ -62,6 +62,7 @@ int cap_netlink_recv(struct sk_buff *skb return -EPERM; return 0; @@ -28154,9 +28218,9 @@ diff -NurpP --minimal linux-3.0/security/commoncap.c linux-3.0-vs2.3.1-pre8/secu return ret; } + -diff -NurpP --minimal linux-3.0/security/selinux/hooks.c linux-3.0-vs2.3.1-pre8/security/selinux/hooks.c ---- linux-3.0/security/selinux/hooks.c 2011-07-22 11:18:14.000000000 +0200 -+++ linux-3.0-vs2.3.1-pre8/security/selinux/hooks.c 2011-06-15 02:40:14.000000000 +0200 +diff -NurpP --minimal linux-3.0.1/security/selinux/hooks.c linux-3.0.1-vs2.3.1-pre9/security/selinux/hooks.c +--- linux-3.0.1/security/selinux/hooks.c 2011-07-22 11:18:14.000000000 +0200 ++++ linux-3.0.1-vs2.3.1-pre9/security/selinux/hooks.c 2011-06-15 02:40:14.000000000 +0200 @@ -67,7 +67,6 @@ #include #include -- 2.44.0