From: Jan RÄ™korajski Date: Fri, 14 Mar 2014 19:23:54 +0000 (+0100) Subject: - 3.4.83 X-Git-Tag: auto/th/kernel-3.4-3.4.83-1 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=648adf06da77858b05432a10184d8a3435fc9349;p=packages%2Fkernel.git - 3.4.83 - vserver patch updated to patch-3.4.83-vs2.3.3.9.diff --- diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch index d687a879..01754b7e 100644 --- a/kernel-vserver-2.3.patch +++ b/kernel-vserver-2.3.patch @@ -1,6 +1,6 @@ -diff -NurpP --minimal linux-3.4.57/Documentation/vserver/debug.txt linux-3.4.57-vs2.3.3.9/Documentation/vserver/debug.txt ---- linux-3.4.57/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/Documentation/vserver/debug.txt 2012-05-21 16:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/Documentation/vserver/debug.txt linux-3.4.83-vs2.3.3.9/Documentation/vserver/debug.txt +--- linux-3.4.83/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/Documentation/vserver/debug.txt 2012-05-21 16:15:04.000000000 +0000 @@ -0,0 +1,154 @@ + +debug_cvirt: @@ -156,9 +156,9 @@ diff -NurpP --minimal linux-3.4.57/Documentation/vserver/debug.txt linux-3.4.57- + 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.4.57/arch/alpha/Kconfig linux-3.4.57-vs2.3.3.9/arch/alpha/Kconfig ---- linux-3.4.57/arch/alpha/Kconfig 2012-05-21 16:06:12.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/arch/alpha/Kconfig 2012-05-21 16:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/arch/alpha/Kconfig linux-3.4.83-vs2.3.3.9/arch/alpha/Kconfig +--- linux-3.4.83/arch/alpha/Kconfig 2012-05-21 16:06:12.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/arch/alpha/Kconfig 2012-05-21 16:15:04.000000000 +0000 @@ -662,6 +662,8 @@ config DUMMY_CONSOLE depends on VGA_HOSE default y @@ -168,9 +168,9 @@ diff -NurpP --minimal linux-3.4.57/arch/alpha/Kconfig linux-3.4.57-vs2.3.3.9/arc source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.4.57/arch/alpha/kernel/entry.S linux-3.4.57-vs2.3.3.9/arch/alpha/kernel/entry.S ---- linux-3.4.57/arch/alpha/kernel/entry.S 2010-10-21 11:06:45.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/arch/alpha/kernel/entry.S 2012-05-21 16:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/arch/alpha/kernel/entry.S linux-3.4.83-vs2.3.3.9/arch/alpha/kernel/entry.S +--- linux-3.4.83/arch/alpha/kernel/entry.S 2010-10-21 11:06:45.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/arch/alpha/kernel/entry.S 2012-05-21 16:15:04.000000000 +0000 @@ -860,24 +860,15 @@ sys_getxgid: .globl sys_getxpid .ent sys_getxpid @@ -203,9 +203,9 @@ diff -NurpP --minimal linux-3.4.57/arch/alpha/kernel/entry.S linux-3.4.57-vs2.3. ret .end sys_getxpid -diff -NurpP --minimal linux-3.4.57/arch/alpha/kernel/ptrace.c linux-3.4.57-vs2.3.3.9/arch/alpha/kernel/ptrace.c ---- linux-3.4.57/arch/alpha/kernel/ptrace.c 2012-05-21 16:06:12.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/arch/alpha/kernel/ptrace.c 2012-05-21 16:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/arch/alpha/kernel/ptrace.c linux-3.4.83-vs2.3.3.9/arch/alpha/kernel/ptrace.c +--- linux-3.4.83/arch/alpha/kernel/ptrace.c 2012-05-21 16:06:12.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/arch/alpha/kernel/ptrace.c 2012-05-21 16:15:04.000000000 +0000 @@ -13,6 +13,7 @@ #include #include @@ -214,9 +214,9 @@ diff -NurpP --minimal linux-3.4.57/arch/alpha/kernel/ptrace.c linux-3.4.57-vs2.3 #include #include -diff -NurpP --minimal linux-3.4.57/arch/alpha/kernel/systbls.S linux-3.4.57-vs2.3.3.9/arch/alpha/kernel/systbls.S ---- linux-3.4.57/arch/alpha/kernel/systbls.S 2012-01-09 15:13:54.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/arch/alpha/kernel/systbls.S 2012-05-21 16:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/arch/alpha/kernel/systbls.S linux-3.4.83-vs2.3.3.9/arch/alpha/kernel/systbls.S +--- linux-3.4.83/arch/alpha/kernel/systbls.S 2012-01-09 15:13:54.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/arch/alpha/kernel/systbls.S 2012-05-21 16:15:04.000000000 +0000 @@ -446,7 +446,7 @@ sys_call_table: .quad sys_stat64 /* 425 */ .quad sys_lstat64 @@ -226,9 +226,9 @@ diff -NurpP --minimal linux-3.4.57/arch/alpha/kernel/systbls.S linux-3.4.57-vs2. .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.4.57/arch/alpha/kernel/traps.c linux-3.4.57-vs2.3.3.9/arch/alpha/kernel/traps.c ---- linux-3.4.57/arch/alpha/kernel/traps.c 2012-05-21 16:06:12.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/arch/alpha/kernel/traps.c 2012-05-21 16:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/arch/alpha/kernel/traps.c linux-3.4.83-vs2.3.3.9/arch/alpha/kernel/traps.c +--- linux-3.4.83/arch/alpha/kernel/traps.c 2012-05-21 16:06:12.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/arch/alpha/kernel/traps.c 2012-05-21 16:15:04.000000000 +0000 @@ -184,7 +184,8 @@ die_if_kernel(char * str, struct pt_regs #ifdef CONFIG_SMP printk("CPU %d ", hard_smp_processor_id()); @@ -239,9 +239,9 @@ diff -NurpP --minimal linux-3.4.57/arch/alpha/kernel/traps.c linux-3.4.57-vs2.3. dik_show_regs(regs, r9_15); add_taint(TAINT_DIE); dik_show_trace((unsigned long *)(regs+1)); -diff -NurpP --minimal linux-3.4.57/arch/arm/Kconfig linux-3.4.57-vs2.3.3.9/arch/arm/Kconfig ---- linux-3.4.57/arch/arm/Kconfig 2013-08-13 14:12:47.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/arch/arm/Kconfig 2012-12-11 11:42:38.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/arch/arm/Kconfig linux-3.4.83-vs2.3.3.9/arch/arm/Kconfig +--- linux-3.4.83/arch/arm/Kconfig 2014-03-12 09:47:43.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/arch/arm/Kconfig 2012-12-11 11:42:38.000000000 +0000 @@ -2311,6 +2311,8 @@ source "fs/Kconfig" source "arch/arm/Kconfig.debug" @@ -251,9 +251,9 @@ diff -NurpP --minimal linux-3.4.57/arch/arm/Kconfig linux-3.4.57-vs2.3.3.9/arch/ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.4.57/arch/arm/kernel/calls.S linux-3.4.57-vs2.3.3.9/arch/arm/kernel/calls.S ---- linux-3.4.57/arch/arm/kernel/calls.S 2012-01-09 15:13:54.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/arch/arm/kernel/calls.S 2012-05-21 16:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/arch/arm/kernel/calls.S linux-3.4.83-vs2.3.3.9/arch/arm/kernel/calls.S +--- linux-3.4.83/arch/arm/kernel/calls.S 2012-01-09 15:13:54.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/arch/arm/kernel/calls.S 2012-05-21 16:15:04.000000000 +0000 @@ -322,7 +322,7 @@ /* 310 */ CALL(sys_request_key) CALL(sys_keyctl) @@ -263,9 +263,9 @@ diff -NurpP --minimal linux-3.4.57/arch/arm/kernel/calls.S linux-3.4.57-vs2.3.3. CALL(sys_ioprio_set) /* 315 */ CALL(sys_ioprio_get) CALL(sys_inotify_init) -diff -NurpP --minimal linux-3.4.57/arch/arm/kernel/process.c linux-3.4.57-vs2.3.3.9/arch/arm/kernel/process.c ---- linux-3.4.57/arch/arm/kernel/process.c 2013-08-13 14:12:48.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/arch/arm/kernel/process.c 2012-09-01 08:50:48.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/arch/arm/kernel/process.c linux-3.4.83-vs2.3.3.9/arch/arm/kernel/process.c +--- linux-3.4.83/arch/arm/kernel/process.c 2014-03-12 09:47:43.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/arch/arm/kernel/process.c 2014-03-12 09:55:28.000000000 +0000 @@ -357,7 +357,8 @@ void __show_regs(struct pt_regs *regs) void show_regs(struct pt_regs * regs) { @@ -276,10 +276,10 @@ diff -NurpP --minimal linux-3.4.57/arch/arm/kernel/process.c linux-3.4.57-vs2.3. __show_regs(regs); dump_stack(); } -diff -NurpP --minimal linux-3.4.57/arch/arm/kernel/traps.c linux-3.4.57-vs2.3.3.9/arch/arm/kernel/traps.c ---- linux-3.4.57/arch/arm/kernel/traps.c 2013-08-13 14:12:48.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/arch/arm/kernel/traps.c 2012-10-22 13:09:53.000000000 +0000 -@@ -249,8 +249,8 @@ static int __die(const char *str, int er +diff -NurpP --minimal linux-3.4.83/arch/arm/kernel/traps.c linux-3.4.83-vs2.3.3.9/arch/arm/kernel/traps.c +--- linux-3.4.83/arch/arm/kernel/traps.c 2014-03-12 09:47:43.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/arch/arm/kernel/traps.c 2014-03-12 09:55:28.000000000 +0000 +@@ -255,8 +255,8 @@ static int __die(const char *str, int er print_modules(); __show_regs(regs); @@ -290,9 +290,9 @@ diff -NurpP --minimal linux-3.4.57/arch/arm/kernel/traps.c linux-3.4.57-vs2.3.3. if (!user_mode(regs) || in_interrupt()) { dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp, -diff -NurpP --minimal linux-3.4.57/arch/cris/Kconfig linux-3.4.57-vs2.3.3.9/arch/cris/Kconfig ---- linux-3.4.57/arch/cris/Kconfig 2012-03-19 18:46:39.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/arch/cris/Kconfig 2012-05-21 16:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/arch/cris/Kconfig linux-3.4.83-vs2.3.3.9/arch/cris/Kconfig +--- linux-3.4.83/arch/cris/Kconfig 2012-03-19 18:46:39.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/arch/cris/Kconfig 2012-05-21 16:15:04.000000000 +0000 @@ -675,6 +675,8 @@ source "drivers/staging/Kconfig" source "arch/cris/Kconfig.debug" @@ -302,9 +302,9 @@ diff -NurpP --minimal linux-3.4.57/arch/cris/Kconfig linux-3.4.57-vs2.3.3.9/arch source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.4.57/arch/frv/kernel/kernel_thread.S linux-3.4.57-vs2.3.3.9/arch/frv/kernel/kernel_thread.S ---- linux-3.4.57/arch/frv/kernel/kernel_thread.S 2008-12-24 23:26:37.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/arch/frv/kernel/kernel_thread.S 2012-05-21 16:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/arch/frv/kernel/kernel_thread.S linux-3.4.83-vs2.3.3.9/arch/frv/kernel/kernel_thread.S +--- linux-3.4.83/arch/frv/kernel/kernel_thread.S 2008-12-24 23:26:37.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/arch/frv/kernel/kernel_thread.S 2012-05-21 16:15:04.000000000 +0000 @@ -37,7 +37,7 @@ kernel_thread: # start by forking the current process, but with shared VM @@ -314,9 +314,9 @@ diff -NurpP --minimal linux-3.4.57/arch/frv/kernel/kernel_thread.S linux-3.4.57- 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.4.57/arch/h8300/Kconfig linux-3.4.57-vs2.3.3.9/arch/h8300/Kconfig ---- linux-3.4.57/arch/h8300/Kconfig 2012-03-19 18:46:39.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/arch/h8300/Kconfig 2012-05-21 16:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/arch/h8300/Kconfig linux-3.4.83-vs2.3.3.9/arch/h8300/Kconfig +--- linux-3.4.83/arch/h8300/Kconfig 2012-03-19 18:46:39.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/arch/h8300/Kconfig 2012-05-21 16:15:04.000000000 +0000 @@ -214,6 +214,8 @@ source "fs/Kconfig" source "arch/h8300/Kconfig.debug" @@ -326,9 +326,9 @@ diff -NurpP --minimal linux-3.4.57/arch/h8300/Kconfig linux-3.4.57-vs2.3.3.9/arc source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.4.57/arch/ia64/Kconfig linux-3.4.57-vs2.3.3.9/arch/ia64/Kconfig ---- linux-3.4.57/arch/ia64/Kconfig 2012-03-19 18:46:39.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/arch/ia64/Kconfig 2012-05-21 16:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/arch/ia64/Kconfig linux-3.4.83-vs2.3.3.9/arch/ia64/Kconfig +--- linux-3.4.83/arch/ia64/Kconfig 2012-03-19 18:46:39.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/arch/ia64/Kconfig 2012-05-21 16:15:04.000000000 +0000 @@ -654,6 +654,8 @@ source "fs/Kconfig" source "arch/ia64/Kconfig.debug" @@ -338,9 +338,9 @@ diff -NurpP --minimal linux-3.4.57/arch/ia64/Kconfig linux-3.4.57-vs2.3.3.9/arch source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.4.57/arch/ia64/kernel/entry.S linux-3.4.57-vs2.3.3.9/arch/ia64/kernel/entry.S ---- linux-3.4.57/arch/ia64/kernel/entry.S 2012-03-19 18:46:40.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/arch/ia64/kernel/entry.S 2012-05-21 16:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/arch/ia64/kernel/entry.S linux-3.4.83-vs2.3.3.9/arch/ia64/kernel/entry.S +--- linux-3.4.83/arch/ia64/kernel/entry.S 2012-03-19 18:46:40.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/arch/ia64/kernel/entry.S 2012-05-21 16:15:04.000000000 +0000 @@ -1714,7 +1714,7 @@ sys_call_table: data8 sys_mq_notify data8 sys_mq_getsetattr @@ -350,9 +350,9 @@ diff -NurpP --minimal linux-3.4.57/arch/ia64/kernel/entry.S linux-3.4.57-vs2.3.3 data8 sys_waitid // 1270 data8 sys_add_key data8 sys_request_key -diff -NurpP --minimal linux-3.4.57/arch/ia64/kernel/process.c linux-3.4.57-vs2.3.3.9/arch/ia64/kernel/process.c ---- linux-3.4.57/arch/ia64/kernel/process.c 2013-08-13 14:12:49.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/arch/ia64/kernel/process.c 2012-10-22 13:09:53.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/arch/ia64/kernel/process.c linux-3.4.83-vs2.3.3.9/arch/ia64/kernel/process.c +--- linux-3.4.83/arch/ia64/kernel/process.c 2014-03-12 09:47:44.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/arch/ia64/kernel/process.c 2012-10-22 13:09:53.000000000 +0000 @@ -111,8 +111,8 @@ show_regs (struct pt_regs *regs) unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri; @@ -364,9 +364,9 @@ diff -NurpP --minimal linux-3.4.57/arch/ia64/kernel/process.c linux-3.4.57-vs2.3 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.4.57/arch/ia64/kernel/ptrace.c linux-3.4.57-vs2.3.3.9/arch/ia64/kernel/ptrace.c ---- linux-3.4.57/arch/ia64/kernel/ptrace.c 2012-05-21 16:06:26.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/arch/ia64/kernel/ptrace.c 2012-05-21 16:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/arch/ia64/kernel/ptrace.c linux-3.4.83-vs2.3.3.9/arch/ia64/kernel/ptrace.c +--- linux-3.4.83/arch/ia64/kernel/ptrace.c 2012-05-21 16:06:26.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/arch/ia64/kernel/ptrace.c 2012-05-21 16:15:04.000000000 +0000 @@ -21,6 +21,7 @@ #include #include @@ -375,9 +375,9 @@ diff -NurpP --minimal linux-3.4.57/arch/ia64/kernel/ptrace.c linux-3.4.57-vs2.3. #include #include -diff -NurpP --minimal linux-3.4.57/arch/ia64/kernel/traps.c linux-3.4.57-vs2.3.3.9/arch/ia64/kernel/traps.c ---- linux-3.4.57/arch/ia64/kernel/traps.c 2012-05-21 16:06:26.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/arch/ia64/kernel/traps.c 2012-05-21 16:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/arch/ia64/kernel/traps.c linux-3.4.83-vs2.3.3.9/arch/ia64/kernel/traps.c +--- linux-3.4.83/arch/ia64/kernel/traps.c 2012-05-21 16:06:26.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/arch/ia64/kernel/traps.c 2012-05-21 16:15:04.000000000 +0000 @@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re put_cpu(); @@ -402,9 +402,9 @@ diff -NurpP --minimal linux-3.4.57/arch/ia64/kernel/traps.c linux-3.4.57-vs2.3.3 } } } -diff -NurpP --minimal linux-3.4.57/arch/m32r/kernel/traps.c linux-3.4.57-vs2.3.3.9/arch/m32r/kernel/traps.c ---- linux-3.4.57/arch/m32r/kernel/traps.c 2012-05-21 16:06:26.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/arch/m32r/kernel/traps.c 2012-05-21 16:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/arch/m32r/kernel/traps.c linux-3.4.83-vs2.3.3.9/arch/m32r/kernel/traps.c +--- linux-3.4.83/arch/m32r/kernel/traps.c 2012-05-21 16:06:26.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/arch/m32r/kernel/traps.c 2012-05-21 16:15:04.000000000 +0000 @@ -195,8 +195,9 @@ static void show_registers(struct pt_reg } else { printk("SPI: %08lx\n", sp); @@ -417,9 +417,9 @@ diff -NurpP --minimal linux-3.4.57/arch/m32r/kernel/traps.c linux-3.4.57-vs2.3.3 /* * When in-kernel, we also print out the stack and code at the -diff -NurpP --minimal linux-3.4.57/arch/m68k/Kconfig linux-3.4.57-vs2.3.3.9/arch/m68k/Kconfig ---- linux-3.4.57/arch/m68k/Kconfig 2012-05-21 16:06:26.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/arch/m68k/Kconfig 2012-05-21 16:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/arch/m68k/Kconfig linux-3.4.83-vs2.3.3.9/arch/m68k/Kconfig +--- linux-3.4.83/arch/m68k/Kconfig 2012-05-21 16:06:26.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/arch/m68k/Kconfig 2012-05-21 16:15:04.000000000 +0000 @@ -146,6 +146,8 @@ source "fs/Kconfig" source "arch/m68k/Kconfig.debug" @@ -429,9 +429,9 @@ diff -NurpP --minimal linux-3.4.57/arch/m68k/Kconfig linux-3.4.57-vs2.3.3.9/arch source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.4.57/arch/mips/Kconfig linux-3.4.57-vs2.3.3.9/arch/mips/Kconfig ---- linux-3.4.57/arch/mips/Kconfig 2012-05-21 16:06:27.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/arch/mips/Kconfig 2012-05-21 16:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/arch/mips/Kconfig linux-3.4.83-vs2.3.3.9/arch/mips/Kconfig +--- linux-3.4.83/arch/mips/Kconfig 2014-03-12 09:47:44.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/arch/mips/Kconfig 2013-10-26 18:10:20.000000000 +0000 @@ -2516,6 +2516,8 @@ source "fs/Kconfig" source "arch/mips/Kconfig.debug" @@ -441,9 +441,9 @@ diff -NurpP --minimal linux-3.4.57/arch/mips/Kconfig linux-3.4.57-vs2.3.3.9/arch source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.4.57/arch/mips/kernel/ptrace.c linux-3.4.57-vs2.3.3.9/arch/mips/kernel/ptrace.c ---- linux-3.4.57/arch/mips/kernel/ptrace.c 2012-05-21 16:06:27.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/arch/mips/kernel/ptrace.c 2012-05-21 16:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/arch/mips/kernel/ptrace.c linux-3.4.83-vs2.3.3.9/arch/mips/kernel/ptrace.c +--- linux-3.4.83/arch/mips/kernel/ptrace.c 2012-05-21 16:06:27.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/arch/mips/kernel/ptrace.c 2012-05-21 16:15:04.000000000 +0000 @@ -25,6 +25,7 @@ #include #include @@ -462,9 +462,9 @@ diff -NurpP --minimal linux-3.4.57/arch/mips/kernel/ptrace.c linux-3.4.57-vs2.3. 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.4.57/arch/mips/kernel/scall32-o32.S linux-3.4.57-vs2.3.3.9/arch/mips/kernel/scall32-o32.S ---- linux-3.4.57/arch/mips/kernel/scall32-o32.S 2012-01-09 15:14:05.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/arch/mips/kernel/scall32-o32.S 2012-05-21 16:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/arch/mips/kernel/scall32-o32.S linux-3.4.83-vs2.3.3.9/arch/mips/kernel/scall32-o32.S +--- linux-3.4.83/arch/mips/kernel/scall32-o32.S 2012-01-09 15:14:05.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/arch/mips/kernel/scall32-o32.S 2012-05-21 16:15:04.000000000 +0000 @@ -523,7 +523,7 @@ einval: li v0, -ENOSYS sys sys_mq_timedreceive 5 sys sys_mq_notify 2 /* 4275 */ @@ -474,9 +474,9 @@ diff -NurpP --minimal linux-3.4.57/arch/mips/kernel/scall32-o32.S linux-3.4.57-v sys sys_waitid 5 sys sys_ni_syscall 0 /* available, was setaltroot */ sys sys_add_key 5 /* 4280 */ -diff -NurpP --minimal linux-3.4.57/arch/mips/kernel/scall64-64.S linux-3.4.57-vs2.3.3.9/arch/mips/kernel/scall64-64.S ---- linux-3.4.57/arch/mips/kernel/scall64-64.S 2012-01-09 15:14:05.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/arch/mips/kernel/scall64-64.S 2012-05-21 16:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/arch/mips/kernel/scall64-64.S linux-3.4.83-vs2.3.3.9/arch/mips/kernel/scall64-64.S +--- linux-3.4.83/arch/mips/kernel/scall64-64.S 2012-01-09 15:14:05.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/arch/mips/kernel/scall64-64.S 2012-05-21 16:15:04.000000000 +0000 @@ -362,7 +362,7 @@ sys_call_table: PTR sys_mq_timedreceive PTR sys_mq_notify @@ -486,9 +486,9 @@ diff -NurpP --minimal linux-3.4.57/arch/mips/kernel/scall64-64.S linux-3.4.57-vs PTR sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key -diff -NurpP --minimal linux-3.4.57/arch/mips/kernel/scall64-n32.S linux-3.4.57-vs2.3.3.9/arch/mips/kernel/scall64-n32.S ---- linux-3.4.57/arch/mips/kernel/scall64-n32.S 2012-01-09 15:14:05.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/arch/mips/kernel/scall64-n32.S 2012-05-21 16:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/arch/mips/kernel/scall64-n32.S linux-3.4.83-vs2.3.3.9/arch/mips/kernel/scall64-n32.S +--- linux-3.4.83/arch/mips/kernel/scall64-n32.S 2012-01-09 15:14:05.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/arch/mips/kernel/scall64-n32.S 2012-05-21 16:15:04.000000000 +0000 @@ -361,7 +361,7 @@ EXPORT(sysn32_call_table) PTR compat_sys_mq_timedreceive PTR compat_sys_mq_notify @@ -498,9 +498,9 @@ diff -NurpP --minimal linux-3.4.57/arch/mips/kernel/scall64-n32.S linux-3.4.57-v PTR compat_sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key -diff -NurpP --minimal linux-3.4.57/arch/mips/kernel/scall64-o32.S linux-3.4.57-vs2.3.3.9/arch/mips/kernel/scall64-o32.S ---- linux-3.4.57/arch/mips/kernel/scall64-o32.S 2012-01-09 15:14:05.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/arch/mips/kernel/scall64-o32.S 2012-05-21 16:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/arch/mips/kernel/scall64-o32.S linux-3.4.83-vs2.3.3.9/arch/mips/kernel/scall64-o32.S +--- linux-3.4.83/arch/mips/kernel/scall64-o32.S 2012-01-09 15:14:05.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/arch/mips/kernel/scall64-o32.S 2012-05-21 16:15:04.000000000 +0000 @@ -480,7 +480,7 @@ sys_call_table: PTR compat_sys_mq_timedreceive PTR compat_sys_mq_notify /* 4275 */ @@ -510,9 +510,9 @@ diff -NurpP --minimal linux-3.4.57/arch/mips/kernel/scall64-o32.S linux-3.4.57-v PTR sys_32_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key /* 4280 */ -diff -NurpP --minimal linux-3.4.57/arch/mips/kernel/traps.c linux-3.4.57-vs2.3.3.9/arch/mips/kernel/traps.c ---- linux-3.4.57/arch/mips/kernel/traps.c 2012-05-21 16:06:27.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/arch/mips/kernel/traps.c 2012-05-21 16:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/arch/mips/kernel/traps.c linux-3.4.83-vs2.3.3.9/arch/mips/kernel/traps.c +--- linux-3.4.83/arch/mips/kernel/traps.c 2012-05-21 16:06:27.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/arch/mips/kernel/traps.c 2012-05-21 16:15:04.000000000 +0000 @@ -343,9 +343,10 @@ void show_registers(struct pt_regs *regs __show_regs(regs); @@ -527,9 +527,9 @@ diff -NurpP --minimal linux-3.4.57/arch/mips/kernel/traps.c linux-3.4.57-vs2.3.3 if (cpu_has_userlocal) { unsigned long tls; -diff -NurpP --minimal linux-3.4.57/arch/parisc/Kconfig linux-3.4.57-vs2.3.3.9/arch/parisc/Kconfig ---- linux-3.4.57/arch/parisc/Kconfig 2012-03-19 18:46:44.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/arch/parisc/Kconfig 2012-05-21 16:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/arch/parisc/Kconfig linux-3.4.83-vs2.3.3.9/arch/parisc/Kconfig +--- linux-3.4.83/arch/parisc/Kconfig 2012-03-19 18:46:44.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/arch/parisc/Kconfig 2012-05-21 16:15:04.000000000 +0000 @@ -279,6 +279,8 @@ source "fs/Kconfig" source "arch/parisc/Kconfig.debug" @@ -539,9 +539,9 @@ diff -NurpP --minimal linux-3.4.57/arch/parisc/Kconfig linux-3.4.57-vs2.3.3.9/ar source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.4.57/arch/parisc/kernel/syscall_table.S linux-3.4.57-vs2.3.3.9/arch/parisc/kernel/syscall_table.S ---- linux-3.4.57/arch/parisc/kernel/syscall_table.S 2011-10-24 16:45:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/arch/parisc/kernel/syscall_table.S 2012-05-21 16:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/arch/parisc/kernel/syscall_table.S linux-3.4.83-vs2.3.3.9/arch/parisc/kernel/syscall_table.S +--- linux-3.4.83/arch/parisc/kernel/syscall_table.S 2011-10-24 16:45:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/arch/parisc/kernel/syscall_table.S 2012-05-21 16:15:04.000000000 +0000 @@ -361,7 +361,7 @@ ENTRY_COMP(mbind) /* 260 */ ENTRY_COMP(get_mempolicy) @@ -551,9 +551,9 @@ diff -NurpP --minimal linux-3.4.57/arch/parisc/kernel/syscall_table.S linux-3.4. ENTRY_SAME(add_key) ENTRY_SAME(request_key) /* 265 */ ENTRY_SAME(keyctl) -diff -NurpP --minimal linux-3.4.57/arch/parisc/kernel/traps.c linux-3.4.57-vs2.3.3.9/arch/parisc/kernel/traps.c ---- linux-3.4.57/arch/parisc/kernel/traps.c 2012-05-21 16:06:28.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/arch/parisc/kernel/traps.c 2012-05-21 16:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/arch/parisc/kernel/traps.c linux-3.4.83-vs2.3.3.9/arch/parisc/kernel/traps.c +--- linux-3.4.83/arch/parisc/kernel/traps.c 2014-03-12 09:47:45.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/arch/parisc/kernel/traps.c 2013-10-26 18:10:20.000000000 +0000 @@ -235,8 +235,9 @@ void die_if_kernel(char *str, struct pt_ if (err == 0) return; /* STFU */ @@ -577,9 +577,9 @@ diff -NurpP --minimal linux-3.4.57/arch/parisc/kernel/traps.c linux-3.4.57-vs2.3 /* Wot's wrong wif bein' racy? */ if (current->thread.flags & PARISC_KERNEL_DEATH) { -diff -NurpP --minimal linux-3.4.57/arch/parisc/mm/fault.c linux-3.4.57-vs2.3.3.9/arch/parisc/mm/fault.c ---- linux-3.4.57/arch/parisc/mm/fault.c 2010-08-02 14:52:06.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/arch/parisc/mm/fault.c 2012-05-21 16:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/arch/parisc/mm/fault.c linux-3.4.83-vs2.3.3.9/arch/parisc/mm/fault.c +--- linux-3.4.83/arch/parisc/mm/fault.c 2010-08-02 14:52:06.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/arch/parisc/mm/fault.c 2012-05-21 16:15:04.000000000 +0000 @@ -237,8 +237,9 @@ bad_area: #ifdef PRINT_USER_FAULTS @@ -592,10 +592,10 @@ diff -NurpP --minimal linux-3.4.57/arch/parisc/mm/fault.c linux-3.4.57-vs2.3.3.9 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.4.57/arch/powerpc/Kconfig linux-3.4.57-vs2.3.3.9/arch/powerpc/Kconfig ---- linux-3.4.57/arch/powerpc/Kconfig 2012-05-21 16:06:28.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/arch/powerpc/Kconfig 2012-05-21 16:15:04.000000000 +0000 -@@ -1002,6 +1002,8 @@ source "lib/Kconfig" +diff -NurpP --minimal linux-3.4.83/arch/powerpc/Kconfig linux-3.4.83-vs2.3.3.9/arch/powerpc/Kconfig +--- linux-3.4.83/arch/powerpc/Kconfig 2014-03-12 09:47:45.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/arch/powerpc/Kconfig 2013-10-26 18:10:20.000000000 +0000 +@@ -1003,6 +1003,8 @@ source "lib/Kconfig" source "arch/powerpc/Kconfig.debug" @@ -604,9 +604,9 @@ diff -NurpP --minimal linux-3.4.57/arch/powerpc/Kconfig linux-3.4.57-vs2.3.3.9/a source "security/Kconfig" config KEYS_COMPAT -diff -NurpP --minimal linux-3.4.57/arch/powerpc/include/asm/unistd.h linux-3.4.57-vs2.3.3.9/arch/powerpc/include/asm/unistd.h ---- linux-3.4.57/arch/powerpc/include/asm/unistd.h 2012-01-09 15:14:05.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/arch/powerpc/include/asm/unistd.h 2012-05-21 16:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/arch/powerpc/include/asm/unistd.h linux-3.4.83-vs2.3.3.9/arch/powerpc/include/asm/unistd.h +--- linux-3.4.83/arch/powerpc/include/asm/unistd.h 2012-01-09 15:14:05.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/arch/powerpc/include/asm/unistd.h 2012-05-21 16:15:04.000000000 +0000 @@ -275,7 +275,7 @@ #endif #define __NR_rtas 255 @@ -616,9 +616,9 @@ diff -NurpP --minimal linux-3.4.57/arch/powerpc/include/asm/unistd.h linux-3.4.5 #define __NR_migrate_pages 258 #define __NR_mbind 259 #define __NR_get_mempolicy 260 -diff -NurpP --minimal linux-3.4.57/arch/powerpc/kernel/process.c linux-3.4.57-vs2.3.3.9/arch/powerpc/kernel/process.c ---- linux-3.4.57/arch/powerpc/kernel/process.c 2013-08-13 14:12:50.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/arch/powerpc/kernel/process.c 2013-07-14 13:38:26.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/arch/powerpc/kernel/process.c linux-3.4.83-vs2.3.3.9/arch/powerpc/kernel/process.c +--- linux-3.4.83/arch/powerpc/kernel/process.c 2014-03-12 09:47:45.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/arch/powerpc/kernel/process.c 2013-07-14 13:38:26.000000000 +0000 @@ -661,8 +661,9 @@ void show_regs(struct pt_regs * regs) #else printk("DAR: "REG", DSISR: %08lx\n", regs->dar, regs->dsisr); @@ -631,9 +631,9 @@ diff -NurpP --minimal linux-3.4.57/arch/powerpc/kernel/process.c linux-3.4.57-vs #ifdef CONFIG_SMP printk(" CPU: %d", raw_smp_processor_id()); -diff -NurpP --minimal linux-3.4.57/arch/powerpc/kernel/traps.c linux-3.4.57-vs2.3.3.9/arch/powerpc/kernel/traps.c ---- linux-3.4.57/arch/powerpc/kernel/traps.c 2013-08-13 14:12:50.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/arch/powerpc/kernel/traps.c 2013-07-14 13:38:26.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/arch/powerpc/kernel/traps.c linux-3.4.83-vs2.3.3.9/arch/powerpc/kernel/traps.c +--- linux-3.4.83/arch/powerpc/kernel/traps.c 2014-03-12 09:47:45.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/arch/powerpc/kernel/traps.c 2013-07-14 13:38:26.000000000 +0000 @@ -1125,8 +1125,9 @@ void nonrecoverable_exception(struct pt_ void trace_syscall(struct pt_regs *regs) @@ -646,9 +646,9 @@ diff -NurpP --minimal linux-3.4.57/arch/powerpc/kernel/traps.c linux-3.4.57-vs2. regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted()); } -diff -NurpP --minimal linux-3.4.57/arch/s390/Kconfig linux-3.4.57-vs2.3.3.9/arch/s390/Kconfig ---- linux-3.4.57/arch/s390/Kconfig 2012-05-21 16:06:32.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/arch/s390/Kconfig 2012-05-21 16:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/arch/s390/Kconfig linux-3.4.83-vs2.3.3.9/arch/s390/Kconfig +--- linux-3.4.83/arch/s390/Kconfig 2012-05-21 16:06:32.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/arch/s390/Kconfig 2012-05-21 16:15:04.000000000 +0000 @@ -639,6 +639,8 @@ source "fs/Kconfig" source "arch/s390/Kconfig.debug" @@ -658,9 +658,9 @@ diff -NurpP --minimal linux-3.4.57/arch/s390/Kconfig linux-3.4.57-vs2.3.3.9/arch source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.4.57/arch/s390/include/asm/tlb.h linux-3.4.57-vs2.3.3.9/arch/s390/include/asm/tlb.h ---- linux-3.4.57/arch/s390/include/asm/tlb.h 2012-05-21 16:06:32.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/arch/s390/include/asm/tlb.h 2012-05-21 16:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/arch/s390/include/asm/tlb.h linux-3.4.83-vs2.3.3.9/arch/s390/include/asm/tlb.h +--- linux-3.4.83/arch/s390/include/asm/tlb.h 2012-05-21 16:06:32.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/arch/s390/include/asm/tlb.h 2012-05-21 16:15:04.000000000 +0000 @@ -24,6 +24,7 @@ #include #include @@ -669,9 +669,9 @@ diff -NurpP --minimal linux-3.4.57/arch/s390/include/asm/tlb.h linux-3.4.57-vs2. #include #include #include -diff -NurpP --minimal linux-3.4.57/arch/s390/include/asm/unistd.h linux-3.4.57-vs2.3.3.9/arch/s390/include/asm/unistd.h ---- linux-3.4.57/arch/s390/include/asm/unistd.h 2012-03-19 18:46:48.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/arch/s390/include/asm/unistd.h 2012-05-21 16:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/arch/s390/include/asm/unistd.h linux-3.4.83-vs2.3.3.9/arch/s390/include/asm/unistd.h +--- linux-3.4.83/arch/s390/include/asm/unistd.h 2012-03-19 18:46:48.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/arch/s390/include/asm/unistd.h 2012-05-21 16:15:04.000000000 +0000 @@ -202,7 +202,7 @@ #define __NR_clock_gettime (__NR_timer_create+6) #define __NR_clock_getres (__NR_timer_create+7) @@ -681,9 +681,9 @@ diff -NurpP --minimal linux-3.4.57/arch/s390/include/asm/unistd.h linux-3.4.57-v #define __NR_statfs64 265 #define __NR_fstatfs64 266 #define __NR_remap_file_pages 267 -diff -NurpP --minimal linux-3.4.57/arch/s390/kernel/ptrace.c linux-3.4.57-vs2.3.3.9/arch/s390/kernel/ptrace.c ---- linux-3.4.57/arch/s390/kernel/ptrace.c 2012-05-21 16:06:32.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/arch/s390/kernel/ptrace.c 2012-05-21 16:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/arch/s390/kernel/ptrace.c linux-3.4.83-vs2.3.3.9/arch/s390/kernel/ptrace.c +--- linux-3.4.83/arch/s390/kernel/ptrace.c 2012-05-21 16:06:32.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/arch/s390/kernel/ptrace.c 2012-05-21 16:15:04.000000000 +0000 @@ -21,6 +21,7 @@ #include #include @@ -692,9 +692,9 @@ diff -NurpP --minimal linux-3.4.57/arch/s390/kernel/ptrace.c linux-3.4.57-vs2.3. #include #include #include -diff -NurpP --minimal linux-3.4.57/arch/s390/kernel/syscalls.S linux-3.4.57-vs2.3.3.9/arch/s390/kernel/syscalls.S ---- linux-3.4.57/arch/s390/kernel/syscalls.S 2012-01-09 15:14:06.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/arch/s390/kernel/syscalls.S 2012-05-21 16:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/arch/s390/kernel/syscalls.S linux-3.4.83-vs2.3.3.9/arch/s390/kernel/syscalls.S +--- linux-3.4.83/arch/s390/kernel/syscalls.S 2012-01-09 15:14:06.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/arch/s390/kernel/syscalls.S 2012-05-21 16:15:04.000000000 +0000 @@ -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) @@ -704,9 +704,9 @@ diff -NurpP --minimal linux-3.4.57/arch/s390/kernel/syscalls.S linux-3.4.57-vs2. 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.4.57/arch/sh/Kconfig linux-3.4.57-vs2.3.3.9/arch/sh/Kconfig ---- linux-3.4.57/arch/sh/Kconfig 2012-05-21 16:06:33.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/arch/sh/Kconfig 2012-05-21 16:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/arch/sh/Kconfig linux-3.4.83-vs2.3.3.9/arch/sh/Kconfig +--- linux-3.4.83/arch/sh/Kconfig 2012-05-21 16:06:33.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/arch/sh/Kconfig 2012-05-21 16:15:04.000000000 +0000 @@ -905,6 +905,8 @@ source "fs/Kconfig" source "arch/sh/Kconfig.debug" @@ -716,9 +716,9 @@ diff -NurpP --minimal linux-3.4.57/arch/sh/Kconfig linux-3.4.57-vs2.3.3.9/arch/s source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.4.57/arch/sh/kernel/irq.c linux-3.4.57-vs2.3.3.9/arch/sh/kernel/irq.c ---- linux-3.4.57/arch/sh/kernel/irq.c 2011-07-22 09:17:41.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/arch/sh/kernel/irq.c 2012-05-21 16:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/arch/sh/kernel/irq.c linux-3.4.83-vs2.3.3.9/arch/sh/kernel/irq.c +--- linux-3.4.83/arch/sh/kernel/irq.c 2011-07-22 09:17:41.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/arch/sh/kernel/irq.c 2012-05-21 16:15:04.000000000 +0000 @@ -14,6 +14,7 @@ #include #include @@ -727,9 +727,9 @@ diff -NurpP --minimal linux-3.4.57/arch/sh/kernel/irq.c linux-3.4.57-vs2.3.3.9/a #include #include #include -diff -NurpP --minimal linux-3.4.57/arch/sparc/Kconfig linux-3.4.57-vs2.3.3.9/arch/sparc/Kconfig ---- linux-3.4.57/arch/sparc/Kconfig 2013-08-13 14:12:51.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/arch/sparc/Kconfig 2012-06-08 13:57:24.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/arch/sparc/Kconfig linux-3.4.83-vs2.3.3.9/arch/sparc/Kconfig +--- linux-3.4.83/arch/sparc/Kconfig 2014-03-12 09:47:46.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/arch/sparc/Kconfig 2012-06-08 13:57:24.000000000 +0000 @@ -599,6 +599,8 @@ source "fs/Kconfig" source "arch/sparc/Kconfig.debug" @@ -739,9 +739,9 @@ diff -NurpP --minimal linux-3.4.57/arch/sparc/Kconfig linux-3.4.57-vs2.3.3.9/arc source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.4.57/arch/sparc/include/asm/unistd.h linux-3.4.57-vs2.3.3.9/arch/sparc/include/asm/unistd.h ---- linux-3.4.57/arch/sparc/include/asm/unistd.h 2012-01-09 15:14:07.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/arch/sparc/include/asm/unistd.h 2012-05-21 16:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/arch/sparc/include/asm/unistd.h linux-3.4.83-vs2.3.3.9/arch/sparc/include/asm/unistd.h +--- linux-3.4.83/arch/sparc/include/asm/unistd.h 2012-01-09 15:14:07.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/arch/sparc/include/asm/unistd.h 2012-05-21 16:15:04.000000000 +0000 @@ -335,7 +335,7 @@ #define __NR_timer_getoverrun 264 #define __NR_timer_delete 265 @@ -751,9 +751,9 @@ diff -NurpP --minimal linux-3.4.57/arch/sparc/include/asm/unistd.h linux-3.4.57- #define __NR_io_setup 268 #define __NR_io_destroy 269 #define __NR_io_submit 270 -diff -NurpP --minimal linux-3.4.57/arch/sparc/kernel/systbls_32.S linux-3.4.57-vs2.3.3.9/arch/sparc/kernel/systbls_32.S ---- linux-3.4.57/arch/sparc/kernel/systbls_32.S 2012-01-09 15:14:09.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/arch/sparc/kernel/systbls_32.S 2012-05-21 16:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/arch/sparc/kernel/systbls_32.S linux-3.4.83-vs2.3.3.9/arch/sparc/kernel/systbls_32.S +--- linux-3.4.83/arch/sparc/kernel/systbls_32.S 2012-01-09 15:14:09.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/arch/sparc/kernel/systbls_32.S 2012-05-21 16:15:04.000000000 +0000 @@ -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 @@ -763,9 +763,9 @@ diff -NurpP --minimal linux-3.4.57/arch/sparc/kernel/systbls_32.S linux-3.4.57-v /*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.4.57/arch/sparc/kernel/systbls_64.S linux-3.4.57-vs2.3.3.9/arch/sparc/kernel/systbls_64.S ---- linux-3.4.57/arch/sparc/kernel/systbls_64.S 2013-08-13 14:12:51.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/arch/sparc/kernel/systbls_64.S 2012-06-08 13:57:24.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/arch/sparc/kernel/systbls_64.S linux-3.4.83-vs2.3.3.9/arch/sparc/kernel/systbls_64.S +--- linux-3.4.83/arch/sparc/kernel/systbls_64.S 2014-03-12 09:47:46.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/arch/sparc/kernel/systbls_64.S 2012-06-08 13:57:24.000000000 +0000 @@ -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 @@ -784,9 +784,9 @@ diff -NurpP --minimal linux-3.4.57/arch/sparc/kernel/systbls_64.S linux-3.4.57-v /*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.4.57/arch/um/Kconfig.rest linux-3.4.57-vs2.3.3.9/arch/um/Kconfig.rest ---- linux-3.4.57/arch/um/Kconfig.rest 2012-01-09 15:14:09.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/arch/um/Kconfig.rest 2012-05-21 16:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/arch/um/Kconfig.rest linux-3.4.83-vs2.3.3.9/arch/um/Kconfig.rest +--- linux-3.4.83/arch/um/Kconfig.rest 2012-01-09 15:14:09.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/arch/um/Kconfig.rest 2012-05-21 16:15:04.000000000 +0000 @@ -12,6 +12,8 @@ source "arch/um/Kconfig.net" source "fs/Kconfig" @@ -796,9 +796,9 @@ diff -NurpP --minimal linux-3.4.57/arch/um/Kconfig.rest linux-3.4.57-vs2.3.3.9/a source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.4.57/arch/x86/Kconfig linux-3.4.57-vs2.3.3.9/arch/x86/Kconfig ---- linux-3.4.57/arch/x86/Kconfig 2013-08-13 14:12:51.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/arch/x86/Kconfig 2013-03-02 15:26:44.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/arch/x86/Kconfig linux-3.4.83-vs2.3.3.9/arch/x86/Kconfig +--- linux-3.4.83/arch/x86/Kconfig 2014-03-12 09:47:46.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/arch/x86/Kconfig 2013-03-02 15:26:44.000000000 +0000 @@ -2221,6 +2221,8 @@ source "fs/Kconfig" source "arch/x86/Kconfig.debug" @@ -808,9 +808,9 @@ diff -NurpP --minimal linux-3.4.57/arch/x86/Kconfig linux-3.4.57-vs2.3.3.9/arch/ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.4.57/arch/x86/syscalls/syscall_32.tbl linux-3.4.57-vs2.3.3.9/arch/x86/syscalls/syscall_32.tbl ---- linux-3.4.57/arch/x86/syscalls/syscall_32.tbl 2012-05-21 16:06:42.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/arch/x86/syscalls/syscall_32.tbl 2012-05-21 16:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/arch/x86/syscalls/syscall_32.tbl linux-3.4.83-vs2.3.3.9/arch/x86/syscalls/syscall_32.tbl +--- linux-3.4.83/arch/x86/syscalls/syscall_32.tbl 2012-05-21 16:06:42.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/arch/x86/syscalls/syscall_32.tbl 2012-05-21 16:15:04.000000000 +0000 @@ -279,7 +279,7 @@ 270 i386 tgkill sys_tgkill 271 i386 utimes sys_utimes compat_sys_utimes @@ -820,9 +820,9 @@ diff -NurpP --minimal linux-3.4.57/arch/x86/syscalls/syscall_32.tbl linux-3.4.57 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.4.57/arch/x86/syscalls/syscall_64.tbl linux-3.4.57-vs2.3.3.9/arch/x86/syscalls/syscall_64.tbl ---- linux-3.4.57/arch/x86/syscalls/syscall_64.tbl 2013-08-13 14:12:52.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/arch/x86/syscalls/syscall_64.tbl 2012-09-16 18:49:11.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/arch/x86/syscalls/syscall_64.tbl linux-3.4.83-vs2.3.3.9/arch/x86/syscalls/syscall_64.tbl +--- linux-3.4.83/arch/x86/syscalls/syscall_64.tbl 2014-03-12 09:47:47.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/arch/x86/syscalls/syscall_64.tbl 2012-09-16 18:49:11.000000000 +0000 @@ -242,7 +242,7 @@ 233 common epoll_ctl sys_epoll_ctl 234 common tgkill sys_tgkill @@ -832,9 +832,9 @@ diff -NurpP --minimal linux-3.4.57/arch/x86/syscalls/syscall_64.tbl linux-3.4.57 237 common mbind sys_mbind 238 common set_mempolicy sys_set_mempolicy 239 common get_mempolicy sys_get_mempolicy -diff -NurpP --minimal linux-3.4.57/drivers/block/Kconfig linux-3.4.57-vs2.3.3.9/drivers/block/Kconfig ---- linux-3.4.57/drivers/block/Kconfig 2012-05-21 16:06:43.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/drivers/block/Kconfig 2012-05-21 16:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/drivers/block/Kconfig linux-3.4.83-vs2.3.3.9/drivers/block/Kconfig +--- linux-3.4.83/drivers/block/Kconfig 2012-05-21 16:06:43.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/drivers/block/Kconfig 2012-05-21 16:15:04.000000000 +0000 @@ -290,6 +290,13 @@ config BLK_DEV_CRYPTOLOOP source "drivers/block/drbd/Kconfig" @@ -849,9 +849,9 @@ diff -NurpP --minimal linux-3.4.57/drivers/block/Kconfig linux-3.4.57-vs2.3.3.9/ config BLK_DEV_NBD tristate "Network block device support" depends on NET -diff -NurpP --minimal linux-3.4.57/drivers/block/Makefile linux-3.4.57-vs2.3.3.9/drivers/block/Makefile ---- linux-3.4.57/drivers/block/Makefile 2012-03-19 18:46:52.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/drivers/block/Makefile 2012-05-21 16:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/drivers/block/Makefile linux-3.4.83-vs2.3.3.9/drivers/block/Makefile +--- linux-3.4.83/drivers/block/Makefile 2012-03-19 18:46:52.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/drivers/block/Makefile 2012-05-21 16:15:04.000000000 +0000 @@ -35,6 +35,7 @@ obj-$(CONFIG_VIODASD) += viodasd.o obj-$(CONFIG_BLK_DEV_SX8) += sx8.o obj-$(CONFIG_BLK_DEV_UB) += ub.o @@ -860,9 +860,9 @@ diff -NurpP --minimal linux-3.4.57/drivers/block/Makefile linux-3.4.57-vs2.3.3.9 obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o obj-$(CONFIG_XEN_BLKDEV_BACKEND) += xen-blkback/ -diff -NurpP --minimal linux-3.4.57/drivers/block/loop.c linux-3.4.57-vs2.3.3.9/drivers/block/loop.c ---- linux-3.4.57/drivers/block/loop.c 2013-08-13 14:12:54.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/drivers/block/loop.c 2013-07-14 13:38:28.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/drivers/block/loop.c linux-3.4.83-vs2.3.3.9/drivers/block/loop.c +--- linux-3.4.83/drivers/block/loop.c 2014-03-12 09:47:50.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/drivers/block/loop.c 2014-03-12 09:55:28.000000000 +0000 @@ -76,6 +76,7 @@ #include #include @@ -918,9 +918,9 @@ diff -NurpP --minimal linux-3.4.57/drivers/block/loop.c linux-3.4.57-vs2.3.3.9/d mutex_lock(&lo->lo_ctl_mutex); lo->lo_refcnt++; mutex_unlock(&lo->lo_ctl_mutex); -diff -NurpP --minimal linux-3.4.57/drivers/block/vroot.c linux-3.4.57-vs2.3.3.9/drivers/block/vroot.c ---- linux-3.4.57/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/drivers/block/vroot.c 2012-05-21 16:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/drivers/block/vroot.c linux-3.4.83-vs2.3.3.9/drivers/block/vroot.c +--- linux-3.4.83/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/drivers/block/vroot.c 2012-05-21 16:15:04.000000000 +0000 @@ -0,0 +1,291 @@ +/* + * linux/drivers/block/vroot.c @@ -1213,9 +1213,9 @@ diff -NurpP --minimal linux-3.4.57/drivers/block/vroot.c linux-3.4.57-vs2.3.3.9/ + +#endif + -diff -NurpP --minimal linux-3.4.57/drivers/infiniband/Kconfig linux-3.4.57-vs2.3.3.9/drivers/infiniband/Kconfig ---- linux-3.4.57/drivers/infiniband/Kconfig 2012-03-19 18:46:54.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/drivers/infiniband/Kconfig 2012-05-21 16:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/drivers/infiniband/Kconfig linux-3.4.83-vs2.3.3.9/drivers/infiniband/Kconfig +--- linux-3.4.83/drivers/infiniband/Kconfig 2012-03-19 18:46:54.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/drivers/infiniband/Kconfig 2012-05-21 16:15:04.000000000 +0000 @@ -39,7 +39,7 @@ config INFINIBAND_USER_MEM config INFINIBAND_ADDR_TRANS bool @@ -1225,9 +1225,9 @@ diff -NurpP --minimal linux-3.4.57/drivers/infiniband/Kconfig linux-3.4.57-vs2.3 default y source "drivers/infiniband/hw/mthca/Kconfig" -diff -NurpP --minimal linux-3.4.57/drivers/infiniband/core/addr.c linux-3.4.57-vs2.3.3.9/drivers/infiniband/core/addr.c ---- linux-3.4.57/drivers/infiniband/core/addr.c 2012-05-21 16:06:46.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/drivers/infiniband/core/addr.c 2012-05-21 16:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/drivers/infiniband/core/addr.c linux-3.4.83-vs2.3.3.9/drivers/infiniband/core/addr.c +--- linux-3.4.83/drivers/infiniband/core/addr.c 2012-05-21 16:06:46.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/drivers/infiniband/core/addr.c 2012-05-21 16:15:04.000000000 +0000 @@ -263,7 +263,7 @@ static int addr6_resolve(struct sockaddr if (ipv6_addr_any(&fl6.saddr)) { @@ -1237,9 +1237,9 @@ diff -NurpP --minimal linux-3.4.57/drivers/infiniband/core/addr.c linux-3.4.57-v if (ret) goto put; -diff -NurpP --minimal linux-3.4.57/drivers/md/dm-ioctl.c linux-3.4.57-vs2.3.3.9/drivers/md/dm-ioctl.c ---- linux-3.4.57/drivers/md/dm-ioctl.c 2013-08-13 14:13:03.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/drivers/md/dm-ioctl.c 2013-02-11 23:37:30.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/drivers/md/dm-ioctl.c linux-3.4.83-vs2.3.3.9/drivers/md/dm-ioctl.c +--- linux-3.4.83/drivers/md/dm-ioctl.c 2014-03-12 09:47:53.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/drivers/md/dm-ioctl.c 2014-03-12 09:55:28.000000000 +0000 @@ -16,6 +16,7 @@ #include #include @@ -1314,7 +1314,7 @@ diff -NurpP --minimal linux-3.4.57/drivers/md/dm-ioctl.c linux-3.4.57-vs2.3.3.9/ if (old_nl) old_nl->next = (uint32_t) ((void *) nl - (void *) old_nl); -@@ -1624,8 +1636,8 @@ static int ctl_ioctl(uint command, struc +@@ -1628,8 +1640,8 @@ static int ctl_ioctl(uint command, struc ioctl_fn fn = NULL; size_t input_param_size; @@ -1325,9 +1325,9 @@ diff -NurpP --minimal linux-3.4.57/drivers/md/dm-ioctl.c linux-3.4.57-vs2.3.3.9/ return -EACCES; if (_IOC_TYPE(command) != DM_IOCTL) -diff -NurpP --minimal linux-3.4.57/drivers/md/dm.c linux-3.4.57-vs2.3.3.9/drivers/md/dm.c ---- linux-3.4.57/drivers/md/dm.c 2013-08-13 14:13:03.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/drivers/md/dm.c 2012-12-08 00:53:53.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/drivers/md/dm.c linux-3.4.83-vs2.3.3.9/drivers/md/dm.c +--- linux-3.4.83/drivers/md/dm.c 2014-03-12 09:47:53.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/drivers/md/dm.c 2014-03-12 09:55:28.000000000 +0000 @@ -19,6 +19,7 @@ #include #include @@ -1401,10 +1401,10 @@ diff -NurpP --minimal linux-3.4.57/drivers/md/dm.c linux-3.4.57-vs2.3.3.9/driver md->queue = blk_alloc_queue(GFP_KERNEL); if (!md->queue) goto bad_queue; -diff -NurpP --minimal linux-3.4.57/drivers/md/dm.h linux-3.4.57-vs2.3.3.9/drivers/md/dm.h ---- linux-3.4.57/drivers/md/dm.h 2012-01-09 15:14:21.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/drivers/md/dm.h 2012-05-21 16:15:04.000000000 +0000 -@@ -41,6 +41,8 @@ struct dm_dev_internal { +diff -NurpP --minimal linux-3.4.83/drivers/md/dm.h linux-3.4.83-vs2.3.3.9/drivers/md/dm.h +--- linux-3.4.83/drivers/md/dm.h 2014-03-12 09:47:53.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/drivers/md/dm.h 2014-03-12 09:55:28.000000000 +0000 +@@ -43,6 +43,8 @@ struct dm_dev_internal { struct dm_table; struct dm_md_mempools; @@ -1413,9 +1413,9 @@ diff -NurpP --minimal linux-3.4.57/drivers/md/dm.h linux-3.4.57-vs2.3.3.9/driver /*----------------------------------------------------------------- * Internal table functions. *---------------------------------------------------------------*/ -diff -NurpP --minimal linux-3.4.57/drivers/net/tun.c linux-3.4.57-vs2.3.3.9/drivers/net/tun.c ---- linux-3.4.57/drivers/net/tun.c 2013-08-13 14:13:14.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/drivers/net/tun.c 2013-03-30 21:29:17.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/drivers/net/tun.c linux-3.4.83-vs2.3.3.9/drivers/net/tun.c +--- linux-3.4.83/drivers/net/tun.c 2014-03-12 09:47:58.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/drivers/net/tun.c 2014-03-12 09:55:28.000000000 +0000 @@ -64,6 +64,7 @@ #include #include @@ -1432,7 +1432,7 @@ diff -NurpP --minimal linux-3.4.57/drivers/net/tun.c linux-3.4.57-vs2.3.3.9/driv struct net_device *dev; netdev_features_t set_features; -@@ -912,6 +914,7 @@ static void tun_setup(struct net_device +@@ -916,6 +918,7 @@ static void tun_setup(struct net_device tun->owner = -1; tun->group = -1; @@ -1440,7 +1440,7 @@ diff -NurpP --minimal linux-3.4.57/drivers/net/tun.c linux-3.4.57-vs2.3.3.9/driv dev->ethtool_ops = &tun_ethtool_ops; dev->destructor = tun_free_netdev; -@@ -1070,7 +1073,7 @@ static int tun_set_iff(struct net *net, +@@ -1074,7 +1077,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))) && @@ -1449,7 +1449,7 @@ diff -NurpP --minimal linux-3.4.57/drivers/net/tun.c linux-3.4.57-vs2.3.3.9/driv return -EPERM; err = security_tun_dev_attach(tun->socket.sk); if (err < 0) -@@ -1084,7 +1087,7 @@ static int tun_set_iff(struct net *net, +@@ -1088,7 +1091,7 @@ static int tun_set_iff(struct net *net, char *name; unsigned long flags = 0; @@ -1458,7 +1458,7 @@ diff -NurpP --minimal linux-3.4.57/drivers/net/tun.c linux-3.4.57-vs2.3.3.9/driv return -EPERM; err = security_tun_dev_create(); if (err < 0) -@@ -1154,6 +1157,9 @@ static int tun_set_iff(struct net *net, +@@ -1158,6 +1161,9 @@ static int tun_set_iff(struct net *net, sk->sk_destruct = tun_sock_destruct; @@ -1468,7 +1468,7 @@ diff -NurpP --minimal linux-3.4.57/drivers/net/tun.c linux-3.4.57-vs2.3.3.9/driv err = tun_attach(tun, file); if (err < 0) goto failed; -@@ -1337,6 +1343,16 @@ static long __tun_chr_ioctl(struct file +@@ -1341,6 +1347,16 @@ static long __tun_chr_ioctl(struct file tun_debug(KERN_INFO, tun, "group set to %d\n", tun->group); break; @@ -1485,9 +1485,9 @@ diff -NurpP --minimal linux-3.4.57/drivers/net/tun.c linux-3.4.57-vs2.3.3.9/driv case TUNSETLINK: /* Only allow setting the type when the interface is down */ if (tun->dev->flags & IFF_UP) { -diff -NurpP --minimal linux-3.4.57/drivers/tty/sysrq.c linux-3.4.57-vs2.3.3.9/drivers/tty/sysrq.c ---- linux-3.4.57/drivers/tty/sysrq.c 2012-05-21 16:07:16.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/drivers/tty/sysrq.c 2012-05-21 16:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/drivers/tty/sysrq.c linux-3.4.83-vs2.3.3.9/drivers/tty/sysrq.c +--- linux-3.4.83/drivers/tty/sysrq.c 2012-05-21 16:07:16.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/drivers/tty/sysrq.c 2012-05-21 16:15:04.000000000 +0000 @@ -41,6 +41,7 @@ #include #include @@ -1539,9 +1539,9 @@ diff -NurpP --minimal linux-3.4.57/drivers/tty/sysrq.c linux-3.4.57-vs2.3.3.9/dr else retval = -1; return retval; -diff -NurpP --minimal linux-3.4.57/drivers/tty/tty_io.c linux-3.4.57-vs2.3.3.9/drivers/tty/tty_io.c ---- linux-3.4.57/drivers/tty/tty_io.c 2013-08-13 14:13:26.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/drivers/tty/tty_io.c 2013-07-14 13:38:33.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/drivers/tty/tty_io.c linux-3.4.83-vs2.3.3.9/drivers/tty/tty_io.c +--- linux-3.4.83/drivers/tty/tty_io.c 2014-03-12 09:48:09.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/drivers/tty/tty_io.c 2013-07-14 13:38:33.000000000 +0000 @@ -104,6 +104,7 @@ #include @@ -1568,9 +1568,9 @@ diff -NurpP --minimal linux-3.4.57/drivers/tty/tty_io.c linux-3.4.57-vs2.3.3.9/d if (pgrp_nr < 0) return -EINVAL; rcu_read_lock(); -diff -NurpP --minimal linux-3.4.57/fs/attr.c linux-3.4.57-vs2.3.3.9/fs/attr.c ---- linux-3.4.57/fs/attr.c 2013-08-13 14:13:31.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/attr.c 2012-06-28 14:45:07.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/attr.c linux-3.4.83-vs2.3.3.9/fs/attr.c +--- linux-3.4.83/fs/attr.c 2014-03-12 09:48:11.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/attr.c 2012-06-28 14:45:07.000000000 +0000 @@ -14,6 +14,9 @@ #include #include @@ -1611,9 +1611,9 @@ diff -NurpP --minimal linux-3.4.57/fs/attr.c linux-3.4.57-vs2.3.3.9/fs/attr.c if (IS_IMMUTABLE(inode) || IS_APPEND(inode)) return -EPERM; } -diff -NurpP --minimal linux-3.4.57/fs/block_dev.c linux-3.4.57-vs2.3.3.9/fs/block_dev.c ---- linux-3.4.57/fs/block_dev.c 2013-08-13 14:13:31.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/block_dev.c 2013-08-13 17:07:36.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/block_dev.c linux-3.4.83-vs2.3.3.9/fs/block_dev.c +--- linux-3.4.83/fs/block_dev.c 2014-03-12 09:48:11.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/block_dev.c 2013-08-13 17:07:36.000000000 +0000 @@ -27,6 +27,7 @@ #include #include @@ -1651,9 +1651,9 @@ diff -NurpP --minimal linux-3.4.57/fs/block_dev.c linux-3.4.57-vs2.3.3.9/fs/bloc if (bdev) { spin_lock(&bdev_lock); if (!inode->i_bdev) { -diff -NurpP --minimal linux-3.4.57/fs/btrfs/ctree.h linux-3.4.57-vs2.3.3.9/fs/btrfs/ctree.h ---- linux-3.4.57/fs/btrfs/ctree.h 2012-05-21 16:07:18.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/btrfs/ctree.h 2012-05-21 16:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/btrfs/ctree.h linux-3.4.83-vs2.3.3.9/fs/btrfs/ctree.h +--- linux-3.4.83/fs/btrfs/ctree.h 2012-05-21 16:07:18.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/btrfs/ctree.h 2012-05-21 16:15:04.000000000 +0000 @@ -668,11 +668,14 @@ struct btrfs_inode_item { /* modification sequence number for NFS */ __le64 sequence; @@ -1706,9 +1706,9 @@ diff -NurpP --minimal linux-3.4.57/fs/btrfs/ctree.h linux-3.4.57-vs2.3.3.9/fs/bt 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.4.57/fs/btrfs/disk-io.c linux-3.4.57-vs2.3.3.9/fs/btrfs/disk-io.c ---- linux-3.4.57/fs/btrfs/disk-io.c 2012-05-21 16:07:18.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/btrfs/disk-io.c 2012-05-21 16:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/btrfs/disk-io.c linux-3.4.83-vs2.3.3.9/fs/btrfs/disk-io.c +--- linux-3.4.83/fs/btrfs/disk-io.c 2012-05-21 16:07:18.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/btrfs/disk-io.c 2012-05-21 16:15:04.000000000 +0000 @@ -2083,6 +2083,9 @@ int open_ctree(struct super_block *sb, goto fail_alloc; } @@ -1719,9 +1719,9 @@ diff -NurpP --minimal linux-3.4.57/fs/btrfs/disk-io.c linux-3.4.57-vs2.3.3.9/fs/ features = btrfs_super_incompat_flags(disk_super) & ~BTRFS_FEATURE_INCOMPAT_SUPP; if (features) { -diff -NurpP --minimal linux-3.4.57/fs/btrfs/inode.c linux-3.4.57-vs2.3.3.9/fs/btrfs/inode.c ---- linux-3.4.57/fs/btrfs/inode.c 2013-08-13 14:13:31.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/btrfs/inode.c 2013-07-14 13:38:34.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/btrfs/inode.c linux-3.4.83-vs2.3.3.9/fs/btrfs/inode.c +--- linux-3.4.83/fs/btrfs/inode.c 2014-03-12 09:48:11.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/btrfs/inode.c 2013-07-14 13:38:34.000000000 +0000 @@ -39,6 +39,7 @@ #include #include @@ -1786,9 +1786,9 @@ diff -NurpP --minimal linux-3.4.57/fs/btrfs/inode.c linux-3.4.57-vs2.3.3.9/fs/bt .get_acl = btrfs_get_acl, }; -diff -NurpP --minimal linux-3.4.57/fs/btrfs/ioctl.c linux-3.4.57-vs2.3.3.9/fs/btrfs/ioctl.c ---- linux-3.4.57/fs/btrfs/ioctl.c 2013-08-13 14:13:31.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/btrfs/ioctl.c 2013-07-14 13:38:34.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/btrfs/ioctl.c linux-3.4.83-vs2.3.3.9/fs/btrfs/ioctl.c +--- linux-3.4.83/fs/btrfs/ioctl.c 2014-03-12 09:48:11.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/btrfs/ioctl.c 2013-07-14 13:38:34.000000000 +0000 @@ -71,10 +71,13 @@ static unsigned int btrfs_flags_to_ioctl { unsigned int iflags = 0; @@ -1961,9 +1961,9 @@ diff -NurpP --minimal linux-3.4.57/fs/btrfs/ioctl.c linux-3.4.57-vs2.3.3.9/fs/bt if (flags & FS_APPEND_FL) ip->flags |= BTRFS_INODE_APPEND; else -diff -NurpP --minimal linux-3.4.57/fs/btrfs/super.c linux-3.4.57-vs2.3.3.9/fs/btrfs/super.c ---- linux-3.4.57/fs/btrfs/super.c 2012-05-21 16:07:19.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/btrfs/super.c 2012-05-21 16:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/btrfs/super.c linux-3.4.83-vs2.3.3.9/fs/btrfs/super.c +--- linux-3.4.83/fs/btrfs/super.c 2012-05-21 16:07:19.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/btrfs/super.c 2012-05-21 16:15:04.000000000 +0000 @@ -279,7 +279,7 @@ enum { Opt_no_space_cache, Opt_recovery, Opt_skip_balance, Opt_check_integrity, Opt_check_integrity_including_extent_data, @@ -2019,9 +2019,9 @@ diff -NurpP --minimal linux-3.4.57/fs/btrfs/super.c linux-3.4.57-vs2.3.3.9/fs/bt if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY)) return 0; -diff -NurpP --minimal linux-3.4.57/fs/char_dev.c linux-3.4.57-vs2.3.3.9/fs/char_dev.c ---- linux-3.4.57/fs/char_dev.c 2012-03-19 18:47:25.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/char_dev.c 2012-05-21 16:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/char_dev.c linux-3.4.83-vs2.3.3.9/fs/char_dev.c +--- linux-3.4.83/fs/char_dev.c 2012-03-19 18:47:25.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/char_dev.c 2012-05-21 16:15:04.000000000 +0000 @@ -21,6 +21,8 @@ #include #include @@ -2054,9 +2054,9 @@ diff -NurpP --minimal linux-3.4.57/fs/char_dev.c linux-3.4.57-vs2.3.3.9/fs/char_ if (!kobj) return -ENXIO; new = container_of(kobj, struct cdev, kobj); -diff -NurpP --minimal linux-3.4.57/fs/dcache.c linux-3.4.57-vs2.3.3.9/fs/dcache.c ---- linux-3.4.57/fs/dcache.c 2013-08-13 14:13:32.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/dcache.c 2013-07-14 13:38:34.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/dcache.c linux-3.4.83-vs2.3.3.9/fs/dcache.c +--- linux-3.4.83/fs/dcache.c 2014-03-12 09:48:12.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/dcache.c 2014-03-12 09:55:28.000000000 +0000 @@ -37,6 +37,7 @@ #include #include @@ -2108,9 +2108,9 @@ diff -NurpP --minimal linux-3.4.57/fs/dcache.c linux-3.4.57-vs2.3.3.9/fs/dcache. found = dentry; spin_unlock(&dentry->d_lock); break; -diff -NurpP --minimal linux-3.4.57/fs/devpts/inode.c linux-3.4.57-vs2.3.3.9/fs/devpts/inode.c ---- linux-3.4.57/fs/devpts/inode.c 2012-05-21 16:07:20.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/devpts/inode.c 2012-05-21 16:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/devpts/inode.c linux-3.4.83-vs2.3.3.9/fs/devpts/inode.c +--- linux-3.4.83/fs/devpts/inode.c 2014-03-12 09:48:12.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/devpts/inode.c 2014-03-12 09:55:28.000000000 +0000 @@ -25,6 +25,7 @@ #include #include @@ -2188,7 +2188,7 @@ diff -NurpP --minimal linux-3.4.57/fs/devpts/inode.c linux-3.4.57-vs2.3.3.9/fs/d s->s_root = d_make_root(inode); if (s->s_root) -@@ -564,6 +610,9 @@ int devpts_pty_new(struct inode *ptmx_in +@@ -565,6 +611,9 @@ int devpts_pty_new(struct inode *ptmx_in inode->i_gid = opts->setgid ? opts->gid : current_fsgid(); inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME; init_special_inode(inode, S_IFCHR|opts->mode, device); @@ -2198,9 +2198,9 @@ diff -NurpP --minimal linux-3.4.57/fs/devpts/inode.c linux-3.4.57-vs2.3.3.9/fs/d inode->i_private = tty; tty->driver_data = inode; -diff -NurpP --minimal linux-3.4.57/fs/ext2/balloc.c linux-3.4.57-vs2.3.3.9/fs/ext2/balloc.c ---- linux-3.4.57/fs/ext2/balloc.c 2012-01-09 15:14:54.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/ext2/balloc.c 2012-05-21 16:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/ext2/balloc.c linux-3.4.83-vs2.3.3.9/fs/ext2/balloc.c +--- linux-3.4.83/fs/ext2/balloc.c 2012-01-09 15:14:54.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/ext2/balloc.c 2012-05-21 16:15:04.000000000 +0000 @@ -701,7 +701,6 @@ ext2_try_to_allocate(struct super_block start = 0; end = EXT2_BLOCKS_PER_GROUP(sb); @@ -2209,9 +2209,9 @@ diff -NurpP --minimal linux-3.4.57/fs/ext2/balloc.c linux-3.4.57-vs2.3.3.9/fs/ex BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb)); repeat: -diff -NurpP --minimal linux-3.4.57/fs/ext2/ext2.h linux-3.4.57-vs2.3.3.9/fs/ext2/ext2.h ---- linux-3.4.57/fs/ext2/ext2.h 2012-05-21 16:07:20.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/ext2/ext2.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/ext2/ext2.h linux-3.4.83-vs2.3.3.9/fs/ext2/ext2.h +--- linux-3.4.83/fs/ext2/ext2.h 2012-05-21 16:07:20.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/ext2/ext2.h 2012-05-21 16:15:05.000000000 +0000 @@ -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) */ @@ -2259,18 +2259,18 @@ diff -NurpP --minimal linux-3.4.57/fs/ext2/ext2.h linux-3.4.57-vs2.3.3.9/fs/ext2 /* ioctl.c */ extern long ext2_ioctl(struct file *, unsigned int, unsigned long); -diff -NurpP --minimal linux-3.4.57/fs/ext2/file.c linux-3.4.57-vs2.3.3.9/fs/ext2/file.c ---- linux-3.4.57/fs/ext2/file.c 2011-10-24 16:45:27.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/ext2/file.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/ext2/file.c linux-3.4.83-vs2.3.3.9/fs/ext2/file.c +--- linux-3.4.83/fs/ext2/file.c 2011-10-24 16:45:27.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/ext2/file.c 2012-05-21 16:15:05.000000000 +0000 @@ -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.4.57/fs/ext2/ialloc.c linux-3.4.57-vs2.3.3.9/fs/ext2/ialloc.c ---- linux-3.4.57/fs/ext2/ialloc.c 2012-03-19 18:47:25.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/ext2/ialloc.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/ext2/ialloc.c linux-3.4.83-vs2.3.3.9/fs/ext2/ialloc.c +--- linux-3.4.83/fs/ext2/ialloc.c 2012-03-19 18:47:25.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/ext2/ialloc.c 2012-05-21 16:15:05.000000000 +0000 @@ -17,6 +17,7 @@ #include #include @@ -2287,9 +2287,9 @@ diff -NurpP --minimal linux-3.4.57/fs/ext2/ialloc.c linux-3.4.57-vs2.3.3.9/fs/ex } else inode_init_owner(inode, dir, mode); -diff -NurpP --minimal linux-3.4.57/fs/ext2/inode.c linux-3.4.57-vs2.3.3.9/fs/ext2/inode.c ---- linux-3.4.57/fs/ext2/inode.c 2012-03-19 18:47:25.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/ext2/inode.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/ext2/inode.c linux-3.4.83-vs2.3.3.9/fs/ext2/inode.c +--- linux-3.4.83/fs/ext2/inode.c 2012-03-19 18:47:25.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/ext2/inode.c 2012-05-21 16:15:05.000000000 +0000 @@ -31,6 +31,7 @@ #include #include @@ -2437,9 +2437,9 @@ diff -NurpP --minimal linux-3.4.57/fs/ext2/inode.c linux-3.4.57-vs2.3.3.9/fs/ext error = dquot_transfer(inode, iattr); if (error) return error; -diff -NurpP --minimal linux-3.4.57/fs/ext2/ioctl.c linux-3.4.57-vs2.3.3.9/fs/ext2/ioctl.c ---- linux-3.4.57/fs/ext2/ioctl.c 2012-03-19 18:47:25.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/ext2/ioctl.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/ext2/ioctl.c linux-3.4.83-vs2.3.3.9/fs/ext2/ioctl.c +--- linux-3.4.83/fs/ext2/ioctl.c 2012-03-19 18:47:25.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/ext2/ioctl.c 2012-05-21 16:15:05.000000000 +0000 @@ -17,6 +17,16 @@ #include @@ -2489,9 +2489,9 @@ diff -NurpP --minimal linux-3.4.57/fs/ext2/ioctl.c linux-3.4.57-vs2.3.3.9/fs/ext flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE; ei->i_flags = flags; -diff -NurpP --minimal linux-3.4.57/fs/ext2/namei.c linux-3.4.57-vs2.3.3.9/fs/ext2/namei.c ---- linux-3.4.57/fs/ext2/namei.c 2012-05-21 16:07:20.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/ext2/namei.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/ext2/namei.c linux-3.4.83-vs2.3.3.9/fs/ext2/namei.c +--- linux-3.4.83/fs/ext2/namei.c 2012-05-21 16:07:20.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/ext2/namei.c 2012-05-21 16:15:05.000000000 +0000 @@ -32,6 +32,7 @@ #include @@ -2516,9 +2516,9 @@ diff -NurpP --minimal linux-3.4.57/fs/ext2/namei.c linux-3.4.57-vs2.3.3.9/fs/ext .get_acl = ext2_get_acl, }; -diff -NurpP --minimal linux-3.4.57/fs/ext2/super.c linux-3.4.57-vs2.3.3.9/fs/ext2/super.c ---- linux-3.4.57/fs/ext2/super.c 2012-05-21 16:07:20.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/ext2/super.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/ext2/super.c linux-3.4.83-vs2.3.3.9/fs/ext2/super.c +--- linux-3.4.83/fs/ext2/super.c 2012-05-21 16:07:20.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/ext2/super.c 2012-05-21 16:15:05.000000000 +0000 @@ -393,7 +393,8 @@ enum { Opt_err_ro, Opt_nouid32, Opt_nocheck, Opt_debug, Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr, @@ -2584,9 +2584,9 @@ diff -NurpP --minimal linux-3.4.57/fs/ext2/super.c linux-3.4.57-vs2.3.3.9/fs/ext sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | ((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0); -diff -NurpP --minimal linux-3.4.57/fs/ext3/ext3.h linux-3.4.57-vs2.3.3.9/fs/ext3/ext3.h ---- linux-3.4.57/fs/ext3/ext3.h 2012-05-21 16:07:20.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/ext3/ext3.h 2012-05-21 17:13:31.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/ext3/ext3.h linux-3.4.83-vs2.3.3.9/fs/ext3/ext3.h +--- linux-3.4.83/fs/ext3/ext3.h 2014-03-12 09:48:13.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/ext3/ext3.h 2014-03-12 09:55:28.000000000 +0000 @@ -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) */ @@ -2630,7 +2630,7 @@ diff -NurpP --minimal linux-3.4.57/fs/ext3/ext3.h linux-3.4.57-vs2.3.3.9/fs/ext3 /* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */ #ifndef _LINUX_EXT2_FS_H -@@ -1057,6 +1064,7 @@ extern void ext3_get_inode_flags(struct +@@ -1061,6 +1068,7 @@ extern void ext3_get_inode_flags(struct extern void ext3_set_aops(struct inode *inode); extern int ext3_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, u64 start, u64 len); @@ -2638,9 +2638,9 @@ diff -NurpP --minimal linux-3.4.57/fs/ext3/ext3.h linux-3.4.57-vs2.3.3.9/fs/ext3 /* ioctl.c */ extern long ext3_ioctl(struct file *, unsigned int, unsigned long); -diff -NurpP --minimal linux-3.4.57/fs/ext3/file.c linux-3.4.57-vs2.3.3.9/fs/ext3/file.c ---- linux-3.4.57/fs/ext3/file.c 2012-05-21 16:07:20.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/ext3/file.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/ext3/file.c linux-3.4.83-vs2.3.3.9/fs/ext3/file.c +--- linux-3.4.83/fs/ext3/file.c 2012-05-21 16:07:20.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/ext3/file.c 2012-05-21 16:15:05.000000000 +0000 @@ -76,5 +76,6 @@ const struct inode_operations ext3_file_ #endif .get_acl = ext3_get_acl, @@ -2648,9 +2648,9 @@ diff -NurpP --minimal linux-3.4.57/fs/ext3/file.c linux-3.4.57-vs2.3.3.9/fs/ext3 + .sync_flags = ext3_sync_flags, }; -diff -NurpP --minimal linux-3.4.57/fs/ext3/ialloc.c linux-3.4.57-vs2.3.3.9/fs/ext3/ialloc.c ---- linux-3.4.57/fs/ext3/ialloc.c 2012-05-21 16:07:20.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/ext3/ialloc.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/ext3/ialloc.c linux-3.4.83-vs2.3.3.9/fs/ext3/ialloc.c +--- linux-3.4.83/fs/ext3/ialloc.c 2012-05-21 16:07:20.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/ext3/ialloc.c 2012-05-21 16:15:05.000000000 +0000 @@ -14,6 +14,7 @@ #include @@ -2667,9 +2667,9 @@ diff -NurpP --minimal linux-3.4.57/fs/ext3/ialloc.c linux-3.4.57-vs2.3.3.9/fs/ex } else inode_init_owner(inode, dir, mode); -diff -NurpP --minimal linux-3.4.57/fs/ext3/inode.c linux-3.4.57-vs2.3.3.9/fs/ext3/inode.c ---- linux-3.4.57/fs/ext3/inode.c 2013-08-13 14:13:32.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/ext3/inode.c 2013-08-13 17:07:36.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/ext3/inode.c linux-3.4.83-vs2.3.3.9/fs/ext3/inode.c +--- linux-3.4.83/fs/ext3/inode.c 2014-03-12 09:48:13.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/ext3/inode.c 2013-08-13 17:07:36.000000000 +0000 @@ -27,6 +27,8 @@ #include #include @@ -2844,9 +2844,9 @@ diff -NurpP --minimal linux-3.4.57/fs/ext3/inode.c linux-3.4.57-vs2.3.3.9/fs/ext error = ext3_mark_inode_dirty(handle, inode); ext3_journal_stop(handle); } -diff -NurpP --minimal linux-3.4.57/fs/ext3/ioctl.c linux-3.4.57-vs2.3.3.9/fs/ext3/ioctl.c ---- linux-3.4.57/fs/ext3/ioctl.c 2012-05-21 16:07:20.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/ext3/ioctl.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/ext3/ioctl.c linux-3.4.83-vs2.3.3.9/fs/ext3/ioctl.c +--- linux-3.4.83/fs/ext3/ioctl.c 2012-05-21 16:07:20.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/ext3/ioctl.c 2012-05-21 16:15:05.000000000 +0000 @@ -12,6 +12,34 @@ #include #include "ext3.h" @@ -2914,9 +2914,9 @@ diff -NurpP --minimal linux-3.4.57/fs/ext3/ioctl.c linux-3.4.57-vs2.3.3.9/fs/ext flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE; ei->i_flags = flags; -diff -NurpP --minimal linux-3.4.57/fs/ext3/namei.c linux-3.4.57-vs2.3.3.9/fs/ext3/namei.c ---- linux-3.4.57/fs/ext3/namei.c 2013-08-13 14:13:32.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/ext3/namei.c 2013-08-13 17:07:36.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/ext3/namei.c linux-3.4.83-vs2.3.3.9/fs/ext3/namei.c +--- linux-3.4.83/fs/ext3/namei.c 2014-03-12 09:48:13.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/ext3/namei.c 2013-08-13 17:07:36.000000000 +0000 @@ -25,6 +25,8 @@ */ @@ -2942,9 +2942,9 @@ diff -NurpP --minimal linux-3.4.57/fs/ext3/namei.c linux-3.4.57-vs2.3.3.9/fs/ext .get_acl = ext3_get_acl, }; -diff -NurpP --minimal linux-3.4.57/fs/ext3/super.c linux-3.4.57-vs2.3.3.9/fs/ext3/super.c ---- linux-3.4.57/fs/ext3/super.c 2013-08-13 14:13:32.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/ext3/super.c 2013-03-30 21:29:17.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/ext3/super.c linux-3.4.83-vs2.3.3.9/fs/ext3/super.c +--- linux-3.4.83/fs/ext3/super.c 2014-03-12 09:48:13.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/ext3/super.c 2013-03-30 21:29:17.000000000 +0000 @@ -820,7 +820,8 @@ enum { Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota, Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota, @@ -3011,9 +3011,9 @@ diff -NurpP --minimal linux-3.4.57/fs/ext3/super.c linux-3.4.57-vs2.3.3.9/fs/ext sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); -diff -NurpP --minimal linux-3.4.57/fs/ext4/ext4.h linux-3.4.57-vs2.3.3.9/fs/ext4/ext4.h ---- linux-3.4.57/fs/ext4/ext4.h 2013-08-13 14:13:32.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/ext4/ext4.h 2013-07-14 13:38:34.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/ext4/ext4.h linux-3.4.83-vs2.3.3.9/fs/ext4/ext4.h +--- linux-3.4.83/fs/ext4/ext4.h 2014-03-12 09:48:13.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/ext4/ext4.h 2014-03-12 09:55:28.000000000 +0000 @@ -380,8 +380,12 @@ struct flex_groups { #define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */ #define EXT4_EA_INODE_FL 0x00200000 /* Inode used for large EA */ @@ -3037,7 +3037,7 @@ diff -NurpP --minimal linux-3.4.57/fs/ext4/ext4.h linux-3.4.57-vs2.3.3.9/fs/ext4 } linux2; struct { __le16 h_i_reserved1; /* Obsoleted fragment number/size which are removed in ext4 */ -@@ -768,6 +773,7 @@ do { \ +@@ -770,6 +775,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 @@ -3045,7 +3045,7 @@ diff -NurpP --minimal linux-3.4.57/fs/ext4/ext4.h linux-3.4.57-vs2.3.3.9/fs/ext4 #define i_reserved2 osd2.linux2.l_i_reserved2 #elif defined(__GNU__) -@@ -945,6 +951,7 @@ struct ext4_inode_info { +@@ -947,6 +953,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 */ @@ -3053,7 +3053,7 @@ diff -NurpP --minimal linux-3.4.57/fs/ext4/ext4.h linux-3.4.57-vs2.3.3.9/fs/ext4 #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 */ -@@ -2294,6 +2301,7 @@ extern int ext4_map_blocks(handle_t *han +@@ -2296,6 +2303,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); @@ -3061,9 +3061,9 @@ diff -NurpP --minimal linux-3.4.57/fs/ext4/ext4.h linux-3.4.57-vs2.3.3.9/fs/ext4 /* 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.4.57/fs/ext4/file.c linux-3.4.57-vs2.3.3.9/fs/ext4/file.c ---- linux-3.4.57/fs/ext4/file.c 2012-01-09 15:14:54.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/ext4/file.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/ext4/file.c linux-3.4.83-vs2.3.3.9/fs/ext4/file.c +--- linux-3.4.83/fs/ext4/file.c 2012-01-09 15:14:54.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/ext4/file.c 2012-05-21 16:15:05.000000000 +0000 @@ -258,5 +258,6 @@ const struct inode_operations ext4_file_ #endif .get_acl = ext4_get_acl, @@ -3071,9 +3071,9 @@ diff -NurpP --minimal linux-3.4.57/fs/ext4/file.c linux-3.4.57-vs2.3.3.9/fs/ext4 + .sync_flags = ext4_sync_flags, }; -diff -NurpP --minimal linux-3.4.57/fs/ext4/ialloc.c linux-3.4.57-vs2.3.3.9/fs/ext4/ialloc.c ---- linux-3.4.57/fs/ext4/ialloc.c 2013-08-13 14:13:32.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/ext4/ialloc.c 2013-07-14 13:38:34.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/ext4/ialloc.c linux-3.4.83-vs2.3.3.9/fs/ext4/ialloc.c +--- linux-3.4.83/fs/ext4/ialloc.c 2014-03-12 09:48:13.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/ext4/ialloc.c 2014-03-12 09:55:28.000000000 +0000 @@ -22,6 +22,7 @@ #include #include @@ -3082,7 +3082,7 @@ diff -NurpP --minimal linux-3.4.57/fs/ext4/ialloc.c linux-3.4.57-vs2.3.3.9/fs/ex #include #include "ext4.h" -@@ -815,6 +816,7 @@ got: +@@ -817,6 +818,7 @@ got: inode->i_mode = mode; inode->i_uid = current_fsuid(); inode->i_gid = dir->i_gid; @@ -3090,9 +3090,9 @@ diff -NurpP --minimal linux-3.4.57/fs/ext4/ialloc.c linux-3.4.57-vs2.3.3.9/fs/ex } else inode_init_owner(inode, dir, mode); -diff -NurpP --minimal linux-3.4.57/fs/ext4/inode.c linux-3.4.57-vs2.3.3.9/fs/ext4/inode.c ---- linux-3.4.57/fs/ext4/inode.c 2013-08-13 14:13:32.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/ext4/inode.c 2013-08-13 17:07:36.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/ext4/inode.c linux-3.4.83-vs2.3.3.9/fs/ext4/inode.c +--- linux-3.4.83/fs/ext4/inode.c 2014-03-12 09:48:13.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/ext4/inode.c 2014-03-12 09:55:28.000000000 +0000 @@ -37,6 +37,7 @@ #include #include @@ -3101,7 +3101,7 @@ diff -NurpP --minimal linux-3.4.57/fs/ext4/inode.c linux-3.4.57-vs2.3.3.9/fs/ext #include "ext4_jbd2.h" #include "xattr.h" -@@ -3585,41 +3586,64 @@ void ext4_set_inode_flags(struct inode * +@@ -3581,41 +3582,64 @@ void ext4_set_inode_flags(struct inode * { unsigned int flags = EXT4_I(inode)->i_flags; @@ -3173,7 +3173,7 @@ diff -NurpP --minimal linux-3.4.57/fs/ext4/inode.c linux-3.4.57-vs2.3.3.9/fs/ext } while (cmpxchg(&ei->i_flags, old_fl, new_fl) != old_fl); } -@@ -3655,6 +3679,8 @@ struct inode *ext4_iget(struct super_blo +@@ -3651,6 +3675,8 @@ struct inode *ext4_iget(struct super_blo journal_t *journal = EXT4_SB(sb)->s_journal; long ret; int block; @@ -3182,7 +3182,7 @@ diff -NurpP --minimal linux-3.4.57/fs/ext4/inode.c linux-3.4.57-vs2.3.3.9/fs/ext inode = iget_locked(sb, ino); if (!inode) -@@ -3670,12 +3696,16 @@ struct inode *ext4_iget(struct super_blo +@@ -3666,12 +3692,16 @@ struct inode *ext4_iget(struct super_blo goto bad_inode; raw_inode = ext4_raw_inode(&iloc); inode->i_mode = le16_to_cpu(raw_inode->i_mode); @@ -3203,7 +3203,7 @@ diff -NurpP --minimal linux-3.4.57/fs/ext4/inode.c linux-3.4.57-vs2.3.3.9/fs/ext set_nlink(inode, le16_to_cpu(raw_inode->i_links_count)); ext4_clear_state_flags(ei); /* Only relevant on 32-bit archs */ -@@ -3894,6 +3924,8 @@ static int ext4_do_update_inode(handle_t +@@ -3890,6 +3920,8 @@ static int ext4_do_update_inode(handle_t struct ext4_inode *raw_inode = ext4_raw_inode(iloc); struct ext4_inode_info *ei = EXT4_I(inode); struct buffer_head *bh = iloc->bh; @@ -3212,7 +3212,7 @@ diff -NurpP --minimal linux-3.4.57/fs/ext4/inode.c linux-3.4.57-vs2.3.3.9/fs/ext int err = 0, rc, block; int need_datasync = 0; -@@ -3905,29 +3937,32 @@ static int ext4_do_update_inode(handle_t +@@ -3901,29 +3933,32 @@ 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))) { @@ -3251,7 +3251,7 @@ diff -NurpP --minimal linux-3.4.57/fs/ext4/inode.c linux-3.4.57-vs2.3.3.9/fs/ext raw_inode->i_links_count = cpu_to_le16(inode->i_nlink); EXT4_INODE_SET_XTIME(i_ctime, inode, raw_inode); -@@ -4114,7 +4149,8 @@ int ext4_setattr(struct dentry *dentry, +@@ -4110,7 +4145,8 @@ int ext4_setattr(struct dentry *dentry, if (is_quota_modification(inode, attr)) dquot_initialize(inode); if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) || @@ -3261,7 +3261,7 @@ diff -NurpP --minimal linux-3.4.57/fs/ext4/inode.c linux-3.4.57-vs2.3.3.9/fs/ext handle_t *handle; /* (user+group)*(old+new) structure, inode write (sb, -@@ -4136,6 +4172,8 @@ int ext4_setattr(struct dentry *dentry, +@@ -4132,6 +4168,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; @@ -3270,9 +3270,9 @@ diff -NurpP --minimal linux-3.4.57/fs/ext4/inode.c linux-3.4.57-vs2.3.3.9/fs/ext error = ext4_mark_inode_dirty(handle, inode); ext4_journal_stop(handle); } -diff -NurpP --minimal linux-3.4.57/fs/ext4/ioctl.c linux-3.4.57-vs2.3.3.9/fs/ext4/ioctl.c ---- linux-3.4.57/fs/ext4/ioctl.c 2013-08-13 14:13:33.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/ext4/ioctl.c 2012-09-01 08:50:49.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/ext4/ioctl.c linux-3.4.83-vs2.3.3.9/fs/ext4/ioctl.c +--- linux-3.4.83/fs/ext4/ioctl.c 2014-03-12 09:48:13.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/ext4/ioctl.c 2012-09-01 08:50:49.000000000 +0000 @@ -14,12 +14,40 @@ #include #include @@ -3337,9 +3337,9 @@ diff -NurpP --minimal linux-3.4.57/fs/ext4/ioctl.c linux-3.4.57-vs2.3.3.9/fs/ext if (!capable(CAP_LINUX_IMMUTABLE)) goto flags_out; } -diff -NurpP --minimal linux-3.4.57/fs/ext4/namei.c linux-3.4.57-vs2.3.3.9/fs/ext4/namei.c ---- linux-3.4.57/fs/ext4/namei.c 2013-08-13 14:13:33.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/ext4/namei.c 2013-08-13 17:07:36.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/ext4/namei.c linux-3.4.83-vs2.3.3.9/fs/ext4/namei.c +--- linux-3.4.83/fs/ext4/namei.c 2014-03-12 09:48:13.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/ext4/namei.c 2013-10-26 18:10:21.000000000 +0000 @@ -34,6 +34,7 @@ #include #include @@ -3356,7 +3356,7 @@ diff -NurpP --minimal linux-3.4.57/fs/ext4/namei.c linux-3.4.57-vs2.3.3.9/fs/ext } if ((bh = bh_use[ra_ptr++]) == NULL) goto next; -@@ -2588,6 +2590,7 @@ const struct inode_operations ext4_dir_i +@@ -2589,6 +2591,7 @@ const struct inode_operations ext4_dir_i #endif .get_acl = ext4_get_acl, .fiemap = ext4_fiemap, @@ -3364,9 +3364,9 @@ diff -NurpP --minimal linux-3.4.57/fs/ext4/namei.c linux-3.4.57-vs2.3.3.9/fs/ext }; const struct inode_operations ext4_special_inode_operations = { -diff -NurpP --minimal linux-3.4.57/fs/ext4/super.c linux-3.4.57-vs2.3.3.9/fs/ext4/super.c ---- linux-3.4.57/fs/ext4/super.c 2013-08-13 14:13:33.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/ext4/super.c 2013-07-14 13:38:34.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/ext4/super.c linux-3.4.83-vs2.3.3.9/fs/ext4/super.c +--- linux-3.4.83/fs/ext4/super.c 2014-03-12 09:48:13.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/ext4/super.c 2014-03-12 09:55:28.000000000 +0000 @@ -1191,6 +1191,7 @@ enum { Opt_inode_readahead_blks, Opt_journal_ioprio, Opt_dioread_nolock, Opt_dioread_lock, @@ -3416,7 +3416,7 @@ diff -NurpP --minimal linux-3.4.57/fs/ext4/super.c linux-3.4.57-vs2.3.3.9/fs/ext sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); -@@ -4400,6 +4421,14 @@ static int ext4_remount(struct super_blo +@@ -4421,6 +4442,14 @@ static int ext4_remount(struct super_blo if (sbi->s_mount_flags & EXT4_MF_FS_ABORTED) ext4_abort(sb, "Abort forced by user"); @@ -3431,9 +3431,9 @@ diff -NurpP --minimal linux-3.4.57/fs/ext4/super.c linux-3.4.57-vs2.3.3.9/fs/ext sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); -diff -NurpP --minimal linux-3.4.57/fs/fcntl.c linux-3.4.57-vs2.3.3.9/fs/fcntl.c ---- linux-3.4.57/fs/fcntl.c 2012-05-21 16:07:20.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/fcntl.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/fcntl.c linux-3.4.83-vs2.3.3.9/fs/fcntl.c +--- linux-3.4.83/fs/fcntl.c 2012-05-21 16:07:20.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/fcntl.c 2012-05-21 16:15:05.000000000 +0000 @@ -20,6 +20,7 @@ #include #include @@ -3460,9 +3460,9 @@ diff -NurpP --minimal linux-3.4.57/fs/fcntl.c linux-3.4.57-vs2.3.3.9/fs/fcntl.c if (unlikely(filp->f_mode & FMODE_PATH)) { if (!check_fcntl_cmd(cmd)) { -diff -NurpP --minimal linux-3.4.57/fs/file.c linux-3.4.57-vs2.3.3.9/fs/file.c ---- linux-3.4.57/fs/file.c 2012-05-21 16:07:20.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/file.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/file.c linux-3.4.83-vs2.3.3.9/fs/file.c +--- linux-3.4.83/fs/file.c 2014-03-12 09:48:13.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/file.c 2014-03-12 09:55:28.000000000 +0000 @@ -21,6 +21,7 @@ #include #include @@ -3488,9 +3488,9 @@ diff -NurpP --minimal linux-3.4.57/fs/file.c linux-3.4.57-vs2.3.3.9/fs/file.c #if 1 /* Sanity check */ if (rcu_dereference_raw(fdt->fd[fd]) != NULL) { -diff -NurpP --minimal linux-3.4.57/fs/file_table.c linux-3.4.57-vs2.3.3.9/fs/file_table.c ---- linux-3.4.57/fs/file_table.c 2012-05-21 16:07:20.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/file_table.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/file_table.c linux-3.4.83-vs2.3.3.9/fs/file_table.c +--- linux-3.4.83/fs/file_table.c 2012-05-21 16:07:20.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/file_table.c 2012-05-21 16:15:05.000000000 +0000 @@ -24,6 +24,8 @@ #include #include @@ -3527,9 +3527,9 @@ diff -NurpP --minimal linux-3.4.57/fs/file_table.c linux-3.4.57-vs2.3.3.9/fs/fil file_sb_list_del(file); file_free(file); } -diff -NurpP --minimal linux-3.4.57/fs/fs_struct.c linux-3.4.57-vs2.3.3.9/fs/fs_struct.c ---- linux-3.4.57/fs/fs_struct.c 2012-05-21 16:07:20.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/fs_struct.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/fs_struct.c linux-3.4.83-vs2.3.3.9/fs/fs_struct.c +--- linux-3.4.83/fs/fs_struct.c 2012-05-21 16:07:20.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/fs_struct.c 2012-05-21 16:15:05.000000000 +0000 @@ -4,6 +4,7 @@ #include #include @@ -3554,9 +3554,9 @@ diff -NurpP --minimal linux-3.4.57/fs/fs_struct.c linux-3.4.57-vs2.3.3.9/fs/fs_s } return fs; } -diff -NurpP --minimal linux-3.4.57/fs/gfs2/file.c linux-3.4.57-vs2.3.3.9/fs/gfs2/file.c ---- linux-3.4.57/fs/gfs2/file.c 2012-05-21 16:07:20.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/gfs2/file.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/gfs2/file.c linux-3.4.83-vs2.3.3.9/fs/gfs2/file.c +--- linux-3.4.83/fs/gfs2/file.c 2012-05-21 16:07:20.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/gfs2/file.c 2012-05-21 16:15:05.000000000 +0000 @@ -142,6 +142,9 @@ static const u32 fsflags_to_gfs2[32] = { [7] = GFS2_DIF_NOATIME, [12] = GFS2_DIF_EXHASH, @@ -3679,9 +3679,9 @@ diff -NurpP --minimal linux-3.4.57/fs/gfs2/file.c linux-3.4.57-vs2.3.3.9/fs/gfs2 static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { switch(cmd) { -diff -NurpP --minimal linux-3.4.57/fs/gfs2/inode.h linux-3.4.57-vs2.3.3.9/fs/gfs2/inode.h ---- linux-3.4.57/fs/gfs2/inode.h 2012-01-09 15:14:54.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/gfs2/inode.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/gfs2/inode.h linux-3.4.83-vs2.3.3.9/fs/gfs2/inode.h +--- linux-3.4.83/fs/gfs2/inode.h 2012-01-09 15:14:54.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/gfs2/inode.h 2012-05-21 16:15:05.000000000 +0000 @@ -120,6 +120,7 @@ extern const struct file_operations gfs2 extern const struct file_operations gfs2_dir_fops_nolock; @@ -3690,9 +3690,9 @@ diff -NurpP --minimal linux-3.4.57/fs/gfs2/inode.h linux-3.4.57-vs2.3.3.9/fs/gfs #ifdef CONFIG_GFS2_FS_LOCKING_DLM extern const struct file_operations gfs2_file_fops; -diff -NurpP --minimal linux-3.4.57/fs/inode.c linux-3.4.57-vs2.3.3.9/fs/inode.c ---- linux-3.4.57/fs/inode.c 2013-08-13 14:13:33.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/inode.c 2013-07-14 13:38:34.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/inode.c linux-3.4.83-vs2.3.3.9/fs/inode.c +--- linux-3.4.83/fs/inode.c 2014-03-12 09:48:14.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/inode.c 2013-07-14 13:38:34.000000000 +0000 @@ -17,6 +17,7 @@ #include #include /* for inode_has_buffers */ @@ -3748,9 +3748,9 @@ diff -NurpP --minimal linux-3.4.57/fs/inode.c linux-3.4.57-vs2.3.3.9/fs/inode.c } EXPORT_SYMBOL(inode_init_owner); -diff -NurpP --minimal linux-3.4.57/fs/ioctl.c linux-3.4.57-vs2.3.3.9/fs/ioctl.c ---- linux-3.4.57/fs/ioctl.c 2012-05-21 16:07:24.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/ioctl.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/ioctl.c linux-3.4.83-vs2.3.3.9/fs/ioctl.c +--- linux-3.4.83/fs/ioctl.c 2012-05-21 16:07:24.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/ioctl.c 2012-05-21 16:15:05.000000000 +0000 @@ -15,6 +15,9 @@ #include #include @@ -3761,9 +3761,9 @@ diff -NurpP --minimal linux-3.4.57/fs/ioctl.c linux-3.4.57-vs2.3.3.9/fs/ioctl.c #include -diff -NurpP --minimal linux-3.4.57/fs/ioprio.c linux-3.4.57-vs2.3.3.9/fs/ioprio.c ---- linux-3.4.57/fs/ioprio.c 2012-03-19 18:47:25.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/ioprio.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/ioprio.c linux-3.4.83-vs2.3.3.9/fs/ioprio.c +--- linux-3.4.83/fs/ioprio.c 2012-03-19 18:47:25.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/ioprio.c 2012-05-21 16:15:05.000000000 +0000 @@ -28,6 +28,7 @@ #include #include @@ -3790,9 +3790,9 @@ diff -NurpP --minimal linux-3.4.57/fs/ioprio.c linux-3.4.57-vs2.3.3.9/fs/ioprio. tmpio = get_task_ioprio(p); if (tmpio < 0) continue; -diff -NurpP --minimal linux-3.4.57/fs/jfs/file.c linux-3.4.57-vs2.3.3.9/fs/jfs/file.c ---- linux-3.4.57/fs/jfs/file.c 2011-10-24 16:45:27.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/jfs/file.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/jfs/file.c linux-3.4.83-vs2.3.3.9/fs/jfs/file.c +--- linux-3.4.83/fs/jfs/file.c 2011-10-24 16:45:27.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/jfs/file.c 2012-05-21 16:15:05.000000000 +0000 @@ -109,7 +109,8 @@ int jfs_setattr(struct dentry *dentry, s if (is_quota_modification(inode, iattr)) dquot_initialize(inode); @@ -3811,9 +3811,9 @@ diff -NurpP --minimal linux-3.4.57/fs/jfs/file.c linux-3.4.57-vs2.3.3.9/fs/jfs/f }; const struct file_operations jfs_file_operations = { -diff -NurpP --minimal linux-3.4.57/fs/jfs/ioctl.c linux-3.4.57-vs2.3.3.9/fs/jfs/ioctl.c ---- linux-3.4.57/fs/jfs/ioctl.c 2012-03-19 18:47:25.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/jfs/ioctl.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/jfs/ioctl.c linux-3.4.83-vs2.3.3.9/fs/jfs/ioctl.c +--- linux-3.4.83/fs/jfs/ioctl.c 2012-03-19 18:47:25.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/jfs/ioctl.c 2012-05-21 16:15:05.000000000 +0000 @@ -11,6 +11,7 @@ #include #include @@ -3871,9 +3871,9 @@ diff -NurpP --minimal linux-3.4.57/fs/jfs/ioctl.c linux-3.4.57-vs2.3.3.9/fs/jfs/ flags |= oldflags & ~JFS_FL_USER_MODIFIABLE; jfs_inode->mode2 = flags; -diff -NurpP --minimal linux-3.4.57/fs/jfs/jfs_dinode.h linux-3.4.57-vs2.3.3.9/fs/jfs/jfs_dinode.h ---- linux-3.4.57/fs/jfs/jfs_dinode.h 2008-12-24 23:26:37.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/jfs/jfs_dinode.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/jfs/jfs_dinode.h linux-3.4.83-vs2.3.3.9/fs/jfs/jfs_dinode.h +--- linux-3.4.83/fs/jfs/jfs_dinode.h 2008-12-24 23:26:37.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/jfs/jfs_dinode.h 2012-05-21 16:15:05.000000000 +0000 @@ -161,9 +161,13 @@ struct dinode { #define JFS_APPEND_FL 0x01000000 /* writes to file may only append */ @@ -3890,9 +3890,9 @@ diff -NurpP --minimal linux-3.4.57/fs/jfs/jfs_dinode.h linux-3.4.57-vs2.3.3.9/fs #define JFS_FL_INHERIT 0x03C80000 /* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */ -diff -NurpP --minimal linux-3.4.57/fs/jfs/jfs_filsys.h linux-3.4.57-vs2.3.3.9/fs/jfs/jfs_filsys.h ---- linux-3.4.57/fs/jfs/jfs_filsys.h 2008-12-24 23:26:37.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/jfs/jfs_filsys.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/jfs/jfs_filsys.h linux-3.4.83-vs2.3.3.9/fs/jfs/jfs_filsys.h +--- linux-3.4.83/fs/jfs/jfs_filsys.h 2008-12-24 23:26:37.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/jfs/jfs_filsys.h 2012-05-21 16:15:05.000000000 +0000 @@ -263,6 +263,7 @@ #define JFS_NAME_MAX 255 #define JFS_PATH_MAX BPSIZE @@ -3901,9 +3901,9 @@ diff -NurpP --minimal linux-3.4.57/fs/jfs/jfs_filsys.h linux-3.4.57-vs2.3.3.9/fs /* * file system state (superblock state) -diff -NurpP --minimal linux-3.4.57/fs/jfs/jfs_imap.c linux-3.4.57-vs2.3.3.9/fs/jfs/jfs_imap.c ---- linux-3.4.57/fs/jfs/jfs_imap.c 2012-01-09 15:14:54.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/jfs/jfs_imap.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/jfs/jfs_imap.c linux-3.4.83-vs2.3.3.9/fs/jfs/jfs_imap.c +--- linux-3.4.83/fs/jfs/jfs_imap.c 2012-01-09 15:14:54.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/jfs/jfs_imap.c 2012-05-21 16:15:05.000000000 +0000 @@ -46,6 +46,7 @@ #include #include @@ -3963,9 +3963,9 @@ diff -NurpP --minimal linux-3.4.57/fs/jfs/jfs_imap.c linux-3.4.57-vs2.3.3.9/fs/j jfs_get_inode_flags(jfs_ip); /* * mode2 is only needed for storing the higher order bits. -diff -NurpP --minimal linux-3.4.57/fs/jfs/jfs_inode.c linux-3.4.57-vs2.3.3.9/fs/jfs/jfs_inode.c ---- linux-3.4.57/fs/jfs/jfs_inode.c 2012-01-09 15:14:54.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/jfs/jfs_inode.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/jfs/jfs_inode.c linux-3.4.83-vs2.3.3.9/fs/jfs/jfs_inode.c +--- linux-3.4.83/fs/jfs/jfs_inode.c 2014-03-12 09:48:14.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/jfs/jfs_inode.c 2014-03-12 09:55:28.000000000 +0000 @@ -18,6 +18,7 @@ #include @@ -4039,9 +4039,9 @@ diff -NurpP --minimal linux-3.4.57/fs/jfs/jfs_inode.c linux-3.4.57-vs2.3.3.9/fs/ } /* -diff -NurpP --minimal linux-3.4.57/fs/jfs/jfs_inode.h linux-3.4.57-vs2.3.3.9/fs/jfs/jfs_inode.h ---- linux-3.4.57/fs/jfs/jfs_inode.h 2011-10-24 16:45:27.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/jfs/jfs_inode.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/jfs/jfs_inode.h linux-3.4.83-vs2.3.3.9/fs/jfs/jfs_inode.h +--- linux-3.4.83/fs/jfs/jfs_inode.h 2011-10-24 16:45:27.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/jfs/jfs_inode.h 2012-05-21 16:15:05.000000000 +0000 @@ -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); @@ -4050,9 +4050,9 @@ diff -NurpP --minimal linux-3.4.57/fs/jfs/jfs_inode.h linux-3.4.57-vs2.3.3.9/fs/ 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.4.57/fs/jfs/namei.c linux-3.4.57-vs2.3.3.9/fs/jfs/namei.c ---- linux-3.4.57/fs/jfs/namei.c 2012-05-21 16:07:25.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/jfs/namei.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/jfs/namei.c linux-3.4.83-vs2.3.3.9/fs/jfs/namei.c +--- linux-3.4.83/fs/jfs/namei.c 2012-05-21 16:07:25.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/jfs/namei.c 2012-05-21 16:15:05.000000000 +0000 @@ -22,6 +22,7 @@ #include #include @@ -4077,9 +4077,9 @@ diff -NurpP --minimal linux-3.4.57/fs/jfs/namei.c linux-3.4.57-vs2.3.3.9/fs/jfs/ }; const struct file_operations jfs_dir_operations = { -diff -NurpP --minimal linux-3.4.57/fs/jfs/super.c linux-3.4.57-vs2.3.3.9/fs/jfs/super.c ---- linux-3.4.57/fs/jfs/super.c 2012-05-21 16:07:25.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/jfs/super.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/jfs/super.c linux-3.4.83-vs2.3.3.9/fs/jfs/super.c +--- linux-3.4.83/fs/jfs/super.c 2012-05-21 16:07:25.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/jfs/super.c 2012-05-21 16:15:05.000000000 +0000 @@ -197,7 +197,8 @@ static void jfs_put_super(struct super_b enum { Opt_integrity, Opt_nointegrity, Opt_iocharset, Opt_resize, @@ -4145,9 +4145,9 @@ diff -NurpP --minimal linux-3.4.57/fs/jfs/super.c linux-3.4.57-vs2.3.3.9/fs/jfs/ if (newLVSize) { printk(KERN_ERR "resize option for remount only\n"); -diff -NurpP --minimal linux-3.4.57/fs/libfs.c linux-3.4.57-vs2.3.3.9/fs/libfs.c ---- linux-3.4.57/fs/libfs.c 2012-05-21 16:07:25.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/libfs.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/libfs.c linux-3.4.83-vs2.3.3.9/fs/libfs.c +--- linux-3.4.83/fs/libfs.c 2012-05-21 16:07:25.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/libfs.c 2012-05-21 16:15:05.000000000 +0000 @@ -135,7 +135,8 @@ static inline unsigned char dt_type(stru * both impossible due to the lock on directory. */ @@ -4193,9 +4193,9 @@ diff -NurpP --minimal linux-3.4.57/fs/libfs.c linux-3.4.57-vs2.3.3.9/fs/libfs.c EXPORT_SYMBOL(generic_read_dir); EXPORT_SYMBOL(mount_pseudo); EXPORT_SYMBOL(simple_write_begin); -diff -NurpP --minimal linux-3.4.57/fs/locks.c linux-3.4.57-vs2.3.3.9/fs/locks.c ---- linux-3.4.57/fs/locks.c 2013-08-13 14:13:33.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/locks.c 2012-09-01 08:50:49.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/locks.c linux-3.4.83-vs2.3.3.9/fs/locks.c +--- linux-3.4.83/fs/locks.c 2014-03-12 09:48:14.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/locks.c 2012-09-01 08:50:49.000000000 +0000 @@ -126,6 +126,8 @@ #include #include @@ -4393,9 +4393,9 @@ diff -NurpP --minimal linux-3.4.57/fs/locks.c linux-3.4.57-vs2.3.3.9/fs/locks.c return 0; } -diff -NurpP --minimal linux-3.4.57/fs/mount.h linux-3.4.57-vs2.3.3.9/fs/mount.h ---- linux-3.4.57/fs/mount.h 2012-03-19 18:47:26.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/mount.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/mount.h linux-3.4.83-vs2.3.3.9/fs/mount.h +--- linux-3.4.83/fs/mount.h 2012-03-19 18:47:26.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/mount.h 2012-05-21 16:15:05.000000000 +0000 @@ -47,6 +47,7 @@ struct mount { int mnt_expiry_mark; /* true if marked for expiry */ int mnt_pinned; @@ -4404,9 +4404,9 @@ diff -NurpP --minimal linux-3.4.57/fs/mount.h linux-3.4.57-vs2.3.3.9/fs/mount.h }; static inline struct mount *real_mount(struct vfsmount *mnt) -diff -NurpP --minimal linux-3.4.57/fs/namei.c linux-3.4.57-vs2.3.3.9/fs/namei.c ---- linux-3.4.57/fs/namei.c 2012-05-21 16:07:25.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/namei.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/namei.c linux-3.4.83-vs2.3.3.9/fs/namei.c +--- linux-3.4.83/fs/namei.c 2012-05-21 16:07:25.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/namei.c 2012-05-21 16:15:05.000000000 +0000 @@ -33,6 +33,14 @@ #include #include @@ -4934,9 +4934,9 @@ diff -NurpP --minimal linux-3.4.57/fs/namei.c linux-3.4.57-vs2.3.3.9/fs/namei.c EXPORT_SYMBOL(dentry_unhash); EXPORT_SYMBOL(generic_readlink); +EXPORT_SYMBOL(vx_info_mnt_namespace); -diff -NurpP --minimal linux-3.4.57/fs/namespace.c linux-3.4.57-vs2.3.3.9/fs/namespace.c ---- linux-3.4.57/fs/namespace.c 2013-08-13 14:13:33.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/namespace.c 2012-06-28 14:45:07.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/namespace.c linux-3.4.83-vs2.3.3.9/fs/namespace.c +--- linux-3.4.83/fs/namespace.c 2014-03-12 09:48:14.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/namespace.c 2012-06-28 14:45:07.000000000 +0000 @@ -20,6 +20,11 @@ #include /* get_fs_root et.al. */ #include /* fsnotify_vfsmount_delete */ @@ -5123,9 +5123,9 @@ diff -NurpP --minimal linux-3.4.57/fs/namespace.c linux-3.4.57-vs2.3.3.9/fs/name kfree(ns); } -diff -NurpP --minimal linux-3.4.57/fs/nfs/client.c linux-3.4.57-vs2.3.3.9/fs/nfs/client.c ---- linux-3.4.57/fs/nfs/client.c 2013-08-13 14:13:33.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/nfs/client.c 2013-01-16 00:15:57.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/nfs/client.c linux-3.4.83-vs2.3.3.9/fs/nfs/client.c +--- linux-3.4.83/fs/nfs/client.c 2014-03-12 09:48:14.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/nfs/client.c 2013-01-16 00:15:57.000000000 +0000 @@ -801,6 +801,9 @@ static int nfs_init_server_rpcclient(str if (server->flags & NFS_MOUNT_SOFT) server->client->cl_softrtry = 1; @@ -5147,9 +5147,9 @@ diff -NurpP --minimal linux-3.4.57/fs/nfs/client.c linux-3.4.57-vs2.3.3.9/fs/nfs server->maxfilesize = fsinfo->maxfilesize; server->time_delta = fsinfo->time_delta; -diff -NurpP --minimal linux-3.4.57/fs/nfs/dir.c linux-3.4.57-vs2.3.3.9/fs/nfs/dir.c ---- linux-3.4.57/fs/nfs/dir.c 2013-08-13 14:13:33.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/nfs/dir.c 2013-01-16 00:15:57.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/nfs/dir.c linux-3.4.83-vs2.3.3.9/fs/nfs/dir.c +--- linux-3.4.83/fs/nfs/dir.c 2014-03-12 09:48:14.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/nfs/dir.c 2013-01-16 00:15:57.000000000 +0000 @@ -35,6 +35,7 @@ #include #include @@ -5166,9 +5166,9 @@ diff -NurpP --minimal linux-3.4.57/fs/nfs/dir.c linux-3.4.57-vs2.3.3.9/fs/nfs/di no_entry: res = d_materialise_unique(dentry, inode); if (res != NULL) { -diff -NurpP --minimal linux-3.4.57/fs/nfs/inode.c linux-3.4.57-vs2.3.3.9/fs/nfs/inode.c ---- linux-3.4.57/fs/nfs/inode.c 2013-08-13 14:13:34.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/nfs/inode.c 2012-10-22 13:09:53.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/nfs/inode.c linux-3.4.83-vs2.3.3.9/fs/nfs/inode.c +--- linux-3.4.83/fs/nfs/inode.c 2014-03-12 09:48:14.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/nfs/inode.c 2014-03-12 09:55:28.000000000 +0000 @@ -40,6 +40,7 @@ #include #include @@ -5177,7 +5177,7 @@ diff -NurpP --minimal linux-3.4.57/fs/nfs/inode.c linux-3.4.57-vs2.3.3.9/fs/nfs/ #include -@@ -275,6 +276,8 @@ nfs_fhget(struct super_block *sb, struct +@@ -277,6 +278,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; @@ -5186,7 +5186,7 @@ diff -NurpP --minimal linux-3.4.57/fs/nfs/inode.c linux-3.4.57-vs2.3.3.9/fs/nfs/ /* We set i_ino for the few things that still rely on it, * such as stat(2) */ -@@ -323,8 +326,8 @@ nfs_fhget(struct super_block *sb, struct +@@ -325,8 +328,8 @@ nfs_fhget(struct super_block *sb, struct inode->i_version = 0; inode->i_size = 0; clear_nlink(inode); @@ -5197,7 +5197,7 @@ diff -NurpP --minimal linux-3.4.57/fs/nfs/inode.c linux-3.4.57-vs2.3.3.9/fs/nfs/ inode->i_blocks = 0; memset(nfsi->cookieverf, 0, sizeof(nfsi->cookieverf)); -@@ -361,13 +364,13 @@ nfs_fhget(struct super_block *sb, struct +@@ -363,13 +366,13 @@ nfs_fhget(struct super_block *sb, struct else if (nfs_server_capable(inode, NFS_CAP_NLINK)) nfsi->cache_validity |= NFS_INO_INVALID_ATTR; if (fattr->valid & NFS_ATTR_FATTR_OWNER) @@ -5213,7 +5213,7 @@ diff -NurpP --minimal linux-3.4.57/fs/nfs/inode.c linux-3.4.57-vs2.3.3.9/fs/nfs/ else if (nfs_server_capable(inode, NFS_CAP_OWNER_GROUP)) nfsi->cache_validity |= NFS_INO_INVALID_ATTR | NFS_INO_INVALID_ACCESS -@@ -380,6 +383,11 @@ nfs_fhget(struct super_block *sb, struct +@@ -382,6 +385,11 @@ nfs_fhget(struct super_block *sb, struct */ inode->i_blocks = nfs_calc_block_size(fattr->du.nfs3.used); } @@ -5225,7 +5225,7 @@ diff -NurpP --minimal linux-3.4.57/fs/nfs/inode.c linux-3.4.57-vs2.3.3.9/fs/nfs/ nfsi->attrtimeo = NFS_MINATTRTIMEO(inode); nfsi->attrtimeo_timestamp = now; nfsi->access_cache = RB_ROOT; -@@ -497,6 +505,8 @@ void nfs_setattr_update_inode(struct ino +@@ -499,6 +507,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; @@ -5234,7 +5234,7 @@ diff -NurpP --minimal linux-3.4.57/fs/nfs/inode.c linux-3.4.57-vs2.3.3.9/fs/nfs/ NFS_I(inode)->cache_validity |= NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL; spin_unlock(&inode->i_lock); } -@@ -946,6 +956,9 @@ static int nfs_check_inode_attributes(st +@@ -948,6 +958,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; @@ -5244,7 +5244,7 @@ diff -NurpP --minimal linux-3.4.57/fs/nfs/inode.c linux-3.4.57-vs2.3.3.9/fs/nfs/ /* Has the inode gone and changed behind our back? */ -@@ -969,13 +982,18 @@ static int nfs_check_inode_attributes(st +@@ -971,13 +984,18 @@ static int nfs_check_inode_attributes(st invalid |= NFS_INO_INVALID_ATTR|NFS_INO_REVAL_PAGECACHE; } @@ -5265,7 +5265,7 @@ diff -NurpP --minimal linux-3.4.57/fs/nfs/inode.c linux-3.4.57-vs2.3.3.9/fs/nfs/ /* Has the link count changed? */ if ((fattr->valid & NFS_ATTR_FATTR_NLINK) && inode->i_nlink != fattr->nlink) -@@ -1273,6 +1291,9 @@ static int nfs_update_inode(struct inode +@@ -1275,6 +1293,9 @@ static int nfs_update_inode(struct inode unsigned long invalid = 0; unsigned long now = jiffies; unsigned long save_cache_validity; @@ -5275,7 +5275,7 @@ diff -NurpP --minimal linux-3.4.57/fs/nfs/inode.c linux-3.4.57-vs2.3.3.9/fs/nfs/ 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, -@@ -1381,6 +1402,9 @@ static int nfs_update_inode(struct inode +@@ -1383,6 +1404,9 @@ static int nfs_update_inode(struct inode | NFS_INO_REVAL_PAGECACHE | NFS_INO_REVAL_FORCED); @@ -5285,7 +5285,7 @@ diff -NurpP --minimal linux-3.4.57/fs/nfs/inode.c linux-3.4.57-vs2.3.3.9/fs/nfs/ if (fattr->valid & NFS_ATTR_FATTR_ATIME) memcpy(&inode->i_atime, &fattr->atime, sizeof(inode->i_atime)); -@@ -1402,9 +1426,9 @@ static int nfs_update_inode(struct inode +@@ -1404,9 +1428,9 @@ static int nfs_update_inode(struct inode | NFS_INO_REVAL_FORCED); if (fattr->valid & NFS_ATTR_FATTR_OWNER) { @@ -5297,7 +5297,7 @@ diff -NurpP --minimal linux-3.4.57/fs/nfs/inode.c linux-3.4.57-vs2.3.3.9/fs/nfs/ } } else if (server->caps & NFS_CAP_OWNER) invalid |= save_cache_validity & (NFS_INO_INVALID_ATTR -@@ -1413,9 +1437,9 @@ static int nfs_update_inode(struct inode +@@ -1415,9 +1439,9 @@ static int nfs_update_inode(struct inode | NFS_INO_REVAL_FORCED); if (fattr->valid & NFS_ATTR_FATTR_GROUP) { @@ -5309,7 +5309,7 @@ diff -NurpP --minimal linux-3.4.57/fs/nfs/inode.c linux-3.4.57-vs2.3.3.9/fs/nfs/ } } else if (server->caps & NFS_CAP_OWNER_GROUP) invalid |= save_cache_validity & (NFS_INO_INVALID_ATTR -@@ -1423,6 +1447,10 @@ static int nfs_update_inode(struct inode +@@ -1425,6 +1449,10 @@ static int nfs_update_inode(struct inode | NFS_INO_INVALID_ACL | NFS_INO_REVAL_FORCED); @@ -5320,9 +5320,9 @@ diff -NurpP --minimal linux-3.4.57/fs/nfs/inode.c linux-3.4.57-vs2.3.3.9/fs/nfs/ if (fattr->valid & NFS_ATTR_FATTR_NLINK) { if (inode->i_nlink != fattr->nlink) { invalid |= NFS_INO_INVALID_ATTR; -diff -NurpP --minimal linux-3.4.57/fs/nfs/nfs3xdr.c linux-3.4.57-vs2.3.3.9/fs/nfs/nfs3xdr.c ---- linux-3.4.57/fs/nfs/nfs3xdr.c 2012-05-21 16:07:25.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/nfs/nfs3xdr.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/nfs/nfs3xdr.c linux-3.4.83-vs2.3.3.9/fs/nfs/nfs3xdr.c +--- linux-3.4.83/fs/nfs/nfs3xdr.c 2012-05-21 16:07:25.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/nfs/nfs3xdr.c 2012-05-21 16:15:05.000000000 +0000 @@ -20,6 +20,7 @@ #include #include @@ -5468,9 +5468,9 @@ diff -NurpP --minimal linux-3.4.57/fs/nfs/nfs3xdr.c linux-3.4.57-vs2.3.3.9/fs/nf } /* -diff -NurpP --minimal linux-3.4.57/fs/nfs/super.c linux-3.4.57-vs2.3.3.9/fs/nfs/super.c ---- linux-3.4.57/fs/nfs/super.c 2013-08-13 14:13:34.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/nfs/super.c 2013-01-16 00:15:57.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/nfs/super.c linux-3.4.83-vs2.3.3.9/fs/nfs/super.c +--- linux-3.4.83/fs/nfs/super.c 2014-03-12 09:48:15.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/nfs/super.c 2013-01-16 00:15:57.000000000 +0000 @@ -54,6 +54,7 @@ #include #include @@ -5542,9 +5542,9 @@ diff -NurpP --minimal linux-3.4.57/fs/nfs/super.c linux-3.4.57-vs2.3.3.9/fs/nfs/ /* * options that take text values -diff -NurpP --minimal linux-3.4.57/fs/nfsd/auth.c linux-3.4.57-vs2.3.3.9/fs/nfsd/auth.c ---- linux-3.4.57/fs/nfsd/auth.c 2010-02-25 10:52:05.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/nfsd/auth.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/nfsd/auth.c linux-3.4.83-vs2.3.3.9/fs/nfsd/auth.c +--- linux-3.4.83/fs/nfsd/auth.c 2010-02-25 10:52:05.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/nfsd/auth.c 2012-05-21 16:15:05.000000000 +0000 @@ -1,6 +1,7 @@ /* Copyright (C) 1995, 1996 Olaf Kirch */ @@ -5563,9 +5563,9 @@ diff -NurpP --minimal linux-3.4.57/fs/nfsd/auth.c linux-3.4.57-vs2.3.3.9/fs/nfsd rqgi = rqstp->rq_cred.cr_group_info; -diff -NurpP --minimal linux-3.4.57/fs/nfsd/nfs3xdr.c linux-3.4.57-vs2.3.3.9/fs/nfsd/nfs3xdr.c ---- linux-3.4.57/fs/nfsd/nfs3xdr.c 2012-05-21 16:07:26.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/nfsd/nfs3xdr.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/nfsd/nfs3xdr.c linux-3.4.83-vs2.3.3.9/fs/nfsd/nfs3xdr.c +--- linux-3.4.83/fs/nfsd/nfs3xdr.c 2012-05-21 16:07:26.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/nfsd/nfs3xdr.c 2012-05-21 16:15:05.000000000 +0000 @@ -7,6 +7,7 @@ */ @@ -5616,9 +5616,9 @@ diff -NurpP --minimal linux-3.4.57/fs/nfsd/nfs3xdr.c linux-3.4.57-vs2.3.3.9/fs/n if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) { p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN); } else { -diff -NurpP --minimal linux-3.4.57/fs/nfsd/nfs4xdr.c linux-3.4.57-vs2.3.3.9/fs/nfsd/nfs4xdr.c ---- linux-3.4.57/fs/nfsd/nfs4xdr.c 2013-08-13 14:13:34.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/nfsd/nfs4xdr.c 2013-07-14 13:38:35.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/nfsd/nfs4xdr.c linux-3.4.83-vs2.3.3.9/fs/nfsd/nfs4xdr.c +--- linux-3.4.83/fs/nfsd/nfs4xdr.c 2014-03-12 09:48:15.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/nfsd/nfs4xdr.c 2013-07-14 13:38:35.000000000 +0000 @@ -46,6 +46,7 @@ #include #include @@ -5648,9 +5648,9 @@ diff -NurpP --minimal linux-3.4.57/fs/nfsd/nfs4xdr.c linux-3.4.57-vs2.3.3.9/fs/n if (status == nfserr_resource) goto out_resource; if (status) -diff -NurpP --minimal linux-3.4.57/fs/nfsd/nfsxdr.c linux-3.4.57-vs2.3.3.9/fs/nfsd/nfsxdr.c ---- linux-3.4.57/fs/nfsd/nfsxdr.c 2011-05-22 14:17:53.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/nfsd/nfsxdr.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/nfsd/nfsxdr.c linux-3.4.83-vs2.3.3.9/fs/nfsd/nfsxdr.c +--- linux-3.4.83/fs/nfsd/nfsxdr.c 2011-05-22 14:17:53.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/nfsd/nfsxdr.c 2012-05-21 16:15:05.000000000 +0000 @@ -6,6 +6,7 @@ #include "xdr.h" @@ -5699,9 +5699,9 @@ diff -NurpP --minimal linux-3.4.57/fs/nfsd/nfsxdr.c linux-3.4.57-vs2.3.3.9/fs/nf if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) { *p++ = htonl(NFS_MAXPATHLEN); -diff -NurpP --minimal linux-3.4.57/fs/ocfs2/dlmglue.c linux-3.4.57-vs2.3.3.9/fs/ocfs2/dlmglue.c ---- linux-3.4.57/fs/ocfs2/dlmglue.c 2013-08-13 14:13:34.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/ocfs2/dlmglue.c 2013-03-02 15:26:44.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/ocfs2/dlmglue.c linux-3.4.83-vs2.3.3.9/fs/ocfs2/dlmglue.c +--- linux-3.4.83/fs/ocfs2/dlmglue.c 2014-03-12 09:48:15.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/ocfs2/dlmglue.c 2013-03-02 15:26:44.000000000 +0000 @@ -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); @@ -5718,9 +5718,9 @@ diff -NurpP --minimal linux-3.4.57/fs/ocfs2/dlmglue.c linux-3.4.57-vs2.3.3.9/fs/ 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.4.57/fs/ocfs2/dlmglue.h linux-3.4.57-vs2.3.3.9/fs/ocfs2/dlmglue.h ---- linux-3.4.57/fs/ocfs2/dlmglue.h 2010-10-21 11:07:50.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/ocfs2/dlmglue.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/ocfs2/dlmglue.h linux-3.4.83-vs2.3.3.9/fs/ocfs2/dlmglue.h +--- linux-3.4.83/fs/ocfs2/dlmglue.h 2010-10-21 11:07:50.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/ocfs2/dlmglue.h 2012-05-21 16:15:05.000000000 +0000 @@ -46,7 +46,8 @@ struct ocfs2_meta_lvb { __be16 lvb_inlink; __be32 lvb_iattr; @@ -5731,9 +5731,9 @@ diff -NurpP --minimal linux-3.4.57/fs/ocfs2/dlmglue.h linux-3.4.57-vs2.3.3.9/fs/ }; #define OCFS2_QINFO_LVB_VERSION 1 -diff -NurpP --minimal linux-3.4.57/fs/ocfs2/file.c linux-3.4.57-vs2.3.3.9/fs/ocfs2/file.c ---- linux-3.4.57/fs/ocfs2/file.c 2013-08-13 14:13:34.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/ocfs2/file.c 2012-07-17 22:29:43.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/ocfs2/file.c linux-3.4.83-vs2.3.3.9/fs/ocfs2/file.c +--- linux-3.4.83/fs/ocfs2/file.c 2014-03-12 09:48:15.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/ocfs2/file.c 2012-07-17 22:29:43.000000000 +0000 @@ -1123,7 +1123,7 @@ int ocfs2_setattr(struct dentry *dentry, attr->ia_valid &= ~ATTR_SIZE; @@ -5743,9 +5743,9 @@ diff -NurpP --minimal linux-3.4.57/fs/ocfs2/file.c linux-3.4.57-vs2.3.3.9/fs/ocf if (!(attr->ia_valid & OCFS2_VALID_ATTRS)) return 0; -diff -NurpP --minimal linux-3.4.57/fs/ocfs2/inode.c linux-3.4.57-vs2.3.3.9/fs/ocfs2/inode.c ---- linux-3.4.57/fs/ocfs2/inode.c 2012-01-09 15:14:55.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/ocfs2/inode.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/ocfs2/inode.c linux-3.4.83-vs2.3.3.9/fs/ocfs2/inode.c +--- linux-3.4.83/fs/ocfs2/inode.c 2012-01-09 15:14:55.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/ocfs2/inode.c 2012-05-21 16:15:05.000000000 +0000 @@ -28,6 +28,7 @@ #include #include @@ -5842,9 +5842,9 @@ diff -NurpP --minimal linux-3.4.57/fs/ocfs2/inode.c linux-3.4.57-vs2.3.3.9/fs/oc /* Fast symlinks will have i_size but no allocated clusters. */ if (S_ISLNK(inode->i_mode) && !fe->i_clusters) -diff -NurpP --minimal linux-3.4.57/fs/ocfs2/inode.h linux-3.4.57-vs2.3.3.9/fs/ocfs2/inode.h ---- linux-3.4.57/fs/ocfs2/inode.h 2012-01-09 15:14:55.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/ocfs2/inode.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/ocfs2/inode.h linux-3.4.83-vs2.3.3.9/fs/ocfs2/inode.h +--- linux-3.4.83/fs/ocfs2/inode.h 2012-01-09 15:14:55.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/ocfs2/inode.h 2012-05-21 16:15:05.000000000 +0000 @@ -154,6 +154,7 @@ struct buffer_head *ocfs2_bread(struct i void ocfs2_set_inode_flags(struct inode *inode); @@ -5853,9 +5853,9 @@ diff -NurpP --minimal linux-3.4.57/fs/ocfs2/inode.h linux-3.4.57-vs2.3.3.9/fs/oc static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode) { -diff -NurpP --minimal linux-3.4.57/fs/ocfs2/ioctl.c linux-3.4.57-vs2.3.3.9/fs/ocfs2/ioctl.c ---- linux-3.4.57/fs/ocfs2/ioctl.c 2012-05-21 16:07:26.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/ocfs2/ioctl.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/ocfs2/ioctl.c linux-3.4.83-vs2.3.3.9/fs/ocfs2/ioctl.c +--- linux-3.4.83/fs/ocfs2/ioctl.c 2012-05-21 16:07:26.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/ocfs2/ioctl.c 2012-05-21 16:15:05.000000000 +0000 @@ -76,7 +76,41 @@ static int ocfs2_get_inode_attr(struct i return status; } @@ -5919,9 +5919,9 @@ diff -NurpP --minimal linux-3.4.57/fs/ocfs2/ioctl.c linux-3.4.57-vs2.3.3.9/fs/oc 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.4.57/fs/ocfs2/namei.c linux-3.4.57-vs2.3.3.9/fs/ocfs2/namei.c ---- linux-3.4.57/fs/ocfs2/namei.c 2012-03-19 18:47:26.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/ocfs2/namei.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/ocfs2/namei.c linux-3.4.83-vs2.3.3.9/fs/ocfs2/namei.c +--- linux-3.4.83/fs/ocfs2/namei.c 2012-03-19 18:47:26.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/ocfs2/namei.c 2012-05-21 16:15:05.000000000 +0000 @@ -41,6 +41,7 @@ #include #include @@ -5952,9 +5952,9 @@ diff -NurpP --minimal linux-3.4.57/fs/ocfs2/namei.c linux-3.4.57-vs2.3.3.9/fs/oc 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.4.57/fs/ocfs2/ocfs2.h linux-3.4.57-vs2.3.3.9/fs/ocfs2/ocfs2.h ---- linux-3.4.57/fs/ocfs2/ocfs2.h 2012-01-09 15:14:55.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/ocfs2/ocfs2.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/ocfs2/ocfs2.h linux-3.4.83-vs2.3.3.9/fs/ocfs2/ocfs2.h +--- linux-3.4.83/fs/ocfs2/ocfs2.h 2012-01-09 15:14:55.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/ocfs2/ocfs2.h 2012-05-21 16:15:05.000000000 +0000 @@ -272,6 +272,7 @@ enum ocfs2_mount_options writes */ OCFS2_MOUNT_HB_NONE = 1 << 13, /* No heartbeat */ @@ -5963,9 +5963,9 @@ diff -NurpP --minimal linux-3.4.57/fs/ocfs2/ocfs2.h linux-3.4.57-vs2.3.3.9/fs/oc }; #define OCFS2_OSB_SOFT_RO 0x0001 -diff -NurpP --minimal linux-3.4.57/fs/ocfs2/ocfs2_fs.h linux-3.4.57-vs2.3.3.9/fs/ocfs2/ocfs2_fs.h ---- linux-3.4.57/fs/ocfs2/ocfs2_fs.h 2011-05-22 14:17:53.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/ocfs2/ocfs2_fs.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/ocfs2/ocfs2_fs.h linux-3.4.83-vs2.3.3.9/fs/ocfs2/ocfs2_fs.h +--- linux-3.4.83/fs/ocfs2/ocfs2_fs.h 2011-05-22 14:17:53.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/ocfs2/ocfs2_fs.h 2012-05-21 16:15:05.000000000 +0000 @@ -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 */ @@ -5978,9 +5978,9 @@ diff -NurpP --minimal linux-3.4.57/fs/ocfs2/ocfs2_fs.h linux-3.4.57-vs2.3.3.9/fs #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.4.57/fs/ocfs2/super.c linux-3.4.57-vs2.3.3.9/fs/ocfs2/super.c ---- linux-3.4.57/fs/ocfs2/super.c 2012-05-21 16:07:26.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/ocfs2/super.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/ocfs2/super.c linux-3.4.83-vs2.3.3.9/fs/ocfs2/super.c +--- linux-3.4.83/fs/ocfs2/super.c 2012-05-21 16:07:26.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/ocfs2/super.c 2012-05-21 16:15:05.000000000 +0000 @@ -185,6 +185,7 @@ enum { Opt_coherency_full, Opt_resv_level, @@ -6044,9 +6044,9 @@ diff -NurpP --minimal linux-3.4.57/fs/ocfs2/super.c linux-3.4.57-vs2.3.3.9/fs/oc default: mlog(ML_ERROR, "Unrecognized mount option \"%s\" " -diff -NurpP --minimal linux-3.4.57/fs/open.c linux-3.4.57-vs2.3.3.9/fs/open.c ---- linux-3.4.57/fs/open.c 2013-08-13 14:13:34.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/open.c 2012-09-16 18:49:11.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/open.c linux-3.4.83-vs2.3.3.9/fs/open.c +--- linux-3.4.83/fs/open.c 2014-03-12 09:48:15.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/open.c 2012-09-16 18:49:11.000000000 +0000 @@ -30,6 +30,11 @@ #include #include @@ -6138,9 +6138,9 @@ diff -NurpP --minimal linux-3.4.57/fs/open.c linux-3.4.57-vs2.3.3.9/fs/open.c } void put_unused_fd(unsigned int fd) -diff -NurpP --minimal linux-3.4.57/fs/proc/array.c linux-3.4.57-vs2.3.3.9/fs/proc/array.c ---- linux-3.4.57/fs/proc/array.c 2012-05-21 16:07:26.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/proc/array.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/proc/array.c linux-3.4.83-vs2.3.3.9/fs/proc/array.c +--- linux-3.4.83/fs/proc/array.c 2012-05-21 16:07:26.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/proc/array.c 2012-05-21 16:15:05.000000000 +0000 @@ -81,6 +81,8 @@ #include #include @@ -6254,9 +6254,9 @@ diff -NurpP --minimal linux-3.4.57/fs/proc/array.c linux-3.4.57-vs2.3.3.9/fs/pro 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.4.57/fs/proc/base.c linux-3.4.57-vs2.3.3.9/fs/proc/base.c ---- linux-3.4.57/fs/proc/base.c 2013-08-13 14:13:34.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/proc/base.c 2012-06-28 14:45:07.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/proc/base.c linux-3.4.83-vs2.3.3.9/fs/proc/base.c +--- linux-3.4.83/fs/proc/base.c 2014-03-12 09:48:15.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/proc/base.c 2012-06-28 14:45:07.000000000 +0000 @@ -84,6 +84,8 @@ #include #include @@ -6418,9 +6418,9 @@ diff -NurpP --minimal linux-3.4.57/fs/proc/base.c linux-3.4.57-vs2.3.3.9/fs/proc ns = dentry->d_sb->s_fs_info; rcu_read_lock(); -diff -NurpP --minimal linux-3.4.57/fs/proc/generic.c linux-3.4.57-vs2.3.3.9/fs/proc/generic.c ---- linux-3.4.57/fs/proc/generic.c 2012-03-19 18:47:26.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/proc/generic.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/proc/generic.c linux-3.4.83-vs2.3.3.9/fs/proc/generic.c +--- linux-3.4.83/fs/proc/generic.c 2012-03-19 18:47:26.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/proc/generic.c 2012-05-21 16:15:05.000000000 +0000 @@ -22,6 +22,7 @@ #include #include @@ -6480,10 +6480,10 @@ diff -NurpP --minimal linux-3.4.57/fs/proc/generic.c linux-3.4.57-vs2.3.3.9/fs/p } else { kfree(ent); ent = NULL; -diff -NurpP --minimal linux-3.4.57/fs/proc/inode.c linux-3.4.57-vs2.3.3.9/fs/proc/inode.c ---- linux-3.4.57/fs/proc/inode.c 2012-05-21 16:07:26.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/proc/inode.c 2012-05-21 16:15:05.000000000 +0000 -@@ -458,6 +458,8 @@ struct inode *proc_get_inode(struct supe +diff -NurpP --minimal linux-3.4.83/fs/proc/inode.c linux-3.4.83-vs2.3.3.9/fs/proc/inode.c +--- linux-3.4.83/fs/proc/inode.c 2014-03-12 09:48:15.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/proc/inode.c 2014-03-12 09:55:28.000000000 +0000 +@@ -456,6 +456,8 @@ struct inode *proc_get_inode(struct supe inode->i_uid = de->uid; inode->i_gid = de->gid; } @@ -6492,9 +6492,9 @@ diff -NurpP --minimal linux-3.4.57/fs/proc/inode.c linux-3.4.57-vs2.3.3.9/fs/pro if (de->size) inode->i_size = de->size; if (de->nlink) -diff -NurpP --minimal linux-3.4.57/fs/proc/internal.h linux-3.4.57-vs2.3.3.9/fs/proc/internal.h ---- linux-3.4.57/fs/proc/internal.h 2012-05-21 16:07:26.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/proc/internal.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/proc/internal.h linux-3.4.83-vs2.3.3.9/fs/proc/internal.h +--- linux-3.4.83/fs/proc/internal.h 2012-05-21 16:07:26.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/proc/internal.h 2012-05-21 16:15:05.000000000 +0000 @@ -10,6 +10,8 @@ */ @@ -6532,9 +6532,9 @@ diff -NurpP --minimal linux-3.4.57/fs/proc/internal.h linux-3.4.57-vs2.3.3.9/fs/ static inline int proc_fd(struct inode *inode) { return PROC_I(inode)->fd; -diff -NurpP --minimal linux-3.4.57/fs/proc/loadavg.c linux-3.4.57-vs2.3.3.9/fs/proc/loadavg.c ---- linux-3.4.57/fs/proc/loadavg.c 2009-09-10 13:26:23.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/proc/loadavg.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/proc/loadavg.c linux-3.4.83-vs2.3.3.9/fs/proc/loadavg.c +--- linux-3.4.83/fs/proc/loadavg.c 2009-09-10 13:26:23.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/proc/loadavg.c 2012-05-21 16:15:05.000000000 +0000 @@ -12,15 +12,27 @@ static int loadavg_proc_show(struct seq_file *m, void *v) @@ -6564,9 +6564,9 @@ diff -NurpP --minimal linux-3.4.57/fs/proc/loadavg.c linux-3.4.57-vs2.3.3.9/fs/p task_active_pid_ns(current)->last_pid); return 0; } -diff -NurpP --minimal linux-3.4.57/fs/proc/meminfo.c linux-3.4.57-vs2.3.3.9/fs/proc/meminfo.c ---- linux-3.4.57/fs/proc/meminfo.c 2012-01-09 15:14:55.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/proc/meminfo.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/proc/meminfo.c linux-3.4.83-vs2.3.3.9/fs/proc/meminfo.c +--- linux-3.4.83/fs/proc/meminfo.c 2012-01-09 15:14:55.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/proc/meminfo.c 2012-05-21 16:15:05.000000000 +0000 @@ -39,7 +39,8 @@ static int meminfo_proc_show(struct seq_ allowed = ((totalram_pages - hugetlb_total_pages()) * sysctl_overcommit_ratio / 100) + total_swap_pages; @@ -6577,9 +6577,9 @@ diff -NurpP --minimal linux-3.4.57/fs/proc/meminfo.c linux-3.4.57-vs2.3.3.9/fs/p total_swapcache_pages - i.bufferram; if (cached < 0) cached = 0; -diff -NurpP --minimal linux-3.4.57/fs/proc/root.c linux-3.4.57-vs2.3.3.9/fs/proc/root.c ---- linux-3.4.57/fs/proc/root.c 2012-05-21 16:07:26.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/proc/root.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/proc/root.c linux-3.4.83-vs2.3.3.9/fs/proc/root.c +--- linux-3.4.83/fs/proc/root.c 2012-05-21 16:07:26.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/proc/root.c 2012-05-21 16:15:05.000000000 +0000 @@ -19,9 +19,14 @@ #include #include @@ -6611,9 +6611,9 @@ diff -NurpP --minimal linux-3.4.57/fs/proc/root.c linux-3.4.57-vs2.3.3.9/fs/proc .name = "/proc", }; -diff -NurpP --minimal linux-3.4.57/fs/proc/stat.c linux-3.4.57-vs2.3.3.9/fs/proc/stat.c ---- linux-3.4.57/fs/proc/stat.c 2013-08-13 14:13:34.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/proc/stat.c 2012-11-06 17:02:35.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/proc/stat.c linux-3.4.83-vs2.3.3.9/fs/proc/stat.c +--- linux-3.4.83/fs/proc/stat.c 2014-03-12 09:48:16.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/proc/stat.c 2012-11-06 17:02:35.000000000 +0000 @@ -9,6 +9,7 @@ #include #include @@ -6633,9 +6633,9 @@ diff -NurpP --minimal linux-3.4.57/fs/proc/stat.c linux-3.4.57-vs2.3.3.9/fs/proc jif = boottime.tv_sec; for_each_possible_cpu(i) { -diff -NurpP --minimal linux-3.4.57/fs/proc/uptime.c linux-3.4.57-vs2.3.3.9/fs/proc/uptime.c ---- linux-3.4.57/fs/proc/uptime.c 2012-03-19 18:47:26.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/proc/uptime.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/proc/uptime.c linux-3.4.83-vs2.3.3.9/fs/proc/uptime.c +--- linux-3.4.83/fs/proc/uptime.c 2012-03-19 18:47:26.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/proc/uptime.c 2012-05-21 16:15:05.000000000 +0000 @@ -5,6 +5,7 @@ #include #include @@ -6655,9 +6655,9 @@ diff -NurpP --minimal linux-3.4.57/fs/proc/uptime.c linux-3.4.57-vs2.3.3.9/fs/pr 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.4.57/fs/proc_namespace.c linux-3.4.57-vs2.3.3.9/fs/proc_namespace.c ---- linux-3.4.57/fs/proc_namespace.c 2012-03-19 18:47:26.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/proc_namespace.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/proc_namespace.c linux-3.4.83-vs2.3.3.9/fs/proc_namespace.c +--- linux-3.4.83/fs/proc_namespace.c 2012-03-19 18:47:26.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/proc_namespace.c 2012-05-21 16:15:05.000000000 +0000 @@ -44,6 +44,8 @@ static int show_sb_opts(struct seq_file { MS_SYNCHRONOUS, ",sync" }, { MS_DIRSYNC, ",dirsync" }, @@ -6767,10 +6767,10 @@ diff -NurpP --minimal linux-3.4.57/fs/proc_namespace.c linux-3.4.57-vs2.3.3.9/fs /* file system type */ seq_puts(m, "with fstype "); show_type(m, sb); -diff -NurpP --minimal linux-3.4.57/fs/quota/dquot.c linux-3.4.57-vs2.3.3.9/fs/quota/dquot.c ---- linux-3.4.57/fs/quota/dquot.c 2012-05-21 16:07:26.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/quota/dquot.c 2012-05-21 16:15:05.000000000 +0000 -@@ -1563,6 +1563,9 @@ int __dquot_alloc_space(struct inode *in +diff -NurpP --minimal linux-3.4.83/fs/quota/dquot.c linux-3.4.83-vs2.3.3.9/fs/quota/dquot.c +--- linux-3.4.83/fs/quota/dquot.c 2014-03-12 09:48:16.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/quota/dquot.c 2014-03-12 09:55:28.000000000 +0000 +@@ -1571,6 +1571,9 @@ int __dquot_alloc_space(struct inode *in struct dquot **dquots = inode->i_dquot; int reserve = flags & DQUOT_SPACE_RESERVE; @@ -6780,7 +6780,7 @@ diff -NurpP --minimal linux-3.4.57/fs/quota/dquot.c linux-3.4.57-vs2.3.3.9/fs/qu /* * First test before acquiring mutex - solves deadlocks when we * re-enter the quota code and are already holding the mutex -@@ -1618,6 +1621,9 @@ int dquot_alloc_inode(const struct inode +@@ -1626,6 +1629,9 @@ int dquot_alloc_inode(const struct inode struct dquot_warn warn[MAXQUOTAS]; struct dquot * const *dquots = inode->i_dquot; @@ -6790,7 +6790,7 @@ diff -NurpP --minimal linux-3.4.57/fs/quota/dquot.c linux-3.4.57-vs2.3.3.9/fs/qu /* First test before acquiring mutex - solves deadlocks when we * re-enter the quota code and are already holding the mutex */ if (!dquot_active(inode)) -@@ -1689,6 +1695,8 @@ void __dquot_free_space(struct inode *in +@@ -1697,6 +1703,8 @@ void __dquot_free_space(struct inode *in struct dquot **dquots = inode->i_dquot; int reserve = flags & DQUOT_SPACE_RESERVE; @@ -6799,7 +6799,7 @@ diff -NurpP --minimal linux-3.4.57/fs/quota/dquot.c linux-3.4.57-vs2.3.3.9/fs/qu /* First test before acquiring mutex - solves deadlocks when we * re-enter the quota code and are already holding the mutex */ if (!dquot_active(inode)) { -@@ -1733,6 +1741,8 @@ void dquot_free_inode(const struct inode +@@ -1741,6 +1749,8 @@ void dquot_free_inode(const struct inode struct dquot_warn warn[MAXQUOTAS]; struct dquot * const *dquots = inode->i_dquot; @@ -6808,9 +6808,9 @@ diff -NurpP --minimal linux-3.4.57/fs/quota/dquot.c linux-3.4.57-vs2.3.3.9/fs/qu /* 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.4.57/fs/quota/quota.c linux-3.4.57-vs2.3.3.9/fs/quota/quota.c ---- linux-3.4.57/fs/quota/quota.c 2012-05-21 16:07:26.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/quota/quota.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/quota/quota.c linux-3.4.83-vs2.3.3.9/fs/quota/quota.c +--- linux-3.4.83/fs/quota/quota.c 2012-05-21 16:07:26.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/quota/quota.c 2012-05-21 16:15:05.000000000 +0000 @@ -8,6 +8,7 @@ #include #include @@ -6898,9 +6898,9 @@ diff -NurpP --minimal linux-3.4.57/fs/quota/quota.c linux-3.4.57-vs2.3.3.9/fs/qu if (quotactl_cmd_write(cmd)) sb = get_super_thawed(bdev); else -diff -NurpP --minimal linux-3.4.57/fs/reiserfs/file.c linux-3.4.57-vs2.3.3.9/fs/reiserfs/file.c ---- linux-3.4.57/fs/reiserfs/file.c 2012-05-21 16:07:26.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/reiserfs/file.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/reiserfs/file.c linux-3.4.83-vs2.3.3.9/fs/reiserfs/file.c +--- linux-3.4.83/fs/reiserfs/file.c 2012-05-21 16:07:26.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/reiserfs/file.c 2012-05-21 16:15:05.000000000 +0000 @@ -319,5 +319,6 @@ const struct inode_operations reiserfs_f .listxattr = reiserfs_listxattr, .removexattr = reiserfs_removexattr, @@ -6908,9 +6908,9 @@ diff -NurpP --minimal linux-3.4.57/fs/reiserfs/file.c linux-3.4.57-vs2.3.3.9/fs/ + .sync_flags = reiserfs_sync_flags, .get_acl = reiserfs_get_acl, }; -diff -NurpP --minimal linux-3.4.57/fs/reiserfs/inode.c linux-3.4.57-vs2.3.3.9/fs/reiserfs/inode.c ---- linux-3.4.57/fs/reiserfs/inode.c 2013-08-13 14:13:34.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/reiserfs/inode.c 2012-12-08 00:53:53.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/reiserfs/inode.c linux-3.4.83-vs2.3.3.9/fs/reiserfs/inode.c +--- linux-3.4.83/fs/reiserfs/inode.c 2014-03-12 09:48:16.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/reiserfs/inode.c 2012-12-08 00:53:53.000000000 +0000 @@ -18,6 +18,7 @@ #include #include @@ -7076,9 +7076,9 @@ diff -NurpP --minimal linux-3.4.57/fs/reiserfs/inode.c linux-3.4.57-vs2.3.3.9/fs mark_inode_dirty(inode); error = journal_end(&th, inode->i_sb, jbegin_count); if (error) -diff -NurpP --minimal linux-3.4.57/fs/reiserfs/ioctl.c linux-3.4.57-vs2.3.3.9/fs/reiserfs/ioctl.c ---- linux-3.4.57/fs/reiserfs/ioctl.c 2012-05-21 16:07:27.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/reiserfs/ioctl.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/reiserfs/ioctl.c linux-3.4.83-vs2.3.3.9/fs/reiserfs/ioctl.c +--- linux-3.4.83/fs/reiserfs/ioctl.c 2012-05-21 16:07:27.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/reiserfs/ioctl.c 2012-05-21 16:15:05.000000000 +0000 @@ -11,6 +11,21 @@ #include #include @@ -7140,9 +7140,9 @@ diff -NurpP --minimal linux-3.4.57/fs/reiserfs/ioctl.c linux-3.4.57-vs2.3.3.9/fs sd_attrs_to_i_attrs(flags, inode); REISERFS_I(inode)->i_attrs = flags; inode->i_ctime = CURRENT_TIME_SEC; -diff -NurpP --minimal linux-3.4.57/fs/reiserfs/namei.c linux-3.4.57-vs2.3.3.9/fs/reiserfs/namei.c ---- linux-3.4.57/fs/reiserfs/namei.c 2012-05-21 16:07:27.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/reiserfs/namei.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/reiserfs/namei.c linux-3.4.83-vs2.3.3.9/fs/reiserfs/namei.c +--- linux-3.4.83/fs/reiserfs/namei.c 2012-05-21 16:07:27.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/reiserfs/namei.c 2012-05-21 16:15:05.000000000 +0000 @@ -18,6 +18,7 @@ #include "acl.h" #include "xattr.h" @@ -7159,9 +7159,9 @@ diff -NurpP --minimal linux-3.4.57/fs/reiserfs/namei.c linux-3.4.57-vs2.3.3.9/fs return d_splice_alias(inode, dentry); } -diff -NurpP --minimal linux-3.4.57/fs/reiserfs/reiserfs.h linux-3.4.57-vs2.3.3.9/fs/reiserfs/reiserfs.h ---- linux-3.4.57/fs/reiserfs/reiserfs.h 2012-05-21 16:07:27.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/reiserfs/reiserfs.h 2012-05-21 17:19:33.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/reiserfs/reiserfs.h linux-3.4.83-vs2.3.3.9/fs/reiserfs/reiserfs.h +--- linux-3.4.83/fs/reiserfs/reiserfs.h 2012-05-21 16:07:27.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/reiserfs/reiserfs.h 2012-05-21 17:19:33.000000000 +0000 @@ -544,6 +544,7 @@ enum reiserfs_mount_options { REISERFS_EXPOSE_PRIVROOT, REISERFS_BARRIER_NONE, @@ -7200,9 +7200,9 @@ diff -NurpP --minimal linux-3.4.57/fs/reiserfs/reiserfs.h linux-3.4.57-vs2.3.3.9 int __reiserfs_write_begin(struct page *page, unsigned from, unsigned len); -diff -NurpP --minimal linux-3.4.57/fs/reiserfs/super.c linux-3.4.57-vs2.3.3.9/fs/reiserfs/super.c ---- linux-3.4.57/fs/reiserfs/super.c 2013-08-13 14:13:34.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/reiserfs/super.c 2012-12-08 00:53:53.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/reiserfs/super.c linux-3.4.83-vs2.3.3.9/fs/reiserfs/super.c +--- linux-3.4.83/fs/reiserfs/super.c 2014-03-12 09:48:17.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/reiserfs/super.c 2012-12-08 00:53:53.000000000 +0000 @@ -982,6 +982,14 @@ static int reiserfs_parse_options(struct {"user_xattr",.setmask = 1 << REISERFS_UNSUPPORTED_OPT}, {"nouser_xattr",.clrmask = 1 << REISERFS_UNSUPPORTED_OPT}, @@ -7244,9 +7244,9 @@ diff -NurpP --minimal linux-3.4.57/fs/reiserfs/super.c linux-3.4.57-vs2.3.3.9/fs 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.4.57/fs/reiserfs/xattr.c linux-3.4.57-vs2.3.3.9/fs/reiserfs/xattr.c ---- linux-3.4.57/fs/reiserfs/xattr.c 2013-08-13 14:13:34.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/reiserfs/xattr.c 2013-07-14 13:38:35.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/reiserfs/xattr.c linux-3.4.83-vs2.3.3.9/fs/reiserfs/xattr.c +--- linux-3.4.83/fs/reiserfs/xattr.c 2014-03-12 09:48:17.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/reiserfs/xattr.c 2013-07-14 13:38:35.000000000 +0000 @@ -40,6 +40,7 @@ #include #include @@ -7255,9 +7255,9 @@ diff -NurpP --minimal linux-3.4.57/fs/reiserfs/xattr.c linux-3.4.57-vs2.3.3.9/fs #include #include #include -diff -NurpP --minimal linux-3.4.57/fs/stat.c linux-3.4.57-vs2.3.3.9/fs/stat.c ---- linux-3.4.57/fs/stat.c 2013-08-13 14:13:34.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/stat.c 2012-10-22 13:09:53.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/stat.c linux-3.4.83-vs2.3.3.9/fs/stat.c +--- linux-3.4.83/fs/stat.c 2014-03-12 09:48:18.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/stat.c 2012-10-22 13:09:53.000000000 +0000 @@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod stat->nlink = inode->i_nlink; stat->uid = inode->i_uid; @@ -7266,9 +7266,9 @@ diff -NurpP --minimal linux-3.4.57/fs/stat.c linux-3.4.57-vs2.3.3.9/fs/stat.c stat->rdev = inode->i_rdev; stat->size = i_size_read(inode); stat->atime = inode->i_atime; -diff -NurpP --minimal linux-3.4.57/fs/statfs.c linux-3.4.57-vs2.3.3.9/fs/statfs.c ---- linux-3.4.57/fs/statfs.c 2012-05-21 16:07:27.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/statfs.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/statfs.c linux-3.4.83-vs2.3.3.9/fs/statfs.c +--- linux-3.4.83/fs/statfs.c 2014-03-12 09:48:18.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/statfs.c 2013-10-26 18:10:23.000000000 +0000 @@ -7,6 +7,8 @@ #include #include @@ -7287,9 +7287,9 @@ diff -NurpP --minimal linux-3.4.57/fs/statfs.c linux-3.4.57-vs2.3.3.9/fs/statfs. return retval; } -diff -NurpP --minimal linux-3.4.57/fs/super.c linux-3.4.57-vs2.3.3.9/fs/super.c ---- linux-3.4.57/fs/super.c 2013-08-13 14:13:34.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/super.c 2013-08-13 17:07:36.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/super.c linux-3.4.83-vs2.3.3.9/fs/super.c +--- linux-3.4.83/fs/super.c 2014-03-12 09:48:18.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/super.c 2013-08-13 17:07:36.000000000 +0000 @@ -33,6 +33,8 @@ #include #include @@ -7313,9 +7313,9 @@ diff -NurpP --minimal linux-3.4.57/fs/super.c linux-3.4.57-vs2.3.3.9/fs/super.c error = security_sb_kern_mount(sb, flags, secdata); if (error) goto out_sb; -diff -NurpP --minimal linux-3.4.57/fs/sysfs/mount.c linux-3.4.57-vs2.3.3.9/fs/sysfs/mount.c ---- linux-3.4.57/fs/sysfs/mount.c 2012-05-21 16:07:27.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/sysfs/mount.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/sysfs/mount.c linux-3.4.83-vs2.3.3.9/fs/sysfs/mount.c +--- linux-3.4.83/fs/sysfs/mount.c 2012-05-21 16:07:27.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/sysfs/mount.c 2012-05-21 16:15:05.000000000 +0000 @@ -47,7 +47,7 @@ static int sysfs_fill_super(struct super sb->s_blocksize = PAGE_CACHE_SIZE; @@ -7325,9 +7325,9 @@ diff -NurpP --minimal linux-3.4.57/fs/sysfs/mount.c linux-3.4.57-vs2.3.3.9/fs/sy sb->s_op = &sysfs_ops; sb->s_time_gran = 1; -diff -NurpP --minimal linux-3.4.57/fs/utimes.c linux-3.4.57-vs2.3.3.9/fs/utimes.c ---- linux-3.4.57/fs/utimes.c 2011-05-22 14:17:54.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/utimes.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/utimes.c linux-3.4.83-vs2.3.3.9/fs/utimes.c +--- linux-3.4.83/fs/utimes.c 2011-05-22 14:17:54.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/utimes.c 2012-05-21 16:15:05.000000000 +0000 @@ -8,6 +8,8 @@ #include #include @@ -7357,9 +7357,9 @@ diff -NurpP --minimal linux-3.4.57/fs/utimes.c linux-3.4.57-vs2.3.3.9/fs/utimes. if (times && times[0].tv_nsec == UTIME_NOW && times[1].tv_nsec == UTIME_NOW) times = NULL; -diff -NurpP --minimal linux-3.4.57/fs/xattr.c linux-3.4.57-vs2.3.3.9/fs/xattr.c ---- linux-3.4.57/fs/xattr.c 2012-05-21 16:07:27.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/xattr.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/xattr.c linux-3.4.83-vs2.3.3.9/fs/xattr.c +--- linux-3.4.83/fs/xattr.c 2012-05-21 16:07:27.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/xattr.c 2012-05-21 16:15:05.000000000 +0000 @@ -20,6 +20,7 @@ #include #include @@ -7377,9 +7377,9 @@ diff -NurpP --minimal linux-3.4.57/fs/xattr.c linux-3.4.57-vs2.3.3.9/fs/xattr.c return (mask & MAY_WRITE) ? -EPERM : -ENODATA; return 0; } -diff -NurpP --minimal linux-3.4.57/fs/xfs/xfs_dinode.h linux-3.4.57-vs2.3.3.9/fs/xfs/xfs_dinode.h ---- linux-3.4.57/fs/xfs/xfs_dinode.h 2011-10-24 16:45:31.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/xfs/xfs_dinode.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/xfs/xfs_dinode.h linux-3.4.83-vs2.3.3.9/fs/xfs/xfs_dinode.h +--- linux-3.4.83/fs/xfs/xfs_dinode.h 2011-10-24 16:45:31.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/xfs/xfs_dinode.h 2012-05-21 16:15:05.000000000 +0000 @@ -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 */ @@ -7420,9 +7420,9 @@ diff -NurpP --minimal linux-3.4.57/fs/xfs/xfs_dinode.h linux-3.4.57-vs2.3.3.9/fs +#define XFS_DIVFLAG_COW 0x02 #endif /* __XFS_DINODE_H__ */ -diff -NurpP --minimal linux-3.4.57/fs/xfs/xfs_fs.h linux-3.4.57-vs2.3.3.9/fs/xfs/xfs_fs.h ---- linux-3.4.57/fs/xfs/xfs_fs.h 2011-10-24 16:45:31.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/xfs/xfs_fs.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/xfs/xfs_fs.h linux-3.4.83-vs2.3.3.9/fs/xfs/xfs_fs.h +--- linux-3.4.83/fs/xfs/xfs_fs.h 2011-10-24 16:45:31.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/xfs/xfs_fs.h 2012-05-21 16:15:05.000000000 +0000 @@ -67,6 +67,9 @@ struct fsxattr { #define XFS_XFLAG_EXTSZINHERIT 0x00001000 /* inherit inode extent size */ #define XFS_XFLAG_NODEFRAG 0x00002000 /* do not defragment */ @@ -7443,9 +7443,9 @@ diff -NurpP --minimal linux-3.4.57/fs/xfs/xfs_fs.h linux-3.4.57-vs2.3.3.9/fs/xfs __u32 bs_dmevmask; /* DMIG event mask */ __u16 bs_dmstate; /* DMIG state info */ __u16 bs_aextents; /* attribute number of extents */ -diff -NurpP --minimal linux-3.4.57/fs/xfs/xfs_ialloc.c linux-3.4.57-vs2.3.3.9/fs/xfs/xfs_ialloc.c ---- linux-3.4.57/fs/xfs/xfs_ialloc.c 2012-03-19 18:47:27.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/xfs/xfs_ialloc.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/xfs/xfs_ialloc.c linux-3.4.83-vs2.3.3.9/fs/xfs/xfs_ialloc.c +--- linux-3.4.83/fs/xfs/xfs_ialloc.c 2012-03-19 18:47:27.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/xfs/xfs_ialloc.c 2012-05-21 16:15:05.000000000 +0000 @@ -37,7 +37,6 @@ #include "xfs_error.h" #include "xfs_bmap.h" @@ -7454,9 +7454,9 @@ diff -NurpP --minimal linux-3.4.57/fs/xfs/xfs_ialloc.c linux-3.4.57-vs2.3.3.9/fs /* * Allocation group level functions. */ -diff -NurpP --minimal linux-3.4.57/fs/xfs/xfs_inode.c linux-3.4.57-vs2.3.3.9/fs/xfs/xfs_inode.c ---- linux-3.4.57/fs/xfs/xfs_inode.c 2012-05-21 16:07:27.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/xfs/xfs_inode.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/xfs/xfs_inode.c linux-3.4.83-vs2.3.3.9/fs/xfs/xfs_inode.c +--- linux-3.4.83/fs/xfs/xfs_inode.c 2012-05-21 16:07:27.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/xfs/xfs_inode.c 2012-05-21 16:15:05.000000000 +0000 @@ -236,6 +236,7 @@ xfs_inotobp( return 0; } @@ -7631,9 +7631,9 @@ diff -NurpP --minimal linux-3.4.57/fs/xfs/xfs_inode.c linux-3.4.57-vs2.3.3.9/fs/ /* 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.4.57/fs/xfs/xfs_inode.h linux-3.4.57-vs2.3.3.9/fs/xfs/xfs_inode.h ---- linux-3.4.57/fs/xfs/xfs_inode.h 2012-05-21 16:07:27.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/xfs/xfs_inode.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/xfs/xfs_inode.h linux-3.4.83-vs2.3.3.9/fs/xfs/xfs_inode.h +--- linux-3.4.83/fs/xfs/xfs_inode.h 2012-05-21 16:07:27.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/xfs/xfs_inode.h 2012-05-21 16:15:05.000000000 +0000 @@ -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 */ @@ -7654,9 +7654,9 @@ diff -NurpP --minimal linux-3.4.57/fs/xfs/xfs_inode.h linux-3.4.57-vs2.3.3.9/fs/ 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.4.57/fs/xfs/xfs_ioctl.c linux-3.4.57-vs2.3.3.9/fs/xfs/xfs_ioctl.c ---- linux-3.4.57/fs/xfs/xfs_ioctl.c 2012-05-21 16:07:27.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/xfs/xfs_ioctl.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/xfs/xfs_ioctl.c linux-3.4.83-vs2.3.3.9/fs/xfs/xfs_ioctl.c +--- linux-3.4.83/fs/xfs/xfs_ioctl.c 2014-03-12 09:48:18.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/xfs/xfs_ioctl.c 2014-03-12 09:55:28.000000000 +0000 @@ -28,7 +28,7 @@ #include "xfs_bmap_btree.h" #include "xfs_dinode.h" @@ -7666,7 +7666,7 @@ diff -NurpP --minimal linux-3.4.57/fs/xfs/xfs_ioctl.c linux-3.4.57-vs2.3.3.9/fs/ #include "xfs_rtalloc.h" #include "xfs_itable.h" #include "xfs_error.h" -@@ -750,6 +750,10 @@ xfs_merge_ioc_xflags( +@@ -751,6 +751,10 @@ xfs_merge_ioc_xflags( xflags |= XFS_XFLAG_IMMUTABLE; else xflags &= ~XFS_XFLAG_IMMUTABLE; @@ -7677,7 +7677,7 @@ diff -NurpP --minimal linux-3.4.57/fs/xfs/xfs_ioctl.c linux-3.4.57-vs2.3.3.9/fs/ if (flags & FS_APPEND_FL) xflags |= XFS_XFLAG_APPEND; else -@@ -778,6 +782,8 @@ xfs_di2lxflags( +@@ -779,6 +783,8 @@ xfs_di2lxflags( if (di_flags & XFS_DIFLAG_IMMUTABLE) flags |= FS_IMMUTABLE_FL; @@ -7686,7 +7686,7 @@ diff -NurpP --minimal linux-3.4.57/fs/xfs/xfs_ioctl.c linux-3.4.57-vs2.3.3.9/fs/ if (di_flags & XFS_DIFLAG_APPEND) flags |= FS_APPEND_FL; if (di_flags & XFS_DIFLAG_SYNC) -@@ -838,6 +844,8 @@ xfs_set_diflags( +@@ -839,6 +845,8 @@ xfs_set_diflags( di_flags = (ip->i_d.di_flags & XFS_DIFLAG_PREALLOC); if (xflags & XFS_XFLAG_IMMUTABLE) di_flags |= XFS_DIFLAG_IMMUTABLE; @@ -7695,7 +7695,7 @@ diff -NurpP --minimal linux-3.4.57/fs/xfs/xfs_ioctl.c linux-3.4.57-vs2.3.3.9/fs/ if (xflags & XFS_XFLAG_APPEND) di_flags |= XFS_DIFLAG_APPEND; if (xflags & XFS_XFLAG_SYNC) -@@ -880,6 +888,10 @@ xfs_diflags_to_linux( +@@ -881,6 +889,10 @@ xfs_diflags_to_linux( inode->i_flags |= S_IMMUTABLE; else inode->i_flags &= ~S_IMMUTABLE; @@ -7706,7 +7706,7 @@ diff -NurpP --minimal linux-3.4.57/fs/xfs/xfs_ioctl.c linux-3.4.57-vs2.3.3.9/fs/ if (xflags & XFS_XFLAG_APPEND) inode->i_flags |= S_APPEND; else -@@ -1372,10 +1384,18 @@ xfs_file_ioctl( +@@ -1373,10 +1385,18 @@ xfs_file_ioctl( case XFS_IOC_FSGETXATTRA: return xfs_ioc_fsgetxattr(ip, 1, arg); case XFS_IOC_FSSETXATTR: @@ -7725,9 +7725,9 @@ diff -NurpP --minimal linux-3.4.57/fs/xfs/xfs_ioctl.c linux-3.4.57-vs2.3.3.9/fs/ return xfs_ioc_setxflags(ip, filp, arg); case XFS_IOC_FSSETDM: { -diff -NurpP --minimal linux-3.4.57/fs/xfs/xfs_ioctl.h linux-3.4.57-vs2.3.3.9/fs/xfs/xfs_ioctl.h ---- linux-3.4.57/fs/xfs/xfs_ioctl.h 2011-10-24 16:45:31.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/xfs/xfs_ioctl.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/xfs/xfs_ioctl.h linux-3.4.83-vs2.3.3.9/fs/xfs/xfs_ioctl.h +--- linux-3.4.83/fs/xfs/xfs_ioctl.h 2011-10-24 16:45:31.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/xfs/xfs_ioctl.h 2012-05-21 16:15:05.000000000 +0000 @@ -70,6 +70,12 @@ xfs_handle_to_dentry( void __user *uhandle, u32 hlen); @@ -7741,9 +7741,9 @@ diff -NurpP --minimal linux-3.4.57/fs/xfs/xfs_ioctl.h linux-3.4.57-vs2.3.3.9/fs/ extern long xfs_file_ioctl( struct file *filp, -diff -NurpP --minimal linux-3.4.57/fs/xfs/xfs_iops.c linux-3.4.57-vs2.3.3.9/fs/xfs/xfs_iops.c ---- linux-3.4.57/fs/xfs/xfs_iops.c 2013-08-13 14:13:35.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/xfs/xfs_iops.c 2013-07-14 13:38:35.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/xfs/xfs_iops.c linux-3.4.83-vs2.3.3.9/fs/xfs/xfs_iops.c +--- linux-3.4.83/fs/xfs/xfs_iops.c 2014-03-12 09:48:18.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/xfs/xfs_iops.c 2013-07-14 13:38:35.000000000 +0000 @@ -30,6 +30,7 @@ #include "xfs_bmap_btree.h" #include "xfs_dinode.h" @@ -7819,9 +7819,9 @@ diff -NurpP --minimal linux-3.4.57/fs/xfs/xfs_iops.c linux-3.4.57-vs2.3.3.9/fs/x switch (inode->i_mode & S_IFMT) { case S_IFBLK: -diff -NurpP --minimal linux-3.4.57/fs/xfs/xfs_itable.c linux-3.4.57-vs2.3.3.9/fs/xfs/xfs_itable.c ---- linux-3.4.57/fs/xfs/xfs_itable.c 2012-05-21 16:07:27.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/xfs/xfs_itable.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/xfs/xfs_itable.c linux-3.4.83-vs2.3.3.9/fs/xfs/xfs_itable.c +--- linux-3.4.83/fs/xfs/xfs_itable.c 2012-05-21 16:07:27.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/xfs/xfs_itable.c 2012-05-21 16:15:05.000000000 +0000 @@ -97,6 +97,7 @@ xfs_bulkstat_one_int( buf->bs_mode = dic->di_mode; buf->bs_uid = dic->di_uid; @@ -7830,9 +7830,9 @@ diff -NurpP --minimal linux-3.4.57/fs/xfs/xfs_itable.c linux-3.4.57-vs2.3.3.9/fs 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.4.57/fs/xfs/xfs_linux.h linux-3.4.57-vs2.3.3.9/fs/xfs/xfs_linux.h ---- linux-3.4.57/fs/xfs/xfs_linux.h 2011-10-24 16:45:31.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/xfs/xfs_linux.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/xfs/xfs_linux.h linux-3.4.83-vs2.3.3.9/fs/xfs/xfs_linux.h +--- linux-3.4.83/fs/xfs/xfs_linux.h 2011-10-24 16:45:31.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/xfs/xfs_linux.h 2012-05-21 16:15:05.000000000 +0000 @@ -121,6 +121,7 @@ #define current_cpu() (raw_smp_processor_id()) @@ -7841,9 +7841,9 @@ diff -NurpP --minimal linux-3.4.57/fs/xfs/xfs_linux.h linux-3.4.57-vs2.3.3.9/fs/ #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.4.57/fs/xfs/xfs_log_recover.c linux-3.4.57-vs2.3.3.9/fs/xfs/xfs_log_recover.c ---- linux-3.4.57/fs/xfs/xfs_log_recover.c 2013-08-13 14:13:35.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/xfs/xfs_log_recover.c 2012-11-18 23:52:29.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/xfs/xfs_log_recover.c linux-3.4.83-vs2.3.3.9/fs/xfs/xfs_log_recover.c +--- linux-3.4.83/fs/xfs/xfs_log_recover.c 2014-03-12 09:48:18.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/xfs/xfs_log_recover.c 2012-11-18 23:52:29.000000000 +0000 @@ -2344,7 +2344,8 @@ xlog_recover_inode_pass2( } @@ -7854,9 +7854,9 @@ diff -NurpP --minimal linux-3.4.57/fs/xfs/xfs_log_recover.c linux-3.4.57-vs2.3.3 /* the rest is in on-disk format */ if (item->ri_buf[1].i_len > sizeof(struct xfs_icdinode)) { -diff -NurpP --minimal linux-3.4.57/fs/xfs/xfs_mount.h linux-3.4.57-vs2.3.3.9/fs/xfs/xfs_mount.h ---- linux-3.4.57/fs/xfs/xfs_mount.h 2012-05-21 16:07:28.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/xfs/xfs_mount.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/xfs/xfs_mount.h linux-3.4.83-vs2.3.3.9/fs/xfs/xfs_mount.h +--- linux-3.4.83/fs/xfs/xfs_mount.h 2012-05-21 16:07:28.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/xfs/xfs_mount.h 2012-05-21 16:15:05.000000000 +0000 @@ -251,6 +251,7 @@ typedef struct xfs_mount { allocator */ #define XFS_MOUNT_NOATTR2 (1ULL << 25) /* disable use of attr2 format */ @@ -7865,9 +7865,9 @@ diff -NurpP --minimal linux-3.4.57/fs/xfs/xfs_mount.h linux-3.4.57-vs2.3.3.9/fs/ /* * Default minimum read and write sizes. -diff -NurpP --minimal linux-3.4.57/fs/xfs/xfs_super.c linux-3.4.57-vs2.3.3.9/fs/xfs/xfs_super.c ---- linux-3.4.57/fs/xfs/xfs_super.c 2012-05-21 16:07:28.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/xfs/xfs_super.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/xfs/xfs_super.c linux-3.4.83-vs2.3.3.9/fs/xfs/xfs_super.c +--- linux-3.4.83/fs/xfs/xfs_super.c 2012-05-21 16:07:28.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/xfs/xfs_super.c 2012-05-21 16:15:05.000000000 +0000 @@ -113,6 +113,9 @@ mempool_t *xfs_ioend_pool; #define MNTOPT_NODELAYLOG "nodelaylog" /* Delayed logging disabled */ #define MNTOPT_DISCARD "discard" /* Discard unused blocks */ @@ -7940,9 +7940,9 @@ diff -NurpP --minimal linux-3.4.57/fs/xfs/xfs_super.c linux-3.4.57-vs2.3.3.9/fs/ /* * 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.4.57/fs/xfs/xfs_vnodeops.c linux-3.4.57-vs2.3.3.9/fs/xfs/xfs_vnodeops.c ---- linux-3.4.57/fs/xfs/xfs_vnodeops.c 2012-05-21 16:07:28.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/fs/xfs/xfs_vnodeops.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/fs/xfs/xfs_vnodeops.c linux-3.4.83-vs2.3.3.9/fs/xfs/xfs_vnodeops.c +--- linux-3.4.83/fs/xfs/xfs_vnodeops.c 2012-05-21 16:07:28.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/fs/xfs/xfs_vnodeops.c 2012-05-21 16:15:05.000000000 +0000 @@ -106,6 +106,77 @@ xfs_readlink_bmap( return error; } @@ -8021,9 +8021,9 @@ diff -NurpP --minimal linux-3.4.57/fs/xfs/xfs_vnodeops.c linux-3.4.57-vs2.3.3.9/ int xfs_readlink( xfs_inode_t *ip, -diff -NurpP --minimal linux-3.4.57/include/linux/Kbuild linux-3.4.57-vs2.3.3.9/include/linux/Kbuild ---- linux-3.4.57/include/linux/Kbuild 2013-08-13 14:13:35.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/Kbuild 2012-07-24 09:52:30.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/Kbuild linux-3.4.83-vs2.3.3.9/include/linux/Kbuild +--- linux-3.4.83/include/linux/Kbuild 2014-03-12 09:48:18.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/Kbuild 2012-07-24 09:52:30.000000000 +0000 @@ -18,6 +18,7 @@ header-y += netfilter_bridge/ header-y += netfilter_ipv4/ header-y += netfilter_ipv6/ @@ -8032,9 +8032,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/Kbuild linux-3.4.57-vs2.3.3.9/i header-y += wimax/ objhdr-y += version.h -diff -NurpP --minimal linux-3.4.57/include/linux/capability.h linux-3.4.57-vs2.3.3.9/include/linux/capability.h ---- linux-3.4.57/include/linux/capability.h 2012-03-19 18:47:27.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/capability.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/capability.h linux-3.4.83-vs2.3.3.9/include/linux/capability.h +--- linux-3.4.83/include/linux/capability.h 2012-03-19 18:47:27.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/capability.h 2012-05-21 16:15:05.000000000 +0000 @@ -280,6 +280,7 @@ struct cpu_vfs_cap_data { arbitrary SCSI commands */ /* Allow setting encryption key on loopback filesystem */ @@ -8057,9 +8057,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/capability.h linux-3.4.57-vs2.3 /* * Bit location of each capability (used by user-space library and kernel) -diff -NurpP --minimal linux-3.4.57/include/linux/cred.h linux-3.4.57-vs2.3.3.9/include/linux/cred.h ---- linux-3.4.57/include/linux/cred.h 2012-03-19 18:47:27.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/cred.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/cred.h linux-3.4.83-vs2.3.3.9/include/linux/cred.h +--- linux-3.4.83/include/linux/cred.h 2012-03-19 18:47:27.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/cred.h 2012-05-21 16:15:05.000000000 +0000 @@ -156,6 +156,7 @@ extern void exit_creds(struct task_struc extern int copy_creds(struct task_struct *, unsigned long); extern const struct cred *get_task_cred(struct task_struct *); @@ -8100,18 +8100,18 @@ diff -NurpP --minimal linux-3.4.57/include/linux/cred.h linux-3.4.57-vs2.3.3.9/i /** * get_new_cred - Get a reference on a new set of credentials * @cred: The new credentials to reference -diff -NurpP --minimal linux-3.4.57/include/linux/devpts_fs.h linux-3.4.57-vs2.3.3.9/include/linux/devpts_fs.h ---- linux-3.4.57/include/linux/devpts_fs.h 2008-12-24 23:26:37.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/devpts_fs.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/devpts_fs.h linux-3.4.83-vs2.3.3.9/include/linux/devpts_fs.h +--- linux-3.4.83/include/linux/devpts_fs.h 2008-12-24 23:26:37.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/devpts_fs.h 2012-05-21 16:15:05.000000000 +0000 @@ -45,5 +45,4 @@ static inline void devpts_pty_kill(struc #endif - #endif /* _LINUX_DEVPTS_FS_H */ -diff -NurpP --minimal linux-3.4.57/include/linux/fs.h linux-3.4.57-vs2.3.3.9/include/linux/fs.h ---- linux-3.4.57/include/linux/fs.h 2012-05-21 16:07:29.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/fs.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/fs.h linux-3.4.83-vs2.3.3.9/include/linux/fs.h +--- linux-3.4.83/include/linux/fs.h 2014-03-12 09:48:19.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/fs.h 2014-03-12 09:55:28.000000000 +0000 @@ -214,6 +214,9 @@ struct inodes_stat_t { #define MS_KERNMOUNT (1<<22) /* this is a kern_mount call */ #define MS_I_VERSION (1<<23) /* Update inode I_version field */ @@ -8234,7 +8234,7 @@ diff -NurpP --minimal linux-3.4.57/include/linux/fs.h linux-3.4.57-vs2.3.3.9/inc struct timespec i_atime; struct timespec i_mtime; struct timespec i_ctime; -@@ -929,12 +964,12 @@ static inline void i_size_write(struct i +@@ -931,12 +966,12 @@ static inline void i_size_write(struct i static inline unsigned iminor(const struct inode *inode) { @@ -8249,7 +8249,7 @@ diff -NurpP --minimal linux-3.4.57/include/linux/fs.h linux-3.4.57-vs2.3.3.9/inc } extern struct block_device *I_BDEV(struct inode *inode); -@@ -1001,6 +1036,7 @@ struct file { +@@ -1003,6 +1038,7 @@ struct file { loff_t f_pos; struct fown_struct f_owner; const struct cred *f_cred; @@ -8257,7 +8257,7 @@ diff -NurpP --minimal linux-3.4.57/include/linux/fs.h linux-3.4.57-vs2.3.3.9/inc struct file_ra_state f_ra; u64 f_version; -@@ -1148,6 +1184,7 @@ struct file_lock { +@@ -1150,6 +1186,7 @@ struct file_lock { struct file *fl_file; loff_t fl_start; loff_t fl_end; @@ -8265,7 +8265,7 @@ diff -NurpP --minimal linux-3.4.57/include/linux/fs.h linux-3.4.57-vs2.3.3.9/inc struct fasync_struct * fl_fasync; /* for lease break notifications */ /* for lease breaks: */ -@@ -1661,6 +1698,7 @@ struct inode_operations { +@@ -1663,6 +1700,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 *); @@ -8273,7 +8273,7 @@ diff -NurpP --minimal linux-3.4.57/include/linux/fs.h linux-3.4.57-vs2.3.3.9/inc void (*truncate_range)(struct inode *, loff_t, loff_t); int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start, u64 len); -@@ -1680,6 +1718,7 @@ extern ssize_t vfs_readv(struct file *, +@@ -1682,6 +1720,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 *); @@ -8281,7 +8281,7 @@ diff -NurpP --minimal linux-3.4.57/include/linux/fs.h linux-3.4.57-vs2.3.3.9/inc struct super_operations { struct inode *(*alloc_inode)(struct super_block *sb); -@@ -2509,6 +2548,7 @@ extern int dcache_dir_open(struct inode +@@ -2511,6 +2550,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); @@ -8289,9 +8289,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/fs.h linux-3.4.57-vs2.3.3.9/inc 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.4.57/include/linux/gfs2_ondisk.h linux-3.4.57-vs2.3.3.9/include/linux/gfs2_ondisk.h ---- linux-3.4.57/include/linux/gfs2_ondisk.h 2012-05-21 16:07:29.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/gfs2_ondisk.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/gfs2_ondisk.h linux-3.4.83-vs2.3.3.9/include/linux/gfs2_ondisk.h +--- linux-3.4.83/include/linux/gfs2_ondisk.h 2012-05-21 16:07:29.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/gfs2_ondisk.h 2012-05-21 16:15:05.000000000 +0000 @@ -214,6 +214,9 @@ enum { gfs2fl_NoAtime = 7, gfs2fl_Sync = 8, @@ -8312,9 +8312,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/gfs2_ondisk.h linux-3.4.57-vs2. #define GFS2_DIF_TRUNC_IN_PROG 0x20000000 /* New in gfs2 */ #define GFS2_DIF_INHERIT_DIRECTIO 0x40000000 #define GFS2_DIF_INHERIT_JDATA 0x80000000 -diff -NurpP --minimal linux-3.4.57/include/linux/if_tun.h linux-3.4.57-vs2.3.3.9/include/linux/if_tun.h ---- linux-3.4.57/include/linux/if_tun.h 2010-08-02 14:52:54.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/if_tun.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/if_tun.h linux-3.4.83-vs2.3.3.9/include/linux/if_tun.h +--- linux-3.4.83/include/linux/if_tun.h 2010-08-02 14:52:54.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/if_tun.h 2012-05-21 16:15:05.000000000 +0000 @@ -53,6 +53,7 @@ #define TUNDETACHFILTER _IOW('T', 214, struct sock_fprog) #define TUNGETVNETHDRSZ _IOR('T', 215, int) @@ -8323,9 +8323,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/if_tun.h linux-3.4.57-vs2.3.3.9 /* TUNSETIFF ifr flags */ #define IFF_TUN 0x0001 -diff -NurpP --minimal linux-3.4.57/include/linux/init_task.h linux-3.4.57-vs2.3.3.9/include/linux/init_task.h ---- linux-3.4.57/include/linux/init_task.h 2013-08-13 14:13:35.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/init_task.h 2012-10-22 13:09:53.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/init_task.h linux-3.4.83-vs2.3.3.9/include/linux/init_task.h +--- linux-3.4.83/include/linux/init_task.h 2014-03-12 09:48:19.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/init_task.h 2012-10-22 13:09:53.000000000 +0000 @@ -210,6 +210,10 @@ extern struct task_group root_task_group INIT_TRACE_RECURSION \ INIT_TASK_RCU_PREEMPT(tsk) \ @@ -8337,9 +8337,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/init_task.h linux-3.4.57-vs2.3. } -diff -NurpP --minimal linux-3.4.57/include/linux/ipc.h linux-3.4.57-vs2.3.3.9/include/linux/ipc.h ---- linux-3.4.57/include/linux/ipc.h 2012-03-19 18:47:28.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/ipc.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/ipc.h linux-3.4.83-vs2.3.3.9/include/linux/ipc.h +--- linux-3.4.83/include/linux/ipc.h 2012-03-19 18:47:28.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/ipc.h 2012-05-21 16:15:05.000000000 +0000 @@ -91,6 +91,7 @@ struct kern_ipc_perm key_t key; uid_t uid; @@ -8348,9 +8348,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/ipc.h linux-3.4.57-vs2.3.3.9/in uid_t cuid; gid_t cgid; umode_t mode; -diff -NurpP --minimal linux-3.4.57/include/linux/ipc_namespace.h linux-3.4.57-vs2.3.3.9/include/linux/ipc_namespace.h ---- linux-3.4.57/include/linux/ipc_namespace.h 2013-08-13 14:13:35.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/ipc_namespace.h 2013-07-14 13:38:35.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/ipc_namespace.h linux-3.4.83-vs2.3.3.9/include/linux/ipc_namespace.h +--- linux-3.4.83/include/linux/ipc_namespace.h 2014-03-12 09:48:19.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/ipc_namespace.h 2013-07-14 13:38:35.000000000 +0000 @@ -101,7 +101,8 @@ static inline int mq_init_ns(struct ipc_ #if defined(CONFIG_IPC_NS) @@ -8377,9 +8377,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/ipc_namespace.h linux-3.4.57-vs } static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns) -diff -NurpP --minimal linux-3.4.57/include/linux/loop.h linux-3.4.57-vs2.3.3.9/include/linux/loop.h ---- linux-3.4.57/include/linux/loop.h 2012-01-09 15:14:58.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/loop.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/loop.h linux-3.4.83-vs2.3.3.9/include/linux/loop.h +--- linux-3.4.83/include/linux/loop.h 2012-01-09 15:14:58.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/loop.h 2012-05-21 16:15:05.000000000 +0000 @@ -45,6 +45,7 @@ struct loop_device { struct loop_func_table *lo_encryption; __u32 lo_init[2]; @@ -8388,9 +8388,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/loop.h linux-3.4.57-vs2.3.3.9/i int (*ioctl)(struct loop_device *, int cmd, unsigned long arg); -diff -NurpP --minimal linux-3.4.57/include/linux/magic.h linux-3.4.57-vs2.3.3.9/include/linux/magic.h ---- linux-3.4.57/include/linux/magic.h 2012-05-21 16:07:31.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/magic.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/magic.h linux-3.4.83-vs2.3.3.9/include/linux/magic.h +--- linux-3.4.83/include/linux/magic.h 2012-05-21 16:07:31.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/magic.h 2012-05-21 16:15:05.000000000 +0000 @@ -3,7 +3,7 @@ #define ADFS_SUPER_MAGIC 0xadf5 @@ -8400,9 +8400,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/magic.h linux-3.4.57-vs2.3.3.9/ #define AUTOFS_SUPER_MAGIC 0x0187 #define CODA_SUPER_MAGIC 0x73757245 #define CRAMFS_MAGIC 0x28cd3d45 /* some random number */ -diff -NurpP --minimal linux-3.4.57/include/linux/major.h linux-3.4.57-vs2.3.3.9/include/linux/major.h ---- linux-3.4.57/include/linux/major.h 2009-09-10 13:26:25.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/major.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/major.h linux-3.4.83-vs2.3.3.9/include/linux/major.h +--- linux-3.4.83/include/linux/major.h 2009-09-10 13:26:25.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/major.h 2012-05-21 16:15:05.000000000 +0000 @@ -15,6 +15,7 @@ #define HD_MAJOR IDE0_MAJOR #define PTY_SLAVE_MAJOR 3 @@ -8411,9 +8411,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/major.h linux-3.4.57-vs2.3.3.9/ #define TTYAUX_MAJOR 5 #define LP_MAJOR 6 #define VCS_MAJOR 7 -diff -NurpP --minimal linux-3.4.57/include/linux/memcontrol.h linux-3.4.57-vs2.3.3.9/include/linux/memcontrol.h ---- linux-3.4.57/include/linux/memcontrol.h 2012-05-21 16:07:31.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/memcontrol.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/memcontrol.h linux-3.4.83-vs2.3.3.9/include/linux/memcontrol.h +--- linux-3.4.83/include/linux/memcontrol.h 2012-05-21 16:07:31.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/memcontrol.h 2012-05-21 16:15:05.000000000 +0000 @@ -88,6 +88,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); @@ -8428,9 +8428,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/memcontrol.h linux-3.4.57-vs2.3 static inline int mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *cgroup) { -diff -NurpP --minimal linux-3.4.57/include/linux/mm_types.h linux-3.4.57-vs2.3.3.9/include/linux/mm_types.h ---- linux-3.4.57/include/linux/mm_types.h 2013-08-13 14:13:35.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/mm_types.h 2012-07-17 22:29:43.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/mm_types.h linux-3.4.83-vs2.3.3.9/include/linux/mm_types.h +--- linux-3.4.83/include/linux/mm_types.h 2014-03-12 09:48:19.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/mm_types.h 2012-07-17 22:29:43.000000000 +0000 @@ -353,6 +353,7 @@ struct mm_struct { /* Architecture-specific MM context */ @@ -8439,9 +8439,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/mm_types.h linux-3.4.57-vs2.3.3 /* Swap token stuff */ /* -diff -NurpP --minimal linux-3.4.57/include/linux/mmzone.h linux-3.4.57-vs2.3.3.9/include/linux/mmzone.h ---- linux-3.4.57/include/linux/mmzone.h 2013-08-13 14:13:35.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/mmzone.h 2012-07-17 22:29:43.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/mmzone.h linux-3.4.83-vs2.3.3.9/include/linux/mmzone.h +--- linux-3.4.83/include/linux/mmzone.h 2014-03-12 09:48:19.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/mmzone.h 2012-07-17 22:29:43.000000000 +0000 @@ -684,6 +684,13 @@ typedef struct pglist_data { __pgdat->node_start_pfn + __pgdat->node_spanned_pages;\ }) @@ -8456,9 +8456,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/mmzone.h linux-3.4.57-vs2.3.3.9 #include extern struct mutex zonelists_mutex; -diff -NurpP --minimal linux-3.4.57/include/linux/mount.h linux-3.4.57-vs2.3.3.9/include/linux/mount.h ---- linux-3.4.57/include/linux/mount.h 2012-03-19 18:47:28.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/mount.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/mount.h linux-3.4.83-vs2.3.3.9/include/linux/mount.h +--- linux-3.4.83/include/linux/mount.h 2012-03-19 18:47:28.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/mount.h 2012-05-21 16:15:05.000000000 +0000 @@ -47,6 +47,9 @@ struct mnt_namespace; #define MNT_INTERNAL 0x4000 @@ -8469,9 +8469,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/mount.h linux-3.4.57-vs2.3.3.9/ struct vfsmount { struct dentry *mnt_root; /* root of the mounted tree */ struct super_block *mnt_sb; /* pointer to superblock */ -diff -NurpP --minimal linux-3.4.57/include/linux/net.h linux-3.4.57-vs2.3.3.9/include/linux/net.h ---- linux-3.4.57/include/linux/net.h 2013-08-13 14:13:35.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/net.h 2012-09-01 08:51:18.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/net.h linux-3.4.83-vs2.3.3.9/include/linux/net.h +--- linux-3.4.83/include/linux/net.h 2014-03-12 09:48:19.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/net.h 2014-03-12 09:55:28.000000000 +0000 @@ -73,6 +73,7 @@ struct net; #define SOCK_PASSCRED 3 #define SOCK_PASSSEC 4 @@ -8480,9 +8480,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/net.h linux-3.4.57-vs2.3.3.9/in #ifndef ARCH_HAS_SOCKET_TYPES /** -diff -NurpP --minimal linux-3.4.57/include/linux/netdevice.h linux-3.4.57-vs2.3.3.9/include/linux/netdevice.h ---- linux-3.4.57/include/linux/netdevice.h 2013-08-13 14:13:35.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/netdevice.h 2013-07-14 13:38:35.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/netdevice.h linux-3.4.83-vs2.3.3.9/include/linux/netdevice.h +--- linux-3.4.83/include/linux/netdevice.h 2014-03-12 09:48:19.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/netdevice.h 2014-03-12 09:55:28.000000000 +0000 @@ -1624,6 +1624,7 @@ extern void netdev_resync_ops(struct ne extern struct net_device *dev_get_by_index(struct net *net, int ifindex); @@ -8491,9 +8491,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/netdevice.h linux-3.4.57-vs2.3. 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.4.57/include/linux/nfs_mount.h linux-3.4.57-vs2.3.3.9/include/linux/nfs_mount.h ---- linux-3.4.57/include/linux/nfs_mount.h 2011-01-05 20:50:31.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/nfs_mount.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/nfs_mount.h linux-3.4.83-vs2.3.3.9/include/linux/nfs_mount.h +--- linux-3.4.83/include/linux/nfs_mount.h 2011-01-05 20:50:31.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/nfs_mount.h 2012-05-21 16:15:05.000000000 +0000 @@ -63,7 +63,8 @@ struct nfs_mount_data { #define NFS_MOUNT_SECFLAVOUR 0x2000 /* 5 */ #define NFS_MOUNT_NORDIRPLUS 0x4000 /* 5 */ @@ -8504,9 +8504,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/nfs_mount.h linux-3.4.57-vs2.3. /* The following are for internal use only */ #define NFS_MOUNT_LOOKUP_CACHE_NONEG 0x10000 -diff -NurpP --minimal linux-3.4.57/include/linux/nsproxy.h linux-3.4.57-vs2.3.3.9/include/linux/nsproxy.h ---- linux-3.4.57/include/linux/nsproxy.h 2011-10-24 16:45:32.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/nsproxy.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/nsproxy.h linux-3.4.83-vs2.3.3.9/include/linux/nsproxy.h +--- linux-3.4.83/include/linux/nsproxy.h 2011-10-24 16:45:32.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/nsproxy.h 2012-05-21 16:15:05.000000000 +0000 @@ -3,6 +3,7 @@ #include @@ -8556,9 +8556,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/nsproxy.h linux-3.4.57-vs2.3.3. } #endif -diff -NurpP --minimal linux-3.4.57/include/linux/pid.h linux-3.4.57-vs2.3.3.9/include/linux/pid.h ---- linux-3.4.57/include/linux/pid.h 2011-07-22 09:18:11.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/pid.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/pid.h linux-3.4.83-vs2.3.3.9/include/linux/pid.h +--- linux-3.4.83/include/linux/pid.h 2011-07-22 09:18:11.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/pid.h 2012-05-21 16:15:05.000000000 +0000 @@ -8,7 +8,8 @@ enum pid_type PIDTYPE_PID, PIDTYPE_PGID, @@ -8577,9 +8577,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/pid.h linux-3.4.57-vs2.3.3.9/in pid_t pid_vnr(struct pid *pid); #define do_each_pid_task(pid, type, task) \ -diff -NurpP --minimal linux-3.4.57/include/linux/proc_fs.h linux-3.4.57-vs2.3.3.9/include/linux/proc_fs.h ---- linux-3.4.57/include/linux/proc_fs.h 2012-03-19 18:47:28.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/proc_fs.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/proc_fs.h linux-3.4.83-vs2.3.3.9/include/linux/proc_fs.h +--- linux-3.4.83/include/linux/proc_fs.h 2012-03-19 18:47:28.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/proc_fs.h 2012-05-21 16:15:05.000000000 +0000 @@ -54,6 +54,7 @@ struct proc_dir_entry { nlink_t nlink; uid_t uid; @@ -8615,9 +8615,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/proc_fs.h linux-3.4.57-vs2.3.3. int fd; union proc_op op; struct proc_dir_entry *pde; -diff -NurpP --minimal linux-3.4.57/include/linux/quotaops.h linux-3.4.57-vs2.3.3.9/include/linux/quotaops.h ---- linux-3.4.57/include/linux/quotaops.h 2012-01-09 15:14:58.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/quotaops.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/quotaops.h linux-3.4.83-vs2.3.3.9/include/linux/quotaops.h +--- linux-3.4.83/include/linux/quotaops.h 2012-01-09 15:14:58.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/quotaops.h 2012-05-21 16:15:05.000000000 +0000 @@ -8,6 +8,7 @@ #define _LINUX_QUOTAOPS_ @@ -8659,9 +8659,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/quotaops.h linux-3.4.57-vs2.3.3 } static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number) -diff -NurpP --minimal linux-3.4.57/include/linux/reboot.h linux-3.4.57-vs2.3.3.9/include/linux/reboot.h ---- linux-3.4.57/include/linux/reboot.h 2011-10-24 16:45:32.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/reboot.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/reboot.h linux-3.4.83-vs2.3.3.9/include/linux/reboot.h +--- linux-3.4.83/include/linux/reboot.h 2011-10-24 16:45:32.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/reboot.h 2012-05-21 16:15:05.000000000 +0000 @@ -33,6 +33,7 @@ #define LINUX_REBOOT_CMD_RESTART2 0xA1B2C3D4 #define LINUX_REBOOT_CMD_SW_SUSPEND 0xD000FCE2 @@ -8670,10 +8670,10 @@ diff -NurpP --minimal linux-3.4.57/include/linux/reboot.h linux-3.4.57-vs2.3.3.9 #ifdef __KERNEL__ -diff -NurpP --minimal linux-3.4.57/include/linux/sched.h linux-3.4.57-vs2.3.3.9/include/linux/sched.h ---- linux-3.4.57/include/linux/sched.h 2013-08-13 14:13:36.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/sched.h 2013-02-11 23:37:30.000000000 +0000 -@@ -1455,6 +1455,14 @@ struct task_struct { +diff -NurpP --minimal linux-3.4.83/include/linux/sched.h linux-3.4.83-vs2.3.3.9/include/linux/sched.h +--- linux-3.4.83/include/linux/sched.h 2014-03-12 09:48:20.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/sched.h 2014-03-12 09:55:28.000000000 +0000 +@@ -1461,6 +1461,14 @@ struct task_struct { #endif seccomp_t seccomp; @@ -8688,7 +8688,7 @@ diff -NurpP --minimal linux-3.4.57/include/linux/sched.h linux-3.4.57-vs2.3.3.9/ /* Thread group tracking */ u32 parent_exec_id; u32 self_exec_id; -@@ -1699,6 +1707,11 @@ struct pid_namespace; +@@ -1705,6 +1713,11 @@ struct pid_namespace; pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type, struct pid_namespace *ns); @@ -8700,7 +8700,7 @@ diff -NurpP --minimal linux-3.4.57/include/linux/sched.h linux-3.4.57-vs2.3.3.9/ static inline pid_t task_pid_nr(struct task_struct *tsk) { return tsk->pid; -@@ -1712,7 +1725,8 @@ static inline pid_t task_pid_nr_ns(struc +@@ -1718,7 +1731,8 @@ static inline pid_t task_pid_nr_ns(struc static inline pid_t task_pid_vnr(struct task_struct *tsk) { @@ -8710,7 +8710,7 @@ diff -NurpP --minimal linux-3.4.57/include/linux/sched.h linux-3.4.57-vs2.3.3.9/ } -@@ -1725,7 +1739,7 @@ pid_t task_tgid_nr_ns(struct task_struct +@@ -1731,7 +1745,7 @@ pid_t task_tgid_nr_ns(struct task_struct static inline pid_t task_tgid_vnr(struct task_struct *tsk) { @@ -8719,9 +8719,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/sched.h linux-3.4.57-vs2.3.3.9/ } -diff -NurpP --minimal linux-3.4.57/include/linux/shmem_fs.h linux-3.4.57-vs2.3.3.9/include/linux/shmem_fs.h ---- linux-3.4.57/include/linux/shmem_fs.h 2012-03-19 18:47:29.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/shmem_fs.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/shmem_fs.h linux-3.4.83-vs2.3.3.9/include/linux/shmem_fs.h +--- linux-3.4.83/include/linux/shmem_fs.h 2012-03-19 18:47:29.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/shmem_fs.h 2012-05-21 16:15:05.000000000 +0000 @@ -8,6 +8,9 @@ /* inode in-kernel data */ @@ -8732,9 +8732,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/shmem_fs.h linux-3.4.57-vs2.3.3 struct shmem_inode_info { spinlock_t lock; unsigned long flags; -diff -NurpP --minimal linux-3.4.57/include/linux/stat.h linux-3.4.57-vs2.3.3.9/include/linux/stat.h ---- linux-3.4.57/include/linux/stat.h 2008-12-24 23:26:37.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/stat.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/stat.h linux-3.4.83-vs2.3.3.9/include/linux/stat.h +--- linux-3.4.83/include/linux/stat.h 2008-12-24 23:26:37.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/stat.h 2012-05-21 16:15:05.000000000 +0000 @@ -66,6 +66,7 @@ struct kstat { unsigned int nlink; uid_t uid; @@ -8743,9 +8743,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/stat.h linux-3.4.57-vs2.3.3.9/i dev_t rdev; loff_t size; struct timespec atime; -diff -NurpP --minimal linux-3.4.57/include/linux/sunrpc/auth.h linux-3.4.57-vs2.3.3.9/include/linux/sunrpc/auth.h ---- linux-3.4.57/include/linux/sunrpc/auth.h 2012-05-21 16:07:32.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/sunrpc/auth.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/sunrpc/auth.h linux-3.4.83-vs2.3.3.9/include/linux/sunrpc/auth.h +--- linux-3.4.83/include/linux/sunrpc/auth.h 2012-05-21 16:07:32.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/sunrpc/auth.h 2012-05-21 16:15:05.000000000 +0000 @@ -25,6 +25,7 @@ struct auth_cred { uid_t uid; @@ -8754,9 +8754,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/sunrpc/auth.h linux-3.4.57-vs2. struct group_info *group_info; const char *principal; unsigned char machine_cred : 1; -diff -NurpP --minimal linux-3.4.57/include/linux/sunrpc/clnt.h linux-3.4.57-vs2.3.3.9/include/linux/sunrpc/clnt.h ---- linux-3.4.57/include/linux/sunrpc/clnt.h 2012-05-21 16:07:32.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/sunrpc/clnt.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/sunrpc/clnt.h linux-3.4.83-vs2.3.3.9/include/linux/sunrpc/clnt.h +--- linux-3.4.83/include/linux/sunrpc/clnt.h 2012-05-21 16:07:32.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/sunrpc/clnt.h 2012-05-21 16:15:05.000000000 +0000 @@ -49,7 +49,8 @@ struct rpc_clnt { unsigned int cl_softrtry : 1,/* soft timeouts */ cl_discrtry : 1,/* disconnect before retry */ @@ -8767,9 +8767,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/sunrpc/clnt.h linux-3.4.57-vs2. struct rpc_rtt * cl_rtt; /* RTO estimator data */ const struct rpc_timeout *cl_timeout; /* Timeout strategy */ -diff -NurpP --minimal linux-3.4.57/include/linux/sysctl.h linux-3.4.57-vs2.3.3.9/include/linux/sysctl.h ---- linux-3.4.57/include/linux/sysctl.h 2012-05-21 16:07:32.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/sysctl.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/sysctl.h linux-3.4.83-vs2.3.3.9/include/linux/sysctl.h +--- linux-3.4.83/include/linux/sysctl.h 2012-05-21 16:07:32.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/sysctl.h 2012-05-21 16:15:05.000000000 +0000 @@ -60,6 +60,7 @@ enum CTL_ABI=9, /* Binary emulation */ CTL_CPU=10, /* CPU stuff (speed scaling, etc) */ @@ -8786,9 +8786,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/sysctl.h linux-3.4.57-vs2.3.3.9 KERN_SPARC_REBOOT=21, /* reboot command on Sparc */ KERN_CTLALTDEL=22, /* int: allow ctl-alt-del to reboot */ -diff -NurpP --minimal linux-3.4.57/include/linux/sysfs.h linux-3.4.57-vs2.3.3.9/include/linux/sysfs.h ---- linux-3.4.57/include/linux/sysfs.h 2012-03-19 18:47:29.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/sysfs.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/sysfs.h linux-3.4.83-vs2.3.3.9/include/linux/sysfs.h +--- linux-3.4.83/include/linux/sysfs.h 2012-03-19 18:47:29.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/sysfs.h 2012-05-21 16:15:05.000000000 +0000 @@ -19,6 +19,8 @@ #include #include @@ -8798,9 +8798,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/sysfs.h linux-3.4.57-vs2.3.3.9/ struct kobject; struct module; enum kobj_ns_type; -diff -NurpP --minimal linux-3.4.57/include/linux/time.h linux-3.4.57-vs2.3.3.9/include/linux/time.h ---- linux-3.4.57/include/linux/time.h 2013-08-13 14:13:36.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/time.h 2012-10-22 13:09:53.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/time.h linux-3.4.83-vs2.3.3.9/include/linux/time.h +--- linux-3.4.83/include/linux/time.h 2014-03-12 09:48:20.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/time.h 2012-10-22 13:09:53.000000000 +0000 @@ -281,6 +281,8 @@ static __always_inline void timespec_add a->tv_nsec = ns; } @@ -8810,9 +8810,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/time.h linux-3.4.57-vs2.3.3.9/i #endif /* __KERNEL__ */ /* -diff -NurpP --minimal linux-3.4.57/include/linux/types.h linux-3.4.57-vs2.3.3.9/include/linux/types.h ---- linux-3.4.57/include/linux/types.h 2012-05-21 16:07:32.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/types.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/types.h linux-3.4.83-vs2.3.3.9/include/linux/types.h +--- linux-3.4.83/include/linux/types.h 2012-05-21 16:07:32.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/types.h 2012-05-21 16:15:05.000000000 +0000 @@ -41,6 +41,9 @@ typedef __kernel_uid32_t uid_t; typedef __kernel_gid32_t gid_t; typedef __kernel_uid16_t uid16_t; @@ -8823,9 +8823,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/types.h linux-3.4.57-vs2.3.3.9/ typedef unsigned long uintptr_t; -diff -NurpP --minimal linux-3.4.57/include/linux/utsname.h linux-3.4.57-vs2.3.3.9/include/linux/utsname.h ---- linux-3.4.57/include/linux/utsname.h 2012-01-09 15:14:59.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/utsname.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/utsname.h linux-3.4.83-vs2.3.3.9/include/linux/utsname.h +--- linux-3.4.83/include/linux/utsname.h 2012-01-09 15:14:59.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/utsname.h 2012-05-21 16:15:05.000000000 +0000 @@ -62,7 +62,8 @@ static inline void get_uts_ns(struct uts } @@ -8852,9 +8852,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/utsname.h linux-3.4.57-vs2.3.3. } #endif -diff -NurpP --minimal linux-3.4.57/include/linux/vroot.h linux-3.4.57-vs2.3.3.9/include/linux/vroot.h ---- linux-3.4.57/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vroot.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vroot.h linux-3.4.83-vs2.3.3.9/include/linux/vroot.h +--- linux-3.4.83/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vroot.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,51 @@ + +/* @@ -8907,9 +8907,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vroot.h linux-3.4.57-vs2.3.3.9/ +#define VROOT_CLR_DEV 0x5601 + +#endif /* _LINUX_VROOT_H */ -diff -NurpP --minimal linux-3.4.57/include/linux/vs_base.h linux-3.4.57-vs2.3.3.9/include/linux/vs_base.h ---- linux-3.4.57/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vs_base.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vs_base.h linux-3.4.83-vs2.3.3.9/include/linux/vs_base.h +--- linux-3.4.83/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vs_base.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,10 @@ +#ifndef _VS_BASE_H +#define _VS_BASE_H @@ -8921,9 +8921,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vs_base.h linux-3.4.57-vs2.3.3. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.4.57/include/linux/vs_context.h linux-3.4.57-vs2.3.3.9/include/linux/vs_context.h ---- linux-3.4.57/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vs_context.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vs_context.h linux-3.4.83-vs2.3.3.9/include/linux/vs_context.h +--- linux-3.4.83/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vs_context.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,242 @@ +#ifndef _VS_CONTEXT_H +#define _VS_CONTEXT_H @@ -9167,9 +9167,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vs_context.h linux-3.4.57-vs2.3 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.4.57/include/linux/vs_cowbl.h linux-3.4.57-vs2.3.3.9/include/linux/vs_cowbl.h ---- linux-3.4.57/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vs_cowbl.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vs_cowbl.h linux-3.4.83-vs2.3.3.9/include/linux/vs_cowbl.h +--- linux-3.4.83/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vs_cowbl.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,48 @@ +#ifndef _VS_COWBL_H +#define _VS_COWBL_H @@ -9219,9 +9219,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vs_cowbl.h linux-3.4.57-vs2.3.3 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.4.57/include/linux/vs_cvirt.h linux-3.4.57-vs2.3.3.9/include/linux/vs_cvirt.h ---- linux-3.4.57/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vs_cvirt.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vs_cvirt.h linux-3.4.83-vs2.3.3.9/include/linux/vs_cvirt.h +--- linux-3.4.83/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vs_cvirt.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,50 @@ +#ifndef _VS_CVIRT_H +#define _VS_CVIRT_H @@ -9273,9 +9273,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vs_cvirt.h linux-3.4.57-vs2.3.3 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.4.57/include/linux/vs_device.h linux-3.4.57-vs2.3.3.9/include/linux/vs_device.h ---- linux-3.4.57/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vs_device.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vs_device.h linux-3.4.83-vs2.3.3.9/include/linux/vs_device.h +--- linux-3.4.83/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vs_device.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,45 @@ +#ifndef _VS_DEVICE_H +#define _VS_DEVICE_H @@ -9322,9 +9322,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vs_device.h linux-3.4.57-vs2.3. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.4.57/include/linux/vs_dlimit.h linux-3.4.57-vs2.3.3.9/include/linux/vs_dlimit.h ---- linux-3.4.57/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vs_dlimit.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vs_dlimit.h linux-3.4.83-vs2.3.3.9/include/linux/vs_dlimit.h +--- linux-3.4.83/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vs_dlimit.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,215 @@ +#ifndef _VS_DLIMIT_H +#define _VS_DLIMIT_H @@ -9541,9 +9541,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vs_dlimit.h linux-3.4.57-vs2.3. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.4.57/include/linux/vs_inet.h linux-3.4.57-vs2.3.3.9/include/linux/vs_inet.h ---- linux-3.4.57/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vs_inet.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vs_inet.h linux-3.4.83-vs2.3.3.9/include/linux/vs_inet.h +--- linux-3.4.83/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vs_inet.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,353 @@ +#ifndef _VS_INET_H +#define _VS_INET_H @@ -9898,9 +9898,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vs_inet.h linux-3.4.57-vs2.3.3. +#else +// #warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.4.57/include/linux/vs_inet6.h linux-3.4.57-vs2.3.3.9/include/linux/vs_inet6.h ---- linux-3.4.57/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vs_inet6.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vs_inet6.h linux-3.4.83-vs2.3.3.9/include/linux/vs_inet6.h +--- linux-3.4.83/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vs_inet6.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,246 @@ +#ifndef _VS_INET6_H +#define _VS_INET6_H @@ -10148,9 +10148,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vs_inet6.h linux-3.4.57-vs2.3.3 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.4.57/include/linux/vs_limit.h linux-3.4.57-vs2.3.3.9/include/linux/vs_limit.h ---- linux-3.4.57/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vs_limit.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vs_limit.h linux-3.4.83-vs2.3.3.9/include/linux/vs_limit.h +--- linux-3.4.83/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vs_limit.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,140 @@ +#ifndef _VS_LIMIT_H +#define _VS_LIMIT_H @@ -10292,9 +10292,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vs_limit.h linux-3.4.57-vs2.3.3 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.4.57/include/linux/vs_network.h linux-3.4.57-vs2.3.3.9/include/linux/vs_network.h ---- linux-3.4.57/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vs_network.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vs_network.h linux-3.4.83-vs2.3.3.9/include/linux/vs_network.h +--- linux-3.4.83/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vs_network.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,169 @@ +#ifndef _NX_VS_NETWORK_H +#define _NX_VS_NETWORK_H @@ -10465,9 +10465,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vs_network.h linux-3.4.57-vs2.3 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.4.57/include/linux/vs_pid.h linux-3.4.57-vs2.3.3.9/include/linux/vs_pid.h ---- linux-3.4.57/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vs_pid.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vs_pid.h linux-3.4.83-vs2.3.3.9/include/linux/vs_pid.h +--- linux-3.4.83/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vs_pid.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,50 @@ +#ifndef _VS_PID_H +#define _VS_PID_H @@ -10519,9 +10519,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vs_pid.h linux-3.4.57-vs2.3.3.9 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.4.57/include/linux/vs_sched.h linux-3.4.57-vs2.3.3.9/include/linux/vs_sched.h ---- linux-3.4.57/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vs_sched.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vs_sched.h linux-3.4.83-vs2.3.3.9/include/linux/vs_sched.h +--- linux-3.4.83/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vs_sched.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,40 @@ +#ifndef _VS_SCHED_H +#define _VS_SCHED_H @@ -10563,9 +10563,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vs_sched.h linux-3.4.57-vs2.3.3 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.4.57/include/linux/vs_socket.h linux-3.4.57-vs2.3.3.9/include/linux/vs_socket.h ---- linux-3.4.57/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vs_socket.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vs_socket.h linux-3.4.83-vs2.3.3.9/include/linux/vs_socket.h +--- linux-3.4.83/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vs_socket.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,67 @@ +#ifndef _VS_SOCKET_H +#define _VS_SOCKET_H @@ -10634,9 +10634,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vs_socket.h linux-3.4.57-vs2.3. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.4.57/include/linux/vs_tag.h linux-3.4.57-vs2.3.3.9/include/linux/vs_tag.h ---- linux-3.4.57/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vs_tag.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vs_tag.h linux-3.4.83-vs2.3.3.9/include/linux/vs_tag.h +--- linux-3.4.83/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vs_tag.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,47 @@ +#ifndef _VS_TAG_H +#define _VS_TAG_H @@ -10685,9 +10685,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vs_tag.h linux-3.4.57-vs2.3.3.9 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.4.57/include/linux/vs_time.h linux-3.4.57-vs2.3.3.9/include/linux/vs_time.h ---- linux-3.4.57/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vs_time.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vs_time.h linux-3.4.83-vs2.3.3.9/include/linux/vs_time.h +--- linux-3.4.83/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vs_time.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,19 @@ +#ifndef _VS_TIME_H +#define _VS_TIME_H @@ -10708,9 +10708,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vs_time.h linux-3.4.57-vs2.3.3. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.4.57/include/linux/vserver/Kbuild linux-3.4.57-vs2.3.3.9/include/linux/vserver/Kbuild ---- linux-3.4.57/include/linux/vserver/Kbuild 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vserver/Kbuild 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vserver/Kbuild linux-3.4.83-vs2.3.3.9/include/linux/vserver/Kbuild +--- linux-3.4.83/include/linux/vserver/Kbuild 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vserver/Kbuild 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,8 @@ + +header-y += context_cmd.h network_cmd.h space_cmd.h \ @@ -10720,9 +10720,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vserver/Kbuild linux-3.4.57-vs2 + +header-y += switch.h network.h monitor.h inode.h device.h + -diff -NurpP --minimal linux-3.4.57/include/linux/vserver/base.h linux-3.4.57-vs2.3.3.9/include/linux/vserver/base.h ---- linux-3.4.57/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vserver/base.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vserver/base.h linux-3.4.83-vs2.3.3.9/include/linux/vserver/base.h +--- linux-3.4.83/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vserver/base.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,178 @@ +#ifndef _VX_BASE_H +#define _VX_BASE_H @@ -10902,9 +10902,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vserver/base.h linux-3.4.57-vs2 +#define nx_info_state(n, m) (__nx_state(n) & (m)) + +#endif -diff -NurpP --minimal linux-3.4.57/include/linux/vserver/cacct.h linux-3.4.57-vs2.3.3.9/include/linux/vserver/cacct.h ---- linux-3.4.57/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vserver/cacct.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vserver/cacct.h linux-3.4.83-vs2.3.3.9/include/linux/vserver/cacct.h +--- linux-3.4.83/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vserver/cacct.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,15 @@ +#ifndef _VX_CACCT_H +#define _VX_CACCT_H @@ -10921,9 +10921,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vserver/cacct.h linux-3.4.57-vs +}; + +#endif /* _VX_CACCT_H */ -diff -NurpP --minimal linux-3.4.57/include/linux/vserver/cacct_cmd.h linux-3.4.57-vs2.3.3.9/include/linux/vserver/cacct_cmd.h ---- linux-3.4.57/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vserver/cacct_cmd.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vserver/cacct_cmd.h linux-3.4.83-vs2.3.3.9/include/linux/vserver/cacct_cmd.h +--- linux-3.4.83/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vserver/cacct_cmd.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,23 @@ +#ifndef _VX_CACCT_CMD_H +#define _VX_CACCT_CMD_H @@ -10948,9 +10948,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vserver/cacct_cmd.h linux-3.4.5 + +#endif /* __KERNEL__ */ +#endif /* _VX_CACCT_CMD_H */ -diff -NurpP --minimal linux-3.4.57/include/linux/vserver/cacct_def.h linux-3.4.57-vs2.3.3.9/include/linux/vserver/cacct_def.h ---- linux-3.4.57/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vserver/cacct_def.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vserver/cacct_def.h linux-3.4.83-vs2.3.3.9/include/linux/vserver/cacct_def.h +--- linux-3.4.83/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vserver/cacct_def.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,43 @@ +#ifndef _VX_CACCT_DEF_H +#define _VX_CACCT_DEF_H @@ -10995,9 +10995,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vserver/cacct_def.h linux-3.4.5 +#endif + +#endif /* _VX_CACCT_DEF_H */ -diff -NurpP --minimal linux-3.4.57/include/linux/vserver/cacct_int.h linux-3.4.57-vs2.3.3.9/include/linux/vserver/cacct_int.h ---- linux-3.4.57/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vserver/cacct_int.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vserver/cacct_int.h linux-3.4.83-vs2.3.3.9/include/linux/vserver/cacct_int.h +--- linux-3.4.83/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vserver/cacct_int.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,21 @@ +#ifndef _VX_CACCT_INT_H +#define _VX_CACCT_INT_H @@ -11020,9 +11020,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vserver/cacct_int.h linux-3.4.5 + +#endif /* __KERNEL__ */ +#endif /* _VX_CACCT_INT_H */ -diff -NurpP --minimal linux-3.4.57/include/linux/vserver/check.h linux-3.4.57-vs2.3.3.9/include/linux/vserver/check.h ---- linux-3.4.57/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vserver/check.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vserver/check.h linux-3.4.83-vs2.3.3.9/include/linux/vserver/check.h +--- linux-3.4.83/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vserver/check.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,89 @@ +#ifndef _VS_CHECK_H +#define _VS_CHECK_H @@ -11113,9 +11113,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vserver/check.h linux-3.4.57-vs +#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1) + +#endif -diff -NurpP --minimal linux-3.4.57/include/linux/vserver/context.h linux-3.4.57-vs2.3.3.9/include/linux/vserver/context.h ---- linux-3.4.57/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vserver/context.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vserver/context.h linux-3.4.83-vs2.3.3.9/include/linux/vserver/context.h +--- linux-3.4.83/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vserver/context.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,188 @@ +#ifndef _VX_CONTEXT_H +#define _VX_CONTEXT_H @@ -11305,9 +11305,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vserver/context.h linux-3.4.57- + +#endif /* __KERNEL__ */ +#endif /* _VX_CONTEXT_H */ -diff -NurpP --minimal linux-3.4.57/include/linux/vserver/context_cmd.h linux-3.4.57-vs2.3.3.9/include/linux/vserver/context_cmd.h ---- linux-3.4.57/include/linux/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vserver/context_cmd.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vserver/context_cmd.h linux-3.4.83-vs2.3.3.9/include/linux/vserver/context_cmd.h +--- linux-3.4.83/include/linux/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vserver/context_cmd.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,162 @@ +#ifndef _VX_CONTEXT_CMD_H +#define _VX_CONTEXT_CMD_H @@ -11471,9 +11471,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vserver/context_cmd.h linux-3.4 + +#endif /* __KERNEL__ */ +#endif /* _VX_CONTEXT_CMD_H */ -diff -NurpP --minimal linux-3.4.57/include/linux/vserver/cvirt.h linux-3.4.57-vs2.3.3.9/include/linux/vserver/cvirt.h ---- linux-3.4.57/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vserver/cvirt.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vserver/cvirt.h linux-3.4.83-vs2.3.3.9/include/linux/vserver/cvirt.h +--- linux-3.4.83/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vserver/cvirt.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,22 @@ +#ifndef _VX_CVIRT_H +#define _VX_CVIRT_H @@ -11497,9 +11497,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vserver/cvirt.h linux-3.4.57-vs + +#endif /* __KERNEL__ */ +#endif /* _VX_CVIRT_H */ -diff -NurpP --minimal linux-3.4.57/include/linux/vserver/cvirt_cmd.h linux-3.4.57-vs2.3.3.9/include/linux/vserver/cvirt_cmd.h ---- linux-3.4.57/include/linux/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vserver/cvirt_cmd.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vserver/cvirt_cmd.h linux-3.4.83-vs2.3.3.9/include/linux/vserver/cvirt_cmd.h +--- linux-3.4.83/include/linux/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vserver/cvirt_cmd.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,53 @@ +#ifndef _VX_CVIRT_CMD_H +#define _VX_CVIRT_CMD_H @@ -11554,9 +11554,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vserver/cvirt_cmd.h linux-3.4.5 + +#endif /* __KERNEL__ */ +#endif /* _VX_CVIRT_CMD_H */ -diff -NurpP --minimal linux-3.4.57/include/linux/vserver/cvirt_def.h linux-3.4.57-vs2.3.3.9/include/linux/vserver/cvirt_def.h ---- linux-3.4.57/include/linux/vserver/cvirt_def.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vserver/cvirt_def.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vserver/cvirt_def.h linux-3.4.83-vs2.3.3.9/include/linux/vserver/cvirt_def.h +--- linux-3.4.83/include/linux/vserver/cvirt_def.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vserver/cvirt_def.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,80 @@ +#ifndef _VX_CVIRT_DEF_H +#define _VX_CVIRT_DEF_H @@ -11638,9 +11638,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vserver/cvirt_def.h linux-3.4.5 +#endif + +#endif /* _VX_CVIRT_DEF_H */ -diff -NurpP --minimal linux-3.4.57/include/linux/vserver/debug.h linux-3.4.57-vs2.3.3.9/include/linux/vserver/debug.h ---- linux-3.4.57/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vserver/debug.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vserver/debug.h linux-3.4.83-vs2.3.3.9/include/linux/vserver/debug.h +--- linux-3.4.83/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vserver/debug.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,145 @@ +#ifndef _VX_DEBUG_H +#define _VX_DEBUG_H @@ -11787,9 +11787,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vserver/debug.h linux-3.4.57-vs + + +#endif /* _VX_DEBUG_H */ -diff -NurpP --minimal linux-3.4.57/include/linux/vserver/debug_cmd.h linux-3.4.57-vs2.3.3.9/include/linux/vserver/debug_cmd.h ---- linux-3.4.57/include/linux/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vserver/debug_cmd.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vserver/debug_cmd.h linux-3.4.83-vs2.3.3.9/include/linux/vserver/debug_cmd.h +--- linux-3.4.83/include/linux/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vserver/debug_cmd.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,58 @@ +#ifndef _VX_DEBUG_CMD_H +#define _VX_DEBUG_CMD_H @@ -11849,9 +11849,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vserver/debug_cmd.h linux-3.4.5 + +#endif /* __KERNEL__ */ +#endif /* _VX_DEBUG_CMD_H */ -diff -NurpP --minimal linux-3.4.57/include/linux/vserver/device.h linux-3.4.57-vs2.3.3.9/include/linux/vserver/device.h ---- linux-3.4.57/include/linux/vserver/device.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vserver/device.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vserver/device.h linux-3.4.83-vs2.3.3.9/include/linux/vserver/device.h +--- linux-3.4.83/include/linux/vserver/device.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vserver/device.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,15 @@ +#ifndef _VX_DEVICE_H +#define _VX_DEVICE_H @@ -11868,9 +11868,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vserver/device.h linux-3.4.57-v +#else /* _VX_DEVICE_H */ +#warning duplicate inclusion +#endif /* _VX_DEVICE_H */ -diff -NurpP --minimal linux-3.4.57/include/linux/vserver/device_cmd.h linux-3.4.57-vs2.3.3.9/include/linux/vserver/device_cmd.h ---- linux-3.4.57/include/linux/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vserver/device_cmd.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vserver/device_cmd.h linux-3.4.83-vs2.3.3.9/include/linux/vserver/device_cmd.h +--- linux-3.4.83/include/linux/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vserver/device_cmd.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,44 @@ +#ifndef _VX_DEVICE_CMD_H +#define _VX_DEVICE_CMD_H @@ -11916,9 +11916,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vserver/device_cmd.h linux-3.4. + +#endif /* __KERNEL__ */ +#endif /* _VX_DEVICE_CMD_H */ -diff -NurpP --minimal linux-3.4.57/include/linux/vserver/device_def.h linux-3.4.57-vs2.3.3.9/include/linux/vserver/device_def.h ---- linux-3.4.57/include/linux/vserver/device_def.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vserver/device_def.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vserver/device_def.h linux-3.4.83-vs2.3.3.9/include/linux/vserver/device_def.h +--- linux-3.4.83/include/linux/vserver/device_def.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vserver/device_def.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,17 @@ +#ifndef _VX_DEVICE_DEF_H +#define _VX_DEVICE_DEF_H @@ -11937,9 +11937,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vserver/device_def.h linux-3.4. +}; + +#endif /* _VX_DEVICE_DEF_H */ -diff -NurpP --minimal linux-3.4.57/include/linux/vserver/dlimit.h linux-3.4.57-vs2.3.3.9/include/linux/vserver/dlimit.h ---- linux-3.4.57/include/linux/vserver/dlimit.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vserver/dlimit.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vserver/dlimit.h linux-3.4.83-vs2.3.3.9/include/linux/vserver/dlimit.h +--- linux-3.4.83/include/linux/vserver/dlimit.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vserver/dlimit.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,54 @@ +#ifndef _VX_DLIMIT_H +#define _VX_DLIMIT_H @@ -11995,9 +11995,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vserver/dlimit.h linux-3.4.57-v +#else /* _VX_DLIMIT_H */ +#warning duplicate inclusion +#endif /* _VX_DLIMIT_H */ -diff -NurpP --minimal linux-3.4.57/include/linux/vserver/dlimit_cmd.h linux-3.4.57-vs2.3.3.9/include/linux/vserver/dlimit_cmd.h ---- linux-3.4.57/include/linux/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vserver/dlimit_cmd.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vserver/dlimit_cmd.h linux-3.4.83-vs2.3.3.9/include/linux/vserver/dlimit_cmd.h +--- linux-3.4.83/include/linux/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vserver/dlimit_cmd.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,109 @@ +#ifndef _VX_DLIMIT_CMD_H +#define _VX_DLIMIT_CMD_H @@ -12108,9 +12108,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vserver/dlimit_cmd.h linux-3.4. + +#endif /* __KERNEL__ */ +#endif /* _VX_DLIMIT_CMD_H */ -diff -NurpP --minimal linux-3.4.57/include/linux/vserver/global.h linux-3.4.57-vs2.3.3.9/include/linux/vserver/global.h ---- linux-3.4.57/include/linux/vserver/global.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vserver/global.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vserver/global.h linux-3.4.83-vs2.3.3.9/include/linux/vserver/global.h +--- linux-3.4.83/include/linux/vserver/global.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vserver/global.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,19 @@ +#ifndef _VX_GLOBAL_H +#define _VX_GLOBAL_H @@ -12131,9 +12131,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vserver/global.h linux-3.4.57-v + + +#endif /* _VX_GLOBAL_H */ -diff -NurpP --minimal linux-3.4.57/include/linux/vserver/history.h linux-3.4.57-vs2.3.3.9/include/linux/vserver/history.h ---- linux-3.4.57/include/linux/vserver/history.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vserver/history.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vserver/history.h linux-3.4.83-vs2.3.3.9/include/linux/vserver/history.h +--- linux-3.4.83/include/linux/vserver/history.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vserver/history.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,197 @@ +#ifndef _VX_HISTORY_H +#define _VX_HISTORY_H @@ -12332,9 +12332,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vserver/history.h linux-3.4.57- +#endif /* CONFIG_VSERVER_HISTORY */ + +#endif /* _VX_HISTORY_H */ -diff -NurpP --minimal linux-3.4.57/include/linux/vserver/inode.h linux-3.4.57-vs2.3.3.9/include/linux/vserver/inode.h ---- linux-3.4.57/include/linux/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vserver/inode.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vserver/inode.h linux-3.4.83-vs2.3.3.9/include/linux/vserver/inode.h +--- linux-3.4.83/include/linux/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vserver/inode.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,39 @@ +#ifndef _VX_INODE_H +#define _VX_INODE_H @@ -12375,9 +12375,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vserver/inode.h linux-3.4.57-vs +#else /* _VX_INODE_H */ +#warning duplicate inclusion +#endif /* _VX_INODE_H */ -diff -NurpP --minimal linux-3.4.57/include/linux/vserver/inode_cmd.h linux-3.4.57-vs2.3.3.9/include/linux/vserver/inode_cmd.h ---- linux-3.4.57/include/linux/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vserver/inode_cmd.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vserver/inode_cmd.h linux-3.4.83-vs2.3.3.9/include/linux/vserver/inode_cmd.h +--- linux-3.4.83/include/linux/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vserver/inode_cmd.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,59 @@ +#ifndef _VX_INODE_CMD_H +#define _VX_INODE_CMD_H @@ -12438,9 +12438,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vserver/inode_cmd.h linux-3.4.5 + +#endif /* __KERNEL__ */ +#endif /* _VX_INODE_CMD_H */ -diff -NurpP --minimal linux-3.4.57/include/linux/vserver/limit.h linux-3.4.57-vs2.3.3.9/include/linux/vserver/limit.h ---- linux-3.4.57/include/linux/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vserver/limit.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vserver/limit.h linux-3.4.83-vs2.3.3.9/include/linux/vserver/limit.h +--- linux-3.4.83/include/linux/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vserver/limit.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,71 @@ +#ifndef _VX_LIMIT_H +#define _VX_LIMIT_H @@ -12513,9 +12513,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vserver/limit.h linux-3.4.57-vs + +#endif /* __KERNEL__ */ +#endif /* _VX_LIMIT_H */ -diff -NurpP --minimal linux-3.4.57/include/linux/vserver/limit_cmd.h linux-3.4.57-vs2.3.3.9/include/linux/vserver/limit_cmd.h ---- linux-3.4.57/include/linux/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vserver/limit_cmd.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vserver/limit_cmd.h linux-3.4.83-vs2.3.3.9/include/linux/vserver/limit_cmd.h +--- linux-3.4.83/include/linux/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vserver/limit_cmd.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,71 @@ +#ifndef _VX_LIMIT_CMD_H +#define _VX_LIMIT_CMD_H @@ -12588,9 +12588,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vserver/limit_cmd.h linux-3.4.5 + +#endif /* __KERNEL__ */ +#endif /* _VX_LIMIT_CMD_H */ -diff -NurpP --minimal linux-3.4.57/include/linux/vserver/limit_def.h linux-3.4.57-vs2.3.3.9/include/linux/vserver/limit_def.h ---- linux-3.4.57/include/linux/vserver/limit_def.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vserver/limit_def.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vserver/limit_def.h linux-3.4.83-vs2.3.3.9/include/linux/vserver/limit_def.h +--- linux-3.4.83/include/linux/vserver/limit_def.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vserver/limit_def.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,47 @@ +#ifndef _VX_LIMIT_DEF_H +#define _VX_LIMIT_DEF_H @@ -12639,9 +12639,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vserver/limit_def.h linux-3.4.5 +#endif + +#endif /* _VX_LIMIT_DEF_H */ -diff -NurpP --minimal linux-3.4.57/include/linux/vserver/limit_int.h linux-3.4.57-vs2.3.3.9/include/linux/vserver/limit_int.h ---- linux-3.4.57/include/linux/vserver/limit_int.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vserver/limit_int.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vserver/limit_int.h linux-3.4.83-vs2.3.3.9/include/linux/vserver/limit_int.h +--- linux-3.4.83/include/linux/vserver/limit_int.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vserver/limit_int.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,198 @@ +#ifndef _VX_LIMIT_INT_H +#define _VX_LIMIT_INT_H @@ -12841,9 +12841,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vserver/limit_int.h linux-3.4.5 + +#endif /* __KERNEL__ */ +#endif /* _VX_LIMIT_INT_H */ -diff -NurpP --minimal linux-3.4.57/include/linux/vserver/monitor.h linux-3.4.57-vs2.3.3.9/include/linux/vserver/monitor.h ---- linux-3.4.57/include/linux/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vserver/monitor.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vserver/monitor.h linux-3.4.83-vs2.3.3.9/include/linux/vserver/monitor.h +--- linux-3.4.83/include/linux/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vserver/monitor.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,96 @@ +#ifndef _VX_MONITOR_H +#define _VX_MONITOR_H @@ -12941,9 +12941,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vserver/monitor.h linux-3.4.57- + + +#endif /* _VX_MONITOR_H */ -diff -NurpP --minimal linux-3.4.57/include/linux/vserver/network.h linux-3.4.57-vs2.3.3.9/include/linux/vserver/network.h ---- linux-3.4.57/include/linux/vserver/network.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vserver/network.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vserver/network.h linux-3.4.83-vs2.3.3.9/include/linux/vserver/network.h +--- linux-3.4.83/include/linux/vserver/network.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vserver/network.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,148 @@ +#ifndef _VX_NETWORK_H +#define _VX_NETWORK_H @@ -13093,9 +13093,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vserver/network.h linux-3.4.57- + +#endif /* __KERNEL__ */ +#endif /* _VX_NETWORK_H */ -diff -NurpP --minimal linux-3.4.57/include/linux/vserver/network_cmd.h linux-3.4.57-vs2.3.3.9/include/linux/vserver/network_cmd.h ---- linux-3.4.57/include/linux/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vserver/network_cmd.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vserver/network_cmd.h linux-3.4.83-vs2.3.3.9/include/linux/vserver/network_cmd.h +--- linux-3.4.83/include/linux/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vserver/network_cmd.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,164 @@ +#ifndef _VX_NETWORK_CMD_H +#define _VX_NETWORK_CMD_H @@ -13261,9 +13261,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vserver/network_cmd.h linux-3.4 + +#endif /* __KERNEL__ */ +#endif /* _VX_CONTEXT_CMD_H */ -diff -NurpP --minimal linux-3.4.57/include/linux/vserver/percpu.h linux-3.4.57-vs2.3.3.9/include/linux/vserver/percpu.h ---- linux-3.4.57/include/linux/vserver/percpu.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vserver/percpu.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vserver/percpu.h linux-3.4.83-vs2.3.3.9/include/linux/vserver/percpu.h +--- linux-3.4.83/include/linux/vserver/percpu.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vserver/percpu.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,14 @@ +#ifndef _VX_PERCPU_H +#define _VX_PERCPU_H @@ -13279,9 +13279,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vserver/percpu.h linux-3.4.57-v +#define PERCPU_PERCTX (sizeof(struct _vx_percpu)) + +#endif /* _VX_PERCPU_H */ -diff -NurpP --minimal linux-3.4.57/include/linux/vserver/pid.h linux-3.4.57-vs2.3.3.9/include/linux/vserver/pid.h ---- linux-3.4.57/include/linux/vserver/pid.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vserver/pid.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vserver/pid.h linux-3.4.83-vs2.3.3.9/include/linux/vserver/pid.h +--- linux-3.4.83/include/linux/vserver/pid.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vserver/pid.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,51 @@ +#ifndef _VSERVER_PID_H +#define _VSERVER_PID_H @@ -13334,9 +13334,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vserver/pid.h linux-3.4.57-vs2. +} + +#endif -diff -NurpP --minimal linux-3.4.57/include/linux/vserver/sched.h linux-3.4.57-vs2.3.3.9/include/linux/vserver/sched.h ---- linux-3.4.57/include/linux/vserver/sched.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vserver/sched.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vserver/sched.h linux-3.4.83-vs2.3.3.9/include/linux/vserver/sched.h +--- linux-3.4.83/include/linux/vserver/sched.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vserver/sched.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,23 @@ +#ifndef _VX_SCHED_H +#define _VX_SCHED_H @@ -13361,9 +13361,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vserver/sched.h linux-3.4.57-vs +#else /* _VX_SCHED_H */ +#warning duplicate inclusion +#endif /* _VX_SCHED_H */ -diff -NurpP --minimal linux-3.4.57/include/linux/vserver/sched_cmd.h linux-3.4.57-vs2.3.3.9/include/linux/vserver/sched_cmd.h ---- linux-3.4.57/include/linux/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vserver/sched_cmd.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vserver/sched_cmd.h linux-3.4.83-vs2.3.3.9/include/linux/vserver/sched_cmd.h +--- linux-3.4.83/include/linux/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vserver/sched_cmd.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,21 @@ +#ifndef _VX_SCHED_CMD_H +#define _VX_SCHED_CMD_H @@ -13386,9 +13386,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vserver/sched_cmd.h linux-3.4.5 + +#endif /* __KERNEL__ */ +#endif /* _VX_SCHED_CMD_H */ -diff -NurpP --minimal linux-3.4.57/include/linux/vserver/sched_def.h linux-3.4.57-vs2.3.3.9/include/linux/vserver/sched_def.h ---- linux-3.4.57/include/linux/vserver/sched_def.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vserver/sched_def.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vserver/sched_def.h linux-3.4.83-vs2.3.3.9/include/linux/vserver/sched_def.h +--- linux-3.4.83/include/linux/vserver/sched_def.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vserver/sched_def.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,38 @@ +#ifndef _VX_SCHED_DEF_H +#define _VX_SCHED_DEF_H @@ -13428,9 +13428,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vserver/sched_def.h linux-3.4.5 +#endif + +#endif /* _VX_SCHED_DEF_H */ -diff -NurpP --minimal linux-3.4.57/include/linux/vserver/signal.h linux-3.4.57-vs2.3.3.9/include/linux/vserver/signal.h ---- linux-3.4.57/include/linux/vserver/signal.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vserver/signal.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vserver/signal.h linux-3.4.83-vs2.3.3.9/include/linux/vserver/signal.h +--- linux-3.4.83/include/linux/vserver/signal.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vserver/signal.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,14 @@ +#ifndef _VX_SIGNAL_H +#define _VX_SIGNAL_H @@ -13446,9 +13446,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vserver/signal.h linux-3.4.57-v +#else /* _VX_SIGNAL_H */ +#warning duplicate inclusion +#endif /* _VX_SIGNAL_H */ -diff -NurpP --minimal linux-3.4.57/include/linux/vserver/signal_cmd.h linux-3.4.57-vs2.3.3.9/include/linux/vserver/signal_cmd.h ---- linux-3.4.57/include/linux/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vserver/signal_cmd.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vserver/signal_cmd.h linux-3.4.83-vs2.3.3.9/include/linux/vserver/signal_cmd.h +--- linux-3.4.83/include/linux/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vserver/signal_cmd.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,43 @@ +#ifndef _VX_SIGNAL_CMD_H +#define _VX_SIGNAL_CMD_H @@ -13493,9 +13493,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vserver/signal_cmd.h linux-3.4. + +#endif /* __KERNEL__ */ +#endif /* _VX_SIGNAL_CMD_H */ -diff -NurpP --minimal linux-3.4.57/include/linux/vserver/space.h linux-3.4.57-vs2.3.3.9/include/linux/vserver/space.h ---- linux-3.4.57/include/linux/vserver/space.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vserver/space.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vserver/space.h linux-3.4.83-vs2.3.3.9/include/linux/vserver/space.h +--- linux-3.4.83/include/linux/vserver/space.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vserver/space.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,12 @@ +#ifndef _VX_SPACE_H +#define _VX_SPACE_H @@ -13509,9 +13509,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vserver/space.h linux-3.4.57-vs +#else /* _VX_SPACE_H */ +#warning duplicate inclusion +#endif /* _VX_SPACE_H */ -diff -NurpP --minimal linux-3.4.57/include/linux/vserver/space_cmd.h linux-3.4.57-vs2.3.3.9/include/linux/vserver/space_cmd.h ---- linux-3.4.57/include/linux/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vserver/space_cmd.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vserver/space_cmd.h linux-3.4.83-vs2.3.3.9/include/linux/vserver/space_cmd.h +--- linux-3.4.83/include/linux/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vserver/space_cmd.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,38 @@ +#ifndef _VX_SPACE_CMD_H +#define _VX_SPACE_CMD_H @@ -13551,9 +13551,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vserver/space_cmd.h linux-3.4.5 + +#endif /* __KERNEL__ */ +#endif /* _VX_SPACE_CMD_H */ -diff -NurpP --minimal linux-3.4.57/include/linux/vserver/switch.h linux-3.4.57-vs2.3.3.9/include/linux/vserver/switch.h ---- linux-3.4.57/include/linux/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vserver/switch.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vserver/switch.h linux-3.4.83-vs2.3.3.9/include/linux/vserver/switch.h +--- linux-3.4.83/include/linux/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vserver/switch.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,98 @@ +#ifndef _VX_SWITCH_H +#define _VX_SWITCH_H @@ -13653,9 +13653,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vserver/switch.h linux-3.4.57-v + +#endif /* _VX_SWITCH_H */ + -diff -NurpP --minimal linux-3.4.57/include/linux/vserver/tag.h linux-3.4.57-vs2.3.3.9/include/linux/vserver/tag.h ---- linux-3.4.57/include/linux/vserver/tag.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vserver/tag.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vserver/tag.h linux-3.4.83-vs2.3.3.9/include/linux/vserver/tag.h +--- linux-3.4.83/include/linux/vserver/tag.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vserver/tag.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,143 @@ +#ifndef _DX_TAG_H +#define _DX_TAG_H @@ -13800,9 +13800,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vserver/tag.h linux-3.4.57-vs2. +#endif + +#endif /* _DX_TAG_H */ -diff -NurpP --minimal linux-3.4.57/include/linux/vserver/tag_cmd.h linux-3.4.57-vs2.3.3.9/include/linux/vserver/tag_cmd.h ---- linux-3.4.57/include/linux/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/linux/vserver/tag_cmd.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/linux/vserver/tag_cmd.h linux-3.4.83-vs2.3.3.9/include/linux/vserver/tag_cmd.h +--- linux-3.4.83/include/linux/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/linux/vserver/tag_cmd.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,22 @@ +#ifndef _VX_TAG_CMD_H +#define _VX_TAG_CMD_H @@ -13826,9 +13826,9 @@ diff -NurpP --minimal linux-3.4.57/include/linux/vserver/tag_cmd.h linux-3.4.57- + +#endif /* __KERNEL__ */ +#endif /* _VX_TAG_CMD_H */ -diff -NurpP --minimal linux-3.4.57/include/net/addrconf.h linux-3.4.57-vs2.3.3.9/include/net/addrconf.h ---- linux-3.4.57/include/net/addrconf.h 2013-08-13 14:13:36.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/net/addrconf.h 2013-08-13 17:08:10.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/net/addrconf.h linux-3.4.83-vs2.3.3.9/include/net/addrconf.h +--- linux-3.4.83/include/net/addrconf.h 2014-03-12 09:48:20.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/net/addrconf.h 2013-08-13 17:08:10.000000000 +0000 @@ -80,7 +80,8 @@ extern int ipv6_dev_get_saddr(struct n struct net_device *dev, const struct in6_addr *daddr, @@ -13839,9 +13839,9 @@ diff -NurpP --minimal linux-3.4.57/include/net/addrconf.h linux-3.4.57-vs2.3.3.9 extern int __ipv6_get_lladdr(struct inet6_dev *idev, struct in6_addr *addr, unsigned char banned_flags); -diff -NurpP --minimal linux-3.4.57/include/net/af_unix.h linux-3.4.57-vs2.3.3.9/include/net/af_unix.h ---- linux-3.4.57/include/net/af_unix.h 2012-05-21 16:07:33.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/net/af_unix.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/net/af_unix.h linux-3.4.83-vs2.3.3.9/include/net/af_unix.h +--- linux-3.4.83/include/net/af_unix.h 2012-05-21 16:07:33.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/net/af_unix.h 2012-05-21 16:15:05.000000000 +0000 @@ -4,6 +4,7 @@ #include #include @@ -13850,9 +13850,9 @@ diff -NurpP --minimal linux-3.4.57/include/net/af_unix.h linux-3.4.57-vs2.3.3.9/ #include extern void unix_inflight(struct file *fp); -diff -NurpP --minimal linux-3.4.57/include/net/inet_timewait_sock.h linux-3.4.57-vs2.3.3.9/include/net/inet_timewait_sock.h ---- linux-3.4.57/include/net/inet_timewait_sock.h 2012-03-19 18:47:29.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/net/inet_timewait_sock.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/net/inet_timewait_sock.h linux-3.4.83-vs2.3.3.9/include/net/inet_timewait_sock.h +--- linux-3.4.83/include/net/inet_timewait_sock.h 2012-03-19 18:47:29.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/net/inet_timewait_sock.h 2012-05-21 16:15:05.000000000 +0000 @@ -112,6 +112,10 @@ struct inet_timewait_sock { #define tw_net __tw_common.skc_net #define tw_daddr __tw_common.skc_daddr @@ -13864,9 +13864,9 @@ diff -NurpP --minimal linux-3.4.57/include/net/inet_timewait_sock.h linux-3.4.57 int tw_timeout; volatile unsigned char tw_substate; unsigned char tw_rcv_wscale; -diff -NurpP --minimal linux-3.4.57/include/net/ip6_route.h linux-3.4.57-vs2.3.3.9/include/net/ip6_route.h ---- linux-3.4.57/include/net/ip6_route.h 2012-03-19 18:47:29.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/net/ip6_route.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/net/ip6_route.h linux-3.4.83-vs2.3.3.9/include/net/ip6_route.h +--- linux-3.4.83/include/net/ip6_route.h 2012-03-19 18:47:29.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/net/ip6_route.h 2012-05-21 16:15:05.000000000 +0000 @@ -88,7 +88,8 @@ extern int ip6_route_get_saddr(struct struct rt6_info *rt, const struct in6_addr *daddr, @@ -13877,9 +13877,9 @@ diff -NurpP --minimal linux-3.4.57/include/net/ip6_route.h linux-3.4.57-vs2.3.3. extern struct rt6_info *rt6_lookup(struct net *net, const struct in6_addr *daddr, -diff -NurpP --minimal linux-3.4.57/include/net/route.h linux-3.4.57-vs2.3.3.9/include/net/route.h ---- linux-3.4.57/include/net/route.h 2012-03-19 18:47:29.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/net/route.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/net/route.h linux-3.4.83-vs2.3.3.9/include/net/route.h +--- linux-3.4.83/include/net/route.h 2012-03-19 18:47:29.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/net/route.h 2012-05-21 16:15:05.000000000 +0000 @@ -202,6 +202,9 @@ static inline void ip_rt_put(struct rtab dst_release(&rt->dst); } @@ -13927,9 +13927,9 @@ diff -NurpP --minimal linux-3.4.57/include/net/route.h linux-3.4.57-vs2.3.3.9/in rt = __ip_route_output_key(net, fl4); if (IS_ERR(rt)) return rt; -diff -NurpP --minimal linux-3.4.57/include/net/sock.h linux-3.4.57-vs2.3.3.9/include/net/sock.h ---- linux-3.4.57/include/net/sock.h 2013-08-13 14:13:36.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/include/net/sock.h 2013-07-14 13:38:35.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/include/net/sock.h linux-3.4.83-vs2.3.3.9/include/net/sock.h +--- linux-3.4.83/include/net/sock.h 2014-03-12 09:48:20.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/include/net/sock.h 2013-07-14 13:38:35.000000000 +0000 @@ -170,6 +170,10 @@ struct sock_common { #ifdef CONFIG_NET_NS struct net *skc_net; @@ -13952,9 +13952,9 @@ diff -NurpP --minimal linux-3.4.57/include/net/sock.h linux-3.4.57-vs2.3.3.9/inc socket_lock_t sk_lock; struct sk_buff_head sk_receive_queue; /* -diff -NurpP --minimal linux-3.4.57/init/Kconfig linux-3.4.57-vs2.3.3.9/init/Kconfig ---- linux-3.4.57/init/Kconfig 2012-05-21 16:07:33.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/init/Kconfig 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/init/Kconfig linux-3.4.83-vs2.3.3.9/init/Kconfig +--- linux-3.4.83/init/Kconfig 2012-05-21 16:07:33.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/init/Kconfig 2012-05-21 16:15:05.000000000 +0000 @@ -579,6 +579,7 @@ config HAVE_UNSTABLE_SCHED_CLOCK menuconfig CGROUPS boolean "Control Group support" @@ -13971,10 +13971,10 @@ diff -NurpP --minimal linux-3.4.57/init/Kconfig linux-3.4.57-vs2.3.3.9/init/Kcon default y help This allows containers, i.e. vservers, to use user namespaces -diff -NurpP --minimal linux-3.4.57/init/main.c linux-3.4.57-vs2.3.3.9/init/main.c ---- linux-3.4.57/init/main.c 2013-08-13 14:13:36.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/init/main.c 2013-02-19 14:42:56.000000000 +0000 -@@ -68,6 +68,7 @@ +diff -NurpP --minimal linux-3.4.83/init/main.c linux-3.4.83-vs2.3.3.9/init/main.c +--- linux-3.4.83/init/main.c 2014-03-12 09:48:21.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/init/main.c 2013-10-26 18:10:57.000000000 +0000 +@@ -69,6 +69,7 @@ #include #include #include @@ -13982,9 +13982,9 @@ diff -NurpP --minimal linux-3.4.57/init/main.c linux-3.4.57-vs2.3.3.9/init/main. #include #include -diff -NurpP --minimal linux-3.4.57/ipc/mqueue.c linux-3.4.57-vs2.3.3.9/ipc/mqueue.c ---- linux-3.4.57/ipc/mqueue.c 2012-05-21 16:07:34.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/ipc/mqueue.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/ipc/mqueue.c linux-3.4.83-vs2.3.3.9/ipc/mqueue.c +--- linux-3.4.83/ipc/mqueue.c 2012-05-21 16:07:34.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/ipc/mqueue.c 2012-05-21 16:15:05.000000000 +0000 @@ -34,6 +34,8 @@ #include #include @@ -14060,9 +14060,9 @@ diff -NurpP --minimal linux-3.4.57/ipc/mqueue.c linux-3.4.57-vs2.3.3.9/ipc/mqueu free_uid(user); } if (ipc_ns) -diff -NurpP --minimal linux-3.4.57/ipc/msg.c linux-3.4.57-vs2.3.3.9/ipc/msg.c ---- linux-3.4.57/ipc/msg.c 2011-05-22 14:17:59.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/ipc/msg.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/ipc/msg.c linux-3.4.83-vs2.3.3.9/ipc/msg.c +--- linux-3.4.83/ipc/msg.c 2011-05-22 14:17:59.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/ipc/msg.c 2012-05-21 16:15:05.000000000 +0000 @@ -37,6 +37,7 @@ #include #include @@ -14079,9 +14079,9 @@ diff -NurpP --minimal linux-3.4.57/ipc/msg.c linux-3.4.57-vs2.3.3.9/ipc/msg.c msq->q_perm.security = NULL; retval = security_msg_queue_alloc(msq); -diff -NurpP --minimal linux-3.4.57/ipc/namespace.c linux-3.4.57-vs2.3.3.9/ipc/namespace.c ---- linux-3.4.57/ipc/namespace.c 2011-07-22 09:18:12.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/ipc/namespace.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/ipc/namespace.c linux-3.4.83-vs2.3.3.9/ipc/namespace.c +--- linux-3.4.83/ipc/namespace.c 2011-07-22 09:18:12.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/ipc/namespace.c 2012-05-21 16:15:05.000000000 +0000 @@ -13,11 +13,12 @@ #include #include @@ -14122,9 +14122,9 @@ diff -NurpP --minimal linux-3.4.57/ipc/namespace.c linux-3.4.57-vs2.3.3.9/ipc/na } /* -diff -NurpP --minimal linux-3.4.57/ipc/sem.c linux-3.4.57-vs2.3.3.9/ipc/sem.c ---- linux-3.4.57/ipc/sem.c 2012-01-09 15:14:59.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/ipc/sem.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/ipc/sem.c linux-3.4.83-vs2.3.3.9/ipc/sem.c +--- linux-3.4.83/ipc/sem.c 2012-01-09 15:14:59.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/ipc/sem.c 2012-05-21 16:15:05.000000000 +0000 @@ -86,6 +86,8 @@ #include #include @@ -14162,9 +14162,9 @@ diff -NurpP --minimal linux-3.4.57/ipc/sem.c linux-3.4.57-vs2.3.3.9/ipc/sem.c security_sem_free(sma); ipc_rcu_putref(sma); } -diff -NurpP --minimal linux-3.4.57/ipc/shm.c linux-3.4.57-vs2.3.3.9/ipc/shm.c ---- linux-3.4.57/ipc/shm.c 2013-08-13 14:13:36.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/ipc/shm.c 2013-07-14 13:38:36.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/ipc/shm.c linux-3.4.83-vs2.3.3.9/ipc/shm.c +--- linux-3.4.83/ipc/shm.c 2014-03-12 09:48:21.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/ipc/shm.c 2013-07-14 13:38:36.000000000 +0000 @@ -39,6 +39,8 @@ #include #include @@ -14220,9 +14220,9 @@ diff -NurpP --minimal linux-3.4.57/ipc/shm.c linux-3.4.57-vs2.3.3.9/ipc/shm.c return error; no_id: -diff -NurpP --minimal linux-3.4.57/kernel/Makefile linux-3.4.57-vs2.3.3.9/kernel/Makefile ---- linux-3.4.57/kernel/Makefile 2012-05-21 16:07:34.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/Makefile 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/Makefile linux-3.4.83-vs2.3.3.9/kernel/Makefile +--- linux-3.4.83/kernel/Makefile 2012-05-21 16:07:34.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/Makefile 2012-05-21 16:15:05.000000000 +0000 @@ -25,6 +25,7 @@ endif obj-y += sched/ obj-y += power/ @@ -14231,9 +14231,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/Makefile linux-3.4.57-vs2.3.3.9/kernel obj-$(CONFIG_FREEZER) += freezer.o obj-$(CONFIG_PROFILING) += profile.o obj-$(CONFIG_STACKTRACE) += stacktrace.o -diff -NurpP --minimal linux-3.4.57/kernel/auditsc.c linux-3.4.57-vs2.3.3.9/kernel/auditsc.c ---- linux-3.4.57/kernel/auditsc.c 2012-03-19 18:47:29.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/auditsc.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/auditsc.c linux-3.4.83-vs2.3.3.9/kernel/auditsc.c +--- linux-3.4.83/kernel/auditsc.c 2012-03-19 18:47:29.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/auditsc.c 2012-05-21 16:15:05.000000000 +0000 @@ -2308,7 +2308,7 @@ int audit_set_loginuid(uid_t loginuid) if (task->loginuid != -1) return -EPERM; @@ -14243,9 +14243,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/auditsc.c linux-3.4.57-vs2.3.3.9/kerne return -EPERM; #endif /* CONFIG_AUDIT_LOGINUID_IMMUTABLE */ -diff -NurpP --minimal linux-3.4.57/kernel/capability.c linux-3.4.57-vs2.3.3.9/kernel/capability.c ---- linux-3.4.57/kernel/capability.c 2012-03-19 18:47:29.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/capability.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/capability.c linux-3.4.83-vs2.3.3.9/kernel/capability.c +--- linux-3.4.83/kernel/capability.c 2012-03-19 18:47:29.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/capability.c 2012-05-21 16:15:05.000000000 +0000 @@ -15,6 +15,7 @@ #include #include @@ -14271,9 +14271,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/capability.c linux-3.4.57-vs2.3.3.9/ke /** * has_capability_noaudit - Does a task have a capability (unaudited) in the * initial user ns -diff -NurpP --minimal linux-3.4.57/kernel/compat.c linux-3.4.57-vs2.3.3.9/kernel/compat.c ---- linux-3.4.57/kernel/compat.c 2012-05-21 16:07:34.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/compat.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/compat.c linux-3.4.83-vs2.3.3.9/kernel/compat.c +--- linux-3.4.83/kernel/compat.c 2012-05-21 16:07:34.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/compat.c 2012-05-21 16:15:05.000000000 +0000 @@ -1054,7 +1054,7 @@ asmlinkage long compat_sys_stime(compat_ if (err) return err; @@ -14283,9 +14283,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/compat.c linux-3.4.57-vs2.3.3.9/kernel return 0; } -diff -NurpP --minimal linux-3.4.57/kernel/cred.c linux-3.4.57-vs2.3.3.9/kernel/cred.c ---- linux-3.4.57/kernel/cred.c 2012-05-21 16:07:34.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/cred.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/cred.c linux-3.4.83-vs2.3.3.9/kernel/cred.c +--- linux-3.4.83/kernel/cred.c 2012-05-21 16:07:34.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/cred.c 2012-05-21 16:15:05.000000000 +0000 @@ -62,31 +62,6 @@ struct cred init_cred = { #endif }; @@ -14355,9 +14355,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/cred.c linux-3.4.57-vs2.3.3.9/kernel/c EXPORT_SYMBOL(prepare_creds); /* -diff -NurpP --minimal linux-3.4.57/kernel/exit.c linux-3.4.57-vs2.3.3.9/kernel/exit.c ---- linux-3.4.57/kernel/exit.c 2013-08-13 14:13:37.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/exit.c 2012-12-08 00:54:06.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/exit.c linux-3.4.83-vs2.3.3.9/kernel/exit.c +--- linux-3.4.83/kernel/exit.c 2014-03-12 09:48:21.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/exit.c 2012-12-08 00:54:06.000000000 +0000 @@ -48,6 +48,10 @@ #include #include @@ -14465,9 +14465,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/exit.c linux-3.4.57-vs2.3.3.9/kernel/e BUG(); /* Avoid "noreturn function does return". */ for (;;) -diff -NurpP --minimal linux-3.4.57/kernel/fork.c linux-3.4.57-vs2.3.3.9/kernel/fork.c ---- linux-3.4.57/kernel/fork.c 2013-08-13 14:13:37.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/fork.c 2012-06-28 14:45:07.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/fork.c linux-3.4.83-vs2.3.3.9/kernel/fork.c +--- linux-3.4.83/kernel/fork.c 2014-03-12 09:48:21.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/fork.c 2014-03-12 09:56:10.000000000 +0000 @@ -68,6 +68,9 @@ #include #include @@ -14519,16 +14519,16 @@ diff -NurpP --minimal linux-3.4.57/kernel/fork.c linux-3.4.57-vs2.3.3.9/kernel/f mm_free_pgd(mm); free_mm(mm); return NULL; -@@ -1125,6 +1134,8 @@ static struct task_struct *copy_process( +@@ -1124,6 +1133,8 @@ static struct task_struct *copy_process( + { int retval; struct task_struct *p; - int cgroup_callbacks_done = 0; + struct vx_info *vxi; + struct nx_info *nxi; if ((clone_flags & (CLONE_NEWNS|CLONE_FS)) == (CLONE_NEWNS|CLONE_FS)) return ERR_PTR(-EINVAL); -@@ -1171,7 +1182,12 @@ static struct task_struct *copy_process( +@@ -1170,7 +1181,12 @@ static struct task_struct *copy_process( DEBUG_LOCKS_WARN_ON(!p->hardirqs_enabled); DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled); #endif @@ -14541,7 +14541,7 @@ diff -NurpP --minimal linux-3.4.57/kernel/fork.c linux-3.4.57-vs2.3.3.9/kernel/f if (atomic_read(&p->real_cred->user->processes) >= task_rlimit(p, RLIMIT_NPROC)) { if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE) && -@@ -1448,6 +1464,18 @@ static struct task_struct *copy_process( +@@ -1441,6 +1457,18 @@ static struct task_struct *copy_process( total_forks++; spin_unlock(¤t->sighand->siglock); @@ -14560,9 +14560,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/fork.c linux-3.4.57-vs2.3.3.9/kernel/f write_unlock_irq(&tasklist_lock); proc_fork_connector(p); cgroup_post_fork(p); -diff -NurpP --minimal linux-3.4.57/kernel/kthread.c linux-3.4.57-vs2.3.3.9/kernel/kthread.c ---- linux-3.4.57/kernel/kthread.c 2013-08-13 14:13:40.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/kthread.c 2012-10-22 13:09:53.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/kthread.c linux-3.4.83-vs2.3.3.9/kernel/kthread.c +--- linux-3.4.83/kernel/kthread.c 2014-03-12 09:48:21.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/kthread.c 2012-10-22 13:09:53.000000000 +0000 @@ -16,6 +16,7 @@ #include #include @@ -14571,9 +14571,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/kthread.c linux-3.4.57-vs2.3.3.9/kerne #include static DEFINE_SPINLOCK(kthread_create_lock); -diff -NurpP --minimal linux-3.4.57/kernel/nsproxy.c linux-3.4.57-vs2.3.3.9/kernel/nsproxy.c ---- linux-3.4.57/kernel/nsproxy.c 2012-01-09 15:15:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/nsproxy.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/nsproxy.c linux-3.4.83-vs2.3.3.9/kernel/nsproxy.c +--- linux-3.4.83/kernel/nsproxy.c 2012-01-09 15:15:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/nsproxy.c 2012-05-21 16:15:05.000000000 +0000 @@ -20,11 +20,14 @@ #include #include @@ -14755,9 +14755,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/nsproxy.c linux-3.4.57-vs2.3.3.9/kerne return -EPERM; *new_nsp = create_new_namespaces(unshare_flags, current, -diff -NurpP --minimal linux-3.4.57/kernel/pid.c linux-3.4.57-vs2.3.3.9/kernel/pid.c ---- linux-3.4.57/kernel/pid.c 2012-03-19 18:47:30.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/pid.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/pid.c linux-3.4.83-vs2.3.3.9/kernel/pid.c +--- linux-3.4.83/kernel/pid.c 2012-03-19 18:47:30.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/pid.c 2012-05-21 16:15:05.000000000 +0000 @@ -36,6 +36,7 @@ #include #include @@ -14815,9 +14815,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/pid.c linux-3.4.57-vs2.3.3.9/kernel/pi pid_t pid_vnr(struct pid *pid) { return pid_nr_ns(pid, current->nsproxy->pid_ns); -diff -NurpP --minimal linux-3.4.57/kernel/pid_namespace.c linux-3.4.57-vs2.3.3.9/kernel/pid_namespace.c ---- linux-3.4.57/kernel/pid_namespace.c 2012-05-21 16:07:34.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/pid_namespace.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/pid_namespace.c linux-3.4.83-vs2.3.3.9/kernel/pid_namespace.c +--- linux-3.4.83/kernel/pid_namespace.c 2012-05-21 16:07:34.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/pid_namespace.c 2012-05-21 16:15:05.000000000 +0000 @@ -16,6 +16,7 @@ #include #include @@ -14842,9 +14842,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/pid_namespace.c linux-3.4.57-vs2.3.3.9 kmem_cache_free(pid_ns_cachep, ns); } -diff -NurpP --minimal linux-3.4.57/kernel/posix-timers.c linux-3.4.57-vs2.3.3.9/kernel/posix-timers.c ---- linux-3.4.57/kernel/posix-timers.c 2013-08-13 14:13:41.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/posix-timers.c 2013-03-30 21:29:17.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/posix-timers.c linux-3.4.83-vs2.3.3.9/kernel/posix-timers.c +--- linux-3.4.83/kernel/posix-timers.c 2014-03-12 09:48:21.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/posix-timers.c 2013-03-30 21:29:17.000000000 +0000 @@ -47,6 +47,7 @@ #include #include @@ -14880,9 +14880,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/posix-timers.c linux-3.4.57-vs2.3.3.9/ /* If we failed to send the signal the timer stops. */ return ret > 0; } -diff -NurpP --minimal linux-3.4.57/kernel/printk.c linux-3.4.57-vs2.3.3.9/kernel/printk.c ---- linux-3.4.57/kernel/printk.c 2013-08-13 14:13:41.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/printk.c 2013-03-02 15:26:44.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/printk.c linux-3.4.83-vs2.3.3.9/kernel/printk.c +--- linux-3.4.83/kernel/printk.c 2014-03-12 09:48:21.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/printk.c 2014-03-12 09:55:28.000000000 +0000 @@ -41,6 +41,7 @@ #include #include @@ -14950,9 +14950,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/printk.c linux-3.4.57-vs2.3.3.9/kernel count = len; if (count > log_buf_len) count = log_buf_len; -diff -NurpP --minimal linux-3.4.57/kernel/ptrace.c linux-3.4.57-vs2.3.3.9/kernel/ptrace.c ---- linux-3.4.57/kernel/ptrace.c 2013-08-13 14:13:41.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/ptrace.c 2013-02-11 23:37:30.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/ptrace.c linux-3.4.83-vs2.3.3.9/kernel/ptrace.c +--- linux-3.4.83/kernel/ptrace.c 2014-03-12 09:48:21.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/ptrace.c 2014-03-12 09:55:28.000000000 +0000 @@ -22,6 +22,7 @@ #include #include @@ -14961,9 +14961,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/ptrace.c linux-3.4.57-vs2.3.3.9/kernel #include #include -@@ -256,6 +257,11 @@ ok: - dumpable = get_dumpable(task->mm); - if (!dumpable && !ptrace_has_cap(task_user_ns(task), mode)) +@@ -257,6 +258,11 @@ ok: + if (dumpable != SUID_DUMP_USER && + !ptrace_has_cap(task_user_ns(task), mode)) return -EPERM; + if (!vx_check(task->xid, VS_ADMIN_P|VS_WATCH_P|VS_IDENT)) + return -EPERM; @@ -14973,9 +14973,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/ptrace.c linux-3.4.57-vs2.3.3.9/kernel return security_ptrace_access_check(task, mode); } -diff -NurpP --minimal linux-3.4.57/kernel/sched/core.c linux-3.4.57-vs2.3.3.9/kernel/sched/core.c ---- linux-3.4.57/kernel/sched/core.c 2013-08-13 14:13:41.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/sched/core.c 2013-07-14 13:38:36.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/sched/core.c linux-3.4.83-vs2.3.3.9/kernel/sched/core.c +--- linux-3.4.83/kernel/sched/core.c 2014-03-12 09:48:22.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/sched/core.c 2014-03-12 09:55:28.000000000 +0000 @@ -72,6 +72,8 @@ #include #include @@ -14985,7 +14985,7 @@ diff -NurpP --minimal linux-3.4.57/kernel/sched/core.c linux-3.4.57-vs2.3.3.9/ke #include #include -@@ -2228,9 +2230,17 @@ EXPORT_SYMBOL(avenrun); /* should be rem +@@ -2226,9 +2228,17 @@ EXPORT_SYMBOL(avenrun); /* should be rem */ void get_avenrun(unsigned long *loads, unsigned long offset, int shift) { @@ -15006,7 +15006,7 @@ diff -NurpP --minimal linux-3.4.57/kernel/sched/core.c linux-3.4.57-vs2.3.3.9/ke } static long calc_load_fold_active(struct rq *this_rq) -@@ -2799,14 +2809,17 @@ static inline void task_group_account_fi +@@ -2857,14 +2867,17 @@ static inline void task_group_account_fi void account_user_time(struct task_struct *p, cputime_t cputime, cputime_t cputime_scaled) { @@ -15025,7 +15025,7 @@ diff -NurpP --minimal linux-3.4.57/kernel/sched/core.c linux-3.4.57-vs2.3.3.9/ke /* Add user time to cpustat. */ task_group_account_field(p, index, (__force u64) cputime); -@@ -2853,9 +2866,12 @@ static inline +@@ -2911,9 +2924,12 @@ static inline void __account_system_time(struct task_struct *p, cputime_t cputime, cputime_t cputime_scaled, int index) { @@ -15038,7 +15038,7 @@ diff -NurpP --minimal linux-3.4.57/kernel/sched/core.c linux-3.4.57-vs2.3.3.9/ke account_group_system_time(p, cputime); /* Add system time to cpustat. */ -@@ -4081,7 +4097,7 @@ SYSCALL_DEFINE1(nice, int, increment) +@@ -4139,7 +4155,7 @@ SYSCALL_DEFINE1(nice, int, increment) nice = 19; if (increment < 0 && !can_nice(current, nice)) @@ -15047,9 +15047,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/sched/core.c linux-3.4.57-vs2.3.3.9/ke retval = security_task_setnice(current, nice); if (retval) -diff -NurpP --minimal linux-3.4.57/kernel/sched/fair.c linux-3.4.57-vs2.3.3.9/kernel/sched/fair.c ---- linux-3.4.57/kernel/sched/fair.c 2013-08-13 14:13:41.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/sched/fair.c 2013-08-13 17:07:37.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/sched/fair.c linux-3.4.83-vs2.3.3.9/kernel/sched/fair.c +--- linux-3.4.83/kernel/sched/fair.c 2014-03-12 09:48:22.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/sched/fair.c 2014-03-12 09:55:28.000000000 +0000 @@ -26,6 +26,7 @@ #include #include @@ -15076,9 +15076,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/sched/fair.c linux-3.4.57-vs2.3.3.9/ke update_cfs_load(cfs_rq, 0); account_entity_dequeue(cfs_rq, se); -diff -NurpP --minimal linux-3.4.57/kernel/signal.c linux-3.4.57-vs2.3.3.9/kernel/signal.c ---- linux-3.4.57/kernel/signal.c 2013-08-13 14:13:41.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/signal.c 2013-07-14 13:38:36.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/signal.c linux-3.4.83-vs2.3.3.9/kernel/signal.c +--- linux-3.4.83/kernel/signal.c 2014-03-12 09:48:22.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/signal.c 2013-07-14 13:38:36.000000000 +0000 @@ -29,6 +29,8 @@ #include #include @@ -15171,9 +15171,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/signal.c linux-3.4.57-vs2.3.3.9/kernel if (sig_kernel_stop(signr)) { /* * The default action is to stop all threads in -diff -NurpP --minimal linux-3.4.57/kernel/softirq.c linux-3.4.57-vs2.3.3.9/kernel/softirq.c ---- linux-3.4.57/kernel/softirq.c 2012-05-21 16:07:34.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/softirq.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/softirq.c linux-3.4.83-vs2.3.3.9/kernel/softirq.c +--- linux-3.4.83/kernel/softirq.c 2012-05-21 16:07:34.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/softirq.c 2012-05-21 16:15:05.000000000 +0000 @@ -24,6 +24,7 @@ #include #include @@ -15182,9 +15182,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/softirq.c linux-3.4.57-vs2.3.3.9/kerne #define CREATE_TRACE_POINTS #include -diff -NurpP --minimal linux-3.4.57/kernel/sys.c linux-3.4.57-vs2.3.3.9/kernel/sys.c ---- linux-3.4.57/kernel/sys.c 2013-08-13 14:13:41.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/sys.c 2013-07-14 13:38:36.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/sys.c linux-3.4.83-vs2.3.3.9/kernel/sys.c +--- linux-3.4.83/kernel/sys.c 2014-03-12 09:48:22.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/sys.c 2013-07-14 13:38:36.000000000 +0000 @@ -45,6 +45,7 @@ #include #include @@ -15281,9 +15281,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/sys.c linux-3.4.57-vs2.3.3.9/kernel/sy return 0; return -EPERM; -diff -NurpP --minimal linux-3.4.57/kernel/sysctl.c linux-3.4.57-vs2.3.3.9/kernel/sysctl.c ---- linux-3.4.57/kernel/sysctl.c 2012-05-21 16:07:34.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/sysctl.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/sysctl.c linux-3.4.83-vs2.3.3.9/kernel/sysctl.c +--- linux-3.4.83/kernel/sysctl.c 2012-05-21 16:07:34.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/sysctl.c 2012-05-21 16:15:05.000000000 +0000 @@ -81,6 +81,7 @@ #if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_LOCK_STAT) #include @@ -15306,9 +15306,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/sysctl.c linux-3.4.57-vs2.3.3.9/kernel #ifdef CONFIG_CHR_DEV_SG { .procname = "sg-big-buff", -diff -NurpP --minimal linux-3.4.57/kernel/sysctl_binary.c linux-3.4.57-vs2.3.3.9/kernel/sysctl_binary.c ---- linux-3.4.57/kernel/sysctl_binary.c 2013-08-13 14:13:41.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/sysctl_binary.c 2013-03-30 21:29:17.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/sysctl_binary.c linux-3.4.83-vs2.3.3.9/kernel/sysctl_binary.c +--- linux-3.4.83/kernel/sysctl_binary.c 2014-03-12 09:48:22.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/sysctl_binary.c 2013-03-30 21:29:17.000000000 +0000 @@ -73,6 +73,7 @@ static const struct bin_table bin_kern_t { CTL_INT, KERN_PANIC, "panic" }, @@ -15317,9 +15317,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/sysctl_binary.c linux-3.4.57-vs2.3.3.9 { CTL_STR, KERN_SPARC_REBOOT, "reboot-cmd" }, { CTL_INT, KERN_CTLALTDEL, "ctrl-alt-del" }, -diff -NurpP --minimal linux-3.4.57/kernel/time/timekeeping.c linux-3.4.57-vs2.3.3.9/kernel/time/timekeeping.c ---- linux-3.4.57/kernel/time/timekeeping.c 2013-08-13 14:13:41.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/time/timekeeping.c 2012-12-08 00:53:53.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/time/timekeeping.c linux-3.4.83-vs2.3.3.9/kernel/time/timekeeping.c +--- linux-3.4.83/kernel/time/timekeeping.c 2014-03-12 09:48:22.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/time/timekeeping.c 2014-03-12 09:55:28.000000000 +0000 @@ -254,6 +254,7 @@ void getnstimeofday(struct timespec *ts) } while (read_seqretry(&timekeeper.lock, seq)); @@ -15328,9 +15328,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/time/timekeeping.c linux-3.4.57-vs2.3. } EXPORT_SYMBOL(getnstimeofday); -diff -NurpP --minimal linux-3.4.57/kernel/time.c linux-3.4.57-vs2.3.3.9/kernel/time.c ---- linux-3.4.57/kernel/time.c 2012-05-21 16:07:34.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/time.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/time.c linux-3.4.83-vs2.3.3.9/kernel/time.c +--- linux-3.4.83/kernel/time.c 2012-05-21 16:07:34.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/time.c 2012-05-21 16:15:05.000000000 +0000 @@ -92,7 +92,7 @@ SYSCALL_DEFINE1(stime, time_t __user *, if (err) return err; @@ -15349,9 +15349,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/time.c linux-3.4.57-vs2.3.3.9/kernel/t return 0; } -diff -NurpP --minimal linux-3.4.57/kernel/timer.c linux-3.4.57-vs2.3.3.9/kernel/timer.c ---- linux-3.4.57/kernel/timer.c 2013-08-13 14:13:41.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/timer.c 2013-08-13 17:07:37.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/timer.c linux-3.4.83-vs2.3.3.9/kernel/timer.c +--- linux-3.4.83/kernel/timer.c 2014-03-12 09:48:22.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/timer.c 2013-08-13 17:07:37.000000000 +0000 @@ -40,6 +40,10 @@ #include #include @@ -15401,9 +15401,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/timer.c linux-3.4.57-vs2.3.3.9/kernel/ SYSCALL_DEFINE0(getuid) { /* Only we change this so SMP safe */ -diff -NurpP --minimal linux-3.4.57/kernel/user_namespace.c linux-3.4.57-vs2.3.3.9/kernel/user_namespace.c ---- linux-3.4.57/kernel/user_namespace.c 2012-01-09 15:15:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/user_namespace.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/user_namespace.c linux-3.4.83-vs2.3.3.9/kernel/user_namespace.c +--- linux-3.4.83/kernel/user_namespace.c 2012-01-09 15:15:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/user_namespace.c 2012-05-21 16:15:05.000000000 +0000 @@ -11,6 +11,7 @@ #include #include @@ -15429,9 +15429,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/user_namespace.c linux-3.4.57-vs2.3.3. INIT_WORK(&ns->destroyer, free_user_ns_work); schedule_work(&ns->destroyer); } -diff -NurpP --minimal linux-3.4.57/kernel/utsname.c linux-3.4.57-vs2.3.3.9/kernel/utsname.c ---- linux-3.4.57/kernel/utsname.c 2012-01-09 15:15:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/utsname.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/utsname.c linux-3.4.83-vs2.3.3.9/kernel/utsname.c +--- linux-3.4.83/kernel/utsname.c 2012-01-09 15:15:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/utsname.c 2012-05-21 16:15:05.000000000 +0000 @@ -16,14 +16,17 @@ #include #include @@ -15500,9 +15500,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/utsname.c linux-3.4.57-vs2.3.3.9/kerne kfree(ns); } -diff -NurpP --minimal linux-3.4.57/kernel/vserver/Kconfig linux-3.4.57-vs2.3.3.9/kernel/vserver/Kconfig ---- linux-3.4.57/kernel/vserver/Kconfig 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/vserver/Kconfig 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/vserver/Kconfig linux-3.4.83-vs2.3.3.9/kernel/vserver/Kconfig +--- linux-3.4.83/kernel/vserver/Kconfig 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/vserver/Kconfig 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,224 @@ +# +# Linux VServer configuration @@ -15728,9 +15728,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/vserver/Kconfig linux-3.4.57-vs2.3.3.9 + bool + default n + -diff -NurpP --minimal linux-3.4.57/kernel/vserver/Makefile linux-3.4.57-vs2.3.3.9/kernel/vserver/Makefile ---- linux-3.4.57/kernel/vserver/Makefile 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/vserver/Makefile 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/vserver/Makefile linux-3.4.83-vs2.3.3.9/kernel/vserver/Makefile +--- linux-3.4.83/kernel/vserver/Makefile 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/vserver/Makefile 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,18 @@ +# +# Makefile for the Linux vserver routines. @@ -15750,9 +15750,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/vserver/Makefile linux-3.4.57-vs2.3.3. +vserver-$(CONFIG_VSERVER_MONITOR) += monitor.o +vserver-$(CONFIG_VSERVER_DEVICE) += device.o + -diff -NurpP --minimal linux-3.4.57/kernel/vserver/cacct.c linux-3.4.57-vs2.3.3.9/kernel/vserver/cacct.c ---- linux-3.4.57/kernel/vserver/cacct.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/vserver/cacct.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/vserver/cacct.c linux-3.4.83-vs2.3.3.9/kernel/vserver/cacct.c +--- linux-3.4.83/kernel/vserver/cacct.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/vserver/cacct.c 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,42 @@ +/* + * linux/kernel/vserver/cacct.c @@ -15796,9 +15796,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/vserver/cacct.c linux-3.4.57-vs2.3.3.9 + return 0; +} + -diff -NurpP --minimal linux-3.4.57/kernel/vserver/cacct_init.h linux-3.4.57-vs2.3.3.9/kernel/vserver/cacct_init.h ---- linux-3.4.57/kernel/vserver/cacct_init.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/vserver/cacct_init.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/vserver/cacct_init.h linux-3.4.83-vs2.3.3.9/kernel/vserver/cacct_init.h +--- linux-3.4.83/kernel/vserver/cacct_init.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/vserver/cacct_init.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,25 @@ + + @@ -15825,9 +15825,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/vserver/cacct_init.h linux-3.4.57-vs2. + return; +} + -diff -NurpP --minimal linux-3.4.57/kernel/vserver/cacct_proc.h linux-3.4.57-vs2.3.3.9/kernel/vserver/cacct_proc.h ---- linux-3.4.57/kernel/vserver/cacct_proc.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/vserver/cacct_proc.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/vserver/cacct_proc.h linux-3.4.83-vs2.3.3.9/kernel/vserver/cacct_proc.h +--- linux-3.4.83/kernel/vserver/cacct_proc.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/vserver/cacct_proc.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,53 @@ +#ifndef _VX_CACCT_PROC_H +#define _VX_CACCT_PROC_H @@ -15882,9 +15882,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/vserver/cacct_proc.h linux-3.4.57-vs2. +} + +#endif /* _VX_CACCT_PROC_H */ -diff -NurpP --minimal linux-3.4.57/kernel/vserver/context.c linux-3.4.57-vs2.3.3.9/kernel/vserver/context.c ---- linux-3.4.57/kernel/vserver/context.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/vserver/context.c 2012-06-28 14:45:48.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/vserver/context.c linux-3.4.83-vs2.3.3.9/kernel/vserver/context.c +--- linux-3.4.83/kernel/vserver/context.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/vserver/context.c 2012-06-28 14:45:48.000000000 +0000 @@ -0,0 +1,1119 @@ +/* + * linux/kernel/vserver/context.c @@ -17005,9 +17005,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/vserver/context.c linux-3.4.57-vs2.3.3 + +EXPORT_SYMBOL_GPL(free_vx_info); + -diff -NurpP --minimal linux-3.4.57/kernel/vserver/cvirt.c linux-3.4.57-vs2.3.3.9/kernel/vserver/cvirt.c ---- linux-3.4.57/kernel/vserver/cvirt.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/vserver/cvirt.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/vserver/cvirt.c linux-3.4.83-vs2.3.3.9/kernel/vserver/cvirt.c +--- linux-3.4.83/kernel/vserver/cvirt.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/vserver/cvirt.c 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,313 @@ +/* + * linux/kernel/vserver/cvirt.c @@ -17322,9 +17322,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/vserver/cvirt.c linux-3.4.57-vs2.3.3.9 + +#endif + -diff -NurpP --minimal linux-3.4.57/kernel/vserver/cvirt_init.h linux-3.4.57-vs2.3.3.9/kernel/vserver/cvirt_init.h ---- linux-3.4.57/kernel/vserver/cvirt_init.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/vserver/cvirt_init.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/vserver/cvirt_init.h linux-3.4.83-vs2.3.3.9/kernel/vserver/cvirt_init.h +--- linux-3.4.83/kernel/vserver/cvirt_init.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/vserver/cvirt_init.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,70 @@ + + @@ -17396,9 +17396,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/vserver/cvirt_init.h linux-3.4.57-vs2. + return; +} + -diff -NurpP --minimal linux-3.4.57/kernel/vserver/cvirt_proc.h linux-3.4.57-vs2.3.3.9/kernel/vserver/cvirt_proc.h ---- linux-3.4.57/kernel/vserver/cvirt_proc.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/vserver/cvirt_proc.h 2013-08-13 17:48:39.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/vserver/cvirt_proc.h linux-3.4.83-vs2.3.3.9/kernel/vserver/cvirt_proc.h +--- linux-3.4.83/kernel/vserver/cvirt_proc.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/vserver/cvirt_proc.h 2013-08-13 17:48:39.000000000 +0000 @@ -0,0 +1,123 @@ +#ifndef _VX_CVIRT_PROC_H +#define _VX_CVIRT_PROC_H @@ -17523,9 +17523,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/vserver/cvirt_proc.h linux-3.4.57-vs2. +} + +#endif /* _VX_CVIRT_PROC_H */ -diff -NurpP --minimal linux-3.4.57/kernel/vserver/debug.c linux-3.4.57-vs2.3.3.9/kernel/vserver/debug.c ---- linux-3.4.57/kernel/vserver/debug.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/vserver/debug.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/vserver/debug.c linux-3.4.83-vs2.3.3.9/kernel/vserver/debug.c +--- linux-3.4.83/kernel/vserver/debug.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/vserver/debug.c 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,32 @@ +/* + * kernel/vserver/debug.c @@ -17559,9 +17559,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/vserver/debug.c linux-3.4.57-vs2.3.3.9 + +EXPORT_SYMBOL_GPL(dump_vx_info); + -diff -NurpP --minimal linux-3.4.57/kernel/vserver/device.c linux-3.4.57-vs2.3.3.9/kernel/vserver/device.c ---- linux-3.4.57/kernel/vserver/device.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/vserver/device.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/vserver/device.c linux-3.4.83-vs2.3.3.9/kernel/vserver/device.c +--- linux-3.4.83/kernel/vserver/device.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/vserver/device.c 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,443 @@ +/* + * linux/kernel/vserver/device.c @@ -18006,9 +18006,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/vserver/device.c linux-3.4.57-vs2.3.3. +#endif /* CONFIG_COMPAT */ + + -diff -NurpP --minimal linux-3.4.57/kernel/vserver/dlimit.c linux-3.4.57-vs2.3.3.9/kernel/vserver/dlimit.c ---- linux-3.4.57/kernel/vserver/dlimit.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/vserver/dlimit.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/vserver/dlimit.c linux-3.4.83-vs2.3.3.9/kernel/vserver/dlimit.c +--- linux-3.4.83/kernel/vserver/dlimit.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/vserver/dlimit.c 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,531 @@ +/* + * linux/kernel/vserver/dlimit.c @@ -18541,9 +18541,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/vserver/dlimit.c linux-3.4.57-vs2.3.3. +EXPORT_SYMBOL_GPL(locate_dl_info); +EXPORT_SYMBOL_GPL(rcu_free_dl_info); + -diff -NurpP --minimal linux-3.4.57/kernel/vserver/helper.c linux-3.4.57-vs2.3.3.9/kernel/vserver/helper.c ---- linux-3.4.57/kernel/vserver/helper.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/vserver/helper.c 2012-09-16 18:49:44.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/vserver/helper.c linux-3.4.83-vs2.3.3.9/kernel/vserver/helper.c +--- linux-3.4.83/kernel/vserver/helper.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/vserver/helper.c 2012-09-16 18:49:44.000000000 +0000 @@ -0,0 +1,229 @@ +/* + * linux/kernel/vserver/helper.c @@ -18774,9 +18774,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/vserver/helper.c linux-3.4.57-vs2.3.3. + return do_vshelper(vshelper_path, argv, envp, 1); +} + -diff -NurpP --minimal linux-3.4.57/kernel/vserver/history.c linux-3.4.57-vs2.3.3.9/kernel/vserver/history.c ---- linux-3.4.57/kernel/vserver/history.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/vserver/history.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/vserver/history.c linux-3.4.83-vs2.3.3.9/kernel/vserver/history.c +--- linux-3.4.83/kernel/vserver/history.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/vserver/history.c 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,258 @@ +/* + * kernel/vserver/history.c @@ -19036,9 +19036,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/vserver/history.c linux-3.4.57-vs2.3.3 + +#endif /* CONFIG_COMPAT */ + -diff -NurpP --minimal linux-3.4.57/kernel/vserver/inet.c linux-3.4.57-vs2.3.3.9/kernel/vserver/inet.c ---- linux-3.4.57/kernel/vserver/inet.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/vserver/inet.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/vserver/inet.c linux-3.4.83-vs2.3.3.9/kernel/vserver/inet.c +--- linux-3.4.83/kernel/vserver/inet.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/vserver/inet.c 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,226 @@ + +#include @@ -19266,9 +19266,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/vserver/inet.c linux-3.4.57-vs2.3.3.9/ + +EXPORT_SYMBOL_GPL(ip_v4_find_src); + -diff -NurpP --minimal linux-3.4.57/kernel/vserver/init.c linux-3.4.57-vs2.3.3.9/kernel/vserver/init.c ---- linux-3.4.57/kernel/vserver/init.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/vserver/init.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/vserver/init.c linux-3.4.83-vs2.3.3.9/kernel/vserver/init.c +--- linux-3.4.83/kernel/vserver/init.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/vserver/init.c 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,45 @@ +/* + * linux/kernel/init.c @@ -19315,9 +19315,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/vserver/init.c linux-3.4.57-vs2.3.3.9/ +module_init(init_vserver); +module_exit(exit_vserver); + -diff -NurpP --minimal linux-3.4.57/kernel/vserver/inode.c linux-3.4.57-vs2.3.3.9/kernel/vserver/inode.c ---- linux-3.4.57/kernel/vserver/inode.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/vserver/inode.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/vserver/inode.c linux-3.4.83-vs2.3.3.9/kernel/vserver/inode.c +--- linux-3.4.83/kernel/vserver/inode.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/vserver/inode.c 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,437 @@ +/* + * linux/kernel/vserver/inode.c @@ -19756,9 +19756,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/vserver/inode.c linux-3.4.57-vs2.3.3.9 + +#endif /* CONFIG_PROPAGATE */ + -diff -NurpP --minimal linux-3.4.57/kernel/vserver/limit.c linux-3.4.57-vs2.3.3.9/kernel/vserver/limit.c ---- linux-3.4.57/kernel/vserver/limit.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/vserver/limit.c 2012-09-01 09:15:21.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/vserver/limit.c linux-3.4.83-vs2.3.3.9/kernel/vserver/limit.c +--- linux-3.4.83/kernel/vserver/limit.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/vserver/limit.c 2012-09-01 09:15:21.000000000 +0000 @@ -0,0 +1,345 @@ +/* + * linux/kernel/vserver/limit.c @@ -20105,9 +20105,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/vserver/limit.c linux-3.4.57-vs2.3.3.9 + return cache; +} + -diff -NurpP --minimal linux-3.4.57/kernel/vserver/limit_init.h linux-3.4.57-vs2.3.3.9/kernel/vserver/limit_init.h ---- linux-3.4.57/kernel/vserver/limit_init.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/vserver/limit_init.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/vserver/limit_init.h linux-3.4.83-vs2.3.3.9/kernel/vserver/limit_init.h +--- linux-3.4.83/kernel/vserver/limit_init.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/vserver/limit_init.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,31 @@ + + @@ -20140,9 +20140,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/vserver/limit_init.h linux-3.4.57-vs2. + } +} + -diff -NurpP --minimal linux-3.4.57/kernel/vserver/limit_proc.h linux-3.4.57-vs2.3.3.9/kernel/vserver/limit_proc.h ---- linux-3.4.57/kernel/vserver/limit_proc.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/vserver/limit_proc.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/vserver/limit_proc.h linux-3.4.83-vs2.3.3.9/kernel/vserver/limit_proc.h +--- linux-3.4.83/kernel/vserver/limit_proc.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/vserver/limit_proc.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,57 @@ +#ifndef _VX_LIMIT_PROC_H +#define _VX_LIMIT_PROC_H @@ -20201,9 +20201,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/vserver/limit_proc.h linux-3.4.57-vs2. +#endif /* _VX_LIMIT_PROC_H */ + + -diff -NurpP --minimal linux-3.4.57/kernel/vserver/network.c linux-3.4.57-vs2.3.3.9/kernel/vserver/network.c ---- linux-3.4.57/kernel/vserver/network.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/vserver/network.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/vserver/network.c linux-3.4.83-vs2.3.3.9/kernel/vserver/network.c +--- linux-3.4.83/kernel/vserver/network.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/vserver/network.c 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,912 @@ +/* + * linux/kernel/vserver/network.c @@ -21117,9 +21117,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/vserver/network.c linux-3.4.57-vs2.3.3 +EXPORT_SYMBOL_GPL(free_nx_info); +EXPORT_SYMBOL_GPL(unhash_nx_info); + -diff -NurpP --minimal linux-3.4.57/kernel/vserver/proc.c linux-3.4.57-vs2.3.3.9/kernel/vserver/proc.c ---- linux-3.4.57/kernel/vserver/proc.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/vserver/proc.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/vserver/proc.c linux-3.4.83-vs2.3.3.9/kernel/vserver/proc.c +--- linux-3.4.83/kernel/vserver/proc.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/vserver/proc.c 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,1103 @@ +/* + * linux/kernel/vserver/proc.c @@ -22224,9 +22224,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/vserver/proc.c linux-3.4.57-vs2.3.3.9/ + return buffer - orig; +} + -diff -NurpP --minimal linux-3.4.57/kernel/vserver/sched.c linux-3.4.57-vs2.3.3.9/kernel/vserver/sched.c ---- linux-3.4.57/kernel/vserver/sched.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/vserver/sched.c 2012-05-21 16:25:11.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/vserver/sched.c linux-3.4.83-vs2.3.3.9/kernel/vserver/sched.c +--- linux-3.4.83/kernel/vserver/sched.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/vserver/sched.c 2012-05-21 16:25:11.000000000 +0000 @@ -0,0 +1,83 @@ +/* + * linux/kernel/vserver/sched.c @@ -22311,9 +22311,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/vserver/sched.c linux-3.4.57-vs2.3.3.9 + return 0; +} + -diff -NurpP --minimal linux-3.4.57/kernel/vserver/sched_init.h linux-3.4.57-vs2.3.3.9/kernel/vserver/sched_init.h ---- linux-3.4.57/kernel/vserver/sched_init.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/vserver/sched_init.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/vserver/sched_init.h linux-3.4.83-vs2.3.3.9/kernel/vserver/sched_init.h +--- linux-3.4.83/kernel/vserver/sched_init.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/vserver/sched_init.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,27 @@ + +static inline void vx_info_init_sched(struct _vx_sched *sched) @@ -22342,9 +22342,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/vserver/sched_init.h linux-3.4.57-vs2. +{ + return; +} -diff -NurpP --minimal linux-3.4.57/kernel/vserver/sched_proc.h linux-3.4.57-vs2.3.3.9/kernel/vserver/sched_proc.h ---- linux-3.4.57/kernel/vserver/sched_proc.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/vserver/sched_proc.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/vserver/sched_proc.h linux-3.4.83-vs2.3.3.9/kernel/vserver/sched_proc.h +--- linux-3.4.83/kernel/vserver/sched_proc.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/vserver/sched_proc.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,32 @@ +#ifndef _VX_SCHED_PROC_H +#define _VX_SCHED_PROC_H @@ -22378,9 +22378,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/vserver/sched_proc.h linux-3.4.57-vs2. +} + +#endif /* _VX_SCHED_PROC_H */ -diff -NurpP --minimal linux-3.4.57/kernel/vserver/signal.c linux-3.4.57-vs2.3.3.9/kernel/vserver/signal.c ---- linux-3.4.57/kernel/vserver/signal.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/vserver/signal.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/vserver/signal.c linux-3.4.83-vs2.3.3.9/kernel/vserver/signal.c +--- linux-3.4.83/kernel/vserver/signal.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/vserver/signal.c 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,134 @@ +/* + * linux/kernel/vserver/signal.c @@ -22516,9 +22516,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/vserver/signal.c linux-3.4.57-vs2.3.3. + return ret; +} + -diff -NurpP --minimal linux-3.4.57/kernel/vserver/space.c linux-3.4.57-vs2.3.3.9/kernel/vserver/space.c ---- linux-3.4.57/kernel/vserver/space.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/vserver/space.c 2013-02-12 00:16:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/vserver/space.c linux-3.4.83-vs2.3.3.9/kernel/vserver/space.c +--- linux-3.4.83/kernel/vserver/space.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/vserver/space.c 2013-02-12 00:16:04.000000000 +0000 @@ -0,0 +1,436 @@ +/* + * linux/kernel/vserver/space.c @@ -22956,9 +22956,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/vserver/space.c linux-3.4.57-vs2.3.3.9 + return 0; +} + -diff -NurpP --minimal linux-3.4.57/kernel/vserver/switch.c linux-3.4.57-vs2.3.3.9/kernel/vserver/switch.c ---- linux-3.4.57/kernel/vserver/switch.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/vserver/switch.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/vserver/switch.c linux-3.4.83-vs2.3.3.9/kernel/vserver/switch.c +--- linux-3.4.83/kernel/vserver/switch.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/vserver/switch.c 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,556 @@ +/* + * linux/kernel/vserver/switch.c @@ -23516,9 +23516,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/vserver/switch.c linux-3.4.57-vs2.3.3. +} + +#endif /* CONFIG_COMPAT */ -diff -NurpP --minimal linux-3.4.57/kernel/vserver/sysctl.c linux-3.4.57-vs2.3.3.9/kernel/vserver/sysctl.c ---- linux-3.4.57/kernel/vserver/sysctl.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/vserver/sysctl.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/vserver/sysctl.c linux-3.4.83-vs2.3.3.9/kernel/vserver/sysctl.c +--- linux-3.4.83/kernel/vserver/sysctl.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/vserver/sysctl.c 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,247 @@ +/* + * kernel/vserver/sysctl.c @@ -23767,9 +23767,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/vserver/sysctl.c linux-3.4.57-vs2.3.3. +EXPORT_SYMBOL_GPL(vs_debug_perm); +EXPORT_SYMBOL_GPL(vs_debug_misc); + -diff -NurpP --minimal linux-3.4.57/kernel/vserver/tag.c linux-3.4.57-vs2.3.3.9/kernel/vserver/tag.c ---- linux-3.4.57/kernel/vserver/tag.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/vserver/tag.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/vserver/tag.c linux-3.4.83-vs2.3.3.9/kernel/vserver/tag.c +--- linux-3.4.83/kernel/vserver/tag.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/vserver/tag.c 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,63 @@ +/* + * linux/kernel/vserver/tag.c @@ -23834,9 +23834,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/vserver/tag.c linux-3.4.57-vs2.3.3.9/k +} + + -diff -NurpP --minimal linux-3.4.57/kernel/vserver/vci_config.h linux-3.4.57-vs2.3.3.9/kernel/vserver/vci_config.h ---- linux-3.4.57/kernel/vserver/vci_config.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/kernel/vserver/vci_config.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/kernel/vserver/vci_config.h linux-3.4.83-vs2.3.3.9/kernel/vserver/vci_config.h +--- linux-3.4.83/kernel/vserver/vci_config.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/kernel/vserver/vci_config.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,76 @@ + +/* interface version */ @@ -23914,9 +23914,9 @@ diff -NurpP --minimal linux-3.4.57/kernel/vserver/vci_config.h linux-3.4.57-vs2. + 0; +} + -diff -NurpP --minimal linux-3.4.57/mm/memcontrol.c linux-3.4.57-vs2.3.3.9/mm/memcontrol.c ---- linux-3.4.57/mm/memcontrol.c 2013-08-13 14:13:42.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/mm/memcontrol.c 2012-12-08 00:53:53.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/mm/memcontrol.c linux-3.4.83-vs2.3.3.9/mm/memcontrol.c +--- linux-3.4.83/mm/memcontrol.c 2014-03-12 09:48:23.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/mm/memcontrol.c 2013-10-26 18:10:23.000000000 +0000 @@ -846,6 +846,31 @@ struct mem_cgroup *mem_cgroup_from_task( struct mem_cgroup, css); } @@ -23949,9 +23949,9 @@ diff -NurpP --minimal linux-3.4.57/mm/memcontrol.c linux-3.4.57-vs2.3.3.9/mm/mem struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm) { struct mem_cgroup *memcg = NULL; -diff -NurpP --minimal linux-3.4.57/mm/oom_kill.c linux-3.4.57-vs2.3.3.9/mm/oom_kill.c ---- linux-3.4.57/mm/oom_kill.c 2012-05-21 16:07:35.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/mm/oom_kill.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/mm/oom_kill.c linux-3.4.83-vs2.3.3.9/mm/oom_kill.c +--- linux-3.4.83/mm/oom_kill.c 2014-03-12 09:48:23.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/mm/oom_kill.c 2013-10-26 18:10:23.000000000 +0000 @@ -35,6 +35,8 @@ #include #include @@ -24026,9 +24026,9 @@ diff -NurpP --minimal linux-3.4.57/mm/oom_kill.c linux-3.4.57-vs2.3.3.9/mm/oom_k } if (PTR_ERR(p) != -1UL) { oom_kill_process(p, gfp_mask, order, points, totalpages, NULL, -diff -NurpP --minimal linux-3.4.57/mm/page_alloc.c linux-3.4.57-vs2.3.3.9/mm/page_alloc.c ---- linux-3.4.57/mm/page_alloc.c 2013-08-13 14:13:42.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/mm/page_alloc.c 2013-08-13 17:07:37.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/mm/page_alloc.c linux-3.4.83-vs2.3.3.9/mm/page_alloc.c +--- linux-3.4.83/mm/page_alloc.c 2014-03-12 09:48:23.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/mm/page_alloc.c 2014-03-12 09:55:28.000000000 +0000 @@ -58,6 +58,8 @@ #include #include @@ -24038,7 +24038,7 @@ diff -NurpP --minimal linux-3.4.57/mm/page_alloc.c linux-3.4.57-vs2.3.3.9/mm/pag #include #include -@@ -2655,6 +2657,9 @@ void si_meminfo(struct sysinfo *val) +@@ -2662,6 +2664,9 @@ void si_meminfo(struct sysinfo *val) val->totalhigh = totalhigh_pages; val->freehigh = nr_free_highpages(); val->mem_unit = PAGE_SIZE; @@ -24048,7 +24048,7 @@ diff -NurpP --minimal linux-3.4.57/mm/page_alloc.c linux-3.4.57-vs2.3.3.9/mm/pag } EXPORT_SYMBOL(si_meminfo); -@@ -2675,6 +2680,9 @@ void si_meminfo_node(struct sysinfo *val +@@ -2682,6 +2687,9 @@ void si_meminfo_node(struct sysinfo *val val->freehigh = 0; #endif val->mem_unit = PAGE_SIZE; @@ -24058,9 +24058,9 @@ diff -NurpP --minimal linux-3.4.57/mm/page_alloc.c linux-3.4.57-vs2.3.3.9/mm/pag } #endif -diff -NurpP --minimal linux-3.4.57/mm/pgtable-generic.c linux-3.4.57-vs2.3.3.9/mm/pgtable-generic.c ---- linux-3.4.57/mm/pgtable-generic.c 2012-05-21 16:07:35.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/mm/pgtable-generic.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/mm/pgtable-generic.c linux-3.4.83-vs2.3.3.9/mm/pgtable-generic.c +--- linux-3.4.83/mm/pgtable-generic.c 2012-05-21 16:07:35.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/mm/pgtable-generic.c 2012-05-21 16:15:05.000000000 +0000 @@ -6,6 +6,8 @@ * Copyright (C) 2010 Linus Torvalds */ @@ -24070,9 +24070,9 @@ diff -NurpP --minimal linux-3.4.57/mm/pgtable-generic.c linux-3.4.57-vs2.3.3.9/m #include #include #include -diff -NurpP --minimal linux-3.4.57/mm/shmem.c linux-3.4.57-vs2.3.3.9/mm/shmem.c ---- linux-3.4.57/mm/shmem.c 2013-08-13 14:13:42.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/mm/shmem.c 2013-03-02 15:26:44.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/mm/shmem.c linux-3.4.83-vs2.3.3.9/mm/shmem.c +--- linux-3.4.83/mm/shmem.c 2014-03-12 09:48:23.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/mm/shmem.c 2013-03-02 15:26:44.000000000 +0000 @@ -1473,7 +1473,7 @@ static int shmem_statfs(struct dentry *d { struct shmem_sb_info *sbinfo = SHMEM_SB(dentry->d_sb); @@ -24091,9 +24091,9 @@ diff -NurpP --minimal linux-3.4.57/mm/shmem.c linux-3.4.57-vs2.3.3.9/mm/shmem.c sb->s_op = &shmem_ops; sb->s_time_gran = 1; #ifdef CONFIG_TMPFS_XATTR -diff -NurpP --minimal linux-3.4.57/mm/slab.c linux-3.4.57-vs2.3.3.9/mm/slab.c ---- linux-3.4.57/mm/slab.c 2013-08-13 14:13:42.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/mm/slab.c 2012-10-22 13:09:53.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/mm/slab.c linux-3.4.83-vs2.3.3.9/mm/slab.c +--- linux-3.4.83/mm/slab.c 2014-03-12 09:48:23.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/mm/slab.c 2012-10-22 13:09:53.000000000 +0000 @@ -413,6 +413,8 @@ static void kmem_list3_init(struct kmem_ #define STATS_INC_FREEMISS(x) do { } while (0) #endif @@ -24127,9 +24127,9 @@ diff -NurpP --minimal linux-3.4.57/mm/slab.c linux-3.4.57-vs2.3.3.9/mm/slab.c kmemcheck_slab_free(cachep, objp, obj_size(cachep)); -diff -NurpP --minimal linux-3.4.57/mm/slab_vs.h linux-3.4.57-vs2.3.3.9/mm/slab_vs.h ---- linux-3.4.57/mm/slab_vs.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/mm/slab_vs.h 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/mm/slab_vs.h linux-3.4.83-vs2.3.3.9/mm/slab_vs.h +--- linux-3.4.83/mm/slab_vs.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/mm/slab_vs.h 2012-05-21 16:15:05.000000000 +0000 @@ -0,0 +1,29 @@ + +#include @@ -24160,9 +24160,9 @@ diff -NurpP --minimal linux-3.4.57/mm/slab_vs.h linux-3.4.57-vs2.3.3.9/mm/slab_v + atomic_sub(cachep->buffer_size, &vxi->cacct.slab[what]); +} + -diff -NurpP --minimal linux-3.4.57/mm/swapfile.c linux-3.4.57-vs2.3.3.9/mm/swapfile.c ---- linux-3.4.57/mm/swapfile.c 2013-08-13 14:13:42.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/mm/swapfile.c 2012-06-28 14:45:07.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/mm/swapfile.c linux-3.4.83-vs2.3.3.9/mm/swapfile.c +--- linux-3.4.83/mm/swapfile.c 2014-03-12 09:48:23.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/mm/swapfile.c 2012-06-28 14:45:07.000000000 +0000 @@ -36,6 +36,7 @@ #include #include @@ -24197,9 +24197,9 @@ diff -NurpP --minimal linux-3.4.57/mm/swapfile.c linux-3.4.57-vs2.3.3.9/mm/swapf } /* -diff -NurpP --minimal linux-3.4.57/net/bridge/br_multicast.c linux-3.4.57-vs2.3.3.9/net/bridge/br_multicast.c ---- linux-3.4.57/net/bridge/br_multicast.c 2013-08-13 14:13:43.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/net/bridge/br_multicast.c 2013-08-13 17:07:37.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/net/bridge/br_multicast.c linux-3.4.83-vs2.3.3.9/net/bridge/br_multicast.c +--- linux-3.4.83/net/bridge/br_multicast.c 2014-03-12 09:48:24.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/net/bridge/br_multicast.c 2014-03-12 09:55:28.000000000 +0000 @@ -445,7 +445,7 @@ static struct sk_buff *br_ip6_multicast_ ip6h->hop_limit = 1; ipv6_addr_set(&ip6h->daddr, htonl(0xff020000), 0, 0, htonl(1)); @@ -24209,9 +24209,9 @@ diff -NurpP --minimal linux-3.4.57/net/bridge/br_multicast.c linux-3.4.57-vs2.3. kfree_skb(skb); return NULL; } -diff -NurpP --minimal linux-3.4.57/net/core/dev.c linux-3.4.57-vs2.3.3.9/net/core/dev.c ---- linux-3.4.57/net/core/dev.c 2013-08-13 14:13:43.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/net/core/dev.c 2013-07-14 13:38:37.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/net/core/dev.c linux-3.4.83-vs2.3.3.9/net/core/dev.c +--- linux-3.4.83/net/core/dev.c 2014-03-12 09:48:25.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/net/core/dev.c 2014-03-12 09:55:28.000000000 +0000 @@ -126,6 +126,7 @@ #include #include @@ -24329,9 +24329,9 @@ diff -NurpP --minimal linux-3.4.57/net/core/dev.c linux-3.4.57-vs2.3.3.9/net/cor 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.4.57/net/core/rtnetlink.c linux-3.4.57-vs2.3.3.9/net/core/rtnetlink.c ---- linux-3.4.57/net/core/rtnetlink.c 2013-08-13 14:13:43.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/net/core/rtnetlink.c 2013-07-14 13:38:37.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/net/core/rtnetlink.c linux-3.4.83-vs2.3.3.9/net/core/rtnetlink.c +--- linux-3.4.83/net/core/rtnetlink.c 2014-03-12 09:48:25.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/net/core/rtnetlink.c 2013-07-14 13:38:37.000000000 +0000 @@ -1079,6 +1079,8 @@ static int rtnl_dump_ifinfo(struct sk_bu hlist_for_each_entry_rcu(dev, node, head, index_hlist) { if (idx < s_idx) @@ -24351,9 +24351,9 @@ diff -NurpP --minimal linux-3.4.57/net/core/rtnetlink.c linux-3.4.57-vs2.3.3.9/n skb = nlmsg_new((if_info_size = if_nlmsg_size(dev, 0)), GFP_KERNEL); if (skb == NULL) goto errout; -diff -NurpP --minimal linux-3.4.57/net/core/sock.c linux-3.4.57-vs2.3.3.9/net/core/sock.c ---- linux-3.4.57/net/core/sock.c 2013-08-13 14:13:44.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/net/core/sock.c 2013-07-14 13:38:37.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/net/core/sock.c linux-3.4.83-vs2.3.3.9/net/core/sock.c +--- linux-3.4.83/net/core/sock.c 2014-03-12 09:48:25.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/net/core/sock.c 2014-03-12 09:55:28.000000000 +0000 @@ -129,6 +129,10 @@ #include @@ -24421,9 +24421,9 @@ diff -NurpP --minimal linux-3.4.57/net/core/sock.c linux-3.4.57-vs2.3.3.9/net/co /* * Before updating sk_refcnt, we must commit prior changes to memory * (Documentation/RCU/rculist_nulls.txt for details) -diff -NurpP --minimal linux-3.4.57/net/ipv4/af_inet.c linux-3.4.57-vs2.3.3.9/net/ipv4/af_inet.c ---- linux-3.4.57/net/ipv4/af_inet.c 2013-08-13 14:13:44.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/net/ipv4/af_inet.c 2013-03-02 15:26:44.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/net/ipv4/af_inet.c linux-3.4.83-vs2.3.3.9/net/ipv4/af_inet.c +--- linux-3.4.83/net/ipv4/af_inet.c 2014-03-12 09:48:25.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/net/ipv4/af_inet.c 2013-03-02 15:26:44.000000000 +0000 @@ -118,6 +118,7 @@ #ifdef CONFIG_IP_MROUTE #include @@ -24501,9 +24501,9 @@ diff -NurpP --minimal linux-3.4.57/net/ipv4/af_inet.c linux-3.4.57-vs2.3.3.9/net sin->sin_port = inet->inet_sport; sin->sin_addr.s_addr = addr; } -diff -NurpP --minimal linux-3.4.57/net/ipv4/arp.c linux-3.4.57-vs2.3.3.9/net/ipv4/arp.c ---- linux-3.4.57/net/ipv4/arp.c 2012-05-21 16:07:40.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/net/ipv4/arp.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/net/ipv4/arp.c linux-3.4.83-vs2.3.3.9/net/ipv4/arp.c +--- linux-3.4.83/net/ipv4/arp.c 2012-05-21 16:07:40.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/net/ipv4/arp.c 2012-05-21 16:15:05.000000000 +0000 @@ -1328,6 +1328,7 @@ static void arp_format_neigh_entry(struc struct net_device *dev = n->dev; int hatype = dev->type; @@ -24520,9 +24520,9 @@ diff -NurpP --minimal linux-3.4.57/net/ipv4/arp.c linux-3.4.57-vs2.3.3.9/net/ipv 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.4.57/net/ipv4/devinet.c linux-3.4.57-vs2.3.3.9/net/ipv4/devinet.c ---- linux-3.4.57/net/ipv4/devinet.c 2012-05-21 16:07:40.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/net/ipv4/devinet.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/net/ipv4/devinet.c linux-3.4.83-vs2.3.3.9/net/ipv4/devinet.c +--- linux-3.4.83/net/ipv4/devinet.c 2012-05-21 16:07:40.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/net/ipv4/devinet.c 2012-05-21 16:15:05.000000000 +0000 @@ -517,6 +517,7 @@ struct in_device *inetdev_by_index(struc } EXPORT_SYMBOL(inetdev_by_index); @@ -24589,10 +24589,10 @@ diff -NurpP --minimal linux-3.4.57/net/ipv4/devinet.c linux-3.4.57-vs2.3.3.9/net if (ip_idx < s_ip_idx) continue; if (inet_fill_ifaddr(skb, ifa, -diff -NurpP --minimal linux-3.4.57/net/ipv4/fib_trie.c linux-3.4.57-vs2.3.3.9/net/ipv4/fib_trie.c ---- linux-3.4.57/net/ipv4/fib_trie.c 2012-05-21 16:07:40.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/net/ipv4/fib_trie.c 2012-05-21 16:15:05.000000000 +0000 -@@ -2556,6 +2556,7 @@ static int fib_route_seq_show(struct seq +diff -NurpP --minimal linux-3.4.83/net/ipv4/fib_trie.c linux-3.4.83-vs2.3.3.9/net/ipv4/fib_trie.c +--- linux-3.4.83/net/ipv4/fib_trie.c 2014-03-12 09:48:25.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/net/ipv4/fib_trie.c 2013-10-26 18:10:23.000000000 +0000 +@@ -2553,6 +2553,7 @@ static int fib_route_seq_show(struct seq || fa->fa_type == RTN_MULTICAST) continue; @@ -24600,9 +24600,9 @@ diff -NurpP --minimal linux-3.4.57/net/ipv4/fib_trie.c linux-3.4.57-vs2.3.3.9/ne if (fi) seq_printf(seq, "%s\t%08X\t%08X\t%04X\t%d\t%u\t" -diff -NurpP --minimal linux-3.4.57/net/ipv4/inet_connection_sock.c linux-3.4.57-vs2.3.3.9/net/ipv4/inet_connection_sock.c ---- linux-3.4.57/net/ipv4/inet_connection_sock.c 2013-08-13 14:13:44.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/net/ipv4/inet_connection_sock.c 2013-01-16 00:15:57.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/net/ipv4/inet_connection_sock.c linux-3.4.83-vs2.3.3.9/net/ipv4/inet_connection_sock.c +--- linux-3.4.83/net/ipv4/inet_connection_sock.c 2014-03-12 09:48:25.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/net/ipv4/inet_connection_sock.c 2013-01-16 00:15:57.000000000 +0000 @@ -52,6 +52,37 @@ void inet_get_local_port_range(int *low, } EXPORT_SYMBOL(inet_get_local_port_range); @@ -24652,9 +24652,9 @@ diff -NurpP --minimal linux-3.4.57/net/ipv4/inet_connection_sock.c linux-3.4.57- break; } } -diff -NurpP --minimal linux-3.4.57/net/ipv4/inet_diag.c linux-3.4.57-vs2.3.3.9/net/ipv4/inet_diag.c ---- linux-3.4.57/net/ipv4/inet_diag.c 2013-08-13 14:13:44.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/net/ipv4/inet_diag.c 2013-01-16 00:18:21.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/net/ipv4/inet_diag.c linux-3.4.83-vs2.3.3.9/net/ipv4/inet_diag.c +--- linux-3.4.83/net/ipv4/inet_diag.c 2014-03-12 09:48:25.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/net/ipv4/inet_diag.c 2014-03-12 09:58:38.000000000 +0000 @@ -31,6 +31,8 @@ #include @@ -24664,7 +24664,7 @@ diff -NurpP --minimal linux-3.4.57/net/ipv4/inet_diag.c linux-3.4.57-vs2.3.3.9/n #include #include -@@ -112,8 +112,10 @@ int inet_sk_diag_fill(struct sock *sk, s +@@ -114,8 +116,10 @@ int inet_sk_diag_fill(struct sock *sk, s memset(&r->id.idiag_src, 0, sizeof(r->id.idiag_src)); memset(&r->id.idiag_dst, 0, sizeof(r->id.idiag_dst)); @@ -24675,9 +24675,9 @@ diff -NurpP --minimal linux-3.4.57/net/ipv4/inet_diag.c linux-3.4.57-vs2.3.3.9/n + r->id.idiag_dst[0] = nx_map_sock_lback(sk->sk_nx_info, + inet->inet_daddr); - if (nla_put_u8(skb, INET_DIAG_SHUTDOWN, sk->sk_shutdown)) - goto errout; -@@ -256,8 +258,8 @@ static int inet_twsk_diag_fill(struct in + /* IPv6 dual-stack sockets use inet->tos for IPv4 connections, + * hence this needs to be included regardless of socket family. +@@ -241,8 +245,8 @@ static int inet_twsk_diag_fill(struct in memset(&r->id.idiag_src, 0, sizeof(r->id.idiag_src)); memset(&r->id.idiag_dst, 0, sizeof(r->id.idiag_dst)); @@ -24688,7 +24688,7 @@ diff -NurpP --minimal linux-3.4.57/net/ipv4/inet_diag.c linux-3.4.57-vs2.3.3.9/n r->idiag_state = tw->tw_substate; r->idiag_timer = 3; -@@ -276,12 +280,14 @@ int inet_diag_dump_one_icsk(struct inet_ +@@ -287,12 +291,14 @@ int inet_diag_dump_one_icsk(struct inet_ err = -EINVAL; if (req->sdiag_family == AF_INET) { @@ -24703,7 +24703,7 @@ diff -NurpP --minimal linux-3.4.57/net/ipv4/inet_diag.c linux-3.4.57-vs2.3.3.9/n sk = inet6_lookup(&init_net, hashinfo, (struct in6_addr *)req->id.idiag_dst, req->id.idiag_dport, -@@ -482,6 +488,7 @@ int inet_diag_bc_sk(const struct nlattr +@@ -493,6 +499,7 @@ int inet_diag_bc_sk(const struct nlattr } else #endif { @@ -24711,7 +24711,7 @@ diff -NurpP --minimal linux-3.4.57/net/ipv4/inet_diag.c linux-3.4.57-vs2.3.3.9/n entry.saddr = &inet->inet_rcv_saddr; entry.daddr = &inet->inet_daddr; } -@@ -639,6 +646,7 @@ static int inet_twsk_diag_dump(struct in +@@ -650,6 +657,7 @@ static int inet_twsk_diag_dump(struct in } else #endif { @@ -24719,7 +24719,7 @@ diff -NurpP --minimal linux-3.4.57/net/ipv4/inet_diag.c linux-3.4.57-vs2.3.3.9/n entry.saddr = &tw->tw_rcv_saddr; entry.daddr = &tw->tw_daddr; } -@@ -753,8 +755,8 @@ static int inet_diag_fill_req(struct sk_ +@@ -729,8 +737,8 @@ static int inet_diag_fill_req(struct sk_ memset(&r->id.idiag_src, 0, sizeof(r->id.idiag_src)); memset(&r->id.idiag_dst, 0, sizeof(r->id.idiag_dst)); @@ -24730,7 +24730,7 @@ diff -NurpP --minimal linux-3.4.57/net/ipv4/inet_diag.c linux-3.4.57-vs2.3.3.9/n r->idiag_expires = jiffies_to_msecs(tmo); r->idiag_rqueue = 0; -@@ -784,6 +792,7 @@ static int inet_diag_dump_reqs(struct sk +@@ -800,6 +808,7 @@ static int inet_diag_dump_reqs(struct sk continue; if (bc) { @@ -24738,7 +24738,7 @@ diff -NurpP --minimal linux-3.4.57/net/ipv4/inet_diag.c linux-3.4.57-vs2.3.3.9/n inet_diag_req_addrs(sk, req, &entry); entry.dport = ntohs(ireq->rmt_port); -@@ -834,6 +843,8 @@ void inet_diag_dump_icsk(struct inet_has +@@ -850,6 +859,8 @@ void inet_diag_dump_icsk(struct inet_has sk_nulls_for_each(sk, node, &ilb->head) { struct inet_sock *inet = inet_sk(sk); @@ -24747,7 +24747,7 @@ diff -NurpP --minimal linux-3.4.57/net/ipv4/inet_diag.c linux-3.4.57-vs2.3.3.9/n if (num < s_num) { num++; continue; -@@ -904,6 +915,8 @@ skip_listen_ht: +@@ -920,6 +931,8 @@ skip_listen_ht: sk_nulls_for_each(sk, node, &head->chain) { struct inet_sock *inet = inet_sk(sk); @@ -24756,7 +24756,7 @@ diff -NurpP --minimal linux-3.4.57/net/ipv4/inet_diag.c linux-3.4.57-vs2.3.3.9/n if (num < s_num) goto next_normal; if (!(r->idiag_states & (1 << sk->sk_state))) -@@ -931,6 +944,8 @@ next_normal: +@@ -947,6 +960,8 @@ next_normal: inet_twsk_for_each(tw, node, &head->twchain) { @@ -24764,10 +24764,10 @@ diff -NurpP --minimal linux-3.4.57/net/ipv4/inet_diag.c linux-3.4.57-vs2.3.3.9/n + continue; if (num < s_num) goto next_dying; - if (r->sdiag_family != AF_UNSPEC && -diff -NurpP --minimal linux-3.4.57/net/ipv4/inet_hashtables.c linux-3.4.57-vs2.3.3.9/net/ipv4/inet_hashtables.c ---- linux-3.4.57/net/ipv4/inet_hashtables.c 2011-10-24 16:45:34.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/net/ipv4/inet_hashtables.c 2012-05-21 16:15:05.000000000 +0000 + if (!(r->idiag_states & (1 << tw->tw_substate))) +diff -NurpP --minimal linux-3.4.83/net/ipv4/inet_hashtables.c linux-3.4.83-vs2.3.3.9/net/ipv4/inet_hashtables.c +--- linux-3.4.83/net/ipv4/inet_hashtables.c 2014-03-12 09:48:25.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/net/ipv4/inet_hashtables.c 2014-03-12 09:55:28.000000000 +0000 @@ -22,6 +22,7 @@ #include #include @@ -24804,9 +24804,9 @@ diff -NurpP --minimal linux-3.4.57/net/ipv4/inet_hashtables.c linux-3.4.57-vs2.3 /* * 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.4.57/net/ipv4/netfilter/nf_nat_helper.c linux-3.4.57-vs2.3.3.9/net/ipv4/netfilter/nf_nat_helper.c ---- linux-3.4.57/net/ipv4/netfilter/nf_nat_helper.c 2012-03-19 18:47:33.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/net/ipv4/netfilter/nf_nat_helper.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/net/ipv4/netfilter/nf_nat_helper.c linux-3.4.83-vs2.3.3.9/net/ipv4/netfilter/nf_nat_helper.c +--- linux-3.4.83/net/ipv4/netfilter/nf_nat_helper.c 2012-03-19 18:47:33.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/net/ipv4/netfilter/nf_nat_helper.c 2012-05-21 16:15:05.000000000 +0000 @@ -20,6 +20,7 @@ #include @@ -24815,9 +24815,9 @@ diff -NurpP --minimal linux-3.4.57/net/ipv4/netfilter/nf_nat_helper.c linux-3.4. #include #include #include -diff -NurpP --minimal linux-3.4.57/net/ipv4/netfilter.c linux-3.4.57-vs2.3.3.9/net/ipv4/netfilter.c ---- linux-3.4.57/net/ipv4/netfilter.c 2012-01-09 15:15:03.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/net/ipv4/netfilter.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/net/ipv4/netfilter.c linux-3.4.83-vs2.3.3.9/net/ipv4/netfilter.c +--- linux-3.4.83/net/ipv4/netfilter.c 2012-01-09 15:15:03.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/net/ipv4/netfilter.c 2012-05-21 16:15:05.000000000 +0000 @@ -6,7 +6,7 @@ #include #include @@ -24827,9 +24827,9 @@ diff -NurpP --minimal linux-3.4.57/net/ipv4/netfilter.c linux-3.4.57-vs2.3.3.9/n #include #include #include -diff -NurpP --minimal linux-3.4.57/net/ipv4/raw.c linux-3.4.57-vs2.3.3.9/net/ipv4/raw.c ---- linux-3.4.57/net/ipv4/raw.c 2013-08-13 14:13:44.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/net/ipv4/raw.c 2012-10-22 13:09:53.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/net/ipv4/raw.c linux-3.4.83-vs2.3.3.9/net/ipv4/raw.c +--- linux-3.4.83/net/ipv4/raw.c 2014-03-12 09:48:26.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/net/ipv4/raw.c 2014-03-12 09:55:28.000000000 +0000 @@ -118,7 +118,7 @@ static struct sock *__raw_v4_lookup(stru if (net_eq(sock_net(sk), net) && inet->inet_num == num && @@ -24892,7 +24892,7 @@ diff -NurpP --minimal linux-3.4.57/net/ipv4/raw.c linux-3.4.57-vs2.3.3.9/net/ipv if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST) inet->inet_saddr = 0; /* Use device */ sk_dst_reset(sk); -@@ -715,7 +733,8 @@ static int raw_recvmsg(struct kiocb *ioc +@@ -712,7 +730,8 @@ static int raw_recvmsg(struct kiocb *ioc /* Copy the address. */ if (sin) { sin->sin_family = AF_INET; @@ -24901,8 +24901,8 @@ diff -NurpP --minimal linux-3.4.57/net/ipv4/raw.c linux-3.4.57-vs2.3.3.9/net/ipv + nx_map_sock_lback(sk->sk_nx_info, ip_hdr(skb)->saddr); sin->sin_port = 0; memset(&sin->sin_zero, 0, sizeof(sin->sin_zero)); - } -@@ -911,7 +930,8 @@ static struct sock *raw_get_first(struct + *addr_len = sizeof(*sin); +@@ -909,7 +928,8 @@ static struct sock *raw_get_first(struct struct hlist_node *node; sk_for_each(sk, node, &state->h->ht[state->bucket]) @@ -24912,7 +24912,7 @@ diff -NurpP --minimal linux-3.4.57/net/ipv4/raw.c linux-3.4.57-vs2.3.3.9/net/ipv goto found; } sk = NULL; -@@ -927,7 +947,8 @@ static struct sock *raw_get_next(struct +@@ -925,7 +945,8 @@ static struct sock *raw_get_next(struct sk = sk_next(sk); try_again: ; @@ -24922,9 +24922,9 @@ diff -NurpP --minimal linux-3.4.57/net/ipv4/raw.c linux-3.4.57-vs2.3.3.9/net/ipv if (!sk && ++state->bucket < RAW_HTABLE_SIZE) { sk = sk_head(&state->h->ht[state->bucket]); -diff -NurpP --minimal linux-3.4.57/net/ipv4/route.c linux-3.4.57-vs2.3.3.9/net/ipv4/route.c ---- linux-3.4.57/net/ipv4/route.c 2012-05-21 16:07:40.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/net/ipv4/route.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/net/ipv4/route.c linux-3.4.83-vs2.3.3.9/net/ipv4/route.c +--- linux-3.4.83/net/ipv4/route.c 2014-03-12 09:48:26.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/net/ipv4/route.c 2014-03-12 09:55:28.000000000 +0000 @@ -2696,7 +2696,7 @@ static struct rtable *ip_route_output_sl @@ -24934,9 +24934,9 @@ diff -NurpP --minimal linux-3.4.57/net/ipv4/route.c linux-3.4.57-vs2.3.3.9/net/i rth = ERR_PTR(-ENODEV); if (dev_out == NULL) goto out; -diff -NurpP --minimal linux-3.4.57/net/ipv4/tcp.c linux-3.4.57-vs2.3.3.9/net/ipv4/tcp.c ---- linux-3.4.57/net/ipv4/tcp.c 2013-08-13 14:13:45.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/net/ipv4/tcp.c 2013-07-14 13:38:37.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/net/ipv4/tcp.c linux-3.4.83-vs2.3.3.9/net/ipv4/tcp.c +--- linux-3.4.83/net/ipv4/tcp.c 2014-03-12 09:48:28.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/net/ipv4/tcp.c 2013-07-14 13:38:37.000000000 +0000 @@ -268,6 +268,7 @@ #include #include @@ -24945,9 +24945,9 @@ diff -NurpP --minimal linux-3.4.57/net/ipv4/tcp.c linux-3.4.57-vs2.3.3.9/net/ipv #include #include -diff -NurpP --minimal linux-3.4.57/net/ipv4/tcp_ipv4.c linux-3.4.57-vs2.3.3.9/net/ipv4/tcp_ipv4.c ---- linux-3.4.57/net/ipv4/tcp_ipv4.c 2013-08-13 14:13:45.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/net/ipv4/tcp_ipv4.c 2013-08-13 17:07:37.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/net/ipv4/tcp_ipv4.c linux-3.4.83-vs2.3.3.9/net/ipv4/tcp_ipv4.c +--- linux-3.4.83/net/ipv4/tcp_ipv4.c 2014-03-12 09:48:28.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/net/ipv4/tcp_ipv4.c 2014-03-12 09:55:28.000000000 +0000 @@ -2037,6 +2037,12 @@ static void *listening_get_next(struct s req = req->dl_next; while (1) { @@ -25053,9 +25053,9 @@ diff -NurpP --minimal linux-3.4.57/net/ipv4/tcp_ipv4.c linux-3.4.57-vs2.3.3.9/ne destp = ntohs(tw->tw_dport); srcp = ntohs(tw->tw_sport); -diff -NurpP --minimal linux-3.4.57/net/ipv4/tcp_minisocks.c linux-3.4.57-vs2.3.3.9/net/ipv4/tcp_minisocks.c ---- linux-3.4.57/net/ipv4/tcp_minisocks.c 2012-05-21 16:07:40.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/net/ipv4/tcp_minisocks.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/net/ipv4/tcp_minisocks.c linux-3.4.83-vs2.3.3.9/net/ipv4/tcp_minisocks.c +--- linux-3.4.83/net/ipv4/tcp_minisocks.c 2012-05-21 16:07:40.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/net/ipv4/tcp_minisocks.c 2012-05-21 16:15:05.000000000 +0000 @@ -23,6 +23,9 @@ #include #include @@ -25078,9 +25078,9 @@ diff -NurpP --minimal linux-3.4.57/net/ipv4/tcp_minisocks.c linux-3.4.57-vs2.3.3 #if IS_ENABLED(CONFIG_IPV6) if (tw->tw_family == PF_INET6) { struct ipv6_pinfo *np = inet6_sk(sk); -diff -NurpP --minimal linux-3.4.57/net/ipv4/udp.c linux-3.4.57-vs2.3.3.9/net/ipv4/udp.c ---- linux-3.4.57/net/ipv4/udp.c 2013-08-13 14:13:45.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/net/ipv4/udp.c 2013-08-13 17:07:37.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/net/ipv4/udp.c linux-3.4.83-vs2.3.3.9/net/ipv4/udp.c +--- linux-3.4.83/net/ipv4/udp.c 2014-03-12 09:48:28.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/net/ipv4/udp.c 2014-03-12 09:55:28.000000000 +0000 @@ -298,14 +298,7 @@ fail: } EXPORT_SYMBOL(udp_lib_get_port); @@ -25172,7 +25172,7 @@ diff -NurpP --minimal linux-3.4.57/net/ipv4/udp.c linux-3.4.57-vs2.3.3.9/net/ipv 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: +@@ -1229,7 +1244,8 @@ try_again: if (sin) { sin->sin_family = AF_INET; sin->sin_port = udp_hdr(skb)->source; @@ -25180,9 +25180,9 @@ diff -NurpP --minimal linux-3.4.57/net/ipv4/udp.c linux-3.4.57-vs2.3.3.9/net/ipv + sin->sin_addr.s_addr = nx_map_sock_lback( + skb->sk->sk_nx_info, ip_hdr(skb)->saddr); memset(sin->sin_zero, 0, sizeof(sin->sin_zero)); + *addr_len = sizeof(*sin); } - if (inet->cmsg_flags) -@@ -1971,6 +1987,8 @@ static struct sock *udp_get_first(struct +@@ -1969,6 +1985,8 @@ static struct sock *udp_get_first(struct sk_nulls_for_each(sk, node, &hslot->head) { if (!net_eq(sock_net(sk), net)) continue; @@ -25191,7 +25191,7 @@ diff -NurpP --minimal linux-3.4.57/net/ipv4/udp.c linux-3.4.57-vs2.3.3.9/net/ipv if (sk->sk_family == state->family) goto found; } -@@ -1988,7 +2006,9 @@ static struct sock *udp_get_next(struct +@@ -1986,7 +2004,9 @@ static struct sock *udp_get_next(struct do { sk = sk_nulls_next(sk); @@ -25202,7 +25202,7 @@ diff -NurpP --minimal linux-3.4.57/net/ipv4/udp.c linux-3.4.57-vs2.3.3.9/net/ipv if (!sk) { if (state->bucket <= state->udp_table->mask) -@@ -2084,8 +2104,8 @@ static void udp4_format_sock(struct sock +@@ -2082,8 +2102,8 @@ static void udp4_format_sock(struct sock int bucket, int *len) { struct inet_sock *inet = inet_sk(sp); @@ -25213,9 +25213,9 @@ diff -NurpP --minimal linux-3.4.57/net/ipv4/udp.c linux-3.4.57-vs2.3.3.9/net/ipv __u16 destp = ntohs(inet->inet_dport); __u16 srcp = ntohs(inet->inet_sport); -diff -NurpP --minimal linux-3.4.57/net/ipv6/Kconfig linux-3.4.57-vs2.3.3.9/net/ipv6/Kconfig ---- linux-3.4.57/net/ipv6/Kconfig 2010-08-02 14:52:59.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/net/ipv6/Kconfig 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/net/ipv6/Kconfig linux-3.4.83-vs2.3.3.9/net/ipv6/Kconfig +--- linux-3.4.83/net/ipv6/Kconfig 2010-08-02 14:52:59.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/net/ipv6/Kconfig 2012-05-21 16:15:05.000000000 +0000 @@ -4,8 +4,8 @@ # IPv6 as module will cause a CRASH if you try to unload it @@ -25227,9 +25227,9 @@ diff -NurpP --minimal linux-3.4.57/net/ipv6/Kconfig linux-3.4.57-vs2.3.3.9/net/i ---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.4.57/net/ipv6/addrconf.c linux-3.4.57-vs2.3.3.9/net/ipv6/addrconf.c ---- linux-3.4.57/net/ipv6/addrconf.c 2013-08-13 14:13:45.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/net/ipv6/addrconf.c 2013-08-13 17:07:37.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/net/ipv6/addrconf.c linux-3.4.83-vs2.3.3.9/net/ipv6/addrconf.c +--- linux-3.4.83/net/ipv6/addrconf.c 2014-03-12 09:48:28.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/net/ipv6/addrconf.c 2013-10-26 18:10:23.000000000 +0000 @@ -88,6 +88,8 @@ #include #include @@ -25239,7 +25239,7 @@ diff -NurpP --minimal linux-3.4.57/net/ipv6/addrconf.c linux-3.4.57-vs2.3.3.9/ne /* Set to 3 to get tracing... */ #define ACONF_DEBUG 2 -@@ -1108,7 +1110,7 @@ out: +@@ -1106,7 +1108,7 @@ out: int ipv6_dev_get_saddr(struct net *net, struct net_device *dst_dev, const struct in6_addr *daddr, unsigned int prefs, @@ -25248,7 +25248,7 @@ diff -NurpP --minimal linux-3.4.57/net/ipv6/addrconf.c linux-3.4.57-vs2.3.3.9/ne { struct ipv6_saddr_score scores[2], *score = &scores[0], *hiscore = &scores[1]; -@@ -1180,6 +1182,8 @@ int ipv6_dev_get_saddr(struct net *net, +@@ -1178,6 +1180,8 @@ int ipv6_dev_get_saddr(struct net *net, dev->name); continue; } @@ -25257,7 +25257,7 @@ diff -NurpP --minimal linux-3.4.57/net/ipv6/addrconf.c linux-3.4.57-vs2.3.3.9/ne score->rule = -1; bitmap_zero(score->scorebits, IPV6_SADDR_RULE_MAX); -@@ -3206,7 +3210,10 @@ static void if6_seq_stop(struct seq_file +@@ -3204,7 +3208,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; @@ -25269,7 +25269,7 @@ diff -NurpP --minimal linux-3.4.57/net/ipv6/addrconf.c linux-3.4.57-vs2.3.3.9/ne &ifp->addr, ifp->idev->dev->ifindex, ifp->prefix_len, -@@ -3712,6 +3719,11 @@ static int in6_dump_addrs(struct inet6_d +@@ -3710,6 +3717,11 @@ static int in6_dump_addrs(struct inet6_d struct ifacaddr6 *ifaca; int err = 1; int ip_idx = *p_ip_idx; @@ -25281,7 +25281,7 @@ diff -NurpP --minimal linux-3.4.57/net/ipv6/addrconf.c linux-3.4.57-vs2.3.3.9/ne read_lock_bh(&idev->lock); switch (type) { -@@ -3722,6 +3734,8 @@ static int in6_dump_addrs(struct inet6_d +@@ -3720,6 +3732,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; @@ -25290,7 +25290,7 @@ diff -NurpP --minimal linux-3.4.57/net/ipv6/addrconf.c linux-3.4.57-vs2.3.3.9/ne err = inet6_fill_ifaddr(skb, ifa, NETLINK_CB(cb->skb).pid, cb->nlh->nlmsg_seq, -@@ -3738,6 +3752,8 @@ static int in6_dump_addrs(struct inet6_d +@@ -3736,6 +3750,8 @@ static int in6_dump_addrs(struct inet6_d ifmca = ifmca->next, ip_idx++) { if (ip_idx < s_ip_idx) continue; @@ -25299,7 +25299,7 @@ diff -NurpP --minimal linux-3.4.57/net/ipv6/addrconf.c linux-3.4.57-vs2.3.3.9/ne err = inet6_fill_ifmcaddr(skb, ifmca, NETLINK_CB(cb->skb).pid, cb->nlh->nlmsg_seq, -@@ -3753,6 +3769,8 @@ static int in6_dump_addrs(struct inet6_d +@@ -3751,6 +3767,8 @@ static int in6_dump_addrs(struct inet6_d ifaca = ifaca->aca_next, ip_idx++) { if (ip_idx < s_ip_idx) continue; @@ -25308,7 +25308,7 @@ diff -NurpP --minimal linux-3.4.57/net/ipv6/addrconf.c linux-3.4.57-vs2.3.3.9/ne err = inet6_fill_ifacaddr(skb, ifaca, NETLINK_CB(cb->skb).pid, cb->nlh->nlmsg_seq, -@@ -4138,6 +4156,11 @@ static int inet6_dump_ifinfo(struct sk_b +@@ -4136,6 +4154,11 @@ static int inet6_dump_ifinfo(struct sk_b struct inet6_dev *idev; struct hlist_head *head; struct hlist_node *node; @@ -25320,7 +25320,7 @@ diff -NurpP --minimal linux-3.4.57/net/ipv6/addrconf.c linux-3.4.57-vs2.3.3.9/ne s_h = cb->args[0]; s_idx = cb->args[1]; -@@ -4149,6 +4172,8 @@ static int inet6_dump_ifinfo(struct sk_b +@@ -4147,6 +4170,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; @@ -25329,9 +25329,9 @@ diff -NurpP --minimal linux-3.4.57/net/ipv6/addrconf.c linux-3.4.57-vs2.3.3.9/ne idev = __in6_dev_get(dev); if (!idev) goto cont; -diff -NurpP --minimal linux-3.4.57/net/ipv6/af_inet6.c linux-3.4.57-vs2.3.3.9/net/ipv6/af_inet6.c ---- linux-3.4.57/net/ipv6/af_inet6.c 2012-05-21 16:07:40.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/net/ipv6/af_inet6.c 2012-09-01 09:15:04.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/net/ipv6/af_inet6.c linux-3.4.83-vs2.3.3.9/net/ipv6/af_inet6.c +--- linux-3.4.83/net/ipv6/af_inet6.c 2012-05-21 16:07:40.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/net/ipv6/af_inet6.c 2012-09-01 09:15:04.000000000 +0000 @@ -42,6 +42,8 @@ #include #include @@ -25427,10 +25427,10 @@ diff -NurpP --minimal linux-3.4.57/net/ipv6/af_inet6.c linux-3.4.57-vs2.3.3.9/ne if (ipv6_addr_any(&np->rcv_saddr)) sin->sin6_addr = np->saddr; else -diff -NurpP --minimal linux-3.4.57/net/ipv6/datagram.c linux-3.4.57-vs2.3.3.9/net/ipv6/datagram.c ---- linux-3.4.57/net/ipv6/datagram.c 2012-05-21 16:07:40.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/net/ipv6/datagram.c 2012-05-21 16:15:05.000000000 +0000 -@@ -642,7 +642,7 @@ int datagram_send_ctl(struct net *net, s +diff -NurpP --minimal linux-3.4.83/net/ipv6/datagram.c linux-3.4.83-vs2.3.3.9/net/ipv6/datagram.c +--- linux-3.4.83/net/ipv6/datagram.c 2014-03-12 09:48:28.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/net/ipv6/datagram.c 2014-03-12 09:55:28.000000000 +0000 +@@ -646,7 +646,7 @@ int datagram_send_ctl(struct net *net, s rcu_read_lock(); if (fl6->flowi6_oif) { @@ -25439,9 +25439,9 @@ diff -NurpP --minimal linux-3.4.57/net/ipv6/datagram.c linux-3.4.57-vs2.3.3.9/ne if (!dev) { rcu_read_unlock(); return -ENODEV; -diff -NurpP --minimal linux-3.4.57/net/ipv6/fib6_rules.c linux-3.4.57-vs2.3.3.9/net/ipv6/fib6_rules.c ---- linux-3.4.57/net/ipv6/fib6_rules.c 2012-03-19 18:47:33.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/net/ipv6/fib6_rules.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/net/ipv6/fib6_rules.c linux-3.4.83-vs2.3.3.9/net/ipv6/fib6_rules.c +--- linux-3.4.83/net/ipv6/fib6_rules.c 2012-03-19 18:47:33.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/net/ipv6/fib6_rules.c 2012-05-21 16:15:05.000000000 +0000 @@ -91,7 +91,7 @@ static int fib6_rule_action(struct fib_r ip6_dst_idev(&rt->dst)->dev, &flp6->daddr, @@ -25451,9 +25451,9 @@ diff -NurpP --minimal linux-3.4.57/net/ipv6/fib6_rules.c linux-3.4.57-vs2.3.3.9/ goto again; if (!ipv6_prefix_equal(&saddr, &r->src.addr, r->src.plen)) -diff -NurpP --minimal linux-3.4.57/net/ipv6/inet6_hashtables.c linux-3.4.57-vs2.3.3.9/net/ipv6/inet6_hashtables.c ---- linux-3.4.57/net/ipv6/inet6_hashtables.c 2011-10-24 16:45:34.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/net/ipv6/inet6_hashtables.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/net/ipv6/inet6_hashtables.c linux-3.4.83-vs2.3.3.9/net/ipv6/inet6_hashtables.c +--- linux-3.4.83/net/ipv6/inet6_hashtables.c 2014-03-12 09:48:28.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/net/ipv6/inet6_hashtables.c 2014-03-12 09:55:28.000000000 +0000 @@ -16,6 +16,7 @@ #include @@ -25489,10 +25489,10 @@ diff -NurpP --minimal linux-3.4.57/net/ipv6/inet6_hashtables.c linux-3.4.57-vs2. } if (sk->sk_bound_dev_if) { if (sk->sk_bound_dev_if != dif) -diff -NurpP --minimal linux-3.4.57/net/ipv6/ip6_output.c linux-3.4.57-vs2.3.3.9/net/ipv6/ip6_output.c ---- linux-3.4.57/net/ipv6/ip6_output.c 2013-08-13 14:13:45.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/net/ipv6/ip6_output.c 2013-08-13 17:07:37.000000000 +0000 -@@ -972,7 +972,8 @@ static int ip6_dst_lookup_tail(struct so +diff -NurpP --minimal linux-3.4.83/net/ipv6/ip6_output.c linux-3.4.83-vs2.3.3.9/net/ipv6/ip6_output.c +--- linux-3.4.83/net/ipv6/ip6_output.c 2014-03-12 09:48:28.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/net/ipv6/ip6_output.c 2014-03-12 09:55:28.000000000 +0000 +@@ -983,7 +983,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, @@ -25502,10 +25502,10 @@ diff -NurpP --minimal linux-3.4.57/net/ipv6/ip6_output.c linux-3.4.57-vs2.3.3.9/ if (err) goto out_err_release; } -diff -NurpP --minimal linux-3.4.57/net/ipv6/ndisc.c linux-3.4.57-vs2.3.3.9/net/ipv6/ndisc.c ---- linux-3.4.57/net/ipv6/ndisc.c 2013-08-13 14:13:45.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/net/ipv6/ndisc.c 2012-11-18 23:52:30.000000000 +0000 -@@ -575,7 +575,7 @@ static void ndisc_send_na(struct net_dev +diff -NurpP --minimal linux-3.4.83/net/ipv6/ndisc.c linux-3.4.83-vs2.3.3.9/net/ipv6/ndisc.c +--- linux-3.4.83/net/ipv6/ndisc.c 2014-03-12 09:48:28.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/net/ipv6/ndisc.c 2013-10-26 18:10:23.000000000 +0000 +@@ -577,7 +577,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, @@ -25514,9 +25514,9 @@ diff -NurpP --minimal linux-3.4.57/net/ipv6/ndisc.c linux-3.4.57-vs2.3.3.9/net/i return; src_addr = &tmpaddr; } -diff -NurpP --minimal linux-3.4.57/net/ipv6/raw.c linux-3.4.57-vs2.3.3.9/net/ipv6/raw.c ---- linux-3.4.57/net/ipv6/raw.c 2013-08-13 14:13:45.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/net/ipv6/raw.c 2012-10-22 13:09:53.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/net/ipv6/raw.c linux-3.4.83-vs2.3.3.9/net/ipv6/raw.c +--- linux-3.4.83/net/ipv6/raw.c 2014-03-12 09:48:28.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/net/ipv6/raw.c 2014-03-12 09:55:28.000000000 +0000 @@ -30,6 +30,7 @@ #include #include @@ -25539,9 +25539,9 @@ diff -NurpP --minimal linux-3.4.57/net/ipv6/raw.c linux-3.4.57-vs2.3.3.9/net/ipv /* ipv4 addr of the socket is invalid. Only the * unspecified and mapped address have a v4 equivalent. */ -diff -NurpP --minimal linux-3.4.57/net/ipv6/route.c linux-3.4.57-vs2.3.3.9/net/ipv6/route.c ---- linux-3.4.57/net/ipv6/route.c 2013-08-13 14:13:45.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/net/ipv6/route.c 2013-08-13 17:07:38.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/net/ipv6/route.c linux-3.4.83-vs2.3.3.9/net/ipv6/route.c +--- linux-3.4.83/net/ipv6/route.c 2014-03-12 09:48:28.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/net/ipv6/route.c 2014-03-12 09:55:28.000000000 +0000 @@ -55,6 +55,7 @@ #include #include @@ -25550,7 +25550,7 @@ diff -NurpP --minimal linux-3.4.57/net/ipv6/route.c linux-3.4.57-vs2.3.3.9/net/i #include -@@ -2150,15 +2151,17 @@ int ip6_route_get_saddr(struct net *net, +@@ -2152,15 +2153,17 @@ int ip6_route_get_saddr(struct net *net, struct rt6_info *rt, const struct in6_addr *daddr, unsigned int prefs, @@ -25571,7 +25571,7 @@ diff -NurpP --minimal linux-3.4.57/net/ipv6/route.c linux-3.4.57-vs2.3.3.9/net/i return err; } -@@ -2489,7 +2492,8 @@ static int rt6_fill_node(struct net *net +@@ -2491,7 +2494,8 @@ static int rt6_fill_node(struct net *net NLA_PUT_U32(skb, RTA_IIF, iif); } else if (dst) { struct in6_addr saddr_buf; @@ -25581,7 +25581,7 @@ diff -NurpP --minimal linux-3.4.57/net/ipv6/route.c linux-3.4.57-vs2.3.3.9/net/i NLA_PUT(skb, RTA_PREFSRC, 16, &saddr_buf); } -@@ -2716,6 +2720,7 @@ static int rt6_info_route(struct rt6_inf +@@ -2718,6 +2722,7 @@ static int rt6_info_route(struct rt6_inf struct seq_file *m = p_arg; struct neighbour *n; @@ -25589,9 +25589,9 @@ diff -NurpP --minimal linux-3.4.57/net/ipv6/route.c linux-3.4.57-vs2.3.3.9/net/i seq_printf(m, "%pi6 %02x ", &rt->rt6i_dst.addr, rt->rt6i_dst.plen); #ifdef CONFIG_IPV6_SUBTREES -diff -NurpP --minimal linux-3.4.57/net/ipv6/tcp_ipv6.c linux-3.4.57-vs2.3.3.9/net/ipv6/tcp_ipv6.c ---- linux-3.4.57/net/ipv6/tcp_ipv6.c 2013-08-13 14:13:45.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/net/ipv6/tcp_ipv6.c 2013-07-14 13:38:37.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/net/ipv6/tcp_ipv6.c linux-3.4.83-vs2.3.3.9/net/ipv6/tcp_ipv6.c +--- linux-3.4.83/net/ipv6/tcp_ipv6.c 2014-03-12 09:48:28.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/net/ipv6/tcp_ipv6.c 2013-10-26 18:10:23.000000000 +0000 @@ -71,6 +71,7 @@ #include @@ -25618,9 +25618,9 @@ diff -NurpP --minimal linux-3.4.57/net/ipv6/tcp_ipv6.c linux-3.4.57-vs2.3.3.9/ne addr_type = ipv6_addr_type(&usin->sin6_addr); -diff -NurpP --minimal linux-3.4.57/net/ipv6/udp.c linux-3.4.57-vs2.3.3.9/net/ipv6/udp.c ---- linux-3.4.57/net/ipv6/udp.c 2013-08-13 14:13:45.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/net/ipv6/udp.c 2013-08-13 17:07:38.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/net/ipv6/udp.c linux-3.4.83-vs2.3.3.9/net/ipv6/udp.c +--- linux-3.4.83/net/ipv6/udp.c 2014-03-12 09:48:28.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/net/ipv6/udp.c 2014-03-12 09:55:28.000000000 +0000 @@ -45,41 +45,67 @@ #include #include @@ -25713,9 +25713,9 @@ diff -NurpP --minimal linux-3.4.57/net/ipv6/udp.c linux-3.4.57-vs2.3.3.9/net/ipv } if (!ipv6_addr_any(&np->daddr)) { if (!ipv6_addr_equal(&np->daddr, saddr)) -diff -NurpP --minimal linux-3.4.57/net/ipv6/xfrm6_policy.c linux-3.4.57-vs2.3.3.9/net/ipv6/xfrm6_policy.c ---- linux-3.4.57/net/ipv6/xfrm6_policy.c 2013-08-13 14:13:45.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/net/ipv6/xfrm6_policy.c 2013-07-14 13:38:37.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/net/ipv6/xfrm6_policy.c linux-3.4.83-vs2.3.3.9/net/ipv6/xfrm6_policy.c +--- linux-3.4.83/net/ipv6/xfrm6_policy.c 2014-03-12 09:48:28.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/net/ipv6/xfrm6_policy.c 2013-07-14 13:38:37.000000000 +0000 @@ -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, @@ -25725,9 +25725,9 @@ diff -NurpP --minimal linux-3.4.57/net/ipv6/xfrm6_policy.c linux-3.4.57-vs2.3.3. dst_release(dst); return 0; } -diff -NurpP --minimal linux-3.4.57/net/netfilter/ipvs/ip_vs_xmit.c linux-3.4.57-vs2.3.3.9/net/netfilter/ipvs/ip_vs_xmit.c ---- linux-3.4.57/net/netfilter/ipvs/ip_vs_xmit.c 2012-03-19 18:47:33.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/net/netfilter/ipvs/ip_vs_xmit.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/net/netfilter/ipvs/ip_vs_xmit.c linux-3.4.83-vs2.3.3.9/net/netfilter/ipvs/ip_vs_xmit.c +--- linux-3.4.83/net/netfilter/ipvs/ip_vs_xmit.c 2014-03-12 09:48:29.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/net/netfilter/ipvs/ip_vs_xmit.c 2013-10-26 18:10:23.000000000 +0000 @@ -226,7 +226,7 @@ __ip_vs_route_output_v6(struct net *net, return dst; if (ipv6_addr_any(&fl6.saddr) && @@ -25737,9 +25737,9 @@ diff -NurpP --minimal linux-3.4.57/net/netfilter/ipvs/ip_vs_xmit.c linux-3.4.57- goto out_err; if (do_xfrm) { dst = xfrm_lookup(net, dst, flowi6_to_flowi(&fl6), NULL, 0); -diff -NurpP --minimal linux-3.4.57/net/netlink/af_netlink.c linux-3.4.57-vs2.3.3.9/net/netlink/af_netlink.c ---- linux-3.4.57/net/netlink/af_netlink.c 2013-08-13 14:13:46.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/net/netlink/af_netlink.c 2012-11-18 23:52:30.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/net/netlink/af_netlink.c linux-3.4.83-vs2.3.3.9/net/netlink/af_netlink.c +--- linux-3.4.83/net/netlink/af_netlink.c 2014-03-12 09:48:29.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/net/netlink/af_netlink.c 2014-03-12 09:55:29.000000000 +0000 @@ -55,6 +55,9 @@ #include #include @@ -25750,7 +25750,7 @@ diff -NurpP --minimal linux-3.4.57/net/netlink/af_netlink.c linux-3.4.57-vs2.3.3 #include #include -@@ -1951,6 +1954,8 @@ static struct sock *netlink_seq_socket_i +@@ -1949,6 +1952,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; @@ -25759,7 +25759,7 @@ diff -NurpP --minimal linux-3.4.57/net/netlink/af_netlink.c linux-3.4.57-vs2.3.3 if (off == pos) { iter->link = i; iter->hash_idx = j; -@@ -1985,7 +1990,8 @@ static void *netlink_seq_next(struct seq +@@ -1983,7 +1988,8 @@ static void *netlink_seq_next(struct seq s = v; do { s = sk_next(s); @@ -25769,7 +25769,7 @@ diff -NurpP --minimal linux-3.4.57/net/netlink/af_netlink.c linux-3.4.57-vs2.3.3 if (s) return s; -@@ -1997,7 +2003,8 @@ static void *netlink_seq_next(struct seq +@@ -1995,7 +2001,8 @@ static void *netlink_seq_next(struct seq for (; j <= hash->mask; j++) { s = sk_head(&hash->table[j]); @@ -25779,9 +25779,9 @@ diff -NurpP --minimal linux-3.4.57/net/netlink/af_netlink.c linux-3.4.57-vs2.3.3 s = sk_next(s); if (s) { iter->link = i; -diff -NurpP --minimal linux-3.4.57/net/socket.c linux-3.4.57-vs2.3.3.9/net/socket.c ---- linux-3.4.57/net/socket.c 2013-08-13 14:13:48.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/net/socket.c 2013-07-14 13:38:39.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/net/socket.c linux-3.4.83-vs2.3.3.9/net/socket.c +--- linux-3.4.83/net/socket.c 2014-03-12 09:48:30.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/net/socket.c 2014-03-12 09:55:29.000000000 +0000 @@ -98,6 +98,10 @@ #include @@ -25793,7 +25793,7 @@ diff -NurpP --minimal linux-3.4.57/net/socket.c linux-3.4.57-vs2.3.3.9/net/socke #include #include -@@ -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); @@ -25801,7 +25801,7 @@ diff -NurpP --minimal linux-3.4.57/net/socket.c linux-3.4.57-vs2.3.3.9/net/socke sock_update_classid(sock->sk); -@@ -561,7 +566,22 @@ static inline int __sock_sendmsg_nosec(s +@@ -562,7 +567,22 @@ static inline int __sock_sendmsg_nosec(s si->msg = msg; si->size = size; @@ -25825,7 +25825,7 @@ diff -NurpP --minimal linux-3.4.57/net/socket.c linux-3.4.57-vs2.3.3.9/net/socke } static inline int __sock_sendmsg(struct kiocb *iocb, struct socket *sock, -@@ -717,6 +737,7 @@ static inline int __sock_recvmsg_nosec(s +@@ -718,6 +738,7 @@ static inline int __sock_recvmsg_nosec(s struct msghdr *msg, size_t size, int flags) { struct sock_iocb *si = kiocb_to_siocb(iocb); @@ -25833,7 +25833,7 @@ diff -NurpP --minimal linux-3.4.57/net/socket.c linux-3.4.57-vs2.3.3.9/net/socke sock_update_classid(sock->sk); -@@ -726,7 +747,18 @@ static inline int __sock_recvmsg_nosec(s +@@ -727,7 +748,18 @@ static inline int __sock_recvmsg_nosec(s si->size = size; si->flags = flags; @@ -25853,7 +25853,7 @@ diff -NurpP --minimal linux-3.4.57/net/socket.c linux-3.4.57-vs2.3.3.9/net/socke } static inline int __sock_recvmsg(struct kiocb *iocb, struct socket *sock, -@@ -1211,6 +1243,13 @@ int __sock_create(struct net *net, int f +@@ -1212,6 +1244,13 @@ int __sock_create(struct net *net, int f if (type < 0 || type >= SOCK_MAX) return -EINVAL; @@ -25867,7 +25867,7 @@ diff -NurpP --minimal linux-3.4.57/net/socket.c linux-3.4.57-vs2.3.3.9/net/socke /* Compatibility. This uglymoron is moved from INET layer to here to avoid -@@ -1346,6 +1385,7 @@ SYSCALL_DEFINE3(socket, int, family, int +@@ -1347,6 +1386,7 @@ SYSCALL_DEFINE3(socket, int, family, int if (retval < 0) goto out; @@ -25875,7 +25875,7 @@ diff -NurpP --minimal linux-3.4.57/net/socket.c linux-3.4.57-vs2.3.3.9/net/socke retval = sock_map_fd(sock, flags & (O_CLOEXEC | O_NONBLOCK)); if (retval < 0) goto out_release; -@@ -1387,10 +1427,12 @@ SYSCALL_DEFINE4(socketpair, int, family, +@@ -1388,10 +1428,12 @@ SYSCALL_DEFINE4(socketpair, int, family, err = sock_create(family, type, protocol, &sock1); if (err < 0) goto out; @@ -25888,9 +25888,9 @@ diff -NurpP --minimal linux-3.4.57/net/socket.c linux-3.4.57-vs2.3.3.9/net/socke err = sock1->ops->socketpair(sock1, sock2); if (err < 0) -diff -NurpP --minimal linux-3.4.57/net/sunrpc/auth.c linux-3.4.57-vs2.3.3.9/net/sunrpc/auth.c ---- linux-3.4.57/net/sunrpc/auth.c 2011-10-24 16:45:34.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/net/sunrpc/auth.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/net/sunrpc/auth.c linux-3.4.83-vs2.3.3.9/net/sunrpc/auth.c +--- linux-3.4.83/net/sunrpc/auth.c 2011-10-24 16:45:34.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/net/sunrpc/auth.c 2012-05-21 16:15:05.000000000 +0000 @@ -14,6 +14,7 @@ #include #include @@ -25915,9 +25915,9 @@ diff -NurpP --minimal linux-3.4.57/net/sunrpc/auth.c linux-3.4.57-vs2.3.3.9/net/ }; dprintk("RPC: %5u looking up %s cred\n", -diff -NurpP --minimal linux-3.4.57/net/sunrpc/auth_unix.c linux-3.4.57-vs2.3.3.9/net/sunrpc/auth_unix.c ---- linux-3.4.57/net/sunrpc/auth_unix.c 2012-01-09 15:15:04.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/net/sunrpc/auth_unix.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/net/sunrpc/auth_unix.c linux-3.4.83-vs2.3.3.9/net/sunrpc/auth_unix.c +--- linux-3.4.83/net/sunrpc/auth_unix.c 2012-01-09 15:15:04.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/net/sunrpc/auth_unix.c 2012-05-21 16:15:05.000000000 +0000 @@ -12,12 +12,14 @@ #include #include @@ -25976,9 +25976,9 @@ diff -NurpP --minimal linux-3.4.57/net/sunrpc/auth_unix.c linux-3.4.57-vs2.3.3.9 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.4.57/net/sunrpc/clnt.c linux-3.4.57-vs2.3.3.9/net/sunrpc/clnt.c ---- linux-3.4.57/net/sunrpc/clnt.c 2013-08-13 14:13:48.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/net/sunrpc/clnt.c 2013-02-11 23:37:30.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/net/sunrpc/clnt.c linux-3.4.83-vs2.3.3.9/net/sunrpc/clnt.c +--- linux-3.4.83/net/sunrpc/clnt.c 2014-03-12 09:48:30.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/net/sunrpc/clnt.c 2014-03-12 09:55:29.000000000 +0000 @@ -31,6 +31,7 @@ #include #include @@ -25997,9 +25997,9 @@ diff -NurpP --minimal linux-3.4.57/net/sunrpc/clnt.c linux-3.4.57-vs2.3.3.9/net/ return clnt; } EXPORT_SYMBOL_GPL(rpc_create); -diff -NurpP --minimal linux-3.4.57/net/unix/af_unix.c linux-3.4.57-vs2.3.3.9/net/unix/af_unix.c ---- linux-3.4.57/net/unix/af_unix.c 2013-08-13 14:13:49.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/net/unix/af_unix.c 2013-07-14 13:38:40.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/net/unix/af_unix.c linux-3.4.83-vs2.3.3.9/net/unix/af_unix.c +--- linux-3.4.83/net/unix/af_unix.c 2014-03-12 09:48:31.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/net/unix/af_unix.c 2014-03-12 09:55:29.000000000 +0000 @@ -114,6 +114,8 @@ #include #include @@ -26018,7 +26018,7 @@ diff -NurpP --minimal linux-3.4.57/net/unix/af_unix.c linux-3.4.57-vs2.3.3.9/net if (u->addr->len == len && !memcmp(u->addr->name, sunname, len)) goto found; -@@ -2265,6 +2269,8 @@ static struct sock *unix_seq_idx(struct +@@ -2278,6 +2282,8 @@ static struct sock *unix_seq_idx(struct for (s = first_unix_socket(&iter->i); s; s = next_unix_socket(&iter->i, s)) { if (sock_net(s) != seq_file_net(seq)) continue; @@ -26027,7 +26027,7 @@ diff -NurpP --minimal linux-3.4.57/net/unix/af_unix.c linux-3.4.57-vs2.3.3.9/net if (off == pos) return s; ++off; -@@ -2289,7 +2295,8 @@ static void *unix_seq_next(struct seq_fi +@@ -2302,7 +2308,8 @@ static void *unix_seq_next(struct seq_fi sk = first_unix_socket(&iter->i); else sk = next_unix_socket(&iter->i, sk); @@ -26037,9 +26037,9 @@ diff -NurpP --minimal linux-3.4.57/net/unix/af_unix.c linux-3.4.57-vs2.3.3.9/net sk = next_unix_socket(&iter->i, sk); return sk; } -diff -NurpP --minimal linux-3.4.57/scripts/checksyscalls.sh linux-3.4.57-vs2.3.3.9/scripts/checksyscalls.sh ---- linux-3.4.57/scripts/checksyscalls.sh 2012-03-19 18:47:34.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/scripts/checksyscalls.sh 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/scripts/checksyscalls.sh linux-3.4.83-vs2.3.3.9/scripts/checksyscalls.sh +--- linux-3.4.83/scripts/checksyscalls.sh 2012-03-19 18:47:34.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/scripts/checksyscalls.sh 2012-05-21 16:15:05.000000000 +0000 @@ -193,7 +193,6 @@ cat << EOF #define __IGNORE_afs_syscall #define __IGNORE_getpmsg @@ -26048,9 +26048,9 @@ diff -NurpP --minimal linux-3.4.57/scripts/checksyscalls.sh linux-3.4.57-vs2.3.3 EOF } -diff -NurpP --minimal linux-3.4.57/security/commoncap.c linux-3.4.57-vs2.3.3.9/security/commoncap.c ---- linux-3.4.57/security/commoncap.c 2012-05-21 16:07:41.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/security/commoncap.c 2012-05-21 16:15:05.000000000 +0000 +diff -NurpP --minimal linux-3.4.83/security/commoncap.c linux-3.4.83-vs2.3.3.9/security/commoncap.c +--- linux-3.4.83/security/commoncap.c 2012-05-21 16:07:41.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/security/commoncap.c 2012-05-21 16:15:05.000000000 +0000 @@ -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) @@ -26092,10 +26092,10 @@ diff -NurpP --minimal linux-3.4.57/security/commoncap.c linux-3.4.57-vs2.3.3.9/s return -EPERM; return 0; } -diff -NurpP --minimal linux-3.4.57/security/selinux/hooks.c linux-3.4.57-vs2.3.3.9/security/selinux/hooks.c ---- linux-3.4.57/security/selinux/hooks.c 2013-08-13 14:13:49.000000000 +0000 -+++ linux-3.4.57-vs2.3.3.9/security/selinux/hooks.c 2012-09-01 08:50:49.000000000 +0000 -@@ -66,7 +66,6 @@ +diff -NurpP --minimal linux-3.4.83/security/selinux/hooks.c linux-3.4.83-vs2.3.3.9/security/selinux/hooks.c +--- linux-3.4.83/security/selinux/hooks.c 2014-03-12 09:48:31.000000000 +0000 ++++ linux-3.4.83-vs2.3.3.9/security/selinux/hooks.c 2014-03-12 09:55:29.000000000 +0000 +@@ -67,7 +67,6 @@ #include #include #include /* for Unix socket types */ diff --git a/kernel.spec b/kernel.spec index cf9ed796..2cbc9899 100644 --- a/kernel.spec +++ b/kernel.spec @@ -91,7 +91,7 @@ %define rel 1 %define basever 3.4 -%define postver .82 +%define postver .83 %define versuffix -%{basever} @@ -140,7 +140,7 @@ Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz # Source0-md5: 967f72983655e2479f951195953e8480 %if "%{postver}" != ".0" Patch0: http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.xz -# Patch0-md5: 1f6fcc1f91fcce2a0f71416c3251e83e +# Patch0-md5: 704eaa463fe3fc1a91e05e8b3bcbb418 %endif Source1: kernel.sysconfig