[packages/kernel/LINUX_3_4] - 3.4.50 - vserver patch updated to patch-3.4.48-vs2.3.3.9.diff
baggins
baggins at pld-linux.org
Thu Jun 20 22:18:44 CEST 2013
commit d6b4a6d784ed9e976861ba4d14593dec70c1b1de
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Thu Jun 20 22:18:21 2013 +0200
- 3.4.50
- vserver patch updated to patch-3.4.48-vs2.3.3.9.diff
kernel-vserver-2.3.patch | 2457 +++++++++++++++++++++++-----------------------
kernel.spec | 4 +-
2 files changed, 1206 insertions(+), 1255 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index e6bf911..06cbe4b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -91,7 +91,7 @@
%define rel 1
%define basever 3.4
-%define postver .49
+%define postver .50
# __alt_kernel is list of features, empty string if none set
# _alt kernel is defined as: %{nil}%{?alt_kernel:-%{?alt_kernel}} (defined in rpm.macros)
@@ -138,7 +138,7 @@ Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz
# Source0-md5: 967f72983655e2479f951195953e8480
%if "%{postver}" != ".0"
Patch0: http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.xz
-# Patch0-md5: 9dd120e1f24ce4a832b5d892902d384d
+# Patch0-md5: f293bc7780f61b0f113dcc7c92a9219d
%endif
Source3: kernel-autoconf.h
diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index 67cf564..c4e7e3e 100644
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -1,6 +1,6 @@
-diff -NurpP --minimal linux-3.4.32/Documentation/vserver/debug.txt linux-3.4.32-vs2.3.3.9/Documentation/vserver/debug.txt
---- linux-3.4.32/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/Documentation/vserver/debug.txt 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/Documentation/vserver/debug.txt linux-3.4.48-vs2.3.3.9/Documentation/vserver/debug.txt
+--- linux-3.4.48/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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.32/Documentation/vserver/debug.txt linux-3.4.32-
+ 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.32/arch/alpha/Kconfig linux-3.4.32-vs2.3.3.9/arch/alpha/Kconfig
---- linux-3.4.32/arch/alpha/Kconfig 2012-05-21 16:06:12.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/arch/alpha/Kconfig 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/arch/alpha/Kconfig linux-3.4.48-vs2.3.3.9/arch/alpha/Kconfig
+--- linux-3.4.48/arch/alpha/Kconfig 2012-05-21 16:06:12.000000000 +0000
++++ linux-3.4.48-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.32/arch/alpha/Kconfig linux-3.4.32-vs2.3.3.9/arc
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.4.32/arch/alpha/kernel/entry.S linux-3.4.32-vs2.3.3.9/arch/alpha/kernel/entry.S
---- linux-3.4.32/arch/alpha/kernel/entry.S 2010-10-21 11:06:45.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/arch/alpha/kernel/entry.S 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/arch/alpha/kernel/entry.S linux-3.4.48-vs2.3.3.9/arch/alpha/kernel/entry.S
+--- linux-3.4.48/arch/alpha/kernel/entry.S 2010-10-21 11:06:45.000000000 +0000
++++ linux-3.4.48-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.32/arch/alpha/kernel/entry.S linux-3.4.32-vs2.3.
ret
.end sys_getxpid
-diff -NurpP --minimal linux-3.4.32/arch/alpha/kernel/ptrace.c linux-3.4.32-vs2.3.3.9/arch/alpha/kernel/ptrace.c
---- linux-3.4.32/arch/alpha/kernel/ptrace.c 2012-05-21 16:06:12.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/arch/alpha/kernel/ptrace.c 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/arch/alpha/kernel/ptrace.c linux-3.4.48-vs2.3.3.9/arch/alpha/kernel/ptrace.c
+--- linux-3.4.48/arch/alpha/kernel/ptrace.c 2012-05-21 16:06:12.000000000 +0000
++++ linux-3.4.48-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.32/arch/alpha/kernel/ptrace.c linux-3.4.32-vs2.3
#include <asm/uaccess.h>
#include <asm/pgtable.h>
-diff -NurpP --minimal linux-3.4.32/arch/alpha/kernel/systbls.S linux-3.4.32-vs2.3.3.9/arch/alpha/kernel/systbls.S
---- linux-3.4.32/arch/alpha/kernel/systbls.S 2012-01-09 15:13:54.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/arch/alpha/kernel/systbls.S 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/arch/alpha/kernel/systbls.S linux-3.4.48-vs2.3.3.9/arch/alpha/kernel/systbls.S
+--- linux-3.4.48/arch/alpha/kernel/systbls.S 2012-01-09 15:13:54.000000000 +0000
++++ linux-3.4.48-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.32/arch/alpha/kernel/systbls.S linux-3.4.32-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.32/arch/alpha/kernel/traps.c linux-3.4.32-vs2.3.3.9/arch/alpha/kernel/traps.c
---- linux-3.4.32/arch/alpha/kernel/traps.c 2012-05-21 16:06:12.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/arch/alpha/kernel/traps.c 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/arch/alpha/kernel/traps.c linux-3.4.48-vs2.3.3.9/arch/alpha/kernel/traps.c
+--- linux-3.4.48/arch/alpha/kernel/traps.c 2012-05-21 16:06:12.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/arch/alpha/kernel/traps.c 2012-05-21 16:15:04.000000000 +0000
@@ -184,7 +184,8 @@ die_if_kernel(char * str, struct pt_regs
#ifdef CONFIG_SMP
printk("CPU %d ", hard_smp_processor_id());
@@ -239,9 +239,9 @@ diff -NurpP --minimal linux-3.4.32/arch/alpha/kernel/traps.c linux-3.4.32-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.32/arch/arm/Kconfig linux-3.4.32-vs2.3.3.9/arch/arm/Kconfig
---- linux-3.4.32/arch/arm/Kconfig 2013-02-19 13:55:11.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/arch/arm/Kconfig 2012-12-11 11:42:38.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/arch/arm/Kconfig linux-3.4.48-vs2.3.3.9/arch/arm/Kconfig
+--- linux-3.4.48/arch/arm/Kconfig 2013-06-13 08:59:13.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/arch/arm/Kconfig 2012-12-11 11:42:38.000000000 +0000
@@ -2311,6 +2311,8 @@ source "fs/Kconfig"
source "arch/arm/Kconfig.debug"
@@ -251,9 +251,9 @@ diff -NurpP --minimal linux-3.4.32/arch/arm/Kconfig linux-3.4.32-vs2.3.3.9/arch/
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.4.32/arch/arm/kernel/calls.S linux-3.4.32-vs2.3.3.9/arch/arm/kernel/calls.S
---- linux-3.4.32/arch/arm/kernel/calls.S 2012-01-09 15:13:54.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/arch/arm/kernel/calls.S 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/arch/arm/kernel/calls.S linux-3.4.48-vs2.3.3.9/arch/arm/kernel/calls.S
+--- linux-3.4.48/arch/arm/kernel/calls.S 2012-01-09 15:13:54.000000000 +0000
++++ linux-3.4.48-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.32/arch/arm/kernel/calls.S linux-3.4.32-vs2.3.3.
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-3.4.32/arch/arm/kernel/process.c linux-3.4.32-vs2.3.3.9/arch/arm/kernel/process.c
---- linux-3.4.32/arch/arm/kernel/process.c 2013-02-19 13:55:11.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/arch/arm/kernel/process.c 2012-09-01 08:50:48.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/arch/arm/kernel/process.c linux-3.4.48-vs2.3.3.9/arch/arm/kernel/process.c
+--- linux-3.4.48/arch/arm/kernel/process.c 2013-06-13 08:59:13.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/arch/arm/kernel/process.c 2012-09-01 08:50:48.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.32/arch/arm/kernel/process.c linux-3.4.32-vs2.3.
__show_regs(regs);
dump_stack();
}
-diff -NurpP --minimal linux-3.4.32/arch/arm/kernel/traps.c linux-3.4.32-vs2.3.3.9/arch/arm/kernel/traps.c
---- linux-3.4.32/arch/arm/kernel/traps.c 2013-02-19 13:55:11.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/arch/arm/kernel/traps.c 2012-10-22 13:09:53.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/arch/arm/kernel/traps.c linux-3.4.48-vs2.3.3.9/arch/arm/kernel/traps.c
+--- linux-3.4.48/arch/arm/kernel/traps.c 2013-06-13 08:59:13.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/arch/arm/kernel/traps.c 2012-10-22 13:09:53.000000000 +0000
@@ -249,8 +249,8 @@ static int __die(const char *str, int er
print_modules();
@@ -290,9 +290,9 @@ diff -NurpP --minimal linux-3.4.32/arch/arm/kernel/traps.c linux-3.4.32-vs2.3.3.
if (!user_mode(regs) || in_interrupt()) {
dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-3.4.32/arch/cris/Kconfig linux-3.4.32-vs2.3.3.9/arch/cris/Kconfig
---- linux-3.4.32/arch/cris/Kconfig 2012-03-19 18:46:39.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/arch/cris/Kconfig 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/arch/cris/Kconfig linux-3.4.48-vs2.3.3.9/arch/cris/Kconfig
+--- linux-3.4.48/arch/cris/Kconfig 2012-03-19 18:46:39.000000000 +0000
++++ linux-3.4.48-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.32/arch/cris/Kconfig linux-3.4.32-vs2.3.3.9/arch
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.4.32/arch/frv/kernel/kernel_thread.S linux-3.4.32-vs2.3.3.9/arch/frv/kernel/kernel_thread.S
---- linux-3.4.32/arch/frv/kernel/kernel_thread.S 2008-12-24 23:26:37.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/arch/frv/kernel/kernel_thread.S 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/arch/frv/kernel/kernel_thread.S linux-3.4.48-vs2.3.3.9/arch/frv/kernel/kernel_thread.S
+--- linux-3.4.48/arch/frv/kernel/kernel_thread.S 2008-12-24 23:26:37.000000000 +0000
++++ linux-3.4.48-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.32/arch/frv/kernel/kernel_thread.S linux-3.4.32-
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.32/arch/h8300/Kconfig linux-3.4.32-vs2.3.3.9/arch/h8300/Kconfig
---- linux-3.4.32/arch/h8300/Kconfig 2012-03-19 18:46:39.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/arch/h8300/Kconfig 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/arch/h8300/Kconfig linux-3.4.48-vs2.3.3.9/arch/h8300/Kconfig
+--- linux-3.4.48/arch/h8300/Kconfig 2012-03-19 18:46:39.000000000 +0000
++++ linux-3.4.48-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.32/arch/h8300/Kconfig linux-3.4.32-vs2.3.3.9/arc
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.4.32/arch/ia64/Kconfig linux-3.4.32-vs2.3.3.9/arch/ia64/Kconfig
---- linux-3.4.32/arch/ia64/Kconfig 2012-03-19 18:46:39.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/arch/ia64/Kconfig 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/arch/ia64/Kconfig linux-3.4.48-vs2.3.3.9/arch/ia64/Kconfig
+--- linux-3.4.48/arch/ia64/Kconfig 2012-03-19 18:46:39.000000000 +0000
++++ linux-3.4.48-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.32/arch/ia64/Kconfig linux-3.4.32-vs2.3.3.9/arch
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.4.32/arch/ia64/kernel/entry.S linux-3.4.32-vs2.3.3.9/arch/ia64/kernel/entry.S
---- linux-3.4.32/arch/ia64/kernel/entry.S 2012-03-19 18:46:40.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/arch/ia64/kernel/entry.S 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/arch/ia64/kernel/entry.S linux-3.4.48-vs2.3.3.9/arch/ia64/kernel/entry.S
+--- linux-3.4.48/arch/ia64/kernel/entry.S 2012-03-19 18:46:40.000000000 +0000
++++ linux-3.4.48-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.32/arch/ia64/kernel/entry.S linux-3.4.32-vs2.3.3
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -NurpP --minimal linux-3.4.32/arch/ia64/kernel/process.c linux-3.4.32-vs2.3.3.9/arch/ia64/kernel/process.c
---- linux-3.4.32/arch/ia64/kernel/process.c 2013-02-19 13:55:12.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/arch/ia64/kernel/process.c 2012-10-22 13:09:53.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/arch/ia64/kernel/process.c linux-3.4.48-vs2.3.3.9/arch/ia64/kernel/process.c
+--- linux-3.4.48/arch/ia64/kernel/process.c 2013-06-13 08:59:14.000000000 +0000
++++ linux-3.4.48-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.32/arch/ia64/kernel/process.c linux-3.4.32-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.32/arch/ia64/kernel/ptrace.c linux-3.4.32-vs2.3.3.9/arch/ia64/kernel/ptrace.c
---- linux-3.4.32/arch/ia64/kernel/ptrace.c 2012-05-21 16:06:26.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/arch/ia64/kernel/ptrace.c 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/arch/ia64/kernel/ptrace.c linux-3.4.48-vs2.3.3.9/arch/ia64/kernel/ptrace.c
+--- linux-3.4.48/arch/ia64/kernel/ptrace.c 2012-05-21 16:06:26.000000000 +0000
++++ linux-3.4.48-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.32/arch/ia64/kernel/ptrace.c linux-3.4.32-vs2.3.
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-3.4.32/arch/ia64/kernel/traps.c linux-3.4.32-vs2.3.3.9/arch/ia64/kernel/traps.c
---- linux-3.4.32/arch/ia64/kernel/traps.c 2012-05-21 16:06:26.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/arch/ia64/kernel/traps.c 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/arch/ia64/kernel/traps.c linux-3.4.48-vs2.3.3.9/arch/ia64/kernel/traps.c
+--- linux-3.4.48/arch/ia64/kernel/traps.c 2012-05-21 16:06:26.000000000 +0000
++++ linux-3.4.48-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.32/arch/ia64/kernel/traps.c linux-3.4.32-vs2.3.3
}
}
}
-diff -NurpP --minimal linux-3.4.32/arch/m32r/kernel/traps.c linux-3.4.32-vs2.3.3.9/arch/m32r/kernel/traps.c
---- linux-3.4.32/arch/m32r/kernel/traps.c 2012-05-21 16:06:26.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/arch/m32r/kernel/traps.c 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/arch/m32r/kernel/traps.c linux-3.4.48-vs2.3.3.9/arch/m32r/kernel/traps.c
+--- linux-3.4.48/arch/m32r/kernel/traps.c 2012-05-21 16:06:26.000000000 +0000
++++ linux-3.4.48-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.32/arch/m32r/kernel/traps.c linux-3.4.32-vs2.3.3
/*
* When in-kernel, we also print out the stack and code at the
-diff -NurpP --minimal linux-3.4.32/arch/m68k/Kconfig linux-3.4.32-vs2.3.3.9/arch/m68k/Kconfig
---- linux-3.4.32/arch/m68k/Kconfig 2012-05-21 16:06:26.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/arch/m68k/Kconfig 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/arch/m68k/Kconfig linux-3.4.48-vs2.3.3.9/arch/m68k/Kconfig
+--- linux-3.4.48/arch/m68k/Kconfig 2012-05-21 16:06:26.000000000 +0000
++++ linux-3.4.48-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.32/arch/m68k/Kconfig linux-3.4.32-vs2.3.3.9/arch
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.4.32/arch/mips/Kconfig linux-3.4.32-vs2.3.3.9/arch/mips/Kconfig
---- linux-3.4.32/arch/mips/Kconfig 2012-05-21 16:06:27.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/arch/mips/Kconfig 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/arch/mips/Kconfig linux-3.4.48-vs2.3.3.9/arch/mips/Kconfig
+--- linux-3.4.48/arch/mips/Kconfig 2012-05-21 16:06:27.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/arch/mips/Kconfig 2012-05-21 16:15:04.000000000 +0000
@@ -2516,6 +2516,8 @@ source "fs/Kconfig"
source "arch/mips/Kconfig.debug"
@@ -441,9 +441,9 @@ diff -NurpP --minimal linux-3.4.32/arch/mips/Kconfig linux-3.4.32-vs2.3.3.9/arch
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.4.32/arch/mips/kernel/ptrace.c linux-3.4.32-vs2.3.3.9/arch/mips/kernel/ptrace.c
---- linux-3.4.32/arch/mips/kernel/ptrace.c 2012-05-21 16:06:27.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/arch/mips/kernel/ptrace.c 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/arch/mips/kernel/ptrace.c linux-3.4.48-vs2.3.3.9/arch/mips/kernel/ptrace.c
+--- linux-3.4.48/arch/mips/kernel/ptrace.c 2012-05-21 16:06:27.000000000 +0000
++++ linux-3.4.48-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.32/arch/mips/kernel/ptrace.c linux-3.4.32-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.32/arch/mips/kernel/scall32-o32.S linux-3.4.32-vs2.3.3.9/arch/mips/kernel/scall32-o32.S
---- linux-3.4.32/arch/mips/kernel/scall32-o32.S 2012-01-09 15:14:05.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/arch/mips/kernel/scall32-o32.S 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/arch/mips/kernel/scall32-o32.S linux-3.4.48-vs2.3.3.9/arch/mips/kernel/scall32-o32.S
+--- linux-3.4.48/arch/mips/kernel/scall32-o32.S 2012-01-09 15:14:05.000000000 +0000
++++ linux-3.4.48-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.32/arch/mips/kernel/scall32-o32.S linux-3.4.32-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.32/arch/mips/kernel/scall64-64.S linux-3.4.32-vs2.3.3.9/arch/mips/kernel/scall64-64.S
---- linux-3.4.32/arch/mips/kernel/scall64-64.S 2012-01-09 15:14:05.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/arch/mips/kernel/scall64-64.S 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/arch/mips/kernel/scall64-64.S linux-3.4.48-vs2.3.3.9/arch/mips/kernel/scall64-64.S
+--- linux-3.4.48/arch/mips/kernel/scall64-64.S 2012-01-09 15:14:05.000000000 +0000
++++ linux-3.4.48-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.32/arch/mips/kernel/scall64-64.S linux-3.4.32-vs
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-3.4.32/arch/mips/kernel/scall64-n32.S linux-3.4.32-vs2.3.3.9/arch/mips/kernel/scall64-n32.S
---- linux-3.4.32/arch/mips/kernel/scall64-n32.S 2012-01-09 15:14:05.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/arch/mips/kernel/scall64-n32.S 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/arch/mips/kernel/scall64-n32.S linux-3.4.48-vs2.3.3.9/arch/mips/kernel/scall64-n32.S
+--- linux-3.4.48/arch/mips/kernel/scall64-n32.S 2012-01-09 15:14:05.000000000 +0000
++++ linux-3.4.48-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.32/arch/mips/kernel/scall64-n32.S linux-3.4.32-v
PTR compat_sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-3.4.32/arch/mips/kernel/scall64-o32.S linux-3.4.32-vs2.3.3.9/arch/mips/kernel/scall64-o32.S
---- linux-3.4.32/arch/mips/kernel/scall64-o32.S 2012-01-09 15:14:05.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/arch/mips/kernel/scall64-o32.S 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/arch/mips/kernel/scall64-o32.S linux-3.4.48-vs2.3.3.9/arch/mips/kernel/scall64-o32.S
+--- linux-3.4.48/arch/mips/kernel/scall64-o32.S 2012-01-09 15:14:05.000000000 +0000
++++ linux-3.4.48-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.32/arch/mips/kernel/scall64-o32.S linux-3.4.32-v
PTR sys_32_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-diff -NurpP --minimal linux-3.4.32/arch/mips/kernel/traps.c linux-3.4.32-vs2.3.3.9/arch/mips/kernel/traps.c
---- linux-3.4.32/arch/mips/kernel/traps.c 2012-05-21 16:06:27.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/arch/mips/kernel/traps.c 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/arch/mips/kernel/traps.c linux-3.4.48-vs2.3.3.9/arch/mips/kernel/traps.c
+--- linux-3.4.48/arch/mips/kernel/traps.c 2012-05-21 16:06:27.000000000 +0000
++++ linux-3.4.48-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.32/arch/mips/kernel/traps.c linux-3.4.32-vs2.3.3
if (cpu_has_userlocal) {
unsigned long tls;
-diff -NurpP --minimal linux-3.4.32/arch/parisc/Kconfig linux-3.4.32-vs2.3.3.9/arch/parisc/Kconfig
---- linux-3.4.32/arch/parisc/Kconfig 2012-03-19 18:46:44.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/arch/parisc/Kconfig 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/arch/parisc/Kconfig linux-3.4.48-vs2.3.3.9/arch/parisc/Kconfig
+--- linux-3.4.48/arch/parisc/Kconfig 2012-03-19 18:46:44.000000000 +0000
++++ linux-3.4.48-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.32/arch/parisc/Kconfig linux-3.4.32-vs2.3.3.9/ar
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.4.32/arch/parisc/kernel/syscall_table.S linux-3.4.32-vs2.3.3.9/arch/parisc/kernel/syscall_table.S
---- linux-3.4.32/arch/parisc/kernel/syscall_table.S 2011-10-24 16:45:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/arch/parisc/kernel/syscall_table.S 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/arch/parisc/kernel/syscall_table.S linux-3.4.48-vs2.3.3.9/arch/parisc/kernel/syscall_table.S
+--- linux-3.4.48/arch/parisc/kernel/syscall_table.S 2011-10-24 16:45:00.000000000 +0000
++++ linux-3.4.48-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.32/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.32/arch/parisc/kernel/traps.c linux-3.4.32-vs2.3.3.9/arch/parisc/kernel/traps.c
---- linux-3.4.32/arch/parisc/kernel/traps.c 2012-05-21 16:06:28.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/arch/parisc/kernel/traps.c 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/arch/parisc/kernel/traps.c linux-3.4.48-vs2.3.3.9/arch/parisc/kernel/traps.c
+--- linux-3.4.48/arch/parisc/kernel/traps.c 2012-05-21 16:06:28.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/arch/parisc/kernel/traps.c 2012-05-21 16:15:04.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.32/arch/parisc/kernel/traps.c linux-3.4.32-vs2.3
/* Wot's wrong wif bein' racy? */
if (current->thread.flags & PARISC_KERNEL_DEATH) {
-diff -NurpP --minimal linux-3.4.32/arch/parisc/mm/fault.c linux-3.4.32-vs2.3.3.9/arch/parisc/mm/fault.c
---- linux-3.4.32/arch/parisc/mm/fault.c 2010-08-02 14:52:06.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/arch/parisc/mm/fault.c 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/arch/parisc/mm/fault.c linux-3.4.48-vs2.3.3.9/arch/parisc/mm/fault.c
+--- linux-3.4.48/arch/parisc/mm/fault.c 2010-08-02 14:52:06.000000000 +0000
++++ linux-3.4.48-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.32/arch/parisc/mm/fault.c linux-3.4.32-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.32/arch/powerpc/Kconfig linux-3.4.32-vs2.3.3.9/arch/powerpc/Kconfig
---- linux-3.4.32/arch/powerpc/Kconfig 2012-05-21 16:06:28.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/arch/powerpc/Kconfig 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/arch/powerpc/Kconfig linux-3.4.48-vs2.3.3.9/arch/powerpc/Kconfig
+--- linux-3.4.48/arch/powerpc/Kconfig 2012-05-21 16:06:28.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/arch/powerpc/Kconfig 2012-05-21 16:15:04.000000000 +0000
@@ -1002,6 +1002,8 @@ source "lib/Kconfig"
source "arch/powerpc/Kconfig.debug"
@@ -604,9 +604,9 @@ diff -NurpP --minimal linux-3.4.32/arch/powerpc/Kconfig linux-3.4.32-vs2.3.3.9/a
source "security/Kconfig"
config KEYS_COMPAT
-diff -NurpP --minimal linux-3.4.32/arch/powerpc/include/asm/unistd.h linux-3.4.32-vs2.3.3.9/arch/powerpc/include/asm/unistd.h
---- linux-3.4.32/arch/powerpc/include/asm/unistd.h 2012-01-09 15:14:05.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/arch/powerpc/include/asm/unistd.h 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/arch/powerpc/include/asm/unistd.h linux-3.4.48-vs2.3.3.9/arch/powerpc/include/asm/unistd.h
+--- linux-3.4.48/arch/powerpc/include/asm/unistd.h 2012-01-09 15:14:05.000000000 +0000
++++ linux-3.4.48-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.32/arch/powerpc/include/asm/unistd.h linux-3.4.3
#define __NR_migrate_pages 258
#define __NR_mbind 259
#define __NR_get_mempolicy 260
-diff -NurpP --minimal linux-3.4.32/arch/powerpc/kernel/process.c linux-3.4.32-vs2.3.3.9/arch/powerpc/kernel/process.c
---- linux-3.4.32/arch/powerpc/kernel/process.c 2013-02-19 13:55:13.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/arch/powerpc/kernel/process.c 2012-09-16 18:49:11.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/arch/powerpc/kernel/process.c linux-3.4.48-vs2.3.3.9/arch/powerpc/kernel/process.c
+--- linux-3.4.48/arch/powerpc/kernel/process.c 2013-06-13 08:59:15.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/arch/powerpc/kernel/process.c 2012-09-16 18:49:11.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.32/arch/powerpc/kernel/process.c linux-3.4.32-vs
#ifdef CONFIG_SMP
printk(" CPU: %d", raw_smp_processor_id());
-diff -NurpP --minimal linux-3.4.32/arch/powerpc/kernel/traps.c linux-3.4.32-vs2.3.3.9/arch/powerpc/kernel/traps.c
---- linux-3.4.32/arch/powerpc/kernel/traps.c 2013-02-19 13:55:13.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/arch/powerpc/kernel/traps.c 2012-09-16 18:49:11.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/arch/powerpc/kernel/traps.c linux-3.4.48-vs2.3.3.9/arch/powerpc/kernel/traps.c
+--- linux-3.4.48/arch/powerpc/kernel/traps.c 2013-06-13 08:59:15.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/arch/powerpc/kernel/traps.c 2013-06-13 09:46:37.000000000 +0000
@@ -1119,8 +1119,9 @@ void nonrecoverable_exception(struct pt_
void trace_syscall(struct pt_regs *regs)
@@ -646,9 +646,9 @@ diff -NurpP --minimal linux-3.4.32/arch/powerpc/kernel/traps.c linux-3.4.32-vs2.
regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted());
}
-diff -NurpP --minimal linux-3.4.32/arch/s390/Kconfig linux-3.4.32-vs2.3.3.9/arch/s390/Kconfig
---- linux-3.4.32/arch/s390/Kconfig 2012-05-21 16:06:32.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/arch/s390/Kconfig 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/arch/s390/Kconfig linux-3.4.48-vs2.3.3.9/arch/s390/Kconfig
+--- linux-3.4.48/arch/s390/Kconfig 2012-05-21 16:06:32.000000000 +0000
++++ linux-3.4.48-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.32/arch/s390/Kconfig linux-3.4.32-vs2.3.3.9/arch
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.4.32/arch/s390/include/asm/tlb.h linux-3.4.32-vs2.3.3.9/arch/s390/include/asm/tlb.h
---- linux-3.4.32/arch/s390/include/asm/tlb.h 2012-05-21 16:06:32.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/arch/s390/include/asm/tlb.h 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/arch/s390/include/asm/tlb.h linux-3.4.48-vs2.3.3.9/arch/s390/include/asm/tlb.h
+--- linux-3.4.48/arch/s390/include/asm/tlb.h 2012-05-21 16:06:32.000000000 +0000
++++ linux-3.4.48-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.32/arch/s390/include/asm/tlb.h linux-3.4.32-vs2.
#include <asm/processor.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-3.4.32/arch/s390/include/asm/unistd.h linux-3.4.32-vs2.3.3.9/arch/s390/include/asm/unistd.h
---- linux-3.4.32/arch/s390/include/asm/unistd.h 2012-03-19 18:46:48.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/arch/s390/include/asm/unistd.h 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/arch/s390/include/asm/unistd.h linux-3.4.48-vs2.3.3.9/arch/s390/include/asm/unistd.h
+--- linux-3.4.48/arch/s390/include/asm/unistd.h 2012-03-19 18:46:48.000000000 +0000
++++ linux-3.4.48-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.32/arch/s390/include/asm/unistd.h linux-3.4.32-v
#define __NR_statfs64 265
#define __NR_fstatfs64 266
#define __NR_remap_file_pages 267
-diff -NurpP --minimal linux-3.4.32/arch/s390/kernel/ptrace.c linux-3.4.32-vs2.3.3.9/arch/s390/kernel/ptrace.c
---- linux-3.4.32/arch/s390/kernel/ptrace.c 2012-05-21 16:06:32.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/arch/s390/kernel/ptrace.c 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/arch/s390/kernel/ptrace.c linux-3.4.48-vs2.3.3.9/arch/s390/kernel/ptrace.c
+--- linux-3.4.48/arch/s390/kernel/ptrace.c 2012-05-21 16:06:32.000000000 +0000
++++ linux-3.4.48-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.32/arch/s390/kernel/ptrace.c linux-3.4.32-vs2.3.
#include <trace/syscall.h>
#include <asm/segment.h>
#include <asm/page.h>
-diff -NurpP --minimal linux-3.4.32/arch/s390/kernel/syscalls.S linux-3.4.32-vs2.3.3.9/arch/s390/kernel/syscalls.S
---- linux-3.4.32/arch/s390/kernel/syscalls.S 2012-01-09 15:14:06.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/arch/s390/kernel/syscalls.S 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/arch/s390/kernel/syscalls.S linux-3.4.48-vs2.3.3.9/arch/s390/kernel/syscalls.S
+--- linux-3.4.48/arch/s390/kernel/syscalls.S 2012-01-09 15:14:06.000000000 +0000
++++ linux-3.4.48-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.32/arch/s390/kernel/syscalls.S linux-3.4.32-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.32/arch/sh/Kconfig linux-3.4.32-vs2.3.3.9/arch/sh/Kconfig
---- linux-3.4.32/arch/sh/Kconfig 2012-05-21 16:06:33.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/arch/sh/Kconfig 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/arch/sh/Kconfig linux-3.4.48-vs2.3.3.9/arch/sh/Kconfig
+--- linux-3.4.48/arch/sh/Kconfig 2012-05-21 16:06:33.000000000 +0000
++++ linux-3.4.48-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.32/arch/sh/Kconfig linux-3.4.32-vs2.3.3.9/arch/s
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.4.32/arch/sh/kernel/irq.c linux-3.4.32-vs2.3.3.9/arch/sh/kernel/irq.c
---- linux-3.4.32/arch/sh/kernel/irq.c 2011-07-22 09:17:41.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/arch/sh/kernel/irq.c 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/arch/sh/kernel/irq.c linux-3.4.48-vs2.3.3.9/arch/sh/kernel/irq.c
+--- linux-3.4.48/arch/sh/kernel/irq.c 2011-07-22 09:17:41.000000000 +0000
++++ linux-3.4.48-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.32/arch/sh/kernel/irq.c linux-3.4.32-vs2.3.3.9/a
#include <asm/processor.h>
#include <asm/machvec.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-3.4.32/arch/sparc/Kconfig linux-3.4.32-vs2.3.3.9/arch/sparc/Kconfig
---- linux-3.4.32/arch/sparc/Kconfig 2013-02-19 13:55:17.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/arch/sparc/Kconfig 2012-06-08 13:57:24.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/arch/sparc/Kconfig linux-3.4.48-vs2.3.3.9/arch/sparc/Kconfig
+--- linux-3.4.48/arch/sparc/Kconfig 2013-06-13 08:59:15.000000000 +0000
++++ linux-3.4.48-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.32/arch/sparc/Kconfig linux-3.4.32-vs2.3.3.9/arc
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.4.32/arch/sparc/include/asm/unistd.h linux-3.4.32-vs2.3.3.9/arch/sparc/include/asm/unistd.h
---- linux-3.4.32/arch/sparc/include/asm/unistd.h 2012-01-09 15:14:07.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/arch/sparc/include/asm/unistd.h 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/arch/sparc/include/asm/unistd.h linux-3.4.48-vs2.3.3.9/arch/sparc/include/asm/unistd.h
+--- linux-3.4.48/arch/sparc/include/asm/unistd.h 2012-01-09 15:14:07.000000000 +0000
++++ linux-3.4.48-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.32/arch/sparc/include/asm/unistd.h linux-3.4.32-
#define __NR_io_setup 268
#define __NR_io_destroy 269
#define __NR_io_submit 270
-diff -NurpP --minimal linux-3.4.32/arch/sparc/kernel/systbls_32.S linux-3.4.32-vs2.3.3.9/arch/sparc/kernel/systbls_32.S
---- linux-3.4.32/arch/sparc/kernel/systbls_32.S 2012-01-09 15:14:09.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/arch/sparc/kernel/systbls_32.S 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/arch/sparc/kernel/systbls_32.S linux-3.4.48-vs2.3.3.9/arch/sparc/kernel/systbls_32.S
+--- linux-3.4.48/arch/sparc/kernel/systbls_32.S 2012-01-09 15:14:09.000000000 +0000
++++ linux-3.4.48-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.32/arch/sparc/kernel/systbls_32.S linux-3.4.32-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.32/arch/sparc/kernel/systbls_64.S linux-3.4.32-vs2.3.3.9/arch/sparc/kernel/systbls_64.S
---- linux-3.4.32/arch/sparc/kernel/systbls_64.S 2013-02-19 13:55:17.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/arch/sparc/kernel/systbls_64.S 2012-06-08 13:57:24.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/arch/sparc/kernel/systbls_64.S linux-3.4.48-vs2.3.3.9/arch/sparc/kernel/systbls_64.S
+--- linux-3.4.48/arch/sparc/kernel/systbls_64.S 2013-06-13 08:59:15.000000000 +0000
++++ linux-3.4.48-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.32/arch/sparc/kernel/systbls_64.S linux-3.4.32-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.32/arch/um/Kconfig.rest linux-3.4.32-vs2.3.3.9/arch/um/Kconfig.rest
---- linux-3.4.32/arch/um/Kconfig.rest 2012-01-09 15:14:09.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/arch/um/Kconfig.rest 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/arch/um/Kconfig.rest linux-3.4.48-vs2.3.3.9/arch/um/Kconfig.rest
+--- linux-3.4.48/arch/um/Kconfig.rest 2012-01-09 15:14:09.000000000 +0000
++++ linux-3.4.48-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,59 +796,10 @@ diff -NurpP --minimal linux-3.4.32/arch/um/Kconfig.rest linux-3.4.32-vs2.3.3.9/a
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.4.32/arch/um/include/shared/kern_constants.h linux-3.4.32-vs2.3.3.9/arch/um/include/shared/kern_constants.h
---- linux-3.4.32/arch/um/include/shared/kern_constants.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/arch/um/include/shared/kern_constants.h 2012-05-21 16:15:04.000000000 +0000
-@@ -0,0 +1 @@
-+#include "../../../../include/generated/asm-offsets.h"
-diff -NurpP --minimal linux-3.4.32/arch/um/include/shared/user_constants.h linux-3.4.32-vs2.3.3.9/arch/um/include/shared/user_constants.h
---- linux-3.4.32/arch/um/include/shared/user_constants.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/arch/um/include/shared/user_constants.h 2012-05-21 16:15:04.000000000 +0000
-@@ -0,0 +1,40 @@
-+/*
-+ * DO NOT MODIFY.
-+ *
-+ * This file was generated by arch/um/Makefile
-+ *
-+ */
-+
-+#define HOST_SC_CR2 176 /* offsetof(struct sigcontext, cr2) # */
-+#define HOST_SC_ERR 152 /* offsetof(struct sigcontext, err) # */
-+#define HOST_SC_TRAPNO 160 /* offsetof(struct sigcontext, trapno) # */
-+#define HOST_FP_SIZE 64 /* sizeof(struct _fpstate) / sizeof(unsigned long) # */
-+#define HOST_RBX 5 /* RBX # */
-+#define HOST_RCX 11 /* RCX # */
-+#define HOST_RDI 14 /* RDI # */
-+#define HOST_RSI 13 /* RSI # */
-+#define HOST_RDX 12 /* RDX # */
-+#define HOST_RBP 4 /* RBP # */
-+#define HOST_RAX 10 /* RAX # */
-+#define HOST_R8 9 /* R8 # */
-+#define HOST_R9 8 /* R9 # */
-+#define HOST_R10 7 /* R10 # */
-+#define HOST_R11 6 /* R11 # */
-+#define HOST_R12 3 /* R12 # */
-+#define HOST_R13 2 /* R13 # */
-+#define HOST_R14 1 /* R14 # */
-+#define HOST_R15 0 /* R15 # */
-+#define HOST_ORIG_RAX 15 /* ORIG_RAX # */
-+#define HOST_CS 17 /* CS # */
-+#define HOST_SS 20 /* SS # */
-+#define HOST_EFLAGS 18 /* EFLAGS # */
-+#define HOST_IP 16 /* RIP # */
-+#define HOST_SP 19 /* RSP # */
-+#define UM_FRAME_SIZE 216 /* sizeof(struct user_regs_struct) # */
-+#define UM_POLLIN 1 /* POLLIN # */
-+#define UM_POLLPRI 2 /* POLLPRI # */
-+#define UM_POLLOUT 4 /* POLLOUT # */
-+#define UM_PROT_READ 1 /* PROT_READ # */
-+#define UM_PROT_WRITE 2 /* PROT_WRITE # */
-+#define UM_PROT_EXEC 4 /* PROT_EXEC # */
-+
-diff -NurpP --minimal linux-3.4.32/arch/x86/Kconfig linux-3.4.32-vs2.3.3.9/arch/x86/Kconfig
---- linux-3.4.32/arch/x86/Kconfig 2012-05-21 16:06:35.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/arch/x86/Kconfig 2012-05-21 16:15:04.000000000 +0000
-@@ -2225,6 +2225,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.4.48/arch/x86/Kconfig linux-3.4.48-vs2.3.3.9/arch/x86/Kconfig
+--- linux-3.4.48/arch/x86/Kconfig 2013-06-13 08:59:16.000000000 +0000
++++ linux-3.4.48-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"
@@ -857,9 +808,9 @@ diff -NurpP --minimal linux-3.4.32/arch/x86/Kconfig linux-3.4.32-vs2.3.3.9/arch/
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.4.32/arch/x86/syscalls/syscall_32.tbl linux-3.4.32-vs2.3.3.9/arch/x86/syscalls/syscall_32.tbl
---- linux-3.4.32/arch/x86/syscalls/syscall_32.tbl 2012-05-21 16:06:42.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/arch/x86/syscalls/syscall_32.tbl 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/arch/x86/syscalls/syscall_32.tbl linux-3.4.48-vs2.3.3.9/arch/x86/syscalls/syscall_32.tbl
+--- linux-3.4.48/arch/x86/syscalls/syscall_32.tbl 2012-05-21 16:06:42.000000000 +0000
++++ linux-3.4.48-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
@@ -869,9 +820,9 @@ diff -NurpP --minimal linux-3.4.32/arch/x86/syscalls/syscall_32.tbl linux-3.4.32
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.32/arch/x86/syscalls/syscall_64.tbl linux-3.4.32-vs2.3.3.9/arch/x86/syscalls/syscall_64.tbl
---- linux-3.4.32/arch/x86/syscalls/syscall_64.tbl 2013-02-19 13:55:18.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/arch/x86/syscalls/syscall_64.tbl 2012-09-16 18:49:11.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/arch/x86/syscalls/syscall_64.tbl linux-3.4.48-vs2.3.3.9/arch/x86/syscalls/syscall_64.tbl
+--- linux-3.4.48/arch/x86/syscalls/syscall_64.tbl 2013-06-13 08:59:16.000000000 +0000
++++ linux-3.4.48-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
@@ -881,9 +832,9 @@ diff -NurpP --minimal linux-3.4.32/arch/x86/syscalls/syscall_64.tbl linux-3.4.32
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.32/drivers/block/Kconfig linux-3.4.32-vs2.3.3.9/drivers/block/Kconfig
---- linux-3.4.32/drivers/block/Kconfig 2012-05-21 16:06:43.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/drivers/block/Kconfig 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/drivers/block/Kconfig linux-3.4.48-vs2.3.3.9/drivers/block/Kconfig
+--- linux-3.4.48/drivers/block/Kconfig 2012-05-21 16:06:43.000000000 +0000
++++ linux-3.4.48-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"
@@ -898,9 +849,9 @@ diff -NurpP --minimal linux-3.4.32/drivers/block/Kconfig linux-3.4.32-vs2.3.3.9/
config BLK_DEV_NBD
tristate "Network block device support"
depends on NET
-diff -NurpP --minimal linux-3.4.32/drivers/block/Makefile linux-3.4.32-vs2.3.3.9/drivers/block/Makefile
---- linux-3.4.32/drivers/block/Makefile 2012-03-19 18:46:52.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/drivers/block/Makefile 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/drivers/block/Makefile linux-3.4.48-vs2.3.3.9/drivers/block/Makefile
+--- linux-3.4.48/drivers/block/Makefile 2012-03-19 18:46:52.000000000 +0000
++++ linux-3.4.48-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
@@ -909,9 +860,9 @@ diff -NurpP --minimal linux-3.4.32/drivers/block/Makefile linux-3.4.32-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.32/drivers/block/loop.c linux-3.4.32-vs2.3.3.9/drivers/block/loop.c
---- linux-3.4.32/drivers/block/loop.c 2012-05-21 16:06:43.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/drivers/block/loop.c 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/drivers/block/loop.c linux-3.4.48-vs2.3.3.9/drivers/block/loop.c
+--- linux-3.4.48/drivers/block/loop.c 2013-06-13 08:59:17.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/drivers/block/loop.c 2013-06-13 09:46:37.000000000 +0000
@@ -76,6 +76,7 @@
#include <linux/sysfs.h>
#include <linux/miscdevice.h>
@@ -955,7 +906,7 @@ diff -NurpP --minimal linux-3.4.32/drivers/block/loop.c linux-3.4.32-vs2.3.3.9/d
info->lo_encrypt_key_size = lo->lo_encrypt_key_size;
memcpy(info->lo_encrypt_key, lo->lo_encrypt_key,
lo->lo_encrypt_key_size);
-@@ -1492,6 +1496,11 @@ static int lo_open(struct block_device *
+@@ -1490,6 +1494,11 @@ static int lo_open(struct block_device *
goto out;
}
@@ -967,9 +918,9 @@ diff -NurpP --minimal linux-3.4.32/drivers/block/loop.c linux-3.4.32-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.32/drivers/block/vroot.c linux-3.4.32-vs2.3.3.9/drivers/block/vroot.c
---- linux-3.4.32/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/drivers/block/vroot.c 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/drivers/block/vroot.c linux-3.4.48-vs2.3.3.9/drivers/block/vroot.c
+--- linux-3.4.48/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -1262,9 +1213,9 @@ diff -NurpP --minimal linux-3.4.32/drivers/block/vroot.c linux-3.4.32-vs2.3.3.9/
+
+#endif
+
-diff -NurpP --minimal linux-3.4.32/drivers/infiniband/Kconfig linux-3.4.32-vs2.3.3.9/drivers/infiniband/Kconfig
---- linux-3.4.32/drivers/infiniband/Kconfig 2012-03-19 18:46:54.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/drivers/infiniband/Kconfig 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/drivers/infiniband/Kconfig linux-3.4.48-vs2.3.3.9/drivers/infiniband/Kconfig
+--- linux-3.4.48/drivers/infiniband/Kconfig 2012-03-19 18:46:54.000000000 +0000
++++ linux-3.4.48-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
@@ -1274,9 +1225,9 @@ diff -NurpP --minimal linux-3.4.32/drivers/infiniband/Kconfig linux-3.4.32-vs2.3
default y
source "drivers/infiniband/hw/mthca/Kconfig"
-diff -NurpP --minimal linux-3.4.32/drivers/infiniband/core/addr.c linux-3.4.32-vs2.3.3.9/drivers/infiniband/core/addr.c
---- linux-3.4.32/drivers/infiniband/core/addr.c 2012-05-21 16:06:46.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/drivers/infiniband/core/addr.c 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/drivers/infiniband/core/addr.c linux-3.4.48-vs2.3.3.9/drivers/infiniband/core/addr.c
+--- linux-3.4.48/drivers/infiniband/core/addr.c 2012-05-21 16:06:46.000000000 +0000
++++ linux-3.4.48-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)) {
@@ -1286,9 +1237,9 @@ diff -NurpP --minimal linux-3.4.32/drivers/infiniband/core/addr.c linux-3.4.32-v
if (ret)
goto put;
-diff -NurpP --minimal linux-3.4.32/drivers/md/dm-ioctl.c linux-3.4.32-vs2.3.3.9/drivers/md/dm-ioctl.c
---- linux-3.4.32/drivers/md/dm-ioctl.c 2013-02-19 13:55:26.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/drivers/md/dm-ioctl.c 2013-02-11 23:37:30.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/drivers/md/dm-ioctl.c linux-3.4.48-vs2.3.3.9/drivers/md/dm-ioctl.c
+--- linux-3.4.48/drivers/md/dm-ioctl.c 2013-06-13 08:59:20.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/drivers/md/dm-ioctl.c 2013-02-11 23:37:30.000000000 +0000
@@ -16,6 +16,7 @@
#include <linux/dm-ioctl.h>
#include <linux/hdreg.h>
@@ -1374,9 +1325,9 @@ diff -NurpP --minimal linux-3.4.32/drivers/md/dm-ioctl.c linux-3.4.32-vs2.3.3.9/
return -EACCES;
if (_IOC_TYPE(command) != DM_IOCTL)
-diff -NurpP --minimal linux-3.4.32/drivers/md/dm.c linux-3.4.32-vs2.3.3.9/drivers/md/dm.c
---- linux-3.4.32/drivers/md/dm.c 2013-02-19 13:55:26.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/drivers/md/dm.c 2012-12-08 00:53:53.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/drivers/md/dm.c linux-3.4.48-vs2.3.3.9/drivers/md/dm.c
+--- linux-3.4.48/drivers/md/dm.c 2013-06-13 08:59:20.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/drivers/md/dm.c 2012-12-08 00:53:53.000000000 +0000
@@ -19,6 +19,7 @@
#include <linux/idr.h>
#include <linux/hdreg.h>
@@ -1450,9 +1401,9 @@ diff -NurpP --minimal linux-3.4.32/drivers/md/dm.c linux-3.4.32-vs2.3.3.9/driver
md->queue = blk_alloc_queue(GFP_KERNEL);
if (!md->queue)
goto bad_queue;
-diff -NurpP --minimal linux-3.4.32/drivers/md/dm.h linux-3.4.32-vs2.3.3.9/drivers/md/dm.h
---- linux-3.4.32/drivers/md/dm.h 2012-01-09 15:14:21.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/drivers/md/dm.h 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/drivers/md/dm.h linux-3.4.48-vs2.3.3.9/drivers/md/dm.h
+--- linux-3.4.48/drivers/md/dm.h 2012-01-09 15:14:21.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/drivers/md/dm.h 2012-05-21 16:15:04.000000000 +0000
@@ -41,6 +41,8 @@ struct dm_dev_internal {
struct dm_table;
struct dm_md_mempools;
@@ -1462,9 +1413,9 @@ diff -NurpP --minimal linux-3.4.32/drivers/md/dm.h linux-3.4.32-vs2.3.3.9/driver
/*-----------------------------------------------------------------
* Internal table functions.
*---------------------------------------------------------------*/
-diff -NurpP --minimal linux-3.4.32/drivers/net/tun.c linux-3.4.32-vs2.3.3.9/drivers/net/tun.c
---- linux-3.4.32/drivers/net/tun.c 2013-02-19 13:55:29.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/drivers/net/tun.c 2012-09-01 08:50:48.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/drivers/net/tun.c linux-3.4.48-vs2.3.3.9/drivers/net/tun.c
+--- linux-3.4.48/drivers/net/tun.c 2013-06-13 08:59:22.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/drivers/net/tun.c 2013-03-30 21:29:17.000000000 +0000
@@ -64,6 +64,7 @@
#include <linux/nsproxy.h>
#include <linux/virtio_net.h>
@@ -1481,7 +1432,7 @@ diff -NurpP --minimal linux-3.4.32/drivers/net/tun.c linux-3.4.32-vs2.3.3.9/driv
struct net_device *dev;
netdev_features_t set_features;
-@@ -910,6 +912,7 @@ static void tun_setup(struct net_device
+@@ -912,6 +914,7 @@ static void tun_setup(struct net_device
tun->owner = -1;
tun->group = -1;
@@ -1489,7 +1440,7 @@ diff -NurpP --minimal linux-3.4.32/drivers/net/tun.c linux-3.4.32-vs2.3.3.9/driv
dev->ethtool_ops = &tun_ethtool_ops;
dev->destructor = tun_free_netdev;
-@@ -1068,7 +1071,7 @@ static int tun_set_iff(struct net *net,
+@@ -1070,7 +1073,7 @@ static int tun_set_iff(struct net *net,
if (((tun->owner != -1 && cred->euid != tun->owner) ||
(tun->group != -1 && !in_egroup_p(tun->group))) &&
@@ -1498,7 +1449,7 @@ diff -NurpP --minimal linux-3.4.32/drivers/net/tun.c linux-3.4.32-vs2.3.3.9/driv
return -EPERM;
err = security_tun_dev_attach(tun->socket.sk);
if (err < 0)
-@@ -1082,7 +1085,7 @@ static int tun_set_iff(struct net *net,
+@@ -1084,7 +1087,7 @@ static int tun_set_iff(struct net *net,
char *name;
unsigned long flags = 0;
@@ -1507,7 +1458,7 @@ diff -NurpP --minimal linux-3.4.32/drivers/net/tun.c linux-3.4.32-vs2.3.3.9/driv
return -EPERM;
err = security_tun_dev_create();
if (err < 0)
-@@ -1152,6 +1155,9 @@ static int tun_set_iff(struct net *net,
+@@ -1154,6 +1157,9 @@ static int tun_set_iff(struct net *net,
sk->sk_destruct = tun_sock_destruct;
@@ -1517,7 +1468,7 @@ diff -NurpP --minimal linux-3.4.32/drivers/net/tun.c linux-3.4.32-vs2.3.3.9/driv
err = tun_attach(tun, file);
if (err < 0)
goto failed;
-@@ -1335,6 +1341,16 @@ static long __tun_chr_ioctl(struct file
+@@ -1337,6 +1343,16 @@ static long __tun_chr_ioctl(struct file
tun_debug(KERN_INFO, tun, "group set to %d\n", tun->group);
break;
@@ -1534,9 +1485,9 @@ diff -NurpP --minimal linux-3.4.32/drivers/net/tun.c linux-3.4.32-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.32/drivers/tty/sysrq.c linux-3.4.32-vs2.3.3.9/drivers/tty/sysrq.c
---- linux-3.4.32/drivers/tty/sysrq.c 2012-05-21 16:07:16.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/drivers/tty/sysrq.c 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/drivers/tty/sysrq.c linux-3.4.48-vs2.3.3.9/drivers/tty/sysrq.c
+--- linux-3.4.48/drivers/tty/sysrq.c 2012-05-21 16:07:16.000000000 +0000
++++ linux-3.4.48-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>
@@ -1588,9 +1539,9 @@ diff -NurpP --minimal linux-3.4.32/drivers/tty/sysrq.c linux-3.4.32-vs2.3.3.9/dr
else
retval = -1;
return retval;
-diff -NurpP --minimal linux-3.4.32/drivers/tty/tty_io.c linux-3.4.32-vs2.3.3.9/drivers/tty/tty_io.c
---- linux-3.4.32/drivers/tty/tty_io.c 2012-05-21 16:07:16.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/drivers/tty/tty_io.c 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/drivers/tty/tty_io.c linux-3.4.48-vs2.3.3.9/drivers/tty/tty_io.c
+--- linux-3.4.48/drivers/tty/tty_io.c 2012-05-21 16:07:16.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/drivers/tty/tty_io.c 2013-06-13 09:46:38.000000000 +0000
@@ -104,6 +104,7 @@
#include <linux/kmod.h>
@@ -1617,9 +1568,9 @@ diff -NurpP --minimal linux-3.4.32/drivers/tty/tty_io.c linux-3.4.32-vs2.3.3.9/d
if (pgrp_nr < 0)
return -EINVAL;
rcu_read_lock();
-diff -NurpP --minimal linux-3.4.32/fs/attr.c linux-3.4.32-vs2.3.3.9/fs/attr.c
---- linux-3.4.32/fs/attr.c 2013-02-19 13:55:45.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/attr.c 2012-06-28 14:45:07.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/attr.c linux-3.4.48-vs2.3.3.9/fs/attr.c
+--- linux-3.4.48/fs/attr.c 2013-06-13 08:59:31.000000000 +0000
++++ linux-3.4.48-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>
@@ -1660,9 +1611,9 @@ diff -NurpP --minimal linux-3.4.32/fs/attr.c linux-3.4.32-vs2.3.3.9/fs/attr.c
if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
return -EPERM;
}
-diff -NurpP --minimal linux-3.4.32/fs/block_dev.c linux-3.4.32-vs2.3.3.9/fs/block_dev.c
---- linux-3.4.32/fs/block_dev.c 2012-05-21 16:07:18.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/block_dev.c 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/block_dev.c linux-3.4.48-vs2.3.3.9/fs/block_dev.c
+--- linux-3.4.48/fs/block_dev.c 2013-06-13 08:59:31.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/fs/block_dev.c 2013-06-13 09:46:38.000000000 +0000
@@ -27,6 +27,7 @@
#include <linux/namei.h>
#include <linux/log2.h>
@@ -1700,9 +1651,9 @@ diff -NurpP --minimal linux-3.4.32/fs/block_dev.c linux-3.4.32-vs2.3.3.9/fs/bloc
if (bdev) {
spin_lock(&bdev_lock);
if (!inode->i_bdev) {
-diff -NurpP --minimal linux-3.4.32/fs/btrfs/ctree.h linux-3.4.32-vs2.3.3.9/fs/btrfs/ctree.h
---- linux-3.4.32/fs/btrfs/ctree.h 2012-05-21 16:07:18.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/btrfs/ctree.h 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/btrfs/ctree.h linux-3.4.48-vs2.3.3.9/fs/btrfs/ctree.h
+--- linux-3.4.48/fs/btrfs/ctree.h 2012-05-21 16:07:18.000000000 +0000
++++ linux-3.4.48-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;
@@ -1755,9 +1706,9 @@ diff -NurpP --minimal linux-3.4.32/fs/btrfs/ctree.h linux-3.4.32-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.32/fs/btrfs/disk-io.c linux-3.4.32-vs2.3.3.9/fs/btrfs/disk-io.c
---- linux-3.4.32/fs/btrfs/disk-io.c 2012-05-21 16:07:18.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/btrfs/disk-io.c 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/btrfs/disk-io.c linux-3.4.48-vs2.3.3.9/fs/btrfs/disk-io.c
+--- linux-3.4.48/fs/btrfs/disk-io.c 2012-05-21 16:07:18.000000000 +0000
++++ linux-3.4.48-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;
}
@@ -1768,9 +1719,9 @@ diff -NurpP --minimal linux-3.4.32/fs/btrfs/disk-io.c linux-3.4.32-vs2.3.3.9/fs/
features = btrfs_super_incompat_flags(disk_super) &
~BTRFS_FEATURE_INCOMPAT_SUPP;
if (features) {
-diff -NurpP --minimal linux-3.4.32/fs/btrfs/inode.c linux-3.4.32-vs2.3.3.9/fs/btrfs/inode.c
---- linux-3.4.32/fs/btrfs/inode.c 2013-02-19 13:55:46.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/btrfs/inode.c 2012-06-28 14:45:07.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/btrfs/inode.c linux-3.4.48-vs2.3.3.9/fs/btrfs/inode.c
+--- linux-3.4.48/fs/btrfs/inode.c 2013-06-13 08:59:31.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/fs/btrfs/inode.c 2013-06-13 09:46:38.000000000 +0000
@@ -39,6 +39,7 @@
#include <linux/slab.h>
#include <linux/ratelimit.h>
@@ -1835,9 +1786,9 @@ diff -NurpP --minimal linux-3.4.32/fs/btrfs/inode.c linux-3.4.32-vs2.3.3.9/fs/bt
.get_acl = btrfs_get_acl,
};
-diff -NurpP --minimal linux-3.4.32/fs/btrfs/ioctl.c linux-3.4.32-vs2.3.3.9/fs/btrfs/ioctl.c
---- linux-3.4.32/fs/btrfs/ioctl.c 2012-05-21 16:07:19.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/btrfs/ioctl.c 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/btrfs/ioctl.c linux-3.4.48-vs2.3.3.9/fs/btrfs/ioctl.c
+--- linux-3.4.48/fs/btrfs/ioctl.c 2012-05-21 16:07:19.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/fs/btrfs/ioctl.c 2012-05-21 16:15:04.000000000 +0000
@@ -71,10 +71,13 @@ static unsigned int btrfs_flags_to_ioctl
{
unsigned int iflags = 0;
@@ -2010,9 +1961,9 @@ diff -NurpP --minimal linux-3.4.32/fs/btrfs/ioctl.c linux-3.4.32-vs2.3.3.9/fs/bt
if (flags & FS_APPEND_FL)
ip->flags |= BTRFS_INODE_APPEND;
else
-diff -NurpP --minimal linux-3.4.32/fs/btrfs/super.c linux-3.4.32-vs2.3.3.9/fs/btrfs/super.c
---- linux-3.4.32/fs/btrfs/super.c 2012-05-21 16:07:19.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/btrfs/super.c 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/btrfs/super.c linux-3.4.48-vs2.3.3.9/fs/btrfs/super.c
+--- linux-3.4.48/fs/btrfs/super.c 2012-05-21 16:07:19.000000000 +0000
++++ linux-3.4.48-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,
@@ -2068,9 +2019,9 @@ diff -NurpP --minimal linux-3.4.32/fs/btrfs/super.c linux-3.4.32-vs2.3.3.9/fs/bt
if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
return 0;
-diff -NurpP --minimal linux-3.4.32/fs/char_dev.c linux-3.4.32-vs2.3.3.9/fs/char_dev.c
---- linux-3.4.32/fs/char_dev.c 2012-03-19 18:47:25.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/char_dev.c 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/char_dev.c linux-3.4.48-vs2.3.3.9/fs/char_dev.c
+--- linux-3.4.48/fs/char_dev.c 2012-03-19 18:47:25.000000000 +0000
++++ linux-3.4.48-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>
@@ -2103,9 +2054,9 @@ diff -NurpP --minimal linux-3.4.32/fs/char_dev.c linux-3.4.32-vs2.3.3.9/fs/char_
if (!kobj)
return -ENXIO;
new = container_of(kobj, struct cdev, kobj);
-diff -NurpP --minimal linux-3.4.32/fs/dcache.c linux-3.4.32-vs2.3.3.9/fs/dcache.c
---- linux-3.4.32/fs/dcache.c 2013-02-19 13:55:49.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/dcache.c 2012-10-22 13:09:53.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/dcache.c linux-3.4.48-vs2.3.3.9/fs/dcache.c
+--- linux-3.4.48/fs/dcache.c 2013-06-13 08:59:32.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/fs/dcache.c 2013-06-13 09:46:38.000000000 +0000
@@ -37,6 +37,7 @@
#include <linux/rculist_bl.h>
#include <linux/prefetch.h>
@@ -2157,9 +2108,9 @@ diff -NurpP --minimal linux-3.4.32/fs/dcache.c linux-3.4.32-vs2.3.3.9/fs/dcache.
found = dentry;
spin_unlock(&dentry->d_lock);
break;
-diff -NurpP --minimal linux-3.4.32/fs/devpts/inode.c linux-3.4.32-vs2.3.3.9/fs/devpts/inode.c
---- linux-3.4.32/fs/devpts/inode.c 2012-05-21 16:07:20.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/devpts/inode.c 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/devpts/inode.c linux-3.4.48-vs2.3.3.9/fs/devpts/inode.c
+--- linux-3.4.48/fs/devpts/inode.c 2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/fs/devpts/inode.c 2012-05-21 16:15:04.000000000 +0000
@@ -25,6 +25,7 @@
#include <linux/parser.h>
#include <linux/fsnotify.h>
@@ -2247,9 +2198,9 @@ diff -NurpP --minimal linux-3.4.32/fs/devpts/inode.c linux-3.4.32-vs2.3.3.9/fs/d
inode->i_private = tty;
tty->driver_data = inode;
-diff -NurpP --minimal linux-3.4.32/fs/ext2/balloc.c linux-3.4.32-vs2.3.3.9/fs/ext2/balloc.c
---- linux-3.4.32/fs/ext2/balloc.c 2012-01-09 15:14:54.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/ext2/balloc.c 2012-05-21 16:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/ext2/balloc.c linux-3.4.48-vs2.3.3.9/fs/ext2/balloc.c
+--- linux-3.4.48/fs/ext2/balloc.c 2012-01-09 15:14:54.000000000 +0000
++++ linux-3.4.48-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);
@@ -2258,9 +2209,9 @@ diff -NurpP --minimal linux-3.4.32/fs/ext2/balloc.c linux-3.4.32-vs2.3.3.9/fs/ex
BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb));
repeat:
-diff -NurpP --minimal linux-3.4.32/fs/ext2/ext2.h linux-3.4.32-vs2.3.3.9/fs/ext2/ext2.h
---- linux-3.4.32/fs/ext2/ext2.h 2012-05-21 16:07:20.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/ext2/ext2.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/ext2/ext2.h linux-3.4.48-vs2.3.3.9/fs/ext2/ext2.h
+--- linux-3.4.48/fs/ext2/ext2.h 2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.48-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) */
@@ -2308,18 +2259,18 @@ diff -NurpP --minimal linux-3.4.32/fs/ext2/ext2.h linux-3.4.32-vs2.3.3.9/fs/ext2
/* ioctl.c */
extern long ext2_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-3.4.32/fs/ext2/file.c linux-3.4.32-vs2.3.3.9/fs/ext2/file.c
---- linux-3.4.32/fs/ext2/file.c 2011-10-24 16:45:27.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/ext2/file.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/ext2/file.c linux-3.4.48-vs2.3.3.9/fs/ext2/file.c
+--- linux-3.4.48/fs/ext2/file.c 2011-10-24 16:45:27.000000000 +0000
++++ linux-3.4.48-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.32/fs/ext2/ialloc.c linux-3.4.32-vs2.3.3.9/fs/ext2/ialloc.c
---- linux-3.4.32/fs/ext2/ialloc.c 2012-03-19 18:47:25.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/ext2/ialloc.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/ext2/ialloc.c linux-3.4.48-vs2.3.3.9/fs/ext2/ialloc.c
+--- linux-3.4.48/fs/ext2/ialloc.c 2012-03-19 18:47:25.000000000 +0000
++++ linux-3.4.48-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>
@@ -2336,9 +2287,9 @@ diff -NurpP --minimal linux-3.4.32/fs/ext2/ialloc.c linux-3.4.32-vs2.3.3.9/fs/ex
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-3.4.32/fs/ext2/inode.c linux-3.4.32-vs2.3.3.9/fs/ext2/inode.c
---- linux-3.4.32/fs/ext2/inode.c 2012-03-19 18:47:25.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/ext2/inode.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/ext2/inode.c linux-3.4.48-vs2.3.3.9/fs/ext2/inode.c
+--- linux-3.4.48/fs/ext2/inode.c 2012-03-19 18:47:25.000000000 +0000
++++ linux-3.4.48-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>
@@ -2486,9 +2437,9 @@ diff -NurpP --minimal linux-3.4.32/fs/ext2/inode.c linux-3.4.32-vs2.3.3.9/fs/ext
error = dquot_transfer(inode, iattr);
if (error)
return error;
-diff -NurpP --minimal linux-3.4.32/fs/ext2/ioctl.c linux-3.4.32-vs2.3.3.9/fs/ext2/ioctl.c
---- linux-3.4.32/fs/ext2/ioctl.c 2012-03-19 18:47:25.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/ext2/ioctl.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/ext2/ioctl.c linux-3.4.48-vs2.3.3.9/fs/ext2/ioctl.c
+--- linux-3.4.48/fs/ext2/ioctl.c 2012-03-19 18:47:25.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/fs/ext2/ioctl.c 2012-05-21 16:15:05.000000000 +0000
@@ -17,6 +17,16 @@
#include <asm/uaccess.h>
@@ -2538,9 +2489,9 @@ diff -NurpP --minimal linux-3.4.32/fs/ext2/ioctl.c linux-3.4.32-vs2.3.3.9/fs/ext
flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE;
ei->i_flags = flags;
-diff -NurpP --minimal linux-3.4.32/fs/ext2/namei.c linux-3.4.32-vs2.3.3.9/fs/ext2/namei.c
---- linux-3.4.32/fs/ext2/namei.c 2012-05-21 16:07:20.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/ext2/namei.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/ext2/namei.c linux-3.4.48-vs2.3.3.9/fs/ext2/namei.c
+--- linux-3.4.48/fs/ext2/namei.c 2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/fs/ext2/namei.c 2012-05-21 16:15:05.000000000 +0000
@@ -32,6 +32,7 @@
#include <linux/pagemap.h>
@@ -2565,9 +2516,9 @@ diff -NurpP --minimal linux-3.4.32/fs/ext2/namei.c linux-3.4.32-vs2.3.3.9/fs/ext
.get_acl = ext2_get_acl,
};
-diff -NurpP --minimal linux-3.4.32/fs/ext2/super.c linux-3.4.32-vs2.3.3.9/fs/ext2/super.c
---- linux-3.4.32/fs/ext2/super.c 2012-05-21 16:07:20.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/ext2/super.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/ext2/super.c linux-3.4.48-vs2.3.3.9/fs/ext2/super.c
+--- linux-3.4.48/fs/ext2/super.c 2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.48-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,
@@ -2633,9 +2584,9 @@ diff -NurpP --minimal linux-3.4.32/fs/ext2/super.c linux-3.4.32-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.32/fs/ext3/ext3.h linux-3.4.32-vs2.3.3.9/fs/ext3/ext3.h
---- linux-3.4.32/fs/ext3/ext3.h 2012-05-21 16:07:20.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/ext3/ext3.h 2012-05-21 17:13:31.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/ext3/ext3.h linux-3.4.48-vs2.3.3.9/fs/ext3/ext3.h
+--- linux-3.4.48/fs/ext3/ext3.h 2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/fs/ext3/ext3.h 2012-05-21 17:13:31.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) */
@@ -2687,9 +2638,9 @@ diff -NurpP --minimal linux-3.4.32/fs/ext3/ext3.h linux-3.4.32-vs2.3.3.9/fs/ext3
/* ioctl.c */
extern long ext3_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-3.4.32/fs/ext3/file.c linux-3.4.32-vs2.3.3.9/fs/ext3/file.c
---- linux-3.4.32/fs/ext3/file.c 2012-05-21 16:07:20.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/ext3/file.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/ext3/file.c linux-3.4.48-vs2.3.3.9/fs/ext3/file.c
+--- linux-3.4.48/fs/ext3/file.c 2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.48-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,
@@ -2697,9 +2648,9 @@ diff -NurpP --minimal linux-3.4.32/fs/ext3/file.c linux-3.4.32-vs2.3.3.9/fs/ext3
+ .sync_flags = ext3_sync_flags,
};
-diff -NurpP --minimal linux-3.4.32/fs/ext3/ialloc.c linux-3.4.32-vs2.3.3.9/fs/ext3/ialloc.c
---- linux-3.4.32/fs/ext3/ialloc.c 2012-05-21 16:07:20.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/ext3/ialloc.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/ext3/ialloc.c linux-3.4.48-vs2.3.3.9/fs/ext3/ialloc.c
+--- linux-3.4.48/fs/ext3/ialloc.c 2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/fs/ext3/ialloc.c 2012-05-21 16:15:05.000000000 +0000
@@ -14,6 +14,7 @@
#include <linux/quotaops.h>
@@ -2716,9 +2667,9 @@ diff -NurpP --minimal linux-3.4.32/fs/ext3/ialloc.c linux-3.4.32-vs2.3.3.9/fs/ex
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-3.4.32/fs/ext3/inode.c linux-3.4.32-vs2.3.3.9/fs/ext3/inode.c
---- linux-3.4.32/fs/ext3/inode.c 2013-02-19 13:55:49.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/ext3/inode.c 2012-09-16 18:49:11.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/ext3/inode.c linux-3.4.48-vs2.3.3.9/fs/ext3/inode.c
+--- linux-3.4.48/fs/ext3/inode.c 2013-06-13 08:59:32.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/fs/ext3/inode.c 2012-09-16 18:49:11.000000000 +0000
@@ -27,6 +27,8 @@
#include <linux/writeback.h>
#include <linux/mpage.h>
@@ -2893,9 +2844,9 @@ diff -NurpP --minimal linux-3.4.32/fs/ext3/inode.c linux-3.4.32-vs2.3.3.9/fs/ext
error = ext3_mark_inode_dirty(handle, inode);
ext3_journal_stop(handle);
}
-diff -NurpP --minimal linux-3.4.32/fs/ext3/ioctl.c linux-3.4.32-vs2.3.3.9/fs/ext3/ioctl.c
---- linux-3.4.32/fs/ext3/ioctl.c 2012-05-21 16:07:20.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/ext3/ioctl.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/ext3/ioctl.c linux-3.4.48-vs2.3.3.9/fs/ext3/ioctl.c
+--- linux-3.4.48/fs/ext3/ioctl.c 2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.48-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"
@@ -2963,9 +2914,9 @@ diff -NurpP --minimal linux-3.4.32/fs/ext3/ioctl.c linux-3.4.32-vs2.3.3.9/fs/ext
flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE;
ei->i_flags = flags;
-diff -NurpP --minimal linux-3.4.32/fs/ext3/namei.c linux-3.4.32-vs2.3.3.9/fs/ext3/namei.c
---- linux-3.4.32/fs/ext3/namei.c 2012-05-21 16:07:20.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/ext3/namei.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/ext3/namei.c linux-3.4.48-vs2.3.3.9/fs/ext3/namei.c
+--- linux-3.4.48/fs/ext3/namei.c 2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/fs/ext3/namei.c 2012-05-21 16:15:05.000000000 +0000
@@ -25,6 +25,8 @@
*/
@@ -2991,9 +2942,9 @@ diff -NurpP --minimal linux-3.4.32/fs/ext3/namei.c linux-3.4.32-vs2.3.3.9/fs/ext
.get_acl = ext3_get_acl,
};
-diff -NurpP --minimal linux-3.4.32/fs/ext3/super.c linux-3.4.32-vs2.3.3.9/fs/ext3/super.c
---- linux-3.4.32/fs/ext3/super.c 2012-05-21 16:07:20.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/ext3/super.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/ext3/super.c linux-3.4.48-vs2.3.3.9/fs/ext3/super.c
+--- linux-3.4.48/fs/ext3/super.c 2013-06-13 08:59:32.000000000 +0000
++++ linux-3.4.48-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,
@@ -3060,9 +3011,9 @@ diff -NurpP --minimal linux-3.4.32/fs/ext3/super.c linux-3.4.32-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.32/fs/ext4/ext4.h linux-3.4.32-vs2.3.3.9/fs/ext4/ext4.h
---- linux-3.4.32/fs/ext4/ext4.h 2013-02-19 13:55:50.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/ext4/ext4.h 2012-09-01 08:50:49.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/ext4/ext4.h linux-3.4.48-vs2.3.3.9/fs/ext4/ext4.h
+--- linux-3.4.48/fs/ext4/ext4.h 2013-06-13 08:59:32.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/fs/ext4/ext4.h 2013-06-13 09:46:38.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 */
@@ -3110,9 +3061,9 @@ diff -NurpP --minimal linux-3.4.32/fs/ext4/ext4.h linux-3.4.32-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.32/fs/ext4/file.c linux-3.4.32-vs2.3.3.9/fs/ext4/file.c
---- linux-3.4.32/fs/ext4/file.c 2012-01-09 15:14:54.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/ext4/file.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/ext4/file.c linux-3.4.48-vs2.3.3.9/fs/ext4/file.c
+--- linux-3.4.48/fs/ext4/file.c 2012-01-09 15:14:54.000000000 +0000
++++ linux-3.4.48-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,
@@ -3120,9 +3071,9 @@ diff -NurpP --minimal linux-3.4.32/fs/ext4/file.c linux-3.4.32-vs2.3.3.9/fs/ext4
+ .sync_flags = ext4_sync_flags,
};
-diff -NurpP --minimal linux-3.4.32/fs/ext4/ialloc.c linux-3.4.32-vs2.3.3.9/fs/ext4/ialloc.c
---- linux-3.4.32/fs/ext4/ialloc.c 2013-02-19 13:55:50.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/ext4/ialloc.c 2013-02-11 23:37:30.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/ext4/ialloc.c linux-3.4.48-vs2.3.3.9/fs/ext4/ialloc.c
+--- linux-3.4.48/fs/ext4/ialloc.c 2013-06-13 08:59:32.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/fs/ext4/ialloc.c 2013-06-13 09:46:38.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/random.h>
#include <linux/bitops.h>
@@ -3139,9 +3090,9 @@ diff -NurpP --minimal linux-3.4.32/fs/ext4/ialloc.c linux-3.4.32-vs2.3.3.9/fs/ex
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-3.4.32/fs/ext4/inode.c linux-3.4.32-vs2.3.3.9/fs/ext4/inode.c
---- linux-3.4.32/fs/ext4/inode.c 2013-02-19 13:55:50.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/ext4/inode.c 2013-02-11 23:37:30.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/ext4/inode.c linux-3.4.48-vs2.3.3.9/fs/ext4/inode.c
+--- linux-3.4.48/fs/ext4/inode.c 2013-06-13 08:59:32.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/fs/ext4/inode.c 2013-03-30 21:29:17.000000000 +0000
@@ -37,6 +37,7 @@
#include <linux/printk.h>
#include <linux/slab.h>
@@ -3150,7 +3101,7 @@ diff -NurpP --minimal linux-3.4.32/fs/ext4/inode.c linux-3.4.32-vs2.3.3.9/fs/ext
#include "ext4_jbd2.h"
#include "xattr.h"
-@@ -3584,41 +3585,64 @@ void ext4_set_inode_flags(struct inode *
+@@ -3585,41 +3586,64 @@ void ext4_set_inode_flags(struct inode *
{
unsigned int flags = EXT4_I(inode)->i_flags;
@@ -3222,7 +3173,7 @@ diff -NurpP --minimal linux-3.4.32/fs/ext4/inode.c linux-3.4.32-vs2.3.3.9/fs/ext
} while (cmpxchg(&ei->i_flags, old_fl, new_fl) != old_fl);
}
-@@ -3654,6 +3678,8 @@ struct inode *ext4_iget(struct super_blo
+@@ -3655,6 +3679,8 @@ struct inode *ext4_iget(struct super_blo
journal_t *journal = EXT4_SB(sb)->s_journal;
long ret;
int block;
@@ -3231,7 +3182,7 @@ diff -NurpP --minimal linux-3.4.32/fs/ext4/inode.c linux-3.4.32-vs2.3.3.9/fs/ext
inode = iget_locked(sb, ino);
if (!inode)
-@@ -3669,12 +3695,16 @@ struct inode *ext4_iget(struct super_blo
+@@ -3670,12 +3696,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);
@@ -3252,7 +3203,7 @@ diff -NurpP --minimal linux-3.4.32/fs/ext4/inode.c linux-3.4.32-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 */
-@@ -3893,6 +3923,8 @@ static int ext4_do_update_inode(handle_t
+@@ -3894,6 +3924,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;
@@ -3261,7 +3212,7 @@ diff -NurpP --minimal linux-3.4.32/fs/ext4/inode.c linux-3.4.32-vs2.3.3.9/fs/ext
int err = 0, rc, block;
int need_datasync = 0;
-@@ -3904,29 +3936,32 @@ static int ext4_do_update_inode(handle_t
+@@ -3905,29 +3937,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))) {
@@ -3300,7 +3251,7 @@ diff -NurpP --minimal linux-3.4.32/fs/ext4/inode.c linux-3.4.32-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);
-@@ -4113,7 +4148,8 @@ int ext4_setattr(struct dentry *dentry,
+@@ -4114,7 +4149,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) ||
@@ -3310,7 +3261,7 @@ diff -NurpP --minimal linux-3.4.32/fs/ext4/inode.c linux-3.4.32-vs2.3.3.9/fs/ext
handle_t *handle;
/* (user+group)*(old+new) structure, inode write (sb,
-@@ -4135,6 +4171,8 @@ int ext4_setattr(struct dentry *dentry,
+@@ -4136,6 +4172,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;
@@ -3319,9 +3270,9 @@ diff -NurpP --minimal linux-3.4.32/fs/ext4/inode.c linux-3.4.32-vs2.3.3.9/fs/ext
error = ext4_mark_inode_dirty(handle, inode);
ext4_journal_stop(handle);
}
-diff -NurpP --minimal linux-3.4.32/fs/ext4/ioctl.c linux-3.4.32-vs2.3.3.9/fs/ext4/ioctl.c
---- linux-3.4.32/fs/ext4/ioctl.c 2013-02-19 13:55:50.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/ext4/ioctl.c 2012-09-01 08:50:49.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/ext4/ioctl.c linux-3.4.48-vs2.3.3.9/fs/ext4/ioctl.c
+--- linux-3.4.48/fs/ext4/ioctl.c 2013-06-13 08:59:32.000000000 +0000
++++ linux-3.4.48-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>
@@ -3386,9 +3337,9 @@ diff -NurpP --minimal linux-3.4.32/fs/ext4/ioctl.c linux-3.4.32-vs2.3.3.9/fs/ext
if (!capable(CAP_LINUX_IMMUTABLE))
goto flags_out;
}
-diff -NurpP --minimal linux-3.4.32/fs/ext4/namei.c linux-3.4.32-vs2.3.3.9/fs/ext4/namei.c
---- linux-3.4.32/fs/ext4/namei.c 2013-02-19 13:55:50.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/ext4/namei.c 2012-10-22 13:09:53.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/ext4/namei.c linux-3.4.48-vs2.3.3.9/fs/ext4/namei.c
+--- linux-3.4.48/fs/ext4/namei.c 2013-06-13 08:59:32.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/fs/ext4/namei.c 2012-10-22 13:09:53.000000000 +0000
@@ -34,6 +34,7 @@
#include <linux/quotaops.h>
#include <linux/buffer_head.h>
@@ -3413,9 +3364,9 @@ diff -NurpP --minimal linux-3.4.32/fs/ext4/namei.c linux-3.4.32-vs2.3.3.9/fs/ext
};
const struct inode_operations ext4_special_inode_operations = {
-diff -NurpP --minimal linux-3.4.32/fs/ext4/super.c linux-3.4.32-vs2.3.3.9/fs/ext4/super.c
---- linux-3.4.32/fs/ext4/super.c 2013-02-19 13:55:50.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/ext4/super.c 2013-02-11 23:38:27.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/ext4/super.c linux-3.4.48-vs2.3.3.9/fs/ext4/super.c
+--- linux-3.4.48/fs/ext4/super.c 2013-06-13 08:59:32.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/fs/ext4/super.c 2013-06-13 09:46:38.000000000 +0000
@@ -1188,6 +1188,7 @@ enum {
Opt_inode_readahead_blks, Opt_journal_ioprio,
Opt_dioread_nolock, Opt_dioread_lock,
@@ -3480,9 +3431,9 @@ diff -NurpP --minimal linux-3.4.32/fs/ext4/super.c linux-3.4.32-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.32/fs/fcntl.c linux-3.4.32-vs2.3.3.9/fs/fcntl.c
---- linux-3.4.32/fs/fcntl.c 2012-05-21 16:07:20.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/fcntl.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/fcntl.c linux-3.4.48-vs2.3.3.9/fs/fcntl.c
+--- linux-3.4.48/fs/fcntl.c 2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.48-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>
@@ -3509,9 +3460,9 @@ diff -NurpP --minimal linux-3.4.32/fs/fcntl.c linux-3.4.32-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.32/fs/file.c linux-3.4.32-vs2.3.3.9/fs/file.c
---- linux-3.4.32/fs/file.c 2012-05-21 16:07:20.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/file.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/file.c linux-3.4.48-vs2.3.3.9/fs/file.c
+--- linux-3.4.48/fs/file.c 2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/fs/file.c 2012-05-21 16:15:05.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/spinlock.h>
#include <linux/rcupdate.h>
@@ -3537,9 +3488,9 @@ diff -NurpP --minimal linux-3.4.32/fs/file.c linux-3.4.32-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.32/fs/file_table.c linux-3.4.32-vs2.3.3.9/fs/file_table.c
---- linux-3.4.32/fs/file_table.c 2012-05-21 16:07:20.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/file_table.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/file_table.c linux-3.4.48-vs2.3.3.9/fs/file_table.c
+--- linux-3.4.48/fs/file_table.c 2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.48-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>
@@ -3576,9 +3527,9 @@ diff -NurpP --minimal linux-3.4.32/fs/file_table.c linux-3.4.32-vs2.3.3.9/fs/fil
file_sb_list_del(file);
file_free(file);
}
-diff -NurpP --minimal linux-3.4.32/fs/fs_struct.c linux-3.4.32-vs2.3.3.9/fs/fs_struct.c
---- linux-3.4.32/fs/fs_struct.c 2012-05-21 16:07:20.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/fs_struct.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/fs_struct.c linux-3.4.48-vs2.3.3.9/fs/fs_struct.c
+--- linux-3.4.48/fs/fs_struct.c 2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.48-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>
@@ -3603,9 +3554,9 @@ diff -NurpP --minimal linux-3.4.32/fs/fs_struct.c linux-3.4.32-vs2.3.3.9/fs/fs_s
}
return fs;
}
-diff -NurpP --minimal linux-3.4.32/fs/gfs2/file.c linux-3.4.32-vs2.3.3.9/fs/gfs2/file.c
---- linux-3.4.32/fs/gfs2/file.c 2012-05-21 16:07:20.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/gfs2/file.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/gfs2/file.c linux-3.4.48-vs2.3.3.9/fs/gfs2/file.c
+--- linux-3.4.48/fs/gfs2/file.c 2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.48-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,
@@ -3728,9 +3679,9 @@ diff -NurpP --minimal linux-3.4.32/fs/gfs2/file.c linux-3.4.32-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.32/fs/gfs2/inode.h linux-3.4.32-vs2.3.3.9/fs/gfs2/inode.h
---- linux-3.4.32/fs/gfs2/inode.h 2012-01-09 15:14:54.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/gfs2/inode.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/gfs2/inode.h linux-3.4.48-vs2.3.3.9/fs/gfs2/inode.h
+--- linux-3.4.48/fs/gfs2/inode.h 2012-01-09 15:14:54.000000000 +0000
++++ linux-3.4.48-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;
@@ -3739,9 +3690,9 @@ diff -NurpP --minimal linux-3.4.32/fs/gfs2/inode.h linux-3.4.32-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.32/fs/inode.c linux-3.4.32-vs2.3.3.9/fs/inode.c
---- linux-3.4.32/fs/inode.c 2012-05-21 16:07:24.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/inode.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/inode.c linux-3.4.48-vs2.3.3.9/fs/inode.c
+--- linux-3.4.48/fs/inode.c 2012-05-21 16:07:24.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/fs/inode.c 2013-06-13 09:46:38.000000000 +0000
@@ -17,6 +17,7 @@
#include <linux/prefetch.h>
#include <linux/buffer_head.h> /* for inode_has_buffers */
@@ -3797,9 +3748,9 @@ diff -NurpP --minimal linux-3.4.32/fs/inode.c linux-3.4.32-vs2.3.3.9/fs/inode.c
}
EXPORT_SYMBOL(inode_init_owner);
-diff -NurpP --minimal linux-3.4.32/fs/ioctl.c linux-3.4.32-vs2.3.3.9/fs/ioctl.c
---- linux-3.4.32/fs/ioctl.c 2012-05-21 16:07:24.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/ioctl.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/ioctl.c linux-3.4.48-vs2.3.3.9/fs/ioctl.c
+--- linux-3.4.48/fs/ioctl.c 2012-05-21 16:07:24.000000000 +0000
++++ linux-3.4.48-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>
@@ -3810,9 +3761,9 @@ diff -NurpP --minimal linux-3.4.32/fs/ioctl.c linux-3.4.32-vs2.3.3.9/fs/ioctl.c
#include <asm/ioctls.h>
-diff -NurpP --minimal linux-3.4.32/fs/ioprio.c linux-3.4.32-vs2.3.3.9/fs/ioprio.c
---- linux-3.4.32/fs/ioprio.c 2012-03-19 18:47:25.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/ioprio.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/ioprio.c linux-3.4.48-vs2.3.3.9/fs/ioprio.c
+--- linux-3.4.48/fs/ioprio.c 2012-03-19 18:47:25.000000000 +0000
++++ linux-3.4.48-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>
@@ -3839,9 +3790,9 @@ diff -NurpP --minimal linux-3.4.32/fs/ioprio.c linux-3.4.32-vs2.3.3.9/fs/ioprio.
tmpio = get_task_ioprio(p);
if (tmpio < 0)
continue;
-diff -NurpP --minimal linux-3.4.32/fs/jfs/file.c linux-3.4.32-vs2.3.3.9/fs/jfs/file.c
---- linux-3.4.32/fs/jfs/file.c 2011-10-24 16:45:27.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/jfs/file.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/jfs/file.c linux-3.4.48-vs2.3.3.9/fs/jfs/file.c
+--- linux-3.4.48/fs/jfs/file.c 2011-10-24 16:45:27.000000000 +0000
++++ linux-3.4.48-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);
@@ -3860,9 +3811,9 @@ diff -NurpP --minimal linux-3.4.32/fs/jfs/file.c linux-3.4.32-vs2.3.3.9/fs/jfs/f
};
const struct file_operations jfs_file_operations = {
-diff -NurpP --minimal linux-3.4.32/fs/jfs/ioctl.c linux-3.4.32-vs2.3.3.9/fs/jfs/ioctl.c
---- linux-3.4.32/fs/jfs/ioctl.c 2012-03-19 18:47:25.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/jfs/ioctl.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/jfs/ioctl.c linux-3.4.48-vs2.3.3.9/fs/jfs/ioctl.c
+--- linux-3.4.48/fs/jfs/ioctl.c 2012-03-19 18:47:25.000000000 +0000
++++ linux-3.4.48-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>
@@ -3920,9 +3871,9 @@ diff -NurpP --minimal linux-3.4.32/fs/jfs/ioctl.c linux-3.4.32-vs2.3.3.9/fs/jfs/
flags |= oldflags & ~JFS_FL_USER_MODIFIABLE;
jfs_inode->mode2 = flags;
-diff -NurpP --minimal linux-3.4.32/fs/jfs/jfs_dinode.h linux-3.4.32-vs2.3.3.9/fs/jfs/jfs_dinode.h
---- linux-3.4.32/fs/jfs/jfs_dinode.h 2008-12-24 23:26:37.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/jfs/jfs_dinode.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/jfs/jfs_dinode.h linux-3.4.48-vs2.3.3.9/fs/jfs/jfs_dinode.h
+--- linux-3.4.48/fs/jfs/jfs_dinode.h 2008-12-24 23:26:37.000000000 +0000
++++ linux-3.4.48-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 */
@@ -3939,9 +3890,9 @@ diff -NurpP --minimal linux-3.4.32/fs/jfs/jfs_dinode.h linux-3.4.32-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.32/fs/jfs/jfs_filsys.h linux-3.4.32-vs2.3.3.9/fs/jfs/jfs_filsys.h
---- linux-3.4.32/fs/jfs/jfs_filsys.h 2008-12-24 23:26:37.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/jfs/jfs_filsys.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/jfs/jfs_filsys.h linux-3.4.48-vs2.3.3.9/fs/jfs/jfs_filsys.h
+--- linux-3.4.48/fs/jfs/jfs_filsys.h 2008-12-24 23:26:37.000000000 +0000
++++ linux-3.4.48-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
@@ -3950,9 +3901,9 @@ diff -NurpP --minimal linux-3.4.32/fs/jfs/jfs_filsys.h linux-3.4.32-vs2.3.3.9/fs
/*
* file system state (superblock state)
-diff -NurpP --minimal linux-3.4.32/fs/jfs/jfs_imap.c linux-3.4.32-vs2.3.3.9/fs/jfs/jfs_imap.c
---- linux-3.4.32/fs/jfs/jfs_imap.c 2012-01-09 15:14:54.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/jfs/jfs_imap.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/jfs/jfs_imap.c linux-3.4.48-vs2.3.3.9/fs/jfs/jfs_imap.c
+--- linux-3.4.48/fs/jfs/jfs_imap.c 2012-01-09 15:14:54.000000000 +0000
++++ linux-3.4.48-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>
@@ -4012,9 +3963,9 @@ diff -NurpP --minimal linux-3.4.32/fs/jfs/jfs_imap.c linux-3.4.32-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.32/fs/jfs/jfs_inode.c linux-3.4.32-vs2.3.3.9/fs/jfs/jfs_inode.c
---- linux-3.4.32/fs/jfs/jfs_inode.c 2012-01-09 15:14:54.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/jfs/jfs_inode.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/jfs/jfs_inode.c linux-3.4.48-vs2.3.3.9/fs/jfs/jfs_inode.c
+--- linux-3.4.48/fs/jfs/jfs_inode.c 2012-01-09 15:14:54.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/fs/jfs/jfs_inode.c 2012-05-21 16:15:05.000000000 +0000
@@ -18,6 +18,7 @@
#include <linux/fs.h>
@@ -4088,9 +4039,9 @@ diff -NurpP --minimal linux-3.4.32/fs/jfs/jfs_inode.c linux-3.4.32-vs2.3.3.9/fs/
}
/*
-diff -NurpP --minimal linux-3.4.32/fs/jfs/jfs_inode.h linux-3.4.32-vs2.3.3.9/fs/jfs/jfs_inode.h
---- linux-3.4.32/fs/jfs/jfs_inode.h 2011-10-24 16:45:27.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/jfs/jfs_inode.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/jfs/jfs_inode.h linux-3.4.48-vs2.3.3.9/fs/jfs/jfs_inode.h
+--- linux-3.4.48/fs/jfs/jfs_inode.h 2011-10-24 16:45:27.000000000 +0000
++++ linux-3.4.48-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);
@@ -4099,9 +4050,9 @@ diff -NurpP --minimal linux-3.4.32/fs/jfs/jfs_inode.h linux-3.4.32-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.32/fs/jfs/namei.c linux-3.4.32-vs2.3.3.9/fs/jfs/namei.c
---- linux-3.4.32/fs/jfs/namei.c 2012-05-21 16:07:25.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/jfs/namei.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/jfs/namei.c linux-3.4.48-vs2.3.3.9/fs/jfs/namei.c
+--- linux-3.4.48/fs/jfs/namei.c 2012-05-21 16:07:25.000000000 +0000
++++ linux-3.4.48-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>
@@ -4126,9 +4077,9 @@ diff -NurpP --minimal linux-3.4.32/fs/jfs/namei.c linux-3.4.32-vs2.3.3.9/fs/jfs/
};
const struct file_operations jfs_dir_operations = {
-diff -NurpP --minimal linux-3.4.32/fs/jfs/super.c linux-3.4.32-vs2.3.3.9/fs/jfs/super.c
---- linux-3.4.32/fs/jfs/super.c 2012-05-21 16:07:25.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/jfs/super.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/jfs/super.c linux-3.4.48-vs2.3.3.9/fs/jfs/super.c
+--- linux-3.4.48/fs/jfs/super.c 2012-05-21 16:07:25.000000000 +0000
++++ linux-3.4.48-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,
@@ -4194,9 +4145,9 @@ diff -NurpP --minimal linux-3.4.32/fs/jfs/super.c linux-3.4.32-vs2.3.3.9/fs/jfs/
if (newLVSize) {
printk(KERN_ERR "resize option for remount only\n");
-diff -NurpP --minimal linux-3.4.32/fs/libfs.c linux-3.4.32-vs2.3.3.9/fs/libfs.c
---- linux-3.4.32/fs/libfs.c 2012-05-21 16:07:25.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/libfs.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/libfs.c linux-3.4.48-vs2.3.3.9/fs/libfs.c
+--- linux-3.4.48/fs/libfs.c 2012-05-21 16:07:25.000000000 +0000
++++ linux-3.4.48-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.
*/
@@ -4242,9 +4193,9 @@ diff -NurpP --minimal linux-3.4.32/fs/libfs.c linux-3.4.32-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.32/fs/locks.c linux-3.4.32-vs2.3.3.9/fs/locks.c
---- linux-3.4.32/fs/locks.c 2013-02-19 13:55:51.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/locks.c 2012-09-01 08:50:49.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/locks.c linux-3.4.48-vs2.3.3.9/fs/locks.c
+--- linux-3.4.48/fs/locks.c 2013-06-13 08:59:34.000000000 +0000
++++ linux-3.4.48-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>
@@ -4442,9 +4393,9 @@ diff -NurpP --minimal linux-3.4.32/fs/locks.c linux-3.4.32-vs2.3.3.9/fs/locks.c
return 0;
}
-diff -NurpP --minimal linux-3.4.32/fs/mount.h linux-3.4.32-vs2.3.3.9/fs/mount.h
---- linux-3.4.32/fs/mount.h 2012-03-19 18:47:26.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/mount.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/mount.h linux-3.4.48-vs2.3.3.9/fs/mount.h
+--- linux-3.4.48/fs/mount.h 2012-03-19 18:47:26.000000000 +0000
++++ linux-3.4.48-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;
@@ -4453,9 +4404,9 @@ diff -NurpP --minimal linux-3.4.32/fs/mount.h linux-3.4.32-vs2.3.3.9/fs/mount.h
};
static inline struct mount *real_mount(struct vfsmount *mnt)
-diff -NurpP --minimal linux-3.4.32/fs/namei.c linux-3.4.32-vs2.3.3.9/fs/namei.c
---- linux-3.4.32/fs/namei.c 2012-05-21 16:07:25.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/namei.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/namei.c linux-3.4.48-vs2.3.3.9/fs/namei.c
+--- linux-3.4.48/fs/namei.c 2012-05-21 16:07:25.000000000 +0000
++++ linux-3.4.48-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>
@@ -4983,9 +4934,9 @@ diff -NurpP --minimal linux-3.4.32/fs/namei.c linux-3.4.32-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.32/fs/namespace.c linux-3.4.32-vs2.3.3.9/fs/namespace.c
---- linux-3.4.32/fs/namespace.c 2013-02-19 13:55:51.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/namespace.c 2012-06-28 14:45:07.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/namespace.c linux-3.4.48-vs2.3.3.9/fs/namespace.c
+--- linux-3.4.48/fs/namespace.c 2013-06-13 08:59:34.000000000 +0000
++++ linux-3.4.48-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 */
@@ -5172,9 +5123,9 @@ diff -NurpP --minimal linux-3.4.32/fs/namespace.c linux-3.4.32-vs2.3.3.9/fs/name
kfree(ns);
}
-diff -NurpP --minimal linux-3.4.32/fs/nfs/client.c linux-3.4.32-vs2.3.3.9/fs/nfs/client.c
---- linux-3.4.32/fs/nfs/client.c 2013-02-19 13:55:51.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/nfs/client.c 2013-01-16 00:15:57.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/nfs/client.c linux-3.4.48-vs2.3.3.9/fs/nfs/client.c
+--- linux-3.4.48/fs/nfs/client.c 2013-06-13 08:59:34.000000000 +0000
++++ linux-3.4.48-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;
@@ -5196,9 +5147,9 @@ diff -NurpP --minimal linux-3.4.32/fs/nfs/client.c linux-3.4.32-vs2.3.3.9/fs/nfs
server->maxfilesize = fsinfo->maxfilesize;
server->time_delta = fsinfo->time_delta;
-diff -NurpP --minimal linux-3.4.32/fs/nfs/dir.c linux-3.4.32-vs2.3.3.9/fs/nfs/dir.c
---- linux-3.4.32/fs/nfs/dir.c 2013-02-19 13:55:51.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/nfs/dir.c 2013-01-16 00:15:57.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/nfs/dir.c linux-3.4.48-vs2.3.3.9/fs/nfs/dir.c
+--- linux-3.4.48/fs/nfs/dir.c 2013-06-13 08:59:34.000000000 +0000
++++ linux-3.4.48-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>
@@ -5215,9 +5166,9 @@ diff -NurpP --minimal linux-3.4.32/fs/nfs/dir.c linux-3.4.32-vs2.3.3.9/fs/nfs/di
no_entry:
res = d_materialise_unique(dentry, inode);
if (res != NULL) {
-diff -NurpP --minimal linux-3.4.32/fs/nfs/inode.c linux-3.4.32-vs2.3.3.9/fs/nfs/inode.c
---- linux-3.4.32/fs/nfs/inode.c 2013-02-19 13:55:51.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/nfs/inode.c 2012-10-22 13:09:53.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/nfs/inode.c linux-3.4.48-vs2.3.3.9/fs/nfs/inode.c
+--- linux-3.4.48/fs/nfs/inode.c 2013-06-13 08:59:34.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/fs/nfs/inode.c 2012-10-22 13:09:53.000000000 +0000
@@ -40,6 +40,7 @@
#include <linux/compat.h>
#include <linux/freezer.h>
@@ -5369,9 +5320,9 @@ diff -NurpP --minimal linux-3.4.32/fs/nfs/inode.c linux-3.4.32-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.32/fs/nfs/nfs3xdr.c linux-3.4.32-vs2.3.3.9/fs/nfs/nfs3xdr.c
---- linux-3.4.32/fs/nfs/nfs3xdr.c 2012-05-21 16:07:25.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/nfs/nfs3xdr.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/nfs/nfs3xdr.c linux-3.4.48-vs2.3.3.9/fs/nfs/nfs3xdr.c
+--- linux-3.4.48/fs/nfs/nfs3xdr.c 2012-05-21 16:07:25.000000000 +0000
++++ linux-3.4.48-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>
@@ -5517,9 +5468,9 @@ diff -NurpP --minimal linux-3.4.32/fs/nfs/nfs3xdr.c linux-3.4.32-vs2.3.3.9/fs/nf
}
/*
-diff -NurpP --minimal linux-3.4.32/fs/nfs/super.c linux-3.4.32-vs2.3.3.9/fs/nfs/super.c
---- linux-3.4.32/fs/nfs/super.c 2013-02-19 13:55:51.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/nfs/super.c 2013-01-16 00:15:57.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/nfs/super.c linux-3.4.48-vs2.3.3.9/fs/nfs/super.c
+--- linux-3.4.48/fs/nfs/super.c 2013-06-13 08:59:34.000000000 +0000
++++ linux-3.4.48-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>
@@ -5591,9 +5542,9 @@ diff -NurpP --minimal linux-3.4.32/fs/nfs/super.c linux-3.4.32-vs2.3.3.9/fs/nfs/
/*
* options that take text values
-diff -NurpP --minimal linux-3.4.32/fs/nfsd/auth.c linux-3.4.32-vs2.3.3.9/fs/nfsd/auth.c
---- linux-3.4.32/fs/nfsd/auth.c 2010-02-25 10:52:05.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/nfsd/auth.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/nfsd/auth.c linux-3.4.48-vs2.3.3.9/fs/nfsd/auth.c
+--- linux-3.4.48/fs/nfsd/auth.c 2010-02-25 10:52:05.000000000 +0000
++++ linux-3.4.48-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> */
@@ -5612,9 +5563,9 @@ diff -NurpP --minimal linux-3.4.32/fs/nfsd/auth.c linux-3.4.32-vs2.3.3.9/fs/nfsd
rqgi = rqstp->rq_cred.cr_group_info;
-diff -NurpP --minimal linux-3.4.32/fs/nfsd/nfs3xdr.c linux-3.4.32-vs2.3.3.9/fs/nfsd/nfs3xdr.c
---- linux-3.4.32/fs/nfsd/nfs3xdr.c 2012-05-21 16:07:26.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/nfsd/nfs3xdr.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/nfsd/nfs3xdr.c linux-3.4.48-vs2.3.3.9/fs/nfsd/nfs3xdr.c
+--- linux-3.4.48/fs/nfsd/nfs3xdr.c 2012-05-21 16:07:26.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/fs/nfsd/nfs3xdr.c 2012-05-21 16:15:05.000000000 +0000
@@ -7,6 +7,7 @@
*/
@@ -5665,9 +5616,9 @@ diff -NurpP --minimal linux-3.4.32/fs/nfsd/nfs3xdr.c linux-3.4.32-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.32/fs/nfsd/nfs4xdr.c linux-3.4.32-vs2.3.3.9/fs/nfsd/nfs4xdr.c
---- linux-3.4.32/fs/nfsd/nfs4xdr.c 2013-02-19 13:55:51.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/nfsd/nfs4xdr.c 2013-01-16 00:15:57.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/nfsd/nfs4xdr.c linux-3.4.48-vs2.3.3.9/fs/nfsd/nfs4xdr.c
+--- linux-3.4.48/fs/nfsd/nfs4xdr.c 2013-06-13 08:59:34.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/fs/nfsd/nfs4xdr.c 2013-06-13 09:46:39.000000000 +0000
@@ -46,6 +46,7 @@
#include <linux/utsname.h>
#include <linux/pagemap.h>
@@ -5697,9 +5648,9 @@ diff -NurpP --minimal linux-3.4.32/fs/nfsd/nfs4xdr.c linux-3.4.32-vs2.3.3.9/fs/n
if (status == nfserr_resource)
goto out_resource;
if (status)
-diff -NurpP --minimal linux-3.4.32/fs/nfsd/nfsxdr.c linux-3.4.32-vs2.3.3.9/fs/nfsd/nfsxdr.c
---- linux-3.4.32/fs/nfsd/nfsxdr.c 2011-05-22 14:17:53.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/nfsd/nfsxdr.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/nfsd/nfsxdr.c linux-3.4.48-vs2.3.3.9/fs/nfsd/nfsxdr.c
+--- linux-3.4.48/fs/nfsd/nfsxdr.c 2011-05-22 14:17:53.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/fs/nfsd/nfsxdr.c 2012-05-21 16:15:05.000000000 +0000
@@ -6,6 +6,7 @@
#include "xdr.h"
@@ -5748,9 +5699,9 @@ diff -NurpP --minimal linux-3.4.32/fs/nfsd/nfsxdr.c linux-3.4.32-vs2.3.3.9/fs/nf
if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
*p++ = htonl(NFS_MAXPATHLEN);
-diff -NurpP --minimal linux-3.4.32/fs/ocfs2/dlmglue.c linux-3.4.32-vs2.3.3.9/fs/ocfs2/dlmglue.c
---- linux-3.4.32/fs/ocfs2/dlmglue.c 2012-01-09 15:14:55.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/ocfs2/dlmglue.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/ocfs2/dlmglue.c linux-3.4.48-vs2.3.3.9/fs/ocfs2/dlmglue.c
+--- linux-3.4.48/fs/ocfs2/dlmglue.c 2013-06-13 08:59:34.000000000 +0000
++++ linux-3.4.48-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);
@@ -5767,9 +5718,9 @@ diff -NurpP --minimal linux-3.4.32/fs/ocfs2/dlmglue.c linux-3.4.32-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.32/fs/ocfs2/dlmglue.h linux-3.4.32-vs2.3.3.9/fs/ocfs2/dlmglue.h
---- linux-3.4.32/fs/ocfs2/dlmglue.h 2010-10-21 11:07:50.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/ocfs2/dlmglue.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/ocfs2/dlmglue.h linux-3.4.48-vs2.3.3.9/fs/ocfs2/dlmglue.h
+--- linux-3.4.48/fs/ocfs2/dlmglue.h 2010-10-21 11:07:50.000000000 +0000
++++ linux-3.4.48-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;
@@ -5780,9 +5731,9 @@ diff -NurpP --minimal linux-3.4.32/fs/ocfs2/dlmglue.h linux-3.4.32-vs2.3.3.9/fs/
};
#define OCFS2_QINFO_LVB_VERSION 1
-diff -NurpP --minimal linux-3.4.32/fs/ocfs2/file.c linux-3.4.32-vs2.3.3.9/fs/ocfs2/file.c
---- linux-3.4.32/fs/ocfs2/file.c 2013-02-19 13:55:52.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/ocfs2/file.c 2012-07-17 22:29:43.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/ocfs2/file.c linux-3.4.48-vs2.3.3.9/fs/ocfs2/file.c
+--- linux-3.4.48/fs/ocfs2/file.c 2013-06-13 08:59:34.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/fs/ocfs2/file.c 2012-07-17 22:29:43.000000000 +0000
@@ -1123,7 +1123,7 @@ int ocfs2_setattr(struct dentry *dentry,
attr->ia_valid &= ~ATTR_SIZE;
@@ -5792,9 +5743,9 @@ diff -NurpP --minimal linux-3.4.32/fs/ocfs2/file.c linux-3.4.32-vs2.3.3.9/fs/ocf
if (!(attr->ia_valid & OCFS2_VALID_ATTRS))
return 0;
-diff -NurpP --minimal linux-3.4.32/fs/ocfs2/inode.c linux-3.4.32-vs2.3.3.9/fs/ocfs2/inode.c
---- linux-3.4.32/fs/ocfs2/inode.c 2012-01-09 15:14:55.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/ocfs2/inode.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/ocfs2/inode.c linux-3.4.48-vs2.3.3.9/fs/ocfs2/inode.c
+--- linux-3.4.48/fs/ocfs2/inode.c 2012-01-09 15:14:55.000000000 +0000
++++ linux-3.4.48-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>
@@ -5891,9 +5842,9 @@ diff -NurpP --minimal linux-3.4.32/fs/ocfs2/inode.c linux-3.4.32-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.32/fs/ocfs2/inode.h linux-3.4.32-vs2.3.3.9/fs/ocfs2/inode.h
---- linux-3.4.32/fs/ocfs2/inode.h 2012-01-09 15:14:55.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/ocfs2/inode.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/ocfs2/inode.h linux-3.4.48-vs2.3.3.9/fs/ocfs2/inode.h
+--- linux-3.4.48/fs/ocfs2/inode.h 2012-01-09 15:14:55.000000000 +0000
++++ linux-3.4.48-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);
@@ -5902,9 +5853,9 @@ diff -NurpP --minimal linux-3.4.32/fs/ocfs2/inode.h linux-3.4.32-vs2.3.3.9/fs/oc
static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode)
{
-diff -NurpP --minimal linux-3.4.32/fs/ocfs2/ioctl.c linux-3.4.32-vs2.3.3.9/fs/ocfs2/ioctl.c
---- linux-3.4.32/fs/ocfs2/ioctl.c 2012-05-21 16:07:26.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/ocfs2/ioctl.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/ocfs2/ioctl.c linux-3.4.48-vs2.3.3.9/fs/ocfs2/ioctl.c
+--- linux-3.4.48/fs/ocfs2/ioctl.c 2012-05-21 16:07:26.000000000 +0000
++++ linux-3.4.48-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;
}
@@ -5968,9 +5919,9 @@ diff -NurpP --minimal linux-3.4.32/fs/ocfs2/ioctl.c linux-3.4.32-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.32/fs/ocfs2/namei.c linux-3.4.32-vs2.3.3.9/fs/ocfs2/namei.c
---- linux-3.4.32/fs/ocfs2/namei.c 2012-03-19 18:47:26.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/ocfs2/namei.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/ocfs2/namei.c linux-3.4.48-vs2.3.3.9/fs/ocfs2/namei.c
+--- linux-3.4.48/fs/ocfs2/namei.c 2012-03-19 18:47:26.000000000 +0000
++++ linux-3.4.48-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>
@@ -6001,9 +5952,9 @@ diff -NurpP --minimal linux-3.4.32/fs/ocfs2/namei.c linux-3.4.32-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.32/fs/ocfs2/ocfs2.h linux-3.4.32-vs2.3.3.9/fs/ocfs2/ocfs2.h
---- linux-3.4.32/fs/ocfs2/ocfs2.h 2012-01-09 15:14:55.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/ocfs2/ocfs2.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/ocfs2/ocfs2.h linux-3.4.48-vs2.3.3.9/fs/ocfs2/ocfs2.h
+--- linux-3.4.48/fs/ocfs2/ocfs2.h 2012-01-09 15:14:55.000000000 +0000
++++ linux-3.4.48-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 */
@@ -6012,9 +5963,9 @@ diff -NurpP --minimal linux-3.4.32/fs/ocfs2/ocfs2.h linux-3.4.32-vs2.3.3.9/fs/oc
};
#define OCFS2_OSB_SOFT_RO 0x0001
-diff -NurpP --minimal linux-3.4.32/fs/ocfs2/ocfs2_fs.h linux-3.4.32-vs2.3.3.9/fs/ocfs2/ocfs2_fs.h
---- linux-3.4.32/fs/ocfs2/ocfs2_fs.h 2011-05-22 14:17:53.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/ocfs2/ocfs2_fs.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/ocfs2/ocfs2_fs.h linux-3.4.48-vs2.3.3.9/fs/ocfs2/ocfs2_fs.h
+--- linux-3.4.48/fs/ocfs2/ocfs2_fs.h 2011-05-22 14:17:53.000000000 +0000
++++ linux-3.4.48-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 */
@@ -6027,9 +5978,9 @@ diff -NurpP --minimal linux-3.4.32/fs/ocfs2/ocfs2_fs.h linux-3.4.32-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.32/fs/ocfs2/super.c linux-3.4.32-vs2.3.3.9/fs/ocfs2/super.c
---- linux-3.4.32/fs/ocfs2/super.c 2012-05-21 16:07:26.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/ocfs2/super.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/ocfs2/super.c linux-3.4.48-vs2.3.3.9/fs/ocfs2/super.c
+--- linux-3.4.48/fs/ocfs2/super.c 2012-05-21 16:07:26.000000000 +0000
++++ linux-3.4.48-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,
@@ -6093,9 +6044,9 @@ diff -NurpP --minimal linux-3.4.32/fs/ocfs2/super.c linux-3.4.32-vs2.3.3.9/fs/oc
default:
mlog(ML_ERROR,
"Unrecognized mount option \"%s\" "
-diff -NurpP --minimal linux-3.4.32/fs/open.c linux-3.4.32-vs2.3.3.9/fs/open.c
---- linux-3.4.32/fs/open.c 2013-02-19 13:55:52.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/open.c 2012-09-16 18:49:11.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/open.c linux-3.4.48-vs2.3.3.9/fs/open.c
+--- linux-3.4.48/fs/open.c 2013-06-13 08:59:34.000000000 +0000
++++ linux-3.4.48-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>
@@ -6187,9 +6138,9 @@ diff -NurpP --minimal linux-3.4.32/fs/open.c linux-3.4.32-vs2.3.3.9/fs/open.c
}
void put_unused_fd(unsigned int fd)
-diff -NurpP --minimal linux-3.4.32/fs/proc/array.c linux-3.4.32-vs2.3.3.9/fs/proc/array.c
---- linux-3.4.32/fs/proc/array.c 2012-05-21 16:07:26.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/proc/array.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/proc/array.c linux-3.4.48-vs2.3.3.9/fs/proc/array.c
+--- linux-3.4.48/fs/proc/array.c 2012-05-21 16:07:26.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/fs/proc/array.c 2012-05-21 16:15:05.000000000 +0000
@@ -81,6 +81,8 @@
#include <linux/pid_namespace.h>
#include <linux/ptrace.h>
@@ -6303,9 +6254,9 @@ diff -NurpP --minimal linux-3.4.32/fs/proc/array.c linux-3.4.32-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.32/fs/proc/base.c linux-3.4.32-vs2.3.3.9/fs/proc/base.c
---- linux-3.4.32/fs/proc/base.c 2013-02-19 13:55:52.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/proc/base.c 2012-06-28 14:45:07.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/proc/base.c linux-3.4.48-vs2.3.3.9/fs/proc/base.c
+--- linux-3.4.48/fs/proc/base.c 2013-06-13 08:59:35.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/fs/proc/base.c 2012-06-28 14:45:07.000000000 +0000
@@ -84,6 +84,8 @@
#include <linux/fs_struct.h>
#include <linux/slab.h>
@@ -6467,9 +6418,9 @@ diff -NurpP --minimal linux-3.4.32/fs/proc/base.c linux-3.4.32-vs2.3.3.9/fs/proc
ns = dentry->d_sb->s_fs_info;
rcu_read_lock();
-diff -NurpP --minimal linux-3.4.32/fs/proc/generic.c linux-3.4.32-vs2.3.3.9/fs/proc/generic.c
---- linux-3.4.32/fs/proc/generic.c 2012-03-19 18:47:26.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/proc/generic.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/proc/generic.c linux-3.4.48-vs2.3.3.9/fs/proc/generic.c
+--- linux-3.4.48/fs/proc/generic.c 2012-03-19 18:47:26.000000000 +0000
++++ linux-3.4.48-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>
@@ -6529,9 +6480,9 @@ diff -NurpP --minimal linux-3.4.32/fs/proc/generic.c linux-3.4.32-vs2.3.3.9/fs/p
} else {
kfree(ent);
ent = NULL;
-diff -NurpP --minimal linux-3.4.32/fs/proc/inode.c linux-3.4.32-vs2.3.3.9/fs/proc/inode.c
---- linux-3.4.32/fs/proc/inode.c 2012-05-21 16:07:26.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/proc/inode.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/proc/inode.c linux-3.4.48-vs2.3.3.9/fs/proc/inode.c
+--- linux-3.4.48/fs/proc/inode.c 2012-05-21 16:07:26.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/fs/proc/inode.c 2012-05-21 16:15:05.000000000 +0000
@@ -458,6 +458,8 @@ struct inode *proc_get_inode(struct supe
inode->i_uid = de->uid;
inode->i_gid = de->gid;
@@ -6541,9 +6492,9 @@ diff -NurpP --minimal linux-3.4.32/fs/proc/inode.c linux-3.4.32-vs2.3.3.9/fs/pro
if (de->size)
inode->i_size = de->size;
if (de->nlink)
-diff -NurpP --minimal linux-3.4.32/fs/proc/internal.h linux-3.4.32-vs2.3.3.9/fs/proc/internal.h
---- linux-3.4.32/fs/proc/internal.h 2012-05-21 16:07:26.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/proc/internal.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/proc/internal.h linux-3.4.48-vs2.3.3.9/fs/proc/internal.h
+--- linux-3.4.48/fs/proc/internal.h 2012-05-21 16:07:26.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/fs/proc/internal.h 2012-05-21 16:15:05.000000000 +0000
@@ -10,6 +10,8 @@
*/
@@ -6581,9 +6532,9 @@ diff -NurpP --minimal linux-3.4.32/fs/proc/internal.h linux-3.4.32-vs2.3.3.9/fs/
static inline int proc_fd(struct inode *inode)
{
return PROC_I(inode)->fd;
-diff -NurpP --minimal linux-3.4.32/fs/proc/loadavg.c linux-3.4.32-vs2.3.3.9/fs/proc/loadavg.c
---- linux-3.4.32/fs/proc/loadavg.c 2009-09-10 13:26:23.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/proc/loadavg.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/proc/loadavg.c linux-3.4.48-vs2.3.3.9/fs/proc/loadavg.c
+--- linux-3.4.48/fs/proc/loadavg.c 2009-09-10 13:26:23.000000000 +0000
++++ linux-3.4.48-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)
@@ -6613,9 +6564,9 @@ diff -NurpP --minimal linux-3.4.32/fs/proc/loadavg.c linux-3.4.32-vs2.3.3.9/fs/p
task_active_pid_ns(current)->last_pid);
return 0;
}
-diff -NurpP --minimal linux-3.4.32/fs/proc/meminfo.c linux-3.4.32-vs2.3.3.9/fs/proc/meminfo.c
---- linux-3.4.32/fs/proc/meminfo.c 2012-01-09 15:14:55.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/proc/meminfo.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/proc/meminfo.c linux-3.4.48-vs2.3.3.9/fs/proc/meminfo.c
+--- linux-3.4.48/fs/proc/meminfo.c 2012-01-09 15:14:55.000000000 +0000
++++ linux-3.4.48-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;
@@ -6626,9 +6577,9 @@ diff -NurpP --minimal linux-3.4.32/fs/proc/meminfo.c linux-3.4.32-vs2.3.3.9/fs/p
total_swapcache_pages - i.bufferram;
if (cached < 0)
cached = 0;
-diff -NurpP --minimal linux-3.4.32/fs/proc/root.c linux-3.4.32-vs2.3.3.9/fs/proc/root.c
---- linux-3.4.32/fs/proc/root.c 2012-05-21 16:07:26.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/proc/root.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/proc/root.c linux-3.4.48-vs2.3.3.9/fs/proc/root.c
+--- linux-3.4.48/fs/proc/root.c 2012-05-21 16:07:26.000000000 +0000
++++ linux-3.4.48-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>
@@ -6660,9 +6611,9 @@ diff -NurpP --minimal linux-3.4.32/fs/proc/root.c linux-3.4.32-vs2.3.3.9/fs/proc
.name = "/proc",
};
-diff -NurpP --minimal linux-3.4.32/fs/proc/stat.c linux-3.4.32-vs2.3.3.9/fs/proc/stat.c
---- linux-3.4.32/fs/proc/stat.c 2013-02-19 13:55:52.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/proc/stat.c 2012-11-06 17:02:35.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/proc/stat.c linux-3.4.48-vs2.3.3.9/fs/proc/stat.c
+--- linux-3.4.48/fs/proc/stat.c 2013-06-13 08:59:35.000000000 +0000
++++ linux-3.4.48-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>
@@ -6682,9 +6633,9 @@ diff -NurpP --minimal linux-3.4.32/fs/proc/stat.c linux-3.4.32-vs2.3.3.9/fs/proc
jif = boottime.tv_sec;
for_each_possible_cpu(i) {
-diff -NurpP --minimal linux-3.4.32/fs/proc/uptime.c linux-3.4.32-vs2.3.3.9/fs/proc/uptime.c
---- linux-3.4.32/fs/proc/uptime.c 2012-03-19 18:47:26.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/proc/uptime.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/proc/uptime.c linux-3.4.48-vs2.3.3.9/fs/proc/uptime.c
+--- linux-3.4.48/fs/proc/uptime.c 2012-03-19 18:47:26.000000000 +0000
++++ linux-3.4.48-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>
@@ -6704,9 +6655,9 @@ diff -NurpP --minimal linux-3.4.32/fs/proc/uptime.c linux-3.4.32-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.32/fs/proc_namespace.c linux-3.4.32-vs2.3.3.9/fs/proc_namespace.c
---- linux-3.4.32/fs/proc_namespace.c 2012-03-19 18:47:26.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/proc_namespace.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/proc_namespace.c linux-3.4.48-vs2.3.3.9/fs/proc_namespace.c
+--- linux-3.4.48/fs/proc_namespace.c 2012-03-19 18:47:26.000000000 +0000
++++ linux-3.4.48-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" },
@@ -6816,9 +6767,9 @@ diff -NurpP --minimal linux-3.4.32/fs/proc_namespace.c linux-3.4.32-vs2.3.3.9/fs
/* file system type */
seq_puts(m, "with fstype ");
show_type(m, sb);
-diff -NurpP --minimal linux-3.4.32/fs/quota/dquot.c linux-3.4.32-vs2.3.3.9/fs/quota/dquot.c
---- linux-3.4.32/fs/quota/dquot.c 2012-05-21 16:07:26.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/quota/dquot.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/quota/dquot.c linux-3.4.48-vs2.3.3.9/fs/quota/dquot.c
+--- linux-3.4.48/fs/quota/dquot.c 2012-05-21 16:07:26.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/fs/quota/dquot.c 2012-05-21 16:15:05.000000000 +0000
@@ -1563,6 +1563,9 @@ int __dquot_alloc_space(struct inode *in
struct dquot **dquots = inode->i_dquot;
int reserve = flags & DQUOT_SPACE_RESERVE;
@@ -6857,9 +6808,9 @@ diff -NurpP --minimal linux-3.4.32/fs/quota/dquot.c linux-3.4.32-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.32/fs/quota/quota.c linux-3.4.32-vs2.3.3.9/fs/quota/quota.c
---- linux-3.4.32/fs/quota/quota.c 2012-05-21 16:07:26.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/quota/quota.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/quota/quota.c linux-3.4.48-vs2.3.3.9/fs/quota/quota.c
+--- linux-3.4.48/fs/quota/quota.c 2012-05-21 16:07:26.000000000 +0000
++++ linux-3.4.48-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>
@@ -6947,9 +6898,9 @@ diff -NurpP --minimal linux-3.4.32/fs/quota/quota.c linux-3.4.32-vs2.3.3.9/fs/qu
if (quotactl_cmd_write(cmd))
sb = get_super_thawed(bdev);
else
-diff -NurpP --minimal linux-3.4.32/fs/reiserfs/file.c linux-3.4.32-vs2.3.3.9/fs/reiserfs/file.c
---- linux-3.4.32/fs/reiserfs/file.c 2012-05-21 16:07:26.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/reiserfs/file.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/reiserfs/file.c linux-3.4.48-vs2.3.3.9/fs/reiserfs/file.c
+--- linux-3.4.48/fs/reiserfs/file.c 2012-05-21 16:07:26.000000000 +0000
++++ linux-3.4.48-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,
@@ -6957,9 +6908,9 @@ diff -NurpP --minimal linux-3.4.32/fs/reiserfs/file.c linux-3.4.32-vs2.3.3.9/fs/
+ .sync_flags = reiserfs_sync_flags,
.get_acl = reiserfs_get_acl,
};
-diff -NurpP --minimal linux-3.4.32/fs/reiserfs/inode.c linux-3.4.32-vs2.3.3.9/fs/reiserfs/inode.c
---- linux-3.4.32/fs/reiserfs/inode.c 2013-02-19 13:55:52.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/reiserfs/inode.c 2012-12-08 00:53:53.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/reiserfs/inode.c linux-3.4.48-vs2.3.3.9/fs/reiserfs/inode.c
+--- linux-3.4.48/fs/reiserfs/inode.c 2013-06-13 08:59:35.000000000 +0000
++++ linux-3.4.48-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>
@@ -7125,9 +7076,9 @@ diff -NurpP --minimal linux-3.4.32/fs/reiserfs/inode.c linux-3.4.32-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.32/fs/reiserfs/ioctl.c linux-3.4.32-vs2.3.3.9/fs/reiserfs/ioctl.c
---- linux-3.4.32/fs/reiserfs/ioctl.c 2012-05-21 16:07:27.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/reiserfs/ioctl.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/reiserfs/ioctl.c linux-3.4.48-vs2.3.3.9/fs/reiserfs/ioctl.c
+--- linux-3.4.48/fs/reiserfs/ioctl.c 2012-05-21 16:07:27.000000000 +0000
++++ linux-3.4.48-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>
@@ -7189,9 +7140,9 @@ diff -NurpP --minimal linux-3.4.32/fs/reiserfs/ioctl.c linux-3.4.32-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.32/fs/reiserfs/namei.c linux-3.4.32-vs2.3.3.9/fs/reiserfs/namei.c
---- linux-3.4.32/fs/reiserfs/namei.c 2012-05-21 16:07:27.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/reiserfs/namei.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/reiserfs/namei.c linux-3.4.48-vs2.3.3.9/fs/reiserfs/namei.c
+--- linux-3.4.48/fs/reiserfs/namei.c 2012-05-21 16:07:27.000000000 +0000
++++ linux-3.4.48-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"
@@ -7208,9 +7159,9 @@ diff -NurpP --minimal linux-3.4.32/fs/reiserfs/namei.c linux-3.4.32-vs2.3.3.9/fs
return d_splice_alias(inode, dentry);
}
-diff -NurpP --minimal linux-3.4.32/fs/reiserfs/reiserfs.h linux-3.4.32-vs2.3.3.9/fs/reiserfs/reiserfs.h
---- linux-3.4.32/fs/reiserfs/reiserfs.h 2012-05-21 16:07:27.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/reiserfs/reiserfs.h 2012-05-21 17:19:33.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/reiserfs/reiserfs.h linux-3.4.48-vs2.3.3.9/fs/reiserfs/reiserfs.h
+--- linux-3.4.48/fs/reiserfs/reiserfs.h 2012-05-21 16:07:27.000000000 +0000
++++ linux-3.4.48-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,
@@ -7249,9 +7200,9 @@ diff -NurpP --minimal linux-3.4.32/fs/reiserfs/reiserfs.h linux-3.4.32-vs2.3.3.9
int __reiserfs_write_begin(struct page *page, unsigned from, unsigned len);
-diff -NurpP --minimal linux-3.4.32/fs/reiserfs/super.c linux-3.4.32-vs2.3.3.9/fs/reiserfs/super.c
---- linux-3.4.32/fs/reiserfs/super.c 2013-02-19 13:55:52.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/reiserfs/super.c 2012-12-08 00:53:53.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/reiserfs/super.c linux-3.4.48-vs2.3.3.9/fs/reiserfs/super.c
+--- linux-3.4.48/fs/reiserfs/super.c 2013-06-13 08:59:35.000000000 +0000
++++ linux-3.4.48-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},
@@ -7293,9 +7244,9 @@ diff -NurpP --minimal linux-3.4.32/fs/reiserfs/super.c linux-3.4.32-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.32/fs/reiserfs/xattr.c linux-3.4.32-vs2.3.3.9/fs/reiserfs/xattr.c
---- linux-3.4.32/fs/reiserfs/xattr.c 2012-05-21 16:07:27.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/reiserfs/xattr.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/reiserfs/xattr.c linux-3.4.48-vs2.3.3.9/fs/reiserfs/xattr.c
+--- linux-3.4.48/fs/reiserfs/xattr.c 2012-05-21 16:07:27.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/fs/reiserfs/xattr.c 2013-06-13 09:46:39.000000000 +0000
@@ -40,6 +40,7 @@
#include <linux/errno.h>
#include <linux/gfp.h>
@@ -7304,9 +7255,9 @@ diff -NurpP --minimal linux-3.4.32/fs/reiserfs/xattr.c linux-3.4.32-vs2.3.3.9/fs
#include <linux/file.h>
#include <linux/pagemap.h>
#include <linux/xattr.h>
-diff -NurpP --minimal linux-3.4.32/fs/stat.c linux-3.4.32-vs2.3.3.9/fs/stat.c
---- linux-3.4.32/fs/stat.c 2013-02-19 13:55:52.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/stat.c 2012-10-22 13:09:53.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/stat.c linux-3.4.48-vs2.3.3.9/fs/stat.c
+--- linux-3.4.48/fs/stat.c 2013-06-13 08:59:35.000000000 +0000
++++ linux-3.4.48-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;
@@ -7315,9 +7266,9 @@ diff -NurpP --minimal linux-3.4.32/fs/stat.c linux-3.4.32-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.32/fs/statfs.c linux-3.4.32-vs2.3.3.9/fs/statfs.c
---- linux-3.4.32/fs/statfs.c 2012-05-21 16:07:27.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/statfs.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/statfs.c linux-3.4.48-vs2.3.3.9/fs/statfs.c
+--- linux-3.4.48/fs/statfs.c 2012-05-21 16:07:27.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/fs/statfs.c 2012-05-21 16:15:05.000000000 +0000
@@ -7,6 +7,8 @@
#include <linux/statfs.h>
#include <linux/security.h>
@@ -7336,9 +7287,9 @@ diff -NurpP --minimal linux-3.4.32/fs/statfs.c linux-3.4.32-vs2.3.3.9/fs/statfs.
return retval;
}
-diff -NurpP --minimal linux-3.4.32/fs/super.c linux-3.4.32-vs2.3.3.9/fs/super.c
---- linux-3.4.32/fs/super.c 2012-05-21 16:07:27.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/super.c 2012-05-21 16:59:38.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/super.c linux-3.4.48-vs2.3.3.9/fs/super.c
+--- linux-3.4.48/fs/super.c 2012-05-21 16:07:27.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/fs/super.c 2012-05-21 16:59:38.000000000 +0000
@@ -33,6 +33,8 @@
#include <linux/rculist_bl.h>
#include <linux/cleancache.h>
@@ -7362,9 +7313,9 @@ diff -NurpP --minimal linux-3.4.32/fs/super.c linux-3.4.32-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.32/fs/sysfs/mount.c linux-3.4.32-vs2.3.3.9/fs/sysfs/mount.c
---- linux-3.4.32/fs/sysfs/mount.c 2012-05-21 16:07:27.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/sysfs/mount.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/sysfs/mount.c linux-3.4.48-vs2.3.3.9/fs/sysfs/mount.c
+--- linux-3.4.48/fs/sysfs/mount.c 2012-05-21 16:07:27.000000000 +0000
++++ linux-3.4.48-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;
@@ -7374,9 +7325,9 @@ diff -NurpP --minimal linux-3.4.32/fs/sysfs/mount.c linux-3.4.32-vs2.3.3.9/fs/sy
sb->s_op = &sysfs_ops;
sb->s_time_gran = 1;
-diff -NurpP --minimal linux-3.4.32/fs/utimes.c linux-3.4.32-vs2.3.3.9/fs/utimes.c
---- linux-3.4.32/fs/utimes.c 2011-05-22 14:17:54.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/utimes.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/utimes.c linux-3.4.48-vs2.3.3.9/fs/utimes.c
+--- linux-3.4.48/fs/utimes.c 2011-05-22 14:17:54.000000000 +0000
++++ linux-3.4.48-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>
@@ -7406,9 +7357,9 @@ diff -NurpP --minimal linux-3.4.32/fs/utimes.c linux-3.4.32-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.32/fs/xattr.c linux-3.4.32-vs2.3.3.9/fs/xattr.c
---- linux-3.4.32/fs/xattr.c 2012-05-21 16:07:27.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/xattr.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/xattr.c linux-3.4.48-vs2.3.3.9/fs/xattr.c
+--- linux-3.4.48/fs/xattr.c 2012-05-21 16:07:27.000000000 +0000
++++ linux-3.4.48-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>
@@ -7426,9 +7377,9 @@ diff -NurpP --minimal linux-3.4.32/fs/xattr.c linux-3.4.32-vs2.3.3.9/fs/xattr.c
return (mask & MAY_WRITE) ? -EPERM : -ENODATA;
return 0;
}
-diff -NurpP --minimal linux-3.4.32/fs/xfs/xfs_dinode.h linux-3.4.32-vs2.3.3.9/fs/xfs/xfs_dinode.h
---- linux-3.4.32/fs/xfs/xfs_dinode.h 2011-10-24 16:45:31.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/xfs/xfs_dinode.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/xfs/xfs_dinode.h linux-3.4.48-vs2.3.3.9/fs/xfs/xfs_dinode.h
+--- linux-3.4.48/fs/xfs/xfs_dinode.h 2011-10-24 16:45:31.000000000 +0000
++++ linux-3.4.48-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 */
@@ -7469,9 +7420,9 @@ diff -NurpP --minimal linux-3.4.32/fs/xfs/xfs_dinode.h linux-3.4.32-vs2.3.3.9/fs
+#define XFS_DIVFLAG_COW 0x02
#endif /* __XFS_DINODE_H__ */
-diff -NurpP --minimal linux-3.4.32/fs/xfs/xfs_fs.h linux-3.4.32-vs2.3.3.9/fs/xfs/xfs_fs.h
---- linux-3.4.32/fs/xfs/xfs_fs.h 2011-10-24 16:45:31.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/xfs/xfs_fs.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/xfs/xfs_fs.h linux-3.4.48-vs2.3.3.9/fs/xfs/xfs_fs.h
+--- linux-3.4.48/fs/xfs/xfs_fs.h 2011-10-24 16:45:31.000000000 +0000
++++ linux-3.4.48-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 */
@@ -7492,9 +7443,9 @@ diff -NurpP --minimal linux-3.4.32/fs/xfs/xfs_fs.h linux-3.4.32-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.32/fs/xfs/xfs_ialloc.c linux-3.4.32-vs2.3.3.9/fs/xfs/xfs_ialloc.c
---- linux-3.4.32/fs/xfs/xfs_ialloc.c 2012-03-19 18:47:27.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/xfs/xfs_ialloc.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/xfs/xfs_ialloc.c linux-3.4.48-vs2.3.3.9/fs/xfs/xfs_ialloc.c
+--- linux-3.4.48/fs/xfs/xfs_ialloc.c 2012-03-19 18:47:27.000000000 +0000
++++ linux-3.4.48-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"
@@ -7503,9 +7454,9 @@ diff -NurpP --minimal linux-3.4.32/fs/xfs/xfs_ialloc.c linux-3.4.32-vs2.3.3.9/fs
/*
* Allocation group level functions.
*/
-diff -NurpP --minimal linux-3.4.32/fs/xfs/xfs_inode.c linux-3.4.32-vs2.3.3.9/fs/xfs/xfs_inode.c
---- linux-3.4.32/fs/xfs/xfs_inode.c 2012-05-21 16:07:27.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/xfs/xfs_inode.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/xfs/xfs_inode.c linux-3.4.48-vs2.3.3.9/fs/xfs/xfs_inode.c
+--- linux-3.4.48/fs/xfs/xfs_inode.c 2012-05-21 16:07:27.000000000 +0000
++++ linux-3.4.48-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;
}
@@ -7680,9 +7631,9 @@ diff -NurpP --minimal linux-3.4.32/fs/xfs/xfs_inode.c linux-3.4.32-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.32/fs/xfs/xfs_inode.h linux-3.4.32-vs2.3.3.9/fs/xfs/xfs_inode.h
---- linux-3.4.32/fs/xfs/xfs_inode.h 2012-05-21 16:07:27.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/xfs/xfs_inode.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/xfs/xfs_inode.h linux-3.4.48-vs2.3.3.9/fs/xfs/xfs_inode.h
+--- linux-3.4.48/fs/xfs/xfs_inode.h 2012-05-21 16:07:27.000000000 +0000
++++ linux-3.4.48-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 */
@@ -7703,9 +7654,9 @@ diff -NurpP --minimal linux-3.4.32/fs/xfs/xfs_inode.h linux-3.4.32-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.32/fs/xfs/xfs_ioctl.c linux-3.4.32-vs2.3.3.9/fs/xfs/xfs_ioctl.c
---- linux-3.4.32/fs/xfs/xfs_ioctl.c 2012-05-21 16:07:27.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/xfs/xfs_ioctl.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/xfs/xfs_ioctl.c linux-3.4.48-vs2.3.3.9/fs/xfs/xfs_ioctl.c
+--- linux-3.4.48/fs/xfs/xfs_ioctl.c 2012-05-21 16:07:27.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/fs/xfs/xfs_ioctl.c 2012-05-21 16:15:05.000000000 +0000
@@ -28,7 +28,7 @@
#include "xfs_bmap_btree.h"
#include "xfs_dinode.h"
@@ -7774,9 +7725,9 @@ diff -NurpP --minimal linux-3.4.32/fs/xfs/xfs_ioctl.c linux-3.4.32-vs2.3.3.9/fs/
return xfs_ioc_setxflags(ip, filp, arg);
case XFS_IOC_FSSETDM: {
-diff -NurpP --minimal linux-3.4.32/fs/xfs/xfs_ioctl.h linux-3.4.32-vs2.3.3.9/fs/xfs/xfs_ioctl.h
---- linux-3.4.32/fs/xfs/xfs_ioctl.h 2011-10-24 16:45:31.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/xfs/xfs_ioctl.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/xfs/xfs_ioctl.h linux-3.4.48-vs2.3.3.9/fs/xfs/xfs_ioctl.h
+--- linux-3.4.48/fs/xfs/xfs_ioctl.h 2011-10-24 16:45:31.000000000 +0000
++++ linux-3.4.48-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);
@@ -7790,9 +7741,9 @@ diff -NurpP --minimal linux-3.4.32/fs/xfs/xfs_ioctl.h linux-3.4.32-vs2.3.3.9/fs/
extern long
xfs_file_ioctl(
struct file *filp,
-diff -NurpP --minimal linux-3.4.32/fs/xfs/xfs_iops.c linux-3.4.32-vs2.3.3.9/fs/xfs/xfs_iops.c
---- linux-3.4.32/fs/xfs/xfs_iops.c 2012-05-21 16:07:27.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/xfs/xfs_iops.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/xfs/xfs_iops.c linux-3.4.48-vs2.3.3.9/fs/xfs/xfs_iops.c
+--- linux-3.4.48/fs/xfs/xfs_iops.c 2012-05-21 16:07:27.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/fs/xfs/xfs_iops.c 2012-05-21 16:15:05.000000000 +0000
@@ -30,6 +30,7 @@
#include "xfs_bmap_btree.h"
#include "xfs_dinode.h"
@@ -7868,9 +7819,9 @@ diff -NurpP --minimal linux-3.4.32/fs/xfs/xfs_iops.c linux-3.4.32-vs2.3.3.9/fs/x
switch (inode->i_mode & S_IFMT) {
case S_IFBLK:
-diff -NurpP --minimal linux-3.4.32/fs/xfs/xfs_itable.c linux-3.4.32-vs2.3.3.9/fs/xfs/xfs_itable.c
---- linux-3.4.32/fs/xfs/xfs_itable.c 2012-05-21 16:07:27.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/xfs/xfs_itable.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/xfs/xfs_itable.c linux-3.4.48-vs2.3.3.9/fs/xfs/xfs_itable.c
+--- linux-3.4.48/fs/xfs/xfs_itable.c 2012-05-21 16:07:27.000000000 +0000
++++ linux-3.4.48-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;
@@ -7879,9 +7830,9 @@ diff -NurpP --minimal linux-3.4.32/fs/xfs/xfs_itable.c linux-3.4.32-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.32/fs/xfs/xfs_linux.h linux-3.4.32-vs2.3.3.9/fs/xfs/xfs_linux.h
---- linux-3.4.32/fs/xfs/xfs_linux.h 2011-10-24 16:45:31.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/xfs/xfs_linux.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/xfs/xfs_linux.h linux-3.4.48-vs2.3.3.9/fs/xfs/xfs_linux.h
+--- linux-3.4.48/fs/xfs/xfs_linux.h 2011-10-24 16:45:31.000000000 +0000
++++ linux-3.4.48-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())
@@ -7890,9 +7841,9 @@ diff -NurpP --minimal linux-3.4.32/fs/xfs/xfs_linux.h linux-3.4.32-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.32/fs/xfs/xfs_log_recover.c linux-3.4.32-vs2.3.3.9/fs/xfs/xfs_log_recover.c
---- linux-3.4.32/fs/xfs/xfs_log_recover.c 2013-02-19 13:55:53.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/xfs/xfs_log_recover.c 2012-11-18 23:52:29.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/xfs/xfs_log_recover.c linux-3.4.48-vs2.3.3.9/fs/xfs/xfs_log_recover.c
+--- linux-3.4.48/fs/xfs/xfs_log_recover.c 2013-06-13 08:59:35.000000000 +0000
++++ linux-3.4.48-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(
}
@@ -7903,9 +7854,9 @@ diff -NurpP --minimal linux-3.4.32/fs/xfs/xfs_log_recover.c linux-3.4.32-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.32/fs/xfs/xfs_mount.h linux-3.4.32-vs2.3.3.9/fs/xfs/xfs_mount.h
---- linux-3.4.32/fs/xfs/xfs_mount.h 2012-05-21 16:07:28.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/xfs/xfs_mount.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/xfs/xfs_mount.h linux-3.4.48-vs2.3.3.9/fs/xfs/xfs_mount.h
+--- linux-3.4.48/fs/xfs/xfs_mount.h 2012-05-21 16:07:28.000000000 +0000
++++ linux-3.4.48-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 */
@@ -7914,9 +7865,9 @@ diff -NurpP --minimal linux-3.4.32/fs/xfs/xfs_mount.h linux-3.4.32-vs2.3.3.9/fs/
/*
* Default minimum read and write sizes.
-diff -NurpP --minimal linux-3.4.32/fs/xfs/xfs_super.c linux-3.4.32-vs2.3.3.9/fs/xfs/xfs_super.c
---- linux-3.4.32/fs/xfs/xfs_super.c 2012-05-21 16:07:28.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/xfs/xfs_super.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/xfs/xfs_super.c linux-3.4.48-vs2.3.3.9/fs/xfs/xfs_super.c
+--- linux-3.4.48/fs/xfs/xfs_super.c 2012-05-21 16:07:28.000000000 +0000
++++ linux-3.4.48-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 */
@@ -7989,9 +7940,9 @@ diff -NurpP --minimal linux-3.4.32/fs/xfs/xfs_super.c linux-3.4.32-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.32/fs/xfs/xfs_vnodeops.c linux-3.4.32-vs2.3.3.9/fs/xfs/xfs_vnodeops.c
---- linux-3.4.32/fs/xfs/xfs_vnodeops.c 2012-05-21 16:07:28.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/fs/xfs/xfs_vnodeops.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/fs/xfs/xfs_vnodeops.c linux-3.4.48-vs2.3.3.9/fs/xfs/xfs_vnodeops.c
+--- linux-3.4.48/fs/xfs/xfs_vnodeops.c 2012-05-21 16:07:28.000000000 +0000
++++ linux-3.4.48-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;
}
@@ -8070,9 +8021,9 @@ diff -NurpP --minimal linux-3.4.32/fs/xfs/xfs_vnodeops.c linux-3.4.32-vs2.3.3.9/
int
xfs_readlink(
xfs_inode_t *ip,
-diff -NurpP --minimal linux-3.4.32/include/linux/Kbuild linux-3.4.32-vs2.3.3.9/include/linux/Kbuild
---- linux-3.4.32/include/linux/Kbuild 2013-02-19 13:55:53.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/Kbuild 2012-07-24 09:52:30.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/Kbuild linux-3.4.48-vs2.3.3.9/include/linux/Kbuild
+--- linux-3.4.48/include/linux/Kbuild 2013-06-13 08:59:35.000000000 +0000
++++ linux-3.4.48-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/
@@ -8081,9 +8032,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/Kbuild linux-3.4.32-vs2.3.3.9/i
header-y += wimax/
objhdr-y += version.h
-diff -NurpP --minimal linux-3.4.32/include/linux/capability.h linux-3.4.32-vs2.3.3.9/include/linux/capability.h
---- linux-3.4.32/include/linux/capability.h 2012-03-19 18:47:27.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/capability.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/capability.h linux-3.4.48-vs2.3.3.9/include/linux/capability.h
+--- linux-3.4.48/include/linux/capability.h 2012-03-19 18:47:27.000000000 +0000
++++ linux-3.4.48-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 */
@@ -8106,9 +8057,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/capability.h linux-3.4.32-vs2.3
/*
* Bit location of each capability (used by user-space library and kernel)
-diff -NurpP --minimal linux-3.4.32/include/linux/cred.h linux-3.4.32-vs2.3.3.9/include/linux/cred.h
---- linux-3.4.32/include/linux/cred.h 2012-03-19 18:47:27.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/cred.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/cred.h linux-3.4.48-vs2.3.3.9/include/linux/cred.h
+--- linux-3.4.48/include/linux/cred.h 2012-03-19 18:47:27.000000000 +0000
++++ linux-3.4.48-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 *);
@@ -8149,18 +8100,18 @@ diff -NurpP --minimal linux-3.4.32/include/linux/cred.h linux-3.4.32-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.32/include/linux/devpts_fs.h linux-3.4.32-vs2.3.3.9/include/linux/devpts_fs.h
---- linux-3.4.32/include/linux/devpts_fs.h 2008-12-24 23:26:37.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/devpts_fs.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/devpts_fs.h linux-3.4.48-vs2.3.3.9/include/linux/devpts_fs.h
+--- linux-3.4.48/include/linux/devpts_fs.h 2008-12-24 23:26:37.000000000 +0000
++++ linux-3.4.48-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.32/include/linux/fs.h linux-3.4.32-vs2.3.3.9/include/linux/fs.h
---- linux-3.4.32/include/linux/fs.h 2012-05-21 16:07:29.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/fs.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/fs.h linux-3.4.48-vs2.3.3.9/include/linux/fs.h
+--- linux-3.4.48/include/linux/fs.h 2012-05-21 16:07:29.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/include/linux/fs.h 2012-05-21 16:15:05.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 */
@@ -8338,9 +8289,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/fs.h linux-3.4.32-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.32/include/linux/gfs2_ondisk.h linux-3.4.32-vs2.3.3.9/include/linux/gfs2_ondisk.h
---- linux-3.4.32/include/linux/gfs2_ondisk.h 2012-05-21 16:07:29.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/gfs2_ondisk.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/gfs2_ondisk.h linux-3.4.48-vs2.3.3.9/include/linux/gfs2_ondisk.h
+--- linux-3.4.48/include/linux/gfs2_ondisk.h 2012-05-21 16:07:29.000000000 +0000
++++ linux-3.4.48-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,
@@ -8361,9 +8312,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/gfs2_ondisk.h linux-3.4.32-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.32/include/linux/if_tun.h linux-3.4.32-vs2.3.3.9/include/linux/if_tun.h
---- linux-3.4.32/include/linux/if_tun.h 2010-08-02 14:52:54.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/if_tun.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/if_tun.h linux-3.4.48-vs2.3.3.9/include/linux/if_tun.h
+--- linux-3.4.48/include/linux/if_tun.h 2010-08-02 14:52:54.000000000 +0000
++++ linux-3.4.48-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)
@@ -8372,9 +8323,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/if_tun.h linux-3.4.32-vs2.3.3.9
/* TUNSETIFF ifr flags */
#define IFF_TUN 0x0001
-diff -NurpP --minimal linux-3.4.32/include/linux/init_task.h linux-3.4.32-vs2.3.3.9/include/linux/init_task.h
---- linux-3.4.32/include/linux/init_task.h 2013-02-19 13:55:53.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/init_task.h 2012-10-22 13:09:53.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/init_task.h linux-3.4.48-vs2.3.3.9/include/linux/init_task.h
+--- linux-3.4.48/include/linux/init_task.h 2013-06-13 08:59:35.000000000 +0000
++++ linux-3.4.48-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) \
@@ -8386,9 +8337,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/init_task.h linux-3.4.32-vs2.3.
}
-diff -NurpP --minimal linux-3.4.32/include/linux/ipc.h linux-3.4.32-vs2.3.3.9/include/linux/ipc.h
---- linux-3.4.32/include/linux/ipc.h 2012-03-19 18:47:28.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/ipc.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/ipc.h linux-3.4.48-vs2.3.3.9/include/linux/ipc.h
+--- linux-3.4.48/include/linux/ipc.h 2012-03-19 18:47:28.000000000 +0000
++++ linux-3.4.48-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;
@@ -8397,9 +8348,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/ipc.h linux-3.4.32-vs2.3.3.9/in
uid_t cuid;
gid_t cgid;
umode_t mode;
-diff -NurpP --minimal linux-3.4.32/include/linux/ipc_namespace.h linux-3.4.32-vs2.3.3.9/include/linux/ipc_namespace.h
---- linux-3.4.32/include/linux/ipc_namespace.h 2011-10-24 16:45:32.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/ipc_namespace.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/ipc_namespace.h linux-3.4.48-vs2.3.3.9/include/linux/ipc_namespace.h
+--- linux-3.4.48/include/linux/ipc_namespace.h 2011-10-24 16:45:32.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/include/linux/ipc_namespace.h 2013-06-13 09:46:39.000000000 +0000
@@ -101,7 +101,8 @@ static inline int mq_init_ns(struct ipc_
#if defined(CONFIG_IPC_NS)
@@ -8426,9 +8377,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/ipc_namespace.h linux-3.4.32-vs
}
static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns)
-diff -NurpP --minimal linux-3.4.32/include/linux/loop.h linux-3.4.32-vs2.3.3.9/include/linux/loop.h
---- linux-3.4.32/include/linux/loop.h 2012-01-09 15:14:58.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/loop.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/loop.h linux-3.4.48-vs2.3.3.9/include/linux/loop.h
+--- linux-3.4.48/include/linux/loop.h 2012-01-09 15:14:58.000000000 +0000
++++ linux-3.4.48-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];
@@ -8437,9 +8388,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/loop.h linux-3.4.32-vs2.3.3.9/i
int (*ioctl)(struct loop_device *, int cmd,
unsigned long arg);
-diff -NurpP --minimal linux-3.4.32/include/linux/magic.h linux-3.4.32-vs2.3.3.9/include/linux/magic.h
---- linux-3.4.32/include/linux/magic.h 2012-05-21 16:07:31.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/magic.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/magic.h linux-3.4.48-vs2.3.3.9/include/linux/magic.h
+--- linux-3.4.48/include/linux/magic.h 2012-05-21 16:07:31.000000000 +0000
++++ linux-3.4.48-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
@@ -8449,9 +8400,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/magic.h linux-3.4.32-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.32/include/linux/major.h linux-3.4.32-vs2.3.3.9/include/linux/major.h
---- linux-3.4.32/include/linux/major.h 2009-09-10 13:26:25.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/major.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/major.h linux-3.4.48-vs2.3.3.9/include/linux/major.h
+--- linux-3.4.48/include/linux/major.h 2009-09-10 13:26:25.000000000 +0000
++++ linux-3.4.48-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
@@ -8460,9 +8411,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/major.h linux-3.4.32-vs2.3.3.9/
#define TTYAUX_MAJOR 5
#define LP_MAJOR 6
#define VCS_MAJOR 7
-diff -NurpP --minimal linux-3.4.32/include/linux/memcontrol.h linux-3.4.32-vs2.3.3.9/include/linux/memcontrol.h
---- linux-3.4.32/include/linux/memcontrol.h 2012-05-21 16:07:31.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/memcontrol.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/memcontrol.h linux-3.4.48-vs2.3.3.9/include/linux/memcontrol.h
+--- linux-3.4.48/include/linux/memcontrol.h 2012-05-21 16:07:31.000000000 +0000
++++ linux-3.4.48-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);
@@ -8477,9 +8428,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/memcontrol.h linux-3.4.32-vs2.3
static inline
int mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *cgroup)
{
-diff -NurpP --minimal linux-3.4.32/include/linux/mm_types.h linux-3.4.32-vs2.3.3.9/include/linux/mm_types.h
---- linux-3.4.32/include/linux/mm_types.h 2013-02-19 13:55:53.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/mm_types.h 2012-07-17 22:29:43.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/mm_types.h linux-3.4.48-vs2.3.3.9/include/linux/mm_types.h
+--- linux-3.4.48/include/linux/mm_types.h 2013-06-13 08:59:36.000000000 +0000
++++ linux-3.4.48-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 */
@@ -8488,9 +8439,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/mm_types.h linux-3.4.32-vs2.3.3
/* Swap token stuff */
/*
-diff -NurpP --minimal linux-3.4.32/include/linux/mmzone.h linux-3.4.32-vs2.3.3.9/include/linux/mmzone.h
---- linux-3.4.32/include/linux/mmzone.h 2013-02-19 13:55:57.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/mmzone.h 2012-07-17 22:29:43.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/mmzone.h linux-3.4.48-vs2.3.3.9/include/linux/mmzone.h
+--- linux-3.4.48/include/linux/mmzone.h 2013-06-13 08:59:36.000000000 +0000
++++ linux-3.4.48-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;\
})
@@ -8505,9 +8456,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/mmzone.h linux-3.4.32-vs2.3.3.9
#include <linux/memory_hotplug.h>
extern struct mutex zonelists_mutex;
-diff -NurpP --minimal linux-3.4.32/include/linux/mount.h linux-3.4.32-vs2.3.3.9/include/linux/mount.h
---- linux-3.4.32/include/linux/mount.h 2012-03-19 18:47:28.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/mount.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/mount.h linux-3.4.48-vs2.3.3.9/include/linux/mount.h
+--- linux-3.4.48/include/linux/mount.h 2012-03-19 18:47:28.000000000 +0000
++++ linux-3.4.48-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
@@ -8518,9 +8469,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/mount.h linux-3.4.32-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.32/include/linux/net.h linux-3.4.32-vs2.3.3.9/include/linux/net.h
---- linux-3.4.32/include/linux/net.h 2013-02-19 13:55:59.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/net.h 2012-09-01 08:51:18.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/net.h linux-3.4.48-vs2.3.3.9/include/linux/net.h
+--- linux-3.4.48/include/linux/net.h 2013-06-13 08:59:36.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/include/linux/net.h 2012-09-01 08:51:18.000000000 +0000
@@ -73,6 +73,7 @@ struct net;
#define SOCK_PASSCRED 3
#define SOCK_PASSSEC 4
@@ -8529,9 +8480,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/net.h linux-3.4.32-vs2.3.3.9/in
#ifndef ARCH_HAS_SOCKET_TYPES
/**
-diff -NurpP --minimal linux-3.4.32/include/linux/netdevice.h linux-3.4.32-vs2.3.3.9/include/linux/netdevice.h
---- linux-3.4.32/include/linux/netdevice.h 2013-02-19 13:56:02.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/netdevice.h 2012-10-22 13:09:53.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/netdevice.h linux-3.4.48-vs2.3.3.9/include/linux/netdevice.h
+--- linux-3.4.48/include/linux/netdevice.h 2013-06-13 08:59:36.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/include/linux/netdevice.h 2013-06-13 09:46:39.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);
@@ -8540,9 +8491,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/netdevice.h linux-3.4.32-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.32/include/linux/nfs_mount.h linux-3.4.32-vs2.3.3.9/include/linux/nfs_mount.h
---- linux-3.4.32/include/linux/nfs_mount.h 2011-01-05 20:50:31.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/nfs_mount.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/nfs_mount.h linux-3.4.48-vs2.3.3.9/include/linux/nfs_mount.h
+--- linux-3.4.48/include/linux/nfs_mount.h 2011-01-05 20:50:31.000000000 +0000
++++ linux-3.4.48-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 */
@@ -8553,9 +8504,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/nfs_mount.h linux-3.4.32-vs2.3.
/* The following are for internal use only */
#define NFS_MOUNT_LOOKUP_CACHE_NONEG 0x10000
-diff -NurpP --minimal linux-3.4.32/include/linux/nsproxy.h linux-3.4.32-vs2.3.3.9/include/linux/nsproxy.h
---- linux-3.4.32/include/linux/nsproxy.h 2011-10-24 16:45:32.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/nsproxy.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/nsproxy.h linux-3.4.48-vs2.3.3.9/include/linux/nsproxy.h
+--- linux-3.4.48/include/linux/nsproxy.h 2011-10-24 16:45:32.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/include/linux/nsproxy.h 2012-05-21 16:15:05.000000000 +0000
@@ -3,6 +3,7 @@
#include <linux/spinlock.h>
@@ -8605,9 +8556,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/nsproxy.h linux-3.4.32-vs2.3.3.
}
#endif
-diff -NurpP --minimal linux-3.4.32/include/linux/pid.h linux-3.4.32-vs2.3.3.9/include/linux/pid.h
---- linux-3.4.32/include/linux/pid.h 2011-07-22 09:18:11.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/pid.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/pid.h linux-3.4.48-vs2.3.3.9/include/linux/pid.h
+--- linux-3.4.48/include/linux/pid.h 2011-07-22 09:18:11.000000000 +0000
++++ linux-3.4.48-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,
@@ -8626,9 +8577,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/pid.h linux-3.4.32-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.32/include/linux/proc_fs.h linux-3.4.32-vs2.3.3.9/include/linux/proc_fs.h
---- linux-3.4.32/include/linux/proc_fs.h 2012-03-19 18:47:28.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/proc_fs.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/proc_fs.h linux-3.4.48-vs2.3.3.9/include/linux/proc_fs.h
+--- linux-3.4.48/include/linux/proc_fs.h 2012-03-19 18:47:28.000000000 +0000
++++ linux-3.4.48-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;
@@ -8664,9 +8615,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/proc_fs.h linux-3.4.32-vs2.3.3.
int fd;
union proc_op op;
struct proc_dir_entry *pde;
-diff -NurpP --minimal linux-3.4.32/include/linux/quotaops.h linux-3.4.32-vs2.3.3.9/include/linux/quotaops.h
---- linux-3.4.32/include/linux/quotaops.h 2012-01-09 15:14:58.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/quotaops.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/quotaops.h linux-3.4.48-vs2.3.3.9/include/linux/quotaops.h
+--- linux-3.4.48/include/linux/quotaops.h 2012-01-09 15:14:58.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/include/linux/quotaops.h 2012-05-21 16:15:05.000000000 +0000
@@ -8,6 +8,7 @@
#define _LINUX_QUOTAOPS_
@@ -8708,9 +8659,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/quotaops.h linux-3.4.32-vs2.3.3
}
static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
-diff -NurpP --minimal linux-3.4.32/include/linux/reboot.h linux-3.4.32-vs2.3.3.9/include/linux/reboot.h
---- linux-3.4.32/include/linux/reboot.h 2011-10-24 16:45:32.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/reboot.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/reboot.h linux-3.4.48-vs2.3.3.9/include/linux/reboot.h
+--- linux-3.4.48/include/linux/reboot.h 2011-10-24 16:45:32.000000000 +0000
++++ linux-3.4.48-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
@@ -8719,9 +8670,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/reboot.h linux-3.4.32-vs2.3.3.9
#ifdef __KERNEL__
-diff -NurpP --minimal linux-3.4.32/include/linux/sched.h linux-3.4.32-vs2.3.3.9/include/linux/sched.h
---- linux-3.4.32/include/linux/sched.h 2013-02-19 13:56:07.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/sched.h 2013-02-11 23:37:30.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/sched.h linux-3.4.48-vs2.3.3.9/include/linux/sched.h
+--- linux-3.4.48/include/linux/sched.h 2013-06-13 08:59:36.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/include/linux/sched.h 2013-02-11 23:37:30.000000000 +0000
@@ -1455,6 +1455,14 @@ struct task_struct {
#endif
seccomp_t seccomp;
@@ -8768,9 +8719,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/sched.h linux-3.4.32-vs2.3.3.9/
}
-diff -NurpP --minimal linux-3.4.32/include/linux/shmem_fs.h linux-3.4.32-vs2.3.3.9/include/linux/shmem_fs.h
---- linux-3.4.32/include/linux/shmem_fs.h 2012-03-19 18:47:29.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/shmem_fs.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/shmem_fs.h linux-3.4.48-vs2.3.3.9/include/linux/shmem_fs.h
+--- linux-3.4.48/include/linux/shmem_fs.h 2012-03-19 18:47:29.000000000 +0000
++++ linux-3.4.48-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 */
@@ -8781,9 +8732,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/shmem_fs.h linux-3.4.32-vs2.3.3
struct shmem_inode_info {
spinlock_t lock;
unsigned long flags;
-diff -NurpP --minimal linux-3.4.32/include/linux/stat.h linux-3.4.32-vs2.3.3.9/include/linux/stat.h
---- linux-3.4.32/include/linux/stat.h 2008-12-24 23:26:37.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/stat.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/stat.h linux-3.4.48-vs2.3.3.9/include/linux/stat.h
+--- linux-3.4.48/include/linux/stat.h 2008-12-24 23:26:37.000000000 +0000
++++ linux-3.4.48-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;
@@ -8792,9 +8743,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/stat.h linux-3.4.32-vs2.3.3.9/i
dev_t rdev;
loff_t size;
struct timespec atime;
-diff -NurpP --minimal linux-3.4.32/include/linux/sunrpc/auth.h linux-3.4.32-vs2.3.3.9/include/linux/sunrpc/auth.h
---- linux-3.4.32/include/linux/sunrpc/auth.h 2012-05-21 16:07:32.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/sunrpc/auth.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/sunrpc/auth.h linux-3.4.48-vs2.3.3.9/include/linux/sunrpc/auth.h
+--- linux-3.4.48/include/linux/sunrpc/auth.h 2012-05-21 16:07:32.000000000 +0000
++++ linux-3.4.48-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;
@@ -8803,9 +8754,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/sunrpc/auth.h linux-3.4.32-vs2.
struct group_info *group_info;
const char *principal;
unsigned char machine_cred : 1;
-diff -NurpP --minimal linux-3.4.32/include/linux/sunrpc/clnt.h linux-3.4.32-vs2.3.3.9/include/linux/sunrpc/clnt.h
---- linux-3.4.32/include/linux/sunrpc/clnt.h 2012-05-21 16:07:32.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/sunrpc/clnt.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/sunrpc/clnt.h linux-3.4.48-vs2.3.3.9/include/linux/sunrpc/clnt.h
+--- linux-3.4.48/include/linux/sunrpc/clnt.h 2012-05-21 16:07:32.000000000 +0000
++++ linux-3.4.48-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 */
@@ -8816,9 +8767,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/sunrpc/clnt.h linux-3.4.32-vs2.
struct rpc_rtt * cl_rtt; /* RTO estimator data */
const struct rpc_timeout *cl_timeout; /* Timeout strategy */
-diff -NurpP --minimal linux-3.4.32/include/linux/sysctl.h linux-3.4.32-vs2.3.3.9/include/linux/sysctl.h
---- linux-3.4.32/include/linux/sysctl.h 2012-05-21 16:07:32.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/sysctl.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/sysctl.h linux-3.4.48-vs2.3.3.9/include/linux/sysctl.h
+--- linux-3.4.48/include/linux/sysctl.h 2012-05-21 16:07:32.000000000 +0000
++++ linux-3.4.48-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) */
@@ -8835,9 +8786,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/sysctl.h linux-3.4.32-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.32/include/linux/sysfs.h linux-3.4.32-vs2.3.3.9/include/linux/sysfs.h
---- linux-3.4.32/include/linux/sysfs.h 2012-03-19 18:47:29.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/sysfs.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/sysfs.h linux-3.4.48-vs2.3.3.9/include/linux/sysfs.h
+--- linux-3.4.48/include/linux/sysfs.h 2012-03-19 18:47:29.000000000 +0000
++++ linux-3.4.48-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>
@@ -8847,9 +8798,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/sysfs.h linux-3.4.32-vs2.3.3.9/
struct kobject;
struct module;
enum kobj_ns_type;
-diff -NurpP --minimal linux-3.4.32/include/linux/time.h linux-3.4.32-vs2.3.3.9/include/linux/time.h
---- linux-3.4.32/include/linux/time.h 2013-02-19 13:56:07.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/time.h 2012-10-22 13:09:53.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/time.h linux-3.4.48-vs2.3.3.9/include/linux/time.h
+--- linux-3.4.48/include/linux/time.h 2013-06-13 08:59:36.000000000 +0000
++++ linux-3.4.48-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;
}
@@ -8859,9 +8810,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/time.h linux-3.4.32-vs2.3.3.9/i
#endif /* __KERNEL__ */
/*
-diff -NurpP --minimal linux-3.4.32/include/linux/types.h linux-3.4.32-vs2.3.3.9/include/linux/types.h
---- linux-3.4.32/include/linux/types.h 2012-05-21 16:07:32.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/types.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/types.h linux-3.4.48-vs2.3.3.9/include/linux/types.h
+--- linux-3.4.48/include/linux/types.h 2012-05-21 16:07:32.000000000 +0000
++++ linux-3.4.48-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;
@@ -8872,9 +8823,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/types.h linux-3.4.32-vs2.3.3.9/
typedef unsigned long uintptr_t;
-diff -NurpP --minimal linux-3.4.32/include/linux/utsname.h linux-3.4.32-vs2.3.3.9/include/linux/utsname.h
---- linux-3.4.32/include/linux/utsname.h 2012-01-09 15:14:59.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/utsname.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/utsname.h linux-3.4.48-vs2.3.3.9/include/linux/utsname.h
+--- linux-3.4.48/include/linux/utsname.h 2012-01-09 15:14:59.000000000 +0000
++++ linux-3.4.48-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
}
@@ -8901,9 +8852,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/utsname.h linux-3.4.32-vs2.3.3.
}
#endif
-diff -NurpP --minimal linux-3.4.32/include/linux/vroot.h linux-3.4.32-vs2.3.3.9/include/linux/vroot.h
---- linux-3.4.32/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vroot.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vroot.h linux-3.4.48-vs2.3.3.9/include/linux/vroot.h
+--- linux-3.4.48/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/include/linux/vroot.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,51 @@
+
+/*
@@ -8956,9 +8907,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vroot.h linux-3.4.32-vs2.3.3.9/
+#define VROOT_CLR_DEV 0x5601
+
+#endif /* _LINUX_VROOT_H */
-diff -NurpP --minimal linux-3.4.32/include/linux/vs_base.h linux-3.4.32-vs2.3.3.9/include/linux/vs_base.h
---- linux-3.4.32/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vs_base.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vs_base.h linux-3.4.48-vs2.3.3.9/include/linux/vs_base.h
+--- linux-3.4.48/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -8970,9 +8921,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vs_base.h linux-3.4.32-vs2.3.3.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.4.32/include/linux/vs_context.h linux-3.4.32-vs2.3.3.9/include/linux/vs_context.h
---- linux-3.4.32/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vs_context.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vs_context.h linux-3.4.48-vs2.3.3.9/include/linux/vs_context.h
+--- linux-3.4.48/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -9216,9 +9167,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vs_context.h linux-3.4.32-vs2.3
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.4.32/include/linux/vs_cowbl.h linux-3.4.32-vs2.3.3.9/include/linux/vs_cowbl.h
---- linux-3.4.32/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vs_cowbl.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vs_cowbl.h linux-3.4.48-vs2.3.3.9/include/linux/vs_cowbl.h
+--- linux-3.4.48/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -9268,9 +9219,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vs_cowbl.h linux-3.4.32-vs2.3.3
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.4.32/include/linux/vs_cvirt.h linux-3.4.32-vs2.3.3.9/include/linux/vs_cvirt.h
---- linux-3.4.32/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vs_cvirt.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vs_cvirt.h linux-3.4.48-vs2.3.3.9/include/linux/vs_cvirt.h
+--- linux-3.4.48/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -9322,9 +9273,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vs_cvirt.h linux-3.4.32-vs2.3.3
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.4.32/include/linux/vs_device.h linux-3.4.32-vs2.3.3.9/include/linux/vs_device.h
---- linux-3.4.32/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vs_device.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vs_device.h linux-3.4.48-vs2.3.3.9/include/linux/vs_device.h
+--- linux-3.4.48/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -9371,9 +9322,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vs_device.h linux-3.4.32-vs2.3.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.4.32/include/linux/vs_dlimit.h linux-3.4.32-vs2.3.3.9/include/linux/vs_dlimit.h
---- linux-3.4.32/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vs_dlimit.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vs_dlimit.h linux-3.4.48-vs2.3.3.9/include/linux/vs_dlimit.h
+--- linux-3.4.48/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -9590,9 +9541,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vs_dlimit.h linux-3.4.32-vs2.3.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.4.32/include/linux/vs_inet.h linux-3.4.32-vs2.3.3.9/include/linux/vs_inet.h
---- linux-3.4.32/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vs_inet.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vs_inet.h linux-3.4.48-vs2.3.3.9/include/linux/vs_inet.h
+--- linux-3.4.48/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -9947,9 +9898,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vs_inet.h linux-3.4.32-vs2.3.3.
+#else
+// #warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.4.32/include/linux/vs_inet6.h linux-3.4.32-vs2.3.3.9/include/linux/vs_inet6.h
---- linux-3.4.32/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vs_inet6.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vs_inet6.h linux-3.4.48-vs2.3.3.9/include/linux/vs_inet6.h
+--- linux-3.4.48/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -10197,9 +10148,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vs_inet6.h linux-3.4.32-vs2.3.3
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.4.32/include/linux/vs_limit.h linux-3.4.32-vs2.3.3.9/include/linux/vs_limit.h
---- linux-3.4.32/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vs_limit.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vs_limit.h linux-3.4.48-vs2.3.3.9/include/linux/vs_limit.h
+--- linux-3.4.48/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -10341,9 +10292,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vs_limit.h linux-3.4.32-vs2.3.3
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.4.32/include/linux/vs_network.h linux-3.4.32-vs2.3.3.9/include/linux/vs_network.h
---- linux-3.4.32/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vs_network.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vs_network.h linux-3.4.48-vs2.3.3.9/include/linux/vs_network.h
+--- linux-3.4.48/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -10514,9 +10465,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vs_network.h linux-3.4.32-vs2.3
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.4.32/include/linux/vs_pid.h linux-3.4.32-vs2.3.3.9/include/linux/vs_pid.h
---- linux-3.4.32/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vs_pid.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vs_pid.h linux-3.4.48-vs2.3.3.9/include/linux/vs_pid.h
+--- linux-3.4.48/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -10568,9 +10519,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vs_pid.h linux-3.4.32-vs2.3.3.9
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.4.32/include/linux/vs_sched.h linux-3.4.32-vs2.3.3.9/include/linux/vs_sched.h
---- linux-3.4.32/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vs_sched.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vs_sched.h linux-3.4.48-vs2.3.3.9/include/linux/vs_sched.h
+--- linux-3.4.48/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -10612,9 +10563,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vs_sched.h linux-3.4.32-vs2.3.3
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.4.32/include/linux/vs_socket.h linux-3.4.32-vs2.3.3.9/include/linux/vs_socket.h
---- linux-3.4.32/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vs_socket.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vs_socket.h linux-3.4.48-vs2.3.3.9/include/linux/vs_socket.h
+--- linux-3.4.48/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -10683,9 +10634,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vs_socket.h linux-3.4.32-vs2.3.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.4.32/include/linux/vs_tag.h linux-3.4.32-vs2.3.3.9/include/linux/vs_tag.h
---- linux-3.4.32/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vs_tag.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vs_tag.h linux-3.4.48-vs2.3.3.9/include/linux/vs_tag.h
+--- linux-3.4.48/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -10734,9 +10685,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vs_tag.h linux-3.4.32-vs2.3.3.9
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.4.32/include/linux/vs_time.h linux-3.4.32-vs2.3.3.9/include/linux/vs_time.h
---- linux-3.4.32/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vs_time.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vs_time.h linux-3.4.48-vs2.3.3.9/include/linux/vs_time.h
+--- linux-3.4.48/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -10757,9 +10708,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vs_time.h linux-3.4.32-vs2.3.3.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.4.32/include/linux/vserver/Kbuild linux-3.4.32-vs2.3.3.9/include/linux/vserver/Kbuild
---- linux-3.4.32/include/linux/vserver/Kbuild 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vserver/Kbuild 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vserver/Kbuild linux-3.4.48-vs2.3.3.9/include/linux/vserver/Kbuild
+--- linux-3.4.48/include/linux/vserver/Kbuild 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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 \
@@ -10769,9 +10720,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vserver/Kbuild linux-3.4.32-vs2
+
+header-y += switch.h network.h monitor.h inode.h device.h
+
-diff -NurpP --minimal linux-3.4.32/include/linux/vserver/base.h linux-3.4.32-vs2.3.3.9/include/linux/vserver/base.h
---- linux-3.4.32/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vserver/base.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vserver/base.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/base.h
+--- linux-3.4.48/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -10951,9 +10902,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vserver/base.h linux-3.4.32-vs2
+#define nx_info_state(n, m) (__nx_state(n) & (m))
+
+#endif
-diff -NurpP --minimal linux-3.4.32/include/linux/vserver/cacct.h linux-3.4.32-vs2.3.3.9/include/linux/vserver/cacct.h
---- linux-3.4.32/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vserver/cacct.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vserver/cacct.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/cacct.h
+--- linux-3.4.48/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -10970,9 +10921,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vserver/cacct.h linux-3.4.32-vs
+};
+
+#endif /* _VX_CACCT_H */
-diff -NurpP --minimal linux-3.4.32/include/linux/vserver/cacct_cmd.h linux-3.4.32-vs2.3.3.9/include/linux/vserver/cacct_cmd.h
---- linux-3.4.32/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vserver/cacct_cmd.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vserver/cacct_cmd.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/cacct_cmd.h
+--- linux-3.4.48/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -10997,9 +10948,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vserver/cacct_cmd.h linux-3.4.3
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CACCT_CMD_H */
-diff -NurpP --minimal linux-3.4.32/include/linux/vserver/cacct_def.h linux-3.4.32-vs2.3.3.9/include/linux/vserver/cacct_def.h
---- linux-3.4.32/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vserver/cacct_def.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vserver/cacct_def.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/cacct_def.h
+--- linux-3.4.48/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -11044,9 +10995,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vserver/cacct_def.h linux-3.4.3
+#endif
+
+#endif /* _VX_CACCT_DEF_H */
-diff -NurpP --minimal linux-3.4.32/include/linux/vserver/cacct_int.h linux-3.4.32-vs2.3.3.9/include/linux/vserver/cacct_int.h
---- linux-3.4.32/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vserver/cacct_int.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vserver/cacct_int.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/cacct_int.h
+--- linux-3.4.48/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -11069,9 +11020,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vserver/cacct_int.h linux-3.4.3
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CACCT_INT_H */
-diff -NurpP --minimal linux-3.4.32/include/linux/vserver/check.h linux-3.4.32-vs2.3.3.9/include/linux/vserver/check.h
---- linux-3.4.32/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vserver/check.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vserver/check.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/check.h
+--- linux-3.4.48/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -11162,9 +11113,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vserver/check.h linux-3.4.32-vs
+#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1)
+
+#endif
-diff -NurpP --minimal linux-3.4.32/include/linux/vserver/context.h linux-3.4.32-vs2.3.3.9/include/linux/vserver/context.h
---- linux-3.4.32/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vserver/context.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vserver/context.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/context.h
+--- linux-3.4.48/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -11354,9 +11305,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vserver/context.h linux-3.4.32-
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_H */
-diff -NurpP --minimal linux-3.4.32/include/linux/vserver/context_cmd.h linux-3.4.32-vs2.3.3.9/include/linux/vserver/context_cmd.h
---- linux-3.4.32/include/linux/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vserver/context_cmd.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vserver/context_cmd.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/context_cmd.h
+--- linux-3.4.48/include/linux/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -11520,9 +11471,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vserver/context_cmd.h linux-3.4
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-3.4.32/include/linux/vserver/cvirt.h linux-3.4.32-vs2.3.3.9/include/linux/vserver/cvirt.h
---- linux-3.4.32/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vserver/cvirt.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vserver/cvirt.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/cvirt.h
+--- linux-3.4.48/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -11546,9 +11497,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vserver/cvirt.h linux-3.4.32-vs
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CVIRT_H */
-diff -NurpP --minimal linux-3.4.32/include/linux/vserver/cvirt_cmd.h linux-3.4.32-vs2.3.3.9/include/linux/vserver/cvirt_cmd.h
---- linux-3.4.32/include/linux/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vserver/cvirt_cmd.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vserver/cvirt_cmd.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/cvirt_cmd.h
+--- linux-3.4.48/include/linux/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -11603,9 +11554,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vserver/cvirt_cmd.h linux-3.4.3
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CVIRT_CMD_H */
-diff -NurpP --minimal linux-3.4.32/include/linux/vserver/cvirt_def.h linux-3.4.32-vs2.3.3.9/include/linux/vserver/cvirt_def.h
---- linux-3.4.32/include/linux/vserver/cvirt_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vserver/cvirt_def.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vserver/cvirt_def.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/cvirt_def.h
+--- linux-3.4.48/include/linux/vserver/cvirt_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -11687,9 +11638,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vserver/cvirt_def.h linux-3.4.3
+#endif
+
+#endif /* _VX_CVIRT_DEF_H */
-diff -NurpP --minimal linux-3.4.32/include/linux/vserver/debug.h linux-3.4.32-vs2.3.3.9/include/linux/vserver/debug.h
---- linux-3.4.32/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vserver/debug.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vserver/debug.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/debug.h
+--- linux-3.4.48/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -11836,9 +11787,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vserver/debug.h linux-3.4.32-vs
+
+
+#endif /* _VX_DEBUG_H */
-diff -NurpP --minimal linux-3.4.32/include/linux/vserver/debug_cmd.h linux-3.4.32-vs2.3.3.9/include/linux/vserver/debug_cmd.h
---- linux-3.4.32/include/linux/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vserver/debug_cmd.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vserver/debug_cmd.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/debug_cmd.h
+--- linux-3.4.48/include/linux/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -11898,9 +11849,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vserver/debug_cmd.h linux-3.4.3
+
+#endif /* __KERNEL__ */
+#endif /* _VX_DEBUG_CMD_H */
-diff -NurpP --minimal linux-3.4.32/include/linux/vserver/device.h linux-3.4.32-vs2.3.3.9/include/linux/vserver/device.h
---- linux-3.4.32/include/linux/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vserver/device.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vserver/device.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/device.h
+--- linux-3.4.48/include/linux/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -11917,9 +11868,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vserver/device.h linux-3.4.32-v
+#else /* _VX_DEVICE_H */
+#warning duplicate inclusion
+#endif /* _VX_DEVICE_H */
-diff -NurpP --minimal linux-3.4.32/include/linux/vserver/device_cmd.h linux-3.4.32-vs2.3.3.9/include/linux/vserver/device_cmd.h
---- linux-3.4.32/include/linux/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vserver/device_cmd.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vserver/device_cmd.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/device_cmd.h
+--- linux-3.4.48/include/linux/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -11965,9 +11916,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vserver/device_cmd.h linux-3.4.
+
+#endif /* __KERNEL__ */
+#endif /* _VX_DEVICE_CMD_H */
-diff -NurpP --minimal linux-3.4.32/include/linux/vserver/device_def.h linux-3.4.32-vs2.3.3.9/include/linux/vserver/device_def.h
---- linux-3.4.32/include/linux/vserver/device_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vserver/device_def.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vserver/device_def.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/device_def.h
+--- linux-3.4.48/include/linux/vserver/device_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -11986,9 +11937,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vserver/device_def.h linux-3.4.
+};
+
+#endif /* _VX_DEVICE_DEF_H */
-diff -NurpP --minimal linux-3.4.32/include/linux/vserver/dlimit.h linux-3.4.32-vs2.3.3.9/include/linux/vserver/dlimit.h
---- linux-3.4.32/include/linux/vserver/dlimit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vserver/dlimit.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vserver/dlimit.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/dlimit.h
+--- linux-3.4.48/include/linux/vserver/dlimit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -12044,9 +11995,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vserver/dlimit.h linux-3.4.32-v
+#else /* _VX_DLIMIT_H */
+#warning duplicate inclusion
+#endif /* _VX_DLIMIT_H */
-diff -NurpP --minimal linux-3.4.32/include/linux/vserver/dlimit_cmd.h linux-3.4.32-vs2.3.3.9/include/linux/vserver/dlimit_cmd.h
---- linux-3.4.32/include/linux/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vserver/dlimit_cmd.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vserver/dlimit_cmd.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/dlimit_cmd.h
+--- linux-3.4.48/include/linux/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -12157,9 +12108,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vserver/dlimit_cmd.h linux-3.4.
+
+#endif /* __KERNEL__ */
+#endif /* _VX_DLIMIT_CMD_H */
-diff -NurpP --minimal linux-3.4.32/include/linux/vserver/global.h linux-3.4.32-vs2.3.3.9/include/linux/vserver/global.h
---- linux-3.4.32/include/linux/vserver/global.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vserver/global.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vserver/global.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/global.h
+--- linux-3.4.48/include/linux/vserver/global.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -12180,9 +12131,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vserver/global.h linux-3.4.32-v
+
+
+#endif /* _VX_GLOBAL_H */
-diff -NurpP --minimal linux-3.4.32/include/linux/vserver/history.h linux-3.4.32-vs2.3.3.9/include/linux/vserver/history.h
---- linux-3.4.32/include/linux/vserver/history.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vserver/history.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vserver/history.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/history.h
+--- linux-3.4.48/include/linux/vserver/history.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -12381,9 +12332,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vserver/history.h linux-3.4.32-
+#endif /* CONFIG_VSERVER_HISTORY */
+
+#endif /* _VX_HISTORY_H */
-diff -NurpP --minimal linux-3.4.32/include/linux/vserver/inode.h linux-3.4.32-vs2.3.3.9/include/linux/vserver/inode.h
---- linux-3.4.32/include/linux/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vserver/inode.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vserver/inode.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/inode.h
+--- linux-3.4.48/include/linux/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -12424,9 +12375,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vserver/inode.h linux-3.4.32-vs
+#else /* _VX_INODE_H */
+#warning duplicate inclusion
+#endif /* _VX_INODE_H */
-diff -NurpP --minimal linux-3.4.32/include/linux/vserver/inode_cmd.h linux-3.4.32-vs2.3.3.9/include/linux/vserver/inode_cmd.h
---- linux-3.4.32/include/linux/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vserver/inode_cmd.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vserver/inode_cmd.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/inode_cmd.h
+--- linux-3.4.48/include/linux/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -12487,9 +12438,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vserver/inode_cmd.h linux-3.4.3
+
+#endif /* __KERNEL__ */
+#endif /* _VX_INODE_CMD_H */
-diff -NurpP --minimal linux-3.4.32/include/linux/vserver/limit.h linux-3.4.32-vs2.3.3.9/include/linux/vserver/limit.h
---- linux-3.4.32/include/linux/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vserver/limit.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vserver/limit.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/limit.h
+--- linux-3.4.48/include/linux/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -12562,9 +12513,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vserver/limit.h linux-3.4.32-vs
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_H */
-diff -NurpP --minimal linux-3.4.32/include/linux/vserver/limit_cmd.h linux-3.4.32-vs2.3.3.9/include/linux/vserver/limit_cmd.h
---- linux-3.4.32/include/linux/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vserver/limit_cmd.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vserver/limit_cmd.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/limit_cmd.h
+--- linux-3.4.48/include/linux/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -12637,9 +12588,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vserver/limit_cmd.h linux-3.4.3
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_CMD_H */
-diff -NurpP --minimal linux-3.4.32/include/linux/vserver/limit_def.h linux-3.4.32-vs2.3.3.9/include/linux/vserver/limit_def.h
---- linux-3.4.32/include/linux/vserver/limit_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vserver/limit_def.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vserver/limit_def.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/limit_def.h
+--- linux-3.4.48/include/linux/vserver/limit_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -12688,9 +12639,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vserver/limit_def.h linux-3.4.3
+#endif
+
+#endif /* _VX_LIMIT_DEF_H */
-diff -NurpP --minimal linux-3.4.32/include/linux/vserver/limit_int.h linux-3.4.32-vs2.3.3.9/include/linux/vserver/limit_int.h
---- linux-3.4.32/include/linux/vserver/limit_int.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vserver/limit_int.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vserver/limit_int.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/limit_int.h
+--- linux-3.4.48/include/linux/vserver/limit_int.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -12890,9 +12841,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vserver/limit_int.h linux-3.4.3
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_INT_H */
-diff -NurpP --minimal linux-3.4.32/include/linux/vserver/monitor.h linux-3.4.32-vs2.3.3.9/include/linux/vserver/monitor.h
---- linux-3.4.32/include/linux/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vserver/monitor.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vserver/monitor.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/monitor.h
+--- linux-3.4.48/include/linux/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -12990,9 +12941,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vserver/monitor.h linux-3.4.32-
+
+
+#endif /* _VX_MONITOR_H */
-diff -NurpP --minimal linux-3.4.32/include/linux/vserver/network.h linux-3.4.32-vs2.3.3.9/include/linux/vserver/network.h
---- linux-3.4.32/include/linux/vserver/network.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vserver/network.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vserver/network.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/network.h
+--- linux-3.4.48/include/linux/vserver/network.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -13142,9 +13093,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vserver/network.h linux-3.4.32-
+
+#endif /* __KERNEL__ */
+#endif /* _VX_NETWORK_H */
-diff -NurpP --minimal linux-3.4.32/include/linux/vserver/network_cmd.h linux-3.4.32-vs2.3.3.9/include/linux/vserver/network_cmd.h
---- linux-3.4.32/include/linux/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vserver/network_cmd.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vserver/network_cmd.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/network_cmd.h
+--- linux-3.4.48/include/linux/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -13310,9 +13261,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vserver/network_cmd.h linux-3.4
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-3.4.32/include/linux/vserver/percpu.h linux-3.4.32-vs2.3.3.9/include/linux/vserver/percpu.h
---- linux-3.4.32/include/linux/vserver/percpu.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vserver/percpu.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vserver/percpu.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/percpu.h
+--- linux-3.4.48/include/linux/vserver/percpu.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -13328,9 +13279,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vserver/percpu.h linux-3.4.32-v
+#define PERCPU_PERCTX (sizeof(struct _vx_percpu))
+
+#endif /* _VX_PERCPU_H */
-diff -NurpP --minimal linux-3.4.32/include/linux/vserver/pid.h linux-3.4.32-vs2.3.3.9/include/linux/vserver/pid.h
---- linux-3.4.32/include/linux/vserver/pid.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vserver/pid.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vserver/pid.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/pid.h
+--- linux-3.4.48/include/linux/vserver/pid.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -13383,9 +13334,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vserver/pid.h linux-3.4.32-vs2.
+}
+
+#endif
-diff -NurpP --minimal linux-3.4.32/include/linux/vserver/sched.h linux-3.4.32-vs2.3.3.9/include/linux/vserver/sched.h
---- linux-3.4.32/include/linux/vserver/sched.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vserver/sched.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vserver/sched.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/sched.h
+--- linux-3.4.48/include/linux/vserver/sched.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -13410,9 +13361,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vserver/sched.h linux-3.4.32-vs
+#else /* _VX_SCHED_H */
+#warning duplicate inclusion
+#endif /* _VX_SCHED_H */
-diff -NurpP --minimal linux-3.4.32/include/linux/vserver/sched_cmd.h linux-3.4.32-vs2.3.3.9/include/linux/vserver/sched_cmd.h
---- linux-3.4.32/include/linux/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vserver/sched_cmd.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vserver/sched_cmd.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/sched_cmd.h
+--- linux-3.4.48/include/linux/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -13435,9 +13386,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vserver/sched_cmd.h linux-3.4.3
+
+#endif /* __KERNEL__ */
+#endif /* _VX_SCHED_CMD_H */
-diff -NurpP --minimal linux-3.4.32/include/linux/vserver/sched_def.h linux-3.4.32-vs2.3.3.9/include/linux/vserver/sched_def.h
---- linux-3.4.32/include/linux/vserver/sched_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vserver/sched_def.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vserver/sched_def.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/sched_def.h
+--- linux-3.4.48/include/linux/vserver/sched_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -13477,9 +13428,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vserver/sched_def.h linux-3.4.3
+#endif
+
+#endif /* _VX_SCHED_DEF_H */
-diff -NurpP --minimal linux-3.4.32/include/linux/vserver/signal.h linux-3.4.32-vs2.3.3.9/include/linux/vserver/signal.h
---- linux-3.4.32/include/linux/vserver/signal.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vserver/signal.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vserver/signal.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/signal.h
+--- linux-3.4.48/include/linux/vserver/signal.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -13495,9 +13446,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vserver/signal.h linux-3.4.32-v
+#else /* _VX_SIGNAL_H */
+#warning duplicate inclusion
+#endif /* _VX_SIGNAL_H */
-diff -NurpP --minimal linux-3.4.32/include/linux/vserver/signal_cmd.h linux-3.4.32-vs2.3.3.9/include/linux/vserver/signal_cmd.h
---- linux-3.4.32/include/linux/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vserver/signal_cmd.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vserver/signal_cmd.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/signal_cmd.h
+--- linux-3.4.48/include/linux/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -13542,9 +13493,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vserver/signal_cmd.h linux-3.4.
+
+#endif /* __KERNEL__ */
+#endif /* _VX_SIGNAL_CMD_H */
-diff -NurpP --minimal linux-3.4.32/include/linux/vserver/space.h linux-3.4.32-vs2.3.3.9/include/linux/vserver/space.h
---- linux-3.4.32/include/linux/vserver/space.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vserver/space.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vserver/space.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/space.h
+--- linux-3.4.48/include/linux/vserver/space.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -13558,9 +13509,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vserver/space.h linux-3.4.32-vs
+#else /* _VX_SPACE_H */
+#warning duplicate inclusion
+#endif /* _VX_SPACE_H */
-diff -NurpP --minimal linux-3.4.32/include/linux/vserver/space_cmd.h linux-3.4.32-vs2.3.3.9/include/linux/vserver/space_cmd.h
---- linux-3.4.32/include/linux/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vserver/space_cmd.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vserver/space_cmd.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/space_cmd.h
+--- linux-3.4.48/include/linux/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -13600,9 +13551,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vserver/space_cmd.h linux-3.4.3
+
+#endif /* __KERNEL__ */
+#endif /* _VX_SPACE_CMD_H */
-diff -NurpP --minimal linux-3.4.32/include/linux/vserver/switch.h linux-3.4.32-vs2.3.3.9/include/linux/vserver/switch.h
---- linux-3.4.32/include/linux/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vserver/switch.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vserver/switch.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/switch.h
+--- linux-3.4.48/include/linux/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -13702,9 +13653,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vserver/switch.h linux-3.4.32-v
+
+#endif /* _VX_SWITCH_H */
+
-diff -NurpP --minimal linux-3.4.32/include/linux/vserver/tag.h linux-3.4.32-vs2.3.3.9/include/linux/vserver/tag.h
---- linux-3.4.32/include/linux/vserver/tag.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vserver/tag.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vserver/tag.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/tag.h
+--- linux-3.4.48/include/linux/vserver/tag.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -13849,9 +13800,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vserver/tag.h linux-3.4.32-vs2.
+#endif
+
+#endif /* _DX_TAG_H */
-diff -NurpP --minimal linux-3.4.32/include/linux/vserver/tag_cmd.h linux-3.4.32-vs2.3.3.9/include/linux/vserver/tag_cmd.h
---- linux-3.4.32/include/linux/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/linux/vserver/tag_cmd.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/linux/vserver/tag_cmd.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/tag_cmd.h
+--- linux-3.4.48/include/linux/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-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
@@ -13875,9 +13826,9 @@ diff -NurpP --minimal linux-3.4.32/include/linux/vserver/tag_cmd.h linux-3.4.32-
+
+#endif /* __KERNEL__ */
+#endif /* _VX_TAG_CMD_H */
-diff -NurpP --minimal linux-3.4.32/include/net/addrconf.h linux-3.4.32-vs2.3.3.9/include/net/addrconf.h
---- linux-3.4.32/include/net/addrconf.h 2012-05-21 16:07:33.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/net/addrconf.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/net/addrconf.h linux-3.4.48-vs2.3.3.9/include/net/addrconf.h
+--- linux-3.4.48/include/net/addrconf.h 2012-05-21 16:07:33.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/include/net/addrconf.h 2012-05-21 16:15:05.000000000 +0000
@@ -80,7 +80,8 @@ extern int ipv6_dev_get_saddr(struct n
struct net_device *dev,
const struct in6_addr *daddr,
@@ -13888,9 +13839,9 @@ diff -NurpP --minimal linux-3.4.32/include/net/addrconf.h linux-3.4.32-vs2.3.3.9
extern int ipv6_get_lladdr(struct net_device *dev,
struct in6_addr *addr,
unsigned char banned_flags);
-diff -NurpP --minimal linux-3.4.32/include/net/af_unix.h linux-3.4.32-vs2.3.3.9/include/net/af_unix.h
---- linux-3.4.32/include/net/af_unix.h 2012-05-21 16:07:33.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/net/af_unix.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/net/af_unix.h linux-3.4.48-vs2.3.3.9/include/net/af_unix.h
+--- linux-3.4.48/include/net/af_unix.h 2012-05-21 16:07:33.000000000 +0000
++++ linux-3.4.48-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>
@@ -13899,9 +13850,9 @@ diff -NurpP --minimal linux-3.4.32/include/net/af_unix.h linux-3.4.32-vs2.3.3.9/
#include <net/sock.h>
extern void unix_inflight(struct file *fp);
-diff -NurpP --minimal linux-3.4.32/include/net/inet_timewait_sock.h linux-3.4.32-vs2.3.3.9/include/net/inet_timewait_sock.h
---- linux-3.4.32/include/net/inet_timewait_sock.h 2012-03-19 18:47:29.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/net/inet_timewait_sock.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/net/inet_timewait_sock.h linux-3.4.48-vs2.3.3.9/include/net/inet_timewait_sock.h
+--- linux-3.4.48/include/net/inet_timewait_sock.h 2012-03-19 18:47:29.000000000 +0000
++++ linux-3.4.48-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
@@ -13913,9 +13864,9 @@ diff -NurpP --minimal linux-3.4.32/include/net/inet_timewait_sock.h linux-3.4.32
int tw_timeout;
volatile unsigned char tw_substate;
unsigned char tw_rcv_wscale;
-diff -NurpP --minimal linux-3.4.32/include/net/ip6_route.h linux-3.4.32-vs2.3.3.9/include/net/ip6_route.h
---- linux-3.4.32/include/net/ip6_route.h 2012-03-19 18:47:29.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/net/ip6_route.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/net/ip6_route.h linux-3.4.48-vs2.3.3.9/include/net/ip6_route.h
+--- linux-3.4.48/include/net/ip6_route.h 2012-03-19 18:47:29.000000000 +0000
++++ linux-3.4.48-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,
@@ -13926,9 +13877,9 @@ diff -NurpP --minimal linux-3.4.32/include/net/ip6_route.h linux-3.4.32-vs2.3.3.
extern struct rt6_info *rt6_lookup(struct net *net,
const struct in6_addr *daddr,
-diff -NurpP --minimal linux-3.4.32/include/net/route.h linux-3.4.32-vs2.3.3.9/include/net/route.h
---- linux-3.4.32/include/net/route.h 2012-03-19 18:47:29.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/net/route.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/net/route.h linux-3.4.48-vs2.3.3.9/include/net/route.h
+--- linux-3.4.48/include/net/route.h 2012-03-19 18:47:29.000000000 +0000
++++ linux-3.4.48-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);
}
@@ -13976,9 +13927,9 @@ diff -NurpP --minimal linux-3.4.32/include/net/route.h linux-3.4.32-vs2.3.3.9/in
rt = __ip_route_output_key(net, fl4);
if (IS_ERR(rt))
return rt;
-diff -NurpP --minimal linux-3.4.32/include/net/sock.h linux-3.4.32-vs2.3.3.9/include/net/sock.h
---- linux-3.4.32/include/net/sock.h 2013-02-19 13:56:07.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/include/net/sock.h 2012-10-22 13:09:53.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/include/net/sock.h linux-3.4.48-vs2.3.3.9/include/net/sock.h
+--- linux-3.4.48/include/net/sock.h 2013-06-13 08:59:36.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/include/net/sock.h 2013-03-02 15:26:44.000000000 +0000
@@ -170,6 +170,10 @@ struct sock_common {
#ifdef CONFIG_NET_NS
struct net *skc_net;
@@ -14001,9 +13952,9 @@ diff -NurpP --minimal linux-3.4.32/include/net/sock.h linux-3.4.32-vs2.3.3.9/inc
socket_lock_t sk_lock;
struct sk_buff_head sk_receive_queue;
/*
-diff -NurpP --minimal linux-3.4.32/init/Kconfig linux-3.4.32-vs2.3.3.9/init/Kconfig
---- linux-3.4.32/init/Kconfig 2012-05-21 16:07:33.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/init/Kconfig 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/init/Kconfig linux-3.4.48-vs2.3.3.9/init/Kconfig
+--- linux-3.4.48/init/Kconfig 2012-05-21 16:07:33.000000000 +0000
++++ linux-3.4.48-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"
@@ -14020,9 +13971,9 @@ diff -NurpP --minimal linux-3.4.32/init/Kconfig linux-3.4.32-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.32/init/main.c linux-3.4.32-vs2.3.3.9/init/main.c
---- linux-3.4.32/init/main.c 2013-02-19 13:56:08.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/init/main.c 2013-02-19 14:42:56.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/init/main.c linux-3.4.48-vs2.3.3.9/init/main.c
+--- linux-3.4.48/init/main.c 2013-06-13 08:59:37.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/init/main.c 2013-02-19 14:42:56.000000000 +0000
@@ -68,6 +68,7 @@
#include <linux/shmem_fs.h>
#include <linux/slab.h>
@@ -14031,9 +13982,9 @@ diff -NurpP --minimal linux-3.4.32/init/main.c linux-3.4.32-vs2.3.3.9/init/main.
#include <asm/io.h>
#include <asm/bugs.h>
-diff -NurpP --minimal linux-3.4.32/ipc/mqueue.c linux-3.4.32-vs2.3.3.9/ipc/mqueue.c
---- linux-3.4.32/ipc/mqueue.c 2012-05-21 16:07:34.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/ipc/mqueue.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/ipc/mqueue.c linux-3.4.48-vs2.3.3.9/ipc/mqueue.c
+--- linux-3.4.48/ipc/mqueue.c 2012-05-21 16:07:34.000000000 +0000
++++ linux-3.4.48-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>
@@ -14109,9 +14060,9 @@ diff -NurpP --minimal linux-3.4.32/ipc/mqueue.c linux-3.4.32-vs2.3.3.9/ipc/mqueu
free_uid(user);
}
if (ipc_ns)
-diff -NurpP --minimal linux-3.4.32/ipc/msg.c linux-3.4.32-vs2.3.3.9/ipc/msg.c
---- linux-3.4.32/ipc/msg.c 2011-05-22 14:17:59.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/ipc/msg.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/ipc/msg.c linux-3.4.48-vs2.3.3.9/ipc/msg.c
+--- linux-3.4.48/ipc/msg.c 2011-05-22 14:17:59.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/ipc/msg.c 2012-05-21 16:15:05.000000000 +0000
@@ -37,6 +37,7 @@
#include <linux/rwsem.h>
#include <linux/nsproxy.h>
@@ -14128,9 +14079,9 @@ diff -NurpP --minimal linux-3.4.32/ipc/msg.c linux-3.4.32-vs2.3.3.9/ipc/msg.c
msq->q_perm.security = NULL;
retval = security_msg_queue_alloc(msq);
-diff -NurpP --minimal linux-3.4.32/ipc/namespace.c linux-3.4.32-vs2.3.3.9/ipc/namespace.c
---- linux-3.4.32/ipc/namespace.c 2011-07-22 09:18:12.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/ipc/namespace.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/ipc/namespace.c linux-3.4.48-vs2.3.3.9/ipc/namespace.c
+--- linux-3.4.48/ipc/namespace.c 2011-07-22 09:18:12.000000000 +0000
++++ linux-3.4.48-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>
@@ -14171,9 +14122,9 @@ diff -NurpP --minimal linux-3.4.32/ipc/namespace.c linux-3.4.32-vs2.3.3.9/ipc/na
}
/*
-diff -NurpP --minimal linux-3.4.32/ipc/sem.c linux-3.4.32-vs2.3.3.9/ipc/sem.c
---- linux-3.4.32/ipc/sem.c 2012-01-09 15:14:59.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/ipc/sem.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/ipc/sem.c linux-3.4.48-vs2.3.3.9/ipc/sem.c
+--- linux-3.4.48/ipc/sem.c 2012-01-09 15:14:59.000000000 +0000
++++ linux-3.4.48-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>
@@ -14211,9 +14162,9 @@ diff -NurpP --minimal linux-3.4.32/ipc/sem.c linux-3.4.32-vs2.3.3.9/ipc/sem.c
security_sem_free(sma);
ipc_rcu_putref(sma);
}
-diff -NurpP --minimal linux-3.4.32/ipc/shm.c linux-3.4.32-vs2.3.3.9/ipc/shm.c
---- linux-3.4.32/ipc/shm.c 2012-05-21 16:07:34.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/ipc/shm.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/ipc/shm.c linux-3.4.48-vs2.3.3.9/ipc/shm.c
+--- linux-3.4.48/ipc/shm.c 2012-05-21 16:07:34.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/ipc/shm.c 2013-06-13 09:46:39.000000000 +0000
@@ -39,6 +39,8 @@
#include <linux/nsproxy.h>
#include <linux/mount.h>
@@ -14269,9 +14220,9 @@ diff -NurpP --minimal linux-3.4.32/ipc/shm.c linux-3.4.32-vs2.3.3.9/ipc/shm.c
return error;
no_id:
-diff -NurpP --minimal linux-3.4.32/kernel/Makefile linux-3.4.32-vs2.3.3.9/kernel/Makefile
---- linux-3.4.32/kernel/Makefile 2012-05-21 16:07:34.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/kernel/Makefile 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/Makefile linux-3.4.48-vs2.3.3.9/kernel/Makefile
+--- linux-3.4.48/kernel/Makefile 2012-05-21 16:07:34.000000000 +0000
++++ linux-3.4.48-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/
@@ -14280,9 +14231,9 @@ diff -NurpP --minimal linux-3.4.32/kernel/Makefile linux-3.4.32-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.32/kernel/auditsc.c linux-3.4.32-vs2.3.3.9/kernel/auditsc.c
---- linux-3.4.32/kernel/auditsc.c 2012-03-19 18:47:29.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/kernel/auditsc.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/auditsc.c linux-3.4.48-vs2.3.3.9/kernel/auditsc.c
+--- linux-3.4.48/kernel/auditsc.c 2012-03-19 18:47:29.000000000 +0000
++++ linux-3.4.48-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;
@@ -14292,9 +14243,9 @@ diff -NurpP --minimal linux-3.4.32/kernel/auditsc.c linux-3.4.32-vs2.3.3.9/kerne
return -EPERM;
#endif /* CONFIG_AUDIT_LOGINUID_IMMUTABLE */
-diff -NurpP --minimal linux-3.4.32/kernel/capability.c linux-3.4.32-vs2.3.3.9/kernel/capability.c
---- linux-3.4.32/kernel/capability.c 2012-03-19 18:47:29.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/kernel/capability.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/capability.c linux-3.4.48-vs2.3.3.9/kernel/capability.c
+--- linux-3.4.48/kernel/capability.c 2012-03-19 18:47:29.000000000 +0000
++++ linux-3.4.48-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>
@@ -14320,9 +14271,9 @@ diff -NurpP --minimal linux-3.4.32/kernel/capability.c linux-3.4.32-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.32/kernel/compat.c linux-3.4.32-vs2.3.3.9/kernel/compat.c
---- linux-3.4.32/kernel/compat.c 2012-05-21 16:07:34.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/kernel/compat.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/compat.c linux-3.4.48-vs2.3.3.9/kernel/compat.c
+--- linux-3.4.48/kernel/compat.c 2012-05-21 16:07:34.000000000 +0000
++++ linux-3.4.48-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;
@@ -14332,9 +14283,9 @@ diff -NurpP --minimal linux-3.4.32/kernel/compat.c linux-3.4.32-vs2.3.3.9/kernel
return 0;
}
-diff -NurpP --minimal linux-3.4.32/kernel/cred.c linux-3.4.32-vs2.3.3.9/kernel/cred.c
---- linux-3.4.32/kernel/cred.c 2012-05-21 16:07:34.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/kernel/cred.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/cred.c linux-3.4.48-vs2.3.3.9/kernel/cred.c
+--- linux-3.4.48/kernel/cred.c 2012-05-21 16:07:34.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/kernel/cred.c 2012-05-21 16:15:05.000000000 +0000
@@ -62,31 +62,6 @@ struct cred init_cred = {
#endif
};
@@ -14404,9 +14355,9 @@ diff -NurpP --minimal linux-3.4.32/kernel/cred.c linux-3.4.32-vs2.3.3.9/kernel/c
EXPORT_SYMBOL(prepare_creds);
/*
-diff -NurpP --minimal linux-3.4.32/kernel/exit.c linux-3.4.32-vs2.3.3.9/kernel/exit.c
---- linux-3.4.32/kernel/exit.c 2013-02-19 13:56:08.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/kernel/exit.c 2012-12-08 00:54:06.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/exit.c linux-3.4.48-vs2.3.3.9/kernel/exit.c
+--- linux-3.4.48/kernel/exit.c 2013-06-13 08:59:37.000000000 +0000
++++ linux-3.4.48-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>
@@ -14514,9 +14465,9 @@ diff -NurpP --minimal linux-3.4.32/kernel/exit.c linux-3.4.32-vs2.3.3.9/kernel/e
BUG();
/* Avoid "noreturn function does return". */
for (;;)
-diff -NurpP --minimal linux-3.4.32/kernel/fork.c linux-3.4.32-vs2.3.3.9/kernel/fork.c
---- linux-3.4.32/kernel/fork.c 2013-02-19 13:56:08.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/kernel/fork.c 2012-06-28 14:45:07.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/fork.c linux-3.4.48-vs2.3.3.9/kernel/fork.c
+--- linux-3.4.48/kernel/fork.c 2013-06-13 08:59:37.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/kernel/fork.c 2012-06-28 14:45:07.000000000 +0000
@@ -68,6 +68,9 @@
#include <linux/oom.h>
#include <linux/khugepaged.h>
@@ -14609,9 +14560,9 @@ diff -NurpP --minimal linux-3.4.32/kernel/fork.c linux-3.4.32-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.32/kernel/kthread.c linux-3.4.32-vs2.3.3.9/kernel/kthread.c
---- linux-3.4.32/kernel/kthread.c 2013-02-19 13:56:08.000000000 +0000
-+++ linux-3.4.32-vs2.3.3.9/kernel/kthread.c 2012-10-22 13:09:53.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/kthread.c linux-3.4.48-vs2.3.3.9/kernel/kthread.c
+--- linux-3.4.48/kernel/kthread.c 2013-06-13 08:59:37.000000000 +0000
++++ linux-3.4.48-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>
@@ -14620,9 +14571,9 @@ diff -NurpP --minimal linux-3.4.32/kernel/kthread.c linux-3.4.32-vs2.3.3.9/kerne
<Skipped 1458 lines>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/d6b4a6d784ed9e976861ba4d14593dec70c1b1de
More information about the pld-cvs-commit
mailing list