[packages/kernel/LINUX_3_4] - vserver patch updated to patch-3.4.87-vs2.3.3.9.diff
baggins
baggins at pld-linux.org
Thu Apr 24 13:45:30 CEST 2014
commit 5bf41d00788c75b699b4815216b64497eb3811ff
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Thu Apr 24 13:44:50 2014 +0200
- vserver patch updated to patch-3.4.87-vs2.3.3.9.diff
kernel-vserver-2.3.patch | 2396 +++++++++++++++++++++++-----------------------
1 file changed, 1199 insertions(+), 1197 deletions(-)
---
diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index 99dd265..cf66eb2 100644
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -1,6 +1,6 @@
-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
+diff -NurpP --minimal linux-3.4.87/Documentation/vserver/debug.txt linux-3.4.87-vs2.3.3.9/Documentation/vserver/debug.txt
+--- linux-3.4.87/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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.83/Documentation/vserver/debug.txt linux-3.4.83-
+ 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.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
+diff -NurpP --minimal linux-3.4.87/arch/alpha/Kconfig linux-3.4.87-vs2.3.3.9/arch/alpha/Kconfig
+--- linux-3.4.87/arch/alpha/Kconfig 2012-05-21 16:06:12.000000000 +0000
++++ linux-3.4.87-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.83/arch/alpha/Kconfig linux-3.4.83-vs2.3.3.9/arc
source "security/Kconfig"
source "crypto/Kconfig"
-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
+diff -NurpP --minimal linux-3.4.87/arch/alpha/kernel/entry.S linux-3.4.87-vs2.3.3.9/arch/alpha/kernel/entry.S
+--- linux-3.4.87/arch/alpha/kernel/entry.S 2010-10-21 11:06:45.000000000 +0000
++++ linux-3.4.87-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.83/arch/alpha/kernel/entry.S linux-3.4.83-vs2.3.
ret
.end sys_getxpid
-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
+diff -NurpP --minimal linux-3.4.87/arch/alpha/kernel/ptrace.c linux-3.4.87-vs2.3.3.9/arch/alpha/kernel/ptrace.c
+--- linux-3.4.87/arch/alpha/kernel/ptrace.c 2012-05-21 16:06:12.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/arch/alpha/kernel/ptrace.c 2012-05-21 16:15:04.000000000 +0000
@@ -13,6 +13,7 @@
#include <linux/user.h>
#include <linux/security.h>
@@ -214,9 +214,9 @@ diff -NurpP --minimal linux-3.4.83/arch/alpha/kernel/ptrace.c linux-3.4.83-vs2.3
#include <asm/uaccess.h>
#include <asm/pgtable.h>
-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
+diff -NurpP --minimal linux-3.4.87/arch/alpha/kernel/systbls.S linux-3.4.87-vs2.3.3.9/arch/alpha/kernel/systbls.S
+--- linux-3.4.87/arch/alpha/kernel/systbls.S 2012-01-09 15:13:54.000000000 +0000
++++ linux-3.4.87-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.83/arch/alpha/kernel/systbls.S linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/arch/alpha/kernel/traps.c linux-3.4.87-vs2.3.3.9/arch/alpha/kernel/traps.c
+--- linux-3.4.87/arch/alpha/kernel/traps.c 2012-05-21 16:06:12.000000000 +0000
++++ linux-3.4.87-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,10 +239,10 @@ diff -NurpP --minimal linux-3.4.83/arch/alpha/kernel/traps.c linux-3.4.83-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.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"
+diff -NurpP --minimal linux-3.4.87/arch/arm/Kconfig linux-3.4.87-vs2.3.3.9/arch/arm/Kconfig
+--- linux-3.4.87/arch/arm/Kconfig 2014-04-21 17:15:55.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/arch/arm/Kconfig 2014-04-21 18:56:34.000000000 +0000
+@@ -2310,6 +2310,8 @@ source "fs/Kconfig"
source "arch/arm/Kconfig.debug"
@@ -251,9 +251,9 @@ diff -NurpP --minimal linux-3.4.83/arch/arm/Kconfig linux-3.4.83-vs2.3.3.9/arch/
source "security/Kconfig"
source "crypto/Kconfig"
-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
+diff -NurpP --minimal linux-3.4.87/arch/arm/kernel/calls.S linux-3.4.87-vs2.3.3.9/arch/arm/kernel/calls.S
+--- linux-3.4.87/arch/arm/kernel/calls.S 2012-01-09 15:13:54.000000000 +0000
++++ linux-3.4.87-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.83/arch/arm/kernel/calls.S linux-3.4.83-vs2.3.3.
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-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
+diff -NurpP --minimal linux-3.4.87/arch/arm/kernel/process.c linux-3.4.87-vs2.3.3.9/arch/arm/kernel/process.c
+--- linux-3.4.87/arch/arm/kernel/process.c 2014-04-21 17:15:55.000000000 +0000
++++ linux-3.4.87-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,9 +276,9 @@ diff -NurpP --minimal linux-3.4.83/arch/arm/kernel/process.c linux-3.4.83-vs2.3.
__show_regs(regs);
dump_stack();
}
-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
+diff -NurpP --minimal linux-3.4.87/arch/arm/kernel/traps.c linux-3.4.87-vs2.3.3.9/arch/arm/kernel/traps.c
+--- linux-3.4.87/arch/arm/kernel/traps.c 2014-04-21 17:15:56.000000000 +0000
++++ linux-3.4.87-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();
@@ -290,9 +290,9 @@ diff -NurpP --minimal linux-3.4.83/arch/arm/kernel/traps.c linux-3.4.83-vs2.3.3.
if (!user_mode(regs) || in_interrupt()) {
dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
-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
+diff -NurpP --minimal linux-3.4.87/arch/cris/Kconfig linux-3.4.87-vs2.3.3.9/arch/cris/Kconfig
+--- linux-3.4.87/arch/cris/Kconfig 2012-03-19 18:46:39.000000000 +0000
++++ linux-3.4.87-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.83/arch/cris/Kconfig linux-3.4.83-vs2.3.3.9/arch
source "security/Kconfig"
source "crypto/Kconfig"
-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
+diff -NurpP --minimal linux-3.4.87/arch/frv/kernel/kernel_thread.S linux-3.4.87-vs2.3.3.9/arch/frv/kernel/kernel_thread.S
+--- linux-3.4.87/arch/frv/kernel/kernel_thread.S 2008-12-24 23:26:37.000000000 +0000
++++ linux-3.4.87-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.83/arch/frv/kernel/kernel_thread.S linux-3.4.83-
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.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
+diff -NurpP --minimal linux-3.4.87/arch/h8300/Kconfig linux-3.4.87-vs2.3.3.9/arch/h8300/Kconfig
+--- linux-3.4.87/arch/h8300/Kconfig 2012-03-19 18:46:39.000000000 +0000
++++ linux-3.4.87-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.83/arch/h8300/Kconfig linux-3.4.83-vs2.3.3.9/arc
source "security/Kconfig"
source "crypto/Kconfig"
-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
+diff -NurpP --minimal linux-3.4.87/arch/ia64/Kconfig linux-3.4.87-vs2.3.3.9/arch/ia64/Kconfig
+--- linux-3.4.87/arch/ia64/Kconfig 2012-03-19 18:46:39.000000000 +0000
++++ linux-3.4.87-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.83/arch/ia64/Kconfig linux-3.4.83-vs2.3.3.9/arch
source "security/Kconfig"
source "crypto/Kconfig"
-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
+diff -NurpP --minimal linux-3.4.87/arch/ia64/kernel/entry.S linux-3.4.87-vs2.3.3.9/arch/ia64/kernel/entry.S
+--- linux-3.4.87/arch/ia64/kernel/entry.S 2012-03-19 18:46:40.000000000 +0000
++++ linux-3.4.87-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.83/arch/ia64/kernel/entry.S linux-3.4.83-vs2.3.3
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-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
+diff -NurpP --minimal linux-3.4.87/arch/ia64/kernel/process.c linux-3.4.87-vs2.3.3.9/arch/ia64/kernel/process.c
+--- linux-3.4.87/arch/ia64/kernel/process.c 2014-04-21 17:15:57.000000000 +0000
++++ linux-3.4.87-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.83/arch/ia64/kernel/process.c linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/arch/ia64/kernel/ptrace.c linux-3.4.87-vs2.3.3.9/arch/ia64/kernel/ptrace.c
+--- linux-3.4.87/arch/ia64/kernel/ptrace.c 2012-05-21 16:06:26.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/arch/ia64/kernel/ptrace.c 2012-05-21 16:15:04.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/regset.h>
#include <linux/elf.h>
@@ -375,9 +375,9 @@ diff -NurpP --minimal linux-3.4.83/arch/ia64/kernel/ptrace.c linux-3.4.83-vs2.3.
#include <asm/pgtable.h>
#include <asm/processor.h>
-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
+diff -NurpP --minimal linux-3.4.87/arch/ia64/kernel/traps.c linux-3.4.87-vs2.3.3.9/arch/ia64/kernel/traps.c
+--- linux-3.4.87/arch/ia64/kernel/traps.c 2012-05-21 16:06:26.000000000 +0000
++++ linux-3.4.87-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.83/arch/ia64/kernel/traps.c linux-3.4.83-vs2.3.3
}
}
}
-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
+diff -NurpP --minimal linux-3.4.87/arch/m32r/kernel/traps.c linux-3.4.87-vs2.3.3.9/arch/m32r/kernel/traps.c
+--- linux-3.4.87/arch/m32r/kernel/traps.c 2012-05-21 16:06:26.000000000 +0000
++++ linux-3.4.87-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.83/arch/m32r/kernel/traps.c linux-3.4.83-vs2.3.3
/*
* When in-kernel, we also print out the stack and code at the
-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
+diff -NurpP --minimal linux-3.4.87/arch/m68k/Kconfig linux-3.4.87-vs2.3.3.9/arch/m68k/Kconfig
+--- linux-3.4.87/arch/m68k/Kconfig 2012-05-21 16:06:26.000000000 +0000
++++ linux-3.4.87-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.83/arch/m68k/Kconfig linux-3.4.83-vs2.3.3.9/arch
source "security/Kconfig"
source "crypto/Kconfig"
-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
+diff -NurpP --minimal linux-3.4.87/arch/mips/Kconfig linux-3.4.87-vs2.3.3.9/arch/mips/Kconfig
+--- linux-3.4.87/arch/mips/Kconfig 2014-04-21 17:15:57.000000000 +0000
++++ linux-3.4.87-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.83/arch/mips/Kconfig linux-3.4.83-vs2.3.3.9/arch
source "security/Kconfig"
source "crypto/Kconfig"
-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
+diff -NurpP --minimal linux-3.4.87/arch/mips/kernel/ptrace.c linux-3.4.87-vs2.3.3.9/arch/mips/kernel/ptrace.c
+--- linux-3.4.87/arch/mips/kernel/ptrace.c 2012-05-21 16:06:27.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/arch/mips/kernel/ptrace.c 2012-05-21 16:15:04.000000000 +0000
@@ -25,6 +25,7 @@
#include <linux/security.h>
#include <linux/audit.h>
@@ -462,9 +462,9 @@ diff -NurpP --minimal linux-3.4.83/arch/mips/kernel/ptrace.c linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/arch/mips/kernel/scall32-o32.S linux-3.4.87-vs2.3.3.9/arch/mips/kernel/scall32-o32.S
+--- linux-3.4.87/arch/mips/kernel/scall32-o32.S 2012-01-09 15:14:05.000000000 +0000
++++ linux-3.4.87-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.83/arch/mips/kernel/scall32-o32.S linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/arch/mips/kernel/scall64-64.S linux-3.4.87-vs2.3.3.9/arch/mips/kernel/scall64-64.S
+--- linux-3.4.87/arch/mips/kernel/scall64-64.S 2012-01-09 15:14:05.000000000 +0000
++++ linux-3.4.87-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.83/arch/mips/kernel/scall64-64.S linux-3.4.83-vs
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-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
+diff -NurpP --minimal linux-3.4.87/arch/mips/kernel/scall64-n32.S linux-3.4.87-vs2.3.3.9/arch/mips/kernel/scall64-n32.S
+--- linux-3.4.87/arch/mips/kernel/scall64-n32.S 2012-01-09 15:14:05.000000000 +0000
++++ linux-3.4.87-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.83/arch/mips/kernel/scall64-n32.S linux-3.4.83-v
PTR compat_sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-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
+diff -NurpP --minimal linux-3.4.87/arch/mips/kernel/scall64-o32.S linux-3.4.87-vs2.3.3.9/arch/mips/kernel/scall64-o32.S
+--- linux-3.4.87/arch/mips/kernel/scall64-o32.S 2012-01-09 15:14:05.000000000 +0000
++++ linux-3.4.87-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.83/arch/mips/kernel/scall64-o32.S linux-3.4.83-v
PTR sys_32_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-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
+diff -NurpP --minimal linux-3.4.87/arch/mips/kernel/traps.c linux-3.4.87-vs2.3.3.9/arch/mips/kernel/traps.c
+--- linux-3.4.87/arch/mips/kernel/traps.c 2012-05-21 16:06:27.000000000 +0000
++++ linux-3.4.87-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.83/arch/mips/kernel/traps.c linux-3.4.83-vs2.3.3
if (cpu_has_userlocal) {
unsigned long tls;
-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
+diff -NurpP --minimal linux-3.4.87/arch/parisc/Kconfig linux-3.4.87-vs2.3.3.9/arch/parisc/Kconfig
+--- linux-3.4.87/arch/parisc/Kconfig 2012-03-19 18:46:44.000000000 +0000
++++ linux-3.4.87-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.83/arch/parisc/Kconfig linux-3.4.83-vs2.3.3.9/ar
source "security/Kconfig"
source "crypto/Kconfig"
-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
+diff -NurpP --minimal linux-3.4.87/arch/parisc/kernel/syscall_table.S linux-3.4.87-vs2.3.3.9/arch/parisc/kernel/syscall_table.S
+--- linux-3.4.87/arch/parisc/kernel/syscall_table.S 2011-10-24 16:45:00.000000000 +0000
++++ linux-3.4.87-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.83/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.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
+diff -NurpP --minimal linux-3.4.87/arch/parisc/kernel/traps.c linux-3.4.87-vs2.3.3.9/arch/parisc/kernel/traps.c
+--- linux-3.4.87/arch/parisc/kernel/traps.c 2014-04-21 17:15:58.000000000 +0000
++++ linux-3.4.87-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.83/arch/parisc/kernel/traps.c linux-3.4.83-vs2.3
/* Wot's wrong wif bein' racy? */
if (current->thread.flags & PARISC_KERNEL_DEATH) {
-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
+diff -NurpP --minimal linux-3.4.87/arch/parisc/mm/fault.c linux-3.4.87-vs2.3.3.9/arch/parisc/mm/fault.c
+--- linux-3.4.87/arch/parisc/mm/fault.c 2010-08-02 14:52:06.000000000 +0000
++++ linux-3.4.87-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,9 +592,9 @@ diff -NurpP --minimal linux-3.4.83/arch/parisc/mm/fault.c linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/arch/powerpc/Kconfig linux-3.4.87-vs2.3.3.9/arch/powerpc/Kconfig
+--- linux-3.4.87/arch/powerpc/Kconfig 2014-04-21 17:15:58.000000000 +0000
++++ linux-3.4.87-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.83/arch/powerpc/Kconfig linux-3.4.83-vs2.3.3.9/a
source "security/Kconfig"
config KEYS_COMPAT
-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
+diff -NurpP --minimal linux-3.4.87/arch/powerpc/include/asm/unistd.h linux-3.4.87-vs2.3.3.9/arch/powerpc/include/asm/unistd.h
+--- linux-3.4.87/arch/powerpc/include/asm/unistd.h 2012-01-09 15:14:05.000000000 +0000
++++ linux-3.4.87-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.83/arch/powerpc/include/asm/unistd.h linux-3.4.8
#define __NR_migrate_pages 258
#define __NR_mbind 259
#define __NR_get_mempolicy 260
-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
+diff -NurpP --minimal linux-3.4.87/arch/powerpc/kernel/process.c linux-3.4.87-vs2.3.3.9/arch/powerpc/kernel/process.c
+--- linux-3.4.87/arch/powerpc/kernel/process.c 2014-04-21 17:15:58.000000000 +0000
++++ linux-3.4.87-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.83/arch/powerpc/kernel/process.c linux-3.4.83-vs
#ifdef CONFIG_SMP
printk(" CPU: %d", raw_smp_processor_id());
-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
+diff -NurpP --minimal linux-3.4.87/arch/powerpc/kernel/traps.c linux-3.4.87-vs2.3.3.9/arch/powerpc/kernel/traps.c
+--- linux-3.4.87/arch/powerpc/kernel/traps.c 2014-04-21 17:15:58.000000000 +0000
++++ linux-3.4.87-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.83/arch/powerpc/kernel/traps.c linux-3.4.83-vs2.
regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted());
}
-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
+diff -NurpP --minimal linux-3.4.87/arch/s390/Kconfig linux-3.4.87-vs2.3.3.9/arch/s390/Kconfig
+--- linux-3.4.87/arch/s390/Kconfig 2012-05-21 16:06:32.000000000 +0000
++++ linux-3.4.87-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.83/arch/s390/Kconfig linux-3.4.83-vs2.3.3.9/arch
source "security/Kconfig"
source "crypto/Kconfig"
-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
+diff -NurpP --minimal linux-3.4.87/arch/s390/include/asm/tlb.h linux-3.4.87-vs2.3.3.9/arch/s390/include/asm/tlb.h
+--- linux-3.4.87/arch/s390/include/asm/tlb.h 2012-05-21 16:06:32.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/arch/s390/include/asm/tlb.h 2012-05-21 16:15:04.000000000 +0000
@@ -24,6 +24,7 @@
#include <linux/mm.h>
#include <linux/pagemap.h>
@@ -669,9 +669,9 @@ diff -NurpP --minimal linux-3.4.83/arch/s390/include/asm/tlb.h linux-3.4.83-vs2.
#include <asm/processor.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-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
+diff -NurpP --minimal linux-3.4.87/arch/s390/include/asm/unistd.h linux-3.4.87-vs2.3.3.9/arch/s390/include/asm/unistd.h
+--- linux-3.4.87/arch/s390/include/asm/unistd.h 2012-03-19 18:46:48.000000000 +0000
++++ linux-3.4.87-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.83/arch/s390/include/asm/unistd.h linux-3.4.83-v
#define __NR_statfs64 265
#define __NR_fstatfs64 266
#define __NR_remap_file_pages 267
-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
+diff -NurpP --minimal linux-3.4.87/arch/s390/kernel/ptrace.c linux-3.4.87-vs2.3.3.9/arch/s390/kernel/ptrace.c
+--- linux-3.4.87/arch/s390/kernel/ptrace.c 2012-05-21 16:06:32.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/arch/s390/kernel/ptrace.c 2012-05-21 16:15:04.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/tracehook.h>
#include <linux/seccomp.h>
@@ -692,9 +692,9 @@ diff -NurpP --minimal linux-3.4.83/arch/s390/kernel/ptrace.c linux-3.4.83-vs2.3.
#include <trace/syscall.h>
#include <asm/segment.h>
#include <asm/page.h>
-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
+diff -NurpP --minimal linux-3.4.87/arch/s390/kernel/syscalls.S linux-3.4.87-vs2.3.3.9/arch/s390/kernel/syscalls.S
+--- linux-3.4.87/arch/s390/kernel/syscalls.S 2012-01-09 15:14:06.000000000 +0000
++++ linux-3.4.87-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.83/arch/s390/kernel/syscalls.S linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/arch/sh/Kconfig linux-3.4.87-vs2.3.3.9/arch/sh/Kconfig
+--- linux-3.4.87/arch/sh/Kconfig 2012-05-21 16:06:33.000000000 +0000
++++ linux-3.4.87-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.83/arch/sh/Kconfig linux-3.4.83-vs2.3.3.9/arch/s
source "security/Kconfig"
source "crypto/Kconfig"
-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
+diff -NurpP --minimal linux-3.4.87/arch/sh/kernel/irq.c linux-3.4.87-vs2.3.3.9/arch/sh/kernel/irq.c
+--- linux-3.4.87/arch/sh/kernel/irq.c 2011-07-22 09:17:41.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/arch/sh/kernel/irq.c 2012-05-21 16:15:04.000000000 +0000
@@ -14,6 +14,7 @@
#include <linux/ftrace.h>
#include <linux/delay.h>
@@ -727,9 +727,9 @@ diff -NurpP --minimal linux-3.4.83/arch/sh/kernel/irq.c linux-3.4.83-vs2.3.3.9/a
#include <asm/processor.h>
#include <asm/machvec.h>
#include <asm/uaccess.h>
-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
+diff -NurpP --minimal linux-3.4.87/arch/sparc/Kconfig linux-3.4.87-vs2.3.3.9/arch/sparc/Kconfig
+--- linux-3.4.87/arch/sparc/Kconfig 2014-04-21 17:15:59.000000000 +0000
++++ linux-3.4.87-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.83/arch/sparc/Kconfig linux-3.4.83-vs2.3.3.9/arc
source "security/Kconfig"
source "crypto/Kconfig"
-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
+diff -NurpP --minimal linux-3.4.87/arch/sparc/include/asm/unistd.h linux-3.4.87-vs2.3.3.9/arch/sparc/include/asm/unistd.h
+--- linux-3.4.87/arch/sparc/include/asm/unistd.h 2012-01-09 15:14:07.000000000 +0000
++++ linux-3.4.87-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.83/arch/sparc/include/asm/unistd.h linux-3.4.83-
#define __NR_io_setup 268
#define __NR_io_destroy 269
#define __NR_io_submit 270
-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
+diff -NurpP --minimal linux-3.4.87/arch/sparc/kernel/systbls_32.S linux-3.4.87-vs2.3.3.9/arch/sparc/kernel/systbls_32.S
+--- linux-3.4.87/arch/sparc/kernel/systbls_32.S 2012-01-09 15:14:09.000000000 +0000
++++ linux-3.4.87-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.83/arch/sparc/kernel/systbls_32.S linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/arch/sparc/kernel/systbls_64.S linux-3.4.87-vs2.3.3.9/arch/sparc/kernel/systbls_64.S
+--- linux-3.4.87/arch/sparc/kernel/systbls_64.S 2014-04-21 17:15:59.000000000 +0000
++++ linux-3.4.87-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.83/arch/sparc/kernel/systbls_64.S linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/arch/um/Kconfig.rest linux-3.4.87-vs2.3.3.9/arch/um/Kconfig.rest
+--- linux-3.4.87/arch/um/Kconfig.rest 2012-01-09 15:14:09.000000000 +0000
++++ linux-3.4.87-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.83/arch/um/Kconfig.rest linux-3.4.83-vs2.3.3.9/a
source "security/Kconfig"
source "crypto/Kconfig"
-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
+diff -NurpP --minimal linux-3.4.87/arch/x86/Kconfig linux-3.4.87-vs2.3.3.9/arch/x86/Kconfig
+--- linux-3.4.87/arch/x86/Kconfig 2014-04-21 17:16:00.000000000 +0000
++++ linux-3.4.87-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.83/arch/x86/Kconfig linux-3.4.83-vs2.3.3.9/arch/
source "security/Kconfig"
source "crypto/Kconfig"
-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
+diff -NurpP --minimal linux-3.4.87/arch/x86/syscalls/syscall_32.tbl linux-3.4.87-vs2.3.3.9/arch/x86/syscalls/syscall_32.tbl
+--- linux-3.4.87/arch/x86/syscalls/syscall_32.tbl 2012-05-21 16:06:42.000000000 +0000
++++ linux-3.4.87-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.83/arch/x86/syscalls/syscall_32.tbl linux-3.4.83
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.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
+diff -NurpP --minimal linux-3.4.87/arch/x86/syscalls/syscall_64.tbl linux-3.4.87-vs2.3.3.9/arch/x86/syscalls/syscall_64.tbl
+--- linux-3.4.87/arch/x86/syscalls/syscall_64.tbl 2014-04-21 17:16:00.000000000 +0000
++++ linux-3.4.87-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.83/arch/x86/syscalls/syscall_64.tbl linux-3.4.83
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.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
+diff -NurpP --minimal linux-3.4.87/drivers/block/Kconfig linux-3.4.87-vs2.3.3.9/drivers/block/Kconfig
+--- linux-3.4.87/drivers/block/Kconfig 2012-05-21 16:06:43.000000000 +0000
++++ linux-3.4.87-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.83/drivers/block/Kconfig linux-3.4.83-vs2.3.3.9/
config BLK_DEV_NBD
tristate "Network block device support"
depends on NET
-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
+diff -NurpP --minimal linux-3.4.87/drivers/block/Makefile linux-3.4.87-vs2.3.3.9/drivers/block/Makefile
+--- linux-3.4.87/drivers/block/Makefile 2012-03-19 18:46:52.000000000 +0000
++++ linux-3.4.87-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.83/drivers/block/Makefile linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/drivers/block/loop.c linux-3.4.87-vs2.3.3.9/drivers/block/loop.c
+--- linux-3.4.87/drivers/block/loop.c 2014-04-21 17:16:02.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/drivers/block/loop.c 2014-03-12 09:55:28.000000000 +0000
@@ -76,6 +76,7 @@
#include <linux/sysfs.h>
#include <linux/miscdevice.h>
@@ -918,9 +918,9 @@ diff -NurpP --minimal linux-3.4.83/drivers/block/loop.c linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/drivers/block/vroot.c linux-3.4.87-vs2.3.3.9/drivers/block/vroot.c
+--- linux-3.4.87/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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.83/drivers/block/vroot.c linux-3.4.83-vs2.3.3.9/
+
+#endif
+
-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
+diff -NurpP --minimal linux-3.4.87/drivers/infiniband/Kconfig linux-3.4.87-vs2.3.3.9/drivers/infiniband/Kconfig
+--- linux-3.4.87/drivers/infiniband/Kconfig 2012-03-19 18:46:54.000000000 +0000
++++ linux-3.4.87-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.83/drivers/infiniband/Kconfig linux-3.4.83-vs2.3
default y
source "drivers/infiniband/hw/mthca/Kconfig"
-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
+diff -NurpP --minimal linux-3.4.87/drivers/infiniband/core/addr.c linux-3.4.87-vs2.3.3.9/drivers/infiniband/core/addr.c
+--- linux-3.4.87/drivers/infiniband/core/addr.c 2012-05-21 16:06:46.000000000 +0000
++++ linux-3.4.87-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.83/drivers/infiniband/core/addr.c linux-3.4.83-v
if (ret)
goto put;
-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
+diff -NurpP --minimal linux-3.4.87/drivers/md/dm-ioctl.c linux-3.4.87-vs2.3.3.9/drivers/md/dm-ioctl.c
+--- linux-3.4.87/drivers/md/dm-ioctl.c 2014-04-21 17:16:05.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/drivers/md/dm-ioctl.c 2014-03-12 09:55:28.000000000 +0000
@@ -16,6 +16,7 @@
#include <linux/dm-ioctl.h>
#include <linux/hdreg.h>
@@ -1325,9 +1325,9 @@ diff -NurpP --minimal linux-3.4.83/drivers/md/dm-ioctl.c linux-3.4.83-vs2.3.3.9/
return -EACCES;
if (_IOC_TYPE(command) != DM_IOCTL)
-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
+diff -NurpP --minimal linux-3.4.87/drivers/md/dm.c linux-3.4.87-vs2.3.3.9/drivers/md/dm.c
+--- linux-3.4.87/drivers/md/dm.c 2014-04-21 17:16:07.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/drivers/md/dm.c 2014-03-12 09:55:28.000000000 +0000
@@ -19,6 +19,7 @@
#include <linux/idr.h>
#include <linux/hdreg.h>
@@ -1401,9 +1401,9 @@ diff -NurpP --minimal linux-3.4.83/drivers/md/dm.c linux-3.4.83-vs2.3.3.9/driver
md->queue = blk_alloc_queue(GFP_KERNEL);
if (!md->queue)
goto bad_queue;
-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
+diff -NurpP --minimal linux-3.4.87/drivers/md/dm.h linux-3.4.87-vs2.3.3.9/drivers/md/dm.h
+--- linux-3.4.87/drivers/md/dm.h 2014-04-21 17:16:07.000000000 +0000
++++ linux-3.4.87-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.83/drivers/md/dm.h linux-3.4.83-vs2.3.3.9/driver
/*-----------------------------------------------------------------
* Internal table functions.
*---------------------------------------------------------------*/
-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
+diff -NurpP --minimal linux-3.4.87/drivers/net/tun.c linux-3.4.87-vs2.3.3.9/drivers/net/tun.c
+--- linux-3.4.87/drivers/net/tun.c 2014-04-21 17:16:11.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/drivers/net/tun.c 2014-03-12 09:55:28.000000000 +0000
@@ -64,6 +64,7 @@
#include <linux/nsproxy.h>
#include <linux/virtio_net.h>
@@ -1485,9 +1485,9 @@ diff -NurpP --minimal linux-3.4.83/drivers/net/tun.c linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/drivers/tty/sysrq.c linux-3.4.87-vs2.3.3.9/drivers/tty/sysrq.c
+--- linux-3.4.87/drivers/tty/sysrq.c 2012-05-21 16:07:16.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/drivers/tty/sysrq.c 2012-05-21 16:15:04.000000000 +0000
@@ -41,6 +41,7 @@
#include <linux/slab.h>
#include <linux/input.h>
@@ -1539,9 +1539,9 @@ diff -NurpP --minimal linux-3.4.83/drivers/tty/sysrq.c linux-3.4.83-vs2.3.3.9/dr
else
retval = -1;
return retval;
-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
+diff -NurpP --minimal linux-3.4.87/drivers/tty/tty_io.c linux-3.4.87-vs2.3.3.9/drivers/tty/tty_io.c
+--- linux-3.4.87/drivers/tty/tty_io.c 2014-04-21 17:16:17.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/drivers/tty/tty_io.c 2013-07-14 13:38:33.000000000 +0000
@@ -104,6 +104,7 @@
#include <linux/kmod.h>
@@ -1568,9 +1568,9 @@ diff -NurpP --minimal linux-3.4.83/drivers/tty/tty_io.c linux-3.4.83-vs2.3.3.9/d
if (pgrp_nr < 0)
return -EINVAL;
rcu_read_lock();
-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
+diff -NurpP --minimal linux-3.4.87/fs/attr.c linux-3.4.87-vs2.3.3.9/fs/attr.c
+--- linux-3.4.87/fs/attr.c 2014-04-21 17:16:20.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/attr.c 2012-06-28 14:45:07.000000000 +0000
@@ -14,6 +14,9 @@
#include <linux/fcntl.h>
#include <linux/security.h>
@@ -1611,9 +1611,9 @@ diff -NurpP --minimal linux-3.4.83/fs/attr.c linux-3.4.83-vs2.3.3.9/fs/attr.c
if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
return -EPERM;
}
-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
+diff -NurpP --minimal linux-3.4.87/fs/block_dev.c linux-3.4.87-vs2.3.3.9/fs/block_dev.c
+--- linux-3.4.87/fs/block_dev.c 2014-04-21 17:16:20.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/block_dev.c 2013-08-13 17:07:36.000000000 +0000
@@ -27,6 +27,7 @@
#include <linux/namei.h>
#include <linux/log2.h>
@@ -1651,9 +1651,9 @@ diff -NurpP --minimal linux-3.4.83/fs/block_dev.c linux-3.4.83-vs2.3.3.9/fs/bloc
if (bdev) {
spin_lock(&bdev_lock);
if (!inode->i_bdev) {
-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
+diff -NurpP --minimal linux-3.4.87/fs/btrfs/ctree.h linux-3.4.87-vs2.3.3.9/fs/btrfs/ctree.h
+--- linux-3.4.87/fs/btrfs/ctree.h 2012-05-21 16:07:18.000000000 +0000
++++ linux-3.4.87-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.83/fs/btrfs/ctree.h linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/fs/btrfs/disk-io.c linux-3.4.87-vs2.3.3.9/fs/btrfs/disk-io.c
+--- linux-3.4.87/fs/btrfs/disk-io.c 2012-05-21 16:07:18.000000000 +0000
++++ linux-3.4.87-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.83/fs/btrfs/disk-io.c linux-3.4.83-vs2.3.3.9/fs/
features = btrfs_super_incompat_flags(disk_super) &
~BTRFS_FEATURE_INCOMPAT_SUPP;
if (features) {
-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
+diff -NurpP --minimal linux-3.4.87/fs/btrfs/inode.c linux-3.4.87-vs2.3.3.9/fs/btrfs/inode.c
+--- linux-3.4.87/fs/btrfs/inode.c 2014-04-21 17:16:20.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/btrfs/inode.c 2013-07-14 13:38:34.000000000 +0000
@@ -39,6 +39,7 @@
#include <linux/slab.h>
#include <linux/ratelimit.h>
@@ -1786,9 +1786,9 @@ diff -NurpP --minimal linux-3.4.83/fs/btrfs/inode.c linux-3.4.83-vs2.3.3.9/fs/bt
.get_acl = btrfs_get_acl,
};
-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
+diff -NurpP --minimal linux-3.4.87/fs/btrfs/ioctl.c linux-3.4.87-vs2.3.3.9/fs/btrfs/ioctl.c
+--- linux-3.4.87/fs/btrfs/ioctl.c 2014-04-21 17:16:20.000000000 +0000
++++ linux-3.4.87-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.83/fs/btrfs/ioctl.c linux-3.4.83-vs2.3.3.9/fs/bt
if (flags & FS_APPEND_FL)
ip->flags |= BTRFS_INODE_APPEND;
else
-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
+diff -NurpP --minimal linux-3.4.87/fs/btrfs/super.c linux-3.4.87-vs2.3.3.9/fs/btrfs/super.c
+--- linux-3.4.87/fs/btrfs/super.c 2012-05-21 16:07:19.000000000 +0000
++++ linux-3.4.87-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.83/fs/btrfs/super.c linux-3.4.83-vs2.3.3.9/fs/bt
if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
return 0;
-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
+diff -NurpP --minimal linux-3.4.87/fs/char_dev.c linux-3.4.87-vs2.3.3.9/fs/char_dev.c
+--- linux-3.4.87/fs/char_dev.c 2012-03-19 18:47:25.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/char_dev.c 2012-05-21 16:15:04.000000000 +0000
@@ -21,6 +21,8 @@
#include <linux/mutex.h>
#include <linux/backing-dev.h>
@@ -2054,9 +2054,9 @@ diff -NurpP --minimal linux-3.4.83/fs/char_dev.c linux-3.4.83-vs2.3.3.9/fs/char_
if (!kobj)
return -ENXIO;
new = container_of(kobj, struct cdev, kobj);
-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
+diff -NurpP --minimal linux-3.4.87/fs/dcache.c linux-3.4.87-vs2.3.3.9/fs/dcache.c
+--- linux-3.4.87/fs/dcache.c 2014-04-21 17:16:22.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/dcache.c 2014-03-12 09:55:28.000000000 +0000
@@ -37,6 +37,7 @@
#include <linux/rculist_bl.h>
#include <linux/prefetch.h>
@@ -2108,9 +2108,9 @@ diff -NurpP --minimal linux-3.4.83/fs/dcache.c linux-3.4.83-vs2.3.3.9/fs/dcache.
found = dentry;
spin_unlock(&dentry->d_lock);
break;
-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
+diff -NurpP --minimal linux-3.4.87/fs/devpts/inode.c linux-3.4.87-vs2.3.3.9/fs/devpts/inode.c
+--- linux-3.4.87/fs/devpts/inode.c 2014-04-21 17:16:22.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/devpts/inode.c 2014-03-12 09:55:28.000000000 +0000
@@ -25,6 +25,7 @@
#include <linux/parser.h>
#include <linux/fsnotify.h>
@@ -2198,9 +2198,9 @@ diff -NurpP --minimal linux-3.4.83/fs/devpts/inode.c linux-3.4.83-vs2.3.3.9/fs/d
inode->i_private = tty;
tty->driver_data = inode;
-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
+diff -NurpP --minimal linux-3.4.87/fs/ext2/balloc.c linux-3.4.87-vs2.3.3.9/fs/ext2/balloc.c
+--- linux-3.4.87/fs/ext2/balloc.c 2012-01-09 15:14:54.000000000 +0000
++++ linux-3.4.87-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.83/fs/ext2/balloc.c linux-3.4.83-vs2.3.3.9/fs/ex
BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb));
repeat:
-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
+diff -NurpP --minimal linux-3.4.87/fs/ext2/ext2.h linux-3.4.87-vs2.3.3.9/fs/ext2/ext2.h
+--- linux-3.4.87/fs/ext2/ext2.h 2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.87-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.83/fs/ext2/ext2.h linux-3.4.83-vs2.3.3.9/fs/ext2
/* ioctl.c */
extern long ext2_ioctl(struct file *, unsigned int, unsigned long);
-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
+diff -NurpP --minimal linux-3.4.87/fs/ext2/file.c linux-3.4.87-vs2.3.3.9/fs/ext2/file.c
+--- linux-3.4.87/fs/ext2/file.c 2011-10-24 16:45:27.000000000 +0000
++++ linux-3.4.87-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.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
+diff -NurpP --minimal linux-3.4.87/fs/ext2/ialloc.c linux-3.4.87-vs2.3.3.9/fs/ext2/ialloc.c
+--- linux-3.4.87/fs/ext2/ialloc.c 2012-03-19 18:47:25.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/ext2/ialloc.c 2012-05-21 16:15:05.000000000 +0000
@@ -17,6 +17,7 @@
#include <linux/backing-dev.h>
#include <linux/buffer_head.h>
@@ -2287,9 +2287,9 @@ diff -NurpP --minimal linux-3.4.83/fs/ext2/ialloc.c linux-3.4.83-vs2.3.3.9/fs/ex
} else
inode_init_owner(inode, dir, mode);
-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
+diff -NurpP --minimal linux-3.4.87/fs/ext2/inode.c linux-3.4.87-vs2.3.3.9/fs/ext2/inode.c
+--- linux-3.4.87/fs/ext2/inode.c 2012-03-19 18:47:25.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/ext2/inode.c 2012-05-21 16:15:05.000000000 +0000
@@ -31,6 +31,7 @@
#include <linux/mpage.h>
#include <linux/fiemap.h>
@@ -2437,9 +2437,9 @@ diff -NurpP --minimal linux-3.4.83/fs/ext2/inode.c linux-3.4.83-vs2.3.3.9/fs/ext
error = dquot_transfer(inode, iattr);
if (error)
return error;
-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
+diff -NurpP --minimal linux-3.4.87/fs/ext2/ioctl.c linux-3.4.87-vs2.3.3.9/fs/ext2/ioctl.c
+--- linux-3.4.87/fs/ext2/ioctl.c 2012-03-19 18:47:25.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/ext2/ioctl.c 2012-05-21 16:15:05.000000000 +0000
@@ -17,6 +17,16 @@
#include <asm/uaccess.h>
@@ -2489,9 +2489,9 @@ diff -NurpP --minimal linux-3.4.83/fs/ext2/ioctl.c linux-3.4.83-vs2.3.3.9/fs/ext
flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE;
ei->i_flags = flags;
-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
+diff -NurpP --minimal linux-3.4.87/fs/ext2/namei.c linux-3.4.87-vs2.3.3.9/fs/ext2/namei.c
+--- linux-3.4.87/fs/ext2/namei.c 2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/ext2/namei.c 2012-05-21 16:15:05.000000000 +0000
@@ -32,6 +32,7 @@
#include <linux/pagemap.h>
@@ -2516,9 +2516,9 @@ diff -NurpP --minimal linux-3.4.83/fs/ext2/namei.c linux-3.4.83-vs2.3.3.9/fs/ext
.get_acl = ext2_get_acl,
};
-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
+diff -NurpP --minimal linux-3.4.87/fs/ext2/super.c linux-3.4.87-vs2.3.3.9/fs/ext2/super.c
+--- linux-3.4.87/fs/ext2/super.c 2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.87-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.83/fs/ext2/super.c linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/fs/ext3/ext3.h linux-3.4.87-vs2.3.3.9/fs/ext3/ext3.h
+--- linux-3.4.87/fs/ext3/ext3.h 2014-04-21 17:16:22.000000000 +0000
++++ linux-3.4.87-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) */
@@ -2638,9 +2638,9 @@ diff -NurpP --minimal linux-3.4.83/fs/ext3/ext3.h linux-3.4.83-vs2.3.3.9/fs/ext3
/* ioctl.c */
extern long ext3_ioctl(struct file *, unsigned int, unsigned long);
-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
+diff -NurpP --minimal linux-3.4.87/fs/ext3/file.c linux-3.4.87-vs2.3.3.9/fs/ext3/file.c
+--- linux-3.4.87/fs/ext3/file.c 2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.87-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.83/fs/ext3/file.c linux-3.4.83-vs2.3.3.9/fs/ext3
+ .sync_flags = ext3_sync_flags,
};
-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
+diff -NurpP --minimal linux-3.4.87/fs/ext3/ialloc.c linux-3.4.87-vs2.3.3.9/fs/ext3/ialloc.c
+--- linux-3.4.87/fs/ext3/ialloc.c 2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/ext3/ialloc.c 2012-05-21 16:15:05.000000000 +0000
@@ -14,6 +14,7 @@
#include <linux/quotaops.h>
@@ -2667,9 +2667,9 @@ diff -NurpP --minimal linux-3.4.83/fs/ext3/ialloc.c linux-3.4.83-vs2.3.3.9/fs/ex
} else
inode_init_owner(inode, dir, mode);
-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
+diff -NurpP --minimal linux-3.4.87/fs/ext3/inode.c linux-3.4.87-vs2.3.3.9/fs/ext3/inode.c
+--- linux-3.4.87/fs/ext3/inode.c 2014-04-21 17:16:22.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/ext3/inode.c 2013-08-13 17:07:36.000000000 +0000
@@ -27,6 +27,8 @@
#include <linux/writeback.h>
#include <linux/mpage.h>
@@ -2844,9 +2844,9 @@ diff -NurpP --minimal linux-3.4.83/fs/ext3/inode.c linux-3.4.83-vs2.3.3.9/fs/ext
error = ext3_mark_inode_dirty(handle, inode);
ext3_journal_stop(handle);
}
-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
+diff -NurpP --minimal linux-3.4.87/fs/ext3/ioctl.c linux-3.4.87-vs2.3.3.9/fs/ext3/ioctl.c
+--- linux-3.4.87/fs/ext3/ioctl.c 2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/ext3/ioctl.c 2012-05-21 16:15:05.000000000 +0000
@@ -12,6 +12,34 @@
#include <asm/uaccess.h>
#include "ext3.h"
@@ -2914,9 +2914,9 @@ diff -NurpP --minimal linux-3.4.83/fs/ext3/ioctl.c linux-3.4.83-vs2.3.3.9/fs/ext
flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE;
ei->i_flags = flags;
-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
+diff -NurpP --minimal linux-3.4.87/fs/ext3/namei.c linux-3.4.87-vs2.3.3.9/fs/ext3/namei.c
+--- linux-3.4.87/fs/ext3/namei.c 2014-04-21 17:16:22.000000000 +0000
++++ linux-3.4.87-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.83/fs/ext3/namei.c linux-3.4.83-vs2.3.3.9/fs/ext
.get_acl = ext3_get_acl,
};
-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
+diff -NurpP --minimal linux-3.4.87/fs/ext3/super.c linux-3.4.87-vs2.3.3.9/fs/ext3/super.c
+--- linux-3.4.87/fs/ext3/super.c 2014-04-21 17:16:22.000000000 +0000
++++ linux-3.4.87-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.83/fs/ext3/super.c linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/fs/ext4/ext4.h linux-3.4.87-vs2.3.3.9/fs/ext4/ext4.h
+--- linux-3.4.87/fs/ext4/ext4.h 2014-04-21 17:16:22.000000000 +0000
++++ linux-3.4.87-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 */
@@ -3061,9 +3061,9 @@ diff -NurpP --minimal linux-3.4.83/fs/ext4/ext4.h linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/fs/ext4/file.c linux-3.4.87-vs2.3.3.9/fs/ext4/file.c
+--- linux-3.4.87/fs/ext4/file.c 2012-01-09 15:14:54.000000000 +0000
++++ linux-3.4.87-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.83/fs/ext4/file.c linux-3.4.83-vs2.3.3.9/fs/ext4
+ .sync_flags = ext4_sync_flags,
};
-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
+diff -NurpP --minimal linux-3.4.87/fs/ext4/ialloc.c linux-3.4.87-vs2.3.3.9/fs/ext4/ialloc.c
+--- linux-3.4.87/fs/ext4/ialloc.c 2014-04-21 17:16:22.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/ext4/ialloc.c 2014-03-12 09:55:28.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/random.h>
#include <linux/bitops.h>
@@ -3090,9 +3090,9 @@ diff -NurpP --minimal linux-3.4.83/fs/ext4/ialloc.c linux-3.4.83-vs2.3.3.9/fs/ex
} else
inode_init_owner(inode, dir, mode);
-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
+diff -NurpP --minimal linux-3.4.87/fs/ext4/inode.c linux-3.4.87-vs2.3.3.9/fs/ext4/inode.c
+--- linux-3.4.87/fs/ext4/inode.c 2014-04-21 17:16:22.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/ext4/inode.c 2014-04-21 19:01:04.000000000 +0000
@@ -38,6 +38,7 @@
#include <linux/slab.h>
#include <linux/ratelimit.h>
@@ -3101,17 +3101,15 @@ diff -NurpP --minimal linux-3.4.83/fs/ext4/inode.c linux-3.4.83-vs2.3.3.9/fs/ext
#include "ext4_jbd2.h"
#include "xattr.h"
-@@ -3582,43 +3583,65 @@
- {
+@@ -3583,42 +3584,67 @@ void ext4_set_inode_flags(struct inode *
unsigned int flags = EXT4_I(inode)->i_flags;
unsigned int new_fl = 0;
-+ unsigned int new_vf = 0;
-+
+
+ if (flags & EXT4_IMMUTABLE_FL)
+ new_fl |= S_IMMUTABLE;
+ if (flags & EXT4_IXUNLINK_FL)
+ new_fl |= S_IXUNLINK;
-
++
if (flags & EXT4_SYNC_FL)
new_fl |= S_SYNC;
if (flags & EXT4_APPEND_FL)
@@ -3122,16 +3120,20 @@ diff -NurpP --minimal linux-3.4.83/fs/ext4/inode.c linux-3.4.83-vs2.3.3.9/fs/ext
new_fl |= S_NOATIME;
if (flags & EXT4_DIRSYNC_FL)
new_fl |= S_DIRSYNC;
++
set_mask_bits(&inode->i_flags,
- S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC, new_fl);
-+ S_IMMUTABLE|S_IXUNLINK|S_SYNC|S_APPEND|S_NOATIME|S_DIRSYNC,
-+ new_fl);
++ S_IXUNLINK | S_IMMUTABLE |
++ S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC, new_fl);
+
++ new_fl = 0;
+ if (flags & EXT4_BARRIER_FL)
-+ new_vf |= V_BARRIER;
++ new_fl |= V_BARRIER;
+ if (flags & EXT4_COW_FL)
-+ new_vf |= V_COW;
-+ set_mask_bits(&inode->i_vflags, V_BARRIER|V_COW, new_vf);
++ new_fl |= V_COW;
++
++ set_mask_bits(&inode->i_vflags,
++ V_BARRIER | V_COW, new_fl);
}
/* Propagate flags from i_flags to EXT4_I(inode)->i_flags */
@@ -3174,7 +3176,7 @@ diff -NurpP --minimal linux-3.4.83/fs/ext4/inode.c linux-3.4.83-vs2.3.3.9/fs/ext
} while (cmpxchg(&ei->i_flags, old_fl, new_fl) != old_fl);
}
-@@ -3651,6 +3675,8 @@ struct inode *ext4_iget(struct super_blo
+@@ -3654,6 +3680,8 @@ struct inode *ext4_iget(struct super_blo
journal_t *journal = EXT4_SB(sb)->s_journal;
long ret;
int block;
@@ -3183,7 +3185,7 @@ diff -NurpP --minimal linux-3.4.83/fs/ext4/inode.c linux-3.4.83-vs2.3.3.9/fs/ext
inode = iget_locked(sb, ino);
if (!inode)
-@@ -3666,12 +3692,16 @@ struct inode *ext4_iget(struct super_blo
+@@ -3669,12 +3697,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);
@@ -3204,7 +3206,7 @@ diff -NurpP --minimal linux-3.4.83/fs/ext4/inode.c linux-3.4.83-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 */
-@@ -3890,6 +3920,8 @@ static int ext4_do_update_inode(handle_t
+@@ -3893,6 +3925,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;
@@ -3213,7 +3215,7 @@ diff -NurpP --minimal linux-3.4.83/fs/ext4/inode.c linux-3.4.83-vs2.3.3.9/fs/ext
int err = 0, rc, block;
int need_datasync = 0;
-@@ -3901,29 +3933,32 @@ static int ext4_do_update_inode(handle_t
+@@ -3904,29 +3938,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))) {
@@ -3252,7 +3254,7 @@ diff -NurpP --minimal linux-3.4.83/fs/ext4/inode.c linux-3.4.83-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);
-@@ -4110,7 +4145,8 @@ int ext4_setattr(struct dentry *dentry,
+@@ -4113,7 +4150,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) ||
@@ -3262,7 +3264,7 @@ diff -NurpP --minimal linux-3.4.83/fs/ext4/inode.c linux-3.4.83-vs2.3.3.9/fs/ext
handle_t *handle;
/* (user+group)*(old+new) structure, inode write (sb,
-@@ -4132,6 +4168,8 @@ int ext4_setattr(struct dentry *dentry,
+@@ -4135,6 +4173,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;
@@ -3271,9 +3273,9 @@ diff -NurpP --minimal linux-3.4.83/fs/ext4/inode.c linux-3.4.83-vs2.3.3.9/fs/ext
error = ext4_mark_inode_dirty(handle, inode);
ext4_journal_stop(handle);
}
-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
+diff -NurpP --minimal linux-3.4.87/fs/ext4/ioctl.c linux-3.4.87-vs2.3.3.9/fs/ext4/ioctl.c
+--- linux-3.4.87/fs/ext4/ioctl.c 2014-04-21 17:16:22.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/ext4/ioctl.c 2012-09-01 08:50:49.000000000 +0000
@@ -14,12 +14,40 @@
#include <linux/compat.h>
#include <linux/mount.h>
@@ -3338,9 +3340,9 @@ diff -NurpP --minimal linux-3.4.83/fs/ext4/ioctl.c linux-3.4.83-vs2.3.3.9/fs/ext
if (!capable(CAP_LINUX_IMMUTABLE))
goto flags_out;
}
-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
+diff -NurpP --minimal linux-3.4.87/fs/ext4/namei.c linux-3.4.87-vs2.3.3.9/fs/ext4/namei.c
+--- linux-3.4.87/fs/ext4/namei.c 2014-04-21 17:16:22.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/ext4/namei.c 2013-10-26 18:10:21.000000000 +0000
@@ -34,6 +34,7 @@
#include <linux/quotaops.h>
#include <linux/buffer_head.h>
@@ -3365,9 +3367,9 @@ diff -NurpP --minimal linux-3.4.83/fs/ext4/namei.c linux-3.4.83-vs2.3.3.9/fs/ext
};
const struct inode_operations ext4_special_inode_operations = {
-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
+diff -NurpP --minimal linux-3.4.87/fs/ext4/super.c linux-3.4.87-vs2.3.3.9/fs/ext4/super.c
+--- linux-3.4.87/fs/ext4/super.c 2014-04-21 17:16:22.000000000 +0000
++++ linux-3.4.87-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,
@@ -3432,9 +3434,9 @@ diff -NurpP --minimal linux-3.4.83/fs/ext4/super.c linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/fs/fcntl.c linux-3.4.87-vs2.3.3.9/fs/fcntl.c
+--- linux-3.4.87/fs/fcntl.c 2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/fcntl.c 2012-05-21 16:15:05.000000000 +0000
@@ -20,6 +20,7 @@
#include <linux/signal.h>
#include <linux/rcupdate.h>
@@ -3461,9 +3463,9 @@ diff -NurpP --minimal linux-3.4.83/fs/fcntl.c linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/fs/file.c linux-3.4.87-vs2.3.3.9/fs/file.c
+--- linux-3.4.87/fs/file.c 2014-04-21 17:16:22.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/file.c 2014-03-12 09:55:28.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/spinlock.h>
#include <linux/rcupdate.h>
@@ -3489,9 +3491,9 @@ diff -NurpP --minimal linux-3.4.83/fs/file.c linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/fs/file_table.c linux-3.4.87-vs2.3.3.9/fs/file_table.c
+--- linux-3.4.87/fs/file_table.c 2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/file_table.c 2012-05-21 16:15:05.000000000 +0000
@@ -24,6 +24,8 @@
#include <linux/percpu_counter.h>
#include <linux/percpu.h>
@@ -3528,9 +3530,9 @@ diff -NurpP --minimal linux-3.4.83/fs/file_table.c linux-3.4.83-vs2.3.3.9/fs/fil
file_sb_list_del(file);
file_free(file);
}
-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
+diff -NurpP --minimal linux-3.4.87/fs/fs_struct.c linux-3.4.87-vs2.3.3.9/fs/fs_struct.c
+--- linux-3.4.87/fs/fs_struct.c 2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/fs_struct.c 2012-05-21 16:15:05.000000000 +0000
@@ -4,6 +4,7 @@
#include <linux/path.h>
#include <linux/slab.h>
@@ -3555,9 +3557,9 @@ diff -NurpP --minimal linux-3.4.83/fs/fs_struct.c linux-3.4.83-vs2.3.3.9/fs/fs_s
}
return fs;
}
-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
+diff -NurpP --minimal linux-3.4.87/fs/gfs2/file.c linux-3.4.87-vs2.3.3.9/fs/gfs2/file.c
+--- linux-3.4.87/fs/gfs2/file.c 2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.87-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,
@@ -3680,9 +3682,9 @@ diff -NurpP --minimal linux-3.4.83/fs/gfs2/file.c linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/fs/gfs2/inode.h linux-3.4.87-vs2.3.3.9/fs/gfs2/inode.h
+--- linux-3.4.87/fs/gfs2/inode.h 2012-01-09 15:14:54.000000000 +0000
++++ linux-3.4.87-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;
@@ -3691,9 +3693,9 @@ diff -NurpP --minimal linux-3.4.83/fs/gfs2/inode.h linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/fs/inode.c linux-3.4.87-vs2.3.3.9/fs/inode.c
+--- linux-3.4.87/fs/inode.c 2014-04-21 17:16:23.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/inode.c 2013-07-14 13:38:34.000000000 +0000
@@ -17,6 +17,7 @@
#include <linux/prefetch.h>
#include <linux/buffer_head.h> /* for inode_has_buffers */
@@ -3749,9 +3751,9 @@ diff -NurpP --minimal linux-3.4.83/fs/inode.c linux-3.4.83-vs2.3.3.9/fs/inode.c
}
EXPORT_SYMBOL(inode_init_owner);
-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
+diff -NurpP --minimal linux-3.4.87/fs/ioctl.c linux-3.4.87-vs2.3.3.9/fs/ioctl.c
+--- linux-3.4.87/fs/ioctl.c 2012-05-21 16:07:24.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/ioctl.c 2012-05-21 16:15:05.000000000 +0000
@@ -15,6 +15,9 @@
#include <linux/writeback.h>
#include <linux/buffer_head.h>
@@ -3762,9 +3764,9 @@ diff -NurpP --minimal linux-3.4.83/fs/ioctl.c linux-3.4.83-vs2.3.3.9/fs/ioctl.c
#include <asm/ioctls.h>
-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
+diff -NurpP --minimal linux-3.4.87/fs/ioprio.c linux-3.4.87-vs2.3.3.9/fs/ioprio.c
+--- linux-3.4.87/fs/ioprio.c 2012-03-19 18:47:25.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/ioprio.c 2012-05-21 16:15:05.000000000 +0000
@@ -28,6 +28,7 @@
#include <linux/syscalls.h>
#include <linux/security.h>
@@ -3791,9 +3793,9 @@ diff -NurpP --minimal linux-3.4.83/fs/ioprio.c linux-3.4.83-vs2.3.3.9/fs/ioprio.
tmpio = get_task_ioprio(p);
if (tmpio < 0)
continue;
-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
+diff -NurpP --minimal linux-3.4.87/fs/jfs/file.c linux-3.4.87-vs2.3.3.9/fs/jfs/file.c
+--- linux-3.4.87/fs/jfs/file.c 2011-10-24 16:45:27.000000000 +0000
++++ linux-3.4.87-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);
@@ -3812,9 +3814,9 @@ diff -NurpP --minimal linux-3.4.83/fs/jfs/file.c linux-3.4.83-vs2.3.3.9/fs/jfs/f
};
const struct file_operations jfs_file_operations = {
-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
+diff -NurpP --minimal linux-3.4.87/fs/jfs/ioctl.c linux-3.4.87-vs2.3.3.9/fs/jfs/ioctl.c
+--- linux-3.4.87/fs/jfs/ioctl.c 2012-03-19 18:47:25.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/jfs/ioctl.c 2012-05-21 16:15:05.000000000 +0000
@@ -11,6 +11,7 @@
#include <linux/mount.h>
#include <linux/time.h>
@@ -3872,9 +3874,9 @@ diff -NurpP --minimal linux-3.4.83/fs/jfs/ioctl.c linux-3.4.83-vs2.3.3.9/fs/jfs/
flags |= oldflags & ~JFS_FL_USER_MODIFIABLE;
jfs_inode->mode2 = flags;
-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
+diff -NurpP --minimal linux-3.4.87/fs/jfs/jfs_dinode.h linux-3.4.87-vs2.3.3.9/fs/jfs/jfs_dinode.h
+--- linux-3.4.87/fs/jfs/jfs_dinode.h 2008-12-24 23:26:37.000000000 +0000
++++ linux-3.4.87-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 */
@@ -3891,9 +3893,9 @@ diff -NurpP --minimal linux-3.4.83/fs/jfs/jfs_dinode.h linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/fs/jfs/jfs_filsys.h linux-3.4.87-vs2.3.3.9/fs/jfs/jfs_filsys.h
+--- linux-3.4.87/fs/jfs/jfs_filsys.h 2008-12-24 23:26:37.000000000 +0000
++++ linux-3.4.87-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
@@ -3902,9 +3904,9 @@ diff -NurpP --minimal linux-3.4.83/fs/jfs/jfs_filsys.h linux-3.4.83-vs2.3.3.9/fs
/*
* file system state (superblock state)
-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
+diff -NurpP --minimal linux-3.4.87/fs/jfs/jfs_imap.c linux-3.4.87-vs2.3.3.9/fs/jfs/jfs_imap.c
+--- linux-3.4.87/fs/jfs/jfs_imap.c 2012-01-09 15:14:54.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/jfs/jfs_imap.c 2012-05-21 16:15:05.000000000 +0000
@@ -46,6 +46,7 @@
#include <linux/pagemap.h>
#include <linux/quotaops.h>
@@ -3964,9 +3966,9 @@ diff -NurpP --minimal linux-3.4.83/fs/jfs/jfs_imap.c linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/fs/jfs/jfs_inode.c linux-3.4.87-vs2.3.3.9/fs/jfs/jfs_inode.c
+--- linux-3.4.87/fs/jfs/jfs_inode.c 2014-04-21 17:16:23.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/jfs/jfs_inode.c 2014-03-12 09:55:28.000000000 +0000
@@ -18,6 +18,7 @@
#include <linux/fs.h>
@@ -4040,9 +4042,9 @@ diff -NurpP --minimal linux-3.4.83/fs/jfs/jfs_inode.c linux-3.4.83-vs2.3.3.9/fs/
}
/*
-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
+diff -NurpP --minimal linux-3.4.87/fs/jfs/jfs_inode.h linux-3.4.87-vs2.3.3.9/fs/jfs/jfs_inode.h
+--- linux-3.4.87/fs/jfs/jfs_inode.h 2011-10-24 16:45:27.000000000 +0000
++++ linux-3.4.87-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);
@@ -4051,9 +4053,9 @@ diff -NurpP --minimal linux-3.4.83/fs/jfs/jfs_inode.h linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/fs/jfs/namei.c linux-3.4.87-vs2.3.3.9/fs/jfs/namei.c
+--- linux-3.4.87/fs/jfs/namei.c 2012-05-21 16:07:25.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/jfs/namei.c 2012-05-21 16:15:05.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/ctype.h>
#include <linux/quotaops.h>
@@ -4078,9 +4080,9 @@ diff -NurpP --minimal linux-3.4.83/fs/jfs/namei.c linux-3.4.83-vs2.3.3.9/fs/jfs/
};
const struct file_operations jfs_dir_operations = {
-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
+diff -NurpP --minimal linux-3.4.87/fs/jfs/super.c linux-3.4.87-vs2.3.3.9/fs/jfs/super.c
+--- linux-3.4.87/fs/jfs/super.c 2012-05-21 16:07:25.000000000 +0000
++++ linux-3.4.87-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,
@@ -4146,9 +4148,9 @@ diff -NurpP --minimal linux-3.4.83/fs/jfs/super.c linux-3.4.83-vs2.3.3.9/fs/jfs/
if (newLVSize) {
printk(KERN_ERR "resize option for remount only\n");
-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
+diff -NurpP --minimal linux-3.4.87/fs/libfs.c linux-3.4.87-vs2.3.3.9/fs/libfs.c
+--- linux-3.4.87/fs/libfs.c 2012-05-21 16:07:25.000000000 +0000
++++ linux-3.4.87-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.
*/
@@ -4194,9 +4196,9 @@ diff -NurpP --minimal linux-3.4.83/fs/libfs.c linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/fs/locks.c linux-3.4.87-vs2.3.3.9/fs/locks.c
+--- linux-3.4.87/fs/locks.c 2014-04-21 17:16:23.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/locks.c 2012-09-01 08:50:49.000000000 +0000
@@ -126,6 +126,8 @@
#include <linux/time.h>
#include <linux/rcupdate.h>
@@ -4394,9 +4396,9 @@ diff -NurpP --minimal linux-3.4.83/fs/locks.c linux-3.4.83-vs2.3.3.9/fs/locks.c
return 0;
}
-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
+diff -NurpP --minimal linux-3.4.87/fs/mount.h linux-3.4.87-vs2.3.3.9/fs/mount.h
+--- linux-3.4.87/fs/mount.h 2012-03-19 18:47:26.000000000 +0000
++++ linux-3.4.87-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;
@@ -4405,9 +4407,9 @@ diff -NurpP --minimal linux-3.4.83/fs/mount.h linux-3.4.83-vs2.3.3.9/fs/mount.h
};
static inline struct mount *real_mount(struct vfsmount *mnt)
-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
+diff -NurpP --minimal linux-3.4.87/fs/namei.c linux-3.4.87-vs2.3.3.9/fs/namei.c
+--- linux-3.4.87/fs/namei.c 2012-05-21 16:07:25.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/namei.c 2012-05-21 16:15:05.000000000 +0000
@@ -33,6 +33,14 @@
#include <linux/device_cgroup.h>
#include <linux/fs_struct.h>
@@ -4935,9 +4937,9 @@ diff -NurpP --minimal linux-3.4.83/fs/namei.c linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/fs/namespace.c linux-3.4.87-vs2.3.3.9/fs/namespace.c
+--- linux-3.4.87/fs/namespace.c 2014-04-21 17:16:23.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/namespace.c 2012-06-28 14:45:07.000000000 +0000
@@ -20,6 +20,11 @@
#include <linux/fs_struct.h> /* get_fs_root et.al. */
#include <linux/fsnotify.h> /* fsnotify_vfsmount_delete */
@@ -5124,9 +5126,9 @@ diff -NurpP --minimal linux-3.4.83/fs/namespace.c linux-3.4.83-vs2.3.3.9/fs/name
kfree(ns);
}
-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
+diff -NurpP --minimal linux-3.4.87/fs/nfs/client.c linux-3.4.87-vs2.3.3.9/fs/nfs/client.c
+--- linux-3.4.87/fs/nfs/client.c 2014-04-21 17:16:23.000000000 +0000
++++ linux-3.4.87-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;
@@ -5148,9 +5150,9 @@ diff -NurpP --minimal linux-3.4.83/fs/nfs/client.c linux-3.4.83-vs2.3.3.9/fs/nfs
server->maxfilesize = fsinfo->maxfilesize;
server->time_delta = fsinfo->time_delta;
-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
+diff -NurpP --minimal linux-3.4.87/fs/nfs/dir.c linux-3.4.87-vs2.3.3.9/fs/nfs/dir.c
+--- linux-3.4.87/fs/nfs/dir.c 2014-04-21 17:16:23.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/nfs/dir.c 2013-01-16 00:15:57.000000000 +0000
@@ -35,6 +35,7 @@
#include <linux/sched.h>
#include <linux/kmemleak.h>
@@ -5167,9 +5169,9 @@ diff -NurpP --minimal linux-3.4.83/fs/nfs/dir.c linux-3.4.83-vs2.3.3.9/fs/nfs/di
no_entry:
res = d_materialise_unique(dentry, inode);
if (res != NULL) {
-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
+diff -NurpP --minimal linux-3.4.87/fs/nfs/inode.c linux-3.4.87-vs2.3.3.9/fs/nfs/inode.c
+--- linux-3.4.87/fs/nfs/inode.c 2014-04-21 17:16:23.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/nfs/inode.c 2014-03-12 09:55:28.000000000 +0000
@@ -40,6 +40,7 @@
#include <linux/compat.h>
#include <linux/freezer.h>
@@ -5321,9 +5323,9 @@ diff -NurpP --minimal linux-3.4.83/fs/nfs/inode.c linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/fs/nfs/nfs3xdr.c linux-3.4.87-vs2.3.3.9/fs/nfs/nfs3xdr.c
+--- linux-3.4.87/fs/nfs/nfs3xdr.c 2012-05-21 16:07:25.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/nfs/nfs3xdr.c 2012-05-21 16:15:05.000000000 +0000
@@ -20,6 +20,7 @@
#include <linux/nfs3.h>
#include <linux/nfs_fs.h>
@@ -5469,9 +5471,9 @@ diff -NurpP --minimal linux-3.4.83/fs/nfs/nfs3xdr.c linux-3.4.83-vs2.3.3.9/fs/nf
}
/*
-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
+diff -NurpP --minimal linux-3.4.87/fs/nfs/super.c linux-3.4.87-vs2.3.3.9/fs/nfs/super.c
+--- linux-3.4.87/fs/nfs/super.c 2014-04-21 17:16:23.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/nfs/super.c 2013-01-16 00:15:57.000000000 +0000
@@ -54,6 +54,7 @@
#include <linux/parser.h>
#include <linux/nsproxy.h>
@@ -5543,9 +5545,9 @@ diff -NurpP --minimal linux-3.4.83/fs/nfs/super.c linux-3.4.83-vs2.3.3.9/fs/nfs/
/*
* options that take text values
-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
+diff -NurpP --minimal linux-3.4.87/fs/nfsd/auth.c linux-3.4.87-vs2.3.3.9/fs/nfsd/auth.c
+--- linux-3.4.87/fs/nfsd/auth.c 2010-02-25 10:52:05.000000000 +0000
++++ linux-3.4.87-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 <okir at monad.swb.de> */
@@ -5564,9 +5566,9 @@ diff -NurpP --minimal linux-3.4.83/fs/nfsd/auth.c linux-3.4.83-vs2.3.3.9/fs/nfsd
rqgi = rqstp->rq_cred.cr_group_info;
-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
+diff -NurpP --minimal linux-3.4.87/fs/nfsd/nfs3xdr.c linux-3.4.87-vs2.3.3.9/fs/nfsd/nfs3xdr.c
+--- linux-3.4.87/fs/nfsd/nfs3xdr.c 2012-05-21 16:07:26.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/nfsd/nfs3xdr.c 2012-05-21 16:15:05.000000000 +0000
@@ -7,6 +7,7 @@
*/
@@ -5617,9 +5619,9 @@ diff -NurpP --minimal linux-3.4.83/fs/nfsd/nfs3xdr.c linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/fs/nfsd/nfs4xdr.c linux-3.4.87-vs2.3.3.9/fs/nfsd/nfs4xdr.c
+--- linux-3.4.87/fs/nfsd/nfs4xdr.c 2014-04-21 17:16:23.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/nfsd/nfs4xdr.c 2013-07-14 13:38:35.000000000 +0000
@@ -46,6 +46,7 @@
#include <linux/utsname.h>
#include <linux/pagemap.h>
@@ -5649,9 +5651,9 @@ diff -NurpP --minimal linux-3.4.83/fs/nfsd/nfs4xdr.c linux-3.4.83-vs2.3.3.9/fs/n
if (status == nfserr_resource)
goto out_resource;
if (status)
-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
+diff -NurpP --minimal linux-3.4.87/fs/nfsd/nfsxdr.c linux-3.4.87-vs2.3.3.9/fs/nfsd/nfsxdr.c
+--- linux-3.4.87/fs/nfsd/nfsxdr.c 2011-05-22 14:17:53.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/nfsd/nfsxdr.c 2012-05-21 16:15:05.000000000 +0000
@@ -6,6 +6,7 @@
#include "xdr.h"
@@ -5700,9 +5702,9 @@ diff -NurpP --minimal linux-3.4.83/fs/nfsd/nfsxdr.c linux-3.4.83-vs2.3.3.9/fs/nf
if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
*p++ = htonl(NFS_MAXPATHLEN);
-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
+diff -NurpP --minimal linux-3.4.87/fs/ocfs2/dlmglue.c linux-3.4.87-vs2.3.3.9/fs/ocfs2/dlmglue.c
+--- linux-3.4.87/fs/ocfs2/dlmglue.c 2014-04-21 17:16:23.000000000 +0000
++++ linux-3.4.87-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);
@@ -5719,9 +5721,9 @@ diff -NurpP --minimal linux-3.4.83/fs/ocfs2/dlmglue.c linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/fs/ocfs2/dlmglue.h linux-3.4.87-vs2.3.3.9/fs/ocfs2/dlmglue.h
+--- linux-3.4.87/fs/ocfs2/dlmglue.h 2010-10-21 11:07:50.000000000 +0000
++++ linux-3.4.87-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;
@@ -5732,9 +5734,9 @@ diff -NurpP --minimal linux-3.4.83/fs/ocfs2/dlmglue.h linux-3.4.83-vs2.3.3.9/fs/
};
#define OCFS2_QINFO_LVB_VERSION 1
-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
+diff -NurpP --minimal linux-3.4.87/fs/ocfs2/file.c linux-3.4.87-vs2.3.3.9/fs/ocfs2/file.c
+--- linux-3.4.87/fs/ocfs2/file.c 2014-04-21 17:16:23.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/ocfs2/file.c 2014-04-21 18:56:34.000000000 +0000
@@ -1123,7 +1123,7 @@ int ocfs2_setattr(struct dentry *dentry,
attr->ia_valid &= ~ATTR_SIZE;
@@ -5744,9 +5746,9 @@ diff -NurpP --minimal linux-3.4.83/fs/ocfs2/file.c linux-3.4.83-vs2.3.3.9/fs/ocf
if (!(attr->ia_valid & OCFS2_VALID_ATTRS))
return 0;
-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
+diff -NurpP --minimal linux-3.4.87/fs/ocfs2/inode.c linux-3.4.87-vs2.3.3.9/fs/ocfs2/inode.c
+--- linux-3.4.87/fs/ocfs2/inode.c 2012-01-09 15:14:55.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/ocfs2/inode.c 2012-05-21 16:15:05.000000000 +0000
@@ -28,6 +28,7 @@
#include <linux/highmem.h>
#include <linux/pagemap.h>
@@ -5843,9 +5845,9 @@ diff -NurpP --minimal linux-3.4.83/fs/ocfs2/inode.c linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/fs/ocfs2/inode.h linux-3.4.87-vs2.3.3.9/fs/ocfs2/inode.h
+--- linux-3.4.87/fs/ocfs2/inode.h 2012-01-09 15:14:55.000000000 +0000
++++ linux-3.4.87-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);
@@ -5854,9 +5856,9 @@ diff -NurpP --minimal linux-3.4.83/fs/ocfs2/inode.h linux-3.4.83-vs2.3.3.9/fs/oc
static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode)
{
-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
+diff -NurpP --minimal linux-3.4.87/fs/ocfs2/ioctl.c linux-3.4.87-vs2.3.3.9/fs/ocfs2/ioctl.c
+--- linux-3.4.87/fs/ocfs2/ioctl.c 2012-05-21 16:07:26.000000000 +0000
++++ linux-3.4.87-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;
}
@@ -5920,9 +5922,9 @@ diff -NurpP --minimal linux-3.4.83/fs/ocfs2/ioctl.c linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/fs/ocfs2/namei.c linux-3.4.87-vs2.3.3.9/fs/ocfs2/namei.c
+--- linux-3.4.87/fs/ocfs2/namei.c 2012-03-19 18:47:26.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/ocfs2/namei.c 2012-05-21 16:15:05.000000000 +0000
@@ -41,6 +41,7 @@
#include <linux/slab.h>
#include <linux/highmem.h>
@@ -5953,9 +5955,9 @@ diff -NurpP --minimal linux-3.4.83/fs/ocfs2/namei.c linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/fs/ocfs2/ocfs2.h linux-3.4.87-vs2.3.3.9/fs/ocfs2/ocfs2.h
+--- linux-3.4.87/fs/ocfs2/ocfs2.h 2012-01-09 15:14:55.000000000 +0000
++++ linux-3.4.87-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 */
@@ -5964,9 +5966,9 @@ diff -NurpP --minimal linux-3.4.83/fs/ocfs2/ocfs2.h linux-3.4.83-vs2.3.3.9/fs/oc
};
#define OCFS2_OSB_SOFT_RO 0x0001
-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
+diff -NurpP --minimal linux-3.4.87/fs/ocfs2/ocfs2_fs.h linux-3.4.87-vs2.3.3.9/fs/ocfs2/ocfs2_fs.h
+--- linux-3.4.87/fs/ocfs2/ocfs2_fs.h 2011-05-22 14:17:53.000000000 +0000
++++ linux-3.4.87-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 */
@@ -5979,9 +5981,9 @@ diff -NurpP --minimal linux-3.4.83/fs/ocfs2/ocfs2_fs.h linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/fs/ocfs2/super.c linux-3.4.87-vs2.3.3.9/fs/ocfs2/super.c
+--- linux-3.4.87/fs/ocfs2/super.c 2012-05-21 16:07:26.000000000 +0000
++++ linux-3.4.87-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,
@@ -6045,9 +6047,9 @@ diff -NurpP --minimal linux-3.4.83/fs/ocfs2/super.c linux-3.4.83-vs2.3.3.9/fs/oc
default:
mlog(ML_ERROR,
"Unrecognized mount option \"%s\" "
-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
+diff -NurpP --minimal linux-3.4.87/fs/open.c linux-3.4.87-vs2.3.3.9/fs/open.c
+--- linux-3.4.87/fs/open.c 2014-04-21 17:16:24.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/open.c 2012-09-16 18:49:11.000000000 +0000
@@ -30,6 +30,11 @@
#include <linux/fs_struct.h>
#include <linux/ima.h>
@@ -6139,9 +6141,9 @@ diff -NurpP --minimal linux-3.4.83/fs/open.c linux-3.4.83-vs2.3.3.9/fs/open.c
}
void put_unused_fd(unsigned int fd)
-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
+diff -NurpP --minimal linux-3.4.87/fs/proc/array.c linux-3.4.87-vs2.3.3.9/fs/proc/array.c
+--- linux-3.4.87/fs/proc/array.c 2014-04-21 17:16:24.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/proc/array.c 2014-04-21 18:56:34.000000000 +0000
@@ -81,6 +81,8 @@
#include <linux/pid_namespace.h>
#include <linux/ptrace.h>
@@ -6255,9 +6257,9 @@ diff -NurpP --minimal linux-3.4.83/fs/proc/array.c linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/fs/proc/base.c linux-3.4.87-vs2.3.3.9/fs/proc/base.c
+--- linux-3.4.87/fs/proc/base.c 2014-04-21 17:16:24.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/proc/base.c 2014-04-21 18:56:34.000000000 +0000
@@ -84,6 +84,8 @@
#include <linux/fs_struct.h>
#include <linux/slab.h>
@@ -6324,7 +6326,7 @@ diff -NurpP --minimal linux-3.4.83/fs/proc/base.c linux-3.4.83-vs2.3.3.9/fs/proc
d_drop(dentry);
return 0;
}
-@@ -2452,6 +2470,13 @@ static struct dentry *proc_pident_lookup
+@@ -2453,6 +2471,13 @@ static struct dentry *proc_pident_lookup
if (!task)
goto out_no_task;
@@ -6338,7 +6340,7 @@ diff -NurpP --minimal linux-3.4.83/fs/proc/base.c linux-3.4.83-vs2.3.3.9/fs/proc
/*
* Yes, it does not scale. And it should not. Don't add
* new entries into /proc/<tgid>/ without very good reasons.
-@@ -2837,7 +2862,7 @@ out_iput:
+@@ -2838,7 +2863,7 @@ out_iput:
static struct dentry *proc_base_lookup(struct inode *dir, struct dentry *dentry)
{
struct dentry *error;
@@ -6347,7 +6349,7 @@ diff -NurpP --minimal linux-3.4.83/fs/proc/base.c linux-3.4.83-vs2.3.3.9/fs/proc
const struct pid_entry *p, *last;
error = ERR_PTR(-ENOENT);
-@@ -2944,6 +2969,9 @@ static int proc_pid_personality(struct s
+@@ -2945,6 +2970,9 @@ static int proc_pid_personality(struct s
static const struct file_operations proc_task_operations;
static const struct inode_operations proc_task_inode_operations;
@@ -6357,7 +6359,7 @@ diff -NurpP --minimal linux-3.4.83/fs/proc/base.c linux-3.4.83-vs2.3.3.9/fs/proc
static const struct pid_entry tgid_base_stuff[] = {
DIR("task", S_IRUGO|S_IXUGO, proc_task_inode_operations, proc_task_operations),
DIR("fd", S_IRUSR|S_IXUSR, proc_fd_inode_operations, proc_fd_operations),
-@@ -3010,6 +3038,8 @@ static const struct pid_entry tgid_base_
+@@ -3011,6 +3039,8 @@ static const struct pid_entry tgid_base_
#ifdef CONFIG_CGROUPS
REG("cgroup", S_IRUGO, proc_cgroup_operations),
#endif
@@ -6366,7 +6368,7 @@ diff -NurpP --minimal linux-3.4.83/fs/proc/base.c linux-3.4.83-vs2.3.3.9/fs/proc
INF("oom_score", S_IRUGO, proc_oom_score),
REG("oom_adj", S_IRUGO|S_IWUSR, proc_oom_adjust_operations),
REG("oom_score_adj", S_IRUGO|S_IWUSR, proc_oom_score_adj_operations),
-@@ -3029,6 +3059,7 @@ static const struct pid_entry tgid_base_
+@@ -3030,6 +3060,7 @@ static const struct pid_entry tgid_base_
#ifdef CONFIG_HARDWALL
INF("hardwall", S_IRUGO, proc_pid_hardwall),
#endif
@@ -6374,7 +6376,7 @@ diff -NurpP --minimal linux-3.4.83/fs/proc/base.c linux-3.4.83-vs2.3.3.9/fs/proc
};
static int proc_tgid_base_readdir(struct file * filp,
-@@ -3222,7 +3253,7 @@ retry:
+@@ -3223,7 +3254,7 @@ retry:
iter.task = NULL;
pid = find_ge_pid(iter.tgid, ns);
if (pid) {
@@ -6383,7 +6385,7 @@ diff -NurpP --minimal linux-3.4.83/fs/proc/base.c linux-3.4.83-vs2.3.3.9/fs/proc
iter.task = pid_task(pid, PIDTYPE_PID);
/* What we to know is if the pid we have find is the
* pid of a thread_group_leader. Testing for task
-@@ -3252,7 +3283,7 @@ static int proc_pid_fill_cache(struct fi
+@@ -3253,7 +3284,7 @@ static int proc_pid_fill_cache(struct fi
struct tgid_iter iter)
{
char name[PROC_NUMBUF];
@@ -6392,7 +6394,7 @@ diff -NurpP --minimal linux-3.4.83/fs/proc/base.c linux-3.4.83-vs2.3.3.9/fs/proc
return proc_fill_cache(filp, dirent, filldir, name, len,
proc_pid_instantiate, iter.task, NULL);
}
-@@ -3276,7 +3307,7 @@ int proc_pid_readdir(struct file * filp,
+@@ -3277,7 +3308,7 @@ int proc_pid_readdir(struct file * filp,
goto out_no_task;
nr = filp->f_pos - FIRST_PROCESS_ENTRY;
@@ -6401,7 +6403,7 @@ diff -NurpP --minimal linux-3.4.83/fs/proc/base.c linux-3.4.83-vs2.3.3.9/fs/proc
if (!reaper)
goto out_no_task;
-@@ -3298,6 +3329,8 @@ int proc_pid_readdir(struct file * filp,
+@@ -3299,6 +3330,8 @@ int proc_pid_readdir(struct file * filp,
__filldir = fake_filldir;
filp->f_pos = iter.tgid + TGID_OFFSET;
@@ -6410,7 +6412,7 @@ diff -NurpP --minimal linux-3.4.83/fs/proc/base.c linux-3.4.83-vs2.3.3.9/fs/proc
if (proc_pid_fill_cache(filp, dirent, __filldir, iter) < 0) {
put_task_struct(iter.task);
goto out;
-@@ -3451,6 +3484,8 @@ static struct dentry *proc_task_lookup(s
+@@ -3452,6 +3485,8 @@ static struct dentry *proc_task_lookup(s
tid = name_to_int(dentry);
if (tid == ~0U)
goto out;
@@ -6419,9 +6421,9 @@ diff -NurpP --minimal linux-3.4.83/fs/proc/base.c linux-3.4.83-vs2.3.3.9/fs/proc
ns = dentry->d_sb->s_fs_info;
rcu_read_lock();
-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
+diff -NurpP --minimal linux-3.4.87/fs/proc/generic.c linux-3.4.87-vs2.3.3.9/fs/proc/generic.c
+--- linux-3.4.87/fs/proc/generic.c 2012-03-19 18:47:26.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/proc/generic.c 2012-05-21 16:15:05.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/bitops.h>
#include <linux/spinlock.h>
@@ -6481,9 +6483,9 @@ diff -NurpP --minimal linux-3.4.83/fs/proc/generic.c linux-3.4.83-vs2.3.3.9/fs/p
} else {
kfree(ent);
ent = NULL;
-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
+diff -NurpP --minimal linux-3.4.87/fs/proc/inode.c linux-3.4.87-vs2.3.3.9/fs/proc/inode.c
+--- linux-3.4.87/fs/proc/inode.c 2014-04-21 17:16:24.000000000 +0000
++++ linux-3.4.87-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;
@@ -6493,9 +6495,9 @@ diff -NurpP --minimal linux-3.4.83/fs/proc/inode.c linux-3.4.83-vs2.3.3.9/fs/pro
if (de->size)
inode->i_size = de->size;
if (de->nlink)
-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
+diff -NurpP --minimal linux-3.4.87/fs/proc/internal.h linux-3.4.87-vs2.3.3.9/fs/proc/internal.h
+--- linux-3.4.87/fs/proc/internal.h 2012-05-21 16:07:26.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/proc/internal.h 2012-05-21 16:15:05.000000000 +0000
@@ -10,6 +10,8 @@
*/
@@ -6533,9 +6535,9 @@ diff -NurpP --minimal linux-3.4.83/fs/proc/internal.h linux-3.4.83-vs2.3.3.9/fs/
static inline int proc_fd(struct inode *inode)
{
return PROC_I(inode)->fd;
-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
+diff -NurpP --minimal linux-3.4.87/fs/proc/loadavg.c linux-3.4.87-vs2.3.3.9/fs/proc/loadavg.c
+--- linux-3.4.87/fs/proc/loadavg.c 2009-09-10 13:26:23.000000000 +0000
++++ linux-3.4.87-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)
@@ -6565,9 +6567,9 @@ diff -NurpP --minimal linux-3.4.83/fs/proc/loadavg.c linux-3.4.83-vs2.3.3.9/fs/p
task_active_pid_ns(current)->last_pid);
return 0;
}
-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
+diff -NurpP --minimal linux-3.4.87/fs/proc/meminfo.c linux-3.4.87-vs2.3.3.9/fs/proc/meminfo.c
+--- linux-3.4.87/fs/proc/meminfo.c 2012-01-09 15:14:55.000000000 +0000
++++ linux-3.4.87-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;
@@ -6578,9 +6580,9 @@ diff -NurpP --minimal linux-3.4.83/fs/proc/meminfo.c linux-3.4.83-vs2.3.3.9/fs/p
total_swapcache_pages - i.bufferram;
if (cached < 0)
cached = 0;
-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
+diff -NurpP --minimal linux-3.4.87/fs/proc/root.c linux-3.4.87-vs2.3.3.9/fs/proc/root.c
+--- linux-3.4.87/fs/proc/root.c 2012-05-21 16:07:26.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/proc/root.c 2012-05-21 16:15:05.000000000 +0000
@@ -19,9 +19,14 @@
#include <linux/mount.h>
#include <linux/pid_namespace.h>
@@ -6612,9 +6614,9 @@ diff -NurpP --minimal linux-3.4.83/fs/proc/root.c linux-3.4.83-vs2.3.3.9/fs/proc
.name = "/proc",
};
-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
+diff -NurpP --minimal linux-3.4.87/fs/proc/stat.c linux-3.4.87-vs2.3.3.9/fs/proc/stat.c
+--- linux-3.4.87/fs/proc/stat.c 2014-04-21 17:16:24.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/proc/stat.c 2012-11-06 17:02:35.000000000 +0000
@@ -9,6 +9,7 @@
#include <linux/slab.h>
#include <linux/time.h>
@@ -6634,9 +6636,9 @@ diff -NurpP --minimal linux-3.4.83/fs/proc/stat.c linux-3.4.83-vs2.3.3.9/fs/proc
jif = boottime.tv_sec;
for_each_possible_cpu(i) {
-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
+diff -NurpP --minimal linux-3.4.87/fs/proc/uptime.c linux-3.4.87-vs2.3.3.9/fs/proc/uptime.c
+--- linux-3.4.87/fs/proc/uptime.c 2012-03-19 18:47:26.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/proc/uptime.c 2012-05-21 16:15:05.000000000 +0000
@@ -5,6 +5,7 @@
#include <linux/seq_file.h>
#include <linux/time.h>
@@ -6656,9 +6658,9 @@ diff -NurpP --minimal linux-3.4.83/fs/proc/uptime.c linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/fs/proc_namespace.c linux-3.4.87-vs2.3.3.9/fs/proc_namespace.c
+--- linux-3.4.87/fs/proc_namespace.c 2012-03-19 18:47:26.000000000 +0000
++++ linux-3.4.87-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" },
@@ -6768,9 +6770,9 @@ diff -NurpP --minimal linux-3.4.83/fs/proc_namespace.c linux-3.4.83-vs2.3.3.9/fs
/* file system type */
seq_puts(m, "with fstype ");
show_type(m, sb);
-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
+diff -NurpP --minimal linux-3.4.87/fs/quota/dquot.c linux-3.4.87-vs2.3.3.9/fs/quota/dquot.c
+--- linux-3.4.87/fs/quota/dquot.c 2014-04-21 17:16:24.000000000 +0000
++++ linux-3.4.87-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;
@@ -6809,9 +6811,9 @@ diff -NurpP --minimal linux-3.4.83/fs/quota/dquot.c linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/fs/quota/quota.c linux-3.4.87-vs2.3.3.9/fs/quota/quota.c
+--- linux-3.4.87/fs/quota/quota.c 2012-05-21 16:07:26.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/quota/quota.c 2012-05-21 16:15:05.000000000 +0000
@@ -8,6 +8,7 @@
#include <linux/fs.h>
#include <linux/namei.h>
@@ -6899,9 +6901,9 @@ diff -NurpP --minimal linux-3.4.83/fs/quota/quota.c linux-3.4.83-vs2.3.3.9/fs/qu
if (quotactl_cmd_write(cmd))
sb = get_super_thawed(bdev);
else
-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
+diff -NurpP --minimal linux-3.4.87/fs/reiserfs/file.c linux-3.4.87-vs2.3.3.9/fs/reiserfs/file.c
+--- linux-3.4.87/fs/reiserfs/file.c 2012-05-21 16:07:26.000000000 +0000
++++ linux-3.4.87-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,
@@ -6909,9 +6911,9 @@ diff -NurpP --minimal linux-3.4.83/fs/reiserfs/file.c linux-3.4.83-vs2.3.3.9/fs/
+ .sync_flags = reiserfs_sync_flags,
.get_acl = reiserfs_get_acl,
};
-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
+diff -NurpP --minimal linux-3.4.87/fs/reiserfs/inode.c linux-3.4.87-vs2.3.3.9/fs/reiserfs/inode.c
+--- linux-3.4.87/fs/reiserfs/inode.c 2014-04-21 17:16:24.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/reiserfs/inode.c 2012-12-08 00:53:53.000000000 +0000
@@ -18,6 +18,7 @@
#include <linux/writeback.h>
#include <linux/quotaops.h>
@@ -7077,9 +7079,9 @@ diff -NurpP --minimal linux-3.4.83/fs/reiserfs/inode.c linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/fs/reiserfs/ioctl.c linux-3.4.87-vs2.3.3.9/fs/reiserfs/ioctl.c
+--- linux-3.4.87/fs/reiserfs/ioctl.c 2012-05-21 16:07:27.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/reiserfs/ioctl.c 2012-05-21 16:15:05.000000000 +0000
@@ -11,6 +11,21 @@
#include <linux/pagemap.h>
#include <linux/compat.h>
@@ -7141,9 +7143,9 @@ diff -NurpP --minimal linux-3.4.83/fs/reiserfs/ioctl.c linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/fs/reiserfs/namei.c linux-3.4.87-vs2.3.3.9/fs/reiserfs/namei.c
+--- linux-3.4.87/fs/reiserfs/namei.c 2012-05-21 16:07:27.000000000 +0000
++++ linux-3.4.87-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"
@@ -7160,9 +7162,9 @@ diff -NurpP --minimal linux-3.4.83/fs/reiserfs/namei.c linux-3.4.83-vs2.3.3.9/fs
return d_splice_alias(inode, dentry);
}
-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
+diff -NurpP --minimal linux-3.4.87/fs/reiserfs/reiserfs.h linux-3.4.87-vs2.3.3.9/fs/reiserfs/reiserfs.h
+--- linux-3.4.87/fs/reiserfs/reiserfs.h 2012-05-21 16:07:27.000000000 +0000
++++ linux-3.4.87-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,
@@ -7201,9 +7203,9 @@ diff -NurpP --minimal linux-3.4.83/fs/reiserfs/reiserfs.h linux-3.4.83-vs2.3.3.9
int __reiserfs_write_begin(struct page *page, unsigned from, unsigned len);
-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
+diff -NurpP --minimal linux-3.4.87/fs/reiserfs/super.c linux-3.4.87-vs2.3.3.9/fs/reiserfs/super.c
+--- linux-3.4.87/fs/reiserfs/super.c 2014-04-21 17:16:24.000000000 +0000
++++ linux-3.4.87-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},
@@ -7245,9 +7247,9 @@ diff -NurpP --minimal linux-3.4.83/fs/reiserfs/super.c linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/fs/reiserfs/xattr.c linux-3.4.87-vs2.3.3.9/fs/reiserfs/xattr.c
+--- linux-3.4.87/fs/reiserfs/xattr.c 2014-04-21 17:16:24.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/reiserfs/xattr.c 2013-07-14 13:38:35.000000000 +0000
@@ -40,6 +40,7 @@
#include <linux/errno.h>
#include <linux/gfp.h>
@@ -7256,9 +7258,9 @@ diff -NurpP --minimal linux-3.4.83/fs/reiserfs/xattr.c linux-3.4.83-vs2.3.3.9/fs
#include <linux/file.h>
#include <linux/pagemap.h>
#include <linux/xattr.h>
-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
+diff -NurpP --minimal linux-3.4.87/fs/stat.c linux-3.4.87-vs2.3.3.9/fs/stat.c
+--- linux-3.4.87/fs/stat.c 2014-04-21 17:16:24.000000000 +0000
++++ linux-3.4.87-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;
@@ -7267,9 +7269,9 @@ diff -NurpP --minimal linux-3.4.83/fs/stat.c linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/fs/statfs.c linux-3.4.87-vs2.3.3.9/fs/statfs.c
+--- linux-3.4.87/fs/statfs.c 2014-04-21 17:16:24.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/statfs.c 2013-10-26 18:10:23.000000000 +0000
@@ -7,6 +7,8 @@
#include <linux/statfs.h>
#include <linux/security.h>
@@ -7288,9 +7290,9 @@ diff -NurpP --minimal linux-3.4.83/fs/statfs.c linux-3.4.83-vs2.3.3.9/fs/statfs.
return retval;
}
-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
+diff -NurpP --minimal linux-3.4.87/fs/super.c linux-3.4.87-vs2.3.3.9/fs/super.c
+--- linux-3.4.87/fs/super.c 2014-04-21 17:16:24.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/super.c 2013-08-13 17:07:36.000000000 +0000
@@ -33,6 +33,8 @@
#include <linux/rculist_bl.h>
#include <linux/cleancache.h>
@@ -7314,9 +7316,9 @@ diff -NurpP --minimal linux-3.4.83/fs/super.c linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/fs/sysfs/mount.c linux-3.4.87-vs2.3.3.9/fs/sysfs/mount.c
+--- linux-3.4.87/fs/sysfs/mount.c 2012-05-21 16:07:27.000000000 +0000
++++ linux-3.4.87-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;
@@ -7326,9 +7328,9 @@ diff -NurpP --minimal linux-3.4.83/fs/sysfs/mount.c linux-3.4.83-vs2.3.3.9/fs/sy
sb->s_op = &sysfs_ops;
sb->s_time_gran = 1;
-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
+diff -NurpP --minimal linux-3.4.87/fs/utimes.c linux-3.4.87-vs2.3.3.9/fs/utimes.c
+--- linux-3.4.87/fs/utimes.c 2011-05-22 14:17:54.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/utimes.c 2012-05-21 16:15:05.000000000 +0000
@@ -8,6 +8,8 @@
#include <linux/stat.h>
#include <linux/utime.h>
@@ -7358,9 +7360,9 @@ diff -NurpP --minimal linux-3.4.83/fs/utimes.c linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/fs/xattr.c linux-3.4.87-vs2.3.3.9/fs/xattr.c
+--- linux-3.4.87/fs/xattr.c 2012-05-21 16:07:27.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/fs/xattr.c 2012-05-21 16:15:05.000000000 +0000
@@ -20,6 +20,7 @@
#include <linux/fsnotify.h>
#include <linux/audit.h>
@@ -7378,9 +7380,9 @@ diff -NurpP --minimal linux-3.4.83/fs/xattr.c linux-3.4.83-vs2.3.3.9/fs/xattr.c
return (mask & MAY_WRITE) ? -EPERM : -ENODATA;
return 0;
}
-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
+diff -NurpP --minimal linux-3.4.87/fs/xfs/xfs_dinode.h linux-3.4.87-vs2.3.3.9/fs/xfs/xfs_dinode.h
+--- linux-3.4.87/fs/xfs/xfs_dinode.h 2011-10-24 16:45:31.000000000 +0000
++++ linux-3.4.87-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 */
@@ -7421,9 +7423,9 @@ diff -NurpP --minimal linux-3.4.83/fs/xfs/xfs_dinode.h linux-3.4.83-vs2.3.3.9/fs
+#define XFS_DIVFLAG_COW 0x02
#endif /* __XFS_DINODE_H__ */
-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
+diff -NurpP --minimal linux-3.4.87/fs/xfs/xfs_fs.h linux-3.4.87-vs2.3.3.9/fs/xfs/xfs_fs.h
+--- linux-3.4.87/fs/xfs/xfs_fs.h 2011-10-24 16:45:31.000000000 +0000
++++ linux-3.4.87-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 */
@@ -7444,9 +7446,9 @@ diff -NurpP --minimal linux-3.4.83/fs/xfs/xfs_fs.h linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/fs/xfs/xfs_ialloc.c linux-3.4.87-vs2.3.3.9/fs/xfs/xfs_ialloc.c
+--- linux-3.4.87/fs/xfs/xfs_ialloc.c 2012-03-19 18:47:27.000000000 +0000
++++ linux-3.4.87-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"
@@ -7455,9 +7457,9 @@ diff -NurpP --minimal linux-3.4.83/fs/xfs/xfs_ialloc.c linux-3.4.83-vs2.3.3.9/fs
/*
* Allocation group level functions.
*/
-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
+diff -NurpP --minimal linux-3.4.87/fs/xfs/xfs_inode.c linux-3.4.87-vs2.3.3.9/fs/xfs/xfs_inode.c
+--- linux-3.4.87/fs/xfs/xfs_inode.c 2012-05-21 16:07:27.000000000 +0000
++++ linux-3.4.87-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;
}
@@ -7632,9 +7634,9 @@ diff -NurpP --minimal linux-3.4.83/fs/xfs/xfs_inode.c linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/fs/xfs/xfs_inode.h linux-3.4.87-vs2.3.3.9/fs/xfs/xfs_inode.h
+--- linux-3.4.87/fs/xfs/xfs_inode.h 2012-05-21 16:07:27.000000000 +0000
++++ linux-3.4.87-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 */
@@ -7655,9 +7657,9 @@ diff -NurpP --minimal linux-3.4.83/fs/xfs/xfs_inode.h linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/fs/xfs/xfs_ioctl.c linux-3.4.87-vs2.3.3.9/fs/xfs/xfs_ioctl.c
+--- linux-3.4.87/fs/xfs/xfs_ioctl.c 2014-04-21 17:16:24.000000000 +0000
++++ linux-3.4.87-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"
@@ -7726,9 +7728,9 @@ diff -NurpP --minimal linux-3.4.83/fs/xfs/xfs_ioctl.c linux-3.4.83-vs2.3.3.9/fs/
return xfs_ioc_setxflags(ip, filp, arg);
case XFS_IOC_FSSETDM: {
-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
+diff -NurpP --minimal linux-3.4.87/fs/xfs/xfs_ioctl.h linux-3.4.87-vs2.3.3.9/fs/xfs/xfs_ioctl.h
+--- linux-3.4.87/fs/xfs/xfs_ioctl.h 2011-10-24 16:45:31.000000000 +0000
++++ linux-3.4.87-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);
@@ -7742,9 +7744,9 @@ diff -NurpP --minimal linux-3.4.83/fs/xfs/xfs_ioctl.h linux-3.4.83-vs2.3.3.9/fs/
extern long
xfs_file_ioctl(
struct file *filp,
-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
+diff -NurpP --minimal linux-3.4.87/fs/xfs/xfs_iops.c linux-3.4.87-vs2.3.3.9/fs/xfs/xfs_iops.c
+--- linux-3.4.87/fs/xfs/xfs_iops.c 2014-04-21 17:16:24.000000000 +0000
++++ linux-3.4.87-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"
@@ -7820,9 +7822,9 @@ diff -NurpP --minimal linux-3.4.83/fs/xfs/xfs_iops.c linux-3.4.83-vs2.3.3.9/fs/x
switch (inode->i_mode & S_IFMT) {
case S_IFBLK:
-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
+diff -NurpP --minimal linux-3.4.87/fs/xfs/xfs_itable.c linux-3.4.87-vs2.3.3.9/fs/xfs/xfs_itable.c
+--- linux-3.4.87/fs/xfs/xfs_itable.c 2012-05-21 16:07:27.000000000 +0000
++++ linux-3.4.87-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;
@@ -7831,9 +7833,9 @@ diff -NurpP --minimal linux-3.4.83/fs/xfs/xfs_itable.c linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/fs/xfs/xfs_linux.h linux-3.4.87-vs2.3.3.9/fs/xfs/xfs_linux.h
+--- linux-3.4.87/fs/xfs/xfs_linux.h 2011-10-24 16:45:31.000000000 +0000
++++ linux-3.4.87-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())
@@ -7842,9 +7844,9 @@ diff -NurpP --minimal linux-3.4.83/fs/xfs/xfs_linux.h linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/fs/xfs/xfs_log_recover.c linux-3.4.87-vs2.3.3.9/fs/xfs/xfs_log_recover.c
+--- linux-3.4.87/fs/xfs/xfs_log_recover.c 2014-04-21 17:16:24.000000000 +0000
++++ linux-3.4.87-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(
}
@@ -7855,9 +7857,9 @@ diff -NurpP --minimal linux-3.4.83/fs/xfs/xfs_log_recover.c linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/fs/xfs/xfs_mount.h linux-3.4.87-vs2.3.3.9/fs/xfs/xfs_mount.h
+--- linux-3.4.87/fs/xfs/xfs_mount.h 2012-05-21 16:07:28.000000000 +0000
++++ linux-3.4.87-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 */
@@ -7866,9 +7868,9 @@ diff -NurpP --minimal linux-3.4.83/fs/xfs/xfs_mount.h linux-3.4.83-vs2.3.3.9/fs/
/*
* Default minimum read and write sizes.
-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
+diff -NurpP --minimal linux-3.4.87/fs/xfs/xfs_super.c linux-3.4.87-vs2.3.3.9/fs/xfs/xfs_super.c
+--- linux-3.4.87/fs/xfs/xfs_super.c 2012-05-21 16:07:28.000000000 +0000
++++ linux-3.4.87-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 */
@@ -7941,9 +7943,9 @@ diff -NurpP --minimal linux-3.4.83/fs/xfs/xfs_super.c linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/fs/xfs/xfs_vnodeops.c linux-3.4.87-vs2.3.3.9/fs/xfs/xfs_vnodeops.c
+--- linux-3.4.87/fs/xfs/xfs_vnodeops.c 2012-05-21 16:07:28.000000000 +0000
++++ linux-3.4.87-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;
}
@@ -8022,9 +8024,9 @@ diff -NurpP --minimal linux-3.4.83/fs/xfs/xfs_vnodeops.c linux-3.4.83-vs2.3.3.9/
int
xfs_readlink(
xfs_inode_t *ip,
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/Kbuild linux-3.4.87-vs2.3.3.9/include/linux/Kbuild
+--- linux-3.4.87/include/linux/Kbuild 2014-04-21 17:16:24.000000000 +0000
++++ linux-3.4.87-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/
@@ -8033,9 +8035,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/Kbuild linux-3.4.83-vs2.3.3.9/i
header-y += wimax/
objhdr-y += version.h
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/capability.h linux-3.4.87-vs2.3.3.9/include/linux/capability.h
+--- linux-3.4.87/include/linux/capability.h 2012-03-19 18:47:27.000000000 +0000
++++ linux-3.4.87-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 */
@@ -8058,9 +8060,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/capability.h linux-3.4.83-vs2.3
/*
* Bit location of each capability (used by user-space library and kernel)
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/cred.h linux-3.4.87-vs2.3.3.9/include/linux/cred.h
+--- linux-3.4.87/include/linux/cred.h 2012-03-19 18:47:27.000000000 +0000
++++ linux-3.4.87-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 *);
@@ -8101,18 +8103,18 @@ diff -NurpP --minimal linux-3.4.83/include/linux/cred.h linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/include/linux/devpts_fs.h linux-3.4.87-vs2.3.3.9/include/linux/devpts_fs.h
+--- linux-3.4.87/include/linux/devpts_fs.h 2008-12-24 23:26:37.000000000 +0000
++++ linux-3.4.87-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.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
+diff -NurpP --minimal linux-3.4.87/include/linux/fs.h linux-3.4.87-vs2.3.3.9/include/linux/fs.h
+--- linux-3.4.87/include/linux/fs.h 2014-04-21 17:16:25.000000000 +0000
++++ linux-3.4.87-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 */
@@ -8290,9 +8292,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/fs.h linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/include/linux/gfs2_ondisk.h linux-3.4.87-vs2.3.3.9/include/linux/gfs2_ondisk.h
+--- linux-3.4.87/include/linux/gfs2_ondisk.h 2012-05-21 16:07:29.000000000 +0000
++++ linux-3.4.87-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,
@@ -8313,9 +8315,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/gfs2_ondisk.h linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/include/linux/if_tun.h linux-3.4.87-vs2.3.3.9/include/linux/if_tun.h
+--- linux-3.4.87/include/linux/if_tun.h 2010-08-02 14:52:54.000000000 +0000
++++ linux-3.4.87-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)
@@ -8324,9 +8326,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/if_tun.h linux-3.4.83-vs2.3.3.9
/* TUNSETIFF ifr flags */
#define IFF_TUN 0x0001
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/init_task.h linux-3.4.87-vs2.3.3.9/include/linux/init_task.h
+--- linux-3.4.87/include/linux/init_task.h 2014-04-21 17:16:25.000000000 +0000
++++ linux-3.4.87-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) \
@@ -8338,9 +8340,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/init_task.h linux-3.4.83-vs2.3.
}
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/ipc.h linux-3.4.87-vs2.3.3.9/include/linux/ipc.h
+--- linux-3.4.87/include/linux/ipc.h 2012-03-19 18:47:28.000000000 +0000
++++ linux-3.4.87-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;
@@ -8349,9 +8351,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/ipc.h linux-3.4.83-vs2.3.3.9/in
uid_t cuid;
gid_t cgid;
umode_t mode;
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/ipc_namespace.h linux-3.4.87-vs2.3.3.9/include/linux/ipc_namespace.h
+--- linux-3.4.87/include/linux/ipc_namespace.h 2014-04-21 17:16:25.000000000 +0000
++++ linux-3.4.87-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)
@@ -8378,9 +8380,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/ipc_namespace.h linux-3.4.83-vs
}
static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns)
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/loop.h linux-3.4.87-vs2.3.3.9/include/linux/loop.h
+--- linux-3.4.87/include/linux/loop.h 2012-01-09 15:14:58.000000000 +0000
++++ linux-3.4.87-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];
@@ -8389,9 +8391,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/loop.h linux-3.4.83-vs2.3.3.9/i
int (*ioctl)(struct loop_device *, int cmd,
unsigned long arg);
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/magic.h linux-3.4.87-vs2.3.3.9/include/linux/magic.h
+--- linux-3.4.87/include/linux/magic.h 2012-05-21 16:07:31.000000000 +0000
++++ linux-3.4.87-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
@@ -8401,9 +8403,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/magic.h linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/include/linux/major.h linux-3.4.87-vs2.3.3.9/include/linux/major.h
+--- linux-3.4.87/include/linux/major.h 2009-09-10 13:26:25.000000000 +0000
++++ linux-3.4.87-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
@@ -8412,9 +8414,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/major.h linux-3.4.83-vs2.3.3.9/
#define TTYAUX_MAJOR 5
#define LP_MAJOR 6
#define VCS_MAJOR 7
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/memcontrol.h linux-3.4.87-vs2.3.3.9/include/linux/memcontrol.h
+--- linux-3.4.87/include/linux/memcontrol.h 2012-05-21 16:07:31.000000000 +0000
++++ linux-3.4.87-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);
@@ -8429,9 +8431,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/memcontrol.h linux-3.4.83-vs2.3
static inline
int mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *cgroup)
{
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/mm_types.h linux-3.4.87-vs2.3.3.9/include/linux/mm_types.h
+--- linux-3.4.87/include/linux/mm_types.h 2014-04-21 17:16:25.000000000 +0000
++++ linux-3.4.87-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 */
@@ -8440,9 +8442,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/mm_types.h linux-3.4.83-vs2.3.3
/* Swap token stuff */
/*
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/mmzone.h linux-3.4.87-vs2.3.3.9/include/linux/mmzone.h
+--- linux-3.4.87/include/linux/mmzone.h 2014-04-21 17:16:25.000000000 +0000
++++ linux-3.4.87-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;\
})
@@ -8457,9 +8459,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/mmzone.h linux-3.4.83-vs2.3.3.9
#include <linux/memory_hotplug.h>
extern struct mutex zonelists_mutex;
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/mount.h linux-3.4.87-vs2.3.3.9/include/linux/mount.h
+--- linux-3.4.87/include/linux/mount.h 2012-03-19 18:47:28.000000000 +0000
++++ linux-3.4.87-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
@@ -8470,9 +8472,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/mount.h linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/include/linux/net.h linux-3.4.87-vs2.3.3.9/include/linux/net.h
+--- linux-3.4.87/include/linux/net.h 2014-04-21 17:16:25.000000000 +0000
++++ linux-3.4.87-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
@@ -8481,9 +8483,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/net.h linux-3.4.83-vs2.3.3.9/in
#ifndef ARCH_HAS_SOCKET_TYPES
/**
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/netdevice.h linux-3.4.87-vs2.3.3.9/include/linux/netdevice.h
+--- linux-3.4.87/include/linux/netdevice.h 2014-04-21 17:16:25.000000000 +0000
++++ linux-3.4.87-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);
@@ -8492,9 +8494,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/netdevice.h linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/include/linux/nfs_mount.h linux-3.4.87-vs2.3.3.9/include/linux/nfs_mount.h
+--- linux-3.4.87/include/linux/nfs_mount.h 2011-01-05 20:50:31.000000000 +0000
++++ linux-3.4.87-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 */
@@ -8505,9 +8507,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/nfs_mount.h linux-3.4.83-vs2.3.
/* The following are for internal use only */
#define NFS_MOUNT_LOOKUP_CACHE_NONEG 0x10000
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/nsproxy.h linux-3.4.87-vs2.3.3.9/include/linux/nsproxy.h
+--- linux-3.4.87/include/linux/nsproxy.h 2011-10-24 16:45:32.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/include/linux/nsproxy.h 2012-05-21 16:15:05.000000000 +0000
@@ -3,6 +3,7 @@
#include <linux/spinlock.h>
@@ -8557,9 +8559,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/nsproxy.h linux-3.4.83-vs2.3.3.
}
#endif
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/pid.h linux-3.4.87-vs2.3.3.9/include/linux/pid.h
+--- linux-3.4.87/include/linux/pid.h 2011-07-22 09:18:11.000000000 +0000
++++ linux-3.4.87-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,
@@ -8578,9 +8580,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/pid.h linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/include/linux/proc_fs.h linux-3.4.87-vs2.3.3.9/include/linux/proc_fs.h
+--- linux-3.4.87/include/linux/proc_fs.h 2012-03-19 18:47:28.000000000 +0000
++++ linux-3.4.87-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;
@@ -8616,9 +8618,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/proc_fs.h linux-3.4.83-vs2.3.3.
int fd;
union proc_op op;
struct proc_dir_entry *pde;
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/quotaops.h linux-3.4.87-vs2.3.3.9/include/linux/quotaops.h
+--- linux-3.4.87/include/linux/quotaops.h 2012-01-09 15:14:58.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/include/linux/quotaops.h 2012-05-21 16:15:05.000000000 +0000
@@ -8,6 +8,7 @@
#define _LINUX_QUOTAOPS_
@@ -8660,9 +8662,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/quotaops.h linux-3.4.83-vs2.3.3
}
static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/reboot.h linux-3.4.87-vs2.3.3.9/include/linux/reboot.h
+--- linux-3.4.87/include/linux/reboot.h 2011-10-24 16:45:32.000000000 +0000
++++ linux-3.4.87-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
@@ -8671,9 +8673,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/reboot.h linux-3.4.83-vs2.3.3.9
#ifdef __KERNEL__
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/sched.h linux-3.4.87-vs2.3.3.9/include/linux/sched.h
+--- linux-3.4.87/include/linux/sched.h 2014-04-21 17:16:25.000000000 +0000
++++ linux-3.4.87-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;
@@ -8720,9 +8722,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/sched.h linux-3.4.83-vs2.3.3.9/
}
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/shmem_fs.h linux-3.4.87-vs2.3.3.9/include/linux/shmem_fs.h
+--- linux-3.4.87/include/linux/shmem_fs.h 2012-03-19 18:47:29.000000000 +0000
++++ linux-3.4.87-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 */
@@ -8733,9 +8735,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/shmem_fs.h linux-3.4.83-vs2.3.3
struct shmem_inode_info {
spinlock_t lock;
unsigned long flags;
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/stat.h linux-3.4.87-vs2.3.3.9/include/linux/stat.h
+--- linux-3.4.87/include/linux/stat.h 2008-12-24 23:26:37.000000000 +0000
++++ linux-3.4.87-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;
@@ -8744,9 +8746,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/stat.h linux-3.4.83-vs2.3.3.9/i
dev_t rdev;
loff_t size;
struct timespec atime;
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/sunrpc/auth.h linux-3.4.87-vs2.3.3.9/include/linux/sunrpc/auth.h
+--- linux-3.4.87/include/linux/sunrpc/auth.h 2012-05-21 16:07:32.000000000 +0000
++++ linux-3.4.87-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;
@@ -8755,9 +8757,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/sunrpc/auth.h linux-3.4.83-vs2.
struct group_info *group_info;
const char *principal;
unsigned char machine_cred : 1;
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/sunrpc/clnt.h linux-3.4.87-vs2.3.3.9/include/linux/sunrpc/clnt.h
+--- linux-3.4.87/include/linux/sunrpc/clnt.h 2012-05-21 16:07:32.000000000 +0000
++++ linux-3.4.87-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 */
@@ -8768,9 +8770,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/sunrpc/clnt.h linux-3.4.83-vs2.
struct rpc_rtt * cl_rtt; /* RTO estimator data */
const struct rpc_timeout *cl_timeout; /* Timeout strategy */
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/sysctl.h linux-3.4.87-vs2.3.3.9/include/linux/sysctl.h
+--- linux-3.4.87/include/linux/sysctl.h 2012-05-21 16:07:32.000000000 +0000
++++ linux-3.4.87-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) */
@@ -8787,9 +8789,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/sysctl.h linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/include/linux/sysfs.h linux-3.4.87-vs2.3.3.9/include/linux/sysfs.h
+--- linux-3.4.87/include/linux/sysfs.h 2012-03-19 18:47:29.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/include/linux/sysfs.h 2012-05-21 16:15:05.000000000 +0000
@@ -19,6 +19,8 @@
#include <linux/kobject_ns.h>
#include <linux/atomic.h>
@@ -8799,9 +8801,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/sysfs.h linux-3.4.83-vs2.3.3.9/
struct kobject;
struct module;
enum kobj_ns_type;
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/time.h linux-3.4.87-vs2.3.3.9/include/linux/time.h
+--- linux-3.4.87/include/linux/time.h 2014-04-21 17:16:25.000000000 +0000
++++ linux-3.4.87-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;
}
@@ -8811,9 +8813,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/time.h linux-3.4.83-vs2.3.3.9/i
#endif /* __KERNEL__ */
/*
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/types.h linux-3.4.87-vs2.3.3.9/include/linux/types.h
+--- linux-3.4.87/include/linux/types.h 2012-05-21 16:07:32.000000000 +0000
++++ linux-3.4.87-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;
@@ -8824,9 +8826,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/types.h linux-3.4.83-vs2.3.3.9/
typedef unsigned long uintptr_t;
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/utsname.h linux-3.4.87-vs2.3.3.9/include/linux/utsname.h
+--- linux-3.4.87/include/linux/utsname.h 2012-01-09 15:14:59.000000000 +0000
++++ linux-3.4.87-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
}
@@ -8853,9 +8855,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/utsname.h linux-3.4.83-vs2.3.3.
}
#endif
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vroot.h linux-3.4.87-vs2.3.3.9/include/linux/vroot.h
+--- linux-3.4.87/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/include/linux/vroot.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,51 @@
+
+/*
@@ -8908,9 +8910,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vroot.h linux-3.4.83-vs2.3.3.9/
+#define VROOT_CLR_DEV 0x5601
+
+#endif /* _LINUX_VROOT_H */
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vs_base.h linux-3.4.87-vs2.3.3.9/include/linux/vs_base.h
+--- linux-3.4.87/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -8922,9 +8924,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vs_base.h linux-3.4.83-vs2.3.3.
+#else
+#warning duplicate inclusion
+#endif
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vs_context.h linux-3.4.87-vs2.3.3.9/include/linux/vs_context.h
+--- linux-3.4.87/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -9168,9 +9170,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vs_context.h linux-3.4.83-vs2.3
+#else
+#warning duplicate inclusion
+#endif
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vs_cowbl.h linux-3.4.87-vs2.3.3.9/include/linux/vs_cowbl.h
+--- linux-3.4.87/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -9220,9 +9222,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vs_cowbl.h linux-3.4.83-vs2.3.3
+#else
+#warning duplicate inclusion
+#endif
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vs_cvirt.h linux-3.4.87-vs2.3.3.9/include/linux/vs_cvirt.h
+--- linux-3.4.87/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -9274,9 +9276,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vs_cvirt.h linux-3.4.83-vs2.3.3
+#else
+#warning duplicate inclusion
+#endif
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vs_device.h linux-3.4.87-vs2.3.3.9/include/linux/vs_device.h
+--- linux-3.4.87/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -9323,9 +9325,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vs_device.h linux-3.4.83-vs2.3.
+#else
+#warning duplicate inclusion
+#endif
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vs_dlimit.h linux-3.4.87-vs2.3.3.9/include/linux/vs_dlimit.h
+--- linux-3.4.87/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -9542,9 +9544,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vs_dlimit.h linux-3.4.83-vs2.3.
+#else
+#warning duplicate inclusion
+#endif
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vs_inet.h linux-3.4.87-vs2.3.3.9/include/linux/vs_inet.h
+--- linux-3.4.87/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -9899,9 +9901,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vs_inet.h linux-3.4.83-vs2.3.3.
+#else
+// #warning duplicate inclusion
+#endif
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vs_inet6.h linux-3.4.87-vs2.3.3.9/include/linux/vs_inet6.h
+--- linux-3.4.87/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -10149,9 +10151,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vs_inet6.h linux-3.4.83-vs2.3.3
+#else
+#warning duplicate inclusion
+#endif
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vs_limit.h linux-3.4.87-vs2.3.3.9/include/linux/vs_limit.h
+--- linux-3.4.87/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -10293,9 +10295,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vs_limit.h linux-3.4.83-vs2.3.3
+#else
+#warning duplicate inclusion
+#endif
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vs_network.h linux-3.4.87-vs2.3.3.9/include/linux/vs_network.h
+--- linux-3.4.87/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -10466,9 +10468,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vs_network.h linux-3.4.83-vs2.3
+#else
+#warning duplicate inclusion
+#endif
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vs_pid.h linux-3.4.87-vs2.3.3.9/include/linux/vs_pid.h
+--- linux-3.4.87/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -10520,9 +10522,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vs_pid.h linux-3.4.83-vs2.3.3.9
+#else
+#warning duplicate inclusion
+#endif
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vs_sched.h linux-3.4.87-vs2.3.3.9/include/linux/vs_sched.h
+--- linux-3.4.87/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -10564,9 +10566,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vs_sched.h linux-3.4.83-vs2.3.3
+#else
+#warning duplicate inclusion
+#endif
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vs_socket.h linux-3.4.87-vs2.3.3.9/include/linux/vs_socket.h
+--- linux-3.4.87/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -10635,9 +10637,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vs_socket.h linux-3.4.83-vs2.3.
+#else
+#warning duplicate inclusion
+#endif
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vs_tag.h linux-3.4.87-vs2.3.3.9/include/linux/vs_tag.h
+--- linux-3.4.87/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -10686,9 +10688,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vs_tag.h linux-3.4.83-vs2.3.3.9
+#else
+#warning duplicate inclusion
+#endif
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vs_time.h linux-3.4.87-vs2.3.3.9/include/linux/vs_time.h
+--- linux-3.4.87/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -10709,9 +10711,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vs_time.h linux-3.4.83-vs2.3.3.
+#else
+#warning duplicate inclusion
+#endif
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vserver/Kbuild linux-3.4.87-vs2.3.3.9/include/linux/vserver/Kbuild
+--- linux-3.4.87/include/linux/vserver/Kbuild 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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 \
@@ -10721,9 +10723,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vserver/Kbuild linux-3.4.83-vs2
+
+header-y += switch.h network.h monitor.h inode.h device.h
+
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vserver/base.h linux-3.4.87-vs2.3.3.9/include/linux/vserver/base.h
+--- linux-3.4.87/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -10903,9 +10905,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vserver/base.h linux-3.4.83-vs2
+#define nx_info_state(n, m) (__nx_state(n) & (m))
+
+#endif
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vserver/cacct.h linux-3.4.87-vs2.3.3.9/include/linux/vserver/cacct.h
+--- linux-3.4.87/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -10922,9 +10924,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vserver/cacct.h linux-3.4.83-vs
+};
+
+#endif /* _VX_CACCT_H */
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vserver/cacct_cmd.h linux-3.4.87-vs2.3.3.9/include/linux/vserver/cacct_cmd.h
+--- linux-3.4.87/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -10949,9 +10951,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vserver/cacct_cmd.h linux-3.4.8
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CACCT_CMD_H */
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vserver/cacct_def.h linux-3.4.87-vs2.3.3.9/include/linux/vserver/cacct_def.h
+--- linux-3.4.87/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -10996,9 +10998,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vserver/cacct_def.h linux-3.4.8
+#endif
+
+#endif /* _VX_CACCT_DEF_H */
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vserver/cacct_int.h linux-3.4.87-vs2.3.3.9/include/linux/vserver/cacct_int.h
+--- linux-3.4.87/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -11021,9 +11023,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vserver/cacct_int.h linux-3.4.8
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CACCT_INT_H */
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vserver/check.h linux-3.4.87-vs2.3.3.9/include/linux/vserver/check.h
+--- linux-3.4.87/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -11114,9 +11116,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vserver/check.h linux-3.4.83-vs
+#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1)
+
+#endif
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vserver/context.h linux-3.4.87-vs2.3.3.9/include/linux/vserver/context.h
+--- linux-3.4.87/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -11306,9 +11308,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vserver/context.h linux-3.4.83-
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_H */
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vserver/context_cmd.h linux-3.4.87-vs2.3.3.9/include/linux/vserver/context_cmd.h
+--- linux-3.4.87/include/linux/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -11472,9 +11474,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vserver/context_cmd.h linux-3.4
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_CMD_H */
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vserver/cvirt.h linux-3.4.87-vs2.3.3.9/include/linux/vserver/cvirt.h
+--- linux-3.4.87/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -11498,9 +11500,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vserver/cvirt.h linux-3.4.83-vs
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CVIRT_H */
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vserver/cvirt_cmd.h linux-3.4.87-vs2.3.3.9/include/linux/vserver/cvirt_cmd.h
+--- linux-3.4.87/include/linux/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -11555,9 +11557,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vserver/cvirt_cmd.h linux-3.4.8
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CVIRT_CMD_H */
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vserver/cvirt_def.h linux-3.4.87-vs2.3.3.9/include/linux/vserver/cvirt_def.h
+--- linux-3.4.87/include/linux/vserver/cvirt_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -11639,9 +11641,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vserver/cvirt_def.h linux-3.4.8
+#endif
+
+#endif /* _VX_CVIRT_DEF_H */
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vserver/debug.h linux-3.4.87-vs2.3.3.9/include/linux/vserver/debug.h
+--- linux-3.4.87/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -11788,9 +11790,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vserver/debug.h linux-3.4.83-vs
+
+
+#endif /* _VX_DEBUG_H */
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vserver/debug_cmd.h linux-3.4.87-vs2.3.3.9/include/linux/vserver/debug_cmd.h
+--- linux-3.4.87/include/linux/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -11850,9 +11852,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vserver/debug_cmd.h linux-3.4.8
+
+#endif /* __KERNEL__ */
+#endif /* _VX_DEBUG_CMD_H */
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vserver/device.h linux-3.4.87-vs2.3.3.9/include/linux/vserver/device.h
+--- linux-3.4.87/include/linux/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -11869,9 +11871,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vserver/device.h linux-3.4.83-v
+#else /* _VX_DEVICE_H */
+#warning duplicate inclusion
+#endif /* _VX_DEVICE_H */
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vserver/device_cmd.h linux-3.4.87-vs2.3.3.9/include/linux/vserver/device_cmd.h
+--- linux-3.4.87/include/linux/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -11917,9 +11919,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vserver/device_cmd.h linux-3.4.
+
+#endif /* __KERNEL__ */
+#endif /* _VX_DEVICE_CMD_H */
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vserver/device_def.h linux-3.4.87-vs2.3.3.9/include/linux/vserver/device_def.h
+--- linux-3.4.87/include/linux/vserver/device_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -11938,9 +11940,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vserver/device_def.h linux-3.4.
+};
+
+#endif /* _VX_DEVICE_DEF_H */
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vserver/dlimit.h linux-3.4.87-vs2.3.3.9/include/linux/vserver/dlimit.h
+--- linux-3.4.87/include/linux/vserver/dlimit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -11996,9 +11998,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vserver/dlimit.h linux-3.4.83-v
+#else /* _VX_DLIMIT_H */
+#warning duplicate inclusion
+#endif /* _VX_DLIMIT_H */
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vserver/dlimit_cmd.h linux-3.4.87-vs2.3.3.9/include/linux/vserver/dlimit_cmd.h
+--- linux-3.4.87/include/linux/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -12109,9 +12111,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vserver/dlimit_cmd.h linux-3.4.
+
+#endif /* __KERNEL__ */
+#endif /* _VX_DLIMIT_CMD_H */
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vserver/global.h linux-3.4.87-vs2.3.3.9/include/linux/vserver/global.h
+--- linux-3.4.87/include/linux/vserver/global.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -12132,9 +12134,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vserver/global.h linux-3.4.83-v
+
+
+#endif /* _VX_GLOBAL_H */
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vserver/history.h linux-3.4.87-vs2.3.3.9/include/linux/vserver/history.h
+--- linux-3.4.87/include/linux/vserver/history.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -12333,9 +12335,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vserver/history.h linux-3.4.83-
+#endif /* CONFIG_VSERVER_HISTORY */
+
+#endif /* _VX_HISTORY_H */
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vserver/inode.h linux-3.4.87-vs2.3.3.9/include/linux/vserver/inode.h
+--- linux-3.4.87/include/linux/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -12376,9 +12378,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vserver/inode.h linux-3.4.83-vs
+#else /* _VX_INODE_H */
+#warning duplicate inclusion
+#endif /* _VX_INODE_H */
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vserver/inode_cmd.h linux-3.4.87-vs2.3.3.9/include/linux/vserver/inode_cmd.h
+--- linux-3.4.87/include/linux/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -12439,9 +12441,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vserver/inode_cmd.h linux-3.4.8
+
+#endif /* __KERNEL__ */
+#endif /* _VX_INODE_CMD_H */
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vserver/limit.h linux-3.4.87-vs2.3.3.9/include/linux/vserver/limit.h
+--- linux-3.4.87/include/linux/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -12514,9 +12516,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vserver/limit.h linux-3.4.83-vs
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_H */
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vserver/limit_cmd.h linux-3.4.87-vs2.3.3.9/include/linux/vserver/limit_cmd.h
+--- linux-3.4.87/include/linux/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -12589,9 +12591,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vserver/limit_cmd.h linux-3.4.8
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_CMD_H */
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vserver/limit_def.h linux-3.4.87-vs2.3.3.9/include/linux/vserver/limit_def.h
+--- linux-3.4.87/include/linux/vserver/limit_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -12640,9 +12642,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vserver/limit_def.h linux-3.4.8
+#endif
+
+#endif /* _VX_LIMIT_DEF_H */
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vserver/limit_int.h linux-3.4.87-vs2.3.3.9/include/linux/vserver/limit_int.h
+--- linux-3.4.87/include/linux/vserver/limit_int.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -12842,9 +12844,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vserver/limit_int.h linux-3.4.8
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_INT_H */
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vserver/monitor.h linux-3.4.87-vs2.3.3.9/include/linux/vserver/monitor.h
+--- linux-3.4.87/include/linux/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -12942,9 +12944,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vserver/monitor.h linux-3.4.83-
+
+
+#endif /* _VX_MONITOR_H */
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vserver/network.h linux-3.4.87-vs2.3.3.9/include/linux/vserver/network.h
+--- linux-3.4.87/include/linux/vserver/network.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -13094,9 +13096,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vserver/network.h linux-3.4.83-
+
+#endif /* __KERNEL__ */
+#endif /* _VX_NETWORK_H */
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vserver/network_cmd.h linux-3.4.87-vs2.3.3.9/include/linux/vserver/network_cmd.h
+--- linux-3.4.87/include/linux/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -13262,9 +13264,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vserver/network_cmd.h linux-3.4
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_CMD_H */
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vserver/percpu.h linux-3.4.87-vs2.3.3.9/include/linux/vserver/percpu.h
+--- linux-3.4.87/include/linux/vserver/percpu.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -13280,9 +13282,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vserver/percpu.h linux-3.4.83-v
+#define PERCPU_PERCTX (sizeof(struct _vx_percpu))
+
+#endif /* _VX_PERCPU_H */
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vserver/pid.h linux-3.4.87-vs2.3.3.9/include/linux/vserver/pid.h
+--- linux-3.4.87/include/linux/vserver/pid.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -13335,9 +13337,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vserver/pid.h linux-3.4.83-vs2.
+}
+
+#endif
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vserver/sched.h linux-3.4.87-vs2.3.3.9/include/linux/vserver/sched.h
+--- linux-3.4.87/include/linux/vserver/sched.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -13362,9 +13364,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vserver/sched.h linux-3.4.83-vs
+#else /* _VX_SCHED_H */
+#warning duplicate inclusion
+#endif /* _VX_SCHED_H */
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vserver/sched_cmd.h linux-3.4.87-vs2.3.3.9/include/linux/vserver/sched_cmd.h
+--- linux-3.4.87/include/linux/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -13387,9 +13389,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vserver/sched_cmd.h linux-3.4.8
+
+#endif /* __KERNEL__ */
+#endif /* _VX_SCHED_CMD_H */
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vserver/sched_def.h linux-3.4.87-vs2.3.3.9/include/linux/vserver/sched_def.h
+--- linux-3.4.87/include/linux/vserver/sched_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -13429,9 +13431,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vserver/sched_def.h linux-3.4.8
+#endif
+
+#endif /* _VX_SCHED_DEF_H */
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vserver/signal.h linux-3.4.87-vs2.3.3.9/include/linux/vserver/signal.h
+--- linux-3.4.87/include/linux/vserver/signal.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -13447,9 +13449,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vserver/signal.h linux-3.4.83-v
+#else /* _VX_SIGNAL_H */
+#warning duplicate inclusion
+#endif /* _VX_SIGNAL_H */
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vserver/signal_cmd.h linux-3.4.87-vs2.3.3.9/include/linux/vserver/signal_cmd.h
+--- linux-3.4.87/include/linux/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -13494,9 +13496,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vserver/signal_cmd.h linux-3.4.
+
+#endif /* __KERNEL__ */
+#endif /* _VX_SIGNAL_CMD_H */
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vserver/space.h linux-3.4.87-vs2.3.3.9/include/linux/vserver/space.h
+--- linux-3.4.87/include/linux/vserver/space.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -13510,9 +13512,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vserver/space.h linux-3.4.83-vs
+#else /* _VX_SPACE_H */
+#warning duplicate inclusion
+#endif /* _VX_SPACE_H */
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vserver/space_cmd.h linux-3.4.87-vs2.3.3.9/include/linux/vserver/space_cmd.h
+--- linux-3.4.87/include/linux/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -13552,9 +13554,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vserver/space_cmd.h linux-3.4.8
+
+#endif /* __KERNEL__ */
+#endif /* _VX_SPACE_CMD_H */
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vserver/switch.h linux-3.4.87-vs2.3.3.9/include/linux/vserver/switch.h
+--- linux-3.4.87/include/linux/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -13654,9 +13656,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vserver/switch.h linux-3.4.83-v
+
+#endif /* _VX_SWITCH_H */
+
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vserver/tag.h linux-3.4.87-vs2.3.3.9/include/linux/vserver/tag.h
+--- linux-3.4.87/include/linux/vserver/tag.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -13801,9 +13803,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vserver/tag.h linux-3.4.83-vs2.
+#endif
+
+#endif /* _DX_TAG_H */
-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
+diff -NurpP --minimal linux-3.4.87/include/linux/vserver/tag_cmd.h linux-3.4.87-vs2.3.3.9/include/linux/vserver/tag_cmd.h
+--- linux-3.4.87/include/linux/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.87-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
@@ -13827,9 +13829,9 @@ diff -NurpP --minimal linux-3.4.83/include/linux/vserver/tag_cmd.h linux-3.4.83-
+
+#endif /* __KERNEL__ */
+#endif /* _VX_TAG_CMD_H */
-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
+diff -NurpP --minimal linux-3.4.87/include/net/addrconf.h linux-3.4.87-vs2.3.3.9/include/net/addrconf.h
+--- linux-3.4.87/include/net/addrconf.h 2014-04-21 17:16:26.000000000 +0000
++++ linux-3.4.87-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,
@@ -13840,9 +13842,9 @@ diff -NurpP --minimal linux-3.4.83/include/net/addrconf.h linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/include/net/af_unix.h linux-3.4.87-vs2.3.3.9/include/net/af_unix.h
+--- linux-3.4.87/include/net/af_unix.h 2012-05-21 16:07:33.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/include/net/af_unix.h 2012-05-21 16:15:05.000000000 +0000
@@ -4,6 +4,7 @@
#include <linux/socket.h>
#include <linux/un.h>
@@ -13851,9 +13853,9 @@ diff -NurpP --minimal linux-3.4.83/include/net/af_unix.h linux-3.4.83-vs2.3.3.9/
#include <net/sock.h>
extern void unix_inflight(struct file *fp);
-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
+diff -NurpP --minimal linux-3.4.87/include/net/inet_timewait_sock.h linux-3.4.87-vs2.3.3.9/include/net/inet_timewait_sock.h
+--- linux-3.4.87/include/net/inet_timewait_sock.h 2012-03-19 18:47:29.000000000 +0000
++++ linux-3.4.87-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
@@ -13865,9 +13867,9 @@ diff -NurpP --minimal linux-3.4.83/include/net/inet_timewait_sock.h linux-3.4.83
int tw_timeout;
volatile unsigned char tw_substate;
unsigned char tw_rcv_wscale;
-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
+diff -NurpP --minimal linux-3.4.87/include/net/ip6_route.h linux-3.4.87-vs2.3.3.9/include/net/ip6_route.h
+--- linux-3.4.87/include/net/ip6_route.h 2012-03-19 18:47:29.000000000 +0000
++++ linux-3.4.87-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,
@@ -13878,9 +13880,9 @@ diff -NurpP --minimal linux-3.4.83/include/net/ip6_route.h linux-3.4.83-vs2.3.3.
extern struct rt6_info *rt6_lookup(struct net *net,
const struct in6_addr *daddr,
-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
+diff -NurpP --minimal linux-3.4.87/include/net/route.h linux-3.4.87-vs2.3.3.9/include/net/route.h
+--- linux-3.4.87/include/net/route.h 2012-03-19 18:47:29.000000000 +0000
++++ linux-3.4.87-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);
}
@@ -13928,9 +13930,9 @@ diff -NurpP --minimal linux-3.4.83/include/net/route.h linux-3.4.83-vs2.3.3.9/in
rt = __ip_route_output_key(net, fl4);
if (IS_ERR(rt))
return rt;
-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
+diff -NurpP --minimal linux-3.4.87/include/net/sock.h linux-3.4.87-vs2.3.3.9/include/net/sock.h
+--- linux-3.4.87/include/net/sock.h 2014-04-21 17:16:26.000000000 +0000
++++ linux-3.4.87-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;
@@ -13953,9 +13955,9 @@ diff -NurpP --minimal linux-3.4.83/include/net/sock.h linux-3.4.83-vs2.3.3.9/inc
socket_lock_t sk_lock;
struct sk_buff_head sk_receive_queue;
/*
-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
+diff -NurpP --minimal linux-3.4.87/init/Kconfig linux-3.4.87-vs2.3.3.9/init/Kconfig
+--- linux-3.4.87/init/Kconfig 2012-05-21 16:07:33.000000000 +0000
++++ linux-3.4.87-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"
@@ -13972,9 +13974,9 @@ diff -NurpP --minimal linux-3.4.83/init/Kconfig linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/init/main.c linux-3.4.87-vs2.3.3.9/init/main.c
+--- linux-3.4.87/init/main.c 2014-04-21 17:16:26.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/init/main.c 2013-10-26 18:10:57.000000000 +0000
@@ -69,6 +69,7 @@
#include <linux/slab.h>
#include <linux/perf_event.h>
@@ -13983,9 +13985,9 @@ diff -NurpP --minimal linux-3.4.83/init/main.c linux-3.4.83-vs2.3.3.9/init/main.
#include <asm/io.h>
#include <asm/bugs.h>
-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
+diff -NurpP --minimal linux-3.4.87/ipc/mqueue.c linux-3.4.87-vs2.3.3.9/ipc/mqueue.c
+--- linux-3.4.87/ipc/mqueue.c 2012-05-21 16:07:34.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/ipc/mqueue.c 2012-05-21 16:15:05.000000000 +0000
@@ -34,6 +34,8 @@
#include <linux/ipc_namespace.h>
#include <linux/user_namespace.h>
@@ -14061,9 +14063,9 @@ diff -NurpP --minimal linux-3.4.83/ipc/mqueue.c linux-3.4.83-vs2.3.3.9/ipc/mqueu
free_uid(user);
}
if (ipc_ns)
-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
+diff -NurpP --minimal linux-3.4.87/ipc/msg.c linux-3.4.87-vs2.3.3.9/ipc/msg.c
+--- linux-3.4.87/ipc/msg.c 2014-04-21 17:16:26.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/ipc/msg.c 2014-04-21 18:56:35.000000000 +0000
@@ -37,6 +37,7 @@
#include <linux/rwsem.h>
#include <linux/nsproxy.h>
@@ -14080,9 +14082,9 @@ diff -NurpP --minimal linux-3.4.83/ipc/msg.c linux-3.4.83-vs2.3.3.9/ipc/msg.c
msq->q_perm.security = NULL;
retval = security_msg_queue_alloc(msq);
-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
+diff -NurpP --minimal linux-3.4.87/ipc/namespace.c linux-3.4.87-vs2.3.3.9/ipc/namespace.c
+--- linux-3.4.87/ipc/namespace.c 2011-07-22 09:18:12.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/ipc/namespace.c 2012-05-21 16:15:05.000000000 +0000
@@ -13,11 +13,12 @@
#include <linux/mount.h>
#include <linux/user_namespace.h>
@@ -14123,9 +14125,9 @@ diff -NurpP --minimal linux-3.4.83/ipc/namespace.c linux-3.4.83-vs2.3.3.9/ipc/na
}
/*
-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
+diff -NurpP --minimal linux-3.4.87/ipc/sem.c linux-3.4.87-vs2.3.3.9/ipc/sem.c
+--- linux-3.4.87/ipc/sem.c 2012-01-09 15:14:59.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/ipc/sem.c 2012-05-21 16:15:05.000000000 +0000
@@ -86,6 +86,8 @@
#include <linux/rwsem.h>
#include <linux/nsproxy.h>
@@ -14163,9 +14165,9 @@ diff -NurpP --minimal linux-3.4.83/ipc/sem.c linux-3.4.83-vs2.3.3.9/ipc/sem.c
security_sem_free(sma);
ipc_rcu_putref(sma);
}
-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
+diff -NurpP --minimal linux-3.4.87/ipc/shm.c linux-3.4.87-vs2.3.3.9/ipc/shm.c
+--- linux-3.4.87/ipc/shm.c 2014-04-21 17:16:26.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/ipc/shm.c 2013-07-14 13:38:36.000000000 +0000
@@ -39,6 +39,8 @@
#include <linux/nsproxy.h>
#include <linux/mount.h>
@@ -14221,9 +14223,9 @@ diff -NurpP --minimal linux-3.4.83/ipc/shm.c linux-3.4.83-vs2.3.3.9/ipc/shm.c
return error;
no_id:
-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
+diff -NurpP --minimal linux-3.4.87/kernel/Makefile linux-3.4.87-vs2.3.3.9/kernel/Makefile
+--- linux-3.4.87/kernel/Makefile 2012-05-21 16:07:34.000000000 +0000
++++ linux-3.4.87-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/
@@ -14232,9 +14234,9 @@ diff -NurpP --minimal linux-3.4.83/kernel/Makefile linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/kernel/auditsc.c linux-3.4.87-vs2.3.3.9/kernel/auditsc.c
+--- linux-3.4.87/kernel/auditsc.c 2012-03-19 18:47:29.000000000 +0000
++++ linux-3.4.87-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;
@@ -14244,9 +14246,9 @@ diff -NurpP --minimal linux-3.4.83/kernel/auditsc.c linux-3.4.83-vs2.3.3.9/kerne
return -EPERM;
#endif /* CONFIG_AUDIT_LOGINUID_IMMUTABLE */
-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
+diff -NurpP --minimal linux-3.4.87/kernel/capability.c linux-3.4.87-vs2.3.3.9/kernel/capability.c
+--- linux-3.4.87/kernel/capability.c 2012-03-19 18:47:29.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/kernel/capability.c 2012-05-21 16:15:05.000000000 +0000
@@ -15,6 +15,7 @@
#include <linux/syscalls.h>
#include <linux/pid_namespace.h>
@@ -14272,9 +14274,9 @@ diff -NurpP --minimal linux-3.4.83/kernel/capability.c linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/kernel/compat.c linux-3.4.87-vs2.3.3.9/kernel/compat.c
+--- linux-3.4.87/kernel/compat.c 2012-05-21 16:07:34.000000000 +0000
++++ linux-3.4.87-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;
@@ -14284,9 +14286,9 @@ diff -NurpP --minimal linux-3.4.83/kernel/compat.c linux-3.4.83-vs2.3.3.9/kernel
return 0;
}
-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
+diff -NurpP --minimal linux-3.4.87/kernel/cred.c linux-3.4.87-vs2.3.3.9/kernel/cred.c
+--- linux-3.4.87/kernel/cred.c 2012-05-21 16:07:34.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/kernel/cred.c 2012-05-21 16:15:05.000000000 +0000
@@ -62,31 +62,6 @@ struct cred init_cred = {
#endif
};
@@ -14356,9 +14358,9 @@ diff -NurpP --minimal linux-3.4.83/kernel/cred.c linux-3.4.83-vs2.3.3.9/kernel/c
EXPORT_SYMBOL(prepare_creds);
/*
-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
+diff -NurpP --minimal linux-3.4.87/kernel/exit.c linux-3.4.87-vs2.3.3.9/kernel/exit.c
+--- linux-3.4.87/kernel/exit.c 2014-04-21 17:16:26.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/kernel/exit.c 2012-12-08 00:54:06.000000000 +0000
@@ -48,6 +48,10 @@
#include <linux/fs_struct.h>
#include <linux/init_task.h>
@@ -14466,9 +14468,9 @@ diff -NurpP --minimal linux-3.4.83/kernel/exit.c linux-3.4.83-vs2.3.3.9/kernel/e
BUG();
/* Avoid "noreturn function does return". */
for (;;)
-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
+diff -NurpP --minimal linux-3.4.87/kernel/fork.c linux-3.4.87-vs2.3.3.9/kernel/fork.c
+--- linux-3.4.87/kernel/fork.c 2014-04-21 17:16:26.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/kernel/fork.c 2014-03-12 09:56:10.000000000 +0000
@@ -68,6 +68,9 @@
#include <linux/oom.h>
#include <linux/khugepaged.h>
@@ -14561,9 +14563,9 @@ diff -NurpP --minimal linux-3.4.83/kernel/fork.c linux-3.4.83-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.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
+diff -NurpP --minimal linux-3.4.87/kernel/kthread.c linux-3.4.87-vs2.3.3.9/kernel/kthread.c
+--- linux-3.4.87/kernel/kthread.c 2014-04-21 17:16:26.000000000 +0000
++++ linux-3.4.87-vs2.3.3.9/kernel/kthread.c 2012-10-22 13:09:53.000000000 +0000
@@ -16,6 +16,7 @@
#include <linux/mutex.h>
#include <linux/slab.h>
<Skipped 1286 lines>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/5bf41d00788c75b699b4815216b64497eb3811ff
More information about the pld-cvs-commit
mailing list