aboutsummaryrefslogtreecommitdiffstats
path: root/main/linux-vserver
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2013-07-02 09:24:39 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2013-07-02 09:24:39 +0000
commitd2ce688a9d4947d6632c9b06e5b2f9b1d3244820 (patch)
tree653d793bd33460c8b16c99ed8ff0d85c61c1a48d /main/linux-vserver
parent1855477de35ea6f90224d6692398d18fc77d9e89 (diff)
downloadaports-d2ce688a9d4947d6632c9b06e5b2f9b1d3244820.tar.bz2
aports-d2ce688a9d4947d6632c9b06e5b2f9b1d3244820.tar.xz
main/linux-vserver: upgrade to 3.4.51
Diffstat (limited to 'main/linux-vserver')
-rw-r--r--main/linux-vserver/APKBUILD26
-rw-r--r--main/linux-vserver/kernelconfig.x864
-rw-r--r--main/linux-vserver/kernelconfig.x86_644
-rw-r--r--main/linux-vserver/patch-3.4.51-vs2.3.3.9.diff (renamed from main/linux-vserver/patch-3.4.45-vs2.3.3.9.diff)2494
4 files changed, 1240 insertions, 1288 deletions
diff --git a/main/linux-vserver/APKBUILD b/main/linux-vserver/APKBUILD
index 0069ca5d7b..3865e54bde 100644
--- a/main/linux-vserver/APKBUILD
+++ b/main/linux-vserver/APKBUILD
@@ -2,7 +2,7 @@
_flavor=vserver
pkgname=linux-${_flavor}
-pkgver=3.4.45
+pkgver=3.4.51
pkgrel=0
_vsver=vs2.3.3.9
@@ -136,17 +136,17 @@ dev() {
}
md5sums="967f72983655e2479f951195953e8480 linux-3.4.tar.xz
-adb183c04b48eb1276abcae46858dc29 patch-3.4.45.xz
-45c7f894c242dfb02c9d9485b252a98f patch-3.4.45-vs2.3.3.9.diff
-17038c80855fa0131db7021225184844 kernelconfig.x86
-ca6fce288664a05fed7c91883cf96dde kernelconfig.x86_64"
+c74052b5a413496d9182bcf8f9087403 patch-3.4.51.xz
+57bf6e2df90c55df27cb345232f75a59 patch-3.4.51-vs2.3.3.9.diff
+1fce2ef2e47d19c150ab0b2df3373a57 kernelconfig.x86
+b6a18f4cb2523bbd2500809e61172f8f kernelconfig.x86_64"
sha256sums="ff3dee6a855873d12487a6f4070ec2f7996d073019171361c955639664baa0c6 linux-3.4.tar.xz
-1eee23dc5a2f6a2448030e4d89e8d2883037c10cfd38eb1d59ee1d8848202ca4 patch-3.4.45.xz
-ab0de3bf5e4c381fb55d7494426bbf4a32a56d5002e6cf99c8a9451e4b0a0a6e patch-3.4.45-vs2.3.3.9.diff
-d5b45035e40e05a7f387027fbfb46fe8cb80f655204d768b937b1b5ff7f28397 kernelconfig.x86
-b6c68df7f4e6a7571839857c18896580da0393369aa7f4d4ee88182309e12376 kernelconfig.x86_64"
+693b3370e84f9612357b5ecf5272930a4dfbfb7674b4f257ece42c9d122c39f5 patch-3.4.51.xz
+15866fe9338fc9069ab1646149a5fb48ea1eada0d7616bd16ae5c77566ee94bc patch-3.4.51-vs2.3.3.9.diff
+e97b45a117671c5a87a9ba4a1f946125053eac078d297f61f9c8d4594acbf830 kernelconfig.x86
+d44d1a1be3402847f540cc0cfb201deec7084b4c516e592b92e115ab3f71d4b5 kernelconfig.x86_64"
sha512sums="1c49b336750c9c2b49d21e54126f22a800367296be0d57e6df28b1532cbeba7fc3bdf4cfe27d9810576e76c2db2e9c2493f0804451c915137cb78d7aa61f236c linux-3.4.tar.xz
-3a7abeae48a6731d76165071f76e83f67a88705de0f6fef88d1dd901e50e8776406d610256aab91f2650176f46ec3fef6e25196c9b25b969b8ba0293728d0b36 patch-3.4.45.xz
-8c3b9d0d93abdd9821595a849a7fae070147ed5013e2b6f31e8a659642586affef5f038fbed5696e447e145a5b0c2a339e7a2479b8579ea953766b9b712df8be patch-3.4.45-vs2.3.3.9.diff
-08d8cf139e3833631f3c53276ace72741fd9dfef99df2a0a8b0d8204222c3715788ee33d1601bdd27ba39aa9352a2ce8e23bdfde5c60a4a8b82eeea77aadae32 kernelconfig.x86
-766f93ef3e2d9ee131811a85179bdeb5e090eefa2adea4fc813f57b275016f37f7b9baf8761177c2431c38da2e0f421f92c08f5156195280f297296b0aa6acf0 kernelconfig.x86_64"
+6daa4976c680a66f9d1c0f8b8be855057cad9744353b999ea51331db7056eb6705231cdfa7075c8cbcc4439aac6ff5de9c6ca336569026029560955a5fc70b06 patch-3.4.51.xz
+16bd974160323f49fe8590d3a99102f6d0f4bc34942cae6a3b0f239f96d52e51ba64435ef1e9c3ff118abc903f2e2b42ca126e29c97df9261c2623898bb955a1 patch-3.4.51-vs2.3.3.9.diff
+f12f999c84f724a4ac20a736c7f56671e23b2a9ddce4b0576dc17d0b3e8f319f5c4bc40b58992eba75ace44148018d85de24b2516d0a83240cd0ca3803606eae kernelconfig.x86
+4cf43a7fc609e9822919e5706f38c03ef72deae2eae6b7d4c4ca7f9f29bccd1f01c0d65660a0c5234df6c2123a1d0c797dbdcb57ca5559e39644704426657f3e kernelconfig.x86_64"
diff --git a/main/linux-vserver/kernelconfig.x86 b/main/linux-vserver/kernelconfig.x86
index 641a31178c..1ddd27cdb7 100644
--- a/main/linux-vserver/kernelconfig.x86
+++ b/main/linux-vserver/kernelconfig.x86
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.4.45-vs2.3.3.9 Kernel Configuration
+# Linux/i386 3.4.51-vs2.3.3.9 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -2199,7 +2199,7 @@ CONFIG_ATH9K_PCI=y
CONFIG_ATH9K_AHB=y
# CONFIG_ATH9K_DEBUGFS is not set
# CONFIG_ATH9K_DFS_CERTIFIED is not set
-CONFIG_ATH9K_RATE_CONTROL=y
+# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set
CONFIG_ATH9K_HTC=m
# CONFIG_ATH9K_HTC_DEBUGFS is not set
CONFIG_CARL9170=m
diff --git a/main/linux-vserver/kernelconfig.x86_64 b/main/linux-vserver/kernelconfig.x86_64
index 92bdd3da3a..5346cbce10 100644
--- a/main/linux-vserver/kernelconfig.x86_64
+++ b/main/linux-vserver/kernelconfig.x86_64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.4.45-vs2.3.3.9 Kernel Configuration
+# Linux/x86_64 3.4.51-vs2.3.3.9 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -2103,7 +2103,7 @@ CONFIG_ATH9K_PCI=y
CONFIG_ATH9K_AHB=y
# CONFIG_ATH9K_DEBUGFS is not set
# CONFIG_ATH9K_DFS_CERTIFIED is not set
-CONFIG_ATH9K_RATE_CONTROL=y
+# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set
CONFIG_ATH9K_HTC=m
# CONFIG_ATH9K_HTC_DEBUGFS is not set
CONFIG_CARL9170=m
diff --git a/main/linux-vserver/patch-3.4.45-vs2.3.3.9.diff b/main/linux-vserver/patch-3.4.51-vs2.3.3.9.diff
index 4d74b9b229..3d00861f87 100644
--- a/main/linux-vserver/patch-3.4.45-vs2.3.3.9.diff
+++ b/main/linux-vserver/patch-3.4.51-vs2.3.3.9.diff
@@ -1,6 +1,6 @@
-diff -NurpP --minimal linux-3.4.45/Documentation/vserver/debug.txt linux-3.4.45-vs2.3.3.9/Documentation/vserver/debug.txt
---- linux-3.4.45/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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,21 +156,22 @@ diff -NurpP --minimal linux-3.4.45/Documentation/vserver/debug.txt linux-3.4.45-
+ 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.45/Makefile linux-3.4.45-vs2.3.3.9/Makefile
---- linux-3.4.45/Makefile 2013-05-13 17:36:16.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/Makefile 2013-05-13 18:41:34.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/Makefile linux-3.4.48-vs2.3.3.9/Makefile
+--- linux-3.4.48/Makefile 2013-06-13 08:59:13.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/Makefile 2013-06-13 13:08:07.000000000 +0000
@@ -1,7 +1,7 @@
VERSION = 3
PATCHLEVEL = 4
- SUBLEVEL = 45
+-SUBLEVEL = 51
-EXTRAVERSION =
++SUBLEVEL = 51
+EXTRAVERSION = -vs2.3.3.9
NAME = Saber-toothed Squirrel
# *DOCUMENTATION*
-diff -NurpP --minimal linux-3.4.45/arch/alpha/Kconfig linux-3.4.45-vs2.3.3.9/arch/alpha/Kconfig
---- linux-3.4.45/arch/alpha/Kconfig 2012-05-21 16:06:12.000000000 +0000
-+++ linux-3.4.45-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
@@ -180,9 +181,9 @@ diff -NurpP --minimal linux-3.4.45/arch/alpha/Kconfig linux-3.4.45-vs2.3.3.9/arc
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.4.45/arch/alpha/kernel/entry.S linux-3.4.45-vs2.3.3.9/arch/alpha/kernel/entry.S
---- linux-3.4.45/arch/alpha/kernel/entry.S 2010-10-21 11:06:45.000000000 +0000
-+++ linux-3.4.45-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
@@ -215,9 +216,9 @@ diff -NurpP --minimal linux-3.4.45/arch/alpha/kernel/entry.S linux-3.4.45-vs2.3.
ret
.end sys_getxpid
-diff -NurpP --minimal linux-3.4.45/arch/alpha/kernel/ptrace.c linux-3.4.45-vs2.3.3.9/arch/alpha/kernel/ptrace.c
---- linux-3.4.45/arch/alpha/kernel/ptrace.c 2012-05-21 16:06:12.000000000 +0000
-+++ linux-3.4.45-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>
@@ -226,9 +227,9 @@ diff -NurpP --minimal linux-3.4.45/arch/alpha/kernel/ptrace.c linux-3.4.45-vs2.3
#include <asm/uaccess.h>
#include <asm/pgtable.h>
-diff -NurpP --minimal linux-3.4.45/arch/alpha/kernel/systbls.S linux-3.4.45-vs2.3.3.9/arch/alpha/kernel/systbls.S
---- linux-3.4.45/arch/alpha/kernel/systbls.S 2012-01-09 15:13:54.000000000 +0000
-+++ linux-3.4.45-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
@@ -238,9 +239,9 @@ diff -NurpP --minimal linux-3.4.45/arch/alpha/kernel/systbls.S linux-3.4.45-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.45/arch/alpha/kernel/traps.c linux-3.4.45-vs2.3.3.9/arch/alpha/kernel/traps.c
---- linux-3.4.45/arch/alpha/kernel/traps.c 2012-05-21 16:06:12.000000000 +0000
-+++ linux-3.4.45-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());
@@ -251,9 +252,9 @@ diff -NurpP --minimal linux-3.4.45/arch/alpha/kernel/traps.c linux-3.4.45-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.45/arch/arm/Kconfig linux-3.4.45-vs2.3.3.9/arch/arm/Kconfig
---- linux-3.4.45/arch/arm/Kconfig 2013-05-13 17:36:16.000000000 +0000
-+++ linux-3.4.45-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"
@@ -263,9 +264,9 @@ diff -NurpP --minimal linux-3.4.45/arch/arm/Kconfig linux-3.4.45-vs2.3.3.9/arch/
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.4.45/arch/arm/kernel/calls.S linux-3.4.45-vs2.3.3.9/arch/arm/kernel/calls.S
---- linux-3.4.45/arch/arm/kernel/calls.S 2012-01-09 15:13:54.000000000 +0000
-+++ linux-3.4.45-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)
@@ -275,9 +276,9 @@ diff -NurpP --minimal linux-3.4.45/arch/arm/kernel/calls.S linux-3.4.45-vs2.3.3.
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-3.4.45/arch/arm/kernel/process.c linux-3.4.45-vs2.3.3.9/arch/arm/kernel/process.c
---- linux-3.4.45/arch/arm/kernel/process.c 2013-05-13 17:36:16.000000000 +0000
-+++ linux-3.4.45-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)
{
@@ -288,9 +289,9 @@ diff -NurpP --minimal linux-3.4.45/arch/arm/kernel/process.c linux-3.4.45-vs2.3.
__show_regs(regs);
dump_stack();
}
-diff -NurpP --minimal linux-3.4.45/arch/arm/kernel/traps.c linux-3.4.45-vs2.3.3.9/arch/arm/kernel/traps.c
---- linux-3.4.45/arch/arm/kernel/traps.c 2013-05-13 17:36:16.000000000 +0000
-+++ linux-3.4.45-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();
@@ -302,9 +303,9 @@ diff -NurpP --minimal linux-3.4.45/arch/arm/kernel/traps.c linux-3.4.45-vs2.3.3.
if (!user_mode(regs) || in_interrupt()) {
dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-3.4.45/arch/cris/Kconfig linux-3.4.45-vs2.3.3.9/arch/cris/Kconfig
---- linux-3.4.45/arch/cris/Kconfig 2012-03-19 18:46:39.000000000 +0000
-+++ linux-3.4.45-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"
@@ -314,9 +315,9 @@ diff -NurpP --minimal linux-3.4.45/arch/cris/Kconfig linux-3.4.45-vs2.3.3.9/arch
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.4.45/arch/frv/kernel/kernel_thread.S linux-3.4.45-vs2.3.3.9/arch/frv/kernel/kernel_thread.S
---- linux-3.4.45/arch/frv/kernel/kernel_thread.S 2008-12-24 23:26:37.000000000 +0000
-+++ linux-3.4.45-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
@@ -326,9 +327,9 @@ diff -NurpP --minimal linux-3.4.45/arch/frv/kernel/kernel_thread.S linux-3.4.45-
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.45/arch/h8300/Kconfig linux-3.4.45-vs2.3.3.9/arch/h8300/Kconfig
---- linux-3.4.45/arch/h8300/Kconfig 2012-03-19 18:46:39.000000000 +0000
-+++ linux-3.4.45-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"
@@ -338,9 +339,9 @@ diff -NurpP --minimal linux-3.4.45/arch/h8300/Kconfig linux-3.4.45-vs2.3.3.9/arc
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.4.45/arch/ia64/Kconfig linux-3.4.45-vs2.3.3.9/arch/ia64/Kconfig
---- linux-3.4.45/arch/ia64/Kconfig 2012-03-19 18:46:39.000000000 +0000
-+++ linux-3.4.45-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"
@@ -350,9 +351,9 @@ diff -NurpP --minimal linux-3.4.45/arch/ia64/Kconfig linux-3.4.45-vs2.3.3.9/arch
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.4.45/arch/ia64/kernel/entry.S linux-3.4.45-vs2.3.3.9/arch/ia64/kernel/entry.S
---- linux-3.4.45/arch/ia64/kernel/entry.S 2012-03-19 18:46:40.000000000 +0000
-+++ linux-3.4.45-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
@@ -362,9 +363,9 @@ diff -NurpP --minimal linux-3.4.45/arch/ia64/kernel/entry.S linux-3.4.45-vs2.3.3
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -NurpP --minimal linux-3.4.45/arch/ia64/kernel/process.c linux-3.4.45-vs2.3.3.9/arch/ia64/kernel/process.c
---- linux-3.4.45/arch/ia64/kernel/process.c 2013-05-13 17:36:17.000000000 +0000
-+++ linux-3.4.45-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;
@@ -376,9 +377,9 @@ diff -NurpP --minimal linux-3.4.45/arch/ia64/kernel/process.c linux-3.4.45-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.45/arch/ia64/kernel/ptrace.c linux-3.4.45-vs2.3.3.9/arch/ia64/kernel/ptrace.c
---- linux-3.4.45/arch/ia64/kernel/ptrace.c 2012-05-21 16:06:26.000000000 +0000
-+++ linux-3.4.45-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>
@@ -387,9 +388,9 @@ diff -NurpP --minimal linux-3.4.45/arch/ia64/kernel/ptrace.c linux-3.4.45-vs2.3.
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-3.4.45/arch/ia64/kernel/traps.c linux-3.4.45-vs2.3.3.9/arch/ia64/kernel/traps.c
---- linux-3.4.45/arch/ia64/kernel/traps.c 2012-05-21 16:06:26.000000000 +0000
-+++ linux-3.4.45-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();
@@ -414,9 +415,9 @@ diff -NurpP --minimal linux-3.4.45/arch/ia64/kernel/traps.c linux-3.4.45-vs2.3.3
}
}
}
-diff -NurpP --minimal linux-3.4.45/arch/m32r/kernel/traps.c linux-3.4.45-vs2.3.3.9/arch/m32r/kernel/traps.c
---- linux-3.4.45/arch/m32r/kernel/traps.c 2012-05-21 16:06:26.000000000 +0000
-+++ linux-3.4.45-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);
@@ -429,9 +430,9 @@ diff -NurpP --minimal linux-3.4.45/arch/m32r/kernel/traps.c linux-3.4.45-vs2.3.3
/*
* When in-kernel, we also print out the stack and code at the
-diff -NurpP --minimal linux-3.4.45/arch/m68k/Kconfig linux-3.4.45-vs2.3.3.9/arch/m68k/Kconfig
---- linux-3.4.45/arch/m68k/Kconfig 2012-05-21 16:06:26.000000000 +0000
-+++ linux-3.4.45-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"
@@ -441,9 +442,9 @@ diff -NurpP --minimal linux-3.4.45/arch/m68k/Kconfig linux-3.4.45-vs2.3.3.9/arch
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.4.45/arch/mips/Kconfig linux-3.4.45-vs2.3.3.9/arch/mips/Kconfig
---- linux-3.4.45/arch/mips/Kconfig 2012-05-21 16:06:27.000000000 +0000
-+++ linux-3.4.45-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"
@@ -453,9 +454,9 @@ diff -NurpP --minimal linux-3.4.45/arch/mips/Kconfig linux-3.4.45-vs2.3.3.9/arch
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.4.45/arch/mips/kernel/ptrace.c linux-3.4.45-vs2.3.3.9/arch/mips/kernel/ptrace.c
---- linux-3.4.45/arch/mips/kernel/ptrace.c 2012-05-21 16:06:27.000000000 +0000
-+++ linux-3.4.45-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>
@@ -474,9 +475,9 @@ diff -NurpP --minimal linux-3.4.45/arch/mips/kernel/ptrace.c linux-3.4.45-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.45/arch/mips/kernel/scall32-o32.S linux-3.4.45-vs2.3.3.9/arch/mips/kernel/scall32-o32.S
---- linux-3.4.45/arch/mips/kernel/scall32-o32.S 2012-01-09 15:14:05.000000000 +0000
-+++ linux-3.4.45-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 */
@@ -486,9 +487,9 @@ diff -NurpP --minimal linux-3.4.45/arch/mips/kernel/scall32-o32.S linux-3.4.45-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.45/arch/mips/kernel/scall64-64.S linux-3.4.45-vs2.3.3.9/arch/mips/kernel/scall64-64.S
---- linux-3.4.45/arch/mips/kernel/scall64-64.S 2012-01-09 15:14:05.000000000 +0000
-+++ linux-3.4.45-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
@@ -498,9 +499,9 @@ diff -NurpP --minimal linux-3.4.45/arch/mips/kernel/scall64-64.S linux-3.4.45-vs
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-3.4.45/arch/mips/kernel/scall64-n32.S linux-3.4.45-vs2.3.3.9/arch/mips/kernel/scall64-n32.S
---- linux-3.4.45/arch/mips/kernel/scall64-n32.S 2012-01-09 15:14:05.000000000 +0000
-+++ linux-3.4.45-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
@@ -510,9 +511,9 @@ diff -NurpP --minimal linux-3.4.45/arch/mips/kernel/scall64-n32.S linux-3.4.45-v
PTR compat_sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-3.4.45/arch/mips/kernel/scall64-o32.S linux-3.4.45-vs2.3.3.9/arch/mips/kernel/scall64-o32.S
---- linux-3.4.45/arch/mips/kernel/scall64-o32.S 2012-01-09 15:14:05.000000000 +0000
-+++ linux-3.4.45-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 */
@@ -522,9 +523,9 @@ diff -NurpP --minimal linux-3.4.45/arch/mips/kernel/scall64-o32.S linux-3.4.45-v
PTR sys_32_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-diff -NurpP --minimal linux-3.4.45/arch/mips/kernel/traps.c linux-3.4.45-vs2.3.3.9/arch/mips/kernel/traps.c
---- linux-3.4.45/arch/mips/kernel/traps.c 2012-05-21 16:06:27.000000000 +0000
-+++ linux-3.4.45-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);
@@ -539,9 +540,9 @@ diff -NurpP --minimal linux-3.4.45/arch/mips/kernel/traps.c linux-3.4.45-vs2.3.3
if (cpu_has_userlocal) {
unsigned long tls;
-diff -NurpP --minimal linux-3.4.45/arch/parisc/Kconfig linux-3.4.45-vs2.3.3.9/arch/parisc/Kconfig
---- linux-3.4.45/arch/parisc/Kconfig 2012-03-19 18:46:44.000000000 +0000
-+++ linux-3.4.45-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"
@@ -551,9 +552,9 @@ diff -NurpP --minimal linux-3.4.45/arch/parisc/Kconfig linux-3.4.45-vs2.3.3.9/ar
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.4.45/arch/parisc/kernel/syscall_table.S linux-3.4.45-vs2.3.3.9/arch/parisc/kernel/syscall_table.S
---- linux-3.4.45/arch/parisc/kernel/syscall_table.S 2011-10-24 16:45:00.000000000 +0000
-+++ linux-3.4.45-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)
@@ -563,9 +564,9 @@ diff -NurpP --minimal linux-3.4.45/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.45/arch/parisc/kernel/traps.c linux-3.4.45-vs2.3.3.9/arch/parisc/kernel/traps.c
---- linux-3.4.45/arch/parisc/kernel/traps.c 2012-05-21 16:06:28.000000000 +0000
-+++ linux-3.4.45-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 */
@@ -589,9 +590,9 @@ diff -NurpP --minimal linux-3.4.45/arch/parisc/kernel/traps.c linux-3.4.45-vs2.3
/* Wot's wrong wif bein' racy? */
if (current->thread.flags & PARISC_KERNEL_DEATH) {
-diff -NurpP --minimal linux-3.4.45/arch/parisc/mm/fault.c linux-3.4.45-vs2.3.3.9/arch/parisc/mm/fault.c
---- linux-3.4.45/arch/parisc/mm/fault.c 2010-08-02 14:52:06.000000000 +0000
-+++ linux-3.4.45-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
@@ -604,9 +605,9 @@ diff -NurpP --minimal linux-3.4.45/arch/parisc/mm/fault.c linux-3.4.45-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.45/arch/powerpc/Kconfig linux-3.4.45-vs2.3.3.9/arch/powerpc/Kconfig
---- linux-3.4.45/arch/powerpc/Kconfig 2012-05-21 16:06:28.000000000 +0000
-+++ linux-3.4.45-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"
@@ -616,9 +617,9 @@ diff -NurpP --minimal linux-3.4.45/arch/powerpc/Kconfig linux-3.4.45-vs2.3.3.9/a
source "security/Kconfig"
config KEYS_COMPAT
-diff -NurpP --minimal linux-3.4.45/arch/powerpc/include/asm/unistd.h linux-3.4.45-vs2.3.3.9/arch/powerpc/include/asm/unistd.h
---- linux-3.4.45/arch/powerpc/include/asm/unistd.h 2012-01-09 15:14:05.000000000 +0000
-+++ linux-3.4.45-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
@@ -628,9 +629,9 @@ diff -NurpP --minimal linux-3.4.45/arch/powerpc/include/asm/unistd.h linux-3.4.4
#define __NR_migrate_pages 258
#define __NR_mbind 259
#define __NR_get_mempolicy 260
-diff -NurpP --minimal linux-3.4.45/arch/powerpc/kernel/process.c linux-3.4.45-vs2.3.3.9/arch/powerpc/kernel/process.c
---- linux-3.4.45/arch/powerpc/kernel/process.c 2013-05-13 17:36:18.000000000 +0000
-+++ linux-3.4.45-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);
@@ -643,10 +644,10 @@ diff -NurpP --minimal linux-3.4.45/arch/powerpc/kernel/process.c linux-3.4.45-vs
#ifdef CONFIG_SMP
printk(" CPU: %d", raw_smp_processor_id());
-diff -NurpP --minimal linux-3.4.45/arch/powerpc/kernel/traps.c linux-3.4.45-vs2.3.3.9/arch/powerpc/kernel/traps.c
---- linux-3.4.45/arch/powerpc/kernel/traps.c 2013-05-13 17:36:18.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/arch/powerpc/kernel/traps.c 2013-05-13 18:16:08.000000000 +0000
-@@ -1125,8 +1125,9 @@ void nonrecoverable_exception(struct pt_
+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)
{
@@ -658,9 +659,9 @@ diff -NurpP --minimal linux-3.4.45/arch/powerpc/kernel/traps.c linux-3.4.45-vs2.
regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted());
}
-diff -NurpP --minimal linux-3.4.45/arch/s390/Kconfig linux-3.4.45-vs2.3.3.9/arch/s390/Kconfig
---- linux-3.4.45/arch/s390/Kconfig 2012-05-21 16:06:32.000000000 +0000
-+++ linux-3.4.45-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"
@@ -670,9 +671,9 @@ diff -NurpP --minimal linux-3.4.45/arch/s390/Kconfig linux-3.4.45-vs2.3.3.9/arch
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.4.45/arch/s390/include/asm/tlb.h linux-3.4.45-vs2.3.3.9/arch/s390/include/asm/tlb.h
---- linux-3.4.45/arch/s390/include/asm/tlb.h 2012-05-21 16:06:32.000000000 +0000
-+++ linux-3.4.45-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>
@@ -681,9 +682,9 @@ diff -NurpP --minimal linux-3.4.45/arch/s390/include/asm/tlb.h linux-3.4.45-vs2.
#include <asm/processor.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-3.4.45/arch/s390/include/asm/unistd.h linux-3.4.45-vs2.3.3.9/arch/s390/include/asm/unistd.h
---- linux-3.4.45/arch/s390/include/asm/unistd.h 2012-03-19 18:46:48.000000000 +0000
-+++ linux-3.4.45-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)
@@ -693,9 +694,9 @@ diff -NurpP --minimal linux-3.4.45/arch/s390/include/asm/unistd.h linux-3.4.45-v
#define __NR_statfs64 265
#define __NR_fstatfs64 266
#define __NR_remap_file_pages 267
-diff -NurpP --minimal linux-3.4.45/arch/s390/kernel/ptrace.c linux-3.4.45-vs2.3.3.9/arch/s390/kernel/ptrace.c
---- linux-3.4.45/arch/s390/kernel/ptrace.c 2012-05-21 16:06:32.000000000 +0000
-+++ linux-3.4.45-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>
@@ -704,9 +705,9 @@ diff -NurpP --minimal linux-3.4.45/arch/s390/kernel/ptrace.c linux-3.4.45-vs2.3.
#include <trace/syscall.h>
#include <asm/segment.h>
#include <asm/page.h>
-diff -NurpP --minimal linux-3.4.45/arch/s390/kernel/syscalls.S linux-3.4.45-vs2.3.3.9/arch/s390/kernel/syscalls.S
---- linux-3.4.45/arch/s390/kernel/syscalls.S 2012-01-09 15:14:06.000000000 +0000
-+++ linux-3.4.45-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)
@@ -716,9 +717,9 @@ diff -NurpP --minimal linux-3.4.45/arch/s390/kernel/syscalls.S linux-3.4.45-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.45/arch/sh/Kconfig linux-3.4.45-vs2.3.3.9/arch/sh/Kconfig
---- linux-3.4.45/arch/sh/Kconfig 2012-05-21 16:06:33.000000000 +0000
-+++ linux-3.4.45-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"
@@ -728,9 +729,9 @@ diff -NurpP --minimal linux-3.4.45/arch/sh/Kconfig linux-3.4.45-vs2.3.3.9/arch/s
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.4.45/arch/sh/kernel/irq.c linux-3.4.45-vs2.3.3.9/arch/sh/kernel/irq.c
---- linux-3.4.45/arch/sh/kernel/irq.c 2011-07-22 09:17:41.000000000 +0000
-+++ linux-3.4.45-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>
@@ -739,9 +740,9 @@ diff -NurpP --minimal linux-3.4.45/arch/sh/kernel/irq.c linux-3.4.45-vs2.3.3.9/a
#include <asm/processor.h>
#include <asm/machvec.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-3.4.45/arch/sparc/Kconfig linux-3.4.45-vs2.3.3.9/arch/sparc/Kconfig
---- linux-3.4.45/arch/sparc/Kconfig 2013-05-13 17:36:18.000000000 +0000
-+++ linux-3.4.45-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"
@@ -751,9 +752,9 @@ diff -NurpP --minimal linux-3.4.45/arch/sparc/Kconfig linux-3.4.45-vs2.3.3.9/arc
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.4.45/arch/sparc/include/asm/unistd.h linux-3.4.45-vs2.3.3.9/arch/sparc/include/asm/unistd.h
---- linux-3.4.45/arch/sparc/include/asm/unistd.h 2012-01-09 15:14:07.000000000 +0000
-+++ linux-3.4.45-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
@@ -763,9 +764,9 @@ diff -NurpP --minimal linux-3.4.45/arch/sparc/include/asm/unistd.h linux-3.4.45-
#define __NR_io_setup 268
#define __NR_io_destroy 269
#define __NR_io_submit 270
-diff -NurpP --minimal linux-3.4.45/arch/sparc/kernel/systbls_32.S linux-3.4.45-vs2.3.3.9/arch/sparc/kernel/systbls_32.S
---- linux-3.4.45/arch/sparc/kernel/systbls_32.S 2012-01-09 15:14:09.000000000 +0000
-+++ linux-3.4.45-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
@@ -775,9 +776,9 @@ diff -NurpP --minimal linux-3.4.45/arch/sparc/kernel/systbls_32.S linux-3.4.45-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.45/arch/sparc/kernel/systbls_64.S linux-3.4.45-vs2.3.3.9/arch/sparc/kernel/systbls_64.S
---- linux-3.4.45/arch/sparc/kernel/systbls_64.S 2013-05-13 17:36:18.000000000 +0000
-+++ linux-3.4.45-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
@@ -796,9 +797,9 @@ diff -NurpP --minimal linux-3.4.45/arch/sparc/kernel/systbls_64.S linux-3.4.45-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.45/arch/um/Kconfig.rest linux-3.4.45-vs2.3.3.9/arch/um/Kconfig.rest
---- linux-3.4.45/arch/um/Kconfig.rest 2012-01-09 15:14:09.000000000 +0000
-+++ linux-3.4.45-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"
@@ -808,58 +809,9 @@ diff -NurpP --minimal linux-3.4.45/arch/um/Kconfig.rest linux-3.4.45-vs2.3.3.9/a
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.4.45/arch/um/include/shared/kern_constants.h linux-3.4.45-vs2.3.3.9/arch/um/include/shared/kern_constants.h
---- linux-3.4.45/arch/um/include/shared/kern_constants.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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.45/arch/um/include/shared/user_constants.h linux-3.4.45-vs2.3.3.9/arch/um/include/shared/user_constants.h
---- linux-3.4.45/arch/um/include/shared/user_constants.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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.45/arch/x86/Kconfig linux-3.4.45-vs2.3.3.9/arch/x86/Kconfig
---- linux-3.4.45/arch/x86/Kconfig 2013-05-13 17:36:18.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/arch/x86/Kconfig 2013-03-02 15:26:44.000000000 +0000
+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"
@@ -869,9 +821,9 @@ diff -NurpP --minimal linux-3.4.45/arch/x86/Kconfig linux-3.4.45-vs2.3.3.9/arch/
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.4.45/arch/x86/syscalls/syscall_32.tbl linux-3.4.45-vs2.3.3.9/arch/x86/syscalls/syscall_32.tbl
---- linux-3.4.45/arch/x86/syscalls/syscall_32.tbl 2012-05-21 16:06:42.000000000 +0000
-+++ linux-3.4.45-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
@@ -881,9 +833,9 @@ diff -NurpP --minimal linux-3.4.45/arch/x86/syscalls/syscall_32.tbl linux-3.4.45
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.45/arch/x86/syscalls/syscall_64.tbl linux-3.4.45-vs2.3.3.9/arch/x86/syscalls/syscall_64.tbl
---- linux-3.4.45/arch/x86/syscalls/syscall_64.tbl 2013-05-13 17:36:19.000000000 +0000
-+++ linux-3.4.45-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
@@ -893,9 +845,9 @@ diff -NurpP --minimal linux-3.4.45/arch/x86/syscalls/syscall_64.tbl linux-3.4.45
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.45/drivers/block/Kconfig linux-3.4.45-vs2.3.3.9/drivers/block/Kconfig
---- linux-3.4.45/drivers/block/Kconfig 2012-05-21 16:06:43.000000000 +0000
-+++ linux-3.4.45-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"
@@ -910,9 +862,9 @@ diff -NurpP --minimal linux-3.4.45/drivers/block/Kconfig linux-3.4.45-vs2.3.3.9/
config BLK_DEV_NBD
tristate "Network block device support"
depends on NET
-diff -NurpP --minimal linux-3.4.45/drivers/block/Makefile linux-3.4.45-vs2.3.3.9/drivers/block/Makefile
---- linux-3.4.45/drivers/block/Makefile 2012-03-19 18:46:52.000000000 +0000
-+++ linux-3.4.45-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
@@ -921,9 +873,9 @@ diff -NurpP --minimal linux-3.4.45/drivers/block/Makefile linux-3.4.45-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.45/drivers/block/loop.c linux-3.4.45-vs2.3.3.9/drivers/block/loop.c
---- linux-3.4.45/drivers/block/loop.c 2013-05-13 17:36:20.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/drivers/block/loop.c 2013-05-13 18:16:08.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>
@@ -940,7 +892,7 @@ diff -NurpP --minimal linux-3.4.45/drivers/block/loop.c linux-3.4.45-vs2.3.3.9/d
lo->lo_backing_file = file;
lo->transfer = transfer_none;
lo->ioctl = NULL;
-@@ -1006,6 +1008,7 @@ static int loop_clr_fd(struct loop_devic
+@@ -1001,6 +1003,7 @@ static int loop_clr_fd(struct loop_devic
lo->lo_sizelimit = 0;
lo->lo_encrypt_key_size = 0;
lo->lo_thread = NULL;
@@ -948,7 +900,7 @@ diff -NurpP --minimal linux-3.4.45/drivers/block/loop.c linux-3.4.45-vs2.3.3.9/d
memset(lo->lo_encrypt_key, 0, LO_KEY_SIZE);
memset(lo->lo_crypt_name, 0, LO_NAME_SIZE);
memset(lo->lo_file_name, 0, LO_NAME_SIZE);
-@@ -1049,7 +1052,7 @@ loop_set_status(struct loop_device *lo,
+@@ -1042,7 +1045,7 @@ loop_set_status(struct loop_device *lo,
if (lo->lo_encrypt_key_size &&
lo->lo_key_owner != uid &&
@@ -957,7 +909,7 @@ diff -NurpP --minimal linux-3.4.45/drivers/block/loop.c linux-3.4.45-vs2.3.3.9/d
return -EPERM;
if (lo->lo_state != Lo_bound)
return -ENXIO;
-@@ -1139,7 +1142,8 @@ loop_get_status(struct loop_device *lo,
+@@ -1132,7 +1135,8 @@ loop_get_status(struct loop_device *lo,
memcpy(info->lo_crypt_name, lo->lo_crypt_name, LO_NAME_SIZE);
info->lo_encrypt_type =
lo->lo_encryption ? lo->lo_encryption->number : 0;
@@ -967,7 +919,7 @@ diff -NurpP --minimal linux-3.4.45/drivers/block/loop.c linux-3.4.45-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);
-@@ -1497,6 +1501,11 @@ static int lo_open(struct block_device *
+@@ -1490,6 +1494,11 @@ static int lo_open(struct block_device *
goto out;
}
@@ -979,9 +931,9 @@ diff -NurpP --minimal linux-3.4.45/drivers/block/loop.c linux-3.4.45-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.45/drivers/block/vroot.c linux-3.4.45-vs2.3.3.9/drivers/block/vroot.c
---- linux-3.4.45/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -1274,9 +1226,9 @@ diff -NurpP --minimal linux-3.4.45/drivers/block/vroot.c linux-3.4.45-vs2.3.3.9/
+
+#endif
+
-diff -NurpP --minimal linux-3.4.45/drivers/infiniband/Kconfig linux-3.4.45-vs2.3.3.9/drivers/infiniband/Kconfig
---- linux-3.4.45/drivers/infiniband/Kconfig 2012-03-19 18:46:54.000000000 +0000
-+++ linux-3.4.45-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
@@ -1286,9 +1238,9 @@ diff -NurpP --minimal linux-3.4.45/drivers/infiniband/Kconfig linux-3.4.45-vs2.3
default y
source "drivers/infiniband/hw/mthca/Kconfig"
-diff -NurpP --minimal linux-3.4.45/drivers/infiniband/core/addr.c linux-3.4.45-vs2.3.3.9/drivers/infiniband/core/addr.c
---- linux-3.4.45/drivers/infiniband/core/addr.c 2012-05-21 16:06:46.000000000 +0000
-+++ linux-3.4.45-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)) {
@@ -1298,9 +1250,9 @@ diff -NurpP --minimal linux-3.4.45/drivers/infiniband/core/addr.c linux-3.4.45-v
if (ret)
goto put;
-diff -NurpP --minimal linux-3.4.45/drivers/md/dm-ioctl.c linux-3.4.45-vs2.3.3.9/drivers/md/dm-ioctl.c
---- linux-3.4.45/drivers/md/dm-ioctl.c 2013-05-13 17:36:25.000000000 +0000
-+++ linux-3.4.45-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>
@@ -1386,9 +1338,9 @@ diff -NurpP --minimal linux-3.4.45/drivers/md/dm-ioctl.c linux-3.4.45-vs2.3.3.9/
return -EACCES;
if (_IOC_TYPE(command) != DM_IOCTL)
-diff -NurpP --minimal linux-3.4.45/drivers/md/dm.c linux-3.4.45-vs2.3.3.9/drivers/md/dm.c
---- linux-3.4.45/drivers/md/dm.c 2013-05-13 17:36:25.000000000 +0000
-+++ linux-3.4.45-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>
@@ -1462,9 +1414,9 @@ diff -NurpP --minimal linux-3.4.45/drivers/md/dm.c linux-3.4.45-vs2.3.3.9/driver
md->queue = blk_alloc_queue(GFP_KERNEL);
if (!md->queue)
goto bad_queue;
-diff -NurpP --minimal linux-3.4.45/drivers/md/dm.h linux-3.4.45-vs2.3.3.9/drivers/md/dm.h
---- linux-3.4.45/drivers/md/dm.h 2012-01-09 15:14:21.000000000 +0000
-+++ linux-3.4.45-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;
@@ -1474,9 +1426,9 @@ diff -NurpP --minimal linux-3.4.45/drivers/md/dm.h linux-3.4.45-vs2.3.3.9/driver
/*-----------------------------------------------------------------
* Internal table functions.
*---------------------------------------------------------------*/
-diff -NurpP --minimal linux-3.4.45/drivers/net/tun.c linux-3.4.45-vs2.3.3.9/drivers/net/tun.c
---- linux-3.4.45/drivers/net/tun.c 2013-05-13 17:36:27.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/drivers/net/tun.c 2013-03-30 21:29:17.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>
@@ -1546,9 +1498,9 @@ diff -NurpP --minimal linux-3.4.45/drivers/net/tun.c linux-3.4.45-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.45/drivers/tty/sysrq.c linux-3.4.45-vs2.3.3.9/drivers/tty/sysrq.c
---- linux-3.4.45/drivers/tty/sysrq.c 2012-05-21 16:07:16.000000000 +0000
-+++ linux-3.4.45-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>
@@ -1600,9 +1552,9 @@ diff -NurpP --minimal linux-3.4.45/drivers/tty/sysrq.c linux-3.4.45-vs2.3.3.9/dr
else
retval = -1;
return retval;
-diff -NurpP --minimal linux-3.4.45/drivers/tty/tty_io.c linux-3.4.45-vs2.3.3.9/drivers/tty/tty_io.c
---- linux-3.4.45/drivers/tty/tty_io.c 2013-05-13 17:36:30.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/drivers/tty/tty_io.c 2013-05-13 18:16:08.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>
@@ -1611,7 +1563,7 @@ diff -NurpP --minimal linux-3.4.45/drivers/tty/tty_io.c linux-3.4.45-vs2.3.3.9/d
#undef TTY_DEBUG_HANGUP
-@@ -2128,7 +2129,8 @@ static int tiocsti(struct tty_struct *tt
+@@ -2118,7 +2119,8 @@ static int tiocsti(struct tty_struct *tt
char ch, mbz = 0;
struct tty_ldisc *ld;
@@ -1621,7 +1573,7 @@ diff -NurpP --minimal linux-3.4.45/drivers/tty/tty_io.c linux-3.4.45-vs2.3.3.9/d
return -EPERM;
if (get_user(ch, p))
return -EFAULT;
-@@ -2416,6 +2418,7 @@ static int tiocspgrp(struct tty_struct *
+@@ -2406,6 +2408,7 @@ static int tiocspgrp(struct tty_struct *
return -ENOTTY;
if (get_user(pgrp_nr, p))
return -EFAULT;
@@ -1629,9 +1581,9 @@ diff -NurpP --minimal linux-3.4.45/drivers/tty/tty_io.c linux-3.4.45-vs2.3.3.9/d
if (pgrp_nr < 0)
return -EINVAL;
rcu_read_lock();
-diff -NurpP --minimal linux-3.4.45/fs/attr.c linux-3.4.45-vs2.3.3.9/fs/attr.c
---- linux-3.4.45/fs/attr.c 2013-05-13 17:36:33.000000000 +0000
-+++ linux-3.4.45-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>
@@ -1672,9 +1624,9 @@ diff -NurpP --minimal linux-3.4.45/fs/attr.c linux-3.4.45-vs2.3.3.9/fs/attr.c
if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
return -EPERM;
}
-diff -NurpP --minimal linux-3.4.45/fs/block_dev.c linux-3.4.45-vs2.3.3.9/fs/block_dev.c
---- linux-3.4.45/fs/block_dev.c 2013-05-13 17:36:34.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/fs/block_dev.c 2013-05-13 18:16:08.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>
@@ -1691,7 +1643,7 @@ diff -NurpP --minimal linux-3.4.45/fs/block_dev.c linux-3.4.45-vs2.3.3.9/fs/bloc
inode->i_bdev = bdev;
inode->i_data.a_ops = &def_blk_aops;
mapping_set_gfp_mask(&inode->i_data, GFP_USER);
-@@ -628,6 +630,11 @@ EXPORT_SYMBOL(bdput);
+@@ -627,6 +629,11 @@ EXPORT_SYMBOL(bdput);
static struct block_device *bd_acquire(struct inode *inode)
{
struct block_device *bdev;
@@ -1703,7 +1655,7 @@ diff -NurpP --minimal linux-3.4.45/fs/block_dev.c linux-3.4.45-vs2.3.3.9/fs/bloc
spin_lock(&bdev_lock);
bdev = inode->i_bdev;
-@@ -638,7 +645,7 @@ static struct block_device *bd_acquire(s
+@@ -637,7 +644,7 @@ static struct block_device *bd_acquire(s
}
spin_unlock(&bdev_lock);
@@ -1712,9 +1664,9 @@ diff -NurpP --minimal linux-3.4.45/fs/block_dev.c linux-3.4.45-vs2.3.3.9/fs/bloc
if (bdev) {
spin_lock(&bdev_lock);
if (!inode->i_bdev) {
-diff -NurpP --minimal linux-3.4.45/fs/btrfs/ctree.h linux-3.4.45-vs2.3.3.9/fs/btrfs/ctree.h
---- linux-3.4.45/fs/btrfs/ctree.h 2012-05-21 16:07:18.000000000 +0000
-+++ linux-3.4.45-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;
@@ -1767,9 +1719,9 @@ diff -NurpP --minimal linux-3.4.45/fs/btrfs/ctree.h linux-3.4.45-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.45/fs/btrfs/disk-io.c linux-3.4.45-vs2.3.3.9/fs/btrfs/disk-io.c
---- linux-3.4.45/fs/btrfs/disk-io.c 2012-05-21 16:07:18.000000000 +0000
-+++ linux-3.4.45-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;
}
@@ -1780,9 +1732,9 @@ diff -NurpP --minimal linux-3.4.45/fs/btrfs/disk-io.c linux-3.4.45-vs2.3.3.9/fs/
features = btrfs_super_incompat_flags(disk_super) &
~BTRFS_FEATURE_INCOMPAT_SUPP;
if (features) {
-diff -NurpP --minimal linux-3.4.45/fs/btrfs/inode.c linux-3.4.45-vs2.3.3.9/fs/btrfs/inode.c
---- linux-3.4.45/fs/btrfs/inode.c 2013-05-13 17:36:34.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/fs/btrfs/inode.c 2013-05-13 18:16:08.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>
@@ -1791,7 +1743,7 @@ diff -NurpP --minimal linux-3.4.45/fs/btrfs/inode.c linux-3.4.45-vs2.3.3.9/fs/bt
#include "compat.h"
#include "ctree.h"
#include "disk-io.h"
-@@ -2482,6 +2483,8 @@ static void btrfs_read_locked_inode(stru
+@@ -2468,6 +2469,8 @@ static void btrfs_read_locked_inode(stru
struct btrfs_key location;
int maybe_acls;
u32 rdev;
@@ -1800,7 +1752,7 @@ diff -NurpP --minimal linux-3.4.45/fs/btrfs/inode.c linux-3.4.45-vs2.3.3.9/fs/bt
int ret;
bool filled = false;
-@@ -2509,8 +2512,13 @@ static void btrfs_read_locked_inode(stru
+@@ -2495,8 +2498,13 @@ static void btrfs_read_locked_inode(stru
struct btrfs_inode_item);
inode->i_mode = btrfs_inode_mode(leaf, inode_item);
set_nlink(inode, btrfs_inode_nlink(leaf, inode_item));
@@ -1816,7 +1768,7 @@ diff -NurpP --minimal linux-3.4.45/fs/btrfs/inode.c linux-3.4.45-vs2.3.3.9/fs/bt
btrfs_i_size_write(inode, btrfs_inode_size(leaf, inode_item));
tspec = btrfs_inode_atime(inode_item);
-@@ -2588,8 +2596,14 @@ static void fill_inode_item(struct btrfs
+@@ -2574,8 +2582,14 @@ static void fill_inode_item(struct btrfs
struct btrfs_inode_item *item,
struct inode *inode)
{
@@ -1833,7 +1785,7 @@ diff -NurpP --minimal linux-3.4.45/fs/btrfs/inode.c linux-3.4.45-vs2.3.3.9/fs/bt
btrfs_set_inode_size(leaf, item, BTRFS_I(inode)->disk_i_size);
btrfs_set_inode_mode(leaf, item, inode->i_mode);
btrfs_set_inode_nlink(leaf, item, inode->i_nlink);
-@@ -7590,11 +7604,13 @@ static const struct inode_operations btr
+@@ -7576,11 +7590,13 @@ static const struct inode_operations btr
.listxattr = btrfs_listxattr,
.removexattr = btrfs_removexattr,
.permission = btrfs_permission,
@@ -1847,9 +1799,9 @@ diff -NurpP --minimal linux-3.4.45/fs/btrfs/inode.c linux-3.4.45-vs2.3.3.9/fs/bt
.get_acl = btrfs_get_acl,
};
-diff -NurpP --minimal linux-3.4.45/fs/btrfs/ioctl.c linux-3.4.45-vs2.3.3.9/fs/btrfs/ioctl.c
---- linux-3.4.45/fs/btrfs/ioctl.c 2012-05-21 16:07:19.000000000 +0000
-+++ linux-3.4.45-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;
@@ -2022,9 +1974,9 @@ diff -NurpP --minimal linux-3.4.45/fs/btrfs/ioctl.c linux-3.4.45-vs2.3.3.9/fs/bt
if (flags & FS_APPEND_FL)
ip->flags |= BTRFS_INODE_APPEND;
else
-diff -NurpP --minimal linux-3.4.45/fs/btrfs/super.c linux-3.4.45-vs2.3.3.9/fs/btrfs/super.c
---- linux-3.4.45/fs/btrfs/super.c 2012-05-21 16:07:19.000000000 +0000
-+++ linux-3.4.45-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,
@@ -2080,9 +2032,9 @@ diff -NurpP --minimal linux-3.4.45/fs/btrfs/super.c linux-3.4.45-vs2.3.3.9/fs/bt
if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
return 0;
-diff -NurpP --minimal linux-3.4.45/fs/char_dev.c linux-3.4.45-vs2.3.3.9/fs/char_dev.c
---- linux-3.4.45/fs/char_dev.c 2012-03-19 18:47:25.000000000 +0000
-+++ linux-3.4.45-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>
@@ -2115,9 +2067,9 @@ diff -NurpP --minimal linux-3.4.45/fs/char_dev.c linux-3.4.45-vs2.3.3.9/fs/char_
if (!kobj)
return -ENXIO;
new = container_of(kobj, struct cdev, kobj);
-diff -NurpP --minimal linux-3.4.45/fs/dcache.c linux-3.4.45-vs2.3.3.9/fs/dcache.c
---- linux-3.4.45/fs/dcache.c 2013-05-13 17:36:34.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/fs/dcache.c 2013-05-13 18:16:08.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>
@@ -2143,7 +2095,7 @@ diff -NurpP --minimal linux-3.4.45/fs/dcache.c linux-3.4.45-vs2.3.3.9/fs/dcache.
}
static inline void __dget(struct dentry *dentry)
-@@ -1260,6 +1264,9 @@ struct dentry *__d_alloc(struct super_bl
+@@ -1258,6 +1262,9 @@ struct dentry *__d_alloc(struct super_bl
struct dentry *dentry;
char *dname;
@@ -2153,7 +2105,7 @@ diff -NurpP --minimal linux-3.4.45/fs/dcache.c linux-3.4.45-vs2.3.3.9/fs/dcache.
dentry = kmem_cache_alloc(dentry_cache, GFP_KERNEL);
if (!dentry)
return NULL;
-@@ -1282,6 +1289,7 @@ struct dentry *__d_alloc(struct super_bl
+@@ -1280,6 +1287,7 @@ struct dentry *__d_alloc(struct super_bl
dentry->d_count = 1;
dentry->d_flags = 0;
@@ -2161,7 +2113,7 @@ diff -NurpP --minimal linux-3.4.45/fs/dcache.c linux-3.4.45-vs2.3.3.9/fs/dcache.
spin_lock_init(&dentry->d_lock);
seqcount_init(&dentry->d_seq);
dentry->d_inode = NULL;
-@@ -1943,6 +1951,7 @@ struct dentry *__d_lookup(struct dentry
+@@ -1941,6 +1949,7 @@ struct dentry *__d_lookup(struct dentry
}
dentry->d_count++;
@@ -2169,9 +2121,9 @@ diff -NurpP --minimal linux-3.4.45/fs/dcache.c linux-3.4.45-vs2.3.3.9/fs/dcache.
found = dentry;
spin_unlock(&dentry->d_lock);
break;
-diff -NurpP --minimal linux-3.4.45/fs/devpts/inode.c linux-3.4.45-vs2.3.3.9/fs/devpts/inode.c
---- linux-3.4.45/fs/devpts/inode.c 2012-05-21 16:07:20.000000000 +0000
-+++ linux-3.4.45-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>
@@ -2259,9 +2211,9 @@ diff -NurpP --minimal linux-3.4.45/fs/devpts/inode.c linux-3.4.45-vs2.3.3.9/fs/d
inode->i_private = tty;
tty->driver_data = inode;
-diff -NurpP --minimal linux-3.4.45/fs/ext2/balloc.c linux-3.4.45-vs2.3.3.9/fs/ext2/balloc.c
---- linux-3.4.45/fs/ext2/balloc.c 2012-01-09 15:14:54.000000000 +0000
-+++ linux-3.4.45-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);
@@ -2270,9 +2222,9 @@ diff -NurpP --minimal linux-3.4.45/fs/ext2/balloc.c linux-3.4.45-vs2.3.3.9/fs/ex
BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb));
repeat:
-diff -NurpP --minimal linux-3.4.45/fs/ext2/ext2.h linux-3.4.45-vs2.3.3.9/fs/ext2/ext2.h
---- linux-3.4.45/fs/ext2/ext2.h 2012-05-21 16:07:20.000000000 +0000
-+++ linux-3.4.45-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) */
@@ -2320,18 +2272,18 @@ diff -NurpP --minimal linux-3.4.45/fs/ext2/ext2.h linux-3.4.45-vs2.3.3.9/fs/ext2
/* ioctl.c */
extern long ext2_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-3.4.45/fs/ext2/file.c linux-3.4.45-vs2.3.3.9/fs/ext2/file.c
---- linux-3.4.45/fs/ext2/file.c 2011-10-24 16:45:27.000000000 +0000
-+++ linux-3.4.45-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.45/fs/ext2/ialloc.c linux-3.4.45-vs2.3.3.9/fs/ext2/ialloc.c
---- linux-3.4.45/fs/ext2/ialloc.c 2012-03-19 18:47:25.000000000 +0000
-+++ linux-3.4.45-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>
@@ -2348,9 +2300,9 @@ diff -NurpP --minimal linux-3.4.45/fs/ext2/ialloc.c linux-3.4.45-vs2.3.3.9/fs/ex
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-3.4.45/fs/ext2/inode.c linux-3.4.45-vs2.3.3.9/fs/ext2/inode.c
---- linux-3.4.45/fs/ext2/inode.c 2012-03-19 18:47:25.000000000 +0000
-+++ linux-3.4.45-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>
@@ -2498,9 +2450,9 @@ diff -NurpP --minimal linux-3.4.45/fs/ext2/inode.c linux-3.4.45-vs2.3.3.9/fs/ext
error = dquot_transfer(inode, iattr);
if (error)
return error;
-diff -NurpP --minimal linux-3.4.45/fs/ext2/ioctl.c linux-3.4.45-vs2.3.3.9/fs/ext2/ioctl.c
---- linux-3.4.45/fs/ext2/ioctl.c 2012-03-19 18:47:25.000000000 +0000
-+++ linux-3.4.45-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>
@@ -2550,9 +2502,9 @@ diff -NurpP --minimal linux-3.4.45/fs/ext2/ioctl.c linux-3.4.45-vs2.3.3.9/fs/ext
flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE;
ei->i_flags = flags;
-diff -NurpP --minimal linux-3.4.45/fs/ext2/namei.c linux-3.4.45-vs2.3.3.9/fs/ext2/namei.c
---- linux-3.4.45/fs/ext2/namei.c 2012-05-21 16:07:20.000000000 +0000
-+++ linux-3.4.45-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>
@@ -2577,9 +2529,9 @@ diff -NurpP --minimal linux-3.4.45/fs/ext2/namei.c linux-3.4.45-vs2.3.3.9/fs/ext
.get_acl = ext2_get_acl,
};
-diff -NurpP --minimal linux-3.4.45/fs/ext2/super.c linux-3.4.45-vs2.3.3.9/fs/ext2/super.c
---- linux-3.4.45/fs/ext2/super.c 2012-05-21 16:07:20.000000000 +0000
-+++ linux-3.4.45-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,
@@ -2645,9 +2597,9 @@ diff -NurpP --minimal linux-3.4.45/fs/ext2/super.c linux-3.4.45-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.45/fs/ext3/ext3.h linux-3.4.45-vs2.3.3.9/fs/ext3/ext3.h
---- linux-3.4.45/fs/ext3/ext3.h 2012-05-21 16:07:20.000000000 +0000
-+++ linux-3.4.45-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) */
@@ -2699,9 +2651,9 @@ diff -NurpP --minimal linux-3.4.45/fs/ext3/ext3.h linux-3.4.45-vs2.3.3.9/fs/ext3
/* ioctl.c */
extern long ext3_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-3.4.45/fs/ext3/file.c linux-3.4.45-vs2.3.3.9/fs/ext3/file.c
---- linux-3.4.45/fs/ext3/file.c 2012-05-21 16:07:20.000000000 +0000
-+++ linux-3.4.45-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,
@@ -2709,9 +2661,9 @@ diff -NurpP --minimal linux-3.4.45/fs/ext3/file.c linux-3.4.45-vs2.3.3.9/fs/ext3
+ .sync_flags = ext3_sync_flags,
};
-diff -NurpP --minimal linux-3.4.45/fs/ext3/ialloc.c linux-3.4.45-vs2.3.3.9/fs/ext3/ialloc.c
---- linux-3.4.45/fs/ext3/ialloc.c 2012-05-21 16:07:20.000000000 +0000
-+++ linux-3.4.45-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>
@@ -2728,9 +2680,9 @@ diff -NurpP --minimal linux-3.4.45/fs/ext3/ialloc.c linux-3.4.45-vs2.3.3.9/fs/ex
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-3.4.45/fs/ext3/inode.c linux-3.4.45-vs2.3.3.9/fs/ext3/inode.c
---- linux-3.4.45/fs/ext3/inode.c 2013-05-13 17:36:34.000000000 +0000
-+++ linux-3.4.45-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>
@@ -2905,9 +2857,9 @@ diff -NurpP --minimal linux-3.4.45/fs/ext3/inode.c linux-3.4.45-vs2.3.3.9/fs/ext
error = ext3_mark_inode_dirty(handle, inode);
ext3_journal_stop(handle);
}
-diff -NurpP --minimal linux-3.4.45/fs/ext3/ioctl.c linux-3.4.45-vs2.3.3.9/fs/ext3/ioctl.c
---- linux-3.4.45/fs/ext3/ioctl.c 2012-05-21 16:07:20.000000000 +0000
-+++ linux-3.4.45-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"
@@ -2975,9 +2927,9 @@ diff -NurpP --minimal linux-3.4.45/fs/ext3/ioctl.c linux-3.4.45-vs2.3.3.9/fs/ext
flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE;
ei->i_flags = flags;
-diff -NurpP --minimal linux-3.4.45/fs/ext3/namei.c linux-3.4.45-vs2.3.3.9/fs/ext3/namei.c
---- linux-3.4.45/fs/ext3/namei.c 2012-05-21 16:07:20.000000000 +0000
-+++ linux-3.4.45-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 @@
*/
@@ -3003,9 +2955,9 @@ diff -NurpP --minimal linux-3.4.45/fs/ext3/namei.c linux-3.4.45-vs2.3.3.9/fs/ext
.get_acl = ext3_get_acl,
};
-diff -NurpP --minimal linux-3.4.45/fs/ext3/super.c linux-3.4.45-vs2.3.3.9/fs/ext3/super.c
---- linux-3.4.45/fs/ext3/super.c 2013-05-13 17:36:34.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/fs/ext3/super.c 2013-03-30 21:29:17.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,
@@ -3072,9 +3024,9 @@ diff -NurpP --minimal linux-3.4.45/fs/ext3/super.c linux-3.4.45-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.45/fs/ext4/ext4.h linux-3.4.45-vs2.3.3.9/fs/ext4/ext4.h
---- linux-3.4.45/fs/ext4/ext4.h 2013-05-13 17:36:34.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/fs/ext4/ext4.h 2013-05-13 18:16:08.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 */
@@ -3122,9 +3074,9 @@ diff -NurpP --minimal linux-3.4.45/fs/ext4/ext4.h linux-3.4.45-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.45/fs/ext4/file.c linux-3.4.45-vs2.3.3.9/fs/ext4/file.c
---- linux-3.4.45/fs/ext4/file.c 2012-01-09 15:14:54.000000000 +0000
-+++ linux-3.4.45-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,
@@ -3132,9 +3084,9 @@ diff -NurpP --minimal linux-3.4.45/fs/ext4/file.c linux-3.4.45-vs2.3.3.9/fs/ext4
+ .sync_flags = ext4_sync_flags,
};
-diff -NurpP --minimal linux-3.4.45/fs/ext4/ialloc.c linux-3.4.45-vs2.3.3.9/fs/ext4/ialloc.c
---- linux-3.4.45/fs/ext4/ialloc.c 2013-05-13 17:36:34.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/fs/ext4/ialloc.c 2013-05-13 18:16:08.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>
@@ -3151,9 +3103,9 @@ diff -NurpP --minimal linux-3.4.45/fs/ext4/ialloc.c linux-3.4.45-vs2.3.3.9/fs/ex
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-3.4.45/fs/ext4/inode.c linux-3.4.45-vs2.3.3.9/fs/ext4/inode.c
---- linux-3.4.45/fs/ext4/inode.c 2013-05-13 17:36:34.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/fs/ext4/inode.c 2013-03-30 21:29:17.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>
@@ -3331,9 +3283,9 @@ diff -NurpP --minimal linux-3.4.45/fs/ext4/inode.c linux-3.4.45-vs2.3.3.9/fs/ext
error = ext4_mark_inode_dirty(handle, inode);
ext4_journal_stop(handle);
}
-diff -NurpP --minimal linux-3.4.45/fs/ext4/ioctl.c linux-3.4.45-vs2.3.3.9/fs/ext4/ioctl.c
---- linux-3.4.45/fs/ext4/ioctl.c 2013-05-13 17:36:34.000000000 +0000
-+++ linux-3.4.45-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>
@@ -3398,9 +3350,9 @@ diff -NurpP --minimal linux-3.4.45/fs/ext4/ioctl.c linux-3.4.45-vs2.3.3.9/fs/ext
if (!capable(CAP_LINUX_IMMUTABLE))
goto flags_out;
}
-diff -NurpP --minimal linux-3.4.45/fs/ext4/namei.c linux-3.4.45-vs2.3.3.9/fs/ext4/namei.c
---- linux-3.4.45/fs/ext4/namei.c 2013-05-13 17:36:34.000000000 +0000
-+++ linux-3.4.45-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>
@@ -3425,10 +3377,10 @@ diff -NurpP --minimal linux-3.4.45/fs/ext4/namei.c linux-3.4.45-vs2.3.3.9/fs/ext
};
const struct inode_operations ext4_special_inode_operations = {
-diff -NurpP --minimal linux-3.4.45/fs/ext4/super.c linux-3.4.45-vs2.3.3.9/fs/ext4/super.c
---- linux-3.4.45/fs/ext4/super.c 2013-05-13 17:36:34.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/fs/ext4/super.c 2013-05-13 18:16:08.000000000 +0000
-@@ -1191,6 +1191,7 @@ enum {
+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,
Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable,
@@ -3436,7 +3388,7 @@ diff -NurpP --minimal linux-3.4.45/fs/ext4/super.c linux-3.4.45-vs2.3.3.9/fs/ext
};
static const match_table_t tokens = {
-@@ -1269,6 +1270,9 @@ static const match_table_t tokens = {
+@@ -1266,6 +1267,9 @@ static const match_table_t tokens = {
{Opt_removed, "reservation"}, /* mount option from ext2/3 */
{Opt_removed, "noreservation"}, /* mount option from ext2/3 */
{Opt_removed, "journal=%u"}, /* mount option from ext2/3 */
@@ -3446,7 +3398,7 @@ diff -NurpP --minimal linux-3.4.45/fs/ext4/super.c linux-3.4.45-vs2.3.3.9/fs/ext
{Opt_err, NULL},
};
-@@ -1503,6 +1507,20 @@ static int handle_mount_opt(struct super
+@@ -1500,6 +1504,20 @@ static int handle_mount_opt(struct super
return -1;
*journal_ioprio = IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, arg);
return 1;
@@ -3467,7 +3419,7 @@ diff -NurpP --minimal linux-3.4.45/fs/ext4/super.c linux-3.4.45-vs2.3.3.9/fs/ext
}
for (m = ext4_mount_opts; m->token != Opt_err; m++) {
-@@ -3239,6 +3257,9 @@ static int ext4_fill_super(struct super_
+@@ -3236,6 +3254,9 @@ static int ext4_fill_super(struct super_
clear_opt(sb, DELALLOC);
}
@@ -3477,7 +3429,7 @@ diff -NurpP --minimal linux-3.4.45/fs/ext4/super.c linux-3.4.45-vs2.3.3.9/fs/ext
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-@@ -4400,6 +4421,14 @@ static int ext4_remount(struct super_blo
+@@ -4397,6 +4418,14 @@ static int ext4_remount(struct super_blo
if (sbi->s_mount_flags & EXT4_MF_FS_ABORTED)
ext4_abort(sb, "Abort forced by user");
@@ -3492,9 +3444,9 @@ diff -NurpP --minimal linux-3.4.45/fs/ext4/super.c linux-3.4.45-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.45/fs/fcntl.c linux-3.4.45-vs2.3.3.9/fs/fcntl.c
---- linux-3.4.45/fs/fcntl.c 2012-05-21 16:07:20.000000000 +0000
-+++ linux-3.4.45-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>
@@ -3521,9 +3473,9 @@ diff -NurpP --minimal linux-3.4.45/fs/fcntl.c linux-3.4.45-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.45/fs/file.c linux-3.4.45-vs2.3.3.9/fs/file.c
---- linux-3.4.45/fs/file.c 2012-05-21 16:07:20.000000000 +0000
-+++ linux-3.4.45-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>
@@ -3549,9 +3501,9 @@ diff -NurpP --minimal linux-3.4.45/fs/file.c linux-3.4.45-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.45/fs/file_table.c linux-3.4.45-vs2.3.3.9/fs/file_table.c
---- linux-3.4.45/fs/file_table.c 2012-05-21 16:07:20.000000000 +0000
-+++ linux-3.4.45-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>
@@ -3588,9 +3540,9 @@ diff -NurpP --minimal linux-3.4.45/fs/file_table.c linux-3.4.45-vs2.3.3.9/fs/fil
file_sb_list_del(file);
file_free(file);
}
-diff -NurpP --minimal linux-3.4.45/fs/fs_struct.c linux-3.4.45-vs2.3.3.9/fs/fs_struct.c
---- linux-3.4.45/fs/fs_struct.c 2012-05-21 16:07:20.000000000 +0000
-+++ linux-3.4.45-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>
@@ -3615,9 +3567,9 @@ diff -NurpP --minimal linux-3.4.45/fs/fs_struct.c linux-3.4.45-vs2.3.3.9/fs/fs_s
}
return fs;
}
-diff -NurpP --minimal linux-3.4.45/fs/gfs2/file.c linux-3.4.45-vs2.3.3.9/fs/gfs2/file.c
---- linux-3.4.45/fs/gfs2/file.c 2012-05-21 16:07:20.000000000 +0000
-+++ linux-3.4.45-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,
@@ -3740,9 +3692,9 @@ diff -NurpP --minimal linux-3.4.45/fs/gfs2/file.c linux-3.4.45-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.45/fs/gfs2/inode.h linux-3.4.45-vs2.3.3.9/fs/gfs2/inode.h
---- linux-3.4.45/fs/gfs2/inode.h 2012-01-09 15:14:54.000000000 +0000
-+++ linux-3.4.45-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;
@@ -3751,9 +3703,9 @@ diff -NurpP --minimal linux-3.4.45/fs/gfs2/inode.h linux-3.4.45-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.45/fs/inode.c linux-3.4.45-vs2.3.3.9/fs/inode.c
---- linux-3.4.45/fs/inode.c 2013-05-13 17:36:34.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/fs/inode.c 2013-05-13 18:16:08.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 */
@@ -3809,9 +3761,9 @@ diff -NurpP --minimal linux-3.4.45/fs/inode.c linux-3.4.45-vs2.3.3.9/fs/inode.c
}
EXPORT_SYMBOL(inode_init_owner);
-diff -NurpP --minimal linux-3.4.45/fs/ioctl.c linux-3.4.45-vs2.3.3.9/fs/ioctl.c
---- linux-3.4.45/fs/ioctl.c 2012-05-21 16:07:24.000000000 +0000
-+++ linux-3.4.45-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>
@@ -3822,9 +3774,9 @@ diff -NurpP --minimal linux-3.4.45/fs/ioctl.c linux-3.4.45-vs2.3.3.9/fs/ioctl.c
#include <asm/ioctls.h>
-diff -NurpP --minimal linux-3.4.45/fs/ioprio.c linux-3.4.45-vs2.3.3.9/fs/ioprio.c
---- linux-3.4.45/fs/ioprio.c 2012-03-19 18:47:25.000000000 +0000
-+++ linux-3.4.45-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>
@@ -3851,9 +3803,9 @@ diff -NurpP --minimal linux-3.4.45/fs/ioprio.c linux-3.4.45-vs2.3.3.9/fs/ioprio.
tmpio = get_task_ioprio(p);
if (tmpio < 0)
continue;
-diff -NurpP --minimal linux-3.4.45/fs/jfs/file.c linux-3.4.45-vs2.3.3.9/fs/jfs/file.c
---- linux-3.4.45/fs/jfs/file.c 2011-10-24 16:45:27.000000000 +0000
-+++ linux-3.4.45-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);
@@ -3872,9 +3824,9 @@ diff -NurpP --minimal linux-3.4.45/fs/jfs/file.c linux-3.4.45-vs2.3.3.9/fs/jfs/f
};
const struct file_operations jfs_file_operations = {
-diff -NurpP --minimal linux-3.4.45/fs/jfs/ioctl.c linux-3.4.45-vs2.3.3.9/fs/jfs/ioctl.c
---- linux-3.4.45/fs/jfs/ioctl.c 2012-03-19 18:47:25.000000000 +0000
-+++ linux-3.4.45-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>
@@ -3932,9 +3884,9 @@ diff -NurpP --minimal linux-3.4.45/fs/jfs/ioctl.c linux-3.4.45-vs2.3.3.9/fs/jfs/
flags |= oldflags & ~JFS_FL_USER_MODIFIABLE;
jfs_inode->mode2 = flags;
-diff -NurpP --minimal linux-3.4.45/fs/jfs/jfs_dinode.h linux-3.4.45-vs2.3.3.9/fs/jfs/jfs_dinode.h
---- linux-3.4.45/fs/jfs/jfs_dinode.h 2008-12-24 23:26:37.000000000 +0000
-+++ linux-3.4.45-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 */
@@ -3951,9 +3903,9 @@ diff -NurpP --minimal linux-3.4.45/fs/jfs/jfs_dinode.h linux-3.4.45-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.45/fs/jfs/jfs_filsys.h linux-3.4.45-vs2.3.3.9/fs/jfs/jfs_filsys.h
---- linux-3.4.45/fs/jfs/jfs_filsys.h 2008-12-24 23:26:37.000000000 +0000
-+++ linux-3.4.45-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
@@ -3962,9 +3914,9 @@ diff -NurpP --minimal linux-3.4.45/fs/jfs/jfs_filsys.h linux-3.4.45-vs2.3.3.9/fs
/*
* file system state (superblock state)
-diff -NurpP --minimal linux-3.4.45/fs/jfs/jfs_imap.c linux-3.4.45-vs2.3.3.9/fs/jfs/jfs_imap.c
---- linux-3.4.45/fs/jfs/jfs_imap.c 2012-01-09 15:14:54.000000000 +0000
-+++ linux-3.4.45-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>
@@ -4024,9 +3976,9 @@ diff -NurpP --minimal linux-3.4.45/fs/jfs/jfs_imap.c linux-3.4.45-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.45/fs/jfs/jfs_inode.c linux-3.4.45-vs2.3.3.9/fs/jfs/jfs_inode.c
---- linux-3.4.45/fs/jfs/jfs_inode.c 2012-01-09 15:14:54.000000000 +0000
-+++ linux-3.4.45-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>
@@ -4100,9 +4052,9 @@ diff -NurpP --minimal linux-3.4.45/fs/jfs/jfs_inode.c linux-3.4.45-vs2.3.3.9/fs/
}
/*
-diff -NurpP --minimal linux-3.4.45/fs/jfs/jfs_inode.h linux-3.4.45-vs2.3.3.9/fs/jfs/jfs_inode.h
---- linux-3.4.45/fs/jfs/jfs_inode.h 2011-10-24 16:45:27.000000000 +0000
-+++ linux-3.4.45-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);
@@ -4111,9 +4063,9 @@ diff -NurpP --minimal linux-3.4.45/fs/jfs/jfs_inode.h linux-3.4.45-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.45/fs/jfs/namei.c linux-3.4.45-vs2.3.3.9/fs/jfs/namei.c
---- linux-3.4.45/fs/jfs/namei.c 2012-05-21 16:07:25.000000000 +0000
-+++ linux-3.4.45-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>
@@ -4138,9 +4090,9 @@ diff -NurpP --minimal linux-3.4.45/fs/jfs/namei.c linux-3.4.45-vs2.3.3.9/fs/jfs/
};
const struct file_operations jfs_dir_operations = {
-diff -NurpP --minimal linux-3.4.45/fs/jfs/super.c linux-3.4.45-vs2.3.3.9/fs/jfs/super.c
---- linux-3.4.45/fs/jfs/super.c 2012-05-21 16:07:25.000000000 +0000
-+++ linux-3.4.45-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,
@@ -4206,9 +4158,9 @@ diff -NurpP --minimal linux-3.4.45/fs/jfs/super.c linux-3.4.45-vs2.3.3.9/fs/jfs/
if (newLVSize) {
printk(KERN_ERR "resize option for remount only\n");
-diff -NurpP --minimal linux-3.4.45/fs/libfs.c linux-3.4.45-vs2.3.3.9/fs/libfs.c
---- linux-3.4.45/fs/libfs.c 2012-05-21 16:07:25.000000000 +0000
-+++ linux-3.4.45-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.
*/
@@ -4254,9 +4206,9 @@ diff -NurpP --minimal linux-3.4.45/fs/libfs.c linux-3.4.45-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.45/fs/locks.c linux-3.4.45-vs2.3.3.9/fs/locks.c
---- linux-3.4.45/fs/locks.c 2013-05-13 17:36:34.000000000 +0000
-+++ linux-3.4.45-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>
@@ -4454,9 +4406,9 @@ diff -NurpP --minimal linux-3.4.45/fs/locks.c linux-3.4.45-vs2.3.3.9/fs/locks.c
return 0;
}
-diff -NurpP --minimal linux-3.4.45/fs/mount.h linux-3.4.45-vs2.3.3.9/fs/mount.h
---- linux-3.4.45/fs/mount.h 2012-03-19 18:47:26.000000000 +0000
-+++ linux-3.4.45-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;
@@ -4465,9 +4417,9 @@ diff -NurpP --minimal linux-3.4.45/fs/mount.h linux-3.4.45-vs2.3.3.9/fs/mount.h
};
static inline struct mount *real_mount(struct vfsmount *mnt)
-diff -NurpP --minimal linux-3.4.45/fs/namei.c linux-3.4.45-vs2.3.3.9/fs/namei.c
---- linux-3.4.45/fs/namei.c 2012-05-21 16:07:25.000000000 +0000
-+++ linux-3.4.45-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>
@@ -4995,9 +4947,9 @@ diff -NurpP --minimal linux-3.4.45/fs/namei.c linux-3.4.45-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.45/fs/namespace.c linux-3.4.45-vs2.3.3.9/fs/namespace.c
---- linux-3.4.45/fs/namespace.c 2013-05-13 17:36:34.000000000 +0000
-+++ linux-3.4.45-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 */
@@ -5184,9 +5136,9 @@ diff -NurpP --minimal linux-3.4.45/fs/namespace.c linux-3.4.45-vs2.3.3.9/fs/name
kfree(ns);
}
-diff -NurpP --minimal linux-3.4.45/fs/nfs/client.c linux-3.4.45-vs2.3.3.9/fs/nfs/client.c
---- linux-3.4.45/fs/nfs/client.c 2013-05-13 17:36:34.000000000 +0000
-+++ linux-3.4.45-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;
@@ -5208,9 +5160,9 @@ diff -NurpP --minimal linux-3.4.45/fs/nfs/client.c linux-3.4.45-vs2.3.3.9/fs/nfs
server->maxfilesize = fsinfo->maxfilesize;
server->time_delta = fsinfo->time_delta;
-diff -NurpP --minimal linux-3.4.45/fs/nfs/dir.c linux-3.4.45-vs2.3.3.9/fs/nfs/dir.c
---- linux-3.4.45/fs/nfs/dir.c 2013-05-13 17:36:35.000000000 +0000
-+++ linux-3.4.45-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>
@@ -5227,9 +5179,9 @@ diff -NurpP --minimal linux-3.4.45/fs/nfs/dir.c linux-3.4.45-vs2.3.3.9/fs/nfs/di
no_entry:
res = d_materialise_unique(dentry, inode);
if (res != NULL) {
-diff -NurpP --minimal linux-3.4.45/fs/nfs/inode.c linux-3.4.45-vs2.3.3.9/fs/nfs/inode.c
---- linux-3.4.45/fs/nfs/inode.c 2013-05-13 17:36:35.000000000 +0000
-+++ linux-3.4.45-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>
@@ -5381,9 +5333,9 @@ diff -NurpP --minimal linux-3.4.45/fs/nfs/inode.c linux-3.4.45-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.45/fs/nfs/nfs3xdr.c linux-3.4.45-vs2.3.3.9/fs/nfs/nfs3xdr.c
---- linux-3.4.45/fs/nfs/nfs3xdr.c 2012-05-21 16:07:25.000000000 +0000
-+++ linux-3.4.45-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>
@@ -5529,9 +5481,9 @@ diff -NurpP --minimal linux-3.4.45/fs/nfs/nfs3xdr.c linux-3.4.45-vs2.3.3.9/fs/nf
}
/*
-diff -NurpP --minimal linux-3.4.45/fs/nfs/super.c linux-3.4.45-vs2.3.3.9/fs/nfs/super.c
---- linux-3.4.45/fs/nfs/super.c 2013-05-13 17:36:35.000000000 +0000
-+++ linux-3.4.45-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>
@@ -5603,9 +5555,9 @@ diff -NurpP --minimal linux-3.4.45/fs/nfs/super.c linux-3.4.45-vs2.3.3.9/fs/nfs/
/*
* options that take text values
-diff -NurpP --minimal linux-3.4.45/fs/nfsd/auth.c linux-3.4.45-vs2.3.3.9/fs/nfsd/auth.c
---- linux-3.4.45/fs/nfsd/auth.c 2010-02-25 10:52:05.000000000 +0000
-+++ linux-3.4.45-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@monad.swb.de> */
@@ -5624,9 +5576,9 @@ diff -NurpP --minimal linux-3.4.45/fs/nfsd/auth.c linux-3.4.45-vs2.3.3.9/fs/nfsd
rqgi = rqstp->rq_cred.cr_group_info;
-diff -NurpP --minimal linux-3.4.45/fs/nfsd/nfs3xdr.c linux-3.4.45-vs2.3.3.9/fs/nfsd/nfs3xdr.c
---- linux-3.4.45/fs/nfsd/nfs3xdr.c 2012-05-21 16:07:26.000000000 +0000
-+++ linux-3.4.45-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 @@
*/
@@ -5677,9 +5629,9 @@ diff -NurpP --minimal linux-3.4.45/fs/nfsd/nfs3xdr.c linux-3.4.45-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.45/fs/nfsd/nfs4xdr.c linux-3.4.45-vs2.3.3.9/fs/nfsd/nfs4xdr.c
---- linux-3.4.45/fs/nfsd/nfs4xdr.c 2013-05-13 17:36:35.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/fs/nfsd/nfs4xdr.c 2013-05-13 18:16:08.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>
@@ -5688,7 +5640,7 @@ diff -NurpP --minimal linux-3.4.45/fs/nfsd/nfs4xdr.c linux-3.4.45-vs2.3.3.9/fs/n
#include "idmap.h"
#include "acl.h"
-@@ -2319,14 +2320,18 @@ out_acl:
+@@ -2325,14 +2326,18 @@ out_acl:
WRITE32(stat.nlink);
}
if (bmval1 & FATTR4_WORD1_OWNER) {
@@ -5709,9 +5661,9 @@ diff -NurpP --minimal linux-3.4.45/fs/nfsd/nfs4xdr.c linux-3.4.45-vs2.3.3.9/fs/n
if (status == nfserr_resource)
goto out_resource;
if (status)
-diff -NurpP --minimal linux-3.4.45/fs/nfsd/nfsxdr.c linux-3.4.45-vs2.3.3.9/fs/nfsd/nfsxdr.c
---- linux-3.4.45/fs/nfsd/nfsxdr.c 2011-05-22 14:17:53.000000000 +0000
-+++ linux-3.4.45-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"
@@ -5760,9 +5712,9 @@ diff -NurpP --minimal linux-3.4.45/fs/nfsd/nfsxdr.c linux-3.4.45-vs2.3.3.9/fs/nf
if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
*p++ = htonl(NFS_MAXPATHLEN);
-diff -NurpP --minimal linux-3.4.45/fs/ocfs2/dlmglue.c linux-3.4.45-vs2.3.3.9/fs/ocfs2/dlmglue.c
---- linux-3.4.45/fs/ocfs2/dlmglue.c 2013-05-13 17:36:35.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/fs/ocfs2/dlmglue.c 2013-03-02 15:26:44.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);
@@ -5779,9 +5731,9 @@ diff -NurpP --minimal linux-3.4.45/fs/ocfs2/dlmglue.c linux-3.4.45-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.45/fs/ocfs2/dlmglue.h linux-3.4.45-vs2.3.3.9/fs/ocfs2/dlmglue.h
---- linux-3.4.45/fs/ocfs2/dlmglue.h 2010-10-21 11:07:50.000000000 +0000
-+++ linux-3.4.45-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;
@@ -5792,9 +5744,9 @@ diff -NurpP --minimal linux-3.4.45/fs/ocfs2/dlmglue.h linux-3.4.45-vs2.3.3.9/fs/
};
#define OCFS2_QINFO_LVB_VERSION 1
-diff -NurpP --minimal linux-3.4.45/fs/ocfs2/file.c linux-3.4.45-vs2.3.3.9/fs/ocfs2/file.c
---- linux-3.4.45/fs/ocfs2/file.c 2013-05-13 17:36:35.000000000 +0000
-+++ linux-3.4.45-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;
@@ -5804,9 +5756,9 @@ diff -NurpP --minimal linux-3.4.45/fs/ocfs2/file.c linux-3.4.45-vs2.3.3.9/fs/ocf
if (!(attr->ia_valid & OCFS2_VALID_ATTRS))
return 0;
-diff -NurpP --minimal linux-3.4.45/fs/ocfs2/inode.c linux-3.4.45-vs2.3.3.9/fs/ocfs2/inode.c
---- linux-3.4.45/fs/ocfs2/inode.c 2012-01-09 15:14:55.000000000 +0000
-+++ linux-3.4.45-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>
@@ -5903,9 +5855,9 @@ diff -NurpP --minimal linux-3.4.45/fs/ocfs2/inode.c linux-3.4.45-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.45/fs/ocfs2/inode.h linux-3.4.45-vs2.3.3.9/fs/ocfs2/inode.h
---- linux-3.4.45/fs/ocfs2/inode.h 2012-01-09 15:14:55.000000000 +0000
-+++ linux-3.4.45-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);
@@ -5914,9 +5866,9 @@ diff -NurpP --minimal linux-3.4.45/fs/ocfs2/inode.h linux-3.4.45-vs2.3.3.9/fs/oc
static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode)
{
-diff -NurpP --minimal linux-3.4.45/fs/ocfs2/ioctl.c linux-3.4.45-vs2.3.3.9/fs/ocfs2/ioctl.c
---- linux-3.4.45/fs/ocfs2/ioctl.c 2012-05-21 16:07:26.000000000 +0000
-+++ linux-3.4.45-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;
}
@@ -5980,9 +5932,9 @@ diff -NurpP --minimal linux-3.4.45/fs/ocfs2/ioctl.c linux-3.4.45-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.45/fs/ocfs2/namei.c linux-3.4.45-vs2.3.3.9/fs/ocfs2/namei.c
---- linux-3.4.45/fs/ocfs2/namei.c 2012-03-19 18:47:26.000000000 +0000
-+++ linux-3.4.45-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>
@@ -6013,9 +5965,9 @@ diff -NurpP --minimal linux-3.4.45/fs/ocfs2/namei.c linux-3.4.45-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.45/fs/ocfs2/ocfs2.h linux-3.4.45-vs2.3.3.9/fs/ocfs2/ocfs2.h
---- linux-3.4.45/fs/ocfs2/ocfs2.h 2012-01-09 15:14:55.000000000 +0000
-+++ linux-3.4.45-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 */
@@ -6024,9 +5976,9 @@ diff -NurpP --minimal linux-3.4.45/fs/ocfs2/ocfs2.h linux-3.4.45-vs2.3.3.9/fs/oc
};
#define OCFS2_OSB_SOFT_RO 0x0001
-diff -NurpP --minimal linux-3.4.45/fs/ocfs2/ocfs2_fs.h linux-3.4.45-vs2.3.3.9/fs/ocfs2/ocfs2_fs.h
---- linux-3.4.45/fs/ocfs2/ocfs2_fs.h 2011-05-22 14:17:53.000000000 +0000
-+++ linux-3.4.45-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 */
@@ -6039,9 +5991,9 @@ diff -NurpP --minimal linux-3.4.45/fs/ocfs2/ocfs2_fs.h linux-3.4.45-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.45/fs/ocfs2/super.c linux-3.4.45-vs2.3.3.9/fs/ocfs2/super.c
---- linux-3.4.45/fs/ocfs2/super.c 2012-05-21 16:07:26.000000000 +0000
-+++ linux-3.4.45-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,
@@ -6105,9 +6057,9 @@ diff -NurpP --minimal linux-3.4.45/fs/ocfs2/super.c linux-3.4.45-vs2.3.3.9/fs/oc
default:
mlog(ML_ERROR,
"Unrecognized mount option \"%s\" "
-diff -NurpP --minimal linux-3.4.45/fs/open.c linux-3.4.45-vs2.3.3.9/fs/open.c
---- linux-3.4.45/fs/open.c 2013-05-13 17:36:35.000000000 +0000
-+++ linux-3.4.45-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>
@@ -6199,9 +6151,9 @@ diff -NurpP --minimal linux-3.4.45/fs/open.c linux-3.4.45-vs2.3.3.9/fs/open.c
}
void put_unused_fd(unsigned int fd)
-diff -NurpP --minimal linux-3.4.45/fs/proc/array.c linux-3.4.45-vs2.3.3.9/fs/proc/array.c
---- linux-3.4.45/fs/proc/array.c 2012-05-21 16:07:26.000000000 +0000
-+++ linux-3.4.45-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>
@@ -6315,9 +6267,9 @@ diff -NurpP --minimal linux-3.4.45/fs/proc/array.c linux-3.4.45-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.45/fs/proc/base.c linux-3.4.45-vs2.3.3.9/fs/proc/base.c
---- linux-3.4.45/fs/proc/base.c 2013-05-13 17:36:35.000000000 +0000
-+++ linux-3.4.45-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>
@@ -6479,9 +6431,9 @@ diff -NurpP --minimal linux-3.4.45/fs/proc/base.c linux-3.4.45-vs2.3.3.9/fs/proc
ns = dentry->d_sb->s_fs_info;
rcu_read_lock();
-diff -NurpP --minimal linux-3.4.45/fs/proc/generic.c linux-3.4.45-vs2.3.3.9/fs/proc/generic.c
---- linux-3.4.45/fs/proc/generic.c 2012-03-19 18:47:26.000000000 +0000
-+++ linux-3.4.45-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>
@@ -6541,9 +6493,9 @@ diff -NurpP --minimal linux-3.4.45/fs/proc/generic.c linux-3.4.45-vs2.3.3.9/fs/p
} else {
kfree(ent);
ent = NULL;
-diff -NurpP --minimal linux-3.4.45/fs/proc/inode.c linux-3.4.45-vs2.3.3.9/fs/proc/inode.c
---- linux-3.4.45/fs/proc/inode.c 2012-05-21 16:07:26.000000000 +0000
-+++ linux-3.4.45-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;
@@ -6553,9 +6505,9 @@ diff -NurpP --minimal linux-3.4.45/fs/proc/inode.c linux-3.4.45-vs2.3.3.9/fs/pro
if (de->size)
inode->i_size = de->size;
if (de->nlink)
-diff -NurpP --minimal linux-3.4.45/fs/proc/internal.h linux-3.4.45-vs2.3.3.9/fs/proc/internal.h
---- linux-3.4.45/fs/proc/internal.h 2012-05-21 16:07:26.000000000 +0000
-+++ linux-3.4.45-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 @@
*/
@@ -6593,9 +6545,9 @@ diff -NurpP --minimal linux-3.4.45/fs/proc/internal.h linux-3.4.45-vs2.3.3.9/fs/
static inline int proc_fd(struct inode *inode)
{
return PROC_I(inode)->fd;
-diff -NurpP --minimal linux-3.4.45/fs/proc/loadavg.c linux-3.4.45-vs2.3.3.9/fs/proc/loadavg.c
---- linux-3.4.45/fs/proc/loadavg.c 2009-09-10 13:26:23.000000000 +0000
-+++ linux-3.4.45-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)
@@ -6625,9 +6577,9 @@ diff -NurpP --minimal linux-3.4.45/fs/proc/loadavg.c linux-3.4.45-vs2.3.3.9/fs/p
task_active_pid_ns(current)->last_pid);
return 0;
}
-diff -NurpP --minimal linux-3.4.45/fs/proc/meminfo.c linux-3.4.45-vs2.3.3.9/fs/proc/meminfo.c
---- linux-3.4.45/fs/proc/meminfo.c 2012-01-09 15:14:55.000000000 +0000
-+++ linux-3.4.45-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;
@@ -6638,9 +6590,9 @@ diff -NurpP --minimal linux-3.4.45/fs/proc/meminfo.c linux-3.4.45-vs2.3.3.9/fs/p
total_swapcache_pages - i.bufferram;
if (cached < 0)
cached = 0;
-diff -NurpP --minimal linux-3.4.45/fs/proc/root.c linux-3.4.45-vs2.3.3.9/fs/proc/root.c
---- linux-3.4.45/fs/proc/root.c 2012-05-21 16:07:26.000000000 +0000
-+++ linux-3.4.45-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>
@@ -6672,9 +6624,9 @@ diff -NurpP --minimal linux-3.4.45/fs/proc/root.c linux-3.4.45-vs2.3.3.9/fs/proc
.name = "/proc",
};
-diff -NurpP --minimal linux-3.4.45/fs/proc/stat.c linux-3.4.45-vs2.3.3.9/fs/proc/stat.c
---- linux-3.4.45/fs/proc/stat.c 2013-05-13 17:36:35.000000000 +0000
-+++ linux-3.4.45-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>
@@ -6694,9 +6646,9 @@ diff -NurpP --minimal linux-3.4.45/fs/proc/stat.c linux-3.4.45-vs2.3.3.9/fs/proc
jif = boottime.tv_sec;
for_each_possible_cpu(i) {
-diff -NurpP --minimal linux-3.4.45/fs/proc/uptime.c linux-3.4.45-vs2.3.3.9/fs/proc/uptime.c
---- linux-3.4.45/fs/proc/uptime.c 2012-03-19 18:47:26.000000000 +0000
-+++ linux-3.4.45-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>
@@ -6716,9 +6668,9 @@ diff -NurpP --minimal linux-3.4.45/fs/proc/uptime.c linux-3.4.45-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.45/fs/proc_namespace.c linux-3.4.45-vs2.3.3.9/fs/proc_namespace.c
---- linux-3.4.45/fs/proc_namespace.c 2012-03-19 18:47:26.000000000 +0000
-+++ linux-3.4.45-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" },
@@ -6828,9 +6780,9 @@ diff -NurpP --minimal linux-3.4.45/fs/proc_namespace.c linux-3.4.45-vs2.3.3.9/fs
/* file system type */
seq_puts(m, "with fstype ");
show_type(m, sb);
-diff -NurpP --minimal linux-3.4.45/fs/quota/dquot.c linux-3.4.45-vs2.3.3.9/fs/quota/dquot.c
---- linux-3.4.45/fs/quota/dquot.c 2012-05-21 16:07:26.000000000 +0000
-+++ linux-3.4.45-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;
@@ -6869,9 +6821,9 @@ diff -NurpP --minimal linux-3.4.45/fs/quota/dquot.c linux-3.4.45-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.45/fs/quota/quota.c linux-3.4.45-vs2.3.3.9/fs/quota/quota.c
---- linux-3.4.45/fs/quota/quota.c 2012-05-21 16:07:26.000000000 +0000
-+++ linux-3.4.45-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>
@@ -6959,9 +6911,9 @@ diff -NurpP --minimal linux-3.4.45/fs/quota/quota.c linux-3.4.45-vs2.3.3.9/fs/qu
if (quotactl_cmd_write(cmd))
sb = get_super_thawed(bdev);
else
-diff -NurpP --minimal linux-3.4.45/fs/reiserfs/file.c linux-3.4.45-vs2.3.3.9/fs/reiserfs/file.c
---- linux-3.4.45/fs/reiserfs/file.c 2012-05-21 16:07:26.000000000 +0000
-+++ linux-3.4.45-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,
@@ -6969,9 +6921,9 @@ diff -NurpP --minimal linux-3.4.45/fs/reiserfs/file.c linux-3.4.45-vs2.3.3.9/fs/
+ .sync_flags = reiserfs_sync_flags,
.get_acl = reiserfs_get_acl,
};
-diff -NurpP --minimal linux-3.4.45/fs/reiserfs/inode.c linux-3.4.45-vs2.3.3.9/fs/reiserfs/inode.c
---- linux-3.4.45/fs/reiserfs/inode.c 2013-05-13 17:36:35.000000000 +0000
-+++ linux-3.4.45-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>
@@ -7137,9 +7089,9 @@ diff -NurpP --minimal linux-3.4.45/fs/reiserfs/inode.c linux-3.4.45-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.45/fs/reiserfs/ioctl.c linux-3.4.45-vs2.3.3.9/fs/reiserfs/ioctl.c
---- linux-3.4.45/fs/reiserfs/ioctl.c 2012-05-21 16:07:27.000000000 +0000
-+++ linux-3.4.45-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>
@@ -7201,9 +7153,9 @@ diff -NurpP --minimal linux-3.4.45/fs/reiserfs/ioctl.c linux-3.4.45-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.45/fs/reiserfs/namei.c linux-3.4.45-vs2.3.3.9/fs/reiserfs/namei.c
---- linux-3.4.45/fs/reiserfs/namei.c 2012-05-21 16:07:27.000000000 +0000
-+++ linux-3.4.45-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"
@@ -7220,9 +7172,9 @@ diff -NurpP --minimal linux-3.4.45/fs/reiserfs/namei.c linux-3.4.45-vs2.3.3.9/fs
return d_splice_alias(inode, dentry);
}
-diff -NurpP --minimal linux-3.4.45/fs/reiserfs/reiserfs.h linux-3.4.45-vs2.3.3.9/fs/reiserfs/reiserfs.h
---- linux-3.4.45/fs/reiserfs/reiserfs.h 2012-05-21 16:07:27.000000000 +0000
-+++ linux-3.4.45-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,
@@ -7261,9 +7213,9 @@ diff -NurpP --minimal linux-3.4.45/fs/reiserfs/reiserfs.h linux-3.4.45-vs2.3.3.9
int __reiserfs_write_begin(struct page *page, unsigned from, unsigned len);
-diff -NurpP --minimal linux-3.4.45/fs/reiserfs/super.c linux-3.4.45-vs2.3.3.9/fs/reiserfs/super.c
---- linux-3.4.45/fs/reiserfs/super.c 2013-05-13 17:36:35.000000000 +0000
-+++ linux-3.4.45-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},
@@ -7305,9 +7257,9 @@ diff -NurpP --minimal linux-3.4.45/fs/reiserfs/super.c linux-3.4.45-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.45/fs/reiserfs/xattr.c linux-3.4.45-vs2.3.3.9/fs/reiserfs/xattr.c
---- linux-3.4.45/fs/reiserfs/xattr.c 2013-05-13 17:36:35.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/fs/reiserfs/xattr.c 2013-05-13 18:16:08.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>
@@ -7316,9 +7268,9 @@ diff -NurpP --minimal linux-3.4.45/fs/reiserfs/xattr.c linux-3.4.45-vs2.3.3.9/fs
#include <linux/file.h>
#include <linux/pagemap.h>
#include <linux/xattr.h>
-diff -NurpP --minimal linux-3.4.45/fs/stat.c linux-3.4.45-vs2.3.3.9/fs/stat.c
---- linux-3.4.45/fs/stat.c 2013-05-13 17:36:35.000000000 +0000
-+++ linux-3.4.45-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;
@@ -7327,9 +7279,9 @@ diff -NurpP --minimal linux-3.4.45/fs/stat.c linux-3.4.45-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.45/fs/statfs.c linux-3.4.45-vs2.3.3.9/fs/statfs.c
---- linux-3.4.45/fs/statfs.c 2012-05-21 16:07:27.000000000 +0000
-+++ linux-3.4.45-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>
@@ -7348,9 +7300,9 @@ diff -NurpP --minimal linux-3.4.45/fs/statfs.c linux-3.4.45-vs2.3.3.9/fs/statfs.
return retval;
}
-diff -NurpP --minimal linux-3.4.45/fs/super.c linux-3.4.45-vs2.3.3.9/fs/super.c
---- linux-3.4.45/fs/super.c 2012-05-21 16:07:27.000000000 +0000
-+++ linux-3.4.45-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>
@@ -7374,9 +7326,9 @@ diff -NurpP --minimal linux-3.4.45/fs/super.c linux-3.4.45-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.45/fs/sysfs/mount.c linux-3.4.45-vs2.3.3.9/fs/sysfs/mount.c
---- linux-3.4.45/fs/sysfs/mount.c 2012-05-21 16:07:27.000000000 +0000
-+++ linux-3.4.45-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;
@@ -7386,9 +7338,9 @@ diff -NurpP --minimal linux-3.4.45/fs/sysfs/mount.c linux-3.4.45-vs2.3.3.9/fs/sy
sb->s_op = &sysfs_ops;
sb->s_time_gran = 1;
-diff -NurpP --minimal linux-3.4.45/fs/utimes.c linux-3.4.45-vs2.3.3.9/fs/utimes.c
---- linux-3.4.45/fs/utimes.c 2011-05-22 14:17:54.000000000 +0000
-+++ linux-3.4.45-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>
@@ -7418,9 +7370,9 @@ diff -NurpP --minimal linux-3.4.45/fs/utimes.c linux-3.4.45-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.45/fs/xattr.c linux-3.4.45-vs2.3.3.9/fs/xattr.c
---- linux-3.4.45/fs/xattr.c 2012-05-21 16:07:27.000000000 +0000
-+++ linux-3.4.45-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>
@@ -7438,9 +7390,9 @@ diff -NurpP --minimal linux-3.4.45/fs/xattr.c linux-3.4.45-vs2.3.3.9/fs/xattr.c
return (mask & MAY_WRITE) ? -EPERM : -ENODATA;
return 0;
}
-diff -NurpP --minimal linux-3.4.45/fs/xfs/xfs_dinode.h linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_dinode.h
---- linux-3.4.45/fs/xfs/xfs_dinode.h 2011-10-24 16:45:31.000000000 +0000
-+++ linux-3.4.45-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 */
@@ -7481,9 +7433,9 @@ diff -NurpP --minimal linux-3.4.45/fs/xfs/xfs_dinode.h linux-3.4.45-vs2.3.3.9/fs
+#define XFS_DIVFLAG_COW 0x02
#endif /* __XFS_DINODE_H__ */
-diff -NurpP --minimal linux-3.4.45/fs/xfs/xfs_fs.h linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_fs.h
---- linux-3.4.45/fs/xfs/xfs_fs.h 2011-10-24 16:45:31.000000000 +0000
-+++ linux-3.4.45-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 */
@@ -7504,9 +7456,9 @@ diff -NurpP --minimal linux-3.4.45/fs/xfs/xfs_fs.h linux-3.4.45-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.45/fs/xfs/xfs_ialloc.c linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_ialloc.c
---- linux-3.4.45/fs/xfs/xfs_ialloc.c 2012-03-19 18:47:27.000000000 +0000
-+++ linux-3.4.45-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"
@@ -7515,9 +7467,9 @@ diff -NurpP --minimal linux-3.4.45/fs/xfs/xfs_ialloc.c linux-3.4.45-vs2.3.3.9/fs
/*
* Allocation group level functions.
*/
-diff -NurpP --minimal linux-3.4.45/fs/xfs/xfs_inode.c linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_inode.c
---- linux-3.4.45/fs/xfs/xfs_inode.c 2012-05-21 16:07:27.000000000 +0000
-+++ linux-3.4.45-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;
}
@@ -7692,9 +7644,9 @@ diff -NurpP --minimal linux-3.4.45/fs/xfs/xfs_inode.c linux-3.4.45-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.45/fs/xfs/xfs_inode.h linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_inode.h
---- linux-3.4.45/fs/xfs/xfs_inode.h 2012-05-21 16:07:27.000000000 +0000
-+++ linux-3.4.45-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 */
@@ -7715,9 +7667,9 @@ diff -NurpP --minimal linux-3.4.45/fs/xfs/xfs_inode.h linux-3.4.45-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.45/fs/xfs/xfs_ioctl.c linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_ioctl.c
---- linux-3.4.45/fs/xfs/xfs_ioctl.c 2012-05-21 16:07:27.000000000 +0000
-+++ linux-3.4.45-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"
@@ -7786,9 +7738,9 @@ diff -NurpP --minimal linux-3.4.45/fs/xfs/xfs_ioctl.c linux-3.4.45-vs2.3.3.9/fs/
return xfs_ioc_setxflags(ip, filp, arg);
case XFS_IOC_FSSETDM: {
-diff -NurpP --minimal linux-3.4.45/fs/xfs/xfs_ioctl.h linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_ioctl.h
---- linux-3.4.45/fs/xfs/xfs_ioctl.h 2011-10-24 16:45:31.000000000 +0000
-+++ linux-3.4.45-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);
@@ -7802,9 +7754,9 @@ diff -NurpP --minimal linux-3.4.45/fs/xfs/xfs_ioctl.h linux-3.4.45-vs2.3.3.9/fs/
extern long
xfs_file_ioctl(
struct file *filp,
-diff -NurpP --minimal linux-3.4.45/fs/xfs/xfs_iops.c linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_iops.c
---- linux-3.4.45/fs/xfs/xfs_iops.c 2012-05-21 16:07:27.000000000 +0000
-+++ linux-3.4.45-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"
@@ -7880,9 +7832,9 @@ diff -NurpP --minimal linux-3.4.45/fs/xfs/xfs_iops.c linux-3.4.45-vs2.3.3.9/fs/x
switch (inode->i_mode & S_IFMT) {
case S_IFBLK:
-diff -NurpP --minimal linux-3.4.45/fs/xfs/xfs_itable.c linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_itable.c
---- linux-3.4.45/fs/xfs/xfs_itable.c 2012-05-21 16:07:27.000000000 +0000
-+++ linux-3.4.45-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;
@@ -7891,9 +7843,9 @@ diff -NurpP --minimal linux-3.4.45/fs/xfs/xfs_itable.c linux-3.4.45-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.45/fs/xfs/xfs_linux.h linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_linux.h
---- linux-3.4.45/fs/xfs/xfs_linux.h 2011-10-24 16:45:31.000000000 +0000
-+++ linux-3.4.45-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())
@@ -7902,9 +7854,9 @@ diff -NurpP --minimal linux-3.4.45/fs/xfs/xfs_linux.h linux-3.4.45-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.45/fs/xfs/xfs_log_recover.c linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_log_recover.c
---- linux-3.4.45/fs/xfs/xfs_log_recover.c 2013-05-13 17:36:35.000000000 +0000
-+++ linux-3.4.45-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(
}
@@ -7915,9 +7867,9 @@ diff -NurpP --minimal linux-3.4.45/fs/xfs/xfs_log_recover.c linux-3.4.45-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.45/fs/xfs/xfs_mount.h linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_mount.h
---- linux-3.4.45/fs/xfs/xfs_mount.h 2012-05-21 16:07:28.000000000 +0000
-+++ linux-3.4.45-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 */
@@ -7926,9 +7878,9 @@ diff -NurpP --minimal linux-3.4.45/fs/xfs/xfs_mount.h linux-3.4.45-vs2.3.3.9/fs/
/*
* Default minimum read and write sizes.
-diff -NurpP --minimal linux-3.4.45/fs/xfs/xfs_super.c linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_super.c
---- linux-3.4.45/fs/xfs/xfs_super.c 2012-05-21 16:07:28.000000000 +0000
-+++ linux-3.4.45-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 */
@@ -8001,9 +7953,9 @@ diff -NurpP --minimal linux-3.4.45/fs/xfs/xfs_super.c linux-3.4.45-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.45/fs/xfs/xfs_vnodeops.c linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_vnodeops.c
---- linux-3.4.45/fs/xfs/xfs_vnodeops.c 2012-05-21 16:07:28.000000000 +0000
-+++ linux-3.4.45-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;
}
@@ -8082,9 +8034,9 @@ diff -NurpP --minimal linux-3.4.45/fs/xfs/xfs_vnodeops.c linux-3.4.45-vs2.3.3.9/
int
xfs_readlink(
xfs_inode_t *ip,
-diff -NurpP --minimal linux-3.4.45/include/linux/Kbuild linux-3.4.45-vs2.3.3.9/include/linux/Kbuild
---- linux-3.4.45/include/linux/Kbuild 2013-05-13 17:36:35.000000000 +0000
-+++ linux-3.4.45-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/
@@ -8093,9 +8045,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/Kbuild linux-3.4.45-vs2.3.3.9/i
header-y += wimax/
objhdr-y += version.h
-diff -NurpP --minimal linux-3.4.45/include/linux/capability.h linux-3.4.45-vs2.3.3.9/include/linux/capability.h
---- linux-3.4.45/include/linux/capability.h 2012-03-19 18:47:27.000000000 +0000
-+++ linux-3.4.45-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 */
@@ -8118,9 +8070,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/capability.h linux-3.4.45-vs2.3
/*
* Bit location of each capability (used by user-space library and kernel)
-diff -NurpP --minimal linux-3.4.45/include/linux/cred.h linux-3.4.45-vs2.3.3.9/include/linux/cred.h
---- linux-3.4.45/include/linux/cred.h 2012-03-19 18:47:27.000000000 +0000
-+++ linux-3.4.45-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 *);
@@ -8161,18 +8113,18 @@ diff -NurpP --minimal linux-3.4.45/include/linux/cred.h linux-3.4.45-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.45/include/linux/devpts_fs.h linux-3.4.45-vs2.3.3.9/include/linux/devpts_fs.h
---- linux-3.4.45/include/linux/devpts_fs.h 2008-12-24 23:26:37.000000000 +0000
-+++ linux-3.4.45-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.45/include/linux/fs.h linux-3.4.45-vs2.3.3.9/include/linux/fs.h
---- linux-3.4.45/include/linux/fs.h 2012-05-21 16:07:29.000000000 +0000
-+++ linux-3.4.45-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 */
@@ -8350,9 +8302,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/fs.h linux-3.4.45-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.45/include/linux/gfs2_ondisk.h linux-3.4.45-vs2.3.3.9/include/linux/gfs2_ondisk.h
---- linux-3.4.45/include/linux/gfs2_ondisk.h 2012-05-21 16:07:29.000000000 +0000
-+++ linux-3.4.45-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,
@@ -8373,9 +8325,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/gfs2_ondisk.h linux-3.4.45-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.45/include/linux/if_tun.h linux-3.4.45-vs2.3.3.9/include/linux/if_tun.h
---- linux-3.4.45/include/linux/if_tun.h 2010-08-02 14:52:54.000000000 +0000
-+++ linux-3.4.45-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)
@@ -8384,9 +8336,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/if_tun.h linux-3.4.45-vs2.3.3.9
/* TUNSETIFF ifr flags */
#define IFF_TUN 0x0001
-diff -NurpP --minimal linux-3.4.45/include/linux/init_task.h linux-3.4.45-vs2.3.3.9/include/linux/init_task.h
---- linux-3.4.45/include/linux/init_task.h 2013-05-13 17:36:35.000000000 +0000
-+++ linux-3.4.45-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) \
@@ -8398,9 +8350,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/init_task.h linux-3.4.45-vs2.3.
}
-diff -NurpP --minimal linux-3.4.45/include/linux/ipc.h linux-3.4.45-vs2.3.3.9/include/linux/ipc.h
---- linux-3.4.45/include/linux/ipc.h 2012-03-19 18:47:28.000000000 +0000
-+++ linux-3.4.45-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;
@@ -8409,9 +8361,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/ipc.h linux-3.4.45-vs2.3.3.9/in
uid_t cuid;
gid_t cgid;
umode_t mode;
-diff -NurpP --minimal linux-3.4.45/include/linux/ipc_namespace.h linux-3.4.45-vs2.3.3.9/include/linux/ipc_namespace.h
---- linux-3.4.45/include/linux/ipc_namespace.h 2013-05-13 17:36:35.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/include/linux/ipc_namespace.h 2013-05-13 18:16:08.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)
@@ -8438,9 +8390,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/ipc_namespace.h linux-3.4.45-vs
}
static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns)
-diff -NurpP --minimal linux-3.4.45/include/linux/loop.h linux-3.4.45-vs2.3.3.9/include/linux/loop.h
---- linux-3.4.45/include/linux/loop.h 2012-01-09 15:14:58.000000000 +0000
-+++ linux-3.4.45-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];
@@ -8449,9 +8401,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/loop.h linux-3.4.45-vs2.3.3.9/i
int (*ioctl)(struct loop_device *, int cmd,
unsigned long arg);
-diff -NurpP --minimal linux-3.4.45/include/linux/magic.h linux-3.4.45-vs2.3.3.9/include/linux/magic.h
---- linux-3.4.45/include/linux/magic.h 2012-05-21 16:07:31.000000000 +0000
-+++ linux-3.4.45-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
@@ -8461,9 +8413,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/magic.h linux-3.4.45-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.45/include/linux/major.h linux-3.4.45-vs2.3.3.9/include/linux/major.h
---- linux-3.4.45/include/linux/major.h 2009-09-10 13:26:25.000000000 +0000
-+++ linux-3.4.45-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
@@ -8472,9 +8424,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/major.h linux-3.4.45-vs2.3.3.9/
#define TTYAUX_MAJOR 5
#define LP_MAJOR 6
#define VCS_MAJOR 7
-diff -NurpP --minimal linux-3.4.45/include/linux/memcontrol.h linux-3.4.45-vs2.3.3.9/include/linux/memcontrol.h
---- linux-3.4.45/include/linux/memcontrol.h 2012-05-21 16:07:31.000000000 +0000
-+++ linux-3.4.45-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);
@@ -8489,9 +8441,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/memcontrol.h linux-3.4.45-vs2.3
static inline
int mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *cgroup)
{
-diff -NurpP --minimal linux-3.4.45/include/linux/mm_types.h linux-3.4.45-vs2.3.3.9/include/linux/mm_types.h
---- linux-3.4.45/include/linux/mm_types.h 2013-05-13 17:36:35.000000000 +0000
-+++ linux-3.4.45-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 */
@@ -8500,9 +8452,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/mm_types.h linux-3.4.45-vs2.3.3
/* Swap token stuff */
/*
-diff -NurpP --minimal linux-3.4.45/include/linux/mmzone.h linux-3.4.45-vs2.3.3.9/include/linux/mmzone.h
---- linux-3.4.45/include/linux/mmzone.h 2013-05-13 17:36:35.000000000 +0000
-+++ linux-3.4.45-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;\
})
@@ -8517,9 +8469,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/mmzone.h linux-3.4.45-vs2.3.3.9
#include <linux/memory_hotplug.h>
extern struct mutex zonelists_mutex;
-diff -NurpP --minimal linux-3.4.45/include/linux/mount.h linux-3.4.45-vs2.3.3.9/include/linux/mount.h
---- linux-3.4.45/include/linux/mount.h 2012-03-19 18:47:28.000000000 +0000
-+++ linux-3.4.45-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
@@ -8530,9 +8482,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/mount.h linux-3.4.45-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.45/include/linux/net.h linux-3.4.45-vs2.3.3.9/include/linux/net.h
---- linux-3.4.45/include/linux/net.h 2013-05-13 17:36:35.000000000 +0000
-+++ linux-3.4.45-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
@@ -8541,9 +8493,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/net.h linux-3.4.45-vs2.3.3.9/in
#ifndef ARCH_HAS_SOCKET_TYPES
/**
-diff -NurpP --minimal linux-3.4.45/include/linux/netdevice.h linux-3.4.45-vs2.3.3.9/include/linux/netdevice.h
---- linux-3.4.45/include/linux/netdevice.h 2013-05-13 17:36:36.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/include/linux/netdevice.h 2013-05-13 18:16:08.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);
@@ -8552,9 +8504,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/netdevice.h linux-3.4.45-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.45/include/linux/nfs_mount.h linux-3.4.45-vs2.3.3.9/include/linux/nfs_mount.h
---- linux-3.4.45/include/linux/nfs_mount.h 2011-01-05 20:50:31.000000000 +0000
-+++ linux-3.4.45-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 */
@@ -8565,9 +8517,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/nfs_mount.h linux-3.4.45-vs2.3.
/* The following are for internal use only */
#define NFS_MOUNT_LOOKUP_CACHE_NONEG 0x10000
-diff -NurpP --minimal linux-3.4.45/include/linux/nsproxy.h linux-3.4.45-vs2.3.3.9/include/linux/nsproxy.h
---- linux-3.4.45/include/linux/nsproxy.h 2011-10-24 16:45:32.000000000 +0000
-+++ linux-3.4.45-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>
@@ -8617,9 +8569,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/nsproxy.h linux-3.4.45-vs2.3.3.
}
#endif
-diff -NurpP --minimal linux-3.4.45/include/linux/pid.h linux-3.4.45-vs2.3.3.9/include/linux/pid.h
---- linux-3.4.45/include/linux/pid.h 2011-07-22 09:18:11.000000000 +0000
-+++ linux-3.4.45-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,
@@ -8638,9 +8590,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/pid.h linux-3.4.45-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.45/include/linux/proc_fs.h linux-3.4.45-vs2.3.3.9/include/linux/proc_fs.h
---- linux-3.4.45/include/linux/proc_fs.h 2012-03-19 18:47:28.000000000 +0000
-+++ linux-3.4.45-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;
@@ -8676,9 +8628,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/proc_fs.h linux-3.4.45-vs2.3.3.
int fd;
union proc_op op;
struct proc_dir_entry *pde;
-diff -NurpP --minimal linux-3.4.45/include/linux/quotaops.h linux-3.4.45-vs2.3.3.9/include/linux/quotaops.h
---- linux-3.4.45/include/linux/quotaops.h 2012-01-09 15:14:58.000000000 +0000
-+++ linux-3.4.45-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_
@@ -8720,9 +8672,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/quotaops.h linux-3.4.45-vs2.3.3
}
static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
-diff -NurpP --minimal linux-3.4.45/include/linux/reboot.h linux-3.4.45-vs2.3.3.9/include/linux/reboot.h
---- linux-3.4.45/include/linux/reboot.h 2011-10-24 16:45:32.000000000 +0000
-+++ linux-3.4.45-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
@@ -8731,9 +8683,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/reboot.h linux-3.4.45-vs2.3.3.9
#ifdef __KERNEL__
-diff -NurpP --minimal linux-3.4.45/include/linux/sched.h linux-3.4.45-vs2.3.3.9/include/linux/sched.h
---- linux-3.4.45/include/linux/sched.h 2013-05-13 17:36:36.000000000 +0000
-+++ linux-3.4.45-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;
@@ -8780,9 +8732,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/sched.h linux-3.4.45-vs2.3.3.9/
}
-diff -NurpP --minimal linux-3.4.45/include/linux/shmem_fs.h linux-3.4.45-vs2.3.3.9/include/linux/shmem_fs.h
---- linux-3.4.45/include/linux/shmem_fs.h 2012-03-19 18:47:29.000000000 +0000
-+++ linux-3.4.45-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 */
@@ -8793,9 +8745,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/shmem_fs.h linux-3.4.45-vs2.3.3
struct shmem_inode_info {
spinlock_t lock;
unsigned long flags;
-diff -NurpP --minimal linux-3.4.45/include/linux/stat.h linux-3.4.45-vs2.3.3.9/include/linux/stat.h
---- linux-3.4.45/include/linux/stat.h 2008-12-24 23:26:37.000000000 +0000
-+++ linux-3.4.45-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;
@@ -8804,9 +8756,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/stat.h linux-3.4.45-vs2.3.3.9/i
dev_t rdev;
loff_t size;
struct timespec atime;
-diff -NurpP --minimal linux-3.4.45/include/linux/sunrpc/auth.h linux-3.4.45-vs2.3.3.9/include/linux/sunrpc/auth.h
---- linux-3.4.45/include/linux/sunrpc/auth.h 2012-05-21 16:07:32.000000000 +0000
-+++ linux-3.4.45-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;
@@ -8815,9 +8767,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/sunrpc/auth.h linux-3.4.45-vs2.
struct group_info *group_info;
const char *principal;
unsigned char machine_cred : 1;
-diff -NurpP --minimal linux-3.4.45/include/linux/sunrpc/clnt.h linux-3.4.45-vs2.3.3.9/include/linux/sunrpc/clnt.h
---- linux-3.4.45/include/linux/sunrpc/clnt.h 2012-05-21 16:07:32.000000000 +0000
-+++ linux-3.4.45-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 */
@@ -8828,9 +8780,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/sunrpc/clnt.h linux-3.4.45-vs2.
struct rpc_rtt * cl_rtt; /* RTO estimator data */
const struct rpc_timeout *cl_timeout; /* Timeout strategy */
-diff -NurpP --minimal linux-3.4.45/include/linux/sysctl.h linux-3.4.45-vs2.3.3.9/include/linux/sysctl.h
---- linux-3.4.45/include/linux/sysctl.h 2012-05-21 16:07:32.000000000 +0000
-+++ linux-3.4.45-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) */
@@ -8847,9 +8799,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/sysctl.h linux-3.4.45-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.45/include/linux/sysfs.h linux-3.4.45-vs2.3.3.9/include/linux/sysfs.h
---- linux-3.4.45/include/linux/sysfs.h 2012-03-19 18:47:29.000000000 +0000
-+++ linux-3.4.45-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>
@@ -8859,9 +8811,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/sysfs.h linux-3.4.45-vs2.3.3.9/
struct kobject;
struct module;
enum kobj_ns_type;
-diff -NurpP --minimal linux-3.4.45/include/linux/time.h linux-3.4.45-vs2.3.3.9/include/linux/time.h
---- linux-3.4.45/include/linux/time.h 2013-05-13 17:36:36.000000000 +0000
-+++ linux-3.4.45-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;
}
@@ -8871,9 +8823,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/time.h linux-3.4.45-vs2.3.3.9/i
#endif /* __KERNEL__ */
/*
-diff -NurpP --minimal linux-3.4.45/include/linux/types.h linux-3.4.45-vs2.3.3.9/include/linux/types.h
---- linux-3.4.45/include/linux/types.h 2012-05-21 16:07:32.000000000 +0000
-+++ linux-3.4.45-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;
@@ -8884,9 +8836,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/types.h linux-3.4.45-vs2.3.3.9/
typedef unsigned long uintptr_t;
-diff -NurpP --minimal linux-3.4.45/include/linux/utsname.h linux-3.4.45-vs2.3.3.9/include/linux/utsname.h
---- linux-3.4.45/include/linux/utsname.h 2012-01-09 15:14:59.000000000 +0000
-+++ linux-3.4.45-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
}
@@ -8913,9 +8865,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/utsname.h linux-3.4.45-vs2.3.3.
}
#endif
-diff -NurpP --minimal linux-3.4.45/include/linux/vroot.h linux-3.4.45-vs2.3.3.9/include/linux/vroot.h
---- linux-3.4.45/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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 @@
+
+/*
@@ -8968,9 +8920,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vroot.h linux-3.4.45-vs2.3.3.9/
+#define VROOT_CLR_DEV 0x5601
+
+#endif /* _LINUX_VROOT_H */
-diff -NurpP --minimal linux-3.4.45/include/linux/vs_base.h linux-3.4.45-vs2.3.3.9/include/linux/vs_base.h
---- linux-3.4.45/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -8982,9 +8934,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vs_base.h linux-3.4.45-vs2.3.3.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.4.45/include/linux/vs_context.h linux-3.4.45-vs2.3.3.9/include/linux/vs_context.h
---- linux-3.4.45/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -9228,9 +9180,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vs_context.h linux-3.4.45-vs2.3
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.4.45/include/linux/vs_cowbl.h linux-3.4.45-vs2.3.3.9/include/linux/vs_cowbl.h
---- linux-3.4.45/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -9280,9 +9232,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vs_cowbl.h linux-3.4.45-vs2.3.3
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.4.45/include/linux/vs_cvirt.h linux-3.4.45-vs2.3.3.9/include/linux/vs_cvirt.h
---- linux-3.4.45/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -9334,9 +9286,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vs_cvirt.h linux-3.4.45-vs2.3.3
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.4.45/include/linux/vs_device.h linux-3.4.45-vs2.3.3.9/include/linux/vs_device.h
---- linux-3.4.45/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -9383,9 +9335,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vs_device.h linux-3.4.45-vs2.3.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.4.45/include/linux/vs_dlimit.h linux-3.4.45-vs2.3.3.9/include/linux/vs_dlimit.h
---- linux-3.4.45/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -9602,9 +9554,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vs_dlimit.h linux-3.4.45-vs2.3.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.4.45/include/linux/vs_inet.h linux-3.4.45-vs2.3.3.9/include/linux/vs_inet.h
---- linux-3.4.45/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -9959,9 +9911,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vs_inet.h linux-3.4.45-vs2.3.3.
+#else
+// #warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.4.45/include/linux/vs_inet6.h linux-3.4.45-vs2.3.3.9/include/linux/vs_inet6.h
---- linux-3.4.45/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -10209,9 +10161,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vs_inet6.h linux-3.4.45-vs2.3.3
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.4.45/include/linux/vs_limit.h linux-3.4.45-vs2.3.3.9/include/linux/vs_limit.h
---- linux-3.4.45/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -10353,9 +10305,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vs_limit.h linux-3.4.45-vs2.3.3
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.4.45/include/linux/vs_network.h linux-3.4.45-vs2.3.3.9/include/linux/vs_network.h
---- linux-3.4.45/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -10526,9 +10478,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vs_network.h linux-3.4.45-vs2.3
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.4.45/include/linux/vs_pid.h linux-3.4.45-vs2.3.3.9/include/linux/vs_pid.h
---- linux-3.4.45/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -10580,9 +10532,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vs_pid.h linux-3.4.45-vs2.3.3.9
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.4.45/include/linux/vs_sched.h linux-3.4.45-vs2.3.3.9/include/linux/vs_sched.h
---- linux-3.4.45/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -10624,9 +10576,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vs_sched.h linux-3.4.45-vs2.3.3
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.4.45/include/linux/vs_socket.h linux-3.4.45-vs2.3.3.9/include/linux/vs_socket.h
---- linux-3.4.45/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -10695,9 +10647,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vs_socket.h linux-3.4.45-vs2.3.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.4.45/include/linux/vs_tag.h linux-3.4.45-vs2.3.3.9/include/linux/vs_tag.h
---- linux-3.4.45/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -10746,9 +10698,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vs_tag.h linux-3.4.45-vs2.3.3.9
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.4.45/include/linux/vs_time.h linux-3.4.45-vs2.3.3.9/include/linux/vs_time.h
---- linux-3.4.45/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -10769,9 +10721,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vs_time.h linux-3.4.45-vs2.3.3.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.4.45/include/linux/vserver/Kbuild linux-3.4.45-vs2.3.3.9/include/linux/vserver/Kbuild
---- linux-3.4.45/include/linux/vserver/Kbuild 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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 \
@@ -10781,9 +10733,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vserver/Kbuild linux-3.4.45-vs2
+
+header-y += switch.h network.h monitor.h inode.h device.h
+
-diff -NurpP --minimal linux-3.4.45/include/linux/vserver/base.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/base.h
---- linux-3.4.45/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -10963,9 +10915,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vserver/base.h linux-3.4.45-vs2
+#define nx_info_state(n, m) (__nx_state(n) & (m))
+
+#endif
-diff -NurpP --minimal linux-3.4.45/include/linux/vserver/cacct.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/cacct.h
---- linux-3.4.45/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -10982,9 +10934,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vserver/cacct.h linux-3.4.45-vs
+};
+
+#endif /* _VX_CACCT_H */
-diff -NurpP --minimal linux-3.4.45/include/linux/vserver/cacct_cmd.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/cacct_cmd.h
---- linux-3.4.45/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -11009,9 +10961,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vserver/cacct_cmd.h linux-3.4.4
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CACCT_CMD_H */
-diff -NurpP --minimal linux-3.4.45/include/linux/vserver/cacct_def.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/cacct_def.h
---- linux-3.4.45/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -11056,9 +11008,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vserver/cacct_def.h linux-3.4.4
+#endif
+
+#endif /* _VX_CACCT_DEF_H */
-diff -NurpP --minimal linux-3.4.45/include/linux/vserver/cacct_int.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/cacct_int.h
---- linux-3.4.45/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -11081,9 +11033,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vserver/cacct_int.h linux-3.4.4
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CACCT_INT_H */
-diff -NurpP --minimal linux-3.4.45/include/linux/vserver/check.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/check.h
---- linux-3.4.45/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -11174,9 +11126,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vserver/check.h linux-3.4.45-vs
+#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1)
+
+#endif
-diff -NurpP --minimal linux-3.4.45/include/linux/vserver/context.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/context.h
---- linux-3.4.45/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -11366,9 +11318,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vserver/context.h linux-3.4.45-
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_H */
-diff -NurpP --minimal linux-3.4.45/include/linux/vserver/context_cmd.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/context_cmd.h
---- linux-3.4.45/include/linux/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -11532,9 +11484,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vserver/context_cmd.h linux-3.4
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-3.4.45/include/linux/vserver/cvirt.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/cvirt.h
---- linux-3.4.45/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -11558,9 +11510,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vserver/cvirt.h linux-3.4.45-vs
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CVIRT_H */
-diff -NurpP --minimal linux-3.4.45/include/linux/vserver/cvirt_cmd.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/cvirt_cmd.h
---- linux-3.4.45/include/linux/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -11615,9 +11567,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vserver/cvirt_cmd.h linux-3.4.4
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CVIRT_CMD_H */
-diff -NurpP --minimal linux-3.4.45/include/linux/vserver/cvirt_def.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/cvirt_def.h
---- linux-3.4.45/include/linux/vserver/cvirt_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -11699,9 +11651,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vserver/cvirt_def.h linux-3.4.4
+#endif
+
+#endif /* _VX_CVIRT_DEF_H */
-diff -NurpP --minimal linux-3.4.45/include/linux/vserver/debug.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/debug.h
---- linux-3.4.45/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -11848,9 +11800,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vserver/debug.h linux-3.4.45-vs
+
+
+#endif /* _VX_DEBUG_H */
-diff -NurpP --minimal linux-3.4.45/include/linux/vserver/debug_cmd.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/debug_cmd.h
---- linux-3.4.45/include/linux/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -11910,9 +11862,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vserver/debug_cmd.h linux-3.4.4
+
+#endif /* __KERNEL__ */
+#endif /* _VX_DEBUG_CMD_H */
-diff -NurpP --minimal linux-3.4.45/include/linux/vserver/device.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/device.h
---- linux-3.4.45/include/linux/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -11929,9 +11881,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vserver/device.h linux-3.4.45-v
+#else /* _VX_DEVICE_H */
+#warning duplicate inclusion
+#endif /* _VX_DEVICE_H */
-diff -NurpP --minimal linux-3.4.45/include/linux/vserver/device_cmd.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/device_cmd.h
---- linux-3.4.45/include/linux/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -11977,9 +11929,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vserver/device_cmd.h linux-3.4.
+
+#endif /* __KERNEL__ */
+#endif /* _VX_DEVICE_CMD_H */
-diff -NurpP --minimal linux-3.4.45/include/linux/vserver/device_def.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/device_def.h
---- linux-3.4.45/include/linux/vserver/device_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -11998,9 +11950,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vserver/device_def.h linux-3.4.
+};
+
+#endif /* _VX_DEVICE_DEF_H */
-diff -NurpP --minimal linux-3.4.45/include/linux/vserver/dlimit.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/dlimit.h
---- linux-3.4.45/include/linux/vserver/dlimit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -12056,9 +12008,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vserver/dlimit.h linux-3.4.45-v
+#else /* _VX_DLIMIT_H */
+#warning duplicate inclusion
+#endif /* _VX_DLIMIT_H */
-diff -NurpP --minimal linux-3.4.45/include/linux/vserver/dlimit_cmd.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/dlimit_cmd.h
---- linux-3.4.45/include/linux/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -12169,9 +12121,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vserver/dlimit_cmd.h linux-3.4.
+
+#endif /* __KERNEL__ */
+#endif /* _VX_DLIMIT_CMD_H */
-diff -NurpP --minimal linux-3.4.45/include/linux/vserver/global.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/global.h
---- linux-3.4.45/include/linux/vserver/global.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -12192,9 +12144,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vserver/global.h linux-3.4.45-v
+
+
+#endif /* _VX_GLOBAL_H */
-diff -NurpP --minimal linux-3.4.45/include/linux/vserver/history.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/history.h
---- linux-3.4.45/include/linux/vserver/history.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -12393,9 +12345,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vserver/history.h linux-3.4.45-
+#endif /* CONFIG_VSERVER_HISTORY */
+
+#endif /* _VX_HISTORY_H */
-diff -NurpP --minimal linux-3.4.45/include/linux/vserver/inode.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/inode.h
---- linux-3.4.45/include/linux/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -12436,9 +12388,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vserver/inode.h linux-3.4.45-vs
+#else /* _VX_INODE_H */
+#warning duplicate inclusion
+#endif /* _VX_INODE_H */
-diff -NurpP --minimal linux-3.4.45/include/linux/vserver/inode_cmd.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/inode_cmd.h
---- linux-3.4.45/include/linux/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -12499,9 +12451,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vserver/inode_cmd.h linux-3.4.4
+
+#endif /* __KERNEL__ */
+#endif /* _VX_INODE_CMD_H */
-diff -NurpP --minimal linux-3.4.45/include/linux/vserver/limit.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/limit.h
---- linux-3.4.45/include/linux/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -12574,9 +12526,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vserver/limit.h linux-3.4.45-vs
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_H */
-diff -NurpP --minimal linux-3.4.45/include/linux/vserver/limit_cmd.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/limit_cmd.h
---- linux-3.4.45/include/linux/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -12649,9 +12601,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vserver/limit_cmd.h linux-3.4.4
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_CMD_H */
-diff -NurpP --minimal linux-3.4.45/include/linux/vserver/limit_def.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/limit_def.h
---- linux-3.4.45/include/linux/vserver/limit_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -12700,9 +12652,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vserver/limit_def.h linux-3.4.4
+#endif
+
+#endif /* _VX_LIMIT_DEF_H */
-diff -NurpP --minimal linux-3.4.45/include/linux/vserver/limit_int.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/limit_int.h
---- linux-3.4.45/include/linux/vserver/limit_int.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -12902,9 +12854,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vserver/limit_int.h linux-3.4.4
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_INT_H */
-diff -NurpP --minimal linux-3.4.45/include/linux/vserver/monitor.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/monitor.h
---- linux-3.4.45/include/linux/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -13002,9 +12954,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vserver/monitor.h linux-3.4.45-
+
+
+#endif /* _VX_MONITOR_H */
-diff -NurpP --minimal linux-3.4.45/include/linux/vserver/network.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/network.h
---- linux-3.4.45/include/linux/vserver/network.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -13154,9 +13106,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vserver/network.h linux-3.4.45-
+
+#endif /* __KERNEL__ */
+#endif /* _VX_NETWORK_H */
-diff -NurpP --minimal linux-3.4.45/include/linux/vserver/network_cmd.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/network_cmd.h
---- linux-3.4.45/include/linux/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -13322,9 +13274,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vserver/network_cmd.h linux-3.4
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-3.4.45/include/linux/vserver/percpu.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/percpu.h
---- linux-3.4.45/include/linux/vserver/percpu.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -13340,9 +13292,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vserver/percpu.h linux-3.4.45-v
+#define PERCPU_PERCTX (sizeof(struct _vx_percpu))
+
+#endif /* _VX_PERCPU_H */
-diff -NurpP --minimal linux-3.4.45/include/linux/vserver/pid.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/pid.h
---- linux-3.4.45/include/linux/vserver/pid.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -13395,9 +13347,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vserver/pid.h linux-3.4.45-vs2.
+}
+
+#endif
-diff -NurpP --minimal linux-3.4.45/include/linux/vserver/sched.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/sched.h
---- linux-3.4.45/include/linux/vserver/sched.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -13422,9 +13374,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vserver/sched.h linux-3.4.45-vs
+#else /* _VX_SCHED_H */
+#warning duplicate inclusion
+#endif /* _VX_SCHED_H */
-diff -NurpP --minimal linux-3.4.45/include/linux/vserver/sched_cmd.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/sched_cmd.h
---- linux-3.4.45/include/linux/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -13447,9 +13399,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vserver/sched_cmd.h linux-3.4.4
+
+#endif /* __KERNEL__ */
+#endif /* _VX_SCHED_CMD_H */
-diff -NurpP --minimal linux-3.4.45/include/linux/vserver/sched_def.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/sched_def.h
---- linux-3.4.45/include/linux/vserver/sched_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -13489,9 +13441,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vserver/sched_def.h linux-3.4.4
+#endif
+
+#endif /* _VX_SCHED_DEF_H */
-diff -NurpP --minimal linux-3.4.45/include/linux/vserver/signal.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/signal.h
---- linux-3.4.45/include/linux/vserver/signal.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -13507,9 +13459,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vserver/signal.h linux-3.4.45-v
+#else /* _VX_SIGNAL_H */
+#warning duplicate inclusion
+#endif /* _VX_SIGNAL_H */
-diff -NurpP --minimal linux-3.4.45/include/linux/vserver/signal_cmd.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/signal_cmd.h
---- linux-3.4.45/include/linux/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -13554,9 +13506,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vserver/signal_cmd.h linux-3.4.
+
+#endif /* __KERNEL__ */
+#endif /* _VX_SIGNAL_CMD_H */
-diff -NurpP --minimal linux-3.4.45/include/linux/vserver/space.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/space.h
---- linux-3.4.45/include/linux/vserver/space.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -13570,9 +13522,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vserver/space.h linux-3.4.45-vs
+#else /* _VX_SPACE_H */
+#warning duplicate inclusion
+#endif /* _VX_SPACE_H */
-diff -NurpP --minimal linux-3.4.45/include/linux/vserver/space_cmd.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/space_cmd.h
---- linux-3.4.45/include/linux/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -13612,9 +13564,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vserver/space_cmd.h linux-3.4.4
+
+#endif /* __KERNEL__ */
+#endif /* _VX_SPACE_CMD_H */
-diff -NurpP --minimal linux-3.4.45/include/linux/vserver/switch.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/switch.h
---- linux-3.4.45/include/linux/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -13714,9 +13666,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vserver/switch.h linux-3.4.45-v
+
+#endif /* _VX_SWITCH_H */
+
-diff -NurpP --minimal linux-3.4.45/include/linux/vserver/tag.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/tag.h
---- linux-3.4.45/include/linux/vserver/tag.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -13861,9 +13813,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vserver/tag.h linux-3.4.45-vs2.
+#endif
+
+#endif /* _DX_TAG_H */
-diff -NurpP --minimal linux-3.4.45/include/linux/vserver/tag_cmd.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/tag_cmd.h
---- linux-3.4.45/include/linux/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-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
@@ -13887,9 +13839,9 @@ diff -NurpP --minimal linux-3.4.45/include/linux/vserver/tag_cmd.h linux-3.4.45-
+
+#endif /* __KERNEL__ */
+#endif /* _VX_TAG_CMD_H */
-diff -NurpP --minimal linux-3.4.45/include/net/addrconf.h linux-3.4.45-vs2.3.3.9/include/net/addrconf.h
---- linux-3.4.45/include/net/addrconf.h 2012-05-21 16:07:33.000000000 +0000
-+++ linux-3.4.45-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,
@@ -13900,9 +13852,9 @@ diff -NurpP --minimal linux-3.4.45/include/net/addrconf.h linux-3.4.45-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.45/include/net/af_unix.h linux-3.4.45-vs2.3.3.9/include/net/af_unix.h
---- linux-3.4.45/include/net/af_unix.h 2012-05-21 16:07:33.000000000 +0000
-+++ linux-3.4.45-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>
@@ -13911,9 +13863,9 @@ diff -NurpP --minimal linux-3.4.45/include/net/af_unix.h linux-3.4.45-vs2.3.3.9/
#include <net/sock.h>
extern void unix_inflight(struct file *fp);
-diff -NurpP --minimal linux-3.4.45/include/net/inet_timewait_sock.h linux-3.4.45-vs2.3.3.9/include/net/inet_timewait_sock.h
---- linux-3.4.45/include/net/inet_timewait_sock.h 2012-03-19 18:47:29.000000000 +0000
-+++ linux-3.4.45-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
@@ -13925,9 +13877,9 @@ diff -NurpP --minimal linux-3.4.45/include/net/inet_timewait_sock.h linux-3.4.45
int tw_timeout;
volatile unsigned char tw_substate;
unsigned char tw_rcv_wscale;
-diff -NurpP --minimal linux-3.4.45/include/net/ip6_route.h linux-3.4.45-vs2.3.3.9/include/net/ip6_route.h
---- linux-3.4.45/include/net/ip6_route.h 2012-03-19 18:47:29.000000000 +0000
-+++ linux-3.4.45-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,
@@ -13938,9 +13890,9 @@ diff -NurpP --minimal linux-3.4.45/include/net/ip6_route.h linux-3.4.45-vs2.3.3.
extern struct rt6_info *rt6_lookup(struct net *net,
const struct in6_addr *daddr,
-diff -NurpP --minimal linux-3.4.45/include/net/route.h linux-3.4.45-vs2.3.3.9/include/net/route.h
---- linux-3.4.45/include/net/route.h 2012-03-19 18:47:29.000000000 +0000
-+++ linux-3.4.45-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);
}
@@ -13988,9 +13940,9 @@ diff -NurpP --minimal linux-3.4.45/include/net/route.h linux-3.4.45-vs2.3.3.9/in
rt = __ip_route_output_key(net, fl4);
if (IS_ERR(rt))
return rt;
-diff -NurpP --minimal linux-3.4.45/include/net/sock.h linux-3.4.45-vs2.3.3.9/include/net/sock.h
---- linux-3.4.45/include/net/sock.h 2013-05-13 17:36:36.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/include/net/sock.h 2013-03-02 15:26:44.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;
@@ -14013,9 +13965,9 @@ diff -NurpP --minimal linux-3.4.45/include/net/sock.h linux-3.4.45-vs2.3.3.9/inc
socket_lock_t sk_lock;
struct sk_buff_head sk_receive_queue;
/*
-diff -NurpP --minimal linux-3.4.45/init/Kconfig linux-3.4.45-vs2.3.3.9/init/Kconfig
---- linux-3.4.45/init/Kconfig 2012-05-21 16:07:33.000000000 +0000
-+++ linux-3.4.45-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"
@@ -14032,9 +13984,9 @@ diff -NurpP --minimal linux-3.4.45/init/Kconfig linux-3.4.45-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.45/init/main.c linux-3.4.45-vs2.3.3.9/init/main.c
---- linux-3.4.45/init/main.c 2013-05-13 17:36:36.000000000 +0000
-+++ linux-3.4.45-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>
@@ -14043,9 +13995,9 @@ diff -NurpP --minimal linux-3.4.45/init/main.c linux-3.4.45-vs2.3.3.9/init/main.
#include <asm/io.h>
#include <asm/bugs.h>
-diff -NurpP --minimal linux-3.4.45/ipc/mqueue.c linux-3.4.45-vs2.3.3.9/ipc/mqueue.c
---- linux-3.4.45/ipc/mqueue.c 2012-05-21 16:07:34.000000000 +0000
-+++ linux-3.4.45-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>
@@ -14121,9 +14073,9 @@ diff -NurpP --minimal linux-3.4.45/ipc/mqueue.c linux-3.4.45-vs2.3.3.9/ipc/mqueu
free_uid(user);
}
if (ipc_ns)
-diff -NurpP --minimal linux-3.4.45/ipc/msg.c linux-3.4.45-vs2.3.3.9/ipc/msg.c
---- linux-3.4.45/ipc/msg.c 2011-05-22 14:17:59.000000000 +0000
-+++ linux-3.4.45-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>
@@ -14140,9 +14092,9 @@ diff -NurpP --minimal linux-3.4.45/ipc/msg.c linux-3.4.45-vs2.3.3.9/ipc/msg.c
msq->q_perm.security = NULL;
retval = security_msg_queue_alloc(msq);
-diff -NurpP --minimal linux-3.4.45/ipc/namespace.c linux-3.4.45-vs2.3.3.9/ipc/namespace.c
---- linux-3.4.45/ipc/namespace.c 2011-07-22 09:18:12.000000000 +0000
-+++ linux-3.4.45-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>
@@ -14183,9 +14135,9 @@ diff -NurpP --minimal linux-3.4.45/ipc/namespace.c linux-3.4.45-vs2.3.3.9/ipc/na
}
/*
-diff -NurpP --minimal linux-3.4.45/ipc/sem.c linux-3.4.45-vs2.3.3.9/ipc/sem.c
---- linux-3.4.45/ipc/sem.c 2012-01-09 15:14:59.000000000 +0000
-+++ linux-3.4.45-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>
@@ -14223,9 +14175,9 @@ diff -NurpP --minimal linux-3.4.45/ipc/sem.c linux-3.4.45-vs2.3.3.9/ipc/sem.c
security_sem_free(sma);
ipc_rcu_putref(sma);
}
-diff -NurpP --minimal linux-3.4.45/ipc/shm.c linux-3.4.45-vs2.3.3.9/ipc/shm.c
---- linux-3.4.45/ipc/shm.c 2013-05-13 17:36:36.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/ipc/shm.c 2013-05-13 18:16:08.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>
@@ -14281,9 +14233,9 @@ diff -NurpP --minimal linux-3.4.45/ipc/shm.c linux-3.4.45-vs2.3.3.9/ipc/shm.c
return error;
no_id:
-diff -NurpP --minimal linux-3.4.45/kernel/Makefile linux-3.4.45-vs2.3.3.9/kernel/Makefile
---- linux-3.4.45/kernel/Makefile 2012-05-21 16:07:34.000000000 +0000
-+++ linux-3.4.45-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/
@@ -14292,9 +14244,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/Makefile linux-3.4.45-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.45/kernel/auditsc.c linux-3.4.45-vs2.3.3.9/kernel/auditsc.c
---- linux-3.4.45/kernel/auditsc.c 2012-03-19 18:47:29.000000000 +0000
-+++ linux-3.4.45-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;
@@ -14304,9 +14256,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/auditsc.c linux-3.4.45-vs2.3.3.9/kerne
return -EPERM;
#endif /* CONFIG_AUDIT_LOGINUID_IMMUTABLE */
-diff -NurpP --minimal linux-3.4.45/kernel/capability.c linux-3.4.45-vs2.3.3.9/kernel/capability.c
---- linux-3.4.45/kernel/capability.c 2012-03-19 18:47:29.000000000 +0000
-+++ linux-3.4.45-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>
@@ -14332,9 +14284,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/capability.c linux-3.4.45-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.45/kernel/compat.c linux-3.4.45-vs2.3.3.9/kernel/compat.c
---- linux-3.4.45/kernel/compat.c 2012-05-21 16:07:34.000000000 +0000
-+++ linux-3.4.45-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;
@@ -14344,9 +14296,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/compat.c linux-3.4.45-vs2.3.3.9/kernel
return 0;
}
-diff -NurpP --minimal linux-3.4.45/kernel/cred.c linux-3.4.45-vs2.3.3.9/kernel/cred.c
---- linux-3.4.45/kernel/cred.c 2012-05-21 16:07:34.000000000 +0000
-+++ linux-3.4.45-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
};
@@ -14416,9 +14368,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/cred.c linux-3.4.45-vs2.3.3.9/kernel/c
EXPORT_SYMBOL(prepare_creds);
/*
-diff -NurpP --minimal linux-3.4.45/kernel/exit.c linux-3.4.45-vs2.3.3.9/kernel/exit.c
---- linux-3.4.45/kernel/exit.c 2013-05-13 17:36:36.000000000 +0000
-+++ linux-3.4.45-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>
@@ -14526,9 +14478,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/exit.c linux-3.4.45-vs2.3.3.9/kernel/e
BUG();
/* Avoid "noreturn function does return". */
for (;;)
-diff -NurpP --minimal linux-3.4.45/kernel/fork.c linux-3.4.45-vs2.3.3.9/kernel/fork.c
---- linux-3.4.45/kernel/fork.c 2013-05-13 17:36:36.000000000 +0000
-+++ linux-3.4.45-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>
@@ -14621,9 +14573,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/fork.c linux-3.4.45-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.45/kernel/kthread.c linux-3.4.45-vs2.3.3.9/kernel/kthread.c
---- linux-3.4.45/kernel/kthread.c 2013-05-13 17:36:36.000000000 +0000
-+++ linux-3.4.45-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>
@@ -14632,9 +14584,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/kthread.c linux-3.4.45-vs2.3.3.9/kerne
#include <trace/events/sched.h>
static DEFINE_SPINLOCK(kthread_create_lock);
-diff -NurpP --minimal linux-3.4.45/kernel/nsproxy.c linux-3.4.45-vs2.3.3.9/kernel/nsproxy.c
---- linux-3.4.45/kernel/nsproxy.c 2012-01-09 15:15:00.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/kernel/nsproxy.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/nsproxy.c linux-3.4.48-vs2.3.3.9/kernel/nsproxy.c
+--- linux-3.4.48/kernel/nsproxy.c 2012-01-09 15:15:00.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/kernel/nsproxy.c 2012-05-21 16:15:05.000000000 +0000
@@ -20,11 +20,14 @@
#include <linux/mnt_namespace.h>
#include <linux/utsname.h>
@@ -14816,9 +14768,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/nsproxy.c linux-3.4.45-vs2.3.3.9/kerne
return -EPERM;
*new_nsp = create_new_namespaces(unshare_flags, current,
-diff -NurpP --minimal linux-3.4.45/kernel/pid.c linux-3.4.45-vs2.3.3.9/kernel/pid.c
---- linux-3.4.45/kernel/pid.c 2012-03-19 18:47:30.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/kernel/pid.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/pid.c linux-3.4.48-vs2.3.3.9/kernel/pid.c
+--- linux-3.4.48/kernel/pid.c 2012-03-19 18:47:30.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/kernel/pid.c 2012-05-21 16:15:05.000000000 +0000
@@ -36,6 +36,7 @@
#include <linux/pid_namespace.h>
#include <linux/init_task.h>
@@ -14876,9 +14828,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/pid.c linux-3.4.45-vs2.3.3.9/kernel/pi
pid_t pid_vnr(struct pid *pid)
{
return pid_nr_ns(pid, current->nsproxy->pid_ns);
-diff -NurpP --minimal linux-3.4.45/kernel/pid_namespace.c linux-3.4.45-vs2.3.3.9/kernel/pid_namespace.c
---- linux-3.4.45/kernel/pid_namespace.c 2012-05-21 16:07:34.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/kernel/pid_namespace.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/pid_namespace.c linux-3.4.48-vs2.3.3.9/kernel/pid_namespace.c
+--- linux-3.4.48/kernel/pid_namespace.c 2012-05-21 16:07:34.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/kernel/pid_namespace.c 2012-05-21 16:15:05.000000000 +0000
@@ -16,6 +16,7 @@
#include <linux/slab.h>
#include <linux/proc_fs.h>
@@ -14903,9 +14855,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/pid_namespace.c linux-3.4.45-vs2.3.3.9
kmem_cache_free(pid_ns_cachep, ns);
}
-diff -NurpP --minimal linux-3.4.45/kernel/posix-timers.c linux-3.4.45-vs2.3.3.9/kernel/posix-timers.c
---- linux-3.4.45/kernel/posix-timers.c 2013-05-13 17:36:36.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/kernel/posix-timers.c 2013-03-30 21:29:17.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/posix-timers.c linux-3.4.48-vs2.3.3.9/kernel/posix-timers.c
+--- linux-3.4.48/kernel/posix-timers.c 2013-06-13 08:59:37.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/kernel/posix-timers.c 2013-03-30 21:29:17.000000000 +0000
@@ -47,6 +47,7 @@
#include <linux/wait.h>
#include <linux/workqueue.h>
@@ -14941,9 +14893,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/posix-timers.c linux-3.4.45-vs2.3.3.9/
/* If we failed to send the signal the timer stops. */
return ret > 0;
}
-diff -NurpP --minimal linux-3.4.45/kernel/printk.c linux-3.4.45-vs2.3.3.9/kernel/printk.c
---- linux-3.4.45/kernel/printk.c 2013-05-13 17:36:36.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/kernel/printk.c 2013-03-02 15:26:44.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/printk.c linux-3.4.48-vs2.3.3.9/kernel/printk.c
+--- linux-3.4.48/kernel/printk.c 2013-06-13 08:59:37.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/kernel/printk.c 2013-03-02 15:26:44.000000000 +0000
@@ -41,6 +41,7 @@
#include <linux/cpu.h>
#include <linux/notifier.h>
@@ -15011,9 +14963,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/printk.c linux-3.4.45-vs2.3.3.9/kernel
count = len;
if (count > log_buf_len)
count = log_buf_len;
-diff -NurpP --minimal linux-3.4.45/kernel/ptrace.c linux-3.4.45-vs2.3.3.9/kernel/ptrace.c
---- linux-3.4.45/kernel/ptrace.c 2013-05-13 17:36:36.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/kernel/ptrace.c 2013-02-11 23:37:30.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/ptrace.c linux-3.4.48-vs2.3.3.9/kernel/ptrace.c
+--- linux-3.4.48/kernel/ptrace.c 2013-06-13 08:59:37.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/kernel/ptrace.c 2013-02-11 23:37:30.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/syscalls.h>
#include <linux/uaccess.h>
@@ -15034,9 +14986,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/ptrace.c linux-3.4.45-vs2.3.3.9/kernel
return security_ptrace_access_check(task, mode);
}
-diff -NurpP --minimal linux-3.4.45/kernel/sched/core.c linux-3.4.45-vs2.3.3.9/kernel/sched/core.c
---- linux-3.4.45/kernel/sched/core.c 2013-05-13 17:36:37.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/kernel/sched/core.c 2013-05-13 18:16:08.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/sched/core.c linux-3.4.48-vs2.3.3.9/kernel/sched/core.c
+--- linux-3.4.48/kernel/sched/core.c 2013-06-13 08:59:37.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/kernel/sched/core.c 2013-06-13 09:46:39.000000000 +0000
@@ -72,6 +72,8 @@
#include <linux/slab.h>
#include <linux/init_task.h>
@@ -15046,7 +14998,7 @@ diff -NurpP --minimal linux-3.4.45/kernel/sched/core.c linux-3.4.45-vs2.3.3.9/ke
#include <asm/switch_to.h>
#include <asm/tlb.h>
-@@ -2228,9 +2230,17 @@ EXPORT_SYMBOL(avenrun); /* should be rem
+@@ -2226,9 +2228,17 @@ EXPORT_SYMBOL(avenrun); /* should be rem
*/
void get_avenrun(unsigned long *loads, unsigned long offset, int shift)
{
@@ -15067,7 +15019,7 @@ diff -NurpP --minimal linux-3.4.45/kernel/sched/core.c linux-3.4.45-vs2.3.3.9/ke
}
static long calc_load_fold_active(struct rq *this_rq)
-@@ -2799,14 +2809,17 @@ static inline void task_group_account_fi
+@@ -2797,14 +2807,17 @@ static inline void task_group_account_fi
void account_user_time(struct task_struct *p, cputime_t cputime,
cputime_t cputime_scaled)
{
@@ -15086,7 +15038,7 @@ diff -NurpP --minimal linux-3.4.45/kernel/sched/core.c linux-3.4.45-vs2.3.3.9/ke
/* Add user time to cpustat. */
task_group_account_field(p, index, (__force u64) cputime);
-@@ -2853,9 +2866,12 @@ static inline
+@@ -2851,9 +2864,12 @@ static inline
void __account_system_time(struct task_struct *p, cputime_t cputime,
cputime_t cputime_scaled, int index)
{
@@ -15099,7 +15051,7 @@ diff -NurpP --minimal linux-3.4.45/kernel/sched/core.c linux-3.4.45-vs2.3.3.9/ke
account_group_system_time(p, cputime);
/* Add system time to cpustat. */
-@@ -4081,7 +4097,7 @@ SYSCALL_DEFINE1(nice, int, increment)
+@@ -4079,7 +4095,7 @@ SYSCALL_DEFINE1(nice, int, increment)
nice = 19;
if (increment < 0 && !can_nice(current, nice))
@@ -15108,9 +15060,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/sched/core.c linux-3.4.45-vs2.3.3.9/ke
retval = security_task_setnice(current, nice);
if (retval)
-diff -NurpP --minimal linux-3.4.45/kernel/sched/fair.c linux-3.4.45-vs2.3.3.9/kernel/sched/fair.c
---- linux-3.4.45/kernel/sched/fair.c 2012-05-21 16:07:34.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/kernel/sched/fair.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/sched/fair.c linux-3.4.48-vs2.3.3.9/kernel/sched/fair.c
+--- linux-3.4.48/kernel/sched/fair.c 2012-05-21 16:07:34.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/kernel/sched/fair.c 2012-05-21 16:15:05.000000000 +0000
@@ -26,6 +26,7 @@
#include <linux/slab.h>
#include <linux/profile.h>
@@ -15137,9 +15089,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/sched/fair.c linux-3.4.45-vs2.3.3.9/ke
update_cfs_load(cfs_rq, 0);
account_entity_dequeue(cfs_rq, se);
-diff -NurpP --minimal linux-3.4.45/kernel/signal.c linux-3.4.45-vs2.3.3.9/kernel/signal.c
---- linux-3.4.45/kernel/signal.c 2013-05-13 17:36:37.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/kernel/signal.c 2013-05-13 18:16:08.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/signal.c linux-3.4.48-vs2.3.3.9/kernel/signal.c
+--- linux-3.4.48/kernel/signal.c 2013-06-13 08:59:38.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/kernel/signal.c 2013-06-13 09:46:39.000000000 +0000
@@ -29,6 +29,8 @@
#include <linux/pid_namespace.h>
#include <linux/nsproxy.h>
@@ -15232,9 +15184,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/signal.c linux-3.4.45-vs2.3.3.9/kernel
if (sig_kernel_stop(signr)) {
/*
* The default action is to stop all threads in
-diff -NurpP --minimal linux-3.4.45/kernel/softirq.c linux-3.4.45-vs2.3.3.9/kernel/softirq.c
---- linux-3.4.45/kernel/softirq.c 2012-05-21 16:07:34.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/kernel/softirq.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/softirq.c linux-3.4.48-vs2.3.3.9/kernel/softirq.c
+--- linux-3.4.48/kernel/softirq.c 2012-05-21 16:07:34.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/kernel/softirq.c 2012-05-21 16:15:05.000000000 +0000
@@ -24,6 +24,7 @@
#include <linux/ftrace.h>
#include <linux/smp.h>
@@ -15243,9 +15195,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/softirq.c linux-3.4.45-vs2.3.3.9/kerne
#define CREATE_TRACE_POINTS
#include <trace/events/irq.h>
-diff -NurpP --minimal linux-3.4.45/kernel/sys.c linux-3.4.45-vs2.3.3.9/kernel/sys.c
---- linux-3.4.45/kernel/sys.c 2013-05-13 17:36:37.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/kernel/sys.c 2013-05-13 18:16:08.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/sys.c linux-3.4.48-vs2.3.3.9/kernel/sys.c
+--- linux-3.4.48/kernel/sys.c 2013-06-13 08:59:39.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/kernel/sys.c 2013-06-13 09:46:39.000000000 +0000
@@ -45,6 +45,7 @@
#include <linux/syscalls.h>
#include <linux/kprobes.h>
@@ -15284,7 +15236,7 @@ diff -NurpP --minimal linux-3.4.45/kernel/sys.c linux-3.4.45-vs2.3.3.9/kernel/sy
niceval = 20 - task_nice(p);
if (niceval > retval)
retval = niceval;
-@@ -420,6 +428,8 @@ EXPORT_SYMBOL_GPL(kernel_power_off);
+@@ -419,6 +427,8 @@ EXPORT_SYMBOL_GPL(kernel_power_off);
static DEFINE_MUTEX(reboot_mutex);
@@ -15293,7 +15245,7 @@ diff -NurpP --minimal linux-3.4.45/kernel/sys.c linux-3.4.45-vs2.3.3.9/kernel/sy
/*
* Reboot system call: for obvious reasons only root may call it,
* and even root needs to set up some magic numbers in the registers
-@@ -461,6 +471,9 @@ SYSCALL_DEFINE4(reboot, int, magic1, int
+@@ -460,6 +470,9 @@ SYSCALL_DEFINE4(reboot, int, magic1, int
if ((cmd == LINUX_REBOOT_CMD_POWER_OFF) && !pm_power_off)
cmd = LINUX_REBOOT_CMD_HALT;
@@ -15303,7 +15255,7 @@ diff -NurpP --minimal linux-3.4.45/kernel/sys.c linux-3.4.45-vs2.3.3.9/kernel/sy
mutex_lock(&reboot_mutex);
switch (cmd) {
case LINUX_REBOOT_CMD_RESTART:
-@@ -1286,7 +1299,8 @@ SYSCALL_DEFINE2(sethostname, char __user
+@@ -1285,7 +1298,8 @@ SYSCALL_DEFINE2(sethostname, char __user
int errno;
char tmp[__NEW_UTS_LEN];
@@ -15313,7 +15265,7 @@ diff -NurpP --minimal linux-3.4.45/kernel/sys.c linux-3.4.45-vs2.3.3.9/kernel/sy
return -EPERM;
if (len < 0 || len > __NEW_UTS_LEN)
-@@ -1337,7 +1351,8 @@ SYSCALL_DEFINE2(setdomainname, char __us
+@@ -1336,7 +1350,8 @@ SYSCALL_DEFINE2(setdomainname, char __us
int errno;
char tmp[__NEW_UTS_LEN];
@@ -15323,7 +15275,7 @@ diff -NurpP --minimal linux-3.4.45/kernel/sys.c linux-3.4.45-vs2.3.3.9/kernel/sy
return -EPERM;
if (len < 0 || len > __NEW_UTS_LEN)
return -EINVAL;
-@@ -1456,7 +1471,7 @@ int do_prlimit(struct task_struct *tsk,
+@@ -1455,7 +1470,7 @@ int do_prlimit(struct task_struct *tsk,
/* Keep the capable check against init_user_ns until
cgroups can contain all limits */
if (new_rlim->rlim_max > rlim->rlim_max &&
@@ -15332,7 +15284,7 @@ diff -NurpP --minimal linux-3.4.45/kernel/sys.c linux-3.4.45-vs2.3.3.9/kernel/sy
retval = -EPERM;
if (!retval)
retval = security_task_setrlimit(tsk->group_leader,
-@@ -1510,7 +1525,8 @@ static int check_prlimit_permission(stru
+@@ -1509,7 +1524,8 @@ static int check_prlimit_permission(stru
cred->gid == tcred->sgid &&
cred->gid == tcred->gid))
return 0;
@@ -15342,9 +15294,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/sys.c linux-3.4.45-vs2.3.3.9/kernel/sy
return 0;
return -EPERM;
-diff -NurpP --minimal linux-3.4.45/kernel/sysctl.c linux-3.4.45-vs2.3.3.9/kernel/sysctl.c
---- linux-3.4.45/kernel/sysctl.c 2012-05-21 16:07:34.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/kernel/sysctl.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/sysctl.c linux-3.4.48-vs2.3.3.9/kernel/sysctl.c
+--- linux-3.4.48/kernel/sysctl.c 2012-05-21 16:07:34.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/kernel/sysctl.c 2012-05-21 16:15:05.000000000 +0000
@@ -81,6 +81,7 @@
#if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_LOCK_STAT)
#include <linux/lockdep.h>
@@ -15367,9 +15319,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/sysctl.c linux-3.4.45-vs2.3.3.9/kernel
#ifdef CONFIG_CHR_DEV_SG
{
.procname = "sg-big-buff",
-diff -NurpP --minimal linux-3.4.45/kernel/sysctl_binary.c linux-3.4.45-vs2.3.3.9/kernel/sysctl_binary.c
---- linux-3.4.45/kernel/sysctl_binary.c 2013-05-13 17:36:37.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/kernel/sysctl_binary.c 2013-03-30 21:29:17.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/sysctl_binary.c linux-3.4.48-vs2.3.3.9/kernel/sysctl_binary.c
+--- linux-3.4.48/kernel/sysctl_binary.c 2013-06-13 08:59:39.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/kernel/sysctl_binary.c 2013-03-30 21:29:17.000000000 +0000
@@ -73,6 +73,7 @@ static const struct bin_table bin_kern_t
{ CTL_INT, KERN_PANIC, "panic" },
@@ -15378,9 +15330,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/sysctl_binary.c linux-3.4.45-vs2.3.3.9
{ CTL_STR, KERN_SPARC_REBOOT, "reboot-cmd" },
{ CTL_INT, KERN_CTLALTDEL, "ctrl-alt-del" },
-diff -NurpP --minimal linux-3.4.45/kernel/time/timekeeping.c linux-3.4.45-vs2.3.3.9/kernel/time/timekeeping.c
---- linux-3.4.45/kernel/time/timekeeping.c 2013-05-13 17:36:37.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/kernel/time/timekeeping.c 2012-12-08 00:53:53.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/time/timekeeping.c linux-3.4.48-vs2.3.3.9/kernel/time/timekeeping.c
+--- linux-3.4.48/kernel/time/timekeeping.c 2013-06-13 08:59:39.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/kernel/time/timekeeping.c 2012-12-08 00:53:53.000000000 +0000
@@ -254,6 +254,7 @@ void getnstimeofday(struct timespec *ts)
} while (read_seqretry(&timekeeper.lock, seq));
@@ -15389,9 +15341,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/time/timekeeping.c linux-3.4.45-vs2.3.
}
EXPORT_SYMBOL(getnstimeofday);
-diff -NurpP --minimal linux-3.4.45/kernel/time.c linux-3.4.45-vs2.3.3.9/kernel/time.c
---- linux-3.4.45/kernel/time.c 2012-05-21 16:07:34.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/kernel/time.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/time.c linux-3.4.48-vs2.3.3.9/kernel/time.c
+--- linux-3.4.48/kernel/time.c 2012-05-21 16:07:34.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/kernel/time.c 2012-05-21 16:15:05.000000000 +0000
@@ -92,7 +92,7 @@ SYSCALL_DEFINE1(stime, time_t __user *,
if (err)
return err;
@@ -15410,9 +15362,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/time.c linux-3.4.45-vs2.3.3.9/kernel/t
return 0;
}
-diff -NurpP --minimal linux-3.4.45/kernel/timer.c linux-3.4.45-vs2.3.3.9/kernel/timer.c
---- linux-3.4.45/kernel/timer.c 2013-05-13 17:36:37.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/kernel/timer.c 2012-10-22 13:09:53.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/timer.c linux-3.4.48-vs2.3.3.9/kernel/timer.c
+--- linux-3.4.48/kernel/timer.c 2013-06-13 08:59:39.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/kernel/timer.c 2012-10-22 13:09:53.000000000 +0000
@@ -40,6 +40,10 @@
#include <linux/irq_work.h>
#include <linux/sched.h>
@@ -15462,9 +15414,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/timer.c linux-3.4.45-vs2.3.3.9/kernel/
SYSCALL_DEFINE0(getuid)
{
/* Only we change this so SMP safe */
-diff -NurpP --minimal linux-3.4.45/kernel/user_namespace.c linux-3.4.45-vs2.3.3.9/kernel/user_namespace.c
---- linux-3.4.45/kernel/user_namespace.c 2012-01-09 15:15:00.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/kernel/user_namespace.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/user_namespace.c linux-3.4.48-vs2.3.3.9/kernel/user_namespace.c
+--- linux-3.4.48/kernel/user_namespace.c 2012-01-09 15:15:00.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/kernel/user_namespace.c 2012-05-21 16:15:05.000000000 +0000
@@ -11,6 +11,7 @@
#include <linux/user_namespace.h>
#include <linux/highuid.h>
@@ -15490,9 +15442,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/user_namespace.c linux-3.4.45-vs2.3.3.
INIT_WORK(&ns->destroyer, free_user_ns_work);
schedule_work(&ns->destroyer);
}
-diff -NurpP --minimal linux-3.4.45/kernel/utsname.c linux-3.4.45-vs2.3.3.9/kernel/utsname.c
---- linux-3.4.45/kernel/utsname.c 2012-01-09 15:15:00.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/kernel/utsname.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/utsname.c linux-3.4.48-vs2.3.3.9/kernel/utsname.c
+--- linux-3.4.48/kernel/utsname.c 2012-01-09 15:15:00.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/kernel/utsname.c 2012-05-21 16:15:05.000000000 +0000
@@ -16,14 +16,17 @@
#include <linux/slab.h>
#include <linux/user_namespace.h>
@@ -15561,9 +15513,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/utsname.c linux-3.4.45-vs2.3.3.9/kerne
kfree(ns);
}
-diff -NurpP --minimal linux-3.4.45/kernel/vserver/Kconfig linux-3.4.45-vs2.3.3.9/kernel/vserver/Kconfig
---- linux-3.4.45/kernel/vserver/Kconfig 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/kernel/vserver/Kconfig 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/vserver/Kconfig linux-3.4.48-vs2.3.3.9/kernel/vserver/Kconfig
+--- linux-3.4.48/kernel/vserver/Kconfig 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/kernel/vserver/Kconfig 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,224 @@
+#
+# Linux VServer configuration
@@ -15789,9 +15741,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/vserver/Kconfig linux-3.4.45-vs2.3.3.9
+ bool
+ default n
+
-diff -NurpP --minimal linux-3.4.45/kernel/vserver/Makefile linux-3.4.45-vs2.3.3.9/kernel/vserver/Makefile
---- linux-3.4.45/kernel/vserver/Makefile 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/kernel/vserver/Makefile 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/vserver/Makefile linux-3.4.48-vs2.3.3.9/kernel/vserver/Makefile
+--- linux-3.4.48/kernel/vserver/Makefile 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/kernel/vserver/Makefile 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,18 @@
+#
+# Makefile for the Linux vserver routines.
@@ -15811,9 +15763,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/vserver/Makefile linux-3.4.45-vs2.3.3.
+vserver-$(CONFIG_VSERVER_MONITOR) += monitor.o
+vserver-$(CONFIG_VSERVER_DEVICE) += device.o
+
-diff -NurpP --minimal linux-3.4.45/kernel/vserver/cacct.c linux-3.4.45-vs2.3.3.9/kernel/vserver/cacct.c
---- linux-3.4.45/kernel/vserver/cacct.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/kernel/vserver/cacct.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/vserver/cacct.c linux-3.4.48-vs2.3.3.9/kernel/vserver/cacct.c
+--- linux-3.4.48/kernel/vserver/cacct.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/kernel/vserver/cacct.c 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,42 @@
+/*
+ * linux/kernel/vserver/cacct.c
@@ -15857,9 +15809,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/vserver/cacct.c linux-3.4.45-vs2.3.3.9
+ return 0;
+}
+
-diff -NurpP --minimal linux-3.4.45/kernel/vserver/cacct_init.h linux-3.4.45-vs2.3.3.9/kernel/vserver/cacct_init.h
---- linux-3.4.45/kernel/vserver/cacct_init.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/kernel/vserver/cacct_init.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/vserver/cacct_init.h linux-3.4.48-vs2.3.3.9/kernel/vserver/cacct_init.h
+--- linux-3.4.48/kernel/vserver/cacct_init.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/kernel/vserver/cacct_init.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,25 @@
+
+
@@ -15886,9 +15838,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/vserver/cacct_init.h linux-3.4.45-vs2.
+ return;
+}
+
-diff -NurpP --minimal linux-3.4.45/kernel/vserver/cacct_proc.h linux-3.4.45-vs2.3.3.9/kernel/vserver/cacct_proc.h
---- linux-3.4.45/kernel/vserver/cacct_proc.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/kernel/vserver/cacct_proc.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/vserver/cacct_proc.h linux-3.4.48-vs2.3.3.9/kernel/vserver/cacct_proc.h
+--- linux-3.4.48/kernel/vserver/cacct_proc.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/kernel/vserver/cacct_proc.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,53 @@
+#ifndef _VX_CACCT_PROC_H
+#define _VX_CACCT_PROC_H
@@ -15943,9 +15895,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/vserver/cacct_proc.h linux-3.4.45-vs2.
+}
+
+#endif /* _VX_CACCT_PROC_H */
-diff -NurpP --minimal linux-3.4.45/kernel/vserver/context.c linux-3.4.45-vs2.3.3.9/kernel/vserver/context.c
---- linux-3.4.45/kernel/vserver/context.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/kernel/vserver/context.c 2012-06-28 14:45:48.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/vserver/context.c linux-3.4.48-vs2.3.3.9/kernel/vserver/context.c
+--- linux-3.4.48/kernel/vserver/context.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/kernel/vserver/context.c 2012-06-28 14:45:48.000000000 +0000
@@ -0,0 +1,1119 @@
+/*
+ * linux/kernel/vserver/context.c
@@ -17066,9 +17018,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/vserver/context.c linux-3.4.45-vs2.3.3
+
+EXPORT_SYMBOL_GPL(free_vx_info);
+
-diff -NurpP --minimal linux-3.4.45/kernel/vserver/cvirt.c linux-3.4.45-vs2.3.3.9/kernel/vserver/cvirt.c
---- linux-3.4.45/kernel/vserver/cvirt.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/kernel/vserver/cvirt.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/vserver/cvirt.c linux-3.4.48-vs2.3.3.9/kernel/vserver/cvirt.c
+--- linux-3.4.48/kernel/vserver/cvirt.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/kernel/vserver/cvirt.c 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,313 @@
+/*
+ * linux/kernel/vserver/cvirt.c
@@ -17383,9 +17335,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/vserver/cvirt.c linux-3.4.45-vs2.3.3.9
+
+#endif
+
-diff -NurpP --minimal linux-3.4.45/kernel/vserver/cvirt_init.h linux-3.4.45-vs2.3.3.9/kernel/vserver/cvirt_init.h
---- linux-3.4.45/kernel/vserver/cvirt_init.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/kernel/vserver/cvirt_init.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/vserver/cvirt_init.h linux-3.4.48-vs2.3.3.9/kernel/vserver/cvirt_init.h
+--- linux-3.4.48/kernel/vserver/cvirt_init.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/kernel/vserver/cvirt_init.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,70 @@
+
+
@@ -17457,9 +17409,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/vserver/cvirt_init.h linux-3.4.45-vs2.
+ return;
+}
+
-diff -NurpP --minimal linux-3.4.45/kernel/vserver/cvirt_proc.h linux-3.4.45-vs2.3.3.9/kernel/vserver/cvirt_proc.h
---- linux-3.4.45/kernel/vserver/cvirt_proc.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/kernel/vserver/cvirt_proc.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/vserver/cvirt_proc.h linux-3.4.48-vs2.3.3.9/kernel/vserver/cvirt_proc.h
+--- linux-3.4.48/kernel/vserver/cvirt_proc.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/kernel/vserver/cvirt_proc.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,123 @@
+#ifndef _VX_CVIRT_PROC_H
+#define _VX_CVIRT_PROC_H
@@ -17584,9 +17536,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/vserver/cvirt_proc.h linux-3.4.45-vs2.
+}
+
+#endif /* _VX_CVIRT_PROC_H */
-diff -NurpP --minimal linux-3.4.45/kernel/vserver/debug.c linux-3.4.45-vs2.3.3.9/kernel/vserver/debug.c
---- linux-3.4.45/kernel/vserver/debug.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/kernel/vserver/debug.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/vserver/debug.c linux-3.4.48-vs2.3.3.9/kernel/vserver/debug.c
+--- linux-3.4.48/kernel/vserver/debug.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/kernel/vserver/debug.c 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,32 @@
+/*
+ * kernel/vserver/debug.c
@@ -17620,9 +17572,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/vserver/debug.c linux-3.4.45-vs2.3.3.9
+
+EXPORT_SYMBOL_GPL(dump_vx_info);
+
-diff -NurpP --minimal linux-3.4.45/kernel/vserver/device.c linux-3.4.45-vs2.3.3.9/kernel/vserver/device.c
---- linux-3.4.45/kernel/vserver/device.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/kernel/vserver/device.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/vserver/device.c linux-3.4.48-vs2.3.3.9/kernel/vserver/device.c
+--- linux-3.4.48/kernel/vserver/device.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/kernel/vserver/device.c 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,443 @@
+/*
+ * linux/kernel/vserver/device.c
@@ -18067,9 +18019,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/vserver/device.c linux-3.4.45-vs2.3.3.
+#endif /* CONFIG_COMPAT */
+
+
-diff -NurpP --minimal linux-3.4.45/kernel/vserver/dlimit.c linux-3.4.45-vs2.3.3.9/kernel/vserver/dlimit.c
---- linux-3.4.45/kernel/vserver/dlimit.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/kernel/vserver/dlimit.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/vserver/dlimit.c linux-3.4.48-vs2.3.3.9/kernel/vserver/dlimit.c
+--- linux-3.4.48/kernel/vserver/dlimit.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/kernel/vserver/dlimit.c 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,531 @@
+/*
+ * linux/kernel/vserver/dlimit.c
@@ -18602,9 +18554,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/vserver/dlimit.c linux-3.4.45-vs2.3.3.
+EXPORT_SYMBOL_GPL(locate_dl_info);
+EXPORT_SYMBOL_GPL(rcu_free_dl_info);
+
-diff -NurpP --minimal linux-3.4.45/kernel/vserver/helper.c linux-3.4.45-vs2.3.3.9/kernel/vserver/helper.c
---- linux-3.4.45/kernel/vserver/helper.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/kernel/vserver/helper.c 2012-09-16 18:49:44.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/vserver/helper.c linux-3.4.48-vs2.3.3.9/kernel/vserver/helper.c
+--- linux-3.4.48/kernel/vserver/helper.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/kernel/vserver/helper.c 2012-09-16 18:49:44.000000000 +0000
@@ -0,0 +1,229 @@
+/*
+ * linux/kernel/vserver/helper.c
@@ -18835,9 +18787,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/vserver/helper.c linux-3.4.45-vs2.3.3.
+ return do_vshelper(vshelper_path, argv, envp, 1);
+}
+
-diff -NurpP --minimal linux-3.4.45/kernel/vserver/history.c linux-3.4.45-vs2.3.3.9/kernel/vserver/history.c
---- linux-3.4.45/kernel/vserver/history.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/kernel/vserver/history.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/vserver/history.c linux-3.4.48-vs2.3.3.9/kernel/vserver/history.c
+--- linux-3.4.48/kernel/vserver/history.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/kernel/vserver/history.c 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,258 @@
+/*
+ * kernel/vserver/history.c
@@ -19097,9 +19049,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/vserver/history.c linux-3.4.45-vs2.3.3
+
+#endif /* CONFIG_COMPAT */
+
-diff -NurpP --minimal linux-3.4.45/kernel/vserver/inet.c linux-3.4.45-vs2.3.3.9/kernel/vserver/inet.c
---- linux-3.4.45/kernel/vserver/inet.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/kernel/vserver/inet.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/vserver/inet.c linux-3.4.48-vs2.3.3.9/kernel/vserver/inet.c
+--- linux-3.4.48/kernel/vserver/inet.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/kernel/vserver/inet.c 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,226 @@
+
+#include <linux/in.h>
@@ -19327,9 +19279,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/vserver/inet.c linux-3.4.45-vs2.3.3.9/
+
+EXPORT_SYMBOL_GPL(ip_v4_find_src);
+
-diff -NurpP --minimal linux-3.4.45/kernel/vserver/init.c linux-3.4.45-vs2.3.3.9/kernel/vserver/init.c
---- linux-3.4.45/kernel/vserver/init.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/kernel/vserver/init.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/vserver/init.c linux-3.4.48-vs2.3.3.9/kernel/vserver/init.c
+--- linux-3.4.48/kernel/vserver/init.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/kernel/vserver/init.c 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,45 @@
+/*
+ * linux/kernel/init.c
@@ -19376,9 +19328,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/vserver/init.c linux-3.4.45-vs2.3.3.9/
+module_init(init_vserver);
+module_exit(exit_vserver);
+
-diff -NurpP --minimal linux-3.4.45/kernel/vserver/inode.c linux-3.4.45-vs2.3.3.9/kernel/vserver/inode.c
---- linux-3.4.45/kernel/vserver/inode.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/kernel/vserver/inode.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/vserver/inode.c linux-3.4.48-vs2.3.3.9/kernel/vserver/inode.c
+--- linux-3.4.48/kernel/vserver/inode.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/kernel/vserver/inode.c 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,437 @@
+/*
+ * linux/kernel/vserver/inode.c
@@ -19817,9 +19769,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/vserver/inode.c linux-3.4.45-vs2.3.3.9
+
+#endif /* CONFIG_PROPAGATE */
+
-diff -NurpP --minimal linux-3.4.45/kernel/vserver/limit.c linux-3.4.45-vs2.3.3.9/kernel/vserver/limit.c
---- linux-3.4.45/kernel/vserver/limit.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/kernel/vserver/limit.c 2012-09-01 09:15:21.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/vserver/limit.c linux-3.4.48-vs2.3.3.9/kernel/vserver/limit.c
+--- linux-3.4.48/kernel/vserver/limit.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/kernel/vserver/limit.c 2012-09-01 09:15:21.000000000 +0000
@@ -0,0 +1,345 @@
+/*
+ * linux/kernel/vserver/limit.c
@@ -20166,9 +20118,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/vserver/limit.c linux-3.4.45-vs2.3.3.9
+ return cache;
+}
+
-diff -NurpP --minimal linux-3.4.45/kernel/vserver/limit_init.h linux-3.4.45-vs2.3.3.9/kernel/vserver/limit_init.h
---- linux-3.4.45/kernel/vserver/limit_init.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/kernel/vserver/limit_init.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/vserver/limit_init.h linux-3.4.48-vs2.3.3.9/kernel/vserver/limit_init.h
+--- linux-3.4.48/kernel/vserver/limit_init.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/kernel/vserver/limit_init.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,31 @@
+
+
@@ -20201,9 +20153,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/vserver/limit_init.h linux-3.4.45-vs2.
+ }
+}
+
-diff -NurpP --minimal linux-3.4.45/kernel/vserver/limit_proc.h linux-3.4.45-vs2.3.3.9/kernel/vserver/limit_proc.h
---- linux-3.4.45/kernel/vserver/limit_proc.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/kernel/vserver/limit_proc.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/vserver/limit_proc.h linux-3.4.48-vs2.3.3.9/kernel/vserver/limit_proc.h
+--- linux-3.4.48/kernel/vserver/limit_proc.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/kernel/vserver/limit_proc.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,57 @@
+#ifndef _VX_LIMIT_PROC_H
+#define _VX_LIMIT_PROC_H
@@ -20262,9 +20214,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/vserver/limit_proc.h linux-3.4.45-vs2.
+#endif /* _VX_LIMIT_PROC_H */
+
+
-diff -NurpP --minimal linux-3.4.45/kernel/vserver/network.c linux-3.4.45-vs2.3.3.9/kernel/vserver/network.c
---- linux-3.4.45/kernel/vserver/network.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/kernel/vserver/network.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/vserver/network.c linux-3.4.48-vs2.3.3.9/kernel/vserver/network.c
+--- linux-3.4.48/kernel/vserver/network.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/kernel/vserver/network.c 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,912 @@
+/*
+ * linux/kernel/vserver/network.c
@@ -21178,9 +21130,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/vserver/network.c linux-3.4.45-vs2.3.3
+EXPORT_SYMBOL_GPL(free_nx_info);
+EXPORT_SYMBOL_GPL(unhash_nx_info);
+
-diff -NurpP --minimal linux-3.4.45/kernel/vserver/proc.c linux-3.4.45-vs2.3.3.9/kernel/vserver/proc.c
---- linux-3.4.45/kernel/vserver/proc.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/kernel/vserver/proc.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/vserver/proc.c linux-3.4.48-vs2.3.3.9/kernel/vserver/proc.c
+--- linux-3.4.48/kernel/vserver/proc.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/kernel/vserver/proc.c 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,1103 @@
+/*
+ * linux/kernel/vserver/proc.c
@@ -22285,9 +22237,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/vserver/proc.c linux-3.4.45-vs2.3.3.9/
+ return buffer - orig;
+}
+
-diff -NurpP --minimal linux-3.4.45/kernel/vserver/sched.c linux-3.4.45-vs2.3.3.9/kernel/vserver/sched.c
---- linux-3.4.45/kernel/vserver/sched.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/kernel/vserver/sched.c 2012-05-21 16:25:11.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/vserver/sched.c linux-3.4.48-vs2.3.3.9/kernel/vserver/sched.c
+--- linux-3.4.48/kernel/vserver/sched.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/kernel/vserver/sched.c 2012-05-21 16:25:11.000000000 +0000
@@ -0,0 +1,83 @@
+/*
+ * linux/kernel/vserver/sched.c
@@ -22372,9 +22324,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/vserver/sched.c linux-3.4.45-vs2.3.3.9
+ return 0;
+}
+
-diff -NurpP --minimal linux-3.4.45/kernel/vserver/sched_init.h linux-3.4.45-vs2.3.3.9/kernel/vserver/sched_init.h
---- linux-3.4.45/kernel/vserver/sched_init.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/kernel/vserver/sched_init.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/vserver/sched_init.h linux-3.4.48-vs2.3.3.9/kernel/vserver/sched_init.h
+--- linux-3.4.48/kernel/vserver/sched_init.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/kernel/vserver/sched_init.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,27 @@
+
+static inline void vx_info_init_sched(struct _vx_sched *sched)
@@ -22403,9 +22355,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/vserver/sched_init.h linux-3.4.45-vs2.
+{
+ return;
+}
-diff -NurpP --minimal linux-3.4.45/kernel/vserver/sched_proc.h linux-3.4.45-vs2.3.3.9/kernel/vserver/sched_proc.h
---- linux-3.4.45/kernel/vserver/sched_proc.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/kernel/vserver/sched_proc.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/vserver/sched_proc.h linux-3.4.48-vs2.3.3.9/kernel/vserver/sched_proc.h
+--- linux-3.4.48/kernel/vserver/sched_proc.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/kernel/vserver/sched_proc.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,32 @@
+#ifndef _VX_SCHED_PROC_H
+#define _VX_SCHED_PROC_H
@@ -22439,9 +22391,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/vserver/sched_proc.h linux-3.4.45-vs2.
+}
+
+#endif /* _VX_SCHED_PROC_H */
-diff -NurpP --minimal linux-3.4.45/kernel/vserver/signal.c linux-3.4.45-vs2.3.3.9/kernel/vserver/signal.c
---- linux-3.4.45/kernel/vserver/signal.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/kernel/vserver/signal.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/vserver/signal.c linux-3.4.48-vs2.3.3.9/kernel/vserver/signal.c
+--- linux-3.4.48/kernel/vserver/signal.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/kernel/vserver/signal.c 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,134 @@
+/*
+ * linux/kernel/vserver/signal.c
@@ -22577,9 +22529,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/vserver/signal.c linux-3.4.45-vs2.3.3.
+ return ret;
+}
+
-diff -NurpP --minimal linux-3.4.45/kernel/vserver/space.c linux-3.4.45-vs2.3.3.9/kernel/vserver/space.c
---- linux-3.4.45/kernel/vserver/space.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/kernel/vserver/space.c 2013-02-12 00:16:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/vserver/space.c linux-3.4.48-vs2.3.3.9/kernel/vserver/space.c
+--- linux-3.4.48/kernel/vserver/space.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/kernel/vserver/space.c 2013-02-12 00:16:04.000000000 +0000
@@ -0,0 +1,436 @@
+/*
+ * linux/kernel/vserver/space.c
@@ -23017,9 +22969,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/vserver/space.c linux-3.4.45-vs2.3.3.9
+ return 0;
+}
+
-diff -NurpP --minimal linux-3.4.45/kernel/vserver/switch.c linux-3.4.45-vs2.3.3.9/kernel/vserver/switch.c
---- linux-3.4.45/kernel/vserver/switch.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/kernel/vserver/switch.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/vserver/switch.c linux-3.4.48-vs2.3.3.9/kernel/vserver/switch.c
+--- linux-3.4.48/kernel/vserver/switch.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/kernel/vserver/switch.c 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,556 @@
+/*
+ * linux/kernel/vserver/switch.c
@@ -23577,9 +23529,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/vserver/switch.c linux-3.4.45-vs2.3.3.
+}
+
+#endif /* CONFIG_COMPAT */
-diff -NurpP --minimal linux-3.4.45/kernel/vserver/sysctl.c linux-3.4.45-vs2.3.3.9/kernel/vserver/sysctl.c
---- linux-3.4.45/kernel/vserver/sysctl.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/kernel/vserver/sysctl.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/vserver/sysctl.c linux-3.4.48-vs2.3.3.9/kernel/vserver/sysctl.c
+--- linux-3.4.48/kernel/vserver/sysctl.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/kernel/vserver/sysctl.c 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,247 @@
+/*
+ * kernel/vserver/sysctl.c
@@ -23828,9 +23780,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/vserver/sysctl.c linux-3.4.45-vs2.3.3.
+EXPORT_SYMBOL_GPL(vs_debug_perm);
+EXPORT_SYMBOL_GPL(vs_debug_misc);
+
-diff -NurpP --minimal linux-3.4.45/kernel/vserver/tag.c linux-3.4.45-vs2.3.3.9/kernel/vserver/tag.c
---- linux-3.4.45/kernel/vserver/tag.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/kernel/vserver/tag.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/vserver/tag.c linux-3.4.48-vs2.3.3.9/kernel/vserver/tag.c
+--- linux-3.4.48/kernel/vserver/tag.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/kernel/vserver/tag.c 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,63 @@
+/*
+ * linux/kernel/vserver/tag.c
@@ -23895,9 +23847,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/vserver/tag.c linux-3.4.45-vs2.3.3.9/k
+}
+
+
-diff -NurpP --minimal linux-3.4.45/kernel/vserver/vci_config.h linux-3.4.45-vs2.3.3.9/kernel/vserver/vci_config.h
---- linux-3.4.45/kernel/vserver/vci_config.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/kernel/vserver/vci_config.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/kernel/vserver/vci_config.h linux-3.4.48-vs2.3.3.9/kernel/vserver/vci_config.h
+--- linux-3.4.48/kernel/vserver/vci_config.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/kernel/vserver/vci_config.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,76 @@
+
+/* interface version */
@@ -23975,9 +23927,9 @@ diff -NurpP --minimal linux-3.4.45/kernel/vserver/vci_config.h linux-3.4.45-vs2.
+ 0;
+}
+
-diff -NurpP --minimal linux-3.4.45/mm/memcontrol.c linux-3.4.45-vs2.3.3.9/mm/memcontrol.c
---- linux-3.4.45/mm/memcontrol.c 2013-05-13 17:36:37.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/mm/memcontrol.c 2012-12-08 00:53:53.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/mm/memcontrol.c linux-3.4.48-vs2.3.3.9/mm/memcontrol.c
+--- linux-3.4.48/mm/memcontrol.c 2013-06-13 08:59:39.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/mm/memcontrol.c 2012-12-08 00:53:53.000000000 +0000
@@ -846,6 +846,31 @@ struct mem_cgroup *mem_cgroup_from_task(
struct mem_cgroup, css);
}
@@ -24010,9 +23962,9 @@ diff -NurpP --minimal linux-3.4.45/mm/memcontrol.c linux-3.4.45-vs2.3.3.9/mm/mem
struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm)
{
struct mem_cgroup *memcg = NULL;
-diff -NurpP --minimal linux-3.4.45/mm/oom_kill.c linux-3.4.45-vs2.3.3.9/mm/oom_kill.c
---- linux-3.4.45/mm/oom_kill.c 2012-05-21 16:07:35.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/mm/oom_kill.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/mm/oom_kill.c linux-3.4.48-vs2.3.3.9/mm/oom_kill.c
+--- linux-3.4.48/mm/oom_kill.c 2012-05-21 16:07:35.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/mm/oom_kill.c 2012-05-21 16:15:05.000000000 +0000
@@ -35,6 +35,8 @@
#include <linux/freezer.h>
#include <linux/ftrace.h>
@@ -24087,9 +24039,9 @@ diff -NurpP --minimal linux-3.4.45/mm/oom_kill.c linux-3.4.45-vs2.3.3.9/mm/oom_k
}
if (PTR_ERR(p) != -1UL) {
oom_kill_process(p, gfp_mask, order, points, totalpages, NULL,
-diff -NurpP --minimal linux-3.4.45/mm/page_alloc.c linux-3.4.45-vs2.3.3.9/mm/page_alloc.c
---- linux-3.4.45/mm/page_alloc.c 2013-05-13 17:36:37.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/mm/page_alloc.c 2013-03-02 15:26:44.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/mm/page_alloc.c linux-3.4.48-vs2.3.3.9/mm/page_alloc.c
+--- linux-3.4.48/mm/page_alloc.c 2013-06-13 08:59:39.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/mm/page_alloc.c 2013-03-02 15:26:44.000000000 +0000
@@ -58,6 +58,8 @@
#include <linux/memcontrol.h>
#include <linux/prefetch.h>
@@ -24119,9 +24071,9 @@ diff -NurpP --minimal linux-3.4.45/mm/page_alloc.c linux-3.4.45-vs2.3.3.9/mm/pag
}
#endif
-diff -NurpP --minimal linux-3.4.45/mm/pgtable-generic.c linux-3.4.45-vs2.3.3.9/mm/pgtable-generic.c
---- linux-3.4.45/mm/pgtable-generic.c 2012-05-21 16:07:35.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/mm/pgtable-generic.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/mm/pgtable-generic.c linux-3.4.48-vs2.3.3.9/mm/pgtable-generic.c
+--- linux-3.4.48/mm/pgtable-generic.c 2012-05-21 16:07:35.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/mm/pgtable-generic.c 2012-05-21 16:15:05.000000000 +0000
@@ -6,6 +6,8 @@
* Copyright (C) 2010 Linus Torvalds
*/
@@ -24131,9 +24083,9 @@ diff -NurpP --minimal linux-3.4.45/mm/pgtable-generic.c linux-3.4.45-vs2.3.3.9/m
#include <linux/pagemap.h>
#include <asm/tlb.h>
#include <asm-generic/pgtable.h>
-diff -NurpP --minimal linux-3.4.45/mm/shmem.c linux-3.4.45-vs2.3.3.9/mm/shmem.c
---- linux-3.4.45/mm/shmem.c 2013-05-13 17:36:37.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/mm/shmem.c 2013-03-02 15:26:44.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/mm/shmem.c linux-3.4.48-vs2.3.3.9/mm/shmem.c
+--- linux-3.4.48/mm/shmem.c 2013-06-13 08:59:39.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/mm/shmem.c 2013-03-02 15:26:44.000000000 +0000
@@ -1473,7 +1473,7 @@ static int shmem_statfs(struct dentry *d
{
struct shmem_sb_info *sbinfo = SHMEM_SB(dentry->d_sb);
@@ -24152,9 +24104,9 @@ diff -NurpP --minimal linux-3.4.45/mm/shmem.c linux-3.4.45-vs2.3.3.9/mm/shmem.c
sb->s_op = &shmem_ops;
sb->s_time_gran = 1;
#ifdef CONFIG_TMPFS_XATTR
-diff -NurpP --minimal linux-3.4.45/mm/slab.c linux-3.4.45-vs2.3.3.9/mm/slab.c
---- linux-3.4.45/mm/slab.c 2013-05-13 17:36:37.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/mm/slab.c 2012-10-22 13:09:53.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/mm/slab.c linux-3.4.48-vs2.3.3.9/mm/slab.c
+--- linux-3.4.48/mm/slab.c 2013-06-13 08:59:39.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/mm/slab.c 2012-10-22 13:09:53.000000000 +0000
@@ -413,6 +413,8 @@ static void kmem_list3_init(struct kmem_
#define STATS_INC_FREEMISS(x) do { } while (0)
#endif
@@ -24188,9 +24140,9 @@ diff -NurpP --minimal linux-3.4.45/mm/slab.c linux-3.4.45-vs2.3.3.9/mm/slab.c
kmemcheck_slab_free(cachep, objp, obj_size(cachep));
-diff -NurpP --minimal linux-3.4.45/mm/slab_vs.h linux-3.4.45-vs2.3.3.9/mm/slab_vs.h
---- linux-3.4.45/mm/slab_vs.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/mm/slab_vs.h 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/mm/slab_vs.h linux-3.4.48-vs2.3.3.9/mm/slab_vs.h
+--- linux-3.4.48/mm/slab_vs.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/mm/slab_vs.h 2012-05-21 16:15:05.000000000 +0000
@@ -0,0 +1,29 @@
+
+#include <linux/vserver/context.h>
@@ -24221,9 +24173,9 @@ diff -NurpP --minimal linux-3.4.45/mm/slab_vs.h linux-3.4.45-vs2.3.3.9/mm/slab_v
+ atomic_sub(cachep->buffer_size, &vxi->cacct.slab[what]);
+}
+
-diff -NurpP --minimal linux-3.4.45/mm/swapfile.c linux-3.4.45-vs2.3.3.9/mm/swapfile.c
---- linux-3.4.45/mm/swapfile.c 2013-05-13 17:36:37.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/mm/swapfile.c 2012-06-28 14:45:07.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/mm/swapfile.c linux-3.4.48-vs2.3.3.9/mm/swapfile.c
+--- linux-3.4.48/mm/swapfile.c 2013-06-13 08:59:40.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/mm/swapfile.c 2012-06-28 14:45:07.000000000 +0000
@@ -36,6 +36,7 @@
#include <asm/tlbflush.h>
#include <linux/swapops.h>
@@ -24258,9 +24210,9 @@ diff -NurpP --minimal linux-3.4.45/mm/swapfile.c linux-3.4.45-vs2.3.3.9/mm/swapf
}
/*
-diff -NurpP --minimal linux-3.4.45/net/bridge/br_multicast.c linux-3.4.45-vs2.3.3.9/net/bridge/br_multicast.c
---- linux-3.4.45/net/bridge/br_multicast.c 2012-05-21 16:07:40.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/net/bridge/br_multicast.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/net/bridge/br_multicast.c linux-3.4.48-vs2.3.3.9/net/bridge/br_multicast.c
+--- linux-3.4.48/net/bridge/br_multicast.c 2012-05-21 16:07:40.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/net/bridge/br_multicast.c 2012-05-21 16:15:05.000000000 +0000
@@ -445,7 +445,7 @@ static struct sk_buff *br_ip6_multicast_
ip6h->hop_limit = 1;
ipv6_addr_set(&ip6h->daddr, htonl(0xff020000), 0, 0, htonl(1));
@@ -24270,9 +24222,9 @@ diff -NurpP --minimal linux-3.4.45/net/bridge/br_multicast.c linux-3.4.45-vs2.3.
kfree_skb(skb);
return NULL;
}
-diff -NurpP --minimal linux-3.4.45/net/core/dev.c linux-3.4.45-vs2.3.3.9/net/core/dev.c
---- linux-3.4.45/net/core/dev.c 2013-05-13 17:36:37.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/net/core/dev.c 2013-05-13 18:16:08.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/net/core/dev.c linux-3.4.48-vs2.3.3.9/net/core/dev.c
+--- linux-3.4.48/net/core/dev.c 2013-06-13 08:59:40.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/net/core/dev.c 2013-06-13 09:46:39.000000000 +0000
@@ -126,6 +126,7 @@
#include <linux/in.h>
#include <linux/jhash.h>
@@ -24370,7 +24322,7 @@ diff -NurpP --minimal linux-3.4.45/net/core/dev.c linux-3.4.45-vs2.3.3.9/net/cor
/* avoid cases where sscanf is not exact inverse of printf */
snprintf(buf, IFNAMSIZ, name, i);
-@@ -4009,6 +4028,8 @@ static int dev_ifconf(struct net *net, c
+@@ -4000,6 +4019,8 @@ static int dev_ifconf(struct net *net, c
total = 0;
for_each_netdev(net, dev) {
@@ -24379,7 +24331,7 @@ diff -NurpP --minimal linux-3.4.45/net/core/dev.c linux-3.4.45-vs2.3.3.9/net/cor
for (i = 0; i < NPROTO; i++) {
if (gifconf_list[i]) {
int done;
-@@ -4111,6 +4132,10 @@ static void dev_seq_printf_stats(struct
+@@ -4102,6 +4123,10 @@ static void dev_seq_printf_stats(struct
struct rtnl_link_stats64 temp;
const struct rtnl_link_stats64 *stats = dev_get_stats(dev, &temp);
@@ -24390,9 +24342,9 @@ diff -NurpP --minimal linux-3.4.45/net/core/dev.c linux-3.4.45-vs2.3.3.9/net/cor
seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
"%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
dev->name, stats->rx_bytes, stats->rx_packets,
-diff -NurpP --minimal linux-3.4.45/net/core/rtnetlink.c linux-3.4.45-vs2.3.3.9/net/core/rtnetlink.c
---- linux-3.4.45/net/core/rtnetlink.c 2013-05-13 17:36:37.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/net/core/rtnetlink.c 2013-05-13 18:16:08.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/net/core/rtnetlink.c linux-3.4.48-vs2.3.3.9/net/core/rtnetlink.c
+--- linux-3.4.48/net/core/rtnetlink.c 2013-06-13 08:59:40.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/net/core/rtnetlink.c 2013-06-13 09:46:39.000000000 +0000
@@ -1079,6 +1079,8 @@ static int rtnl_dump_ifinfo(struct sk_bu
hlist_for_each_entry_rcu(dev, node, head, index_hlist) {
if (idx < s_idx)
@@ -24412,9 +24364,9 @@ diff -NurpP --minimal linux-3.4.45/net/core/rtnetlink.c linux-3.4.45-vs2.3.3.9/n
skb = nlmsg_new((if_info_size = if_nlmsg_size(dev, 0)), GFP_KERNEL);
if (skb == NULL)
goto errout;
-diff -NurpP --minimal linux-3.4.45/net/core/sock.c linux-3.4.45-vs2.3.3.9/net/core/sock.c
---- linux-3.4.45/net/core/sock.c 2013-05-13 17:36:37.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/net/core/sock.c 2013-05-13 18:16:08.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/net/core/sock.c linux-3.4.48-vs2.3.3.9/net/core/sock.c
+--- linux-3.4.48/net/core/sock.c 2013-06-13 08:59:40.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/net/core/sock.c 2013-06-13 09:46:39.000000000 +0000
@@ -129,6 +129,10 @@
#include <net/netprio_cgroup.h>
@@ -24426,7 +24378,7 @@ diff -NurpP --minimal linux-3.4.45/net/core/sock.c linux-3.4.45-vs2.3.3.9/net/co
#include <trace/events/sock.h>
-@@ -1153,6 +1157,8 @@ static struct sock *sk_prot_alloc(struct
+@@ -1147,6 +1151,8 @@ static struct sock *sk_prot_alloc(struct
goto out_free_sec;
sk_tx_queue_clear(sk);
}
@@ -24435,7 +24387,7 @@ diff -NurpP --minimal linux-3.4.45/net/core/sock.c linux-3.4.45-vs2.3.3.9/net/co
return sk;
-@@ -1261,6 +1267,11 @@ static void __sk_free(struct sock *sk)
+@@ -1255,6 +1261,11 @@ static void __sk_free(struct sock *sk)
put_cred(sk->sk_peer_cred);
put_pid(sk->sk_peer_pid);
put_net(sock_net(sk));
@@ -24447,7 +24399,7 @@ diff -NurpP --minimal linux-3.4.45/net/core/sock.c linux-3.4.45-vs2.3.3.9/net/co
sk_prot_free(sk->sk_prot_creator, sk);
}
-@@ -1321,6 +1332,8 @@ struct sock *sk_clone_lock(const struct
+@@ -1315,6 +1326,8 @@ struct sock *sk_clone_lock(const struct
/* SANITY */
get_net(sock_net(newsk));
@@ -24456,7 +24408,7 @@ diff -NurpP --minimal linux-3.4.45/net/core/sock.c linux-3.4.45-vs2.3.3.9/net/co
sk_node_init(&newsk->sk_node);
sock_lock_init(newsk);
bh_lock_sock(newsk);
-@@ -1377,6 +1390,12 @@ struct sock *sk_clone_lock(const struct
+@@ -1371,6 +1384,12 @@ struct sock *sk_clone_lock(const struct
smp_wmb();
atomic_set(&newsk->sk_refcnt, 2);
@@ -24469,7 +24421,7 @@ diff -NurpP --minimal linux-3.4.45/net/core/sock.c linux-3.4.45-vs2.3.3.9/net/co
/*
* Increment the counter in the same struct proto as the master
* sock (sk_refcnt_debug_inc uses newsk->sk_prot->socks, that
-@@ -2133,6 +2152,12 @@ void sock_init_data(struct socket *sock,
+@@ -2127,6 +2146,12 @@ void sock_init_data(struct socket *sock,
sk->sk_stamp = ktime_set(-1L, 0);
@@ -24482,9 +24434,9 @@ diff -NurpP --minimal linux-3.4.45/net/core/sock.c linux-3.4.45-vs2.3.3.9/net/co
/*
* Before updating sk_refcnt, we must commit prior changes to memory
* (Documentation/RCU/rculist_nulls.txt for details)
-diff -NurpP --minimal linux-3.4.45/net/ipv4/af_inet.c linux-3.4.45-vs2.3.3.9/net/ipv4/af_inet.c
---- linux-3.4.45/net/ipv4/af_inet.c 2013-05-13 17:36:38.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/net/ipv4/af_inet.c 2013-03-02 15:26:44.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/net/ipv4/af_inet.c linux-3.4.48-vs2.3.3.9/net/ipv4/af_inet.c
+--- linux-3.4.48/net/ipv4/af_inet.c 2013-06-13 08:59:41.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/net/ipv4/af_inet.c 2013-03-02 15:26:44.000000000 +0000
@@ -118,6 +118,7 @@
#ifdef CONFIG_IP_MROUTE
#include <linux/mroute.h>
@@ -24562,9 +24514,9 @@ diff -NurpP --minimal linux-3.4.45/net/ipv4/af_inet.c linux-3.4.45-vs2.3.3.9/net
sin->sin_port = inet->inet_sport;
sin->sin_addr.s_addr = addr;
}
-diff -NurpP --minimal linux-3.4.45/net/ipv4/arp.c linux-3.4.45-vs2.3.3.9/net/ipv4/arp.c
---- linux-3.4.45/net/ipv4/arp.c 2012-05-21 16:07:40.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/net/ipv4/arp.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/net/ipv4/arp.c linux-3.4.48-vs2.3.3.9/net/ipv4/arp.c
+--- linux-3.4.48/net/ipv4/arp.c 2012-05-21 16:07:40.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/net/ipv4/arp.c 2012-05-21 16:15:05.000000000 +0000
@@ -1328,6 +1328,7 @@ static void arp_format_neigh_entry(struc
struct net_device *dev = n->dev;
int hatype = dev->type;
@@ -24581,9 +24533,9 @@ diff -NurpP --minimal linux-3.4.45/net/ipv4/arp.c linux-3.4.45-vs2.3.3.9/net/ipv
sprintf(tbuf, "%pI4", n->key);
seq_printf(seq, "%-16s 0x%-10x0x%-10x%s * %s\n",
tbuf, hatype, ATF_PUBL | ATF_PERM, "00:00:00:00:00:00",
-diff -NurpP --minimal linux-3.4.45/net/ipv4/devinet.c linux-3.4.45-vs2.3.3.9/net/ipv4/devinet.c
---- linux-3.4.45/net/ipv4/devinet.c 2012-05-21 16:07:40.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/net/ipv4/devinet.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/net/ipv4/devinet.c linux-3.4.48-vs2.3.3.9/net/ipv4/devinet.c
+--- linux-3.4.48/net/ipv4/devinet.c 2012-05-21 16:07:40.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/net/ipv4/devinet.c 2012-05-21 16:15:05.000000000 +0000
@@ -517,6 +517,7 @@ struct in_device *inetdev_by_index(struc
}
EXPORT_SYMBOL(inetdev_by_index);
@@ -24650,9 +24602,9 @@ diff -NurpP --minimal linux-3.4.45/net/ipv4/devinet.c linux-3.4.45-vs2.3.3.9/net
if (ip_idx < s_ip_idx)
continue;
if (inet_fill_ifaddr(skb, ifa,
-diff -NurpP --minimal linux-3.4.45/net/ipv4/fib_trie.c linux-3.4.45-vs2.3.3.9/net/ipv4/fib_trie.c
---- linux-3.4.45/net/ipv4/fib_trie.c 2012-05-21 16:07:40.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/net/ipv4/fib_trie.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/net/ipv4/fib_trie.c linux-3.4.48-vs2.3.3.9/net/ipv4/fib_trie.c
+--- linux-3.4.48/net/ipv4/fib_trie.c 2012-05-21 16:07:40.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/net/ipv4/fib_trie.c 2012-05-21 16:15:05.000000000 +0000
@@ -2556,6 +2556,7 @@ static int fib_route_seq_show(struct seq
|| fa->fa_type == RTN_MULTICAST)
continue;
@@ -24661,9 +24613,9 @@ diff -NurpP --minimal linux-3.4.45/net/ipv4/fib_trie.c linux-3.4.45-vs2.3.3.9/ne
if (fi)
seq_printf(seq,
"%s\t%08X\t%08X\t%04X\t%d\t%u\t"
-diff -NurpP --minimal linux-3.4.45/net/ipv4/inet_connection_sock.c linux-3.4.45-vs2.3.3.9/net/ipv4/inet_connection_sock.c
---- linux-3.4.45/net/ipv4/inet_connection_sock.c 2013-05-13 17:36:38.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/net/ipv4/inet_connection_sock.c 2013-01-16 00:15:57.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/net/ipv4/inet_connection_sock.c linux-3.4.48-vs2.3.3.9/net/ipv4/inet_connection_sock.c
+--- linux-3.4.48/net/ipv4/inet_connection_sock.c 2013-06-13 08:59:41.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/net/ipv4/inet_connection_sock.c 2013-01-16 00:15:57.000000000 +0000
@@ -52,6 +52,37 @@ void inet_get_local_port_range(int *low,
}
EXPORT_SYMBOL(inet_get_local_port_range);
@@ -24713,9 +24665,9 @@ diff -NurpP --minimal linux-3.4.45/net/ipv4/inet_connection_sock.c linux-3.4.45-
break;
}
}
-diff -NurpP --minimal linux-3.4.45/net/ipv4/inet_diag.c linux-3.4.45-vs2.3.3.9/net/ipv4/inet_diag.c
---- linux-3.4.45/net/ipv4/inet_diag.c 2013-05-13 17:36:38.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/net/ipv4/inet_diag.c 2013-01-16 00:18:21.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/net/ipv4/inet_diag.c linux-3.4.48-vs2.3.3.9/net/ipv4/inet_diag.c
+--- linux-3.4.48/net/ipv4/inet_diag.c 2013-06-13 08:59:41.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/net/ipv4/inet_diag.c 2013-01-16 00:18:21.000000000 +0000
@@ -31,6 +31,8 @@
#include <linux/inet.h>
@@ -24826,9 +24778,9 @@ diff -NurpP --minimal linux-3.4.45/net/ipv4/inet_diag.c linux-3.4.45-vs2.3.3.9/n
if (num < s_num)
goto next_dying;
if (r->sdiag_family != AF_UNSPEC &&
-diff -NurpP --minimal linux-3.4.45/net/ipv4/inet_hashtables.c linux-3.4.45-vs2.3.3.9/net/ipv4/inet_hashtables.c
---- linux-3.4.45/net/ipv4/inet_hashtables.c 2011-10-24 16:45:34.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/net/ipv4/inet_hashtables.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/net/ipv4/inet_hashtables.c linux-3.4.48-vs2.3.3.9/net/ipv4/inet_hashtables.c
+--- linux-3.4.48/net/ipv4/inet_hashtables.c 2011-10-24 16:45:34.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/net/ipv4/inet_hashtables.c 2012-05-21 16:15:05.000000000 +0000
@@ -22,6 +22,7 @@
#include <net/inet_connection_sock.h>
#include <net/inet_hashtables.h>
@@ -24865,9 +24817,9 @@ diff -NurpP --minimal linux-3.4.45/net/ipv4/inet_hashtables.c linux-3.4.45-vs2.3
/*
* if the nulls value we got at the end of this lookup is
* not the expected one, we must restart lookup.
-diff -NurpP --minimal linux-3.4.45/net/ipv4/netfilter/nf_nat_helper.c linux-3.4.45-vs2.3.3.9/net/ipv4/netfilter/nf_nat_helper.c
---- linux-3.4.45/net/ipv4/netfilter/nf_nat_helper.c 2012-03-19 18:47:33.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/net/ipv4/netfilter/nf_nat_helper.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/net/ipv4/netfilter/nf_nat_helper.c linux-3.4.48-vs2.3.3.9/net/ipv4/netfilter/nf_nat_helper.c
+--- linux-3.4.48/net/ipv4/netfilter/nf_nat_helper.c 2012-03-19 18:47:33.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/net/ipv4/netfilter/nf_nat_helper.c 2012-05-21 16:15:05.000000000 +0000
@@ -20,6 +20,7 @@
#include <net/route.h>
@@ -24876,9 +24828,9 @@ diff -NurpP --minimal linux-3.4.45/net/ipv4/netfilter/nf_nat_helper.c linux-3.4.
#include <net/netfilter/nf_conntrack.h>
#include <net/netfilter/nf_conntrack_helper.h>
#include <net/netfilter/nf_conntrack_ecache.h>
-diff -NurpP --minimal linux-3.4.45/net/ipv4/netfilter.c linux-3.4.45-vs2.3.3.9/net/ipv4/netfilter.c
---- linux-3.4.45/net/ipv4/netfilter.c 2012-01-09 15:15:03.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/net/ipv4/netfilter.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/net/ipv4/netfilter.c linux-3.4.48-vs2.3.3.9/net/ipv4/netfilter.c
+--- linux-3.4.48/net/ipv4/netfilter.c 2012-01-09 15:15:03.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/net/ipv4/netfilter.c 2012-05-21 16:15:05.000000000 +0000
@@ -6,7 +6,7 @@
#include <linux/skbuff.h>
#include <linux/gfp.h>
@@ -24888,9 +24840,9 @@ diff -NurpP --minimal linux-3.4.45/net/ipv4/netfilter.c linux-3.4.45-vs2.3.3.9/n
#include <net/xfrm.h>
#include <net/ip.h>
#include <net/netfilter/nf_queue.h>
-diff -NurpP --minimal linux-3.4.45/net/ipv4/raw.c linux-3.4.45-vs2.3.3.9/net/ipv4/raw.c
---- linux-3.4.45/net/ipv4/raw.c 2013-05-13 17:36:38.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/net/ipv4/raw.c 2012-10-22 13:09:53.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/net/ipv4/raw.c linux-3.4.48-vs2.3.3.9/net/ipv4/raw.c
+--- linux-3.4.48/net/ipv4/raw.c 2013-06-13 08:59:41.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/net/ipv4/raw.c 2012-10-22 13:09:53.000000000 +0000
@@ -118,7 +118,7 @@ static struct sock *__raw_v4_lookup(stru
if (net_eq(sock_net(sk), net) && inet->inet_num == num &&
@@ -24983,9 +24935,9 @@ diff -NurpP --minimal linux-3.4.45/net/ipv4/raw.c linux-3.4.45-vs2.3.3.9/net/ipv
if (!sk && ++state->bucket < RAW_HTABLE_SIZE) {
sk = sk_head(&state->h->ht[state->bucket]);
-diff -NurpP --minimal linux-3.4.45/net/ipv4/route.c linux-3.4.45-vs2.3.3.9/net/ipv4/route.c
---- linux-3.4.45/net/ipv4/route.c 2012-05-21 16:07:40.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/net/ipv4/route.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/net/ipv4/route.c linux-3.4.48-vs2.3.3.9/net/ipv4/route.c
+--- linux-3.4.48/net/ipv4/route.c 2012-05-21 16:07:40.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/net/ipv4/route.c 2012-05-21 16:15:05.000000000 +0000
@@ -2696,7 +2696,7 @@ static struct rtable *ip_route_output_sl
@@ -24995,9 +24947,9 @@ diff -NurpP --minimal linux-3.4.45/net/ipv4/route.c linux-3.4.45-vs2.3.3.9/net/i
rth = ERR_PTR(-ENODEV);
if (dev_out == NULL)
goto out;
-diff -NurpP --minimal linux-3.4.45/net/ipv4/tcp.c linux-3.4.45-vs2.3.3.9/net/ipv4/tcp.c
---- linux-3.4.45/net/ipv4/tcp.c 2013-05-13 17:36:38.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/net/ipv4/tcp.c 2013-03-30 21:29:17.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/net/ipv4/tcp.c linux-3.4.48-vs2.3.3.9/net/ipv4/tcp.c
+--- linux-3.4.48/net/ipv4/tcp.c 2013-06-13 08:59:41.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/net/ipv4/tcp.c 2013-03-30 21:29:17.000000000 +0000
@@ -268,6 +268,7 @@
#include <linux/crypto.h>
#include <linux/time.h>
@@ -25006,9 +24958,9 @@ diff -NurpP --minimal linux-3.4.45/net/ipv4/tcp.c linux-3.4.45-vs2.3.3.9/net/ipv
#include <net/icmp.h>
#include <net/tcp.h>
-diff -NurpP --minimal linux-3.4.45/net/ipv4/tcp_ipv4.c linux-3.4.45-vs2.3.3.9/net/ipv4/tcp_ipv4.c
---- linux-3.4.45/net/ipv4/tcp_ipv4.c 2013-05-13 17:36:38.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/net/ipv4/tcp_ipv4.c 2013-01-16 00:15:57.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/net/ipv4/tcp_ipv4.c linux-3.4.48-vs2.3.3.9/net/ipv4/tcp_ipv4.c
+--- linux-3.4.48/net/ipv4/tcp_ipv4.c 2013-06-13 08:59:41.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/net/ipv4/tcp_ipv4.c 2013-01-16 00:15:57.000000000 +0000
@@ -2037,6 +2037,12 @@ static void *listening_get_next(struct s
req = req->dl_next;
while (1) {
@@ -25114,9 +25066,9 @@ diff -NurpP --minimal linux-3.4.45/net/ipv4/tcp_ipv4.c linux-3.4.45-vs2.3.3.9/ne
destp = ntohs(tw->tw_dport);
srcp = ntohs(tw->tw_sport);
-diff -NurpP --minimal linux-3.4.45/net/ipv4/tcp_minisocks.c linux-3.4.45-vs2.3.3.9/net/ipv4/tcp_minisocks.c
---- linux-3.4.45/net/ipv4/tcp_minisocks.c 2012-05-21 16:07:40.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/net/ipv4/tcp_minisocks.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/net/ipv4/tcp_minisocks.c linux-3.4.48-vs2.3.3.9/net/ipv4/tcp_minisocks.c
+--- linux-3.4.48/net/ipv4/tcp_minisocks.c 2012-05-21 16:07:40.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/net/ipv4/tcp_minisocks.c 2012-05-21 16:15:05.000000000 +0000
@@ -23,6 +23,9 @@
#include <linux/slab.h>
#include <linux/sysctl.h>
@@ -25139,9 +25091,9 @@ diff -NurpP --minimal linux-3.4.45/net/ipv4/tcp_minisocks.c linux-3.4.45-vs2.3.3
#if IS_ENABLED(CONFIG_IPV6)
if (tw->tw_family == PF_INET6) {
struct ipv6_pinfo *np = inet6_sk(sk);
-diff -NurpP --minimal linux-3.4.45/net/ipv4/udp.c linux-3.4.45-vs2.3.3.9/net/ipv4/udp.c
---- linux-3.4.45/net/ipv4/udp.c 2012-05-21 16:07:40.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/net/ipv4/udp.c 2012-06-28 14:45:36.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/net/ipv4/udp.c linux-3.4.48-vs2.3.3.9/net/ipv4/udp.c
+--- linux-3.4.48/net/ipv4/udp.c 2012-05-21 16:07:40.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/net/ipv4/udp.c 2012-06-28 14:45:36.000000000 +0000
@@ -298,14 +298,7 @@ fail:
}
EXPORT_SYMBOL(udp_lib_get_port);
@@ -25274,9 +25226,9 @@ diff -NurpP --minimal linux-3.4.45/net/ipv4/udp.c linux-3.4.45-vs2.3.3.9/net/ipv
__u16 destp = ntohs(inet->inet_dport);
__u16 srcp = ntohs(inet->inet_sport);
-diff -NurpP --minimal linux-3.4.45/net/ipv6/Kconfig linux-3.4.45-vs2.3.3.9/net/ipv6/Kconfig
---- linux-3.4.45/net/ipv6/Kconfig 2010-08-02 14:52:59.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/net/ipv6/Kconfig 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/net/ipv6/Kconfig linux-3.4.48-vs2.3.3.9/net/ipv6/Kconfig
+--- linux-3.4.48/net/ipv6/Kconfig 2010-08-02 14:52:59.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/net/ipv6/Kconfig 2012-05-21 16:15:05.000000000 +0000
@@ -4,8 +4,8 @@
# IPv6 as module will cause a CRASH if you try to unload it
@@ -25288,9 +25240,9 @@ diff -NurpP --minimal linux-3.4.45/net/ipv6/Kconfig linux-3.4.45-vs2.3.3.9/net/i
---help---
This is complemental support for the IP version 6.
You will still be able to do traditional IPv4 networking as well.
-diff -NurpP --minimal linux-3.4.45/net/ipv6/addrconf.c linux-3.4.45-vs2.3.3.9/net/ipv6/addrconf.c
---- linux-3.4.45/net/ipv6/addrconf.c 2013-05-13 17:36:38.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/net/ipv6/addrconf.c 2013-05-13 18:16:08.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/net/ipv6/addrconf.c linux-3.4.48-vs2.3.3.9/net/ipv6/addrconf.c
+--- linux-3.4.48/net/ipv6/addrconf.c 2013-06-13 08:59:41.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/net/ipv6/addrconf.c 2013-06-13 09:46:39.000000000 +0000
@@ -88,6 +88,8 @@
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
@@ -25318,7 +25270,7 @@ diff -NurpP --minimal linux-3.4.45/net/ipv6/addrconf.c linux-3.4.45-vs2.3.3.9/ne
score->rule = -1;
bitmap_zero(score->scorebits, IPV6_SADDR_RULE_MAX);
-@@ -3193,7 +3197,10 @@ static void if6_seq_stop(struct seq_file
+@@ -3166,7 +3170,10 @@ static void if6_seq_stop(struct seq_file
static int if6_seq_show(struct seq_file *seq, void *v)
{
struct inet6_ifaddr *ifp = (struct inet6_ifaddr *)v;
@@ -25330,7 +25282,7 @@ diff -NurpP --minimal linux-3.4.45/net/ipv6/addrconf.c linux-3.4.45-vs2.3.3.9/ne
&ifp->addr,
ifp->idev->dev->ifindex,
ifp->prefix_len,
-@@ -3699,6 +3706,11 @@ static int in6_dump_addrs(struct inet6_d
+@@ -3672,6 +3679,11 @@ static int in6_dump_addrs(struct inet6_d
struct ifacaddr6 *ifaca;
int err = 1;
int ip_idx = *p_ip_idx;
@@ -25342,7 +25294,7 @@ diff -NurpP --minimal linux-3.4.45/net/ipv6/addrconf.c linux-3.4.45-vs2.3.3.9/ne
read_lock_bh(&idev->lock);
switch (type) {
-@@ -3709,6 +3721,8 @@ static int in6_dump_addrs(struct inet6_d
+@@ -3682,6 +3694,8 @@ static int in6_dump_addrs(struct inet6_d
list_for_each_entry(ifa, &idev->addr_list, if_list) {
if (++ip_idx < s_ip_idx)
continue;
@@ -25351,7 +25303,7 @@ diff -NurpP --minimal linux-3.4.45/net/ipv6/addrconf.c linux-3.4.45-vs2.3.3.9/ne
err = inet6_fill_ifaddr(skb, ifa,
NETLINK_CB(cb->skb).pid,
cb->nlh->nlmsg_seq,
-@@ -3725,6 +3739,8 @@ static int in6_dump_addrs(struct inet6_d
+@@ -3698,6 +3712,8 @@ static int in6_dump_addrs(struct inet6_d
ifmca = ifmca->next, ip_idx++) {
if (ip_idx < s_ip_idx)
continue;
@@ -25360,7 +25312,7 @@ diff -NurpP --minimal linux-3.4.45/net/ipv6/addrconf.c linux-3.4.45-vs2.3.3.9/ne
err = inet6_fill_ifmcaddr(skb, ifmca,
NETLINK_CB(cb->skb).pid,
cb->nlh->nlmsg_seq,
-@@ -3740,6 +3756,8 @@ static int in6_dump_addrs(struct inet6_d
+@@ -3713,6 +3729,8 @@ static int in6_dump_addrs(struct inet6_d
ifaca = ifaca->aca_next, ip_idx++) {
if (ip_idx < s_ip_idx)
continue;
@@ -25369,7 +25321,7 @@ diff -NurpP --minimal linux-3.4.45/net/ipv6/addrconf.c linux-3.4.45-vs2.3.3.9/ne
err = inet6_fill_ifacaddr(skb, ifaca,
NETLINK_CB(cb->skb).pid,
cb->nlh->nlmsg_seq,
-@@ -4125,6 +4143,11 @@ static int inet6_dump_ifinfo(struct sk_b
+@@ -4098,6 +4116,11 @@ static int inet6_dump_ifinfo(struct sk_b
struct inet6_dev *idev;
struct hlist_head *head;
struct hlist_node *node;
@@ -25381,7 +25333,7 @@ diff -NurpP --minimal linux-3.4.45/net/ipv6/addrconf.c linux-3.4.45-vs2.3.3.9/ne
s_h = cb->args[0];
s_idx = cb->args[1];
-@@ -4136,6 +4159,8 @@ static int inet6_dump_ifinfo(struct sk_b
+@@ -4109,6 +4132,8 @@ static int inet6_dump_ifinfo(struct sk_b
hlist_for_each_entry_rcu(dev, node, head, index_hlist) {
if (idx < s_idx)
goto cont;
@@ -25390,9 +25342,9 @@ diff -NurpP --minimal linux-3.4.45/net/ipv6/addrconf.c linux-3.4.45-vs2.3.3.9/ne
idev = __in6_dev_get(dev);
if (!idev)
goto cont;
-diff -NurpP --minimal linux-3.4.45/net/ipv6/af_inet6.c linux-3.4.45-vs2.3.3.9/net/ipv6/af_inet6.c
---- linux-3.4.45/net/ipv6/af_inet6.c 2012-05-21 16:07:40.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/net/ipv6/af_inet6.c 2012-09-01 09:15:04.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/net/ipv6/af_inet6.c linux-3.4.48-vs2.3.3.9/net/ipv6/af_inet6.c
+--- linux-3.4.48/net/ipv6/af_inet6.c 2012-05-21 16:07:40.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/net/ipv6/af_inet6.c 2012-09-01 09:15:04.000000000 +0000
@@ -42,6 +42,8 @@
#include <linux/netdevice.h>
#include <linux/icmpv6.h>
@@ -25488,9 +25440,9 @@ diff -NurpP --minimal linux-3.4.45/net/ipv6/af_inet6.c linux-3.4.45-vs2.3.3.9/ne
if (ipv6_addr_any(&np->rcv_saddr))
sin->sin6_addr = np->saddr;
else
-diff -NurpP --minimal linux-3.4.45/net/ipv6/datagram.c linux-3.4.45-vs2.3.3.9/net/ipv6/datagram.c
---- linux-3.4.45/net/ipv6/datagram.c 2012-05-21 16:07:40.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/net/ipv6/datagram.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/net/ipv6/datagram.c linux-3.4.48-vs2.3.3.9/net/ipv6/datagram.c
+--- linux-3.4.48/net/ipv6/datagram.c 2012-05-21 16:07:40.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/net/ipv6/datagram.c 2012-05-21 16:15:05.000000000 +0000
@@ -642,7 +642,7 @@ int datagram_send_ctl(struct net *net, s
rcu_read_lock();
@@ -25500,9 +25452,9 @@ diff -NurpP --minimal linux-3.4.45/net/ipv6/datagram.c linux-3.4.45-vs2.3.3.9/ne
if (!dev) {
rcu_read_unlock();
return -ENODEV;
-diff -NurpP --minimal linux-3.4.45/net/ipv6/fib6_rules.c linux-3.4.45-vs2.3.3.9/net/ipv6/fib6_rules.c
---- linux-3.4.45/net/ipv6/fib6_rules.c 2012-03-19 18:47:33.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/net/ipv6/fib6_rules.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/net/ipv6/fib6_rules.c linux-3.4.48-vs2.3.3.9/net/ipv6/fib6_rules.c
+--- linux-3.4.48/net/ipv6/fib6_rules.c 2012-03-19 18:47:33.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/net/ipv6/fib6_rules.c 2012-05-21 16:15:05.000000000 +0000
@@ -91,7 +91,7 @@ static int fib6_rule_action(struct fib_r
ip6_dst_idev(&rt->dst)->dev,
&flp6->daddr,
@@ -25512,9 +25464,9 @@ diff -NurpP --minimal linux-3.4.45/net/ipv6/fib6_rules.c linux-3.4.45-vs2.3.3.9/
goto again;
if (!ipv6_prefix_equal(&saddr, &r->src.addr,
r->src.plen))
-diff -NurpP --minimal linux-3.4.45/net/ipv6/inet6_hashtables.c linux-3.4.45-vs2.3.3.9/net/ipv6/inet6_hashtables.c
---- linux-3.4.45/net/ipv6/inet6_hashtables.c 2011-10-24 16:45:34.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/net/ipv6/inet6_hashtables.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/net/ipv6/inet6_hashtables.c linux-3.4.48-vs2.3.3.9/net/ipv6/inet6_hashtables.c
+--- linux-3.4.48/net/ipv6/inet6_hashtables.c 2011-10-24 16:45:34.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/net/ipv6/inet6_hashtables.c 2012-05-21 16:15:05.000000000 +0000
@@ -16,6 +16,7 @@
#include <linux/module.h>
@@ -25550,9 +25502,9 @@ diff -NurpP --minimal linux-3.4.45/net/ipv6/inet6_hashtables.c linux-3.4.45-vs2.
}
if (sk->sk_bound_dev_if) {
if (sk->sk_bound_dev_if != dif)
-diff -NurpP --minimal linux-3.4.45/net/ipv6/ip6_output.c linux-3.4.45-vs2.3.3.9/net/ipv6/ip6_output.c
---- linux-3.4.45/net/ipv6/ip6_output.c 2013-05-13 17:36:38.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/net/ipv6/ip6_output.c 2013-02-19 14:42:56.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/net/ipv6/ip6_output.c linux-3.4.48-vs2.3.3.9/net/ipv6/ip6_output.c
+--- linux-3.4.48/net/ipv6/ip6_output.c 2013-06-13 08:59:41.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/net/ipv6/ip6_output.c 2013-02-19 14:42:56.000000000 +0000
@@ -966,7 +966,8 @@ static int ip6_dst_lookup_tail(struct so
struct rt6_info *rt = (struct rt6_info *) *dst;
err = ip6_route_get_saddr(net, rt, &fl6->daddr,
@@ -25563,9 +25515,9 @@ diff -NurpP --minimal linux-3.4.45/net/ipv6/ip6_output.c linux-3.4.45-vs2.3.3.9/
if (err)
goto out_err_release;
}
-diff -NurpP --minimal linux-3.4.45/net/ipv6/ndisc.c linux-3.4.45-vs2.3.3.9/net/ipv6/ndisc.c
---- linux-3.4.45/net/ipv6/ndisc.c 2013-05-13 17:36:38.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/net/ipv6/ndisc.c 2012-11-18 23:52:30.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/net/ipv6/ndisc.c linux-3.4.48-vs2.3.3.9/net/ipv6/ndisc.c
+--- linux-3.4.48/net/ipv6/ndisc.c 2013-06-13 08:59:41.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/net/ipv6/ndisc.c 2012-11-18 23:52:30.000000000 +0000
@@ -575,7 +575,7 @@ static void ndisc_send_na(struct net_dev
} else {
if (ipv6_dev_get_saddr(dev_net(dev), dev, daddr,
@@ -25575,9 +25527,9 @@ diff -NurpP --minimal linux-3.4.45/net/ipv6/ndisc.c linux-3.4.45-vs2.3.3.9/net/i
return;
src_addr = &tmpaddr;
}
-diff -NurpP --minimal linux-3.4.45/net/ipv6/raw.c linux-3.4.45-vs2.3.3.9/net/ipv6/raw.c
---- linux-3.4.45/net/ipv6/raw.c 2013-05-13 17:36:38.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/net/ipv6/raw.c 2012-10-22 13:09:53.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/net/ipv6/raw.c linux-3.4.48-vs2.3.3.9/net/ipv6/raw.c
+--- linux-3.4.48/net/ipv6/raw.c 2013-06-13 08:59:41.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/net/ipv6/raw.c 2012-10-22 13:09:53.000000000 +0000
@@ -30,6 +30,7 @@
#include <linux/icmpv6.h>
#include <linux/netfilter.h>
@@ -25600,9 +25552,9 @@ diff -NurpP --minimal linux-3.4.45/net/ipv6/raw.c linux-3.4.45-vs2.3.3.9/net/ipv
/* ipv4 addr of the socket is invalid. Only the
* unspecified and mapped address have a v4 equivalent.
*/
-diff -NurpP --minimal linux-3.4.45/net/ipv6/route.c linux-3.4.45-vs2.3.3.9/net/ipv6/route.c
---- linux-3.4.45/net/ipv6/route.c 2013-05-13 17:36:38.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/net/ipv6/route.c 2013-03-30 21:29:17.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/net/ipv6/route.c linux-3.4.48-vs2.3.3.9/net/ipv6/route.c
+--- linux-3.4.48/net/ipv6/route.c 2013-06-13 08:59:41.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/net/ipv6/route.c 2013-03-30 21:29:17.000000000 +0000
@@ -55,6 +55,7 @@
#include <net/xfrm.h>
#include <net/netevent.h>
@@ -25650,9 +25602,9 @@ diff -NurpP --minimal linux-3.4.45/net/ipv6/route.c linux-3.4.45-vs2.3.3.9/net/i
seq_printf(m, "%pi6 %02x ", &rt->rt6i_dst.addr, rt->rt6i_dst.plen);
#ifdef CONFIG_IPV6_SUBTREES
-diff -NurpP --minimal linux-3.4.45/net/ipv6/tcp_ipv6.c linux-3.4.45-vs2.3.3.9/net/ipv6/tcp_ipv6.c
---- linux-3.4.45/net/ipv6/tcp_ipv6.c 2013-05-13 17:36:38.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/net/ipv6/tcp_ipv6.c 2013-01-16 00:15:57.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/net/ipv6/tcp_ipv6.c linux-3.4.48-vs2.3.3.9/net/ipv6/tcp_ipv6.c
+--- linux-3.4.48/net/ipv6/tcp_ipv6.c 2013-06-13 08:59:41.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/net/ipv6/tcp_ipv6.c 2013-01-16 00:15:57.000000000 +0000
@@ -71,6 +71,7 @@
#include <linux/crypto.h>
@@ -25679,9 +25631,9 @@ diff -NurpP --minimal linux-3.4.45/net/ipv6/tcp_ipv6.c linux-3.4.45-vs2.3.3.9/ne
addr_type = ipv6_addr_type(&usin->sin6_addr);
-diff -NurpP --minimal linux-3.4.45/net/ipv6/udp.c linux-3.4.45-vs2.3.3.9/net/ipv6/udp.c
---- linux-3.4.45/net/ipv6/udp.c 2012-05-21 16:07:40.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/net/ipv6/udp.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/net/ipv6/udp.c linux-3.4.48-vs2.3.3.9/net/ipv6/udp.c
+--- linux-3.4.48/net/ipv6/udp.c 2012-05-21 16:07:40.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/net/ipv6/udp.c 2012-05-21 16:15:05.000000000 +0000
@@ -45,41 +45,67 @@
#include <net/tcp_states.h>
#include <net/ip6_checksum.h>
@@ -25774,9 +25726,9 @@ diff -NurpP --minimal linux-3.4.45/net/ipv6/udp.c linux-3.4.45-vs2.3.3.9/net/ipv
}
if (!ipv6_addr_any(&np->daddr)) {
if (!ipv6_addr_equal(&np->daddr, saddr))
-diff -NurpP --minimal linux-3.4.45/net/ipv6/xfrm6_policy.c linux-3.4.45-vs2.3.3.9/net/ipv6/xfrm6_policy.c
---- linux-3.4.45/net/ipv6/xfrm6_policy.c 2012-03-19 18:47:33.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/net/ipv6/xfrm6_policy.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/net/ipv6/xfrm6_policy.c linux-3.4.48-vs2.3.3.9/net/ipv6/xfrm6_policy.c
+--- linux-3.4.48/net/ipv6/xfrm6_policy.c 2012-03-19 18:47:33.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/net/ipv6/xfrm6_policy.c 2012-05-21 16:15:05.000000000 +0000
@@ -63,7 +63,7 @@ static int xfrm6_get_saddr(struct net *n
dev = ip6_dst_idev(dst)->dev;
ipv6_dev_get_saddr(dev_net(dev), dev,
@@ -25786,9 +25738,9 @@ diff -NurpP --minimal linux-3.4.45/net/ipv6/xfrm6_policy.c linux-3.4.45-vs2.3.3.
dst_release(dst);
return 0;
}
-diff -NurpP --minimal linux-3.4.45/net/netfilter/ipvs/ip_vs_xmit.c linux-3.4.45-vs2.3.3.9/net/netfilter/ipvs/ip_vs_xmit.c
---- linux-3.4.45/net/netfilter/ipvs/ip_vs_xmit.c 2012-03-19 18:47:33.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/net/netfilter/ipvs/ip_vs_xmit.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/net/netfilter/ipvs/ip_vs_xmit.c linux-3.4.48-vs2.3.3.9/net/netfilter/ipvs/ip_vs_xmit.c
+--- linux-3.4.48/net/netfilter/ipvs/ip_vs_xmit.c 2012-03-19 18:47:33.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/net/netfilter/ipvs/ip_vs_xmit.c 2012-05-21 16:15:05.000000000 +0000
@@ -226,7 +226,7 @@ __ip_vs_route_output_v6(struct net *net,
return dst;
if (ipv6_addr_any(&fl6.saddr) &&
@@ -25798,9 +25750,9 @@ diff -NurpP --minimal linux-3.4.45/net/netfilter/ipvs/ip_vs_xmit.c linux-3.4.45-
goto out_err;
if (do_xfrm) {
dst = xfrm_lookup(net, dst, flowi6_to_flowi(&fl6), NULL, 0);
-diff -NurpP --minimal linux-3.4.45/net/netlink/af_netlink.c linux-3.4.45-vs2.3.3.9/net/netlink/af_netlink.c
---- linux-3.4.45/net/netlink/af_netlink.c 2013-05-13 17:36:38.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/net/netlink/af_netlink.c 2012-11-18 23:52:30.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/net/netlink/af_netlink.c linux-3.4.48-vs2.3.3.9/net/netlink/af_netlink.c
+--- linux-3.4.48/net/netlink/af_netlink.c 2013-06-13 08:59:42.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/net/netlink/af_netlink.c 2012-11-18 23:52:30.000000000 +0000
@@ -55,6 +55,9 @@
#include <linux/types.h>
#include <linux/audit.h>
@@ -25840,9 +25792,9 @@ diff -NurpP --minimal linux-3.4.45/net/netlink/af_netlink.c linux-3.4.45-vs2.3.3
s = sk_next(s);
if (s) {
iter->link = i;
-diff -NurpP --minimal linux-3.4.45/net/socket.c linux-3.4.45-vs2.3.3.9/net/socket.c
---- linux-3.4.45/net/socket.c 2013-05-13 17:36:38.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/net/socket.c 2012-10-22 13:09:53.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/net/socket.c linux-3.4.48-vs2.3.3.9/net/socket.c
+--- linux-3.4.48/net/socket.c 2013-06-13 08:59:42.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/net/socket.c 2012-10-22 13:09:53.000000000 +0000
@@ -98,6 +98,10 @@
#include <net/sock.h>
@@ -25949,9 +25901,9 @@ diff -NurpP --minimal linux-3.4.45/net/socket.c linux-3.4.45-vs2.3.3.9/net/socke
err = sock1->ops->socketpair(sock1, sock2);
if (err < 0)
-diff -NurpP --minimal linux-3.4.45/net/sunrpc/auth.c linux-3.4.45-vs2.3.3.9/net/sunrpc/auth.c
---- linux-3.4.45/net/sunrpc/auth.c 2011-10-24 16:45:34.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/net/sunrpc/auth.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/net/sunrpc/auth.c linux-3.4.48-vs2.3.3.9/net/sunrpc/auth.c
+--- linux-3.4.48/net/sunrpc/auth.c 2011-10-24 16:45:34.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/net/sunrpc/auth.c 2012-05-21 16:15:05.000000000 +0000
@@ -14,6 +14,7 @@
#include <linux/hash.h>
#include <linux/sunrpc/clnt.h>
@@ -25976,9 +25928,9 @@ diff -NurpP --minimal linux-3.4.45/net/sunrpc/auth.c linux-3.4.45-vs2.3.3.9/net/
};
dprintk("RPC: %5u looking up %s cred\n",
-diff -NurpP --minimal linux-3.4.45/net/sunrpc/auth_unix.c linux-3.4.45-vs2.3.3.9/net/sunrpc/auth_unix.c
---- linux-3.4.45/net/sunrpc/auth_unix.c 2012-01-09 15:15:04.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/net/sunrpc/auth_unix.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/net/sunrpc/auth_unix.c linux-3.4.48-vs2.3.3.9/net/sunrpc/auth_unix.c
+--- linux-3.4.48/net/sunrpc/auth_unix.c 2012-01-09 15:15:04.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/net/sunrpc/auth_unix.c 2012-05-21 16:15:05.000000000 +0000
@@ -12,12 +12,14 @@
#include <linux/module.h>
#include <linux/sunrpc/clnt.h>
@@ -26037,9 +25989,9 @@ diff -NurpP --minimal linux-3.4.45/net/sunrpc/auth_unix.c linux-3.4.45-vs2.3.3.9
hold = p++;
for (i = 0; i < 16 && cred->uc_gids[i] != (gid_t) NOGROUP; i++)
*p++ = htonl((u32) cred->uc_gids[i]);
-diff -NurpP --minimal linux-3.4.45/net/sunrpc/clnt.c linux-3.4.45-vs2.3.3.9/net/sunrpc/clnt.c
---- linux-3.4.45/net/sunrpc/clnt.c 2013-05-13 17:36:38.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/net/sunrpc/clnt.c 2013-02-11 23:37:30.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/net/sunrpc/clnt.c linux-3.4.48-vs2.3.3.9/net/sunrpc/clnt.c
+--- linux-3.4.48/net/sunrpc/clnt.c 2013-06-13 08:59:42.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/net/sunrpc/clnt.c 2013-02-11 23:37:30.000000000 +0000
@@ -31,6 +31,7 @@
#include <linux/in6.h>
#include <linux/un.h>
@@ -26058,9 +26010,9 @@ diff -NurpP --minimal linux-3.4.45/net/sunrpc/clnt.c linux-3.4.45-vs2.3.3.9/net/
return clnt;
}
EXPORT_SYMBOL_GPL(rpc_create);
-diff -NurpP --minimal linux-3.4.45/net/unix/af_unix.c linux-3.4.45-vs2.3.3.9/net/unix/af_unix.c
---- linux-3.4.45/net/unix/af_unix.c 2013-05-13 17:36:38.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/net/unix/af_unix.c 2013-05-13 18:16:08.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/net/unix/af_unix.c linux-3.4.48-vs2.3.3.9/net/unix/af_unix.c
+--- linux-3.4.48/net/unix/af_unix.c 2013-06-13 08:59:42.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/net/unix/af_unix.c 2013-06-13 09:46:39.000000000 +0000
@@ -114,6 +114,8 @@
#include <linux/mount.h>
#include <net/checksum.h>
@@ -26079,7 +26031,7 @@ diff -NurpP --minimal linux-3.4.45/net/unix/af_unix.c linux-3.4.45-vs2.3.3.9/net
if (u->addr->len == len &&
!memcmp(u->addr->name, sunname, len))
goto found;
-@@ -2265,6 +2269,8 @@ static struct sock *unix_seq_idx(struct
+@@ -2266,6 +2270,8 @@ static struct sock *unix_seq_idx(struct
for (s = first_unix_socket(&iter->i); s; s = next_unix_socket(&iter->i, s)) {
if (sock_net(s) != seq_file_net(seq))
continue;
@@ -26088,7 +26040,7 @@ diff -NurpP --minimal linux-3.4.45/net/unix/af_unix.c linux-3.4.45-vs2.3.3.9/net
if (off == pos)
return s;
++off;
-@@ -2289,7 +2295,8 @@ static void *unix_seq_next(struct seq_fi
+@@ -2290,7 +2296,8 @@ static void *unix_seq_next(struct seq_fi
sk = first_unix_socket(&iter->i);
else
sk = next_unix_socket(&iter->i, sk);
@@ -26098,9 +26050,9 @@ diff -NurpP --minimal linux-3.4.45/net/unix/af_unix.c linux-3.4.45-vs2.3.3.9/net
sk = next_unix_socket(&iter->i, sk);
return sk;
}
-diff -NurpP --minimal linux-3.4.45/scripts/checksyscalls.sh linux-3.4.45-vs2.3.3.9/scripts/checksyscalls.sh
---- linux-3.4.45/scripts/checksyscalls.sh 2012-03-19 18:47:34.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/scripts/checksyscalls.sh 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/scripts/checksyscalls.sh linux-3.4.48-vs2.3.3.9/scripts/checksyscalls.sh
+--- linux-3.4.48/scripts/checksyscalls.sh 2012-03-19 18:47:34.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/scripts/checksyscalls.sh 2012-05-21 16:15:05.000000000 +0000
@@ -193,7 +193,6 @@ cat << EOF
#define __IGNORE_afs_syscall
#define __IGNORE_getpmsg
@@ -26109,9 +26061,9 @@ diff -NurpP --minimal linux-3.4.45/scripts/checksyscalls.sh linux-3.4.45-vs2.3.3
EOF
}
-diff -NurpP --minimal linux-3.4.45/security/commoncap.c linux-3.4.45-vs2.3.3.9/security/commoncap.c
---- linux-3.4.45/security/commoncap.c 2012-05-21 16:07:41.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/security/commoncap.c 2012-05-21 16:15:05.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/security/commoncap.c linux-3.4.48-vs2.3.3.9/security/commoncap.c
+--- linux-3.4.48/security/commoncap.c 2012-05-21 16:07:41.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/security/commoncap.c 2012-05-21 16:15:05.000000000 +0000
@@ -76,14 +76,20 @@ int cap_netlink_send(struct sock *sk, st
int cap_capable(const struct cred *cred, struct user_namespace *targ_ns,
int cap, int audit)
@@ -26153,9 +26105,9 @@ diff -NurpP --minimal linux-3.4.45/security/commoncap.c linux-3.4.45-vs2.3.3.9/s
return -EPERM;
return 0;
}
-diff -NurpP --minimal linux-3.4.45/security/selinux/hooks.c linux-3.4.45-vs2.3.3.9/security/selinux/hooks.c
---- linux-3.4.45/security/selinux/hooks.c 2013-05-13 17:36:38.000000000 +0000
-+++ linux-3.4.45-vs2.3.3.9/security/selinux/hooks.c 2012-09-01 08:50:49.000000000 +0000
+diff -NurpP --minimal linux-3.4.48/security/selinux/hooks.c linux-3.4.48-vs2.3.3.9/security/selinux/hooks.c
+--- linux-3.4.48/security/selinux/hooks.c 2013-06-13 08:59:44.000000000 +0000
++++ linux-3.4.48-vs2.3.3.9/security/selinux/hooks.c 2012-09-01 08:50:49.000000000 +0000
@@ -66,7 +66,6 @@
#include <linux/dccp.h>
#include <linux/quota.h>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 22:20:08 +0000