From e915af4e2f47257947db75e07fc377cc4f90c2e5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Sun, 9 Dec 2012 11:58:06 +0100 Subject: [PATCH] - up to 3.6.9; new vserver patch 3.6.9-vs2.3.4.4; drop perf building (see kernel-tools.spec); builds now but there is few ng patches that need fix before rel 1 --- kernel-vserver-2.3.patch | 3203 +++++++++++++++++++++++--------------- kernel.make | 4 +- kernel.spec | 65 +- 3 files changed, 1969 insertions(+), 1303 deletions(-) diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch index 49f411e8..fefd98cc 100644 --- a/kernel-vserver-2.3.patch +++ b/kernel-vserver-2.3.patch @@ -1,6 +1,6 @@ -diff -NurpP --minimal linux-3.6.6/Documentation/vserver/debug.txt linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/Documentation/vserver/debug.txt ---- linux-3.6.6/Documentation/vserver/debug.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/Documentation/vserver/debug.txt 2012-10-04 18:46:59.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/Documentation/vserver/debug.txt linux-3.6.9-vs2.3.4.4/Documentation/vserver/debug.txt +--- linux-3.6.9/Documentation/vserver/debug.txt 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/Documentation/vserver/debug.txt 2012-10-04 18:46:59.000000000 +0200 @@ -0,0 +1,154 @@ + +debug_cvirt: @@ -156,9 +156,9 @@ diff -NurpP --minimal linux-3.6.6/Documentation/vserver/debug.txt linux-3.6.6-vs + 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.6.6/arch/alpha/Kconfig linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/alpha/Kconfig ---- linux-3.6.6/arch/alpha/Kconfig 2012-10-04 15:26:43.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/alpha/Kconfig 2012-10-04 18:46:59.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/arch/alpha/Kconfig linux-3.6.9-vs2.3.4.4/arch/alpha/Kconfig +--- linux-3.6.9/arch/alpha/Kconfig 2012-10-04 15:26:43.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/arch/alpha/Kconfig 2012-10-04 18:46:59.000000000 +0200 @@ -664,6 +664,8 @@ config DUMMY_CONSOLE depends on VGA_HOSE default y @@ -168,9 +168,9 @@ diff -NurpP --minimal linux-3.6.6/arch/alpha/Kconfig linux-3.6.6-vs2.3.4.3.1-nox source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.6.6/arch/alpha/kernel/ptrace.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/alpha/kernel/ptrace.c ---- linux-3.6.6/arch/alpha/kernel/ptrace.c 2012-05-21 18:06:12.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/alpha/kernel/ptrace.c 2012-10-04 18:46:59.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/arch/alpha/kernel/ptrace.c linux-3.6.9-vs2.3.4.4/arch/alpha/kernel/ptrace.c +--- linux-3.6.9/arch/alpha/kernel/ptrace.c 2012-05-21 18:06:12.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/arch/alpha/kernel/ptrace.c 2012-10-04 18:46:59.000000000 +0200 @@ -13,6 +13,7 @@ #include #include @@ -179,9 +179,9 @@ diff -NurpP --minimal linux-3.6.6/arch/alpha/kernel/ptrace.c linux-3.6.6-vs2.3.4 #include #include -diff -NurpP --minimal linux-3.6.6/arch/alpha/kernel/systbls.S linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/alpha/kernel/systbls.S ---- linux-3.6.6/arch/alpha/kernel/systbls.S 2012-10-04 15:26:43.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/alpha/kernel/systbls.S 2012-10-04 18:46:59.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/arch/alpha/kernel/systbls.S linux-3.6.9-vs2.3.4.4/arch/alpha/kernel/systbls.S +--- linux-3.6.9/arch/alpha/kernel/systbls.S 2012-10-04 15:26:43.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/arch/alpha/kernel/systbls.S 2012-10-04 18:46:59.000000000 +0200 @@ -446,7 +446,7 @@ sys_call_table: .quad sys_stat64 /* 425 */ .quad sys_lstat64 @@ -191,9 +191,9 @@ diff -NurpP --minimal linux-3.6.6/arch/alpha/kernel/systbls.S linux-3.6.6-vs2.3. .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.6.6/arch/alpha/kernel/traps.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/alpha/kernel/traps.c ---- linux-3.6.6/arch/alpha/kernel/traps.c 2012-05-21 18:06:12.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/alpha/kernel/traps.c 2012-10-04 18:46:59.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/arch/alpha/kernel/traps.c linux-3.6.9-vs2.3.4.4/arch/alpha/kernel/traps.c +--- linux-3.6.9/arch/alpha/kernel/traps.c 2012-05-21 18:06:12.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/arch/alpha/kernel/traps.c 2012-10-04 18:46:59.000000000 +0200 @@ -184,7 +184,8 @@ die_if_kernel(char * str, struct pt_regs #ifdef CONFIG_SMP printk("CPU %d ", hard_smp_processor_id()); @@ -204,9 +204,9 @@ diff -NurpP --minimal linux-3.6.6/arch/alpha/kernel/traps.c linux-3.6.6-vs2.3.4. dik_show_regs(regs, r9_15); add_taint(TAINT_DIE); dik_show_trace((unsigned long *)(regs+1)); -diff -NurpP --minimal linux-3.6.6/arch/arm/Kconfig linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/arm/Kconfig ---- linux-3.6.6/arch/arm/Kconfig 2012-11-06 18:42:06.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/arm/Kconfig 2012-11-06 18:43:40.000000000 +0100 +diff -NurpP --minimal linux-3.6.9/arch/arm/Kconfig linux-3.6.9-vs2.3.4.4/arch/arm/Kconfig +--- linux-3.6.9/arch/arm/Kconfig 2012-12-08 01:34:06.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/arch/arm/Kconfig 2012-11-06 18:43:40.000000000 +0100 @@ -2341,6 +2341,8 @@ source "fs/Kconfig" source "arch/arm/Kconfig.debug" @@ -216,9 +216,9 @@ diff -NurpP --minimal linux-3.6.6/arch/arm/Kconfig linux-3.6.6-vs2.3.4.3.1-noxfs source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.6.6/arch/arm/kernel/calls.S linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/arm/kernel/calls.S ---- linux-3.6.6/arch/arm/kernel/calls.S 2012-10-04 15:26:43.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/arm/kernel/calls.S 2012-10-04 18:46:59.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/arch/arm/kernel/calls.S linux-3.6.9-vs2.3.4.4/arch/arm/kernel/calls.S +--- linux-3.6.9/arch/arm/kernel/calls.S 2012-10-04 15:26:43.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/arch/arm/kernel/calls.S 2012-10-04 18:46:59.000000000 +0200 @@ -322,7 +322,7 @@ /* 310 */ CALL(sys_request_key) CALL(sys_keyctl) @@ -228,9 +228,9 @@ diff -NurpP --minimal linux-3.6.6/arch/arm/kernel/calls.S linux-3.6.6-vs2.3.4.3. CALL(sys_ioprio_set) /* 315 */ CALL(sys_ioprio_get) CALL(sys_inotify_init) -diff -NurpP --minimal linux-3.6.6/arch/arm/kernel/process.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/arm/kernel/process.c ---- linux-3.6.6/arch/arm/kernel/process.c 2012-10-04 15:26:43.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/arm/kernel/process.c 2012-10-04 18:46:59.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/arch/arm/kernel/process.c linux-3.6.9-vs2.3.4.4/arch/arm/kernel/process.c +--- linux-3.6.9/arch/arm/kernel/process.c 2012-10-04 15:26:43.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/arch/arm/kernel/process.c 2012-10-04 18:46:59.000000000 +0200 @@ -337,7 +337,8 @@ void __show_regs(struct pt_regs *regs) void show_regs(struct pt_regs * regs) { @@ -241,9 +241,9 @@ diff -NurpP --minimal linux-3.6.6/arch/arm/kernel/process.c linux-3.6.6-vs2.3.4. __show_regs(regs); dump_stack(); } -diff -NurpP --minimal linux-3.6.6/arch/arm/kernel/traps.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/arm/kernel/traps.c ---- linux-3.6.6/arch/arm/kernel/traps.c 2012-10-04 15:26:44.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/arm/kernel/traps.c 2012-10-04 19:03:56.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/arch/arm/kernel/traps.c linux-3.6.9-vs2.3.4.4/arch/arm/kernel/traps.c +--- linux-3.6.9/arch/arm/kernel/traps.c 2012-10-04 15:26:44.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/arch/arm/kernel/traps.c 2012-10-04 19:03:56.000000000 +0200 @@ -249,8 +249,8 @@ static int __die(const char *str, int er print_modules(); @@ -255,9 +255,9 @@ diff -NurpP --minimal linux-3.6.6/arch/arm/kernel/traps.c linux-3.6.6-vs2.3.4.3. if (!user_mode(regs) || in_interrupt()) { dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp, -diff -NurpP --minimal linux-3.6.6/arch/cris/Kconfig linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/cris/Kconfig ---- linux-3.6.6/arch/cris/Kconfig 2012-10-04 15:26:51.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/cris/Kconfig 2012-10-04 18:46:59.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/arch/cris/Kconfig linux-3.6.9-vs2.3.4.4/arch/cris/Kconfig +--- linux-3.6.9/arch/cris/Kconfig 2012-10-04 15:26:51.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/arch/cris/Kconfig 2012-10-04 18:46:59.000000000 +0200 @@ -673,6 +673,8 @@ source "drivers/staging/Kconfig" source "arch/cris/Kconfig.debug" @@ -267,9 +267,9 @@ diff -NurpP --minimal linux-3.6.6/arch/cris/Kconfig linux-3.6.6-vs2.3.4.3.1-noxf source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.6.6/arch/frv/kernel/kernel_thread.S linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/frv/kernel/kernel_thread.S ---- linux-3.6.6/arch/frv/kernel/kernel_thread.S 2012-10-04 15:26:51.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/frv/kernel/kernel_thread.S 2012-10-04 18:46:59.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/arch/frv/kernel/kernel_thread.S linux-3.6.9-vs2.3.4.4/arch/frv/kernel/kernel_thread.S +--- linux-3.6.9/arch/frv/kernel/kernel_thread.S 2012-10-04 15:26:51.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/arch/frv/kernel/kernel_thread.S 2012-10-04 18:46:59.000000000 +0200 @@ -37,7 +37,7 @@ kernel_thread: # start by forking the current process, but with shared VM @@ -279,9 +279,9 @@ diff -NurpP --minimal linux-3.6.6/arch/frv/kernel/kernel_thread.S linux-3.6.6-vs 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.6.6/arch/h8300/Kconfig linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/h8300/Kconfig ---- linux-3.6.6/arch/h8300/Kconfig 2012-10-04 15:26:51.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/h8300/Kconfig 2012-10-04 18:46:59.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/arch/h8300/Kconfig linux-3.6.9-vs2.3.4.4/arch/h8300/Kconfig +--- linux-3.6.9/arch/h8300/Kconfig 2012-10-04 15:26:51.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/arch/h8300/Kconfig 2012-10-04 18:46:59.000000000 +0200 @@ -215,6 +215,8 @@ source "fs/Kconfig" source "arch/h8300/Kconfig.debug" @@ -291,9 +291,9 @@ diff -NurpP --minimal linux-3.6.6/arch/h8300/Kconfig linux-3.6.6-vs2.3.4.3.1-nox source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.6.6/arch/ia64/Kconfig linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/ia64/Kconfig ---- linux-3.6.6/arch/ia64/Kconfig 2012-10-04 15:26:51.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/ia64/Kconfig 2012-10-04 18:46:59.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/arch/ia64/Kconfig linux-3.6.9-vs2.3.4.4/arch/ia64/Kconfig +--- linux-3.6.9/arch/ia64/Kconfig 2012-10-04 15:26:51.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/arch/ia64/Kconfig 2012-10-04 18:46:59.000000000 +0200 @@ -652,6 +652,8 @@ source "fs/Kconfig" source "arch/ia64/Kconfig.debug" @@ -303,9 +303,9 @@ diff -NurpP --minimal linux-3.6.6/arch/ia64/Kconfig linux-3.6.6-vs2.3.4.3.1-noxf source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.6.6/arch/ia64/kernel/entry.S linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/ia64/kernel/entry.S ---- linux-3.6.6/arch/ia64/kernel/entry.S 2012-03-19 19:46:40.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/ia64/kernel/entry.S 2012-10-04 18:46:59.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/arch/ia64/kernel/entry.S linux-3.6.9-vs2.3.4.4/arch/ia64/kernel/entry.S +--- linux-3.6.9/arch/ia64/kernel/entry.S 2012-03-19 19:46:40.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/arch/ia64/kernel/entry.S 2012-10-04 18:46:59.000000000 +0200 @@ -1714,7 +1714,7 @@ sys_call_table: data8 sys_mq_notify data8 sys_mq_getsetattr @@ -315,9 +315,9 @@ diff -NurpP --minimal linux-3.6.6/arch/ia64/kernel/entry.S linux-3.6.6-vs2.3.4.3 data8 sys_waitid // 1270 data8 sys_add_key data8 sys_request_key -diff -NurpP --minimal linux-3.6.6/arch/ia64/kernel/process.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/ia64/kernel/process.c ---- linux-3.6.6/arch/ia64/kernel/process.c 2012-11-06 18:42:07.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/ia64/kernel/process.c 2012-11-06 18:43:40.000000000 +0100 +diff -NurpP --minimal linux-3.6.9/arch/ia64/kernel/process.c linux-3.6.9-vs2.3.4.4/arch/ia64/kernel/process.c +--- linux-3.6.9/arch/ia64/kernel/process.c 2012-12-08 01:34:06.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/arch/ia64/kernel/process.c 2012-11-06 18:43:40.000000000 +0100 @@ -111,8 +111,8 @@ show_regs (struct pt_regs *regs) unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri; @@ -329,9 +329,9 @@ diff -NurpP --minimal linux-3.6.6/arch/ia64/kernel/process.c linux-3.6.6-vs2.3.4 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.6.6/arch/ia64/kernel/ptrace.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/ia64/kernel/ptrace.c ---- linux-3.6.6/arch/ia64/kernel/ptrace.c 2012-05-21 18:06:26.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/ia64/kernel/ptrace.c 2012-10-04 18:46:59.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/arch/ia64/kernel/ptrace.c linux-3.6.9-vs2.3.4.4/arch/ia64/kernel/ptrace.c +--- linux-3.6.9/arch/ia64/kernel/ptrace.c 2012-05-21 18:06:26.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/arch/ia64/kernel/ptrace.c 2012-10-04 18:46:59.000000000 +0200 @@ -21,6 +21,7 @@ #include #include @@ -340,9 +340,9 @@ diff -NurpP --minimal linux-3.6.6/arch/ia64/kernel/ptrace.c linux-3.6.6-vs2.3.4. #include #include -diff -NurpP --minimal linux-3.6.6/arch/ia64/kernel/traps.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/ia64/kernel/traps.c ---- linux-3.6.6/arch/ia64/kernel/traps.c 2012-05-21 18:06:26.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/ia64/kernel/traps.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/arch/ia64/kernel/traps.c linux-3.6.9-vs2.3.4.4/arch/ia64/kernel/traps.c +--- linux-3.6.9/arch/ia64/kernel/traps.c 2012-05-21 18:06:26.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/arch/ia64/kernel/traps.c 2012-10-04 18:47:00.000000000 +0200 @@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re put_cpu(); @@ -367,9 +367,9 @@ diff -NurpP --minimal linux-3.6.6/arch/ia64/kernel/traps.c linux-3.6.6-vs2.3.4.3 } } } -diff -NurpP --minimal linux-3.6.6/arch/m32r/kernel/traps.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/m32r/kernel/traps.c ---- linux-3.6.6/arch/m32r/kernel/traps.c 2012-05-21 18:06:26.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/m32r/kernel/traps.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/arch/m32r/kernel/traps.c linux-3.6.9-vs2.3.4.4/arch/m32r/kernel/traps.c +--- linux-3.6.9/arch/m32r/kernel/traps.c 2012-05-21 18:06:26.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/arch/m32r/kernel/traps.c 2012-10-04 18:47:00.000000000 +0200 @@ -195,8 +195,9 @@ static void show_registers(struct pt_reg } else { printk("SPI: %08lx\n", sp); @@ -382,9 +382,9 @@ diff -NurpP --minimal linux-3.6.6/arch/m32r/kernel/traps.c linux-3.6.6-vs2.3.4.3 /* * When in-kernel, we also print out the stack and code at the -diff -NurpP --minimal linux-3.6.6/arch/m68k/Kconfig linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/m68k/Kconfig ---- linux-3.6.6/arch/m68k/Kconfig 2012-10-04 15:26:51.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/m68k/Kconfig 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/arch/m68k/Kconfig linux-3.6.9-vs2.3.4.4/arch/m68k/Kconfig +--- linux-3.6.9/arch/m68k/Kconfig 2012-10-04 15:26:51.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/arch/m68k/Kconfig 2012-10-04 18:47:00.000000000 +0200 @@ -129,6 +129,8 @@ source "fs/Kconfig" source "arch/m68k/Kconfig.debug" @@ -394,9 +394,9 @@ diff -NurpP --minimal linux-3.6.6/arch/m68k/Kconfig linux-3.6.6-vs2.3.4.3.1-noxf source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.6.6/arch/mips/Kconfig linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/mips/Kconfig ---- linux-3.6.6/arch/mips/Kconfig 2012-10-04 15:26:52.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/mips/Kconfig 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/arch/mips/Kconfig linux-3.6.9-vs2.3.4.4/arch/mips/Kconfig +--- linux-3.6.9/arch/mips/Kconfig 2012-10-04 15:26:52.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/arch/mips/Kconfig 2012-10-04 18:47:00.000000000 +0200 @@ -2554,6 +2554,8 @@ source "fs/Kconfig" source "arch/mips/Kconfig.debug" @@ -406,9 +406,9 @@ diff -NurpP --minimal linux-3.6.6/arch/mips/Kconfig linux-3.6.6-vs2.3.4.3.1-noxf source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.6.6/arch/mips/kernel/ptrace.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/mips/kernel/ptrace.c ---- linux-3.6.6/arch/mips/kernel/ptrace.c 2012-07-22 23:38:52.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/mips/kernel/ptrace.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/arch/mips/kernel/ptrace.c linux-3.6.9-vs2.3.4.4/arch/mips/kernel/ptrace.c +--- linux-3.6.9/arch/mips/kernel/ptrace.c 2012-07-22 23:38:52.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/arch/mips/kernel/ptrace.c 2012-10-04 18:47:00.000000000 +0200 @@ -25,6 +25,7 @@ #include #include @@ -427,9 +427,9 @@ diff -NurpP --minimal linux-3.6.6/arch/mips/kernel/ptrace.c linux-3.6.6-vs2.3.4. 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.6.6/arch/mips/kernel/scall32-o32.S linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/mips/kernel/scall32-o32.S ---- linux-3.6.6/arch/mips/kernel/scall32-o32.S 2012-01-09 16:14:05.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/mips/kernel/scall32-o32.S 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/arch/mips/kernel/scall32-o32.S linux-3.6.9-vs2.3.4.4/arch/mips/kernel/scall32-o32.S +--- linux-3.6.9/arch/mips/kernel/scall32-o32.S 2012-01-09 16:14:05.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/arch/mips/kernel/scall32-o32.S 2012-10-04 18:47:00.000000000 +0200 @@ -523,7 +523,7 @@ einval: li v0, -ENOSYS sys sys_mq_timedreceive 5 sys sys_mq_notify 2 /* 4275 */ @@ -439,9 +439,9 @@ diff -NurpP --minimal linux-3.6.6/arch/mips/kernel/scall32-o32.S linux-3.6.6-vs2 sys sys_waitid 5 sys sys_ni_syscall 0 /* available, was setaltroot */ sys sys_add_key 5 /* 4280 */ -diff -NurpP --minimal linux-3.6.6/arch/mips/kernel/scall64-64.S linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/mips/kernel/scall64-64.S ---- linux-3.6.6/arch/mips/kernel/scall64-64.S 2012-01-09 16:14:05.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/mips/kernel/scall64-64.S 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/arch/mips/kernel/scall64-64.S linux-3.6.9-vs2.3.4.4/arch/mips/kernel/scall64-64.S +--- linux-3.6.9/arch/mips/kernel/scall64-64.S 2012-01-09 16:14:05.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/arch/mips/kernel/scall64-64.S 2012-10-04 18:47:00.000000000 +0200 @@ -362,7 +362,7 @@ sys_call_table: PTR sys_mq_timedreceive PTR sys_mq_notify @@ -451,9 +451,9 @@ diff -NurpP --minimal linux-3.6.6/arch/mips/kernel/scall64-64.S linux-3.6.6-vs2. PTR sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key -diff -NurpP --minimal linux-3.6.6/arch/mips/kernel/scall64-n32.S linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/mips/kernel/scall64-n32.S ---- linux-3.6.6/arch/mips/kernel/scall64-n32.S 2012-01-09 16:14:05.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/mips/kernel/scall64-n32.S 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/arch/mips/kernel/scall64-n32.S linux-3.6.9-vs2.3.4.4/arch/mips/kernel/scall64-n32.S +--- linux-3.6.9/arch/mips/kernel/scall64-n32.S 2012-01-09 16:14:05.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/arch/mips/kernel/scall64-n32.S 2012-10-04 18:47:00.000000000 +0200 @@ -361,7 +361,7 @@ EXPORT(sysn32_call_table) PTR compat_sys_mq_timedreceive PTR compat_sys_mq_notify @@ -463,9 +463,9 @@ diff -NurpP --minimal linux-3.6.6/arch/mips/kernel/scall64-n32.S linux-3.6.6-vs2 PTR compat_sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key -diff -NurpP --minimal linux-3.6.6/arch/mips/kernel/scall64-o32.S linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/mips/kernel/scall64-o32.S ---- linux-3.6.6/arch/mips/kernel/scall64-o32.S 2012-01-09 16:14:05.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/mips/kernel/scall64-o32.S 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/arch/mips/kernel/scall64-o32.S linux-3.6.9-vs2.3.4.4/arch/mips/kernel/scall64-o32.S +--- linux-3.6.9/arch/mips/kernel/scall64-o32.S 2012-01-09 16:14:05.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/arch/mips/kernel/scall64-o32.S 2012-10-04 18:47:00.000000000 +0200 @@ -480,7 +480,7 @@ sys_call_table: PTR compat_sys_mq_timedreceive PTR compat_sys_mq_notify /* 4275 */ @@ -475,9 +475,9 @@ diff -NurpP --minimal linux-3.6.6/arch/mips/kernel/scall64-o32.S linux-3.6.6-vs2 PTR sys_32_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key /* 4280 */ -diff -NurpP --minimal linux-3.6.6/arch/mips/kernel/traps.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/mips/kernel/traps.c ---- linux-3.6.6/arch/mips/kernel/traps.c 2012-10-04 15:26:53.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/mips/kernel/traps.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/arch/mips/kernel/traps.c linux-3.6.9-vs2.3.4.4/arch/mips/kernel/traps.c +--- linux-3.6.9/arch/mips/kernel/traps.c 2012-10-04 15:26:53.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/arch/mips/kernel/traps.c 2012-10-04 18:47:00.000000000 +0200 @@ -347,9 +347,10 @@ void show_registers(struct pt_regs *regs __show_regs(regs); @@ -492,9 +492,9 @@ diff -NurpP --minimal linux-3.6.6/arch/mips/kernel/traps.c linux-3.6.6-vs2.3.4.3 if (cpu_has_userlocal) { unsigned long tls; -diff -NurpP --minimal linux-3.6.6/arch/parisc/Kconfig linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/parisc/Kconfig ---- linux-3.6.6/arch/parisc/Kconfig 2012-07-22 23:38:52.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/parisc/Kconfig 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/arch/parisc/Kconfig linux-3.6.9-vs2.3.4.4/arch/parisc/Kconfig +--- linux-3.6.9/arch/parisc/Kconfig 2012-07-22 23:38:52.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/arch/parisc/Kconfig 2012-10-04 18:47:00.000000000 +0200 @@ -281,6 +281,8 @@ source "fs/Kconfig" source "arch/parisc/Kconfig.debug" @@ -504,9 +504,9 @@ diff -NurpP --minimal linux-3.6.6/arch/parisc/Kconfig linux-3.6.6-vs2.3.4.3.1-no source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.6.6/arch/parisc/kernel/syscall_table.S linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/parisc/kernel/syscall_table.S ---- linux-3.6.6/arch/parisc/kernel/syscall_table.S 2011-10-24 18:45:00.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/parisc/kernel/syscall_table.S 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/arch/parisc/kernel/syscall_table.S linux-3.6.9-vs2.3.4.4/arch/parisc/kernel/syscall_table.S +--- linux-3.6.9/arch/parisc/kernel/syscall_table.S 2011-10-24 18:45:00.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/arch/parisc/kernel/syscall_table.S 2012-10-04 18:47:00.000000000 +0200 @@ -361,7 +361,7 @@ ENTRY_COMP(mbind) /* 260 */ ENTRY_COMP(get_mempolicy) @@ -516,9 +516,9 @@ diff -NurpP --minimal linux-3.6.6/arch/parisc/kernel/syscall_table.S linux-3.6.6 ENTRY_SAME(add_key) ENTRY_SAME(request_key) /* 265 */ ENTRY_SAME(keyctl) -diff -NurpP --minimal linux-3.6.6/arch/parisc/kernel/traps.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/parisc/kernel/traps.c ---- linux-3.6.6/arch/parisc/kernel/traps.c 2012-05-21 18:06:28.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/parisc/kernel/traps.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/arch/parisc/kernel/traps.c linux-3.6.9-vs2.3.4.4/arch/parisc/kernel/traps.c +--- linux-3.6.9/arch/parisc/kernel/traps.c 2012-05-21 18:06:28.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/arch/parisc/kernel/traps.c 2012-10-04 18:47:00.000000000 +0200 @@ -235,8 +235,9 @@ void die_if_kernel(char *str, struct pt_ if (err == 0) return; /* STFU */ @@ -542,9 +542,9 @@ diff -NurpP --minimal linux-3.6.6/arch/parisc/kernel/traps.c linux-3.6.6-vs2.3.4 /* Wot's wrong wif bein' racy? */ if (current->thread.flags & PARISC_KERNEL_DEATH) { -diff -NurpP --minimal linux-3.6.6/arch/parisc/mm/fault.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/parisc/mm/fault.c ---- linux-3.6.6/arch/parisc/mm/fault.c 2010-08-02 16:52:06.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/parisc/mm/fault.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/arch/parisc/mm/fault.c linux-3.6.9-vs2.3.4.4/arch/parisc/mm/fault.c +--- linux-3.6.9/arch/parisc/mm/fault.c 2010-08-02 16:52:06.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/arch/parisc/mm/fault.c 2012-10-04 18:47:00.000000000 +0200 @@ -237,8 +237,9 @@ bad_area: #ifdef PRINT_USER_FAULTS @@ -557,9 +557,9 @@ diff -NurpP --minimal linux-3.6.6/arch/parisc/mm/fault.c linux-3.6.6-vs2.3.4.3.1 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.6.6/arch/powerpc/Kconfig linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/powerpc/Kconfig ---- linux-3.6.6/arch/powerpc/Kconfig 2012-10-04 15:26:53.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/powerpc/Kconfig 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/arch/powerpc/Kconfig linux-3.6.9-vs2.3.4.4/arch/powerpc/Kconfig +--- linux-3.6.9/arch/powerpc/Kconfig 2012-10-04 15:26:53.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/arch/powerpc/Kconfig 2012-10-04 18:47:00.000000000 +0200 @@ -996,6 +996,8 @@ source "lib/Kconfig" source "arch/powerpc/Kconfig.debug" @@ -569,9 +569,9 @@ diff -NurpP --minimal linux-3.6.6/arch/powerpc/Kconfig linux-3.6.6-vs2.3.4.3.1-n source "security/Kconfig" config KEYS_COMPAT -diff -NurpP --minimal linux-3.6.6/arch/powerpc/include/asm/unistd.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/powerpc/include/asm/unistd.h ---- linux-3.6.6/arch/powerpc/include/asm/unistd.h 2012-10-04 15:26:53.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/powerpc/include/asm/unistd.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/arch/powerpc/include/asm/unistd.h linux-3.6.9-vs2.3.4.4/arch/powerpc/include/asm/unistd.h +--- linux-3.6.9/arch/powerpc/include/asm/unistd.h 2012-10-04 15:26:53.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/arch/powerpc/include/asm/unistd.h 2012-10-04 18:47:00.000000000 +0200 @@ -275,7 +275,7 @@ #endif #define __NR_rtas 255 @@ -581,9 +581,9 @@ diff -NurpP --minimal linux-3.6.6/arch/powerpc/include/asm/unistd.h linux-3.6.6- #define __NR_migrate_pages 258 #define __NR_mbind 259 #define __NR_get_mempolicy 260 -diff -NurpP --minimal linux-3.6.6/arch/powerpc/kernel/process.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/powerpc/kernel/process.c ---- linux-3.6.6/arch/powerpc/kernel/process.c 2012-10-04 15:26:54.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/powerpc/kernel/process.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/arch/powerpc/kernel/process.c linux-3.6.9-vs2.3.4.4/arch/powerpc/kernel/process.c +--- linux-3.6.9/arch/powerpc/kernel/process.c 2012-10-04 15:26:54.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/arch/powerpc/kernel/process.c 2012-10-04 18:47:00.000000000 +0200 @@ -661,8 +661,9 @@ void show_regs(struct pt_regs * regs) #else printk("DAR: "REG", DSISR: %08lx\n", regs->dar, regs->dsisr); @@ -596,9 +596,9 @@ diff -NurpP --minimal linux-3.6.6/arch/powerpc/kernel/process.c linux-3.6.6-vs2. #ifdef CONFIG_SMP printk(" CPU: %d", raw_smp_processor_id()); -diff -NurpP --minimal linux-3.6.6/arch/powerpc/kernel/traps.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/powerpc/kernel/traps.c ---- linux-3.6.6/arch/powerpc/kernel/traps.c 2012-10-04 15:26:54.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/powerpc/kernel/traps.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/arch/powerpc/kernel/traps.c linux-3.6.9-vs2.3.4.4/arch/powerpc/kernel/traps.c +--- linux-3.6.9/arch/powerpc/kernel/traps.c 2012-10-04 15:26:54.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/arch/powerpc/kernel/traps.c 2012-10-04 18:47:00.000000000 +0200 @@ -1119,8 +1119,9 @@ void nonrecoverable_exception(struct pt_ void trace_syscall(struct pt_regs *regs) @@ -611,9 +611,9 @@ diff -NurpP --minimal linux-3.6.6/arch/powerpc/kernel/traps.c linux-3.6.6-vs2.3. regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted()); } -diff -NurpP --minimal linux-3.6.6/arch/s390/Kconfig linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/s390/Kconfig ---- linux-3.6.6/arch/s390/Kconfig 2012-10-04 15:26:54.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/s390/Kconfig 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/arch/s390/Kconfig linux-3.6.9-vs2.3.4.4/arch/s390/Kconfig +--- linux-3.6.9/arch/s390/Kconfig 2012-10-04 15:26:54.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/arch/s390/Kconfig 2012-10-04 18:47:00.000000000 +0200 @@ -634,6 +634,8 @@ source "fs/Kconfig" source "arch/s390/Kconfig.debug" @@ -623,9 +623,9 @@ diff -NurpP --minimal linux-3.6.6/arch/s390/Kconfig linux-3.6.6-vs2.3.4.3.1-noxf source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.6.6/arch/s390/include/asm/tlb.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/s390/include/asm/tlb.h ---- linux-3.6.6/arch/s390/include/asm/tlb.h 2012-07-22 23:38:59.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/s390/include/asm/tlb.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/arch/s390/include/asm/tlb.h linux-3.6.9-vs2.3.4.4/arch/s390/include/asm/tlb.h +--- linux-3.6.9/arch/s390/include/asm/tlb.h 2012-07-22 23:38:59.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/arch/s390/include/asm/tlb.h 2012-10-04 18:47:00.000000000 +0200 @@ -24,6 +24,7 @@ #include #include @@ -634,9 +634,9 @@ diff -NurpP --minimal linux-3.6.6/arch/s390/include/asm/tlb.h linux-3.6.6-vs2.3. #include #include #include -diff -NurpP --minimal linux-3.6.6/arch/s390/include/asm/unistd.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/s390/include/asm/unistd.h ---- linux-3.6.6/arch/s390/include/asm/unistd.h 2012-10-04 15:26:55.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/s390/include/asm/unistd.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/arch/s390/include/asm/unistd.h linux-3.6.9-vs2.3.4.4/arch/s390/include/asm/unistd.h +--- linux-3.6.9/arch/s390/include/asm/unistd.h 2012-10-04 15:26:55.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/arch/s390/include/asm/unistd.h 2012-10-04 18:47:00.000000000 +0200 @@ -200,7 +200,7 @@ #define __NR_clock_gettime (__NR_timer_create+6) #define __NR_clock_getres (__NR_timer_create+7) @@ -646,9 +646,9 @@ diff -NurpP --minimal linux-3.6.6/arch/s390/include/asm/unistd.h linux-3.6.6-vs2 #define __NR_statfs64 265 #define __NR_fstatfs64 266 #define __NR_remap_file_pages 267 -diff -NurpP --minimal linux-3.6.6/arch/s390/kernel/ptrace.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/s390/kernel/ptrace.c ---- linux-3.6.6/arch/s390/kernel/ptrace.c 2012-10-04 15:26:55.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/s390/kernel/ptrace.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/arch/s390/kernel/ptrace.c linux-3.6.9-vs2.3.4.4/arch/s390/kernel/ptrace.c +--- linux-3.6.9/arch/s390/kernel/ptrace.c 2012-10-04 15:26:55.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/arch/s390/kernel/ptrace.c 2012-10-04 18:47:00.000000000 +0200 @@ -21,6 +21,7 @@ #include #include @@ -657,9 +657,9 @@ diff -NurpP --minimal linux-3.6.6/arch/s390/kernel/ptrace.c linux-3.6.6-vs2.3.4. #include #include #include -diff -NurpP --minimal linux-3.6.6/arch/s390/kernel/syscalls.S linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/s390/kernel/syscalls.S ---- linux-3.6.6/arch/s390/kernel/syscalls.S 2012-01-09 16:14:06.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/s390/kernel/syscalls.S 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/arch/s390/kernel/syscalls.S linux-3.6.9-vs2.3.4.4/arch/s390/kernel/syscalls.S +--- linux-3.6.9/arch/s390/kernel/syscalls.S 2012-01-09 16:14:06.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/arch/s390/kernel/syscalls.S 2012-10-04 18:47:00.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) @@ -669,9 +669,9 @@ diff -NurpP --minimal linux-3.6.6/arch/s390/kernel/syscalls.S linux-3.6.6-vs2.3. 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.6.6/arch/sh/Kconfig linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/sh/Kconfig ---- linux-3.6.6/arch/sh/Kconfig 2012-10-04 15:26:55.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/sh/Kconfig 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/arch/sh/Kconfig linux-3.6.9-vs2.3.4.4/arch/sh/Kconfig +--- linux-3.6.9/arch/sh/Kconfig 2012-10-04 15:26:55.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/arch/sh/Kconfig 2012-10-04 18:47:00.000000000 +0200 @@ -940,6 +940,8 @@ source "fs/Kconfig" source "arch/sh/Kconfig.debug" @@ -681,9 +681,9 @@ diff -NurpP --minimal linux-3.6.6/arch/sh/Kconfig linux-3.6.6-vs2.3.4.3.1-noxfs- source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.6.6/arch/sh/kernel/irq.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/sh/kernel/irq.c ---- linux-3.6.6/arch/sh/kernel/irq.c 2012-10-04 15:26:56.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/sh/kernel/irq.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/arch/sh/kernel/irq.c linux-3.6.9-vs2.3.4.4/arch/sh/kernel/irq.c +--- linux-3.6.9/arch/sh/kernel/irq.c 2012-10-04 15:26:56.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/arch/sh/kernel/irq.c 2012-10-04 18:47:00.000000000 +0200 @@ -14,6 +14,7 @@ #include #include @@ -692,9 +692,9 @@ diff -NurpP --minimal linux-3.6.6/arch/sh/kernel/irq.c linux-3.6.6-vs2.3.4.3.1-n #include #include #include -diff -NurpP --minimal linux-3.6.6/arch/sparc/Kconfig linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/sparc/Kconfig ---- linux-3.6.6/arch/sparc/Kconfig 2012-10-04 15:26:58.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/sparc/Kconfig 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/arch/sparc/Kconfig linux-3.6.9-vs2.3.4.4/arch/sparc/Kconfig +--- linux-3.6.9/arch/sparc/Kconfig 2012-10-04 15:26:58.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/arch/sparc/Kconfig 2012-10-04 18:47:00.000000000 +0200 @@ -593,6 +593,8 @@ source "fs/Kconfig" source "arch/sparc/Kconfig.debug" @@ -704,9 +704,9 @@ diff -NurpP --minimal linux-3.6.6/arch/sparc/Kconfig linux-3.6.6-vs2.3.4.3.1-nox source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.6.6/arch/sparc/include/asm/unistd.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/sparc/include/asm/unistd.h ---- linux-3.6.6/arch/sparc/include/asm/unistd.h 2012-10-04 15:26:59.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/sparc/include/asm/unistd.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/arch/sparc/include/asm/unistd.h linux-3.6.9-vs2.3.4.4/arch/sparc/include/asm/unistd.h +--- linux-3.6.9/arch/sparc/include/asm/unistd.h 2012-10-04 15:26:59.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/arch/sparc/include/asm/unistd.h 2012-10-04 18:47:00.000000000 +0200 @@ -335,7 +335,7 @@ #define __NR_timer_getoverrun 264 #define __NR_timer_delete 265 @@ -716,9 +716,9 @@ diff -NurpP --minimal linux-3.6.6/arch/sparc/include/asm/unistd.h linux-3.6.6-vs #define __NR_io_setup 268 #define __NR_io_destroy 269 #define __NR_io_submit 270 -diff -NurpP --minimal linux-3.6.6/arch/sparc/kernel/systbls_32.S linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/sparc/kernel/systbls_32.S ---- linux-3.6.6/arch/sparc/kernel/systbls_32.S 2012-01-09 16:14:09.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/sparc/kernel/systbls_32.S 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/arch/sparc/kernel/systbls_32.S linux-3.6.9-vs2.3.4.4/arch/sparc/kernel/systbls_32.S +--- linux-3.6.9/arch/sparc/kernel/systbls_32.S 2012-01-09 16:14:09.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/arch/sparc/kernel/systbls_32.S 2012-10-04 18:47:00.000000000 +0200 @@ -70,7 +70,7 @@ sys_call_table: /*250*/ .long sys_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_ni_syscall /*255*/ .long sys_sync_file_range, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep @@ -728,9 +728,9 @@ diff -NurpP --minimal linux-3.6.6/arch/sparc/kernel/systbls_32.S linux-3.6.6-vs2 /*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.6.6/arch/sparc/kernel/systbls_64.S linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/sparc/kernel/systbls_64.S ---- linux-3.6.6/arch/sparc/kernel/systbls_64.S 2012-07-22 23:39:00.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/sparc/kernel/systbls_64.S 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/arch/sparc/kernel/systbls_64.S linux-3.6.9-vs2.3.4.4/arch/sparc/kernel/systbls_64.S +--- linux-3.6.9/arch/sparc/kernel/systbls_64.S 2012-07-22 23:39:00.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/arch/sparc/kernel/systbls_64.S 2012-10-04 18:47:00.000000000 +0200 @@ -71,7 +71,7 @@ sys_call_table32: /*250*/ .word sys_mremap, compat_sys_sysctl, sys32_getsid, sys_fdatasync, sys_nis_syscall .word sys32_sync_file_range, compat_sys_clock_settime, compat_sys_clock_gettime, compat_sys_clock_getres, sys32_clock_nanosleep @@ -749,9 +749,9 @@ diff -NurpP --minimal linux-3.6.6/arch/sparc/kernel/systbls_64.S linux-3.6.6-vs2 /*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.6.6/arch/um/Kconfig.rest linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/um/Kconfig.rest ---- linux-3.6.6/arch/um/Kconfig.rest 2012-01-09 16:14:09.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/um/Kconfig.rest 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/arch/um/Kconfig.rest linux-3.6.9-vs2.3.4.4/arch/um/Kconfig.rest +--- linux-3.6.9/arch/um/Kconfig.rest 2012-01-09 16:14:09.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/arch/um/Kconfig.rest 2012-10-04 18:47:00.000000000 +0200 @@ -12,6 +12,8 @@ source "arch/um/Kconfig.net" source "fs/Kconfig" @@ -761,14 +761,14 @@ diff -NurpP --minimal linux-3.6.6/arch/um/Kconfig.rest linux-3.6.6-vs2.3.4.3.1-n source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.6.6/arch/um/include/shared/kern_constants.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/um/include/shared/kern_constants.h ---- linux-3.6.6/arch/um/include/shared/kern_constants.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/um/include/shared/kern_constants.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/arch/um/include/shared/kern_constants.h linux-3.6.9-vs2.3.4.4/arch/um/include/shared/kern_constants.h +--- linux-3.6.9/arch/um/include/shared/kern_constants.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/arch/um/include/shared/kern_constants.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../include/generated/asm-offsets.h" -diff -NurpP --minimal linux-3.6.6/arch/um/include/shared/user_constants.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/um/include/shared/user_constants.h ---- linux-3.6.6/arch/um/include/shared/user_constants.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/um/include/shared/user_constants.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/arch/um/include/shared/user_constants.h linux-3.6.9-vs2.3.4.4/arch/um/include/shared/user_constants.h +--- linux-3.6.9/arch/um/include/shared/user_constants.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/arch/um/include/shared/user_constants.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,40 @@ +/* + * DO NOT MODIFY. @@ -810,9 +810,9 @@ diff -NurpP --minimal linux-3.6.6/arch/um/include/shared/user_constants.h linux- +#define UM_PROT_WRITE 2 /* PROT_WRITE # */ +#define UM_PROT_EXEC 4 /* PROT_EXEC # */ + -diff -NurpP --minimal linux-3.6.6/arch/x86/Kconfig linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/x86/Kconfig ---- linux-3.6.6/arch/x86/Kconfig 2012-10-04 15:27:00.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/x86/Kconfig 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/arch/x86/Kconfig linux-3.6.9-vs2.3.4.4/arch/x86/Kconfig +--- linux-3.6.9/arch/x86/Kconfig 2012-10-04 15:27:00.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/arch/x86/Kconfig 2012-10-04 18:47:00.000000000 +0200 @@ -2228,6 +2228,8 @@ source "fs/Kconfig" source "arch/x86/Kconfig.debug" @@ -822,9 +822,9 @@ diff -NurpP --minimal linux-3.6.6/arch/x86/Kconfig linux-3.6.6-vs2.3.4.3.1-noxfs source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.6.6/arch/x86/syscalls/syscall_32.tbl linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/x86/syscalls/syscall_32.tbl ---- linux-3.6.6/arch/x86/syscalls/syscall_32.tbl 2012-07-22 23:39:02.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/x86/syscalls/syscall_32.tbl 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/arch/x86/syscalls/syscall_32.tbl linux-3.6.9-vs2.3.4.4/arch/x86/syscalls/syscall_32.tbl +--- linux-3.6.9/arch/x86/syscalls/syscall_32.tbl 2012-07-22 23:39:02.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/arch/x86/syscalls/syscall_32.tbl 2012-10-04 18:47:00.000000000 +0200 @@ -279,7 +279,7 @@ 270 i386 tgkill sys_tgkill 271 i386 utimes sys_utimes compat_sys_utimes @@ -834,9 +834,9 @@ diff -NurpP --minimal linux-3.6.6/arch/x86/syscalls/syscall_32.tbl linux-3.6.6-v 274 i386 mbind sys_mbind 275 i386 get_mempolicy sys_get_mempolicy compat_sys_get_mempolicy 276 i386 set_mempolicy sys_set_mempolicy -diff -NurpP --minimal linux-3.6.6/arch/x86/syscalls/syscall_64.tbl linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/x86/syscalls/syscall_64.tbl ---- linux-3.6.6/arch/x86/syscalls/syscall_64.tbl 2012-10-04 15:27:01.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/arch/x86/syscalls/syscall_64.tbl 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/arch/x86/syscalls/syscall_64.tbl linux-3.6.9-vs2.3.4.4/arch/x86/syscalls/syscall_64.tbl +--- linux-3.6.9/arch/x86/syscalls/syscall_64.tbl 2012-10-04 15:27:01.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/arch/x86/syscalls/syscall_64.tbl 2012-10-04 18:47:00.000000000 +0200 @@ -242,7 +242,7 @@ 233 common epoll_ctl sys_epoll_ctl 234 common tgkill sys_tgkill @@ -846,9 +846,9 @@ diff -NurpP --minimal linux-3.6.6/arch/x86/syscalls/syscall_64.tbl linux-3.6.6-v 237 common mbind sys_mbind 238 common set_mempolicy sys_set_mempolicy 239 common get_mempolicy sys_get_mempolicy -diff -NurpP --minimal linux-3.6.6/drivers/block/Kconfig linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/drivers/block/Kconfig ---- linux-3.6.6/drivers/block/Kconfig 2012-05-21 18:06:43.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/drivers/block/Kconfig 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/drivers/block/Kconfig linux-3.6.9-vs2.3.4.4/drivers/block/Kconfig +--- linux-3.6.9/drivers/block/Kconfig 2012-05-21 18:06:43.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/drivers/block/Kconfig 2012-10-04 18:47:00.000000000 +0200 @@ -290,6 +290,13 @@ config BLK_DEV_CRYPTOLOOP source "drivers/block/drbd/Kconfig" @@ -863,9 +863,9 @@ diff -NurpP --minimal linux-3.6.6/drivers/block/Kconfig linux-3.6.6-vs2.3.4.3.1- config BLK_DEV_NBD tristate "Network block device support" depends on NET -diff -NurpP --minimal linux-3.6.6/drivers/block/Makefile linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/drivers/block/Makefile ---- linux-3.6.6/drivers/block/Makefile 2012-03-19 19:46:52.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/drivers/block/Makefile 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/drivers/block/Makefile linux-3.6.9-vs2.3.4.4/drivers/block/Makefile +--- linux-3.6.9/drivers/block/Makefile 2012-03-19 19:46:52.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/drivers/block/Makefile 2012-10-04 18:47:00.000000000 +0200 @@ -35,6 +35,7 @@ obj-$(CONFIG_VIODASD) += viodasd.o obj-$(CONFIG_BLK_DEV_SX8) += sx8.o obj-$(CONFIG_BLK_DEV_UB) += ub.o @@ -874,9 +874,9 @@ diff -NurpP --minimal linux-3.6.6/drivers/block/Makefile linux-3.6.6-vs2.3.4.3.1 obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o obj-$(CONFIG_XEN_BLKDEV_BACKEND) += xen-blkback/ -diff -NurpP --minimal linux-3.6.6/drivers/block/loop.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/drivers/block/loop.c ---- linux-3.6.6/drivers/block/loop.c 2012-07-22 23:39:02.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/drivers/block/loop.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/drivers/block/loop.c linux-3.6.9-vs2.3.4.4/drivers/block/loop.c +--- linux-3.6.9/drivers/block/loop.c 2012-07-22 23:39:02.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/drivers/block/loop.c 2012-10-04 18:47:00.000000000 +0200 @@ -76,6 +76,7 @@ #include #include @@ -932,9 +932,9 @@ diff -NurpP --minimal linux-3.6.6/drivers/block/loop.c linux-3.6.6-vs2.3.4.3.1-n mutex_lock(&lo->lo_ctl_mutex); lo->lo_refcnt++; mutex_unlock(&lo->lo_ctl_mutex); -diff -NurpP --minimal linux-3.6.6/drivers/block/vroot.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/drivers/block/vroot.c ---- linux-3.6.6/drivers/block/vroot.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/drivers/block/vroot.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/drivers/block/vroot.c linux-3.6.9-vs2.3.4.4/drivers/block/vroot.c +--- linux-3.6.9/drivers/block/vroot.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/drivers/block/vroot.c 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,291 @@ +/* + * linux/drivers/block/vroot.c @@ -1227,9 +1227,9 @@ diff -NurpP --minimal linux-3.6.6/drivers/block/vroot.c linux-3.6.6-vs2.3.4.3.1- + +#endif + -diff -NurpP --minimal linux-3.6.6/drivers/infiniband/Kconfig linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/drivers/infiniband/Kconfig ---- linux-3.6.6/drivers/infiniband/Kconfig 2012-07-22 23:39:06.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/drivers/infiniband/Kconfig 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/drivers/infiniband/Kconfig linux-3.6.9-vs2.3.4.4/drivers/infiniband/Kconfig +--- linux-3.6.9/drivers/infiniband/Kconfig 2012-07-22 23:39:06.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/drivers/infiniband/Kconfig 2012-10-04 18:47:00.000000000 +0200 @@ -39,7 +39,7 @@ config INFINIBAND_USER_MEM config INFINIBAND_ADDR_TRANS bool @@ -1239,9 +1239,9 @@ diff -NurpP --minimal linux-3.6.6/drivers/infiniband/Kconfig linux-3.6.6-vs2.3.4 default y source "drivers/infiniband/hw/mthca/Kconfig" -diff -NurpP --minimal linux-3.6.6/drivers/infiniband/core/addr.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/drivers/infiniband/core/addr.c ---- linux-3.6.6/drivers/infiniband/core/addr.c 2012-10-04 15:27:10.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/drivers/infiniband/core/addr.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/drivers/infiniband/core/addr.c linux-3.6.9-vs2.3.4.4/drivers/infiniband/core/addr.c +--- linux-3.6.9/drivers/infiniband/core/addr.c 2012-10-04 15:27:10.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/drivers/infiniband/core/addr.c 2012-10-04 18:47:00.000000000 +0200 @@ -263,7 +263,7 @@ static int addr6_resolve(struct sockaddr if (ipv6_addr_any(&fl6.saddr)) { @@ -1251,9 +1251,9 @@ diff -NurpP --minimal linux-3.6.6/drivers/infiniband/core/addr.c linux-3.6.6-vs2 if (ret) goto put; -diff -NurpP --minimal linux-3.6.6/drivers/md/dm-ioctl.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/drivers/md/dm-ioctl.c ---- linux-3.6.6/drivers/md/dm-ioctl.c 2012-10-04 15:27:11.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/drivers/md/dm-ioctl.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/drivers/md/dm-ioctl.c linux-3.6.9-vs2.3.4.4/drivers/md/dm-ioctl.c +--- linux-3.6.9/drivers/md/dm-ioctl.c 2012-10-04 15:27:11.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/drivers/md/dm-ioctl.c 2012-10-04 18:47:00.000000000 +0200 @@ -16,6 +16,7 @@ #include #include @@ -1339,9 +1339,9 @@ diff -NurpP --minimal linux-3.6.6/drivers/md/dm-ioctl.c linux-3.6.6-vs2.3.4.3.1- return -EACCES; if (_IOC_TYPE(command) != DM_IOCTL) -diff -NurpP --minimal linux-3.6.6/drivers/md/dm.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/drivers/md/dm.c ---- linux-3.6.6/drivers/md/dm.c 2012-10-04 15:27:11.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/drivers/md/dm.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/drivers/md/dm.c linux-3.6.9-vs2.3.4.4/drivers/md/dm.c +--- linux-3.6.9/drivers/md/dm.c 2012-12-08 01:34:09.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/drivers/md/dm.c 2012-12-08 01:36:32.000000000 +0100 @@ -19,6 +19,7 @@ #include #include @@ -1407,7 +1407,7 @@ diff -NurpP --minimal linux-3.6.6/drivers/md/dm.c linux-3.6.6-vs2.3.4.3.1-noxfs- /*----------------------------------------------------------------- * CRUD START: * A more elegant soln is in the works that uses the queue -@@ -1892,6 +1904,7 @@ static struct mapped_device *alloc_dev(i +@@ -1898,6 +1910,7 @@ static struct mapped_device *alloc_dev(i INIT_LIST_HEAD(&md->uevent_list); spin_lock_init(&md->uevent_lock); @@ -1415,9 +1415,9 @@ diff -NurpP --minimal linux-3.6.6/drivers/md/dm.c linux-3.6.6-vs2.3.4.3.1-noxfs- md->queue = blk_alloc_queue(GFP_KERNEL); if (!md->queue) goto bad_queue; -diff -NurpP --minimal linux-3.6.6/drivers/md/dm.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/drivers/md/dm.h ---- linux-3.6.6/drivers/md/dm.h 2012-10-04 15:27:11.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/drivers/md/dm.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/drivers/md/dm.h linux-3.6.9-vs2.3.4.4/drivers/md/dm.h +--- linux-3.6.9/drivers/md/dm.h 2012-10-04 15:27:11.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/drivers/md/dm.h 2012-10-04 18:47:00.000000000 +0200 @@ -46,6 +46,8 @@ struct dm_dev_internal { struct dm_table; struct dm_md_mempools; @@ -1427,9 +1427,9 @@ diff -NurpP --minimal linux-3.6.6/drivers/md/dm.h linux-3.6.6-vs2.3.4.3.1-noxfs- /*----------------------------------------------------------------- * Internal table functions. *---------------------------------------------------------------*/ -diff -NurpP --minimal linux-3.6.6/drivers/net/tun.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/drivers/net/tun.c ---- linux-3.6.6/drivers/net/tun.c 2012-10-04 15:27:20.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/drivers/net/tun.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/drivers/net/tun.c linux-3.6.9-vs2.3.4.4/drivers/net/tun.c +--- linux-3.6.9/drivers/net/tun.c 2012-10-04 15:27:20.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/drivers/net/tun.c 2012-10-04 18:47:00.000000000 +0200 @@ -64,6 +64,7 @@ #include #include @@ -1499,9 +1499,9 @@ diff -NurpP --minimal linux-3.6.6/drivers/net/tun.c linux-3.6.6-vs2.3.4.3.1-noxf case TUNSETLINK: /* Only allow setting the type when the interface is down */ if (tun->dev->flags & IFF_UP) { -diff -NurpP --minimal linux-3.6.6/drivers/tty/sysrq.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/drivers/tty/sysrq.c ---- linux-3.6.6/drivers/tty/sysrq.c 2012-05-21 18:07:16.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/drivers/tty/sysrq.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/drivers/tty/sysrq.c linux-3.6.9-vs2.3.4.4/drivers/tty/sysrq.c +--- linux-3.6.9/drivers/tty/sysrq.c 2012-05-21 18:07:16.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/drivers/tty/sysrq.c 2012-10-04 18:47:00.000000000 +0200 @@ -41,6 +41,7 @@ #include #include @@ -1553,9 +1553,9 @@ diff -NurpP --minimal linux-3.6.6/drivers/tty/sysrq.c linux-3.6.6-vs2.3.4.3.1-no else retval = -1; return retval; -diff -NurpP --minimal linux-3.6.6/drivers/tty/tty_io.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/drivers/tty/tty_io.c ---- linux-3.6.6/drivers/tty/tty_io.c 2012-07-22 23:39:32.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/drivers/tty/tty_io.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/drivers/tty/tty_io.c linux-3.6.9-vs2.3.4.4/drivers/tty/tty_io.c +--- linux-3.6.9/drivers/tty/tty_io.c 2012-07-22 23:39:32.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/drivers/tty/tty_io.c 2012-10-04 18:47:00.000000000 +0200 @@ -104,6 +104,7 @@ #include @@ -1582,9 +1582,9 @@ diff -NurpP --minimal linux-3.6.6/drivers/tty/tty_io.c linux-3.6.6-vs2.3.4.3.1-n if (pgrp_nr < 0) return -EINVAL; rcu_read_lock(); -diff -NurpP --minimal linux-3.6.6/fs/attr.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/attr.c ---- linux-3.6.6/fs/attr.c 2012-10-04 15:27:39.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/attr.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/attr.c linux-3.6.9-vs2.3.4.4/fs/attr.c +--- linux-3.6.9/fs/attr.c 2012-10-04 15:27:39.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/attr.c 2012-10-04 18:47:00.000000000 +0200 @@ -14,6 +14,9 @@ #include #include @@ -1625,9 +1625,9 @@ diff -NurpP --minimal linux-3.6.6/fs/attr.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/ if (IS_IMMUTABLE(inode) || IS_APPEND(inode)) return -EPERM; } -diff -NurpP --minimal linux-3.6.6/fs/block_dev.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/block_dev.c ---- linux-3.6.6/fs/block_dev.c 2012-10-04 15:27:39.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/block_dev.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/block_dev.c linux-3.6.9-vs2.3.4.4/fs/block_dev.c +--- linux-3.6.9/fs/block_dev.c 2012-10-04 15:27:39.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/block_dev.c 2012-10-04 18:47:00.000000000 +0200 @@ -27,6 +27,7 @@ #include #include @@ -1665,9 +1665,9 @@ diff -NurpP --minimal linux-3.6.6/fs/block_dev.c linux-3.6.6-vs2.3.4.3.1-noxfs-n if (bdev) { spin_lock(&bdev_lock); if (!inode->i_bdev) { -diff -NurpP --minimal linux-3.6.6/fs/btrfs/ctree.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/btrfs/ctree.h ---- linux-3.6.6/fs/btrfs/ctree.h 2012-10-04 15:27:39.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/btrfs/ctree.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/btrfs/ctree.h linux-3.6.9-vs2.3.4.4/fs/btrfs/ctree.h +--- linux-3.6.9/fs/btrfs/ctree.h 2012-10-04 15:27:39.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/btrfs/ctree.h 2012-10-04 18:47:00.000000000 +0200 @@ -674,11 +674,14 @@ struct btrfs_inode_item { /* modification sequence number for NFS */ __le64 sequence; @@ -1720,9 +1720,9 @@ diff -NurpP --minimal linux-3.6.6/fs/btrfs/ctree.h linux-3.6.6-vs2.3.4.3.1-noxfs 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.6.6/fs/btrfs/disk-io.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/btrfs/disk-io.c ---- linux-3.6.6/fs/btrfs/disk-io.c 2012-10-04 15:27:39.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/btrfs/disk-io.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/btrfs/disk-io.c linux-3.6.9-vs2.3.4.4/fs/btrfs/disk-io.c +--- linux-3.6.9/fs/btrfs/disk-io.c 2012-10-04 15:27:39.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/btrfs/disk-io.c 2012-10-04 18:47:00.000000000 +0200 @@ -2187,6 +2187,9 @@ int open_ctree(struct super_block *sb, goto fail_alloc; } @@ -1733,9 +1733,9 @@ diff -NurpP --minimal linux-3.6.6/fs/btrfs/disk-io.c linux-3.6.6-vs2.3.4.3.1-nox features = btrfs_super_incompat_flags(disk_super) & ~BTRFS_FEATURE_INCOMPAT_SUPP; if (features) { -diff -NurpP --minimal linux-3.6.6/fs/btrfs/inode.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/btrfs/inode.c ---- linux-3.6.6/fs/btrfs/inode.c 2012-10-04 15:27:39.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/btrfs/inode.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/btrfs/inode.c linux-3.6.9-vs2.3.4.4/fs/btrfs/inode.c +--- linux-3.6.9/fs/btrfs/inode.c 2012-10-04 15:27:39.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/btrfs/inode.c 2012-10-04 18:47:00.000000000 +0200 @@ -39,6 +39,7 @@ #include #include @@ -1800,9 +1800,9 @@ diff -NurpP --minimal linux-3.6.6/fs/btrfs/inode.c linux-3.6.6-vs2.3.4.3.1-noxfs .get_acl = btrfs_get_acl, }; -diff -NurpP --minimal linux-3.6.6/fs/btrfs/ioctl.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/btrfs/ioctl.c ---- linux-3.6.6/fs/btrfs/ioctl.c 2012-10-04 15:27:39.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/btrfs/ioctl.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/btrfs/ioctl.c linux-3.6.9-vs2.3.4.4/fs/btrfs/ioctl.c +--- linux-3.6.9/fs/btrfs/ioctl.c 2012-10-04 15:27:39.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/btrfs/ioctl.c 2012-10-04 18:47:00.000000000 +0200 @@ -74,10 +74,13 @@ static unsigned int btrfs_flags_to_ioctl { unsigned int iflags = 0; @@ -1974,9 +1974,9 @@ diff -NurpP --minimal linux-3.6.6/fs/btrfs/ioctl.c linux-3.6.6-vs2.3.4.3.1-noxfs if (flags & FS_APPEND_FL) ip->flags |= BTRFS_INODE_APPEND; else -diff -NurpP --minimal linux-3.6.6/fs/btrfs/super.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/btrfs/super.c ---- linux-3.6.6/fs/btrfs/super.c 2012-10-04 15:27:39.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/btrfs/super.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/btrfs/super.c linux-3.6.9-vs2.3.4.4/fs/btrfs/super.c +--- linux-3.6.9/fs/btrfs/super.c 2012-10-04 15:27:39.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/btrfs/super.c 2012-10-04 18:47:00.000000000 +0200 @@ -306,7 +306,7 @@ enum { Opt_no_space_cache, Opt_recovery, Opt_skip_balance, Opt_check_integrity, Opt_check_integrity_including_extent_data, @@ -2032,9 +2032,9 @@ diff -NurpP --minimal linux-3.6.6/fs/btrfs/super.c linux-3.6.6-vs2.3.4.3.1-noxfs if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY)) return 0; -diff -NurpP --minimal linux-3.6.6/fs/char_dev.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/char_dev.c ---- linux-3.6.6/fs/char_dev.c 2012-03-19 19:47:25.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/char_dev.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/char_dev.c linux-3.6.9-vs2.3.4.4/fs/char_dev.c +--- linux-3.6.9/fs/char_dev.c 2012-03-19 19:47:25.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/fs/char_dev.c 2012-10-04 18:47:00.000000000 +0200 @@ -21,6 +21,8 @@ #include #include @@ -2067,9 +2067,9 @@ diff -NurpP --minimal linux-3.6.6/fs/char_dev.c linux-3.6.6-vs2.3.4.3.1-noxfs-no if (!kobj) return -ENXIO; new = container_of(kobj, struct cdev, kobj); -diff -NurpP --minimal linux-3.6.6/fs/dcache.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/dcache.c ---- linux-3.6.6/fs/dcache.c 2012-10-04 15:27:39.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/dcache.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/dcache.c linux-3.6.9-vs2.3.4.4/fs/dcache.c +--- linux-3.6.9/fs/dcache.c 2012-10-04 15:27:39.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/dcache.c 2012-12-07 22:49:54.000000000 +0100 @@ -37,6 +37,7 @@ #include #include @@ -2121,9 +2121,9 @@ diff -NurpP --minimal linux-3.6.6/fs/dcache.c linux-3.6.6-vs2.3.4.3.1-noxfs-noco found = dentry; spin_unlock(&dentry->d_lock); break; -diff -NurpP --minimal linux-3.6.6/fs/devpts/inode.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/devpts/inode.c ---- linux-3.6.6/fs/devpts/inode.c 2012-10-04 15:27:39.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/devpts/inode.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/devpts/inode.c linux-3.6.9-vs2.3.4.4/fs/devpts/inode.c +--- linux-3.6.9/fs/devpts/inode.c 2012-10-04 15:27:39.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/devpts/inode.c 2012-10-04 18:47:00.000000000 +0200 @@ -25,6 +25,7 @@ #include #include @@ -2197,7 +2197,7 @@ diff -NurpP --minimal linux-3.6.6/fs/devpts/inode.c linux-3.6.6-vs2.3.4.3.1-noxf + inode->i_fop = &devpts_dir_operations; set_nlink(inode, 2); + /* devpts is xid tagged */ -+ inode->i_tag = (vserver_tag_t)vx_current_xid(); ++ inode->i_tag = (vs_tag_t)vx_current_xid(); s->s_root = d_make_root(inode); if (s->s_root) @@ -2206,14 +2206,14 @@ diff -NurpP --minimal linux-3.6.6/fs/devpts/inode.c linux-3.6.6-vs2.3.4.3.1-noxf inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME; init_special_inode(inode, S_IFCHR|opts->mode, device); + /* devpts is xid tagged */ -+ inode->i_tag = (vserver_tag_t)vx_current_xid(); ++ inode->i_tag = (vs_tag_t)vx_current_xid(); + inode->i_op = &devpts_file_inode_operations; inode->i_private = tty; tty->driver_data = inode; -diff -NurpP --minimal linux-3.6.6/fs/ext2/balloc.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ext2/balloc.c ---- linux-3.6.6/fs/ext2/balloc.c 2012-10-04 15:27:39.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ext2/balloc.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/ext2/balloc.c linux-3.6.9-vs2.3.4.4/fs/ext2/balloc.c +--- linux-3.6.9/fs/ext2/balloc.c 2012-10-04 15:27:39.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/ext2/balloc.c 2012-10-04 18:47:00.000000000 +0200 @@ -699,7 +699,6 @@ ext2_try_to_allocate(struct super_block start = 0; end = EXT2_BLOCKS_PER_GROUP(sb); @@ -2222,9 +2222,9 @@ diff -NurpP --minimal linux-3.6.6/fs/ext2/balloc.c linux-3.6.6-vs2.3.4.3.1-noxfs BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb)); repeat: -diff -NurpP --minimal linux-3.6.6/fs/ext2/ext2.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ext2/ext2.h ---- linux-3.6.6/fs/ext2/ext2.h 2012-07-22 23:39:39.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ext2/ext2.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/ext2/ext2.h linux-3.6.9-vs2.3.4.4/fs/ext2/ext2.h +--- linux-3.6.9/fs/ext2/ext2.h 2012-07-22 23:39:39.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/ext2/ext2.h 2012-10-04 18:47:00.000000000 +0200 @@ -244,8 +244,12 @@ struct ext2_group_desc #define EXT2_NOTAIL_FL FS_NOTAIL_FL /* file tail should not be merged */ #define EXT2_DIRSYNC_FL FS_DIRSYNC_FL /* dirsync behaviour (directories only) */ @@ -2272,18 +2272,18 @@ diff -NurpP --minimal linux-3.6.6/fs/ext2/ext2.h linux-3.6.6-vs2.3.4.3.1-noxfs-n /* ioctl.c */ extern long ext2_ioctl(struct file *, unsigned int, unsigned long); -diff -NurpP --minimal linux-3.6.6/fs/ext2/file.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ext2/file.c ---- linux-3.6.6/fs/ext2/file.c 2011-10-24 18:45:27.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ext2/file.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/ext2/file.c linux-3.6.9-vs2.3.4.4/fs/ext2/file.c +--- linux-3.6.9/fs/ext2/file.c 2011-10-24 18:45:27.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/ext2/file.c 2012-10-04 18:47:00.000000000 +0200 @@ -104,4 +104,5 @@ const struct inode_operations ext2_file_ .setattr = ext2_setattr, .get_acl = ext2_get_acl, .fiemap = ext2_fiemap, + .sync_flags = ext2_sync_flags, }; -diff -NurpP --minimal linux-3.6.6/fs/ext2/ialloc.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ext2/ialloc.c ---- linux-3.6.6/fs/ext2/ialloc.c 2012-10-04 15:27:39.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ext2/ialloc.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/ext2/ialloc.c linux-3.6.9-vs2.3.4.4/fs/ext2/ialloc.c +--- linux-3.6.9/fs/ext2/ialloc.c 2012-10-04 15:27:39.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/ext2/ialloc.c 2012-10-04 18:47:00.000000000 +0200 @@ -17,6 +17,7 @@ #include #include @@ -2300,9 +2300,9 @@ diff -NurpP --minimal linux-3.6.6/fs/ext2/ialloc.c linux-3.6.6-vs2.3.4.3.1-noxfs } else inode_init_owner(inode, dir, mode); -diff -NurpP --minimal linux-3.6.6/fs/ext2/inode.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ext2/inode.c ---- linux-3.6.6/fs/ext2/inode.c 2012-10-04 15:27:39.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ext2/inode.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/ext2/inode.c linux-3.6.9-vs2.3.4.4/fs/ext2/inode.c +--- linux-3.6.9/fs/ext2/inode.c 2012-10-04 15:27:39.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/ext2/inode.c 2012-10-04 18:47:00.000000000 +0200 @@ -31,6 +31,7 @@ #include #include @@ -2433,9 +2433,9 @@ diff -NurpP --minimal linux-3.6.6/fs/ext2/inode.c linux-3.6.6-vs2.3.4.3.1-noxfs- error = dquot_transfer(inode, iattr); if (error) return error; -diff -NurpP --minimal linux-3.6.6/fs/ext2/ioctl.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ext2/ioctl.c ---- linux-3.6.6/fs/ext2/ioctl.c 2012-03-19 19:47:25.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ext2/ioctl.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/ext2/ioctl.c linux-3.6.9-vs2.3.4.4/fs/ext2/ioctl.c +--- linux-3.6.9/fs/ext2/ioctl.c 2012-03-19 19:47:25.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/fs/ext2/ioctl.c 2012-10-04 18:47:00.000000000 +0200 @@ -17,6 +17,16 @@ #include @@ -2485,9 +2485,9 @@ diff -NurpP --minimal linux-3.6.6/fs/ext2/ioctl.c linux-3.6.6-vs2.3.4.3.1-noxfs- flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE; ei->i_flags = flags; -diff -NurpP --minimal linux-3.6.6/fs/ext2/namei.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ext2/namei.c ---- linux-3.6.6/fs/ext2/namei.c 2012-10-04 15:27:39.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ext2/namei.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/ext2/namei.c linux-3.6.9-vs2.3.4.4/fs/ext2/namei.c +--- linux-3.6.9/fs/ext2/namei.c 2012-10-04 15:27:39.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/ext2/namei.c 2012-10-04 18:47:00.000000000 +0200 @@ -32,6 +32,7 @@ #include @@ -2512,9 +2512,9 @@ diff -NurpP --minimal linux-3.6.6/fs/ext2/namei.c linux-3.6.6-vs2.3.4.3.1-noxfs- .get_acl = ext2_get_acl, }; -diff -NurpP --minimal linux-3.6.6/fs/ext2/super.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ext2/super.c ---- linux-3.6.6/fs/ext2/super.c 2012-10-04 15:27:39.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ext2/super.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/ext2/super.c linux-3.6.9-vs2.3.4.4/fs/ext2/super.c +--- linux-3.6.9/fs/ext2/super.c 2012-10-04 15:27:39.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/ext2/super.c 2012-10-04 18:47:00.000000000 +0200 @@ -390,7 +390,8 @@ enum { Opt_err_ro, Opt_nouid32, Opt_nocheck, Opt_debug, Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr, @@ -2580,9 +2580,9 @@ diff -NurpP --minimal linux-3.6.6/fs/ext2/super.c linux-3.6.6-vs2.3.4.3.1-noxfs- sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | ((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0); -diff -NurpP --minimal linux-3.6.6/fs/ext3/ext3.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ext3/ext3.h ---- linux-3.6.6/fs/ext3/ext3.h 2012-07-22 23:39:39.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ext3/ext3.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/ext3/ext3.h linux-3.6.9-vs2.3.4.4/fs/ext3/ext3.h +--- linux-3.6.9/fs/ext3/ext3.h 2012-07-22 23:39:39.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/ext3/ext3.h 2012-10-04 18:47:00.000000000 +0200 @@ -151,10 +151,14 @@ struct ext3_group_desc #define EXT3_NOTAIL_FL 0x00008000 /* file tail should not be merged */ #define EXT3_DIRSYNC_FL 0x00010000 /* dirsync behaviour (directories only) */ @@ -2634,9 +2634,9 @@ diff -NurpP --minimal linux-3.6.6/fs/ext3/ext3.h linux-3.6.6-vs2.3.4.3.1-noxfs-n /* ioctl.c */ extern long ext3_ioctl(struct file *, unsigned int, unsigned long); -diff -NurpP --minimal linux-3.6.6/fs/ext3/file.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ext3/file.c ---- linux-3.6.6/fs/ext3/file.c 2012-05-21 18:07:20.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ext3/file.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/ext3/file.c linux-3.6.9-vs2.3.4.4/fs/ext3/file.c +--- linux-3.6.9/fs/ext3/file.c 2012-05-21 18:07:20.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/ext3/file.c 2012-10-04 18:47:00.000000000 +0200 @@ -76,5 +76,6 @@ const struct inode_operations ext3_file_ #endif .get_acl = ext3_get_acl, @@ -2644,9 +2644,9 @@ diff -NurpP --minimal linux-3.6.6/fs/ext3/file.c linux-3.6.6-vs2.3.4.3.1-noxfs-n + .sync_flags = ext3_sync_flags, }; -diff -NurpP --minimal linux-3.6.6/fs/ext3/ialloc.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ext3/ialloc.c ---- linux-3.6.6/fs/ext3/ialloc.c 2012-07-22 23:39:39.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ext3/ialloc.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/ext3/ialloc.c linux-3.6.9-vs2.3.4.4/fs/ext3/ialloc.c +--- linux-3.6.9/fs/ext3/ialloc.c 2012-07-22 23:39:39.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/ext3/ialloc.c 2012-10-04 18:47:00.000000000 +0200 @@ -14,6 +14,7 @@ #include @@ -2663,9 +2663,9 @@ diff -NurpP --minimal linux-3.6.6/fs/ext3/ialloc.c linux-3.6.6-vs2.3.4.3.1-noxfs } else inode_init_owner(inode, dir, mode); -diff -NurpP --minimal linux-3.6.6/fs/ext3/inode.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ext3/inode.c ---- linux-3.6.6/fs/ext3/inode.c 2012-10-04 15:27:39.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ext3/inode.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/ext3/inode.c linux-3.6.9-vs2.3.4.4/fs/ext3/inode.c +--- linux-3.6.9/fs/ext3/inode.c 2012-10-04 15:27:39.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/ext3/inode.c 2012-10-04 18:47:00.000000000 +0200 @@ -27,6 +27,8 @@ #include #include @@ -2796,9 +2796,9 @@ diff -NurpP --minimal linux-3.6.6/fs/ext3/inode.c linux-3.6.6-vs2.3.4.3.1-noxfs- error = ext3_mark_inode_dirty(handle, inode); ext3_journal_stop(handle); } -diff -NurpP --minimal linux-3.6.6/fs/ext3/ioctl.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ext3/ioctl.c ---- linux-3.6.6/fs/ext3/ioctl.c 2012-05-21 18:07:20.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ext3/ioctl.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/ext3/ioctl.c linux-3.6.9-vs2.3.4.4/fs/ext3/ioctl.c +--- linux-3.6.9/fs/ext3/ioctl.c 2012-05-21 18:07:20.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/ext3/ioctl.c 2012-10-04 18:47:00.000000000 +0200 @@ -12,6 +12,34 @@ #include #include "ext3.h" @@ -2866,9 +2866,9 @@ diff -NurpP --minimal linux-3.6.6/fs/ext3/ioctl.c linux-3.6.6-vs2.3.4.3.1-noxfs- flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE; ei->i_flags = flags; -diff -NurpP --minimal linux-3.6.6/fs/ext3/namei.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ext3/namei.c ---- linux-3.6.6/fs/ext3/namei.c 2012-10-04 15:27:39.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ext3/namei.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/ext3/namei.c linux-3.6.9-vs2.3.4.4/fs/ext3/namei.c +--- linux-3.6.9/fs/ext3/namei.c 2012-10-04 15:27:39.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/ext3/namei.c 2012-10-04 18:47:00.000000000 +0200 @@ -25,6 +25,8 @@ */ @@ -2894,9 +2894,9 @@ diff -NurpP --minimal linux-3.6.6/fs/ext3/namei.c linux-3.6.6-vs2.3.4.3.1-noxfs- .get_acl = ext3_get_acl, }; -diff -NurpP --minimal linux-3.6.6/fs/ext3/super.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ext3/super.c ---- linux-3.6.6/fs/ext3/super.c 2012-10-04 15:27:39.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ext3/super.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/ext3/super.c linux-3.6.9-vs2.3.4.4/fs/ext3/super.c +--- linux-3.6.9/fs/ext3/super.c 2012-10-04 15:27:39.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/ext3/super.c 2012-10-04 18:47:00.000000000 +0200 @@ -811,7 +811,8 @@ enum { Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota, Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota, @@ -2963,9 +2963,9 @@ diff -NurpP --minimal linux-3.6.6/fs/ext3/super.c linux-3.6.6-vs2.3.4.3.1-noxfs- sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); -diff -NurpP --minimal linux-3.6.6/fs/ext4/ext4.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ext4/ext4.h ---- linux-3.6.6/fs/ext4/ext4.h 2012-11-06 18:42:12.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ext4/ext4.h 2012-11-06 18:43:41.000000000 +0100 +diff -NurpP --minimal linux-3.6.9/fs/ext4/ext4.h linux-3.6.9-vs2.3.4.4/fs/ext4/ext4.h +--- linux-3.6.9/fs/ext4/ext4.h 2012-12-08 01:34:13.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/fs/ext4/ext4.h 2012-12-08 01:36:33.000000000 +0100 @@ -393,8 +393,12 @@ struct flex_groups { #define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */ #define EXT4_EA_INODE_FL 0x00200000 /* Inode used for large EA */ @@ -3004,7 +3004,7 @@ diff -NurpP --minimal linux-3.6.6/fs/ext4/ext4.h linux-3.6.6-vs2.3.4.3.1-noxfs-n #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 */ -@@ -2393,6 +2399,7 @@ extern int ext4_map_blocks(handle_t *han +@@ -2392,6 +2398,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); @@ -3012,9 +3012,9 @@ diff -NurpP --minimal linux-3.6.6/fs/ext4/ext4.h linux-3.6.6-vs2.3.4.3.1-noxfs-n /* 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.6.6/fs/ext4/file.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ext4/file.c ---- linux-3.6.6/fs/ext4/file.c 2012-10-04 15:27:39.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ext4/file.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/ext4/file.c linux-3.6.9-vs2.3.4.4/fs/ext4/file.c +--- linux-3.6.9/fs/ext4/file.c 2012-10-04 15:27:39.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/ext4/file.c 2012-10-04 18:47:00.000000000 +0200 @@ -334,5 +334,6 @@ const struct inode_operations ext4_file_ #endif .get_acl = ext4_get_acl, @@ -3022,9 +3022,9 @@ diff -NurpP --minimal linux-3.6.6/fs/ext4/file.c linux-3.6.6-vs2.3.4.3.1-noxfs-n + .sync_flags = ext4_sync_flags, }; -diff -NurpP --minimal linux-3.6.6/fs/ext4/ialloc.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ext4/ialloc.c ---- linux-3.6.6/fs/ext4/ialloc.c 2012-11-06 18:42:12.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ext4/ialloc.c 2012-11-06 18:43:41.000000000 +0100 +diff -NurpP --minimal linux-3.6.9/fs/ext4/ialloc.c linux-3.6.9-vs2.3.4.4/fs/ext4/ialloc.c +--- linux-3.6.9/fs/ext4/ialloc.c 2012-12-08 01:34:13.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/fs/ext4/ialloc.c 2012-11-06 18:43:41.000000000 +0100 @@ -22,6 +22,7 @@ #include #include @@ -3041,9 +3041,9 @@ diff -NurpP --minimal linux-3.6.6/fs/ext4/ialloc.c linux-3.6.6-vs2.3.4.3.1-noxfs } else inode_init_owner(inode, dir, mode); -diff -NurpP --minimal linux-3.6.6/fs/ext4/inode.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ext4/inode.c ---- linux-3.6.6/fs/ext4/inode.c 2012-11-06 18:42:12.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ext4/inode.c 2012-11-06 18:43:41.000000000 +0100 +diff -NurpP --minimal linux-3.6.9/fs/ext4/inode.c linux-3.6.9-vs2.3.4.4/fs/ext4/inode.c +--- linux-3.6.9/fs/ext4/inode.c 2012-12-08 01:34:13.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/fs/ext4/inode.c 2012-11-06 18:43:41.000000000 +0100 @@ -37,6 +37,7 @@ #include #include @@ -3177,9 +3177,9 @@ diff -NurpP --minimal linux-3.6.6/fs/ext4/inode.c linux-3.6.6-vs2.3.4.3.1-noxfs- error = ext4_mark_inode_dirty(handle, inode); ext4_journal_stop(handle); } -diff -NurpP --minimal linux-3.6.6/fs/ext4/ioctl.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ext4/ioctl.c ---- linux-3.6.6/fs/ext4/ioctl.c 2012-10-04 15:27:39.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ext4/ioctl.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/ext4/ioctl.c linux-3.6.9-vs2.3.4.4/fs/ext4/ioctl.c +--- linux-3.6.9/fs/ext4/ioctl.c 2012-10-04 15:27:39.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/ext4/ioctl.c 2012-10-04 18:47:00.000000000 +0200 @@ -14,12 +14,40 @@ #include #include @@ -3244,9 +3244,9 @@ diff -NurpP --minimal linux-3.6.6/fs/ext4/ioctl.c linux-3.6.6-vs2.3.4.3.1-noxfs- if (!capable(CAP_LINUX_IMMUTABLE)) goto flags_out; } -diff -NurpP --minimal linux-3.6.6/fs/ext4/namei.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ext4/namei.c ---- linux-3.6.6/fs/ext4/namei.c 2012-11-06 18:42:13.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ext4/namei.c 2012-11-06 18:43:41.000000000 +0100 +diff -NurpP --minimal linux-3.6.9/fs/ext4/namei.c linux-3.6.9-vs2.3.4.4/fs/ext4/namei.c +--- linux-3.6.9/fs/ext4/namei.c 2012-12-08 01:34:13.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/fs/ext4/namei.c 2012-11-06 18:43:41.000000000 +0100 @@ -34,6 +34,7 @@ #include #include @@ -3271,10 +3271,10 @@ diff -NurpP --minimal linux-3.6.6/fs/ext4/namei.c linux-3.6.6-vs2.3.4.3.1-noxfs- }; const struct inode_operations ext4_special_inode_operations = { -diff -NurpP --minimal linux-3.6.6/fs/ext4/super.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ext4/super.c ---- linux-3.6.6/fs/ext4/super.c 2012-11-06 18:42:13.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ext4/super.c 2012-11-06 18:43:41.000000000 +0100 -@@ -1219,6 +1219,7 @@ enum { +diff -NurpP --minimal linux-3.6.9/fs/ext4/super.c linux-3.6.9-vs2.3.4.4/fs/ext4/super.c +--- linux-3.6.9/fs/ext4/super.c 2012-12-08 01:34:13.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/fs/ext4/super.c 2012-12-08 01:36:33.000000000 +0100 +@@ -1220,6 +1220,7 @@ enum { Opt_inode_readahead_blks, Opt_journal_ioprio, Opt_dioread_nolock, Opt_dioread_lock, Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable, @@ -3282,7 +3282,7 @@ diff -NurpP --minimal linux-3.6.6/fs/ext4/super.c linux-3.6.6-vs2.3.4.3.1-noxfs- }; static const match_table_t tokens = { -@@ -1297,6 +1298,9 @@ static const match_table_t tokens = { +@@ -1298,6 +1299,9 @@ static const match_table_t tokens = { {Opt_removed, "reservation"}, /* mount option from ext2/3 */ {Opt_removed, "noreservation"}, /* mount option from ext2/3 */ {Opt_removed, "journal=%u"}, /* mount option from ext2/3 */ @@ -3292,7 +3292,7 @@ diff -NurpP --minimal linux-3.6.6/fs/ext4/super.c linux-3.6.6-vs2.3.4.3.1-noxfs- {Opt_err, NULL}, }; -@@ -1543,6 +1547,20 @@ static int handle_mount_opt(struct super +@@ -1544,6 +1548,20 @@ static int handle_mount_opt(struct super return -1; *journal_ioprio = IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, arg); return 1; @@ -3313,7 +3313,7 @@ diff -NurpP --minimal linux-3.6.6/fs/ext4/super.c linux-3.6.6-vs2.3.4.3.1-noxfs- } for (m = ext4_mount_opts; m->token != Opt_err; m++) { -@@ -3417,6 +3435,9 @@ static int ext4_fill_super(struct super_ +@@ -3418,6 +3436,9 @@ static int ext4_fill_super(struct super_ } } @@ -3323,7 +3323,7 @@ diff -NurpP --minimal linux-3.6.6/fs/ext4/super.c linux-3.6.6-vs2.3.4.3.1-noxfs- sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); -@@ -4582,6 +4603,14 @@ static int ext4_remount(struct super_blo +@@ -4583,6 +4604,14 @@ static int ext4_remount(struct super_blo if (sbi->s_mount_flags & EXT4_MF_FS_ABORTED) ext4_abort(sb, "Abort forced by user"); @@ -3338,9 +3338,9 @@ diff -NurpP --minimal linux-3.6.6/fs/ext4/super.c linux-3.6.6-vs2.3.4.3.1-noxfs- sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); -diff -NurpP --minimal linux-3.6.6/fs/fcntl.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/fcntl.c ---- linux-3.6.6/fs/fcntl.c 2012-10-04 15:27:39.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/fcntl.c 2012-10-04 19:05:02.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/fcntl.c linux-3.6.9-vs2.3.4.4/fs/fcntl.c +--- linux-3.6.9/fs/fcntl.c 2012-10-04 15:27:39.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/fcntl.c 2012-10-04 19:05:02.000000000 +0200 @@ -21,6 +21,7 @@ #include #include @@ -3367,9 +3367,9 @@ diff -NurpP --minimal linux-3.6.6/fs/fcntl.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow if (unlikely(filp->f_mode & FMODE_PATH)) { if (!check_fcntl_cmd(cmd)) -diff -NurpP --minimal linux-3.6.6/fs/file.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/file.c ---- linux-3.6.6/fs/file.c 2012-05-21 18:07:20.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/file.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/file.c linux-3.6.9-vs2.3.4.4/fs/file.c +--- linux-3.6.9/fs/file.c 2012-05-21 18:07:20.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/file.c 2012-10-04 18:47:00.000000000 +0200 @@ -21,6 +21,7 @@ #include #include @@ -3395,9 +3395,9 @@ diff -NurpP --minimal linux-3.6.6/fs/file.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/ #if 1 /* Sanity check */ if (rcu_dereference_raw(fdt->fd[fd]) != NULL) { -diff -NurpP --minimal linux-3.6.6/fs/file_table.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/file_table.c ---- linux-3.6.6/fs/file_table.c 2012-10-04 15:27:39.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/file_table.c 2012-10-04 19:10:21.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/file_table.c linux-3.6.9-vs2.3.4.4/fs/file_table.c +--- linux-3.6.9/fs/file_table.c 2012-10-04 15:27:39.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/file_table.c 2012-11-17 14:36:19.000000000 +0100 @@ -26,6 +26,8 @@ #include #include @@ -3434,9 +3434,9 @@ diff -NurpP --minimal linux-3.6.6/fs/file_table.c linux-3.6.6-vs2.3.4.3.1-noxfs- file_sb_list_del(file); file_free(file); } -diff -NurpP --minimal linux-3.6.6/fs/fs_struct.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/fs_struct.c ---- linux-3.6.6/fs/fs_struct.c 2012-10-04 15:27:39.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/fs_struct.c 2012-10-04 19:08:56.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/fs_struct.c linux-3.6.9-vs2.3.4.4/fs/fs_struct.c +--- linux-3.6.9/fs/fs_struct.c 2012-10-04 15:27:39.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/fs_struct.c 2012-10-04 19:08:56.000000000 +0200 @@ -4,6 +4,7 @@ #include #include @@ -3461,9 +3461,9 @@ diff -NurpP --minimal linux-3.6.6/fs/fs_struct.c linux-3.6.6-vs2.3.4.3.1-noxfs-n } return fs; } -diff -NurpP --minimal linux-3.6.6/fs/gfs2/file.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/gfs2/file.c ---- linux-3.6.6/fs/gfs2/file.c 2012-10-04 15:27:40.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/gfs2/file.c 2012-10-04 19:05:34.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/gfs2/file.c linux-3.6.9-vs2.3.4.4/fs/gfs2/file.c +--- linux-3.6.9/fs/gfs2/file.c 2012-12-08 01:34:13.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/fs/gfs2/file.c 2012-12-08 01:36:33.000000000 +0100 @@ -143,6 +143,9 @@ static const u32 fsflags_to_gfs2[32] = { [12] = GFS2_DIF_EXHASH, [14] = GFS2_DIF_INHERIT_JDATA, @@ -3586,9 +3586,9 @@ diff -NurpP --minimal linux-3.6.6/fs/gfs2/file.c linux-3.6.6-vs2.3.4.3.1-noxfs-n static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { switch(cmd) { -diff -NurpP --minimal linux-3.6.6/fs/gfs2/inode.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/gfs2/inode.h ---- linux-3.6.6/fs/gfs2/inode.h 2012-07-22 23:39:40.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/gfs2/inode.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/gfs2/inode.h linux-3.6.9-vs2.3.4.4/fs/gfs2/inode.h +--- linux-3.6.9/fs/gfs2/inode.h 2012-07-22 23:39:40.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/gfs2/inode.h 2012-10-04 18:47:00.000000000 +0200 @@ -117,6 +117,7 @@ extern const struct file_operations gfs2 extern const struct file_operations gfs2_dir_fops_nolock; @@ -3597,9 +3597,9 @@ diff -NurpP --minimal linux-3.6.6/fs/gfs2/inode.h linux-3.6.6-vs2.3.4.3.1-noxfs- #ifdef CONFIG_GFS2_FS_LOCKING_DLM extern const struct file_operations gfs2_file_fops; -diff -NurpP --minimal linux-3.6.6/fs/inode.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/inode.c ---- linux-3.6.6/fs/inode.c 2012-10-04 15:27:40.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/inode.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/inode.c linux-3.6.9-vs2.3.4.4/fs/inode.c +--- linux-3.6.9/fs/inode.c 2012-12-08 01:34:13.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/fs/inode.c 2012-12-08 01:36:33.000000000 +0100 @@ -17,6 +17,7 @@ #include #include /* for inode_has_buffers */ @@ -3626,7 +3626,7 @@ diff -NurpP --minimal linux-3.6.6/fs/inode.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow inode->dirtied_when = 0; if (security_inode_alloc(inode)) -@@ -470,6 +475,8 @@ void __insert_inode_hash(struct inode *i +@@ -483,6 +488,8 @@ void __insert_inode_hash(struct inode *i } EXPORT_SYMBOL(__insert_inode_hash); @@ -3635,7 +3635,7 @@ diff -NurpP --minimal linux-3.6.6/fs/inode.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow /** * __remove_inode_hash - remove an inode from the hash * @inode: inode to unhash -@@ -1792,9 +1799,11 @@ void init_special_inode(struct inode *in +@@ -1804,9 +1811,11 @@ void init_special_inode(struct inode *in if (S_ISCHR(mode)) { inode->i_fop = &def_chr_fops; inode->i_rdev = rdev; @@ -3647,7 +3647,7 @@ diff -NurpP --minimal linux-3.6.6/fs/inode.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow } else if (S_ISFIFO(mode)) inode->i_fop = &def_fifo_fops; else if (S_ISSOCK(mode)) -@@ -1823,6 +1832,7 @@ void inode_init_owner(struct inode *inod +@@ -1835,6 +1844,7 @@ void inode_init_owner(struct inode *inod } else inode->i_gid = current_fsgid(); inode->i_mode = mode; @@ -3655,9 +3655,9 @@ diff -NurpP --minimal linux-3.6.6/fs/inode.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow } EXPORT_SYMBOL(inode_init_owner); -diff -NurpP --minimal linux-3.6.6/fs/ioctl.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ioctl.c ---- linux-3.6.6/fs/ioctl.c 2012-05-21 18:07:24.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ioctl.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/ioctl.c linux-3.6.9-vs2.3.4.4/fs/ioctl.c +--- linux-3.6.9/fs/ioctl.c 2012-05-21 18:07:24.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/ioctl.c 2012-10-04 18:47:00.000000000 +0200 @@ -15,6 +15,9 @@ #include #include @@ -3668,9 +3668,9 @@ diff -NurpP --minimal linux-3.6.6/fs/ioctl.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow #include -diff -NurpP --minimal linux-3.6.6/fs/ioprio.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ioprio.c ---- linux-3.6.6/fs/ioprio.c 2012-07-22 23:39:40.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ioprio.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/ioprio.c linux-3.6.9-vs2.3.4.4/fs/ioprio.c +--- linux-3.6.9/fs/ioprio.c 2012-07-22 23:39:40.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/ioprio.c 2012-10-04 18:47:00.000000000 +0200 @@ -28,6 +28,7 @@ #include #include @@ -3697,9 +3697,9 @@ diff -NurpP --minimal linux-3.6.6/fs/ioprio.c linux-3.6.6-vs2.3.4.3.1-noxfs-noco tmpio = get_task_ioprio(p); if (tmpio < 0) continue; -diff -NurpP --minimal linux-3.6.6/fs/jfs/file.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/jfs/file.c ---- linux-3.6.6/fs/jfs/file.c 2011-10-24 18:45:27.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/jfs/file.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/jfs/file.c linux-3.6.9-vs2.3.4.4/fs/jfs/file.c +--- linux-3.6.9/fs/jfs/file.c 2011-10-24 18:45:27.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/jfs/file.c 2012-10-04 18:47:00.000000000 +0200 @@ -109,7 +109,8 @@ int jfs_setattr(struct dentry *dentry, s if (is_quota_modification(inode, iattr)) dquot_initialize(inode); @@ -3718,9 +3718,9 @@ diff -NurpP --minimal linux-3.6.6/fs/jfs/file.c linux-3.6.6-vs2.3.4.3.1-noxfs-no }; const struct file_operations jfs_file_operations = { -diff -NurpP --minimal linux-3.6.6/fs/jfs/ioctl.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/jfs/ioctl.c ---- linux-3.6.6/fs/jfs/ioctl.c 2012-03-19 19:47:25.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/jfs/ioctl.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/jfs/ioctl.c linux-3.6.9-vs2.3.4.4/fs/jfs/ioctl.c +--- linux-3.6.9/fs/jfs/ioctl.c 2012-03-19 19:47:25.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/fs/jfs/ioctl.c 2012-10-04 18:47:00.000000000 +0200 @@ -11,6 +11,7 @@ #include #include @@ -3778,9 +3778,9 @@ diff -NurpP --minimal linux-3.6.6/fs/jfs/ioctl.c linux-3.6.6-vs2.3.4.3.1-noxfs-n flags |= oldflags & ~JFS_FL_USER_MODIFIABLE; jfs_inode->mode2 = flags; -diff -NurpP --minimal linux-3.6.6/fs/jfs/jfs_dinode.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/jfs/jfs_dinode.h ---- linux-3.6.6/fs/jfs/jfs_dinode.h 2008-12-25 00:26:37.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/jfs/jfs_dinode.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/jfs/jfs_dinode.h linux-3.6.9-vs2.3.4.4/fs/jfs/jfs_dinode.h +--- linux-3.6.9/fs/jfs/jfs_dinode.h 2008-12-25 00:26:37.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/fs/jfs/jfs_dinode.h 2012-10-04 18:47:00.000000000 +0200 @@ -161,9 +161,13 @@ struct dinode { #define JFS_APPEND_FL 0x01000000 /* writes to file may only append */ @@ -3797,9 +3797,9 @@ diff -NurpP --minimal linux-3.6.6/fs/jfs/jfs_dinode.h linux-3.6.6-vs2.3.4.3.1-no #define JFS_FL_INHERIT 0x03C80000 /* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */ -diff -NurpP --minimal linux-3.6.6/fs/jfs/jfs_filsys.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/jfs/jfs_filsys.h ---- linux-3.6.6/fs/jfs/jfs_filsys.h 2008-12-25 00:26:37.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/jfs/jfs_filsys.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/jfs/jfs_filsys.h linux-3.6.9-vs2.3.4.4/fs/jfs/jfs_filsys.h +--- linux-3.6.9/fs/jfs/jfs_filsys.h 2008-12-25 00:26:37.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/fs/jfs/jfs_filsys.h 2012-10-04 18:47:00.000000000 +0200 @@ -263,6 +263,7 @@ #define JFS_NAME_MAX 255 #define JFS_PATH_MAX BPSIZE @@ -3808,9 +3808,9 @@ diff -NurpP --minimal linux-3.6.6/fs/jfs/jfs_filsys.h linux-3.6.6-vs2.3.4.3.1-no /* * file system state (superblock state) -diff -NurpP --minimal linux-3.6.6/fs/jfs/jfs_imap.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/jfs/jfs_imap.c ---- linux-3.6.6/fs/jfs/jfs_imap.c 2012-01-09 16:14:54.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/jfs/jfs_imap.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/jfs/jfs_imap.c linux-3.6.9-vs2.3.4.4/fs/jfs/jfs_imap.c +--- linux-3.6.9/fs/jfs/jfs_imap.c 2012-01-09 16:14:54.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/fs/jfs/jfs_imap.c 2012-10-04 18:47:00.000000000 +0200 @@ -46,6 +46,7 @@ #include #include @@ -3870,9 +3870,9 @@ diff -NurpP --minimal linux-3.6.6/fs/jfs/jfs_imap.c linux-3.6.6-vs2.3.4.3.1-noxf jfs_get_inode_flags(jfs_ip); /* * mode2 is only needed for storing the higher order bits. -diff -NurpP --minimal linux-3.6.6/fs/jfs/jfs_inode.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/jfs/jfs_inode.c ---- linux-3.6.6/fs/jfs/jfs_inode.c 2012-01-09 16:14:54.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/jfs/jfs_inode.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/jfs/jfs_inode.c linux-3.6.9-vs2.3.4.4/fs/jfs/jfs_inode.c +--- linux-3.6.9/fs/jfs/jfs_inode.c 2012-01-09 16:14:54.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/fs/jfs/jfs_inode.c 2012-10-04 18:47:00.000000000 +0200 @@ -18,6 +18,7 @@ #include @@ -3946,9 +3946,9 @@ diff -NurpP --minimal linux-3.6.6/fs/jfs/jfs_inode.c linux-3.6.6-vs2.3.4.3.1-nox } /* -diff -NurpP --minimal linux-3.6.6/fs/jfs/jfs_inode.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/jfs/jfs_inode.h ---- linux-3.6.6/fs/jfs/jfs_inode.h 2011-10-24 18:45:27.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/jfs/jfs_inode.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/jfs/jfs_inode.h linux-3.6.9-vs2.3.4.4/fs/jfs/jfs_inode.h +--- linux-3.6.9/fs/jfs/jfs_inode.h 2011-10-24 18:45:27.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/jfs/jfs_inode.h 2012-10-04 18:47:00.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); @@ -3957,9 +3957,9 @@ diff -NurpP --minimal linux-3.6.6/fs/jfs/jfs_inode.h linux-3.6.6-vs2.3.4.3.1-nox 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.6.6/fs/jfs/namei.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/jfs/namei.c ---- linux-3.6.6/fs/jfs/namei.c 2012-10-04 15:27:40.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/jfs/namei.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/jfs/namei.c linux-3.6.9-vs2.3.4.4/fs/jfs/namei.c +--- linux-3.6.9/fs/jfs/namei.c 2012-10-04 15:27:40.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/jfs/namei.c 2012-10-04 18:47:00.000000000 +0200 @@ -22,6 +22,7 @@ #include #include @@ -3984,9 +3984,9 @@ diff -NurpP --minimal linux-3.6.6/fs/jfs/namei.c linux-3.6.6-vs2.3.4.3.1-noxfs-n }; const struct file_operations jfs_dir_operations = { -diff -NurpP --minimal linux-3.6.6/fs/jfs/super.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/jfs/super.c ---- linux-3.6.6/fs/jfs/super.c 2012-10-04 15:27:40.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/jfs/super.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/jfs/super.c linux-3.6.9-vs2.3.4.4/fs/jfs/super.c +--- linux-3.6.9/fs/jfs/super.c 2012-10-04 15:27:40.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/jfs/super.c 2012-10-04 18:47:00.000000000 +0200 @@ -197,7 +197,8 @@ static void jfs_put_super(struct super_b enum { Opt_integrity, Opt_nointegrity, Opt_iocharset, Opt_resize, @@ -4052,9 +4052,9 @@ diff -NurpP --minimal linux-3.6.6/fs/jfs/super.c linux-3.6.6-vs2.3.4.3.1-noxfs-n if (newLVSize) { printk(KERN_ERR "resize option for remount only\n"); -diff -NurpP --minimal linux-3.6.6/fs/libfs.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/libfs.c ---- linux-3.6.6/fs/libfs.c 2012-10-04 15:27:40.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/libfs.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/libfs.c linux-3.6.9-vs2.3.4.4/fs/libfs.c +--- linux-3.6.9/fs/libfs.c 2012-10-04 15:27:40.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/libfs.c 2012-10-04 18:47:00.000000000 +0200 @@ -135,7 +135,8 @@ static inline unsigned char dt_type(stru * both impossible due to the lock on directory. */ @@ -4100,9 +4100,9 @@ diff -NurpP --minimal linux-3.6.6/fs/libfs.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow EXPORT_SYMBOL(generic_read_dir); EXPORT_SYMBOL(mount_pseudo); EXPORT_SYMBOL(simple_write_begin); -diff -NurpP --minimal linux-3.6.6/fs/locks.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/locks.c ---- linux-3.6.6/fs/locks.c 2012-10-04 15:27:40.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/locks.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/locks.c linux-3.6.9-vs2.3.4.4/fs/locks.c +--- linux-3.6.9/fs/locks.c 2012-10-04 15:27:40.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/locks.c 2012-10-04 18:47:00.000000000 +0200 @@ -126,6 +126,8 @@ #include #include @@ -4300,20 +4300,20 @@ diff -NurpP --minimal linux-3.6.6/fs/locks.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow return 0; } -diff -NurpP --minimal linux-3.6.6/fs/mount.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/mount.h ---- linux-3.6.6/fs/mount.h 2012-10-04 15:27:40.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/mount.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/mount.h linux-3.6.9-vs2.3.4.4/fs/mount.h +--- linux-3.6.9/fs/mount.h 2012-10-04 15:27:40.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/mount.h 2012-10-04 18:47:00.000000000 +0200 @@ -46,6 +46,7 @@ struct mount { int mnt_expiry_mark; /* true if marked for expiry */ int mnt_pinned; int mnt_ghosts; -+ vserver_tag_t mnt_tag; /* tagging used for vfsmount */ ++ vs_tag_t mnt_tag; /* tagging used for vfsmount */ }; #define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */ -diff -NurpP --minimal linux-3.6.6/fs/namei.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/namei.c ---- linux-3.6.6/fs/namei.c 2012-11-06 18:42:13.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/namei.c 2012-11-06 18:43:41.000000000 +0100 +diff -NurpP --minimal linux-3.6.9/fs/namei.c linux-3.6.9-vs2.3.4.4/fs/namei.c +--- linux-3.6.9/fs/namei.c 2012-12-08 01:34:14.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/fs/namei.c 2012-12-08 01:08:53.000000000 +0100 @@ -34,6 +34,14 @@ #include #include @@ -4544,25 +4544,24 @@ diff -NurpP --minimal linux-3.6.6/fs/namei.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow file = get_empty_filp(); if (!file) return ERR_PTR(-ENFILE); -@@ -2920,6 +3047,17 @@ static struct file *path_openat(int dfd, +@@ -2920,6 +3047,16 @@ static struct file *path_openat(int dfd, error = do_last(nd, &path, file, op, &opened, pathname); put_link(nd, &link, cookie); } + +#ifdef CONFIG_VSERVER_COWBL -+ if (filp == ERR_PTR(-EMLINK)) { ++ if (error == -EMLINK) { + if (nd->root.mnt && !(nd->flags & LOOKUP_ROOT)) + path_put(&nd->root); + if (base) + fput(base); -+ release_open_intent(nd); + goto restart; + } +#endif out: if (nd->root.mnt && !(nd->flags & LOOKUP_ROOT)) path_put(&nd->root); -@@ -3023,6 +3161,11 @@ struct dentry *kern_path_create(int dfd, +@@ -3023,6 +3160,11 @@ struct dentry *kern_path_create(int dfd, goto fail; } *path = nd.path; @@ -4574,7 +4573,7 @@ diff -NurpP --minimal linux-3.6.6/fs/namei.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow return dentry; fail: dput(dentry); -@@ -3489,7 +3632,7 @@ int vfs_link(struct dentry *old_dentry, +@@ -3489,7 +3631,7 @@ int vfs_link(struct dentry *old_dentry, /* * A link to an append-only or immutable file cannot be created. */ @@ -4583,7 +4582,7 @@ diff -NurpP --minimal linux-3.6.6/fs/namei.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow return -EPERM; if (!dir->i_op->link) return -EPERM; -@@ -3874,6 +4017,253 @@ int vfs_follow_link(struct nameidata *nd +@@ -3874,6 +4016,275 @@ int vfs_follow_link(struct nameidata *nd return __vfs_follow_link(nd, link); } @@ -4598,13 +4597,11 @@ diff -NurpP --minimal linux-3.6.6/fs/namei.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow + return do_splice_direct(in, &ppos, out, len, 0); +} + -+extern unsigned int mnt_get_count(struct mount *mnt); -+ +struct dentry *cow_break_link(const char *pathname) +{ + int ret, mode, pathlen, redo = 0; + struct nameidata old_nd, dir_nd; -+ struct path old_path, dir_path; ++ struct path dir_path, *old_path, *new_path; + struct dentry *dir, *old_dentry, *new_dentry = NULL; + struct file *old_file; + struct file *new_file; @@ -4613,24 +4610,26 @@ diff -NurpP --minimal linux-3.6.6/fs/namei.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow + + vxdprintk(VXD_CBIT(misc, 1), + "cow_break_link(" VS_Q("%s") ")", pathname); ++ + path = kmalloc(PATH_MAX, GFP_KERNEL); + ret = -ENOMEM; + if (!path) + goto out; + -+ /* old_nd will have refs to dentry and mnt */ ++ /* old_nd.path will have refs to dentry and mnt */ + ret = do_path_lookup(AT_FDCWD, pathname, LOOKUP_FOLLOW, &old_nd); + vxdprintk(VXD_CBIT(misc, 2), -+ "do_path_lookup(old): %d [r=%d]", -+ ret, mnt_get_count(real_mount(old_nd.path.mnt))); ++ "do_path_lookup(old): %d", ret); + if (ret < 0) + goto out_free_path; + -+ old_path = old_nd.path; -+ old_dentry = old_path.dentry; -+ mode = old_dentry->d_inode->i_mode; ++ /* dentry/mnt refs handed over to old_path */ ++ old_path = &old_nd.path; ++ /* no explicit reference for old_dentry here */ ++ old_dentry = old_path->dentry; + -+ to = d_path(&old_path, path, PATH_MAX-2); ++ mode = old_dentry->d_inode->i_mode; ++ to = d_path(old_path, path, PATH_MAX-2); + pathlen = strlen(to); + vxdprintk(VXD_CBIT(misc, 2), + "old path " VS_Q("%s") " [%p:" VS_Q("%.*s") ":%d]", to, @@ -4647,14 +4646,17 @@ diff -NurpP --minimal linux-3.6.6/fs/namei.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow + goto out_rel_old; + + vxdprintk(VXD_CBIT(misc, 1), "temp copy " VS_Q("%s"), to); -+ /* dir_nd will have refs to dentry and mnt */ ++ ++ /* dir_nd.path will have refs to dentry and mnt */ + ret = do_path_lookup(AT_FDCWD, to, + LOOKUP_PARENT | LOOKUP_OPEN | LOOKUP_CREATE, &dir_nd); + vxdprintk(VXD_CBIT(misc, 2), "do_path_lookup(new): %d", ret); + if (ret < 0) + goto retry; + -+ /* this puppy downs the dir inode mutex if successful */ ++ /* this puppy downs the dir inode mutex if successful. ++ dir_path will hold refs to dentry and mnt and ++ we'll have get write access to the mnt */ + new_dentry = kern_path_create(AT_FDCWD, to, &dir_path, 0); + if (!new_dentry || IS_ERR(new_dentry)) { + path_put(&dir_nd.path); @@ -4663,22 +4665,36 @@ diff -NurpP --minimal linux-3.6.6/fs/namei.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow + PTR_ERR(new_dentry)); + goto retry; + } -+ path_put(&dir_path); + vxdprintk(VXD_CBIT(misc, 2), + "kern_path_create(new): %p [" VS_Q("%.*s") ":%d]", + new_dentry, + new_dentry->d_name.len, new_dentry->d_name.name, + new_dentry->d_name.len); + ++ /* take a reference on new_dentry */ ++ dget(new_dentry); ++ ++ /* dentry/mnt refs handed over to new_path */ ++ new_path = &dir_path; ++ ++ /* dentry for old/new dir */ + dir = dir_nd.path.dentry; + -+ ret = vfs_create(dir->d_inode, new_dentry, mode, &dir_nd); ++ /* give up reference on dir */ ++ dput(new_path->dentry); ++ ++ /* new_dentry already has a reference */ ++ new_path->dentry = new_dentry; ++ ++ ret = vfs_create(dir->d_inode, new_dentry, mode, 1); + vxdprintk(VXD_CBIT(misc, 2), + "vfs_create(new): %d", ret); + if (ret == -EEXIST) { + mutex_unlock(&dir->d_inode->i_mutex); + path_put(&dir_nd.path); -+ dput(new_dentry); ++ mnt_drop_write(new_path->mnt); ++ path_put(new_path); ++ new_dentry = NULL; + goto retry; + } + else if (ret < 0) @@ -4689,10 +4705,8 @@ diff -NurpP --minimal linux-3.6.6/fs/namei.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow + if ((redo = d_unhashed(old_dentry))) + goto out_unlock_new; + -+ path_get(&old_path); -+ /* this one cleans up the dentry/mnt in case of failure */ -+ old_file = dentry_open(old_dentry, old_path.mnt, -+ O_RDONLY, current_cred()); ++ /* doesn't change refs for old_path */ ++ old_file = dentry_open(old_path, O_RDONLY, current_cred()); + vxdprintk(VXD_CBIT(misc, 2), + "dentry_open(old): %p", old_file); + if (IS_ERR(old_file)) { @@ -4700,11 +4714,8 @@ diff -NurpP --minimal linux-3.6.6/fs/namei.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow + goto out_unlock_new; + } + -+ dget(new_dentry); -+ mntget(old_path.mnt); -+ /* this one cleans up the dentry/mnt in case of failure */ -+ new_file = dentry_open(new_dentry, old_path.mnt, -+ O_WRONLY, current_cred()); ++ /* doesn't change refs for new_path */ ++ new_file = dentry_open(new_path, O_WRONLY, current_cred()); + vxdprintk(VXD_CBIT(misc, 2), + "dentry_open(new): %p", new_file); + if (IS_ERR(new_file)) { @@ -4733,6 +4744,7 @@ diff -NurpP --minimal linux-3.6.6/fs/namei.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow + mark_inode_dirty(new_inode); + } + ++ /* lock rename mutex */ + mutex_lock(&old_dentry->d_inode->i_sb->s_vfs_rename_mutex); + + /* drop out late */ @@ -4766,6 +4778,13 @@ diff -NurpP --minimal linux-3.6.6/fs/namei.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow + fput(old_file); + +out_unlock_new: ++ /* drop references from dir_nd.path */ ++ path_put(&dir_nd.path); ++ ++ /* drop write access to mnt */ ++ mnt_drop_write(new_path->mnt); ++ ++ /* unlock the inode mutex from kern_path_create() */ + mutex_unlock(&dir->d_inode->i_mutex); + if (!ret) + goto out_redo; @@ -4776,25 +4795,28 @@ diff -NurpP --minimal linux-3.6.6/fs/namei.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow +out_redo: + if (!redo) + goto out_rel_both; -+ /* lookup dentry once again */ -+ /* old_nd.path is freed as old_path in out_rel_old */ ++ ++ /* lookup dentry once again ++ old_nd.path will be freed as old_path in out_rel_old */ + ret = do_path_lookup(AT_FDCWD, pathname, LOOKUP_FOLLOW, &old_nd); + if (ret) + goto out_rel_both; + ++ /* drop reference on new_dentry */ + dput(new_dentry); -+ new_dentry = old_nd.path.dentry; ++ new_dentry = old_path->dentry; ++ dget(new_dentry); + vxdprintk(VXD_CBIT(misc, 2), + "do_path_lookup(redo): %p [" VS_Q("%.*s") ":%d]", + new_dentry, + new_dentry->d_name.len, new_dentry->d_name.name, + new_dentry->d_name.len); -+ dget(new_dentry); + +out_rel_both: -+ path_put(&dir_nd.path); ++ if (new_path) ++ path_put(new_path); +out_rel_old: -+ path_put(&old_path); ++ path_put(old_path); +out_free_path: + kfree(path); +out: @@ -4803,8 +4825,7 @@ diff -NurpP --minimal linux-3.6.6/fs/namei.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow + new_dentry = ERR_PTR(ret); + } + vxdprintk(VXD_CBIT(misc, 3), -+ "cow_break_link returning with %p [r=%d]", -+ new_dentry, mnt_get_count(real_mount(old_nd.path.mnt))); ++ "cow_break_link returning with %p", new_dentry); + return new_dentry; +} + @@ -4837,14 +4858,14 @@ diff -NurpP --minimal linux-3.6.6/fs/namei.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow /* get the link contents into pagecache */ static char *page_getlink(struct dentry * dentry, struct page **ppage) { -@@ -3998,3 +4388,4 @@ EXPORT_SYMBOL(vfs_symlink); +@@ -3998,3 +4409,4 @@ EXPORT_SYMBOL(vfs_symlink); EXPORT_SYMBOL(vfs_unlink); EXPORT_SYMBOL(dentry_unhash); EXPORT_SYMBOL(generic_readlink); +EXPORT_SYMBOL(vx_info_mnt_namespace); -diff -NurpP --minimal linux-3.6.6/fs/namespace.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/namespace.c ---- linux-3.6.6/fs/namespace.c 2012-10-04 15:27:40.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/namespace.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/namespace.c linux-3.6.9-vs2.3.4.4/fs/namespace.c +--- linux-3.6.9/fs/namespace.c 2012-10-04 15:27:40.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/namespace.c 2012-12-08 01:10:23.000000000 +0100 @@ -20,6 +20,11 @@ #include /* get_fs_root et.al. */ #include /* fsnotify_vfsmount_delete */ @@ -4916,7 +4937,7 @@ diff -NurpP --minimal linux-3.6.6/fs/namespace.c linux-3.6.6-vs2.3.4.3.1-noxfs-n */ static int do_loopback(struct path *path, char *old_name, - int recurse) -+ vserver_tag_t tag, unsigned long flags, int mnt_flags) ++ vs_tag_t tag, unsigned long flags, int mnt_flags) { LIST_HEAD(umount_list); struct path old_path; @@ -4965,7 +4986,7 @@ diff -NurpP --minimal linux-3.6.6/fs/namespace.c linux-3.6.6-vs2.3.4.3.1-noxfs-n struct path path; int retval = 0; int mnt_flags = 0; -+ vserver_tag_t tag = 0; ++ vs_tag_t tag = 0; /* Discard magic */ if ((flags & MS_MGC_MSK) == MS_MGC_VAL) @@ -5031,9 +5052,9 @@ diff -NurpP --minimal linux-3.6.6/fs/namespace.c linux-3.6.6-vs2.3.4.3.1-noxfs-n kfree(ns); } -diff -NurpP --minimal linux-3.6.6/fs/nfs/client.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/nfs/client.c ---- linux-3.6.6/fs/nfs/client.c 2012-11-06 18:42:13.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/nfs/client.c 2012-11-06 18:43:41.000000000 +0100 +diff -NurpP --minimal linux-3.6.9/fs/nfs/client.c linux-3.6.9-vs2.3.4.4/fs/nfs/client.c +--- linux-3.6.9/fs/nfs/client.c 2012-12-08 01:34:14.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/fs/nfs/client.c 2012-11-06 18:43:41.000000000 +0100 @@ -692,6 +692,9 @@ int nfs_init_server_rpcclient(struct nfs if (server->flags & NFS_MOUNT_SOFT) server->client->cl_softrtry = 1; @@ -5055,9 +5076,9 @@ diff -NurpP --minimal linux-3.6.6/fs/nfs/client.c linux-3.6.6-vs2.3.4.3.1-noxfs- server->maxfilesize = fsinfo->maxfilesize; server->time_delta = fsinfo->time_delta; -diff -NurpP --minimal linux-3.6.6/fs/nfs/dir.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/nfs/dir.c ---- linux-3.6.6/fs/nfs/dir.c 2012-10-04 15:27:40.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/nfs/dir.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/nfs/dir.c linux-3.6.9-vs2.3.4.4/fs/nfs/dir.c +--- linux-3.6.9/fs/nfs/dir.c 2012-10-04 15:27:40.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/nfs/dir.c 2012-10-04 18:47:00.000000000 +0200 @@ -36,6 +36,7 @@ #include #include @@ -5074,9 +5095,9 @@ diff -NurpP --minimal linux-3.6.6/fs/nfs/dir.c linux-3.6.6-vs2.3.4.3.1-noxfs-noc no_entry: res = d_materialise_unique(dentry, inode); if (res != NULL) { -diff -NurpP --minimal linux-3.6.6/fs/nfs/inode.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/nfs/inode.c ---- linux-3.6.6/fs/nfs/inode.c 2012-10-04 15:27:40.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/nfs/inode.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/nfs/inode.c linux-3.6.9-vs2.3.4.4/fs/nfs/inode.c +--- linux-3.6.9/fs/nfs/inode.c 2012-10-04 15:27:40.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/nfs/inode.c 2012-10-04 18:47:00.000000000 +0200 @@ -39,6 +39,7 @@ #include #include @@ -5146,7 +5167,7 @@ diff -NurpP --minimal linux-3.6.6/fs/nfs/inode.c linux-3.6.6-vs2.3.4.3.1-noxfs-n unsigned long invalid = 0; + uid_t uid; + gid_t gid; -+ vserver_tag_t tag; ++ vs_tag_t tag; if (nfs_have_delegated_attributes(inode)) @@ -5177,7 +5198,7 @@ diff -NurpP --minimal linux-3.6.6/fs/nfs/inode.c linux-3.6.6-vs2.3.4.3.1-noxfs-n unsigned long save_cache_validity; + uid_t uid; + gid_t gid; -+ vserver_tag_t tag; ++ vs_tag_t tag; dfprintk(VFS, "NFS: %s(%s/%ld fh_crc=0x%08x ct=%d info=0x%x)\n", __func__, inode->i_sb->s_id, inode->i_ino, @@ -5226,9 +5247,9 @@ diff -NurpP --minimal linux-3.6.6/fs/nfs/inode.c linux-3.6.6-vs2.3.4.3.1-noxfs-n if (fattr->valid & NFS_ATTR_FATTR_NLINK) { if (inode->i_nlink != fattr->nlink) { invalid |= NFS_INO_INVALID_ATTR; -diff -NurpP --minimal linux-3.6.6/fs/nfs/nfs3xdr.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/nfs/nfs3xdr.c ---- linux-3.6.6/fs/nfs/nfs3xdr.c 2012-10-04 15:27:40.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/nfs/nfs3xdr.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/nfs/nfs3xdr.c linux-3.6.9-vs2.3.4.4/fs/nfs/nfs3xdr.c +--- linux-3.6.9/fs/nfs/nfs3xdr.c 2012-10-04 15:27:40.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/nfs/nfs3xdr.c 2012-10-04 18:47:00.000000000 +0200 @@ -20,6 +20,7 @@ #include #include @@ -5374,9 +5395,9 @@ diff -NurpP --minimal linux-3.6.6/fs/nfs/nfs3xdr.c linux-3.6.6-vs2.3.4.3.1-noxfs } /* -diff -NurpP --minimal linux-3.6.6/fs/nfs/super.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/nfs/super.c ---- linux-3.6.6/fs/nfs/super.c 2012-10-04 15:27:40.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/nfs/super.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/nfs/super.c linux-3.6.9-vs2.3.4.4/fs/nfs/super.c +--- linux-3.6.9/fs/nfs/super.c 2012-12-08 01:34:14.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/fs/nfs/super.c 2012-12-08 01:36:33.000000000 +0100 @@ -54,6 +54,7 @@ #include #include @@ -5448,9 +5469,9 @@ diff -NurpP --minimal linux-3.6.6/fs/nfs/super.c linux-3.6.6-vs2.3.4.3.1-noxfs-n /* * options that take text values -diff -NurpP --minimal linux-3.6.6/fs/nfsd/auth.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/nfsd/auth.c ---- linux-3.6.6/fs/nfsd/auth.c 2012-07-22 23:39:41.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/nfsd/auth.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/nfsd/auth.c linux-3.6.9-vs2.3.4.4/fs/nfsd/auth.c +--- linux-3.6.9/fs/nfsd/auth.c 2012-07-22 23:39:41.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/nfsd/auth.c 2012-10-04 18:47:00.000000000 +0200 @@ -2,6 +2,7 @@ #include @@ -5469,9 +5490,9 @@ diff -NurpP --minimal linux-3.6.6/fs/nfsd/auth.c linux-3.6.6-vs2.3.4.3.1-noxfs-n rqgi = rqstp->rq_cred.cr_group_info; -diff -NurpP --minimal linux-3.6.6/fs/nfsd/nfs3xdr.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/nfsd/nfs3xdr.c ---- linux-3.6.6/fs/nfsd/nfs3xdr.c 2012-05-21 18:07:26.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/nfsd/nfs3xdr.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/nfsd/nfs3xdr.c linux-3.6.9-vs2.3.4.4/fs/nfsd/nfs3xdr.c +--- linux-3.6.9/fs/nfsd/nfs3xdr.c 2012-05-21 18:07:26.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/nfsd/nfs3xdr.c 2012-10-04 18:47:00.000000000 +0200 @@ -7,6 +7,7 @@ */ @@ -5522,9 +5543,9 @@ diff -NurpP --minimal linux-3.6.6/fs/nfsd/nfs3xdr.c linux-3.6.6-vs2.3.4.3.1-noxf if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) { p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN); } else { -diff -NurpP --minimal linux-3.6.6/fs/nfsd/nfs4xdr.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/nfsd/nfs4xdr.c ---- linux-3.6.6/fs/nfsd/nfs4xdr.c 2012-10-04 15:27:40.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/nfsd/nfs4xdr.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/nfsd/nfs4xdr.c linux-3.6.9-vs2.3.4.4/fs/nfsd/nfs4xdr.c +--- linux-3.6.9/fs/nfsd/nfs4xdr.c 2012-10-04 15:27:40.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/nfsd/nfs4xdr.c 2012-10-04 18:47:00.000000000 +0200 @@ -46,6 +46,7 @@ #include #include @@ -5554,9 +5575,9 @@ diff -NurpP --minimal linux-3.6.6/fs/nfsd/nfs4xdr.c linux-3.6.6-vs2.3.4.3.1-noxf if (status == nfserr_resource) goto out_resource; if (status) -diff -NurpP --minimal linux-3.6.6/fs/nfsd/nfsxdr.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/nfsd/nfsxdr.c ---- linux-3.6.6/fs/nfsd/nfsxdr.c 2011-05-22 16:17:53.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/nfsd/nfsxdr.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/nfsd/nfsxdr.c linux-3.6.9-vs2.3.4.4/fs/nfsd/nfsxdr.c +--- linux-3.6.9/fs/nfsd/nfsxdr.c 2011-05-22 16:17:53.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/nfsd/nfsxdr.c 2012-10-04 18:47:00.000000000 +0200 @@ -6,6 +6,7 @@ #include "xdr.h" @@ -5605,9 +5626,9 @@ diff -NurpP --minimal linux-3.6.6/fs/nfsd/nfsxdr.c linux-3.6.6-vs2.3.4.3.1-noxfs if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) { *p++ = htonl(NFS_MAXPATHLEN); -diff -NurpP --minimal linux-3.6.6/fs/ocfs2/dlmglue.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ocfs2/dlmglue.c ---- linux-3.6.6/fs/ocfs2/dlmglue.c 2012-07-22 23:39:41.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ocfs2/dlmglue.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/ocfs2/dlmglue.c linux-3.6.9-vs2.3.4.4/fs/ocfs2/dlmglue.c +--- linux-3.6.9/fs/ocfs2/dlmglue.c 2012-07-22 23:39:41.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/ocfs2/dlmglue.c 2012-10-04 18:47:00.000000000 +0200 @@ -2047,6 +2047,7 @@ static void __ocfs2_stuff_meta_lvb(struc lvb->lvb_iclusters = cpu_to_be32(oi->ip_clusters); lvb->lvb_iuid = cpu_to_be32(inode->i_uid); @@ -5624,9 +5645,9 @@ diff -NurpP --minimal linux-3.6.6/fs/ocfs2/dlmglue.c linux-3.6.6-vs2.3.4.3.1-nox inode->i_mode = be16_to_cpu(lvb->lvb_imode); set_nlink(inode, be16_to_cpu(lvb->lvb_inlink)); ocfs2_unpack_timespec(&inode->i_atime, -diff -NurpP --minimal linux-3.6.6/fs/ocfs2/dlmglue.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ocfs2/dlmglue.h ---- linux-3.6.6/fs/ocfs2/dlmglue.h 2010-10-21 13:07:50.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ocfs2/dlmglue.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/ocfs2/dlmglue.h linux-3.6.9-vs2.3.4.4/fs/ocfs2/dlmglue.h +--- linux-3.6.9/fs/ocfs2/dlmglue.h 2010-10-21 13:07:50.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/ocfs2/dlmglue.h 2012-10-04 18:47:00.000000000 +0200 @@ -46,7 +46,8 @@ struct ocfs2_meta_lvb { __be16 lvb_inlink; __be32 lvb_iattr; @@ -5637,9 +5658,9 @@ diff -NurpP --minimal linux-3.6.6/fs/ocfs2/dlmglue.h linux-3.6.6-vs2.3.4.3.1-nox }; #define OCFS2_QINFO_LVB_VERSION 1 -diff -NurpP --minimal linux-3.6.6/fs/ocfs2/file.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ocfs2/file.c ---- linux-3.6.6/fs/ocfs2/file.c 2012-10-04 15:27:41.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ocfs2/file.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/ocfs2/file.c linux-3.6.9-vs2.3.4.4/fs/ocfs2/file.c +--- linux-3.6.9/fs/ocfs2/file.c 2012-10-04 15:27:41.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/ocfs2/file.c 2012-10-04 18:47:00.000000000 +0200 @@ -1123,7 +1123,7 @@ int ocfs2_setattr(struct dentry *dentry, attr->ia_valid &= ~ATTR_SIZE; @@ -5649,9 +5670,9 @@ diff -NurpP --minimal linux-3.6.6/fs/ocfs2/file.c linux-3.6.6-vs2.3.4.3.1-noxfs- if (!(attr->ia_valid & OCFS2_VALID_ATTRS)) return 0; -diff -NurpP --minimal linux-3.6.6/fs/ocfs2/inode.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ocfs2/inode.c ---- linux-3.6.6/fs/ocfs2/inode.c 2012-07-22 23:39:41.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ocfs2/inode.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/ocfs2/inode.c linux-3.6.9-vs2.3.4.4/fs/ocfs2/inode.c +--- linux-3.6.9/fs/ocfs2/inode.c 2012-07-22 23:39:41.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/ocfs2/inode.c 2012-10-04 18:47:00.000000000 +0200 @@ -28,6 +28,7 @@ #include #include @@ -5748,9 +5769,9 @@ diff -NurpP --minimal linux-3.6.6/fs/ocfs2/inode.c linux-3.6.6-vs2.3.4.3.1-noxfs /* Fast symlinks will have i_size but no allocated clusters. */ if (S_ISLNK(inode->i_mode) && !fe->i_clusters) { -diff -NurpP --minimal linux-3.6.6/fs/ocfs2/inode.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ocfs2/inode.h ---- linux-3.6.6/fs/ocfs2/inode.h 2012-01-09 16:14:55.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ocfs2/inode.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/ocfs2/inode.h linux-3.6.9-vs2.3.4.4/fs/ocfs2/inode.h +--- linux-3.6.9/fs/ocfs2/inode.h 2012-01-09 16:14:55.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/fs/ocfs2/inode.h 2012-10-04 18:47:00.000000000 +0200 @@ -154,6 +154,7 @@ struct buffer_head *ocfs2_bread(struct i void ocfs2_set_inode_flags(struct inode *inode); @@ -5759,9 +5780,9 @@ diff -NurpP --minimal linux-3.6.6/fs/ocfs2/inode.h linux-3.6.6-vs2.3.4.3.1-noxfs static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode) { -diff -NurpP --minimal linux-3.6.6/fs/ocfs2/ioctl.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ocfs2/ioctl.c ---- linux-3.6.6/fs/ocfs2/ioctl.c 2012-10-04 15:27:41.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ocfs2/ioctl.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/ocfs2/ioctl.c linux-3.6.9-vs2.3.4.4/fs/ocfs2/ioctl.c +--- linux-3.6.9/fs/ocfs2/ioctl.c 2012-10-04 15:27:41.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/ocfs2/ioctl.c 2012-10-04 18:47:00.000000000 +0200 @@ -76,7 +76,41 @@ static int ocfs2_get_inode_attr(struct i return status; } @@ -5825,9 +5846,9 @@ diff -NurpP --minimal linux-3.6.6/fs/ocfs2/ioctl.c linux-3.6.6-vs2.3.4.3.1-noxfs 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.6.6/fs/ocfs2/namei.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ocfs2/namei.c ---- linux-3.6.6/fs/ocfs2/namei.c 2012-10-04 15:27:41.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ocfs2/namei.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/ocfs2/namei.c linux-3.6.9-vs2.3.4.4/fs/ocfs2/namei.c +--- linux-3.6.9/fs/ocfs2/namei.c 2012-10-04 15:27:41.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/ocfs2/namei.c 2012-10-04 18:47:00.000000000 +0200 @@ -41,6 +41,7 @@ #include #include @@ -5840,7 +5861,7 @@ diff -NurpP --minimal linux-3.6.6/fs/ocfs2/namei.c linux-3.6.6-vs2.3.4.3.1-noxfs struct ocfs2_dinode *fe = NULL; struct ocfs2_extent_list *fel; u16 feat; -+ vserver_tag_t tag; ++ vs_tag_t tag; *new_fe_bh = NULL; @@ -5858,9 +5879,9 @@ diff -NurpP --minimal linux-3.6.6/fs/ocfs2/namei.c linux-3.6.6-vs2.3.4.3.1-noxfs 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.6.6/fs/ocfs2/ocfs2.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ocfs2/ocfs2.h ---- linux-3.6.6/fs/ocfs2/ocfs2.h 2012-01-09 16:14:55.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ocfs2/ocfs2.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/ocfs2/ocfs2.h linux-3.6.9-vs2.3.4.4/fs/ocfs2/ocfs2.h +--- linux-3.6.9/fs/ocfs2/ocfs2.h 2012-01-09 16:14:55.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/fs/ocfs2/ocfs2.h 2012-10-04 18:47:00.000000000 +0200 @@ -272,6 +272,7 @@ enum ocfs2_mount_options writes */ OCFS2_MOUNT_HB_NONE = 1 << 13, /* No heartbeat */ @@ -5869,9 +5890,9 @@ diff -NurpP --minimal linux-3.6.6/fs/ocfs2/ocfs2.h linux-3.6.6-vs2.3.4.3.1-noxfs }; #define OCFS2_OSB_SOFT_RO 0x0001 -diff -NurpP --minimal linux-3.6.6/fs/ocfs2/ocfs2_fs.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ocfs2/ocfs2_fs.h ---- linux-3.6.6/fs/ocfs2/ocfs2_fs.h 2011-05-22 16:17:53.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ocfs2/ocfs2_fs.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/ocfs2/ocfs2_fs.h linux-3.6.9-vs2.3.4.4/fs/ocfs2/ocfs2_fs.h +--- linux-3.6.9/fs/ocfs2/ocfs2_fs.h 2011-05-22 16:17:53.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/ocfs2/ocfs2_fs.h 2012-10-04 18:47:00.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 */ @@ -5884,9 +5905,9 @@ diff -NurpP --minimal linux-3.6.6/fs/ocfs2/ocfs2_fs.h linux-3.6.6-vs2.3.4.3.1-no #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.6.6/fs/ocfs2/super.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ocfs2/super.c ---- linux-3.6.6/fs/ocfs2/super.c 2012-05-21 18:07:26.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/ocfs2/super.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/ocfs2/super.c linux-3.6.9-vs2.3.4.4/fs/ocfs2/super.c +--- linux-3.6.9/fs/ocfs2/super.c 2012-05-21 18:07:26.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/ocfs2/super.c 2012-10-04 18:47:00.000000000 +0200 @@ -185,6 +185,7 @@ enum { Opt_coherency_full, Opt_resv_level, @@ -5950,9 +5971,9 @@ diff -NurpP --minimal linux-3.6.6/fs/ocfs2/super.c linux-3.6.6-vs2.3.4.3.1-noxfs default: mlog(ML_ERROR, "Unrecognized mount option \"%s\" " -diff -NurpP --minimal linux-3.6.6/fs/open.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/open.c ---- linux-3.6.6/fs/open.c 2012-10-04 15:27:41.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/open.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/open.c linux-3.6.9-vs2.3.4.4/fs/open.c +--- linux-3.6.9/fs/open.c 2012-10-04 15:27:41.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/open.c 2012-10-04 18:47:00.000000000 +0200 @@ -30,6 +30,11 @@ #include #include @@ -6032,9 +6053,9 @@ diff -NurpP --minimal linux-3.6.6/fs/open.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/ } void put_unused_fd(unsigned int fd) -diff -NurpP --minimal linux-3.6.6/fs/proc/array.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/proc/array.c ---- linux-3.6.6/fs/proc/array.c 2012-07-22 23:39:42.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/proc/array.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/proc/array.c linux-3.6.9-vs2.3.4.4/fs/proc/array.c +--- linux-3.6.9/fs/proc/array.c 2012-07-22 23:39:42.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/proc/array.c 2012-10-04 18:47:00.000000000 +0200 @@ -82,6 +82,8 @@ #include #include @@ -6148,9 +6169,9 @@ diff -NurpP --minimal linux-3.6.6/fs/proc/array.c linux-3.6.6-vs2.3.4.3.1-noxfs- seq_printf(m, "%d (%s) %c", pid_nr_ns(pid, ns), tcomm, state); seq_put_decimal_ll(m, ' ', ppid); seq_put_decimal_ll(m, ' ', pgid); -diff -NurpP --minimal linux-3.6.6/fs/proc/base.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/proc/base.c ---- linux-3.6.6/fs/proc/base.c 2012-10-04 15:27:41.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/proc/base.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/proc/base.c linux-3.6.9-vs2.3.4.4/fs/proc/base.c +--- linux-3.6.9/fs/proc/base.c 2012-10-04 15:27:41.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/proc/base.c 2012-10-04 18:47:00.000000000 +0200 @@ -85,6 +85,8 @@ #include #include @@ -6183,7 +6204,7 @@ diff -NurpP --minimal linux-3.6.6/fs/proc/base.c linux-3.6.6-vs2.3.4.3.1-noxfs-n rcu_read_unlock(); } + /* procfs is xid tagged */ -+ inode->i_tag = (vserver_tag_t)vx_task_xid(task); ++ inode->i_tag = (vs_tag_t)vx_task_xid(task); security_task_to_inode(task, inode); out: @@ -6312,9 +6333,9 @@ diff -NurpP --minimal linux-3.6.6/fs/proc/base.c linux-3.6.6-vs2.3.4.3.1-noxfs-n ns = dentry->d_sb->s_fs_info; rcu_read_lock(); -diff -NurpP --minimal linux-3.6.6/fs/proc/generic.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/proc/generic.c ---- linux-3.6.6/fs/proc/generic.c 2012-10-04 15:27:41.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/proc/generic.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/proc/generic.c linux-3.6.9-vs2.3.4.4/fs/proc/generic.c +--- linux-3.6.9/fs/proc/generic.c 2012-10-04 15:27:41.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/proc/generic.c 2012-10-04 18:47:00.000000000 +0200 @@ -22,6 +22,7 @@ #include #include @@ -6374,9 +6395,9 @@ diff -NurpP --minimal linux-3.6.6/fs/proc/generic.c linux-3.6.6-vs2.3.4.3.1-noxf } else { kfree(ent); ent = NULL; -diff -NurpP --minimal linux-3.6.6/fs/proc/inode.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/proc/inode.c ---- linux-3.6.6/fs/proc/inode.c 2012-07-22 23:39:42.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/proc/inode.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/proc/inode.c linux-3.6.9-vs2.3.4.4/fs/proc/inode.c +--- linux-3.6.9/fs/proc/inode.c 2012-07-22 23:39:42.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/proc/inode.c 2012-10-04 18:47:00.000000000 +0200 @@ -458,6 +458,8 @@ struct inode *proc_get_inode(struct supe inode->i_uid = de->uid; inode->i_gid = de->gid; @@ -6386,9 +6407,9 @@ diff -NurpP --minimal linux-3.6.6/fs/proc/inode.c linux-3.6.6-vs2.3.4.3.1-noxfs- if (de->size) inode->i_size = de->size; if (de->nlink) -diff -NurpP --minimal linux-3.6.6/fs/proc/internal.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/proc/internal.h ---- linux-3.6.6/fs/proc/internal.h 2012-10-04 15:27:41.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/proc/internal.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/proc/internal.h linux-3.6.9-vs2.3.4.4/fs/proc/internal.h +--- linux-3.6.9/fs/proc/internal.h 2012-10-04 15:27:41.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/proc/internal.h 2012-10-04 18:47:00.000000000 +0200 @@ -10,6 +10,8 @@ */ @@ -6426,9 +6447,9 @@ diff -NurpP --minimal linux-3.6.6/fs/proc/internal.h linux-3.6.6-vs2.3.4.3.1-nox static inline int proc_fd(struct inode *inode) { return PROC_I(inode)->fd; -diff -NurpP --minimal linux-3.6.6/fs/proc/loadavg.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/proc/loadavg.c ---- linux-3.6.6/fs/proc/loadavg.c 2009-09-10 15:26:23.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/proc/loadavg.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/proc/loadavg.c linux-3.6.9-vs2.3.4.4/fs/proc/loadavg.c +--- linux-3.6.9/fs/proc/loadavg.c 2009-09-10 15:26:23.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/proc/loadavg.c 2012-10-04 18:47:00.000000000 +0200 @@ -12,15 +12,27 @@ static int loadavg_proc_show(struct seq_file *m, void *v) @@ -6458,9 +6479,9 @@ diff -NurpP --minimal linux-3.6.6/fs/proc/loadavg.c linux-3.6.6-vs2.3.4.3.1-noxf task_active_pid_ns(current)->last_pid); return 0; } -diff -NurpP --minimal linux-3.6.6/fs/proc/meminfo.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/proc/meminfo.c ---- linux-3.6.6/fs/proc/meminfo.c 2012-01-09 16:14:55.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/proc/meminfo.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/proc/meminfo.c linux-3.6.9-vs2.3.4.4/fs/proc/meminfo.c +--- linux-3.6.9/fs/proc/meminfo.c 2012-01-09 16:14:55.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/fs/proc/meminfo.c 2012-10-04 18:47:00.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; @@ -6471,9 +6492,9 @@ diff -NurpP --minimal linux-3.6.6/fs/proc/meminfo.c linux-3.6.6-vs2.3.4.3.1-noxf total_swapcache_pages - i.bufferram; if (cached < 0) cached = 0; -diff -NurpP --minimal linux-3.6.6/fs/proc/root.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/proc/root.c ---- linux-3.6.6/fs/proc/root.c 2012-10-04 15:27:41.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/proc/root.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/proc/root.c linux-3.6.9-vs2.3.4.4/fs/proc/root.c +--- linux-3.6.9/fs/proc/root.c 2012-10-04 15:27:41.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/proc/root.c 2012-10-04 18:47:00.000000000 +0200 @@ -19,9 +19,14 @@ #include #include @@ -6505,9 +6526,9 @@ diff -NurpP --minimal linux-3.6.6/fs/proc/root.c linux-3.6.6-vs2.3.4.3.1-noxfs-n .name = "/proc", }; -diff -NurpP --minimal linux-3.6.6/fs/proc/stat.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/proc/stat.c ---- linux-3.6.6/fs/proc/stat.c 2012-11-06 18:42:13.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/proc/stat.c 2012-11-06 18:43:41.000000000 +0100 +diff -NurpP --minimal linux-3.6.9/fs/proc/stat.c linux-3.6.9-vs2.3.4.4/fs/proc/stat.c +--- linux-3.6.9/fs/proc/stat.c 2012-12-08 01:34:14.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/fs/proc/stat.c 2012-11-06 18:43:41.000000000 +0100 @@ -9,6 +9,7 @@ #include #include @@ -6527,9 +6548,9 @@ diff -NurpP --minimal linux-3.6.6/fs/proc/stat.c linux-3.6.6-vs2.3.4.3.1-noxfs-n jif = boottime.tv_sec; for_each_possible_cpu(i) { -diff -NurpP --minimal linux-3.6.6/fs/proc/uptime.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/proc/uptime.c ---- linux-3.6.6/fs/proc/uptime.c 2012-03-19 19:47:26.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/proc/uptime.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/proc/uptime.c linux-3.6.9-vs2.3.4.4/fs/proc/uptime.c +--- linux-3.6.9/fs/proc/uptime.c 2012-03-19 19:47:26.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/fs/proc/uptime.c 2012-10-04 18:47:00.000000000 +0200 @@ -5,6 +5,7 @@ #include #include @@ -6549,9 +6570,9 @@ diff -NurpP --minimal linux-3.6.6/fs/proc/uptime.c linux-3.6.6-vs2.3.4.3.1-noxfs 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.6.6/fs/proc_namespace.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/proc_namespace.c ---- linux-3.6.6/fs/proc_namespace.c 2012-10-04 15:27:41.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/proc_namespace.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/proc_namespace.c linux-3.6.9-vs2.3.4.4/fs/proc_namespace.c +--- linux-3.6.9/fs/proc_namespace.c 2012-10-04 15:27:41.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/proc_namespace.c 2012-10-04 18:47:00.000000000 +0200 @@ -44,6 +44,8 @@ static int show_sb_opts(struct seq_file { MS_SYNCHRONOUS, ",sync" }, { MS_DIRSYNC, ",dirsync" }, @@ -6661,9 +6682,9 @@ diff -NurpP --minimal linux-3.6.6/fs/proc_namespace.c linux-3.6.6-vs2.3.4.3.1-no /* file system type */ seq_puts(m, "with fstype "); show_type(m, sb); -diff -NurpP --minimal linux-3.6.6/fs/quota/dquot.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/quota/dquot.c ---- linux-3.6.6/fs/quota/dquot.c 2012-10-04 15:27:41.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/quota/dquot.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/quota/dquot.c linux-3.6.9-vs2.3.4.4/fs/quota/dquot.c +--- linux-3.6.9/fs/quota/dquot.c 2012-10-04 15:27:41.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/quota/dquot.c 2012-10-04 18:47:00.000000000 +0200 @@ -1580,6 +1580,9 @@ int __dquot_alloc_space(struct inode *in struct dquot **dquots = inode->i_dquot; int reserve = flags & DQUOT_SPACE_RESERVE; @@ -6702,9 +6723,9 @@ diff -NurpP --minimal linux-3.6.6/fs/quota/dquot.c linux-3.6.6-vs2.3.4.3.1-noxfs /* 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.6.6/fs/quota/quota.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/quota/quota.c ---- linux-3.6.6/fs/quota/quota.c 2012-10-04 15:27:41.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/quota/quota.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/quota/quota.c linux-3.6.9-vs2.3.4.4/fs/quota/quota.c +--- linux-3.6.9/fs/quota/quota.c 2012-10-04 15:27:41.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/quota/quota.c 2012-10-04 18:47:00.000000000 +0200 @@ -8,6 +8,7 @@ #include #include @@ -6792,9 +6813,9 @@ diff -NurpP --minimal linux-3.6.6/fs/quota/quota.c linux-3.6.6-vs2.3.4.3.1-noxfs if (quotactl_cmd_write(cmd)) sb = get_super_thawed(bdev); else -diff -NurpP --minimal linux-3.6.6/fs/reiserfs/file.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/reiserfs/file.c ---- linux-3.6.6/fs/reiserfs/file.c 2012-05-21 18:07:26.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/reiserfs/file.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/reiserfs/file.c linux-3.6.9-vs2.3.4.4/fs/reiserfs/file.c +--- linux-3.6.9/fs/reiserfs/file.c 2012-05-21 18:07:26.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/reiserfs/file.c 2012-10-04 18:47:00.000000000 +0200 @@ -319,5 +319,6 @@ const struct inode_operations reiserfs_f .listxattr = reiserfs_listxattr, .removexattr = reiserfs_removexattr, @@ -6802,9 +6823,9 @@ diff -NurpP --minimal linux-3.6.6/fs/reiserfs/file.c linux-3.6.6-vs2.3.4.3.1-nox + .sync_flags = reiserfs_sync_flags, .get_acl = reiserfs_get_acl, }; -diff -NurpP --minimal linux-3.6.6/fs/reiserfs/inode.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/reiserfs/inode.c ---- linux-3.6.6/fs/reiserfs/inode.c 2012-11-06 18:42:13.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/reiserfs/inode.c 2012-11-06 18:43:41.000000000 +0100 +diff -NurpP --minimal linux-3.6.9/fs/reiserfs/inode.c linux-3.6.9-vs2.3.4.4/fs/reiserfs/inode.c +--- linux-3.6.9/fs/reiserfs/inode.c 2012-12-08 01:34:14.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/fs/reiserfs/inode.c 2012-12-08 01:36:33.000000000 +0100 @@ -18,6 +18,7 @@ #include #include @@ -6882,7 +6903,7 @@ diff -NurpP --minimal linux-3.6.6/fs/reiserfs/inode.c linux-3.6.6-vs2.3.4.3.1-no set_sd_v2_mtime(sd_v2, inode->i_mtime.tv_sec); set_sd_v2_atime(sd_v2, inode->i_atime.tv_sec); set_sd_v2_ctime(sd_v2, inode->i_ctime.tv_sec); -@@ -2866,14 +2877,19 @@ int reiserfs_commit_write(struct file *f +@@ -2869,14 +2880,19 @@ int reiserfs_commit_write(struct file *f void sd_attrs_to_i_attrs(__u16 sd_attrs, struct inode *inode) { if (reiserfs_attrs(inode->i_sb)) { @@ -6906,7 +6927,7 @@ diff -NurpP --minimal linux-3.6.6/fs/reiserfs/inode.c linux-3.6.6-vs2.3.4.3.1-no if (sd_attrs & REISERFS_APPEND_FL) inode->i_flags |= S_APPEND; else -@@ -2886,6 +2902,15 @@ void sd_attrs_to_i_attrs(__u16 sd_attrs, +@@ -2889,6 +2905,15 @@ void sd_attrs_to_i_attrs(__u16 sd_attrs, REISERFS_I(inode)->i_flags |= i_nopack_mask; else REISERFS_I(inode)->i_flags &= ~i_nopack_mask; @@ -6922,7 +6943,7 @@ diff -NurpP --minimal linux-3.6.6/fs/reiserfs/inode.c linux-3.6.6-vs2.3.4.3.1-no } } -@@ -2896,6 +2921,11 @@ void i_attrs_to_sd_attrs(struct inode *i +@@ -2899,6 +2924,11 @@ void i_attrs_to_sd_attrs(struct inode *i *sd_attrs |= REISERFS_IMMUTABLE_FL; else *sd_attrs &= ~REISERFS_IMMUTABLE_FL; @@ -6934,7 +6955,7 @@ diff -NurpP --minimal linux-3.6.6/fs/reiserfs/inode.c linux-3.6.6-vs2.3.4.3.1-no if (inode->i_flags & S_SYNC) *sd_attrs |= REISERFS_SYNC_FL; else -@@ -2908,6 +2938,15 @@ void i_attrs_to_sd_attrs(struct inode *i +@@ -2911,6 +2941,15 @@ void i_attrs_to_sd_attrs(struct inode *i *sd_attrs |= REISERFS_NOTAIL_FL; else *sd_attrs &= ~REISERFS_NOTAIL_FL; @@ -6950,7 +6971,7 @@ diff -NurpP --minimal linux-3.6.6/fs/reiserfs/inode.c linux-3.6.6-vs2.3.4.3.1-no } } -@@ -3153,7 +3192,8 @@ int reiserfs_setattr(struct dentry *dent +@@ -3155,7 +3194,8 @@ int reiserfs_setattr(struct dentry *dent } if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) || @@ -6960,7 +6981,7 @@ diff -NurpP --minimal linux-3.6.6/fs/reiserfs/inode.c linux-3.6.6-vs2.3.4.3.1-no struct reiserfs_transaction_handle th; int jbegin_count = 2 * -@@ -3182,6 +3222,9 @@ int reiserfs_setattr(struct dentry *dent +@@ -3186,6 +3226,9 @@ int reiserfs_setattr(struct dentry *dent inode->i_uid = attr->ia_uid; if (attr->ia_valid & ATTR_GID) inode->i_gid = attr->ia_gid; @@ -6970,9 +6991,9 @@ diff -NurpP --minimal linux-3.6.6/fs/reiserfs/inode.c linux-3.6.6-vs2.3.4.3.1-no mark_inode_dirty(inode); error = journal_end(&th, inode->i_sb, jbegin_count); if (error) -diff -NurpP --minimal linux-3.6.6/fs/reiserfs/ioctl.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/reiserfs/ioctl.c ---- linux-3.6.6/fs/reiserfs/ioctl.c 2012-05-21 18:07:27.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/reiserfs/ioctl.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/reiserfs/ioctl.c linux-3.6.9-vs2.3.4.4/fs/reiserfs/ioctl.c +--- linux-3.6.9/fs/reiserfs/ioctl.c 2012-05-21 18:07:27.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/reiserfs/ioctl.c 2012-10-04 18:47:00.000000000 +0200 @@ -11,6 +11,21 @@ #include #include @@ -7034,9 +7055,9 @@ diff -NurpP --minimal linux-3.6.6/fs/reiserfs/ioctl.c linux-3.6.6-vs2.3.4.3.1-no sd_attrs_to_i_attrs(flags, inode); REISERFS_I(inode)->i_attrs = flags; inode->i_ctime = CURRENT_TIME_SEC; -diff -NurpP --minimal linux-3.6.6/fs/reiserfs/namei.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/reiserfs/namei.c ---- linux-3.6.6/fs/reiserfs/namei.c 2012-10-04 15:27:41.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/reiserfs/namei.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/reiserfs/namei.c linux-3.6.9-vs2.3.4.4/fs/reiserfs/namei.c +--- linux-3.6.9/fs/reiserfs/namei.c 2012-10-04 15:27:41.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/reiserfs/namei.c 2012-10-04 18:47:00.000000000 +0200 @@ -18,6 +18,7 @@ #include "acl.h" #include "xattr.h" @@ -7053,9 +7074,9 @@ diff -NurpP --minimal linux-3.6.6/fs/reiserfs/namei.c linux-3.6.6-vs2.3.4.3.1-no return d_splice_alias(inode, dentry); } -diff -NurpP --minimal linux-3.6.6/fs/reiserfs/reiserfs.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/reiserfs/reiserfs.h ---- linux-3.6.6/fs/reiserfs/reiserfs.h 2012-07-22 23:39:42.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/reiserfs/reiserfs.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/reiserfs/reiserfs.h linux-3.6.9-vs2.3.4.4/fs/reiserfs/reiserfs.h +--- linux-3.6.9/fs/reiserfs/reiserfs.h 2012-07-22 23:39:42.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/reiserfs/reiserfs.h 2012-10-04 18:47:00.000000000 +0200 @@ -549,6 +549,7 @@ enum reiserfs_mount_options { REISERFS_EXPOSE_PRIVROOT, REISERFS_BARRIER_NONE, @@ -7094,10 +7115,10 @@ diff -NurpP --minimal linux-3.6.6/fs/reiserfs/reiserfs.h linux-3.6.6-vs2.3.4.3.1 int __reiserfs_write_begin(struct page *page, unsigned from, unsigned len); -diff -NurpP --minimal linux-3.6.6/fs/reiserfs/super.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/reiserfs/super.c ---- linux-3.6.6/fs/reiserfs/super.c 2012-10-04 15:27:41.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/reiserfs/super.c 2012-10-04 18:47:00.000000000 +0200 -@@ -1018,6 +1018,14 @@ static int reiserfs_parse_options(struct +diff -NurpP --minimal linux-3.6.9/fs/reiserfs/super.c linux-3.6.9-vs2.3.4.4/fs/reiserfs/super.c +--- linux-3.6.9/fs/reiserfs/super.c 2012-12-08 01:34:14.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/fs/reiserfs/super.c 2012-12-08 01:36:33.000000000 +0100 +@@ -1020,6 +1020,14 @@ static int reiserfs_parse_options(struct {"user_xattr",.setmask = 1 << REISERFS_UNSUPPORTED_OPT}, {"nouser_xattr",.clrmask = 1 << REISERFS_UNSUPPORTED_OPT}, #endif @@ -7112,7 +7133,7 @@ diff -NurpP --minimal linux-3.6.6/fs/reiserfs/super.c linux-3.6.6-vs2.3.4.3.1-no #ifdef CONFIG_REISERFS_FS_POSIX_ACL {"acl",.setmask = 1 << REISERFS_POSIXACL}, {"noacl",.clrmask = 1 << REISERFS_POSIXACL}, -@@ -1336,6 +1344,14 @@ static int reiserfs_remount(struct super +@@ -1338,6 +1346,14 @@ static int reiserfs_remount(struct super handle_quota_files(s, qf_names, &qfmt); #endif @@ -7127,7 +7148,7 @@ diff -NurpP --minimal linux-3.6.6/fs/reiserfs/super.c linux-3.6.6-vs2.3.4.3.1-no handle_attrs(s); /* Add options that are safe here */ -@@ -1816,6 +1832,10 @@ static int reiserfs_fill_super(struct su +@@ -1831,6 +1847,10 @@ static int reiserfs_fill_super(struct su goto error_unlocked; } @@ -7138,9 +7159,9 @@ diff -NurpP --minimal linux-3.6.6/fs/reiserfs/super.c linux-3.6.6-vs2.3.4.3.1-no 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.6.6/fs/reiserfs/xattr.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/reiserfs/xattr.c ---- linux-3.6.6/fs/reiserfs/xattr.c 2012-10-04 15:27:41.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/reiserfs/xattr.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/reiserfs/xattr.c linux-3.6.9-vs2.3.4.4/fs/reiserfs/xattr.c +--- linux-3.6.9/fs/reiserfs/xattr.c 2012-10-04 15:27:41.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/reiserfs/xattr.c 2012-10-04 18:47:00.000000000 +0200 @@ -40,6 +40,7 @@ #include #include @@ -7149,9 +7170,9 @@ diff -NurpP --minimal linux-3.6.6/fs/reiserfs/xattr.c linux-3.6.6-vs2.3.4.3.1-no #include #include #include -diff -NurpP --minimal linux-3.6.6/fs/stat.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/stat.c ---- linux-3.6.6/fs/stat.c 2012-10-04 15:27:41.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/stat.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/stat.c linux-3.6.9-vs2.3.4.4/fs/stat.c +--- linux-3.6.9/fs/stat.c 2012-10-04 15:27:41.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/stat.c 2012-10-04 18:47:00.000000000 +0200 @@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod stat->nlink = inode->i_nlink; stat->uid = inode->i_uid; @@ -7160,9 +7181,9 @@ diff -NurpP --minimal linux-3.6.6/fs/stat.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/ stat->rdev = inode->i_rdev; stat->size = i_size_read(inode); stat->atime = inode->i_atime; -diff -NurpP --minimal linux-3.6.6/fs/statfs.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/statfs.c ---- linux-3.6.6/fs/statfs.c 2012-07-22 23:39:42.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/statfs.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/statfs.c linux-3.6.9-vs2.3.4.4/fs/statfs.c +--- linux-3.6.9/fs/statfs.c 2012-07-22 23:39:42.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/statfs.c 2012-10-04 18:47:00.000000000 +0200 @@ -7,6 +7,8 @@ #include #include @@ -7181,9 +7202,9 @@ diff -NurpP --minimal linux-3.6.6/fs/statfs.c linux-3.6.6-vs2.3.4.3.1-noxfs-noco return retval; } -diff -NurpP --minimal linux-3.6.6/fs/super.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/super.c ---- linux-3.6.6/fs/super.c 2012-10-04 15:27:41.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/super.c 2012-10-04 19:06:05.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/super.c linux-3.6.9-vs2.3.4.4/fs/super.c +--- linux-3.6.9/fs/super.c 2012-10-04 15:27:41.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/super.c 2012-10-04 19:06:05.000000000 +0200 @@ -34,6 +34,8 @@ #include #include @@ -7207,9 +7228,9 @@ diff -NurpP --minimal linux-3.6.6/fs/super.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow error = security_sb_kern_mount(sb, flags, secdata); if (error) goto out_sb; -diff -NurpP --minimal linux-3.6.6/fs/sysfs/mount.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/sysfs/mount.c ---- linux-3.6.6/fs/sysfs/mount.c 2012-10-04 15:27:41.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/sysfs/mount.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/sysfs/mount.c linux-3.6.9-vs2.3.4.4/fs/sysfs/mount.c +--- linux-3.6.9/fs/sysfs/mount.c 2012-10-04 15:27:41.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/sysfs/mount.c 2012-10-04 18:47:00.000000000 +0200 @@ -47,7 +47,7 @@ static int sysfs_fill_super(struct super sb->s_blocksize = PAGE_CACHE_SIZE; @@ -7219,9 +7240,9 @@ diff -NurpP --minimal linux-3.6.6/fs/sysfs/mount.c linux-3.6.6-vs2.3.4.3.1-noxfs sb->s_op = &sysfs_ops; sb->s_time_gran = 1; -diff -NurpP --minimal linux-3.6.6/fs/utimes.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/utimes.c ---- linux-3.6.6/fs/utimes.c 2012-07-22 23:39:42.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/utimes.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/utimes.c linux-3.6.9-vs2.3.4.4/fs/utimes.c +--- linux-3.6.9/fs/utimes.c 2012-07-22 23:39:42.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/utimes.c 2012-10-04 18:47:00.000000000 +0200 @@ -8,6 +8,8 @@ #include #include @@ -7251,9 +7272,9 @@ diff -NurpP --minimal linux-3.6.6/fs/utimes.c linux-3.6.6-vs2.3.4.3.1-noxfs-noco if (times && times[0].tv_nsec == UTIME_NOW && times[1].tv_nsec == UTIME_NOW) times = NULL; -diff -NurpP --minimal linux-3.6.6/fs/xattr.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/xattr.c ---- linux-3.6.6/fs/xattr.c 2012-10-04 15:27:44.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/fs/xattr.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/xattr.c linux-3.6.9-vs2.3.4.4/fs/xattr.c +--- linux-3.6.9/fs/xattr.c 2012-10-04 15:27:44.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/xattr.c 2012-10-04 18:47:00.000000000 +0200 @@ -20,6 +20,7 @@ #include #include @@ -7271,9 +7292,653 @@ diff -NurpP --minimal linux-3.6.6/fs/xattr.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow return (mask & MAY_WRITE) ? -EPERM : -ENODATA; return 0; } -diff -NurpP --minimal linux-3.6.6/include/linux/Kbuild linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/Kbuild ---- linux-3.6.6/include/linux/Kbuild 2012-10-04 15:27:45.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/Kbuild 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/fs/xfs/xfs_dinode.h linux-3.6.9-vs2.3.4.4/fs/xfs/xfs_dinode.h +--- linux-3.6.9/fs/xfs/xfs_dinode.h 2012-10-04 15:27:44.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/xfs/xfs_dinode.h 2012-10-04 18:47:00.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 */ + __be16 di_projid_hi; /* higher part owner's project id */ +- __u8 di_pad[6]; /* unused, zeroed space */ ++ __u8 di_pad[2]; /* unused, zeroed space */ ++ __be16 di_tag; /* context tagging */ ++ __be16 di_vflags; /* vserver specific flags */ + __be16 di_flushiter; /* incremented on flush */ + xfs_timestamp_t di_atime; /* time last accessed */ + xfs_timestamp_t di_mtime; /* time last modified */ +@@ -184,6 +186,8 @@ static inline void xfs_dinode_put_rdev(s + #define XFS_DIFLAG_EXTSZINHERIT_BIT 12 /* inherit inode extent size */ + #define XFS_DIFLAG_NODEFRAG_BIT 13 /* do not reorganize/defragment */ + #define XFS_DIFLAG_FILESTREAM_BIT 14 /* use filestream allocator */ ++#define XFS_DIFLAG_IXUNLINK_BIT 15 /* Immutable inver on unlink */ ++ + #define XFS_DIFLAG_REALTIME (1 << XFS_DIFLAG_REALTIME_BIT) + #define XFS_DIFLAG_PREALLOC (1 << XFS_DIFLAG_PREALLOC_BIT) + #define XFS_DIFLAG_NEWRTBM (1 << XFS_DIFLAG_NEWRTBM_BIT) +@@ -199,6 +203,7 @@ static inline void xfs_dinode_put_rdev(s + #define XFS_DIFLAG_EXTSZINHERIT (1 << XFS_DIFLAG_EXTSZINHERIT_BIT) + #define XFS_DIFLAG_NODEFRAG (1 << XFS_DIFLAG_NODEFRAG_BIT) + #define XFS_DIFLAG_FILESTREAM (1 << XFS_DIFLAG_FILESTREAM_BIT) ++#define XFS_DIFLAG_IXUNLINK (1 << XFS_DIFLAG_IXUNLINK_BIT) + + #ifdef CONFIG_XFS_RT + #define XFS_IS_REALTIME_INODE(ip) ((ip)->i_d.di_flags & XFS_DIFLAG_REALTIME) +@@ -211,6 +216,10 @@ static inline void xfs_dinode_put_rdev(s + XFS_DIFLAG_IMMUTABLE | XFS_DIFLAG_APPEND | XFS_DIFLAG_SYNC | \ + XFS_DIFLAG_NOATIME | XFS_DIFLAG_NODUMP | XFS_DIFLAG_RTINHERIT | \ + XFS_DIFLAG_PROJINHERIT | XFS_DIFLAG_NOSYMLINKS | XFS_DIFLAG_EXTSIZE | \ +- XFS_DIFLAG_EXTSZINHERIT | XFS_DIFLAG_NODEFRAG | XFS_DIFLAG_FILESTREAM) ++ XFS_DIFLAG_EXTSZINHERIT | XFS_DIFLAG_NODEFRAG | XFS_DIFLAG_FILESTREAM | \ ++ XFS_DIFLAG_IXUNLINK) ++ ++#define XFS_DIVFLAG_BARRIER 0x01 ++#define XFS_DIVFLAG_COW 0x02 + + #endif /* __XFS_DINODE_H__ */ +diff -NurpP --minimal linux-3.6.9/fs/xfs/xfs_fs.h linux-3.6.9-vs2.3.4.4/fs/xfs/xfs_fs.h +--- linux-3.6.9/fs/xfs/xfs_fs.h 2011-10-24 18:45:31.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/xfs/xfs_fs.h 2012-10-04 18:47:00.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 */ + #define XFS_XFLAG_FILESTREAM 0x00004000 /* use filestream allocator */ ++#define XFS_XFLAG_IXUNLINK 0x00008000 /* immutable invert on unlink */ ++#define XFS_XFLAG_BARRIER 0x10000000 /* chroot() barrier */ ++#define XFS_XFLAG_COW 0x20000000 /* copy on write mark */ + #define XFS_XFLAG_HASATTR 0x80000000 /* no DIFLAG for this */ + + /* +@@ -302,7 +305,8 @@ typedef struct xfs_bstat { + #define bs_projid bs_projid_lo /* (previously just bs_projid) */ + __u16 bs_forkoff; /* inode fork offset in bytes */ + __u16 bs_projid_hi; /* higher part of project id */ +- unsigned char bs_pad[10]; /* pad space, unused */ ++ unsigned char bs_pad[8]; /* pad space, unused */ ++ __u16 bs_tag; /* context tagging */ + __u32 bs_dmevmask; /* DMIG event mask */ + __u16 bs_dmstate; /* DMIG state info */ + __u16 bs_aextents; /* attribute number of extents */ +diff -NurpP --minimal linux-3.6.9/fs/xfs/xfs_ialloc.c linux-3.6.9-vs2.3.4.4/fs/xfs/xfs_ialloc.c +--- linux-3.6.9/fs/xfs/xfs_ialloc.c 2012-10-04 15:27:44.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/xfs/xfs_ialloc.c 2012-10-04 18:47:00.000000000 +0200 +@@ -37,7 +37,6 @@ + #include "xfs_error.h" + #include "xfs_bmap.h" + +- + /* + * Allocation group level functions. + */ +diff -NurpP --minimal linux-3.6.9/fs/xfs/xfs_inode.c linux-3.6.9-vs2.3.4.4/fs/xfs/xfs_inode.c +--- linux-3.6.9/fs/xfs/xfs_inode.c 2012-10-04 15:27:44.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/xfs/xfs_inode.c 2012-11-16 22:43:16.000000000 +0100 +@@ -16,6 +16,7 @@ + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + #include ++#include + + #include "xfs.h" + #include "xfs_fs.h" +@@ -563,15 +564,25 @@ xfs_iformat_btree( + STATIC void + xfs_dinode_from_disk( + xfs_icdinode_t *to, +- xfs_dinode_t *from) ++ xfs_dinode_t *from, ++ int tagged) + { ++ uint32_t uid, gid, tag; ++ + to->di_magic = be16_to_cpu(from->di_magic); + to->di_mode = be16_to_cpu(from->di_mode); + to->di_version = from ->di_version; + to->di_format = from->di_format; + to->di_onlink = be16_to_cpu(from->di_onlink); +- to->di_uid = be32_to_cpu(from->di_uid); +- to->di_gid = be32_to_cpu(from->di_gid); ++ ++ uid = be32_to_cpu(from->di_uid); ++ gid = be32_to_cpu(from->di_gid); ++ tag = be16_to_cpu(from->di_tag); ++ ++ to->di_uid = INOTAG_UID(tagged, uid, gid); ++ to->di_gid = INOTAG_GID(tagged, uid, gid); ++ to->di_tag = INOTAG_TAG(tagged, uid, gid, tag); ++ + to->di_nlink = be32_to_cpu(from->di_nlink); + to->di_projid_lo = be16_to_cpu(from->di_projid_lo); + to->di_projid_hi = be16_to_cpu(from->di_projid_hi); +@@ -593,21 +604,26 @@ xfs_dinode_from_disk( + to->di_dmevmask = be32_to_cpu(from->di_dmevmask); + to->di_dmstate = be16_to_cpu(from->di_dmstate); + to->di_flags = be16_to_cpu(from->di_flags); ++ to->di_vflags = be16_to_cpu(from->di_vflags); + to->di_gen = be32_to_cpu(from->di_gen); + } + + void + xfs_dinode_to_disk( + xfs_dinode_t *to, +- xfs_icdinode_t *from) ++ xfs_icdinode_t *from, ++ int tagged) + { + to->di_magic = cpu_to_be16(from->di_magic); + to->di_mode = cpu_to_be16(from->di_mode); + to->di_version = from ->di_version; + to->di_format = from->di_format; + to->di_onlink = cpu_to_be16(from->di_onlink); +- to->di_uid = cpu_to_be32(from->di_uid); +- to->di_gid = cpu_to_be32(from->di_gid); ++ ++ to->di_uid = cpu_to_be32(TAGINO_UID(tagged, from->di_uid, from->di_tag)); ++ to->di_gid = cpu_to_be32(TAGINO_GID(tagged, from->di_gid, from->di_tag)); ++ to->di_tag = cpu_to_be16(TAGINO_TAG(tagged, from->di_tag)); ++ + to->di_nlink = cpu_to_be32(from->di_nlink); + to->di_projid_lo = cpu_to_be16(from->di_projid_lo); + to->di_projid_hi = cpu_to_be16(from->di_projid_hi); +@@ -629,12 +645,14 @@ xfs_dinode_to_disk( + to->di_dmevmask = cpu_to_be32(from->di_dmevmask); + to->di_dmstate = cpu_to_be16(from->di_dmstate); + to->di_flags = cpu_to_be16(from->di_flags); ++ to->di_vflags = cpu_to_be16(from->di_vflags); + to->di_gen = cpu_to_be32(from->di_gen); + } + + STATIC uint + _xfs_dic2xflags( +- __uint16_t di_flags) ++ __uint16_t di_flags, ++ __uint16_t di_vflags) + { + uint flags = 0; + +@@ -645,6 +663,8 @@ _xfs_dic2xflags( + flags |= XFS_XFLAG_PREALLOC; + if (di_flags & XFS_DIFLAG_IMMUTABLE) + flags |= XFS_XFLAG_IMMUTABLE; ++ if (di_flags & XFS_DIFLAG_IXUNLINK) ++ flags |= XFS_XFLAG_IXUNLINK; + if (di_flags & XFS_DIFLAG_APPEND) + flags |= XFS_XFLAG_APPEND; + if (di_flags & XFS_DIFLAG_SYNC) +@@ -669,6 +689,10 @@ _xfs_dic2xflags( + flags |= XFS_XFLAG_FILESTREAM; + } + ++ if (di_vflags & XFS_DIVFLAG_BARRIER) ++ flags |= FS_BARRIER_FL; ++ if (di_vflags & XFS_DIVFLAG_COW) ++ flags |= FS_COW_FL; + return flags; + } + +@@ -678,7 +702,7 @@ xfs_ip2xflags( + { + xfs_icdinode_t *dic = &ip->i_d; + +- return _xfs_dic2xflags(dic->di_flags) | ++ return _xfs_dic2xflags(dic->di_flags, dic->di_vflags) | + (XFS_IFORK_Q(ip) ? XFS_XFLAG_HASATTR : 0); + } + +@@ -686,7 +710,8 @@ uint + xfs_dic2xflags( + xfs_dinode_t *dip) + { +- return _xfs_dic2xflags(be16_to_cpu(dip->di_flags)) | ++ return _xfs_dic2xflags(be16_to_cpu(dip->di_flags), ++ be16_to_cpu(dip->di_vflags)) | + (XFS_DFORK_Q(dip) ? XFS_XFLAG_HASATTR : 0); + } + +@@ -740,7 +765,8 @@ xfs_iread( + * Otherwise, just get the truly permanent information. + */ + if (dip->di_mode) { +- xfs_dinode_from_disk(&ip->i_d, dip); ++ xfs_dinode_from_disk(&ip->i_d, dip, ++ mp->m_flags & XFS_MOUNT_TAGGED); + error = xfs_iformat(ip, dip); + if (error) { + #ifdef DEBUG +@@ -927,6 +953,7 @@ xfs_ialloc( + ASSERT(ip->i_d.di_nlink == nlink); + ip->i_d.di_uid = current_fsuid(); + ip->i_d.di_gid = current_fsgid(); ++ ip->i_d.di_tag = current_fstag(&ip->i_vnode); + xfs_set_projid(ip, prid); + memset(&(ip->i_d.di_pad[0]), 0, sizeof(ip->i_d.di_pad)); + +@@ -986,6 +1013,7 @@ xfs_ialloc( + ip->i_d.di_dmevmask = 0; + ip->i_d.di_dmstate = 0; + ip->i_d.di_flags = 0; ++ ip->i_d.di_vflags = 0; + flags = XFS_ILOG_CORE; + switch (mode & S_IFMT) { + case S_IFIFO: +@@ -1667,6 +1695,7 @@ xfs_ifree( + } + ip->i_d.di_mode = 0; /* mark incore inode as free */ + ip->i_d.di_flags = 0; ++ ip->i_d.di_vflags = 0; + ip->i_d.di_dmevmask = 0; + ip->i_d.di_forkoff = 0; /* mark the attr fork not in use */ + ip->i_d.di_format = XFS_DINODE_FMT_EXTENTS; +@@ -1833,6 +1862,7 @@ xfs_iroot_realloc( + return; + } + ++#include + + /* + * This is called when the amount of space needed for if_data +@@ -2521,7 +2551,8 @@ xfs_iflush_int( + * because if the inode is dirty at all the core must + * be. + */ +- xfs_dinode_to_disk(dip, &ip->i_d); ++ xfs_dinode_to_disk(dip, &ip->i_d, ++ mp->m_flags & XFS_MOUNT_TAGGED); + + /* 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.6.9/fs/xfs/xfs_inode.h linux-3.6.9-vs2.3.4.4/fs/xfs/xfs_inode.h +--- linux-3.6.9/fs/xfs/xfs_inode.h 2012-10-04 15:27:44.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/xfs/xfs_inode.h 2012-10-04 18:47:00.000000000 +0200 +@@ -134,7 +134,9 @@ typedef struct xfs_icdinode { + __uint32_t di_nlink; /* number of links to file */ + __uint16_t di_projid_lo; /* lower part of owner's project id */ + __uint16_t di_projid_hi; /* higher part of owner's project id */ +- __uint8_t di_pad[6]; /* unused, zeroed space */ ++ __uint8_t di_pad[2]; /* unused, zeroed space */ ++ __uint16_t di_tag; /* context tagging */ ++ __uint16_t di_vflags; /* vserver specific flags */ + __uint16_t di_flushiter; /* incremented on flush */ + xfs_ictimestamp_t di_atime; /* time last accessed */ + xfs_ictimestamp_t di_mtime; /* time last modified */ +@@ -561,7 +563,7 @@ int xfs_imap_to_bp(struct xfs_mount *, + int xfs_iread(struct xfs_mount *, struct xfs_trans *, + struct xfs_inode *, uint); + void xfs_dinode_to_disk(struct xfs_dinode *, +- struct xfs_icdinode *); ++ struct xfs_icdinode *, int); + 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.6.9/fs/xfs/xfs_ioctl.c linux-3.6.9-vs2.3.4.4/fs/xfs/xfs_ioctl.c +--- linux-3.6.9/fs/xfs/xfs_ioctl.c 2012-10-04 15:27:44.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/xfs/xfs_ioctl.c 2012-10-04 18:47:00.000000000 +0200 +@@ -26,7 +26,7 @@ + #include "xfs_bmap_btree.h" + #include "xfs_dinode.h" + #include "xfs_inode.h" +-#include "xfs_ioctl.h" ++// #include "xfs_ioctl.h" + #include "xfs_rtalloc.h" + #include "xfs_itable.h" + #include "xfs_error.h" +@@ -762,6 +762,10 @@ xfs_merge_ioc_xflags( + xflags |= XFS_XFLAG_IMMUTABLE; + else + xflags &= ~XFS_XFLAG_IMMUTABLE; ++ if (flags & FS_IXUNLINK_FL) ++ xflags |= XFS_XFLAG_IXUNLINK; ++ else ++ xflags &= ~XFS_XFLAG_IXUNLINK; + if (flags & FS_APPEND_FL) + xflags |= XFS_XFLAG_APPEND; + else +@@ -790,6 +794,8 @@ xfs_di2lxflags( + + if (di_flags & XFS_DIFLAG_IMMUTABLE) + flags |= FS_IMMUTABLE_FL; ++ if (di_flags & XFS_DIFLAG_IXUNLINK) ++ flags |= FS_IXUNLINK_FL; + if (di_flags & XFS_DIFLAG_APPEND) + flags |= FS_APPEND_FL; + if (di_flags & XFS_DIFLAG_SYNC) +@@ -850,6 +856,8 @@ xfs_set_diflags( + di_flags = (ip->i_d.di_flags & XFS_DIFLAG_PREALLOC); + if (xflags & XFS_XFLAG_IMMUTABLE) + di_flags |= XFS_DIFLAG_IMMUTABLE; ++ if (xflags & XFS_XFLAG_IXUNLINK) ++ di_flags |= XFS_DIFLAG_IXUNLINK; + if (xflags & XFS_XFLAG_APPEND) + di_flags |= XFS_DIFLAG_APPEND; + if (xflags & XFS_XFLAG_SYNC) +@@ -892,6 +900,10 @@ xfs_diflags_to_linux( + inode->i_flags |= S_IMMUTABLE; + else + inode->i_flags &= ~S_IMMUTABLE; ++ if (xflags & XFS_XFLAG_IXUNLINK) ++ inode->i_flags |= S_IXUNLINK; ++ else ++ inode->i_flags &= ~S_IXUNLINK; + if (xflags & XFS_XFLAG_APPEND) + inode->i_flags |= S_APPEND; + else +@@ -1396,10 +1408,18 @@ xfs_file_ioctl( + case XFS_IOC_FSGETXATTRA: + return xfs_ioc_fsgetxattr(ip, 1, arg); + case XFS_IOC_FSSETXATTR: ++ if (IS_BARRIER(inode)) { ++ vxwprintk_task(1, "messing with the barrier."); ++ return -XFS_ERROR(EACCES); ++ } + return xfs_ioc_fssetxattr(ip, filp, arg); + case XFS_IOC_GETXFLAGS: + return xfs_ioc_getxflags(ip, arg); + case XFS_IOC_SETXFLAGS: ++ if (IS_BARRIER(inode)) { ++ vxwprintk_task(1, "messing with the barrier."); ++ return -XFS_ERROR(EACCES); ++ } + return xfs_ioc_setxflags(ip, filp, arg); + + case XFS_IOC_FSSETDM: { +diff -NurpP --minimal linux-3.6.9/fs/xfs/xfs_ioctl.h linux-3.6.9-vs2.3.4.4/fs/xfs/xfs_ioctl.h +--- linux-3.6.9/fs/xfs/xfs_ioctl.h 2011-10-24 18:45:31.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/xfs/xfs_ioctl.h 2012-10-04 18:47:00.000000000 +0200 +@@ -70,6 +70,12 @@ xfs_handle_to_dentry( + void __user *uhandle, + u32 hlen); + ++extern int ++xfs_sync_flags( ++ struct inode *inode, ++ int flags, ++ int vflags); ++ + extern long + xfs_file_ioctl( + struct file *filp, +diff -NurpP --minimal linux-3.6.9/fs/xfs/xfs_iops.c linux-3.6.9-vs2.3.4.4/fs/xfs/xfs_iops.c +--- linux-3.6.9/fs/xfs/xfs_iops.c 2012-10-04 15:27:44.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/xfs/xfs_iops.c 2012-11-16 22:14:53.000000000 +0100 +@@ -28,6 +28,7 @@ + #include "xfs_bmap_btree.h" + #include "xfs_dinode.h" + #include "xfs_inode.h" ++#include "xfs_ioctl.h" + #include "xfs_bmap.h" + #include "xfs_rtalloc.h" + #include "xfs_error.h" +@@ -46,6 +47,7 @@ + #include + #include + #include ++#include + + static int + xfs_initxattrs( +@@ -421,6 +423,7 @@ xfs_vn_getattr( + stat->nlink = ip->i_d.di_nlink; + stat->uid = ip->i_d.di_uid; + stat->gid = ip->i_d.di_gid; ++ stat->tag = ip->i_d.di_tag; + stat->ino = ip->i_ino; + stat->atime = inode->i_atime; + stat->mtime = inode->i_mtime; +@@ -1033,6 +1036,7 @@ static const struct inode_operations xfs + .listxattr = xfs_vn_listxattr, + .fiemap = xfs_vn_fiemap, + .update_time = xfs_vn_update_time, ++ .sync_flags = xfs_sync_flags, + }; + + static const struct inode_operations xfs_dir_inode_operations = { +@@ -1059,6 +1063,7 @@ static const struct inode_operations xfs + .removexattr = generic_removexattr, + .listxattr = xfs_vn_listxattr, + .update_time = xfs_vn_update_time, ++ .sync_flags = xfs_sync_flags, + }; + + static const struct inode_operations xfs_dir_ci_inode_operations = { +@@ -1110,6 +1115,10 @@ xfs_diflags_to_iflags( + inode->i_flags |= S_IMMUTABLE; + else + inode->i_flags &= ~S_IMMUTABLE; ++ if (ip->i_d.di_flags & XFS_DIFLAG_IXUNLINK) ++ inode->i_flags |= S_IXUNLINK; ++ else ++ inode->i_flags &= ~S_IXUNLINK; + if (ip->i_d.di_flags & XFS_DIFLAG_APPEND) + inode->i_flags |= S_APPEND; + else +@@ -1122,6 +1131,15 @@ xfs_diflags_to_iflags( + inode->i_flags |= S_NOATIME; + else + inode->i_flags &= ~S_NOATIME; ++ ++ if (ip->i_d.di_vflags & XFS_DIVFLAG_BARRIER) ++ inode->i_vflags |= V_BARRIER; ++ else ++ inode->i_vflags &= ~V_BARRIER; ++ if (ip->i_d.di_vflags & XFS_DIVFLAG_COW) ++ inode->i_vflags |= V_COW; ++ else ++ inode->i_vflags &= ~V_COW; + } + + /* +@@ -1153,6 +1171,7 @@ xfs_setup_inode( + set_nlink(inode, ip->i_d.di_nlink); + inode->i_uid = ip->i_d.di_uid; + inode->i_gid = ip->i_d.di_gid; ++ inode->i_tag = ip->i_d.di_tag; + + switch (inode->i_mode & S_IFMT) { + case S_IFBLK: +diff -NurpP --minimal linux-3.6.9/fs/xfs/xfs_itable.c linux-3.6.9-vs2.3.4.4/fs/xfs/xfs_itable.c +--- linux-3.6.9/fs/xfs/xfs_itable.c 2012-10-04 15:27:44.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/xfs/xfs_itable.c 2012-10-04 18:47:00.000000000 +0200 +@@ -96,6 +96,7 @@ xfs_bulkstat_one_int( + buf->bs_mode = dic->di_mode; + buf->bs_uid = dic->di_uid; + buf->bs_gid = dic->di_gid; ++ buf->bs_tag = dic->di_tag; + buf->bs_size = dic->di_size; + buf->bs_atime.tv_sec = dic->di_atime.t_sec; + buf->bs_atime.tv_nsec = dic->di_atime.t_nsec; +diff -NurpP --minimal linux-3.6.9/fs/xfs/xfs_linux.h linux-3.6.9-vs2.3.4.4/fs/xfs/xfs_linux.h +--- linux-3.6.9/fs/xfs/xfs_linux.h 2011-10-24 18:45:31.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/xfs/xfs_linux.h 2012-10-04 18:47:00.000000000 +0200 +@@ -121,6 +121,7 @@ + + #define current_cpu() (raw_smp_processor_id()) + #define current_pid() (current->pid) ++#define current_fstag(vp) (dx_current_fstag((vp)->i_sb)) + #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.6.9/fs/xfs/xfs_log_recover.c linux-3.6.9-vs2.3.4.4/fs/xfs/xfs_log_recover.c +--- linux-3.6.9/fs/xfs/xfs_log_recover.c 2012-12-08 01:34:14.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/fs/xfs/xfs_log_recover.c 2012-12-08 01:36:33.000000000 +0100 +@@ -2359,7 +2359,8 @@ xlog_recover_inode_pass2( + } + + /* The core is in in-core format */ +- xfs_dinode_to_disk(dip, item->ri_buf[1].i_addr); ++ xfs_dinode_to_disk(dip, item->ri_buf[1].i_addr, ++ mp->m_flags & XFS_MOUNT_TAGGED); + + /* the rest is in on-disk format */ + if (item->ri_buf[1].i_len > sizeof(struct xfs_icdinode)) { +diff -NurpP --minimal linux-3.6.9/fs/xfs/xfs_mount.h linux-3.6.9-vs2.3.4.4/fs/xfs/xfs_mount.h +--- linux-3.6.9/fs/xfs/xfs_mount.h 2012-10-04 15:27:44.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/xfs/xfs_mount.h 2012-10-04 18:47:00.000000000 +0200 +@@ -251,6 +251,7 @@ typedef struct xfs_mount { + allocator */ + #define XFS_MOUNT_NOATTR2 (1ULL << 25) /* disable use of attr2 format */ + ++#define XFS_MOUNT_TAGGED (1ULL << 31) /* context tagging */ + + /* + * Default minimum read and write sizes. +diff -NurpP --minimal linux-3.6.9/fs/xfs/xfs_super.c linux-3.6.9-vs2.3.4.4/fs/xfs/xfs_super.c +--- linux-3.6.9/fs/xfs/xfs_super.c 2012-10-04 15:27:44.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/xfs/xfs_super.c 2012-10-04 18:47:00.000000000 +0200 +@@ -112,6 +112,9 @@ mempool_t *xfs_ioend_pool; + #define MNTOPT_NODELAYLOG "nodelaylog" /* Delayed logging disabled */ + #define MNTOPT_DISCARD "discard" /* Discard unused blocks */ + #define MNTOPT_NODISCARD "nodiscard" /* Do not discard unused blocks */ ++#define MNTOPT_TAGXID "tagxid" /* context tagging for inodes */ ++#define MNTOPT_TAGGED "tag" /* context tagging for inodes */ ++#define MNTOPT_NOTAGTAG "notag" /* do not use context tagging */ + + /* + * Table driven mount option parser. +@@ -120,10 +123,14 @@ mempool_t *xfs_ioend_pool; + * in the future, too. + */ + enum { ++ Opt_tag, Opt_notag, + Opt_barrier, Opt_nobarrier, Opt_err + }; + + static const match_table_t tokens = { ++ {Opt_tag, "tagxid"}, ++ {Opt_tag, "tag"}, ++ {Opt_notag, "notag"}, + {Opt_barrier, "barrier"}, + {Opt_nobarrier, "nobarrier"}, + {Opt_err, NULL} +@@ -371,6 +378,19 @@ xfs_parseargs( + } else if (!strcmp(this_char, "irixsgid")) { + xfs_warn(mp, + "irixsgid is now a sysctl(2) variable, option is deprecated."); ++#ifndef CONFIG_TAGGING_NONE ++ } else if (!strcmp(this_char, MNTOPT_TAGGED)) { ++ mp->m_flags |= XFS_MOUNT_TAGGED; ++ } else if (!strcmp(this_char, MNTOPT_NOTAGTAG)) { ++ mp->m_flags &= ~XFS_MOUNT_TAGGED; ++ } else if (!strcmp(this_char, MNTOPT_TAGXID)) { ++ mp->m_flags |= XFS_MOUNT_TAGGED; ++#endif ++#ifdef CONFIG_PROPAGATE ++ } else if (!strcmp(this_char, MNTOPT_TAGGED)) { ++ /* use value */ ++ mp->m_flags |= XFS_MOUNT_TAGGED; ++#endif + } else { + xfs_warn(mp, "unknown mount option [%s].", this_char); + return EINVAL; +@@ -1056,6 +1076,16 @@ xfs_fs_remount( + case Opt_nobarrier: + mp->m_flags &= ~XFS_MOUNT_BARRIER; + break; ++ case Opt_tag: ++ if (!(sb->s_flags & MS_TAGGED)) { ++ printk(KERN_INFO ++ "XFS: %s: tagging not permitted on remount.\n", ++ sb->s_id); ++ return -EINVAL; ++ } ++ break; ++ case Opt_notag: ++ break; + default: + /* + * Logically we would return an error here to prevent +@@ -1275,6 +1305,9 @@ xfs_fs_fill_super( + if (error) + goto out_free_sb; + ++ if (mp->m_flags & XFS_MOUNT_TAGGED) ++ sb->s_flags |= MS_TAGGED; ++ + /* + * 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.6.9/fs/xfs/xfs_vnodeops.c linux-3.6.9-vs2.3.4.4/fs/xfs/xfs_vnodeops.c +--- linux-3.6.9/fs/xfs/xfs_vnodeops.c 2012-10-04 15:27:44.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/fs/xfs/xfs_vnodeops.c 2012-10-04 18:47:00.000000000 +0200 +@@ -103,6 +103,77 @@ xfs_readlink_bmap( + return error; + } + ++ ++STATIC void ++xfs_get_inode_flags( ++ xfs_inode_t *ip) ++{ ++ struct inode *inode = VFS_I(ip); ++ unsigned int flags = inode->i_flags; ++ unsigned int vflags = inode->i_vflags; ++ ++ if (flags & S_IMMUTABLE) ++ ip->i_d.di_flags |= XFS_DIFLAG_IMMUTABLE; ++ else ++ ip->i_d.di_flags &= ~XFS_DIFLAG_IMMUTABLE; ++ if (flags & S_IXUNLINK) ++ ip->i_d.di_flags |= XFS_DIFLAG_IXUNLINK; ++ else ++ ip->i_d.di_flags &= ~XFS_DIFLAG_IXUNLINK; ++ ++ if (vflags & V_BARRIER) ++ ip->i_d.di_vflags |= XFS_DIVFLAG_BARRIER; ++ else ++ ip->i_d.di_vflags &= ~XFS_DIVFLAG_BARRIER; ++ if (vflags & V_COW) ++ ip->i_d.di_vflags |= XFS_DIVFLAG_COW; ++ else ++ ip->i_d.di_vflags &= ~XFS_DIVFLAG_COW; ++} ++ ++int ++xfs_sync_flags( ++ struct inode *inode, ++ int flags, ++ int vflags) ++{ ++ struct xfs_inode *ip = XFS_I(inode); ++ struct xfs_mount *mp = ip->i_mount; ++ struct xfs_trans *tp; ++ unsigned int lock_flags = 0; ++ int code; ++ ++ tp = xfs_trans_alloc(mp, XFS_TRANS_SETATTR_NOT_SIZE); ++ code = xfs_trans_reserve(tp, 0, XFS_ICHANGE_LOG_RES(mp), 0, 0, 0); ++ if (code) ++ goto error_out; ++ ++ xfs_ilock(ip, XFS_ILOCK_EXCL); ++ xfs_trans_ijoin(tp, ip, 0); ++ ++ inode->i_flags = flags; ++ inode->i_vflags = vflags; ++ xfs_get_inode_flags(ip); ++ ++ xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE); ++ xfs_trans_ichgtime(tp, ip, XFS_ICHGTIME_CHG); ++ ++ XFS_STATS_INC(xs_ig_attrchg); ++ ++ if (mp->m_flags & XFS_MOUNT_WSYNC) ++ xfs_trans_set_sync(tp); ++ code = xfs_trans_commit(tp, 0); ++ xfs_iunlock(ip, XFS_ILOCK_EXCL); ++ return code; ++ ++error_out: ++ xfs_trans_cancel(tp, 0); ++ if (lock_flags) ++ xfs_iunlock(ip, XFS_ILOCK_EXCL); ++ return code; ++} ++ ++ + int + xfs_readlink( + xfs_inode_t *ip, +diff -NurpP --minimal linux-3.6.9/include/linux/Kbuild linux-3.6.9-vs2.3.4.4/include/linux/Kbuild +--- linux-3.6.9/include/linux/Kbuild 2012-10-04 15:27:45.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/include/linux/Kbuild 2012-10-04 18:47:00.000000000 +0200 @@ -18,6 +18,7 @@ header-y += netfilter_bridge/ header-y += netfilter_ipv4/ header-y += netfilter_ipv6/ @@ -7282,9 +7947,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/Kbuild linux-3.6.6-vs2.3.4.3.1-n header-y += wimax/ objhdr-y += version.h -diff -NurpP --minimal linux-3.6.6/include/linux/capability.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/capability.h ---- linux-3.6.6/include/linux/capability.h 2012-07-22 23:39:43.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/capability.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/capability.h linux-3.6.9-vs2.3.4.4/include/linux/capability.h +--- linux-3.6.9/include/linux/capability.h 2012-07-22 23:39:43.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/include/linux/capability.h 2012-10-04 18:47:00.000000000 +0200 @@ -280,6 +280,7 @@ struct cpu_vfs_cap_data { arbitrary SCSI commands */ /* Allow setting encryption key on loopback filesystem */ @@ -7307,9 +7972,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/capability.h linux-3.6.6-vs2.3.4 /* * Bit location of each capability (used by user-space library and kernel) -diff -NurpP --minimal linux-3.6.6/include/linux/cred.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/cred.h ---- linux-3.6.6/include/linux/cred.h 2012-07-22 23:39:43.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/cred.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/cred.h linux-3.6.9-vs2.3.4.4/include/linux/cred.h +--- linux-3.6.9/include/linux/cred.h 2012-07-22 23:39:43.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/include/linux/cred.h 2012-10-04 18:47:00.000000000 +0200 @@ -157,6 +157,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 *); @@ -7350,18 +8015,18 @@ diff -NurpP --minimal linux-3.6.6/include/linux/cred.h linux-3.6.6-vs2.3.4.3.1-n /** * get_new_cred - Get a reference on a new set of credentials * @cred: The new credentials to reference -diff -NurpP --minimal linux-3.6.6/include/linux/devpts_fs.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/devpts_fs.h ---- linux-3.6.6/include/linux/devpts_fs.h 2008-12-25 00:26:37.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/devpts_fs.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/devpts_fs.h linux-3.6.9-vs2.3.4.4/include/linux/devpts_fs.h +--- linux-3.6.9/include/linux/devpts_fs.h 2008-12-25 00:26:37.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/devpts_fs.h 2012-10-04 18:47:00.000000000 +0200 @@ -45,5 +45,4 @@ static inline void devpts_pty_kill(struc #endif - #endif /* _LINUX_DEVPTS_FS_H */ -diff -NurpP --minimal linux-3.6.6/include/linux/fs.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/fs.h ---- linux-3.6.6/include/linux/fs.h 2012-10-04 15:27:45.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/fs.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/fs.h linux-3.6.9-vs2.3.4.4/include/linux/fs.h +--- linux-3.6.9/include/linux/fs.h 2012-10-04 15:27:45.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/include/linux/fs.h 2012-10-04 18:47:00.000000000 +0200 @@ -225,6 +225,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 */ @@ -7451,7 +8116,7 @@ diff -NurpP --minimal linux-3.6.6/include/linux/fs.h linux-3.6.6-vs2.3.4.3.1-nox umode_t ia_mode; kuid_t ia_uid; kgid_t ia_gid; -+ vserver_tag_t ia_tag; ++ vs_tag_t ia_tag; loff_t ia_size; struct timespec ia_atime; struct timespec ia_mtime; @@ -7470,7 +8135,7 @@ diff -NurpP --minimal linux-3.6.6/include/linux/fs.h linux-3.6.6-vs2.3.4.3.1-nox kuid_t i_uid; kgid_t i_gid; - unsigned int i_flags; -+ vserver_tag_t i_tag; ++ vs_tag_t i_tag; + unsigned short i_flags; + unsigned short i_vflags; @@ -7539,9 +8204,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/fs.h linux-3.6.6-vs2.3.4.3.1-nox 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.6.6/include/linux/gfs2_ondisk.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/gfs2_ondisk.h ---- linux-3.6.6/include/linux/gfs2_ondisk.h 2012-10-04 15:27:45.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/gfs2_ondisk.h 2012-10-04 18:54:29.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/gfs2_ondisk.h linux-3.6.9-vs2.3.4.4/include/linux/gfs2_ondisk.h +--- linux-3.6.9/include/linux/gfs2_ondisk.h 2012-10-04 15:27:45.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/include/linux/gfs2_ondisk.h 2012-10-04 18:54:29.000000000 +0200 @@ -225,6 +225,9 @@ enum { gfs2fl_Sync = 8, gfs2fl_System = 9, @@ -7562,9 +8227,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/gfs2_ondisk.h linux-3.6.6-vs2.3. #define GFS2_DIF_TRUNC_IN_PROG 0x20000000 /* New in gfs2 */ #define GFS2_DIF_INHERIT_DIRECTIO 0x40000000 /* only in gfs1 */ #define GFS2_DIF_INHERIT_JDATA 0x80000000 -diff -NurpP --minimal linux-3.6.6/include/linux/if_tun.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/if_tun.h ---- linux-3.6.6/include/linux/if_tun.h 2010-08-02 16:52:54.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/if_tun.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/if_tun.h linux-3.6.9-vs2.3.4.4/include/linux/if_tun.h +--- linux-3.6.9/include/linux/if_tun.h 2010-08-02 16:52:54.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/include/linux/if_tun.h 2012-10-04 18:47:00.000000000 +0200 @@ -53,6 +53,7 @@ #define TUNDETACHFILTER _IOW('T', 214, struct sock_fprog) #define TUNGETVNETHDRSZ _IOR('T', 215, int) @@ -7573,9 +8238,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/if_tun.h linux-3.6.6-vs2.3.4.3.1 /* TUNSETIFF ifr flags */ #define IFF_TUN 0x0001 -diff -NurpP --minimal linux-3.6.6/include/linux/init_task.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/init_task.h ---- linux-3.6.6/include/linux/init_task.h 2012-10-04 15:27:45.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/init_task.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/init_task.h linux-3.6.9-vs2.3.4.4/include/linux/init_task.h +--- linux-3.6.9/include/linux/init_task.h 2012-10-04 15:27:45.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/include/linux/init_task.h 2012-10-04 18:47:00.000000000 +0200 @@ -210,6 +210,10 @@ extern struct task_group root_task_group INIT_TRACE_RECURSION \ INIT_TASK_RCU_PREEMPT(tsk) \ @@ -7587,9 +8252,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/init_task.h linux-3.6.6-vs2.3.4. } -diff -NurpP --minimal linux-3.6.6/include/linux/ipc.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/ipc.h ---- linux-3.6.6/include/linux/ipc.h 2012-03-19 19:47:28.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/ipc.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/ipc.h linux-3.6.9-vs2.3.4.4/include/linux/ipc.h +--- linux-3.6.9/include/linux/ipc.h 2012-03-19 19:47:28.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/ipc.h 2012-10-04 18:47:00.000000000 +0200 @@ -91,6 +91,7 @@ struct kern_ipc_perm key_t key; uid_t uid; @@ -7598,9 +8263,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/ipc.h linux-3.6.6-vs2.3.4.3.1-no uid_t cuid; gid_t cgid; umode_t mode; -diff -NurpP --minimal linux-3.6.6/include/linux/ipc_namespace.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/ipc_namespace.h ---- linux-3.6.6/include/linux/ipc_namespace.h 2012-07-22 23:39:43.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/ipc_namespace.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/ipc_namespace.h linux-3.6.9-vs2.3.4.4/include/linux/ipc_namespace.h +--- linux-3.6.9/include/linux/ipc_namespace.h 2012-07-22 23:39:43.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/include/linux/ipc_namespace.h 2012-10-04 18:47:00.000000000 +0200 @@ -133,7 +133,8 @@ static inline int mq_init_ns(struct ipc_ #if defined(CONFIG_IPC_NS) @@ -7627,9 +8292,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/ipc_namespace.h linux-3.6.6-vs2. } static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns) -diff -NurpP --minimal linux-3.6.6/include/linux/loop.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/loop.h ---- linux-3.6.6/include/linux/loop.h 2012-01-09 16:14:58.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/loop.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/loop.h linux-3.6.9-vs2.3.4.4/include/linux/loop.h +--- linux-3.6.9/include/linux/loop.h 2012-01-09 16:14:58.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/loop.h 2012-10-04 18:47:00.000000000 +0200 @@ -45,6 +45,7 @@ struct loop_device { struct loop_func_table *lo_encryption; __u32 lo_init[2]; @@ -7638,9 +8303,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/loop.h linux-3.6.6-vs2.3.4.3.1-n int (*ioctl)(struct loop_device *, int cmd, unsigned long arg); -diff -NurpP --minimal linux-3.6.6/include/linux/magic.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/magic.h ---- linux-3.6.6/include/linux/magic.h 2012-05-21 18:07:31.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/magic.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/magic.h linux-3.6.9-vs2.3.4.4/include/linux/magic.h +--- linux-3.6.9/include/linux/magic.h 2012-05-21 18:07:31.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/include/linux/magic.h 2012-10-04 18:47:00.000000000 +0200 @@ -3,7 +3,7 @@ #define ADFS_SUPER_MAGIC 0xadf5 @@ -7650,9 +8315,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/magic.h linux-3.6.6-vs2.3.4.3.1- #define AUTOFS_SUPER_MAGIC 0x0187 #define CODA_SUPER_MAGIC 0x73757245 #define CRAMFS_MAGIC 0x28cd3d45 /* some random number */ -diff -NurpP --minimal linux-3.6.6/include/linux/major.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/major.h ---- linux-3.6.6/include/linux/major.h 2009-09-10 15:26:25.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/major.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/major.h linux-3.6.9-vs2.3.4.4/include/linux/major.h +--- linux-3.6.9/include/linux/major.h 2009-09-10 15:26:25.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/include/linux/major.h 2012-10-04 18:47:00.000000000 +0200 @@ -15,6 +15,7 @@ #define HD_MAJOR IDE0_MAJOR #define PTY_SLAVE_MAJOR 3 @@ -7661,9 +8326,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/major.h linux-3.6.6-vs2.3.4.3.1- #define TTYAUX_MAJOR 5 #define LP_MAJOR 6 #define VCS_MAJOR 7 -diff -NurpP --minimal linux-3.6.6/include/linux/memcontrol.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/memcontrol.h ---- linux-3.6.6/include/linux/memcontrol.h 2012-10-04 15:27:45.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/memcontrol.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/memcontrol.h linux-3.6.9-vs2.3.4.4/include/linux/memcontrol.h +--- linux-3.6.9/include/linux/memcontrol.h 2012-10-04 15:27:45.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/include/linux/memcontrol.h 2012-10-04 18:47:00.000000000 +0200 @@ -83,6 +83,13 @@ extern struct mem_cgroup *try_get_mem_cg extern struct mem_cgroup *parent_mem_cgroup(struct mem_cgroup *memcg); extern struct mem_cgroup *mem_cgroup_from_cont(struct cgroup *cont); @@ -7678,9 +8343,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/memcontrol.h linux-3.6.6-vs2.3.4 static inline int mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *cgroup) { -diff -NurpP --minimal linux-3.6.6/include/linux/mm_types.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/mm_types.h ---- linux-3.6.6/include/linux/mm_types.h 2012-10-04 15:27:46.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/mm_types.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/mm_types.h linux-3.6.9-vs2.3.4.4/include/linux/mm_types.h +--- linux-3.6.9/include/linux/mm_types.h 2012-10-04 15:27:46.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/include/linux/mm_types.h 2012-10-04 18:47:00.000000000 +0200 @@ -370,6 +370,7 @@ struct mm_struct { /* Architecture-specific MM context */ @@ -7689,9 +8354,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/mm_types.h linux-3.6.6-vs2.3.4.3 unsigned long flags; /* Must use atomic bitops to access the bits */ -diff -NurpP --minimal linux-3.6.6/include/linux/mmzone.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/mmzone.h ---- linux-3.6.6/include/linux/mmzone.h 2012-10-04 15:27:46.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/mmzone.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/mmzone.h linux-3.6.9-vs2.3.4.4/include/linux/mmzone.h +--- linux-3.6.9/include/linux/mmzone.h 2012-12-08 01:34:14.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/mmzone.h 2012-12-08 01:36:33.000000000 +0100 @@ -727,6 +727,13 @@ typedef struct pglist_data { __pgdat->node_start_pfn + __pgdat->node_spanned_pages;\ }) @@ -7706,9 +8371,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/mmzone.h linux-3.6.6-vs2.3.4.3.1 #include extern struct mutex zonelists_mutex; -diff -NurpP --minimal linux-3.6.6/include/linux/mount.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/mount.h ---- linux-3.6.6/include/linux/mount.h 2012-03-19 19:47:28.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/mount.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/mount.h linux-3.6.9-vs2.3.4.4/include/linux/mount.h +--- linux-3.6.9/include/linux/mount.h 2012-03-19 19:47:28.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/mount.h 2012-10-04 18:47:00.000000000 +0200 @@ -47,6 +47,9 @@ struct mnt_namespace; #define MNT_INTERNAL 0x4000 @@ -7719,9 +8384,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/mount.h linux-3.6.6-vs2.3.4.3.1- struct vfsmount { struct dentry *mnt_root; /* root of the mounted tree */ struct super_block *mnt_sb; /* pointer to superblock */ -diff -NurpP --minimal linux-3.6.6/include/linux/net.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/net.h ---- linux-3.6.6/include/linux/net.h 2012-10-04 15:27:46.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/net.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/net.h linux-3.6.9-vs2.3.4.4/include/linux/net.h +--- linux-3.6.9/include/linux/net.h 2012-10-04 15:27:46.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/include/linux/net.h 2012-10-04 18:47:00.000000000 +0200 @@ -73,6 +73,7 @@ struct net; #define SOCK_PASSCRED 3 #define SOCK_PASSSEC 4 @@ -7730,9 +8395,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/net.h linux-3.6.6-vs2.3.4.3.1-no #ifndef ARCH_HAS_SOCKET_TYPES /** -diff -NurpP --minimal linux-3.6.6/include/linux/netdevice.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/netdevice.h ---- linux-3.6.6/include/linux/netdevice.h 2012-10-04 15:27:46.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/netdevice.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/netdevice.h linux-3.6.9-vs2.3.4.4/include/linux/netdevice.h +--- linux-3.6.9/include/linux/netdevice.h 2012-10-04 15:27:46.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/include/linux/netdevice.h 2012-10-04 18:47:00.000000000 +0200 @@ -1651,6 +1651,7 @@ extern void netdev_resync_ops(struct ne extern struct net_device *dev_get_by_index(struct net *net, int ifindex); @@ -7741,9 +8406,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/netdevice.h linux-3.6.6-vs2.3.4. extern struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex); extern int dev_restart(struct net_device *dev); #ifdef CONFIG_NETPOLL_TRAP -diff -NurpP --minimal linux-3.6.6/include/linux/nfs_mount.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/nfs_mount.h ---- linux-3.6.6/include/linux/nfs_mount.h 2011-01-05 21:50:31.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/nfs_mount.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/nfs_mount.h linux-3.6.9-vs2.3.4.4/include/linux/nfs_mount.h +--- linux-3.6.9/include/linux/nfs_mount.h 2011-01-05 21:50:31.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/nfs_mount.h 2012-10-04 18:47:00.000000000 +0200 @@ -63,7 +63,8 @@ struct nfs_mount_data { #define NFS_MOUNT_SECFLAVOUR 0x2000 /* 5 */ #define NFS_MOUNT_NORDIRPLUS 0x4000 /* 5 */ @@ -7754,9 +8419,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/nfs_mount.h linux-3.6.6-vs2.3.4. /* The following are for internal use only */ #define NFS_MOUNT_LOOKUP_CACHE_NONEG 0x10000 -diff -NurpP --minimal linux-3.6.6/include/linux/nsproxy.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/nsproxy.h ---- linux-3.6.6/include/linux/nsproxy.h 2011-10-24 18:45:32.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/nsproxy.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/nsproxy.h linux-3.6.9-vs2.3.4.4/include/linux/nsproxy.h +--- linux-3.6.9/include/linux/nsproxy.h 2011-10-24 18:45:32.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/include/linux/nsproxy.h 2012-10-04 18:47:00.000000000 +0200 @@ -3,6 +3,7 @@ #include @@ -7806,9 +8471,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/nsproxy.h linux-3.6.6-vs2.3.4.3. } #endif -diff -NurpP --minimal linux-3.6.6/include/linux/pid.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/pid.h ---- linux-3.6.6/include/linux/pid.h 2011-07-22 11:18:11.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/pid.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/pid.h linux-3.6.9-vs2.3.4.4/include/linux/pid.h +--- linux-3.6.9/include/linux/pid.h 2011-07-22 11:18:11.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/include/linux/pid.h 2012-10-04 18:47:00.000000000 +0200 @@ -8,7 +8,8 @@ enum pid_type PIDTYPE_PID, PIDTYPE_PGID, @@ -7827,9 +8492,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/pid.h linux-3.6.6-vs2.3.4.3.1-no pid_t pid_vnr(struct pid *pid); #define do_each_pid_task(pid, type, task) \ -diff -NurpP --minimal linux-3.6.6/include/linux/proc_fs.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/proc_fs.h ---- linux-3.6.6/include/linux/proc_fs.h 2012-07-22 23:39:44.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/proc_fs.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/proc_fs.h linux-3.6.9-vs2.3.4.4/include/linux/proc_fs.h +--- linux-3.6.9/include/linux/proc_fs.h 2012-07-22 23:39:44.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/include/linux/proc_fs.h 2012-10-04 18:47:00.000000000 +0200 @@ -54,6 +54,7 @@ struct proc_dir_entry { nlink_t nlink; kuid_t uid; @@ -7865,9 +8530,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/proc_fs.h linux-3.6.6-vs2.3.4.3. int fd; union proc_op op; struct proc_dir_entry *pde; -diff -NurpP --minimal linux-3.6.6/include/linux/quotaops.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/quotaops.h ---- linux-3.6.6/include/linux/quotaops.h 2012-10-04 15:27:46.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/quotaops.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/quotaops.h linux-3.6.9-vs2.3.4.4/include/linux/quotaops.h +--- linux-3.6.9/include/linux/quotaops.h 2012-10-04 15:27:46.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/include/linux/quotaops.h 2012-10-04 18:47:00.000000000 +0200 @@ -8,6 +8,7 @@ #define _LINUX_QUOTAOPS_ @@ -7909,9 +8574,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/quotaops.h linux-3.6.6-vs2.3.4.3 } static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number) -diff -NurpP --minimal linux-3.6.6/include/linux/reboot.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/reboot.h ---- linux-3.6.6/include/linux/reboot.h 2011-10-24 18:45:32.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/reboot.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/reboot.h linux-3.6.9-vs2.3.4.4/include/linux/reboot.h +--- linux-3.6.9/include/linux/reboot.h 2011-10-24 18:45:32.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/include/linux/reboot.h 2012-10-04 18:47:00.000000000 +0200 @@ -33,6 +33,7 @@ #define LINUX_REBOOT_CMD_RESTART2 0xA1B2C3D4 #define LINUX_REBOOT_CMD_SW_SUSPEND 0xD000FCE2 @@ -7920,9 +8585,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/reboot.h linux-3.6.6-vs2.3.4.3.1 #ifdef __KERNEL__ -diff -NurpP --minimal linux-3.6.6/include/linux/sched.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/sched.h ---- linux-3.6.6/include/linux/sched.h 2012-10-04 15:27:46.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/sched.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/sched.h linux-3.6.9-vs2.3.4.4/include/linux/sched.h +--- linux-3.6.9/include/linux/sched.h 2012-10-04 15:27:46.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/include/linux/sched.h 2012-10-04 18:47:00.000000000 +0200 @@ -1422,6 +1422,14 @@ struct task_struct { #endif struct seccomp seccomp; @@ -7933,7 +8598,7 @@ diff -NurpP --minimal linux-3.6.6/include/linux/sched.h linux-3.6.6-vs2.3.4.3.1- + + xid_t xid; + nid_t nid; -+ vserver_tag_t tag; ++ vs_tag_t tag; + /* Thread group tracking */ u32 parent_exec_id; @@ -7969,9 +8634,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/sched.h linux-3.6.6-vs2.3.4.3.1- } -diff -NurpP --minimal linux-3.6.6/include/linux/shmem_fs.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/shmem_fs.h ---- linux-3.6.6/include/linux/shmem_fs.h 2012-07-22 23:39:44.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/shmem_fs.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/shmem_fs.h linux-3.6.9-vs2.3.4.4/include/linux/shmem_fs.h +--- linux-3.6.9/include/linux/shmem_fs.h 2012-07-22 23:39:44.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/include/linux/shmem_fs.h 2012-10-04 18:47:00.000000000 +0200 @@ -8,6 +8,9 @@ /* inode in-kernel data */ @@ -7982,31 +8647,31 @@ diff -NurpP --minimal linux-3.6.6/include/linux/shmem_fs.h linux-3.6.6-vs2.3.4.3 struct shmem_inode_info { spinlock_t lock; unsigned long flags; -diff -NurpP --minimal linux-3.6.6/include/linux/stat.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/stat.h ---- linux-3.6.6/include/linux/stat.h 2012-07-22 23:39:44.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/stat.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/stat.h linux-3.6.9-vs2.3.4.4/include/linux/stat.h +--- linux-3.6.9/include/linux/stat.h 2012-07-22 23:39:44.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/include/linux/stat.h 2012-10-04 18:47:00.000000000 +0200 @@ -67,6 +67,7 @@ struct kstat { unsigned int nlink; kuid_t uid; kgid_t gid; -+ vserver_tag_t tag; ++ vs_tag_t tag; dev_t rdev; loff_t size; struct timespec atime; -diff -NurpP --minimal linux-3.6.6/include/linux/sunrpc/auth.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/sunrpc/auth.h ---- linux-3.6.6/include/linux/sunrpc/auth.h 2012-10-04 15:27:46.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/sunrpc/auth.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/sunrpc/auth.h linux-3.6.9-vs2.3.4.4/include/linux/sunrpc/auth.h +--- linux-3.6.9/include/linux/sunrpc/auth.h 2012-10-04 15:27:46.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/include/linux/sunrpc/auth.h 2012-10-04 18:47:00.000000000 +0200 @@ -25,6 +25,7 @@ struct auth_cred { uid_t uid; gid_t gid; -+ vserver_tag_t tag; ++ vs_tag_t tag; struct group_info *group_info; const char *principal; unsigned char machine_cred : 1; -diff -NurpP --minimal linux-3.6.6/include/linux/sunrpc/clnt.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/sunrpc/clnt.h ---- linux-3.6.6/include/linux/sunrpc/clnt.h 2012-05-21 18:07:32.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/sunrpc/clnt.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/sunrpc/clnt.h linux-3.6.9-vs2.3.4.4/include/linux/sunrpc/clnt.h +--- linux-3.6.9/include/linux/sunrpc/clnt.h 2012-05-21 18:07:32.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/include/linux/sunrpc/clnt.h 2012-10-04 18:47:00.000000000 +0200 @@ -49,7 +49,8 @@ struct rpc_clnt { unsigned int cl_softrtry : 1,/* soft timeouts */ cl_discrtry : 1,/* disconnect before retry */ @@ -8017,9 +8682,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/sunrpc/clnt.h linux-3.6.6-vs2.3. struct rpc_rtt * cl_rtt; /* RTO estimator data */ const struct rpc_timeout *cl_timeout; /* Timeout strategy */ -diff -NurpP --minimal linux-3.6.6/include/linux/sysctl.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/sysctl.h ---- linux-3.6.6/include/linux/sysctl.h 2012-05-21 18:07:32.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/sysctl.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/sysctl.h linux-3.6.9-vs2.3.4.4/include/linux/sysctl.h +--- linux-3.6.9/include/linux/sysctl.h 2012-05-21 18:07:32.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/include/linux/sysctl.h 2012-10-04 18:47:00.000000000 +0200 @@ -60,6 +60,7 @@ enum CTL_ABI=9, /* Binary emulation */ CTL_CPU=10, /* CPU stuff (speed scaling, etc) */ @@ -8036,9 +8701,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/sysctl.h linux-3.6.6-vs2.3.4.3.1 KERN_SPARC_REBOOT=21, /* reboot command on Sparc */ KERN_CTLALTDEL=22, /* int: allow ctl-alt-del to reboot */ -diff -NurpP --minimal linux-3.6.6/include/linux/sysfs.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/sysfs.h ---- linux-3.6.6/include/linux/sysfs.h 2012-07-22 23:39:44.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/sysfs.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/sysfs.h linux-3.6.9-vs2.3.4.4/include/linux/sysfs.h +--- linux-3.6.9/include/linux/sysfs.h 2012-07-22 23:39:44.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/include/linux/sysfs.h 2012-10-04 18:47:00.000000000 +0200 @@ -19,6 +19,8 @@ #include #include @@ -8048,9 +8713,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/sysfs.h linux-3.6.6-vs2.3.4.3.1- struct kobject; struct module; enum kobj_ns_type; -diff -NurpP --minimal linux-3.6.6/include/linux/time.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/time.h ---- linux-3.6.6/include/linux/time.h 2012-10-04 15:27:46.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/time.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/time.h linux-3.6.9-vs2.3.4.4/include/linux/time.h +--- linux-3.6.9/include/linux/time.h 2012-10-04 15:27:46.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/include/linux/time.h 2012-10-04 18:47:00.000000000 +0200 @@ -280,6 +280,8 @@ static __always_inline void timespec_add a->tv_nsec = ns; } @@ -8060,22 +8725,22 @@ diff -NurpP --minimal linux-3.6.6/include/linux/time.h linux-3.6.6-vs2.3.4.3.1-n #endif /* __KERNEL__ */ /* -diff -NurpP --minimal linux-3.6.6/include/linux/types.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/types.h ---- linux-3.6.6/include/linux/types.h 2012-10-04 15:27:47.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/types.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/types.h linux-3.6.9-vs2.3.4.4/include/linux/types.h +--- linux-3.6.9/include/linux/types.h 2012-10-04 15:27:47.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/include/linux/types.h 2012-10-04 18:47:00.000000000 +0200 @@ -41,6 +41,9 @@ typedef __kernel_uid32_t uid_t; typedef __kernel_gid32_t gid_t; typedef __kernel_uid16_t uid16_t; typedef __kernel_gid16_t gid16_t; +typedef unsigned int xid_t; +typedef unsigned int nid_t; -+typedef unsigned int vserver_tag_t; ++typedef unsigned int vs_tag_t; typedef unsigned long uintptr_t; -diff -NurpP --minimal linux-3.6.6/include/linux/utsname.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/utsname.h ---- linux-3.6.6/include/linux/utsname.h 2012-01-09 16:14:59.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/utsname.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/utsname.h linux-3.6.9-vs2.3.4.4/include/linux/utsname.h +--- linux-3.6.9/include/linux/utsname.h 2012-01-09 16:14:59.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/utsname.h 2012-10-04 18:47:00.000000000 +0200 @@ -62,7 +62,8 @@ static inline void get_uts_ns(struct uts } @@ -8102,9 +8767,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/utsname.h linux-3.6.6-vs2.3.4.3. } #endif -diff -NurpP --minimal linux-3.6.6/include/linux/vroot.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vroot.h ---- linux-3.6.6/include/linux/vroot.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vroot.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vroot.h linux-3.6.9-vs2.3.4.4/include/linux/vroot.h +--- linux-3.6.9/include/linux/vroot.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vroot.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,51 @@ + +/* @@ -8157,9 +8822,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vroot.h linux-3.6.6-vs2.3.4.3.1- +#define VROOT_CLR_DEV 0x5601 + +#endif /* _LINUX_VROOT_H */ -diff -NurpP --minimal linux-3.6.6/include/linux/vs_base.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vs_base.h ---- linux-3.6.6/include/linux/vs_base.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vs_base.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vs_base.h linux-3.6.9-vs2.3.4.4/include/linux/vs_base.h +--- linux-3.6.9/include/linux/vs_base.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vs_base.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,10 @@ +#ifndef _VS_BASE_H +#define _VS_BASE_H @@ -8171,9 +8836,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vs_base.h linux-3.6.6-vs2.3.4.3. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.6.6/include/linux/vs_context.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vs_context.h ---- linux-3.6.6/include/linux/vs_context.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vs_context.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vs_context.h linux-3.6.9-vs2.3.4.4/include/linux/vs_context.h +--- linux-3.6.9/include/linux/vs_context.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vs_context.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,242 @@ +#ifndef _VS_CONTEXT_H +#define _VS_CONTEXT_H @@ -8417,9 +9082,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vs_context.h linux-3.6.6-vs2.3.4 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.6.6/include/linux/vs_cowbl.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vs_cowbl.h ---- linux-3.6.6/include/linux/vs_cowbl.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vs_cowbl.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vs_cowbl.h linux-3.6.9-vs2.3.4.4/include/linux/vs_cowbl.h +--- linux-3.6.9/include/linux/vs_cowbl.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vs_cowbl.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,48 @@ +#ifndef _VS_COWBL_H +#define _VS_COWBL_H @@ -8469,9 +9134,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vs_cowbl.h linux-3.6.6-vs2.3.4.3 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.6.6/include/linux/vs_cvirt.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vs_cvirt.h ---- linux-3.6.6/include/linux/vs_cvirt.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vs_cvirt.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vs_cvirt.h linux-3.6.9-vs2.3.4.4/include/linux/vs_cvirt.h +--- linux-3.6.9/include/linux/vs_cvirt.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vs_cvirt.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,50 @@ +#ifndef _VS_CVIRT_H +#define _VS_CVIRT_H @@ -8523,9 +9188,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vs_cvirt.h linux-3.6.6-vs2.3.4.3 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.6.6/include/linux/vs_device.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vs_device.h ---- linux-3.6.6/include/linux/vs_device.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vs_device.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vs_device.h linux-3.6.9-vs2.3.4.4/include/linux/vs_device.h +--- linux-3.6.9/include/linux/vs_device.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vs_device.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,45 @@ +#ifndef _VS_DEVICE_H +#define _VS_DEVICE_H @@ -8572,9 +9237,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vs_device.h linux-3.6.6-vs2.3.4. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.6.6/include/linux/vs_dlimit.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vs_dlimit.h ---- linux-3.6.6/include/linux/vs_dlimit.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vs_dlimit.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vs_dlimit.h linux-3.6.9-vs2.3.4.4/include/linux/vs_dlimit.h +--- linux-3.6.9/include/linux/vs_dlimit.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vs_dlimit.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,215 @@ +#ifndef _VS_DLIMIT_H +#define _VS_DLIMIT_H @@ -8624,7 +9289,7 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vs_dlimit.h linux-3.6.6-vs2.3.4. +#define __dlimit_char(d) ((d) ? '*' : ' ') + +static inline int __dl_alloc_space(struct super_block *sb, -+ vserver_tag_t tag, dlsize_t nr, const char *file, int line) ++ vs_tag_t tag, dlsize_t nr, const char *file, int line) +{ + struct dl_info *dli = NULL; + int ret = 0; @@ -8650,7 +9315,7 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vs_dlimit.h linux-3.6.6-vs2.3.4. +} + +static inline void __dl_free_space(struct super_block *sb, -+ vserver_tag_t tag, dlsize_t nr, const char *_file, int _line) ++ vs_tag_t tag, dlsize_t nr, const char *_file, int _line) +{ + struct dl_info *dli = NULL; + @@ -8675,7 +9340,7 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vs_dlimit.h linux-3.6.6-vs2.3.4. +} + +static inline int __dl_alloc_inode(struct super_block *sb, -+ vserver_tag_t tag, const char *_file, int _line) ++ vs_tag_t tag, const char *_file, int _line) +{ + struct dl_info *dli; + int ret = 0; @@ -8697,7 +9362,7 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vs_dlimit.h linux-3.6.6-vs2.3.4. +} + +static inline void __dl_free_inode(struct super_block *sb, -+ vserver_tag_t tag, const char *_file, int _line) ++ vs_tag_t tag, const char *_file, int _line) +{ + struct dl_info *dli; + @@ -8718,7 +9383,7 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vs_dlimit.h linux-3.6.6-vs2.3.4. + sb, tag, __dlimit_char(dli), _file, _line); +} + -+static inline void __dl_adjust_block(struct super_block *sb, vserver_tag_t tag, ++static inline void __dl_adjust_block(struct super_block *sb, vs_tag_t tag, + unsigned long long *free_blocks, unsigned long long *root_blocks, + const char *_file, int _line) +{ @@ -8791,9 +9456,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vs_dlimit.h linux-3.6.6-vs2.3.4. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.6.6/include/linux/vs_inet.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vs_inet.h ---- linux-3.6.6/include/linux/vs_inet.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vs_inet.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vs_inet.h linux-3.6.9-vs2.3.4.4/include/linux/vs_inet.h +--- linux-3.6.9/include/linux/vs_inet.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vs_inet.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,353 @@ +#ifndef _VS_INET_H +#define _VS_INET_H @@ -9148,9 +9813,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vs_inet.h linux-3.6.6-vs2.3.4.3. +#else +// #warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.6.6/include/linux/vs_inet6.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vs_inet6.h ---- linux-3.6.6/include/linux/vs_inet6.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vs_inet6.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vs_inet6.h linux-3.6.9-vs2.3.4.4/include/linux/vs_inet6.h +--- linux-3.6.9/include/linux/vs_inet6.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vs_inet6.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,246 @@ +#ifndef _VS_INET6_H +#define _VS_INET6_H @@ -9398,9 +10063,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vs_inet6.h linux-3.6.6-vs2.3.4.3 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.6.6/include/linux/vs_limit.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vs_limit.h ---- linux-3.6.6/include/linux/vs_limit.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vs_limit.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vs_limit.h linux-3.6.9-vs2.3.4.4/include/linux/vs_limit.h +--- linux-3.6.9/include/linux/vs_limit.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vs_limit.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,140 @@ +#ifndef _VS_LIMIT_H +#define _VS_LIMIT_H @@ -9542,9 +10207,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vs_limit.h linux-3.6.6-vs2.3.4.3 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.6.6/include/linux/vs_network.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vs_network.h ---- linux-3.6.6/include/linux/vs_network.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vs_network.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vs_network.h linux-3.6.9-vs2.3.4.4/include/linux/vs_network.h +--- linux-3.6.9/include/linux/vs_network.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vs_network.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,169 @@ +#ifndef _NX_VS_NETWORK_H +#define _NX_VS_NETWORK_H @@ -9715,9 +10380,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vs_network.h linux-3.6.6-vs2.3.4 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.6.6/include/linux/vs_pid.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vs_pid.h ---- linux-3.6.6/include/linux/vs_pid.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vs_pid.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vs_pid.h linux-3.6.9-vs2.3.4.4/include/linux/vs_pid.h +--- linux-3.6.9/include/linux/vs_pid.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vs_pid.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,50 @@ +#ifndef _VS_PID_H +#define _VS_PID_H @@ -9769,9 +10434,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vs_pid.h linux-3.6.6-vs2.3.4.3.1 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.6.6/include/linux/vs_sched.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vs_sched.h ---- linux-3.6.6/include/linux/vs_sched.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vs_sched.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vs_sched.h linux-3.6.9-vs2.3.4.4/include/linux/vs_sched.h +--- linux-3.6.9/include/linux/vs_sched.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vs_sched.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,40 @@ +#ifndef _VS_SCHED_H +#define _VS_SCHED_H @@ -9813,9 +10478,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vs_sched.h linux-3.6.6-vs2.3.4.3 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.6.6/include/linux/vs_socket.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vs_socket.h ---- linux-3.6.6/include/linux/vs_socket.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vs_socket.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vs_socket.h linux-3.6.9-vs2.3.4.4/include/linux/vs_socket.h +--- linux-3.6.9/include/linux/vs_socket.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vs_socket.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,67 @@ +#ifndef _VS_SOCKET_H +#define _VS_SOCKET_H @@ -9884,9 +10549,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vs_socket.h linux-3.6.6-vs2.3.4. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.6.6/include/linux/vs_tag.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vs_tag.h ---- linux-3.6.6/include/linux/vs_tag.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vs_tag.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vs_tag.h linux-3.6.9-vs2.3.4.4/include/linux/vs_tag.h +--- linux-3.6.9/include/linux/vs_tag.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vs_tag.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,47 @@ +#ifndef _VS_TAG_H +#define _VS_TAG_H @@ -9917,7 +10582,7 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vs_tag.h linux-3.6.6-vs2.3.4.3.1 + * check current context for ADMIN/WATCH and + * optionally against supplied argument + */ -+static inline int __dx_check(vserver_tag_t cid, vserver_tag_t id, unsigned int mode) ++static inline int __dx_check(vs_tag_t cid, vs_tag_t id, unsigned int mode) +{ + if (mode & DX_ARG_MASK) { + if ((mode & DX_IDENT) && (id == cid)) @@ -9935,9 +10600,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vs_tag.h linux-3.6.6-vs2.3.4.3.1 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.6.6/include/linux/vs_time.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vs_time.h ---- linux-3.6.6/include/linux/vs_time.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vs_time.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vs_time.h linux-3.6.9-vs2.3.4.4/include/linux/vs_time.h +--- linux-3.6.9/include/linux/vs_time.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vs_time.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,19 @@ +#ifndef _VS_TIME_H +#define _VS_TIME_H @@ -9958,9 +10623,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vs_time.h linux-3.6.6-vs2.3.4.3. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.6.6/include/linux/vserver/Kbuild linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/Kbuild ---- linux-3.6.6/include/linux/vserver/Kbuild 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/Kbuild 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vserver/Kbuild linux-3.6.9-vs2.3.4.4/include/linux/vserver/Kbuild +--- linux-3.6.9/include/linux/vserver/Kbuild 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vserver/Kbuild 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,8 @@ + +header-y += context_cmd.h network_cmd.h space_cmd.h \ @@ -9970,9 +10635,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vserver/Kbuild linux-3.6.6-vs2.3 + +header-y += switch.h network.h monitor.h inode.h device.h + -diff -NurpP --minimal linux-3.6.6/include/linux/vserver/base.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/base.h ---- linux-3.6.6/include/linux/vserver/base.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/base.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vserver/base.h linux-3.6.9-vs2.3.4.4/include/linux/vserver/base.h +--- linux-3.6.9/include/linux/vserver/base.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vserver/base.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,178 @@ +#ifndef _VX_BASE_H +#define _VX_BASE_H @@ -10152,9 +10817,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vserver/base.h linux-3.6.6-vs2.3 +#define nx_info_state(n, m) (__nx_state(n) & (m)) + +#endif -diff -NurpP --minimal linux-3.6.6/include/linux/vserver/cacct.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/cacct.h ---- linux-3.6.6/include/linux/vserver/cacct.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/cacct.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vserver/cacct.h linux-3.6.9-vs2.3.4.4/include/linux/vserver/cacct.h +--- linux-3.6.9/include/linux/vserver/cacct.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vserver/cacct.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,15 @@ +#ifndef _VX_CACCT_H +#define _VX_CACCT_H @@ -10171,9 +10836,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vserver/cacct.h linux-3.6.6-vs2. +}; + +#endif /* _VX_CACCT_H */ -diff -NurpP --minimal linux-3.6.6/include/linux/vserver/cacct_cmd.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/cacct_cmd.h ---- linux-3.6.6/include/linux/vserver/cacct_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/cacct_cmd.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vserver/cacct_cmd.h linux-3.6.9-vs2.3.4.4/include/linux/vserver/cacct_cmd.h +--- linux-3.6.9/include/linux/vserver/cacct_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vserver/cacct_cmd.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,23 @@ +#ifndef _VX_CACCT_CMD_H +#define _VX_CACCT_CMD_H @@ -10198,9 +10863,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vserver/cacct_cmd.h linux-3.6.6- + +#endif /* __KERNEL__ */ +#endif /* _VX_CACCT_CMD_H */ -diff -NurpP --minimal linux-3.6.6/include/linux/vserver/cacct_def.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/cacct_def.h ---- linux-3.6.6/include/linux/vserver/cacct_def.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/cacct_def.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vserver/cacct_def.h linux-3.6.9-vs2.3.4.4/include/linux/vserver/cacct_def.h +--- linux-3.6.9/include/linux/vserver/cacct_def.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vserver/cacct_def.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,43 @@ +#ifndef _VX_CACCT_DEF_H +#define _VX_CACCT_DEF_H @@ -10245,9 +10910,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vserver/cacct_def.h linux-3.6.6- +#endif + +#endif /* _VX_CACCT_DEF_H */ -diff -NurpP --minimal linux-3.6.6/include/linux/vserver/cacct_int.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/cacct_int.h ---- linux-3.6.6/include/linux/vserver/cacct_int.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/cacct_int.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vserver/cacct_int.h linux-3.6.9-vs2.3.4.4/include/linux/vserver/cacct_int.h +--- linux-3.6.9/include/linux/vserver/cacct_int.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vserver/cacct_int.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,21 @@ +#ifndef _VX_CACCT_INT_H +#define _VX_CACCT_INT_H @@ -10270,9 +10935,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vserver/cacct_int.h linux-3.6.6- + +#endif /* __KERNEL__ */ +#endif /* _VX_CACCT_INT_H */ -diff -NurpP --minimal linux-3.6.6/include/linux/vserver/check.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/check.h ---- linux-3.6.6/include/linux/vserver/check.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/check.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vserver/check.h linux-3.6.9-vs2.3.4.4/include/linux/vserver/check.h +--- linux-3.6.9/include/linux/vserver/check.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vserver/check.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,89 @@ +#ifndef _VS_CHECK_H +#define _VS_CHECK_H @@ -10363,9 +11028,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vserver/check.h linux-3.6.6-vs2. +#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1) + +#endif -diff -NurpP --minimal linux-3.6.6/include/linux/vserver/context.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/context.h ---- linux-3.6.6/include/linux/vserver/context.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/context.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vserver/context.h linux-3.6.9-vs2.3.4.4/include/linux/vserver/context.h +--- linux-3.6.9/include/linux/vserver/context.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vserver/context.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,188 @@ +#ifndef _VX_CONTEXT_H +#define _VX_CONTEXT_H @@ -10555,9 +11220,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vserver/context.h linux-3.6.6-vs + +#endif /* __KERNEL__ */ +#endif /* _VX_CONTEXT_H */ -diff -NurpP --minimal linux-3.6.6/include/linux/vserver/context_cmd.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/context_cmd.h ---- linux-3.6.6/include/linux/vserver/context_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/context_cmd.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vserver/context_cmd.h linux-3.6.9-vs2.3.4.4/include/linux/vserver/context_cmd.h +--- linux-3.6.9/include/linux/vserver/context_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vserver/context_cmd.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,162 @@ +#ifndef _VX_CONTEXT_CMD_H +#define _VX_CONTEXT_CMD_H @@ -10721,9 +11386,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vserver/context_cmd.h linux-3.6. + +#endif /* __KERNEL__ */ +#endif /* _VX_CONTEXT_CMD_H */ -diff -NurpP --minimal linux-3.6.6/include/linux/vserver/cvirt.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/cvirt.h ---- linux-3.6.6/include/linux/vserver/cvirt.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/cvirt.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vserver/cvirt.h linux-3.6.9-vs2.3.4.4/include/linux/vserver/cvirt.h +--- linux-3.6.9/include/linux/vserver/cvirt.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vserver/cvirt.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,22 @@ +#ifndef _VX_CVIRT_H +#define _VX_CVIRT_H @@ -10747,9 +11412,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vserver/cvirt.h linux-3.6.6-vs2. + +#endif /* __KERNEL__ */ +#endif /* _VX_CVIRT_H */ -diff -NurpP --minimal linux-3.6.6/include/linux/vserver/cvirt_cmd.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/cvirt_cmd.h ---- linux-3.6.6/include/linux/vserver/cvirt_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/cvirt_cmd.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vserver/cvirt_cmd.h linux-3.6.9-vs2.3.4.4/include/linux/vserver/cvirt_cmd.h +--- linux-3.6.9/include/linux/vserver/cvirt_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vserver/cvirt_cmd.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,53 @@ +#ifndef _VX_CVIRT_CMD_H +#define _VX_CVIRT_CMD_H @@ -10804,9 +11469,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vserver/cvirt_cmd.h linux-3.6.6- + +#endif /* __KERNEL__ */ +#endif /* _VX_CVIRT_CMD_H */ -diff -NurpP --minimal linux-3.6.6/include/linux/vserver/cvirt_def.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/cvirt_def.h ---- linux-3.6.6/include/linux/vserver/cvirt_def.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/cvirt_def.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vserver/cvirt_def.h linux-3.6.9-vs2.3.4.4/include/linux/vserver/cvirt_def.h +--- linux-3.6.9/include/linux/vserver/cvirt_def.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vserver/cvirt_def.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,80 @@ +#ifndef _VX_CVIRT_DEF_H +#define _VX_CVIRT_DEF_H @@ -10888,9 +11553,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vserver/cvirt_def.h linux-3.6.6- +#endif + +#endif /* _VX_CVIRT_DEF_H */ -diff -NurpP --minimal linux-3.6.6/include/linux/vserver/debug.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/debug.h ---- linux-3.6.6/include/linux/vserver/debug.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/debug.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vserver/debug.h linux-3.6.9-vs2.3.4.4/include/linux/vserver/debug.h +--- linux-3.6.9/include/linux/vserver/debug.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vserver/debug.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,145 @@ +#ifndef _VX_DEBUG_H +#define _VX_DEBUG_H @@ -11037,9 +11702,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vserver/debug.h linux-3.6.6-vs2. + + +#endif /* _VX_DEBUG_H */ -diff -NurpP --minimal linux-3.6.6/include/linux/vserver/debug_cmd.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/debug_cmd.h ---- linux-3.6.6/include/linux/vserver/debug_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/debug_cmd.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vserver/debug_cmd.h linux-3.6.9-vs2.3.4.4/include/linux/vserver/debug_cmd.h +--- linux-3.6.9/include/linux/vserver/debug_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vserver/debug_cmd.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,58 @@ +#ifndef _VX_DEBUG_CMD_H +#define _VX_DEBUG_CMD_H @@ -11099,9 +11764,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vserver/debug_cmd.h linux-3.6.6- + +#endif /* __KERNEL__ */ +#endif /* _VX_DEBUG_CMD_H */ -diff -NurpP --minimal linux-3.6.6/include/linux/vserver/device.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/device.h ---- linux-3.6.6/include/linux/vserver/device.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/device.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vserver/device.h linux-3.6.9-vs2.3.4.4/include/linux/vserver/device.h +--- linux-3.6.9/include/linux/vserver/device.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vserver/device.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,15 @@ +#ifndef _VX_DEVICE_H +#define _VX_DEVICE_H @@ -11118,9 +11783,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vserver/device.h linux-3.6.6-vs2 +#else /* _VX_DEVICE_H */ +#warning duplicate inclusion +#endif /* _VX_DEVICE_H */ -diff -NurpP --minimal linux-3.6.6/include/linux/vserver/device_cmd.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/device_cmd.h ---- linux-3.6.6/include/linux/vserver/device_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/device_cmd.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vserver/device_cmd.h linux-3.6.9-vs2.3.4.4/include/linux/vserver/device_cmd.h +--- linux-3.6.9/include/linux/vserver/device_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vserver/device_cmd.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,44 @@ +#ifndef _VX_DEVICE_CMD_H +#define _VX_DEVICE_CMD_H @@ -11166,9 +11831,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vserver/device_cmd.h linux-3.6.6 + +#endif /* __KERNEL__ */ +#endif /* _VX_DEVICE_CMD_H */ -diff -NurpP --minimal linux-3.6.6/include/linux/vserver/device_def.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/device_def.h ---- linux-3.6.6/include/linux/vserver/device_def.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/device_def.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vserver/device_def.h linux-3.6.9-vs2.3.4.4/include/linux/vserver/device_def.h +--- linux-3.6.9/include/linux/vserver/device_def.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vserver/device_def.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,17 @@ +#ifndef _VX_DEVICE_DEF_H +#define _VX_DEVICE_DEF_H @@ -11187,9 +11852,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vserver/device_def.h linux-3.6.6 +}; + +#endif /* _VX_DEVICE_DEF_H */ -diff -NurpP --minimal linux-3.6.6/include/linux/vserver/dlimit.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/dlimit.h ---- linux-3.6.6/include/linux/vserver/dlimit.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/dlimit.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vserver/dlimit.h linux-3.6.9-vs2.3.4.4/include/linux/vserver/dlimit.h +--- linux-3.6.9/include/linux/vserver/dlimit.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vserver/dlimit.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,54 @@ +#ifndef _VX_DLIMIT_H +#define _VX_DLIMIT_H @@ -11211,7 +11876,7 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vserver/dlimit.h linux-3.6.6-vs2 +struct dl_info { + struct hlist_node dl_hlist; /* linked list of contexts */ + struct rcu_head dl_rcu; /* the rcu head */ -+ vserver_tag_t dl_tag; /* context tag */ ++ vs_tag_t dl_tag; /* context tag */ + atomic_t dl_usecnt; /* usage count */ + atomic_t dl_refcnt; /* reference count */ + @@ -11232,7 +11897,7 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vserver/dlimit.h linux-3.6.6-vs2 +extern void rcu_free_dl_info(struct rcu_head *); +extern void unhash_dl_info(struct dl_info *); + -+extern struct dl_info *locate_dl_info(struct super_block *, vserver_tag_t); ++extern struct dl_info *locate_dl_info(struct super_block *, vs_tag_t); + + +struct kstatfs; @@ -11245,9 +11910,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vserver/dlimit.h linux-3.6.6-vs2 +#else /* _VX_DLIMIT_H */ +#warning duplicate inclusion +#endif /* _VX_DLIMIT_H */ -diff -NurpP --minimal linux-3.6.6/include/linux/vserver/dlimit_cmd.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/dlimit_cmd.h ---- linux-3.6.6/include/linux/vserver/dlimit_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/dlimit_cmd.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vserver/dlimit_cmd.h linux-3.6.9-vs2.3.4.4/include/linux/vserver/dlimit_cmd.h +--- linux-3.6.9/include/linux/vserver/dlimit_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vserver/dlimit_cmd.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,109 @@ +#ifndef _VX_DLIMIT_CMD_H +#define _VX_DLIMIT_CMD_H @@ -11358,9 +12023,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vserver/dlimit_cmd.h linux-3.6.6 + +#endif /* __KERNEL__ */ +#endif /* _VX_DLIMIT_CMD_H */ -diff -NurpP --minimal linux-3.6.6/include/linux/vserver/global.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/global.h ---- linux-3.6.6/include/linux/vserver/global.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/global.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vserver/global.h linux-3.6.9-vs2.3.4.4/include/linux/vserver/global.h +--- linux-3.6.9/include/linux/vserver/global.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vserver/global.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,19 @@ +#ifndef _VX_GLOBAL_H +#define _VX_GLOBAL_H @@ -11381,9 +12046,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vserver/global.h linux-3.6.6-vs2 + + +#endif /* _VX_GLOBAL_H */ -diff -NurpP --minimal linux-3.6.6/include/linux/vserver/history.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/history.h ---- linux-3.6.6/include/linux/vserver/history.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/history.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vserver/history.h linux-3.6.9-vs2.3.4.4/include/linux/vserver/history.h +--- linux-3.6.9/include/linux/vserver/history.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vserver/history.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,197 @@ +#ifndef _VX_HISTORY_H +#define _VX_HISTORY_H @@ -11582,9 +12247,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vserver/history.h linux-3.6.6-vs +#endif /* CONFIG_VSERVER_HISTORY */ + +#endif /* _VX_HISTORY_H */ -diff -NurpP --minimal linux-3.6.6/include/linux/vserver/inode.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/inode.h ---- linux-3.6.6/include/linux/vserver/inode.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/inode.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vserver/inode.h linux-3.6.9-vs2.3.4.4/include/linux/vserver/inode.h +--- linux-3.6.9/include/linux/vserver/inode.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vserver/inode.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,39 @@ +#ifndef _VX_INODE_H +#define _VX_INODE_H @@ -11625,9 +12290,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vserver/inode.h linux-3.6.6-vs2. +#else /* _VX_INODE_H */ +#warning duplicate inclusion +#endif /* _VX_INODE_H */ -diff -NurpP --minimal linux-3.6.6/include/linux/vserver/inode_cmd.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/inode_cmd.h ---- linux-3.6.6/include/linux/vserver/inode_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/inode_cmd.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vserver/inode_cmd.h linux-3.6.9-vs2.3.4.4/include/linux/vserver/inode_cmd.h +--- linux-3.6.9/include/linux/vserver/inode_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vserver/inode_cmd.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,59 @@ +#ifndef _VX_INODE_CMD_H +#define _VX_INODE_CMD_H @@ -11688,9 +12353,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vserver/inode_cmd.h linux-3.6.6- + +#endif /* __KERNEL__ */ +#endif /* _VX_INODE_CMD_H */ -diff -NurpP --minimal linux-3.6.6/include/linux/vserver/limit.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/limit.h ---- linux-3.6.6/include/linux/vserver/limit.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/limit.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vserver/limit.h linux-3.6.9-vs2.3.4.4/include/linux/vserver/limit.h +--- linux-3.6.9/include/linux/vserver/limit.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vserver/limit.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,71 @@ +#ifndef _VX_LIMIT_H +#define _VX_LIMIT_H @@ -11763,9 +12428,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vserver/limit.h linux-3.6.6-vs2. + +#endif /* __KERNEL__ */ +#endif /* _VX_LIMIT_H */ -diff -NurpP --minimal linux-3.6.6/include/linux/vserver/limit_cmd.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/limit_cmd.h ---- linux-3.6.6/include/linux/vserver/limit_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/limit_cmd.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vserver/limit_cmd.h linux-3.6.9-vs2.3.4.4/include/linux/vserver/limit_cmd.h +--- linux-3.6.9/include/linux/vserver/limit_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vserver/limit_cmd.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,71 @@ +#ifndef _VX_LIMIT_CMD_H +#define _VX_LIMIT_CMD_H @@ -11838,9 +12503,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vserver/limit_cmd.h linux-3.6.6- + +#endif /* __KERNEL__ */ +#endif /* _VX_LIMIT_CMD_H */ -diff -NurpP --minimal linux-3.6.6/include/linux/vserver/limit_def.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/limit_def.h ---- linux-3.6.6/include/linux/vserver/limit_def.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/limit_def.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vserver/limit_def.h linux-3.6.9-vs2.3.4.4/include/linux/vserver/limit_def.h +--- linux-3.6.9/include/linux/vserver/limit_def.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vserver/limit_def.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,47 @@ +#ifndef _VX_LIMIT_DEF_H +#define _VX_LIMIT_DEF_H @@ -11889,9 +12554,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vserver/limit_def.h linux-3.6.6- +#endif + +#endif /* _VX_LIMIT_DEF_H */ -diff -NurpP --minimal linux-3.6.6/include/linux/vserver/limit_int.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/limit_int.h ---- linux-3.6.6/include/linux/vserver/limit_int.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/limit_int.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vserver/limit_int.h linux-3.6.9-vs2.3.4.4/include/linux/vserver/limit_int.h +--- linux-3.6.9/include/linux/vserver/limit_int.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vserver/limit_int.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,198 @@ +#ifndef _VX_LIMIT_INT_H +#define _VX_LIMIT_INT_H @@ -12091,9 +12756,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vserver/limit_int.h linux-3.6.6- + +#endif /* __KERNEL__ */ +#endif /* _VX_LIMIT_INT_H */ -diff -NurpP --minimal linux-3.6.6/include/linux/vserver/monitor.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/monitor.h ---- linux-3.6.6/include/linux/vserver/monitor.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/monitor.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vserver/monitor.h linux-3.6.9-vs2.3.4.4/include/linux/vserver/monitor.h +--- linux-3.6.9/include/linux/vserver/monitor.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vserver/monitor.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,96 @@ +#ifndef _VX_MONITOR_H +#define _VX_MONITOR_H @@ -12191,9 +12856,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vserver/monitor.h linux-3.6.6-vs + + +#endif /* _VX_MONITOR_H */ -diff -NurpP --minimal linux-3.6.6/include/linux/vserver/network.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/network.h ---- linux-3.6.6/include/linux/vserver/network.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/network.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vserver/network.h linux-3.6.9-vs2.3.4.4/include/linux/vserver/network.h +--- linux-3.6.9/include/linux/vserver/network.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vserver/network.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,148 @@ +#ifndef _VX_NETWORK_H +#define _VX_NETWORK_H @@ -12343,9 +13008,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vserver/network.h linux-3.6.6-vs + +#endif /* __KERNEL__ */ +#endif /* _VX_NETWORK_H */ -diff -NurpP --minimal linux-3.6.6/include/linux/vserver/network_cmd.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/network_cmd.h ---- linux-3.6.6/include/linux/vserver/network_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/network_cmd.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vserver/network_cmd.h linux-3.6.9-vs2.3.4.4/include/linux/vserver/network_cmd.h +--- linux-3.6.9/include/linux/vserver/network_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vserver/network_cmd.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,164 @@ +#ifndef _VX_NETWORK_CMD_H +#define _VX_NETWORK_CMD_H @@ -12511,9 +13176,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vserver/network_cmd.h linux-3.6. + +#endif /* __KERNEL__ */ +#endif /* _VX_CONTEXT_CMD_H */ -diff -NurpP --minimal linux-3.6.6/include/linux/vserver/percpu.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/percpu.h ---- linux-3.6.6/include/linux/vserver/percpu.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/percpu.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vserver/percpu.h linux-3.6.9-vs2.3.4.4/include/linux/vserver/percpu.h +--- linux-3.6.9/include/linux/vserver/percpu.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vserver/percpu.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,14 @@ +#ifndef _VX_PERCPU_H +#define _VX_PERCPU_H @@ -12529,9 +13194,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vserver/percpu.h linux-3.6.6-vs2 +#define PERCPU_PERCTX (sizeof(struct _vx_percpu)) + +#endif /* _VX_PERCPU_H */ -diff -NurpP --minimal linux-3.6.6/include/linux/vserver/pid.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/pid.h ---- linux-3.6.6/include/linux/vserver/pid.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/pid.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vserver/pid.h linux-3.6.9-vs2.3.4.4/include/linux/vserver/pid.h +--- linux-3.6.9/include/linux/vserver/pid.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vserver/pid.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,51 @@ +#ifndef _VSERVER_PID_H +#define _VSERVER_PID_H @@ -12584,9 +13249,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vserver/pid.h linux-3.6.6-vs2.3. +} + +#endif -diff -NurpP --minimal linux-3.6.6/include/linux/vserver/sched.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/sched.h ---- linux-3.6.6/include/linux/vserver/sched.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/sched.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vserver/sched.h linux-3.6.9-vs2.3.4.4/include/linux/vserver/sched.h +--- linux-3.6.9/include/linux/vserver/sched.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vserver/sched.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,23 @@ +#ifndef _VX_SCHED_H +#define _VX_SCHED_H @@ -12611,9 +13276,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vserver/sched.h linux-3.6.6-vs2. +#else /* _VX_SCHED_H */ +#warning duplicate inclusion +#endif /* _VX_SCHED_H */ -diff -NurpP --minimal linux-3.6.6/include/linux/vserver/sched_cmd.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/sched_cmd.h ---- linux-3.6.6/include/linux/vserver/sched_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/sched_cmd.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vserver/sched_cmd.h linux-3.6.9-vs2.3.4.4/include/linux/vserver/sched_cmd.h +--- linux-3.6.9/include/linux/vserver/sched_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vserver/sched_cmd.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,21 @@ +#ifndef _VX_SCHED_CMD_H +#define _VX_SCHED_CMD_H @@ -12636,9 +13301,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vserver/sched_cmd.h linux-3.6.6- + +#endif /* __KERNEL__ */ +#endif /* _VX_SCHED_CMD_H */ -diff -NurpP --minimal linux-3.6.6/include/linux/vserver/sched_def.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/sched_def.h ---- linux-3.6.6/include/linux/vserver/sched_def.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/sched_def.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vserver/sched_def.h linux-3.6.9-vs2.3.4.4/include/linux/vserver/sched_def.h +--- linux-3.6.9/include/linux/vserver/sched_def.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vserver/sched_def.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,38 @@ +#ifndef _VX_SCHED_DEF_H +#define _VX_SCHED_DEF_H @@ -12678,9 +13343,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vserver/sched_def.h linux-3.6.6- +#endif + +#endif /* _VX_SCHED_DEF_H */ -diff -NurpP --minimal linux-3.6.6/include/linux/vserver/signal.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/signal.h ---- linux-3.6.6/include/linux/vserver/signal.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/signal.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vserver/signal.h linux-3.6.9-vs2.3.4.4/include/linux/vserver/signal.h +--- linux-3.6.9/include/linux/vserver/signal.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vserver/signal.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,14 @@ +#ifndef _VX_SIGNAL_H +#define _VX_SIGNAL_H @@ -12696,9 +13361,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vserver/signal.h linux-3.6.6-vs2 +#else /* _VX_SIGNAL_H */ +#warning duplicate inclusion +#endif /* _VX_SIGNAL_H */ -diff -NurpP --minimal linux-3.6.6/include/linux/vserver/signal_cmd.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/signal_cmd.h ---- linux-3.6.6/include/linux/vserver/signal_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/signal_cmd.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vserver/signal_cmd.h linux-3.6.9-vs2.3.4.4/include/linux/vserver/signal_cmd.h +--- linux-3.6.9/include/linux/vserver/signal_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vserver/signal_cmd.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,43 @@ +#ifndef _VX_SIGNAL_CMD_H +#define _VX_SIGNAL_CMD_H @@ -12743,9 +13408,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vserver/signal_cmd.h linux-3.6.6 + +#endif /* __KERNEL__ */ +#endif /* _VX_SIGNAL_CMD_H */ -diff -NurpP --minimal linux-3.6.6/include/linux/vserver/space.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/space.h ---- linux-3.6.6/include/linux/vserver/space.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/space.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vserver/space.h linux-3.6.9-vs2.3.4.4/include/linux/vserver/space.h +--- linux-3.6.9/include/linux/vserver/space.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vserver/space.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,12 @@ +#ifndef _VX_SPACE_H +#define _VX_SPACE_H @@ -12759,9 +13424,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vserver/space.h linux-3.6.6-vs2. +#else /* _VX_SPACE_H */ +#warning duplicate inclusion +#endif /* _VX_SPACE_H */ -diff -NurpP --minimal linux-3.6.6/include/linux/vserver/space_cmd.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/space_cmd.h ---- linux-3.6.6/include/linux/vserver/space_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/space_cmd.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vserver/space_cmd.h linux-3.6.9-vs2.3.4.4/include/linux/vserver/space_cmd.h +--- linux-3.6.9/include/linux/vserver/space_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vserver/space_cmd.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,38 @@ +#ifndef _VX_SPACE_CMD_H +#define _VX_SPACE_CMD_H @@ -12801,9 +13466,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vserver/space_cmd.h linux-3.6.6- + +#endif /* __KERNEL__ */ +#endif /* _VX_SPACE_CMD_H */ -diff -NurpP --minimal linux-3.6.6/include/linux/vserver/switch.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/switch.h ---- linux-3.6.6/include/linux/vserver/switch.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/switch.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vserver/switch.h linux-3.6.9-vs2.3.4.4/include/linux/vserver/switch.h +--- linux-3.6.9/include/linux/vserver/switch.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vserver/switch.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,98 @@ +#ifndef _VX_SWITCH_H +#define _VX_SWITCH_H @@ -12903,9 +13568,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vserver/switch.h linux-3.6.6-vs2 + +#endif /* _VX_SWITCH_H */ + -diff -NurpP --minimal linux-3.6.6/include/linux/vserver/tag.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/tag.h ---- linux-3.6.6/include/linux/vserver/tag.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/tag.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vserver/tag.h linux-3.6.9-vs2.3.4.4/include/linux/vserver/tag.h +--- linux-3.6.9/include/linux/vserver/tag.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vserver/tag.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,143 @@ +#ifndef _DX_TAG_H +#define _DX_TAG_H @@ -13036,7 +13701,7 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vserver/tag.h linux-3.6.6-vs2.3. + +#define dx_notagcheck(sb) ((sb) && ((sb)->s_flags & MS_NOTAGCHECK)) + -+int dx_parse_tag(char *string, vserver_tag_t *tag, int remove, int *mnt_flags, ++int dx_parse_tag(char *string, vs_tag_t *tag, int remove, int *mnt_flags, + unsigned long *flags); + +#ifdef CONFIG_PROPAGATE @@ -13050,9 +13715,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vserver/tag.h linux-3.6.6-vs2.3. +#endif + +#endif /* _DX_TAG_H */ -diff -NurpP --minimal linux-3.6.6/include/linux/vserver/tag_cmd.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/tag_cmd.h ---- linux-3.6.6/include/linux/vserver/tag_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/linux/vserver/tag_cmd.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/linux/vserver/tag_cmd.h linux-3.6.9-vs2.3.4.4/include/linux/vserver/tag_cmd.h +--- linux-3.6.9/include/linux/vserver/tag_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/linux/vserver/tag_cmd.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,22 @@ +#ifndef _VX_TAG_CMD_H +#define _VX_TAG_CMD_H @@ -13076,9 +13741,9 @@ diff -NurpP --minimal linux-3.6.6/include/linux/vserver/tag_cmd.h linux-3.6.6-vs + +#endif /* __KERNEL__ */ +#endif /* _VX_TAG_CMD_H */ -diff -NurpP --minimal linux-3.6.6/include/net/addrconf.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/net/addrconf.h ---- linux-3.6.6/include/net/addrconf.h 2012-10-04 15:27:47.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/net/addrconf.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/net/addrconf.h linux-3.6.9-vs2.3.4.4/include/net/addrconf.h +--- linux-3.6.9/include/net/addrconf.h 2012-10-04 15:27:47.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/include/net/addrconf.h 2012-10-04 18:47:00.000000000 +0200 @@ -81,7 +81,8 @@ extern int ipv6_dev_get_saddr(struct n struct net_device *dev, const struct in6_addr *daddr, @@ -13089,9 +13754,9 @@ diff -NurpP --minimal linux-3.6.6/include/net/addrconf.h linux-3.6.6-vs2.3.4.3.1 extern int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr, unsigned char banned_flags); -diff -NurpP --minimal linux-3.6.6/include/net/af_unix.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/net/af_unix.h ---- linux-3.6.6/include/net/af_unix.h 2012-10-04 15:27:47.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/net/af_unix.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/net/af_unix.h linux-3.6.9-vs2.3.4.4/include/net/af_unix.h +--- linux-3.6.9/include/net/af_unix.h 2012-10-04 15:27:47.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/include/net/af_unix.h 2012-10-04 18:47:00.000000000 +0200 @@ -4,6 +4,7 @@ #include #include @@ -13100,9 +13765,9 @@ diff -NurpP --minimal linux-3.6.6/include/net/af_unix.h linux-3.6.6-vs2.3.4.3.1- #include extern void unix_inflight(struct file *fp); -diff -NurpP --minimal linux-3.6.6/include/net/inet_timewait_sock.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/net/inet_timewait_sock.h ---- linux-3.6.6/include/net/inet_timewait_sock.h 2012-03-19 19:47:29.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/net/inet_timewait_sock.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/net/inet_timewait_sock.h linux-3.6.9-vs2.3.4.4/include/net/inet_timewait_sock.h +--- linux-3.6.9/include/net/inet_timewait_sock.h 2012-03-19 19:47:29.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/net/inet_timewait_sock.h 2012-10-04 18:47:00.000000000 +0200 @@ -112,6 +112,10 @@ struct inet_timewait_sock { #define tw_net __tw_common.skc_net #define tw_daddr __tw_common.skc_daddr @@ -13114,9 +13779,9 @@ diff -NurpP --minimal linux-3.6.6/include/net/inet_timewait_sock.h linux-3.6.6-v int tw_timeout; volatile unsigned char tw_substate; unsigned char tw_rcv_wscale; -diff -NurpP --minimal linux-3.6.6/include/net/ip6_route.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/net/ip6_route.h ---- linux-3.6.6/include/net/ip6_route.h 2012-10-04 15:27:47.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/net/ip6_route.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/net/ip6_route.h linux-3.6.9-vs2.3.4.4/include/net/ip6_route.h +--- linux-3.6.9/include/net/ip6_route.h 2012-10-04 15:27:47.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/include/net/ip6_route.h 2012-10-04 18:47:00.000000000 +0200 @@ -97,7 +97,8 @@ extern int ip6_route_get_saddr(struct struct rt6_info *rt, const struct in6_addr *daddr, @@ -13127,9 +13792,9 @@ diff -NurpP --minimal linux-3.6.6/include/net/ip6_route.h linux-3.6.6-vs2.3.4.3. extern struct rt6_info *rt6_lookup(struct net *net, const struct in6_addr *daddr, -diff -NurpP --minimal linux-3.6.6/include/net/route.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/net/route.h ---- linux-3.6.6/include/net/route.h 2012-11-06 18:42:13.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/net/route.h 2012-11-06 18:43:41.000000000 +0100 +diff -NurpP --minimal linux-3.6.9/include/net/route.h linux-3.6.9-vs2.3.4.4/include/net/route.h +--- linux-3.6.9/include/net/route.h 2012-12-08 01:34:14.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/include/net/route.h 2012-11-06 18:43:41.000000000 +0100 @@ -204,6 +204,9 @@ static inline void ip_rt_put(struct rtab dst_release(&rt->dst); } @@ -13177,9 +13842,9 @@ diff -NurpP --minimal linux-3.6.6/include/net/route.h linux-3.6.6-vs2.3.4.3.1-no rt = __ip_route_output_key(net, fl4); if (IS_ERR(rt)) return rt; -diff -NurpP --minimal linux-3.6.6/include/net/sock.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/net/sock.h ---- linux-3.6.6/include/net/sock.h 2012-10-04 15:27:47.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/include/net/sock.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/include/net/sock.h linux-3.6.9-vs2.3.4.4/include/net/sock.h +--- linux-3.6.9/include/net/sock.h 2012-10-04 15:27:47.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/include/net/sock.h 2012-10-04 18:47:00.000000000 +0200 @@ -171,6 +171,10 @@ struct sock_common { #ifdef CONFIG_NET_NS struct net *skc_net; @@ -13202,9 +13867,9 @@ diff -NurpP --minimal linux-3.6.6/include/net/sock.h linux-3.6.6-vs2.3.4.3.1-nox socket_lock_t sk_lock; struct sk_buff_head sk_receive_queue; /* -diff -NurpP --minimal linux-3.6.6/init/Kconfig linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/init/Kconfig ---- linux-3.6.6/init/Kconfig 2012-10-04 15:27:48.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/init/Kconfig 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/init/Kconfig linux-3.6.9-vs2.3.4.4/init/Kconfig +--- linux-3.6.9/init/Kconfig 2012-10-04 15:27:48.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/init/Kconfig 2012-10-04 18:47:00.000000000 +0200 @@ -624,6 +624,7 @@ config HAVE_UNSTABLE_SCHED_CLOCK menuconfig CGROUPS boolean "Control Group support" @@ -13221,9 +13886,9 @@ diff -NurpP --minimal linux-3.6.6/init/Kconfig linux-3.6.6-vs2.3.4.3.1-noxfs-noc select UIDGID_STRICT_TYPE_CHECKS default n -diff -NurpP --minimal linux-3.6.6/init/main.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/init/main.c ---- linux-3.6.6/init/main.c 2012-11-06 18:42:13.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/init/main.c 2012-11-06 18:43:41.000000000 +0100 +diff -NurpP --minimal linux-3.6.9/init/main.c linux-3.6.9-vs2.3.4.4/init/main.c +--- linux-3.6.9/init/main.c 2012-12-08 01:34:14.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/init/main.c 2012-11-06 18:43:41.000000000 +0100 @@ -69,6 +69,7 @@ #include #include @@ -13232,9 +13897,9 @@ diff -NurpP --minimal linux-3.6.6/init/main.c linux-3.6.6-vs2.3.4.3.1-noxfs-noco #include #include -diff -NurpP --minimal linux-3.6.6/ipc/mqueue.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/ipc/mqueue.c ---- linux-3.6.6/ipc/mqueue.c 2012-10-04 15:27:48.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/ipc/mqueue.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/ipc/mqueue.c linux-3.6.9-vs2.3.4.4/ipc/mqueue.c +--- linux-3.6.9/ipc/mqueue.c 2012-10-04 15:27:48.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/ipc/mqueue.c 2012-10-04 18:47:00.000000000 +0200 @@ -35,6 +35,8 @@ #include #include @@ -13310,9 +13975,9 @@ diff -NurpP --minimal linux-3.6.6/ipc/mqueue.c linux-3.6.6-vs2.3.4.3.1-noxfs-noc free_uid(user); } if (ipc_ns) -diff -NurpP --minimal linux-3.6.6/ipc/msg.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/ipc/msg.c ---- linux-3.6.6/ipc/msg.c 2011-05-22 16:17:59.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/ipc/msg.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/ipc/msg.c linux-3.6.9-vs2.3.4.4/ipc/msg.c +--- linux-3.6.9/ipc/msg.c 2011-05-22 16:17:59.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/ipc/msg.c 2012-10-04 18:47:00.000000000 +0200 @@ -37,6 +37,7 @@ #include #include @@ -13329,9 +13994,9 @@ diff -NurpP --minimal linux-3.6.6/ipc/msg.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/ msq->q_perm.security = NULL; retval = security_msg_queue_alloc(msq); -diff -NurpP --minimal linux-3.6.6/ipc/namespace.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/ipc/namespace.c ---- linux-3.6.6/ipc/namespace.c 2012-07-22 23:39:46.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/ipc/namespace.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/ipc/namespace.c linux-3.6.9-vs2.3.4.4/ipc/namespace.c +--- linux-3.6.9/ipc/namespace.c 2012-07-22 23:39:46.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/ipc/namespace.c 2012-10-04 18:47:00.000000000 +0200 @@ -13,11 +13,12 @@ #include #include @@ -13373,9 +14038,9 @@ diff -NurpP --minimal linux-3.6.6/ipc/namespace.c linux-3.6.6-vs2.3.4.3.1-noxfs- } /* -diff -NurpP --minimal linux-3.6.6/ipc/sem.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/ipc/sem.c ---- linux-3.6.6/ipc/sem.c 2012-01-09 16:14:59.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/ipc/sem.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/ipc/sem.c linux-3.6.9-vs2.3.4.4/ipc/sem.c +--- linux-3.6.9/ipc/sem.c 2012-01-09 16:14:59.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/ipc/sem.c 2012-10-04 18:47:00.000000000 +0200 @@ -86,6 +86,8 @@ #include #include @@ -13413,9 +14078,9 @@ diff -NurpP --minimal linux-3.6.6/ipc/sem.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/ security_sem_free(sma); ipc_rcu_putref(sma); } -diff -NurpP --minimal linux-3.6.6/ipc/shm.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/ipc/shm.c ---- linux-3.6.6/ipc/shm.c 2012-10-04 15:27:48.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/ipc/shm.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/ipc/shm.c linux-3.6.9-vs2.3.4.4/ipc/shm.c +--- linux-3.6.9/ipc/shm.c 2012-10-04 15:27:48.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/ipc/shm.c 2012-10-04 18:47:00.000000000 +0200 @@ -39,6 +39,8 @@ #include #include @@ -13471,9 +14136,9 @@ diff -NurpP --minimal linux-3.6.6/ipc/shm.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/ return error; no_id: -diff -NurpP --minimal linux-3.6.6/kernel/Makefile linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/Makefile ---- linux-3.6.6/kernel/Makefile 2012-07-22 23:39:46.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/Makefile 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/Makefile linux-3.6.9-vs2.3.4.4/kernel/Makefile +--- linux-3.6.9/kernel/Makefile 2012-07-22 23:39:46.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/kernel/Makefile 2012-10-04 18:47:00.000000000 +0200 @@ -24,6 +24,7 @@ endif obj-y += sched/ @@ -13482,9 +14147,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/Makefile linux-3.6.6-vs2.3.4.3.1-noxfs- ifeq ($(CONFIG_CHECKPOINT_RESTORE),y) obj-$(CONFIG_X86) += kcmp.o -diff -NurpP --minimal linux-3.6.6/kernel/auditsc.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/auditsc.c ---- linux-3.6.6/kernel/auditsc.c 2012-07-22 23:39:46.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/auditsc.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/auditsc.c linux-3.6.9-vs2.3.4.4/kernel/auditsc.c +--- linux-3.6.9/kernel/auditsc.c 2012-07-22 23:39:46.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/kernel/auditsc.c 2012-10-04 18:47:00.000000000 +0200 @@ -2309,7 +2309,7 @@ int audit_set_loginuid(uid_t loginuid) if (task->loginuid != -1) return -EPERM; @@ -13494,9 +14159,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/auditsc.c linux-3.6.6-vs2.3.4.3.1-noxfs return -EPERM; #endif /* CONFIG_AUDIT_LOGINUID_IMMUTABLE */ -diff -NurpP --minimal linux-3.6.6/kernel/capability.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/capability.c ---- linux-3.6.6/kernel/capability.c 2012-07-22 23:39:46.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/capability.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/capability.c linux-3.6.9-vs2.3.4.4/kernel/capability.c +--- linux-3.6.9/kernel/capability.c 2012-07-22 23:39:46.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/kernel/capability.c 2012-10-04 18:47:00.000000000 +0200 @@ -15,6 +15,7 @@ #include #include @@ -13522,9 +14187,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/capability.c linux-3.6.6-vs2.3.4.3.1-no /** * has_capability_noaudit - Does a task have a capability (unaudited) in the * initial user ns -diff -NurpP --minimal linux-3.6.6/kernel/compat.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/compat.c ---- linux-3.6.6/kernel/compat.c 2012-07-22 23:39:46.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/compat.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/compat.c linux-3.6.9-vs2.3.4.4/kernel/compat.c +--- linux-3.6.9/kernel/compat.c 2012-07-22 23:39:46.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/kernel/compat.c 2012-10-04 18:47:00.000000000 +0200 @@ -1054,7 +1054,7 @@ asmlinkage long compat_sys_stime(compat_ if (err) return err; @@ -13534,9 +14199,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/compat.c linux-3.6.6-vs2.3.4.3.1-noxfs- return 0; } -diff -NurpP --minimal linux-3.6.6/kernel/cred.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/cred.c ---- linux-3.6.6/kernel/cred.c 2012-07-22 23:39:46.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/cred.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/cred.c linux-3.6.9-vs2.3.4.4/kernel/cred.c +--- linux-3.6.9/kernel/cred.c 2012-07-22 23:39:46.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/kernel/cred.c 2012-10-04 18:47:00.000000000 +0200 @@ -70,31 +70,6 @@ struct cred init_cred = { #endif }; @@ -13606,9 +14271,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/cred.c linux-3.6.6-vs2.3.4.3.1-noxfs-no EXPORT_SYMBOL(prepare_creds); /* -diff -NurpP --minimal linux-3.6.6/kernel/exit.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/exit.c ---- linux-3.6.6/kernel/exit.c 2012-10-04 15:27:48.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/exit.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/exit.c linux-3.6.9-vs2.3.4.4/kernel/exit.c +--- linux-3.6.9/kernel/exit.c 2012-10-04 15:27:48.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/kernel/exit.c 2012-12-08 01:20:39.000000000 +0100 @@ -48,6 +48,10 @@ #include #include @@ -13632,7 +14297,65 @@ diff -NurpP --minimal linux-3.6.6/kernel/exit.c linux-3.6.6-vs2.3.4.3.1-noxfs-no } } } -@@ -1018,6 +1024,9 @@ void do_exit(long code) +@@ -711,15 +717,25 @@ static struct task_struct *find_new_reap + __acquires(&tasklist_lock) + { + struct pid_namespace *pid_ns = task_active_pid_ns(father); +- struct task_struct *thread; ++ struct vx_info *vxi = task_get_vx_info(father); ++ struct task_struct *thread = father; ++ struct task_struct *reaper; + +- thread = father; + while_each_thread(father, thread) { + if (thread->flags & PF_EXITING) + continue; + if (unlikely(pid_ns->child_reaper == father)) + pid_ns->child_reaper = thread; +- return thread; ++ reaper = thread; ++ goto out_put; ++ } ++ ++ reaper = pid_ns->child_reaper; ++ if (vxi) { ++ BUG_ON(!vxi->vx_reaper); ++ if (vxi->vx_reaper != init_pid_ns.child_reaper && ++ vxi->vx_reaper != father) ++ reaper = vxi->vx_reaper; + } + + if (unlikely(pid_ns->child_reaper == father)) { +@@ -757,7 +773,9 @@ static struct task_struct *find_new_reap + } + } + +- return pid_ns->child_reaper; ++out_put: ++ put_vx_info(vxi); ++ return reaper; + } + + /* +@@ -808,10 +826,15 @@ static void forget_original_parent(struc + list_for_each_entry_safe(p, n, &father->children, sibling) { + struct task_struct *t = p; + do { +- t->real_parent = reaper; ++ struct task_struct *new_parent = reaper; ++ ++ if (unlikely(p == reaper)) ++ new_parent = task_active_pid_ns(p)->child_reaper; ++ ++ t->real_parent = new_parent; + if (t->parent == father) { + BUG_ON(t->ptrace); +- t->parent = t->real_parent; ++ t->parent = new_parent; + } + if (t->pdeath_signal) + group_send_sig_info(t->pdeath_signal, +@@ -1018,6 +1041,9 @@ void do_exit(long code) */ ptrace_put_breakpoints(tsk); @@ -13642,7 +14365,7 @@ diff -NurpP --minimal linux-3.6.6/kernel/exit.c linux-3.6.6-vs2.3.4.3.1-noxfs-no exit_notify(tsk, group_dead); #ifdef CONFIG_NUMA task_lock(tsk); -@@ -1068,10 +1077,15 @@ void do_exit(long code) +@@ -1068,10 +1094,15 @@ void do_exit(long code) smp_mb(); raw_spin_unlock_wait(&tsk->pi_lock); @@ -13658,9 +14381,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/exit.c linux-3.6.6-vs2.3.4.3.1-noxfs-no BUG(); /* Avoid "noreturn function does return". */ for (;;) -diff -NurpP --minimal linux-3.6.6/kernel/fork.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/fork.c ---- linux-3.6.6/kernel/fork.c 2012-10-04 15:27:48.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/fork.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/fork.c linux-3.6.9-vs2.3.4.4/kernel/fork.c +--- linux-3.6.9/kernel/fork.c 2012-10-04 15:27:48.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/kernel/fork.c 2012-10-04 18:47:00.000000000 +0200 @@ -70,6 +70,9 @@ #include #include @@ -13753,9 +14476,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/fork.c linux-3.6.6-vs2.3.4.3.1-noxfs-no write_unlock_irq(&tasklist_lock); proc_fork_connector(p); cgroup_post_fork(p); -diff -NurpP --minimal linux-3.6.6/kernel/kthread.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/kthread.c ---- linux-3.6.6/kernel/kthread.c 2012-10-04 15:27:48.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/kthread.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/kthread.c linux-3.6.9-vs2.3.4.4/kernel/kthread.c +--- linux-3.6.9/kernel/kthread.c 2012-10-04 15:27:48.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/kernel/kthread.c 2012-10-04 18:47:00.000000000 +0200 @@ -16,6 +16,7 @@ #include #include @@ -13764,9 +14487,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/kthread.c linux-3.6.6-vs2.3.4.3.1-noxfs #include static DEFINE_SPINLOCK(kthread_create_lock); -diff -NurpP --minimal linux-3.6.6/kernel/nsproxy.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/nsproxy.c ---- linux-3.6.6/kernel/nsproxy.c 2012-01-09 16:15:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/nsproxy.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/nsproxy.c linux-3.6.9-vs2.3.4.4/kernel/nsproxy.c +--- linux-3.6.9/kernel/nsproxy.c 2012-01-09 16:15:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/kernel/nsproxy.c 2012-10-04 18:47:00.000000000 +0200 @@ -20,11 +20,14 @@ #include #include @@ -13948,9 +14671,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/nsproxy.c linux-3.6.6-vs2.3.4.3.1-noxfs return -EPERM; *new_nsp = create_new_namespaces(unshare_flags, current, -diff -NurpP --minimal linux-3.6.6/kernel/pid.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/pid.c ---- linux-3.6.6/kernel/pid.c 2012-07-22 23:39:46.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/pid.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/pid.c linux-3.6.9-vs2.3.4.4/kernel/pid.c +--- linux-3.6.9/kernel/pid.c 2012-07-22 23:39:46.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/kernel/pid.c 2012-10-04 18:47:00.000000000 +0200 @@ -36,6 +36,7 @@ #include #include @@ -14008,9 +14731,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/pid.c linux-3.6.6-vs2.3.4.3.1-noxfs-noc pid_t pid_vnr(struct pid *pid) { return pid_nr_ns(pid, current->nsproxy->pid_ns); -diff -NurpP --minimal linux-3.6.6/kernel/pid_namespace.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/pid_namespace.c ---- linux-3.6.6/kernel/pid_namespace.c 2012-10-04 15:27:48.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/pid_namespace.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/pid_namespace.c linux-3.6.9-vs2.3.4.4/kernel/pid_namespace.c +--- linux-3.6.9/kernel/pid_namespace.c 2012-10-04 15:27:48.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/kernel/pid_namespace.c 2012-10-04 18:47:00.000000000 +0200 @@ -16,6 +16,7 @@ #include #include @@ -14035,9 +14758,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/pid_namespace.c linux-3.6.6-vs2.3.4.3.1 kmem_cache_free(pid_ns_cachep, ns); } -diff -NurpP --minimal linux-3.6.6/kernel/posix-timers.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/posix-timers.c ---- linux-3.6.6/kernel/posix-timers.c 2012-01-09 16:15:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/posix-timers.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/posix-timers.c linux-3.6.9-vs2.3.4.4/kernel/posix-timers.c +--- linux-3.6.9/kernel/posix-timers.c 2012-01-09 16:15:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/kernel/posix-timers.c 2012-10-04 18:47:00.000000000 +0200 @@ -47,6 +47,7 @@ #include #include @@ -14073,9 +14796,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/posix-timers.c linux-3.6.6-vs2.3.4.3.1- /* If we failed to send the signal the timer stops. */ return ret > 0; } -diff -NurpP --minimal linux-3.6.6/kernel/printk.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/printk.c ---- linux-3.6.6/kernel/printk.c 2012-10-04 15:27:48.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/printk.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/printk.c linux-3.6.9-vs2.3.4.4/kernel/printk.c +--- linux-3.6.9/kernel/printk.c 2012-10-04 15:27:48.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/kernel/printk.c 2012-10-04 18:47:00.000000000 +0200 @@ -42,6 +42,7 @@ #include #include @@ -14143,9 +14866,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/printk.c linux-3.6.6-vs2.3.4.3.1-noxfs- error = syslog_print_all(buf, len, clear); break; /* Clear ring buffer */ -diff -NurpP --minimal linux-3.6.6/kernel/ptrace.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/ptrace.c ---- linux-3.6.6/kernel/ptrace.c 2012-07-22 23:39:46.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/ptrace.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/ptrace.c linux-3.6.9-vs2.3.4.4/kernel/ptrace.c +--- linux-3.6.9/kernel/ptrace.c 2012-07-22 23:39:46.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/kernel/ptrace.c 2012-10-04 18:47:00.000000000 +0200 @@ -22,6 +22,7 @@ #include #include @@ -14166,9 +14889,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/ptrace.c linux-3.6.6-vs2.3.4.3.1-noxfs- return security_ptrace_access_check(task, mode); } -diff -NurpP --minimal linux-3.6.6/kernel/sched/core.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/sched/core.c ---- linux-3.6.6/kernel/sched/core.c 2012-11-06 18:42:14.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/sched/core.c 2012-11-06 18:43:41.000000000 +0100 +diff -NurpP --minimal linux-3.6.9/kernel/sched/core.c linux-3.6.9-vs2.3.4.4/kernel/sched/core.c +--- linux-3.6.9/kernel/sched/core.c 2012-12-08 01:34:15.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/kernel/sched/core.c 2012-11-06 18:43:41.000000000 +0100 @@ -72,6 +72,8 @@ #include #include @@ -14240,9 +14963,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/sched/core.c linux-3.6.6-vs2.3.4.3.1-no retval = security_task_setnice(current, nice); if (retval) -diff -NurpP --minimal linux-3.6.6/kernel/sched/fair.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/sched/fair.c ---- linux-3.6.6/kernel/sched/fair.c 2012-10-04 15:27:48.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/sched/fair.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/sched/fair.c linux-3.6.9-vs2.3.4.4/kernel/sched/fair.c +--- linux-3.6.9/kernel/sched/fair.c 2012-10-04 15:27:48.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/kernel/sched/fair.c 2012-10-04 18:47:00.000000000 +0200 @@ -26,6 +26,7 @@ #include #include @@ -14269,9 +14992,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/sched/fair.c linux-3.6.6-vs2.3.4.3.1-no update_cfs_load(cfs_rq, 0); account_entity_dequeue(cfs_rq, se); -diff -NurpP --minimal linux-3.6.6/kernel/signal.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/signal.c ---- linux-3.6.6/kernel/signal.c 2012-10-04 15:27:48.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/signal.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/signal.c linux-3.6.9-vs2.3.4.4/kernel/signal.c +--- linux-3.6.9/kernel/signal.c 2012-10-04 15:27:48.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/kernel/signal.c 2012-10-04 18:47:00.000000000 +0200 @@ -30,6 +30,8 @@ #include #include @@ -14364,9 +15087,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/signal.c linux-3.6.6-vs2.3.4.3.1-noxfs- if (sig_kernel_stop(signr)) { /* * The default action is to stop all threads in -diff -NurpP --minimal linux-3.6.6/kernel/softirq.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/softirq.c ---- linux-3.6.6/kernel/softirq.c 2012-10-04 15:27:48.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/softirq.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/softirq.c linux-3.6.9-vs2.3.4.4/kernel/softirq.c +--- linux-3.6.9/kernel/softirq.c 2012-10-04 15:27:48.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/kernel/softirq.c 2012-10-04 18:47:00.000000000 +0200 @@ -24,6 +24,7 @@ #include #include @@ -14375,9 +15098,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/softirq.c linux-3.6.6-vs2.3.4.3.1-noxfs #define CREATE_TRACE_POINTS #include -diff -NurpP --minimal linux-3.6.6/kernel/sys.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/sys.c ---- linux-3.6.6/kernel/sys.c 2012-11-06 18:42:14.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/sys.c 2012-11-06 18:43:41.000000000 +0100 +diff -NurpP --minimal linux-3.6.9/kernel/sys.c linux-3.6.9-vs2.3.4.4/kernel/sys.c +--- linux-3.6.9/kernel/sys.c 2012-12-08 01:34:15.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/kernel/sys.c 2012-11-06 18:43:41.000000000 +0100 @@ -47,6 +47,7 @@ #include #include @@ -14474,9 +15197,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/sys.c linux-3.6.6-vs2.3.4.3.1-noxfs-noc return 0; return -EPERM; -diff -NurpP --minimal linux-3.6.6/kernel/sysctl.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/sysctl.c ---- linux-3.6.6/kernel/sysctl.c 2012-10-04 15:27:48.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/sysctl.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/sysctl.c linux-3.6.9-vs2.3.4.4/kernel/sysctl.c +--- linux-3.6.9/kernel/sysctl.c 2012-10-04 15:27:48.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/kernel/sysctl.c 2012-10-04 18:47:00.000000000 +0200 @@ -82,6 +82,7 @@ #if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_LOCK_STAT) #include @@ -14499,9 +15222,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/sysctl.c linux-3.6.6-vs2.3.4.3.1-noxfs- #ifdef CONFIG_CHR_DEV_SG { .procname = "sg-big-buff", -diff -NurpP --minimal linux-3.6.6/kernel/sysctl_binary.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/sysctl_binary.c ---- linux-3.6.6/kernel/sysctl_binary.c 2012-10-04 15:27:48.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/sysctl_binary.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/sysctl_binary.c linux-3.6.9-vs2.3.4.4/kernel/sysctl_binary.c +--- linux-3.6.9/kernel/sysctl_binary.c 2012-10-04 15:27:48.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/kernel/sysctl_binary.c 2012-10-04 18:47:00.000000000 +0200 @@ -73,6 +73,7 @@ static const struct bin_table bin_kern_t { CTL_INT, KERN_PANIC, "panic" }, @@ -14510,9 +15233,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/sysctl_binary.c linux-3.6.6-vs2.3.4.3.1 { CTL_STR, KERN_SPARC_REBOOT, "reboot-cmd" }, { CTL_INT, KERN_CTLALTDEL, "ctrl-alt-del" }, -diff -NurpP --minimal linux-3.6.6/kernel/time/timekeeping.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/time/timekeeping.c ---- linux-3.6.6/kernel/time/timekeeping.c 2012-11-06 18:42:14.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/time/timekeeping.c 2012-11-06 18:43:41.000000000 +0100 +diff -NurpP --minimal linux-3.6.9/kernel/time/timekeeping.c linux-3.6.9-vs2.3.4.4/kernel/time/timekeeping.c +--- linux-3.6.9/kernel/time/timekeeping.c 2012-12-08 01:34:15.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/kernel/time/timekeeping.c 2012-11-06 18:43:41.000000000 +0100 @@ -309,6 +309,7 @@ void getnstimeofday(struct timespec *ts) ts->tv_nsec = 0; @@ -14521,9 +15244,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/time/timekeeping.c linux-3.6.6-vs2.3.4. } EXPORT_SYMBOL(getnstimeofday); -diff -NurpP --minimal linux-3.6.6/kernel/time.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/time.c ---- linux-3.6.6/kernel/time.c 2012-05-21 18:07:34.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/time.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/time.c linux-3.6.9-vs2.3.4.4/kernel/time.c +--- linux-3.6.9/kernel/time.c 2012-05-21 18:07:34.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/kernel/time.c 2012-10-04 18:47:00.000000000 +0200 @@ -92,7 +92,7 @@ SYSCALL_DEFINE1(stime, time_t __user *, if (err) return err; @@ -14542,9 +15265,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/time.c linux-3.6.6-vs2.3.4.3.1-noxfs-no return 0; } -diff -NurpP --minimal linux-3.6.6/kernel/timer.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/timer.c ---- linux-3.6.6/kernel/timer.c 2012-11-06 18:42:14.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/timer.c 2012-11-06 18:43:41.000000000 +0100 +diff -NurpP --minimal linux-3.6.9/kernel/timer.c linux-3.6.9-vs2.3.4.4/kernel/timer.c +--- linux-3.6.9/kernel/timer.c 2012-12-08 01:34:15.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/kernel/timer.c 2012-11-06 18:43:41.000000000 +0100 @@ -40,6 +40,10 @@ #include #include @@ -14556,9 +15279,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/timer.c linux-3.6.6-vs2.3.4.3.1-noxfs-n #include #include -diff -NurpP --minimal linux-3.6.6/kernel/user_namespace.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/user_namespace.c ---- linux-3.6.6/kernel/user_namespace.c 2012-07-22 23:39:47.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/user_namespace.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/user_namespace.c linux-3.6.9-vs2.3.4.4/kernel/user_namespace.c +--- linux-3.6.9/kernel/user_namespace.c 2012-07-22 23:39:47.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/kernel/user_namespace.c 2012-10-04 18:47:00.000000000 +0200 @@ -19,6 +19,7 @@ #include #include @@ -14585,9 +15308,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/user_namespace.c linux-3.6.6-vs2.3.4.3. put_user_ns(parent); } EXPORT_SYMBOL(free_user_ns); -diff -NurpP --minimal linux-3.6.6/kernel/utsname.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/utsname.c ---- linux-3.6.6/kernel/utsname.c 2012-07-22 23:39:47.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/utsname.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/utsname.c linux-3.6.9-vs2.3.4.4/kernel/utsname.c +--- linux-3.6.9/kernel/utsname.c 2012-07-22 23:39:47.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/kernel/utsname.c 2012-10-04 18:47:00.000000000 +0200 @@ -16,14 +16,17 @@ #include #include @@ -14656,9 +15379,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/utsname.c linux-3.6.6-vs2.3.4.3.1-noxfs kfree(ns); } -diff -NurpP --minimal linux-3.6.6/kernel/vserver/Kconfig linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/Kconfig ---- linux-3.6.6/kernel/vserver/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/Kconfig 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/vserver/Kconfig linux-3.6.9-vs2.3.4.4/kernel/vserver/Kconfig +--- linux-3.6.9/kernel/vserver/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/kernel/vserver/Kconfig 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,224 @@ +# +# Linux VServer configuration @@ -14687,14 +15410,14 @@ diff -NurpP --minimal linux-3.6.6/kernel/vserver/Kconfig linux-3.6.6-vs2.3.4.3.1 + (note: such guests do not allow to change the ip + on the fly and do not show loopback addresses) + -+ -+ -+ -+ -+ -+ -+ -+ ++config VSERVER_COWBL ++ bool "Enable COW Immutable Link Breaking" ++ default y ++ help ++ This enables the COW (Copy-On-Write) link break code. ++ It allows you to treat unified files like normal files ++ when writing to them (which will implicitely break the ++ link and create a copy of the unified file) + +config VSERVER_VTIME + bool "Enable Virtualized Guest Time" @@ -14884,9 +15607,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/vserver/Kconfig linux-3.6.6-vs2.3.4.3.1 + bool + default n + -diff -NurpP --minimal linux-3.6.6/kernel/vserver/Makefile linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/Makefile ---- linux-3.6.6/kernel/vserver/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/Makefile 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/vserver/Makefile linux-3.6.9-vs2.3.4.4/kernel/vserver/Makefile +--- linux-3.6.9/kernel/vserver/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/kernel/vserver/Makefile 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,18 @@ +# +# Makefile for the Linux vserver routines. @@ -14906,9 +15629,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/vserver/Makefile linux-3.6.6-vs2.3.4.3. +vserver-$(CONFIG_VSERVER_MONITOR) += monitor.o +vserver-$(CONFIG_VSERVER_DEVICE) += device.o + -diff -NurpP --minimal linux-3.6.6/kernel/vserver/cacct.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/cacct.c ---- linux-3.6.6/kernel/vserver/cacct.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/cacct.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/vserver/cacct.c linux-3.6.9-vs2.3.4.4/kernel/vserver/cacct.c +--- linux-3.6.9/kernel/vserver/cacct.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/kernel/vserver/cacct.c 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,42 @@ +/* + * linux/kernel/vserver/cacct.c @@ -14952,9 +15675,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/vserver/cacct.c linux-3.6.6-vs2.3.4.3.1 + return 0; +} + -diff -NurpP --minimal linux-3.6.6/kernel/vserver/cacct_init.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/cacct_init.h ---- linux-3.6.6/kernel/vserver/cacct_init.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/cacct_init.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/vserver/cacct_init.h linux-3.6.9-vs2.3.4.4/kernel/vserver/cacct_init.h +--- linux-3.6.9/kernel/vserver/cacct_init.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/kernel/vserver/cacct_init.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,25 @@ + + @@ -14981,9 +15704,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/vserver/cacct_init.h linux-3.6.6-vs2.3. + return; +} + -diff -NurpP --minimal linux-3.6.6/kernel/vserver/cacct_proc.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/cacct_proc.h ---- linux-3.6.6/kernel/vserver/cacct_proc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/cacct_proc.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/vserver/cacct_proc.h linux-3.6.9-vs2.3.4.4/kernel/vserver/cacct_proc.h +--- linux-3.6.9/kernel/vserver/cacct_proc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/kernel/vserver/cacct_proc.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,53 @@ +#ifndef _VX_CACCT_PROC_H +#define _VX_CACCT_PROC_H @@ -15038,9 +15761,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/vserver/cacct_proc.h linux-3.6.6-vs2.3. +} + +#endif /* _VX_CACCT_PROC_H */ -diff -NurpP --minimal linux-3.6.6/kernel/vserver/context.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/context.c ---- linux-3.6.6/kernel/vserver/context.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/context.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/vserver/context.c linux-3.6.9-vs2.3.4.4/kernel/vserver/context.c +--- linux-3.6.9/kernel/vserver/context.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/kernel/vserver/context.c 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,1119 @@ +/* + * linux/kernel/vserver/context.c @@ -16161,9 +16884,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/vserver/context.c linux-3.6.6-vs2.3.4.3 + +EXPORT_SYMBOL_GPL(free_vx_info); + -diff -NurpP --minimal linux-3.6.6/kernel/vserver/cvirt.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/cvirt.c ---- linux-3.6.6/kernel/vserver/cvirt.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/cvirt.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/vserver/cvirt.c linux-3.6.9-vs2.3.4.4/kernel/vserver/cvirt.c +--- linux-3.6.9/kernel/vserver/cvirt.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/kernel/vserver/cvirt.c 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,313 @@ +/* + * linux/kernel/vserver/cvirt.c @@ -16478,9 +17201,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/vserver/cvirt.c linux-3.6.6-vs2.3.4.3.1 + +#endif + -diff -NurpP --minimal linux-3.6.6/kernel/vserver/cvirt_init.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/cvirt_init.h ---- linux-3.6.6/kernel/vserver/cvirt_init.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/cvirt_init.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/vserver/cvirt_init.h linux-3.6.9-vs2.3.4.4/kernel/vserver/cvirt_init.h +--- linux-3.6.9/kernel/vserver/cvirt_init.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/kernel/vserver/cvirt_init.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,70 @@ + + @@ -16552,9 +17275,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/vserver/cvirt_init.h linux-3.6.6-vs2.3. + return; +} + -diff -NurpP --minimal linux-3.6.6/kernel/vserver/cvirt_proc.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/cvirt_proc.h ---- linux-3.6.6/kernel/vserver/cvirt_proc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/cvirt_proc.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/vserver/cvirt_proc.h linux-3.6.9-vs2.3.4.4/kernel/vserver/cvirt_proc.h +--- linux-3.6.9/kernel/vserver/cvirt_proc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/kernel/vserver/cvirt_proc.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,123 @@ +#ifndef _VX_CVIRT_PROC_H +#define _VX_CVIRT_PROC_H @@ -16679,9 +17402,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/vserver/cvirt_proc.h linux-3.6.6-vs2.3. +} + +#endif /* _VX_CVIRT_PROC_H */ -diff -NurpP --minimal linux-3.6.6/kernel/vserver/debug.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/debug.c ---- linux-3.6.6/kernel/vserver/debug.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/debug.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/vserver/debug.c linux-3.6.9-vs2.3.4.4/kernel/vserver/debug.c +--- linux-3.6.9/kernel/vserver/debug.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/kernel/vserver/debug.c 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,32 @@ +/* + * kernel/vserver/debug.c @@ -16715,9 +17438,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/vserver/debug.c linux-3.6.6-vs2.3.4.3.1 + +EXPORT_SYMBOL_GPL(dump_vx_info); + -diff -NurpP --minimal linux-3.6.6/kernel/vserver/device.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/device.c ---- linux-3.6.6/kernel/vserver/device.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/device.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/vserver/device.c linux-3.6.9-vs2.3.4.4/kernel/vserver/device.c +--- linux-3.6.9/kernel/vserver/device.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/kernel/vserver/device.c 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,443 @@ +/* + * linux/kernel/vserver/device.c @@ -17162,9 +17885,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/vserver/device.c linux-3.6.6-vs2.3.4.3. +#endif /* CONFIG_COMPAT */ + + -diff -NurpP --minimal linux-3.6.6/kernel/vserver/dlimit.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/dlimit.c ---- linux-3.6.6/kernel/vserver/dlimit.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/dlimit.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/vserver/dlimit.c linux-3.6.9-vs2.3.4.4/kernel/vserver/dlimit.c +--- linux-3.6.9/kernel/vserver/dlimit.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/kernel/vserver/dlimit.c 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,531 @@ +/* + * linux/kernel/vserver/dlimit.c @@ -17195,7 +17918,7 @@ diff -NurpP --minimal linux-3.6.6/kernel/vserver/dlimit.c linux-3.6.6-vs2.3.4.3. + * allocate an initialized dl_info struct + * doesn't make it visible (hash) */ + -+static struct dl_info *__alloc_dl_info(struct super_block *sb, vserver_tag_t tag) ++static struct dl_info *__alloc_dl_info(struct super_block *sb, vs_tag_t tag) +{ + struct dl_info *new = NULL; + @@ -17252,7 +17975,7 @@ diff -NurpP --minimal linux-3.6.6/kernel/vserver/dlimit.c linux-3.6.6-vs2.3.4.3. +static DEFINE_SPINLOCK(dl_info_hash_lock); + + -+static inline unsigned int __hashval(struct super_block *sb, vserver_tag_t tag) ++static inline unsigned int __hashval(struct super_block *sb, vs_tag_t tag) +{ + return ((tag ^ (unsigned long)sb) % DL_HASH_SIZE); +} @@ -17294,7 +18017,7 @@ diff -NurpP --minimal linux-3.6.6/kernel/vserver/dlimit.c linux-3.6.6-vs2.3.4.3. + * requires the rcu_read_lock() + * doesn't increment the dl_refcnt */ + -+static inline struct dl_info *__lookup_dl_info(struct super_block *sb, vserver_tag_t tag) ++static inline struct dl_info *__lookup_dl_info(struct super_block *sb, vs_tag_t tag) +{ + struct hlist_head *head = &dl_info_hash[__hashval(sb, tag)]; + struct hlist_node *pos; @@ -17310,7 +18033,7 @@ diff -NurpP --minimal linux-3.6.6/kernel/vserver/dlimit.c linux-3.6.6-vs2.3.4.3. +} + + -+struct dl_info *locate_dl_info(struct super_block *sb, vserver_tag_t tag) ++struct dl_info *locate_dl_info(struct super_block *sb, vs_tag_t tag) +{ + struct dl_info *dli; + @@ -17697,9 +18420,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/vserver/dlimit.c linux-3.6.6-vs2.3.4.3. +EXPORT_SYMBOL_GPL(locate_dl_info); +EXPORT_SYMBOL_GPL(rcu_free_dl_info); + -diff -NurpP --minimal linux-3.6.6/kernel/vserver/helper.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/helper.c ---- linux-3.6.6/kernel/vserver/helper.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/helper.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/vserver/helper.c linux-3.6.9-vs2.3.4.4/kernel/vserver/helper.c +--- linux-3.6.9/kernel/vserver/helper.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/kernel/vserver/helper.c 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,229 @@ +/* + * linux/kernel/vserver/helper.c @@ -17930,9 +18653,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/vserver/helper.c linux-3.6.6-vs2.3.4.3. + return do_vshelper(vshelper_path, argv, envp, 1); +} + -diff -NurpP --minimal linux-3.6.6/kernel/vserver/history.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/history.c ---- linux-3.6.6/kernel/vserver/history.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/history.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/vserver/history.c linux-3.6.9-vs2.3.4.4/kernel/vserver/history.c +--- linux-3.6.9/kernel/vserver/history.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/kernel/vserver/history.c 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,258 @@ +/* + * kernel/vserver/history.c @@ -18192,9 +18915,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/vserver/history.c linux-3.6.6-vs2.3.4.3 + +#endif /* CONFIG_COMPAT */ + -diff -NurpP --minimal linux-3.6.6/kernel/vserver/inet.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/inet.c ---- linux-3.6.6/kernel/vserver/inet.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/inet.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/vserver/inet.c linux-3.6.9-vs2.3.4.4/kernel/vserver/inet.c +--- linux-3.6.9/kernel/vserver/inet.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/kernel/vserver/inet.c 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,226 @@ + +#include @@ -18422,9 +19145,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/vserver/inet.c linux-3.6.6-vs2.3.4.3.1- + +EXPORT_SYMBOL_GPL(ip_v4_find_src); + -diff -NurpP --minimal linux-3.6.6/kernel/vserver/init.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/init.c ---- linux-3.6.6/kernel/vserver/init.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/init.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/vserver/init.c linux-3.6.9-vs2.3.4.4/kernel/vserver/init.c +--- linux-3.6.9/kernel/vserver/init.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/kernel/vserver/init.c 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,45 @@ +/* + * linux/kernel/init.c @@ -18471,9 +19194,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/vserver/init.c linux-3.6.6-vs2.3.4.3.1- +module_init(init_vserver); +module_exit(exit_vserver); + -diff -NurpP --minimal linux-3.6.6/kernel/vserver/inode.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/inode.c ---- linux-3.6.6/kernel/vserver/inode.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/inode.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/vserver/inode.c linux-3.6.9-vs2.3.4.4/kernel/vserver/inode.c +--- linux-3.6.9/kernel/vserver/inode.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/kernel/vserver/inode.c 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,437 @@ +/* + * linux/kernel/vserver/inode.c @@ -18816,7 +19539,7 @@ diff -NurpP --minimal linux-3.6.6/kernel/vserver/inode.c linux-3.6.6-vs2.3.4.3.1 + } +} + -+int dx_parse_tag(char *string, vserver_tag_t *tag, int remove, int *mnt_flags, ++int dx_parse_tag(char *string, vs_tag_t *tag, int remove, int *mnt_flags, + unsigned long *flags) +{ + int set = 0; @@ -18883,7 +19606,7 @@ diff -NurpP --minimal linux-3.6.6/kernel/vserver/inode.c linux-3.6.6-vs2.3.4.3.1 + +void __dx_propagate_tag(struct nameidata *nd, struct inode *inode) +{ -+ vserver_tag_t new_tag = 0; ++ vs_tag_t new_tag = 0; + struct vfsmount *mnt; + int propagate; + @@ -18912,9 +19635,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/vserver/inode.c linux-3.6.6-vs2.3.4.3.1 + +#endif /* CONFIG_PROPAGATE */ + -diff -NurpP --minimal linux-3.6.6/kernel/vserver/limit.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/limit.c ---- linux-3.6.6/kernel/vserver/limit.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/limit.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/vserver/limit.c linux-3.6.9-vs2.3.4.4/kernel/vserver/limit.c +--- linux-3.6.9/kernel/vserver/limit.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/kernel/vserver/limit.c 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,345 @@ +/* + * linux/kernel/vserver/limit.c @@ -19261,9 +19984,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/vserver/limit.c linux-3.6.6-vs2.3.4.3.1 + return cache; +} + -diff -NurpP --minimal linux-3.6.6/kernel/vserver/limit_init.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/limit_init.h ---- linux-3.6.6/kernel/vserver/limit_init.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/limit_init.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/vserver/limit_init.h linux-3.6.9-vs2.3.4.4/kernel/vserver/limit_init.h +--- linux-3.6.9/kernel/vserver/limit_init.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/kernel/vserver/limit_init.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,31 @@ + + @@ -19296,9 +20019,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/vserver/limit_init.h linux-3.6.6-vs2.3. + } +} + -diff -NurpP --minimal linux-3.6.6/kernel/vserver/limit_proc.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/limit_proc.h ---- linux-3.6.6/kernel/vserver/limit_proc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/limit_proc.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/vserver/limit_proc.h linux-3.6.9-vs2.3.4.4/kernel/vserver/limit_proc.h +--- linux-3.6.9/kernel/vserver/limit_proc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/kernel/vserver/limit_proc.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,57 @@ +#ifndef _VX_LIMIT_PROC_H +#define _VX_LIMIT_PROC_H @@ -19357,9 +20080,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/vserver/limit_proc.h linux-3.6.6-vs2.3. +#endif /* _VX_LIMIT_PROC_H */ + + -diff -NurpP --minimal linux-3.6.6/kernel/vserver/network.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/network.c ---- linux-3.6.6/kernel/vserver/network.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/network.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/vserver/network.c linux-3.6.9-vs2.3.4.4/kernel/vserver/network.c +--- linux-3.6.9/kernel/vserver/network.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/kernel/vserver/network.c 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,912 @@ +/* + * linux/kernel/vserver/network.c @@ -20273,9 +20996,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/vserver/network.c linux-3.6.6-vs2.3.4.3 +EXPORT_SYMBOL_GPL(free_nx_info); +EXPORT_SYMBOL_GPL(unhash_nx_info); + -diff -NurpP --minimal linux-3.6.6/kernel/vserver/proc.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/proc.c ---- linux-3.6.6/kernel/vserver/proc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/proc.c 2012-10-09 14:19:59.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/vserver/proc.c linux-3.6.9-vs2.3.4.4/kernel/vserver/proc.c +--- linux-3.6.9/kernel/vserver/proc.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/kernel/vserver/proc.c 2012-10-09 14:19:59.000000000 +0200 @@ -0,0 +1,1110 @@ +/* + * linux/kernel/vserver/proc.c @@ -21387,9 +22110,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/vserver/proc.c linux-3.6.6-vs2.3.4.3.1- + return buffer - orig; +} + -diff -NurpP --minimal linux-3.6.6/kernel/vserver/sched.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/sched.c ---- linux-3.6.6/kernel/vserver/sched.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/sched.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/vserver/sched.c linux-3.6.9-vs2.3.4.4/kernel/vserver/sched.c +--- linux-3.6.9/kernel/vserver/sched.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/kernel/vserver/sched.c 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,83 @@ +/* + * linux/kernel/vserver/sched.c @@ -21474,9 +22197,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/vserver/sched.c linux-3.6.6-vs2.3.4.3.1 + return 0; +} + -diff -NurpP --minimal linux-3.6.6/kernel/vserver/sched_init.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/sched_init.h ---- linux-3.6.6/kernel/vserver/sched_init.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/sched_init.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/vserver/sched_init.h linux-3.6.9-vs2.3.4.4/kernel/vserver/sched_init.h +--- linux-3.6.9/kernel/vserver/sched_init.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/kernel/vserver/sched_init.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,27 @@ + +static inline void vx_info_init_sched(struct _vx_sched *sched) @@ -21505,9 +22228,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/vserver/sched_init.h linux-3.6.6-vs2.3. +{ + return; +} -diff -NurpP --minimal linux-3.6.6/kernel/vserver/sched_proc.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/sched_proc.h ---- linux-3.6.6/kernel/vserver/sched_proc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/sched_proc.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/vserver/sched_proc.h linux-3.6.9-vs2.3.4.4/kernel/vserver/sched_proc.h +--- linux-3.6.9/kernel/vserver/sched_proc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/kernel/vserver/sched_proc.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,32 @@ +#ifndef _VX_SCHED_PROC_H +#define _VX_SCHED_PROC_H @@ -21541,9 +22264,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/vserver/sched_proc.h linux-3.6.6-vs2.3. +} + +#endif /* _VX_SCHED_PROC_H */ -diff -NurpP --minimal linux-3.6.6/kernel/vserver/signal.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/signal.c ---- linux-3.6.6/kernel/vserver/signal.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/signal.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/vserver/signal.c linux-3.6.9-vs2.3.4.4/kernel/vserver/signal.c +--- linux-3.6.9/kernel/vserver/signal.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/kernel/vserver/signal.c 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,134 @@ +/* + * linux/kernel/vserver/signal.c @@ -21679,9 +22402,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/vserver/signal.c linux-3.6.6-vs2.3.4.3. + return ret; +} + -diff -NurpP --minimal linux-3.6.6/kernel/vserver/space.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/space.c ---- linux-3.6.6/kernel/vserver/space.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/space.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/vserver/space.c linux-3.6.9-vs2.3.4.4/kernel/vserver/space.c +--- linux-3.6.9/kernel/vserver/space.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/kernel/vserver/space.c 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,436 @@ +/* + * linux/kernel/vserver/space.c @@ -22119,9 +22842,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/vserver/space.c linux-3.6.6-vs2.3.4.3.1 + return 0; +} + -diff -NurpP --minimal linux-3.6.6/kernel/vserver/switch.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/switch.c ---- linux-3.6.6/kernel/vserver/switch.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/switch.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/vserver/switch.c linux-3.6.9-vs2.3.4.4/kernel/vserver/switch.c +--- linux-3.6.9/kernel/vserver/switch.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/kernel/vserver/switch.c 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,556 @@ +/* + * linux/kernel/vserver/switch.c @@ -22679,9 +23402,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/vserver/switch.c linux-3.6.6-vs2.3.4.3. +} + +#endif /* CONFIG_COMPAT */ -diff -NurpP --minimal linux-3.6.6/kernel/vserver/sysctl.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/sysctl.c ---- linux-3.6.6/kernel/vserver/sysctl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/sysctl.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/vserver/sysctl.c linux-3.6.9-vs2.3.4.4/kernel/vserver/sysctl.c +--- linux-3.6.9/kernel/vserver/sysctl.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/kernel/vserver/sysctl.c 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,247 @@ +/* + * kernel/vserver/sysctl.c @@ -22930,9 +23653,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/vserver/sysctl.c linux-3.6.6-vs2.3.4.3. +EXPORT_SYMBOL_GPL(vs_debug_perm); +EXPORT_SYMBOL_GPL(vs_debug_misc); + -diff -NurpP --minimal linux-3.6.6/kernel/vserver/tag.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/tag.c ---- linux-3.6.6/kernel/vserver/tag.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/tag.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/vserver/tag.c linux-3.6.9-vs2.3.4.4/kernel/vserver/tag.c +--- linux-3.6.9/kernel/vserver/tag.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/kernel/vserver/tag.c 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,63 @@ +/* + * linux/kernel/vserver/tag.c @@ -22953,7 +23676,7 @@ diff -NurpP --minimal linux-3.6.6/kernel/vserver/tag.c linux-3.6.6-vs2.3.4.3.1-n +#include + + -+int dx_migrate_task(struct task_struct *p, vserver_tag_t tag) ++int dx_migrate_task(struct task_struct *p, vs_tag_t tag) +{ + if (!p) + BUG(); @@ -22977,7 +23700,7 @@ diff -NurpP --minimal linux-3.6.6/kernel/vserver/tag.c linux-3.6.6-vs2.3.4.3.1-n + +int vc_task_tag(uint32_t id) +{ -+ vserver_tag_t tag; ++ vs_tag_t tag; + + if (id) { + struct task_struct *tsk; @@ -22997,9 +23720,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/vserver/tag.c linux-3.6.6-vs2.3.4.3.1-n +} + + -diff -NurpP --minimal linux-3.6.6/kernel/vserver/vci_config.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/vci_config.h ---- linux-3.6.6/kernel/vserver/vci_config.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/kernel/vserver/vci_config.h 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/kernel/vserver/vci_config.h linux-3.6.9-vs2.3.4.4/kernel/vserver/vci_config.h +--- linux-3.6.9/kernel/vserver/vci_config.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/kernel/vserver/vci_config.h 2012-10-04 18:47:00.000000000 +0200 @@ -0,0 +1,76 @@ + +/* interface version */ @@ -23077,9 +23800,9 @@ diff -NurpP --minimal linux-3.6.6/kernel/vserver/vci_config.h linux-3.6.6-vs2.3. + 0; +} + -diff -NurpP --minimal linux-3.6.6/mm/memcontrol.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/mm/memcontrol.c ---- linux-3.6.6/mm/memcontrol.c 2012-10-04 15:27:48.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/mm/memcontrol.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/mm/memcontrol.c linux-3.6.9-vs2.3.4.4/mm/memcontrol.c +--- linux-3.6.9/mm/memcontrol.c 2012-12-08 01:34:15.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/mm/memcontrol.c 2012-12-08 01:36:33.000000000 +0100 @@ -885,6 +885,31 @@ struct mem_cgroup *mem_cgroup_from_task( return mem_cgroup_from_css(task_subsys_state(p, mem_cgroup_subsys_id)); } @@ -23112,9 +23835,9 @@ diff -NurpP --minimal linux-3.6.6/mm/memcontrol.c linux-3.6.6-vs2.3.4.3.1-noxfs- struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm) { struct mem_cgroup *memcg = NULL; -diff -NurpP --minimal linux-3.6.6/mm/oom_kill.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/mm/oom_kill.c ---- linux-3.6.6/mm/oom_kill.c 2012-10-04 15:27:48.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/mm/oom_kill.c 2012-10-04 18:53:46.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/mm/oom_kill.c linux-3.6.9-vs2.3.4.4/mm/oom_kill.c +--- linux-3.6.9/mm/oom_kill.c 2012-10-04 15:27:48.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/mm/oom_kill.c 2012-10-04 18:53:46.000000000 +0200 @@ -35,6 +35,8 @@ #include #include @@ -23189,9 +23912,9 @@ diff -NurpP --minimal linux-3.6.6/mm/oom_kill.c linux-3.6.6-vs2.3.4.3.1-noxfs-no } if (PTR_ERR(p) != -1UL) { oom_kill_process(p, gfp_mask, order, points, totalpages, NULL, -diff -NurpP --minimal linux-3.6.6/mm/page_alloc.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/mm/page_alloc.c ---- linux-3.6.6/mm/page_alloc.c 2012-10-04 15:27:48.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/mm/page_alloc.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/mm/page_alloc.c linux-3.6.9-vs2.3.4.4/mm/page_alloc.c +--- linux-3.6.9/mm/page_alloc.c 2012-12-08 01:34:15.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/mm/page_alloc.c 2012-12-08 01:36:33.000000000 +0100 @@ -58,6 +58,8 @@ #include #include @@ -23221,9 +23944,9 @@ diff -NurpP --minimal linux-3.6.6/mm/page_alloc.c linux-3.6.6-vs2.3.4.3.1-noxfs- } #endif -diff -NurpP --minimal linux-3.6.6/mm/pgtable-generic.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/mm/pgtable-generic.c ---- linux-3.6.6/mm/pgtable-generic.c 2012-07-22 23:39:47.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/mm/pgtable-generic.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/mm/pgtable-generic.c linux-3.6.9-vs2.3.4.4/mm/pgtable-generic.c +--- linux-3.6.9/mm/pgtable-generic.c 2012-07-22 23:39:47.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/mm/pgtable-generic.c 2012-10-04 18:47:00.000000000 +0200 @@ -6,6 +6,8 @@ * Copyright (C) 2010 Linus Torvalds */ @@ -23233,10 +23956,10 @@ diff -NurpP --minimal linux-3.6.6/mm/pgtable-generic.c linux-3.6.6-vs2.3.4.3.1-n #include #include #include -diff -NurpP --minimal linux-3.6.6/mm/shmem.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/mm/shmem.c ---- linux-3.6.6/mm/shmem.c 2012-11-06 18:42:14.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/mm/shmem.c 2012-11-06 18:43:41.000000000 +0100 -@@ -1814,7 +1814,7 @@ static int shmem_statfs(struct dentry *d +diff -NurpP --minimal linux-3.6.9/mm/shmem.c linux-3.6.9-vs2.3.4.4/mm/shmem.c +--- linux-3.6.9/mm/shmem.c 2012-12-08 01:34:15.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/mm/shmem.c 2012-12-08 01:36:33.000000000 +0100 +@@ -1826,7 +1826,7 @@ static int shmem_statfs(struct dentry *d { struct shmem_sb_info *sbinfo = SHMEM_SB(dentry->d_sb); @@ -23245,7 +23968,7 @@ diff -NurpP --minimal linux-3.6.6/mm/shmem.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow buf->f_bsize = PAGE_CACHE_SIZE; buf->f_namelen = NAME_MAX; if (sbinfo->max_blocks) { -@@ -2632,7 +2632,7 @@ int shmem_fill_super(struct super_block +@@ -2644,7 +2644,7 @@ int shmem_fill_super(struct super_block sb->s_maxbytes = MAX_LFS_FILESIZE; sb->s_blocksize = PAGE_CACHE_SIZE; sb->s_blocksize_bits = PAGE_CACHE_SHIFT; @@ -23254,9 +23977,9 @@ diff -NurpP --minimal linux-3.6.6/mm/shmem.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow sb->s_op = &shmem_ops; sb->s_time_gran = 1; #ifdef CONFIG_TMPFS_XATTR -diff -NurpP --minimal linux-3.6.6/mm/slab.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/mm/slab.c ---- linux-3.6.6/mm/slab.c 2012-11-06 18:42:14.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/mm/slab.c 2012-11-06 18:43:41.000000000 +0100 +diff -NurpP --minimal linux-3.6.9/mm/slab.c linux-3.6.9-vs2.3.4.4/mm/slab.c +--- linux-3.6.9/mm/slab.c 2012-12-08 01:34:15.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/mm/slab.c 2012-11-06 18:43:41.000000000 +0100 @@ -445,6 +445,8 @@ static void kmem_list3_init(struct kmem_ #define STATS_INC_FREEMISS(x) do { } while (0) #endif @@ -23290,9 +24013,9 @@ diff -NurpP --minimal linux-3.6.6/mm/slab.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/ kmemcheck_slab_free(cachep, objp, cachep->object_size); -diff -NurpP --minimal linux-3.6.6/mm/slab_vs.h linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/mm/slab_vs.h ---- linux-3.6.6/mm/slab_vs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/mm/slab_vs.h 2012-10-09 16:28:11.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/mm/slab_vs.h linux-3.6.9-vs2.3.4.4/mm/slab_vs.h +--- linux-3.6.9/mm/slab_vs.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/mm/slab_vs.h 2012-10-09 16:28:11.000000000 +0200 @@ -0,0 +1,29 @@ + +#include @@ -23323,9 +24046,9 @@ diff -NurpP --minimal linux-3.6.6/mm/slab_vs.h linux-3.6.6-vs2.3.4.3.1-noxfs-noc + atomic_sub(cachep->size, &vxi->cacct.slab[what]); +} + -diff -NurpP --minimal linux-3.6.6/mm/swapfile.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/mm/swapfile.c ---- linux-3.6.6/mm/swapfile.c 2012-10-04 15:27:48.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/mm/swapfile.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/mm/swapfile.c linux-3.6.9-vs2.3.4.4/mm/swapfile.c +--- linux-3.6.9/mm/swapfile.c 2012-10-04 15:27:48.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/mm/swapfile.c 2012-10-04 18:47:00.000000000 +0200 @@ -39,6 +39,7 @@ #include #include @@ -23360,9 +24083,9 @@ diff -NurpP --minimal linux-3.6.6/mm/swapfile.c linux-3.6.6-vs2.3.4.3.1-noxfs-no } /* -diff -NurpP --minimal linux-3.6.6/net/bridge/br_multicast.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/bridge/br_multicast.c ---- linux-3.6.6/net/bridge/br_multicast.c 2012-10-04 15:27:49.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/bridge/br_multicast.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/net/bridge/br_multicast.c linux-3.6.9-vs2.3.4.4/net/bridge/br_multicast.c +--- linux-3.6.9/net/bridge/br_multicast.c 2012-10-04 15:27:49.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/net/bridge/br_multicast.c 2012-10-04 18:47:00.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)); @@ -23372,9 +24095,9 @@ diff -NurpP --minimal linux-3.6.6/net/bridge/br_multicast.c linux-3.6.6-vs2.3.4. kfree_skb(skb); return NULL; } -diff -NurpP --minimal linux-3.6.6/net/core/dev.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/core/dev.c ---- linux-3.6.6/net/core/dev.c 2012-11-06 18:42:14.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/core/dev.c 2012-11-06 18:43:41.000000000 +0100 +diff -NurpP --minimal linux-3.6.9/net/core/dev.c linux-3.6.9-vs2.3.4.4/net/core/dev.c +--- linux-3.6.9/net/core/dev.c 2012-12-08 01:34:15.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/net/core/dev.c 2012-12-08 01:36:33.000000000 +0100 @@ -126,6 +126,7 @@ #include #include @@ -23472,7 +24195,7 @@ diff -NurpP --minimal linux-3.6.6/net/core/dev.c linux-3.6.6-vs2.3.4.3.1-noxfs-n /* avoid cases where sscanf is not exact inverse of printf */ snprintf(buf, IFNAMSIZ, name, i); -@@ -4074,6 +4093,8 @@ static int dev_ifconf(struct net *net, c +@@ -4076,6 +4095,8 @@ static int dev_ifconf(struct net *net, c total = 0; for_each_netdev(net, dev) { @@ -23481,7 +24204,7 @@ diff -NurpP --minimal linux-3.6.6/net/core/dev.c linux-3.6.6-vs2.3.4.3.1-noxfs-n for (i = 0; i < NPROTO; i++) { if (gifconf_list[i]) { int done; -@@ -4176,6 +4197,10 @@ static void dev_seq_printf_stats(struct +@@ -4178,6 +4199,10 @@ static void dev_seq_printf_stats(struct struct rtnl_link_stats64 temp; const struct rtnl_link_stats64 *stats = dev_get_stats(dev, &temp); @@ -23492,9 +24215,9 @@ diff -NurpP --minimal linux-3.6.6/net/core/dev.c linux-3.6.6-vs2.3.4.3.1-noxfs-n 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.6.6/net/core/rtnetlink.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/core/rtnetlink.c ---- linux-3.6.6/net/core/rtnetlink.c 2012-10-04 15:27:49.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/core/rtnetlink.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/net/core/rtnetlink.c linux-3.6.9-vs2.3.4.4/net/core/rtnetlink.c +--- linux-3.6.9/net/core/rtnetlink.c 2012-10-04 15:27:49.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/net/core/rtnetlink.c 2012-10-04 18:47:00.000000000 +0200 @@ -1080,6 +1080,8 @@ static int rtnl_dump_ifinfo(struct sk_bu hlist_for_each_entry_rcu(dev, node, head, index_hlist) { if (idx < s_idx) @@ -23514,9 +24237,9 @@ diff -NurpP --minimal linux-3.6.6/net/core/rtnetlink.c linux-3.6.6-vs2.3.4.3.1-n skb = nlmsg_new((if_info_size = if_nlmsg_size(dev, 0)), GFP_KERNEL); if (skb == NULL) goto errout; -diff -NurpP --minimal linux-3.6.6/net/core/sock.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/core/sock.c ---- linux-3.6.6/net/core/sock.c 2012-10-04 15:27:49.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/core/sock.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/net/core/sock.c linux-3.6.9-vs2.3.4.4/net/core/sock.c +--- linux-3.6.9/net/core/sock.c 2012-10-04 15:27:49.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/net/core/sock.c 2012-10-04 18:47:00.000000000 +0200 @@ -132,6 +132,10 @@ #include @@ -23584,9 +24307,9 @@ diff -NurpP --minimal linux-3.6.6/net/core/sock.c linux-3.6.6-vs2.3.4.3.1-noxfs- /* * Before updating sk_refcnt, we must commit prior changes to memory * (Documentation/RCU/rculist_nulls.txt for details) -diff -NurpP --minimal linux-3.6.6/net/ipv4/af_inet.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv4/af_inet.c ---- linux-3.6.6/net/ipv4/af_inet.c 2012-10-04 15:27:49.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv4/af_inet.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/net/ipv4/af_inet.c linux-3.6.9-vs2.3.4.4/net/ipv4/af_inet.c +--- linux-3.6.9/net/ipv4/af_inet.c 2012-10-04 15:27:49.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/net/ipv4/af_inet.c 2012-10-04 18:47:00.000000000 +0200 @@ -118,6 +118,7 @@ #ifdef CONFIG_IP_MROUTE #include @@ -23664,9 +24387,9 @@ diff -NurpP --minimal linux-3.6.6/net/ipv4/af_inet.c linux-3.6.6-vs2.3.4.3.1-nox sin->sin_port = inet->inet_sport; sin->sin_addr.s_addr = addr; } -diff -NurpP --minimal linux-3.6.6/net/ipv4/arp.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv4/arp.c ---- linux-3.6.6/net/ipv4/arp.c 2012-10-04 15:27:49.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv4/arp.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/net/ipv4/arp.c linux-3.6.9-vs2.3.4.4/net/ipv4/arp.c +--- linux-3.6.9/net/ipv4/arp.c 2012-10-04 15:27:49.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/net/ipv4/arp.c 2012-10-04 18:47:00.000000000 +0200 @@ -1318,6 +1318,7 @@ static void arp_format_neigh_entry(struc struct net_device *dev = n->dev; int hatype = dev->type; @@ -23683,9 +24406,9 @@ diff -NurpP --minimal linux-3.6.6/net/ipv4/arp.c linux-3.6.6-vs2.3.4.3.1-noxfs-n sprintf(tbuf, "%pI4", n->key); seq_printf(seq, "%-16s 0x%-10x0x%-10x%s * %s\n", tbuf, hatype, ATF_PUBL | ATF_PERM, "00:00:00:00:00:00", -diff -NurpP --minimal linux-3.6.6/net/ipv4/devinet.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv4/devinet.c ---- linux-3.6.6/net/ipv4/devinet.c 2012-10-04 15:27:49.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv4/devinet.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/net/ipv4/devinet.c linux-3.6.9-vs2.3.4.4/net/ipv4/devinet.c +--- linux-3.6.9/net/ipv4/devinet.c 2012-10-04 15:27:49.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/net/ipv4/devinet.c 2012-10-04 18:47:00.000000000 +0200 @@ -516,6 +516,7 @@ struct in_device *inetdev_by_index(struc } EXPORT_SYMBOL(inetdev_by_index); @@ -23752,9 +24475,9 @@ diff -NurpP --minimal linux-3.6.6/net/ipv4/devinet.c linux-3.6.6-vs2.3.4.3.1-nox if (ip_idx < s_ip_idx) continue; if (inet_fill_ifaddr(skb, ifa, -diff -NurpP --minimal linux-3.6.6/net/ipv4/fib_trie.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv4/fib_trie.c ---- linux-3.6.6/net/ipv4/fib_trie.c 2012-10-04 15:27:49.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv4/fib_trie.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/net/ipv4/fib_trie.c linux-3.6.9-vs2.3.4.4/net/ipv4/fib_trie.c +--- linux-3.6.9/net/ipv4/fib_trie.c 2012-10-04 15:27:49.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/net/ipv4/fib_trie.c 2012-10-04 18:47:00.000000000 +0200 @@ -2554,6 +2554,7 @@ static int fib_route_seq_show(struct seq || fa->fa_type == RTN_MULTICAST) continue; @@ -23763,9 +24486,9 @@ diff -NurpP --minimal linux-3.6.6/net/ipv4/fib_trie.c linux-3.6.6-vs2.3.4.3.1-no if (fi) seq_printf(seq, "%s\t%08X\t%08X\t%04X\t%d\t%u\t" -diff -NurpP --minimal linux-3.6.6/net/ipv4/inet_connection_sock.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv4/inet_connection_sock.c ---- linux-3.6.6/net/ipv4/inet_connection_sock.c 2012-11-06 18:42:14.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv4/inet_connection_sock.c 2012-11-06 18:43:41.000000000 +0100 +diff -NurpP --minimal linux-3.6.9/net/ipv4/inet_connection_sock.c linux-3.6.9-vs2.3.4.4/net/ipv4/inet_connection_sock.c +--- linux-3.6.9/net/ipv4/inet_connection_sock.c 2012-12-08 01:34:15.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/net/ipv4/inet_connection_sock.c 2012-11-06 18:43:41.000000000 +0100 @@ -53,6 +53,37 @@ void inet_get_local_port_range(int *low, } EXPORT_SYMBOL(inet_get_local_port_range); @@ -23815,9 +24538,9 @@ diff -NurpP --minimal linux-3.6.6/net/ipv4/inet_connection_sock.c linux-3.6.6-vs break; } if (!relax && reuse && sk2->sk_reuse && -diff -NurpP --minimal linux-3.6.6/net/ipv4/inet_diag.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv4/inet_diag.c ---- linux-3.6.6/net/ipv4/inet_diag.c 2012-10-04 15:27:49.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv4/inet_diag.c 2012-10-04 19:02:16.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/net/ipv4/inet_diag.c linux-3.6.9-vs2.3.4.4/net/ipv4/inet_diag.c +--- linux-3.6.9/net/ipv4/inet_diag.c 2012-12-08 01:34:15.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/net/ipv4/inet_diag.c 2012-12-08 01:36:33.000000000 +0100 @@ -31,6 +31,8 @@ #include @@ -23929,9 +24652,9 @@ diff -NurpP --minimal linux-3.6.6/net/ipv4/inet_diag.c linux-3.6.6-vs2.3.4.3.1-n if (num < s_num) goto next_dying; if (r->sdiag_family != AF_UNSPEC && -diff -NurpP --minimal linux-3.6.6/net/ipv4/inet_hashtables.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv4/inet_hashtables.c ---- linux-3.6.6/net/ipv4/inet_hashtables.c 2012-07-22 23:39:48.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv4/inet_hashtables.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/net/ipv4/inet_hashtables.c linux-3.6.9-vs2.3.4.4/net/ipv4/inet_hashtables.c +--- linux-3.6.9/net/ipv4/inet_hashtables.c 2012-07-22 23:39:48.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/net/ipv4/inet_hashtables.c 2012-10-04 18:47:00.000000000 +0200 @@ -22,6 +22,7 @@ #include #include @@ -23968,9 +24691,9 @@ diff -NurpP --minimal linux-3.6.6/net/ipv4/inet_hashtables.c linux-3.6.6-vs2.3.4 /* * 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.6.6/net/ipv4/netfilter/nf_nat_helper.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv4/netfilter/nf_nat_helper.c ---- linux-3.6.6/net/ipv4/netfilter/nf_nat_helper.c 2012-10-04 15:27:50.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv4/netfilter/nf_nat_helper.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/net/ipv4/netfilter/nf_nat_helper.c linux-3.6.9-vs2.3.4.4/net/ipv4/netfilter/nf_nat_helper.c +--- linux-3.6.9/net/ipv4/netfilter/nf_nat_helper.c 2012-10-04 15:27:50.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/net/ipv4/netfilter/nf_nat_helper.c 2012-10-04 18:47:00.000000000 +0200 @@ -20,6 +20,7 @@ #include @@ -23979,9 +24702,9 @@ diff -NurpP --minimal linux-3.6.6/net/ipv4/netfilter/nf_nat_helper.c linux-3.6.6 #include #include #include -diff -NurpP --minimal linux-3.6.6/net/ipv4/netfilter.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv4/netfilter.c ---- linux-3.6.6/net/ipv4/netfilter.c 2012-07-22 23:39:48.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv4/netfilter.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/net/ipv4/netfilter.c linux-3.6.9-vs2.3.4.4/net/ipv4/netfilter.c +--- linux-3.6.9/net/ipv4/netfilter.c 2012-07-22 23:39:48.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/net/ipv4/netfilter.c 2012-10-04 18:47:00.000000000 +0200 @@ -6,7 +6,7 @@ #include #include @@ -23991,9 +24714,9 @@ diff -NurpP --minimal linux-3.6.6/net/ipv4/netfilter.c linux-3.6.6-vs2.3.4.3.1-n #include #include #include -diff -NurpP --minimal linux-3.6.6/net/ipv4/raw.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv4/raw.c ---- linux-3.6.6/net/ipv4/raw.c 2012-10-04 15:27:50.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv4/raw.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/net/ipv4/raw.c linux-3.6.9-vs2.3.4.4/net/ipv4/raw.c +--- linux-3.6.9/net/ipv4/raw.c 2012-10-04 15:27:50.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/net/ipv4/raw.c 2012-10-04 18:47:00.000000000 +0200 @@ -118,7 +118,7 @@ static struct sock *__raw_v4_lookup(stru if (net_eq(sock_net(sk), net) && inet->inet_num == num && @@ -24086,10 +24809,10 @@ diff -NurpP --minimal linux-3.6.6/net/ipv4/raw.c linux-3.6.6-vs2.3.4.3.1-noxfs-n if (!sk && ++state->bucket < RAW_HTABLE_SIZE) { sk = sk_head(&state->h->ht[state->bucket]); -diff -NurpP --minimal linux-3.6.6/net/ipv4/route.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv4/route.c ---- linux-3.6.6/net/ipv4/route.c 2012-11-06 18:42:15.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv4/route.c 2012-11-06 18:43:41.000000000 +0100 -@@ -1946,7 +1946,7 @@ struct rtable *__ip_route_output_key(str +diff -NurpP --minimal linux-3.6.9/net/ipv4/route.c linux-3.6.9-vs2.3.4.4/net/ipv4/route.c +--- linux-3.6.9/net/ipv4/route.c 2012-12-08 01:34:15.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/net/ipv4/route.c 2012-12-08 01:36:33.000000000 +0100 +@@ -1949,7 +1949,7 @@ struct rtable *__ip_route_output_key(str if (fl4->flowi4_oif) { @@ -24098,9 +24821,9 @@ diff -NurpP --minimal linux-3.6.6/net/ipv4/route.c linux-3.6.6-vs2.3.4.3.1-noxfs rth = ERR_PTR(-ENODEV); if (dev_out == NULL) goto out; -diff -NurpP --minimal linux-3.6.6/net/ipv4/tcp.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv4/tcp.c ---- linux-3.6.6/net/ipv4/tcp.c 2012-10-04 15:27:50.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv4/tcp.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/net/ipv4/tcp.c linux-3.6.9-vs2.3.4.4/net/ipv4/tcp.c +--- linux-3.6.9/net/ipv4/tcp.c 2012-12-08 01:34:16.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/net/ipv4/tcp.c 2012-12-08 01:36:33.000000000 +0100 @@ -268,6 +268,7 @@ #include #include @@ -24109,9 +24832,9 @@ diff -NurpP --minimal linux-3.6.6/net/ipv4/tcp.c linux-3.6.6-vs2.3.4.3.1-noxfs-n #include #include -diff -NurpP --minimal linux-3.6.6/net/ipv4/tcp_ipv4.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv4/tcp_ipv4.c ---- linux-3.6.6/net/ipv4/tcp_ipv4.c 2012-11-06 18:42:15.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv4/tcp_ipv4.c 2012-11-06 18:43:41.000000000 +0100 +diff -NurpP --minimal linux-3.6.9/net/ipv4/tcp_ipv4.c linux-3.6.9-vs2.3.4.4/net/ipv4/tcp_ipv4.c +--- linux-3.6.9/net/ipv4/tcp_ipv4.c 2012-12-08 01:34:16.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/net/ipv4/tcp_ipv4.c 2012-11-06 18:43:41.000000000 +0100 @@ -2034,6 +2034,12 @@ static void *listening_get_next(struct s req = req->dl_next; while (1) { @@ -24217,9 +24940,9 @@ diff -NurpP --minimal linux-3.6.6/net/ipv4/tcp_ipv4.c linux-3.6.6-vs2.3.4.3.1-no destp = ntohs(tw->tw_dport); srcp = ntohs(tw->tw_sport); -diff -NurpP --minimal linux-3.6.6/net/ipv4/tcp_minisocks.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv4/tcp_minisocks.c ---- linux-3.6.6/net/ipv4/tcp_minisocks.c 2012-10-04 15:27:50.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv4/tcp_minisocks.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/net/ipv4/tcp_minisocks.c linux-3.6.9-vs2.3.4.4/net/ipv4/tcp_minisocks.c +--- linux-3.6.9/net/ipv4/tcp_minisocks.c 2012-10-04 15:27:50.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/net/ipv4/tcp_minisocks.c 2012-10-04 18:47:00.000000000 +0200 @@ -23,6 +23,9 @@ #include #include @@ -24242,9 +24965,9 @@ diff -NurpP --minimal linux-3.6.6/net/ipv4/tcp_minisocks.c linux-3.6.6-vs2.3.4.3 #if IS_ENABLED(CONFIG_IPV6) if (tw->tw_family == PF_INET6) { struct ipv6_pinfo *np = inet6_sk(sk); -diff -NurpP --minimal linux-3.6.6/net/ipv4/udp.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv4/udp.c ---- linux-3.6.6/net/ipv4/udp.c 2012-10-04 15:27:50.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv4/udp.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/net/ipv4/udp.c linux-3.6.9-vs2.3.4.4/net/ipv4/udp.c +--- linux-3.6.9/net/ipv4/udp.c 2012-10-04 15:27:50.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/net/ipv4/udp.c 2012-10-04 18:47:00.000000000 +0200 @@ -300,14 +300,7 @@ fail: } EXPORT_SYMBOL(udp_lib_get_port); @@ -24377,9 +25100,9 @@ diff -NurpP --minimal linux-3.6.6/net/ipv4/udp.c linux-3.6.6-vs2.3.4.3.1-noxfs-n __u16 destp = ntohs(inet->inet_dport); __u16 srcp = ntohs(inet->inet_sport); -diff -NurpP --minimal linux-3.6.6/net/ipv6/Kconfig linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv6/Kconfig ---- linux-3.6.6/net/ipv6/Kconfig 2012-07-22 23:39:48.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv6/Kconfig 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/net/ipv6/Kconfig linux-3.6.9-vs2.3.4.4/net/ipv6/Kconfig +--- linux-3.6.9/net/ipv6/Kconfig 2012-07-22 23:39:48.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/net/ipv6/Kconfig 2012-10-04 18:47:00.000000000 +0200 @@ -4,8 +4,8 @@ # IPv6 as module will cause a CRASH if you try to unload it @@ -24391,9 +25114,9 @@ diff -NurpP --minimal linux-3.6.6/net/ipv6/Kconfig linux-3.6.6-vs2.3.4.3.1-noxfs ---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.6.6/net/ipv6/addrconf.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv6/addrconf.c ---- linux-3.6.6/net/ipv6/addrconf.c 2012-11-06 18:42:15.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv6/addrconf.c 2012-11-06 18:43:41.000000000 +0100 +diff -NurpP --minimal linux-3.6.9/net/ipv6/addrconf.c linux-3.6.9-vs2.3.4.4/net/ipv6/addrconf.c +--- linux-3.6.9/net/ipv6/addrconf.c 2012-12-08 01:34:16.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/net/ipv6/addrconf.c 2012-11-06 18:43:41.000000000 +0100 @@ -92,6 +92,8 @@ #include #include @@ -24493,9 +25216,9 @@ diff -NurpP --minimal linux-3.6.6/net/ipv6/addrconf.c linux-3.6.6-vs2.3.4.3.1-no idev = __in6_dev_get(dev); if (!idev) goto cont; -diff -NurpP --minimal linux-3.6.6/net/ipv6/af_inet6.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv6/af_inet6.c ---- linux-3.6.6/net/ipv6/af_inet6.c 2012-11-06 18:42:15.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv6/af_inet6.c 2012-11-06 18:43:41.000000000 +0100 +diff -NurpP --minimal linux-3.6.9/net/ipv6/af_inet6.c linux-3.6.9-vs2.3.4.4/net/ipv6/af_inet6.c +--- linux-3.6.9/net/ipv6/af_inet6.c 2012-12-08 01:34:16.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/net/ipv6/af_inet6.c 2012-11-06 18:43:41.000000000 +0100 @@ -43,6 +43,8 @@ #include #include @@ -24591,9 +25314,9 @@ diff -NurpP --minimal linux-3.6.6/net/ipv6/af_inet6.c linux-3.6.6-vs2.3.4.3.1-no if (ipv6_addr_any(&np->rcv_saddr)) sin->sin6_addr = np->saddr; else -diff -NurpP --minimal linux-3.6.6/net/ipv6/datagram.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv6/datagram.c ---- linux-3.6.6/net/ipv6/datagram.c 2012-07-22 23:39:48.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv6/datagram.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/net/ipv6/datagram.c linux-3.6.9-vs2.3.4.4/net/ipv6/datagram.c +--- linux-3.6.9/net/ipv6/datagram.c 2012-07-22 23:39:48.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/net/ipv6/datagram.c 2012-10-04 18:47:00.000000000 +0200 @@ -645,7 +645,7 @@ int datagram_send_ctl(struct net *net, s rcu_read_lock(); @@ -24603,9 +25326,9 @@ diff -NurpP --minimal linux-3.6.6/net/ipv6/datagram.c linux-3.6.6-vs2.3.4.3.1-no if (!dev) { rcu_read_unlock(); return -ENODEV; -diff -NurpP --minimal linux-3.6.6/net/ipv6/fib6_rules.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv6/fib6_rules.c ---- linux-3.6.6/net/ipv6/fib6_rules.c 2012-07-22 23:39:48.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv6/fib6_rules.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/net/ipv6/fib6_rules.c linux-3.6.9-vs2.3.4.4/net/ipv6/fib6_rules.c +--- linux-3.6.9/net/ipv6/fib6_rules.c 2012-07-22 23:39:48.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/net/ipv6/fib6_rules.c 2012-10-04 18:47:00.000000000 +0200 @@ -90,7 +90,7 @@ static int fib6_rule_action(struct fib_r ip6_dst_idev(&rt->dst)->dev, &flp6->daddr, @@ -24615,9 +25338,9 @@ diff -NurpP --minimal linux-3.6.6/net/ipv6/fib6_rules.c linux-3.6.6-vs2.3.4.3.1- goto again; if (!ipv6_prefix_equal(&saddr, &r->src.addr, r->src.plen)) -diff -NurpP --minimal linux-3.6.6/net/ipv6/inet6_hashtables.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv6/inet6_hashtables.c ---- linux-3.6.6/net/ipv6/inet6_hashtables.c 2011-10-24 18:45:34.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv6/inet6_hashtables.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/net/ipv6/inet6_hashtables.c linux-3.6.9-vs2.3.4.4/net/ipv6/inet6_hashtables.c +--- linux-3.6.9/net/ipv6/inet6_hashtables.c 2011-10-24 18:45:34.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/net/ipv6/inet6_hashtables.c 2012-10-04 18:47:00.000000000 +0200 @@ -16,6 +16,7 @@ #include @@ -24653,9 +25376,9 @@ diff -NurpP --minimal linux-3.6.6/net/ipv6/inet6_hashtables.c linux-3.6.6-vs2.3. } if (sk->sk_bound_dev_if) { if (sk->sk_bound_dev_if != dif) -diff -NurpP --minimal linux-3.6.6/net/ipv6/ip6_output.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv6/ip6_output.c ---- linux-3.6.6/net/ipv6/ip6_output.c 2012-10-04 15:27:50.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv6/ip6_output.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/net/ipv6/ip6_output.c linux-3.6.9-vs2.3.4.4/net/ipv6/ip6_output.c +--- linux-3.6.9/net/ipv6/ip6_output.c 2012-10-04 15:27:50.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/net/ipv6/ip6_output.c 2012-10-04 18:47:00.000000000 +0200 @@ -966,7 +966,8 @@ static int ip6_dst_lookup_tail(struct so struct rt6_info *rt = (struct rt6_info *) *dst; err = ip6_route_get_saddr(net, rt, &fl6->daddr, @@ -24666,9 +25389,9 @@ diff -NurpP --minimal linux-3.6.6/net/ipv6/ip6_output.c linux-3.6.6-vs2.3.4.3.1- if (err) goto out_err_release; } -diff -NurpP --minimal linux-3.6.6/net/ipv6/ndisc.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv6/ndisc.c ---- linux-3.6.6/net/ipv6/ndisc.c 2012-10-04 15:27:50.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv6/ndisc.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/net/ipv6/ndisc.c linux-3.6.9-vs2.3.4.4/net/ipv6/ndisc.c +--- linux-3.6.9/net/ipv6/ndisc.c 2012-12-08 01:34:16.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/net/ipv6/ndisc.c 2012-12-08 01:36:33.000000000 +0100 @@ -517,7 +517,7 @@ static void ndisc_send_na(struct net_dev } else { if (ipv6_dev_get_saddr(dev_net(dev), dev, daddr, @@ -24678,9 +25401,9 @@ diff -NurpP --minimal linux-3.6.6/net/ipv6/ndisc.c linux-3.6.6-vs2.3.4.3.1-noxfs return; src_addr = &tmpaddr; } -diff -NurpP --minimal linux-3.6.6/net/ipv6/raw.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv6/raw.c ---- linux-3.6.6/net/ipv6/raw.c 2012-10-04 15:27:50.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv6/raw.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/net/ipv6/raw.c linux-3.6.9-vs2.3.4.4/net/ipv6/raw.c +--- linux-3.6.9/net/ipv6/raw.c 2012-10-04 15:27:50.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/net/ipv6/raw.c 2012-10-04 18:47:00.000000000 +0200 @@ -30,6 +30,7 @@ #include #include @@ -24703,9 +25426,9 @@ diff -NurpP --minimal linux-3.6.6/net/ipv6/raw.c linux-3.6.6-vs2.3.4.3.1-noxfs-n /* ipv4 addr of the socket is invalid. Only the * unspecified and mapped address have a v4 equivalent. */ -diff -NurpP --minimal linux-3.6.6/net/ipv6/route.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv6/route.c ---- linux-3.6.6/net/ipv6/route.c 2012-11-06 18:42:15.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv6/route.c 2012-11-06 18:43:41.000000000 +0100 +diff -NurpP --minimal linux-3.6.9/net/ipv6/route.c linux-3.6.9-vs2.3.4.4/net/ipv6/route.c +--- linux-3.6.9/net/ipv6/route.c 2012-12-08 01:34:16.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/net/ipv6/route.c 2012-12-08 01:36:33.000000000 +0100 @@ -57,6 +57,7 @@ #include #include @@ -24753,9 +25476,9 @@ diff -NurpP --minimal linux-3.6.6/net/ipv6/route.c linux-3.6.6-vs2.3.4.3.1-noxfs seq_printf(m, "%pi6 %02x ", &rt->rt6i_dst.addr, rt->rt6i_dst.plen); #ifdef CONFIG_IPV6_SUBTREES -diff -NurpP --minimal linux-3.6.6/net/ipv6/tcp_ipv6.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv6/tcp_ipv6.c ---- linux-3.6.6/net/ipv6/tcp_ipv6.c 2012-11-06 18:42:15.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv6/tcp_ipv6.c 2012-11-06 18:43:41.000000000 +0100 +diff -NurpP --minimal linux-3.6.9/net/ipv6/tcp_ipv6.c linux-3.6.9-vs2.3.4.4/net/ipv6/tcp_ipv6.c +--- linux-3.6.9/net/ipv6/tcp_ipv6.c 2012-12-08 01:34:17.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/net/ipv6/tcp_ipv6.c 2012-11-06 18:43:41.000000000 +0100 @@ -71,6 +71,7 @@ #include @@ -24782,9 +25505,9 @@ diff -NurpP --minimal linux-3.6.6/net/ipv6/tcp_ipv6.c linux-3.6.6-vs2.3.4.3.1-no addr_type = ipv6_addr_type(&usin->sin6_addr); -diff -NurpP --minimal linux-3.6.6/net/ipv6/udp.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv6/udp.c ---- linux-3.6.6/net/ipv6/udp.c 2012-10-04 15:27:50.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv6/udp.c 2012-10-04 18:56:03.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/net/ipv6/udp.c linux-3.6.9-vs2.3.4.4/net/ipv6/udp.c +--- linux-3.6.9/net/ipv6/udp.c 2012-10-04 15:27:50.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/net/ipv6/udp.c 2012-10-04 18:56:03.000000000 +0200 @@ -45,42 +45,68 @@ #include #include @@ -24878,9 +25601,9 @@ diff -NurpP --minimal linux-3.6.6/net/ipv6/udp.c linux-3.6.6-vs2.3.4.3.1-noxfs-n } if (!ipv6_addr_any(&np->daddr)) { if (!ipv6_addr_equal(&np->daddr, saddr)) -diff -NurpP --minimal linux-3.6.6/net/ipv6/xfrm6_policy.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv6/xfrm6_policy.c ---- linux-3.6.6/net/ipv6/xfrm6_policy.c 2012-10-04 15:27:50.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/ipv6/xfrm6_policy.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/net/ipv6/xfrm6_policy.c linux-3.6.9-vs2.3.4.4/net/ipv6/xfrm6_policy.c +--- linux-3.6.9/net/ipv6/xfrm6_policy.c 2012-10-04 15:27:50.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/net/ipv6/xfrm6_policy.c 2012-10-04 18:47:00.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, @@ -24890,9 +25613,9 @@ diff -NurpP --minimal linux-3.6.6/net/ipv6/xfrm6_policy.c linux-3.6.6-vs2.3.4.3. dst_release(dst); return 0; } -diff -NurpP --minimal linux-3.6.6/net/netfilter/ipvs/ip_vs_xmit.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/netfilter/ipvs/ip_vs_xmit.c ---- linux-3.6.6/net/netfilter/ipvs/ip_vs_xmit.c 2012-11-06 18:42:15.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/netfilter/ipvs/ip_vs_xmit.c 2012-11-06 18:43:41.000000000 +0100 +diff -NurpP --minimal linux-3.6.9/net/netfilter/ipvs/ip_vs_xmit.c linux-3.6.9-vs2.3.4.4/net/netfilter/ipvs/ip_vs_xmit.c +--- linux-3.6.9/net/netfilter/ipvs/ip_vs_xmit.c 2012-12-08 01:34:19.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/net/netfilter/ipvs/ip_vs_xmit.c 2012-11-06 18:43:41.000000000 +0100 @@ -231,7 +231,7 @@ __ip_vs_route_output_v6(struct net *net, return dst; if (ipv6_addr_any(&fl6.saddr) && @@ -24902,9 +25625,9 @@ diff -NurpP --minimal linux-3.6.6/net/netfilter/ipvs/ip_vs_xmit.c linux-3.6.6-vs goto out_err; if (do_xfrm) { dst = xfrm_lookup(net, dst, flowi6_to_flowi(&fl6), NULL, 0); -diff -NurpP --minimal linux-3.6.6/net/netlink/af_netlink.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/netlink/af_netlink.c ---- linux-3.6.6/net/netlink/af_netlink.c 2012-11-06 18:42:15.000000000 +0100 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/netlink/af_netlink.c 2012-11-06 18:43:41.000000000 +0100 +diff -NurpP --minimal linux-3.6.9/net/netlink/af_netlink.c linux-3.6.9-vs2.3.4.4/net/netlink/af_netlink.c +--- linux-3.6.9/net/netlink/af_netlink.c 2012-12-08 01:34:19.000000000 +0100 ++++ linux-3.6.9-vs2.3.4.4/net/netlink/af_netlink.c 2012-12-08 01:36:33.000000000 +0100 @@ -55,6 +55,9 @@ #include #include @@ -24915,7 +25638,7 @@ diff -NurpP --minimal linux-3.6.6/net/netlink/af_netlink.c linux-3.6.6-vs2.3.4.3 #include #include -@@ -1972,6 +1975,8 @@ static struct sock *netlink_seq_socket_i +@@ -1983,6 +1986,8 @@ static struct sock *netlink_seq_socket_i sk_for_each(s, node, &hash->table[j]) { if (sock_net(s) != seq_file_net(seq)) continue; @@ -24924,7 +25647,7 @@ diff -NurpP --minimal linux-3.6.6/net/netlink/af_netlink.c linux-3.6.6-vs2.3.4.3 if (off == pos) { iter->link = i; iter->hash_idx = j; -@@ -2006,7 +2011,8 @@ static void *netlink_seq_next(struct seq +@@ -2017,7 +2022,8 @@ static void *netlink_seq_next(struct seq s = v; do { s = sk_next(s); @@ -24934,7 +25657,7 @@ diff -NurpP --minimal linux-3.6.6/net/netlink/af_netlink.c linux-3.6.6-vs2.3.4.3 if (s) return s; -@@ -2018,7 +2024,8 @@ static void *netlink_seq_next(struct seq +@@ -2029,7 +2035,8 @@ static void *netlink_seq_next(struct seq for (; j <= hash->mask; j++) { s = sk_head(&hash->table[j]); @@ -24944,9 +25667,9 @@ diff -NurpP --minimal linux-3.6.6/net/netlink/af_netlink.c linux-3.6.6-vs2.3.4.3 s = sk_next(s); if (s) { iter->link = i; -diff -NurpP --minimal linux-3.6.6/net/socket.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/socket.c ---- linux-3.6.6/net/socket.c 2012-10-04 15:27:51.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/socket.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/net/socket.c linux-3.6.9-vs2.3.4.4/net/socket.c +--- linux-3.6.9/net/socket.c 2012-10-04 15:27:51.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/net/socket.c 2012-10-04 18:47:00.000000000 +0200 @@ -98,6 +98,10 @@ #include @@ -25053,9 +25776,9 @@ diff -NurpP --minimal linux-3.6.6/net/socket.c linux-3.6.6-vs2.3.4.3.1-noxfs-noc err = sock1->ops->socketpair(sock1, sock2); if (err < 0) -diff -NurpP --minimal linux-3.6.6/net/sunrpc/auth.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/sunrpc/auth.c ---- linux-3.6.6/net/sunrpc/auth.c 2012-10-04 15:27:51.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/sunrpc/auth.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/net/sunrpc/auth.c linux-3.6.9-vs2.3.4.4/net/sunrpc/auth.c +--- linux-3.6.9/net/sunrpc/auth.c 2012-10-04 15:27:51.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/net/sunrpc/auth.c 2012-10-04 18:47:00.000000000 +0200 @@ -15,6 +15,7 @@ #include #include @@ -25080,9 +25803,9 @@ diff -NurpP --minimal linux-3.6.6/net/sunrpc/auth.c linux-3.6.6-vs2.3.4.3.1-noxf }; dprintk("RPC: %5u looking up %s cred\n", -diff -NurpP --minimal linux-3.6.6/net/sunrpc/auth_unix.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/sunrpc/auth_unix.c ---- linux-3.6.6/net/sunrpc/auth_unix.c 2012-07-22 23:39:49.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/sunrpc/auth_unix.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/net/sunrpc/auth_unix.c linux-3.6.9-vs2.3.4.4/net/sunrpc/auth_unix.c +--- linux-3.6.9/net/sunrpc/auth_unix.c 2012-07-22 23:39:49.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/net/sunrpc/auth_unix.c 2012-10-04 18:47:00.000000000 +0200 @@ -13,11 +13,13 @@ #include #include @@ -25093,7 +25816,7 @@ diff -NurpP --minimal linux-3.6.6/net/sunrpc/auth_unix.c linux-3.6.6-vs2.3.4.3.1 struct unx_cred { struct rpc_cred uc_base; -+ vserver_tag_t uc_tag; ++ vs_tag_t uc_tag; gid_t uc_gid; gid_t uc_gids[NFS_NGROUPS]; }; @@ -25140,9 +25863,9 @@ diff -NurpP --minimal linux-3.6.6/net/sunrpc/auth_unix.c linux-3.6.6-vs2.3.4.3.1 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.6.6/net/sunrpc/clnt.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/sunrpc/clnt.c ---- linux-3.6.6/net/sunrpc/clnt.c 2012-10-04 15:27:51.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/sunrpc/clnt.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/net/sunrpc/clnt.c linux-3.6.9-vs2.3.4.4/net/sunrpc/clnt.c +--- linux-3.6.9/net/sunrpc/clnt.c 2012-10-04 15:27:51.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/net/sunrpc/clnt.c 2012-10-04 18:47:00.000000000 +0200 @@ -31,6 +31,7 @@ #include #include @@ -25161,9 +25884,9 @@ diff -NurpP --minimal linux-3.6.6/net/sunrpc/clnt.c linux-3.6.6-vs2.3.4.3.1-noxf return clnt; } EXPORT_SYMBOL_GPL(rpc_create); -diff -NurpP --minimal linux-3.6.6/net/unix/af_unix.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/unix/af_unix.c ---- linux-3.6.6/net/unix/af_unix.c 2012-10-04 15:27:51.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/net/unix/af_unix.c 2012-10-04 18:59:36.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/net/unix/af_unix.c linux-3.6.9-vs2.3.4.4/net/unix/af_unix.c +--- linux-3.6.9/net/unix/af_unix.c 2012-10-04 15:27:51.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/net/unix/af_unix.c 2012-10-04 18:59:36.000000000 +0200 @@ -114,6 +114,8 @@ #include #include @@ -25200,9 +25923,9 @@ diff -NurpP --minimal linux-3.6.6/net/unix/af_unix.c linux-3.6.6-vs2.3.4.3.1-nox if (sock_net(sk) == seq_file_net(seq)) return sk; } -diff -NurpP --minimal linux-3.6.6/scripts/checksyscalls.sh linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/scripts/checksyscalls.sh ---- linux-3.6.6/scripts/checksyscalls.sh 2012-10-04 15:27:51.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/scripts/checksyscalls.sh 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/scripts/checksyscalls.sh linux-3.6.9-vs2.3.4.4/scripts/checksyscalls.sh +--- linux-3.6.9/scripts/checksyscalls.sh 2012-10-04 15:27:51.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/scripts/checksyscalls.sh 2012-10-04 18:47:00.000000000 +0200 @@ -193,7 +193,6 @@ cat << EOF #define __IGNORE_afs_syscall #define __IGNORE_getpmsg @@ -25211,9 +25934,9 @@ diff -NurpP --minimal linux-3.6.6/scripts/checksyscalls.sh linux-3.6.6-vs2.3.4.3 EOF } -diff -NurpP --minimal linux-3.6.6/security/commoncap.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/security/commoncap.c ---- linux-3.6.6/security/commoncap.c 2012-07-22 23:39:51.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/security/commoncap.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/security/commoncap.c linux-3.6.9-vs2.3.4.4/security/commoncap.c +--- linux-3.6.9/security/commoncap.c 2012-07-22 23:39:51.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/security/commoncap.c 2012-10-04 18:47:00.000000000 +0200 @@ -76,14 +76,20 @@ int cap_netlink_send(struct sock *sk, st int cap_capable(const struct cred *cred, struct user_namespace *targ_ns, int cap, int audit) @@ -25255,9 +25978,9 @@ diff -NurpP --minimal linux-3.6.6/security/commoncap.c linux-3.6.6-vs2.3.4.3.1-n return -EPERM; return 0; } -diff -NurpP --minimal linux-3.6.6/security/selinux/hooks.c linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/security/selinux/hooks.c ---- linux-3.6.6/security/selinux/hooks.c 2012-10-04 15:27:53.000000000 +0200 -+++ linux-3.6.6-vs2.3.4.3.1-noxfs-nocow/security/selinux/hooks.c 2012-10-04 18:47:00.000000000 +0200 +diff -NurpP --minimal linux-3.6.9/security/selinux/hooks.c linux-3.6.9-vs2.3.4.4/security/selinux/hooks.c +--- linux-3.6.9/security/selinux/hooks.c 2012-10-04 15:27:53.000000000 +0200 ++++ linux-3.6.9-vs2.3.4.4/security/selinux/hooks.c 2012-10-04 18:47:00.000000000 +0200 @@ -66,7 +66,6 @@ #include #include diff --git a/kernel.make b/kernel.make index 0f808c78..0e04986c 100644 --- a/kernel.make +++ b/kernel.make @@ -1,12 +1,10 @@ MAKE_OPTS := -SUB_DIR := -OSUB_DIR := include $(TARGETOBJ).mk all := $(filter-out all Makefile,$(MAKECMDGOALS)) all $(all): - $(MAKE) -C $(KERNELSRC)/$(SUB_DIR) O=$(KERNELOUTPUT)/$(OSUB_DIR) $(MAKE_OPTS) $(all) + $(MAKE) -C $(KERNELSRC) O=$(KERNELOUTPUT) $(MAKE_OPTS) $(all) # vim:ft=make diff --git a/kernel.spec b/kernel.spec index 99c08b1a..6a409895 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ %define rel 0.1 %define basever 3.6 -%define postver .6 +%define postver .9 # __alt_kernel is list of features, empty string if none set # _alt kernel is defined as: %{nil}%{?alt_kernel:-%{?alt_kernel}} (defined in rpm.macros) @@ -112,7 +112,7 @@ Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz # Source0-md5: 1a1760420eac802c541a20ab51a093d1 %if "%{postver}" != ".0" Patch0: http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.bz2 -# Patch0-md5: 363e730147333182616cc687345e7fe2 +# Patch0-md5: 521206b52f0c159f4f3e3d2e975977dc %endif Source3: kernel-autoconf.h @@ -169,8 +169,8 @@ Patch49: kernel-zph.patch # based on http://www.linuximq.net/patchs/patch-imqmq-3.1.diff.bz2 Patch50: kernel-imq.patch -Patch51: http://downloads.sourceforge.net/project/reiser4/reiser4-for-linux-3.x/reiser4-for-3.5.3.patch.gz -# Patch51-md5: 7794f6edb31fd39f5d27f978d4f23cb1 +Patch51: http://downloads.sourceforge.net/project/reiser4/reiser4-for-linux-3.x/reiser4-for-3.6.4.patch.gz +# Patch51-md5: 4128aa3bd062d0289117dda6775a7f20 # http://fatooh.org/esfq-2.6/sfq-2.6.24.1.tar.bz2 Patch53: kernel-esfq.patch @@ -187,7 +187,7 @@ Patch59: kernel-rndis_host-wm5.patch # http://patches.aircrack-ng.org/hostap-kernel-2.6.18.patch Patch85: kernel-hostap.patch -# http://vserver.13thfloor.at/Experimental/patch-3.6.6-vs2.3.4.3.1-noxfs-nocow.diff +# http://vserver.13thfloor.at/Experimental/patch-3.6.9-vs2.3.4.4.diff Patch100: kernel-vserver-2.3.patch Patch101: kernel-vserver-fixes.patch @@ -590,16 +590,6 @@ Verzeichniss vorgefunden werden kann. Pakiet zawiera dokumentację do jądra Linuksa pochodzącą z katalogu /usr/src/linux/Documentation. -%package tools-perf -Summary: perf tool -Group: Applications/System - -%description tools-perf -Perf is a profiler tool for Linux 2.6+ based systems that abstracts -away CPU hardware differences in Linux performance measurements and -presents a simple commandline interface. Perf is based on the -perf_events interface exported by recent versions of the Linux kernel. - %prep %setup -qc ln -s %{SOURCE7} kernel-module-build.pl @@ -859,30 +849,6 @@ cd - %{__awk} %{?debug:-v dieOnError=1} -v infile=%{objdir}/%{defconfig} -f %{SOURCE8} %{objdir}/.config -# builds userspace tools - -# perf slag version -install -d %{targetobj}/tools/perf-slang -%{__make} all man NO_GTK2=1 \ - SUB_DIR=tools/perf \ - OSUB_DIR=tools/perf-slang \ - TARGETOBJ=%{targetobj} \ - %{?with_verbose:V=1} \ - prefix=%{_prefix} \ - perfexecdir=%{_datadir}/perf-core \ - template_dir=%{_datadir}/perf-core/templates - -# perf gtk version -install -d %{targetobj}/tools/perf-gtk -%{__make} all man \ - SUB_DIR=tools/perf \ - OSUB_DIR=tools/perf-gtk \ - TARGETOBJ=%{targetobj} \ - %{?with_verbose:V=1} \ - prefix=%{_prefix} \ - perfexecdir=%{_datadir}/perf-core \ - template_dir=%{_datadir}/perf-core/templates - # build kernel %{__make} \ TARGETOBJ=%{targetobj} \ @@ -891,27 +857,6 @@ install -d %{targetobj}/tools/perf-gtk %install rm -rf $RPM_BUILD_ROOT - -%if 0 -# FIXME -# perf slang -%{__make} %{MakeOpts} -j1 %{!?with_verbose:-s} install install-man NO_GTK2=1 \ - -C %{objdir}/tools/perf-slang \ - DESTDIR=$RPM_BUILD_ROOT \ - prefix=%{_prefix} \ - perfexecdir=%{_datadir}/perf-core \ - template_dir=%{_datadir}/perf-core/templates - -# perf gtk -%{__make} %{MakeOpts} -j1 %{!?with_verbose:-s} install install-man \ - -C %{objdir}/tools/perf-gtk \ - DESTDIR=$RPM_BUILD_ROOT \ - prefix=%{_prefix} \ - perfexecdir=%{_datadir}/perf-core \ - template_dir=%{_datadir}/perf-core/templates -%endif - -# kernel modules and rest %{__make} %{MakeOpts} -j1 %{!?with_verbose:-s} modules_install firmware_install \ -C %{objdir} \ %{?with_verbose:V=1} \ -- 2.44.0