-diff -NurpP --minimal linux-3.5.4/Documentation/vserver/debug.txt linux-3.5.4-vs2.3.4.3/Documentation/vserver/debug.txt
---- linux-3.5.4/Documentation/vserver/debug.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/Documentation/vserver/debug.txt 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/Documentation/vserver/debug.txt linux-3.6-vs2.3.4.3-noxfs-nocow/Documentation/vserver/debug.txt
+--- linux-3.6/Documentation/vserver/debug.txt 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/Documentation/vserver/debug.txt 2012-10-04 18:46:59.000000000 +0200
@@ -0,0 +1,154 @@
+
+debug_cvirt:
+ m 2^m "vx_acc_page[%5d,%s,%2d]: %5d%s"
+ "vx_acc_pages[%5d,%s,%2d]: %5d += %5d"
+ "vx_pages_avail[%5d,%s,%2d]: %5ld > %5d + %5d"
-diff -NurpP --minimal linux-3.5.4/arch/alpha/Kconfig linux-3.5.4-vs2.3.4.3/arch/alpha/Kconfig
---- linux-3.5.4/arch/alpha/Kconfig 2012-07-22 23:38:45.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/arch/alpha/Kconfig 2012-07-23 01:45:55.000000000 +0200
-@@ -661,6 +661,8 @@ config DUMMY_CONSOLE
+diff -NurpP --minimal linux-3.6/arch/alpha/Kconfig linux-3.6-vs2.3.4.3-noxfs-nocow/arch/alpha/Kconfig
+--- linux-3.6/arch/alpha/Kconfig 2012-10-04 15:26:43.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/alpha/Kconfig 2012-10-04 18:46:59.000000000 +0200
+@@ -664,6 +664,8 @@ config DUMMY_CONSOLE
depends on VGA_HOSE
default y
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.5.4/arch/alpha/kernel/entry.S linux-3.5.4-vs2.3.4.3/arch/alpha/kernel/entry.S
---- linux-3.5.4/arch/alpha/kernel/entry.S 2010-10-21 13:06:45.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/arch/alpha/kernel/entry.S 2012-07-23 01:45:55.000000000 +0200
-@@ -860,24 +860,15 @@ sys_getxgid:
- .globl sys_getxpid
- .ent sys_getxpid
- sys_getxpid:
-+ lda $sp, -16($sp)
-+ stq $26, 0($sp)
- .prologue 0
-- ldq $2, TI_TASK($8)
-
-- /* See linux/kernel/timer.c sys_getppid for discussion
-- about this loop. */
-- ldq $3, TASK_GROUP_LEADER($2)
-- ldq $4, TASK_REAL_PARENT($3)
-- ldl $0, TASK_TGID($2)
--1: ldl $1, TASK_TGID($4)
--#ifdef CONFIG_SMP
-- mov $4, $5
-- mb
-- ldq $3, TASK_GROUP_LEADER($2)
-- ldq $4, TASK_REAL_PARENT($3)
-- cmpeq $4, $5, $5
-- beq $5, 1b
--#endif
-- stq $1, 80($sp)
-+ lda $16, 96($sp)
-+ jsr $26, do_getxpid
-+ ldq $26, 0($sp)
-+
-+ lda $sp, 16($sp)
- ret
- .end sys_getxpid
-
-diff -NurpP --minimal linux-3.5.4/arch/alpha/kernel/ptrace.c linux-3.5.4-vs2.3.4.3/arch/alpha/kernel/ptrace.c
---- linux-3.5.4/arch/alpha/kernel/ptrace.c 2012-05-21 18:06:12.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/arch/alpha/kernel/ptrace.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/alpha/kernel/ptrace.c linux-3.6-vs2.3.4.3-noxfs-nocow/arch/alpha/kernel/ptrace.c
+--- linux-3.6/arch/alpha/kernel/ptrace.c 2012-05-21 18:06:12.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/alpha/kernel/ptrace.c 2012-10-04 18:46:59.000000000 +0200
@@ -13,6 +13,7 @@
#include <linux/user.h>
#include <linux/security.h>
#include <asm/uaccess.h>
#include <asm/pgtable.h>
-diff -NurpP --minimal linux-3.5.4/arch/alpha/kernel/systbls.S linux-3.5.4-vs2.3.4.3/arch/alpha/kernel/systbls.S
---- linux-3.5.4/arch/alpha/kernel/systbls.S 2012-07-22 23:38:45.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/arch/alpha/kernel/systbls.S 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/alpha/kernel/systbls.S linux-3.6-vs2.3.4.3-noxfs-nocow/arch/alpha/kernel/systbls.S
+--- linux-3.6/arch/alpha/kernel/systbls.S 2012-10-04 15:26:43.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
.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.5.4/arch/alpha/kernel/traps.c linux-3.5.4-vs2.3.4.3/arch/alpha/kernel/traps.c
---- linux-3.5.4/arch/alpha/kernel/traps.c 2012-05-21 18:06:12.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/arch/alpha/kernel/traps.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/alpha/kernel/traps.c linux-3.6-vs2.3.4.3-noxfs-nocow/arch/alpha/kernel/traps.c
+--- linux-3.6/arch/alpha/kernel/traps.c 2012-05-21 18:06:12.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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());
dik_show_regs(regs, r9_15);
add_taint(TAINT_DIE);
dik_show_trace((unsigned long *)(regs+1));
-diff -NurpP --minimal linux-3.5.4/arch/arm/Kconfig linux-3.5.4-vs2.3.4.3/arch/arm/Kconfig
---- linux-3.5.4/arch/arm/Kconfig 2012-09-16 20:46:29.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/arch/arm/Kconfig 2012-09-16 20:50:19.000000000 +0200
-@@ -2270,6 +2270,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.6/arch/arm/Kconfig linux-3.6-vs2.3.4.3-noxfs-nocow/arch/arm/Kconfig
+--- linux-3.6/arch/arm/Kconfig 2012-10-04 15:26:43.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/arm/Kconfig 2012-10-04 18:46:59.000000000 +0200
+@@ -2331,6 +2331,8 @@ source "fs/Kconfig"
source "arch/arm/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.5.4/arch/arm/kernel/calls.S linux-3.5.4-vs2.3.4.3/arch/arm/kernel/calls.S
---- linux-3.5.4/arch/arm/kernel/calls.S 2012-01-09 16:13:54.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/arch/arm/kernel/calls.S 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/arm/kernel/calls.S linux-3.6-vs2.3.4.3-noxfs-nocow/arch/arm/kernel/calls.S
+--- linux-3.6/arch/arm/kernel/calls.S 2012-10-04 15:26:43.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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)
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-3.5.4/arch/arm/kernel/process.c linux-3.5.4-vs2.3.4.3/arch/arm/kernel/process.c
---- linux-3.5.4/arch/arm/kernel/process.c 2012-09-16 20:46:29.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/arch/arm/kernel/process.c 2012-08-19 13:28:27.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/arm/kernel/process.c linux-3.6-vs2.3.4.3-noxfs-nocow/arch/arm/kernel/process.c
+--- linux-3.6/arch/arm/kernel/process.c 2012-10-04 15:26:43.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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)
{
__show_regs(regs);
dump_stack();
}
-diff -NurpP --minimal linux-3.5.4/arch/arm/kernel/traps.c linux-3.5.4-vs2.3.4.3/arch/arm/kernel/traps.c
---- linux-3.5.4/arch/arm/kernel/traps.c 2012-09-16 20:46:29.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/arch/arm/kernel/traps.c 2012-08-19 13:28:27.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/arm/kernel/traps.c linux-3.6-vs2.3.4.3-noxfs-nocow/arch/arm/kernel/traps.c
+--- linux-3.6/arch/arm/kernel/traps.c 2012-10-04 15:26:44.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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();
__show_regs(regs);
- printk(KERN_EMERG "Process %.*s (pid: %d, stack limit = 0x%p)\n",
-- TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), thread + 1);
+- TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), end_of_stack(tsk));
+ printk(KERN_EMERG "Process %.*s (pid: %d:#%u, stack limit = 0x%p)\n",
-+ TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), tsk->xid, thread + 1);
++ TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), tsk->xid, end_of_stack(tsk));
if (!user_mode(regs) || in_interrupt()) {
dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-3.5.4/arch/cris/Kconfig linux-3.5.4-vs2.3.4.3/arch/cris/Kconfig
---- linux-3.5.4/arch/cris/Kconfig 2012-07-22 23:38:50.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/arch/cris/Kconfig 2012-07-23 01:45:55.000000000 +0200
-@@ -672,6 +672,8 @@ source "drivers/staging/Kconfig"
+diff -NurpP --minimal linux-3.6/arch/cris/Kconfig linux-3.6-vs2.3.4.3-noxfs-nocow/arch/cris/Kconfig
+--- linux-3.6/arch/cris/Kconfig 2012-10-04 15:26:51.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/cris/Kconfig 2012-10-04 18:46:59.000000000 +0200
+@@ -673,6 +673,8 @@ source "drivers/staging/Kconfig"
source "arch/cris/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.5.4/arch/frv/kernel/kernel_thread.S linux-3.5.4-vs2.3.4.3/arch/frv/kernel/kernel_thread.S
---- linux-3.5.4/arch/frv/kernel/kernel_thread.S 2008-12-25 00:26:37.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/arch/frv/kernel/kernel_thread.S 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/frv/kernel/kernel_thread.S linux-3.6-vs2.3.4.3-noxfs-nocow/arch/frv/kernel/kernel_thread.S
+--- linux-3.6/arch/frv/kernel/kernel_thread.S 2012-10-04 15:26:51.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
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.5.4/arch/h8300/Kconfig linux-3.5.4-vs2.3.4.3/arch/h8300/Kconfig
---- linux-3.5.4/arch/h8300/Kconfig 2012-03-19 19:46:39.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/arch/h8300/Kconfig 2012-07-23 01:45:55.000000000 +0200
-@@ -214,6 +214,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.6/arch/h8300/Kconfig linux-3.6-vs2.3.4.3-noxfs-nocow/arch/h8300/Kconfig
+--- linux-3.6/arch/h8300/Kconfig 2012-10-04 15:26:51.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/h8300/Kconfig 2012-10-04 18:46:59.000000000 +0200
+@@ -215,6 +215,8 @@ source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.5.4/arch/ia64/Kconfig linux-3.5.4-vs2.3.4.3/arch/ia64/Kconfig
---- linux-3.5.4/arch/ia64/Kconfig 2012-07-22 23:38:50.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/arch/ia64/Kconfig 2012-07-23 01:45:55.000000000 +0200
-@@ -653,6 +653,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.6/arch/ia64/Kconfig linux-3.6-vs2.3.4.3-noxfs-nocow/arch/ia64/Kconfig
+--- linux-3.6/arch/ia64/Kconfig 2012-10-04 15:26:51.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/ia64/Kconfig 2012-10-04 18:46:59.000000000 +0200
+@@ -652,6 +652,8 @@ source "fs/Kconfig"
source "arch/ia64/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.5.4/arch/ia64/kernel/entry.S linux-3.5.4-vs2.3.4.3/arch/ia64/kernel/entry.S
---- linux-3.5.4/arch/ia64/kernel/entry.S 2012-03-19 19:46:40.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/arch/ia64/kernel/entry.S 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/ia64/kernel/entry.S linux-3.6-vs2.3.4.3-noxfs-nocow/arch/ia64/kernel/entry.S
+--- linux-3.6/arch/ia64/kernel/entry.S 2012-03-19 19:46:40.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -NurpP --minimal linux-3.5.4/arch/ia64/kernel/process.c linux-3.5.4-vs2.3.4.3/arch/ia64/kernel/process.c
---- linux-3.5.4/arch/ia64/kernel/process.c 2012-07-22 23:38:51.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/arch/ia64/kernel/process.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/ia64/kernel/process.c linux-3.6-vs2.3.4.3-noxfs-nocow/arch/ia64/kernel/process.c
+--- linux-3.6/arch/ia64/kernel/process.c 2012-07-22 23:38:51.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/ia64/kernel/process.c 2012-10-04 18:46:59.000000000 +0200
@@ -110,8 +110,8 @@ show_regs (struct pt_regs *regs)
unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri;
printk("psr : %016lx ifs : %016lx ip : [<%016lx>] %s (%s)\n",
regs->cr_ipsr, regs->cr_ifs, ip, print_tainted(),
init_utsname()->release);
-diff -NurpP --minimal linux-3.5.4/arch/ia64/kernel/ptrace.c linux-3.5.4-vs2.3.4.3/arch/ia64/kernel/ptrace.c
---- linux-3.5.4/arch/ia64/kernel/ptrace.c 2012-05-21 18:06:26.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/arch/ia64/kernel/ptrace.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/ia64/kernel/ptrace.c linux-3.6-vs2.3.4.3-noxfs-nocow/arch/ia64/kernel/ptrace.c
+--- linux-3.6/arch/ia64/kernel/ptrace.c 2012-05-21 18:06:26.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/ia64/kernel/ptrace.c 2012-10-04 18:46:59.000000000 +0200
@@ -21,6 +21,7 @@
#include <linux/regset.h>
#include <linux/elf.h>
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-3.5.4/arch/ia64/kernel/traps.c linux-3.5.4-vs2.3.4.3/arch/ia64/kernel/traps.c
---- linux-3.5.4/arch/ia64/kernel/traps.c 2012-05-21 18:06:26.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/arch/ia64/kernel/traps.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/ia64/kernel/traps.c linux-3.6-vs2.3.4.3-noxfs-nocow/arch/ia64/kernel/traps.c
+--- linux-3.6/arch/ia64/kernel/traps.c 2012-05-21 18:06:26.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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();
}
}
}
-diff -NurpP --minimal linux-3.5.4/arch/m32r/kernel/traps.c linux-3.5.4-vs2.3.4.3/arch/m32r/kernel/traps.c
---- linux-3.5.4/arch/m32r/kernel/traps.c 2012-05-21 18:06:26.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/arch/m32r/kernel/traps.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/m32r/kernel/traps.c linux-3.6-vs2.3.4.3-noxfs-nocow/arch/m32r/kernel/traps.c
+--- linux-3.6/arch/m32r/kernel/traps.c 2012-05-21 18:06:26.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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);
/*
* When in-kernel, we also print out the stack and code at the
-diff -NurpP --minimal linux-3.5.4/arch/m68k/Kconfig linux-3.5.4-vs2.3.4.3/arch/m68k/Kconfig
---- linux-3.5.4/arch/m68k/Kconfig 2012-07-22 23:38:51.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/arch/m68k/Kconfig 2012-07-23 01:45:55.000000000 +0200
-@@ -139,6 +139,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.6/arch/m68k/Kconfig linux-3.6-vs2.3.4.3-noxfs-nocow/arch/m68k/Kconfig
+--- linux-3.6/arch/m68k/Kconfig 2012-10-04 15:26:51.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/m68k/Kconfig 2012-10-04 18:47:00.000000000 +0200
+@@ -129,6 +129,8 @@ source "fs/Kconfig"
source "arch/m68k/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.5.4/arch/mips/Kconfig linux-3.5.4-vs2.3.4.3/arch/mips/Kconfig
---- linux-3.5.4/arch/mips/Kconfig 2012-07-22 23:38:51.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/arch/mips/Kconfig 2012-07-23 01:45:55.000000000 +0200
-@@ -2513,6 +2513,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.6/arch/mips/Kconfig linux-3.6-vs2.3.4.3-noxfs-nocow/arch/mips/Kconfig
+--- linux-3.6/arch/mips/Kconfig 2012-10-04 15:26:52.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/mips/Kconfig 2012-10-04 18:47:00.000000000 +0200
+@@ -2554,6 +2554,8 @@ source "fs/Kconfig"
source "arch/mips/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.5.4/arch/mips/kernel/ptrace.c linux-3.5.4-vs2.3.4.3/arch/mips/kernel/ptrace.c
---- linux-3.5.4/arch/mips/kernel/ptrace.c 2012-07-22 23:38:52.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/arch/mips/kernel/ptrace.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/mips/kernel/ptrace.c linux-3.6-vs2.3.4.3-noxfs-nocow/arch/mips/kernel/ptrace.c
+--- linux-3.6/arch/mips/kernel/ptrace.c 2012-07-22 23:38:52.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/mips/kernel/ptrace.c 2012-10-04 18:47:00.000000000 +0200
@@ -25,6 +25,7 @@
#include <linux/security.h>
#include <linux/audit.h>
switch (request) {
/* when I and D space are separate, these will need to be fixed. */
case PTRACE_PEEKTEXT: /* read word at location addr. */
-diff -NurpP --minimal linux-3.5.4/arch/mips/kernel/scall32-o32.S linux-3.5.4-vs2.3.4.3/arch/mips/kernel/scall32-o32.S
---- linux-3.5.4/arch/mips/kernel/scall32-o32.S 2012-01-09 16:14:05.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/arch/mips/kernel/scall32-o32.S 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/mips/kernel/scall32-o32.S linux-3.6-vs2.3.4.3-noxfs-nocow/arch/mips/kernel/scall32-o32.S
+--- linux-3.6/arch/mips/kernel/scall32-o32.S 2012-01-09 16:14:05.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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 */
sys sys_waitid 5
sys sys_ni_syscall 0 /* available, was setaltroot */
sys sys_add_key 5 /* 4280 */
-diff -NurpP --minimal linux-3.5.4/arch/mips/kernel/scall64-64.S linux-3.5.4-vs2.3.4.3/arch/mips/kernel/scall64-64.S
---- linux-3.5.4/arch/mips/kernel/scall64-64.S 2012-01-09 16:14:05.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/arch/mips/kernel/scall64-64.S 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/mips/kernel/scall64-64.S linux-3.6-vs2.3.4.3-noxfs-nocow/arch/mips/kernel/scall64-64.S
+--- linux-3.6/arch/mips/kernel/scall64-64.S 2012-01-09 16:14:05.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-3.5.4/arch/mips/kernel/scall64-n32.S linux-3.5.4-vs2.3.4.3/arch/mips/kernel/scall64-n32.S
---- linux-3.5.4/arch/mips/kernel/scall64-n32.S 2012-01-09 16:14:05.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/arch/mips/kernel/scall64-n32.S 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/mips/kernel/scall64-n32.S linux-3.6-vs2.3.4.3-noxfs-nocow/arch/mips/kernel/scall64-n32.S
+--- linux-3.6/arch/mips/kernel/scall64-n32.S 2012-01-09 16:14:05.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
PTR compat_sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-3.5.4/arch/mips/kernel/scall64-o32.S linux-3.5.4-vs2.3.4.3/arch/mips/kernel/scall64-o32.S
---- linux-3.5.4/arch/mips/kernel/scall64-o32.S 2012-01-09 16:14:05.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/arch/mips/kernel/scall64-o32.S 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/mips/kernel/scall64-o32.S linux-3.6-vs2.3.4.3-noxfs-nocow/arch/mips/kernel/scall64-o32.S
+--- linux-3.6/arch/mips/kernel/scall64-o32.S 2012-01-09 16:14:05.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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 */
PTR sys_32_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-diff -NurpP --minimal linux-3.5.4/arch/mips/kernel/traps.c linux-3.5.4-vs2.3.4.3/arch/mips/kernel/traps.c
---- linux-3.5.4/arch/mips/kernel/traps.c 2012-07-22 23:38:52.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/arch/mips/kernel/traps.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/mips/kernel/traps.c linux-3.6-vs2.3.4.3-noxfs-nocow/arch/mips/kernel/traps.c
+--- linux-3.6/arch/mips/kernel/traps.c 2012-10-04 15:26:53.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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);
if (cpu_has_userlocal) {
unsigned long tls;
-diff -NurpP --minimal linux-3.5.4/arch/parisc/Kconfig linux-3.5.4-vs2.3.4.3/arch/parisc/Kconfig
---- linux-3.5.4/arch/parisc/Kconfig 2012-07-22 23:38:52.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/arch/parisc/Kconfig 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/parisc/Kconfig linux-3.6-vs2.3.4.3-noxfs-nocow/arch/parisc/Kconfig
+--- linux-3.6/arch/parisc/Kconfig 2012-07-22 23:38:52.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/parisc/Kconfig 2012-10-04 18:47:00.000000000 +0200
@@ -281,6 +281,8 @@ source "fs/Kconfig"
source "arch/parisc/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.5.4/arch/parisc/kernel/syscall_table.S linux-3.5.4-vs2.3.4.3/arch/parisc/kernel/syscall_table.S
---- linux-3.5.4/arch/parisc/kernel/syscall_table.S 2011-10-24 18:45:00.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/arch/parisc/kernel/syscall_table.S 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/parisc/kernel/syscall_table.S linux-3.6-vs2.3.4.3-noxfs-nocow/arch/parisc/kernel/syscall_table.S
+--- linux-3.6/arch/parisc/kernel/syscall_table.S 2011-10-24 18:45:00.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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)
ENTRY_SAME(add_key)
ENTRY_SAME(request_key) /* 265 */
ENTRY_SAME(keyctl)
-diff -NurpP --minimal linux-3.5.4/arch/parisc/kernel/traps.c linux-3.5.4-vs2.3.4.3/arch/parisc/kernel/traps.c
---- linux-3.5.4/arch/parisc/kernel/traps.c 2012-05-21 18:06:28.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/arch/parisc/kernel/traps.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/parisc/kernel/traps.c linux-3.6-vs2.3.4.3-noxfs-nocow/arch/parisc/kernel/traps.c
+--- linux-3.6/arch/parisc/kernel/traps.c 2012-05-21 18:06:28.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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 */
/* Wot's wrong wif bein' racy? */
if (current->thread.flags & PARISC_KERNEL_DEATH) {
-diff -NurpP --minimal linux-3.5.4/arch/parisc/mm/fault.c linux-3.5.4-vs2.3.4.3/arch/parisc/mm/fault.c
---- linux-3.5.4/arch/parisc/mm/fault.c 2010-08-02 16:52:06.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/arch/parisc/mm/fault.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/parisc/mm/fault.c linux-3.6-vs2.3.4.3-noxfs-nocow/arch/parisc/mm/fault.c
+--- linux-3.6/arch/parisc/mm/fault.c 2010-08-02 16:52:06.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/parisc/mm/fault.c 2012-10-04 18:47:00.000000000 +0200
@@ -237,8 +237,9 @@ bad_area:
#ifdef PRINT_USER_FAULTS
if (vma) {
printk(KERN_DEBUG "vm_start = 0x%08lx, vm_end = 0x%08lx\n",
vma->vm_start, vma->vm_end);
-diff -NurpP --minimal linux-3.5.4/arch/powerpc/Kconfig linux-3.5.4-vs2.3.4.3/arch/powerpc/Kconfig
---- linux-3.5.4/arch/powerpc/Kconfig 2012-07-22 23:38:53.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/arch/powerpc/Kconfig 2012-07-23 01:45:55.000000000 +0200
-@@ -994,6 +994,8 @@ source "lib/Kconfig"
+diff -NurpP --minimal linux-3.6/arch/powerpc/Kconfig linux-3.6-vs2.3.4.3-noxfs-nocow/arch/powerpc/Kconfig
+--- linux-3.6/arch/powerpc/Kconfig 2012-10-04 15:26:53.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/powerpc/Kconfig 2012-10-04 18:47:00.000000000 +0200
+@@ -996,6 +996,8 @@ source "lib/Kconfig"
source "arch/powerpc/Kconfig.debug"
source "security/Kconfig"
config KEYS_COMPAT
-diff -NurpP --minimal linux-3.5.4/arch/powerpc/include/asm/unistd.h linux-3.5.4-vs2.3.4.3/arch/powerpc/include/asm/unistd.h
---- linux-3.5.4/arch/powerpc/include/asm/unistd.h 2012-01-09 16:14:05.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/arch/powerpc/include/asm/unistd.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/powerpc/include/asm/unistd.h linux-3.6-vs2.3.4.3-noxfs-nocow/arch/powerpc/include/asm/unistd.h
+--- linux-3.6/arch/powerpc/include/asm/unistd.h 2012-10-04 15:26:53.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/powerpc/include/asm/unistd.h 2012-10-04 18:47:00.000000000 +0200
@@ -275,7 +275,7 @@
#endif
#define __NR_rtas 255
#define __NR_migrate_pages 258
#define __NR_mbind 259
#define __NR_get_mempolicy 260
-diff -NurpP --minimal linux-3.5.4/arch/powerpc/kernel/process.c linux-3.5.4-vs2.3.4.3/arch/powerpc/kernel/process.c
---- linux-3.5.4/arch/powerpc/kernel/process.c 2012-09-16 20:46:30.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/arch/powerpc/kernel/process.c 2012-09-16 20:50:19.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/powerpc/kernel/process.c linux-3.6-vs2.3.4.3-noxfs-nocow/arch/powerpc/kernel/process.c
+--- linux-3.6/arch/powerpc/kernel/process.c 2012-10-04 15:26:54.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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);
#ifdef CONFIG_SMP
printk(" CPU: %d", raw_smp_processor_id());
-diff -NurpP --minimal linux-3.5.4/arch/powerpc/kernel/traps.c linux-3.5.4-vs2.3.4.3/arch/powerpc/kernel/traps.c
---- linux-3.5.4/arch/powerpc/kernel/traps.c 2012-09-16 20:46:30.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/arch/powerpc/kernel/traps.c 2012-09-16 20:50:19.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/powerpc/kernel/traps.c linux-3.6-vs2.3.4.3-noxfs-nocow/arch/powerpc/kernel/traps.c
+--- linux-3.6/arch/powerpc/kernel/traps.c 2012-10-04 15:26:54.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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)
regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted());
}
-diff -NurpP --minimal linux-3.5.4/arch/s390/Kconfig linux-3.5.4-vs2.3.4.3/arch/s390/Kconfig
---- linux-3.5.4/arch/s390/Kconfig 2012-07-22 23:38:58.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/arch/s390/Kconfig 2012-07-23 01:45:55.000000000 +0200
-@@ -630,6 +630,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.6/arch/s390/Kconfig linux-3.6-vs2.3.4.3-noxfs-nocow/arch/s390/Kconfig
+--- linux-3.6/arch/s390/Kconfig 2012-10-04 15:26:54.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/s390/Kconfig 2012-10-04 18:47:00.000000000 +0200
+@@ -634,6 +634,8 @@ source "fs/Kconfig"
source "arch/s390/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.5.4/arch/s390/include/asm/tlb.h linux-3.5.4-vs2.3.4.3/arch/s390/include/asm/tlb.h
---- linux-3.5.4/arch/s390/include/asm/tlb.h 2012-07-22 23:38:59.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/arch/s390/include/asm/tlb.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/s390/include/asm/tlb.h linux-3.6-vs2.3.4.3-noxfs-nocow/arch/s390/include/asm/tlb.h
+--- linux-3.6/arch/s390/include/asm/tlb.h 2012-07-22 23:38:59.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/s390/include/asm/tlb.h 2012-10-04 18:47:00.000000000 +0200
@@ -24,6 +24,7 @@
#include <linux/mm.h>
#include <linux/pagemap.h>
#include <asm/processor.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-3.5.4/arch/s390/include/asm/unistd.h linux-3.5.4-vs2.3.4.3/arch/s390/include/asm/unistd.h
---- linux-3.5.4/arch/s390/include/asm/unistd.h 2012-03-19 19:46:48.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/arch/s390/include/asm/unistd.h 2012-07-23 01:45:55.000000000 +0200
-@@ -202,7 +202,7 @@
+diff -NurpP --minimal linux-3.6/arch/s390/include/asm/unistd.h linux-3.6-vs2.3.4.3-noxfs-nocow/arch/s390/include/asm/unistd.h
+--- linux-3.6/arch/s390/include/asm/unistd.h 2012-10-04 15:26:55.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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)
#define __NR_clock_nanosleep (__NR_timer_create+8)
#define __NR_statfs64 265
#define __NR_fstatfs64 266
#define __NR_remap_file_pages 267
-diff -NurpP --minimal linux-3.5.4/arch/s390/kernel/ptrace.c linux-3.5.4-vs2.3.4.3/arch/s390/kernel/ptrace.c
---- linux-3.5.4/arch/s390/kernel/ptrace.c 2012-07-22 23:38:59.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/arch/s390/kernel/ptrace.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/s390/kernel/ptrace.c linux-3.6-vs2.3.4.3-noxfs-nocow/arch/s390/kernel/ptrace.c
+--- linux-3.6/arch/s390/kernel/ptrace.c 2012-10-04 15:26:55.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/s390/kernel/ptrace.c 2012-10-04 18:47:00.000000000 +0200
@@ -21,6 +21,7 @@
#include <linux/tracehook.h>
#include <linux/seccomp.h>
#include <trace/syscall.h>
#include <asm/segment.h>
#include <asm/page.h>
-diff -NurpP --minimal linux-3.5.4/arch/s390/kernel/syscalls.S linux-3.5.4-vs2.3.4.3/arch/s390/kernel/syscalls.S
---- linux-3.5.4/arch/s390/kernel/syscalls.S 2012-01-09 16:14:06.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/arch/s390/kernel/syscalls.S 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/s390/kernel/syscalls.S linux-3.6-vs2.3.4.3-noxfs-nocow/arch/s390/kernel/syscalls.S
+--- linux-3.6/arch/s390/kernel/syscalls.S 2012-01-09 16:14:06.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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)
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.5.4/arch/sh/Kconfig linux-3.5.4-vs2.3.4.3/arch/sh/Kconfig
---- linux-3.5.4/arch/sh/Kconfig 2012-07-22 23:38:59.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/arch/sh/Kconfig 2012-07-23 01:45:55.000000000 +0200
-@@ -937,6 +937,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.6/arch/sh/Kconfig linux-3.6-vs2.3.4.3-noxfs-nocow/arch/sh/Kconfig
+--- linux-3.6/arch/sh/Kconfig 2012-10-04 15:26:55.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/sh/Kconfig 2012-10-04 18:47:00.000000000 +0200
+@@ -940,6 +940,8 @@ source "fs/Kconfig"
source "arch/sh/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.5.4/arch/sh/kernel/irq.c linux-3.5.4-vs2.3.4.3/arch/sh/kernel/irq.c
---- linux-3.5.4/arch/sh/kernel/irq.c 2012-07-22 23:38:59.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/arch/sh/kernel/irq.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/sh/kernel/irq.c linux-3.6-vs2.3.4.3-noxfs-nocow/arch/sh/kernel/irq.c
+--- linux-3.6/arch/sh/kernel/irq.c 2012-10-04 15:26:56.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/sh/kernel/irq.c 2012-10-04 18:47:00.000000000 +0200
@@ -14,6 +14,7 @@
#include <linux/ftrace.h>
#include <linux/delay.h>
#include <asm/processor.h>
#include <asm/machvec.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-3.5.4/arch/sparc/Kconfig linux-3.5.4-vs2.3.4.3/arch/sparc/Kconfig
---- linux-3.5.4/arch/sparc/Kconfig 2012-07-22 23:38:59.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/arch/sparc/Kconfig 2012-07-23 01:45:55.000000000 +0200
-@@ -592,6 +592,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.6/arch/sparc/Kconfig linux-3.6-vs2.3.4.3-noxfs-nocow/arch/sparc/Kconfig
+--- linux-3.6/arch/sparc/Kconfig 2012-10-04 15:26:58.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/sparc/Kconfig 2012-10-04 18:47:00.000000000 +0200
+@@ -593,6 +593,8 @@ source "fs/Kconfig"
source "arch/sparc/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.5.4/arch/sparc/include/asm/unistd.h linux-3.5.4-vs2.3.4.3/arch/sparc/include/asm/unistd.h
---- linux-3.5.4/arch/sparc/include/asm/unistd.h 2012-01-09 16:14:07.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/arch/sparc/include/asm/unistd.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/sparc/include/asm/unistd.h linux-3.6-vs2.3.4.3-noxfs-nocow/arch/sparc/include/asm/unistd.h
+--- linux-3.6/arch/sparc/include/asm/unistd.h 2012-10-04 15:26:59.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
#define __NR_io_setup 268
#define __NR_io_destroy 269
#define __NR_io_submit 270
-diff -NurpP --minimal linux-3.5.4/arch/sparc/kernel/systbls_32.S linux-3.5.4-vs2.3.4.3/arch/sparc/kernel/systbls_32.S
---- linux-3.5.4/arch/sparc/kernel/systbls_32.S 2012-01-09 16:14:09.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/arch/sparc/kernel/systbls_32.S 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/sparc/kernel/systbls_32.S linux-3.6-vs2.3.4.3-noxfs-nocow/arch/sparc/kernel/systbls_32.S
+--- linux-3.6/arch/sparc/kernel/systbls_32.S 2012-01-09 16:14:09.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
/*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.5.4/arch/sparc/kernel/systbls_64.S linux-3.5.4-vs2.3.4.3/arch/sparc/kernel/systbls_64.S
---- linux-3.5.4/arch/sparc/kernel/systbls_64.S 2012-07-22 23:39:00.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/arch/sparc/kernel/systbls_64.S 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/sparc/kernel/systbls_64.S linux-3.6-vs2.3.4.3-noxfs-nocow/arch/sparc/kernel/systbls_64.S
+--- linux-3.6/arch/sparc/kernel/systbls_64.S 2012-07-22 23:39:00.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
/*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.5.4/arch/um/Kconfig.rest linux-3.5.4-vs2.3.4.3/arch/um/Kconfig.rest
---- linux-3.5.4/arch/um/Kconfig.rest 2012-01-09 16:14:09.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/arch/um/Kconfig.rest 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/um/Kconfig.rest linux-3.6-vs2.3.4.3-noxfs-nocow/arch/um/Kconfig.rest
+--- linux-3.6/arch/um/Kconfig.rest 2012-01-09 16:14:09.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/um/Kconfig.rest 2012-10-04 18:47:00.000000000 +0200
@@ -12,6 +12,8 @@ source "arch/um/Kconfig.net"
source "fs/Kconfig"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.5.4/arch/um/include/shared/kern_constants.h linux-3.5.4-vs2.3.4.3/arch/um/include/shared/kern_constants.h
---- linux-3.5.4/arch/um/include/shared/kern_constants.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/arch/um/include/shared/kern_constants.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/um/include/shared/kern_constants.h linux-3.6-vs2.3.4.3-noxfs-nocow/arch/um/include/shared/kern_constants.h
+--- linux-3.6/arch/um/include/shared/kern_constants.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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.5.4/arch/um/include/shared/user_constants.h linux-3.5.4-vs2.3.4.3/arch/um/include/shared/user_constants.h
---- linux-3.5.4/arch/um/include/shared/user_constants.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/arch/um/include/shared/user_constants.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/um/include/shared/user_constants.h linux-3.6-vs2.3.4.3-noxfs-nocow/arch/um/include/shared/user_constants.h
+--- linux-3.6/arch/um/include/shared/user_constants.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/um/include/shared/user_constants.h 2012-10-04 18:47:00.000000000 +0200
@@ -0,0 +1,40 @@
+/*
+ * DO NOT MODIFY.
+#define UM_PROT_WRITE 2 /* PROT_WRITE # */
+#define UM_PROT_EXEC 4 /* PROT_EXEC # */
+
-diff -NurpP --minimal linux-3.5.4/arch/x86/Kconfig linux-3.5.4-vs2.3.4.3/arch/x86/Kconfig
---- linux-3.5.4/arch/x86/Kconfig 2012-07-22 23:39:01.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/arch/x86/Kconfig 2012-07-23 01:45:55.000000000 +0200
-@@ -2226,6 +2226,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.6/arch/x86/Kconfig linux-3.6-vs2.3.4.3-noxfs-nocow/arch/x86/Kconfig
+--- linux-3.6/arch/x86/Kconfig 2012-10-04 15:27:00.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/arch/x86/Kconfig 2012-10-04 18:47:00.000000000 +0200
+@@ -2228,6 +2228,8 @@ source "fs/Kconfig"
source "arch/x86/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.5.4/arch/x86/syscalls/syscall_32.tbl linux-3.5.4-vs2.3.4.3/arch/x86/syscalls/syscall_32.tbl
---- linux-3.5.4/arch/x86/syscalls/syscall_32.tbl 2012-07-22 23:39:02.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/arch/x86/syscalls/syscall_32.tbl 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/x86/syscalls/syscall_32.tbl linux-3.6-vs2.3.4.3-noxfs-nocow/arch/x86/syscalls/syscall_32.tbl
+--- linux-3.6/arch/x86/syscalls/syscall_32.tbl 2012-07-22 23:39:02.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
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.5.4/arch/x86/syscalls/syscall_64.tbl linux-3.5.4-vs2.3.4.3/arch/x86/syscalls/syscall_64.tbl
---- linux-3.5.4/arch/x86/syscalls/syscall_64.tbl 2012-09-16 20:46:30.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/arch/x86/syscalls/syscall_64.tbl 2012-09-16 20:50:19.000000000 +0200
+diff -NurpP --minimal linux-3.6/arch/x86/syscalls/syscall_64.tbl linux-3.6-vs2.3.4.3-noxfs-nocow/arch/x86/syscalls/syscall_64.tbl
+--- linux-3.6/arch/x86/syscalls/syscall_64.tbl 2012-10-04 15:27:01.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
237 common mbind sys_mbind
238 common set_mempolicy sys_set_mempolicy
239 common get_mempolicy sys_get_mempolicy
-diff -NurpP --minimal linux-3.5.4/drivers/block/Kconfig linux-3.5.4-vs2.3.4.3/drivers/block/Kconfig
---- linux-3.5.4/drivers/block/Kconfig 2012-05-21 18:06:43.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/drivers/block/Kconfig 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/drivers/block/Kconfig linux-3.6-vs2.3.4.3-noxfs-nocow/drivers/block/Kconfig
+--- linux-3.6/drivers/block/Kconfig 2012-05-21 18:06:43.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/drivers/block/Kconfig 2012-10-04 18:47:00.000000000 +0200
@@ -290,6 +290,13 @@ config BLK_DEV_CRYPTOLOOP
source "drivers/block/drbd/Kconfig"
config BLK_DEV_NBD
tristate "Network block device support"
depends on NET
-diff -NurpP --minimal linux-3.5.4/drivers/block/Makefile linux-3.5.4-vs2.3.4.3/drivers/block/Makefile
---- linux-3.5.4/drivers/block/Makefile 2012-03-19 19:46:52.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/drivers/block/Makefile 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/drivers/block/Makefile linux-3.6-vs2.3.4.3-noxfs-nocow/drivers/block/Makefile
+--- linux-3.6/drivers/block/Makefile 2012-03-19 19:46:52.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o
obj-$(CONFIG_XEN_BLKDEV_BACKEND) += xen-blkback/
-diff -NurpP --minimal linux-3.5.4/drivers/block/loop.c linux-3.5.4-vs2.3.4.3/drivers/block/loop.c
---- linux-3.5.4/drivers/block/loop.c 2012-07-22 23:39:02.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/drivers/block/loop.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/drivers/block/loop.c linux-3.6-vs2.3.4.3-noxfs-nocow/drivers/block/loop.c
+--- linux-3.6/drivers/block/loop.c 2012-07-22 23:39:02.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/drivers/block/loop.c 2012-10-04 18:47:00.000000000 +0200
@@ -76,6 +76,7 @@
#include <linux/sysfs.h>
#include <linux/miscdevice.h>
mutex_lock(&lo->lo_ctl_mutex);
lo->lo_refcnt++;
mutex_unlock(&lo->lo_ctl_mutex);
-diff -NurpP --minimal linux-3.5.4/drivers/block/vroot.c linux-3.5.4-vs2.3.4.3/drivers/block/vroot.c
---- linux-3.5.4/drivers/block/vroot.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/drivers/block/vroot.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/drivers/block/vroot.c linux-3.6-vs2.3.4.3-noxfs-nocow/drivers/block/vroot.c
+--- linux-3.6/drivers/block/vroot.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/drivers/block/vroot.c 2012-10-04 18:47:00.000000000 +0200
@@ -0,0 +1,291 @@
+/*
+ * linux/drivers/block/vroot.c
+
+#endif
+
-diff -NurpP --minimal linux-3.5.4/drivers/infiniband/Kconfig linux-3.5.4-vs2.3.4.3/drivers/infiniband/Kconfig
---- linux-3.5.4/drivers/infiniband/Kconfig 2012-07-22 23:39:06.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/drivers/infiniband/Kconfig 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/drivers/infiniband/Kconfig linux-3.6-vs2.3.4.3-noxfs-nocow/drivers/infiniband/Kconfig
+--- linux-3.6/drivers/infiniband/Kconfig 2012-07-22 23:39:06.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/drivers/infiniband/Kconfig 2012-10-04 18:47:00.000000000 +0200
@@ -39,7 +39,7 @@ config INFINIBAND_USER_MEM
config INFINIBAND_ADDR_TRANS
bool
default y
source "drivers/infiniband/hw/mthca/Kconfig"
-diff -NurpP --minimal linux-3.5.4/drivers/infiniband/core/addr.c linux-3.5.4-vs2.3.4.3/drivers/infiniband/core/addr.c
---- linux-3.5.4/drivers/infiniband/core/addr.c 2012-05-21 18:06:46.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/drivers/infiniband/core/addr.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/drivers/infiniband/core/addr.c linux-3.6-vs2.3.4.3-noxfs-nocow/drivers/infiniband/core/addr.c
+--- linux-3.6/drivers/infiniband/core/addr.c 2012-10-04 15:27:10.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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)) {
if (ret)
goto put;
-diff -NurpP --minimal linux-3.5.4/drivers/md/dm-ioctl.c linux-3.5.4-vs2.3.4.3/drivers/md/dm-ioctl.c
---- linux-3.5.4/drivers/md/dm-ioctl.c 2012-05-21 18:06:49.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/drivers/md/dm-ioctl.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/drivers/md/dm-ioctl.c linux-3.6-vs2.3.4.3-noxfs-nocow/drivers/md/dm-ioctl.c
+--- linux-3.6/drivers/md/dm-ioctl.c 2012-10-04 15:27:11.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/drivers/md/dm-ioctl.c 2012-10-04 18:47:00.000000000 +0200
@@ -16,6 +16,7 @@
#include <linux/dm-ioctl.h>
#include <linux/hdreg.h>
if (old_nl)
old_nl->next = (uint32_t) ((void *) nl -
(void *) old_nl);
-@@ -1616,8 +1628,8 @@ static int ctl_ioctl(uint command, struc
+@@ -1619,8 +1631,8 @@ static int ctl_ioctl(uint command, struc
ioctl_fn fn = NULL;
size_t input_param_size;
return -EACCES;
if (_IOC_TYPE(command) != DM_IOCTL)
-diff -NurpP --minimal linux-3.5.4/drivers/md/dm.c linux-3.5.4-vs2.3.4.3/drivers/md/dm.c
---- linux-3.5.4/drivers/md/dm.c 2012-05-21 18:06:49.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/drivers/md/dm.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/drivers/md/dm.c linux-3.6-vs2.3.4.3-noxfs-nocow/drivers/md/dm.c
+--- linux-3.6/drivers/md/dm.c 2012-10-04 15:27:11.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/drivers/md/dm.c 2012-10-04 18:47:00.000000000 +0200
@@ -19,6 +19,7 @@
#include <linux/idr.h>
#include <linux/hdreg.h>
/*-----------------------------------------------------------------
* CRUD START:
* A more elegant soln is in the works that uses the queue
-@@ -1850,6 +1862,7 @@ static struct mapped_device *alloc_dev(i
+@@ -1892,6 +1904,7 @@ static struct mapped_device *alloc_dev(i
INIT_LIST_HEAD(&md->uevent_list);
spin_lock_init(&md->uevent_lock);
md->queue = blk_alloc_queue(GFP_KERNEL);
if (!md->queue)
goto bad_queue;
-diff -NurpP --minimal linux-3.5.4/drivers/md/dm.h linux-3.5.4-vs2.3.4.3/drivers/md/dm.h
---- linux-3.5.4/drivers/md/dm.h 2012-01-09 16:14:21.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/drivers/md/dm.h 2012-07-23 01:45:55.000000000 +0200
-@@ -41,6 +41,8 @@ struct dm_dev_internal {
+diff -NurpP --minimal linux-3.6/drivers/md/dm.h linux-3.6-vs2.3.4.3-noxfs-nocow/drivers/md/dm.h
+--- linux-3.6/drivers/md/dm.h 2012-10-04 15:27:11.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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;
/*-----------------------------------------------------------------
* Internal table functions.
*---------------------------------------------------------------*/
-diff -NurpP --minimal linux-3.5.4/drivers/net/tun.c linux-3.5.4-vs2.3.4.3/drivers/net/tun.c
---- linux-3.5.4/drivers/net/tun.c 2012-09-16 20:46:30.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/drivers/net/tun.c 2012-08-19 13:28:27.000000000 +0200
+diff -NurpP --minimal linux-3.6/drivers/net/tun.c linux-3.6-vs2.3.4.3-noxfs-nocow/drivers/net/tun.c
+--- linux-3.6/drivers/net/tun.c 2012-10-04 15:27:20.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/drivers/net/tun.c 2012-10-04 18:47:00.000000000 +0200
@@ -64,6 +64,7 @@
#include <linux/nsproxy.h>
#include <linux/virtio_net.h>
#include <net/net_namespace.h>
#include <net/netns/generic.h>
#include <net/rtnetlink.h>
-@@ -120,6 +121,7 @@ struct tun_struct {
+@@ -122,6 +123,7 @@ struct tun_struct {
unsigned int flags;
uid_t owner;
gid_t group;
struct net_device *dev;
netdev_features_t set_features;
-@@ -910,6 +912,7 @@ static void tun_setup(struct net_device
+@@ -1033,6 +1035,7 @@ static void tun_setup(struct net_device
tun->owner = -1;
tun->group = -1;
dev->ethtool_ops = &tun_ethtool_ops;
dev->destructor = tun_free_netdev;
-@@ -1068,7 +1071,7 @@ static int tun_set_iff(struct net *net,
+@@ -1191,7 +1194,7 @@ static int tun_set_iff(struct net *net,
if (((tun->owner != -1 && cred->euid != tun->owner) ||
(tun->group != -1 && !in_egroup_p(tun->group))) &&
return -EPERM;
err = security_tun_dev_attach(tun->socket.sk);
if (err < 0)
-@@ -1082,7 +1085,7 @@ static int tun_set_iff(struct net *net,
+@@ -1205,7 +1208,7 @@ static int tun_set_iff(struct net *net,
char *name;
unsigned long flags = 0;
return -EPERM;
err = security_tun_dev_create();
if (err < 0)
-@@ -1152,6 +1155,9 @@ static int tun_set_iff(struct net *net,
+@@ -1276,6 +1279,9 @@ static int tun_set_iff(struct net *net,
sk->sk_destruct = tun_sock_destruct;
err = tun_attach(tun, file);
if (err < 0)
goto failed;
-@@ -1335,6 +1341,16 @@ static long __tun_chr_ioctl(struct file
+@@ -1459,6 +1465,16 @@ static long __tun_chr_ioctl(struct file
tun_debug(KERN_INFO, tun, "group set to %d\n", tun->group);
break;
case TUNSETLINK:
/* Only allow setting the type when the interface is down */
if (tun->dev->flags & IFF_UP) {
-diff -NurpP --minimal linux-3.5.4/drivers/tty/sysrq.c linux-3.5.4-vs2.3.4.3/drivers/tty/sysrq.c
---- linux-3.5.4/drivers/tty/sysrq.c 2012-05-21 18:07:16.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/drivers/tty/sysrq.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/drivers/tty/sysrq.c linux-3.6-vs2.3.4.3-noxfs-nocow/drivers/tty/sysrq.c
+--- linux-3.6/drivers/tty/sysrq.c 2012-05-21 18:07:16.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/drivers/tty/sysrq.c 2012-10-04 18:47:00.000000000 +0200
@@ -41,6 +41,7 @@
#include <linux/slab.h>
#include <linux/input.h>
else
retval = -1;
return retval;
-diff -NurpP --minimal linux-3.5.4/drivers/tty/tty_io.c linux-3.5.4-vs2.3.4.3/drivers/tty/tty_io.c
---- linux-3.5.4/drivers/tty/tty_io.c 2012-07-22 23:39:32.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/drivers/tty/tty_io.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/drivers/tty/tty_io.c linux-3.6-vs2.3.4.3-noxfs-nocow/drivers/tty/tty_io.c
+--- linux-3.6/drivers/tty/tty_io.c 2012-07-22 23:39:32.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/drivers/tty/tty_io.c 2012-10-04 18:47:00.000000000 +0200
@@ -104,6 +104,7 @@
#include <linux/kmod.h>
if (pgrp_nr < 0)
return -EINVAL;
rcu_read_lock();
-diff -NurpP --minimal linux-3.5.4/fs/attr.c linux-3.5.4-vs2.3.4.3/fs/attr.c
---- linux-3.5.4/fs/attr.c 2012-07-22 23:39:35.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/attr.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/attr.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/attr.c
+--- linux-3.6/fs/attr.c 2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/attr.c 2012-10-04 18:47:00.000000000 +0200
@@ -14,6 +14,9 @@
#include <linux/fcntl.h>
#include <linux/security.h>
if (ia_valid & ATTR_ATIME)
inode->i_atime = timespec_trunc(attr->ia_atime,
inode->i_sb->s_time_gran);
-@@ -171,7 +180,8 @@ int notify_change(struct dentry * dentry
- struct timespec now;
- unsigned int ia_valid = attr->ia_valid;
+@@ -173,7 +182,8 @@ int notify_change(struct dentry * dentry
+
+ WARN_ON_ONCE(!mutex_is_locked(&inode->i_mutex));
- if (ia_valid & (ATTR_MODE | ATTR_UID | ATTR_GID | ATTR_TIMES_SET)) {
+ if (ia_valid & (ATTR_MODE | ATTR_UID | ATTR_GID |
if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
return -EPERM;
}
-diff -NurpP --minimal linux-3.5.4/fs/block_dev.c linux-3.5.4-vs2.3.4.3/fs/block_dev.c
---- linux-3.5.4/fs/block_dev.c 2012-07-22 23:39:35.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/block_dev.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/block_dev.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/block_dev.c
+--- linux-3.6/fs/block_dev.c 2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/block_dev.c 2012-10-04 18:47:00.000000000 +0200
@@ -27,6 +27,7 @@
#include <linux/namei.h>
#include <linux/log2.h>
if (bdev) {
spin_lock(&bdev_lock);
if (!inode->i_bdev) {
-diff -NurpP --minimal linux-3.5.4/fs/btrfs/ctree.h linux-3.5.4-vs2.3.4.3/fs/btrfs/ctree.h
---- linux-3.5.4/fs/btrfs/ctree.h 2012-07-22 23:39:35.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/btrfs/ctree.h 2012-07-23 01:45:55.000000000 +0200
-@@ -671,11 +671,14 @@ struct btrfs_inode_item {
+diff -NurpP --minimal linux-3.6/fs/btrfs/ctree.h linux-3.6-vs2.3.4.3-noxfs-nocow/fs/btrfs/ctree.h
+--- linux-3.6/fs/btrfs/ctree.h 2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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;
struct btrfs_timespec atime;
struct btrfs_timespec ctime;
struct btrfs_timespec mtime;
-@@ -1568,6 +1571,8 @@ struct btrfs_ioctl_defrag_range_args {
+@@ -1727,6 +1730,8 @@ struct btrfs_ioctl_defrag_range_args {
#define BTRFS_MOUNT_CHECK_INTEGRITY_INCLUDING_EXTENT_DATA (1 << 21)
#define BTRFS_MOUNT_PANIC_ON_FATAL_ERROR (1 << 22)
#define btrfs_clear_opt(o, opt) ((o) &= ~BTRFS_MOUNT_##opt)
#define btrfs_set_opt(o, opt) ((o) |= BTRFS_MOUNT_##opt)
#define btrfs_test_opt(root, opt) ((root)->fs_info->mount_opt & \
-@@ -1788,6 +1793,7 @@ BTRFS_SETGET_FUNCS(inode_block_group, st
+@@ -1988,6 +1993,7 @@ BTRFS_SETGET_FUNCS(inode_block_group, st
BTRFS_SETGET_FUNCS(inode_nlink, struct btrfs_inode_item, nlink, 32);
BTRFS_SETGET_FUNCS(inode_uid, struct btrfs_inode_item, uid, 32);
BTRFS_SETGET_FUNCS(inode_gid, struct btrfs_inode_item, gid, 32);
BTRFS_SETGET_FUNCS(inode_mode, struct btrfs_inode_item, mode, 32);
BTRFS_SETGET_FUNCS(inode_rdev, struct btrfs_inode_item, rdev, 64);
BTRFS_SETGET_FUNCS(inode_flags, struct btrfs_inode_item, flags, 64);
-@@ -1841,6 +1847,10 @@ BTRFS_SETGET_FUNCS(extent_flags, struct
+@@ -2041,6 +2047,10 @@ BTRFS_SETGET_FUNCS(extent_flags, struct
BTRFS_SETGET_FUNCS(extent_refs_v0, struct btrfs_extent_item_v0, refs, 32);
BTRFS_SETGET_FUNCS(tree_block_level, struct btrfs_tree_block_info, level, 8);
-@@ -3017,6 +3027,7 @@ extern const struct dentry_operations bt
+@@ -3305,6 +3315,7 @@ extern const struct dentry_operations bt
long btrfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
void btrfs_update_iflags(struct inode *inode);
void btrfs_inherit_iflags(struct inode *inode, struct inode *dir);
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.5.4/fs/btrfs/disk-io.c linux-3.5.4-vs2.3.4.3/fs/btrfs/disk-io.c
---- linux-3.5.4/fs/btrfs/disk-io.c 2012-07-22 23:39:35.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/btrfs/disk-io.c 2012-07-23 01:45:55.000000000 +0200
-@@ -2090,6 +2090,9 @@ int open_ctree(struct super_block *sb,
+diff -NurpP --minimal linux-3.6/fs/btrfs/disk-io.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/btrfs/disk-io.c
+--- linux-3.6/fs/btrfs/disk-io.c 2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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;
}
features = btrfs_super_incompat_flags(disk_super) &
~BTRFS_FEATURE_INCOMPAT_SUPP;
if (features) {
-diff -NurpP --minimal linux-3.5.4/fs/btrfs/inode.c linux-3.5.4-vs2.3.4.3/fs/btrfs/inode.c
---- linux-3.5.4/fs/btrfs/inode.c 2012-07-22 23:39:35.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/btrfs/inode.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/btrfs/inode.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/btrfs/inode.c
+--- linux-3.6/fs/btrfs/inode.c 2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/btrfs/inode.c 2012-10-04 18:47:00.000000000 +0200
@@ -39,6 +39,7 @@
#include <linux/slab.h>
#include <linux/ratelimit.h>
#include "compat.h"
#include "ctree.h"
#include "disk-io.h"
-@@ -2543,6 +2544,8 @@ static void btrfs_read_locked_inode(stru
+@@ -2545,6 +2546,8 @@ static void btrfs_read_locked_inode(stru
struct btrfs_key location;
int maybe_acls;
u32 rdev;
int ret;
bool filled = false;
-@@ -2570,8 +2573,13 @@ static void btrfs_read_locked_inode(stru
+@@ -2572,8 +2575,13 @@ static void btrfs_read_locked_inode(stru
struct btrfs_inode_item);
inode->i_mode = btrfs_inode_mode(leaf, inode_item);
set_nlink(inode, btrfs_inode_nlink(leaf, inode_item));
btrfs_i_size_write(inode, btrfs_inode_size(leaf, inode_item));
tspec = btrfs_inode_atime(inode_item);
-@@ -2649,8 +2657,14 @@ static void fill_inode_item(struct btrfs
+@@ -2651,8 +2659,14 @@ static void fill_inode_item(struct btrfs
struct btrfs_inode_item *item,
struct inode *inode)
{
btrfs_set_inode_size(leaf, item, BTRFS_I(inode)->disk_i_size);
btrfs_set_inode_mode(leaf, item, inode->i_mode);
btrfs_set_inode_nlink(leaf, item, inode->i_nlink);
-@@ -7621,11 +7635,13 @@ static const struct inode_operations btr
+@@ -7636,11 +7650,13 @@ static const struct inode_operations btr
.listxattr = btrfs_listxattr,
.removexattr = btrfs_removexattr,
.permission = btrfs_permission,
.get_acl = btrfs_get_acl,
};
-diff -NurpP --minimal linux-3.5.4/fs/btrfs/ioctl.c linux-3.5.4-vs2.3.4.3/fs/btrfs/ioctl.c
---- linux-3.5.4/fs/btrfs/ioctl.c 2012-07-22 23:39:35.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/btrfs/ioctl.c 2012-07-23 01:45:55.000000000 +0200
-@@ -72,10 +72,13 @@ static unsigned int btrfs_flags_to_ioctl
+diff -NurpP --minimal linux-3.6/fs/btrfs/ioctl.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/btrfs/ioctl.c
+--- linux-3.6/fs/btrfs/ioctl.c 2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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;
if (flags & BTRFS_INODE_APPEND)
iflags |= FS_APPEND_FL;
if (flags & BTRFS_INODE_NODUMP)
-@@ -92,28 +95,78 @@ static unsigned int btrfs_flags_to_ioctl
+@@ -94,28 +97,78 @@ static unsigned int btrfs_flags_to_ioctl
else if (flags & BTRFS_INODE_NOCOMPRESS)
iflags |= FS_NOCOMP_FL;
}
/*
-@@ -129,6 +182,7 @@ void btrfs_inherit_iflags(struct inode *
+@@ -131,6 +184,7 @@ void btrfs_inherit_iflags(struct inode *
return;
flags = BTRFS_I(dir)->flags;
if (flags & BTRFS_INODE_NOCOMPRESS) {
BTRFS_I(inode)->flags &= ~BTRFS_INODE_COMPRESS;
-@@ -144,6 +198,30 @@ void btrfs_inherit_iflags(struct inode *
+@@ -146,6 +200,30 @@ void btrfs_inherit_iflags(struct inode *
btrfs_update_iflags(inode);
}
static int btrfs_ioctl_getflags(struct file *file, void __user *arg)
{
struct btrfs_inode *ip = BTRFS_I(file->f_path.dentry->d_inode);
-@@ -200,7 +278,8 @@ static int btrfs_ioctl_setflags(struct f
+@@ -206,21 +284,27 @@ static int btrfs_ioctl_setflags(struct f
flags = btrfs_mask_flags(inode->i_mode, flags);
oldflags = btrfs_flags_to_ioctl(ip->flags);
if (!capable(CAP_LINUX_IMMUTABLE)) {
ret = -EPERM;
goto out_unlock;
-@@ -211,14 +290,19 @@ static int btrfs_ioctl_setflags(struct f
- if (ret)
- goto out_unlock;
+ }
+ }
- if (flags & FS_SYNC_FL)
- ip->flags |= BTRFS_INODE_SYNC;
if (flags & FS_APPEND_FL)
ip->flags |= BTRFS_INODE_APPEND;
else
-diff -NurpP --minimal linux-3.5.4/fs/btrfs/super.c linux-3.5.4-vs2.3.4.3/fs/btrfs/super.c
---- linux-3.5.4/fs/btrfs/super.c 2012-07-22 23:39:35.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/btrfs/super.c 2012-07-23 01:45:55.000000000 +0200
-@@ -281,7 +281,7 @@ enum {
+diff -NurpP --minimal linux-3.6/fs/btrfs/super.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/btrfs/super.c
+--- linux-3.6/fs/btrfs/super.c 2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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,
Opt_check_integrity_print_mask, Opt_fatal_errors,
};
static match_table_t tokens = {
-@@ -321,6 +321,9 @@ static match_table_t tokens = {
+@@ -346,6 +346,9 @@ static match_table_t tokens = {
{Opt_check_integrity_including_extent_data, "check_int_data"},
{Opt_check_integrity_print_mask, "check_int_print_mask=%d"},
{Opt_fatal_errors, "fatal_errors=%s"},
{Opt_err, NULL},
};
-@@ -563,6 +566,22 @@ int btrfs_parse_options(struct btrfs_roo
+@@ -596,6 +599,22 @@ int btrfs_parse_options(struct btrfs_roo
goto out;
}
break;
case Opt_err:
printk(KERN_INFO "btrfs: unrecognized mount option "
"'%s'\n", p);
-@@ -1158,6 +1177,12 @@ static int btrfs_remount(struct super_bl
+@@ -1196,6 +1215,12 @@ static int btrfs_remount(struct super_bl
btrfs_resize_thread_pool(fs_info,
fs_info->thread_pool_size, old_thread_pool_size);
if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
return 0;
-diff -NurpP --minimal linux-3.5.4/fs/char_dev.c linux-3.5.4-vs2.3.4.3/fs/char_dev.c
---- linux-3.5.4/fs/char_dev.c 2012-03-19 19:47:25.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/fs/char_dev.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/char_dev.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/char_dev.c
+--- linux-3.6/fs/char_dev.c 2012-03-19 19:47:25.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/char_dev.c 2012-10-04 18:47:00.000000000 +0200
@@ -21,6 +21,8 @@
#include <linux/mutex.h>
#include <linux/backing-dev.h>
if (!kobj)
return -ENXIO;
new = container_of(kobj, struct cdev, kobj);
-diff -NurpP --minimal linux-3.5.4/fs/dcache.c linux-3.5.4-vs2.3.4.3/fs/dcache.c
---- linux-3.5.4/fs/dcache.c 2012-07-22 23:39:36.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/dcache.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/dcache.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/dcache.c
+--- linux-3.6/fs/dcache.c 2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/dcache.c 2012-10-04 18:47:00.000000000 +0200
@@ -37,6 +37,7 @@
#include <linux/rculist_bl.h>
#include <linux/prefetch.h>
}
static inline void __dget(struct dentry *dentry)
-@@ -1270,6 +1274,9 @@ struct dentry *__d_alloc(struct super_bl
+@@ -1276,6 +1280,9 @@ struct dentry *__d_alloc(struct super_bl
struct dentry *dentry;
char *dname;
dentry = kmem_cache_alloc(dentry_cache, GFP_KERNEL);
if (!dentry)
return NULL;
-@@ -1302,6 +1309,7 @@ struct dentry *__d_alloc(struct super_bl
+@@ -1308,6 +1315,7 @@ struct dentry *__d_alloc(struct super_bl
dentry->d_count = 1;
dentry->d_flags = 0;
spin_lock_init(&dentry->d_lock);
seqcount_init(&dentry->d_seq);
dentry->d_inode = NULL;
-@@ -2005,6 +2013,7 @@ struct dentry *__d_lookup(struct dentry
+@@ -2012,6 +2020,7 @@ struct dentry *__d_lookup(struct dentry
}
dentry->d_count++;
found = dentry;
spin_unlock(&dentry->d_lock);
break;
-diff -NurpP --minimal linux-3.5.4/fs/devpts/inode.c linux-3.5.4-vs2.3.4.3/fs/devpts/inode.c
---- linux-3.5.4/fs/devpts/inode.c 2012-07-22 23:39:38.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/devpts/inode.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/devpts/inode.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/devpts/inode.c
+--- linux-3.6/fs/devpts/inode.c 2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/devpts/inode.c 2012-10-04 18:47:00.000000000 +0200
@@ -25,6 +25,7 @@
#include <linux/parser.h>
#include <linux/fsnotify.h>
inode->i_private = tty;
tty->driver_data = inode;
-diff -NurpP --minimal linux-3.5.4/fs/ext2/balloc.c linux-3.5.4-vs2.3.4.3/fs/ext2/balloc.c
---- linux-3.5.4/fs/ext2/balloc.c 2012-07-22 23:39:39.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/ext2/balloc.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ext2/balloc.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext2/balloc.c
+--- linux-3.6/fs/ext2/balloc.c 2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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);
BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb));
repeat:
-diff -NurpP --minimal linux-3.5.4/fs/ext2/ext2.h linux-3.5.4-vs2.3.4.3/fs/ext2/ext2.h
---- linux-3.5.4/fs/ext2/ext2.h 2012-07-22 23:39:39.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/ext2/ext2.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ext2/ext2.h linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext2/ext2.h
+--- linux-3.6/fs/ext2/ext2.h 2012-07-22 23:39:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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) */
/* ioctl.c */
extern long ext2_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-3.5.4/fs/ext2/file.c linux-3.5.4-vs2.3.4.3/fs/ext2/file.c
---- linux-3.5.4/fs/ext2/file.c 2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/ext2/file.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ext2/file.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext2/file.c
+--- linux-3.6/fs/ext2/file.c 2011-10-24 18:45:27.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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.5.4/fs/ext2/ialloc.c linux-3.5.4-vs2.3.4.3/fs/ext2/ialloc.c
---- linux-3.5.4/fs/ext2/ialloc.c 2012-07-22 23:39:39.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/ext2/ialloc.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ext2/ialloc.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext2/ialloc.c
+--- linux-3.6/fs/ext2/ialloc.c 2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext2/ialloc.c 2012-10-04 18:47:00.000000000 +0200
@@ -17,6 +17,7 @@
#include <linux/backing-dev.h>
#include <linux/buffer_head.h>
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-3.5.4/fs/ext2/inode.c linux-3.5.4-vs2.3.4.3/fs/ext2/inode.c
---- linux-3.5.4/fs/ext2/inode.c 2012-07-22 23:39:39.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/ext2/inode.c 2012-07-23 11:01:46.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ext2/inode.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext2/inode.c
+--- linux-3.6/fs/ext2/inode.c 2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext2/inode.c 2012-10-04 18:47:00.000000000 +0200
@@ -31,6 +31,7 @@
#include <linux/mpage.h>
#include <linux/fiemap.h>
#include "ext2.h"
#include "acl.h"
#include "xip.h"
-@@ -1162,7 +1163,7 @@ static void ext2_truncate_blocks(struct
+@@ -1165,7 +1166,7 @@ static void ext2_truncate_blocks(struct
return;
if (ext2_inode_is_fast_symlink(inode))
return;
return;
__ext2_truncate_blocks(inode, offset);
}
-@@ -1253,36 +1254,61 @@ void ext2_set_inode_flags(struct inode *
+@@ -1256,36 +1257,61 @@ void ext2_set_inode_flags(struct inode *
{
unsigned int flags = EXT2_I(inode)->i_flags;
}
struct inode *ext2_iget (struct super_block *sb, unsigned long ino)
-@@ -1318,8 +1344,10 @@ struct inode *ext2_iget (struct super_bl
+@@ -1321,8 +1347,10 @@ struct inode *ext2_iget (struct super_bl
i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
}
set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
inode->i_size = le32_to_cpu(raw_inode->i_size);
inode->i_atime.tv_sec = (signed)le32_to_cpu(raw_inode->i_atime);
-@@ -1417,8 +1445,8 @@ static int __ext2_write_inode(struct ino
+@@ -1420,8 +1448,8 @@ static int __ext2_write_inode(struct ino
struct ext2_inode_info *ei = EXT2_I(inode);
struct super_block *sb = inode->i_sb;
ino_t ino = inode->i_ino;
struct buffer_head * bh;
struct ext2_inode * raw_inode = ext2_get_inode(sb, ino, &bh);
int n;
-@@ -1454,6 +1482,9 @@ static int __ext2_write_inode(struct ino
+@@ -1457,6 +1485,9 @@ static int __ext2_write_inode(struct ino
raw_inode->i_uid_high = 0;
raw_inode->i_gid_high = 0;
}
raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
raw_inode->i_size = cpu_to_le32(inode->i_size);
raw_inode->i_atime = cpu_to_le32(inode->i_atime.tv_sec);
-@@ -1534,7 +1565,8 @@ int ext2_setattr(struct dentry *dentry,
+@@ -1537,7 +1568,8 @@ int ext2_setattr(struct dentry *dentry,
if (is_quota_modification(inode, iattr))
dquot_initialize(inode);
if ((iattr->ia_valid & ATTR_UID && !uid_eq(iattr->ia_uid, inode->i_uid)) ||
error = dquot_transfer(inode, iattr);
if (error)
return error;
-diff -NurpP --minimal linux-3.5.4/fs/ext2/ioctl.c linux-3.5.4-vs2.3.4.3/fs/ext2/ioctl.c
---- linux-3.5.4/fs/ext2/ioctl.c 2012-03-19 19:47:25.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/fs/ext2/ioctl.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ext2/ioctl.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext2/ioctl.c
+--- linux-3.6/fs/ext2/ioctl.c 2012-03-19 19:47:25.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext2/ioctl.c 2012-10-04 18:47:00.000000000 +0200
@@ -17,6 +17,16 @@
#include <asm/uaccess.h>
flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE;
ei->i_flags = flags;
-diff -NurpP --minimal linux-3.5.4/fs/ext2/namei.c linux-3.5.4-vs2.3.4.3/fs/ext2/namei.c
---- linux-3.5.4/fs/ext2/namei.c 2012-07-22 23:39:39.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/ext2/namei.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ext2/namei.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext2/namei.c
+--- linux-3.6/fs/ext2/namei.c 2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext2/namei.c 2012-10-04 18:47:00.000000000 +0200
@@ -32,6 +32,7 @@
#include <linux/pagemap.h>
.get_acl = ext2_get_acl,
};
-diff -NurpP --minimal linux-3.5.4/fs/ext2/super.c linux-3.5.4-vs2.3.4.3/fs/ext2/super.c
---- linux-3.5.4/fs/ext2/super.c 2012-07-22 23:39:39.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/ext2/super.c 2012-07-23 01:45:55.000000000 +0200
-@@ -386,7 +386,8 @@ enum {
+diff -NurpP --minimal linux-3.6/fs/ext2/super.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext2/super.c
+--- linux-3.6/fs/ext2/super.c 2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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,
Opt_acl, Opt_noacl, Opt_xip, Opt_ignore, Opt_err, Opt_quota,
};
static const match_table_t tokens = {
-@@ -414,6 +415,9 @@ static const match_table_t tokens = {
+@@ -418,6 +419,9 @@ static const match_table_t tokens = {
{Opt_acl, "acl"},
{Opt_noacl, "noacl"},
{Opt_xip, "xip"},
{Opt_grpquota, "grpquota"},
{Opt_ignore, "noquota"},
{Opt_quota, "quota"},
-@@ -497,6 +501,20 @@ static int parse_options(char *options,
+@@ -501,6 +505,20 @@ static int parse_options(char *options,
case Opt_nouid32:
set_opt (sbi->s_mount_opt, NO_UID32);
break;
case Opt_nocheck:
clear_opt (sbi->s_mount_opt, CHECK);
break;
-@@ -855,6 +873,8 @@ static int ext2_fill_super(struct super_
+@@ -859,6 +877,8 @@ static int ext2_fill_super(struct super_
if (!parse_options((char *) data, sb))
goto failed_mount;
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
((EXT2_SB(sb)->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ?
MS_POSIXACL : 0);
-@@ -1226,6 +1246,14 @@ static int ext2_remount (struct super_bl
+@@ -1265,6 +1285,14 @@ static int ext2_remount (struct super_bl
goto restore_opts;
}
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-3.5.4/fs/ext3/ext3.h linux-3.5.4-vs2.3.4.3/fs/ext3/ext3.h
---- linux-3.5.4/fs/ext3/ext3.h 2012-07-22 23:39:39.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/ext3/ext3.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ext3/ext3.h linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext3/ext3.h
+--- linux-3.6/fs/ext3/ext3.h 2012-07-22 23:39:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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) */
/* ioctl.c */
extern long ext3_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-3.5.4/fs/ext3/file.c linux-3.5.4-vs2.3.4.3/fs/ext3/file.c
---- linux-3.5.4/fs/ext3/file.c 2012-05-21 18:07:20.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/ext3/file.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ext3/file.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext3/file.c
+--- linux-3.6/fs/ext3/file.c 2012-05-21 18:07:20.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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,
+ .sync_flags = ext3_sync_flags,
};
-diff -NurpP --minimal linux-3.5.4/fs/ext3/ialloc.c linux-3.5.4-vs2.3.4.3/fs/ext3/ialloc.c
---- linux-3.5.4/fs/ext3/ialloc.c 2012-07-22 23:39:39.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/ext3/ialloc.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ext3/ialloc.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext3/ialloc.c
+--- linux-3.6/fs/ext3/ialloc.c 2012-07-22 23:39:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext3/ialloc.c 2012-10-04 18:47:00.000000000 +0200
@@ -14,6 +14,7 @@
#include <linux/quotaops.h>
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-3.5.4/fs/ext3/inode.c linux-3.5.4-vs2.3.4.3/fs/ext3/inode.c
---- linux-3.5.4/fs/ext3/inode.c 2012-09-16 20:46:31.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/ext3/inode.c 2012-09-16 20:50:19.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ext3/inode.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext3/inode.c
+--- linux-3.6/fs/ext3/inode.c 2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext3/inode.c 2012-10-04 18:47:00.000000000 +0200
@@ -27,6 +27,8 @@
#include <linux/writeback.h>
#include <linux/mpage.h>
error = ext3_mark_inode_dirty(handle, inode);
ext3_journal_stop(handle);
}
-diff -NurpP --minimal linux-3.5.4/fs/ext3/ioctl.c linux-3.5.4-vs2.3.4.3/fs/ext3/ioctl.c
---- linux-3.5.4/fs/ext3/ioctl.c 2012-05-21 18:07:20.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/ext3/ioctl.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ext3/ioctl.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext3/ioctl.c
+--- linux-3.6/fs/ext3/ioctl.c 2012-05-21 18:07:20.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext3/ioctl.c 2012-10-04 18:47:00.000000000 +0200
@@ -12,6 +12,34 @@
#include <asm/uaccess.h>
#include "ext3.h"
flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE;
ei->i_flags = flags;
-diff -NurpP --minimal linux-3.5.4/fs/ext3/namei.c linux-3.5.4-vs2.3.4.3/fs/ext3/namei.c
---- linux-3.5.4/fs/ext3/namei.c 2012-07-22 23:39:39.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/ext3/namei.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ext3/namei.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext3/namei.c
+--- linux-3.6/fs/ext3/namei.c 2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext3/namei.c 2012-10-04 18:47:00.000000000 +0200
@@ -25,6 +25,8 @@
*/
.get_acl = ext3_get_acl,
};
-diff -NurpP --minimal linux-3.5.4/fs/ext3/super.c linux-3.5.4-vs2.3.4.3/fs/ext3/super.c
---- linux-3.5.4/fs/ext3/super.c 2012-07-22 23:39:39.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/ext3/super.c 2012-07-23 01:45:55.000000000 +0200
-@@ -822,7 +822,8 @@ enum {
+diff -NurpP --minimal linux-3.6/fs/ext3/super.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext3/super.c
+--- linux-3.6/fs/ext3/super.c 2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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,
Opt_noquota, Opt_ignore, Opt_barrier, Opt_nobarrier, Opt_err,
};
static const match_table_t tokens = {
-@@ -879,6 +880,9 @@ static const match_table_t tokens = {
+@@ -868,6 +869,9 @@ static const match_table_t tokens = {
{Opt_barrier, "barrier"},
{Opt_nobarrier, "nobarrier"},
{Opt_resize, "resize"},
{Opt_err, NULL},
};
-@@ -1044,6 +1048,20 @@ static int parse_options (char *options,
+@@ -1033,6 +1037,20 @@ static int parse_options (char *options,
case Opt_nouid32:
set_opt (sbi->s_mount_opt, NO_UID32);
break;
case Opt_nocheck:
clear_opt (sbi->s_mount_opt, CHECK);
break;
-@@ -1742,6 +1760,9 @@ static int ext3_fill_super (struct super
+@@ -1731,6 +1749,9 @@ static int ext3_fill_super (struct super
NULL, 0))
goto failed_mount;
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-@@ -2623,6 +2644,14 @@ static int ext3_remount (struct super_bl
+@@ -2618,6 +2639,14 @@ static int ext3_remount (struct super_bl
if (test_opt(sb, ABORT))
ext3_abort(sb, __func__, "Abort forced by user");
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-3.5.4/fs/ext4/ext4.h linux-3.5.4-vs2.3.4.3/fs/ext4/ext4.h
---- linux-3.5.4/fs/ext4/ext4.h 2012-09-16 20:46:31.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/ext4/ext4.h 2012-08-11 15:15:02.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ext4/ext4.h linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext4/ext4.h
+--- linux-3.6/fs/ext4/ext4.h 2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext4/ext4.h 2012-10-04 18:47:00.000000000 +0200
@@ -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 */
#define EXT4_FL_USER_VISIBLE 0x004BDFFF /* User visible flags */
#define EXT4_FL_USER_MODIFIABLE 0x004B80FF /* User modifiable flags */
-@@ -664,7 +668,7 @@ struct ext4_inode {
+@@ -666,7 +670,7 @@ struct ext4_inode {
__le16 l_i_uid_high; /* these 2 fields */
__le16 l_i_gid_high; /* were reserved2[0] */
__le16 l_i_checksum_lo;/* crc32c(uuid+inum+inode) LE */
} linux2;
struct {
__le16 h_i_reserved1; /* Obsoleted fragment number/size which are removed in ext4 */
-@@ -782,6 +786,7 @@ do { \
+@@ -784,6 +788,7 @@ do { \
#define i_gid_low i_gid
#define i_uid_high osd2.linux2.l_i_uid_high
#define i_gid_high osd2.linux2.l_i_gid_high
#define i_checksum_lo osd2.linux2.l_i_checksum_lo
#elif defined(__GNU__)
-@@ -962,6 +967,7 @@ struct ext4_inode_info {
+@@ -964,6 +969,7 @@ struct ext4_inode_info {
#define EXT4_MOUNT_POSIX_ACL 0x08000 /* POSIX Access Control Lists */
#define EXT4_MOUNT_NO_AUTO_DA_ALLOC 0x10000 /* No auto delalloc mapping */
#define EXT4_MOUNT_BARRIER 0x20000 /* Use block barriers */
#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 */
-@@ -2395,6 +2401,7 @@ extern int ext4_map_blocks(handle_t *han
+@@ -2393,6 +2399,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);
/* 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.5.4/fs/ext4/file.c linux-3.5.4-vs2.3.4.3/fs/ext4/file.c
---- linux-3.5.4/fs/ext4/file.c 2012-07-22 23:39:40.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/ext4/file.c 2012-07-23 01:45:55.000000000 +0200
-@@ -258,5 +258,6 @@ const struct inode_operations ext4_file_
+diff -NurpP --minimal linux-3.6/fs/ext4/file.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext4/file.c
+--- linux-3.6/fs/ext4/file.c 2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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,
.fiemap = ext4_fiemap,
+ .sync_flags = ext4_sync_flags,
};
-diff -NurpP --minimal linux-3.5.4/fs/ext4/ialloc.c linux-3.5.4-vs2.3.4.3/fs/ext4/ialloc.c
---- linux-3.5.4/fs/ext4/ialloc.c 2012-09-16 20:46:31.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/ext4/ialloc.c 2012-08-11 15:15:02.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ext4/ialloc.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext4/ialloc.c
+--- linux-3.6/fs/ext4/ialloc.c 2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext4/ialloc.c 2012-10-04 18:47:00.000000000 +0200
@@ -22,6 +22,7 @@
#include <linux/random.h>
#include <linux/bitops.h>
#include <asm/byteorder.h>
#include "ext4.h"
-@@ -844,6 +845,7 @@ got:
+@@ -842,6 +843,7 @@ got:
inode->i_mode = mode;
inode->i_uid = current_fsuid();
inode->i_gid = dir->i_gid;
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-3.5.4/fs/ext4/inode.c linux-3.5.4-vs2.3.4.3/fs/ext4/inode.c
---- linux-3.5.4/fs/ext4/inode.c 2012-09-16 20:46:31.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/ext4/inode.c 2012-08-11 15:15:02.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ext4/inode.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext4/inode.c
+--- linux-3.6/fs/ext4/inode.c 2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext4/inode.c 2012-10-04 18:47:00.000000000 +0200
@@ -37,6 +37,7 @@
#include <linux/printk.h>
#include <linux/slab.h>
#include "ext4_jbd2.h"
#include "xattr.h"
-@@ -3645,41 +3646,64 @@ void ext4_set_inode_flags(struct inode *
+@@ -3712,41 +3713,64 @@ void ext4_set_inode_flags(struct inode *
{
unsigned int flags = EXT4_I(inode)->i_flags;
} while (cmpxchg(&ei->i_flags, old_fl, new_fl) != old_fl);
}
-@@ -3771,8 +3795,10 @@ struct inode *ext4_iget(struct super_blo
+@@ -3838,8 +3862,10 @@ struct inode *ext4_iget(struct super_blo
i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
}
set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
ext4_clear_state_flags(ei); /* Only relevant on 32-bit archs */
-@@ -3995,8 +4021,8 @@ static int ext4_do_update_inode(handle_t
+@@ -4062,8 +4088,8 @@ static int ext4_do_update_inode(handle_t
ext4_get_inode_flags(ei);
raw_inode->i_mode = cpu_to_le16(inode->i_mode);
if (!(test_opt(inode->i_sb, NO_UID32))) {
raw_inode->i_uid_low = cpu_to_le16(low_16_bits(i_uid));
raw_inode->i_gid_low = cpu_to_le16(low_16_bits(i_gid));
-@@ -4019,6 +4045,9 @@ static int ext4_do_update_inode(handle_t
+@@ -4086,6 +4112,9 @@ static int ext4_do_update_inode(handle_t
raw_inode->i_uid_high = 0;
raw_inode->i_gid_high = 0;
}
raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
EXT4_INODE_SET_XTIME(i_ctime, inode, raw_inode);
-@@ -4204,7 +4233,8 @@ int ext4_setattr(struct dentry *dentry,
+@@ -4271,7 +4300,8 @@ int ext4_setattr(struct dentry *dentry,
if (is_quota_modification(inode, attr))
dquot_initialize(inode);
if ((ia_valid & ATTR_UID && !uid_eq(attr->ia_uid, inode->i_uid)) ||
handle_t *handle;
/* (user+group)*(old+new) structure, inode write (sb,
-@@ -4226,6 +4256,8 @@ int ext4_setattr(struct dentry *dentry,
+@@ -4293,6 +4323,8 @@ int ext4_setattr(struct dentry *dentry,
inode->i_uid = attr->ia_uid;
if (attr->ia_valid & ATTR_GID)
inode->i_gid = attr->ia_gid;
error = ext4_mark_inode_dirty(handle, inode);
ext4_journal_stop(handle);
}
-diff -NurpP --minimal linux-3.5.4/fs/ext4/ioctl.c linux-3.5.4-vs2.3.4.3/fs/ext4/ioctl.c
---- linux-3.5.4/fs/ext4/ioctl.c 2012-07-22 23:39:40.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/ext4/ioctl.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ext4/ioctl.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext4/ioctl.c
+--- linux-3.6/fs/ext4/ioctl.c 2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext4/ioctl.c 2012-10-04 18:47:00.000000000 +0200
@@ -14,12 +14,40 @@
#include <linux/compat.h>
#include <linux/mount.h>
if (!capable(CAP_LINUX_IMMUTABLE))
goto flags_out;
}
-diff -NurpP --minimal linux-3.5.4/fs/ext4/namei.c linux-3.5.4-vs2.3.4.3/fs/ext4/namei.c
---- linux-3.5.4/fs/ext4/namei.c 2012-09-16 20:46:31.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/ext4/namei.c 2012-08-11 15:15:02.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ext4/namei.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext4/namei.c
+--- linux-3.6/fs/ext4/namei.c 2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext4/namei.c 2012-10-04 18:47:00.000000000 +0200
@@ -34,6 +34,7 @@
#include <linux/quotaops.h>
#include <linux/buffer_head.h>
};
const struct inode_operations ext4_special_inode_operations = {
-diff -NurpP --minimal linux-3.5.4/fs/ext4/super.c linux-3.5.4-vs2.3.4.3/fs/ext4/super.c
---- linux-3.5.4/fs/ext4/super.c 2012-09-16 20:46:31.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/ext4/super.c 2012-08-27 13:24:16.000000000 +0200
-@@ -1232,6 +1232,7 @@ enum {
+diff -NurpP --minimal linux-3.6/fs/ext4/super.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext4/super.c
+--- linux-3.6/fs/ext4/super.c 2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ext4/super.c 2012-10-04 18:47:00.000000000 +0200
+@@ -1219,6 +1219,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,
};
static const match_table_t tokens = {
-@@ -1310,6 +1311,9 @@ static const match_table_t tokens = {
+@@ -1297,6 +1298,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 */
{Opt_err, NULL},
};
-@@ -1556,6 +1560,20 @@ static int handle_mount_opt(struct super
+@@ -1543,6 +1547,20 @@ static int handle_mount_opt(struct super
return -1;
*journal_ioprio = IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, arg);
return 1;
}
for (m = ext4_mount_opts; m->token != Opt_err; m++) {
-@@ -3418,6 +3436,9 @@ static int ext4_fill_super(struct super_
+@@ -3417,6 +3435,9 @@ static int ext4_fill_super(struct super_
}
}
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-@@ -4574,6 +4595,14 @@ static int ext4_remount(struct super_blo
+@@ -4582,6 +4603,14 @@ static int ext4_remount(struct super_blo
if (sbi->s_mount_flags & EXT4_MF_FS_ABORTED)
ext4_abort(sb, "Abort forced by user");
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-3.5.4/fs/fcntl.c linux-3.5.4-vs2.3.4.3/fs/fcntl.c
---- linux-3.5.4/fs/fcntl.c 2012-07-22 23:39:40.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/fcntl.c 2012-07-23 01:45:55.000000000 +0200
-@@ -20,6 +20,7 @@
- #include <linux/signal.h>
+diff -NurpP --minimal linux-3.6/fs/fcntl.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/fcntl.c
+--- linux-3.6/fs/fcntl.c 2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/fcntl.c 2012-10-04 19:05:02.000000000 +0200
+@@ -21,6 +21,7 @@
#include <linux/rcupdate.h>
#include <linux/pid_namespace.h>
+ #include <linux/user_namespace.h>
+#include <linux/vs_limit.h>
#include <asm/poll.h>
#include <asm/siginfo.h>
-@@ -103,6 +104,8 @@ SYSCALL_DEFINE3(dup3, unsigned int, oldf
+@@ -104,6 +105,8 @@ SYSCALL_DEFINE3(dup3, unsigned int, oldf
if (tofree)
filp_close(tofree, files);
return newfd;
-@@ -448,6 +451,8 @@ SYSCALL_DEFINE3(fcntl, unsigned int, fd,
+@@ -477,6 +480,8 @@ SYSCALL_DEFINE3(fcntl, unsigned int, fd,
filp = fget_raw_light(fd, &fput_needed);
if (!filp)
goto out;
if (unlikely(filp->f_mode & FMODE_PATH)) {
if (!check_fcntl_cmd(cmd))
-diff -NurpP --minimal linux-3.5.4/fs/file.c linux-3.5.4-vs2.3.4.3/fs/file.c
---- linux-3.5.4/fs/file.c 2012-05-21 18:07:20.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/file.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/file.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/file.c
+--- linux-3.6/fs/file.c 2012-05-21 18:07:20.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/file.c 2012-10-04 18:47:00.000000000 +0200
@@ -21,6 +21,7 @@
#include <linux/spinlock.h>
#include <linux/rcupdate.h>
#if 1
/* Sanity check */
if (rcu_dereference_raw(fdt->fd[fd]) != NULL) {
-diff -NurpP --minimal linux-3.5.4/fs/file_table.c linux-3.5.4-vs2.3.4.3/fs/file_table.c
---- linux-3.5.4/fs/file_table.c 2012-07-22 23:39:40.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/file_table.c 2012-07-23 01:45:55.000000000 +0200
-@@ -24,6 +24,8 @@
- #include <linux/percpu_counter.h>
- #include <linux/percpu.h>
+diff -NurpP --minimal linux-3.6/fs/file_table.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/file_table.c
+--- linux-3.6/fs/file_table.c 2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/file_table.c 2012-10-04 19:10:21.000000000 +0200
+@@ -26,6 +26,8 @@
+ #include <linux/hardirq.h>
+ #include <linux/task_work.h>
#include <linux/ima.h>
+#include <linux/vs_limit.h>
+#include <linux/vs_context.h>
#include <linux/atomic.h>
-@@ -134,6 +136,8 @@ struct file *get_empty_filp(void)
+@@ -136,6 +138,8 @@ struct file *get_empty_filp(void)
spin_lock_init(&f->f_lock);
eventpoll_init_file(f);
/* f->f_version: 0 */
return f;
over:
-@@ -251,6 +255,8 @@ static void __fput(struct file *file)
- }
- fops_put(file->f_op);
- put_pid(file->f_owner.pid);
+@@ -257,6 +261,8 @@ static void __fput(struct file *file)
+ i_readcount_dec(inode);
+ if (file->f_mode & FMODE_WRITE)
+ drop_file_write_access(file);
+ vx_files_dec(file);
+ file->f_xid = 0;
- file_sb_list_del(file);
- if ((file->f_mode & (FMODE_READ | FMODE_WRITE)) == FMODE_READ)
- i_readcount_dec(inode);
-@@ -381,6 +387,8 @@ void put_filp(struct file *file)
+ file->f_path.dentry = NULL;
+ file->f_path.mnt = NULL;
+ file_free(file);
+@@ -449,6 +455,8 @@ void put_filp(struct file *file)
{
if (atomic_long_dec_and_test(&file->f_count)) {
security_file_free(file);
file_sb_list_del(file);
file_free(file);
}
-diff -NurpP --minimal linux-3.5.4/fs/fs_struct.c linux-3.5.4-vs2.3.4.3/fs/fs_struct.c
---- linux-3.5.4/fs/fs_struct.c 2012-05-21 18:07:20.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/fs_struct.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/fs_struct.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/fs_struct.c
+--- linux-3.6/fs/fs_struct.c 2012-10-04 15:27:39.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/fs_struct.c 2012-10-04 19:08:56.000000000 +0200
@@ -4,6 +4,7 @@
#include <linux/path.h>
#include <linux/slab.h>
+#include <linux/vserver/global.h>
#include "internal.h"
- static inline void path_get_longterm(struct path *path)
-@@ -99,6 +100,7 @@ void free_fs_struct(struct fs_struct *fs
+ /*
+@@ -87,6 +88,7 @@ void free_fs_struct(struct fs_struct *fs
{
- path_put_longterm(&fs->root);
- path_put_longterm(&fs->pwd);
+ path_put(&fs->root);
+ path_put(&fs->pwd);
+ atomic_dec(&vs_global_fs);
kmem_cache_free(fs_cachep, fs);
}
-@@ -136,6 +138,7 @@ struct fs_struct *copy_fs_struct(struct
+@@ -124,6 +126,7 @@ struct fs_struct *copy_fs_struct(struct
fs->pwd = old->pwd;
- path_get_longterm(&fs->pwd);
+ path_get(&fs->pwd);
spin_unlock(&old->lock);
+ atomic_inc(&vs_global_fs);
}
return fs;
}
-diff -NurpP --minimal linux-3.5.4/fs/gfs2/file.c linux-3.5.4-vs2.3.4.3/fs/gfs2/file.c
---- linux-3.5.4/fs/gfs2/file.c 2012-07-22 23:39:40.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/gfs2/file.c 2012-07-23 01:45:55.000000000 +0200
-@@ -142,6 +142,9 @@ static const u32 fsflags_to_gfs2[32] = {
- [7] = GFS2_DIF_NOATIME,
+diff -NurpP --minimal linux-3.6/fs/gfs2/file.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/gfs2/file.c
+--- linux-3.6/fs/gfs2/file.c 2012-10-04 15:27:40.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/gfs2/file.c 2012-10-04 19:05:34.000000000 +0200
+@@ -143,6 +143,9 @@ static const u32 fsflags_to_gfs2[32] = {
[12] = GFS2_DIF_EXHASH,
[14] = GFS2_DIF_INHERIT_JDATA,
+ [17] = GFS2_DIF_TOPDIR,
+ [27] = GFS2_DIF_IXUNLINK,
+ [26] = GFS2_DIF_BARRIER,
+ [29] = GFS2_DIF_COW,
};
static const u32 gfs2_to_fsflags[32] = {
-@@ -151,6 +154,9 @@ static const u32 gfs2_to_fsflags[32] = {
- [gfs2fl_NoAtime] = FS_NOATIME_FL,
+@@ -153,6 +156,9 @@ static const u32 gfs2_to_fsflags[32] = {
[gfs2fl_ExHash] = FS_INDEX_FL,
+ [gfs2fl_TopLevel] = FS_TOPDIR_FL,
[gfs2fl_InheritJdata] = FS_JOURNAL_DATA_FL,
+ [gfs2fl_IXUnlink] = FS_IXUNLINK_FL,
+ [gfs2fl_Barrier] = FS_BARRIER_FL,
};
static int gfs2_get_flags(struct file *filp, u32 __user *ptr)
-@@ -181,12 +187,18 @@ void gfs2_set_inode_flags(struct inode *
+@@ -183,12 +189,18 @@ void gfs2_set_inode_flags(struct inode *
{
struct gfs2_inode *ip = GFS2_I(inode);
unsigned int flags = inode->i_flags;
if (ip->i_diskflags & GFS2_DIF_APPENDONLY)
flags |= S_APPEND;
if (ip->i_diskflags & GFS2_DIF_NOATIME)
-@@ -194,6 +206,43 @@ void gfs2_set_inode_flags(struct inode *
+@@ -196,6 +208,43 @@ void gfs2_set_inode_flags(struct inode *
if (ip->i_diskflags & GFS2_DIF_SYNC)
flags |= S_SYNC;
inode->i_flags = flags;
}
/* Flags that can be set by user space */
-@@ -305,6 +354,37 @@ static int gfs2_set_flags(struct file *f
+@@ -309,6 +358,37 @@ static int gfs2_set_flags(struct file *f
return do_gfs2_set_flags(filp, gfsflags, ~GFS2_DIF_JDATA);
}
static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
switch(cmd) {
-diff -NurpP --minimal linux-3.5.4/fs/gfs2/inode.h linux-3.5.4-vs2.3.4.3/fs/gfs2/inode.h
---- linux-3.5.4/fs/gfs2/inode.h 2012-07-22 23:39:40.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/gfs2/inode.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/gfs2/inode.h linux-3.6-vs2.3.4.3-noxfs-nocow/fs/gfs2/inode.h
+--- linux-3.6/fs/gfs2/inode.h 2012-07-22 23:39:40.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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;
#ifdef CONFIG_GFS2_FS_LOCKING_DLM
extern const struct file_operations gfs2_file_fops;
-diff -NurpP --minimal linux-3.5.4/fs/inode.c linux-3.5.4-vs2.3.4.3/fs/inode.c
---- linux-3.5.4/fs/inode.c 2012-07-22 23:39:40.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/inode.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/inode.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/inode.c
+--- linux-3.6/fs/inode.c 2012-10-04 15:27:40.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/inode.c 2012-10-04 18:47:00.000000000 +0200
@@ -17,6 +17,7 @@
#include <linux/prefetch.h>
#include <linux/buffer_head.h> /* for inode_has_buffers */
/**
* __remove_inode_hash - remove an inode from the hash
* @inode: inode to unhash
-@@ -1786,9 +1793,11 @@ void init_special_inode(struct inode *in
+@@ -1792,9 +1799,11 @@ void init_special_inode(struct inode *in
if (S_ISCHR(mode)) {
inode->i_fop = &def_chr_fops;
inode->i_rdev = rdev;
} else if (S_ISFIFO(mode))
inode->i_fop = &def_fifo_fops;
else if (S_ISSOCK(mode))
-@@ -1817,6 +1826,7 @@ void inode_init_owner(struct inode *inod
+@@ -1823,6 +1832,7 @@ void inode_init_owner(struct inode *inod
} else
inode->i_gid = current_fsgid();
inode->i_mode = mode;
}
EXPORT_SYMBOL(inode_init_owner);
-diff -NurpP --minimal linux-3.5.4/fs/ioctl.c linux-3.5.4-vs2.3.4.3/fs/ioctl.c
---- linux-3.5.4/fs/ioctl.c 2012-05-21 18:07:24.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/ioctl.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ioctl.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ioctl.c
+--- linux-3.6/fs/ioctl.c 2012-05-21 18:07:24.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ioctl.c 2012-10-04 18:47:00.000000000 +0200
@@ -15,6 +15,9 @@
#include <linux/writeback.h>
#include <linux/buffer_head.h>
#include <asm/ioctls.h>
-diff -NurpP --minimal linux-3.5.4/fs/ioprio.c linux-3.5.4-vs2.3.4.3/fs/ioprio.c
---- linux-3.5.4/fs/ioprio.c 2012-07-22 23:39:40.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/ioprio.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ioprio.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ioprio.c
+--- linux-3.6/fs/ioprio.c 2012-07-22 23:39:40.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ioprio.c 2012-10-04 18:47:00.000000000 +0200
@@ -28,6 +28,7 @@
#include <linux/syscalls.h>
#include <linux/security.h>
tmpio = get_task_ioprio(p);
if (tmpio < 0)
continue;
-diff -NurpP --minimal linux-3.5.4/fs/jfs/file.c linux-3.5.4-vs2.3.4.3/fs/jfs/file.c
---- linux-3.5.4/fs/jfs/file.c 2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/jfs/file.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/jfs/file.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/jfs/file.c
+--- linux-3.6/fs/jfs/file.c 2011-10-24 18:45:27.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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);
};
const struct file_operations jfs_file_operations = {
-diff -NurpP --minimal linux-3.5.4/fs/jfs/ioctl.c linux-3.5.4-vs2.3.4.3/fs/jfs/ioctl.c
---- linux-3.5.4/fs/jfs/ioctl.c 2012-03-19 19:47:25.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/fs/jfs/ioctl.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/jfs/ioctl.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/jfs/ioctl.c
+--- linux-3.6/fs/jfs/ioctl.c 2012-03-19 19:47:25.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/jfs/ioctl.c 2012-10-04 18:47:00.000000000 +0200
@@ -11,6 +11,7 @@
#include <linux/mount.h>
#include <linux/time.h>
flags |= oldflags & ~JFS_FL_USER_MODIFIABLE;
jfs_inode->mode2 = flags;
-diff -NurpP --minimal linux-3.5.4/fs/jfs/jfs_dinode.h linux-3.5.4-vs2.3.4.3/fs/jfs/jfs_dinode.h
---- linux-3.5.4/fs/jfs/jfs_dinode.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/fs/jfs/jfs_dinode.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/jfs/jfs_dinode.h linux-3.6-vs2.3.4.3-noxfs-nocow/fs/jfs/jfs_dinode.h
+--- linux-3.6/fs/jfs/jfs_dinode.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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 */
#define JFS_FL_INHERIT 0x03C80000
/* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */
-diff -NurpP --minimal linux-3.5.4/fs/jfs/jfs_filsys.h linux-3.5.4-vs2.3.4.3/fs/jfs/jfs_filsys.h
---- linux-3.5.4/fs/jfs/jfs_filsys.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/fs/jfs/jfs_filsys.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/jfs/jfs_filsys.h linux-3.6-vs2.3.4.3-noxfs-nocow/fs/jfs/jfs_filsys.h
+--- linux-3.6/fs/jfs/jfs_filsys.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
/*
* file system state (superblock state)
-diff -NurpP --minimal linux-3.5.4/fs/jfs/jfs_imap.c linux-3.5.4-vs2.3.4.3/fs/jfs/jfs_imap.c
---- linux-3.5.4/fs/jfs/jfs_imap.c 2012-01-09 16:14:54.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/fs/jfs/jfs_imap.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/jfs/jfs_imap.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/jfs/jfs_imap.c
+--- linux-3.6/fs/jfs/jfs_imap.c 2012-01-09 16:14:54.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/jfs/jfs_imap.c 2012-10-04 18:47:00.000000000 +0200
@@ -46,6 +46,7 @@
#include <linux/pagemap.h>
#include <linux/quotaops.h>
jfs_get_inode_flags(jfs_ip);
/*
* mode2 is only needed for storing the higher order bits.
-diff -NurpP --minimal linux-3.5.4/fs/jfs/jfs_inode.c linux-3.5.4-vs2.3.4.3/fs/jfs/jfs_inode.c
---- linux-3.5.4/fs/jfs/jfs_inode.c 2012-01-09 16:14:54.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/fs/jfs/jfs_inode.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/jfs/jfs_inode.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/jfs/jfs_inode.c
+--- linux-3.6/fs/jfs/jfs_inode.c 2012-01-09 16:14:54.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/jfs/jfs_inode.c 2012-10-04 18:47:00.000000000 +0200
@@ -18,6 +18,7 @@
#include <linux/fs.h>
}
/*
-diff -NurpP --minimal linux-3.5.4/fs/jfs/jfs_inode.h linux-3.5.4-vs2.3.4.3/fs/jfs/jfs_inode.h
---- linux-3.5.4/fs/jfs/jfs_inode.h 2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/jfs/jfs_inode.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/jfs/jfs_inode.h linux-3.6-vs2.3.4.3-noxfs-nocow/fs/jfs/jfs_inode.h
+--- linux-3.6/fs/jfs/jfs_inode.h 2011-10-24 18:45:27.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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);
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.5.4/fs/jfs/namei.c linux-3.5.4-vs2.3.4.3/fs/jfs/namei.c
---- linux-3.5.4/fs/jfs/namei.c 2012-05-21 18:07:25.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/jfs/namei.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/jfs/namei.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/jfs/namei.c
+--- linux-3.6/fs/jfs/namei.c 2012-10-04 15:27:40.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/jfs/namei.c 2012-10-04 18:47:00.000000000 +0200
@@ -22,6 +22,7 @@
#include <linux/ctype.h>
#include <linux/quotaops.h>
};
const struct file_operations jfs_dir_operations = {
-diff -NurpP --minimal linux-3.5.4/fs/jfs/super.c linux-3.5.4-vs2.3.4.3/fs/jfs/super.c
---- linux-3.5.4/fs/jfs/super.c 2012-05-21 18:07:25.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/jfs/super.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/jfs/super.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/jfs/super.c
+--- linux-3.6/fs/jfs/super.c 2012-10-04 15:27:40.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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,
if (newLVSize) {
printk(KERN_ERR "resize option for remount only\n");
-diff -NurpP --minimal linux-3.5.4/fs/libfs.c linux-3.5.4-vs2.3.4.3/fs/libfs.c
---- linux-3.5.4/fs/libfs.c 2012-07-22 23:39:40.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/libfs.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/libfs.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/libfs.c
+--- linux-3.6/fs/libfs.c 2012-10-04 15:27:40.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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.
*/
EXPORT_SYMBOL(generic_read_dir);
EXPORT_SYMBOL(mount_pseudo);
EXPORT_SYMBOL(simple_write_begin);
-diff -NurpP --minimal linux-3.5.4/fs/locks.c linux-3.5.4-vs2.3.4.3/fs/locks.c
---- linux-3.5.4/fs/locks.c 2012-09-16 20:46:31.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/locks.c 2012-08-11 15:15:02.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/locks.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/locks.c
+--- linux-3.6/fs/locks.c 2012-10-04 15:27:40.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/locks.c 2012-10-04 18:47:00.000000000 +0200
@@ -126,6 +126,8 @@
#include <linux/time.h>
#include <linux/rcupdate.h>
return fl;
}
EXPORT_SYMBOL_GPL(locks_alloc_lock);
-@@ -216,6 +224,7 @@ void locks_free_lock(struct file_lock *f
+@@ -212,6 +220,7 @@ void locks_free_lock(struct file_lock *f
BUG_ON(!list_empty(&fl->fl_block));
BUG_ON(!list_empty(&fl->fl_link));
locks_release_private(fl);
kmem_cache_free(filelock_cache, fl);
}
-@@ -225,6 +234,7 @@ void locks_init_lock(struct file_lock *f
+@@ -221,6 +230,7 @@ void locks_init_lock(struct file_lock *f
{
memset(fl, 0, sizeof(struct file_lock));
locks_init_lock_heads(fl);
}
EXPORT_SYMBOL(locks_init_lock);
-@@ -265,6 +275,7 @@ void locks_copy_lock(struct file_lock *n
+@@ -261,6 +271,7 @@ void locks_copy_lock(struct file_lock *n
new->fl_file = fl->fl_file;
new->fl_ops = fl->fl_ops;
new->fl_lmops = fl->fl_lmops;
locks_copy_private(new, fl);
}
-@@ -303,6 +314,11 @@ static int flock_make_lock(struct file *
+@@ -299,6 +310,11 @@ static int flock_make_lock(struct file *
fl->fl_flags = FL_FLOCK;
fl->fl_type = type;
fl->fl_end = OFFSET_MAX;
*lock = fl;
return 0;
-@@ -452,6 +468,7 @@ static int lease_init(struct file *filp,
+@@ -438,6 +454,7 @@ static int lease_init(struct file *filp,
fl->fl_owner = current->files;
fl->fl_pid = current->tgid;
fl->fl_file = filp;
fl->fl_flags = FL_LEASE;
-@@ -471,6 +488,11 @@ static struct file_lock *lease_alloc(str
+@@ -457,6 +474,11 @@ static struct file_lock *lease_alloc(str
if (fl == NULL)
return ERR_PTR(error);
error = lease_init(filp, type, fl);
if (error) {
locks_free_lock(fl);
-@@ -773,6 +795,7 @@ static int flock_lock_file(struct file *
+@@ -753,6 +775,7 @@ static int flock_lock_file(struct file *
lock_flocks();
}
find_conflict:
for_each_lock(inode, before) {
struct file_lock *fl = *before;
-@@ -793,6 +816,7 @@ find_conflict:
+@@ -773,6 +796,7 @@ find_conflict:
goto out;
locks_copy_lock(new_fl, request);
locks_insert_lock(before, new_fl);
new_fl = NULL;
error = 0;
-@@ -803,7 +827,8 @@ out:
+@@ -783,7 +807,8 @@ out:
return error;
}
{
struct file_lock *fl;
struct file_lock *new_fl = NULL;
-@@ -813,6 +838,8 @@ static int __posix_lock_file(struct inod
+@@ -793,6 +818,8 @@ static int __posix_lock_file(struct inod
struct file_lock **before;
int error, added = 0;
/*
* We may need two file_lock structures for this operation,
* so we get them in advance to avoid races.
-@@ -823,7 +850,11 @@ static int __posix_lock_file(struct inod
+@@ -803,7 +830,11 @@ static int __posix_lock_file(struct inod
(request->fl_type != F_UNLCK ||
request->fl_start != 0 || request->fl_end != OFFSET_MAX)) {
new_fl = locks_alloc_lock();
}
lock_flocks();
-@@ -1022,7 +1053,8 @@ static int __posix_lock_file(struct inod
+@@ -1002,7 +1033,8 @@ static int __posix_lock_file(struct inod
int posix_lock_file(struct file *filp, struct file_lock *fl,
struct file_lock *conflock)
{
}
EXPORT_SYMBOL(posix_lock_file);
-@@ -1112,7 +1144,7 @@ int locks_mandatory_area(int read_write,
+@@ -1092,7 +1124,7 @@ int locks_mandatory_area(int read_write,
fl.fl_end = offset + count - 1;
for (;;) {
if (error != FILE_LOCK_DEFERRED)
break;
error = wait_event_interruptible(fl.fl_wait, !fl.fl_next);
-@@ -1407,6 +1439,7 @@ int generic_add_lease(struct file *filp,
+@@ -1397,6 +1429,7 @@ int generic_add_lease(struct file *filp,
goto out;
locks_insert_lock(before, lease);
return 0;
out:
-@@ -1848,6 +1881,11 @@ int fcntl_setlk(unsigned int fd, struct
+@@ -1838,6 +1871,11 @@ int fcntl_setlk(unsigned int fd, struct
if (file_lock == NULL)
return -ENOLCK;
/*
* This might block, so we do it before checking the inode.
*/
-@@ -1966,6 +2004,11 @@ int fcntl_setlk64(unsigned int fd, struc
+@@ -1956,6 +1994,11 @@ int fcntl_setlk64(unsigned int fd, struc
if (file_lock == NULL)
return -ENOLCK;
/*
* This might block, so we do it before checking the inode.
*/
-@@ -2231,8 +2274,11 @@ static int locks_show(struct seq_file *f
+@@ -2221,8 +2264,11 @@ static int locks_show(struct seq_file *f
lock_get_status(f, fl, *((loff_t *)f->private), "");
return 0;
}
-diff -NurpP --minimal linux-3.5.4/fs/mount.h linux-3.5.4-vs2.3.4.3/fs/mount.h
---- linux-3.5.4/fs/mount.h 2012-03-19 19:47:26.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/fs/mount.h 2012-07-23 01:45:55.000000000 +0200
-@@ -47,6 +47,7 @@ struct mount {
+diff -NurpP --minimal linux-3.6/fs/mount.h linux-3.6-vs2.3.4.3-noxfs-nocow/fs/mount.h
+--- linux-3.6/fs/mount.h 2012-10-04 15:27:40.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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;
+ tag_t mnt_tag; /* tagging used for vfsmount */
};
- static inline struct mount *real_mount(struct vfsmount *mnt)
-diff -NurpP --minimal linux-3.5.4/fs/namei.c linux-3.5.4-vs2.3.4.3/fs/namei.c
---- linux-3.5.4/fs/namei.c 2012-07-22 23:39:41.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/namei.c 2012-07-23 10:46:40.000000000 +0200
+ #define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */
+diff -NurpP --minimal linux-3.6/fs/namei.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/namei.c
+--- linux-3.6/fs/namei.c 2012-10-04 15:27:40.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/namei.c 2012-10-04 19:08:15.000000000 +0200
@@ -34,6 +34,14 @@
#include <linux/device_cgroup.h>
#include <linux/fs_struct.h>
/*
* This does the basic permission checking
*/
-@@ -343,10 +434,14 @@ int inode_permission(struct inode *inode
+@@ -334,10 +425,14 @@ int __inode_permission(struct inode *ino
/*
* Nobody gets write access to an immutable file.
*/
retval = do_inode_permission(inode, mask);
if (retval)
return retval;
-@@ -1025,7 +1120,8 @@ static void follow_dotdot(struct nameida
+@@ -1189,7 +1284,8 @@ static void follow_dotdot(struct nameida
if (nd->path.dentry == nd->root.dentry &&
nd->path.mnt == nd->root.mnt) {
}
if (nd->path.dentry != nd->path.mnt->mnt_root) {
/* rare case of legitimate dget_parent()... */
-@@ -1174,6 +1270,9 @@ static int lookup_fast(struct nameidata
+@@ -1338,6 +1434,9 @@ static int lookup_fast(struct nameidata
goto unlazy;
}
}
path->mnt = mnt;
path->dentry = dentry;
if (unlikely(!__follow_mount_rcu(nd, path, inode)))
-@@ -1209,6 +1308,8 @@ unlazy:
+@@ -1373,6 +1472,8 @@ unlazy:
}
}
path->mnt = mnt;
path->dentry = dentry;
err = follow_managed(path, nd->flags);
-@@ -2010,7 +2111,7 @@ static int may_delete(struct inode *dir,
+@@ -2192,7 +2293,7 @@ static int may_delete(struct inode *dir,
if (IS_APPEND(dir))
return -EPERM;
if (check_sticky(dir, victim->d_inode)||IS_APPEND(victim->d_inode)||
return -EPERM;
if (isdir) {
if (!S_ISDIR(victim->d_inode->i_mode))
-@@ -2090,19 +2191,25 @@ int vfs_create(struct inode *dir, struct
+@@ -2271,19 +2372,25 @@ int vfs_create(struct inode *dir, struct
+ bool want_excl)
{
int error = may_create(dir, dentry);
-
- if (error)
+- return error;
+ if (error) {
+ vxdprintk(VXD_CBIT(misc, 3), "may_create failed with %d", error);
- return error;
++ return error;
+ }
if (!dir->i_op->create)
mode |= S_IFREG;
error = security_inode_create(dir, dentry, mode);
- if (error)
+- return error;
+ if (error) {
+ vxdprintk(VXD_CBIT(misc, 3), "security_inode_create failed with %d", error);
- return error;
++ return error;
+ }
- error = dir->i_op->create(dir, dentry, mode, nd);
+ error = dir->i_op->create(dir, dentry, mode, want_excl);
if (!error)
fsnotify_create(dir, dentry);
+ else
return error;
}
-@@ -2137,6 +2244,15 @@ static int may_open(struct path *path, i
+@@ -2318,6 +2425,15 @@ static int may_open(struct path *path, i
break;
}
error = inode_permission(inode, acc_mode);
if (error)
return error;
-@@ -2386,6 +2502,16 @@ ok:
+@@ -2820,6 +2936,16 @@ finish_open:
}
- common:
+ finish_open_created:
error = may_open(&nd->path, acc_mode, open_flag);
+#ifdef CONFIG_VSERVER_COWBL
+ if (error == -EMLINK) {
+ }
+#endif
if (error)
- goto exit;
- filp = nameidata_to_filp(nd);
-@@ -2443,6 +2569,7 @@ static struct file *path_openat(int dfd,
- struct path path;
+ goto out;
+ file->f_path.mnt = nd->path.mnt;
+@@ -2884,6 +3010,7 @@ static struct file *path_openat(int dfd,
+ int opened = 0;
int error;
+restart:
- filp = get_empty_filp();
- if (!filp)
+ file = get_empty_filp();
+ if (!file)
return ERR_PTR(-ENFILE);
-@@ -2480,6 +2607,17 @@ static struct file *path_openat(int dfd,
- filp = do_last(nd, &path, op, pathname);
+@@ -2920,6 +3047,17 @@ static struct file *path_openat(int dfd,
+ error = do_last(nd, &path, file, op, &opened, pathname);
put_link(nd, &link, cookie);
}
+
out:
if (nd->root.mnt && !(nd->flags & LOOKUP_ROOT))
path_put(&nd->root);
-@@ -2575,6 +2713,11 @@ struct dentry *kern_path_create(int dfd,
+@@ -3023,6 +3161,11 @@ struct dentry *kern_path_create(int dfd,
goto fail;
}
*path = nd.path;
+ dentry->d_name.len, dentry->d_name.name,
+ path->dentry->d_inode);
return dentry;
- eexist:
+ fail:
dput(dentry);
-@@ -3060,7 +3203,7 @@ int vfs_link(struct dentry *old_dentry,
+@@ -3489,7 +3632,7 @@ int vfs_link(struct dentry *old_dentry,
/*
* A link to an append-only or immutable file cannot be created.
*/
return -EPERM;
if (!dir->i_op->link)
return -EPERM;
-@@ -3449,6 +3592,253 @@ int vfs_follow_link(struct nameidata *nd
+@@ -3874,6 +4017,253 @@ int vfs_follow_link(struct nameidata *nd
return __vfs_follow_link(nd, link);
}
/* get the link contents into pagecache */
static char *page_getlink(struct dentry * dentry, struct page **ppage)
{
-@@ -3573,3 +3963,4 @@ EXPORT_SYMBOL(vfs_symlink);
+@@ -3998,3 +4388,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.5.4/fs/namespace.c linux-3.5.4-vs2.3.4.3/fs/namespace.c
---- linux-3.5.4/fs/namespace.c 2012-07-22 23:39:41.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/namespace.c 2012-07-23 10:44:12.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/namespace.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/namespace.c
+--- linux-3.6/fs/namespace.c 2012-10-04 15:27:40.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/namespace.c 2012-10-04 18:47:00.000000000 +0200
@@ -20,6 +20,11 @@
#include <linux/fs_struct.h> /* get_fs_root et.al. */
#include <linux/fsnotify.h> /* fsnotify_vfsmount_delete */
#include "pnode.h"
#include "internal.h"
-@@ -697,6 +702,10 @@ vfs_kern_mount(struct file_system_type *
+@@ -749,6 +754,10 @@ vfs_kern_mount(struct file_system_type *
if (!type)
return ERR_PTR(-ENODEV);
mnt = alloc_vfsmnt(name);
if (!mnt)
return ERR_PTR(-ENOMEM);
-@@ -745,6 +754,7 @@ static struct mount *clone_mnt(struct mo
- mnt->mnt.mnt_root = dget(root);
- mnt->mnt_mountpoint = mnt->mnt.mnt_root;
- mnt->mnt_parent = mnt;
+@@ -801,6 +810,7 @@ static struct mount *clone_mnt(struct mo
+ mnt->mnt.mnt_root = dget(root);
+ mnt->mnt_mountpoint = mnt->mnt.mnt_root;
+ mnt->mnt_parent = mnt;
+ mnt->mnt_tag = old->mnt_tag;
- br_write_lock(&vfsmount_lock);
- list_add_tail(&mnt->mnt_instance, &sb->s_mounts);
- br_write_unlock(&vfsmount_lock);
-@@ -1211,7 +1221,7 @@ SYSCALL_DEFINE2(umount, char __user *, n
+ br_write_lock(&vfsmount_lock);
+ list_add_tail(&mnt->mnt_instance, &sb->s_mounts);
+ br_write_unlock(&vfsmount_lock);
+@@ -1266,7 +1276,7 @@ SYSCALL_DEFINE2(umount, char __user *, n
goto dput_and_out;
retval = -EPERM;
goto dput_and_out;
retval = do_umount(mnt, flags);
-@@ -1237,7 +1247,7 @@ SYSCALL_DEFINE1(oldumount, char __user *
+@@ -1292,7 +1302,7 @@ SYSCALL_DEFINE1(oldumount, char __user *
static int mount_is_safe(struct path *path)
{
return 0;
return -EPERM;
#ifdef notyet
-@@ -1550,7 +1560,7 @@ static int do_change_type(struct path *p
+@@ -1610,7 +1620,7 @@ static int do_change_type(struct path *p
int type;
int err = 0;
return -EPERM;
if (path->dentry != path->mnt->mnt_root)
-@@ -1566,6 +1576,7 @@ static int do_change_type(struct path *p
+@@ -1626,6 +1636,7 @@ static int do_change_type(struct path *p
if (err)
goto out_unlock;
}
br_write_lock(&vfsmount_lock);
for (m = mnt; m; m = (recurse ? next_mnt(m, mnt) : NULL))
-@@ -1581,12 +1592,14 @@ static int do_change_type(struct path *p
+@@ -1641,12 +1652,14 @@ static int do_change_type(struct path *p
* do loopback mount.
*/
static int do_loopback(struct path *path, char *old_name,
if (err)
return err;
if (!old_name || !*old_name)
-@@ -1654,13 +1667,13 @@ static int change_mount_flags(struct vfs
+@@ -1715,13 +1728,13 @@ static int change_mount_flags(struct vfs
* on it - tough luck.
*/
static int do_remount(struct path *path, int flags, int mnt_flags,
return -EPERM;
if (!check_mnt(mnt))
-@@ -1709,7 +1722,7 @@ static int do_move_mount(struct path *pa
+@@ -1770,7 +1783,7 @@ static int do_move_mount(struct path *pa
struct mount *p;
struct mount *old;
int err = 0;
return -EPERM;
if (!old_name || !*old_name)
return -EINVAL;
-@@ -1860,7 +1873,7 @@ static int do_new_mount(struct path *pat
+@@ -1927,7 +1940,7 @@ static int do_new_mount(struct path *pat
return -EINVAL;
/* we need capabilities... */
return -EPERM;
mnt = do_kern_mount(type, flags, name, data);
-@@ -2130,6 +2143,7 @@ long do_mount(char *dev_name, char *dir_
+@@ -2197,6 +2210,7 @@ long do_mount(char *dev_name, char *dir_
struct path path;
int retval = 0;
int mnt_flags = 0;
/* Discard magic */
if ((flags & MS_MGC_MSK) == MS_MGC_VAL)
-@@ -2157,6 +2171,12 @@ long do_mount(char *dev_name, char *dir_
+@@ -2224,6 +2238,12 @@ long do_mount(char *dev_name, char *dir_
if (!(flags & MS_NOATIME))
mnt_flags |= MNT_RELATIME;
/* Separate the per-mountpoint flags */
if (flags & MS_NOSUID)
mnt_flags |= MNT_NOSUID;
-@@ -2173,15 +2193,17 @@ long do_mount(char *dev_name, char *dir_
+@@ -2240,15 +2260,17 @@ long do_mount(char *dev_name, char *dir_
if (flags & MS_RDONLY)
mnt_flags |= MNT_READONLY;
else if (flags & (MS_SHARED | MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE))
retval = do_change_type(&path, flags);
else if (flags & MS_MOVE)
-@@ -2284,6 +2306,7 @@ static struct mnt_namespace *dup_mnt_ns(
+@@ -2329,6 +2351,7 @@ static struct mnt_namespace *dup_mnt_ns(
q = next_mnt(q, new);
}
up_write(&namespace_sem);
if (rootmnt)
mntput(rootmnt);
-@@ -2480,9 +2503,10 @@ SYSCALL_DEFINE2(pivot_root, const char _
+@@ -2524,9 +2547,10 @@ SYSCALL_DEFINE2(pivot_root, const char _
error = -EINVAL;
new_mnt = real_mount(new.mnt);
root_mnt = real_mount(root.mnt);
goto out4;
if (!check_mnt(root_mnt) || !check_mnt(new_mnt))
goto out4;
-@@ -2603,6 +2627,7 @@ void put_mnt_ns(struct mnt_namespace *ns
+@@ -2647,6 +2671,7 @@ void put_mnt_ns(struct mnt_namespace *ns
br_write_unlock(&vfsmount_lock);
up_write(&namespace_sem);
release_mounts(&umount_list);
kfree(ns);
}
-diff -NurpP --minimal linux-3.5.4/fs/nfs/client.c linux-3.5.4-vs2.3.4.3/fs/nfs/client.c
---- linux-3.5.4/fs/nfs/client.c 2012-07-22 23:39:41.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/nfs/client.c 2012-07-23 01:45:55.000000000 +0200
-@@ -797,6 +797,9 @@ static int nfs_init_server_rpcclient(str
+diff -NurpP --minimal linux-3.6/fs/nfs/client.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/nfs/client.c
+--- linux-3.6/fs/nfs/client.c 2012-10-04 15:27:40.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/nfs/client.c 2012-10-04 18:47:00.000000000 +0200
+@@ -692,6 +692,9 @@ int nfs_init_server_rpcclient(struct nfs
if (server->flags & NFS_MOUNT_SOFT)
server->client->cl_softrtry = 1;
+ server->client->cl_tag = 1;
return 0;
}
-
-@@ -990,6 +993,10 @@ static void nfs_server_set_fsinfo(struct
+ EXPORT_SYMBOL_GPL(nfs_init_server_rpcclient);
+@@ -870,6 +873,10 @@ static void nfs_server_set_fsinfo(struct
server->acdirmin = server->acdirmax = 0;
}
server->maxfilesize = fsinfo->maxfilesize;
server->time_delta = fsinfo->time_delta;
-diff -NurpP --minimal linux-3.5.4/fs/nfs/dir.c linux-3.5.4-vs2.3.4.3/fs/nfs/dir.c
---- linux-3.5.4/fs/nfs/dir.c 2012-07-22 23:39:41.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/nfs/dir.c 2012-07-23 01:45:55.000000000 +0200
-@@ -35,6 +35,7 @@
+diff -NurpP --minimal linux-3.6/fs/nfs/dir.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/nfs/dir.c
+--- linux-3.6/fs/nfs/dir.c 2012-10-04 15:27:40.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/nfs/dir.c 2012-10-04 18:47:00.000000000 +0200
+@@ -36,6 +36,7 @@
#include <linux/sched.h>
#include <linux/kmemleak.h>
#include <linux/xattr.h>
#include "delegation.h"
#include "iostat.h"
-@@ -1337,6 +1338,7 @@ static struct dentry *nfs_lookup(struct
+@@ -1251,6 +1252,7 @@ struct dentry *nfs_lookup(struct inode *
/* Success: notify readdir to use READDIRPLUS */
nfs_advise_use_readdirplus(dir);
no_entry:
res = d_materialise_unique(dentry, inode);
if (res != NULL) {
-diff -NurpP --minimal linux-3.5.4/fs/nfs/inode.c linux-3.5.4-vs2.3.4.3/fs/nfs/inode.c
---- linux-3.5.4/fs/nfs/inode.c 2012-07-22 23:39:41.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/nfs/inode.c 2012-07-23 10:48:04.000000000 +0200
-@@ -40,6 +40,7 @@
+diff -NurpP --minimal linux-3.6/fs/nfs/inode.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/nfs/inode.c
+--- linux-3.6/fs/nfs/inode.c 2012-10-04 15:27:40.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/nfs/inode.c 2012-10-04 18:47:00.000000000 +0200
+@@ -39,6 +39,7 @@
#include <linux/compat.h>
#include <linux/freezer.h>
#include <linux/crc32.h>
#include <asm/uaccess.h>
-@@ -275,6 +276,8 @@ nfs_fhget(struct super_block *sb, struct
+@@ -279,6 +280,8 @@ nfs_fhget(struct super_block *sb, struct
if (inode->i_state & I_NEW) {
struct nfs_inode *nfsi = NFS_I(inode);
unsigned long now = jiffies;
/* We set i_ino for the few things that still rely on it,
* such as stat(2) */
-@@ -319,8 +322,8 @@ nfs_fhget(struct super_block *sb, struct
+@@ -323,8 +326,8 @@ nfs_fhget(struct super_block *sb, struct
inode->i_version = 0;
inode->i_size = 0;
clear_nlink(inode);
inode->i_blocks = 0;
memset(nfsi->cookieverf, 0, sizeof(nfsi->cookieverf));
nfsi->write_io = 0;
-@@ -354,11 +357,11 @@ nfs_fhget(struct super_block *sb, struct
+@@ -358,11 +361,11 @@ nfs_fhget(struct super_block *sb, struct
else if (nfs_server_capable(inode, NFS_CAP_NLINK))
nfsi->cache_validity |= NFS_INO_INVALID_ATTR;
if (fattr->valid & NFS_ATTR_FATTR_OWNER)
else if (nfs_server_capable(inode, NFS_CAP_OWNER_GROUP))
nfsi->cache_validity |= NFS_INO_INVALID_ATTR;
if (fattr->valid & NFS_ATTR_FATTR_BLOCKS_USED)
-@@ -369,6 +372,11 @@ nfs_fhget(struct super_block *sb, struct
+@@ -373,6 +376,11 @@ nfs_fhget(struct super_block *sb, struct
*/
inode->i_blocks = nfs_calc_block_size(fattr->du.nfs3.used);
}
nfsi->attrtimeo = NFS_MINATTRTIMEO(inode);
nfsi->attrtimeo_timestamp = now;
nfsi->access_cache = RB_ROOT;
-@@ -488,6 +496,8 @@ void nfs_setattr_update_inode(struct ino
+@@ -494,6 +502,8 @@ void nfs_setattr_update_inode(struct ino
inode->i_uid = attr->ia_uid;
if ((attr->ia_valid & ATTR_GID) != 0)
inode->i_gid = attr->ia_gid;
NFS_I(inode)->cache_validity |= NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL;
spin_unlock(&inode->i_lock);
}
-@@ -947,6 +957,9 @@ static int nfs_check_inode_attributes(st
+@@ -965,6 +975,9 @@ static int nfs_check_inode_attributes(st
struct nfs_inode *nfsi = NFS_I(inode);
loff_t cur_size, new_isize;
unsigned long invalid = 0;
if (nfs_have_delegated_attributes(inode))
-@@ -972,13 +985,18 @@ static int nfs_check_inode_attributes(st
+@@ -990,13 +1003,18 @@ static int nfs_check_inode_attributes(st
invalid |= NFS_INO_INVALID_ATTR|NFS_INO_REVAL_PAGECACHE;
}
/* Has the link count changed? */
if ((fattr->valid & NFS_ATTR_FATTR_NLINK) && inode->i_nlink != fattr->nlink)
-@@ -1276,6 +1294,9 @@ static int nfs_update_inode(struct inode
+@@ -1300,6 +1318,9 @@ static int nfs_update_inode(struct inode
unsigned long invalid = 0;
unsigned long now = jiffies;
unsigned long save_cache_validity;
dfprintk(VFS, "NFS: %s(%s/%ld fh_crc=0x%08x ct=%d info=0x%x)\n",
__func__, inode->i_sb->s_id, inode->i_ino,
-@@ -1377,6 +1398,9 @@ static int nfs_update_inode(struct inode
+@@ -1401,6 +1422,9 @@ static int nfs_update_inode(struct inode
| NFS_INO_REVAL_PAGECACHE
| NFS_INO_REVAL_FORCED);
if (fattr->valid & NFS_ATTR_FATTR_ATIME)
memcpy(&inode->i_atime, &fattr->atime, sizeof(inode->i_atime));
-@@ -1398,9 +1422,9 @@ static int nfs_update_inode(struct inode
+@@ -1422,9 +1446,9 @@ static int nfs_update_inode(struct inode
| NFS_INO_REVAL_FORCED);
if (fattr->valid & NFS_ATTR_FATTR_OWNER) {
}
} else if (server->caps & NFS_CAP_OWNER)
invalid |= save_cache_validity & (NFS_INO_INVALID_ATTR
-@@ -1409,9 +1433,9 @@ static int nfs_update_inode(struct inode
+@@ -1433,9 +1457,9 @@ static int nfs_update_inode(struct inode
| NFS_INO_REVAL_FORCED);
if (fattr->valid & NFS_ATTR_FATTR_GROUP) {
}
} else if (server->caps & NFS_CAP_OWNER_GROUP)
invalid |= save_cache_validity & (NFS_INO_INVALID_ATTR
-@@ -1419,6 +1443,10 @@ static int nfs_update_inode(struct inode
+@@ -1443,6 +1467,10 @@ static int nfs_update_inode(struct inode
| NFS_INO_INVALID_ACL
| NFS_INO_REVAL_FORCED);
if (fattr->valid & NFS_ATTR_FATTR_NLINK) {
if (inode->i_nlink != fattr->nlink) {
invalid |= NFS_INO_INVALID_ATTR;
-diff -NurpP --minimal linux-3.5.4/fs/nfs/nfs3xdr.c linux-3.5.4-vs2.3.4.3/fs/nfs/nfs3xdr.c
---- linux-3.5.4/fs/nfs/nfs3xdr.c 2012-07-22 23:39:41.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/nfs/nfs3xdr.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/nfs/nfs3xdr.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/nfs/nfs3xdr.c
+--- linux-3.6/fs/nfs/nfs3xdr.c 2012-10-04 15:27:40.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/nfs/nfs3xdr.c 2012-10-04 18:47:00.000000000 +0200
@@ -20,6 +20,7 @@
#include <linux/nfs3.h>
#include <linux/nfs_fs.h>
#include "internal.h"
#define NFSDBG_FACILITY NFSDBG_XDR
-@@ -564,7 +565,8 @@ static __be32 *xdr_decode_nfstime3(__be3
+@@ -560,7 +561,8 @@ static __be32 *xdr_decode_nfstime3(__be3
* set_mtime mtime;
* };
*/
{
u32 nbytes;
__be32 *p;
-@@ -596,15 +598,19 @@ static void encode_sattr3(struct xdr_str
+@@ -592,15 +594,19 @@ static void encode_sattr3(struct xdr_str
} else
*p++ = xdr_zero;
} else
*p++ = xdr_zero;
-@@ -883,7 +889,7 @@ static void nfs3_xdr_enc_setattr3args(st
+@@ -879,7 +885,7 @@ static void nfs3_xdr_enc_setattr3args(st
const struct nfs3_sattrargs *args)
{
encode_nfs_fh3(xdr, args->fh);
encode_sattrguard3(xdr, args);
}
-@@ -1033,13 +1039,13 @@ static void nfs3_xdr_enc_write3args(stru
+@@ -1029,13 +1035,13 @@ static void nfs3_xdr_enc_write3args(stru
* };
*/
static void encode_createhow3(struct xdr_stream *xdr,
break;
case NFS3_CREATE_EXCLUSIVE:
encode_createverf3(xdr, args->verifier);
-@@ -1054,7 +1060,7 @@ static void nfs3_xdr_enc_create3args(str
+@@ -1050,7 +1056,7 @@ static void nfs3_xdr_enc_create3args(str
const struct nfs3_createargs *args)
{
encode_diropargs3(xdr, args->fh, args->name, args->len);
}
/*
-@@ -1070,7 +1076,7 @@ static void nfs3_xdr_enc_mkdir3args(stru
+@@ -1066,7 +1072,7 @@ static void nfs3_xdr_enc_mkdir3args(stru
const struct nfs3_mkdirargs *args)
{
encode_diropargs3(xdr, args->fh, args->name, args->len);
}
/*
-@@ -1087,9 +1093,9 @@ static void nfs3_xdr_enc_mkdir3args(stru
+@@ -1083,9 +1089,9 @@ static void nfs3_xdr_enc_mkdir3args(stru
* };
*/
static void encode_symlinkdata3(struct xdr_stream *xdr,
encode_nfspath3(xdr, args->pages, args->pathlen);
}
-@@ -1098,7 +1104,7 @@ static void nfs3_xdr_enc_symlink3args(st
+@@ -1094,7 +1100,7 @@ static void nfs3_xdr_enc_symlink3args(st
const struct nfs3_symlinkargs *args)
{
encode_diropargs3(xdr, args->fromfh, args->fromname, args->fromlen);
}
/*
-@@ -1126,24 +1132,24 @@ static void nfs3_xdr_enc_symlink3args(st
+@@ -1122,24 +1128,24 @@ static void nfs3_xdr_enc_symlink3args(st
* };
*/
static void encode_devicedata3(struct xdr_stream *xdr,
break;
case NF3REG:
case NF3DIR:
-@@ -1158,7 +1164,7 @@ static void nfs3_xdr_enc_mknod3args(stru
+@@ -1154,7 +1160,7 @@ static void nfs3_xdr_enc_mknod3args(stru
const struct nfs3_mknodargs *args)
{
encode_diropargs3(xdr, args->fh, args->name, args->len);
}
/*
-diff -NurpP --minimal linux-3.5.4/fs/nfs/super.c linux-3.5.4-vs2.3.4.3/fs/nfs/super.c
---- linux-3.5.4/fs/nfs/super.c 2012-09-16 20:46:31.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/nfs/super.c 2012-09-16 20:50:19.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/nfs/super.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/nfs/super.c
+--- linux-3.6/fs/nfs/super.c 2012-10-04 15:27:40.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/nfs/super.c 2012-10-04 18:47:00.000000000 +0200
@@ -54,6 +54,7 @@
#include <linux/parser.h>
#include <linux/nsproxy.h>
#include <asm/uaccess.h>
-@@ -87,6 +88,7 @@ enum {
+@@ -88,6 +89,7 @@ enum {
Opt_sharecache, Opt_nosharecache,
Opt_resvport, Opt_noresvport,
Opt_fscache, Opt_nofscache,
/* Mount options that take integer arguments */
Opt_port,
-@@ -99,6 +101,7 @@ enum {
+@@ -100,6 +102,7 @@ enum {
Opt_mountport,
Opt_mountvers,
Opt_minorversion,
/* Mount options that take string arguments */
Opt_nfsvers,
-@@ -181,6 +184,10 @@ static const match_table_t nfs_mount_opt
+@@ -182,6 +185,10 @@ static const match_table_t nfs_mount_opt
/* The following needs to be listed after all other options */
{ Opt_nfsvers, "v%s" },
{ Opt_err, NULL }
};
-@@ -684,6 +691,7 @@ static void nfs_show_mount_options(struc
+@@ -626,6 +633,7 @@ static void nfs_show_mount_options(struc
{ NFS_MOUNT_NORDIRPLUS, ",nordirplus", "" },
{ NFS_MOUNT_UNSHARED, ",nosharecache", "" },
{ NFS_MOUNT_NORESVPORT, ",noresvport", "" },
{ 0, NULL, NULL }
};
const struct proc_nfs_info *nfs_infop;
-@@ -1296,6 +1304,14 @@ static int nfs_parse_mount_options(char
+@@ -1243,6 +1251,14 @@ static int nfs_parse_mount_options(char
kfree(mnt->fscache_uniq);
mnt->fscache_uniq = NULL;
break;
/*
* options that take numeric values
-@@ -1382,6 +1398,12 @@ static int nfs_parse_mount_options(char
+@@ -1329,6 +1345,12 @@ static int nfs_parse_mount_options(char
goto out_invalid_value;
mnt->minorversion = option;
break;
/*
* options that take text values
-diff -NurpP --minimal linux-3.5.4/fs/nfsd/auth.c linux-3.5.4-vs2.3.4.3/fs/nfsd/auth.c
---- linux-3.5.4/fs/nfsd/auth.c 2012-07-22 23:39:41.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/nfsd/auth.c 2012-07-23 10:47:00.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/nfsd/auth.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/nfsd/auth.c
+--- linux-3.6/fs/nfsd/auth.c 2012-07-22 23:39:41.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/nfsd/auth.c 2012-10-04 18:47:00.000000000 +0200
@@ -2,6 +2,7 @@
#include <linux/sched.h>
rqgi = rqstp->rq_cred.cr_group_info;
-diff -NurpP --minimal linux-3.5.4/fs/nfsd/nfs3xdr.c linux-3.5.4-vs2.3.4.3/fs/nfsd/nfs3xdr.c
---- linux-3.5.4/fs/nfsd/nfs3xdr.c 2012-05-21 18:07:26.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/nfsd/nfs3xdr.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/nfsd/nfs3xdr.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/nfsd/nfs3xdr.c
+--- linux-3.6/fs/nfsd/nfs3xdr.c 2012-05-21 18:07:26.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/nfsd/nfs3xdr.c 2012-10-04 18:47:00.000000000 +0200
@@ -7,6 +7,7 @@
*/
if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) {
p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN);
} else {
-diff -NurpP --minimal linux-3.5.4/fs/nfsd/nfs4xdr.c linux-3.5.4-vs2.3.4.3/fs/nfsd/nfs4xdr.c
---- linux-3.5.4/fs/nfsd/nfs4xdr.c 2012-09-16 20:46:31.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/nfsd/nfs4xdr.c 2012-08-11 15:15:02.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/nfsd/nfs4xdr.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/nfsd/nfs4xdr.c
+--- linux-3.6/fs/nfsd/nfs4xdr.c 2012-10-04 15:27:40.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/nfsd/nfs4xdr.c 2012-10-04 18:47:00.000000000 +0200
@@ -46,6 +46,7 @@
#include <linux/utsname.h>
#include <linux/pagemap.h>
if (status == nfserr_resource)
goto out_resource;
if (status)
-diff -NurpP --minimal linux-3.5.4/fs/nfsd/nfsxdr.c linux-3.5.4-vs2.3.4.3/fs/nfsd/nfsxdr.c
---- linux-3.5.4/fs/nfsd/nfsxdr.c 2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/nfsd/nfsxdr.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/nfsd/nfsxdr.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/nfsd/nfsxdr.c
+--- linux-3.6/fs/nfsd/nfsxdr.c 2011-05-22 16:17:53.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/nfsd/nfsxdr.c 2012-10-04 18:47:00.000000000 +0200
@@ -6,6 +6,7 @@
#include "xdr.h"
if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
*p++ = htonl(NFS_MAXPATHLEN);
-diff -NurpP --minimal linux-3.5.4/fs/ocfs2/dlmglue.c linux-3.5.4-vs2.3.4.3/fs/ocfs2/dlmglue.c
---- linux-3.5.4/fs/ocfs2/dlmglue.c 2012-07-22 23:39:41.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/ocfs2/dlmglue.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ocfs2/dlmglue.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ocfs2/dlmglue.c
+--- linux-3.6/fs/ocfs2/dlmglue.c 2012-07-22 23:39:41.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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);
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.5.4/fs/ocfs2/dlmglue.h linux-3.5.4-vs2.3.4.3/fs/ocfs2/dlmglue.h
---- linux-3.5.4/fs/ocfs2/dlmglue.h 2010-10-21 13:07:50.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/ocfs2/dlmglue.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ocfs2/dlmglue.h linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ocfs2/dlmglue.h
+--- linux-3.6/fs/ocfs2/dlmglue.h 2010-10-21 13:07:50.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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;
};
#define OCFS2_QINFO_LVB_VERSION 1
-diff -NurpP --minimal linux-3.5.4/fs/ocfs2/file.c linux-3.5.4-vs2.3.4.3/fs/ocfs2/file.c
---- linux-3.5.4/fs/ocfs2/file.c 2012-07-22 23:39:41.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/ocfs2/file.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ocfs2/file.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ocfs2/file.c
+--- linux-3.6/fs/ocfs2/file.c 2012-10-04 15:27:41.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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;
if (!(attr->ia_valid & OCFS2_VALID_ATTRS))
return 0;
-diff -NurpP --minimal linux-3.5.4/fs/ocfs2/inode.c linux-3.5.4-vs2.3.4.3/fs/ocfs2/inode.c
---- linux-3.5.4/fs/ocfs2/inode.c 2012-07-22 23:39:41.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/ocfs2/inode.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ocfs2/inode.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ocfs2/inode.c
+--- linux-3.6/fs/ocfs2/inode.c 2012-07-22 23:39:41.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ocfs2/inode.c 2012-10-04 18:47:00.000000000 +0200
@@ -28,6 +28,7 @@
#include <linux/highmem.h>
#include <linux/pagemap.h>
/* Fast symlinks will have i_size but no allocated clusters. */
if (S_ISLNK(inode->i_mode) && !fe->i_clusters) {
-diff -NurpP --minimal linux-3.5.4/fs/ocfs2/inode.h linux-3.5.4-vs2.3.4.3/fs/ocfs2/inode.h
---- linux-3.5.4/fs/ocfs2/inode.h 2012-01-09 16:14:55.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/fs/ocfs2/inode.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ocfs2/inode.h linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ocfs2/inode.h
+--- linux-3.6/fs/ocfs2/inode.h 2012-01-09 16:14:55.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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);
static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode)
{
-diff -NurpP --minimal linux-3.5.4/fs/ocfs2/ioctl.c linux-3.5.4-vs2.3.4.3/fs/ocfs2/ioctl.c
---- linux-3.5.4/fs/ocfs2/ioctl.c 2012-07-22 23:39:41.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/ocfs2/ioctl.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ocfs2/ioctl.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ocfs2/ioctl.c
+--- linux-3.6/fs/ocfs2/ioctl.c 2012-10-04 15:27:41.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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;
}
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.5.4/fs/ocfs2/namei.c linux-3.5.4-vs2.3.4.3/fs/ocfs2/namei.c
---- linux-3.5.4/fs/ocfs2/namei.c 2012-07-22 23:39:41.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/ocfs2/namei.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ocfs2/namei.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ocfs2/namei.c
+--- linux-3.6/fs/ocfs2/namei.c 2012-10-04 15:27:41.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ocfs2/namei.c 2012-10-04 18:47:00.000000000 +0200
@@ -41,6 +41,7 @@
#include <linux/slab.h>
#include <linux/highmem.h>
fe->i_mode = cpu_to_le16(inode->i_mode);
if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode))
fe->id1.dev1.i_rdev = cpu_to_le64(huge_encode_dev(dev));
-diff -NurpP --minimal linux-3.5.4/fs/ocfs2/ocfs2.h linux-3.5.4-vs2.3.4.3/fs/ocfs2/ocfs2.h
---- linux-3.5.4/fs/ocfs2/ocfs2.h 2012-01-09 16:14:55.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/fs/ocfs2/ocfs2.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ocfs2/ocfs2.h linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ocfs2/ocfs2.h
+--- linux-3.6/fs/ocfs2/ocfs2.h 2012-01-09 16:14:55.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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 */
};
#define OCFS2_OSB_SOFT_RO 0x0001
-diff -NurpP --minimal linux-3.5.4/fs/ocfs2/ocfs2_fs.h linux-3.5.4-vs2.3.4.3/fs/ocfs2/ocfs2_fs.h
---- linux-3.5.4/fs/ocfs2/ocfs2_fs.h 2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/ocfs2/ocfs2_fs.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ocfs2/ocfs2_fs.h linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ocfs2/ocfs2_fs.h
+--- linux-3.6/fs/ocfs2/ocfs2_fs.h 2011-05-22 16:17:53.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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 */
#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.5.4/fs/ocfs2/super.c linux-3.5.4-vs2.3.4.3/fs/ocfs2/super.c
---- linux-3.5.4/fs/ocfs2/super.c 2012-05-21 18:07:26.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/ocfs2/super.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/ocfs2/super.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ocfs2/super.c
+--- linux-3.6/fs/ocfs2/super.c 2012-05-21 18:07:26.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/ocfs2/super.c 2012-10-04 18:47:00.000000000 +0200
@@ -185,6 +185,7 @@ enum {
Opt_coherency_full,
Opt_resv_level,
default:
mlog(ML_ERROR,
"Unrecognized mount option \"%s\" "
-diff -NurpP --minimal linux-3.5.4/fs/open.c linux-3.5.4-vs2.3.4.3/fs/open.c
---- linux-3.5.4/fs/open.c 2012-09-16 20:46:31.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/open.c 2012-09-16 20:50:19.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/open.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/open.c
+--- linux-3.6/fs/open.c 2012-10-04 15:27:41.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/open.c 2012-10-04 18:47:00.000000000 +0200
@@ -30,6 +30,11 @@
#include <linux/fs_struct.h>
#include <linux/ima.h>
inode = path.dentry->d_inode;
/* For directories it's -EISDIR, for other non-regulars - -EINVAL */
-@@ -490,6 +501,10 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, cons
+@@ -495,6 +506,10 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, cons
error = user_path_at(dfd, filename, LOOKUP_FOLLOW, &path);
if (!error) {
error = chmod_common(&path, mode);
path_put(&path);
}
-@@ -517,13 +532,13 @@ static int chown_common(struct path *pat
+@@ -522,13 +537,13 @@ static int chown_common(struct path *pat
if (!uid_valid(uid))
return -EINVAL;
newattrs.ia_valid |= ATTR_UID;
}
if (!S_ISDIR(inode->i_mode))
newattrs.ia_valid |=
-@@ -548,6 +563,10 @@ SYSCALL_DEFINE3(chown, const char __user
+@@ -561,6 +576,18 @@ SYSCALL_DEFINE5(fchownat, int, dfd, cons
error = mnt_want_write(path.mnt);
if (error)
goto out_release;
+ error = cow_check_and_break(&path);
+ if (!error)
+#endif
- error = chown_common(&path, user, group);
- mnt_drop_write(path.mnt);
- out_release:
-@@ -575,6 +594,10 @@ SYSCALL_DEFINE5(fchownat, int, dfd, cons
- error = mnt_want_write(path.mnt);
- if (error)
- goto out_release;
+#ifdef CONFIG_VSERVER_COWBL
+ error = cow_check_and_break(&path);
+ if (!error)
+#endif
- error = chown_common(&path, user, group);
- mnt_drop_write(path.mnt);
- out_release:
-@@ -594,6 +617,10 @@ SYSCALL_DEFINE3(lchown, const char __use
- error = mnt_want_write(path.mnt);
- if (error)
- goto out_release;
+#ifdef CONFIG_VSERVER_COWBL
+ error = cow_check_and_break(&path);
+ if (!error)
error = chown_common(&path, user, group);
mnt_drop_write(path.mnt);
out_release:
-@@ -887,6 +914,7 @@ static void __put_unused_fd(struct files
+@@ -809,6 +836,7 @@ static void __put_unused_fd(struct files
__clear_open_fd(fd, fdt);
if (fd < files->next_fd)
files->next_fd = fd;
}
void put_unused_fd(unsigned int fd)
-diff -NurpP --minimal linux-3.5.4/fs/proc/array.c linux-3.5.4-vs2.3.4.3/fs/proc/array.c
---- linux-3.5.4/fs/proc/array.c 2012-07-22 23:39:42.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/proc/array.c 2012-07-23 10:51:47.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/proc/array.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/proc/array.c
+--- linux-3.6/fs/proc/array.c 2012-07-22 23:39:42.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/proc/array.c 2012-10-04 18:47:00.000000000 +0200
@@ -82,6 +82,8 @@
#include <linux/ptrace.h>
#include <linux/tracehook.h>
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.5.4/fs/proc/base.c linux-3.5.4-vs2.3.4.3/fs/proc/base.c
---- linux-3.5.4/fs/proc/base.c 2012-07-22 23:39:42.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/proc/base.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/proc/base.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/proc/base.c
+--- linux-3.6/fs/proc/base.c 2012-10-04 15:27:41.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/proc/base.c 2012-10-04 18:47:00.000000000 +0200
@@ -85,6 +85,8 @@
#include <linux/fs_struct.h>
#include <linux/slab.h>
#ifdef CONFIG_HARDWALL
#include <asm/hardwall.h>
#endif
-@@ -937,11 +939,16 @@ static ssize_t oom_adjust_write(struct f
+@@ -941,11 +943,16 @@ static ssize_t oom_adjust_write(struct f
goto err_task_lock;
}
/*
* Warn that /proc/pid/oom_adj is deprecated, see
* Documentation/feature-removal-schedule.txt.
-@@ -1541,6 +1548,8 @@ struct inode *proc_pid_make_inode(struct
+@@ -1548,6 +1555,8 @@ struct inode *proc_pid_make_inode(struct
inode->i_gid = cred->egid;
rcu_read_unlock();
}
security_task_to_inode(task, inode);
out:
-@@ -1586,6 +1595,8 @@ int pid_getattr(struct vfsmount *mnt, st
+@@ -1593,6 +1602,8 @@ int pid_getattr(struct vfsmount *mnt, st
/* dentry stuff */
/*
* Exceptional case: normally we are not allowed to unhash a busy
* directory. In this case, however, we can do it - no aliasing problems
-@@ -1614,6 +1625,12 @@ int pid_revalidate(struct dentry *dentry
+@@ -1621,6 +1632,12 @@ int pid_revalidate(struct dentry *dentry
task = get_proc_task(inode);
if (task) {
if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
task_dumpable(task)) {
rcu_read_lock();
-@@ -1630,6 +1647,7 @@ int pid_revalidate(struct dentry *dentry
+@@ -1637,6 +1654,7 @@ int pid_revalidate(struct dentry *dentry
put_task_struct(task);
return 1;
}
d_drop(dentry);
return 0;
}
-@@ -2450,6 +2468,13 @@ static struct dentry *proc_pident_lookup
+@@ -2457,6 +2475,13 @@ static struct dentry *proc_pident_lookup
if (!task)
goto out_no_task;
/*
* Yes, it does not scale. And it should not. Don't add
* new entries into /proc/<tgid>/ without very good reasons.
-@@ -2835,7 +2860,7 @@ out_iput:
+@@ -2842,7 +2867,7 @@ out_iput:
static struct dentry *proc_base_lookup(struct inode *dir, struct dentry *dentry)
{
struct dentry *error;
const struct pid_entry *p, *last;
error = ERR_PTR(-ENOENT);
-@@ -3010,6 +3035,9 @@ static int proc_pid_personality(struct s
+@@ -3017,6 +3042,9 @@ static int proc_pid_personality(struct s
static const struct file_operations proc_task_operations;
static const struct inode_operations proc_task_inode_operations;
static const struct pid_entry tgid_base_stuff[] = {
DIR("task", S_IRUGO|S_IXUGO, proc_task_inode_operations, proc_task_operations),
DIR("fd", S_IRUSR|S_IXUSR, proc_fd_inode_operations, proc_fd_operations),
-@@ -3076,6 +3104,8 @@ static const struct pid_entry tgid_base_
+@@ -3083,6 +3111,8 @@ static const struct pid_entry tgid_base_
#ifdef CONFIG_CGROUPS
REG("cgroup", S_IRUGO, proc_cgroup_operations),
#endif
INF("oom_score", S_IRUGO, proc_oom_score),
REG("oom_adj", S_IRUGO|S_IWUSR, proc_oom_adjust_operations),
REG("oom_score_adj", S_IRUGO|S_IWUSR, proc_oom_score_adj_operations),
-@@ -3099,6 +3129,7 @@ static const struct pid_entry tgid_base_
+@@ -3106,6 +3136,7 @@ static const struct pid_entry tgid_base_
REG("uid_map", S_IRUGO|S_IWUSR, proc_uid_map_operations),
REG("gid_map", S_IRUGO|S_IWUSR, proc_gid_map_operations),
#endif
};
static int proc_tgid_base_readdir(struct file * filp,
-@@ -3292,7 +3323,7 @@ retry:
+@@ -3300,7 +3331,7 @@ retry:
iter.task = NULL;
pid = find_ge_pid(iter.tgid, ns);
if (pid) {
iter.task = pid_task(pid, PIDTYPE_PID);
/* What we to know is if the pid we have find is the
* pid of a thread_group_leader. Testing for task
-@@ -3322,7 +3353,7 @@ static int proc_pid_fill_cache(struct fi
+@@ -3330,7 +3361,7 @@ static int proc_pid_fill_cache(struct fi
struct tgid_iter iter)
{
char name[PROC_NUMBUF];
return proc_fill_cache(filp, dirent, filldir, name, len,
proc_pid_instantiate, iter.task, NULL);
}
-@@ -3346,7 +3377,7 @@ int proc_pid_readdir(struct file * filp,
+@@ -3354,7 +3385,7 @@ int proc_pid_readdir(struct file * filp,
goto out_no_task;
nr = filp->f_pos - FIRST_PROCESS_ENTRY;
if (!reaper)
goto out_no_task;
-@@ -3368,6 +3399,8 @@ int proc_pid_readdir(struct file * filp,
+@@ -3376,6 +3407,8 @@ int proc_pid_readdir(struct file * filp,
__filldir = fake_filldir;
filp->f_pos = iter.tgid + TGID_OFFSET;
if (proc_pid_fill_cache(filp, dirent, __filldir, iter) < 0) {
put_task_struct(iter.task);
goto out;
-@@ -3528,6 +3561,8 @@ static struct dentry *proc_task_lookup(s
+@@ -3537,6 +3570,8 @@ static struct dentry *proc_task_lookup(s
tid = name_to_int(dentry);
if (tid == ~0U)
goto out;
ns = dentry->d_sb->s_fs_info;
rcu_read_lock();
-diff -NurpP --minimal linux-3.5.4/fs/proc/generic.c linux-3.5.4-vs2.3.4.3/fs/proc/generic.c
---- linux-3.5.4/fs/proc/generic.c 2012-03-19 19:47:26.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/fs/proc/generic.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/proc/generic.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/proc/generic.c
+--- linux-3.6/fs/proc/generic.c 2012-10-04 15:27:41.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/proc/generic.c 2012-10-04 18:47:00.000000000 +0200
@@ -22,6 +22,7 @@
#include <linux/bitops.h>
#include <linux/spinlock.h>
} else {
kfree(ent);
ent = NULL;
-diff -NurpP --minimal linux-3.5.4/fs/proc/inode.c linux-3.5.4-vs2.3.4.3/fs/proc/inode.c
---- linux-3.5.4/fs/proc/inode.c 2012-07-22 23:39:42.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/proc/inode.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/proc/inode.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/proc/inode.c
+--- linux-3.6/fs/proc/inode.c 2012-07-22 23:39:42.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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;
if (de->size)
inode->i_size = de->size;
if (de->nlink)
-diff -NurpP --minimal linux-3.5.4/fs/proc/internal.h linux-3.5.4-vs2.3.4.3/fs/proc/internal.h
---- linux-3.5.4/fs/proc/internal.h 2012-07-22 23:39:42.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/proc/internal.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/proc/internal.h linux-3.6-vs2.3.4.3-noxfs-nocow/fs/proc/internal.h
+--- linux-3.6/fs/proc/internal.h 2012-10-04 15:27:41.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/proc/internal.h 2012-10-04 18:47:00.000000000 +0200
@@ -10,6 +10,8 @@
*/
static inline int proc_fd(struct inode *inode)
{
return PROC_I(inode)->fd;
-diff -NurpP --minimal linux-3.5.4/fs/proc/loadavg.c linux-3.5.4-vs2.3.4.3/fs/proc/loadavg.c
---- linux-3.5.4/fs/proc/loadavg.c 2009-09-10 15:26:23.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/proc/loadavg.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/proc/loadavg.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/proc/loadavg.c
+--- linux-3.6/fs/proc/loadavg.c 2009-09-10 15:26:23.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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)
task_active_pid_ns(current)->last_pid);
return 0;
}
-diff -NurpP --minimal linux-3.5.4/fs/proc/meminfo.c linux-3.5.4-vs2.3.4.3/fs/proc/meminfo.c
---- linux-3.5.4/fs/proc/meminfo.c 2012-01-09 16:14:55.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/fs/proc/meminfo.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/proc/meminfo.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/proc/meminfo.c
+--- linux-3.6/fs/proc/meminfo.c 2012-01-09 16:14:55.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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;
total_swapcache_pages - i.bufferram;
if (cached < 0)
cached = 0;
-diff -NurpP --minimal linux-3.5.4/fs/proc/root.c linux-3.5.4-vs2.3.4.3/fs/proc/root.c
---- linux-3.5.4/fs/proc/root.c 2012-07-22 23:39:42.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/proc/root.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/proc/root.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/proc/root.c
+--- linux-3.6/fs/proc/root.c 2012-10-04 15:27:41.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/proc/root.c 2012-10-04 18:47:00.000000000 +0200
@@ -19,9 +19,14 @@
#include <linux/mount.h>
#include <linux/pid_namespace.h>
static int proc_test_super(struct super_block *sb, void *data)
{
return sb->s_fs_info == data;
-@@ -190,6 +195,7 @@ void __init proc_root_init(void)
+@@ -189,6 +194,7 @@ void __init proc_root_init(void)
#endif
proc_mkdir("bus", NULL);
proc_sys_init();
}
static int proc_root_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat
-@@ -257,6 +263,7 @@ struct proc_dir_entry proc_root = {
+@@ -255,6 +261,7 @@ struct proc_dir_entry proc_root = {
.proc_iops = &proc_root_inode_operations,
.proc_fops = &proc_root_operations,
.parent = &proc_root,
.name = "/proc",
};
-diff -NurpP --minimal linux-3.5.4/fs/proc/stat.c linux-3.5.4-vs2.3.4.3/fs/proc/stat.c
---- linux-3.5.4/fs/proc/stat.c 2012-05-21 18:07:26.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/proc/stat.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/proc/stat.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/proc/stat.c
+--- linux-3.6/fs/proc/stat.c 2012-05-21 18:07:26.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/proc/stat.c 2012-10-04 18:47:00.000000000 +0200
@@ -9,6 +9,7 @@
#include <linux/slab.h>
#include <linux/time.h>
jif = boottime.tv_sec;
for_each_possible_cpu(i) {
-diff -NurpP --minimal linux-3.5.4/fs/proc/uptime.c linux-3.5.4-vs2.3.4.3/fs/proc/uptime.c
---- linux-3.5.4/fs/proc/uptime.c 2012-03-19 19:47:26.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/fs/proc/uptime.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/proc/uptime.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/proc/uptime.c
+--- linux-3.6/fs/proc/uptime.c 2012-03-19 19:47:26.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/proc/uptime.c 2012-10-04 18:47:00.000000000 +0200
@@ -5,6 +5,7 @@
#include <linux/seq_file.h>
#include <linux/time.h>
seq_printf(m, "%lu.%02lu %lu.%02lu\n",
(unsigned long) uptime.tv_sec,
(uptime.tv_nsec / (NSEC_PER_SEC / 100)),
-diff -NurpP --minimal linux-3.5.4/fs/proc_namespace.c linux-3.5.4-vs2.3.4.3/fs/proc_namespace.c
---- linux-3.5.4/fs/proc_namespace.c 2012-07-22 23:39:42.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/proc_namespace.c 2012-07-23 11:01:00.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/proc_namespace.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/proc_namespace.c
+--- linux-3.6/fs/proc_namespace.c 2012-10-04 15:27:41.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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" },
/* file system type */
seq_puts(m, "with fstype ");
show_type(m, sb);
-diff -NurpP --minimal linux-3.5.4/fs/quota/dquot.c linux-3.5.4-vs2.3.4.3/fs/quota/dquot.c
---- linux-3.5.4/fs/quota/dquot.c 2012-07-22 23:39:42.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/quota/dquot.c 2012-07-23 01:45:55.000000000 +0200
-@@ -1562,6 +1562,9 @@ int __dquot_alloc_space(struct inode *in
+diff -NurpP --minimal linux-3.6/fs/quota/dquot.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/quota/dquot.c
+--- linux-3.6/fs/quota/dquot.c 2012-10-04 15:27:41.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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;
/*
* First test before acquiring mutex - solves deadlocks when we
* re-enter the quota code and are already holding the mutex
-@@ -1617,6 +1620,9 @@ int dquot_alloc_inode(const struct inode
+@@ -1635,6 +1638,9 @@ int dquot_alloc_inode(const struct inode
struct dquot_warn warn[MAXQUOTAS];
struct dquot * const *dquots = inode->i_dquot;
/* First test before acquiring mutex - solves deadlocks when we
* re-enter the quota code and are already holding the mutex */
if (!dquot_active(inode))
-@@ -1688,6 +1694,8 @@ void __dquot_free_space(struct inode *in
+@@ -1706,6 +1712,8 @@ void __dquot_free_space(struct inode *in
struct dquot **dquots = inode->i_dquot;
int reserve = flags & DQUOT_SPACE_RESERVE;
/* First test before acquiring mutex - solves deadlocks when we
* re-enter the quota code and are already holding the mutex */
if (!dquot_active(inode)) {
-@@ -1732,6 +1740,8 @@ void dquot_free_inode(const struct inode
+@@ -1750,6 +1758,8 @@ void dquot_free_inode(const struct inode
struct dquot_warn warn[MAXQUOTAS];
struct dquot * const *dquots = inode->i_dquot;
/* 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.5.4/fs/quota/quota.c linux-3.5.4-vs2.3.4.3/fs/quota/quota.c
---- linux-3.5.4/fs/quota/quota.c 2012-05-21 18:07:26.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/quota/quota.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/quota/quota.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/quota/quota.c
+--- linux-3.6/fs/quota/quota.c 2012-10-04 15:27:41.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/quota/quota.c 2012-10-04 18:47:00.000000000 +0200
@@ -8,6 +8,7 @@
#include <linux/fs.h>
#include <linux/namei.h>
#include <linux/slab.h>
+#include <linux/vs_context.h>
#include <asm/current.h>
- #include <asm/uaccess.h>
+ #include <linux/uaccess.h>
#include <linux/kernel.h>
@@ -37,7 +38,7 @@ static int check_quotactl_permission(str
break;
if (quotactl_cmd_write(cmd))
sb = get_super_thawed(bdev);
else
-diff -NurpP --minimal linux-3.5.4/fs/reiserfs/file.c linux-3.5.4-vs2.3.4.3/fs/reiserfs/file.c
---- linux-3.5.4/fs/reiserfs/file.c 2012-05-21 18:07:26.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/reiserfs/file.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/reiserfs/file.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/reiserfs/file.c
+--- linux-3.6/fs/reiserfs/file.c 2012-05-21 18:07:26.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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,
+ .sync_flags = reiserfs_sync_flags,
.get_acl = reiserfs_get_acl,
};
-diff -NurpP --minimal linux-3.5.4/fs/reiserfs/inode.c linux-3.5.4-vs2.3.4.3/fs/reiserfs/inode.c
---- linux-3.5.4/fs/reiserfs/inode.c 2012-07-22 23:39:42.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/reiserfs/inode.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/reiserfs/inode.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/reiserfs/inode.c
+--- linux-3.6/fs/reiserfs/inode.c 2012-10-04 15:27:41.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/reiserfs/inode.c 2012-10-04 18:47:00.000000000 +0200
@@ -18,6 +18,7 @@
#include <linux/writeback.h>
#include <linux/quotaops.h>
mark_inode_dirty(inode);
error = journal_end(&th, inode->i_sb, jbegin_count);
if (error)
-diff -NurpP --minimal linux-3.5.4/fs/reiserfs/ioctl.c linux-3.5.4-vs2.3.4.3/fs/reiserfs/ioctl.c
---- linux-3.5.4/fs/reiserfs/ioctl.c 2012-05-21 18:07:27.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/reiserfs/ioctl.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/reiserfs/ioctl.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/reiserfs/ioctl.c
+--- linux-3.6/fs/reiserfs/ioctl.c 2012-05-21 18:07:27.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/reiserfs/ioctl.c 2012-10-04 18:47:00.000000000 +0200
@@ -11,6 +11,21 @@
#include <linux/pagemap.h>
#include <linux/compat.h>
sd_attrs_to_i_attrs(flags, inode);
REISERFS_I(inode)->i_attrs = flags;
inode->i_ctime = CURRENT_TIME_SEC;
-diff -NurpP --minimal linux-3.5.4/fs/reiserfs/namei.c linux-3.5.4-vs2.3.4.3/fs/reiserfs/namei.c
---- linux-3.5.4/fs/reiserfs/namei.c 2012-05-21 18:07:27.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/reiserfs/namei.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/reiserfs/namei.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/reiserfs/namei.c
+--- linux-3.6/fs/reiserfs/namei.c 2012-10-04 15:27:41.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/reiserfs/namei.c 2012-10-04 18:47:00.000000000 +0200
@@ -18,6 +18,7 @@
#include "acl.h"
#include "xattr.h"
return d_splice_alias(inode, dentry);
}
-diff -NurpP --minimal linux-3.5.4/fs/reiserfs/reiserfs.h linux-3.5.4-vs2.3.4.3/fs/reiserfs/reiserfs.h
---- linux-3.5.4/fs/reiserfs/reiserfs.h 2012-07-22 23:39:42.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/reiserfs/reiserfs.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/reiserfs/reiserfs.h linux-3.6-vs2.3.4.3-noxfs-nocow/fs/reiserfs/reiserfs.h
+--- linux-3.6/fs/reiserfs/reiserfs.h 2012-07-22 23:39:42.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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,
int __reiserfs_write_begin(struct page *page, unsigned from, unsigned len);
-diff -NurpP --minimal linux-3.5.4/fs/reiserfs/super.c linux-3.5.4-vs2.3.4.3/fs/reiserfs/super.c
---- linux-3.5.4/fs/reiserfs/super.c 2012-07-22 23:39:42.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/reiserfs/super.c 2012-07-23 01:45:55.000000000 +0200
-@@ -1013,6 +1013,14 @@ static int reiserfs_parse_options(struct
+diff -NurpP --minimal linux-3.6/fs/reiserfs/super.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/reiserfs/super.c
+--- linux-3.6/fs/reiserfs/super.c 2012-10-04 15:27:41.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/reiserfs/super.c 2012-10-04 18:47:00.000000000 +0200
+@@ -1018,6 +1018,14 @@ static int reiserfs_parse_options(struct
{"user_xattr",.setmask = 1 << REISERFS_UNSUPPORTED_OPT},
{"nouser_xattr",.clrmask = 1 << REISERFS_UNSUPPORTED_OPT},
#endif
#ifdef CONFIG_REISERFS_FS_POSIX_ACL
{"acl",.setmask = 1 << REISERFS_POSIXACL},
{"noacl",.clrmask = 1 << REISERFS_POSIXACL},
-@@ -1331,6 +1339,14 @@ static int reiserfs_remount(struct super
+@@ -1336,6 +1344,14 @@ static int reiserfs_remount(struct super
handle_quota_files(s, qf_names, &qfmt);
#endif
handle_attrs(s);
/* Add options that are safe here */
-@@ -1811,6 +1827,10 @@ static int reiserfs_fill_super(struct su
+@@ -1816,6 +1832,10 @@ static int reiserfs_fill_super(struct su
goto error_unlocked;
}
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.5.4/fs/reiserfs/xattr.c linux-3.5.4-vs2.3.4.3/fs/reiserfs/xattr.c
---- linux-3.5.4/fs/reiserfs/xattr.c 2012-05-21 18:07:27.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/reiserfs/xattr.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/reiserfs/xattr.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/reiserfs/xattr.c
+--- linux-3.6/fs/reiserfs/xattr.c 2012-10-04 15:27:41.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/reiserfs/xattr.c 2012-10-04 18:47:00.000000000 +0200
@@ -40,6 +40,7 @@
#include <linux/errno.h>
#include <linux/gfp.h>
#include <linux/file.h>
#include <linux/pagemap.h>
#include <linux/xattr.h>
-diff -NurpP --minimal linux-3.5.4/fs/stat.c linux-3.5.4-vs2.3.4.3/fs/stat.c
---- linux-3.5.4/fs/stat.c 2012-07-22 23:39:42.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/stat.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/stat.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/stat.c
+--- linux-3.6/fs/stat.c 2012-10-04 15:27:41.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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;
stat->rdev = inode->i_rdev;
stat->size = i_size_read(inode);
stat->atime = inode->i_atime;
-diff -NurpP --minimal linux-3.5.4/fs/statfs.c linux-3.5.4-vs2.3.4.3/fs/statfs.c
---- linux-3.5.4/fs/statfs.c 2012-07-22 23:39:42.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/statfs.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/statfs.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/statfs.c
+--- linux-3.6/fs/statfs.c 2012-07-22 23:39:42.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/statfs.c 2012-10-04 18:47:00.000000000 +0200
@@ -7,6 +7,8 @@
#include <linux/statfs.h>
#include <linux/security.h>
return retval;
}
-diff -NurpP --minimal linux-3.5.4/fs/super.c linux-3.5.4-vs2.3.4.3/fs/super.c
---- linux-3.5.4/fs/super.c 2012-05-21 18:07:27.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/super.c 2012-07-23 01:45:55.000000000 +0200
-@@ -33,6 +33,8 @@
- #include <linux/rculist_bl.h>
+diff -NurpP --minimal linux-3.6/fs/super.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/super.c
+--- linux-3.6/fs/super.c 2012-10-04 15:27:41.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/super.c 2012-10-04 19:06:05.000000000 +0200
+@@ -34,6 +34,8 @@
#include <linux/cleancache.h>
#include <linux/fsnotify.h>
+ #include <linux/lockdep.h>
+#include <linux/magic.h>
+#include <linux/vs_context.h>
#include "internal.h"
-@@ -1138,6 +1140,13 @@ mount_fs(struct file_system_type *type,
+@@ -1148,6 +1150,13 @@ mount_fs(struct file_system_type *type,
WARN_ON(sb->s_bdi == &default_backing_dev_info);
sb->s_flags |= MS_BORN;
error = security_sb_kern_mount(sb, flags, secdata);
if (error)
goto out_sb;
-diff -NurpP --minimal linux-3.5.4/fs/sysfs/mount.c linux-3.5.4-vs2.3.4.3/fs/sysfs/mount.c
---- linux-3.5.4/fs/sysfs/mount.c 2012-05-21 18:07:27.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/sysfs/mount.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/sysfs/mount.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/sysfs/mount.c
+--- linux-3.6/fs/sysfs/mount.c 2012-10-04 15:27:41.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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;
sb->s_op = &sysfs_ops;
sb->s_time_gran = 1;
-diff -NurpP --minimal linux-3.5.4/fs/utimes.c linux-3.5.4-vs2.3.4.3/fs/utimes.c
---- linux-3.5.4/fs/utimes.c 2012-07-22 23:39:42.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/utimes.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/utimes.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/utimes.c
+--- linux-3.6/fs/utimes.c 2012-07-22 23:39:42.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/utimes.c 2012-10-04 18:47:00.000000000 +0200
@@ -8,6 +8,8 @@
#include <linux/stat.h>
#include <linux/utime.h>
if (times && times[0].tv_nsec == UTIME_NOW &&
times[1].tv_nsec == UTIME_NOW)
times = NULL;
-diff -NurpP --minimal linux-3.5.4/fs/xattr.c linux-3.5.4-vs2.3.4.3/fs/xattr.c
---- linux-3.5.4/fs/xattr.c 2012-07-22 23:39:42.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/xattr.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/xattr.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/xattr.c
+--- linux-3.6/fs/xattr.c 2012-10-04 15:27:44.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/xattr.c 2012-10-04 18:47:00.000000000 +0200
@@ -20,6 +20,7 @@
#include <linux/fsnotify.h>
#include <linux/audit.h>
return (mask & MAY_WRITE) ? -EPERM : -ENODATA;
return 0;
}
-diff -NurpP --minimal linux-3.5.4/fs/xfs/xfs_dinode.h linux-3.5.4-vs2.3.4.3/fs/xfs/xfs_dinode.h
---- linux-3.5.4/fs/xfs/xfs_dinode.h 2011-10-24 18:45:31.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/xfs/xfs_dinode.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/xfs/xfs_dinode.h linux-3.6-vs2.3.4.3-noxfs-nocow/fs/xfs/xfs_dinode.h
+--- linux-3.6/fs/xfs/xfs_dinode.h 2012-10-04 15:27:44.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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 */
+#define XFS_DIVFLAG_COW 0x02
#endif /* __XFS_DINODE_H__ */
-diff -NurpP --minimal linux-3.5.4/fs/xfs/xfs_fs.h linux-3.5.4-vs2.3.4.3/fs/xfs/xfs_fs.h
---- linux-3.5.4/fs/xfs/xfs_fs.h 2011-10-24 18:45:31.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/xfs/xfs_fs.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/xfs/xfs_fs.h linux-3.6-vs2.3.4.3-noxfs-nocow/fs/xfs/xfs_fs.h
+--- linux-3.6/fs/xfs/xfs_fs.h 2011-10-24 18:45:31.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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 */
__u32 bs_dmevmask; /* DMIG event mask */
__u16 bs_dmstate; /* DMIG state info */
__u16 bs_aextents; /* attribute number of extents */
-diff -NurpP --minimal linux-3.5.4/fs/xfs/xfs_ialloc.c linux-3.5.4-vs2.3.4.3/fs/xfs/xfs_ialloc.c
---- linux-3.5.4/fs/xfs/xfs_ialloc.c 2012-07-22 23:39:42.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/xfs/xfs_ialloc.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/xfs/xfs_ialloc.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/xfs/xfs_ialloc.c
+--- linux-3.6/fs/xfs/xfs_ialloc.c 2012-10-04 15:27:44.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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.5.4/fs/xfs/xfs_inode.c linux-3.5.4-vs2.3.4.3/fs/xfs/xfs_inode.c
---- linux-3.5.4/fs/xfs/xfs_inode.c 2012-07-22 23:39:42.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/xfs/xfs_inode.c 2012-07-23 01:45:55.000000000 +0200
-@@ -250,6 +250,7 @@ xfs_inotobp(
- return 0;
+diff -NurpP --minimal linux-3.6/fs/xfs/xfs_inode.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/xfs/xfs_inode.c
+--- linux-3.6/fs/xfs/xfs_inode.c 2012-10-04 15:27:44.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/xfs/xfs_inode.c 2012-10-04 18:47:00.000000000 +0200
+@@ -1833,6 +1833,7 @@ xfs_iroot_realloc(
+ return;
}
+#include <linux/vs_tag.h>
/*
- * This routine is called to map an inode to the buffer containing
-@@ -645,15 +646,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);
-@@ -675,21 +686,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);
-@@ -711,12 +727,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;
-
-@@ -727,6 +745,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)
-@@ -751,6 +771,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;
- }
-
-@@ -760,7 +784,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);
- }
-
-@@ -768,7 +792,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);
- }
-
-@@ -800,7 +825,6 @@ xfs_iread(
- if (error)
- return error;
- dip = (xfs_dinode_t *)xfs_buf_offset(bp, ip->i_imap.im_boffset);
--
- /*
- * If we got something that isn't an inode it means someone
- * (nfs or dmi) has a stale handle.
-@@ -823,7 +847,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
-@@ -1011,6 +1036,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));
-
-@@ -1070,6 +1096,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:
-@@ -1737,6 +1764,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;
-@@ -2589,7 +2617,8 @@ xfs_iflush_int(
+ * This is called when the amount of space needed for if_data
+@@ -2521,7 +2522,8 @@ xfs_iflush_int(
* because if the inode is dirty at all the core must
* be.
*/
/* 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.5.4/fs/xfs/xfs_inode.h linux-3.5.4-vs2.3.4.3/fs/xfs/xfs_inode.h
---- linux-3.5.4/fs/xfs/xfs_inode.h 2012-07-22 23:39:42.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/xfs/xfs_inode.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/xfs/xfs_inode.h linux-3.6-vs2.3.4.3-noxfs-nocow/fs/xfs/xfs_inode.h
+--- linux-3.6/fs/xfs/xfs_inode.h 2012-10-04 15:27:44.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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_flushiter; /* incremented on flush */
xfs_ictimestamp_t di_atime; /* time last accessed */
xfs_ictimestamp_t di_mtime; /* time last modified */
-@@ -566,7 +568,7 @@ int xfs_itobp(struct xfs_mount *, struc
+@@ -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 *,
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.5.4/fs/xfs/xfs_ioctl.c linux-3.5.4-vs2.3.4.3/fs/xfs/xfs_ioctl.c
---- linux-3.5.4/fs/xfs/xfs_ioctl.c 2012-07-22 23:39:42.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/xfs/xfs_ioctl.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/xfs/xfs_ioctl.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/xfs/xfs_ioctl.c
+--- linux-3.6/fs/xfs/xfs_ioctl.c 2012-10-04 15:27:44.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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_rtalloc.h"
#include "xfs_itable.h"
#include "xfs_error.h"
-@@ -748,6 +748,10 @@ xfs_merge_ioc_xflags(
+@@ -762,6 +762,10 @@ xfs_merge_ioc_xflags(
xflags |= XFS_XFLAG_IMMUTABLE;
else
xflags &= ~XFS_XFLAG_IMMUTABLE;
if (flags & FS_APPEND_FL)
xflags |= XFS_XFLAG_APPEND;
else
-@@ -776,6 +780,8 @@ xfs_di2lxflags(
+@@ -790,6 +794,8 @@ xfs_di2lxflags(
if (di_flags & XFS_DIFLAG_IMMUTABLE)
flags |= FS_IMMUTABLE_FL;
if (di_flags & XFS_DIFLAG_APPEND)
flags |= FS_APPEND_FL;
if (di_flags & XFS_DIFLAG_SYNC)
-@@ -836,6 +842,8 @@ xfs_set_diflags(
+@@ -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_APPEND)
di_flags |= XFS_DIFLAG_APPEND;
if (xflags & XFS_XFLAG_SYNC)
-@@ -878,6 +886,10 @@ xfs_diflags_to_linux(
+@@ -892,6 +900,10 @@ xfs_diflags_to_linux(
inode->i_flags |= S_IMMUTABLE;
else
inode->i_flags &= ~S_IMMUTABLE;
if (xflags & XFS_XFLAG_APPEND)
inode->i_flags |= S_APPEND;
else
-@@ -1370,10 +1382,18 @@ xfs_file_ioctl(
+@@ -1396,10 +1408,18 @@ xfs_file_ioctl(
case XFS_IOC_FSGETXATTRA:
return xfs_ioc_fsgetxattr(ip, 1, arg);
case XFS_IOC_FSSETXATTR:
return xfs_ioc_setxflags(ip, filp, arg);
case XFS_IOC_FSSETDM: {
-diff -NurpP --minimal linux-3.5.4/fs/xfs/xfs_ioctl.h linux-3.5.4-vs2.3.4.3/fs/xfs/xfs_ioctl.h
---- linux-3.5.4/fs/xfs/xfs_ioctl.h 2011-10-24 18:45:31.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/xfs/xfs_ioctl.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/xfs/xfs_ioctl.h linux-3.6-vs2.3.4.3-noxfs-nocow/fs/xfs/xfs_ioctl.h
+--- linux-3.6/fs/xfs/xfs_ioctl.h 2011-10-24 18:45:31.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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 long
xfs_file_ioctl(
struct file *filp,
-diff -NurpP --minimal linux-3.5.4/fs/xfs/xfs_iops.c linux-3.5.4-vs2.3.4.3/fs/xfs/xfs_iops.c
---- linux-3.5.4/fs/xfs/xfs_iops.c 2012-07-22 23:39:42.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/xfs/xfs_iops.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/xfs/xfs_iops.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/xfs/xfs_iops.c
+--- linux-3.6/fs/xfs/xfs_iops.c 2012-10-04 15:27:44.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/xfs/xfs_iops.c 2012-10-04 18:47:00.000000000 +0200
@@ -28,6 +28,7 @@
#include "xfs_bmap_btree.h"
#include "xfs_dinode.h"
stat->ino = ip->i_ino;
stat->atime = inode->i_atime;
stat->mtime = inode->i_mtime;
-@@ -991,6 +994,7 @@ static const struct inode_operations xfs
- .removexattr = generic_removexattr,
- .listxattr = xfs_vn_listxattr,
- .fiemap = xfs_vn_fiemap,
-+ .sync_flags = xfs_sync_flags,
- };
-
- static const struct inode_operations xfs_dir_inode_operations = {
-@@ -1016,6 +1020,7 @@ static const struct inode_operations xfs
- .getxattr = generic_getxattr,
- .removexattr = generic_removexattr,
- .listxattr = xfs_vn_listxattr,
-+ .sync_flags = xfs_sync_flags,
- };
-
- static const struct inode_operations xfs_dir_ci_inode_operations = {
-@@ -1065,6 +1070,10 @@ xfs_diflags_to_iflags(
+@@ -1110,6 +1113,10 @@ xfs_diflags_to_iflags(
inode->i_flags |= S_IMMUTABLE;
else
inode->i_flags &= ~S_IMMUTABLE;
if (ip->i_d.di_flags & XFS_DIFLAG_APPEND)
inode->i_flags |= S_APPEND;
else
-@@ -1077,6 +1086,15 @@ xfs_diflags_to_iflags(
+@@ -1122,6 +1129,15 @@ xfs_diflags_to_iflags(
inode->i_flags |= S_NOATIME;
else
inode->i_flags &= ~S_NOATIME;
}
/*
-@@ -1108,6 +1126,7 @@ xfs_setup_inode(
+@@ -1153,6 +1169,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;
switch (inode->i_mode & S_IFMT) {
case S_IFBLK:
-diff -NurpP --minimal linux-3.5.4/fs/xfs/xfs_itable.c linux-3.5.4-vs2.3.4.3/fs/xfs/xfs_itable.c
---- linux-3.5.4/fs/xfs/xfs_itable.c 2012-07-22 23:39:42.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/xfs/xfs_itable.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/xfs/xfs_itable.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/xfs/xfs_itable.c
+--- linux-3.6/fs/xfs/xfs_itable.c 2012-10-04 15:27:44.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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_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.5.4/fs/xfs/xfs_linux.h linux-3.5.4-vs2.3.4.3/fs/xfs/xfs_linux.h
---- linux-3.5.4/fs/xfs/xfs_linux.h 2011-10-24 18:45:31.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/xfs/xfs_linux.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/xfs/xfs_linux.h linux-3.6-vs2.3.4.3-noxfs-nocow/fs/xfs/xfs_linux.h
+--- linux-3.6/fs/xfs/xfs_linux.h 2011-10-24 18:45:31.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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_test_flags(f) (current->flags & (f))
#define current_set_flags_nested(sp, f) \
(*(sp) = current->flags, current->flags |= (f))
-diff -NurpP --minimal linux-3.5.4/fs/xfs/xfs_log_recover.c linux-3.5.4-vs2.3.4.3/fs/xfs/xfs_log_recover.c
---- linux-3.5.4/fs/xfs/xfs_log_recover.c 2012-07-22 23:39:42.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/xfs/xfs_log_recover.c 2012-07-23 01:45:55.000000000 +0200
-@@ -2351,7 +2351,8 @@ xlog_recover_inode_pass2(
+diff -NurpP --minimal linux-3.6/fs/xfs/xfs_log_recover.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/xfs/xfs_log_recover.c
+--- linux-3.6/fs/xfs/xfs_log_recover.c 2012-10-04 15:27:44.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/xfs/xfs_log_recover.c 2012-10-04 18:47:00.000000000 +0200
+@@ -2359,7 +2359,8 @@ xlog_recover_inode_pass2(
}
/* The core is in in-core format */
/* the rest is in on-disk format */
if (item->ri_buf[1].i_len > sizeof(struct xfs_icdinode)) {
-diff -NurpP --minimal linux-3.5.4/fs/xfs/xfs_mount.h linux-3.5.4-vs2.3.4.3/fs/xfs/xfs_mount.h
---- linux-3.5.4/fs/xfs/xfs_mount.h 2012-07-22 23:39:42.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/xfs/xfs_mount.h 2012-07-23 01:45:55.000000000 +0200
-@@ -252,6 +252,7 @@ typedef struct xfs_mount {
+diff -NurpP --minimal linux-3.6/fs/xfs/xfs_mount.h linux-3.6-vs2.3.4.3-noxfs-nocow/fs/xfs/xfs_mount.h
+--- linux-3.6/fs/xfs/xfs_mount.h 2012-10-04 15:27:44.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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 */
/*
* Default minimum read and write sizes.
-diff -NurpP --minimal linux-3.5.4/fs/xfs/xfs_super.c linux-3.5.4-vs2.3.4.3/fs/xfs/xfs_super.c
---- linux-3.5.4/fs/xfs/xfs_super.c 2012-07-22 23:39:42.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/xfs/xfs_super.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/xfs/xfs_super.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/xfs/xfs_super.c
+--- linux-3.6/fs/xfs/xfs_super.c 2012-10-04 15:27:44.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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 */
} else {
xfs_warn(mp, "unknown mount option [%s].", this_char);
return EINVAL;
-@@ -1124,6 +1144,16 @@ xfs_fs_remount(
+@@ -1056,6 +1076,16 @@ xfs_fs_remount(
case Opt_nobarrier:
mp->m_flags &= ~XFS_MOUNT_BARRIER;
break;
default:
/*
* Logically we would return an error here to prevent
-@@ -1343,6 +1373,9 @@ xfs_fs_fill_super(
+@@ -1275,6 +1305,9 @@ xfs_fs_fill_super(
if (error)
goto out_free_sb;
/*
* 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.5.4/fs/xfs/xfs_vnodeops.c linux-3.5.4-vs2.3.4.3/fs/xfs/xfs_vnodeops.c
---- linux-3.5.4/fs/xfs/xfs_vnodeops.c 2012-07-22 23:39:42.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/fs/xfs/xfs_vnodeops.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/fs/xfs/xfs_vnodeops.c linux-3.6-vs2.3.4.3-noxfs-nocow/fs/xfs/xfs_vnodeops.c
+--- linux-3.6/fs/xfs/xfs_vnodeops.c 2012-10-04 15:27:44.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/fs/xfs/xfs_vnodeops.c 2012-10-04 18:47:00.000000000 +0200
@@ -103,6 +103,77 @@ xfs_readlink_bmap(
return error;
}
int
xfs_readlink(
xfs_inode_t *ip,
-diff -NurpP --minimal linux-3.5.4/include/linux/Kbuild linux-3.5.4-vs2.3.4.3/include/linux/Kbuild
---- linux-3.5.4/include/linux/Kbuild 2012-07-22 23:39:43.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/include/linux/Kbuild 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/Kbuild linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/Kbuild
+--- linux-3.6/include/linux/Kbuild 2012-10-04 15:27:45.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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/
header-y += wimax/
objhdr-y += version.h
-diff -NurpP --minimal linux-3.5.4/include/linux/capability.h linux-3.5.4-vs2.3.4.3/include/linux/capability.h
---- linux-3.5.4/include/linux/capability.h 2012-07-22 23:39:43.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/include/linux/capability.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/capability.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/capability.h
+--- linux-3.6/include/linux/capability.h 2012-07-22 23:39:43.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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 */
/*
* Bit location of each capability (used by user-space library and kernel)
-diff -NurpP --minimal linux-3.5.4/include/linux/cred.h linux-3.5.4-vs2.3.4.3/include/linux/cred.h
---- linux-3.5.4/include/linux/cred.h 2012-07-22 23:39:43.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/include/linux/cred.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/cred.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/cred.h
+--- linux-3.6/include/linux/cred.h 2012-07-22 23:39:43.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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 *);
/**
* get_new_cred - Get a reference on a new set of credentials
* @cred: The new credentials to reference
-diff -NurpP --minimal linux-3.5.4/include/linux/devpts_fs.h linux-3.5.4-vs2.3.4.3/include/linux/devpts_fs.h
---- linux-3.5.4/include/linux/devpts_fs.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/devpts_fs.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/devpts_fs.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/devpts_fs.h
+--- linux-3.6/include/linux/devpts_fs.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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.5.4/include/linux/fs.h linux-3.5.4-vs2.3.4.3/include/linux/fs.h
---- linux-3.5.4/include/linux/fs.h 2012-07-22 23:39:43.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/include/linux/fs.h 2012-07-23 10:22:46.000000000 +0200
-@@ -223,6 +223,9 @@ struct inodes_stat_t {
+diff -NurpP --minimal linux-3.6/include/linux/fs.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/fs.h
+--- linux-3.6/include/linux/fs.h 2012-10-04 15:27:45.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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 */
#define MS_STRICTATIME (1<<24) /* Always perform atime updates */
#define MS_NOSEC (1<<28)
#define MS_BORN (1<<29)
#define MS_ACTIVE (1<<30)
-@@ -254,6 +257,14 @@ struct inodes_stat_t {
+@@ -256,6 +259,14 @@ struct inodes_stat_t {
#define S_IMA 1024 /* Inode has an associated IMA struct */
#define S_AUTOMOUNT 2048 /* Automount/referral quasi-directory */
#define S_NOSEC 4096 /* no suid or xattr security attributes */
/*
* Note that nosuid etc flags are inode-specific: setting some file-system
-@@ -276,12 +287,15 @@ struct inodes_stat_t {
+@@ -278,12 +289,15 @@ struct inodes_stat_t {
#define IS_DIRSYNC(inode) (__IS_FLG(inode, MS_SYNCHRONOUS|MS_DIRSYNC) || \
((inode)->i_flags & (S_SYNC|S_DIRSYNC)))
#define IS_MANDLOCK(inode) __IS_FLG(inode, MS_MANDLOCK)
#define IS_POSIXACL(inode) __IS_FLG(inode, MS_POSIXACL)
#define IS_DEADDIR(inode) ((inode)->i_flags & S_DEAD)
-@@ -292,6 +306,16 @@ struct inodes_stat_t {
+@@ -294,6 +308,16 @@ struct inodes_stat_t {
#define IS_AUTOMOUNT(inode) ((inode)->i_flags & S_AUTOMOUNT)
#define IS_NOSEC(inode) ((inode)->i_flags & S_NOSEC)
/* the read-only stuff doesn't really belong here, but any other place is
probably as bad and I don't want to create yet another include file. */
-@@ -378,11 +402,14 @@ struct inodes_stat_t {
+@@ -380,11 +404,14 @@ struct inodes_stat_t {
#define FS_EXTENT_FL 0x00080000 /* Extents */
#define FS_DIRECTIO_FL 0x00100000 /* Use direct i/o */
#define FS_NOCOW_FL 0x00800000 /* Do not cow file */
#define SYNC_FILE_RANGE_WAIT_BEFORE 1
#define SYNC_FILE_RANGE_WRITE 2
-@@ -466,6 +493,7 @@ typedef void (dio_iodone_t)(struct kiocb
+@@ -472,6 +499,7 @@ typedef void (dio_iodone_t)(struct kiocb
#define ATTR_KILL_PRIV (1 << 14)
#define ATTR_OPEN (1 << 15) /* Truncating from open(O_TRUNC) */
#define ATTR_TIMES_SET (1 << 16)
/*
* This is the Inode Attributes structure, used for notify_change(). It
-@@ -481,6 +509,7 @@ struct iattr {
+@@ -487,6 +515,7 @@ struct iattr {
umode_t ia_mode;
kuid_t ia_uid;
kgid_t ia_gid;
loff_t ia_size;
struct timespec ia_atime;
struct timespec ia_mtime;
-@@ -494,6 +523,9 @@ struct iattr {
+@@ -500,6 +529,9 @@ struct iattr {
struct file *ia_file;
};
/*
* Includes for diskquotas.
*/
-@@ -773,7 +805,9 @@ struct inode {
+@@ -784,7 +816,9 @@ struct inode {
unsigned short i_opflags;
kuid_t i_uid;
kgid_t i_gid;
#ifdef CONFIG_FS_POSIX_ACL
struct posix_acl *i_acl;
-@@ -802,6 +836,7 @@ struct inode {
+@@ -813,6 +847,7 @@ struct inode {
unsigned int __i_nlink;
};
dev_t i_rdev;
loff_t i_size;
struct timespec i_atime;
struct timespec i_mtime;
-@@ -964,12 +999,12 @@ static inline void i_gid_write(struct in
+@@ -975,12 +1010,12 @@ static inline void i_gid_write(struct in
static inline unsigned iminor(const struct inode *inode)
{
}
extern struct block_device *I_BDEV(struct inode *inode);
-@@ -1036,6 +1071,7 @@ struct file {
+@@ -1047,6 +1082,7 @@ struct file {
loff_t f_pos;
struct fown_struct f_owner;
const struct cred *f_cred;
struct file_ra_state f_ra;
u64 f_version;
-@@ -1183,6 +1219,7 @@ struct file_lock {
+@@ -1194,6 +1230,7 @@ struct file_lock {
struct file *fl_file;
loff_t fl_start;
loff_t fl_end;
struct fasync_struct * fl_fasync; /* for lease break notifications */
/* for lease breaks: */
-@@ -1690,6 +1727,7 @@ struct inode_operations {
+@@ -1829,6 +1866,7 @@ struct inode_operations {
ssize_t (*getxattr) (struct dentry *, const char *, void *, size_t);
ssize_t (*listxattr) (struct dentry *, char *, size_t);
int (*removexattr) (struct dentry *, const char *);
int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start,
u64 len);
int (*update_time)(struct inode *, struct timespec *, int);
-@@ -1708,6 +1746,7 @@ extern ssize_t vfs_readv(struct file *,
+@@ -1850,6 +1888,7 @@ extern ssize_t vfs_readv(struct file *,
unsigned long, loff_t *);
extern ssize_t vfs_writev(struct file *, const struct iovec __user *,
unsigned long, loff_t *);
struct super_operations {
struct inode *(*alloc_inode)(struct super_block *sb);
-@@ -2542,6 +2581,7 @@ extern int dcache_dir_open(struct inode
+@@ -2692,6 +2731,7 @@ extern int dcache_dir_open(struct inode
extern int dcache_dir_close(struct inode *, struct file *);
extern loff_t dcache_dir_lseek(struct file *, loff_t, int);
extern int dcache_readdir(struct file *, void *, filldir_t);
extern int simple_setattr(struct dentry *, struct iattr *);
extern int simple_getattr(struct vfsmount *, struct dentry *, struct kstat *);
extern int simple_statfs(struct dentry *, struct kstatfs *);
-diff -NurpP --minimal linux-3.5.4/include/linux/gfs2_ondisk.h linux-3.5.4-vs2.3.4.3/include/linux/gfs2_ondisk.h
---- linux-3.5.4/include/linux/gfs2_ondisk.h 2012-05-21 18:07:29.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/include/linux/gfs2_ondisk.h 2012-07-23 01:45:55.000000000 +0200
-@@ -214,6 +214,9 @@ enum {
- gfs2fl_NoAtime = 7,
+diff -NurpP --minimal linux-3.6/include/linux/gfs2_ondisk.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/gfs2_ondisk.h
+--- linux-3.6/include/linux/gfs2_ondisk.h 2012-10-04 15:27:45.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/gfs2_ondisk.h 2012-10-04 18:54:29.000000000 +0200
+@@ -225,6 +225,9 @@ enum {
gfs2fl_Sync = 8,
gfs2fl_System = 9,
+ gfs2fl_TopLevel = 10,
+ gfs2fl_IXUnlink = 16,
+ gfs2fl_Barrier = 17,
+ gfs2fl_Cow = 18,
gfs2fl_TruncInProg = 29,
gfs2fl_InheritDirectio = 30,
gfs2fl_InheritJdata = 31,
-@@ -230,6 +233,9 @@ enum {
- #define GFS2_DIF_NOATIME 0x00000080
+@@ -242,6 +245,9 @@ enum {
#define GFS2_DIF_SYNC 0x00000100
#define GFS2_DIF_SYSTEM 0x00000200 /* New in gfs2 */
+ #define GFS2_DIF_TOPDIR 0x00000400 /* New in gfs2 */
+#define GFS2_DIF_IXUNLINK 0x00010000
+#define GFS2_DIF_BARRIER 0x00020000
+#define GFS2_DIF_COW 0x00040000
#define GFS2_DIF_TRUNC_IN_PROG 0x20000000 /* New in gfs2 */
- #define GFS2_DIF_INHERIT_DIRECTIO 0x40000000
+ #define GFS2_DIF_INHERIT_DIRECTIO 0x40000000 /* only in gfs1 */
#define GFS2_DIF_INHERIT_JDATA 0x80000000
-diff -NurpP --minimal linux-3.5.4/include/linux/if_tun.h linux-3.5.4-vs2.3.4.3/include/linux/if_tun.h
---- linux-3.5.4/include/linux/if_tun.h 2010-08-02 16:52:54.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/include/linux/if_tun.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/if_tun.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/if_tun.h
+--- linux-3.6/include/linux/if_tun.h 2010-08-02 16:52:54.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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)
/* TUNSETIFF ifr flags */
#define IFF_TUN 0x0001
-diff -NurpP --minimal linux-3.5.4/include/linux/init_task.h linux-3.5.4-vs2.3.4.3/include/linux/init_task.h
---- linux-3.5.4/include/linux/init_task.h 2012-07-22 23:39:43.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/include/linux/init_task.h 2012-07-23 01:45:55.000000000 +0200
-@@ -200,6 +200,10 @@ extern struct cred init_cred;
+diff -NurpP --minimal linux-3.6/include/linux/init_task.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/init_task.h
+--- linux-3.6/include/linux/init_task.h 2012-10-04 15:27:45.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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) \
INIT_CPUSET_SEQ \
}
-diff -NurpP --minimal linux-3.5.4/include/linux/ipc.h linux-3.5.4-vs2.3.4.3/include/linux/ipc.h
---- linux-3.5.4/include/linux/ipc.h 2012-03-19 19:47:28.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/ipc.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/ipc.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/ipc.h
+--- linux-3.6/include/linux/ipc.h 2012-03-19 19:47:28.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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;
uid_t cuid;
gid_t cgid;
umode_t mode;
-diff -NurpP --minimal linux-3.5.4/include/linux/ipc_namespace.h linux-3.5.4-vs2.3.4.3/include/linux/ipc_namespace.h
---- linux-3.5.4/include/linux/ipc_namespace.h 2012-07-22 23:39:43.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/include/linux/ipc_namespace.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/ipc_namespace.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/ipc_namespace.h
+--- linux-3.6/include/linux/ipc_namespace.h 2012-07-22 23:39:43.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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)
}
static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns)
-diff -NurpP --minimal linux-3.5.4/include/linux/loop.h linux-3.5.4-vs2.3.4.3/include/linux/loop.h
---- linux-3.5.4/include/linux/loop.h 2012-01-09 16:14:58.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/loop.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/loop.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/loop.h
+--- linux-3.6/include/linux/loop.h 2012-01-09 16:14:58.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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];
int (*ioctl)(struct loop_device *, int cmd,
unsigned long arg);
-diff -NurpP --minimal linux-3.5.4/include/linux/magic.h linux-3.5.4-vs2.3.4.3/include/linux/magic.h
---- linux-3.5.4/include/linux/magic.h 2012-05-21 18:07:31.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/include/linux/magic.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/magic.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/magic.h
+--- linux-3.6/include/linux/magic.h 2012-05-21 18:07:31.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/magic.h 2012-10-04 18:47:00.000000000 +0200
@@ -3,7 +3,7 @@
#define ADFS_SUPER_MAGIC 0xadf5
#define AUTOFS_SUPER_MAGIC 0x0187
#define CODA_SUPER_MAGIC 0x73757245
#define CRAMFS_MAGIC 0x28cd3d45 /* some random number */
-diff -NurpP --minimal linux-3.5.4/include/linux/major.h linux-3.5.4-vs2.3.4.3/include/linux/major.h
---- linux-3.5.4/include/linux/major.h 2009-09-10 15:26:25.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/include/linux/major.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/major.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/major.h
+--- linux-3.6/include/linux/major.h 2009-09-10 15:26:25.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
#define TTYAUX_MAJOR 5
#define LP_MAJOR 6
#define VCS_MAJOR 7
-diff -NurpP --minimal linux-3.5.4/include/linux/memcontrol.h linux-3.5.4-vs2.3.4.3/include/linux/memcontrol.h
---- linux-3.5.4/include/linux/memcontrol.h 2012-07-22 23:39:43.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/include/linux/memcontrol.h 2012-07-23 01:45:55.000000000 +0200
-@@ -85,6 +85,13 @@ extern struct mem_cgroup *try_get_mem_cg
+diff -NurpP --minimal linux-3.6/include/linux/memcontrol.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/memcontrol.h
+--- linux-3.6/include/linux/memcontrol.h 2012-10-04 15:27:45.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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);
static inline
int mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *cgroup)
{
-diff -NurpP --minimal linux-3.5.4/include/linux/mm_types.h linux-3.5.4-vs2.3.4.3/include/linux/mm_types.h
---- linux-3.5.4/include/linux/mm_types.h 2012-07-22 23:39:44.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/include/linux/mm_types.h 2012-07-23 01:45:55.000000000 +0200
-@@ -354,6 +354,7 @@ struct mm_struct {
+diff -NurpP --minimal linux-3.6/include/linux/mm_types.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/mm_types.h
+--- linux-3.6/include/linux/mm_types.h 2012-10-04 15:27:46.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/mm_types.h 2012-10-04 18:47:00.000000000 +0200
+@@ -370,6 +370,7 @@ struct mm_struct {
/* Architecture-specific MM context */
mm_context_t context;
unsigned long flags; /* Must use atomic bitops to access the bits */
-diff -NurpP --minimal linux-3.5.4/include/linux/mmzone.h linux-3.5.4-vs2.3.4.3/include/linux/mmzone.h
---- linux-3.5.4/include/linux/mmzone.h 2012-07-22 23:39:44.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/include/linux/mmzone.h 2012-07-23 01:45:55.000000000 +0200
-@@ -715,6 +715,13 @@ typedef struct pglist_data {
+diff -NurpP --minimal linux-3.6/include/linux/mmzone.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/mmzone.h
+--- linux-3.6/include/linux/mmzone.h 2012-10-04 15:27:46.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/mmzone.h 2012-10-04 18:47:00.000000000 +0200
+@@ -727,6 +727,13 @@ typedef struct pglist_data {
__pgdat->node_start_pfn + __pgdat->node_spanned_pages;\
})
#include <linux/memory_hotplug.h>
extern struct mutex zonelists_mutex;
-diff -NurpP --minimal linux-3.5.4/include/linux/mount.h linux-3.5.4-vs2.3.4.3/include/linux/mount.h
---- linux-3.5.4/include/linux/mount.h 2012-03-19 19:47:28.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/mount.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/mount.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/mount.h
+--- linux-3.6/include/linux/mount.h 2012-03-19 19:47:28.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/mount.h 2012-10-04 18:47:00.000000000 +0200
@@ -47,6 +47,9 @@ struct mnt_namespace;
#define MNT_INTERNAL 0x4000
struct vfsmount {
struct dentry *mnt_root; /* root of the mounted tree */
struct super_block *mnt_sb; /* pointer to superblock */
-diff -NurpP --minimal linux-3.5.4/include/linux/net.h linux-3.5.4-vs2.3.4.3/include/linux/net.h
---- linux-3.5.4/include/linux/net.h 2012-09-16 20:46:31.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/include/linux/net.h 2012-08-11 15:16:09.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/net.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/net.h
+--- linux-3.6/include/linux/net.h 2012-10-04 15:27:46.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
#ifndef ARCH_HAS_SOCKET_TYPES
/**
-diff -NurpP --minimal linux-3.5.4/include/linux/netdevice.h linux-3.5.4-vs2.3.4.3/include/linux/netdevice.h
---- linux-3.5.4/include/linux/netdevice.h 2012-07-22 23:39:44.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/include/linux/netdevice.h 2012-07-23 01:45:55.000000000 +0200
-@@ -1644,6 +1644,7 @@ extern void netdev_resync_ops(struct ne
+diff -NurpP --minimal linux-3.6/include/linux/netdevice.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/netdevice.h
+--- linux-3.6/include/linux/netdevice.h 2012-10-04 15:27:46.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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);
extern struct net_device *__dev_get_by_index(struct net *net, int ifindex);
extern struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex);
extern int dev_restart(struct net_device *dev);
#ifdef CONFIG_NETPOLL_TRAP
-diff -NurpP --minimal linux-3.5.4/include/linux/nfs_mount.h linux-3.5.4-vs2.3.4.3/include/linux/nfs_mount.h
---- linux-3.5.4/include/linux/nfs_mount.h 2011-01-05 21:50:31.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/nfs_mount.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/nfs_mount.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/nfs_mount.h
+--- linux-3.6/include/linux/nfs_mount.h 2011-01-05 21:50:31.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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 */
/* The following are for internal use only */
#define NFS_MOUNT_LOOKUP_CACHE_NONEG 0x10000
-diff -NurpP --minimal linux-3.5.4/include/linux/nsproxy.h linux-3.5.4-vs2.3.4.3/include/linux/nsproxy.h
---- linux-3.5.4/include/linux/nsproxy.h 2011-10-24 18:45:32.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/include/linux/nsproxy.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/nsproxy.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/nsproxy.h
+--- linux-3.6/include/linux/nsproxy.h 2011-10-24 18:45:32.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/nsproxy.h 2012-10-04 18:47:00.000000000 +0200
@@ -3,6 +3,7 @@
#include <linux/spinlock.h>
}
#endif
-diff -NurpP --minimal linux-3.5.4/include/linux/pid.h linux-3.5.4-vs2.3.4.3/include/linux/pid.h
---- linux-3.5.4/include/linux/pid.h 2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/include/linux/pid.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/pid.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/pid.h
+--- linux-3.6/include/linux/pid.h 2011-07-22 11:18:11.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/pid.h 2012-10-04 18:47:00.000000000 +0200
@@ -8,7 +8,8 @@ enum pid_type
PIDTYPE_PID,
PIDTYPE_PGID,
pid_t pid_vnr(struct pid *pid);
#define do_each_pid_task(pid, type, task) \
-diff -NurpP --minimal linux-3.5.4/include/linux/proc_fs.h linux-3.5.4-vs2.3.4.3/include/linux/proc_fs.h
---- linux-3.5.4/include/linux/proc_fs.h 2012-07-22 23:39:44.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/include/linux/proc_fs.h 2012-07-23 10:20:57.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/proc_fs.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/proc_fs.h
+--- linux-3.6/include/linux/proc_fs.h 2012-07-22 23:39:44.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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;
int fd;
union proc_op op;
struct proc_dir_entry *pde;
-diff -NurpP --minimal linux-3.5.4/include/linux/quotaops.h linux-3.5.4-vs2.3.4.3/include/linux/quotaops.h
---- linux-3.5.4/include/linux/quotaops.h 2012-07-22 23:39:44.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/include/linux/quotaops.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/quotaops.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/quotaops.h
+--- linux-3.6/include/linux/quotaops.h 2012-10-04 15:27:46.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/quotaops.h 2012-10-04 18:47:00.000000000 +0200
@@ -8,6 +8,7 @@
#define _LINUX_QUOTAOPS_
#define DQUOT_SPACE_WARN 0x1
#define DQUOT_SPACE_RESERVE 0x2
-@@ -204,11 +205,12 @@ static inline void dquot_drop(struct ino
+@@ -205,11 +206,12 @@ static inline void dquot_drop(struct ino
static inline int dquot_alloc_inode(const struct inode *inode)
{
}
static inline int dquot_transfer(struct inode *inode, struct iattr *iattr)
-@@ -219,6 +221,10 @@ static inline int dquot_transfer(struct
+@@ -220,6 +222,10 @@ static inline int dquot_transfer(struct
static inline int __dquot_alloc_space(struct inode *inode, qsize_t number,
int flags)
{
if (!(flags & DQUOT_SPACE_RESERVE))
inode_add_bytes(inode, number);
return 0;
-@@ -229,6 +235,7 @@ static inline void __dquot_free_space(st
+@@ -230,6 +236,7 @@ static inline void __dquot_free_space(st
{
if (!(flags & DQUOT_SPACE_RESERVE))
inode_sub_bytes(inode, number);
}
static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
-diff -NurpP --minimal linux-3.5.4/include/linux/reboot.h linux-3.5.4-vs2.3.4.3/include/linux/reboot.h
---- linux-3.5.4/include/linux/reboot.h 2011-10-24 18:45:32.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/include/linux/reboot.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/reboot.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/reboot.h
+--- linux-3.6/include/linux/reboot.h 2011-10-24 18:45:32.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
#ifdef __KERNEL__
-diff -NurpP --minimal linux-3.5.4/include/linux/sched.h linux-3.5.4-vs2.3.4.3/include/linux/sched.h
---- linux-3.5.4/include/linux/sched.h 2012-07-22 23:39:44.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/include/linux/sched.h 2012-07-23 01:45:55.000000000 +0200
-@@ -1414,6 +1414,14 @@ struct task_struct {
+diff -NurpP --minimal linux-3.6/include/linux/sched.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/sched.h
+--- linux-3.6/include/linux/sched.h 2012-10-04 15:27:46.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/sched.h 2012-10-04 18:47:00.000000000 +0200
+@@ -1422,6 +1422,14 @@ struct task_struct {
#endif
struct seccomp seccomp;
/* Thread group tracking */
u32 parent_exec_id;
u32 self_exec_id;
-@@ -1662,6 +1670,11 @@ struct pid_namespace;
+@@ -1668,6 +1676,11 @@ struct pid_namespace;
pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
struct pid_namespace *ns);
static inline pid_t task_pid_nr(struct task_struct *tsk)
{
return tsk->pid;
-@@ -1675,7 +1688,8 @@ static inline pid_t task_pid_nr_ns(struc
+@@ -1681,7 +1694,8 @@ static inline pid_t task_pid_nr_ns(struc
static inline pid_t task_pid_vnr(struct task_struct *tsk)
{
}
-@@ -1688,7 +1702,7 @@ pid_t task_tgid_nr_ns(struct task_struct
+@@ -1694,7 +1708,7 @@ pid_t task_tgid_nr_ns(struct task_struct
static inline pid_t task_tgid_vnr(struct task_struct *tsk)
{
}
-diff -NurpP --minimal linux-3.5.4/include/linux/shmem_fs.h linux-3.5.4-vs2.3.4.3/include/linux/shmem_fs.h
---- linux-3.5.4/include/linux/shmem_fs.h 2012-07-22 23:39:44.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/include/linux/shmem_fs.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/shmem_fs.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/shmem_fs.h
+--- linux-3.6/include/linux/shmem_fs.h 2012-07-22 23:39:44.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/shmem_fs.h 2012-10-04 18:47:00.000000000 +0200
@@ -8,6 +8,9 @@
/* inode in-kernel data */
struct shmem_inode_info {
spinlock_t lock;
unsigned long flags;
-diff -NurpP --minimal linux-3.5.4/include/linux/stat.h linux-3.5.4-vs2.3.4.3/include/linux/stat.h
---- linux-3.5.4/include/linux/stat.h 2012-07-22 23:39:44.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/include/linux/stat.h 2012-07-23 10:23:18.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/stat.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/stat.h
+--- linux-3.6/include/linux/stat.h 2012-07-22 23:39:44.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/stat.h 2012-10-04 18:47:00.000000000 +0200
@@ -67,6 +67,7 @@ struct kstat {
unsigned int nlink;
kuid_t uid;
dev_t rdev;
loff_t size;
struct timespec atime;
-diff -NurpP --minimal linux-3.5.4/include/linux/sunrpc/auth.h linux-3.5.4-vs2.3.4.3/include/linux/sunrpc/auth.h
---- linux-3.5.4/include/linux/sunrpc/auth.h 2012-05-21 18:07:32.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/include/linux/sunrpc/auth.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/sunrpc/auth.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/sunrpc/auth.h
+--- linux-3.6/include/linux/sunrpc/auth.h 2012-10-04 15:27:46.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/sunrpc/auth.h 2012-10-04 18:47:00.000000000 +0200
@@ -25,6 +25,7 @@
struct auth_cred {
uid_t uid;
struct group_info *group_info;
const char *principal;
unsigned char machine_cred : 1;
-diff -NurpP --minimal linux-3.5.4/include/linux/sunrpc/clnt.h linux-3.5.4-vs2.3.4.3/include/linux/sunrpc/clnt.h
---- linux-3.5.4/include/linux/sunrpc/clnt.h 2012-05-21 18:07:32.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/include/linux/sunrpc/clnt.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/sunrpc/clnt.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/sunrpc/clnt.h
+--- linux-3.6/include/linux/sunrpc/clnt.h 2012-05-21 18:07:32.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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 */
struct rpc_rtt * cl_rtt; /* RTO estimator data */
const struct rpc_timeout *cl_timeout; /* Timeout strategy */
-diff -NurpP --minimal linux-3.5.4/include/linux/sysctl.h linux-3.5.4-vs2.3.4.3/include/linux/sysctl.h
---- linux-3.5.4/include/linux/sysctl.h 2012-05-21 18:07:32.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/include/linux/sysctl.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/sysctl.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/sysctl.h
+--- linux-3.6/include/linux/sysctl.h 2012-05-21 18:07:32.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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) */
KERN_SPARC_REBOOT=21, /* reboot command on Sparc */
KERN_CTLALTDEL=22, /* int: allow ctl-alt-del to reboot */
-diff -NurpP --minimal linux-3.5.4/include/linux/sysfs.h linux-3.5.4-vs2.3.4.3/include/linux/sysfs.h
---- linux-3.5.4/include/linux/sysfs.h 2012-07-22 23:39:44.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/include/linux/sysfs.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/sysfs.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/sysfs.h
+--- linux-3.6/include/linux/sysfs.h 2012-07-22 23:39:44.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/sysfs.h 2012-10-04 18:47:00.000000000 +0200
@@ -19,6 +19,8 @@
#include <linux/kobject_ns.h>
#include <linux/atomic.h>
struct kobject;
struct module;
enum kobj_ns_type;
-diff -NurpP --minimal linux-3.5.4/include/linux/time.h linux-3.5.4-vs2.3.4.3/include/linux/time.h
---- linux-3.5.4/include/linux/time.h 2012-09-16 20:46:31.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/include/linux/time.h 2012-08-11 15:15:02.000000000 +0200
-@@ -255,6 +255,8 @@ static __always_inline void timespec_add
+diff -NurpP --minimal linux-3.6/include/linux/time.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/time.h
+--- linux-3.6/include/linux/time.h 2012-10-04 15:27:46.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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;
}
#endif /* __KERNEL__ */
/*
-diff -NurpP --minimal linux-3.5.4/include/linux/types.h linux-3.5.4-vs2.3.4.3/include/linux/types.h
---- linux-3.5.4/include/linux/types.h 2012-07-22 23:39:45.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/include/linux/types.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/types.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/types.h
+--- linux-3.6/include/linux/types.h 2012-10-04 15:27:47.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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 unsigned long uintptr_t;
-diff -NurpP --minimal linux-3.5.4/include/linux/utsname.h linux-3.5.4-vs2.3.4.3/include/linux/utsname.h
---- linux-3.5.4/include/linux/utsname.h 2012-01-09 16:14:59.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/utsname.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/utsname.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/utsname.h
+--- linux-3.6/include/linux/utsname.h 2012-01-09 16:14:59.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/utsname.h 2012-10-04 18:47:00.000000000 +0200
@@ -62,7 +62,8 @@ static inline void get_uts_ns(struct uts
}
}
#endif
-diff -NurpP --minimal linux-3.5.4/include/linux/vroot.h linux-3.5.4-vs2.3.4.3/include/linux/vroot.h
---- linux-3.5.4/include/linux/vroot.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vroot.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vroot.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vroot.h
+--- linux-3.6/include/linux/vroot.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vroot.h 2012-10-04 18:47:00.000000000 +0200
@@ -0,0 +1,51 @@
+
+/*
+#define VROOT_CLR_DEV 0x5601
+
+#endif /* _LINUX_VROOT_H */
-diff -NurpP --minimal linux-3.5.4/include/linux/vs_base.h linux-3.5.4-vs2.3.4.3/include/linux/vs_base.h
---- linux-3.5.4/include/linux/vs_base.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vs_base.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vs_base.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vs_base.h
+--- linux-3.6/include/linux/vs_base.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.5.4/include/linux/vs_context.h linux-3.5.4-vs2.3.4.3/include/linux/vs_context.h
---- linux-3.5.4/include/linux/vs_context.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vs_context.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vs_context.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vs_context.h
+--- linux-3.6/include/linux/vs_context.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.5.4/include/linux/vs_cowbl.h linux-3.5.4-vs2.3.4.3/include/linux/vs_cowbl.h
---- linux-3.5.4/include/linux/vs_cowbl.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vs_cowbl.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vs_cowbl.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vs_cowbl.h
+--- linux-3.6/include/linux/vs_cowbl.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.5.4/include/linux/vs_cvirt.h linux-3.5.4-vs2.3.4.3/include/linux/vs_cvirt.h
---- linux-3.5.4/include/linux/vs_cvirt.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vs_cvirt.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vs_cvirt.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vs_cvirt.h
+--- linux-3.6/include/linux/vs_cvirt.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.5.4/include/linux/vs_device.h linux-3.5.4-vs2.3.4.3/include/linux/vs_device.h
---- linux-3.5.4/include/linux/vs_device.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vs_device.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vs_device.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vs_device.h
+--- linux-3.6/include/linux/vs_device.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.5.4/include/linux/vs_dlimit.h linux-3.5.4-vs2.3.4.3/include/linux/vs_dlimit.h
---- linux-3.5.4/include/linux/vs_dlimit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vs_dlimit.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vs_dlimit.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vs_dlimit.h
+--- linux-3.6/include/linux/vs_dlimit.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.5.4/include/linux/vs_inet.h linux-3.5.4-vs2.3.4.3/include/linux/vs_inet.h
---- linux-3.5.4/include/linux/vs_inet.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vs_inet.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vs_inet.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vs_inet.h
+--- linux-3.6/include/linux/vs_inet.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+#else
+// #warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.5.4/include/linux/vs_inet6.h linux-3.5.4-vs2.3.4.3/include/linux/vs_inet6.h
---- linux-3.5.4/include/linux/vs_inet6.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vs_inet6.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vs_inet6.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vs_inet6.h
+--- linux-3.6/include/linux/vs_inet6.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.5.4/include/linux/vs_limit.h linux-3.5.4-vs2.3.4.3/include/linux/vs_limit.h
---- linux-3.5.4/include/linux/vs_limit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vs_limit.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vs_limit.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vs_limit.h
+--- linux-3.6/include/linux/vs_limit.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.5.4/include/linux/vs_network.h linux-3.5.4-vs2.3.4.3/include/linux/vs_network.h
---- linux-3.5.4/include/linux/vs_network.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vs_network.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vs_network.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vs_network.h
+--- linux-3.6/include/linux/vs_network.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.5.4/include/linux/vs_pid.h linux-3.5.4-vs2.3.4.3/include/linux/vs_pid.h
---- linux-3.5.4/include/linux/vs_pid.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vs_pid.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vs_pid.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vs_pid.h
+--- linux-3.6/include/linux/vs_pid.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.5.4/include/linux/vs_sched.h linux-3.5.4-vs2.3.4.3/include/linux/vs_sched.h
---- linux-3.5.4/include/linux/vs_sched.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vs_sched.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vs_sched.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vs_sched.h
+--- linux-3.6/include/linux/vs_sched.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.5.4/include/linux/vs_socket.h linux-3.5.4-vs2.3.4.3/include/linux/vs_socket.h
---- linux-3.5.4/include/linux/vs_socket.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vs_socket.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vs_socket.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vs_socket.h
+--- linux-3.6/include/linux/vs_socket.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.5.4/include/linux/vs_tag.h linux-3.5.4-vs2.3.4.3/include/linux/vs_tag.h
---- linux-3.5.4/include/linux/vs_tag.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vs_tag.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vs_tag.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vs_tag.h
+--- linux-3.6/include/linux/vs_tag.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.5.4/include/linux/vs_time.h linux-3.5.4-vs2.3.4.3/include/linux/vs_time.h
---- linux-3.5.4/include/linux/vs_time.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vs_time.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vs_time.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vs_time.h
+--- linux-3.6/include/linux/vs_time.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.5.4/include/linux/vserver/Kbuild linux-3.5.4-vs2.3.4.3/include/linux/vserver/Kbuild
---- linux-3.5.4/include/linux/vserver/Kbuild 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vserver/Kbuild 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/Kbuild linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/Kbuild
+--- linux-3.6/include/linux/vserver/Kbuild 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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 \
+
+header-y += switch.h network.h monitor.h inode.h device.h
+
-diff -NurpP --minimal linux-3.5.4/include/linux/vserver/base.h linux-3.5.4-vs2.3.4.3/include/linux/vserver/base.h
---- linux-3.5.4/include/linux/vserver/base.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vserver/base.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/base.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/base.h
+--- linux-3.6/include/linux/vserver/base.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+#define nx_info_state(n, m) (__nx_state(n) & (m))
+
+#endif
-diff -NurpP --minimal linux-3.5.4/include/linux/vserver/cacct.h linux-3.5.4-vs2.3.4.3/include/linux/vserver/cacct.h
---- linux-3.5.4/include/linux/vserver/cacct.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vserver/cacct.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/cacct.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/cacct.h
+--- linux-3.6/include/linux/vserver/cacct.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+};
+
+#endif /* _VX_CACCT_H */
-diff -NurpP --minimal linux-3.5.4/include/linux/vserver/cacct_cmd.h linux-3.5.4-vs2.3.4.3/include/linux/vserver/cacct_cmd.h
---- linux-3.5.4/include/linux/vserver/cacct_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vserver/cacct_cmd.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/cacct_cmd.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/cacct_cmd.h
+--- linux-3.6/include/linux/vserver/cacct_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CACCT_CMD_H */
-diff -NurpP --minimal linux-3.5.4/include/linux/vserver/cacct_def.h linux-3.5.4-vs2.3.4.3/include/linux/vserver/cacct_def.h
---- linux-3.5.4/include/linux/vserver/cacct_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vserver/cacct_def.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/cacct_def.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/cacct_def.h
+--- linux-3.6/include/linux/vserver/cacct_def.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+#endif
+
+#endif /* _VX_CACCT_DEF_H */
-diff -NurpP --minimal linux-3.5.4/include/linux/vserver/cacct_int.h linux-3.5.4-vs2.3.4.3/include/linux/vserver/cacct_int.h
---- linux-3.5.4/include/linux/vserver/cacct_int.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vserver/cacct_int.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/cacct_int.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/cacct_int.h
+--- linux-3.6/include/linux/vserver/cacct_int.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CACCT_INT_H */
-diff -NurpP --minimal linux-3.5.4/include/linux/vserver/check.h linux-3.5.4-vs2.3.4.3/include/linux/vserver/check.h
---- linux-3.5.4/include/linux/vserver/check.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vserver/check.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/check.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/check.h
+--- linux-3.6/include/linux/vserver/check.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1)
+
+#endif
-diff -NurpP --minimal linux-3.5.4/include/linux/vserver/context.h linux-3.5.4-vs2.3.4.3/include/linux/vserver/context.h
---- linux-3.5.4/include/linux/vserver/context.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vserver/context.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/context.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/context.h
+--- linux-3.6/include/linux/vserver/context.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_H */
-diff -NurpP --minimal linux-3.5.4/include/linux/vserver/context_cmd.h linux-3.5.4-vs2.3.4.3/include/linux/vserver/context_cmd.h
---- linux-3.5.4/include/linux/vserver/context_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vserver/context_cmd.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/context_cmd.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/context_cmd.h
+--- linux-3.6/include/linux/vserver/context_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-3.5.4/include/linux/vserver/cvirt.h linux-3.5.4-vs2.3.4.3/include/linux/vserver/cvirt.h
---- linux-3.5.4/include/linux/vserver/cvirt.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vserver/cvirt.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/cvirt.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/cvirt.h
+--- linux-3.6/include/linux/vserver/cvirt.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CVIRT_H */
-diff -NurpP --minimal linux-3.5.4/include/linux/vserver/cvirt_cmd.h linux-3.5.4-vs2.3.4.3/include/linux/vserver/cvirt_cmd.h
---- linux-3.5.4/include/linux/vserver/cvirt_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vserver/cvirt_cmd.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/cvirt_cmd.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/cvirt_cmd.h
+--- linux-3.6/include/linux/vserver/cvirt_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CVIRT_CMD_H */
-diff -NurpP --minimal linux-3.5.4/include/linux/vserver/cvirt_def.h linux-3.5.4-vs2.3.4.3/include/linux/vserver/cvirt_def.h
---- linux-3.5.4/include/linux/vserver/cvirt_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vserver/cvirt_def.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/cvirt_def.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/cvirt_def.h
+--- linux-3.6/include/linux/vserver/cvirt_def.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+#endif
+
+#endif /* _VX_CVIRT_DEF_H */
-diff -NurpP --minimal linux-3.5.4/include/linux/vserver/debug.h linux-3.5.4-vs2.3.4.3/include/linux/vserver/debug.h
---- linux-3.5.4/include/linux/vserver/debug.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vserver/debug.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/debug.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/debug.h
+--- linux-3.6/include/linux/vserver/debug.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+
+
+#endif /* _VX_DEBUG_H */
-diff -NurpP --minimal linux-3.5.4/include/linux/vserver/debug_cmd.h linux-3.5.4-vs2.3.4.3/include/linux/vserver/debug_cmd.h
---- linux-3.5.4/include/linux/vserver/debug_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vserver/debug_cmd.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/debug_cmd.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/debug_cmd.h
+--- linux-3.6/include/linux/vserver/debug_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+
+#endif /* __KERNEL__ */
+#endif /* _VX_DEBUG_CMD_H */
-diff -NurpP --minimal linux-3.5.4/include/linux/vserver/device.h linux-3.5.4-vs2.3.4.3/include/linux/vserver/device.h
---- linux-3.5.4/include/linux/vserver/device.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vserver/device.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/device.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/device.h
+--- linux-3.6/include/linux/vserver/device.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+#else /* _VX_DEVICE_H */
+#warning duplicate inclusion
+#endif /* _VX_DEVICE_H */
-diff -NurpP --minimal linux-3.5.4/include/linux/vserver/device_cmd.h linux-3.5.4-vs2.3.4.3/include/linux/vserver/device_cmd.h
---- linux-3.5.4/include/linux/vserver/device_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vserver/device_cmd.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/device_cmd.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/device_cmd.h
+--- linux-3.6/include/linux/vserver/device_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+
+#endif /* __KERNEL__ */
+#endif /* _VX_DEVICE_CMD_H */
-diff -NurpP --minimal linux-3.5.4/include/linux/vserver/device_def.h linux-3.5.4-vs2.3.4.3/include/linux/vserver/device_def.h
---- linux-3.5.4/include/linux/vserver/device_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vserver/device_def.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/device_def.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/device_def.h
+--- linux-3.6/include/linux/vserver/device_def.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+};
+
+#endif /* _VX_DEVICE_DEF_H */
-diff -NurpP --minimal linux-3.5.4/include/linux/vserver/dlimit.h linux-3.5.4-vs2.3.4.3/include/linux/vserver/dlimit.h
---- linux-3.5.4/include/linux/vserver/dlimit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vserver/dlimit.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/dlimit.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/dlimit.h
+--- linux-3.6/include/linux/vserver/dlimit.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+#else /* _VX_DLIMIT_H */
+#warning duplicate inclusion
+#endif /* _VX_DLIMIT_H */
-diff -NurpP --minimal linux-3.5.4/include/linux/vserver/dlimit_cmd.h linux-3.5.4-vs2.3.4.3/include/linux/vserver/dlimit_cmd.h
---- linux-3.5.4/include/linux/vserver/dlimit_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vserver/dlimit_cmd.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/dlimit_cmd.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/dlimit_cmd.h
+--- linux-3.6/include/linux/vserver/dlimit_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+
+#endif /* __KERNEL__ */
+#endif /* _VX_DLIMIT_CMD_H */
-diff -NurpP --minimal linux-3.5.4/include/linux/vserver/global.h linux-3.5.4-vs2.3.4.3/include/linux/vserver/global.h
---- linux-3.5.4/include/linux/vserver/global.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vserver/global.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/global.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/global.h
+--- linux-3.6/include/linux/vserver/global.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+
+
+#endif /* _VX_GLOBAL_H */
-diff -NurpP --minimal linux-3.5.4/include/linux/vserver/history.h linux-3.5.4-vs2.3.4.3/include/linux/vserver/history.h
---- linux-3.5.4/include/linux/vserver/history.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vserver/history.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/history.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/history.h
+--- linux-3.6/include/linux/vserver/history.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+#endif /* CONFIG_VSERVER_HISTORY */
+
+#endif /* _VX_HISTORY_H */
-diff -NurpP --minimal linux-3.5.4/include/linux/vserver/inode.h linux-3.5.4-vs2.3.4.3/include/linux/vserver/inode.h
---- linux-3.5.4/include/linux/vserver/inode.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vserver/inode.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/inode.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/inode.h
+--- linux-3.6/include/linux/vserver/inode.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+#else /* _VX_INODE_H */
+#warning duplicate inclusion
+#endif /* _VX_INODE_H */
-diff -NurpP --minimal linux-3.5.4/include/linux/vserver/inode_cmd.h linux-3.5.4-vs2.3.4.3/include/linux/vserver/inode_cmd.h
---- linux-3.5.4/include/linux/vserver/inode_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vserver/inode_cmd.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/inode_cmd.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/inode_cmd.h
+--- linux-3.6/include/linux/vserver/inode_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+
+#endif /* __KERNEL__ */
+#endif /* _VX_INODE_CMD_H */
-diff -NurpP --minimal linux-3.5.4/include/linux/vserver/limit.h linux-3.5.4-vs2.3.4.3/include/linux/vserver/limit.h
---- linux-3.5.4/include/linux/vserver/limit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vserver/limit.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/limit.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/limit.h
+--- linux-3.6/include/linux/vserver/limit.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_H */
-diff -NurpP --minimal linux-3.5.4/include/linux/vserver/limit_cmd.h linux-3.5.4-vs2.3.4.3/include/linux/vserver/limit_cmd.h
---- linux-3.5.4/include/linux/vserver/limit_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vserver/limit_cmd.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/limit_cmd.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/limit_cmd.h
+--- linux-3.6/include/linux/vserver/limit_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_CMD_H */
-diff -NurpP --minimal linux-3.5.4/include/linux/vserver/limit_def.h linux-3.5.4-vs2.3.4.3/include/linux/vserver/limit_def.h
---- linux-3.5.4/include/linux/vserver/limit_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vserver/limit_def.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/limit_def.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/limit_def.h
+--- linux-3.6/include/linux/vserver/limit_def.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+#endif
+
+#endif /* _VX_LIMIT_DEF_H */
-diff -NurpP --minimal linux-3.5.4/include/linux/vserver/limit_int.h linux-3.5.4-vs2.3.4.3/include/linux/vserver/limit_int.h
---- linux-3.5.4/include/linux/vserver/limit_int.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vserver/limit_int.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/limit_int.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/limit_int.h
+--- linux-3.6/include/linux/vserver/limit_int.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_INT_H */
-diff -NurpP --minimal linux-3.5.4/include/linux/vserver/monitor.h linux-3.5.4-vs2.3.4.3/include/linux/vserver/monitor.h
---- linux-3.5.4/include/linux/vserver/monitor.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vserver/monitor.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/monitor.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/monitor.h
+--- linux-3.6/include/linux/vserver/monitor.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+
+
+#endif /* _VX_MONITOR_H */
-diff -NurpP --minimal linux-3.5.4/include/linux/vserver/network.h linux-3.5.4-vs2.3.4.3/include/linux/vserver/network.h
---- linux-3.5.4/include/linux/vserver/network.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vserver/network.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/network.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/network.h
+--- linux-3.6/include/linux/vserver/network.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+
+#endif /* __KERNEL__ */
+#endif /* _VX_NETWORK_H */
-diff -NurpP --minimal linux-3.5.4/include/linux/vserver/network_cmd.h linux-3.5.4-vs2.3.4.3/include/linux/vserver/network_cmd.h
---- linux-3.5.4/include/linux/vserver/network_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vserver/network_cmd.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/network_cmd.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/network_cmd.h
+--- linux-3.6/include/linux/vserver/network_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-3.5.4/include/linux/vserver/percpu.h linux-3.5.4-vs2.3.4.3/include/linux/vserver/percpu.h
---- linux-3.5.4/include/linux/vserver/percpu.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vserver/percpu.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/percpu.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/percpu.h
+--- linux-3.6/include/linux/vserver/percpu.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+#define PERCPU_PERCTX (sizeof(struct _vx_percpu))
+
+#endif /* _VX_PERCPU_H */
-diff -NurpP --minimal linux-3.5.4/include/linux/vserver/pid.h linux-3.5.4-vs2.3.4.3/include/linux/vserver/pid.h
---- linux-3.5.4/include/linux/vserver/pid.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vserver/pid.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/pid.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/pid.h
+--- linux-3.6/include/linux/vserver/pid.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+}
+
+#endif
-diff -NurpP --minimal linux-3.5.4/include/linux/vserver/sched.h linux-3.5.4-vs2.3.4.3/include/linux/vserver/sched.h
---- linux-3.5.4/include/linux/vserver/sched.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vserver/sched.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/sched.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/sched.h
+--- linux-3.6/include/linux/vserver/sched.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+#else /* _VX_SCHED_H */
+#warning duplicate inclusion
+#endif /* _VX_SCHED_H */
-diff -NurpP --minimal linux-3.5.4/include/linux/vserver/sched_cmd.h linux-3.5.4-vs2.3.4.3/include/linux/vserver/sched_cmd.h
---- linux-3.5.4/include/linux/vserver/sched_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vserver/sched_cmd.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/sched_cmd.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/sched_cmd.h
+--- linux-3.6/include/linux/vserver/sched_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+
+#endif /* __KERNEL__ */
+#endif /* _VX_SCHED_CMD_H */
-diff -NurpP --minimal linux-3.5.4/include/linux/vserver/sched_def.h linux-3.5.4-vs2.3.4.3/include/linux/vserver/sched_def.h
---- linux-3.5.4/include/linux/vserver/sched_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vserver/sched_def.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/sched_def.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/sched_def.h
+--- linux-3.6/include/linux/vserver/sched_def.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+#endif
+
+#endif /* _VX_SCHED_DEF_H */
-diff -NurpP --minimal linux-3.5.4/include/linux/vserver/signal.h linux-3.5.4-vs2.3.4.3/include/linux/vserver/signal.h
---- linux-3.5.4/include/linux/vserver/signal.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vserver/signal.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/signal.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/signal.h
+--- linux-3.6/include/linux/vserver/signal.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+#else /* _VX_SIGNAL_H */
+#warning duplicate inclusion
+#endif /* _VX_SIGNAL_H */
-diff -NurpP --minimal linux-3.5.4/include/linux/vserver/signal_cmd.h linux-3.5.4-vs2.3.4.3/include/linux/vserver/signal_cmd.h
---- linux-3.5.4/include/linux/vserver/signal_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vserver/signal_cmd.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/signal_cmd.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/signal_cmd.h
+--- linux-3.6/include/linux/vserver/signal_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+
+#endif /* __KERNEL__ */
+#endif /* _VX_SIGNAL_CMD_H */
-diff -NurpP --minimal linux-3.5.4/include/linux/vserver/space.h linux-3.5.4-vs2.3.4.3/include/linux/vserver/space.h
---- linux-3.5.4/include/linux/vserver/space.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vserver/space.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/space.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/space.h
+--- linux-3.6/include/linux/vserver/space.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+#else /* _VX_SPACE_H */
+#warning duplicate inclusion
+#endif /* _VX_SPACE_H */
-diff -NurpP --minimal linux-3.5.4/include/linux/vserver/space_cmd.h linux-3.5.4-vs2.3.4.3/include/linux/vserver/space_cmd.h
---- linux-3.5.4/include/linux/vserver/space_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vserver/space_cmd.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/space_cmd.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/space_cmd.h
+--- linux-3.6/include/linux/vserver/space_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+
+#endif /* __KERNEL__ */
+#endif /* _VX_SPACE_CMD_H */
-diff -NurpP --minimal linux-3.5.4/include/linux/vserver/switch.h linux-3.5.4-vs2.3.4.3/include/linux/vserver/switch.h
---- linux-3.5.4/include/linux/vserver/switch.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vserver/switch.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/switch.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/switch.h
+--- linux-3.6/include/linux/vserver/switch.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+
+#endif /* _VX_SWITCH_H */
+
-diff -NurpP --minimal linux-3.5.4/include/linux/vserver/tag.h linux-3.5.4-vs2.3.4.3/include/linux/vserver/tag.h
---- linux-3.5.4/include/linux/vserver/tag.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vserver/tag.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/tag.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/tag.h
+--- linux-3.6/include/linux/vserver/tag.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+#endif
+
+#endif /* _DX_TAG_H */
-diff -NurpP --minimal linux-3.5.4/include/linux/vserver/tag_cmd.h linux-3.5.4-vs2.3.4.3/include/linux/vserver/tag_cmd.h
---- linux-3.5.4/include/linux/vserver/tag_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/linux/vserver/tag_cmd.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/linux/vserver/tag_cmd.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/linux/vserver/tag_cmd.h
+--- linux-3.6/include/linux/vserver/tag_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+
+#endif /* __KERNEL__ */
+#endif /* _VX_TAG_CMD_H */
-diff -NurpP --minimal linux-3.5.4/include/net/addrconf.h linux-3.5.4-vs2.3.4.3/include/net/addrconf.h
---- linux-3.5.4/include/net/addrconf.h 2012-07-22 23:39:46.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/include/net/addrconf.h 2012-07-23 01:45:55.000000000 +0200
-@@ -80,7 +80,8 @@ extern int ipv6_dev_get_saddr(struct n
+diff -NurpP --minimal linux-3.6/include/net/addrconf.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/net/addrconf.h
+--- linux-3.6/include/net/addrconf.h 2012-10-04 15:27:47.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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,
unsigned int srcprefs,
extern int ipv6_get_lladdr(struct net_device *dev,
struct in6_addr *addr,
unsigned char banned_flags);
-diff -NurpP --minimal linux-3.5.4/include/net/af_unix.h linux-3.5.4-vs2.3.4.3/include/net/af_unix.h
---- linux-3.5.4/include/net/af_unix.h 2012-07-22 23:39:46.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/include/net/af_unix.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/net/af_unix.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/net/af_unix.h
+--- linux-3.6/include/net/af_unix.h 2012-10-04 15:27:47.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/net/af_unix.h 2012-10-04 18:47:00.000000000 +0200
@@ -4,6 +4,7 @@
#include <linux/socket.h>
#include <linux/un.h>
#include <net/sock.h>
extern void unix_inflight(struct file *fp);
-diff -NurpP --minimal linux-3.5.4/include/net/inet_timewait_sock.h linux-3.5.4-vs2.3.4.3/include/net/inet_timewait_sock.h
---- linux-3.5.4/include/net/inet_timewait_sock.h 2012-03-19 19:47:29.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/include/net/inet_timewait_sock.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/net/inet_timewait_sock.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/net/inet_timewait_sock.h
+--- linux-3.6/include/net/inet_timewait_sock.h 2012-03-19 19:47:29.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
int tw_timeout;
volatile unsigned char tw_substate;
unsigned char tw_rcv_wscale;
-diff -NurpP --minimal linux-3.5.4/include/net/ip6_route.h linux-3.5.4-vs2.3.4.3/include/net/ip6_route.h
---- linux-3.5.4/include/net/ip6_route.h 2012-07-22 23:39:46.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/include/net/ip6_route.h 2012-07-23 01:45:55.000000000 +0200
-@@ -88,7 +88,8 @@ extern int ip6_route_get_saddr(struct
+diff -NurpP --minimal linux-3.6/include/net/ip6_route.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/net/ip6_route.h
+--- linux-3.6/include/net/ip6_route.h 2012-10-04 15:27:47.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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,
unsigned int prefs,
extern struct rt6_info *rt6_lookup(struct net *net,
const struct in6_addr *daddr,
-diff -NurpP --minimal linux-3.5.4/include/net/route.h linux-3.5.4-vs2.3.4.3/include/net/route.h
---- linux-3.5.4/include/net/route.h 2012-07-22 23:39:46.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/include/net/route.h 2012-07-23 01:45:55.000000000 +0200
-@@ -202,6 +202,9 @@ static inline void ip_rt_put(struct rtab
+diff -NurpP --minimal linux-3.6/include/net/route.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/net/route.h
+--- linux-3.6/include/net/route.h 2012-10-04 15:27:47.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/include/net/route.h 2012-10-04 18:47:00.000000000 +0200
+@@ -203,6 +203,9 @@ static inline void ip_rt_put(struct rtab
dst_release(&rt->dst);
}
#define IPTOS_RT_MASK (IPTOS_TOS_MASK & ~3)
extern const __u8 ip_tos2prio[16];
-@@ -253,6 +256,9 @@ static inline void ip_route_connect_init
+@@ -252,6 +255,9 @@ static inline void ip_route_connect_init
protocol, flow_flags, dst, src, dport, sport);
}
static inline struct rtable *ip_route_connect(struct flowi4 *fl4,
__be32 dst, __be32 src, u32 tos,
int oif, u8 protocol,
-@@ -261,11 +267,25 @@ static inline struct rtable *ip_route_co
+@@ -260,11 +266,25 @@ static inline struct rtable *ip_route_co
{
struct net *net = sock_net(sk);
struct rtable *rt;
rt = __ip_route_output_key(net, fl4);
if (IS_ERR(rt))
return rt;
-diff -NurpP --minimal linux-3.5.4/include/net/sock.h linux-3.5.4-vs2.3.4.3/include/net/sock.h
---- linux-3.5.4/include/net/sock.h 2012-07-22 23:39:46.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/include/net/sock.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/include/net/sock.h linux-3.6-vs2.3.4.3-noxfs-nocow/include/net/sock.h
+--- linux-3.6/include/net/sock.h 2012-10-04 15:27:47.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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;
/*
* fields between dontcopy_begin/dontcopy_end
* are not copied in sock_copy()
-@@ -282,6 +286,10 @@ struct sock {
+@@ -284,6 +288,10 @@ struct sock {
#define sk_bind_node __sk_common.skc_bind_node
#define sk_prot __sk_common.skc_prot
#define sk_net __sk_common.skc_net
socket_lock_t sk_lock;
struct sk_buff_head sk_receive_queue;
/*
-diff -NurpP --minimal linux-3.5.4/init/Kconfig linux-3.5.4-vs2.3.4.3/init/Kconfig
---- linux-3.5.4/init/Kconfig 2012-07-22 23:39:46.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/init/Kconfig 2012-07-23 01:54:21.000000000 +0200
+diff -NurpP --minimal linux-3.6/init/Kconfig linux-3.6-vs2.3.4.3-noxfs-nocow/init/Kconfig
+--- linux-3.6/init/Kconfig 2012-10-04 15:27:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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"
help
This option adds support for grouping sets of processes together, for
use with process control subsystems such as Cpusets, CFS, memory
-@@ -874,6 +875,7 @@ config USER_NS
+@@ -889,6 +890,7 @@ config USER_NS
bool "User namespace (EXPERIMENTAL)"
depends on EXPERIMENTAL
depends on UIDGID_CONVERTED
select UIDGID_STRICT_TYPE_CHECKS
default n
-diff -NurpP --minimal linux-3.5.4/init/main.c linux-3.5.4-vs2.3.4.3/init/main.c
---- linux-3.5.4/init/main.c 2012-07-22 23:39:46.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/init/main.c 2012-07-23 01:45:55.000000000 +0200
-@@ -68,6 +68,7 @@
- #include <linux/shmem_fs.h>
+diff -NurpP --minimal linux-3.6/init/main.c linux-3.6-vs2.3.4.3-noxfs-nocow/init/main.c
+--- linux-3.6/init/main.c 2012-10-04 15:27:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/init/main.c 2012-10-04 18:51:41.000000000 +0200
+@@ -69,6 +69,7 @@
#include <linux/slab.h>
#include <linux/perf_event.h>
+ #include <linux/file.h>
+#include <linux/vserver/percpu.h>
#include <asm/io.h>
#include <asm/bugs.h>
-diff -NurpP --minimal linux-3.5.4/ipc/mqueue.c linux-3.5.4-vs2.3.4.3/ipc/mqueue.c
---- linux-3.5.4/ipc/mqueue.c 2012-07-22 23:39:46.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/ipc/mqueue.c 2012-07-23 01:56:45.000000000 +0200
+diff -NurpP --minimal linux-3.6/ipc/mqueue.c linux-3.6-vs2.3.4.3-noxfs-nocow/ipc/mqueue.c
+--- linux-3.6/ipc/mqueue.c 2012-10-04 15:27:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/ipc/mqueue.c 2012-10-04 18:47:00.000000000 +0200
@@ -35,6 +35,8 @@
#include <linux/ipc_namespace.h>
#include <linux/user_namespace.h>
free_uid(user);
}
if (ipc_ns)
-diff -NurpP --minimal linux-3.5.4/ipc/msg.c linux-3.5.4-vs2.3.4.3/ipc/msg.c
---- linux-3.5.4/ipc/msg.c 2011-05-22 16:17:59.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/ipc/msg.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/ipc/msg.c linux-3.6-vs2.3.4.3-noxfs-nocow/ipc/msg.c
+--- linux-3.6/ipc/msg.c 2011-05-22 16:17:59.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/ipc/msg.c 2012-10-04 18:47:00.000000000 +0200
@@ -37,6 +37,7 @@
#include <linux/rwsem.h>
#include <linux/nsproxy.h>
msq->q_perm.security = NULL;
retval = security_msg_queue_alloc(msq);
-diff -NurpP --minimal linux-3.5.4/ipc/namespace.c linux-3.5.4-vs2.3.4.3/ipc/namespace.c
---- linux-3.5.4/ipc/namespace.c 2012-07-22 23:39:46.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/ipc/namespace.c 2012-07-23 03:31:37.000000000 +0200
+diff -NurpP --minimal linux-3.6/ipc/namespace.c linux-3.6-vs2.3.4.3-noxfs-nocow/ipc/namespace.c
+--- linux-3.6/ipc/namespace.c 2012-07-22 23:39:46.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/ipc/namespace.c 2012-10-04 18:47:00.000000000 +0200
@@ -13,11 +13,12 @@
#include <linux/mount.h>
#include <linux/user_namespace.h>
}
/*
-diff -NurpP --minimal linux-3.5.4/ipc/sem.c linux-3.5.4-vs2.3.4.3/ipc/sem.c
---- linux-3.5.4/ipc/sem.c 2012-01-09 16:14:59.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/ipc/sem.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/ipc/sem.c linux-3.6-vs2.3.4.3-noxfs-nocow/ipc/sem.c
+--- linux-3.6/ipc/sem.c 2012-01-09 16:14:59.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/ipc/sem.c 2012-10-04 18:47:00.000000000 +0200
@@ -86,6 +86,8 @@
#include <linux/rwsem.h>
#include <linux/nsproxy.h>
security_sem_free(sma);
ipc_rcu_putref(sma);
}
-diff -NurpP --minimal linux-3.5.4/ipc/shm.c linux-3.5.4-vs2.3.4.3/ipc/shm.c
---- linux-3.5.4/ipc/shm.c 2012-07-22 23:39:46.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/ipc/shm.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/ipc/shm.c linux-3.6-vs2.3.4.3-noxfs-nocow/ipc/shm.c
+--- linux-3.6/ipc/shm.c 2012-10-04 15:27:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/ipc/shm.c 2012-10-04 18:47:00.000000000 +0200
@@ -39,6 +39,8 @@
#include <linux/nsproxy.h>
#include <linux/mount.h>
return error;
no_id:
-diff -NurpP --minimal linux-3.5.4/kernel/Makefile linux-3.5.4-vs2.3.4.3/kernel/Makefile
---- linux-3.5.4/kernel/Makefile 2012-07-22 23:39:46.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/kernel/Makefile 2012-07-23 10:20:32.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/Makefile linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/Makefile
+--- linux-3.6/kernel/Makefile 2012-07-22 23:39:46.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/Makefile 2012-10-04 18:47:00.000000000 +0200
@@ -24,6 +24,7 @@ endif
obj-y += sched/
ifeq ($(CONFIG_CHECKPOINT_RESTORE),y)
obj-$(CONFIG_X86) += kcmp.o
-diff -NurpP --minimal linux-3.5.4/kernel/auditsc.c linux-3.5.4-vs2.3.4.3/kernel/auditsc.c
---- linux-3.5.4/kernel/auditsc.c 2012-07-22 23:39:46.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/kernel/auditsc.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/auditsc.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/auditsc.c
+--- linux-3.6/kernel/auditsc.c 2012-07-22 23:39:46.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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;
return -EPERM;
#endif /* CONFIG_AUDIT_LOGINUID_IMMUTABLE */
-diff -NurpP --minimal linux-3.5.4/kernel/capability.c linux-3.5.4-vs2.3.4.3/kernel/capability.c
---- linux-3.5.4/kernel/capability.c 2012-07-22 23:39:46.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/kernel/capability.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/capability.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/capability.c
+--- linux-3.6/kernel/capability.c 2012-07-22 23:39:46.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/capability.c 2012-10-04 18:47:00.000000000 +0200
@@ -15,6 +15,7 @@
#include <linux/syscalls.h>
#include <linux/pid_namespace.h>
/**
* has_capability_noaudit - Does a task have a capability (unaudited) in the
* initial user ns
-diff -NurpP --minimal linux-3.5.4/kernel/compat.c linux-3.5.4-vs2.3.4.3/kernel/compat.c
---- linux-3.5.4/kernel/compat.c 2012-07-22 23:39:46.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/kernel/compat.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/compat.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/compat.c
+--- linux-3.6/kernel/compat.c 2012-07-22 23:39:46.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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;
return 0;
}
-diff -NurpP --minimal linux-3.5.4/kernel/cred.c linux-3.5.4-vs2.3.4.3/kernel/cred.c
---- linux-3.5.4/kernel/cred.c 2012-07-22 23:39:46.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/kernel/cred.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/cred.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/cred.c
+--- linux-3.6/kernel/cred.c 2012-07-22 23:39:46.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/cred.c 2012-10-04 18:47:00.000000000 +0200
@@ -70,31 +70,6 @@ struct cred init_cred = {
#endif
};
EXPORT_SYMBOL(prepare_creds);
/*
-diff -NurpP --minimal linux-3.5.4/kernel/exit.c linux-3.5.4-vs2.3.4.3/kernel/exit.c
---- linux-3.5.4/kernel/exit.c 2012-09-16 20:46:31.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/kernel/exit.c 2012-08-11 15:15:02.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/exit.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/exit.c
+--- linux-3.6/kernel/exit.c 2012-10-04 15:27:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/exit.c 2012-10-04 18:47:00.000000000 +0200
@@ -48,6 +48,10 @@
#include <linux/fs_struct.h>
#include <linux/init_task.h>
}
}
}
-@@ -1020,6 +1026,9 @@ void do_exit(long code)
+@@ -1018,6 +1024,9 @@ void do_exit(long code)
*/
ptrace_put_breakpoints(tsk);
exit_notify(tsk, group_dead);
#ifdef CONFIG_NUMA
task_lock(tsk);
-@@ -1070,10 +1079,15 @@ void do_exit(long code)
+@@ -1068,10 +1077,15 @@ void do_exit(long code)
smp_mb();
raw_spin_unlock_wait(&tsk->pi_lock);
BUG();
/* Avoid "noreturn function does return". */
for (;;)
-diff -NurpP --minimal linux-3.5.4/kernel/fork.c linux-3.5.4-vs2.3.4.3/kernel/fork.c
---- linux-3.5.4/kernel/fork.c 2012-09-16 20:46:31.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/kernel/fork.c 2012-09-16 20:50:19.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/fork.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/fork.c
+--- linux-3.6/kernel/fork.c 2012-10-04 15:27:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/fork.c 2012-10-04 18:47:00.000000000 +0200
@@ -70,6 +70,9 @@
#include <linux/khugepaged.h>
#include <linux/signalfd.h>
#include <asm/pgtable.h>
#include <asm/pgalloc.h>
-@@ -207,6 +210,8 @@ void free_task(struct task_struct *tsk)
- account_kernel_stack(tsk->stack, -1);
+@@ -210,6 +213,8 @@ void free_task(struct task_struct *tsk)
+ arch_release_thread_info(tsk->stack);
free_thread_info(tsk->stack);
rt_mutex_debug_task_free(tsk);
+ clr_vx_info(&tsk->vx_info);
+ clr_nx_info(&tsk->nx_info);
ftrace_graph_exit_task(tsk);
put_seccomp_filter(tsk);
- free_task_struct(tsk);
-@@ -545,6 +550,7 @@ static struct mm_struct *mm_init(struct
+ arch_release_task_struct(tsk);
+@@ -541,6 +546,7 @@ static struct mm_struct *mm_init(struct
if (likely(!mm_alloc_pgd(mm))) {
mm->def_flags = 0;
mmu_notifier_mm_init(mm);
return mm;
}
-@@ -597,6 +603,7 @@ void __mmdrop(struct mm_struct *mm)
+@@ -593,6 +599,7 @@ void __mmdrop(struct mm_struct *mm)
destroy_context(mm);
mmu_notifier_mm_destroy(mm);
check_mm(mm);
free_mm(mm);
}
EXPORT_SYMBOL_GPL(__mmdrop);
-@@ -838,6 +845,7 @@ struct mm_struct *dup_mm(struct task_str
+@@ -834,6 +841,7 @@ struct mm_struct *dup_mm(struct task_str
goto fail_nomem;
memcpy(mm, oldmm, sizeof(*mm));
mm_init_cpumask(mm);
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
-@@ -878,6 +886,7 @@ fail_nocontext:
+@@ -874,6 +882,7 @@ fail_nocontext:
* If init_new_context() failed, we cannot use mmput() to free the mm
* because it calls destroy_context()
*/
mm_free_pgd(mm);
free_mm(mm);
return NULL;
-@@ -1161,6 +1170,8 @@ static struct task_struct *copy_process(
+@@ -1157,6 +1166,8 @@ static struct task_struct *copy_process(
int retval;
struct task_struct *p;
int cgroup_callbacks_done = 0;
if ((clone_flags & (CLONE_NEWNS|CLONE_FS)) == (CLONE_NEWNS|CLONE_FS))
return ERR_PTR(-EINVAL);
-@@ -1208,7 +1219,12 @@ static struct task_struct *copy_process(
+@@ -1204,7 +1215,12 @@ static struct task_struct *copy_process(
DEBUG_LOCKS_WARN_ON(!p->hardirqs_enabled);
DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
#endif
if (atomic_read(&p->real_cred->user->processes) >=
task_rlimit(p, RLIMIT_NPROC)) {
if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE) &&
-@@ -1487,6 +1503,18 @@ static struct task_struct *copy_process(
+@@ -1483,6 +1499,18 @@ static struct task_struct *copy_process(
total_forks++;
spin_unlock(¤t->sighand->siglock);
write_unlock_irq(&tasklist_lock);
proc_fork_connector(p);
cgroup_post_fork(p);
-diff -NurpP --minimal linux-3.5.4/kernel/kthread.c linux-3.5.4-vs2.3.4.3/kernel/kthread.c
---- linux-3.5.4/kernel/kthread.c 2012-03-19 19:47:30.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/kernel/kthread.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/kthread.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/kthread.c
+--- linux-3.6/kernel/kthread.c 2012-10-04 15:27:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/kthread.c 2012-10-04 18:47:00.000000000 +0200
@@ -16,6 +16,7 @@
#include <linux/mutex.h>
#include <linux/slab.h>
#include <trace/events/sched.h>
static DEFINE_SPINLOCK(kthread_create_lock);
-diff -NurpP --minimal linux-3.5.4/kernel/nsproxy.c linux-3.5.4-vs2.3.4.3/kernel/nsproxy.c
---- linux-3.5.4/kernel/nsproxy.c 2012-01-09 16:15:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/kernel/nsproxy.c 2012-07-23 10:58:02.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/nsproxy.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/nsproxy.c
+--- linux-3.6/kernel/nsproxy.c 2012-01-09 16:15:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/nsproxy.c 2012-10-04 18:47:00.000000000 +0200
@@ -20,11 +20,14 @@
#include <linux/mnt_namespace.h>
#include <linux/utsname.h>
return -EPERM;
*new_nsp = create_new_namespaces(unshare_flags, current,
-diff -NurpP --minimal linux-3.5.4/kernel/pid.c linux-3.5.4-vs2.3.4.3/kernel/pid.c
---- linux-3.5.4/kernel/pid.c 2012-07-22 23:39:46.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/kernel/pid.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/pid.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/pid.c
+--- linux-3.6/kernel/pid.c 2012-07-22 23:39:46.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/pid.c 2012-10-04 18:47:00.000000000 +0200
@@ -36,6 +36,7 @@
#include <linux/pid_namespace.h>
#include <linux/init_task.h>
pid_t pid_vnr(struct pid *pid)
{
return pid_nr_ns(pid, current->nsproxy->pid_ns);
-diff -NurpP --minimal linux-3.5.4/kernel/pid_namespace.c linux-3.5.4-vs2.3.4.3/kernel/pid_namespace.c
---- linux-3.5.4/kernel/pid_namespace.c 2012-07-22 23:39:46.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/kernel/pid_namespace.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/pid_namespace.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/pid_namespace.c
+--- linux-3.6/kernel/pid_namespace.c 2012-10-04 15:27:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/pid_namespace.c 2012-10-04 18:47:00.000000000 +0200
@@ -16,6 +16,7 @@
#include <linux/slab.h>
#include <linux/proc_fs.h>
kmem_cache_free(pid_ns_cachep, ns);
}
-diff -NurpP --minimal linux-3.5.4/kernel/posix-timers.c linux-3.5.4-vs2.3.4.3/kernel/posix-timers.c
---- linux-3.5.4/kernel/posix-timers.c 2012-01-09 16:15:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/kernel/posix-timers.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/posix-timers.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/posix-timers.c
+--- linux-3.6/kernel/posix-timers.c 2012-01-09 16:15:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/posix-timers.c 2012-10-04 18:47:00.000000000 +0200
@@ -47,6 +47,7 @@
#include <linux/wait.h>
#include <linux/workqueue.h>
/* If we failed to send the signal the timer stops. */
return ret > 0;
}
-diff -NurpP --minimal linux-3.5.4/kernel/printk.c linux-3.5.4-vs2.3.4.3/kernel/printk.c
---- linux-3.5.4/kernel/printk.c 2012-09-16 20:46:31.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/kernel/printk.c 2012-08-19 13:28:27.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/printk.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/printk.c
+--- linux-3.6/kernel/printk.c 2012-10-04 15:27:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/printk.c 2012-10-04 18:47:00.000000000 +0200
@@ -42,6 +42,7 @@
#include <linux/notifier.h>
#include <linux/rculist.h>
#include <asm/uaccess.h>
-@@ -783,7 +784,7 @@ static int check_syslog_permissions(int
+@@ -818,7 +819,7 @@ static int check_syslog_permissions(int
return 0;
if (syslog_action_restricted(type)) {
return 0;
/* For historical reasons, accept CAP_SYS_ADMIN too, with a warning */
if (capable(CAP_SYS_ADMIN)) {
-@@ -1076,12 +1077,9 @@ int do_syslog(int type, char __user *buf
+@@ -1111,12 +1112,9 @@ int do_syslog(int type, char __user *buf
if (error)
return error;
error = -EINVAL;
if (!buf || len < 0)
goto out;
-@@ -1092,6 +1090,16 @@ int do_syslog(int type, char __user *buf
+@@ -1127,6 +1125,16 @@ int do_syslog(int type, char __user *buf
error = -EFAULT;
goto out;
}
error = wait_event_interruptible(log_wait,
syslog_seq != log_next_seq);
if (error)
-@@ -1104,16 +1112,6 @@ int do_syslog(int type, char __user *buf
+@@ -1139,16 +1147,6 @@ int do_syslog(int type, char __user *buf
/* FALL THRU */
/* Read last kernel messages */
case SYSLOG_ACTION_READ_ALL:
error = syslog_print_all(buf, len, clear);
break;
/* Clear ring buffer */
-diff -NurpP --minimal linux-3.5.4/kernel/ptrace.c linux-3.5.4-vs2.3.4.3/kernel/ptrace.c
---- linux-3.5.4/kernel/ptrace.c 2012-07-22 23:39:46.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/kernel/ptrace.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/ptrace.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/ptrace.c
+--- linux-3.6/kernel/ptrace.c 2012-07-22 23:39:46.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/ptrace.c 2012-10-04 18:47:00.000000000 +0200
@@ -22,6 +22,7 @@
#include <linux/syscalls.h>
#include <linux/uaccess.h>
return security_ptrace_access_check(task, mode);
}
-diff -NurpP --minimal linux-3.5.4/kernel/sched/core.c linux-3.5.4-vs2.3.4.3/kernel/sched/core.c
---- linux-3.5.4/kernel/sched/core.c 2012-09-16 20:46:31.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/kernel/sched/core.c 2012-09-16 20:50:19.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/sched/core.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/sched/core.c
+--- linux-3.6/kernel/sched/core.c 2012-10-04 15:27:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/sched/core.c 2012-10-04 18:47:00.000000000 +0200
@@ -72,6 +72,8 @@
#include <linux/slab.h>
#include <linux/init_task.h>
retval = security_task_setnice(current, nice);
if (retval)
-diff -NurpP --minimal linux-3.5.4/kernel/sched/fair.c linux-3.5.4-vs2.3.4.3/kernel/sched/fair.c
---- linux-3.5.4/kernel/sched/fair.c 2012-07-22 23:39:47.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/kernel/sched/fair.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/sched/fair.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/sched/fair.c
+--- linux-3.6/kernel/sched/fair.c 2012-10-04 15:27:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/sched/fair.c 2012-10-04 18:47:00.000000000 +0200
@@ -26,6 +26,7 @@
#include <linux/slab.h>
#include <linux/profile.h>
update_cfs_load(cfs_rq, 0);
account_entity_dequeue(cfs_rq, se);
-diff -NurpP --minimal linux-3.5.4/kernel/signal.c linux-3.5.4-vs2.3.4.3/kernel/signal.c
---- linux-3.5.4/kernel/signal.c 2012-07-22 23:39:47.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/kernel/signal.c 2012-07-23 03:53:00.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/signal.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/signal.c
+--- linux-3.6/kernel/signal.c 2012-10-04 15:27:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/signal.c 2012-10-04 18:47:00.000000000 +0200
@@ -30,6 +30,8 @@
#include <linux/nsproxy.h>
#include <linux/user_namespace.h>
int err = group_send_sig_info(sig, info, p);
++count;
if (err != -EPERM)
-@@ -2302,6 +2329,11 @@ relock:
+@@ -2317,6 +2344,11 @@ relock:
!sig_kernel_only(signr))
continue;
if (sig_kernel_stop(signr)) {
/*
* The default action is to stop all threads in
-diff -NurpP --minimal linux-3.5.4/kernel/softirq.c linux-3.5.4-vs2.3.4.3/kernel/softirq.c
---- linux-3.5.4/kernel/softirq.c 2012-05-21 18:07:34.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/kernel/softirq.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/softirq.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/softirq.c
+--- linux-3.6/kernel/softirq.c 2012-10-04 15:27:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/softirq.c 2012-10-04 18:47:00.000000000 +0200
@@ -24,6 +24,7 @@
#include <linux/ftrace.h>
#include <linux/smp.h>
#define CREATE_TRACE_POINTS
#include <trace/events/irq.h>
-diff -NurpP --minimal linux-3.5.4/kernel/sys.c linux-3.5.4-vs2.3.4.3/kernel/sys.c
---- linux-3.5.4/kernel/sys.c 2012-07-22 23:39:47.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/kernel/sys.c 2012-07-23 03:33:13.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/sys.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/sys.c
+--- linux-3.6/kernel/sys.c 2012-10-04 15:27:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/sys.c 2012-10-04 18:47:00.000000000 +0200
@@ -47,6 +47,7 @@
#include <linux/syscalls.h>
#include <linux/kprobes.h>
return 0;
return -EPERM;
-diff -NurpP --minimal linux-3.5.4/kernel/sysctl.c linux-3.5.4-vs2.3.4.3/kernel/sysctl.c
---- linux-3.5.4/kernel/sysctl.c 2012-05-21 18:07:34.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/kernel/sysctl.c 2012-07-23 01:45:55.000000000 +0200
-@@ -81,6 +81,7 @@
+diff -NurpP --minimal linux-3.6/kernel/sysctl.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/sysctl.c
+--- linux-3.6/kernel/sysctl.c 2012-10-04 15:27:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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 <linux/lockdep.h>
#endif
#ifdef CONFIG_CHR_DEV_SG
#include <scsi/sg.h>
#endif
-@@ -562,6 +563,13 @@ static struct ctl_table kern_table[] = {
+@@ -568,6 +569,13 @@ static struct ctl_table kern_table[] = {
.proc_handler = proc_dostring,
},
#endif
#ifdef CONFIG_CHR_DEV_SG
{
.procname = "sg-big-buff",
-diff -NurpP --minimal linux-3.5.4/kernel/sysctl_binary.c linux-3.5.4-vs2.3.4.3/kernel/sysctl_binary.c
---- linux-3.5.4/kernel/sysctl_binary.c 2012-01-09 16:15:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/kernel/sysctl_binary.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/sysctl_binary.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/sysctl_binary.c
+--- linux-3.6/kernel/sysctl_binary.c 2012-10-04 15:27:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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" },
{ CTL_STR, KERN_SPARC_REBOOT, "reboot-cmd" },
{ CTL_INT, KERN_CTLALTDEL, "ctrl-alt-del" },
-diff -NurpP --minimal linux-3.5.4/kernel/time/timekeeping.c linux-3.5.4-vs2.3.4.3/kernel/time/timekeeping.c
---- linux-3.5.4/kernel/time/timekeeping.c 2012-07-22 23:39:47.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/kernel/time/timekeeping.c 2012-07-23 01:45:55.000000000 +0200
-@@ -254,6 +254,7 @@ void getnstimeofday(struct timespec *ts)
- } while (read_seqretry(&timekeeper.lock, seq));
+diff -NurpP --minimal linux-3.6/kernel/time/timekeeping.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/time/timekeeping.c
+--- linux-3.6/kernel/time/timekeeping.c 2012-10-04 15:27:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/time/timekeeping.c 2012-10-04 18:47:00.000000000 +0200
+@@ -309,6 +309,7 @@ void getnstimeofday(struct timespec *ts)
+ ts->tv_nsec = 0;
timespec_add_ns(ts, nsecs);
+ vx_adjust_timespec(ts);
}
EXPORT_SYMBOL(getnstimeofday);
-diff -NurpP --minimal linux-3.5.4/kernel/time.c linux-3.5.4-vs2.3.4.3/kernel/time.c
---- linux-3.5.4/kernel/time.c 2012-05-21 18:07:34.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/kernel/time.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/time.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/time.c
+--- linux-3.6/kernel/time.c 2012-05-21 18:07:34.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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;
return 0;
}
-diff -NurpP --minimal linux-3.5.4/kernel/timer.c linux-3.5.4-vs2.3.4.3/kernel/timer.c
---- linux-3.5.4/kernel/timer.c 2012-07-22 23:39:47.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/kernel/timer.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/timer.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/timer.c
+--- linux-3.6/kernel/timer.c 2012-10-04 15:27:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/timer.c 2012-10-09 14:02:12.000000000 +0200
@@ -40,6 +40,10 @@
#include <linux/irq_work.h>
#include <linux/sched.h>
#include <asm/uaccess.h>
#include <asm/unistd.h>
-@@ -1394,12 +1398,6 @@ SYSCALL_DEFINE1(alarm, unsigned int, sec
-
- #endif
-
--#ifndef __alpha__
--
--/*
-- * The Alpha uses getxpid, getxuid, and getxgid instead. Maybe this
-- * should be moved into arch/i386 instead?
-- */
-
- /**
- * sys_getpid - return the thread group id of the current process
-@@ -1428,10 +1426,23 @@ SYSCALL_DEFINE0(getppid)
- rcu_read_lock();
- pid = task_tgid_vnr(rcu_dereference(current->real_parent));
- rcu_read_unlock();
-+ return vx_map_pid(pid);
-+}
-
-- return pid;
-+#ifdef __alpha__
-+
-+/*
-+ * The Alpha uses getxpid, getxuid, and getxgid instead.
-+ */
-+
-+asmlinkage long do_getxpid(long *ppid)
-+{
-+ *ppid = sys_getppid();
-+ return sys_getpid();
- }
-
-+#else /* _alpha_ */
-+
- SYSCALL_DEFINE0(getuid)
- {
- /* Only we change this so SMP safe */
-diff -NurpP --minimal linux-3.5.4/kernel/user_namespace.c linux-3.5.4-vs2.3.4.3/kernel/user_namespace.c
---- linux-3.5.4/kernel/user_namespace.c 2012-07-22 23:39:47.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/kernel/user_namespace.c 2012-07-23 03:38:28.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/user_namespace.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/user_namespace.c
+--- linux-3.6/kernel/user_namespace.c 2012-07-22 23:39:47.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/user_namespace.c 2012-10-04 18:47:00.000000000 +0200
@@ -19,6 +19,7 @@
#include <linux/fs.h>
#include <linux/uaccess.h>
put_user_ns(parent);
}
EXPORT_SYMBOL(free_user_ns);
-diff -NurpP --minimal linux-3.5.4/kernel/utsname.c linux-3.5.4-vs2.3.4.3/kernel/utsname.c
---- linux-3.5.4/kernel/utsname.c 2012-07-22 23:39:47.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/kernel/utsname.c 2012-07-23 03:52:22.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/utsname.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/utsname.c
+--- linux-3.6/kernel/utsname.c 2012-07-22 23:39:47.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/utsname.c 2012-10-04 18:47:00.000000000 +0200
@@ -16,14 +16,17 @@
#include <linux/slab.h>
#include <linux/user_namespace.h>
kfree(ns);
}
-diff -NurpP --minimal linux-3.5.4/kernel/vserver/Kconfig linux-3.5.4-vs2.3.4.3/kernel/vserver/Kconfig
---- linux-3.5.4/kernel/vserver/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/kernel/vserver/Kconfig 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/Kconfig linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/Kconfig
+--- linux-3.6/kernel/vserver/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/Kconfig 2012-10-04 18:47:00.000000000 +0200
@@ -0,0 +1,224 @@
+#
+# Linux VServer configuration
+ bool
+ default n
+
-diff -NurpP --minimal linux-3.5.4/kernel/vserver/Makefile linux-3.5.4-vs2.3.4.3/kernel/vserver/Makefile
---- linux-3.5.4/kernel/vserver/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/kernel/vserver/Makefile 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/Makefile linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/Makefile
+--- linux-3.6/kernel/vserver/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/Makefile 2012-10-04 18:47:00.000000000 +0200
@@ -0,0 +1,18 @@
+#
+# Makefile for the Linux vserver routines.
+vserver-$(CONFIG_VSERVER_MONITOR) += monitor.o
+vserver-$(CONFIG_VSERVER_DEVICE) += device.o
+
-diff -NurpP --minimal linux-3.5.4/kernel/vserver/cacct.c linux-3.5.4-vs2.3.4.3/kernel/vserver/cacct.c
---- linux-3.5.4/kernel/vserver/cacct.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/kernel/vserver/cacct.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/cacct.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/cacct.c
+--- linux-3.6/kernel/vserver/cacct.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/cacct.c 2012-10-04 18:47:00.000000000 +0200
@@ -0,0 +1,42 @@
+/*
+ * linux/kernel/vserver/cacct.c
+ return 0;
+}
+
-diff -NurpP --minimal linux-3.5.4/kernel/vserver/cacct_init.h linux-3.5.4-vs2.3.4.3/kernel/vserver/cacct_init.h
---- linux-3.5.4/kernel/vserver/cacct_init.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/kernel/vserver/cacct_init.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/cacct_init.h linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/cacct_init.h
+--- linux-3.6/kernel/vserver/cacct_init.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/cacct_init.h 2012-10-04 18:47:00.000000000 +0200
@@ -0,0 +1,25 @@
+
+
+ return;
+}
+
-diff -NurpP --minimal linux-3.5.4/kernel/vserver/cacct_proc.h linux-3.5.4-vs2.3.4.3/kernel/vserver/cacct_proc.h
---- linux-3.5.4/kernel/vserver/cacct_proc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/kernel/vserver/cacct_proc.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/cacct_proc.h linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/cacct_proc.h
+--- linux-3.6/kernel/vserver/cacct_proc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+}
+
+#endif /* _VX_CACCT_PROC_H */
-diff -NurpP --minimal linux-3.5.4/kernel/vserver/context.c linux-3.5.4-vs2.3.4.3/kernel/vserver/context.c
---- linux-3.5.4/kernel/vserver/context.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/kernel/vserver/context.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/context.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/context.c
+--- linux-3.6/kernel/vserver/context.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/context.c 2012-10-04 18:47:00.000000000 +0200
@@ -0,0 +1,1119 @@
+/*
+ * linux/kernel/vserver/context.c
+
+EXPORT_SYMBOL_GPL(free_vx_info);
+
-diff -NurpP --minimal linux-3.5.4/kernel/vserver/cvirt.c linux-3.5.4-vs2.3.4.3/kernel/vserver/cvirt.c
---- linux-3.5.4/kernel/vserver/cvirt.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/kernel/vserver/cvirt.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/cvirt.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/cvirt.c
+--- linux-3.6/kernel/vserver/cvirt.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/cvirt.c 2012-10-04 18:47:00.000000000 +0200
@@ -0,0 +1,313 @@
+/*
+ * linux/kernel/vserver/cvirt.c
+
+#endif
+
-diff -NurpP --minimal linux-3.5.4/kernel/vserver/cvirt_init.h linux-3.5.4-vs2.3.4.3/kernel/vserver/cvirt_init.h
---- linux-3.5.4/kernel/vserver/cvirt_init.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/kernel/vserver/cvirt_init.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/cvirt_init.h linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/cvirt_init.h
+--- linux-3.6/kernel/vserver/cvirt_init.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/cvirt_init.h 2012-10-04 18:47:00.000000000 +0200
@@ -0,0 +1,70 @@
+
+
+ return;
+}
+
-diff -NurpP --minimal linux-3.5.4/kernel/vserver/cvirt_proc.h linux-3.5.4-vs2.3.4.3/kernel/vserver/cvirt_proc.h
---- linux-3.5.4/kernel/vserver/cvirt_proc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/kernel/vserver/cvirt_proc.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/cvirt_proc.h linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/cvirt_proc.h
+--- linux-3.6/kernel/vserver/cvirt_proc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+}
+
+#endif /* _VX_CVIRT_PROC_H */
-diff -NurpP --minimal linux-3.5.4/kernel/vserver/debug.c linux-3.5.4-vs2.3.4.3/kernel/vserver/debug.c
---- linux-3.5.4/kernel/vserver/debug.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/kernel/vserver/debug.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/debug.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/debug.c
+--- linux-3.6/kernel/vserver/debug.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/debug.c 2012-10-04 18:47:00.000000000 +0200
@@ -0,0 +1,32 @@
+/*
+ * kernel/vserver/debug.c
+
+EXPORT_SYMBOL_GPL(dump_vx_info);
+
-diff -NurpP --minimal linux-3.5.4/kernel/vserver/device.c linux-3.5.4-vs2.3.4.3/kernel/vserver/device.c
---- linux-3.5.4/kernel/vserver/device.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/kernel/vserver/device.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/device.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/device.c
+--- linux-3.6/kernel/vserver/device.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/device.c 2012-10-04 18:47:00.000000000 +0200
@@ -0,0 +1,443 @@
+/*
+ * linux/kernel/vserver/device.c
+#endif /* CONFIG_COMPAT */
+
+
-diff -NurpP --minimal linux-3.5.4/kernel/vserver/dlimit.c linux-3.5.4-vs2.3.4.3/kernel/vserver/dlimit.c
---- linux-3.5.4/kernel/vserver/dlimit.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/kernel/vserver/dlimit.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/dlimit.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/dlimit.c
+--- linux-3.6/kernel/vserver/dlimit.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/dlimit.c 2012-10-04 18:47:00.000000000 +0200
@@ -0,0 +1,531 @@
+/*
+ * linux/kernel/vserver/dlimit.c
+EXPORT_SYMBOL_GPL(locate_dl_info);
+EXPORT_SYMBOL_GPL(rcu_free_dl_info);
+
-diff -NurpP --minimal linux-3.5.4/kernel/vserver/helper.c linux-3.5.4-vs2.3.4.3/kernel/vserver/helper.c
---- linux-3.5.4/kernel/vserver/helper.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/kernel/vserver/helper.c 2012-09-16 17:54:50.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/helper.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/helper.c
+--- linux-3.6/kernel/vserver/helper.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/helper.c 2012-10-04 18:47:00.000000000 +0200
@@ -0,0 +1,229 @@
+/*
+ * linux/kernel/vserver/helper.c
+ return do_vshelper(vshelper_path, argv, envp, 1);
+}
+
-diff -NurpP --minimal linux-3.5.4/kernel/vserver/history.c linux-3.5.4-vs2.3.4.3/kernel/vserver/history.c
---- linux-3.5.4/kernel/vserver/history.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/kernel/vserver/history.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/history.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/history.c
+--- linux-3.6/kernel/vserver/history.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/history.c 2012-10-04 18:47:00.000000000 +0200
@@ -0,0 +1,258 @@
+/*
+ * kernel/vserver/history.c
+
+#endif /* CONFIG_COMPAT */
+
-diff -NurpP --minimal linux-3.5.4/kernel/vserver/inet.c linux-3.5.4-vs2.3.4.3/kernel/vserver/inet.c
---- linux-3.5.4/kernel/vserver/inet.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/kernel/vserver/inet.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/inet.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/inet.c
+--- linux-3.6/kernel/vserver/inet.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/inet.c 2012-10-04 18:47:00.000000000 +0200
@@ -0,0 +1,226 @@
+
+#include <linux/in.h>
+
+EXPORT_SYMBOL_GPL(ip_v4_find_src);
+
-diff -NurpP --minimal linux-3.5.4/kernel/vserver/init.c linux-3.5.4-vs2.3.4.3/kernel/vserver/init.c
---- linux-3.5.4/kernel/vserver/init.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/kernel/vserver/init.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/init.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/init.c
+--- linux-3.6/kernel/vserver/init.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/init.c 2012-10-04 18:47:00.000000000 +0200
@@ -0,0 +1,45 @@
+/*
+ * linux/kernel/init.c
+module_init(init_vserver);
+module_exit(exit_vserver);
+
-diff -NurpP --minimal linux-3.5.4/kernel/vserver/inode.c linux-3.5.4-vs2.3.4.3/kernel/vserver/inode.c
---- linux-3.5.4/kernel/vserver/inode.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/kernel/vserver/inode.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/inode.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/inode.c
+--- linux-3.6/kernel/vserver/inode.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/inode.c 2012-10-04 18:47:00.000000000 +0200
@@ -0,0 +1,437 @@
+/*
+ * linux/kernel/vserver/inode.c
+
+#endif /* CONFIG_PROPAGATE */
+
-diff -NurpP --minimal linux-3.5.4/kernel/vserver/limit.c linux-3.5.4-vs2.3.4.3/kernel/vserver/limit.c
---- linux-3.5.4/kernel/vserver/limit.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/kernel/vserver/limit.c 2012-09-10 16:04:53.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/limit.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/limit.c
+--- linux-3.6/kernel/vserver/limit.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/limit.c 2012-10-04 18:47:00.000000000 +0200
@@ -0,0 +1,345 @@
+/*
+ * linux/kernel/vserver/limit.c
+ return cache;
+}
+
-diff -NurpP --minimal linux-3.5.4/kernel/vserver/limit_init.h linux-3.5.4-vs2.3.4.3/kernel/vserver/limit_init.h
---- linux-3.5.4/kernel/vserver/limit_init.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/kernel/vserver/limit_init.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/limit_init.h linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/limit_init.h
+--- linux-3.6/kernel/vserver/limit_init.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/limit_init.h 2012-10-04 18:47:00.000000000 +0200
@@ -0,0 +1,31 @@
+
+
+ }
+}
+
-diff -NurpP --minimal linux-3.5.4/kernel/vserver/limit_proc.h linux-3.5.4-vs2.3.4.3/kernel/vserver/limit_proc.h
---- linux-3.5.4/kernel/vserver/limit_proc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/kernel/vserver/limit_proc.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/limit_proc.h linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/limit_proc.h
+--- linux-3.6/kernel/vserver/limit_proc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+#endif /* _VX_LIMIT_PROC_H */
+
+
-diff -NurpP --minimal linux-3.5.4/kernel/vserver/network.c linux-3.5.4-vs2.3.4.3/kernel/vserver/network.c
---- linux-3.5.4/kernel/vserver/network.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/kernel/vserver/network.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/network.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/network.c
+--- linux-3.6/kernel/vserver/network.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/network.c 2012-10-04 18:47:00.000000000 +0200
@@ -0,0 +1,912 @@
+/*
+ * linux/kernel/vserver/network.c
+EXPORT_SYMBOL_GPL(free_nx_info);
+EXPORT_SYMBOL_GPL(unhash_nx_info);
+
-diff -NurpP --minimal linux-3.5.4/kernel/vserver/proc.c linux-3.5.4-vs2.3.4.3/kernel/vserver/proc.c
---- linux-3.5.4/kernel/vserver/proc.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/kernel/vserver/proc.c 2012-07-23 01:45:55.000000000 +0200
-@@ -0,0 +1,1103 @@
+diff -NurpP --minimal linux-3.6/kernel/vserver/proc.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/proc.c
+--- linux-3.6/kernel/vserver/proc.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/proc.c 2012-10-09 14:19:59.000000000 +0200
+@@ -0,0 +1,1110 @@
+/*
+ * linux/kernel/vserver/proc.c
+ *
+#include <linux/proc_fs.h>
+#include <linux/fs_struct.h>
+#include <linux/mount.h>
++#include <linux/namei.h>
+#include <asm/unistd.h>
+
+#include <linux/vs_context.h>
+ return lookup_vx_info(PROC_I(inode)->fd);
+}
+
-+static int proc_xid_revalidate(struct dentry *dentry, struct nameidata *nd)
++static int proc_xid_revalidate(struct dentry *dentry, unsigned int flags)
+{
+ struct inode *inode = dentry->d_inode;
+ xid_t xid = PROC_I(inode)->fd;
+
++ if (flags & LOOKUP_RCU) /* FIXME: can be dropped? */
++ return -ECHILD;
++
+ if (!xid || xid_is_hashed(xid))
+ return 1;
+ d_drop(dentry);
+
+/* get and revalidate nx_info/nid */
+
-+static int proc_nid_revalidate(struct dentry *dentry, struct nameidata *nd)
++static int proc_nid_revalidate(struct dentry *dentry, unsigned int flags)
+{
+ struct inode *inode = dentry->d_inode;
+ nid_t nid = PROC_I(inode)->fd;
+
++ if (flags & LOOKUP_RCU) /* FIXME: can be dropped? */
++ return -ECHILD;
++
+ if (!nid || nid_is_hashed(nid))
+ return 1;
+ d_drop(dentry);
+}
+
+static struct dentry *proc_xid_lookup(struct inode *dir,
-+ struct dentry *dentry, struct nameidata *nd)
++ struct dentry *dentry, unsigned int flags)
+{
+ struct vs_entry *p = vx_base_stuff;
+ struct dentry *error = ERR_PTR(-ENOENT);
+}
+
+static struct dentry *proc_nid_lookup(struct inode *dir,
-+ struct dentry *dentry, struct nameidata *nd)
++ struct dentry *dentry, unsigned int flags)
+{
+ struct vs_entry *p = nx_base_stuff;
+ struct dentry *error = ERR_PTR(-ENOENT);
+
+
+static struct dentry *proc_virtual_lookup(struct inode *dir,
-+ struct dentry *dentry, struct nameidata *nd)
++ struct dentry *dentry, unsigned int flags)
+{
+ struct vs_entry *p = vx_virtual_stuff;
+ struct dentry *error = ERR_PTR(-ENOENT);
+
+
+static struct dentry *proc_virtnet_lookup(struct inode *dir,
-+ struct dentry *dentry, struct nameidata *nd)
++ struct dentry *dentry, unsigned int flags)
+{
+ struct vs_entry *p = nx_virtnet_stuff;
+ struct dentry *error = ERR_PTR(-ENOENT);
+ return buffer - orig;
+}
+
-diff -NurpP --minimal linux-3.5.4/kernel/vserver/sched.c linux-3.5.4-vs2.3.4.3/kernel/vserver/sched.c
---- linux-3.5.4/kernel/vserver/sched.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/kernel/vserver/sched.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/sched.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/sched.c
+--- linux-3.6/kernel/vserver/sched.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/sched.c 2012-10-04 18:47:00.000000000 +0200
@@ -0,0 +1,83 @@
+/*
+ * linux/kernel/vserver/sched.c
+ return 0;
+}
+
-diff -NurpP --minimal linux-3.5.4/kernel/vserver/sched_init.h linux-3.5.4-vs2.3.4.3/kernel/vserver/sched_init.h
---- linux-3.5.4/kernel/vserver/sched_init.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/kernel/vserver/sched_init.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/sched_init.h linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/sched_init.h
+--- linux-3.6/kernel/vserver/sched_init.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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)
+{
+ return;
+}
-diff -NurpP --minimal linux-3.5.4/kernel/vserver/sched_proc.h linux-3.5.4-vs2.3.4.3/kernel/vserver/sched_proc.h
---- linux-3.5.4/kernel/vserver/sched_proc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/kernel/vserver/sched_proc.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/sched_proc.h linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/sched_proc.h
+--- linux-3.6/kernel/vserver/sched_proc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
+}
+
+#endif /* _VX_SCHED_PROC_H */
-diff -NurpP --minimal linux-3.5.4/kernel/vserver/signal.c linux-3.5.4-vs2.3.4.3/kernel/vserver/signal.c
---- linux-3.5.4/kernel/vserver/signal.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/kernel/vserver/signal.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/signal.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/signal.c
+--- linux-3.6/kernel/vserver/signal.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/signal.c 2012-10-04 18:47:00.000000000 +0200
@@ -0,0 +1,134 @@
+/*
+ * linux/kernel/vserver/signal.c
+ return ret;
+}
+
-diff -NurpP --minimal linux-3.5.4/kernel/vserver/space.c linux-3.5.4-vs2.3.4.3/kernel/vserver/space.c
---- linux-3.5.4/kernel/vserver/space.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/kernel/vserver/space.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/space.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/space.c
+--- linux-3.6/kernel/vserver/space.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/space.c 2012-10-04 18:47:00.000000000 +0200
@@ -0,0 +1,436 @@
+/*
+ * linux/kernel/vserver/space.c
+ return 0;
+}
+
-diff -NurpP --minimal linux-3.5.4/kernel/vserver/switch.c linux-3.5.4-vs2.3.4.3/kernel/vserver/switch.c
---- linux-3.5.4/kernel/vserver/switch.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/kernel/vserver/switch.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/switch.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/switch.c
+--- linux-3.6/kernel/vserver/switch.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/switch.c 2012-10-04 18:47:00.000000000 +0200
@@ -0,0 +1,556 @@
+/*
+ * linux/kernel/vserver/switch.c
+}
+
+#endif /* CONFIG_COMPAT */
-diff -NurpP --minimal linux-3.5.4/kernel/vserver/sysctl.c linux-3.5.4-vs2.3.4.3/kernel/vserver/sysctl.c
---- linux-3.5.4/kernel/vserver/sysctl.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/kernel/vserver/sysctl.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/sysctl.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/sysctl.c
+--- linux-3.6/kernel/vserver/sysctl.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/sysctl.c 2012-10-04 18:47:00.000000000 +0200
@@ -0,0 +1,247 @@
+/*
+ * kernel/vserver/sysctl.c
+EXPORT_SYMBOL_GPL(vs_debug_perm);
+EXPORT_SYMBOL_GPL(vs_debug_misc);
+
-diff -NurpP --minimal linux-3.5.4/kernel/vserver/tag.c linux-3.5.4-vs2.3.4.3/kernel/vserver/tag.c
---- linux-3.5.4/kernel/vserver/tag.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/kernel/vserver/tag.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/tag.c linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/tag.c
+--- linux-3.6/kernel/vserver/tag.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/tag.c 2012-10-04 18:47:00.000000000 +0200
@@ -0,0 +1,63 @@
+/*
+ * linux/kernel/vserver/tag.c
+}
+
+
-diff -NurpP --minimal linux-3.5.4/kernel/vserver/vci_config.h linux-3.5.4-vs2.3.4.3/kernel/vserver/vci_config.h
---- linux-3.5.4/kernel/vserver/vci_config.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/kernel/vserver/vci_config.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/kernel/vserver/vci_config.h linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/vci_config.h
+--- linux-3.6/kernel/vserver/vci_config.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/kernel/vserver/vci_config.h 2012-10-04 18:47:00.000000000 +0200
@@ -0,0 +1,76 @@
+
+/* interface version */
+ 0;
+}
+
-diff -NurpP --minimal linux-3.5.4/mm/memcontrol.c linux-3.5.4-vs2.3.4.3/mm/memcontrol.c
---- linux-3.5.4/mm/memcontrol.c 2012-07-22 23:39:47.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/mm/memcontrol.c 2012-07-23 01:45:55.000000000 +0200
-@@ -883,6 +883,31 @@ struct mem_cgroup *mem_cgroup_from_task(
- struct mem_cgroup, css);
+diff -NurpP --minimal linux-3.6/mm/memcontrol.c linux-3.6-vs2.3.4.3-noxfs-nocow/mm/memcontrol.c
+--- linux-3.6/mm/memcontrol.c 2012-10-04 15:27:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/mm/memcontrol.c 2012-10-04 18:47:00.000000000 +0200
+@@ -885,6 +885,31 @@ struct mem_cgroup *mem_cgroup_from_task(
+ return mem_cgroup_from_css(task_subsys_state(p, mem_cgroup_subsys_id));
}
+u64 mem_cgroup_res_read_u64(struct mem_cgroup *mem, int member)
struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm)
{
struct mem_cgroup *memcg = NULL;
-diff -NurpP --minimal linux-3.5.4/mm/oom_kill.c linux-3.5.4-vs2.3.4.3/mm/oom_kill.c
---- linux-3.5.4/mm/oom_kill.c 2012-07-22 23:39:47.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/mm/oom_kill.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/mm/oom_kill.c linux-3.6-vs2.3.4.3-noxfs-nocow/mm/oom_kill.c
+--- linux-3.6/mm/oom_kill.c 2012-10-04 15:27:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/mm/oom_kill.c 2012-10-04 18:53:46.000000000 +0200
@@ -35,6 +35,8 @@
#include <linux/freezer.h>
#include <linux/ftrace.h>
/* When mem_cgroup_out_of_memory() and p is not member of the group */
if (memcg && !task_in_mem_cgroup(p, memcg))
return true;
-@@ -449,8 +458,8 @@ static void oom_kill_process(struct task
+@@ -472,8 +481,8 @@ void oom_kill_process(struct task_struct
dump_header(p, gfp_mask, order, memcg, nodemask);
task_lock(p);
task_unlock(p);
/*
-@@ -483,8 +492,8 @@ static void oom_kill_process(struct task
+@@ -518,8 +527,8 @@ void oom_kill_process(struct task_struct
/* mm cannot safely be dereferenced after task_unlock(victim) */
mm = victim->mm;
K(get_mm_counter(victim->mm, MM_ANONPAGES)),
K(get_mm_counter(victim->mm, MM_FILEPAGES)));
task_unlock(victim);
-@@ -583,6 +592,8 @@ int unregister_oom_notifier(struct notif
+@@ -589,6 +598,8 @@ int unregister_oom_notifier(struct notif
}
EXPORT_SYMBOL_GPL(unregister_oom_notifier);
/*
* Try to acquire the OOM killer lock for the zones in zonelist. Returns zero
* if a parallel OOM killing is already taking place that includes a zone in
-@@ -734,7 +745,12 @@ void out_of_memory(struct zonelist *zone
+@@ -738,7 +749,12 @@ void out_of_memory(struct zonelist *zone
+ /* Found nothing?!?! Either we hang forever, or we panic. */
if (!p) {
dump_header(NULL, gfp_mask, order, NULL, mpol_mask);
- read_unlock(&tasklist_lock);
- panic("Out of memory and no killable processes...\n");
+
+ /* avoid panic for guest OOM */
}
if (PTR_ERR(p) != -1UL) {
oom_kill_process(p, gfp_mask, order, points, totalpages, NULL,
-diff -NurpP --minimal linux-3.5.4/mm/page_alloc.c linux-3.5.4-vs2.3.4.3/mm/page_alloc.c
---- linux-3.5.4/mm/page_alloc.c 2012-09-16 20:46:31.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/mm/page_alloc.c 2012-08-19 13:28:27.000000000 +0200
-@@ -59,6 +59,8 @@
+diff -NurpP --minimal linux-3.6/mm/page_alloc.c linux-3.6-vs2.3.4.3-noxfs-nocow/mm/page_alloc.c
+--- linux-3.6/mm/page_alloc.c 2012-10-04 15:27:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/mm/page_alloc.c 2012-10-04 18:47:00.000000000 +0200
+@@ -58,6 +58,8 @@
#include <linux/prefetch.h>
#include <linux/migrate.h>
#include <linux/page-debug-flags.h>
#include <asm/tlbflush.h>
#include <asm/div64.h>
-@@ -2711,6 +2713,9 @@ void si_meminfo(struct sysinfo *val)
+@@ -2773,6 +2775,9 @@ void si_meminfo(struct sysinfo *val)
val->totalhigh = totalhigh_pages;
val->freehigh = nr_free_highpages();
val->mem_unit = PAGE_SIZE;
}
EXPORT_SYMBOL(si_meminfo);
-@@ -2731,6 +2736,9 @@ void si_meminfo_node(struct sysinfo *val
+@@ -2793,6 +2798,9 @@ void si_meminfo_node(struct sysinfo *val
val->freehigh = 0;
#endif
val->mem_unit = PAGE_SIZE;
}
#endif
-diff -NurpP --minimal linux-3.5.4/mm/pgtable-generic.c linux-3.5.4-vs2.3.4.3/mm/pgtable-generic.c
---- linux-3.5.4/mm/pgtable-generic.c 2012-07-22 23:39:47.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/mm/pgtable-generic.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/mm/pgtable-generic.c linux-3.6-vs2.3.4.3-noxfs-nocow/mm/pgtable-generic.c
+--- linux-3.6/mm/pgtable-generic.c 2012-07-22 23:39:47.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/mm/pgtable-generic.c 2012-10-04 18:47:00.000000000 +0200
@@ -6,6 +6,8 @@
* Copyright (C) 2010 Linus Torvalds
*/
#include <linux/pagemap.h>
#include <asm/tlb.h>
#include <asm-generic/pgtable.h>
-diff -NurpP --minimal linux-3.5.4/mm/shmem.c linux-3.5.4-vs2.3.4.3/mm/shmem.c
---- linux-3.5.4/mm/shmem.c 2012-07-22 23:39:47.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/mm/shmem.c 2012-07-23 01:45:55.000000000 +0200
-@@ -1812,7 +1812,7 @@ static int shmem_statfs(struct dentry *d
+diff -NurpP --minimal linux-3.6/mm/shmem.c linux-3.6-vs2.3.4.3-noxfs-nocow/mm/shmem.c
+--- linux-3.6/mm/shmem.c 2012-10-04 15:27:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/mm/shmem.c 2012-10-04 18:47:00.000000000 +0200
+@@ -1814,7 +1814,7 @@ static int shmem_statfs(struct dentry *d
{
struct shmem_sb_info *sbinfo = SHMEM_SB(dentry->d_sb);
buf->f_bsize = PAGE_CACHE_SIZE;
buf->f_namelen = NAME_MAX;
if (sbinfo->max_blocks) {
-@@ -2628,7 +2628,7 @@ int shmem_fill_super(struct super_block
+@@ -2630,7 +2630,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;
sb->s_op = &shmem_ops;
sb->s_time_gran = 1;
#ifdef CONFIG_TMPFS_XATTR
-diff -NurpP --minimal linux-3.5.4/mm/slab.c linux-3.5.4-vs2.3.4.3/mm/slab.c
---- linux-3.5.4/mm/slab.c 2012-05-21 18:07:35.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/mm/slab.c 2012-07-23 01:45:55.000000000 +0200
-@@ -413,6 +413,8 @@ static void kmem_list3_init(struct kmem_
+diff -NurpP --minimal linux-3.6/mm/slab.c linux-3.6-vs2.3.4.3-noxfs-nocow/mm/slab.c
+--- linux-3.6/mm/slab.c 2012-10-04 15:27:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/mm/slab.c 2012-10-04 18:47:00.000000000 +0200
+@@ -445,6 +445,8 @@ static void kmem_list3_init(struct kmem_
#define STATS_INC_FREEMISS(x) do { } while (0)
#endif
#if DEBUG
/*
-@@ -3466,6 +3468,7 @@ retry:
+@@ -3539,6 +3541,7 @@ retry:
obj = slab_get_obj(cachep, slabp, nodeid);
check_slabp(cachep, slabp);
l3->free_objects--;
/* move slabp to correct slabp list: */
list_del(&slabp->list);
-@@ -3543,6 +3546,7 @@ __cache_alloc_node(struct kmem_cache *ca
+@@ -3616,6 +3619,7 @@ __cache_alloc_node(struct kmem_cache *ca
/* ___cache_alloc_node can fall back to other nodes */
ptr = ____cache_alloc_node(cachep, flags, nodeid);
out:
+ vx_slab_alloc(cachep, flags);
local_irq_restore(save_flags);
ptr = cache_alloc_debugcheck_after(cachep, flags, ptr, caller);
- kmemleak_alloc_recursive(ptr, obj_size(cachep), 1, cachep->flags,
-@@ -3730,6 +3734,7 @@ static inline void __cache_free(struct k
+ kmemleak_alloc_recursive(ptr, cachep->object_size, 1, cachep->flags,
+@@ -3806,6 +3810,7 @@ static inline void __cache_free(struct k
check_irq_off();
kmemleak_free_recursive(objp, cachep->flags);
objp = cache_free_debugcheck(cachep, objp, caller);
+ vx_slab_free(cachep);
- kmemcheck_slab_free(cachep, objp, obj_size(cachep));
+ kmemcheck_slab_free(cachep, objp, cachep->object_size);
-diff -NurpP --minimal linux-3.5.4/mm/slab_vs.h linux-3.5.4-vs2.3.4.3/mm/slab_vs.h
---- linux-3.5.4/mm/slab_vs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/mm/slab_vs.h 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/mm/slab_vs.h linux-3.6-vs2.3.4.3-noxfs-nocow/mm/slab_vs.h
+--- linux-3.6/mm/slab_vs.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/mm/slab_vs.h 2012-10-04 18:47:00.000000000 +0200
@@ -0,0 +1,29 @@
+
+#include <linux/vserver/context.h>
+ atomic_sub(cachep->buffer_size, &vxi->cacct.slab[what]);
+}
+
-diff -NurpP --minimal linux-3.5.4/mm/swapfile.c linux-3.5.4-vs2.3.4.3/mm/swapfile.c
---- linux-3.5.4/mm/swapfile.c 2012-07-22 23:39:47.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/mm/swapfile.c 2012-07-23 01:45:55.000000000 +0200
-@@ -38,6 +38,7 @@
+diff -NurpP --minimal linux-3.6/mm/swapfile.c linux-3.6-vs2.3.4.3-noxfs-nocow/mm/swapfile.c
+--- linux-3.6/mm/swapfile.c 2012-10-04 15:27:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/mm/swapfile.c 2012-10-04 18:47:00.000000000 +0200
+@@ -39,6 +39,7 @@
#include <asm/tlbflush.h>
#include <linux/swapops.h>
#include <linux/page_cgroup.h>
static bool swap_count_continued(struct swap_info_struct *, pgoff_t,
unsigned char);
-@@ -1746,6 +1747,16 @@ static int swap_show(struct seq_file *sw
+@@ -1686,6 +1687,16 @@ static int swap_show(struct seq_file *sw
if (si == SEQ_START_TOKEN) {
seq_puts(swap,"Filename\t\t\t\tType\t\tSize\tUsed\tPriority\n");
return 0;
}
-@@ -2173,6 +2184,8 @@ void si_swapinfo(struct sysinfo *val)
+@@ -2113,6 +2124,8 @@ void si_swapinfo(struct sysinfo *val)
val->freeswap = nr_swap_pages + nr_to_be_unused;
val->totalswap = total_swap_pages + nr_to_be_unused;
spin_unlock(&swap_lock);
}
/*
-diff -NurpP --minimal linux-3.5.4/net/bridge/br_multicast.c linux-3.5.4-vs2.3.4.3/net/bridge/br_multicast.c
---- linux-3.5.4/net/bridge/br_multicast.c 2012-07-22 23:39:47.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/net/bridge/br_multicast.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/net/bridge/br_multicast.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/bridge/br_multicast.c
+--- linux-3.6/net/bridge/br_multicast.c 2012-10-04 15:27:49.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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));
kfree_skb(skb);
return NULL;
}
-diff -NurpP --minimal linux-3.5.4/net/core/dev.c linux-3.5.4-vs2.3.4.3/net/core/dev.c
---- linux-3.5.4/net/core/dev.c 2012-09-16 20:46:31.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/net/core/dev.c 2012-08-19 13:28:27.000000000 +0200
+diff -NurpP --minimal linux-3.6/net/core/dev.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/core/dev.c
+--- linux-3.6/net/core/dev.c 2012-10-04 15:27:49.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/core/dev.c 2012-10-04 18:47:00.000000000 +0200
@@ -126,6 +126,7 @@
#include <linux/in.h>
#include <linux/jhash.h>
/* avoid cases where sscanf is not exact inverse of printf */
snprintf(buf, IFNAMSIZ, name, i);
-@@ -3976,6 +3995,8 @@ static int dev_ifconf(struct net *net, c
+@@ -4071,6 +4090,8 @@ static int dev_ifconf(struct net *net, c
total = 0;
for_each_netdev(net, dev) {
for (i = 0; i < NPROTO; i++) {
if (gifconf_list[i]) {
int done;
-@@ -4078,6 +4099,10 @@ static void dev_seq_printf_stats(struct
+@@ -4173,6 +4194,10 @@ static void dev_seq_printf_stats(struct
struct rtnl_link_stats64 temp;
const struct rtnl_link_stats64 *stats = dev_get_stats(dev, &temp);
seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
"%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
dev->name, stats->rx_bytes, stats->rx_packets,
-diff -NurpP --minimal linux-3.5.4/net/core/rtnetlink.c linux-3.5.4-vs2.3.4.3/net/core/rtnetlink.c
---- linux-3.5.4/net/core/rtnetlink.c 2012-09-16 20:46:31.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/net/core/rtnetlink.c 2012-08-19 13:28:27.000000000 +0200
-@@ -1085,6 +1085,8 @@ static int rtnl_dump_ifinfo(struct sk_bu
+diff -NurpP --minimal linux-3.6/net/core/rtnetlink.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/core/rtnetlink.c
+--- linux-3.6/net/core/rtnetlink.c 2012-10-04 15:27:49.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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)
goto cont;
if (rtnl_fill_ifinfo(skb, dev, RTM_NEWLINK,
NETLINK_CB(cb->skb).pid,
cb->nlh->nlmsg_seq, 0,
-@@ -1967,6 +1969,9 @@ void rtmsg_ifinfo(int type, struct net_d
+@@ -1969,6 +1971,9 @@ void rtmsg_ifinfo(int type, struct net_d
int err = -ENOBUFS;
size_t if_info_size;
skb = nlmsg_new((if_info_size = if_nlmsg_size(dev, 0)), GFP_KERNEL);
if (skb == NULL)
goto errout;
-diff -NurpP --minimal linux-3.5.4/net/core/sock.c linux-3.5.4-vs2.3.4.3/net/core/sock.c
---- linux-3.5.4/net/core/sock.c 2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/net/core/sock.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/net/core/sock.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/core/sock.c
+--- linux-3.6/net/core/sock.c 2012-10-04 15:27:49.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/core/sock.c 2012-10-04 18:47:00.000000000 +0200
@@ -132,6 +132,10 @@
#include <net/netprio_cgroup.h>
#include <trace/events/sock.h>
-@@ -1138,6 +1142,8 @@ static struct sock *sk_prot_alloc(struct
+@@ -1194,6 +1198,8 @@ static struct sock *sk_prot_alloc(struct
goto out_free_sec;
sk_tx_queue_clear(sk);
}
return sk;
-@@ -1246,6 +1252,11 @@ static void __sk_free(struct sock *sk)
+@@ -1302,6 +1308,11 @@ static void __sk_free(struct sock *sk)
put_cred(sk->sk_peer_cred);
put_pid(sk->sk_peer_pid);
put_net(sock_net(sk));
sk_prot_free(sk->sk_prot_creator, sk);
}
-@@ -1306,6 +1317,8 @@ struct sock *sk_clone_lock(const struct
+@@ -1362,6 +1373,8 @@ struct sock *sk_clone_lock(const struct
/* SANITY */
get_net(sock_net(newsk));
sk_node_init(&newsk->sk_node);
sock_lock_init(newsk);
bh_lock_sock(newsk);
-@@ -1362,6 +1375,12 @@ struct sock *sk_clone_lock(const struct
+@@ -1418,6 +1431,12 @@ struct sock *sk_clone_lock(const struct
smp_wmb();
atomic_set(&newsk->sk_refcnt, 2);
/*
* Increment the counter in the same struct proto as the master
* sock (sk_refcnt_debug_inc uses newsk->sk_prot->socks, that
-@@ -2118,6 +2137,12 @@ void sock_init_data(struct socket *sock,
+@@ -2187,6 +2206,12 @@ void sock_init_data(struct socket *sock,
sk->sk_stamp = ktime_set(-1L, 0);
/*
* Before updating sk_refcnt, we must commit prior changes to memory
* (Documentation/RCU/rculist_nulls.txt for details)
-diff -NurpP --minimal linux-3.5.4/net/ipv4/af_inet.c linux-3.5.4-vs2.3.4.3/net/ipv4/af_inet.c
---- linux-3.5.4/net/ipv4/af_inet.c 2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/net/ipv4/af_inet.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/net/ipv4/af_inet.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/af_inet.c
+--- linux-3.6/net/ipv4/af_inet.c 2012-10-04 15:27:49.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/af_inet.c 2012-10-04 18:47:00.000000000 +0200
@@ -118,6 +118,7 @@
#ifdef CONFIG_IP_MROUTE
#include <linux/mroute.h>
/* The inetsw table contains everything that inet_create needs to
-@@ -327,9 +328,13 @@ lookup_protocol:
+@@ -326,9 +327,13 @@ lookup_protocol:
}
err = -EPERM;
err = -EAFNOSUPPORT;
if (!inet_netns_ok(net, protocol))
goto out_rcu_unlock;
-@@ -454,6 +459,7 @@ int inet_bind(struct socket *sock, struc
+@@ -453,6 +458,7 @@ int inet_bind(struct socket *sock, struc
struct sockaddr_in *addr = (struct sockaddr_in *)uaddr;
struct sock *sk = sock->sk;
struct inet_sock *inet = inet_sk(sk);
unsigned short snum;
int chk_addr_ret;
int err;
-@@ -477,7 +483,11 @@ int inet_bind(struct socket *sock, struc
+@@ -476,7 +482,11 @@ int inet_bind(struct socket *sock, struc
goto out;
}
/* Not specified by any standard per-se, however it breaks too
* many applications when removed. It is unfortunate since
-@@ -489,7 +499,7 @@ int inet_bind(struct socket *sock, struc
+@@ -488,7 +498,7 @@ int inet_bind(struct socket *sock, struc
err = -EADDRNOTAVAIL;
if (!sysctl_ip_nonlocal_bind &&
!(inet->freebind || inet->transparent) &&
chk_addr_ret != RTN_LOCAL &&
chk_addr_ret != RTN_MULTICAST &&
chk_addr_ret != RTN_BROADCAST)
-@@ -514,7 +524,7 @@ int inet_bind(struct socket *sock, struc
+@@ -513,7 +523,7 @@ int inet_bind(struct socket *sock, struc
if (sk->sk_state != TCP_CLOSE || inet->inet_num)
goto out_release_sock;
if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST)
inet->inet_saddr = 0; /* Use device */
-@@ -717,11 +727,13 @@ int inet_getname(struct socket *sock, st
+@@ -731,11 +741,13 @@ int inet_getname(struct socket *sock, st
peer == 1))
return -ENOTCONN;
sin->sin_port = inet->inet_dport;
sin->sin_port = inet->inet_sport;
sin->sin_addr.s_addr = addr;
}
-diff -NurpP --minimal linux-3.5.4/net/ipv4/arp.c linux-3.5.4-vs2.3.4.3/net/ipv4/arp.c
---- linux-3.5.4/net/ipv4/arp.c 2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/net/ipv4/arp.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/net/ipv4/arp.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/arp.c
+--- linux-3.6/net/ipv4/arp.c 2012-10-04 15:27:49.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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;
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.5.4/net/ipv4/devinet.c linux-3.5.4-vs2.3.4.3/net/ipv4/devinet.c
---- linux-3.5.4/net/ipv4/devinet.c 2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/net/ipv4/devinet.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/net/ipv4/devinet.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/devinet.c
+--- linux-3.6/net/ipv4/devinet.c 2012-10-04 15:27:49.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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);
if (ip_idx < s_ip_idx)
continue;
if (inet_fill_ifaddr(skb, ifa,
-diff -NurpP --minimal linux-3.5.4/net/ipv4/fib_trie.c linux-3.5.4-vs2.3.4.3/net/ipv4/fib_trie.c
---- linux-3.5.4/net/ipv4/fib_trie.c 2012-05-21 18:07:40.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/net/ipv4/fib_trie.c 2012-07-23 01:45:55.000000000 +0200
-@@ -2556,6 +2556,7 @@ static int fib_route_seq_show(struct seq
+diff -NurpP --minimal linux-3.6/net/ipv4/fib_trie.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/fib_trie.c
+--- linux-3.6/net/ipv4/fib_trie.c 2012-10-04 15:27:49.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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;
if (fi)
seq_printf(seq,
"%s\t%08X\t%08X\t%04X\t%d\t%u\t"
-diff -NurpP --minimal linux-3.5.4/net/ipv4/inet_connection_sock.c linux-3.5.4-vs2.3.4.3/net/ipv4/inet_connection_sock.c
---- linux-3.5.4/net/ipv4/inet_connection_sock.c 2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/net/ipv4/inet_connection_sock.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/net/ipv4/inet_connection_sock.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/inet_connection_sock.c
+--- linux-3.6/net/ipv4/inet_connection_sock.c 2012-10-04 15:27:49.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/inet_connection_sock.c 2012-10-04 18:47:00.000000000 +0200
@@ -53,6 +53,37 @@ void inet_get_local_port_range(int *low,
}
EXPORT_SYMBOL(inet_get_local_port_range);
break;
}
if (!relax && reuse && sk2->sk_reuse &&
-diff -NurpP --minimal linux-3.5.4/net/ipv4/inet_diag.c linux-3.5.4-vs2.3.4.3/net/ipv4/inet_diag.c
---- linux-3.5.4/net/ipv4/inet_diag.c 2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/net/ipv4/inet_diag.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/net/ipv4/inet_diag.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/inet_diag.c
+--- linux-3.6/net/ipv4/inet_diag.c 2012-10-04 15:27:49.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/inet_diag.c 2012-10-04 19:02:16.000000000 +0200
@@ -31,6 +31,8 @@
#include <linux/inet.h>
#include <linux/inet_diag.h>
#include <linux/sock_diag.h>
-@@ -106,8 +108,10 @@ int inet_sk_diag_fill(struct sock *sk, s
+@@ -101,8 +103,10 @@ int inet_sk_diag_fill(struct sock *sk, s
r->id.idiag_sport = inet->inet_sport;
r->id.idiag_dport = inet->inet_dport;
/* IPv6 dual-stack sockets use inet->tos for IPv4 connections,
* hence this needs to be included regardless of socket family.
-@@ -227,8 +231,8 @@ static int inet_twsk_diag_fill(struct in
+@@ -233,8 +237,8 @@ static int inet_twsk_diag_fill(struct in
sock_diag_save_cookie(tw, r->id.idiag_cookie);
r->id.idiag_sport = tw->tw_sport;
r->id.idiag_dport = tw->tw_dport;
r->idiag_state = tw->tw_substate;
r->idiag_timer = 3;
r->idiag_expires = DIV_ROUND_UP(tmo * 1000, HZ);
-@@ -272,12 +276,14 @@ int inet_diag_dump_one_icsk(struct inet_
+@@ -276,12 +280,14 @@ int inet_diag_dump_one_icsk(struct inet_
err = -EINVAL;
if (req->sdiag_family == AF_INET) {
+ /* TODO: lback */
- sk = inet_lookup(&init_net, hashinfo, req->id.idiag_dst[0],
+ sk = inet_lookup(net, hashinfo, req->id.idiag_dst[0],
req->id.idiag_dport, req->id.idiag_src[0],
req->id.idiag_sport, req->id.idiag_if);
}
#if IS_ENABLED(CONFIG_IPV6)
else if (req->sdiag_family == AF_INET6) {
+ /* TODO: lback */
- sk = inet6_lookup(&init_net, hashinfo,
+ sk = inet6_lookup(net, hashinfo,
(struct in6_addr *)req->id.idiag_dst,
req->id.idiag_dport,
-@@ -472,6 +478,7 @@ int inet_diag_bc_sk(const struct nlattr
+@@ -476,6 +482,7 @@ int inet_diag_bc_sk(const struct nlattr
} else
#endif
{
entry.saddr = &inet->inet_rcv_saddr;
entry.daddr = &inet->inet_daddr;
}
-@@ -570,6 +577,7 @@ static int inet_twsk_diag_dump(struct in
+@@ -574,6 +581,7 @@ static int inet_twsk_diag_dump(struct in
} else
#endif
{
entry.saddr = &tw->tw_rcv_saddr;
entry.daddr = &tw->tw_daddr;
}
-@@ -615,8 +623,8 @@ static int inet_diag_fill_req(struct sk_
+@@ -620,8 +628,8 @@ static int inet_diag_fill_req(struct sk_
r->id.idiag_sport = inet->inet_sport;
r->id.idiag_dport = ireq->rmt_port;
entry.saddr =
#if IS_ENABLED(CONFIG_IPV6)
(entry.family == AF_INET6) ?
-@@ -744,6 +753,8 @@ void inet_diag_dump_icsk(struct inet_has
- sk_nulls_for_each(sk, node, &ilb->head) {
- struct inet_sock *inet = inet_sk(sk);
+@@ -748,6 +757,8 @@ void inet_diag_dump_icsk(struct inet_has
+ if (!net_eq(sock_net(sk), net))
+ continue;
+ if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
+ continue;
if (num < s_num) {
num++;
continue;
-@@ -814,6 +825,8 @@ skip_listen_ht:
- sk_nulls_for_each(sk, node, &head->chain) {
- struct inet_sock *inet = inet_sk(sk);
+@@ -820,6 +831,8 @@ skip_listen_ht:
+ if (!net_eq(sock_net(sk), net))
+ continue;
+ if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
+ continue;
if (num < s_num)
goto next_normal;
if (!(r->idiag_states & (1 << sk->sk_state)))
-@@ -841,6 +854,8 @@ next_normal:
- inet_twsk_for_each(tw, node,
+@@ -848,7 +861,8 @@ next_normal:
&head->twchain) {
-
+ if (!net_eq(twsk_net(tw), net))
+ continue;
+-
+ if (!nx_check(tw->tw_nid, VS_WATCH_P | VS_IDENT))
+ continue;
if (num < s_num)
goto next_dying;
if (r->sdiag_family != AF_UNSPEC &&
-diff -NurpP --minimal linux-3.5.4/net/ipv4/inet_hashtables.c linux-3.5.4-vs2.3.4.3/net/ipv4/inet_hashtables.c
---- linux-3.5.4/net/ipv4/inet_hashtables.c 2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/net/ipv4/inet_hashtables.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/net/ipv4/inet_hashtables.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/inet_hashtables.c
+--- linux-3.6/net/ipv4/inet_hashtables.c 2012-07-22 23:39:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/inet_hashtables.c 2012-10-04 18:47:00.000000000 +0200
@@ -22,6 +22,7 @@
#include <net/inet_connection_sock.h>
#include <net/inet_hashtables.h>
/*
* if the nulls value we got at the end of this lookup is
* not the expected one, we must restart lookup.
-diff -NurpP --minimal linux-3.5.4/net/ipv4/netfilter/nf_nat_helper.c linux-3.5.4-vs2.3.4.3/net/ipv4/netfilter/nf_nat_helper.c
---- linux-3.5.4/net/ipv4/netfilter/nf_nat_helper.c 2012-03-19 19:47:33.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/net/ipv4/netfilter/nf_nat_helper.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/net/ipv4/netfilter/nf_nat_helper.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/netfilter/nf_nat_helper.c
+--- linux-3.6/net/ipv4/netfilter/nf_nat_helper.c 2012-10-04 15:27:50.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/netfilter/nf_nat_helper.c 2012-10-04 18:47:00.000000000 +0200
@@ -20,6 +20,7 @@
#include <net/route.h>
#include <net/netfilter/nf_conntrack.h>
#include <net/netfilter/nf_conntrack_helper.h>
#include <net/netfilter/nf_conntrack_ecache.h>
-diff -NurpP --minimal linux-3.5.4/net/ipv4/netfilter.c linux-3.5.4-vs2.3.4.3/net/ipv4/netfilter.c
---- linux-3.5.4/net/ipv4/netfilter.c 2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/net/ipv4/netfilter.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/net/ipv4/netfilter.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/netfilter.c
+--- linux-3.6/net/ipv4/netfilter.c 2012-07-22 23:39:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/netfilter.c 2012-10-04 18:47:00.000000000 +0200
@@ -6,7 +6,7 @@
#include <linux/skbuff.h>
#include <linux/gfp.h>
#include <net/xfrm.h>
#include <net/ip.h>
#include <net/netfilter/nf_queue.h>
-diff -NurpP --minimal linux-3.5.4/net/ipv4/raw.c linux-3.5.4-vs2.3.4.3/net/ipv4/raw.c
---- linux-3.5.4/net/ipv4/raw.c 2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/net/ipv4/raw.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/net/ipv4/raw.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/raw.c
+--- linux-3.6/net/ipv4/raw.c 2012-10-04 15:27:50.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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 &&
!(sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif))
goto found; /* gotcha */
}
-@@ -390,6 +390,12 @@ static int raw_send_hdrinc(struct sock *
+@@ -397,6 +397,12 @@ static int raw_send_hdrinc(struct sock *
icmp_out_count(net, ((struct icmphdr *)
skb_transport_header(skb))->type);
err = NF_HOOK(NFPROTO_IPV4, NF_INET_LOCAL_OUT, skb, NULL,
rt->dst.dev, dst_output);
if (err > 0)
-@@ -575,6 +581,16 @@ static int raw_sendmsg(struct kiocb *ioc
+@@ -582,6 +588,16 @@ static int raw_sendmsg(struct kiocb *ioc
goto done;
}
security_sk_classify_flow(sk, flowi4_to_flowi(&fl4));
rt = ip_route_output_flow(sock_net(sk), &fl4, sk);
if (IS_ERR(rt)) {
-@@ -651,17 +667,19 @@ static int raw_bind(struct sock *sk, str
+@@ -658,17 +674,19 @@ static int raw_bind(struct sock *sk, str
{
struct inet_sock *inet = inet_sk(sk);
struct sockaddr_in *addr = (struct sockaddr_in *) uaddr;
if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST)
inet->inet_saddr = 0; /* Use device */
sk_dst_reset(sk);
-@@ -713,7 +731,8 @@ static int raw_recvmsg(struct kiocb *ioc
+@@ -720,7 +738,8 @@ static int raw_recvmsg(struct kiocb *ioc
/* Copy the address. */
if (sin) {
sin->sin_family = AF_INET;
sin->sin_port = 0;
memset(&sin->sin_zero, 0, sizeof(sin->sin_zero));
}
-@@ -909,7 +928,8 @@ static struct sock *raw_get_first(struct
+@@ -916,7 +935,8 @@ static struct sock *raw_get_first(struct
struct hlist_node *node;
sk_for_each(sk, node, &state->h->ht[state->bucket])
goto found;
}
sk = NULL;
-@@ -925,7 +945,8 @@ static struct sock *raw_get_next(struct
+@@ -932,7 +952,8 @@ static struct sock *raw_get_next(struct
sk = sk_next(sk);
try_again:
;
if (!sk && ++state->bucket < RAW_HTABLE_SIZE) {
sk = sk_head(&state->h->ht[state->bucket]);
-diff -NurpP --minimal linux-3.5.4/net/ipv4/route.c linux-3.5.4-vs2.3.4.3/net/ipv4/route.c
---- linux-3.5.4/net/ipv4/route.c 2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/net/ipv4/route.c 2012-07-23 01:45:55.000000000 +0200
-@@ -2690,7 +2690,7 @@ static struct rtable *ip_route_output_sl
+diff -NurpP --minimal linux-3.6/net/ipv4/route.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/route.c
+--- linux-3.6/net/ipv4/route.c 2012-10-04 15:27:50.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/route.c 2012-10-04 18:47:00.000000000 +0200
+@@ -1928,7 +1928,7 @@ struct rtable *__ip_route_output_key(str
if (fl4->flowi4_oif) {
rth = ERR_PTR(-ENODEV);
if (dev_out == NULL)
goto out;
-diff -NurpP --minimal linux-3.5.4/net/ipv4/tcp.c linux-3.5.4-vs2.3.4.3/net/ipv4/tcp.c
---- linux-3.5.4/net/ipv4/tcp.c 2012-09-16 20:46:31.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/net/ipv4/tcp.c 2012-08-11 15:15:02.000000000 +0200
+diff -NurpP --minimal linux-3.6/net/ipv4/tcp.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/tcp.c
+--- linux-3.6/net/ipv4/tcp.c 2012-10-04 15:27:50.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/tcp.c 2012-10-04 18:47:00.000000000 +0200
@@ -268,6 +268,7 @@
#include <linux/crypto.h>
#include <linux/time.h>
+#include <linux/in.h>
#include <net/icmp.h>
- #include <net/tcp.h>
-diff -NurpP --minimal linux-3.5.4/net/ipv4/tcp_ipv4.c linux-3.5.4-vs2.3.4.3/net/ipv4/tcp_ipv4.c
---- linux-3.5.4/net/ipv4/tcp_ipv4.c 2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/net/ipv4/tcp_ipv4.c 2012-07-23 01:45:55.000000000 +0200
-@@ -2005,6 +2005,12 @@ static void *listening_get_next(struct s
+ #include <net/inet_common.h>
+diff -NurpP --minimal linux-3.6/net/ipv4/tcp_ipv4.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/tcp_ipv4.c
+--- linux-3.6/net/ipv4/tcp_ipv4.c 2012-10-04 15:27:50.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/tcp_ipv4.c 2012-10-04 18:47:00.000000000 +0200
+@@ -2033,6 +2033,12 @@ static void *listening_get_next(struct s
req = req->dl_next;
while (1) {
while (req) {
if (req->rsk_ops->family == st->family) {
cur = req;
goto out;
-@@ -2029,6 +2035,10 @@ get_req:
+@@ -2057,6 +2063,10 @@ get_req:
}
get_sk:
sk_nulls_for_each_from(sk, node) {
if (!net_eq(sock_net(sk), net))
continue;
if (sk->sk_family == st->family) {
-@@ -2105,6 +2115,11 @@ static void *established_get_first(struc
+@@ -2133,6 +2143,11 @@ static void *established_get_first(struc
spin_lock_bh(lock);
sk_nulls_for_each(sk, node, &tcp_hashinfo.ehash[st->bucket].chain) {
if (sk->sk_family != st->family ||
!net_eq(sock_net(sk), net)) {
continue;
-@@ -2115,6 +2130,11 @@ static void *established_get_first(struc
+@@ -2143,6 +2158,11 @@ static void *established_get_first(struc
st->state = TCP_SEQ_STATE_TIME_WAIT;
inet_twsk_for_each(tw, node,
&tcp_hashinfo.ehash[st->bucket].twchain) {
if (tw->tw_family != st->family ||
!net_eq(twsk_net(tw), net)) {
continue;
-@@ -2144,7 +2164,9 @@ static void *established_get_next(struct
+@@ -2172,7 +2192,9 @@ static void *established_get_next(struct
tw = cur;
tw = tw_next(tw);
get_tw:
tw = tw_next(tw);
}
if (tw) {
-@@ -2168,6 +2190,11 @@ get_tw:
+@@ -2196,6 +2218,11 @@ get_tw:
sk = sk_nulls_next(sk);
sk_nulls_for_each_from(sk, node) {
if (sk->sk_family == st->family && net_eq(sock_net(sk), net))
goto found;
}
-@@ -2373,9 +2400,9 @@ static void get_openreq4(const struct so
+@@ -2401,9 +2428,9 @@ static void get_openreq4(const struct so
seq_printf(f, "%4d: %08X:%04X %08X:%04X"
" %02X %08X:%08X %02X:%08lX %08X %5d %8d %u %d %pK%n",
i,
ntohs(ireq->rmt_port),
TCP_SYN_RECV,
0, 0, /* could print option size, but that is af dependent. */
-@@ -2397,8 +2424,8 @@ static void get_tcp4_sock(struct sock *s
+@@ -2425,8 +2452,8 @@ static void get_tcp4_sock(struct sock *s
const struct tcp_sock *tp = tcp_sk(sk);
const struct inet_connection_sock *icsk = inet_csk(sk);
const struct inet_sock *inet = inet_sk(sk);
__u16 destp = ntohs(inet->inet_dport);
__u16 srcp = ntohs(inet->inet_sport);
int rx_queue;
-@@ -2455,8 +2482,8 @@ static void get_timewait4_sock(const str
+@@ -2483,8 +2510,8 @@ static void get_timewait4_sock(const str
if (ttd < 0)
ttd = 0;
destp = ntohs(tw->tw_dport);
srcp = ntohs(tw->tw_sport);
-diff -NurpP --minimal linux-3.5.4/net/ipv4/tcp_minisocks.c linux-3.5.4-vs2.3.4.3/net/ipv4/tcp_minisocks.c
---- linux-3.5.4/net/ipv4/tcp_minisocks.c 2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/net/ipv4/tcp_minisocks.c 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/net/ipv4/tcp_minisocks.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/tcp_minisocks.c
+--- linux-3.6/net/ipv4/tcp_minisocks.c 2012-10-04 15:27:50.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/tcp_minisocks.c 2012-10-04 18:47:00.000000000 +0200
@@ -23,6 +23,9 @@
#include <linux/slab.h>
#include <linux/sysctl.h>
#include <net/tcp.h>
#include <net/inet_common.h>
#include <net/xfrm.h>
-@@ -336,6 +339,11 @@ void tcp_time_wait(struct sock *sk, int
+@@ -287,6 +290,11 @@ void tcp_time_wait(struct sock *sk, int
tcptw->tw_ts_recent = tp->rx_opt.ts_recent;
tcptw->tw_ts_recent_stamp = tp->rx_opt.ts_recent_stamp;
#if IS_ENABLED(CONFIG_IPV6)
if (tw->tw_family == PF_INET6) {
struct ipv6_pinfo *np = inet6_sk(sk);
-diff -NurpP --minimal linux-3.5.4/net/ipv4/udp.c linux-3.5.4-vs2.3.4.3/net/ipv4/udp.c
---- linux-3.5.4/net/ipv4/udp.c 2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/net/ipv4/udp.c 2012-07-23 01:45:55.000000000 +0200
-@@ -299,14 +299,7 @@ fail:
+diff -NurpP --minimal linux-3.6/net/ipv4/udp.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/udp.c
+--- linux-3.6/net/ipv4/udp.c 2012-10-04 15:27:50.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv4/udp.c 2012-10-04 18:47:00.000000000 +0200
+@@ -300,14 +300,7 @@ fail:
}
EXPORT_SYMBOL(udp_lib_get_port);
static unsigned int udp4_portaddr_hash(struct net *net, __be32 saddr,
unsigned int port)
-@@ -341,6 +334,11 @@ static inline int compute_score(struct s
+@@ -342,6 +335,11 @@ static inline int compute_score(struct s
if (inet->inet_rcv_saddr != daddr)
return -1;
score += 2;
}
if (inet->inet_daddr) {
if (inet->inet_daddr != saddr)
-@@ -444,6 +442,7 @@ exact_match:
+@@ -445,6 +443,7 @@ exact_match:
return result;
}
/* UDP is nearly always wildcards out the wazoo, it makes no sense to try
* harder than this. -DaveM
*/
-@@ -489,6 +488,11 @@ begin:
+@@ -490,6 +489,11 @@ begin:
sk_nulls_for_each_rcu(sk, node, &hslot->head) {
score = compute_score(sk, net, saddr, hnum, sport,
daddr, dport, dif);
if (score > badness) {
result = sk;
badness = score;
-@@ -502,6 +506,7 @@ begin:
+@@ -503,6 +507,7 @@ begin:
if (get_nulls_value(node) != slot)
goto begin;
if (result) {
if (unlikely(!atomic_inc_not_zero_hint(&result->sk_refcnt, 2)))
result = NULL;
-@@ -511,6 +516,7 @@ begin:
+@@ -512,6 +517,7 @@ begin:
goto begin;
}
}
rcu_read_unlock();
return result;
}
-@@ -554,8 +560,7 @@ static inline struct sock *udp_v4_mcast_
+@@ -555,8 +561,7 @@ static inline struct sock *udp_v4_mcast_
udp_sk(s)->udp_port_hash != hnum ||
(inet->inet_daddr && inet->inet_daddr != rmt_addr) ||
(inet->inet_dport != rmt_port && inet->inet_dport) ||
ipv6_only_sock(s) ||
(s->sk_bound_dev_if && s->sk_bound_dev_if != dif))
continue;
-@@ -934,6 +939,16 @@ int udp_sendmsg(struct kiocb *iocb, stru
+@@ -939,6 +944,16 @@ int udp_sendmsg(struct kiocb *iocb, stru
inet_sk_flowi_flags(sk)|FLOWI_FLAG_CAN_SLEEP,
faddr, saddr, dport, inet->inet_sport);
security_sk_classify_flow(sk, flowi4_to_flowi(fl4));
rt = ip_route_output_flow(net, fl4, sk);
if (IS_ERR(rt)) {
-@@ -1232,7 +1247,8 @@ try_again:
+@@ -1244,7 +1259,8 @@ try_again:
if (sin) {
sin->sin_family = AF_INET;
sin->sin_port = udp_hdr(skb)->source;
memset(sin->sin_zero, 0, sizeof(sin->sin_zero));
}
if (inet->cmsg_flags)
-@@ -1980,6 +1996,8 @@ static struct sock *udp_get_first(struct
+@@ -1992,6 +2008,8 @@ static struct sock *udp_get_first(struct
sk_nulls_for_each(sk, node, &hslot->head) {
if (!net_eq(sock_net(sk), net))
continue;
if (sk->sk_family == state->family)
goto found;
}
-@@ -1997,7 +2015,9 @@ static struct sock *udp_get_next(struct
+@@ -2009,7 +2027,9 @@ static struct sock *udp_get_next(struct
do {
sk = sk_nulls_next(sk);
if (!sk) {
if (state->bucket <= state->udp_table->mask)
-@@ -2093,8 +2113,8 @@ static void udp4_format_sock(struct sock
+@@ -2105,8 +2125,8 @@ static void udp4_format_sock(struct sock
int bucket, int *len)
{
struct inet_sock *inet = inet_sk(sp);
__u16 destp = ntohs(inet->inet_dport);
__u16 srcp = ntohs(inet->inet_sport);
-diff -NurpP --minimal linux-3.5.4/net/ipv6/Kconfig linux-3.5.4-vs2.3.4.3/net/ipv6/Kconfig
---- linux-3.5.4/net/ipv6/Kconfig 2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/net/ipv6/Kconfig 2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.6/net/ipv6/Kconfig linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv6/Kconfig
+--- linux-3.6/net/ipv6/Kconfig 2012-07-22 23:39:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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
---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.5.4/net/ipv6/addrconf.c linux-3.5.4-vs2.3.4.3/net/ipv6/addrconf.c
---- linux-3.5.4/net/ipv6/addrconf.c 2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/net/ipv6/addrconf.c 2012-07-23 01:45:56.000000000 +0200
-@@ -91,6 +91,8 @@
+diff -NurpP --minimal linux-3.6/net/ipv6/addrconf.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv6/addrconf.c
+--- linux-3.6/net/ipv6/addrconf.c 2012-10-04 15:27:50.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv6/addrconf.c 2012-10-04 18:47:00.000000000 +0200
+@@ -92,6 +92,8 @@
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
#include <linux/export.h>
/* Set to 3 to get tracing... */
#define ACONF_DEBUG 2
-@@ -1102,7 +1104,7 @@ out:
+@@ -1095,7 +1097,7 @@ out:
int ipv6_dev_get_saddr(struct net *net, struct net_device *dst_dev,
const struct in6_addr *daddr, unsigned int prefs,
{
struct ipv6_saddr_score scores[2],
*score = &scores[0], *hiscore = &scores[1];
-@@ -1174,6 +1176,8 @@ int ipv6_dev_get_saddr(struct net *net,
+@@ -1167,6 +1169,8 @@ int ipv6_dev_get_saddr(struct net *net,
dev->name);
continue;
}
score->rule = -1;
bitmap_zero(score->scorebits, IPV6_SADDR_RULE_MAX);
-@@ -3157,7 +3161,10 @@ static void if6_seq_stop(struct seq_file
+@@ -3150,7 +3154,10 @@ static void if6_seq_stop(struct seq_file
static int if6_seq_show(struct seq_file *seq, void *v)
{
struct inet6_ifaddr *ifp = (struct inet6_ifaddr *)v;
&ifp->addr,
ifp->idev->dev->ifindex,
ifp->prefix_len,
-@@ -3663,6 +3670,11 @@ static int in6_dump_addrs(struct inet6_d
+@@ -3656,6 +3663,11 @@ static int in6_dump_addrs(struct inet6_d
struct ifacaddr6 *ifaca;
int err = 1;
int ip_idx = *p_ip_idx;
read_lock_bh(&idev->lock);
switch (type) {
-@@ -3673,6 +3685,8 @@ static int in6_dump_addrs(struct inet6_d
+@@ -3666,6 +3678,8 @@ static int in6_dump_addrs(struct inet6_d
list_for_each_entry(ifa, &idev->addr_list, if_list) {
if (++ip_idx < s_ip_idx)
continue;
err = inet6_fill_ifaddr(skb, ifa,
NETLINK_CB(cb->skb).pid,
cb->nlh->nlmsg_seq,
-@@ -3689,6 +3703,8 @@ static int in6_dump_addrs(struct inet6_d
+@@ -3682,6 +3696,8 @@ static int in6_dump_addrs(struct inet6_d
ifmca = ifmca->next, ip_idx++) {
if (ip_idx < s_ip_idx)
continue;
err = inet6_fill_ifmcaddr(skb, ifmca,
NETLINK_CB(cb->skb).pid,
cb->nlh->nlmsg_seq,
-@@ -3704,6 +3720,8 @@ static int in6_dump_addrs(struct inet6_d
+@@ -3697,6 +3713,8 @@ static int in6_dump_addrs(struct inet6_d
ifaca = ifaca->aca_next, ip_idx++) {
if (ip_idx < s_ip_idx)
continue;
err = inet6_fill_ifacaddr(skb, ifaca,
NETLINK_CB(cb->skb).pid,
cb->nlh->nlmsg_seq,
-@@ -4087,6 +4105,11 @@ static int inet6_dump_ifinfo(struct sk_b
+@@ -4080,6 +4098,11 @@ static int inet6_dump_ifinfo(struct sk_b
struct inet6_dev *idev;
struct hlist_head *head;
struct hlist_node *node;
s_h = cb->args[0];
s_idx = cb->args[1];
-@@ -4098,6 +4121,8 @@ static int inet6_dump_ifinfo(struct sk_b
+@@ -4091,6 +4114,8 @@ static int inet6_dump_ifinfo(struct sk_b
hlist_for_each_entry_rcu(dev, node, head, index_hlist) {
if (idx < s_idx)
goto cont;
idev = __in6_dev_get(dev);
if (!idev)
goto cont;
-diff -NurpP --minimal linux-3.5.4/net/ipv6/af_inet6.c linux-3.5.4-vs2.3.4.3/net/ipv6/af_inet6.c
---- linux-3.5.4/net/ipv6/af_inet6.c 2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/net/ipv6/af_inet6.c 2012-08-27 12:52:07.000000000 +0200
+diff -NurpP --minimal linux-3.6/net/ipv6/af_inet6.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv6/af_inet6.c
+--- linux-3.6/net/ipv6/af_inet6.c 2012-07-22 23:39:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv6/af_inet6.c 2012-10-04 18:47:00.000000000 +0200
@@ -43,6 +43,8 @@
#include <linux/netdevice.h>
#include <linux/icmpv6.h>
if (ipv6_addr_any(&np->rcv_saddr))
sin->sin6_addr = np->saddr;
else
-diff -NurpP --minimal linux-3.5.4/net/ipv6/datagram.c linux-3.5.4-vs2.3.4.3/net/ipv6/datagram.c
---- linux-3.5.4/net/ipv6/datagram.c 2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/net/ipv6/datagram.c 2012-07-23 01:45:56.000000000 +0200
+diff -NurpP --minimal linux-3.6/net/ipv6/datagram.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv6/datagram.c
+--- linux-3.6/net/ipv6/datagram.c 2012-07-22 23:39:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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();
if (!dev) {
rcu_read_unlock();
return -ENODEV;
-diff -NurpP --minimal linux-3.5.4/net/ipv6/fib6_rules.c linux-3.5.4-vs2.3.4.3/net/ipv6/fib6_rules.c
---- linux-3.5.4/net/ipv6/fib6_rules.c 2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/net/ipv6/fib6_rules.c 2012-07-23 01:45:56.000000000 +0200
+diff -NurpP --minimal linux-3.6/net/ipv6/fib6_rules.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv6/fib6_rules.c
+--- linux-3.6/net/ipv6/fib6_rules.c 2012-07-22 23:39:48.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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,
goto again;
if (!ipv6_prefix_equal(&saddr, &r->src.addr,
r->src.plen))
-diff -NurpP --minimal linux-3.5.4/net/ipv6/inet6_hashtables.c linux-3.5.4-vs2.3.4.3/net/ipv6/inet6_hashtables.c
---- linux-3.5.4/net/ipv6/inet6_hashtables.c 2011-10-24 18:45:34.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/net/ipv6/inet6_hashtables.c 2012-07-23 01:45:56.000000000 +0200
+diff -NurpP --minimal linux-3.6/net/ipv6/inet6_hashtables.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv6/inet6_hashtables.c
+--- linux-3.6/net/ipv6/inet6_hashtables.c 2011-10-24 18:45:34.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv6/inet6_hashtables.c 2012-10-04 18:47:00.000000000 +0200
@@ -16,6 +16,7 @@
#include <linux/module.h>
}
if (sk->sk_bound_dev_if) {
if (sk->sk_bound_dev_if != dif)
-diff -NurpP --minimal linux-3.5.4/net/ipv6/ip6_output.c linux-3.5.4-vs2.3.4.3/net/ipv6/ip6_output.c
---- linux-3.5.4/net/ipv6/ip6_output.c 2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/net/ipv6/ip6_output.c 2012-07-23 01:45:56.000000000 +0200
-@@ -973,7 +973,8 @@ static int ip6_dst_lookup_tail(struct so
+diff -NurpP --minimal linux-3.6/net/ipv6/ip6_output.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv6/ip6_output.c
+--- linux-3.6/net/ipv6/ip6_output.c 2012-10-04 15:27:50.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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,
sk ? inet6_sk(sk)->srcprefs : 0,
if (err)
goto out_err_release;
}
-diff -NurpP --minimal linux-3.5.4/net/ipv6/ndisc.c linux-3.5.4-vs2.3.4.3/net/ipv6/ndisc.c
---- linux-3.5.4/net/ipv6/ndisc.c 2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/net/ipv6/ndisc.c 2012-07-23 01:45:56.000000000 +0200
-@@ -562,7 +562,7 @@ static void ndisc_send_na(struct net_dev
+diff -NurpP --minimal linux-3.6/net/ipv6/ndisc.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv6/ndisc.c
+--- linux-3.6/net/ipv6/ndisc.c 2012-10-04 15:27:50.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv6/ndisc.c 2012-10-04 18:47:00.000000000 +0200
+@@ -517,7 +517,7 @@ static void ndisc_send_na(struct net_dev
} else {
if (ipv6_dev_get_saddr(dev_net(dev), dev, daddr,
inet6_sk(dev_net(dev)->ipv6.ndisc_sk)->srcprefs,
return;
src_addr = &tmpaddr;
}
-diff -NurpP --minimal linux-3.5.4/net/ipv6/raw.c linux-3.5.4-vs2.3.4.3/net/ipv6/raw.c
---- linux-3.5.4/net/ipv6/raw.c 2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/net/ipv6/raw.c 2012-07-23 01:45:56.000000000 +0200
+diff -NurpP --minimal linux-3.6/net/ipv6/raw.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv6/raw.c
+--- linux-3.6/net/ipv6/raw.c 2012-10-04 15:27:50.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv6/raw.c 2012-10-04 18:47:00.000000000 +0200
@@ -30,6 +30,7 @@
#include <linux/icmpv6.h>
#include <linux/netfilter.h>
#include <linux/skbuff.h>
#include <linux/compat.h>
#include <asm/uaccess.h>
-@@ -285,6 +286,13 @@ static int rawv6_bind(struct sock *sk, s
+@@ -284,6 +285,13 @@ static int rawv6_bind(struct sock *sk, s
goto out_unlock;
}
/* ipv4 addr of the socket is invalid. Only the
* unspecified and mapped address have a v4 equivalent.
*/
-diff -NurpP --minimal linux-3.5.4/net/ipv6/route.c linux-3.5.4-vs2.3.4.3/net/ipv6/route.c
---- linux-3.5.4/net/ipv6/route.c 2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/net/ipv6/route.c 2012-07-23 10:25:43.000000000 +0200
+diff -NurpP --minimal linux-3.6/net/ipv6/route.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv6/route.c
+--- linux-3.6/net/ipv6/route.c 2012-10-04 15:27:50.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv6/route.c 2012-10-04 18:47:00.000000000 +0200
@@ -57,6 +57,7 @@
#include <net/xfrm.h>
#include <net/netevent.h>
#include <asm/uaccess.h>
-@@ -2140,15 +2141,17 @@ int ip6_route_get_saddr(struct net *net,
+@@ -2111,15 +2112,17 @@ int ip6_route_get_saddr(struct net *net,
struct rt6_info *rt,
const struct in6_addr *daddr,
unsigned int prefs,
return err;
}
-@@ -2484,7 +2487,8 @@ static int rt6_fill_node(struct net *net
+@@ -2455,7 +2458,8 @@ static int rt6_fill_node(struct net *net
goto nla_put_failure;
} else if (dst) {
struct in6_addr saddr_buf;
nla_put(skb, RTA_PREFSRC, 16, &saddr_buf))
goto nla_put_failure;
}
-@@ -2714,6 +2718,7 @@ static int rt6_info_route(struct rt6_inf
+@@ -2673,6 +2677,7 @@ static int rt6_info_route(struct rt6_inf
struct seq_file *m = p_arg;
struct neighbour *n;
seq_printf(m, "%pi6 %02x ", &rt->rt6i_dst.addr, rt->rt6i_dst.plen);
#ifdef CONFIG_IPV6_SUBTREES
-diff -NurpP --minimal linux-3.5.4/net/ipv6/tcp_ipv6.c linux-3.5.4-vs2.3.4.3/net/ipv6/tcp_ipv6.c
---- linux-3.5.4/net/ipv6/tcp_ipv6.c 2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/net/ipv6/tcp_ipv6.c 2012-07-23 01:45:56.000000000 +0200
+diff -NurpP --minimal linux-3.6/net/ipv6/tcp_ipv6.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv6/tcp_ipv6.c
+--- linux-3.6/net/ipv6/tcp_ipv6.c 2012-10-04 15:27:50.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv6/tcp_ipv6.c 2012-10-04 18:47:00.000000000 +0200
@@ -71,6 +71,7 @@
#include <linux/crypto.h>
static void tcp_v6_send_reset(struct sock *sk, struct sk_buff *skb);
static void tcp_v6_reqsk_send_ack(struct sock *sk, struct sk_buff *skb,
-@@ -163,8 +164,15 @@ static int tcp_v6_connect(struct sock *s
+@@ -175,8 +176,15 @@ static int tcp_v6_connect(struct sock *s
* connect() to INADDR_ANY means loopback (BSD'ism).
*/
addr_type = ipv6_addr_type(&usin->sin6_addr);
-diff -NurpP --minimal linux-3.5.4/net/ipv6/udp.c linux-3.5.4-vs2.3.4.3/net/ipv6/udp.c
---- linux-3.5.4/net/ipv6/udp.c 2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/net/ipv6/udp.c 2012-07-23 01:45:56.000000000 +0200
-@@ -45,41 +45,67 @@
+diff -NurpP --minimal linux-3.6/net/ipv6/udp.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv6/udp.c
+--- linux-3.6/net/ipv6/udp.c 2012-10-04 15:27:50.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv6/udp.c 2012-10-04 18:56:03.000000000 +0200
+@@ -45,42 +45,68 @@
#include <net/tcp_states.h>
#include <net/ip6_checksum.h>
#include <net/xfrm.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
+ #include <trace/events/skb.h>
#include "udp_impl.h"
-int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
}
static unsigned int udp6_portaddr_hash(struct net *net,
-@@ -143,6 +169,10 @@ static inline int compute_score(struct s
+@@ -144,6 +170,10 @@ static inline int compute_score(struct s
if (!ipv6_addr_equal(&np->rcv_saddr, daddr))
return -1;
score++;
}
if (!ipv6_addr_any(&np->daddr)) {
if (!ipv6_addr_equal(&np->daddr, saddr))
-diff -NurpP --minimal linux-3.5.4/net/ipv6/xfrm6_policy.c linux-3.5.4-vs2.3.4.3/net/ipv6/xfrm6_policy.c
---- linux-3.5.4/net/ipv6/xfrm6_policy.c 2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/net/ipv6/xfrm6_policy.c 2012-07-23 01:45:56.000000000 +0200
+diff -NurpP --minimal linux-3.6/net/ipv6/xfrm6_policy.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/ipv6/xfrm6_policy.c
+--- linux-3.6/net/ipv6/xfrm6_policy.c 2012-10-04 15:27:50.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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,
dst_release(dst);
return 0;
}
-diff -NurpP --minimal linux-3.5.4/net/netfilter/ipvs/ip_vs_xmit.c linux-3.5.4-vs2.3.4.3/net/netfilter/ipvs/ip_vs_xmit.c
---- linux-3.5.4/net/netfilter/ipvs/ip_vs_xmit.c 2012-03-19 19:47:33.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/net/netfilter/ipvs/ip_vs_xmit.c 2012-07-23 01:45:56.000000000 +0200
+diff -NurpP --minimal linux-3.6/net/netfilter/ipvs/ip_vs_xmit.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/netfilter/ipvs/ip_vs_xmit.c
+--- linux-3.6/net/netfilter/ipvs/ip_vs_xmit.c 2012-10-04 15:27:50.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/netfilter/ipvs/ip_vs_xmit.c 2012-10-04 18:47:00.000000000 +0200
@@ -226,7 +226,7 @@ __ip_vs_route_output_v6(struct net *net,
return dst;
if (ipv6_addr_any(&fl6.saddr) &&
goto out_err;
if (do_xfrm) {
dst = xfrm_lookup(net, dst, flowi6_to_flowi(&fl6), NULL, 0);
-diff -NurpP --minimal linux-3.5.4/net/netlink/af_netlink.c linux-3.5.4-vs2.3.4.3/net/netlink/af_netlink.c
---- linux-3.5.4/net/netlink/af_netlink.c 2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/net/netlink/af_netlink.c 2012-07-23 01:45:56.000000000 +0200
+diff -NurpP --minimal linux-3.6/net/netlink/af_netlink.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/netlink/af_netlink.c
+--- linux-3.6/net/netlink/af_netlink.c 2012-10-04 15:27:50.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/netlink/af_netlink.c 2012-10-04 18:47:00.000000000 +0200
@@ -55,6 +55,9 @@
#include <linux/types.h>
#include <linux/audit.h>
#include <net/net_namespace.h>
#include <net/sock.h>
-@@ -1935,6 +1938,8 @@ static struct sock *netlink_seq_socket_i
+@@ -1959,6 +1962,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;
if (off == pos) {
iter->link = i;
iter->hash_idx = j;
-@@ -1969,7 +1974,8 @@ static void *netlink_seq_next(struct seq
+@@ -1993,7 +1998,8 @@ static void *netlink_seq_next(struct seq
s = v;
do {
s = sk_next(s);
if (s)
return s;
-@@ -1981,7 +1987,8 @@ static void *netlink_seq_next(struct seq
+@@ -2005,7 +2011,8 @@ static void *netlink_seq_next(struct seq
for (; j <= hash->mask; j++) {
s = sk_head(&hash->table[j]);
s = sk_next(s);
if (s) {
iter->link = i;
-diff -NurpP --minimal linux-3.5.4/net/socket.c linux-3.5.4-vs2.3.4.3/net/socket.c
---- linux-3.5.4/net/socket.c 2012-09-16 20:46:31.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/net/socket.c 2012-09-16 20:50:19.000000000 +0200
+diff -NurpP --minimal linux-3.6/net/socket.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/socket.c
+--- linux-3.6/net/socket.c 2012-10-04 15:27:51.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/socket.c 2012-10-04 18:47:00.000000000 +0200
@@ -98,6 +98,10 @@
#include <net/sock.h>
#include <linux/if_tun.h>
#include <linux/ipv6_route.h>
-@@ -551,6 +555,7 @@ static inline int __sock_sendmsg_nosec(s
+@@ -552,6 +556,7 @@ static inline int __sock_sendmsg_nosec(s
struct msghdr *msg, size_t size)
{
struct sock_iocb *si = kiocb_to_siocb(iocb);
sock_update_classid(sock->sk);
-@@ -561,7 +566,22 @@ static inline int __sock_sendmsg_nosec(s
+@@ -560,7 +565,22 @@ static inline int __sock_sendmsg_nosec(s
si->msg = msg;
si->size = size;
}
static inline int __sock_sendmsg(struct kiocb *iocb, struct socket *sock,
-@@ -717,6 +737,7 @@ static inline int __sock_recvmsg_nosec(s
+@@ -716,6 +736,7 @@ static inline int __sock_recvmsg_nosec(s
struct msghdr *msg, size_t size, int flags)
{
struct sock_iocb *si = kiocb_to_siocb(iocb);
sock_update_classid(sock->sk);
-@@ -726,7 +747,18 @@ static inline int __sock_recvmsg_nosec(s
+@@ -725,7 +746,18 @@ static inline int __sock_recvmsg_nosec(s
si->size = size;
si->flags = flags;
}
static inline int __sock_recvmsg(struct kiocb *iocb, struct socket *sock,
-@@ -1211,6 +1243,13 @@ int __sock_create(struct net *net, int f
+@@ -1210,6 +1242,13 @@ int __sock_create(struct net *net, int f
if (type < 0 || type >= SOCK_MAX)
return -EINVAL;
/* Compatibility.
This uglymoron is moved from INET layer to here to avoid
-@@ -1345,6 +1384,7 @@ SYSCALL_DEFINE3(socket, int, family, int
+@@ -1344,6 +1383,7 @@ SYSCALL_DEFINE3(socket, int, family, int
if (retval < 0)
goto out;
retval = sock_map_fd(sock, flags & (O_CLOEXEC | O_NONBLOCK));
if (retval < 0)
goto out_release;
-@@ -1386,10 +1426,12 @@ SYSCALL_DEFINE4(socketpair, int, family,
+@@ -1385,10 +1425,12 @@ SYSCALL_DEFINE4(socketpair, int, family,
err = sock_create(family, type, protocol, &sock1);
if (err < 0)
goto out;
err = sock1->ops->socketpair(sock1, sock2);
if (err < 0)
-diff -NurpP --minimal linux-3.5.4/net/sunrpc/auth.c linux-3.5.4-vs2.3.4.3/net/sunrpc/auth.c
---- linux-3.5.4/net/sunrpc/auth.c 2011-10-24 18:45:34.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/net/sunrpc/auth.c 2012-07-23 01:45:56.000000000 +0200
-@@ -14,6 +14,7 @@
- #include <linux/hash.h>
+diff -NurpP --minimal linux-3.6/net/sunrpc/auth.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/sunrpc/auth.c
+--- linux-3.6/net/sunrpc/auth.c 2012-10-04 15:27:51.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/sunrpc/auth.c 2012-10-04 18:47:00.000000000 +0200
+@@ -15,6 +15,7 @@
#include <linux/sunrpc/clnt.h>
+ #include <linux/sunrpc/gss_api.h>
#include <linux/spinlock.h>
+#include <linux/vs_tag.h>
#ifdef RPC_DEBUG
# define RPCDBG_FACILITY RPCDBG_AUTH
-@@ -427,6 +428,7 @@ rpcauth_lookupcred(struct rpc_auth *auth
+@@ -481,6 +482,7 @@ rpcauth_lookupcred(struct rpc_auth *auth
memset(&acred, 0, sizeof(acred));
acred.uid = cred->fsuid;
acred.gid = cred->fsgid;
acred.group_info = get_group_info(((struct cred *)cred)->group_info);
ret = auth->au_ops->lookup_cred(auth, &acred, flags);
-@@ -467,6 +469,7 @@ rpcauth_bind_root_cred(struct rpc_task *
+@@ -521,6 +523,7 @@ rpcauth_bind_root_cred(struct rpc_task *
struct auth_cred acred = {
.uid = 0,
.gid = 0,
};
dprintk("RPC: %5u looking up %s cred\n",
-diff -NurpP --minimal linux-3.5.4/net/sunrpc/auth_unix.c linux-3.5.4-vs2.3.4.3/net/sunrpc/auth_unix.c
---- linux-3.5.4/net/sunrpc/auth_unix.c 2012-07-22 23:39:49.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/net/sunrpc/auth_unix.c 2012-07-23 10:26:39.000000000 +0200
+diff -NurpP --minimal linux-3.6/net/sunrpc/auth_unix.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/sunrpc/auth_unix.c
+--- linux-3.6/net/sunrpc/auth_unix.c 2012-07-22 23:39:49.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/sunrpc/auth_unix.c 2012-10-04 18:47:00.000000000 +0200
@@ -13,11 +13,13 @@
#include <linux/sunrpc/clnt.h>
#include <linux/sunrpc/auth.h>
hold = p++;
for (i = 0; i < 16 && cred->uc_gids[i] != (gid_t) NOGROUP; i++)
*p++ = htonl((u32) cred->uc_gids[i]);
-diff -NurpP --minimal linux-3.5.4/net/sunrpc/clnt.c linux-3.5.4-vs2.3.4.3/net/sunrpc/clnt.c
---- linux-3.5.4/net/sunrpc/clnt.c 2012-09-16 20:46:31.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/net/sunrpc/clnt.c 2012-08-19 13:28:27.000000000 +0200
+diff -NurpP --minimal linux-3.6/net/sunrpc/clnt.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/sunrpc/clnt.c
+--- linux-3.6/net/sunrpc/clnt.c 2012-10-04 15:27:51.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/sunrpc/clnt.c 2012-10-04 18:47:00.000000000 +0200
@@ -31,6 +31,7 @@
#include <linux/in6.h>
#include <linux/un.h>
return clnt;
}
EXPORT_SYMBOL_GPL(rpc_create);
-diff -NurpP --minimal linux-3.5.4/net/unix/af_unix.c linux-3.5.4-vs2.3.4.3/net/unix/af_unix.c
---- linux-3.5.4/net/unix/af_unix.c 2012-07-22 23:39:49.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/net/unix/af_unix.c 2012-07-23 01:45:56.000000000 +0200
+diff -NurpP --minimal linux-3.6/net/unix/af_unix.c linux-3.6-vs2.3.4.3-noxfs-nocow/net/unix/af_unix.c
+--- linux-3.6/net/unix/af_unix.c 2012-10-04 15:27:51.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/net/unix/af_unix.c 2012-10-04 18:59:36.000000000 +0200
@@ -114,6 +114,8 @@
#include <linux/mount.h>
#include <net/checksum.h>
+#include <linux/vs_context.h>
+#include <linux/vs_limit.h>
- struct hlist_head unix_socket_table[UNIX_HASH_SIZE + 1];
+ struct hlist_head unix_socket_table[2 * UNIX_HASH_SIZE];
EXPORT_SYMBOL_GPL(unix_socket_table);
-@@ -262,6 +264,8 @@ static struct sock *__unix_find_socket_b
+@@ -271,6 +273,8 @@ static struct sock *__unix_find_socket_b
if (!net_eq(sock_net(s), net))
continue;
if (u->addr->len == len &&
!memcmp(u->addr->name, sunname, len))
goto found;
-@@ -2276,6 +2280,8 @@ static struct sock *unix_seq_idx(struct
- for (s = first_unix_socket(&iter->i); s; s = next_unix_socket(&iter->i, s)) {
- if (sock_net(s) != seq_file_net(seq))
+@@ -2258,6 +2262,8 @@ static struct sock *unix_from_bucket(str
+ for (sk = sk_head(&unix_socket_table[bucket]); sk; sk = sk_next(sk)) {
+ if (sock_net(sk) != seq_file_net(seq))
continue;
-+ if (!nx_check(s->sk_nid, VS_WATCH_P | VS_IDENT))
++ if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
+ continue;
- if (off == pos)
- return s;
- ++off;
-@@ -2300,7 +2306,8 @@ static void *unix_seq_next(struct seq_fi
- sk = first_unix_socket(&iter->i);
- else
- sk = next_unix_socket(&iter->i, sk);
-- while (sk && (sock_net(sk) != seq_file_net(seq)))
-+ while (sk && (sock_net(sk) != seq_file_net(seq) ||
-+ !nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)))
- sk = next_unix_socket(&iter->i, sk);
- return sk;
- }
-diff -NurpP --minimal linux-3.5.4/scripts/checksyscalls.sh linux-3.5.4-vs2.3.4.3/scripts/checksyscalls.sh
---- linux-3.5.4/scripts/checksyscalls.sh 2012-03-19 19:47:34.000000000 +0100
-+++ linux-3.5.4-vs2.3.4.3/scripts/checksyscalls.sh 2012-07-23 01:45:56.000000000 +0200
+ if (++count == offset)
+ break;
+ }
+@@ -2275,6 +2281,8 @@ static struct sock *unix_next_socket(str
+ sk = sk_next(sk);
+ if (!sk)
+ goto next_bucket;
++ if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
++ continue;
+ if (sock_net(sk) == seq_file_net(seq))
+ return sk;
+ }
+diff -NurpP --minimal linux-3.6/scripts/checksyscalls.sh linux-3.6-vs2.3.4.3-noxfs-nocow/scripts/checksyscalls.sh
+--- linux-3.6/scripts/checksyscalls.sh 2012-10-04 15:27:51.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/scripts/checksyscalls.sh 2012-10-04 18:47:00.000000000 +0200
@@ -193,7 +193,6 @@ cat << EOF
#define __IGNORE_afs_syscall
#define __IGNORE_getpmsg
EOF
}
-diff -NurpP --minimal linux-3.5.4/security/commoncap.c linux-3.5.4-vs2.3.4.3/security/commoncap.c
---- linux-3.5.4/security/commoncap.c 2012-07-22 23:39:51.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/security/commoncap.c 2012-07-23 11:05:45.000000000 +0200
+diff -NurpP --minimal linux-3.6/security/commoncap.c linux-3.6-vs2.3.4.3-noxfs-nocow/security/commoncap.c
+--- linux-3.6/security/commoncap.c 2012-07-22 23:39:51.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/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)
return -EPERM;
return 0;
}
-diff -NurpP --minimal linux-3.5.4/security/selinux/hooks.c linux-3.5.4-vs2.3.4.3/security/selinux/hooks.c
---- linux-3.5.4/security/selinux/hooks.c 2012-09-16 20:46:31.000000000 +0200
-+++ linux-3.5.4-vs2.3.4.3/security/selinux/hooks.c 2012-08-19 13:28:27.000000000 +0200
+diff -NurpP --minimal linux-3.6/security/selinux/hooks.c linux-3.6-vs2.3.4.3-noxfs-nocow/security/selinux/hooks.c
+--- linux-3.6/security/selinux/hooks.c 2012-10-04 15:27:53.000000000 +0200
++++ linux-3.6-vs2.3.4.3-noxfs-nocow/security/selinux/hooks.c 2012-10-04 18:47:00.000000000 +0200
@@ -66,7 +66,6 @@
#include <linux/dccp.h>
#include <linux/quota.h>
projects / packages / kernel.git / commitdiff